commit_sha
stringlengths
40
40
modifications
listlengths
1
328
files
listlengths
2
183
file_patch_count
int64
2
183
enhanced_diffs
listlengths
1
300
enhanced_diffs_count
int64
1
300
diff_count
int64
1
328
01bc5c83c895357f23a345ecec85a3796cf66358
[ { "name": "ipa320$bride", "new_args": "Node container", "new_implementation": null, "new_return_type": "Collection<RosLinkDescriptor>", "new_signature": "Collection<RosLinkDescriptor> getContainedTypeModelFacetLinks_Publisher_4004(Node container)", "old_args": "Node container", "old_implementation": null, "old_return_type": "Collection<RosLinkDescriptor>", "old_signature": "Collection<RosLinkDescriptor> getContainedTypeModelFacetLinks_Publisher_4002(Node container)" }, { "name": "ipa320$bride", "new_args": "Node container", "new_implementation": null, "new_return_type": "Collection<RosLinkDescriptor>", "new_signature": "Collection<RosLinkDescriptor> getContainedTypeModelFacetLinks_Subscriber_4002(Node container)", "old_args": "Node container", "old_implementation": null, "old_return_type": "Collection<RosLinkDescriptor>", "old_signature": "Collection<RosLinkDescriptor> getContainedTypeModelFacetLinks_Subscriber_4001(Node container)" }, { "name": "ipa320$bride", "new_args": "Topic target,Map<EObject,Collection<EStructuralFeature.Setting>> crossReferences", "new_implementation": null, "new_return_type": "Collection<RosLinkDescriptor>", "new_signature": "Collection<RosLinkDescriptor> getIncomingTypeModelFacetLinks_Publisher_4004(Topic target,Map<EObject,Collection<EStructuralFeature.Setting>> crossReferences)", "old_args": "Topic target,Map<EObject,Collection<EStructuralFeature.Setting>> crossReferences", "old_implementation": null, "old_return_type": "Collection<RosLinkDescriptor>", "old_signature": "Collection<RosLinkDescriptor> getIncomingTypeModelFacetLinks_Publisher_4002(Topic target,Map<EObject,Collection<EStructuralFeature.Setting>> crossReferences)" }, { "name": "ipa320$bride", "new_args": "Topic target,Map<EObject,Collection<EStructuralFeature.Setting>> crossReferences", "new_implementation": null, "new_return_type": "Collection<RosLinkDescriptor>", "new_signature": "Collection<RosLinkDescriptor> getIncomingTypeModelFacetLinks_Subscriber_4002(Topic target,Map<EObject,Collection<EStructuralFeature.Setting>> crossReferences)", "old_args": "Topic target,Map<EObject,Collection<EStructuralFeature.Setting>> crossReferences", "old_implementation": null, "old_return_type": "Collection<RosLinkDescriptor>", "old_signature": "Collection<RosLinkDescriptor> getIncomingTypeModelFacetLinks_Subscriber_4001(Topic target,Map<EObject,Collection<EStructuralFeature.Setting>> crossReferences)" }, { "name": "ipa320$bride", "new_args": "", "new_implementation": null, "new_return_type": "IParser", "new_signature": "IParser getNodeName_5001Parser()", "old_args": "", "old_implementation": null, "old_return_type": "IParser", "old_signature": "IParser getNodeName_5002Parser()" }, { "name": "ipa320$bride", "new_args": "View view", "new_implementation": null, "new_return_type": "String", "new_signature": "String getNode_2001Text(View view)", "old_args": "View view", "old_implementation": null, "old_return_type": "String", "old_signature": "String getNode_2002Text(View view)" }, { "name": "ipa320$bride", "new_args": "", "new_implementation": null, "new_return_type": "IParser", "new_signature": "IParser getPublisherName_6004Parser()", "old_args": "", "old_implementation": null, "old_return_type": "IParser", "old_signature": "IParser getPublisherName_6002Parser()" }, { "name": "ipa320$bride", "new_args": "View view", "new_implementation": null, "new_return_type": "String", "new_signature": "String getPublisher_4004Text(View view)", "old_args": "View view", "old_implementation": null, "old_return_type": "String", "old_signature": "String getPublisher_4002Text(View view)" }, { "name": "ipa320$bride", "new_args": "", "new_implementation": null, "new_return_type": "IParser", "new_signature": "IParser getSubscriberName_6002Parser()", "old_args": "", "old_implementation": null, "old_return_type": "IParser", "old_signature": "IParser getSubscriberName_6001Parser()" }, { "name": "ipa320$bride", "new_args": "View view", "new_implementation": null, "new_return_type": "String", "new_signature": "String getSubscriber_4002Text(View view)", "old_args": "View view", "old_implementation": null, "old_return_type": "String", "old_signature": "String getSubscriber_4001Text(View view)" }, { "name": "ipa320$bride", "new_args": "", "new_implementation": "if (topicName_5002Parser == null) {\n\t\t\ttopicName_5002Parser = parser;\n\t\treturn topicName_5002Parser;\n\tprivate IParser serviceName_5003Parser;\n\tprivate IParser getServiceName_5003Parser() {\n\t\tif (serviceName_5003Parser == null) {\n\t\t\t\t\t.getService_Name()", "new_return_type": "IParser", "new_signature": "IParser getTopicName_5002Parser()", "old_args": "", "old_implementation": "if (topicName_5001Parser == null) {\n\t\t\ttopicName_5001Parser = parser;\n\t\treturn topicName_5001Parser;\n\tprivate IParser nodeName_5002Parser;\n\tprivate IParser getNodeName_5002Parser() {\n\t\tif (nodeName_5002Parser == null) {\n\t\t\t\t\t.getNode_Name()", "old_return_type": "IParser", "old_signature": "IParser getTopicName_5001Parser()" }, { "name": "ipa320$bride", "new_args": "View view", "new_implementation": null, "new_return_type": "String", "new_signature": "String getTopic_2002Text(View view)", "old_args": "View view", "old_implementation": null, "old_return_type": "String", "old_signature": "String getTopic_2001Text(View view)" }, { "name": "ipa320$bride", "new_args": "Node source,Topic target", "new_implementation": null, "new_return_type": "boolean", "new_signature": "boolean canCreatePublisher_4004(Node source,Topic target)", "old_args": "Node source,Topic target", "old_implementation": null, "old_return_type": "boolean", "old_signature": "boolean canCreatePublisher_4002(Node source,Topic target)" }, { "name": "ipa320$bride", "new_args": "Node source,Topic target", "new_implementation": null, "new_return_type": "boolean", "new_signature": "boolean canCreateSubscriber_4002(Node source,Topic target)", "old_args": "Node source,Topic target", "old_implementation": null, "old_return_type": "boolean", "old_signature": "boolean canCreateSubscriber_4001(Node source,Topic target)" }, { "name": "ipa320$bride", "new_args": "Publisher linkInstance,Node source,Topic target", "new_implementation": null, "new_return_type": "boolean", "new_signature": "boolean canExistPublisher_4004(Publisher linkInstance,Node source,Topic target)", "old_args": "Publisher linkInstance,Node source,Topic target", "old_implementation": null, "old_return_type": "boolean", "old_signature": "boolean canExistPublisher_4002(Publisher linkInstance,Node source,Topic target)" }, { "name": "ipa320$bride", "new_args": "Subscriber linkInstance,Node source,Topic target", "new_implementation": null, "new_return_type": "boolean", "new_signature": "boolean canExistSubscriber_4002(Subscriber linkInstance,Node source,Topic target)", "old_args": "Subscriber linkInstance,Node source,Topic target", "old_implementation": null, "old_return_type": "boolean", "old_signature": "boolean canExistSubscriber_4001(Subscriber linkInstance,Node source,Topic target)" }, { "name": "ipa320$bride", "new_args": "EObject domainElement,View containerView,int index,boolean persisted,PreferencesHint preferencesHint", "new_implementation": null, "new_return_type": "Node", "new_signature": "Node createNode_2001(EObject domainElement,View containerView,int index,boolean persisted,PreferencesHint preferencesHint)", "old_args": "EObject domainElement,View containerView,int index,boolean persisted,PreferencesHint preferencesHint", "old_implementation": null, "old_return_type": "Node", "old_signature": "Node createNode_2002(EObject domainElement,View containerView,int index,boolean persisted,PreferencesHint preferencesHint)" }, { "name": "ipa320$bride", "new_args": "EObject domainElement,View containerView,int index,boolean persisted,PreferencesHint preferencesHint", "new_implementation": null, "new_return_type": "Edge", "new_signature": "Edge createPublisher_4004(EObject domainElement,View containerView,int index,boolean persisted,PreferencesHint preferencesHint)", "old_args": "EObject domainElement,View containerView,int index,boolean persisted,PreferencesHint preferencesHint", "old_implementation": null, "old_return_type": "Edge", "old_signature": "Edge createPublisher_4002(EObject domainElement,View containerView,int index,boolean persisted,PreferencesHint preferencesHint)" }, { "name": "ipa320$bride", "new_args": "EObject domainElement,View containerView,int index,boolean persisted,PreferencesHint preferencesHint", "new_implementation": null, "new_return_type": "Edge", "new_signature": "Edge createSubscriber_4002(EObject domainElement,View containerView,int index,boolean persisted,PreferencesHint preferencesHint)", "old_args": "EObject domainElement,View containerView,int index,boolean persisted,PreferencesHint preferencesHint", "old_implementation": null, "old_return_type": "Edge", "old_signature": "Edge createSubscriber_4001(EObject domainElement,View containerView,int index,boolean persisted,PreferencesHint preferencesHint)" }, { "name": "ipa320$bride", "new_args": "EObject domainElement,View containerView,int index,boolean persisted,PreferencesHint preferencesHint", "new_implementation": null, "new_return_type": "Node", "new_signature": "Node createTopic_2002(EObject domainElement,View containerView,int index,boolean persisted,PreferencesHint preferencesHint)", "old_args": "EObject domainElement,View containerView,int index,boolean persisted,PreferencesHint preferencesHint", "old_implementation": null, "old_return_type": "Node", "old_signature": "Node createTopic_2001(EObject domainElement,View containerView,int index,boolean persisted,PreferencesHint preferencesHint)" }, { "name": "ipa320$bride", "new_args": "View view", "new_implementation": null, "new_return_type": "List<RosLinkDescriptor>", "new_signature": "List<RosLinkDescriptor> getNode_2001ContainedLinks(View view)", "old_args": "View view", "old_implementation": null, "old_return_type": "List<RosLinkDescriptor>", "old_signature": "List<RosLinkDescriptor> getNode_2002ContainedLinks(View view)" }, { "name": "ipa320$bride", "new_args": "View view", "new_implementation": null, "new_return_type": "List<RosLinkDescriptor>", "new_signature": "List<RosLinkDescriptor> getNode_2001IncomingLinks(View view)", "old_args": "View view", "old_implementation": null, "old_return_type": "List<RosLinkDescriptor>", "old_signature": "List<RosLinkDescriptor> getNode_2002IncomingLinks(View view)" }, { "name": "ipa320$bride", "new_args": "View view", "new_implementation": null, "new_return_type": "List<RosLinkDescriptor>", "new_signature": "List<RosLinkDescriptor> getNode_2001OutgoingLinks(View view)", "old_args": "View view", "old_implementation": null, "old_return_type": "List<RosLinkDescriptor>", "old_signature": "List<RosLinkDescriptor> getNode_2002OutgoingLinks(View view)" }, { "name": "ipa320$bride", "new_args": "View view", "new_implementation": null, "new_return_type": "List<RosLinkDescriptor>", "new_signature": "List<RosLinkDescriptor> getPublisher_4004ContainedLinks(View view)", "old_args": "View view", "old_implementation": null, "old_return_type": "List<RosLinkDescriptor>", "old_signature": "List<RosLinkDescriptor> getPublisher_4002ContainedLinks(View view)" }, { "name": "ipa320$bride", "new_args": "View view", "new_implementation": null, "new_return_type": "List<RosLinkDescriptor>", "new_signature": "List<RosLinkDescriptor> getPublisher_4004IncomingLinks(View view)", "old_args": "View view", "old_implementation": null, "old_return_type": "List<RosLinkDescriptor>", "old_signature": "List<RosLinkDescriptor> getPublisher_4002IncomingLinks(View view)" }, { "name": "ipa320$bride", "new_args": "View view", "new_implementation": null, "new_return_type": "List<RosLinkDescriptor>", "new_signature": "List<RosLinkDescriptor> getPublisher_4004OutgoingLinks(View view)", "old_args": "View view", "old_implementation": null, "old_return_type": "List<RosLinkDescriptor>", "old_signature": "List<RosLinkDescriptor> getPublisher_4002OutgoingLinks(View view)" }, { "name": "ipa320$bride", "new_args": "View view", "new_implementation": null, "new_return_type": "List<RosLinkDescriptor>", "new_signature": "List<RosLinkDescriptor> getSubscriber_4002ContainedLinks(View view)", "old_args": "View view", "old_implementation": null, "old_return_type": "List<RosLinkDescriptor>", "old_signature": "List<RosLinkDescriptor> getSubscriber_4001ContainedLinks(View view)" }, { "name": "ipa320$bride", "new_args": "View view", "new_implementation": null, "new_return_type": "List<RosLinkDescriptor>", "new_signature": "List<RosLinkDescriptor> getSubscriber_4002IncomingLinks(View view)", "old_args": "View view", "old_implementation": null, "old_return_type": "List<RosLinkDescriptor>", "old_signature": "List<RosLinkDescriptor> getSubscriber_4001IncomingLinks(View view)" }, { "name": "ipa320$bride", "new_args": "View view", "new_implementation": null, "new_return_type": "List<RosLinkDescriptor>", "new_signature": "List<RosLinkDescriptor> getSubscriber_4002OutgoingLinks(View view)", "old_args": "View view", "old_implementation": null, "old_return_type": "List<RosLinkDescriptor>", "old_signature": "List<RosLinkDescriptor> getSubscriber_4001OutgoingLinks(View view)" }, { "name": "ipa320$bride", "new_args": "View view", "new_implementation": null, "new_return_type": "List<RosLinkDescriptor>", "new_signature": "List<RosLinkDescriptor> getTopic_2002ContainedLinks(View view)", "old_args": "View view", "old_implementation": null, "old_return_type": "List<RosLinkDescriptor>", "old_signature": "List<RosLinkDescriptor> getTopic_2001ContainedLinks(View view)" }, { "name": "ipa320$bride", "new_args": "View view", "new_implementation": null, "new_return_type": "List<RosLinkDescriptor>", "new_signature": "List<RosLinkDescriptor> getTopic_2002IncomingLinks(View view)", "old_args": "View view", "old_implementation": null, "old_return_type": "List<RosLinkDescriptor>", "old_signature": "List<RosLinkDescriptor> getTopic_2001IncomingLinks(View view)" }, { "name": "ipa320$bride", "new_args": "View view", "new_implementation": null, "new_return_type": "List<RosLinkDescriptor>", "new_signature": "List<RosLinkDescriptor> getTopic_2002OutgoingLinks(View view)", "old_args": "View view", "old_implementation": null, "old_return_type": "List<RosLinkDescriptor>", "old_signature": "List<RosLinkDescriptor> getTopic_2001OutgoingLinks(View view)" } ]
[ { "additions": 20, "blob_url": "https://github.com/ipa320/bride/blob/01bc5c83c895357f23a345ecec85a3796cf66358/org.ros.model.ros.diagram%2Fmessages.properties", "changes": 26, "contents_url": "https://api.github.com/repos/ipa320/bride/contents/org.ros.model.ros.diagram%2Fmessages.properties?ref=01bc5c83c895357f23a345ecec85a3796cf66358", "deletions": 6, "filename": "org.ros.model.ros.diagram/messages.properties", "new_code": "Service5CreationTool_title=Service\nService5CreationTool_desc=Create new Service\nServiceServer6CreationTool_title=ServiceServer\nServiceServer6CreationTool_desc=Create new ServiceServer\nServiceClient7CreationTool_title=ServiceClient\nServiceClient7CreationTool_desc=Create new ServiceClient\nParameter8CreationTool_title=Parameter\nParameter8CreationTool_desc=Create new Parameter\nNodeParametersEditPart_title=Parameters\nNavigatorGroupName_Subscriber_4002_target=target\nNavigatorGroupName_Subscriber_4002_source=source\nNavigatorGroupName_Topic_2002_incominglinks=incoming links\nNavigatorGroupName_Service_2003_incominglinks=incoming links\nNavigatorGroupName_Node_2001_outgoinglinks=outgoing links\nNavigatorGroupName_ServiceClient_4001_target=target\nNavigatorGroupName_ServiceClient_4001_source=source\nNavigatorGroupName_Publisher_4004_target=target\nNavigatorGroupName_Publisher_4004_source=source\nNavigatorGroupName_ServiceServer_4003_target=target\nNavigatorGroupName_ServiceServer_4003_source=source", "new_methods": [], "old_code": "NavigatorGroupName_Subscriber_4001_target=target\nNavigatorGroupName_Subscriber_4001_source=source\nNavigatorGroupName_Topic_2001_incominglinks=incoming links\nNavigatorGroupName_Publisher_4002_target=target\nNavigatorGroupName_Publisher_4002_source=source\nNavigatorGroupName_Node_2002_outgoinglinks=outgoing links", "old_methods": [], "patch": "@@ -53,15 +53,29 @@ Subscriber3CreationTool_title=Subscriber\n Subscriber3CreationTool_desc=Create new Subscriber\n Topic4CreationTool_title=Topic\n Topic4CreationTool_desc=Create new Topic\n+Service5CreationTool_title=Service\n+Service5CreationTool_desc=Create new Service\n+ServiceServer6CreationTool_title=ServiceServer\n+ServiceServer6CreationTool_desc=Create new ServiceServer\n+ServiceClient7CreationTool_title=ServiceClient\n+ServiceClient7CreationTool_desc=Create new ServiceClient\n+Parameter8CreationTool_title=Parameter\n+Parameter8CreationTool_desc=Create new Parameter\n+NodeParametersEditPart_title=Parameters\n \n CommandName_OpenDiagram=Open Diagram\n NavigatorGroupName_Package_1000_links=links\n-NavigatorGroupName_Subscriber_4001_target=target\n-NavigatorGroupName_Subscriber_4001_source=source\n-NavigatorGroupName_Topic_2001_incominglinks=incoming links\n-NavigatorGroupName_Publisher_4002_target=target\n-NavigatorGroupName_Publisher_4002_source=source\n-NavigatorGroupName_Node_2002_outgoinglinks=outgoing links\n+NavigatorGroupName_Subscriber_4002_target=target\n+NavigatorGroupName_Subscriber_4002_source=source\n+NavigatorGroupName_Topic_2002_incominglinks=incoming links\n+NavigatorGroupName_Service_2003_incominglinks=incoming links\n+NavigatorGroupName_Node_2001_outgoinglinks=outgoing links\n+NavigatorGroupName_ServiceClient_4001_target=target\n+NavigatorGroupName_ServiceClient_4001_source=source\n+NavigatorGroupName_Publisher_4004_target=target\n+NavigatorGroupName_Publisher_4004_source=source\n+NavigatorGroupName_ServiceServer_4003_target=target\n+NavigatorGroupName_ServiceServer_4003_source=source\n NavigatorActionProvider_OpenDiagramActionName=Open Diagram\n AbstractParser_UnexpectedValueType=Value of type {0} is expected\n AbstractParser_WrongStringConversion=String value does not convert to {0} value", "raw_url": "https://github.com/ipa320/bride/raw/01bc5c83c895357f23a345ecec85a3796cf66358/org.ros.model.ros.diagram%2Fmessages.properties", "sha": "664f58427ff2d102230459c0c1555b393e3223c4", "status": "modified" }, { "additions": 90, "blob_url": "https://github.com/ipa320/bride/blob/01bc5c83c895357f23a345ecec85a3796cf66358/org.ros.model.ros.diagram%2Fmodel%2Fros.gmfgraph", "changes": 125, "contents_url": "https://api.github.com/repos/ipa320/bride/contents/org.ros.model.ros.diagram%2Fmodel%2Fros.gmfgraph?ref=01bc5c83c895357f23a345ecec85a3796cf66358", "deletions": 35, "filename": "org.ros.model.ros.diagram/model/ros.gmfgraph", "new_code": " xsi:type=\"gmfgraph:GridLayout\"/>\n <layoutData\n xsi:type=\"gmfgraph:GridLayoutData\"\n verticalAlignment=\"BEGINNING\"\n horizontalAlignment=\"BEGINNING\"/>\n </children>\n <children\n xsi:type=\"gmfgraph:Rectangle\"\n name=\"ParameterCompartmentFigure\">\n <layoutData\n xsi:type=\"gmfgraph:GridLayoutData\"\n grabExcessHorizontalSpace=\"true\"\n grabExcessVerticalSpace=\"true\"\n verticalAlignment=\"FILL\"\n horizontalAlignment=\"FILL\"/>\n <layout\n xsi:type=\"gmfgraph:StackLayout\"/>\n figure=\"//@figures.0/@descriptors.0/@actualFigure/@children.1\"/>\n xsi:type=\"gmfgraph:PolylineConnection\"\n xsi:type=\"gmfgraph:PolylineConnection\"\n name=\"ServiceFigure\">\n <actualFigure\n xsi:type=\"gmfgraph:Rectangle\"\n name=\"ServiceFigure\">\n <layout\n xsi:type=\"gmfgraph:FlowLayout\"/>\n <children\n xsi:type=\"gmfgraph:Label\"\n name=\"ServiceNameFigure\"\n text=\"&lt;...>\"/>\n </actualFigure>\n <accessors\n figure=\"//@figures.0/@descriptors.4/@actualFigure/@children.0\"/>\n </descriptors>\n <descriptors\n name=\"ServiceServerFigure\">\n name=\"ServiceServerFigure\">\n <children\n xsi:type=\"gmfgraph:Label\"\n name=\"ServiceServerNameFigure\"\n text=\"&lt;...>\"/>\n </actualFigure>\n <accessors\n figure=\"//@figures.0/@descriptors.5/@actualFigure/@children.0\"/>\n name=\"ServiceClientFigure\">\n name=\"ServiceClientFigure\">\n <children\n xsi:type=\"gmfgraph:Label\"\n name=\"ServiceClientNameFigure\"\n text=\"&lt;...>\"/>\n </actualFigure>\n <accessors\n figure=\"//@figures.0/@descriptors.6/@actualFigure/@children.0\"/>\n </descriptors>\n <descriptors\n name=\"ParameterFigure\">\n <actualFigure\n xsi:type=\"gmfgraph:Label\"\n name=\"ParameterNameFigure\"\n text=\"&lt;...>\"/>\n name=\"Topic\"\n figure=\"TopicFigure\"/>\n <nodes\n name=\"Service\"\n figure=\"ServiceFigure\"/>\n <nodes\n name=\"Parameter\"\n figure=\"ParameterFigure\"/>\n <connections\n <connections\n name=\"ServiceServer\"\n figure=\"ServiceServerFigure\"/>\n name=\"ServiceClient\"\n figure=\"ServiceClientFigure\"/>\n name=\"Parameters\"\n <labels\n name=\"ServiceName\"\n figure=\"ServiceFigure\"\n accessor=\"//@figures.0/@descriptors.4/@accessors.0\"/>\n <labels\n name=\"ServiceServerName\"\n figure=\"ServiceServerFigure\"\n accessor=\"//@figures.0/@descriptors.5/@accessors.0\"/>\n <labels\n name=\"ServiceClientName\"\n figure=\"ServiceClientFigure\"\n accessor=\"//@figures.0/@descriptors.6/@accessors.0\"/>\n <labels\n name=\"ParameterName\"\n figure=\"ParameterFigure\"/>", "new_methods": [], "old_code": " <figures\n xsi:type=\"gmfgraph:PolylineDecoration\"\n name=\"PublisherTopicTargetDecoration\"/>\n <figures\n xsi:type=\"gmfgraph:PolylineDecoration\"\n name=\"SubscriberTopicTargetDecoration\"/>\n xsi:type=\"gmfgraph:FlowLayout\"/>\n <children\n xsi:type=\"gmfgraph:Rectangle\"\n name=\"PublisherCompartmentFigure\">\n <layout\n xsi:type=\"gmfgraph:StackLayout\"/>\n </children>\n figure=\"//@figures.0/@descriptors.0/@actualFigure/@children.0/@children.0\"/>\n xsi:type=\"gmfgraph:Rectangle\"\n <layout\n xsi:type=\"gmfgraph:FlowLayout\"/>\n xsi:type=\"gmfgraph:Rectangle\"\n <layout\n xsi:type=\"gmfgraph:FlowLayout\"/>\n name=\"PublisherTopicFigure\">\n name=\"PublisherTopicConnectionFigure\"\n targetDecoration=\"//@figures.0/@figures.0\"/>\n name=\"SubscriberTopicFigure\">\n name=\"SubscriberTopicConnectionFigure\"\n targetDecoration=\"//@figures.0/@figures.1\"/>\n <nodes\n <nodes\n name=\"Topic\"\n figure=\"TopicFigure\"/>\n name=\"Publisher to Topic\"\n figure=\"PublisherTopicFigure\"/>\n name=\"Subscriber To Topic\"\n figure=\"SubscriberTopicFigure\"/>\n name=\"Publishers\"", "old_methods": [], "patch": "@@ -5,43 +5,45 @@\n xmlns:gmfgraph=\"http://www.eclipse.org/gmf/2006/GraphicalDefinition\" name=\"ros\">\n <figures\n name=\"Default\">\n- <figures\n- xsi:type=\"gmfgraph:PolylineDecoration\"\n- name=\"PublisherTopicTargetDecoration\"/>\n- <figures\n- xsi:type=\"gmfgraph:PolylineDecoration\"\n- name=\"SubscriberTopicTargetDecoration\"/>\n <descriptors\n name=\"NodeFigure\">\n <actualFigure\n xsi:type=\"gmfgraph:Rectangle\"\n name=\"NodeFigure\">\n <layout\n- xsi:type=\"gmfgraph:FlowLayout\"/>\n+ xsi:type=\"gmfgraph:GridLayout\"/>\n <children\n xsi:type=\"gmfgraph:Label\"\n name=\"NodeNameFigure\"\n text=\"&lt;...>\">\n- <children\n- xsi:type=\"gmfgraph:Rectangle\"\n- name=\"PublisherCompartmentFigure\">\n- <layout\n- xsi:type=\"gmfgraph:StackLayout\"/>\n- </children>\n+ <layoutData\n+ xsi:type=\"gmfgraph:GridLayoutData\"\n+ verticalAlignment=\"BEGINNING\"\n+ horizontalAlignment=\"BEGINNING\"/>\n+ </children>\n+ <children\n+ xsi:type=\"gmfgraph:Rectangle\"\n+ name=\"ParameterCompartmentFigure\">\n+ <layoutData\n+ xsi:type=\"gmfgraph:GridLayoutData\"\n+ grabExcessHorizontalSpace=\"true\"\n+ grabExcessVerticalSpace=\"true\"\n+ verticalAlignment=\"FILL\"\n+ horizontalAlignment=\"FILL\"/>\n+ <layout\n+ xsi:type=\"gmfgraph:StackLayout\"/>\n </children>\n </actualFigure>\n <accessors\n figure=\"//@figures.0/@descriptors.0/@actualFigure/@children.0\"/>\n <accessors\n- figure=\"//@figures.0/@descriptors.0/@actualFigure/@children.0/@children.0\"/>\n+ figure=\"//@figures.0/@descriptors.0/@actualFigure/@children.1\"/>\n </descriptors>\n <descriptors\n name=\"PublisherFigure\">\n <actualFigure\n- xsi:type=\"gmfgraph:Rectangle\"\n+ xsi:type=\"gmfgraph:PolylineConnection\"\n name=\"PublisherFigure\">\n- <layout\n- xsi:type=\"gmfgraph:FlowLayout\"/>\n <children\n xsi:type=\"gmfgraph:Label\"\n name=\"PublisherNameFigure\"\n@@ -53,10 +55,8 @@\n <descriptors\n name=\"SubscriberFigure\">\n <actualFigure\n- xsi:type=\"gmfgraph:Rectangle\"\n+ xsi:type=\"gmfgraph:PolylineConnection\"\n name=\"SubscriberFigure\">\n- <layout\n- xsi:type=\"gmfgraph:FlowLayout\"/>\n <children\n xsi:type=\"gmfgraph:Label\"\n name=\"SubscriberNameFigure\"\n@@ -81,40 +81,80 @@\n figure=\"//@figures.0/@descriptors.3/@actualFigure/@children.0\"/>\n </descriptors>\n <descriptors\n- name=\"PublisherTopicFigure\">\n+ name=\"ServiceFigure\">\n+ <actualFigure\n+ xsi:type=\"gmfgraph:Rectangle\"\n+ name=\"ServiceFigure\">\n+ <layout\n+ xsi:type=\"gmfgraph:FlowLayout\"/>\n+ <children\n+ xsi:type=\"gmfgraph:Label\"\n+ name=\"ServiceNameFigure\"\n+ text=\"&lt;...>\"/>\n+ </actualFigure>\n+ <accessors\n+ figure=\"//@figures.0/@descriptors.4/@actualFigure/@children.0\"/>\n+ </descriptors>\n+ <descriptors\n+ name=\"ServiceServerFigure\">\n <actualFigure\n xsi:type=\"gmfgraph:PolylineConnection\"\n- name=\"PublisherTopicConnectionFigure\"\n- targetDecoration=\"//@figures.0/@figures.0\"/>\n+ name=\"ServiceServerFigure\">\n+ <children\n+ xsi:type=\"gmfgraph:Label\"\n+ name=\"ServiceServerNameFigure\"\n+ text=\"&lt;...>\"/>\n+ </actualFigure>\n+ <accessors\n+ figure=\"//@figures.0/@descriptors.5/@actualFigure/@children.0\"/>\n </descriptors>\n <descriptors\n- name=\"SubscriberTopicFigure\">\n+ name=\"ServiceClientFigure\">\n <actualFigure\n xsi:type=\"gmfgraph:PolylineConnection\"\n- name=\"SubscriberTopicConnectionFigure\"\n- targetDecoration=\"//@figures.0/@figures.1\"/>\n+ name=\"ServiceClientFigure\">\n+ <children\n+ xsi:type=\"gmfgraph:Label\"\n+ name=\"ServiceClientNameFigure\"\n+ text=\"&lt;...>\"/>\n+ </actualFigure>\n+ <accessors\n+ figure=\"//@figures.0/@descriptors.6/@actualFigure/@children.0\"/>\n+ </descriptors>\n+ <descriptors\n+ name=\"ParameterFigure\">\n+ <actualFigure\n+ xsi:type=\"gmfgraph:Label\"\n+ name=\"ParameterNameFigure\"\n+ text=\"&lt;...>\"/>\n </descriptors>\n </figures>\n <nodes\n name=\"Node\"\n figure=\"NodeFigure\"/>\n <nodes\n+ name=\"Topic\"\n+ figure=\"TopicFigure\"/>\n+ <nodes\n+ name=\"Service\"\n+ figure=\"ServiceFigure\"/>\n+ <nodes\n+ name=\"Parameter\"\n+ figure=\"ParameterFigure\"/>\n+ <connections\n name=\"Publisher\"\n figure=\"PublisherFigure\"/>\n- <nodes\n+ <connections\n name=\"Subscriber\"\n figure=\"SubscriberFigure\"/>\n- <nodes\n- name=\"Topic\"\n- figure=\"TopicFigure\"/>\n <connections\n- name=\"Publisher to Topic\"\n- figure=\"PublisherTopicFigure\"/>\n+ name=\"ServiceServer\"\n+ figure=\"ServiceServerFigure\"/>\n <connections\n- name=\"Subscriber To Topic\"\n- figure=\"SubscriberTopicFigure\"/>\n+ name=\"ServiceClient\"\n+ figure=\"ServiceClientFigure\"/>\n <compartments\n- name=\"Publishers\"\n+ name=\"Parameters\"\n figure=\"NodeFigure\"\n needsTitle=\"true\"\n accessor=\"//@figures.0/@descriptors.0/@accessors.1\"/>\n@@ -134,4 +174,19 @@\n name=\"TopicName\"\n figure=\"TopicFigure\"\n accessor=\"//@figures.0/@descriptors.3/@accessors.0\"/>\n+ <labels\n+ name=\"ServiceName\"\n+ figure=\"ServiceFigure\"\n+ accessor=\"//@figures.0/@descriptors.4/@accessors.0\"/>\n+ <labels\n+ name=\"ServiceServerName\"\n+ figure=\"ServiceServerFigure\"\n+ accessor=\"//@figures.0/@descriptors.5/@accessors.0\"/>\n+ <labels\n+ name=\"ServiceClientName\"\n+ figure=\"ServiceClientFigure\"\n+ accessor=\"//@figures.0/@descriptors.6/@accessors.0\"/>\n+ <labels\n+ name=\"ParameterName\"\n+ figure=\"ParameterFigure\"/>\n </gmfgraph:Canvas>", "raw_url": "https://github.com/ipa320/bride/raw/01bc5c83c895357f23a345ecec85a3796cf66358/org.ros.model.ros.diagram%2Fmodel%2Fros.gmfgraph", "sha": "6d252c49f8df499d753afa18d5ee50741ba3644e", "status": "modified" }, { "additions": 36, "blob_url": "https://github.com/ipa320/bride/blob/01bc5c83c895357f23a345ecec85a3796cf66358/org.ros.model.ros.diagram%2Fmodel%2Fros.gmftool", "changes": 36, "contents_url": "https://api.github.com/repos/ipa320/bride/contents/org.ros.model.ros.diagram%2Fmodel%2Fros.gmftool?ref=01bc5c83c895357f23a345ecec85a3796cf66358", "deletions": 0, "filename": "org.ros.model.ros.diagram/model/ros.gmftool", "new_code": " <tools\n xsi:type=\"gmftool:CreationTool\"\n title=\"Service\"\n description=\"Create new Service\">\n <smallIcon\n xsi:type=\"gmftool:DefaultImage\"/>\n <largeIcon\n xsi:type=\"gmftool:DefaultImage\"/>\n </tools>\n <tools\n xsi:type=\"gmftool:CreationTool\"\n title=\"ServiceServer\"\n description=\"Create new ServiceServer\">\n <smallIcon\n xsi:type=\"gmftool:DefaultImage\"/>\n <largeIcon\n xsi:type=\"gmftool:DefaultImage\"/>\n </tools>\n <tools\n xsi:type=\"gmftool:CreationTool\"\n title=\"ServiceClient\"\n description=\"Create new ServiceClient\">\n <smallIcon\n xsi:type=\"gmftool:DefaultImage\"/>\n <largeIcon\n xsi:type=\"gmftool:DefaultImage\"/>\n </tools>\n <tools\n xsi:type=\"gmftool:CreationTool\"\n title=\"Parameter\"\n description=\"Create new Parameter\">\n <smallIcon\n xsi:type=\"gmftool:DefaultImage\"/>\n <largeIcon\n xsi:type=\"gmftool:DefaultImage\"/>\n </tools>", "new_methods": [], "old_code": "", "old_methods": [], "patch": "@@ -44,6 +44,42 @@\n <largeIcon\n xsi:type=\"gmftool:DefaultImage\"/>\n </tools>\n+ <tools\n+ xsi:type=\"gmftool:CreationTool\"\n+ title=\"Service\"\n+ description=\"Create new Service\">\n+ <smallIcon\n+ xsi:type=\"gmftool:DefaultImage\"/>\n+ <largeIcon\n+ xsi:type=\"gmftool:DefaultImage\"/>\n+ </tools>\n+ <tools\n+ xsi:type=\"gmftool:CreationTool\"\n+ title=\"ServiceServer\"\n+ description=\"Create new ServiceServer\">\n+ <smallIcon\n+ xsi:type=\"gmftool:DefaultImage\"/>\n+ <largeIcon\n+ xsi:type=\"gmftool:DefaultImage\"/>\n+ </tools>\n+ <tools\n+ xsi:type=\"gmftool:CreationTool\"\n+ title=\"ServiceClient\"\n+ description=\"Create new ServiceClient\">\n+ <smallIcon\n+ xsi:type=\"gmftool:DefaultImage\"/>\n+ <largeIcon\n+ xsi:type=\"gmftool:DefaultImage\"/>\n+ </tools>\n+ <tools\n+ xsi:type=\"gmftool:CreationTool\"\n+ title=\"Parameter\"\n+ description=\"Create new Parameter\">\n+ <smallIcon\n+ xsi:type=\"gmftool:DefaultImage\"/>\n+ <largeIcon\n+ xsi:type=\"gmftool:DefaultImage\"/>\n+ </tools>\n </tools>\n </palette>\n </gmftool:ToolRegistry>", "raw_url": "https://github.com/ipa320/bride/raw/01bc5c83c895357f23a345ecec85a3796cf66358/org.ros.model.ros.diagram%2Fmodel%2Fros.gmftool", "sha": "b653b73c51ee3dad12c7bf06aeb4b1502e943b68", "status": "modified" }, { "additions": 8, "blob_url": "https://github.com/ipa320/bride/blob/01bc5c83c895357f23a345ecec85a3796cf66358/org.ros.model.ros.diagram%2Fplugin.properties", "changes": 12, "contents_url": "https://api.github.com/repos/ipa320/bride/contents/org.ros.model.ros.diagram%2Fplugin.properties?ref=01bc5c83c895357f23a345ecec85a3796cf66358", "deletions": 4, "filename": "org.ros.model.ros.diagram/plugin.properties", "new_code": "metatype.name.Node_2001=Node\nmetatype.name.Topic_2002=Topic\nmetatype.name.Service_2003=Service\nmetatype.name.Parameter_3001=Parameter\nmetatype.name.ServiceClient_4001=ServiceClient\nmetatype.name.Subscriber_4002=Subscriber\nmetatype.name.ServiceServer_4003=ServiceServer\nmetatype.name.Publisher_4004=Publisher", "new_methods": [], "old_code": "metatype.name.Topic_2001=Topic\nmetatype.name.Node_2002=Node\nmetatype.name.Subscriber_4001=Subscriber\nmetatype.name.Publisher_4002=Publisher", "old_methods": [], "patch": "@@ -31,10 +31,14 @@ prefpage.org.ros.model.ros.diagram.rulersAndGrid=Rulers And Grid\n \n # Providers\n metatype.name.Package_1000=Undefined\n-metatype.name.Topic_2001=Topic\n-metatype.name.Node_2002=Node\n-metatype.name.Subscriber_4001=Subscriber\n-metatype.name.Publisher_4002=Publisher\n+metatype.name.Node_2001=Node\n+metatype.name.Topic_2002=Topic\n+metatype.name.Service_2003=Service\n+metatype.name.Parameter_3001=Parameter\n+metatype.name.ServiceClient_4001=ServiceClient\n+metatype.name.Subscriber_4002=Subscriber\n+metatype.name.ServiceServer_4003=ServiceServer\n+metatype.name.Publisher_4004=Publisher\n \n # Commands and menu actions\n cmdcategory.name=Ros Editor Commands", "raw_url": "https://github.com/ipa320/bride/raw/01bc5c83c895357f23a345ecec85a3796cf66358/org.ros.model.ros.diagram%2Fplugin.properties", "sha": "20bd90e452d268133ac75299f6b4c8a4a30d7c75", "status": "modified" }, { "additions": 72, "blob_url": "https://github.com/ipa320/bride/blob/01bc5c83c895357f23a345ecec85a3796cf66358/org.ros.model.ros.diagram%2Fplugin.xml", "changes": 99, "contents_url": "https://api.github.com/repos/ipa320/bride/contents/org.ros.model.ros.diagram%2Fplugin.xml?ref=01bc5c83c895357f23a345ecec85a3796cf66358", "deletions": 27, "filename": "org.ros.model.ros.diagram/plugin.xml", "new_code": " <context viewClass=\"org.eclipse.gmf.runtime.notation.Node\" semanticHints=\"2001,2002,2003,3001\"/>\n <context viewClass=\"org.eclipse.gmf.runtime.notation.Edge\" semanticHints=\"4001,4002,4003,4004\"/>\n <method name=\"getType()\" value=\"2001,2002,2003,3001\"/>\n <method name=\"getType()\" value=\"4001,4002,4003,4004\"/>\n <method name=\"getType()\" value=\"5001,5002,5003\"/>\n <method name=\"getType()\" value=\"7001\"/>\n <object class=\"org.ros.model.ros.diagram.edit.parts.NodeEditPart\" id=\"Node_2001\"/>\n <object class=\"org.ros.model.ros.diagram.edit.parts.TopicEditPart\" id=\"Topic_2002\"/>\n <object class=\"org.ros.model.ros.diagram.edit.parts.ServiceEditPart\" id=\"Service_2003\"/>\n <context elements=\"Package_1000,Node_2001,Topic_2002,Service_2003\"/>\n id=\"org.ros.model.ros.diagram.Node_2001\"\n name=\"%metatype.name.Node_2001\"\n eclass=\"Node\"\n edithelper=\"org.ros.model.ros.diagram.edit.helpers.NodeEditHelper\">\n id=\"org.ros.model.ros.diagram.Topic_2002\"\n name=\"%metatype.name.Topic_2002\"\n eclass=\"Topic\"\n edithelper=\"org.ros.model.ros.diagram.edit.helpers.TopicEditHelper\">\n id=\"org.ros.model.ros.diagram.Service_2003\"\n name=\"%metatype.name.Service_2003\"\n kind=\"org.eclipse.gmf.runtime.emf.type.core.IHintedType\"\n eclass=\"Service\"\n edithelper=\"org.ros.model.ros.diagram.edit.helpers.ServiceEditHelper\">\n <param name=\"semanticHint\" value=\"2003\"/>\n </metamodelType>\n </metamodel>\n <metamodel nsURI=\"http://ros/1.0\">\n <metamodelType\n id=\"org.ros.model.ros.diagram.Parameter_3001\"\n name=\"%metatype.name.Parameter_3001\"\n kind=\"org.eclipse.gmf.runtime.emf.type.core.IHintedType\"\n eclass=\"Parameter\"\n edithelper=\"org.ros.model.ros.diagram.edit.helpers.ParameterEditHelper\">\n <param name=\"semanticHint\" value=\"3001\"/>\n </metamodelType>\n </metamodel>\n <metamodel nsURI=\"http://ros/1.0\">\n <metamodelType\n id=\"org.ros.model.ros.diagram.ServiceClient_4001\"\n name=\"%metatype.name.ServiceClient_4001\"\n kind=\"org.eclipse.gmf.runtime.emf.type.core.IHintedType\"\n eclass=\"ServiceClient\"\n edithelper=\"org.ros.model.ros.diagram.edit.helpers.ServiceClientEditHelper\">\n <param name=\"semanticHint\" value=\"4001\"/>\n </metamodelType>\n </metamodel>\n <metamodel nsURI=\"http://ros/1.0\">\n <metamodelType\n id=\"org.ros.model.ros.diagram.Subscriber_4002\"\n name=\"%metatype.name.Subscriber_4002\"\n <param name=\"semanticHint\" value=\"4002\"/>\n </metamodelType>\n </metamodel>\n <metamodel nsURI=\"http://ros/1.0\">\n <metamodelType\n id=\"org.ros.model.ros.diagram.ServiceServer_4003\"\n name=\"%metatype.name.ServiceServer_4003\"\n kind=\"org.eclipse.gmf.runtime.emf.type.core.IHintedType\"\n eclass=\"ServiceServer\"\n edithelper=\"org.ros.model.ros.diagram.edit.helpers.ServiceServerEditHelper\">\n <param name=\"semanticHint\" value=\"4003\"/>\n id=\"org.ros.model.ros.diagram.Publisher_4004\"\n name=\"%metatype.name.Publisher_4004\"\n <param name=\"semanticHint\" value=\"4004\"/>\n <elementType ref=\"org.ros.model.ros.diagram.Node_2001\"/>\n <elementType ref=\"org.ros.model.ros.diagram.Topic_2002\"/>\n <elementType ref=\"org.ros.model.ros.diagram.Service_2003\"/>\n <elementType ref=\"org.ros.model.ros.diagram.Parameter_3001\"/>\n <elementType ref=\"org.ros.model.ros.diagram.ServiceClient_4001\"/>\n <elementType ref=\"org.ros.model.ros.diagram.Subscriber_4002\"/>\n <elementType ref=\"org.ros.model.ros.diagram.ServiceServer_4003\"/>\n <elementType ref=\"org.ros.model.ros.diagram.Publisher_4004\"/>", "new_methods": [], "old_code": " <context viewClass=\"org.eclipse.gmf.runtime.notation.Node\" semanticHints=\"2001,2002\"/>\n <context viewClass=\"org.eclipse.gmf.runtime.notation.Edge\" semanticHints=\"4001,4002\"/>\n <method name=\"getType()\" value=\"2001,2002\"/>\n <method name=\"getType()\" value=\"4001,4002\"/>\n <method name=\"getType()\" value=\"5001,5002\"/>\n <method name=\"getType()\" value=\"\"/>\n <object class=\"org.ros.model.ros.diagram.edit.parts.TopicEditPart\" id=\"Topic_2001\"/>\n <object class=\"org.ros.model.ros.diagram.edit.parts.NodeEditPart\" id=\"Node_2002\"/>\n <context elements=\"Package_1000,Topic_2001,Node_2002\"/>\n id=\"org.ros.model.ros.diagram.Topic_2001\"\n name=\"%metatype.name.Topic_2001\"\n eclass=\"Topic\"\n edithelper=\"org.ros.model.ros.diagram.edit.helpers.TopicEditHelper\">\n id=\"org.ros.model.ros.diagram.Node_2002\"\n name=\"%metatype.name.Node_2002\"\n eclass=\"Node\"\n edithelper=\"org.ros.model.ros.diagram.edit.helpers.NodeEditHelper\">\n id=\"org.ros.model.ros.diagram.Subscriber_4001\"\n name=\"%metatype.name.Subscriber_4001\"\n <param name=\"semanticHint\" value=\"4001\"/>\n id=\"org.ros.model.ros.diagram.Publisher_4002\"\n name=\"%metatype.name.Publisher_4002\"\n <param name=\"semanticHint\" value=\"4002\"/>\n <elementType ref=\"org.ros.model.ros.diagram.Topic_2001\"/>\n <elementType ref=\"org.ros.model.ros.diagram.Node_2002\"/>\n <elementType ref=\"org.ros.model.ros.diagram.Subscriber_4001\"/>\n <elementType ref=\"org.ros.model.ros.diagram.Publisher_4002\"/>", "old_methods": [], "patch": "@@ -217,8 +217,8 @@\n <viewProvider class=\"org.ros.model.ros.diagram.providers.RosViewProvider\">\n <Priority name=\"Lowest\"/>\n <context viewClass=\"org.eclipse.gmf.runtime.notation.Diagram\" semanticHints=\"Ros\"/>\n- <context viewClass=\"org.eclipse.gmf.runtime.notation.Node\" semanticHints=\"2001,2002\"/>\n- <context viewClass=\"org.eclipse.gmf.runtime.notation.Edge\" semanticHints=\"4001,4002\"/>\n+ <context viewClass=\"org.eclipse.gmf.runtime.notation.Node\" semanticHints=\"2001,2002,2003,3001\"/>\n+ <context viewClass=\"org.eclipse.gmf.runtime.notation.Edge\" semanticHints=\"4001,4002,4003,4004\"/>\n </viewProvider>\n </extension>\n \n@@ -230,16 +230,16 @@\n <method name=\"getType()\" value=\"Ros\"/>\n </object>\n <object class=\"org.eclipse.gmf.runtime.notation.Node\" id=\"generated-nodes\">\n- <method name=\"getType()\" value=\"2001,2002\"/>\n+ <method name=\"getType()\" value=\"2001,2002,2003,3001\"/>\n </object>\n <object class=\"org.eclipse.gmf.runtime.notation.Edge\" id=\"generated-links\">\n- <method name=\"getType()\" value=\"4001,4002\"/>\n+ <method name=\"getType()\" value=\"4001,4002,4003,4004\"/>\n </object>\n <object class=\"org.eclipse.gmf.runtime.notation.Node\" id=\"generated-labels\">\n- <method name=\"getType()\" value=\"5001,5002\"/>\n+ <method name=\"getType()\" value=\"5001,5002,5003\"/>\n </object>\n <object class=\"org.eclipse.gmf.runtime.notation.Node\" id=\"generated-compartments\">\n- <method name=\"getType()\" value=\"\"/>\n+ <method name=\"getType()\" value=\"7001\"/>\n </object>\n <context views=\"generated-diagram,generated-nodes,generated-links,generated-labels,generated-compartments\"/>\n </editpartProvider>\n@@ -250,9 +250,10 @@\n <modelingAssistantProvider class=\"org.ros.model.ros.diagram.providers.RosModelingAssistantProvider\">\n <Priority name=\"Lowest\"/>\n <object class=\"org.ros.model.ros.diagram.edit.parts.PackageEditPart\" id=\"Package_1000\"/>\n- <object class=\"org.ros.model.ros.diagram.edit.parts.TopicEditPart\" id=\"Topic_2001\"/>\n- <object class=\"org.ros.model.ros.diagram.edit.parts.NodeEditPart\" id=\"Node_2002\"/>\n- <context elements=\"Package_1000,Topic_2001,Node_2002\"/>\n+ <object class=\"org.ros.model.ros.diagram.edit.parts.NodeEditPart\" id=\"Node_2001\"/>\n+ <object class=\"org.ros.model.ros.diagram.edit.parts.TopicEditPart\" id=\"Topic_2002\"/>\n+ <object class=\"org.ros.model.ros.diagram.edit.parts.ServiceEditPart\" id=\"Service_2003\"/>\n+ <context elements=\"Package_1000,Node_2001,Topic_2002,Service_2003\"/>\n </modelingAssistantProvider>\n </extension>\n \n@@ -284,42 +285,82 @@\n </metamodel>\n <metamodel nsURI=\"http://ros/1.0\">\n <metamodelType\n- id=\"org.ros.model.ros.diagram.Topic_2001\"\n- name=\"%metatype.name.Topic_2001\"\n+ id=\"org.ros.model.ros.diagram.Node_2001\"\n+ name=\"%metatype.name.Node_2001\"\n kind=\"org.eclipse.gmf.runtime.emf.type.core.IHintedType\"\n- eclass=\"Topic\"\n- edithelper=\"org.ros.model.ros.diagram.edit.helpers.TopicEditHelper\">\n+ eclass=\"Node\"\n+ edithelper=\"org.ros.model.ros.diagram.edit.helpers.NodeEditHelper\">\n <param name=\"semanticHint\" value=\"2001\"/>\n </metamodelType>\n </metamodel>\n <metamodel nsURI=\"http://ros/1.0\">\n <metamodelType\n- id=\"org.ros.model.ros.diagram.Node_2002\"\n- name=\"%metatype.name.Node_2002\"\n+ id=\"org.ros.model.ros.diagram.Topic_2002\"\n+ name=\"%metatype.name.Topic_2002\"\n kind=\"org.eclipse.gmf.runtime.emf.type.core.IHintedType\"\n- eclass=\"Node\"\n- edithelper=\"org.ros.model.ros.diagram.edit.helpers.NodeEditHelper\">\n+ eclass=\"Topic\"\n+ edithelper=\"org.ros.model.ros.diagram.edit.helpers.TopicEditHelper\">\n <param name=\"semanticHint\" value=\"2002\"/>\n </metamodelType>\n </metamodel>\n <metamodel nsURI=\"http://ros/1.0\">\n <metamodelType\n- id=\"org.ros.model.ros.diagram.Subscriber_4001\"\n- name=\"%metatype.name.Subscriber_4001\"\n+ id=\"org.ros.model.ros.diagram.Service_2003\"\n+ name=\"%metatype.name.Service_2003\"\n+ kind=\"org.eclipse.gmf.runtime.emf.type.core.IHintedType\"\n+ eclass=\"Service\"\n+ edithelper=\"org.ros.model.ros.diagram.edit.helpers.ServiceEditHelper\">\n+ <param name=\"semanticHint\" value=\"2003\"/>\n+ </metamodelType>\n+ </metamodel>\n+ <metamodel nsURI=\"http://ros/1.0\">\n+ <metamodelType\n+ id=\"org.ros.model.ros.diagram.Parameter_3001\"\n+ name=\"%metatype.name.Parameter_3001\"\n+ kind=\"org.eclipse.gmf.runtime.emf.type.core.IHintedType\"\n+ eclass=\"Parameter\"\n+ edithelper=\"org.ros.model.ros.diagram.edit.helpers.ParameterEditHelper\">\n+ <param name=\"semanticHint\" value=\"3001\"/>\n+ </metamodelType>\n+ </metamodel>\n+ <metamodel nsURI=\"http://ros/1.0\">\n+ <metamodelType\n+ id=\"org.ros.model.ros.diagram.ServiceClient_4001\"\n+ name=\"%metatype.name.ServiceClient_4001\"\n+ kind=\"org.eclipse.gmf.runtime.emf.type.core.IHintedType\"\n+ eclass=\"ServiceClient\"\n+ edithelper=\"org.ros.model.ros.diagram.edit.helpers.ServiceClientEditHelper\">\n+ <param name=\"semanticHint\" value=\"4001\"/>\n+ </metamodelType>\n+ </metamodel>\n+ <metamodel nsURI=\"http://ros/1.0\">\n+ <metamodelType\n+ id=\"org.ros.model.ros.diagram.Subscriber_4002\"\n+ name=\"%metatype.name.Subscriber_4002\"\n kind=\"org.eclipse.gmf.runtime.emf.type.core.IHintedType\"\n eclass=\"Subscriber\"\n edithelper=\"org.ros.model.ros.diagram.edit.helpers.SubscriberEditHelper\">\n- <param name=\"semanticHint\" value=\"4001\"/>\n+ <param name=\"semanticHint\" value=\"4002\"/>\n+ </metamodelType>\n+ </metamodel>\n+ <metamodel nsURI=\"http://ros/1.0\">\n+ <metamodelType\n+ id=\"org.ros.model.ros.diagram.ServiceServer_4003\"\n+ name=\"%metatype.name.ServiceServer_4003\"\n+ kind=\"org.eclipse.gmf.runtime.emf.type.core.IHintedType\"\n+ eclass=\"ServiceServer\"\n+ edithelper=\"org.ros.model.ros.diagram.edit.helpers.ServiceServerEditHelper\">\n+ <param name=\"semanticHint\" value=\"4003\"/>\n </metamodelType>\n </metamodel>\n <metamodel nsURI=\"http://ros/1.0\">\n <metamodelType\n- id=\"org.ros.model.ros.diagram.Publisher_4002\"\n- name=\"%metatype.name.Publisher_4002\"\n+ id=\"org.ros.model.ros.diagram.Publisher_4004\"\n+ name=\"%metatype.name.Publisher_4004\"\n kind=\"org.eclipse.gmf.runtime.emf.type.core.IHintedType\"\n eclass=\"Publisher\"\n edithelper=\"org.ros.model.ros.diagram.edit.helpers.PublisherEditHelper\">\n- <param name=\"semanticHint\" value=\"4002\"/>\n+ <param name=\"semanticHint\" value=\"4004\"/>\n </metamodelType>\n </metamodel>\n </extension>\n@@ -335,10 +376,14 @@\n </clientContext> \n <binding context=\"org.ros.model.ros.diagram.TypeContext\">\n <elementType ref=\"org.ros.model.ros.diagram.Package_1000\"/>\n- <elementType ref=\"org.ros.model.ros.diagram.Topic_2001\"/>\n- <elementType ref=\"org.ros.model.ros.diagram.Node_2002\"/>\n- <elementType ref=\"org.ros.model.ros.diagram.Subscriber_4001\"/>\n- <elementType ref=\"org.ros.model.ros.diagram.Publisher_4002\"/>\n+ <elementType ref=\"org.ros.model.ros.diagram.Node_2001\"/>\n+ <elementType ref=\"org.ros.model.ros.diagram.Topic_2002\"/>\n+ <elementType ref=\"org.ros.model.ros.diagram.Service_2003\"/>\n+ <elementType ref=\"org.ros.model.ros.diagram.Parameter_3001\"/>\n+ <elementType ref=\"org.ros.model.ros.diagram.ServiceClient_4001\"/>\n+ <elementType ref=\"org.ros.model.ros.diagram.Subscriber_4002\"/>\n+ <elementType ref=\"org.ros.model.ros.diagram.ServiceServer_4003\"/>\n+ <elementType ref=\"org.ros.model.ros.diagram.Publisher_4004\"/>\n <advice ref=\"org.eclipse.gmf.runtime.diagram.core.advice.notationDepdendents\"/>\n </binding>\n </extension>", "raw_url": "https://github.com/ipa320/bride/raw/01bc5c83c895357f23a345ecec85a3796cf66358/org.ros.model.ros.diagram%2Fplugin.xml", "sha": "6eca59f9b4e441c976c8203684a63f86ca89c133", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/ipa320/bride/blob/01bc5c83c895357f23a345ecec85a3796cf66358/org.ros.model.ros.diagram%2Fsrc%2Forg%2Fros%2Fmodel%2Fros%2Fdiagram%2Fedit%2Fcommands%2FPublisherCreateCommand.java", "changes": 2, "contents_url": "https://api.github.com/repos/ipa320/bride/contents/org.ros.model.ros.diagram%2Fsrc%2Forg%2Fros%2Fmodel%2Fros%2Fdiagram%2Fedit%2Fcommands%2FPublisherCreateCommand.java?ref=01bc5c83c895357f23a345ecec85a3796cf66358", "deletions": 1, "filename": "org.ros.model.ros.diagram/src/org/ros/model/ros/diagram/edit/commands/PublisherCreateCommand.java", "new_code": "\t\t\t\t.canCreatePublisher_4004(getSource(), getTarget());", "new_methods": [], "old_code": "\t\t\t\t.canCreatePublisher_4002(getSource(), getTarget());", "old_methods": [], "patch": "@@ -60,7 +60,7 @@ public boolean canExecute() {\n \t\t}\n \t\t// target may be null here but it's possible to check constraint\n \t\treturn RosBaseItemSemanticEditPolicy.getLinkConstraints()\n-\t\t\t\t.canCreatePublisher_4002(getSource(), getTarget());\n+\t\t\t\t.canCreatePublisher_4004(getSource(), getTarget());\n \t}\n \n \t/**", "raw_url": "https://github.com/ipa320/bride/raw/01bc5c83c895357f23a345ecec85a3796cf66358/org.ros.model.ros.diagram%2Fsrc%2Forg%2Fros%2Fmodel%2Fros%2Fdiagram%2Fedit%2Fcommands%2FPublisherCreateCommand.java", "sha": "e7917e59ed5947199ab5905538536937115e650d", "status": "modified" }, { "additions": 2, "blob_url": "https://github.com/ipa320/bride/blob/01bc5c83c895357f23a345ecec85a3796cf66358/org.ros.model.ros.diagram%2Fsrc%2Forg%2Fros%2Fmodel%2Fros%2Fdiagram%2Fedit%2Fcommands%2FPublisherReorientCommand.java", "changes": 4, "contents_url": "https://api.github.com/repos/ipa320/bride/contents/org.ros.model.ros.diagram%2Fsrc%2Forg%2Fros%2Fmodel%2Fros%2Fdiagram%2Fedit%2Fcommands%2FPublisherReorientCommand.java?ref=01bc5c83c895357f23a345ecec85a3796cf66358", "deletions": 2, "filename": "org.ros.model.ros.diagram/src/org/ros/model/ros/diagram/edit/commands/PublisherReorientCommand.java", "new_code": "\t\t\t\t.canExistPublisher_4004(getLink(), getNewSource(), target);\n\t\t\t\t.canExistPublisher_4004(getLink(), source, getNewTarget());", "new_methods": [], "old_code": "\t\t\t\t.canExistPublisher_4002(getLink(), getNewSource(), target);\n\t\t\t\t.canExistPublisher_4002(getLink(), source, getNewTarget());", "old_methods": [], "patch": "@@ -67,7 +67,7 @@ protected boolean canReorientSource() {\n \t\t}\n \t\tTopic target = getLink().getTopic();\n \t\treturn RosBaseItemSemanticEditPolicy.getLinkConstraints()\n-\t\t\t\t.canExistPublisher_4002(getLink(), getNewSource(), target);\n+\t\t\t\t.canExistPublisher_4004(getLink(), getNewSource(), target);\n \t}\n \n \t/**\n@@ -82,7 +82,7 @@ protected boolean canReorientTarget() {\n \t\t}\n \t\tNode source = (Node) getLink().eContainer();\n \t\treturn RosBaseItemSemanticEditPolicy.getLinkConstraints()\n-\t\t\t\t.canExistPublisher_4002(getLink(), source, getNewTarget());\n+\t\t\t\t.canExistPublisher_4004(getLink(), source, getNewTarget());\n \t}\n \n \t/**", "raw_url": "https://github.com/ipa320/bride/raw/01bc5c83c895357f23a345ecec85a3796cf66358/org.ros.model.ros.diagram%2Fsrc%2Forg%2Fros%2Fmodel%2Fros%2Fdiagram%2Fedit%2Fcommands%2FPublisherReorientCommand.java", "sha": "be2a4fe277d8c785f448e269b999e341d7363477", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/ipa320/bride/blob/01bc5c83c895357f23a345ecec85a3796cf66358/org.ros.model.ros.diagram%2Fsrc%2Forg%2Fros%2Fmodel%2Fros%2Fdiagram%2Fedit%2Fcommands%2FSubscriberCreateCommand.java", "changes": 2, "contents_url": "https://api.github.com/repos/ipa320/bride/contents/org.ros.model.ros.diagram%2Fsrc%2Forg%2Fros%2Fmodel%2Fros%2Fdiagram%2Fedit%2Fcommands%2FSubscriberCreateCommand.java?ref=01bc5c83c895357f23a345ecec85a3796cf66358", "deletions": 1, "filename": "org.ros.model.ros.diagram/src/org/ros/model/ros/diagram/edit/commands/SubscriberCreateCommand.java", "new_code": "\t\t\t\t.canCreateSubscriber_4002(getSource(), getTarget());", "new_methods": [], "old_code": "\t\t\t\t.canCreateSubscriber_4001(getSource(), getTarget());", "old_methods": [], "patch": "@@ -60,7 +60,7 @@ public boolean canExecute() {\n \t\t}\n \t\t// target may be null here but it's possible to check constraint\n \t\treturn RosBaseItemSemanticEditPolicy.getLinkConstraints()\n-\t\t\t\t.canCreateSubscriber_4001(getSource(), getTarget());\n+\t\t\t\t.canCreateSubscriber_4002(getSource(), getTarget());\n \t}\n \n \t/**", "raw_url": "https://github.com/ipa320/bride/raw/01bc5c83c895357f23a345ecec85a3796cf66358/org.ros.model.ros.diagram%2Fsrc%2Forg%2Fros%2Fmodel%2Fros%2Fdiagram%2Fedit%2Fcommands%2FSubscriberCreateCommand.java", "sha": "a07d32aacdcfb5f97af9cdb924c3a7e81b73a2f6", "status": "modified" }, { "additions": 2, "blob_url": "https://github.com/ipa320/bride/blob/01bc5c83c895357f23a345ecec85a3796cf66358/org.ros.model.ros.diagram%2Fsrc%2Forg%2Fros%2Fmodel%2Fros%2Fdiagram%2Fedit%2Fcommands%2FSubscriberReorientCommand.java", "changes": 4, "contents_url": "https://api.github.com/repos/ipa320/bride/contents/org.ros.model.ros.diagram%2Fsrc%2Forg%2Fros%2Fmodel%2Fros%2Fdiagram%2Fedit%2Fcommands%2FSubscriberReorientCommand.java?ref=01bc5c83c895357f23a345ecec85a3796cf66358", "deletions": 2, "filename": "org.ros.model.ros.diagram/src/org/ros/model/ros/diagram/edit/commands/SubscriberReorientCommand.java", "new_code": "\t\t\t\t.canExistSubscriber_4002(getLink(), getNewSource(), target);\n\t\t\t\t.canExistSubscriber_4002(getLink(), source, getNewTarget());", "new_methods": [], "old_code": "\t\t\t\t.canExistSubscriber_4001(getLink(), getNewSource(), target);\n\t\t\t\t.canExistSubscriber_4001(getLink(), source, getNewTarget());", "old_methods": [], "patch": "@@ -67,7 +67,7 @@ protected boolean canReorientSource() {\n \t\t}\n \t\tTopic target = getLink().getTopic();\n \t\treturn RosBaseItemSemanticEditPolicy.getLinkConstraints()\n-\t\t\t\t.canExistSubscriber_4001(getLink(), getNewSource(), target);\n+\t\t\t\t.canExistSubscriber_4002(getLink(), getNewSource(), target);\n \t}\n \n \t/**\n@@ -82,7 +82,7 @@ protected boolean canReorientTarget() {\n \t\t}\n \t\tNode source = (Node) getLink().eContainer();\n \t\treturn RosBaseItemSemanticEditPolicy.getLinkConstraints()\n-\t\t\t\t.canExistSubscriber_4001(getLink(), source, getNewTarget());\n+\t\t\t\t.canExistSubscriber_4002(getLink(), source, getNewTarget());\n \t}\n \n \t/**", "raw_url": "https://github.com/ipa320/bride/raw/01bc5c83c895357f23a345ecec85a3796cf66358/org.ros.model.ros.diagram%2Fsrc%2Forg%2Fros%2Fmodel%2Fros%2Fdiagram%2Fedit%2Fcommands%2FSubscriberReorientCommand.java", "sha": "f07651d25aed93f116461ab6adbf6c306da9cb1b", "status": "modified" }, { "additions": 5, "blob_url": "https://github.com/ipa320/bride/blob/01bc5c83c895357f23a345ecec85a3796cf66358/org.ros.model.ros.diagram%2Fsrc%2Forg%2Fros%2Fmodel%2Fros%2Fdiagram%2Fedit%2Fcommands%2FTopicCreateCommand.java", "changes": 6, "contents_url": "https://api.github.com/repos/ipa320/bride/contents/org.ros.model.ros.diagram%2Fsrc%2Forg%2Fros%2Fmodel%2Fros%2Fdiagram%2Fedit%2Fcommands%2FTopicCreateCommand.java?ref=01bc5c83c895357f23a345ecec85a3796cf66358", "deletions": 1, "filename": "org.ros.model.ros.diagram/src/org/ros/model/ros/diagram/edit/commands/TopicCreateCommand.java", "new_code": "\t\tPackage container = (Package) getElementToEdit();\n\t\tif (container.getTopic() != null) {\n\t\t\treturn false;\n\t\t}\n\t\towner.setTopic(newElement);", "new_methods": [], "old_code": "\t\towner.getTopic().add(newElement);", "old_methods": [], "patch": "@@ -44,6 +44,10 @@ protected EObject getElementToEdit() {\n \t * @generated\n \t */\n \tpublic boolean canExecute() {\n+\t\tPackage container = (Package) getElementToEdit();\n+\t\tif (container.getTopic() != null) {\n+\t\t\treturn false;\n+\t\t}\n \t\treturn true;\n \n \t}\n@@ -56,7 +60,7 @@ protected CommandResult doExecuteWithResult(IProgressMonitor monitor,\n \t\tTopic newElement = RosFactory.eINSTANCE.createTopic();\n \n \t\tPackage owner = (Package) getElementToEdit();\n-\t\towner.getTopic().add(newElement);\n+\t\towner.setTopic(newElement);\n \n \t\tdoConfigure(newElement, monitor, info);\n ", "raw_url": "https://github.com/ipa320/bride/raw/01bc5c83c895357f23a345ecec85a3796cf66358/org.ros.model.ros.diagram%2Fsrc%2Forg%2Fros%2Fmodel%2Fros%2Fdiagram%2Fedit%2Fcommands%2FTopicCreateCommand.java", "sha": "d546d5339aba301b6e5f289e60d110e3ac53cd3f", "status": "modified" }, { "additions": 115, "blob_url": "https://github.com/ipa320/bride/blob/01bc5c83c895357f23a345ecec85a3796cf66358/org.ros.model.ros.diagram%2Fsrc%2Forg%2Fros%2Fmodel%2Fros%2Fdiagram%2Fedit%2Fparts%2FNodeEditPart.java", "changes": 144, "contents_url": "https://api.github.com/repos/ipa320/bride/contents/org.ros.model.ros.diagram%2Fsrc%2Forg%2Fros%2Fmodel%2Fros%2Fdiagram%2Fedit%2Fparts%2FNodeEditPart.java?ref=01bc5c83c895357f23a345ecec85a3796cf66358", "deletions": 29, "filename": "org.ros.model.ros.diagram/src/org/ros/model/ros/diagram/edit/parts/NodeEditPart.java", "new_code": "import org.eclipse.draw2d.GridData;\nimport org.eclipse.draw2d.GridLayout;\nimport org.eclipse.gef.Request;\nimport org.eclipse.gef.editpolicies.NonResizableEditPolicy;\nimport org.eclipse.gmf.runtime.diagram.core.edithelpers.CreateElementRequestAdapter;\nimport org.eclipse.gmf.runtime.diagram.ui.editpolicies.CreationEditPolicy;\nimport org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewAndElementRequest;\n\tpublic static final int VISUAL_ID = 2001;\n\t\tinstallEditPolicy(EditPolicyRoles.CREATION_ROLE,\n\t\t\t\tnew CreationEditPolicy());\n\t\torg.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {\n\n\t\t\tprotected EditPolicy createChildEditPolicy(EditPart child) {\n\t\t\t\tEditPolicy result = child\n\t\t\t\t\t\t.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);\n\t\t\t\tif (result == null) {\n\t\t\t\t\tresult = new NonResizableEditPolicy();\n\t\t\t\t}\n\t\t\t\treturn result;\n\t\t\tprotected Command getMoveChildrenCommand(Request request) {\n\t\tif (childEditPart instanceof NodeParametersEditPart) {\n\t\t\tIFigure pane = getPrimaryShape()\n\t\t\t\t\t.getFigureParameterCompartmentFigure();\n\t\t\tsetupContentPane(pane); // FIXME each comparment should handle his content pane in his own way \n\t\t\tpane.add(((NodeParametersEditPart) childEditPart).getFigure());\n\t\t\treturn true;\n\t\t}\n\t\tif (childEditPart instanceof NodeParametersEditPart) {\n\t\t\tIFigure pane = getPrimaryShape()\n\t\t\t\t\t.getFigureParameterCompartmentFigure();\n\t\t\tsetupContentPane(pane); // FIXME each comparment should handle his content pane in his own way \n\t\t\tpane.remove(((NodeParametersEditPart) childEditPart).getFigure());\n\t\t\treturn true;\n\t\t}\n\t\tif (editPart instanceof NodeParametersEditPart) {\n\t\t\treturn getPrimaryShape().getFigureParameterCompartmentFigure();\n\t\t}\n\t\tArrayList<IElementType> types = new ArrayList<IElementType>(4);\n\t\ttypes.add(RosElementTypes.ServiceClient_4001);\n\t\ttypes.add(RosElementTypes.Subscriber_4002);\n\t\ttypes.add(RosElementTypes.ServiceServer_4003);\n\t\ttypes.add(RosElementTypes.Publisher_4004);\n\t\tif (targetEditPart instanceof ServiceEditPart) {\n\t\t\ttypes.add(RosElementTypes.ServiceClient_4001);\n\t\t}\n\t\t\ttypes.add(RosElementTypes.Subscriber_4002);\n\t\t}\n\t\tif (targetEditPart instanceof ServiceEditPart) {\n\t\t\ttypes.add(RosElementTypes.ServiceServer_4003);\n\t\t\ttypes.add(RosElementTypes.Publisher_4004);\n\t\tif (relationshipType == RosElementTypes.ServiceClient_4001) {\n\t\t\ttypes.add(RosElementTypes.Service_2003);\n\t\t} else if (relationshipType == RosElementTypes.Subscriber_4002) {\n\t\t\ttypes.add(RosElementTypes.Topic_2002);\n\t\t} else if (relationshipType == RosElementTypes.ServiceServer_4003) {\n\t\t\ttypes.add(RosElementTypes.Service_2003);\n\t\t} else if (relationshipType == RosElementTypes.Publisher_4004) {\n\t\t\ttypes.add(RosElementTypes.Topic_2002);\n\t/**\n\t * @generated\n\t */\n\tpublic EditPart getTargetEditPart(Request request) {\n\t\tif (request instanceof CreateViewAndElementRequest) {\n\t\t\tCreateElementRequestAdapter adapter = ((CreateViewAndElementRequest) request)\n\t\t\t\t\t.getViewAndElementDescriptor()\n\t\t\t\t\t.getCreateElementRequestAdapter();\n\t\t\tIElementType type = (IElementType) adapter\n\t\t\t\t\t.getAdapter(IElementType.class);\n\t\t\tif (type == RosElementTypes.Parameter_3001) {\n\t\t\t\treturn getChildBySemanticHint(RosVisualIDRegistry\n\t\t\t\t\t\t.getType(NodeParametersEditPart.VISUAL_ID));\n\t\t\t}\n\t\t}\n\t\treturn super.getTargetEditPart(request);\n\t}\n\n\t\t/**\n\t\t * @generated\n\t\t */\n\t\tprivate RectangleFigure fFigureParameterCompartmentFigure;\n\t\t\tGridLayout layoutThis = new GridLayout();\n\t\t\tlayoutThis.numColumns = 1;\n\t\t\tlayoutThis.makeColumnsEqualWidth = true;\n\t\t\tGridData constraintFFigureNodeNameFigure = new GridData();\n\t\t\tconstraintFFigureNodeNameFigure.verticalAlignment = GridData.BEGINNING;\n\t\t\tconstraintFFigureNodeNameFigure.horizontalAlignment = GridData.BEGINNING;\n\t\t\tconstraintFFigureNodeNameFigure.horizontalIndent = 0;\n\t\t\tconstraintFFigureNodeNameFigure.horizontalSpan = 1;\n\t\t\tconstraintFFigureNodeNameFigure.verticalSpan = 1;\n\t\t\tconstraintFFigureNodeNameFigure.grabExcessHorizontalSpace = false;\n\t\t\tconstraintFFigureNodeNameFigure.grabExcessVerticalSpace = false;\n\t\t\tthis.add(fFigureNodeNameFigure, constraintFFigureNodeNameFigure);\n\n\t\t\tfFigureParameterCompartmentFigure = new RectangleFigure();\n\n\t\t\tGridData constraintFFigureParameterCompartmentFigure = new GridData();\n\t\t\tconstraintFFigureParameterCompartmentFigure.verticalAlignment = GridData.FILL;\n\t\t\tconstraintFFigureParameterCompartmentFigure.horizontalAlignment = GridData.FILL;\n\t\t\tconstraintFFigureParameterCompartmentFigure.horizontalIndent = 0;\n\t\t\tconstraintFFigureParameterCompartmentFigure.horizontalSpan = 1;\n\t\t\tconstraintFFigureParameterCompartmentFigure.verticalSpan = 1;\n\t\t\tconstraintFFigureParameterCompartmentFigure.grabExcessHorizontalSpace = true;\n\t\t\tconstraintFFigureParameterCompartmentFigure.grabExcessVerticalSpace = true;\n\t\t\tthis.add(fFigureParameterCompartmentFigure,\n\t\t\t\t\tconstraintFFigureParameterCompartmentFigure);\n\n\t\t\tfFigureParameterCompartmentFigure\n\t\t\t\t\t.setLayoutManager(new StackLayout());\n\t\t/**\n\t\t * @generated\n\t\t */\n\t\tpublic RectangleFigure getFigureParameterCompartmentFigure() {\n\t\t\treturn fFigureParameterCompartmentFigure;\n\t\t}\n", "new_methods": [ { "arguments": [ "EditPart child" ], "filename": "org.ros.model.ros.diagram/src/org/ros/model/ros/diagram/edit/parts/NodeEditPart.java", "implementation": "EditPolicy result = child\n\t\t\t\t\t\t.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);\n\t\t\t\tif (result == null) {\n\t\t\t\t\tresult = new NonResizableEditPolicy();", "signature": "EditPolicy createChildEditPolicy(EditPart child)" }, { "arguments": [ "Request request" ], "filename": "org.ros.model.ros.diagram/src/org/ros/model/ros/diagram/edit/parts/NodeEditPart.java", "implementation": "if (childEditPart instanceof NodeParametersEditPart) {\n\t\t\tIFigure pane = getPrimaryShape()\n\t\t\t\t\t.getFigureParameterCompartmentFigure();\n\t\t\tsetupContentPane(pane); // FIXME each comparment should handle his content pane in his own way \n\t\t\tpane.add(((NodeParametersEditPart) childEditPart).getFigure());\n\t\t\treturn true;", "signature": "Command getMoveChildrenCommand(Request request)" }, { "arguments": [ "relationshipType == RosElementTypes.Subscriber_4002" ], "filename": "org.ros.model.ros.diagram/src/org/ros/model/ros/diagram/edit/parts/NodeEditPart.java", "implementation": "types.add(RosElementTypes.Topic_2002);", "signature": "else if (relationshipType == RosElementTypes.Subscriber_4002)" }, { "arguments": [ "relationshipType == RosElementTypes.ServiceServer_4003" ], "filename": "org.ros.model.ros.diagram/src/org/ros/model/ros/diagram/edit/parts/NodeEditPart.java", "implementation": "types.add(RosElementTypes.Service_2003);", "signature": "else if (relationshipType == RosElementTypes.ServiceServer_4003)" }, { "arguments": [ "relationshipType == RosElementTypes.Publisher_4004" ], "filename": "org.ros.model.ros.diagram/src/org/ros/model/ros/diagram/edit/parts/NodeEditPart.java", "implementation": "types.add(RosElementTypes.Topic_2002);\n\t/**\n\t * @generated\n\t */\n\tpublic EditPart getTargetEditPart(Request request) {\n\t\tif (request instanceof CreateViewAndElementRequest) {\n\t\t\tCreateElementRequestAdapter adapter = ((CreateViewAndElementRequest) request)\n\t\t\t\t\t.getViewAndElementDescriptor()\n\t\t\t\t\t.getCreateElementRequestAdapter();\n\t\t\tIElementType type = (IElementType) adapter\n\t\t\t\t\t.getAdapter(IElementType.class);\n\t\t\tif (type == RosElementTypes.Parameter_3001) {\n\t\t\t\treturn getChildBySemanticHint(RosVisualIDRegistry\n\t\t\t\t\t\t.getType(NodeParametersEditPart.VISUAL_ID));", "signature": "else if (relationshipType == RosElementTypes.Publisher_4004)" }, { "arguments": [], "filename": "org.ros.model.ros.diagram/src/org/ros/model/ros/diagram/edit/parts/NodeEditPart.java", "implementation": "return fFigureParameterCompartmentFigure;", "signature": "RectangleFigure getFigureParameterCompartmentFigure()" } ], "old_code": "import org.eclipse.draw2d.FlowLayout;\nimport org.eclipse.gmf.runtime.diagram.ui.editpolicies.FlowLayoutEditPolicy;\n\tpublic static final int VISUAL_ID = 2002;\n\n\t\tFlowLayoutEditPolicy lep = new FlowLayoutEditPolicy() {\n\n\t\t\tprotected Command createAddCommand(EditPart child, EditPart after) {\n\t\t\t\treturn null;\n\t\t\tprotected Command createMoveChildCommand(EditPart child,\n\t\t\t\t\tEditPart after) {\n\t\tArrayList<IElementType> types = new ArrayList<IElementType>(2);\n\t\ttypes.add(RosElementTypes.Subscriber_4001);\n\t\ttypes.add(RosElementTypes.Publisher_4002);\n\t\t\ttypes.add(RosElementTypes.Subscriber_4001);\n\t\t\ttypes.add(RosElementTypes.Publisher_4002);\n\t\tif (relationshipType == RosElementTypes.Subscriber_4001) {\n\t\t\ttypes.add(RosElementTypes.Topic_2001);\n\t\t} else if (relationshipType == RosElementTypes.Publisher_4002) {\n\t\t\ttypes.add(RosElementTypes.Topic_2001);\n\t\t\tFlowLayout layoutThis = new FlowLayout();\n\t\t\tlayoutThis.setStretchMinorAxis(false);\n\t\t\tlayoutThis.setMinorAlignment(FlowLayout.ALIGN_LEFTTOP);\n\n\t\t\tlayoutThis.setMajorAlignment(FlowLayout.ALIGN_LEFTTOP);\n\t\t\tlayoutThis.setMajorSpacing(5);\n\t\t\tlayoutThis.setMinorSpacing(5);\n\t\t\tlayoutThis.setHorizontal(true);\n\n\t\t\tthis.add(fFigureNodeNameFigure);", "old_methods": [ { "arguments": [], "filename": "org.ros.model.ros.diagram/src/org/ros/model/ros/diagram/edit/parts/NodeEditPart.java", "implementation": "protected Command createAddCommand(EditPart child, EditPart after) {\n\t\t\t\treturn null;\n\t\t\tprotected Command createMoveChildCommand(EditPart child,\n\t\t\t\t\tEditPart after) {\n\t\tArrayList<IElementType> types = new ArrayList<IElementType>(2);\n\t\ttypes.add(RosElementTypes.Subscriber_4001);\n\t\ttypes.add(RosElementTypes.Publisher_4002);\n\t\t\ttypes.add(RosElementTypes.Subscriber_4001);\n\t\t\ttypes.add(RosElementTypes.Publisher_4002);\n\t\tif (relationshipType == RosElementTypes.Subscriber_4001) {\n\t\t\ttypes.add(RosElementTypes.Topic_2001);", "signature": "new FlowLayoutEditPolicy()" } ], "patch": "@@ -4,20 +4,25 @@\n import java.util.LinkedList;\n import java.util.List;\n \n-import org.eclipse.draw2d.FlowLayout;\n+import org.eclipse.draw2d.GridData;\n+import org.eclipse.draw2d.GridLayout;\n import org.eclipse.draw2d.IFigure;\n import org.eclipse.draw2d.RectangleFigure;\n import org.eclipse.draw2d.Shape;\n import org.eclipse.draw2d.StackLayout;\n import org.eclipse.gef.EditPart;\n import org.eclipse.gef.EditPolicy;\n+import org.eclipse.gef.Request;\n import org.eclipse.gef.commands.Command;\n import org.eclipse.gef.editpolicies.LayoutEditPolicy;\n+import org.eclipse.gef.editpolicies.NonResizableEditPolicy;\n import org.eclipse.gef.requests.CreateRequest;\n+import org.eclipse.gmf.runtime.diagram.core.edithelpers.CreateElementRequestAdapter;\n import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;\n import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeNodeEditPart;\n+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CreationEditPolicy;\n import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;\n-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.FlowLayoutEditPolicy;\n+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewAndElementRequest;\n import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;\n import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;\n import org.eclipse.gmf.runtime.emf.type.core.IElementType;\n@@ -36,7 +41,7 @@ public class NodeEditPart extends ShapeNodeEditPart {\n \t/**\n \t * @generated\n \t */\n-\tpublic static final int VISUAL_ID = 2002;\n+\tpublic static final int VISUAL_ID = 2001;\n \n \t/**\n \t * @generated\n@@ -59,6 +64,8 @@ public NodeEditPart(View view) {\n \t * @generated\n \t */\n \tprotected void createDefaultEditPolicies() {\n+\t\tinstallEditPolicy(EditPolicyRoles.CREATION_ROLE,\n+\t\t\t\tnew CreationEditPolicy());\n \t\tsuper.createDefaultEditPolicies();\n \t\tinstallEditPolicy(EditPolicyRoles.SEMANTIC_ROLE,\n \t\t\t\tnew NodeItemSemanticEditPolicy());\n@@ -71,15 +78,18 @@ protected void createDefaultEditPolicies() {\n \t * @generated\n \t */\n \tprotected LayoutEditPolicy createLayoutEditPolicy() {\n-\n-\t\tFlowLayoutEditPolicy lep = new FlowLayoutEditPolicy() {\n-\n-\t\t\tprotected Command createAddCommand(EditPart child, EditPart after) {\n-\t\t\t\treturn null;\n+\t\torg.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {\n+\n+\t\t\tprotected EditPolicy createChildEditPolicy(EditPart child) {\n+\t\t\t\tEditPolicy result = child\n+\t\t\t\t\t\t.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);\n+\t\t\t\tif (result == null) {\n+\t\t\t\t\tresult = new NonResizableEditPolicy();\n+\t\t\t\t}\n+\t\t\t\treturn result;\n \t\t\t}\n \n-\t\t\tprotected Command createMoveChildCommand(EditPart child,\n-\t\t\t\t\tEditPart after) {\n+\t\t\tprotected Command getMoveChildrenCommand(Request request) {\n \t\t\t\treturn null;\n \t\t\t}\n \n@@ -113,6 +123,13 @@ protected boolean addFixedChild(EditPart childEditPart) {\n \t\t\t\t\t.getFigureNodeNameFigure());\n \t\t\treturn true;\n \t\t}\n+\t\tif (childEditPart instanceof NodeParametersEditPart) {\n+\t\t\tIFigure pane = getPrimaryShape()\n+\t\t\t\t\t.getFigureParameterCompartmentFigure();\n+\t\t\tsetupContentPane(pane); // FIXME each comparment should handle his content pane in his own way \n+\t\t\tpane.add(((NodeParametersEditPart) childEditPart).getFigure());\n+\t\t\treturn true;\n+\t\t}\n \t\treturn false;\n \t}\n \n@@ -123,6 +140,13 @@ protected boolean removeFixedChild(EditPart childEditPart) {\n \t\tif (childEditPart instanceof NodeNameEditPart) {\n \t\t\treturn true;\n \t\t}\n+\t\tif (childEditPart instanceof NodeParametersEditPart) {\n+\t\t\tIFigure pane = getPrimaryShape()\n+\t\t\t\t\t.getFigureParameterCompartmentFigure();\n+\t\t\tsetupContentPane(pane); // FIXME each comparment should handle his content pane in his own way \n+\t\t\tpane.remove(((NodeParametersEditPart) childEditPart).getFigure());\n+\t\t\treturn true;\n+\t\t}\n \t\treturn false;\n \t}\n \n@@ -150,6 +174,9 @@ protected void removeChildVisual(EditPart childEditPart) {\n \t * @generated\n \t */\n \tprotected IFigure getContentPaneFor(IGraphicalEditPart editPart) {\n+\t\tif (editPart instanceof NodeParametersEditPart) {\n+\t\t\treturn getPrimaryShape().getFigureParameterCompartmentFigure();\n+\t\t}\n \t\treturn getContentPane();\n \t}\n \n@@ -251,9 +278,11 @@ public EditPart getPrimaryChildEditPart() {\n \t * @generated\n \t */\n \tpublic List<IElementType> getMARelTypesOnSource() {\n-\t\tArrayList<IElementType> types = new ArrayList<IElementType>(2);\n-\t\ttypes.add(RosElementTypes.Subscriber_4001);\n-\t\ttypes.add(RosElementTypes.Publisher_4002);\n+\t\tArrayList<IElementType> types = new ArrayList<IElementType>(4);\n+\t\ttypes.add(RosElementTypes.ServiceClient_4001);\n+\t\ttypes.add(RosElementTypes.Subscriber_4002);\n+\t\ttypes.add(RosElementTypes.ServiceServer_4003);\n+\t\ttypes.add(RosElementTypes.Publisher_4004);\n \t\treturn types;\n \t}\n \n@@ -263,11 +292,17 @@ public List<IElementType> getMARelTypesOnSource() {\n \tpublic List<IElementType> getMARelTypesOnSourceAndTarget(\n \t\t\tIGraphicalEditPart targetEditPart) {\n \t\tLinkedList<IElementType> types = new LinkedList<IElementType>();\n+\t\tif (targetEditPart instanceof ServiceEditPart) {\n+\t\t\ttypes.add(RosElementTypes.ServiceClient_4001);\n+\t\t}\n \t\tif (targetEditPart instanceof TopicEditPart) {\n-\t\t\ttypes.add(RosElementTypes.Subscriber_4001);\n+\t\t\ttypes.add(RosElementTypes.Subscriber_4002);\n+\t\t}\n+\t\tif (targetEditPart instanceof ServiceEditPart) {\n+\t\t\ttypes.add(RosElementTypes.ServiceServer_4003);\n \t\t}\n \t\tif (targetEditPart instanceof TopicEditPart) {\n-\t\t\ttypes.add(RosElementTypes.Publisher_4002);\n+\t\t\ttypes.add(RosElementTypes.Publisher_4004);\n \t\t}\n \t\treturn types;\n \t}\n@@ -277,14 +312,36 @@ public List<IElementType> getMARelTypesOnSourceAndTarget(\n \t */\n \tpublic List<IElementType> getMATypesForTarget(IElementType relationshipType) {\n \t\tLinkedList<IElementType> types = new LinkedList<IElementType>();\n-\t\tif (relationshipType == RosElementTypes.Subscriber_4001) {\n-\t\t\ttypes.add(RosElementTypes.Topic_2001);\n-\t\t} else if (relationshipType == RosElementTypes.Publisher_4002) {\n-\t\t\ttypes.add(RosElementTypes.Topic_2001);\n+\t\tif (relationshipType == RosElementTypes.ServiceClient_4001) {\n+\t\t\ttypes.add(RosElementTypes.Service_2003);\n+\t\t} else if (relationshipType == RosElementTypes.Subscriber_4002) {\n+\t\t\ttypes.add(RosElementTypes.Topic_2002);\n+\t\t} else if (relationshipType == RosElementTypes.ServiceServer_4003) {\n+\t\t\ttypes.add(RosElementTypes.Service_2003);\n+\t\t} else if (relationshipType == RosElementTypes.Publisher_4004) {\n+\t\t\ttypes.add(RosElementTypes.Topic_2002);\n \t\t}\n \t\treturn types;\n \t}\n \n+\t/**\n+\t * @generated\n+\t */\n+\tpublic EditPart getTargetEditPart(Request request) {\n+\t\tif (request instanceof CreateViewAndElementRequest) {\n+\t\t\tCreateElementRequestAdapter adapter = ((CreateViewAndElementRequest) request)\n+\t\t\t\t\t.getViewAndElementDescriptor()\n+\t\t\t\t\t.getCreateElementRequestAdapter();\n+\t\t\tIElementType type = (IElementType) adapter\n+\t\t\t\t\t.getAdapter(IElementType.class);\n+\t\t\tif (type == RosElementTypes.Parameter_3001) {\n+\t\t\t\treturn getChildBySemanticHint(RosVisualIDRegistry\n+\t\t\t\t\t\t.getType(NodeParametersEditPart.VISUAL_ID));\n+\t\t\t}\n+\t\t}\n+\t\treturn super.getTargetEditPart(request);\n+\t}\n+\n \t/**\n \t * @generated\n \t */\n@@ -294,21 +351,19 @@ public class NodeFigure extends RectangleFigure {\n \t\t * @generated\n \t\t */\n \t\tprivate WrappingLabel fFigureNodeNameFigure;\n+\t\t/**\n+\t\t * @generated\n+\t\t */\n+\t\tprivate RectangleFigure fFigureParameterCompartmentFigure;\n \n \t\t/**\n \t\t * @generated\n \t\t */\n \t\tpublic NodeFigure() {\n \n-\t\t\tFlowLayout layoutThis = new FlowLayout();\n-\t\t\tlayoutThis.setStretchMinorAxis(false);\n-\t\t\tlayoutThis.setMinorAlignment(FlowLayout.ALIGN_LEFTTOP);\n-\n-\t\t\tlayoutThis.setMajorAlignment(FlowLayout.ALIGN_LEFTTOP);\n-\t\t\tlayoutThis.setMajorSpacing(5);\n-\t\t\tlayoutThis.setMinorSpacing(5);\n-\t\t\tlayoutThis.setHorizontal(true);\n-\n+\t\t\tGridLayout layoutThis = new GridLayout();\n+\t\t\tlayoutThis.numColumns = 1;\n+\t\t\tlayoutThis.makeColumnsEqualWidth = true;\n \t\t\tthis.setLayoutManager(layoutThis);\n \n \t\t\tcreateContents();\n@@ -322,7 +377,31 @@ private void createContents() {\n \t\t\tfFigureNodeNameFigure = new WrappingLabel();\n \t\t\tfFigureNodeNameFigure.setText(\"<...>\");\n \n-\t\t\tthis.add(fFigureNodeNameFigure);\n+\t\t\tGridData constraintFFigureNodeNameFigure = new GridData();\n+\t\t\tconstraintFFigureNodeNameFigure.verticalAlignment = GridData.BEGINNING;\n+\t\t\tconstraintFFigureNodeNameFigure.horizontalAlignment = GridData.BEGINNING;\n+\t\t\tconstraintFFigureNodeNameFigure.horizontalIndent = 0;\n+\t\t\tconstraintFFigureNodeNameFigure.horizontalSpan = 1;\n+\t\t\tconstraintFFigureNodeNameFigure.verticalSpan = 1;\n+\t\t\tconstraintFFigureNodeNameFigure.grabExcessHorizontalSpace = false;\n+\t\t\tconstraintFFigureNodeNameFigure.grabExcessVerticalSpace = false;\n+\t\t\tthis.add(fFigureNodeNameFigure, constraintFFigureNodeNameFigure);\n+\n+\t\t\tfFigureParameterCompartmentFigure = new RectangleFigure();\n+\n+\t\t\tGridData constraintFFigureParameterCompartmentFigure = new GridData();\n+\t\t\tconstraintFFigureParameterCompartmentFigure.verticalAlignment = GridData.FILL;\n+\t\t\tconstraintFFigureParameterCompartmentFigure.horizontalAlignment = GridData.FILL;\n+\t\t\tconstraintFFigureParameterCompartmentFigure.horizontalIndent = 0;\n+\t\t\tconstraintFFigureParameterCompartmentFigure.horizontalSpan = 1;\n+\t\t\tconstraintFFigureParameterCompartmentFigure.verticalSpan = 1;\n+\t\t\tconstraintFFigureParameterCompartmentFigure.grabExcessHorizontalSpace = true;\n+\t\t\tconstraintFFigureParameterCompartmentFigure.grabExcessVerticalSpace = true;\n+\t\t\tthis.add(fFigureParameterCompartmentFigure,\n+\t\t\t\t\tconstraintFFigureParameterCompartmentFigure);\n+\n+\t\t\tfFigureParameterCompartmentFigure\n+\t\t\t\t\t.setLayoutManager(new StackLayout());\n \n \t\t}\n \n@@ -333,6 +412,13 @@ public WrappingLabel getFigureNodeNameFigure() {\n \t\t\treturn fFigureNodeNameFigure;\n \t\t}\n \n+\t\t/**\n+\t\t * @generated\n+\t\t */\n+\t\tpublic RectangleFigure getFigureParameterCompartmentFigure() {\n+\t\t\treturn fFigureParameterCompartmentFigure;\n+\t\t}\n+\n \t}\n \n }", "raw_url": "https://github.com/ipa320/bride/raw/01bc5c83c895357f23a345ecec85a3796cf66358/org.ros.model.ros.diagram%2Fsrc%2Forg%2Fros%2Fmodel%2Fros%2Fdiagram%2Fedit%2Fparts%2FNodeEditPart.java", "sha": "435c79aea640fde2dfca524aafa670fdc01a4d9b", "status": "modified" }, { "additions": 2, "blob_url": "https://github.com/ipa320/bride/blob/01bc5c83c895357f23a345ecec85a3796cf66358/org.ros.model.ros.diagram%2Fsrc%2Forg%2Fros%2Fmodel%2Fros%2Fdiagram%2Fedit%2Fparts%2FNodeNameEditPart.java", "changes": 4, "contents_url": "https://api.github.com/repos/ipa320/bride/contents/org.ros.model.ros.diagram%2Fsrc%2Forg%2Fros%2Fmodel%2Fros%2Fdiagram%2Fedit%2Fparts%2FNodeNameEditPart.java?ref=01bc5c83c895357f23a345ecec85a3796cf66358", "deletions": 2, "filename": "org.ros.model.ros.diagram/src/org/ros/model/ros/diagram/edit/parts/NodeNameEditPart.java", "new_code": "\tpublic static final int VISUAL_ID = 5001;\n\t\t\t\t\t\t\tRosElementTypes.Node_2001,", "new_methods": [], "old_code": "\tpublic static final int VISUAL_ID = 5002;\n\t\t\t\t\t\t\tRosElementTypes.Node_2002,", "old_methods": [], "patch": "@@ -52,7 +52,7 @@ public class NodeNameEditPart extends CompartmentEditPart implements\n \t/**\n \t * @generated\n \t */\n-\tpublic static final int VISUAL_ID = 5002;\n+\tpublic static final int VISUAL_ID = 5001;\n \n \t/**\n \t * @generated\n@@ -294,7 +294,7 @@ public IParser getParser() {\n \t\tif (parser == null) {\n \t\t\tparser = RosParserProvider\n \t\t\t\t\t.getParser(\n-\t\t\t\t\t\t\tRosElementTypes.Node_2002,\n+\t\t\t\t\t\t\tRosElementTypes.Node_2001,\n \t\t\t\t\t\t\tgetParserElement(),\n \t\t\t\t\t\t\tRosVisualIDRegistry\n \t\t\t\t\t\t\t\t\t.getType(org.ros.model.ros.diagram.edit.parts.NodeNameEditPart.VISUAL_ID));", "raw_url": "https://github.com/ipa320/bride/raw/01bc5c83c895357f23a345ecec85a3796cf66358/org.ros.model.ros.diagram%2Fsrc%2Forg%2Fros%2Fmodel%2Fros%2Fdiagram%2Fedit%2Fparts%2FNodeNameEditPart.java", "sha": "6cd8ef21c826c02819adfd96ccf5c0cf32b2bfc5", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/ipa320/bride/blob/01bc5c83c895357f23a345ecec85a3796cf66358/org.ros.model.ros.diagram%2Fsrc%2Forg%2Fros%2Fmodel%2Fros%2Fdiagram%2Fedit%2Fparts%2FPublisherEditPart.java", "changes": 2, "contents_url": "https://api.github.com/repos/ipa320/bride/contents/org.ros.model.ros.diagram%2Fsrc%2Forg%2Fros%2Fmodel%2Fros%2Fdiagram%2Fedit%2Fparts%2FPublisherEditPart.java?ref=01bc5c83c895357f23a345ecec85a3796cf66358", "deletions": 1, "filename": "org.ros.model.ros.diagram/src/org/ros/model/ros/diagram/edit/parts/PublisherEditPart.java", "new_code": "\tpublic static final int VISUAL_ID = 4004;", "new_methods": [], "old_code": "\tpublic static final int VISUAL_ID = 4002;", "old_methods": [], "patch": "@@ -19,7 +19,7 @@ public class PublisherEditPart extends ConnectionNodeEditPart implements\n \t/**\n \t * @generated\n \t */\n-\tpublic static final int VISUAL_ID = 4002;\n+\tpublic static final int VISUAL_ID = 4004;\n \n \t/**\n \t * @generated", "raw_url": "https://github.com/ipa320/bride/raw/01bc5c83c895357f23a345ecec85a3796cf66358/org.ros.model.ros.diagram%2Fsrc%2Forg%2Fros%2Fmodel%2Fros%2Fdiagram%2Fedit%2Fparts%2FPublisherEditPart.java", "sha": "df0c2574a3cd972f2bdc89d6edf11632e9696325", "status": "modified" }, { "additions": 2, "blob_url": "https://github.com/ipa320/bride/blob/01bc5c83c895357f23a345ecec85a3796cf66358/org.ros.model.ros.diagram%2Fsrc%2Forg%2Fros%2Fmodel%2Fros%2Fdiagram%2Fedit%2Fparts%2FPublisherNameEditPart.java", "changes": 4, "contents_url": "https://api.github.com/repos/ipa320/bride/contents/org.ros.model.ros.diagram%2Fsrc%2Forg%2Fros%2Fmodel%2Fros%2Fdiagram%2Fedit%2Fparts%2FPublisherNameEditPart.java?ref=01bc5c83c895357f23a345ecec85a3796cf66358", "deletions": 2, "filename": "org.ros.model.ros.diagram/src/org/ros/model/ros/diagram/edit/parts/PublisherNameEditPart.java", "new_code": "\tpublic static final int VISUAL_ID = 6004;\n\t\t\t\t\t\t\tRosElementTypes.Publisher_4004,", "new_methods": [], "old_code": "\tpublic static final int VISUAL_ID = 6002;\n\t\t\t\t\t\t\tRosElementTypes.Publisher_4002,", "old_methods": [], "patch": "@@ -53,7 +53,7 @@ public class PublisherNameEditPart extends LabelEditPart implements\n \t/**\n \t * @generated\n \t */\n-\tpublic static final int VISUAL_ID = 6002;\n+\tpublic static final int VISUAL_ID = 6004;\n \n \t/**\n \t * @generated\n@@ -312,7 +312,7 @@ public IParser getParser() {\n \t\tif (parser == null) {\n \t\t\tparser = RosParserProvider\n \t\t\t\t\t.getParser(\n-\t\t\t\t\t\t\tRosElementTypes.Publisher_4002,\n+\t\t\t\t\t\t\tRosElementTypes.Publisher_4004,\n \t\t\t\t\t\t\tgetParserElement(),\n \t\t\t\t\t\t\tRosVisualIDRegistry\n \t\t\t\t\t\t\t\t\t.getType(org.ros.model.ros.diagram.edit.parts.PublisherNameEditPart.VISUAL_ID));", "raw_url": "https://github.com/ipa320/bride/raw/01bc5c83c895357f23a345ecec85a3796cf66358/org.ros.model.ros.diagram%2Fsrc%2Forg%2Fros%2Fmodel%2Fros%2Fdiagram%2Fedit%2Fparts%2FPublisherNameEditPart.java", "sha": "8a25fa1bd1e65c34de437a76b624b56329b44978", "status": "modified" }, { "additions": 28, "blob_url": "https://github.com/ipa320/bride/blob/01bc5c83c895357f23a345ecec85a3796cf66358/org.ros.model.ros.diagram%2Fsrc%2Forg%2Fros%2Fmodel%2Fros%2Fdiagram%2Fedit%2Fparts%2FRosEditPartFactory.java", "changes": 32, "contents_url": "https://api.github.com/repos/ipa320/bride/contents/org.ros.model.ros.diagram%2Fsrc%2Forg%2Fros%2Fmodel%2Fros%2Fdiagram%2Fedit%2Fparts%2FRosEditPartFactory.java?ref=01bc5c83c895357f23a345ecec85a3796cf66358", "deletions": 4, "filename": "org.ros.model.ros.diagram/src/org/ros/model/ros/diagram/edit/parts/RosEditPartFactory.java", "new_code": "\t\t\tcase NodeEditPart.VISUAL_ID:\n\t\t\t\treturn new NodeEditPart(view);\n\n\t\t\tcase NodeNameEditPart.VISUAL_ID:\n\t\t\t\treturn new NodeNameEditPart(view);\n\n\t\t\tcase ServiceEditPart.VISUAL_ID:\n\t\t\t\treturn new ServiceEditPart(view);\n\t\t\tcase ServiceNameEditPart.VISUAL_ID:\n\t\t\t\treturn new ServiceNameEditPart(view);\n\n\t\t\tcase ParameterEditPart.VISUAL_ID:\n\t\t\t\treturn new ParameterEditPart(view);\n\n\t\t\tcase NodeParametersEditPart.VISUAL_ID:\n\t\t\t\treturn new NodeParametersEditPart(view);\n\n\t\t\tcase ServiceClientEditPart.VISUAL_ID:\n\t\t\t\treturn new ServiceClientEditPart(view);\n\n\t\t\tcase ServiceClientNameEditPart.VISUAL_ID:\n\t\t\t\treturn new ServiceClientNameEditPart(view);\n\t\t\tcase ServiceServerEditPart.VISUAL_ID:\n\t\t\t\treturn new ServiceServerEditPart(view);\n\n\t\t\tcase ServiceServerNameEditPart.VISUAL_ID:\n\t\t\t\treturn new ServiceServerNameEditPart(view);\n", "new_methods": [], "old_code": "\t\t\tcase NodeEditPart.VISUAL_ID:\n\t\t\t\treturn new NodeEditPart(view);\n\t\t\tcase NodeNameEditPart.VISUAL_ID:\n\t\t\t\treturn new NodeNameEditPart(view);", "old_methods": [], "patch": "@@ -31,24 +31,48 @@ public EditPart createEditPart(EditPart context, Object model) {\n \t\t\tcase PackageEditPart.VISUAL_ID:\n \t\t\t\treturn new PackageEditPart(view);\n \n+\t\t\tcase NodeEditPart.VISUAL_ID:\n+\t\t\t\treturn new NodeEditPart(view);\n+\n+\t\t\tcase NodeNameEditPart.VISUAL_ID:\n+\t\t\t\treturn new NodeNameEditPart(view);\n+\n \t\t\tcase TopicEditPart.VISUAL_ID:\n \t\t\t\treturn new TopicEditPart(view);\n \n \t\t\tcase TopicNameEditPart.VISUAL_ID:\n \t\t\t\treturn new TopicNameEditPart(view);\n \n-\t\t\tcase NodeEditPart.VISUAL_ID:\n-\t\t\t\treturn new NodeEditPart(view);\n+\t\t\tcase ServiceEditPart.VISUAL_ID:\n+\t\t\t\treturn new ServiceEditPart(view);\n \n-\t\t\tcase NodeNameEditPart.VISUAL_ID:\n-\t\t\t\treturn new NodeNameEditPart(view);\n+\t\t\tcase ServiceNameEditPart.VISUAL_ID:\n+\t\t\t\treturn new ServiceNameEditPart(view);\n+\n+\t\t\tcase ParameterEditPart.VISUAL_ID:\n+\t\t\t\treturn new ParameterEditPart(view);\n+\n+\t\t\tcase NodeParametersEditPart.VISUAL_ID:\n+\t\t\t\treturn new NodeParametersEditPart(view);\n+\n+\t\t\tcase ServiceClientEditPart.VISUAL_ID:\n+\t\t\t\treturn new ServiceClientEditPart(view);\n+\n+\t\t\tcase ServiceClientNameEditPart.VISUAL_ID:\n+\t\t\t\treturn new ServiceClientNameEditPart(view);\n \n \t\t\tcase SubscriberEditPart.VISUAL_ID:\n \t\t\t\treturn new SubscriberEditPart(view);\n \n \t\t\tcase SubscriberNameEditPart.VISUAL_ID:\n \t\t\t\treturn new SubscriberNameEditPart(view);\n \n+\t\t\tcase ServiceServerEditPart.VISUAL_ID:\n+\t\t\t\treturn new ServiceServerEditPart(view);\n+\n+\t\t\tcase ServiceServerNameEditPart.VISUAL_ID:\n+\t\t\t\treturn new ServiceServerNameEditPart(view);\n+\n \t\t\tcase PublisherEditPart.VISUAL_ID:\n \t\t\t\treturn new PublisherEditPart(view);\n ", "raw_url": "https://github.com/ipa320/bride/raw/01bc5c83c895357f23a345ecec85a3796cf66358/org.ros.model.ros.diagram%2Fsrc%2Forg%2Fros%2Fmodel%2Fros%2Fdiagram%2Fedit%2Fparts%2FRosEditPartFactory.java", "sha": "e35f857baabf16b99651dca51ae22ea75799eee7", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/ipa320/bride/blob/01bc5c83c895357f23a345ecec85a3796cf66358/org.ros.model.ros.diagram%2Fsrc%2Forg%2Fros%2Fmodel%2Fros%2Fdiagram%2Fedit%2Fparts%2FSubscriberEditPart.java", "changes": 2, "contents_url": "https://api.github.com/repos/ipa320/bride/contents/org.ros.model.ros.diagram%2Fsrc%2Forg%2Fros%2Fmodel%2Fros%2Fdiagram%2Fedit%2Fparts%2FSubscriberEditPart.java?ref=01bc5c83c895357f23a345ecec85a3796cf66358", "deletions": 1, "filename": "org.ros.model.ros.diagram/src/org/ros/model/ros/diagram/edit/parts/SubscriberEditPart.java", "new_code": "\tpublic static final int VISUAL_ID = 4002;", "new_methods": [], "old_code": "\tpublic static final int VISUAL_ID = 4001;", "old_methods": [], "patch": "@@ -19,7 +19,7 @@ public class SubscriberEditPart extends ConnectionNodeEditPart implements\n \t/**\n \t * @generated\n \t */\n-\tpublic static final int VISUAL_ID = 4001;\n+\tpublic static final int VISUAL_ID = 4002;\n \n \t/**\n \t * @generated", "raw_url": "https://github.com/ipa320/bride/raw/01bc5c83c895357f23a345ecec85a3796cf66358/org.ros.model.ros.diagram%2Fsrc%2Forg%2Fros%2Fmodel%2Fros%2Fdiagram%2Fedit%2Fparts%2FSubscriberEditPart.java", "sha": "03e029256922243690d74d83389602d767fd5bc0", "status": "modified" }, { "additions": 2, "blob_url": "https://github.com/ipa320/bride/blob/01bc5c83c895357f23a345ecec85a3796cf66358/org.ros.model.ros.diagram%2Fsrc%2Forg%2Fros%2Fmodel%2Fros%2Fdiagram%2Fedit%2Fparts%2FSubscriberNameEditPart.java", "changes": 4, "contents_url": "https://api.github.com/repos/ipa320/bride/contents/org.ros.model.ros.diagram%2Fsrc%2Forg%2Fros%2Fmodel%2Fros%2Fdiagram%2Fedit%2Fparts%2FSubscriberNameEditPart.java?ref=01bc5c83c895357f23a345ecec85a3796cf66358", "deletions": 2, "filename": "org.ros.model.ros.diagram/src/org/ros/model/ros/diagram/edit/parts/SubscriberNameEditPart.java", "new_code": "\tpublic static final int VISUAL_ID = 6002;\n\t\t\t\t\t\t\tRosElementTypes.Subscriber_4002,", "new_methods": [], "old_code": "\tpublic static final int VISUAL_ID = 6001;\n\t\t\t\t\t\t\tRosElementTypes.Subscriber_4001,", "old_methods": [], "patch": "@@ -53,7 +53,7 @@ public class SubscriberNameEditPart extends LabelEditPart implements\n \t/**\n \t * @generated\n \t */\n-\tpublic static final int VISUAL_ID = 6001;\n+\tpublic static final int VISUAL_ID = 6002;\n \n \t/**\n \t * @generated\n@@ -312,7 +312,7 @@ public IParser getParser() {\n \t\tif (parser == null) {\n \t\t\tparser = RosParserProvider\n \t\t\t\t\t.getParser(\n-\t\t\t\t\t\t\tRosElementTypes.Subscriber_4001,\n+\t\t\t\t\t\t\tRosElementTypes.Subscriber_4002,\n \t\t\t\t\t\t\tgetParserElement(),\n \t\t\t\t\t\t\tRosVisualIDRegistry\n \t\t\t\t\t\t\t\t\t.getType(org.ros.model.ros.diagram.edit.parts.SubscriberNameEditPart.VISUAL_ID));", "raw_url": "https://github.com/ipa320/bride/raw/01bc5c83c895357f23a345ecec85a3796cf66358/org.ros.model.ros.diagram%2Fsrc%2Forg%2Fros%2Fmodel%2Fros%2Fdiagram%2Fedit%2Fparts%2FSubscriberNameEditPart.java", "sha": "1667237b3add9b90fa1194617a0be0375d719249", "status": "modified" }, { "additions": 7, "blob_url": "https://github.com/ipa320/bride/blob/01bc5c83c895357f23a345ecec85a3796cf66358/org.ros.model.ros.diagram%2Fsrc%2Forg%2Fros%2Fmodel%2Fros%2Fdiagram%2Fedit%2Fparts%2FTopicEditPart.java", "changes": 14, "contents_url": "https://api.github.com/repos/ipa320/bride/contents/org.ros.model.ros.diagram%2Fsrc%2Forg%2Fros%2Fmodel%2Fros%2Fdiagram%2Fedit%2Fparts%2FTopicEditPart.java?ref=01bc5c83c895357f23a345ecec85a3796cf66358", "deletions": 7, "filename": "org.ros.model.ros.diagram/src/org/ros/model/ros/diagram/edit/parts/TopicEditPart.java", "new_code": "\tpublic static final int VISUAL_ID = 2002;\n\t\ttypes.add(RosElementTypes.Subscriber_4002);\n\t\ttypes.add(RosElementTypes.Publisher_4004);\n\t\tif (relationshipType == RosElementTypes.Subscriber_4002) {\n\t\t\ttypes.add(RosElementTypes.Node_2001);\n\t\t} else if (relationshipType == RosElementTypes.Publisher_4004) {\n\t\t\ttypes.add(RosElementTypes.Node_2001);", "new_methods": [], "old_code": "\tpublic static final int VISUAL_ID = 2001;\n\t\ttypes.add(RosElementTypes.Subscriber_4001);\n\t\ttypes.add(RosElementTypes.Publisher_4002);\n\t\tif (relationshipType == RosElementTypes.Subscriber_4001) {\n\t\t\ttypes.add(RosElementTypes.Node_2002);\n\t\t} else if (relationshipType == RosElementTypes.Publisher_4002) {\n\t\t\ttypes.add(RosElementTypes.Node_2002);", "old_methods": [], "patch": "@@ -37,7 +37,7 @@ public class TopicEditPart extends ShapeNodeEditPart {\n \t/**\n \t * @generated\n \t */\n-\tpublic static final int VISUAL_ID = 2001;\n+\tpublic static final int VISUAL_ID = 2002;\n \n \t/**\n \t * @generated\n@@ -253,8 +253,8 @@ public EditPart getPrimaryChildEditPart() {\n \t */\n \tpublic List<IElementType> getMARelTypesOnTarget() {\n \t\tArrayList<IElementType> types = new ArrayList<IElementType>(2);\n-\t\ttypes.add(RosElementTypes.Subscriber_4001);\n-\t\ttypes.add(RosElementTypes.Publisher_4002);\n+\t\ttypes.add(RosElementTypes.Subscriber_4002);\n+\t\ttypes.add(RosElementTypes.Publisher_4004);\n \t\treturn types;\n \t}\n \n@@ -263,10 +263,10 @@ public List<IElementType> getMARelTypesOnTarget() {\n \t */\n \tpublic List<IElementType> getMATypesForSource(IElementType relationshipType) {\n \t\tLinkedList<IElementType> types = new LinkedList<IElementType>();\n-\t\tif (relationshipType == RosElementTypes.Subscriber_4001) {\n-\t\t\ttypes.add(RosElementTypes.Node_2002);\n-\t\t} else if (relationshipType == RosElementTypes.Publisher_4002) {\n-\t\t\ttypes.add(RosElementTypes.Node_2002);\n+\t\tif (relationshipType == RosElementTypes.Subscriber_4002) {\n+\t\t\ttypes.add(RosElementTypes.Node_2001);\n+\t\t} else if (relationshipType == RosElementTypes.Publisher_4004) {\n+\t\t\ttypes.add(RosElementTypes.Node_2001);\n \t\t}\n \t\treturn types;\n \t}", "raw_url": "https://github.com/ipa320/bride/raw/01bc5c83c895357f23a345ecec85a3796cf66358/org.ros.model.ros.diagram%2Fsrc%2Forg%2Fros%2Fmodel%2Fros%2Fdiagram%2Fedit%2Fparts%2FTopicEditPart.java", "sha": "0de7c7b1f813c9ef30a4f2a354e4b79ed195ea85", "status": "modified" }, { "additions": 2, "blob_url": "https://github.com/ipa320/bride/blob/01bc5c83c895357f23a345ecec85a3796cf66358/org.ros.model.ros.diagram%2Fsrc%2Forg%2Fros%2Fmodel%2Fros%2Fdiagram%2Fedit%2Fparts%2FTopicNameEditPart.java", "changes": 4, "contents_url": "https://api.github.com/repos/ipa320/bride/contents/org.ros.model.ros.diagram%2Fsrc%2Forg%2Fros%2Fmodel%2Fros%2Fdiagram%2Fedit%2Fparts%2FTopicNameEditPart.java?ref=01bc5c83c895357f23a345ecec85a3796cf66358", "deletions": 2, "filename": "org.ros.model.ros.diagram/src/org/ros/model/ros/diagram/edit/parts/TopicNameEditPart.java", "new_code": "\tpublic static final int VISUAL_ID = 5002;\n\t\t\t\t\t\t\tRosElementTypes.Topic_2002,", "new_methods": [], "old_code": "\tpublic static final int VISUAL_ID = 5001;\n\t\t\t\t\t\t\tRosElementTypes.Topic_2001,", "old_methods": [], "patch": "@@ -52,7 +52,7 @@ public class TopicNameEditPart extends CompartmentEditPart implements\n \t/**\n \t * @generated\n \t */\n-\tpublic static final int VISUAL_ID = 5001;\n+\tpublic static final int VISUAL_ID = 5002;\n \n \t/**\n \t * @generated\n@@ -294,7 +294,7 @@ public IParser getParser() {\n \t\tif (parser == null) {\n \t\t\tparser = RosParserProvider\n \t\t\t\t\t.getParser(\n-\t\t\t\t\t\t\tRosElementTypes.Topic_2001,\n+\t\t\t\t\t\t\tRosElementTypes.Topic_2002,\n \t\t\t\t\t\t\tgetParserElement(),\n \t\t\t\t\t\t\tRosVisualIDRegistry\n \t\t\t\t\t\t\t\t\t.getType(org.ros.model.ros.diagram.edit.parts.TopicNameEditPart.VISUAL_ID));", "raw_url": "https://github.com/ipa320/bride/raw/01bc5c83c895357f23a345ecec85a3796cf66358/org.ros.model.ros.diagram%2Fsrc%2Forg%2Fros%2Fmodel%2Fros%2Fdiagram%2Fedit%2Fparts%2FTopicNameEditPart.java", "sha": "860e218a3aecf408b553deadea47a3dc99066590", "status": "modified" }, { "additions": 75, "blob_url": "https://github.com/ipa320/bride/blob/01bc5c83c895357f23a345ecec85a3796cf66358/org.ros.model.ros.diagram%2Fsrc%2Forg%2Fros%2Fmodel%2Fros%2Fdiagram%2Fedit%2Fpolicies%2FNodeItemSemanticEditPolicy.java", "changes": 80, "contents_url": "https://api.github.com/repos/ipa320/bride/contents/org.ros.model.ros.diagram%2Fsrc%2Forg%2Fros%2Fmodel%2Fros%2Fdiagram%2Fedit%2Fpolicies%2FNodeItemSemanticEditPolicy.java?ref=01bc5c83c895357f23a345ecec85a3796cf66358", "deletions": 5, "filename": "org.ros.model.ros.diagram/src/org/ros/model/ros/diagram/edit/policies/NodeItemSemanticEditPolicy.java", "new_code": "import org.eclipse.gmf.runtime.common.core.command.ICompositeCommand;\nimport org.eclipse.gmf.runtime.notation.Node;\nimport org.ros.model.ros.diagram.edit.commands.ServiceClientCreateCommand;\nimport org.ros.model.ros.diagram.edit.commands.ServiceClientReorientCommand;\nimport org.ros.model.ros.diagram.edit.commands.ServiceServerCreateCommand;\nimport org.ros.model.ros.diagram.edit.commands.ServiceServerReorientCommand;\nimport org.ros.model.ros.diagram.edit.parts.NodeParametersEditPart;\nimport org.ros.model.ros.diagram.edit.parts.ParameterEditPart;\nimport org.ros.model.ros.diagram.edit.parts.ServiceClientEditPart;\nimport org.ros.model.ros.diagram.edit.parts.ServiceServerEditPart;\n\t\tsuper(RosElementTypes.Node_2001);\n\t\t\tif (RosVisualIDRegistry.getVisualID(outgoingLink) == ServiceClientEditPart.VISUAL_ID) {\n\t\t\t\tDestroyElementRequest r = new DestroyElementRequest(\n\t\t\t\t\t\toutgoingLink.getElement(), false);\n\t\t\t\tcmd.add(new DestroyElementCommand(r));\n\t\t\t\tcmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));\n\t\t\t\tcontinue;\n\t\t\t}\n\t\t\tif (RosVisualIDRegistry.getVisualID(outgoingLink) == ServiceServerEditPart.VISUAL_ID) {\n\t\t\t\tDestroyElementRequest r = new DestroyElementRequest(\n\t\t\t\t\t\toutgoingLink.getElement(), false);\n\t\t\t\tcmd.add(new DestroyElementCommand(r));\n\t\t\t\tcmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));\n\t\t\t\tcontinue;\n\t\t\t}\n\t\t\taddDestroyChildNodesCommand(cmd);\n\t/**\n\t * @generated\n\t */\n\tprivate void addDestroyChildNodesCommand(ICompositeCommand cmd) {\n\t\tView view = (View) getHost().getModel();\n\t\tfor (Iterator<?> nit = view.getChildren().iterator(); nit.hasNext();) {\n\t\t\tNode node = (Node) nit.next();\n\t\t\tswitch (RosVisualIDRegistry.getVisualID(node)) {\n\t\t\tcase NodeParametersEditPart.VISUAL_ID:\n\t\t\t\tfor (Iterator<?> cit = node.getChildren().iterator(); cit\n\t\t\t\t\t\t.hasNext();) {\n\t\t\t\t\tNode cnode = (Node) cit.next();\n\t\t\t\t\tswitch (RosVisualIDRegistry.getVisualID(cnode)) {\n\t\t\t\t\tcase ParameterEditPart.VISUAL_ID:\n\t\t\t\t\t\tcmd.add(new DestroyElementCommand(\n\t\t\t\t\t\t\t\tnew DestroyElementRequest(getEditingDomain(),\n\t\t\t\t\t\t\t\t\t\tcnode.getElement(), false))); // directlyOwned: true\n\t\t\t\t\t\t// don't need explicit deletion of cnode as parent's view deletion would clean child views as well \n\t\t\t\t\t\t// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));\n\t\t\t\t\t\tbreak;\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t\tbreak;\n\t\t\t}\n\t\t}\n\t}\n\n\t\tif (RosElementTypes.ServiceClient_4001 == req.getElementType()) {\n\t\t\treturn getGEFWrapper(new ServiceClientCreateCommand(req,\n\t\t\t\t\treq.getSource(), req.getTarget()));\n\t\t}\n\t\tif (RosElementTypes.Subscriber_4002 == req.getElementType()) {\n\t\tif (RosElementTypes.ServiceServer_4003 == req.getElementType()) {\n\t\t\treturn getGEFWrapper(new ServiceServerCreateCommand(req,\n\t\t\t\t\treq.getSource(), req.getTarget()));\n\t\t}\n\t\tif (RosElementTypes.Publisher_4004 == req.getElementType()) {\n\t\tif (RosElementTypes.ServiceClient_4001 == req.getElementType()) {\n\t\t\treturn null;\n\t\t}\n\t\tif (RosElementTypes.Subscriber_4002 == req.getElementType()) {\n\t\t\treturn null;\n\t\t}\n\t\tif (RosElementTypes.ServiceServer_4003 == req.getElementType()) {\n\t\tif (RosElementTypes.Publisher_4004 == req.getElementType()) {\n\t\tcase ServiceClientEditPart.VISUAL_ID:\n\t\t\treturn getGEFWrapper(new ServiceClientReorientCommand(req));\n\t\tcase ServiceServerEditPart.VISUAL_ID:\n\t\t\treturn getGEFWrapper(new ServiceServerReorientCommand(req));", "new_methods": [ { "arguments": [ "ICompositeCommand cmd" ], "filename": "org.ros.model.ros.diagram/src/org/ros/model/ros/diagram/edit/policies/NodeItemSemanticEditPolicy.java", "implementation": "View view = (View) getHost().getModel();\n\t\tfor (Iterator<?> nit = view.getChildren().iterator(); nit.hasNext();) {\n\t\t\tNode node = (Node) nit.next();\n\t\t\tswitch (RosVisualIDRegistry.getVisualID(node)) {\n\t\t\tcase NodeParametersEditPart.VISUAL_ID:\n\t\t\t\tfor (Iterator<?> cit = node.getChildren().iterator(); cit\n\t\t\t\t\t\t.hasNext();) {\n\t\t\t\t\tNode cnode = (Node) cit.next();\n\t\t\t\t\tswitch (RosVisualIDRegistry.getVisualID(cnode)) {\n\t\t\t\t\tcase ParameterEditPart.VISUAL_ID:\n\t\t\t\t\t\tcmd.add(new DestroyElementCommand(\n\t\t\t\t\t\t\t\tnew DestroyElementRequest(getEditingDomain(),\n\t\t\t\t\t\t\t\t\t\tcnode.getElement(), false))); // directlyOwned: true\n\t\t\t\t\t\t// don't need explicit deletion of cnode as parent's view deletion would clean child views as well \n\t\t\t\t\t\t// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));\n\t\t\t\t\t\tbreak;", "signature": "void addDestroyChildNodesCommand(ICompositeCommand cmd)" } ], "old_code": "\t\tsuper(RosElementTypes.Node_2002);\n\t\tif (RosElementTypes.Subscriber_4001 == req.getElementType()) {\n\t\tif (RosElementTypes.Publisher_4002 == req.getElementType()) {\n\t\tif (RosElementTypes.Subscriber_4001 == req.getElementType()) {\n\t\tif (RosElementTypes.Publisher_4002 == req.getElementType()) {", "old_methods": [], "patch": "@@ -4,19 +4,29 @@\n \n import org.eclipse.emf.ecore.EAnnotation;\n import org.eclipse.gef.commands.Command;\n+import org.eclipse.gmf.runtime.common.core.command.ICompositeCommand;\n import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;\n import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;\n import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;\n import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;\n import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;\n import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;\n import org.eclipse.gmf.runtime.notation.Edge;\n+import org.eclipse.gmf.runtime.notation.Node;\n import org.eclipse.gmf.runtime.notation.View;\n import org.ros.model.ros.diagram.edit.commands.PublisherCreateCommand;\n import org.ros.model.ros.diagram.edit.commands.PublisherReorientCommand;\n+import org.ros.model.ros.diagram.edit.commands.ServiceClientCreateCommand;\n+import org.ros.model.ros.diagram.edit.commands.ServiceClientReorientCommand;\n+import org.ros.model.ros.diagram.edit.commands.ServiceServerCreateCommand;\n+import org.ros.model.ros.diagram.edit.commands.ServiceServerReorientCommand;\n import org.ros.model.ros.diagram.edit.commands.SubscriberCreateCommand;\n import org.ros.model.ros.diagram.edit.commands.SubscriberReorientCommand;\n+import org.ros.model.ros.diagram.edit.parts.NodeParametersEditPart;\n+import org.ros.model.ros.diagram.edit.parts.ParameterEditPart;\n import org.ros.model.ros.diagram.edit.parts.PublisherEditPart;\n+import org.ros.model.ros.diagram.edit.parts.ServiceClientEditPart;\n+import org.ros.model.ros.diagram.edit.parts.ServiceServerEditPart;\n import org.ros.model.ros.diagram.edit.parts.SubscriberEditPart;\n import org.ros.model.ros.diagram.part.RosVisualIDRegistry;\n import org.ros.model.ros.diagram.providers.RosElementTypes;\n@@ -30,7 +40,7 @@ public class NodeItemSemanticEditPolicy extends RosBaseItemSemanticEditPolicy {\n \t * @generated\n \t */\n \tpublic NodeItemSemanticEditPolicy() {\n-\t\tsuper(RosElementTypes.Node_2002);\n+\t\tsuper(RosElementTypes.Node_2001);\n \t}\n \n \t/**\n@@ -43,13 +53,27 @@ protected Command getDestroyElementCommand(DestroyElementRequest req) {\n \t\tcmd.setTransactionNestingEnabled(false);\n \t\tfor (Iterator<?> it = view.getSourceEdges().iterator(); it.hasNext();) {\n \t\t\tEdge outgoingLink = (Edge) it.next();\n+\t\t\tif (RosVisualIDRegistry.getVisualID(outgoingLink) == ServiceClientEditPart.VISUAL_ID) {\n+\t\t\t\tDestroyElementRequest r = new DestroyElementRequest(\n+\t\t\t\t\t\toutgoingLink.getElement(), false);\n+\t\t\t\tcmd.add(new DestroyElementCommand(r));\n+\t\t\t\tcmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));\n+\t\t\t\tcontinue;\n+\t\t\t}\n \t\t\tif (RosVisualIDRegistry.getVisualID(outgoingLink) == SubscriberEditPart.VISUAL_ID) {\n \t\t\t\tDestroyElementRequest r = new DestroyElementRequest(\n \t\t\t\t\t\toutgoingLink.getElement(), false);\n \t\t\t\tcmd.add(new DestroyElementCommand(r));\n \t\t\t\tcmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));\n \t\t\t\tcontinue;\n \t\t\t}\n+\t\t\tif (RosVisualIDRegistry.getVisualID(outgoingLink) == ServiceServerEditPart.VISUAL_ID) {\n+\t\t\t\tDestroyElementRequest r = new DestroyElementRequest(\n+\t\t\t\t\t\toutgoingLink.getElement(), false);\n+\t\t\t\tcmd.add(new DestroyElementCommand(r));\n+\t\t\t\tcmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));\n+\t\t\t\tcontinue;\n+\t\t\t}\n \t\t\tif (RosVisualIDRegistry.getVisualID(outgoingLink) == PublisherEditPart.VISUAL_ID) {\n \t\t\t\tDestroyElementRequest r = new DestroyElementRequest(\n \t\t\t\t\t\toutgoingLink.getElement(), false);\n@@ -61,6 +85,7 @@ protected Command getDestroyElementCommand(DestroyElementRequest req) {\n \t\tEAnnotation annotation = view.getEAnnotation(\"Shortcut\"); //$NON-NLS-1$\n \t\tif (annotation == null) {\n \t\t\t// there are indirectly referenced children, need extra commands: false\n+\t\t\taddDestroyChildNodesCommand(cmd);\n \t\t\taddDestroyShortcutsCommand(cmd, view);\n \t\t\t// delete host element\n \t\t\tcmd.add(new DestroyElementCommand(req));\n@@ -70,6 +95,33 @@ protected Command getDestroyElementCommand(DestroyElementRequest req) {\n \t\treturn getGEFWrapper(cmd.reduce());\n \t}\n \n+\t/**\n+\t * @generated\n+\t */\n+\tprivate void addDestroyChildNodesCommand(ICompositeCommand cmd) {\n+\t\tView view = (View) getHost().getModel();\n+\t\tfor (Iterator<?> nit = view.getChildren().iterator(); nit.hasNext();) {\n+\t\t\tNode node = (Node) nit.next();\n+\t\t\tswitch (RosVisualIDRegistry.getVisualID(node)) {\n+\t\t\tcase NodeParametersEditPart.VISUAL_ID:\n+\t\t\t\tfor (Iterator<?> cit = node.getChildren().iterator(); cit\n+\t\t\t\t\t\t.hasNext();) {\n+\t\t\t\t\tNode cnode = (Node) cit.next();\n+\t\t\t\t\tswitch (RosVisualIDRegistry.getVisualID(cnode)) {\n+\t\t\t\t\tcase ParameterEditPart.VISUAL_ID:\n+\t\t\t\t\t\tcmd.add(new DestroyElementCommand(\n+\t\t\t\t\t\t\t\tnew DestroyElementRequest(getEditingDomain(),\n+\t\t\t\t\t\t\t\t\t\tcnode.getElement(), false))); // directlyOwned: true\n+\t\t\t\t\t\t// don't need explicit deletion of cnode as parent's view deletion would clean child views as well \n+\t\t\t\t\t\t// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));\n+\t\t\t\t\t\tbreak;\n+\t\t\t\t\t}\n+\t\t\t\t}\n+\t\t\t\tbreak;\n+\t\t\t}\n+\t\t}\n+\t}\n+\n \t/**\n \t * @generated\n \t */\n@@ -85,11 +137,19 @@ protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {\n \t */\n \tprotected Command getStartCreateRelationshipCommand(\n \t\t\tCreateRelationshipRequest req) {\n-\t\tif (RosElementTypes.Subscriber_4001 == req.getElementType()) {\n+\t\tif (RosElementTypes.ServiceClient_4001 == req.getElementType()) {\n+\t\t\treturn getGEFWrapper(new ServiceClientCreateCommand(req,\n+\t\t\t\t\treq.getSource(), req.getTarget()));\n+\t\t}\n+\t\tif (RosElementTypes.Subscriber_4002 == req.getElementType()) {\n \t\t\treturn getGEFWrapper(new SubscriberCreateCommand(req,\n \t\t\t\t\treq.getSource(), req.getTarget()));\n \t\t}\n-\t\tif (RosElementTypes.Publisher_4002 == req.getElementType()) {\n+\t\tif (RosElementTypes.ServiceServer_4003 == req.getElementType()) {\n+\t\t\treturn getGEFWrapper(new ServiceServerCreateCommand(req,\n+\t\t\t\t\treq.getSource(), req.getTarget()));\n+\t\t}\n+\t\tif (RosElementTypes.Publisher_4004 == req.getElementType()) {\n \t\t\treturn getGEFWrapper(new PublisherCreateCommand(req,\n \t\t\t\t\treq.getSource(), req.getTarget()));\n \t\t}\n@@ -101,10 +161,16 @@ protected Command getStartCreateRelationshipCommand(\n \t */\n \tprotected Command getCompleteCreateRelationshipCommand(\n \t\t\tCreateRelationshipRequest req) {\n-\t\tif (RosElementTypes.Subscriber_4001 == req.getElementType()) {\n+\t\tif (RosElementTypes.ServiceClient_4001 == req.getElementType()) {\n+\t\t\treturn null;\n+\t\t}\n+\t\tif (RosElementTypes.Subscriber_4002 == req.getElementType()) {\n+\t\t\treturn null;\n+\t\t}\n+\t\tif (RosElementTypes.ServiceServer_4003 == req.getElementType()) {\n \t\t\treturn null;\n \t\t}\n-\t\tif (RosElementTypes.Publisher_4002 == req.getElementType()) {\n+\t\tif (RosElementTypes.Publisher_4004 == req.getElementType()) {\n \t\t\treturn null;\n \t\t}\n \t\treturn null;\n@@ -119,8 +185,12 @@ protected Command getCompleteCreateRelationshipCommand(\n \tprotected Command getReorientRelationshipCommand(\n \t\t\tReorientRelationshipRequest req) {\n \t\tswitch (getVisualID(req)) {\n+\t\tcase ServiceClientEditPart.VISUAL_ID:\n+\t\t\treturn getGEFWrapper(new ServiceClientReorientCommand(req));\n \t\tcase SubscriberEditPart.VISUAL_ID:\n \t\t\treturn getGEFWrapper(new SubscriberReorientCommand(req));\n+\t\tcase ServiceServerEditPart.VISUAL_ID:\n+\t\t\treturn getGEFWrapper(new ServiceServerReorientCommand(req));\n \t\tcase PublisherEditPart.VISUAL_ID:\n \t\t\treturn getGEFWrapper(new PublisherReorientCommand(req));\n \t\t}", "raw_url": "https://github.com/ipa320/bride/raw/01bc5c83c895357f23a345ecec85a3796cf66358/org.ros.model.ros.diagram%2Fsrc%2Forg%2Fros%2Fmodel%2Fros%2Fdiagram%2Fedit%2Fpolicies%2FNodeItemSemanticEditPolicy.java", "sha": "a2570581d899d90b3bb6784d83271799d56f7be3", "status": "modified" }, { "additions": 47, "blob_url": "https://github.com/ipa320/bride/blob/01bc5c83c895357f23a345ecec85a3796cf66358/org.ros.model.ros.diagram%2Fsrc%2Forg%2Fros%2Fmodel%2Fros%2Fdiagram%2Fedit%2Fpolicies%2FPackageCanonicalEditPolicy.java", "changes": 55, "contents_url": "https://api.github.com/repos/ipa320/bride/contents/org.ros.model.ros.diagram%2Fsrc%2Forg%2Fros%2Fmodel%2Fros%2Fdiagram%2Fedit%2Fpolicies%2FPackageCanonicalEditPolicy.java?ref=01bc5c83c895357f23a345ecec85a3796cf66358", "deletions": 8, "filename": "org.ros.model.ros.diagram/src/org/ros/model/ros/diagram/edit/policies/PackageCanonicalEditPolicy.java", "new_code": "import org.ros.model.ros.diagram.edit.parts.ServiceClientEditPart;\nimport org.ros.model.ros.diagram.edit.parts.ServiceEditPart;\nimport org.ros.model.ros.diagram.edit.parts.ServiceServerEditPart;\n\t\t\tmyFeaturesToSynchronize.add(RosPackage.eINSTANCE.getPackage_Node());\n\t\t\tmyFeaturesToSynchronize.add(RosPackage.eINSTANCE\n\t\t\t\t\t.getPackage_Service());\n\t\treturn visualID == NodeEditPart.VISUAL_ID\n\t\t\t\t|| visualID == TopicEditPart.VISUAL_ID\n\t\t\t\t|| visualID == ServiceEditPart.VISUAL_ID;\n\t\tcase NodeEditPart.VISUAL_ID: {\n\t\t\tif (!domain2NotationMap.containsKey(view.getElement())) {\n\t\t\t\tresult.addAll(RosDiagramUpdater\n\t\t\t\t\t\t.getNode_2001ContainedLinks(view));\n\t\t\t}\n\t\t\tif (!domain2NotationMap.containsKey(view.getElement())\n\t\t\t\t\t|| view.getEAnnotation(\"Shortcut\") == null) { //$NON-NLS-1$\n\t\t\t\tdomain2NotationMap.put(view.getElement(), view);\n\t\t\t}\n\t\t\tbreak;\n\t\t}\n\t\t\t\t\t\t.getTopic_2002ContainedLinks(view));\n\t\tcase ServiceEditPart.VISUAL_ID: {\n\t\t\t\t\t\t.getService_2003ContainedLinks(view));\n\t\t\t}\n\t\t\tif (!domain2NotationMap.containsKey(view.getElement())\n\t\t\t\t\t|| view.getEAnnotation(\"Shortcut\") == null) { //$NON-NLS-1$\n\t\t\t\tdomain2NotationMap.put(view.getElement(), view);\n\t\t\t}\n\t\t\tbreak;\n\t\t}\n\t\tcase ServiceClientEditPart.VISUAL_ID: {\n\t\t\tif (!domain2NotationMap.containsKey(view.getElement())) {\n\t\t\t\tresult.addAll(RosDiagramUpdater\n\t\t\t\t\t\t.getServiceClient_4001ContainedLinks(view));\n\t\t\t\t\t\t.getSubscriber_4002ContainedLinks(view));\n\t\t\t}\n\t\t\tif (!domain2NotationMap.containsKey(view.getElement())\n\t\t\t\t\t|| view.getEAnnotation(\"Shortcut\") == null) { //$NON-NLS-1$\n\t\t\t\tdomain2NotationMap.put(view.getElement(), view);\n\t\t\t}\n\t\t\tbreak;\n\t\t}\n\t\tcase ServiceServerEditPart.VISUAL_ID: {\n\t\t\tif (!domain2NotationMap.containsKey(view.getElement())) {\n\t\t\t\tresult.addAll(RosDiagramUpdater\n\t\t\t\t\t\t.getServiceServer_4003ContainedLinks(view));\n\t\t\t\t\t\t.getPublisher_4004ContainedLinks(view));", "new_methods": [], "old_code": "\t\t\tmyFeaturesToSynchronize.add(RosPackage.eINSTANCE.getPackage_Node());\n\t\treturn visualID == TopicEditPart.VISUAL_ID\n\t\t\t\t|| visualID == NodeEditPart.VISUAL_ID;\n\t\t\t\t\t\t.getTopic_2001ContainedLinks(view));\n\t\tcase NodeEditPart.VISUAL_ID: {\n\t\t\t\t\t\t.getNode_2002ContainedLinks(view));\n\t\t\t\t\t\t.getSubscriber_4001ContainedLinks(view));\n\t\t\t\t\t\t.getPublisher_4002ContainedLinks(view));", "old_methods": [], "patch": "@@ -34,6 +34,9 @@\n import org.ros.model.ros.diagram.edit.parts.NodeEditPart;\n import org.ros.model.ros.diagram.edit.parts.PackageEditPart;\n import org.ros.model.ros.diagram.edit.parts.PublisherEditPart;\n+import org.ros.model.ros.diagram.edit.parts.ServiceClientEditPart;\n+import org.ros.model.ros.diagram.edit.parts.ServiceEditPart;\n+import org.ros.model.ros.diagram.edit.parts.ServiceServerEditPart;\n import org.ros.model.ros.diagram.edit.parts.SubscriberEditPart;\n import org.ros.model.ros.diagram.edit.parts.TopicEditPart;\n import org.ros.model.ros.diagram.part.RosDiagramUpdater;\n@@ -69,9 +72,11 @@ protected void refreshOnActivate() {\n \tprotected Set getFeaturesToSynchronize() {\n \t\tif (myFeaturesToSynchronize == null) {\n \t\t\tmyFeaturesToSynchronize = new HashSet<EStructuralFeature>();\n+\t\t\tmyFeaturesToSynchronize.add(RosPackage.eINSTANCE.getPackage_Node());\n \t\t\tmyFeaturesToSynchronize\n \t\t\t\t\t.add(RosPackage.eINSTANCE.getPackage_Topic());\n-\t\t\tmyFeaturesToSynchronize.add(RosPackage.eINSTANCE.getPackage_Node());\n+\t\t\tmyFeaturesToSynchronize.add(RosPackage.eINSTANCE\n+\t\t\t\t\t.getPackage_Service());\n \t\t}\n \t\treturn myFeaturesToSynchronize;\n \t}\n@@ -105,8 +110,9 @@ protected boolean isOrphaned(Collection<EObject> semanticChildren,\n \t */\n \tprivate boolean isMyDiagramElement(View view) {\n \t\tint visualID = RosVisualIDRegistry.getVisualID(view);\n-\t\treturn visualID == TopicEditPart.VISUAL_ID\n-\t\t\t\t|| visualID == NodeEditPart.VISUAL_ID;\n+\t\treturn visualID == NodeEditPart.VISUAL_ID\n+\t\t\t\t|| visualID == TopicEditPart.VISUAL_ID\n+\t\t\t\t|| visualID == ServiceEditPart.VISUAL_ID;\n \t}\n \n \t/**\n@@ -265,21 +271,43 @@ private Collection<RosLinkDescriptor> collectAllLinks(View view,\n \t\t\t}\n \t\t\tbreak;\n \t\t}\n+\t\tcase NodeEditPart.VISUAL_ID: {\n+\t\t\tif (!domain2NotationMap.containsKey(view.getElement())) {\n+\t\t\t\tresult.addAll(RosDiagramUpdater\n+\t\t\t\t\t\t.getNode_2001ContainedLinks(view));\n+\t\t\t}\n+\t\t\tif (!domain2NotationMap.containsKey(view.getElement())\n+\t\t\t\t\t|| view.getEAnnotation(\"Shortcut\") == null) { //$NON-NLS-1$\n+\t\t\t\tdomain2NotationMap.put(view.getElement(), view);\n+\t\t\t}\n+\t\t\tbreak;\n+\t\t}\n \t\tcase TopicEditPart.VISUAL_ID: {\n \t\t\tif (!domain2NotationMap.containsKey(view.getElement())) {\n \t\t\t\tresult.addAll(RosDiagramUpdater\n-\t\t\t\t\t\t.getTopic_2001ContainedLinks(view));\n+\t\t\t\t\t\t.getTopic_2002ContainedLinks(view));\n \t\t\t}\n \t\t\tif (!domain2NotationMap.containsKey(view.getElement())\n \t\t\t\t\t|| view.getEAnnotation(\"Shortcut\") == null) { //$NON-NLS-1$\n \t\t\t\tdomain2NotationMap.put(view.getElement(), view);\n \t\t\t}\n \t\t\tbreak;\n \t\t}\n-\t\tcase NodeEditPart.VISUAL_ID: {\n+\t\tcase ServiceEditPart.VISUAL_ID: {\n \t\t\tif (!domain2NotationMap.containsKey(view.getElement())) {\n \t\t\t\tresult.addAll(RosDiagramUpdater\n-\t\t\t\t\t\t.getNode_2002ContainedLinks(view));\n+\t\t\t\t\t\t.getService_2003ContainedLinks(view));\n+\t\t\t}\n+\t\t\tif (!domain2NotationMap.containsKey(view.getElement())\n+\t\t\t\t\t|| view.getEAnnotation(\"Shortcut\") == null) { //$NON-NLS-1$\n+\t\t\t\tdomain2NotationMap.put(view.getElement(), view);\n+\t\t\t}\n+\t\t\tbreak;\n+\t\t}\n+\t\tcase ServiceClientEditPart.VISUAL_ID: {\n+\t\t\tif (!domain2NotationMap.containsKey(view.getElement())) {\n+\t\t\t\tresult.addAll(RosDiagramUpdater\n+\t\t\t\t\t\t.getServiceClient_4001ContainedLinks(view));\n \t\t\t}\n \t\t\tif (!domain2NotationMap.containsKey(view.getElement())\n \t\t\t\t\t|| view.getEAnnotation(\"Shortcut\") == null) { //$NON-NLS-1$\n@@ -290,7 +318,18 @@ private Collection<RosLinkDescriptor> collectAllLinks(View view,\n \t\tcase SubscriberEditPart.VISUAL_ID: {\n \t\t\tif (!domain2NotationMap.containsKey(view.getElement())) {\n \t\t\t\tresult.addAll(RosDiagramUpdater\n-\t\t\t\t\t\t.getSubscriber_4001ContainedLinks(view));\n+\t\t\t\t\t\t.getSubscriber_4002ContainedLinks(view));\n+\t\t\t}\n+\t\t\tif (!domain2NotationMap.containsKey(view.getElement())\n+\t\t\t\t\t|| view.getEAnnotation(\"Shortcut\") == null) { //$NON-NLS-1$\n+\t\t\t\tdomain2NotationMap.put(view.getElement(), view);\n+\t\t\t}\n+\t\t\tbreak;\n+\t\t}\n+\t\tcase ServiceServerEditPart.VISUAL_ID: {\n+\t\t\tif (!domain2NotationMap.containsKey(view.getElement())) {\n+\t\t\t\tresult.addAll(RosDiagramUpdater\n+\t\t\t\t\t\t.getServiceServer_4003ContainedLinks(view));\n \t\t\t}\n \t\t\tif (!domain2NotationMap.containsKey(view.getElement())\n \t\t\t\t\t|| view.getEAnnotation(\"Shortcut\") == null) { //$NON-NLS-1$\n@@ -301,7 +340,7 @@ private Collection<RosLinkDescriptor> collectAllLinks(View view,\n \t\tcase PublisherEditPart.VISUAL_ID: {\n \t\t\tif (!domain2NotationMap.containsKey(view.getElement())) {\n \t\t\t\tresult.addAll(RosDiagramUpdater\n-\t\t\t\t\t\t.getPublisher_4002ContainedLinks(view));\n+\t\t\t\t\t\t.getPublisher_4004ContainedLinks(view));\n \t\t\t}\n \t\t\tif (!domain2NotationMap.containsKey(view.getElement())\n \t\t\t\t\t|| view.getEAnnotation(\"Shortcut\") == null) { //$NON-NLS-1$", "raw_url": "https://github.com/ipa320/bride/raw/01bc5c83c895357f23a345ecec85a3796cf66358/org.ros.model.ros.diagram%2Fsrc%2Forg%2Fros%2Fmodel%2Fros%2Fdiagram%2Fedit%2Fpolicies%2FPackageCanonicalEditPolicy.java", "sha": "614443e8856856c99e58dce0c99427c15c9dbfec", "status": "modified" }, { "additions": 7, "blob_url": "https://github.com/ipa320/bride/blob/01bc5c83c895357f23a345ecec85a3796cf66358/org.ros.model.ros.diagram%2Fsrc%2Forg%2Fros%2Fmodel%2Fros%2Fdiagram%2Fedit%2Fpolicies%2FPackageItemSemanticEditPolicy.java", "changes": 10, "contents_url": "https://api.github.com/repos/ipa320/bride/contents/org.ros.model.ros.diagram%2Fsrc%2Forg%2Fros%2Fmodel%2Fros%2Fdiagram%2Fedit%2Fpolicies%2FPackageItemSemanticEditPolicy.java?ref=01bc5c83c895357f23a345ecec85a3796cf66358", "deletions": 3, "filename": "org.ros.model.ros.diagram/src/org/ros/model/ros/diagram/edit/policies/PackageItemSemanticEditPolicy.java", "new_code": "import org.ros.model.ros.diagram.edit.commands.ServiceCreateCommand;\n\t\tif (RosElementTypes.Node_2001 == req.getElementType()) {\n\t\t\treturn getGEFWrapper(new NodeCreateCommand(req));\n\t\t}\n\t\tif (RosElementTypes.Topic_2002 == req.getElementType()) {\n\t\tif (RosElementTypes.Service_2003 == req.getElementType()) {\n\t\t\treturn getGEFWrapper(new ServiceCreateCommand(req));", "new_methods": [], "old_code": "\t\tif (RosElementTypes.Topic_2001 == req.getElementType()) {\n\t\tif (RosElementTypes.Node_2002 == req.getElementType()) {\n\t\t\treturn getGEFWrapper(new NodeCreateCommand(req));", "old_methods": [], "patch": "@@ -7,6 +7,7 @@\n import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;\n import org.eclipse.gmf.runtime.emf.type.core.requests.DuplicateElementsRequest;\n import org.ros.model.ros.diagram.edit.commands.NodeCreateCommand;\n+import org.ros.model.ros.diagram.edit.commands.ServiceCreateCommand;\n import org.ros.model.ros.diagram.edit.commands.TopicCreateCommand;\n import org.ros.model.ros.diagram.providers.RosElementTypes;\n \n@@ -27,11 +28,14 @@ public PackageItemSemanticEditPolicy() {\n \t * @generated\n \t */\n \tprotected Command getCreateCommand(CreateElementRequest req) {\n-\t\tif (RosElementTypes.Topic_2001 == req.getElementType()) {\n+\t\tif (RosElementTypes.Node_2001 == req.getElementType()) {\n+\t\t\treturn getGEFWrapper(new NodeCreateCommand(req));\n+\t\t}\n+\t\tif (RosElementTypes.Topic_2002 == req.getElementType()) {\n \t\t\treturn getGEFWrapper(new TopicCreateCommand(req));\n \t\t}\n-\t\tif (RosElementTypes.Node_2002 == req.getElementType()) {\n-\t\t\treturn getGEFWrapper(new NodeCreateCommand(req));\n+\t\tif (RosElementTypes.Service_2003 == req.getElementType()) {\n+\t\t\treturn getGEFWrapper(new ServiceCreateCommand(req));\n \t\t}\n \t\treturn super.getCreateCommand(req);\n \t}", "raw_url": "https://github.com/ipa320/bride/raw/01bc5c83c895357f23a345ecec85a3796cf66358/org.ros.model.ros.diagram%2Fsrc%2Forg%2Fros%2Fmodel%2Fros%2Fdiagram%2Fedit%2Fpolicies%2FPackageItemSemanticEditPolicy.java", "sha": "aafd0c3c68c386a3440c5c897486936916daadb2", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/ipa320/bride/blob/01bc5c83c895357f23a345ecec85a3796cf66358/org.ros.model.ros.diagram%2Fsrc%2Forg%2Fros%2Fmodel%2Fros%2Fdiagram%2Fedit%2Fpolicies%2FPublisherItemSemanticEditPolicy.java", "changes": 2, "contents_url": "https://api.github.com/repos/ipa320/bride/contents/org.ros.model.ros.diagram%2Fsrc%2Forg%2Fros%2Fmodel%2Fros%2Fdiagram%2Fedit%2Fpolicies%2FPublisherItemSemanticEditPolicy.java?ref=01bc5c83c895357f23a345ecec85a3796cf66358", "deletions": 1, "filename": "org.ros.model.ros.diagram/src/org/ros/model/ros/diagram/edit/policies/PublisherItemSemanticEditPolicy.java", "new_code": "\t\tsuper(RosElementTypes.Publisher_4004);", "new_methods": [], "old_code": "\t\tsuper(RosElementTypes.Publisher_4002);", "old_methods": [], "patch": "@@ -15,7 +15,7 @@ public class PublisherItemSemanticEditPolicy extends\n \t * @generated\n \t */\n \tpublic PublisherItemSemanticEditPolicy() {\n-\t\tsuper(RosElementTypes.Publisher_4002);\n+\t\tsuper(RosElementTypes.Publisher_4004);\n \t}\n \n \t/**", "raw_url": "https://github.com/ipa320/bride/raw/01bc5c83c895357f23a345ecec85a3796cf66358/org.ros.model.ros.diagram%2Fsrc%2Forg%2Fros%2Fmodel%2Fros%2Fdiagram%2Fedit%2Fpolicies%2FPublisherItemSemanticEditPolicy.java", "sha": "a8b6e3d3854c9c072cee50225ac06629b1ad2f97", "status": "modified" }, { "additions": 39, "blob_url": "https://github.com/ipa320/bride/blob/01bc5c83c895357f23a345ecec85a3796cf66358/org.ros.model.ros.diagram%2Fsrc%2Forg%2Fros%2Fmodel%2Fros%2Fdiagram%2Fedit%2Fpolicies%2FRosBaseItemSemanticEditPolicy.java", "changes": 45, "contents_url": "https://api.github.com/repos/ipa320/bride/contents/org.ros.model.ros.diagram%2Fsrc%2Forg%2Fros%2Fmodel%2Fros%2Fdiagram%2Fedit%2Fpolicies%2FRosBaseItemSemanticEditPolicy.java?ref=01bc5c83c895357f23a345ecec85a3796cf66358", "deletions": 6, "filename": "org.ros.model.ros.diagram/src/org/ros/model/ros/diagram/edit/policies/RosBaseItemSemanticEditPolicy.java", "new_code": "import org.ros.model.ros.Service;\nimport org.ros.model.ros.ServiceClient;\nimport org.ros.model.ros.ServiceServer;\n\t\tpublic boolean canCreateServiceClient_4001(Node source, Service target) {\n\t\t\treturn canExistServiceClient_4001(null, source, target);\n\t\tpublic boolean canCreateSubscriber_4002(Node source, Topic target) {\n\t\t\treturn canExistSubscriber_4002(null, source, target);\n\t\tpublic boolean canCreateServiceServer_4003(Node source, Service target) {\n\t\t\treturn canExistServiceServer_4003(null, source, target);\n\t\t}\n\n\t\t/**\n\t\t * @generated\n\t\t */\n\t\tpublic boolean canCreatePublisher_4004(Node source, Topic target) {\n\t\t\treturn canExistPublisher_4004(null, source, target);\n\t\t}\n\n\t\t/**\n\t\t * @generated\n\t\t */\n\t\tpublic boolean canExistServiceClient_4001(ServiceClient linkInstance,\n\t\t\t\tNode source, Service target) {\n\t\t\treturn true;\n\t\t}\n\n\t\t/**\n\t\t * @generated\n\t\t */\n\t\tpublic boolean canExistSubscriber_4002(Subscriber linkInstance,\n\t\tpublic boolean canExistServiceServer_4003(ServiceServer linkInstance,\n\t\t\t\tNode source, Service target) {\n\t\t\treturn true;\n\t\t}\n\n\t\t/**\n\t\t * @generated\n\t\t */\n\t\tpublic boolean canExistPublisher_4004(Publisher linkInstance,", "new_methods": [ { "arguments": [ "Node source", " Service target" ], "filename": "org.ros.model.ros.diagram/src/org/ros/model/ros/diagram/edit/policies/RosBaseItemSemanticEditPolicy.java", "implementation": "return canExistServiceClient_4001(null, source, target);\n\t\tpublic boolean canCreateSubscriber_4002(Node source, Topic target) {\n\t\t\treturn canExistSubscriber_4002(null, source, target);\n\t\tpublic boolean canCreateServiceServer_4003(Node source, Service target) {\n\t\t\treturn canExistServiceServer_4003(null, source, target);", "signature": "boolean canCreateServiceClient_4001(Node source, Service target)" }, { "arguments": [ "Node source", " Topic target" ], "filename": "org.ros.model.ros.diagram/src/org/ros/model/ros/diagram/edit/policies/RosBaseItemSemanticEditPolicy.java", "implementation": "return canExistPublisher_4004(null, source, target);", "signature": "boolean canCreatePublisher_4004(Node source, Topic target)" }, { "arguments": [ "ServiceClient linkInstance", "\n\t\t\t\tNode source", " Service target" ], "filename": "org.ros.model.ros.diagram/src/org/ros/model/ros/diagram/edit/policies/RosBaseItemSemanticEditPolicy.java", "implementation": "return true;", "signature": "boolean canExistServiceClient_4001(ServiceClient linkInstance,\n\t\t\t\tNode source, Service target)" }, { "arguments": [ "Subscriber linkInstance", "\n\t\tpublic boolean canExistServiceServer_4003" ], "filename": "org.ros.model.ros.diagram/src/org/ros/model/ros/diagram/edit/policies/RosBaseItemSemanticEditPolicy.java", "implementation": "return true;", "signature": "boolean canExistSubscriber_4002(Subscriber linkInstance,\n\t\tpublic boolean canExistServiceServer_4003(ServiceServer linkInstance,\n\t\t\t\tNode source, Service target)" } ], "old_code": "\t\tpublic boolean canCreateSubscriber_4001(Node source, Topic target) {\n\t\t\treturn canExistSubscriber_4001(null, source, target);\n\t\tpublic boolean canCreatePublisher_4002(Node source, Topic target) {\n\t\t\treturn canExistPublisher_4002(null, source, target);\n\t\tpublic boolean canExistSubscriber_4001(Subscriber linkInstance,\n\t\tpublic boolean canExistPublisher_4002(Publisher linkInstance,", "old_methods": [], "patch": "@@ -32,6 +32,9 @@\n import org.eclipse.gmf.runtime.notation.View;\n import org.ros.model.ros.Node;\n import org.ros.model.ros.Publisher;\n+import org.ros.model.ros.Service;\n+import org.ros.model.ros.ServiceClient;\n+import org.ros.model.ros.ServiceServer;\n import org.ros.model.ros.Subscriber;\n import org.ros.model.ros.Topic;\n import org.ros.model.ros.diagram.edit.helpers.RosBaseEditHelper;\n@@ -324,29 +327,59 @@ public static class LinkConstraints {\n \t\t/**\n \t\t * @generated\n \t\t */\n-\t\tpublic boolean canCreateSubscriber_4001(Node source, Topic target) {\n-\t\t\treturn canExistSubscriber_4001(null, source, target);\n+\t\tpublic boolean canCreateServiceClient_4001(Node source, Service target) {\n+\t\t\treturn canExistServiceClient_4001(null, source, target);\n \t\t}\n \n \t\t/**\n \t\t * @generated\n \t\t */\n-\t\tpublic boolean canCreatePublisher_4002(Node source, Topic target) {\n-\t\t\treturn canExistPublisher_4002(null, source, target);\n+\t\tpublic boolean canCreateSubscriber_4002(Node source, Topic target) {\n+\t\t\treturn canExistSubscriber_4002(null, source, target);\n \t\t}\n \n \t\t/**\n \t\t * @generated\n \t\t */\n-\t\tpublic boolean canExistSubscriber_4001(Subscriber linkInstance,\n+\t\tpublic boolean canCreateServiceServer_4003(Node source, Service target) {\n+\t\t\treturn canExistServiceServer_4003(null, source, target);\n+\t\t}\n+\n+\t\t/**\n+\t\t * @generated\n+\t\t */\n+\t\tpublic boolean canCreatePublisher_4004(Node source, Topic target) {\n+\t\t\treturn canExistPublisher_4004(null, source, target);\n+\t\t}\n+\n+\t\t/**\n+\t\t * @generated\n+\t\t */\n+\t\tpublic boolean canExistServiceClient_4001(ServiceClient linkInstance,\n+\t\t\t\tNode source, Service target) {\n+\t\t\treturn true;\n+\t\t}\n+\n+\t\t/**\n+\t\t * @generated\n+\t\t */\n+\t\tpublic boolean canExistSubscriber_4002(Subscriber linkInstance,\n \t\t\t\tNode source, Topic target) {\n \t\t\treturn true;\n \t\t}\n \n \t\t/**\n \t\t * @generated\n \t\t */\n-\t\tpublic boolean canExistPublisher_4002(Publisher linkInstance,\n+\t\tpublic boolean canExistServiceServer_4003(ServiceServer linkInstance,\n+\t\t\t\tNode source, Service target) {\n+\t\t\treturn true;\n+\t\t}\n+\n+\t\t/**\n+\t\t * @generated\n+\t\t */\n+\t\tpublic boolean canExistPublisher_4004(Publisher linkInstance,\n \t\t\t\tNode source, Topic target) {\n \t\t\treturn true;\n \t\t}", "raw_url": "https://github.com/ipa320/bride/raw/01bc5c83c895357f23a345ecec85a3796cf66358/org.ros.model.ros.diagram%2Fsrc%2Forg%2Fros%2Fmodel%2Fros%2Fdiagram%2Fedit%2Fpolicies%2FRosBaseItemSemanticEditPolicy.java", "sha": "ec6c0b0bfed23dabcdfaeab7bf554acadf0df82c", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/ipa320/bride/blob/01bc5c83c895357f23a345ecec85a3796cf66358/org.ros.model.ros.diagram%2Fsrc%2Forg%2Fros%2Fmodel%2Fros%2Fdiagram%2Fedit%2Fpolicies%2FSubscriberItemSemanticEditPolicy.java", "changes": 2, "contents_url": "https://api.github.com/repos/ipa320/bride/contents/org.ros.model.ros.diagram%2Fsrc%2Forg%2Fros%2Fmodel%2Fros%2Fdiagram%2Fedit%2Fpolicies%2FSubscriberItemSemanticEditPolicy.java?ref=01bc5c83c895357f23a345ecec85a3796cf66358", "deletions": 1, "filename": "org.ros.model.ros.diagram/src/org/ros/model/ros/diagram/edit/policies/SubscriberItemSemanticEditPolicy.java", "new_code": "\t\tsuper(RosElementTypes.Subscriber_4002);", "new_methods": [], "old_code": "\t\tsuper(RosElementTypes.Subscriber_4001);", "old_methods": [], "patch": "@@ -15,7 +15,7 @@ public class SubscriberItemSemanticEditPolicy extends\n \t * @generated\n \t */\n \tpublic SubscriberItemSemanticEditPolicy() {\n-\t\tsuper(RosElementTypes.Subscriber_4001);\n+\t\tsuper(RosElementTypes.Subscriber_4002);\n \t}\n \n \t/**", "raw_url": "https://github.com/ipa320/bride/raw/01bc5c83c895357f23a345ecec85a3796cf66358/org.ros.model.ros.diagram%2Fsrc%2Forg%2Fros%2Fmodel%2Fros%2Fdiagram%2Fedit%2Fpolicies%2FSubscriberItemSemanticEditPolicy.java", "sha": "2d4a514600b02bd0275117d6bb02824ef24f7ecf", "status": "modified" }, { "additions": 5, "blob_url": "https://github.com/ipa320/bride/blob/01bc5c83c895357f23a345ecec85a3796cf66358/org.ros.model.ros.diagram%2Fsrc%2Forg%2Fros%2Fmodel%2Fros%2Fdiagram%2Fedit%2Fpolicies%2FTopicItemSemanticEditPolicy.java", "changes": 10, "contents_url": "https://api.github.com/repos/ipa320/bride/contents/org.ros.model.ros.diagram%2Fsrc%2Forg%2Fros%2Fmodel%2Fros%2Fdiagram%2Fedit%2Fpolicies%2FTopicItemSemanticEditPolicy.java?ref=01bc5c83c895357f23a345ecec85a3796cf66358", "deletions": 5, "filename": "org.ros.model.ros.diagram/src/org/ros/model/ros/diagram/edit/policies/TopicItemSemanticEditPolicy.java", "new_code": "\t\tsuper(RosElementTypes.Topic_2002);\n\t\tif (RosElementTypes.Subscriber_4002 == req.getElementType()) {\n\t\tif (RosElementTypes.Publisher_4004 == req.getElementType()) {\n\t\tif (RosElementTypes.Subscriber_4002 == req.getElementType()) {\n\t\tif (RosElementTypes.Publisher_4004 == req.getElementType()) {", "new_methods": [], "old_code": "\t\tsuper(RosElementTypes.Topic_2001);\n\t\tif (RosElementTypes.Subscriber_4001 == req.getElementType()) {\n\t\tif (RosElementTypes.Publisher_4002 == req.getElementType()) {\n\t\tif (RosElementTypes.Subscriber_4001 == req.getElementType()) {\n\t\tif (RosElementTypes.Publisher_4002 == req.getElementType()) {", "old_methods": [], "patch": "@@ -30,7 +30,7 @@ public class TopicItemSemanticEditPolicy extends RosBaseItemSemanticEditPolicy {\n \t * @generated\n \t */\n \tpublic TopicItemSemanticEditPolicy() {\n-\t\tsuper(RosElementTypes.Topic_2001);\n+\t\tsuper(RosElementTypes.Topic_2002);\n \t}\n \n \t/**\n@@ -85,10 +85,10 @@ protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {\n \t */\n \tprotected Command getStartCreateRelationshipCommand(\n \t\t\tCreateRelationshipRequest req) {\n-\t\tif (RosElementTypes.Subscriber_4001 == req.getElementType()) {\n+\t\tif (RosElementTypes.Subscriber_4002 == req.getElementType()) {\n \t\t\treturn null;\n \t\t}\n-\t\tif (RosElementTypes.Publisher_4002 == req.getElementType()) {\n+\t\tif (RosElementTypes.Publisher_4004 == req.getElementType()) {\n \t\t\treturn null;\n \t\t}\n \t\treturn null;\n@@ -99,11 +99,11 @@ protected Command getStartCreateRelationshipCommand(\n \t */\n \tprotected Command getCompleteCreateRelationshipCommand(\n \t\t\tCreateRelationshipRequest req) {\n-\t\tif (RosElementTypes.Subscriber_4001 == req.getElementType()) {\n+\t\tif (RosElementTypes.Subscriber_4002 == req.getElementType()) {\n \t\t\treturn getGEFWrapper(new SubscriberCreateCommand(req,\n \t\t\t\t\treq.getSource(), req.getTarget()));\n \t\t}\n-\t\tif (RosElementTypes.Publisher_4002 == req.getElementType()) {\n+\t\tif (RosElementTypes.Publisher_4004 == req.getElementType()) {\n \t\t\treturn getGEFWrapper(new PublisherCreateCommand(req,\n \t\t\t\t\treq.getSource(), req.getTarget()));\n \t\t}", "raw_url": "https://github.com/ipa320/bride/raw/01bc5c83c895357f23a345ecec85a3796cf66358/org.ros.model.ros.diagram%2Fsrc%2Forg%2Fros%2Fmodel%2Fros%2Fdiagram%2Fedit%2Fpolicies%2FTopicItemSemanticEditPolicy.java", "sha": "412441a8c93312061f8f378dc13a9ce02f3a948b", "status": "modified" }, { "additions": 132, "blob_url": "https://github.com/ipa320/bride/blob/01bc5c83c895357f23a345ecec85a3796cf66358/org.ros.model.ros.diagram%2Fsrc%2Forg%2Fros%2Fmodel%2Fros%2Fdiagram%2Fnavigator%2FRosNavigatorContentProvider.java", "changes": 153, "contents_url": "https://api.github.com/repos/ipa320/bride/contents/org.ros.model.ros.diagram%2Fsrc%2Forg%2Fros%2Fmodel%2Fros%2Fdiagram%2Fnavigator%2FRosNavigatorContentProvider.java?ref=01bc5c83c895357f23a345ecec85a3796cf66358", "deletions": 21, "filename": "org.ros.model.ros.diagram/src/org/ros/model/ros/diagram/navigator/RosNavigatorContentProvider.java", "new_code": "import org.ros.model.ros.diagram.edit.parts.NodeParametersEditPart;\nimport org.ros.model.ros.diagram.edit.parts.ParameterEditPart;\nimport org.ros.model.ros.diagram.edit.parts.ServiceClientEditPart;\nimport org.ros.model.ros.diagram.edit.parts.ServiceEditPart;\nimport org.ros.model.ros.diagram.edit.parts.ServiceServerEditPart;\n\t\t\tconnectedViews = getChildrenByType(Collections.singleton(sv),\n\t\t\t\t\tRosVisualIDRegistry.getType(NodeEditPart.VISUAL_ID));\n\t\t\tresult.addAll(createNavigatorItems(connectedViews, parentElement,\n\t\t\t\t\tfalse));\n\t\t\t\t\tRosVisualIDRegistry.getType(ServiceEditPart.VISUAL_ID));\n\t\t\tconnectedViews = getDiagramLinksByType(Collections.singleton(sv),\n\t\t\t\t\tRosVisualIDRegistry\n\t\t\t\t\t\t\t.getType(ServiceClientEditPart.VISUAL_ID));\n\t\t\tlinks.addChildren(createNavigatorItems(connectedViews, links, false));\n\t\t\tconnectedViews = getDiagramLinksByType(Collections.singleton(sv),\n\t\t\t\t\tRosVisualIDRegistry\n\t\t\t\t\t\t\t.getType(ServiceServerEditPart.VISUAL_ID));\n\t\t\tlinks.addChildren(createNavigatorItems(connectedViews, links, false));\n\t\t\t\t\tMessages.NavigatorGroupName_Subscriber_4002_target,\n\t\t\t\t\tMessages.NavigatorGroupName_Subscriber_4002_source,\n\t\t\t\t\tMessages.NavigatorGroupName_Topic_2002_incominglinks,\n\t\tcase ServiceEditPart.VISUAL_ID: {\n\t\t\tLinkedList<RosAbstractNavigatorItem> result = new LinkedList<RosAbstractNavigatorItem>();\n\t\t\tNode sv = (Node) view;\n\t\t\tRosNavigatorGroup incominglinks = new RosNavigatorGroup(\n\t\t\t\t\tMessages.NavigatorGroupName_Service_2003_incominglinks,\n\t\t\t\t\t\"icons/incomingLinksNavigatorGroup.gif\", parentElement); //$NON-NLS-1$\n\t\t\tCollection<View> connectedViews;\n\t\t\tconnectedViews = getIncomingLinksByType(Collections.singleton(sv),\n\t\t\t\t\tRosVisualIDRegistry\n\t\t\t\t\t\t\t.getType(ServiceClientEditPart.VISUAL_ID));\n\t\t\tincominglinks.addChildren(createNavigatorItems(connectedViews,\n\t\t\t\t\tincominglinks, true));\n\t\t\tconnectedViews = getIncomingLinksByType(Collections.singleton(sv),\n\t\t\t\t\tRosVisualIDRegistry\n\t\t\t\t\t\t\t.getType(ServiceServerEditPart.VISUAL_ID));\n\t\t\tincominglinks.addChildren(createNavigatorItems(connectedViews,\n\t\t\t\t\tincominglinks, true));\n\t\t\tif (!incominglinks.isEmpty()) {\n\t\t\t\tresult.add(incominglinks);\n\t\t\t}\n\t\t\treturn result.toArray();\n\t\t}\n\n\t\tcase NodeEditPart.VISUAL_ID: {\n\t\t\tLinkedList<RosAbstractNavigatorItem> result = new LinkedList<RosAbstractNavigatorItem>();\n\t\t\tNode sv = (Node) view;\n\t\t\tRosNavigatorGroup outgoinglinks = new RosNavigatorGroup(\n\t\t\t\t\tMessages.NavigatorGroupName_Node_2001_outgoinglinks,\n\t\t\t\t\t\"icons/outgoingLinksNavigatorGroup.gif\", parentElement); //$NON-NLS-1$\n\t\t\tCollection<View> connectedViews;\n\t\t\tconnectedViews = getChildrenByType(Collections.singleton(sv),\n\t\t\t\t\tRosVisualIDRegistry\n\t\t\t\t\t\t\t.getType(NodeParametersEditPart.VISUAL_ID));\n\t\t\tconnectedViews = getChildrenByType(connectedViews,\n\t\t\t\t\tRosVisualIDRegistry.getType(ParameterEditPart.VISUAL_ID));\n\t\t\tresult.addAll(createNavigatorItems(connectedViews, parentElement,\n\t\t\t\t\tfalse));\n\t\t\tconnectedViews = getOutgoingLinksByType(Collections.singleton(sv),\n\t\t\t\t\tRosVisualIDRegistry\n\t\t\t\t\t\t\t.getType(ServiceClientEditPart.VISUAL_ID));\n\t\t\toutgoinglinks.addChildren(createNavigatorItems(connectedViews,\n\t\t\t\t\toutgoinglinks, true));\n\t\t\tconnectedViews = getOutgoingLinksByType(Collections.singleton(sv),\n\t\t\t\t\tRosVisualIDRegistry.getType(SubscriberEditPart.VISUAL_ID));\n\t\t\toutgoinglinks.addChildren(createNavigatorItems(connectedViews,\n\t\t\t\t\toutgoinglinks, true));\n\t\t\tconnectedViews = getOutgoingLinksByType(Collections.singleton(sv),\n\t\t\t\t\tRosVisualIDRegistry\n\t\t\t\t\t\t\t.getType(ServiceServerEditPart.VISUAL_ID));\n\t\t\toutgoinglinks.addChildren(createNavigatorItems(connectedViews,\n\t\t\t\t\toutgoinglinks, true));\n\t\t\tconnectedViews = getOutgoingLinksByType(Collections.singleton(sv),\n\t\t\t\t\tRosVisualIDRegistry.getType(PublisherEditPart.VISUAL_ID));\n\t\t\toutgoinglinks.addChildren(createNavigatorItems(connectedViews,\n\t\t\t\t\toutgoinglinks, true));\n\t\t\tif (!outgoinglinks.isEmpty()) {\n\t\t\t\tresult.add(outgoinglinks);\n\t\t\t}\n\t\t\treturn result.toArray();\n\t\t}\n\n\t\tcase ServiceClientEditPart.VISUAL_ID: {\n\t\t\tLinkedList<RosAbstractNavigatorItem> result = new LinkedList<RosAbstractNavigatorItem>();\n\t\t\tEdge sv = (Edge) view;\n\t\t\tRosNavigatorGroup target = new RosNavigatorGroup(\n\t\t\t\t\tMessages.NavigatorGroupName_ServiceClient_4001_target,\n\t\t\t\t\t\"icons/linkTargetNavigatorGroup.gif\", parentElement); //$NON-NLS-1$\n\t\t\tRosNavigatorGroup source = new RosNavigatorGroup(\n\t\t\t\t\tMessages.NavigatorGroupName_ServiceClient_4001_source,\n\t\t\t\t\t\"icons/linkSourceNavigatorGroup.gif\", parentElement); //$NON-NLS-1$\n\t\t\tCollection<View> connectedViews;\n\t\t\tconnectedViews = getLinksTargetByType(Collections.singleton(sv),\n\t\t\t\t\tRosVisualIDRegistry.getType(ServiceEditPart.VISUAL_ID));\n\t\t\ttarget.addChildren(createNavigatorItems(connectedViews, target,\n\t\t\t\t\ttrue));\n\t\t\tconnectedViews = getLinksSourceByType(Collections.singleton(sv),\n\t\t\t\t\tRosVisualIDRegistry.getType(NodeEditPart.VISUAL_ID));\n\t\t\tsource.addChildren(createNavigatorItems(connectedViews, source,\n\t\t\t\t\ttrue));\n\t\t\tif (!target.isEmpty()) {\n\t\t\t\tresult.add(target);\n\t\t\t}\n\t\t\tif (!source.isEmpty()) {\n\t\t\t\tresult.add(source);\n\t\t\t}\n\t\t\treturn result.toArray();\n\t\t}\n\n\t\t\t\t\tMessages.NavigatorGroupName_Publisher_4004_target,\n\t\t\t\t\tMessages.NavigatorGroupName_Publisher_4004_source,\n\t\tcase ServiceServerEditPart.VISUAL_ID: {\n\t\t\tEdge sv = (Edge) view;\n\t\t\tRosNavigatorGroup target = new RosNavigatorGroup(\n\t\t\t\t\tMessages.NavigatorGroupName_ServiceServer_4003_target,\n\t\t\t\t\t\"icons/linkTargetNavigatorGroup.gif\", parentElement); //$NON-NLS-1$\n\t\t\tRosNavigatorGroup source = new RosNavigatorGroup(\n\t\t\t\t\tMessages.NavigatorGroupName_ServiceServer_4003_source,\n\t\t\t\t\t\"icons/linkSourceNavigatorGroup.gif\", parentElement); //$NON-NLS-1$\n\t\t\tconnectedViews = getLinksTargetByType(Collections.singleton(sv),\n\t\t\t\t\tRosVisualIDRegistry.getType(ServiceEditPart.VISUAL_ID));\n\t\t\ttarget.addChildren(createNavigatorItems(connectedViews, target,\n\t\t\t\t\ttrue));\n\t\t\tconnectedViews = getLinksSourceByType(Collections.singleton(sv),\n\t\t\t\t\tRosVisualIDRegistry.getType(NodeEditPart.VISUAL_ID));\n\t\t\tsource.addChildren(createNavigatorItems(connectedViews, source,\n\t\t\t\t\ttrue));\n\t\t\tif (!target.isEmpty()) {\n\t\t\t\tresult.add(target);\n\t\t\t}\n\t\t\tif (!source.isEmpty()) {\n\t\t\t\tresult.add(source);", "new_methods": [], "old_code": "\t\t\t\t\tRosVisualIDRegistry.getType(NodeEditPart.VISUAL_ID));\n\t\t\t\t\tMessages.NavigatorGroupName_Subscriber_4001_target,\n\t\t\t\t\tMessages.NavigatorGroupName_Subscriber_4001_source,\n\t\t\t\t\tMessages.NavigatorGroupName_Topic_2001_incominglinks,\n\t\t\t\t\tMessages.NavigatorGroupName_Publisher_4002_target,\n\t\t\t\t\tMessages.NavigatorGroupName_Publisher_4002_source,\n\t\tcase NodeEditPart.VISUAL_ID: {\n\t\t\tNode sv = (Node) view;\n\t\t\tRosNavigatorGroup outgoinglinks = new RosNavigatorGroup(\n\t\t\t\t\tMessages.NavigatorGroupName_Node_2002_outgoinglinks,\n\t\t\t\t\t\"icons/outgoingLinksNavigatorGroup.gif\", parentElement); //$NON-NLS-1$\n\t\t\tconnectedViews = getOutgoingLinksByType(Collections.singleton(sv),\n\t\t\t\t\tRosVisualIDRegistry.getType(SubscriberEditPart.VISUAL_ID));\n\t\t\toutgoinglinks.addChildren(createNavigatorItems(connectedViews,\n\t\t\t\t\toutgoinglinks, true));\n\t\t\tconnectedViews = getOutgoingLinksByType(Collections.singleton(sv),\n\t\t\t\t\tRosVisualIDRegistry.getType(PublisherEditPart.VISUAL_ID));\n\t\t\toutgoinglinks.addChildren(createNavigatorItems(connectedViews,\n\t\t\t\t\toutgoinglinks, true));\n\t\t\tif (!outgoinglinks.isEmpty()) {\n\t\t\t\tresult.add(outgoinglinks);", "old_methods": [], "patch": "@@ -23,8 +23,13 @@\n import org.eclipse.ui.navigator.ICommonContentExtensionSite;\n import org.eclipse.ui.navigator.ICommonContentProvider;\n import org.ros.model.ros.diagram.edit.parts.NodeEditPart;\n+import org.ros.model.ros.diagram.edit.parts.NodeParametersEditPart;\n import org.ros.model.ros.diagram.edit.parts.PackageEditPart;\n+import org.ros.model.ros.diagram.edit.parts.ParameterEditPart;\n import org.ros.model.ros.diagram.edit.parts.PublisherEditPart;\n+import org.ros.model.ros.diagram.edit.parts.ServiceClientEditPart;\n+import org.ros.model.ros.diagram.edit.parts.ServiceEditPart;\n+import org.ros.model.ros.diagram.edit.parts.ServiceServerEditPart;\n import org.ros.model.ros.diagram.edit.parts.SubscriberEditPart;\n import org.ros.model.ros.diagram.edit.parts.TopicEditPart;\n import org.ros.model.ros.diagram.part.Messages;\n@@ -224,17 +229,29 @@ private Object[] getViewChildren(View view, Object parentElement) {\n \t\t\t\t\tMessages.NavigatorGroupName_Package_1000_links,\n \t\t\t\t\t\"icons/linksNavigatorGroup.gif\", parentElement); //$NON-NLS-1$\n \t\t\tCollection<View> connectedViews;\n+\t\t\tconnectedViews = getChildrenByType(Collections.singleton(sv),\n+\t\t\t\t\tRosVisualIDRegistry.getType(NodeEditPart.VISUAL_ID));\n+\t\t\tresult.addAll(createNavigatorItems(connectedViews, parentElement,\n+\t\t\t\t\tfalse));\n \t\t\tconnectedViews = getChildrenByType(Collections.singleton(sv),\n \t\t\t\t\tRosVisualIDRegistry.getType(TopicEditPart.VISUAL_ID));\n \t\t\tresult.addAll(createNavigatorItems(connectedViews, parentElement,\n \t\t\t\t\tfalse));\n \t\t\tconnectedViews = getChildrenByType(Collections.singleton(sv),\n-\t\t\t\t\tRosVisualIDRegistry.getType(NodeEditPart.VISUAL_ID));\n+\t\t\t\t\tRosVisualIDRegistry.getType(ServiceEditPart.VISUAL_ID));\n \t\t\tresult.addAll(createNavigatorItems(connectedViews, parentElement,\n \t\t\t\t\tfalse));\n+\t\t\tconnectedViews = getDiagramLinksByType(Collections.singleton(sv),\n+\t\t\t\t\tRosVisualIDRegistry\n+\t\t\t\t\t\t\t.getType(ServiceClientEditPart.VISUAL_ID));\n+\t\t\tlinks.addChildren(createNavigatorItems(connectedViews, links, false));\n \t\t\tconnectedViews = getDiagramLinksByType(Collections.singleton(sv),\n \t\t\t\t\tRosVisualIDRegistry.getType(SubscriberEditPart.VISUAL_ID));\n \t\t\tlinks.addChildren(createNavigatorItems(connectedViews, links, false));\n+\t\t\tconnectedViews = getDiagramLinksByType(Collections.singleton(sv),\n+\t\t\t\t\tRosVisualIDRegistry\n+\t\t\t\t\t\t\t.getType(ServiceServerEditPart.VISUAL_ID));\n+\t\t\tlinks.addChildren(createNavigatorItems(connectedViews, links, false));\n \t\t\tconnectedViews = getDiagramLinksByType(Collections.singleton(sv),\n \t\t\t\t\tRosVisualIDRegistry.getType(PublisherEditPart.VISUAL_ID));\n \t\t\tlinks.addChildren(createNavigatorItems(connectedViews, links, false));\n@@ -248,10 +265,10 @@ private Object[] getViewChildren(View view, Object parentElement) {\n \t\t\tLinkedList<RosAbstractNavigatorItem> result = new LinkedList<RosAbstractNavigatorItem>();\n \t\t\tEdge sv = (Edge) view;\n \t\t\tRosNavigatorGroup target = new RosNavigatorGroup(\n-\t\t\t\t\tMessages.NavigatorGroupName_Subscriber_4001_target,\n+\t\t\t\t\tMessages.NavigatorGroupName_Subscriber_4002_target,\n \t\t\t\t\t\"icons/linkTargetNavigatorGroup.gif\", parentElement); //$NON-NLS-1$\n \t\t\tRosNavigatorGroup source = new RosNavigatorGroup(\n-\t\t\t\t\tMessages.NavigatorGroupName_Subscriber_4001_source,\n+\t\t\t\t\tMessages.NavigatorGroupName_Subscriber_4002_source,\n \t\t\t\t\t\"icons/linkSourceNavigatorGroup.gif\", parentElement); //$NON-NLS-1$\n \t\t\tCollection<View> connectedViews;\n \t\t\tconnectedViews = getLinksTargetByType(Collections.singleton(sv),\n@@ -275,7 +292,7 @@ private Object[] getViewChildren(View view, Object parentElement) {\n \t\t\tLinkedList<RosAbstractNavigatorItem> result = new LinkedList<RosAbstractNavigatorItem>();\n \t\t\tNode sv = (Node) view;\n \t\t\tRosNavigatorGroup incominglinks = new RosNavigatorGroup(\n-\t\t\t\t\tMessages.NavigatorGroupName_Topic_2001_incominglinks,\n+\t\t\t\t\tMessages.NavigatorGroupName_Topic_2002_incominglinks,\n \t\t\t\t\t\"icons/incomingLinksNavigatorGroup.gif\", parentElement); //$NON-NLS-1$\n \t\t\tCollection<View> connectedViews;\n \t\t\tconnectedViews = getIncomingLinksByType(Collections.singleton(sv),\n@@ -292,14 +309,102 @@ private Object[] getViewChildren(View view, Object parentElement) {\n \t\t\treturn result.toArray();\n \t\t}\n \n+\t\tcase ServiceEditPart.VISUAL_ID: {\n+\t\t\tLinkedList<RosAbstractNavigatorItem> result = new LinkedList<RosAbstractNavigatorItem>();\n+\t\t\tNode sv = (Node) view;\n+\t\t\tRosNavigatorGroup incominglinks = new RosNavigatorGroup(\n+\t\t\t\t\tMessages.NavigatorGroupName_Service_2003_incominglinks,\n+\t\t\t\t\t\"icons/incomingLinksNavigatorGroup.gif\", parentElement); //$NON-NLS-1$\n+\t\t\tCollection<View> connectedViews;\n+\t\t\tconnectedViews = getIncomingLinksByType(Collections.singleton(sv),\n+\t\t\t\t\tRosVisualIDRegistry\n+\t\t\t\t\t\t\t.getType(ServiceClientEditPart.VISUAL_ID));\n+\t\t\tincominglinks.addChildren(createNavigatorItems(connectedViews,\n+\t\t\t\t\tincominglinks, true));\n+\t\t\tconnectedViews = getIncomingLinksByType(Collections.singleton(sv),\n+\t\t\t\t\tRosVisualIDRegistry\n+\t\t\t\t\t\t\t.getType(ServiceServerEditPart.VISUAL_ID));\n+\t\t\tincominglinks.addChildren(createNavigatorItems(connectedViews,\n+\t\t\t\t\tincominglinks, true));\n+\t\t\tif (!incominglinks.isEmpty()) {\n+\t\t\t\tresult.add(incominglinks);\n+\t\t\t}\n+\t\t\treturn result.toArray();\n+\t\t}\n+\n+\t\tcase NodeEditPart.VISUAL_ID: {\n+\t\t\tLinkedList<RosAbstractNavigatorItem> result = new LinkedList<RosAbstractNavigatorItem>();\n+\t\t\tNode sv = (Node) view;\n+\t\t\tRosNavigatorGroup outgoinglinks = new RosNavigatorGroup(\n+\t\t\t\t\tMessages.NavigatorGroupName_Node_2001_outgoinglinks,\n+\t\t\t\t\t\"icons/outgoingLinksNavigatorGroup.gif\", parentElement); //$NON-NLS-1$\n+\t\t\tCollection<View> connectedViews;\n+\t\t\tconnectedViews = getChildrenByType(Collections.singleton(sv),\n+\t\t\t\t\tRosVisualIDRegistry\n+\t\t\t\t\t\t\t.getType(NodeParametersEditPart.VISUAL_ID));\n+\t\t\tconnectedViews = getChildrenByType(connectedViews,\n+\t\t\t\t\tRosVisualIDRegistry.getType(ParameterEditPart.VISUAL_ID));\n+\t\t\tresult.addAll(createNavigatorItems(connectedViews, parentElement,\n+\t\t\t\t\tfalse));\n+\t\t\tconnectedViews = getOutgoingLinksByType(Collections.singleton(sv),\n+\t\t\t\t\tRosVisualIDRegistry\n+\t\t\t\t\t\t\t.getType(ServiceClientEditPart.VISUAL_ID));\n+\t\t\toutgoinglinks.addChildren(createNavigatorItems(connectedViews,\n+\t\t\t\t\toutgoinglinks, true));\n+\t\t\tconnectedViews = getOutgoingLinksByType(Collections.singleton(sv),\n+\t\t\t\t\tRosVisualIDRegistry.getType(SubscriberEditPart.VISUAL_ID));\n+\t\t\toutgoinglinks.addChildren(createNavigatorItems(connectedViews,\n+\t\t\t\t\toutgoinglinks, true));\n+\t\t\tconnectedViews = getOutgoingLinksByType(Collections.singleton(sv),\n+\t\t\t\t\tRosVisualIDRegistry\n+\t\t\t\t\t\t\t.getType(ServiceServerEditPart.VISUAL_ID));\n+\t\t\toutgoinglinks.addChildren(createNavigatorItems(connectedViews,\n+\t\t\t\t\toutgoinglinks, true));\n+\t\t\tconnectedViews = getOutgoingLinksByType(Collections.singleton(sv),\n+\t\t\t\t\tRosVisualIDRegistry.getType(PublisherEditPart.VISUAL_ID));\n+\t\t\toutgoinglinks.addChildren(createNavigatorItems(connectedViews,\n+\t\t\t\t\toutgoinglinks, true));\n+\t\t\tif (!outgoinglinks.isEmpty()) {\n+\t\t\t\tresult.add(outgoinglinks);\n+\t\t\t}\n+\t\t\treturn result.toArray();\n+\t\t}\n+\n+\t\tcase ServiceClientEditPart.VISUAL_ID: {\n+\t\t\tLinkedList<RosAbstractNavigatorItem> result = new LinkedList<RosAbstractNavigatorItem>();\n+\t\t\tEdge sv = (Edge) view;\n+\t\t\tRosNavigatorGroup target = new RosNavigatorGroup(\n+\t\t\t\t\tMessages.NavigatorGroupName_ServiceClient_4001_target,\n+\t\t\t\t\t\"icons/linkTargetNavigatorGroup.gif\", parentElement); //$NON-NLS-1$\n+\t\t\tRosNavigatorGroup source = new RosNavigatorGroup(\n+\t\t\t\t\tMessages.NavigatorGroupName_ServiceClient_4001_source,\n+\t\t\t\t\t\"icons/linkSourceNavigatorGroup.gif\", parentElement); //$NON-NLS-1$\n+\t\t\tCollection<View> connectedViews;\n+\t\t\tconnectedViews = getLinksTargetByType(Collections.singleton(sv),\n+\t\t\t\t\tRosVisualIDRegistry.getType(ServiceEditPart.VISUAL_ID));\n+\t\t\ttarget.addChildren(createNavigatorItems(connectedViews, target,\n+\t\t\t\t\ttrue));\n+\t\t\tconnectedViews = getLinksSourceByType(Collections.singleton(sv),\n+\t\t\t\t\tRosVisualIDRegistry.getType(NodeEditPart.VISUAL_ID));\n+\t\t\tsource.addChildren(createNavigatorItems(connectedViews, source,\n+\t\t\t\t\ttrue));\n+\t\t\tif (!target.isEmpty()) {\n+\t\t\t\tresult.add(target);\n+\t\t\t}\n+\t\t\tif (!source.isEmpty()) {\n+\t\t\t\tresult.add(source);\n+\t\t\t}\n+\t\t\treturn result.toArray();\n+\t\t}\n+\n \t\tcase PublisherEditPart.VISUAL_ID: {\n \t\t\tLinkedList<RosAbstractNavigatorItem> result = new LinkedList<RosAbstractNavigatorItem>();\n \t\t\tEdge sv = (Edge) view;\n \t\t\tRosNavigatorGroup target = new RosNavigatorGroup(\n-\t\t\t\t\tMessages.NavigatorGroupName_Publisher_4002_target,\n+\t\t\t\t\tMessages.NavigatorGroupName_Publisher_4004_target,\n \t\t\t\t\t\"icons/linkTargetNavigatorGroup.gif\", parentElement); //$NON-NLS-1$\n \t\t\tRosNavigatorGroup source = new RosNavigatorGroup(\n-\t\t\t\t\tMessages.NavigatorGroupName_Publisher_4002_source,\n+\t\t\t\t\tMessages.NavigatorGroupName_Publisher_4004_source,\n \t\t\t\t\t\"icons/linkSourceNavigatorGroup.gif\", parentElement); //$NON-NLS-1$\n \t\t\tCollection<View> connectedViews;\n \t\t\tconnectedViews = getLinksTargetByType(Collections.singleton(sv),\n@@ -319,23 +424,29 @@ private Object[] getViewChildren(View view, Object parentElement) {\n \t\t\treturn result.toArray();\n \t\t}\n \n-\t\tcase NodeEditPart.VISUAL_ID: {\n+\t\tcase ServiceServerEditPart.VISUAL_ID: {\n \t\t\tLinkedList<RosAbstractNavigatorItem> result = new LinkedList<RosAbstractNavigatorItem>();\n-\t\t\tNode sv = (Node) view;\n-\t\t\tRosNavigatorGroup outgoinglinks = new RosNavigatorGroup(\n-\t\t\t\t\tMessages.NavigatorGroupName_Node_2002_outgoinglinks,\n-\t\t\t\t\t\"icons/outgoingLinksNavigatorGroup.gif\", parentElement); //$NON-NLS-1$\n+\t\t\tEdge sv = (Edge) view;\n+\t\t\tRosNavigatorGroup target = new RosNavigatorGroup(\n+\t\t\t\t\tMessages.NavigatorGroupName_ServiceServer_4003_target,\n+\t\t\t\t\t\"icons/linkTargetNavigatorGroup.gif\", parentElement); //$NON-NLS-1$\n+\t\t\tRosNavigatorGroup source = new RosNavigatorGroup(\n+\t\t\t\t\tMessages.NavigatorGroupName_ServiceServer_4003_source,\n+\t\t\t\t\t\"icons/linkSourceNavigatorGroup.gif\", parentElement); //$NON-NLS-1$\n \t\t\tCollection<View> connectedViews;\n-\t\t\tconnectedViews = getOutgoingLinksByType(Collections.singleton(sv),\n-\t\t\t\t\tRosVisualIDRegistry.getType(SubscriberEditPart.VISUAL_ID));\n-\t\t\toutgoinglinks.addChildren(createNavigatorItems(connectedViews,\n-\t\t\t\t\toutgoinglinks, true));\n-\t\t\tconnectedViews = getOutgoingLinksByType(Collections.singleton(sv),\n-\t\t\t\t\tRosVisualIDRegistry.getType(PublisherEditPart.VISUAL_ID));\n-\t\t\toutgoinglinks.addChildren(createNavigatorItems(connectedViews,\n-\t\t\t\t\toutgoinglinks, true));\n-\t\t\tif (!outgoinglinks.isEmpty()) {\n-\t\t\t\tresult.add(outgoinglinks);\n+\t\t\tconnectedViews = getLinksTargetByType(Collections.singleton(sv),\n+\t\t\t\t\tRosVisualIDRegistry.getType(ServiceEditPart.VISUAL_ID));\n+\t\t\ttarget.addChildren(createNavigatorItems(connectedViews, target,\n+\t\t\t\t\ttrue));\n+\t\t\tconnectedViews = getLinksSourceByType(Collections.singleton(sv),\n+\t\t\t\t\tRosVisualIDRegistry.getType(NodeEditPart.VISUAL_ID));\n+\t\t\tsource.addChildren(createNavigatorItems(connectedViews, source,\n+\t\t\t\t\ttrue));\n+\t\t\tif (!target.isEmpty()) {\n+\t\t\t\tresult.add(target);\n+\t\t\t}\n+\t\t\tif (!source.isEmpty()) {\n+\t\t\t\tresult.add(source);\n \t\t\t}\n \t\t\treturn result.toArray();\n \t\t}", "raw_url": "https://github.com/ipa320/bride/raw/01bc5c83c895357f23a345ecec85a3796cf66358/org.ros.model.ros.diagram%2Fsrc%2Forg%2Fros%2Fmodel%2Fros%2Fdiagram%2Fnavigator%2FRosNavigatorContentProvider.java", "sha": "0edf2280905d826a4fc0ed853d7a992e25316b61", "status": "modified" }, { "additions": 127, "blob_url": "https://github.com/ipa320/bride/blob/01bc5c83c895357f23a345ecec85a3796cf66358/org.ros.model.ros.diagram%2Fsrc%2Forg%2Fros%2Fmodel%2Fros%2Fdiagram%2Fnavigator%2FRosNavigatorLabelProvider.java", "changes": 149, "contents_url": "https://api.github.com/repos/ipa320/bride/contents/org.ros.model.ros.diagram%2Fsrc%2Forg%2Fros%2Fmodel%2Fros%2Fdiagram%2Fnavigator%2FRosNavigatorLabelProvider.java?ref=01bc5c83c895357f23a345ecec85a3796cf66358", "deletions": 22, "filename": "org.ros.model.ros.diagram/src/org/ros/model/ros/diagram/navigator/RosNavigatorLabelProvider.java", "new_code": "import org.ros.model.ros.diagram.edit.parts.ParameterEditPart;\nimport org.ros.model.ros.diagram.edit.parts.ServiceClientEditPart;\nimport org.ros.model.ros.diagram.edit.parts.ServiceClientNameEditPart;\nimport org.ros.model.ros.diagram.edit.parts.ServiceEditPart;\nimport org.ros.model.ros.diagram.edit.parts.ServiceNameEditPart;\nimport org.ros.model.ros.diagram.edit.parts.ServiceServerEditPart;\nimport org.ros.model.ros.diagram.edit.parts.ServiceServerNameEditPart;\n\t\t\t\t\t\"Navigator?Link?http://ros/1.0?Subscriber\", RosElementTypes.Subscriber_4002); //$NON-NLS-1$\n\t\t\t\t\t\"Navigator?TopLevelNode?http://ros/1.0?Topic\", RosElementTypes.Topic_2002); //$NON-NLS-1$\n\t\tcase ServiceEditPart.VISUAL_ID:\n\t\t\t\t\t\"Navigator?TopLevelNode?http://ros/1.0?Service\", RosElementTypes.Service_2003); //$NON-NLS-1$\n\t\t\t\t\t\"Navigator?TopLevelNode?http://ros/1.0?Node\", RosElementTypes.Node_2001); //$NON-NLS-1$\n\t\tcase ServiceClientEditPart.VISUAL_ID:\n\t\t\treturn getImage(\n\t\t\t\t\t\"Navigator?Link?http://ros/1.0?ServiceClient\", RosElementTypes.ServiceClient_4001); //$NON-NLS-1$\n\t\tcase PublisherEditPart.VISUAL_ID:\n\t\t\treturn getImage(\n\t\t\t\t\t\"Navigator?Link?http://ros/1.0?Publisher\", RosElementTypes.Publisher_4004); //$NON-NLS-1$\n\t\tcase ServiceServerEditPart.VISUAL_ID:\n\t\t\treturn getImage(\n\t\t\t\t\t\"Navigator?Link?http://ros/1.0?ServiceServer\", RosElementTypes.ServiceServer_4003); //$NON-NLS-1$\n\t\tcase ParameterEditPart.VISUAL_ID:\n\t\t\treturn getImage(\n\t\t\t\t\t\"Navigator?Node?http://ros/1.0?Parameter\", RosElementTypes.Parameter_3001); //$NON-NLS-1$\n\t\t\treturn getSubscriber_4002Text(view);\n\t\t\treturn getTopic_2002Text(view);\n\t\tcase ServiceEditPart.VISUAL_ID:\n\t\t\treturn getService_2003Text(view);\n\t\t\treturn getNode_2001Text(view);\n\t\tcase ServiceClientEditPart.VISUAL_ID:\n\t\t\treturn getServiceClient_4001Text(view);\n\t\tcase PublisherEditPart.VISUAL_ID:\n\t\t\treturn getPublisher_4004Text(view);\n\t\tcase ServiceServerEditPart.VISUAL_ID:\n\t\t\treturn getServiceServer_4003Text(view);\n\t\tcase ParameterEditPart.VISUAL_ID:\n\t\t\treturn getParameter_3001Text(view);\n\tprivate String getSubscriber_4002Text(View view) {\n\t\t\t\tRosElementTypes.Subscriber_4002,\n\t\t\t\t\t\"Parser was not found for label \" + 6002); //$NON-NLS-1$\n\tprivate String getTopic_2002Text(View view) {\n\t\t\t\tRosElementTypes.Topic_2002,\n\t\t} else {\n\t\t\tRosDiagramEditorPlugin.getInstance().logError(\n\t\t\t\t\t\"Parser was not found for label \" + 5002); //$NON-NLS-1$\n\t\t\treturn \"\"; //$NON-NLS-1$\n\t\t}\n\t}\n\n\t/**\n\t * @generated\n\t */\n\tprivate String getService_2003Text(View view) {\n\t\tIParser parser = RosParserProvider.getParser(\n\t\t\t\tRosElementTypes.Service_2003,\n\t\t\t\tview.getElement() != null ? view.getElement() : view,\n\t\t\t\tRosVisualIDRegistry.getType(ServiceNameEditPart.VISUAL_ID));\n\t\tif (parser != null) {\n\t\t\treturn parser.getPrintString(new EObjectAdapter(\n\t\t\t\t\tview.getElement() != null ? view.getElement() : view),\n\t\t\t\t\tParserOptions.NONE.intValue());\n\t\t} else {\n\t\t\tRosDiagramEditorPlugin.getInstance().logError(\n\t\t\t\t\t\"Parser was not found for label \" + 5003); //$NON-NLS-1$\n\t\t\treturn \"\"; //$NON-NLS-1$\n\t\t}\n\t}\n\n\t/**\n\t * @generated\n\t */\n\tprivate String getNode_2001Text(View view) {\n\t\tIParser parser = RosParserProvider.getParser(RosElementTypes.Node_2001,\n\t\t\t\tview.getElement() != null ? view.getElement() : view,\n\t\t\t\tRosVisualIDRegistry.getType(NodeNameEditPart.VISUAL_ID));\n\t\tif (parser != null) {\n\t\t\treturn parser.getPrintString(new EObjectAdapter(\n\t\t\t\t\tview.getElement() != null ? view.getElement() : view),\n\t\t\t\t\tParserOptions.NONE.intValue());\n\tprivate String getServiceClient_4001Text(View view) {\n\t\tIParser parser = RosParserProvider.getParser(\n\t\t\t\tRosElementTypes.ServiceClient_4001,\n\t\t\t\tview.getElement() != null ? view.getElement() : view,\n\t\t\t\tRosVisualIDRegistry\n\t\t\t\t\t\t.getType(ServiceClientNameEditPart.VISUAL_ID));\n\t\tif (parser != null) {\n\t\t\treturn parser.getPrintString(new EObjectAdapter(\n\t\t\t\t\tview.getElement() != null ? view.getElement() : view),\n\t\t\t\t\tParserOptions.NONE.intValue());\n\t\t} else {\n\t\t\tRosDiagramEditorPlugin.getInstance().logError(\n\t\t\t\t\t\"Parser was not found for label \" + 6001); //$NON-NLS-1$\n\t\t\treturn \"\"; //$NON-NLS-1$\n\t\t}\n\t}\n\n\t/**\n\t * @generated\n\t */\n\tprivate String getPublisher_4004Text(View view) {\n\t\t\t\tRosElementTypes.Publisher_4004,\n\t\t\t\t\t\"Parser was not found for label \" + 6004); //$NON-NLS-1$\n\tprivate String getServiceServer_4003Text(View view) {\n\t\tIParser parser = RosParserProvider.getParser(\n\t\t\t\tRosElementTypes.ServiceServer_4003,\n\t\t\t\tRosVisualIDRegistry\n\t\t\t\t\t\t.getType(ServiceServerNameEditPart.VISUAL_ID));\n\t\t\t\t\t\"Parser was not found for label \" + 6003); //$NON-NLS-1$\n\t\t\treturn \"\"; //$NON-NLS-1$\n\t\t}\n\t}\n\n\t/**\n\t * @generated\n\t */\n\tprivate String getParameter_3001Text(View view) {\n\t\tIParser parser = RosParserProvider.getParser(\n\t\t\t\tRosElementTypes.Parameter_3001,\n\t\t\t\tview.getElement() != null ? view.getElement() : view,\n\t\t\t\tRosVisualIDRegistry.getType(ParameterEditPart.VISUAL_ID));\n\t\tif (parser != null) {\n\t\t\treturn parser.getPrintString(new EObjectAdapter(\n\t\t\t\t\tview.getElement() != null ? view.getElement() : view),\n\t\t\t\t\tParserOptions.NONE.intValue());\n\t\t} else {\n\t\t\tRosDiagramEditorPlugin.getInstance().logError(\n\t\t\t\t\t\"Parser was not found for label \" + 3001); //$NON-NLS-1$", "new_methods": [ { "arguments": [ "View view" ], "filename": "org.ros.model.ros.diagram/src/org/ros/model/ros/diagram/navigator/RosNavigatorLabelProvider.java", "implementation": "RosElementTypes.Subscriber_4002,\n\t\t\t\t\t\"Parser was not found for label \" + 6002); //$NON-NLS-1$\n\tprivate String getTopic_2002Text(View view) {\n\t\t\t\tRosElementTypes.Topic_2002,", "signature": "String getSubscriber_4002Text(View view)" }, { "arguments": [ "View view" ], "filename": "org.ros.model.ros.diagram/src/org/ros/model/ros/diagram/navigator/RosNavigatorLabelProvider.java", "implementation": "IParser parser = RosParserProvider.getParser(\n\t\t\t\tRosElementTypes.Service_2003,\n\t\t\t\tview.getElement() != null ? view.getElement() : view,\n\t\t\t\tRosVisualIDRegistry.getType(ServiceNameEditPart.VISUAL_ID));\n\t\tif (parser != null) {\n\t\t\treturn parser.getPrintString(new EObjectAdapter(\n\t\t\t\t\tview.getElement() != null ? view.getElement() : view),\n\t\t\t\t\tParserOptions.NONE.intValue());", "signature": "String getService_2003Text(View view)" }, { "arguments": [ "View view" ], "filename": "org.ros.model.ros.diagram/src/org/ros/model/ros/diagram/navigator/RosNavigatorLabelProvider.java", "implementation": "IParser parser = RosParserProvider.getParser(RosElementTypes.Node_2001,\n\t\t\t\tview.getElement() != null ? view.getElement() : view,\n\t\t\t\tRosVisualIDRegistry.getType(NodeNameEditPart.VISUAL_ID));\n\t\tif (parser != null) {\n\t\t\treturn parser.getPrintString(new EObjectAdapter(\n\t\t\t\t\tview.getElement() != null ? view.getElement() : view),\n\t\t\t\t\tParserOptions.NONE.intValue());\n\tprivate String getServiceClient_4001Text(View view) {\n\t\tIParser parser = RosParserProvider.getParser(\n\t\t\t\tRosElementTypes.ServiceClient_4001,\n\t\t\t\tview.getElement() != null ? view.getElement() : view,\n\t\t\t\tRosVisualIDRegistry\n\t\t\t\t\t\t.getType(ServiceClientNameEditPart.VISUAL_ID));\n\t\tif (parser != null) {\n\t\t\treturn parser.getPrintString(new EObjectAdapter(\n\t\t\t\t\tview.getElement() != null ? view.getElement() : view),\n\t\t\t\t\tParserOptions.NONE.intValue());", "signature": "String getNode_2001Text(View view)" }, { "arguments": [ "View view" ], "filename": "org.ros.model.ros.diagram/src/org/ros/model/ros/diagram/navigator/RosNavigatorLabelProvider.java", "implementation": "RosElementTypes.Publisher_4004,\n\t\t\t\t\t\"Parser was not found for label \" + 6004); //$NON-NLS-1$\n\tprivate String getServiceServer_4003Text(View view) {\n\t\tIParser parser = RosParserProvider.getParser(\n\t\t\t\tRosElementTypes.ServiceServer_4003,\n\t\t\t\tRosVisualIDRegistry\n\t\t\t\t\t\t.getType(ServiceServerNameEditPart.VISUAL_ID));\n\t\t\t\t\t\"Parser was not found for label \" + 6003); //$NON-NLS-1$\n\t\t\treturn \"\"; //$NON-NLS-1$", "signature": "String getPublisher_4004Text(View view)" }, { "arguments": [ "View view" ], "filename": "org.ros.model.ros.diagram/src/org/ros/model/ros/diagram/navigator/RosNavigatorLabelProvider.java", "implementation": "IParser parser = RosParserProvider.getParser(\n\t\t\t\tRosElementTypes.Parameter_3001,\n\t\t\t\tview.getElement() != null ? view.getElement() : view,\n\t\t\t\tRosVisualIDRegistry.getType(ParameterEditPart.VISUAL_ID));\n\t\tif (parser != null) {\n\t\t\treturn parser.getPrintString(new EObjectAdapter(\n\t\t\t\t\tview.getElement() != null ? view.getElement() : view),\n\t\t\t\t\tParserOptions.NONE.intValue());", "signature": "String getParameter_3001Text(View view)" } ], "old_code": "\t\t\t\t\t\"Navigator?Link?http://ros/1.0?Subscriber\", RosElementTypes.Subscriber_4001); //$NON-NLS-1$\n\t\t\t\t\t\"Navigator?TopLevelNode?http://ros/1.0?Topic\", RosElementTypes.Topic_2001); //$NON-NLS-1$\n\t\tcase PublisherEditPart.VISUAL_ID:\n\t\t\t\t\t\"Navigator?Link?http://ros/1.0?Publisher\", RosElementTypes.Publisher_4002); //$NON-NLS-1$\n\t\t\t\t\t\"Navigator?TopLevelNode?http://ros/1.0?Node\", RosElementTypes.Node_2002); //$NON-NLS-1$\n\t\t\treturn getSubscriber_4001Text(view);\n\t\t\treturn getTopic_2001Text(view);\n\t\tcase PublisherEditPart.VISUAL_ID:\n\t\t\treturn getPublisher_4002Text(view);\n\t\t\treturn getNode_2002Text(view);\n\tprivate String getSubscriber_4001Text(View view) {\n\t\t\t\tRosElementTypes.Subscriber_4001,\n\t\t\t\t\t\"Parser was not found for label \" + 6001); //$NON-NLS-1$\n\tprivate String getTopic_2001Text(View view) {\n\t\t\t\tRosElementTypes.Topic_2001,\n\tprivate String getPublisher_4002Text(View view) {\n\t\t\t\tRosElementTypes.Publisher_4002,\n\t\t\t\t\t\"Parser was not found for label \" + 6002); //$NON-NLS-1$\n\tprivate String getNode_2002Text(View view) {\n\t\tIParser parser = RosParserProvider.getParser(RosElementTypes.Node_2002,\n\t\t\t\tRosVisualIDRegistry.getType(NodeNameEditPart.VISUAL_ID));\n\t\t\t\t\t\"Parser was not found for label \" + 5002); //$NON-NLS-1$", "old_methods": [], "patch": "@@ -19,8 +19,15 @@\n import org.ros.model.ros.diagram.edit.parts.NodeEditPart;\n import org.ros.model.ros.diagram.edit.parts.NodeNameEditPart;\n import org.ros.model.ros.diagram.edit.parts.PackageEditPart;\n+import org.ros.model.ros.diagram.edit.parts.ParameterEditPart;\n import org.ros.model.ros.diagram.edit.parts.PublisherEditPart;\n import org.ros.model.ros.diagram.edit.parts.PublisherNameEditPart;\n+import org.ros.model.ros.diagram.edit.parts.ServiceClientEditPart;\n+import org.ros.model.ros.diagram.edit.parts.ServiceClientNameEditPart;\n+import org.ros.model.ros.diagram.edit.parts.ServiceEditPart;\n+import org.ros.model.ros.diagram.edit.parts.ServiceNameEditPart;\n+import org.ros.model.ros.diagram.edit.parts.ServiceServerEditPart;\n+import org.ros.model.ros.diagram.edit.parts.ServiceServerNameEditPart;\n import org.ros.model.ros.diagram.edit.parts.SubscriberEditPart;\n import org.ros.model.ros.diagram.edit.parts.SubscriberNameEditPart;\n import org.ros.model.ros.diagram.edit.parts.TopicEditPart;\n@@ -94,16 +101,28 @@ public Image getImage(View view) {\n \t\t\t\t\t\"Navigator?Diagram?http://ros/1.0?Package\", RosElementTypes.Package_1000); //$NON-NLS-1$\n \t\tcase SubscriberEditPart.VISUAL_ID:\n \t\t\treturn getImage(\n-\t\t\t\t\t\"Navigator?Link?http://ros/1.0?Subscriber\", RosElementTypes.Subscriber_4001); //$NON-NLS-1$\n+\t\t\t\t\t\"Navigator?Link?http://ros/1.0?Subscriber\", RosElementTypes.Subscriber_4002); //$NON-NLS-1$\n \t\tcase TopicEditPart.VISUAL_ID:\n \t\t\treturn getImage(\n-\t\t\t\t\t\"Navigator?TopLevelNode?http://ros/1.0?Topic\", RosElementTypes.Topic_2001); //$NON-NLS-1$\n-\t\tcase PublisherEditPart.VISUAL_ID:\n+\t\t\t\t\t\"Navigator?TopLevelNode?http://ros/1.0?Topic\", RosElementTypes.Topic_2002); //$NON-NLS-1$\n+\t\tcase ServiceEditPart.VISUAL_ID:\n \t\t\treturn getImage(\n-\t\t\t\t\t\"Navigator?Link?http://ros/1.0?Publisher\", RosElementTypes.Publisher_4002); //$NON-NLS-1$\n+\t\t\t\t\t\"Navigator?TopLevelNode?http://ros/1.0?Service\", RosElementTypes.Service_2003); //$NON-NLS-1$\n \t\tcase NodeEditPart.VISUAL_ID:\n \t\t\treturn getImage(\n-\t\t\t\t\t\"Navigator?TopLevelNode?http://ros/1.0?Node\", RosElementTypes.Node_2002); //$NON-NLS-1$\n+\t\t\t\t\t\"Navigator?TopLevelNode?http://ros/1.0?Node\", RosElementTypes.Node_2001); //$NON-NLS-1$\n+\t\tcase ServiceClientEditPart.VISUAL_ID:\n+\t\t\treturn getImage(\n+\t\t\t\t\t\"Navigator?Link?http://ros/1.0?ServiceClient\", RosElementTypes.ServiceClient_4001); //$NON-NLS-1$\n+\t\tcase PublisherEditPart.VISUAL_ID:\n+\t\t\treturn getImage(\n+\t\t\t\t\t\"Navigator?Link?http://ros/1.0?Publisher\", RosElementTypes.Publisher_4004); //$NON-NLS-1$\n+\t\tcase ServiceServerEditPart.VISUAL_ID:\n+\t\t\treturn getImage(\n+\t\t\t\t\t\"Navigator?Link?http://ros/1.0?ServiceServer\", RosElementTypes.ServiceServer_4003); //$NON-NLS-1$\n+\t\tcase ParameterEditPart.VISUAL_ID:\n+\t\t\treturn getImage(\n+\t\t\t\t\t\"Navigator?Node?http://ros/1.0?Parameter\", RosElementTypes.Parameter_3001); //$NON-NLS-1$\n \t\t}\n \t\treturn getImage(\"Navigator?UnknownElement\", null); //$NON-NLS-1$\n \t}\n@@ -159,13 +178,21 @@ public String getText(View view) {\n \t\tcase PackageEditPart.VISUAL_ID:\n \t\t\treturn getPackage_1000Text(view);\n \t\tcase SubscriberEditPart.VISUAL_ID:\n-\t\t\treturn getSubscriber_4001Text(view);\n+\t\t\treturn getSubscriber_4002Text(view);\n \t\tcase TopicEditPart.VISUAL_ID:\n-\t\t\treturn getTopic_2001Text(view);\n-\t\tcase PublisherEditPart.VISUAL_ID:\n-\t\t\treturn getPublisher_4002Text(view);\n+\t\t\treturn getTopic_2002Text(view);\n+\t\tcase ServiceEditPart.VISUAL_ID:\n+\t\t\treturn getService_2003Text(view);\n \t\tcase NodeEditPart.VISUAL_ID:\n-\t\t\treturn getNode_2002Text(view);\n+\t\t\treturn getNode_2001Text(view);\n+\t\tcase ServiceClientEditPart.VISUAL_ID:\n+\t\t\treturn getServiceClient_4001Text(view);\n+\t\tcase PublisherEditPart.VISUAL_ID:\n+\t\t\treturn getPublisher_4004Text(view);\n+\t\tcase ServiceServerEditPart.VISUAL_ID:\n+\t\t\treturn getServiceServer_4003Text(view);\n+\t\tcase ParameterEditPart.VISUAL_ID:\n+\t\t\treturn getParameter_3001Text(view);\n \t\t}\n \t\treturn getUnknownElementText(view);\n \t}\n@@ -187,9 +214,9 @@ private String getPackage_1000Text(View view) {\n \t/**\n \t * @generated\n \t */\n-\tprivate String getSubscriber_4001Text(View view) {\n+\tprivate String getSubscriber_4002Text(View view) {\n \t\tIParser parser = RosParserProvider.getParser(\n-\t\t\t\tRosElementTypes.Subscriber_4001,\n+\t\t\t\tRosElementTypes.Subscriber_4002,\n \t\t\t\tview.getElement() != null ? view.getElement() : view,\n \t\t\t\tRosVisualIDRegistry.getType(SubscriberNameEditPart.VISUAL_ID));\n \t\tif (parser != null) {\n@@ -198,23 +225,60 @@ private String getSubscriber_4001Text(View view) {\n \t\t\t\t\tParserOptions.NONE.intValue());\n \t\t} else {\n \t\t\tRosDiagramEditorPlugin.getInstance().logError(\n-\t\t\t\t\t\"Parser was not found for label \" + 6001); //$NON-NLS-1$\n+\t\t\t\t\t\"Parser was not found for label \" + 6002); //$NON-NLS-1$\n \t\t\treturn \"\"; //$NON-NLS-1$\n \t\t}\n \t}\n \n \t/**\n \t * @generated\n \t */\n-\tprivate String getTopic_2001Text(View view) {\n+\tprivate String getTopic_2002Text(View view) {\n \t\tIParser parser = RosParserProvider.getParser(\n-\t\t\t\tRosElementTypes.Topic_2001,\n+\t\t\t\tRosElementTypes.Topic_2002,\n \t\t\t\tview.getElement() != null ? view.getElement() : view,\n \t\t\t\tRosVisualIDRegistry.getType(TopicNameEditPart.VISUAL_ID));\n \t\tif (parser != null) {\n \t\t\treturn parser.getPrintString(new EObjectAdapter(\n \t\t\t\t\tview.getElement() != null ? view.getElement() : view),\n \t\t\t\t\tParserOptions.NONE.intValue());\n+\t\t} else {\n+\t\t\tRosDiagramEditorPlugin.getInstance().logError(\n+\t\t\t\t\t\"Parser was not found for label \" + 5002); //$NON-NLS-1$\n+\t\t\treturn \"\"; //$NON-NLS-1$\n+\t\t}\n+\t}\n+\n+\t/**\n+\t * @generated\n+\t */\n+\tprivate String getService_2003Text(View view) {\n+\t\tIParser parser = RosParserProvider.getParser(\n+\t\t\t\tRosElementTypes.Service_2003,\n+\t\t\t\tview.getElement() != null ? view.getElement() : view,\n+\t\t\t\tRosVisualIDRegistry.getType(ServiceNameEditPart.VISUAL_ID));\n+\t\tif (parser != null) {\n+\t\t\treturn parser.getPrintString(new EObjectAdapter(\n+\t\t\t\t\tview.getElement() != null ? view.getElement() : view),\n+\t\t\t\t\tParserOptions.NONE.intValue());\n+\t\t} else {\n+\t\t\tRosDiagramEditorPlugin.getInstance().logError(\n+\t\t\t\t\t\"Parser was not found for label \" + 5003); //$NON-NLS-1$\n+\t\t\treturn \"\"; //$NON-NLS-1$\n+\t\t}\n+\t}\n+\n+\t/**\n+\t * @generated\n+\t */\n+\tprivate String getNode_2001Text(View view) {\n+\t\tIParser parser = RosParserProvider.getParser(RosElementTypes.Node_2001,\n+\t\t\t\tview.getElement() != null ? view.getElement() : view,\n+\t\t\t\tRosVisualIDRegistry.getType(NodeNameEditPart.VISUAL_ID));\n+\t\tif (parser != null) {\n+\t\t\treturn parser.getPrintString(new EObjectAdapter(\n+\t\t\t\t\tview.getElement() != null ? view.getElement() : view),\n+\t\t\t\t\tParserOptions.NONE.intValue());\n \t\t} else {\n \t\t\tRosDiagramEditorPlugin.getInstance().logError(\n \t\t\t\t\t\"Parser was not found for label \" + 5001); //$NON-NLS-1$\n@@ -225,9 +289,29 @@ private String getTopic_2001Text(View view) {\n \t/**\n \t * @generated\n \t */\n-\tprivate String getPublisher_4002Text(View view) {\n+\tprivate String getServiceClient_4001Text(View view) {\n+\t\tIParser parser = RosParserProvider.getParser(\n+\t\t\t\tRosElementTypes.ServiceClient_4001,\n+\t\t\t\tview.getElement() != null ? view.getElement() : view,\n+\t\t\t\tRosVisualIDRegistry\n+\t\t\t\t\t\t.getType(ServiceClientNameEditPart.VISUAL_ID));\n+\t\tif (parser != null) {\n+\t\t\treturn parser.getPrintString(new EObjectAdapter(\n+\t\t\t\t\tview.getElement() != null ? view.getElement() : view),\n+\t\t\t\t\tParserOptions.NONE.intValue());\n+\t\t} else {\n+\t\t\tRosDiagramEditorPlugin.getInstance().logError(\n+\t\t\t\t\t\"Parser was not found for label \" + 6001); //$NON-NLS-1$\n+\t\t\treturn \"\"; //$NON-NLS-1$\n+\t\t}\n+\t}\n+\n+\t/**\n+\t * @generated\n+\t */\n+\tprivate String getPublisher_4004Text(View view) {\n \t\tIParser parser = RosParserProvider.getParser(\n-\t\t\t\tRosElementTypes.Publisher_4002,\n+\t\t\t\tRosElementTypes.Publisher_4004,\n \t\t\t\tview.getElement() != null ? view.getElement() : view,\n \t\t\t\tRosVisualIDRegistry.getType(PublisherNameEditPart.VISUAL_ID));\n \t\tif (parser != null) {\n@@ -236,25 +320,46 @@ private String getPublisher_4002Text(View view) {\n \t\t\t\t\tParserOptions.NONE.intValue());\n \t\t} else {\n \t\t\tRosDiagramEditorPlugin.getInstance().logError(\n-\t\t\t\t\t\"Parser was not found for label \" + 6002); //$NON-NLS-1$\n+\t\t\t\t\t\"Parser was not found for label \" + 6004); //$NON-NLS-1$\n \t\t\treturn \"\"; //$NON-NLS-1$\n \t\t}\n \t}\n \n \t/**\n \t * @generated\n \t */\n-\tprivate String getNode_2002Text(View view) {\n-\t\tIParser parser = RosParserProvider.getParser(RosElementTypes.Node_2002,\n+\tprivate String getServiceServer_4003Text(View view) {\n+\t\tIParser parser = RosParserProvider.getParser(\n+\t\t\t\tRosElementTypes.ServiceServer_4003,\n \t\t\t\tview.getElement() != null ? view.getElement() : view,\n-\t\t\t\tRosVisualIDRegistry.getType(NodeNameEditPart.VISUAL_ID));\n+\t\t\t\tRosVisualIDRegistry\n+\t\t\t\t\t\t.getType(ServiceServerNameEditPart.VISUAL_ID));\n \t\tif (parser != null) {\n \t\t\treturn parser.getPrintString(new EObjectAdapter(\n \t\t\t\t\tview.getElement() != null ? view.getElement() : view),\n \t\t\t\t\tParserOptions.NONE.intValue());\n \t\t} else {\n \t\t\tRosDiagramEditorPlugin.getInstance().logError(\n-\t\t\t\t\t\"Parser was not found for label \" + 5002); //$NON-NLS-1$\n+\t\t\t\t\t\"Parser was not found for label \" + 6003); //$NON-NLS-1$\n+\t\t\treturn \"\"; //$NON-NLS-1$\n+\t\t}\n+\t}\n+\n+\t/**\n+\t * @generated\n+\t */\n+\tprivate String getParameter_3001Text(View view) {\n+\t\tIParser parser = RosParserProvider.getParser(\n+\t\t\t\tRosElementTypes.Parameter_3001,\n+\t\t\t\tview.getElement() != null ? view.getElement() : view,\n+\t\t\t\tRosVisualIDRegistry.getType(ParameterEditPart.VISUAL_ID));\n+\t\tif (parser != null) {\n+\t\t\treturn parser.getPrintString(new EObjectAdapter(\n+\t\t\t\t\tview.getElement() != null ? view.getElement() : view),\n+\t\t\t\t\tParserOptions.NONE.intValue());\n+\t\t} else {\n+\t\t\tRosDiagramEditorPlugin.getInstance().logError(\n+\t\t\t\t\t\"Parser was not found for label \" + 3001); //$NON-NLS-1$\n \t\t\treturn \"\"; //$NON-NLS-1$\n \t\t}\n \t}", "raw_url": "https://github.com/ipa320/bride/raw/01bc5c83c895357f23a345ecec85a3796cf66358/org.ros.model.ros.diagram%2Fsrc%2Forg%2Fros%2Fmodel%2Fros%2Fdiagram%2Fnavigator%2FRosNavigatorLabelProvider.java", "sha": "514ad906917f579fefd0ce8eda4474a7c956cbb3", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/ipa320/bride/blob/01bc5c83c895357f23a345ecec85a3796cf66358/org.ros.model.ros.diagram%2Fsrc%2Forg%2Fros%2Fmodel%2Fros%2Fdiagram%2Fnavigator%2FRosNavigatorSorter.java", "changes": 2, "contents_url": "https://api.github.com/repos/ipa320/bride/contents/org.ros.model.ros.diagram%2Fsrc%2Forg%2Fros%2Fmodel%2Fros%2Fdiagram%2Fnavigator%2FRosNavigatorSorter.java?ref=01bc5c83c895357f23a345ecec85a3796cf66358", "deletions": 1, "filename": "org.ros.model.ros.diagram/src/org/ros/model/ros/diagram/navigator/RosNavigatorSorter.java", "new_code": "\tprivate static final int GROUP_CATEGORY = 7003;", "new_methods": [], "old_code": "\tprivate static final int GROUP_CATEGORY = 4004;", "old_methods": [], "patch": "@@ -11,7 +11,7 @@ public class RosNavigatorSorter extends ViewerSorter {\n \t/**\n \t * @generated\n \t */\n-\tprivate static final int GROUP_CATEGORY = 4004;\n+\tprivate static final int GROUP_CATEGORY = 7003;\n \n \t/**\n \t * @generated", "raw_url": "https://github.com/ipa320/bride/raw/01bc5c83c895357f23a345ecec85a3796cf66358/org.ros.model.ros.diagram%2Fsrc%2Forg%2Fros%2Fmodel%2Fros%2Fdiagram%2Fnavigator%2FRosNavigatorSorter.java", "sha": "e44ccb18641ccd6d244bf960a140268a32d4047c", "status": "modified" }, { "additions": 76, "blob_url": "https://github.com/ipa320/bride/blob/01bc5c83c895357f23a345ecec85a3796cf66358/org.ros.model.ros.diagram%2Fsrc%2Forg%2Fros%2Fmodel%2Fros%2Fdiagram%2Fpart%2FMessages.java", "changes": 82, "contents_url": "https://api.github.com/repos/ipa320/bride/contents/org.ros.model.ros.diagram%2Fsrc%2Forg%2Fros%2Fmodel%2Fros%2Fdiagram%2Fpart%2FMessages.java?ref=01bc5c83c895357f23a345ecec85a3796cf66358", "deletions": 6, "filename": "org.ros.model.ros.diagram/src/org/ros/model/ros/diagram/part/Messages.java", "new_code": "\t/**\n\t * @generated\n\t */\n\tpublic static String Service5CreationTool_title;\n\n\t/**\n\t * @generated\n\t */\n\tpublic static String Service5CreationTool_desc;\n\n\t/**\n\t * @generated\n\t */\n\tpublic static String ServiceServer6CreationTool_title;\n\n\t/**\n\t * @generated\n\t */\n\tpublic static String ServiceServer6CreationTool_desc;\n\n\t/**\n\t * @generated\n\t */\n\tpublic static String ServiceClient7CreationTool_title;\n\n\t/**\n\t * @generated\n\t */\n\tpublic static String ServiceClient7CreationTool_desc;\n\n\t/**\n\t * @generated\n\t */\n\tpublic static String Parameter8CreationTool_title;\n\n\t/**\n\t * @generated\n\t */\n\tpublic static String Parameter8CreationTool_desc;\n\n\t/**\n\t * @generated\n\t */\n\tpublic static String NodeParametersEditPart_title;\n\n\tpublic static String NavigatorGroupName_Subscriber_4002_target;\n\n\t/**\n\t * @generated\n\t */\n\tpublic static String NavigatorGroupName_Subscriber_4002_source;\n\n\t/**\n\t * @generated\n\t */\n\tpublic static String NavigatorGroupName_Topic_2002_incominglinks;\n\n\t/**\n\t * @generated\n\t */\n\tpublic static String NavigatorGroupName_Service_2003_incominglinks;\n\n\t/**\n\t * @generated\n\t */\n\tpublic static String NavigatorGroupName_Node_2001_outgoinglinks;\n\n\t/**\n\t * @generated\n\t */\n\tpublic static String NavigatorGroupName_ServiceClient_4001_target;\n\tpublic static String NavigatorGroupName_ServiceClient_4001_source;\n\tpublic static String NavigatorGroupName_Publisher_4004_target;\n\tpublic static String NavigatorGroupName_Publisher_4004_source;\n\tpublic static String NavigatorGroupName_ServiceServer_4003_target;\n\tpublic static String NavigatorGroupName_ServiceServer_4003_source;", "new_methods": [], "old_code": "\tpublic static String NavigatorGroupName_Subscriber_4001_target;\n\tpublic static String NavigatorGroupName_Subscriber_4001_source;\n\tpublic static String NavigatorGroupName_Topic_2001_incominglinks;\n\tpublic static String NavigatorGroupName_Publisher_4002_target;\n\tpublic static String NavigatorGroupName_Publisher_4002_source;\n\tpublic static String NavigatorGroupName_Node_2002_outgoinglinks;", "old_methods": [], "patch": "@@ -285,6 +285,51 @@ private Messages() {\n \t */\n \tpublic static String Topic4CreationTool_desc;\n \n+\t/**\n+\t * @generated\n+\t */\n+\tpublic static String Service5CreationTool_title;\n+\n+\t/**\n+\t * @generated\n+\t */\n+\tpublic static String Service5CreationTool_desc;\n+\n+\t/**\n+\t * @generated\n+\t */\n+\tpublic static String ServiceServer6CreationTool_title;\n+\n+\t/**\n+\t * @generated\n+\t */\n+\tpublic static String ServiceServer6CreationTool_desc;\n+\n+\t/**\n+\t * @generated\n+\t */\n+\tpublic static String ServiceClient7CreationTool_title;\n+\n+\t/**\n+\t * @generated\n+\t */\n+\tpublic static String ServiceClient7CreationTool_desc;\n+\n+\t/**\n+\t * @generated\n+\t */\n+\tpublic static String Parameter8CreationTool_title;\n+\n+\t/**\n+\t * @generated\n+\t */\n+\tpublic static String Parameter8CreationTool_desc;\n+\n+\t/**\n+\t * @generated\n+\t */\n+\tpublic static String NodeParametersEditPart_title;\n+\n \t/**\n \t * @generated\n \t */\n@@ -298,32 +343,57 @@ private Messages() {\n \t/**\n \t * @generated\n \t */\n-\tpublic static String NavigatorGroupName_Subscriber_4001_target;\n+\tpublic static String NavigatorGroupName_Subscriber_4002_target;\n+\n+\t/**\n+\t * @generated\n+\t */\n+\tpublic static String NavigatorGroupName_Subscriber_4002_source;\n+\n+\t/**\n+\t * @generated\n+\t */\n+\tpublic static String NavigatorGroupName_Topic_2002_incominglinks;\n+\n+\t/**\n+\t * @generated\n+\t */\n+\tpublic static String NavigatorGroupName_Service_2003_incominglinks;\n+\n+\t/**\n+\t * @generated\n+\t */\n+\tpublic static String NavigatorGroupName_Node_2001_outgoinglinks;\n+\n+\t/**\n+\t * @generated\n+\t */\n+\tpublic static String NavigatorGroupName_ServiceClient_4001_target;\n \n \t/**\n \t * @generated\n \t */\n-\tpublic static String NavigatorGroupName_Subscriber_4001_source;\n+\tpublic static String NavigatorGroupName_ServiceClient_4001_source;\n \n \t/**\n \t * @generated\n \t */\n-\tpublic static String NavigatorGroupName_Topic_2001_incominglinks;\n+\tpublic static String NavigatorGroupName_Publisher_4004_target;\n \n \t/**\n \t * @generated\n \t */\n-\tpublic static String NavigatorGroupName_Publisher_4002_target;\n+\tpublic static String NavigatorGroupName_Publisher_4004_source;\n \n \t/**\n \t * @generated\n \t */\n-\tpublic static String NavigatorGroupName_Publisher_4002_source;\n+\tpublic static String NavigatorGroupName_ServiceServer_4003_target;\n \n \t/**\n \t * @generated\n \t */\n-\tpublic static String NavigatorGroupName_Node_2002_outgoinglinks;\n+\tpublic static String NavigatorGroupName_ServiceServer_4003_source;\n \n \t/**\n \t * @generated", "raw_url": "https://github.com/ipa320/bride/raw/01bc5c83c895357f23a345ecec85a3796cf66358/org.ros.model.ros.diagram%2Fsrc%2Forg%2Fros%2Fmodel%2Fros%2Fdiagram%2Fpart%2FMessages.java", "sha": "c4bb4cc511e1ba5d262eab2aa705caebe4b24099", "status": "modified" }, { "additions": 340, "blob_url": "https://github.com/ipa320/bride/blob/01bc5c83c895357f23a345ecec85a3796cf66358/org.ros.model.ros.diagram%2Fsrc%2Forg%2Fros%2Fmodel%2Fros%2Fdiagram%2Fpart%2FRosDiagramUpdater.java", "changes": 389, "contents_url": "https://api.github.com/repos/ipa320/bride/contents/org.ros.model.ros.diagram%2Fsrc%2Forg%2Fros%2Fmodel%2Fros%2Fdiagram%2Fpart%2FRosDiagramUpdater.java?ref=01bc5c83c895357f23a345ecec85a3796cf66358", "deletions": 49, "filename": "org.ros.model.ros.diagram/src/org/ros/model/ros/diagram/part/RosDiagramUpdater.java", "new_code": "import org.ros.model.ros.Parameter;\nimport org.ros.model.ros.Service;\nimport org.ros.model.ros.ServiceClient;\nimport org.ros.model.ros.ServiceServer;\nimport org.ros.model.ros.diagram.edit.parts.NodeParametersEditPart;\nimport org.ros.model.ros.diagram.edit.parts.ParameterEditPart;\nimport org.ros.model.ros.diagram.edit.parts.ServiceClientEditPart;\nimport org.ros.model.ros.diagram.edit.parts.ServiceEditPart;\nimport org.ros.model.ros.diagram.edit.parts.ServiceServerEditPart;\n\t\tcase NodeParametersEditPart.VISUAL_ID:\n\t\t\treturn getNodeParameters_7001SemanticChildren(view);\n\t\tfor (Iterator<?> it = modelElement.getNode().iterator(); it.hasNext();) {\n\t\t\tNode childElement = (Node) it.next();\n\t\t\tint visualID = RosVisualIDRegistry.getNodeVisualID(view,\n\t\t\t\t\tchildElement);\n\t\t\tif (visualID == NodeEditPart.VISUAL_ID) {\n\t\t\t\tresult.add(new RosNodeDescriptor(childElement, visualID));\n\t\t\t\tcontinue;\n\t\t\t}\n\t\t}\n\t\t{\n\t\t\tTopic childElement = modelElement.getTopic();\n\t\t\t}\n\t\t}\n\t\tfor (Iterator<?> it = modelElement.getService().iterator(); it\n\t\t\t\t.hasNext();) {\n\t\t\tService childElement = (Service) it.next();\n\t\t\tint visualID = RosVisualIDRegistry.getNodeVisualID(view,\n\t\t\t\t\tchildElement);\n\t\t\tif (visualID == ServiceEditPart.VISUAL_ID) {\n\t\t\t\tresult.add(new RosNodeDescriptor(childElement, visualID));\n\t\treturn result;\n\t}\n\n\t/**\n\t * @generated\n\t */\n\tpublic static List<RosNodeDescriptor> getNodeParameters_7001SemanticChildren(\n\t\t\tView view) {\n\t\tif (false == view.eContainer() instanceof View) {\n\t\t\treturn Collections.emptyList();\n\t\t}\n\t\tView containerView = (View) view.eContainer();\n\t\tif (!containerView.isSetElement()) {\n\t\t\treturn Collections.emptyList();\n\t\t}\n\t\tNode modelElement = (Node) containerView.getElement();\n\t\tLinkedList<RosNodeDescriptor> result = new LinkedList<RosNodeDescriptor>();\n\t\tfor (Iterator<?> it = modelElement.getParameter().iterator(); it\n\t\t\t\t.hasNext();) {\n\t\t\tParameter childElement = (Parameter) it.next();\n\t\t\tif (visualID == ParameterEditPart.VISUAL_ID) {\n\t\t\treturn getNode_2001ContainedLinks(view);\n\t\tcase TopicEditPart.VISUAL_ID:\n\t\t\treturn getTopic_2002ContainedLinks(view);\n\t\tcase ServiceEditPart.VISUAL_ID:\n\t\t\treturn getService_2003ContainedLinks(view);\n\t\tcase ParameterEditPart.VISUAL_ID:\n\t\t\treturn getParameter_3001ContainedLinks(view);\n\t\tcase ServiceClientEditPart.VISUAL_ID:\n\t\t\treturn getServiceClient_4001ContainedLinks(view);\n\t\t\treturn getSubscriber_4002ContainedLinks(view);\n\t\tcase ServiceServerEditPart.VISUAL_ID:\n\t\t\treturn getServiceServer_4003ContainedLinks(view);\n\t\t\treturn getPublisher_4004ContainedLinks(view);\n\t\t\treturn getNode_2001IncomingLinks(view);\n\t\tcase TopicEditPart.VISUAL_ID:\n\t\t\treturn getTopic_2002IncomingLinks(view);\n\t\tcase ServiceEditPart.VISUAL_ID:\n\t\t\treturn getService_2003IncomingLinks(view);\n\t\tcase ParameterEditPart.VISUAL_ID:\n\t\t\treturn getParameter_3001IncomingLinks(view);\n\t\tcase ServiceClientEditPart.VISUAL_ID:\n\t\t\treturn getServiceClient_4001IncomingLinks(view);\n\t\t\treturn getSubscriber_4002IncomingLinks(view);\n\t\tcase ServiceServerEditPart.VISUAL_ID:\n\t\t\treturn getServiceServer_4003IncomingLinks(view);\n\t\t\treturn getPublisher_4004IncomingLinks(view);\n\t\t\treturn getNode_2001OutgoingLinks(view);\n\t\tcase TopicEditPart.VISUAL_ID:\n\t\t\treturn getTopic_2002OutgoingLinks(view);\n\t\tcase ServiceEditPart.VISUAL_ID:\n\t\t\treturn getService_2003OutgoingLinks(view);\n\t\tcase ParameterEditPart.VISUAL_ID:\n\t\t\treturn getParameter_3001OutgoingLinks(view);\n\t\tcase ServiceClientEditPart.VISUAL_ID:\n\t\t\treturn getServiceClient_4001OutgoingLinks(view);\n\t\t\treturn getSubscriber_4002OutgoingLinks(view);\n\t\tcase ServiceServerEditPart.VISUAL_ID:\n\t\t\treturn getServiceServer_4003OutgoingLinks(view);\n\t\t\treturn getPublisher_4004OutgoingLinks(view);\n\tpublic static List<RosLinkDescriptor> getNode_2001ContainedLinks(View view) {\n\t\tNode modelElement = (Node) view.getElement();\n\t\tLinkedList<RosLinkDescriptor> result = new LinkedList<RosLinkDescriptor>();\n\t\tresult.addAll(getContainedTypeModelFacetLinks_ServiceClient_4001(modelElement));\n\t\tresult.addAll(getContainedTypeModelFacetLinks_Subscriber_4002(modelElement));\n\t\tresult.addAll(getContainedTypeModelFacetLinks_ServiceServer_4003(modelElement));\n\t\tresult.addAll(getContainedTypeModelFacetLinks_Publisher_4004(modelElement));\n\t\treturn result;\n\t}\n\n\t/**\n\t * @generated\n\t */\n\tpublic static List<RosLinkDescriptor> getTopic_2002ContainedLinks(View view) {\n\tpublic static List<RosLinkDescriptor> getService_2003ContainedLinks(\n\t\t\tView view) {\n\t\treturn Collections.emptyList();\n\t}\n\n\t/**\n\t * @generated\n\t */\n\tpublic static List<RosLinkDescriptor> getParameter_3001ContainedLinks(\n\t\t\tView view) {\n\t\treturn Collections.emptyList();\n\t}\n\n\t/**\n\t * @generated\n\t */\n\tpublic static List<RosLinkDescriptor> getServiceClient_4001ContainedLinks(\n\t\t\tView view) {\n\t\treturn Collections.emptyList();\n\tpublic static List<RosLinkDescriptor> getSubscriber_4002ContainedLinks(\n\tpublic static List<RosLinkDescriptor> getServiceServer_4003ContainedLinks(\n\tpublic static List<RosLinkDescriptor> getPublisher_4004ContainedLinks(\n\t\t\tView view) {\n\t\treturn Collections.emptyList();\n\t}\n\n\t/**\n\t * @generated\n\t */\n\tpublic static List<RosLinkDescriptor> getNode_2001IncomingLinks(View view) {\n\t\treturn Collections.emptyList();\n\t}\n\n\t/**\n\t * @generated\n\t */\n\tpublic static List<RosLinkDescriptor> getTopic_2002IncomingLinks(View view) {\n\t\tresult.addAll(getIncomingTypeModelFacetLinks_Subscriber_4002(\n\t\tresult.addAll(getIncomingTypeModelFacetLinks_Publisher_4004(\n\tpublic static List<RosLinkDescriptor> getService_2003IncomingLinks(View view) {\n\t\tService modelElement = (Service) view.getElement();\n\t\tMap<EObject, Collection<EStructuralFeature.Setting>> crossReferences = EcoreUtil.CrossReferencer\n\t\t\t\t.find(view.eResource().getResourceSet().getResources());\n\t\tLinkedList<RosLinkDescriptor> result = new LinkedList<RosLinkDescriptor>();\n\t\tresult.addAll(getIncomingTypeModelFacetLinks_ServiceClient_4001(\n\t\t\t\tmodelElement, crossReferences));\n\t\tresult.addAll(getIncomingTypeModelFacetLinks_ServiceServer_4003(\n\t\t\t\tmodelElement, crossReferences));\n\t\treturn result;\n\t}\n\n\t/**\n\t * @generated\n\t */\n\tpublic static List<RosLinkDescriptor> getParameter_3001IncomingLinks(\n\t\t\tView view) {\n\t\treturn Collections.emptyList();\n\t}\n\n\t/**\n\t * @generated\n\t */\n\tpublic static List<RosLinkDescriptor> getServiceClient_4001IncomingLinks(\n\t\t\tView view) {\n\tpublic static List<RosLinkDescriptor> getSubscriber_4002IncomingLinks(\n\tpublic static List<RosLinkDescriptor> getServiceServer_4003IncomingLinks(\n\tpublic static List<RosLinkDescriptor> getPublisher_4004IncomingLinks(\n\t\t\tView view) {\n\tpublic static List<RosLinkDescriptor> getNode_2001OutgoingLinks(View view) {\n\t\tresult.addAll(getContainedTypeModelFacetLinks_ServiceClient_4001(modelElement));\n\t\tresult.addAll(getContainedTypeModelFacetLinks_Subscriber_4002(modelElement));\n\t\tresult.addAll(getContainedTypeModelFacetLinks_ServiceServer_4003(modelElement));\n\t\tresult.addAll(getContainedTypeModelFacetLinks_Publisher_4004(modelElement));\n\tpublic static List<RosLinkDescriptor> getTopic_2002OutgoingLinks(View view) {\n\t\treturn Collections.emptyList();\n\t}\n\n\t/**\n\t * @generated\n\t */\n\tpublic static List<RosLinkDescriptor> getService_2003OutgoingLinks(View view) {\n\t\treturn Collections.emptyList();\n\t}\n\n\t/**\n\t * @generated\n\t */\n\tpublic static List<RosLinkDescriptor> getParameter_3001OutgoingLinks(\n\t\t\tView view) {\n\t\treturn Collections.emptyList();\n\t}\n\n\t/**\n\t * @generated\n\t */\n\tpublic static List<RosLinkDescriptor> getServiceClient_4001OutgoingLinks(\n\tpublic static List<RosLinkDescriptor> getSubscriber_4002OutgoingLinks(\n\tpublic static List<RosLinkDescriptor> getServiceServer_4003OutgoingLinks(\n\t\t\tView view) {\n\t\treturn Collections.emptyList();\n\t}\n\n\t/**\n\t * @generated\n\t */\n\tpublic static List<RosLinkDescriptor> getPublisher_4004OutgoingLinks(\n\t\t\tView view) {\n\t\treturn Collections.emptyList();\n\t}\n\n\t/**\n\t * @generated\n\t */\n\tprivate static Collection<RosLinkDescriptor> getContainedTypeModelFacetLinks_ServiceClient_4001(\n\t\t\tNode container) {\n\t\tLinkedList<RosLinkDescriptor> result = new LinkedList<RosLinkDescriptor>();\n\t\tfor (Iterator<?> links = container.getServiceClient().iterator(); links\n\t\t\t\t.hasNext();) {\n\t\t\tEObject linkObject = (EObject) links.next();\n\t\t\tif (false == linkObject instanceof ServiceClient) {\n\t\t\t\tcontinue;\n\t\t\t}\n\t\t\tServiceClient link = (ServiceClient) linkObject;\n\t\t\tif (ServiceClientEditPart.VISUAL_ID != RosVisualIDRegistry\n\t\t\t\t\t.getLinkWithClassVisualID(link)) {\n\t\t\t\tcontinue;\n\t\t\t}\n\t\t\tService dst = link.getService();\n\t\t\tresult.add(new RosLinkDescriptor(container, dst, link,\n\t\t\t\t\tRosElementTypes.ServiceClient_4001,\n\t\t\t\t\tServiceClientEditPart.VISUAL_ID));\n\t\t}\n\t\treturn result;\n\t}\n\n\t/**\n\t * @generated\n\t */\n\tprivate static Collection<RosLinkDescriptor> getContainedTypeModelFacetLinks_Subscriber_4002(\n\t\t\t\t\tRosElementTypes.Subscriber_4002,\n\tprivate static Collection<RosLinkDescriptor> getContainedTypeModelFacetLinks_ServiceServer_4003(\n\t\t\tNode container) {\n\t\tLinkedList<RosLinkDescriptor> result = new LinkedList<RosLinkDescriptor>();\n\t\tfor (Iterator<?> links = container.getServiceServer().iterator(); links\n\t\t\t\t.hasNext();) {\n\t\t\tEObject linkObject = (EObject) links.next();\n\t\t\tif (false == linkObject instanceof ServiceServer) {\n\t\t\t\tcontinue;\n\t\t\t}\n\t\t\tServiceServer link = (ServiceServer) linkObject;\n\t\t\tif (ServiceServerEditPart.VISUAL_ID != RosVisualIDRegistry\n\t\t\t\t\t.getLinkWithClassVisualID(link)) {\n\t\t\t\tcontinue;\n\t\t\t}\n\t\t\tService dst = link.getService();\n\t\t\tresult.add(new RosLinkDescriptor(container, dst, link,\n\t\t\t\t\tRosElementTypes.ServiceServer_4003,\n\t\t\t\t\tServiceServerEditPart.VISUAL_ID));\n\t\t}\n\t\treturn result;\n\t}\n\n\t/**\n\t * @generated\n\t */\n\tprivate static Collection<RosLinkDescriptor> getContainedTypeModelFacetLinks_Publisher_4004(\n\t\t\t\t\tRosElementTypes.Publisher_4004, PublisherEditPart.VISUAL_ID));\n\tprivate static Collection<RosLinkDescriptor> getIncomingTypeModelFacetLinks_ServiceClient_4001(\n\t\t\tService target,\n\t\t\tMap<EObject, Collection<EStructuralFeature.Setting>> crossReferences) {\n\t\tLinkedList<RosLinkDescriptor> result = new LinkedList<RosLinkDescriptor>();\n\t\tCollection<EStructuralFeature.Setting> settings = crossReferences\n\t\t\t\t.get(target);\n\t\tfor (EStructuralFeature.Setting setting : settings) {\n\t\t\tif (setting.getEStructuralFeature() != RosPackage.eINSTANCE\n\t\t\t\t\t.getServiceClient_Service()\n\t\t\t\t\t|| false == setting.getEObject() instanceof ServiceClient) {\n\t\t\t\tcontinue;\n\t\t\t}\n\t\t\tServiceClient link = (ServiceClient) setting.getEObject();\n\t\t\tif (ServiceClientEditPart.VISUAL_ID != RosVisualIDRegistry\n\t\t\t\t\t.getLinkWithClassVisualID(link)) {\n\t\t\t\tcontinue;\n\t\t\t}\n\t\t\tif (false == link.eContainer() instanceof Node) {\n\t\t\t\tcontinue;\n\t\t\t}\n\t\t\tNode container = (Node) link.eContainer();\n\t\t\tresult.add(new RosLinkDescriptor(container, target, link,\n\t\t\t\t\tRosElementTypes.ServiceClient_4001,\n\t\t\t\t\tServiceClientEditPart.VISUAL_ID));\n\n\t\t}\n\t\treturn result;\n\t}\n\n\t/**\n\t * @generated\n\t */\n\tprivate static Collection<RosLinkDescriptor> getIncomingTypeModelFacetLinks_Subscriber_4002(\n\t\t\t\t\tRosElementTypes.Subscriber_4002,\n\tprivate static Collection<RosLinkDescriptor> getIncomingTypeModelFacetLinks_ServiceServer_4003(\n\t\t\tService target,\n\t\t\tMap<EObject, Collection<EStructuralFeature.Setting>> crossReferences) {\n\t\tLinkedList<RosLinkDescriptor> result = new LinkedList<RosLinkDescriptor>();\n\t\tCollection<EStructuralFeature.Setting> settings = crossReferences\n\t\t\t\t.get(target);\n\t\tfor (EStructuralFeature.Setting setting : settings) {\n\t\t\tif (setting.getEStructuralFeature() != RosPackage.eINSTANCE\n\t\t\t\t\t.getServiceServer_Service()\n\t\t\t\t\t|| false == setting.getEObject() instanceof ServiceServer) {\n\t\t\t\tcontinue;\n\t\t\t}\n\t\t\tServiceServer link = (ServiceServer) setting.getEObject();\n\t\t\tif (ServiceServerEditPart.VISUAL_ID != RosVisualIDRegistry\n\t\t\t\t\t.getLinkWithClassVisualID(link)) {\n\t\t\t\tcontinue;\n\t\t\t}\n\t\t\tif (false == link.eContainer() instanceof Node) {\n\t\t\t\tcontinue;\n\t\t\t}\n\t\t\tNode container = (Node) link.eContainer();\n\t\t\tresult.add(new RosLinkDescriptor(container, target, link,\n\t\t\t\t\tRosElementTypes.ServiceServer_4003,\n\t\t\t\t\tServiceServerEditPart.VISUAL_ID));\n\n\t\t}\n\t\treturn result;\n\t}\n\n\t/**\n\t * @generated\n\t */\n\tprivate static Collection<RosLinkDescriptor> getIncomingTypeModelFacetLinks_Publisher_4004(\n\t\t\t\t\tRosElementTypes.Publisher_4004, PublisherEditPart.VISUAL_ID));", "new_methods": [], "old_code": "\t\tfor (Iterator<?> it = modelElement.getTopic().iterator(); it.hasNext();) {\n\t\t\tTopic childElement = (Topic) it.next();\n\t\tfor (Iterator<?> it = modelElement.getNode().iterator(); it.hasNext();) {\n\t\t\tNode childElement = (Node) it.next();\n\t\t\tif (visualID == NodeEditPart.VISUAL_ID) {\n\t\tcase TopicEditPart.VISUAL_ID:\n\t\t\treturn getTopic_2001ContainedLinks(view);\n\t\t\treturn getNode_2002ContainedLinks(view);\n\t\t\treturn getSubscriber_4001ContainedLinks(view);\n\t\t\treturn getPublisher_4002ContainedLinks(view);\n\t\tcase TopicEditPart.VISUAL_ID:\n\t\t\treturn getTopic_2001IncomingLinks(view);\n\t\t\treturn getNode_2002IncomingLinks(view);\n\t\t\treturn getSubscriber_4001IncomingLinks(view);\n\t\t\treturn getPublisher_4002IncomingLinks(view);\n\t\tcase TopicEditPart.VISUAL_ID:\n\t\t\treturn getTopic_2001OutgoingLinks(view);\n\t\t\treturn getNode_2002OutgoingLinks(view);\n\t\t\treturn getSubscriber_4001OutgoingLinks(view);\n\t\t\treturn getPublisher_4002OutgoingLinks(view);\n\tpublic static List<RosLinkDescriptor> getTopic_2001ContainedLinks(View view) {\n\tpublic static List<RosLinkDescriptor> getNode_2002ContainedLinks(View view) {\n\t\tNode modelElement = (Node) view.getElement();\n\t\tLinkedList<RosLinkDescriptor> result = new LinkedList<RosLinkDescriptor>();\n\t\tresult.addAll(getContainedTypeModelFacetLinks_Subscriber_4001(modelElement));\n\t\tresult.addAll(getContainedTypeModelFacetLinks_Publisher_4002(modelElement));\n\t\treturn result;\n\tpublic static List<RosLinkDescriptor> getSubscriber_4001ContainedLinks(\n\tpublic static List<RosLinkDescriptor> getPublisher_4002ContainedLinks(\n\tpublic static List<RosLinkDescriptor> getTopic_2001IncomingLinks(View view) {\n\t\tresult.addAll(getIncomingTypeModelFacetLinks_Subscriber_4001(\n\t\tresult.addAll(getIncomingTypeModelFacetLinks_Publisher_4002(\n\tpublic static List<RosLinkDescriptor> getNode_2002IncomingLinks(View view) {\n\tpublic static List<RosLinkDescriptor> getSubscriber_4001IncomingLinks(\n\tpublic static List<RosLinkDescriptor> getPublisher_4002IncomingLinks(\n\tpublic static List<RosLinkDescriptor> getTopic_2001OutgoingLinks(View view) {\n\tpublic static List<RosLinkDescriptor> getNode_2002OutgoingLinks(View view) {\n\t\tresult.addAll(getContainedTypeModelFacetLinks_Subscriber_4001(modelElement));\n\t\tresult.addAll(getContainedTypeModelFacetLinks_Publisher_4002(modelElement));\n\tpublic static List<RosLinkDescriptor> getSubscriber_4001OutgoingLinks(\n\tpublic static List<RosLinkDescriptor> getPublisher_4002OutgoingLinks(\n\tprivate static Collection<RosLinkDescriptor> getContainedTypeModelFacetLinks_Subscriber_4001(\n\t\t\t\t\tRosElementTypes.Subscriber_4001,\n\tprivate static Collection<RosLinkDescriptor> getContainedTypeModelFacetLinks_Publisher_4002(\n\t\t\t\t\tRosElementTypes.Publisher_4002, PublisherEditPart.VISUAL_ID));\n\tprivate static Collection<RosLinkDescriptor> getIncomingTypeModelFacetLinks_Subscriber_4001(\n\t\t\t\t\tRosElementTypes.Subscriber_4001,\n\tprivate static Collection<RosLinkDescriptor> getIncomingTypeModelFacetLinks_Publisher_4002(\n\t\t\t\t\tRosElementTypes.Publisher_4002, PublisherEditPart.VISUAL_ID));", "old_methods": [], "patch": "@@ -13,13 +13,22 @@\n import org.eclipse.gmf.runtime.notation.View;\n import org.ros.model.ros.Node;\n import org.ros.model.ros.Package;\n+import org.ros.model.ros.Parameter;\n import org.ros.model.ros.Publisher;\n import org.ros.model.ros.RosPackage;\n+import org.ros.model.ros.Service;\n+import org.ros.model.ros.ServiceClient;\n+import org.ros.model.ros.ServiceServer;\n import org.ros.model.ros.Subscriber;\n import org.ros.model.ros.Topic;\n import org.ros.model.ros.diagram.edit.parts.NodeEditPart;\n+import org.ros.model.ros.diagram.edit.parts.NodeParametersEditPart;\n import org.ros.model.ros.diagram.edit.parts.PackageEditPart;\n+import org.ros.model.ros.diagram.edit.parts.ParameterEditPart;\n import org.ros.model.ros.diagram.edit.parts.PublisherEditPart;\n+import org.ros.model.ros.diagram.edit.parts.ServiceClientEditPart;\n+import org.ros.model.ros.diagram.edit.parts.ServiceEditPart;\n+import org.ros.model.ros.diagram.edit.parts.ServiceServerEditPart;\n import org.ros.model.ros.diagram.edit.parts.SubscriberEditPart;\n import org.ros.model.ros.diagram.edit.parts.TopicEditPart;\n import org.ros.model.ros.diagram.providers.RosElementTypes;\n@@ -36,6 +45,8 @@ public static List<RosNodeDescriptor> getSemanticChildren(View view) {\n \t\tswitch (RosVisualIDRegistry.getVisualID(view)) {\n \t\tcase PackageEditPart.VISUAL_ID:\n \t\t\treturn getPackage_1000SemanticChildren(view);\n+\t\tcase NodeParametersEditPart.VISUAL_ID:\n+\t\t\treturn getNodeParameters_7001SemanticChildren(view);\n \t\t}\n \t\treturn Collections.emptyList();\n \t}\n@@ -50,20 +61,56 @@ public static List<RosNodeDescriptor> getPackage_1000SemanticChildren(\n \t\t}\n \t\tPackage modelElement = (Package) view.getElement();\n \t\tLinkedList<RosNodeDescriptor> result = new LinkedList<RosNodeDescriptor>();\n-\t\tfor (Iterator<?> it = modelElement.getTopic().iterator(); it.hasNext();) {\n-\t\t\tTopic childElement = (Topic) it.next();\n+\t\tfor (Iterator<?> it = modelElement.getNode().iterator(); it.hasNext();) {\n+\t\t\tNode childElement = (Node) it.next();\n+\t\t\tint visualID = RosVisualIDRegistry.getNodeVisualID(view,\n+\t\t\t\t\tchildElement);\n+\t\t\tif (visualID == NodeEditPart.VISUAL_ID) {\n+\t\t\t\tresult.add(new RosNodeDescriptor(childElement, visualID));\n+\t\t\t\tcontinue;\n+\t\t\t}\n+\t\t}\n+\t\t{\n+\t\t\tTopic childElement = modelElement.getTopic();\n \t\t\tint visualID = RosVisualIDRegistry.getNodeVisualID(view,\n \t\t\t\t\tchildElement);\n \t\t\tif (visualID == TopicEditPart.VISUAL_ID) {\n \t\t\t\tresult.add(new RosNodeDescriptor(childElement, visualID));\n+\t\t\t}\n+\t\t}\n+\t\tfor (Iterator<?> it = modelElement.getService().iterator(); it\n+\t\t\t\t.hasNext();) {\n+\t\t\tService childElement = (Service) it.next();\n+\t\t\tint visualID = RosVisualIDRegistry.getNodeVisualID(view,\n+\t\t\t\t\tchildElement);\n+\t\t\tif (visualID == ServiceEditPart.VISUAL_ID) {\n+\t\t\t\tresult.add(new RosNodeDescriptor(childElement, visualID));\n \t\t\t\tcontinue;\n \t\t\t}\n \t\t}\n-\t\tfor (Iterator<?> it = modelElement.getNode().iterator(); it.hasNext();) {\n-\t\t\tNode childElement = (Node) it.next();\n+\t\treturn result;\n+\t}\n+\n+\t/**\n+\t * @generated\n+\t */\n+\tpublic static List<RosNodeDescriptor> getNodeParameters_7001SemanticChildren(\n+\t\t\tView view) {\n+\t\tif (false == view.eContainer() instanceof View) {\n+\t\t\treturn Collections.emptyList();\n+\t\t}\n+\t\tView containerView = (View) view.eContainer();\n+\t\tif (!containerView.isSetElement()) {\n+\t\t\treturn Collections.emptyList();\n+\t\t}\n+\t\tNode modelElement = (Node) containerView.getElement();\n+\t\tLinkedList<RosNodeDescriptor> result = new LinkedList<RosNodeDescriptor>();\n+\t\tfor (Iterator<?> it = modelElement.getParameter().iterator(); it\n+\t\t\t\t.hasNext();) {\n+\t\t\tParameter childElement = (Parameter) it.next();\n \t\t\tint visualID = RosVisualIDRegistry.getNodeVisualID(view,\n \t\t\t\t\tchildElement);\n-\t\t\tif (visualID == NodeEditPart.VISUAL_ID) {\n+\t\t\tif (visualID == ParameterEditPart.VISUAL_ID) {\n \t\t\t\tresult.add(new RosNodeDescriptor(childElement, visualID));\n \t\t\t\tcontinue;\n \t\t\t}\n@@ -78,14 +125,22 @@ public static List<RosLinkDescriptor> getContainedLinks(View view) {\n \t\tswitch (RosVisualIDRegistry.getVisualID(view)) {\n \t\tcase PackageEditPart.VISUAL_ID:\n \t\t\treturn getPackage_1000ContainedLinks(view);\n-\t\tcase TopicEditPart.VISUAL_ID:\n-\t\t\treturn getTopic_2001ContainedLinks(view);\n \t\tcase NodeEditPart.VISUAL_ID:\n-\t\t\treturn getNode_2002ContainedLinks(view);\n+\t\t\treturn getNode_2001ContainedLinks(view);\n+\t\tcase TopicEditPart.VISUAL_ID:\n+\t\t\treturn getTopic_2002ContainedLinks(view);\n+\t\tcase ServiceEditPart.VISUAL_ID:\n+\t\t\treturn getService_2003ContainedLinks(view);\n+\t\tcase ParameterEditPart.VISUAL_ID:\n+\t\t\treturn getParameter_3001ContainedLinks(view);\n+\t\tcase ServiceClientEditPart.VISUAL_ID:\n+\t\t\treturn getServiceClient_4001ContainedLinks(view);\n \t\tcase SubscriberEditPart.VISUAL_ID:\n-\t\t\treturn getSubscriber_4001ContainedLinks(view);\n+\t\t\treturn getSubscriber_4002ContainedLinks(view);\n+\t\tcase ServiceServerEditPart.VISUAL_ID:\n+\t\t\treturn getServiceServer_4003ContainedLinks(view);\n \t\tcase PublisherEditPart.VISUAL_ID:\n-\t\t\treturn getPublisher_4002ContainedLinks(view);\n+\t\t\treturn getPublisher_4004ContainedLinks(view);\n \t\t}\n \t\treturn Collections.emptyList();\n \t}\n@@ -95,14 +150,22 @@ public static List<RosLinkDescriptor> getContainedLinks(View view) {\n \t */\n \tpublic static List<RosLinkDescriptor> getIncomingLinks(View view) {\n \t\tswitch (RosVisualIDRegistry.getVisualID(view)) {\n-\t\tcase TopicEditPart.VISUAL_ID:\n-\t\t\treturn getTopic_2001IncomingLinks(view);\n \t\tcase NodeEditPart.VISUAL_ID:\n-\t\t\treturn getNode_2002IncomingLinks(view);\n+\t\t\treturn getNode_2001IncomingLinks(view);\n+\t\tcase TopicEditPart.VISUAL_ID:\n+\t\t\treturn getTopic_2002IncomingLinks(view);\n+\t\tcase ServiceEditPart.VISUAL_ID:\n+\t\t\treturn getService_2003IncomingLinks(view);\n+\t\tcase ParameterEditPart.VISUAL_ID:\n+\t\t\treturn getParameter_3001IncomingLinks(view);\n+\t\tcase ServiceClientEditPart.VISUAL_ID:\n+\t\t\treturn getServiceClient_4001IncomingLinks(view);\n \t\tcase SubscriberEditPart.VISUAL_ID:\n-\t\t\treturn getSubscriber_4001IncomingLinks(view);\n+\t\t\treturn getSubscriber_4002IncomingLinks(view);\n+\t\tcase ServiceServerEditPart.VISUAL_ID:\n+\t\t\treturn getServiceServer_4003IncomingLinks(view);\n \t\tcase PublisherEditPart.VISUAL_ID:\n-\t\t\treturn getPublisher_4002IncomingLinks(view);\n+\t\t\treturn getPublisher_4004IncomingLinks(view);\n \t\t}\n \t\treturn Collections.emptyList();\n \t}\n@@ -112,14 +175,22 @@ public static List<RosLinkDescriptor> getIncomingLinks(View view) {\n \t */\n \tpublic static List<RosLinkDescriptor> getOutgoingLinks(View view) {\n \t\tswitch (RosVisualIDRegistry.getVisualID(view)) {\n-\t\tcase TopicEditPart.VISUAL_ID:\n-\t\t\treturn getTopic_2001OutgoingLinks(view);\n \t\tcase NodeEditPart.VISUAL_ID:\n-\t\t\treturn getNode_2002OutgoingLinks(view);\n+\t\t\treturn getNode_2001OutgoingLinks(view);\n+\t\tcase TopicEditPart.VISUAL_ID:\n+\t\t\treturn getTopic_2002OutgoingLinks(view);\n+\t\tcase ServiceEditPart.VISUAL_ID:\n+\t\t\treturn getService_2003OutgoingLinks(view);\n+\t\tcase ParameterEditPart.VISUAL_ID:\n+\t\t\treturn getParameter_3001OutgoingLinks(view);\n+\t\tcase ServiceClientEditPart.VISUAL_ID:\n+\t\t\treturn getServiceClient_4001OutgoingLinks(view);\n \t\tcase SubscriberEditPart.VISUAL_ID:\n-\t\t\treturn getSubscriber_4001OutgoingLinks(view);\n+\t\t\treturn getSubscriber_4002OutgoingLinks(view);\n+\t\tcase ServiceServerEditPart.VISUAL_ID:\n+\t\t\treturn getServiceServer_4003OutgoingLinks(view);\n \t\tcase PublisherEditPart.VISUAL_ID:\n-\t\t\treturn getPublisher_4002OutgoingLinks(view);\n+\t\t\treturn getPublisher_4004OutgoingLinks(view);\n \t\t}\n \t\treturn Collections.emptyList();\n \t}\n@@ -135,113 +206,244 @@ public static List<RosLinkDescriptor> getPackage_1000ContainedLinks(\n \t/**\n \t * @generated\n \t */\n-\tpublic static List<RosLinkDescriptor> getTopic_2001ContainedLinks(View view) {\n+\tpublic static List<RosLinkDescriptor> getNode_2001ContainedLinks(View view) {\n+\t\tNode modelElement = (Node) view.getElement();\n+\t\tLinkedList<RosLinkDescriptor> result = new LinkedList<RosLinkDescriptor>();\n+\t\tresult.addAll(getContainedTypeModelFacetLinks_ServiceClient_4001(modelElement));\n+\t\tresult.addAll(getContainedTypeModelFacetLinks_Subscriber_4002(modelElement));\n+\t\tresult.addAll(getContainedTypeModelFacetLinks_ServiceServer_4003(modelElement));\n+\t\tresult.addAll(getContainedTypeModelFacetLinks_Publisher_4004(modelElement));\n+\t\treturn result;\n+\t}\n+\n+\t/**\n+\t * @generated\n+\t */\n+\tpublic static List<RosLinkDescriptor> getTopic_2002ContainedLinks(View view) {\n \t\treturn Collections.emptyList();\n \t}\n \n \t/**\n \t * @generated\n \t */\n-\tpublic static List<RosLinkDescriptor> getNode_2002ContainedLinks(View view) {\n-\t\tNode modelElement = (Node) view.getElement();\n-\t\tLinkedList<RosLinkDescriptor> result = new LinkedList<RosLinkDescriptor>();\n-\t\tresult.addAll(getContainedTypeModelFacetLinks_Subscriber_4001(modelElement));\n-\t\tresult.addAll(getContainedTypeModelFacetLinks_Publisher_4002(modelElement));\n-\t\treturn result;\n+\tpublic static List<RosLinkDescriptor> getService_2003ContainedLinks(\n+\t\t\tView view) {\n+\t\treturn Collections.emptyList();\n+\t}\n+\n+\t/**\n+\t * @generated\n+\t */\n+\tpublic static List<RosLinkDescriptor> getParameter_3001ContainedLinks(\n+\t\t\tView view) {\n+\t\treturn Collections.emptyList();\n+\t}\n+\n+\t/**\n+\t * @generated\n+\t */\n+\tpublic static List<RosLinkDescriptor> getServiceClient_4001ContainedLinks(\n+\t\t\tView view) {\n+\t\treturn Collections.emptyList();\n \t}\n \n \t/**\n \t * @generated\n \t */\n-\tpublic static List<RosLinkDescriptor> getSubscriber_4001ContainedLinks(\n+\tpublic static List<RosLinkDescriptor> getSubscriber_4002ContainedLinks(\n \t\t\tView view) {\n \t\treturn Collections.emptyList();\n \t}\n \n \t/**\n \t * @generated\n \t */\n-\tpublic static List<RosLinkDescriptor> getPublisher_4002ContainedLinks(\n+\tpublic static List<RosLinkDescriptor> getServiceServer_4003ContainedLinks(\n \t\t\tView view) {\n \t\treturn Collections.emptyList();\n \t}\n \n \t/**\n \t * @generated\n \t */\n-\tpublic static List<RosLinkDescriptor> getTopic_2001IncomingLinks(View view) {\n+\tpublic static List<RosLinkDescriptor> getPublisher_4004ContainedLinks(\n+\t\t\tView view) {\n+\t\treturn Collections.emptyList();\n+\t}\n+\n+\t/**\n+\t * @generated\n+\t */\n+\tpublic static List<RosLinkDescriptor> getNode_2001IncomingLinks(View view) {\n+\t\treturn Collections.emptyList();\n+\t}\n+\n+\t/**\n+\t * @generated\n+\t */\n+\tpublic static List<RosLinkDescriptor> getTopic_2002IncomingLinks(View view) {\n \t\tTopic modelElement = (Topic) view.getElement();\n \t\tMap<EObject, Collection<EStructuralFeature.Setting>> crossReferences = EcoreUtil.CrossReferencer\n \t\t\t\t.find(view.eResource().getResourceSet().getResources());\n \t\tLinkedList<RosLinkDescriptor> result = new LinkedList<RosLinkDescriptor>();\n-\t\tresult.addAll(getIncomingTypeModelFacetLinks_Subscriber_4001(\n+\t\tresult.addAll(getIncomingTypeModelFacetLinks_Subscriber_4002(\n \t\t\t\tmodelElement, crossReferences));\n-\t\tresult.addAll(getIncomingTypeModelFacetLinks_Publisher_4002(\n+\t\tresult.addAll(getIncomingTypeModelFacetLinks_Publisher_4004(\n \t\t\t\tmodelElement, crossReferences));\n \t\treturn result;\n \t}\n \n \t/**\n \t * @generated\n \t */\n-\tpublic static List<RosLinkDescriptor> getNode_2002IncomingLinks(View view) {\n+\tpublic static List<RosLinkDescriptor> getService_2003IncomingLinks(View view) {\n+\t\tService modelElement = (Service) view.getElement();\n+\t\tMap<EObject, Collection<EStructuralFeature.Setting>> crossReferences = EcoreUtil.CrossReferencer\n+\t\t\t\t.find(view.eResource().getResourceSet().getResources());\n+\t\tLinkedList<RosLinkDescriptor> result = new LinkedList<RosLinkDescriptor>();\n+\t\tresult.addAll(getIncomingTypeModelFacetLinks_ServiceClient_4001(\n+\t\t\t\tmodelElement, crossReferences));\n+\t\tresult.addAll(getIncomingTypeModelFacetLinks_ServiceServer_4003(\n+\t\t\t\tmodelElement, crossReferences));\n+\t\treturn result;\n+\t}\n+\n+\t/**\n+\t * @generated\n+\t */\n+\tpublic static List<RosLinkDescriptor> getParameter_3001IncomingLinks(\n+\t\t\tView view) {\n+\t\treturn Collections.emptyList();\n+\t}\n+\n+\t/**\n+\t * @generated\n+\t */\n+\tpublic static List<RosLinkDescriptor> getServiceClient_4001IncomingLinks(\n+\t\t\tView view) {\n \t\treturn Collections.emptyList();\n \t}\n \n \t/**\n \t * @generated\n \t */\n-\tpublic static List<RosLinkDescriptor> getSubscriber_4001IncomingLinks(\n+\tpublic static List<RosLinkDescriptor> getSubscriber_4002IncomingLinks(\n \t\t\tView view) {\n \t\treturn Collections.emptyList();\n \t}\n \n \t/**\n \t * @generated\n \t */\n-\tpublic static List<RosLinkDescriptor> getPublisher_4002IncomingLinks(\n+\tpublic static List<RosLinkDescriptor> getServiceServer_4003IncomingLinks(\n \t\t\tView view) {\n \t\treturn Collections.emptyList();\n \t}\n \n \t/**\n \t * @generated\n \t */\n-\tpublic static List<RosLinkDescriptor> getTopic_2001OutgoingLinks(View view) {\n+\tpublic static List<RosLinkDescriptor> getPublisher_4004IncomingLinks(\n+\t\t\tView view) {\n \t\treturn Collections.emptyList();\n \t}\n \n \t/**\n \t * @generated\n \t */\n-\tpublic static List<RosLinkDescriptor> getNode_2002OutgoingLinks(View view) {\n+\tpublic static List<RosLinkDescriptor> getNode_2001OutgoingLinks(View view) {\n \t\tNode modelElement = (Node) view.getElement();\n \t\tLinkedList<RosLinkDescriptor> result = new LinkedList<RosLinkDescriptor>();\n-\t\tresult.addAll(getContainedTypeModelFacetLinks_Subscriber_4001(modelElement));\n-\t\tresult.addAll(getContainedTypeModelFacetLinks_Publisher_4002(modelElement));\n+\t\tresult.addAll(getContainedTypeModelFacetLinks_ServiceClient_4001(modelElement));\n+\t\tresult.addAll(getContainedTypeModelFacetLinks_Subscriber_4002(modelElement));\n+\t\tresult.addAll(getContainedTypeModelFacetLinks_ServiceServer_4003(modelElement));\n+\t\tresult.addAll(getContainedTypeModelFacetLinks_Publisher_4004(modelElement));\n \t\treturn result;\n \t}\n \n \t/**\n \t * @generated\n \t */\n-\tpublic static List<RosLinkDescriptor> getSubscriber_4001OutgoingLinks(\n+\tpublic static List<RosLinkDescriptor> getTopic_2002OutgoingLinks(View view) {\n+\t\treturn Collections.emptyList();\n+\t}\n+\n+\t/**\n+\t * @generated\n+\t */\n+\tpublic static List<RosLinkDescriptor> getService_2003OutgoingLinks(View view) {\n+\t\treturn Collections.emptyList();\n+\t}\n+\n+\t/**\n+\t * @generated\n+\t */\n+\tpublic static List<RosLinkDescriptor> getParameter_3001OutgoingLinks(\n+\t\t\tView view) {\n+\t\treturn Collections.emptyList();\n+\t}\n+\n+\t/**\n+\t * @generated\n+\t */\n+\tpublic static List<RosLinkDescriptor> getServiceClient_4001OutgoingLinks(\n \t\t\tView view) {\n \t\treturn Collections.emptyList();\n \t}\n \n \t/**\n \t * @generated\n \t */\n-\tpublic static List<RosLinkDescriptor> getPublisher_4002OutgoingLinks(\n+\tpublic static List<RosLinkDescriptor> getSubscriber_4002OutgoingLinks(\n \t\t\tView view) {\n \t\treturn Collections.emptyList();\n \t}\n \n \t/**\n \t * @generated\n \t */\n-\tprivate static Collection<RosLinkDescriptor> getContainedTypeModelFacetLinks_Subscriber_4001(\n+\tpublic static List<RosLinkDescriptor> getServiceServer_4003OutgoingLinks(\n+\t\t\tView view) {\n+\t\treturn Collections.emptyList();\n+\t}\n+\n+\t/**\n+\t * @generated\n+\t */\n+\tpublic static List<RosLinkDescriptor> getPublisher_4004OutgoingLinks(\n+\t\t\tView view) {\n+\t\treturn Collections.emptyList();\n+\t}\n+\n+\t/**\n+\t * @generated\n+\t */\n+\tprivate static Collection<RosLinkDescriptor> getContainedTypeModelFacetLinks_ServiceClient_4001(\n+\t\t\tNode container) {\n+\t\tLinkedList<RosLinkDescriptor> result = new LinkedList<RosLinkDescriptor>();\n+\t\tfor (Iterator<?> links = container.getServiceClient().iterator(); links\n+\t\t\t\t.hasNext();) {\n+\t\t\tEObject linkObject = (EObject) links.next();\n+\t\t\tif (false == linkObject instanceof ServiceClient) {\n+\t\t\t\tcontinue;\n+\t\t\t}\n+\t\t\tServiceClient link = (ServiceClient) linkObject;\n+\t\t\tif (ServiceClientEditPart.VISUAL_ID != RosVisualIDRegistry\n+\t\t\t\t\t.getLinkWithClassVisualID(link)) {\n+\t\t\t\tcontinue;\n+\t\t\t}\n+\t\t\tService dst = link.getService();\n+\t\t\tresult.add(new RosLinkDescriptor(container, dst, link,\n+\t\t\t\t\tRosElementTypes.ServiceClient_4001,\n+\t\t\t\t\tServiceClientEditPart.VISUAL_ID));\n+\t\t}\n+\t\treturn result;\n+\t}\n+\n+\t/**\n+\t * @generated\n+\t */\n+\tprivate static Collection<RosLinkDescriptor> getContainedTypeModelFacetLinks_Subscriber_4002(\n \t\t\tNode container) {\n \t\tLinkedList<RosLinkDescriptor> result = new LinkedList<RosLinkDescriptor>();\n \t\tfor (Iterator<?> links = container.getSubscriber().iterator(); links\n@@ -257,7 +459,7 @@ private static Collection<RosLinkDescriptor> getContainedTypeModelFacetLinks_Sub\n \t\t\t}\n \t\t\tTopic dst = link.getTopic();\n \t\t\tresult.add(new RosLinkDescriptor(container, dst, link,\n-\t\t\t\t\tRosElementTypes.Subscriber_4001,\n+\t\t\t\t\tRosElementTypes.Subscriber_4002,\n \t\t\t\t\tSubscriberEditPart.VISUAL_ID));\n \t\t}\n \t\treturn result;\n@@ -266,7 +468,32 @@ private static Collection<RosLinkDescriptor> getContainedTypeModelFacetLinks_Sub\n \t/**\n \t * @generated\n \t */\n-\tprivate static Collection<RosLinkDescriptor> getContainedTypeModelFacetLinks_Publisher_4002(\n+\tprivate static Collection<RosLinkDescriptor> getContainedTypeModelFacetLinks_ServiceServer_4003(\n+\t\t\tNode container) {\n+\t\tLinkedList<RosLinkDescriptor> result = new LinkedList<RosLinkDescriptor>();\n+\t\tfor (Iterator<?> links = container.getServiceServer().iterator(); links\n+\t\t\t\t.hasNext();) {\n+\t\t\tEObject linkObject = (EObject) links.next();\n+\t\t\tif (false == linkObject instanceof ServiceServer) {\n+\t\t\t\tcontinue;\n+\t\t\t}\n+\t\t\tServiceServer link = (ServiceServer) linkObject;\n+\t\t\tif (ServiceServerEditPart.VISUAL_ID != RosVisualIDRegistry\n+\t\t\t\t\t.getLinkWithClassVisualID(link)) {\n+\t\t\t\tcontinue;\n+\t\t\t}\n+\t\t\tService dst = link.getService();\n+\t\t\tresult.add(new RosLinkDescriptor(container, dst, link,\n+\t\t\t\t\tRosElementTypes.ServiceServer_4003,\n+\t\t\t\t\tServiceServerEditPart.VISUAL_ID));\n+\t\t}\n+\t\treturn result;\n+\t}\n+\n+\t/**\n+\t * @generated\n+\t */\n+\tprivate static Collection<RosLinkDescriptor> getContainedTypeModelFacetLinks_Publisher_4004(\n \t\t\tNode container) {\n \t\tLinkedList<RosLinkDescriptor> result = new LinkedList<RosLinkDescriptor>();\n \t\tfor (Iterator<?> links = container.getPublisher().iterator(); links\n@@ -282,15 +509,47 @@ private static Collection<RosLinkDescriptor> getContainedTypeModelFacetLinks_Pub\n \t\t\t}\n \t\t\tTopic dst = link.getTopic();\n \t\t\tresult.add(new RosLinkDescriptor(container, dst, link,\n-\t\t\t\t\tRosElementTypes.Publisher_4002, PublisherEditPart.VISUAL_ID));\n+\t\t\t\t\tRosElementTypes.Publisher_4004, PublisherEditPart.VISUAL_ID));\n \t\t}\n \t\treturn result;\n \t}\n \n \t/**\n \t * @generated\n \t */\n-\tprivate static Collection<RosLinkDescriptor> getIncomingTypeModelFacetLinks_Subscriber_4001(\n+\tprivate static Collection<RosLinkDescriptor> getIncomingTypeModelFacetLinks_ServiceClient_4001(\n+\t\t\tService target,\n+\t\t\tMap<EObject, Collection<EStructuralFeature.Setting>> crossReferences) {\n+\t\tLinkedList<RosLinkDescriptor> result = new LinkedList<RosLinkDescriptor>();\n+\t\tCollection<EStructuralFeature.Setting> settings = crossReferences\n+\t\t\t\t.get(target);\n+\t\tfor (EStructuralFeature.Setting setting : settings) {\n+\t\t\tif (setting.getEStructuralFeature() != RosPackage.eINSTANCE\n+\t\t\t\t\t.getServiceClient_Service()\n+\t\t\t\t\t|| false == setting.getEObject() instanceof ServiceClient) {\n+\t\t\t\tcontinue;\n+\t\t\t}\n+\t\t\tServiceClient link = (ServiceClient) setting.getEObject();\n+\t\t\tif (ServiceClientEditPart.VISUAL_ID != RosVisualIDRegistry\n+\t\t\t\t\t.getLinkWithClassVisualID(link)) {\n+\t\t\t\tcontinue;\n+\t\t\t}\n+\t\t\tif (false == link.eContainer() instanceof Node) {\n+\t\t\t\tcontinue;\n+\t\t\t}\n+\t\t\tNode container = (Node) link.eContainer();\n+\t\t\tresult.add(new RosLinkDescriptor(container, target, link,\n+\t\t\t\t\tRosElementTypes.ServiceClient_4001,\n+\t\t\t\t\tServiceClientEditPart.VISUAL_ID));\n+\n+\t\t}\n+\t\treturn result;\n+\t}\n+\n+\t/**\n+\t * @generated\n+\t */\n+\tprivate static Collection<RosLinkDescriptor> getIncomingTypeModelFacetLinks_Subscriber_4002(\n \t\t\tTopic target,\n \t\t\tMap<EObject, Collection<EStructuralFeature.Setting>> crossReferences) {\n \t\tLinkedList<RosLinkDescriptor> result = new LinkedList<RosLinkDescriptor>();\n@@ -312,7 +571,7 @@ private static Collection<RosLinkDescriptor> getIncomingTypeModelFacetLinks_Subs\n \t\t\t}\n \t\t\tNode container = (Node) link.eContainer();\n \t\t\tresult.add(new RosLinkDescriptor(container, target, link,\n-\t\t\t\t\tRosElementTypes.Subscriber_4001,\n+\t\t\t\t\tRosElementTypes.Subscriber_4002,\n \t\t\t\t\tSubscriberEditPart.VISUAL_ID));\n \n \t\t}\n@@ -322,7 +581,39 @@ private static Collection<RosLinkDescriptor> getIncomingTypeModelFacetLinks_Subs\n \t/**\n \t * @generated\n \t */\n-\tprivate static Collection<RosLinkDescriptor> getIncomingTypeModelFacetLinks_Publisher_4002(\n+\tprivate static Collection<RosLinkDescriptor> getIncomingTypeModelFacetLinks_ServiceServer_4003(\n+\t\t\tService target,\n+\t\t\tMap<EObject, Collection<EStructuralFeature.Setting>> crossReferences) {\n+\t\tLinkedList<RosLinkDescriptor> result = new LinkedList<RosLinkDescriptor>();\n+\t\tCollection<EStructuralFeature.Setting> settings = crossReferences\n+\t\t\t\t.get(target);\n+\t\tfor (EStructuralFeature.Setting setting : settings) {\n+\t\t\tif (setting.getEStructuralFeature() != RosPackage.eINSTANCE\n+\t\t\t\t\t.getServiceServer_Service()\n+\t\t\t\t\t|| false == setting.getEObject() instanceof ServiceServer) {\n+\t\t\t\tcontinue;\n+\t\t\t}\n+\t\t\tServiceServer link = (ServiceServer) setting.getEObject();\n+\t\t\tif (ServiceServerEditPart.VISUAL_ID != RosVisualIDRegistry\n+\t\t\t\t\t.getLinkWithClassVisualID(link)) {\n+\t\t\t\tcontinue;\n+\t\t\t}\n+\t\t\tif (false == link.eContainer() instanceof Node) {\n+\t\t\t\tcontinue;\n+\t\t\t}\n+\t\t\tNode container = (Node) link.eContainer();\n+\t\t\tresult.add(new RosLinkDescriptor(container, target, link,\n+\t\t\t\t\tRosElementTypes.ServiceServer_4003,\n+\t\t\t\t\tServiceServerEditPart.VISUAL_ID));\n+\n+\t\t}\n+\t\treturn result;\n+\t}\n+\n+\t/**\n+\t * @generated\n+\t */\n+\tprivate static Collection<RosLinkDescriptor> getIncomingTypeModelFacetLinks_Publisher_4004(\n \t\t\tTopic target,\n \t\t\tMap<EObject, Collection<EStructuralFeature.Setting>> crossReferences) {\n \t\tLinkedList<RosLinkDescriptor> result = new LinkedList<RosLinkDescriptor>();\n@@ -344,7 +635,7 @@ private static Collection<RosLinkDescriptor> getIncomingTypeModelFacetLinks_Publ\n \t\t\t}\n \t\t\tNode container = (Node) link.eContainer();\n \t\t\tresult.add(new RosLinkDescriptor(container, target, link,\n-\t\t\t\t\tRosElementTypes.Publisher_4002, PublisherEditPart.VISUAL_ID));\n+\t\t\t\t\tRosElementTypes.Publisher_4004, PublisherEditPart.VISUAL_ID));\n \n \t\t}\n \t\treturn result;", "raw_url": "https://github.com/ipa320/bride/raw/01bc5c83c895357f23a345ecec85a3796cf66358/org.ros.model.ros.diagram%2Fsrc%2Forg%2Fros%2Fmodel%2Fros%2Fdiagram%2Fpart%2FRosDiagramUpdater.java", "sha": "bbfea100d4ea95261c037117780df92c9f0344ad", "status": "modified" }, { "additions": 72, "blob_url": "https://github.com/ipa320/bride/blob/01bc5c83c895357f23a345ecec85a3796cf66358/org.ros.model.ros.diagram%2Fsrc%2Forg%2Fros%2Fmodel%2Fros%2Fdiagram%2Fpart%2FRosPaletteFactory.java", "changes": 80, "contents_url": "https://api.github.com/repos/ipa320/bride/contents/org.ros.model.ros.diagram%2Fsrc%2Forg%2Fros%2Fmodel%2Fros%2Fdiagram%2Fpart%2FRosPaletteFactory.java?ref=01bc5c83c895357f23a345ecec85a3796cf66358", "deletions": 8, "filename": "org.ros.model.ros.diagram/src/org/ros/model/ros/diagram/part/RosPaletteFactory.java", "new_code": "\t\tpaletteContainer.add(createService5CreationTool());\n\t\tpaletteContainer.add(createServiceServer6CreationTool());\n\t\tpaletteContainer.add(createServiceClient7CreationTool());\n\t\tpaletteContainer.add(createParameter8CreationTool());\n\t\t\t\tCollections.singletonList(RosElementTypes.Node_2001));\n\t\t\t\t.getImageDescriptor(RosElementTypes.Node_2001));\n\t\t\t\tCollections.singletonList(RosElementTypes.Publisher_4004));\n\t\t\t\t.getImageDescriptor(RosElementTypes.Publisher_4004));\n\t\t\t\tCollections.singletonList(RosElementTypes.Subscriber_4002));\n\t\t\t\t.getImageDescriptor(RosElementTypes.Subscriber_4002));\n\t\t\t\tCollections.singletonList(RosElementTypes.Topic_2002));\n\t\t\t\t.getImageDescriptor(RosElementTypes.Topic_2002));\n\t\tentry.setLargeIcon(entry.getSmallIcon());\n\t\treturn entry;\n\t}\n\n\t/**\n\t * @generated\n\t */\n\tprivate ToolEntry createService5CreationTool() {\n\t\tNodeToolEntry entry = new NodeToolEntry(\n\t\t\t\tMessages.Service5CreationTool_title,\n\t\t\t\tMessages.Service5CreationTool_desc,\n\t\t\t\tCollections.singletonList(RosElementTypes.Service_2003));\n\t\tentry.setId(\"createService5CreationTool\"); //$NON-NLS-1$\n\t\tentry.setSmallIcon(RosElementTypes\n\t\t\t\t.getImageDescriptor(RosElementTypes.Service_2003));\n\t\tentry.setLargeIcon(entry.getSmallIcon());\n\t\treturn entry;\n\t}\n\n\t/**\n\t * @generated\n\t */\n\tprivate ToolEntry createServiceServer6CreationTool() {\n\t\tLinkToolEntry entry = new LinkToolEntry(\n\t\t\t\tMessages.ServiceServer6CreationTool_title,\n\t\t\t\tMessages.ServiceServer6CreationTool_desc,\n\t\t\t\tCollections.singletonList(RosElementTypes.ServiceServer_4003));\n\t\tentry.setId(\"createServiceServer6CreationTool\"); //$NON-NLS-1$\n\t\tentry.setSmallIcon(RosElementTypes\n\t\t\t\t.getImageDescriptor(RosElementTypes.ServiceServer_4003));\n\t\tentry.setLargeIcon(entry.getSmallIcon());\n\t\treturn entry;\n\t}\n\n\t/**\n\t * @generated\n\t */\n\tprivate ToolEntry createServiceClient7CreationTool() {\n\t\tLinkToolEntry entry = new LinkToolEntry(\n\t\t\t\tMessages.ServiceClient7CreationTool_title,\n\t\t\t\tMessages.ServiceClient7CreationTool_desc,\n\t\t\t\tCollections.singletonList(RosElementTypes.ServiceClient_4001));\n\t\tentry.setId(\"createServiceClient7CreationTool\"); //$NON-NLS-1$\n\t\tentry.setSmallIcon(RosElementTypes\n\t\t\t\t.getImageDescriptor(RosElementTypes.ServiceClient_4001));\n\t\tentry.setLargeIcon(entry.getSmallIcon());\n\t\treturn entry;\n\t}\n\n\t/**\n\t * @generated\n\t */\n\tprivate ToolEntry createParameter8CreationTool() {\n\t\tNodeToolEntry entry = new NodeToolEntry(\n\t\t\t\tMessages.Parameter8CreationTool_title,\n\t\t\t\tMessages.Parameter8CreationTool_desc,\n\t\t\t\tCollections.singletonList(RosElementTypes.Parameter_3001));\n\t\tentry.setId(\"createParameter8CreationTool\"); //$NON-NLS-1$\n\t\tentry.setSmallIcon(RosElementTypes\n\t\t\t\t.getImageDescriptor(RosElementTypes.Parameter_3001));", "new_methods": [ { "arguments": [], "filename": "org.ros.model.ros.diagram/src/org/ros/model/ros/diagram/part/RosPaletteFactory.java", "implementation": "NodeToolEntry entry = new NodeToolEntry(\n\t\t\t\tMessages.Service5CreationTool_title,\n\t\t\t\tMessages.Service5CreationTool_desc,\n\t\t\t\tCollections.singletonList(RosElementTypes.Service_2003));\n\t\tentry.setId(\"createService5CreationTool\"); //$NON-NLS-1$\n\t\tentry.setSmallIcon(RosElementTypes\n\t\t\t\t.getImageDescriptor(RosElementTypes.Service_2003));\n\t\tentry.setLargeIcon(entry.getSmallIcon());\n\t\treturn entry;", "signature": "ToolEntry createService5CreationTool()" }, { "arguments": [], "filename": "org.ros.model.ros.diagram/src/org/ros/model/ros/diagram/part/RosPaletteFactory.java", "implementation": "LinkToolEntry entry = new LinkToolEntry(\n\t\t\t\tMessages.ServiceServer6CreationTool_title,\n\t\t\t\tMessages.ServiceServer6CreationTool_desc,\n\t\t\t\tCollections.singletonList(RosElementTypes.ServiceServer_4003));\n\t\tentry.setId(\"createServiceServer6CreationTool\"); //$NON-NLS-1$\n\t\tentry.setSmallIcon(RosElementTypes\n\t\t\t\t.getImageDescriptor(RosElementTypes.ServiceServer_4003));\n\t\tentry.setLargeIcon(entry.getSmallIcon());\n\t\treturn entry;", "signature": "ToolEntry createServiceServer6CreationTool()" }, { "arguments": [], "filename": "org.ros.model.ros.diagram/src/org/ros/model/ros/diagram/part/RosPaletteFactory.java", "implementation": "LinkToolEntry entry = new LinkToolEntry(\n\t\t\t\tMessages.ServiceClient7CreationTool_title,\n\t\t\t\tMessages.ServiceClient7CreationTool_desc,\n\t\t\t\tCollections.singletonList(RosElementTypes.ServiceClient_4001));\n\t\tentry.setId(\"createServiceClient7CreationTool\"); //$NON-NLS-1$\n\t\tentry.setSmallIcon(RosElementTypes\n\t\t\t\t.getImageDescriptor(RosElementTypes.ServiceClient_4001));\n\t\tentry.setLargeIcon(entry.getSmallIcon());\n\t\treturn entry;", "signature": "ToolEntry createServiceClient7CreationTool()" } ], "old_code": "\t\t\t\tCollections.singletonList(RosElementTypes.Node_2002));\n\t\t\t\t.getImageDescriptor(RosElementTypes.Node_2002));\n\t\t\t\tCollections.singletonList(RosElementTypes.Publisher_4002));\n\t\t\t\t.getImageDescriptor(RosElementTypes.Publisher_4002));\n\t\t\t\tCollections.singletonList(RosElementTypes.Subscriber_4001));\n\t\t\t\t.getImageDescriptor(RosElementTypes.Subscriber_4001));\n\t\t\t\tCollections.singletonList(RosElementTypes.Topic_2001));\n\t\t\t\t.getImageDescriptor(RosElementTypes.Topic_2001));", "old_methods": [], "patch": "@@ -37,6 +37,10 @@ private PaletteContainer createRos1Group() {\n \t\tpaletteContainer.add(createPublisher2CreationTool());\n \t\tpaletteContainer.add(createSubscriber3CreationTool());\n \t\tpaletteContainer.add(createTopic4CreationTool());\n+\t\tpaletteContainer.add(createService5CreationTool());\n+\t\tpaletteContainer.add(createServiceServer6CreationTool());\n+\t\tpaletteContainer.add(createServiceClient7CreationTool());\n+\t\tpaletteContainer.add(createParameter8CreationTool());\n \t\treturn paletteContainer;\n \t}\n \n@@ -47,10 +51,10 @@ private ToolEntry createNode1CreationTool() {\n \t\tNodeToolEntry entry = new NodeToolEntry(\n \t\t\t\tMessages.Node1CreationTool_title,\n \t\t\t\tMessages.Node1CreationTool_desc,\n-\t\t\t\tCollections.singletonList(RosElementTypes.Node_2002));\n+\t\t\t\tCollections.singletonList(RosElementTypes.Node_2001));\n \t\tentry.setId(\"createNode1CreationTool\"); //$NON-NLS-1$\n \t\tentry.setSmallIcon(RosElementTypes\n-\t\t\t\t.getImageDescriptor(RosElementTypes.Node_2002));\n+\t\t\t\t.getImageDescriptor(RosElementTypes.Node_2001));\n \t\tentry.setLargeIcon(entry.getSmallIcon());\n \t\treturn entry;\n \t}\n@@ -62,10 +66,10 @@ private ToolEntry createPublisher2CreationTool() {\n \t\tLinkToolEntry entry = new LinkToolEntry(\n \t\t\t\tMessages.Publisher2CreationTool_title,\n \t\t\t\tMessages.Publisher2CreationTool_desc,\n-\t\t\t\tCollections.singletonList(RosElementTypes.Publisher_4002));\n+\t\t\t\tCollections.singletonList(RosElementTypes.Publisher_4004));\n \t\tentry.setId(\"createPublisher2CreationTool\"); //$NON-NLS-1$\n \t\tentry.setSmallIcon(RosElementTypes\n-\t\t\t\t.getImageDescriptor(RosElementTypes.Publisher_4002));\n+\t\t\t\t.getImageDescriptor(RosElementTypes.Publisher_4004));\n \t\tentry.setLargeIcon(entry.getSmallIcon());\n \t\treturn entry;\n \t}\n@@ -77,10 +81,10 @@ private ToolEntry createSubscriber3CreationTool() {\n \t\tLinkToolEntry entry = new LinkToolEntry(\n \t\t\t\tMessages.Subscriber3CreationTool_title,\n \t\t\t\tMessages.Subscriber3CreationTool_desc,\n-\t\t\t\tCollections.singletonList(RosElementTypes.Subscriber_4001));\n+\t\t\t\tCollections.singletonList(RosElementTypes.Subscriber_4002));\n \t\tentry.setId(\"createSubscriber3CreationTool\"); //$NON-NLS-1$\n \t\tentry.setSmallIcon(RosElementTypes\n-\t\t\t\t.getImageDescriptor(RosElementTypes.Subscriber_4001));\n+\t\t\t\t.getImageDescriptor(RosElementTypes.Subscriber_4002));\n \t\tentry.setLargeIcon(entry.getSmallIcon());\n \t\treturn entry;\n \t}\n@@ -92,10 +96,70 @@ private ToolEntry createTopic4CreationTool() {\n \t\tNodeToolEntry entry = new NodeToolEntry(\n \t\t\t\tMessages.Topic4CreationTool_title,\n \t\t\t\tMessages.Topic4CreationTool_desc,\n-\t\t\t\tCollections.singletonList(RosElementTypes.Topic_2001));\n+\t\t\t\tCollections.singletonList(RosElementTypes.Topic_2002));\n \t\tentry.setId(\"createTopic4CreationTool\"); //$NON-NLS-1$\n \t\tentry.setSmallIcon(RosElementTypes\n-\t\t\t\t.getImageDescriptor(RosElementTypes.Topic_2001));\n+\t\t\t\t.getImageDescriptor(RosElementTypes.Topic_2002));\n+\t\tentry.setLargeIcon(entry.getSmallIcon());\n+\t\treturn entry;\n+\t}\n+\n+\t/**\n+\t * @generated\n+\t */\n+\tprivate ToolEntry createService5CreationTool() {\n+\t\tNodeToolEntry entry = new NodeToolEntry(\n+\t\t\t\tMessages.Service5CreationTool_title,\n+\t\t\t\tMessages.Service5CreationTool_desc,\n+\t\t\t\tCollections.singletonList(RosElementTypes.Service_2003));\n+\t\tentry.setId(\"createService5CreationTool\"); //$NON-NLS-1$\n+\t\tentry.setSmallIcon(RosElementTypes\n+\t\t\t\t.getImageDescriptor(RosElementTypes.Service_2003));\n+\t\tentry.setLargeIcon(entry.getSmallIcon());\n+\t\treturn entry;\n+\t}\n+\n+\t/**\n+\t * @generated\n+\t */\n+\tprivate ToolEntry createServiceServer6CreationTool() {\n+\t\tLinkToolEntry entry = new LinkToolEntry(\n+\t\t\t\tMessages.ServiceServer6CreationTool_title,\n+\t\t\t\tMessages.ServiceServer6CreationTool_desc,\n+\t\t\t\tCollections.singletonList(RosElementTypes.ServiceServer_4003));\n+\t\tentry.setId(\"createServiceServer6CreationTool\"); //$NON-NLS-1$\n+\t\tentry.setSmallIcon(RosElementTypes\n+\t\t\t\t.getImageDescriptor(RosElementTypes.ServiceServer_4003));\n+\t\tentry.setLargeIcon(entry.getSmallIcon());\n+\t\treturn entry;\n+\t}\n+\n+\t/**\n+\t * @generated\n+\t */\n+\tprivate ToolEntry createServiceClient7CreationTool() {\n+\t\tLinkToolEntry entry = new LinkToolEntry(\n+\t\t\t\tMessages.ServiceClient7CreationTool_title,\n+\t\t\t\tMessages.ServiceClient7CreationTool_desc,\n+\t\t\t\tCollections.singletonList(RosElementTypes.ServiceClient_4001));\n+\t\tentry.setId(\"createServiceClient7CreationTool\"); //$NON-NLS-1$\n+\t\tentry.setSmallIcon(RosElementTypes\n+\t\t\t\t.getImageDescriptor(RosElementTypes.ServiceClient_4001));\n+\t\tentry.setLargeIcon(entry.getSmallIcon());\n+\t\treturn entry;\n+\t}\n+\n+\t/**\n+\t * @generated\n+\t */\n+\tprivate ToolEntry createParameter8CreationTool() {\n+\t\tNodeToolEntry entry = new NodeToolEntry(\n+\t\t\t\tMessages.Parameter8CreationTool_title,\n+\t\t\t\tMessages.Parameter8CreationTool_desc,\n+\t\t\t\tCollections.singletonList(RosElementTypes.Parameter_3001));\n+\t\tentry.setId(\"createParameter8CreationTool\"); //$NON-NLS-1$\n+\t\tentry.setSmallIcon(RosElementTypes\n+\t\t\t\t.getImageDescriptor(RosElementTypes.Parameter_3001));\n \t\tentry.setLargeIcon(entry.getSmallIcon());\n \t\treturn entry;\n \t}", "raw_url": "https://github.com/ipa320/bride/raw/01bc5c83c895357f23a345ecec85a3796cf66358/org.ros.model.ros.diagram%2Fsrc%2Forg%2Fros%2Fmodel%2Fros%2Fdiagram%2Fpart%2FRosPaletteFactory.java", "sha": "530c80ec4f8d8ea92bd24f522af0248cba90c930", "status": "modified" }, { "additions": 57, "blob_url": "https://github.com/ipa320/bride/blob/01bc5c83c895357f23a345ecec85a3796cf66358/org.ros.model.ros.diagram%2Fsrc%2Forg%2Fros%2Fmodel%2Fros%2Fdiagram%2Fpart%2FRosVisualIDRegistry.java", "changes": 62, "contents_url": "https://api.github.com/repos/ipa320/bride/contents/org.ros.model.ros.diagram%2Fsrc%2Forg%2Fros%2Fmodel%2Fros%2Fdiagram%2Fpart%2FRosVisualIDRegistry.java?ref=01bc5c83c895357f23a345ecec85a3796cf66358", "deletions": 5, "filename": "org.ros.model.ros.diagram/src/org/ros/model/ros/diagram/part/RosVisualIDRegistry.java", "new_code": "import org.ros.model.ros.diagram.edit.parts.NodeParametersEditPart;\nimport org.ros.model.ros.diagram.edit.parts.ParameterEditPart;\nimport org.ros.model.ros.diagram.edit.parts.ServiceClientEditPart;\nimport org.ros.model.ros.diagram.edit.parts.ServiceClientNameEditPart;\nimport org.ros.model.ros.diagram.edit.parts.ServiceEditPart;\nimport org.ros.model.ros.diagram.edit.parts.ServiceNameEditPart;\nimport org.ros.model.ros.diagram.edit.parts.ServiceServerEditPart;\nimport org.ros.model.ros.diagram.edit.parts.ServiceServerNameEditPart;\n\t\t\tif (RosPackage.eINSTANCE.getNode().isSuperTypeOf(\n\t\t\t\t\tdomainElement.eClass())) {\n\t\t\t\treturn NodeEditPart.VISUAL_ID;\n\t\t\t}\n\t\t\tif (RosPackage.eINSTANCE.getService().isSuperTypeOf(\n\t\t\t\treturn ServiceEditPart.VISUAL_ID;\n\t\t\t}\n\t\t\tbreak;\n\t\tcase NodeParametersEditPart.VISUAL_ID:\n\t\t\tif (RosPackage.eINSTANCE.getParameter().isSuperTypeOf(\n\t\t\t\t\tdomainElement.eClass())) {\n\t\t\t\treturn ParameterEditPart.VISUAL_ID;\n\t\t\tif (NodeEditPart.VISUAL_ID == nodeVisualID) {\n\t\t\t\treturn true;\n\t\t\t}\n\t\t\tif (ServiceEditPart.VISUAL_ID == nodeVisualID) {\n\t\t\t\treturn true;\n\t\t\t}\n\t\t\tbreak;\n\t\tcase NodeEditPart.VISUAL_ID:\n\t\t\tif (NodeNameEditPart.VISUAL_ID == nodeVisualID) {\n\t\t\t\treturn true;\n\t\t\t}\n\t\t\tif (NodeParametersEditPart.VISUAL_ID == nodeVisualID) {\n\t\tcase ServiceEditPart.VISUAL_ID:\n\t\t\tif (ServiceNameEditPart.VISUAL_ID == nodeVisualID) {\n\t\t\t\treturn true;\n\t\t\t}\n\t\t\tbreak;\n\t\tcase NodeParametersEditPart.VISUAL_ID:\n\t\t\tif (ParameterEditPart.VISUAL_ID == nodeVisualID) {\n\t\t\t\treturn true;\n\t\t\t}\n\t\t\tbreak;\n\t\tcase ServiceClientEditPart.VISUAL_ID:\n\t\t\tif (ServiceClientNameEditPart.VISUAL_ID == nodeVisualID) {\n\t\tcase ServiceServerEditPart.VISUAL_ID:\n\t\t\tif (ServiceServerNameEditPart.VISUAL_ID == nodeVisualID) {\n\t\t\t\treturn true;\n\t\t\t}\n\t\t\tbreak;\n\t\tif (RosPackage.eINSTANCE.getServiceClient().isSuperTypeOf(\n\t\t\t\tdomainElement.eClass())) {\n\t\t\treturn ServiceClientEditPart.VISUAL_ID;\n\t\t}\n\t\tif (RosPackage.eINSTANCE.getServiceServer().isSuperTypeOf(\n\t\t\t\tdomainElement.eClass())) {\n\t\t\treturn ServiceServerEditPart.VISUAL_ID;\n\t\t}", "new_methods": [], "old_code": "\t\t\tif (RosPackage.eINSTANCE.getNode().isSuperTypeOf(\n\t\t\t\treturn NodeEditPart.VISUAL_ID;\n\t\t\tif (NodeEditPart.VISUAL_ID == nodeVisualID) {\n\t\tcase NodeEditPart.VISUAL_ID:\n\t\t\tif (NodeNameEditPart.VISUAL_ID == nodeVisualID) {", "old_methods": [], "patch": "@@ -9,9 +9,17 @@\n import org.ros.model.ros.RosPackage;\n import org.ros.model.ros.diagram.edit.parts.NodeEditPart;\n import org.ros.model.ros.diagram.edit.parts.NodeNameEditPart;\n+import org.ros.model.ros.diagram.edit.parts.NodeParametersEditPart;\n import org.ros.model.ros.diagram.edit.parts.PackageEditPart;\n+import org.ros.model.ros.diagram.edit.parts.ParameterEditPart;\n import org.ros.model.ros.diagram.edit.parts.PublisherEditPart;\n import org.ros.model.ros.diagram.edit.parts.PublisherNameEditPart;\n+import org.ros.model.ros.diagram.edit.parts.ServiceClientEditPart;\n+import org.ros.model.ros.diagram.edit.parts.ServiceClientNameEditPart;\n+import org.ros.model.ros.diagram.edit.parts.ServiceEditPart;\n+import org.ros.model.ros.diagram.edit.parts.ServiceNameEditPart;\n+import org.ros.model.ros.diagram.edit.parts.ServiceServerEditPart;\n+import org.ros.model.ros.diagram.edit.parts.ServiceServerNameEditPart;\n import org.ros.model.ros.diagram.edit.parts.SubscriberEditPart;\n import org.ros.model.ros.diagram.edit.parts.SubscriberNameEditPart;\n import org.ros.model.ros.diagram.edit.parts.TopicEditPart;\n@@ -125,13 +133,23 @@ public static int getNodeVisualID(View containerView, EObject domainElement) {\n \t\t}\n \t\tswitch (containerVisualID) {\n \t\tcase PackageEditPart.VISUAL_ID:\n+\t\t\tif (RosPackage.eINSTANCE.getNode().isSuperTypeOf(\n+\t\t\t\t\tdomainElement.eClass())) {\n+\t\t\t\treturn NodeEditPart.VISUAL_ID;\n+\t\t\t}\n \t\t\tif (RosPackage.eINSTANCE.getTopic().isSuperTypeOf(\n \t\t\t\t\tdomainElement.eClass())) {\n \t\t\t\treturn TopicEditPart.VISUAL_ID;\n \t\t\t}\n-\t\t\tif (RosPackage.eINSTANCE.getNode().isSuperTypeOf(\n+\t\t\tif (RosPackage.eINSTANCE.getService().isSuperTypeOf(\n \t\t\t\t\tdomainElement.eClass())) {\n-\t\t\t\treturn NodeEditPart.VISUAL_ID;\n+\t\t\t\treturn ServiceEditPart.VISUAL_ID;\n+\t\t\t}\n+\t\t\tbreak;\n+\t\tcase NodeParametersEditPart.VISUAL_ID:\n+\t\t\tif (RosPackage.eINSTANCE.getParameter().isSuperTypeOf(\n+\t\t\t\t\tdomainElement.eClass())) {\n+\t\t\t\treturn ParameterEditPart.VISUAL_ID;\n \t\t\t}\n \t\t\tbreak;\n \t\t}\n@@ -160,10 +178,21 @@ public static boolean canCreateNode(View containerView, int nodeVisualID) {\n \t\t}\n \t\tswitch (containerVisualID) {\n \t\tcase PackageEditPart.VISUAL_ID:\n+\t\t\tif (NodeEditPart.VISUAL_ID == nodeVisualID) {\n+\t\t\t\treturn true;\n+\t\t\t}\n \t\t\tif (TopicEditPart.VISUAL_ID == nodeVisualID) {\n \t\t\t\treturn true;\n \t\t\t}\n-\t\t\tif (NodeEditPart.VISUAL_ID == nodeVisualID) {\n+\t\t\tif (ServiceEditPart.VISUAL_ID == nodeVisualID) {\n+\t\t\t\treturn true;\n+\t\t\t}\n+\t\t\tbreak;\n+\t\tcase NodeEditPart.VISUAL_ID:\n+\t\t\tif (NodeNameEditPart.VISUAL_ID == nodeVisualID) {\n+\t\t\t\treturn true;\n+\t\t\t}\n+\t\t\tif (NodeParametersEditPart.VISUAL_ID == nodeVisualID) {\n \t\t\t\treturn true;\n \t\t\t}\n \t\t\tbreak;\n@@ -172,8 +201,18 @@ public static boolean canCreateNode(View containerView, int nodeVisualID) {\n \t\t\t\treturn true;\n \t\t\t}\n \t\t\tbreak;\n-\t\tcase NodeEditPart.VISUAL_ID:\n-\t\t\tif (NodeNameEditPart.VISUAL_ID == nodeVisualID) {\n+\t\tcase ServiceEditPart.VISUAL_ID:\n+\t\t\tif (ServiceNameEditPart.VISUAL_ID == nodeVisualID) {\n+\t\t\t\treturn true;\n+\t\t\t}\n+\t\t\tbreak;\n+\t\tcase NodeParametersEditPart.VISUAL_ID:\n+\t\t\tif (ParameterEditPart.VISUAL_ID == nodeVisualID) {\n+\t\t\t\treturn true;\n+\t\t\t}\n+\t\t\tbreak;\n+\t\tcase ServiceClientEditPart.VISUAL_ID:\n+\t\t\tif (ServiceClientNameEditPart.VISUAL_ID == nodeVisualID) {\n \t\t\t\treturn true;\n \t\t\t}\n \t\t\tbreak;\n@@ -182,6 +221,11 @@ public static boolean canCreateNode(View containerView, int nodeVisualID) {\n \t\t\t\treturn true;\n \t\t\t}\n \t\t\tbreak;\n+\t\tcase ServiceServerEditPart.VISUAL_ID:\n+\t\t\tif (ServiceServerNameEditPart.VISUAL_ID == nodeVisualID) {\n+\t\t\t\treturn true;\n+\t\t\t}\n+\t\t\tbreak;\n \t\tcase PublisherEditPart.VISUAL_ID:\n \t\t\tif (PublisherNameEditPart.VISUAL_ID == nodeVisualID) {\n \t\t\t\treturn true;\n@@ -198,10 +242,18 @@ public static int getLinkWithClassVisualID(EObject domainElement) {\n \t\tif (domainElement == null) {\n \t\t\treturn -1;\n \t\t}\n+\t\tif (RosPackage.eINSTANCE.getServiceClient().isSuperTypeOf(\n+\t\t\t\tdomainElement.eClass())) {\n+\t\t\treturn ServiceClientEditPart.VISUAL_ID;\n+\t\t}\n \t\tif (RosPackage.eINSTANCE.getSubscriber().isSuperTypeOf(\n \t\t\t\tdomainElement.eClass())) {\n \t\t\treturn SubscriberEditPart.VISUAL_ID;\n \t\t}\n+\t\tif (RosPackage.eINSTANCE.getServiceServer().isSuperTypeOf(\n+\t\t\t\tdomainElement.eClass())) {\n+\t\t\treturn ServiceServerEditPart.VISUAL_ID;\n+\t\t}\n \t\tif (RosPackage.eINSTANCE.getPublisher().isSuperTypeOf(\n \t\t\t\tdomainElement.eClass())) {\n \t\t\treturn PublisherEditPart.VISUAL_ID;", "raw_url": "https://github.com/ipa320/bride/raw/01bc5c83c895357f23a345ecec85a3796cf66358/org.ros.model.ros.diagram%2Fsrc%2Forg%2Fros%2Fmodel%2Fros%2Fdiagram%2Fpart%2FRosVisualIDRegistry.java", "sha": "c7fdaa0dcba4794ca6fb5759c49f438203e396a0", "status": "modified" }, { "additions": 59, "blob_url": "https://github.com/ipa320/bride/blob/01bc5c83c895357f23a345ecec85a3796cf66358/org.ros.model.ros.diagram%2Fsrc%2Forg%2Fros%2Fmodel%2Fros%2Fdiagram%2Fproviders%2FRosElementTypes.java", "changes": 76, "contents_url": "https://api.github.com/repos/ipa320/bride/contents/org.ros.model.ros.diagram%2Fsrc%2Forg%2Fros%2Fmodel%2Fros%2Fdiagram%2Fproviders%2FRosElementTypes.java?ref=01bc5c83c895357f23a345ecec85a3796cf66358", "deletions": 17, "filename": "org.ros.model.ros.diagram/src/org/ros/model/ros/diagram/providers/RosElementTypes.java", "new_code": "import org.ros.model.ros.diagram.edit.parts.ParameterEditPart;\nimport org.ros.model.ros.diagram.edit.parts.ServiceClientEditPart;\nimport org.ros.model.ros.diagram.edit.parts.ServiceEditPart;\nimport org.ros.model.ros.diagram.edit.parts.ServiceServerEditPart;\n\tpublic static final IElementType Node_2001 = getElementType(\"org.ros.model.ros.diagram.Node_2001\"); //$NON-NLS-1$\n\tpublic static final IElementType Topic_2002 = getElementType(\"org.ros.model.ros.diagram.Topic_2002\"); //$NON-NLS-1$\n\tpublic static final IElementType Service_2003 = getElementType(\"org.ros.model.ros.diagram.Service_2003\"); //$NON-NLS-1$\n\tpublic static final IElementType Parameter_3001 = getElementType(\"org.ros.model.ros.diagram.Parameter_3001\"); //$NON-NLS-1$\n\t/**\n\t * @generated\n\t */\n\tpublic static final IElementType ServiceClient_4001 = getElementType(\"org.ros.model.ros.diagram.ServiceClient_4001\"); //$NON-NLS-1$\n\t/**\n\t * @generated\n\t */\n\tpublic static final IElementType Subscriber_4002 = getElementType(\"org.ros.model.ros.diagram.Subscriber_4002\"); //$NON-NLS-1$\n\t/**\n\t * @generated\n\t */\n\tpublic static final IElementType ServiceServer_4003 = getElementType(\"org.ros.model.ros.diagram.ServiceServer_4003\"); //$NON-NLS-1$\n\t/**\n\t * @generated\n\t */\n\tpublic static final IElementType Publisher_4004 = getElementType(\"org.ros.model.ros.diagram.Publisher_4004\"); //$NON-NLS-1$\n\t\t\telements.put(Node_2001, RosPackage.eINSTANCE.getNode());\n\n\t\t\telements.put(Topic_2002, RosPackage.eINSTANCE.getTopic());\n\n\t\t\telements.put(Service_2003, RosPackage.eINSTANCE.getService());\n\t\t\telements.put(Parameter_3001, RosPackage.eINSTANCE.getParameter());\n\t\t\telements.put(ServiceClient_4001,\n\t\t\t\t\tRosPackage.eINSTANCE.getServiceClient());\n\t\t\telements.put(Subscriber_4002, RosPackage.eINSTANCE.getSubscriber());\n\n\t\t\telements.put(ServiceServer_4003,\n\t\t\t\t\tRosPackage.eINSTANCE.getServiceServer());\n\n\t\t\telements.put(Publisher_4004, RosPackage.eINSTANCE.getPublisher());\n\t\t\tKNOWN_ELEMENT_TYPES.add(Node_2001);\n\t\t\tKNOWN_ELEMENT_TYPES.add(Topic_2002);\n\t\t\tKNOWN_ELEMENT_TYPES.add(Service_2003);\n\t\t\tKNOWN_ELEMENT_TYPES.add(Parameter_3001);\n\t\t\tKNOWN_ELEMENT_TYPES.add(ServiceClient_4001);\n\t\t\tKNOWN_ELEMENT_TYPES.add(Subscriber_4002);\n\t\t\tKNOWN_ELEMENT_TYPES.add(ServiceServer_4003);\n\t\t\tKNOWN_ELEMENT_TYPES.add(Publisher_4004);\n\t\t\treturn Node_2001;\n\t\tcase TopicEditPart.VISUAL_ID:\n\t\t\treturn Topic_2002;\n\t\tcase ServiceEditPart.VISUAL_ID:\n\t\t\treturn Service_2003;\n\t\tcase ParameterEditPart.VISUAL_ID:\n\t\t\treturn Parameter_3001;\n\t\tcase ServiceClientEditPart.VISUAL_ID:\n\t\t\treturn ServiceClient_4001;\n\t\t\treturn Subscriber_4002;\n\t\tcase ServiceServerEditPart.VISUAL_ID:\n\t\t\treturn ServiceServer_4003;\n\t\t\treturn Publisher_4004;", "new_methods": [], "old_code": "\tpublic static final IElementType Topic_2001 = getElementType(\"org.ros.model.ros.diagram.Topic_2001\"); //$NON-NLS-1$\n\tpublic static final IElementType Node_2002 = getElementType(\"org.ros.model.ros.diagram.Node_2002\"); //$NON-NLS-1$\n\tpublic static final IElementType Subscriber_4001 = getElementType(\"org.ros.model.ros.diagram.Subscriber_4001\"); //$NON-NLS-1$\n\tpublic static final IElementType Publisher_4002 = getElementType(\"org.ros.model.ros.diagram.Publisher_4002\"); //$NON-NLS-1$\n\t\t\telements.put(Topic_2001, RosPackage.eINSTANCE.getTopic());\n\t\t\telements.put(Node_2002, RosPackage.eINSTANCE.getNode());\n\t\t\telements.put(Subscriber_4001, RosPackage.eINSTANCE.getSubscriber());\n\t\t\telements.put(Publisher_4002, RosPackage.eINSTANCE.getPublisher());\n\t\t\tKNOWN_ELEMENT_TYPES.add(Topic_2001);\n\t\t\tKNOWN_ELEMENT_TYPES.add(Node_2002);\n\t\t\tKNOWN_ELEMENT_TYPES.add(Subscriber_4001);\n\t\t\tKNOWN_ELEMENT_TYPES.add(Publisher_4002);\n\t\tcase TopicEditPart.VISUAL_ID:\n\t\t\treturn Topic_2001;\n\t\t\treturn Node_2002;\n\t\t\treturn Subscriber_4001;\n\t\t\treturn Publisher_4002;", "old_methods": [], "patch": "@@ -18,7 +18,11 @@\n import org.ros.model.ros.RosPackage;\n import org.ros.model.ros.diagram.edit.parts.NodeEditPart;\n import org.ros.model.ros.diagram.edit.parts.PackageEditPart;\n+import org.ros.model.ros.diagram.edit.parts.ParameterEditPart;\n import org.ros.model.ros.diagram.edit.parts.PublisherEditPart;\n+import org.ros.model.ros.diagram.edit.parts.ServiceClientEditPart;\n+import org.ros.model.ros.diagram.edit.parts.ServiceEditPart;\n+import org.ros.model.ros.diagram.edit.parts.ServiceServerEditPart;\n import org.ros.model.ros.diagram.edit.parts.SubscriberEditPart;\n import org.ros.model.ros.diagram.edit.parts.TopicEditPart;\n import org.ros.model.ros.diagram.part.RosDiagramEditorPlugin;\n@@ -56,19 +60,35 @@ private RosElementTypes() {\n \t/**\n \t * @generated\n \t */\n-\tpublic static final IElementType Topic_2001 = getElementType(\"org.ros.model.ros.diagram.Topic_2001\"); //$NON-NLS-1$\n+\tpublic static final IElementType Node_2001 = getElementType(\"org.ros.model.ros.diagram.Node_2001\"); //$NON-NLS-1$\n \t/**\n \t * @generated\n \t */\n-\tpublic static final IElementType Node_2002 = getElementType(\"org.ros.model.ros.diagram.Node_2002\"); //$NON-NLS-1$\n+\tpublic static final IElementType Topic_2002 = getElementType(\"org.ros.model.ros.diagram.Topic_2002\"); //$NON-NLS-1$\n \t/**\n \t * @generated\n \t */\n-\tpublic static final IElementType Subscriber_4001 = getElementType(\"org.ros.model.ros.diagram.Subscriber_4001\"); //$NON-NLS-1$\n+\tpublic static final IElementType Service_2003 = getElementType(\"org.ros.model.ros.diagram.Service_2003\"); //$NON-NLS-1$\n \t/**\n \t * @generated\n \t */\n-\tpublic static final IElementType Publisher_4002 = getElementType(\"org.ros.model.ros.diagram.Publisher_4002\"); //$NON-NLS-1$\n+\tpublic static final IElementType Parameter_3001 = getElementType(\"org.ros.model.ros.diagram.Parameter_3001\"); //$NON-NLS-1$\n+\t/**\n+\t * @generated\n+\t */\n+\tpublic static final IElementType ServiceClient_4001 = getElementType(\"org.ros.model.ros.diagram.ServiceClient_4001\"); //$NON-NLS-1$\n+\t/**\n+\t * @generated\n+\t */\n+\tpublic static final IElementType Subscriber_4002 = getElementType(\"org.ros.model.ros.diagram.Subscriber_4002\"); //$NON-NLS-1$\n+\t/**\n+\t * @generated\n+\t */\n+\tpublic static final IElementType ServiceServer_4003 = getElementType(\"org.ros.model.ros.diagram.ServiceServer_4003\"); //$NON-NLS-1$\n+\t/**\n+\t * @generated\n+\t */\n+\tpublic static final IElementType Publisher_4004 = getElementType(\"org.ros.model.ros.diagram.Publisher_4004\"); //$NON-NLS-1$\n \n \t/**\n \t * @generated\n@@ -183,13 +203,23 @@ public static ENamedElement getElement(IAdaptable hint) {\n \n \t\t\telements.put(Package_1000, RosPackage.eINSTANCE.getPackage());\n \n-\t\t\telements.put(Topic_2001, RosPackage.eINSTANCE.getTopic());\n+\t\t\telements.put(Node_2001, RosPackage.eINSTANCE.getNode());\n+\n+\t\t\telements.put(Topic_2002, RosPackage.eINSTANCE.getTopic());\n+\n+\t\t\telements.put(Service_2003, RosPackage.eINSTANCE.getService());\n \n-\t\t\telements.put(Node_2002, RosPackage.eINSTANCE.getNode());\n+\t\t\telements.put(Parameter_3001, RosPackage.eINSTANCE.getParameter());\n \n-\t\t\telements.put(Subscriber_4001, RosPackage.eINSTANCE.getSubscriber());\n+\t\t\telements.put(ServiceClient_4001,\n+\t\t\t\t\tRosPackage.eINSTANCE.getServiceClient());\n \n-\t\t\telements.put(Publisher_4002, RosPackage.eINSTANCE.getPublisher());\n+\t\t\telements.put(Subscriber_4002, RosPackage.eINSTANCE.getSubscriber());\n+\n+\t\t\telements.put(ServiceServer_4003,\n+\t\t\t\t\tRosPackage.eINSTANCE.getServiceServer());\n+\n+\t\t\telements.put(Publisher_4004, RosPackage.eINSTANCE.getPublisher());\n \t\t}\n \t\treturn (ENamedElement) elements.get(type);\n \t}\n@@ -208,10 +238,14 @@ public static boolean isKnownElementType(IElementType elementType) {\n \t\tif (KNOWN_ELEMENT_TYPES == null) {\n \t\t\tKNOWN_ELEMENT_TYPES = new HashSet<IElementType>();\n \t\t\tKNOWN_ELEMENT_TYPES.add(Package_1000);\n-\t\t\tKNOWN_ELEMENT_TYPES.add(Topic_2001);\n-\t\t\tKNOWN_ELEMENT_TYPES.add(Node_2002);\n-\t\t\tKNOWN_ELEMENT_TYPES.add(Subscriber_4001);\n-\t\t\tKNOWN_ELEMENT_TYPES.add(Publisher_4002);\n+\t\t\tKNOWN_ELEMENT_TYPES.add(Node_2001);\n+\t\t\tKNOWN_ELEMENT_TYPES.add(Topic_2002);\n+\t\t\tKNOWN_ELEMENT_TYPES.add(Service_2003);\n+\t\t\tKNOWN_ELEMENT_TYPES.add(Parameter_3001);\n+\t\t\tKNOWN_ELEMENT_TYPES.add(ServiceClient_4001);\n+\t\t\tKNOWN_ELEMENT_TYPES.add(Subscriber_4002);\n+\t\t\tKNOWN_ELEMENT_TYPES.add(ServiceServer_4003);\n+\t\t\tKNOWN_ELEMENT_TYPES.add(Publisher_4004);\n \t\t}\n \t\treturn KNOWN_ELEMENT_TYPES.contains(elementType);\n \t}\n@@ -223,14 +257,22 @@ public static IElementType getElementType(int visualID) {\n \t\tswitch (visualID) {\n \t\tcase PackageEditPart.VISUAL_ID:\n \t\t\treturn Package_1000;\n-\t\tcase TopicEditPart.VISUAL_ID:\n-\t\t\treturn Topic_2001;\n \t\tcase NodeEditPart.VISUAL_ID:\n-\t\t\treturn Node_2002;\n+\t\t\treturn Node_2001;\n+\t\tcase TopicEditPart.VISUAL_ID:\n+\t\t\treturn Topic_2002;\n+\t\tcase ServiceEditPart.VISUAL_ID:\n+\t\t\treturn Service_2003;\n+\t\tcase ParameterEditPart.VISUAL_ID:\n+\t\t\treturn Parameter_3001;\n+\t\tcase ServiceClientEditPart.VISUAL_ID:\n+\t\t\treturn ServiceClient_4001;\n \t\tcase SubscriberEditPart.VISUAL_ID:\n-\t\t\treturn Subscriber_4001;\n+\t\t\treturn Subscriber_4002;\n+\t\tcase ServiceServerEditPart.VISUAL_ID:\n+\t\t\treturn ServiceServer_4003;\n \t\tcase PublisherEditPart.VISUAL_ID:\n-\t\t\treturn Publisher_4002;\n+\t\t\treturn Publisher_4004;\n \t\t}\n \t\treturn null;\n \t}", "raw_url": "https://github.com/ipa320/bride/raw/01bc5c83c895357f23a345ecec85a3796cf66358/org.ros.model.ros.diagram%2Fsrc%2Forg%2Fros%2Fmodel%2Fros%2Fdiagram%2Fproviders%2FRosElementTypes.java", "sha": "9009d41d6b53e04acf7fecb76203230b721d78d3", "status": "modified" }, { "additions": 17, "blob_url": "https://github.com/ipa320/bride/blob/01bc5c83c895357f23a345ecec85a3796cf66358/org.ros.model.ros.diagram%2Fsrc%2Forg%2Fros%2Fmodel%2Fros%2Fdiagram%2Fproviders%2FRosModelingAssistantProvider.java", "changes": 20, "contents_url": "https://api.github.com/repos/ipa320/bride/contents/org.ros.model.ros.diagram%2Fsrc%2Forg%2Fros%2Fmodel%2Fros%2Fdiagram%2Fproviders%2FRosModelingAssistantProvider.java?ref=01bc5c83c895357f23a345ecec85a3796cf66358", "deletions": 3, "filename": "org.ros.model.ros.diagram/src/org/ros/model/ros/diagram/providers/RosModelingAssistantProvider.java", "new_code": "import org.ros.model.ros.diagram.edit.parts.ServiceEditPart;\n\t\t\tArrayList<IElementType> types = new ArrayList<IElementType>(3);\n\t\t\ttypes.add(RosElementTypes.Node_2001);\n\t\t\ttypes.add(RosElementTypes.Topic_2002);\n\t\t\ttypes.add(RosElementTypes.Service_2003);\n\t\t\treturn types;\n\t\t}\n\t\tif (editPart instanceof NodeEditPart) {\n\t\t\tArrayList<IElementType> types = new ArrayList<IElementType>(1);\n\t\t\ttypes.add(RosElementTypes.Parameter_3001);\n\t\tif (targetEditPart instanceof ServiceEditPart) {\n\t\t\treturn ((ServiceEditPart) targetEditPart).getMARelTypesOnTarget();\n\t\t}\n\t\tif (targetEditPart instanceof ServiceEditPart) {\n\t\t\treturn ((ServiceEditPart) targetEditPart)\n\t\t\t\t\t.getMATypesForSource(relationshipType);\n\t\t}", "new_methods": [], "old_code": "\t\t\tArrayList<IElementType> types = new ArrayList<IElementType>(2);\n\t\t\ttypes.add(RosElementTypes.Topic_2001);\n\t\t\ttypes.add(RosElementTypes.Node_2002);", "old_methods": [], "patch": "@@ -22,6 +22,7 @@\n import org.eclipse.ui.dialogs.ElementListSelectionDialog;\n import org.ros.model.ros.diagram.edit.parts.NodeEditPart;\n import org.ros.model.ros.diagram.edit.parts.PackageEditPart;\n+import org.ros.model.ros.diagram.edit.parts.ServiceEditPart;\n import org.ros.model.ros.diagram.edit.parts.TopicEditPart;\n import org.ros.model.ros.diagram.part.Messages;\n import org.ros.model.ros.diagram.part.RosDiagramEditorPlugin;\n@@ -38,9 +39,15 @@ public List getTypesForPopupBar(IAdaptable host) {\n \t\tIGraphicalEditPart editPart = (IGraphicalEditPart) host\n \t\t\t\t.getAdapter(IGraphicalEditPart.class);\n \t\tif (editPart instanceof PackageEditPart) {\n-\t\t\tArrayList<IElementType> types = new ArrayList<IElementType>(2);\n-\t\t\ttypes.add(RosElementTypes.Topic_2001);\n-\t\t\ttypes.add(RosElementTypes.Node_2002);\n+\t\t\tArrayList<IElementType> types = new ArrayList<IElementType>(3);\n+\t\t\ttypes.add(RosElementTypes.Node_2001);\n+\t\t\ttypes.add(RosElementTypes.Topic_2002);\n+\t\t\ttypes.add(RosElementTypes.Service_2003);\n+\t\t\treturn types;\n+\t\t}\n+\t\tif (editPart instanceof NodeEditPart) {\n+\t\t\tArrayList<IElementType> types = new ArrayList<IElementType>(1);\n+\t\t\ttypes.add(RosElementTypes.Parameter_3001);\n \t\t\treturn types;\n \t\t}\n \t\treturn Collections.EMPTY_LIST;\n@@ -67,6 +74,9 @@ public List getRelTypesOnTarget(IAdaptable target) {\n \t\tif (targetEditPart instanceof TopicEditPart) {\n \t\t\treturn ((TopicEditPart) targetEditPart).getMARelTypesOnTarget();\n \t\t}\n+\t\tif (targetEditPart instanceof ServiceEditPart) {\n+\t\t\treturn ((ServiceEditPart) targetEditPart).getMARelTypesOnTarget();\n+\t\t}\n \t\treturn Collections.EMPTY_LIST;\n \t}\n \n@@ -97,6 +107,10 @@ public List getTypesForSource(IAdaptable target,\n \t\t\treturn ((TopicEditPart) targetEditPart)\n \t\t\t\t\t.getMATypesForSource(relationshipType);\n \t\t}\n+\t\tif (targetEditPart instanceof ServiceEditPart) {\n+\t\t\treturn ((ServiceEditPart) targetEditPart)\n+\t\t\t\t\t.getMATypesForSource(relationshipType);\n+\t\t}\n \t\treturn Collections.EMPTY_LIST;\n \t}\n ", "raw_url": "https://github.com/ipa320/bride/raw/01bc5c83c895357f23a345ecec85a3796cf66358/org.ros.model.ros.diagram%2Fsrc%2Forg%2Fros%2Fmodel%2Fros%2Fdiagram%2Fproviders%2FRosModelingAssistantProvider.java", "sha": "4c7287333031d92ad419f64ddd495b62861b3fd6", "status": "modified" }, { "additions": 110, "blob_url": "https://github.com/ipa320/bride/blob/01bc5c83c895357f23a345ecec85a3796cf66358/org.ros.model.ros.diagram%2Fsrc%2Forg%2Fros%2Fmodel%2Fros%2Fdiagram%2Fproviders%2FRosParserProvider.java", "changes": 136, "contents_url": "https://api.github.com/repos/ipa320/bride/contents/org.ros.model.ros.diagram%2Fsrc%2Forg%2Fros%2Fmodel%2Fros%2Fdiagram%2Fproviders%2FRosParserProvider.java?ref=01bc5c83c895357f23a345ecec85a3796cf66358", "deletions": 26, "filename": "org.ros.model.ros.diagram/src/org/ros/model/ros/diagram/providers/RosParserProvider.java", "new_code": "import org.ros.model.ros.diagram.edit.parts.ParameterEditPart;\nimport org.ros.model.ros.diagram.edit.parts.ServiceClientNameEditPart;\nimport org.ros.model.ros.diagram.edit.parts.ServiceNameEditPart;\nimport org.ros.model.ros.diagram.edit.parts.ServiceServerNameEditPart;\n\tprivate IParser nodeName_5001Parser;\n\tprivate IParser getNodeName_5001Parser() {\n\t\tif (nodeName_5001Parser == null) {\n\t\t\tEAttribute[] features = new EAttribute[] { RosPackage.eINSTANCE\n\t\t\t\t\t.getNode_Name() };\n\t\t\tMessageFormatParser parser = new MessageFormatParser(features);\n\t\t\tnodeName_5001Parser = parser;\n\t\t}\n\t\treturn nodeName_5001Parser;\n\t}\n\n\t/**\n\t * @generated\n\t */\n\tprivate IParser topicName_5002Parser;\n\n\t/**\n\t * @generated\n\t */\n\tprivate IParser getTopicName_5002Parser() {\n\t\tif (topicName_5002Parser == null) {\n\t\t\ttopicName_5002Parser = parser;\n\t\treturn topicName_5002Parser;\n\tprivate IParser serviceName_5003Parser;\n\tprivate IParser getServiceName_5003Parser() {\n\t\tif (serviceName_5003Parser == null) {\n\t\t\t\t\t.getService_Name() };\n\t\t\tMessageFormatParser parser = new MessageFormatParser(features);\n\t\t\tserviceName_5003Parser = parser;\n\t\t}\n\t\treturn serviceName_5003Parser;\n\t}\n\n\t/**\n\t * @generated\n\t */\n\tprivate IParser parameter_3001Parser;\n\n\t/**\n\t * @generated\n\t */\n\tprivate IParser getParameter_3001Parser() {\n\t\tif (parameter_3001Parser == null) {\n\t\t\tEAttribute[] features = new EAttribute[] { RosPackage.eINSTANCE\n\t\t\t\t\t.getParameter_Name() };\n\t\t\tparameter_3001Parser = parser;\n\t\treturn parameter_3001Parser;\n\tprivate IParser serviceClientName_6001Parser;\n\tprivate IParser getServiceClientName_6001Parser() {\n\t\tif (serviceClientName_6001Parser == null) {\n\t\t\tEAttribute[] features = new EAttribute[] { RosPackage.eINSTANCE\n\t\t\t\t\t.getServiceClient_Name() };\n\t\t\tMessageFormatParser parser = new MessageFormatParser(features);\n\t\t\tserviceClientName_6001Parser = parser;\n\t\t}\n\t\treturn serviceClientName_6001Parser;\n\t}\n\n\t/**\n\t * @generated\n\t */\n\tprivate IParser subscriberName_6002Parser;\n\n\t/**\n\t * @generated\n\t */\n\tprivate IParser getSubscriberName_6002Parser() {\n\t\tif (subscriberName_6002Parser == null) {\n\t\t\tsubscriberName_6002Parser = parser;\n\t\t}\n\t\treturn subscriberName_6002Parser;\n\t}\n\n\t/**\n\t * @generated\n\t */\n\tprivate IParser serviceServerName_6003Parser;\n\n\t/**\n\t * @generated\n\t */\n\tprivate IParser getServiceServerName_6003Parser() {\n\t\tif (serviceServerName_6003Parser == null) {\n\t\t\tEAttribute[] features = new EAttribute[] { RosPackage.eINSTANCE\n\t\t\t\t\t.getServiceServer_Name() };\n\t\t\tMessageFormatParser parser = new MessageFormatParser(features);\n\t\t\tserviceServerName_6003Parser = parser;\n\t\treturn serviceServerName_6003Parser;\n\tprivate IParser publisherName_6004Parser;\n\tprivate IParser getPublisherName_6004Parser() {\n\t\tif (publisherName_6004Parser == null) {\n\t\t\tpublisherName_6004Parser = parser;\n\t\treturn publisherName_6004Parser;\n\t\t\treturn getNodeName_5001Parser();\n\t\tcase TopicNameEditPart.VISUAL_ID:\n\t\t\treturn getTopicName_5002Parser();\n\t\tcase ServiceNameEditPart.VISUAL_ID:\n\t\t\treturn getServiceName_5003Parser();\n\t\tcase ParameterEditPart.VISUAL_ID:\n\t\t\treturn getParameter_3001Parser();\n\t\tcase ServiceClientNameEditPart.VISUAL_ID:\n\t\t\treturn getServiceClientName_6001Parser();\n\t\t\treturn getSubscriberName_6002Parser();\n\t\tcase ServiceServerNameEditPart.VISUAL_ID:\n\t\t\treturn getServiceServerName_6003Parser();\n\t\t\treturn getPublisherName_6004Parser();", "new_methods": [ { "arguments": [], "filename": "org.ros.model.ros.diagram/src/org/ros/model/ros/diagram/providers/RosParserProvider.java", "implementation": "if (nodeName_5001Parser == null) {\n\t\t\tEAttribute[] features = new EAttribute[] { RosPackage.eINSTANCE\n\t\t\t\t\t.getNode_Name()", "signature": "IParser getNodeName_5001Parser()" }, { "arguments": [], "filename": "org.ros.model.ros.diagram/src/org/ros/model/ros/diagram/providers/RosParserProvider.java", "implementation": "if (topicName_5002Parser == null) {\n\t\t\ttopicName_5002Parser = parser;\n\t\treturn topicName_5002Parser;\n\tprivate IParser serviceName_5003Parser;\n\tprivate IParser getServiceName_5003Parser() {\n\t\tif (serviceName_5003Parser == null) {\n\t\t\t\t\t.getService_Name()", "signature": "IParser getTopicName_5002Parser()" }, { "arguments": [], "filename": "org.ros.model.ros.diagram/src/org/ros/model/ros/diagram/providers/RosParserProvider.java", "implementation": "if (parameter_3001Parser == null) {\n\t\t\tEAttribute[] features = new EAttribute[] { RosPackage.eINSTANCE\n\t\t\t\t\t.getParameter_Name()", "signature": "IParser getParameter_3001Parser()" }, { "arguments": [], "filename": "org.ros.model.ros.diagram/src/org/ros/model/ros/diagram/providers/RosParserProvider.java", "implementation": "if (serviceClientName_6001Parser == null) {\n\t\t\tEAttribute[] features = new EAttribute[] { RosPackage.eINSTANCE\n\t\t\t\t\t.getServiceClient_Name()", "signature": "IParser getServiceClientName_6001Parser()" }, { "arguments": [], "filename": "org.ros.model.ros.diagram/src/org/ros/model/ros/diagram/providers/RosParserProvider.java", "implementation": "if (subscriberName_6002Parser == null) {\n\t\t\tsubscriberName_6002Parser = parser;", "signature": "IParser getSubscriberName_6002Parser()" }, { "arguments": [], "filename": "org.ros.model.ros.diagram/src/org/ros/model/ros/diagram/providers/RosParserProvider.java", "implementation": "if (serviceServerName_6003Parser == null) {\n\t\t\tEAttribute[] features = new EAttribute[] { RosPackage.eINSTANCE\n\t\t\t\t\t.getServiceServer_Name()", "signature": "IParser getServiceServerName_6003Parser()" } ], "old_code": "\tprivate IParser topicName_5001Parser;\n\tprivate IParser getTopicName_5001Parser() {\n\t\tif (topicName_5001Parser == null) {\n\t\t\ttopicName_5001Parser = parser;\n\t\treturn topicName_5001Parser;\n\tprivate IParser nodeName_5002Parser;\n\tprivate IParser getNodeName_5002Parser() {\n\t\tif (nodeName_5002Parser == null) {\n\t\t\t\t\t.getNode_Name() };\n\t\t\tnodeName_5002Parser = parser;\n\t\treturn nodeName_5002Parser;\n\tprivate IParser subscriberName_6001Parser;\n\tprivate IParser getSubscriberName_6001Parser() {\n\t\tif (subscriberName_6001Parser == null) {\n\t\t\tsubscriberName_6001Parser = parser;\n\t\treturn subscriberName_6001Parser;\n\tprivate IParser publisherName_6002Parser;\n\tprivate IParser getPublisherName_6002Parser() {\n\t\tif (publisherName_6002Parser == null) {\n\t\t\tpublisherName_6002Parser = parser;\n\t\treturn publisherName_6002Parser;\n\t\tcase TopicNameEditPart.VISUAL_ID:\n\t\t\treturn getTopicName_5001Parser();\n\t\t\treturn getNodeName_5002Parser();\n\t\t\treturn getSubscriberName_6001Parser();\n\t\t\treturn getPublisherName_6002Parser();", "old_methods": [ { "arguments": [], "filename": "org.ros.model.ros.diagram/src/org/ros/model/ros/diagram/providers/RosParserProvider.java", "implementation": "if (topicName_5001Parser == null) {\n\t\t\ttopicName_5001Parser = parser;\n\t\treturn topicName_5001Parser;\n\tprivate IParser nodeName_5002Parser;\n\tprivate IParser getNodeName_5002Parser() {\n\t\tif (nodeName_5002Parser == null) {\n\t\t\t\t\t.getNode_Name()", "signature": "IParser getTopicName_5001Parser()" } ], "patch": "@@ -14,7 +14,11 @@\n import org.eclipse.gmf.runtime.notation.View;\n import org.ros.model.ros.RosPackage;\n import org.ros.model.ros.diagram.edit.parts.NodeNameEditPart;\n+import org.ros.model.ros.diagram.edit.parts.ParameterEditPart;\n import org.ros.model.ros.diagram.edit.parts.PublisherNameEditPart;\n+import org.ros.model.ros.diagram.edit.parts.ServiceClientNameEditPart;\n+import org.ros.model.ros.diagram.edit.parts.ServiceNameEditPart;\n+import org.ros.model.ros.diagram.edit.parts.ServiceServerNameEditPart;\n import org.ros.model.ros.diagram.edit.parts.SubscriberNameEditPart;\n import org.ros.model.ros.diagram.edit.parts.TopicNameEditPart;\n import org.ros.model.ros.diagram.parsers.MessageFormatParser;\n@@ -29,88 +33,168 @@ public class RosParserProvider extends AbstractProvider implements\n \t/**\n \t * @generated\n \t */\n-\tprivate IParser topicName_5001Parser;\n+\tprivate IParser nodeName_5001Parser;\n \n \t/**\n \t * @generated\n \t */\n-\tprivate IParser getTopicName_5001Parser() {\n-\t\tif (topicName_5001Parser == null) {\n+\tprivate IParser getNodeName_5001Parser() {\n+\t\tif (nodeName_5001Parser == null) {\n+\t\t\tEAttribute[] features = new EAttribute[] { RosPackage.eINSTANCE\n+\t\t\t\t\t.getNode_Name() };\n+\t\t\tMessageFormatParser parser = new MessageFormatParser(features);\n+\t\t\tnodeName_5001Parser = parser;\n+\t\t}\n+\t\treturn nodeName_5001Parser;\n+\t}\n+\n+\t/**\n+\t * @generated\n+\t */\n+\tprivate IParser topicName_5002Parser;\n+\n+\t/**\n+\t * @generated\n+\t */\n+\tprivate IParser getTopicName_5002Parser() {\n+\t\tif (topicName_5002Parser == null) {\n \t\t\tEAttribute[] features = new EAttribute[] { RosPackage.eINSTANCE\n \t\t\t\t\t.getTopic_Name() };\n \t\t\tMessageFormatParser parser = new MessageFormatParser(features);\n-\t\t\ttopicName_5001Parser = parser;\n+\t\t\ttopicName_5002Parser = parser;\n \t\t}\n-\t\treturn topicName_5001Parser;\n+\t\treturn topicName_5002Parser;\n \t}\n \n \t/**\n \t * @generated\n \t */\n-\tprivate IParser nodeName_5002Parser;\n+\tprivate IParser serviceName_5003Parser;\n \n \t/**\n \t * @generated\n \t */\n-\tprivate IParser getNodeName_5002Parser() {\n-\t\tif (nodeName_5002Parser == null) {\n+\tprivate IParser getServiceName_5003Parser() {\n+\t\tif (serviceName_5003Parser == null) {\n \t\t\tEAttribute[] features = new EAttribute[] { RosPackage.eINSTANCE\n-\t\t\t\t\t.getNode_Name() };\n+\t\t\t\t\t.getService_Name() };\n+\t\t\tMessageFormatParser parser = new MessageFormatParser(features);\n+\t\t\tserviceName_5003Parser = parser;\n+\t\t}\n+\t\treturn serviceName_5003Parser;\n+\t}\n+\n+\t/**\n+\t * @generated\n+\t */\n+\tprivate IParser parameter_3001Parser;\n+\n+\t/**\n+\t * @generated\n+\t */\n+\tprivate IParser getParameter_3001Parser() {\n+\t\tif (parameter_3001Parser == null) {\n+\t\t\tEAttribute[] features = new EAttribute[] { RosPackage.eINSTANCE\n+\t\t\t\t\t.getParameter_Name() };\n \t\t\tMessageFormatParser parser = new MessageFormatParser(features);\n-\t\t\tnodeName_5002Parser = parser;\n+\t\t\tparameter_3001Parser = parser;\n \t\t}\n-\t\treturn nodeName_5002Parser;\n+\t\treturn parameter_3001Parser;\n \t}\n \n \t/**\n \t * @generated\n \t */\n-\tprivate IParser subscriberName_6001Parser;\n+\tprivate IParser serviceClientName_6001Parser;\n \n \t/**\n \t * @generated\n \t */\n-\tprivate IParser getSubscriberName_6001Parser() {\n-\t\tif (subscriberName_6001Parser == null) {\n+\tprivate IParser getServiceClientName_6001Parser() {\n+\t\tif (serviceClientName_6001Parser == null) {\n+\t\t\tEAttribute[] features = new EAttribute[] { RosPackage.eINSTANCE\n+\t\t\t\t\t.getServiceClient_Name() };\n+\t\t\tMessageFormatParser parser = new MessageFormatParser(features);\n+\t\t\tserviceClientName_6001Parser = parser;\n+\t\t}\n+\t\treturn serviceClientName_6001Parser;\n+\t}\n+\n+\t/**\n+\t * @generated\n+\t */\n+\tprivate IParser subscriberName_6002Parser;\n+\n+\t/**\n+\t * @generated\n+\t */\n+\tprivate IParser getSubscriberName_6002Parser() {\n+\t\tif (subscriberName_6002Parser == null) {\n \t\t\tEAttribute[] features = new EAttribute[] { RosPackage.eINSTANCE\n \t\t\t\t\t.getSubscriber_Name() };\n \t\t\tMessageFormatParser parser = new MessageFormatParser(features);\n-\t\t\tsubscriberName_6001Parser = parser;\n+\t\t\tsubscriberName_6002Parser = parser;\n+\t\t}\n+\t\treturn subscriberName_6002Parser;\n+\t}\n+\n+\t/**\n+\t * @generated\n+\t */\n+\tprivate IParser serviceServerName_6003Parser;\n+\n+\t/**\n+\t * @generated\n+\t */\n+\tprivate IParser getServiceServerName_6003Parser() {\n+\t\tif (serviceServerName_6003Parser == null) {\n+\t\t\tEAttribute[] features = new EAttribute[] { RosPackage.eINSTANCE\n+\t\t\t\t\t.getServiceServer_Name() };\n+\t\t\tMessageFormatParser parser = new MessageFormatParser(features);\n+\t\t\tserviceServerName_6003Parser = parser;\n \t\t}\n-\t\treturn subscriberName_6001Parser;\n+\t\treturn serviceServerName_6003Parser;\n \t}\n \n \t/**\n \t * @generated\n \t */\n-\tprivate IParser publisherName_6002Parser;\n+\tprivate IParser publisherName_6004Parser;\n \n \t/**\n \t * @generated\n \t */\n-\tprivate IParser getPublisherName_6002Parser() {\n-\t\tif (publisherName_6002Parser == null) {\n+\tprivate IParser getPublisherName_6004Parser() {\n+\t\tif (publisherName_6004Parser == null) {\n \t\t\tEAttribute[] features = new EAttribute[] { RosPackage.eINSTANCE\n \t\t\t\t\t.getPublisher_Name() };\n \t\t\tMessageFormatParser parser = new MessageFormatParser(features);\n-\t\t\tpublisherName_6002Parser = parser;\n+\t\t\tpublisherName_6004Parser = parser;\n \t\t}\n-\t\treturn publisherName_6002Parser;\n+\t\treturn publisherName_6004Parser;\n \t}\n \n \t/**\n \t * @generated\n \t */\n \tprotected IParser getParser(int visualID) {\n \t\tswitch (visualID) {\n-\t\tcase TopicNameEditPart.VISUAL_ID:\n-\t\t\treturn getTopicName_5001Parser();\n \t\tcase NodeNameEditPart.VISUAL_ID:\n-\t\t\treturn getNodeName_5002Parser();\n+\t\t\treturn getNodeName_5001Parser();\n+\t\tcase TopicNameEditPart.VISUAL_ID:\n+\t\t\treturn getTopicName_5002Parser();\n+\t\tcase ServiceNameEditPart.VISUAL_ID:\n+\t\t\treturn getServiceName_5003Parser();\n+\t\tcase ParameterEditPart.VISUAL_ID:\n+\t\t\treturn getParameter_3001Parser();\n+\t\tcase ServiceClientNameEditPart.VISUAL_ID:\n+\t\t\treturn getServiceClientName_6001Parser();\n \t\tcase SubscriberNameEditPart.VISUAL_ID:\n-\t\t\treturn getSubscriberName_6001Parser();\n+\t\t\treturn getSubscriberName_6002Parser();\n+\t\tcase ServiceServerNameEditPart.VISUAL_ID:\n+\t\t\treturn getServiceServerName_6003Parser();\n \t\tcase PublisherNameEditPart.VISUAL_ID:\n-\t\t\treturn getPublisherName_6002Parser();\n+\t\t\treturn getPublisherName_6004Parser();\n \t\t}\n \t\treturn null;\n \t}", "raw_url": "https://github.com/ipa320/bride/raw/01bc5c83c895357f23a345ecec85a3796cf66358/org.ros.model.ros.diagram%2Fsrc%2Forg%2Fros%2Fmodel%2Fros%2Fdiagram%2Fproviders%2FRosParserProvider.java", "sha": "63725b61e61fe2df39ac9bf9ed6fdc33a81dec69", "status": "modified" }, { "additions": 262, "blob_url": "https://github.com/ipa320/bride/blob/01bc5c83c895357f23a345ecec85a3796cf66358/org.ros.model.ros.diagram%2Fsrc%2Forg%2Fros%2Fmodel%2Fros%2Fdiagram%2Fproviders%2FRosViewProvider.java", "changes": 283, "contents_url": "https://api.github.com/repos/ipa320/bride/contents/org.ros.model.ros.diagram%2Fsrc%2Forg%2Fros%2Fmodel%2Fros%2Fdiagram%2Fproviders%2FRosViewProvider.java?ref=01bc5c83c895357f23a345ecec85a3796cf66358", "deletions": 21, "filename": "org.ros.model.ros.diagram/src/org/ros/model/ros/diagram/providers/RosViewProvider.java", "new_code": "import org.eclipse.gmf.runtime.notation.TitleStyle;\nimport org.ros.model.ros.diagram.edit.parts.NodeParametersEditPart;\nimport org.ros.model.ros.diagram.edit.parts.ParameterEditPart;\nimport org.ros.model.ros.diagram.edit.parts.ServiceClientEditPart;\nimport org.ros.model.ros.diagram.edit.parts.ServiceClientNameEditPart;\nimport org.ros.model.ros.diagram.edit.parts.ServiceEditPart;\nimport org.ros.model.ros.diagram.edit.parts.ServiceNameEditPart;\nimport org.ros.model.ros.diagram.edit.parts.ServiceServerEditPart;\nimport org.ros.model.ros.diagram.edit.parts.ServiceServerNameEditPart;\n\t\t\t\tcase TopicEditPart.VISUAL_ID:\n\t\t\t\tcase ServiceEditPart.VISUAL_ID:\n\t\t\t\tcase ParameterEditPart.VISUAL_ID:\n\t\treturn NodeEditPart.VISUAL_ID == visualID\n\t\t\t\t|| TopicEditPart.VISUAL_ID == visualID\n\t\t\t\t|| ServiceEditPart.VISUAL_ID == visualID\n\t\t\t\t|| ParameterEditPart.VISUAL_ID == visualID;\n\t\tcase NodeEditPart.VISUAL_ID:\n\t\t\treturn createNode_2001(domainElement, containerView, index,\n\t\t\t\t\tpersisted, preferencesHint);\n\t\t\treturn createTopic_2002(domainElement, containerView, index,\n\t\tcase ServiceEditPart.VISUAL_ID:\n\t\t\treturn createService_2003(domainElement, containerView, index,\n\t\t\t\t\tpersisted, preferencesHint);\n\t\tcase ParameterEditPart.VISUAL_ID:\n\t\t\treturn createParameter_3001(domainElement, containerView, index,\n\t\tcase ServiceClientEditPart.VISUAL_ID:\n\t\t\treturn createServiceClient_4001(\n\t\t\t\t\tgetSemanticElement(semanticAdapter), containerView, index,\n\t\t\t\t\tpersisted, preferencesHint);\n\t\t\treturn createSubscriber_4002(getSemanticElement(semanticAdapter),\n\t\tcase ServiceServerEditPart.VISUAL_ID:\n\t\t\treturn createServiceServer_4003(\n\t\t\t\t\tgetSemanticElement(semanticAdapter), containerView, index,\n\t\t\t\t\tpersisted, preferencesHint);\n\t\t\treturn createPublisher_4004(getSemanticElement(semanticAdapter),\n\tpublic Node createNode_2001(EObject domainElement, View containerView,\n\t\tnode.setType(RosVisualIDRegistry.getType(NodeEditPart.VISUAL_ID));\n\t\t\t\tRosVisualIDRegistry.getType(NodeNameEditPart.VISUAL_ID));\n\t\tcreateCompartment(node,\n\t\t\t\tRosVisualIDRegistry.getType(NodeParametersEditPart.VISUAL_ID),\n\t\t\t\tfalse, true, true, true);\n\tpublic Node createTopic_2002(EObject domainElement, View containerView,\n\t\tnode.setType(RosVisualIDRegistry.getType(TopicEditPart.VISUAL_ID));\n\t\t\t\tRosVisualIDRegistry.getType(TopicNameEditPart.VISUAL_ID));\n\tpublic Node createService_2003(EObject domainElement, View containerView,\n\t\t\tint index, boolean persisted, PreferencesHint preferencesHint) {\n\t\tShape node = NotationFactory.eINSTANCE.createShape();\n\t\tnode.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());\n\t\tnode.setType(RosVisualIDRegistry.getType(ServiceEditPart.VISUAL_ID));\n\t\tViewUtil.insertChildView(containerView, node, index, persisted);\n\t\tnode.setElement(domainElement);\n\t\tstampShortcut(containerView, node);\n\t\t// initializeFromPreferences \n\t\tfinal IPreferenceStore prefStore = (IPreferenceStore) preferencesHint\n\t\t\t\t.getPreferenceStore();\n\n\t\torg.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter.getColor(\n\t\t\t\tprefStore, IPreferenceConstants.PREF_LINE_COLOR);\n\t\tViewUtil.setStructuralFeatureValue(node,\n\t\t\t\tNotationPackage.eINSTANCE.getLineStyle_LineColor(),\n\t\t\t\tFigureUtilities.RGBToInteger(lineRGB));\n\t\tFontStyle nodeFontStyle = (FontStyle) node\n\t\t\t\t.getStyle(NotationPackage.Literals.FONT_STYLE);\n\t\tif (nodeFontStyle != null) {\n\t\t\tFontData fontData = PreferenceConverter.getFontData(prefStore,\n\t\t\t\t\tIPreferenceConstants.PREF_DEFAULT_FONT);\n\t\t\tnodeFontStyle.setFontName(fontData.getName());\n\t\t\tnodeFontStyle.setFontHeight(fontData.getHeight());\n\t\t\tnodeFontStyle.setBold((fontData.getStyle() & SWT.BOLD) != 0);\n\t\t\tnodeFontStyle.setItalic((fontData.getStyle() & SWT.ITALIC) != 0);\n\t\t\torg.eclipse.swt.graphics.RGB fontRGB = PreferenceConverter\n\t\t\t\t\t.getColor(prefStore, IPreferenceConstants.PREF_FONT_COLOR);\n\t\t\tnodeFontStyle.setFontColor(FigureUtilities.RGBToInteger(fontRGB)\n\t\t\t\t\t.intValue());\n\t\t}\n\t\torg.eclipse.swt.graphics.RGB fillRGB = PreferenceConverter.getColor(\n\t\t\t\tprefStore, IPreferenceConstants.PREF_FILL_COLOR);\n\t\tViewUtil.setStructuralFeatureValue(node,\n\t\t\t\tNotationPackage.eINSTANCE.getFillStyle_FillColor(),\n\t\t\t\tFigureUtilities.RGBToInteger(fillRGB));\n\t\tNode label5003 = createLabel(node,\n\t\t\t\tRosVisualIDRegistry.getType(ServiceNameEditPart.VISUAL_ID));\n\t\treturn node;\n\t}\n\n\t/**\n\t * @generated\n\t */\n\tpublic Node createParameter_3001(EObject domainElement, View containerView,\n\t\t\tint index, boolean persisted, PreferencesHint preferencesHint) {\n\t\tNode node = NotationFactory.eINSTANCE.createNode();\n\t\tnode.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());\n\t\tnode.setType(RosVisualIDRegistry.getType(ParameterEditPart.VISUAL_ID));\n\t\tViewUtil.insertChildView(containerView, node, index, persisted);\n\t\tnode.setElement(domainElement);\n\t\treturn node;\n\t}\n\n\t/**\n\t * @generated\n\t */\n\tpublic Edge createServiceClient_4001(EObject domainElement,\n\t\tedge.setType(RosVisualIDRegistry\n\t\t\t\t.getType(ServiceClientEditPart.VISUAL_ID));\n\t\t\t\tRosVisualIDRegistry\n\t\t\t\t\t\t.getType(ServiceClientNameEditPart.VISUAL_ID));\n\tpublic Edge createSubscriber_4002(EObject domainElement,\n\t\t\tView containerView, int index, boolean persisted,\n\t\t\tPreferencesHint preferencesHint) {\n\t\tedge.setType(RosVisualIDRegistry.getType(SubscriberEditPart.VISUAL_ID));\n\t\t\t\tRosVisualIDRegistry.getType(SubscriberNameEditPart.VISUAL_ID));\n\t/**\n\t * @generated\n\t */\n\tpublic Edge createServiceServer_4003(EObject domainElement,\n\t\t\tView containerView, int index, boolean persisted,\n\t\t\tPreferencesHint preferencesHint) {\n\t\tConnector edge = NotationFactory.eINSTANCE.createConnector();\n\t\tedge.getStyles().add(NotationFactory.eINSTANCE.createFontStyle());\n\t\tRelativeBendpoints bendpoints = NotationFactory.eINSTANCE\n\t\t\t\t.createRelativeBendpoints();\n\t\tArrayList<RelativeBendpoint> points = new ArrayList<RelativeBendpoint>(\n\t\t\t\t2);\n\t\tpoints.add(new RelativeBendpoint());\n\t\tpoints.add(new RelativeBendpoint());\n\t\tbendpoints.setPoints(points);\n\t\tedge.setBendpoints(bendpoints);\n\t\tViewUtil.insertChildView(containerView, edge, index, persisted);\n\t\tedge.setType(RosVisualIDRegistry\n\t\t\t\t.getType(ServiceServerEditPart.VISUAL_ID));\n\t\tedge.setElement(domainElement);\n\t\t// initializePreferences\n\t\tfinal IPreferenceStore prefStore = (IPreferenceStore) preferencesHint\n\t\t\t\t.getPreferenceStore();\n\n\t\torg.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter.getColor(\n\t\t\t\tprefStore, IPreferenceConstants.PREF_LINE_COLOR);\n\t\tViewUtil.setStructuralFeatureValue(edge,\n\t\t\t\tNotationPackage.eINSTANCE.getLineStyle_LineColor(),\n\t\t\t\tFigureUtilities.RGBToInteger(lineRGB));\n\t\tFontStyle edgeFontStyle = (FontStyle) edge\n\t\t\t\t.getStyle(NotationPackage.Literals.FONT_STYLE);\n\t\tif (edgeFontStyle != null) {\n\t\t\tFontData fontData = PreferenceConverter.getFontData(prefStore,\n\t\t\t\t\tIPreferenceConstants.PREF_DEFAULT_FONT);\n\t\t\tedgeFontStyle.setFontName(fontData.getName());\n\t\t\tedgeFontStyle.setFontHeight(fontData.getHeight());\n\t\t\tedgeFontStyle.setBold((fontData.getStyle() & SWT.BOLD) != 0);\n\t\t\tedgeFontStyle.setItalic((fontData.getStyle() & SWT.ITALIC) != 0);\n\t\t\torg.eclipse.swt.graphics.RGB fontRGB = PreferenceConverter\n\t\t\t\t\t.getColor(prefStore, IPreferenceConstants.PREF_FONT_COLOR);\n\t\t\tedgeFontStyle.setFontColor(FigureUtilities.RGBToInteger(fontRGB)\n\t\t\t\t\t.intValue());\n\t\t}\n\t\tRouting routing = Routing.get(prefStore\n\t\t\t\t.getInt(IPreferenceConstants.PREF_LINE_STYLE));\n\t\tif (routing != null) {\n\t\t\tViewUtil.setStructuralFeatureValue(edge,\n\t\t\t\t\tNotationPackage.eINSTANCE.getRoutingStyle_Routing(),\n\t\t\t\t\trouting);\n\t\t}\n\t\tNode label6003 = createLabel(edge,\n\t\t\t\tRosVisualIDRegistry\n\t\t\t\t\t\t.getType(ServiceServerNameEditPart.VISUAL_ID));\n\t\tlabel6003.setLayoutConstraint(NotationFactory.eINSTANCE\n\t\t\t\t.createLocation());\n\t\tLocation location6003 = (Location) label6003.getLayoutConstraint();\n\t\tlocation6003.setX(0);\n\t\tlocation6003.setY(40);\n\t\treturn edge;\n\t}\n\n\t/**\n\t * @generated\n\t */\n\tpublic Edge createPublisher_4004(EObject domainElement, View containerView,\n\t\t\tint index, boolean persisted, PreferencesHint preferencesHint) {\n\t\tConnector edge = NotationFactory.eINSTANCE.createConnector();\n\t\tedge.getStyles().add(NotationFactory.eINSTANCE.createFontStyle());\n\t\tRelativeBendpoints bendpoints = NotationFactory.eINSTANCE\n\t\t\t\t.createRelativeBendpoints();\n\t\tArrayList<RelativeBendpoint> points = new ArrayList<RelativeBendpoint>(\n\t\t\t\t2);\n\t\tpoints.add(new RelativeBendpoint());\n\t\tpoints.add(new RelativeBendpoint());\n\t\tbendpoints.setPoints(points);\n\t\tedge.setBendpoints(bendpoints);\n\t\tViewUtil.insertChildView(containerView, edge, index, persisted);\n\t\tedge.setType(RosVisualIDRegistry.getType(PublisherEditPart.VISUAL_ID));\n\t\tedge.setElement(domainElement);\n\t\t// initializePreferences\n\t\tfinal IPreferenceStore prefStore = (IPreferenceStore) preferencesHint\n\t\t\t\t.getPreferenceStore();\n\n\t\torg.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter.getColor(\n\t\t\t\tprefStore, IPreferenceConstants.PREF_LINE_COLOR);\n\t\tViewUtil.setStructuralFeatureValue(edge,\n\t\t\t\tNotationPackage.eINSTANCE.getLineStyle_LineColor(),\n\t\t\t\tFigureUtilities.RGBToInteger(lineRGB));\n\t\tFontStyle edgeFontStyle = (FontStyle) edge\n\t\t\t\t.getStyle(NotationPackage.Literals.FONT_STYLE);\n\t\tif (edgeFontStyle != null) {\n\t\t\tFontData fontData = PreferenceConverter.getFontData(prefStore,\n\t\t\t\t\tIPreferenceConstants.PREF_DEFAULT_FONT);\n\t\t\tedgeFontStyle.setFontName(fontData.getName());\n\t\t\tedgeFontStyle.setFontHeight(fontData.getHeight());\n\t\t\tedgeFontStyle.setBold((fontData.getStyle() & SWT.BOLD) != 0);\n\t\t\tedgeFontStyle.setItalic((fontData.getStyle() & SWT.ITALIC) != 0);\n\t\t\torg.eclipse.swt.graphics.RGB fontRGB = PreferenceConverter\n\t\t\t\t\t.getColor(prefStore, IPreferenceConstants.PREF_FONT_COLOR);\n\t\t\tedgeFontStyle.setFontColor(FigureUtilities.RGBToInteger(fontRGB)\n\t\t\t\t\t.intValue());\n\t\t}\n\t\tRouting routing = Routing.get(prefStore\n\t\t\t\t.getInt(IPreferenceConstants.PREF_LINE_STYLE));\n\t\tif (routing != null) {\n\t\t\tViewUtil.setStructuralFeatureValue(edge,\n\t\t\t\t\tNotationPackage.eINSTANCE.getRoutingStyle_Routing(),\n\t\t\t\t\trouting);\n\t\t}\n\t\tNode label6004 = createLabel(edge,\n\t\t\t\tRosVisualIDRegistry.getType(PublisherNameEditPart.VISUAL_ID));\n\t\tlabel6004.setLayoutConstraint(NotationFactory.eINSTANCE\n\t\t\t\t.createLocation());\n\t\tLocation location6004 = (Location) label6004.getLayoutConstraint();\n\t\tlocation6004.setX(0);\n\t\tlocation6004.setY(40);\n\t\treturn edge;\n\t}\n\n\t/**\n\t * @generated\n\t */\n\tprivate Node createCompartment(View owner, String hint,\n\t\t\tboolean canCollapse, boolean hasTitle, boolean canSort,\n\t\t\tboolean canFilter) {\n\t\t//SemanticListCompartment rv = NotationFactory.eINSTANCE.createSemanticListCompartment();\n\t\t//rv.setShowTitle(showTitle);\n\t\t//rv.setCollapsed(isCollapsed);\n\t\tNode rv;\n\t\tif (canCollapse) {\n\t\t\trv = NotationFactory.eINSTANCE.createBasicCompartment();\n\t\t} else {\n\t\t\trv = NotationFactory.eINSTANCE.createDecorationNode();\n\t\t}\n\t\tif (hasTitle) {\n\t\t\tTitleStyle ts = NotationFactory.eINSTANCE.createTitleStyle();\n\t\t\tts.setShowTitle(true);\n\t\t\trv.getStyles().add(ts);\n\t\t}\n\t\tif (canSort) {\n\t\t\trv.getStyles().add(NotationFactory.eINSTANCE.createSortingStyle());\n\t\t}\n\t\tif (canFilter) {\n\t\t\trv.getStyles()\n\t\t\t\t\t.add(NotationFactory.eINSTANCE.createFilteringStyle());\n\t\t}\n\t\trv.setType(hint);\n\t\tViewUtil.insertChildView(owner, rv, ViewUtil.APPEND, true);\n\t\treturn rv;\n\t}\n", "new_methods": [ { "arguments": [ "EObject domainElement", " View containerView", "\n\t\t\tint index", " boolean persisted", " PreferencesHint preferencesHint" ], "filename": "org.ros.model.ros.diagram/src/org/ros/model/ros/diagram/providers/RosViewProvider.java", "implementation": "Shape node = NotationFactory.eINSTANCE.createShape();\n\t\tnode.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());\n\t\tnode.setType(RosVisualIDRegistry.getType(ServiceEditPart.VISUAL_ID));\n\t\tViewUtil.insertChildView(containerView, node, index, persisted);\n\t\tnode.setElement(domainElement);\n\t\tstampShortcut(containerView, node);\n\t\t// initializeFromPreferences \n\t\tfinal IPreferenceStore prefStore = (IPreferenceStore) preferencesHint\n\t\t\t\t.getPreferenceStore();\n\n\t\torg.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter.getColor(\n\t\t\t\tprefStore, IPreferenceConstants.PREF_LINE_COLOR);\n\t\tViewUtil.setStructuralFeatureValue(node,\n\t\t\t\tNotationPackage.eINSTANCE.getLineStyle_LineColor(),\n\t\t\t\tFigureUtilities.RGBToInteger(lineRGB));\n\t\tFontStyle nodeFontStyle = (FontStyle) node\n\t\t\t\t.getStyle(NotationPackage.Literals.FONT_STYLE);\n\t\tif (nodeFontStyle != null) {\n\t\t\tFontData fontData = PreferenceConverter.getFontData(prefStore,\n\t\t\t\t\tIPreferenceConstants.PREF_DEFAULT_FONT);\n\t\t\tnodeFontStyle.setFontName(fontData.getName());\n\t\t\tnodeFontStyle.setFontHeight(fontData.getHeight());\n\t\t\tnodeFontStyle.setBold((fontData.getStyle() & SWT.BOLD) != 0);\n\t\t\tnodeFontStyle.setItalic((fontData.getStyle() & SWT.ITALIC) != 0);\n\t\t\torg.eclipse.swt.graphics.RGB fontRGB = PreferenceConverter\n\t\t\t\t\t.getColor(prefStore, IPreferenceConstants.PREF_FONT_COLOR);\n\t\t\tnodeFontStyle.setFontColor(FigureUtilities.RGBToInteger(fontRGB)\n\t\t\t\t\t.intValue());", "signature": "Node createService_2003(EObject domainElement, View containerView,\n\t\t\tint index, boolean persisted, PreferencesHint preferencesHint)" }, { "arguments": [ "EObject domainElement", " View containerView", "\n\t\t\tint index", " boolean persisted", " PreferencesHint preferencesHint" ], "filename": "org.ros.model.ros.diagram/src/org/ros/model/ros/diagram/providers/RosViewProvider.java", "implementation": "Node node = NotationFactory.eINSTANCE.createNode();\n\t\tnode.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());\n\t\tnode.setType(RosVisualIDRegistry.getType(ParameterEditPart.VISUAL_ID));\n\t\tViewUtil.insertChildView(containerView, node, index, persisted);\n\t\tnode.setElement(domainElement);\n\t\treturn node;", "signature": "Node createParameter_3001(EObject domainElement, View containerView,\n\t\t\tint index, boolean persisted, PreferencesHint preferencesHint)" }, { "arguments": [ "EObject domainElement", "\n\t\t\tView containerView", " int index", " boolean persisted", "\n\t\t\tPreferencesHint preferencesHint" ], "filename": "org.ros.model.ros.diagram/src/org/ros/model/ros/diagram/providers/RosViewProvider.java", "implementation": "edge.setType(RosVisualIDRegistry.getType(SubscriberEditPart.VISUAL_ID));\n\t\t\t\tRosVisualIDRegistry.getType(SubscriberNameEditPart.VISUAL_ID));\n\t/**\n\t * @generated\n\t */\n\tpublic Edge createServiceServer_4003(EObject domainElement,\n\t\t\tView containerView, int index, boolean persisted,\n\t\t\tPreferencesHint preferencesHint) {\n\t\tConnector edge = NotationFactory.eINSTANCE.createConnector();\n\t\tedge.getStyles().add(NotationFactory.eINSTANCE.createFontStyle());\n\t\tRelativeBendpoints bendpoints = NotationFactory.eINSTANCE\n\t\t\t\t.createRelativeBendpoints();\n\t\tArrayList<RelativeBendpoint> points = new ArrayList<RelativeBendpoint>(\n\t\t\t\t2);\n\t\tpoints.add(new RelativeBendpoint());\n\t\tpoints.add(new RelativeBendpoint());\n\t\tbendpoints.setPoints(points);\n\t\tedge.setBendpoints(bendpoints);\n\t\tViewUtil.insertChildView(containerView, edge, index, persisted);\n\t\tedge.setType(RosVisualIDRegistry\n\t\t\t\t.getType(ServiceServerEditPart.VISUAL_ID));\n\t\tedge.setElement(domainElement);\n\t\t// initializePreferences\n\t\tfinal IPreferenceStore prefStore = (IPreferenceStore) preferencesHint\n\t\t\t\t.getPreferenceStore();\n\n\t\torg.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter.getColor(\n\t\t\t\tprefStore, IPreferenceConstants.PREF_LINE_COLOR);\n\t\tViewUtil.setStructuralFeatureValue(edge,\n\t\t\t\tNotationPackage.eINSTANCE.getLineStyle_LineColor(),\n\t\t\t\tFigureUtilities.RGBToInteger(lineRGB));\n\t\tFontStyle edgeFontStyle = (FontStyle) edge\n\t\t\t\t.getStyle(NotationPackage.Literals.FONT_STYLE);\n\t\tif (edgeFontStyle != null) {\n\t\t\tFontData fontData = PreferenceConverter.getFontData(prefStore,\n\t\t\t\t\tIPreferenceConstants.PREF_DEFAULT_FONT);\n\t\t\tedgeFontStyle.setFontName(fontData.getName());\n\t\t\tedgeFontStyle.setFontHeight(fontData.getHeight());\n\t\t\tedgeFontStyle.setBold((fontData.getStyle() & SWT.BOLD) != 0);\n\t\t\tedgeFontStyle.setItalic((fontData.getStyle() & SWT.ITALIC) != 0);\n\t\t\torg.eclipse.swt.graphics.RGB fontRGB = PreferenceConverter\n\t\t\t\t\t.getColor(prefStore, IPreferenceConstants.PREF_FONT_COLOR);\n\t\t\tedgeFontStyle.setFontColor(FigureUtilities.RGBToInteger(fontRGB)\n\t\t\t\t\t.intValue());", "signature": "Edge createSubscriber_4002(EObject domainElement,\n\t\t\tView containerView, int index, boolean persisted,\n\t\t\tPreferencesHint preferencesHint)" }, { "arguments": [ "EObject domainElement", " View containerView", "\n\t\t\tint index", " boolean persisted", " PreferencesHint preferencesHint" ], "filename": "org.ros.model.ros.diagram/src/org/ros/model/ros/diagram/providers/RosViewProvider.java", "implementation": "Connector edge = NotationFactory.eINSTANCE.createConnector();\n\t\tedge.getStyles().add(NotationFactory.eINSTANCE.createFontStyle());\n\t\tRelativeBendpoints bendpoints = NotationFactory.eINSTANCE\n\t\t\t\t.createRelativeBendpoints();\n\t\tArrayList<RelativeBendpoint> points = new ArrayList<RelativeBendpoint>(\n\t\t\t\t2);\n\t\tpoints.add(new RelativeBendpoint());\n\t\tpoints.add(new RelativeBendpoint());\n\t\tbendpoints.setPoints(points);\n\t\tedge.setBendpoints(bendpoints);\n\t\tViewUtil.insertChildView(containerView, edge, index, persisted);\n\t\tedge.setType(RosVisualIDRegistry.getType(PublisherEditPart.VISUAL_ID));\n\t\tedge.setElement(domainElement);\n\t\t// initializePreferences\n\t\tfinal IPreferenceStore prefStore = (IPreferenceStore) preferencesHint\n\t\t\t\t.getPreferenceStore();\n\n\t\torg.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter.getColor(\n\t\t\t\tprefStore, IPreferenceConstants.PREF_LINE_COLOR);\n\t\tViewUtil.setStructuralFeatureValue(edge,\n\t\t\t\tNotationPackage.eINSTANCE.getLineStyle_LineColor(),\n\t\t\t\tFigureUtilities.RGBToInteger(lineRGB));\n\t\tFontStyle edgeFontStyle = (FontStyle) edge\n\t\t\t\t.getStyle(NotationPackage.Literals.FONT_STYLE);\n\t\tif (edgeFontStyle != null) {\n\t\t\tFontData fontData = PreferenceConverter.getFontData(prefStore,\n\t\t\t\t\tIPreferenceConstants.PREF_DEFAULT_FONT);\n\t\t\tedgeFontStyle.setFontName(fontData.getName());\n\t\t\tedgeFontStyle.setFontHeight(fontData.getHeight());\n\t\t\tedgeFontStyle.setBold((fontData.getStyle() & SWT.BOLD) != 0);\n\t\t\tedgeFontStyle.setItalic((fontData.getStyle() & SWT.ITALIC) != 0);\n\t\t\torg.eclipse.swt.graphics.RGB fontRGB = PreferenceConverter\n\t\t\t\t\t.getColor(prefStore, IPreferenceConstants.PREF_FONT_COLOR);\n\t\t\tedgeFontStyle.setFontColor(FigureUtilities.RGBToInteger(fontRGB)\n\t\t\t\t\t.intValue());", "signature": "Edge createPublisher_4004(EObject domainElement, View containerView,\n\t\t\tint index, boolean persisted, PreferencesHint preferencesHint)" }, { "arguments": [ "View owner", " String hint", "\n\t\t\tboolean canCollapse", " boolean hasTitle", " boolean canSort", "\n\t\t\tboolean canFilter" ], "filename": "org.ros.model.ros.diagram/src/org/ros/model/ros/diagram/providers/RosViewProvider.java", "implementation": "//SemanticListCompartment rv = NotationFactory.eINSTANCE.createSemanticListCompartment();\n\t\t//rv.setShowTitle(showTitle);\n\t\t//rv.setCollapsed(isCollapsed);\n\t\tNode rv;\n\t\tif (canCollapse) {\n\t\t\trv = NotationFactory.eINSTANCE.createBasicCompartment();", "signature": "Node createCompartment(View owner, String hint,\n\t\t\tboolean canCollapse, boolean hasTitle, boolean canSort,\n\t\t\tboolean canFilter)" } ], "old_code": "\t\t\t\tcase TopicEditPart.VISUAL_ID:\n\t\treturn TopicEditPart.VISUAL_ID == visualID\n\t\t\t\t|| NodeEditPart.VISUAL_ID == visualID;\n\t\t\treturn createTopic_2001(domainElement, containerView, index,\n\t\tcase NodeEditPart.VISUAL_ID:\n\t\t\treturn createNode_2002(domainElement, containerView, index,\n\t\t\treturn createSubscriber_4001(getSemanticElement(semanticAdapter),\n\t\t\treturn createPublisher_4002(getSemanticElement(semanticAdapter),\n\tpublic Node createTopic_2001(EObject domainElement, View containerView,\n\t\tnode.setType(RosVisualIDRegistry.getType(TopicEditPart.VISUAL_ID));\n\t\t\t\tRosVisualIDRegistry.getType(TopicNameEditPart.VISUAL_ID));\n\tpublic Node createNode_2002(EObject domainElement, View containerView,\n\t\tnode.setType(RosVisualIDRegistry.getType(NodeEditPart.VISUAL_ID));\n\t\t\t\tRosVisualIDRegistry.getType(NodeNameEditPart.VISUAL_ID));\n\tpublic Edge createSubscriber_4001(EObject domainElement,\n\t\tedge.setType(RosVisualIDRegistry.getType(SubscriberEditPart.VISUAL_ID));\n\t\t\t\tRosVisualIDRegistry.getType(SubscriberNameEditPart.VISUAL_ID));\n\tpublic Edge createPublisher_4002(EObject domainElement, View containerView,\n\t\t\tint index, boolean persisted, PreferencesHint preferencesHint) {\n\t\tedge.setType(RosVisualIDRegistry.getType(PublisherEditPart.VISUAL_ID));\n\t\t\t\tRosVisualIDRegistry.getType(PublisherNameEditPart.VISUAL_ID));", "old_methods": [], "patch": "@@ -35,6 +35,7 @@\n import org.eclipse.gmf.runtime.notation.RelativeBendpoints;\n import org.eclipse.gmf.runtime.notation.Routing;\n import org.eclipse.gmf.runtime.notation.Shape;\n+import org.eclipse.gmf.runtime.notation.TitleStyle;\n import org.eclipse.gmf.runtime.notation.View;\n import org.eclipse.gmf.runtime.notation.datatype.RelativeBendpoint;\n import org.eclipse.jface.preference.IPreferenceStore;\n@@ -43,9 +44,17 @@\n import org.eclipse.swt.graphics.FontData;\n import org.ros.model.ros.diagram.edit.parts.NodeEditPart;\n import org.ros.model.ros.diagram.edit.parts.NodeNameEditPart;\n+import org.ros.model.ros.diagram.edit.parts.NodeParametersEditPart;\n import org.ros.model.ros.diagram.edit.parts.PackageEditPart;\n+import org.ros.model.ros.diagram.edit.parts.ParameterEditPart;\n import org.ros.model.ros.diagram.edit.parts.PublisherEditPart;\n import org.ros.model.ros.diagram.edit.parts.PublisherNameEditPart;\n+import org.ros.model.ros.diagram.edit.parts.ServiceClientEditPart;\n+import org.ros.model.ros.diagram.edit.parts.ServiceClientNameEditPart;\n+import org.ros.model.ros.diagram.edit.parts.ServiceEditPart;\n+import org.ros.model.ros.diagram.edit.parts.ServiceNameEditPart;\n+import org.ros.model.ros.diagram.edit.parts.ServiceServerEditPart;\n+import org.ros.model.ros.diagram.edit.parts.ServiceServerNameEditPart;\n import org.ros.model.ros.diagram.edit.parts.SubscriberEditPart;\n import org.ros.model.ros.diagram.edit.parts.SubscriberNameEditPart;\n import org.ros.model.ros.diagram.edit.parts.TopicEditPart;\n@@ -140,8 +149,10 @@ protected boolean provides(CreateNodeViewOperation op) {\n \t\t\t\t\treturn false; // foreign diagram\n \t\t\t\t}\n \t\t\t\tswitch (visualID) {\n-\t\t\t\tcase TopicEditPart.VISUAL_ID:\n \t\t\t\tcase NodeEditPart.VISUAL_ID:\n+\t\t\t\tcase TopicEditPart.VISUAL_ID:\n+\t\t\t\tcase ServiceEditPart.VISUAL_ID:\n+\t\t\t\tcase ParameterEditPart.VISUAL_ID:\n \t\t\t\t\tif (domainElement == null\n \t\t\t\t\t\t\t|| visualID != RosVisualIDRegistry.getNodeVisualID(\n \t\t\t\t\t\t\t\t\top.getContainerView(), domainElement)) {\n@@ -153,8 +164,10 @@ protected boolean provides(CreateNodeViewOperation op) {\n \t\t\t\t}\n \t\t\t}\n \t\t}\n-\t\treturn TopicEditPart.VISUAL_ID == visualID\n-\t\t\t\t|| NodeEditPart.VISUAL_ID == visualID;\n+\t\treturn NodeEditPart.VISUAL_ID == visualID\n+\t\t\t\t|| TopicEditPart.VISUAL_ID == visualID\n+\t\t\t\t|| ServiceEditPart.VISUAL_ID == visualID\n+\t\t\t\t|| ParameterEditPart.VISUAL_ID == visualID;\n \t}\n \n \t/**\n@@ -211,11 +224,17 @@ public Node createNode(IAdaptable semanticAdapter, View containerView,\n \t\t\tvisualID = RosVisualIDRegistry.getVisualID(semanticHint);\n \t\t}\n \t\tswitch (visualID) {\n+\t\tcase NodeEditPart.VISUAL_ID:\n+\t\t\treturn createNode_2001(domainElement, containerView, index,\n+\t\t\t\t\tpersisted, preferencesHint);\n \t\tcase TopicEditPart.VISUAL_ID:\n-\t\t\treturn createTopic_2001(domainElement, containerView, index,\n+\t\t\treturn createTopic_2002(domainElement, containerView, index,\n \t\t\t\t\tpersisted, preferencesHint);\n-\t\tcase NodeEditPart.VISUAL_ID:\n-\t\t\treturn createNode_2002(domainElement, containerView, index,\n+\t\tcase ServiceEditPart.VISUAL_ID:\n+\t\t\treturn createService_2003(domainElement, containerView, index,\n+\t\t\t\t\tpersisted, preferencesHint);\n+\t\tcase ParameterEditPart.VISUAL_ID:\n+\t\t\treturn createParameter_3001(domainElement, containerView, index,\n \t\t\t\t\tpersisted, preferencesHint);\n \t\t}\n \t\t// can't happen, provided #provides(CreateNodeViewOperation) is correct\n@@ -231,11 +250,19 @@ public Edge createEdge(IAdaptable semanticAdapter, View containerView,\n \t\tIElementType elementType = getSemanticElementType(semanticAdapter);\n \t\tString elementTypeHint = ((IHintedType) elementType).getSemanticHint();\n \t\tswitch (RosVisualIDRegistry.getVisualID(elementTypeHint)) {\n+\t\tcase ServiceClientEditPart.VISUAL_ID:\n+\t\t\treturn createServiceClient_4001(\n+\t\t\t\t\tgetSemanticElement(semanticAdapter), containerView, index,\n+\t\t\t\t\tpersisted, preferencesHint);\n \t\tcase SubscriberEditPart.VISUAL_ID:\n-\t\t\treturn createSubscriber_4001(getSemanticElement(semanticAdapter),\n+\t\t\treturn createSubscriber_4002(getSemanticElement(semanticAdapter),\n \t\t\t\t\tcontainerView, index, persisted, preferencesHint);\n+\t\tcase ServiceServerEditPart.VISUAL_ID:\n+\t\t\treturn createServiceServer_4003(\n+\t\t\t\t\tgetSemanticElement(semanticAdapter), containerView, index,\n+\t\t\t\t\tpersisted, preferencesHint);\n \t\tcase PublisherEditPart.VISUAL_ID:\n-\t\t\treturn createPublisher_4002(getSemanticElement(semanticAdapter),\n+\t\t\treturn createPublisher_4004(getSemanticElement(semanticAdapter),\n \t\t\t\t\tcontainerView, index, persisted, preferencesHint);\n \t\t}\n \t\t// can never happen, provided #provides(CreateEdgeViewOperation) is correct\n@@ -245,11 +272,11 @@ public Edge createEdge(IAdaptable semanticAdapter, View containerView,\n \t/**\n \t * @generated\n \t */\n-\tpublic Node createTopic_2001(EObject domainElement, View containerView,\n+\tpublic Node createNode_2001(EObject domainElement, View containerView,\n \t\t\tint index, boolean persisted, PreferencesHint preferencesHint) {\n \t\tShape node = NotationFactory.eINSTANCE.createShape();\n \t\tnode.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());\n-\t\tnode.setType(RosVisualIDRegistry.getType(TopicEditPart.VISUAL_ID));\n+\t\tnode.setType(RosVisualIDRegistry.getType(NodeEditPart.VISUAL_ID));\n \t\tViewUtil.insertChildView(containerView, node, index, persisted);\n \t\tnode.setElement(domainElement);\n \t\tstampShortcut(containerView, node);\n@@ -282,18 +309,21 @@ public Node createTopic_2001(EObject domainElement, View containerView,\n \t\t\t\tNotationPackage.eINSTANCE.getFillStyle_FillColor(),\n \t\t\t\tFigureUtilities.RGBToInteger(fillRGB));\n \t\tNode label5001 = createLabel(node,\n-\t\t\t\tRosVisualIDRegistry.getType(TopicNameEditPart.VISUAL_ID));\n+\t\t\t\tRosVisualIDRegistry.getType(NodeNameEditPart.VISUAL_ID));\n+\t\tcreateCompartment(node,\n+\t\t\t\tRosVisualIDRegistry.getType(NodeParametersEditPart.VISUAL_ID),\n+\t\t\t\tfalse, true, true, true);\n \t\treturn node;\n \t}\n \n \t/**\n \t * @generated\n \t */\n-\tpublic Node createNode_2002(EObject domainElement, View containerView,\n+\tpublic Node createTopic_2002(EObject domainElement, View containerView,\n \t\t\tint index, boolean persisted, PreferencesHint preferencesHint) {\n \t\tShape node = NotationFactory.eINSTANCE.createShape();\n \t\tnode.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());\n-\t\tnode.setType(RosVisualIDRegistry.getType(NodeEditPart.VISUAL_ID));\n+\t\tnode.setType(RosVisualIDRegistry.getType(TopicEditPart.VISUAL_ID));\n \t\tViewUtil.insertChildView(containerView, node, index, persisted);\n \t\tnode.setElement(domainElement);\n \t\tstampShortcut(containerView, node);\n@@ -326,14 +356,71 @@ public Node createNode_2002(EObject domainElement, View containerView,\n \t\t\t\tNotationPackage.eINSTANCE.getFillStyle_FillColor(),\n \t\t\t\tFigureUtilities.RGBToInteger(fillRGB));\n \t\tNode label5002 = createLabel(node,\n-\t\t\t\tRosVisualIDRegistry.getType(NodeNameEditPart.VISUAL_ID));\n+\t\t\t\tRosVisualIDRegistry.getType(TopicNameEditPart.VISUAL_ID));\n \t\treturn node;\n \t}\n \n \t/**\n \t * @generated\n \t */\n-\tpublic Edge createSubscriber_4001(EObject domainElement,\n+\tpublic Node createService_2003(EObject domainElement, View containerView,\n+\t\t\tint index, boolean persisted, PreferencesHint preferencesHint) {\n+\t\tShape node = NotationFactory.eINSTANCE.createShape();\n+\t\tnode.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());\n+\t\tnode.setType(RosVisualIDRegistry.getType(ServiceEditPart.VISUAL_ID));\n+\t\tViewUtil.insertChildView(containerView, node, index, persisted);\n+\t\tnode.setElement(domainElement);\n+\t\tstampShortcut(containerView, node);\n+\t\t// initializeFromPreferences \n+\t\tfinal IPreferenceStore prefStore = (IPreferenceStore) preferencesHint\n+\t\t\t\t.getPreferenceStore();\n+\n+\t\torg.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter.getColor(\n+\t\t\t\tprefStore, IPreferenceConstants.PREF_LINE_COLOR);\n+\t\tViewUtil.setStructuralFeatureValue(node,\n+\t\t\t\tNotationPackage.eINSTANCE.getLineStyle_LineColor(),\n+\t\t\t\tFigureUtilities.RGBToInteger(lineRGB));\n+\t\tFontStyle nodeFontStyle = (FontStyle) node\n+\t\t\t\t.getStyle(NotationPackage.Literals.FONT_STYLE);\n+\t\tif (nodeFontStyle != null) {\n+\t\t\tFontData fontData = PreferenceConverter.getFontData(prefStore,\n+\t\t\t\t\tIPreferenceConstants.PREF_DEFAULT_FONT);\n+\t\t\tnodeFontStyle.setFontName(fontData.getName());\n+\t\t\tnodeFontStyle.setFontHeight(fontData.getHeight());\n+\t\t\tnodeFontStyle.setBold((fontData.getStyle() & SWT.BOLD) != 0);\n+\t\t\tnodeFontStyle.setItalic((fontData.getStyle() & SWT.ITALIC) != 0);\n+\t\t\torg.eclipse.swt.graphics.RGB fontRGB = PreferenceConverter\n+\t\t\t\t\t.getColor(prefStore, IPreferenceConstants.PREF_FONT_COLOR);\n+\t\t\tnodeFontStyle.setFontColor(FigureUtilities.RGBToInteger(fontRGB)\n+\t\t\t\t\t.intValue());\n+\t\t}\n+\t\torg.eclipse.swt.graphics.RGB fillRGB = PreferenceConverter.getColor(\n+\t\t\t\tprefStore, IPreferenceConstants.PREF_FILL_COLOR);\n+\t\tViewUtil.setStructuralFeatureValue(node,\n+\t\t\t\tNotationPackage.eINSTANCE.getFillStyle_FillColor(),\n+\t\t\t\tFigureUtilities.RGBToInteger(fillRGB));\n+\t\tNode label5003 = createLabel(node,\n+\t\t\t\tRosVisualIDRegistry.getType(ServiceNameEditPart.VISUAL_ID));\n+\t\treturn node;\n+\t}\n+\n+\t/**\n+\t * @generated\n+\t */\n+\tpublic Node createParameter_3001(EObject domainElement, View containerView,\n+\t\t\tint index, boolean persisted, PreferencesHint preferencesHint) {\n+\t\tNode node = NotationFactory.eINSTANCE.createNode();\n+\t\tnode.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());\n+\t\tnode.setType(RosVisualIDRegistry.getType(ParameterEditPart.VISUAL_ID));\n+\t\tViewUtil.insertChildView(containerView, node, index, persisted);\n+\t\tnode.setElement(domainElement);\n+\t\treturn node;\n+\t}\n+\n+\t/**\n+\t * @generated\n+\t */\n+\tpublic Edge createServiceClient_4001(EObject domainElement,\n \t\t\tView containerView, int index, boolean persisted,\n \t\t\tPreferencesHint preferencesHint) {\n \t\tConnector edge = NotationFactory.eINSTANCE.createConnector();\n@@ -347,7 +434,8 @@ public Edge createSubscriber_4001(EObject domainElement,\n \t\tbendpoints.setPoints(points);\n \t\tedge.setBendpoints(bendpoints);\n \t\tViewUtil.insertChildView(containerView, edge, index, persisted);\n-\t\tedge.setType(RosVisualIDRegistry.getType(SubscriberEditPart.VISUAL_ID));\n+\t\tedge.setType(RosVisualIDRegistry\n+\t\t\t\t.getType(ServiceClientEditPart.VISUAL_ID));\n \t\tedge.setElement(domainElement);\n \t\t// initializePreferences\n \t\tfinal IPreferenceStore prefStore = (IPreferenceStore) preferencesHint\n@@ -380,7 +468,8 @@ public Edge createSubscriber_4001(EObject domainElement,\n \t\t\t\t\trouting);\n \t\t}\n \t\tNode label6001 = createLabel(edge,\n-\t\t\t\tRosVisualIDRegistry.getType(SubscriberNameEditPart.VISUAL_ID));\n+\t\t\t\tRosVisualIDRegistry\n+\t\t\t\t\t\t.getType(ServiceClientNameEditPart.VISUAL_ID));\n \t\tlabel6001.setLayoutConstraint(NotationFactory.eINSTANCE\n \t\t\t\t.createLocation());\n \t\tLocation location6001 = (Location) label6001.getLayoutConstraint();\n@@ -392,8 +481,9 @@ public Edge createSubscriber_4001(EObject domainElement,\n \t/**\n \t * @generated\n \t */\n-\tpublic Edge createPublisher_4002(EObject domainElement, View containerView,\n-\t\t\tint index, boolean persisted, PreferencesHint preferencesHint) {\n+\tpublic Edge createSubscriber_4002(EObject domainElement,\n+\t\t\tView containerView, int index, boolean persisted,\n+\t\t\tPreferencesHint preferencesHint) {\n \t\tConnector edge = NotationFactory.eINSTANCE.createConnector();\n \t\tedge.getStyles().add(NotationFactory.eINSTANCE.createFontStyle());\n \t\tRelativeBendpoints bendpoints = NotationFactory.eINSTANCE\n@@ -405,7 +495,7 @@ public Edge createPublisher_4002(EObject domainElement, View containerView,\n \t\tbendpoints.setPoints(points);\n \t\tedge.setBendpoints(bendpoints);\n \t\tViewUtil.insertChildView(containerView, edge, index, persisted);\n-\t\tedge.setType(RosVisualIDRegistry.getType(PublisherEditPart.VISUAL_ID));\n+\t\tedge.setType(RosVisualIDRegistry.getType(SubscriberEditPart.VISUAL_ID));\n \t\tedge.setElement(domainElement);\n \t\t// initializePreferences\n \t\tfinal IPreferenceStore prefStore = (IPreferenceStore) preferencesHint\n@@ -438,7 +528,7 @@ public Edge createPublisher_4002(EObject domainElement, View containerView,\n \t\t\t\t\trouting);\n \t\t}\n \t\tNode label6002 = createLabel(edge,\n-\t\t\t\tRosVisualIDRegistry.getType(PublisherNameEditPart.VISUAL_ID));\n+\t\t\t\tRosVisualIDRegistry.getType(SubscriberNameEditPart.VISUAL_ID));\n \t\tlabel6002.setLayoutConstraint(NotationFactory.eINSTANCE\n \t\t\t\t.createLocation());\n \t\tLocation location6002 = (Location) label6002.getLayoutConstraint();\n@@ -447,6 +537,125 @@ public Edge createPublisher_4002(EObject domainElement, View containerView,\n \t\treturn edge;\n \t}\n \n+\t/**\n+\t * @generated\n+\t */\n+\tpublic Edge createServiceServer_4003(EObject domainElement,\n+\t\t\tView containerView, int index, boolean persisted,\n+\t\t\tPreferencesHint preferencesHint) {\n+\t\tConnector edge = NotationFactory.eINSTANCE.createConnector();\n+\t\tedge.getStyles().add(NotationFactory.eINSTANCE.createFontStyle());\n+\t\tRelativeBendpoints bendpoints = NotationFactory.eINSTANCE\n+\t\t\t\t.createRelativeBendpoints();\n+\t\tArrayList<RelativeBendpoint> points = new ArrayList<RelativeBendpoint>(\n+\t\t\t\t2);\n+\t\tpoints.add(new RelativeBendpoint());\n+\t\tpoints.add(new RelativeBendpoint());\n+\t\tbendpoints.setPoints(points);\n+\t\tedge.setBendpoints(bendpoints);\n+\t\tViewUtil.insertChildView(containerView, edge, index, persisted);\n+\t\tedge.setType(RosVisualIDRegistry\n+\t\t\t\t.getType(ServiceServerEditPart.VISUAL_ID));\n+\t\tedge.setElement(domainElement);\n+\t\t// initializePreferences\n+\t\tfinal IPreferenceStore prefStore = (IPreferenceStore) preferencesHint\n+\t\t\t\t.getPreferenceStore();\n+\n+\t\torg.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter.getColor(\n+\t\t\t\tprefStore, IPreferenceConstants.PREF_LINE_COLOR);\n+\t\tViewUtil.setStructuralFeatureValue(edge,\n+\t\t\t\tNotationPackage.eINSTANCE.getLineStyle_LineColor(),\n+\t\t\t\tFigureUtilities.RGBToInteger(lineRGB));\n+\t\tFontStyle edgeFontStyle = (FontStyle) edge\n+\t\t\t\t.getStyle(NotationPackage.Literals.FONT_STYLE);\n+\t\tif (edgeFontStyle != null) {\n+\t\t\tFontData fontData = PreferenceConverter.getFontData(prefStore,\n+\t\t\t\t\tIPreferenceConstants.PREF_DEFAULT_FONT);\n+\t\t\tedgeFontStyle.setFontName(fontData.getName());\n+\t\t\tedgeFontStyle.setFontHeight(fontData.getHeight());\n+\t\t\tedgeFontStyle.setBold((fontData.getStyle() & SWT.BOLD) != 0);\n+\t\t\tedgeFontStyle.setItalic((fontData.getStyle() & SWT.ITALIC) != 0);\n+\t\t\torg.eclipse.swt.graphics.RGB fontRGB = PreferenceConverter\n+\t\t\t\t\t.getColor(prefStore, IPreferenceConstants.PREF_FONT_COLOR);\n+\t\t\tedgeFontStyle.setFontColor(FigureUtilities.RGBToInteger(fontRGB)\n+\t\t\t\t\t.intValue());\n+\t\t}\n+\t\tRouting routing = Routing.get(prefStore\n+\t\t\t\t.getInt(IPreferenceConstants.PREF_LINE_STYLE));\n+\t\tif (routing != null) {\n+\t\t\tViewUtil.setStructuralFeatureValue(edge,\n+\t\t\t\t\tNotationPackage.eINSTANCE.getRoutingStyle_Routing(),\n+\t\t\t\t\trouting);\n+\t\t}\n+\t\tNode label6003 = createLabel(edge,\n+\t\t\t\tRosVisualIDRegistry\n+\t\t\t\t\t\t.getType(ServiceServerNameEditPart.VISUAL_ID));\n+\t\tlabel6003.setLayoutConstraint(NotationFactory.eINSTANCE\n+\t\t\t\t.createLocation());\n+\t\tLocation location6003 = (Location) label6003.getLayoutConstraint();\n+\t\tlocation6003.setX(0);\n+\t\tlocation6003.setY(40);\n+\t\treturn edge;\n+\t}\n+\n+\t/**\n+\t * @generated\n+\t */\n+\tpublic Edge createPublisher_4004(EObject domainElement, View containerView,\n+\t\t\tint index, boolean persisted, PreferencesHint preferencesHint) {\n+\t\tConnector edge = NotationFactory.eINSTANCE.createConnector();\n+\t\tedge.getStyles().add(NotationFactory.eINSTANCE.createFontStyle());\n+\t\tRelativeBendpoints bendpoints = NotationFactory.eINSTANCE\n+\t\t\t\t.createRelativeBendpoints();\n+\t\tArrayList<RelativeBendpoint> points = new ArrayList<RelativeBendpoint>(\n+\t\t\t\t2);\n+\t\tpoints.add(new RelativeBendpoint());\n+\t\tpoints.add(new RelativeBendpoint());\n+\t\tbendpoints.setPoints(points);\n+\t\tedge.setBendpoints(bendpoints);\n+\t\tViewUtil.insertChildView(containerView, edge, index, persisted);\n+\t\tedge.setType(RosVisualIDRegistry.getType(PublisherEditPart.VISUAL_ID));\n+\t\tedge.setElement(domainElement);\n+\t\t// initializePreferences\n+\t\tfinal IPreferenceStore prefStore = (IPreferenceStore) preferencesHint\n+\t\t\t\t.getPreferenceStore();\n+\n+\t\torg.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter.getColor(\n+\t\t\t\tprefStore, IPreferenceConstants.PREF_LINE_COLOR);\n+\t\tViewUtil.setStructuralFeatureValue(edge,\n+\t\t\t\tNotationPackage.eINSTANCE.getLineStyle_LineColor(),\n+\t\t\t\tFigureUtilities.RGBToInteger(lineRGB));\n+\t\tFontStyle edgeFontStyle = (FontStyle) edge\n+\t\t\t\t.getStyle(NotationPackage.Literals.FONT_STYLE);\n+\t\tif (edgeFontStyle != null) {\n+\t\t\tFontData fontData = PreferenceConverter.getFontData(prefStore,\n+\t\t\t\t\tIPreferenceConstants.PREF_DEFAULT_FONT);\n+\t\t\tedgeFontStyle.setFontName(fontData.getName());\n+\t\t\tedgeFontStyle.setFontHeight(fontData.getHeight());\n+\t\t\tedgeFontStyle.setBold((fontData.getStyle() & SWT.BOLD) != 0);\n+\t\t\tedgeFontStyle.setItalic((fontData.getStyle() & SWT.ITALIC) != 0);\n+\t\t\torg.eclipse.swt.graphics.RGB fontRGB = PreferenceConverter\n+\t\t\t\t\t.getColor(prefStore, IPreferenceConstants.PREF_FONT_COLOR);\n+\t\t\tedgeFontStyle.setFontColor(FigureUtilities.RGBToInteger(fontRGB)\n+\t\t\t\t\t.intValue());\n+\t\t}\n+\t\tRouting routing = Routing.get(prefStore\n+\t\t\t\t.getInt(IPreferenceConstants.PREF_LINE_STYLE));\n+\t\tif (routing != null) {\n+\t\t\tViewUtil.setStructuralFeatureValue(edge,\n+\t\t\t\t\tNotationPackage.eINSTANCE.getRoutingStyle_Routing(),\n+\t\t\t\t\trouting);\n+\t\t}\n+\t\tNode label6004 = createLabel(edge,\n+\t\t\t\tRosVisualIDRegistry.getType(PublisherNameEditPart.VISUAL_ID));\n+\t\tlabel6004.setLayoutConstraint(NotationFactory.eINSTANCE\n+\t\t\t\t.createLocation());\n+\t\tLocation location6004 = (Location) label6004.getLayoutConstraint();\n+\t\tlocation6004.setX(0);\n+\t\tlocation6004.setY(40);\n+\t\treturn edge;\n+\t}\n+\n \t/**\n \t * @generated\n \t */\n@@ -472,6 +681,38 @@ private Node createLabel(View owner, String hint) {\n \t\treturn rv;\n \t}\n \n+\t/**\n+\t * @generated\n+\t */\n+\tprivate Node createCompartment(View owner, String hint,\n+\t\t\tboolean canCollapse, boolean hasTitle, boolean canSort,\n+\t\t\tboolean canFilter) {\n+\t\t//SemanticListCompartment rv = NotationFactory.eINSTANCE.createSemanticListCompartment();\n+\t\t//rv.setShowTitle(showTitle);\n+\t\t//rv.setCollapsed(isCollapsed);\n+\t\tNode rv;\n+\t\tif (canCollapse) {\n+\t\t\trv = NotationFactory.eINSTANCE.createBasicCompartment();\n+\t\t} else {\n+\t\t\trv = NotationFactory.eINSTANCE.createDecorationNode();\n+\t\t}\n+\t\tif (hasTitle) {\n+\t\t\tTitleStyle ts = NotationFactory.eINSTANCE.createTitleStyle();\n+\t\t\tts.setShowTitle(true);\n+\t\t\trv.getStyles().add(ts);\n+\t\t}\n+\t\tif (canSort) {\n+\t\t\trv.getStyles().add(NotationFactory.eINSTANCE.createSortingStyle());\n+\t\t}\n+\t\tif (canFilter) {\n+\t\t\trv.getStyles()\n+\t\t\t\t\t.add(NotationFactory.eINSTANCE.createFilteringStyle());\n+\t\t}\n+\t\trv.setType(hint);\n+\t\tViewUtil.insertChildView(owner, rv, ViewUtil.APPEND, true);\n+\t\treturn rv;\n+\t}\n+\n \t/**\n \t * @generated\n \t */", "raw_url": "https://github.com/ipa320/bride/raw/01bc5c83c895357f23a345ecec85a3796cf66358/org.ros.model.ros.diagram%2Fsrc%2Forg%2Fros%2Fmodel%2Fros%2Fdiagram%2Fproviders%2FRosViewProvider.java", "sha": "9b9bef6de5d33036345bf83b2562e1df4b06b78e", "status": "modified" } ]
37
[ { "name": "ipa320$bride", "new_args": "", "new_implementation": "if (topicName_5002Parser == null) {\n\t\t\ttopicName_5002Parser = parser;\n\t\treturn topicName_5002Parser;\n\tprivate IParser serviceName_5003Parser;\n\tprivate IParser getServiceName_5003Parser() {\n\t\tif (serviceName_5003Parser == null) {\n\t\t\t\t\t.getService_Name()", "new_return_type": "IParser", "new_signature": "IParser getTopicName_5002Parser()", "old_args": "", "old_implementation": "if (topicName_5001Parser == null) {\n\t\t\ttopicName_5001Parser = parser;\n\t\treturn topicName_5001Parser;\n\tprivate IParser nodeName_5002Parser;\n\tprivate IParser getNodeName_5002Parser() {\n\t\tif (nodeName_5002Parser == null) {\n\t\t\t\t\t.getNode_Name()", "old_return_type": "IParser", "old_signature": "IParser getTopicName_5001Parser()" } ]
1
32
02668af08bebc5266b321ab1df2f45dfe656c813
[ { "name": "duracloud$duracloud", "new_args": "", "new_implementation": "return null != durabossHost && null != durabossPort &&\n null != durabossContext;", "new_return_type": "boolean", "new_signature": "boolean durabossEndpointLoad()", "old_args": "", "old_implementation": "return null != durareportHost && null != durareportPort &&\n null != durareportContext;", "old_return_type": "boolean", "old_signature": "boolean durareportEndpointLoad()" }, { "name": "duracloud$duracloud", "new_args": "", "new_implementation": null, "new_return_type": "String", "new_signature": "String getPropsDuraBossContext()", "old_args": "", "old_implementation": null, "old_return_type": "String", "old_signature": "String getPropsDuraReportContext()" }, { "name": "duracloud$duracloud", "new_args": "String key,String value", "new_implementation": null, "new_return_type": "void", "new_signature": "void loadDuraboss(String key,String value)", "old_args": "String key,String value", "old_implementation": null, "old_return_type": "void", "old_signature": "void loadDurareport(String key,String value)" }, { "name": "duracloud$duracloud", "new_args": "DurabossConfig config", "new_implementation": null, "new_return_type": "void", "new_signature": "void verifyDurabossConfig(DurabossConfig config)", "old_args": "DurareportConfig config", "old_implementation": null, "old_return_type": "void", "old_signature": "void verifyDurareportConfig(DurareportConfig config)" }, { "name": "duracloud$duracloud", "new_args": "InputStream xml", "new_implementation": null, "new_return_type": "DurabossConfig", "new_signature": "DurabossConfig createDurabossConfigFrom(InputStream xml)", "old_args": "InputStream xml", "old_implementation": null, "old_return_type": "DurareportConfig", "old_signature": "DurareportConfig createDurareportConfigFrom(InputStream xml)" }, { "name": "duracloud$duracloud", "new_args": "", "new_implementation": null, "new_return_type": "String", "new_signature": "String getDuraBossContext()", "old_args": "", "old_implementation": null, "old_return_type": "String", "old_signature": "String getDuraReportContext()" }, { "name": "duracloud$duracloud", "new_args": "", "new_implementation": null, "new_return_type": "String", "new_signature": "String getDuraBossContext()", "old_args": "", "old_implementation": null, "old_return_type": "String", "old_signature": "String getDuraReportContext()" }, { "name": "duracloud$duracloud", "new_args": "", "new_implementation": null, "new_return_type": "String", "new_signature": "String getDuraBossHost()", "old_args": "", "old_implementation": null, "old_return_type": "String", "old_signature": "String getDuraReportHost()" }, { "name": "duracloud$duracloud", "new_args": "", "new_implementation": null, "new_return_type": "String", "new_signature": "String getDuraBossPort()", "old_args": "", "old_implementation": null, "old_return_type": "String", "old_signature": "String getDuraReportPort()" }, { "name": "duracloud$duracloud", "new_args": "", "new_implementation": null, "new_return_type": "Application", "new_signature": "Application getDuraboss()", "old_args": "", "old_implementation": null, "old_return_type": "Application", "old_signature": "Application getDurareport()" }, { "name": "duracloud$duracloud", "new_args": "", "new_implementation": null, "new_return_type": "String", "new_signature": "String getDurabossContext()", "old_args": "", "old_implementation": null, "old_return_type": "String", "old_signature": "String getDurareportContext()" }, { "name": "duracloud$duracloud", "new_args": "String durabossContext", "new_implementation": null, "new_return_type": "void", "new_signature": "void setDuraBossContext(String durabossContext)", "old_args": "String durareportContext", "old_implementation": null, "old_return_type": "void", "old_signature": "void setDuraReportContext(String durareportContext)" }, { "name": "duracloud$duracloud", "new_args": "String durabossContext", "new_implementation": null, "new_return_type": "void", "new_signature": "void setDurabossContext(String durabossContext)", "old_args": "String durareportContext", "old_implementation": null, "old_return_type": "void", "old_signature": "void setDurareportContext(String durareportContext)" } ]
[ { "additions": 27, "blob_url": "https://github.com/duracloud/duracloud/blob/02668af08bebc5266b321ab1df2f45dfe656c813/app-config%2Fsrc%2Fmain%2Fjava%2Forg%2Fduracloud%2Fappconfig%2FApplicationInitializer.java", "changes": 54, "contents_url": "https://api.github.com/repos/duracloud/duracloud/contents/app-config%2Fsrc%2Fmain%2Fjava%2Forg%2Fduracloud%2Fappconfig%2FApplicationInitializer.java?ref=02668af08bebc5266b321ab1df2f45dfe656c813", "deletions": 27, "filename": "app-config/src/main/java/org/duracloud/appconfig/ApplicationInitializer.java", "new_code": "import org.duracloud.appconfig.domain.DurabossConfig;\n private static final String durabossKey = \"duraboss\";\n private String durabossHost;\n private String durabossPort;\n private String durabossContext;\n * duraboss, and application security from the provided props.\n if (durabossEndpointLoad()) {\n app = new Application(durabossHost,\n durabossPort,\n durabossContext);\n appWithConfig = new ApplicationWithConfig(durabossKey);\n appWithConfig.setConfig(new DurabossConfig());\n log.warn(\"duraboss endpoint not !loaded\");\n private boolean durabossEndpointLoad() {\n return null != durabossHost && null != durabossPort &&\n null != durabossContext;\n } else if (prefix.equalsIgnoreCase(DurabossConfig.QUALIFIER)) {\n loadDuraboss(suffix, value);\n loadDuraboss(suffix, value);\n private void loadDuraboss(String key, String value) {\n this.durabossHost = value;\n this.durabossPort = value;\n this.durabossContext = value;\n if (durabossEndpointLoad()) {\n response = initApp(appsWithConfigs.get(durabossKey));\n public Application getDuraboss() {\n return appsWithConfigs.get(durabossKey).getApplication();", "new_methods": [ { "arguments": [], "filename": "app-config/src/main/java/org/duracloud/appconfig/ApplicationInitializer.java", "implementation": "return null != durabossHost && null != durabossPort &&\n null != durabossContext;", "signature": "boolean durabossEndpointLoad()" } ], "old_code": "import org.duracloud.appconfig.domain.DurareportConfig;\n private static final String durareportKey = \"durareport\";\n private String durareportHost;\n private String durareportPort;\n private String durareportContext;\n * durareport, and application security from the provided props.\n if (durareportEndpointLoad()) {\n app = new Application(durareportHost,\n durareportPort,\n durareportContext);\n appWithConfig = new ApplicationWithConfig(durareportKey);\n appWithConfig.setConfig(new DurareportConfig());\n log.warn(\"durareport endpoint not !loaded\");\n private boolean durareportEndpointLoad() {\n return null != durareportHost && null != durareportPort &&\n null != durareportContext;\n } else if (prefix.equalsIgnoreCase(DurareportConfig.QUALIFIER)) {\n loadDurareport(suffix, value);\n loadDurareport(suffix, value);\n private void loadDurareport(String key, String value) {\n this.durareportHost = value;\n this.durareportPort = value;\n this.durareportContext = value;\n if (durareportEndpointLoad()) {\n response = initApp(appsWithConfigs.get(durareportKey));\n public Application getDurareport() {\n return appsWithConfigs.get(durareportKey).getApplication();", "old_methods": [ { "arguments": [], "filename": "app-config/src/main/java/org/duracloud/appconfig/ApplicationInitializer.java", "implementation": "return null != durareportHost && null != durareportPort &&\n null != durareportContext;", "signature": "boolean durareportEndpointLoad()" } ], "patch": "@@ -11,7 +11,7 @@\n import org.duracloud.appconfig.domain.Application;\n import org.duracloud.appconfig.domain.BaseConfig;\n import org.duracloud.appconfig.domain.DuradminConfig;\n-import org.duracloud.appconfig.domain.DurareportConfig;\n+import org.duracloud.appconfig.domain.DurabossConfig;\n import org.duracloud.appconfig.domain.DuraserviceConfig;\n import org.duracloud.appconfig.domain.DurastoreConfig;\n import org.duracloud.appconfig.domain.SecurityConfig;\n@@ -46,7 +46,7 @@ public class ApplicationInitializer extends BaseConfig {\n private static final String duradminKey = \"duradmin\";\n private static final String duraserviceKey = \"duraservice\";\n private static final String durastoreKey = \"durastore\";\n- private static final String durareportKey = \"durareport\";\n+ private static final String durabossKey = \"duraboss\";\n \n protected static final String hostKey = \"host\";\n protected static final String portKey = \"port\";\n@@ -62,9 +62,9 @@ public class ApplicationInitializer extends BaseConfig {\n private String durastoreHost;\n private String durastorePort;\n private String durastoreContext;\n- private String durareportHost;\n- private String durareportPort;\n- private String durareportContext;\n+ private String durabossHost;\n+ private String durabossPort;\n+ private String durabossContext;\n \n private SecurityConfig securityConfig = new SecurityConfig();\n private Map<String, ApplicationWithConfig> appsWithConfigs =\n@@ -88,7 +88,7 @@ public ApplicationInitializer(File propsFile) throws IOException {\n \n /**\n * This method sets the configuration of duradmin, durastore, duraservice,\n- * durareport, and application security from the provided props.\n+ * duraboss, and application security from the provided props.\n * Note: this method is called by the constructor, so generally is should\n * not be needed publicly.\n *\n@@ -145,17 +145,17 @@ private void createApplications() {\n log.warn(\"durastore endpoint !loaded\");\n }\n \n- if (durareportEndpointLoad()) {\n- app = new Application(durareportHost,\n- durareportPort,\n- durareportContext);\n+ if (durabossEndpointLoad()) {\n+ app = new Application(durabossHost,\n+ durabossPort,\n+ durabossContext);\n \n- appWithConfig = new ApplicationWithConfig(durareportKey);\n+ appWithConfig = new ApplicationWithConfig(durabossKey);\n appWithConfig.setApplication(app);\n- appWithConfig.setConfig(new DurareportConfig());\n+ appWithConfig.setConfig(new DurabossConfig());\n appsWithConfigs.put(appWithConfig.getName(), appWithConfig);\n } else {\n- log.warn(\"durareport endpoint not !loaded\");\n+ log.warn(\"duraboss endpoint not !loaded\");\n }\n }\n \n@@ -174,9 +174,9 @@ private boolean durastoreEndpointLoad() {\n null != durastoreContext;\n }\n \n- private boolean durareportEndpointLoad() {\n- return null != durareportHost && null != durareportPort &&\n- null != durareportContext;\n+ private boolean durabossEndpointLoad() {\n+ return null != durabossHost && null != durabossPort &&\n+ null != durabossContext;\n }\n \n protected String getQualifier() {\n@@ -196,14 +196,14 @@ protected void loadProperty(String key, String value) {\n } else if (prefix.equalsIgnoreCase(DuraserviceConfig.QUALIFIER)) {\n loadDuraservice(suffix, value);\n \n- } else if (prefix.equalsIgnoreCase(DurareportConfig.QUALIFIER)) {\n- loadDurareport(suffix, value);\n+ } else if (prefix.equalsIgnoreCase(DurabossConfig.QUALIFIER)) {\n+ loadDuraboss(suffix, value);\n \n } else if (prefix.equalsIgnoreCase(wildcardKey)) {\n loadDuradmin(suffix, value);\n loadDurastore(suffix, value);\n loadDuraservice(suffix, value);\n- loadDurareport(suffix, value);\n+ loadDuraboss(suffix, value);\n \n } else {\n String msg = \"unknown key: \" + key + \" (\" + value + \")\";\n@@ -266,16 +266,16 @@ private void loadDuraservice(String key, String value) {\n }\n }\n \n- private void loadDurareport(String key, String value) {\n+ private void loadDuraboss(String key, String value) {\n String prefix = getPrefix(key);\n if (prefix.equalsIgnoreCase(hostKey)) {\n- this.durareportHost = value;\n+ this.durabossHost = value;\n \n } else if (prefix.equalsIgnoreCase(portKey)) {\n- this.durareportPort = value;\n+ this.durabossPort = value;\n \n } else if (prefix.equalsIgnoreCase(contextKey)) {\n- this.durareportContext = value;\n+ this.durabossContext = value;\n \n } else {\n String msg = \"unknown key: \" + key + \" (\" + value + \")\";\n@@ -296,8 +296,8 @@ public RestHttpHelper.HttpResponse initialize() {\n response = initApp(appsWithConfigs.get(durastoreKey));\n response = initApp(appsWithConfigs.get(duraserviceKey));\n response = initApp(appsWithConfigs.get(duradminKey));\n- if (durareportEndpointLoad()) {\n- response = initApp(appsWithConfigs.get(durareportKey));\n+ if (durabossEndpointLoad()) {\n+ response = initApp(appsWithConfigs.get(durabossKey));\n }\n \n return response;\n@@ -389,7 +389,7 @@ public Application getDuraservice() {\n return appsWithConfigs.get(duraserviceKey).getApplication();\n }\n \n- public Application getDurareport() {\n- return appsWithConfigs.get(durareportKey).getApplication();\n+ public Application getDuraboss() {\n+ return appsWithConfigs.get(durabossKey).getApplication();\n }\n }", "raw_url": "https://github.com/duracloud/duracloud/raw/02668af08bebc5266b321ab1df2f45dfe656c813/app-config%2Fsrc%2Fmain%2Fjava%2Forg%2Fduracloud%2Fappconfig%2FApplicationInitializer.java", "sha": "69ccf19d62c3742ab3bdb33add3a8ccf0488e25b", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/duracloud/duracloud/blob/02668af08bebc5266b321ab1df2f45dfe656c813/app-config%2Fsrc%2Fmain%2Fjava%2Forg%2Fduracloud%2Fappconfig%2Fdomain%2FBaseConfig.java", "changes": 2, "contents_url": "https://api.github.com/repos/duracloud/duracloud/contents/app-config%2Fsrc%2Fmain%2Fjava%2Forg%2Fduracloud%2Fappconfig%2Fdomain%2FBaseConfig.java?ref=02668af08bebc5266b321ab1df2f45dfe656c813", "deletions": 1, "filename": "app-config/src/main/java/org/duracloud/appconfig/domain/BaseConfig.java", "new_code": " * duraservice, duradmin, duraboss, and security configurations.", "new_methods": [], "old_code": " * duraservice, duradmin, durareport, and security configurations.", "old_methods": [], "patch": "@@ -16,7 +16,7 @@\n \n /**\n * This class collects the common functionality needed by durastore,\n- * duraservice, duradmin, durareport, and security configurations.\n+ * duraservice, duradmin, duraboss, and security configurations.\n *\n * @author Andrew Woods\n * Date: Apr 20, 2010", "raw_url": "https://github.com/duracloud/duracloud/raw/02668af08bebc5266b321ab1df2f45dfe656c813/app-config%2Fsrc%2Fmain%2Fjava%2Forg%2Fduracloud%2Fappconfig%2Fdomain%2FBaseConfig.java", "sha": "58016abf526ec9496f8dad9cfb974f8e87b94ec4", "status": "modified" }, { "additions": 8, "blob_url": "https://github.com/duracloud/duracloud/blob/02668af08bebc5266b321ab1df2f45dfe656c813/app-config%2Fsrc%2Fmain%2Fjava%2Forg%2Fduracloud%2Fappconfig%2Fdomain%2FDuradminConfig.java", "changes": 16, "contents_url": "https://api.github.com/repos/duracloud/duracloud/contents/app-config%2Fsrc%2Fmain%2Fjava%2Forg%2Fduracloud%2Fappconfig%2Fdomain%2FDuradminConfig.java?ref=02668af08bebc5266b321ab1df2f45dfe656c813", "deletions": 8, "filename": "app-config/src/main/java/org/duracloud/appconfig/domain/DuradminConfig.java", "new_code": " public static final String duraBossContextKey = \"duraboss-context\";\n private String durabossContext;\n } else if (key.equalsIgnoreCase(duraBossContextKey)) {\n this.durabossContext = value;\n public String getDurabossContext() {\n return durabossContext;\n public void setDurabossContext(String durabossContext) {\n this.durabossContext = durabossContext;", "new_methods": [], "old_code": " public static final String duraReportContextKey = \"durareport-context\";\n private String durareportContext;\n } else if (key.equalsIgnoreCase(duraReportContextKey)) {\n this.durareportContext = value;\n public String getDurareportContext() {\n return durareportContext;\n public void setDurareportContext(String durareportContext) {\n this.durareportContext = durareportContext;", "old_methods": [], "patch": "@@ -28,7 +28,7 @@ public class DuradminConfig extends BaseConfig implements AppConfig {\n public static final String duraServiceHostKey = \"duraservice-host\";\n public static final String duraServicePortKey = \"duraservice-port\";\n public static final String duraServiceContextKey = \"duraservice-context\";\n- public static final String duraReportContextKey = \"durareport-context\";\n+ public static final String duraBossContextKey = \"duraboss-context\";\n \n public static final String amaUrlKey = \"ama-url\";\n \n@@ -38,7 +38,7 @@ public class DuradminConfig extends BaseConfig implements AppConfig {\n private String duraserviceHost;\n private String duraservicePort;\n private String duraserviceContext;\n- private String durareportContext;\n+ private String durabossContext;\n \n private String amaUrl;\n \n@@ -74,8 +74,8 @@ protected void loadProperty(String key, String value) {\n } else if (key.equalsIgnoreCase(duraServiceContextKey)) {\n this.duraserviceContext = value;\n \n- } else if (key.equalsIgnoreCase(duraReportContextKey)) {\n- this.durareportContext = value;\n+ } else if (key.equalsIgnoreCase(duraBossContextKey)) {\n+ this.durabossContext = value;\n \n } else if (key.equalsIgnoreCase(amaUrlKey)) {\n this.amaUrl = value;\n@@ -149,11 +149,11 @@ public void setAmaUrl(String amaUrl) {\n this.amaUrl = amaUrl;\n }\n \n- public String getDurareportContext() {\n- return durareportContext;\n+ public String getDurabossContext() {\n+ return durabossContext;\n }\n \n- public void setDurareportContext(String durareportContext) {\n- this.durareportContext = durareportContext;\n+ public void setDurabossContext(String durabossContext) {\n+ this.durabossContext = durabossContext;\n }\n }", "raw_url": "https://github.com/duracloud/duracloud/raw/02668af08bebc5266b321ab1df2f45dfe656c813/app-config%2Fsrc%2Fmain%2Fjava%2Forg%2Fduracloud%2Fappconfig%2Fdomain%2FDuradminConfig.java", "sha": "f49a1901b8c0508cee827064bd086080b42b4690", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/duracloud/duracloud/blob/02668af08bebc5266b321ab1df2f45dfe656c813/app-config%2Fsrc%2Fmain%2Fjava%2Forg%2Fduracloud%2Fappconfig%2Fxml%2FDuradminInitDocumentBinding.java", "changes": 2, "contents_url": "https://api.github.com/repos/duracloud/duracloud/contents/app-config%2Fsrc%2Fmain%2Fjava%2Forg%2Fduracloud%2Fappconfig%2Fxml%2FDuradminInitDocumentBinding.java?ref=02668af08bebc5266b321ab1df2f45dfe656c813", "deletions": 1, "filename": "app-config/src/main/java/org/duracloud/appconfig/xml/DuradminInitDocumentBinding.java", "new_code": " config.setDurabossContext(root.getChildText(\"durabossContext\"));", "new_methods": [], "old_code": " config.setDurareportContext(root.getChildText(\"durareportContext\"));", "old_methods": [], "patch": "@@ -47,7 +47,7 @@ public static DuradminConfig createDuradminConfigFrom(InputStream xml) {\n config.setDuraserviceHost(root.getChildText(\"duraserviceHost\"));\n config.setDuraservicePort(root.getChildText(\"duraservicePort\"));\n config.setDuraserviceContext(root.getChildText(\"duraserviceContext\"));\n- config.setDurareportContext(root.getChildText(\"durareportContext\"));\n+ config.setDurabossContext(root.getChildText(\"durabossContext\"));\n config.setAmaUrl(root.getChildText(\"amaUrl\"));\n \n } catch (Exception e) {", "raw_url": "https://github.com/duracloud/duracloud/raw/02668af08bebc5266b321ab1df2f45dfe656c813/app-config%2Fsrc%2Fmain%2Fjava%2Forg%2Fduracloud%2Fappconfig%2Fxml%2FDuradminInitDocumentBinding.java", "sha": "27e7d2f469ae2816e7f4083c0f8ca9c25809843a", "status": "modified" }, { "additions": 6, "blob_url": "https://github.com/duracloud/duracloud/blob/02668af08bebc5266b321ab1df2f45dfe656c813/app-config%2Fsrc%2Fmain%2Fresources%2Finit.properties", "changes": 12, "contents_url": "https://api.github.com/repos/duracloud/duracloud/contents/app-config%2Fsrc%2Fmain%2Fresources%2Finit.properties?ref=02668af08bebc5266b321ab1df2f45dfe656c813", "deletions": 6, "filename": "app-config/src/main/resources/init.properties", "new_code": "app.duraboss.context=duraboss\n# defines notification requirements, for duraboss\nduraboss.notification.0.type=EMAIL\nduraboss.notification.0.username=[username]\nduraboss.notification.0.password=[password]\nduraboss.notification.0.originator=[from email address]", "new_methods": [], "old_code": "app.durareport.context=durareport\n# defines notification requirements, for durareport\ndurareport.notification.0.type=EMAIL\ndurareport.notification.0.username=[username]\ndurareport.notification.0.password=[password]\ndurareport.notification.0.originator=[from email address]", "old_methods": [], "patch": "@@ -6,7 +6,7 @@ app.*.port=8080\n app.durastore.context=durastore\n app.duraservice.context=duraservice\n app.duradmin.context=duradmin\n-app.durareport.context=durareport\n+app.duraboss.context=duraboss\n \n ###\n # defines durastore accts\n@@ -67,12 +67,12 @@ duradmin.duraservice-port=8080\n duradmin.duraservice-context=duraservice\n \n ###\n-# defines notification requirements, for durareport\n+# defines notification requirements, for duraboss\n ###\n-durareport.notification.0.type=EMAIL\n-durareport.notification.0.username=[username]\n-durareport.notification.0.password=[password]\n-durareport.notification.0.originator=[from email address]\n+duraboss.notification.0.type=EMAIL\n+duraboss.notification.0.username=[username]\n+duraboss.notification.0.password=[password]\n+duraboss.notification.0.originator=[from email address]\n \n ###\n # defines new users", "raw_url": "https://github.com/duracloud/duracloud/raw/02668af08bebc5266b321ab1df2f45dfe656c813/app-config%2Fsrc%2Fmain%2Fresources%2Finit.properties", "sha": "faa77c231174cf63f03174196026ef795a0a54f0", "status": "modified" }, { "additions": 13, "blob_url": "https://github.com/duracloud/duracloud/blob/02668af08bebc5266b321ab1df2f45dfe656c813/app-config%2Fsrc%2Ftest%2Fjava%2Forg%2Fduracloud%2Fappconfig%2FApplicationInitializerTest.java", "changes": 26, "contents_url": "https://api.github.com/repos/duracloud/duracloud/contents/app-config%2Fsrc%2Ftest%2Fjava%2Forg%2Fduracloud%2Fappconfig%2FApplicationInitializerTest.java?ref=02668af08bebc5266b321ab1df2f45dfe656c813", "deletions": 13, "filename": "app-config/src/test/java/org/duracloud/appconfig/ApplicationInitializerTest.java", "new_code": "import org.duracloud.appconfig.domain.DurabossConfig;\n private String durabossPort = \"durabossPort\";\n private String durabossContext = \"durabossContext\";\n String pRpt = p + DurabossConfig.QUALIFIER + dot;\n props.put(pRpt + port, durabossPort);\n props.put(pRpt + context, durabossContext);\n Application duraboss = config.getDuraboss();\n Assert.assertNotNull(duraboss);\n String reportHost = duraboss.getHost();\n String reportPort = duraboss.getPort();\n String reportContext = duraboss.getContext();\n Assert.assertEquals(durabossPort, reportPort);\n Assert.assertEquals(durabossContext, reportContext);", "new_methods": [], "old_code": "import org.duracloud.appconfig.domain.DurareportConfig;\n private String durareportPort = \"durareportPort\";\n private String durareportContext = \"durareportContext\";\n String pRpt = p + DurareportConfig.QUALIFIER + dot;\n props.put(pRpt + port, durareportPort);\n props.put(pRpt + context, durareportContext);\n Application durareport = config.getDurareport();\n Assert.assertNotNull(durareport);\n String reportHost = durareport.getHost();\n String reportPort = durareport.getPort();\n String reportContext = durareport.getContext();\n Assert.assertEquals(durareportPort, reportPort);\n Assert.assertEquals(durareportContext, reportContext);", "old_methods": [], "patch": "@@ -9,7 +9,7 @@\n \n import org.duracloud.appconfig.domain.Application;\n import org.duracloud.appconfig.domain.DuradminConfig;\n-import org.duracloud.appconfig.domain.DurareportConfig;\n+import org.duracloud.appconfig.domain.DurabossConfig;\n import org.duracloud.appconfig.domain.DuraserviceConfig;\n import org.duracloud.appconfig.domain.DurastoreConfig;\n import org.junit.Assert;\n@@ -32,8 +32,8 @@ public class ApplicationInitializerTest {\n private String durastoreContext = \"durastoreContext\";\n private String duraservicePort = \"duraservicePort\";\n private String duraserviceContext = \"duraserviceContext\";\n- private String durareportPort = \"durareportPort\";\n- private String durareportContext = \"durareportContext\";\n+ private String durabossPort = \"durabossPort\";\n+ private String durabossContext = \"durabossContext\";\n private String allHost = \"allHost\";\n \n @Test\n@@ -56,7 +56,7 @@ private Properties createProps() {\n String pAdm = p + DuradminConfig.QUALIFIER + dot;\n String pStr = p + DurastoreConfig.QUALIFIER + dot;\n String pSrv = p + DuraserviceConfig.QUALIFIER + dot;\n- String pRpt = p + DurareportConfig.QUALIFIER + dot;\n+ String pRpt = p + DurabossConfig.QUALIFIER + dot;\n String pWild = p + ApplicationInitializer.wildcardKey + dot;\n \n String host = ApplicationInitializer.hostKey;\n@@ -66,11 +66,11 @@ private Properties createProps() {\n props.put(pAdm + port, duradminPort);\n props.put(pStr + port, durastorePort);\n props.put(pSrv + port, duraservicePort);\n- props.put(pRpt + port, durareportPort);\n+ props.put(pRpt + port, durabossPort);\n props.put(pAdm + context, duradminContext);\n props.put(pStr + context, durastoreContext);\n props.put(pSrv + context, duraserviceContext);\n- props.put(pRpt + context, durareportContext);\n+ props.put(pRpt + context, durabossContext);\n props.put(pWild + host, allHost);\n \n return props;\n@@ -80,12 +80,12 @@ private void verifyApplicationInitializer(ApplicationInitializer config) {\n Application duradmin = config.getDuradmin();\n Application durastore = config.getDurastore();\n Application duraservice = config.getDuraservice();\n- Application durareport = config.getDurareport();\n+ Application duraboss = config.getDuraboss();\n \n Assert.assertNotNull(duradmin);\n Assert.assertNotNull(durastore);\n Assert.assertNotNull(duraservice);\n- Assert.assertNotNull(durareport);\n+ Assert.assertNotNull(duraboss);\n \n String adminHost = duradmin.getHost();\n String adminPort = duradmin.getPort();\n@@ -96,9 +96,9 @@ private void verifyApplicationInitializer(ApplicationInitializer config) {\n String serviceHost = duraservice.getHost();\n String servicePort = duraservice.getPort();\n String serviceContext = duraservice.getContext();\n- String reportHost = durareport.getHost();\n- String reportPort = durareport.getPort();\n- String reportContext = durareport.getContext();\n+ String reportHost = duraboss.getHost();\n+ String reportPort = duraboss.getPort();\n+ String reportContext = duraboss.getContext();\n \n Assert.assertNotNull(adminHost);\n Assert.assertNotNull(adminPort);\n@@ -123,8 +123,8 @@ private void verifyApplicationInitializer(ApplicationInitializer config) {\n Assert.assertEquals(duraservicePort, servicePort);\n Assert.assertEquals(duraserviceContext, serviceContext);\n Assert.assertEquals(allHost, reportHost);\n- Assert.assertEquals(durareportPort, reportPort);\n- Assert.assertEquals(durareportContext, reportContext);\n+ Assert.assertEquals(durabossPort, reportPort);\n+ Assert.assertEquals(durabossContext, reportContext);\n }\n \n }", "raw_url": "https://github.com/duracloud/duracloud/raw/02668af08bebc5266b321ab1df2f45dfe656c813/app-config%2Fsrc%2Ftest%2Fjava%2Forg%2Fduracloud%2Fappconfig%2FApplicationInitializerTest.java", "sha": "62306a860ed00b4c1737507ab54bdbbe82420cf5", "status": "modified" }, { "additions": 4, "blob_url": "https://github.com/duracloud/duracloud/blob/02668af08bebc5266b321ab1df2f45dfe656c813/app-config%2Fsrc%2Ftest%2Fjava%2Forg%2Fduracloud%2Fappconfig%2Fdomain%2FDuradminConfigTest.java", "changes": 8, "contents_url": "https://api.github.com/repos/duracloud/duracloud/contents/app-config%2Fsrc%2Ftest%2Fjava%2Forg%2Fduracloud%2Fappconfig%2Fdomain%2FDuradminConfigTest.java?ref=02668af08bebc5266b321ab1df2f45dfe656c813", "deletions": 4, "filename": "app-config/src/test/java/org/duracloud/appconfig/domain/DuradminConfigTest.java", "new_code": " private String durabossContext = \"durabossContext\";\n props.put(p + DuradminConfig.duraBossContextKey, durabossContext);\n Assert.assertNotNull(config.getDurabossContext());\n Assert.assertEquals(durabossContext, config.getDurabossContext());", "new_methods": [], "old_code": " private String durareportContext = \"durareportContext\";\n props.put(p + DuradminConfig.duraReportContextKey, durareportContext);\n Assert.assertNotNull(config.getDurareportContext());\n Assert.assertEquals(durareportContext, config.getDurareportContext());", "old_methods": [], "patch": "@@ -28,7 +28,7 @@ public class DuradminConfigTest {\n private String duraserviceHost = \"duraserviceHost\";\n private String duraservicePort = \"duraservicePort\";\n private String duraserviceContext = \"duraserviceContext\";\n- private String durareportContext = \"durareportContext\";\n+ private String durabossContext = \"durabossContext\";\n \n private String amaUrl = \"amaUrl\";\n \n@@ -54,7 +54,7 @@ private Map<String, String> createProps() {\n props.put(p + DuradminConfig.duraServiceHostKey, duraserviceHost);\n props.put(p + DuradminConfig.duraServicePortKey, duraservicePort);\n props.put(p + DuradminConfig.duraServiceContextKey, duraserviceContext);\n- props.put(p + DuradminConfig.duraReportContextKey, durareportContext);\n+ props.put(p + DuradminConfig.duraBossContextKey, durabossContext);\n props.put(p + DuradminConfig.amaUrlKey, amaUrl);\n \n return props;\n@@ -68,7 +68,7 @@ private void verifyDuradminConfig(DuradminConfig config) {\n Assert.assertNotNull(config.getDuraserviceHost());\n Assert.assertNotNull(config.getDuraservicePort());\n Assert.assertNotNull(config.getDuraserviceContext());\n- Assert.assertNotNull(config.getDurareportContext());\n+ Assert.assertNotNull(config.getDurabossContext());\n \n Assert.assertNotNull(config.getAmaUrl());\n \n@@ -78,7 +78,7 @@ private void verifyDuradminConfig(DuradminConfig config) {\n Assert.assertEquals(duraserviceHost, config.getDuraserviceHost());\n Assert.assertEquals(duraservicePort, config.getDuraservicePort());\n Assert.assertEquals(duraserviceContext, config.getDuraserviceContext());\n- Assert.assertEquals(durareportContext, config.getDurareportContext());\n+ Assert.assertEquals(durabossContext, config.getDurabossContext());\n Assert.assertEquals(amaUrl, config.getAmaUrl());\n }\n ", "raw_url": "https://github.com/duracloud/duracloud/raw/02668af08bebc5266b321ab1df2f45dfe656c813/app-config%2Fsrc%2Ftest%2Fjava%2Forg%2Fduracloud%2Fappconfig%2Fdomain%2FDuradminConfigTest.java", "sha": "ac02bef55c144b890a08cd80473f618e1e4d3196", "status": "modified" }, { "additions": 8, "blob_url": "https://github.com/duracloud/duracloud/blob/02668af08bebc5266b321ab1df2f45dfe656c813/duradmin%2Fsrc%2Fmain%2Fjava%2Forg%2Fduracloud%2Fduradmin%2Fconfig%2FDuradminConfig.java", "changes": 16, "contents_url": "https://api.github.com/repos/duracloud/duracloud/contents/duradmin%2Fsrc%2Fmain%2Fjava%2Forg%2Fduracloud%2Fduradmin%2Fconfig%2FDuradminConfig.java?ref=02668af08bebc5266b321ab1df2f45dfe656c813", "deletions": 8, "filename": "duradmin/src/main/java/org/duracloud/duradmin/config/DuradminConfig.java", "new_code": " private static String durabossContextKey = \"durabossContext\";\n config.setDuraBossContext(getPropsDuraBossContext());\n private static String getPropsDuraBossContext() {\n return getProps().getProperty(durabossContextKey, \"duraboss\");\n public static String getDuraBossHost() {\n public static String getDuraBossPort() {\n public static String getDuraBossContext() {\n return getPropsDuraBossContext();", "new_methods": [], "old_code": " private static String durareportContextKey = \"durareportContext\";\n config.setDuraReportContext(getPropsDuraReportContext());\n private static String getPropsDuraReportContext() {\n return getProps().getProperty(durareportContextKey, \"durareport\");\n public static String getDuraReportHost() {\n public static String getDuraReportPort() {\n public static String getDuraReportContext() {\n return getPropsDuraReportContext();", "old_methods": [], "patch": "@@ -35,7 +35,7 @@ public class DuradminConfig\n \n private static String duraserviceContextKey = \"duraserviceContext\";\n \n- private static String durareportContextKey = \"durareportContext\";\n+ private static String durabossContextKey = \"durabossContext\";\n \n private static boolean initialized = false;\n \n@@ -128,25 +128,25 @@ private static void initFromProperties() {\n config.setDuraServiceHost(getPropsHost());\n config.setDuraServicePort(getPropsPort());\n config.setDuraServiceContext(getPropsDuraServiceContext());\n- config.setDuraReportContext(getPropsDuraReportContext());\n+ config.setDuraBossContext(getPropsDuraBossContext());\n \n config.setAmaUrl(null); // default is null.\n }\n \n- private static String getPropsDuraReportContext() {\n- return getProps().getProperty(durareportContextKey, \"durareport\");\n+ private static String getPropsDuraBossContext() {\n+ return getProps().getProperty(durabossContextKey, \"duraboss\");\n }\n \n- public static String getDuraReportHost() {\n+ public static String getDuraBossHost() {\n return getPropsHost();\n }\n \n- public static String getDuraReportPort() {\n+ public static String getDuraBossPort() {\n return getPropsPort();\n }\n \n- public static String getDuraReportContext() {\n- return getPropsDuraReportContext();\n+ public static String getDuraBossContext() {\n+ return getPropsDuraBossContext();\n }\n \n }", "raw_url": "https://github.com/duracloud/duracloud/raw/02668af08bebc5266b321ab1df2f45dfe656c813/duradmin%2Fsrc%2Fmain%2Fjava%2Forg%2Fduracloud%2Fduradmin%2Fconfig%2FDuradminConfig.java", "sha": "96b63a9949aa63f11b89fa89d5173efe477cdb19", "status": "modified" }, { "additions": 13, "blob_url": "https://github.com/duracloud/duracloud/blob/02668af08bebc5266b321ab1df2f45dfe656c813/duradmin%2Fsrc%2Fmain%2Fjava%2Forg%2Fduracloud%2Fduradmin%2Fcontrol%2FInitController.java", "changes": 26, "contents_url": "https://api.github.com/repos/duracloud/duracloud/contents/duradmin%2Fsrc%2Fmain%2Fjava%2Forg%2Fduracloud%2Fduradmin%2Fcontrol%2FInitController.java?ref=02668af08bebc5266b321ab1df2f45dfe656c813", "deletions": 13, "filename": "duradmin/src/main/java/org/duracloud/duradmin/control/InitController.java", "new_code": "import javax.servlet.ServletInputStream;\nimport javax.servlet.http.HttpServletRequest;\nimport javax.servlet.http.HttpServletResponse;\n\nimport static javax.servlet.http.HttpServletResponse.SC_BAD_REQUEST;\nimport static javax.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR;\nimport static javax.servlet.http.HttpServletResponse.SC_METHOD_NOT_ALLOWED;\nimport static javax.servlet.http.HttpServletResponse.SC_OK;\nimport static javax.servlet.http.HttpServletResponse.SC_SERVICE_UNAVAILABLE;\nimport static org.duracloud.appconfig.xml.DuradminInitDocumentBinding.createDuradminConfigFrom;\nimport static org.duracloud.common.util.ExceptionUtil.getStackTraceAsString;\n\n init.setDuraBossContext(config.getDurabossContext());", "new_methods": [], "old_code": "import static javax.servlet.http.HttpServletResponse.SC_BAD_REQUEST;\nimport static javax.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR;\nimport static javax.servlet.http.HttpServletResponse.SC_METHOD_NOT_ALLOWED;\nimport static javax.servlet.http.HttpServletResponse.SC_OK;\nimport static javax.servlet.http.HttpServletResponse.SC_SERVICE_UNAVAILABLE;\nimport static org.duracloud.appconfig.xml.DuradminInitDocumentBinding.createDuradminConfigFrom;\nimport static org.duracloud.common.util.ExceptionUtil.getStackTraceAsString;\n\nimport javax.servlet.ServletInputStream;\nimport javax.servlet.http.HttpServletRequest;\nimport javax.servlet.http.HttpServletResponse;\n\n init.setDuraReportContext(config.getDurareportContext());", "old_methods": [], "patch": "@@ -7,18 +7,6 @@\n */\n package org.duracloud.duradmin.control;\n \n-import static javax.servlet.http.HttpServletResponse.SC_BAD_REQUEST;\n-import static javax.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR;\n-import static javax.servlet.http.HttpServletResponse.SC_METHOD_NOT_ALLOWED;\n-import static javax.servlet.http.HttpServletResponse.SC_OK;\n-import static javax.servlet.http.HttpServletResponse.SC_SERVICE_UNAVAILABLE;\n-import static org.duracloud.appconfig.xml.DuradminInitDocumentBinding.createDuradminConfigFrom;\n-import static org.duracloud.common.util.ExceptionUtil.getStackTraceAsString;\n-\n-import javax.servlet.ServletInputStream;\n-import javax.servlet.http.HttpServletRequest;\n-import javax.servlet.http.HttpServletResponse;\n-\n import org.duracloud.common.util.InitUtil;\n import org.duracloud.duradmin.config.DuradminConfig;\n import org.duracloud.duradmin.domain.AdminInit;\n@@ -27,6 +15,18 @@\n import org.springframework.validation.BindException;\n import org.springframework.web.servlet.ModelAndView;\n \n+import javax.servlet.ServletInputStream;\n+import javax.servlet.http.HttpServletRequest;\n+import javax.servlet.http.HttpServletResponse;\n+\n+import static javax.servlet.http.HttpServletResponse.SC_BAD_REQUEST;\n+import static javax.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR;\n+import static javax.servlet.http.HttpServletResponse.SC_METHOD_NOT_ALLOWED;\n+import static javax.servlet.http.HttpServletResponse.SC_OK;\n+import static javax.servlet.http.HttpServletResponse.SC_SERVICE_UNAVAILABLE;\n+import static org.duracloud.appconfig.xml.DuradminInitDocumentBinding.createDuradminConfigFrom;\n+import static org.duracloud.common.util.ExceptionUtil.getStackTraceAsString;\n+\n /**\n * This class initializes the application based on the xml body of the\n * servlet request.\n@@ -87,7 +87,7 @@ private void updateInit(org.duracloud.appconfig.domain.DuradminConfig config)\n init.setDuraStorePort(config.getDurastorePort());\n init.setDuraStoreContext(config.getDurastoreContext());\n init.setAmaUrl(config.getAmaUrl());\n- init.setDuraReportContext(config.getDurareportContext());\n+ init.setDuraBossContext(config.getDurabossContext());\n \n DuradminConfig.setConfig(init);\n ", "raw_url": "https://github.com/duracloud/duracloud/raw/02668af08bebc5266b321ab1df2f45dfe656c813/duradmin%2Fsrc%2Fmain%2Fjava%2Forg%2Fduracloud%2Fduradmin%2Fcontrol%2FInitController.java", "sha": "b314af0565e058cf55049aed13c05a4c18e67ef8", "status": "modified" }, { "additions": 5, "blob_url": "https://github.com/duracloud/duracloud/blob/02668af08bebc5266b321ab1df2f45dfe656c813/duradmin%2Fsrc%2Fmain%2Fjava%2Forg%2Fduracloud%2Fduradmin%2Fdomain%2FAdminInit.java", "changes": 10, "contents_url": "https://api.github.com/repos/duracloud/duracloud/contents/duradmin%2Fsrc%2Fmain%2Fjava%2Forg%2Fduracloud%2Fduradmin%2Fdomain%2FAdminInit.java?ref=02668af08bebc5266b321ab1df2f45dfe656c813", "deletions": 5, "filename": "duradmin/src/main/java/org/duracloud/duradmin/domain/AdminInit.java", "new_code": " private String duraBossContext;\n public void setDuraBossContext(String durabossContext) {\n this.duraBossContext = durabossContext;\n public String getDuraBossContext() {\n return duraBossContext;", "new_methods": [], "old_code": " private String duraReportContext;\n public void setDuraReportContext(String durareportContext) {\n this.duraReportContext = durareportContext;\n public String getDuraReportContext() {\n return duraReportContext;", "old_methods": [], "patch": "@@ -20,7 +20,7 @@ public class AdminInit {\n private String duraServicePort;\n private String duraServiceContext;\n private String amaUrl;\n- private String duraReportContext;\n+ private String duraBossContext;\n \n public String getDuraStoreHost() {\n return duraStoreHost;\n@@ -78,11 +78,11 @@ public void setAmaUrl(String amaUrl) {\n this.amaUrl = amaUrl;\n }\n \n- public void setDuraReportContext(String durareportContext) {\n- this.duraReportContext = durareportContext;\n+ public void setDuraBossContext(String durabossContext) {\n+ this.duraBossContext = durabossContext;\n }\n \n- public String getDuraReportContext() {\n- return duraReportContext;\n+ public String getDuraBossContext() {\n+ return duraBossContext;\n }\n }\n\\ No newline at end of file", "raw_url": "https://github.com/duracloud/duracloud/raw/02668af08bebc5266b321ab1df2f45dfe656c813/duradmin%2Fsrc%2Fmain%2Fjava%2Forg%2Fduracloud%2Fduradmin%2Fdomain%2FAdminInit.java", "sha": "a86141417fb1c4624933f55fa24b8b146d406f04", "status": "modified" }, { "additions": 3, "blob_url": "https://github.com/duracloud/duracloud/blob/02668af08bebc5266b321ab1df2f45dfe656c813/duradmin%2Fsrc%2Fmain%2Fjava%2Forg%2Fduracloud%2Fduradmin%2Freport%2FDuradminServiceReportManagerImpl.java", "changes": 6, "contents_url": "https://api.github.com/repos/duracloud/duracloud/contents/duradmin%2Fsrc%2Fmain%2Fjava%2Forg%2Fduracloud%2Fduradmin%2Freport%2FDuradminServiceReportManagerImpl.java?ref=02668af08bebc5266b321ab1df2f45dfe656c813", "deletions": 3, "filename": "duradmin/src/main/java/org/duracloud/duradmin/report/DuradminServiceReportManagerImpl.java", "new_code": " super(DuradminConfig.getDuraBossHost(),\n DuradminConfig.getDuraBossPort(),\n DuradminConfig.getDuraBossContext());", "new_methods": [], "old_code": " super(DuradminConfig.getDuraReportHost(),\n DuradminConfig.getDuraReportPort(),\n DuradminConfig.getDuraReportContext());", "old_methods": [], "patch": "@@ -18,9 +18,9 @@\n public class DuradminServiceReportManagerImpl extends ServiceReportManagerImpl{\n \n public DuradminServiceReportManagerImpl(){\n- super(DuradminConfig.getDuraReportHost(),\n- DuradminConfig.getDuraReportPort(),\n- DuradminConfig.getDuraReportContext());\n+ super(DuradminConfig.getDuraBossHost(),\n+ DuradminConfig.getDuraBossPort(),\n+ DuradminConfig.getDuraBossContext());\n }\n \n }", "raw_url": "https://github.com/duracloud/duracloud/raw/02668af08bebc5266b321ab1df2f45dfe656c813/duradmin%2Fsrc%2Fmain%2Fjava%2Forg%2Fduracloud%2Fduradmin%2Freport%2FDuradminServiceReportManagerImpl.java", "sha": "7ff47e0b0bebd458620ab279f3289c3c2e2a7bfd", "status": "modified" }, { "additions": 3, "blob_url": "https://github.com/duracloud/duracloud/blob/02668af08bebc5266b321ab1df2f45dfe656c813/duradmin%2Fsrc%2Fmain%2Fjava%2Forg%2Fduracloud%2Fduradmin%2Freport%2FDuradminStorageReportManagerImpl.java", "changes": 6, "contents_url": "https://api.github.com/repos/duracloud/duracloud/contents/duradmin%2Fsrc%2Fmain%2Fjava%2Forg%2Fduracloud%2Fduradmin%2Freport%2FDuradminStorageReportManagerImpl.java?ref=02668af08bebc5266b321ab1df2f45dfe656c813", "deletions": 3, "filename": "duradmin/src/main/java/org/duracloud/duradmin/report/DuradminStorageReportManagerImpl.java", "new_code": " super(DuradminConfig.getDuraBossHost(),\n DuradminConfig.getDuraBossPort(),\n DuradminConfig.getDuraBossContext());", "new_methods": [], "old_code": " super(DuradminConfig.getDuraReportHost(),\n DuradminConfig.getDuraReportPort(),\n DuradminConfig.getDuraReportContext());", "old_methods": [], "patch": "@@ -18,9 +18,9 @@\n public class DuradminStorageReportManagerImpl extends StorageReportManagerImpl{\n \n public DuradminStorageReportManagerImpl(){\n- super(DuradminConfig.getDuraReportHost(),\n- DuradminConfig.getDuraReportPort(),\n- DuradminConfig.getDuraReportContext());\n+ super(DuradminConfig.getDuraBossHost(),\n+ DuradminConfig.getDuraBossPort(),\n+ DuradminConfig.getDuraBossContext());\n }\n \n }", "raw_url": "https://github.com/duracloud/duracloud/raw/02668af08bebc5266b321ab1df2f45dfe656c813/duradmin%2Fsrc%2Fmain%2Fjava%2Forg%2Fduracloud%2Fduradmin%2Freport%2FDuradminStorageReportManagerImpl.java", "sha": "cdc306fa394a6d98191bbeca00dae6c621ac75fd", "status": "modified" }, { "additions": 2, "blob_url": "https://github.com/duracloud/duracloud/blob/02668af08bebc5266b321ab1df2f45dfe656c813/pom.xml", "changes": 3, "contents_url": "https://api.github.com/repos/duracloud/duracloud/contents/pom.xml?ref=02668af08bebc5266b321ab1df2f45dfe656c813", "deletions": 1, "filename": "pom.xml", "new_code": " <module>reporter</module>\n <module>duraboss</module>", "new_methods": [], "old_code": " <module>durareport</module>", "old_methods": [], "patch": "@@ -85,7 +85,8 @@\n <module>servicemonitor</module>\n <module>duraservice</module>\n <module>reportdata</module>\n- <module>durareport</module>\n+ <module>reporter</module>\n+ <module>duraboss</module>\n <module>reportclient</module>\n <module>app-config</module>\n <module>serviceclient</module>", "raw_url": "https://github.com/duracloud/duracloud/raw/02668af08bebc5266b321ab1df2f45dfe656c813/pom.xml", "sha": "f350a075f88cf1a46d0a7a83a3945b6b1b186aee", "status": "modified" }, { "additions": 3, "blob_url": "https://github.com/duracloud/duracloud/blob/02668af08bebc5266b321ab1df2f45dfe656c813/reportclient%2Fresources%2FExampleReportClient.java", "changes": 6, "contents_url": "https://api.github.com/repos/duracloud/duracloud/contents/reportclient%2Fresources%2FExampleReportClient.java?ref=02668af08bebc5266b321ab1df2f45dfe656c813", "deletions": 3, "filename": "reportclient/resources/ExampleReportClient.java", "new_code": " * Example code which connects to the DuraCloud DuraBoss reporting REST API\n * by using the ReportClient.\n private static final String CONTEXT = \"duraboss\";", "new_methods": [], "old_code": " * Example code which connects to the DuraCloud DuraReport REST API by using\n * the ReportClient.\n private static final String CONTEXT = \"durareport\";", "old_methods": [], "patch": "@@ -24,8 +24,8 @@\n import java.util.Map;\n \n /**\n- * Example code which connects to the DuraCloud DuraReport REST API by using\n- * the ReportClient.\n+ * Example code which connects to the DuraCloud DuraBoss reporting REST API\n+ * by using the ReportClient.\n *\n * @author Bill Branan\n * Date: 6/2/11\n@@ -36,7 +36,7 @@ public class ExampleReportClient {\n private static final String PASSWORD = \"upw\"; // replace as necessary\n private static final String HOST = \"localhost\"; // replace as necessary\n private static final String PORT = \"8080\"; // replace as necessary\n- private static final String CONTEXT = \"durareport\";\n+ private static final String CONTEXT = \"duraboss\";\n \n private StorageReportManager storageReportManager;\n private ServiceReportManager serviceReportManager;", "raw_url": "https://github.com/duracloud/duracloud/raw/02668af08bebc5266b321ab1df2f45dfe656c813/reportclient%2Fresources%2FExampleReportClient.java", "sha": "c5bd7f30ddcff2f19f31b18d224b0a904b5ef788", "status": "modified" }, { "additions": 3, "blob_url": "https://github.com/duracloud/duracloud/blob/02668af08bebc5266b321ab1df2f45dfe656c813/reportclient%2Fresources%2Freadme.txt", "changes": 6, "contents_url": "https://api.github.com/repos/duracloud/duracloud/contents/reportclient%2Fresources%2Freadme.txt?ref=02668af08bebc5266b321ab1df2f45dfe656c813", "deletions": 3, "filename": "reportclient/resources/readme.txt", "new_code": "reports is managed by the DuraBoss web application. DuraBoss\ncommunicating with DuraBoss report features, a Java client, called\nReportClient was written.", "new_methods": [], "old_code": "reports is managed by the DuraReport web application. DuraReport\ncommunicating with DuraReport, a Java client, called ReportClient\nwas written.", "old_methods": [], "patch": "@@ -4,11 +4,11 @@\n \n DuraCloud provides reporting over both storage and service functions\n which occur within the DuraCloud framework. The building of these\n-reports is managed by the DuraReport web application. DuraReport\n+reports is managed by the DuraBoss web application. DuraBoss\n is installed and running on your DuraCloud instance and can be\n accessed via a REST interface. In order to aid Java developers in\n-communicating with DuraReport, a Java client, called ReportClient\n-was written.\n+communicating with DuraBoss report features, a Java client, called\n+ReportClient was written.\n \n 2. Using ReportClient\n ", "raw_url": "https://github.com/duracloud/duracloud/raw/02668af08bebc5266b321ab1df2f45dfe656c813/reportclient%2Fresources%2Freadme.txt", "sha": "07ab8cc19e2a570ef2c5bc8381af4938e2f1302b", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/duracloud/duracloud/blob/02668af08bebc5266b321ab1df2f45dfe656c813/reportclient%2Fsrc%2Fmain%2Fjava%2Forg%2Fduracloud%2Fclient%2Freport%2FBaseReportManager.java", "changes": 2, "contents_url": "https://api.github.com/repos/duracloud/duracloud/contents/reportclient%2Fsrc%2Fmain%2Fjava%2Forg%2Fduracloud%2Fclient%2Freport%2FBaseReportManager.java?ref=02668af08bebc5266b321ab1df2f45dfe656c813", "deletions": 1, "filename": "reportclient/src/main/java/org/duracloud/client/report/BaseReportManager.java", "new_code": " private static final String DEFAULT_CONTEXT = \"duraboss\";\r", "new_methods": [], "old_code": " private static final String DEFAULT_CONTEXT = \"durareport\";\r", "old_methods": [], "patch": "@@ -25,7 +25,7 @@ public abstract class BaseReportManager implements Securable {\n \r\n protected RestHttpHelper restHelper;\r\n \r\n- private static final String DEFAULT_CONTEXT = \"durareport\";\r\n+ private static final String DEFAULT_CONTEXT = \"duraboss\";\r\n private String baseURL = null;\r\n \r\n public BaseReportManager(String host, String port) {\r", "raw_url": "https://github.com/duracloud/duracloud/raw/02668af08bebc5266b321ab1df2f45dfe656c813/reportclient%2Fsrc%2Fmain%2Fjava%2Forg%2Fduracloud%2Fclient%2Freport%2FBaseReportManager.java", "sha": "70553369b0c83e7fa2824a117ba2e01eb128ca93", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/duracloud/duracloud/blob/02668af08bebc5266b321ab1df2f45dfe656c813/reportclient%2Fsrc%2Fmain%2Fjava%2Forg%2Fduracloud%2Fclient%2Freport%2FServiceReportManagerImpl.java", "changes": 2, "contents_url": "https://api.github.com/repos/duracloud/duracloud/contents/reportclient%2Fsrc%2Fmain%2Fjava%2Forg%2Fduracloud%2Fclient%2Freport%2FServiceReportManagerImpl.java?ref=02668af08bebc5266b321ab1df2f45dfe656c813", "deletions": 1, "filename": "reportclient/src/main/java/org/duracloud/client/report/ServiceReportManagerImpl.java", "new_code": " String storageReport = \"report/service\";\r", "new_methods": [], "old_code": " String storageReport = \"servicereport\";\r", "old_methods": [], "patch": "@@ -35,7 +35,7 @@ public ServiceReportManagerImpl(String host, String port, String context) {\n }\r\n \r\n private String buildURL(String relativeURL) {\r\n- String storageReport = \"servicereport\";\r\n+ String storageReport = \"report/service\";\r\n if (null == relativeURL) {\r\n return getBaseURL() + \"/\" + storageReport;\r\n }\r", "raw_url": "https://github.com/duracloud/duracloud/raw/02668af08bebc5266b321ab1df2f45dfe656c813/reportclient%2Fsrc%2Fmain%2Fjava%2Forg%2Fduracloud%2Fclient%2Freport%2FServiceReportManagerImpl.java", "sha": "6b14fd06a4d262fd61a380fde31139f6db241472", "status": "modified" }, { "additions": 2, "blob_url": "https://github.com/duracloud/duracloud/blob/02668af08bebc5266b321ab1df2f45dfe656c813/reportclient%2Fsrc%2Fmain%2Fjava%2Forg%2Fduracloud%2Fclient%2Freport%2FStorageReportManager.java", "changes": 4, "contents_url": "https://api.github.com/repos/duracloud/duracloud/contents/reportclient%2Fsrc%2Fmain%2Fjava%2Forg%2Fduracloud%2Fclient%2Freport%2FStorageReportManager.java?ref=02668af08bebc5266b321ab1df2f45dfe656c813", "deletions": 2, "filename": "reportclient/src/main/java/org/duracloud/client/report/StorageReportManager.java", "new_code": " * Allows for communication with DuraBoss reporting\r\n * Tells DuraBoss reporting to start running a new storage report generation\r", "new_methods": [], "old_code": " * Allows for communication with DuraReport\r\n * Tells DuraReport to start running a new storage report generation\r", "old_methods": [], "patch": "@@ -17,7 +17,7 @@\n import java.util.List;\r\n \r\n /**\r\n- * Allows for communication with DuraReport\r\n+ * Allows for communication with DuraBoss reporting\r\n *\r\n * @author: Bill Branan\r\n * Date: 6/2/11\r\n@@ -66,7 +66,7 @@ public StorageReportInfo getStorageReportInfo()\n throws ReportException;\r\n \r\n /**\r\n- * Tells DuraReport to start running a new storage report generation\r\n+ * Tells DuraBoss reporting to start running a new storage report generation\r\n * process. If a report generation process is already underway, this\r\n * call is ignored.\r\n *\r", "raw_url": "https://github.com/duracloud/duracloud/raw/02668af08bebc5266b321ab1df2f45dfe656c813/reportclient%2Fsrc%2Fmain%2Fjava%2Forg%2Fduracloud%2Fclient%2Freport%2FStorageReportManager.java", "sha": "a9f44d9737b9b6944eb27685e4b2f6b623cfc2d4", "status": "modified" }, { "additions": 2, "blob_url": "https://github.com/duracloud/duracloud/blob/02668af08bebc5266b321ab1df2f45dfe656c813/reportclient%2Fsrc%2Fmain%2Fjava%2Forg%2Fduracloud%2Fclient%2Freport%2FStorageReportManagerImpl.java", "changes": 4, "contents_url": "https://api.github.com/repos/duracloud/duracloud/contents/reportclient%2Fsrc%2Fmain%2Fjava%2Forg%2Fduracloud%2Fclient%2Freport%2FStorageReportManagerImpl.java?ref=02668af08bebc5266b321ab1df2f45dfe656c813", "deletions": 2, "filename": "reportclient/src/main/java/org/duracloud/client/report/StorageReportManagerImpl.java", "new_code": " * Allows for communication with Duraboss reporting\r\n String storageReport = \"report/storage\";\r", "new_methods": [], "old_code": " * Allows for communication with DuraReport\r\n String storageReport = \"storagereport\";\r", "old_methods": [], "patch": "@@ -24,7 +24,7 @@\n import java.util.List;\r\n \r\n /**\r\n- * Allows for communication with DuraReport\r\n+ * Allows for communication with Duraboss reporting\r\n *\r\n * @author: Bill Branan\r\n * Date: 6/2/11\r\n@@ -40,7 +40,7 @@ public StorageReportManagerImpl(String host, String port, String context) {\n }\r\n \r\n private String buildURL(String relativeURL) {\r\n- String storageReport = \"storagereport\";\r\n+ String storageReport = \"report/storage\";\r\n if (null == relativeURL) {\r\n return getBaseURL() + \"/\" + storageReport;\r\n }\r", "raw_url": "https://github.com/duracloud/duracloud/raw/02668af08bebc5266b321ab1df2f45dfe656c813/reportclient%2Fsrc%2Fmain%2Fjava%2Forg%2Fduracloud%2Fclient%2Freport%2FStorageReportManagerImpl.java", "sha": "3a936136e1ba36cd9fcd2e7f6377777d60580fd4", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/duracloud/duracloud/blob/02668af08bebc5266b321ab1df2f45dfe656c813/reportclient%2Fsrc%2Ftest%2Fjava%2Forg%2Fduracloud%2Fclient%2Freport%2FServiceReportManagerImplTest.java", "changes": 2, "contents_url": "https://api.github.com/repos/duracloud/duracloud/contents/reportclient%2Fsrc%2Ftest%2Fjava%2Forg%2Fduracloud%2Fclient%2Freport%2FServiceReportManagerImplTest.java?ref=02668af08bebc5266b321ab1df2f45dfe656c813", "deletions": 1, "filename": "reportclient/src/test/java/org/duracloud/client/report/ServiceReportManagerImplTest.java", "new_code": " return baseUrl + \"/report/service\";\r", "new_methods": [], "old_code": " return baseUrl + \"/servicereport\";\r", "old_methods": [], "patch": "@@ -47,7 +47,7 @@ public void setup() {\n }\r\n \r\n private String getBaseUrl() {\r\n- return baseUrl + \"/servicereport\";\r\n+ return baseUrl + \"/report/service\";\r\n }\r\n \r\n @Test\r", "raw_url": "https://github.com/duracloud/duracloud/raw/02668af08bebc5266b321ab1df2f45dfe656c813/reportclient%2Fsrc%2Ftest%2Fjava%2Forg%2Fduracloud%2Fclient%2Freport%2FServiceReportManagerImplTest.java", "sha": "068d5ca2333438ea673b4ed1f84fd4accbebbca3", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/duracloud/duracloud/blob/02668af08bebc5266b321ab1df2f45dfe656c813/reportclient%2Fsrc%2Ftest%2Fjava%2Forg%2Fduracloud%2Fclient%2Freport%2FStorageReportManagerImplTest.java", "changes": 2, "contents_url": "https://api.github.com/repos/duracloud/duracloud/contents/reportclient%2Fsrc%2Ftest%2Fjava%2Forg%2Fduracloud%2Fclient%2Freport%2FStorageReportManagerImplTest.java?ref=02668af08bebc5266b321ab1df2f45dfe656c813", "deletions": 1, "filename": "reportclient/src/test/java/org/duracloud/client/report/StorageReportManagerImplTest.java", "new_code": " return baseUrl + \"/report/storage\";\r", "new_methods": [], "old_code": " return baseUrl + \"/storagereport\";\r", "old_methods": [], "patch": "@@ -46,7 +46,7 @@ public void setup() {\n }\r\n \r\n private String getBaseUrl() {\r\n- return baseUrl + \"/storagereport\";\r\n+ return baseUrl + \"/report/storage\";\r\n }\r\n \r\n @Test\r", "raw_url": "https://github.com/duracloud/duracloud/raw/02668af08bebc5266b321ab1df2f45dfe656c813/reportclient%2Fsrc%2Ftest%2Fjava%2Forg%2Fduracloud%2Fclient%2Freport%2FStorageReportManagerImplTest.java", "sha": "63081cfcc6809ae69ec543844b3da8d560b24794", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/duracloud/duracloud/blob/02668af08bebc5266b321ab1df2f45dfe656c813/resources%2Freadme.txt", "changes": 2, "contents_url": "https://api.github.com/repos/duracloud/duracloud/contents/resources%2Freadme.txt?ref=02668af08bebc5266b321ab1df2f45dfe656c813", "deletions": 1, "filename": "resources/readme.txt", "new_code": "-- duraboss.war", "new_methods": [], "old_code": "-- durareport.war", "old_methods": [], "patch": "@@ -6,7 +6,7 @@ This package should include the following:\n a. war files\n -- durastore.war\n -- duraservice.war\n--- durareport.war\n+-- duraboss.war\n -- duradmin.war\n \n b. services", "raw_url": "https://github.com/duracloud/duracloud/raw/02668af08bebc5266b321ab1df2f45dfe656c813/resources%2Freadme.txt", "sha": "b87a442ab3eb759516a1e6dfa06b701db41fdedf", "status": "modified" } ]
22
[ { "name": "duracloud$duracloud", "new_args": "", "new_implementation": "return null != durabossHost && null != durabossPort &&\n null != durabossContext;", "new_return_type": "boolean", "new_signature": "boolean durabossEndpointLoad()", "old_args": "", "old_implementation": "return null != durareportHost && null != durareportPort &&\n null != durareportContext;", "old_return_type": "boolean", "old_signature": "boolean durareportEndpointLoad()" } ]
1
13
02e22b24a77665fb2eab634322ed84dc4b41f9dd
[ { "name": "nimbusproject$nimbus", "new_args": "String cmpName", "new_implementation": null, "new_return_type": "String", "new_signature": "String getInstancePublicNetwork(String cmpName)", "old_args": "String cmpName", "old_implementation": null, "old_return_type": "String", "old_signature": "String getInstanceNetwork(String cmpName)" }, { "name": "nimbusproject$nimbus", "new_args": "", "new_implementation": null, "new_return_type": "String", "new_signature": "String getCustomPublicNetwork()", "old_args": "", "old_implementation": null, "old_return_type": "String", "old_signature": "String getCustomNetwork()" }, { "name": "nimbusproject$nimbus", "new_args": "", "new_implementation": null, "new_return_type": "String", "new_signature": "String getLargePublicNetwork()", "old_args": "", "old_implementation": null, "old_return_type": "String", "old_signature": "String getLargeNetwork()" }, { "name": "nimbusproject$nimbus", "new_args": "", "new_implementation": null, "new_return_type": "String", "new_signature": "String getPublicNetwork()", "old_args": "", "old_implementation": null, "old_return_type": "String", "old_signature": "String getNetwork()" }, { "name": "nimbusproject$nimbus", "new_args": "", "new_implementation": null, "new_return_type": "String", "new_signature": "String getSmallPublicNetwork()", "old_args": "", "old_implementation": null, "old_return_type": "String", "old_signature": "String getSmallNetwork()" }, { "name": "nimbusproject$nimbus", "new_args": "", "new_implementation": null, "new_return_type": "String", "new_signature": "String getXlargePublicNetwork()", "old_args": "", "old_implementation": null, "old_return_type": "String", "old_signature": "String getXlargeNetwork()" }, { "name": "nimbusproject$nimbus", "new_args": "String customPublicNetwork", "new_implementation": null, "new_return_type": "void", "new_signature": "void setCustomPublicNetwork(String customPublicNetwork)", "old_args": "String customNetwork", "old_implementation": null, "old_return_type": "void", "old_signature": "void setCustomNetwork(String customNetwork)" }, { "name": "nimbusproject$nimbus", "new_args": "String largePublicNetwork", "new_implementation": null, "new_return_type": "void", "new_signature": "void setLargePublicNetwork(String largePublicNetwork)", "old_args": "String largeNetwork", "old_implementation": null, "old_return_type": "void", "old_signature": "void setLargeNetwork(String largeNetwork)" }, { "name": "nimbusproject$nimbus", "new_args": "String publicNetwork", "new_implementation": null, "new_return_type": "void", "new_signature": "void setPublicNetwork(String publicNetwork)", "old_args": "String network", "old_implementation": null, "old_return_type": "void", "old_signature": "void setNetwork(String network)" }, { "name": "nimbusproject$nimbus", "new_args": "String smallPublicNetwork", "new_implementation": "this.smallPublicNetwork = smallPublicNetwork;\n public void setSmallPrivateNetwork(String smallPrivateNetwork) {\n this.smallPrivateNetwork = smallPrivateNetwork;\n public void setCustomPublicNetwork(String customPublicNetwork) {\n this.customPublicNetwork = customPublicNetwork;\n public void setCustomPrivateNetwork(String customPrivateNetwork) {\n this.customPrivateNetwork = customPrivateNetwork;", "new_return_type": "void", "new_signature": "void setSmallPublicNetwork(String smallPublicNetwork)", "old_args": "String smallNetwork", "old_implementation": "this.smallNetwork = smallNetwork;\n public void setCustomNetwork(String customNetwork) {\n this.customNetwork = customNetwork;\n public void setLargeNetwork(String largeNetwork) {\n this.largeNetwork = largeNetwork;\n public void setXlargeNetwork(String xlargeNetwork) {\n this.xlargeNetwork = xlargeNetwork;\n public String getSmallNetwork() {\n return this.smallNetwork;\n public String getCustomNetwork() {\n return this.customNetwork;\n public String getLargeNetwork() {\n return this.largeNetwork;\n public String getXlargeNetwork() {\n return this.xlargeNetwork;\n protected String getMatchingName(int memory, int cpus, String network) {\n if (this.smallMemory == memory && this.smallCPUs == cpus && this.smallNetwork.equals(network)) {", "old_return_type": "void", "old_signature": "void setSmallNetwork(String smallNetwork)" }, { "name": "nimbusproject$nimbus", "new_args": "String xlargePublicNetwork", "new_implementation": null, "new_return_type": "void", "new_signature": "void setXlargePublicNetwork(String xlargePublicNetwork)", "old_args": "String xlargeNetwork", "old_implementation": null, "old_return_type": "void", "old_signature": "void setXlargeNetwork(String xlargeNetwork)" } ]
[ { "additions": 13, "blob_url": "https://github.com/nimbusproject/nimbus/blob/02e22b24a77665fb2eab634322ed84dc4b41f9dd/messaging%2Fgt4.0-elastic%2Fjava%2Fmsgbridge%2Fetc%2Felastic%2Felastic.conf", "changes": 18, "contents_url": "https://api.github.com/repos/nimbusproject/nimbus/contents/messaging%2Fgt4.0-elastic%2Fjava%2Fmsgbridge%2Fetc%2Felastic%2Felastic.conf?ref=02e22b24a77665fb2eab634322ed84dc4b41f9dd", "deletions": 5, "filename": "messaging/gt4.0-elastic/java/msgbridge/etc/elastic/elastic.conf", "new_code": "# The following two settings are the default for all instances\n\n# The following settings allow to override default setting per instance\n# The defaults are used if left blank\n\nnetwork.public.small=\nnetwork.private.small=\nnetwork.public.large=\nnetwork.private.large=\nnetwork.public.xlarge=\nnetwork.private.xlarge=\nnetwork.public.custom=private\nnetwork.private.custom=private", "new_methods": [], "old_code": "network.small=\nnetwork.large=\nnetwork.xlarge=\nnetwork.custom=private\n", "old_methods": [], "patch": "@@ -19,21 +19,29 @@ cpus.large=2\n cpus.xlarge=4\n cpus.custom=1\n \n-network.small=\n-network.large=\n-network.xlarge=\n-network.custom=private\n-\n # There is a concept of \"public\" and \"private\" networks built into the elastic\n # interface. You need to map these to the real networks to request from the\n # underlying resource manager (workspace service).\n #\n # They can be the same value which will trigger one real NIC request. If they\n # are different network names, two real NIC requests will be made.\n \n+# The following two settings are the default for all instances\n+\n net.public=public\n net.private=private\n \n+# The following settings allow to override default setting per instance\n+# The defaults are used if left blank\n+\n+network.public.small=\n+network.private.small=\n+network.public.large=\n+network.private.large=\n+network.public.xlarge=\n+network.private.xlarge=\n+network.public.custom=private\n+network.private.custom=private\n \n # The default VMM to request from the underlying manager is x86+Xen3, see the\n # \"elastic/other/other-elastic.conf\" to change this.", "raw_url": "https://github.com/nimbusproject/nimbus/raw/02e22b24a77665fb2eab634322ed84dc4b41f9dd/messaging%2Fgt4.0-elastic%2Fjava%2Fmsgbridge%2Fetc%2Felastic%2Felastic.conf", "sha": "75f7dee80731e5e47258e10faee4f6f030a94617", "status": "modified" }, { "additions": 8, "blob_url": "https://github.com/nimbusproject/nimbus/blob/02e22b24a77665fb2eab634322ed84dc4b41f9dd/messaging%2Fgt4.0-elastic%2Fjava%2Fmsgbridge%2Fetc%2Felastic%2Fother%2Fmain.xml", "changes": 12, "contents_url": "https://api.github.com/repos/nimbusproject/nimbus/contents/messaging%2Fgt4.0-elastic%2Fjava%2Fmsgbridge%2Fetc%2Felastic%2Fother%2Fmain.xml?ref=02e22b24a77665fb2eab634322ed84dc4b41f9dd", "deletions": 4, "filename": "messaging/gt4.0-elastic/java/msgbridge/etc/elastic/other/main.xml", "new_code": " <property name=\"smallPublicNetwork\" value=\"$ELASTIC{network.public.small}\" />\n <property name=\"smallPrivateNetwork\" value=\"$ELASTIC{network.private.small}\" />\n <property name=\"largePublicNetwork\" value=\"$ELASTIC{network.public.large}\" />\n <property name=\"largePrivateNetwork\" value=\"$ELASTIC{network.private.large}\" />\n <property name=\"xlargePublicNetwork\" value=\"$ELASTIC{network.public.xlarge}\" />\n <property name=\"xlargePrivateNetwork\" value=\"$ELASTIC{network.private.xlarge}\" />\n <property name=\"customPublicNetwork\" value=\"$ELASTIC{network.public.custom}\" />\n <property name=\"customPrivateNetwork\" value=\"$ELASTIC{network.private.custom}\" />", "new_methods": [], "old_code": " <property name=\"smallNetwork\" value=\"$ELASTIC{network.small}\" />\n <property name=\"largeNetwork\" value=\"$ELASTIC{network.large}\" />\n <property name=\"xlargeNetwork\" value=\"$ELASTIC{network.xlarge}\" />\n <property name=\"customNetwork\" value=\"$ELASTIC{network.custom}\" />", "old_methods": [], "patch": "@@ -142,10 +142,14 @@\n \n <constructor-arg ref=\"nimbus-elastic.rm.modulelocator\" />\n \n- <property name=\"smallNetwork\" value=\"$ELASTIC{network.small}\" />\n- <property name=\"largeNetwork\" value=\"$ELASTIC{network.large}\" />\n- <property name=\"xlargeNetwork\" value=\"$ELASTIC{network.xlarge}\" />\n- <property name=\"customNetwork\" value=\"$ELASTIC{network.custom}\" />\n+ <property name=\"smallPublicNetwork\" value=\"$ELASTIC{network.public.small}\" />\n+ <property name=\"smallPrivateNetwork\" value=\"$ELASTIC{network.private.small}\" />\n+ <property name=\"largePublicNetwork\" value=\"$ELASTIC{network.public.large}\" />\n+ <property name=\"largePrivateNetwork\" value=\"$ELASTIC{network.private.large}\" />\n+ <property name=\"xlargePublicNetwork\" value=\"$ELASTIC{network.public.xlarge}\" />\n+ <property name=\"xlargePrivateNetwork\" value=\"$ELASTIC{network.private.xlarge}\" />\n+ <property name=\"customPublicNetwork\" value=\"$ELASTIC{network.public.custom}\" />\n+ <property name=\"customPrivateNetwork\" value=\"$ELASTIC{network.private.custom}\" />\n \n <property name=\"smallMemory\" value=\"$ELASTIC{memory.small}\" /> \n <property name=\"largeMemory\" value=\"$ELASTIC{memory.large}\" />", "raw_url": "https://github.com/nimbusproject/nimbus/raw/02e22b24a77665fb2eab634322ed84dc4b41f9dd/messaging%2Fgt4.0-elastic%2Fjava%2Fmsgbridge%2Fetc%2Felastic%2Fother%2Fmain.xml", "sha": "e4c7fa8e7a189041cb1f6dc5ae528099696b99b2", "status": "modified" }, { "additions": 93, "blob_url": "https://github.com/nimbusproject/nimbus/blob/02e22b24a77665fb2eab634322ed84dc4b41f9dd/messaging%2Fgt4.0-elastic%2Fjava%2Fmsgbridge%2Fsrc%2Forg%2Fnimbustools%2Fmessaging%2Fgt4_0_elastic%2Fv2008_05_05%2Fgeneral%2Fdefaults%2FDefaultResourceAllocations.java", "changes": 129, "contents_url": "https://api.github.com/repos/nimbusproject/nimbus/contents/messaging%2Fgt4.0-elastic%2Fjava%2Fmsgbridge%2Fsrc%2Forg%2Fnimbustools%2Fmessaging%2Fgt4_0_elastic%2Fv2008_05_05%2Fgeneral%2Fdefaults%2FDefaultResourceAllocations.java?ref=02e22b24a77665fb2eab634322ed84dc4b41f9dd", "deletions": 36, "filename": "messaging/gt4.0-elastic/java/msgbridge/src/org/nimbustools/messaging/gt4_0_elastic/v2008_05_05/general/defaults/DefaultResourceAllocations.java", "new_code": " protected String smallPublicNetwork = null;\n protected String smallPrivateNetwork = null;\n protected String largePublicNetwork = null;\n protected String largePrivateNetwork = null;\n protected String xlargePublicNetwork = null;\n protected String xlargePrivateNetwork = null;\n protected String customPublicNetwork = null;\n protected String customPrivateNetwork = null;\n public void setSmallPublicNetwork(String smallPublicNetwork) {\n this.smallPublicNetwork = smallPublicNetwork;\n public void setSmallPrivateNetwork(String smallPrivateNetwork) {\n this.smallPrivateNetwork = smallPrivateNetwork;\n public void setCustomPublicNetwork(String customPublicNetwork) {\n this.customPublicNetwork = customPublicNetwork;\n public void setCustomPrivateNetwork(String customPrivateNetwork) {\n this.customPrivateNetwork = customPrivateNetwork;\n }\n\n public void setLargePublicNetwork(String largePublicNetwork) {\n this.largePublicNetwork = largePublicNetwork;\n }\n\n public void setLargePrivateNetwork(String largePrivateNetwork) {\n this.largePrivateNetwork = largePrivateNetwork;\n }\n\n public void setXlargePublicNetwork(String xlargePublicNetwork) {\n this.xlargePublicNetwork = xlargePublicNetwork;\n }\n\n public void setXlargePrivateNetwork(String xlargePrivateNetwork) {\n this.xlargePrivateNetwork = xlargePrivateNetwork;\n public String getSmallPublicNetwork() {\n return this.smallPublicNetwork;\n }\n\n public String getSmallPrivateNetwork() {\n return this.smallPrivateNetwork;\n }\n\n public String getCustomPublicNetwork() {\n return this.customPublicNetwork;\n }\n\n public String getCustomPrivateNetwork() {\n return this.customPrivateNetwork;\n public String getLargePublicNetwork() {\n return this.largePublicNetwork;\n public String getLargePrivateNetwork() {\n return this.largePrivateNetwork;\n public String getXlargePublicNetwork() {\n return this.xlargePublicNetwork;\n }\n\n public String getXlargePrivateNetwork() {\n return this.xlargePrivateNetwork;\n protected String getMatchingName(int memory, int cpus, String publicNetwork, String privateNetwork) {\n if (this.smallMemory == memory && this.smallCPUs == cpus && this.smallPublicNetwork.equals(publicNetwork) && this.smallPrivateNetwork.equals(privateNetwork)) {\n } else if (this.largeMemory == memory && this.largeCPUs == cpus && this.largePublicNetwork.equals(publicNetwork) && this.largePrivateNetwork.equals(privateNetwork)) {\n } else if (this.xlargeMemory == memory && this.xlargeCPUs == cpus && this.xlargePublicNetwork.equals(publicNetwork) && this.xlargePrivateNetwork.equals(privateNetwork)) {\n } else if (this.customMemory == memory && this.customCPUs == cpus && this.customPublicNetwork.equals(publicNetwork) && this.customPrivateNetwork.equals(privateNetwork)) {\n String publicNetwork = ra.getPublicNetwork();\n if (publicNetwork == null) {\n publicNetwork = \"\";\n }\n String privateNetwork = ra.getPrivateNetwork();\n if (privateNetwork == null) {\n privateNetwork = \"\";\n return this.getMatchingName(ra.getMemory(), ra.getIndCpuCount(), publicNetwork, privateNetwork);\n String publicNetwork = getInstancePublicNetwork(cmpName);\n String privateNetwork = getInstancePrivateNetwork(cmpName);\n ra.setPublicNetwork(publicNetwork);\n ra.setPrivateNetwork(privateNetwork);\n protected String getInstancePublicNetwork(final String cmpName)\n return this.smallPublicNetwork;\n return this.largePublicNetwork;\n return this.xlargePublicNetwork;\n return this.customPublicNetwork;\n protected String getInstancePrivateNetwork(final String cmpName)\n throws CannotTranslateException {\n if (cmpName.equals(this.getSmallName())) {\n return this.smallPrivateNetwork;\n } else if (cmpName.equals(this.getLargeName())) {\n return this.largePrivateNetwork;\n } else if (cmpName.equals(this.getXlargeName())) {\n return this.xlargePrivateNetwork;\n } else if (cmpName.equals(this.getCustomName())) {\n return this.customPrivateNetwork;\n } else {\n throw new CannotTranslateException(\n \"Unknown instance type '\" + cmpName + \"'\");\n }\n }", "new_methods": [ { "arguments": [ "String smallPublicNetwork" ], "filename": "messaging/gt4.0-elastic/java/msgbridge/src/org/nimbustools/messaging/gt4_0_elastic/v2008_05_05/general/defaults/DefaultResourceAllocations.java", "implementation": "this.smallPublicNetwork = smallPublicNetwork;\n public void setSmallPrivateNetwork(String smallPrivateNetwork) {\n this.smallPrivateNetwork = smallPrivateNetwork;\n public void setCustomPublicNetwork(String customPublicNetwork) {\n this.customPublicNetwork = customPublicNetwork;\n public void setCustomPrivateNetwork(String customPrivateNetwork) {\n this.customPrivateNetwork = customPrivateNetwork;", "signature": "void setSmallPublicNetwork(String smallPublicNetwork)" }, { "arguments": [ "String largePublicNetwork" ], "filename": "messaging/gt4.0-elastic/java/msgbridge/src/org/nimbustools/messaging/gt4_0_elastic/v2008_05_05/general/defaults/DefaultResourceAllocations.java", "implementation": "this.largePublicNetwork = largePublicNetwork;", "signature": "void setLargePublicNetwork(String largePublicNetwork)" }, { "arguments": [ "String largePrivateNetwork" ], "filename": "messaging/gt4.0-elastic/java/msgbridge/src/org/nimbustools/messaging/gt4_0_elastic/v2008_05_05/general/defaults/DefaultResourceAllocations.java", "implementation": "this.largePrivateNetwork = largePrivateNetwork;", "signature": "void setLargePrivateNetwork(String largePrivateNetwork)" }, { "arguments": [ "String xlargePublicNetwork" ], "filename": "messaging/gt4.0-elastic/java/msgbridge/src/org/nimbustools/messaging/gt4_0_elastic/v2008_05_05/general/defaults/DefaultResourceAllocations.java", "implementation": "this.xlargePublicNetwork = xlargePublicNetwork;", "signature": "void setXlargePublicNetwork(String xlargePublicNetwork)" }, { "arguments": [ "String xlargePrivateNetwork" ], "filename": "messaging/gt4.0-elastic/java/msgbridge/src/org/nimbustools/messaging/gt4_0_elastic/v2008_05_05/general/defaults/DefaultResourceAllocations.java", "implementation": "this.xlargePrivateNetwork = xlargePrivateNetwork;\n public String getSmallPublicNetwork() {\n return this.smallPublicNetwork;", "signature": "void setXlargePrivateNetwork(String xlargePrivateNetwork)" }, { "arguments": [], "filename": "messaging/gt4.0-elastic/java/msgbridge/src/org/nimbustools/messaging/gt4_0_elastic/v2008_05_05/general/defaults/DefaultResourceAllocations.java", "implementation": "return this.smallPrivateNetwork;", "signature": "String getSmallPrivateNetwork()" }, { "arguments": [], "filename": "messaging/gt4.0-elastic/java/msgbridge/src/org/nimbustools/messaging/gt4_0_elastic/v2008_05_05/general/defaults/DefaultResourceAllocations.java", "implementation": "return this.customPublicNetwork;", "signature": "String getCustomPublicNetwork()" }, { "arguments": [], "filename": "messaging/gt4.0-elastic/java/msgbridge/src/org/nimbustools/messaging/gt4_0_elastic/v2008_05_05/general/defaults/DefaultResourceAllocations.java", "implementation": "return this.customPrivateNetwork;\n public String getLargePublicNetwork() {\n return this.largePublicNetwork;\n public String getLargePrivateNetwork() {\n return this.largePrivateNetwork;\n public String getXlargePublicNetwork() {\n return this.xlargePublicNetwork;", "signature": "String getCustomPrivateNetwork()" }, { "arguments": [], "filename": "messaging/gt4.0-elastic/java/msgbridge/src/org/nimbustools/messaging/gt4_0_elastic/v2008_05_05/general/defaults/DefaultResourceAllocations.java", "implementation": "return this.xlargePrivateNetwork;\n protected String getMatchingName(int memory, int cpus, String publicNetwork, String privateNetwork) {\n if (this.smallMemory == memory && this.smallCPUs == cpus && this.smallPublicNetwork.equals(publicNetwork) && this.smallPrivateNetwork.equals(privateNetwork)) {", "signature": "String getXlargePrivateNetwork()" } ], "old_code": " protected String smallNetwork = null;\n protected String largeNetwork = null;\n protected String xlargeNetwork = null;\n protected String customNetwork = null;\n public void setSmallNetwork(String smallNetwork) {\n this.smallNetwork = smallNetwork;\n public void setCustomNetwork(String customNetwork) {\n this.customNetwork = customNetwork;\n public void setLargeNetwork(String largeNetwork) {\n this.largeNetwork = largeNetwork;\n public void setXlargeNetwork(String xlargeNetwork) {\n this.xlargeNetwork = xlargeNetwork;\n public String getSmallNetwork() {\n return this.smallNetwork;\n public String getCustomNetwork() {\n return this.customNetwork;\n public String getLargeNetwork() {\n return this.largeNetwork;\n public String getXlargeNetwork() {\n return this.xlargeNetwork;\n protected String getMatchingName(int memory, int cpus, String network) {\n if (this.smallMemory == memory && this.smallCPUs == cpus && this.smallNetwork.equals(network)) {\n } else if (this.largeMemory == memory && this.largeCPUs == cpus && this.largeNetwork.equals(network)) {\n } else if (this.xlargeMemory == memory && this.xlargeCPUs == cpus && this.xlargeNetwork.equals(network)) {\n } else if (this.customMemory == memory && this.customCPUs == cpus && this.customNetwork.equals(network)) {\n String network = ra.getNetwork();\n if (network == null) {\n network = \"\";\n return this.getMatchingName(ra.getMemory(), ra.getIndCpuCount(), network);\n String network = getInstanceNetwork(cmpName);\n ra.setNetwork(network);\n protected String getInstanceNetwork(final String cmpName)\n return this.smallNetwork;\n return this.largeNetwork;\n return this.xlargeNetwork;\n return this.customNetwork;", "old_methods": [ { "arguments": [ "String smallNetwork" ], "filename": "messaging/gt4.0-elastic/java/msgbridge/src/org/nimbustools/messaging/gt4_0_elastic/v2008_05_05/general/defaults/DefaultResourceAllocations.java", "implementation": "this.smallNetwork = smallNetwork;\n public void setCustomNetwork(String customNetwork) {\n this.customNetwork = customNetwork;\n public void setLargeNetwork(String largeNetwork) {\n this.largeNetwork = largeNetwork;\n public void setXlargeNetwork(String xlargeNetwork) {\n this.xlargeNetwork = xlargeNetwork;\n public String getSmallNetwork() {\n return this.smallNetwork;\n public String getCustomNetwork() {\n return this.customNetwork;\n public String getLargeNetwork() {\n return this.largeNetwork;\n public String getXlargeNetwork() {\n return this.xlargeNetwork;\n protected String getMatchingName(int memory, int cpus, String network) {\n if (this.smallMemory == memory && this.smallCPUs == cpus && this.smallNetwork.equals(network)) {", "signature": "void setSmallNetwork(String smallNetwork)" } ], "patch": "@@ -62,10 +62,14 @@ public class DefaultResourceAllocations implements ResourceAllocations {\n protected String xlargeName;\n protected String customName;\n \n- protected String smallNetwork = null;\n- protected String largeNetwork = null;\n- protected String xlargeNetwork = null;\n- protected String customNetwork = null;\n+ protected String smallPublicNetwork = null;\n+ protected String smallPrivateNetwork = null;\n+ protected String largePublicNetwork = null;\n+ protected String largePrivateNetwork = null;\n+ protected String xlargePublicNetwork = null;\n+ protected String xlargePrivateNetwork = null;\n+ protected String customPublicNetwork = null;\n+ protected String customPrivateNetwork = null;\n \n protected String unknownString;\n \n@@ -165,20 +169,36 @@ void validate() throws Exception {\n // -------------------------------------------------------------------------\n // SET\n // -------------------------------------------------------------------------\n- public void setSmallNetwork(String smallNetwork) {\n- this.smallNetwork = smallNetwork;\n+ public void setSmallPublicNetwork(String smallPublicNetwork) {\n+ this.smallPublicNetwork = smallPublicNetwork;\n }\n \n- public void setCustomNetwork(String customNetwork) {\n- this.customNetwork = customNetwork;\n+ public void setSmallPrivateNetwork(String smallPrivateNetwork) {\n+ this.smallPrivateNetwork = smallPrivateNetwork;\n }\n \n- public void setLargeNetwork(String largeNetwork) {\n- this.largeNetwork = largeNetwork;\n+ public void setCustomPublicNetwork(String customPublicNetwork) {\n+ this.customPublicNetwork = customPublicNetwork;\n }\n \n- public void setXlargeNetwork(String xlargeNetwork) {\n- this.xlargeNetwork = xlargeNetwork;\n+ public void setCustomPrivateNetwork(String customPrivateNetwork) {\n+ this.customPrivateNetwork = customPrivateNetwork;\n+ }\n+\n+ public void setLargePublicNetwork(String largePublicNetwork) {\n+ this.largePublicNetwork = largePublicNetwork;\n+ }\n+\n+ public void setLargePrivateNetwork(String largePrivateNetwork) {\n+ this.largePrivateNetwork = largePrivateNetwork;\n+ }\n+\n+ public void setXlargePublicNetwork(String xlargePublicNetwork) {\n+ this.xlargePublicNetwork = xlargePublicNetwork;\n+ }\n+\n+ public void setXlargePrivateNetwork(String xlargePrivateNetwork) {\n+ this.xlargePrivateNetwork = xlargePrivateNetwork;\n }\n \n public void setCustomMemory(int customMemory) {\n@@ -263,20 +283,36 @@ public void setSiType(String siType) throws Exception {\n // -------------------------------------------------------------------------\n // implements ResourceAllocations\n // -------------------------------------------------------------------------\n- public String getSmallNetwork() {\n- return this.smallNetwork;\n+ public String getSmallPublicNetwork() {\n+ return this.smallPublicNetwork;\n+ }\n+\n+ public String getSmallPrivateNetwork() {\n+ return this.smallPrivateNetwork;\n+ }\n+\n+ public String getCustomPublicNetwork() {\n+ return this.customPublicNetwork;\n+ }\n+\n+ public String getCustomPrivateNetwork() {\n+ return this.customPrivateNetwork;\n }\n \n- public String getCustomNetwork() {\n- return this.customNetwork;\n+ public String getLargePublicNetwork() {\n+ return this.largePublicNetwork;\n }\n \n- public String getLargeNetwork() {\n- return this.largeNetwork;\n+ public String getLargePrivateNetwork() {\n+ return this.largePrivateNetwork;\n }\n \n- public String getXlargeNetwork() {\n- return this.xlargeNetwork;\n+ public String getXlargePublicNetwork() {\n+ return this.xlargePublicNetwork;\n+ }\n+\n+ public String getXlargePrivateNetwork() {\n+ return this.xlargePrivateNetwork;\n }\n \n public String getSpotInstanceType(){\n@@ -311,14 +347,14 @@ public String getVmmVersion() {\n return this.vmmVersion;\n }\n \n- protected String getMatchingName(int memory, int cpus, String network) {\n- if (this.smallMemory == memory && this.smallCPUs == cpus && this.smallNetwork.equals(network)) {\n+ protected String getMatchingName(int memory, int cpus, String publicNetwork, String privateNetwork) {\n+ if (this.smallMemory == memory && this.smallCPUs == cpus && this.smallPublicNetwork.equals(publicNetwork) && this.smallPrivateNetwork.equals(privateNetwork)) {\n return this.getSmallName();\n- } else if (this.largeMemory == memory && this.largeCPUs == cpus && this.largeNetwork.equals(network)) {\n+ } else if (this.largeMemory == memory && this.largeCPUs == cpus && this.largePublicNetwork.equals(publicNetwork) && this.largePrivateNetwork.equals(privateNetwork)) {\n return this.getLargeName();\n- } else if (this.xlargeMemory == memory && this.xlargeCPUs == cpus && this.xlargeNetwork.equals(network)) {\n+ } else if (this.xlargeMemory == memory && this.xlargeCPUs == cpus && this.xlargePublicNetwork.equals(publicNetwork) && this.xlargePrivateNetwork.equals(privateNetwork)) {\n return this.getXlargeName();\n- } else if (this.customMemory == memory && this.customCPUs == cpus && this.customNetwork.equals(network)) {\n+ } else if (this.customMemory == memory && this.customCPUs == cpus && this.customPublicNetwork.equals(publicNetwork) && this.customPrivateNetwork.equals(privateNetwork)) {\n return this.getCustomName();\n } else {\n return this.unknownString;\n@@ -333,12 +369,16 @@ public String getMatchingName(ResourceAllocation ra)\n }\n \n // Undefined networks in elastic.conf are declared with empty strings\n- String network = ra.getNetwork();\n- if (network == null) {\n- network = \"\";\n+ String publicNetwork = ra.getPublicNetwork();\n+ if (publicNetwork == null) {\n+ publicNetwork = \"\";\n+ }\n+ String privateNetwork = ra.getPrivateNetwork();\n+ if (privateNetwork == null) {\n+ privateNetwork = \"\";\n }\n \n- return this.getMatchingName(ra.getMemory(), ra.getIndCpuCount(), network);\n+ return this.getMatchingName(ra.getMemory(), ra.getIndCpuCount(), publicNetwork, privateNetwork);\n }\n \n public ResourceAllocation getMatchingRA(String name,\n@@ -370,15 +410,17 @@ public ResourceAllocation getMatchingRA(String name,\n \n Integer cpus = getInstanceCPUs(cmpName);\n \n- String network = getInstanceNetwork(cmpName);\n+ String publicNetwork = getInstancePublicNetwork(cmpName);\n+ String privateNetwork = getInstancePrivateNetwork(cmpName);\n \n ra.setIndCpuCount(cpus);\n \n ra.setSpotInstance(spot);\n \n ra.setArchitecture(this.cpuArch);\n \n- ra.setNetwork(network);\n+ ra.setPublicNetwork(publicNetwork);\n+ ra.setPrivateNetwork(privateNetwork);\n \n return ra;\n }\n@@ -415,22 +457,37 @@ protected Integer getInstanceCPUs(final String cmpName)\n }\n }\n \n- protected String getInstanceNetwork(final String cmpName)\n+ protected String getInstancePublicNetwork(final String cmpName)\n throws CannotTranslateException {\n if (cmpName.equals(this.getSmallName())) {\n- return this.smallNetwork;\n+ return this.smallPublicNetwork;\n } else if (cmpName.equals(this.getLargeName())) {\n- return this.largeNetwork;\n+ return this.largePublicNetwork;\n } else if (cmpName.equals(this.getXlargeName())) {\n- return this.xlargeNetwork;\n+ return this.xlargePublicNetwork;\n } else if (cmpName.equals(this.getCustomName())) {\n- return this.customNetwork;\n+ return this.customPublicNetwork;\n } else {\n throw new CannotTranslateException(\n \"Unknown instance type '\" + cmpName + \"'\");\n }\n }\n \n+ protected String getInstancePrivateNetwork(final String cmpName)\n+ throws CannotTranslateException {\n+ if (cmpName.equals(this.getSmallName())) {\n+ return this.smallPrivateNetwork;\n+ } else if (cmpName.equals(this.getLargeName())) {\n+ return this.largePrivateNetwork;\n+ } else if (cmpName.equals(this.getXlargeName())) {\n+ return this.xlargePrivateNetwork;\n+ } else if (cmpName.equals(this.getCustomName())) {\n+ return this.customPrivateNetwork;\n+ } else {\n+ throw new CannotTranslateException(\n+ \"Unknown instance type '\" + cmpName + \"'\");\n+ }\n+ }\n \n public RequiredVMM getRequiredVMM() {\n return this.requestThisVMM;", "raw_url": "https://github.com/nimbusproject/nimbus/raw/02e22b24a77665fb2eab634322ed84dc4b41f9dd/messaging%2Fgt4.0-elastic%2Fjava%2Fmsgbridge%2Fsrc%2Forg%2Fnimbustools%2Fmessaging%2Fgt4_0_elastic%2Fv2008_05_05%2Fgeneral%2Fdefaults%2FDefaultResourceAllocations.java", "sha": "225012283d4a928c7ebfefc3d56cda0c1956e6c7", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/nimbusproject/nimbus/blob/02e22b24a77665fb2eab634322ed84dc4b41f9dd/messaging%2Fgt4.0-elastic%2Fjava%2Fmsgbridge%2Fsrc%2Forg%2Fnimbustools%2Fmessaging%2Fgt4_0_elastic%2Fv2008_05_05%2Frm%2Fdefaults%2FDefaultRequestSI.java", "changes": 2, "contents_url": "https://api.github.com/repos/nimbusproject/nimbus/contents/messaging%2Fgt4.0-elastic%2Fjava%2Fmsgbridge%2Fsrc%2Forg%2Fnimbustools%2Fmessaging%2Fgt4_0_elastic%2Fv2008_05_05%2Frm%2Fdefaults%2FDefaultRequestSI.java?ref=02e22b24a77665fb2eab634322ed84dc4b41f9dd", "deletions": 1, "filename": "messaging/gt4.0-elastic/java/msgbridge/src/org/nimbustools/messaging/gt4_0_elastic/v2008_05_05/rm/defaults/DefaultRequestSI.java", "new_code": " final NIC[] nics = this.getNICs(ra.getPublicNetwork(), ra.getPrivateNetwork());", "new_methods": [], "old_code": " final NIC[] nics = this.getNICs(ra.getNetwork());", "old_methods": [], "patch": "@@ -199,7 +199,7 @@ public SpotCreateRequest translateReqSpotInstances(\n req.getInstanceCount().intValue(),\n req.getInstanceCount().intValue(),\n true);\n- final NIC[] nics = this.getNICs(ra.getNetwork());\n+ final NIC[] nics = this.getNICs(ra.getPublicNetwork(), ra.getPrivateNetwork());\n \n final RequiredVMM reqVMM = this.RAs.getRequiredVMM();\n ", "raw_url": "https://github.com/nimbusproject/nimbus/raw/02e22b24a77665fb2eab634322ed84dc4b41f9dd/messaging%2Fgt4.0-elastic%2Fjava%2Fmsgbridge%2Fsrc%2Forg%2Fnimbustools%2Fmessaging%2Fgt4_0_elastic%2Fv2008_05_05%2Frm%2Fdefaults%2FDefaultRequestSI.java", "sha": "94fef641133ac4b807686437a474773e2e366ace", "status": "modified" }, { "additions": 36, "blob_url": "https://github.com/nimbusproject/nimbus/blob/02e22b24a77665fb2eab634322ed84dc4b41f9dd/messaging%2Fgt4.0-elastic%2Fjava%2Fmsgbridge%2Fsrc%2Forg%2Fnimbustools%2Fmessaging%2Fgt4_0_elastic%2Fv2008_05_05%2Frm%2Fdefaults%2FDefaultRun.java", "changes": 44, "contents_url": "https://api.github.com/repos/nimbusproject/nimbus/contents/messaging%2Fgt4.0-elastic%2Fjava%2Fmsgbridge%2Fsrc%2Forg%2Fnimbustools%2Fmessaging%2Fgt4_0_elastic%2Fv2008_05_05%2Frm%2Fdefaults%2FDefaultRun.java?ref=02e22b24a77665fb2eab634322ed84dc4b41f9dd", "deletions": 8, "filename": "messaging/gt4.0-elastic/java/msgbridge/src/org/nimbustools/messaging/gt4_0_elastic/v2008_05_05/rm/defaults/DefaultRun.java", "new_code": " final NIC[] nics = this.getNICs(ra.getPublicNetwork(), ra.getPrivateNetwork());\n protected NIC[] getNICs(String publicNetworkName, String privateNetworkName) throws CannotTranslateException {\n\n /* Check that when one of public and private is set, they are both set */\n if (publicNetworkName != null && !publicNetworkName.trim().equals(\"\")) {\n if (privateNetworkName == null || privateNetworkName.trim().equals(\"\")) {\n throw new CannotTranslateException(\"Illegal Networks \" +\n \"implementation, public network set but null private network mapping\");\n }\n }\n if (privateNetworkName != null && !privateNetworkName.trim().equals(\"\")) {\n if (publicNetworkName == null || publicNetworkName.trim().equals(\"\")) {\n throw new CannotTranslateException(\"Illegal Networks \" +\n \"implementation, private network set but null public network mapping\");\n }\n }\n\n if (publicNetworkName != null && !publicNetworkName.trim().equals(\"\")) {\n if (publicNetworkName.trim().equals(privateNetworkName.trim())) {\n nics = new NIC[1];\n publicNetworkName = publicNetworkName.trim();\n logger.info(\"Using network name \" + publicNetworkName);\n nics[0] = this.oneRequestedNIC(publicNetworkName, \"autoeth0\");\n } else {\n nics = new NIC[2];\n publicNetworkName = publicNetworkName.trim();\n privateNetworkName = privateNetworkName.trim();\n logger.info(\"Using public network name \" + publicNetworkName + \" and private network name \" + privateNetworkName);\n nics[0] = this.oneRequestedNIC(publicNetworkName, \"autoeth0\");\n nics[1] = this.oneRequestedNIC(privateNetworkName, \"autoeth1\");\n }\n if (netName2 != null) {\n logger.info(\"Using networks \" + netName + \" and \" + netName2);\n } else {\n logger.info(\"Using network \" + netName);\n }", "new_methods": [], "old_code": " final NIC[] nics = this.getNICs(ra.getNetwork());\n protected NIC[] getNICs(String networkName) throws CannotTranslateException {\n if (networkName != null && !networkName.trim().equals(\"\")) {\n nics = new NIC[1];\n networkName = networkName.trim();\n logger.info(\"Using network name \" + networkName);\n nics[0] = this.oneRequestedNIC(networkName, \"autoeth0\");\n logger.info(\"Using network \" + netName);", "old_methods": [], "patch": "@@ -188,7 +188,7 @@ public CreateRequest translateRunInstances(RunInstancesType req,\n req.getMinCount(),\n req.getMaxCount(),\n false);\n- final NIC[] nics = this.getNICs(ra.getNetwork());\n+ final NIC[] nics = this.getNICs(ra.getPublicNetwork(), ra.getPrivateNetwork());\n final RequiredVMM reqVMM = this.RAs.getRequiredVMM();\n \n String userData = null;\n@@ -351,7 +351,7 @@ public RunInstancesResponseType translateCreateResult(CreateResult result,\n // NETWORK REQUEST\n // -------------------------------------------------------------------------\n \n- protected NIC[] getNICs(String networkName) throws CannotTranslateException {\n+ protected NIC[] getNICs(String publicNetworkName, String privateNetworkName) throws CannotTranslateException {\n \n // if the network mappings are the same value, that currently means\n // only make one real NIC request\n@@ -365,11 +365,35 @@ protected NIC[] getNICs(String networkName) throws CannotTranslateException {\n }\n \n final NIC[] nics;\n- if (networkName != null && !networkName.trim().equals(\"\")) {\n- nics = new NIC[1];\n- networkName = networkName.trim();\n- logger.info(\"Using network name \" + networkName);\n- nics[0] = this.oneRequestedNIC(networkName, \"autoeth0\");\n+\n+ /* Check that when one of public and private is set, they are both set */\n+ if (publicNetworkName != null && !publicNetworkName.trim().equals(\"\")) {\n+ if (privateNetworkName == null || privateNetworkName.trim().equals(\"\")) {\n+ throw new CannotTranslateException(\"Illegal Networks \" +\n+ \"implementation, public network set but null private network mapping\");\n+ }\n+ }\n+ if (privateNetworkName != null && !privateNetworkName.trim().equals(\"\")) {\n+ if (publicNetworkName == null || publicNetworkName.trim().equals(\"\")) {\n+ throw new CannotTranslateException(\"Illegal Networks \" +\n+ \"implementation, private network set but null public network mapping\");\n+ }\n+ }\n+\n+ if (publicNetworkName != null && !publicNetworkName.trim().equals(\"\")) {\n+ if (publicNetworkName.trim().equals(privateNetworkName.trim())) {\n+ nics = new NIC[1];\n+ publicNetworkName = publicNetworkName.trim();\n+ logger.info(\"Using network name \" + publicNetworkName);\n+ nics[0] = this.oneRequestedNIC(publicNetworkName, \"autoeth0\");\n+ } else {\n+ nics = new NIC[2];\n+ publicNetworkName = publicNetworkName.trim();\n+ privateNetworkName = privateNetworkName.trim();\n+ logger.info(\"Using public network name \" + publicNetworkName + \" and private network name \" + privateNetworkName);\n+ nics[0] = this.oneRequestedNIC(publicNetworkName, \"autoeth0\");\n+ nics[1] = this.oneRequestedNIC(privateNetworkName, \"autoeth1\");\n+ }\n }\n else if (pubNet.equals(privNet)) {\n nics = new NIC[1];\n@@ -541,7 +565,11 @@ protected void handleNetworking(VM vm,\n String privateAssignedIp = null;\n String publicAssignedIp = null;\n \n- logger.info(\"Using network \" + netName);\n+ if (netName2 != null) {\n+ logger.info(\"Using networks \" + netName + \" and \" + netName2);\n+ } else {\n+ logger.info(\"Using network \" + netName);\n+ }\n if (this.networks.isPrivateNetwork(netName)) {\n riit.setPrivateDnsName(hostname);\n riit.setPrivateIpAddress(ipAddress);", "raw_url": "https://github.com/nimbusproject/nimbus/raw/02e22b24a77665fb2eab634322ed84dc4b41f9dd/messaging%2Fgt4.0-elastic%2Fjava%2Fmsgbridge%2Fsrc%2Forg%2Fnimbustools%2Fmessaging%2Fgt4_0_elastic%2Fv2008_05_05%2Frm%2Fdefaults%2FDefaultRun.java", "sha": "fb16c808b8fd5ffadf2e8932e379ff751b9dbd26", "status": "modified" }, { "additions": 8, "blob_url": "https://github.com/nimbusproject/nimbus/blob/02e22b24a77665fb2eab634322ed84dc4b41f9dd/messaging%2Fquery%2Fjava%2Fsource%2Fetc%2Fquery%2Fother%2Fmain.xml", "changes": 12, "contents_url": "https://api.github.com/repos/nimbusproject/nimbus/contents/messaging%2Fquery%2Fjava%2Fsource%2Fetc%2Fquery%2Fother%2Fmain.xml?ref=02e22b24a77665fb2eab634322ed84dc4b41f9dd", "deletions": 4, "filename": "messaging/query/java/source/etc/query/other/main.xml", "new_code": " <property name=\"smallPublicNetwork\" value=\"$ELASTIC{network.public.small}\" />\n <property name=\"smallPrivateNetwork\" value=\"$ELASTIC{network.private.small}\" />\n <property name=\"largePublicNetwork\" value=\"$ELASTIC{network.public.large}\" />\n <property name=\"largePrivateNetwork\" value=\"$ELASTIC{network.private.large}\" />\n <property name=\"xlargePublicNetwork\" value=\"$ELASTIC{network.public.xlarge}\" />\n <property name=\"xlargePrivateNetwork\" value=\"$ELASTIC{network.private.xlarge}\" />\n <property name=\"customPublicNetwork\" value=\"$ELASTIC{network.public.custom}\" />\n <property name=\"customPrivateNetwork\" value=\"$ELASTIC{network.private.custom}\" />", "new_methods": [], "old_code": " <property name=\"smallNetwork\" value=\"$ELASTIC{network.small}\" />\n <property name=\"largeNetwork\" value=\"$ELASTIC{network.large}\" />\n <property name=\"xlargeNetwork\" value=\"$ELASTIC{network.xlarge}\" />\n <property name=\"customNetwork\" value=\"$ELASTIC{network.custom}\" />", "old_methods": [], "patch": "@@ -223,10 +223,14 @@ http://cxf.apache.org/schemas/jaxrs.xsd\">\n \n <constructor-arg ref=\"nimbus-query.rm.modulelocator\" />\n \n- <property name=\"smallNetwork\" value=\"$ELASTIC{network.small}\" />\n- <property name=\"largeNetwork\" value=\"$ELASTIC{network.large}\" />\n- <property name=\"xlargeNetwork\" value=\"$ELASTIC{network.xlarge}\" />\n- <property name=\"customNetwork\" value=\"$ELASTIC{network.custom}\" />\n+ <property name=\"smallPublicNetwork\" value=\"$ELASTIC{network.public.small}\" />\n+ <property name=\"smallPrivateNetwork\" value=\"$ELASTIC{network.private.small}\" />\n+ <property name=\"largePublicNetwork\" value=\"$ELASTIC{network.public.large}\" />\n+ <property name=\"largePrivateNetwork\" value=\"$ELASTIC{network.private.large}\" />\n+ <property name=\"xlargePublicNetwork\" value=\"$ELASTIC{network.public.xlarge}\" />\n+ <property name=\"xlargePrivateNetwork\" value=\"$ELASTIC{network.private.xlarge}\" />\n+ <property name=\"customPublicNetwork\" value=\"$ELASTIC{network.public.custom}\" />\n+ <property name=\"customPrivateNetwork\" value=\"$ELASTIC{network.private.custom}\" />\n \n <property name=\"smallMemory\" value=\"$ELASTIC{memory.small}\" />\n <property name=\"largeMemory\" value=\"$ELASTIC{memory.large}\" />", "raw_url": "https://github.com/nimbusproject/nimbus/raw/02e22b24a77665fb2eab634322ed84dc4b41f9dd/messaging%2Fquery%2Fjava%2Fsource%2Fetc%2Fquery%2Fother%2Fmain.xml", "sha": "ef6645e7310342f1b19a0d67f4e6e038665b7047", "status": "modified" }, { "additions": 2, "blob_url": "https://github.com/nimbusproject/nimbus/blob/02e22b24a77665fb2eab634322ed84dc4b41f9dd/service-api%2Fjava%2Fsource%2Fsrc%2Forg%2Fnimbustools%2Fapi%2F_repr%2Fvm%2F_ResourceAllocation.java", "changes": 3, "contents_url": "https://api.github.com/repos/nimbusproject/nimbus/contents/service-api%2Fjava%2Fsource%2Fsrc%2Forg%2Fnimbustools%2Fapi%2F_repr%2Fvm%2F_ResourceAllocation.java?ref=02e22b24a77665fb2eab634322ed84dc4b41f9dd", "deletions": 1, "filename": "service-api/java/source/src/org/nimbustools/api/_repr/vm/_ResourceAllocation.java", "new_code": " public void setPublicNetwork(String network);\n public void setPrivateNetwork(String network);", "new_methods": [], "old_code": " public void setNetwork(String network);", "old_methods": [], "patch": "@@ -27,5 +27,6 @@ public interface _ResourceAllocation extends ResourceAllocation {\n public void setMemory(int memory);\n public void setNodeNumber(int nodeNumber);\n public void setSpotInstance(boolean spot);\n- public void setNetwork(String network);\n+ public void setPublicNetwork(String network);\n+ public void setPrivateNetwork(String network);\n }", "raw_url": "https://github.com/nimbusproject/nimbus/raw/02e22b24a77665fb2eab634322ed84dc4b41f9dd/service-api%2Fjava%2Fsource%2Fsrc%2Forg%2Fnimbustools%2Fapi%2F_repr%2Fvm%2F_ResourceAllocation.java", "sha": "96305685547bcb2961995c60fb17db205560c321", "status": "modified" }, { "additions": 13, "blob_url": "https://github.com/nimbusproject/nimbus/blob/02e22b24a77665fb2eab634322ed84dc4b41f9dd/service-api%2Fjava%2Fsource%2Fsrc%2Forg%2Fnimbustools%2Fapi%2Fdefaults%2Frepr%2Fvm%2FDefaultResourceAllocation.java", "changes": 18, "contents_url": "https://api.github.com/repos/nimbusproject/nimbus/contents/service-api%2Fjava%2Fsource%2Fsrc%2Forg%2Fnimbustools%2Fapi%2Fdefaults%2Frepr%2Fvm%2FDefaultResourceAllocation.java?ref=02e22b24a77665fb2eab634322ed84dc4b41f9dd", "deletions": 5, "filename": "service-api/java/source/src/org/nimbustools/api/defaults/repr/vm/DefaultResourceAllocation.java", "new_code": " private String publicNetwork;\n private String privateNetwork;\n public String getPublicNetwork() {\n return this.publicNetwork;\n public String getPrivateNetwork() {\n return this.privateNetwork;\n }\n public void setPublicNetwork(String publicNetwork) {\n this.publicNetwork = publicNetwork;\n }\n\n public void setPrivateNetwork(String privateNetwork) {\n this.privateNetwork = privateNetwork;", "new_methods": [ { "arguments": [], "filename": "service-api/java/source/src/org/nimbustools/api/defaults/repr/vm/DefaultResourceAllocation.java", "implementation": "return this.publicNetwork;\n public String getPrivateNetwork() {\n return this.privateNetwork;", "signature": "String getPublicNetwork()" }, { "arguments": [ "String publicNetwork" ], "filename": "service-api/java/source/src/org/nimbustools/api/defaults/repr/vm/DefaultResourceAllocation.java", "implementation": "this.publicNetwork = publicNetwork;", "signature": "void setPublicNetwork(String publicNetwork)" } ], "old_code": " private String network;\n public String getNetwork() {\n return this.network;\n public void setNetwork(String network) {\n this.network = network;", "old_methods": [], "patch": "@@ -31,7 +31,8 @@ public class DefaultResourceAllocation implements _ResourceAllocation {\n private int memory;\n private int nodeNumber;\n private boolean spotInstance;\n- private String network;\n+ private String publicNetwork;\n+ private String privateNetwork;\n \n // -------------------------------------------------------------------------\n // implements org.nimbustools.api.repr.vm.ResourceAllocation\n@@ -49,10 +50,13 @@ public int getIndCpuCount() {\n return this.indCpuCount;\n }\n \n- public String getNetwork() {\n- return this.network;\n+ public String getPublicNetwork() {\n+ return this.publicNetwork;\n }\n \n+ public String getPrivateNetwork() {\n+ return this.privateNetwork;\n+ }\n \n public int getCpuPercentage() {\n return this.cpuPercentage;\n@@ -94,8 +98,12 @@ public void setMemory(int memory) {\n this.memory = memory;\n }\n \n- public void setNetwork(String network) {\n- this.network = network;\n+ public void setPublicNetwork(String publicNetwork) {\n+ this.publicNetwork = publicNetwork;\n+ }\n+\n+ public void setPrivateNetwork(String privateNetwork) {\n+ this.privateNetwork = privateNetwork;\n }\n \n public void setNodeNumber(int nodeNumber) {", "raw_url": "https://github.com/nimbusproject/nimbus/raw/02e22b24a77665fb2eab634322ed84dc4b41f9dd/service-api%2Fjava%2Fsource%2Fsrc%2Forg%2Fnimbustools%2Fapi%2Fdefaults%2Frepr%2Fvm%2FDefaultResourceAllocation.java", "sha": "e61813520cecb59f003dffc4178457c7795fc15a", "status": "modified" }, { "additions": 2, "blob_url": "https://github.com/nimbusproject/nimbus/blob/02e22b24a77665fb2eab634322ed84dc4b41f9dd/service-api%2Fjava%2Fsource%2Fsrc%2Forg%2Fnimbustools%2Fapi%2Frepr%2Fvm%2FResourceAllocation.java", "changes": 3, "contents_url": "https://api.github.com/repos/nimbusproject/nimbus/contents/service-api%2Fjava%2Fsource%2Fsrc%2Forg%2Fnimbustools%2Fapi%2Frepr%2Fvm%2FResourceAllocation.java?ref=02e22b24a77665fb2eab634322ed84dc4b41f9dd", "deletions": 1, "filename": "service-api/java/source/src/org/nimbustools/api/repr/vm/ResourceAllocation.java", "new_code": " public String getPublicNetwork();\n public String getPrivateNetwork();", "new_methods": [], "old_code": " public String getNetwork();", "old_methods": [], "patch": "@@ -36,5 +36,6 @@ public interface ResourceAllocation {\n public int getMemory();\n public int getNodeNumber();\n public boolean isSpotInstance();\n- public String getNetwork();\n+ public String getPublicNetwork();\n+ public String getPrivateNetwork();\n }", "raw_url": "https://github.com/nimbusproject/nimbus/raw/02e22b24a77665fb2eab634322ed84dc4b41f9dd/service-api%2Fjava%2Fsource%2Fsrc%2Forg%2Fnimbustools%2Fapi%2Frepr%2Fvm%2FResourceAllocation.java", "sha": "11b7d5953c79df9492cea24234f93fe747ada9d0", "status": "modified" } ]
9
[ { "name": "nimbusproject$nimbus", "new_args": "String smallPublicNetwork", "new_implementation": "this.smallPublicNetwork = smallPublicNetwork;\n public void setSmallPrivateNetwork(String smallPrivateNetwork) {\n this.smallPrivateNetwork = smallPrivateNetwork;\n public void setCustomPublicNetwork(String customPublicNetwork) {\n this.customPublicNetwork = customPublicNetwork;\n public void setCustomPrivateNetwork(String customPrivateNetwork) {\n this.customPrivateNetwork = customPrivateNetwork;", "new_return_type": "void", "new_signature": "void setSmallPublicNetwork(String smallPublicNetwork)", "old_args": "String smallNetwork", "old_implementation": "this.smallNetwork = smallNetwork;\n public void setCustomNetwork(String customNetwork) {\n this.customNetwork = customNetwork;\n public void setLargeNetwork(String largeNetwork) {\n this.largeNetwork = largeNetwork;\n public void setXlargeNetwork(String xlargeNetwork) {\n this.xlargeNetwork = xlargeNetwork;\n public String getSmallNetwork() {\n return this.smallNetwork;\n public String getCustomNetwork() {\n return this.customNetwork;\n public String getLargeNetwork() {\n return this.largeNetwork;\n public String getXlargeNetwork() {\n return this.xlargeNetwork;\n protected String getMatchingName(int memory, int cpus, String network) {\n if (this.smallMemory == memory && this.smallCPUs == cpus && this.smallNetwork.equals(network)) {", "old_return_type": "void", "old_signature": "void setSmallNetwork(String smallNetwork)" } ]
1
11
0492aafe3780886c3936544ffed92c1bcc587431
[ { "name": "iee$iee", "new_args": "EObject context,Expression semanticObject", "new_implementation": null, "new_return_type": "void", "new_signature": "void sequence_AdditionInBrackets(EObject context,Expression semanticObject)", "old_args": "EObject context,Expression semanticObject", "old_implementation": null, "old_return_type": "void", "old_signature": "void sequence_AdditionInBrackets_Expression(EObject context,Expression semanticObject)" }, { "name": "iee$iee", "new_args": "EObject context,Addition semanticObject", "new_implementation": null, "new_return_type": "void", "new_signature": "void sequence_Addition(EObject context,Addition semanticObject)", "old_args": "EObject context,Addition semanticObject", "old_implementation": null, "old_return_type": "void", "old_signature": "void sequence_Addition_Addition(EObject context,Addition semanticObject)" }, { "name": "iee$iee", "new_args": "EObject context,Addition semanticObject", "new_implementation": null, "new_return_type": "void", "new_signature": "void sequence_Addition(EObject context,Addition semanticObject)", "old_args": "EObject context,Addition semanticObject", "old_implementation": null, "old_return_type": "void", "old_signature": "void sequence_Addition_Addition(EObject context,Addition semanticObject)" }, { "name": "iee$iee", "new_args": "EObject context,Exponent semanticObject", "new_implementation": null, "new_return_type": "void", "new_signature": "void sequence_Exponent(EObject context,Exponent semanticObject)", "old_args": "EObject context,Exponent semanticObject", "old_implementation": null, "old_return_type": "void", "old_signature": "void sequence_Exponent_Exponent(EObject context,Exponent semanticObject)" }, { "name": "iee$iee", "new_args": "EObject context,Exponent semanticObject", "new_implementation": null, "new_return_type": "void", "new_signature": "void sequence_Exponent(EObject context,Exponent semanticObject)", "old_args": "EObject context,Exponent semanticObject", "old_implementation": null, "old_return_type": "void", "old_signature": "void sequence_Exponent_Exponent(EObject context,Exponent semanticObject)" }, { "name": "iee$iee", "new_args": "EObject context,Formula semanticObject", "new_implementation": null, "new_return_type": "void", "new_signature": "void sequence_Formula(EObject context,Formula semanticObject)", "old_args": "EObject context,Formula semanticObject", "old_implementation": null, "old_return_type": "void", "old_signature": "void sequence_Formula_Formula(EObject context,Formula semanticObject)" }, { "name": "iee$iee", "new_args": "EObject context,Formula semanticObject", "new_implementation": null, "new_return_type": "void", "new_signature": "void sequence_Formula(EObject context,Formula semanticObject)", "old_args": "EObject context,Formula semanticObject", "old_implementation": null, "old_return_type": "void", "old_signature": "void sequence_Formula_Formula(EObject context,Formula semanticObject)" }, { "name": "iee$iee", "new_args": "EObject context,FunctionDefinition semanticObject", "new_implementation": null, "new_return_type": "void", "new_signature": "void sequence_FunctionDefinition(EObject context,FunctionDefinition semanticObject)", "old_args": "EObject context,FunctionDefinition semanticObject", "old_implementation": null, "old_return_type": "void", "old_signature": "void sequence_FunctionDefinition_FunctionDefinition(EObject context,FunctionDefinition semanticObject)" }, { "name": "iee$iee", "new_args": "EObject context,FunctionDefinition semanticObject", "new_implementation": null, "new_return_type": "void", "new_signature": "void sequence_FunctionDefinition(EObject context,FunctionDefinition semanticObject)", "old_args": "EObject context,FunctionDefinition semanticObject", "old_implementation": null, "old_return_type": "void", "old_signature": "void sequence_FunctionDefinition_FunctionDefinition(EObject context,FunctionDefinition semanticObject)" }, { "name": "iee$iee", "new_args": "EObject context,Expression semanticObject", "new_implementation": null, "new_return_type": "void", "new_signature": "void sequence_Function(EObject context,Expression semanticObject)", "old_args": "EObject context,Expression semanticObject", "old_implementation": null, "old_return_type": "void", "old_signature": "void sequence_Function_Expression(EObject context,Expression semanticObject)" }, { "name": "iee$iee", "new_args": "EObject context,Expression semanticObject", "new_implementation": null, "new_return_type": "void", "new_signature": "void sequence_Function(EObject context,Expression semanticObject)", "old_args": "EObject context,Expression semanticObject", "old_implementation": null, "old_return_type": "void", "old_signature": "void sequence_Function_Expression(EObject context,Expression semanticObject)" }, { "name": "iee$iee", "new_args": "EObject context,MatrixExpression semanticObject", "new_implementation": null, "new_return_type": "void", "new_signature": "void sequence_MatrixAdditionInBrackets(EObject context,MatrixExpression semanticObject)", "old_args": "EObject context,MatrixExpression semanticObject", "old_implementation": null, "old_return_type": "void", "old_signature": "void sequence_MatrixAdditionInBrackets_MatrixExpression(EObject context,MatrixExpression semanticObject)" }, { "name": "iee$iee", "new_args": "EObject context,MatrixAddition semanticObject", "new_implementation": null, "new_return_type": "void", "new_signature": "void sequence_MatrixAddition(EObject context,MatrixAddition semanticObject)", "old_args": "EObject context,MatrixAddition semanticObject", "old_implementation": null, "old_return_type": "void", "old_signature": "void sequence_MatrixAddition_MatrixAddition(EObject context,MatrixAddition semanticObject)" }, { "name": "iee$iee", "new_args": "EObject context,MatrixAddition semanticObject", "new_implementation": null, "new_return_type": "void", "new_signature": "void sequence_MatrixAddition(EObject context,MatrixAddition semanticObject)", "old_args": "EObject context,MatrixAddition semanticObject", "old_implementation": null, "old_return_type": "void", "old_signature": "void sequence_MatrixAddition_MatrixAddition(EObject context,MatrixAddition semanticObject)" }, { "name": "iee$iee", "new_args": "EObject context,MatrixAssignment semanticObject", "new_implementation": null, "new_return_type": "void", "new_signature": "void sequence_MatrixAssignment(EObject context,MatrixAssignment semanticObject)", "old_args": "EObject context,MatrixAssignment semanticObject", "old_implementation": null, "old_return_type": "void", "old_signature": "void sequence_MatrixAssignment_MatrixAssignment(EObject context,MatrixAssignment semanticObject)" }, { "name": "iee$iee", "new_args": "EObject context,MatrixAssignment semanticObject", "new_implementation": null, "new_return_type": "void", "new_signature": "void sequence_MatrixAssignment(EObject context,MatrixAssignment semanticObject)", "old_args": "EObject context,MatrixAssignment semanticObject", "old_implementation": null, "old_return_type": "void", "old_signature": "void sequence_MatrixAssignment_MatrixAssignment(EObject context,MatrixAssignment semanticObject)" }, { "name": "iee$iee", "new_args": "EObject context,MatrixFormula semanticObject", "new_implementation": null, "new_return_type": "void", "new_signature": "void sequence_MatrixFormula(EObject context,MatrixFormula semanticObject)", "old_args": "EObject context,MatrixFormula semanticObject", "old_implementation": null, "old_return_type": "void", "old_signature": "void sequence_MatrixFormula_MatrixFormula(EObject context,MatrixFormula semanticObject)" }, { "name": "iee$iee", "new_args": "EObject context,MatrixFormula semanticObject", "new_implementation": null, "new_return_type": "void", "new_signature": "void sequence_MatrixFormula(EObject context,MatrixFormula semanticObject)", "old_args": "EObject context,MatrixFormula semanticObject", "old_implementation": null, "old_return_type": "void", "old_signature": "void sequence_MatrixFormula_MatrixFormula(EObject context,MatrixFormula semanticObject)" }, { "name": "iee$iee", "new_args": "EObject context,MatrixMultiplication semanticObject", "new_implementation": null, "new_return_type": "void", "new_signature": "void sequence_MatrixMultiplication(EObject context,MatrixMultiplication semanticObject)", "old_args": "EObject context,MatrixMultiplication semanticObject", "old_implementation": null, "old_return_type": "void", "old_signature": "void sequence_MatrixMultiplication_MatrixMultiplication(EObject context,MatrixMultiplication semanticObject)" }, { "name": "iee$iee", "new_args": "EObject context,MatrixMultiplication semanticObject", "new_implementation": null, "new_return_type": "void", "new_signature": "void sequence_MatrixMultiplication(EObject context,MatrixMultiplication semanticObject)", "old_args": "EObject context,MatrixMultiplication semanticObject", "old_implementation": null, "old_return_type": "void", "old_signature": "void sequence_MatrixMultiplication_MatrixMultiplication(EObject context,MatrixMultiplication semanticObject)" }, { "name": "iee$iee", "new_args": "EObject context,MatrixRow semanticObject", "new_implementation": null, "new_return_type": "void", "new_signature": "void sequence_MatrixRow(EObject context,MatrixRow semanticObject)", "old_args": "EObject context,MatrixRow semanticObject", "old_implementation": null, "old_return_type": "void", "old_signature": "void sequence_MatrixRow_MatrixRow(EObject context,MatrixRow semanticObject)" }, { "name": "iee$iee", "new_args": "EObject context,Matrix semanticObject", "new_implementation": null, "new_return_type": "void", "new_signature": "void sequence_Matrix(EObject context,Matrix semanticObject)", "old_args": "EObject context,Matrix semanticObject", "old_implementation": null, "old_return_type": "void", "old_signature": "void sequence_Matrix_Matrix(EObject context,Matrix semanticObject)" }, { "name": "iee$iee", "new_args": "EObject context,Division semanticObject", "new_implementation": null, "new_return_type": "void", "new_signature": "void sequence_Multiplication(EObject context,Division semanticObject)", "old_args": "EObject context,Division semanticObject", "old_implementation": null, "old_return_type": "void", "old_signature": "void sequence_Multiplication_Division(EObject context,Division semanticObject)" }, { "name": "iee$iee", "new_args": "EObject context,Division semanticObject", "new_implementation": null, "new_return_type": "void", "new_signature": "void sequence_Multiplication(EObject context,Division semanticObject)", "old_args": "EObject context,Division semanticObject", "old_implementation": null, "old_return_type": "void", "old_signature": "void sequence_Multiplication_Division(EObject context,Division semanticObject)" }, { "name": "iee$iee", "new_args": "EObject context,Modulo semanticObject", "new_implementation": null, "new_return_type": "void", "new_signature": "void sequence_Multiplication(EObject context,Modulo semanticObject)", "old_args": "EObject context,Modulo semanticObject", "old_implementation": null, "old_return_type": "void", "old_signature": "void sequence_Multiplication_Modulo(EObject context,Modulo semanticObject)" }, { "name": "iee$iee", "new_args": "EObject context,Modulo semanticObject", "new_implementation": null, "new_return_type": "void", "new_signature": "void sequence_Multiplication(EObject context,Modulo semanticObject)", "old_args": "EObject context,Modulo semanticObject", "old_implementation": null, "old_return_type": "void", "old_signature": "void sequence_Multiplication_Modulo(EObject context,Modulo semanticObject)" }, { "name": "iee$iee", "new_args": "EObject context,Multiplication semanticObject", "new_implementation": null, "new_return_type": "void", "new_signature": "void sequence_Multiplication(EObject context,Multiplication semanticObject)", "old_args": "EObject context,Multiplication semanticObject", "old_implementation": null, "old_return_type": "void", "old_signature": "void sequence_Multiplication_Multiplication(EObject context,Multiplication semanticObject)" }, { "name": "iee$iee", "new_args": "EObject context,Multiplication semanticObject", "new_implementation": null, "new_return_type": "void", "new_signature": "void sequence_Multiplication(EObject context,Multiplication semanticObject)", "old_args": "EObject context,Multiplication semanticObject", "old_implementation": null, "old_return_type": "void", "old_signature": "void sequence_Multiplication_Multiplication(EObject context,Multiplication semanticObject)" }, { "name": "iee$iee", "new_args": "EObject context,MatrixInBrackets semanticObject", "new_implementation": null, "new_return_type": "void", "new_signature": "void sequence_PrimaryMatrix(EObject context,MatrixInBrackets semanticObject)", "old_args": "EObject context,NewMatrix semanticObject", "old_implementation": null, "old_return_type": "void", "old_signature": "void sequence_PrimaryMatrix_NewMatrix(EObject context,NewMatrix semanticObject)" }, { "name": "iee$iee", "new_args": "EObject context,NewMatrix semanticObject", "new_implementation": null, "new_return_type": "void", "new_signature": "void sequence_PrimaryMatrix(EObject context,NewMatrix semanticObject)", "old_args": "EObject context,NewMatrix semanticObject", "old_implementation": null, "old_return_type": "void", "old_signature": "void sequence_PrimaryMatrix_NewMatrix(EObject context,NewMatrix semanticObject)" }, { "name": "iee$iee", "new_args": "EObject context,Float semanticObject", "new_implementation": null, "new_return_type": "void", "new_signature": "void sequence_Primary(EObject context,Float semanticObject)", "old_args": "EObject context,Float semanticObject", "old_implementation": null, "old_return_type": "void", "old_signature": "void sequence_Primary_Float(EObject context,Float semanticObject)" }, { "name": "iee$iee", "new_args": "EObject context,Function semanticObject", "new_implementation": null, "new_return_type": "void", "new_signature": "void sequence_Primary(EObject context,Function semanticObject)", "old_args": "EObject context,Function semanticObject", "old_implementation": null, "old_return_type": "void", "old_signature": "void sequence_Primary_Function(EObject context,Function semanticObject)" }, { "name": "iee$iee", "new_args": "EObject context,MatrixElement semanticObject", "new_implementation": null, "new_return_type": "void", "new_signature": "void sequence_Primary(EObject context,MatrixElement semanticObject)", "old_args": "EObject context,MatrixElement semanticObject", "old_implementation": null, "old_return_type": "void", "old_signature": "void sequence_Primary_MatrixElement(EObject context,MatrixElement semanticObject)" }, { "name": "iee$iee", "new_args": "EObject context,Variable semanticObject", "new_implementation": null, "new_return_type": "void", "new_signature": "void sequence_Primary(EObject context,Variable semanticObject)", "old_args": "EObject context,Variable semanticObject", "old_implementation": null, "old_return_type": "void", "old_signature": "void sequence_Primary_Variable(EObject context,Variable semanticObject)" }, { "name": "iee$iee", "new_args": "EObject context,Statement semanticObject", "new_implementation": null, "new_return_type": "void", "new_signature": "void sequence_Statement(EObject context,Statement semanticObject)", "old_args": "EObject context,Statement semanticObject", "old_implementation": null, "old_return_type": "void", "old_signature": "void sequence_Statement_Statement(EObject context,Statement semanticObject)" }, { "name": "iee$iee", "new_args": "EObject context,Statement semanticObject", "new_implementation": null, "new_return_type": "void", "new_signature": "void sequence_Statement(EObject context,Statement semanticObject)", "old_args": "EObject context,Statement semanticObject", "old_implementation": null, "old_return_type": "void", "old_signature": "void sequence_Statement_Statement(EObject context,Statement semanticObject)" }, { "name": "iee$iee", "new_args": "EObject context,Factorial semanticObject", "new_implementation": null, "new_return_type": "void", "new_signature": "void sequence_UnaryExpression(EObject context,Factorial semanticObject)", "old_args": "EObject context,Factorial semanticObject", "old_implementation": null, "old_return_type": "void", "old_signature": "void sequence_UnaryExpression_Factorial(EObject context,Factorial semanticObject)" }, { "name": "iee$iee", "new_args": "EObject context,Factorial semanticObject", "new_implementation": null, "new_return_type": "void", "new_signature": "void sequence_UnaryExpression(EObject context,Factorial semanticObject)", "old_args": "EObject context,Factorial semanticObject", "old_implementation": null, "old_return_type": "void", "old_signature": "void sequence_UnaryExpression_Factorial(EObject context,Factorial semanticObject)" }, { "name": "iee$iee", "new_args": "EObject context,Invert semanticObject", "new_implementation": null, "new_return_type": "void", "new_signature": "void sequence_UnaryExpression(EObject context,Invert semanticObject)", "old_args": "EObject context,Invert semanticObject", "old_implementation": null, "old_return_type": "void", "old_signature": "void sequence_UnaryExpression_Invert(EObject context,Invert semanticObject)" }, { "name": "iee$iee", "new_args": "EObject context,Invert semanticObject", "new_implementation": null, "new_return_type": "void", "new_signature": "void sequence_UnaryExpression(EObject context,Invert semanticObject)", "old_args": "EObject context,Invert semanticObject", "old_implementation": null, "old_return_type": "void", "old_signature": "void sequence_UnaryExpression_Invert(EObject context,Invert semanticObject)" }, { "name": "iee$iee", "new_args": "EObject context,VariableAssignment semanticObject", "new_implementation": null, "new_return_type": "void", "new_signature": "void sequence_VariableAssignment(EObject context,VariableAssignment semanticObject)", "old_args": "EObject context,VariableAssignment semanticObject", "old_implementation": null, "old_return_type": "void", "old_signature": "void sequence_VariableAssignment_VariableAssignment(EObject context,VariableAssignment semanticObject)" }, { "name": "iee$iee", "new_args": "EObject context,VariableAssignment semanticObject", "new_implementation": null, "new_return_type": "void", "new_signature": "void sequence_VariableAssignment(EObject context,VariableAssignment semanticObject)", "old_args": "EObject context,VariableAssignment semanticObject", "old_implementation": null, "old_return_type": "void", "old_signature": "void sequence_VariableAssignment_VariableAssignment(EObject context,VariableAssignment semanticObject)" }, { "name": "iee$iee", "new_args": "", "new_implementation": "return cColumnFloatParserRuleCall_2_6_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getColumnFloatParserRuleCall_2_6_0()", "old_args": "", "old_implementation": "return cColumnINTTerminalRuleCall_2_6_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getColumnINTTerminalRuleCall_2_6_0()" }, { "name": "iee$iee", "new_args": "", "new_implementation": null, "new_return_type": "RuleCall", "new_signature": "RuleCall getColumnFloatParserRuleCall_3_6_0()", "old_args": "", "old_implementation": null, "old_return_type": "RuleCall", "old_signature": "RuleCall getColumnINTTerminalRuleCall_3_6_0()" }, { "name": "iee$iee", "new_args": "", "new_implementation": "return cRowFloatParserRuleCall_2_3_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getRowFloatParserRuleCall_2_3_0()", "old_args": "", "old_implementation": "return cRowINTTerminalRuleCall_2_3_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getRowINTTerminalRuleCall_2_3_0()" }, { "name": "iee$iee", "new_args": "", "new_implementation": null, "new_return_type": "RuleCall", "new_signature": "RuleCall getRowFloatParserRuleCall_3_3_0()", "old_args": "", "old_implementation": null, "old_return_type": "RuleCall", "old_signature": "RuleCall getRowINTTerminalRuleCall_3_3_0()" } ]
[ { "additions": 50, "blob_url": "https://github.com/iee/iee/blob/0492aafe3780886c3936544ffed92c1bcc587431/org.eclipse.iee.sample.formula%2Fsrc%2Forg%2Feclipse%2Fiee%2Fsample%2Fformula%2Fpad%2FFormulaRenderer.java", "changes": 112, "contents_url": "https://api.github.com/repos/iee/iee/contents/org.eclipse.iee.sample.formula%2Fsrc%2Forg%2Feclipse%2Fiee%2Fsample%2Fformula%2Fpad%2FFormulaRenderer.java?ref=0492aafe3780886c3936544ffed92c1bcc587431", "deletions": 62, "filename": "org.eclipse.iee.sample.formula/src/org/eclipse/iee/sample/formula/pad/FormulaRenderer.java", "new_code": "\r\n\r\n\r\n\r\n\r\n\r\n\r\n\t\t\tif (text.charAt(0) == '=') {\r\n\t\t\t\tlatex = FormulaPadManager.getMolex()\r\n\t\t\t\t\t\t.translateMath(text.substring(1)).trim()\r\n\t\t\t\t\t\t.replace(\"\\n\", \"\").replace(\"\\r\", \"\");\r\n\t\t\t} else if (text.charAt(text.length() - 1) == '=') {\r\n\t\t\t\tlatex = FormulaPadManager.getMolex()\r\n\t\t\t\t\t\t.translateMath(text.substring(0, text.length() - 1))\r\n\t\t\t\t\t\t.trim().replace(\"\\n\", \"\").replace(\"\\r\", \"\");\r\n\t\t\t} else {\r\n\t\t\t\tlatex = FormulaPadManager.getMolex().translateMath(text).trim()\r\n\t\t\t\t\t\t.replace(\"\\n\", \"\").replace(\"\\r\", \"\");\r\n\t\t\tjava.awt.Image awtImage = TeXFormula.createBufferedImage(latex,\r\n\t\t\t\t\tTeXConstants.STYLE_TEXT, 40, java.awt.Color.black,\r\n\r\n\r\n\r\n\r\n\r\n\t\tif (bufferedImage.getColorModel() instanceof DirectColorModel) {\r\n\t\t\tDirectColorModel colorModel = (DirectColorModel) bufferedImage\r\n\t\t\t\t\t.getColorModel();\r\n\r\n\t\t\tPaletteData palette = new PaletteData(colorModel.getRedMask(),\r\n\t\t\t\t\tcolorModel.getGreenMask(), colorModel.getBlueMask());\r\n\r\n\t\t\tImageData data = new ImageData(bufferedImage.getWidth(),\r\n\t\t\t\t\tbufferedImage.getHeight(), colorModel.getPixelSize(),\r\n\t\t\t\t\tpalette);\r\n\r\n\r\n\t\t\t\t\tint pixel = palette.getPixel(new RGB(pixelArray[0],\r\n\t\t\t\t\t\t\tpixelArray[1], pixelArray[2]));\r\n\t\t\t}\r\n\t\t} else if (bufferedImage.getColorModel() instanceof IndexColorModel) {\r\n\t\t\tIndexColorModel colorModel = (IndexColorModel) bufferedImage\r\n\t\t\t\t\t.getColorModel();\r\n\r\n\r\n\r\n\t\t\tImageData data = new ImageData(bufferedImage.getWidth(),\r\n\t\t\t\t\tbufferedImage.getHeight(), colorModel.getPixelSize(),\r\n\t\t\t\t\tpalette);\r\n\r", "new_methods": [], "old_code": "\t\r\n\t\r\n\t\r\n\t\r\n\t\r\n\t\t\r\n\t\r\n\t\t\r\n\t\t\tif (text.charAt(0) == '=')\r\n\t\t\t{\r\n\t\t\t\tlatex = FormulaPadManager.getMolex().translateMath(text.substring(1)).trim().replace(\"\\n\\r\", \"\");\r\n\t\t\t}\r\n\t\t\telse if (text.charAt(text.length() - 1) == '=')\r\n\t\t\t{\r\n\t\t\t\tlatex = FormulaPadManager.getMolex().translateMath(text.substring(0, text.length() - 1)).trim().replace(\"\\n\\r\", \"\");\r\n\t\t\t}\r\n\t\t\telse \r\n\t\t\t{\r\n\t\t\t\tlatex = FormulaPadManager.getMolex().translateMath(text).trim().replace(\"\\n\\r\", \"\");\r\n\t\t\tjava.awt.Image awtImage =\r\n\t\t\t\tTeXFormula.createBufferedImage(\r\n\t\t\t\t\tlatex,\r\n\t\t\t\t\tTeXConstants.STYLE_TEXT,\r\n\t\t\t\t\t40,\r\n\t\t\t\t\tjava.awt.Color.black,\r\n\t\t\t\r\n\t\t\t\r\n\t\t\t\r\n\t\t\t\r\n\t\r\n\t\tif (bufferedImage.getColorModel() instanceof DirectColorModel) {\t\r\n\t\t\tDirectColorModel colorModel =\r\n\t\t\t\t(DirectColorModel) bufferedImage.getColorModel();\r\n\t\t\t\r\n\t\t\tPaletteData palette = new PaletteData(\r\n\t\t\t\tcolorModel.getRedMask(),\r\n\t\t\t\tcolorModel.getGreenMask(),\r\n\t\t\t\tcolorModel.getBlueMask());\r\n\t\t\t\r\n\t\t\tImageData data = new ImageData(\r\n\t\t\t\tbufferedImage.getWidth(),\r\n\t\t\t\tbufferedImage.getHeight(),\r\n\t\t\t\tcolorModel.getPixelSize(),\r\n\t\t\t\tpalette);\r\n\t\t\t\r\n\t\t\t\r\n\t\t\t\t\tint pixel = palette.getPixel(\r\n\t\t\t\t\t\tnew RGB(pixelArray[0],pixelArray[1], pixelArray[2]));\r\n\t\t\t}\t\t\t\r\n\t\t}\r\n\t\telse if (bufferedImage.getColorModel() instanceof IndexColorModel) {\r\n\t\t\tIndexColorModel colorModel =\r\n\t\t\t\t(IndexColorModel) bufferedImage.getColorModel();\r\n\t\t\t\r\n\t\t\t\r\n\t\t\t\r\n\t\t\tImageData data = new ImageData(\r\n\t\t\t\tbufferedImage.getWidth(),\r\n\t\t\t\tbufferedImage.getHeight(),\r\n\t\t\t\tcolorModel.getPixelSize(),\r\n\t\t\t\tpalette);\r\n\t\t\t\r", "old_methods": [], "patch": "@@ -17,127 +17,115 @@\n import org.scilab.forge.jlatexmath.TeXFormula;\r\n \r\n public class FormulaRenderer {\r\n-\t\r\n+\r\n \tprotected static Display fDisplay;\r\n-\t\r\n+\r\n \tprotected static Map<String, Image> fCachedImages = new TreeMap<String, Image>();\r\n-\t\r\n-\t\r\n+\r\n \tpublic static void setDisplay(Display display) {\r\n \t\tfDisplay = display;\r\n \t}\r\n-\t\r\n+\r\n \tpublic static boolean isTextValid(String text) {\r\n \t\tif (fCachedImages.containsKey(text)) {\r\n \t\t\treturn true;\r\n \t\t}\r\n-\t\t\r\n+\r\n \t\tif (getFormulaImage(text) == null) {\r\n \t\t\treturn false;\r\n \t\t} else {\r\n \t\t\treturn true;\r\n \t\t}\r\n \t}\r\n-\t\r\n+\r\n \tpublic static Image getFormulaImage(String text) {\r\n \t\tImage cachedImage = fCachedImages.get(text);\r\n \t\tString latex = \"\";\r\n \t\tif (cachedImage != null) {\r\n \t\t\treturn cachedImage;\r\n \t\t}\r\n-\t\t\r\n+\r\n \t\ttry {\r\n \t\t\t/* Translating to Latex */\r\n-\t\t\tif (text.charAt(0) == '=')\r\n-\t\t\t{\r\n-\t\t\t\tlatex = FormulaPadManager.getMolex().translateMath(text.substring(1)).trim().replace(\"\\n\\r\", \"\");\r\n+\t\t\tif (text.charAt(0) == '=') {\r\n+\t\t\t\tlatex = FormulaPadManager.getMolex()\r\n+\t\t\t\t\t\t.translateMath(text.substring(1)).trim()\r\n+\t\t\t\t\t\t.replace(\"\\n\", \"\").replace(\"\\r\", \"\");\r\n \t\t\t\tlatex = \"=\" + latex;\r\n-\t\t\t}\r\n-\t\t\telse if (text.charAt(text.length() - 1) == '=')\r\n-\t\t\t{\r\n-\t\t\t\tlatex = FormulaPadManager.getMolex().translateMath(text.substring(0, text.length() - 1)).trim().replace(\"\\n\\r\", \"\");\r\n+\t\t\t} else if (text.charAt(text.length() - 1) == '=') {\r\n+\t\t\t\tlatex = FormulaPadManager.getMolex()\r\n+\t\t\t\t\t\t.translateMath(text.substring(0, text.length() - 1))\r\n+\t\t\t\t\t\t.trim().replace(\"\\n\", \"\").replace(\"\\r\", \"\");\r\n \t\t\t\tlatex = latex + \"=\";\r\n-\t\t\t}\r\n-\t\t\telse \r\n-\t\t\t{\r\n-\t\t\t\tlatex = FormulaPadManager.getMolex().translateMath(text).trim().replace(\"\\n\\r\", \"\");\r\n+\t\t\t} else {\r\n+\t\t\t\tlatex = FormulaPadManager.getMolex().translateMath(text).trim()\r\n+\t\t\t\t\t\t.replace(\"\\n\", \"\").replace(\"\\r\", \"\");\r\n \t\t\t}\r\n \t\t\tSystem.out.println(\"latex: \" + latex);\r\n-\t\t\tjava.awt.Image awtImage =\r\n-\t\t\t\tTeXFormula.createBufferedImage(\r\n-\t\t\t\t\tlatex,\r\n-\t\t\t\t\tTeXConstants.STYLE_TEXT,\r\n-\t\t\t\t\t40,\r\n-\t\t\t\t\tjava.awt.Color.black,\r\n+\t\t\tjava.awt.Image awtImage = TeXFormula.createBufferedImage(latex,\r\n+\t\t\t\t\tTeXConstants.STYLE_TEXT, 40, java.awt.Color.black,\r\n \t\t\t\t\tjava.awt.Color.white);\r\n-\t\t\t\r\n+\r\n \t\t\tImageData swtImageData = convertToSWT((BufferedImage) awtImage);\r\n-\t\t\t\r\n+\r\n \t\t\tImage formulaImage = new Image(fDisplay, swtImageData);\r\n-\t\t\t\r\n+\r\n \t\t\tfCachedImages.put(text, formulaImage);\r\n \t\t\treturn formulaImage;\r\n-\t\t\t\r\n+\r\n \t\t} catch (Exception e) {\r\n \t\t\te.printStackTrace();\r\n \t\t\treturn null;\r\n \t\t}\r\n \t}\r\n-\t\r\n+\r\n \tprotected static ImageData convertToSWT(BufferedImage bufferedImage) {\r\n-\t\tif (bufferedImage.getColorModel() instanceof DirectColorModel) {\t\r\n-\t\t\tDirectColorModel colorModel =\r\n-\t\t\t\t(DirectColorModel) bufferedImage.getColorModel();\r\n-\t\t\t\r\n-\t\t\tPaletteData palette = new PaletteData(\r\n-\t\t\t\tcolorModel.getRedMask(),\r\n-\t\t\t\tcolorModel.getGreenMask(),\r\n-\t\t\t\tcolorModel.getBlueMask());\r\n-\t\t\t\r\n-\t\t\tImageData data = new ImageData(\r\n-\t\t\t\tbufferedImage.getWidth(),\r\n-\t\t\t\tbufferedImage.getHeight(),\r\n-\t\t\t\tcolorModel.getPixelSize(),\r\n-\t\t\t\tpalette);\r\n-\t\t\t\r\n+\t\tif (bufferedImage.getColorModel() instanceof DirectColorModel) {\r\n+\t\t\tDirectColorModel colorModel = (DirectColorModel) bufferedImage\r\n+\t\t\t\t\t.getColorModel();\r\n+\r\n+\t\t\tPaletteData palette = new PaletteData(colorModel.getRedMask(),\r\n+\t\t\t\t\tcolorModel.getGreenMask(), colorModel.getBlueMask());\r\n+\r\n+\t\t\tImageData data = new ImageData(bufferedImage.getWidth(),\r\n+\t\t\t\t\tbufferedImage.getHeight(), colorModel.getPixelSize(),\r\n+\t\t\t\t\tpalette);\r\n+\r\n \t\t\tWritableRaster raster = bufferedImage.getRaster();\r\n-\t\t\t\r\n+\r\n \t\t\tint[] pixelArray = new int[3];\r\n \t\t\tfor (int y = 0; y < data.height; y++) {\r\n \t\t\t\tfor (int x = 0; x < data.width; x++) {\r\n \t\t\t\t\traster.getPixel(x, y, pixelArray);\r\n-\t\t\t\t\tint pixel = palette.getPixel(\r\n-\t\t\t\t\t\tnew RGB(pixelArray[0],pixelArray[1], pixelArray[2]));\r\n+\t\t\t\t\tint pixel = palette.getPixel(new RGB(pixelArray[0],\r\n+\t\t\t\t\t\t\tpixelArray[1], pixelArray[2]));\r\n \t\t\t\t\tdata.setPixel(x, y, pixel);\r\n \t\t\t\t}\r\n-\t\t\t}\t\t\t\r\n+\t\t\t}\r\n \t\t\treturn data;\r\n-\t\t}\r\n-\t\telse if (bufferedImage.getColorModel() instanceof IndexColorModel) {\r\n-\t\t\tIndexColorModel colorModel =\r\n-\t\t\t\t(IndexColorModel) bufferedImage.getColorModel();\r\n-\t\t\t\r\n+\t\t} else if (bufferedImage.getColorModel() instanceof IndexColorModel) {\r\n+\t\t\tIndexColorModel colorModel = (IndexColorModel) bufferedImage\r\n+\t\t\t\t\t.getColorModel();\r\n+\r\n \t\t\tint size = colorModel.getMapSize();\r\n \t\t\tbyte[] reds = new byte[size];\r\n \t\t\tbyte[] greens = new byte[size];\r\n \t\t\tbyte[] blues = new byte[size];\r\n-\t\t\t\r\n+\r\n \t\t\tcolorModel.getReds(reds);\r\n \t\t\tcolorModel.getGreens(greens);\r\n \t\t\tcolorModel.getBlues(blues);\r\n-\t\t\t\r\n+\r\n \t\t\tRGB[] rgbs = new RGB[size];\r\n \t\t\tfor (int i = 0; i < rgbs.length; i++) {\r\n \t\t\t\trgbs[i] = new RGB(reds[i] & 0xFF, greens[i] & 0xFF,\r\n \t\t\t\t\t\tblues[i] & 0xFF);\r\n \t\t\t}\r\n \t\t\tPaletteData palette = new PaletteData(rgbs);\r\n-\t\t\tImageData data = new ImageData(\r\n-\t\t\t\tbufferedImage.getWidth(),\r\n-\t\t\t\tbufferedImage.getHeight(),\r\n-\t\t\t\tcolorModel.getPixelSize(),\r\n-\t\t\t\tpalette);\r\n-\t\t\t\r\n+\t\t\tImageData data = new ImageData(bufferedImage.getWidth(),\r\n+\t\t\t\t\tbufferedImage.getHeight(), colorModel.getPixelSize(),\r\n+\t\t\t\t\tpalette);\r\n+\r\n \t\t\tdata.transparentPixel = colorModel.getTransparentPixel();\r\n \t\t\tWritableRaster raster = bufferedImage.getRaster();\r\n \t\t\tint[] pixelArray = new int[1];\r", "raw_url": "https://github.com/iee/iee/raw/0492aafe3780886c3936544ffed92c1bcc587431/org.eclipse.iee.sample.formula%2Fsrc%2Forg%2Feclipse%2Fiee%2Fsample%2Fformula%2Fpad%2FFormulaRenderer.java", "sha": "b83c30ad9a405850c2fd41a49987a25912e6b548", "status": "modified" }, { "additions": 2, "blob_url": "https://github.com/iee/iee/blob/0492aafe3780886c3936544ffed92c1bcc587431/org.eclipse.iee.translator.Jmole%2Forg.eclipse.iee.translator.jmole.math%2Fbin%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fjmole%2Fmath%2FMath.ecore", "changes": 4, "contents_url": "https://api.github.com/repos/iee/iee/contents/org.eclipse.iee.translator.Jmole%2Forg.eclipse.iee.translator.jmole.math%2Fbin%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fjmole%2Fmath%2FMath.ecore?ref=0492aafe3780886c3936544ffed92c1bcc587431", "deletions": 2, "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/bin/org/eclipse/iee/translator/jmole/math/Math.ecore", "new_code": " <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"row\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString\"/>\n <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"column\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString\"/>", "new_methods": [], "old_code": " <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"row\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt\"/>\n <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"column\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt\"/>", "old_methods": [], "patch": "@@ -104,8 +104,8 @@\n </eClassifiers>\n <eClassifiers xsi:type=\"ecore:EClass\" name=\"MatrixElement\" eSuperTypes=\"platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Expression\">\n <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"element\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString\"/>\n- <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"row\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt\"/>\n- <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"column\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt\"/>\n+ <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"row\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString\"/>\n+ <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"column\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString\"/>\n </eClassifiers>\n <eClassifiers xsi:type=\"ecore:EClass\" name=\"Function\" eSuperTypes=\"platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Expression\">\n <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"function\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Expression\"", "raw_url": "https://github.com/iee/iee/raw/0492aafe3780886c3936544ffed92c1bcc587431/org.eclipse.iee.translator.Jmole%2Forg.eclipse.iee.translator.jmole.math%2Fbin%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fjmole%2Fmath%2FMath.ecore", "sha": "787c23d275cabce596ec5f460ecdfe2c0030d245", "status": "modified" }, { "additions": 2, "blob_url": "https://github.com/iee/iee/blob/0492aafe3780886c3936544ffed92c1bcc587431/org.eclipse.iee.translator.Jmole%2Forg.eclipse.iee.translator.jmole.math%2Fbin%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fjmole%2Fmath%2FMath.xmi", "changes": 4, "contents_url": "https://api.github.com/repos/iee/iee/contents/org.eclipse.iee.translator.Jmole%2Forg.eclipse.iee.translator.jmole.math%2Fbin%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fjmole%2Fmath%2FMath.xmi?ref=0492aafe3780886c3936544ffed92c1bcc587431", "deletions": 2, "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/bin/org/eclipse/iee/translator/jmole/math/Math.xmi", "new_code": " <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.15\"/>\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.15\"/>", "new_methods": [], "old_code": " <terminal xsi:type=\"xtext:RuleCall\" rule=\"/1/@rules.1\"/>\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/1/@rules.1\"/>", "old_methods": [], "patch": "@@ -213,12 +213,12 @@\n </elements>\n <elements xsi:type=\"xtext:Keyword\" value=\"[\"/>\n <elements xsi:type=\"xtext:Assignment\" feature=\"row\" operator=\"=\">\n- <terminal xsi:type=\"xtext:RuleCall\" rule=\"/1/@rules.1\"/>\n+ <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.15\"/>\n </elements>\n <elements xsi:type=\"xtext:Keyword\" value=\"]\"/>\n <elements xsi:type=\"xtext:Keyword\" value=\"[\"/>\n <elements xsi:type=\"xtext:Assignment\" feature=\"column\" operator=\"=\">\n- <terminal xsi:type=\"xtext:RuleCall\" rule=\"/1/@rules.1\"/>\n+ <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.15\"/>\n </elements>\n <elements xsi:type=\"xtext:Keyword\" value=\"]\"/>\n </elements>", "raw_url": "https://github.com/iee/iee/raw/0492aafe3780886c3936544ffed92c1bcc587431/org.eclipse.iee.translator.Jmole%2Forg.eclipse.iee.translator.jmole.math%2Fbin%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fjmole%2Fmath%2FMath.xmi", "sha": "7e25782bbdeca16c06388bf4956a56e96c538fa2", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/iee/iee/blob/0492aafe3780886c3936544ffed92c1bcc587431/org.eclipse.iee.translator.Jmole%2Forg.eclipse.iee.translator.jmole.math%2Fbin%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fjmole%2Fmath%2FMath.xtext", "changes": 2, "contents_url": "https://api.github.com/repos/iee/iee/contents/org.eclipse.iee.translator.Jmole%2Forg.eclipse.iee.translator.jmole.math%2Fbin%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fjmole%2Fmath%2FMath.xtext?ref=0492aafe3780886c3936544ffed92c1bcc587431", "deletions": 1, "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/bin/org/eclipse/iee/translator/jmole/math/Math.xtext", "new_code": "\t{MatrixElement} element=MATH_NAME '[' row=Float ']' '[' column=Float ']' | ", "new_methods": [], "old_code": "\t{MatrixElement} element=MATH_NAME '[' row=INT ']' '[' column=INT ']' | ", "old_methods": [], "patch": "@@ -39,7 +39,7 @@ Exponent returns Expression:\n Primary returns Expression:\n \t{Variable} name=MATH_NAME |\n \t{Float} value=Float |\n-\t{MatrixElement} element=MATH_NAME '[' row=INT ']' '[' column=INT ']' | \n+\t{MatrixElement} element=MATH_NAME '[' row=Float ']' '[' column=Float ']' | \n \t{Function} function=Function |\n \t'(' Addition ')';\n ", "raw_url": "https://github.com/iee/iee/raw/0492aafe3780886c3936544ffed92c1bcc587431/org.eclipse.iee.translator.Jmole%2Forg.eclipse.iee.translator.jmole.math%2Fbin%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fjmole%2Fmath%2FMath.xtext", "sha": "a81ab333fc9e64436f5ba09a88d26b704a9d52b7", "status": "modified" }, { "additions": 16, "blob_url": "https://github.com/iee/iee/blob/0492aafe3780886c3936544ffed92c1bcc587431/org.eclipse.iee.translator.Jmole%2Forg.eclipse.iee.translator.jmole.math%2Fbin%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fjmole%2Fmath%2Fparser%2Fantlr%2Finternal%2FInternalMath.g", "changes": 32, "contents_url": "https://api.github.com/repos/iee/iee/contents/org.eclipse.iee.translator.Jmole%2Forg.eclipse.iee.translator.jmole.math%2Fbin%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fjmole%2Fmath%2Fparser%2Fantlr%2Finternal%2FInternalMath.g?ref=0492aafe3780886c3936544ffed92c1bcc587431", "deletions": 16, "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/bin/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g", "new_code": "\t\t{ \n\t newCompositeNode(grammarAccess.getPrimaryAccess().getRowFloatParserRuleCall_2_3_0()); \n\t }\n\t\tlv_row_7_0=ruleFloat\t\t{\n\t $current = createModelElementForParent(grammarAccess.getPrimaryRule());\n \t\tset(\n \t\t\"Float\");\n\t afterParserOrEnumRuleCall();\n\t\t{ \n\t newCompositeNode(grammarAccess.getPrimaryAccess().getColumnFloatParserRuleCall_2_6_0()); \n\t }\n\t\tlv_column_10_0=ruleFloat\t\t{\n\t $current = createModelElementForParent(grammarAccess.getPrimaryRule());\n \t\tset(\n \t\t\"Float\");\n\t afterParserOrEnumRuleCall();", "new_methods": [], "old_code": "\t\tlv_row_7_0=RULE_INT\n\t\t{\n\t\t\tnewLeafNode(lv_row_7_0, grammarAccess.getPrimaryAccess().getRowINTTerminalRuleCall_2_3_0()); \n\t\t}\n\t\t{\n\t $current = createModelElement(grammarAccess.getPrimaryRule());\n \t\tsetWithLastConsumed(\n \t\t\"INT\");\n\t\tlv_column_10_0=RULE_INT\n\t\t{\n\t\t\tnewLeafNode(lv_column_10_0, grammarAccess.getPrimaryAccess().getColumnINTTerminalRuleCall_2_6_0()); \n\t\t}\n\t\t{\n\t $current = createModelElement(grammarAccess.getPrimaryRule());\n \t\tsetWithLastConsumed(\n \t\t\"INT\");", "old_methods": [], "patch": "@@ -780,19 +780,19 @@ rulePrimary returns [EObject current=null]\n }\n (\n (\n-\t\tlv_row_7_0=RULE_INT\n-\t\t{\n-\t\t\tnewLeafNode(lv_row_7_0, grammarAccess.getPrimaryAccess().getRowINTTerminalRuleCall_2_3_0()); \n-\t\t}\n-\t\t{\n+\t\t{ \n+\t newCompositeNode(grammarAccess.getPrimaryAccess().getRowFloatParserRuleCall_2_3_0()); \n+\t }\n+\t\tlv_row_7_0=ruleFloat\t\t{\n \t if ($current==null) {\n-\t $current = createModelElement(grammarAccess.getPrimaryRule());\n+\t $current = createModelElementForParent(grammarAccess.getPrimaryRule());\n \t }\n- \t\tsetWithLastConsumed(\n+ \t\tset(\n \t\t\t$current, \n \t\t\t\"row\",\n \t\tlv_row_7_0, \n- \t\t\"INT\");\n+ \t\t\"Float\");\n+\t afterParserOrEnumRuleCall();\n \t }\n \n )\n@@ -806,19 +806,19 @@ rulePrimary returns [EObject current=null]\n }\n (\n (\n-\t\tlv_column_10_0=RULE_INT\n-\t\t{\n-\t\t\tnewLeafNode(lv_column_10_0, grammarAccess.getPrimaryAccess().getColumnINTTerminalRuleCall_2_6_0()); \n-\t\t}\n-\t\t{\n+\t\t{ \n+\t newCompositeNode(grammarAccess.getPrimaryAccess().getColumnFloatParserRuleCall_2_6_0()); \n+\t }\n+\t\tlv_column_10_0=ruleFloat\t\t{\n \t if ($current==null) {\n-\t $current = createModelElement(grammarAccess.getPrimaryRule());\n+\t $current = createModelElementForParent(grammarAccess.getPrimaryRule());\n \t }\n- \t\tsetWithLastConsumed(\n+ \t\tset(\n \t\t\t$current, \n \t\t\t\"column\",\n \t\tlv_column_10_0, \n- \t\t\"INT\");\n+ \t\t\"Float\");\n+\t afterParserOrEnumRuleCall();\n \t }\n \n )", "raw_url": "https://github.com/iee/iee/raw/0492aafe3780886c3936544ffed92c1bcc587431/org.eclipse.iee.translator.Jmole%2Forg.eclipse.iee.translator.jmole.math%2Fbin%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fjmole%2Fmath%2Fparser%2Fantlr%2Finternal%2FInternalMath.g", "sha": "9c199e006c51f9557cff866e21d95238df6dffb2", "status": "modified" }, { "additions": 2, "blob_url": "https://github.com/iee/iee/blob/0492aafe3780886c3936544ffed92c1bcc587431/org.eclipse.iee.translator.Jmole%2Forg.eclipse.iee.translator.jmole.math%2Fsrc-gen%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fjmole%2Fmath%2FMath.ecore", "changes": 4, "contents_url": "https://api.github.com/repos/iee/iee/contents/org.eclipse.iee.translator.Jmole%2Forg.eclipse.iee.translator.jmole.math%2Fsrc-gen%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fjmole%2Fmath%2FMath.ecore?ref=0492aafe3780886c3936544ffed92c1bcc587431", "deletions": 2, "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore", "new_code": " <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"row\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString\"/>\n <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"column\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString\"/>", "new_methods": [], "old_code": " <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"row\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt\"/>\n <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"column\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt\"/>", "old_methods": [], "patch": "@@ -104,8 +104,8 @@\n </eClassifiers>\n <eClassifiers xsi:type=\"ecore:EClass\" name=\"MatrixElement\" eSuperTypes=\"platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Expression\">\n <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"element\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString\"/>\n- <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"row\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt\"/>\n- <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"column\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt\"/>\n+ <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"row\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString\"/>\n+ <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"column\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString\"/>\n </eClassifiers>\n <eClassifiers xsi:type=\"ecore:EClass\" name=\"Function\" eSuperTypes=\"platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Expression\">\n <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"function\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Expression\"", "raw_url": "https://github.com/iee/iee/raw/0492aafe3780886c3936544ffed92c1bcc587431/org.eclipse.iee.translator.Jmole%2Forg.eclipse.iee.translator.jmole.math%2Fsrc-gen%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fjmole%2Fmath%2FMath.ecore", "sha": "787c23d275cabce596ec5f460ecdfe2c0030d245", "status": "modified" }, { "additions": 2, "blob_url": "https://github.com/iee/iee/blob/0492aafe3780886c3936544ffed92c1bcc587431/org.eclipse.iee.translator.Jmole%2Forg.eclipse.iee.translator.jmole.math%2Fsrc-gen%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fjmole%2Fmath%2FMath.xmi", "changes": 4, "contents_url": "https://api.github.com/repos/iee/iee/contents/org.eclipse.iee.translator.Jmole%2Forg.eclipse.iee.translator.jmole.math%2Fsrc-gen%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fjmole%2Fmath%2FMath.xmi?ref=0492aafe3780886c3936544ffed92c1bcc587431", "deletions": 2, "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.xmi", "new_code": " <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.15\"/>\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.15\"/>", "new_methods": [], "old_code": " <terminal xsi:type=\"xtext:RuleCall\" rule=\"/1/@rules.1\"/>\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/1/@rules.1\"/>", "old_methods": [], "patch": "@@ -213,12 +213,12 @@\n </elements>\n <elements xsi:type=\"xtext:Keyword\" value=\"[\"/>\n <elements xsi:type=\"xtext:Assignment\" feature=\"row\" operator=\"=\">\n- <terminal xsi:type=\"xtext:RuleCall\" rule=\"/1/@rules.1\"/>\n+ <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.15\"/>\n </elements>\n <elements xsi:type=\"xtext:Keyword\" value=\"]\"/>\n <elements xsi:type=\"xtext:Keyword\" value=\"[\"/>\n <elements xsi:type=\"xtext:Assignment\" feature=\"column\" operator=\"=\">\n- <terminal xsi:type=\"xtext:RuleCall\" rule=\"/1/@rules.1\"/>\n+ <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.15\"/>\n </elements>\n <elements xsi:type=\"xtext:Keyword\" value=\"]\"/>\n </elements>", "raw_url": "https://github.com/iee/iee/raw/0492aafe3780886c3936544ffed92c1bcc587431/org.eclipse.iee.translator.Jmole%2Forg.eclipse.iee.translator.jmole.math%2Fsrc-gen%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fjmole%2Fmath%2FMath.xmi", "sha": "7e25782bbdeca16c06388bf4956a56e96c538fa2", "status": "modified" }, { "additions": 6, "blob_url": "https://github.com/iee/iee/blob/0492aafe3780886c3936544ffed92c1bcc587431/org.eclipse.iee.translator.Jmole%2Forg.eclipse.iee.translator.jmole.math%2Fsrc-gen%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fjmole%2Fmath%2Fmath%2FMatrixElement.java", "changes": 12, "contents_url": "https://api.github.com/repos/iee/iee/contents/org.eclipse.iee.translator.Jmole%2Forg.eclipse.iee.translator.jmole.math%2Fsrc-gen%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fjmole%2Fmath%2Fmath%2FMatrixElement.java?ref=0492aafe3780886c3936544ffed92c1bcc587431", "deletions": 6, "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/math/MatrixElement.java", "new_code": " * @see #setRow(String)\n String getRow();\n void setRow(String value);\n * @see #setColumn(String)\n String getColumn();\n void setColumn(String value);", "new_methods": [], "old_code": " * @see #setRow(int)\n int getRow();\n void setRow(int value);\n * @see #setColumn(int)\n int getColumn();\n void setColumn(int value);", "old_methods": [], "patch": "@@ -62,12 +62,12 @@ public interface MatrixElement extends Expression\n * </p>\n * <!-- end-user-doc -->\n * @return the value of the '<em>Row</em>' attribute.\n- * @see #setRow(int)\n+ * @see #setRow(String)\n * @see org.eclipse.iee.translator.jmole.math.math.MathPackage#getMatrixElement_Row()\n * @model\n * @generated\n */\n- int getRow();\n+ String getRow();\n \n /**\n * Sets the value of the '{@link org.eclipse.iee.translator.jmole.math.math.MatrixElement#getRow <em>Row</em>}' attribute.\n@@ -77,7 +77,7 @@ public interface MatrixElement extends Expression\n * @see #getRow()\n * @generated\n */\n- void setRow(int value);\n+ void setRow(String value);\n \n /**\n * Returns the value of the '<em><b>Column</b></em>' attribute.\n@@ -88,12 +88,12 @@ public interface MatrixElement extends Expression\n * </p>\n * <!-- end-user-doc -->\n * @return the value of the '<em>Column</em>' attribute.\n- * @see #setColumn(int)\n+ * @see #setColumn(String)\n * @see org.eclipse.iee.translator.jmole.math.math.MathPackage#getMatrixElement_Column()\n * @model\n * @generated\n */\n- int getColumn();\n+ String getColumn();\n \n /**\n * Sets the value of the '{@link org.eclipse.iee.translator.jmole.math.math.MatrixElement#getColumn <em>Column</em>}' attribute.\n@@ -103,6 +103,6 @@ public interface MatrixElement extends Expression\n * @see #getColumn()\n * @generated\n */\n- void setColumn(int value);\n+ void setColumn(String value);\n \n } // MatrixElement", "raw_url": "https://github.com/iee/iee/raw/0492aafe3780886c3936544ffed92c1bcc587431/org.eclipse.iee.translator.Jmole%2Forg.eclipse.iee.translator.jmole.math%2Fsrc-gen%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fjmole%2Fmath%2Fmath%2FMatrixElement.java", "sha": "485e1fb90c3ed186e368f0bbceaf8ae9dc9e2304", "status": "modified" }, { "additions": 2, "blob_url": "https://github.com/iee/iee/blob/0492aafe3780886c3936544ffed92c1bcc587431/org.eclipse.iee.translator.Jmole%2Forg.eclipse.iee.translator.jmole.math%2Fsrc-gen%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fjmole%2Fmath%2Fmath%2Fimpl%2FMathPackageImpl.java", "changes": 4, "contents_url": "https://api.github.com/repos/iee/iee/contents/org.eclipse.iee.translator.Jmole%2Forg.eclipse.iee.translator.jmole.math%2Fsrc-gen%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fjmole%2Fmath%2Fmath%2Fimpl%2FMathPackageImpl.java?ref=0492aafe3780886c3936544ffed92c1bcc587431", "deletions": 2, "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/math/impl/MathPackageImpl.java", "new_code": " initEAttribute(getMatrixElement_Row(), ecorePackage.getEString(), \"row\", null, 0, 1, MatrixElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n initEAttribute(getMatrixElement_Column(), ecorePackage.getEString(), \"column\", null, 0, 1, MatrixElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);", "new_methods": [], "old_code": " initEAttribute(getMatrixElement_Row(), ecorePackage.getEInt(), \"row\", null, 0, 1, MatrixElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n initEAttribute(getMatrixElement_Column(), ecorePackage.getEInt(), \"column\", null, 0, 1, MatrixElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);", "old_methods": [], "patch": "@@ -1306,8 +1306,8 @@ public void initializePackageContents()\n \n initEClass(matrixElementEClass, MatrixElement.class, \"MatrixElement\", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\n initEAttribute(getMatrixElement_Element(), ecorePackage.getEString(), \"element\", null, 0, 1, MatrixElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n- initEAttribute(getMatrixElement_Row(), ecorePackage.getEInt(), \"row\", null, 0, 1, MatrixElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n- initEAttribute(getMatrixElement_Column(), ecorePackage.getEInt(), \"column\", null, 0, 1, MatrixElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n+ initEAttribute(getMatrixElement_Row(), ecorePackage.getEString(), \"row\", null, 0, 1, MatrixElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n+ initEAttribute(getMatrixElement_Column(), ecorePackage.getEString(), \"column\", null, 0, 1, MatrixElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n \n initEClass(functionEClass, Function.class, \"Function\", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\n initEReference(getFunction_Function(), this.getExpression(), null, \"function\", null, 0, 1, Function.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);", "raw_url": "https://github.com/iee/iee/raw/0492aafe3780886c3936544ffed92c1bcc587431/org.eclipse.iee.translator.Jmole%2Forg.eclipse.iee.translator.jmole.math%2Fsrc-gen%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fjmole%2Fmath%2Fmath%2Fimpl%2FMathPackageImpl.java", "sha": "05a20afb5581d1059ccda5ddee98ab9173a689ce", "status": "modified" }, { "additions": 14, "blob_url": "https://github.com/iee/iee/blob/0492aafe3780886c3936544ffed92c1bcc587431/org.eclipse.iee.translator.Jmole%2Forg.eclipse.iee.translator.jmole.math%2Fsrc-gen%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fjmole%2Fmath%2Fmath%2Fimpl%2FMatrixElementImpl.java", "changes": 28, "contents_url": "https://api.github.com/repos/iee/iee/contents/org.eclipse.iee.translator.Jmole%2Forg.eclipse.iee.translator.jmole.math%2Fsrc-gen%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fjmole%2Fmath%2Fmath%2Fimpl%2FMatrixElementImpl.java?ref=0492aafe3780886c3936544ffed92c1bcc587431", "deletions": 14, "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/math/impl/MatrixElementImpl.java", "new_code": " protected static final String ROW_EDEFAULT = null;\n protected String row = ROW_EDEFAULT;\n protected static final String COLUMN_EDEFAULT = null;\n protected String column = COLUMN_EDEFAULT;\n public String getRow()\n public void setRow(String newRow)\n String oldRow = row;\n public String getColumn()\n public void setColumn(String newColumn)\n String oldColumn = column;\n setRow((String)newValue);\n setColumn((String)newValue);\n return ROW_EDEFAULT == null ? row != null : !ROW_EDEFAULT.equals(row);\n return COLUMN_EDEFAULT == null ? column != null : !COLUMN_EDEFAULT.equals(column);", "new_methods": [], "old_code": " protected static final int ROW_EDEFAULT = 0;\n protected int row = ROW_EDEFAULT;\n protected static final int COLUMN_EDEFAULT = 0;\n protected int column = COLUMN_EDEFAULT;\n public int getRow()\n public void setRow(int newRow)\n int oldRow = row;\n public int getColumn()\n public void setColumn(int newColumn)\n int oldColumn = column;\n setRow((Integer)newValue);\n setColumn((Integer)newValue);\n return row != ROW_EDEFAULT;\n return column != COLUMN_EDEFAULT;", "old_methods": [], "patch": "@@ -60,7 +60,7 @@ public class MatrixElementImpl extends ExpressionImpl implements MatrixElement\n * @generated\n * @ordered\n */\n- protected static final int ROW_EDEFAULT = 0;\n+ protected static final String ROW_EDEFAULT = null;\n \n /**\n * The cached value of the '{@link #getRow() <em>Row</em>}' attribute.\n@@ -70,7 +70,7 @@ public class MatrixElementImpl extends ExpressionImpl implements MatrixElement\n * @generated\n * @ordered\n */\n- protected int row = ROW_EDEFAULT;\n+ protected String row = ROW_EDEFAULT;\n \n /**\n * The default value of the '{@link #getColumn() <em>Column</em>}' attribute.\n@@ -80,7 +80,7 @@ public class MatrixElementImpl extends ExpressionImpl implements MatrixElement\n * @generated\n * @ordered\n */\n- protected static final int COLUMN_EDEFAULT = 0;\n+ protected static final String COLUMN_EDEFAULT = null;\n \n /**\n * The cached value of the '{@link #getColumn() <em>Column</em>}' attribute.\n@@ -90,7 +90,7 @@ public class MatrixElementImpl extends ExpressionImpl implements MatrixElement\n * @generated\n * @ordered\n */\n- protected int column = COLUMN_EDEFAULT;\n+ protected String column = COLUMN_EDEFAULT;\n \n /**\n * <!-- begin-user-doc -->\n@@ -141,7 +141,7 @@ public void setElement(String newElement)\n * <!-- end-user-doc -->\n * @generated\n */\n- public int getRow()\n+ public String getRow()\n {\n return row;\n }\n@@ -151,9 +151,9 @@ public int getRow()\n * <!-- end-user-doc -->\n * @generated\n */\n- public void setRow(int newRow)\n+ public void setRow(String newRow)\n {\n- int oldRow = row;\n+ String oldRow = row;\n row = newRow;\n if (eNotificationRequired())\n eNotify(new ENotificationImpl(this, Notification.SET, MathPackage.MATRIX_ELEMENT__ROW, oldRow, row));\n@@ -164,7 +164,7 @@ public void setRow(int newRow)\n * <!-- end-user-doc -->\n * @generated\n */\n- public int getColumn()\n+ public String getColumn()\n {\n return column;\n }\n@@ -174,9 +174,9 @@ public int getColumn()\n * <!-- end-user-doc -->\n * @generated\n */\n- public void setColumn(int newColumn)\n+ public void setColumn(String newColumn)\n {\n- int oldColumn = column;\n+ String oldColumn = column;\n column = newColumn;\n if (eNotificationRequired())\n eNotify(new ENotificationImpl(this, Notification.SET, MathPackage.MATRIX_ELEMENT__COLUMN, oldColumn, column));\n@@ -216,10 +216,10 @@ public void eSet(int featureID, Object newValue)\n setElement((String)newValue);\n return;\n case MathPackage.MATRIX_ELEMENT__ROW:\n- setRow((Integer)newValue);\n+ setRow((String)newValue);\n return;\n case MathPackage.MATRIX_ELEMENT__COLUMN:\n- setColumn((Integer)newValue);\n+ setColumn((String)newValue);\n return;\n }\n super.eSet(featureID, newValue);\n@@ -261,9 +261,9 @@ public boolean eIsSet(int featureID)\n case MathPackage.MATRIX_ELEMENT__ELEMENT:\n return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);\n case MathPackage.MATRIX_ELEMENT__ROW:\n- return row != ROW_EDEFAULT;\n+ return ROW_EDEFAULT == null ? row != null : !ROW_EDEFAULT.equals(row);\n case MathPackage.MATRIX_ELEMENT__COLUMN:\n- return column != COLUMN_EDEFAULT;\n+ return COLUMN_EDEFAULT == null ? column != null : !COLUMN_EDEFAULT.equals(column);\n }\n return super.eIsSet(featureID);\n }", "raw_url": "https://github.com/iee/iee/raw/0492aafe3780886c3936544ffed92c1bcc587431/org.eclipse.iee.translator.Jmole%2Forg.eclipse.iee.translator.jmole.math%2Fsrc-gen%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fjmole%2Fmath%2Fmath%2Fimpl%2FMatrixElementImpl.java", "sha": "4fa6710944dd564939f80aa5b6cd0e33e3d818a0", "status": "modified" }, { "additions": 16, "blob_url": "https://github.com/iee/iee/blob/0492aafe3780886c3936544ffed92c1bcc587431/org.eclipse.iee.translator.Jmole%2Forg.eclipse.iee.translator.jmole.math%2Fsrc-gen%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fjmole%2Fmath%2Fparser%2Fantlr%2Finternal%2FInternalMath.g", "changes": 32, "contents_url": "https://api.github.com/repos/iee/iee/contents/org.eclipse.iee.translator.Jmole%2Forg.eclipse.iee.translator.jmole.math%2Fsrc-gen%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fjmole%2Fmath%2Fparser%2Fantlr%2Finternal%2FInternalMath.g?ref=0492aafe3780886c3936544ffed92c1bcc587431", "deletions": 16, "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g", "new_code": "\t\t{ \n\t newCompositeNode(grammarAccess.getPrimaryAccess().getRowFloatParserRuleCall_2_3_0()); \n\t }\n\t\tlv_row_7_0=ruleFloat\t\t{\n\t $current = createModelElementForParent(grammarAccess.getPrimaryRule());\n \t\tset(\n \t\t\"Float\");\n\t afterParserOrEnumRuleCall();\n\t\t{ \n\t newCompositeNode(grammarAccess.getPrimaryAccess().getColumnFloatParserRuleCall_2_6_0()); \n\t }\n\t\tlv_column_10_0=ruleFloat\t\t{\n\t $current = createModelElementForParent(grammarAccess.getPrimaryRule());\n \t\tset(\n \t\t\"Float\");\n\t afterParserOrEnumRuleCall();", "new_methods": [], "old_code": "\t\tlv_row_7_0=RULE_INT\n\t\t{\n\t\t\tnewLeafNode(lv_row_7_0, grammarAccess.getPrimaryAccess().getRowINTTerminalRuleCall_2_3_0()); \n\t\t}\n\t\t{\n\t $current = createModelElement(grammarAccess.getPrimaryRule());\n \t\tsetWithLastConsumed(\n \t\t\"INT\");\n\t\tlv_column_10_0=RULE_INT\n\t\t{\n\t\t\tnewLeafNode(lv_column_10_0, grammarAccess.getPrimaryAccess().getColumnINTTerminalRuleCall_2_6_0()); \n\t\t}\n\t\t{\n\t $current = createModelElement(grammarAccess.getPrimaryRule());\n \t\tsetWithLastConsumed(\n \t\t\"INT\");", "old_methods": [], "patch": "@@ -780,19 +780,19 @@ rulePrimary returns [EObject current=null]\n }\n (\n (\n-\t\tlv_row_7_0=RULE_INT\n-\t\t{\n-\t\t\tnewLeafNode(lv_row_7_0, grammarAccess.getPrimaryAccess().getRowINTTerminalRuleCall_2_3_0()); \n-\t\t}\n-\t\t{\n+\t\t{ \n+\t newCompositeNode(grammarAccess.getPrimaryAccess().getRowFloatParserRuleCall_2_3_0()); \n+\t }\n+\t\tlv_row_7_0=ruleFloat\t\t{\n \t if ($current==null) {\n-\t $current = createModelElement(grammarAccess.getPrimaryRule());\n+\t $current = createModelElementForParent(grammarAccess.getPrimaryRule());\n \t }\n- \t\tsetWithLastConsumed(\n+ \t\tset(\n \t\t\t$current, \n \t\t\t\"row\",\n \t\tlv_row_7_0, \n- \t\t\"INT\");\n+ \t\t\"Float\");\n+\t afterParserOrEnumRuleCall();\n \t }\n \n )\n@@ -806,19 +806,19 @@ rulePrimary returns [EObject current=null]\n }\n (\n (\n-\t\tlv_column_10_0=RULE_INT\n-\t\t{\n-\t\t\tnewLeafNode(lv_column_10_0, grammarAccess.getPrimaryAccess().getColumnINTTerminalRuleCall_2_6_0()); \n-\t\t}\n-\t\t{\n+\t\t{ \n+\t newCompositeNode(grammarAccess.getPrimaryAccess().getColumnFloatParserRuleCall_2_6_0()); \n+\t }\n+\t\tlv_column_10_0=ruleFloat\t\t{\n \t if ($current==null) {\n-\t $current = createModelElement(grammarAccess.getPrimaryRule());\n+\t $current = createModelElementForParent(grammarAccess.getPrimaryRule());\n \t }\n- \t\tsetWithLastConsumed(\n+ \t\tset(\n \t\t\t$current, \n \t\t\t\"column\",\n \t\tlv_column_10_0, \n- \t\t\"INT\");\n+ \t\t\"Float\");\n+\t afterParserOrEnumRuleCall();\n \t }\n \n )", "raw_url": "https://github.com/iee/iee/raw/0492aafe3780886c3936544ffed92c1bcc587431/org.eclipse.iee.translator.Jmole%2Forg.eclipse.iee.translator.jmole.math%2Fsrc-gen%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fjmole%2Fmath%2Fparser%2Fantlr%2Finternal%2FInternalMath.g", "sha": "9c199e006c51f9557cff866e21d95238df6dffb2", "status": "modified" }, { "additions": 118, "blob_url": "https://github.com/iee/iee/blob/0492aafe3780886c3936544ffed92c1bcc587431/org.eclipse.iee.translator.Jmole%2Forg.eclipse.iee.translator.jmole.math%2Fsrc-gen%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fjmole%2Fmath%2Fserializer%2FAbstractMathSemanticSequencer.java", "changes": 236, "contents_url": "https://api.github.com/repos/iee/iee/contents/org.eclipse.iee.translator.Jmole%2Forg.eclipse.iee.translator.jmole.math%2Fsrc-gen%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fjmole%2Fmath%2Fserializer%2FAbstractMathSemanticSequencer.java?ref=0492aafe3780886c3936544ffed92c1bcc587431", "deletions": 118, "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/serializer/AbstractMathSemanticSequencer.java", "new_code": "\t\t\t\t context == grammarAccess.getExponentRule() ||\n\t\t\t\t context == grammarAccess.getExponentAccess().getExponentLeftAction_1_0() ||\n\t\t\t\t context == grammarAccess.getMultiplicationAccess().getMultiplicationLeftAction_1_0_1() ||\n\t\t\t\t context == grammarAccess.getPrimaryRule() ||\n\t\t\t\t context == grammarAccess.getUnaryExpressionRule()) {\n\t\t\t\t\tsequence_Addition(context, (Addition) semanticObject); \n\t\t\t\t context == grammarAccess.getExponentRule() ||\n\t\t\t\t context == grammarAccess.getExponentAccess().getExponentLeftAction_1_0() ||\n\t\t\t\t context == grammarAccess.getMultiplicationAccess().getMultiplicationLeftAction_1_0_1() ||\n\t\t\t\t context == grammarAccess.getPrimaryRule() ||\n\t\t\t\t context == grammarAccess.getUnaryExpressionRule()) {\n\t\t\t\t\tsequence_Multiplication(context, (Division) semanticObject); \n\t\t\t\t context == grammarAccess.getExponentRule() ||\n\t\t\t\t context == grammarAccess.getExponentAccess().getExponentLeftAction_1_0() ||\n\t\t\t\t context == grammarAccess.getMultiplicationAccess().getMultiplicationLeftAction_1_0_1() ||\n\t\t\t\t context == grammarAccess.getPrimaryRule() ||\n\t\t\t\t context == grammarAccess.getUnaryExpressionRule()) {\n\t\t\t\t\tsequence_Exponent(context, (Exponent) semanticObject); \n\t\t\t\t\tsequence_Function(context, (Expression) semanticObject); \n\t\t\t\t context == grammarAccess.getExponentRule() ||\n\t\t\t\t context == grammarAccess.getExponentAccess().getExponentLeftAction_1_0() ||\n\t\t\t\t context == grammarAccess.getMultiplicationAccess().getMultiplicationLeftAction_1_0_1() ||\n\t\t\t\t context == grammarAccess.getPrimaryRule() ||\n\t\t\t\t context == grammarAccess.getUnaryExpressionRule()) {\n\t\t\t\t\tsequence_UnaryExpression(context, (Factorial) semanticObject); \n\t\t\t\t context == grammarAccess.getExponentRule() ||\n\t\t\t\t context == grammarAccess.getExponentAccess().getExponentLeftAction_1_0() ||\n\t\t\t\t context == grammarAccess.getMultiplicationAccess().getMultiplicationLeftAction_1_0_1() ||\n\t\t\t\t context == grammarAccess.getPrimaryRule() ||\n\t\t\t\t context == grammarAccess.getUnaryExpressionRule()) {\n\t\t\t\t\tsequence_Primary(context, (org.eclipse.iee.translator.jmole.math.math.Float) semanticObject); \n\t\t\t\t\tsequence_Formula(context, (Formula) semanticObject); \n\t\t\t\t context == grammarAccess.getExponentRule() ||\n\t\t\t\t context == grammarAccess.getExponentAccess().getExponentLeftAction_1_0() ||\n\t\t\t\t context == grammarAccess.getMultiplicationAccess().getMultiplicationLeftAction_1_0_1() ||\n\t\t\t\t context == grammarAccess.getPrimaryRule() ||\n\t\t\t\t context == grammarAccess.getUnaryExpressionRule()) {\n\t\t\t\t\tsequence_Primary(context, (Function) semanticObject); \n\t\t\t\t\tsequence_FunctionDefinition(context, (FunctionDefinition) semanticObject); \n\t\t\t\t context == grammarAccess.getExponentRule() ||\n\t\t\t\t context == grammarAccess.getExponentAccess().getExponentLeftAction_1_0() ||\n\t\t\t\t context == grammarAccess.getMultiplicationAccess().getMultiplicationLeftAction_1_0_1() ||\n\t\t\t\t context == grammarAccess.getPrimaryRule() ||\n\t\t\t\t context == grammarAccess.getUnaryExpressionRule()) {\n\t\t\t\t\tsequence_UnaryExpression(context, (Invert) semanticObject); \n\t\t\t\t\tsequence_Matrix(context, (Matrix) semanticObject); \n\t\t\t\t\tsequence_MatrixAddition(context, (MatrixAddition) semanticObject); \n\t\t\t\t\tsequence_MatrixAssignment(context, (MatrixAssignment) semanticObject); \n\t\t\t\t context == grammarAccess.getExponentRule() ||\n\t\t\t\t context == grammarAccess.getExponentAccess().getExponentLeftAction_1_0() ||\n\t\t\t\t context == grammarAccess.getMultiplicationAccess().getMultiplicationLeftAction_1_0_1() ||\n\t\t\t\t context == grammarAccess.getPrimaryRule() ||\n\t\t\t\t context == grammarAccess.getUnaryExpressionRule()) {\n\t\t\t\t\tsequence_Primary(context, (MatrixElement) semanticObject); \n\t\t\t\t\tsequence_MatrixFormula(context, (MatrixFormula) semanticObject); \n\t\t\t\t\tsequence_MatrixMultiplication(context, (MatrixMultiplication) semanticObject); \n\t\t\t\t\tsequence_MatrixRow(context, (MatrixRow) semanticObject); \n\t\t\t\t\tsequence_MatrixAddition(context, (MatrixSubtraction) semanticObject); \n\t\t\t\t\tsequence_PrimaryMatrix(context, (MatrixVariable) semanticObject); \n\t\t\t\t context == grammarAccess.getExponentRule() ||\n\t\t\t\t context == grammarAccess.getExponentAccess().getExponentLeftAction_1_0() ||\n\t\t\t\t context == grammarAccess.getMultiplicationAccess().getMultiplicationLeftAction_1_0_1() ||\n\t\t\t\t context == grammarAccess.getPrimaryRule() ||\n\t\t\t\t context == grammarAccess.getUnaryExpressionRule()) {\n\t\t\t\t\tsequence_Multiplication(context, (Modulo) semanticObject); \n\t\t\t\t context == grammarAccess.getExponentRule() ||\n\t\t\t\t context == grammarAccess.getExponentAccess().getExponentLeftAction_1_0() ||\n\t\t\t\t context == grammarAccess.getMultiplicationAccess().getMultiplicationLeftAction_1_0_1() ||\n\t\t\t\t context == grammarAccess.getPrimaryRule() ||\n\t\t\t\t context == grammarAccess.getUnaryExpressionRule()) {\n\t\t\t\t\tsequence_Multiplication(context, (Multiplication) semanticObject); \n\t\t\t\t\tsequence_PrimaryMatrix(context, (NewMatrix) semanticObject); \n\t\t\t\t\tsequence_Statement(context, (Statement) semanticObject); \n\t\t\t\t context == grammarAccess.getExponentRule() ||\n\t\t\t\t context == grammarAccess.getExponentAccess().getExponentLeftAction_1_0() ||\n\t\t\t\t context == grammarAccess.getMultiplicationAccess().getMultiplicationLeftAction_1_0_1() ||\n\t\t\t\t context == grammarAccess.getPrimaryRule() ||\n\t\t\t\t context == grammarAccess.getUnaryExpressionRule()) {\n\t\t\t\t\tsequence_Addition(context, (Subtraction) semanticObject); \n\t\t\t\t\tsequence_PrimaryMatrix(context, (TransposeMatrix) semanticObject); \n\t\t\t\t context == grammarAccess.getExponentRule() ||\n\t\t\t\t context == grammarAccess.getExponentAccess().getExponentLeftAction_1_0() ||\n\t\t\t\t context == grammarAccess.getMultiplicationAccess().getMultiplicationLeftAction_1_0_1() ||\n\t\t\t\t context == grammarAccess.getPrimaryRule() ||\n\t\t\t\t context == grammarAccess.getUnaryExpressionRule()) {\n\t\t\t\t\tsequence_Primary(context, (Variable) semanticObject); \n\t\t\t\t\tsequence_VariableAssignment(context, (VariableAssignment) semanticObject); \n\tprotected void sequence_Addition(EObject context, Addition semanticObject) {\n\tprotected void sequence_Addition(EObject context, Subtraction semanticObject) {\n\tprotected void sequence_Exponent(EObject context, Exponent semanticObject) {\n\tprotected void sequence_Formula(EObject context, Formula semanticObject) {\n\tprotected void sequence_FunctionDefinition(EObject context, FunctionDefinition semanticObject) {\n\tprotected void sequence_Function(EObject context, Expression semanticObject) {\n\tprotected void sequence_MatrixAddition(EObject context, MatrixAddition semanticObject) {\n\tprotected void sequence_MatrixAddition(EObject context, MatrixSubtraction semanticObject) {\n\tprotected void sequence_MatrixAssignment(EObject context, MatrixAssignment semanticObject) {\n\tprotected void sequence_MatrixFormula(EObject context, MatrixFormula semanticObject) {\n\t * left[0, 2]\n\t * rightMatrix[0, 1]\n\t * rightScalar[0, 1]\n\tprotected void sequence_MatrixMultiplication(EObject context, MatrixMultiplication semanticObject) {\n\tprotected void sequence_MatrixRow(EObject context, MatrixRow semanticObject) {\n\tprotected void sequence_Matrix(EObject context, Matrix semanticObject) {\n\tprotected void sequence_Multiplication(EObject context, Division semanticObject) {\n\tprotected void sequence_Multiplication(EObject context, Modulo semanticObject) {\n\tprotected void sequence_Multiplication(EObject context, Multiplication semanticObject) {\n\tprotected void sequence_PrimaryMatrix(EObject context, MatrixVariable semanticObject) {\n\tprotected void sequence_PrimaryMatrix(EObject context, NewMatrix semanticObject) {\n\tprotected void sequence_PrimaryMatrix(EObject context, TransposeMatrix semanticObject) {\n\tprotected void sequence_Primary(EObject context, org.eclipse.iee.translator.jmole.math.math.Float semanticObject) {\n\tprotected void sequence_Primary(EObject context, Function semanticObject) {\n\t * (element=MATH_NAME row=Float column=Float)\n\tprotected void sequence_Primary(EObject context, MatrixElement semanticObject) {\n\tprotected void sequence_Primary(EObject context, Variable semanticObject) {\n\tprotected void sequence_Statement(EObject context, Statement semanticObject) {\n\tprotected void sequence_UnaryExpression(EObject context, Factorial semanticObject) {\n\tprotected void sequence_UnaryExpression(EObject context, Invert semanticObject) {\n\tprotected void sequence_VariableAssignment(EObject context, VariableAssignment semanticObject) {", "new_methods": [], "old_code": "\t\t\t\t context == grammarAccess.getMultiplicationAccess().getMultiplicationLeftAction_1_0_1() ||\n\t\t\t\t context == grammarAccess.getUnaryExpressionRule() ||\n\t\t\t\t context == grammarAccess.getExponentRule() ||\n\t\t\t\t context == grammarAccess.getExponentAccess().getExponentLeftAction_1_0() ||\n\t\t\t\t context == grammarAccess.getPrimaryRule()) {\n\t\t\t\t\tsequence_Addition_Addition(context, (Addition) semanticObject); \n\t\t\t\t context == grammarAccess.getMultiplicationAccess().getMultiplicationLeftAction_1_0_1() ||\n\t\t\t\t context == grammarAccess.getUnaryExpressionRule() ||\n\t\t\t\t context == grammarAccess.getExponentRule() ||\n\t\t\t\t context == grammarAccess.getExponentAccess().getExponentLeftAction_1_0() ||\n\t\t\t\t context == grammarAccess.getPrimaryRule()) {\n\t\t\t\t\tsequence_Multiplication_Division(context, (Division) semanticObject); \n\t\t\t\t context == grammarAccess.getMultiplicationAccess().getMultiplicationLeftAction_1_0_1() ||\n\t\t\t\t context == grammarAccess.getUnaryExpressionRule() ||\n\t\t\t\t context == grammarAccess.getExponentRule() ||\n\t\t\t\t context == grammarAccess.getExponentAccess().getExponentLeftAction_1_0() ||\n\t\t\t\t context == grammarAccess.getPrimaryRule()) {\n\t\t\t\t\tsequence_Exponent_Exponent(context, (Exponent) semanticObject); \n\t\t\t\t\tsequence_Function_Expression(context, (Expression) semanticObject); \n\t\t\t\t context == grammarAccess.getMultiplicationAccess().getMultiplicationLeftAction_1_0_1() ||\n\t\t\t\t context == grammarAccess.getUnaryExpressionRule() ||\n\t\t\t\t context == grammarAccess.getExponentRule() ||\n\t\t\t\t context == grammarAccess.getExponentAccess().getExponentLeftAction_1_0() ||\n\t\t\t\t context == grammarAccess.getPrimaryRule()) {\n\t\t\t\t\tsequence_UnaryExpression_Factorial(context, (Factorial) semanticObject); \n\t\t\t\t context == grammarAccess.getMultiplicationAccess().getMultiplicationLeftAction_1_0_1() ||\n\t\t\t\t context == grammarAccess.getUnaryExpressionRule() ||\n\t\t\t\t context == grammarAccess.getExponentRule() ||\n\t\t\t\t context == grammarAccess.getExponentAccess().getExponentLeftAction_1_0() ||\n\t\t\t\t context == grammarAccess.getPrimaryRule()) {\n\t\t\t\t\tsequence_Primary_Float(context, (org.eclipse.iee.translator.jmole.math.math.Float) semanticObject); \n\t\t\t\t\tsequence_Formula_Formula(context, (Formula) semanticObject); \n\t\t\t\t context == grammarAccess.getMultiplicationAccess().getMultiplicationLeftAction_1_0_1() ||\n\t\t\t\t context == grammarAccess.getUnaryExpressionRule() ||\n\t\t\t\t context == grammarAccess.getExponentRule() ||\n\t\t\t\t context == grammarAccess.getExponentAccess().getExponentLeftAction_1_0() ||\n\t\t\t\t context == grammarAccess.getPrimaryRule()) {\n\t\t\t\t\tsequence_Primary_Function(context, (Function) semanticObject); \n\t\t\t\t\tsequence_FunctionDefinition_FunctionDefinition(context, (FunctionDefinition) semanticObject); \n\t\t\t\t context == grammarAccess.getMultiplicationAccess().getMultiplicationLeftAction_1_0_1() ||\n\t\t\t\t context == grammarAccess.getUnaryExpressionRule() ||\n\t\t\t\t context == grammarAccess.getExponentRule() ||\n\t\t\t\t context == grammarAccess.getExponentAccess().getExponentLeftAction_1_0() ||\n\t\t\t\t context == grammarAccess.getPrimaryRule()) {\n\t\t\t\t\tsequence_UnaryExpression_Invert(context, (Invert) semanticObject); \n\t\t\t\t\tsequence_Matrix_Matrix(context, (Matrix) semanticObject); \n\t\t\t\t\tsequence_MatrixAddition_MatrixAddition(context, (MatrixAddition) semanticObject); \n\t\t\t\t\tsequence_MatrixAssignment_MatrixAssignment(context, (MatrixAssignment) semanticObject); \n\t\t\t\t context == grammarAccess.getMultiplicationAccess().getMultiplicationLeftAction_1_0_1() ||\n\t\t\t\t context == grammarAccess.getUnaryExpressionRule() ||\n\t\t\t\t context == grammarAccess.getExponentRule() ||\n\t\t\t\t context == grammarAccess.getExponentAccess().getExponentLeftAction_1_0() ||\n\t\t\t\t context == grammarAccess.getPrimaryRule()) {\n\t\t\t\t\tsequence_Primary_MatrixElement(context, (MatrixElement) semanticObject); \n\t\t\t\t\tsequence_MatrixFormula_MatrixFormula(context, (MatrixFormula) semanticObject); \n\t\t\t\t\tsequence_MatrixMultiplication_MatrixMultiplication(context, (MatrixMultiplication) semanticObject); \n\t\t\t\t\tsequence_MatrixRow_MatrixRow(context, (MatrixRow) semanticObject); \n\t\t\t\t\tsequence_MatrixAddition_MatrixSubtraction(context, (MatrixSubtraction) semanticObject); \n\t\t\t\t\tsequence_PrimaryMatrix_MatrixVariable(context, (MatrixVariable) semanticObject); \n\t\t\t\t context == grammarAccess.getMultiplicationAccess().getMultiplicationLeftAction_1_0_1() ||\n\t\t\t\t context == grammarAccess.getUnaryExpressionRule() ||\n\t\t\t\t context == grammarAccess.getExponentRule() ||\n\t\t\t\t context == grammarAccess.getExponentAccess().getExponentLeftAction_1_0() ||\n\t\t\t\t context == grammarAccess.getPrimaryRule()) {\n\t\t\t\t\tsequence_Multiplication_Modulo(context, (Modulo) semanticObject); \n\t\t\t\t context == grammarAccess.getMultiplicationAccess().getMultiplicationLeftAction_1_0_1() ||\n\t\t\t\t context == grammarAccess.getUnaryExpressionRule() ||\n\t\t\t\t context == grammarAccess.getExponentRule() ||\n\t\t\t\t context == grammarAccess.getExponentAccess().getExponentLeftAction_1_0() ||\n\t\t\t\t context == grammarAccess.getPrimaryRule()) {\n\t\t\t\t\tsequence_Multiplication_Multiplication(context, (Multiplication) semanticObject); \n\t\t\t\t\tsequence_PrimaryMatrix_NewMatrix(context, (NewMatrix) semanticObject); \n\t\t\t\t\tsequence_Statement_Statement(context, (Statement) semanticObject); \n\t\t\t\t context == grammarAccess.getMultiplicationAccess().getMultiplicationLeftAction_1_0_1() ||\n\t\t\t\t context == grammarAccess.getUnaryExpressionRule() ||\n\t\t\t\t context == grammarAccess.getExponentRule() ||\n\t\t\t\t context == grammarAccess.getExponentAccess().getExponentLeftAction_1_0() ||\n\t\t\t\t context == grammarAccess.getPrimaryRule()) {\n\t\t\t\t\tsequence_Addition_Subtraction(context, (Subtraction) semanticObject); \n\t\t\t\t\tsequence_PrimaryMatrix_TransposeMatrix(context, (TransposeMatrix) semanticObject); \n\t\t\t\t context == grammarAccess.getMultiplicationAccess().getMultiplicationLeftAction_1_0_1() ||\n\t\t\t\t context == grammarAccess.getUnaryExpressionRule() ||\n\t\t\t\t context == grammarAccess.getExponentRule() ||\n\t\t\t\t context == grammarAccess.getExponentAccess().getExponentLeftAction_1_0() ||\n\t\t\t\t context == grammarAccess.getPrimaryRule()) {\n\t\t\t\t\tsequence_Primary_Variable(context, (Variable) semanticObject); \n\t\t\t\t\tsequence_VariableAssignment_VariableAssignment(context, (VariableAssignment) semanticObject); \n\tprotected void sequence_Addition_Addition(EObject context, Addition semanticObject) {\n\tprotected void sequence_Addition_Subtraction(EObject context, Subtraction semanticObject) {\n\tprotected void sequence_Exponent_Exponent(EObject context, Exponent semanticObject) {\n\tprotected void sequence_Formula_Formula(EObject context, Formula semanticObject) {\n\tprotected void sequence_FunctionDefinition_FunctionDefinition(EObject context, FunctionDefinition semanticObject) {\n\tprotected void sequence_Function_Expression(EObject context, Expression semanticObject) {\n\tprotected void sequence_MatrixAddition_MatrixAddition(EObject context, MatrixAddition semanticObject) {\n\tprotected void sequence_MatrixAddition_MatrixSubtraction(EObject context, MatrixSubtraction semanticObject) {\n\tprotected void sequence_MatrixAssignment_MatrixAssignment(EObject context, MatrixAssignment semanticObject) {\n\tprotected void sequence_MatrixFormula_MatrixFormula(EObject context, MatrixFormula semanticObject) {\n\t * left[2, 2]\n\t * rightMatrix[1, 1]\n\t * rightScalar[1, 1]\n\tprotected void sequence_MatrixMultiplication_MatrixMultiplication(EObject context, MatrixMultiplication semanticObject) {\n\tprotected void sequence_MatrixRow_MatrixRow(EObject context, MatrixRow semanticObject) {\n\tprotected void sequence_Matrix_Matrix(EObject context, Matrix semanticObject) {\n\tprotected void sequence_Multiplication_Division(EObject context, Division semanticObject) {\n\tprotected void sequence_Multiplication_Modulo(EObject context, Modulo semanticObject) {\n\tprotected void sequence_Multiplication_Multiplication(EObject context, Multiplication semanticObject) {\n\tprotected void sequence_PrimaryMatrix_MatrixVariable(EObject context, MatrixVariable semanticObject) {\n\tprotected void sequence_PrimaryMatrix_NewMatrix(EObject context, NewMatrix semanticObject) {\n\tprotected void sequence_PrimaryMatrix_TransposeMatrix(EObject context, TransposeMatrix semanticObject) {\n\tprotected void sequence_Primary_Float(EObject context, org.eclipse.iee.translator.jmole.math.math.Float semanticObject) {\n\tprotected void sequence_Primary_Function(EObject context, Function semanticObject) {\n\t * (element=MATH_NAME row=INT column=INT)\n\tprotected void sequence_Primary_MatrixElement(EObject context, MatrixElement semanticObject) {\n\tprotected void sequence_Primary_Variable(EObject context, Variable semanticObject) {\n\tprotected void sequence_Statement_Statement(EObject context, Statement semanticObject) {\n\tprotected void sequence_UnaryExpression_Factorial(EObject context, Factorial semanticObject) {\n\tprotected void sequence_UnaryExpression_Invert(EObject context, Invert semanticObject) {\n\tprotected void sequence_VariableAssignment_VariableAssignment(EObject context, VariableAssignment semanticObject) {", "old_methods": [], "patch": "@@ -74,135 +74,135 @@ public void createSequence(EObject context, EObject semanticObject) {\n \t\t\t\tif(context == grammarAccess.getAdditionRule() ||\n \t\t\t\t context == grammarAccess.getAdditionAccess().getAdditionLeftAction_1_0_1() ||\n \t\t\t\t context == grammarAccess.getAdditionAccess().getSubtractionLeftAction_1_1_1() ||\n+\t\t\t\t context == grammarAccess.getExponentRule() ||\n+\t\t\t\t context == grammarAccess.getExponentAccess().getExponentLeftAction_1_0() ||\n \t\t\t\t context == grammarAccess.getMultiplicationRule() ||\n-\t\t\t\t context == grammarAccess.getMultiplicationAccess().getMultiplicationLeftAction_1_0_1() ||\n \t\t\t\t context == grammarAccess.getMultiplicationAccess().getDivisionLeftAction_1_1_1() ||\n \t\t\t\t context == grammarAccess.getMultiplicationAccess().getModuloLeftAction_1_2_1() ||\n-\t\t\t\t context == grammarAccess.getUnaryExpressionRule() ||\n-\t\t\t\t context == grammarAccess.getExponentRule() ||\n-\t\t\t\t context == grammarAccess.getExponentAccess().getExponentLeftAction_1_0() ||\n-\t\t\t\t context == grammarAccess.getPrimaryRule()) {\n-\t\t\t\t\tsequence_Addition_Addition(context, (Addition) semanticObject); \n+\t\t\t\t context == grammarAccess.getMultiplicationAccess().getMultiplicationLeftAction_1_0_1() ||\n+\t\t\t\t context == grammarAccess.getPrimaryRule() ||\n+\t\t\t\t context == grammarAccess.getUnaryExpressionRule()) {\n+\t\t\t\t\tsequence_Addition(context, (Addition) semanticObject); \n \t\t\t\t\treturn; \n \t\t\t\t}\n \t\t\t\telse break;\n \t\t\tcase MathPackage.DIVISION:\n \t\t\t\tif(context == grammarAccess.getAdditionRule() ||\n \t\t\t\t context == grammarAccess.getAdditionAccess().getAdditionLeftAction_1_0_1() ||\n \t\t\t\t context == grammarAccess.getAdditionAccess().getSubtractionLeftAction_1_1_1() ||\n+\t\t\t\t context == grammarAccess.getExponentRule() ||\n+\t\t\t\t context == grammarAccess.getExponentAccess().getExponentLeftAction_1_0() ||\n \t\t\t\t context == grammarAccess.getMultiplicationRule() ||\n-\t\t\t\t context == grammarAccess.getMultiplicationAccess().getMultiplicationLeftAction_1_0_1() ||\n \t\t\t\t context == grammarAccess.getMultiplicationAccess().getDivisionLeftAction_1_1_1() ||\n \t\t\t\t context == grammarAccess.getMultiplicationAccess().getModuloLeftAction_1_2_1() ||\n-\t\t\t\t context == grammarAccess.getUnaryExpressionRule() ||\n-\t\t\t\t context == grammarAccess.getExponentRule() ||\n-\t\t\t\t context == grammarAccess.getExponentAccess().getExponentLeftAction_1_0() ||\n-\t\t\t\t context == grammarAccess.getPrimaryRule()) {\n-\t\t\t\t\tsequence_Multiplication_Division(context, (Division) semanticObject); \n+\t\t\t\t context == grammarAccess.getMultiplicationAccess().getMultiplicationLeftAction_1_0_1() ||\n+\t\t\t\t context == grammarAccess.getPrimaryRule() ||\n+\t\t\t\t context == grammarAccess.getUnaryExpressionRule()) {\n+\t\t\t\t\tsequence_Multiplication(context, (Division) semanticObject); \n \t\t\t\t\treturn; \n \t\t\t\t}\n \t\t\t\telse break;\n \t\t\tcase MathPackage.EXPONENT:\n \t\t\t\tif(context == grammarAccess.getAdditionRule() ||\n \t\t\t\t context == grammarAccess.getAdditionAccess().getAdditionLeftAction_1_0_1() ||\n \t\t\t\t context == grammarAccess.getAdditionAccess().getSubtractionLeftAction_1_1_1() ||\n+\t\t\t\t context == grammarAccess.getExponentRule() ||\n+\t\t\t\t context == grammarAccess.getExponentAccess().getExponentLeftAction_1_0() ||\n \t\t\t\t context == grammarAccess.getMultiplicationRule() ||\n-\t\t\t\t context == grammarAccess.getMultiplicationAccess().getMultiplicationLeftAction_1_0_1() ||\n \t\t\t\t context == grammarAccess.getMultiplicationAccess().getDivisionLeftAction_1_1_1() ||\n \t\t\t\t context == grammarAccess.getMultiplicationAccess().getModuloLeftAction_1_2_1() ||\n-\t\t\t\t context == grammarAccess.getUnaryExpressionRule() ||\n-\t\t\t\t context == grammarAccess.getExponentRule() ||\n-\t\t\t\t context == grammarAccess.getExponentAccess().getExponentLeftAction_1_0() ||\n-\t\t\t\t context == grammarAccess.getPrimaryRule()) {\n-\t\t\t\t\tsequence_Exponent_Exponent(context, (Exponent) semanticObject); \n+\t\t\t\t context == grammarAccess.getMultiplicationAccess().getMultiplicationLeftAction_1_0_1() ||\n+\t\t\t\t context == grammarAccess.getPrimaryRule() ||\n+\t\t\t\t context == grammarAccess.getUnaryExpressionRule()) {\n+\t\t\t\t\tsequence_Exponent(context, (Exponent) semanticObject); \n \t\t\t\t\treturn; \n \t\t\t\t}\n \t\t\t\telse break;\n \t\t\tcase MathPackage.EXPRESSION:\n \t\t\t\tif(context == grammarAccess.getFunctionRule()) {\n-\t\t\t\t\tsequence_Function_Expression(context, (Expression) semanticObject); \n+\t\t\t\t\tsequence_Function(context, (Expression) semanticObject); \n \t\t\t\t\treturn; \n \t\t\t\t}\n \t\t\t\telse break;\n \t\t\tcase MathPackage.FACTORIAL:\n \t\t\t\tif(context == grammarAccess.getAdditionRule() ||\n \t\t\t\t context == grammarAccess.getAdditionAccess().getAdditionLeftAction_1_0_1() ||\n \t\t\t\t context == grammarAccess.getAdditionAccess().getSubtractionLeftAction_1_1_1() ||\n+\t\t\t\t context == grammarAccess.getExponentRule() ||\n+\t\t\t\t context == grammarAccess.getExponentAccess().getExponentLeftAction_1_0() ||\n \t\t\t\t context == grammarAccess.getMultiplicationRule() ||\n-\t\t\t\t context == grammarAccess.getMultiplicationAccess().getMultiplicationLeftAction_1_0_1() ||\n \t\t\t\t context == grammarAccess.getMultiplicationAccess().getDivisionLeftAction_1_1_1() ||\n \t\t\t\t context == grammarAccess.getMultiplicationAccess().getModuloLeftAction_1_2_1() ||\n-\t\t\t\t context == grammarAccess.getUnaryExpressionRule() ||\n-\t\t\t\t context == grammarAccess.getExponentRule() ||\n-\t\t\t\t context == grammarAccess.getExponentAccess().getExponentLeftAction_1_0() ||\n-\t\t\t\t context == grammarAccess.getPrimaryRule()) {\n-\t\t\t\t\tsequence_UnaryExpression_Factorial(context, (Factorial) semanticObject); \n+\t\t\t\t context == grammarAccess.getMultiplicationAccess().getMultiplicationLeftAction_1_0_1() ||\n+\t\t\t\t context == grammarAccess.getPrimaryRule() ||\n+\t\t\t\t context == grammarAccess.getUnaryExpressionRule()) {\n+\t\t\t\t\tsequence_UnaryExpression(context, (Factorial) semanticObject); \n \t\t\t\t\treturn; \n \t\t\t\t}\n \t\t\t\telse break;\n \t\t\tcase MathPackage.FLOAT:\n \t\t\t\tif(context == grammarAccess.getAdditionRule() ||\n \t\t\t\t context == grammarAccess.getAdditionAccess().getAdditionLeftAction_1_0_1() ||\n \t\t\t\t context == grammarAccess.getAdditionAccess().getSubtractionLeftAction_1_1_1() ||\n+\t\t\t\t context == grammarAccess.getExponentRule() ||\n+\t\t\t\t context == grammarAccess.getExponentAccess().getExponentLeftAction_1_0() ||\n \t\t\t\t context == grammarAccess.getMultiplicationRule() ||\n-\t\t\t\t context == grammarAccess.getMultiplicationAccess().getMultiplicationLeftAction_1_0_1() ||\n \t\t\t\t context == grammarAccess.getMultiplicationAccess().getDivisionLeftAction_1_1_1() ||\n \t\t\t\t context == grammarAccess.getMultiplicationAccess().getModuloLeftAction_1_2_1() ||\n-\t\t\t\t context == grammarAccess.getUnaryExpressionRule() ||\n-\t\t\t\t context == grammarAccess.getExponentRule() ||\n-\t\t\t\t context == grammarAccess.getExponentAccess().getExponentLeftAction_1_0() ||\n-\t\t\t\t context == grammarAccess.getPrimaryRule()) {\n-\t\t\t\t\tsequence_Primary_Float(context, (org.eclipse.iee.translator.jmole.math.math.Float) semanticObject); \n+\t\t\t\t context == grammarAccess.getMultiplicationAccess().getMultiplicationLeftAction_1_0_1() ||\n+\t\t\t\t context == grammarAccess.getPrimaryRule() ||\n+\t\t\t\t context == grammarAccess.getUnaryExpressionRule()) {\n+\t\t\t\t\tsequence_Primary(context, (org.eclipse.iee.translator.jmole.math.math.Float) semanticObject); \n \t\t\t\t\treturn; \n \t\t\t\t}\n \t\t\t\telse break;\n \t\t\tcase MathPackage.FORMULA:\n \t\t\t\tif(context == grammarAccess.getFormulaRule()) {\n-\t\t\t\t\tsequence_Formula_Formula(context, (Formula) semanticObject); \n+\t\t\t\t\tsequence_Formula(context, (Formula) semanticObject); \n \t\t\t\t\treturn; \n \t\t\t\t}\n \t\t\t\telse break;\n \t\t\tcase MathPackage.FUNCTION:\n \t\t\t\tif(context == grammarAccess.getAdditionRule() ||\n \t\t\t\t context == grammarAccess.getAdditionAccess().getAdditionLeftAction_1_0_1() ||\n \t\t\t\t context == grammarAccess.getAdditionAccess().getSubtractionLeftAction_1_1_1() ||\n+\t\t\t\t context == grammarAccess.getExponentRule() ||\n+\t\t\t\t context == grammarAccess.getExponentAccess().getExponentLeftAction_1_0() ||\n \t\t\t\t context == grammarAccess.getMultiplicationRule() ||\n-\t\t\t\t context == grammarAccess.getMultiplicationAccess().getMultiplicationLeftAction_1_0_1() ||\n \t\t\t\t context == grammarAccess.getMultiplicationAccess().getDivisionLeftAction_1_1_1() ||\n \t\t\t\t context == grammarAccess.getMultiplicationAccess().getModuloLeftAction_1_2_1() ||\n-\t\t\t\t context == grammarAccess.getUnaryExpressionRule() ||\n-\t\t\t\t context == grammarAccess.getExponentRule() ||\n-\t\t\t\t context == grammarAccess.getExponentAccess().getExponentLeftAction_1_0() ||\n-\t\t\t\t context == grammarAccess.getPrimaryRule()) {\n-\t\t\t\t\tsequence_Primary_Function(context, (Function) semanticObject); \n+\t\t\t\t context == grammarAccess.getMultiplicationAccess().getMultiplicationLeftAction_1_0_1() ||\n+\t\t\t\t context == grammarAccess.getPrimaryRule() ||\n+\t\t\t\t context == grammarAccess.getUnaryExpressionRule()) {\n+\t\t\t\t\tsequence_Primary(context, (Function) semanticObject); \n \t\t\t\t\treturn; \n \t\t\t\t}\n \t\t\t\telse break;\n \t\t\tcase MathPackage.FUNCTION_DEFINITION:\n \t\t\t\tif(context == grammarAccess.getFunctionDefinitionRule()) {\n-\t\t\t\t\tsequence_FunctionDefinition_FunctionDefinition(context, (FunctionDefinition) semanticObject); \n+\t\t\t\t\tsequence_FunctionDefinition(context, (FunctionDefinition) semanticObject); \n \t\t\t\t\treturn; \n \t\t\t\t}\n \t\t\t\telse break;\n \t\t\tcase MathPackage.INVERT:\n \t\t\t\tif(context == grammarAccess.getAdditionRule() ||\n \t\t\t\t context == grammarAccess.getAdditionAccess().getAdditionLeftAction_1_0_1() ||\n \t\t\t\t context == grammarAccess.getAdditionAccess().getSubtractionLeftAction_1_1_1() ||\n+\t\t\t\t context == grammarAccess.getExponentRule() ||\n+\t\t\t\t context == grammarAccess.getExponentAccess().getExponentLeftAction_1_0() ||\n \t\t\t\t context == grammarAccess.getMultiplicationRule() ||\n-\t\t\t\t context == grammarAccess.getMultiplicationAccess().getMultiplicationLeftAction_1_0_1() ||\n \t\t\t\t context == grammarAccess.getMultiplicationAccess().getDivisionLeftAction_1_1_1() ||\n \t\t\t\t context == grammarAccess.getMultiplicationAccess().getModuloLeftAction_1_2_1() ||\n-\t\t\t\t context == grammarAccess.getUnaryExpressionRule() ||\n-\t\t\t\t context == grammarAccess.getExponentRule() ||\n-\t\t\t\t context == grammarAccess.getExponentAccess().getExponentLeftAction_1_0() ||\n-\t\t\t\t context == grammarAccess.getPrimaryRule()) {\n-\t\t\t\t\tsequence_UnaryExpression_Invert(context, (Invert) semanticObject); \n+\t\t\t\t context == grammarAccess.getMultiplicationAccess().getMultiplicationLeftAction_1_0_1() ||\n+\t\t\t\t context == grammarAccess.getPrimaryRule() ||\n+\t\t\t\t context == grammarAccess.getUnaryExpressionRule()) {\n+\t\t\t\t\tsequence_UnaryExpression(context, (Invert) semanticObject); \n \t\t\t\t\treturn; \n \t\t\t\t}\n \t\t\t\telse break;\n \t\t\tcase MathPackage.MATRIX:\n \t\t\t\tif(context == grammarAccess.getMatrixRule()) {\n-\t\t\t\t\tsequence_Matrix_Matrix(context, (Matrix) semanticObject); \n+\t\t\t\t\tsequence_Matrix(context, (Matrix) semanticObject); \n \t\t\t\t\treturn; \n \t\t\t\t}\n \t\t\t\telse break;\n@@ -214,35 +214,35 @@ public void createSequence(EObject context, EObject semanticObject) {\n \t\t\t\t context == grammarAccess.getMatrixMultiplicationAccess().getMatrixMultiplicationLeftAction_1_0_1() ||\n \t\t\t\t context == grammarAccess.getMatrixMultiplicationAccess().getMatrixMultiplicationLeftAction_1_1_1() ||\n \t\t\t\t context == grammarAccess.getPrimaryMatrixRule()) {\n-\t\t\t\t\tsequence_MatrixAddition_MatrixAddition(context, (MatrixAddition) semanticObject); \n+\t\t\t\t\tsequence_MatrixAddition(context, (MatrixAddition) semanticObject); \n \t\t\t\t\treturn; \n \t\t\t\t}\n \t\t\t\telse break;\n \t\t\tcase MathPackage.MATRIX_ASSIGNMENT:\n \t\t\t\tif(context == grammarAccess.getMatrixAssignmentRule()) {\n-\t\t\t\t\tsequence_MatrixAssignment_MatrixAssignment(context, (MatrixAssignment) semanticObject); \n+\t\t\t\t\tsequence_MatrixAssignment(context, (MatrixAssignment) semanticObject); \n \t\t\t\t\treturn; \n \t\t\t\t}\n \t\t\t\telse break;\n \t\t\tcase MathPackage.MATRIX_ELEMENT:\n \t\t\t\tif(context == grammarAccess.getAdditionRule() ||\n \t\t\t\t context == grammarAccess.getAdditionAccess().getAdditionLeftAction_1_0_1() ||\n \t\t\t\t context == grammarAccess.getAdditionAccess().getSubtractionLeftAction_1_1_1() ||\n+\t\t\t\t context == grammarAccess.getExponentRule() ||\n+\t\t\t\t context == grammarAccess.getExponentAccess().getExponentLeftAction_1_0() ||\n \t\t\t\t context == grammarAccess.getMultiplicationRule() ||\n-\t\t\t\t context == grammarAccess.getMultiplicationAccess().getMultiplicationLeftAction_1_0_1() ||\n \t\t\t\t context == grammarAccess.getMultiplicationAccess().getDivisionLeftAction_1_1_1() ||\n \t\t\t\t context == grammarAccess.getMultiplicationAccess().getModuloLeftAction_1_2_1() ||\n-\t\t\t\t context == grammarAccess.getUnaryExpressionRule() ||\n-\t\t\t\t context == grammarAccess.getExponentRule() ||\n-\t\t\t\t context == grammarAccess.getExponentAccess().getExponentLeftAction_1_0() ||\n-\t\t\t\t context == grammarAccess.getPrimaryRule()) {\n-\t\t\t\t\tsequence_Primary_MatrixElement(context, (MatrixElement) semanticObject); \n+\t\t\t\t context == grammarAccess.getMultiplicationAccess().getMultiplicationLeftAction_1_0_1() ||\n+\t\t\t\t context == grammarAccess.getPrimaryRule() ||\n+\t\t\t\t context == grammarAccess.getUnaryExpressionRule()) {\n+\t\t\t\t\tsequence_Primary(context, (MatrixElement) semanticObject); \n \t\t\t\t\treturn; \n \t\t\t\t}\n \t\t\t\telse break;\n \t\t\tcase MathPackage.MATRIX_FORMULA:\n \t\t\t\tif(context == grammarAccess.getMatrixFormulaRule()) {\n-\t\t\t\t\tsequence_MatrixFormula_MatrixFormula(context, (MatrixFormula) semanticObject); \n+\t\t\t\t\tsequence_MatrixFormula(context, (MatrixFormula) semanticObject); \n \t\t\t\t\treturn; \n \t\t\t\t}\n \t\t\t\telse break;\n@@ -254,13 +254,13 @@ public void createSequence(EObject context, EObject semanticObject) {\n \t\t\t\t context == grammarAccess.getMatrixMultiplicationAccess().getMatrixMultiplicationLeftAction_1_0_1() ||\n \t\t\t\t context == grammarAccess.getMatrixMultiplicationAccess().getMatrixMultiplicationLeftAction_1_1_1() ||\n \t\t\t\t context == grammarAccess.getPrimaryMatrixRule()) {\n-\t\t\t\t\tsequence_MatrixMultiplication_MatrixMultiplication(context, (MatrixMultiplication) semanticObject); \n+\t\t\t\t\tsequence_MatrixMultiplication(context, (MatrixMultiplication) semanticObject); \n \t\t\t\t\treturn; \n \t\t\t\t}\n \t\t\t\telse break;\n \t\t\tcase MathPackage.MATRIX_ROW:\n \t\t\t\tif(context == grammarAccess.getMatrixRowRule()) {\n-\t\t\t\t\tsequence_MatrixRow_MatrixRow(context, (MatrixRow) semanticObject); \n+\t\t\t\t\tsequence_MatrixRow(context, (MatrixRow) semanticObject); \n \t\t\t\t\treturn; \n \t\t\t\t}\n \t\t\t\telse break;\n@@ -272,7 +272,7 @@ public void createSequence(EObject context, EObject semanticObject) {\n \t\t\t\t context == grammarAccess.getMatrixMultiplicationAccess().getMatrixMultiplicationLeftAction_1_0_1() ||\n \t\t\t\t context == grammarAccess.getMatrixMultiplicationAccess().getMatrixMultiplicationLeftAction_1_1_1() ||\n \t\t\t\t context == grammarAccess.getPrimaryMatrixRule()) {\n-\t\t\t\t\tsequence_MatrixAddition_MatrixSubtraction(context, (MatrixSubtraction) semanticObject); \n+\t\t\t\t\tsequence_MatrixAddition(context, (MatrixSubtraction) semanticObject); \n \t\t\t\t\treturn; \n \t\t\t\t}\n \t\t\t\telse break;\n@@ -284,39 +284,39 @@ public void createSequence(EObject context, EObject semanticObject) {\n \t\t\t\t context == grammarAccess.getMatrixMultiplicationAccess().getMatrixMultiplicationLeftAction_1_0_1() ||\n \t\t\t\t context == grammarAccess.getMatrixMultiplicationAccess().getMatrixMultiplicationLeftAction_1_1_1() ||\n \t\t\t\t context == grammarAccess.getPrimaryMatrixRule()) {\n-\t\t\t\t\tsequence_PrimaryMatrix_MatrixVariable(context, (MatrixVariable) semanticObject); \n+\t\t\t\t\tsequence_PrimaryMatrix(context, (MatrixVariable) semanticObject); \n \t\t\t\t\treturn; \n \t\t\t\t}\n \t\t\t\telse break;\n \t\t\tcase MathPackage.MODULO:\n \t\t\t\tif(context == grammarAccess.getAdditionRule() ||\n \t\t\t\t context == grammarAccess.getAdditionAccess().getAdditionLeftAction_1_0_1() ||\n \t\t\t\t context == grammarAccess.getAdditionAccess().getSubtractionLeftAction_1_1_1() ||\n+\t\t\t\t context == grammarAccess.getExponentRule() ||\n+\t\t\t\t context == grammarAccess.getExponentAccess().getExponentLeftAction_1_0() ||\n \t\t\t\t context == grammarAccess.getMultiplicationRule() ||\n-\t\t\t\t context == grammarAccess.getMultiplicationAccess().getMultiplicationLeftAction_1_0_1() ||\n \t\t\t\t context == grammarAccess.getMultiplicationAccess().getDivisionLeftAction_1_1_1() ||\n \t\t\t\t context == grammarAccess.getMultiplicationAccess().getModuloLeftAction_1_2_1() ||\n-\t\t\t\t context == grammarAccess.getUnaryExpressionRule() ||\n-\t\t\t\t context == grammarAccess.getExponentRule() ||\n-\t\t\t\t context == grammarAccess.getExponentAccess().getExponentLeftAction_1_0() ||\n-\t\t\t\t context == grammarAccess.getPrimaryRule()) {\n-\t\t\t\t\tsequence_Multiplication_Modulo(context, (Modulo) semanticObject); \n+\t\t\t\t context == grammarAccess.getMultiplicationAccess().getMultiplicationLeftAction_1_0_1() ||\n+\t\t\t\t context == grammarAccess.getPrimaryRule() ||\n+\t\t\t\t context == grammarAccess.getUnaryExpressionRule()) {\n+\t\t\t\t\tsequence_Multiplication(context, (Modulo) semanticObject); \n \t\t\t\t\treturn; \n \t\t\t\t}\n \t\t\t\telse break;\n \t\t\tcase MathPackage.MULTIPLICATION:\n \t\t\t\tif(context == grammarAccess.getAdditionRule() ||\n \t\t\t\t context == grammarAccess.getAdditionAccess().getAdditionLeftAction_1_0_1() ||\n \t\t\t\t context == grammarAccess.getAdditionAccess().getSubtractionLeftAction_1_1_1() ||\n+\t\t\t\t context == grammarAccess.getExponentRule() ||\n+\t\t\t\t context == grammarAccess.getExponentAccess().getExponentLeftAction_1_0() ||\n \t\t\t\t context == grammarAccess.getMultiplicationRule() ||\n-\t\t\t\t context == grammarAccess.getMultiplicationAccess().getMultiplicationLeftAction_1_0_1() ||\n \t\t\t\t context == grammarAccess.getMultiplicationAccess().getDivisionLeftAction_1_1_1() ||\n \t\t\t\t context == grammarAccess.getMultiplicationAccess().getModuloLeftAction_1_2_1() ||\n-\t\t\t\t context == grammarAccess.getUnaryExpressionRule() ||\n-\t\t\t\t context == grammarAccess.getExponentRule() ||\n-\t\t\t\t context == grammarAccess.getExponentAccess().getExponentLeftAction_1_0() ||\n-\t\t\t\t context == grammarAccess.getPrimaryRule()) {\n-\t\t\t\t\tsequence_Multiplication_Multiplication(context, (Multiplication) semanticObject); \n+\t\t\t\t context == grammarAccess.getMultiplicationAccess().getMultiplicationLeftAction_1_0_1() ||\n+\t\t\t\t context == grammarAccess.getPrimaryRule() ||\n+\t\t\t\t context == grammarAccess.getUnaryExpressionRule()) {\n+\t\t\t\t\tsequence_Multiplication(context, (Multiplication) semanticObject); \n \t\t\t\t\treturn; \n \t\t\t\t}\n \t\t\t\telse break;\n@@ -328,29 +328,29 @@ public void createSequence(EObject context, EObject semanticObject) {\n \t\t\t\t context == grammarAccess.getMatrixMultiplicationAccess().getMatrixMultiplicationLeftAction_1_0_1() ||\n \t\t\t\t context == grammarAccess.getMatrixMultiplicationAccess().getMatrixMultiplicationLeftAction_1_1_1() ||\n \t\t\t\t context == grammarAccess.getPrimaryMatrixRule()) {\n-\t\t\t\t\tsequence_PrimaryMatrix_NewMatrix(context, (NewMatrix) semanticObject); \n+\t\t\t\t\tsequence_PrimaryMatrix(context, (NewMatrix) semanticObject); \n \t\t\t\t\treturn; \n \t\t\t\t}\n \t\t\t\telse break;\n \t\t\tcase MathPackage.STATEMENT:\n \t\t\t\tif(context == grammarAccess.getStatementRule()) {\n-\t\t\t\t\tsequence_Statement_Statement(context, (Statement) semanticObject); \n+\t\t\t\t\tsequence_Statement(context, (Statement) semanticObject); \n \t\t\t\t\treturn; \n \t\t\t\t}\n \t\t\t\telse break;\n \t\t\tcase MathPackage.SUBTRACTION:\n \t\t\t\tif(context == grammarAccess.getAdditionRule() ||\n \t\t\t\t context == grammarAccess.getAdditionAccess().getAdditionLeftAction_1_0_1() ||\n \t\t\t\t context == grammarAccess.getAdditionAccess().getSubtractionLeftAction_1_1_1() ||\n+\t\t\t\t context == grammarAccess.getExponentRule() ||\n+\t\t\t\t context == grammarAccess.getExponentAccess().getExponentLeftAction_1_0() ||\n \t\t\t\t context == grammarAccess.getMultiplicationRule() ||\n-\t\t\t\t context == grammarAccess.getMultiplicationAccess().getMultiplicationLeftAction_1_0_1() ||\n \t\t\t\t context == grammarAccess.getMultiplicationAccess().getDivisionLeftAction_1_1_1() ||\n \t\t\t\t context == grammarAccess.getMultiplicationAccess().getModuloLeftAction_1_2_1() ||\n-\t\t\t\t context == grammarAccess.getUnaryExpressionRule() ||\n-\t\t\t\t context == grammarAccess.getExponentRule() ||\n-\t\t\t\t context == grammarAccess.getExponentAccess().getExponentLeftAction_1_0() ||\n-\t\t\t\t context == grammarAccess.getPrimaryRule()) {\n-\t\t\t\t\tsequence_Addition_Subtraction(context, (Subtraction) semanticObject); \n+\t\t\t\t context == grammarAccess.getMultiplicationAccess().getMultiplicationLeftAction_1_0_1() ||\n+\t\t\t\t context == grammarAccess.getPrimaryRule() ||\n+\t\t\t\t context == grammarAccess.getUnaryExpressionRule()) {\n+\t\t\t\t\tsequence_Addition(context, (Subtraction) semanticObject); \n \t\t\t\t\treturn; \n \t\t\t\t}\n \t\t\t\telse break;\n@@ -362,29 +362,29 @@ public void createSequence(EObject context, EObject semanticObject) {\n \t\t\t\t context == grammarAccess.getMatrixMultiplicationAccess().getMatrixMultiplicationLeftAction_1_0_1() ||\n \t\t\t\t context == grammarAccess.getMatrixMultiplicationAccess().getMatrixMultiplicationLeftAction_1_1_1() ||\n \t\t\t\t context == grammarAccess.getPrimaryMatrixRule()) {\n-\t\t\t\t\tsequence_PrimaryMatrix_TransposeMatrix(context, (TransposeMatrix) semanticObject); \n+\t\t\t\t\tsequence_PrimaryMatrix(context, (TransposeMatrix) semanticObject); \n \t\t\t\t\treturn; \n \t\t\t\t}\n \t\t\t\telse break;\n \t\t\tcase MathPackage.VARIABLE:\n \t\t\t\tif(context == grammarAccess.getAdditionRule() ||\n \t\t\t\t context == grammarAccess.getAdditionAccess().getAdditionLeftAction_1_0_1() ||\n \t\t\t\t context == grammarAccess.getAdditionAccess().getSubtractionLeftAction_1_1_1() ||\n+\t\t\t\t context == grammarAccess.getExponentRule() ||\n+\t\t\t\t context == grammarAccess.getExponentAccess().getExponentLeftAction_1_0() ||\n \t\t\t\t context == grammarAccess.getMultiplicationRule() ||\n-\t\t\t\t context == grammarAccess.getMultiplicationAccess().getMultiplicationLeftAction_1_0_1() ||\n \t\t\t\t context == grammarAccess.getMultiplicationAccess().getDivisionLeftAction_1_1_1() ||\n \t\t\t\t context == grammarAccess.getMultiplicationAccess().getModuloLeftAction_1_2_1() ||\n-\t\t\t\t context == grammarAccess.getUnaryExpressionRule() ||\n-\t\t\t\t context == grammarAccess.getExponentRule() ||\n-\t\t\t\t context == grammarAccess.getExponentAccess().getExponentLeftAction_1_0() ||\n-\t\t\t\t context == grammarAccess.getPrimaryRule()) {\n-\t\t\t\t\tsequence_Primary_Variable(context, (Variable) semanticObject); \n+\t\t\t\t context == grammarAccess.getMultiplicationAccess().getMultiplicationLeftAction_1_0_1() ||\n+\t\t\t\t context == grammarAccess.getPrimaryRule() ||\n+\t\t\t\t context == grammarAccess.getUnaryExpressionRule()) {\n+\t\t\t\t\tsequence_Primary(context, (Variable) semanticObject); \n \t\t\t\t\treturn; \n \t\t\t\t}\n \t\t\t\telse break;\n \t\t\tcase MathPackage.VARIABLE_ASSIGNMENT:\n \t\t\t\tif(context == grammarAccess.getVariableAssignmentRule()) {\n-\t\t\t\t\tsequence_VariableAssignment_VariableAssignment(context, (VariableAssignment) semanticObject); \n+\t\t\t\t\tsequence_VariableAssignment(context, (VariableAssignment) semanticObject); \n \t\t\t\t\treturn; \n \t\t\t\t}\n \t\t\t\telse break;\n@@ -400,7 +400,7 @@ public void createSequence(EObject context, EObject semanticObject) {\n \t * left[1, 1]\n \t * right[1, 1]\n \t */\n-\tprotected void sequence_Addition_Addition(EObject context, Addition semanticObject) {\n+\tprotected void sequence_Addition(EObject context, Addition semanticObject) {\n \t\tgenericSequencer.createSequence(context, semanticObject);\n \t}\n \t\n@@ -413,7 +413,7 @@ protected void sequence_Addition_Addition(EObject context, Addition semanticObje\n \t * left[1, 1]\n \t * right[1, 1]\n \t */\n-\tprotected void sequence_Addition_Subtraction(EObject context, Subtraction semanticObject) {\n+\tprotected void sequence_Addition(EObject context, Subtraction semanticObject) {\n \t\tgenericSequencer.createSequence(context, semanticObject);\n \t}\n \t\n@@ -426,7 +426,7 @@ protected void sequence_Addition_Subtraction(EObject context, Subtraction semant\n \t * left[1, 1]\n \t * right[1, 1]\n \t */\n-\tprotected void sequence_Exponent_Exponent(EObject context, Exponent semanticObject) {\n+\tprotected void sequence_Exponent(EObject context, Exponent semanticObject) {\n \t\tgenericSequencer.createSequence(context, semanticObject);\n \t}\n \t\n@@ -438,7 +438,7 @@ protected void sequence_Exponent_Exponent(EObject context, Exponent semanticObje\n \t * Features:\n \t * expression[1, 1]\n \t */\n-\tprotected void sequence_Formula_Formula(EObject context, Formula semanticObject) {\n+\tprotected void sequence_Formula(EObject context, Formula semanticObject) {\n \t\tif(errorAcceptor != null) {\n \t\t\tif(transientValues.isValueTransient(semanticObject, MathPackage.Literals.FORMULA__EXPRESSION) == ValueTransient.YES)\n \t\t\t\terrorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, MathPackage.Literals.FORMULA__EXPRESSION));\n@@ -458,7 +458,7 @@ protected void sequence_Formula_Formula(EObject context, Formula semanticObject)\n \t * function[1, 1]\n \t * formula[1, 1]\n \t */\n-\tprotected void sequence_FunctionDefinition_FunctionDefinition(EObject context, FunctionDefinition semanticObject) {\n+\tprotected void sequence_FunctionDefinition(EObject context, FunctionDefinition semanticObject) {\n \t\tif(errorAcceptor != null) {\n \t\t\tif(transientValues.isValueTransient(semanticObject, MathPackage.Literals.FUNCTION_DEFINITION__FUNCTION) == ValueTransient.YES)\n \t\t\t\terrorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, MathPackage.Literals.FUNCTION_DEFINITION__FUNCTION));\n@@ -481,7 +481,7 @@ protected void sequence_FunctionDefinition_FunctionDefinition(EObject context, F\n \t * name[1, 1]\n \t * parameters[0, *]\n \t */\n-\tprotected void sequence_Function_Expression(EObject context, Expression semanticObject) {\n+\tprotected void sequence_Function(EObject context, Expression semanticObject) {\n \t\tgenericSequencer.createSequence(context, semanticObject);\n \t}\n \t\n@@ -494,7 +494,7 @@ protected void sequence_Function_Expression(EObject context, Expression semantic\n \t * left[1, 1]\n \t * right[1, 1]\n \t */\n-\tprotected void sequence_MatrixAddition_MatrixAddition(EObject context, MatrixAddition semanticObject) {\n+\tprotected void sequence_MatrixAddition(EObject context, MatrixAddition semanticObject) {\n \t\tif(errorAcceptor != null) {\n \t\t\tif(transientValues.isValueTransient(semanticObject, MathPackage.Literals.MATRIX_ADDITION__LEFT) == ValueTransient.YES)\n \t\t\t\terrorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, MathPackage.Literals.MATRIX_ADDITION__LEFT));\n@@ -517,7 +517,7 @@ protected void sequence_MatrixAddition_MatrixAddition(EObject context, MatrixAdd\n \t * left[1, 1]\n \t * right[1, 1]\n \t */\n-\tprotected void sequence_MatrixAddition_MatrixSubtraction(EObject context, MatrixSubtraction semanticObject) {\n+\tprotected void sequence_MatrixAddition(EObject context, MatrixSubtraction semanticObject) {\n \t\tif(errorAcceptor != null) {\n \t\t\tif(transientValues.isValueTransient(semanticObject, MathPackage.Literals.MATRIX_SUBTRACTION__LEFT) == ValueTransient.YES)\n \t\t\t\terrorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, MathPackage.Literals.MATRIX_SUBTRACTION__LEFT));\n@@ -540,7 +540,7 @@ protected void sequence_MatrixAddition_MatrixSubtraction(EObject context, Matrix\n \t * variable[1, 1]\n \t * value[1, 1]\n \t */\n-\tprotected void sequence_MatrixAssignment_MatrixAssignment(EObject context, MatrixAssignment semanticObject) {\n+\tprotected void sequence_MatrixAssignment(EObject context, MatrixAssignment semanticObject) {\n \t\tif(errorAcceptor != null) {\n \t\t\tif(transientValues.isValueTransient(semanticObject, MathPackage.Literals.MATRIX_ASSIGNMENT__VARIABLE) == ValueTransient.YES)\n \t\t\t\terrorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, MathPackage.Literals.MATRIX_ASSIGNMENT__VARIABLE));\n@@ -562,7 +562,7 @@ protected void sequence_MatrixAssignment_MatrixAssignment(EObject context, Matri\n \t * Features:\n \t * expression[1, 1]\n \t */\n-\tprotected void sequence_MatrixFormula_MatrixFormula(EObject context, MatrixFormula semanticObject) {\n+\tprotected void sequence_MatrixFormula(EObject context, MatrixFormula semanticObject) {\n \t\tif(errorAcceptor != null) {\n \t\t\tif(transientValues.isValueTransient(semanticObject, MathPackage.Literals.MATRIX_FORMULA__EXPRESSION) == ValueTransient.YES)\n \t\t\t\terrorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, MathPackage.Literals.MATRIX_FORMULA__EXPRESSION));\n@@ -582,19 +582,19 @@ protected void sequence_MatrixFormula_MatrixFormula(EObject context, MatrixFormu\n \t * )\n \t *\n \t * Features:\n-\t * left[2, 2]\n-\t * rightMatrix[1, 1]\n+\t * left[0, 2]\n+\t * rightMatrix[0, 1]\n \t * EXCLUDE_IF_UNSET left\n \t * MANDATORY_IF_SET left\n \t * EXCLUDE_IF_SET left\n \t * EXCLUDE_IF_SET rightScalar\n-\t * rightScalar[1, 1]\n+\t * rightScalar[0, 1]\n \t * EXCLUDE_IF_UNSET left\n \t * MANDATORY_IF_SET left\n \t * EXCLUDE_IF_SET left\n \t * EXCLUDE_IF_SET rightMatrix\n \t */\n-\tprotected void sequence_MatrixMultiplication_MatrixMultiplication(EObject context, MatrixMultiplication semanticObject) {\n+\tprotected void sequence_MatrixMultiplication(EObject context, MatrixMultiplication semanticObject) {\n \t\tgenericSequencer.createSequence(context, semanticObject);\n \t}\n \t\n@@ -606,7 +606,7 @@ protected void sequence_MatrixMultiplication_MatrixMultiplication(EObject contex\n \t * Features:\n \t * elements[0, *]\n \t */\n-\tprotected void sequence_MatrixRow_MatrixRow(EObject context, MatrixRow semanticObject) {\n+\tprotected void sequence_MatrixRow(EObject context, MatrixRow semanticObject) {\n \t\tgenericSequencer.createSequence(context, semanticObject);\n \t}\n \t\n@@ -618,7 +618,7 @@ protected void sequence_MatrixRow_MatrixRow(EObject context, MatrixRow semanticO\n \t * Features:\n \t * rows[0, *]\n \t */\n-\tprotected void sequence_Matrix_Matrix(EObject context, Matrix semanticObject) {\n+\tprotected void sequence_Matrix(EObject context, Matrix semanticObject) {\n \t\tgenericSequencer.createSequence(context, semanticObject);\n \t}\n \t\n@@ -631,7 +631,7 @@ protected void sequence_Matrix_Matrix(EObject context, Matrix semanticObject) {\n \t * left[1, 1]\n \t * right[1, 1]\n \t */\n-\tprotected void sequence_Multiplication_Division(EObject context, Division semanticObject) {\n+\tprotected void sequence_Multiplication(EObject context, Division semanticObject) {\n \t\tgenericSequencer.createSequence(context, semanticObject);\n \t}\n \t\n@@ -644,7 +644,7 @@ protected void sequence_Multiplication_Division(EObject context, Division semant\n \t * left[1, 1]\n \t * right[1, 1]\n \t */\n-\tprotected void sequence_Multiplication_Modulo(EObject context, Modulo semanticObject) {\n+\tprotected void sequence_Multiplication(EObject context, Modulo semanticObject) {\n \t\tgenericSequencer.createSequence(context, semanticObject);\n \t}\n \t\n@@ -657,7 +657,7 @@ protected void sequence_Multiplication_Modulo(EObject context, Modulo semanticOb\n \t * left[1, 1]\n \t * right[1, 1]\n \t */\n-\tprotected void sequence_Multiplication_Multiplication(EObject context, Multiplication semanticObject) {\n+\tprotected void sequence_Multiplication(EObject context, Multiplication semanticObject) {\n \t\tgenericSequencer.createSequence(context, semanticObject);\n \t}\n \t\n@@ -669,7 +669,7 @@ protected void sequence_Multiplication_Multiplication(EObject context, Multiplic\n \t * Features:\n \t * name[1, 1]\n \t */\n-\tprotected void sequence_PrimaryMatrix_MatrixVariable(EObject context, MatrixVariable semanticObject) {\n+\tprotected void sequence_PrimaryMatrix(EObject context, MatrixVariable semanticObject) {\n \t\tif(errorAcceptor != null) {\n \t\t\tif(transientValues.isValueTransient(semanticObject, MathPackage.Literals.MATRIX_VARIABLE__NAME) == ValueTransient.YES)\n \t\t\t\terrorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, MathPackage.Literals.MATRIX_VARIABLE__NAME));\n@@ -688,7 +688,7 @@ protected void sequence_PrimaryMatrix_MatrixVariable(EObject context, MatrixVari\n \t * Features:\n \t * matrix[1, 1]\n \t */\n-\tprotected void sequence_PrimaryMatrix_NewMatrix(EObject context, NewMatrix semanticObject) {\n+\tprotected void sequence_PrimaryMatrix(EObject context, NewMatrix semanticObject) {\n \t\tif(errorAcceptor != null) {\n \t\t\tif(transientValues.isValueTransient(semanticObject, MathPackage.Literals.NEW_MATRIX__MATRIX) == ValueTransient.YES)\n \t\t\t\terrorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, MathPackage.Literals.NEW_MATRIX__MATRIX));\n@@ -707,7 +707,7 @@ protected void sequence_PrimaryMatrix_NewMatrix(EObject context, NewMatrix seman\n \t * Features:\n \t * name[1, 1]\n \t */\n-\tprotected void sequence_PrimaryMatrix_TransposeMatrix(EObject context, TransposeMatrix semanticObject) {\n+\tprotected void sequence_PrimaryMatrix(EObject context, TransposeMatrix semanticObject) {\n \t\tif(errorAcceptor != null) {\n \t\t\tif(transientValues.isValueTransient(semanticObject, MathPackage.Literals.TRANSPOSE_MATRIX__NAME) == ValueTransient.YES)\n \t\t\t\terrorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, MathPackage.Literals.TRANSPOSE_MATRIX__NAME));\n@@ -726,7 +726,7 @@ protected void sequence_PrimaryMatrix_TransposeMatrix(EObject context, Transpose\n \t * Features:\n \t * value[1, 1]\n \t */\n-\tprotected void sequence_Primary_Float(EObject context, org.eclipse.iee.translator.jmole.math.math.Float semanticObject) {\n+\tprotected void sequence_Primary(EObject context, org.eclipse.iee.translator.jmole.math.math.Float semanticObject) {\n \t\tgenericSequencer.createSequence(context, semanticObject);\n \t}\n \t\n@@ -738,21 +738,21 @@ protected void sequence_Primary_Float(EObject context, org.eclipse.iee.translato\n \t * Features:\n \t * function[1, 1]\n \t */\n-\tprotected void sequence_Primary_Function(EObject context, Function semanticObject) {\n+\tprotected void sequence_Primary(EObject context, Function semanticObject) {\n \t\tgenericSequencer.createSequence(context, semanticObject);\n \t}\n \t\n \t\n \t/**\n \t * Constraint:\n-\t * (element=MATH_NAME row=INT column=INT)\n+\t * (element=MATH_NAME row=Float column=Float)\n \t *\n \t * Features:\n \t * element[1, 1]\n \t * row[1, 1]\n \t * column[1, 1]\n \t */\n-\tprotected void sequence_Primary_MatrixElement(EObject context, MatrixElement semanticObject) {\n+\tprotected void sequence_Primary(EObject context, MatrixElement semanticObject) {\n \t\tgenericSequencer.createSequence(context, semanticObject);\n \t}\n \t\n@@ -764,7 +764,7 @@ protected void sequence_Primary_MatrixElement(EObject context, MatrixElement sem\n \t * Features:\n \t * name[1, 1]\n \t */\n-\tprotected void sequence_Primary_Variable(EObject context, Variable semanticObject) {\n+\tprotected void sequence_Primary(EObject context, Variable semanticObject) {\n \t\tgenericSequencer.createSequence(context, semanticObject);\n \t}\n \t\n@@ -806,7 +806,7 @@ protected void sequence_Primary_Variable(EObject context, Variable semanticObjec\n \t * EXCLUDE_IF_SET formula\n \t * EXCLUDE_IF_SET matrixAssignment\n \t */\n-\tprotected void sequence_Statement_Statement(EObject context, Statement semanticObject) {\n+\tprotected void sequence_Statement(EObject context, Statement semanticObject) {\n \t\tgenericSequencer.createSequence(context, semanticObject);\n \t}\n \t\n@@ -818,7 +818,7 @@ protected void sequence_Statement_Statement(EObject context, Statement semanticO\n \t * Features:\n \t * expression[1, 1]\n \t */\n-\tprotected void sequence_UnaryExpression_Factorial(EObject context, Factorial semanticObject) {\n+\tprotected void sequence_UnaryExpression(EObject context, Factorial semanticObject) {\n \t\tgenericSequencer.createSequence(context, semanticObject);\n \t}\n \t\n@@ -830,7 +830,7 @@ protected void sequence_UnaryExpression_Factorial(EObject context, Factorial sem\n \t * Features:\n \t * expression[1, 1]\n \t */\n-\tprotected void sequence_UnaryExpression_Invert(EObject context, Invert semanticObject) {\n+\tprotected void sequence_UnaryExpression(EObject context, Invert semanticObject) {\n \t\tgenericSequencer.createSequence(context, semanticObject);\n \t}\n \t\n@@ -843,7 +843,7 @@ protected void sequence_UnaryExpression_Invert(EObject context, Invert semanticO\n \t * variable[1, 1]\n \t * value[1, 1]\n \t */\n-\tprotected void sequence_VariableAssignment_VariableAssignment(EObject context, VariableAssignment semanticObject) {\n+\tprotected void sequence_VariableAssignment(EObject context, VariableAssignment semanticObject) {\n \t\tif(errorAcceptor != null) {\n \t\t\tif(transientValues.isValueTransient(semanticObject, MathPackage.Literals.VARIABLE_ASSIGNMENT__VARIABLE) == ValueTransient.YES)\n \t\t\t\terrorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, MathPackage.Literals.VARIABLE_ASSIGNMENT__VARIABLE));", "raw_url": "https://github.com/iee/iee/raw/0492aafe3780886c3936544ffed92c1bcc587431/org.eclipse.iee.translator.Jmole%2Forg.eclipse.iee.translator.jmole.math%2Fsrc-gen%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fjmole%2Fmath%2Fserializer%2FAbstractMathSemanticSequencer.java", "sha": "fc986bbdb4a7c3cb615bf59d1b76c5cf353039c9", "status": "modified" }, { "additions": 37, "blob_url": "https://github.com/iee/iee/blob/0492aafe3780886c3936544ffed92c1bcc587431/org.eclipse.iee.translator.Jmole%2Forg.eclipse.iee.translator.jmole.math%2Fsrc-gen%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fjmole%2Fmath%2Fserializer%2FAbstractMathSyntacticSequencer.java", "changes": 69, "contents_url": "https://api.github.com/repos/iee/iee/contents/org.eclipse.iee.translator.Jmole%2Forg.eclipse.iee.translator.jmole.math%2Fsrc-gen%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fjmole%2Fmath%2Fserializer%2FAbstractMathSyntacticSequencer.java?ref=0492aafe3780886c3936544ffed92c1bcc587431", "deletions": 32, "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/serializer/AbstractMathSyntacticSequencer.java", "new_code": "import java.util.List;\nimport org.eclipse.xtext.serializer.analysis.ISyntacticSequencerPDAProvider.ISynNavigable;\n\tprotected String getUnassignedRuleCallToken(EObject semanticObject, RuleCall ruleCall, INode node) {\n\t\tif (transition.getAmbiguousSyntaxes().isEmpty()) return;\n\t\tList<INode> transitionNodes = collectNodes(fromNode, toNode);\n\t\tfor (AbstractElementAlias syntax : transition.getAmbiguousSyntaxes()) {\n\t\t\tList<INode> syntaxNodes = getNodesFor(transitionNodes, syntax);\n\t\t\tif(match_Function_CommaKeyword_2_2_q.equals(syntax))\n\t\t\t\temit_Function_CommaKeyword_2_2_q(semanticObject, getLastNavigableState(), syntaxNodes);\n\t\t\telse if(match_MatrixRow_CommaKeyword_1_2_q.equals(syntax))\n\t\t\t\temit_MatrixRow_CommaKeyword_1_2_q(semanticObject, getLastNavigableState(), syntaxNodes);\n\t\t\telse if(match_Matrix_CommaKeyword_1_2_q.equals(syntax))\n\t\t\t\temit_Matrix_CommaKeyword_1_2_q(semanticObject, getLastNavigableState(), syntaxNodes);\n\t\t\telse if(match_PrimaryMatrix_LeftParenthesisKeyword_3_0_a.equals(syntax))\n\t\t\t\temit_PrimaryMatrix_LeftParenthesisKeyword_3_0_a(semanticObject, getLastNavigableState(), syntaxNodes);\n\t\t\telse if(match_PrimaryMatrix_LeftParenthesisKeyword_3_0_p.equals(syntax))\n\t\t\t\temit_PrimaryMatrix_LeftParenthesisKeyword_3_0_p(semanticObject, getLastNavigableState(), syntaxNodes);\n\t\t\telse if(match_Primary_LeftParenthesisKeyword_4_0_a.equals(syntax))\n\t\t\t\temit_Primary_LeftParenthesisKeyword_4_0_a(semanticObject, getLastNavigableState(), syntaxNodes);\n\t\t\telse if(match_Primary_LeftParenthesisKeyword_4_0_p.equals(syntax))\n\t\t\t\temit_Primary_LeftParenthesisKeyword_4_0_p(semanticObject, getLastNavigableState(), syntaxNodes);\n\t\t\telse acceptNodes(getLastNavigableState(), syntaxNodes);\n\t\t}\n\tprotected void emit_Function_CommaKeyword_2_2_q(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {\n\t\tacceptNodes(transition, nodes);\n\tprotected void emit_MatrixRow_CommaKeyword_1_2_q(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {\n\t\tacceptNodes(transition, nodes);\n\tprotected void emit_Matrix_CommaKeyword_1_2_q(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {\n\t\tacceptNodes(transition, nodes);\n\tprotected void emit_PrimaryMatrix_LeftParenthesisKeyword_3_0_a(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {\n\t\tacceptNodes(transition, nodes);\n\tprotected void emit_PrimaryMatrix_LeftParenthesisKeyword_3_0_p(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {\n\t\tacceptNodes(transition, nodes);\n\tprotected void emit_Primary_LeftParenthesisKeyword_4_0_a(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {\n\t\tacceptNodes(transition, nodes);\n\tprotected void emit_Primary_LeftParenthesisKeyword_4_0_p(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {\n\t\tacceptNodes(transition, nodes);", "new_methods": [ { "arguments": [ "EObject semanticObject", " RuleCall ruleCall", " INode node" ], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/serializer/AbstractMathSyntacticSequencer.java", "implementation": "if (transition.getAmbiguousSyntaxes().isEmpty()) return;\n\t\tList<INode> transitionNodes = collectNodes(fromNode, toNode);\n\t\tfor (AbstractElementAlias syntax : transition.getAmbiguousSyntaxes()) {\n\t\t\tList<INode> syntaxNodes = getNodesFor(transitionNodes, syntax);\n\t\t\tif(match_Function_CommaKeyword_2_2_q.equals(syntax))\n\t\t\t\temit_Function_CommaKeyword_2_2_q(semanticObject, getLastNavigableState(), syntaxNodes);\n\t\t\telse if(match_MatrixRow_CommaKeyword_1_2_q.equals(syntax))\n\t\t\t\temit_MatrixRow_CommaKeyword_1_2_q(semanticObject, getLastNavigableState(), syntaxNodes);\n\t\t\telse if(match_Matrix_CommaKeyword_1_2_q.equals(syntax))\n\t\t\t\temit_Matrix_CommaKeyword_1_2_q(semanticObject, getLastNavigableState(), syntaxNodes);\n\t\t\telse if(match_PrimaryMatrix_LeftParenthesisKeyword_3_0_a.equals(syntax))\n\t\t\t\temit_PrimaryMatrix_LeftParenthesisKeyword_3_0_a(semanticObject, getLastNavigableState(), syntaxNodes);\n\t\t\telse if(match_PrimaryMatrix_LeftParenthesisKeyword_3_0_p.equals(syntax))\n\t\t\t\temit_PrimaryMatrix_LeftParenthesisKeyword_3_0_p(semanticObject, getLastNavigableState(), syntaxNodes);\n\t\t\telse if(match_Primary_LeftParenthesisKeyword_4_0_a.equals(syntax))\n\t\t\t\temit_Primary_LeftParenthesisKeyword_4_0_a(semanticObject, getLastNavigableState(), syntaxNodes);\n\t\t\telse if(match_Primary_LeftParenthesisKeyword_4_0_p.equals(syntax))\n\t\t\t\temit_Primary_LeftParenthesisKeyword_4_0_p(semanticObject, getLastNavigableState(), syntaxNodes);\n\t\t\telse acceptNodes(getLastNavigableState(), syntaxNodes);", "signature": "String getUnassignedRuleCallToken(EObject semanticObject, RuleCall ruleCall, INode node)" } ], "old_code": "\tprotected String getUnassignedRuleCallToken(RuleCall ruleCall, INode node) {\n\t\tif (!transition.isSyntacticallyAmbiguous())\n\t\t\treturn;\n\t\tif(match_Function_CommaKeyword_2_2_q.equals(transition.getAmbiguousSyntax()))\n\t\t\temit_Function_CommaKeyword_2_2_q(semanticObject, transition, fromNode, toNode);\n\t\telse if(match_MatrixRow_CommaKeyword_1_2_q.equals(transition.getAmbiguousSyntax()))\n\t\t\temit_MatrixRow_CommaKeyword_1_2_q(semanticObject, transition, fromNode, toNode);\n\t\telse if(match_Matrix_CommaKeyword_1_2_q.equals(transition.getAmbiguousSyntax()))\n\t\t\temit_Matrix_CommaKeyword_1_2_q(semanticObject, transition, fromNode, toNode);\n\t\telse if(match_PrimaryMatrix_LeftParenthesisKeyword_3_0_a.equals(transition.getAmbiguousSyntax()))\n\t\t\temit_PrimaryMatrix_LeftParenthesisKeyword_3_0_a(semanticObject, transition, fromNode, toNode);\n\t\telse if(match_PrimaryMatrix_LeftParenthesisKeyword_3_0_p.equals(transition.getAmbiguousSyntax()))\n\t\t\temit_PrimaryMatrix_LeftParenthesisKeyword_3_0_p(semanticObject, transition, fromNode, toNode);\n\t\telse if(match_Primary_LeftParenthesisKeyword_4_0_a.equals(transition.getAmbiguousSyntax()))\n\t\t\temit_Primary_LeftParenthesisKeyword_4_0_a(semanticObject, transition, fromNode, toNode);\n\t\telse if(match_Primary_LeftParenthesisKeyword_4_0_p.equals(transition.getAmbiguousSyntax()))\n\t\t\temit_Primary_LeftParenthesisKeyword_4_0_p(semanticObject, transition, fromNode, toNode);\n\t\telse acceptNodes(transition, fromNode, toNode);\n\tprotected void emit_Function_CommaKeyword_2_2_q(EObject semanticObject, ISynTransition transition, INode fromNode, INode toNode) {\n\t\tacceptNodes(transition, fromNode, toNode);\n\tprotected void emit_MatrixRow_CommaKeyword_1_2_q(EObject semanticObject, ISynTransition transition, INode fromNode, INode toNode) {\n\t\tacceptNodes(transition, fromNode, toNode);\n\tprotected void emit_Matrix_CommaKeyword_1_2_q(EObject semanticObject, ISynTransition transition, INode fromNode, INode toNode) {\n\t\tacceptNodes(transition, fromNode, toNode);\n\tprotected void emit_PrimaryMatrix_LeftParenthesisKeyword_3_0_a(EObject semanticObject, ISynTransition transition, INode fromNode, INode toNode) {\n\t\tacceptNodes(transition, fromNode, toNode);\n\tprotected void emit_PrimaryMatrix_LeftParenthesisKeyword_3_0_p(EObject semanticObject, ISynTransition transition, INode fromNode, INode toNode) {\n\t\tacceptNodes(transition, fromNode, toNode);\n\tprotected void emit_Primary_LeftParenthesisKeyword_4_0_a(EObject semanticObject, ISynTransition transition, INode fromNode, INode toNode) {\n\t\tacceptNodes(transition, fromNode, toNode);\n\tprotected void emit_Primary_LeftParenthesisKeyword_4_0_p(EObject semanticObject, ISynTransition transition, INode fromNode, INode toNode) {\n\t\tacceptNodes(transition, fromNode, toNode);", "old_methods": [], "patch": "@@ -1,13 +1,15 @@\n package org.eclipse.iee.translator.jmole.math.serializer;\n \n import com.google.inject.Inject;\n+import java.util.List;\n import org.eclipse.emf.ecore.EObject;\n import org.eclipse.iee.translator.jmole.math.services.MathGrammarAccess;\n import org.eclipse.xtext.IGrammarAccess;\n import org.eclipse.xtext.RuleCall;\n import org.eclipse.xtext.nodemodel.INode;\n import org.eclipse.xtext.serializer.analysis.GrammarAlias.AbstractElementAlias;\n import org.eclipse.xtext.serializer.analysis.GrammarAlias.TokenAlias;\n+import org.eclipse.xtext.serializer.analysis.ISyntacticSequencerPDAProvider.ISynNavigable;\n import org.eclipse.xtext.serializer.analysis.ISyntacticSequencerPDAProvider.ISynTransition;\n import org.eclipse.xtext.serializer.sequencer.AbstractSyntacticSequencer;\n \n@@ -36,86 +38,89 @@ protected void init(IGrammarAccess access) {\n \t}\n \t\n \t@Override\n-\tprotected String getUnassignedRuleCallToken(RuleCall ruleCall, INode node) {\n+\tprotected String getUnassignedRuleCallToken(EObject semanticObject, RuleCall ruleCall, INode node) {\n \t\treturn \"\";\n \t}\n \t\n \t\n \t@Override\n \tprotected void emitUnassignedTokens(EObject semanticObject, ISynTransition transition, INode fromNode, INode toNode) {\n-\t\tif (!transition.isSyntacticallyAmbiguous())\n-\t\t\treturn;\n-\t\tif(match_Function_CommaKeyword_2_2_q.equals(transition.getAmbiguousSyntax()))\n-\t\t\temit_Function_CommaKeyword_2_2_q(semanticObject, transition, fromNode, toNode);\n-\t\telse if(match_MatrixRow_CommaKeyword_1_2_q.equals(transition.getAmbiguousSyntax()))\n-\t\t\temit_MatrixRow_CommaKeyword_1_2_q(semanticObject, transition, fromNode, toNode);\n-\t\telse if(match_Matrix_CommaKeyword_1_2_q.equals(transition.getAmbiguousSyntax()))\n-\t\t\temit_Matrix_CommaKeyword_1_2_q(semanticObject, transition, fromNode, toNode);\n-\t\telse if(match_PrimaryMatrix_LeftParenthesisKeyword_3_0_a.equals(transition.getAmbiguousSyntax()))\n-\t\t\temit_PrimaryMatrix_LeftParenthesisKeyword_3_0_a(semanticObject, transition, fromNode, toNode);\n-\t\telse if(match_PrimaryMatrix_LeftParenthesisKeyword_3_0_p.equals(transition.getAmbiguousSyntax()))\n-\t\t\temit_PrimaryMatrix_LeftParenthesisKeyword_3_0_p(semanticObject, transition, fromNode, toNode);\n-\t\telse if(match_Primary_LeftParenthesisKeyword_4_0_a.equals(transition.getAmbiguousSyntax()))\n-\t\t\temit_Primary_LeftParenthesisKeyword_4_0_a(semanticObject, transition, fromNode, toNode);\n-\t\telse if(match_Primary_LeftParenthesisKeyword_4_0_p.equals(transition.getAmbiguousSyntax()))\n-\t\t\temit_Primary_LeftParenthesisKeyword_4_0_p(semanticObject, transition, fromNode, toNode);\n-\t\telse acceptNodes(transition, fromNode, toNode);\n+\t\tif (transition.getAmbiguousSyntaxes().isEmpty()) return;\n+\t\tList<INode> transitionNodes = collectNodes(fromNode, toNode);\n+\t\tfor (AbstractElementAlias syntax : transition.getAmbiguousSyntaxes()) {\n+\t\t\tList<INode> syntaxNodes = getNodesFor(transitionNodes, syntax);\n+\t\t\tif(match_Function_CommaKeyword_2_2_q.equals(syntax))\n+\t\t\t\temit_Function_CommaKeyword_2_2_q(semanticObject, getLastNavigableState(), syntaxNodes);\n+\t\t\telse if(match_MatrixRow_CommaKeyword_1_2_q.equals(syntax))\n+\t\t\t\temit_MatrixRow_CommaKeyword_1_2_q(semanticObject, getLastNavigableState(), syntaxNodes);\n+\t\t\telse if(match_Matrix_CommaKeyword_1_2_q.equals(syntax))\n+\t\t\t\temit_Matrix_CommaKeyword_1_2_q(semanticObject, getLastNavigableState(), syntaxNodes);\n+\t\t\telse if(match_PrimaryMatrix_LeftParenthesisKeyword_3_0_a.equals(syntax))\n+\t\t\t\temit_PrimaryMatrix_LeftParenthesisKeyword_3_0_a(semanticObject, getLastNavigableState(), syntaxNodes);\n+\t\t\telse if(match_PrimaryMatrix_LeftParenthesisKeyword_3_0_p.equals(syntax))\n+\t\t\t\temit_PrimaryMatrix_LeftParenthesisKeyword_3_0_p(semanticObject, getLastNavigableState(), syntaxNodes);\n+\t\t\telse if(match_Primary_LeftParenthesisKeyword_4_0_a.equals(syntax))\n+\t\t\t\temit_Primary_LeftParenthesisKeyword_4_0_a(semanticObject, getLastNavigableState(), syntaxNodes);\n+\t\t\telse if(match_Primary_LeftParenthesisKeyword_4_0_p.equals(syntax))\n+\t\t\t\temit_Primary_LeftParenthesisKeyword_4_0_p(semanticObject, getLastNavigableState(), syntaxNodes);\n+\t\t\telse acceptNodes(getLastNavigableState(), syntaxNodes);\n+\t\t}\n \t}\n \n \t/**\n \t * Syntax:\n \t * ','?\n \t */\n-\tprotected void emit_Function_CommaKeyword_2_2_q(EObject semanticObject, ISynTransition transition, INode fromNode, INode toNode) {\n-\t\tacceptNodes(transition, fromNode, toNode);\n+\tprotected void emit_Function_CommaKeyword_2_2_q(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {\n+\t\tacceptNodes(transition, nodes);\n \t}\n \t\n \t/**\n \t * Syntax:\n \t * ','?\n \t */\n-\tprotected void emit_MatrixRow_CommaKeyword_1_2_q(EObject semanticObject, ISynTransition transition, INode fromNode, INode toNode) {\n-\t\tacceptNodes(transition, fromNode, toNode);\n+\tprotected void emit_MatrixRow_CommaKeyword_1_2_q(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {\n+\t\tacceptNodes(transition, nodes);\n \t}\n \t\n \t/**\n \t * Syntax:\n \t * ','?\n \t */\n-\tprotected void emit_Matrix_CommaKeyword_1_2_q(EObject semanticObject, ISynTransition transition, INode fromNode, INode toNode) {\n-\t\tacceptNodes(transition, fromNode, toNode);\n+\tprotected void emit_Matrix_CommaKeyword_1_2_q(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {\n+\t\tacceptNodes(transition, nodes);\n \t}\n \t\n \t/**\n \t * Syntax:\n \t * '('*\n \t */\n-\tprotected void emit_PrimaryMatrix_LeftParenthesisKeyword_3_0_a(EObject semanticObject, ISynTransition transition, INode fromNode, INode toNode) {\n-\t\tacceptNodes(transition, fromNode, toNode);\n+\tprotected void emit_PrimaryMatrix_LeftParenthesisKeyword_3_0_a(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {\n+\t\tacceptNodes(transition, nodes);\n \t}\n \t\n \t/**\n \t * Syntax:\n \t * '('+\n \t */\n-\tprotected void emit_PrimaryMatrix_LeftParenthesisKeyword_3_0_p(EObject semanticObject, ISynTransition transition, INode fromNode, INode toNode) {\n-\t\tacceptNodes(transition, fromNode, toNode);\n+\tprotected void emit_PrimaryMatrix_LeftParenthesisKeyword_3_0_p(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {\n+\t\tacceptNodes(transition, nodes);\n \t}\n \t\n \t/**\n \t * Syntax:\n \t * '('*\n \t */\n-\tprotected void emit_Primary_LeftParenthesisKeyword_4_0_a(EObject semanticObject, ISynTransition transition, INode fromNode, INode toNode) {\n-\t\tacceptNodes(transition, fromNode, toNode);\n+\tprotected void emit_Primary_LeftParenthesisKeyword_4_0_a(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {\n+\t\tacceptNodes(transition, nodes);\n \t}\n \t\n \t/**\n \t * Syntax:\n \t * '('+\n \t */\n-\tprotected void emit_Primary_LeftParenthesisKeyword_4_0_p(EObject semanticObject, ISynTransition transition, INode fromNode, INode toNode) {\n-\t\tacceptNodes(transition, fromNode, toNode);\n+\tprotected void emit_Primary_LeftParenthesisKeyword_4_0_p(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {\n+\t\tacceptNodes(transition, nodes);\n \t}\n \t\n }", "raw_url": "https://github.com/iee/iee/raw/0492aafe3780886c3936544ffed92c1bcc587431/org.eclipse.iee.translator.Jmole%2Forg.eclipse.iee.translator.jmole.math%2Fsrc-gen%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fjmole%2Fmath%2Fserializer%2FAbstractMathSyntacticSequencer.java", "sha": "c1ec1ad39d3431d46cabf52d79548e1ab87506c5", "status": "modified" }, { "additions": 15, "blob_url": "https://github.com/iee/iee/blob/0492aafe3780886c3936544ffed92c1bcc587431/org.eclipse.iee.translator.Jmole%2Forg.eclipse.iee.translator.jmole.math%2Fsrc-gen%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fjmole%2Fmath%2Fservices%2FMathGrammarAccess.java", "changes": 30, "contents_url": "https://api.github.com/repos/iee/iee/contents/org.eclipse.iee.translator.Jmole%2Forg.eclipse.iee.translator.jmole.math%2Fsrc-gen%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fjmole%2Fmath%2Fservices%2FMathGrammarAccess.java?ref=0492aafe3780886c3936544ffed92c1bcc587431", "deletions": 15, "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "new_code": "\t\tprivate final RuleCall cRowFloatParserRuleCall_2_3_0 = (RuleCall)cRowAssignment_2_3.eContents().get(0);\n\t\tprivate final RuleCall cColumnFloatParserRuleCall_2_6_0 = (RuleCall)cColumnAssignment_2_6.eContents().get(0);\n\t\t//\t{Variable} name=MATH_NAME | {Float} value=Float | {MatrixElement} element=MATH_NAME \"[\" row=Float \"]\" \"[\" column=Float\n\t\t//\t\"]\" | {Function} function=Function | \"(\" Addition \")\";\n\t\t//{Variable} name=MATH_NAME | {Float} value=Float | {MatrixElement} element=MATH_NAME \"[\" row=Float \"]\" \"[\" column=Float\n\t\t//\"]\" | {Function} function=Function | \"(\" Addition \")\"\n\t\t//{MatrixElement} element=MATH_NAME \"[\" row=Float \"]\" \"[\" column=Float \"]\"\n\t\t//row=Float\n\t\t//Float\n\t\tpublic RuleCall getRowFloatParserRuleCall_2_3_0() { return cRowFloatParserRuleCall_2_3_0; }\n\t\t//column=Float\n\t\t//Float\n\t\tpublic RuleCall getColumnFloatParserRuleCall_2_6_0() { return cColumnFloatParserRuleCall_2_6_0; }\n\t//\t{Variable} name=MATH_NAME | {Float} value=Float | {MatrixElement} element=MATH_NAME \"[\" row=Float \"]\" \"[\" column=Float\n\t//\t\"]\" | {Function} function=Function | \"(\" Addition \")\";", "new_methods": [ { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cRowFloatParserRuleCall_2_3_0;", "signature": "RuleCall getRowFloatParserRuleCall_2_3_0()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cColumnFloatParserRuleCall_2_6_0;", "signature": "RuleCall getColumnFloatParserRuleCall_2_6_0()" } ], "old_code": "\t\tprivate final RuleCall cRowINTTerminalRuleCall_2_3_0 = (RuleCall)cRowAssignment_2_3.eContents().get(0);\n\t\tprivate final RuleCall cColumnINTTerminalRuleCall_2_6_0 = (RuleCall)cColumnAssignment_2_6.eContents().get(0);\n\t\t//\t{Variable} name=MATH_NAME | {Float} value=Float | {MatrixElement} element=MATH_NAME \"[\" row=INT \"]\" \"[\" column=INT \"]\"\n\t\t//\t| {Function} function=Function | \"(\" Addition \")\";\n\t\t//{Variable} name=MATH_NAME | {Float} value=Float | {MatrixElement} element=MATH_NAME \"[\" row=INT \"]\" \"[\" column=INT \"]\" |\n\t\t//{Function} function=Function | \"(\" Addition \")\"\n\t\t//{MatrixElement} element=MATH_NAME \"[\" row=INT \"]\" \"[\" column=INT \"]\"\n\t\t//row=INT\n\t\t//INT\n\t\tpublic RuleCall getRowINTTerminalRuleCall_2_3_0() { return cRowINTTerminalRuleCall_2_3_0; }\n\t\t//column=INT\n\t\t//INT\n\t\tpublic RuleCall getColumnINTTerminalRuleCall_2_6_0() { return cColumnINTTerminalRuleCall_2_6_0; }\n\t//\t{Variable} name=MATH_NAME | {Float} value=Float | {MatrixElement} element=MATH_NAME \"[\" row=INT \"]\" \"[\" column=INT \"]\"\n\t//\t| {Function} function=Function | \"(\" Addition \")\";", "old_methods": [ { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cRowINTTerminalRuleCall_2_3_0;", "signature": "RuleCall getRowINTTerminalRuleCall_2_3_0()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cColumnINTTerminalRuleCall_2_6_0;", "signature": "RuleCall getColumnINTTerminalRuleCall_2_6_0()" } ], "patch": "@@ -388,11 +388,11 @@ public class PrimaryElements extends AbstractParserRuleElementFinder {\n \t\tprivate final RuleCall cElementMATH_NAMETerminalRuleCall_2_1_0 = (RuleCall)cElementAssignment_2_1.eContents().get(0);\n \t\tprivate final Keyword cLeftSquareBracketKeyword_2_2 = (Keyword)cGroup_2.eContents().get(2);\n \t\tprivate final Assignment cRowAssignment_2_3 = (Assignment)cGroup_2.eContents().get(3);\n-\t\tprivate final RuleCall cRowINTTerminalRuleCall_2_3_0 = (RuleCall)cRowAssignment_2_3.eContents().get(0);\n+\t\tprivate final RuleCall cRowFloatParserRuleCall_2_3_0 = (RuleCall)cRowAssignment_2_3.eContents().get(0);\n \t\tprivate final Keyword cRightSquareBracketKeyword_2_4 = (Keyword)cGroup_2.eContents().get(4);\n \t\tprivate final Keyword cLeftSquareBracketKeyword_2_5 = (Keyword)cGroup_2.eContents().get(5);\n \t\tprivate final Assignment cColumnAssignment_2_6 = (Assignment)cGroup_2.eContents().get(6);\n-\t\tprivate final RuleCall cColumnINTTerminalRuleCall_2_6_0 = (RuleCall)cColumnAssignment_2_6.eContents().get(0);\n+\t\tprivate final RuleCall cColumnFloatParserRuleCall_2_6_0 = (RuleCall)cColumnAssignment_2_6.eContents().get(0);\n \t\tprivate final Keyword cRightSquareBracketKeyword_2_7 = (Keyword)cGroup_2.eContents().get(7);\n \t\tprivate final Group cGroup_3 = (Group)cAlternatives.eContents().get(3);\n \t\tprivate final Action cFunctionAction_3_0 = (Action)cGroup_3.eContents().get(0);\n@@ -404,12 +404,12 @@ public class PrimaryElements extends AbstractParserRuleElementFinder {\n \t\tprivate final Keyword cRightParenthesisKeyword_4_2 = (Keyword)cGroup_4.eContents().get(2);\n \t\t\n \t\t//Primary returns Expression:\n-\t\t//\t{Variable} name=MATH_NAME | {Float} value=Float | {MatrixElement} element=MATH_NAME \"[\" row=INT \"]\" \"[\" column=INT \"]\"\n-\t\t//\t| {Function} function=Function | \"(\" Addition \")\";\n+\t\t//\t{Variable} name=MATH_NAME | {Float} value=Float | {MatrixElement} element=MATH_NAME \"[\" row=Float \"]\" \"[\" column=Float\n+\t\t//\t\"]\" | {Function} function=Function | \"(\" Addition \")\";\n \t\tpublic ParserRule getRule() { return rule; }\n \n-\t\t//{Variable} name=MATH_NAME | {Float} value=Float | {MatrixElement} element=MATH_NAME \"[\" row=INT \"]\" \"[\" column=INT \"]\" |\n-\t\t//{Function} function=Function | \"(\" Addition \")\"\n+\t\t//{Variable} name=MATH_NAME | {Float} value=Float | {MatrixElement} element=MATH_NAME \"[\" row=Float \"]\" \"[\" column=Float\n+\t\t//\"]\" | {Function} function=Function | \"(\" Addition \")\"\n \t\tpublic Alternatives getAlternatives() { return cAlternatives; }\n \n \t\t//{Variable} name=MATH_NAME\n@@ -436,7 +436,7 @@ public class PrimaryElements extends AbstractParserRuleElementFinder {\n \t\t//Float\n \t\tpublic RuleCall getValueFloatParserRuleCall_1_1_0() { return cValueFloatParserRuleCall_1_1_0; }\n \n-\t\t//{MatrixElement} element=MATH_NAME \"[\" row=INT \"]\" \"[\" column=INT \"]\"\n+\t\t//{MatrixElement} element=MATH_NAME \"[\" row=Float \"]\" \"[\" column=Float \"]\"\n \t\tpublic Group getGroup_2() { return cGroup_2; }\n \n \t\t//{MatrixElement}\n@@ -451,23 +451,23 @@ public class PrimaryElements extends AbstractParserRuleElementFinder {\n \t\t//\"[\"\n \t\tpublic Keyword getLeftSquareBracketKeyword_2_2() { return cLeftSquareBracketKeyword_2_2; }\n \n-\t\t//row=INT\n+\t\t//row=Float\n \t\tpublic Assignment getRowAssignment_2_3() { return cRowAssignment_2_3; }\n \n-\t\t//INT\n-\t\tpublic RuleCall getRowINTTerminalRuleCall_2_3_0() { return cRowINTTerminalRuleCall_2_3_0; }\n+\t\t//Float\n+\t\tpublic RuleCall getRowFloatParserRuleCall_2_3_0() { return cRowFloatParserRuleCall_2_3_0; }\n \n \t\t//\"]\"\n \t\tpublic Keyword getRightSquareBracketKeyword_2_4() { return cRightSquareBracketKeyword_2_4; }\n \n \t\t//\"[\"\n \t\tpublic Keyword getLeftSquareBracketKeyword_2_5() { return cLeftSquareBracketKeyword_2_5; }\n \n-\t\t//column=INT\n+\t\t//column=Float\n \t\tpublic Assignment getColumnAssignment_2_6() { return cColumnAssignment_2_6; }\n \n-\t\t//INT\n-\t\tpublic RuleCall getColumnINTTerminalRuleCall_2_6_0() { return cColumnINTTerminalRuleCall_2_6_0; }\n+\t\t//Float\n+\t\tpublic RuleCall getColumnFloatParserRuleCall_2_6_0() { return cColumnFloatParserRuleCall_2_6_0; }\n \n \t\t//\"]\"\n \t\tpublic Keyword getRightSquareBracketKeyword_2_7() { return cRightSquareBracketKeyword_2_7; }\n@@ -1145,8 +1145,8 @@ public ParserRule getExponentRule() {\n \t}\n \n \t//Primary returns Expression:\n-\t//\t{Variable} name=MATH_NAME | {Float} value=Float | {MatrixElement} element=MATH_NAME \"[\" row=INT \"]\" \"[\" column=INT \"]\"\n-\t//\t| {Function} function=Function | \"(\" Addition \")\";\n+\t//\t{Variable} name=MATH_NAME | {Float} value=Float | {MatrixElement} element=MATH_NAME \"[\" row=Float \"]\" \"[\" column=Float\n+\t//\t\"]\" | {Function} function=Function | \"(\" Addition \")\";\n \tpublic PrimaryElements getPrimaryAccess() {\n \t\treturn (pPrimary != null) ? pPrimary : (pPrimary = new PrimaryElements());\n \t}", "raw_url": "https://github.com/iee/iee/raw/0492aafe3780886c3936544ffed92c1bcc587431/org.eclipse.iee.translator.Jmole%2Forg.eclipse.iee.translator.jmole.math%2Fsrc-gen%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fjmole%2Fmath%2Fservices%2FMathGrammarAccess.java", "sha": "6da78784dec791439781e56a1886145f92bbacd4", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/iee/iee/blob/0492aafe3780886c3936544ffed92c1bcc587431/org.eclipse.iee.translator.Jmole%2Forg.eclipse.iee.translator.jmole.math%2Fsrc%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fjmole%2Fmath%2FMath.xtext", "changes": 2, "contents_url": "https://api.github.com/repos/iee/iee/contents/org.eclipse.iee.translator.Jmole%2Forg.eclipse.iee.translator.jmole.math%2Fsrc%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fjmole%2Fmath%2FMath.xtext?ref=0492aafe3780886c3936544ffed92c1bcc587431", "deletions": 1, "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src/org/eclipse/iee/translator/jmole/math/Math.xtext", "new_code": "\t{MatrixElement} element=MATH_NAME '[' row=Float ']' '[' column=Float ']' | ", "new_methods": [], "old_code": "\t{MatrixElement} element=MATH_NAME '[' row=INT ']' '[' column=INT ']' | ", "old_methods": [], "patch": "@@ -39,7 +39,7 @@ Exponent returns Expression:\n Primary returns Expression:\n \t{Variable} name=MATH_NAME |\n \t{Float} value=Float |\n-\t{MatrixElement} element=MATH_NAME '[' row=INT ']' '[' column=INT ']' | \n+\t{MatrixElement} element=MATH_NAME '[' row=Float ']' '[' column=Float ']' | \n \t{Function} function=Function |\n \t'(' Addition ')';\n ", "raw_url": "https://github.com/iee/iee/raw/0492aafe3780886c3936544ffed92c1bcc587431/org.eclipse.iee.translator.Jmole%2Forg.eclipse.iee.translator.jmole.math%2Fsrc%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fjmole%2Fmath%2FMath.xtext", "sha": "a81ab333fc9e64436f5ba09a88d26b704a9d52b7", "status": "modified" }, { "additions": 2, "blob_url": "https://github.com/iee/iee/blob/0492aafe3780886c3936544ffed92c1bcc587431/org.eclipse.iee.translator.Jmole%2Forg.eclipse.iee.translator.jmole.math%2Fxtend-gen%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fjmole%2Fmath%2Fgenerator%2FMathGenerator.java", "changes": 4, "contents_url": "https://api.github.com/repos/iee/iee/contents/org.eclipse.iee.translator.Jmole%2Forg.eclipse.iee.translator.jmole.math%2Fxtend-gen%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fjmole%2Fmath%2Fgenerator%2FMathGenerator.java?ref=0492aafe3780886c3936544ffed92c1bcc587431", "deletions": 2, "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/xtend-gen/org/eclipse/iee/translator/jmole/math/generator/MathGenerator.java", "new_code": " String _row = e.getRow();\n String _column = e.getColumn();", "new_methods": [], "old_code": " int _row = e.getRow();\n int _column = e.getColumn();", "old_methods": [], "patch": "@@ -272,10 +272,10 @@ protected StringConcatenation _compileExpression(final MatrixElement e) {\n String _element = e.getElement();\n _builder.append(_element, \"\");\n _builder.append(\".get(\");\n- int _row = e.getRow();\n+ String _row = e.getRow();\n _builder.append(_row, \"\");\n _builder.append(\",\");\n- int _column = e.getColumn();\n+ String _column = e.getColumn();\n _builder.append(_column, \"\");\n _builder.append(\")\");\n return _builder;", "raw_url": "https://github.com/iee/iee/raw/0492aafe3780886c3936544ffed92c1bcc587431/org.eclipse.iee.translator.Jmole%2Forg.eclipse.iee.translator.jmole.math%2Fxtend-gen%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fjmole%2Fmath%2Fgenerator%2FMathGenerator.java", "sha": "dc39c743f70dac7557960d6a097c862ba9e96bb0", "status": "modified" }, { "additions": 2, "blob_url": "https://github.com/iee/iee/blob/0492aafe3780886c3936544ffed92c1bcc587431/org.eclipse.iee.translator.TeXmole%2Forg.eclipse.iee.translator.molex.mex%2Fbin%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fmolex%2Fmex%2FMex.ecore", "changes": 4, "contents_url": "https://api.github.com/repos/iee/iee/contents/org.eclipse.iee.translator.TeXmole%2Forg.eclipse.iee.translator.molex.mex%2Fbin%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fmolex%2Fmex%2FMex.ecore?ref=0492aafe3780886c3936544ffed92c1bcc587431", "deletions": 2, "filename": "org.eclipse.iee.translator.TeXmole/org.eclipse.iee.translator.molex.mex/bin/org/eclipse/iee/translator/molex/mex/Mex.ecore", "new_code": " <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"row\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString\"/>\n <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"column\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString\"/>", "new_methods": [], "old_code": " <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"row\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt\"/>\n <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"column\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt\"/>", "old_methods": [], "patch": "@@ -113,8 +113,8 @@\n </eClassifiers>\n <eClassifiers xsi:type=\"ecore:EClass\" name=\"MatrixElement\" eSuperTypes=\"platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//Expression\">\n <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"element\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString\"/>\n- <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"row\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt\"/>\n- <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"column\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt\"/>\n+ <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"row\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString\"/>\n+ <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"column\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString\"/>\n </eClassifiers>\n <eClassifiers xsi:type=\"ecore:EClass\" name=\"InBrackets\" eSuperTypes=\"platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//Expression\">\n <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"inBrackets\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//Expression\"", "raw_url": "https://github.com/iee/iee/raw/0492aafe3780886c3936544ffed92c1bcc587431/org.eclipse.iee.translator.TeXmole%2Forg.eclipse.iee.translator.molex.mex%2Fbin%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fmolex%2Fmex%2FMex.ecore", "sha": "7660cc8b16b77aab2f78e6139d5f3d5171fed29c", "status": "modified" }, { "additions": 2, "blob_url": "https://github.com/iee/iee/blob/0492aafe3780886c3936544ffed92c1bcc587431/org.eclipse.iee.translator.TeXmole%2Forg.eclipse.iee.translator.molex.mex%2Fbin%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fmolex%2Fmex%2FMex.xmi", "changes": 4, "contents_url": "https://api.github.com/repos/iee/iee/contents/org.eclipse.iee.translator.TeXmole%2Forg.eclipse.iee.translator.molex.mex%2Fbin%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fmolex%2Fmex%2FMex.xmi?ref=0492aafe3780886c3936544ffed92c1bcc587431", "deletions": 2, "filename": "org.eclipse.iee.translator.TeXmole/org.eclipse.iee.translator.molex.mex/bin/org/eclipse/iee/translator/molex/mex/Mex.xmi", "new_code": " <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.17\"/>\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.17\"/>", "new_methods": [], "old_code": " <terminal xsi:type=\"xtext:RuleCall\" rule=\"/1/@rules.1\"/>\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/1/@rules.1\"/>", "old_methods": [], "patch": "@@ -235,12 +235,12 @@\n </elements>\n <elements xsi:type=\"xtext:Keyword\" value=\"[\"/>\n <elements xsi:type=\"xtext:Assignment\" feature=\"row\" operator=\"=\">\n- <terminal xsi:type=\"xtext:RuleCall\" rule=\"/1/@rules.1\"/>\n+ <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.17\"/>\n </elements>\n <elements xsi:type=\"xtext:Keyword\" value=\"]\"/>\n <elements xsi:type=\"xtext:Keyword\" value=\"[\"/>\n <elements xsi:type=\"xtext:Assignment\" feature=\"column\" operator=\"=\">\n- <terminal xsi:type=\"xtext:RuleCall\" rule=\"/1/@rules.1\"/>\n+ <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.17\"/>\n </elements>\n <elements xsi:type=\"xtext:Keyword\" value=\"]\"/>\n </elements>", "raw_url": "https://github.com/iee/iee/raw/0492aafe3780886c3936544ffed92c1bcc587431/org.eclipse.iee.translator.TeXmole%2Forg.eclipse.iee.translator.molex.mex%2Fbin%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fmolex%2Fmex%2FMex.xmi", "sha": "9d7c5bcb6f3524babbeb5c90fcbb237337f34cf4", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/iee/iee/blob/0492aafe3780886c3936544ffed92c1bcc587431/org.eclipse.iee.translator.TeXmole%2Forg.eclipse.iee.translator.molex.mex%2Fbin%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fmolex%2Fmex%2FMex.xtext", "changes": 2, "contents_url": "https://api.github.com/repos/iee/iee/contents/org.eclipse.iee.translator.TeXmole%2Forg.eclipse.iee.translator.molex.mex%2Fbin%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fmolex%2Fmex%2FMex.xtext?ref=0492aafe3780886c3936544ffed92c1bcc587431", "deletions": 1, "filename": "org.eclipse.iee.translator.TeXmole/org.eclipse.iee.translator.molex.mex/bin/org/eclipse/iee/translator/molex/mex/Mex.xtext", "new_code": "\t{MatrixElement} element=MATH_NAME '[' row=Float ']' '[' column=Float ']' | ", "new_methods": [], "old_code": "\t{MatrixElement} element=MATH_NAME '[' row=INT ']' '[' column=INT ']' | ", "old_methods": [], "patch": "@@ -43,7 +43,7 @@ Primary returns Expression:\n \t{Variable} name=MATH_NAME |\n \t{Float} value=Float |\n \t{Function} function=Function |\n-\t{MatrixElement} element=MATH_NAME '[' row=INT ']' '[' column=INT ']' | \n+\t{MatrixElement} element=MATH_NAME '[' row=Float ']' '[' column=Float ']' | \n \t{InBrackets} inBrackets=AdditionInBrackets;\n \n Matrix:", "raw_url": "https://github.com/iee/iee/raw/0492aafe3780886c3936544ffed92c1bcc587431/org.eclipse.iee.translator.TeXmole%2Forg.eclipse.iee.translator.molex.mex%2Fbin%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fmolex%2Fmex%2FMex.xtext", "sha": "94d06799200eca0c430baf24f4042d002f0c0935", "status": "modified" }, { "additions": 32, "blob_url": "https://github.com/iee/iee/blob/0492aafe3780886c3936544ffed92c1bcc587431/org.eclipse.iee.translator.TeXmole%2Forg.eclipse.iee.translator.molex.mex%2Fbin%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fmolex%2Fmex%2Fgenerator%2FMexGenerator.xtend", "changes": 32, "contents_url": "https://api.github.com/repos/iee/iee/contents/org.eclipse.iee.translator.TeXmole%2Forg.eclipse.iee.translator.molex.mex%2Fbin%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fmolex%2Fmex%2Fgenerator%2FMexGenerator.xtend?ref=0492aafe3780886c3936544ffed92c1bcc587431", "deletions": 0, "filename": "org.eclipse.iee.translator.TeXmole/org.eclipse.iee.translator.molex.mex/bin/org/eclipse/iee/translator/molex/mex/generator/MexGenerator.xtend", "new_code": "\t\t�IF n.name == \"alpha\" || n.name == \"beta\" || n.name == \"gamma\" ||\n\t\t n.name == \"delta\" || n.name == \"epsilon\" || n.name == \"varepsilon\" ||\n\t\t n.name == \"zeta\" || n.name == \"eta\" || n.name == \"theta\" ||\n\t\t n.name == \"vartheta\" || n.name == \"gamma\" || n.name == \"kappa\" ||\n\t\t\tn.name == \"lambda\" || n.name == \"mu\" || n.name == \"nu\" || \n\t\t\tn.name == \"xi\" || n.name == \"pi\" || n.name == \"varpi\" || \n\t\t\tn.name == \"rho\" || n.name == \"varrho\" || n.name == \"sigma\" ||\n\t\t\tn.name == \"varsigma\" || n.name == \"tau\" || n.name == \"upsilon\" ||\n\t\t\tn.name == \"phi\" || n.name == \"varphi\" || n.name == \"chi\" || \n\t\t\tn.name == \"psi\" || n.name == \"omega\" || n.name == \"Gamma\" ||\n\t\t\tn.name == \"Delta\" || n.name == \"Theta\" || n.name == \"Lambda\" ||\n\t\t\tn.name == \"Xi\" || n.name == \"Pi\" || n.name == \"Sigma\" || \n\t\t\tn.name == \"Upsilon\" || n.name == \"Phi\" || n.name == \"Psi\" || \n\t\t\tn.name == \"Omega\"�\n\t\t\t\\\n\t\t�ENDIF�\n\t\t�IF n.name == \"alpha\" || n.name == \"beta\" || n.name == \"gamma\" ||\n\t\t n.name == \"delta\" || n.name == \"epsilon\" || n.name == \"varepsilon\" ||\n\t\t n.name == \"zeta\" || n.name == \"eta\" || n.name == \"theta\" ||\n\t\t n.name == \"vartheta\" || n.name == \"gamma\" || n.name == \"kappa\" ||\n\t\t\tn.name == \"lambda\" || n.name == \"mu\" || n.name == \"nu\" || \n\t\t\tn.name == \"xi\" || n.name == \"pi\" || n.name == \"varpi\" || \n\t\t\tn.name == \"rho\" || n.name == \"varrho\" || n.name == \"sigma\" ||\n\t\t\tn.name == \"varsigma\" || n.name == \"tau\" || n.name == \"upsilon\" ||\n\t\t\tn.name == \"phi\" || n.name == \"varphi\" || n.name == \"chi\" || \n\t\t\tn.name == \"psi\" || n.name == \"omega\" || n.name == \"Gamma\" ||\n\t\t\tn.name == \"Delta\" || n.name == \"Theta\" || n.name == \"Lambda\" ||\n\t\t\tn.name == \"Xi\" || n.name == \"Pi\" || n.name == \"Sigma\" || \n\t\t\tn.name == \"Upsilon\" || n.name == \"Phi\" || n.name == \"Psi\" || \n\t\t\tn.name == \"Omega\"�\n\t\t\t\\\n\t\t�ENDIF�", "new_methods": [], "old_code": "", "old_methods": [], "patch": "@@ -228,6 +228,22 @@ class MexGenerator implements IGenerator {\n \t\n \t//Matrix Expressions\n \tdef dispatch compileMatrixExpression(MatrixVariable n) '''\n+\t\t�IF n.name == \"alpha\" || n.name == \"beta\" || n.name == \"gamma\" ||\n+\t\t n.name == \"delta\" || n.name == \"epsilon\" || n.name == \"varepsilon\" ||\n+\t\t n.name == \"zeta\" || n.name == \"eta\" || n.name == \"theta\" ||\n+\t\t n.name == \"vartheta\" || n.name == \"gamma\" || n.name == \"kappa\" ||\n+\t\t\tn.name == \"lambda\" || n.name == \"mu\" || n.name == \"nu\" || \n+\t\t\tn.name == \"xi\" || n.name == \"pi\" || n.name == \"varpi\" || \n+\t\t\tn.name == \"rho\" || n.name == \"varrho\" || n.name == \"sigma\" ||\n+\t\t\tn.name == \"varsigma\" || n.name == \"tau\" || n.name == \"upsilon\" ||\n+\t\t\tn.name == \"phi\" || n.name == \"varphi\" || n.name == \"chi\" || \n+\t\t\tn.name == \"psi\" || n.name == \"omega\" || n.name == \"Gamma\" ||\n+\t\t\tn.name == \"Delta\" || n.name == \"Theta\" || n.name == \"Lambda\" ||\n+\t\t\tn.name == \"Xi\" || n.name == \"Pi\" || n.name == \"Sigma\" || \n+\t\t\tn.name == \"Upsilon\" || n.name == \"Phi\" || n.name == \"Psi\" || \n+\t\t\tn.name == \"Omega\"�\n+\t\t\t\\\n+\t\t�ENDIF�\n \t\t�n.name�'''\t\n \t\n \tdef dispatch compileMatrixExpression(NewMatrix m) '''\n@@ -253,6 +269,22 @@ class MexGenerator implements IGenerator {\n \t\t'''\t\n \t\t\n \tdef dispatch compileMatrixExpression(TransposeMatrix n) '''\n+\t\t�IF n.name == \"alpha\" || n.name == \"beta\" || n.name == \"gamma\" ||\n+\t\t n.name == \"delta\" || n.name == \"epsilon\" || n.name == \"varepsilon\" ||\n+\t\t n.name == \"zeta\" || n.name == \"eta\" || n.name == \"theta\" ||\n+\t\t n.name == \"vartheta\" || n.name == \"gamma\" || n.name == \"kappa\" ||\n+\t\t\tn.name == \"lambda\" || n.name == \"mu\" || n.name == \"nu\" || \n+\t\t\tn.name == \"xi\" || n.name == \"pi\" || n.name == \"varpi\" || \n+\t\t\tn.name == \"rho\" || n.name == \"varrho\" || n.name == \"sigma\" ||\n+\t\t\tn.name == \"varsigma\" || n.name == \"tau\" || n.name == \"upsilon\" ||\n+\t\t\tn.name == \"phi\" || n.name == \"varphi\" || n.name == \"chi\" || \n+\t\t\tn.name == \"psi\" || n.name == \"omega\" || n.name == \"Gamma\" ||\n+\t\t\tn.name == \"Delta\" || n.name == \"Theta\" || n.name == \"Lambda\" ||\n+\t\t\tn.name == \"Xi\" || n.name == \"Pi\" || n.name == \"Sigma\" || \n+\t\t\tn.name == \"Upsilon\" || n.name == \"Phi\" || n.name == \"Psi\" || \n+\t\t\tn.name == \"Omega\"�\n+\t\t\t\\\n+\t\t�ENDIF�\n \t\t�n.name�^T'''\t\n \t\t\n \tdef dispatch compileMatrixExpression(MatrixInBrackets op) '''", "raw_url": "https://github.com/iee/iee/raw/0492aafe3780886c3936544ffed92c1bcc587431/org.eclipse.iee.translator.TeXmole%2Forg.eclipse.iee.translator.molex.mex%2Fbin%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fmolex%2Fmex%2Fgenerator%2FMexGenerator.xtend", "sha": "12cce6c8af8826be1c11d49fba6b26cce91da4ee", "status": "modified" }, { "additions": 16, "blob_url": "https://github.com/iee/iee/blob/0492aafe3780886c3936544ffed92c1bcc587431/org.eclipse.iee.translator.TeXmole%2Forg.eclipse.iee.translator.molex.mex%2Fbin%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fmolex%2Fmex%2Fparser%2Fantlr%2Finternal%2FInternalMex.g", "changes": 32, "contents_url": "https://api.github.com/repos/iee/iee/contents/org.eclipse.iee.translator.TeXmole%2Forg.eclipse.iee.translator.molex.mex%2Fbin%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fmolex%2Fmex%2Fparser%2Fantlr%2Finternal%2FInternalMex.g?ref=0492aafe3780886c3936544ffed92c1bcc587431", "deletions": 16, "filename": "org.eclipse.iee.translator.TeXmole/org.eclipse.iee.translator.molex.mex/bin/org/eclipse/iee/translator/molex/mex/parser/antlr/internal/InternalMex.g", "new_code": "\t\t{ \n\t newCompositeNode(grammarAccess.getPrimaryAccess().getRowFloatParserRuleCall_3_3_0()); \n\t }\n\t\tlv_row_9_0=ruleFloat\t\t{\n\t $current = createModelElementForParent(grammarAccess.getPrimaryRule());\n \t\tset(\n \t\t\"Float\");\n\t afterParserOrEnumRuleCall();\n\t\t{ \n\t newCompositeNode(grammarAccess.getPrimaryAccess().getColumnFloatParserRuleCall_3_6_0()); \n\t }\n\t\tlv_column_12_0=ruleFloat\t\t{\n\t $current = createModelElementForParent(grammarAccess.getPrimaryRule());\n \t\tset(\n \t\t\"Float\");\n\t afterParserOrEnumRuleCall();", "new_methods": [], "old_code": "\t\tlv_row_9_0=RULE_INT\n\t\t{\n\t\t\tnewLeafNode(lv_row_9_0, grammarAccess.getPrimaryAccess().getRowINTTerminalRuleCall_3_3_0()); \n\t\t}\n\t\t{\n\t $current = createModelElement(grammarAccess.getPrimaryRule());\n \t\tsetWithLastConsumed(\n \t\t\"INT\");\n\t\tlv_column_12_0=RULE_INT\n\t\t{\n\t\t\tnewLeafNode(lv_column_12_0, grammarAccess.getPrimaryAccess().getColumnINTTerminalRuleCall_3_6_0()); \n\t\t}\n\t\t{\n\t $current = createModelElement(grammarAccess.getPrimaryRule());\n \t\tsetWithLastConsumed(\n \t\t\"INT\");", "old_methods": [], "patch": "@@ -855,19 +855,19 @@ rulePrimary returns [EObject current=null]\n }\n (\n (\n-\t\tlv_row_9_0=RULE_INT\n-\t\t{\n-\t\t\tnewLeafNode(lv_row_9_0, grammarAccess.getPrimaryAccess().getRowINTTerminalRuleCall_3_3_0()); \n-\t\t}\n-\t\t{\n+\t\t{ \n+\t newCompositeNode(grammarAccess.getPrimaryAccess().getRowFloatParserRuleCall_3_3_0()); \n+\t }\n+\t\tlv_row_9_0=ruleFloat\t\t{\n \t if ($current==null) {\n-\t $current = createModelElement(grammarAccess.getPrimaryRule());\n+\t $current = createModelElementForParent(grammarAccess.getPrimaryRule());\n \t }\n- \t\tsetWithLastConsumed(\n+ \t\tset(\n \t\t\t$current, \n \t\t\t\"row\",\n \t\tlv_row_9_0, \n- \t\t\"INT\");\n+ \t\t\"Float\");\n+\t afterParserOrEnumRuleCall();\n \t }\n \n )\n@@ -881,19 +881,19 @@ rulePrimary returns [EObject current=null]\n }\n (\n (\n-\t\tlv_column_12_0=RULE_INT\n-\t\t{\n-\t\t\tnewLeafNode(lv_column_12_0, grammarAccess.getPrimaryAccess().getColumnINTTerminalRuleCall_3_6_0()); \n-\t\t}\n-\t\t{\n+\t\t{ \n+\t newCompositeNode(grammarAccess.getPrimaryAccess().getColumnFloatParserRuleCall_3_6_0()); \n+\t }\n+\t\tlv_column_12_0=ruleFloat\t\t{\n \t if ($current==null) {\n-\t $current = createModelElement(grammarAccess.getPrimaryRule());\n+\t $current = createModelElementForParent(grammarAccess.getPrimaryRule());\n \t }\n- \t\tsetWithLastConsumed(\n+ \t\tset(\n \t\t\t$current, \n \t\t\t\"column\",\n \t\tlv_column_12_0, \n- \t\t\"INT\");\n+ \t\t\"Float\");\n+\t afterParserOrEnumRuleCall();\n \t }\n \n )", "raw_url": "https://github.com/iee/iee/raw/0492aafe3780886c3936544ffed92c1bcc587431/org.eclipse.iee.translator.TeXmole%2Forg.eclipse.iee.translator.molex.mex%2Fbin%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fmolex%2Fmex%2Fparser%2Fantlr%2Finternal%2FInternalMex.g", "sha": "c6c1c3475901e586f543de62de08b193b609f277", "status": "modified" }, { "additions": 6, "blob_url": "https://github.com/iee/iee/blob/0492aafe3780886c3936544ffed92c1bcc587431/org.eclipse.iee.translator.TeXmole%2Forg.eclipse.iee.translator.molex.mex%2Fsrc-gen%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fmolex%2Fmex%2Fmex%2FMatrixElement.java", "changes": 12, "contents_url": "https://api.github.com/repos/iee/iee/contents/org.eclipse.iee.translator.TeXmole%2Forg.eclipse.iee.translator.molex.mex%2Fsrc-gen%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fmolex%2Fmex%2Fmex%2FMatrixElement.java?ref=0492aafe3780886c3936544ffed92c1bcc587431", "deletions": 6, "filename": "org.eclipse.iee.translator.TeXmole/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/mex/MatrixElement.java", "new_code": " * @see #setRow(String)\n String getRow();\n void setRow(String value);\n * @see #setColumn(String)\n String getColumn();\n void setColumn(String value);", "new_methods": [], "old_code": " * @see #setRow(int)\n int getRow();\n void setRow(int value);\n * @see #setColumn(int)\n int getColumn();\n void setColumn(int value);", "old_methods": [], "patch": "@@ -62,12 +62,12 @@ public interface MatrixElement extends Expression\n * </p>\n * <!-- end-user-doc -->\n * @return the value of the '<em>Row</em>' attribute.\n- * @see #setRow(int)\n+ * @see #setRow(String)\n * @see org.eclipse.iee.translator.molex.mex.mex.MexPackage#getMatrixElement_Row()\n * @model\n * @generated\n */\n- int getRow();\n+ String getRow();\n \n /**\n * Sets the value of the '{@link org.eclipse.iee.translator.molex.mex.mex.MatrixElement#getRow <em>Row</em>}' attribute.\n@@ -77,7 +77,7 @@ public interface MatrixElement extends Expression\n * @see #getRow()\n * @generated\n */\n- void setRow(int value);\n+ void setRow(String value);\n \n /**\n * Returns the value of the '<em><b>Column</b></em>' attribute.\n@@ -88,12 +88,12 @@ public interface MatrixElement extends Expression\n * </p>\n * <!-- end-user-doc -->\n * @return the value of the '<em>Column</em>' attribute.\n- * @see #setColumn(int)\n+ * @see #setColumn(String)\n * @see org.eclipse.iee.translator.molex.mex.mex.MexPackage#getMatrixElement_Column()\n * @model\n * @generated\n */\n- int getColumn();\n+ String getColumn();\n \n /**\n * Sets the value of the '{@link org.eclipse.iee.translator.molex.mex.mex.MatrixElement#getColumn <em>Column</em>}' attribute.\n@@ -103,6 +103,6 @@ public interface MatrixElement extends Expression\n * @see #getColumn()\n * @generated\n */\n- void setColumn(int value);\n+ void setColumn(String value);\n \n } // MatrixElement", "raw_url": "https://github.com/iee/iee/raw/0492aafe3780886c3936544ffed92c1bcc587431/org.eclipse.iee.translator.TeXmole%2Forg.eclipse.iee.translator.molex.mex%2Fsrc-gen%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fmolex%2Fmex%2Fmex%2FMatrixElement.java", "sha": "a55fc94f9b4bf5684e898c7bc69517ed6036bda9", "status": "modified" }, { "additions": 14, "blob_url": "https://github.com/iee/iee/blob/0492aafe3780886c3936544ffed92c1bcc587431/org.eclipse.iee.translator.TeXmole%2Forg.eclipse.iee.translator.molex.mex%2Fsrc-gen%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fmolex%2Fmex%2Fmex%2Fimpl%2FMatrixElementImpl.java", "changes": 28, "contents_url": "https://api.github.com/repos/iee/iee/contents/org.eclipse.iee.translator.TeXmole%2Forg.eclipse.iee.translator.molex.mex%2Fsrc-gen%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fmolex%2Fmex%2Fmex%2Fimpl%2FMatrixElementImpl.java?ref=0492aafe3780886c3936544ffed92c1bcc587431", "deletions": 14, "filename": "org.eclipse.iee.translator.TeXmole/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/mex/impl/MatrixElementImpl.java", "new_code": " protected static final String ROW_EDEFAULT = null;\n protected String row = ROW_EDEFAULT;\n protected static final String COLUMN_EDEFAULT = null;\n protected String column = COLUMN_EDEFAULT;\n public String getRow()\n public void setRow(String newRow)\n String oldRow = row;\n public String getColumn()\n public void setColumn(String newColumn)\n String oldColumn = column;\n setRow((String)newValue);\n setColumn((String)newValue);\n return ROW_EDEFAULT == null ? row != null : !ROW_EDEFAULT.equals(row);\n return COLUMN_EDEFAULT == null ? column != null : !COLUMN_EDEFAULT.equals(column);", "new_methods": [], "old_code": " protected static final int ROW_EDEFAULT = 0;\n protected int row = ROW_EDEFAULT;\n protected static final int COLUMN_EDEFAULT = 0;\n protected int column = COLUMN_EDEFAULT;\n public int getRow()\n public void setRow(int newRow)\n int oldRow = row;\n public int getColumn()\n public void setColumn(int newColumn)\n int oldColumn = column;\n setRow((Integer)newValue);\n setColumn((Integer)newValue);\n return row != ROW_EDEFAULT;\n return column != COLUMN_EDEFAULT;", "old_methods": [], "patch": "@@ -60,7 +60,7 @@ public class MatrixElementImpl extends ExpressionImpl implements MatrixElement\n * @generated\n * @ordered\n */\n- protected static final int ROW_EDEFAULT = 0;\n+ protected static final String ROW_EDEFAULT = null;\n \n /**\n * The cached value of the '{@link #getRow() <em>Row</em>}' attribute.\n@@ -70,7 +70,7 @@ public class MatrixElementImpl extends ExpressionImpl implements MatrixElement\n * @generated\n * @ordered\n */\n- protected int row = ROW_EDEFAULT;\n+ protected String row = ROW_EDEFAULT;\n \n /**\n * The default value of the '{@link #getColumn() <em>Column</em>}' attribute.\n@@ -80,7 +80,7 @@ public class MatrixElementImpl extends ExpressionImpl implements MatrixElement\n * @generated\n * @ordered\n */\n- protected static final int COLUMN_EDEFAULT = 0;\n+ protected static final String COLUMN_EDEFAULT = null;\n \n /**\n * The cached value of the '{@link #getColumn() <em>Column</em>}' attribute.\n@@ -90,7 +90,7 @@ public class MatrixElementImpl extends ExpressionImpl implements MatrixElement\n * @generated\n * @ordered\n */\n- protected int column = COLUMN_EDEFAULT;\n+ protected String column = COLUMN_EDEFAULT;\n \n /**\n * <!-- begin-user-doc -->\n@@ -141,7 +141,7 @@ public void setElement(String newElement)\n * <!-- end-user-doc -->\n * @generated\n */\n- public int getRow()\n+ public String getRow()\n {\n return row;\n }\n@@ -151,9 +151,9 @@ public int getRow()\n * <!-- end-user-doc -->\n * @generated\n */\n- public void setRow(int newRow)\n+ public void setRow(String newRow)\n {\n- int oldRow = row;\n+ String oldRow = row;\n row = newRow;\n if (eNotificationRequired())\n eNotify(new ENotificationImpl(this, Notification.SET, MexPackage.MATRIX_ELEMENT__ROW, oldRow, row));\n@@ -164,7 +164,7 @@ public void setRow(int newRow)\n * <!-- end-user-doc -->\n * @generated\n */\n- public int getColumn()\n+ public String getColumn()\n {\n return column;\n }\n@@ -174,9 +174,9 @@ public int getColumn()\n * <!-- end-user-doc -->\n * @generated\n */\n- public void setColumn(int newColumn)\n+ public void setColumn(String newColumn)\n {\n- int oldColumn = column;\n+ String oldColumn = column;\n column = newColumn;\n if (eNotificationRequired())\n eNotify(new ENotificationImpl(this, Notification.SET, MexPackage.MATRIX_ELEMENT__COLUMN, oldColumn, column));\n@@ -216,10 +216,10 @@ public void eSet(int featureID, Object newValue)\n setElement((String)newValue);\n return;\n case MexPackage.MATRIX_ELEMENT__ROW:\n- setRow((Integer)newValue);\n+ setRow((String)newValue);\n return;\n case MexPackage.MATRIX_ELEMENT__COLUMN:\n- setColumn((Integer)newValue);\n+ setColumn((String)newValue);\n return;\n }\n super.eSet(featureID, newValue);\n@@ -261,9 +261,9 @@ public boolean eIsSet(int featureID)\n case MexPackage.MATRIX_ELEMENT__ELEMENT:\n return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);\n case MexPackage.MATRIX_ELEMENT__ROW:\n- return row != ROW_EDEFAULT;\n+ return ROW_EDEFAULT == null ? row != null : !ROW_EDEFAULT.equals(row);\n case MexPackage.MATRIX_ELEMENT__COLUMN:\n- return column != COLUMN_EDEFAULT;\n+ return COLUMN_EDEFAULT == null ? column != null : !COLUMN_EDEFAULT.equals(column);\n }\n return super.eIsSet(featureID);\n }", "raw_url": "https://github.com/iee/iee/raw/0492aafe3780886c3936544ffed92c1bcc587431/org.eclipse.iee.translator.TeXmole%2Forg.eclipse.iee.translator.molex.mex%2Fsrc-gen%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fmolex%2Fmex%2Fmex%2Fimpl%2FMatrixElementImpl.java", "sha": "79d3a5e3e002b638813a936e956faa06da4b62c5", "status": "modified" } ]
23
[ { "name": "iee$iee", "new_args": "", "new_implementation": "return cColumnFloatParserRuleCall_2_6_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getColumnFloatParserRuleCall_2_6_0()", "old_args": "", "old_implementation": "return cColumnINTTerminalRuleCall_2_6_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getColumnINTTerminalRuleCall_2_6_0()" }, { "name": "iee$iee", "new_args": "", "new_implementation": "return cRowFloatParserRuleCall_2_3_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getRowFloatParserRuleCall_2_3_0()", "old_args": "", "old_implementation": "return cRowINTTerminalRuleCall_2_3_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getRowINTTerminalRuleCall_2_3_0()" } ]
2
46
06fe82da71dd6d2f9b52b9d0fc12bf6acd6cca0e
[ { "name": "choreos$choreos_v-v", "new_args": "Client client", "new_implementation": "this.client = client;", "new_return_type": "void", "new_signature": "void setClient(Client client)", "old_args": "", "old_implementation": "loadGen = LoadGeneratorFactory.getInstance().<K, T> create();", "old_return_type": "void", "old_signature": "void newLoadGenerator()" } ]
[ { "additions": 18, "blob_url": "https://github.com/choreos/choreos_v-v/blob/06fe82da71dd6d2f9b52b9d0fc12bf6acd6cca0e/scalability_explorer%2Fsrc%2Fmain%2Fjava%2Feu%2Fchoreos%2Fvv%2Fexperiments%2FExperiment.java", "changes": 76, "contents_url": "https://api.github.com/repos/choreos/choreos_v-v/contents/scalability_explorer%2Fsrc%2Fmain%2Fjava%2Feu%2Fchoreos%2Fvv%2Fexperiments%2FExperiment.java?ref=06fe82da71dd6d2f9b52b9d0fc12bf6acd6cca0e", "deletions": 58, "filename": "scalability_explorer/src/main/java/eu/choreos/vv/experiments/Experiment.java", "new_code": "import eu.choreos.vv.client.Client;\npublic abstract class Experiment implements Scalable {\n\t//private LoadGenerator<K, T> loadGen;\n\tprivate Client client;\n\t\n\tpublic Client getClient() {\n\t\treturn client;\n\t}\n\t\n\tpublic void setClient(Client client) {\n\t\tthis.client = client; \n\t}\n\t\t//beforeIteration();\n\t\t//newLoadGenerator();\n\t\t//loadGen.setDelay(60000000000l / numberOfRequestsPerMinute);\n\t\treport = client.execute(numberOfRequestsPerIteration, 60000000000l / numberOfRequestsPerMinute, parameters);\n\t\t//afterIteration();\n\t\treport.setMeasurementUnit(client.getLabel());", "new_methods": [ { "arguments": [], "filename": "scalability_explorer/src/main/java/eu/choreos/vv/experiments/Experiment.java", "implementation": "return client;", "signature": "Client getClient()" }, { "arguments": [ "Client client" ], "filename": "scalability_explorer/src/main/java/eu/choreos/vv/experiments/Experiment.java", "implementation": "this.client = client;", "signature": "void setClient(Client client)" } ], "old_code": "import eu.choreos.vv.loadgenerator.LoadGenerator;\nimport eu.choreos.vv.loadgenerator.LoadGeneratorFactory;\npublic abstract class Experiment<K, T> implements Scalable {\n\tprivate LoadGenerator<K, T> loadGen;\n\t/**\n\t * This method can be overridden to execute before each Iteration\n\t * \n\t * @param resourceQuantity\n\t * current resource quantity\n\t * @throws Exception\n\t */\n\tpublic void beforeIteration() throws Exception {\n\t}\n\n\t/**\n\t * This method can be overridden to execute before each request\n\t * \n\t * @throws Exception\n\t */\n\tpublic K beforeRequest() throws Exception {\n\t\treturn null;\n\t}\n\n\t/**\n\t * This method must be overridden in order to execute the proper request\n\t * \n\t * @throws Exception\n\t */\n\tpublic T request(K param) throws Exception {\n\t\treturn null;\n\t}\n\n\t/**\n\t * This method can be overriden to execute after each request\n\t * \n\t * @throws Exception\n\t */\n\tpublic void afterRequest(T param) throws Exception {\n\t}\n\n\t/**\n\t * This method can be overriden to execute after each Iteration\n\t * \n\t * @throws Expeption\n\t */\n\tpublic void afterIteration() throws Exception {\n\n\t}\n\n\tprivate void newLoadGenerator() {\n\t\tloadGen = LoadGeneratorFactory.getInstance().<K, T> create();\n\t}\n\t\tbeforeIteration();\n\t\tnewLoadGenerator();\n\t\tloadGen.setDelay(60000000000l / numberOfRequestsPerMinute);\n\t\treport = loadGen.execute(numberOfRequestsPerIteration, this);\n\t\tafterIteration();\n\t\treport.setMeasurementUnit(loadGen.getLabel());", "old_methods": [ { "arguments": [], "filename": "scalability_explorer/src/main/java/eu/choreos/vv/experiments/Experiment.java", "implementation": "loadGen = LoadGeneratorFactory.getInstance().<K, T> create();", "signature": "void newLoadGenerator()" } ], "patch": "@@ -8,12 +8,11 @@\n import eu.choreos.vv.Scalable;\n import eu.choreos.vv.ScaleCaster;\n import eu.choreos.vv.analysis.Analyzer;\n+import eu.choreos.vv.client.Client;\n import eu.choreos.vv.data.ExperimentReport;\n import eu.choreos.vv.data.ReportData;\n import eu.choreos.vv.deployment.Deployer;\n import eu.choreos.vv.experiments.strategy.ExperimentStrategy;\n-import eu.choreos.vv.loadgenerator.LoadGenerator;\n-import eu.choreos.vv.loadgenerator.LoadGeneratorFactory;\n import eu.choreos.vv.stop.IterationsStop;\n import eu.choreos.vv.stop.StopCriterion;\n \n@@ -27,13 +26,14 @@\n * limit).\n * \n */\n-public abstract class Experiment<K, T> implements Scalable {\n+public abstract class Experiment implements Scalable {\n \n \tprivate int numberOfRequestsPerIteration;\n \tprivate int numberOfRequestsPerMinute;\n \tprivate Map<String, Object> parameters;\n \tprivate StopCriterion criteria;\n-\tprivate LoadGenerator<K, T> loadGen;\n+\t//private LoadGenerator<K, T> loadGen;\n+\tprivate Client client;\n \tprivate Deployer deployer;\n \tprivate Analyzer analyzer;\n \tprivate List<ExperimentReport> reports;\n@@ -47,51 +47,6 @@ public abstract class Experiment<K, T> implements Scalable {\n \tpublic void beforeExperiment() throws Exception {\n \t}\n \n-\t/**\n-\t * This method can be overridden to execute before each Iteration\n-\t * \n-\t * @param resourceQuantity\n-\t * current resource quantity\n-\t * @throws Exception\n-\t */\n-\tpublic void beforeIteration() throws Exception {\n-\t}\n-\n-\t/**\n-\t * This method can be overridden to execute before each request\n-\t * \n-\t * @throws Exception\n-\t */\n-\tpublic K beforeRequest() throws Exception {\n-\t\treturn null;\n-\t}\n-\n-\t/**\n-\t * This method must be overridden in order to execute the proper request\n-\t * \n-\t * @throws Exception\n-\t */\n-\tpublic T request(K param) throws Exception {\n-\t\treturn null;\n-\t}\n-\n-\t/**\n-\t * This method can be overriden to execute after each request\n-\t * \n-\t * @throws Exception\n-\t */\n-\tpublic void afterRequest(T param) throws Exception {\n-\t}\n-\n-\t/**\n-\t * This method can be overriden to execute after each Iteration\n-\t * \n-\t * @throws Expeption\n-\t */\n-\tpublic void afterIteration() throws Exception {\n-\n-\t}\n-\n \t/**\n \t * This method can be overriden to execute after the experiment\n \t * \n@@ -112,9 +67,6 @@ public Experiment() {\n \t\tparameters = new HashMap<String, Object>();\n \t}\n \n-\tprivate void newLoadGenerator() {\n-\t\tloadGen = LoadGeneratorFactory.getInstance().<K, T> create();\n-\t}\n \n \tpublic ExperimentStrategy getStrategy() {\n \t\treturn strategy;\n@@ -132,6 +84,14 @@ public Deployer getDeployer() {\n \tpublic void setDeployer(Deployer enacter) {\n \t\tthis.deployer = enacter;\n \t}\n+\t\n+\tpublic Client getClient() {\n+\t\treturn client;\n+\t}\n+\t\n+\tpublic void setClient(Client client) {\n+\t\tthis.client = client; \n+\t}\n \n \tpublic int getNumberOfRequestsPerIteration() {\n \t\treturn numberOfRequestsPerIteration;\n@@ -185,13 +145,13 @@ public ReportData execute(ScaleCaster scaleCaster) throws Exception {\n \n \t\tif (deployer != null)\n \t\t\tdeployer.scale(parameters);\n-\t\tbeforeIteration();\n+\t\t//beforeIteration();\n \n-\t\tnewLoadGenerator();\n-\t\tloadGen.setDelay(60000000000l / numberOfRequestsPerMinute);\n-\t\treport = loadGen.execute(numberOfRequestsPerIteration, this);\n+\t\t//newLoadGenerator();\n+\t\t//loadGen.setDelay(60000000000l / numberOfRequestsPerMinute);\n+\t\treport = client.execute(numberOfRequestsPerIteration, 60000000000l / numberOfRequestsPerMinute, parameters);\n \n-\t\tafterIteration();\n+\t\t//afterIteration();\n \n \t\treturn report;\n \t}\n@@ -244,7 +204,7 @@ public void run(String name, boolean analyse, boolean store)\n \t\t\tdeployer.deploy();\n \t\treport = scaleCaster.execute();\n \t\treport.setParameterLabels(getParameterLabels());\n-\t\treport.setMeasurementUnit(loadGen.getLabel());\n+\t\treport.setMeasurementUnit(client.getLabel());\n \t\tafterExperiment();\n \t\tif (store)\n \t\t\treports.add(report);", "raw_url": "https://github.com/choreos/choreos_v-v/raw/06fe82da71dd6d2f9b52b9d0fc12bf6acd6cca0e/scalability_explorer%2Fsrc%2Fmain%2Fjava%2Feu%2Fchoreos%2Fvv%2Fexperiments%2FExperiment.java", "sha": "6b90a3a1100563d9627fe88eb5d2bdc34c13afe1", "status": "modified" }, { "additions": 2, "blob_url": "https://github.com/choreos/choreos_v-v/blob/06fe82da71dd6d2f9b52b9d0fc12bf6acd6cca0e/scalability_explorer%2Fsrc%2Fmain%2Fjava%2Feu%2Fchoreos%2Fvv%2Floadgenerator%2FLoadGenerator.java", "changes": 4, "contents_url": "https://api.github.com/repos/choreos/choreos_v-v/contents/scalability_explorer%2Fsrc%2Fmain%2Fjava%2Feu%2Fchoreos%2Fvv%2Floadgenerator%2FLoadGenerator.java?ref=06fe82da71dd6d2f9b52b9d0fc12bf6acd6cca0e", "deletions": 2, "filename": "scalability_explorer/src/main/java/eu/choreos/vv/loadgenerator/LoadGenerator.java", "new_code": "import eu.choreos.vv.client.Client;\n\tpublic ReportData execute(int times, Client<K, T> exec) throws Exception;", "new_methods": [], "old_code": "import eu.choreos.vv.experiments.Experiment;\n\tpublic ReportData execute(int times, Experiment<K, T> exec) throws Exception;", "old_methods": [], "patch": "@@ -1,8 +1,8 @@\n package eu.choreos.vv.loadgenerator;\n \n import eu.choreos.vv.chart.Labeled;\n+import eu.choreos.vv.client.Client;\n import eu.choreos.vv.data.ReportData;\n-import eu.choreos.vv.experiments.Experiment;\n import eu.choreos.vv.loadgenerator.strategy.LoadGenerationStrategy;\n \n /**\n@@ -19,7 +19,7 @@ public interface LoadGenerator <K, T> extends Labeled {\n \t * @return a list of the values returned by the executions\n \t * @throws Exception\n \t */\n-\tpublic ReportData execute(int times, Experiment<K, T> exec) throws Exception;\n+\tpublic ReportData execute(int times, Client<K, T> exec) throws Exception;\n \t\n \tpublic void setDelay(long delay);\n \t", "raw_url": "https://github.com/choreos/choreos_v-v/raw/06fe82da71dd6d2f9b52b9d0fc12bf6acd6cca0e/scalability_explorer%2Fsrc%2Fmain%2Fjava%2Feu%2Fchoreos%2Fvv%2Floadgenerator%2FLoadGenerator.java", "sha": "c49402db6d2dbf0efbc5e404e0742b43fb326917", "status": "modified" }, { "additions": 7, "blob_url": "https://github.com/choreos/choreos_v-v/blob/06fe82da71dd6d2f9b52b9d0fc12bf6acd6cca0e/scalability_explorer%2Fsrc%2Fmain%2Fjava%2Feu%2Fchoreos%2Fvv%2Floadgenerator%2FParallelLoadGenerator.java", "changes": 13, "contents_url": "https://api.github.com/repos/choreos/choreos_v-v/contents/scalability_explorer%2Fsrc%2Fmain%2Fjava%2Feu%2Fchoreos%2Fvv%2Floadgenerator%2FParallelLoadGenerator.java?ref=06fe82da71dd6d2f9b52b9d0fc12bf6acd6cca0e", "deletions": 6, "filename": "scalability_explorer/src/main/java/eu/choreos/vv/loadgenerator/ParallelLoadGenerator.java", "new_code": "import eu.choreos.vv.client.Client;\n\tprivate Client<K, T> client;\n\tpublic ReportData execute(int numberOfCalls, Client<K, T> client)\n\t\tthis.client = client;\n\t\tK valueBefore = client.beforeRequest();\n\t\tT valueRequest = client.request(valueBefore);\n\t\tclient.afterRequest(valueRequest);", "new_methods": [], "old_code": "\tprivate Experiment<K, T> experiment;\n\tpublic ReportData execute(int numberOfCalls, Experiment<K, T> experiment)\n\t\tthis.experiment = experiment;\n\t\tK valueBefore = experiment.beforeRequest();\n\t\tT valueRequest = experiment.request(valueBefore);\n\t\texperiment.afterRequest(valueRequest);", "old_methods": [], "patch": "@@ -9,6 +9,7 @@\n import java.util.concurrent.Future;\n import java.util.concurrent.TimeUnit;\n \n+import eu.choreos.vv.client.Client;\n import eu.choreos.vv.data.ReportData;\n import eu.choreos.vv.experiments.Experiment;\n import eu.choreos.vv.loadgenerator.strategy.LoadGenerationStrategy;\n@@ -23,7 +24,7 @@ public class ParallelLoadGenerator <K, T> implements LoadGenerator<K, T>, Callab\n \n \tprivate int poolSize;\n \tprivate int timeout;\n-\tprivate Experiment<K, T> experiment;\n+\tprivate Client<K, T> client;\n \tprivate LoadGenerationStrategy strategy;\n \n \tprotected long delay;\n@@ -34,14 +35,14 @@ public String getLabel() {\n \t}\n \n \t@Override\n-\tpublic ReportData execute(int numberOfCalls, Experiment<K, T> experiment)\n+\tpublic ReportData execute(int numberOfCalls, Client<K, T> client)\n \t\t\tthrows Exception {\n \t\tfinal ExecutorService executorService = Executors\n \t\t\t\t.newFixedThreadPool(poolSize);\n \t\tfinal List<Future<Double>> futureResults = new ArrayList<Future<Double>>();\n \t\tfinal List<Number> measurements = new ArrayList<Number>();\n \t\tDate start, end;\n-\t\tthis.experiment = experiment;\n+\t\tthis.client = client;\n \t\tstrategy.setMeanDelay(delay);\n \t\tstrategy.setup();\n \t\ttry {\n@@ -123,11 +124,11 @@ public void setTimeout(int timeout) {\n \t */\n \t@Override\n \tpublic Double call() throws Exception {\n-\t\tK valueBefore = experiment.beforeRequest();\n+\t\tK valueBefore = client.beforeRequest();\n \t\tdouble start = System.currentTimeMillis();\n-\t\tT valueRequest = experiment.request(valueBefore);\n+\t\tT valueRequest = client.request(valueBefore);\n \t\tdouble end = System.currentTimeMillis();\n-\t\texperiment.afterRequest(valueRequest);\n+\t\tclient.afterRequest(valueRequest);\n \t\treturn (end - start);\n \t}\n ", "raw_url": "https://github.com/choreos/choreos_v-v/raw/06fe82da71dd6d2f9b52b9d0fc12bf6acd6cca0e/scalability_explorer%2Fsrc%2Fmain%2Fjava%2Feu%2Fchoreos%2Fvv%2Floadgenerator%2FParallelLoadGenerator.java", "sha": "40f83141f65934a9c82a52b6399ce4e60d42d6c8", "status": "modified" }, { "additions": 7, "blob_url": "https://github.com/choreos/choreos_v-v/blob/06fe82da71dd6d2f9b52b9d0fc12bf6acd6cca0e/scalability_explorer%2Fsrc%2Fmain%2Fjava%2Feu%2Fchoreos%2Fvv%2Floadgenerator%2FSequentialLoadGenerator.java", "changes": 19, "contents_url": "https://api.github.com/repos/choreos/choreos_v-v/contents/scalability_explorer%2Fsrc%2Fmain%2Fjava%2Feu%2Fchoreos%2Fvv%2Floadgenerator%2FSequentialLoadGenerator.java?ref=06fe82da71dd6d2f9b52b9d0fc12bf6acd6cca0e", "deletions": 12, "filename": "scalability_explorer/src/main/java/eu/choreos/vv/loadgenerator/SequentialLoadGenerator.java", "new_code": "import eu.choreos.vv.client.Client;\n\tprivate Client<K, T> client;\n\tpublic ReportData execute(int numberOfCalls, Client<K, T> client)\n\t\tthis.client = client;\n\t\tK valueBefore = client.beforeRequest();\n\t\tT valueRequest = client.request(valueBefore);\n\t\tclient.afterRequest(valueRequest);", "new_methods": [], "old_code": "import java.util.concurrent.Callable;\nimport java.util.concurrent.ExecutorService;\nimport java.util.concurrent.Executors;\nimport java.util.concurrent.Future;\nimport java.util.concurrent.TimeUnit;\nimport eu.choreos.vv.experiments.Experiment;\n\tprivate Experiment<K, T> experiment;\n\tpublic ReportData execute(int numberOfCalls, Experiment<K, T> experiment)\n\t\tthis.experiment = experiment;\n\t\tK valueBefore = experiment.beforeRequest();\n\t\tT valueRequest = experiment.request(valueBefore);\n\t\texperiment.afterRequest(valueRequest);", "old_methods": [], "patch": "@@ -3,14 +3,9 @@\n import java.util.ArrayList;\n import java.util.Date;\n import java.util.List;\n-import java.util.concurrent.Callable;\n-import java.util.concurrent.ExecutorService;\n-import java.util.concurrent.Executors;\n-import java.util.concurrent.Future;\n-import java.util.concurrent.TimeUnit;\n \n+import eu.choreos.vv.client.Client;\n import eu.choreos.vv.data.ReportData;\n-import eu.choreos.vv.experiments.Experiment;\n import eu.choreos.vv.loadgenerator.strategy.LoadGenerationStrategy;\n \n /**\n@@ -21,7 +16,7 @@ public class SequentialLoadGenerator <K, T> implements LoadGenerator<K, T> {\n \n \tstatic final String LABEL = \"response time (msec)\";\n \n-\tprivate Experiment<K, T> experiment;\n+\tprivate Client<K, T> client;\n \tprivate LoadGenerationStrategy strategy;\n \n \tprotected long delay;\n@@ -32,11 +27,11 @@ public String getLabel() {\n \t}\n \n \t@Override\n-\tpublic ReportData execute(int numberOfCalls, Experiment<K, T> experiment)\n+\tpublic ReportData execute(int numberOfCalls, Client<K, T> client)\n \t\t\tthrows Exception {\n \t\tfinal List<Number> measurements = new ArrayList<Number>();\n \t\tDate start, end;\n-\t\tthis.experiment = experiment;\n+\t\tthis.client = client;\n \t\tstrategy.setMeanDelay(delay);\n \t\tstrategy.setup();\n \t\t\tstart = new Date();\n@@ -72,11 +67,11 @@ public long getDelay() {\n \t}\n \n \tpublic Double call() throws Exception {\n-\t\tK valueBefore = experiment.beforeRequest();\n+\t\tK valueBefore = client.beforeRequest();\n \t\tdouble start = System.currentTimeMillis();\n-\t\tT valueRequest = experiment.request(valueBefore);\n+\t\tT valueRequest = client.request(valueBefore);\n \t\tdouble end = System.currentTimeMillis();\n-\t\texperiment.afterRequest(valueRequest);\n+\t\tclient.afterRequest(valueRequest);\n \t\treturn (end - start);\n \t}\n ", "raw_url": "https://github.com/choreos/choreos_v-v/raw/06fe82da71dd6d2f9b52b9d0fc12bf6acd6cca0e/scalability_explorer%2Fsrc%2Fmain%2Fjava%2Feu%2Fchoreos%2Fvv%2Floadgenerator%2FSequentialLoadGenerator.java", "sha": "15a4b660f2d84b8b89fa8e0e86ae257cfee449f9", "status": "modified" }, { "additions": 56, "blob_url": "https://github.com/choreos/choreos_v-v/blob/06fe82da71dd6d2f9b52b9d0fc12bf6acd6cca0e/scalability_explorer%2Fsrc%2Ftest%2Fjava%2Feu%2Fchoreos%2Fvv%2Fexample%2FScalabilityTestExample.java", "changes": 101, "contents_url": "https://api.github.com/repos/choreos/choreos_v-v/contents/scalability_explorer%2Fsrc%2Ftest%2Fjava%2Feu%2Fchoreos%2Fvv%2Fexample%2FScalabilityTestExample.java?ref=06fe82da71dd6d2f9b52b9d0fc12bf6acd6cca0e", "deletions": 45, "filename": "scalability_explorer/src/test/java/eu/choreos/vv/example/ScalabilityTestExample.java", "new_code": "import eu.choreos.vv.client.Client;\npublic class ScalabilityTestExample extends Experiment {\n\tpublic static final int REQUESTS = 10;\n\t\n\tList<Long> resources = new ArrayList<Long>();\n\t\n\n\n\n\t\tthis.setClient(new TheClient(resources));\n\t\tthis.setAnalyser(new AggregatePerformance(\"Scalability Chart\",\n\t\t\t\tnew MeanChartCreator(), 1));\n\n\n\tpublic static void execute() throws Exception {\n\t\tScalabilityTestExample example = new ScalabilityTestExample();\n\t\texample.run(\"test1\");\n\n\t}\n\n\tpublic static void main(String[] args) throws Exception {\n\t\texecute();\n\n\t}\n\n\t@Test\n\tpublic void shouldExecuteWithoutError() throws Exception {\n\t\texecute();\n\t}\n\n}\n\nclass TheClient extends Client<Long, Long> {\n\tList<Long> resources;\n\tint resourceIndex = 0;\n\n\tlong[] timestamps;\n\tint count;\n\n\tpublic TheClient(List<Long> rs) {\n\t\tresources = rs;\n\t\t// System.out.println(\"index \" + resourceIndex);\n\t\t// System.out.println(\"resource size \" + resources.size());\n\t\t// System.out.println(\"request time \" + System.currentTimeMillis());\n\t\t// System.out.println(\"sleep \" + sleepTime);\n\tpublic void setUp() {\n\t\t// resources.add(50l);\n\t\ttimestamps = new long[ScalabilityTestExample.REQUESTS];\n\t\tcount = 0;\n\t\tresources.add(Math.round(Math.random() * 100l\n\t\t\t\t* (Integer) (params.get(\"a\"))));\n\t\tSystem.out.println(\"######### new iteration ##############\");\n\t@Override\n\tpublic void tearDown() {\n\t\tfor (int i = 1; i < ScalabilityTestExample.REQUESTS; i++)\n\t\t\tSystem.out.println(timestamps[i] - timestamps[i - 1]);", "new_methods": [], "old_code": "public class ScalabilityTestExample extends Experiment <Long, Long>{\n\n\tprivate static final int REQUESTS = 10;\n\tList<Long> resources;\n\tint resourceIndex;\n\tlong[] timestamps;\n\tint count;\n\n\t\tresources = new ArrayList<Long>();\n\t\tresourceIndex = 0;\n\t\t\n\t\t\n\t\t\n\t\t\n\t\tthis.setAnalyser(new AggregatePerformance(\"Scalability Chart\", new MeanChartCreator(), 1));\n\t\t\n\t\n\t@Override\n\tpublic void beforeIteration() {\n\t\t//resources.add(50l);\n\t\ttimestamps = new long[REQUESTS];\n\t\tcount = 0;\n\t\tresources.add(Math.round( Math.random() * 100l * (Integer)(getParam(\"a\"))));\n\t\tSystem.out.println(\"######### new iteration ##############\");\n//\t\tSystem.out.println(\"index \" + resourceIndex);\n//\t\tSystem.out.println(\"resource size \" + resources.size());\n//\t\tSystem.out.println(\"request time \" + System.currentTimeMillis());\n//\t\tSystem.out.println(\"sleep \" + sleepTime);\n\tpublic void afterIteration() {\n\t\tfor(int i = 1; i < REQUESTS; i++)\n\t\t\tSystem.out.println(timestamps[i]-timestamps[i-1]);\n\t}\n\n\tpublic static void execute() throws Exception {\n\t\tScalabilityTestExample example = new ScalabilityTestExample();\n\t\texample.run(\"test1\");\n\n\t}\n\n\tpublic static void main(String[] args) throws Exception {\n\t\texecute();\n\n\t@Test\n\tpublic void shouldExecuteWithoutError() throws Exception {\n\t\texecute();", "old_methods": [ { "arguments": [], "filename": "scalability_explorer/src/test/java/eu/choreos/vv/example/ScalabilityTestExample.java", "implementation": "//resources.add(50l);\n\t\ttimestamps = new long[REQUESTS];\n\t\tcount = 0;\n\t\tresources.add(Math.round( Math.random() * 100l * (Integer)(getParam(\"a\"))));\n\t\tSystem.out.println(\"######### new iteration ##############\");\n//\t\tSystem.out.println(\"index \" + resourceIndex);\n//\t\tSystem.out.println(\"resource size \" + resources.size());\n//\t\tSystem.out.println(\"request time \" + System.currentTimeMillis());\n//\t\tSystem.out.println(\"sleep \" + sleepTime);\n\tpublic void afterIteration() {\n\t\tfor(int i = 1; i < REQUESTS; i++)\n\t\t\tSystem.out.println(timestamps[i]-timestamps[i-1]);", "signature": "void beforeIteration()" } ], "patch": "@@ -8,6 +8,7 @@\n import eu.choreos.vv.aggregations.Mean;\n import eu.choreos.vv.analysis.AggregatePerformance;\n import eu.choreos.vv.chart.creator.MeanChartCreator;\n+import eu.choreos.vv.client.Client;\n import eu.choreos.vv.experiments.Experiment;\n import eu.choreos.vv.experiments.strategy.ComposedStrategy;\n import eu.choreos.vv.experiments.strategy.ExperimentStrategy;\n@@ -17,50 +18,66 @@\n import eu.choreos.vv.increasefunctions.LinearIncrease;\n import eu.choreos.vv.stop.MeasurementStop;\n \n-public class ScalabilityTestExample extends Experiment <Long, Long>{\n-\n-\tprivate static final int REQUESTS = 10;\n-\tList<Long> resources;\n-\tint resourceIndex;\n+public class ScalabilityTestExample extends Experiment {\n+\tpublic static final int REQUESTS = 10;\n+\t\n+\tList<Long> resources = new ArrayList<Long>();\n+\t\n \t\n-\tlong[] timestamps;\n-\tint count;\n-\n \t@Override\n \tpublic void beforeExperiment() {\n-\t\tresources = new ArrayList<Long>();\n-\t\tresourceIndex = 0;\n-\t\t\n \t\tExperimentStrategy estrategy = new WorkloadScaling();\n \t\testrategy.setFunction(new LinearIncrease(100));\n \t\testrategy.setParameterInitialValue(100);\n-\t\t\n+\n \t\tExperimentStrategy cstrategy = new ParameterScaling(\"a\");\n \t\tcstrategy.setFunction(new ExponentialIncrease(2));\n \t\tcstrategy.setParameterInitialValue(1);\n-\t\t\n+\n \t\tExperimentStrategy strategy = new ComposedStrategy(estrategy, cstrategy);\n-\t\t\n+\n+\t\tthis.setClient(new TheClient(resources));\n \t\tthis.setStrategy(strategy);\n \t\tthis.setNumberOfRequestsPerIteration(REQUESTS);\n \t\tthis.setStoppingCriteria(new MeasurementStop(100.0, new Mean()));\n-\t\tthis.setAnalyser(new AggregatePerformance(\"Scalability Chart\", new MeanChartCreator(), 1));\n-\t\t\n+\t\tthis.setAnalyser(new AggregatePerformance(\"Scalability Chart\",\n+\t\t\t\tnew MeanChartCreator(), 1));\n+\n \t}\n-\t\n-\t@Override\n-\tpublic void beforeIteration() {\n-\t\t//resources.add(50l);\n-\t\ttimestamps = new long[REQUESTS];\n-\t\tcount = 0;\n-\t\tresources.add(Math.round( Math.random() * 100l * (Integer)(getParam(\"a\"))));\n-\t\tSystem.out.println(\"######### new iteration ##############\");\n+\n+\tpublic static void execute() throws Exception {\n+\t\tScalabilityTestExample example = new ScalabilityTestExample();\n+\t\texample.run(\"test1\");\n+\n+\t}\n+\n+\tpublic static void main(String[] args) throws Exception {\n+\t\texecute();\n+\n+\t}\n+\n+\t@Test\n+\tpublic void shouldExecuteWithoutError() throws Exception {\n+\t\texecute();\n+\t}\n+\n+}\n+\n+class TheClient extends Client<Long, Long> {\n+\tList<Long> resources;\n+\tint resourceIndex = 0;\n+\n+\tlong[] timestamps;\n+\tint count;\n+\n+\tpublic TheClient(List<Long> rs) {\n+\t\tresources = rs;\n \t}\n \n \t@Override\n \tpublic Long beforeRequest() {\n-//\t\tSystem.out.println(\"index \" + resourceIndex);\n-//\t\tSystem.out.println(\"resource size \" + resources.size());\n+\t\t// System.out.println(\"index \" + resourceIndex);\n+\t\t// System.out.println(\"resource size \" + resources.size());\n \t\tLong sleepTime = resources.get(resourceIndex);\n \t\tresourceIndex = resourceIndex < resources.size() - 1 ? resourceIndex + 1\n \t\t\t\t: 0;\n@@ -70,8 +87,8 @@ public Long beforeRequest() {\n \t@Override\n \tpublic Long request(Long param) {\n \t\ttimestamps[count++] = System.nanoTime();\n-//\t\tSystem.out.println(\"request time \" + System.currentTimeMillis());\n-//\t\tSystem.out.println(\"sleep \" + sleepTime);\n+\t\t// System.out.println(\"request time \" + System.currentTimeMillis());\n+\t\t// System.out.println(\"sleep \" + sleepTime);\n \t\ttry {\n \t\t\tThread.sleep(param);\n \t\t} catch (InterruptedException e) {\n@@ -82,25 +99,19 @@ public Long request(Long param) {\n \t}\n \n \t@Override\n-\tpublic void afterIteration() {\n-\t\tfor(int i = 1; i < REQUESTS; i++)\n-\t\t\tSystem.out.println(timestamps[i]-timestamps[i-1]);\n-\t}\n-\n-\tpublic static void execute() throws Exception {\n-\t\tScalabilityTestExample example = new ScalabilityTestExample();\n-\t\texample.run(\"test1\");\n-\n-\t}\n-\n-\tpublic static void main(String[] args) throws Exception {\n-\t\texecute();\n-\n+\tpublic void setUp() {\n+\t\t// resources.add(50l);\n+\t\ttimestamps = new long[ScalabilityTestExample.REQUESTS];\n+\t\tcount = 0;\n+\t\tresources.add(Math.round(Math.random() * 100l\n+\t\t\t\t* (Integer) (params.get(\"a\"))));\n+\t\tSystem.out.println(\"######### new iteration ##############\");\n \t}\n \n-\t@Test\n-\tpublic void shouldExecuteWithoutError() throws Exception {\n-\t\texecute();\n+\t@Override\n+\tpublic void tearDown() {\n+\t\tfor (int i = 1; i < ScalabilityTestExample.REQUESTS; i++)\n+\t\t\tSystem.out.println(timestamps[i] - timestamps[i - 1]);\n \t}\n \n }", "raw_url": "https://github.com/choreos/choreos_v-v/raw/06fe82da71dd6d2f9b52b9d0fc12bf6acd6cca0e/scalability_explorer%2Fsrc%2Ftest%2Fjava%2Feu%2Fchoreos%2Fvv%2Fexample%2FScalabilityTestExample.java", "sha": "fb6f38b572a537a444c6aae685385124db045ed6", "status": "modified" }, { "additions": 20, "blob_url": "https://github.com/choreos/choreos_v-v/blob/06fe82da71dd6d2f9b52b9d0fc12bf6acd6cca0e/scalability_explorer%2Fsrc%2Ftest%2Fjava%2Feu%2Fchoreos%2Fvv%2Floadgenerator%2FLoadGeneratorTest.java", "changes": 54, "contents_url": "https://api.github.com/repos/choreos/choreos_v-v/contents/scalability_explorer%2Fsrc%2Ftest%2Fjava%2Feu%2Fchoreos%2Fvv%2Floadgenerator%2FLoadGeneratorTest.java?ref=06fe82da71dd6d2f9b52b9d0fc12bf6acd6cca0e", "deletions": 34, "filename": "scalability_explorer/src/test/java/eu/choreos/vv/loadgenerator/LoadGeneratorTest.java", "new_code": "import eu.choreos.vv.client.Client;\n\n\t\tLoadGenerator<Object, Object> loadGen = LoadGeneratorFactory\n\t\t\t\t.getInstance().create();\n\t\t\tloadGen.execute(TIMES_TO_RUN, new Client<Object, Object>() {\n\t\t\t\t@Override\n\t\t\t\tpublic Object request(Object param) {\n\t\t\t\t}\n\t\t\t});\n\n\t\tLoadGenerator<Object, Object> loadGen = LoadGeneratorFactory\n\t\t\t\t.getInstance().create();\n\t\tloadGen.setDelay(10000000);\n\t\tloadGen.execute(100, new Client<Object, Object>() {\n\t\tdouble duration = (endTime - startTime) / 1000d;\n\t\tassertEquals(1, duration, 0.1);\n\t\tLoadGenerator<Object, Object> loadGen = LoadGeneratorFactory\n\t\t\t\t.getInstance().create();\n\t\tloadGen.execute(10, new Client<Object, Object>() {\n\t\tassertEquals(1.2, duration, 0.1);", "new_methods": [ { "arguments": [ "Object param" ], "filename": "scalability_explorer/src/test/java/eu/choreos/vv/loadgenerator/LoadGeneratorTest.java", "implementation": "", "signature": "Object request(Object param)" } ], "old_code": "import eu.choreos.vv.experiments.Experiment;\n\t\n\t\tLoadGenerator loadGen = LoadGeneratorFactory.getInstance().create();\n\t\tloadGen.execute(TIMES_TO_RUN, new Experiment<Object, Object>() {\n\t\t\t@Override\n\t\t\tpublic Object request(Object param) {\n\t\t\t}\n\t\t\t@Override\n\t\t\tprotected List<String> getParameterLabels() {\n\t\t\t\t// TODO Auto-generated method stub\n\t\t\t\treturn null;\n\t\t\t}\n\t\t});\n\t\n\t\tLoadGenerator loadGen = LoadGeneratorFactory.getInstance().create();\n\t\tloadGen.setDelay(1000000);\n\t\tloadGen.execute(100, new Experiment<Object, Object>() {\n\t\t\t@Override\n\t\t\tprotected List<String> getParameterLabels() {\n\t\t\t\t// TODO Auto-generated method stub\n\t\t\t\treturn null;\n\t\t\t}\n\t\tdouble duration = (endTime - startTime)/1000d;\n\t\tassertEquals(0.1, duration, 0.05);\n\t\tLoadGenerator loadGen = LoadGeneratorFactory.getInstance().create();\n\t\tloadGen.execute(10, new Experiment<Object, Object>() {\n\t\t\t@Override\n\t\t\tprotected List<String> getParameterLabels() {\n\t\t\t\t// TODO Auto-generated method stub\n\t\t\t\treturn null;\n\t\t\t}\n\n\n\t\tassertEquals(1.1, duration, 0.01);", "old_methods": [ { "arguments": [ "Object param" ], "filename": "scalability_explorer/src/test/java/eu/choreos/vv/loadgenerator/LoadGeneratorTest.java", "implementation": "", "signature": "Object request(Object param)" } ], "patch": "@@ -7,44 +7,41 @@\n \n import org.junit.Test;\n \n-import eu.choreos.vv.experiments.Experiment;\n+import eu.choreos.vv.client.Client;\n \n public class LoadGeneratorTest {\n-\t\n+\n \t@Test\n \tpublic void shouldRunManyTimes() {\n \t\tfinal int DELAY = 10000000;\n \t\tfinal int TIMES_TO_RUN = 1000;\n \t\tfinal List<Long> times = new ArrayList<Long>();\n-\t\tLoadGenerator loadGen = LoadGeneratorFactory.getInstance().create();\n+\t\tLoadGenerator<Object, Object> loadGen = LoadGeneratorFactory\n+\t\t\t\t.getInstance().create();\n \t\tloadGen.setDelay(DELAY);\n \t\ttry {\n-\t\tloadGen.execute(TIMES_TO_RUN, new Experiment<Object, Object>() {\n+\t\t\tloadGen.execute(TIMES_TO_RUN, new Client<Object, Object>() {\n \n-\t\t\t@Override\n-\t\t\tpublic Object request(Object param) {\n+\t\t\t\t@Override\n+\t\t\t\tpublic Object request(Object param) {\n \t\t\t\t\ttimes.add(System.currentTimeMillis());\n \t\t\t\t\treturn null;\n-\t\t\t}\n+\t\t\t\t}\n \n-\t\t\t@Override\n-\t\t\tprotected List<String> getParameterLabels() {\n-\t\t\t\t// TODO Auto-generated method stub\n-\t\t\t\treturn null;\n-\t\t\t}\n-\t\t});\n+\t\t\t});\n \t\t} catch (Exception e) {\n \t\t\te.printStackTrace();\n \t\t}\n \t\tassertEquals(TIMES_TO_RUN, times.size());\n \t}\n-\t\n+\n \t@Test\n \tpublic void sholdRunForOneSecond() throws Exception {\n-\t\tLoadGenerator loadGen = LoadGeneratorFactory.getInstance().create();\n-\t\tloadGen.setDelay(1000000);\n+\t\tLoadGenerator<Object, Object> loadGen = LoadGeneratorFactory\n+\t\t\t\t.getInstance().create();\n+\t\tloadGen.setDelay(10000000);\n \t\tlong startTime = System.currentTimeMillis();\n-\t\tloadGen.execute(100, new Experiment<Object, Object>() {\n+\t\tloadGen.execute(100, new Client<Object, Object>() {\n \n \t\t\t@Override\n \t\t\tpublic Object request(Object param) {\n@@ -57,23 +54,19 @@ public Object request(Object param) {\n \t\t\t\treturn null;\n \t\t\t}\n \n-\t\t\t@Override\n-\t\t\tprotected List<String> getParameterLabels() {\n-\t\t\t\t// TODO Auto-generated method stub\n-\t\t\t\treturn null;\n-\t\t\t}\n \t\t});\n \t\tlong endTime = System.currentTimeMillis();\n-\t\tdouble duration = (endTime - startTime)/1000d;\n-\t\tassertEquals(0.1, duration, 0.05);\n+\t\tdouble duration = (endTime - startTime) / 1000d;\n+\t\tassertEquals(1, duration, 0.1);\n \t}\n \n \t@Test\n \tpublic void executionShouldTakeLongerThanDelay() throws Exception {\n-\t\tLoadGenerator loadGen = LoadGeneratorFactory.getInstance().create();\n+\t\tLoadGenerator<Object, Object> loadGen = LoadGeneratorFactory\n+\t\t\t\t.getInstance().create();\n \t\tloadGen.setDelay(100000000);\n \t\tlong startTime = System.currentTimeMillis();\n-\t\tloadGen.execute(10, new Experiment<Object, Object>() {\n+\t\tloadGen.execute(10, new Client<Object, Object>() {\n \n \t\t\t@Override\n \t\t\tpublic Object request(Object param) {\n@@ -86,17 +79,10 @@ public Object request(Object param) {\n \t\t\t\treturn null;\n \t\t\t}\n \n-\t\t\t@Override\n-\t\t\tprotected List<String> getParameterLabels() {\n-\t\t\t\t// TODO Auto-generated method stub\n-\t\t\t\treturn null;\n-\t\t\t}\n-\n-\n \t\t});\n \t\tlong endTime = System.currentTimeMillis();\n \t\tdouble duration = (endTime - startTime) / 1000d;\n-\t\tassertEquals(1.1, duration, 0.01);\n+\t\tassertEquals(1.2, duration, 0.1);\n \t}\n \n }\n\\ No newline at end of file", "raw_url": "https://github.com/choreos/choreos_v-v/raw/06fe82da71dd6d2f9b52b9d0fc12bf6acd6cca0e/scalability_explorer%2Fsrc%2Ftest%2Fjava%2Feu%2Fchoreos%2Fvv%2Floadgenerator%2FLoadGeneratorTest.java", "sha": "c66d08faaa67a4eb90b5b70cbd57697362bace03", "status": "modified" }, { "additions": 5, "blob_url": "https://github.com/choreos/choreos_v-v/blob/06fe82da71dd6d2f9b52b9d0fc12bf6acd6cca0e/scalability_explorer%2Fsrc%2Ftest%2Fjava%2Feu%2Fchoreos%2Fvv%2Floadgenerator%2FTraceDrivenTest.java", "changes": 14, "contents_url": "https://api.github.com/repos/choreos/choreos_v-v/contents/scalability_explorer%2Fsrc%2Ftest%2Fjava%2Feu%2Fchoreos%2Fvv%2Floadgenerator%2FTraceDrivenTest.java?ref=06fe82da71dd6d2f9b52b9d0fc12bf6acd6cca0e", "deletions": 9, "filename": "scalability_explorer/src/test/java/eu/choreos/vv/loadgenerator/TraceDrivenTest.java", "new_code": "import eu.choreos.vv.client.Client;\n\t\tLoadGenerator<Object, Object> loadGen = LoadGeneratorFactory.getInstance().create();\n\t\t\t\tnew Client<Object, Object>() {\n\n\t\tassertEquals(times.get(1)/10000000f, 10f, 0.2);", "new_methods": [], "old_code": "import eu.choreos.vv.experiments.Experiment;\n\t\tLoadGenerator loadGen = LoadGeneratorFactory.getInstance().create();\n\t\t\t\tnew Experiment<Object, Object>() {\n\t\t\t\t\t@Override\n\t\t\t\t\tprotected List<String> getParameterLabels() {\n\t\t\t\t\t\t// TODO Auto-generated method stub\n\t\t\t\t\t\treturn null;\n\t\t\t\t\t}\n\t\tassertEquals(times.get(1)/10000000f, 10f, 0.1);", "old_methods": [], "patch": "@@ -10,8 +10,8 @@\n \n import org.junit.Test;\n \n+import eu.choreos.vv.client.Client;\n import eu.choreos.vv.data.ReportData;\n-import eu.choreos.vv.experiments.Experiment;\n import eu.choreos.vv.loadgenerator.strategy.LoadGenerationStrategy;\n import eu.choreos.vv.loadgenerator.strategy.TraceDrivenLoad;\n \n@@ -24,11 +24,11 @@ public void test() throws Exception {\n \t\tBufferedReader in = new BufferedReader(reader);\n \t\tLoadGenerationStrategy strategy = new TraceDrivenLoad(in);\n \t\tLoadGeneratorFactory.getInstance().setStrategy(strategy);\n-\t\tLoadGenerator loadGen = LoadGeneratorFactory.getInstance().create();\n+\t\tLoadGenerator<Object, Object> loadGen = LoadGeneratorFactory.getInstance().create();\n \t\tfinal List<Long> times = new ArrayList<Long>();\n \n \t\tReportData report = loadGen.execute(6,\n-\t\t\t\tnew Experiment<Object, Object>() {\n+\t\t\t\tnew Client<Object, Object>() {\n \n \t\t\t\t\tlong ant, now = System.nanoTime();\n \n@@ -42,14 +42,10 @@ public Object request(Object param) {\n \t\t\t\t\t\treturn times;\n \t\t\t\t\t}\n \n-\t\t\t\t\t@Override\n-\t\t\t\t\tprotected List<String> getParameterLabels() {\n-\t\t\t\t\t\t// TODO Auto-generated method stub\n-\t\t\t\t\t\treturn null;\n-\t\t\t\t\t}\n+\n \t\t\t\t});\n \n-\t\tassertEquals(times.get(1)/10000000f, 10f, 0.1);\n+\t\tassertEquals(times.get(1)/10000000f, 10f, 0.2);\n \t\tassertEquals(times.get(2)/10000000f, 10f, 0.1);\n \t\tassertEquals(times.get(3)/10000000f, 2f, 0.1);\n \t\tassertEquals(times.get(4)/10000000f, 45.9f, 0.1);", "raw_url": "https://github.com/choreos/choreos_v-v/raw/06fe82da71dd6d2f9b52b9d0fc12bf6acd6cca0e/scalability_explorer%2Fsrc%2Ftest%2Fjava%2Feu%2Fchoreos%2Fvv%2Floadgenerator%2FTraceDrivenTest.java", "sha": "2fe63ffcb53add17c226bc524b524f1fe24e3e59", "status": "modified" } ]
7
[ { "name": "choreos$choreos_v-v", "new_args": "Client client", "new_implementation": "this.client = client;", "new_return_type": "void", "new_signature": "void setClient(Client client)", "old_args": "", "old_implementation": "loadGen = LoadGeneratorFactory.getInstance().<K, T> create();", "old_return_type": "void", "old_signature": "void newLoadGenerator()" } ]
1
1
070f8a4124a580cd7a140029dee655beeae8540b
[ { "name": "trifork$erjang", "new_args": "", "new_implementation": "return \"'\" + encode_escapes(value) + \"'\";", "new_return_type": "EAtom", "new_signature": "EAtom testAtom()", "old_args": "", "old_implementation": "return \"'\" + value + \"'\";\n\t\n\tpublic boolean isAtom(String name)\n\t{\n\t\n \n\t\n\n\n\n\t\t\n\t\t\t\t\t\"intern\", \"(\" + STRING_TYPE.getDescriptor() + \")\" + type.getDescriptor());\n\t\t\n\t\treturn type;", "old_return_type": "EAtom", "old_signature": "EAtom asAtom()" }, { "name": "trifork$erjang", "new_args": "", "new_implementation": "return \"'\" + encode_escapes(value) + \"'\";", "new_return_type": "EAtom", "new_signature": "EAtom testAtom()", "old_args": "", "old_implementation": "return \"'\" + value + \"'\";\n\t\n\tpublic boolean isAtom(String name)\n\t{\n\t\n \n\t\n\n\n\n\t\t\n\t\t\t\t\t\"intern\", \"(\" + STRING_TYPE.getDescriptor() + \")\" + type.getDescriptor());\n\t\t\n\t\treturn type;", "old_return_type": "EAtom", "old_signature": "EAtom asAtom()" }, { "name": "trifork$erjang", "new_args": "", "new_implementation": null, "new_return_type": "ECons", "new_signature": "ECons testCons()", "old_args": "", "old_implementation": null, "old_return_type": "ECons", "old_signature": "ECons asCons()" }, { "name": "trifork$erjang", "new_args": "", "new_implementation": null, "new_return_type": "ECons", "new_signature": "ECons testCons()", "old_args": "", "old_implementation": null, "old_return_type": "ECons", "old_signature": "ECons asCons()" }, { "name": "trifork$erjang", "new_args": "", "new_implementation": null, "new_return_type": "EInteger", "new_signature": "EInteger testInteger()", "old_args": "", "old_implementation": null, "old_return_type": "EInteger", "old_signature": "EInteger asInteger()" }, { "name": "trifork$erjang", "new_args": "", "new_implementation": null, "new_return_type": "EInteger", "new_signature": "EInteger testInteger()", "old_args": "", "old_implementation": null, "old_return_type": "EInteger", "old_signature": "EInteger asInteger()" }, { "name": "trifork$erjang", "new_args": "", "new_implementation": null, "new_return_type": "ENumber", "new_signature": "ENumber testNumber()", "old_args": "", "old_implementation": null, "old_return_type": "ENumber", "old_signature": "ENumber asNumber()" }, { "name": "trifork$erjang", "new_args": "", "new_implementation": null, "new_return_type": "ENumber", "new_signature": "ENumber testNumber()", "old_args": "", "old_implementation": null, "old_return_type": "ENumber", "old_signature": "ENumber asNumber()" }, { "name": "trifork$erjang", "new_args": "", "new_implementation": null, "new_return_type": "EPID", "new_signature": "EPID testPID()", "old_args": "", "old_implementation": null, "old_return_type": "EPID", "old_signature": "EPID asPID()" }, { "name": "trifork$erjang", "new_args": "", "new_implementation": null, "new_return_type": "EPID", "new_signature": "EPID testPID()", "old_args": "", "old_implementation": null, "old_return_type": "EPID", "old_signature": "EPID asPID()" }, { "name": "trifork$erjang", "new_args": "", "new_implementation": null, "new_return_type": "ESeq", "new_signature": "ESeq testSeq()", "old_args": "", "old_implementation": null, "old_return_type": "ESeq", "old_signature": "ESeq asSeq()" }, { "name": "trifork$erjang", "new_args": "", "new_implementation": null, "new_return_type": "ESeq", "new_signature": "ESeq testSeq()", "old_args": "", "old_implementation": null, "old_return_type": "ESeq", "old_signature": "ESeq asSeq()" }, { "name": "trifork$erjang", "new_args": "", "new_implementation": null, "new_return_type": "ETuple", "new_signature": "ETuple testTuple()", "old_args": "", "old_implementation": null, "old_return_type": "ETuple", "old_signature": "ETuple asTuple()" }, { "name": "trifork$erjang", "new_args": "", "new_implementation": null, "new_return_type": "ETuple", "new_signature": "ETuple testTuple()", "old_args": "", "old_implementation": null, "old_return_type": "ETuple", "old_signature": "ETuple asTuple()" }, { "name": "trifork$erjang", "new_args": "int i", "new_implementation": null, "new_return_type": "EObject", "new_signature": "EObject elm(int i)", "old_args": "int i", "old_implementation": null, "old_return_type": "EObject", "old_signature": "EObject nth(int i)" }, { "name": "trifork$erjang", "new_args": "int i", "new_implementation": null, "new_return_type": "EObject", "new_signature": "EObject elm(int i)", "old_args": "int i", "old_implementation": null, "old_return_type": "EObject", "old_signature": "EObject nth(int i)" }, { "name": "trifork$erjang", "new_args": "int i", "new_implementation": null, "new_return_type": "EObject", "new_signature": "EObject elm(int i)", "old_args": "int i", "old_implementation": null, "old_return_type": "EObject", "old_signature": "EObject nth(int i)" }, { "name": "trifork$erjang", "new_args": "int i", "new_implementation": null, "new_return_type": "EObject", "new_signature": "EObject elm(int i)", "old_args": "int i", "old_implementation": null, "old_return_type": "EObject", "old_signature": "EObject nth(int i)" }, { "name": "trifork$erjang", "new_args": "int i", "new_implementation": null, "new_return_type": "EObject", "new_signature": "EObject elm(int i)", "old_args": "int i", "old_implementation": null, "old_return_type": "EObject", "old_signature": "EObject nth(int i)" } ]
[ { "additions": 1, "blob_url": "https://github.com/trifork/erjang/blob/070f8a4124a580cd7a140029dee655beeae8540b/.classpath", "changes": 1, "contents_url": "https://api.github.com/repos/trifork/erjang/contents/.classpath?ref=070f8a4124a580cd7a140029dee655beeae8540b", "deletions": 0, "filename": ".classpath", "new_code": "\t<classpathentry kind=\"lib\" path=\"lib/asm-xml-3.2.jar\"/>", "new_methods": [], "old_code": "", "old_methods": [], "patch": "@@ -10,5 +10,6 @@\n \t<classpathentry kind=\"lib\" path=\"lib/asm-analysis-3.2.jar\"/>\n \t<classpathentry kind=\"lib\" path=\"lib/asm-util-3.2.jar\"/>\n \t<classpathentry kind=\"lib\" path=\"lib/asm-tree-3.2.jar\"/>\n+\t<classpathentry kind=\"lib\" path=\"lib/asm-xml-3.2.jar\"/>\n \t<classpathentry kind=\"output\" path=\"bin\"/>\n </classpath>", "raw_url": "https://github.com/trifork/erjang/raw/070f8a4124a580cd7a140029dee655beeae8540b/.classpath", "sha": "657678d24a2cff764e5c0e4527868d212e50acad", "status": "modified" }, { "additions": 53, "blob_url": "https://github.com/trifork/erjang/blob/070f8a4124a580cd7a140029dee655beeae8540b/src%2Ferjang%2FEAtom.java", "changes": 71, "contents_url": "https://api.github.com/repos/trifork/erjang/contents/src%2Ferjang%2FEAtom.java?ref=070f8a4124a580cd7a140029dee655beeae8540b", "deletions": 18, "filename": "src/erjang/EAtom.java", "new_code": "\tpublic EAtom testAtom() {\n\n\t\t\treturn \"'\" + encode_escapes(value) + \"'\";\n\t\t}\n\t}\n\n\t/**\n\t * @param value2\n\t * @return\n\t */\n\tprivate String encode_escapes(CharSequence seq) {\n\t\tStringBuffer sb = new StringBuffer();\n\t\tfor (int i = 0; i < seq.length(); i++) {\n\t\t\tchar ch = seq.charAt(i);\n\t\t\tif ((ch >= 0x20 && ch <= 0xff) && ch != '\\'' && ch != 0x7f) {\n\t\t\t\tsb.append(ch);\n\t\t\t} else {\n\t\t\t\tswitch (ch) {\n\t\t\t\tcase '\\t':\n\t\t\t\t\tsb.append(\"\\\\t\");\n\t\t\t\t\tbreak;\n\t\t\t\tcase '\\n':\n\t\t\t\t\tsb.append(\"\\\\n\");\n\t\t\t\t\tbreak;\n\t\t\t\tcase '\\r':\n\t\t\t\t\tsb.append(\"\\\\r\");\n\t\t\t\t\tbreak;\n\t\t\t\tcase '\\f':\n\t\t\t\t\tsb.append(\"\\\\f\");\n\t\t\t\t\tbreak;\n\t\t\t\tcase '\\b':\n\t\t\t\t\tsb.append(\"\\\\b\");\n\t\t\t\t\tbreak;\n\t\t\t\tcase '\\'':\n\t\t\t\t\tsb.append(\"\\\\'\");\n\t\t\t\t\tbreak;\n\t\t\t\tdefault:\n\t\t\t\t\tsb.append(\"\\\\\");\n\t\t\t\t\tString.format(\"%2x\", (int) ch);\n\t\t\t\t\t// TODO: figure out if this is right\n\t\t\t\t}\n\t\t\t}\n\t\treturn sb.toString();\n\n\tpublic boolean isAtom(String name) {\n\n\n\n\n\t\t\t\t\"intern\", \"(\" + STRING_TYPE.getDescriptor() + \")\"\n\t\t\t\t\t\t+ type.getDescriptor());\n\t\treturn type;\n\t}", "new_methods": [ { "arguments": [], "filename": "src/erjang/EAtom.java", "implementation": "return \"'\" + encode_escapes(value) + \"'\";", "signature": "EAtom testAtom()" }, { "arguments": [ "CharSequence seq" ], "filename": "src/erjang/EAtom.java", "implementation": "StringBuffer sb = new StringBuffer();\n\t\tfor (int i = 0; i < seq.length(); i++) {\n\t\t\tchar ch = seq.charAt(i);\n\t\t\tif ((ch >= 0x20 && ch <= 0xff) && ch != '\\'' && ch != 0x7f) {\n\t\t\t\tsb.append(ch);", "signature": "String encode_escapes(CharSequence seq)" }, { "arguments": [ "String name" ], "filename": "src/erjang/EAtom.java", "implementation": "\"intern\", \"(\" + STRING_TYPE.getDescriptor() + \")\"\n\t\t\t\t\t\t+ type.getDescriptor());\n\t\treturn type;", "signature": "boolean isAtom(String name)" } ], "old_code": "\n\tpublic EAtom asAtom() {\n\t\n\t\t\treturn \"'\" + value + \"'\";\n\t\n\tpublic boolean isAtom(String name)\n\t{\n\t\n \n\t\n\n\n\n\t\t\n\t\t\t\t\t\"intern\", \"(\" + STRING_TYPE.getDescriptor() + \")\" + type.getDescriptor());\n\t\t\n\t\treturn type;\t\n\t}", "old_methods": [ { "arguments": [], "filename": "src/erjang/EAtom.java", "implementation": "return \"'\" + value + \"'\";\n\t\n\tpublic boolean isAtom(String name)\n\t{\n\t\n \n\t\n\n\n\n\t\t\n\t\t\t\t\t\"intern\", \"(\" + STRING_TYPE.getDescriptor() + \")\" + type.getDescriptor());\n\t\t\n\t\treturn type;", "signature": "EAtom asAtom()" } ], "patch": "@@ -21,15 +21,14 @@\n import java.util.concurrent.ConcurrentHashMap;\n import java.util.regex.Pattern;\n \n-\n import org.objectweb.asm.Opcodes;\n import org.objectweb.asm.Type;\n \n import erjang.jbeam.ops.CodeAdapter;\n \n public class EAtom extends ETerm implements CharSequence {\n \n-\tpublic EAtom asAtom() {\n+\tpublic EAtom testAtom() {\n \t\treturn this;\n \t}\n \n@@ -42,31 +41,70 @@ private EAtom(String name) {\n \t}\n \n \tPattern ATOM = Pattern.compile(\"[a-z_]([a-z]|[A-Z]|@|_|[0-9])*\");\n-\t\n+\n \t@Override\n \tpublic String toString() {\n \t\tif (ATOM.matcher(value).matches()) {\n \t\t\treturn value;\n \t\t} else {\n-\t\t\treturn \"'\" + value + \"'\";\n+\t\t\treturn \"'\" + encode_escapes(value) + \"'\";\n+\t\t}\n+\t}\n+\n+\t/**\n+\t * @param value2\n+\t * @return\n+\t */\n+\tprivate String encode_escapes(CharSequence seq) {\n+\t\tStringBuffer sb = new StringBuffer();\n+\t\tfor (int i = 0; i < seq.length(); i++) {\n+\t\t\tchar ch = seq.charAt(i);\n+\t\t\tif ((ch >= 0x20 && ch <= 0xff) && ch != '\\'' && ch != 0x7f) {\n+\t\t\t\tsb.append(ch);\n+\t\t\t} else {\n+\t\t\t\tswitch (ch) {\n+\t\t\t\tcase '\\t':\n+\t\t\t\t\tsb.append(\"\\\\t\");\n+\t\t\t\t\tbreak;\n+\t\t\t\tcase '\\n':\n+\t\t\t\t\tsb.append(\"\\\\n\");\n+\t\t\t\t\tbreak;\n+\t\t\t\tcase '\\r':\n+\t\t\t\t\tsb.append(\"\\\\r\");\n+\t\t\t\t\tbreak;\n+\t\t\t\tcase '\\f':\n+\t\t\t\t\tsb.append(\"\\\\f\");\n+\t\t\t\t\tbreak;\n+\t\t\t\tcase '\\b':\n+\t\t\t\t\tsb.append(\"\\\\b\");\n+\t\t\t\t\tbreak;\n+\t\t\t\tcase '\\'':\n+\t\t\t\t\tsb.append(\"\\\\'\");\n+\t\t\t\t\tbreak;\n+\t\t\t\tdefault:\n+\t\t\t\t\tsb.append(\"\\\\\");\n+\t\t\t\t\tString.format(\"%2x\", (int) ch);\n+\t\t\t\t\t// TODO: figure out if this is right\n+\t\t\t\t}\n+\t\t\t}\n \t\t}\n+\t\treturn sb.toString();\n \t}\n-\t\n-\tpublic boolean isAtom(String name)\n-\t{\n+\n+\tpublic boolean isAtom(String name) {\n \t\treturn interns.contains(name);\n \t}\n-\t\n+\n \t@Override\n \tpublic boolean equals(Object obj) {\n \t\treturn this == obj;\n \t}\n- \n+\n \t@Override\n \tpublic int hashCode() {\n \t\treturn value.hashCode();\n \t}\n-\t\n+\n \tpublic static EAtom intern(String name) {\n \n \t\tEAtom res = interns.get(name);\n@@ -80,8 +118,6 @@ public static EAtom intern(String name) {\n \t\treturn res;\n \t}\n \n-\n-\n \t@Override\n \tpublic char charAt(int index) {\n \t\treturn value.charAt(index);\n@@ -101,21 +137,20 @@ public String getName() {\n \t\treturn value;\n \t}\n \n-\n \tprivate static final Type EATOM_TYPE = Type.getType(EAtom.class);\n \tprivate static final Type STRING_TYPE = Type.getType(String.class);\n \n \t@Override\n \tpublic org.objectweb.asm.Type emit_const(CodeAdapter fa) {\n \n \t\tType type = EATOM_TYPE;\n-\t\t\n+\n \t\tfa.visitLdcInsn(value);\n \t\tfa.visitMethodInsn(Opcodes.INVOKESTATIC, type.getInternalName(),\n-\t\t\t\t\t\"intern\", \"(\" + STRING_TYPE.getDescriptor() + \")\" + type.getDescriptor());\n-\t\t\n-\t\treturn type;\t\n-\t}\n+\t\t\t\t\"intern\", \"(\" + STRING_TYPE.getDescriptor() + \")\"\n+\t\t\t\t\t\t+ type.getDescriptor());\n \n+\t\treturn type;\n+\t}\n \n }", "raw_url": "https://github.com/trifork/erjang/raw/070f8a4124a580cd7a140029dee655beeae8540b/src%2Ferjang%2FEAtom.java", "sha": "8a163f56e54162c913c6dfe8fbd65f14e3235eb5", "status": "modified" }, { "additions": 3, "blob_url": "https://github.com/trifork/erjang/blob/070f8a4124a580cd7a140029dee655beeae8540b/src%2Ferjang%2FECons.java", "changes": 6, "contents_url": "https://api.github.com/repos/trifork/erjang/contents/src%2Ferjang%2FECons.java?ref=070f8a4124a580cd7a140029dee655beeae8540b", "deletions": 3, "filename": "src/erjang/ECons.java", "new_code": "\tpublic static final ENil NIL = new ENil();\n\tpublic ECons testCons() {\n\t\twhile (cell != NIL && (cell instanceof ECons)) {", "new_methods": [], "old_code": "\tpublic static final ENil EMPTY = new ENil();\n\tpublic ECons asCons() {\n\t\twhile (cell != EMPTY && (cell instanceof ECons)) {", "old_methods": [], "patch": "@@ -20,20 +20,20 @@\n \n public abstract class ECons extends ETerm {\n \n-\tpublic static final ENil EMPTY = new ENil();\n+\tpublic static final ENil NIL = new ENil();\n \n \tpublic abstract EObject head();\n \tpublic abstract EObject tail();\n \t\n-\tpublic ECons asCons() {\n+\tpublic ECons testCons() {\n \t\treturn this;\n \t}\n \n \t// generic count function that also works for non-well-formed lists\n \tpublic int count() {\n \t\tEObject cell = tail();\n \t\tint count = 1;\n-\t\twhile (cell != EMPTY && (cell instanceof ECons)) {\n+\t\twhile (cell != NIL && (cell instanceof ECons)) {\n \t\t\tcell = ((ECons)cell).tail();\n \t\t\tcount += 1;\n \t\t}", "raw_url": "https://github.com/trifork/erjang/raw/070f8a4124a580cd7a140029dee655beeae8540b/src%2Ferjang%2FECons.java", "sha": "ed18e0f684e0f313d70d68f46690759c21f70f86", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/trifork/erjang/blob/070f8a4124a580cd7a140029dee655beeae8540b/src%2Ferjang%2FEInteger.java", "changes": 2, "contents_url": "https://api.github.com/repos/trifork/erjang/contents/src%2Ferjang%2FEInteger.java?ref=070f8a4124a580cd7a140029dee655beeae8540b", "deletions": 1, "filename": "src/erjang/EInteger.java", "new_code": "\tpublic EInteger testInteger() {", "new_methods": [], "old_code": "\tpublic EInteger asInteger() {", "old_methods": [], "patch": "@@ -33,7 +33,7 @@ public EInteger(int value)\n \t\tthis.value = value;\n \t}\n \t\n-\tpublic EInteger asInteger() {\n+\tpublic EInteger testInteger() {\n \t\treturn this;\n \t}\n ", "raw_url": "https://github.com/trifork/erjang/raw/070f8a4124a580cd7a140029dee655beeae8540b/src%2Ferjang%2FEInteger.java", "sha": "16b52a865a29ff85092c265f6b8cb3e74dd3f07b", "status": "modified" }, { "additions": 6, "blob_url": "https://github.com/trifork/erjang/blob/070f8a4124a580cd7a140029dee655beeae8540b/src%2Ferjang%2FEList.java", "changes": 8, "contents_url": "https://api.github.com/repos/trifork/erjang/contents/src%2Ferjang%2FEList.java?ref=070f8a4124a580cd7a140029dee655beeae8540b", "deletions": 2, "filename": "src/erjang/EList.java", "new_code": "\t\tif (tail == null) tail = NIL;\n\tpublic ECons testNonEmptyList() {\n\t\treturn this;\n\t}\n\t\n\t\twhile (val != ECons.NIL) {", "new_methods": [ { "arguments": [], "filename": "src/erjang/EList.java", "implementation": "return this;", "signature": "ECons testNonEmptyList()" } ], "old_code": "\t\tif (tail == null) tail = EMPTY;\n\t\twhile (val != ECons.EMPTY) {", "old_methods": [], "patch": "@@ -29,12 +29,16 @@ public class EList extends ESeq {\n \tprivate final ESeq tail;\n \t\n \tpublic EList(EObject h, ESeq tail) {\n-\t\tif (tail == null) tail = EMPTY;\n+\t\tif (tail == null) tail = NIL;\n \t\t\n \t\tthis.head = h;\n \t\tthis.tail = tail;\n \t}\n \t\n+\tpublic ECons testNonEmptyList() {\n+\t\treturn this;\n+\t}\n+\t\n \t// only for ENil!\n \tprotected EList() {\n \t\thead = tail = null;\n@@ -62,7 +66,7 @@ public String toString() {\n \t\tStringBuffer sb = new StringBuffer(\"[\");\n \t\t\n \t\tESeq val = this;\n-\t\twhile (val != ECons.EMPTY) {\n+\t\twhile (val != ECons.NIL) {\n \t\t\tif (val != this) { sb.append(\",\"); }\n \t\t\tsb.append(val.head());\n \t\t\tval = val.tail();", "raw_url": "https://github.com/trifork/erjang/raw/070f8a4124a580cd7a140029dee655beeae8540b/src%2Ferjang%2FEList.java", "sha": "528e34ddde5f0dcf161fbc0a0447c3e8e302f70e", "status": "modified" }, { "additions": 6, "blob_url": "https://github.com/trifork/erjang/blob/070f8a4124a580cd7a140029dee655beeae8540b/src%2Ferjang%2FENil.java", "changes": 6, "contents_url": "https://api.github.com/repos/trifork/erjang/contents/src%2Ferjang%2FENil.java?ref=070f8a4124a580cd7a140029dee655beeae8540b", "deletions": 0, "filename": "src/erjang/ENil.java", "new_code": "\t\n\tpublic ENil testNil() {\n\t\treturn this;\n\t}\n\n", "new_methods": [ { "arguments": [], "filename": "src/erjang/ENil.java", "implementation": "return this;", "signature": "ENil testNil()" } ], "old_code": "", "old_methods": [], "patch": "@@ -57,4 +57,10 @@ public Type emit_const(CodeAdapter fa) {\n \t\tfa.visitFieldInsn(Opcodes.GETSTATIC, ECONS_TYPE.getInternalName(), \"EMPTY\", ENIL_TYPE.getDescriptor());\n \t\treturn ENIL_TYPE;\n \t}\n+\t\n+\tpublic ENil testNil() {\n+\t\treturn this;\n+\t}\n+\n+\n }", "raw_url": "https://github.com/trifork/erjang/raw/070f8a4124a580cd7a140029dee655beeae8540b/src%2Ferjang%2FENil.java", "sha": "0816f3acfe124ec0171fc2036cf361cec68372a9", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/trifork/erjang/blob/070f8a4124a580cd7a140029dee655beeae8540b/src%2Ferjang%2FENumber.java", "changes": 2, "contents_url": "https://api.github.com/repos/trifork/erjang/contents/src%2Ferjang%2FENumber.java?ref=070f8a4124a580cd7a140029dee655beeae8540b", "deletions": 1, "filename": "src/erjang/ENumber.java", "new_code": "\tpublic ENumber testNumber() {", "new_methods": [], "old_code": "\tpublic ENumber asNumber() {", "old_methods": [], "patch": "@@ -34,7 +34,7 @@ public static ENumber parseInt(String str) {\n }\n \t}\n \n-\tpublic ENumber asNumber() {\n+\tpublic ENumber testNumber() {\n \t\treturn this;\n \t}\n ", "raw_url": "https://github.com/trifork/erjang/raw/070f8a4124a580cd7a140029dee655beeae8540b/src%2Ferjang%2FENumber.java", "sha": "abbee1885edab1c76a26e36a52e2521407bfd1e5", "status": "modified" }, { "additions": 14, "blob_url": "https://github.com/trifork/erjang/blob/070f8a4124a580cd7a140029dee655beeae8540b/src%2Ferjang%2FEObject.java", "changes": 22, "contents_url": "https://api.github.com/repos/trifork/erjang/contents/src%2Ferjang%2FEObject.java?ref=070f8a4124a580cd7a140029dee655beeae8540b", "deletions": 8, "filename": "src/erjang/EObject.java", "new_code": "\tpublic EAtom testAtom() {\n\tpublic ECons testNonEmptyList() {\n\t\treturn null;\n\t}\n\t\n\tpublic ETuple testTuple() {\n\tpublic ESeq testSeq() {\n\tpublic EPID testPID() {\n\tpublic ENumber testNumber() {\n\tpublic ECons testCons() {\n\tpublic EInteger testInteger() {\n\t\treturn null;\n\t}\n\tpublic ENil testNil() {", "new_methods": [ { "arguments": [], "filename": "src/erjang/EObject.java", "implementation": "public ECons testNonEmptyList() {\n\t\treturn null;", "signature": "EAtom testAtom()" }, { "arguments": [], "filename": "src/erjang/EObject.java", "implementation": "public ESeq testSeq() {\n\tpublic EPID testPID() {\n\tpublic ENumber testNumber() {\n\tpublic ECons testCons() {\n\tpublic EInteger testInteger() {\n\t\treturn null;", "signature": "ETuple testTuple()" } ], "old_code": "\tpublic EAtom asAtom() {\n\tpublic ETuple asTuple() {\n\tpublic ESeq asSeq() {\n\tpublic EPID asPID() {\n\tpublic ENumber asNumber() {\n\n\tpublic ECons asCons() {\n\tpublic EInteger asInteger() {", "old_methods": [], "patch": "@@ -26,37 +26,43 @@ public ECons cons(EObject h)\n \t}\n \t\n \n-\tpublic EAtom asAtom() {\n+\tpublic EAtom testAtom() {\n \t\treturn null;\n \t}\n \n-\tpublic ETuple asTuple() {\n+\tpublic ECons testNonEmptyList() {\n+\t\treturn null;\n+\t}\n+\t\n+\tpublic ETuple testTuple() {\n \t\treturn null;\n \t}\n \n-\tpublic ESeq asSeq() {\n+\tpublic ESeq testSeq() {\n \t\treturn null;\n \t}\n \n-\tpublic EPID asPID() {\n+\tpublic EPID testPID() {\n \t\treturn null;\n \t}\n \n \tpublic int asInt() {\n \t\tthrow new RuntimeException(\"cannot convert \" + this + \" to int\");\n \t}\n \n-\tpublic ENumber asNumber() {\n+\tpublic ENumber testNumber() {\n \t\treturn null;\n \t}\n \n-\n-\tpublic ECons asCons() {\n+\tpublic ECons testCons() {\n \t\treturn null;\n \t}\n \n+\tpublic EInteger testInteger() {\n+\t\treturn null;\n+\t}\n \n-\tpublic EInteger asInteger() {\n+\tpublic ENil testNil() {\n \t\treturn null;\n \t}\n ", "raw_url": "https://github.com/trifork/erjang/raw/070f8a4124a580cd7a140029dee655beeae8540b/src%2Ferjang%2FEObject.java", "sha": "2f53a8d55cac016f99c21707bfba3b57e5aa7ecb", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/trifork/erjang/blob/070f8a4124a580cd7a140029dee655beeae8540b/src%2Ferjang%2FEPID.java", "changes": 2, "contents_url": "https://api.github.com/repos/trifork/erjang/contents/src%2Ferjang%2FEPID.java?ref=070f8a4124a580cd7a140029dee655beeae8540b", "deletions": 1, "filename": "src/erjang/EPID.java", "new_code": "\tpublic EPID testPID() {", "new_methods": [], "old_code": "\tpublic EPID asPID() {", "old_methods": [], "patch": "@@ -20,7 +20,7 @@\n \n public class EPID extends EObject {\n \n-\tpublic EPID asPID() {\n+\tpublic EPID testPID() {\n \t\treturn this;\n \t}\n }", "raw_url": "https://github.com/trifork/erjang/raw/070f8a4124a580cd7a140029dee655beeae8540b/src%2Ferjang%2FEPID.java", "sha": "025ecae946d85b97b6724ae21bec5e1966027dbd", "status": "modified" }, { "additions": 6, "blob_url": "https://github.com/trifork/erjang/blob/070f8a4124a580cd7a140029dee655beeae8540b/src%2Ferjang%2FEPair.java", "changes": 8, "contents_url": "https://api.github.com/repos/trifork/erjang/contents/src%2Ferjang%2FEPair.java?ref=070f8a4124a580cd7a140029dee655beeae8540b", "deletions": 2, "filename": "src/erjang/EPair.java", "new_code": "\tpublic ECons testNonEmptyList() {\n\t\treturn this;\n\t}\n\t\n\t\twhile (val instanceof ECons && val != NIL) {\n\t\tif (val != NIL) {", "new_methods": [ { "arguments": [], "filename": "src/erjang/EPair.java", "implementation": "return this;", "signature": "ECons testNonEmptyList()" } ], "old_code": "\t\twhile (val instanceof ECons && val != EMPTY) {\n\t\tif (val != EMPTY) {", "old_methods": [], "patch": "@@ -36,6 +36,10 @@ public EPair(EObject h, EObject t) {\n \t\tthis.tail = t;\n \t}\n \n+\tpublic ECons testNonEmptyList() {\n+\t\treturn this;\n+\t}\n+\t\n \n \tpublic EObject head() {\n \t\treturn head;\n@@ -50,14 +54,14 @@ public String toString() {\n \t\tStringBuffer sb = new StringBuffer(\"[\");\n \t\t\n \t\tEObject val = this;\n-\t\twhile (val instanceof ECons && val != EMPTY) {\n+\t\twhile (val instanceof ECons && val != NIL) {\n \t\t\tECons ep = (ECons) val;\n \t\t\tif (val != this) { sb.append(\",\"); }\n \t\t\tsb.append(ep.head());\n \t\t\tval = ep.tail();\n \t\t}\n \t\t\n-\t\tif (val != EMPTY) {\n+\t\tif (val != NIL) {\n \t\t\tsb.append('|');\n \t\t\tsb.append(val);\n \t\t}", "raw_url": "https://github.com/trifork/erjang/raw/070f8a4124a580cd7a140029dee655beeae8540b/src%2Ferjang%2FEPair.java", "sha": "2fdb01692e2088148e39101e61c665b37af07796", "status": "modified" }, { "additions": 10, "blob_url": "https://github.com/trifork/erjang/blob/070f8a4124a580cd7a140029dee655beeae8540b/src%2Ferjang%2FERT.java", "changes": 20, "contents_url": "https://api.github.com/repos/trifork/erjang/contents/src%2Ferjang%2FERT.java?ref=070f8a4124a580cd7a140029dee655beeae8540b", "deletions": 10, "filename": "src/erjang/ERT.java", "new_code": "\tpublic static ETerm cons(EObject h, EObject t) {\n\t\treturn t.cons(h);\n\tpublic static final EAtom ATOM_TRUE = EAtom.intern(\"true\");\n\tpublic static final EAtom ATOM_FALSE = EAtom.intern(\"false\");\n\t\n\tpublic static boolean eq(EObject o1, EObject o2) { return o1==null?o2==null:o1.equals(o2); }\n\tpublic static boolean eq(EObject o1, EAtom o2) { return o1==o2; }\n\tpublic static boolean eq(EAtom o1, EObject o2) { return o1==o2; }\n\tpublic static boolean eq(EAtom o1, EAtom o2) { return o1==o2; }\n", "new_methods": [ { "arguments": [ "EObject h", " EObject t" ], "filename": "src/erjang/ERT.java", "implementation": "return t.cons(h);\n\tpublic static final EAtom ATOM_TRUE = EAtom.intern(\"true\");\n\tpublic static final EAtom ATOM_FALSE = EAtom.intern(\"false\");\n\t\n\tpublic static boolean eq(EObject o1, EObject o2) { return o1==null?o2==null:o1.equals(o2);", "signature": "ETerm cons(EObject h, EObject t)" }, { "arguments": [ "EObject o1", " EAtom o2" ], "filename": "src/erjang/ERT.java", "implementation": "return o1==o2;", "signature": "boolean eq(EObject o1, EAtom o2)" }, { "arguments": [ "EAtom o1", " EObject o2" ], "filename": "src/erjang/ERT.java", "implementation": "return o1==o2;", "signature": "boolean eq(EAtom o1, EObject o2)" }, { "arguments": [ "EAtom o1", " EAtom o2" ], "filename": "src/erjang/ERT.java", "implementation": "return o1==o2;", "signature": "boolean eq(EAtom o1, EAtom o2)" } ], "old_code": "\tpublic static ETerm cons(EObject h, ETerm t) {\n\t\tif (t instanceof ECons) {\n\t\t\treturn ((ECons) t).cons(h);\n\t\t} else {\n\t\t\treturn new EPair(h, t);\n\t\t}\n\t}\n\n\tpublic static ETerm cons(ETerm h, ECons t) {\n\t\treturn ((ECons) t).cons(h);", "old_methods": [ { "arguments": [ "EObject h", " ETerm t" ], "filename": "src/erjang/ERT.java", "implementation": "if (t instanceof ECons) {\n\t\t\treturn ((ECons) t).cons(h);", "signature": "ETerm cons(EObject h, ETerm t)" } ], "patch": "@@ -24,16 +24,8 @@ public class ERT {\n \tpublic static final EAtom AM_BADMATCH = EAtom.intern(\"badmatch\");\n \tpublic static final EAtom AM_BADARITH = EAtom.intern(\"badarith\");\n \n-\tpublic static ETerm cons(EObject h, ETerm t) {\n-\t\tif (t instanceof ECons) {\n-\t\t\treturn ((ECons) t).cons(h);\n-\t\t} else {\n-\t\t\treturn new EPair(h, t);\n-\t\t}\n-\t}\n-\n-\tpublic static ETerm cons(ETerm h, ECons t) {\n-\t\treturn ((ECons) t).cons(h);\n+\tpublic static ETerm cons(EObject h, EObject t) {\n+\t\treturn t.cons(h);\n \t}\n \n \tpublic static ErlangException badarith(ArithmeticException cause,\n@@ -64,4 +56,12 @@ public static ErlangException badarg(EObject arg1, int arg2) {\n \t\tthrow new ErlangException(AM_BADARG);\n \t}\n \n+\tpublic static final EAtom ATOM_TRUE = EAtom.intern(\"true\");\n+\tpublic static final EAtom ATOM_FALSE = EAtom.intern(\"false\");\n+\t\n+\tpublic static boolean eq(EObject o1, EObject o2) { return o1==null?o2==null:o1.equals(o2); }\n+\tpublic static boolean eq(EObject o1, EAtom o2) { return o1==o2; }\n+\tpublic static boolean eq(EAtom o1, EObject o2) { return o1==o2; }\n+\tpublic static boolean eq(EAtom o1, EAtom o2) { return o1==o2; }\n+\n }", "raw_url": "https://github.com/trifork/erjang/raw/070f8a4124a580cd7a140029dee655beeae8540b/src%2Ferjang%2FERT.java", "sha": "31d6581f75d51cbfd0a3b53fec3fa1c6fa3dc240", "status": "modified" }, { "additions": 3, "blob_url": "https://github.com/trifork/erjang/blob/070f8a4124a580cd7a140029dee655beeae8540b/src%2Ferjang%2FESeq.java", "changes": 6, "contents_url": "https://api.github.com/repos/trifork/erjang/contents/src%2Ferjang%2FESeq.java?ref=070f8a4124a580cd7a140029dee655beeae8540b", "deletions": 3, "filename": "src/erjang/ESeq.java", "new_code": "\tpublic ESeq testSeq() {\n\t\twhile (curr != NIL) {\n\t\twhile (curr != NIL) {", "new_methods": [], "old_code": "\tpublic ESeq asSeq() {\n\t\twhile (curr != EMPTY) {\n\t\twhile (curr != EMPTY) {", "old_methods": [], "patch": "@@ -24,7 +24,7 @@\n \n public abstract class ESeq extends ECons {\n \n-\tpublic ESeq asSeq() {\n+\tpublic ESeq testSeq() {\n \t\treturn this;\n \t}\n \n@@ -36,7 +36,7 @@ public ESeq asSeq() {\n \tpublic EObject[] toArray() {\n \t\tList<EObject> out = new ArrayList<EObject>();\n \t\tESeq curr = this;\n-\t\twhile (curr != EMPTY) {\n+\t\twhile (curr != NIL) {\n \t\t\tout.add(curr.head());\n \t\t\tcurr = curr.tail();\n \t\t}\n@@ -46,7 +46,7 @@ public EObject[] toArray() {\n \tpublic int length() {\n \t\tint count = 0;\n \t\tESeq curr = this;\n-\t\twhile (curr != EMPTY) {\n+\t\twhile (curr != NIL) {\n \t\t\tcount += 1;\n \t\t\tcurr = curr.tail();\n \t\t}", "raw_url": "https://github.com/trifork/erjang/raw/070f8a4124a580cd7a140029dee655beeae8540b/src%2Ferjang%2FESeq.java", "sha": "224263b9213beb0c3f8a4cc57505347505155cf0", "status": "modified" }, { "additions": 62, "blob_url": "https://github.com/trifork/erjang/blob/070f8a4124a580cd7a140029dee655beeae8540b/src%2Ferjang%2FEString.java", "changes": 74, "contents_url": "https://api.github.com/repos/trifork/erjang/contents/src%2Ferjang%2FEString.java?ref=070f8a4124a580cd7a140029dee655beeae8540b", "deletions": 12, "filename": "src/erjang/EString.java", "new_code": "public class EString extends ESeq implements CharSequence {\n\tprivate byte[] data;\n\tprivate int off;\n\tprivate int hash = -1;\n\tprivate EString(byte[] data, int off)\n\t{\n\t\tthis.data = data;\n\t\tthis.off = off;\n\t}\n\t\n\t\tif (hash == -1) { hash = stringValue().hashCode(); }\n\t\treturn new String(data, off, data.length-off, ISO_LATIN_1);\n\t\t\t\n\t\t\tint len1 = data.length-off;\n\t\t\tint len2 = es.data.length-es.off;\n\t\t\t\n\t\t\tif (len1 != len2) return false;\n\t\t\t\n\t\t\tfor (int i = 0; i < len1; i++) {\n\t\t\t\tif (data[off+i] != es.data[es.off+i]) return false;\n\t\t\treturn true;\n\n\t\t} else if (obj instanceof String) {\t\t\t\n\t\t\treturn stringValue().equals(obj);\n\t\treturn (char) (data[off+index] & 0xff);\n\t\treturn data.length-off;\n\t\tif (end == length()) return new EString(data, off+start);\n\t\tif (offset < 0 || length < 0 || (offset+length) > length())\n\t/* (non-Javadoc)\n\t * @see erjang.ESeq#cons(erjang.EObject)\n\t */\n\t@Override\n\tpublic EList cons(EObject h) {\n\t\treturn new EList(h, this);\n\t}\n\n\t/* (non-Javadoc)\n\t * @see erjang.ESeq#tail()\n\t */\n\t@Override\n\tpublic ESeq tail() {\n\t\tif (off == data.length) return ENil.NIL;\n\t\treturn new EString(data, off+1);\n\t}\n\n\t/* (non-Javadoc)\n\t * @see erjang.ECons#head()\n\t */\n\t@Override\n\tpublic EInteger head() {\n\t\treturn new EInteger(data[off] & 0xff);\n\t}\n\n\t@Override\n\tpublic ENil testNil() {\n\t\treturn length() == 0 ? ENil.NIL : null;\n\t}\n\n\tpublic ECons testNonEmptyList() {\n\t\treturn length() == 0 ? null : this;\n\t}\n\t", "new_methods": [ { "arguments": [ "byte[] data", " int off" ], "filename": "src/erjang/EString.java", "implementation": "this.data = data;\n\t\tthis.off = off;", "signature": "private EString(byte[] data, int off)" }, { "arguments": [ "obj instanceof String" ], "filename": "src/erjang/EString.java", "implementation": "return stringValue().equals(obj);\n\t\treturn (char) (data[off+index] & 0xff);\n\t\treturn data.length-off;\n\t\tif (end == length()) return new EString(data, off+start);\n\t\tif (offset < 0 || length < 0 || (offset+length) > length())\n\t/* (non-Javadoc)\n\t * @see erjang.ESeq#cons(erjang.EObject)\n\t */\n\t@Override\n\tpublic EList cons(EObject h) {\n\t\treturn new EList(h, this);", "signature": "else if (obj instanceof String)" }, { "arguments": [], "filename": "src/erjang/EString.java", "implementation": "if (off == data.length) return ENil.NIL;\n\t\treturn new EString(data, off+1);", "signature": "ESeq tail()" }, { "arguments": [], "filename": "src/erjang/EString.java", "implementation": "return new EInteger(data[off] & 0xff);", "signature": "EInteger head()" }, { "arguments": [], "filename": "src/erjang/EString.java", "implementation": "return length() == 0 ? ENil.NIL : null;", "signature": "ENil testNil()" }, { "arguments": [], "filename": "src/erjang/EString.java", "implementation": "return length() == 0 ? null : this;", "signature": "ECons testNonEmptyList()" } ], "old_code": "public class EString extends ETerm implements CharSequence {\n\tbyte[] data;\n\tint hash;\n\t\treturn new String(data, ISO_LATIN_1);\n\t\t\treturn es.hash == hash && Arrays.equals(es.data, data);\n\n\t\t} else if (obj instanceof String) {\n\t\t\tif ( hash == obj.hashCode() ) {\n\t\t\t\t\n\t\treturn (char) (data[index] & 0xff);\n\t\treturn data.length;\n\t\tif (offset < 0 || length < 0 || (offset+length) > data.length)", "old_methods": [], "patch": "@@ -26,55 +26,71 @@\n \n import erjang.jbeam.ops.CodeAdapter;\n \n-public class EString extends ETerm implements CharSequence {\n+public class EString extends ESeq implements CharSequence {\n \n \tprivate static final Charset ISO_LATIN_1 = Charset.forName(\"ISO-8859-1\");\n \t\n-\tbyte[] data;\n-\tint hash;\n+\tprivate byte[] data;\n+\tprivate int off;\n+\tprivate int hash = -1;\n \t\n \tpublic EString(String value) {\n \t\tthis.hash = value.hashCode();\n \t\tthis.data = value.getBytes(ISO_LATIN_1);\n \t}\n \n+\tprivate EString(byte[] data, int off)\n+\t{\n+\t\tthis.data = data;\n+\t\tthis.off = off;\n+\t}\n+\t\n \t@Override\n \tpublic int hashCode() {\n+\t\tif (hash == -1) { hash = stringValue().hashCode(); }\n \t\treturn hash;\n \t}\n \t\n \tpublic String stringValue() {\n-\t\treturn new String(data, ISO_LATIN_1);\n+\t\treturn new String(data, off, data.length-off, ISO_LATIN_1);\n \t}\n \t\n \t@Override\n \tpublic boolean equals(Object obj) {\n \t\tif (obj instanceof EString) {\n \t\t\tEString es = (EString) obj;\n-\t\t\treturn es.hash == hash && Arrays.equals(es.data, data);\n-\n-\t\t} else if (obj instanceof String) {\n-\t\t\tif ( hash == obj.hashCode() ) {\n-\t\t\t\t\n+\t\t\t\n+\t\t\tint len1 = data.length-off;\n+\t\t\tint len2 = es.data.length-es.off;\n+\t\t\t\n+\t\t\tif (len1 != len2) return false;\n+\t\t\t\n+\t\t\tfor (int i = 0; i < len1; i++) {\n+\t\t\t\tif (data[off+i] != es.data[es.off+i]) return false;\n \t\t\t}\n \t\t\t\n+\t\t\treturn true;\n+\n+\t\t} else if (obj instanceof String) {\t\t\t\n+\t\t\treturn stringValue().equals(obj);\n \t\t}\n \t\t\n \t\treturn false;\n \t}\n \n \t@Override\n \tpublic char charAt(int index) {\n-\t\treturn (char) (data[index] & 0xff);\n+\t\treturn (char) (data[off+index] & 0xff);\n \t}\n \n \t@Override\n \tpublic int length() {\n-\t\treturn data.length;\n+\t\treturn data.length-off;\n \t}\n \n \t@Override\n \tpublic CharSequence subSequence(final int start, final int end) {\t\t\n+\t\tif (end == length()) return new EString(data, off+start);\n \t\treturn new SubSequence(start, end-start);\n \t}\n \t\n@@ -108,7 +124,7 @@ public CharSequence subSequence(int start, int end) {\n \t}\n \n \tvoid check_subseq(int offset, int length) {\n-\t\tif (offset < 0 || length < 0 || (offset+length) > data.length)\n+\t\tif (offset < 0 || length < 0 || (offset+length) > length())\n \t\t\tthrow new IllegalArgumentException();\n \t}\n \t\n@@ -136,5 +152,39 @@ public Type emit_const(CodeAdapter fa) {\n \t\treturn type;\n \t}\n \n+\t/* (non-Javadoc)\n+\t * @see erjang.ESeq#cons(erjang.EObject)\n+\t */\n+\t@Override\n+\tpublic EList cons(EObject h) {\n+\t\treturn new EList(h, this);\n+\t}\n+\n+\t/* (non-Javadoc)\n+\t * @see erjang.ESeq#tail()\n+\t */\n+\t@Override\n+\tpublic ESeq tail() {\n+\t\tif (off == data.length) return ENil.NIL;\n+\t\treturn new EString(data, off+1);\n+\t}\n+\n+\t/* (non-Javadoc)\n+\t * @see erjang.ECons#head()\n+\t */\n+\t@Override\n+\tpublic EInteger head() {\n+\t\treturn new EInteger(data[off] & 0xff);\n+\t}\n+\n+\t@Override\n+\tpublic ENil testNil() {\n+\t\treturn length() == 0 ? ENil.NIL : null;\n+\t}\n+\n+\tpublic ECons testNonEmptyList() {\n+\t\treturn length() == 0 ? null : this;\n+\t}\n+\t\n \n }", "raw_url": "https://github.com/trifork/erjang/raw/070f8a4124a580cd7a140029dee655beeae8540b/src%2Ferjang%2FEString.java", "sha": "ab50df9649cbfc8ea0c725fc79715149add91cc4", "status": "modified" }, { "additions": 5, "blob_url": "https://github.com/trifork/erjang/blob/070f8a4124a580cd7a140029dee655beeae8540b/src%2Ferjang%2FETuple.java", "changes": 10, "contents_url": "https://api.github.com/repos/trifork/erjang/contents/src%2Ferjang%2FETuple.java?ref=070f8a4124a580cd7a140029dee655beeae8540b", "deletions": 5, "filename": "src/erjang/ETuple.java", "new_code": "\tpublic ETuple testTuple() {\n\tpublic abstract EObject elm(int i);\n\t\tmv = cw.visitMethod(Opcodes.ACC_PUBLIC, \"elm\", \"(I)\"\n\t\t\tsb.append(elm(i));\n\t\t\tfa.emit_const(elm(i + 1));", "new_methods": [], "old_code": "\tpublic ETuple asTuple() {\n\tpublic abstract EObject nth(int i);\n\t\tmv = cw.visitMethod(Opcodes.ACC_PUBLIC, \"nth\", \"(I)\"\n\t\t\tsb.append(nth(i));\n\t\t\tfa.emit_const(nth(i + 1));", "old_methods": [], "patch": "@@ -37,13 +37,13 @@\n \n public abstract class ETuple extends ETerm implements Cloneable {\n \n-\tpublic ETuple asTuple() {\n+\tpublic ETuple testTuple() {\n \t\treturn this;\n \t}\n \n \tpublic abstract int arity();\n \n-\tpublic abstract EObject nth(int i);\n+\tpublic abstract EObject elm(int i);\n \n \tpublic static ETuple make(int len) {\n \t\tswitch (len) {\n@@ -232,7 +232,7 @@ private static void make_blank_bridge(ClassAdapter cw,\n \tprivate static void create_tuple_nth(int n_cells, ClassAdapter cw,\n \t\t\tString this_class_name) {\n \t\tMethodVisitor mv;\n-\t\tmv = cw.visitMethod(Opcodes.ACC_PUBLIC, \"nth\", \"(I)\"\n+\t\tmv = cw.visitMethod(Opcodes.ACC_PUBLIC, \"elm\", \"(I)\"\n \t\t\t\t+ ETERM_TYPE.getDescriptor(), null, null);\n \t\tmv.visitCode();\n \n@@ -373,7 +373,7 @@ public String toString() {\n \t\tfor (int i = 1; i <= this.arity(); i++) {\n \t\t\tif (i != 1)\n \t\t\t\tsb.append(',');\n-\t\t\tsb.append(nth(i));\n+\t\t\tsb.append(elm(i));\n \t\t}\n \t\tsb.append(\"}\");\n \t\treturn sb.toString();\n@@ -392,7 +392,7 @@ public Type emit_const(CodeAdapter fa) {\n \t\tfor (int i = 0; i < arity(); i++) {\n \t\t\tfa.visitInsn(Opcodes.DUP);\n \n-\t\t\tfa.emit_const(nth(i + 1));\n+\t\t\tfa.emit_const(elm(i + 1));\n \n \t\t\tfa.visitFieldInsn(Opcodes.PUTFIELD, type.getInternalName(), \"elem\"\n \t\t\t\t\t+ (i + 1), ETERM_TYPE.getDescriptor());", "raw_url": "https://github.com/trifork/erjang/raw/070f8a4124a580cd7a140029dee655beeae8540b/src%2Ferjang%2FETuple.java", "sha": "a27eef15603cfb96b62ccf2fcda4456de53249a2", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/trifork/erjang/blob/070f8a4124a580cd7a140029dee655beeae8540b/src%2Ferjang%2FETuple0.java", "changes": 2, "contents_url": "https://api.github.com/repos/trifork/erjang/contents/src%2Ferjang%2FETuple0.java?ref=070f8a4124a580cd7a140029dee655beeae8540b", "deletions": 1, "filename": "src/erjang/ETuple0.java", "new_code": "\tpublic EObject elm(int i) {", "new_methods": [], "old_code": "\tpublic EObject nth(int i) {", "old_methods": [], "patch": "@@ -30,7 +30,7 @@ public int arity() {\n \t}\n \n \t@Override\n-\tpublic EObject nth(int i) {\n+\tpublic EObject elm(int i) {\n \t\treturn bad_nth(i);\n \t}\n \t", "raw_url": "https://github.com/trifork/erjang/raw/070f8a4124a580cd7a140029dee655beeae8540b/src%2Ferjang%2FETuple0.java", "sha": "27870f76c7fbb0a06ff9335d8dd258999956cd32", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/trifork/erjang/blob/070f8a4124a580cd7a140029dee655beeae8540b/src%2Ferjang%2FETuple1.java", "changes": 2, "contents_url": "https://api.github.com/repos/trifork/erjang/contents/src%2Ferjang%2FETuple1.java?ref=070f8a4124a580cd7a140029dee655beeae8540b", "deletions": 1, "filename": "src/erjang/ETuple1.java", "new_code": "\tpublic EObject elm(int i) {", "new_methods": [], "old_code": "\tpublic EObject nth(int i) {", "old_methods": [], "patch": "@@ -42,7 +42,7 @@ public void set(int index, EObject term) {\n \t}\n \n \t@Override\n-\tpublic EObject nth(int i) {\n+\tpublic EObject elm(int i) {\n \t\tif(i==1) return elem1; \n \t\treturn bad_nth(i);\n \t}", "raw_url": "https://github.com/trifork/erjang/raw/070f8a4124a580cd7a140029dee655beeae8540b/src%2Ferjang%2FETuple1.java", "sha": "0721ba6b728089cf8f2d6869386efaecc657ba0b", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/trifork/erjang/blob/070f8a4124a580cd7a140029dee655beeae8540b/src%2Ferjang%2FETuple2.java", "changes": 2, "contents_url": "https://api.github.com/repos/trifork/erjang/contents/src%2Ferjang%2FETuple2.java?ref=070f8a4124a580cd7a140029dee655beeae8540b", "deletions": 1, "filename": "src/erjang/ETuple2.java", "new_code": "\tpublic EObject elm(int i) {", "new_methods": [], "old_code": "\tpublic EObject nth(int i) {", "old_methods": [], "patch": "@@ -34,7 +34,7 @@ public int arity() {\n \t}\n \n \t@Override\n-\tpublic EObject nth(int i) {\n+\tpublic EObject elm(int i) {\n \t\tif (i == 1) {\n \t\t\treturn elem1;\n \t\t} else if (i == 2) {", "raw_url": "https://github.com/trifork/erjang/raw/070f8a4124a580cd7a140029dee655beeae8540b/src%2Ferjang%2FETuple2.java", "sha": "d5afdcde134be58b21be9bee13b54ae1e4a5297a", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/trifork/erjang/blob/070f8a4124a580cd7a140029dee655beeae8540b/src%2Ferjang%2FETuple3.java", "changes": 2, "contents_url": "https://api.github.com/repos/trifork/erjang/contents/src%2Ferjang%2FETuple3.java?ref=070f8a4124a580cd7a140029dee655beeae8540b", "deletions": 1, "filename": "src/erjang/ETuple3.java", "new_code": "\tpublic EObject elm(int i) {", "new_methods": [], "old_code": "\tpublic EObject nth(int i) {", "old_methods": [], "patch": "@@ -36,7 +36,7 @@ public int arity() {\n \t}\n \n \t@Override\n-\tpublic EObject nth(int i) {\n+\tpublic EObject elm(int i) {\n \t\tswitch (i) {\n \t\tcase 1:\n \t\t\treturn elem1;", "raw_url": "https://github.com/trifork/erjang/raw/070f8a4124a580cd7a140029dee655beeae8540b/src%2Ferjang%2FETuple3.java", "sha": "eb427ea2db3d12578243cf732cc36b78b9350181", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/trifork/erjang/blob/070f8a4124a580cd7a140029dee655beeae8540b/src%2Ferjang%2FETuple4.java", "changes": 2, "contents_url": "https://api.github.com/repos/trifork/erjang/contents/src%2Ferjang%2FETuple4.java?ref=070f8a4124a580cd7a140029dee655beeae8540b", "deletions": 1, "filename": "src/erjang/ETuple4.java", "new_code": "\tpublic EObject elm(int i) {", "new_methods": [], "old_code": "\tpublic EObject nth(int i) {", "old_methods": [], "patch": "@@ -37,7 +37,7 @@ public int arity() {\n \t}\n \n \t@Override\n-\tpublic EObject nth(int i) {\n+\tpublic EObject elm(int i) {\n \t\tswitch (i) {\n \t\tcase 1:\n \t\t\treturn elem1;", "raw_url": "https://github.com/trifork/erjang/raw/070f8a4124a580cd7a140029dee655beeae8540b/src%2Ferjang%2FETuple4.java", "sha": "c2e434893335acf3a16b9d7d75ab4c2eb715aceb", "status": "modified" }, { "additions": 2, "blob_url": "https://github.com/trifork/erjang/blob/070f8a4124a580cd7a140029dee655beeae8540b/src%2Ferjang%2FErlangException.java", "changes": 4, "contents_url": "https://api.github.com/repos/trifork/erjang/contents/src%2Ferjang%2FErlangException.java?ref=070f8a4124a580cd7a140029dee655beeae8540b", "deletions": 2, "filename": "src/erjang/ErlangException.java", "new_code": "\t\tthis.args = ECons.NIL;\n\t\tESeq res = ESeq.NIL;", "new_methods": [], "old_code": "\t\tthis.args = ECons.EMPTY;\n\t\tESeq res = ESeq.EMPTY;", "old_methods": [], "patch": "@@ -48,11 +48,11 @@ public ErlangException(EAtom reason) {\n \t\tthis.reason = reason;\n \t\tthis.module = null;\n \t\tthis.function = null;\n-\t\tthis.args = ECons.EMPTY;\n+\t\tthis.args = ECons.NIL;\n \t}\n \n \tprivate ESeq listify(Object[] args) {\n-\t\tESeq res = ESeq.EMPTY;\n+\t\tESeq res = ESeq.NIL;\n \t\tfor (int i = args.length-1; i >= 0; i--) {\n \t\t\tEObject h = erl_value(args[i]);\n \t\t\tres = res.cons(h);", "raw_url": "https://github.com/trifork/erjang/raw/070f8a4124a580cd7a140029dee655beeae8540b/src%2Ferjang%2FErlangException.java", "sha": "384c67cb17bee2938aa51517f4167fb9df6429d9", "status": "modified" }, { "additions": 2, "blob_url": "https://github.com/trifork/erjang/blob/070f8a4124a580cd7a140029dee655beeae8540b/src%2Ferjang%2Fbeam%2FBIFUtil.java", "changes": 4, "contents_url": "https://api.github.com/repos/trifork/erjang/contents/src%2Ferjang%2Fbeam%2FBIFUtil.java?ref=070f8a4124a580cd7a140029dee655beeae8540b", "deletions": 2, "filename": "src/erjang/beam/BIFUtil.java", "new_code": "import erjang.modules.erl_bif;\n\t\tregisterBifs(erl_bif.class);", "new_methods": [], "old_code": "import erjang.modules.ErlangModule;\n\t\tregisterBifs(ErlangModule.class);", "old_methods": [], "patch": "@@ -27,7 +27,7 @@\n import erjang.EAtom;\n import erjang.EObject;\n import erjang.modules.BinOps;\n-import erjang.modules.ErlangModule;\n+import erjang.modules.erl_bif;\n \n /**\n * Used by the compiler to find and mange BIF definitions.\n@@ -42,7 +42,7 @@ public class BIFUtil {\n \tstatic Map<String, BIFHandler> guard_bifs = new HashMap<String, BIFHandler>();\n \n \tstatic {\n-\t\tregisterBifs(ErlangModule.class);\n+\t\tregisterBifs(erl_bif.class);\n \t\tregisterBifs(BinOps.class);\n \t}\n ", "raw_url": "https://github.com/trifork/erjang/raw/070f8a4124a580cd7a140029dee655beeae8540b/src%2Ferjang%2Fbeam%2FBIFUtil.java", "sha": "637d150b77555528daf6478aa32514bb1051ee00", "status": "modified" }, { "additions": 33, "blob_url": "https://github.com/trifork/erjang/blob/070f8a4124a580cd7a140029dee655beeae8540b/src%2Ferjang%2Fbeam%2FBeamFileData.java", "changes": 67, "contents_url": "https://api.github.com/repos/trifork/erjang/contents/src%2Ferjang%2Fbeam%2FBeamFileData.java?ref=070f8a4124a580cd7a140029dee655beeae8540b", "deletions": 34, "filename": "src/erjang/beam/BeamFileData.java", "new_code": "\t\tassert (data.elm(1) == BEAM_FILE);\n\t\tmodule = data.elm(2).testAtom();\n\t\texports = data.elm(3).testSeq();\n\t\tattributes = data.elm(4).testSeq();\n\t\tcomp_info = data.elm(5).testSeq();\n\t\tcode = data.elm(6).testSeq();\n\t\ttry {\n\t\t\tfor (ESeq exp = (ESeq) code; exp != ESeq.NIL; exp = exp.tail()) {\n\t\t\t\tETuple fun = (ETuple) exp.head();\n\t\t\t\tvisit_function(v, fun);\n\t\t\t}\n\t\t} finally {\n\t\t\tv.visitEnd();\n\t\tEAtom name = (EAtom) fun.elm(2);\n\t\tint ary = fun.elm(3).asInt();\n\t\tint entry = fun.elm(4).asInt();\n\t\tEList insns = (EList) fun.elm(5);\n\n\n\t\tfor (ESeq insn = (ESeq) insns; insn != ESeq.NIL; insn = insn.tail()) {\n\n\t\t\t\tbbv.visitInsn(opcode, ETuple.make(new EObject[] { i }));\n\n\t\t\t\tBeamOpcode opcode = BeamOpcode.get((EAtom) et.elm(1));\n\n\t\t\t\t\tEInteger label = (EInteger) et.elm(2);\n\n\n\n\t\tfor (ESeq exp = (ESeq) attributes; exp != ESeq.NIL; exp = exp.tail()) {\n\t\t\tv.visitAttribute((EAtom) one.elm(1), one.elm(2));\n\t\tfor (ESeq exp = (ESeq) exports; exp != ESeq.NIL; exp = exp.tail()) {\n\t\t\tv.visitExport((EAtom) one.elm(1), one.elm(2).asInt(), one.elm(3)", "new_methods": [], "old_code": "\t\tassert (data.nth(1) == BEAM_FILE);\n\t\tmodule = data.nth(2).asAtom();\n\t\texports = data.nth(3).asSeq();\n\t\tattributes = data.nth(4).asSeq();\n\t\tcomp_info = data.nth(5).asSeq();\n\t\tcode = data.nth(6).asSeq();\n\t\tfor (ESeq exp = (ESeq) code; exp != ESeq.EMPTY; exp = exp.tail()) {\n\t\t\tETuple fun = (ETuple) exp.head();\n\t\t\tvisit_function(v, fun);\n\n\t\tv.visitEnd();\n\n\t\tEAtom name = (EAtom) fun.nth(2);\n\t\tint ary = fun.nth(3).asInt();\n\t\tint entry = fun.nth(4).asInt();\n\t\tEList insns = (EList) fun.nth(5);\n\t\t\n\t\t\n\t\tfor (ESeq insn = (ESeq) insns; insn != ESeq.EMPTY; insn = insn.tail()) {\n\t\t\t\n\t\t\t\tbbv.visitInsn(opcode, ETuple.make(new EObject[] {i}));\n\t\t\t\t\n\t\t\t\tBeamOpcode opcode = BeamOpcode.get((EAtom) et.nth(1));\n\t\t\t\t\n\t\t\t\t\tEInteger label = (EInteger) et.nth(2);\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\n\t\tfor (ESeq exp = (ESeq) attributes; exp != ESeq.EMPTY; exp = exp\n\t\t\t\t.tail()) {\n\t\t\tv.visitAttribute((EAtom) one.nth(1), one.nth(2));\n\t\tfor (ESeq exp = (ESeq) exports; exp != ESeq.EMPTY; exp = exp\n\t\t\t\t.tail()) {\n\t\t\tv.visitExport((EAtom) one.nth(1), one.nth(2).asInt(), one.nth(3)", "old_methods": [], "patch": "@@ -43,13 +43,13 @@ public class BeamFileData {\n \tprivate ESeq code;\n \n \tpublic BeamFileData(ETuple data) {\n-\t\tassert (data.nth(1) == BEAM_FILE);\n+\t\tassert (data.elm(1) == BEAM_FILE);\n \n-\t\tmodule = data.nth(2).asAtom();\n-\t\texports = data.nth(3).asSeq();\n-\t\tattributes = data.nth(4).asSeq();\n-\t\tcomp_info = data.nth(5).asSeq();\n-\t\tcode = data.nth(6).asSeq();\n+\t\tmodule = data.elm(2).testAtom();\n+\t\texports = data.elm(3).testSeq();\n+\t\tattributes = data.elm(4).testSeq();\n+\t\tcomp_info = data.elm(5).testSeq();\n+\t\tcode = data.elm(6).testSeq();\n \t}\n \n \tvoid accept(ModuleVisitor v) {\n@@ -59,22 +59,23 @@ void accept(ModuleVisitor v) {\n \n \t\tvisit_attributes(v);\n \n-\t\tfor (ESeq exp = (ESeq) code; exp != ESeq.EMPTY; exp = exp.tail()) {\n-\t\t\tETuple fun = (ETuple) exp.head();\n+\t\ttry {\n+\t\t\tfor (ESeq exp = (ESeq) code; exp != ESeq.NIL; exp = exp.tail()) {\n+\t\t\t\tETuple fun = (ETuple) exp.head();\n \n-\t\t\tvisit_function(v, fun);\n+\t\t\t\tvisit_function(v, fun);\n+\t\t\t}\n+\t\t} finally {\n+\t\t\tv.visitEnd();\n \t\t}\n-\n-\t\tv.visitEnd();\n-\n \t}\n \n \tprivate void visit_function(ModuleVisitor v, ETuple fun) {\n \n-\t\tEAtom name = (EAtom) fun.nth(2);\n-\t\tint ary = fun.nth(3).asInt();\n-\t\tint entry = fun.nth(4).asInt();\n-\t\tEList insns = (EList) fun.nth(5);\n+\t\tEAtom name = (EAtom) fun.elm(2);\n+\t\tint ary = fun.elm(3).asInt();\n+\t\tint entry = fun.elm(4).asInt();\n+\t\tEList insns = (EList) fun.elm(5);\n \n \t\tFunctionVisitor fv = v.visitFunction(name, ary, entry);\n \n@@ -84,28 +85,28 @@ private void visit_function(ModuleVisitor v, ETuple fun) {\n \t}\n \n \tprivate void visit_insns(EList insns, FunctionVisitor fv) {\n-\t\t\n+\n \t\tBlockVisitor bbv = null;\n-\t\t\n-\t\tfor (ESeq insn = (ESeq) insns; insn != ESeq.EMPTY; insn = insn.tail()) {\n+\n+\t\tfor (ESeq insn = (ESeq) insns; insn != ESeq.NIL; insn = insn.tail()) {\n \n \t\t\tEObject i = insn.head();\n-\t\t\t\n+\n \t\t\tif (i instanceof EAtom) {\n \t\t\t\tBeamOpcode opcode = BeamOpcode.get((EAtom) i);\n-\t\t\t\tbbv.visitInsn(opcode, ETuple.make(new EObject[] {i}));\n-\t\t\t\t\n+\t\t\t\tbbv.visitInsn(opcode, ETuple.make(new EObject[] { i }));\n+\n \t\t\t} else if (i instanceof ETuple) {\n \t\t\t\tETuple et = (ETuple) i;\n-\t\t\t\tBeamOpcode opcode = BeamOpcode.get((EAtom) et.nth(1));\n-\t\t\t\t\n+\t\t\t\tBeamOpcode opcode = BeamOpcode.get((EAtom) et.elm(1));\n+\n \t\t\t\tif (opcode == BeamOpcode.label) {\n-\t\t\t\t\tEInteger label = (EInteger) et.nth(2);\n-\t\t\t\t\t\n+\t\t\t\t\tEInteger label = (EInteger) et.elm(2);\n+\n \t\t\t\t\tif (bbv != null) {\n \t\t\t\t\t\tbbv.visitEnd();\n \t\t\t\t\t}\n-\t\t\t\t\t\n+\n \t\t\t\t\tbbv = fv.visitLabeledBlock(label.asInt());\n \t\t\t\t} else {\n \t\t\t\t\tbbv.visitInsn(opcode, et);\n@@ -114,25 +115,23 @@ private void visit_insns(EList insns, FunctionVisitor fv) {\n \t\t\t\tthrow new IllegalArgumentException();\n \t\t\t}\n \t\t}\n-\t\t\n+\n \t\tif (bbv != null) {\n \t\t\tbbv.visitEnd();\n \t\t}\n \t}\n \n \tprivate void visit_attributes(ModuleVisitor v) {\n-\t\tfor (ESeq exp = (ESeq) attributes; exp != ESeq.EMPTY; exp = exp\n-\t\t\t\t.tail()) {\n+\t\tfor (ESeq exp = (ESeq) attributes; exp != ESeq.NIL; exp = exp.tail()) {\n \t\t\tETuple one = (ETuple) exp.head();\n-\t\t\tv.visitAttribute((EAtom) one.nth(1), one.nth(2));\n+\t\t\tv.visitAttribute((EAtom) one.elm(1), one.elm(2));\n \t\t}\n \t}\n \n \tprivate void visit_exports(ModuleVisitor v) {\n-\t\tfor (ESeq exp = (ESeq) exports; exp != ESeq.EMPTY; exp = exp\n-\t\t\t\t.tail()) {\n+\t\tfor (ESeq exp = (ESeq) exports; exp != ESeq.NIL; exp = exp.tail()) {\n \t\t\tETuple one = (ETuple) exp.head();\n-\t\t\tv.visitExport((EAtom) one.nth(1), one.nth(2).asInt(), one.nth(3)\n+\t\t\tv.visitExport((EAtom) one.elm(1), one.elm(2).asInt(), one.elm(3)\n \t\t\t\t\t.asInt());\n \t\t}\n \t}", "raw_url": "https://github.com/trifork/erjang/raw/070f8a4124a580cd7a140029dee655beeae8540b/src%2Ferjang%2Fbeam%2FBeamFileData.java", "sha": "748a88ec399dc464fd7fb36edfeb5fab3896dd38", "status": "modified" }, { "additions": 67, "blob_url": "https://github.com/trifork/erjang/blob/070f8a4124a580cd7a140029dee655beeae8540b/src%2Ferjang%2Fbeam%2FBlockVisitor2.java", "changes": 67, "contents_url": "https://api.github.com/repos/trifork/erjang/contents/src%2Ferjang%2Fbeam%2FBlockVisitor2.java?ref=070f8a4124a580cd7a140029dee655beeae8540b", "deletions": 0, "filename": "src/erjang/beam/BlockVisitor2.java", "new_code": "\n\t/**\n\t * @param opcode\n\t * @param ys\n\t */\n\tvoid visitInsn(BeamOpcode opcode, Arg[] ys);\n\n\t/**\n\t * @param opcode\n\t * @param efun\n\t * @param freevars\n\t */\n\tvoid visitInsn(BeamOpcode opcode, ExtFunc efun, Arg[] freevars);\n\n\t/**\n\t * @param opcode\n\t * @param in\n\t * @param out\n\t */\n\tvoid visitInsn(BeamOpcode opcode, Arg[] in, Arg out);\n\n\t/**\n\t * @param opcode\n\t * @param asInt\n\t * @param decodeOutArg\n\t */\n\tvoid visitInsn(BeamOpcode opcode, int val, Arg out);\n\n\t/**\n\t * @param opcode\n\t * @param val\n\t * @param tupleReg\n\t * @param i\n\t */\n\tvoid visitInsn(BeamOpcode opcode, Arg val, Arg out, int pos);\n\n\t/**\n\t * @param in\n\t * @param failLabel\n\t * @param arities\n\t * @param targets\n\t */\n\tvoid visitSelectTuple(Arg in, int failLabel, int[] arities, int[] targets);\n\n\t/**\n\t * @param in\n\t * @param failLabel\n\t * @param values\n\t * @param targets\n\t */\n\tvoid visitSelectValue(Arg in, int failLabel, Arg[] values, int[] targets);\n\n\t/**\n\t * @param test\n\t * @param failLabel\n\t * @param arg\n\t * @param arity\n\t * @param tupleType\n\t */\n\tvoid visitTest(BeamOpcode test, int failLabel, Arg arg, int arity,\n\t\t\tType tupleType);\n\n\t/**\n\t * @param decodeLabelref\n\t */\n\tvoid visitJump(int decodeLabelref);\n", "new_methods": [], "old_code": "", "old_methods": [], "patch": "@@ -72,6 +72,73 @@ void visitTest(BeamOpcode test, int failLabel, Arg[] args, Arg out,\n \t * @param isExternal\n \t */\n \tvoid visitCall(ExtFunc fun, Arg[] args, boolean isTail, boolean isExternal);\n+\n+\t/**\n+\t * @param opcode\n+\t * @param ys\n+\t */\n+\tvoid visitInsn(BeamOpcode opcode, Arg[] ys);\n+\n+\t/**\n+\t * @param opcode\n+\t * @param efun\n+\t * @param freevars\n+\t */\n+\tvoid visitInsn(BeamOpcode opcode, ExtFunc efun, Arg[] freevars);\n+\n+\t/**\n+\t * @param opcode\n+\t * @param in\n+\t * @param out\n+\t */\n+\tvoid visitInsn(BeamOpcode opcode, Arg[] in, Arg out);\n+\n+\t/**\n+\t * @param opcode\n+\t * @param asInt\n+\t * @param decodeOutArg\n+\t */\n+\tvoid visitInsn(BeamOpcode opcode, int val, Arg out);\n+\n+\t/**\n+\t * @param opcode\n+\t * @param val\n+\t * @param tupleReg\n+\t * @param i\n+\t */\n+\tvoid visitInsn(BeamOpcode opcode, Arg val, Arg out, int pos);\n+\n+\t/**\n+\t * @param in\n+\t * @param failLabel\n+\t * @param arities\n+\t * @param targets\n+\t */\n+\tvoid visitSelectTuple(Arg in, int failLabel, int[] arities, int[] targets);\n+\n+\t/**\n+\t * @param in\n+\t * @param failLabel\n+\t * @param values\n+\t * @param targets\n+\t */\n+\tvoid visitSelectValue(Arg in, int failLabel, Arg[] values, int[] targets);\n+\n+\t/**\n+\t * @param test\n+\t * @param failLabel\n+\t * @param arg\n+\t * @param arity\n+\t * @param tupleType\n+\t */\n+\tvoid visitTest(BeamOpcode test, int failLabel, Arg arg, int arity,\n+\t\t\tType tupleType);\n+\n+\t/**\n+\t * @param decodeLabelref\n+\t */\n+\tvoid visitJump(int decodeLabelref);\n+\n \t\n \n }", "raw_url": "https://github.com/trifork/erjang/raw/070f8a4124a580cd7a140029dee655beeae8540b/src%2Ferjang%2Fbeam%2FBlockVisitor2.java", "sha": "3a48cb03ce7abbd5dfe19d9416691de558c57b7f", "status": "modified" }, { "additions": 13, "blob_url": "https://github.com/trifork/erjang/blob/070f8a4124a580cd7a140029dee655beeae8540b/src%2Ferjang%2Fbeam%2FCompiler.java", "changes": 39, "contents_url": "https://api.github.com/repos/trifork/erjang/contents/src%2Ferjang%2Fbeam%2FCompiler.java?ref=070f8a4124a580cd7a140029dee655beeae8540b", "deletions": 26, "filename": "src/erjang/beam/Compiler.java", "new_code": "\t\ttry {\n\t\t\t// go!\n\t\t\treader.accept(analysis);\n\t\t} catch (Error e) {\n\t\t\te.printStackTrace();\n\t\t}\n\n\n\t\t\tString jbeam_name = beam_name.substring(0, beam_name\n\t\t\t\t\t.lastIndexOf('.') + 1)\n\t\t\t\t\t+ \"jbeam\";\n\t\t\tFile outfile = new File(out_dir, jbeam_name);\n\t\t\twriteTo(outfile, data);", "new_methods": [], "old_code": "import java.io.ByteArrayOutputStream;\nimport java.io.DataOutputStream;\nimport java.util.HashMap;\nimport java.util.Map;\nimport java.util.TreeMap;\nimport java.util.regex.Pattern;\nimport org.objectweb.asm.AnnotationVisitor;\nimport org.objectweb.asm.ClassVisitor;\nimport org.objectweb.asm.Label;\nimport org.objectweb.asm.MethodAdapter;\nimport org.objectweb.asm.MethodVisitor;\nimport org.objectweb.asm.Type;\nimport com.sun.tools.javac.resources.compiler;\nimport erjang.EModule;\nimport erjang.EObject;\nimport erjang.ErlFun;\nimport erjang.Module;\n\t\t// go!\n\t\treader.accept(analysis);\n\n\t\t\n\t\t\t\n\t\t\tString jbeam_name = beam_name.substring(0, beam_name.lastIndexOf('.')+1) + \"jbeam\";\n\t\t\tFile outfile = new File(out_dir, beam_name);\n\t\t\twriteTo(outfile , data);\n\t\t", "old_methods": [], "patch": "@@ -18,32 +18,15 @@\n \n package erjang.beam;\n \n-import java.io.ByteArrayOutputStream;\n-import java.io.DataOutputStream;\n import java.io.File;\n import java.io.FileOutputStream;\n import java.io.IOException;\n-import java.util.HashMap;\n-import java.util.Map;\n-import java.util.TreeMap;\n-import java.util.regex.Pattern;\n \n-import org.objectweb.asm.AnnotationVisitor;\n-import org.objectweb.asm.ClassVisitor;\n import org.objectweb.asm.ClassWriter;\n-import org.objectweb.asm.Label;\n-import org.objectweb.asm.MethodAdapter;\n-import org.objectweb.asm.MethodVisitor;\n import org.objectweb.asm.Opcodes;\n-import org.objectweb.asm.Type;\n \n import com.ericsson.otp.erlang.OtpAuthException;\n-import com.sun.tools.javac.resources.compiler;\n \n-import erjang.EModule;\n-import erjang.EObject;\n-import erjang.ErlFun;\n-import erjang.Module;\n import erjang.beam.analysis.BeamTypeAnalysis;\n \n public class Compiler implements Opcodes {\n@@ -73,9 +56,12 @@ byte[] compile(File file) throws IOException {\n \t\t// the beam file reader, phase 1\n \t\tBeamFileData reader = loader.load(file);\n \n-\t\t// go!\n-\t\treader.accept(analysis);\n-\n+\t\ttry {\n+\t\t\t// go!\n+\t\t\treader.accept(analysis);\n+\t\t} catch (Error e) {\n+\t\t\te.printStackTrace();\n+\t\t}\n \t\t// get byte code data\n \t\treturn cw.toByteArray();\n \t}\n@@ -84,18 +70,19 @@ public static void main(String[] args) throws Exception {\n \n \t\tFile out_dir = new File(\"out\");\n \t\tCompiler cc = new Compiler();\n-\t\t\n+\n \t\tfor (int i = 0; i < args.length; i++) {\n-\t\t\t\n+\n \t\t\tFile infile = new File(args[i]);\n \t\t\tbyte[] data = cc.compile(infile);\n \t\t\tString beam_name = infile.getName();\n-\t\t\tString jbeam_name = beam_name.substring(0, beam_name.lastIndexOf('.')+1) + \"jbeam\";\n-\t\t\tFile outfile = new File(out_dir, beam_name);\n-\t\t\twriteTo(outfile , data);\n+\t\t\tString jbeam_name = beam_name.substring(0, beam_name\n+\t\t\t\t\t.lastIndexOf('.') + 1)\n+\t\t\t\t\t+ \"jbeam\";\n+\t\t\tFile outfile = new File(out_dir, jbeam_name);\n+\t\t\twriteTo(outfile, data);\n \t\t}\n \n-\t\t\n \t}\n \n \tstatic void writeTo(File output, byte[] class_data) throws IOException {", "raw_url": "https://github.com/trifork/erjang/raw/070f8a4124a580cd7a140029dee655beeae8540b/src%2Ferjang%2Fbeam%2FCompiler.java", "sha": "e9d1929d4ec2ed87a99e644292e594149945befe", "status": "modified" }, { "additions": 571, "blob_url": "https://github.com/trifork/erjang/blob/070f8a4124a580cd7a140029dee655beeae8540b/src%2Ferjang%2Fbeam%2FCompilerVisitor.java", "changes": 634, "contents_url": "https://api.github.com/repos/trifork/erjang/contents/src%2Ferjang%2Fbeam%2FCompilerVisitor.java?ref=070f8a4124a580cd7a140029dee655beeae8540b", "deletions": 63, "filename": "src/erjang/beam/CompilerVisitor.java", "new_code": "import erjang.EString;\nimport erjang.NotImplemented;\nimport erjang.modules.erl_bif;\n\tECons atts = EList.NIL;\n\t\tcv.visit(V1_6, ACC_PUBLIC, self_type.getInternalName(), null,\n\t\tString internalEMname = erl_bif.class.getName().replace('.', '/');\n\tMap<ETerm, String> constants = new HashMap<ETerm, String>();\n\n\t\tprivate Label start;\n\t\tprivate Label end;\n\t\tprivate int scratch_reg;\n\t\t\tthis.start = new Label();\n\t\t\tthis.end = new Label();\n\n\t\t\tmv.visitLabel(start);\n\n\t\t\tmv.visitMaxs(20, scratch_reg + 1);\n\t\t\tmv.visitLabel(end);\n\t\t\t\tmv.visitLocalVariable(\"X\" + i, EOBJECT_TYPE.getDescriptor(),\n\t\t\t\t\t\tnull, start, end, local);\n\n\t\t\t\tmv.visitLocalVariable(\"Y\" + i, EOBJECT_TYPE.getDescriptor(),\n\t\t\t\t\t\tnull, start, end, local);\n\t\t\t\tmv.visitLocalVariable(\"F\" + i,\n\t\t\t\t\t\tType.DOUBLE_TYPE.getDescriptor(), null, start, end,\n\t\t\t\t\t\tlocal);\n\t\t\tthis.scratch_reg = local;\n\n\n\n\n\t\t\t\tmv.visitMethodInsn(INVOKESTATIC, ERT_TYPE.getInternalName(),\n\t\t\t\t\t\t\"unbox\" + primTypeName(toType), \"(\"\n\t\t\t\t\t\t\t\t+ fromType.getDescriptor() + \")\"\n\t\t\t\t\t\t\t\t+ toType.getDescriptor());\n\n\t\t\t}\n\n\t\t\t/**\n\t\t\t * @param toType\n\t\t\t * @return\n\t\t\t */\n\t\t\tprivate String primTypeName(Type typ) {\n\t\t\t\tswitch (typ.getSort()) {\n\t\t\t\tcase Type.DOUBLE:\n\t\t\t\t\treturn \"Double\";\n\t\t\t\tcase Type.INT:\n\t\t\t\t\treturn \"Integer\";\n\t\t\t\tcase Type.BOOLEAN:\n\t\t\t\t\treturn \"Atom\";\n\t\t\t\tdefault:\n\t\t\t\t\tthrow new Error();\n\t\t\t\t}\n\t\t\t\t\tmv.visitMethodInsn(INVOKESTATIC,\n\t\t\t\t\t\t\tERT_TYPE.getInternalName(), \"box\", \"(\"\n\t\t\t\t\t\t\t\t\t+ fromType.getDescriptor() + \")\"\n\t\t\t\t\t\t\t\t\t+ toType.getDescriptor());\n\t\t\t\t\tmv.visitMethodInsn(INVOKESTATIC,\n\t\t\t\t\t\t\tERT_TYPE.getInternalName(), \"box\", \"(\"\n\t\t\t\t\t\t\t\t\t+ fromType.getDescriptor() + \")\"\n\t\t\t\t\t\t\t\t\t+ toType.getDescriptor());\n\t\t\t\t\tmv.visitMethodInsn(INVOKESTATIC,\n\t\t\t\t\t\t\tERT_TYPE.getInternalName(), \"box\", \"(\"\n\t\t\t\t\t\t\t\t\t+ fromType.getDescriptor() + \")\"\n\t\t\t\t\t\t\t\t\t+ toType.getDescriptor());\n\t\t\t\tif (value == ENil.NIL) {\n\t\t\t\t\tmv.visitFieldInsn(GETSTATIC, ENIL_TYPE.getInternalName(),\n\t\t\t\t\t\t\t\"NIL\", ENIL_TYPE.getDescriptor());\n\t\t\t\t\treturn ENIL_TYPE;\n\t\t\t\t}\n\n\t\t\t\tif (value == ERT.ATOM_TRUE) {\n\t\t\t\t\tmv.visitFieldInsn(GETSTATIC, ERT_TYPE.getInternalName(),\n\t\t\t\t\t\t\t\"ATOM_TRUE\", EATOM_TYPE.getDescriptor());\n\t\t\t\t\treturn EATOM_TYPE;\n\t\t\t\t}\n\n\t\t\t\tif (value == ERT.ATOM_FALSE) {\n\t\t\t\t\tmv.visitFieldInsn(GETSTATIC, ERT_TYPE.getInternalName(),\n\t\t\t\t\t\t\t\"ATOM_FALSE\", EATOM_TYPE.getDescriptor());\n\t\t\t\t\treturn EATOM_TYPE;\n\t\t\t\t}\n\n\n\t\t\t\t\tType type = Type.getType(value.getClass());\n\n\t\t\t\t\tString cn = getConstantName(value, constants.size());\n\n\t\t\t\t\tconstants.put(value, known = cn);\n\t\t\t\t\tcv.visitField(ACC_STATIC, known, type.getDescriptor(),\n\t\t\t\t\t\t\tnull, null);\n\n\t\t\t\t\tSystem.err.println(constants);\n\n\t\t\t\t\tmv.visitFieldInsn(GETSTATIC, self_type.getInternalName(),\n\t\t\t\t\t\t\tknown, type.getDescriptor());\n\n\t\t\t\tthrow new Error(\"cannot push \" + value + \" as \" + stack_type);\n\t\t\t/**\n\t\t\t * @param value\n\t\t\t * @param size\n\t\t\t * @return\n\t\t\t */\n\t\t\tprivate String getConstantName(ETerm value, int size) {\n\t\t\t\tif (value instanceof EAtom)\n\t\t\t\t\treturn \"atom_\" + EUtil.toJavaIdentifier((EAtom) value);\n\t\t\t\tif (value instanceof ENumber)\n\t\t\t\t\treturn EUtil.toJavaIdentifier(\"num_\"\n\t\t\t\t\t\t\t+ value.toString().replace('.', '_').replace('-',\n\t\t\t\t\t\t\t\t\t'_'));\n\t\t\t\tif (value instanceof EString)\n\t\t\t\t\treturn \"str_\" + size;\n\t\t\t\telse\n\t\t\t\t\treturn \"cst_\" + size;\n\t\t\t}\n\n\t\t\t/*\n\t\t\t * (non-Javadoc)\n\t\t\t * \n\t\t\t * @see erjang.beam.BlockVisitor2#visitInsn(erjang.beam.BeamOpcode,\n\t\t\t * erjang.beam.Arg[], erjang.beam.Arg)\n\t\t\t */\n\t\t\t@Override\n\t\t\tpublic void visitInsn(BeamOpcode opcode, Arg[] in, Arg out) {\n\t\t\t\tswitch (opcode) {\n\t\t\t\tcase put_list:\n\t\t\t\t\tpush(in[0], EOBJECT_TYPE);\n\t\t\t\t\tpush(in[1], EOBJECT_TYPE);\n\t\t\t\t\tmv.visitMethodInsn(INVOKESTATIC,\n\t\t\t\t\t\t\tERT_TYPE.getInternalName(), \"cons\", \"(\"\n\t\t\t\t\t\t\t\t\t+ EOBJECT_TYPE.getDescriptor()\n\t\t\t\t\t\t\t\t\t+ EOBJECT_TYPE.getDescriptor() + \")\"\n\t\t\t\t\t\t\t\t\t+ ECONS_TYPE.getDescriptor());\n\t\t\t\t\tpop(out, ECONS_TYPE);\n\t\t\t\t\treturn;\n\t\t\t\t}\n\n\t\t\t\tthrow new Error();\n\t\t\t}\n\n\t\t\t\t\tmv.visitVarInsn(ALOAD, 0);\n\t\t\t\tcase if_end:\n\t\t\t\t\tmv.visitMethodInsn(INVOKESTATIC,\n\t\t\t\t\t\t\tERT_TYPE.getInternalName(), \"if_end\", EUtil\n\t\t\t\t\t\t\t\t\t.getSignature(0));\n\t\t\t\t\tmv.visitInsn(ARETURN);\n\t\t\t\t\treturn;\n\n\t\t\t\t}\n\n\t\t\t\tthrow new Error();\n\t\t\t}\n\n\t\t\t/*\n\t\t\t * (non-Javadoc)\n\t\t\t * \n\t\t\t * @see erjang.beam.BlockVisitor2#visitInsn(erjang.beam.BeamOpcode,\n\t\t\t * int, erjang.beam.Arg)\n\t\t\t */\n\t\t\t@Override\n\t\t\tpublic void visitInsn(BeamOpcode opcode, int val, Arg out) {\n\t\t\t\tswitch (opcode) {\n\t\t\t\tcase put_tuple:\n\t\t\t\t\tmv.visitTypeInsn(NEW, out.type.getInternalName());\n\t\t\t\t\tmv.visitInsn(DUP);\n\t\t\t\t\tmv.visitMethodInsn(INVOKESPECIAL, out.type\n\t\t\t\t\t\t\t.getInternalName(), \"<init>\", \"()V\");\n\t\t\t\t\tpop(out, out.type);\n\n\t\t\t\t\treturn;\n\t\t\t\t}\n\t\t\t\tthrow new Error();\n\t\t\t}\n\n\t\t\t/*\n\t\t\t * (non-Javadoc)\n\t\t\t * \n\t\t\t * @see erjang.beam.BlockVisitor2#visitInsn(erjang.beam.BeamOpcode,\n\t\t\t * erjang.beam.Arg, erjang.beam.Arg, int)\n\t\t\t */\n\t\t\t@Override\n\t\t\tpublic void visitInsn(BeamOpcode opcode, Arg val, Arg out, int pos) {\n\t\t\t\tif (opcode == BeamOpcode.put) {\n\t\t\t\t\tpush(out, out.type);\n\t\t\t\t\tpush(val, EOBJECT_TYPE);\n\t\t\t\t\tmv.visitFieldInsn(PUTFIELD, out.type.getInternalName(),\n\t\t\t\t\t\t\t\"elm\" + pos, EOBJECT_TYPE.getDescriptor());\n\t\t\t\t\treturn;\n\n\t\t\t\t} else if (opcode == BeamOpcode.get_tuple_element) {\n\t\t\t\t\tpush(val, val.type);\n\t\t\t\t\tmv.visitFieldInsn(GETFIELD, val.type.getInternalName(),\n\t\t\t\t\t\t\t\"elm\" + pos, EOBJECT_TYPE.getDescriptor());\n\t\t\t\t\tpop(out, EOBJECT_TYPE);\n\t\t\t\t\treturn;\n\t\t\t\t} else if (opcode == BeamOpcode.set_tuple_element) {\n\t\t\t\t\tpush(out, out.type);\n\t\t\t\t\tpush(val, val.type);\n\t\t\t\t\tmv.visitFieldInsn(PUTFIELD, val.type.getInternalName(),\n\t\t\t\t\t\t\t\"elm\" + pos, EOBJECT_TYPE.getDescriptor());\n\t\t\t\t\treturn;\n\t\t\t/**\n\t\t\t * @param pos\n\t\t\t */\n\t\t\tprivate void push_int(int pos) {\n\t\t\t\tif (pos >= -1 && pos <= 5) {\n\t\t\t\t\tmv.visitInsn(ICONST_0 + pos);\n\t\t\t\t} else {\n\t\t\t\t\tmv.visitLdcInsn(new Integer(pos));\n\t\t\t\t}\n\t\t\t}\n\n\t\t\t\tswitch (opcode) {\n\t\t\t\tcase func_info:\n\t\t\t\t\tExtFunc f = (ExtFunc) arg;\n\t\t\t\t\tpush_immediate(f.mod, EATOM_TYPE);\n\t\t\t\t\tpush_immediate(f.fun, EATOM_TYPE);\n\t\t\t\t\tmv.visitLdcInsn(new Integer(arg.no));\n\t\t\t\t\tmv.visitMethodInsn(INVOKESTATIC,\n\t\t\t\t\t\t\tERT_TYPE.getInternalName(), \"func_info\", \"(\"\n\t\t\t\t\t\t\t\t\t+ ETUPLE_TYPE.getDescriptor()\n\t\t\t\t\t\t\t\t\t+ ETUPLE_TYPE.getDescriptor() + \"I)\"\n\t\t\t\t\t\t\t\t\t+ EOBJECT_TYPE.getDescriptor());\n\t\t\t\t\tmv.visitInsn(ARETURN);\n\t\t\t\t\treturn;\n\n\t\t\t\tcase init:\n\t\t\t\t\tpush_immediate(ENil.NIL, ENIL_TYPE);\n\t\t\t\t\tpop(arg, ENIL_TYPE);\n\t\t\t\t\treturn;\n\n\t\t\t\tcase case_end:\n\t\t\t\t\tpush(arg, EOBJECT_TYPE);\n\t\t\t\t\tmv.visitMethodInsn(INVOKESTATIC,\n\t\t\t\t\t\t\tERT_TYPE.getInternalName(), \"case_end\", EUtil\n\t\t\t\t\t\t\t\t\t.getSignature(1));\n\t\t\t\t\tmv.visitInsn(ARETURN);\n\t\t\t\t\treturn;\n\n\t\t\t\tcase badmatch:\n\t\t\t\t\tpush(arg, EOBJECT_TYPE);\n\t\t\t\t\tmv.visitMethodInsn(INVOKESTATIC,\n\t\t\t\t\t\t\tERT_TYPE.getInternalName(), \"badmatch\", EUtil\n\t\t\t\t\t\t\t\t\t.getSignature(1));\n\t\t\t\t\tmv.visitInsn(ARETURN);\n\t\t\t\t\treturn;\n\n\t\t\t\t}\n\n\t\t\t\tthrow new Error(\"unhandled \" + opcode);\n\t\t\t\tSystem.err.println(test_bif);\n\n\t\t\t\tpush(arg1, arg1.type);\n\t\t\t\t\tif (returnType.getSort() == Type.BOOLEAN) {\n\t\t\t\t\t\tmv.visitJumpInsn(IFEQ, getLabel(failLabel));\n\n\t\t\t\t\t} else {\n\n\t\t\t\t\t\t// guard\n\t\t\t\t\t\tif (returnType.getSort() != Type.OBJECT)\n\t\t\t\t\t\t\tthrow new Error(\"guards must return object type\");\n\t\t\t\t\t\t// dup result for test\n\t\t\t\t\t\tif (arg1 != null) {\n\t\t\t\t\t\t\tmv.visitInsn(DUP);\n\t\t\t\t\t\t\tmv.visitVarInsn(ASTORE, scratch_reg);\n\t\t\t\t\t\t}\n\t\t\t\t\t\tmv.visitJumpInsn(IFNULL, getLabel(failLabel));\n\t\t\t\t\t\tif (arg1 != null) {\n\t\t\t\t\t\t\tmv.visitVarInsn(ALOAD, scratch_reg);\n\t\t\t\t\t\t\tpop(arg1, returnType);\n\t\t\t\t\t\t}\n\t\t\t/*\n\t\t\t * (non-Javadoc)\n\t\t\t * \n\t\t\t * @see erjang.beam.BlockVisitor2#visitTest(erjang.beam.BeamOpcode,\n\t\t\t * int, erjang.beam.Arg, int, org.objectweb.asm.Type)\n\t\t\t */\n\t\t\t@Override\n\t\t\tpublic void visitTest(BeamOpcode test, int failLabel, Arg arg,\n\t\t\t\t\tint arity, Type tupleType) {\n\n\t\t\t\tif (test != BeamOpcode.test_arity)\n\t\t\t\t\tthrow new Error();\n\n\t\t\t\tpush(arg, ETUPLE_TYPE);\n\t\t\t\tmv.visitMethodInsn(INVOKEVIRTUAL,\n\t\t\t\t\t\tETUPLE_TYPE.getInternalName(), \"count\", \"()I\");\n\t\t\t\tpush_int(arity);\n\t\t\t\tmv.visitJumpInsn(IF_ICMPNE, getLabel(failLabel));\n\t\t\t\tpush(arg, ETUPLE_TYPE);\n\t\t\t\tmv.visitTypeInsn(CHECKCAST, tupleType.getInternalName());\n\t\t\t\tpop(arg, tupleType);\n\t\t\t}\n\n\t\t\t\tif (test == BeamOpcode.is_eq_exact\n\t\t\t\t\t\t&& (args[0].type.equals(EATOM_TYPE) || args[1].type\n\t\t\t\t\t\t\t\t.equals(EATOM_TYPE))) {\n\t\t\t\t\tpush(args[0], EOBJECT_TYPE);\n\t\t\t\t\tpush(args[1], EOBJECT_TYPE);\n\t\t\t\t\tmv.visitJumpInsn(IF_ACMPNE, getLabel(failLabel));\n\t\t\t\t\treturn;\n\t\t\t\t}\n\n\t\t\t\t\tswitch (bif.getReturnType().getSort()) {\n\t\t\t\t\tcase Type.BOOLEAN:\n\t\t\t\t\t\tif (out == null) {\n\t\t\t\t\t\t\tmv.visitJumpInsn(IFEQ, getLabel(failLabel));\n\t\t\t\t\t\t}\n\t\t\t\t\t\tbreak;\n\t\t\t\t\tcase Type.OBJECT:\n\n\t\t\t\t\t\tif (out != null) {\n\t\t\t\t\t\t\tpop(out, bif.getReturnType());\n\t\t\t\t\t\t\tpush(out, bif.getReturnType());\n\t\t\t\t\t\t}\n\n\t\t\t\t\t\tmv.visitJumpInsn(IFNULL, getLabel(failLabel));\n\t\t\t\t\t\tbreak;\n\t\t\t\t\tdefault:\n\t\t\t\t\t\tthrow new Error(\"guards must return object type\");\n\n\t\t\t\t\t\t\tpop(arg2, EDOUBLE_TYPE);\n\t\t\t\t\t\t\tpop(arg2, arg1.type);\n\t\t\t\tif (!type.getInternalName().startsWith(\"erjang/E\")) {\n\t\t\t\tcase is_boolean:\n\t\t\t\t\treturn IS_BOOLEAN_TEST;\n\t\t\t\tcase is_atom:\n\t\t\t\t\treturn IS_ATOM_TEST;\n\t\t\t\tcase is_tuple:\n\t\t\t\t\treturn IS_TUPLE_TEST;\n\t\t\t\tcase is_integer:\n\t\t\t\t\treturn IS_INTEGER_TEST;\n\t\t\t/*\n\t\t\t * (non-Javadoc)\n\t\t\t * \n\t\t\t * @see erjang.beam.BlockVisitor2#visitInsn(erjang.beam.BeamOpcode,\n\t\t\t * erjang.beam.Arg[])\n\t\t\t */\n\t\t\t@Override\n\t\t\tpublic void visitInsn(BeamOpcode opcode, Arg[] ys) {\n\n\t\t\t\tif (opcode == BeamOpcode.allocate_zero\n\t\t\t\t\t\t|| opcode == BeamOpcode.allocate_heap_zero) {\n\n\t\t\t\t\tmv.visitFieldInsn(GETSTATIC, ENIL_TYPE.getInternalName(),\n\t\t\t\t\t\t\t\"NIL\", ENIL_TYPE.getDescriptor());\n\t\t\t\t\tfor (int i = 0; i < ys.length; i++) {\n\t\t\t\t\t\tif (i != (ys.length - 1))\n\t\t\t\t\t\t\tmv.visitInsn(DUP);\n\t\t\t\t\t\tpop(ys[i], ENIL_TYPE);\n\t\t\t\t\t}\n\n\t\t\t\t\treturn;\n\t\t\t\t} else if (opcode == BeamOpcode.get_list) {\n\n\t\t\t\t\tpush(ys[0], ECONS_TYPE);\n\t\t\t\t\tmv.visitInsn(DUP);\n\t\t\t\t\tmv.visitMethodInsn(INVOKEVIRTUAL, ECONS_TYPE\n\t\t\t\t\t\t\t.getInternalName(), \"head\", \"()\"\n\t\t\t\t\t\t\t+ EOBJECT_TYPE.getDescriptor());\n\t\t\t\t\tpop(ys[1], EOBJECT_TYPE);\n\t\t\t\t\tmv.visitMethodInsn(INVOKEVIRTUAL, ECONS_TYPE\n\t\t\t\t\t\t\t.getInternalName(), \"tail\", \"()\"\n\t\t\t\t\t\t\t+ EOBJECT_TYPE.getDescriptor());\n\t\t\t\t\tpop(ys[2], EOBJECT_TYPE);\n\t\t\t\t\treturn;\n\n\t\t\t\t} else if (opcode == BeamOpcode.apply) {\n\n\t\t\t\t\tfor (int i = 0; i < ys.length; i++) {\n\t\t\t\t\t\tpush(ys[i], EOBJECT_TYPE);\n\t\t\t\t\t}\n\t\t\t\t\tmv.visitMethodInsn(INVOKESTATIC,\n\t\t\t\t\t\t\tERT_TYPE.getInternalName(), \"apply\", EUtil\n\t\t\t\t\t\t\t\t\t.getSignature(ys.length));\n\t\t\t\t\tmv.visitVarInsn(ASTORE, xregs[0]);\n\n\t\t\t\t\treturn;\n\t\t\t\t\t\n\t\t\t\t} else if (opcode == BeamOpcode.apply_last) {\n\n\t\t\t\t\tfor (int i = 0; i < ys.length; i++) {\n\t\t\t\t\t\tpush(ys[i], EOBJECT_TYPE);\n\t\t\t\t\t}\n\t\t\t\t\tmv.visitMethodInsn(INVOKESTATIC,\n\t\t\t\t\t\t\tERT_TYPE.getInternalName(), \"apply$last\", EUtil\n\t\t\t\t\t\t\t\t\t.getSignature(ys.length));\n\n\t\t\t\t\tmv.visitInsn(ARETURN);\n\n\t\t\t\t\treturn;\n\t\t\t\t\t\n\t\t\t\t} else if (opcode == BeamOpcode.send) {\n\t\t\t\t\tfor (int i = 0; i < ys.length; i++) {\n\t\t\t\t\t\tpush(ys[i], EOBJECT_TYPE);\n\t\t\t\t\t}\n\t\t\t\t\tmv.visitMethodInsn(INVOKESTATIC,\n\t\t\t\t\t\t\tERT_TYPE.getInternalName(), \"send\", EUtil\n\t\t\t\t\t\t\t\t\t.getSignature(ys.length));\n\t\t\t\t\tmv.visitVarInsn(ASTORE, xregs[0]);\n\n\t\t\t\t\treturn;\n\t\t\t\t}\n\n\t\t\t\tthrow new Error(\"unhandled:\" + opcode);\n\t\t\t}\n\n\t\t\t/*\n\t\t\t * (non-Javadoc)\n\t\t\t * \n\t\t\t * @see erjang.beam.BlockVisitor2#visitInsn(erjang.beam.BeamOpcode,\n\t\t\t * erjang.beam.ExtFunc, int)\n\t\t\t */\n\t\t\t@Override\n\t\t\tpublic void visitInsn(BeamOpcode opcode, ExtFunc efun,\n\t\t\t\t\tArg[] freevars) {\n\t\t\t\tif (opcode == BeamOpcode.make_fun2) {\n\n\t\t\t\t\tString funtype = EFUN_TYPE.getInternalName() + efun.no;\n\t\t\t\t\tfor (int i = 0; i < freevars.length; i++) {\n\t\t\t\t\t\tpush(freevars[i], EOBJECT_TYPE);\n\t\t\t\t\t}\n\n\t\t\t\t\tStringBuilder sb = new StringBuilder(\"(\");\n\t\t\t\t\tfor (int i = 0; i < freevars.length; i++) {\n\t\t\t\t\t\tsb.append(EOBJECT_TYPE.getDescriptor());\n\t\t\t\t\t}\n\t\t\t\t\tsb.append(\")\");\n\t\t\t\t\tsb.append(\"L\").append(funtype).append(\";\");\n\t\t\t\t\tString gen_fun_desc = sb.toString();\n\t\t\t\t\tString gen_fun_name = \"make_fun2_\"\n\t\t\t\t\t\t\t+ EUtil.getJavaName(efun);\n\n\t\t\t\t\tmv.visitMethodInsn(INVOKESTATIC, self_type\n\t\t\t\t\t\t\t.getInternalName(), gen_fun_name, gen_fun_desc);\n\n\t\t\t\t\tmv.visitVarInsn(ASTORE, 0);\n\n\t\t\t\t\treturn;\n\t\t\t\t}\n\n\t\t\t\tthrow new Error();\n\t\t\t}\n\n\t\t\t/*\n\t\t\t * (non-Javadoc)\n\t\t\t * \n\t\t\t * @see erjang.beam.BlockVisitor2#visitSelectValue(erjang.beam.Arg,\n\t\t\t * int, erjang.beam.Arg[], int[])\n\t\t\t */\n\t\t\t@Override\n\t\t\tpublic void visitSelectValue(Arg in, int failLabel, Arg[] values,\n\t\t\t\t\tint[] targets) {\n\t\t\t\tint[] hash = new int[values.length];\n\t\t\t\tLabel[] label = new Label[values.length];\n\t\t\t\tfor (int i = 0; i < values.length; i++) {\n\t\t\t\t\thash[i] = values[i].value.hashCode();\n\t\t\t\t\tlabel[i] = new Label();\n\t\t\t\t}\n\n\t\t\t\tpush(in, EOBJECT_TYPE);\n\t\t\t\tmv.visitMethodInsn(INVOKEVIRTUAL, \"java/lang/Object\",\n\t\t\t\t\t\t\"hashCode\", \"()I\");\n\t\t\t\tmv.visitLookupSwitchInsn(getLabel(failLabel), hash, label);\n\n\t\t\t\tfor (int i = 0; i < hash.length; i++) {\n\t\t\t\t\tint h = hash[i];\n\t\t\t\t\tfor (int j = i; j < hash.length; j++) {\n\t\t\t\t\t\tif (h == hash[j] && label[j] != null)\n\t\t\t\t\t\t\tmv.visitLabel(label[j]);\n\t\t\t\t\t}\n\n\t\t\t\t\tfor (int j = i; j < hash.length; j++) {\n\t\t\t\t\t\tif (h == hash[j] && label[j] != null) {\n\n\t\t\t\t\t\t\tif (values[j].type.equals(EATOM_TYPE)) {\n\n\t\t\t\t\t\t\t\tpush(in, in.type);\n\t\t\t\t\t\t\t\tpush(values[j], values[j].type);\n\t\t\t\t\t\t\t\tmv.visitJumpInsn(IF_ACMPEQ,\n\t\t\t\t\t\t\t\t\t\tgetLabel(targets[j]));\n\n\t\t\t\t\t\t\t} else {\n\n\t\t\t\t\t\t\t\tif (in.type == values[j].type) {\n\t\t\t\t\t\t\t\t\tpush(in, in.type);\n\t\t\t\t\t\t\t\t\tpush(values[j], values[j].type);\n\n\t\t\t\t\t\t\t\t\tmv.visitMethodInsn(INVOKESTATIC, ERT_TYPE\n\t\t\t\t\t\t\t\t\t\t\t.getInternalName(), \"eq\", \"(\"\n\t\t\t\t\t\t\t\t\t\t\t+ in.type.getDescriptor()\n\t\t\t\t\t\t\t\t\t\t\t+ in.type.getDescriptor() + \")Z\");\n\t\t\t\t\t\t\t\t} else {\n\t\t\t\t\t\t\t\t\tpush(in, EOBJECT_TYPE);\n\t\t\t\t\t\t\t\t\tpush(values[j], EOBJECT_TYPE);\n\t\t\t\t\t\t\t\t\tmv.visitMethodInsn(INVOKEVIRTUAL,\n\t\t\t\t\t\t\t\t\t\t\t\"java/lang/Object\", \"equals\",\n\t\t\t\t\t\t\t\t\t\t\t\"(Ljava/lang/Object;)Z\");\n\t\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\t\tmv.visitJumpInsn(IFNE, getLabel(targets[j]));\n\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\tlabel[j] = null;\n\t\t\t\t\t\t}\n\t\t\t\t\t}\n\n\t\t\t\t\tmv.visitJumpInsn(GOTO, getLabel(failLabel));\n\t\t\t\t}\n\t\t\t}\n\n\t\t\t@Override\n\t\t\tpublic void visitSelectTuple(Arg in, int failLabel, int[] arities,\n\t\t\t\t\tint[] targets) {\n\n\t\t\t\tpush(in, ETUPLE_TYPE);\n\n\t\t\t\tmv.visitMethodInsn(INVOKEVIRTUAL,\n\t\t\t\t\t\tETUPLE_TYPE.getInternalName(), \"count\", \"()I\");\n\n\t\t\t\tLabel[] targetLabels = new Label[targets.length];\n\t\t\t\tfor (int i = 0; i < targets.length; i++) {\n\t\t\t\t\ttargetLabels[i] = new Label();\n\t\t\t\t}\n\t\t\t\tmv.visitLookupSwitchInsn(getLabel(failLabel), arities,\n\t\t\t\t\t\ttargetLabels);\n\t\t\t\tfor (int i = 0; i < targetLabels.length; i++) {\n\t\t\t\t\tmv.visitLabel(targetLabels[i]);\n\t\t\t\t\tpush(in, ETUPLE_TYPE);\n\t\t\t\t\tmv.visitTypeInsn(CHECKCAST, getTubleType(arities[i])\n\t\t\t\t\t\t\t.getInternalName());\n\t\t\t\t\tpop(in, getTubleType(arities[i]));\n\t\t\t\t\tmv.visitJumpInsn(GOTO, getLabel(targets[i]));\n\t\t\t\t}\n\n\t\t\t}\n\n\t\t\t/*\n\t\t\t * (non-Javadoc)\n\t\t\t * \n\t\t\t * @see erjang.beam.BlockVisitor2#visitJump(int)\n\t\t\t */\n\t\t\t@Override\n\t\t\tpublic void visitJump(int label) {\n\t\t\t\tmv.visitJumpInsn(GOTO, getLabel(label));\n\t\t\t}\n\n\t\t\t/**\n\t\t\t * @param i\n\t\t\t * @return\n\t\t\t */\n\t\t\tprivate Type getTubleType(int i) {\n\t\t\t\treturn Type.getType(\"L\" + ETUPLE_TYPE.getInternalName() + i\n\t\t\t\t\t\t+ \";\");\n\t\t\t}\n\n\t\t\t\t\tString funTypeName = EFUN_TYPE.getInternalName()\n\t\t\t\t\t\t\t+ args.length;\n\t\t\t\t\t\t\tfield, \"L\" + funTypeName + \";\");\n\t\t\t\t\tmv.visitMethodInsn(INVOKEVIRTUAL, funTypeName,\n\t\t\t\t\t\t\tis_tail ? \"invoke_tail\" : \"invoke\", EUtil\n\t\t\t\t\t\t\t\t\t.getSignature(args.length));\n\t\t\t\t\t} else {\n\t\t\t\t\t\tmv.visitVarInsn(ASTORE, 0);\n\t\t\t\t\t} else {\n\t\t\t\t\t\tmv.visitVarInsn(ASTORE, 0);\n\t\t\t.getMethod(\"erjang.ECons testNonEmptyList()\");\n\tstatic Method IS_LIST_TEST = Method.getMethod(\"erjang.ECons testCons()\");\n\tstatic Method IS_TUPLE_TEST = Method.getMethod(\"erjang.ETuple testTuple()\");\n\tstatic Method IS_INTEGER_TEST = Method.getMethod(\"erjang.ETuple testInteger()\");\n\tstatic Method IS_ATOM_TEST = Method.getMethod(\"erjang.ETuple testAtom()\");\n\tstatic Method IS_NIL_TEST = Method.getMethod(\"boolean isNil()\");\n\tstatic Method IS_BOOLEAN_TEST = Method.getMethod(\"boolean isBoolean()\");", "new_methods": [ { "arguments": [ "Type typ" ], "filename": "src/erjang/beam/CompilerVisitor.java", "implementation": "switch (typ.getSort()) {\n\t\t\t\tcase Type.DOUBLE:\n\t\t\t\t\treturn \"Double\";\n\t\t\t\tcase Type.INT:\n\t\t\t\t\treturn \"Integer\";\n\t\t\t\tcase Type.BOOLEAN:\n\t\t\t\t\treturn \"Atom\";\n\t\t\t\tdefault:\n\t\t\t\t\tthrow new Error();", "signature": "String primTypeName(Type typ)" }, { "arguments": [ "ETerm value", " int size" ], "filename": "src/erjang/beam/CompilerVisitor.java", "implementation": "if (value instanceof EAtom)\n\t\t\t\t\treturn \"atom_\" + EUtil.toJavaIdentifier((EAtom) value);\n\t\t\t\tif (value instanceof ENumber)\n\t\t\t\t\treturn EUtil.toJavaIdentifier(\"num_\"\n\t\t\t\t\t\t\t+ value.toString().replace('.', '_').replace('-',\n\t\t\t\t\t\t\t\t\t'_'));\n\t\t\t\tif (value instanceof EString)\n\t\t\t\t\treturn \"str_\" + size;\n\t\t\t\telse\n\t\t\t\t\treturn \"cst_\" + size;", "signature": "String getConstantName(ETerm value, int size)" }, { "arguments": [ "BeamOpcode opcode", " Arg[] in", " Arg out" ], "filename": "src/erjang/beam/CompilerVisitor.java", "implementation": "switch (opcode) {\n\t\t\t\tcase put_list:\n\t\t\t\t\tpush(in[0], EOBJECT_TYPE);\n\t\t\t\t\tpush(in[1], EOBJECT_TYPE);\n\t\t\t\t\tmv.visitMethodInsn(INVOKESTATIC,\n\t\t\t\t\t\t\tERT_TYPE.getInternalName(), \"cons\", \"(\"\n\t\t\t\t\t\t\t\t\t+ EOBJECT_TYPE.getDescriptor()\n\t\t\t\t\t\t\t\t\t+ EOBJECT_TYPE.getDescriptor() + \")\"\n\t\t\t\t\t\t\t\t\t+ ECONS_TYPE.getDescriptor());\n\t\t\t\t\tpop(out, ECONS_TYPE);\n\t\t\t\t\treturn;", "signature": "void visitInsn(BeamOpcode opcode, Arg[] in, Arg out)" }, { "arguments": [ "BeamOpcode opcode", " int val", " Arg out" ], "filename": "src/erjang/beam/CompilerVisitor.java", "implementation": "switch (opcode) {\n\t\t\t\tcase put_tuple:\n\t\t\t\t\tmv.visitTypeInsn(NEW, out.type.getInternalName());\n\t\t\t\t\tmv.visitInsn(DUP);\n\t\t\t\t\tmv.visitMethodInsn(INVOKESPECIAL, out.type\n\t\t\t\t\t\t\t.getInternalName(), \"<init>\", \"()V\");\n\t\t\t\t\tpop(out, out.type);\n\n\t\t\t\t\treturn;", "signature": "void visitInsn(BeamOpcode opcode, int val, Arg out)" }, { "arguments": [ "BeamOpcode opcode", " Arg val", " Arg out", " int pos" ], "filename": "src/erjang/beam/CompilerVisitor.java", "implementation": "if (opcode == BeamOpcode.put) {\n\t\t\t\t\tpush(out, out.type);\n\t\t\t\t\tpush(val, EOBJECT_TYPE);\n\t\t\t\t\tmv.visitFieldInsn(PUTFIELD, out.type.getInternalName(),\n\t\t\t\t\t\t\t\"elm\" + pos, EOBJECT_TYPE.getDescriptor());\n\t\t\t\t\treturn;", "signature": "void visitInsn(BeamOpcode opcode, Arg val, Arg out, int pos)" }, { "arguments": [ "opcode == BeamOpcode.get_tuple_element" ], "filename": "src/erjang/beam/CompilerVisitor.java", "implementation": "push(val, val.type);\n\t\t\t\t\tmv.visitFieldInsn(GETFIELD, val.type.getInternalName(),\n\t\t\t\t\t\t\t\"elm\" + pos, EOBJECT_TYPE.getDescriptor());\n\t\t\t\t\tpop(out, EOBJECT_TYPE);\n\t\t\t\t\treturn;", "signature": "else if (opcode == BeamOpcode.get_tuple_element)" }, { "arguments": [ "opcode == BeamOpcode.set_tuple_element" ], "filename": "src/erjang/beam/CompilerVisitor.java", "implementation": "push(out, out.type);\n\t\t\t\t\tpush(val, val.type);\n\t\t\t\t\tmv.visitFieldInsn(PUTFIELD, val.type.getInternalName(),\n\t\t\t\t\t\t\t\"elm\" + pos, EOBJECT_TYPE.getDescriptor());\n\t\t\t\t\treturn;\n\t\t\t/**\n\t\t\t * @param pos\n\t\t\t */\n\t\t\tprivate void push_int(int pos) {\n\t\t\t\tif (pos >= -1 && pos <= 5) {\n\t\t\t\t\tmv.visitInsn(ICONST_0 + pos);", "signature": "else if (opcode == BeamOpcode.set_tuple_element)" }, { "arguments": [ "arg1 != null" ], "filename": "src/erjang/beam/CompilerVisitor.java", "implementation": "mv.visitInsn(DUP);\n\t\t\t\t\t\t\tmv.visitVarInsn(ASTORE, scratch_reg);", "signature": "test\n\t\t\t\t\t\tif (arg1 != null)" }, { "arguments": [ "BeamOpcode test", " int failLabel", " Arg arg", "\n\t\t\t\t\tint arity", " Type tupleType" ], "filename": "src/erjang/beam/CompilerVisitor.java", "implementation": "if (test != BeamOpcode.test_arity)\n\t\t\t\t\tthrow new Error();\n\n\t\t\t\tpush(arg, ETUPLE_TYPE);\n\t\t\t\tmv.visitMethodInsn(INVOKEVIRTUAL,\n\t\t\t\t\t\tETUPLE_TYPE.getInternalName(), \"count\", \"()I\");\n\t\t\t\tpush_int(arity);\n\t\t\t\tmv.visitJumpInsn(IF_ICMPNE, getLabel(failLabel));\n\t\t\t\tpush(arg, ETUPLE_TYPE);\n\t\t\t\tmv.visitTypeInsn(CHECKCAST, tupleType.getInternalName());\n\t\t\t\tpop(arg, tupleType);", "signature": "void visitTest(BeamOpcode test, int failLabel, Arg arg,\n\t\t\t\t\tint arity, Type tupleType)" }, { "arguments": [ "BeamOpcode opcode", " Arg[] ys" ], "filename": "src/erjang/beam/CompilerVisitor.java", "implementation": "if (opcode == BeamOpcode.allocate_zero\n\t\t\t\t\t\t|| opcode == BeamOpcode.allocate_heap_zero) {\n\n\t\t\t\t\tmv.visitFieldInsn(GETSTATIC, ENIL_TYPE.getInternalName(),\n\t\t\t\t\t\t\t\"NIL\", ENIL_TYPE.getDescriptor());\n\t\t\t\t\tfor (int i = 0; i < ys.length; i++) {\n\t\t\t\t\t\tif (i != (ys.length - 1))\n\t\t\t\t\t\t\tmv.visitInsn(DUP);\n\t\t\t\t\t\tpop(ys[i], ENIL_TYPE);", "signature": "void visitInsn(BeamOpcode opcode, Arg[] ys)" }, { "arguments": [ "opcode == BeamOpcode.get_list" ], "filename": "src/erjang/beam/CompilerVisitor.java", "implementation": "push(ys[0], ECONS_TYPE);\n\t\t\t\t\tmv.visitInsn(DUP);\n\t\t\t\t\tmv.visitMethodInsn(INVOKEVIRTUAL, ECONS_TYPE\n\t\t\t\t\t\t\t.getInternalName(), \"head\", \"()\"\n\t\t\t\t\t\t\t+ EOBJECT_TYPE.getDescriptor());\n\t\t\t\t\tpop(ys[1], EOBJECT_TYPE);\n\t\t\t\t\tmv.visitMethodInsn(INVOKEVIRTUAL, ECONS_TYPE\n\t\t\t\t\t\t\t.getInternalName(), \"tail\", \"()\"\n\t\t\t\t\t\t\t+ EOBJECT_TYPE.getDescriptor());\n\t\t\t\t\tpop(ys[2], EOBJECT_TYPE);\n\t\t\t\t\treturn;", "signature": "else if (opcode == BeamOpcode.get_list)" }, { "arguments": [ "opcode == BeamOpcode.apply" ], "filename": "src/erjang/beam/CompilerVisitor.java", "implementation": "for (int i = 0; i < ys.length; i++) {\n\t\t\t\t\t\tpush(ys[i], EOBJECT_TYPE);", "signature": "else if (opcode == BeamOpcode.apply)" }, { "arguments": [ "opcode == BeamOpcode.apply_last" ], "filename": "src/erjang/beam/CompilerVisitor.java", "implementation": "for (int i = 0; i < ys.length; i++) {\n\t\t\t\t\t\tpush(ys[i], EOBJECT_TYPE);", "signature": "else if (opcode == BeamOpcode.apply_last)" }, { "arguments": [ "opcode == BeamOpcode.send" ], "filename": "src/erjang/beam/CompilerVisitor.java", "implementation": "for (int i = 0; i < ys.length; i++) {\n\t\t\t\t\t\tpush(ys[i], EOBJECT_TYPE);", "signature": "else if (opcode == BeamOpcode.send)" }, { "arguments": [ "BeamOpcode opcode", " ExtFunc efun", "\n\t\t\t\t\tArg[] freevars" ], "filename": "src/erjang/beam/CompilerVisitor.java", "implementation": "if (opcode == BeamOpcode.make_fun2) {\n\n\t\t\t\t\tString funtype = EFUN_TYPE.getInternalName() + efun.no;\n\t\t\t\t\tfor (int i = 0; i < freevars.length; i++) {\n\t\t\t\t\t\tpush(freevars[i], EOBJECT_TYPE);", "signature": "void visitInsn(BeamOpcode opcode, ExtFunc efun,\n\t\t\t\t\tArg[] freevars)" }, { "arguments": [ "Arg in", " int failLabel", " Arg[] values", "\n\t\t\t\t\tint[] targets" ], "filename": "src/erjang/beam/CompilerVisitor.java", "implementation": "int[] hash = new int[values.length];\n\t\t\t\tLabel[] label = new Label[values.length];\n\t\t\t\tfor (int i = 0; i < values.length; i++) {\n\t\t\t\t\thash[i] = values[i].value.hashCode();\n\t\t\t\t\tlabel[i] = new Label();", "signature": "void visitSelectValue(Arg in, int failLabel, Arg[] values,\n\t\t\t\t\tint[] targets)" }, { "arguments": [ "Arg in", " int failLabel", " int[] arities", "\n\t\t\t\t\tint[] targets" ], "filename": "src/erjang/beam/CompilerVisitor.java", "implementation": "push(in, ETUPLE_TYPE);\n\n\t\t\t\tmv.visitMethodInsn(INVOKEVIRTUAL,\n\t\t\t\t\t\tETUPLE_TYPE.getInternalName(), \"count\", \"()I\");\n\n\t\t\t\tLabel[] targetLabels = new Label[targets.length];\n\t\t\t\tfor (int i = 0; i < targets.length; i++) {\n\t\t\t\t\ttargetLabels[i] = new Label();", "signature": "void visitSelectTuple(Arg in, int failLabel, int[] arities,\n\t\t\t\t\tint[] targets)" }, { "arguments": [ "int label" ], "filename": "src/erjang/beam/CompilerVisitor.java", "implementation": "mv.visitJumpInsn(GOTO, getLabel(label));", "signature": "void visitJump(int label)" }, { "arguments": [ "int i" ], "filename": "src/erjang/beam/CompilerVisitor.java", "implementation": "return Type.getType(\"L\" + ETUPLE_TYPE.getInternalName() + i\n\t\t\t\t\t\t+ \";\");", "signature": "Type getTubleType(int i)" } ], "old_code": "import erjang.modules.ErlangModule;\n\tECons atts = EList.EMPTY;\n\t\tcv.visit(V1_5, ACC_PUBLIC, self_type.getInternalName(), null,\n\t\tString internalEMname = ErlangModule.class.getName().replace('.', '/');\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\tthrow new Error();\n\t\t\t\t\tmv.visitTypeInsn(NEW, EINTEGER_TYPE.getInternalName());\n\t\t\t\t\tmv.visitInsn(DUP);\n\t\t\t\t\tmv.visitMethodInsn(INVOKESPECIAL, EINTEGER_TYPE\n\t\t\t\t\t\t\t.getInternalName(), \"<init>\", \"(I)V\");\n\t\t\t\t\tmv.visitTypeInsn(NEW, EDOUBLE_TYPE.getInternalName());\n\t\t\t\t\tmv.visitInsn(DUP);\n\t\t\t\t\tmv.visitMethodInsn(INVOKESPECIAL, EDOUBLE_TYPE\n\t\t\t\t\t\t\t.getInternalName(), \"<init>\", \"(D)V\");\n\t\t\t\t\tLabel true_case = new Label();\n\t\t\t\t\tLabel end_case = new Label();\n\n\t\t\t\t\tmv.visitJumpInsn(IFEQ, true_case);\n\t\t\t\t\tmv.visitFieldInsn(GETSTATIC, ERT_TYPE.getInternalName(),\n\t\t\t\t\t\t\t\"FALSE\", EATOM_TYPE.getInternalName());\n\t\t\t\t\tmv.visitJumpInsn(GOTO, end_case);\n\t\t\t\t\tmv.visitLabel(true_case);\n\t\t\t\t\tmv.visitFieldInsn(GETSTATIC, ERT_TYPE.getInternalName(),\n\t\t\t\t\t\t\t\"TRUE\", EATOM_TYPE.getInternalName());\n\t\t\t\t\tmv.visitLabel(end_case);\n\n\t\t\tMap<ETerm,String> constants = new HashMap<ETerm,String>(); \n\t\t\t\n\t\t\t\t\n\t\t\t\t\tconstants.put(value, known = \"cp$\" + constants.size());\n\t\t\t\t\n\t\t\t\t\tmv.visitFieldInsn(GETSTATIC, self_type.getInternalName(), known, type.getDescriptor());\n\t\t\t\t\n\t\t\t\tthrow new Error(\"cannot push \"+value + \" as \"+stack_type);\n\t\t\t\tthrow new Error();\n\t\t\t\tpush(arg1, test_bif.getArgumentTypes()[0]);\n\t\t\t\t\t// guard\n\t\t\t\t\tif (returnType.getSort() != Type.OBJECT)\n\t\t\t\t\t\tthrow new Error(\"guards must return object type\");\n\t\t\t\t\t// dup result for test\n\t\t\t\t\tif (arg1 != null) {\n\t\t\t\t\t\tpop(arg1, returnType);\n\t\t\t\t\t\tpush(new Arg(arg1, returnType), returnType);\n\t\t\t\t\tmv.visitJumpInsn(IFNULL, getLabel(failLabel));\n\t\t\t\t\tif (bif.getReturnType().getSort() != Type.OBJECT)\n\t\t\t\t\t\tthrow new Error(\"guards must return object type\");\n\t\t\t\t\tif (out != null) {\n\t\t\t\t\t\tpop(out, bif.getReturnType());\n\t\t\t\t\t\tpush(out, bif.getReturnType());\n\t\t\t\t\tmv.visitJumpInsn(IFNULL, getLabel(failLabel));\n\t\t\t\t\t\t\n\t\t\t\t\t\t\tpop(arg2, EDOUBLE_TYPE);\t\t\t\t\t\t\t\n\t\t\t\t\t\t\tpop(arg2, arg1.type);\t\t\t\t\t\t\t\n\n\t\t\t\tif (!EOBJECT_TYPE.equals(type)) {\n\t\t\t\t\t\t\tfield, EFUN_TYPE.getDescriptor());\n\t\t\t\t\tmv.visitMethodInsn(INVOKEVIRTUAL, EFUN_TYPE\n\t\t\t\t\t\t\t.getInternalName(), is_tail ? \"invoke_tail\"\n\t\t\t\t\t\t\t: \"invoke\", EUtil.getSignature(args.length));\n\t\t\t.getMethod(\"erjang.ESeq asSeq()\");\n\tstatic Method IS_LIST_TEST = Method.getMethod(\"erjang.ECons asCons()\");\n\tstatic Method IS_NIL_TEST = Method.getMethod(\"erjang.ENil asNil()\");", "old_methods": [], "patch": "@@ -48,20 +48,22 @@\n import erjang.EPort;\n import erjang.ERT;\n import erjang.ESeq;\n+import erjang.EString;\n import erjang.ETerm;\n import erjang.ETuple;\n import erjang.ETuple2;\n import erjang.ErlFun;\n import erjang.Module;\n+import erjang.NotImplemented;\n import erjang.beam.Arg.Kind;\n-import erjang.modules.ErlangModule;\n+import erjang.modules.erl_bif;\n \n /**\n * \n */\n public class CompilerVisitor implements ModuleVisitor, Opcodes {\n \n-\tECons atts = EList.EMPTY;\n+\tECons atts = EList.NIL;\n \tprivate Set<String> exported = new HashSet<String>();\n \n \tprivate final ClassVisitor cv;\n@@ -122,7 +124,7 @@ public void visitModule(EAtom name) {\n \n \t\tthis.self_type = Type.getObjectType(getInternalClassName());\n \n-\t\tcv.visit(V1_5, ACC_PUBLIC, self_type.getInternalName(), null,\n+\t\tcv.visit(V1_6, ACC_PUBLIC, self_type.getInternalName(), null,\n \t\t\t\tEMODULE_TYPE.getInternalName(), null);\n \n \t\tadd_module_annotation(cv);\n@@ -141,7 +143,7 @@ private void add_module_annotation(ClassVisitor cv) {\n \tprivate String getInternalClassName() {\n \t\tString cn = EUtil.toJavaIdentifier(getModuleName());\n \n-\t\tString internalEMname = ErlangModule.class.getName().replace('.', '/');\n+\t\tString internalEMname = erl_bif.class.getName().replace('.', '/');\n \t\tint idx = internalEMname.lastIndexOf('/');\n \t\tString prefix = internalEMname.substring(0, idx + 1);\n \t\treturn prefix + cn;\n@@ -154,6 +156,8 @@ private String getModuleName() {\n \t\treturn module_name.getName();\n \t}\n \n+\tMap<ETerm, String> constants = new HashMap<ETerm, String>();\n+\n \t/*\n \t * (non-Javadoc)\n \t * \n@@ -211,6 +215,9 @@ class ASMFunctionAdapter implements FunctionVisitor2 {\n \t\tprivate int[] xregs;\n \t\tprivate int[] yregs;\n \t\tprivate int[] fpregs;\n+\t\tprivate Label start;\n+\t\tprivate Label end;\n+\t\tprivate int scratch_reg;\n \n \t\tLabel getLabel(int i) {\n \t\t\tif (i <= 0)\n@@ -246,9 +253,14 @@ public void visitMaxs(int x_count, int y_count, int fp_count,\n \n \t\t\tadd_erlfun_annotation(mv);\n \n+\t\t\tthis.start = new Label();\n+\t\t\tthis.end = new Label();\n+\n \t\t\tallocate_regs_to_locals(x_count, y_count, fp_count);\n \n \t\t\tmv.visitCode();\n+\t\t\tmv.visitLabel(start);\n+\n \t\t\tmv.visitJumpInsn(GOTO, getLabel(startLabel));\n \t\t}\n \n@@ -259,6 +271,8 @@ public void visitMaxs(int x_count, int y_count, int fp_count,\n \t\t */\n \t\t@Override\n \t\tpublic void visitEnd() {\n+\t\t\tmv.visitMaxs(20, scratch_reg + 1);\n+\t\t\tmv.visitLabel(end);\n \t\t\tmv.visitEnd();\n \t\t}\n \n@@ -277,22 +291,32 @@ private void allocate_regs_to_locals(int xCount, int yCount, int fpCount) {\n \n \t\t\txregs = new int[max_x];\n \t\t\tfor (int i = 0; i < max_x; i++) {\n+\t\t\t\tmv.visitLocalVariable(\"X\" + i, EOBJECT_TYPE.getDescriptor(),\n+\t\t\t\t\t\tnull, start, end, local);\n \t\t\t\txregs[i] = local;\n \t\t\t\tlocal += 1;\n+\n \t\t\t}\n \n \t\t\tyregs = new int[max_y];\n \t\t\tfor (int i = 0; i < max_y; i++) {\n+\t\t\t\tmv.visitLocalVariable(\"Y\" + i, EOBJECT_TYPE.getDescriptor(),\n+\t\t\t\t\t\tnull, start, end, local);\n \t\t\t\tyregs[i] = local;\n \t\t\t\tlocal += 1;\n \t\t\t}\n \n \t\t\tfpregs = new int[max_f];\n \t\t\tfor (int i = 0; i < max_f; i++) {\n+\t\t\t\tmv.visitLocalVariable(\"F\" + i,\n+\t\t\t\t\t\tType.DOUBLE_TYPE.getDescriptor(), null, start, end,\n+\t\t\t\t\t\tlocal);\n \t\t\t\tfpregs[i] = local;\n \t\t\t\tlocal += 2;\n \t\t\t}\n \n+\t\t\tthis.scratch_reg = local;\n+\n \t\t}\n \n \t\tprivate void add_erlfun_annotation(MethodVisitor mv) {\n@@ -354,6 +378,7 @@ public void visitInsn(BeamOpcode opcode, int failLabel, Arg[] in,\n \t\t\t\t\t\t\tpop(out, bif.getReturnType());\n \t\t\t\t\t\t\tpush(out, bif.getReturnType());\n \t\t\t\t\t\t}\n+\n \t\t\t\t\t\tmv.visitJumpInsn(IFNULL, getLabel(failLabel));\n \t\t\t\t\t} else {\n \t\t\t\t\t\tpop(out, bif.getReturnType());\n@@ -402,11 +427,11 @@ private void pop(Arg out, Type stack_type) {\n \t\t\t\tif (out.kind == Kind.X || out.kind == Kind.Y) {\n \t\t\t\t\tmv.visitVarInsn(ASTORE, var_index(out));\n \t\t\t\t} else if (out.kind == Kind.F) {\n-\t\t\t\t\t\n+\n \t\t\t\t\tif (!stack_type.equals(Type.DOUBLE_TYPE)) {\n \t\t\t\t\t\temit_convert(stack_type, Type.DOUBLE_TYPE);\n \t\t\t\t\t}\n-\t\t\t\t\t\n+\n \t\t\t\t\tmv.visitVarInsn(FSTORE, var_index(out));\n \t\t\t\t} else {\n \t\t\t\t\tthrow new Error();\n@@ -455,7 +480,28 @@ private void emit_unbox(Type fromType, Type toType) {\n \t\t\t\t\t}\n \t\t\t\t}\n \n-\t\t\t\tthrow new Error();\n+\t\t\t\tmv.visitMethodInsn(INVOKESTATIC, ERT_TYPE.getInternalName(),\n+\t\t\t\t\t\t\"unbox\" + primTypeName(toType), \"(\"\n+\t\t\t\t\t\t\t\t+ fromType.getDescriptor() + \")\"\n+\t\t\t\t\t\t\t\t+ toType.getDescriptor());\n+\n+\t\t\t}\n+\n+\t\t\t/**\n+\t\t\t * @param toType\n+\t\t\t * @return\n+\t\t\t */\n+\t\t\tprivate String primTypeName(Type typ) {\n+\t\t\t\tswitch (typ.getSort()) {\n+\t\t\t\tcase Type.DOUBLE:\n+\t\t\t\t\treturn \"Double\";\n+\t\t\t\tcase Type.INT:\n+\t\t\t\t\treturn \"Integer\";\n+\t\t\t\tcase Type.BOOLEAN:\n+\t\t\t\t\treturn \"Atom\";\n+\t\t\t\tdefault:\n+\t\t\t\t\tthrow new Error();\n+\t\t\t\t}\n \t\t\t}\n \n \t\t\t/**\n@@ -465,30 +511,22 @@ private void emit_unbox(Type fromType, Type toType) {\n \t\t\tprivate void emit_box(Type fromType, Type toType) {\n \t\t\t\tif (fromType.equals(Type.INT_TYPE)\n \t\t\t\t\t\t&& toType.getSort() == Type.OBJECT) {\n-\t\t\t\t\tmv.visitTypeInsn(NEW, EINTEGER_TYPE.getInternalName());\n-\t\t\t\t\tmv.visitInsn(DUP);\n-\t\t\t\t\tmv.visitMethodInsn(INVOKESPECIAL, EINTEGER_TYPE\n-\t\t\t\t\t\t\t.getInternalName(), \"<init>\", \"(I)V\");\n+\t\t\t\t\tmv.visitMethodInsn(INVOKESTATIC,\n+\t\t\t\t\t\t\tERT_TYPE.getInternalName(), \"box\", \"(\"\n+\t\t\t\t\t\t\t\t\t+ fromType.getDescriptor() + \")\"\n+\t\t\t\t\t\t\t\t\t+ toType.getDescriptor());\n \t\t\t\t} else if (fromType.equals(Type.DOUBLE_TYPE)\n \t\t\t\t\t\t&& toType.getSort() == Type.OBJECT) {\n-\t\t\t\t\tmv.visitTypeInsn(NEW, EDOUBLE_TYPE.getInternalName());\n-\t\t\t\t\tmv.visitInsn(DUP);\n-\t\t\t\t\tmv.visitMethodInsn(INVOKESPECIAL, EDOUBLE_TYPE\n-\t\t\t\t\t\t\t.getInternalName(), \"<init>\", \"(D)V\");\n+\t\t\t\t\tmv.visitMethodInsn(INVOKESTATIC,\n+\t\t\t\t\t\t\tERT_TYPE.getInternalName(), \"box\", \"(\"\n+\t\t\t\t\t\t\t\t\t+ fromType.getDescriptor() + \")\"\n+\t\t\t\t\t\t\t\t\t+ toType.getDescriptor());\n \t\t\t\t} else if (fromType.equals(Type.BOOLEAN_TYPE)\n \t\t\t\t\t\t&& toType.getSort() == Type.OBJECT) {\n-\t\t\t\t\tLabel true_case = new Label();\n-\t\t\t\t\tLabel end_case = new Label();\n-\n-\t\t\t\t\tmv.visitJumpInsn(IFEQ, true_case);\n-\t\t\t\t\tmv.visitFieldInsn(GETSTATIC, ERT_TYPE.getInternalName(),\n-\t\t\t\t\t\t\t\"FALSE\", EATOM_TYPE.getInternalName());\n-\t\t\t\t\tmv.visitJumpInsn(GOTO, end_case);\n-\t\t\t\t\tmv.visitLabel(true_case);\n-\t\t\t\t\tmv.visitFieldInsn(GETSTATIC, ERT_TYPE.getInternalName(),\n-\t\t\t\t\t\t\t\"TRUE\", EATOM_TYPE.getInternalName());\n-\t\t\t\t\tmv.visitLabel(end_case);\n-\n+\t\t\t\t\tmv.visitMethodInsn(INVOKESTATIC,\n+\t\t\t\t\t\t\tERT_TYPE.getInternalName(), \"box\", \"(\"\n+\t\t\t\t\t\t\t\t\t+ fromType.getDescriptor() + \")\"\n+\t\t\t\t\t\t\t\t\t+ toType.getDescriptor());\n \t\t\t\t} else {\n \t\t\t\t\tthrow new Error(\"cannot box \" + fromType + \" -> \" + toType);\n \t\t\t\t}\n@@ -526,15 +564,31 @@ private void push(Arg value, Type stack_type) {\n \t\t\t\t}\n \t\t\t}\n \n-\t\t\tMap<ETerm,String> constants = new HashMap<ETerm,String>(); \n-\t\t\t\n \t\t\t/**\n \t\t\t * @param value\n \t\t\t * @param stack_type\n \t\t\t * TODO\n \t\t\t */\n \t\t\tprivate Type push_immediate(ETerm value, Type stack_type) {\n \n+\t\t\t\tif (value == ENil.NIL) {\n+\t\t\t\t\tmv.visitFieldInsn(GETSTATIC, ENIL_TYPE.getInternalName(),\n+\t\t\t\t\t\t\t\"NIL\", ENIL_TYPE.getDescriptor());\n+\t\t\t\t\treturn ENIL_TYPE;\n+\t\t\t\t}\n+\n+\t\t\t\tif (value == ERT.ATOM_TRUE) {\n+\t\t\t\t\tmv.visitFieldInsn(GETSTATIC, ERT_TYPE.getInternalName(),\n+\t\t\t\t\t\t\t\"ATOM_TRUE\", EATOM_TYPE.getDescriptor());\n+\t\t\t\t\treturn EATOM_TYPE;\n+\t\t\t\t}\n+\n+\t\t\t\tif (value == ERT.ATOM_FALSE) {\n+\t\t\t\t\tmv.visitFieldInsn(GETSTATIC, ERT_TYPE.getInternalName(),\n+\t\t\t\t\t\t\t\"ATOM_FALSE\", EATOM_TYPE.getDescriptor());\n+\t\t\t\t\treturn EATOM_TYPE;\n+\t\t\t\t}\n+\n \t\t\t\tif (stack_type.getSort() != Type.OBJECT) {\n \t\t\t\t\tif (value instanceof EInteger) {\n \t\t\t\t\t\tmv.visitLdcInsn(new Integer(value.asInt()));\n@@ -553,22 +607,73 @@ private Type push_immediate(ETerm value, Type stack_type) {\n \t\t\t\t}\n \n \t\t\t\tString known = constants.get(value);\n-\t\t\t\t\n+\n \t\t\t\tif (known == null) {\n-\t\t\t\t\tconstants.put(value, known = \"cp$\" + constants.size());\n+\t\t\t\t\tType type = Type.getType(value.getClass());\n+\n+\t\t\t\t\tString cn = getConstantName(value, constants.size());\n+\n+\t\t\t\t\tconstants.put(value, known = cn);\n+\t\t\t\t\tcv.visitField(ACC_STATIC, known, type.getDescriptor(),\n+\t\t\t\t\t\t\tnull, null);\n+\n+\t\t\t\t\tSystem.err.println(constants);\n \t\t\t\t}\n-\t\t\t\t\n+\n \t\t\t\tif (known != null) {\n \t\t\t\t\tType type = Type.getType(value.getClass());\n-\t\t\t\t\tmv.visitFieldInsn(GETSTATIC, self_type.getInternalName(), known, type.getDescriptor());\n+\t\t\t\t\tmv.visitFieldInsn(GETSTATIC, self_type.getInternalName(),\n+\t\t\t\t\t\t\tknown, type.getDescriptor());\n \t\t\t\t\treturn type;\n \t\t\t\t}\n-\t\t\t\t\n-\t\t\t\tthrow new Error(\"cannot push \"+value + \" as \"+stack_type);\n+\n+\t\t\t\tthrow new Error(\"cannot push \" + value + \" as \" + stack_type);\n \n \t\t\t\t// return Type.getType(value.getClass());\n \t\t\t}\n \n+\t\t\t/**\n+\t\t\t * @param value\n+\t\t\t * @param size\n+\t\t\t * @return\n+\t\t\t */\n+\t\t\tprivate String getConstantName(ETerm value, int size) {\n+\t\t\t\tif (value instanceof EAtom)\n+\t\t\t\t\treturn \"atom_\" + EUtil.toJavaIdentifier((EAtom) value);\n+\t\t\t\tif (value instanceof ENumber)\n+\t\t\t\t\treturn EUtil.toJavaIdentifier(\"num_\"\n+\t\t\t\t\t\t\t+ value.toString().replace('.', '_').replace('-',\n+\t\t\t\t\t\t\t\t\t'_'));\n+\t\t\t\tif (value instanceof EString)\n+\t\t\t\t\treturn \"str_\" + size;\n+\t\t\t\telse\n+\t\t\t\t\treturn \"cst_\" + size;\n+\t\t\t}\n+\n+\t\t\t/*\n+\t\t\t * (non-Javadoc)\n+\t\t\t * \n+\t\t\t * @see erjang.beam.BlockVisitor2#visitInsn(erjang.beam.BeamOpcode,\n+\t\t\t * erjang.beam.Arg[], erjang.beam.Arg)\n+\t\t\t */\n+\t\t\t@Override\n+\t\t\tpublic void visitInsn(BeamOpcode opcode, Arg[] in, Arg out) {\n+\t\t\t\tswitch (opcode) {\n+\t\t\t\tcase put_list:\n+\t\t\t\t\tpush(in[0], EOBJECT_TYPE);\n+\t\t\t\t\tpush(in[1], EOBJECT_TYPE);\n+\t\t\t\t\tmv.visitMethodInsn(INVOKESTATIC,\n+\t\t\t\t\t\t\tERT_TYPE.getInternalName(), \"cons\", \"(\"\n+\t\t\t\t\t\t\t\t\t+ EOBJECT_TYPE.getDescriptor()\n+\t\t\t\t\t\t\t\t\t+ EOBJECT_TYPE.getDescriptor() + \")\"\n+\t\t\t\t\t\t\t\t\t+ ECONS_TYPE.getDescriptor());\n+\t\t\t\t\tpop(out, ECONS_TYPE);\n+\t\t\t\t\treturn;\n+\t\t\t\t}\n+\n+\t\t\t\tthrow new Error();\n+\t\t\t}\n+\n \t\t\t/*\n \t\t\t * (non-Javadoc)\n \t\t\t * \n@@ -578,14 +683,86 @@ private Type push_immediate(ETerm value, Type stack_type) {\n \t\t\tpublic void visitInsn(BeamOpcode insn) {\n \t\t\t\tswitch (insn) {\n \t\t\t\tcase K_return:\n+\t\t\t\t\tmv.visitVarInsn(ALOAD, 0);\n \t\t\t\t\tmv.visitInsn(ARETURN);\n \t\t\t\t\treturn;\n \n+\t\t\t\tcase if_end:\n+\t\t\t\t\tmv.visitMethodInsn(INVOKESTATIC,\n+\t\t\t\t\t\t\tERT_TYPE.getInternalName(), \"if_end\", EUtil\n+\t\t\t\t\t\t\t\t\t.getSignature(0));\n+\t\t\t\t\tmv.visitInsn(ARETURN);\n+\t\t\t\t\treturn;\n+\n+\t\t\t\t}\n+\n+\t\t\t\tthrow new Error();\n+\t\t\t}\n+\n+\t\t\t/*\n+\t\t\t * (non-Javadoc)\n+\t\t\t * \n+\t\t\t * @see erjang.beam.BlockVisitor2#visitInsn(erjang.beam.BeamOpcode,\n+\t\t\t * int, erjang.beam.Arg)\n+\t\t\t */\n+\t\t\t@Override\n+\t\t\tpublic void visitInsn(BeamOpcode opcode, int val, Arg out) {\n+\t\t\t\tswitch (opcode) {\n+\t\t\t\tcase put_tuple:\n+\t\t\t\t\tmv.visitTypeInsn(NEW, out.type.getInternalName());\n+\t\t\t\t\tmv.visitInsn(DUP);\n+\t\t\t\t\tmv.visitMethodInsn(INVOKESPECIAL, out.type\n+\t\t\t\t\t\t\t.getInternalName(), \"<init>\", \"()V\");\n+\t\t\t\t\tpop(out, out.type);\n+\n+\t\t\t\t\treturn;\n+\t\t\t\t}\n+\t\t\t\tthrow new Error();\n+\t\t\t}\n+\n+\t\t\t/*\n+\t\t\t * (non-Javadoc)\n+\t\t\t * \n+\t\t\t * @see erjang.beam.BlockVisitor2#visitInsn(erjang.beam.BeamOpcode,\n+\t\t\t * erjang.beam.Arg, erjang.beam.Arg, int)\n+\t\t\t */\n+\t\t\t@Override\n+\t\t\tpublic void visitInsn(BeamOpcode opcode, Arg val, Arg out, int pos) {\n+\t\t\t\tif (opcode == BeamOpcode.put) {\n+\t\t\t\t\tpush(out, out.type);\n+\t\t\t\t\tpush(val, EOBJECT_TYPE);\n+\t\t\t\t\tmv.visitFieldInsn(PUTFIELD, out.type.getInternalName(),\n+\t\t\t\t\t\t\t\"elm\" + pos, EOBJECT_TYPE.getDescriptor());\n+\t\t\t\t\treturn;\n+\n+\t\t\t\t} else if (opcode == BeamOpcode.get_tuple_element) {\n+\t\t\t\t\tpush(val, val.type);\n+\t\t\t\t\tmv.visitFieldInsn(GETFIELD, val.type.getInternalName(),\n+\t\t\t\t\t\t\t\"elm\" + pos, EOBJECT_TYPE.getDescriptor());\n+\t\t\t\t\tpop(out, EOBJECT_TYPE);\n+\t\t\t\t\treturn;\n+\t\t\t\t} else if (opcode == BeamOpcode.set_tuple_element) {\n+\t\t\t\t\tpush(out, out.type);\n+\t\t\t\t\tpush(val, val.type);\n+\t\t\t\t\tmv.visitFieldInsn(PUTFIELD, val.type.getInternalName(),\n+\t\t\t\t\t\t\t\"elm\" + pos, EOBJECT_TYPE.getDescriptor());\n+\t\t\t\t\treturn;\n \t\t\t\t}\n \n \t\t\t\tthrow new Error();\n \t\t\t}\n \n+\t\t\t/**\n+\t\t\t * @param pos\n+\t\t\t */\n+\t\t\tprivate void push_int(int pos) {\n+\t\t\t\tif (pos >= -1 && pos <= 5) {\n+\t\t\t\t\tmv.visitInsn(ICONST_0 + pos);\n+\t\t\t\t} else {\n+\t\t\t\t\tmv.visitLdcInsn(new Integer(pos));\n+\t\t\t\t}\n+\t\t\t}\n+\n \t\t\t/*\n \t\t\t * (non-Javadoc)\n \t\t\t * \n@@ -627,7 +804,44 @@ public void visitInsn(BeamOpcode opcode, ETuple et) {\n \t\t\t */\n \t\t\t@Override\n \t\t\tpublic void visitInsn(BeamOpcode opcode, Arg arg) {\n-\t\t\t\tthrow new Error();\n+\t\t\t\tswitch (opcode) {\n+\t\t\t\tcase func_info:\n+\t\t\t\t\tExtFunc f = (ExtFunc) arg;\n+\t\t\t\t\tpush_immediate(f.mod, EATOM_TYPE);\n+\t\t\t\t\tpush_immediate(f.fun, EATOM_TYPE);\n+\t\t\t\t\tmv.visitLdcInsn(new Integer(arg.no));\n+\t\t\t\t\tmv.visitMethodInsn(INVOKESTATIC,\n+\t\t\t\t\t\t\tERT_TYPE.getInternalName(), \"func_info\", \"(\"\n+\t\t\t\t\t\t\t\t\t+ ETUPLE_TYPE.getDescriptor()\n+\t\t\t\t\t\t\t\t\t+ ETUPLE_TYPE.getDescriptor() + \"I)\"\n+\t\t\t\t\t\t\t\t\t+ EOBJECT_TYPE.getDescriptor());\n+\t\t\t\t\tmv.visitInsn(ARETURN);\n+\t\t\t\t\treturn;\n+\n+\t\t\t\tcase init:\n+\t\t\t\t\tpush_immediate(ENil.NIL, ENIL_TYPE);\n+\t\t\t\t\tpop(arg, ENIL_TYPE);\n+\t\t\t\t\treturn;\n+\n+\t\t\t\tcase case_end:\n+\t\t\t\t\tpush(arg, EOBJECT_TYPE);\n+\t\t\t\t\tmv.visitMethodInsn(INVOKESTATIC,\n+\t\t\t\t\t\t\tERT_TYPE.getInternalName(), \"case_end\", EUtil\n+\t\t\t\t\t\t\t\t\t.getSignature(1));\n+\t\t\t\t\tmv.visitInsn(ARETURN);\n+\t\t\t\t\treturn;\n+\n+\t\t\t\tcase badmatch:\n+\t\t\t\t\tpush(arg, EOBJECT_TYPE);\n+\t\t\t\t\tmv.visitMethodInsn(INVOKESTATIC,\n+\t\t\t\t\t\t\tERT_TYPE.getInternalName(), \"badmatch\", EUtil\n+\t\t\t\t\t\t\t\t\t.getSignature(1));\n+\t\t\t\t\tmv.visitInsn(ARETURN);\n+\t\t\t\t\treturn;\n+\n+\t\t\t\t}\n+\n+\t\t\t\tthrow new Error(\"unhandled \" + opcode);\n \t\t\t}\n \n \t\t\t/*\n@@ -641,30 +855,65 @@ public void visitTest(BeamOpcode test, int failLabel, Arg arg1,\n \t\t\t\t\tType out) {\n \t\t\t\tMethod test_bif = get_test_bif(test, arg1.type);\n \n-\t\t\t\tpush(arg1, test_bif.getArgumentTypes()[0]);\n+\t\t\t\tSystem.err.println(test_bif);\n+\n+\t\t\t\tpush(arg1, arg1.type);\n \n \t\t\t\tmv.visitMethodInsn(INVOKEVIRTUAL, EOBJECT_TYPE\n \t\t\t\t\t\t.getInternalName(), test_bif.getName(), test_bif\n \t\t\t\t\t\t.getDescriptor());\n \n \t\t\t\tType returnType = test_bif.getReturnType();\n \t\t\t\tif (failLabel != 0) {\n-\t\t\t\t\t// guard\n-\t\t\t\t\tif (returnType.getSort() != Type.OBJECT)\n-\t\t\t\t\t\tthrow new Error(\"guards must return object type\");\n+\t\t\t\t\tif (returnType.getSort() == Type.BOOLEAN) {\n+\t\t\t\t\t\tmv.visitJumpInsn(IFEQ, getLabel(failLabel));\n+\n+\t\t\t\t\t} else {\n+\n+\t\t\t\t\t\t// guard\n+\t\t\t\t\t\tif (returnType.getSort() != Type.OBJECT)\n+\t\t\t\t\t\t\tthrow new Error(\"guards must return object type\");\n \n-\t\t\t\t\t// dup result for test\n-\t\t\t\t\tif (arg1 != null) {\n-\t\t\t\t\t\tpop(arg1, returnType);\n-\t\t\t\t\t\tpush(new Arg(arg1, returnType), returnType);\n+\t\t\t\t\t\t// dup result for test\n+\t\t\t\t\t\tif (arg1 != null) {\n+\t\t\t\t\t\t\tmv.visitInsn(DUP);\n+\t\t\t\t\t\t\tmv.visitVarInsn(ASTORE, scratch_reg);\n+\t\t\t\t\t\t}\n+\t\t\t\t\t\tmv.visitJumpInsn(IFNULL, getLabel(failLabel));\n+\t\t\t\t\t\tif (arg1 != null) {\n+\t\t\t\t\t\t\tmv.visitVarInsn(ALOAD, scratch_reg);\n+\t\t\t\t\t\t\tpop(arg1, returnType);\n+\t\t\t\t\t\t}\n \t\t\t\t\t}\n-\t\t\t\t\tmv.visitJumpInsn(IFNULL, getLabel(failLabel));\n \t\t\t\t} else {\n \t\t\t\t\tpop(arg1, returnType);\n \t\t\t\t}\n \n \t\t\t}\n \n+\t\t\t/*\n+\t\t\t * (non-Javadoc)\n+\t\t\t * \n+\t\t\t * @see erjang.beam.BlockVisitor2#visitTest(erjang.beam.BeamOpcode,\n+\t\t\t * int, erjang.beam.Arg, int, org.objectweb.asm.Type)\n+\t\t\t */\n+\t\t\t@Override\n+\t\t\tpublic void visitTest(BeamOpcode test, int failLabel, Arg arg,\n+\t\t\t\t\tint arity, Type tupleType) {\n+\n+\t\t\t\tif (test != BeamOpcode.test_arity)\n+\t\t\t\t\tthrow new Error();\n+\n+\t\t\t\tpush(arg, ETUPLE_TYPE);\n+\t\t\t\tmv.visitMethodInsn(INVOKEVIRTUAL,\n+\t\t\t\t\t\tETUPLE_TYPE.getInternalName(), \"count\", \"()I\");\n+\t\t\t\tpush_int(arity);\n+\t\t\t\tmv.visitJumpInsn(IF_ICMPNE, getLabel(failLabel));\n+\t\t\t\tpush(arg, ETUPLE_TYPE);\n+\t\t\t\tmv.visitTypeInsn(CHECKCAST, tupleType.getInternalName());\n+\t\t\t\tpop(arg, tupleType);\n+\t\t\t}\n+\n \t\t\t/*\n \t\t\t * (non-Javadoc)\n \t\t\t * \n@@ -675,6 +924,15 @@ public void visitTest(BeamOpcode test, int failLabel, Arg arg1,\n \t\t\tpublic void visitTest(BeamOpcode test, int failLabel, Arg[] args,\n \t\t\t\t\tArg out, Type outType) {\n \n+\t\t\t\tif (test == BeamOpcode.is_eq_exact\n+\t\t\t\t\t\t&& (args[0].type.equals(EATOM_TYPE) || args[1].type\n+\t\t\t\t\t\t\t\t.equals(EATOM_TYPE))) {\n+\t\t\t\t\tpush(args[0], EOBJECT_TYPE);\n+\t\t\t\t\tpush(args[1], EOBJECT_TYPE);\n+\t\t\t\t\tmv.visitJumpInsn(IF_ACMPNE, getLabel(failLabel));\n+\t\t\t\t\treturn;\n+\t\t\t\t}\n+\n \t\t\t\tBIF bif = BIFUtil.getMethod(test.name(), args, true);\n \n \t\t\t\tfor (int i = 0; i < args.length; i++) {\n@@ -686,15 +944,26 @@ public void visitTest(BeamOpcode test, int failLabel, Arg[] args,\n \n \t\t\t\tif (failLabel != 0) {\n \t\t\t\t\t// guard\n-\t\t\t\t\tif (bif.getReturnType().getSort() != Type.OBJECT)\n-\t\t\t\t\t\tthrow new Error(\"guards must return object type\");\n+\t\t\t\t\tswitch (bif.getReturnType().getSort()) {\n+\t\t\t\t\tcase Type.BOOLEAN:\n+\t\t\t\t\t\tif (out == null) {\n+\t\t\t\t\t\t\tmv.visitJumpInsn(IFEQ, getLabel(failLabel));\n+\t\t\t\t\t\t}\n+\t\t\t\t\t\tbreak;\n \n-\t\t\t\t\tif (out != null) {\n-\t\t\t\t\t\tpop(out, bif.getReturnType());\n-\t\t\t\t\t\tpush(out, bif.getReturnType());\n+\t\t\t\t\tcase Type.OBJECT:\n+\n+\t\t\t\t\t\tif (out != null) {\n+\t\t\t\t\t\t\tpop(out, bif.getReturnType());\n+\t\t\t\t\t\t\tpush(out, bif.getReturnType());\n+\t\t\t\t\t\t}\n+\n+\t\t\t\t\t\tmv.visitJumpInsn(IFNULL, getLabel(failLabel));\n+\t\t\t\t\t\tbreak;\n+\t\t\t\t\tdefault:\n+\t\t\t\t\t\tthrow new Error(\"guards must return object type\");\n \t\t\t\t\t}\n \n-\t\t\t\t\tmv.visitJumpInsn(IFNULL, getLabel(failLabel));\n \t\t\t\t} else {\n \t\t\t\t\tpop(out, bif.getReturnType());\n \t\t\t\t}\n@@ -718,25 +987,24 @@ public void visitInsn(BeamOpcode opcode, Arg arg1, Arg arg2) {\n \t\t\t\tcase fmove:\n \t\t\t\t\tif (arg1.kind == Kind.F) {\n \t\t\t\t\t\tpush(arg1, Type.DOUBLE_TYPE);\n-\t\t\t\t\t\t\n+\n \t\t\t\t\t\tif (arg2.kind == Kind.F) {\n \t\t\t\t\t\t\tpop(arg2, Type.DOUBLE_TYPE);\n \t\t\t\t\t\t} else {\n \t\t\t\t\t\t\temit_convert(Type.DOUBLE_TYPE, EDOUBLE_TYPE);\n-\t\t\t\t\t\t\tpop(arg2, EDOUBLE_TYPE);\t\t\t\t\t\t\t\n+\t\t\t\t\t\t\tpop(arg2, EDOUBLE_TYPE);\n \t\t\t\t\t\t}\n \t\t\t\t\t} else {\n \t\t\t\t\t\tif (arg2.kind == Kind.F) {\n \t\t\t\t\t\t\tpush(arg1, Type.DOUBLE_TYPE);\n \t\t\t\t\t\t\tpop(arg2, Type.DOUBLE_TYPE);\n \t\t\t\t\t\t} else {\n \t\t\t\t\t\t\tpush(arg1, arg1.type);\n-\t\t\t\t\t\t\tpop(arg2, arg1.type);\t\t\t\t\t\t\t\n+\t\t\t\t\t\t\tpop(arg2, arg1.type);\n \t\t\t\t\t\t}\n \t\t\t\t\t}\n \t\t\t\t\tbreak;\n \n-\n \t\t\t\tdefault:\n \t\t\t\t\tthrow new Error(\"unhandled: \" + opcode);\n \t\t\t\t}\n@@ -750,7 +1018,7 @@ public void visitInsn(BeamOpcode opcode, Arg arg1, Arg arg2) {\n \t\t\t */\n \t\t\tprivate Method get_test_bif(BeamOpcode test, Type type) {\n \n-\t\t\t\tif (!EOBJECT_TYPE.equals(type)) {\n+\t\t\t\tif (!type.getInternalName().startsWith(\"erjang/E\")) {\n \t\t\t\t\tthrow new Error(\"expecting EObject\");\n \t\t\t\t}\n \n@@ -759,13 +1027,243 @@ private Method get_test_bif(BeamOpcode test, Type type) {\n \t\t\t\t\treturn IS_NONEMPTY_LIST_TEST;\n \t\t\t\tcase is_nil:\n \t\t\t\t\treturn IS_NIL_TEST;\n+\t\t\t\tcase is_boolean:\n+\t\t\t\t\treturn IS_BOOLEAN_TEST;\n+\t\t\t\tcase is_atom:\n+\t\t\t\t\treturn IS_ATOM_TEST;\n \t\t\t\tcase is_list:\n \t\t\t\t\treturn IS_LIST_TEST;\n+\t\t\t\tcase is_tuple:\n+\t\t\t\t\treturn IS_TUPLE_TEST;\n+\t\t\t\tcase is_integer:\n+\t\t\t\t\treturn IS_INTEGER_TEST;\n \t\t\t\t}\n \n \t\t\t\tthrow new Error(\"unhandled \" + test);\n \t\t\t}\n \n+\t\t\t/*\n+\t\t\t * (non-Javadoc)\n+\t\t\t * \n+\t\t\t * @see erjang.beam.BlockVisitor2#visitInsn(erjang.beam.BeamOpcode,\n+\t\t\t * erjang.beam.Arg[])\n+\t\t\t */\n+\t\t\t@Override\n+\t\t\tpublic void visitInsn(BeamOpcode opcode, Arg[] ys) {\n+\n+\t\t\t\tif (opcode == BeamOpcode.allocate_zero\n+\t\t\t\t\t\t|| opcode == BeamOpcode.allocate_heap_zero) {\n+\n+\t\t\t\t\tmv.visitFieldInsn(GETSTATIC, ENIL_TYPE.getInternalName(),\n+\t\t\t\t\t\t\t\"NIL\", ENIL_TYPE.getDescriptor());\n+\t\t\t\t\tfor (int i = 0; i < ys.length; i++) {\n+\t\t\t\t\t\tif (i != (ys.length - 1))\n+\t\t\t\t\t\t\tmv.visitInsn(DUP);\n+\t\t\t\t\t\tpop(ys[i], ENIL_TYPE);\n+\t\t\t\t\t}\n+\n+\t\t\t\t\treturn;\n+\t\t\t\t} else if (opcode == BeamOpcode.get_list) {\n+\n+\t\t\t\t\tpush(ys[0], ECONS_TYPE);\n+\t\t\t\t\tmv.visitInsn(DUP);\n+\t\t\t\t\tmv.visitMethodInsn(INVOKEVIRTUAL, ECONS_TYPE\n+\t\t\t\t\t\t\t.getInternalName(), \"head\", \"()\"\n+\t\t\t\t\t\t\t+ EOBJECT_TYPE.getDescriptor());\n+\t\t\t\t\tpop(ys[1], EOBJECT_TYPE);\n+\t\t\t\t\tmv.visitMethodInsn(INVOKEVIRTUAL, ECONS_TYPE\n+\t\t\t\t\t\t\t.getInternalName(), \"tail\", \"()\"\n+\t\t\t\t\t\t\t+ EOBJECT_TYPE.getDescriptor());\n+\t\t\t\t\tpop(ys[2], EOBJECT_TYPE);\n+\t\t\t\t\treturn;\n+\n+\t\t\t\t} else if (opcode == BeamOpcode.apply) {\n+\n+\t\t\t\t\tfor (int i = 0; i < ys.length; i++) {\n+\t\t\t\t\t\tpush(ys[i], EOBJECT_TYPE);\n+\t\t\t\t\t}\n+\t\t\t\t\tmv.visitMethodInsn(INVOKESTATIC,\n+\t\t\t\t\t\t\tERT_TYPE.getInternalName(), \"apply\", EUtil\n+\t\t\t\t\t\t\t\t\t.getSignature(ys.length));\n+\t\t\t\t\tmv.visitVarInsn(ASTORE, xregs[0]);\n+\n+\t\t\t\t\treturn;\n+\t\t\t\t\t\n+\t\t\t\t} else if (opcode == BeamOpcode.apply_last) {\n+\n+\t\t\t\t\tfor (int i = 0; i < ys.length; i++) {\n+\t\t\t\t\t\tpush(ys[i], EOBJECT_TYPE);\n+\t\t\t\t\t}\n+\t\t\t\t\tmv.visitMethodInsn(INVOKESTATIC,\n+\t\t\t\t\t\t\tERT_TYPE.getInternalName(), \"apply$last\", EUtil\n+\t\t\t\t\t\t\t\t\t.getSignature(ys.length));\n+\n+\t\t\t\t\tmv.visitInsn(ARETURN);\n+\n+\t\t\t\t\treturn;\n+\t\t\t\t\t\n+\t\t\t\t} else if (opcode == BeamOpcode.send) {\n+\t\t\t\t\tfor (int i = 0; i < ys.length; i++) {\n+\t\t\t\t\t\tpush(ys[i], EOBJECT_TYPE);\n+\t\t\t\t\t}\n+\t\t\t\t\tmv.visitMethodInsn(INVOKESTATIC,\n+\t\t\t\t\t\t\tERT_TYPE.getInternalName(), \"send\", EUtil\n+\t\t\t\t\t\t\t\t\t.getSignature(ys.length));\n+\t\t\t\t\tmv.visitVarInsn(ASTORE, xregs[0]);\n+\n+\t\t\t\t\treturn;\n+\t\t\t\t}\n+\n+\t\t\t\tthrow new Error(\"unhandled:\" + opcode);\n+\t\t\t}\n+\n+\t\t\t/*\n+\t\t\t * (non-Javadoc)\n+\t\t\t * \n+\t\t\t * @see erjang.beam.BlockVisitor2#visitInsn(erjang.beam.BeamOpcode,\n+\t\t\t * erjang.beam.ExtFunc, int)\n+\t\t\t */\n+\t\t\t@Override\n+\t\t\tpublic void visitInsn(BeamOpcode opcode, ExtFunc efun,\n+\t\t\t\t\tArg[] freevars) {\n+\t\t\t\tif (opcode == BeamOpcode.make_fun2) {\n+\n+\t\t\t\t\tString funtype = EFUN_TYPE.getInternalName() + efun.no;\n+\t\t\t\t\tfor (int i = 0; i < freevars.length; i++) {\n+\t\t\t\t\t\tpush(freevars[i], EOBJECT_TYPE);\n+\t\t\t\t\t}\n+\n+\t\t\t\t\tStringBuilder sb = new StringBuilder(\"(\");\n+\t\t\t\t\tfor (int i = 0; i < freevars.length; i++) {\n+\t\t\t\t\t\tsb.append(EOBJECT_TYPE.getDescriptor());\n+\t\t\t\t\t}\n+\t\t\t\t\tsb.append(\")\");\n+\t\t\t\t\tsb.append(\"L\").append(funtype).append(\";\");\n+\t\t\t\t\tString gen_fun_desc = sb.toString();\n+\t\t\t\t\tString gen_fun_name = \"make_fun2_\"\n+\t\t\t\t\t\t\t+ EUtil.getJavaName(efun);\n+\n+\t\t\t\t\tmv.visitMethodInsn(INVOKESTATIC, self_type\n+\t\t\t\t\t\t\t.getInternalName(), gen_fun_name, gen_fun_desc);\n+\n+\t\t\t\t\tmv.visitVarInsn(ASTORE, 0);\n+\n+\t\t\t\t\treturn;\n+\t\t\t\t}\n+\n+\t\t\t\tthrow new Error();\n+\t\t\t}\n+\n+\t\t\t/*\n+\t\t\t * (non-Javadoc)\n+\t\t\t * \n+\t\t\t * @see erjang.beam.BlockVisitor2#visitSelectValue(erjang.beam.Arg,\n+\t\t\t * int, erjang.beam.Arg[], int[])\n+\t\t\t */\n+\t\t\t@Override\n+\t\t\tpublic void visitSelectValue(Arg in, int failLabel, Arg[] values,\n+\t\t\t\t\tint[] targets) {\n+\t\t\t\tint[] hash = new int[values.length];\n+\t\t\t\tLabel[] label = new Label[values.length];\n+\t\t\t\tfor (int i = 0; i < values.length; i++) {\n+\t\t\t\t\thash[i] = values[i].value.hashCode();\n+\t\t\t\t\tlabel[i] = new Label();\n+\t\t\t\t}\n+\n+\t\t\t\tpush(in, EOBJECT_TYPE);\n+\t\t\t\tmv.visitMethodInsn(INVOKEVIRTUAL, \"java/lang/Object\",\n+\t\t\t\t\t\t\"hashCode\", \"()I\");\n+\t\t\t\tmv.visitLookupSwitchInsn(getLabel(failLabel), hash, label);\n+\n+\t\t\t\tfor (int i = 0; i < hash.length; i++) {\n+\t\t\t\t\tint h = hash[i];\n+\t\t\t\t\tfor (int j = i; j < hash.length; j++) {\n+\t\t\t\t\t\tif (h == hash[j] && label[j] != null)\n+\t\t\t\t\t\t\tmv.visitLabel(label[j]);\n+\t\t\t\t\t}\n+\n+\t\t\t\t\tfor (int j = i; j < hash.length; j++) {\n+\t\t\t\t\t\tif (h == hash[j] && label[j] != null) {\n+\n+\t\t\t\t\t\t\tif (values[j].type.equals(EATOM_TYPE)) {\n+\n+\t\t\t\t\t\t\t\tpush(in, in.type);\n+\t\t\t\t\t\t\t\tpush(values[j], values[j].type);\n+\t\t\t\t\t\t\t\tmv.visitJumpInsn(IF_ACMPEQ,\n+\t\t\t\t\t\t\t\t\t\tgetLabel(targets[j]));\n+\n+\t\t\t\t\t\t\t} else {\n+\n+\t\t\t\t\t\t\t\tif (in.type == values[j].type) {\n+\t\t\t\t\t\t\t\t\tpush(in, in.type);\n+\t\t\t\t\t\t\t\t\tpush(values[j], values[j].type);\n+\n+\t\t\t\t\t\t\t\t\tmv.visitMethodInsn(INVOKESTATIC, ERT_TYPE\n+\t\t\t\t\t\t\t\t\t\t\t.getInternalName(), \"eq\", \"(\"\n+\t\t\t\t\t\t\t\t\t\t\t+ in.type.getDescriptor()\n+\t\t\t\t\t\t\t\t\t\t\t+ in.type.getDescriptor() + \")Z\");\n+\t\t\t\t\t\t\t\t} else {\n+\t\t\t\t\t\t\t\t\tpush(in, EOBJECT_TYPE);\n+\t\t\t\t\t\t\t\t\tpush(values[j], EOBJECT_TYPE);\n+\t\t\t\t\t\t\t\t\tmv.visitMethodInsn(INVOKEVIRTUAL,\n+\t\t\t\t\t\t\t\t\t\t\t\"java/lang/Object\", \"equals\",\n+\t\t\t\t\t\t\t\t\t\t\t\"(Ljava/lang/Object;)Z\");\n+\t\t\t\t\t\t\t\t}\n+\t\t\t\t\t\t\t\tmv.visitJumpInsn(IFNE, getLabel(targets[j]));\n+\t\t\t\t\t\t\t}\n+\t\t\t\t\t\t\tlabel[j] = null;\n+\t\t\t\t\t\t}\n+\t\t\t\t\t}\n+\n+\t\t\t\t\tmv.visitJumpInsn(GOTO, getLabel(failLabel));\n+\t\t\t\t}\n+\t\t\t}\n+\n+\t\t\t@Override\n+\t\t\tpublic void visitSelectTuple(Arg in, int failLabel, int[] arities,\n+\t\t\t\t\tint[] targets) {\n+\n+\t\t\t\tpush(in, ETUPLE_TYPE);\n+\n+\t\t\t\tmv.visitMethodInsn(INVOKEVIRTUAL,\n+\t\t\t\t\t\tETUPLE_TYPE.getInternalName(), \"count\", \"()I\");\n+\n+\t\t\t\tLabel[] targetLabels = new Label[targets.length];\n+\t\t\t\tfor (int i = 0; i < targets.length; i++) {\n+\t\t\t\t\ttargetLabels[i] = new Label();\n+\t\t\t\t}\n+\t\t\t\tmv.visitLookupSwitchInsn(getLabel(failLabel), arities,\n+\t\t\t\t\t\ttargetLabels);\n+\t\t\t\tfor (int i = 0; i < targetLabels.length; i++) {\n+\t\t\t\t\tmv.visitLabel(targetLabels[i]);\n+\t\t\t\t\tpush(in, ETUPLE_TYPE);\n+\t\t\t\t\tmv.visitTypeInsn(CHECKCAST, getTubleType(arities[i])\n+\t\t\t\t\t\t\t.getInternalName());\n+\t\t\t\t\tpop(in, getTubleType(arities[i]));\n+\t\t\t\t\tmv.visitJumpInsn(GOTO, getLabel(targets[i]));\n+\t\t\t\t}\n+\n+\t\t\t}\n+\n+\t\t\t/*\n+\t\t\t * (non-Javadoc)\n+\t\t\t * \n+\t\t\t * @see erjang.beam.BlockVisitor2#visitJump(int)\n+\t\t\t */\n+\t\t\t@Override\n+\t\t\tpublic void visitJump(int label) {\n+\t\t\t\tmv.visitJumpInsn(GOTO, getLabel(label));\n+\t\t\t}\n+\n+\t\t\t/**\n+\t\t\t * @param i\n+\t\t\t * @return\n+\t\t\t */\n+\t\t\tprivate Type getTubleType(int i) {\n+\t\t\t\treturn Type.getType(\"L\" + ETUPLE_TYPE.getInternalName() + i\n+\t\t\t\t\t\t+ \";\");\n+\t\t\t}\n+\n \t\t\t/*\n \t\t\t * (non-Javadoc)\n \t\t\t * \n@@ -779,18 +1277,22 @@ public void visitCall(ExtFunc fun, Arg[] args, boolean is_tail,\n \t\t\t\tif (isExternal) {\n \t\t\t\t\tString field = CompilerVisitor.this\n \t\t\t\t\t\t\t.getExternalFunction(fun);\n+\t\t\t\t\tString funTypeName = EFUN_TYPE.getInternalName()\n+\t\t\t\t\t\t\t+ args.length;\n \t\t\t\t\tmv.visitFieldInsn(GETSTATIC, self_type.getInternalName(),\n-\t\t\t\t\t\t\tfield, EFUN_TYPE.getDescriptor());\n+\t\t\t\t\t\t\tfield, \"L\" + funTypeName + \";\");\n \t\t\t\t\tfor (int i = 0; i < args.length; i++) {\n \t\t\t\t\t\tpush(args[i], EOBJECT_TYPE);\n \t\t\t\t\t}\n \n-\t\t\t\t\tmv.visitMethodInsn(INVOKEVIRTUAL, EFUN_TYPE\n-\t\t\t\t\t\t\t.getInternalName(), is_tail ? \"invoke_tail\"\n-\t\t\t\t\t\t\t: \"invoke\", EUtil.getSignature(args.length));\n+\t\t\t\t\tmv.visitMethodInsn(INVOKEVIRTUAL, funTypeName,\n+\t\t\t\t\t\t\tis_tail ? \"invoke_tail\" : \"invoke\", EUtil\n+\t\t\t\t\t\t\t\t\t.getSignature(args.length));\n \n \t\t\t\t\tif (is_tail) {\n \t\t\t\t\t\tmv.visitInsn(ARETURN);\n+\t\t\t\t\t} else {\n+\t\t\t\t\t\tmv.visitVarInsn(ASTORE, 0);\n \t\t\t\t\t}\n \n \t\t\t\t} else {\n@@ -807,6 +1309,8 @@ public void visitCall(ExtFunc fun, Arg[] args, boolean is_tail,\n \n \t\t\t\t\tif (is_tail) {\n \t\t\t\t\t\tmv.visitInsn(ARETURN);\n+\t\t\t\t\t} else {\n+\t\t\t\t\t\tmv.visitVarInsn(ASTORE, 0);\n \t\t\t\t\t}\n \n \t\t\t\t}\n@@ -816,9 +1320,13 @@ public void visitCall(ExtFunc fun, Arg[] args, boolean is_tail,\n \t}\n \n \tstatic Method IS_NONEMPTY_LIST_TEST = Method\n-\t\t\t.getMethod(\"erjang.ESeq asSeq()\");\n-\tstatic Method IS_LIST_TEST = Method.getMethod(\"erjang.ECons asCons()\");\n-\tstatic Method IS_NIL_TEST = Method.getMethod(\"erjang.ENil asNil()\");\n+\t\t\t.getMethod(\"erjang.ECons testNonEmptyList()\");\n+\tstatic Method IS_LIST_TEST = Method.getMethod(\"erjang.ECons testCons()\");\n+\tstatic Method IS_TUPLE_TEST = Method.getMethod(\"erjang.ETuple testTuple()\");\n+\tstatic Method IS_INTEGER_TEST = Method.getMethod(\"erjang.ETuple testInteger()\");\n+\tstatic Method IS_ATOM_TEST = Method.getMethod(\"erjang.ETuple testAtom()\");\n+\tstatic Method IS_NIL_TEST = Method.getMethod(\"boolean isNil()\");\n+\tstatic Method IS_BOOLEAN_TEST = Method.getMethod(\"boolean isBoolean()\");\n \n \tMap<String, ExtFunc> imported = new HashMap<String, ExtFunc>();\n ", "raw_url": "https://github.com/trifork/erjang/raw/070f8a4124a580cd7a140029dee655beeae8540b/src%2Ferjang%2Fbeam%2FCompilerVisitor.java", "sha": "0361c1f81877cf304ad870d7145324f60abc57f0", "status": "modified" }, { "additions": 10, "blob_url": "https://github.com/trifork/erjang/blob/070f8a4124a580cd7a140029dee655beeae8540b/src%2Ferjang%2Fbeam%2FExtFunc.java", "changes": 10, "contents_url": "https://api.github.com/repos/trifork/erjang/contents/src%2Ferjang%2Fbeam%2FExtFunc.java?ref=070f8a4124a580cd7a140029dee655beeae8540b", "deletions": 0, "filename": "src/erjang/beam/ExtFunc.java", "new_code": "import erjang.ETuple;\n\t/**\n\t * @param ext\n\t */\n\tpublic ExtFunc(ETuple ext) {\n\t\tsuper(Kind.EXT_FUNC, ext.elm(3).asInt());\n\t\tthis.mod = ext.elm(1).testAtom();\n\t\tthis.fun = ext.elm(2).testAtom();\n\t}\n", "new_methods": [ { "arguments": [ "ETuple ext" ], "filename": "src/erjang/beam/ExtFunc.java", "implementation": "super(Kind.EXT_FUNC, ext.elm(3).asInt());\n\t\tthis.mod = ext.elm(1).testAtom();\n\t\tthis.fun = ext.elm(2).testAtom();", "signature": "public ExtFunc(ETuple ext)" } ], "old_code": "", "old_methods": [], "patch": "@@ -20,6 +20,7 @@\n package erjang.beam;\n \n import erjang.EAtom;\n+import erjang.ETuple;\n \n /**\n * \n@@ -40,4 +41,13 @@ public ExtFunc(EAtom mod, EAtom fun, int arity) {\n \n \t}\n \n+\t/**\n+\t * @param ext\n+\t */\n+\tpublic ExtFunc(ETuple ext) {\n+\t\tsuper(Kind.EXT_FUNC, ext.elm(3).asInt());\n+\t\tthis.mod = ext.elm(1).testAtom();\n+\t\tthis.fun = ext.elm(2).testAtom();\n+\t}\n+\n }", "raw_url": "https://github.com/trifork/erjang/raw/070f8a4124a580cd7a140029dee655beeae8540b/src%2Ferjang%2Fbeam%2FExtFunc.java", "sha": "536cb3ef544435b981b4f78524b4e37e13e1d7d7", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/trifork/erjang/blob/070f8a4124a580cd7a140029dee655beeae8540b/src%2Ferjang%2Fbeam%2FOtpConverter.java", "changes": 2, "contents_url": "https://api.github.com/repos/trifork/erjang/contents/src%2Ferjang%2Fbeam%2FOtpConverter.java?ref=070f8a4124a580cd7a140029dee655beeae8540b", "deletions": 1, "filename": "src/erjang/beam/OtpConverter.java", "new_code": "\t\t\t\tETerm tail = obj.getLastTail() == null ? EList.NIL", "new_methods": [], "old_code": "\t\t\t\tETerm tail = obj.getLastTail() == null ? EList.EMPTY", "old_methods": [], "patch": "@@ -73,7 +73,7 @@ ETerm conv(OtpErlangTuple obj) {\n \t\tadd(OtpErlangList.class, new Converter<OtpErlangList>() {\n \t\t\t@Override\n \t\t\tETerm conv(OtpErlangList obj) {\n-\t\t\t\tETerm tail = obj.getLastTail() == null ? EList.EMPTY\n+\t\t\t\tETerm tail = obj.getLastTail() == null ? EList.NIL\n \t\t\t\t\t\t: convert(obj.getLastTail());\n \t\t\t\tfor (int i = obj.arity() - 1; i >= 0; i--) {\n \t\t\t\t\ttail = ERT.cons(convert(obj.elementAt(i)), tail);", "raw_url": "https://github.com/trifork/erjang/raw/070f8a4124a580cd7a140029dee655beeae8540b/src%2Ferjang%2Fbeam%2FOtpConverter.java", "sha": "faff42da4473e6cf9789c9c8601b39a434701760", "status": "modified" }, { "additions": 459, "blob_url": "https://github.com/trifork/erjang/blob/070f8a4124a580cd7a140029dee655beeae8540b/src%2Ferjang%2Fbeam%2Fanalysis%2FBeamTypeAnalysis.java", "changes": 636, "contents_url": "https://api.github.com/repos/trifork/erjang/contents/src%2Ferjang%2Fbeam%2Fanalysis%2FBeamTypeAnalysis.java?ref=070f8a4124a580cd7a140029dee655beeae8540b", "deletions": 177, "filename": "src/erjang/beam/analysis/BeamTypeAnalysis.java", "new_code": "\tstatic final ETerm APPLY_ATOM = EAtom.intern(\"apply\");\n\t\t\t\t\tif (BeamOpcode.get(lb.insns.get(0).elm(1).testAtom()) == BeamOpcode.func_info) {\n\t\t\ttry {\n\t\t\t\tif (fv instanceof FunctionVisitor2) {\n\t\t\t\t\t((FunctionVisitor2) fv).visitMaxs(this.max_xreg,\n\t\t\t\t\t\t\tthis.max_stack, this.max_freg,\n\t\t\t\t\t\t\tthis.is_tail_recursive);\n\t\t\t\t}\n\t\t\t\tfor (LabeledBlock block : this.lbs.values()) {\n\t\t\t\t\tBlockVisitor vis = super.fv\n\t\t\t\t\t\t\t.visitLabeledBlock(block.block_label);\n\t\t\t\t\tblock.accept(vis);\n\t\t\t\t}\n\t\t\t} finally {\n\t\t\t\tsuper.fv.visitEnd();\n\t\t\t\ttry {\n\t\t\t\t\tif (!isDeadCode()) {\n\t\t\t\t\t\tif (vis instanceof BlockVisitor2) {\n\t\t\t\t\t\t\taccept_2((BlockVisitor2) vis);\n\t\t\t\t\t\t} else {\n\t\t\t\t\t\t\taccept_1(vis);\n\t\t\t\t\t\t}\n\t\t\t\t\t}\n\t\t\t\t} finally {\n\t\t\t\t\tvis.visitEnd();\n\t\t\t\t\tBeamOpcode opcode = BeamOpcode.get(insn.elm(1).testAtom());\n\t\t\t\tint tuple_pos = 0;\n\t\t\t\tArg tuple_reg = null;\n\n\t\t\t\t\tBeamOpcode opcode = BeamOpcode.get(insn.elm(1).testAtom());\n\t\t\t\t\tTypeMap type_map = this.map[insn_idx];\n\t\t\t\t\t\tSystem.err.print(\"go: \" + insn);\n\t\t\t\t\t\tvis.visitInsn(opcode,\n\t\t\t\t\t\t\t\t(Arg) new ExtFunc(insn.elm(2).testTuple().elm(2)\n\t\t\t\t\t\t\t\t\t\t.testAtom(), insn.elm(3).testTuple().elm(2)\n\t\t\t\t\t\t\t\t\t\t.testAtom(), insn.elm(4).asInt()));\n\n\t\t\t\t\t\tArg arg1 = decode_arg(insn_idx, insn.elm(2));\n\t\t\t\t\t\tArg arg2 = decode_arg(insn_idx, insn.elm(3));\n\n\n\t\t\t\t\tcase arithfbif: {\n\t\t\t\t\t\tSystem.err.println(\"gen: \" + insn);\n\t\t\t\t\t\tEAtom name = insn.elm(2).testAtom();\n\t\t\t\t\t\tint failLabel = decode_labelref(insn.elm(3));\n\t\t\t\t\t\tESeq parms = insn.elm(4).testSeq();\n\t\t\t\t\t\tArg out = decode_out_arg(insn_idx, insn.elm(5));\n\t\t\t\t\tcase bif: {\n\t\t\t\t\t\tSystem.err.println(\"gen: \" + insn);\n\t\t\t\t\t\tEAtom name = insn.elm(2).testAtom();\n\t\t\t\t\t\tint failLabel = decode_labelref(insn.elm(3));\n\t\t\t\t\t\tESeq parms = insn.elm(4).testSeq();\n\t\t\t\t\t\tArg out = decode_out_arg(insn_idx, insn.elm(5));\n\n\t\t\t\t\tcase gc_bif: {\n\t\t\t\t\t\tSystem.err.println(\"gen: \" + insn);\n\t\t\t\t\t\tEAtom name = insn.elm(2).testAtom();\n\t\t\t\t\t\tint failLabel = decode_labelref(insn.elm(3));\n\t\t\t\t\t\tESeq parms = insn.elm(5).testSeq();\n\t\t\t\t\t\tArg[] in = decode_args(insn_idx, parms.toArray());\n\t\t\t\t\t\tArg out = decode_out_arg(insn_idx, insn.elm(6));\n\n\t\t\t\t\t\tBIF bif = BIFUtil.getMethod(name.getName(), parmTypes(\n\t\t\t\t\t\t\t\tthis.map[insn_idx], parms), failLabel != 0);\n\n\t\t\t\t\t\tvis.visitInsn(opcode, failLabel, in, out, bif);\n\t\t\t\t\t\tbreak;\n\t\t\t\t\t}\n\n\n\t\t\t\t\tcase allocate_zero: {\n\t\t\t\t\t\tint depth = type_map.stacksize;\n\t\t\t\t\t\tint count = insn.elm(2).asInt();\n\t\t\t\t\t\tArg[] ys = new Arg[count];\n\t\t\t\t\t\tfor (int i = 0; i < count; i++) {\n\t\t\t\t\t\t\tys[i] = new Arg(Arg.Kind.Y, i);\n\t\t\t\t\t\t}\n\t\t\t\t\t\tvis.visitInsn(opcode, (Arg[]) ys);\n\t\t\t\t\t\tbreak;\n\n\t\t\t\t\t}\n\n\n\n\t\t\t\t\tcase call_ext_last:\n\t\t\t\t\t\tdo_call(vis, insn_idx, insn, true, true);\n\t\t\t\t\t\tbreak;\n\n\t\t\t\t\tcase call_ext:\n\t\t\t\t\t\tdo_call(vis, insn_idx, insn, false, true);\n\t\t\t\t\t\tbreak;\n\n\t\t\t\t\tcase call:\n\t\t\t\t\t\tdo_call(vis, insn_idx, insn, false, false);\n\t\t\t\t\t\tbreak;\n\n\t\t\t\t\tcase call_last:\n\t\t\t\t\tcase call_only:\n\t\t\t\t\t\tdo_call(vis, insn_idx, insn, true, false);\n\t\t\t\t\t\tbreak;\n\n\t\t\t\t\tcase apply_last:\n\t\t\t\t\tcase apply: {\n\t\t\t\t\t\tArg[] args = new Arg[2+insn.elm(2).asInt()];\n\t\t\t\t\t\tfor (int i = 0; i < args.length; i++) {\n\t\t\t\t\t\t\targs[i] = new Arg(Arg.Kind.X, i, map[insn_idx].getx(i));\n\t\t\t\t\t\t}\n\t\t\t\t\t\tvis.visitInsn(opcode, args);\n\t\t\t\t\t\tbreak;\n\t\t\t\t\t\t\n\t\t\t\t\t}\n\t\t\t\t\t\t\n\t\t\t\t\tcase make_fun2:\n\t\t\t\t\t{\n\t\t\t\t\t\tExtFunc efun = new ExtFunc(insn.elm(2).testTuple());\n\t\t\t\t\t\tint numfree = insn.elm(5).asInt();\n\t\t\t\t\t\tArg[] free = new Arg[numfree];\n\t\t\t\t\t\tfor (int i = 0; i < numfree; i++) { free[i] = new Arg(Arg.Kind.X, i, map[insn_idx].getx(i)); }\n\t\t\t\t\t\tvis.visitInsn(opcode, efun, free);\n\t\t\t\t\t\tbreak;\n\t\t\t\t\t}\n\t\t\t\t\t\t\n\t\t\t\t\tcase init:\n\t\t\t\t\t\tvis.visitInsn(opcode, decode_arg(insn_idx, insn.elm(2)));\n\t\t\t\t\t\tbreak;\n\t\t\t\t\t\t\n\t\t\t\t\tcase put_list:\n\t\t\t\t\t{\n\t\t\t\t\t\tArg[] in = new Arg[] { decode_arg(insn_idx, insn.elm(2)), decode_arg(insn_idx, insn.elm(3)) };\n\t\t\t\t\t\tArg out = decode_out_arg(insn_idx, insn.elm(4));\n\t\t\t\t\t\t\n\t\t\t\t\t\tvis.visitInsn(opcode, in, out);\n\t\t\t\t\t\tbreak;\n\t\t\t\t\t}\n\t\t\t\t\t\n\t\t\t\t\tcase put_tuple:\n\t\t\t\t\t{\n\t\t\t\t\t\t\n\t\t\t\t\t\tint arity = insn.elm(2).asInt();\n\t\t\t\t\t\tType tupleType = getTupleType(arity);\n\t\t\t\t\t\ttuple_reg = new Arg (decode_out_arg(insn_idx, insn.elm(3)), tupleType);\n\t\t\t\t\t\tvis.visitInsn(opcode, arity, tuple_reg);\n\t\t\t\t\t\ttuple_pos = 1;\n\t\t\t\t\t\tbreak;\n\t\t\t\t\t}\n\t\t\t\t\t\t\n\t\t\t\t\tcase put: \n\t\t\t\t\t{\n\t\t\t\t\t\tArg val = decode_arg(insn_idx, insn.elm(2));\n\t\t\t\t\t\tvis.visitInsn(opcode, val, tuple_reg, tuple_pos++);\n\t\t\t\t\t\tbreak;\n\t\t\t\t\t}\n\n\t\t\t\t\tcase set_tuple_element: {\n\t\t\t\t\t\tArg in = decode_arg(insn_idx, insn.elm(2));\n\t\t\t\t\t\tArg out = decode_arg(insn_idx, insn.elm(3));\n\t\t\t\t\t\tint idx = insn.elm(4).asInt();\n\n\t\t\t\t\t\tvis.visitInsn(opcode, in, out, idx);\n\t\t\t\t\t\t\n\t\t\t\t\t\tbreak;\n\t\t\t\t\t}\n\t\t\t\t\t\n\n\t\t\t\t\tcase allocate_heap:\n\t\t\t\t\tcase allocate:\n\t\t\t\t\tcase deallocate:\n\t\t\t\t\t\t// need to zero out refs?\n\t\t\t\t\t\tbreak;\n\t\t\t\t\t}\n\t\t\t\t\t\n\t\t\t\t\tcase select_tuple_arity: {\n\t\t\t\t\t\tint failLabel = decode_labelref(insn.elm(3));\n\t\t\t\t\t\tArg in = decode_arg(insn_idx, insn.elm(2));\n\n\t\t\t\t\t\t\n\t\t\t\t\t\tESeq cases = insn.elm(4).testTuple().elm(2).testSeq();\n\t\t\t\t\t\tint len = cases.length()/2;\n\t\t\t\t\t\t\n\t\t\t\t\t\tint[] arities = new int[len];\n\t\t\t\t\t\tint[] targets = new int[len];\n\n\t\t\t\t\t\tint idx = 0;\n\t\t\t\t\t\t\n\t\t\t\t\t\twhile (cases != ESeq.NIL) {\n\t\t\t\t\t\t\tarities[idx] = cases.head().asInt();\n\t\t\t\t\t\t\tEObject target = cases.tail().head();\n\t\t\t\t\t\t\ttargets[idx] = decode_labelref(target);\n\n\t\t\t\t\t\t\tcases = cases.tail().tail();\n\t\t\t\t\t\t\tidx += 1;\n\t\t\t\t\t\t\n\t\t\t\t\t\tvis.visitSelectTuple(in, failLabel, arities, targets);\n\t\t\t\t\t\t\n\t\t\t\t\t\tbreak;\n\n\t\t\t\t\tcase select_val: {\n\t\t\t\t\t\tArg in = decode_arg(insn_idx, insn.elm(2));\n\t\t\t\t\t\tint failLabel = decode_labelref(insn.elm(3));\n\t\t\t\t\t\tESeq cases = insn.elm(4).testTuple().elm(2).testSeq();\n\t\t\t\t\t\tint len = cases.length()/2;\n\t\t\t\t\t\t\n\t\t\t\t\t\tArg[] values = new Arg[len];\n\t\t\t\t\t\tint[] targets = new int[len];\n\n\t\t\t\t\t\tint idx = 0;\n\t\t\t\t\t\t\n\t\t\t\t\t\twhile (cases != ESeq.NIL) {\n\t\t\t\t\t\t\tvalues[idx] = decode_value (cases.head());\n\t\t\t\t\t\t\tEObject target = cases.tail().head();\n\t\t\t\t\t\t\ttargets[idx] = decode_labelref(target);\n\n\t\t\t\t\t\t\tcases = cases.tail().tail();\n\t\t\t\t\t\t\tidx += 1;\n\t\t\t\t\t\t}\n\t\t\t\t\t\t\n\t\t\t\t\t\tvis.visitSelectValue(in, failLabel, values, targets);\n\t\t\t\t\t\t\n\t\t\t\t\t\tbreak;\n\t\t\t\t\t}\n\n\n\t\t\t\t\t\n\t\t\t\t\tcase get_tuple_element: {\n\t\t\t\t\t\t\n\t\t\t\t\t\tArg in = decode_arg(insn_idx, insn.elm(2));\n\t\t\t\t\t\tint idx = insn.elm(3).asInt();\n\t\t\t\t\t\tArg out = decode_out_arg(insn_idx, insn.elm(4));\n\n\t\t\t\t\t\tvis.visitInsn(opcode, in, out, idx);\n\t\t\t\t\t\t\n\t\t\t\t\t\tbreak;\n\t\t\t\t\t}\n\t\t\t\t\t\n\t\t\t\t\tcase jump:\n\t\t\t\t\t\tvis.visitJump(decode_labelref(insn.elm(2)));\n\t\t\t\t\t\tbreak;\n\t\t\t\t\t\t\n\t\t\t\t\tcase trim:\n\t\t\t\t\t\tbreak;\n\t\t\t\t\t\n\t\t\t\t\tcase get_list:\n\t\t\t\t\t\tvis.visitInsn(opcode, new Arg[] { decode_arg(insn_idx, insn.elm(2)), \n\t\t\t\t\t\t\t\tdecode_out_arg(insn_idx, insn.elm(3)), \n\t\t\t\t\t\t\t\tdecode_out_arg(insn_idx, insn.elm(4))\n\t\t\t\t\t\t\t\t});\n\t\t\t\t\t\tbreak;\n\t\t\t\t\t\t\n\t\t\t\t\tcase badmatch:\n\t\t\t\t\tcase case_end:\n\t\t\t\t\t\tvis.visitInsn(opcode, decode_arg(insn_idx, insn.elm(2)));\n\t\t\t\t\tcase if_end:\n\t\t\t\t\t\tvis.visitInsn(opcode);\n\t\t\t\t\t\tbreak;\n\t\t\t\t\t\t\n\t\t\t\t\tcase send: {\n\t\t\t\t\t\tvis.visitInsn(opcode, new Arg[] { new Arg(Arg.Kind.X, 0), new Arg(Arg.Kind.X, 1) });\n\t\t\t\t\t\tbreak;\n\t\t\t\t\t}\n\t\t\t\t\t\t\n\t\t\tprivate void do_call(BlockVisitor2 vis, int insn_idx, ETuple insn,\n\t\t\t\t\tboolean is_tail, boolean is_external) throws Error {\n\t\t\t\tint arg_count = insn.elm(2).asInt();\n\t\t\t\tArg[] args = new Arg[arg_count];\n\t\t\t\tfor (int i = 0; i < arg_count; i++) {\n\t\t\t\t\targs[i] = new Arg(Kind.X, i, this.map[insn_idx].getx(i));\n\t\t\t\t}\n\t\t\t\t\n\t\t\t\tETuple ft = insn.elm(3).testTuple();\n\t\t\t\tExtFunc fun;\n\t\t\t\tif (ft.elm(1) != EXTFUNC_ATOM)\n\t\t\t\t\tfun = new ExtFunc(ft.elm(1).testAtom(), ft.elm(2)\n\t\t\t\t\t\t\t.testAtom(), ft.elm(3).asInt());\n\t\t\t\telse\n\t\t\t\t\tfun = new ExtFunc(ft.elm(2).testAtom(), ft.elm(3)\n\t\t\t\t\t\t.testAtom(), ft.elm(4).asInt());\n\t\t\t\tvis.visitCall(fun, args, is_tail, is_external);\n\t\t\t}\n\n\t\t\t\tint failLabel = decode_labelref(insn.elm(3));\n\t\t\t\tEObject[] argExprs = insn.elm(4).testSeq().toArray();\n\t\t\t\tArg[] args = decode_args(insn_idx, argExprs);\n\t\t\t\tBeamOpcode test = BeamOpcode.get(insn.elm(2).testAtom());\n\t\t\t\tcase is_boolean:\n\t\t\t\tcase is_atom:\n\t\t\t\t\tvis.visitTest(test, failLabel, args[0], EATOM_TYPE);\n\t\t\t\t\tbreak;\n\n\t\t\t\tcase is_integer:\n\t\t\t\t\tvis.visitTest(test, failLabel, args[0], EINTEGER_TYPE);\n\t\t\t\t\tbreak;\n\n\t\t\t\tcase is_tuple:\n\t\t\t\t\tvis.visitTest(test, failLabel, args[0], ETUPLE_TYPE);\n\t\t\t\t\tbreak;\n\n\t\t\t\tcase is_lt:\n\t\t\t\tcase is_ge:\n\t\t\t\tcase is_eq_exact:\n\t\t\t\tcase is_ne_exact:\n\t\t\t\tcase is_ne:\n\t\t\t\t\tvis.visitTest(test, failLabel, args, (Arg) null,\n\t\t\t\t\t\t\tType.VOID_TYPE);\n\t\t\t\t\tbreak;\n\n\t\t\t\tcase test_arity:\n\t\t\t\t\tint arity = argExprs[1].asInt();\n\t\t\t\t\tvis.visitTest(test, failLabel, args[0], arity, getTupleType(arity));\n\t\t\t\t\t\n\t\t\t\t\t\t\t+ insn_idx + \" // \" + test + \":\" + test.ordinal());\n\t\t\t\t\t\treturn new Arg(tup.elem2, EATOM_TYPE);\n\t\t\t\t\t\tif (tup.elem2.testInteger() != null) {\n\t\t\t\t\treturn new Arg(ENil.NIL, ENIL_TYPE);\n\t\t\t/**\n\t\t\t * @param insnIdx\n\t\t\t * @param eObject\n\t\t\t * @return\n\t\t\t */\n\t\t\tprivate Arg decode_value(EObject src) {\n\n\t\t\t\tif (src instanceof ETuple2) {\n\t\t\t\t\tETuple2 tup = (ETuple2) src;\n\t\t\t\t\tif (tup.elem1 == ATOM_ATOM) {\n\t\t\t\t\t\treturn new Arg(tup.elem2, EATOM_TYPE);\n\t\t\t\t\t} else if (tup.elem1 == LITERAL_ATOM) {\n\t\t\t\t\t\treturn new Arg(tup.elem2);\n\t\t\t\t\t} else if (tup.elem1 == INTEGER_ATOM) {\n\t\t\t\t\t\tif (tup.elem2.testInteger() != null) {\n\t\t\t\t\t\t\treturn new Arg(tup.elem2, Type.INT_TYPE);\n\t\t\t\t\t\t} else {\n\t\t\t\t\t\t\treturn new Arg(tup.elem2);\n\t\t\t\t\t\t}\n\t\t\t\t\t} else if (tup.elem1 == FLOAT_ATOM) {\n\t\t\t\t\t\treturn new Arg(tup.elem2, Type.DOUBLE_TYPE);\n\t\t\t\t\t}\n\n\t\t\t\t} else if (src == NIL_ATOM) {\n\t\t\t\t\treturn new Arg(ENil.NIL, ENIL_TYPE);\n\n\t\t\t\t}\n\n\t\t\t\tthrow new Error(\"unknown value\");\n\n\t\t\t}\n\n\n\t\t\t\n\t\t\t\t\t}\n\t\t\t\tif (f_tup == NOFAIL_ATOM)\n\t\t\t\t\treturn 0;\n\t\t\t\tassert (f_tup.testTuple().elm(1) == F_ATOM);\n\t\t\t\treturn f_tup.testTuple().elm(2).asInt();\n\t\t\t\t\tBeamOpcode code = BeamOpcode.get(insn.elm(1).testAtom());\n\t\t\t\t\t\tEObject src = insn.elm(2);\n\t\t\t\t\t\tEObject dst = insn.elm(3);\n\t\t\t\t\t\tcurrent = branch(current, insn.elm(2), insn_idx);\n\t\t\t\t\t\tEAtom name = insn.elm(2).testAtom();\n\t\t\t\t\t\tESeq parms = insn.elm(4).testSeq();\n\t\t\t\t\t\tcurrent = setType(current, insn.elm(5), type);\n\t\t\t\t\t\tif (insn.elm(3).testTuple().elm(2).asInt() != 0) {\n\t\t\t\t\t\tcurrent = branch(current, insn.elm(3), insn_idx);\n\t\t\t\t\t\tEAtom name = insn.elm(2).testAtom();\n\t\t\t\t\t\tESeq parms = insn.elm(5).testSeq();\n\t\t\t\t\t\tcurrent = setType(current, insn.elm(6), type);\n\t\t\t\t\t\tcurrent = branch(current, insn.elm(3), insn_idx);\n\t\t\t\t\t\tEAtom name = insn.elm(2).testAtom();\n\t\t\t\t\t\tESeq parms = insn.elm(4).testSeq();\n\t\t\t\t\t\tcurrent = setType(current, insn.elm(5), type);\n\t\t\t\t\t\tgetType(current, insn.elm(2));\n\t\t\t\t\t\tcurrent = setType(current, insn.elm(3),\n\t\t\t\t\t\tcurrent = setType(current, insn.elm(2), null);\n\t\t\t\t\t\tgetType(current, insn.elm(2));\n\t\t\t\t\t\tgetType(current, insn.elm(3));\n\t\t\t\t\t\tEObject src = insn.elm(2);\n\t\t\t\t\t\tint idx = insn.elm(3).asInt();\n\t\t\t\t\t\tEObject dst = insn.elm(4);\n\t\t\t\t\t\tEObject from = insn.elm(2);\n\t\t\t\t\t\tEObject head_into = insn.elm(3);\n\t\t\t\t\t\tEObject tail_into = insn.elm(4);\n\t\t\t\t\t\tType head_type = getType(current, insn.elm(2));\n\t\t\t\t\t\tType tail_type = getType(current, insn.elm(3));\n\t\t\t\t\t\t\tthrow new Error(\"value: \" + insn.elm(3)\n\t\t\t\t\t\t\tcurrent = setType(current, insn.elm(4), ELIST_TYPE);\n\t\t\t\t\t\t\tcurrent = setType(current, insn.elm(4), ECONS_TYPE);\n\t\t\t\t\t\tint arity = insn.elm(2).asInt();\n\t\t\t\t\t\tETuple reg = insn.elm(3).testTuple();\n\t\t\t\t\t\tcurrent = setType(current, insn.elm(2), EOBJECT_TYPE);\n\t\t\t\t\t\tcurrent = branch(current, insn.elm(3), insn_idx);\n\t\t\t\t\t\tgetType(current, insn.elm(2));\n\t\t\t\t\t\tif (insn.elm(2).testTuple().elm(2).asInt() != 0) {\n\t\t\t\t\t\tcheckArgs(current, insn.elm(3), insn);\n\t\t\t\t\t\tcurrent = setType(current, insn.elm(4), EOBJECT_TYPE);\n\t\t\t\t\t\tcurrent = branch(current, insn.elm(3), insn_idx);\n\t\t\t\t\t\tcurrent.touchx(0, insn.elm(5).asInt());\n\t\t\t\t\t\tcurrent = branch(current, insn.elm(2), insn_idx);\n\t\t\t\t\t\tcurrent = setType(current, insn.elm(3), EOBJECT_TYPE);\n\t\t\t\t\t\tType timeout_type = getType(current, insn.elm(3));\n\t\t\t\t\t\tcurrent = branch(current, insn.elm(2), insn_idx);\n\t\t\t\t\t\tint howmuch = insn.elm(2).asInt();\n\t\t\t\t\t\tint slots = insn.elm(2).asInt();\n\t\t\t\t\t\tcurrent = current.alloc_y(insn.elm(2).asInt());\n\t\t\t\t\t\tgetType(current, insn.elm(2));\n\t\t\t\t\t\tcurrent = branch(current, insn.elm(3), insn_idx);\n\t\t\t\t\t\tgetType(current, insn.elm(2));\n\t\t\t\t\t\tESeq cases = insn.elm(4).testTuple().elm(2).testSeq();\n\t\t\t\t\t\twhile (cases != ESeq.NIL) {\n\t\t\t\t\t\t\tcurrent = setType(current, insn.elm(2), getTupleType(value.asInt()));\n\t\t\t\t\t\t\t\n\t\t\t\t\t\tcurrent = branch(current, insn.elm(3), insn_idx);\n\t\t\t\t\t\tgetType(current, insn.elm(2));\n\t\t\t\t\t\tESeq cases = insn.elm(4).testTuple().elm(2).testSeq();\n\t\t\t\t\t\twhile (cases != ESeq.NIL) {\n\t\t\t\t\t\tint argCount = insn.elm(2).asInt();\n\t\t\t\t\t\tint argCount = insn.elm(2).asInt();\n\t\t\t\t\t\tType ctx = getType(current, insn.elm(2));\n\t\t\t\tif ((at = cell.testTuple()) != null) {\n\t\t\t\t\t\tif (at.elm(1) == X_ATOM)\n\t\t\t\t\t\tif (at.elm(1) == Y_ATOM)\n\t\t\t\t\t\tif (at.elm(1) == FR_ATOM)\n\t\t\t\twhile (args != ESeq.NIL) {\n\t\t\t\tESeq args = eTerm.testSeq();\n\t\t\t\twhile (args != ESeq.NIL) {\n\t\t\t\tcurrent = branch(current, insn.elm(3), insn_idx);\n\t\t\t\tEObject[] args = insn.elm(4).testSeq().toArray();\n\t\t\t\tBeamOpcode test = BeamOpcode.get(insn.elm(2).testAtom());\n\t\t\t\t\tcheckArgs(current, insn.elm(4), insn);\n\t\t\t\t\treturn setType(current, arg1.testTuple(), ENIL_TYPE);\n\t\t\t\t\tcheckArgs(current, insn.elm(4), insn);\n\t\t\t\t\treturn setType(current, arg1.testTuple(), ECONS_TYPE);\n\t\t\t\t\tcheckArgs(current, insn.elm(4), insn);\n\t\t\t\t\treturn setType(current, arg1.testTuple(), EBINARY_TYPE);\n\t\t\t\t\tcheckArgs(current, insn.elm(4), insn);\n\t\t\t\t\treturn setType(current, arg1.testTuple(), ETUPLE_TYPE);\n\t\t\t\t\tcheckArgs(current, insn.elm(4), insn);\n\t\t\t\t\treturn setType(current, arg1.testTuple(), getTupleType(arg2\n\t\t\t\t\tcheckArgs(current, insn.elm(4), insn);\n\t\t\t\t\treturn setType(current, arg1.testTuple(), EATOM_TYPE);\n\t\t\t\t\tcheckArgs(current, insn.elm(4), insn);\n\t\t\t\t\tcheckArgs(current, insn.elm(4), insn);\n\t\t\t\t\tcheckArgs(current, insn.elm(4), insn);\n\t\t\t\t\tcheckArgs(current, insn.elm(4), insn);\n\t\t\t\t\tcheckArgs(current, insn.elm(4), insn);\n\t\t\t\t\tcheckArgs(current, insn.elm(4), insn);\n\t\t\t\t\t\t\tcurrent = setType(current, arg1.testTuple(), t2);\n\t\t\t\t\t\t\tcurrent = setType(current, arg2.testTuple(), t1);\n\t\t\t\t\tcheckArgs(current, insn.elm(4), insn);\n\t\t\t\t\tif ((tup = args[3].testTuple()) != null) {\n\t\t\t\t\t\tif (tup.elm(1) == INTEGER_ATOM\n\t\t\t\t\t\t\t\t&& tup.elm(2).asInt() <= 32) {\n\t\t\t\t\tETuple tuple = nth.testTuple();\n\t\t\t\t\tif (tuple.elm(1) != F_ATOM)\n\t\t\t\t\tint target = tuple.elm(2).asInt();\n\t\t\t\tETuple et = arg2.testTuple();\n\t\t\t\treturn (et != null && et.elm(1) == X_ATOM\n\t\t\t\t\t\t|| et.elm(1) == Y_ATOM || et.elm(1) == FR_ATOM);\n\t\t\t\tETuple dst = dd.testTuple();\n\t\t\t\tEObject key = dst.elm(1);\n\t\t\t\tEObject value = dst.elm(2);\n\t\t\t\t\treturn BeamOpcode.get(insn.elm(1).testAtom());", "new_methods": [ { "arguments": [ "EObject src" ], "filename": "src/erjang/beam/analysis/BeamTypeAnalysis.java", "implementation": "if (src instanceof ETuple2) {\n\t\t\t\t\tETuple2 tup = (ETuple2) src;\n\t\t\t\t\tif (tup.elem1 == ATOM_ATOM) {\n\t\t\t\t\t\treturn new Arg(tup.elem2, EATOM_TYPE);", "signature": "Arg decode_value(EObject src)" }, { "arguments": [ "tup.elem1 == LITERAL_ATOM" ], "filename": "src/erjang/beam/analysis/BeamTypeAnalysis.java", "implementation": "return new Arg(tup.elem2);", "signature": "else if (tup.elem1 == LITERAL_ATOM)" }, { "arguments": [ "tup.elem1 == INTEGER_ATOM" ], "filename": "src/erjang/beam/analysis/BeamTypeAnalysis.java", "implementation": "if (tup.elem2.testInteger() != null) {\n\t\t\t\t\t\t\treturn new Arg(tup.elem2, Type.INT_TYPE);", "signature": "else if (tup.elem1 == INTEGER_ATOM)" }, { "arguments": [ "tup.elem1 == FLOAT_ATOM" ], "filename": "src/erjang/beam/analysis/BeamTypeAnalysis.java", "implementation": "return new Arg(tup.elem2, Type.DOUBLE_TYPE);", "signature": "else if (tup.elem1 == FLOAT_ATOM)" }, { "arguments": [ "src == NIL_ATOM" ], "filename": "src/erjang/beam/analysis/BeamTypeAnalysis.java", "implementation": "return new Arg(ENil.NIL, ENIL_TYPE);", "signature": "else if (src == NIL_ATOM)" } ], "old_code": "\t\t\t\t\tif (BeamOpcode.get(lb.insns.get(0).nth(1).asAtom()) == BeamOpcode.func_info) {\n\t\t\tif (fv instanceof FunctionVisitor2) {\n\t\t\t\t((FunctionVisitor2) fv).visitMaxs(this.max_xreg,\n\t\t\t\t\t\tthis.max_stack, this.max_freg, this.is_tail_recursive);\n\t\t\t}\n\t\t\tfor (LabeledBlock block : this.lbs.values()) {\n\t\t\t\tBlockVisitor vis = super.fv\n\t\t\t\t\t\t.visitLabeledBlock(block.block_label);\n\t\t\t\tblock.accept(vis);\n\n\t\t\tsuper.fv.visitEnd();\n\t\t\t\tif (!isDeadCode()) {\n\t\t\t\t\tif (vis instanceof BlockVisitor2) {\n\t\t\t\t\t\taccept_2((BlockVisitor2) vis);\n\t\t\t\t\t} else {\n\t\t\t\t\t\taccept_1(vis);\n\t\t\t\t\t}\n\n\t\t\t\tvis.visitEnd();\n\t\t\t\t\tBeamOpcode opcode = BeamOpcode.get(insn.nth(1).asAtom());\n\t\t\t\t\tBeamOpcode opcode = BeamOpcode.get(insn.nth(1).asAtom());\n\t\t\t\t\t\tvis.visitInsn(opcode, (Arg) new ExtFunc(insn.nth(2)\n\t\t\t\t\t\t\t\t.asAtom(), insn.nth(3).asAtom(), insn.nth(4)\n\t\t\t\t\t\t\t\t.asInt()));\n\t\t\t\t\t\t\n\t\t\t\t\t\tArg arg1 = decode_arg(insn_idx, insn.nth(2));\n\t\t\t\t\t\tArg arg2 = decode_arg(insn_idx, insn.nth(3));\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\tcase arithfbif:\n\t\t\t\t\t{\n\t\t\t\t\t\tSystem.err.println(\"gen: \"+insn);\n\t\t\t\t\t\tEAtom name = insn.nth(2).asAtom();\n\t\t\t\t\t\tint failLabel = decode_labelref(insn.nth(3));\n\t\t\t\t\t\tESeq parms = insn.nth(4).asSeq();\n\t\t\t\t\t\tArg out = decode_out_arg(insn_idx, insn.nth(5));\n\t\t\t\t\t\t\n\t\t\t\t\tcase gc_bif:\n\t\t\t\t\tcase bif:\n\t\t\t\t\t{\n\t\t\t\t\t\tSystem.err.println(\"gen: \"+insn);\n\t\t\t\t\t\tEAtom name = insn.nth(2).asAtom();\n\t\t\t\t\t\tint failLabel = decode_labelref(insn.nth(3));\n\t\t\t\t\t\tESeq parms = insn.nth(5).asSeq();\n\t\t\t\t\t\tArg out = decode_out_arg(insn_idx, insn.nth(6));\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\tboolean is_tail = true;\n\t\t\t\t\t\tboolean is_external = true;\n\t\t\t\t\t\tint arg_count = insn.nth(2).asInt();\n\t\t\t\t\t\tArg[] args = new Arg[arg_count];\n\t\t\t\t\t\tfor (int i = 0; i < arg_count; i++) {\n\t\t\t\t\t\t\targs[i] = new Arg(Kind.X, i, this.map[insn_idx].getx(i));\n\t\t\t\t\t\tETuple ft = insn.nth(3).asTuple();\n\t\t\t\t\t\tif (ft.nth(1) != EXTFUNC_ATOM) throw new Error();\n\t\t\t\t\t\tExtFunc fun = new ExtFunc(ft.nth(2).asAtom(), ft.nth(3).asAtom(), ft.nth(4).asInt());\n\t\t\t\t\t\tvis.visitCall(fun, args, is_tail, is_external);\n\t\t\t\tint failLabel = decode_labelref(insn.nth(3));\n\t\t\t\tArg[] args = decode_args(insn_idx, insn.nth(4).asSeq()\n\t\t\t\t\t\t.toArray());\n\t\t\t\tBeamOpcode test = BeamOpcode.get(insn.nth(2).asAtom());\n\t\t\t\t\tvis.visitTest(test, failLabel, args, (Arg)null, Type.VOID_TYPE);\n\t\t\t\t\t\t\t+ insn_idx);\n\t\t\t\t\t\treturn new Arg(tup.elem2);\n\t\t\t\t\t\tif (tup.elem2.asInteger() != null) {\n\t\t\t\t\treturn new Arg(src);\n\t\t\t\t\t} \n\t\t\t\tassert (f_tup.asTuple().nth(1) == F_ATOM);\n\t\t\t\treturn f_tup.asTuple().nth(2).asInt();\n\t\t\t\t\tBeamOpcode code = BeamOpcode.get(insn.nth(1).asAtom());\n\t\t\t\t\t\tEObject src = insn.nth(2);\n\t\t\t\t\t\tEObject dst = insn.nth(3);\n\t\t\t\t\t\tcurrent = branch(current, insn.nth(2), insn_idx);\n\t\t\t\t\t\tEAtom name = insn.nth(2).asAtom();\n\t\t\t\t\t\tESeq parms = insn.nth(4).asSeq();\n\t\t\t\t\t\tcurrent = setType(current, insn.nth(5), type);\n\t\t\t\t\t\tif (insn.nth(3).asTuple().nth(2).asInt() != 0) {\n\t\t\t\t\t\tcurrent = branch(current, insn.nth(3), insn_idx);\n\t\t\t\t\t\tEAtom name = insn.nth(2).asAtom();\n\t\t\t\t\t\tESeq parms = insn.nth(5).asSeq();\n\t\t\t\t\t\tcurrent = setType(current, insn.nth(6), type);\n\t\t\t\t\t\tcurrent = branch(current, insn.nth(3), insn_idx);\n\t\t\t\t\t\tEAtom name = insn.nth(2).asAtom();\n\t\t\t\t\t\tESeq parms = insn.nth(4).asSeq();\n\t\t\t\t\t\tcurrent = setType(current, insn.nth(5), type);\n\t\t\t\t\t\tgetType(current, insn.nth(2));\n\t\t\t\t\t\tcurrent = setType(current, insn.nth(3),\n\t\t\t\t\t\tcurrent = setType(current, insn.nth(2), null);\n\t\t\t\t\t\tgetType(current, insn.nth(2));\n\t\t\t\t\t\tgetType(current, insn.nth(3));\n\t\t\t\t\t\tEObject src = insn.nth(2);\n\t\t\t\t\t\tint idx = insn.nth(3).asInt();\n\t\t\t\t\t\tEObject dst = insn.nth(4);\n\t\t\t\t\t\tEObject from = insn.nth(2);\n\t\t\t\t\t\tEObject head_into = insn.nth(3);\n\t\t\t\t\t\tEObject tail_into = insn.nth(4);\n\t\t\t\t\t\tType head_type = getType(current, insn.nth(2));\n\t\t\t\t\t\tType tail_type = getType(current, insn.nth(3));\n\t\t\t\t\t\t\tthrow new Error(\"value: \" + insn.nth(3)\n\t\t\t\t\t\t\tcurrent = setType(current, insn.nth(4), ELIST_TYPE);\n\t\t\t\t\t\t\tcurrent = setType(current, insn.nth(4), ECONS_TYPE);\n\t\t\t\t\t\tint arity = insn.nth(2).asInt();\n\t\t\t\t\t\tETuple reg = insn.nth(3).asTuple();\n\t\t\t\t\t\tcurrent = setType(current, insn.nth(2), EOBJECT_TYPE);\n\t\t\t\t\t\tcurrent = branch(current, insn.nth(3), insn_idx);\n\t\t\t\t\t\tgetType(current, insn.nth(2));\n\t\t\t\t\t\tif (insn.nth(2).asTuple().nth(2).asInt() != 0) {\n\t\t\t\t\t\tcheckArgs(current, insn.nth(3), insn);\n\t\t\t\t\t\tcurrent = setType(current, insn.nth(4), EOBJECT_TYPE);\n\t\t\t\t\t\tcurrent = branch(current, insn.nth(3), insn_idx);\n\t\t\t\t\t\tcurrent.touchx(0, insn.nth(5).asInt());\n\t\t\t\t\t\tcurrent = branch(current, insn.nth(2), insn_idx);\n\t\t\t\t\t\tcurrent = setType(current, insn.nth(3), EOBJECT_TYPE);\n\t\t\t\t\t\tType timeout_type = getType(current, insn.nth(3));\n\t\t\t\t\t\tcurrent = branch(current, insn.nth(2), insn_idx);\n\t\t\t\t\t\tint howmuch = insn.nth(2).asInt();\n\t\t\t\t\t\tint slots = insn.nth(2).asInt();\n\t\t\t\t\t\tcurrent = current.alloc_y(insn.nth(2).asInt());\n\t\t\t\t\t\tgetType(current, insn.nth(2));\n\t\t\t\t\t\tcurrent = branch(current, insn.nth(3), insn_idx);\n\t\t\t\t\t\tgetType(current, insn.nth(2));\n\t\t\t\t\t\tESeq cases = insn.nth(4).asTuple().nth(2).asSeq();\n\t\t\t\t\t\twhile (cases != ESeq.EMPTY) {\n\t\t\t\t\t\tcurrent = branch(current, insn.nth(3), insn_idx);\n\t\t\t\t\t\tgetType(current, insn.nth(2));\n\t\t\t\t\t\tESeq cases = insn.nth(4).asTuple().nth(2).asSeq();\n\t\t\t\t\t\twhile (cases != ESeq.EMPTY) {\n\t\t\t\t\t\tint argCount = insn.nth(2).asInt();\n\t\t\t\t\t\tint argCount = insn.nth(2).asInt();\n\t\t\t\t\t\tType ctx = getType(current, insn.nth(2));\n\t\t\t\tif ((at = cell.asTuple()) != null) {\n\t\t\t\t\t\tif (at.nth(1) == X_ATOM)\n\t\t\t\t\t\tif (at.nth(1) == Y_ATOM)\n\t\t\t\t\t\tif (at.nth(1) == FR_ATOM)\n\t\t\t\twhile (args != ESeq.EMPTY) {\n\t\t\t\tESeq args = eTerm.asSeq();\n\t\t\t\twhile (args != ESeq.EMPTY) {\n\t\t\t\tcurrent = branch(current, insn.nth(3), insn_idx);\n\t\t\t\tEObject[] args = insn.nth(4).asSeq().toArray();\n\t\t\t\tBeamOpcode test = BeamOpcode.get(insn.nth(2).asAtom());\n\t\t\t\t\tcheckArgs(current, insn.nth(4), insn);\n\t\t\t\t\treturn setType(current, arg1.asTuple(), ENIL_TYPE);\n\t\t\t\t\tcheckArgs(current, insn.nth(4), insn);\n\t\t\t\t\treturn setType(current, arg1.asTuple(), ECONS_TYPE);\n\t\t\t\t\tcheckArgs(current, insn.nth(4), insn);\n\t\t\t\t\treturn setType(current, arg1.asTuple(), EBINARY_TYPE);\n\t\t\t\t\tcheckArgs(current, insn.nth(4), insn);\n\t\t\t\t\treturn setType(current, arg1.asTuple(), ETUPLE_TYPE);\n\t\t\t\t\tcheckArgs(current, insn.nth(4), insn);\n\t\t\t\t\treturn setType(current, arg1.asTuple(), getTupleType(arg2\n\t\t\t\t\tcheckArgs(current, insn.nth(4), insn);\n\t\t\t\t\treturn setType(current, arg1.asTuple(), EATOM_TYPE);\n\t\t\t\t\tcheckArgs(current, insn.nth(4), insn);\n\t\t\t\t\tcheckArgs(current, insn.nth(4), insn);\n\t\t\t\t\tcheckArgs(current, insn.nth(4), insn);\n\t\t\t\t\tcheckArgs(current, insn.nth(4), insn);\n\t\t\t\t\tcheckArgs(current, insn.nth(4), insn);\n\t\t\t\t\tcheckArgs(current, insn.nth(4), insn);\n\t\t\t\t\t\t\tcurrent = setType(current, arg1.asTuple(), t2);\n\t\t\t\t\t\t\tcurrent = setType(current, arg2.asTuple(), t1);\n\t\t\t\t\tcheckArgs(current, insn.nth(4), insn);\n\t\t\t\t\tif ((tup = args[3].asTuple()) != null) {\n\t\t\t\t\t\tif (tup.nth(1) == INTEGER_ATOM\n\t\t\t\t\t\t\t\t&& tup.nth(2).asInt() <= 32) {\n\t\t\t\t\tETuple tuple = nth.asTuple();\n\t\t\t\t\tif (tuple.nth(1) != F_ATOM)\n\t\t\t\t\tint target = tuple.nth(2).asInt();\n\t\t\t\tETuple et = arg2.asTuple();\n\t\t\t\treturn (et != null && et.nth(1) == X_ATOM\n\t\t\t\t\t\t|| et.nth(1) == Y_ATOM || et.nth(1) == FR_ATOM);\n\t\t\t\tETuple dst = dd.asTuple();\n\t\t\t\tEObject key = dst.nth(1);\n\t\t\t\tEObject value = dst.nth(2);\n\t\t\t\t\treturn BeamOpcode.get(insn.nth(1).asAtom());", "old_methods": [], "patch": "@@ -103,6 +103,7 @@ public BeamTypeAnalysis(ModuleVisitor mv) {\n \tstatic final ETerm F_ATOM = EAtom.intern(\"f\");\n \tstatic final ETerm FIELD_FLAGS_ATOM = EAtom.intern(\"field_flags\");\n \tstatic final ETerm EXTFUNC_ATOM = EAtom.intern(\"extfunc\");\n+\tstatic final ETerm APPLY_ATOM = EAtom.intern(\"apply\");\n \n \tprivate static final ETuple X0_REG = ETuple.make(new ETerm[] { X_ATOM,\n \t\t\tnew EInteger(0) });\n@@ -245,7 +246,7 @@ public void visitEnd() {\n \t\t\tfor (int i : labels) {\n \t\t\t\tlb = lbs.get(i);\n \t\t\t\tif (lb.isDeadCode()) {\n-\t\t\t\t\tif (BeamOpcode.get(lb.insns.get(0).nth(1).asAtom()) == BeamOpcode.func_info) {\n+\t\t\t\t\tif (BeamOpcode.get(lb.insns.get(0).elm(1).testAtom()) == BeamOpcode.func_info) {\n \t\t\t\t\t\t// ignore this\n \t\t\t\t\t} else {\n \t\t\t\t\t\tSystem.err.println(\"UNREACHABLE \" + lb.block_label);\n@@ -263,20 +264,23 @@ public void visitEnd() {\n \n \t\tprivate void function_visit_end() {\n \n-\t\t\tif (fv instanceof FunctionVisitor2) {\n-\t\t\t\t((FunctionVisitor2) fv).visitMaxs(this.max_xreg,\n-\t\t\t\t\t\tthis.max_stack, this.max_freg, this.is_tail_recursive);\n-\t\t\t}\n+\t\t\ttry {\n+\t\t\t\tif (fv instanceof FunctionVisitor2) {\n+\t\t\t\t\t((FunctionVisitor2) fv).visitMaxs(this.max_xreg,\n+\t\t\t\t\t\t\tthis.max_stack, this.max_freg,\n+\t\t\t\t\t\t\tthis.is_tail_recursive);\n+\t\t\t\t}\n \n-\t\t\tfor (LabeledBlock block : this.lbs.values()) {\n+\t\t\t\tfor (LabeledBlock block : this.lbs.values()) {\n \n-\t\t\t\tBlockVisitor vis = super.fv\n-\t\t\t\t\t\t.visitLabeledBlock(block.block_label);\n+\t\t\t\t\tBlockVisitor vis = super.fv\n+\t\t\t\t\t\t\t.visitLabeledBlock(block.block_label);\n \n-\t\t\t\tblock.accept(vis);\n+\t\t\t\t\tblock.accept(vis);\n+\t\t\t\t}\n+\t\t\t} finally {\n+\t\t\t\tsuper.fv.visitEnd();\n \t\t\t}\n-\n-\t\t\tsuper.fv.visitEnd();\n \t\t}\n \n \t\tprivate void dump() {\n@@ -335,47 +339,54 @@ public LabeledBlock(int label) {\n \t\t\t */\n \t\t\tpublic void accept(BlockVisitor vis) {\n \n-\t\t\t\tif (!isDeadCode()) {\n+\t\t\t\ttry {\n+\t\t\t\t\tif (!isDeadCode()) {\n \n-\t\t\t\t\tif (vis instanceof BlockVisitor2) {\n-\t\t\t\t\t\taccept_2((BlockVisitor2) vis);\n-\t\t\t\t\t} else {\n-\t\t\t\t\t\taccept_1(vis);\n-\t\t\t\t\t}\n+\t\t\t\t\t\tif (vis instanceof BlockVisitor2) {\n+\t\t\t\t\t\t\taccept_2((BlockVisitor2) vis);\n+\t\t\t\t\t\t} else {\n+\t\t\t\t\t\t\taccept_1(vis);\n+\t\t\t\t\t\t}\n \n+\t\t\t\t\t}\n+\t\t\t\t} finally {\n+\t\t\t\t\tvis.visitEnd();\n \t\t\t\t}\n-\n-\t\t\t\tvis.visitEnd();\n \t\t\t}\n \n \t\t\tprivate void accept_1(BlockVisitor vis) {\n \t\t\t\tfor (int i = 0; i < insns.size(); i++) {\n \t\t\t\t\tETuple insn = insns.get(i);\n-\t\t\t\t\tBeamOpcode opcode = BeamOpcode.get(insn.nth(1).asAtom());\n+\t\t\t\t\tBeamOpcode opcode = BeamOpcode.get(insn.elm(1).testAtom());\n \t\t\t\t\tvis.visitInsn(opcode, insn);\n \t\t\t\t}\n \t\t\t}\n \n \t\t\tprivate void accept_2(BlockVisitor2 vis) {\n+\t\t\t\tint tuple_pos = 0;\n+\t\t\t\tArg tuple_reg = null;\n+\n \t\t\t\tfor (int insn_idx = 0; insn_idx < insns.size(); insn_idx++) {\n \t\t\t\t\tETuple insn = insns.get(insn_idx);\n-\t\t\t\t\tBeamOpcode opcode = BeamOpcode.get(insn.nth(1).asAtom());\n+\t\t\t\t\tBeamOpcode opcode = BeamOpcode.get(insn.elm(1).testAtom());\n+\t\t\t\t\tTypeMap type_map = this.map[insn_idx];\n \n \t\t\t\t\tswitch (opcode) {\n \t\t\t\t\tcase func_info:\n-\t\t\t\t\t\tvis.visitInsn(opcode, (Arg) new ExtFunc(insn.nth(2)\n-\t\t\t\t\t\t\t\t.asAtom(), insn.nth(3).asAtom(), insn.nth(4)\n-\t\t\t\t\t\t\t\t.asInt()));\n+\t\t\t\t\t\tSystem.err.print(\"go: \" + insn);\n+\t\t\t\t\t\tvis.visitInsn(opcode,\n+\t\t\t\t\t\t\t\t(Arg) new ExtFunc(insn.elm(2).testTuple().elm(2)\n+\t\t\t\t\t\t\t\t\t\t.testAtom(), insn.elm(3).testTuple().elm(2)\n+\t\t\t\t\t\t\t\t\t\t.testAtom(), insn.elm(4).asInt()));\n \t\t\t\t\t\tbreak;\n-\t\t\t\t\t\t\n+\n \t\t\t\t\tcase fconv:\n \t\t\t\t\tcase fmove:\n \t\t\t\t\tcase move: {\n \t\t\t\t\t\tSystem.err.println(insn);\n-\t\t\t\t\t\tArg arg1 = decode_arg(insn_idx, insn.nth(2));\n-\t\t\t\t\t\tArg arg2 = decode_arg(insn_idx, insn.nth(3));\n-\t\t\t\t\t\t\n-\t\t\t\t\t\t\n+\t\t\t\t\t\tArg arg1 = decode_arg(insn_idx, insn.elm(2));\n+\t\t\t\t\t\tArg arg2 = decode_arg(insn_idx, insn.elm(3));\n+\n \t\t\t\t\t\tif (arg2.kind != Kind.F) {\n \t\t\t\t\t\t\tif (arg1.kind == Kind.F) {\n \t\t\t\t\t\t\t\targ2 = new Arg(arg2, EDOUBLE_TYPE);\n@@ -385,94 +396,311 @@ private void accept_2(BlockVisitor2 vis) {\n \t\t\t\t\t\t} else {\n \t\t\t\t\t\t\t// arg2.kind == F\n \t\t\t\t\t\t}\n-\t\t\t\t\t\t\n+\n \t\t\t\t\t\tvis.visitInsn(opcode, arg1, arg2);\n \t\t\t\t\t\tbreak;\n \t\t\t\t\t}\n \n-\t\t\t\t\tcase arithfbif:\n-\t\t\t\t\t{\n-\t\t\t\t\t\tSystem.err.println(\"gen: \"+insn);\n-\t\t\t\t\t\tEAtom name = insn.nth(2).asAtom();\n-\t\t\t\t\t\tint failLabel = decode_labelref(insn.nth(3));\n-\t\t\t\t\t\tESeq parms = insn.nth(4).asSeq();\n+\t\t\t\t\tcase arithfbif: {\n+\t\t\t\t\t\tSystem.err.println(\"gen: \" + insn);\n+\t\t\t\t\t\tEAtom name = insn.elm(2).testAtom();\n+\t\t\t\t\t\tint failLabel = decode_labelref(insn.elm(3));\n+\t\t\t\t\t\tESeq parms = insn.elm(4).testSeq();\n \t\t\t\t\t\tArg[] in = decode_args(insn_idx, parms.toArray());\n-\t\t\t\t\t\tArg out = decode_out_arg(insn_idx, insn.nth(5));\n+\t\t\t\t\t\tArg out = decode_out_arg(insn_idx, insn.elm(5));\n \n \t\t\t\t\t\tBIF bif = BIFUtil.getMethod(name.getName(), parmTypes(\n \t\t\t\t\t\t\t\tthis.map[insn_idx], parms), failLabel != 0);\n \n-\t\t\t\t\t\t\n \t\t\t\t\t\tvis.visitInsn(opcode, failLabel, in, out, bif);\n \t\t\t\t\t\tbreak;\n \t\t\t\t\t}\n \n-\t\t\t\t\tcase gc_bif:\n-\t\t\t\t\tcase bif:\n-\t\t\t\t\t{\n-\t\t\t\t\t\tSystem.err.println(\"gen: \"+insn);\n-\t\t\t\t\t\tEAtom name = insn.nth(2).asAtom();\n-\t\t\t\t\t\tint failLabel = decode_labelref(insn.nth(3));\n-\t\t\t\t\t\tESeq parms = insn.nth(5).asSeq();\n+\t\t\t\t\tcase bif: {\n+\t\t\t\t\t\tSystem.err.println(\"gen: \" + insn);\n+\t\t\t\t\t\tEAtom name = insn.elm(2).testAtom();\n+\t\t\t\t\t\tint failLabel = decode_labelref(insn.elm(3));\n+\t\t\t\t\t\tESeq parms = insn.elm(4).testSeq();\n \t\t\t\t\t\tArg[] in = decode_args(insn_idx, parms.toArray());\n-\t\t\t\t\t\tArg out = decode_out_arg(insn_idx, insn.nth(6));\n+\t\t\t\t\t\tArg out = decode_out_arg(insn_idx, insn.elm(5));\n \n \t\t\t\t\t\tBIF bif = BIFUtil.getMethod(name.getName(), parmTypes(\n \t\t\t\t\t\t\t\tthis.map[insn_idx], parms), failLabel != 0);\n \n-\t\t\t\t\t\t\n \t\t\t\t\t\tvis.visitInsn(opcode, failLabel, in, out, bif);\n \t\t\t\t\t\tbreak;\n \t\t\t\t\t}\n-\t\t\t\t\t\t\n+\n+\t\t\t\t\tcase gc_bif: {\n+\t\t\t\t\t\tSystem.err.println(\"gen: \" + insn);\n+\t\t\t\t\t\tEAtom name = insn.elm(2).testAtom();\n+\t\t\t\t\t\tint failLabel = decode_labelref(insn.elm(3));\n+\t\t\t\t\t\tESeq parms = insn.elm(5).testSeq();\n+\t\t\t\t\t\tArg[] in = decode_args(insn_idx, parms.toArray());\n+\t\t\t\t\t\tArg out = decode_out_arg(insn_idx, insn.elm(6));\n+\n+\t\t\t\t\t\tBIF bif = BIFUtil.getMethod(name.getName(), parmTypes(\n+\t\t\t\t\t\t\t\tthis.map[insn_idx], parms), failLabel != 0);\n+\n+\t\t\t\t\t\tvis.visitInsn(opcode, failLabel, in, out, bif);\n+\t\t\t\t\t\tbreak;\n+\t\t\t\t\t}\n+\n \t\t\t\t\tcase test:\n \t\t\t\t\t\taccept_2_test(vis, insn, insn_idx);\n \t\t\t\t\t\tbreak;\n \n \t\t\t\t\tcase K_return:\n \t\t\t\t\t\tvis.visitInsn(opcode);\n \t\t\t\t\t\tbreak;\n+\n \t\t\t\t\t\t\n+\t\t\t\t\tcase allocate_zero: {\n+\t\t\t\t\t\tint depth = type_map.stacksize;\n+\t\t\t\t\t\tint count = insn.elm(2).asInt();\n+\t\t\t\t\t\tArg[] ys = new Arg[count];\n+\t\t\t\t\t\tfor (int i = 0; i < count; i++) {\n+\t\t\t\t\t\t\tys[i] = new Arg(Arg.Kind.Y, i);\n+\t\t\t\t\t\t}\n+\t\t\t\t\t\tvis.visitInsn(opcode, (Arg[]) ys);\n+\t\t\t\t\t\tbreak;\n+\n+\t\t\t\t\t}\n+\n \t\t\t\t\tcase test_heap:\n \t\t\t\t\t\tbreak;\n-\t\t\t\t\t\t\n+\n \t\t\t\t\tcase fclearerror:\n \t\t\t\t\tcase fcheckerror:\n \t\t\t\t\t\tbreak;\n-\t\t\t\t\t\t\n+\n+\t\t\t\t\tcase call_ext_last:\n \t\t\t\t\tcase call_ext_only:\n+\t\t\t\t\t\tdo_call(vis, insn_idx, insn, true, true);\n+\t\t\t\t\t\tbreak;\n+\n+\t\t\t\t\tcase call_ext:\n+\t\t\t\t\t\tdo_call(vis, insn_idx, insn, false, true);\n+\t\t\t\t\t\tbreak;\n+\n+\t\t\t\t\tcase call:\n+\t\t\t\t\t\tdo_call(vis, insn_idx, insn, false, false);\n+\t\t\t\t\t\tbreak;\n+\n+\t\t\t\t\tcase call_last:\n+\t\t\t\t\tcase call_only:\n+\t\t\t\t\t\tdo_call(vis, insn_idx, insn, true, false);\n+\t\t\t\t\t\tbreak;\n+\n+\t\t\t\t\tcase apply_last:\n+\t\t\t\t\tcase apply: {\n+\t\t\t\t\t\tArg[] args = new Arg[2+insn.elm(2).asInt()];\n+\t\t\t\t\t\tfor (int i = 0; i < args.length; i++) {\n+\t\t\t\t\t\t\targs[i] = new Arg(Arg.Kind.X, i, map[insn_idx].getx(i));\n+\t\t\t\t\t\t}\n+\t\t\t\t\t\tvis.visitInsn(opcode, args);\n+\t\t\t\t\t\tbreak;\n+\t\t\t\t\t\t\n+\t\t\t\t\t}\n+\t\t\t\t\t\t\n+\t\t\t\t\tcase make_fun2:\n+\t\t\t\t\t{\n+\t\t\t\t\t\tExtFunc efun = new ExtFunc(insn.elm(2).testTuple());\n+\t\t\t\t\t\tint numfree = insn.elm(5).asInt();\n+\t\t\t\t\t\tArg[] free = new Arg[numfree];\n+\t\t\t\t\t\tfor (int i = 0; i < numfree; i++) { free[i] = new Arg(Arg.Kind.X, i, map[insn_idx].getx(i)); }\n+\t\t\t\t\t\tvis.visitInsn(opcode, efun, free);\n+\t\t\t\t\t\tbreak;\n+\t\t\t\t\t}\n+\t\t\t\t\t\t\n+\t\t\t\t\tcase init:\n+\t\t\t\t\t\tvis.visitInsn(opcode, decode_arg(insn_idx, insn.elm(2)));\n+\t\t\t\t\t\tbreak;\n+\t\t\t\t\t\t\n+\t\t\t\t\tcase put_list:\n+\t\t\t\t\t{\n+\t\t\t\t\t\tArg[] in = new Arg[] { decode_arg(insn_idx, insn.elm(2)), decode_arg(insn_idx, insn.elm(3)) };\n+\t\t\t\t\t\tArg out = decode_out_arg(insn_idx, insn.elm(4));\n+\t\t\t\t\t\t\n+\t\t\t\t\t\tvis.visitInsn(opcode, in, out);\n+\t\t\t\t\t\tbreak;\n+\t\t\t\t\t}\n+\t\t\t\t\t\n+\t\t\t\t\tcase put_tuple:\n+\t\t\t\t\t{\n+\t\t\t\t\t\t\n+\t\t\t\t\t\tint arity = insn.elm(2).asInt();\n+\t\t\t\t\t\tType tupleType = getTupleType(arity);\n+\t\t\t\t\t\ttuple_reg = new Arg (decode_out_arg(insn_idx, insn.elm(3)), tupleType);\n+\t\t\t\t\t\tvis.visitInsn(opcode, arity, tuple_reg);\n+\t\t\t\t\t\ttuple_pos = 1;\n+\t\t\t\t\t\tbreak;\n+\t\t\t\t\t}\n+\t\t\t\t\t\t\n+\t\t\t\t\tcase put: \n+\t\t\t\t\t{\n+\t\t\t\t\t\tArg val = decode_arg(insn_idx, insn.elm(2));\n+\t\t\t\t\t\tvis.visitInsn(opcode, val, tuple_reg, tuple_pos++);\n+\t\t\t\t\t\tbreak;\n+\t\t\t\t\t}\n+\n+\t\t\t\t\tcase set_tuple_element: {\n+\t\t\t\t\t\tArg in = decode_arg(insn_idx, insn.elm(2));\n+\t\t\t\t\t\tArg out = decode_arg(insn_idx, insn.elm(3));\n+\t\t\t\t\t\tint idx = insn.elm(4).asInt();\n+\n+\t\t\t\t\t\tvis.visitInsn(opcode, in, out, idx);\n+\t\t\t\t\t\t\n+\t\t\t\t\t\tbreak;\n+\t\t\t\t\t}\n+\t\t\t\t\t\n+\n+\t\t\t\t\tcase allocate_heap:\n+\t\t\t\t\tcase allocate:\n+\t\t\t\t\tcase deallocate:\n \t\t\t\t\t{\n-\t\t\t\t\t\tboolean is_tail = true;\n-\t\t\t\t\t\tboolean is_external = true;\n-\t\t\t\t\t\tint arg_count = insn.nth(2).asInt();\n-\t\t\t\t\t\tArg[] args = new Arg[arg_count];\n-\t\t\t\t\t\tfor (int i = 0; i < arg_count; i++) {\n-\t\t\t\t\t\t\targs[i] = new Arg(Kind.X, i, this.map[insn_idx].getx(i));\n+\t\t\t\t\t\t// need to zero out refs?\n+\t\t\t\t\t\tbreak;\n+\t\t\t\t\t}\n+\t\t\t\t\t\n+\t\t\t\t\tcase select_tuple_arity: {\n+\t\t\t\t\t\tint failLabel = decode_labelref(insn.elm(3));\n+\t\t\t\t\t\tArg in = decode_arg(insn_idx, insn.elm(2));\n+\n+\t\t\t\t\t\t\n+\t\t\t\t\t\tESeq cases = insn.elm(4).testTuple().elm(2).testSeq();\n+\t\t\t\t\t\tint len = cases.length()/2;\n+\t\t\t\t\t\t\n+\t\t\t\t\t\tint[] arities = new int[len];\n+\t\t\t\t\t\tint[] targets = new int[len];\n+\n+\t\t\t\t\t\tint idx = 0;\n+\t\t\t\t\t\t\n+\t\t\t\t\t\twhile (cases != ESeq.NIL) {\n+\t\t\t\t\t\t\tarities[idx] = cases.head().asInt();\n+\t\t\t\t\t\t\tEObject target = cases.tail().head();\n+\t\t\t\t\t\t\ttargets[idx] = decode_labelref(target);\n+\n+\t\t\t\t\t\t\tcases = cases.tail().tail();\n+\t\t\t\t\t\t\tidx += 1;\n \t\t\t\t\t\t}\n-\t\t\t\t\t\tETuple ft = insn.nth(3).asTuple();\n-\t\t\t\t\t\tif (ft.nth(1) != EXTFUNC_ATOM) throw new Error();\n-\t\t\t\t\t\tExtFunc fun = new ExtFunc(ft.nth(2).asAtom(), ft.nth(3).asAtom(), ft.nth(4).asInt());\n-\t\t\t\t\t\tvis.visitCall(fun, args, is_tail, is_external);\n+\t\t\t\t\t\t\n+\t\t\t\t\t\tvis.visitSelectTuple(in, failLabel, arities, targets);\n+\t\t\t\t\t\t\n+\t\t\t\t\t\tbreak;\n \t\t\t\t\t}\n+\n+\t\t\t\t\tcase select_val: {\n+\t\t\t\t\t\tArg in = decode_arg(insn_idx, insn.elm(2));\n+\t\t\t\t\t\tint failLabel = decode_labelref(insn.elm(3));\n+\t\t\t\t\t\tESeq cases = insn.elm(4).testTuple().elm(2).testSeq();\n+\t\t\t\t\t\tint len = cases.length()/2;\n+\t\t\t\t\t\t\n+\t\t\t\t\t\tArg[] values = new Arg[len];\n+\t\t\t\t\t\tint[] targets = new int[len];\n+\n+\t\t\t\t\t\tint idx = 0;\n+\t\t\t\t\t\t\n+\t\t\t\t\t\twhile (cases != ESeq.NIL) {\n+\t\t\t\t\t\t\tvalues[idx] = decode_value (cases.head());\n+\t\t\t\t\t\t\tEObject target = cases.tail().head();\n+\t\t\t\t\t\t\ttargets[idx] = decode_labelref(target);\n+\n+\t\t\t\t\t\t\tcases = cases.tail().tail();\n+\t\t\t\t\t\t\tidx += 1;\n+\t\t\t\t\t\t}\n+\t\t\t\t\t\t\n+\t\t\t\t\t\tvis.visitSelectValue(in, failLabel, values, targets);\n+\t\t\t\t\t\t\n+\t\t\t\t\t\tbreak;\n+\t\t\t\t\t}\n+\n+\n+\t\t\t\t\t\n+\t\t\t\t\tcase get_tuple_element: {\n+\t\t\t\t\t\t\n+\t\t\t\t\t\tArg in = decode_arg(insn_idx, insn.elm(2));\n+\t\t\t\t\t\tint idx = insn.elm(3).asInt();\n+\t\t\t\t\t\tArg out = decode_out_arg(insn_idx, insn.elm(4));\n+\n+\t\t\t\t\t\tvis.visitInsn(opcode, in, out, idx);\n+\t\t\t\t\t\t\n+\t\t\t\t\t\tbreak;\n+\t\t\t\t\t}\n+\t\t\t\t\t\n+\t\t\t\t\tcase jump:\n+\t\t\t\t\t\tvis.visitJump(decode_labelref(insn.elm(2)));\n+\t\t\t\t\t\tbreak;\n+\t\t\t\t\t\t\n+\t\t\t\t\tcase trim:\n+\t\t\t\t\t\tbreak;\n+\t\t\t\t\t\n+\t\t\t\t\tcase get_list:\n+\t\t\t\t\t\tvis.visitInsn(opcode, new Arg[] { decode_arg(insn_idx, insn.elm(2)), \n+\t\t\t\t\t\t\t\tdecode_out_arg(insn_idx, insn.elm(3)), \n+\t\t\t\t\t\t\t\tdecode_out_arg(insn_idx, insn.elm(4))\n+\t\t\t\t\t\t\t\t});\n+\t\t\t\t\t\tbreak;\n+\t\t\t\t\t\t\n+\t\t\t\t\tcase badmatch:\n+\t\t\t\t\tcase case_end:\n+\t\t\t\t\t\tvis.visitInsn(opcode, decode_arg(insn_idx, insn.elm(2)));\n \t\t\t\t\t\tbreak;\n \t\t\t\t\t\t\n+\t\t\t\t\tcase if_end:\n+\t\t\t\t\t\tvis.visitInsn(opcode);\n+\t\t\t\t\t\tbreak;\n+\t\t\t\t\t\t\n+\t\t\t\t\tcase send: {\n+\t\t\t\t\t\tvis.visitInsn(opcode, new Arg[] { new Arg(Arg.Kind.X, 0), new Arg(Arg.Kind.X, 1) });\n+\t\t\t\t\t\tbreak;\n+\t\t\t\t\t}\n+\t\t\t\t\t\t\n \t\t\t\t\tdefault:\n \t\t\t\t\t\tthrow new Error(\"unhandled insn: \" + insn);\n \t\t\t\t\t}\n \n \t\t\t\t}\n \t\t\t}\n \n+\t\t\tprivate void do_call(BlockVisitor2 vis, int insn_idx, ETuple insn,\n+\t\t\t\t\tboolean is_tail, boolean is_external) throws Error {\n+\t\t\t\tint arg_count = insn.elm(2).asInt();\n+\t\t\t\tArg[] args = new Arg[arg_count];\n+\t\t\t\tfor (int i = 0; i < arg_count; i++) {\n+\t\t\t\t\targs[i] = new Arg(Kind.X, i, this.map[insn_idx].getx(i));\n+\t\t\t\t}\n+\t\t\t\t\n+\t\t\t\tETuple ft = insn.elm(3).testTuple();\n+\t\t\t\tExtFunc fun;\n+\t\t\t\tif (ft.elm(1) != EXTFUNC_ATOM)\n+\t\t\t\t\tfun = new ExtFunc(ft.elm(1).testAtom(), ft.elm(2)\n+\t\t\t\t\t\t\t.testAtom(), ft.elm(3).asInt());\n+\t\t\t\telse\n+\t\t\t\t\tfun = new ExtFunc(ft.elm(2).testAtom(), ft.elm(3)\n+\t\t\t\t\t\t.testAtom(), ft.elm(4).asInt());\n+\t\t\t\tvis.visitCall(fun, args, is_tail, is_external);\n+\t\t\t}\n+\n \t\t\tprivate void accept_2_test(BlockVisitor2 vis, ETuple insn,\n \t\t\t\t\tint insn_idx) {\n \n-\t\t\t\tint failLabel = decode_labelref(insn.nth(3));\n+\t\t\t\tint failLabel = decode_labelref(insn.elm(3));\n \n-\t\t\t\tArg[] args = decode_args(insn_idx, insn.nth(4).asSeq()\n-\t\t\t\t\t\t.toArray());\n+\t\t\t\tEObject[] argExprs = insn.elm(4).testSeq().toArray();\n+\t\t\t\tArg[] args = decode_args(insn_idx, argExprs);\n \n-\t\t\t\tBeamOpcode test = BeamOpcode.get(insn.nth(2).asAtom());\n+\t\t\t\tBeamOpcode test = BeamOpcode.get(insn.elm(2).testAtom());\n \t\t\t\tswitch (test) {\n+\t\t\t\tcase is_boolean:\n+\t\t\t\tcase is_atom:\n+\t\t\t\t\tvis.visitTest(test, failLabel, args[0], EATOM_TYPE);\n+\t\t\t\t\tbreak;\n+\n+\t\t\t\tcase is_integer:\n+\t\t\t\t\tvis.visitTest(test, failLabel, args[0], EINTEGER_TYPE);\n+\t\t\t\t\tbreak;\n+\n \t\t\t\tcase is_list:\n \t\t\t\t\tvis.visitTest(test, failLabel, args[0], ECONS_TYPE);\n \t\t\t\t\tbreak;\n@@ -481,17 +709,33 @@ private void accept_2_test(BlockVisitor2 vis, ETuple insn,\n \t\t\t\t\tvis.visitTest(test, failLabel, args[0], ESEQ_TYPE);\n \t\t\t\t\tbreak;\n \n+\t\t\t\tcase is_tuple:\n+\t\t\t\t\tvis.visitTest(test, failLabel, args[0], ETUPLE_TYPE);\n+\t\t\t\t\tbreak;\n+\n \t\t\t\tcase is_nil:\n \t\t\t\t\tvis.visitTest(test, failLabel, args[0], ENIL_TYPE);\n \t\t\t\t\tbreak;\n \n+\t\t\t\tcase is_lt:\n+\t\t\t\tcase is_ge:\n+\t\t\t\tcase is_eq_exact:\n+\t\t\t\tcase is_ne_exact:\n+\t\t\t\tcase is_ne:\n \t\t\t\tcase is_eq:\n-\t\t\t\t\tvis.visitTest(test, failLabel, args, (Arg)null, Type.VOID_TYPE);\n+\t\t\t\t\tvis.visitTest(test, failLabel, args, (Arg) null,\n+\t\t\t\t\t\t\tType.VOID_TYPE);\n+\t\t\t\t\tbreak;\n+\n+\t\t\t\tcase test_arity:\n+\t\t\t\t\tint arity = argExprs[1].asInt();\n+\t\t\t\t\tvis.visitTest(test, failLabel, args[0], arity, getTupleType(arity));\n \t\t\t\t\tbreak;\n \t\t\t\t\t\n+\t\t\t\t\t\n \t\t\t\tdefault:\n \t\t\t\t\tthrow new Error(\"unhandled test: \" + insn + \" at index \"\n-\t\t\t\t\t\t\t+ insn_idx);\n+\t\t\t\t\t\t\t+ insn_idx + \" // \" + test + \":\" + test.ordinal());\n \t\t\t\t}\n \n \t\t\t}\n@@ -530,11 +774,11 @@ private Arg decode_arg(int insn_idx, EObject src) {\n \t\t\t\t\t\tint freg = tup.elem2.asInt();\n \t\t\t\t\t\treturn new Arg(Arg.Kind.F, freg, Type.DOUBLE_TYPE);\n \t\t\t\t\t} else if (tup.elem1 == ATOM_ATOM) {\n-\t\t\t\t\t\treturn new Arg(tup.elem2);\n+\t\t\t\t\t\treturn new Arg(tup.elem2, EATOM_TYPE);\n \t\t\t\t\t} else if (tup.elem1 == LITERAL_ATOM) {\n \t\t\t\t\t\treturn new Arg(tup.elem2);\n \t\t\t\t\t} else if (tup.elem1 == INTEGER_ATOM) {\n-\t\t\t\t\t\tif (tup.elem2.asInteger() != null) {\n+\t\t\t\t\t\tif (tup.elem2.testInteger() != null) {\n \t\t\t\t\t\t\treturn new Arg(tup.elem2, Type.INT_TYPE);\n \t\t\t\t\t\t} else {\n \t\t\t\t\t\t\treturn new Arg(tup.elem2);\n@@ -544,14 +788,48 @@ private Arg decode_arg(int insn_idx, EObject src) {\n \t\t\t\t\t}\n \n \t\t\t\t} else if (src == NIL_ATOM) {\n-\t\t\t\t\treturn new Arg(src);\n+\t\t\t\t\treturn new Arg(ENil.NIL, ENIL_TYPE);\n \n \t\t\t\t}\n \n \t\t\t\treturn null;\n \n \t\t\t}\n \n+\t\t\t/**\n+\t\t\t * @param insnIdx\n+\t\t\t * @param eObject\n+\t\t\t * @return\n+\t\t\t */\n+\t\t\tprivate Arg decode_value(EObject src) {\n+\n+\t\t\t\tif (src instanceof ETuple2) {\n+\t\t\t\t\tETuple2 tup = (ETuple2) src;\n+\t\t\t\t\tif (tup.elem1 == ATOM_ATOM) {\n+\t\t\t\t\t\treturn new Arg(tup.elem2, EATOM_TYPE);\n+\t\t\t\t\t} else if (tup.elem1 == LITERAL_ATOM) {\n+\t\t\t\t\t\treturn new Arg(tup.elem2);\n+\t\t\t\t\t} else if (tup.elem1 == INTEGER_ATOM) {\n+\t\t\t\t\t\tif (tup.elem2.testInteger() != null) {\n+\t\t\t\t\t\t\treturn new Arg(tup.elem2, Type.INT_TYPE);\n+\t\t\t\t\t\t} else {\n+\t\t\t\t\t\t\treturn new Arg(tup.elem2);\n+\t\t\t\t\t\t}\n+\t\t\t\t\t} else if (tup.elem1 == FLOAT_ATOM) {\n+\t\t\t\t\t\treturn new Arg(tup.elem2, Type.DOUBLE_TYPE);\n+\t\t\t\t\t}\n+\n+\t\t\t\t} else if (src == NIL_ATOM) {\n+\t\t\t\t\treturn new Arg(ENil.NIL, ENIL_TYPE);\n+\n+\t\t\t\t}\n+\n+\t\t\t\tthrow new Error(\"unknown value\");\n+\n+\t\t\t}\n+\n+\n+\t\t\t\n \t\t\tprivate Arg decode_out_arg(int insn_idx, EObject src) {\n \t\t\t\tTypeMap current = this.map[insn_idx];\n \n@@ -566,7 +844,7 @@ private Arg decode_out_arg(int insn_idx, EObject src) {\n \t\t\t\t\t} else if (tup.elem1 == FR_ATOM) {\n \t\t\t\t\t\tint freg = tup.elem2.asInt();\n \t\t\t\t\t\treturn new Arg(Arg.Kind.F, freg);\n-\t\t\t\t\t} \n+\t\t\t\t\t}\n \t\t\t\t}\n \n \t\t\t\tthrow new Error();\n@@ -578,8 +856,10 @@ private Arg decode_out_arg(int insn_idx, EObject src) {\n \t\t\t * @return\n \t\t\t */\n \t\t\tprivate int decode_labelref(EObject f_tup) {\n-\t\t\t\tassert (f_tup.asTuple().nth(1) == F_ATOM);\n-\t\t\t\treturn f_tup.asTuple().nth(2).asInt();\n+\t\t\t\tif (f_tup == NOFAIL_ATOM)\n+\t\t\t\t\treturn 0;\n+\t\t\t\tassert (f_tup.testTuple().elm(1) == F_ATOM);\n+\t\t\t\treturn f_tup.testTuple().elm(2).asInt();\n \t\t\t}\n \n \t\t\tpublic boolean isDeadCode() {\n@@ -622,7 +902,7 @@ public void analyze0() {\n \n \t\t\t\t\tmap[insn_idx] = current;\n \t\t\t\t\tETuple insn = insns.get(insn_idx);\n-\t\t\t\t\tBeamOpcode code = BeamOpcode.get(insn.nth(1).asAtom());\n+\t\t\t\t\tBeamOpcode code = BeamOpcode.get(insn.elm(1).testAtom());\n \t\t\t\t\tlast_opcode = code;\n \t\t\t\t\t/*\n \t\t\t\t\t * System.out.println(name + \"(\" + bb_label + \"):\" + i +\n@@ -631,8 +911,8 @@ public void analyze0() {\n \t\t\t\t\tswitch (code) {\n \t\t\t\t\tcase fmove:\n \t\t\t\t\tcase move: {\n-\t\t\t\t\t\tEObject src = insn.nth(2);\n-\t\t\t\t\t\tEObject dst = insn.nth(3);\n+\t\t\t\t\t\tEObject src = insn.elm(2);\n+\t\t\t\t\t\tEObject dst = insn.elm(3);\n \n \t\t\t\t\t\tType srcType = getType(current, src);\n \n@@ -654,7 +934,7 @@ public void analyze0() {\n \t\t\t\t\t}\n \n \t\t\t\t\tcase jump: {\n-\t\t\t\t\t\tcurrent = branch(current, insn.nth(2), insn_idx);\n+\t\t\t\t\t\tcurrent = branch(current, insn.elm(2), insn_idx);\n \t\t\t\t\t\tcontinue next_insn;\n \n \t\t\t\t\t}\n@@ -667,15 +947,15 @@ public void analyze0() {\n \n \t\t\t\t\tcase arithfbif: {\n \t\t\t\t\t\tSystem.err.println(insn);\n-\t\t\t\t\t\tEAtom name = insn.nth(2).asAtom();\n-\t\t\t\t\t\tESeq parms = insn.nth(4).asSeq();\n+\t\t\t\t\t\tEAtom name = insn.elm(2).testAtom();\n+\t\t\t\t\t\tESeq parms = insn.elm(4).testSeq();\n \n \t\t\t\t\t\tcheckArgs(current, parms, insn);\n \n \t\t\t\t\t\tType type = getBifResult(name.getName(), parmTypes(\n \t\t\t\t\t\t\t\tcurrent, parms), false);\n \n-\t\t\t\t\t\tcurrent = setType(current, insn.nth(5), type);\n+\t\t\t\t\t\tcurrent = setType(current, insn.elm(5), type);\n \n \t\t\t\t\t\tcontinue next_insn;\n \t\t\t\t\t}\n@@ -684,40 +964,40 @@ public void analyze0() {\n \t\t\t\t\t\t// {gc_bif,BifName,F,Live,[A1,A2?],Reg};\n \n \t\t\t\t\t\tboolean is_guard = false;\n-\t\t\t\t\t\tif (insn.nth(3).asTuple().nth(2).asInt() != 0) {\n+\t\t\t\t\t\tif (insn.elm(3).testTuple().elm(2).asInt() != 0) {\n \t\t\t\t\t\t\tis_guard = true;\n \t\t\t\t\t\t}\n \n \t\t\t\t\t\t// System.err.println(insn);\n-\t\t\t\t\t\tcurrent = branch(current, insn.nth(3), insn_idx);\n+\t\t\t\t\t\tcurrent = branch(current, insn.elm(3), insn_idx);\n \n-\t\t\t\t\t\tEAtom name = insn.nth(2).asAtom();\n-\t\t\t\t\t\tESeq parms = insn.nth(5).asSeq();\n+\t\t\t\t\t\tEAtom name = insn.elm(2).testAtom();\n+\t\t\t\t\t\tESeq parms = insn.elm(5).testSeq();\n \n \t\t\t\t\t\tcheckArgs(current, parms, insn);\n \n \t\t\t\t\t\tType type = getBifResult(name.getName(), parmTypes(\n \t\t\t\t\t\t\t\tcurrent, parms), is_guard);\n \n-\t\t\t\t\t\tcurrent = setType(current, insn.nth(6), type);\n+\t\t\t\t\t\tcurrent = setType(current, insn.elm(6), type);\n \n \t\t\t\t\t\t// dump();\n \t\t\t\t\t\tcontinue next_insn;\n \t\t\t\t\t}\n \n \t\t\t\t\tcase bif: {\n \t\t\t\t\t\t// System.err.println(insn);\n-\t\t\t\t\t\tcurrent = branch(current, insn.nth(3), insn_idx);\n+\t\t\t\t\t\tcurrent = branch(current, insn.elm(3), insn_idx);\n \n-\t\t\t\t\t\tEAtom name = insn.nth(2).asAtom();\n-\t\t\t\t\t\tESeq parms = insn.nth(4).asSeq();\n+\t\t\t\t\t\tEAtom name = insn.elm(2).testAtom();\n+\t\t\t\t\t\tESeq parms = insn.elm(4).testSeq();\n \n \t\t\t\t\t\tcheckArgs(current, parms, insn);\n \n \t\t\t\t\t\tType type = getBifResult(name.getName(), parmTypes(\n \t\t\t\t\t\t\t\tcurrent, parms), false);\n \n-\t\t\t\t\t\tcurrent = setType(current, insn.nth(5), type);\n+\t\t\t\t\t\tcurrent = setType(current, insn.elm(5), type);\n \n \t\t\t\t\t\tcontinue next_insn;\n \t\t\t\t\t}\n@@ -736,36 +1016,36 @@ public void analyze0() {\n \n \t\t\t\t\tcase fconv: {\n \t\t\t\t\t\t// unbox and convert to DOUBLE\n-\t\t\t\t\t\tgetType(current, insn.nth(2));\n-\t\t\t\t\t\tcurrent = setType(current, insn.nth(3),\n+\t\t\t\t\t\tgetType(current, insn.elm(2));\n+\t\t\t\t\t\tcurrent = setType(current, insn.elm(3),\n \t\t\t\t\t\t\t\tType.DOUBLE_TYPE);\n \t\t\t\t\t\tcontinue next_insn;\n \t\t\t\t\t}\n \n \t\t\t\t\tcase init: {\n-\t\t\t\t\t\tcurrent = setType(current, insn.nth(2), null);\n+\t\t\t\t\t\tcurrent = setType(current, insn.elm(2), null);\n \t\t\t\t\t\tcontinue next_insn;\n \t\t\t\t\t}\n \n \t\t\t\t\tcase set_tuple_element: {\n-\t\t\t\t\t\tgetType(current, insn.nth(2));\n-\t\t\t\t\t\tgetType(current, insn.nth(3));\n+\t\t\t\t\t\tgetType(current, insn.elm(2));\n+\t\t\t\t\t\tgetType(current, insn.elm(3));\n \t\t\t\t\t\tcontinue next_insn;\n \t\t\t\t\t}\n \n \t\t\t\t\tcase get_tuple_element: {\n-\t\t\t\t\t\tEObject src = insn.nth(2);\n-\t\t\t\t\t\tint idx = insn.nth(3).asInt();\n-\t\t\t\t\t\tEObject dst = insn.nth(4);\n+\t\t\t\t\t\tEObject src = insn.elm(2);\n+\t\t\t\t\t\tint idx = insn.elm(3).asInt();\n+\t\t\t\t\t\tEObject dst = insn.elm(4);\n \t\t\t\t\t\tgetType(current, src);\n \t\t\t\t\t\tcurrent = setType(current, dst, EOBJECT_TYPE);\n \t\t\t\t\t\tcontinue next_insn;\n \t\t\t\t\t}\n \n \t\t\t\t\tcase get_list: {\n-\t\t\t\t\t\tEObject from = insn.nth(2);\n-\t\t\t\t\t\tEObject head_into = insn.nth(3);\n-\t\t\t\t\t\tEObject tail_into = insn.nth(4);\n+\t\t\t\t\t\tEObject from = insn.elm(2);\n+\t\t\t\t\t\tEObject head_into = insn.elm(3);\n+\t\t\t\t\t\tEObject tail_into = insn.elm(4);\n \n \t\t\t\t\t\tcurrent = setType(current, head_into, EOBJECT_TYPE);\n \n@@ -781,35 +1061,35 @@ public void analyze0() {\n \n \t\t\t\t\tcase put_list: {\n \n-\t\t\t\t\t\tType head_type = getType(current, insn.nth(2));\n-\t\t\t\t\t\tType tail_type = getType(current, insn.nth(3));\n+\t\t\t\t\t\tType head_type = getType(current, insn.elm(2));\n+\t\t\t\t\t\tType tail_type = getType(current, insn.elm(3));\n \n \t\t\t\t\t\tif (tail_type == null) {\n-\t\t\t\t\t\t\tthrow new Error(\"value: \" + insn.nth(3)\n+\t\t\t\t\t\t\tthrow new Error(\"value: \" + insn.elm(3)\n \t\t\t\t\t\t\t\t\t+ \" has no type\");\n \t\t\t\t\t\t}\n \n \t\t\t\t\t\tif (tail_type.equals(ENIL_TYPE)\n \t\t\t\t\t\t\t\t|| tail_type.equals(ESEQ_TYPE)\n \t\t\t\t\t\t\t\t|| tail_type.equals(ELIST_TYPE)) {\n-\t\t\t\t\t\t\tcurrent = setType(current, insn.nth(4), ELIST_TYPE);\n+\t\t\t\t\t\t\tcurrent = setType(current, insn.elm(4), ELIST_TYPE);\n \t\t\t\t\t\t} else {\n-\t\t\t\t\t\t\tcurrent = setType(current, insn.nth(4), ECONS_TYPE);\n+\t\t\t\t\t\t\tcurrent = setType(current, insn.elm(4), ECONS_TYPE);\n \t\t\t\t\t\t}\n \t\t\t\t\t\tcontinue next_insn;\n \t\t\t\t\t}\n \n \t\t\t\t\tcase put_tuple: {\n-\t\t\t\t\t\tint arity = insn.nth(2).asInt();\n-\t\t\t\t\t\tETuple reg = insn.nth(3).asTuple();\n+\t\t\t\t\t\tint arity = insn.elm(2).asInt();\n+\t\t\t\t\t\tETuple reg = insn.elm(3).testTuple();\n \n \t\t\t\t\t\tcurrent = setType(current, reg, getTupleType(arity));\n \t\t\t\t\t\tcontinue next_insn;\n \t\t\t\t\t}\n \n \t\t\t\t\tcase K_try:\n-\t\t\t\t\t\tcurrent = setType(current, insn.nth(2), EOBJECT_TYPE);\n-\t\t\t\t\t\tcurrent = branch(current, insn.nth(3), insn_idx);\n+\t\t\t\t\t\tcurrent = setType(current, insn.elm(2), EOBJECT_TYPE);\n+\t\t\t\t\t\tcurrent = branch(current, insn.elm(3), insn_idx);\n \t\t\t\t\t\tcontinue next_insn;\n \n \t\t\t\t\tcase try_case_end:\n@@ -818,39 +1098,39 @@ public void analyze0() {\n \t\t\t\t\t\tcontinue next_insn;\n \n \t\t\t\t\tcase try_case:\n-\t\t\t\t\t\tgetType(current, insn.nth(2));\n+\t\t\t\t\t\tgetType(current, insn.elm(2));\n \t\t\t\t\t\tcurrent = current.setx(0, EATOM_TYPE); // reason\n \t\t\t\t\t\tcurrent = current.setx(1, EOBJECT_TYPE); // value\n \t\t\t\t\t\tcurrent = current.setx(2, EOBJECT_TYPE); // trace\n \t\t\t\t\t\tcontinue next_insn;\n \n \t\t\t\t\tcase raise:\n \t\t\t\t\t\tboolean is_guard = false;\n-\t\t\t\t\t\tif (insn.nth(2).asTuple().nth(2).asInt() != 0) {\n+\t\t\t\t\t\tif (insn.elm(2).testTuple().elm(2).asInt() != 0) {\n \t\t\t\t\t\t\tis_guard = true;\n \t\t\t\t\t\t}\n \n-\t\t\t\t\t\tcheckArgs(current, insn.nth(3), insn);\n-\t\t\t\t\t\tcurrent = setType(current, insn.nth(4), EOBJECT_TYPE);\n+\t\t\t\t\t\tcheckArgs(current, insn.elm(3), insn);\n+\t\t\t\t\t\tcurrent = setType(current, insn.elm(4), EOBJECT_TYPE);\n \n \t\t\t\t\t\tcontinue next_insn;\n \n \t\t\t\t\tcase K_catch:\n-\t\t\t\t\t\tcurrent = branch(current, insn.nth(3), insn_idx);\n+\t\t\t\t\t\tcurrent = branch(current, insn.elm(3), insn_idx);\n \t\t\t\t\t\tcontinue next_insn;\n \n \t\t\t\t\tcase catch_end:\n \t\t\t\t\t\tcontinue next_insn;\n \n \t\t\t\t\tcase make_fun2: {\n-\t\t\t\t\t\tcurrent.touchx(0, insn.nth(5).asInt());\n+\t\t\t\t\t\tcurrent.touchx(0, insn.elm(5).asInt());\n \t\t\t\t\t\tcurrent = current.setx(0, EFUN_TYPE);\n \t\t\t\t\t\tcontinue next_insn;\n \t\t\t\t\t}\n \n \t\t\t\t\tcase loop_rec: {\n-\t\t\t\t\t\tcurrent = branch(current, insn.nth(2), insn_idx);\n-\t\t\t\t\t\tcurrent = setType(current, insn.nth(3), EOBJECT_TYPE);\n+\t\t\t\t\t\tcurrent = branch(current, insn.elm(2), insn_idx);\n+\t\t\t\t\t\tcurrent = setType(current, insn.elm(3), EOBJECT_TYPE);\n \t\t\t\t\t\tcontinue next_insn;\n \t\t\t\t\t}\n \n@@ -866,16 +1146,16 @@ public void analyze0() {\n \t\t\t\t\t}\n \n \t\t\t\t\tcase wait_timeout: {\n-\t\t\t\t\t\tType timeout_type = getType(current, insn.nth(3));\n+\t\t\t\t\t\tType timeout_type = getType(current, insn.elm(3));\n \t\t\t\t\t}\n \t\t\t\t\tcase wait: {\n-\t\t\t\t\t\tcurrent = branch(current, insn.nth(2), insn_idx);\n+\t\t\t\t\t\tcurrent = branch(current, insn.elm(2), insn_idx);\n \t\t\t\t\t\tcontinue next_insn;\n \t\t\t\t\t}\n \n \t\t\t\t\tcase deallocate:\n \t\t\t\t\tcase trim: {\n-\t\t\t\t\t\tint howmuch = insn.nth(2).asInt();\n+\t\t\t\t\t\tint howmuch = insn.elm(2).asInt();\n \t\t\t\t\t\tcurrent = current.trim_y(howmuch);\n \t\t\t\t\t\tcontinue next_insn;\n \t\t\t\t\t}\n@@ -887,7 +1167,7 @@ public void analyze0() {\n \n \t\t\t\t\tcase allocate_zero:\n \t\t\t\t\tcase allocate_heap_zero: {\n-\t\t\t\t\t\tint slots = insn.nth(2).asInt();\n+\t\t\t\t\t\tint slots = insn.elm(2).asInt();\n \t\t\t\t\t\tcurrent = current.alloc_y(slots);\n \t\t\t\t\t\tfor (int slot = 0; slot < slots; slot++) {\n \t\t\t\t\t\t\tcurrent = current.sety(slot, ENIL_TYPE);\n@@ -897,7 +1177,7 @@ public void analyze0() {\n \n \t\t\t\t\tcase allocate:\n \t\t\t\t\tcase allocate_heap: {\n-\t\t\t\t\t\tcurrent = current.alloc_y(insn.nth(2).asInt());\n+\t\t\t\t\t\tcurrent = current.alloc_y(insn.elm(2).asInt());\n \t\t\t\t\t\tcontinue next_insn;\n \t\t\t\t\t}\n \n@@ -906,20 +1186,22 @@ public void analyze0() {\n \t\t\t\t\t\tcontinue next_insn;\n \n \t\t\t\t\tcase put:\n-\t\t\t\t\t\tgetType(current, insn.nth(2));\n+\t\t\t\t\t\tgetType(current, insn.elm(2));\n \t\t\t\t\t\tcontinue next_insn;\n \n \t\t\t\t\tcase select_tuple_arity: {\n-\t\t\t\t\t\tcurrent = branch(current, insn.nth(3), insn_idx);\n+\t\t\t\t\t\tcurrent = branch(current, insn.elm(3), insn_idx);\n \n \t\t\t\t\t\t// touch select reg\n-\t\t\t\t\t\tgetType(current, insn.nth(2));\n+\t\t\t\t\t\tgetType(current, insn.elm(2));\n \n-\t\t\t\t\t\tESeq cases = insn.nth(4).asTuple().nth(2).asSeq();\n-\t\t\t\t\t\twhile (cases != ESeq.EMPTY) {\n+\t\t\t\t\t\tESeq cases = insn.elm(4).testTuple().elm(2).testSeq();\n+\t\t\t\t\t\twhile (cases != ESeq.NIL) {\n \t\t\t\t\t\t\tEObject value = cases.head();\n \t\t\t\t\t\t\tEObject target = cases.tail().head();\n \n+\t\t\t\t\t\t\tcurrent = setType(current, insn.elm(2), getTupleType(value.asInt()));\n+\t\t\t\t\t\t\t\n \t\t\t\t\t\t\tcurrent = branch(current, target, insn_idx);\n \n \t\t\t\t\t\t\tcases = cases.tail().tail();\n@@ -929,13 +1211,13 @@ public void analyze0() {\n \t\t\t\t\t}\n \n \t\t\t\t\tcase select_val: {\n-\t\t\t\t\t\tcurrent = branch(current, insn.nth(3), insn_idx);\n+\t\t\t\t\t\tcurrent = branch(current, insn.elm(3), insn_idx);\n \n \t\t\t\t\t\t// touch select reg\n-\t\t\t\t\t\tgetType(current, insn.nth(2));\n+\t\t\t\t\t\tgetType(current, insn.elm(2));\n \n-\t\t\t\t\t\tESeq cases = insn.nth(4).asTuple().nth(2).asSeq();\n-\t\t\t\t\t\twhile (cases != ESeq.EMPTY) {\n+\t\t\t\t\t\tESeq cases = insn.elm(4).testTuple().elm(2).testSeq();\n+\t\t\t\t\t\twhile (cases != ESeq.NIL) {\n \t\t\t\t\t\t\tEObject value = cases.head();\n \t\t\t\t\t\t\tEObject target = cases.tail().head();\n \n@@ -952,7 +1234,7 @@ public void analyze0() {\n \t\t\t\t\tcase apply:\n \t\t\t\t\tcase call:\n \t\t\t\t\tcase call_ext: {\n-\t\t\t\t\t\tint argCount = insn.nth(2).asInt();\n+\t\t\t\t\t\tint argCount = insn.elm(2).asInt();\n \t\t\t\t\t\tcurrent.touchx(0, argCount);\n \t\t\t\t\t\tcurrent = current.setx(0, EOBJECT_TYPE);\n \t\t\t\t\t\tcontinue next_insn;\n@@ -968,7 +1250,7 @@ public void analyze0() {\n \t\t\t\t\tcase call_ext_last:\n \t\t\t\t\tcase call_ext_only:\n \t\t\t\t\t\tis_tail_recursive = true;\n-\t\t\t\t\t\tint argCount = insn.nth(2).asInt();\n+\t\t\t\t\t\tint argCount = insn.elm(2).asInt();\n \t\t\t\t\t\tcurrent.touchx(0, argCount);\n \t\t\t\t\t\tcontinue next_insn;\n \n@@ -981,7 +1263,7 @@ public void analyze0() {\n \t\t\t\t\t\tcontinue next_insn;\n \n \t\t\t\t\tcase bs_context_to_binary: {\n-\t\t\t\t\t\tType ctx = getType(current, insn.nth(2));\n+\t\t\t\t\t\tType ctx = getType(current, insn.elm(2));\n \t\t\t\t\t\tcurrent = current.setx(0, EBINARY_TYPE);\n \t\t\t\t\t\tcontinue next_insn;\n \t\t\t\t\t}\n@@ -1038,13 +1320,13 @@ boolean is_term(BeamOpcode code) {\n \t\t\tprivate int sizeof(TypeMap current, EObject cell) {\n \n \t\t\t\tETuple at;\n-\t\t\t\tif ((at = cell.asTuple()) != null) {\n+\t\t\t\tif ((at = cell.testTuple()) != null) {\n \t\t\t\t\tif (at.arity() == 2) {\n-\t\t\t\t\t\tif (at.nth(1) == X_ATOM)\n+\t\t\t\t\t\tif (at.elm(1) == X_ATOM)\n \t\t\t\t\t\t\treturn 32;\n-\t\t\t\t\t\tif (at.nth(1) == Y_ATOM)\n+\t\t\t\t\t\tif (at.elm(1) == Y_ATOM)\n \t\t\t\t\t\t\treturn 32;\n-\t\t\t\t\t\tif (at.nth(1) == FR_ATOM)\n+\t\t\t\t\t\tif (at.elm(1) == FR_ATOM)\n \t\t\t\t\t\t\treturn 64;\n \t\t\t\t\t}\n \t\t\t\t}\n@@ -1065,7 +1347,7 @@ private Type getBifResult(String name, Type[] parmTypes,\n \t\t\tprivate Type[] parmTypes(TypeMap current, ESeq args) {\n \t\t\t\tArrayList<Type> res = new ArrayList<Type>();\n \n-\t\t\t\twhile (args != ESeq.EMPTY) {\n+\t\t\t\twhile (args != ESeq.NIL) {\n \t\t\t\t\tEObject arg = args.head();\n \t\t\t\t\tres.add(getType(current, arg));\n \t\t\t\t\targs = args.tail();\n@@ -1075,9 +1357,9 @@ private Type[] parmTypes(TypeMap current, ESeq args) {\n \t\t\t}\n \n \t\t\tprivate void checkArgs(TypeMap current, EObject eTerm, ETuple insn) {\n-\t\t\t\tESeq args = eTerm.asSeq();\n+\t\t\t\tESeq args = eTerm.testSeq();\n \n-\t\t\t\twhile (args != ESeq.EMPTY) {\n+\t\t\t\twhile (args != ESeq.NIL) {\n \t\t\t\t\tEObject arg = args.head();\n \n \t\t\t\t\tif (getType(current, arg) == null) {\n@@ -1091,91 +1373,91 @@ private void checkArgs(TypeMap current, EObject eTerm, ETuple insn) {\n \t\t\tprivate TypeMap analyze_test(TypeMap current, ETuple insn,\n \t\t\t\t\tint insn_idx) {\n \n-\t\t\t\tcurrent = branch(current, insn.nth(3), insn_idx);\n+\t\t\t\tcurrent = branch(current, insn.elm(3), insn_idx);\n \n-\t\t\t\tEObject[] args = insn.nth(4).asSeq().toArray();\n+\t\t\t\tEObject[] args = insn.elm(4).testSeq().toArray();\n \t\t\t\tEObject arg1 = args[0];\n \t\t\t\tEObject arg2 = (args.length > 1) ? args[1] : null;\n \n-\t\t\t\tBeamOpcode test = BeamOpcode.get(insn.nth(2).asAtom());\n+\t\t\t\tBeamOpcode test = BeamOpcode.get(insn.elm(2).testAtom());\n \t\t\t\tswitch (test) {\n \t\t\t\tcase is_nil: {\n-\t\t\t\t\tcheckArgs(current, insn.nth(4), insn);\n-\t\t\t\t\treturn setType(current, arg1.asTuple(), ENIL_TYPE);\n+\t\t\t\t\tcheckArgs(current, insn.elm(4), insn);\n+\t\t\t\t\treturn setType(current, arg1.testTuple(), ENIL_TYPE);\n \t\t\t\t}\n \n \t\t\t\tcase is_list:\n \t\t\t\tcase is_nonempty_list: {\n-\t\t\t\t\tcheckArgs(current, insn.nth(4), insn);\n-\t\t\t\t\treturn setType(current, arg1.asTuple(), ECONS_TYPE);\n+\t\t\t\t\tcheckArgs(current, insn.elm(4), insn);\n+\t\t\t\t\treturn setType(current, arg1.testTuple(), ECONS_TYPE);\n \t\t\t\t}\n \n \t\t\t\tcase is_binary: {\n-\t\t\t\t\tcheckArgs(current, insn.nth(4), insn);\n-\t\t\t\t\treturn setType(current, arg1.asTuple(), EBINARY_TYPE);\n+\t\t\t\t\tcheckArgs(current, insn.elm(4), insn);\n+\t\t\t\t\treturn setType(current, arg1.testTuple(), EBINARY_TYPE);\n \t\t\t\t}\n \t\t\t\tcase is_tuple: {\n-\t\t\t\t\tcheckArgs(current, insn.nth(4), insn);\n-\t\t\t\t\treturn setType(current, arg1.asTuple(), ETUPLE_TYPE);\n+\t\t\t\t\tcheckArgs(current, insn.elm(4), insn);\n+\t\t\t\t\treturn setType(current, arg1.testTuple(), ETUPLE_TYPE);\n \t\t\t\t}\n \n \t\t\t\tcase test_arity: {\n-\t\t\t\t\tcheckArgs(current, insn.nth(4), insn);\n-\t\t\t\t\treturn setType(current, arg1.asTuple(), getTupleType(arg2\n+\t\t\t\t\tcheckArgs(current, insn.elm(4), insn);\n+\t\t\t\t\treturn setType(current, arg1.testTuple(), getTupleType(arg2\n \t\t\t\t\t\t\t.asInt()));\n \t\t\t\t}\n \n \t\t\t\tcase is_boolean:\n \t\t\t\tcase is_atom: {\n-\t\t\t\t\tcheckArgs(current, insn.nth(4), insn);\n-\t\t\t\t\treturn setType(current, arg1.asTuple(), EATOM_TYPE);\n+\t\t\t\t\tcheckArgs(current, insn.elm(4), insn);\n+\t\t\t\t\treturn setType(current, arg1.testTuple(), EATOM_TYPE);\n \t\t\t\t}\n \n \t\t\t\tcase is_integer: {\n-\t\t\t\t\tcheckArgs(current, insn.nth(4), insn);\n+\t\t\t\t\tcheckArgs(current, insn.elm(4), insn);\n \t\t\t\t\treturn setType(current, arg1, EINTEGER_TYPE);\n \t\t\t\t}\n \n \t\t\t\tcase is_pid: {\n-\t\t\t\t\tcheckArgs(current, insn.nth(4), insn);\n+\t\t\t\t\tcheckArgs(current, insn.elm(4), insn);\n \t\t\t\t\treturn setType(current, arg1, EPID_TYPE);\n \t\t\t\t}\n \n \t\t\t\tcase is_port: {\n-\t\t\t\t\tcheckArgs(current, insn.nth(4), insn);\n+\t\t\t\t\tcheckArgs(current, insn.elm(4), insn);\n \t\t\t\t\treturn setType(current, arg1, EPORT_TYPE);\n \t\t\t\t}\n \n \t\t\t\tcase is_float: {\n-\t\t\t\t\tcheckArgs(current, insn.nth(4), insn);\n+\t\t\t\t\tcheckArgs(current, insn.elm(4), insn);\n \t\t\t\t\treturn setType(current, arg1, EDOUBLE_TYPE);\n \t\t\t\t}\n \n \t\t\t\tcase is_ge:\n \t\t\t\tcase is_ne:\n \t\t\t\tcase is_ne_exact:\n-\t\t\t\t\tcheckArgs(current, insn.nth(4), insn);\n+\t\t\t\t\tcheckArgs(current, insn.elm(4), insn);\n \t\t\t\t\treturn current;\n \n \t\t\t\tcase is_eq:\n \t\t\t\tcase is_eq_exact: {\n-\t\t\t\t\tcheckArgs(current, insn.nth(4), insn);\n+\t\t\t\t\tcheckArgs(current, insn.elm(4), insn);\n \t\t\t\t\tType t1 = getType(current, arg1);\n \t\t\t\t\tType t2 = getType(current, arg2);\n \n \t\t\t\t\tif (!t1.equals(t2)) {\n \t\t\t\t\t\tif (isReg(arg1)) {\n-\t\t\t\t\t\t\tcurrent = setType(current, arg1.asTuple(), t2);\n+\t\t\t\t\t\t\tcurrent = setType(current, arg1.testTuple(), t2);\n \t\t\t\t\t\t} else if (isReg(arg2)) {\n-\t\t\t\t\t\t\tcurrent = setType(current, arg2.asTuple(), t1);\n+\t\t\t\t\t\t\tcurrent = setType(current, arg2.testTuple(), t1);\n \t\t\t\t\t\t}\n \t\t\t\t\t}\n \n \t\t\t\t\treturn current;\n \t\t\t\t}\n \n \t\t\t\tcase is_lt:\n-\t\t\t\t\tcheckArgs(current, insn.nth(4), insn);\n+\t\t\t\t\tcheckArgs(current, insn.elm(4), insn);\n \t\t\t\t\treturn current;\n \n \t\t\t\tcase bs_start_match2:\n@@ -1189,9 +1471,9 @@ private TypeMap analyze_test(TypeMap current, ETuple insn,\n \t\t\t\t\t}\n \n \t\t\t\t\tETuple tup;\n-\t\t\t\t\tif ((tup = args[3].asTuple()) != null) {\n-\t\t\t\t\t\tif (tup.nth(1) == INTEGER_ATOM\n-\t\t\t\t\t\t\t\t&& tup.nth(2).asInt() <= 32) {\n+\t\t\t\t\tif ((tup = args[3].testTuple()) != null) {\n+\t\t\t\t\t\tif (tup.elm(1) == INTEGER_ATOM\n+\t\t\t\t\t\t\t\t&& tup.elm(2).asInt() <= 32) {\n \t\t\t\t\t\t\tcurrent = setType(current, args[5], Type.INT_TYPE);\n \t\t\t\t\t\t\treturn current;\n \t\t\t\t\t\t}\n@@ -1246,11 +1528,11 @@ private void check(TypeMap current, EObject src) {\n \t\t\tprivate TypeMap branch(TypeMap current, EObject nth, int idx) {\n \t\t\t\tif (nth != NOFAIL_ATOM) {\n \n-\t\t\t\t\tETuple tuple = nth.asTuple();\n-\t\t\t\t\tif (tuple.nth(1) != F_ATOM)\n+\t\t\t\t\tETuple tuple = nth.testTuple();\n+\t\t\t\t\tif (tuple.elm(1) != F_ATOM)\n \t\t\t\t\t\tthrow new Error(\"not a branch target: \" + nth);\n \n-\t\t\t\t\tint target = tuple.nth(2).asInt();\n+\t\t\t\t\tint target = tuple.elm(2).asInt();\n \t\t\t\t\tif (target != 0) {\n \t\t\t\t\t\tget_lb(target, false).merge_from(current);\n \t\t\t\t\t}\n@@ -1265,9 +1547,9 @@ private Type getTupleType(int arity) {\n \t\t\t}\n \n \t\t\tprivate boolean isReg(EObject arg2) {\n-\t\t\t\tETuple et = arg2.asTuple();\n-\t\t\t\treturn (et != null && et.nth(1) == X_ATOM\n-\t\t\t\t\t\t|| et.nth(1) == Y_ATOM || et.nth(1) == FR_ATOM);\n+\t\t\t\tETuple et = arg2.testTuple();\n+\t\t\t\treturn (et != null && et.elm(1) == X_ATOM\n+\t\t\t\t\t\t|| et.elm(1) == Y_ATOM || et.elm(1) == FR_ATOM);\n \t\t\t}\n \n \t\t\tpublic void merge_from(TypeMap typeMap) {\n@@ -1304,10 +1586,10 @@ public void visitInsn(BeamOpcode opcode, ETuple insn) {\n \t\t\t}\n \n \t\t\tprivate TypeMap setType(TypeMap current, EObject dd, Type type) {\n-\t\t\t\tETuple dst = dd.asTuple();\n+\t\t\t\tETuple dst = dd.testTuple();\n \n-\t\t\t\tEObject key = dst.nth(1);\n-\t\t\t\tEObject value = dst.nth(2);\n+\t\t\t\tEObject key = dst.elm(1);\n+\t\t\t\tEObject value = dst.elm(2);\n \t\t\t\tif (key == X_ATOM) {\n \t\t\t\t\tcurrent = current.setx(value.asInt(), type);\n \t\t\t\t} else if (key == Y_ATOM) {\n@@ -1385,7 +1667,7 @@ public BInsn(ETuple insn, TypeMap current) {\n \n \t\t\t\t@Override\n \t\t\t\tpublic BeamOpcode opcode() {\n-\t\t\t\t\treturn BeamOpcode.get(insn.nth(1).asAtom());\n+\t\t\t\t\treturn BeamOpcode.get(insn.elm(1).testAtom());\n \t\t\t\t}\n \n \t\t\t\t@Override", "raw_url": "https://github.com/trifork/erjang/raw/070f8a4124a580cd7a140029dee655beeae8540b/src%2Ferjang%2Fbeam%2Fanalysis%2FBeamTypeAnalysis.java", "sha": "de39e7b609d9037b01a334371d2f3bdef61446d5", "status": "modified" }, { "additions": 21, "blob_url": "https://github.com/trifork/erjang/blob/070f8a4124a580cd7a140029dee655beeae8540b/src%2Ferjang%2Fjbeam%2FBEAMFile.java", "changes": 42, "contents_url": "https://api.github.com/repos/trifork/erjang/contents/src%2Ferjang%2Fjbeam%2FBEAMFile.java?ref=070f8a4124a580cd7a140029dee655beeae8540b", "deletions": 21, "filename": "src/erjang/jbeam/BEAMFile.java", "new_code": "\t\t\treturn sym2enum((EAtom) stmt.elm(1));\n\t\tObject nth = vec.elm(i);\n\t\tBeamFileTag opcode = sym2enum((EAtom) stmt.elm(1));\n\t\t\treturn (EInteger) stmt.elm(2);\n\t\t\treturn (EAtom) stmt.elm(2);\n\t\t\tETuple vec = (ETuple) stmt.elm(3);\n\t\t\tEAtom mod = (EAtom) vec.elm(1);\n\t\t\tEAtom fun = (EAtom) vec.elm(2);\n\t\t\tEInteger ari = (EInteger) vec.elm(3);\n\t\t\tETuple vec = (ETuple) stmt.elm(3);\n\t\t\tEAtom mod = (EAtom) vec.elm(1);\n\t\t\tEAtom fun = (EAtom) vec.elm(2);\n\t\t\tEInteger ari = (EInteger) vec.elm(3);\n\t\tESeq v = (ESeq) stmt.elm(i);\n\t\twhile (v != ECons.NIL) {\n\t\treturn (EList) stmt.elm(i);\n\t\treturn (EString) stmt.elm(i);\n\t\treturn (EAtom) stmt.elm(i);\n\t\treturn ((EInteger) stmt.elm(i)).intValue();\n\t\tif (value != ECons.NIL && value instanceof ECons) {\n\t\t\t\tregisterConst(t.elm(i));", "new_methods": [], "old_code": "\t\t\treturn sym2enum((EAtom) stmt.nth(1));\n\t\tObject nth = vec.nth(i);\n\t\tBeamFileTag opcode = sym2enum((EAtom) stmt.nth(1));\n\t\t\treturn (EInteger) stmt.nth(2);\n\t\t\treturn (EAtom) stmt.nth(2);\n\t\t\tETuple vec = (ETuple) stmt.nth(3);\n\t\t\tEAtom mod = (EAtom) vec.nth(1);\n\t\t\tEAtom fun = (EAtom) vec.nth(2);\n\t\t\tEInteger ari = (EInteger) vec.nth(3);\n\t\t\tETuple vec = (ETuple) stmt.nth(3);\n\t\t\tEAtom mod = (EAtom) vec.nth(1);\n\t\t\tEAtom fun = (EAtom) vec.nth(2);\n\t\t\tEInteger ari = (EInteger) vec.nth(3);\n\t\tESeq v = (ESeq) stmt.nth(i);\n\t\twhile (v != ECons.EMPTY) {\n\t\treturn (EList) stmt.nth(i);\n\t\treturn (EString) stmt.nth(i);\n\t\treturn (EAtom) stmt.nth(i);\n\t\treturn ((EInteger) stmt.nth(i)).intValue();\n\t\tif (value != ECons.EMPTY && value instanceof ECons) {\n\t\t\t\tregisterConst(t.nth(i));", "old_methods": [], "patch": "@@ -247,7 +247,7 @@ private BeamFileTag lookahead(List<ETerm> vec, int i) {\n \t\t\treturn sym2enum((EAtom) nth);\n \t\t} else {\n \t\t\tETuple stmt = (ETuple) nth;\n-\t\t\treturn sym2enum((EAtom) stmt.nth(1));\n+\t\t\treturn sym2enum((EAtom) stmt.elm(1));\n \t\t}\n \t}\n \n@@ -257,7 +257,7 @@ private Object decode(List<ETerm> vec, int i) throws Exception {\n \t}\n \n \tprivate Object decode(ETuple vec, int i) throws Exception {\n-\t\tObject nth = vec.nth(i);\n+\t\tObject nth = vec.elm(i);\n \t\treturn decode_one(nth);\n \t}\n \n@@ -277,7 +277,7 @@ private Object decode_one(Object nth) throws Exception {\n \n \tprivate Object decode_record(ETuple stmt) throws Exception {\n \n-\t\tBeamFileTag opcode = sym2enum((EAtom) stmt.nth(1));\n+\t\tBeamFileTag opcode = sym2enum((EAtom) stmt.elm(1));\n \t\tswitch (opcode) {\n \n \t\tcase file:\n@@ -313,10 +313,10 @@ private Object decode_record(ETuple stmt) throws Exception {\n \t\t\treturn (Register) new RegisterY(integer(stmt, 2));\n \n \t\tcase integer:\n-\t\t\treturn (EInteger) stmt.nth(2);\n+\t\t\treturn (EInteger) stmt.elm(2);\n \n \t\tcase atom:\n-\t\t\treturn (EAtom) stmt.nth(2);\n+\t\t\treturn (EAtom) stmt.elm(2);\n \n \t\tcase test:\n \t\t\treturn (Insn) new Test(atom(stmt, 2), (Label) decode(stmt, 3),\n@@ -340,19 +340,19 @@ private Object decode_record(ETuple stmt) throws Exception {\n \n \t\tcase call: {\n \t\t\tint nargs = integer(stmt, 2);\n-\t\t\tETuple vec = (ETuple) stmt.nth(3);\n-\t\t\tEAtom mod = (EAtom) vec.nth(1);\n-\t\t\tEAtom fun = (EAtom) vec.nth(2);\n-\t\t\tEInteger ari = (EInteger) vec.nth(3);\n+\t\t\tETuple vec = (ETuple) stmt.elm(3);\n+\t\t\tEAtom mod = (EAtom) vec.elm(1);\n+\t\t\tEAtom fun = (EAtom) vec.elm(2);\n+\t\t\tEInteger ari = (EInteger) vec.elm(3);\n \t\t\treturn new Call(nargs, mod, fun, ari.intValue(), false);\n \t\t}\n \n \t\tcase call_only: {\n \t\t\tint nargs = integer(stmt, 2);\n-\t\t\tETuple vec = (ETuple) stmt.nth(3);\n-\t\t\tEAtom mod = (EAtom) vec.nth(1);\n-\t\t\tEAtom fun = (EAtom) vec.nth(2);\n-\t\t\tEInteger ari = (EInteger) vec.nth(3);\n+\t\t\tETuple vec = (ETuple) stmt.elm(3);\n+\t\t\tEAtom mod = (EAtom) vec.elm(1);\n+\t\t\tEAtom fun = (EAtom) vec.elm(2);\n+\t\t\tEInteger ari = (EInteger) vec.elm(3);\n \t\t\treturn new Call(nargs, mod, fun, ari.intValue(), true);\n \t\t}\n \n@@ -385,35 +385,35 @@ private Object decode_record(ETuple stmt) throws Exception {\n \t}\n \n \tprivate Object[] decode_list(ETuple stmt, int i) throws Exception {\n-\t\tESeq v = (ESeq) stmt.nth(i);\n+\t\tESeq v = (ESeq) stmt.elm(i);\n \n \t\tObject[] result = new Object[v.count()];\n \t\tint pos = 0;\n-\t\twhile (v != ECons.EMPTY) {\n+\t\twhile (v != ECons.NIL) {\n \t\t\tresult[pos++] = decode_record((ETuple) v.head());\n \t\t\tv = v.tail();\n \t\t}\n \t\treturn result;\n \t}\n \n \tprivate EList list(ETuple stmt, int i) {\n-\t\treturn (EList) stmt.nth(i);\n+\t\treturn (EList) stmt.elm(i);\n \t}\n \n \tprivate EString string(ETuple stmt, int i) {\n-\t\treturn (EString) stmt.nth(i);\n+\t\treturn (EString) stmt.elm(i);\n \t}\n \n \tprivate EAtom atom(ETuple stmt, int i) {\n-\t\treturn (EAtom) stmt.nth(i);\n+\t\treturn (EAtom) stmt.elm(i);\n \t}\n \n \tprivate Register reg(ETuple stmt, int i) throws Exception {\n \t\treturn (Register) decode(stmt, i);\n \t}\n \n \tprivate int integer(ETuple stmt, int i) {\n-\t\treturn ((EInteger) stmt.nth(i)).intValue();\n+\t\treturn ((EInteger) stmt.elm(i)).intValue();\n \t}\n \n \tBeamFileTag sym2enum(EAtom sym) {\n@@ -452,13 +452,13 @@ public String registerConst(ETerm value) {\n \t\t\tconsts.put(value, str);\n \t\t}\n \t\t\n-\t\tif (value != ECons.EMPTY && value instanceof ECons) {\n+\t\tif (value != ECons.NIL && value instanceof ECons) {\n \t\t\tregisterConst(((ECons)value).head());\n \t\t\tregisterConst(((ECons)value).tail());\n \t\t} else if (value instanceof ETuple) {\n \t\t\tETuple t = (ETuple) value;\n \t\t\tfor (int i = 1; i <= t.arity(); i++) {\n-\t\t\t\tregisterConst(t.nth(i));\n+\t\t\t\tregisterConst(t.elm(i));\n \t\t\t}\n \t\t}\n \t\t", "raw_url": "https://github.com/trifork/erjang/raw/070f8a4124a580cd7a140029dee655beeae8540b/src%2Ferjang%2Fjbeam%2FBEAMFile.java", "sha": "b04c5cc2cc5825b6047718f1a969a06292cd04d5", "status": "modified" }, { "additions": 2, "blob_url": "https://github.com/trifork/erjang/blob/070f8a4124a580cd7a140029dee655beeae8540b/src%2Ferjang%2Fjbeam%2Fops%2FGCBif.java", "changes": 4, "contents_url": "https://api.github.com/repos/trifork/erjang/contents/src%2Ferjang%2Fjbeam%2Fops%2FGCBif.java?ref=070f8a4124a580cd7a140029dee655beeae8540b", "deletions": 2, "filename": "src/erjang/jbeam/ops/GCBif.java", "new_code": "import erjang.modules.erl_bif;\n\tprivate static final Type BIF_TYPE = Type.getType(erl_bif.class);", "new_methods": [], "old_code": "import erjang.modules.ErlangModule;\n\tprivate static final Type BIF_TYPE = Type.getType(ErlangModule.class);", "old_methods": [], "patch": "@@ -5,13 +5,13 @@\n \n import erjang.EAtom;\n import erjang.ETerm;\n-import erjang.modules.ErlangModule;\n+import erjang.modules.erl_bif;\n \n public class GCBif extends Insn {\n \n \tprivate static final Type EXCEPTION_TYPE = Type.getType(Exception.class);\n \n-\tprivate static final Type BIF_TYPE = Type.getType(ErlangModule.class);\n+\tprivate static final Type BIF_TYPE = Type.getType(erl_bif.class);\n \n \tprivate static final Type ETERM_TYPE = Type.getType(ETerm.class);\n \t", "raw_url": "https://github.com/trifork/erjang/raw/070f8a4124a580cd7a140029dee655beeae8540b/src%2Ferjang%2Fjbeam%2Fops%2FGCBif.java", "sha": "6ecba722bec22195cd63421f935fdf3e0b4f1df0", "status": "modified" }, { "additions": 2, "blob_url": "https://github.com/trifork/erjang/blob/070f8a4124a580cd7a140029dee655beeae8540b/src%2Ferjang%2Fjbeam%2Fops%2FTest.java", "changes": 4, "contents_url": "https://api.github.com/repos/trifork/erjang/contents/src%2Ferjang%2Fjbeam%2Fops%2FTest.java?ref=070f8a4124a580cd7a140029dee655beeae8540b", "deletions": 2, "filename": "src/erjang/jbeam/ops/Test.java", "new_code": "import erjang.modules.erl_bif;\n\tprivate static final Type BIF_TYPE = Type.getType(erl_bif.class);", "new_methods": [], "old_code": "import erjang.modules.ErlangModule;\n\tprivate static final Type BIF_TYPE = Type.getType(ErlangModule.class);", "old_methods": [], "patch": "@@ -4,15 +4,15 @@\n import org.objectweb.asm.Type;\n \n import erjang.EAtom;\n-import erjang.modules.ErlangModule;\n+import erjang.modules.erl_bif;\n \n public class Test extends Insn {\n \n \tprivate final EAtom how;\n \tprivate final Label failto;\n \tprivate final Object[] args;\n \n-\tprivate static final Type BIF_TYPE = Type.getType(ErlangModule.class);\n+\tprivate static final Type BIF_TYPE = Type.getType(erl_bif.class);\n \t\n \tpublic Test(EAtom how, Label failto, Object[] args) {\n \t\tthis.how = how;", "raw_url": "https://github.com/trifork/erjang/raw/070f8a4124a580cd7a140029dee655beeae8540b/src%2Ferjang%2Fjbeam%2Fops%2FTest.java", "sha": "1d6798b3a98f1f8f300ede51d3b19d779622695c", "status": "modified" }, { "additions": 14, "blob_url": "https://github.com/trifork/erjang/blob/070f8a4124a580cd7a140029dee655beeae8540b/src%2Ferjang%2Fmodules%2FBinOps.java", "changes": 28, "contents_url": "https://api.github.com/repos/trifork/erjang/contents/src%2Ferjang%2Fmodules%2FBinOps.java?ref=070f8a4124a580cd7a140029dee655beeae8540b", "deletions": 14, "filename": "src/erjang/modules/BinOps.java", "new_code": "\t\tif ((n1=o1.testNumber()) != null) {\n\t\t\tif ((n2=o2.testNumber()) != null) {\n\t\tif ((i1=o1.testInteger()) != null && (i2=o2.testInteger()) != null)\n\t\tif ((n1=o1.testNumber()) != null) {\n\t\t\tif ((n2=o2.testNumber()) != null) {\n\t\tif ((i1=o1.testInteger()) != null && (i2=o2.testInteger()) != null)\n\t\tif ((n1=o1.testNumber()) != null) {\n\t\t\tif ((n2=o2.testNumber()) != null) {\n\t\tif ((i1=o1.testInteger()) != null && (i2=o2.testInteger()) != null)\n\t\tif ((n1=o1.testNumber()) != null) {\n\t\t\tif ((n2=o2.testNumber()) != null) {\n\t\tif ((i1=o1.testInteger()) != null && (i2=o2.testInteger()) != null)\n\t\tif ((n1=o1.testNumber()) != null) {\n\t\t\tif ((n2=o2.testNumber()) != null) {", "new_methods": [], "old_code": "\t\tif ((n1=o1.asNumber()) != null) {\n\t\t\tif ((n2=o2.asNumber()) != null) {\n\t\tif ((i1=o1.asInteger()) != null && (i2=o2.asInteger()) != null)\n\t\tif ((n1=o1.asNumber()) != null) {\n\t\t\tif ((n2=o2.asNumber()) != null) {\n\t\tif ((i1=o1.asInteger()) != null && (i2=o2.asInteger()) != null)\n\t\tif ((n1=o1.asNumber()) != null) {\n\t\t\tif ((n2=o2.asNumber()) != null) {\n\t\tif ((i1=o1.asInteger()) != null && (i2=o2.asInteger()) != null)\n\t\tif ((n1=o1.asNumber()) != null) {\n\t\t\tif ((n2=o2.asNumber()) != null) {\n\t\tif ((i1=o1.asInteger()) != null && (i2=o2.asInteger()) != null)\n\t\tif ((n1=o1.asNumber()) != null) {\n\t\t\tif ((n2=o2.asNumber()) != null) {", "old_methods": [], "patch": "@@ -14,8 +14,8 @@ static public ENumber band_guard(EObject o1, EObject o2)\n \t{\n \t\tENumber n1;\n \t\tENumber n2;\n-\t\tif ((n1=o1.asNumber()) != null) {\n-\t\t\tif ((n2=o2.asNumber()) != null) {\n+\t\tif ((n1=o1.testNumber()) != null) {\n+\t\t\tif ((n2=o2.testNumber()) != null) {\n \t\t\t\treturn n1.bitAnd(n2);\n \t\t\t}\n \t\t}\n@@ -28,15 +28,15 @@ static public ENumber band_guard(EObject o1, EObject o2)\n \tstatic public ENumber band(EObject o1, EObject o2)\n \t{\n \t\tEInteger i1, i2;\n-\t\tif ((i1=o1.asInteger()) != null && (i2=o2.asInteger()) != null)\n+\t\tif ((i1=o1.testInteger()) != null && (i2=o2.testInteger()) != null)\n \t\t{\n \t\t\treturn new EInteger(i1.value & i2.value);\n \t\t}\n \t\t\n \t\tENumber n1;\n \t\tENumber n2;\n-\t\tif ((n1=o1.asNumber()) != null) {\n-\t\t\tif ((n2=o2.asNumber()) != null) {\n+\t\tif ((n1=o1.testNumber()) != null) {\n+\t\t\tif ((n2=o2.testNumber()) != null) {\n \t\t\t\treturn n1.bitAnd(n2);\n \t\t\t}\n \t\t}\n@@ -57,15 +57,15 @@ static public int bor(int n1, int n2)\n \tstatic public ENumber bor(EObject o1, EObject o2)\n \t{\n \t\tEInteger i1, i2;\n-\t\tif ((i1=o1.asInteger()) != null && (i2=o2.asInteger()) != null)\n+\t\tif ((i1=o1.testInteger()) != null && (i2=o2.testInteger()) != null)\n \t\t{\n \t\t\treturn new EInteger(i1.value | i2.value);\n \t\t}\n \t\t\n \t\tENumber n1;\n \t\tENumber n2;\n-\t\tif ((n1=o1.asNumber()) != null) {\n-\t\t\tif ((n2=o2.asNumber()) != null) {\n+\t\tif ((n1=o1.testNumber()) != null) {\n+\t\t\tif ((n2=o2.testNumber()) != null) {\n \t\t\t\treturn n1.bitOr(n2);\n \t\t\t}\n \t\t}\n@@ -88,15 +88,15 @@ static public int band(int n1, int n2)\n \tstatic public ENumber bsr(EObject o1, EObject o2)\n \t{\n \t\tEInteger i1, i2;\n-\t\tif ((i1=o1.asInteger()) != null && (i2=o2.asInteger()) != null)\n+\t\tif ((i1=o1.testInteger()) != null && (i2=o2.testInteger()) != null)\n \t\t{\n \t\t\treturn new EInteger(i1.value >> i2.value);\n \t\t}\n \t\t\n \t\tENumber n1;\n \t\tENumber n2;\n-\t\tif ((n1=o1.asNumber()) != null) {\n-\t\t\tif ((n2=o2.asNumber()) != null) {\n+\t\tif ((n1=o1.testNumber()) != null) {\n+\t\t\tif ((n2=o2.testNumber()) != null) {\n \t\t\t\treturn n1.bitShiftRight(n2);\n \t\t\t}\n \t\t}\n@@ -108,15 +108,15 @@ static public ENumber bsr(EObject o1, EObject o2)\n \tstatic public ENumber bsl(EObject o1, EObject o2)\n \t{\n \t\tEInteger i1, i2;\n-\t\tif ((i1=o1.asInteger()) != null && (i2=o2.asInteger()) != null)\n+\t\tif ((i1=o1.testInteger()) != null && (i2=o2.testInteger()) != null)\n \t\t{\n \t\t\treturn new EInteger(i1.value << i2.value);\n \t\t}\n \t\t\n \t\tENumber n1;\n \t\tENumber n2;\n-\t\tif ((n1=o1.asNumber()) != null) {\n-\t\t\tif ((n2=o2.asNumber()) != null) {\n+\t\tif ((n1=o1.testNumber()) != null) {\n+\t\t\tif ((n2=o2.testNumber()) != null) {\n \t\t\t\treturn n1.bitShiftLeft(n2);\n \t\t\t}\n \t\t}", "raw_url": "https://github.com/trifork/erjang/raw/070f8a4124a580cd7a140029dee655beeae8540b/src%2Ferjang%2Fmodules%2FBinOps.java", "sha": "261157682d41aac4f152031302faf94a1b62c923", "status": "modified" } ]
32
[ { "name": "trifork$erjang", "new_args": "", "new_implementation": "return \"'\" + encode_escapes(value) + \"'\";", "new_return_type": "EAtom", "new_signature": "EAtom testAtom()", "old_args": "", "old_implementation": "return \"'\" + value + \"'\";\n\t\n\tpublic boolean isAtom(String name)\n\t{\n\t\n \n\t\n\n\n\n\t\t\n\t\t\t\t\t\"intern\", \"(\" + STRING_TYPE.getDescriptor() + \")\" + type.getDescriptor());\n\t\t\n\t\treturn type;", "old_return_type": "EAtom", "old_signature": "EAtom asAtom()" }, { "name": "trifork$erjang", "new_args": "", "new_implementation": "return \"'\" + encode_escapes(value) + \"'\";", "new_return_type": "EAtom", "new_signature": "EAtom testAtom()", "old_args": "", "old_implementation": "return \"'\" + value + \"'\";\n\t\n\tpublic boolean isAtom(String name)\n\t{\n\t\n \n\t\n\n\n\n\t\t\n\t\t\t\t\t\"intern\", \"(\" + STRING_TYPE.getDescriptor() + \")\" + type.getDescriptor());\n\t\t\n\t\treturn type;", "old_return_type": "EAtom", "old_signature": "EAtom asAtom()" } ]
2
19
0ca7982fec30c2bb8204efbbea61428a643d2e9c
[ { "name": "projectdanube$xdi2", "new_args": "String xriString,State state", "new_implementation": null, "new_return_type": "XDIAddress", "new_signature": "XDIAddress makeXDIAddress(String xriString,State state)", "old_args": "String xriString,State state", "old_implementation": null, "old_return_type": "XDI3Segment", "old_signature": "XDI3Segment makeXDI3Segment(String xriString,State state)" }, { "name": "projectdanube$xdi2", "new_args": "String xriString,State state", "new_implementation": null, "new_return_type": "XDIArc", "new_signature": "XDIArc makeXDIArc(String xriString,State state)", "old_args": "String xriString,State state", "old_implementation": null, "old_return_type": "XDI3SubSegment", "old_signature": "XDI3SubSegment makeXDI3SubSegment(String xriString,State state)" }, { "name": "projectdanube$xdi2", "new_args": "BufferedWriter bufferedWriter,ContextNode contextNode,XDIArc contextNodeArc", "new_implementation": null, "new_return_type": "void", "new_signature": "void writecontextNodeArc(BufferedWriter bufferedWriter,ContextNode contextNode,XDIArc contextNodeArc)", "old_args": "BufferedWriter bufferedWriter,ContextNode contextNode,XDI3SubSegment contextNodeArcXri", "old_implementation": null, "old_return_type": "void", "old_signature": "void writeContextNodeArcXri(BufferedWriter bufferedWriter,ContextNode contextNode,XDI3SubSegment contextNodeArcXri)" }, { "name": "projectdanube$xdi2", "new_args": "BufferedWriter bufferedWriter,XDIAddress contextNodeAddress,XDIArc contextNodeArc", "new_implementation": null, "new_return_type": "void", "new_signature": "void writecontextNodeArc(BufferedWriter bufferedWriter,XDIAddress contextNodeAddress,XDIArc contextNodeArc)", "old_args": "BufferedWriter bufferedWriter,XDI3Segment contextNodeXri,XDI3SubSegment contextNodeArcXri", "old_implementation": null, "old_return_type": "void", "old_signature": "void writeContextNodeArcXri(BufferedWriter bufferedWriter,XDI3Segment contextNodeXri,XDI3SubSegment contextNodeArcXri)" }, { "name": "projectdanube$xdi2", "new_args": "BufferedWriter bufferedWriter,XDIAddress contextNodeAddress", "new_implementation": null, "new_return_type": "void", "new_signature": "void writecontextNodeAddress(BufferedWriter bufferedWriter,XDIAddress contextNodeAddress)", "old_args": "BufferedWriter bufferedWriter,XDI3Segment contextNodeXri", "old_implementation": null, "old_return_type": "void", "old_signature": "void writeContextNodeXri(BufferedWriter bufferedWriter,XDI3Segment contextNodeXri)" }, { "name": "projectdanube$xdi2", "new_args": "XDIAddress address,XDIStatement statement", "new_implementation": null, "new_return_type": "XDIStatement", "new_signature": "XDIStatement concatAddressStatement(XDIAddress address,XDIStatement statement)", "old_args": "XDI3Segment xri,XDI3Statement statementXri", "old_implementation": null, "old_return_type": "XDI3Statement", "old_signature": "XDI3Statement concatXriStatement(XDI3Segment xri,XDI3Statement statementXri)" }, { "name": "projectdanube$xdi2", "new_args": "", "new_implementation": null, "new_return_type": "XDIArc", "new_signature": "XDIArc createarc()", "old_args": "", "old_implementation": null, "old_return_type": "XDI3SubSegment", "old_signature": "XDI3SubSegment createArcXri()" }, { "name": "projectdanube$xdi2", "new_args": "XDIArc arc", "new_implementation": "return arc;\r\n\tpublic static boolean isValidarc(XDIArc arc) {\r\n\t\tif (arc == null) return false;\r\n\t\tif (arc.isAttributeXs()) return false;\r\n\t\tif (arc.isClassXs()) return false;\r\n\t\tif (! arc.hasLiteral() && ! arc.hasXRef()) return false;\r\n\t\tif (XDIConstants.CS_CLASS_UNRESERVED.equals(arc.getCs()) || XDIConstants.CS_CLASS_RESERVED.equals(arc.getCs())) {", "new_return_type": "XDIArc", "new_signature": "XDIArc createarc(XDIArc arc)", "old_args": "XDI3SubSegment arcXri", "old_implementation": "return arcXri;\r\n\tpublic static boolean isValidArcXri(XDI3SubSegment arcXri) {\r\n\t\tif (arcXri == null) return false;\r\n\t\tif (arcXri.isAttributeXs()) return false;\r\n\t\tif (arcXri.isClassXs()) return false;\r\n\t\tif (! arcXri.hasLiteral() && ! arcXri.hasXRef()) return false;\r\n\t\tif (XDIConstants.CS_CLASS_UNRESERVED.equals(arcXri.getCs()) || XDIConstants.CS_CLASS_RESERVED.equals(arcXri.getCs())) {", "old_return_type": "XDI3SubSegment", "old_signature": "XDI3SubSegment createArcXri(XDI3SubSegment arcXri)" }, { "name": "projectdanube$xdi2", "new_args": "XDIArc arc", "new_implementation": "return arc;\r\n\tpublic static boolean isValidarc(XDIArc arc) {\r\n\t\tif (arc == null) return false;\r\n\t\tif (arc.isAttributeXs()) return false;\r\n\t\tif (arc.isClassXs()) return false;\r\n\t\tif (! arc.hasLiteral() && ! arc.hasXRef()) return false;\r\n\t\tif (XDIConstants.CS_CLASS_UNRESERVED.equals(arc.getCs()) || XDIConstants.CS_CLASS_RESERVED.equals(arc.getCs())) {", "new_return_type": "XDIArc", "new_signature": "XDIArc createarc(XDIArc arc)", "old_args": "XDI3SubSegment arcXri", "old_implementation": "return arcXri;\r\n\tpublic static boolean isValidArcXri(XDI3SubSegment arcXri) {\r\n\t\tif (arcXri == null) return false;\r\n\t\tif (arcXri.isAttributeXs()) return false;\r\n\t\tif (arcXri.isClassXs()) return false;\r\n\t\tif (! arcXri.hasLiteral() && ! arcXri.hasXRef()) return false;\r\n\t\tif (XDIConstants.CS_CLASS_UNRESERVED.equals(arcXri.getCs()) || XDIConstants.CS_CLASS_RESERVED.equals(arcXri.getCs())) {", "old_return_type": "XDI3SubSegment", "old_signature": "XDI3SubSegment createArcXri(XDI3SubSegment arcXri)" }, { "name": "projectdanube$xdi2", "new_args": "XDIArc arc", "new_implementation": "return arc;\r\n\tpublic static boolean isValidarc(XDIArc arc) {\r\n\t\tif (arc == null) return false;\r\n\t\tif (arc.isAttributeXs()) return false;\r\n\t\tif (arc.isClassXs()) return false;\r\n\t\tif (! arc.hasLiteral() && ! arc.hasXRef()) return false;\r\n\t\tif (XDIConstants.CS_CLASS_UNRESERVED.equals(arc.getCs()) || XDIConstants.CS_CLASS_RESERVED.equals(arc.getCs())) {", "new_return_type": "XDIArc", "new_signature": "XDIArc createarc(XDIArc arc)", "old_args": "XDI3SubSegment arcXri", "old_implementation": "return arcXri;\r\n\tpublic static boolean isValidArcXri(XDI3SubSegment arcXri) {\r\n\t\tif (arcXri == null) return false;\r\n\t\tif (arcXri.isAttributeXs()) return false;\r\n\t\tif (arcXri.isClassXs()) return false;\r\n\t\tif (! arcXri.hasLiteral() && ! arcXri.hasXRef()) return false;\r\n\t\tif (XDIConstants.CS_CLASS_UNRESERVED.equals(arcXri.getCs()) || XDIConstants.CS_CLASS_RESERVED.equals(arcXri.getCs())) {", "old_return_type": "XDI3SubSegment", "old_signature": "XDI3SubSegment createArcXri(XDI3SubSegment arcXri)" }, { "name": "projectdanube$xdi2", "new_args": "XDIArc arc", "new_implementation": "return arc;\r\n\tpublic static boolean isValidarc(XDIArc arc) {\r\n\t\tif (arc == null) return false;\r\n\t\tif (arc.isAttributeXs()) return false;\r\n\t\tif (arc.isClassXs()) return false;\r\n\t\tif (! arc.hasLiteral() && ! arc.hasXRef()) return false;\r\n\t\tif (XDIConstants.CS_CLASS_UNRESERVED.equals(arc.getCs()) || XDIConstants.CS_CLASS_RESERVED.equals(arc.getCs())) {", "new_return_type": "XDIArc", "new_signature": "XDIArc createarc(XDIArc arc)", "old_args": "XDI3SubSegment arcXri", "old_implementation": "return arcXri;\r\n\tpublic static boolean isValidArcXri(XDI3SubSegment arcXri) {\r\n\t\tif (arcXri == null) return false;\r\n\t\tif (arcXri.isAttributeXs()) return false;\r\n\t\tif (arcXri.isClassXs()) return false;\r\n\t\tif (! arcXri.hasLiteral() && ! arcXri.hasXRef()) return false;\r\n\t\tif (XDIConstants.CS_CLASS_UNRESERVED.equals(arcXri.getCs()) || XDIConstants.CS_CLASS_RESERVED.equals(arcXri.getCs())) {", "old_return_type": "XDI3SubSegment", "old_signature": "XDI3SubSegment createArcXri(XDI3SubSegment arcXri)" }, { "name": "projectdanube$xdi2", "new_args": "String identifier,boolean attribute", "new_implementation": null, "new_return_type": "XDIArc", "new_signature": "XDIArc createarc(String identifier,boolean attribute)", "old_args": "String identifier,boolean attribute", "old_implementation": null, "old_return_type": "XDI3SubSegment", "old_signature": "XDI3SubSegment createArcXri(String identifier,boolean attribute)" }, { "name": "projectdanube$xdi2", "new_args": "String identifier,boolean attribute", "new_implementation": null, "new_return_type": "XDIArc", "new_signature": "XDIArc createarc(String identifier,boolean attribute)", "old_args": "String identifier,boolean attribute", "old_implementation": null, "old_return_type": "XDI3SubSegment", "old_signature": "XDI3SubSegment createArcXri(String identifier,boolean attribute)" }, { "name": "projectdanube$xdi2", "new_args": "String string,boolean attribute", "new_implementation": null, "new_return_type": "XDIArc", "new_signature": "XDIArc createDigestarc(String string,boolean attribute)", "old_args": "String string,boolean attribute", "old_implementation": null, "old_return_type": "XDI3SubSegment", "old_signature": "XDI3SubSegment createDigestArcXri(String string,boolean attribute)" }, { "name": "projectdanube$xdi2", "new_args": "String string,boolean attribute,String algorithm", "new_implementation": null, "new_return_type": "XDIArc", "new_signature": "XDIArc createDigestarc(String string,boolean attribute,String algorithm)", "old_args": "String string,boolean attribute,String algorithm", "old_implementation": null, "old_return_type": "XDI3SubSegment", "old_signature": "XDI3SubSegment createDigestArcXri(String string,boolean attribute,String algorithm)" }, { "name": "projectdanube$xdi2", "new_args": "XDIAddress subject,XDIAddress predicate", "new_implementation": null, "new_return_type": "XDIArc", "new_signature": "XDIArc createInnerRootarc(XDIAddress subject,XDIAddress predicate)", "old_args": "XDI3Segment subject,XDI3Segment predicate", "old_implementation": null, "old_return_type": "XDI3SubSegment", "old_signature": "XDI3SubSegment createInnerRootArcXri(XDI3Segment subject,XDI3Segment predicate)" }, { "name": "projectdanube$xdi2", "new_args": "XDIAddress address", "new_implementation": null, "new_return_type": "XDIArc", "new_signature": "XDIArc createPeerRootArc(XDIAddress address)", "old_args": "XDI3Segment xri", "old_implementation": null, "old_return_type": "XDI3SubSegment", "old_signature": "XDI3SubSegment createPeerRootArcXri(XDI3Segment xri)" }, { "name": "projectdanube$xdi2", "new_args": "boolean attribute", "new_implementation": null, "new_return_type": "XDIArc", "new_signature": "XDIArc createRandomUuidarc(boolean attribute)", "old_args": "boolean attribute", "old_implementation": null, "old_return_type": "XDI3SubSegment", "old_signature": "XDI3SubSegment createRandomUuidArcXri(boolean attribute)" }, { "name": "projectdanube$xdi2", "new_args": "String uuid,boolean attribute", "new_implementation": null, "new_return_type": "XDIArc", "new_signature": "XDIArc createUuidarc(String uuid,boolean attribute)", "old_args": "String uuid,boolean attribute", "old_implementation": null, "old_return_type": "XDI3SubSegment", "old_signature": "XDI3SubSegment createUuidArcXri(String uuid,boolean attribute)" }, { "name": "projectdanube$xdi2", "new_args": "", "new_implementation": null, "new_return_type": "XDIAddress", "new_signature": "XDIAddress getArc()", "old_args": "", "old_implementation": null, "old_return_type": "XDI3Segment", "old_signature": "XDI3Segment getArcXri()" }, { "name": "projectdanube$xdi2", "new_args": "", "new_implementation": null, "new_return_type": "XDIArc", "new_signature": "XDIArc getArc()", "old_args": "", "old_implementation": null, "old_return_type": "XDI3SubSegment", "old_signature": "XDI3SubSegment getArcXri()" }, { "name": "projectdanube$xdi2", "new_args": "", "new_implementation": null, "new_return_type": "XDIArc", "new_signature": "XDIArc getArc()", "old_args": "", "old_implementation": null, "old_return_type": "XDI3SubSegment", "old_signature": "XDI3SubSegment getArcXri()" }, { "name": "projectdanube$xdi2", "new_args": "XDIArc arc", "new_implementation": null, "new_return_type": "XDIArc", "new_signature": "XDIArc getBasearc(XDIArc arc)", "old_args": "XDI3SubSegment arcXri", "old_implementation": null, "old_return_type": "XDI3SubSegment", "old_signature": "XDI3SubSegment getBaseArcXri(XDI3SubSegment arcXri)" }, { "name": "projectdanube$xdi2", "new_args": "", "new_implementation": null, "new_return_type": "XDIAddress", "new_signature": "XDIAddress getContextNodeAddress()", "old_args": "", "old_implementation": null, "old_return_type": "XDI3Segment", "old_signature": "XDI3Segment getContextNodeXri()" }, { "name": "projectdanube$xdi2", "new_args": "XDIArc arc", "new_implementation": null, "new_return_type": "String", "new_signature": "String getIriOfPeerRootArc(XDIArc arc)", "old_args": "XDI3SubSegment arcXri", "old_implementation": null, "old_return_type": "String", "old_signature": "String getIriOfPeerRootArcXri(XDI3SubSegment arcXri)" }, { "name": "projectdanube$xdi2", "new_args": "XDIArc arc", "new_implementation": null, "new_return_type": "String", "new_signature": "String getLiteralOfPeerRootArc(XDIArc arc)", "old_args": "XDI3SubSegment arcXri", "old_implementation": null, "old_return_type": "String", "old_signature": "String getLiteralOfPeerRootArcXri(XDI3SubSegment arcXri)" }, { "name": "projectdanube$xdi2", "new_args": "", "new_implementation": null, "new_return_type": "XDIAddress", "new_signature": "XDIAddress getRelationAddress()", "old_args": "", "old_implementation": null, "old_return_type": "XDI3Segment", "old_signature": "XDI3Segment getRelationArcXri()" }, { "name": "projectdanube$xdi2", "new_args": "", "new_implementation": null, "new_return_type": "XDIAddress", "new_signature": "XDIAddress getSenderAddress()", "old_args": "", "old_implementation": null, "old_return_type": "XDI3Segment", "old_signature": "XDI3Segment getSenderXri()" }, { "name": "projectdanube$xdi2", "new_args": "", "new_implementation": null, "new_return_type": "XDIAddress", "new_signature": "XDIAddress getSenderAddress()", "old_args": "", "old_implementation": null, "old_return_type": "XDI3Segment", "old_signature": "XDI3Segment getSenderXri()" }, { "name": "projectdanube$xdi2", "new_args": "", "new_implementation": null, "new_return_type": "XDIAddress", "new_signature": "XDIAddress getTargetContextNodeAddress()", "old_args": "", "old_implementation": null, "old_return_type": "XDI3Segment", "old_signature": "XDI3Segment getTargetContextNodeXri()" }, { "name": "projectdanube$xdi2", "new_args": "", "new_implementation": null, "new_return_type": "XDIAddress", "new_signature": "XDIAddress getAddress()", "old_args": "", "old_implementation": null, "old_return_type": "XDI3Segment", "old_signature": "XDI3Segment getXri()" }, { "name": "projectdanube$xdi2", "new_args": "", "new_implementation": null, "new_return_type": "XDIAddress", "new_signature": "XDIAddress getAddress()", "old_args": "", "old_implementation": null, "old_return_type": "XDI3Segment", "old_signature": "XDI3Segment getXri()" }, { "name": "projectdanube$xdi2", "new_args": "XDIArc arc", "new_implementation": null, "new_return_type": "XDIAddress", "new_signature": "XDIAddress getAddressOfPeerRootArc(XDIArc arc)", "old_args": "XDI3SubSegment arcXri", "old_implementation": null, "old_return_type": "XDI3Segment", "old_signature": "XDI3Segment getXriOfPeerRootArcXri(XDI3SubSegment arcXri)" }, { "name": "projectdanube$xdi2", "new_args": "", "new_implementation": null, "new_return_type": "boolean", "new_signature": "boolean hasAddress()", "old_args": "", "old_implementation": null, "old_return_type": "boolean", "old_signature": "boolean hasSegment()" }, { "name": "projectdanube$xdi2", "new_args": "XDIArc arc", "new_implementation": null, "new_return_type": "boolean", "new_signature": "boolean isInnerRootarc(XDIArc arc)", "old_args": "XDI3SubSegment arcXri", "old_implementation": null, "old_return_type": "boolean", "old_signature": "boolean isInnerRootArcXri(XDI3SubSegment arcXri)" }, { "name": "projectdanube$xdi2", "new_args": "XDIArc arc", "new_implementation": null, "new_return_type": "boolean", "new_signature": "boolean isPeerRootArc(XDIArc arc)", "old_args": "XDI3SubSegment arcXri", "old_implementation": null, "old_return_type": "boolean", "old_signature": "boolean isPeerRootArcXri(XDI3SubSegment arcXri)" }, { "name": "projectdanube$xdi2", "new_args": "XDIArc arc", "new_implementation": null, "new_return_type": "boolean", "new_signature": "boolean isRootarc(XDIArc arc)", "old_args": "XDI3SubSegment arcXri", "old_implementation": null, "old_return_type": "boolean", "old_signature": "boolean isRootArcXri(XDI3SubSegment arcXri)" }, { "name": "projectdanube$xdi2", "new_args": "XDIArc arc", "new_implementation": null, "new_return_type": "boolean", "new_signature": "boolean isValidarc(XDIArc arc)", "old_args": "XDI3SubSegment arcXri", "old_implementation": null, "old_return_type": "boolean", "old_signature": "boolean isValidArcXri(XDI3SubSegment arcXri)" }, { "name": "projectdanube$xdi2", "new_args": "XDIArc arc", "new_implementation": null, "new_return_type": "boolean", "new_signature": "boolean isValidarc(XDIArc arc)", "old_args": "XDI3SubSegment arcXri", "old_implementation": null, "old_return_type": "boolean", "old_signature": "boolean isValidArcXri(XDI3SubSegment arcXri)" }, { "name": "projectdanube$xdi2", "new_args": "XDIArc arc", "new_implementation": null, "new_return_type": "boolean", "new_signature": "boolean isValidarc(XDIArc arc)", "old_args": "XDI3SubSegment arcXri", "old_implementation": null, "old_return_type": "boolean", "old_signature": "boolean isValidArcXri(XDI3SubSegment arcXri)" }, { "name": "projectdanube$xdi2", "new_args": "XDIArc arc", "new_implementation": null, "new_return_type": "boolean", "new_signature": "boolean isValidarc(XDIArc arc)", "old_args": "XDI3SubSegment arcXri", "old_implementation": null, "old_return_type": "boolean", "old_signature": "boolean isValidArcXri(XDI3SubSegment arcXri)" }, { "name": "projectdanube$xdi2", "new_args": "XDIArc arc", "new_implementation": null, "new_return_type": "boolean", "new_signature": "boolean isValidarc(XDIArc arc)", "old_args": "XDI3SubSegment arcXri", "old_implementation": null, "old_return_type": "boolean", "old_signature": "boolean isValidArcXri(XDI3SubSegment arcXri)" }, { "name": "projectdanube$xdi2", "new_args": "XDIArc arc", "new_implementation": null, "new_return_type": "boolean", "new_signature": "boolean isValidarc(XDIArc arc)", "old_args": "XDI3SubSegment arcXri", "old_implementation": null, "old_return_type": "boolean", "old_signature": "boolean isValidArcXri(XDI3SubSegment arcXri)" }, { "name": "projectdanube$xdi2", "new_args": "XDIArc arc", "new_implementation": null, "new_return_type": "boolean", "new_signature": "boolean isValidarc(XDIArc arc)", "old_args": "XDI3SubSegment arcXri", "old_implementation": null, "old_return_type": "boolean", "old_signature": "boolean isValidArcXri(XDI3SubSegment arcXri)" }, { "name": "projectdanube$xdi2", "new_args": "XDIArc arc", "new_implementation": null, "new_return_type": "boolean", "new_signature": "boolean isValidarc(XDIArc arc)", "old_args": "XDI3SubSegment arcXri", "old_implementation": null, "old_return_type": "boolean", "old_signature": "boolean isValidArcXri(XDI3SubSegment arcXri)" }, { "name": "projectdanube$xdi2", "new_args": "XDIArc arc", "new_implementation": null, "new_return_type": "boolean", "new_signature": "boolean isValidarc(XDIArc arc)", "old_args": "XDI3SubSegment arcXri", "old_implementation": null, "old_return_type": "boolean", "old_signature": "boolean isValidArcXri(XDI3SubSegment arcXri)" }, { "name": "projectdanube$xdi2", "new_args": "XDIArc arc,boolean attribute", "new_implementation": null, "new_return_type": "boolean", "new_signature": "boolean isValidarc(XDIArc arc,boolean attribute)", "old_args": "XDI3SubSegment arcXri,boolean attribute", "old_implementation": null, "old_return_type": "boolean", "old_signature": "boolean isValidArcXri(XDI3SubSegment arcXri,boolean attribute)" }, { "name": "projectdanube$xdi2", "new_args": "XDIArc arc,boolean attribute", "new_implementation": null, "new_return_type": "boolean", "new_signature": "boolean isValidarc(XDIArc arc,boolean attribute)", "old_args": "XDI3SubSegment arcXri,boolean attribute", "old_implementation": null, "old_return_type": "boolean", "old_signature": "boolean isValidArcXri(XDI3SubSegment arcXri,boolean attribute)" }, { "name": "projectdanube$xdi2", "new_args": "String string", "new_implementation": null, "new_return_type": "XDIAddress", "new_signature": "XDIAddress parseXDIAddress(String string)", "old_args": "String string", "old_implementation": null, "old_return_type": "XDI3Segment", "old_signature": "XDI3Segment parseXDI3Segment(String string)" }, { "name": "projectdanube$xdi2", "new_args": "String string", "new_implementation": null, "new_return_type": "XDIStatement", "new_signature": "XDIStatement parseXDIStatement(String string)", "old_args": "String string", "old_implementation": null, "old_return_type": "XDI3Statement", "old_signature": "XDI3Statement parseXDI3Statement(String string)" }, { "name": "projectdanube$xdi2", "new_args": "String string", "new_implementation": null, "new_return_type": "XDIArc", "new_signature": "XDIArc parseXDIArc(String string)", "old_args": "String string", "old_implementation": null, "old_return_type": "XDI3SubSegment", "old_signature": "XDI3SubSegment parseXDI3SubSegment(String string)" }, { "name": "projectdanube$xdi2", "new_args": "String string", "new_implementation": null, "new_return_type": "XDIXRef", "new_signature": "XDIXRef parseXDIXRef(String string)", "old_args": "String string", "old_implementation": null, "old_return_type": "XDI3XRef", "old_signature": "XDI3XRef parseXDI3XRef(String string)" }, { "name": "projectdanube$xdi2", "new_args": "XDIStatement statement,XDIAddress start,boolean variablesInAddress,boolean variablesInStart", "new_implementation": null, "new_return_type": "XDIStatement", "new_signature": "XDIStatement removeStartAddressStatement(XDIStatement statement,XDIAddress start,boolean variablesInAddress,boolean variablesInStart)", "old_args": "XDI3Statement statementXri,XDI3Segment start,boolean variablesInXri,boolean variablesInStart", "old_implementation": null, "old_return_type": "XDI3Statement", "old_signature": "XDI3Statement removeStartXriStatement(XDI3Statement statementXri,XDI3Segment start,boolean variablesInXri,boolean variablesInStart)" }, { "name": "projectdanube$xdi2", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void testarcs()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void testArcXris()" }, { "name": "projectdanube$xdi2", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void testcontextNodeAddresss()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void testContextNodeXris()" }, { "name": "projectdanube$xdi2", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void testIllegalarcs()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void testIllegalArcXris()" }, { "name": "projectdanube$xdi2", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void testTypeToXdiEntitySingletonarc()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void testTypeToXdiEntitySingletonArcXri()" }, { "name": "projectdanube$xdi2", "new_args": "String type", "new_implementation": "if (log.isTraceEnabled()) log.trace(\"typeToXdiarc(\" + type + \")\");\r\n\t\tXDIArc xdiarc = null;\r\n\t\ttry { xdiarc = XDIArc.create(type);", "new_return_type": "XDIArc", "new_signature": "XDIArc typeToXdiarc(String type)", "old_args": "String type", "old_implementation": "if (log.isTraceEnabled()) log.trace(\"typeToXdiArcXri(\" + type + \")\");\r\n\t\tXDI3SubSegment xdiArcXri = null;\r\n\t\ttry { xdiArcXri = XDI3SubSegment.create(type);", "old_return_type": "XDI3SubSegment", "old_signature": "XDI3SubSegment typeToXdiArcXri(String type)" } ]
[ { "additions": 10, "blob_url": "https://github.com/projectdanube/xdi2/blob/0ca7982fec30c2bb8204efbbea61428a643d2e9c/client%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fclient%2Fconstants%2FXDIClientConstants.java", "changes": 20, "contents_url": "https://api.github.com/repos/projectdanube/xdi2/contents/client%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fclient%2Fconstants%2FXDIClientConstants.java?ref=0ca7982fec30c2bb8204efbbea61428a643d2e9c", "deletions": 10, "filename": "client/src/main/java/xdi2/client/constants/XDIClientConstants.java", "new_code": "import xdi2.core.syntax.XDIAddress;\r\nimport xdi2.core.syntax.XDIArc;\r\n\tpublic static final XDIAddress XDI_ADD_AC_XDI = XDIAddress.create(\"[<$xdi>]\");\r\n\tpublic static final XDIAddress XDI_ADD_AC_URI = XDIAddress.create(\"[<$uri>]\");\r\n\tpublic static final XDIAddress XDI_ADD_AS_XDI = XDIAddress.create(\"<$xdi>\");\r\n\tpublic static final XDIAddress XDI_ADD_AS_URI = XDIAddress.create(\"<$uri>\");\r\n\tpublic static final XDIArc XDI_ARC_AC_XDI = XDIArc.create(\"[<$xdi>]\");\r\n\tpublic static final XDIArc XDI_ARC_AC_URI = XDIArc.create(\"[<$uri>]\");\r\n\tpublic static final XDIArc XDI_ARC_AS_XDI = XDIArc.create(\"<$xdi>\");\r\n\tpublic static final XDIArc XDI_ARC_AS_URI = XDIArc.create(\"<$uri>\");\r", "new_methods": [], "old_code": "import xdi2.core.xri3.XDI3Segment;\r\nimport xdi2.core.xri3.XDI3SubSegment;\r\n\tpublic static final XDI3Segment XRI_S_AC_XDI = XDI3Segment.create(\"[<$xdi>]\");\r\n\tpublic static final XDI3Segment XRI_S_AC_URI = XDI3Segment.create(\"[<$uri>]\");\r\n\tpublic static final XDI3Segment XRI_S_AS_XDI = XDI3Segment.create(\"<$xdi>\");\r\n\tpublic static final XDI3Segment XRI_S_AS_URI = XDI3Segment.create(\"<$uri>\");\r\n\tpublic static final XDI3SubSegment XRI_SS_AC_XDI = XDI3SubSegment.create(\"[<$xdi>]\");\r\n\tpublic static final XDI3SubSegment XRI_SS_AC_URI = XDI3SubSegment.create(\"[<$uri>]\");\r\n\tpublic static final XDI3SubSegment XRI_SS_AS_XDI = XDI3SubSegment.create(\"<$xdi>\");\r\n\tpublic static final XDI3SubSegment XRI_SS_AS_URI = XDI3SubSegment.create(\"<$uri>\");\r", "old_methods": [], "patch": "@@ -1,7 +1,7 @@\n package xdi2.client.constants;\r\n \r\n-import xdi2.core.xri3.XDI3Segment;\r\n-import xdi2.core.xri3.XDI3SubSegment;\r\n+import xdi2.core.syntax.XDIAddress;\r\n+import xdi2.core.syntax.XDIArc;\r\n \r\n /**\r\n * Constants for XDI client and discovery.\r\n@@ -10,17 +10,17 @@\n */\r\n public final class XDIClientConstants {\r\n \r\n-\tpublic static final XDI3Segment XRI_S_AC_XDI = XDI3Segment.create(\"[<$xdi>]\");\r\n-\tpublic static final XDI3Segment XRI_S_AC_URI = XDI3Segment.create(\"[<$uri>]\");\r\n+\tpublic static final XDIAddress XDI_ADD_AC_XDI = XDIAddress.create(\"[<$xdi>]\");\r\n+\tpublic static final XDIAddress XDI_ADD_AC_URI = XDIAddress.create(\"[<$uri>]\");\r\n \r\n-\tpublic static final XDI3Segment XRI_S_AS_XDI = XDI3Segment.create(\"<$xdi>\");\r\n-\tpublic static final XDI3Segment XRI_S_AS_URI = XDI3Segment.create(\"<$uri>\");\r\n+\tpublic static final XDIAddress XDI_ADD_AS_XDI = XDIAddress.create(\"<$xdi>\");\r\n+\tpublic static final XDIAddress XDI_ADD_AS_URI = XDIAddress.create(\"<$uri>\");\r\n \r\n-\tpublic static final XDI3SubSegment XRI_SS_AC_XDI = XDI3SubSegment.create(\"[<$xdi>]\");\r\n-\tpublic static final XDI3SubSegment XRI_SS_AC_URI = XDI3SubSegment.create(\"[<$uri>]\");\r\n+\tpublic static final XDIArc XDI_ARC_AC_XDI = XDIArc.create(\"[<$xdi>]\");\r\n+\tpublic static final XDIArc XDI_ARC_AC_URI = XDIArc.create(\"[<$uri>]\");\r\n \r\n-\tpublic static final XDI3SubSegment XRI_SS_AS_XDI = XDI3SubSegment.create(\"<$xdi>\");\r\n-\tpublic static final XDI3SubSegment XRI_SS_AS_URI = XDI3SubSegment.create(\"<$uri>\");\r\n+\tpublic static final XDIArc XDI_ARC_AS_XDI = XDIArc.create(\"<$xdi>\");\r\n+\tpublic static final XDIArc XDI_ARC_AS_URI = XDIArc.create(\"<$uri>\");\r\n \r\n \tprivate XDIClientConstants() { }\r\n }\r", "raw_url": "https://github.com/projectdanube/xdi2/raw/0ca7982fec30c2bb8204efbbea61428a643d2e9c/client%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fclient%2Fconstants%2FXDIClientConstants.java", "sha": "cb738fe3eb44c95b99ea72a317b24dd936f5c81b", "status": "modified" }, { "additions": 4, "blob_url": "https://github.com/projectdanube/xdi2/blob/0ca7982fec30c2bb8204efbbea61428a643d2e9c/client%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fclient%2Fevents%2FXDIDiscoverFromRegistryEvent.java", "changes": 8, "contents_url": "https://api.github.com/repos/projectdanube/xdi2/contents/client%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fclient%2Fevents%2FXDIDiscoverFromRegistryEvent.java?ref=0ca7982fec30c2bb8204efbbea61428a643d2e9c", "deletions": 4, "filename": "client/src/main/java/xdi2/client/events/XDIDiscoverFromRegistryEvent.java", "new_code": "import xdi2.core.syntax.XDIAddress;\r\n\tprivate XDIAddress query;\r\n\tpublic XDIDiscoverFromRegistryEvent(Object source, MessageEnvelope messageEnvelope, XDIDiscoveryResult discoveryResult, XDIAddress query) {\r\n\tpublic XDIAddress getQuery() {\r", "new_methods": [], "old_code": "import xdi2.core.xri3.XDI3Segment;\r\n\tprivate XDI3Segment query;\r\n\tpublic XDIDiscoverFromRegistryEvent(Object source, MessageEnvelope messageEnvelope, XDIDiscoveryResult discoveryResult, XDI3Segment query) {\r\n\tpublic XDI3Segment getQuery() {\r", "old_methods": [], "patch": "@@ -1,23 +1,23 @@\n package xdi2.client.events;\r\n \r\n-import xdi2.core.xri3.XDI3Segment;\r\n+import xdi2.core.syntax.XDIAddress;\r\n import xdi2.discovery.XDIDiscoveryResult;\r\n import xdi2.messaging.MessageEnvelope;\r\n \r\n public class XDIDiscoverFromRegistryEvent extends XDIDiscoverEvent {\r\n \r\n \tprivate static final long serialVersionUID = -4512281567446646198L;\r\n \r\n-\tprivate XDI3Segment query;\r\n+\tprivate XDIAddress query;\r\n \r\n-\tpublic XDIDiscoverFromRegistryEvent(Object source, MessageEnvelope messageEnvelope, XDIDiscoveryResult discoveryResult, XDI3Segment query) {\r\n+\tpublic XDIDiscoverFromRegistryEvent(Object source, MessageEnvelope messageEnvelope, XDIDiscoveryResult discoveryResult, XDIAddress query) {\r\n \r\n \t\tsuper(source, messageEnvelope, discoveryResult);\r\n \r\n \t\tthis.query = query;\r\n \t}\r\n \r\n-\tpublic XDI3Segment getQuery() {\r\n+\tpublic XDIAddress getQuery() {\r\n \r\n \t\treturn this.query;\r\n \t}\r", "raw_url": "https://github.com/projectdanube/xdi2/raw/0ca7982fec30c2bb8204efbbea61428a643d2e9c/client%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fclient%2Fevents%2FXDIDiscoverFromRegistryEvent.java", "sha": "73a8b386abdc740015909ab743b8b6979d52a640", "status": "modified" }, { "additions": 15, "blob_url": "https://github.com/projectdanube/xdi2/blob/0ca7982fec30c2bb8204efbbea61428a643d2e9c/client%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fclient%2Futil%2FXDIClientUtil.java", "changes": 30, "contents_url": "https://api.github.com/repos/projectdanube/xdi2/contents/client%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fclient%2Futil%2FXDIClientUtil.java?ref=0ca7982fec30c2bb8204efbbea61428a643d2e9c", "deletions": 15, "filename": "client/src/main/java/xdi2/client/util/XDIClientUtil.java", "new_code": "import xdi2.core.syntax.CloudNumber;\nimport xdi2.core.syntax.XDIAddress;\nimport xdi2.core.util.AddressUtil;\n\t\tMessage message = messageEnvelope.createMessage(cloudNumber.getAddress());\n\t\tmessage.setToPeerRootXri(cloudNumber.getPeerRootArc());\n\t\tmessage.setLinkContractXri(RootLinkContract.createRootLinkContractXri(cloudNumber.getAddress()));\n\t\tmessage.createGetOperation(RootLinkContract.createRootLinkContractXri(cloudNumber.getAddress()));\n\t\treturn retrievePrivateKey(cloudNumber, xdiEndpointUri, secretToken, XDIAuthenticationConstants.XDI_ADD_MSG_SIG_KEYPAIR_PRIVATE_KEY);\n\t\treturn retrievePrivateKey(cloudNumber, xdiEndpointUri, secretToken, XDIAuthenticationConstants.XDI_ADD_MSG_ENCRYPT_KEYPAIR_PRIVATE_KEY);\n\tprivate static PrivateKey retrievePrivateKey(CloudNumber cloudNumber, String xdiEndpointUri, String secretToken, XDIAddress privateKeyRelativeAddress) throws Xdi2ClientException, GeneralSecurityException {\n\t\tXDIAddress privateKeyAddress = AddressUtil.concatAddresses(cloudNumber.getAddress(), privateKeyRelativeAddress);\n\t\tMessage message = messageEnvelope.createMessage(cloudNumber.getAddress());\n\t\tmessage.setToPeerRootXri(cloudNumber.getPeerRootArc());\n\t\tmessage.setLinkContractXri(RootLinkContract.createRootLinkContractXri(cloudNumber.getAddress()));\n\t\tXdiEntity authorityXdiEntity = XdiLocalRoot.findLocalRoot(authorityMessageResultGraph).getXdiEntity(cloudNumber.getAddress(), false);", "new_methods": [], "old_code": "import xdi2.core.util.XDI3Util;\nimport xdi2.core.xri3.CloudNumber;\nimport xdi2.core.xri3.XDI3Segment;\n\t\tMessage message = messageEnvelope.createMessage(cloudNumber.getXri());\n\t\tmessage.setToPeerRootXri(cloudNumber.getPeerRootXri());\n\t\tmessage.setLinkContractXri(RootLinkContract.createRootLinkContractXri(cloudNumber.getXri()));\n\t\tmessage.createGetOperation(RootLinkContract.createRootLinkContractXri(cloudNumber.getXri()));\n\t\treturn retrievePrivateKey(cloudNumber, xdiEndpointUri, secretToken, XDIAuthenticationConstants.XRI_S_MSG_SIG_KEYPAIR_PRIVATE_KEY);\n\t\treturn retrievePrivateKey(cloudNumber, xdiEndpointUri, secretToken, XDIAuthenticationConstants.XRI_S_MSG_ENCRYPT_KEYPAIR_PRIVATE_KEY);\n\tprivate static PrivateKey retrievePrivateKey(CloudNumber cloudNumber, String xdiEndpointUri, String secretToken, XDI3Segment privateKeyRelativeAddress) throws Xdi2ClientException, GeneralSecurityException {\n\t\tXDI3Segment privateKeyAddress = XDI3Util.concatXris(cloudNumber.getXri(), privateKeyRelativeAddress);\n\t\tMessage message = messageEnvelope.createMessage(cloudNumber.getXri());\n\t\tmessage.setToPeerRootXri(cloudNumber.getPeerRootXri());\n\t\tmessage.setLinkContractXri(RootLinkContract.createRootLinkContractXri(cloudNumber.getXri()));\n\t\tXdiEntity authorityXdiEntity = XdiLocalRoot.findLocalRoot(authorityMessageResultGraph).getXdiEntity(cloudNumber.getXri(), false);", "old_methods": [], "patch": "@@ -11,9 +11,9 @@\n import xdi2.core.features.linkcontracts.RootLinkContract;\n import xdi2.core.features.nodetypes.XdiEntity;\n import xdi2.core.features.nodetypes.XdiLocalRoot;\n-import xdi2.core.util.XDI3Util;\n-import xdi2.core.xri3.CloudNumber;\n-import xdi2.core.xri3.XDI3Segment;\n+import xdi2.core.syntax.CloudNumber;\n+import xdi2.core.syntax.XDIAddress;\n+import xdi2.core.util.AddressUtil;\n import xdi2.messaging.Message;\n import xdi2.messaging.MessageEnvelope;\n import xdi2.messaging.MessageResult;\n@@ -25,37 +25,37 @@ public static void authenticateSecretToken(CloudNumber cloudNumber, String xdiEn\n \t\tXDIHttpClient xdiHttpClient = new XDIHttpClient(xdiEndpointUri);\n \n \t\tMessageEnvelope messageEnvelope = new MessageEnvelope();\n-\t\tMessage message = messageEnvelope.createMessage(cloudNumber.getXri());\n-\t\tmessage.setToPeerRootXri(cloudNumber.getPeerRootXri());\n-\t\tmessage.setLinkContractXri(RootLinkContract.createRootLinkContractXri(cloudNumber.getXri()));\n+\t\tMessage message = messageEnvelope.createMessage(cloudNumber.getAddress());\n+\t\tmessage.setToPeerRootXri(cloudNumber.getPeerRootArc());\n+\t\tmessage.setLinkContractXri(RootLinkContract.createRootLinkContractXri(cloudNumber.getAddress()));\n \t\tmessage.setSecretToken(secretToken);\n-\t\tmessage.createGetOperation(RootLinkContract.createRootLinkContractXri(cloudNumber.getXri()));\n+\t\tmessage.createGetOperation(RootLinkContract.createRootLinkContractXri(cloudNumber.getAddress()));\n \n \t\txdiHttpClient.send(messageEnvelope, null);\n \t}\n \n \tpublic static PrivateKey retrieveSignaturePrivateKey(CloudNumber cloudNumber, String xdiEndpointUri, String secretToken) throws Xdi2ClientException, GeneralSecurityException {\n \n-\t\treturn retrievePrivateKey(cloudNumber, xdiEndpointUri, secretToken, XDIAuthenticationConstants.XRI_S_MSG_SIG_KEYPAIR_PRIVATE_KEY);\n+\t\treturn retrievePrivateKey(cloudNumber, xdiEndpointUri, secretToken, XDIAuthenticationConstants.XDI_ADD_MSG_SIG_KEYPAIR_PRIVATE_KEY);\n \t}\n \n \tpublic static PrivateKey retrieveEncryptionPrivateKey(CloudNumber cloudNumber, String xdiEndpointUri, String secretToken) throws Xdi2ClientException, GeneralSecurityException {\n \n-\t\treturn retrievePrivateKey(cloudNumber, xdiEndpointUri, secretToken, XDIAuthenticationConstants.XRI_S_MSG_ENCRYPT_KEYPAIR_PRIVATE_KEY);\n+\t\treturn retrievePrivateKey(cloudNumber, xdiEndpointUri, secretToken, XDIAuthenticationConstants.XDI_ADD_MSG_ENCRYPT_KEYPAIR_PRIVATE_KEY);\n \t}\n \n-\tprivate static PrivateKey retrievePrivateKey(CloudNumber cloudNumber, String xdiEndpointUri, String secretToken, XDI3Segment privateKeyRelativeAddress) throws Xdi2ClientException, GeneralSecurityException {\n+\tprivate static PrivateKey retrievePrivateKey(CloudNumber cloudNumber, String xdiEndpointUri, String secretToken, XDIAddress privateKeyRelativeAddress) throws Xdi2ClientException, GeneralSecurityException {\n \n \t\t// request the private key from the graph\n \n \t\tXDIHttpClient xdiHttpClient = new XDIHttpClient(xdiEndpointUri);\n \n-\t\tXDI3Segment privateKeyAddress = XDI3Util.concatXris(cloudNumber.getXri(), privateKeyRelativeAddress);\n+\t\tXDIAddress privateKeyAddress = AddressUtil.concatAddresses(cloudNumber.getAddress(), privateKeyRelativeAddress);\n \n \t\tMessageEnvelope messageEnvelope = new MessageEnvelope();\n-\t\tMessage message = messageEnvelope.createMessage(cloudNumber.getXri());\n-\t\tmessage.setToPeerRootXri(cloudNumber.getPeerRootXri());\n-\t\tmessage.setLinkContractXri(RootLinkContract.createRootLinkContractXri(cloudNumber.getXri()));\n+\t\tMessage message = messageEnvelope.createMessage(cloudNumber.getAddress());\n+\t\tmessage.setToPeerRootXri(cloudNumber.getPeerRootArc());\n+\t\tmessage.setLinkContractXri(RootLinkContract.createRootLinkContractXri(cloudNumber.getAddress()));\n \t\tmessage.setSecretToken(secretToken);\n \t\tmessage.createGetOperation(privateKeyAddress);\n \n@@ -65,7 +65,7 @@ private static PrivateKey retrievePrivateKey(CloudNumber cloudNumber, String xdi\n \n \t\t// find authority\n \n-\t\tXdiEntity authorityXdiEntity = XdiLocalRoot.findLocalRoot(authorityMessageResultGraph).getXdiEntity(cloudNumber.getXri(), false);\n+\t\tXdiEntity authorityXdiEntity = XdiLocalRoot.findLocalRoot(authorityMessageResultGraph).getXdiEntity(cloudNumber.getAddress(), false);\n \t\tif (authorityXdiEntity == null) return null;\n \n \t\t// find private key", "raw_url": "https://github.com/projectdanube/xdi2/raw/0ca7982fec30c2bb8204efbbea61428a643d2e9c/client%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fclient%2Futil%2FXDIClientUtil.java", "sha": "b966ba7a69316b87fe8374c17480429b5212188c", "status": "modified" }, { "additions": 23, "blob_url": "https://github.com/projectdanube/xdi2/blob/0ca7982fec30c2bb8204efbbea61428a643d2e9c/client%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fdiscovery%2FXDIDiscoveryClient.java", "changes": 46, "contents_url": "https://api.github.com/repos/projectdanube/xdi2/contents/client%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fdiscovery%2FXDIDiscoveryClient.java?ref=0ca7982fec30c2bb8204efbbea61428a643d2e9c", "deletions": 23, "filename": "client/src/main/java/xdi2/discovery/XDIDiscoveryClient.java", "new_code": "import xdi2.core.syntax.CloudNumber;\r\nimport xdi2.core.syntax.XDIAddress;\r\nimport xdi2.core.syntax.XDIStatement;\r\nimport xdi2.core.util.AddressUtil;\r\n\tpublic XDIDiscoveryResult discover(XDIAddress query, XDIAddress[] endpointUriTypes) throws Xdi2ClientException {\r\n\tpublic XDIDiscoveryResult discoverFromRegistry(XDIAddress query, XDIAddress[] endpointUriTypes) throws Xdi2ClientException {\r\n\t\t\tregistryMessage.createGetOperation(XDIAddress.fromComponent(XdiPeerRoot.createPeerRootArc(query)));\r\n\tpublic XDIDiscoveryResult discoverFromAuthority(String xdiEndpointUri, CloudNumber cloudNumber, XDIAddress[] endpointUriTypes) throws Xdi2ClientException {\r\n\t\t\tauthorityMessage.setToPeerRootXri(cloudNumber.getPeerRootArc());\r\n\t\t\tauthorityMessage.setLinkContractXri(PublicLinkContract.createPublicLinkContractXri(cloudNumber.getAddress()));\r\n\t\t\tauthorityMessage.createGetOperation(XDIStatement.fromRelationComponents(XDIConstants.XDI_ADD_ROOT, XDIDictionaryConstants.XDI_ADD_IS_REF, XDIConstants.XDI_ADD_VARIABLE));\r\n\t\t\tauthorityMessage.createGetOperation(XDIStatement.fromRelationComponents(cloudNumber.getAddress(), XDIDictionaryConstants.XDI_ADD_IS_REF, XDIConstants.XDI_ADD_VARIABLE));\r\n\t\t\tauthorityMessage.createGetOperation(AddressUtil.concatAddresses(cloudNumber.getAddress(), XDIAuthenticationConstants.XDI_ADD_MSG_SIG_KEYPAIR_PUBLIC_KEY));\r\n\t\t\tauthorityMessage.createGetOperation(AddressUtil.concatAddresses(cloudNumber.getAddress(), XDIAuthenticationConstants.XDI_ADD_MSG_ENCRYPT_KEYPAIR_PUBLIC_KEY));\r\n\t\t\t\tfor (XDIAddress endpointUriType : endpointUriTypes) {\r\n\t\t\t\t\tauthorityMessage.createGetOperation(AddressUtil.concatAddresses(cloudNumber.getAddress(), endpointUriType, XDIClientConstants.XDI_ADD_AS_URI));\r\n\t\tprivate XDIAddress query;\r\n\t\tprivate Set<XDIAddress> endpointUriTypes;\r\n\t\tpublic DiscoveryCacheKey(XDIAddress query, String xdiEndpointUri, Set<XDIAddress> endpointUriTypes) {\r\n\t\tprivate static DiscoveryCacheKey build(XDIAddress query, XDIHttpClient registryXdiHttpClient, XDIAddress[] endpointUriTypes) {\r\n\t\t\treturn new DiscoveryCacheKey(query, registryXdiHttpClient.getEndpointUri().toString(), endpointUriTypes == null ? null : new HashSet<XDIAddress> (Arrays.asList(endpointUriTypes)));\r\n\t\tprivate static DiscoveryCacheKey build(CloudNumber cloudNumber, String xdiEndpointUri, XDIAddress[] endpointUriTypes) {\r\n\t\t\treturn new DiscoveryCacheKey(cloudNumber.getAddress(), xdiEndpointUri, endpointUriTypes == null ? null : new HashSet<XDIAddress> (Arrays.asList(endpointUriTypes)));\r", "new_methods": [], "old_code": "import xdi2.core.util.XDI3Util;\r\nimport xdi2.core.xri3.CloudNumber;\r\nimport xdi2.core.xri3.XDI3Segment;\r\nimport xdi2.core.xri3.XDI3Statement;\r\n\tpublic XDIDiscoveryResult discover(XDI3Segment query, XDI3Segment[] endpointUriTypes) throws Xdi2ClientException {\r\n\tpublic XDIDiscoveryResult discoverFromRegistry(XDI3Segment query, XDI3Segment[] endpointUriTypes) throws Xdi2ClientException {\r\n\t\t\tregistryMessage.createGetOperation(XDI3Segment.fromComponent(XdiPeerRoot.createPeerRootArcXri(query)));\r\n\tpublic XDIDiscoveryResult discoverFromAuthority(String xdiEndpointUri, CloudNumber cloudNumber, XDI3Segment[] endpointUriTypes) throws Xdi2ClientException {\r\n\t\t\tauthorityMessage.setToPeerRootXri(cloudNumber.getPeerRootXri());\r\n\t\t\tauthorityMessage.setLinkContractXri(PublicLinkContract.createPublicLinkContractXri(cloudNumber.getXri()));\r\n\t\t\tauthorityMessage.createGetOperation(XDI3Statement.fromRelationComponents(XDIConstants.XRI_S_ROOT, XDIDictionaryConstants.XRI_S_IS_REF, XDIConstants.XRI_S_VARIABLE));\r\n\t\t\tauthorityMessage.createGetOperation(XDI3Statement.fromRelationComponents(cloudNumber.getXri(), XDIDictionaryConstants.XRI_S_IS_REF, XDIConstants.XRI_S_VARIABLE));\r\n\t\t\tauthorityMessage.createGetOperation(XDI3Util.concatXris(cloudNumber.getXri(), XDIAuthenticationConstants.XRI_S_MSG_SIG_KEYPAIR_PUBLIC_KEY));\r\n\t\t\tauthorityMessage.createGetOperation(XDI3Util.concatXris(cloudNumber.getXri(), XDIAuthenticationConstants.XRI_S_MSG_ENCRYPT_KEYPAIR_PUBLIC_KEY));\r\n\t\t\t\tfor (XDI3Segment endpointUriType : endpointUriTypes) {\r\n\t\t\t\t\tauthorityMessage.createGetOperation(XDI3Util.concatXris(cloudNumber.getXri(), endpointUriType, XDIClientConstants.XRI_S_AS_URI));\r\n\t\tprivate XDI3Segment query;\r\n\t\tprivate Set<XDI3Segment> endpointUriTypes;\r\n\t\tpublic DiscoveryCacheKey(XDI3Segment query, String xdiEndpointUri, Set<XDI3Segment> endpointUriTypes) {\r\n\t\tprivate static DiscoveryCacheKey build(XDI3Segment query, XDIHttpClient registryXdiHttpClient, XDI3Segment[] endpointUriTypes) {\r\n\t\t\treturn new DiscoveryCacheKey(query, registryXdiHttpClient.getEndpointUri().toString(), endpointUriTypes == null ? null : new HashSet<XDI3Segment> (Arrays.asList(endpointUriTypes)));\r\n\t\tprivate static DiscoveryCacheKey build(CloudNumber cloudNumber, String xdiEndpointUri, XDI3Segment[] endpointUriTypes) {\r\n\t\t\treturn new DiscoveryCacheKey(cloudNumber.getXri(), xdiEndpointUri, endpointUriTypes == null ? null : new HashSet<XDI3Segment> (Arrays.asList(endpointUriTypes)));\r", "old_methods": [], "patch": "@@ -22,10 +22,10 @@\n import xdi2.core.constants.XDIDictionaryConstants;\r\n import xdi2.core.features.linkcontracts.PublicLinkContract;\r\n import xdi2.core.features.nodetypes.XdiPeerRoot;\r\n-import xdi2.core.util.XDI3Util;\r\n-import xdi2.core.xri3.CloudNumber;\r\n-import xdi2.core.xri3.XDI3Segment;\r\n-import xdi2.core.xri3.XDI3Statement;\r\n+import xdi2.core.syntax.CloudNumber;\r\n+import xdi2.core.syntax.XDIAddress;\r\n+import xdi2.core.syntax.XDIStatement;\r\n+import xdi2.core.util.AddressUtil;\r\n import xdi2.messaging.Message;\r\n import xdi2.messaging.MessageEnvelope;\r\n import xdi2.messaging.MessageResult;\r\n@@ -103,7 +103,7 @@ public XDIDiscoveryClient() {\n \t\tthis(NEUSTAR_PROD_DISCOVERY_XDI_CLIENT);\r\n \t}\r\n \r\n-\tpublic XDIDiscoveryResult discover(XDI3Segment query, XDI3Segment[] endpointUriTypes) throws Xdi2ClientException {\r\n+\tpublic XDIDiscoveryResult discover(XDIAddress query, XDIAddress[] endpointUriTypes) throws Xdi2ClientException {\r\n \r\n \t\t// first discover from registry\r\n \r\n@@ -146,7 +146,7 @@ public XDIDiscoveryResult discover(XDI3Segment query, XDI3Segment[] endpointUriT\n \t\treturn xdiDiscoveryResult;\r\n \t}\r\n \r\n-\tpublic XDIDiscoveryResult discoverFromRegistry(XDI3Segment query, XDI3Segment[] endpointUriTypes) throws Xdi2ClientException {\r\n+\tpublic XDIDiscoveryResult discoverFromRegistry(XDIAddress query, XDIAddress[] endpointUriTypes) throws Xdi2ClientException {\r\n \r\n \t\tXDIDiscoveryResult discoveryResult = new XDIDiscoveryResult();\r\n \r\n@@ -173,7 +173,7 @@ public XDIDiscoveryResult discoverFromRegistry(XDI3Segment query, XDI3Segment[]\n \r\n \t\t\tregistryMessageEnvelope = new MessageEnvelope();\r\n \t\t\tMessage registryMessage = registryMessageEnvelope.createMessage(null);\r\n-\t\t\tregistryMessage.createGetOperation(XDI3Segment.fromComponent(XdiPeerRoot.createPeerRootArcXri(query)));\r\n+\t\t\tregistryMessage.createGetOperation(XDIAddress.fromComponent(XdiPeerRoot.createPeerRootArc(query)));\r\n \r\n \t\t\ttry {\r\n \r\n@@ -213,7 +213,7 @@ public XDIDiscoveryResult discoverFromRegistry(XDI3Segment query, XDI3Segment[]\n \t\treturn discoveryResult;\r\n \t}\r\n \r\n-\tpublic XDIDiscoveryResult discoverFromAuthority(String xdiEndpointUri, CloudNumber cloudNumber, XDI3Segment[] endpointUriTypes) throws Xdi2ClientException {\r\n+\tpublic XDIDiscoveryResult discoverFromAuthority(String xdiEndpointUri, CloudNumber cloudNumber, XDIAddress[] endpointUriTypes) throws Xdi2ClientException {\r\n \r\n \t\tXDIDiscoveryResult discoveryResult = new XDIDiscoveryResult();\r\n \r\n@@ -240,18 +240,18 @@ public XDIDiscoveryResult discoverFromAuthority(String xdiEndpointUri, CloudNumb\n \r\n \t\t\tauthorityMessageEnvelope = new MessageEnvelope();\r\n \t\t\tMessage authorityMessage = authorityMessageEnvelope.createMessage(null);\r\n-\t\t\tauthorityMessage.setToPeerRootXri(cloudNumber.getPeerRootXri());\r\n-\t\t\tauthorityMessage.setLinkContractXri(PublicLinkContract.createPublicLinkContractXri(cloudNumber.getXri()));\r\n-\t\t\tauthorityMessage.createGetOperation(XDI3Statement.fromRelationComponents(XDIConstants.XRI_S_ROOT, XDIDictionaryConstants.XRI_S_IS_REF, XDIConstants.XRI_S_VARIABLE));\r\n-\t\t\tauthorityMessage.createGetOperation(XDI3Statement.fromRelationComponents(cloudNumber.getXri(), XDIDictionaryConstants.XRI_S_IS_REF, XDIConstants.XRI_S_VARIABLE));\r\n-\t\t\tauthorityMessage.createGetOperation(XDI3Util.concatXris(cloudNumber.getXri(), XDIAuthenticationConstants.XRI_S_MSG_SIG_KEYPAIR_PUBLIC_KEY));\r\n-\t\t\tauthorityMessage.createGetOperation(XDI3Util.concatXris(cloudNumber.getXri(), XDIAuthenticationConstants.XRI_S_MSG_ENCRYPT_KEYPAIR_PUBLIC_KEY));\r\n+\t\t\tauthorityMessage.setToPeerRootXri(cloudNumber.getPeerRootArc());\r\n+\t\t\tauthorityMessage.setLinkContractXri(PublicLinkContract.createPublicLinkContractXri(cloudNumber.getAddress()));\r\n+\t\t\tauthorityMessage.createGetOperation(XDIStatement.fromRelationComponents(XDIConstants.XDI_ADD_ROOT, XDIDictionaryConstants.XDI_ADD_IS_REF, XDIConstants.XDI_ADD_VARIABLE));\r\n+\t\t\tauthorityMessage.createGetOperation(XDIStatement.fromRelationComponents(cloudNumber.getAddress(), XDIDictionaryConstants.XDI_ADD_IS_REF, XDIConstants.XDI_ADD_VARIABLE));\r\n+\t\t\tauthorityMessage.createGetOperation(AddressUtil.concatAddresses(cloudNumber.getAddress(), XDIAuthenticationConstants.XDI_ADD_MSG_SIG_KEYPAIR_PUBLIC_KEY));\r\n+\t\t\tauthorityMessage.createGetOperation(AddressUtil.concatAddresses(cloudNumber.getAddress(), XDIAuthenticationConstants.XDI_ADD_MSG_ENCRYPT_KEYPAIR_PUBLIC_KEY));\r\n \r\n \t\t\tif (endpointUriTypes != null) {\r\n \r\n-\t\t\t\tfor (XDI3Segment endpointUriType : endpointUriTypes) {\r\n+\t\t\t\tfor (XDIAddress endpointUriType : endpointUriTypes) {\r\n \r\n-\t\t\t\t\tauthorityMessage.createGetOperation(XDI3Util.concatXris(cloudNumber.getXri(), endpointUriType, XDIClientConstants.XRI_S_AS_URI));\r\n+\t\t\t\t\tauthorityMessage.createGetOperation(AddressUtil.concatAddresses(cloudNumber.getAddress(), endpointUriType, XDIClientConstants.XDI_ADD_AS_URI));\r\n \t\t\t\t}\r\n \t\t\t}\r\n \r\n@@ -301,25 +301,25 @@ private static class DiscoveryCacheKey implements Serializable {\n \r\n \t\tprivate static final long serialVersionUID = -2109761083423630152L;\r\n \r\n-\t\tprivate XDI3Segment query;\r\n+\t\tprivate XDIAddress query;\r\n \t\tprivate String xdiEndpointUri;\r\n-\t\tprivate Set<XDI3Segment> endpointUriTypes;\r\n+\t\tprivate Set<XDIAddress> endpointUriTypes;\r\n \r\n-\t\tpublic DiscoveryCacheKey(XDI3Segment query, String xdiEndpointUri, Set<XDI3Segment> endpointUriTypes) {\r\n+\t\tpublic DiscoveryCacheKey(XDIAddress query, String xdiEndpointUri, Set<XDIAddress> endpointUriTypes) {\r\n \r\n \t\t\tthis.query = query;\r\n \t\t\tthis.xdiEndpointUri = xdiEndpointUri;\r\n \t\t\tthis.endpointUriTypes = endpointUriTypes;\r\n \t\t}\r\n \r\n-\t\tprivate static DiscoveryCacheKey build(XDI3Segment query, XDIHttpClient registryXdiHttpClient, XDI3Segment[] endpointUriTypes) {\r\n+\t\tprivate static DiscoveryCacheKey build(XDIAddress query, XDIHttpClient registryXdiHttpClient, XDIAddress[] endpointUriTypes) {\r\n \r\n-\t\t\treturn new DiscoveryCacheKey(query, registryXdiHttpClient.getEndpointUri().toString(), endpointUriTypes == null ? null : new HashSet<XDI3Segment> (Arrays.asList(endpointUriTypes)));\r\n+\t\t\treturn new DiscoveryCacheKey(query, registryXdiHttpClient.getEndpointUri().toString(), endpointUriTypes == null ? null : new HashSet<XDIAddress> (Arrays.asList(endpointUriTypes)));\r\n \t\t}\r\n \r\n-\t\tprivate static DiscoveryCacheKey build(CloudNumber cloudNumber, String xdiEndpointUri, XDI3Segment[] endpointUriTypes) {\r\n+\t\tprivate static DiscoveryCacheKey build(CloudNumber cloudNumber, String xdiEndpointUri, XDIAddress[] endpointUriTypes) {\r\n \r\n-\t\t\treturn new DiscoveryCacheKey(cloudNumber.getXri(), xdiEndpointUri, endpointUriTypes == null ? null : new HashSet<XDI3Segment> (Arrays.asList(endpointUriTypes)));\r\n+\t\t\treturn new DiscoveryCacheKey(cloudNumber.getAddress(), xdiEndpointUri, endpointUriTypes == null ? null : new HashSet<XDIAddress> (Arrays.asList(endpointUriTypes)));\r\n \t\t}\r\n \r\n \t\t@Override\r", "raw_url": "https://github.com/projectdanube/xdi2/raw/0ca7982fec30c2bb8204efbbea61428a643d2e9c/client%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fdiscovery%2FXDIDiscoveryClient.java", "sha": "3f170d9d0c920c85778e7ea6054de27feebf6909", "status": "modified" }, { "additions": 24, "blob_url": "https://github.com/projectdanube/xdi2/blob/0ca7982fec30c2bb8204efbbea61428a643d2e9c/client%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fdiscovery%2FXDIDiscoveryResult.java", "changes": 48, "contents_url": "https://api.github.com/repos/projectdanube/xdi2/contents/client%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fdiscovery%2FXDIDiscoveryResult.java?ref=0ca7982fec30c2bb8204efbbea61428a643d2e9c", "deletions": 24, "filename": "client/src/main/java/xdi2/discovery/XDIDiscoveryResult.java", "new_code": "import xdi2.core.syntax.CloudNumber;\r\nimport xdi2.core.syntax.XDIAddress;\r\nimport xdi2.core.util.AddressUtil;\r\n\tprivate Map<XDIAddress, String> endpointUris;\r\n\t\tthis.endpointUris = new HashMap<XDIAddress, String> ();\r\n\tvoid initFromRegistryAndAuthorityDiscoveryResult(XDIDiscoveryResult xdiDiscoveryResultRegistry, XDIDiscoveryResult xdiDiscoveryResultAuthority, XDIAddress query, XDIAddress[] endpointUriTypes) throws Xdi2ClientException {\r\n\tvoid initFromRegistryMessageResult(MessageEnvelope registryMessageEnvelope, MessageResult registryMessageResult, XDIAddress query, XDIAddress[] endpointUriTypes) throws Xdi2ClientException {\r\n\t\tif (xdiRoot instanceof XdiPeerRoot && CloudNumber.isValid(((XdiPeerRoot) xdiRoot).getAddressOfPeerRoot())) {\r\n\t\t\tthis.cloudNumber = CloudNumber.fromPeerRootArc(((XdiPeerRoot) xdiRoot).getArc());\r\n\t\tif (xdiRoot instanceof XdiPeerRoot && CloudNumber.isValid(((XdiPeerRoot) xdiRoot).getAddressOfPeerRoot())) {\r\n\t\t\tthis.cloudNumber = CloudNumber.fromPeerRootArc(((XdiPeerRoot) xdiRoot).getArc());\r\n\t\tendpointUriTypes = new XDIAddress[] { XDIClientConstants.XDI_ADD_AS_XDI };\r\n\t\tfor (XDIAddress endpointUriType : endpointUriTypes) {\r\n\t\t\tXDIAddress endpointUriXdiAttributeAddress = AddressUtil.concatAddresses(endpointUriType, XDIClientConstants.XDI_ARC_AS_URI);\r\n\tvoid initFromAuthorityMessageResult(MessageEnvelope authorityMessageEnvelope, MessageResult authorityMessageResult, XDIAddress[] endpointUriTypes) throws Xdi2ClientException {\r\n\t\tif (xdiRoot instanceof XdiPeerRoot && CloudNumber.isValid(((XdiPeerRoot) xdiRoot).getAddressOfPeerRoot())) {\r\n\t\t\tthis.cloudNumber = CloudNumber.fromPeerRootArc(((XdiPeerRoot) xdiRoot).getArc());\r\n\t\tif (xdiRoot instanceof XdiPeerRoot && CloudNumber.isValid(((XdiPeerRoot) xdiRoot).getAddressOfPeerRoot())) {\r\n\t\t\tthis.cloudNumber = CloudNumber.fromPeerRootArc(((XdiPeerRoot) xdiRoot).getArc());\r\n\t\tXdiEntity authorityXdiEntity = XdiLocalRoot.findLocalRoot(authorityMessageResultGraph).getXdiEntity(this.cloudNumber.getAddress(), false);\r\n\t\t\tfor (XDIAddress endpointUriType : endpointUriTypes) {\r\n\t\t\t\tXDIAddress endpointUriXdiAttributeAddress = AddressUtil.concatAddresses(endpointUriType, XDIClientConstants.XDI_ARC_AS_URI);\r\n\tpublic Map<XDIAddress, String> getEndpointUris() {\r\n\t\treturn this.getEndpointUris().get(XDIClientConstants.XDI_ADD_AS_XDI);\r", "new_methods": [], "old_code": "import xdi2.core.util.XDI3Util;\r\nimport xdi2.core.xri3.CloudNumber;\r\nimport xdi2.core.xri3.XDI3Segment;\r\n\tprivate Map<XDI3Segment, String> endpointUris;\r\n\t\tthis.endpointUris = new HashMap<XDI3Segment, String> ();\r\n\tvoid initFromRegistryAndAuthorityDiscoveryResult(XDIDiscoveryResult xdiDiscoveryResultRegistry, XDIDiscoveryResult xdiDiscoveryResultAuthority, XDI3Segment query, XDI3Segment[] endpointUriTypes) throws Xdi2ClientException {\r\n\tvoid initFromRegistryMessageResult(MessageEnvelope registryMessageEnvelope, MessageResult registryMessageResult, XDI3Segment query, XDI3Segment[] endpointUriTypes) throws Xdi2ClientException {\r\n\t\tif (xdiRoot instanceof XdiPeerRoot && CloudNumber.isValid(((XdiPeerRoot) xdiRoot).getXriOfPeerRoot())) {\r\n\t\t\tthis.cloudNumber = CloudNumber.fromPeerRootXri(((XdiPeerRoot) xdiRoot).getArcXri());\r\n\t\tif (xdiRoot instanceof XdiPeerRoot && CloudNumber.isValid(((XdiPeerRoot) xdiRoot).getXriOfPeerRoot())) {\r\n\t\t\tthis.cloudNumber = CloudNumber.fromPeerRootXri(((XdiPeerRoot) xdiRoot).getArcXri());\r\n\t\tendpointUriTypes = new XDI3Segment[] { XDIClientConstants.XRI_S_AS_XDI };\r\n\t\tfor (XDI3Segment endpointUriType : endpointUriTypes) {\r\n\t\t\tXDI3Segment endpointUriXdiAttributeAddress = XDI3Util.concatXris(endpointUriType, XDIClientConstants.XRI_SS_AS_URI);\r\n\tvoid initFromAuthorityMessageResult(MessageEnvelope authorityMessageEnvelope, MessageResult authorityMessageResult, XDI3Segment[] endpointUriTypes) throws Xdi2ClientException {\r\n\t\tif (xdiRoot instanceof XdiPeerRoot && CloudNumber.isValid(((XdiPeerRoot) xdiRoot).getXriOfPeerRoot())) {\r\n\t\t\tthis.cloudNumber = CloudNumber.fromPeerRootXri(((XdiPeerRoot) xdiRoot).getArcXri());\r\n\t\tif (xdiRoot instanceof XdiPeerRoot && CloudNumber.isValid(((XdiPeerRoot) xdiRoot).getXriOfPeerRoot())) {\r\n\t\t\tthis.cloudNumber = CloudNumber.fromPeerRootXri(((XdiPeerRoot) xdiRoot).getArcXri());\r\n\t\tXdiEntity authorityXdiEntity = XdiLocalRoot.findLocalRoot(authorityMessageResultGraph).getXdiEntity(this.cloudNumber.getXri(), false);\r\n\t\t\tfor (XDI3Segment endpointUriType : endpointUriTypes) {\r\n\t\t\t\tXDI3Segment endpointUriXdiAttributeAddress = XDI3Util.concatXris(endpointUriType, XDIClientConstants.XRI_SS_AS_URI);\r\n\tpublic Map<XDI3Segment, String> getEndpointUris() {\r\n\t\treturn this.getEndpointUris().get(XDIClientConstants.XRI_S_AS_XDI);\r", "old_methods": [], "patch": "@@ -17,9 +17,9 @@\n import xdi2.core.features.nodetypes.XdiPeerRoot;\r\n import xdi2.core.features.nodetypes.XdiRoot;\r\n import xdi2.core.features.nodetypes.XdiValue;\r\n-import xdi2.core.util.XDI3Util;\r\n-import xdi2.core.xri3.CloudNumber;\r\n-import xdi2.core.xri3.XDI3Segment;\r\n+import xdi2.core.syntax.CloudNumber;\r\n+import xdi2.core.syntax.XDIAddress;\r\n+import xdi2.core.util.AddressUtil;\r\n import xdi2.messaging.MessageEnvelope;\r\n import xdi2.messaging.MessageResult;\r\n \r\n@@ -30,7 +30,7 @@ public class XDIDiscoveryResult implements Serializable {\n \tprivate CloudNumber cloudNumber;\r\n \tprivate PublicKey signaturePublicKey;\r\n \tprivate PublicKey encryptionPublicKey;\r\n-\tprivate Map<XDI3Segment, String> endpointUris;\r\n+\tprivate Map<XDIAddress, String> endpointUris;\r\n \r\n \tprivate MessageEnvelope messageEnvelope;\r\n \tprivate MessageResult messageResult;\r\n@@ -40,19 +40,19 @@ public XDIDiscoveryResult() {\n \t\tthis.cloudNumber = null;\r\n \t\tthis.signaturePublicKey = null;\r\n \t\tthis.encryptionPublicKey = null;\r\n-\t\tthis.endpointUris = new HashMap<XDI3Segment, String> ();\r\n+\t\tthis.endpointUris = new HashMap<XDIAddress, String> ();\r\n \r\n \t\tthis.messageEnvelope = null;\r\n \t\tthis.messageResult = null;\r\n \t}\r\n \r\n-\tvoid initFromRegistryAndAuthorityDiscoveryResult(XDIDiscoveryResult xdiDiscoveryResultRegistry, XDIDiscoveryResult xdiDiscoveryResultAuthority, XDI3Segment query, XDI3Segment[] endpointUriTypes) throws Xdi2ClientException {\r\n+\tvoid initFromRegistryAndAuthorityDiscoveryResult(XDIDiscoveryResult xdiDiscoveryResultRegistry, XDIDiscoveryResult xdiDiscoveryResultAuthority, XDIAddress query, XDIAddress[] endpointUriTypes) throws Xdi2ClientException {\r\n \r\n \t\tthis.initFromRegistryMessageResult(xdiDiscoveryResultRegistry.getMessageEnvelope(), xdiDiscoveryResultRegistry.getMessageResult(), query, endpointUriTypes);\r\n \t\tthis.initFromAuthorityMessageResult(xdiDiscoveryResultAuthority.getMessageEnvelope(), xdiDiscoveryResultAuthority.getMessageResult(), endpointUriTypes);\r\n \t}\r\n \r\n-\tvoid initFromRegistryMessageResult(MessageEnvelope registryMessageEnvelope, MessageResult registryMessageResult, XDI3Segment query, XDI3Segment[] endpointUriTypes) throws Xdi2ClientException {\r\n+\tvoid initFromRegistryMessageResult(MessageEnvelope registryMessageEnvelope, MessageResult registryMessageResult, XDIAddress query, XDIAddress[] endpointUriTypes) throws Xdi2ClientException {\r\n \r\n \t\tthis.messageEnvelope = registryMessageEnvelope;\r\n \t\tthis.messageResult = registryMessageResult;\r\n@@ -66,25 +66,25 @@ void initFromRegistryMessageResult(MessageEnvelope registryMessageEnvelope, Mess\n \t\tXdiRoot xdiRoot = XdiLocalRoot.findLocalRoot(registryMessageResultGraph).getPeerRoot(query, false);\r\n \t\tif (xdiRoot == null) return;\r\n \r\n-\t\tif (xdiRoot instanceof XdiPeerRoot && CloudNumber.isValid(((XdiPeerRoot) xdiRoot).getXriOfPeerRoot())) {\r\n+\t\tif (xdiRoot instanceof XdiPeerRoot && CloudNumber.isValid(((XdiPeerRoot) xdiRoot).getAddressOfPeerRoot())) {\r\n \r\n-\t\t\tthis.cloudNumber = CloudNumber.fromPeerRootXri(((XdiPeerRoot) xdiRoot).getArcXri());\r\n+\t\t\tthis.cloudNumber = CloudNumber.fromPeerRootArc(((XdiPeerRoot) xdiRoot).getArc());\r\n \t\t}\r\n \r\n \t\txdiRoot = xdiRoot == null ? null : xdiRoot.dereference();\r\n \r\n-\t\tif (xdiRoot instanceof XdiPeerRoot && CloudNumber.isValid(((XdiPeerRoot) xdiRoot).getXriOfPeerRoot())) {\r\n+\t\tif (xdiRoot instanceof XdiPeerRoot && CloudNumber.isValid(((XdiPeerRoot) xdiRoot).getAddressOfPeerRoot())) {\r\n \r\n-\t\t\tthis.cloudNumber = CloudNumber.fromPeerRootXri(((XdiPeerRoot) xdiRoot).getArcXri());\r\n+\t\t\tthis.cloudNumber = CloudNumber.fromPeerRootArc(((XdiPeerRoot) xdiRoot).getArc());\r\n \t\t}\r\n \r\n \t\t// find XDI endpoint uri\r\n \r\n-\t\tendpointUriTypes = new XDI3Segment[] { XDIClientConstants.XRI_S_AS_XDI };\r\n+\t\tendpointUriTypes = new XDIAddress[] { XDIClientConstants.XDI_ADD_AS_XDI };\r\n \r\n-\t\tfor (XDI3Segment endpointUriType : endpointUriTypes) {\r\n+\t\tfor (XDIAddress endpointUriType : endpointUriTypes) {\r\n \r\n-\t\t\tXDI3Segment endpointUriXdiAttributeAddress = XDI3Util.concatXris(endpointUriType, XDIClientConstants.XRI_SS_AS_URI);\r\n+\t\t\tXDIAddress endpointUriXdiAttributeAddress = AddressUtil.concatAddresses(endpointUriType, XDIClientConstants.XDI_ARC_AS_URI);\r\n \t\t\tXdiAttribute endpointUriXdiAttribute = xdiRoot.getXdiAttributeSingleton(endpointUriXdiAttributeAddress, false);\r\n \t\t\tif (endpointUriXdiAttribute == null) continue;\r\n \r\n@@ -103,7 +103,7 @@ void initFromRegistryMessageResult(MessageEnvelope registryMessageEnvelope, Mess\n \t\t}\r\n \t}\r\n \r\n-\tvoid initFromAuthorityMessageResult(MessageEnvelope authorityMessageEnvelope, MessageResult authorityMessageResult, XDI3Segment[] endpointUriTypes) throws Xdi2ClientException {\r\n+\tvoid initFromAuthorityMessageResult(MessageEnvelope authorityMessageEnvelope, MessageResult authorityMessageResult, XDIAddress[] endpointUriTypes) throws Xdi2ClientException {\r\n \r\n \t\tthis.messageEnvelope = authorityMessageEnvelope;\r\n \t\tthis.messageResult = authorityMessageResult;\r\n@@ -118,24 +118,24 @@ void initFromAuthorityMessageResult(MessageEnvelope authorityMessageEnvelope, Me\n \t\tif (xdiRoot == null) xdiRoot = XdiLocalRoot.findLocalRoot(authorityMessageResultGraph);\r\n \t\tif (xdiRoot == null) return;\r\n \r\n-\t\tif (xdiRoot instanceof XdiPeerRoot && CloudNumber.isValid(((XdiPeerRoot) xdiRoot).getXriOfPeerRoot())) {\r\n+\t\tif (xdiRoot instanceof XdiPeerRoot && CloudNumber.isValid(((XdiPeerRoot) xdiRoot).getAddressOfPeerRoot())) {\r\n \r\n-\t\t\tthis.cloudNumber = CloudNumber.fromPeerRootXri(((XdiPeerRoot) xdiRoot).getArcXri());\r\n+\t\t\tthis.cloudNumber = CloudNumber.fromPeerRootArc(((XdiPeerRoot) xdiRoot).getArc());\r\n \t\t}\r\n \r\n \t\txdiRoot = xdiRoot == null ? null : xdiRoot.dereference();\r\n \r\n-\t\tif (xdiRoot instanceof XdiPeerRoot && CloudNumber.isValid(((XdiPeerRoot) xdiRoot).getXriOfPeerRoot())) {\r\n+\t\tif (xdiRoot instanceof XdiPeerRoot && CloudNumber.isValid(((XdiPeerRoot) xdiRoot).getAddressOfPeerRoot())) {\r\n \r\n-\t\t\tthis.cloudNumber = CloudNumber.fromPeerRootXri(((XdiPeerRoot) xdiRoot).getArcXri());\r\n+\t\t\tthis.cloudNumber = CloudNumber.fromPeerRootArc(((XdiPeerRoot) xdiRoot).getArc());\r\n \t\t}\r\n \r\n \t\t// find cloud names\r\n \r\n \r\n \t\t// find authority\r\n \r\n-\t\tXdiEntity authorityXdiEntity = XdiLocalRoot.findLocalRoot(authorityMessageResultGraph).getXdiEntity(this.cloudNumber.getXri(), false);\r\n+\t\tXdiEntity authorityXdiEntity = XdiLocalRoot.findLocalRoot(authorityMessageResultGraph).getXdiEntity(this.cloudNumber.getAddress(), false);\r\n \t\tif (authorityXdiEntity == null) return;\r\n \r\n \t\t// find signature public key\r\n@@ -162,9 +162,9 @@ void initFromAuthorityMessageResult(MessageEnvelope authorityMessageEnvelope, Me\n \r\n \t\tif (endpointUriTypes != null) {\r\n \r\n-\t\t\tfor (XDI3Segment endpointUriType : endpointUriTypes) {\r\n+\t\t\tfor (XDIAddress endpointUriType : endpointUriTypes) {\r\n \r\n-\t\t\t\tXDI3Segment endpointUriXdiAttributeAddress = XDI3Util.concatXris(endpointUriType, XDIClientConstants.XRI_SS_AS_URI);\r\n+\t\t\t\tXDIAddress endpointUriXdiAttributeAddress = AddressUtil.concatAddresses(endpointUriType, XDIClientConstants.XDI_ARC_AS_URI);\r\n \t\t\t\tXdiAttribute endpointUriXdiAttribute = authorityXdiEntity.getXdiAttributeSingleton(endpointUriXdiAttributeAddress, false);\r\n \t\t\t\tif (endpointUriXdiAttribute == null) continue;\r\n \r\n@@ -210,14 +210,14 @@ public PublicKey getEncryptionPublicKey() {\n \t\treturn this.encryptionPublicKey;\r\n \t}\r\n \r\n-\tpublic Map<XDI3Segment, String> getEndpointUris() {\r\n+\tpublic Map<XDIAddress, String> getEndpointUris() {\r\n \r\n \t\treturn this.endpointUris;\r\n \t}\r\n \r\n \tpublic String getXdiEndpointUri() {\r\n \r\n-\t\treturn this.getEndpointUris().get(XDIClientConstants.XRI_S_AS_XDI);\r\n+\t\treturn this.getEndpointUris().get(XDIClientConstants.XDI_ADD_AS_XDI);\r\n \t}\r\n \r\n \tpublic String getDefaultEndpointUri() {\r", "raw_url": "https://github.com/projectdanube/xdi2/raw/0ca7982fec30c2bb8204efbbea61428a643d2e9c/client%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fdiscovery%2FXDIDiscoveryResult.java", "sha": "06a770da205a8279ff7bd2199346c70db4902b35", "status": "modified" }, { "additions": 94, "blob_url": "https://github.com/projectdanube/xdi2/blob/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2FContextNode.java", "changes": 188, "contents_url": "https://api.github.com/repos/projectdanube/xdi2/contents/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2FContextNode.java?ref=0ca7982fec30c2bb8204efbbea61428a643d2e9c", "deletions": 94, "filename": "core/src/main/java/xdi2/core/ContextNode.java", "new_code": "import xdi2.core.syntax.XDIAddress;\r\nimport xdi2.core.syntax.XDIArc;\r\nimport xdi2.core.syntax.XDIStatement;\r\n\t * Every context node has an associated arc.\r\n\t * @return The arc associated with this context node.\r\n\tpublic XDIArc getArc();\r\n\t * Gets the address of this context node.\r\n\t * @return The address of this context node.\r\n\tpublic XDIAddress getAddress();\r\n\t * @param arc The arc of the new or existing context node.\r\n\tpublic ContextNode setContextNode(XDIArc arc);\r\n\tpublic ContextNode setDeepContextNode(XDIAddress relativecontextNodeAddress);\r\n\t * Returns the context node with a given arc.\r\n\t * @param arc The arc of the context node.\r\n\t * @return The context node with the given arc, or null.\r\n\tpublic ContextNode getContextNode(XDIArc arc, boolean subgraph);\r\n\t * Returns the context node with a given arc.\r\n\t * @param arc The arc of the context node.\r\n\t * @return The context node with the given arc, or null.\r\n\tpublic ContextNode getContextNode(XDIArc arc);\r\n\tpublic ContextNode getDeepContextNode(XDIAddress relativecontextNodeAddress, boolean subgraph);\r\n\tpublic ContextNode getDeepContextNode(XDIAddress relativecontextNodeAddress);\r\n\tpublic ReadOnlyIterator<ContextNode> getDeepContextNodes(XDIAddress relativecontextNodeAddress);\r\n\t * Checks if a context node with a given arc exists under this context node.\r\n\t * @param arc The arc to look for. \r\n\t * @return True if this context node has a context node with the given arc.\r\n\tpublic boolean containsContextNode(XDIArc arc);\r\n\t * Deletes the context node with a given arc.\r\n\t * @param arc The arc of the context node.\r\n\tpublic void delContextNode(XDIArc arc);\r\n\t * @param arc The arc of the relation.\r\n\t * @param targetContextNodeAddress The target context node XRI of the relation.\r\n\tpublic Relation setRelation(XDIAddress arc, XDIAddress targetContextNodeAddress);\r\n\t * Deep version of ContextNode.setRelation(XDIAddress, XDIAddress), operates at a context node further down in the graph.\r\n\tpublic Relation setDeepRelation(XDIAddress relativecontextNodeAddress, XDIAddress arc, XDIAddress targetContextNodeAddress);\r\n\t * @param arc The arc of the relation.\r\n\tpublic Relation setRelation(XDIAddress arc, ContextNode targetContextNode);\r\n\t * Deep version of ContextNode.setRelation(XDIAddress, ContextNode), operates at a context node further down in the graph.\r\n\tpublic Relation setDeepRelation(XDIAddress relativecontextNodeAddress, XDIAddress arc, ContextNode targetContextNode);\r\n\t * @param arc The arc to look for. \r\n\t * @param targetContextNodeAddress The target context node XRI of the relation.\r\n\t * @return The relation with the given arc, or null.\r\n\tpublic Relation getRelation(XDIAddress arc, XDIAddress targetContextNodeAddress);\r\n\t * Deep version of ContextNode.getRelation(XDIAddress, XDIAddress), operates at a context node further down in the graph.\r\n\tpublic Relation getDeepRelation(XDIAddress relativecontextNodeAddress, XDIAddress arc, XDIAddress targetContextNodeAddress);\r\n\t * @param arc The arc to look for. \r\n\t * @return The relation with the given arc, or null.\r\n\tpublic Relation getRelation(XDIAddress arc);\r\n\t * Deep version of ContextNode.getRelation(XDIAddress), operates at a context node further down in the graph.\r\n\tpublic Relation getDeepRelation(XDIAddress relativecontextNodeAddress, XDIAddress arc);\r\n\t * @param arc The arc to look for. \r\n\t * @return An iterator over relations with the given arc, or null.\r\n\tpublic ReadOnlyIterator<Relation> getRelations(XDIAddress arc);\r\n\t * Deep version of ContextNode.getRelations(XDIAddress), operates at a context node further down in the graph.\r\n\tpublic ReadOnlyIterator<Relation> getDeepRelations(XDIAddress relativecontextNodeAddress, XDIAddress arc);\r\n\tpublic ReadOnlyIterator<Relation> getDeepRelations(XDIAddress relativecontextNodeAddress);\r\n\t * Returns the incoming relations with a given arc.\r\n\t * @param arc The arc to look for. \r\n\t * @return An iterator over relations with the given arc, or null.\r\n\tpublic ReadOnlyIterator<Relation> getIncomingRelations(XDIAddress arc);\r\n\t * Checks if a relation with a given arc and target context node XRI exists in this context node.\r\n\t * @param arc The arc of the relations. \r\n\t * @param targetContextNodeAddress The target context node XRI of the relation.\r\n\t * @return True if this context node has a relation with the given arc and target context node XRI.\r\n\tpublic boolean containsRelation(XDIAddress arc, XDIAddress targetContextNodeAddress);\r\n\t * Checks if relations with a given arc exist in this context node.\r\n\t * @param arc The arc of the relations. \r\n\t * @return True if this context node has relations with the given arc.\r\n\tpublic boolean containsRelations(XDIAddress arc);\r\n\t * Checks if incoming relations with a given arc exist in this context node.\r\n\t * @param arc The arc of the incoming relations. \r\n\t * @return True if this context node has incoming relations with the given arc.\r\n\tpublic boolean containsIncomingRelations(XDIAddress arc);\r\n\t * Deletes the relation with a given arc from this context node.\r\n\t * @param arc The arc of the relation.\r\n\t * @param targetContextNodeAddress The target context node XRI of the relation.\r\n\tpublic void delRelation(XDIAddress arc, XDIAddress targetContextNodeAddress);\r\n\t * Deletes the relation with a given arc from this context node.\r\n\t * @param arc The arc of the relation.\r\n\tpublic void delRelations(XDIAddress arc);\r\n\t * @param arc The arc to look for. \r\n\tpublic long getRelationCount(XDIAddress arc);\r\n\tpublic Literal setDeepLiteral(XDIAddress relativecontextNodeAddress, Object literalData);\r\n\tpublic Literal setDeepLiteralString(XDIAddress relativecontextNodeAddress, String literalData);\r\n\tpublic Literal setDeepLiteralNumber(XDIAddress relativecontextNodeAddress, Double literalData);\r\n\tpublic Literal setDeepLiteralBoolean(XDIAddress relativecontextNodeAddress, Boolean literalData);\r\n\tpublic Literal getDeepLiteral(XDIAddress relativecontextNodeAddress, Object literalData);\r\n\tpublic Literal getDeepLiteralString(XDIAddress relativecontextNodeAddress, String literalData);\r\n\tpublic Literal getDeepLiteralNumber(XDIAddress relativecontextNodeAddress, Double literalData);\r\n\tpublic Literal getDeepLiteralBoolean(XDIAddress relativecontextNodeAddress, Boolean literalData);\r\n\tpublic Literal getDeepLiteral(XDIAddress relativecontextNodeAddress);\r\n\tpublic Statement setStatement(XDIStatement statementXri);\r\n\tpublic Statement getStatement(XDIStatement statementXri);\r\n\tpublic boolean containsStatement(XDIStatement statementXri);\r", "new_methods": [], "old_code": "import xdi2.core.xri3.XDI3Segment;\r\nimport xdi2.core.xri3.XDI3Statement;\r\nimport xdi2.core.xri3.XDI3SubSegment;\r\n\t * Every context node has an associated arc XRI.\r\n\t * @return The arc XRI associated with this context node.\r\n\tpublic XDI3SubSegment getArcXri();\r\n\t * Gets the XRI of this context node.\r\n\t * @return The XRI of this context node.\r\n\tpublic XDI3Segment getXri();\r\n\t * @param arcXri The arc XRI of the new or existing context node.\r\n\tpublic ContextNode setContextNode(XDI3SubSegment arcXri);\r\n\tpublic ContextNode setDeepContextNode(XDI3Segment relativeContextNodeXri);\r\n\t * Returns the context node with a given arc XRI.\r\n\t * @param arcXri The arc XRI of the context node.\r\n\t * @return The context node with the given arc XRI, or null.\r\n\tpublic ContextNode getContextNode(XDI3SubSegment arcXri, boolean subgraph);\r\n\t * Returns the context node with a given arc XRI.\r\n\t * @param arcXri The arc XRI of the context node.\r\n\t * @return The context node with the given arc XRI, or null.\r\n\tpublic ContextNode getContextNode(XDI3SubSegment arcXri);\r\n\tpublic ContextNode getDeepContextNode(XDI3Segment relativeContextNodeXri, boolean subgraph);\r\n\tpublic ContextNode getDeepContextNode(XDI3Segment relativeContextNodeXri);\r\n\tpublic ReadOnlyIterator<ContextNode> getDeepContextNodes(XDI3Segment relativeContextNodeXri);\r\n\t * Checks if a context node with a given arc XRI exists under this context node.\r\n\t * @param arcXri The arc XRI to look for. \r\n\t * @return True if this context node has a context node with the given arc XRI.\r\n\tpublic boolean containsContextNode(XDI3SubSegment arcXri);\r\n\t * Deletes the context node with a given arc XRI.\r\n\t * @param arcXri The arc XRI of the context node.\r\n\tpublic void delContextNode(XDI3SubSegment arcXri);\r\n\t * @param arcXri The arc XRI of the relation.\r\n\t * @param targetContextNodeXri The target context node XRI of the relation.\r\n\tpublic Relation setRelation(XDI3Segment arcXri, XDI3Segment targetContextNodeXri);\r\n\t * Deep version of ContextNode.setRelation(XDI3Segment, XDI3Segment), operates at a context node further down in the graph.\r\n\tpublic Relation setDeepRelation(XDI3Segment relativeContextNodeXri, XDI3Segment arcXri, XDI3Segment targetContextNodeXri);\r\n\t * @param arcXri The arc XRI of the relation.\r\n\tpublic Relation setRelation(XDI3Segment arcXri, ContextNode targetContextNode);\r\n\t * Deep version of ContextNode.setRelation(XDI3Segment, ContextNode), operates at a context node further down in the graph.\r\n\tpublic Relation setDeepRelation(XDI3Segment relativeContextNodeXri, XDI3Segment arcXri, ContextNode targetContextNode);\r\n\t * @param arcXri The arc XRI to look for. \r\n\t * @param targetContextNodeXri The target context node XRI of the relation.\r\n\t * @return The relation with the given arc XRI, or null.\r\n\tpublic Relation getRelation(XDI3Segment arcXri, XDI3Segment targetContextNodeXri);\r\n\t * Deep version of ContextNode.getRelation(XDI3Segment, XDI3Segment), operates at a context node further down in the graph.\r\n\tpublic Relation getDeepRelation(XDI3Segment relativeContextNodeXri, XDI3Segment arcXri, XDI3Segment targetContextNodeXri);\r\n\t * @param arcXri The arc XRI to look for. \r\n\t * @return The relation with the given arc XRI, or null.\r\n\tpublic Relation getRelation(XDI3Segment arcXri);\r\n\t * Deep version of ContextNode.getRelation(XDI3Segment), operates at a context node further down in the graph.\r\n\tpublic Relation getDeepRelation(XDI3Segment relativeContextNodeXri, XDI3Segment arcXri);\r\n\t * @param arcXri The arc XRI to look for. \r\n\t * @return An iterator over relations with the given arc XRI, or null.\r\n\tpublic ReadOnlyIterator<Relation> getRelations(XDI3Segment arcXri);\r\n\t * Deep version of ContextNode.getRelations(XDI3Segment), operates at a context node further down in the graph.\r\n\tpublic ReadOnlyIterator<Relation> getDeepRelations(XDI3Segment relativeContextNodeXri, XDI3Segment arcXri);\r\n\tpublic ReadOnlyIterator<Relation> getDeepRelations(XDI3Segment relativeContextNodeXri);\r\n\t * Returns the incoming relations with a given arc XRI.\r\n\t * @param arcXri The arc XRI to look for. \r\n\t * @return An iterator over relations with the given arc XRI, or null.\r\n\tpublic ReadOnlyIterator<Relation> getIncomingRelations(XDI3Segment arcXri);\r\n\t * Checks if a relation with a given arc XRI and target context node XRI exists in this context node.\r\n\t * @param arcXri The arc XRI of the relations. \r\n\t * @param targetContextNodeXri The target context node XRI of the relation.\r\n\t * @return True if this context node has a relation with the given arc XRI and target context node XRI.\r\n\tpublic boolean containsRelation(XDI3Segment arcXri, XDI3Segment targetContextNodeXri);\r\n\t * Checks if relations with a given arc XRI exist in this context node.\r\n\t * @param arcXri The arc XRI of the relations. \r\n\t * @return True if this context node has relations with the given arc XRI.\r\n\tpublic boolean containsRelations(XDI3Segment arcXri);\r\n\t * Checks if incoming relations with a given arc XRI exist in this context node.\r\n\t * @param arcXri The arc XRI of the incoming relations. \r\n\t * @return True if this context node has incoming relations with the given arc XRI.\r\n\tpublic boolean containsIncomingRelations(XDI3Segment arcXri);\r\n\t * Deletes the relation with a given arc XRI from this context node.\r\n\t * @param arcXri The arc XRI of the relation.\r\n\t * @param targetContextNodeXri The target context node XRI of the relation.\r\n\tpublic void delRelation(XDI3Segment arcXri, XDI3Segment targetContextNodeXri);\r\n\t * Deletes the relation with a given arc XRI from this context node.\r\n\t * @param arcXri The arc XRI of the relation.\r\n\tpublic void delRelations(XDI3Segment arcXri);\r\n\t * @param arcXri The arc XRI to look for. \r\n\tpublic long getRelationCount(XDI3Segment arcXri);\r\n\tpublic Literal setDeepLiteral(XDI3Segment relativeContextNodeXri, Object literalData);\r\n\tpublic Literal setDeepLiteralString(XDI3Segment relativeContextNodeXri, String literalData);\r\n\tpublic Literal setDeepLiteralNumber(XDI3Segment relativeContextNodeXri, Double literalData);\r\n\tpublic Literal setDeepLiteralBoolean(XDI3Segment relativeContextNodeXri, Boolean literalData);\r\n\tpublic Literal getDeepLiteral(XDI3Segment relativeContextNodeXri, Object literalData);\r\n\tpublic Literal getDeepLiteralString(XDI3Segment relativeContextNodeXri, String literalData);\r\n\tpublic Literal getDeepLiteralNumber(XDI3Segment relativeContextNodeXri, Double literalData);\r\n\tpublic Literal getDeepLiteralBoolean(XDI3Segment relativeContextNodeXri, Boolean literalData);\r\n\tpublic Literal getDeepLiteral(XDI3Segment relativeContextNodeXri);\r\n\tpublic Statement setStatement(XDI3Statement statementXri);\r\n\tpublic Statement getStatement(XDI3Statement statementXri);\r\n\tpublic boolean containsStatement(XDI3Statement statementXri);\r", "old_methods": [], "patch": "@@ -3,10 +3,10 @@\n import java.io.Serializable;\r\n \r\n import xdi2.core.Statement.ContextNodeStatement;\r\n+import xdi2.core.syntax.XDIAddress;\r\n+import xdi2.core.syntax.XDIArc;\r\n+import xdi2.core.syntax.XDIStatement;\r\n import xdi2.core.util.iterators.ReadOnlyIterator;\r\n-import xdi2.core.xri3.XDI3Segment;\r\n-import xdi2.core.xri3.XDI3Statement;\r\n-import xdi2.core.xri3.XDI3SubSegment;\r\n \r\n /**\r\n * This interface represents a context node in an XDI graph.\r\n@@ -67,61 +67,61 @@ public interface ContextNode extends Serializable, Comparable<ContextNode> {\n \tpublic boolean isEmpty();\r\n \r\n \t/**\r\n-\t * Every context node has an associated arc XRI.\r\n+\t * Every context node has an associated arc.\r\n \t * This returns null for the root context node.\r\n-\t * @return The arc XRI associated with this context node.\r\n+\t * @return The arc associated with this context node.\r\n \t */\r\n-\tpublic XDI3SubSegment getArcXri();\r\n+\tpublic XDIArc getArc();\r\n \r\n \t/**\r\n-\t * Gets the XRI of this context node.\r\n+\t * Gets the address of this context node.\r\n \t * This returns the empty string for the root context node.\r\n-\t * @return The XRI of this context node.\r\n+\t * @return The address of this context node.\r\n \t */\r\n-\tpublic XDI3Segment getXri();\r\n+\tpublic XDIAddress getAddress();\r\n \r\n \t/*\r\n \t * Methods related to context nodes of this context node\r\n \t */\r\n \r\n \t/**\r\n \t * Creates a new context node and adds it to this context node, or returns an existing context node.\r\n-\t * @param arcXri The arc XRI of the new or existing context node.\r\n+\t * @param arc The arc of the new or existing context node.\r\n \t * @return The newly created or existing context node.\r\n \t */\r\n-\tpublic ContextNode setContextNode(XDI3SubSegment arcXri);\r\n+\tpublic ContextNode setContextNode(XDIArc arc);\r\n \r\n \t/**\r\n \t * Deep version of ContextNode.setContextNode(XDI3SubSegment), operates at a context node further down in the graph.\r\n \t */\r\n-\tpublic ContextNode setDeepContextNode(XDI3Segment relativeContextNodeXri);\r\n+\tpublic ContextNode setDeepContextNode(XDIAddress relativecontextNodeAddress);\r\n \r\n \t/**\r\n-\t * Returns the context node with a given arc XRI.\r\n-\t * @param arcXri The arc XRI of the context node.\r\n+\t * Returns the context node with a given arc.\r\n+\t * @param arc The arc of the context node.\r\n \t * @param subgraph This is simply a hint to the implementation whether \r\n \t * child context nodes will subsequently be requested. Implementations may \r\n \t * or may not actually use this parameter.\r\n-\t * @return The context node with the given arc XRI, or null.\r\n+\t * @return The context node with the given arc, or null.\r\n \t */\r\n-\tpublic ContextNode getContextNode(XDI3SubSegment arcXri, boolean subgraph);\r\n+\tpublic ContextNode getContextNode(XDIArc arc, boolean subgraph);\r\n \r\n \t/**\r\n-\t * Returns the context node with a given arc XRI.\r\n-\t * @param arcXri The arc XRI of the context node.\r\n-\t * @return The context node with the given arc XRI, or null.\r\n+\t * Returns the context node with a given arc.\r\n+\t * @param arc The arc of the context node.\r\n+\t * @return The context node with the given arc, or null.\r\n \t */\r\n-\tpublic ContextNode getContextNode(XDI3SubSegment arcXri);\r\n+\tpublic ContextNode getContextNode(XDIArc arc);\r\n \r\n \t/**\r\n \t * Deep version of ContextNode.getContextNode(XDI3SubSegment, boolean), operates at a context node further down in the graph.\r\n \t */\r\n-\tpublic ContextNode getDeepContextNode(XDI3Segment relativeContextNodeXri, boolean subgraph);\r\n+\tpublic ContextNode getDeepContextNode(XDIAddress relativecontextNodeAddress, boolean subgraph);\r\n \r\n \t/**\r\n \t * Deep version of ContextNode.getContextNode(XDI3SubSegment), operates at a context node further down in the graph.\r\n \t */\r\n-\tpublic ContextNode getDeepContextNode(XDI3Segment relativeContextNodeXri);\r\n+\tpublic ContextNode getDeepContextNode(XDIAddress relativecontextNodeAddress);\r\n \r\n \t/**\r\n \t * Returns the context nodes under this context node.\r\n@@ -132,7 +132,7 @@ public interface ContextNode extends Serializable, Comparable<ContextNode> {\n \t/**\r\n \t * Deep version of ContextNode.getContextNodes(), operates at a context node further down in the graph.\r\n \t */\r\n-\tpublic ReadOnlyIterator<ContextNode> getDeepContextNodes(XDI3Segment relativeContextNodeXri);\r\n+\tpublic ReadOnlyIterator<ContextNode> getDeepContextNodes(XDIAddress relativecontextNodeAddress);\r\n \r\n \t/**\r\n \t * Returns all context nodes under this context node.\r\n@@ -147,11 +147,11 @@ public interface ContextNode extends Serializable, Comparable<ContextNode> {\n \tpublic ReadOnlyIterator<ContextNode> getAllLeafContextNodes();\r\n \r\n \t/**\r\n-\t * Checks if a context node with a given arc XRI exists under this context node.\r\n-\t * @param arcXri The arc XRI to look for. \r\n-\t * @return True if this context node has a context node with the given arc XRI.\r\n+\t * Checks if a context node with a given arc exists under this context node.\r\n+\t * @param arc The arc to look for. \r\n+\t * @return True if this context node has a context node with the given arc.\r\n \t */\r\n-\tpublic boolean containsContextNode(XDI3SubSegment arcXri);\r\n+\tpublic boolean containsContextNode(XDIArc arc);\r\n \r\n \t/**\r\n \t * Checks if this context node has one or more context nodes.\r\n@@ -160,10 +160,10 @@ public interface ContextNode extends Serializable, Comparable<ContextNode> {\n \tpublic boolean containsContextNodes();\r\n \r\n \t/**\r\n-\t * Deletes the context node with a given arc XRI.\r\n-\t * @param arcXri The arc XRI of the context node.\r\n+\t * Deletes the context node with a given arc.\r\n+\t * @param arc The arc of the context node.\r\n \t */\r\n-\tpublic void delContextNode(XDI3SubSegment arcXri);\r\n+\tpublic void delContextNode(XDIArc arc);\r\n \r\n \t/**\r\n \t * Deletes all context nodes from this context node.\r\n@@ -188,66 +188,66 @@ public interface ContextNode extends Serializable, Comparable<ContextNode> {\n \r\n \t/**\r\n \t * Creates a new relation and adds it to this context node, or returns an existing relation.\r\n-\t * @param arcXri The arc XRI of the relation.\r\n-\t * @param targetContextNodeXri The target context node XRI of the relation.\r\n+\t * @param arc The arc of the relation.\r\n+\t * @param targetContextNodeAddress The target context node XRI of the relation.\r\n \t * @return The newly created or existing relation.\r\n \t */\r\n-\tpublic Relation setRelation(XDI3Segment arcXri, XDI3Segment targetContextNodeXri);\r\n+\tpublic Relation setRelation(XDIAddress arc, XDIAddress targetContextNodeAddress);\r\n \r\n \t/**\r\n-\t * Deep version of ContextNode.setRelation(XDI3Segment, XDI3Segment), operates at a context node further down in the graph.\r\n+\t * Deep version of ContextNode.setRelation(XDIAddress, XDIAddress), operates at a context node further down in the graph.\r\n \t */\r\n-\tpublic Relation setDeepRelation(XDI3Segment relativeContextNodeXri, XDI3Segment arcXri, XDI3Segment targetContextNodeXri);\r\n+\tpublic Relation setDeepRelation(XDIAddress relativecontextNodeAddress, XDIAddress arc, XDIAddress targetContextNodeAddress);\r\n \r\n \t/**\r\n \t * Creates a new relation and adds it to this context node, or returns an existing relation.\r\n-\t * @param arcXri The arc XRI of the relation.\r\n+\t * @param arc The arc of the relation.\r\n \t * @param targetContextNode The target context node of the relation.\r\n \t * @return The newly created or existing relation.\r\n \t */\r\n-\tpublic Relation setRelation(XDI3Segment arcXri, ContextNode targetContextNode);\r\n+\tpublic Relation setRelation(XDIAddress arc, ContextNode targetContextNode);\r\n \r\n \t/**\r\n-\t * Deep version of ContextNode.setRelation(XDI3Segment, ContextNode), operates at a context node further down in the graph.\r\n+\t * Deep version of ContextNode.setRelation(XDIAddress, ContextNode), operates at a context node further down in the graph.\r\n \t */\r\n-\tpublic Relation setDeepRelation(XDI3Segment relativeContextNodeXri, XDI3Segment arcXri, ContextNode targetContextNode);\r\n+\tpublic Relation setDeepRelation(XDIAddress relativecontextNodeAddress, XDIAddress arc, ContextNode targetContextNode);\r\n \r\n \t/**\r\n \t * Returns a relation at this context node. \r\n-\t * @param arcXri The arc XRI to look for. \r\n-\t * @param targetContextNodeXri The target context node XRI of the relation.\r\n-\t * @return The relation with the given arc XRI, or null.\r\n+\t * @param arc The arc to look for. \r\n+\t * @param targetContextNodeAddress The target context node XRI of the relation.\r\n+\t * @return The relation with the given arc, or null.\r\n \t */\r\n-\tpublic Relation getRelation(XDI3Segment arcXri, XDI3Segment targetContextNodeXri);\r\n+\tpublic Relation getRelation(XDIAddress arc, XDIAddress targetContextNodeAddress);\r\n \r\n \t/**\r\n-\t * Deep version of ContextNode.getRelation(XDI3Segment, XDI3Segment), operates at a context node further down in the graph.\r\n+\t * Deep version of ContextNode.getRelation(XDIAddress, XDIAddress), operates at a context node further down in the graph.\r\n \t */\r\n-\tpublic Relation getDeepRelation(XDI3Segment relativeContextNodeXri, XDI3Segment arcXri, XDI3Segment targetContextNodeXri);\r\n+\tpublic Relation getDeepRelation(XDIAddress relativecontextNodeAddress, XDIAddress arc, XDIAddress targetContextNodeAddress);\r\n \r\n \t/**\r\n \t * Returns a relation at this context node. \r\n-\t * @param arcXri The arc XRI to look for. \r\n-\t * @return The relation with the given arc XRI, or null.\r\n+\t * @param arc The arc to look for. \r\n+\t * @return The relation with the given arc, or null.\r\n \t */\r\n-\tpublic Relation getRelation(XDI3Segment arcXri);\r\n+\tpublic Relation getRelation(XDIAddress arc);\r\n \r\n \t/**\r\n-\t * Deep version of ContextNode.getRelation(XDI3Segment), operates at a context node further down in the graph.\r\n+\t * Deep version of ContextNode.getRelation(XDIAddress), operates at a context node further down in the graph.\r\n \t */\r\n-\tpublic Relation getDeepRelation(XDI3Segment relativeContextNodeXri, XDI3Segment arcXri);\r\n+\tpublic Relation getDeepRelation(XDIAddress relativecontextNodeAddress, XDIAddress arc);\r\n \r\n \t/**\r\n \t * Returns relations at this context node. \r\n-\t * @param arcXri The arc XRI to look for. \r\n-\t * @return An iterator over relations with the given arc XRI, or null.\r\n+\t * @param arc The arc to look for. \r\n+\t * @return An iterator over relations with the given arc, or null.\r\n \t */\r\n-\tpublic ReadOnlyIterator<Relation> getRelations(XDI3Segment arcXri);\r\n+\tpublic ReadOnlyIterator<Relation> getRelations(XDIAddress arc);\r\n \r\n \t/**\r\n-\t * Deep version of ContextNode.getRelations(XDI3Segment), operates at a context node further down in the graph.\r\n+\t * Deep version of ContextNode.getRelations(XDIAddress), operates at a context node further down in the graph.\r\n \t */\r\n-\tpublic ReadOnlyIterator<Relation> getDeepRelations(XDI3Segment relativeContextNodeXri, XDI3Segment arcXri);\r\n+\tpublic ReadOnlyIterator<Relation> getDeepRelations(XDIAddress relativecontextNodeAddress, XDIAddress arc);\r\n \r\n \t/**\r\n \t * Returns the relations of this context node.\r\n@@ -258,14 +258,14 @@ public interface ContextNode extends Serializable, Comparable<ContextNode> {\n \t/**\r\n \t * Deep version of ContextNode.getRelations(), operates at a context node further down in the graph.\r\n \t */\r\n-\tpublic ReadOnlyIterator<Relation> getDeepRelations(XDI3Segment relativeContextNodeXri);\r\n+\tpublic ReadOnlyIterator<Relation> getDeepRelations(XDIAddress relativecontextNodeAddress);\r\n \r\n \t/**\r\n-\t * Returns the incoming relations with a given arc XRI.\r\n-\t * @param arcXri The arc XRI to look for. \r\n-\t * @return An iterator over relations with the given arc XRI, or null.\r\n+\t * Returns the incoming relations with a given arc.\r\n+\t * @param arc The arc to look for. \r\n+\t * @return An iterator over relations with the given arc, or null.\r\n \t */\r\n-\tpublic ReadOnlyIterator<Relation> getIncomingRelations(XDI3Segment arcXri);\r\n+\tpublic ReadOnlyIterator<Relation> getIncomingRelations(XDIAddress arc);\r\n \r\n \t/**\r\n \t * Returns the incoming relations of this context node.\r\n@@ -286,19 +286,19 @@ public interface ContextNode extends Serializable, Comparable<ContextNode> {\n \tpublic ReadOnlyIterator<Relation> getAllIncomingRelations();\r\n \r\n \t/**\r\n-\t * Checks if a relation with a given arc XRI and target context node XRI exists in this context node.\r\n-\t * @param arcXri The arc XRI of the relations. \r\n-\t * @param targetContextNodeXri The target context node XRI of the relation.\r\n-\t * @return True if this context node has a relation with the given arc XRI and target context node XRI.\r\n+\t * Checks if a relation with a given arc and target context node XRI exists in this context node.\r\n+\t * @param arc The arc of the relations. \r\n+\t * @param targetContextNodeAddress The target context node XRI of the relation.\r\n+\t * @return True if this context node has a relation with the given arc and target context node XRI.\r\n \t */\r\n-\tpublic boolean containsRelation(XDI3Segment arcXri, XDI3Segment targetContextNodeXri);\r\n+\tpublic boolean containsRelation(XDIAddress arc, XDIAddress targetContextNodeAddress);\r\n \r\n \t/**\r\n-\t * Checks if relations with a given arc XRI exist in this context node.\r\n-\t * @param arcXri The arc XRI of the relations. \r\n-\t * @return True if this context node has relations with the given arc XRI.\r\n+\t * Checks if relations with a given arc exist in this context node.\r\n+\t * @param arc The arc of the relations. \r\n+\t * @return True if this context node has relations with the given arc.\r\n \t */\r\n-\tpublic boolean containsRelations(XDI3Segment arcXri);\r\n+\tpublic boolean containsRelations(XDIAddress arc);\r\n \r\n \t/**\r\n \t * Checks if this context node has one or more relations.\r\n@@ -307,11 +307,11 @@ public interface ContextNode extends Serializable, Comparable<ContextNode> {\n \tpublic boolean containsRelations();\r\n \r\n \t/**\r\n-\t * Checks if incoming relations with a given arc XRI exist in this context node.\r\n-\t * @param arcXri The arc XRI of the incoming relations. \r\n-\t * @return True if this context node has incoming relations with the given arc XRI.\r\n+\t * Checks if incoming relations with a given arc exist in this context node.\r\n+\t * @param arc The arc of the incoming relations. \r\n+\t * @return True if this context node has incoming relations with the given arc.\r\n \t */\r\n-\tpublic boolean containsIncomingRelations(XDI3Segment arcXri);\r\n+\tpublic boolean containsIncomingRelations(XDIAddress arc);\r\n \r\n \t/**\r\n \t * Checks if this context node has one or more incoming relations.\r\n@@ -320,17 +320,17 @@ public interface ContextNode extends Serializable, Comparable<ContextNode> {\n \tpublic boolean containsIncomingRelations();\r\n \r\n \t/**\r\n-\t * Deletes the relation with a given arc XRI from this context node.\r\n-\t * @param arcXri The arc XRI of the relation.\r\n-\t * @param targetContextNodeXri The target context node XRI of the relation.\r\n+\t * Deletes the relation with a given arc from this context node.\r\n+\t * @param arc The arc of the relation.\r\n+\t * @param targetContextNodeAddress The target context node XRI of the relation.\r\n \t */\r\n-\tpublic void delRelation(XDI3Segment arcXri, XDI3Segment targetContextNodeXri);\r\n+\tpublic void delRelation(XDIAddress arc, XDIAddress targetContextNodeAddress);\r\n \r\n \t/**\r\n-\t * Deletes the relation with a given arc XRI from this context node.\r\n-\t * @param arcXri The arc XRI of the relation.\r\n+\t * Deletes the relation with a given arc from this context node.\r\n+\t * @param arc The arc of the relation.\r\n \t */\r\n-\tpublic void delRelations(XDI3Segment arcXri);\r\n+\tpublic void delRelations(XDIAddress arc);\r\n \r\n \t/**\r\n \t * Deletes all relations from this context node.\r\n@@ -344,10 +344,10 @@ public interface ContextNode extends Serializable, Comparable<ContextNode> {\n \r\n \t/**\r\n \t * Returns the number of relations of this context node.\r\n-\t * @param arcXri The arc XRI to look for. \r\n+\t * @param arc The arc to look for. \r\n \t * @return The number of relations.\r\n \t */\r\n-\tpublic long getRelationCount(XDI3Segment arcXri);\r\n+\tpublic long getRelationCount(XDIAddress arc);\r\n \r\n \t/**\r\n \t * Returns the number of relations of this context node.\r\n@@ -396,22 +396,22 @@ public interface ContextNode extends Serializable, Comparable<ContextNode> {\n \t/**\r\n \t * Deep version of ContextNode.setLiteral(Object), operates at a context node further down in the graph.\r\n \t */\r\n-\tpublic Literal setDeepLiteral(XDI3Segment relativeContextNodeXri, Object literalData);\r\n+\tpublic Literal setDeepLiteral(XDIAddress relativecontextNodeAddress, Object literalData);\r\n \r\n \t/**\r\n \t * Deep version of ContextNode.setLiteralString(String), operates at a context node further down in the graph.\r\n \t */\r\n-\tpublic Literal setDeepLiteralString(XDI3Segment relativeContextNodeXri, String literalData);\r\n+\tpublic Literal setDeepLiteralString(XDIAddress relativecontextNodeAddress, String literalData);\r\n \r\n \t/**\r\n \t * Deep version of ContextNode.setLiteralNumber(Double), operates at a context node further down in the graph.\r\n \t */\r\n-\tpublic Literal setDeepLiteralNumber(XDI3Segment relativeContextNodeXri, Double literalData);\r\n+\tpublic Literal setDeepLiteralNumber(XDIAddress relativecontextNodeAddress, Double literalData);\r\n \r\n \t/**\r\n \t * Deep version of ContextNode.setLiteralBoolean(Boolean), operates at a context node further down in the graph.\r\n \t */\r\n-\tpublic Literal setDeepLiteralBoolean(XDI3Segment relativeContextNodeXri, Boolean literalData);\r\n+\tpublic Literal setDeepLiteralBoolean(XDIAddress relativecontextNodeAddress, Boolean literalData);\r\n \r\n \t/**\r\n \t * Returns the literal of this context node.\r\n@@ -450,27 +450,27 @@ public interface ContextNode extends Serializable, Comparable<ContextNode> {\n \t/**\r\n \t * Deep version of ContextNode.getLiteral(Object), operates at a context node further down in the graph.\r\n \t */\r\n-\tpublic Literal getDeepLiteral(XDI3Segment relativeContextNodeXri, Object literalData);\r\n+\tpublic Literal getDeepLiteral(XDIAddress relativecontextNodeAddress, Object literalData);\r\n \r\n \t/**\r\n \t * Deep version of ContextNode.getLiteralString(String), operates at a context node further down in the graph.\r\n \t */\r\n-\tpublic Literal getDeepLiteralString(XDI3Segment relativeContextNodeXri, String literalData);\r\n+\tpublic Literal getDeepLiteralString(XDIAddress relativecontextNodeAddress, String literalData);\r\n \r\n \t/**\r\n \t * Deep version of ContextNode.getLiteraNumber(Double), operates at a context node further down in the graph.\r\n \t */\r\n-\tpublic Literal getDeepLiteralNumber(XDI3Segment relativeContextNodeXri, Double literalData);\r\n+\tpublic Literal getDeepLiteralNumber(XDIAddress relativecontextNodeAddress, Double literalData);\r\n \r\n \t/**\r\n \t * Deep version of ContextNode.getLiteralBoolean(Boolean), operates at a context node further down in the graph.\r\n \t */\r\n-\tpublic Literal getDeepLiteralBoolean(XDI3Segment relativeContextNodeXri, Boolean literalData);\r\n+\tpublic Literal getDeepLiteralBoolean(XDIAddress relativecontextNodeAddress, Boolean literalData);\r\n \r\n \t/**\r\n \t * Deep version of ContextNode.getLiteral(), operates at a context node further down in the graph.\r\n \t */\r\n-\tpublic Literal getDeepLiteral(XDI3Segment relativeContextNodeXri);\r\n+\tpublic Literal getDeepLiteral(XDIAddress relativecontextNodeAddress);\r\n \r\n \t/**\r\n \t * Returns all literals of this context node.\r\n@@ -536,12 +536,12 @@ public interface ContextNode extends Serializable, Comparable<ContextNode> {\n \t/**\r\n \t * Sets a statement in this context node.\r\n \t */\r\n-\tpublic Statement setStatement(XDI3Statement statementXri);\r\n+\tpublic Statement setStatement(XDIStatement statementXri);\r\n \r\n \t/**\r\n \t * Gets a statement in this context node.\r\n \t */\r\n-\tpublic Statement getStatement(XDI3Statement statementXri);\r\n+\tpublic Statement getStatement(XDIStatement statementXri);\r\n \r\n \t/**\r\n \t * Gets all statements in this context node.\r\n@@ -552,7 +552,7 @@ public interface ContextNode extends Serializable, Comparable<ContextNode> {\n \t/**\r\n \t * Check if a statement exists in this context node.\r\n \t */\r\n-\tpublic boolean containsStatement(XDI3Statement statementXri);\r\n+\tpublic boolean containsStatement(XDIStatement statementXri);\r\n \r\n \t/**\r\n \t * Returns the number of all statements in this context node.\r", "raw_url": "https://github.com/projectdanube/xdi2/raw/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2FContextNode.java", "sha": "647c3e7e99d2509d0745528902b83e61da03e831", "status": "modified" }, { "additions": 32, "blob_url": "https://github.com/projectdanube/xdi2/blob/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2FGraph.java", "changes": 64, "contents_url": "https://api.github.com/repos/projectdanube/xdi2/contents/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2FGraph.java?ref=0ca7982fec30c2bb8204efbbea61428a643d2e9c", "deletions": 32, "filename": "core/src/main/java/xdi2/core/Graph.java", "new_code": "import xdi2.core.syntax.XDIAddress;\r\nimport xdi2.core.syntax.XDIStatement;\r\n\t * Deep version of ContextNode.setContextNode(XDIArc), operates at a context node further down in the graph.\r\n\tpublic ContextNode setDeepContextNode(XDIAddress contextNodeAddress);\r\n\t * Deep version of ContextNode.getContextNode(XDIArc, boolean), operates at a context node further down in the graph.\r\n\tpublic ContextNode getDeepContextNode(XDIAddress contextNodeAddress, boolean subgraph);\r\n\t * Deep version of ContextNode.getContextNode(XDIArc), operates at a context node further down in the graph.\r\n\tpublic ContextNode getDeepContextNode(XDIAddress contextNodeAddress);\r\n\tpublic ReadOnlyIterator<ContextNode> getDeepContextNodes(XDIAddress contextNodeAddress);\r\n\t * Deep version of ContextNode.setRelation(XDIAddress, XDIAddress), operates at a context node further down in the graph.\r\n\tpublic Relation setDeepRelation(XDIAddress contextNodeAddress, XDIAddress arc, XDIAddress targetContextNodeAddress);\r\n\t * Deep version of ContextNode.setRelation(XDIAddress, ContextNode), operates at a context node further down in the graph.\r\n\tpublic Relation setDeepRelation(XDIAddress contextNodeAddress, XDIAddress arc, ContextNode targetContextNode);\r\n\t * Deep version of ContextNode.getRelation(XDIAddress, XDIAddress), operates at a context node further down in the graph.\r\n\tpublic Relation getDeepRelation(XDIAddress contextNodeAddress, XDIAddress arc, XDIAddress targetContextNodeAddress);\r\n\t * Deep version of ContextNode.getRelation(XDIAddress), operates at a context node further down in the graph.\r\n\tpublic Relation getDeepRelation(XDIAddress contextNodeAddress, XDIAddress arc);\r\n\t * Deep version of ContextNode.getRelations(XDIAddress), operates at a context node further down in the graph.\r\n\tpublic ReadOnlyIterator<Relation> getDeepRelations(XDIAddress contextNodeAddress, XDIAddress arc);\r\n\tpublic ReadOnlyIterator<Relation> getDeepRelations(XDIAddress contextNodeAddress);\r\n\tpublic Literal setDeepLiteral(XDIAddress contextNodeAddress, Object literalData);\r\n\tpublic Literal setDeepLiteralString(XDIAddress contextNodeAddress, String literalData);\r\n\tpublic Literal setDeepLiteralNumber(XDIAddress contextNodeAddress, Double literalData);\r\n\tpublic Literal setDeepLiteralBoolean(XDIAddress contextNodeAddress, Boolean literalData);\r\n\tpublic Literal getDeepLiteral(XDIAddress contextNodeAddress, Object literalData);\r\n\tpublic Literal getDeepLiteralString(XDIAddress contextNodeAddress, String literalData);\r\n\tpublic Literal getDeepLiteralNumber(XDIAddress contextNodeAddress, Double literalData);\r\n\tpublic Literal getDeepLiteralBoolean(XDIAddress contextNodeAddress, Boolean literalData);\r\n\tpublic Literal getDeepLiteral(XDIAddress contextNodeAddress);\r\n\tpublic Statement setStatement(XDIStatement statementXri);\r\n\tpublic Statement getStatement(XDIStatement statementXri);\r\n\tpublic boolean containsStatement(XDIStatement statementXri);\r", "new_methods": [], "old_code": "import xdi2.core.xri3.XDI3Segment;\r\nimport xdi2.core.xri3.XDI3Statement;\r\n\t * Deep version of ContextNode.setContextNode(XDI3SubSegment), operates at a context node further down in the graph.\r\n\tpublic ContextNode setDeepContextNode(XDI3Segment contextNodeXri);\r\n\t * Deep version of ContextNode.getContextNode(XDI3SubSegment, boolean), operates at a context node further down in the graph.\r\n\tpublic ContextNode getDeepContextNode(XDI3Segment contextNodeXri, boolean subgraph);\r\n\t * Deep version of ContextNode.getContextNode(XDI3SubSegment), operates at a context node further down in the graph.\r\n\tpublic ContextNode getDeepContextNode(XDI3Segment contextNodeXri);\r\n\tpublic ReadOnlyIterator<ContextNode> getDeepContextNodes(XDI3Segment contextNodeXri);\r\n\t * Deep version of ContextNode.setRelation(XDI3Segment, XDI3Segment), operates at a context node further down in the graph.\r\n\tpublic Relation setDeepRelation(XDI3Segment contextNodeXri, XDI3Segment arcXri, XDI3Segment targetContextNodeXri);\r\n\t * Deep version of ContextNode.setRelation(XDI3Segment, ContextNode), operates at a context node further down in the graph.\r\n\tpublic Relation setDeepRelation(XDI3Segment contextNodeXri, XDI3Segment arcXri, ContextNode targetContextNode);\r\n\t * Deep version of ContextNode.getRelation(XDI3Segment, XDI3Segment), operates at a context node further down in the graph.\r\n\tpublic Relation getDeepRelation(XDI3Segment contextNodeXri, XDI3Segment arcXri, XDI3Segment targetContextNodeXri);\r\n\t * Deep version of ContextNode.getRelation(XDI3Segment), operates at a context node further down in the graph.\r\n\tpublic Relation getDeepRelation(XDI3Segment contextNodeXri, XDI3Segment arcXri);\r\n\t * Deep version of ContextNode.getRelations(XDI3Segment), operates at a context node further down in the graph.\r\n\tpublic ReadOnlyIterator<Relation> getDeepRelations(XDI3Segment contextNodeXri, XDI3Segment arcXri);\r\n\tpublic ReadOnlyIterator<Relation> getDeepRelations(XDI3Segment contextNodeXri);\r\n\tpublic Literal setDeepLiteral(XDI3Segment contextNodeXri, Object literalData);\r\n\tpublic Literal setDeepLiteralString(XDI3Segment contextNodeXri, String literalData);\r\n\tpublic Literal setDeepLiteralNumber(XDI3Segment contextNodeXri, Double literalData);\r\n\tpublic Literal setDeepLiteralBoolean(XDI3Segment contextNodeXri, Boolean literalData);\r\n\tpublic Literal getDeepLiteral(XDI3Segment contextNodeXri, Object literalData);\r\n\tpublic Literal getDeepLiteralString(XDI3Segment contextNodeXri, String literalData);\r\n\tpublic Literal getDeepLiteralNumber(XDI3Segment contextNodeXri, Double literalData);\r\n\tpublic Literal getDeepLiteralBoolean(XDI3Segment contextNodeXri, Boolean literalData);\r\n\tpublic Literal getDeepLiteral(XDI3Segment contextNodeXri);\r\n\tpublic Statement setStatement(XDI3Statement statementXri);\r\n\tpublic Statement getStatement(XDI3Statement statementXri);\r\n\tpublic boolean containsStatement(XDI3Statement statementXri);\r", "old_methods": [], "patch": "@@ -4,9 +4,9 @@\n import java.util.Properties;\r\n \r\n import xdi2.core.io.MimeType;\r\n+import xdi2.core.syntax.XDIAddress;\r\n+import xdi2.core.syntax.XDIStatement;\r\n import xdi2.core.util.iterators.ReadOnlyIterator;\r\n-import xdi2.core.xri3.XDI3Segment;\r\n-import xdi2.core.xri3.XDI3Statement;\r\n \r\n /**\r\n * This interface represents a whole XDI graph.\r\n@@ -83,99 +83,99 @@ public interface Graph extends Serializable, Comparable<Graph> {\n \t */\r\n \r\n \t/**\r\n-\t * Deep version of ContextNode.setContextNode(XDI3SubSegment), operates at a context node further down in the graph.\r\n+\t * Deep version of ContextNode.setContextNode(XDIArc), operates at a context node further down in the graph.\r\n \t */\r\n-\tpublic ContextNode setDeepContextNode(XDI3Segment contextNodeXri);\r\n+\tpublic ContextNode setDeepContextNode(XDIAddress contextNodeAddress);\r\n \r\n \t/**\r\n-\t * Deep version of ContextNode.getContextNode(XDI3SubSegment, boolean), operates at a context node further down in the graph.\r\n+\t * Deep version of ContextNode.getContextNode(XDIArc, boolean), operates at a context node further down in the graph.\r\n \t */\r\n-\tpublic ContextNode getDeepContextNode(XDI3Segment contextNodeXri, boolean subgraph);\r\n+\tpublic ContextNode getDeepContextNode(XDIAddress contextNodeAddress, boolean subgraph);\r\n \r\n \t/**\r\n-\t * Deep version of ContextNode.getContextNode(XDI3SubSegment), operates at a context node further down in the graph.\r\n+\t * Deep version of ContextNode.getContextNode(XDIArc), operates at a context node further down in the graph.\r\n \t */\r\n-\tpublic ContextNode getDeepContextNode(XDI3Segment contextNodeXri);\r\n+\tpublic ContextNode getDeepContextNode(XDIAddress contextNodeAddress);\r\n \r\n \t/**\r\n \t * Deep version of ContextNode.getContextNodes(), operates at a context node further down in the graph.\r\n \t */\r\n-\tpublic ReadOnlyIterator<ContextNode> getDeepContextNodes(XDI3Segment contextNodeXri);\r\n+\tpublic ReadOnlyIterator<ContextNode> getDeepContextNodes(XDIAddress contextNodeAddress);\r\n \r\n \t/**\r\n-\t * Deep version of ContextNode.setRelation(XDI3Segment, XDI3Segment), operates at a context node further down in the graph.\r\n+\t * Deep version of ContextNode.setRelation(XDIAddress, XDIAddress), operates at a context node further down in the graph.\r\n \t */\r\n-\tpublic Relation setDeepRelation(XDI3Segment contextNodeXri, XDI3Segment arcXri, XDI3Segment targetContextNodeXri);\r\n+\tpublic Relation setDeepRelation(XDIAddress contextNodeAddress, XDIAddress arc, XDIAddress targetContextNodeAddress);\r\n \r\n \t/**\r\n-\t * Deep version of ContextNode.setRelation(XDI3Segment, ContextNode), operates at a context node further down in the graph.\r\n+\t * Deep version of ContextNode.setRelation(XDIAddress, ContextNode), operates at a context node further down in the graph.\r\n \t */\r\n-\tpublic Relation setDeepRelation(XDI3Segment contextNodeXri, XDI3Segment arcXri, ContextNode targetContextNode);\r\n+\tpublic Relation setDeepRelation(XDIAddress contextNodeAddress, XDIAddress arc, ContextNode targetContextNode);\r\n \r\n \t/**\r\n-\t * Deep version of ContextNode.getRelation(XDI3Segment, XDI3Segment), operates at a context node further down in the graph.\r\n+\t * Deep version of ContextNode.getRelation(XDIAddress, XDIAddress), operates at a context node further down in the graph.\r\n \t */\r\n-\tpublic Relation getDeepRelation(XDI3Segment contextNodeXri, XDI3Segment arcXri, XDI3Segment targetContextNodeXri);\r\n+\tpublic Relation getDeepRelation(XDIAddress contextNodeAddress, XDIAddress arc, XDIAddress targetContextNodeAddress);\r\n \r\n \t/**\r\n-\t * Deep version of ContextNode.getRelation(XDI3Segment), operates at a context node further down in the graph.\r\n+\t * Deep version of ContextNode.getRelation(XDIAddress), operates at a context node further down in the graph.\r\n \t */\r\n-\tpublic Relation getDeepRelation(XDI3Segment contextNodeXri, XDI3Segment arcXri);\r\n+\tpublic Relation getDeepRelation(XDIAddress contextNodeAddress, XDIAddress arc);\r\n \r\n \t/**\r\n-\t * Deep version of ContextNode.getRelations(XDI3Segment), operates at a context node further down in the graph.\r\n+\t * Deep version of ContextNode.getRelations(XDIAddress), operates at a context node further down in the graph.\r\n \t */\r\n-\tpublic ReadOnlyIterator<Relation> getDeepRelations(XDI3Segment contextNodeXri, XDI3Segment arcXri);\r\n+\tpublic ReadOnlyIterator<Relation> getDeepRelations(XDIAddress contextNodeAddress, XDIAddress arc);\r\n \r\n \t/**\r\n \t * Deep version of ContextNode.getRelations(), operates at a context node further down in the graph.\r\n \t */\r\n-\tpublic ReadOnlyIterator<Relation> getDeepRelations(XDI3Segment contextNodeXri);\r\n+\tpublic ReadOnlyIterator<Relation> getDeepRelations(XDIAddress contextNodeAddress);\r\n \r\n \t/**\r\n \t * Deep version of ContextNode.setLiteral(Object), operates at a context node further down in the graph.\r\n \t */\r\n-\tpublic Literal setDeepLiteral(XDI3Segment contextNodeXri, Object literalData);\r\n+\tpublic Literal setDeepLiteral(XDIAddress contextNodeAddress, Object literalData);\r\n \r\n \t/**\r\n \t * Deep version of ContextNode.setLiteralString(String), operates at a context node further down in the graph.\r\n \t */\r\n-\tpublic Literal setDeepLiteralString(XDI3Segment contextNodeXri, String literalData);\r\n+\tpublic Literal setDeepLiteralString(XDIAddress contextNodeAddress, String literalData);\r\n \r\n \t/**\r\n \t * Deep version of ContextNode.setLiteralNumber(Double), operates at a context node further down in the graph.\r\n \t */\r\n-\tpublic Literal setDeepLiteralNumber(XDI3Segment contextNodeXri, Double literalData);\r\n+\tpublic Literal setDeepLiteralNumber(XDIAddress contextNodeAddress, Double literalData);\r\n \r\n \t/**\r\n \t * Deep version of ContextNode.setLiteralBoolean(Boolean), operates at a context node further down in the graph.\r\n \t */\r\n-\tpublic Literal setDeepLiteralBoolean(XDI3Segment contextNodeXri, Boolean literalData);\r\n+\tpublic Literal setDeepLiteralBoolean(XDIAddress contextNodeAddress, Boolean literalData);\r\n \r\n \t/**\r\n \t * Deep version of ContextNode.getLiteral(Object), operates at a context node further down in the graph.\r\n \t */\r\n-\tpublic Literal getDeepLiteral(XDI3Segment contextNodeXri, Object literalData);\r\n+\tpublic Literal getDeepLiteral(XDIAddress contextNodeAddress, Object literalData);\r\n \r\n \t/**\r\n \t * Deep version of ContextNode.getLiteralString(String), operates at a context node further down in the graph.\r\n \t */\r\n-\tpublic Literal getDeepLiteralString(XDI3Segment contextNodeXri, String literalData);\r\n+\tpublic Literal getDeepLiteralString(XDIAddress contextNodeAddress, String literalData);\r\n \r\n \t/**\r\n \t * Deep version of ContextNode.getLiteralNumber(Double), operates at a context node further down in the graph.\r\n \t */\r\n-\tpublic Literal getDeepLiteralNumber(XDI3Segment contextNodeXri, Double literalData);\r\n+\tpublic Literal getDeepLiteralNumber(XDIAddress contextNodeAddress, Double literalData);\r\n \r\n \t/**\r\n \t * Deep version of ContextNode.getLiteralBoolean(Boolean), operates at a context node further down in the graph.\r\n \t */\r\n-\tpublic Literal getDeepLiteralBoolean(XDI3Segment contextNodeXri, Boolean literalData);\r\n+\tpublic Literal getDeepLiteralBoolean(XDIAddress contextNodeAddress, Boolean literalData);\r\n \r\n \t/**\r\n \t * Deep version of ContextNode.getLiteral(), operates at a context node further down in the graph.\r\n \t */\r\n-\tpublic Literal getDeepLiteral(XDI3Segment contextNodeXri);\r\n+\tpublic Literal getDeepLiteral(XDIAddress contextNodeAddress);\r\n \r\n \t/*\r\n \t * Methods related to statements\r\n@@ -184,12 +184,12 @@ public interface Graph extends Serializable, Comparable<Graph> {\n \t/**\r\n \t * Sets a statement in this graph.\r\n \t */\r\n-\tpublic Statement setStatement(XDI3Statement statementXri);\r\n+\tpublic Statement setStatement(XDIStatement statementXri);\r\n \r\n \t/**\r\n \t * Gets a statement in this graph.\r\n \t */\r\n-\tpublic Statement getStatement(XDI3Statement statementXri);\r\n+\tpublic Statement getStatement(XDIStatement statementXri);\r\n \r\n \t/**\r\n \t * Gets all statements in this graph.\r\n@@ -200,7 +200,7 @@ public interface Graph extends Serializable, Comparable<Graph> {\n \t/**\r\n \t * Check if a statement exists in this graph.\r\n \t */\r\n-\tpublic boolean containsStatement(XDI3Statement statementXri);\r\n+\tpublic boolean containsStatement(XDIStatement statementXri);\r\n \r\n \t/**\r\n \t * Returns the number of all statements in this graph.\r", "raw_url": "https://github.com/projectdanube/xdi2/raw/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2FGraph.java", "sha": "577c1a64b7b50eeed0f0c1530b20fd362e3a2e94", "status": "modified" }, { "additions": 7, "blob_url": "https://github.com/projectdanube/xdi2/blob/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2FRelation.java", "changes": 14, "contents_url": "https://api.github.com/repos/projectdanube/xdi2/contents/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2FRelation.java?ref=0ca7982fec30c2bb8204efbbea61428a643d2e9c", "deletions": 7, "filename": "core/src/main/java/xdi2/core/Relation.java", "new_code": "import xdi2.core.syntax.XDIAddress;\r\n\t * Every relation has an associated arc.\r\n\t * @return The arc associated with the relation.\r\n\tpublic XDIAddress getArc();\r\n\t * Get the target context node address.\r\n\t * @return The target context node address of the relation.\r\n\tpublic XDIAddress getTargetContextNodeAddress();\r", "new_methods": [], "old_code": "import xdi2.core.xri3.XDI3Segment;\r\n\t * Every relation has an associated arc XRI.\r\n\t * @return The arc XRI associated with the relation.\r\n\tpublic XDI3Segment getArcXri();\r\n\t * Get the target context node XRI.\r\n\t * @return The target context node XRI of the relation.\r\n\tpublic XDI3Segment getTargetContextNodeXri();\r", "old_methods": [], "patch": "@@ -3,7 +3,7 @@\n import java.io.Serializable;\r\n \r\n import xdi2.core.Statement.RelationStatement;\r\n-import xdi2.core.xri3.XDI3Segment;\r\n+import xdi2.core.syntax.XDIAddress;\r\n \r\n /**\r\n * This interface represents a relation in an XDI graph.\r\n@@ -34,16 +34,16 @@ public interface Relation extends Serializable, Comparable<Relation> {\n \tpublic void delete();\r\n \r\n \t/**\r\n-\t * Every relation has an associated arc XRI.\r\n-\t * @return The arc XRI associated with the relation.\r\n+\t * Every relation has an associated arc.\r\n+\t * @return The arc associated with the relation.\r\n \t */\r\n-\tpublic XDI3Segment getArcXri();\r\n+\tpublic XDIAddress getArc();\r\n \r\n \t/**\r\n-\t * Get the target context node XRI.\r\n-\t * @return The target context node XRI of the relation.\r\n+\t * Get the target context node address.\r\n+\t * @return The target context node address of the relation.\r\n \t */\r\n-\tpublic XDI3Segment getTargetContextNodeXri();\r\n+\tpublic XDIAddress getTargetContextNodeAddress();\r\n \r\n \t/**\r\n \t * Follows the relation to the target context node.\r", "raw_url": "https://github.com/projectdanube/xdi2/raw/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2FRelation.java", "sha": "f66f61454ea1fafc89af219c0c22a59e78e28ad8", "status": "modified" }, { "additions": 14, "blob_url": "https://github.com/projectdanube/xdi2/blob/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2FStatement.java", "changes": 28, "contents_url": "https://api.github.com/repos/projectdanube/xdi2/contents/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2FStatement.java?ref=0ca7982fec30c2bb8204efbbea61428a643d2e9c", "deletions": 14, "filename": "core/src/main/java/xdi2/core/Statement.java", "new_code": "import xdi2.core.syntax.XDIAddress;\r\nimport xdi2.core.syntax.XDIArc;\r\nimport xdi2.core.syntax.XDIStatement;\r\n\tpublic XDIAddress getSubject();\r\n\tpublic XDIAddress getPredicate();\r\n\tpublic XDIStatement getXri();\r\n\t\tpublic XDIAddress getSubject();\r\n\t\tpublic XDIAddress getPredicate();\r\n\t\tpublic XDIArc getObject();\r\n\t\tpublic XDIAddress getSubject();\r\n\t\tpublic XDIAddress getPredicate();\r\n\t\tpublic XDIAddress getObject();\r\n\t\tpublic XDIAddress getSubject();\r\n\t\tpublic XDIAddress getPredicate();\r", "new_methods": [], "old_code": "import xdi2.core.xri3.XDI3Segment;\r\nimport xdi2.core.xri3.XDI3Statement;\r\nimport xdi2.core.xri3.XDI3SubSegment;\r\n\tpublic XDI3Segment getSubject();\r\n\tpublic XDI3Segment getPredicate();\r\n\tpublic XDI3Statement getXri();\r\n\t\tpublic XDI3Segment getSubject();\r\n\t\tpublic XDI3Segment getPredicate();\r\n\t\tpublic XDI3SubSegment getObject();\r\n\t\tpublic XDI3Segment getSubject();\r\n\t\tpublic XDI3Segment getPredicate();\r\n\t\tpublic XDI3Segment getObject();\r\n\t\tpublic XDI3Segment getSubject();\r\n\t\tpublic XDI3Segment getPredicate();\r", "old_methods": [], "patch": "@@ -2,9 +2,9 @@\n \r\n import java.io.Serializable;\r\n \r\n-import xdi2.core.xri3.XDI3Segment;\r\n-import xdi2.core.xri3.XDI3Statement;\r\n-import xdi2.core.xri3.XDI3SubSegment;\r\n+import xdi2.core.syntax.XDIAddress;\r\n+import xdi2.core.syntax.XDIArc;\r\n+import xdi2.core.syntax.XDIStatement;\r\n \r\n /**\r\n * This interface represents a statement in an XDI graph.\r\n@@ -22,13 +22,13 @@ public interface Statement extends Serializable, Comparable<Statement> {\n \t * Gets the subject of this statement.\r\n \t * @return A subject.\r\n \t */\r\n-\tpublic XDI3Segment getSubject();\r\n+\tpublic XDIAddress getSubject();\r\n \r\n \t/**\r\n \t * Gets the predicate of this statement.\r\n \t * @return A predicate.\r\n \t */\r\n-\tpublic XDI3Segment getPredicate();\r\n+\tpublic XDIAddress getPredicate();\r\n \r\n \t/**\r\n \t * Gets the object of this statement.\r\n@@ -57,7 +57,7 @@ public interface Statement extends Serializable, Comparable<Statement> {\n \t * Expresses the statement as an XDI statement in the form subject/predicate/object\r\n \t * @return An XDI statement.\r\n \t */\r\n-\tpublic XDI3Statement getXri();\r\n+\tpublic XDIStatement getXri();\r\n \r\n \t/*\r\n \t * Sub-interfaces\r\n@@ -66,38 +66,38 @@ public interface Statement extends Serializable, Comparable<Statement> {\n \tpublic interface ContextNodeStatement extends Statement {\r\n \r\n \t\t@Override\r\n-\t\tpublic XDI3Segment getSubject();\r\n+\t\tpublic XDIAddress getSubject();\r\n \r\n \t\t@Override\r\n-\t\tpublic XDI3Segment getPredicate();\r\n+\t\tpublic XDIAddress getPredicate();\r\n \r\n \t\t@Override\r\n-\t\tpublic XDI3SubSegment getObject();\r\n+\t\tpublic XDIArc getObject();\r\n \r\n \t\tpublic ContextNode getContextNode();\r\n \t}\r\n \r\n \tpublic interface RelationStatement extends Statement {\r\n \r\n \t\t@Override\r\n-\t\tpublic XDI3Segment getSubject();\r\n+\t\tpublic XDIAddress getSubject();\r\n \r\n \t\t@Override\r\n-\t\tpublic XDI3Segment getPredicate();\r\n+\t\tpublic XDIAddress getPredicate();\r\n \r\n \t\t@Override\r\n-\t\tpublic XDI3Segment getObject();\r\n+\t\tpublic XDIAddress getObject();\r\n \r\n \t\tpublic Relation getRelation();\r\n \t}\r\n \r\n \tpublic interface LiteralStatement extends Statement {\r\n \r\n \t\t@Override\r\n-\t\tpublic XDI3Segment getSubject();\r\n+\t\tpublic XDIAddress getSubject();\r\n \r\n \t\t@Override\r\n-\t\tpublic XDI3Segment getPredicate();\r\n+\t\tpublic XDIAddress getPredicate();\r\n \r\n \t\t@Override\r\n \t\tpublic Object getObject();\r", "raw_url": "https://github.com/projectdanube/xdi2/raw/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2FStatement.java", "sha": "980825f2b92c99da2fd05bc8ffa52b0bbf0b7650", "status": "modified" }, { "additions": 20, "blob_url": "https://github.com/projectdanube/xdi2/blob/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Fconstants%2FXDIAuthenticationConstants.java", "changes": 40, "contents_url": "https://api.github.com/repos/projectdanube/xdi2/contents/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Fconstants%2FXDIAuthenticationConstants.java?ref=0ca7982fec30c2bb8204efbbea61428a643d2e9c", "deletions": 20, "filename": "core/src/main/java/xdi2/core/constants/XDIAuthenticationConstants.java", "new_code": "import xdi2.core.syntax.XDIAddress;\r\nimport xdi2.core.syntax.XDIArc;\r\nimport xdi2.core.util.AddressUtil;\r\n\tpublic static final XDIAddress XDI_ADD_ANONYMOUS = XDIAddress.create(\"$anon\");\r\n\tpublic static final XDIArc XDI_ARC_SIGNATURE = XDIArc.create(\"$sig\");\r\n\tpublic static final XDIAddress XDI_ADD_SECRET_TOKEN = XDIAddress.create(\"<$secret><$token>\");\r\n\tpublic static final XDIAddress XDI_ADD_OAUTH_TOKEN = XDIAddress.create(\"<$oauth><$token>\");\r\n\tpublic static final XDIAddress XDI_ADD_SECRET_TOKEN_VALID = XDIAddress.create(\"<$secret><$token><$valid>\");\r\n\tpublic static final XDIAddress XDI_ADD_OAUTH_TOKEN_VALID = XDIAddress.create(\"<$oauth><$token><$valid>\");\r\n\tpublic static final XDIAddress XDI_ADD_SIGNATURE_VALID = XDIAddress.create(\"<$sig><$valid>\");\r\n\tpublic static final XDIAddress XDI_ADD_DIGEST_SECRET_TOKEN = XDIAddress.create(\"<$digest><$secret><$token>\");\r\n\tpublic static final XDIAddress XDI_ADD_PUBLIC_KEY = XDIAddress.create(\"<$public><$key>\");\r\n\tpublic static final XDIAddress XDI_ADD_PRIVATE_KEY = XDIAddress.create(\"<$private><$key>\");\r\n\tpublic static final XDIAddress XDI_ADD_SECRET_KEY = XDIAddress.create(\"<$secret><$key>\");\r\n\tpublic static final XDIAddress XDI_ADD_MSG_SIG_KEYPAIR = XDIAddress.create(\"$msg$sig$keypair\");\r\n\tpublic static final XDIAddress XDI_ADD_MSG_SIG_KEYPAIR_PUBLIC_KEY = AddressUtil.concatAddresses(XDI_ADD_MSG_SIG_KEYPAIR, XDI_ADD_PUBLIC_KEY);\r\n\tpublic static final XDIAddress XDI_ADD_MSG_SIG_KEYPAIR_PRIVATE_KEY = AddressUtil.concatAddresses(XDI_ADD_MSG_SIG_KEYPAIR, XDI_ADD_PRIVATE_KEY);\r\n\tpublic static final XDIAddress XDI_ADD_MSG_ENCRYPT_KEYPAIR = XDIAddress.create(\"$msg$encrypt$keypair\");\r\n\tpublic static final XDIAddress XDI_ADD_MSG_ENCRYPT_KEYPAIR_PUBLIC_KEY = AddressUtil.concatAddresses(XDI_ADD_MSG_ENCRYPT_KEYPAIR, XDI_ADD_PUBLIC_KEY);\r\n\tpublic static final XDIAddress XDI_ADD_MSG_ENCRYPT_KEYPAIR_PRIVATE_KEY = AddressUtil.concatAddresses(XDI_ADD_MSG_ENCRYPT_KEYPAIR, XDI_ADD_PRIVATE_KEY);\r", "new_methods": [], "old_code": "import xdi2.core.util.XDI3Util;\r\nimport xdi2.core.xri3.XDI3Segment;\r\nimport xdi2.core.xri3.XDI3SubSegment;\r\n\tpublic static final XDI3Segment XRI_S_ANONYMOUS = XDI3Segment.create(\"$anon\");\r\n\tpublic static final XDI3SubSegment XRI_SS_SIGNATURE = XDI3SubSegment.create(\"$sig\");\r\n\tpublic static final XDI3Segment XRI_S_SECRET_TOKEN = XDI3Segment.create(\"<$secret><$token>\");\r\n\tpublic static final XDI3Segment XRI_S_OAUTH_TOKEN = XDI3Segment.create(\"<$oauth><$token>\");\r\n\tpublic static final XDI3Segment XRI_S_SECRET_TOKEN_VALID = XDI3Segment.create(\"<$secret><$token><$valid>\");\r\n\tpublic static final XDI3Segment XRI_S_OAUTH_TOKEN_VALID = XDI3Segment.create(\"<$oauth><$token><$valid>\");\r\n\tpublic static final XDI3Segment XRI_S_SIGNATURE_VALID = XDI3Segment.create(\"<$sig><$valid>\");\r\n\tpublic static final XDI3Segment XRI_S_DIGEST_SECRET_TOKEN = XDI3Segment.create(\"<$digest><$secret><$token>\");\r\n\tpublic static final XDI3Segment XRI_S_PUBLIC_KEY = XDI3Segment.create(\"<$public><$key>\");\r\n\tpublic static final XDI3Segment XRI_S_PRIVATE_KEY = XDI3Segment.create(\"<$private><$key>\");\r\n\tpublic static final XDI3Segment XRI_S_SECRET_KEY = XDI3Segment.create(\"<$secret><$key>\");\r\n\tpublic static final XDI3Segment XRI_S_MSG_SIG_KEYPAIR = XDI3Segment.create(\"$msg$sig$keypair\");\r\n\tpublic static final XDI3Segment XRI_S_MSG_SIG_KEYPAIR_PUBLIC_KEY = XDI3Util.concatXris(XRI_S_MSG_SIG_KEYPAIR, XRI_S_PUBLIC_KEY);\r\n\tpublic static final XDI3Segment XRI_S_MSG_SIG_KEYPAIR_PRIVATE_KEY = XDI3Util.concatXris(XRI_S_MSG_SIG_KEYPAIR, XRI_S_PRIVATE_KEY);\r\n\tpublic static final XDI3Segment XRI_S_MSG_ENCRYPT_KEYPAIR = XDI3Segment.create(\"$msg$encrypt$keypair\");\r\n\tpublic static final XDI3Segment XRI_S_MSG_ENCRYPT_KEYPAIR_PUBLIC_KEY = XDI3Util.concatXris(XRI_S_MSG_ENCRYPT_KEYPAIR, XRI_S_PUBLIC_KEY);\r\n\tpublic static final XDI3Segment XRI_S_MSG_ENCRYPT_KEYPAIR_PRIVATE_KEY = XDI3Util.concatXris(XRI_S_MSG_ENCRYPT_KEYPAIR, XRI_S_PRIVATE_KEY);\r", "old_methods": [], "patch": "@@ -1,8 +1,8 @@\n package xdi2.core.constants;\r\n \r\n-import xdi2.core.util.XDI3Util;\r\n-import xdi2.core.xri3.XDI3Segment;\r\n-import xdi2.core.xri3.XDI3SubSegment;\r\n+import xdi2.core.syntax.XDIAddress;\r\n+import xdi2.core.syntax.XDIArc;\r\n+import xdi2.core.util.AddressUtil;\r\n \r\n /**\r\n * Constants for XDI authentication.\r\n@@ -11,29 +11,29 @@\n */\r\n public final class XDIAuthenticationConstants {\r\n \r\n-\tpublic static final XDI3Segment XRI_S_ANONYMOUS = XDI3Segment.create(\"$anon\");\r\n+\tpublic static final XDIAddress XDI_ADD_ANONYMOUS = XDIAddress.create(\"$anon\");\r\n \r\n-\tpublic static final XDI3SubSegment XRI_SS_SIGNATURE = XDI3SubSegment.create(\"$sig\");\r\n+\tpublic static final XDIArc XDI_ARC_SIGNATURE = XDIArc.create(\"$sig\");\r\n \r\n-\tpublic static final XDI3Segment XRI_S_SECRET_TOKEN = XDI3Segment.create(\"<$secret><$token>\");\r\n-\tpublic static final XDI3Segment XRI_S_OAUTH_TOKEN = XDI3Segment.create(\"<$oauth><$token>\");\r\n+\tpublic static final XDIAddress XDI_ADD_SECRET_TOKEN = XDIAddress.create(\"<$secret><$token>\");\r\n+\tpublic static final XDIAddress XDI_ADD_OAUTH_TOKEN = XDIAddress.create(\"<$oauth><$token>\");\r\n \r\n-\tpublic static final XDI3Segment XRI_S_SECRET_TOKEN_VALID = XDI3Segment.create(\"<$secret><$token><$valid>\");\r\n-\tpublic static final XDI3Segment XRI_S_OAUTH_TOKEN_VALID = XDI3Segment.create(\"<$oauth><$token><$valid>\");\r\n-\tpublic static final XDI3Segment XRI_S_SIGNATURE_VALID = XDI3Segment.create(\"<$sig><$valid>\");\r\n+\tpublic static final XDIAddress XDI_ADD_SECRET_TOKEN_VALID = XDIAddress.create(\"<$secret><$token><$valid>\");\r\n+\tpublic static final XDIAddress XDI_ADD_OAUTH_TOKEN_VALID = XDIAddress.create(\"<$oauth><$token><$valid>\");\r\n+\tpublic static final XDIAddress XDI_ADD_SIGNATURE_VALID = XDIAddress.create(\"<$sig><$valid>\");\r\n \r\n-\tpublic static final XDI3Segment XRI_S_DIGEST_SECRET_TOKEN = XDI3Segment.create(\"<$digest><$secret><$token>\");\r\n+\tpublic static final XDIAddress XDI_ADD_DIGEST_SECRET_TOKEN = XDIAddress.create(\"<$digest><$secret><$token>\");\r\n \r\n-\tpublic static final XDI3Segment XRI_S_PUBLIC_KEY = XDI3Segment.create(\"<$public><$key>\");\r\n-\tpublic static final XDI3Segment XRI_S_PRIVATE_KEY = XDI3Segment.create(\"<$private><$key>\");\r\n-\tpublic static final XDI3Segment XRI_S_SECRET_KEY = XDI3Segment.create(\"<$secret><$key>\");\r\n+\tpublic static final XDIAddress XDI_ADD_PUBLIC_KEY = XDIAddress.create(\"<$public><$key>\");\r\n+\tpublic static final XDIAddress XDI_ADD_PRIVATE_KEY = XDIAddress.create(\"<$private><$key>\");\r\n+\tpublic static final XDIAddress XDI_ADD_SECRET_KEY = XDIAddress.create(\"<$secret><$key>\");\r\n \r\n-\tpublic static final XDI3Segment XRI_S_MSG_SIG_KEYPAIR = XDI3Segment.create(\"$msg$sig$keypair\");\r\n-\tpublic static final XDI3Segment XRI_S_MSG_SIG_KEYPAIR_PUBLIC_KEY = XDI3Util.concatXris(XRI_S_MSG_SIG_KEYPAIR, XRI_S_PUBLIC_KEY);\r\n-\tpublic static final XDI3Segment XRI_S_MSG_SIG_KEYPAIR_PRIVATE_KEY = XDI3Util.concatXris(XRI_S_MSG_SIG_KEYPAIR, XRI_S_PRIVATE_KEY);\r\n-\tpublic static final XDI3Segment XRI_S_MSG_ENCRYPT_KEYPAIR = XDI3Segment.create(\"$msg$encrypt$keypair\");\r\n-\tpublic static final XDI3Segment XRI_S_MSG_ENCRYPT_KEYPAIR_PUBLIC_KEY = XDI3Util.concatXris(XRI_S_MSG_ENCRYPT_KEYPAIR, XRI_S_PUBLIC_KEY);\r\n-\tpublic static final XDI3Segment XRI_S_MSG_ENCRYPT_KEYPAIR_PRIVATE_KEY = XDI3Util.concatXris(XRI_S_MSG_ENCRYPT_KEYPAIR, XRI_S_PRIVATE_KEY);\r\n+\tpublic static final XDIAddress XDI_ADD_MSG_SIG_KEYPAIR = XDIAddress.create(\"$msg$sig$keypair\");\r\n+\tpublic static final XDIAddress XDI_ADD_MSG_SIG_KEYPAIR_PUBLIC_KEY = AddressUtil.concatAddresses(XDI_ADD_MSG_SIG_KEYPAIR, XDI_ADD_PUBLIC_KEY);\r\n+\tpublic static final XDIAddress XDI_ADD_MSG_SIG_KEYPAIR_PRIVATE_KEY = AddressUtil.concatAddresses(XDI_ADD_MSG_SIG_KEYPAIR, XDI_ADD_PRIVATE_KEY);\r\n+\tpublic static final XDIAddress XDI_ADD_MSG_ENCRYPT_KEYPAIR = XDIAddress.create(\"$msg$encrypt$keypair\");\r\n+\tpublic static final XDIAddress XDI_ADD_MSG_ENCRYPT_KEYPAIR_PUBLIC_KEY = AddressUtil.concatAddresses(XDI_ADD_MSG_ENCRYPT_KEYPAIR, XDI_ADD_PUBLIC_KEY);\r\n+\tpublic static final XDIAddress XDI_ADD_MSG_ENCRYPT_KEYPAIR_PRIVATE_KEY = AddressUtil.concatAddresses(XDI_ADD_MSG_ENCRYPT_KEYPAIR, XDI_ADD_PRIVATE_KEY);\r\n \r\n \tprivate XDIAuthenticationConstants() { }\r\n }\r", "raw_url": "https://github.com/projectdanube/xdi2/raw/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Fconstants%2FXDIAuthenticationConstants.java", "sha": "fa2015b43787ce0a63000d5a15864f6e8769760e", "status": "modified" }, { "additions": 13, "blob_url": "https://github.com/projectdanube/xdi2/blob/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Fconstants%2FXDIConstants.java", "changes": 26, "contents_url": "https://api.github.com/repos/projectdanube/xdi2/contents/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Fconstants%2FXDIConstants.java?ref=0ca7982fec30c2bb8204efbbea61428a643d2e9c", "deletions": 13, "filename": "core/src/main/java/xdi2/core/constants/XDIConstants.java", "new_code": "import xdi2.core.syntax.XDIAddress;\r\nimport xdi2.core.syntax.XDIArc;\r\n\tpublic static final XDIAddress XDI_ADD_ROOT = XDIAddress.create(\"\");\r\n\tpublic static final XDIAddress XDI_ADD_CONTEXT = XDIAddress.create(\"\");\r\n\tpublic static final XDIAddress XDI_ADD_VALUE = XDIAddress.create(XDIConstants.CS_VALUE.toString());\r\n\tpublic static final XDIAddress XDI_ADD_LITERAL = XDIAddress.create(XDIConstants.CS_VALUE.toString());\r\n\tpublic static final XDIArc XDI_ARC_VALUE = XDIArc.create(XDIConstants.CS_VALUE.toString());\r\n\tpublic static final XDIArc XDI_ARC_LITERAL = XDIArc.create(XDIConstants.CS_VALUE.toString());\r\n\tpublic static final XDIAddress XDI_ADD_TRUE = XDIAddress.create(\"$true\");\r\n\tpublic static final XDIAddress XDI_ADD_FALSE = XDIAddress.create(\"$false\");\r\n\tpublic static final XDIArc XDI_ARC_TRUE = XDIArc.create(\"$true\");\r\n\tpublic static final XDIArc XDI_ARC_FALSE = XDIArc.create(\"$false\");\r\n\tpublic static final XDIAddress XDI_ADD_VARIABLE = XDIAddress.create(XDIConstants.XS_VARIABLE);\r", "new_methods": [], "old_code": "import xdi2.core.xri3.XDI3Segment;\r\nimport xdi2.core.xri3.XDI3SubSegment;\r\n\tpublic static final XDI3Segment XRI_S_ROOT = XDI3Segment.create(\"\");\r\n\tpublic static final XDI3Segment XRI_S_CONTEXT = XDI3Segment.create(\"\");\r\n\tpublic static final XDI3Segment XRI_S_VALUE = XDI3Segment.create(XDIConstants.CS_VALUE.toString());\r\n\tpublic static final XDI3Segment XRI_S_LITERAL = XDI3Segment.create(XDIConstants.CS_VALUE.toString());\r\n\tpublic static final XDI3SubSegment XRI_SS_VALUE = XDI3SubSegment.create(XDIConstants.CS_VALUE.toString());\r\n\tpublic static final XDI3SubSegment XRI_SS_LITERAL = XDI3SubSegment.create(XDIConstants.CS_VALUE.toString());\r\n\tpublic static final XDI3Segment XRI_S_TRUE = XDI3Segment.create(\"$true\");\r\n\tpublic static final XDI3Segment XRI_S_FALSE = XDI3Segment.create(\"$false\");\r\n\tpublic static final XDI3SubSegment XRI_SS_TRUE = XDI3SubSegment.create(\"$true\");\r\n\tpublic static final XDI3SubSegment XRI_SS_FALSE = XDI3SubSegment.create(\"$false\");\r\n\tpublic static final XDI3Segment XRI_S_VARIABLE = XDI3Segment.create(XDIConstants.XS_VARIABLE);\r", "old_methods": [], "patch": "@@ -1,7 +1,7 @@\n package xdi2.core.constants;\r\n \r\n-import xdi2.core.xri3.XDI3Segment;\r\n-import xdi2.core.xri3.XDI3SubSegment;\r\n+import xdi2.core.syntax.XDIAddress;\r\n+import xdi2.core.syntax.XDIArc;\r\n \r\n /**\r\n * General XDI syntax and graph constants.\r\n@@ -27,21 +27,21 @@ public class XDIConstants {\n \r\n \tpublic static final Character[] CS_ARRAY = new Character[] { CS_AUTHORITY_PERSONAL, CS_AUTHORITY_LEGAL, CS_AUTHORITY_GENERAL, CS_CLASS_UNRESERVED, CS_CLASS_RESERVED, CS_VALUE, CS_MEMBER_UNORDERED, CS_MEMBER_ORDERED };\r\n \r\n-\tpublic static final XDI3Segment XRI_S_ROOT = XDI3Segment.create(\"\");\r\n-\tpublic static final XDI3Segment XRI_S_CONTEXT = XDI3Segment.create(\"\");\r\n-\tpublic static final XDI3Segment XRI_S_VALUE = XDI3Segment.create(XDIConstants.CS_VALUE.toString());\r\n-\tpublic static final XDI3Segment XRI_S_LITERAL = XDI3Segment.create(XDIConstants.CS_VALUE.toString());\r\n+\tpublic static final XDIAddress XDI_ADD_ROOT = XDIAddress.create(\"\");\r\n+\tpublic static final XDIAddress XDI_ADD_CONTEXT = XDIAddress.create(\"\");\r\n+\tpublic static final XDIAddress XDI_ADD_VALUE = XDIAddress.create(XDIConstants.CS_VALUE.toString());\r\n+\tpublic static final XDIAddress XDI_ADD_LITERAL = XDIAddress.create(XDIConstants.CS_VALUE.toString());\r\n \r\n-\tpublic static final XDI3SubSegment XRI_SS_VALUE = XDI3SubSegment.create(XDIConstants.CS_VALUE.toString());\r\n-\tpublic static final XDI3SubSegment XRI_SS_LITERAL = XDI3SubSegment.create(XDIConstants.CS_VALUE.toString());\r\n+\tpublic static final XDIArc XDI_ARC_VALUE = XDIArc.create(XDIConstants.CS_VALUE.toString());\r\n+\tpublic static final XDIArc XDI_ARC_LITERAL = XDIArc.create(XDIConstants.CS_VALUE.toString());\r\n \r\n-\tpublic static final XDI3Segment XRI_S_TRUE = XDI3Segment.create(\"$true\");\r\n-\tpublic static final XDI3Segment XRI_S_FALSE = XDI3Segment.create(\"$false\");\r\n+\tpublic static final XDIAddress XDI_ADD_TRUE = XDIAddress.create(\"$true\");\r\n+\tpublic static final XDIAddress XDI_ADD_FALSE = XDIAddress.create(\"$false\");\r\n \r\n-\tpublic static final XDI3SubSegment XRI_SS_TRUE = XDI3SubSegment.create(\"$true\");\r\n-\tpublic static final XDI3SubSegment XRI_SS_FALSE = XDI3SubSegment.create(\"$false\");\r\n+\tpublic static final XDIArc XDI_ARC_TRUE = XDIArc.create(\"$true\");\r\n+\tpublic static final XDIArc XDI_ARC_FALSE = XDIArc.create(\"$false\");\r\n \r\n-\tpublic static final XDI3Segment XRI_S_VARIABLE = XDI3Segment.create(XDIConstants.XS_VARIABLE);\r\n+\tpublic static final XDIAddress XDI_ADD_VARIABLE = XDIAddress.create(XDIConstants.XS_VARIABLE);\r\n \r\n \tprivate XDIConstants() { }\r\n }\r", "raw_url": "https://github.com/projectdanube/xdi2/raw/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Fconstants%2FXDIConstants.java", "sha": "f259ef78e99d817aefb31e14d54f761784ea3b5f", "status": "modified" }, { "additions": 9, "blob_url": "https://github.com/projectdanube/xdi2/blob/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Fconstants%2FXDIDictionaryConstants.java", "changes": 18, "contents_url": "https://api.github.com/repos/projectdanube/xdi2/contents/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Fconstants%2FXDIDictionaryConstants.java?ref=0ca7982fec30c2bb8204efbbea61428a643d2e9c", "deletions": 9, "filename": "core/src/main/java/xdi2/core/constants/XDIDictionaryConstants.java", "new_code": "import xdi2.core.syntax.XDIAddress;\r\n\tpublic static final XDIAddress XDI_ADD_IS = XDIAddress.create(\"$is\");\r\n\tpublic static final XDIAddress XDI_ADD_IS_TYPE = XDIAddress.create(\"$is#\");\r\n\tpublic static final XDIAddress XDI_ADD_REF = XDIAddress.create(\"$ref\");\r\n\tpublic static final XDIAddress XDI_ADD_IS_REF = XDIAddress.create(\"$is$ref\");\r\n\tpublic static final XDIAddress XDI_ADD_REP = XDIAddress.create(\"$rep\");\r\n\tpublic static final XDIAddress XDI_ADD_IS_REP = XDIAddress.create(\"$is$rep\");\r\n\tpublic static final XDIAddress XDI_ADD_BOOLEAN = XDIAddress.create(\"$b\");\r\n\tpublic static final XDIAddress XDI_ADD_NUMBER = XDIAddress.create(\"$n\");\r", "new_methods": [], "old_code": "import xdi2.core.xri3.XDI3Segment;\r\n\tpublic static final XDI3Segment XRI_S_IS = XDI3Segment.create(\"$is\");\r\n\tpublic static final XDI3Segment XRI_S_IS_TYPE = XDI3Segment.create(\"$is#\");\r\n\tpublic static final XDI3Segment XRI_S_REF = XDI3Segment.create(\"$ref\");\r\n\tpublic static final XDI3Segment XRI_S_IS_REF = XDI3Segment.create(\"$is$ref\");\r\n\tpublic static final XDI3Segment XRI_S_REP = XDI3Segment.create(\"$rep\");\r\n\tpublic static final XDI3Segment XRI_S_IS_REP = XDI3Segment.create(\"$is$rep\");\r\n\tpublic static final XDI3Segment XRI_S_BOOLEAN = XDI3Segment.create(\"$b\");\r\n\tpublic static final XDI3Segment XRI_S_NUMBER = XDI3Segment.create(\"$n\");\r", "old_methods": [], "patch": "@@ -1,6 +1,6 @@\n package xdi2.core.constants;\r\n \r\n-import xdi2.core.xri3.XDI3Segment;\r\n+import xdi2.core.syntax.XDIAddress;\r\n \r\n /**\r\n * Constants for XDI dictionaries.\r\n@@ -9,18 +9,18 @@\n */\r\n public final class XDIDictionaryConstants {\r\n \r\n-\tpublic static final XDI3Segment XRI_S_IS = XDI3Segment.create(\"$is\");\r\n+\tpublic static final XDIAddress XDI_ADD_IS = XDIAddress.create(\"$is\");\r\n \r\n-\tpublic static final XDI3Segment XRI_S_IS_TYPE = XDI3Segment.create(\"$is#\");\r\n+\tpublic static final XDIAddress XDI_ADD_IS_TYPE = XDIAddress.create(\"$is#\");\r\n \r\n-\tpublic static final XDI3Segment XRI_S_REF = XDI3Segment.create(\"$ref\");\r\n-\tpublic static final XDI3Segment XRI_S_IS_REF = XDI3Segment.create(\"$is$ref\");\r\n+\tpublic static final XDIAddress XDI_ADD_REF = XDIAddress.create(\"$ref\");\r\n+\tpublic static final XDIAddress XDI_ADD_IS_REF = XDIAddress.create(\"$is$ref\");\r\n \r\n-\tpublic static final XDI3Segment XRI_S_REP = XDI3Segment.create(\"$rep\");\r\n-\tpublic static final XDI3Segment XRI_S_IS_REP = XDI3Segment.create(\"$is$rep\");\r\n+\tpublic static final XDIAddress XDI_ADD_REP = XDIAddress.create(\"$rep\");\r\n+\tpublic static final XDIAddress XDI_ADD_IS_REP = XDIAddress.create(\"$is$rep\");\r\n \r\n-\tpublic static final XDI3Segment XRI_S_BOOLEAN = XDI3Segment.create(\"$b\");\r\n-\tpublic static final XDI3Segment XRI_S_NUMBER = XDI3Segment.create(\"$n\");\r\n+\tpublic static final XDIAddress XDI_ADD_BOOLEAN = XDIAddress.create(\"$b\");\r\n+\tpublic static final XDIAddress XDI_ADD_NUMBER = XDIAddress.create(\"$n\");\r\n \r\n \tprivate XDIDictionaryConstants() { }\r\n }\r", "raw_url": "https://github.com/projectdanube/xdi2/raw/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Fconstants%2FXDIDictionaryConstants.java", "sha": "d288ceb952e83ea706f9f9570d4e16fcd4da453a", "status": "modified" }, { "additions": 20, "blob_url": "https://github.com/projectdanube/xdi2/blob/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Fconstants%2FXDILinkContractConstants.java", "changes": 40, "contents_url": "https://api.github.com/repos/projectdanube/xdi2/contents/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Fconstants%2FXDILinkContractConstants.java?ref=0ca7982fec30c2bb8204efbbea61428a643d2e9c", "deletions": 20, "filename": "core/src/main/java/xdi2/core/constants/XDILinkContractConstants.java", "new_code": "import xdi2.core.syntax.XDIAddress;\r\nimport xdi2.core.syntax.XDIArc;\r\n\tpublic static final XDIAddress XDI_ADD_DO = XDIAddress.create(\"$do\");\r\n\tpublic static final XDIAddress XDI_ADD_EC_DO = XDIAddress.create(\"[$do]\");\r\n\tpublic static final XDIAddress XDI_ADD_DO_VARIABLE = XDIAddress.create(\"{$do}\");\r\n\tpublic static final XDIArc XDI_ARC_DO = XDIArc.create(\"$do\");\r\n\tpublic static final XDIArc XDI_ARC_EC_DO = XDIArc.create(\"[$do]\");\r\n\tpublic static final XDIArc XDI_ARC_DO_VARIABLE = XDIArc.create(\"{$do}\");\r\n\tpublic static final XDIAddress XDI_ADD_PUBLIC = XDIAddress.create(\"$public\");\r\n\tpublic static final XDIAddress XDI_ADD_TO_VARIABLE = XDIAddress.create(\"{$to}\");\r\n\tpublic static final XDIAddress XDI_ADD_FROM_VARIABLE = XDIAddress.create(\"{$from}\");\r\n\tpublic static final XDIArc XDI_ARC_TO_VARIABLE = XDIArc.create(\"{$to}\");\r\n\tpublic static final XDIArc XDI_ARC_FROM_VARIABLE = XDIArc.create(\"{$from}\");\r\n\tpublic static final XDIAddress XDI_ADD_ALL = XDIAddress.create(\"$all\");\r\n\tpublic static final XDIAddress XDI_ADD_GET = XDIAddress.create(\"$get\");\r\n\tpublic static final XDIAddress XDI_ADD_SET = XDIAddress.create(\"$set\");\r\n\tpublic static final XDIAddress XDI_ADD_SET_DO = XDIAddress.create(\"$set{$do}\");\r\n\tpublic static final XDIAddress XDI_ADD_SET_REF = XDIAddress.create(\"$set{$ref}\");\r\n\tpublic static final XDIAddress XDI_ADD_DEL = XDIAddress.create(\"$del\");\r\n\tpublic static final XDIAddress XDI_ADD_NOT = XDIAddress.create(\"$not\");\r", "new_methods": [], "old_code": "import xdi2.core.xri3.XDI3Segment;\r\nimport xdi2.core.xri3.XDI3SubSegment;\r\n\tpublic static final XDI3Segment XRI_S_DO = XDI3Segment.create(\"$do\");\r\n\tpublic static final XDI3Segment XRI_S_EC_DO = XDI3Segment.create(\"[$do]\");\r\n\tpublic static final XDI3Segment XRI_S_DO_VARIABLE = XDI3Segment.create(\"{$do}\");\r\n\tpublic static final XDI3SubSegment XRI_SS_DO = XDI3SubSegment.create(\"$do\");\r\n\tpublic static final XDI3SubSegment XRI_SS_EC_DO = XDI3SubSegment.create(\"[$do]\");\r\n\tpublic static final XDI3SubSegment XRI_SS_DO_VARIABLE = XDI3SubSegment.create(\"{$do}\");\r\n\tpublic static final XDI3Segment XRI_S_PUBLIC = XDI3Segment.create(\"$public\");\r\n\tpublic static final XDI3Segment XRI_S_TO_VARIABLE = XDI3Segment.create(\"{$to}\");\r\n\tpublic static final XDI3Segment XRI_S_FROM_VARIABLE = XDI3Segment.create(\"{$from}\");\r\n\tpublic static final XDI3SubSegment XRI_SS_TO_VARIABLE = XDI3SubSegment.create(\"{$to}\");\r\n\tpublic static final XDI3SubSegment XRI_SS_FROM_VARIABLE = XDI3SubSegment.create(\"{$from}\");\r\n\tpublic static final XDI3Segment XRI_S_ALL = XDI3Segment.create(\"$all\");\r\n\tpublic static final XDI3Segment XRI_S_GET = XDI3Segment.create(\"$get\");\r\n\tpublic static final XDI3Segment XRI_S_SET = XDI3Segment.create(\"$set\");\r\n\tpublic static final XDI3Segment XRI_S_SET_DO = XDI3Segment.create(\"$set{$do}\");\r\n\tpublic static final XDI3Segment XRI_S_SET_REF = XDI3Segment.create(\"$set{$ref}\");\r\n\tpublic static final XDI3Segment XRI_S_DEL = XDI3Segment.create(\"$del\");\r\n\tpublic static final XDI3Segment XRI_S_NOT = XDI3Segment.create(\"$not\");\r", "old_methods": [], "patch": "@@ -1,7 +1,7 @@\n package xdi2.core.constants;\r\n \r\n-import xdi2.core.xri3.XDI3Segment;\r\n-import xdi2.core.xri3.XDI3SubSegment;\r\n+import xdi2.core.syntax.XDIAddress;\r\n+import xdi2.core.syntax.XDIArc;\r\n \r\n /**\r\n * Constants for XDI link contracts.\r\n@@ -10,29 +10,29 @@\n */\r\n public final class XDILinkContractConstants {\r\n \r\n-\tpublic static final XDI3Segment XRI_S_DO = XDI3Segment.create(\"$do\");\r\n-\tpublic static final XDI3Segment XRI_S_EC_DO = XDI3Segment.create(\"[$do]\");\r\n-\tpublic static final XDI3Segment XRI_S_DO_VARIABLE = XDI3Segment.create(\"{$do}\");\r\n+\tpublic static final XDIAddress XDI_ADD_DO = XDIAddress.create(\"$do\");\r\n+\tpublic static final XDIAddress XDI_ADD_EC_DO = XDIAddress.create(\"[$do]\");\r\n+\tpublic static final XDIAddress XDI_ADD_DO_VARIABLE = XDIAddress.create(\"{$do}\");\r\n \r\n-\tpublic static final XDI3SubSegment XRI_SS_DO = XDI3SubSegment.create(\"$do\");\r\n-\tpublic static final XDI3SubSegment XRI_SS_EC_DO = XDI3SubSegment.create(\"[$do]\");\r\n-\tpublic static final XDI3SubSegment XRI_SS_DO_VARIABLE = XDI3SubSegment.create(\"{$do}\");\r\n+\tpublic static final XDIArc XDI_ARC_DO = XDIArc.create(\"$do\");\r\n+\tpublic static final XDIArc XDI_ARC_EC_DO = XDIArc.create(\"[$do]\");\r\n+\tpublic static final XDIArc XDI_ARC_DO_VARIABLE = XDIArc.create(\"{$do}\");\r\n \r\n-\tpublic static final XDI3Segment XRI_S_PUBLIC = XDI3Segment.create(\"$public\");\r\n+\tpublic static final XDIAddress XDI_ADD_PUBLIC = XDIAddress.create(\"$public\");\r\n \r\n-\tpublic static final XDI3Segment XRI_S_TO_VARIABLE = XDI3Segment.create(\"{$to}\");\r\n-\tpublic static final XDI3Segment XRI_S_FROM_VARIABLE = XDI3Segment.create(\"{$from}\");\r\n+\tpublic static final XDIAddress XDI_ADD_TO_VARIABLE = XDIAddress.create(\"{$to}\");\r\n+\tpublic static final XDIAddress XDI_ADD_FROM_VARIABLE = XDIAddress.create(\"{$from}\");\r\n \r\n-\tpublic static final XDI3SubSegment XRI_SS_TO_VARIABLE = XDI3SubSegment.create(\"{$to}\");\r\n-\tpublic static final XDI3SubSegment XRI_SS_FROM_VARIABLE = XDI3SubSegment.create(\"{$from}\");\r\n+\tpublic static final XDIArc XDI_ARC_TO_VARIABLE = XDIArc.create(\"{$to}\");\r\n+\tpublic static final XDIArc XDI_ARC_FROM_VARIABLE = XDIArc.create(\"{$from}\");\r\n \r\n-\tpublic static final XDI3Segment XRI_S_ALL = XDI3Segment.create(\"$all\");\r\n-\tpublic static final XDI3Segment XRI_S_GET = XDI3Segment.create(\"$get\");\r\n-\tpublic static final XDI3Segment XRI_S_SET = XDI3Segment.create(\"$set\");\r\n-\tpublic static final XDI3Segment XRI_S_SET_DO = XDI3Segment.create(\"$set{$do}\");\r\n-\tpublic static final XDI3Segment XRI_S_SET_REF = XDI3Segment.create(\"$set{$ref}\");\r\n-\tpublic static final XDI3Segment XRI_S_DEL = XDI3Segment.create(\"$del\");\r\n-\tpublic static final XDI3Segment XRI_S_NOT = XDI3Segment.create(\"$not\");\r\n+\tpublic static final XDIAddress XDI_ADD_ALL = XDIAddress.create(\"$all\");\r\n+\tpublic static final XDIAddress XDI_ADD_GET = XDIAddress.create(\"$get\");\r\n+\tpublic static final XDIAddress XDI_ADD_SET = XDIAddress.create(\"$set\");\r\n+\tpublic static final XDIAddress XDI_ADD_SET_DO = XDIAddress.create(\"$set{$do}\");\r\n+\tpublic static final XDIAddress XDI_ADD_SET_REF = XDIAddress.create(\"$set{$ref}\");\r\n+\tpublic static final XDIAddress XDI_ADD_DEL = XDIAddress.create(\"$del\");\r\n+\tpublic static final XDIAddress XDI_ADD_NOT = XDIAddress.create(\"$not\");\r\n \r\n \tprivate XDILinkContractConstants() { }\r\n }\r", "raw_url": "https://github.com/projectdanube/xdi2/raw/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Fconstants%2FXDILinkContractConstants.java", "sha": "1d3685c445a5d71202737b18c1ed2591be33ab1a", "status": "modified" }, { "additions": 12, "blob_url": "https://github.com/projectdanube/xdi2/blob/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Fconstants%2FXDIPolicyConstants.java", "changes": 24, "contents_url": "https://api.github.com/repos/projectdanube/xdi2/contents/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Fconstants%2FXDIPolicyConstants.java?ref=0ca7982fec30c2bb8204efbbea61428a643d2e9c", "deletions": 12, "filename": "core/src/main/java/xdi2/core/constants/XDIPolicyConstants.java", "new_code": "import xdi2.core.syntax.XDIAddress;\r\nimport xdi2.core.syntax.XDIArc;\r\n\tpublic static final XDIAddress XDI_ADD_IF = XDIAddress.create(\"$if\");\r\n\tpublic static final XDIArc XDI_ARC_IF = XDIArc.create(\"$if\");\r\n\tpublic static final XDIArc XDI_ARC_AND = XDIArc.create(\"$and\");\r\n\tpublic static final XDIArc XDI_ARC_OR = XDIArc.create(\"$or\");\r\n\tpublic static final XDIArc XDI_ARC_NOT = XDIArc.create(\"$not\");\r\n\tpublic static final XDIAddress XDI_ADD_EQUALS = XDIAddress.create(\"$equals\");\r\n\tpublic static final XDIAddress XDI_ADD_MATCHES = XDIAddress.create(\"$matches\");\r\n\tpublic static final XDIAddress XDI_ADD_GREATER = XDIAddress.create(\"$greater\");\r\n\tpublic static final XDIAddress XDI_ADD_LESSER = XDIAddress.create(\"$lesser\");\r\n\tpublic static final XDIAddress XDI_ADD_IS = XDIAddress.create(\"$is\");\r", "new_methods": [], "old_code": "import xdi2.core.xri3.XDI3Segment;\r\nimport xdi2.core.xri3.XDI3SubSegment;\r\n\tpublic static final XDI3Segment XRI_S_IF = XDI3Segment.create(\"$if\");\r\n\tpublic static final XDI3SubSegment XRI_SS_IF = XDI3SubSegment.create(\"$if\");\r\n\tpublic static final XDI3SubSegment XRI_SS_AND = XDI3SubSegment.create(\"$and\");\r\n\tpublic static final XDI3SubSegment XRI_SS_OR = XDI3SubSegment.create(\"$or\");\r\n\tpublic static final XDI3SubSegment XRI_SS_NOT = XDI3SubSegment.create(\"$not\");\r\n\tpublic static final XDI3Segment XRI_S_EQUALS = XDI3Segment.create(\"$equals\");\r\n\tpublic static final XDI3Segment XRI_S_MATCHES = XDI3Segment.create(\"$matches\");\r\n\tpublic static final XDI3Segment XRI_S_GREATER = XDI3Segment.create(\"$greater\");\r\n\tpublic static final XDI3Segment XRI_S_LESSER = XDI3Segment.create(\"$lesser\");\r\n\tpublic static final XDI3Segment XRI_S_IS = XDI3Segment.create(\"$is\");\r", "old_methods": [], "patch": "@@ -1,7 +1,7 @@\n package xdi2.core.constants;\r\n \r\n-import xdi2.core.xri3.XDI3Segment;\r\n-import xdi2.core.xri3.XDI3SubSegment;\r\n+import xdi2.core.syntax.XDIAddress;\r\n+import xdi2.core.syntax.XDIArc;\r\n \r\n /**\r\n * Constants for XDI policies.\r\n@@ -10,19 +10,19 @@\n */\r\n public final class XDIPolicyConstants {\r\n \r\n-\tpublic static final XDI3Segment XRI_S_IF = XDI3Segment.create(\"$if\");\r\n+\tpublic static final XDIAddress XDI_ADD_IF = XDIAddress.create(\"$if\");\r\n \r\n-\tpublic static final XDI3SubSegment XRI_SS_IF = XDI3SubSegment.create(\"$if\");\r\n+\tpublic static final XDIArc XDI_ARC_IF = XDIArc.create(\"$if\");\r\n \r\n-\tpublic static final XDI3SubSegment XRI_SS_AND = XDI3SubSegment.create(\"$and\");\r\n-\tpublic static final XDI3SubSegment XRI_SS_OR = XDI3SubSegment.create(\"$or\");\r\n-\tpublic static final XDI3SubSegment XRI_SS_NOT = XDI3SubSegment.create(\"$not\");\r\n+\tpublic static final XDIArc XDI_ARC_AND = XDIArc.create(\"$and\");\r\n+\tpublic static final XDIArc XDI_ARC_OR = XDIArc.create(\"$or\");\r\n+\tpublic static final XDIArc XDI_ARC_NOT = XDIArc.create(\"$not\");\r\n \r\n-\tpublic static final XDI3Segment XRI_S_EQUALS = XDI3Segment.create(\"$equals\");\r\n-\tpublic static final XDI3Segment XRI_S_MATCHES = XDI3Segment.create(\"$matches\");\r\n-\tpublic static final XDI3Segment XRI_S_GREATER = XDI3Segment.create(\"$greater\");\r\n-\tpublic static final XDI3Segment XRI_S_LESSER = XDI3Segment.create(\"$lesser\");\r\n-\tpublic static final XDI3Segment XRI_S_IS = XDI3Segment.create(\"$is\");\r\n+\tpublic static final XDIAddress XDI_ADD_EQUALS = XDIAddress.create(\"$equals\");\r\n+\tpublic static final XDIAddress XDI_ADD_MATCHES = XDIAddress.create(\"$matches\");\r\n+\tpublic static final XDIAddress XDI_ADD_GREATER = XDIAddress.create(\"$greater\");\r\n+\tpublic static final XDIAddress XDI_ADD_LESSER = XDIAddress.create(\"$lesser\");\r\n+\tpublic static final XDIAddress XDI_ADD_IS = XDIAddress.create(\"$is\");\r\n \r\n \tprivate XDIPolicyConstants() { }\r\n }\r", "raw_url": "https://github.com/projectdanube/xdi2/raw/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Fconstants%2FXDIPolicyConstants.java", "sha": "5c5e41cebc9b27528a45e694eaaffc1cba3961a8", "status": "modified" }, { "additions": 8, "blob_url": "https://github.com/projectdanube/xdi2/blob/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Fconstants%2FXDITimestampsConstants.java", "changes": 16, "contents_url": "https://api.github.com/repos/projectdanube/xdi2/contents/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Fconstants%2FXDITimestampsConstants.java?ref=0ca7982fec30c2bb8204efbbea61428a643d2e9c", "deletions": 8, "filename": "core/src/main/java/xdi2/core/constants/XDITimestampsConstants.java", "new_code": "import xdi2.core.syntax.XDIAddress;\r\nimport xdi2.core.syntax.XDIArc;\r\n\tpublic static final XDIAddress XDI_ADD_AS_CREATED = XDIAddress.create(\"<#created>\");\r\n\tpublic static final XDIAddress XDI_ADD_AS_EXPIRES = XDIAddress.create(\"<#expires>\");\r\n\tpublic static final XDIAddress XDI_ADD_AS_T = XDIAddress.create(\"<$t>\");\r\n\tpublic static final XDIArc XDI_ARC_AS_CREATED = XDIArc.create(\"<#created>\");\r\n\tpublic static final XDIArc XDI_ARC_AS_EXPIRES = XDIArc.create(\"<#expires>\");\r\n\tpublic static final XDIArc XDI_ARC_AS_T = XDIArc.create(\"<$t>\");\r", "new_methods": [], "old_code": "import xdi2.core.xri3.XDI3Segment;\r\nimport xdi2.core.xri3.XDI3SubSegment;\r\n\tpublic static final XDI3Segment XRI_S_AS_CREATED = XDI3Segment.create(\"<#created>\");\r\n\tpublic static final XDI3Segment XRI_S_AS_EXPIRES = XDI3Segment.create(\"<#expires>\");\r\n\tpublic static final XDI3Segment XRI_S_AS_T = XDI3Segment.create(\"<$t>\");\r\n\tpublic static final XDI3SubSegment XRI_SS_AS_CREATED = XDI3SubSegment.create(\"<#created>\");\r\n\tpublic static final XDI3SubSegment XRI_SS_AS_EXPIRES = XDI3SubSegment.create(\"<#expires>\");\r\n\tpublic static final XDI3SubSegment XRI_SS_AS_T = XDI3SubSegment.create(\"<$t>\");\r", "old_methods": [], "patch": "@@ -3,8 +3,8 @@\n import java.text.DateFormat;\r\n import java.text.SimpleDateFormat;\r\n \r\n-import xdi2.core.xri3.XDI3Segment;\r\n-import xdi2.core.xri3.XDI3SubSegment;\r\n+import xdi2.core.syntax.XDIAddress;\r\n+import xdi2.core.syntax.XDIArc;\r\n \r\n /**\r\n * Constants for XDI timestamps.\r\n@@ -13,13 +13,13 @@\n */\r\n public final class XDITimestampsConstants {\r\n \r\n-\tpublic static final XDI3Segment XRI_S_AS_CREATED = XDI3Segment.create(\"<#created>\");\r\n-\tpublic static final XDI3Segment XRI_S_AS_EXPIRES = XDI3Segment.create(\"<#expires>\");\r\n-\tpublic static final XDI3Segment XRI_S_AS_T = XDI3Segment.create(\"<$t>\");\r\n+\tpublic static final XDIAddress XDI_ADD_AS_CREATED = XDIAddress.create(\"<#created>\");\r\n+\tpublic static final XDIAddress XDI_ADD_AS_EXPIRES = XDIAddress.create(\"<#expires>\");\r\n+\tpublic static final XDIAddress XDI_ADD_AS_T = XDIAddress.create(\"<$t>\");\r\n \r\n-\tpublic static final XDI3SubSegment XRI_SS_AS_CREATED = XDI3SubSegment.create(\"<#created>\");\r\n-\tpublic static final XDI3SubSegment XRI_SS_AS_EXPIRES = XDI3SubSegment.create(\"<#expires>\");\r\n-\tpublic static final XDI3SubSegment XRI_SS_AS_T = XDI3SubSegment.create(\"<$t>\");\r\n+\tpublic static final XDIArc XDI_ARC_AS_CREATED = XDIArc.create(\"<#created>\");\r\n+\tpublic static final XDIArc XDI_ARC_AS_EXPIRES = XDIArc.create(\"<#expires>\");\r\n+\tpublic static final XDIArc XDI_ARC_AS_T = XDIArc.create(\"<$t>\");\r\n \r\n \tpublic static final DateFormat[] FORMATS_TIMESTAMP = new SimpleDateFormat[] {\r\n \r", "raw_url": "https://github.com/projectdanube/xdi2/raw/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Fconstants%2FXDITimestampsConstants.java", "sha": "bad8cdbffe9b6fe806c890a88ab3252304ad12ec", "status": "modified" }, { "additions": 36, "blob_url": "https://github.com/projectdanube/xdi2/blob/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Fdatatypes%2FDataTypes.java", "changes": 72, "contents_url": "https://api.github.com/repos/projectdanube/xdi2/contents/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Fdatatypes%2FDataTypes.java?ref=0ca7982fec30c2bb8204efbbea61428a643d2e9c", "deletions": 36, "filename": "core/src/main/java/xdi2/core/features/datatypes/DataTypes.java", "new_code": "import xdi2.core.syntax.XDIAddress;\r\nimport xdi2.core.util.iterators.MappingRelationTargetContextNodeAddressIterator;\r\n\tpublic static final XDIAddress XRI_DATATYPE_XSD = XDIAddress.create(\"\" + XDIConstants.CS_CLASS_UNRESERVED + XDIConstants.CS_CLASS_RESERVED + \"xsd\");\r\n\tpublic static final XDIAddress XRI_DATATYPE_JSON = XDIAddress.create(\"\" + XDIConstants.CS_CLASS_UNRESERVED + XDIConstants.CS_CLASS_RESERVED + \"json\");\r\n\tpublic static final XDIAddress XRI_DATATYPE_MIME = XDIAddress.create(\"\" + XDIConstants.CS_CLASS_UNRESERVED + XDIConstants.CS_CLASS_RESERVED + \"mime\");\r\n\tpublic static XDIAddress booleanToXri(Boolean b) {\r\n\t\tif (Boolean.TRUE.equals(b)) return XDIConstants.XDI_ADD_TRUE;\r\n\t\tif (Boolean.FALSE.equals(b)) return XDIConstants.XDI_ADD_FALSE;\r\n\tpublic static Boolean xriToBoolean(XDIAddress xri) {\r\n\t\tif (XDIConstants.XDI_ADD_TRUE.equals(xri)) return Boolean.TRUE;\r\n\t\tif (XDIConstants.XDI_ADD_FALSE.equals(xri)) return Boolean.FALSE;\r\n\tpublic static void setDataType(ContextNode contextNode, XDIAddress dataTypeXri) {\r\n\t\tcontextNode.setRelation(XDIDictionaryConstants.XDI_ADD_IS_TYPE, dataTypeXri);\r\n\tpublic static List<XDIAddress> getDataTypes(ContextNode contextNode) {\r\n\t\tReadOnlyIterator<Relation> relations = contextNode.getRelations(XDIDictionaryConstants.XDI_ADD_IS_TYPE);\r\n\t\treturn new IteratorListMaker<XDIAddress> (new MappingRelationTargetContextNodeAddressIterator(relations)).list();\r\n\tpublic static XDIAddress getDataType(ContextNode contextNode) {\r\n\t\tRelation relation = contextNode.getRelation(XDIDictionaryConstants.XDI_ADD_IS_TYPE);\r\n\t\treturn relation == null ? null : relation.getTargetContextNodeAddress();\r\n\t * Returns XDIAddress for a xsd datatype string.\r\n\t * @return a xsd datatype XDIAddress\r\n\tpublic static XDIAddress dataTypeXriFromXsdType(String xsdType) {\r\n\t\treturn XDIAddress.create(\"\" + XRI_DATATYPE_XSD + XDIConstants.CS_CLASS_RESERVED + xsdType);\r\n\tpublic static String xsdTypeFromDataTypeXri(XDIAddress dataTypeXri) {\r\n\t * Returns XDIAddress for a json datatype string.\r\n\t * @return a json datatype XDIAddress\r\n\tpublic static XDIAddress dataTypeXriFromJsonType(String jsonType) {\r\n\t\treturn XDIAddress.create(\"\" + XRI_DATATYPE_JSON + XDIConstants.CS_CLASS_RESERVED + jsonType);\r\n\tpublic static String jsonTypeFromDataTypeXri(XDIAddress dataTypeXri) {\r\n\t * Returns XDIAddress for a mime datatype string.\r\n\t * @return a mime datatype XDIAddress.\r\n\tpublic static XDIAddress dataTypeXriFromMimeType(String mimeType) {\r\n\t\tXDIAddress xri = null;\r\n\t\t\txri = XDIAddress.create(\"\" + XRI_DATATYPE_MIME + XDIConstants.CS_CLASS_RESERVED + parts[0] + XDIConstants.CS_CLASS_UNRESERVED + parts[1]);\r\n\tpublic static String mimeTypeFromDataTypeXri(XDIAddress dataTypeXri) {\r\n\t\t\tthrow new Xdi2RuntimeException(\"Invalid XDIAddress \", ex);\r", "new_methods": [], "old_code": "import xdi2.core.util.iterators.MappingRelationTargetContextNodeXriIterator;\r\nimport xdi2.core.xri3.XDI3Segment;\r\n\tpublic static final XDI3Segment XRI_DATATYPE_XSD = XDI3Segment.create(\"\" + XDIConstants.CS_CLASS_UNRESERVED + XDIConstants.CS_CLASS_RESERVED + \"xsd\");\r\n\tpublic static final XDI3Segment XRI_DATATYPE_JSON = XDI3Segment.create(\"\" + XDIConstants.CS_CLASS_UNRESERVED + XDIConstants.CS_CLASS_RESERVED + \"json\");\r\n\tpublic static final XDI3Segment XRI_DATATYPE_MIME = XDI3Segment.create(\"\" + XDIConstants.CS_CLASS_UNRESERVED + XDIConstants.CS_CLASS_RESERVED + \"mime\");\r\n\tpublic static XDI3Segment booleanToXri(Boolean b) {\r\n\t\tif (Boolean.TRUE.equals(b)) return XDIConstants.XRI_S_TRUE;\r\n\t\tif (Boolean.FALSE.equals(b)) return XDIConstants.XRI_S_FALSE;\r\n\tpublic static Boolean xriToBoolean(XDI3Segment xri) {\r\n\t\tif (XDIConstants.XRI_S_TRUE.equals(xri)) return Boolean.TRUE;\r\n\t\tif (XDIConstants.XRI_S_FALSE.equals(xri)) return Boolean.FALSE;\r\n\tpublic static void setDataType(ContextNode contextNode, XDI3Segment dataTypeXri) {\r\n\t\tcontextNode.setRelation(XDIDictionaryConstants.XRI_S_IS_TYPE, dataTypeXri);\r\n\tpublic static List<XDI3Segment> getDataTypes(ContextNode contextNode) {\r\n\t\tReadOnlyIterator<Relation> relations = contextNode.getRelations(XDIDictionaryConstants.XRI_S_IS_TYPE);\r\n\t\treturn new IteratorListMaker<XDI3Segment> (new MappingRelationTargetContextNodeXriIterator(relations)).list();\r\n\tpublic static XDI3Segment getDataType(ContextNode contextNode) {\r\n\t\tRelation relation = contextNode.getRelation(XDIDictionaryConstants.XRI_S_IS_TYPE);\r\n\t\treturn relation == null ? null : relation.getTargetContextNodeXri();\r\n\t * Returns XDI3Segment for a xsd datatype string.\r\n\t * @return a xsd datatype XDI3Segment\r\n\tpublic static XDI3Segment dataTypeXriFromXsdType(String xsdType) {\r\n\t\treturn XDI3Segment.create(\"\" + XRI_DATATYPE_XSD + XDIConstants.CS_CLASS_RESERVED + xsdType);\r\n\tpublic static String xsdTypeFromDataTypeXri(XDI3Segment dataTypeXri) {\r\n\t * Returns XDI3Segment for a json datatype string.\r\n\t * @return a json datatype XDI3Segment\r\n\tpublic static XDI3Segment dataTypeXriFromJsonType(String jsonType) {\r\n\t\treturn XDI3Segment.create(\"\" + XRI_DATATYPE_JSON + XDIConstants.CS_CLASS_RESERVED + jsonType);\r\n\tpublic static String jsonTypeFromDataTypeXri(XDI3Segment dataTypeXri) {\r\n\t * Returns XDI3Segment for a mime datatype string.\r\n\t * @return a mime datatype XDI3Segment.\r\n\tpublic static XDI3Segment dataTypeXriFromMimeType(String mimeType) {\r\n\t\tXDI3Segment xri = null;\r\n\t\t\txri = XDI3Segment.create(\"\" + XRI_DATATYPE_MIME + XDIConstants.CS_CLASS_RESERVED + parts[0] + XDIConstants.CS_CLASS_UNRESERVED + parts[1]);\r\n\tpublic static String mimeTypeFromDataTypeXri(XDI3Segment dataTypeXri) {\r\n\t\t\tthrow new Xdi2RuntimeException(\"Invalid XDI3Segment \", ex);\r", "old_methods": [], "patch": "@@ -7,10 +7,10 @@\n import xdi2.core.constants.XDIConstants;\r\n import xdi2.core.constants.XDIDictionaryConstants;\r\n import xdi2.core.exceptions.Xdi2RuntimeException;\r\n+import xdi2.core.syntax.XDIAddress;\r\n import xdi2.core.util.iterators.IteratorListMaker;\r\n-import xdi2.core.util.iterators.MappingRelationTargetContextNodeXriIterator;\r\n+import xdi2.core.util.iterators.MappingRelationTargetContextNodeAddressIterator;\r\n import xdi2.core.util.iterators.ReadOnlyIterator;\r\n-import xdi2.core.xri3.XDI3Segment;\r\n \r\n /**\r\n * A helper class to work with data types, i.e. get or set them. Supported data\r\n@@ -22,26 +22,26 @@ public class DataTypes {\n \r\n \tprivate DataTypes() { }\r\n \r\n-\tpublic static final XDI3Segment XRI_DATATYPE_XSD = XDI3Segment.create(\"\" + XDIConstants.CS_CLASS_UNRESERVED + XDIConstants.CS_CLASS_RESERVED + \"xsd\");\r\n-\tpublic static final XDI3Segment XRI_DATATYPE_JSON = XDI3Segment.create(\"\" + XDIConstants.CS_CLASS_UNRESERVED + XDIConstants.CS_CLASS_RESERVED + \"json\");\r\n-\tpublic static final XDI3Segment XRI_DATATYPE_MIME = XDI3Segment.create(\"\" + XDIConstants.CS_CLASS_UNRESERVED + XDIConstants.CS_CLASS_RESERVED + \"mime\");\r\n+\tpublic static final XDIAddress XRI_DATATYPE_XSD = XDIAddress.create(\"\" + XDIConstants.CS_CLASS_UNRESERVED + XDIConstants.CS_CLASS_RESERVED + \"xsd\");\r\n+\tpublic static final XDIAddress XRI_DATATYPE_JSON = XDIAddress.create(\"\" + XDIConstants.CS_CLASS_UNRESERVED + XDIConstants.CS_CLASS_RESERVED + \"json\");\r\n+\tpublic static final XDIAddress XRI_DATATYPE_MIME = XDIAddress.create(\"\" + XDIConstants.CS_CLASS_UNRESERVED + XDIConstants.CS_CLASS_RESERVED + \"mime\");\r\n \r\n \t/*\r\n \t * Methods for booleans\r\n \t */\r\n \r\n-\tpublic static XDI3Segment booleanToXri(Boolean b) {\r\n+\tpublic static XDIAddress booleanToXri(Boolean b) {\r\n \r\n-\t\tif (Boolean.TRUE.equals(b)) return XDIConstants.XRI_S_TRUE;\r\n-\t\tif (Boolean.FALSE.equals(b)) return XDIConstants.XRI_S_FALSE;\r\n+\t\tif (Boolean.TRUE.equals(b)) return XDIConstants.XDI_ADD_TRUE;\r\n+\t\tif (Boolean.FALSE.equals(b)) return XDIConstants.XDI_ADD_FALSE;\r\n \r\n \t\treturn null;\r\n \t}\r\n \r\n-\tpublic static Boolean xriToBoolean(XDI3Segment xri) {\r\n+\tpublic static Boolean xriToBoolean(XDIAddress xri) {\r\n \r\n-\t\tif (XDIConstants.XRI_S_TRUE.equals(xri)) return Boolean.TRUE;\r\n-\t\tif (XDIConstants.XRI_S_FALSE.equals(xri)) return Boolean.FALSE;\r\n+\t\tif (XDIConstants.XDI_ADD_TRUE.equals(xri)) return Boolean.TRUE;\r\n+\t\tif (XDIConstants.XDI_ADD_FALSE.equals(xri)) return Boolean.FALSE;\r\n \r\n \t\treturn null;\r\n \t}\r\n@@ -56,9 +56,9 @@ public static Boolean xriToBoolean(XDI3Segment xri) {\n \t * @param contextNode\r\n \t * @param dataTypeXri\r\n \t */\r\n-\tpublic static void setDataType(ContextNode contextNode, XDI3Segment dataTypeXri) {\r\n+\tpublic static void setDataType(ContextNode contextNode, XDIAddress dataTypeXri) {\r\n \r\n-\t\tcontextNode.setRelation(XDIDictionaryConstants.XRI_S_IS_TYPE, dataTypeXri);\r\n+\t\tcontextNode.setRelation(XDIDictionaryConstants.XDI_ADD_IS_TYPE, dataTypeXri);\r\n \t}\r\n \r\n \t/**\r\n@@ -67,11 +67,11 @@ public static void setDataType(ContextNode contextNode, XDI3Segment dataTypeXri)\n \t * @param contextNode\r\n \t * @return list of datatypes\r\n \t */\r\n-\tpublic static List<XDI3Segment> getDataTypes(ContextNode contextNode) {\r\n+\tpublic static List<XDIAddress> getDataTypes(ContextNode contextNode) {\r\n \r\n-\t\tReadOnlyIterator<Relation> relations = contextNode.getRelations(XDIDictionaryConstants.XRI_S_IS_TYPE);\r\n+\t\tReadOnlyIterator<Relation> relations = contextNode.getRelations(XDIDictionaryConstants.XDI_ADD_IS_TYPE);\r\n \r\n-\t\treturn new IteratorListMaker<XDI3Segment> (new MappingRelationTargetContextNodeXriIterator(relations)).list();\r\n+\t\treturn new IteratorListMaker<XDIAddress> (new MappingRelationTargetContextNodeAddressIterator(relations)).list();\r\n \t}\r\n \r\n \t/**\r\n@@ -80,26 +80,26 @@ public static List<XDI3Segment> getDataTypes(ContextNode contextNode) {\n \t * @param contextNode\r\n \t * @return datatype\r\n \t */\r\n-\tpublic static XDI3Segment getDataType(ContextNode contextNode) {\r\n+\tpublic static XDIAddress getDataType(ContextNode contextNode) {\r\n \r\n-\t\tRelation relation = contextNode.getRelation(XDIDictionaryConstants.XRI_S_IS_TYPE);\r\n+\t\tRelation relation = contextNode.getRelation(XDIDictionaryConstants.XDI_ADD_IS_TYPE);\r\n \r\n-\t\treturn relation == null ? null : relation.getTargetContextNodeXri();\r\n+\t\treturn relation == null ? null : relation.getTargetContextNodeAddress();\r\n \t}\r\n \r\n \t/*\r\n \t * Methods for data type XRIs\r\n \t */\r\n \r\n \t/**\r\n-\t * Returns XDI3Segment for a xsd datatype string.\r\n+\t * Returns XDIAddress for a xsd datatype string.\r\n \t * \r\n \t * @param xsdType\r\n-\t * @return a xsd datatype XDI3Segment\r\n+\t * @return a xsd datatype XDIAddress\r\n \t */\r\n-\tpublic static XDI3Segment dataTypeXriFromXsdType(String xsdType) {\r\n+\tpublic static XDIAddress dataTypeXriFromXsdType(String xsdType) {\r\n \r\n-\t\treturn XDI3Segment.create(\"\" + XRI_DATATYPE_XSD + XDIConstants.CS_CLASS_RESERVED + xsdType);\r\n+\t\treturn XDIAddress.create(\"\" + XRI_DATATYPE_XSD + XDIConstants.CS_CLASS_RESERVED + xsdType);\r\n \t}\r\n \r\n \t/**\r\n@@ -108,22 +108,22 @@ public static XDI3Segment dataTypeXriFromXsdType(String xsdType) {\n \t * @param dataTypeXri\r\n \t * @return a string of xsd datatype\r\n \t */\r\n-\tpublic static String xsdTypeFromDataTypeXri(XDI3Segment dataTypeXri) {\r\n+\tpublic static String xsdTypeFromDataTypeXri(XDIAddress dataTypeXri) {\r\n \r\n \t\tString dataTypeXriString = dataTypeXri.toString();\r\n \r\n \t\treturn getDataTypeFromXRISegment(dataTypeXriString, true);\r\n \t}\r\n \r\n \t/**\r\n-\t * Returns XDI3Segment for a json datatype string.\r\n+\t * Returns XDIAddress for a json datatype string.\r\n \t * \r\n \t * @param jsonType\r\n-\t * @return a json datatype XDI3Segment\r\n+\t * @return a json datatype XDIAddress\r\n \t */\r\n-\tpublic static XDI3Segment dataTypeXriFromJsonType(String jsonType) {\r\n+\tpublic static XDIAddress dataTypeXriFromJsonType(String jsonType) {\r\n \r\n-\t\treturn XDI3Segment.create(\"\" + XRI_DATATYPE_JSON + XDIConstants.CS_CLASS_RESERVED + jsonType);\r\n+\t\treturn XDIAddress.create(\"\" + XRI_DATATYPE_JSON + XDIConstants.CS_CLASS_RESERVED + jsonType);\r\n \t}\r\n \r\n \t/**\r\n@@ -132,28 +132,28 @@ public static XDI3Segment dataTypeXriFromJsonType(String jsonType) {\n \t * @param dataTypeXri\r\n \t * @return a string of json datatype\r\n \t */\r\n-\tpublic static String jsonTypeFromDataTypeXri(XDI3Segment dataTypeXri) {\r\n+\tpublic static String jsonTypeFromDataTypeXri(XDIAddress dataTypeXri) {\r\n \r\n \t\tString dataTypeJSONString = dataTypeXri.toString();\r\n \r\n \t\treturn getDataTypeFromXRISegment(dataTypeJSONString, false);\r\n \t}\r\n \r\n \t/**\r\n-\t * Returns XDI3Segment for a mime datatype string.\r\n+\t * Returns XDIAddress for a mime datatype string.\r\n \t * \r\n \t * @param mimeType\r\n-\t * @return a mime datatype XDI3Segment.\r\n+\t * @return a mime datatype XDIAddress.\r\n \t */\r\n-\tpublic static XDI3Segment dataTypeXriFromMimeType(String mimeType) {\r\n+\tpublic static XDIAddress dataTypeXriFromMimeType(String mimeType) {\r\n \r\n \t\tString[] parts;\r\n-\t\tXDI3Segment xri = null;\r\n+\t\tXDIAddress xri = null;\r\n \r\n \t\ttry {\r\n \r\n \t\t\tparts = mimeType.split(\"/\");\r\n-\t\t\txri = XDI3Segment.create(\"\" + XRI_DATATYPE_MIME + XDIConstants.CS_CLASS_RESERVED + parts[0] + XDIConstants.CS_CLASS_UNRESERVED + parts[1]);\r\n+\t\t\txri = XDIAddress.create(\"\" + XRI_DATATYPE_MIME + XDIConstants.CS_CLASS_RESERVED + parts[0] + XDIConstants.CS_CLASS_UNRESERVED + parts[1]);\r\n \t\t} catch (Exception ex) {\r\n \r\n \t\t\tthrow new Xdi2RuntimeException(\"Invalid MIME Type \", ex);\r\n@@ -168,7 +168,7 @@ public static XDI3Segment dataTypeXriFromMimeType(String mimeType) {\n \t * @param dataTypeXri\r\n \t * @return a string of mime datatype\r\n \t */\r\n-\tpublic static String mimeTypeFromDataTypeXri(XDI3Segment dataTypeXri) {\r\n+\tpublic static String mimeTypeFromDataTypeXri(XDIAddress dataTypeXri) {\r\n \r\n \t\tString dataTypeMIMEString = dataTypeXri.toString();\r\n \r\n@@ -210,7 +210,7 @@ private static String getDataTypeFromXRISegment(String xriSegment, boolean isXSD\n \t\t\t}\r\n \t\t} catch (Exception ex) {\r\n \r\n-\t\t\tthrow new Xdi2RuntimeException(\"Invalid XDI3Segment \", ex);\r\n+\t\t\tthrow new Xdi2RuntimeException(\"Invalid XDIAddress \", ex);\r\n \t\t}\r\n \r\n \t\treturn buffer.toString();\r", "raw_url": "https://github.com/projectdanube/xdi2/raw/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Fdatatypes%2FDataTypes.java", "sha": "25bd78657ac95181af8c575aa18e2f247e5941e5", "status": "modified" }, { "additions": 22, "blob_url": "https://github.com/projectdanube/xdi2/blob/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Fdictionary%2FDictionary.java", "changes": 44, "contents_url": "https://api.github.com/repos/projectdanube/xdi2/contents/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Fdictionary%2FDictionary.java?ref=0ca7982fec30c2bb8204efbbea61428a643d2e9c", "deletions": 22, "filename": "core/src/main/java/xdi2/core/features/dictionary/Dictionary.java", "new_code": "import xdi2.core.syntax.XDIAddress;\r\nimport xdi2.core.syntax.XDIArc;\r\nimport xdi2.core.util.iterators.MappingContextNodeAddressIterator;\r\n\tpublic static XDIArc instanceXriToDictionaryXri(XDIArc instanceXri) {\r\n\t\treturn XDIArc.create(\"\" + XDIConstants.CS_CLASS_UNRESERVED + \"(\" + instanceXri + \")\");\r\n\tpublic static XDIArc dictionaryXriToInstanceXri(XDIArc dictionaryXri) {\r\n\t\treturn XDIArc.create(dictionaryXri.getXRef().getValue());\r\n\tpublic static XDIArc nativeIdentifierToInstanceXri(String nativeIdentifier) {\r\n\t\treturn XDIArc.create(\"\" + XDIConstants.CS_CLASS_UNRESERVED + \"(\" + nativeIdentifier + \")\");\r\n\tpublic static String instanceXriToNativeIdentifier(XDIArc instanceXri) {\r\n\tpublic static Iterator<XDIAddress> getContextNodeTypes(ContextNode contextNode) {\r\n\t\treturn new MappingContextNodeAddressIterator(new MappingRelationTargetContextNodeIterator(contextNode.getRelations(XDIDictionaryConstants.XDI_ADD_IS_TYPE)));\r\n\tpublic static XDIAddress getContextNodeType(ContextNode contextNode) {\r\n\t\treturn contextNode.getRelation(XDIDictionaryConstants.XDI_ADD_IS_TYPE).getTargetContextNodeAddress();\r\n\tpublic static boolean isContextNodeType(ContextNode contextNode, XDIAddress type) {\r\n\t\treturn contextNode.containsRelation(XDIDictionaryConstants.XDI_ADD_IS_TYPE, type);\r\n\tpublic static void setContextNodeType(ContextNode contextNode, XDIAddress type) {\r\n\t\tcontextNode.setRelation(XDIDictionaryConstants.XDI_ADD_IS_TYPE, type);\r\n\tpublic static void delContextNodeType(ContextNode contextNode, XDIAddress type) {\r\n\t\tcontextNode.delRelation(XDIDictionaryConstants.XDI_ADD_IS_TYPE, type);\r\n\t\tcontextNode.delRelations(XDIDictionaryConstants.XDI_ADD_IS_TYPE);\r\n\tpublic static void replaceContextNodeType(ContextNode contextNode, XDIAddress type) {\r", "new_methods": [], "old_code": "import xdi2.core.util.iterators.MappingContextNodeXriIterator;\r\nimport xdi2.core.xri3.XDI3Segment;\r\nimport xdi2.core.xri3.XDI3SubSegment;\r\n\tpublic static XDI3SubSegment instanceXriToDictionaryXri(XDI3SubSegment instanceXri) {\r\n\t\treturn XDI3SubSegment.create(\"\" + XDIConstants.CS_CLASS_UNRESERVED + \"(\" + instanceXri + \")\");\r\n\tpublic static XDI3SubSegment dictionaryXriToInstanceXri(XDI3SubSegment dictionaryXri) {\r\n\t\treturn XDI3SubSegment.create(dictionaryXri.getXRef().getValue());\r\n\tpublic static XDI3SubSegment nativeIdentifierToInstanceXri(String nativeIdentifier) {\r\n\t\treturn XDI3SubSegment.create(\"\" + XDIConstants.CS_CLASS_UNRESERVED + \"(\" + nativeIdentifier + \")\");\r\n\tpublic static String instanceXriToNativeIdentifier(XDI3SubSegment instanceXri) {\r\n\tpublic static Iterator<XDI3Segment> getContextNodeTypes(ContextNode contextNode) {\r\n\t\treturn new MappingContextNodeXriIterator(new MappingRelationTargetContextNodeIterator(contextNode.getRelations(XDIDictionaryConstants.XRI_S_IS_TYPE)));\r\n\tpublic static XDI3Segment getContextNodeType(ContextNode contextNode) {\r\n\t\treturn contextNode.getRelation(XDIDictionaryConstants.XRI_S_IS_TYPE).getTargetContextNodeXri();\r\n\tpublic static boolean isContextNodeType(ContextNode contextNode, XDI3Segment type) {\r\n\t\treturn contextNode.containsRelation(XDIDictionaryConstants.XRI_S_IS_TYPE, type);\r\n\tpublic static void setContextNodeType(ContextNode contextNode, XDI3Segment type) {\r\n\t\tcontextNode.setRelation(XDIDictionaryConstants.XRI_S_IS_TYPE, type);\r\n\tpublic static void delContextNodeType(ContextNode contextNode, XDI3Segment type) {\r\n\t\tcontextNode.delRelation(XDIDictionaryConstants.XRI_S_IS_TYPE, type);\r\n\t\tcontextNode.delRelations(XDIDictionaryConstants.XRI_S_IS_TYPE);\r\n\tpublic static void replaceContextNodeType(ContextNode contextNode, XDI3Segment type) {\r", "old_methods": [], "patch": "@@ -5,10 +5,10 @@\n import xdi2.core.ContextNode;\r\n import xdi2.core.constants.XDIConstants;\r\n import xdi2.core.constants.XDIDictionaryConstants;\r\n-import xdi2.core.util.iterators.MappingContextNodeXriIterator;\r\n+import xdi2.core.syntax.XDIAddress;\r\n+import xdi2.core.syntax.XDIArc;\r\n+import xdi2.core.util.iterators.MappingContextNodeAddressIterator;\r\n import xdi2.core.util.iterators.MappingRelationTargetContextNodeIterator;\r\n-import xdi2.core.xri3.XDI3Segment;\r\n-import xdi2.core.xri3.XDI3SubSegment;\r\n \r\n public class Dictionary {\r\n \r\n@@ -18,25 +18,25 @@ private Dictionary() { }\n \t * Methods for dictionary XRIs\r\n \t */\r\n \r\n-\tpublic static XDI3SubSegment instanceXriToDictionaryXri(XDI3SubSegment instanceXri) {\r\n+\tpublic static XDIArc instanceXriToDictionaryXri(XDIArc instanceXri) {\r\n \r\n-\t\treturn XDI3SubSegment.create(\"\" + XDIConstants.CS_CLASS_UNRESERVED + \"(\" + instanceXri + \")\");\r\n+\t\treturn XDIArc.create(\"\" + XDIConstants.CS_CLASS_UNRESERVED + \"(\" + instanceXri + \")\");\r\n \t}\r\n \r\n-\tpublic static XDI3SubSegment dictionaryXriToInstanceXri(XDI3SubSegment dictionaryXri) {\r\n+\tpublic static XDIArc dictionaryXriToInstanceXri(XDIArc dictionaryXri) {\r\n \r\n \t\tif (! XDIConstants.CS_CLASS_UNRESERVED.equals(dictionaryXri.getCs())) return null;\r\n \t\tif (! dictionaryXri.hasXRef()) return null;\r\n \r\n-\t\treturn XDI3SubSegment.create(dictionaryXri.getXRef().getValue());\r\n+\t\treturn XDIArc.create(dictionaryXri.getXRef().getValue());\r\n \t}\r\n \r\n-\tpublic static XDI3SubSegment nativeIdentifierToInstanceXri(String nativeIdentifier) {\r\n+\tpublic static XDIArc nativeIdentifierToInstanceXri(String nativeIdentifier) {\r\n \r\n-\t\treturn XDI3SubSegment.create(\"\" + XDIConstants.CS_CLASS_UNRESERVED + \"(\" + nativeIdentifier + \")\");\r\n+\t\treturn XDIArc.create(\"\" + XDIConstants.CS_CLASS_UNRESERVED + \"(\" + nativeIdentifier + \")\");\r\n \t}\r\n \r\n-\tpublic static String instanceXriToNativeIdentifier(XDI3SubSegment instanceXri) {\r\n+\tpublic static String instanceXriToNativeIdentifier(XDIArc instanceXri) {\r\n \r\n \t\tif (! instanceXri.hasXRef()) return null;\r\n \r\n@@ -47,37 +47,37 @@ public static String instanceXriToNativeIdentifier(XDI3SubSegment instanceXri) {\n \t * Methods for types of context nodes.\r\n \t */\r\n \r\n-\tpublic static Iterator<XDI3Segment> getContextNodeTypes(ContextNode contextNode) {\r\n+\tpublic static Iterator<XDIAddress> getContextNodeTypes(ContextNode contextNode) {\r\n \r\n-\t\treturn new MappingContextNodeXriIterator(new MappingRelationTargetContextNodeIterator(contextNode.getRelations(XDIDictionaryConstants.XRI_S_IS_TYPE)));\r\n+\t\treturn new MappingContextNodeAddressIterator(new MappingRelationTargetContextNodeIterator(contextNode.getRelations(XDIDictionaryConstants.XDI_ADD_IS_TYPE)));\r\n \t}\r\n \r\n-\tpublic static XDI3Segment getContextNodeType(ContextNode contextNode) {\r\n+\tpublic static XDIAddress getContextNodeType(ContextNode contextNode) {\r\n \r\n-\t\treturn contextNode.getRelation(XDIDictionaryConstants.XRI_S_IS_TYPE).getTargetContextNodeXri();\r\n+\t\treturn contextNode.getRelation(XDIDictionaryConstants.XDI_ADD_IS_TYPE).getTargetContextNodeAddress();\r\n \t}\r\n \r\n-\tpublic static boolean isContextNodeType(ContextNode contextNode, XDI3Segment type) {\r\n+\tpublic static boolean isContextNodeType(ContextNode contextNode, XDIAddress type) {\r\n \r\n-\t\treturn contextNode.containsRelation(XDIDictionaryConstants.XRI_S_IS_TYPE, type);\r\n+\t\treturn contextNode.containsRelation(XDIDictionaryConstants.XDI_ADD_IS_TYPE, type);\r\n \t}\r\n \r\n-\tpublic static void setContextNodeType(ContextNode contextNode, XDI3Segment type) {\r\n+\tpublic static void setContextNodeType(ContextNode contextNode, XDIAddress type) {\r\n \r\n-\t\tcontextNode.setRelation(XDIDictionaryConstants.XRI_S_IS_TYPE, type);\r\n+\t\tcontextNode.setRelation(XDIDictionaryConstants.XDI_ADD_IS_TYPE, type);\r\n \t}\r\n \r\n-\tpublic static void delContextNodeType(ContextNode contextNode, XDI3Segment type) {\r\n+\tpublic static void delContextNodeType(ContextNode contextNode, XDIAddress type) {\r\n \r\n-\t\tcontextNode.delRelation(XDIDictionaryConstants.XRI_S_IS_TYPE, type);\r\n+\t\tcontextNode.delRelation(XDIDictionaryConstants.XDI_ADD_IS_TYPE, type);\r\n \t}\r\n \r\n \tpublic static void delContextNodeTypes(ContextNode contextNode) {\r\n \r\n-\t\tcontextNode.delRelations(XDIDictionaryConstants.XRI_S_IS_TYPE);\r\n+\t\tcontextNode.delRelations(XDIDictionaryConstants.XDI_ADD_IS_TYPE);\r\n \t}\r\n \r\n-\tpublic static void replaceContextNodeType(ContextNode contextNode, XDI3Segment type) {\r\n+\tpublic static void replaceContextNodeType(ContextNode contextNode, XDIAddress type) {\r\n \r\n \t\tdelContextNodeTypes(contextNode);\r\n \t\tsetContextNodeType(contextNode, type);\r", "raw_url": "https://github.com/projectdanube/xdi2/raw/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Fdictionary%2FDictionary.java", "sha": "1c248f1a5341afcf9e507bde0e35f1a3525a7b1c", "status": "modified" }, { "additions": 17, "blob_url": "https://github.com/projectdanube/xdi2/blob/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Fequivalence%2FEquivalence.java", "changes": 34, "contents_url": "https://api.github.com/repos/projectdanube/xdi2/contents/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Fequivalence%2FEquivalence.java?ref=0ca7982fec30c2bb8204efbbea61428a643d2e9c", "deletions": 17, "filename": "core/src/main/java/xdi2/core/features/equivalence/Equivalence.java", "new_code": "import xdi2.core.syntax.XDIAddress;\r\n\t\treturn contextNode.getRelations(XDIDictionaryConstants.XDI_ADD_IS);\r\n\t\tcontextNode.setRelation(XDIDictionaryConstants.XDI_ADD_IS, identityContextNode);\r\n\tpublic static void setIdentityContextNode(ContextNode contextNode, XDIAddress identitycontextNodeAddress) {\r\n\t\tcontextNode.setRelation(XDIDictionaryConstants.XDI_ADD_IS, identitycontextNodeAddress);\r\n\t\tIterator<Relation> identityRelations = contextNode.getIncomingRelations(XDIDictionaryConstants.XDI_ADD_IS);\r\n\t\treturn contextNode.getRelation(XDIDictionaryConstants.XDI_ADD_REF);\r\n\t\tcontextNode.setRelation(XDIDictionaryConstants.XDI_ADD_REF, referenceContextNode);\r\n\tpublic static void setReferenceContextNode(ContextNode contextNode, XDIAddress referencecontextNodeAddress) {\r\n\t\tcontextNode.setRelation(XDIDictionaryConstants.XDI_ADD_REF, referencecontextNodeAddress);\r\n\t\tIterator<Relation> referenceRelations = contextNode.getIncomingRelations(XDIDictionaryConstants.XDI_ADD_REF);\r\n\t\treturn contextNode.getRelation(XDIDictionaryConstants.XDI_ADD_REP);\r\n\t\tcontextNode.setRelation(XDIDictionaryConstants.XDI_ADD_REP, replacementContextNode);\r\n\tpublic static void setReplacementContextNode(ContextNode contextNode, XDIAddress replacementcontextNodeAddress) {\r\n\t\tcontextNode.setRelation(XDIDictionaryConstants.XDI_ADD_REP, replacementcontextNodeAddress);\r\n\t\tIterator<Relation> replacementRelations = contextNode.getIncomingRelations(XDIDictionaryConstants.XDI_ADD_REP);\r\n\t\t\t\treturn relation.getArc().equals(XDIDictionaryConstants.XDI_ADD_REF) || relation.getArc().equals(XDIDictionaryConstants.XDI_ADD_REP);\r", "new_methods": [], "old_code": "import xdi2.core.xri3.XDI3Segment;\r\n\t\treturn contextNode.getRelations(XDIDictionaryConstants.XRI_S_IS);\r\n\t\tcontextNode.setRelation(XDIDictionaryConstants.XRI_S_IS, identityContextNode);\r\n\tpublic static void setIdentityContextNode(ContextNode contextNode, XDI3Segment identityContextNodeXri) {\r\n\t\tcontextNode.setRelation(XDIDictionaryConstants.XRI_S_IS, identityContextNodeXri);\r\n\t\tIterator<Relation> identityRelations = contextNode.getIncomingRelations(XDIDictionaryConstants.XRI_S_IS);\r\n\t\treturn contextNode.getRelation(XDIDictionaryConstants.XRI_S_REF);\r\n\t\tcontextNode.setRelation(XDIDictionaryConstants.XRI_S_REF, referenceContextNode);\r\n\tpublic static void setReferenceContextNode(ContextNode contextNode, XDI3Segment referenceContextNodeXri) {\r\n\t\tcontextNode.setRelation(XDIDictionaryConstants.XRI_S_REF, referenceContextNodeXri);\r\n\t\tIterator<Relation> referenceRelations = contextNode.getIncomingRelations(XDIDictionaryConstants.XRI_S_REF);\r\n\t\treturn contextNode.getRelation(XDIDictionaryConstants.XRI_S_REP);\r\n\t\tcontextNode.setRelation(XDIDictionaryConstants.XRI_S_REP, replacementContextNode);\r\n\tpublic static void setReplacementContextNode(ContextNode contextNode, XDI3Segment replacementContextNodeXri) {\r\n\t\tcontextNode.setRelation(XDIDictionaryConstants.XRI_S_REP, replacementContextNodeXri);\r\n\t\tIterator<Relation> replacementRelations = contextNode.getIncomingRelations(XDIDictionaryConstants.XRI_S_REP);\r\n\t\t\t\treturn relation.getArcXri().equals(XDIDictionaryConstants.XRI_S_REF) || relation.getArcXri().equals(XDIDictionaryConstants.XRI_S_REP);\r", "old_methods": [], "patch": "@@ -7,11 +7,11 @@\n import xdi2.core.ContextNode;\r\n import xdi2.core.Relation;\r\n import xdi2.core.constants.XDIDictionaryConstants;\r\n+import xdi2.core.syntax.XDIAddress;\r\n import xdi2.core.util.iterators.CompositeIterator;\r\n import xdi2.core.util.iterators.MappingRelationContextNodeIterator;\r\n import xdi2.core.util.iterators.MappingRelationTargetContextNodeIterator;\r\n import xdi2.core.util.iterators.SelectingIterator;\r\n-import xdi2.core.xri3.XDI3Segment;\r\n \r\n public class Equivalence {\r\n \r\n@@ -23,7 +23,7 @@ private Equivalence() { }\n \r\n \tpublic static Iterator<Relation> getIdentityRelations(ContextNode contextNode) {\r\n \r\n-\t\treturn contextNode.getRelations(XDIDictionaryConstants.XRI_S_IS);\r\n+\t\treturn contextNode.getRelations(XDIDictionaryConstants.XDI_ADD_IS);\r\n \t}\r\n \r\n \tpublic static Iterator<ContextNode> getIdentityContextNodes(ContextNode contextNode) {\r\n@@ -33,17 +33,17 @@ public static Iterator<ContextNode> getIdentityContextNodes(ContextNode contextN\n \r\n \tpublic static void setIdentityContextNode(ContextNode contextNode, ContextNode identityContextNode) {\r\n \r\n-\t\tcontextNode.setRelation(XDIDictionaryConstants.XRI_S_IS, identityContextNode);\r\n+\t\tcontextNode.setRelation(XDIDictionaryConstants.XDI_ADD_IS, identityContextNode);\r\n \t}\r\n \r\n-\tpublic static void setIdentityContextNode(ContextNode contextNode, XDI3Segment identityContextNodeXri) {\r\n+\tpublic static void setIdentityContextNode(ContextNode contextNode, XDIAddress identitycontextNodeAddress) {\r\n \r\n-\t\tcontextNode.setRelation(XDIDictionaryConstants.XRI_S_IS, identityContextNodeXri);\r\n+\t\tcontextNode.setRelation(XDIDictionaryConstants.XDI_ADD_IS, identitycontextNodeAddress);\r\n \t}\r\n \r\n \tpublic static Iterator<Relation> getIncomingIdentityRelations(ContextNode contextNode) {\r\n \r\n-\t\tIterator<Relation> identityRelations = contextNode.getIncomingRelations(XDIDictionaryConstants.XRI_S_IS);\r\n+\t\tIterator<Relation> identityRelations = contextNode.getIncomingRelations(XDIDictionaryConstants.XDI_ADD_IS);\r\n \r\n \t\tList<Iterator<? extends Relation>> iterators = new ArrayList<Iterator<? extends Relation>> ();\r\n \t\titerators.add(identityRelations);\r\n@@ -64,7 +64,7 @@ public static Iterator<ContextNode> getIncomingIdentityContextNodes(ContextNode\n \r\n \tpublic static Relation getReferenceRelation(ContextNode contextNode) {\r\n \r\n-\t\treturn contextNode.getRelation(XDIDictionaryConstants.XRI_S_REF);\r\n+\t\treturn contextNode.getRelation(XDIDictionaryConstants.XDI_ADD_REF);\r\n \t}\r\n \r\n \tpublic static ContextNode getReferenceContextNode(ContextNode contextNode) {\r\n@@ -83,23 +83,23 @@ public static void setReferenceContextNode(ContextNode contextNode, ContextNode\n \t\tRelation replacementRelation = getReplacementRelation(contextNode);\r\n \t\tif (replacementRelation != null) replacementRelation.delete();\r\n \r\n-\t\tcontextNode.setRelation(XDIDictionaryConstants.XRI_S_REF, referenceContextNode);\r\n+\t\tcontextNode.setRelation(XDIDictionaryConstants.XDI_ADD_REF, referenceContextNode);\r\n \t}\r\n \r\n-\tpublic static void setReferenceContextNode(ContextNode contextNode, XDI3Segment referenceContextNodeXri) {\r\n+\tpublic static void setReferenceContextNode(ContextNode contextNode, XDIAddress referencecontextNodeAddress) {\r\n \r\n \t\tRelation referenceRelation = getReferenceRelation(contextNode);\r\n \t\tif (referenceRelation != null) referenceRelation.delete();\r\n \r\n \t\tRelation replacementRelation = getReplacementRelation(contextNode);\r\n \t\tif (replacementRelation != null) replacementRelation.delete();\r\n \r\n-\t\tcontextNode.setRelation(XDIDictionaryConstants.XRI_S_REF, referenceContextNodeXri);\r\n+\t\tcontextNode.setRelation(XDIDictionaryConstants.XDI_ADD_REF, referencecontextNodeAddress);\r\n \t}\r\n \r\n \tpublic static Iterator<Relation> getIncomingReferenceRelations(ContextNode contextNode) {\r\n \r\n-\t\tIterator<Relation> referenceRelations = contextNode.getIncomingRelations(XDIDictionaryConstants.XRI_S_REF);\r\n+\t\tIterator<Relation> referenceRelations = contextNode.getIncomingRelations(XDIDictionaryConstants.XDI_ADD_REF);\r\n \r\n \t\tList<Iterator<? extends Relation>> iterators = new ArrayList<Iterator<? extends Relation>> ();\r\n \t\titerators.add(referenceRelations);\r\n@@ -120,7 +120,7 @@ public static Iterator<ContextNode> getIncomingReferenceContextNodes(ContextNode\n \r\n \tpublic static Relation getReplacementRelation(ContextNode contextNode) {\r\n \r\n-\t\treturn contextNode.getRelation(XDIDictionaryConstants.XRI_S_REP);\r\n+\t\treturn contextNode.getRelation(XDIDictionaryConstants.XDI_ADD_REP);\r\n \t}\r\n \r\n \tpublic static ContextNode getReplacementContextNode(ContextNode contextNode) {\r\n@@ -139,23 +139,23 @@ public static void setReplacementContextNode(ContextNode contextNode, ContextNod\n \t\tRelation replacementRelation = getReplacementRelation(contextNode);\r\n \t\tif (replacementRelation != null) replacementRelation.delete();\r\n \r\n-\t\tcontextNode.setRelation(XDIDictionaryConstants.XRI_S_REP, replacementContextNode);\r\n+\t\tcontextNode.setRelation(XDIDictionaryConstants.XDI_ADD_REP, replacementContextNode);\r\n \t}\r\n \r\n-\tpublic static void setReplacementContextNode(ContextNode contextNode, XDI3Segment replacementContextNodeXri) {\r\n+\tpublic static void setReplacementContextNode(ContextNode contextNode, XDIAddress replacementcontextNodeAddress) {\r\n \r\n \t\tRelation referenceRelation = getReferenceRelation(contextNode);\r\n \t\tif (referenceRelation != null) referenceRelation.delete();\r\n \r\n \t\tRelation replacementRelation = getReplacementRelation(contextNode);\r\n \t\tif (replacementRelation != null) replacementRelation.delete();\r\n \r\n-\t\tcontextNode.setRelation(XDIDictionaryConstants.XRI_S_REP, replacementContextNodeXri);\r\n+\t\tcontextNode.setRelation(XDIDictionaryConstants.XDI_ADD_REP, replacementcontextNodeAddress);\r\n \t}\r\n \r\n \tpublic static Iterator<Relation> getIncomingReplacementRelations(ContextNode contextNode) {\r\n \r\n-\t\tIterator<Relation> replacementRelations = contextNode.getIncomingRelations(XDIDictionaryConstants.XRI_S_REP);\r\n+\t\tIterator<Relation> replacementRelations = contextNode.getIncomingRelations(XDIDictionaryConstants.XDI_ADD_REP);\r\n \r\n \t\tList<Iterator<? extends Relation>> iterators = new ArrayList<Iterator<? extends Relation>> ();\r\n \t\titerators.add(replacementRelations);\r\n@@ -181,7 +181,7 @@ public static Iterator<Relation> getAllReferenceAndReplacementRelations(ContextN\n \t\t\t@Override\r\n \t\t\tpublic boolean select(Relation relation) {\r\n \r\n-\t\t\t\treturn relation.getArcXri().equals(XDIDictionaryConstants.XRI_S_REF) || relation.getArcXri().equals(XDIDictionaryConstants.XRI_S_REP);\r\n+\t\t\t\treturn relation.getArc().equals(XDIDictionaryConstants.XDI_ADD_REF) || relation.getArc().equals(XDIDictionaryConstants.XDI_ADD_REP);\r\n \t\t\t}\r\n \t\t};\r\n \t}\r", "raw_url": "https://github.com/projectdanube/xdi2/raw/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Fequivalence%2FEquivalence.java", "sha": "986fb47156f7f50e0c3890392ea456024e44059a", "status": "modified" }, { "additions": 15, "blob_url": "https://github.com/projectdanube/xdi2/blob/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Fkeys%2FKeys.java", "changes": 30, "contents_url": "https://api.github.com/repos/projectdanube/xdi2/contents/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Fkeys%2FKeys.java?ref=0ca7982fec30c2bb8204efbbea61428a643d2e9c", "deletions": 15, "filename": "core/src/main/java/xdi2/core/features/keys/Keys.java", "new_code": "import xdi2.core.syntax.XDIAddress;\r\nimport xdi2.core.syntax.XDIArc;\r\n\t\treturn getPublicKey(xdiContext, XDIAuthenticationConstants.XDI_ADD_MSG_SIG_KEYPAIR_PUBLIC_KEY);\r\n\t\treturn getPublicKey(xdiContext, XDIAuthenticationConstants.XDI_ADD_MSG_ENCRYPT_KEYPAIR_PUBLIC_KEY);\r\n\t\treturn getPrivateKey(xdiContext, XDIAuthenticationConstants.XDI_ADD_MSG_SIG_KEYPAIR_PRIVATE_KEY);\r\n\t\treturn getPrivateKey(xdiContext, XDIAuthenticationConstants.XDI_ADD_MSG_ENCRYPT_KEYPAIR_PRIVATE_KEY);\r\n\t\treturn getSecretKey(xdiContext, XDIAuthenticationConstants.XDI_ADD_MSG_SIG_KEYPAIR_PUBLIC_KEY);\r\n\t\treturn getSecretKey(xdiContext, XDIAuthenticationConstants.XDI_ADD_MSG_ENCRYPT_KEYPAIR_PUBLIC_KEY);\r\n\tpublic static PublicKey getPublicKey(XdiContext<?> xdiContext, XDIAddress publicKeyRelativeAddress) throws GeneralSecurityException {\r\n\tpublic static PrivateKey getPrivateKey(XdiContext<?> xdiContext, XDIAddress privateKeyRelativeAddress) throws GeneralSecurityException {\r\n\tpublic static SecretKey getSecretKey(XdiContext<?> xdiContext, XDIAddress secretKeyRelativeAddress) throws GeneralSecurityException {\r\n\tpublic static String getKeyAlgorithm(XDIAddress dataTypeXri) {\r\n\t\tXDIArc keyAlgorithmXri = dataTypeXri.getNumArcs() > 0 ? dataTypeXri.getArc(0) : null;\r\n\tpublic static Integer getKeyLength(XDIAddress dataTypeXri) {\r\n\t\tXDIArc keyLengthXri = dataTypeXri.getNumArcs() > 1 ? dataTypeXri.getArc(1) : null;\r", "new_methods": [], "old_code": "import xdi2.core.xri3.XDI3Segment;\r\nimport xdi2.core.xri3.XDI3SubSegment;\r\n\t\treturn getPublicKey(xdiContext, XDIAuthenticationConstants.XRI_S_MSG_SIG_KEYPAIR_PUBLIC_KEY);\r\n\t\treturn getPublicKey(xdiContext, XDIAuthenticationConstants.XRI_S_MSG_ENCRYPT_KEYPAIR_PUBLIC_KEY);\r\n\t\treturn getPrivateKey(xdiContext, XDIAuthenticationConstants.XRI_S_MSG_SIG_KEYPAIR_PRIVATE_KEY);\r\n\t\treturn getPrivateKey(xdiContext, XDIAuthenticationConstants.XRI_S_MSG_ENCRYPT_KEYPAIR_PRIVATE_KEY);\r\n\t\treturn getSecretKey(xdiContext, XDIAuthenticationConstants.XRI_S_MSG_SIG_KEYPAIR_PUBLIC_KEY);\r\n\t\treturn getSecretKey(xdiContext, XDIAuthenticationConstants.XRI_S_MSG_ENCRYPT_KEYPAIR_PUBLIC_KEY);\r\n\tpublic static PublicKey getPublicKey(XdiContext<?> xdiContext, XDI3Segment publicKeyRelativeAddress) throws GeneralSecurityException {\r\n\tpublic static PrivateKey getPrivateKey(XdiContext<?> xdiContext, XDI3Segment privateKeyRelativeAddress) throws GeneralSecurityException {\r\n\tpublic static SecretKey getSecretKey(XdiContext<?> xdiContext, XDI3Segment secretKeyRelativeAddress) throws GeneralSecurityException {\r\n\tpublic static String getKeyAlgorithm(XDI3Segment dataTypeXri) {\r\n\t\tXDI3SubSegment keyAlgorithmXri = dataTypeXri.getNumSubSegments() > 0 ? dataTypeXri.getSubSegment(0) : null;\r\n\tpublic static Integer getKeyLength(XDI3Segment dataTypeXri) {\r\n\t\tXDI3SubSegment keyLengthXri = dataTypeXri.getNumSubSegments() > 1 ? dataTypeXri.getSubSegment(1) : null;\r", "old_methods": [], "patch": "@@ -18,8 +18,8 @@\n import xdi2.core.features.nodetypes.XdiAttribute;\r\n import xdi2.core.features.nodetypes.XdiContext;\r\n import xdi2.core.features.nodetypes.XdiValue;\r\n-import xdi2.core.xri3.XDI3Segment;\r\n-import xdi2.core.xri3.XDI3SubSegment;\r\n+import xdi2.core.syntax.XDIAddress;\r\n+import xdi2.core.syntax.XDIArc;\r\n \r\n public class Keys {\r\n \r\n@@ -32,7 +32,7 @@ private Keys() { }\n \t */\r\n \tpublic static PublicKey getSignaturePublicKey(XdiContext<?> xdiContext) throws GeneralSecurityException {\r\n \r\n-\t\treturn getPublicKey(xdiContext, XDIAuthenticationConstants.XRI_S_MSG_SIG_KEYPAIR_PUBLIC_KEY);\r\n+\t\treturn getPublicKey(xdiContext, XDIAuthenticationConstants.XDI_ADD_MSG_SIG_KEYPAIR_PUBLIC_KEY);\r\n \t}\r\n \r\n \t/**\r\n@@ -42,7 +42,7 @@ public static PublicKey getSignaturePublicKey(XdiContext<?> xdiContext) throws G\n \t */\r\n \tpublic static PublicKey getEncryptionPublicKey(XdiContext<?> xdiContext) throws GeneralSecurityException {\r\n \r\n-\t\treturn getPublicKey(xdiContext, XDIAuthenticationConstants.XRI_S_MSG_ENCRYPT_KEYPAIR_PUBLIC_KEY);\r\n+\t\treturn getPublicKey(xdiContext, XDIAuthenticationConstants.XDI_ADD_MSG_ENCRYPT_KEYPAIR_PUBLIC_KEY);\r\n \t}\r\n \r\n \t/**\r\n@@ -52,7 +52,7 @@ public static PublicKey getEncryptionPublicKey(XdiContext<?> xdiContext) throws\n \t */\r\n \tpublic static PrivateKey getSignaturePrivateKey(XdiContext<?> xdiContext) throws GeneralSecurityException {\r\n \r\n-\t\treturn getPrivateKey(xdiContext, XDIAuthenticationConstants.XRI_S_MSG_SIG_KEYPAIR_PRIVATE_KEY);\r\n+\t\treturn getPrivateKey(xdiContext, XDIAuthenticationConstants.XDI_ADD_MSG_SIG_KEYPAIR_PRIVATE_KEY);\r\n \t}\r\n \r\n \t/**\r\n@@ -62,7 +62,7 @@ public static PrivateKey getSignaturePrivateKey(XdiContext<?> xdiContext) throws\n \t */\r\n \tpublic static PrivateKey getEncryptionPrivateKey(XdiContext<?> xdiContext) throws GeneralSecurityException {\r\n \r\n-\t\treturn getPrivateKey(xdiContext, XDIAuthenticationConstants.XRI_S_MSG_ENCRYPT_KEYPAIR_PRIVATE_KEY);\r\n+\t\treturn getPrivateKey(xdiContext, XDIAuthenticationConstants.XDI_ADD_MSG_ENCRYPT_KEYPAIR_PRIVATE_KEY);\r\n \t}\r\n \r\n \t/**\r\n@@ -72,7 +72,7 @@ public static PrivateKey getEncryptionPrivateKey(XdiContext<?> xdiContext) throw\n \t */\r\n \tpublic static SecretKey getSignatureSecretKey(XdiContext<?> xdiContext) throws GeneralSecurityException {\r\n \r\n-\t\treturn getSecretKey(xdiContext, XDIAuthenticationConstants.XRI_S_MSG_SIG_KEYPAIR_PUBLIC_KEY);\r\n+\t\treturn getSecretKey(xdiContext, XDIAuthenticationConstants.XDI_ADD_MSG_SIG_KEYPAIR_PUBLIC_KEY);\r\n \t}\r\n \r\n \t/**\r\n@@ -82,15 +82,15 @@ public static SecretKey getSignatureSecretKey(XdiContext<?> xdiContext) throws G\n \t */\r\n \tpublic static SecretKey getEncryptionSecretKey(XdiContext<?> xdiContext) throws GeneralSecurityException {\r\n \r\n-\t\treturn getSecretKey(xdiContext, XDIAuthenticationConstants.XRI_S_MSG_ENCRYPT_KEYPAIR_PUBLIC_KEY);\r\n+\t\treturn getSecretKey(xdiContext, XDIAuthenticationConstants.XDI_ADD_MSG_ENCRYPT_KEYPAIR_PUBLIC_KEY);\r\n \t}\r\n \r\n \t/**\r\n \t * Given a context, get a public key.\r\n \t * @param graph The graph.\r\n \t * @return A public key.\r\n \t */\r\n-\tpublic static PublicKey getPublicKey(XdiContext<?> xdiContext, XDI3Segment publicKeyRelativeAddress) throws GeneralSecurityException {\r\n+\tpublic static PublicKey getPublicKey(XdiContext<?> xdiContext, XDIAddress publicKeyRelativeAddress) throws GeneralSecurityException {\r\n \r\n \t\t// find public key\r\n \r\n@@ -113,7 +113,7 @@ public static PublicKey getPublicKey(XdiContext<?> xdiContext, XDI3Segment publi\n \t * @param graph The graph.\r\n \t * @return A private key.\r\n \t */\r\n-\tpublic static PrivateKey getPrivateKey(XdiContext<?> xdiContext, XDI3Segment privateKeyRelativeAddress) throws GeneralSecurityException {\r\n+\tpublic static PrivateKey getPrivateKey(XdiContext<?> xdiContext, XDIAddress privateKeyRelativeAddress) throws GeneralSecurityException {\r\n \r\n \t\t// find private key\r\n \r\n@@ -136,7 +136,7 @@ public static PrivateKey getPrivateKey(XdiContext<?> xdiContext, XDI3Segment pri\n \t * @param graph The graph.\r\n \t * @return A secret key.\r\n \t */\r\n-\tpublic static SecretKey getSecretKey(XdiContext<?> xdiContext, XDI3Segment secretKeyRelativeAddress) throws GeneralSecurityException {\r\n+\tpublic static SecretKey getSecretKey(XdiContext<?> xdiContext, XDIAddress secretKeyRelativeAddress) throws GeneralSecurityException {\r\n \r\n \t\t// find secret key\r\n \r\n@@ -187,9 +187,9 @@ public static SecretKey secretKeyFromSecretKeyString(String secretKeyString) thr\n \t\treturn new SecretKeySpec(secretKeyBytes, 0, secretKeyBytes.length, \"AES\");\r\n \t}\r\n \r\n-\tpublic static String getKeyAlgorithm(XDI3Segment dataTypeXri) {\r\n+\tpublic static String getKeyAlgorithm(XDIAddress dataTypeXri) {\r\n \r\n-\t\tXDI3SubSegment keyAlgorithmXri = dataTypeXri.getNumSubSegments() > 0 ? dataTypeXri.getSubSegment(0) : null;\r\n+\t\tXDIArc keyAlgorithmXri = dataTypeXri.getNumArcs() > 0 ? dataTypeXri.getArc(0) : null;\r\n \t\tif (keyAlgorithmXri == null) return null;\r\n \r\n \t\tif (! XDIConstants.CS_CLASS_RESERVED.equals(keyAlgorithmXri.getCs())) return null;\r\n@@ -199,9 +199,9 @@ public static String getKeyAlgorithm(XDI3Segment dataTypeXri) {\n \t\treturn keyAlgorithmXri.getLiteral();\r\n \t}\r\n \r\n-\tpublic static Integer getKeyLength(XDI3Segment dataTypeXri) {\r\n+\tpublic static Integer getKeyLength(XDIAddress dataTypeXri) {\r\n \r\n-\t\tXDI3SubSegment keyLengthXri = dataTypeXri.getNumSubSegments() > 1 ? dataTypeXri.getSubSegment(1) : null;\r\n+\t\tXDIArc keyLengthXri = dataTypeXri.getNumArcs() > 1 ? dataTypeXri.getArc(1) : null;\r\n \t\tif (keyLengthXri == null) return null;\r\n \r\n \t\tif (! XDIConstants.CS_CLASS_RESERVED.equals(keyLengthXri.getCs())) return null;\r", "raw_url": "https://github.com/projectdanube/xdi2/raw/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Fkeys%2FKeys.java", "sha": "a3833de0fee3a52a77278e13752e1d0524e61b6d", "status": "modified" }, { "additions": 32, "blob_url": "https://github.com/projectdanube/xdi2/blob/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Flinkcontracts%2FGenericLinkContract.java", "changes": 64, "contents_url": "https://api.github.com/repos/projectdanube/xdi2/contents/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Flinkcontracts%2FGenericLinkContract.java?ref=0ca7982fec30c2bb8204efbbea61428a643d2e9c", "deletions": 32, "filename": "core/src/main/java/xdi2/core/features/linkcontracts/GenericLinkContract.java", "new_code": "import xdi2.core.syntax.XDIAddress;\r\nimport xdi2.core.syntax.XDIArc;\r\nimport xdi2.core.util.AddressUtil;\r\n\t\t\tif (! ((XdiEntitySingleton) xdiEntity).getArc().equals(XDILinkContractConstants.XDI_ARC_DO)) return false;\r\n\t\t\tif (! ((XdiEntityMember) xdiEntity).getXdiCollection().getArc().equals(XDILinkContractConstants.XDI_ARC_EC_DO)) return false;\r\n\tpublic static XDIAddress createGenericLinkContractXri(XDIAddress authorizingAuthority, XDIAddress requestingAuthority, XDIAddress templateAuthorityAndId) {\r\n\t\tList<XDIArc> genericLinkContractarcs = new ArrayList<XDIArc> ();\r\n\t\tXDIArc linkContractInnerRootarc = XdiInnerRoot.createInnerRootarc(\r\n\t\tgenericLinkContractarcs.add(linkContractInnerRootarc);\r\n\t\t\tgenericLinkContractarcs.addAll(templateAuthorityAndId.getArcs());\r\n\t\tgenericLinkContractarcs.add(XDILinkContractConstants.XDI_ARC_DO);\r\n\t\treturn XDIAddress.fromComponents(genericLinkContractarcs);\r\n\tpublic static GenericLinkContract findGenericLinkContract(Graph graph, XDIAddress authorizingAuthority, XDIAddress requestingAuthority, XDIAddress templateAuthorityAndId, boolean create) {\r\n\t\tXDIAddress genericLinkContractXri = createGenericLinkContractXri(authorizingAuthority, requestingAuthority, templateAuthorityAndId);\r\n\tpublic static XDIAddress getAuthorizingAuthority(XDIAddress xri) {\r\n\t\tXDIArc linkContractInnerRootarc = xri.getFirstArc();\r\n\t\tif (! XdiInnerRoot.isInnerRootarc(linkContractInnerRootarc)) return null;\r\n\t\treturn XdiInnerRoot.getSubjectOfInnerRootXri(linkContractInnerRootarc);\r\n\tpublic static XDIAddress getRequestingAuthority(XDIAddress xri) {\r\n\t\tXDIArc linkContractInnerRootarc = xri.getFirstArc();\r\n\t\tif (! XdiInnerRoot.isInnerRootarc(linkContractInnerRootarc)) return null;\r\n\t\treturn XdiInnerRoot.getPredicateOfInnerRootXri(linkContractInnerRootarc);\r\n\tpublic static XDIAddress getTemplateAuthorityAndId(XDIAddress xri) {\r\n\t\tint index = AddressUtil.indexOfXri(xri, XDILinkContractConstants.XDI_ARC_DO);\r\n\t\tif (index < 0) index = AddressUtil.indexOfXri(xri, XdiEntityCollection.createarc(XDILinkContractConstants.XDI_ARC_DO));\r\n\t\treturn AddressUtil.subXri(xri, 1, index);\r\n\tpublic XDIAddress getAuthorizingAuthority() {\r\n\t\treturn getAuthorizingAuthority(this.getContextNode().getAddress());\r\n\tpublic XDIAddress getRequestingAuthority() {\r\n\t\treturn getRequestingAuthority(this.getContextNode().getAddress());\r\n\tpublic XDIAddress getTemplateAuthorityAndId() {\r\n\t\treturn getTemplateAuthorityAndId(this.getContextNode().getAddress());\r", "new_methods": [], "old_code": "import xdi2.core.util.XDI3Util;\r\nimport xdi2.core.xri3.XDI3Segment;\r\nimport xdi2.core.xri3.XDI3SubSegment;\r\n\t\t\tif (! ((XdiEntitySingleton) xdiEntity).getArcXri().equals(XDILinkContractConstants.XRI_SS_DO)) return false;\r\n\t\t\tif (! ((XdiEntityMember) xdiEntity).getXdiCollection().getArcXri().equals(XDILinkContractConstants.XRI_SS_EC_DO)) return false;\r\n\tpublic static XDI3Segment createGenericLinkContractXri(XDI3Segment authorizingAuthority, XDI3Segment requestingAuthority, XDI3Segment templateAuthorityAndId) {\r\n\t\tList<XDI3SubSegment> genericLinkContractArcXris = new ArrayList<XDI3SubSegment> ();\r\n\t\tXDI3SubSegment linkContractInnerRootArcXri = XdiInnerRoot.createInnerRootArcXri(\r\n\t\tgenericLinkContractArcXris.add(linkContractInnerRootArcXri);\r\n\t\t\tgenericLinkContractArcXris.addAll(templateAuthorityAndId.getSubSegments());\r\n\t\tgenericLinkContractArcXris.add(XDILinkContractConstants.XRI_SS_DO);\r\n\t\treturn XDI3Segment.fromComponents(genericLinkContractArcXris);\r\n\tpublic static GenericLinkContract findGenericLinkContract(Graph graph, XDI3Segment authorizingAuthority, XDI3Segment requestingAuthority, XDI3Segment templateAuthorityAndId, boolean create) {\r\n\t\tXDI3Segment genericLinkContractXri = createGenericLinkContractXri(authorizingAuthority, requestingAuthority, templateAuthorityAndId);\r\n\tpublic static XDI3Segment getAuthorizingAuthority(XDI3Segment xri) {\r\n\t\tXDI3SubSegment linkContractInnerRootArcXri = xri.getFirstSubSegment();\r\n\t\tif (! XdiInnerRoot.isInnerRootArcXri(linkContractInnerRootArcXri)) return null;\r\n\t\treturn XdiInnerRoot.getSubjectOfInnerRootXri(linkContractInnerRootArcXri);\r\n\tpublic static XDI3Segment getRequestingAuthority(XDI3Segment xri) {\r\n\t\tXDI3SubSegment linkContractInnerRootArcXri = xri.getFirstSubSegment();\r\n\t\tif (! XdiInnerRoot.isInnerRootArcXri(linkContractInnerRootArcXri)) return null;\r\n\t\treturn XdiInnerRoot.getPredicateOfInnerRootXri(linkContractInnerRootArcXri);\r\n\tpublic static XDI3Segment getTemplateAuthorityAndId(XDI3Segment xri) {\r\n\t\tint index = XDI3Util.indexOfXri(xri, XDILinkContractConstants.XRI_SS_DO);\r\n\t\tif (index < 0) index = XDI3Util.indexOfXri(xri, XdiEntityCollection.createArcXri(XDILinkContractConstants.XRI_SS_DO));\r\n\t\treturn XDI3Util.subXri(xri, 1, index);\r\n\tpublic XDI3Segment getAuthorizingAuthority() {\r\n\t\treturn getAuthorizingAuthority(this.getContextNode().getXri());\r\n\tpublic XDI3Segment getRequestingAuthority() {\r\n\t\treturn getRequestingAuthority(this.getContextNode().getXri());\r\n\tpublic XDI3Segment getTemplateAuthorityAndId() {\r\n\t\treturn getTemplateAuthorityAndId(this.getContextNode().getXri());\r", "old_methods": [], "patch": "@@ -12,9 +12,9 @@\n import xdi2.core.features.nodetypes.XdiEntityMember;\r\n import xdi2.core.features.nodetypes.XdiEntitySingleton;\r\n import xdi2.core.features.nodetypes.XdiInnerRoot;\r\n-import xdi2.core.util.XDI3Util;\r\n-import xdi2.core.xri3.XDI3Segment;\r\n-import xdi2.core.xri3.XDI3SubSegment;\r\n+import xdi2.core.syntax.XDIAddress;\r\n+import xdi2.core.syntax.XDIArc;\r\n+import xdi2.core.util.AddressUtil;\r\n \r\n /**\r\n * An XDI generic link contract, represented as an XDI entity.\r\n@@ -43,15 +43,15 @@ public static boolean isValid(XdiEntity xdiEntity) {\n \r\n \t\tif (xdiEntity instanceof XdiEntitySingleton) {\r\n \r\n-\t\t\tif (! ((XdiEntitySingleton) xdiEntity).getArcXri().equals(XDILinkContractConstants.XRI_SS_DO)) return false;\r\n+\t\t\tif (! ((XdiEntitySingleton) xdiEntity).getArc().equals(XDILinkContractConstants.XDI_ARC_DO)) return false;\r\n \r\n \t\t\tif (getAuthorizingAuthority(xdiEntity.getXri()) == null) return false;\r\n \t\t\tif (getRequestingAuthority(xdiEntity.getXri()) == null) return false;\r\n \r\n \t\t\treturn true;\r\n \t\t} else if (xdiEntity instanceof XdiEntityMember) {\r\n \r\n-\t\t\tif (! ((XdiEntityMember) xdiEntity).getXdiCollection().getArcXri().equals(XDILinkContractConstants.XRI_SS_EC_DO)) return false;\r\n+\t\t\tif (! ((XdiEntityMember) xdiEntity).getXdiCollection().getArc().equals(XDILinkContractConstants.XDI_ARC_EC_DO)) return false;\r\n \r\n \t\t\tif (getAuthorizingAuthority(xdiEntity.getXri()) == null) return false;\r\n \t\t\tif (getRequestingAuthority(xdiEntity.getXri()) == null) return false;\r\n@@ -75,36 +75,36 @@ public static GenericLinkContract fromXdiEntity(XdiEntity xdiEntity) {\n \t\treturn new GenericLinkContract(xdiEntity);\r\n \t}\r\n \r\n-\tpublic static XDI3Segment createGenericLinkContractXri(XDI3Segment authorizingAuthority, XDI3Segment requestingAuthority, XDI3Segment templateAuthorityAndId) {\r\n+\tpublic static XDIAddress createGenericLinkContractXri(XDIAddress authorizingAuthority, XDIAddress requestingAuthority, XDIAddress templateAuthorityAndId) {\r\n \r\n \t\tif (authorizingAuthority == null) throw new NullPointerException();\r\n \t\tif (requestingAuthority == null) throw new NullPointerException();\r\n \r\n-\t\tList<XDI3SubSegment> genericLinkContractArcXris = new ArrayList<XDI3SubSegment> ();\r\n+\t\tList<XDIArc> genericLinkContractarcs = new ArrayList<XDIArc> ();\r\n \r\n-\t\tXDI3SubSegment linkContractInnerRootArcXri = XdiInnerRoot.createInnerRootArcXri(\r\n+\t\tXDIArc linkContractInnerRootarc = XdiInnerRoot.createInnerRootarc(\r\n \t\t\t\tauthorizingAuthority, \r\n \t\t\t\trequestingAuthority);\r\n \r\n-\t\tgenericLinkContractArcXris.add(linkContractInnerRootArcXri);\r\n+\t\tgenericLinkContractarcs.add(linkContractInnerRootarc);\r\n \r\n \t\tif (templateAuthorityAndId != null) {\r\n \r\n-\t\t\tgenericLinkContractArcXris.addAll(templateAuthorityAndId.getSubSegments());\r\n+\t\t\tgenericLinkContractarcs.addAll(templateAuthorityAndId.getArcs());\r\n \t\t}\r\n \r\n-\t\tgenericLinkContractArcXris.add(XDILinkContractConstants.XRI_SS_DO);\r\n+\t\tgenericLinkContractarcs.add(XDILinkContractConstants.XDI_ARC_DO);\r\n \r\n-\t\treturn XDI3Segment.fromComponents(genericLinkContractArcXris);\r\n+\t\treturn XDIAddress.fromComponents(genericLinkContractarcs);\r\n \t}\r\n \r\n \t/**\r\n \t * Factory method that finds or creates an XDI generic link contract for a graph.\r\n \t * @return The XDI generic link contract.\r\n \t */\r\n-\tpublic static GenericLinkContract findGenericLinkContract(Graph graph, XDI3Segment authorizingAuthority, XDI3Segment requestingAuthority, XDI3Segment templateAuthorityAndId, boolean create) {\r\n+\tpublic static GenericLinkContract findGenericLinkContract(Graph graph, XDIAddress authorizingAuthority, XDIAddress requestingAuthority, XDIAddress templateAuthorityAndId, boolean create) {\r\n \r\n-\t\tXDI3Segment genericLinkContractXri = createGenericLinkContractXri(authorizingAuthority, requestingAuthority, templateAuthorityAndId);\r\n+\t\tXDIAddress genericLinkContractXri = createGenericLinkContractXri(authorizingAuthority, requestingAuthority, templateAuthorityAndId);\r\n \r\n \t\tContextNode genericLinkContractContextNode = create ? graph.setDeepContextNode(genericLinkContractXri) : graph.getDeepContextNode(genericLinkContractXri, true);\r\n \t\tif (genericLinkContractContextNode == null) return null;\r\n@@ -116,46 +116,46 @@ public static GenericLinkContract findGenericLinkContract(Graph graph, XDI3Segme\n \t * Static methods\r\n \t */\r\n \r\n-\tpublic static XDI3Segment getAuthorizingAuthority(XDI3Segment xri) {\r\n+\tpublic static XDIAddress getAuthorizingAuthority(XDIAddress xri) {\r\n \r\n-\t\tXDI3SubSegment linkContractInnerRootArcXri = xri.getFirstSubSegment();\r\n-\t\tif (! XdiInnerRoot.isInnerRootArcXri(linkContractInnerRootArcXri)) return null;\r\n+\t\tXDIArc linkContractInnerRootarc = xri.getFirstArc();\r\n+\t\tif (! XdiInnerRoot.isInnerRootarc(linkContractInnerRootarc)) return null;\r\n \r\n-\t\treturn XdiInnerRoot.getSubjectOfInnerRootXri(linkContractInnerRootArcXri);\r\n+\t\treturn XdiInnerRoot.getSubjectOfInnerRootXri(linkContractInnerRootarc);\r\n \t}\r\n \r\n-\tpublic static XDI3Segment getRequestingAuthority(XDI3Segment xri) {\r\n+\tpublic static XDIAddress getRequestingAuthority(XDIAddress xri) {\r\n \r\n-\t\tXDI3SubSegment linkContractInnerRootArcXri = xri.getFirstSubSegment();\r\n-\t\tif (! XdiInnerRoot.isInnerRootArcXri(linkContractInnerRootArcXri)) return null;\r\n+\t\tXDIArc linkContractInnerRootarc = xri.getFirstArc();\r\n+\t\tif (! XdiInnerRoot.isInnerRootarc(linkContractInnerRootarc)) return null;\r\n \r\n-\t\treturn XdiInnerRoot.getPredicateOfInnerRootXri(linkContractInnerRootArcXri);\r\n+\t\treturn XdiInnerRoot.getPredicateOfInnerRootXri(linkContractInnerRootarc);\r\n \t}\r\n \r\n-\tpublic static XDI3Segment getTemplateAuthorityAndId(XDI3Segment xri) {\r\n+\tpublic static XDIAddress getTemplateAuthorityAndId(XDIAddress xri) {\r\n \r\n-\t\tint index = XDI3Util.indexOfXri(xri, XDILinkContractConstants.XRI_SS_DO);\r\n-\t\tif (index < 0) index = XDI3Util.indexOfXri(xri, XdiEntityCollection.createArcXri(XDILinkContractConstants.XRI_SS_DO));\r\n+\t\tint index = AddressUtil.indexOfXri(xri, XDILinkContractConstants.XDI_ARC_DO);\r\n+\t\tif (index < 0) index = AddressUtil.indexOfXri(xri, XdiEntityCollection.createarc(XDILinkContractConstants.XDI_ARC_DO));\r\n \r\n-\t\treturn XDI3Util.subXri(xri, 1, index);\r\n+\t\treturn AddressUtil.subXri(xri, 1, index);\r\n \t}\r\n \r\n \t/*\r\n \t * Instance methods\r\n \t */\r\n \r\n-\tpublic XDI3Segment getAuthorizingAuthority() {\r\n+\tpublic XDIAddress getAuthorizingAuthority() {\r\n \r\n-\t\treturn getAuthorizingAuthority(this.getContextNode().getXri());\r\n+\t\treturn getAuthorizingAuthority(this.getContextNode().getAddress());\r\n \t}\r\n \r\n-\tpublic XDI3Segment getRequestingAuthority() {\r\n+\tpublic XDIAddress getRequestingAuthority() {\r\n \r\n-\t\treturn getRequestingAuthority(this.getContextNode().getXri());\r\n+\t\treturn getRequestingAuthority(this.getContextNode().getAddress());\r\n \t}\r\n \r\n-\tpublic XDI3Segment getTemplateAuthorityAndId() {\r\n+\tpublic XDIAddress getTemplateAuthorityAndId() {\r\n \r\n-\t\treturn getTemplateAuthorityAndId(this.getContextNode().getXri());\r\n+\t\treturn getTemplateAuthorityAndId(this.getContextNode().getAddress());\r\n \t}\r\n }\r", "raw_url": "https://github.com/projectdanube/xdi2/raw/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Flinkcontracts%2FGenericLinkContract.java", "sha": "f8484f63a6d03d11dc2e18d2468f8de367a3a6b2", "status": "modified" }, { "additions": 29, "blob_url": "https://github.com/projectdanube/xdi2/blob/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Flinkcontracts%2FGovernorLinkContract.java", "changes": 58, "contents_url": "https://api.github.com/repos/projectdanube/xdi2/contents/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Flinkcontracts%2FGovernorLinkContract.java?ref=0ca7982fec30c2bb8204efbbea61428a643d2e9c", "deletions": 29, "filename": "core/src/main/java/xdi2/core/features/linkcontracts/GovernorLinkContract.java", "new_code": "import xdi2.core.syntax.XDIAddress;\r\nimport xdi2.core.syntax.XDIArc;\r\nimport xdi2.core.util.AddressUtil;\r\n\t\t\tif (! ((XdiEntitySingleton) xdiEntity).getArc().equals(XDILinkContractConstants.XDI_ARC_DO)) return false;\r\n\t\t\tif (! ((XdiEntityMember) xdiEntity).getXdiCollection().getArc().equals(XDILinkContractConstants.XDI_ARC_EC_DO)) return false;\r\n\tpublic static XDIAddress createGovernorLinkContractXri(XDIAddress requestingAuthority, XDIAddress templateAuthorityAndId) {\r\n\t\tList<XDIArc> governorLinkContractarcs = new ArrayList<XDIArc> ();\r\n\t\tXDIArc linkContractInnerRootarc = XdiInnerRoot.createInnerRootarc(\r\n\t\t\t\tAddressUtil.concatAddresses(templateAuthorityAndId, XDILinkContractConstants.XDI_ARC_DO_VARIABLE));\r\n\t\tgovernorLinkContractarcs.add(linkContractInnerRootarc);\r\n\t\tgovernorLinkContractarcs.add(XDILinkContractConstants.XDI_ARC_DO);\r\n\t\treturn XDIAddress.fromComponents(governorLinkContractarcs);\r\n\tpublic static GovernorLinkContract findGovernorLinkContract(Graph graph, XDIAddress requestingAuthority, XDIAddress templateAuthorityAndId, boolean create) {\r\n\t\tXDIAddress governorLinkContractXri = createGovernorLinkContractXri(requestingAuthority, templateAuthorityAndId);\r\n\tpublic static XDIAddress getRequestingAuthority(XDIAddress xri) {\r\n\t\tXDIArc linkContractInnerRootarc = xri.getFirstArc();\r\n\t\tif (! XdiInnerRoot.isInnerRootarc(linkContractInnerRootarc)) return null;\r\n\t\tXDIAddress subjectXri = XdiInnerRoot.getSubjectOfInnerRootXri(linkContractInnerRootarc);\r\n\t\tXDIAddress requestingAuthority = subjectXri;\r\n\tpublic static XDIAddress getTemplateAuthorityAndId(XDIAddress xri) {\r\n\t\tXDIArc linkContractInnerRootarc = xri.getFirstArc();\r\n\t\tif (! XdiInnerRoot.isInnerRootarc(linkContractInnerRootarc)) return null;\r\n\t\tXDIAddress predicateXri = XdiInnerRoot.getPredicateOfInnerRootXri(linkContractInnerRootarc);\r\n\t\tif (AddressUtil.endsWith(predicateXri, XDILinkContractConstants.XDI_ADD_DO_VARIABLE) == null) return null;\r\n\t\tXDIAddress templateAuthorityAndId = AddressUtil.parentXri(predicateXri, -1);\r\n\tpublic XDIAddress getRequestingAuthority() {\r\n\t\treturn getRequestingAuthority(this.getContextNode().getAddress());\r\n\tpublic XDIAddress getTemplateAuthorityAndId() {\r\n\t\treturn getTemplateAuthorityAndId(this.getContextNode().getAddress());\r", "new_methods": [], "old_code": "import xdi2.core.util.XDI3Util;\r\nimport xdi2.core.xri3.XDI3Segment;\r\nimport xdi2.core.xri3.XDI3SubSegment;\r\n\t\t\tif (! ((XdiEntitySingleton) xdiEntity).getArcXri().equals(XDILinkContractConstants.XRI_SS_DO)) return false;\r\n\t\t\tif (! ((XdiEntityMember) xdiEntity).getXdiCollection().getArcXri().equals(XDILinkContractConstants.XRI_SS_EC_DO)) return false;\r\n\tpublic static XDI3Segment createGovernorLinkContractXri(XDI3Segment requestingAuthority, XDI3Segment templateAuthorityAndId) {\r\n\t\tList<XDI3SubSegment> governorLinkContractArcXris = new ArrayList<XDI3SubSegment> ();\r\n\t\tXDI3SubSegment linkContractInnerRootArcXri = XdiInnerRoot.createInnerRootArcXri(\r\n\t\t\t\tXDI3Util.concatXris(templateAuthorityAndId, XDILinkContractConstants.XRI_SS_DO_VARIABLE));\r\n\t\tgovernorLinkContractArcXris.add(linkContractInnerRootArcXri);\r\n\t\tgovernorLinkContractArcXris.add(XDILinkContractConstants.XRI_SS_DO);\r\n\t\treturn XDI3Segment.fromComponents(governorLinkContractArcXris);\r\n\tpublic static GovernorLinkContract findGovernorLinkContract(Graph graph, XDI3Segment requestingAuthority, XDI3Segment templateAuthorityAndId, boolean create) {\r\n\t\tXDI3Segment governorLinkContractXri = createGovernorLinkContractXri(requestingAuthority, templateAuthorityAndId);\r\n\tpublic static XDI3Segment getRequestingAuthority(XDI3Segment xri) {\r\n\t\tXDI3SubSegment linkContractInnerRootArcXri = xri.getFirstSubSegment();\r\n\t\tif (! XdiInnerRoot.isInnerRootArcXri(linkContractInnerRootArcXri)) return null;\r\n\t\tXDI3Segment subjectXri = XdiInnerRoot.getSubjectOfInnerRootXri(linkContractInnerRootArcXri);\r\n\t\tXDI3Segment requestingAuthority = subjectXri;\r\n\tpublic static XDI3Segment getTemplateAuthorityAndId(XDI3Segment xri) {\r\n\t\tXDI3SubSegment linkContractInnerRootArcXri = xri.getFirstSubSegment();\r\n\t\tif (! XdiInnerRoot.isInnerRootArcXri(linkContractInnerRootArcXri)) return null;\r\n\t\tXDI3Segment predicateXri = XdiInnerRoot.getPredicateOfInnerRootXri(linkContractInnerRootArcXri);\r\n\t\tif (XDI3Util.endsWith(predicateXri, XDILinkContractConstants.XRI_S_DO_VARIABLE) == null) return null;\r\n\t\tXDI3Segment templateAuthorityAndId = XDI3Util.parentXri(predicateXri, -1);\r\n\tpublic XDI3Segment getRequestingAuthority() {\r\n\t\treturn getRequestingAuthority(this.getContextNode().getXri());\r\n\tpublic XDI3Segment getTemplateAuthorityAndId() {\r\n\t\treturn getTemplateAuthorityAndId(this.getContextNode().getXri());\r", "old_methods": [], "patch": "@@ -11,9 +11,9 @@\n import xdi2.core.features.nodetypes.XdiEntityMember;\r\n import xdi2.core.features.nodetypes.XdiEntitySingleton;\r\n import xdi2.core.features.nodetypes.XdiInnerRoot;\r\n-import xdi2.core.util.XDI3Util;\r\n-import xdi2.core.xri3.XDI3Segment;\r\n-import xdi2.core.xri3.XDI3SubSegment;\r\n+import xdi2.core.syntax.XDIAddress;\r\n+import xdi2.core.syntax.XDIArc;\r\n+import xdi2.core.util.AddressUtil;\r\n \r\n /**\r\n * An XDI governor link contract, represented as an XDI entity.\r\n@@ -42,15 +42,15 @@ public static boolean isValid(XdiEntity xdiEntity) {\n \r\n \t\tif (xdiEntity instanceof XdiEntitySingleton) {\r\n \r\n-\t\t\tif (! ((XdiEntitySingleton) xdiEntity).getArcXri().equals(XDILinkContractConstants.XRI_SS_DO)) return false;\r\n+\t\t\tif (! ((XdiEntitySingleton) xdiEntity).getArc().equals(XDILinkContractConstants.XDI_ARC_DO)) return false;\r\n \r\n \t\t\tif (getRequestingAuthority(xdiEntity.getXri()) == null) return false;\r\n \t\t\tif (getTemplateAuthorityAndId(xdiEntity.getXri()) == null) return false;\r\n \r\n \t\t\treturn true;\r\n \t\t} else if (xdiEntity instanceof XdiEntityMember) {\r\n \r\n-\t\t\tif (! ((XdiEntityMember) xdiEntity).getXdiCollection().getArcXri().equals(XDILinkContractConstants.XRI_SS_EC_DO)) return false;\r\n+\t\t\tif (! ((XdiEntityMember) xdiEntity).getXdiCollection().getArc().equals(XDILinkContractConstants.XDI_ARC_EC_DO)) return false;\r\n \r\n \t\t\tif (getRequestingAuthority(xdiEntity.getXri()) == null) return false;\r\n \t\t\tif (getTemplateAuthorityAndId(xdiEntity.getXri()) == null) return false;\r\n@@ -74,31 +74,31 @@ public static GovernorLinkContract fromXdiEntity(XdiEntity xdiEntity) {\n \t\treturn new GovernorLinkContract(xdiEntity);\r\n \t}\r\n \r\n-\tpublic static XDI3Segment createGovernorLinkContractXri(XDI3Segment requestingAuthority, XDI3Segment templateAuthorityAndId) {\r\n+\tpublic static XDIAddress createGovernorLinkContractXri(XDIAddress requestingAuthority, XDIAddress templateAuthorityAndId) {\r\n \r\n \t\tif (requestingAuthority == null) throw new NullPointerException();\r\n \t\tif (templateAuthorityAndId == null) throw new NullPointerException();\r\n \r\n-\t\tList<XDI3SubSegment> governorLinkContractArcXris = new ArrayList<XDI3SubSegment> ();\r\n+\t\tList<XDIArc> governorLinkContractarcs = new ArrayList<XDIArc> ();\r\n \r\n-\t\tXDI3SubSegment linkContractInnerRootArcXri = XdiInnerRoot.createInnerRootArcXri(\r\n+\t\tXDIArc linkContractInnerRootarc = XdiInnerRoot.createInnerRootarc(\r\n \t\t\t\trequestingAuthority, \r\n-\t\t\t\tXDI3Util.concatXris(templateAuthorityAndId, XDILinkContractConstants.XRI_SS_DO_VARIABLE));\r\n+\t\t\t\tAddressUtil.concatAddresses(templateAuthorityAndId, XDILinkContractConstants.XDI_ARC_DO_VARIABLE));\r\n \r\n-\t\tgovernorLinkContractArcXris.add(linkContractInnerRootArcXri);\r\n+\t\tgovernorLinkContractarcs.add(linkContractInnerRootarc);\r\n \r\n-\t\tgovernorLinkContractArcXris.add(XDILinkContractConstants.XRI_SS_DO);\r\n+\t\tgovernorLinkContractarcs.add(XDILinkContractConstants.XDI_ARC_DO);\r\n \r\n-\t\treturn XDI3Segment.fromComponents(governorLinkContractArcXris);\r\n+\t\treturn XDIAddress.fromComponents(governorLinkContractarcs);\r\n \t}\r\n \r\n \t/**\r\n \t * Factory method that finds or creates an XDI governor link contract for a graph.\r\n \t * @return The XDI governor link contract.\r\n \t */\r\n-\tpublic static GovernorLinkContract findGovernorLinkContract(Graph graph, XDI3Segment requestingAuthority, XDI3Segment templateAuthorityAndId, boolean create) {\r\n+\tpublic static GovernorLinkContract findGovernorLinkContract(Graph graph, XDIAddress requestingAuthority, XDIAddress templateAuthorityAndId, boolean create) {\r\n \r\n-\t\tXDI3Segment governorLinkContractXri = createGovernorLinkContractXri(requestingAuthority, templateAuthorityAndId);\r\n+\t\tXDIAddress governorLinkContractXri = createGovernorLinkContractXri(requestingAuthority, templateAuthorityAndId);\r\n \r\n \t\tContextNode governorLinkContractContextNode = create ? graph.setDeepContextNode(governorLinkContractXri) : graph.getDeepContextNode(governorLinkContractXri, true);\r\n \t\tif (governorLinkContractContextNode == null) return null;\r\n@@ -110,26 +110,26 @@ public static GovernorLinkContract findGovernorLinkContract(Graph graph, XDI3Seg\n \t * Static methods\r\n \t */\r\n \r\n-\tpublic static XDI3Segment getRequestingAuthority(XDI3Segment xri) {\r\n+\tpublic static XDIAddress getRequestingAuthority(XDIAddress xri) {\r\n \r\n-\t\tXDI3SubSegment linkContractInnerRootArcXri = xri.getFirstSubSegment();\r\n-\t\tif (! XdiInnerRoot.isInnerRootArcXri(linkContractInnerRootArcXri)) return null;\r\n+\t\tXDIArc linkContractInnerRootarc = xri.getFirstArc();\r\n+\t\tif (! XdiInnerRoot.isInnerRootarc(linkContractInnerRootarc)) return null;\r\n \r\n-\t\tXDI3Segment subjectXri = XdiInnerRoot.getSubjectOfInnerRootXri(linkContractInnerRootArcXri);\r\n-\t\tXDI3Segment requestingAuthority = subjectXri;\r\n+\t\tXDIAddress subjectXri = XdiInnerRoot.getSubjectOfInnerRootXri(linkContractInnerRootarc);\r\n+\t\tXDIAddress requestingAuthority = subjectXri;\r\n \r\n \t\treturn requestingAuthority;\r\n \t}\r\n \r\n-\tpublic static XDI3Segment getTemplateAuthorityAndId(XDI3Segment xri) {\r\n+\tpublic static XDIAddress getTemplateAuthorityAndId(XDIAddress xri) {\r\n \r\n-\t\tXDI3SubSegment linkContractInnerRootArcXri = xri.getFirstSubSegment();\r\n-\t\tif (! XdiInnerRoot.isInnerRootArcXri(linkContractInnerRootArcXri)) return null;\r\n+\t\tXDIArc linkContractInnerRootarc = xri.getFirstArc();\r\n+\t\tif (! XdiInnerRoot.isInnerRootarc(linkContractInnerRootarc)) return null;\r\n \r\n-\t\tXDI3Segment predicateXri = XdiInnerRoot.getPredicateOfInnerRootXri(linkContractInnerRootArcXri);\r\n-\t\tif (XDI3Util.endsWith(predicateXri, XDILinkContractConstants.XRI_S_DO_VARIABLE) == null) return null;\r\n+\t\tXDIAddress predicateXri = XdiInnerRoot.getPredicateOfInnerRootXri(linkContractInnerRootarc);\r\n+\t\tif (AddressUtil.endsWith(predicateXri, XDILinkContractConstants.XDI_ADD_DO_VARIABLE) == null) return null;\r\n \r\n-\t\tXDI3Segment templateAuthorityAndId = XDI3Util.parentXri(predicateXri, -1);\r\n+\t\tXDIAddress templateAuthorityAndId = AddressUtil.parentXri(predicateXri, -1);\r\n \r\n \t\treturn templateAuthorityAndId;\r\n \t}\r\n@@ -138,13 +138,13 @@ public static XDI3Segment getTemplateAuthorityAndId(XDI3Segment xri) {\n \t * Instance methods\r\n \t */\r\n \r\n-\tpublic XDI3Segment getRequestingAuthority() {\r\n+\tpublic XDIAddress getRequestingAuthority() {\r\n \r\n-\t\treturn getRequestingAuthority(this.getContextNode().getXri());\r\n+\t\treturn getRequestingAuthority(this.getContextNode().getAddress());\r\n \t}\r\n \r\n-\tpublic XDI3Segment getTemplateAuthorityAndId() {\r\n+\tpublic XDIAddress getTemplateAuthorityAndId() {\r\n \r\n-\t\treturn getTemplateAuthorityAndId(this.getContextNode().getXri());\r\n+\t\treturn getTemplateAuthorityAndId(this.getContextNode().getAddress());\r\n \t}\r\n }\r", "raw_url": "https://github.com/projectdanube/xdi2/raw/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Flinkcontracts%2FGovernorLinkContract.java", "sha": "aa5c60f5775d786d901c0e4875ea95bf4748ebdc", "status": "modified" }, { "additions": 35, "blob_url": "https://github.com/projectdanube/xdi2/blob/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Flinkcontracts%2FLinkContractBase.java", "changes": 70, "contents_url": "https://api.github.com/repos/projectdanube/xdi2/contents/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Flinkcontracts%2FLinkContractBase.java?ref=0ca7982fec30c2bb8204efbbea61428a643d2e9c", "deletions": 35, "filename": "core/src/main/java/xdi2/core/features/linkcontracts/LinkContractBase.java", "new_code": "import xdi2.core.syntax.XDIAddress;\r\nimport xdi2.core.syntax.XDIStatement;\r\nimport xdi2.core.util.AddressUtil;\r\nimport xdi2.core.util.iterators.MappingRelationTargetContextNodeAddressIterator;\r\nimport xdi2.core.util.iterators.MappingStatementIterator;\r\n\t\tXdiEntitySingleton xdiEntitySingleton = this.getXdiEntity().getXdiEntitySingleton(XdiEntitySingleton.createarc(XDIPolicyConstants.XDI_ARC_IF), create);\r\n\tpublic void setPermissionTargetAddress(XDIAddress permissionXri, XDIAddress targetAddress) {\r\n\t\tif (this.getContextNode().containsRelation(XDILinkContractConstants.XDI_ADD_ALL, targetAddress)) return;\r\n\t\tif (permissionXri.equals(XDILinkContractConstants.XDI_ADD_ALL)) {\r\n\t\t\tthis.getContextNode().delRelation(XDILinkContractConstants.XDI_ADD_GET, targetAddress);\r\n\t\t\tthis.getContextNode().delRelation(XDILinkContractConstants.XDI_ADD_SET, targetAddress);\r\n\t\t\tthis.getContextNode().delRelation(XDILinkContractConstants.XDI_ADD_SET_DO, targetAddress);\r\n\t\t\tthis.getContextNode().delRelation(XDILinkContractConstants.XDI_ADD_SET_REF, targetAddress);\r\n\t\t\tthis.getContextNode().delRelation(XDILinkContractConstants.XDI_ADD_DEL, targetAddress);\r\n\tpublic void setNegativePermissionTargetAddress(XDIAddress permissionXri, XDIAddress targetAddress) {\r\n\t\tthis.setPermissionTargetAddress(AddressUtil.concatAddresses(XDILinkContractConstants.XDI_ADD_NOT, permissionXri), targetAddress);\r\n\tpublic void setPermissionTargetStatement(XDIAddress permissionXri, XDIStatement targetStatementXri) {\r\n\tpublic void setNegativePermissionTargetStatement(XDIAddress permissionXri, XDIStatement targetStatementXri) {\r\n\t\tthis.setPermissionTargetStatement(AddressUtil.concatAddresses(XDILinkContractConstants.XDI_ADD_NOT, permissionXri), targetStatementXri);\r\n\tpublic void delPermissionTargetAddress(XDIAddress permissionXri, XDIAddress targetAddress) {\r\n\tpublic void delNegativePermissionTargetAddress(XDIAddress permissionXri, XDIAddress targetAddress) {\r\n\t\tthis.delPermissionTargetAddress(AddressUtil.concatAddresses(XDILinkContractConstants.XDI_ADD_NOT, permissionXri), targetAddress);\r\n\tpublic void delPermissionTargetStatement(XDIAddress permissionXri, XDIStatement targetStatementXri) {\r\n\tpublic void delNegativePermissionTargetStatement(XDIAddress permissionXri, XDIStatement targetStatementXri) {\r\n\t\tthis.delPermissionTargetStatement(AddressUtil.concatAddresses(XDILinkContractConstants.XDI_ADD_NOT, permissionXri), targetStatementXri);\r\n\tpublic IterableIterator<XDIAddress> getPermissionTargetAddresses(XDIAddress permissionXri) {\r\n\t\treturn new MappingRelationTargetContextNodeAddressIterator(\r\n\tpublic IterableIterator<XDIAddress> getNegativePermissionTargetAddresses(XDIAddress permissionXri) {\r\n\t\treturn this.getPermissionTargetAddresses(AddressUtil.concatAddresses(XDILinkContractConstants.XDI_ADD_NOT, permissionXri));\r\n\tpublic IterableIterator<XDIStatement> getPermissionTargetStatements(XDIAddress permissionXri) {\r\n\t\tif (xdiInnerRoot == null) return new EmptyIterator<XDIStatement> ();\r\n\t\t\t\tnew MappingStatementIterator(\r\n\tpublic boolean hasPermissionTargetStatement(XDIAddress permissionXri, XDIStatement targetStatementXri) {\r\n\tpublic boolean hasNegativePermissionTargetStatement(XDIAddress permissionXri, XDIStatement targetStatementXri) {\r\n\t\treturn this.hasPermissionTargetStatement(AddressUtil.concatAddresses(XDILinkContractConstants.XDI_ADD_NOT, permissionXri), targetStatementXri);\r", "new_methods": [], "old_code": "import xdi2.core.util.XDI3Util;\r\nimport xdi2.core.util.iterators.MappingRelationTargetContextNodeXriIterator;\r\nimport xdi2.core.util.iterators.MappingStatementXriIterator;\r\nimport xdi2.core.xri3.XDI3Segment;\r\nimport xdi2.core.xri3.XDI3Statement;\r\n\t\tXdiEntitySingleton xdiEntitySingleton = this.getXdiEntity().getXdiEntitySingleton(XdiEntitySingleton.createArcXri(XDIPolicyConstants.XRI_SS_IF), create);\r\n\tpublic void setPermissionTargetAddress(XDI3Segment permissionXri, XDI3Segment targetAddress) {\r\n\t\tif (this.getContextNode().containsRelation(XDILinkContractConstants.XRI_S_ALL, targetAddress)) return;\r\n\t\tif (permissionXri.equals(XDILinkContractConstants.XRI_S_ALL)) {\r\n\t\t\tthis.getContextNode().delRelation(XDILinkContractConstants.XRI_S_GET, targetAddress);\r\n\t\t\tthis.getContextNode().delRelation(XDILinkContractConstants.XRI_S_SET, targetAddress);\r\n\t\t\tthis.getContextNode().delRelation(XDILinkContractConstants.XRI_S_SET_DO, targetAddress);\r\n\t\t\tthis.getContextNode().delRelation(XDILinkContractConstants.XRI_S_SET_REF, targetAddress);\r\n\t\t\tthis.getContextNode().delRelation(XDILinkContractConstants.XRI_S_DEL, targetAddress);\r\n\tpublic void setNegativePermissionTargetAddress(XDI3Segment permissionXri, XDI3Segment targetAddress) {\r\n\t\tthis.setPermissionTargetAddress(XDI3Util.concatXris(XDILinkContractConstants.XRI_S_NOT, permissionXri), targetAddress);\r\n\tpublic void setPermissionTargetStatement(XDI3Segment permissionXri, XDI3Statement targetStatementXri) {\r\n\tpublic void setNegativePermissionTargetStatement(XDI3Segment permissionXri, XDI3Statement targetStatementXri) {\r\n\t\tthis.setPermissionTargetStatement(XDI3Util.concatXris(XDILinkContractConstants.XRI_S_NOT, permissionXri), targetStatementXri);\r\n\tpublic void delPermissionTargetAddress(XDI3Segment permissionXri, XDI3Segment targetAddress) {\r\n\tpublic void delNegativePermissionTargetAddress(XDI3Segment permissionXri, XDI3Segment targetAddress) {\r\n\t\tthis.delPermissionTargetAddress(XDI3Util.concatXris(XDILinkContractConstants.XRI_S_NOT, permissionXri), targetAddress);\r\n\tpublic void delPermissionTargetStatement(XDI3Segment permissionXri, XDI3Statement targetStatementXri) {\r\n\tpublic void delNegativePermissionTargetStatement(XDI3Segment permissionXri, XDI3Statement targetStatementXri) {\r\n\t\tthis.delPermissionTargetStatement(XDI3Util.concatXris(XDILinkContractConstants.XRI_S_NOT, permissionXri), targetStatementXri);\r\n\tpublic IterableIterator<XDI3Segment> getPermissionTargetAddresses(XDI3Segment permissionXri) {\r\n\t\treturn new MappingRelationTargetContextNodeXriIterator(\r\n\tpublic IterableIterator<XDI3Segment> getNegativePermissionTargetAddresses(XDI3Segment permissionXri) {\r\n\t\treturn this.getPermissionTargetAddresses(XDI3Util.concatXris(XDILinkContractConstants.XRI_S_NOT, permissionXri));\r\n\tpublic IterableIterator<XDI3Statement> getPermissionTargetStatements(XDI3Segment permissionXri) {\r\n\t\tif (xdiInnerRoot == null) return new EmptyIterator<XDI3Statement> ();\r\n\t\t\t\tnew MappingStatementXriIterator(\r\n\tpublic boolean hasPermissionTargetStatement(XDI3Segment permissionXri, XDI3Statement targetStatementXri) {\r\n\tpublic boolean hasNegativePermissionTargetStatement(XDI3Segment permissionXri, XDI3Statement targetStatementXri) {\r\n\t\treturn this.hasPermissionTargetStatement(XDI3Util.concatXris(XDILinkContractConstants.XRI_S_NOT, permissionXri), targetStatementXri);\r", "old_methods": [], "patch": "@@ -13,14 +13,14 @@\n import xdi2.core.features.nodetypes.XdiRoot.MappingAbsoluteToRelativeStatementXriIterator;\r\n import xdi2.core.features.nodetypes.XdiSubGraph;\r\n import xdi2.core.features.nodetypes.XdiVariable;\r\n-import xdi2.core.util.XDI3Util;\r\n+import xdi2.core.syntax.XDIAddress;\r\n+import xdi2.core.syntax.XDIStatement;\r\n+import xdi2.core.util.AddressUtil;\r\n import xdi2.core.util.iterators.EmptyIterator;\r\n import xdi2.core.util.iterators.IterableIterator;\r\n-import xdi2.core.util.iterators.MappingRelationTargetContextNodeXriIterator;\r\n-import xdi2.core.util.iterators.MappingStatementXriIterator;\r\n+import xdi2.core.util.iterators.MappingRelationTargetContextNodeAddressIterator;\r\n+import xdi2.core.util.iterators.MappingStatementIterator;\r\n import xdi2.core.util.iterators.SelectingNotImpliedStatementIterator;\r\n-import xdi2.core.xri3.XDI3Segment;\r\n-import xdi2.core.xri3.XDI3Statement;\r\n \r\n /**\r\n * The base class for XDI link contracts and XDI link contract templates, represented as an XDI entity or variable.\r\n@@ -90,7 +90,7 @@ public ContextNode getContextNode() {\n \t */\r\n \tpublic PolicyRoot getPolicyRoot(boolean create) {\r\n \r\n-\t\tXdiEntitySingleton xdiEntitySingleton = this.getXdiEntity().getXdiEntitySingleton(XdiEntitySingleton.createArcXri(XDIPolicyConstants.XRI_SS_IF), create);\r\n+\t\tXdiEntitySingleton xdiEntitySingleton = this.getXdiEntity().getXdiEntitySingleton(XdiEntitySingleton.createarc(XDIPolicyConstants.XDI_ARC_IF), create);\r\n \t\tif (xdiEntitySingleton == null) return null;\r\n \r\n \t\treturn PolicyRoot.fromXdiEntity(xdiEntitySingleton);\r\n@@ -101,36 +101,36 @@ public PolicyRoot getPolicyRoot(boolean create) {\n \t * @param permissionXri The permission XRI.\r\n \t * @param targetAddress The target context node XRI of the permission.\r\n \t */\r\n-\tpublic void setPermissionTargetAddress(XDI3Segment permissionXri, XDI3Segment targetAddress) {\r\n+\tpublic void setPermissionTargetAddress(XDIAddress permissionXri, XDIAddress targetAddress) {\r\n \r\n \t\tif (permissionXri == null || targetAddress == null) throw new NullPointerException();\r\n \r\n \t\t// if an arc to the given target context node exists with $all, then no other permission arc should be created\r\n \r\n-\t\tif (this.getContextNode().containsRelation(XDILinkContractConstants.XRI_S_ALL, targetAddress)) return;\r\n+\t\tif (this.getContextNode().containsRelation(XDILinkContractConstants.XDI_ADD_ALL, targetAddress)) return;\r\n \r\n \t\t// if a $all permission is added to the target node then all other permission arcs should be deleted\r\n \r\n-\t\tif (permissionXri.equals(XDILinkContractConstants.XRI_S_ALL)) {\r\n+\t\tif (permissionXri.equals(XDILinkContractConstants.XDI_ADD_ALL)) {\r\n \r\n-\t\t\tthis.getContextNode().delRelation(XDILinkContractConstants.XRI_S_GET, targetAddress);\r\n-\t\t\tthis.getContextNode().delRelation(XDILinkContractConstants.XRI_S_SET, targetAddress);\r\n-\t\t\tthis.getContextNode().delRelation(XDILinkContractConstants.XRI_S_SET_DO, targetAddress);\r\n-\t\t\tthis.getContextNode().delRelation(XDILinkContractConstants.XRI_S_SET_REF, targetAddress);\r\n-\t\t\tthis.getContextNode().delRelation(XDILinkContractConstants.XRI_S_DEL, targetAddress);\r\n+\t\t\tthis.getContextNode().delRelation(XDILinkContractConstants.XDI_ADD_GET, targetAddress);\r\n+\t\t\tthis.getContextNode().delRelation(XDILinkContractConstants.XDI_ADD_SET, targetAddress);\r\n+\t\t\tthis.getContextNode().delRelation(XDILinkContractConstants.XDI_ADD_SET_DO, targetAddress);\r\n+\t\t\tthis.getContextNode().delRelation(XDILinkContractConstants.XDI_ADD_SET_REF, targetAddress);\r\n+\t\t\tthis.getContextNode().delRelation(XDILinkContractConstants.XDI_ADD_DEL, targetAddress);\r\n \t\t}\r\n \r\n \t\t// set the permission arc\r\n \r\n \t\tthis.getContextNode().setRelation(permissionXri, targetAddress);\r\n \t}\r\n \r\n-\tpublic void setNegativePermissionTargetAddress(XDI3Segment permissionXri, XDI3Segment targetAddress) {\r\n+\tpublic void setNegativePermissionTargetAddress(XDIAddress permissionXri, XDIAddress targetAddress) {\r\n \r\n-\t\tthis.setPermissionTargetAddress(XDI3Util.concatXris(XDILinkContractConstants.XRI_S_NOT, permissionXri), targetAddress);\r\n+\t\tthis.setPermissionTargetAddress(AddressUtil.concatAddresses(XDILinkContractConstants.XDI_ADD_NOT, permissionXri), targetAddress);\r\n \t}\r\n \r\n-\tpublic void setPermissionTargetStatement(XDI3Segment permissionXri, XDI3Statement targetStatementXri) {\r\n+\tpublic void setPermissionTargetStatement(XDIAddress permissionXri, XDIStatement targetStatementXri) {\r\n \r\n \t\tif (permissionXri == null || targetStatementXri == null) throw new NullPointerException();\r\n \r\n@@ -144,12 +144,12 @@ public void setPermissionTargetStatement(XDI3Segment permissionXri, XDI3Statemen\n \t\txdiInnerRoot.getContextNode().setStatement(targetStatementXri);\r\n \t}\r\n \r\n-\tpublic void setNegativePermissionTargetStatement(XDI3Segment permissionXri, XDI3Statement targetStatementXri) {\r\n+\tpublic void setNegativePermissionTargetStatement(XDIAddress permissionXri, XDIStatement targetStatementXri) {\r\n \r\n-\t\tthis.setPermissionTargetStatement(XDI3Util.concatXris(XDILinkContractConstants.XRI_S_NOT, permissionXri), targetStatementXri);\r\n+\t\tthis.setPermissionTargetStatement(AddressUtil.concatAddresses(XDILinkContractConstants.XDI_ADD_NOT, permissionXri), targetStatementXri);\r\n \t}\r\n \r\n-\tpublic void delPermissionTargetAddress(XDI3Segment permissionXri, XDI3Segment targetAddress) {\r\n+\tpublic void delPermissionTargetAddress(XDIAddress permissionXri, XDIAddress targetAddress) {\r\n \r\n \t\tif (permissionXri == null || targetAddress == null) throw new NullPointerException();\r\n \r\n@@ -158,12 +158,12 @@ public void delPermissionTargetAddress(XDI3Segment permissionXri, XDI3Segment ta\n \t\tthis.getContextNode().delRelation(permissionXri, targetAddress);\r\n \t}\r\n \r\n-\tpublic void delNegativePermissionTargetAddress(XDI3Segment permissionXri, XDI3Segment targetAddress) {\r\n+\tpublic void delNegativePermissionTargetAddress(XDIAddress permissionXri, XDIAddress targetAddress) {\r\n \r\n-\t\tthis.delPermissionTargetAddress(XDI3Util.concatXris(XDILinkContractConstants.XRI_S_NOT, permissionXri), targetAddress);\r\n+\t\tthis.delPermissionTargetAddress(AddressUtil.concatAddresses(XDILinkContractConstants.XDI_ADD_NOT, permissionXri), targetAddress);\r\n \t}\r\n \r\n-\tpublic void delPermissionTargetStatement(XDI3Segment permissionXri, XDI3Statement targetStatementXri) {\r\n+\tpublic void delPermissionTargetStatement(XDIAddress permissionXri, XDIStatement targetStatementXri) {\r\n \r\n \t\tif (permissionXri == null || targetStatementXri == null) throw new NullPointerException();\r\n \r\n@@ -178,45 +178,45 @@ public void delPermissionTargetStatement(XDI3Segment permissionXri, XDI3Statemen\n \t\tstatement.delete();\r\n \t}\r\n \r\n-\tpublic void delNegativePermissionTargetStatement(XDI3Segment permissionXri, XDI3Statement targetStatementXri) {\r\n+\tpublic void delNegativePermissionTargetStatement(XDIAddress permissionXri, XDIStatement targetStatementXri) {\r\n \r\n-\t\tthis.delPermissionTargetStatement(XDI3Util.concatXris(XDILinkContractConstants.XRI_S_NOT, permissionXri), targetStatementXri);\r\n+\t\tthis.delPermissionTargetStatement(AddressUtil.concatAddresses(XDILinkContractConstants.XDI_ADD_NOT, permissionXri), targetStatementXri);\r\n \t}\r\n \r\n-\tpublic IterableIterator<XDI3Segment> getPermissionTargetAddresses(XDI3Segment permissionXri) {\r\n+\tpublic IterableIterator<XDIAddress> getPermissionTargetAddresses(XDIAddress permissionXri) {\r\n \r\n \t\tif (permissionXri == null) throw new NullPointerException();\r\n \r\n \t\t// return the target addresses\r\n \r\n-\t\treturn new MappingRelationTargetContextNodeXriIterator(\r\n+\t\treturn new MappingRelationTargetContextNodeAddressIterator(\r\n \t\t\t\t\t\tthis.getContextNode().getRelations(permissionXri));\r\n \t}\r\n \r\n-\tpublic IterableIterator<XDI3Segment> getNegativePermissionTargetAddresses(XDI3Segment permissionXri) {\r\n+\tpublic IterableIterator<XDIAddress> getNegativePermissionTargetAddresses(XDIAddress permissionXri) {\r\n \r\n-\t\treturn this.getPermissionTargetAddresses(XDI3Util.concatXris(XDILinkContractConstants.XRI_S_NOT, permissionXri));\r\n+\t\treturn this.getPermissionTargetAddresses(AddressUtil.concatAddresses(XDILinkContractConstants.XDI_ADD_NOT, permissionXri));\r\n \t}\r\n \r\n-\tpublic IterableIterator<XDI3Statement> getPermissionTargetStatements(XDI3Segment permissionXri) {\r\n+\tpublic IterableIterator<XDIStatement> getPermissionTargetStatements(XDIAddress permissionXri) {\r\n \r\n \t\tif (permissionXri == null) throw new NullPointerException();\r\n \r\n \t\t// find the inner root\r\n \r\n \t\tXdiInnerRoot xdiInnerRoot = this.getXdiEntity().getXdiInnerRoot(permissionXri, false);\r\n-\t\tif (xdiInnerRoot == null) return new EmptyIterator<XDI3Statement> ();\r\n+\t\tif (xdiInnerRoot == null) return new EmptyIterator<XDIStatement> ();\r\n \r\n \t\t// return the target statements\r\n \r\n \t\treturn new MappingAbsoluteToRelativeStatementXriIterator(\r\n \t\t\t\txdiInnerRoot,\r\n-\t\t\t\tnew MappingStatementXriIterator(\r\n+\t\t\t\tnew MappingStatementIterator(\r\n \t\t\t\t\t\tnew SelectingNotImpliedStatementIterator(\r\n \t\t\t\t\t\t\t\txdiInnerRoot.getContextNode().getAllStatements())));\r\n \t}\r\n \r\n-\tpublic boolean hasPermissionTargetStatement(XDI3Segment permissionXri, XDI3Statement targetStatementXri) {\r\n+\tpublic boolean hasPermissionTargetStatement(XDIAddress permissionXri, XDIStatement targetStatementXri) {\r\n \r\n \t\tif (permissionXri == null || targetStatementXri == null) throw new NullPointerException();\r\n \r\n@@ -230,9 +230,9 @@ public boolean hasPermissionTargetStatement(XDI3Segment permissionXri, XDI3State\n \t\treturn xdiInnerRoot.getContextNode().containsStatement(targetStatementXri);\r\n \t}\r\n \r\n-\tpublic boolean hasNegativePermissionTargetStatement(XDI3Segment permissionXri, XDI3Statement targetStatementXri) {\r\n+\tpublic boolean hasNegativePermissionTargetStatement(XDIAddress permissionXri, XDIStatement targetStatementXri) {\r\n \r\n-\t\treturn this.hasPermissionTargetStatement(XDI3Util.concatXris(XDILinkContractConstants.XRI_S_NOT, permissionXri), targetStatementXri);\r\n+\t\treturn this.hasPermissionTargetStatement(AddressUtil.concatAddresses(XDILinkContractConstants.XDI_ADD_NOT, permissionXri), targetStatementXri);\r\n \t}\r\n \r\n \t/*\r", "raw_url": "https://github.com/projectdanube/xdi2/raw/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Flinkcontracts%2FLinkContractBase.java", "sha": "c019b704e657ae0dfc88a8825011a68b205172d0", "status": "modified" }, { "additions": 16, "blob_url": "https://github.com/projectdanube/xdi2/blob/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Flinkcontracts%2FLinkContractTemplate.java", "changes": 32, "contents_url": "https://api.github.com/repos/projectdanube/xdi2/contents/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Flinkcontracts%2FLinkContractTemplate.java?ref=0ca7982fec30c2bb8204efbbea61428a643d2e9c", "deletions": 16, "filename": "core/src/main/java/xdi2/core/features/linkcontracts/LinkContractTemplate.java", "new_code": "import xdi2.core.syntax.XDIAddress;\r\nimport xdi2.core.syntax.XDIArc;\r\nimport xdi2.core.util.AddressUtil;\r\n\t\tif (! xdiVariable.getArc().equals(XDILinkContractConstants.XDI_ARC_DO_VARIABLE)) return false;\r\n\tpublic static XDIAddress createLinkContractTemplateXri(XDIAddress templateAuthorityAndId) {\r\n\t\tList<XDIArc> linkContractTemplatearcs = new ArrayList<XDIArc> ();\r\n\t\tlinkContractTemplatearcs.addAll(templateAuthorityAndId.getArcs());\r\n\t\tlinkContractTemplatearcs.add(XDILinkContractConstants.XDI_ARC_DO_VARIABLE);\r\n\t\treturn XDIAddress.fromComponents(linkContractTemplatearcs);\r\n\tpublic static LinkContractTemplate findLinkContractTemplate(Graph graph, XDIAddress templateAuthorityAndId, boolean create) {\r\n\t\tXDIAddress linkContractTemplateXri = createLinkContractTemplateXri(templateAuthorityAndId);\r\n\tpublic static XDIAddress getTemplateAuthorityAndId(XDIAddress xri) {\r\n\t\tint index = AddressUtil.indexOfXri(xri, XDILinkContractConstants.XDI_ARC_DO_VARIABLE);\r\n\t\treturn AddressUtil.subXri(xri, 0, index);\r\n\tpublic XDIAddress getTemplateAuthorityAndId() {\r\n\t\treturn getTemplateAuthorityAndId(this.getContextNode().getAddress());\r", "new_methods": [], "old_code": "import xdi2.core.util.XDI3Util;\r\nimport xdi2.core.xri3.XDI3Segment;\r\nimport xdi2.core.xri3.XDI3SubSegment;\r\n\t\tif (! xdiVariable.getArcXri().equals(XDILinkContractConstants.XRI_SS_DO_VARIABLE)) return false;\r\n\tpublic static XDI3Segment createLinkContractTemplateXri(XDI3Segment templateAuthorityAndId) {\r\n\t\tList<XDI3SubSegment> linkContractTemplateArcXris = new ArrayList<XDI3SubSegment> ();\r\n\t\tlinkContractTemplateArcXris.addAll(templateAuthorityAndId.getSubSegments());\r\n\t\tlinkContractTemplateArcXris.add(XDILinkContractConstants.XRI_SS_DO_VARIABLE);\r\n\t\treturn XDI3Segment.fromComponents(linkContractTemplateArcXris);\r\n\tpublic static LinkContractTemplate findLinkContractTemplate(Graph graph, XDI3Segment templateAuthorityAndId, boolean create) {\r\n\t\tXDI3Segment linkContractTemplateXri = createLinkContractTemplateXri(templateAuthorityAndId);\r\n\tpublic static XDI3Segment getTemplateAuthorityAndId(XDI3Segment xri) {\r\n\t\tint index = XDI3Util.indexOfXri(xri, XDILinkContractConstants.XRI_SS_DO_VARIABLE);\r\n\t\treturn XDI3Util.subXri(xri, 0, index);\r\n\tpublic XDI3Segment getTemplateAuthorityAndId() {\r\n\t\treturn getTemplateAuthorityAndId(this.getContextNode().getXri());\r", "old_methods": [], "patch": "@@ -7,9 +7,9 @@\n import xdi2.core.Graph;\r\n import xdi2.core.constants.XDILinkContractConstants;\r\n import xdi2.core.features.nodetypes.XdiVariable;\r\n-import xdi2.core.util.XDI3Util;\r\n-import xdi2.core.xri3.XDI3Segment;\r\n-import xdi2.core.xri3.XDI3SubSegment;\r\n+import xdi2.core.syntax.XDIAddress;\r\n+import xdi2.core.syntax.XDIArc;\r\n+import xdi2.core.util.AddressUtil;\r\n \r\n /**\r\n * An XDI link contract template, represented as an XDI variable.\r\n@@ -36,7 +36,7 @@ protected LinkContractTemplate(XdiVariable xdiVariable) {\n \t */\r\n \tpublic static boolean isValid(XdiVariable xdiVariable) {\r\n \r\n-\t\tif (! xdiVariable.getArcXri().equals(XDILinkContractConstants.XRI_SS_DO_VARIABLE)) return false;\r\n+\t\tif (! xdiVariable.getArc().equals(XDILinkContractConstants.XDI_ARC_DO_VARIABLE)) return false;\r\n \r\n \t\tif (getTemplateAuthorityAndId(xdiVariable.getXri()) == null) return false;\r\n \r\n@@ -55,26 +55,26 @@ public static LinkContractTemplate fromXdiVariable(XdiVariable xdiVariable) {\n \t\treturn new LinkContractTemplate(xdiVariable);\r\n \t}\r\n \r\n-\tpublic static XDI3Segment createLinkContractTemplateXri(XDI3Segment templateAuthorityAndId) {\r\n+\tpublic static XDIAddress createLinkContractTemplateXri(XDIAddress templateAuthorityAndId) {\r\n \r\n \t\tif (templateAuthorityAndId == null) throw new NullPointerException();\r\n \t\t\r\n-\t\tList<XDI3SubSegment> linkContractTemplateArcXris = new ArrayList<XDI3SubSegment> ();\r\n+\t\tList<XDIArc> linkContractTemplatearcs = new ArrayList<XDIArc> ();\r\n \r\n-\t\tlinkContractTemplateArcXris.addAll(templateAuthorityAndId.getSubSegments());\r\n+\t\tlinkContractTemplatearcs.addAll(templateAuthorityAndId.getArcs());\r\n \r\n-\t\tlinkContractTemplateArcXris.add(XDILinkContractConstants.XRI_SS_DO_VARIABLE);\r\n+\t\tlinkContractTemplatearcs.add(XDILinkContractConstants.XDI_ARC_DO_VARIABLE);\r\n \r\n-\t\treturn XDI3Segment.fromComponents(linkContractTemplateArcXris);\r\n+\t\treturn XDIAddress.fromComponents(linkContractTemplatearcs);\r\n \t}\r\n \r\n \t/**\r\n \t * Factory method that finds or creates an XDI link contract template for a graph.\r\n \t * @return The XDI link contract template.\r\n \t */\r\n-\tpublic static LinkContractTemplate findLinkContractTemplate(Graph graph, XDI3Segment templateAuthorityAndId, boolean create) {\r\n+\tpublic static LinkContractTemplate findLinkContractTemplate(Graph graph, XDIAddress templateAuthorityAndId, boolean create) {\r\n \r\n-\t\tXDI3Segment linkContractTemplateXri = createLinkContractTemplateXri(templateAuthorityAndId);\r\n+\t\tXDIAddress linkContractTemplateXri = createLinkContractTemplateXri(templateAuthorityAndId);\r\n \r\n \t\tContextNode linkContractTemplateContextNode = create ? graph.setDeepContextNode(linkContractTemplateXri) : graph.getDeepContextNode(linkContractTemplateXri, true);\r\n \t\tif (linkContractTemplateContextNode == null) return null;\r\n@@ -86,12 +86,12 @@ public static LinkContractTemplate findLinkContractTemplate(Graph graph, XDI3Seg\n \t * Static methods\r\n \t */\r\n \r\n-\tpublic static XDI3Segment getTemplateAuthorityAndId(XDI3Segment xri) {\r\n+\tpublic static XDIAddress getTemplateAuthorityAndId(XDIAddress xri) {\r\n \r\n-\t\tint index = XDI3Util.indexOfXri(xri, XDILinkContractConstants.XRI_SS_DO_VARIABLE);\r\n+\t\tint index = AddressUtil.indexOfXri(xri, XDILinkContractConstants.XDI_ARC_DO_VARIABLE);\r\n \t\tif (index < 0) return null;\r\n \r\n-\t\treturn XDI3Util.subXri(xri, 0, index);\r\n+\t\treturn AddressUtil.subXri(xri, 0, index);\r\n \t}\r\n \r\n \t/*\r\n@@ -103,8 +103,8 @@ public GenericLinkContract instantiate() {\n \t\tthrow new RuntimeException(\"Not implemented.\");\r\n \t}\r\n \r\n-\tpublic XDI3Segment getTemplateAuthorityAndId() {\r\n+\tpublic XDIAddress getTemplateAuthorityAndId() {\r\n \r\n-\t\treturn getTemplateAuthorityAndId(this.getContextNode().getXri());\r\n+\t\treturn getTemplateAuthorityAndId(this.getContextNode().getAddress());\r\n \t}\r\n }\r", "raw_url": "https://github.com/projectdanube/xdi2/raw/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Flinkcontracts%2FLinkContractTemplate.java", "sha": "92ccc2f5c884e3e7edcdbca16e994a1a4167c6df", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/projectdanube/xdi2/blob/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Flinkcontracts%2FLinkContracts.java", "changes": 2, "contents_url": "https://api.github.com/repos/projectdanube/xdi2/contents/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Flinkcontracts%2FLinkContracts.java?ref=0ca7982fec30c2bb8204efbbea61428a643d2e9c", "deletions": 1, "filename": "core/src/main/java/xdi2/core/features/linkcontracts/LinkContracts.java", "new_code": "\t\tContextNode linkContractContextNode = create ? contextNode.setDeepContextNode(XDILinkContractConstants.XDI_ADD_DO) : contextNode.getDeepContextNode(XDILinkContractConstants.XDI_ADD_DO, true);\r", "new_methods": [], "old_code": "\t\tContextNode linkContractContextNode = create ? contextNode.setDeepContextNode(XDILinkContractConstants.XRI_S_DO) : contextNode.getDeepContextNode(XDILinkContractConstants.XRI_S_DO, true);\r", "old_methods": [], "patch": "@@ -35,7 +35,7 @@ public static Iterator<LinkContract> getAllLinkContracts(Graph graph) {\n \t */\r\n \tpublic static LinkContract getLinkContract(ContextNode contextNode, boolean create) {\r\n \r\n-\t\tContextNode linkContractContextNode = create ? contextNode.setDeepContextNode(XDILinkContractConstants.XRI_S_DO) : contextNode.getDeepContextNode(XDILinkContractConstants.XRI_S_DO, true);\r\n+\t\tContextNode linkContractContextNode = create ? contextNode.setDeepContextNode(XDILinkContractConstants.XDI_ADD_DO) : contextNode.getDeepContextNode(XDILinkContractConstants.XDI_ADD_DO, true);\r\n \t\tif (linkContractContextNode == null) return null;\r\n \r\n \t\tXdiEntitySingleton xdiEntitySingleton = XdiEntitySingleton.fromContextNode(linkContractContextNode);\r", "raw_url": "https://github.com/projectdanube/xdi2/raw/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Flinkcontracts%2FLinkContracts.java", "sha": "b7ced25a5272f272ffb727863c49b28c89b3fde6", "status": "modified" }, { "additions": 6, "blob_url": "https://github.com/projectdanube/xdi2/blob/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Flinkcontracts%2FPublicLinkContract.java", "changes": 12, "contents_url": "https://api.github.com/repos/projectdanube/xdi2/contents/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Flinkcontracts%2FPublicLinkContract.java?ref=0ca7982fec30c2bb8204efbbea61428a643d2e9c", "deletions": 6, "filename": "core/src/main/java/xdi2/core/features/linkcontracts/PublicLinkContract.java", "new_code": "import xdi2.core.syntax.XDIAddress;\r\n\t\t\tif (! XDILinkContractConstants.XDI_ADD_PUBLIC.equals(GenericLinkContract.getRequestingAuthority(xdiEntity.getXri()))) return false;\r\n\tpublic static XDIAddress createPublicLinkContractXri(XDIAddress ownerXri) {\r\n\t\treturn GenericLinkContract.createGenericLinkContractXri(ownerXri, XDILinkContractConstants.XDI_ADD_PUBLIC, null);\r\n\t\tXDIAddress ownerXri = GraphUtil.getOwnerXri(graph);\r\n\t\tGenericLinkContract genericLinkContract = GenericLinkContract.findGenericLinkContract(graph, ownerXri, XDILinkContractConstants.XDI_ADD_PUBLIC, null, true);\r", "new_methods": [], "old_code": "import xdi2.core.xri3.XDI3Segment;\r\n\t\t\tif (! XDILinkContractConstants.XRI_S_PUBLIC.equals(GenericLinkContract.getRequestingAuthority(xdiEntity.getXri()))) return false;\r\n\tpublic static XDI3Segment createPublicLinkContractXri(XDI3Segment ownerXri) {\r\n\t\treturn GenericLinkContract.createGenericLinkContractXri(ownerXri, XDILinkContractConstants.XRI_S_PUBLIC, null);\r\n\t\tXDI3Segment ownerXri = GraphUtil.getOwnerXri(graph);\r\n\t\tGenericLinkContract genericLinkContract = GenericLinkContract.findGenericLinkContract(graph, ownerXri, XDILinkContractConstants.XRI_S_PUBLIC, null, true);\r", "old_methods": [], "patch": "@@ -5,8 +5,8 @@\n import xdi2.core.features.nodetypes.XdiEntity;\r\n import xdi2.core.features.nodetypes.XdiEntityMember;\r\n import xdi2.core.features.nodetypes.XdiEntitySingleton;\r\n+import xdi2.core.syntax.XDIAddress;\r\n import xdi2.core.util.GraphUtil;\r\n-import xdi2.core.xri3.XDI3Segment;\r\n \r\n /**\r\n * An XDI public link contract, represented as an XDI entity.\r\n@@ -41,7 +41,7 @@ public static boolean isValid(XdiEntity xdiEntity) {\n \t\t\tif (GenericLinkContract.getRequestingAuthority(xdiEntity.getXri()) == null) return false;\r\n \t\t\tif (GenericLinkContract.getTemplateAuthorityAndId(xdiEntity.getXri()) != null) return false;\r\n \r\n-\t\t\tif (! XDILinkContractConstants.XRI_S_PUBLIC.equals(GenericLinkContract.getRequestingAuthority(xdiEntity.getXri()))) return false;\r\n+\t\t\tif (! XDILinkContractConstants.XDI_ADD_PUBLIC.equals(GenericLinkContract.getRequestingAuthority(xdiEntity.getXri()))) return false;\r\n \r\n \t\t\treturn true;\r\n \t\t} else if (xdiEntity instanceof XdiEntityMember) {\r\n@@ -65,9 +65,9 @@ public static PublicLinkContract fromXdiEntity(XdiEntity xdiEntity) {\n \t\treturn new PublicLinkContract(xdiEntity);\r\n \t}\r\n \r\n-\tpublic static XDI3Segment createPublicLinkContractXri(XDI3Segment ownerXri) {\r\n+\tpublic static XDIAddress createPublicLinkContractXri(XDIAddress ownerXri) {\r\n \r\n-\t\treturn GenericLinkContract.createGenericLinkContractXri(ownerXri, XDILinkContractConstants.XRI_S_PUBLIC, null);\r\n+\t\treturn GenericLinkContract.createGenericLinkContractXri(ownerXri, XDILinkContractConstants.XDI_ADD_PUBLIC, null);\r\n \t}\r\n \r\n \t/**\r\n@@ -76,10 +76,10 @@ public static XDI3Segment createPublicLinkContractXri(XDI3Segment ownerXri) {\n \t */\r\n \tpublic static PublicLinkContract findPublicLinkContract(Graph graph, boolean create) {\r\n \r\n-\t\tXDI3Segment ownerXri = GraphUtil.getOwnerXri(graph);\r\n+\t\tXDIAddress ownerXri = GraphUtil.getOwnerXri(graph);\r\n \t\tif (ownerXri == null) return null;\r\n \r\n-\t\tGenericLinkContract genericLinkContract = GenericLinkContract.findGenericLinkContract(graph, ownerXri, XDILinkContractConstants.XRI_S_PUBLIC, null, true);\r\n+\t\tGenericLinkContract genericLinkContract = GenericLinkContract.findGenericLinkContract(graph, ownerXri, XDILinkContractConstants.XDI_ADD_PUBLIC, null, true);\r\n \t\tif (genericLinkContract == null) return null;\r\n \r\n \t\treturn fromXdiEntity(genericLinkContract.getXdiEntity());\r", "raw_url": "https://github.com/projectdanube/xdi2/raw/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Flinkcontracts%2FPublicLinkContract.java", "sha": "04b3ac6d580cc33d4c0dafa74490aa71d8072395", "status": "modified" }, { "additions": 3, "blob_url": "https://github.com/projectdanube/xdi2/blob/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Flinkcontracts%2FRootLinkContract.java", "changes": 6, "contents_url": "https://api.github.com/repos/projectdanube/xdi2/contents/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Flinkcontracts%2FRootLinkContract.java?ref=0ca7982fec30c2bb8204efbbea61428a643d2e9c", "deletions": 3, "filename": "core/src/main/java/xdi2/core/features/linkcontracts/RootLinkContract.java", "new_code": "import xdi2.core.syntax.XDIAddress;\r\n\tpublic static XDIAddress createRootLinkContractXri(XDIAddress ownerXri) {\r\n\t\tXDIAddress ownerXri = GraphUtil.getOwnerXri(graph);\r", "new_methods": [], "old_code": "import xdi2.core.xri3.XDI3Segment;\r\n\tpublic static XDI3Segment createRootLinkContractXri(XDI3Segment ownerXri) {\r\n\t\tXDI3Segment ownerXri = GraphUtil.getOwnerXri(graph);\r", "old_methods": [], "patch": "@@ -4,8 +4,8 @@\n import xdi2.core.features.nodetypes.XdiEntity;\r\n import xdi2.core.features.nodetypes.XdiEntityMember;\r\n import xdi2.core.features.nodetypes.XdiEntitySingleton;\r\n+import xdi2.core.syntax.XDIAddress;\r\n import xdi2.core.util.GraphUtil;\r\n-import xdi2.core.xri3.XDI3Segment;\r\n \r\n /**\r\n * An XDI root link contract, represented as an XDI entity.\r\n@@ -64,7 +64,7 @@ public static RootLinkContract fromXdiEntity(XdiEntity xdiEntity) {\n \t\treturn new RootLinkContract(xdiEntity);\r\n \t}\r\n \r\n-\tpublic static XDI3Segment createRootLinkContractXri(XDI3Segment ownerXri) {\r\n+\tpublic static XDIAddress createRootLinkContractXri(XDIAddress ownerXri) {\r\n \r\n \t\treturn GenericLinkContract.createGenericLinkContractXri(ownerXri, ownerXri, null);\r\n \t}\r\n@@ -75,7 +75,7 @@ public static XDI3Segment createRootLinkContractXri(XDI3Segment ownerXri) {\n \t */\r\n \tpublic static RootLinkContract findRootLinkContract(Graph graph, boolean create) {\r\n \r\n-\t\tXDI3Segment ownerXri = GraphUtil.getOwnerXri(graph);\r\n+\t\tXDIAddress ownerXri = GraphUtil.getOwnerXri(graph);\r\n \t\tif (ownerXri == null) return null;\r\n \r\n \t\tGenericLinkContract genericLinkContract = GenericLinkContract.findGenericLinkContract(graph, ownerXri, ownerXri, null, create);\r", "raw_url": "https://github.com/projectdanube/xdi2/raw/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Flinkcontracts%2FRootLinkContract.java", "sha": "3d9b4f7340ab7ef7ad9e0d2f49237e195ed0bfdc", "status": "modified" }, { "additions": 6, "blob_url": "https://github.com/projectdanube/xdi2/blob/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Flinkcontracts%2Fcondition%2FCondition.java", "changes": 12, "contents_url": "https://api.github.com/repos/projectdanube/xdi2/contents/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Flinkcontracts%2Fcondition%2FCondition.java?ref=0ca7982fec30c2bb8204efbbea61428a643d2e9c", "deletions": 6, "filename": "core/src/main/java/xdi2/core/features/linkcontracts/condition/Condition.java", "new_code": "import xdi2.core.syntax.XDIStatement;\r\n\tprivate XDIStatement statementXri;\r\n\tprotected Condition(XDIStatement statementXri) {\r\n\tpublic static boolean isValid(XDIStatement statement) {\r\n\tpublic static Condition fromStatement(XDIStatement statement) {\r\n\tpublic XDIStatement getStatementXri() {\r", "new_methods": [], "old_code": "import xdi2.core.xri3.XDI3Statement;\r\n\tprivate XDI3Statement statementXri;\r\n\tprotected Condition(XDI3Statement statementXri) {\r\n\tpublic static boolean isValid(XDI3Statement statement) {\r\n\tpublic static Condition fromStatement(XDI3Statement statement) {\r\n\tpublic XDI3Statement getStatementXri() {\r", "old_methods": [], "patch": "@@ -6,7 +6,7 @@\n import org.slf4j.LoggerFactory;\r\n \r\n import xdi2.core.features.linkcontracts.evaluation.PolicyEvaluationContext;\r\n-import xdi2.core.xri3.XDI3Statement;\r\n+import xdi2.core.syntax.XDIStatement;\r\n \r\n /**\r\n * An XDI condition, represented as a statement.\r\n@@ -19,9 +19,9 @@ public abstract class Condition implements Serializable, Comparable<Condition> {\n \r\n \tprivate static final Logger log = LoggerFactory.getLogger(Condition.class);\r\n \r\n-\tprivate XDI3Statement statementXri;\r\n+\tprivate XDIStatement statementXri;\r\n \r\n-\tprotected Condition(XDI3Statement statementXri) {\r\n+\tprotected Condition(XDIStatement statementXri) {\r\n \r\n \t\tif (statementXri == null) throw new NullPointerException();\r\n \r\n@@ -37,7 +37,7 @@ protected Condition(XDI3Statement statementXri) {\n \t * @param statement The statement to check.\r\n \t * @return True if the statement is a valid XDI condition.\r\n \t */\r\n-\tpublic static boolean isValid(XDI3Statement statement) {\r\n+\tpublic static boolean isValid(XDIStatement statement) {\r\n \r\n \t\treturn\r\n \t\t\t\tEqualsCondition.isValid(statement) ||\r\n@@ -53,7 +53,7 @@ public static boolean isValid(XDI3Statement statement) {\n \t * @param statement The statement that is an XDI condition.\r\n \t * @return The XDI condition.\r\n \t */\r\n-\tpublic static Condition fromStatement(XDI3Statement statement) {\r\n+\tpublic static Condition fromStatement(XDIStatement statement) {\r\n \r\n \t\tif (EqualsCondition.isValid(statement)) return EqualsCondition.fromStatement(statement);\r\n \t\tif (MatchesCondition.isValid(statement)) return MatchesCondition.fromStatement(statement);\r\n@@ -85,7 +85,7 @@ public static Condition castCondition(Condition condition) {\n \t * Returns the underlying statement to which this XDI condition is bound.\r\n \t * @return A statement that represents the XDI condition.\r\n \t */\r\n-\tpublic XDI3Statement getStatementXri() {\r\n+\tpublic XDIStatement getStatementXri() {\r\n \r\n \t\treturn this.statementXri;\r\n \t}\r", "raw_url": "https://github.com/projectdanube/xdi2/raw/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Flinkcontracts%2Fcondition%2FCondition.java", "sha": "2089e31714ed05f4fe84d4ccbff3bf000ec543dc", "status": "modified" }, { "additions": 9, "blob_url": "https://github.com/projectdanube/xdi2/blob/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Flinkcontracts%2Fcondition%2FEqualsCondition.java", "changes": 18, "contents_url": "https://api.github.com/repos/projectdanube/xdi2/contents/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Flinkcontracts%2Fcondition%2FEqualsCondition.java?ref=0ca7982fec30c2bb8204efbbea61428a643d2e9c", "deletions": 9, "filename": "core/src/main/java/xdi2/core/features/linkcontracts/condition/EqualsCondition.java", "new_code": "import xdi2.core.syntax.XDIAddress;\r\nimport xdi2.core.syntax.XDIStatement;\r\n\tprotected EqualsCondition(XDIStatement statement) {\r\n\tpublic static boolean isValid(XDIStatement statement) {\r\n\t\tif (! XDIPolicyConstants.XDI_ADD_EQUALS.equals(statement.getRelationAddress())) return false;\r\n\tpublic static EqualsCondition fromStatement(XDIStatement statement) {\r\n\tpublic static EqualsCondition fromSubjectAndObject(XDIAddress subject, XDIAddress object) {\r\n\t\treturn fromStatement(XDIStatement.fromRelationComponents(subject, XDIPolicyConstants.XDI_ADD_EQUALS, object));\r\n\t\tContextNode object = policyEvaluationContext.getContextNode((XDIAddress) this.getStatementXri().getObject());\r", "new_methods": [], "old_code": "import xdi2.core.xri3.XDI3Segment;\r\nimport xdi2.core.xri3.XDI3Statement;\r\n\tprotected EqualsCondition(XDI3Statement statement) {\r\n\tpublic static boolean isValid(XDI3Statement statement) {\r\n\t\tif (! XDIPolicyConstants.XRI_S_EQUALS.equals(statement.getRelationArcXri())) return false;\r\n\tpublic static EqualsCondition fromStatement(XDI3Statement statement) {\r\n\tpublic static EqualsCondition fromSubjectAndObject(XDI3Segment subject, XDI3Segment object) {\r\n\t\treturn fromStatement(XDI3Statement.fromRelationComponents(subject, XDIPolicyConstants.XRI_S_EQUALS, object));\r\n\t\tContextNode object = policyEvaluationContext.getContextNode((XDI3Segment) this.getStatementXri().getObject());\r", "old_methods": [], "patch": "@@ -4,8 +4,8 @@\n import xdi2.core.constants.XDIPolicyConstants;\r\n import xdi2.core.features.linkcontracts.evaluation.PolicyEvaluationContext;\r\n import xdi2.core.impl.AbstractLiteral;\r\n-import xdi2.core.xri3.XDI3Segment;\r\n-import xdi2.core.xri3.XDI3Statement;\r\n+import xdi2.core.syntax.XDIAddress;\r\n+import xdi2.core.syntax.XDIStatement;\r\n \r\n /**\r\n * An XDI $equals condition, represented as a statement.\r\n@@ -16,7 +16,7 @@ public class EqualsCondition extends Condition {\n \r\n \tprivate static final long serialVersionUID = 613463446651165139L;\r\n \r\n-\tprotected EqualsCondition(XDI3Statement statement) {\r\n+\tprotected EqualsCondition(XDIStatement statement) {\r\n \r\n \t\tsuper(statement);\r\n \t}\r\n@@ -30,11 +30,11 @@ protected EqualsCondition(XDI3Statement statement) {\n \t * @param statement The statement to check.\r\n \t * @return True if the statement is a valid XDI $equals condition.\r\n \t */\r\n-\tpublic static boolean isValid(XDI3Statement statement) {\r\n+\tpublic static boolean isValid(XDIStatement statement) {\r\n \r\n \t\tif (! statement.isRelationStatement()) return false;\r\n \r\n-\t\tif (! XDIPolicyConstants.XRI_S_EQUALS.equals(statement.getRelationArcXri())) return false;\r\n+\t\tif (! XDIPolicyConstants.XDI_ADD_EQUALS.equals(statement.getRelationAddress())) return false;\r\n \r\n \t\treturn true;\r\n \t}\r\n@@ -44,16 +44,16 @@ public static boolean isValid(XDI3Statement statement) {\n \t * @param statement The statement that is an XDI $equals condition.\r\n \t * @return The XDI $equals condition.\r\n \t */\r\n-\tpublic static EqualsCondition fromStatement(XDI3Statement statement) {\r\n+\tpublic static EqualsCondition fromStatement(XDIStatement statement) {\r\n \r\n \t\tif (! isValid(statement)) return null;\r\n \r\n \t\treturn new EqualsCondition(statement);\r\n \t}\r\n \r\n-\tpublic static EqualsCondition fromSubjectAndObject(XDI3Segment subject, XDI3Segment object) {\r\n+\tpublic static EqualsCondition fromSubjectAndObject(XDIAddress subject, XDIAddress object) {\r\n \r\n-\t\treturn fromStatement(XDI3Statement.fromRelationComponents(subject, XDIPolicyConstants.XRI_S_EQUALS, object));\r\n+\t\treturn fromStatement(XDIStatement.fromRelationComponents(subject, XDIPolicyConstants.XDI_ADD_EQUALS, object));\r\n \t}\r\n \r\n \t/*\r\n@@ -64,7 +64,7 @@ public static EqualsCondition fromSubjectAndObject(XDI3Segment subject, XDI3Segm\n \tpublic Boolean evaluateInternal(PolicyEvaluationContext policyEvaluationContext) {\r\n \r\n \t\tContextNode subject = policyEvaluationContext.getContextNode(this.getStatementXri().getSubject());\r\n-\t\tContextNode object = policyEvaluationContext.getContextNode((XDI3Segment) this.getStatementXri().getObject());\r\n+\t\tContextNode object = policyEvaluationContext.getContextNode((XDIAddress) this.getStatementXri().getObject());\r\n \r\n \t\tif (subject == null || object == null) return Boolean.FALSE;\r\n \r", "raw_url": "https://github.com/projectdanube/xdi2/raw/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Flinkcontracts%2Fcondition%2FEqualsCondition.java", "sha": "010316348f3f11e8293d1c147f47ac973a44f8fe", "status": "modified" }, { "additions": 4, "blob_url": "https://github.com/projectdanube/xdi2/blob/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Flinkcontracts%2Fcondition%2FGenericCondition.java", "changes": 8, "contents_url": "https://api.github.com/repos/projectdanube/xdi2/contents/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Flinkcontracts%2Fcondition%2FGenericCondition.java?ref=0ca7982fec30c2bb8204efbbea61428a643d2e9c", "deletions": 4, "filename": "core/src/main/java/xdi2/core/features/linkcontracts/condition/GenericCondition.java", "new_code": "import xdi2.core.syntax.XDIStatement;\r\n\tprotected GenericCondition(XDIStatement statementXri) {\r\n\tpublic static boolean isValid(XDIStatement statement) {\r\n\tpublic static GenericCondition fromStatement(XDIStatement statement) {\r", "new_methods": [], "old_code": "import xdi2.core.xri3.XDI3Statement;\r\n\tprotected GenericCondition(XDI3Statement statementXri) {\r\n\tpublic static boolean isValid(XDI3Statement statement) {\r\n\tpublic static GenericCondition fromStatement(XDI3Statement statement) {\r", "old_methods": [], "patch": "@@ -2,7 +2,7 @@\n \r\n import xdi2.core.Statement;\r\n import xdi2.core.features.linkcontracts.evaluation.PolicyEvaluationContext;\r\n-import xdi2.core.xri3.XDI3Statement;\r\n+import xdi2.core.syntax.XDIStatement;\r\n \r\n /**\r\n * An XDI generic condition, represented as a statement.\r\n@@ -13,7 +13,7 @@ public class GenericCondition extends Condition {\n \r\n \tprivate static final long serialVersionUID = 3812888725775095575L;\r\n \r\n-\tprotected GenericCondition(XDI3Statement statementXri) {\r\n+\tprotected GenericCondition(XDIStatement statementXri) {\r\n \r\n \t\tsuper(statementXri);\r\n \t}\r\n@@ -27,7 +27,7 @@ protected GenericCondition(XDI3Statement statementXri) {\n \t * @param statement The statement to check.\r\n \t * @return True if the statement is a valid XDI generic condition.\r\n \t */\r\n-\tpublic static boolean isValid(XDI3Statement statement) {\r\n+\tpublic static boolean isValid(XDIStatement statement) {\r\n \r\n \t\treturn true;\r\n \t}\r\n@@ -37,7 +37,7 @@ public static boolean isValid(XDI3Statement statement) {\n \t * @param statement The statement that is an XDI generic condition.\r\n \t * @return The XDI generic condition.\r\n \t */\r\n-\tpublic static GenericCondition fromStatement(XDI3Statement statement) {\r\n+\tpublic static GenericCondition fromStatement(XDIStatement statement) {\r\n \r\n \t\tif (! isValid(statement)) return null;\r\n \r", "raw_url": "https://github.com/projectdanube/xdi2/raw/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Flinkcontracts%2Fcondition%2FGenericCondition.java", "sha": "a4f5fcbb2a0debb6b0059b50e6ad80c043050c03", "status": "modified" }, { "additions": 9, "blob_url": "https://github.com/projectdanube/xdi2/blob/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Flinkcontracts%2Fcondition%2FGreaterCondition.java", "changes": 18, "contents_url": "https://api.github.com/repos/projectdanube/xdi2/contents/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Flinkcontracts%2Fcondition%2FGreaterCondition.java?ref=0ca7982fec30c2bb8204efbbea61428a643d2e9c", "deletions": 9, "filename": "core/src/main/java/xdi2/core/features/linkcontracts/condition/GreaterCondition.java", "new_code": "import xdi2.core.syntax.XDIAddress;\r\nimport xdi2.core.syntax.XDIStatement;\r\n\tprotected GreaterCondition(XDIStatement statement) {\r\n\tpublic static boolean isValid(XDIStatement statement) {\r\n\t\tif (! XDIPolicyConstants.XDI_ADD_GREATER.equals(statement.getRelationAddress())) return false;\r\n\tpublic static GreaterCondition fromStatement(XDIStatement statement) {\r\n\tpublic static GreaterCondition fromSubjectAndObject(XDIAddress subject, XDIAddress object) {\r\n\t\treturn fromStatement(XDIStatement.fromRelationComponents(subject, XDIPolicyConstants.XDI_ADD_GREATER, object));\r\n\t\tContextNode object = policyEvaluationContext.getContextNode((XDIAddress) this.getStatementXri().getObject());\r", "new_methods": [], "old_code": "import xdi2.core.xri3.XDI3Segment;\r\nimport xdi2.core.xri3.XDI3Statement;\r\n\tprotected GreaterCondition(XDI3Statement statement) {\r\n\tpublic static boolean isValid(XDI3Statement statement) {\r\n\t\tif (! XDIPolicyConstants.XRI_S_GREATER.equals(statement.getRelationArcXri())) return false;\r\n\tpublic static GreaterCondition fromStatement(XDI3Statement statement) {\r\n\tpublic static GreaterCondition fromSubjectAndObject(XDI3Segment subject, XDI3Segment object) {\r\n\t\treturn fromStatement(XDI3Statement.fromRelationComponents(subject, XDIPolicyConstants.XRI_S_GREATER, object));\r\n\t\tContextNode object = policyEvaluationContext.getContextNode((XDI3Segment) this.getStatementXri().getObject());\r", "old_methods": [], "patch": "@@ -4,8 +4,8 @@\n import xdi2.core.constants.XDIPolicyConstants;\r\n import xdi2.core.features.linkcontracts.evaluation.PolicyEvaluationContext;\r\n import xdi2.core.impl.AbstractLiteral;\r\n-import xdi2.core.xri3.XDI3Segment;\r\n-import xdi2.core.xri3.XDI3Statement;\r\n+import xdi2.core.syntax.XDIAddress;\r\n+import xdi2.core.syntax.XDIStatement;\r\n \r\n /**\r\n * An XDI $greater condition, represented as a statement.\r\n@@ -16,7 +16,7 @@ public class GreaterCondition extends Condition {\n \r\n \tprivate static final long serialVersionUID = 2302071980940540935L;\r\n \r\n-\tprotected GreaterCondition(XDI3Statement statement) {\r\n+\tprotected GreaterCondition(XDIStatement statement) {\r\n \r\n \t\tsuper(statement);\r\n \t}\r\n@@ -30,11 +30,11 @@ protected GreaterCondition(XDI3Statement statement) {\n \t * @param statement The statement to check.\r\n \t * @return True if the statement is a valid XDI $greater condition.\r\n \t */\r\n-\tpublic static boolean isValid(XDI3Statement statement) {\r\n+\tpublic static boolean isValid(XDIStatement statement) {\r\n \r\n \t\tif (! statement.isRelationStatement()) return false;\r\n \r\n-\t\tif (! XDIPolicyConstants.XRI_S_GREATER.equals(statement.getRelationArcXri())) return false;\r\n+\t\tif (! XDIPolicyConstants.XDI_ADD_GREATER.equals(statement.getRelationAddress())) return false;\r\n \r\n \t\treturn true;\r\n \t}\r\n@@ -44,16 +44,16 @@ public static boolean isValid(XDI3Statement statement) {\n \t * @param statement The statement that is an XDI $greater condition.\r\n \t * @return The XDI $greater condition.\r\n \t */\r\n-\tpublic static GreaterCondition fromStatement(XDI3Statement statement) {\r\n+\tpublic static GreaterCondition fromStatement(XDIStatement statement) {\r\n \r\n \t\tif (! isValid(statement)) return null;\r\n \r\n \t\treturn new GreaterCondition(statement);\r\n \t}\r\n \r\n-\tpublic static GreaterCondition fromSubjectAndObject(XDI3Segment subject, XDI3Segment object) {\r\n+\tpublic static GreaterCondition fromSubjectAndObject(XDIAddress subject, XDIAddress object) {\r\n \r\n-\t\treturn fromStatement(XDI3Statement.fromRelationComponents(subject, XDIPolicyConstants.XRI_S_GREATER, object));\r\n+\t\treturn fromStatement(XDIStatement.fromRelationComponents(subject, XDIPolicyConstants.XDI_ADD_GREATER, object));\r\n \t}\r\n \r\n \t/*\r\n@@ -64,7 +64,7 @@ public static GreaterCondition fromSubjectAndObject(XDI3Segment subject, XDI3Seg\n \tpublic Boolean evaluateInternal(PolicyEvaluationContext policyEvaluationContext) {\r\n \r\n \t\tContextNode subject = policyEvaluationContext.getContextNode(this.getStatementXri().getSubject());\r\n-\t\tContextNode object = policyEvaluationContext.getContextNode((XDI3Segment) this.getStatementXri().getObject());\r\n+\t\tContextNode object = policyEvaluationContext.getContextNode((XDIAddress) this.getStatementXri().getObject());\r\n \r\n \t\tif (subject == null || object == null) return Boolean.FALSE;\r\n \r", "raw_url": "https://github.com/projectdanube/xdi2/raw/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Flinkcontracts%2Fcondition%2FGreaterCondition.java", "sha": "400c938905eed7767dd94db4836332751da77be5", "status": "modified" }, { "additions": 10, "blob_url": "https://github.com/projectdanube/xdi2/blob/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Flinkcontracts%2Fcondition%2FIsCondition.java", "changes": 20, "contents_url": "https://api.github.com/repos/projectdanube/xdi2/contents/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Flinkcontracts%2Fcondition%2FIsCondition.java?ref=0ca7982fec30c2bb8204efbbea61428a643d2e9c", "deletions": 10, "filename": "core/src/main/java/xdi2/core/features/linkcontracts/condition/IsCondition.java", "new_code": "import xdi2.core.syntax.XDIAddress;\r\nimport xdi2.core.syntax.XDIStatement;\r\n\tprotected IsCondition(XDIStatement statement) {\r\n\tpublic static boolean isValid(XDIStatement statement) {\r\n\t\tif (! XDIPolicyConstants.XDI_ADD_IS.equals(statement.getRelationAddress())) return false;\r\n\tpublic static IsCondition fromStatement(XDIStatement statement) {\r\n\tpublic static IsCondition fromSubjectAndObject(XDIAddress subject, XDIAddress object) {\r\n\t\treturn fromStatement(XDIStatement.fromRelationComponents(subject, XDIPolicyConstants.XDI_ADD_IS, object));\r\n\t\tXDIAddress subject = policyEvaluationContext.resolveXri(this.getStatementXri().getSubject());\r\n\t\tXDIAddress object = policyEvaluationContext.resolveXri((XDIAddress) this.getStatementXri().getObject());\r", "new_methods": [], "old_code": "import xdi2.core.xri3.XDI3Segment;\r\nimport xdi2.core.xri3.XDI3Statement;\r\n\tprotected IsCondition(XDI3Statement statement) {\r\n\tpublic static boolean isValid(XDI3Statement statement) {\r\n\t\tif (! XDIPolicyConstants.XRI_S_IS.equals(statement.getRelationArcXri())) return false;\r\n\tpublic static IsCondition fromStatement(XDI3Statement statement) {\r\n\tpublic static IsCondition fromSubjectAndObject(XDI3Segment subject, XDI3Segment object) {\r\n\t\treturn fromStatement(XDI3Statement.fromRelationComponents(subject, XDIPolicyConstants.XRI_S_IS, object));\r\n\t\tXDI3Segment subject = policyEvaluationContext.resolveXri(this.getStatementXri().getSubject());\r\n\t\tXDI3Segment object = policyEvaluationContext.resolveXri((XDI3Segment) this.getStatementXri().getObject());\r", "old_methods": [], "patch": "@@ -2,8 +2,8 @@\n \r\n import xdi2.core.constants.XDIPolicyConstants;\r\n import xdi2.core.features.linkcontracts.evaluation.PolicyEvaluationContext;\r\n-import xdi2.core.xri3.XDI3Segment;\r\n-import xdi2.core.xri3.XDI3Statement;\r\n+import xdi2.core.syntax.XDIAddress;\r\n+import xdi2.core.syntax.XDIStatement;\r\n \r\n /**\r\n * An XDI $is condition, represented as a statement.\r\n@@ -14,7 +14,7 @@ public class IsCondition extends Condition {\n \r\n \tprivate static final long serialVersionUID = 7506322819724395818L;\r\n \r\n-\tprotected IsCondition(XDI3Statement statement) {\r\n+\tprotected IsCondition(XDIStatement statement) {\r\n \r\n \t\tsuper(statement);\r\n \t}\r\n@@ -28,11 +28,11 @@ protected IsCondition(XDI3Statement statement) {\n \t * @param statement The statement to check.\r\n \t * @return True if the statement is a valid XDI $is condition.\r\n \t */\r\n-\tpublic static boolean isValid(XDI3Statement statement) {\r\n+\tpublic static boolean isValid(XDIStatement statement) {\r\n \r\n \t\tif (! statement.isRelationStatement()) return false;\r\n \r\n-\t\tif (! XDIPolicyConstants.XRI_S_IS.equals(statement.getRelationArcXri())) return false;\r\n+\t\tif (! XDIPolicyConstants.XDI_ADD_IS.equals(statement.getRelationAddress())) return false;\r\n \r\n \t\treturn true;\r\n \t}\r\n@@ -42,16 +42,16 @@ public static boolean isValid(XDI3Statement statement) {\n \t * @param statement The statement that is an XDI $is condition.\r\n \t * @return The XDI $is condition.\r\n \t */\r\n-\tpublic static IsCondition fromStatement(XDI3Statement statement) {\r\n+\tpublic static IsCondition fromStatement(XDIStatement statement) {\r\n \r\n \t\tif (! isValid(statement)) return null;\r\n \r\n \t\treturn new IsCondition(statement);\r\n \t}\r\n \r\n-\tpublic static IsCondition fromSubjectAndObject(XDI3Segment subject, XDI3Segment object) {\r\n+\tpublic static IsCondition fromSubjectAndObject(XDIAddress subject, XDIAddress object) {\r\n \r\n-\t\treturn fromStatement(XDI3Statement.fromRelationComponents(subject, XDIPolicyConstants.XRI_S_IS, object));\r\n+\t\treturn fromStatement(XDIStatement.fromRelationComponents(subject, XDIPolicyConstants.XDI_ADD_IS, object));\r\n \t}\r\n \r\n \t/*\r\n@@ -63,8 +63,8 @@ public Boolean evaluateInternal(PolicyEvaluationContext policyEvaluationContext)\n \r\n \t\t// check if subject XRI and object XRI are the same\r\n \r\n-\t\tXDI3Segment subject = policyEvaluationContext.resolveXri(this.getStatementXri().getSubject());\r\n-\t\tXDI3Segment object = policyEvaluationContext.resolveXri((XDI3Segment) this.getStatementXri().getObject());\r\n+\t\tXDIAddress subject = policyEvaluationContext.resolveXri(this.getStatementXri().getSubject());\r\n+\t\tXDIAddress object = policyEvaluationContext.resolveXri((XDIAddress) this.getStatementXri().getObject());\r\n \r\n \t\tif (subject == null || object == null) return Boolean.FALSE;\r\n \t\t\r", "raw_url": "https://github.com/projectdanube/xdi2/raw/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Flinkcontracts%2Fcondition%2FIsCondition.java", "sha": "2a9243a4287a29d442debcd5a2d4464cad75d8f1", "status": "modified" }, { "additions": 9, "blob_url": "https://github.com/projectdanube/xdi2/blob/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Flinkcontracts%2Fcondition%2FLesserCondition.java", "changes": 18, "contents_url": "https://api.github.com/repos/projectdanube/xdi2/contents/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Flinkcontracts%2Fcondition%2FLesserCondition.java?ref=0ca7982fec30c2bb8204efbbea61428a643d2e9c", "deletions": 9, "filename": "core/src/main/java/xdi2/core/features/linkcontracts/condition/LesserCondition.java", "new_code": "import xdi2.core.syntax.XDIAddress;\r\nimport xdi2.core.syntax.XDIStatement;\r\n\tprotected LesserCondition(XDIStatement statement) {\r\n\tpublic static boolean isValid(XDIStatement statement) {\r\n\t\tif (! XDIPolicyConstants.XDI_ADD_LESSER.equals(statement.getRelationAddress())) return false;\r\n\tpublic static LesserCondition fromStatement(XDIStatement statement) {\r\n\tpublic static LesserCondition fromSubjectAndObject(XDIAddress subject, XDIAddress object) {\r\n\t\treturn fromStatement(XDIStatement.fromRelationComponents(subject, XDIPolicyConstants.XDI_ADD_LESSER, object));\r\n\t\tContextNode object = policyEvaluationContext.getContextNode((XDIAddress) this.getStatementXri().getObject());\r", "new_methods": [], "old_code": "import xdi2.core.xri3.XDI3Segment;\r\nimport xdi2.core.xri3.XDI3Statement;\r\n\tprotected LesserCondition(XDI3Statement statement) {\r\n\tpublic static boolean isValid(XDI3Statement statement) {\r\n\t\tif (! XDIPolicyConstants.XRI_S_LESSER.equals(statement.getRelationArcXri())) return false;\r\n\tpublic static LesserCondition fromStatement(XDI3Statement statement) {\r\n\tpublic static LesserCondition fromSubjectAndObject(XDI3Segment subject, XDI3Segment object) {\r\n\t\treturn fromStatement(XDI3Statement.fromRelationComponents(subject, XDIPolicyConstants.XRI_S_LESSER, object));\r\n\t\tContextNode object = policyEvaluationContext.getContextNode((XDI3Segment) this.getStatementXri().getObject());\r", "old_methods": [], "patch": "@@ -4,8 +4,8 @@\n import xdi2.core.constants.XDIPolicyConstants;\r\n import xdi2.core.features.linkcontracts.evaluation.PolicyEvaluationContext;\r\n import xdi2.core.impl.AbstractLiteral;\r\n-import xdi2.core.xri3.XDI3Segment;\r\n-import xdi2.core.xri3.XDI3Statement;\r\n+import xdi2.core.syntax.XDIAddress;\r\n+import xdi2.core.syntax.XDIStatement;\r\n \r\n /**\r\n * An XDI $lesser condition, represented as a statement.\r\n@@ -16,7 +16,7 @@ public class LesserCondition extends Condition {\n \r\n \tprivate static final long serialVersionUID = -8479583948559334331L;\r\n \r\n-\tprotected LesserCondition(XDI3Statement statement) {\r\n+\tprotected LesserCondition(XDIStatement statement) {\r\n \r\n \t\tsuper(statement);\r\n \t}\r\n@@ -30,11 +30,11 @@ protected LesserCondition(XDI3Statement statement) {\n \t * @param statement The statement to check.\r\n \t * @return True if the statement is a valid XDI $lesser condition.\r\n \t */\r\n-\tpublic static boolean isValid(XDI3Statement statement) {\r\n+\tpublic static boolean isValid(XDIStatement statement) {\r\n \r\n \t\tif (! statement.isRelationStatement()) return false;\r\n \r\n-\t\tif (! XDIPolicyConstants.XRI_S_LESSER.equals(statement.getRelationArcXri())) return false;\r\n+\t\tif (! XDIPolicyConstants.XDI_ADD_LESSER.equals(statement.getRelationAddress())) return false;\r\n \r\n \t\treturn true;\r\n \t}\r\n@@ -44,16 +44,16 @@ public static boolean isValid(XDI3Statement statement) {\n \t * @param statement The statement that is an XDI $lesser condition.\r\n \t * @return The XDI $lesser condition.\r\n \t */\r\n-\tpublic static LesserCondition fromStatement(XDI3Statement statement) {\r\n+\tpublic static LesserCondition fromStatement(XDIStatement statement) {\r\n \r\n \t\tif (! isValid(statement)) return null;\r\n \r\n \t\treturn new LesserCondition(statement);\r\n \t}\r\n \r\n-\tpublic static LesserCondition fromSubjectAndObject(XDI3Segment subject, XDI3Segment object) {\r\n+\tpublic static LesserCondition fromSubjectAndObject(XDIAddress subject, XDIAddress object) {\r\n \r\n-\t\treturn fromStatement(XDI3Statement.fromRelationComponents(subject, XDIPolicyConstants.XRI_S_LESSER, object));\r\n+\t\treturn fromStatement(XDIStatement.fromRelationComponents(subject, XDIPolicyConstants.XDI_ADD_LESSER, object));\r\n \t}\r\n \r\n \t/*\r\n@@ -64,7 +64,7 @@ public static LesserCondition fromSubjectAndObject(XDI3Segment subject, XDI3Segm\n \tpublic Boolean evaluateInternal(PolicyEvaluationContext policyEvaluationContext) {\r\n \r\n \t\tContextNode subject = policyEvaluationContext.getContextNode(this.getStatementXri().getSubject());\r\n-\t\tContextNode object = policyEvaluationContext.getContextNode((XDI3Segment) this.getStatementXri().getObject());\r\n+\t\tContextNode object = policyEvaluationContext.getContextNode((XDIAddress) this.getStatementXri().getObject());\r\n \r\n \t\tif (subject == null || object == null) return Boolean.FALSE;\r\n \r", "raw_url": "https://github.com/projectdanube/xdi2/raw/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Flinkcontracts%2Fcondition%2FLesserCondition.java", "sha": "13a853e90877031833943043f7dfee7026a817b4", "status": "modified" }, { "additions": 9, "blob_url": "https://github.com/projectdanube/xdi2/blob/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Flinkcontracts%2Fcondition%2FMatchesCondition.java", "changes": 18, "contents_url": "https://api.github.com/repos/projectdanube/xdi2/contents/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Flinkcontracts%2Fcondition%2FMatchesCondition.java?ref=0ca7982fec30c2bb8204efbbea61428a643d2e9c", "deletions": 9, "filename": "core/src/main/java/xdi2/core/features/linkcontracts/condition/MatchesCondition.java", "new_code": "import xdi2.core.syntax.XDIAddress;\r\nimport xdi2.core.syntax.XDIStatement;\r\n\tprotected MatchesCondition(XDIStatement statement) {\r\n\tpublic static boolean isValid(XDIStatement statement) {\r\n\t\tif (! XDIPolicyConstants.XDI_ADD_MATCHES.equals(statement.getRelationAddress())) return false;\r\n\tpublic static MatchesCondition fromStatement(XDIStatement statement) {\r\n\tpublic static MatchesCondition fromSubjectAndObject(XDIAddress subject, XDIAddress object) {\r\n\t\treturn fromStatement(XDIStatement.fromRelationComponents(subject, XDIPolicyConstants.XDI_ADD_MATCHES, object));\r\n\t\tContextNode object = policyEvaluationContext.getContextNode((XDIAddress) this.getStatementXri().getObject());\r", "new_methods": [], "old_code": "import xdi2.core.xri3.XDI3Segment;\r\nimport xdi2.core.xri3.XDI3Statement;\r\n\tprotected MatchesCondition(XDI3Statement statement) {\r\n\tpublic static boolean isValid(XDI3Statement statement) {\r\n\t\tif (! XDIPolicyConstants.XRI_S_MATCHES.equals(statement.getRelationArcXri())) return false;\r\n\tpublic static MatchesCondition fromStatement(XDI3Statement statement) {\r\n\tpublic static MatchesCondition fromSubjectAndObject(XDI3Segment subject, XDI3Segment object) {\r\n\t\treturn fromStatement(XDI3Statement.fromRelationComponents(subject, XDIPolicyConstants.XRI_S_MATCHES, object));\r\n\t\tContextNode object = policyEvaluationContext.getContextNode((XDI3Segment) this.getStatementXri().getObject());\r", "old_methods": [], "patch": "@@ -5,8 +5,8 @@\n import xdi2.core.ContextNode;\r\n import xdi2.core.constants.XDIPolicyConstants;\r\n import xdi2.core.features.linkcontracts.evaluation.PolicyEvaluationContext;\r\n-import xdi2.core.xri3.XDI3Segment;\r\n-import xdi2.core.xri3.XDI3Statement;\r\n+import xdi2.core.syntax.XDIAddress;\r\n+import xdi2.core.syntax.XDIStatement;\r\n \r\n /**\r\n * An XDI $matches condition, represented as a statement.\r\n@@ -17,7 +17,7 @@ public class MatchesCondition extends Condition {\n \r\n \tprivate static final long serialVersionUID = -3144452704386786096L;\r\n \r\n-\tprotected MatchesCondition(XDI3Statement statement) {\r\n+\tprotected MatchesCondition(XDIStatement statement) {\r\n \r\n \t\tsuper(statement);\r\n \t}\r\n@@ -31,11 +31,11 @@ protected MatchesCondition(XDI3Statement statement) {\n \t * @param statement The statement to check.\r\n \t * @return True if the statement is a valid XDI $matches condition.\r\n \t */\r\n-\tpublic static boolean isValid(XDI3Statement statement) {\r\n+\tpublic static boolean isValid(XDIStatement statement) {\r\n \r\n \t\tif (! statement.isRelationStatement()) return false;\r\n \r\n-\t\tif (! XDIPolicyConstants.XRI_S_MATCHES.equals(statement.getRelationArcXri())) return false;\r\n+\t\tif (! XDIPolicyConstants.XDI_ADD_MATCHES.equals(statement.getRelationAddress())) return false;\r\n \r\n \t\treturn true;\r\n \t}\r\n@@ -45,16 +45,16 @@ public static boolean isValid(XDI3Statement statement) {\n \t * @param statement The statement that is an XDI $matches condition.\r\n \t * @return The XDI $matches condition.\r\n \t */\r\n-\tpublic static MatchesCondition fromStatement(XDI3Statement statement) {\r\n+\tpublic static MatchesCondition fromStatement(XDIStatement statement) {\r\n \r\n \t\tif (! isValid(statement)) return null;\r\n \r\n \t\treturn new MatchesCondition(statement);\r\n \t}\r\n \r\n-\tpublic static MatchesCondition fromSubjectAndObject(XDI3Segment subject, XDI3Segment object) {\r\n+\tpublic static MatchesCondition fromSubjectAndObject(XDIAddress subject, XDIAddress object) {\r\n \r\n-\t\treturn fromStatement(XDI3Statement.fromRelationComponents(subject, XDIPolicyConstants.XRI_S_MATCHES, object));\r\n+\t\treturn fromStatement(XDIStatement.fromRelationComponents(subject, XDIPolicyConstants.XDI_ADD_MATCHES, object));\r\n \t}\r\n \r\n \t/*\r\n@@ -65,7 +65,7 @@ public static MatchesCondition fromSubjectAndObject(XDI3Segment subject, XDI3Seg\n \tpublic Boolean evaluateInternal(PolicyEvaluationContext policyEvaluationContext) {\r\n \r\n \t\tContextNode subject = policyEvaluationContext.getContextNode(this.getStatementXri().getSubject());\r\n-\t\tContextNode object = policyEvaluationContext.getContextNode((XDI3Segment) this.getStatementXri().getObject());\r\n+\t\tContextNode object = policyEvaluationContext.getContextNode((XDIAddress) this.getStatementXri().getObject());\r\n \r\n \t\tif (subject == null || object == null) return Boolean.FALSE;\r\n \r", "raw_url": "https://github.com/projectdanube/xdi2/raw/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Flinkcontracts%2Fcondition%2FMatchesCondition.java", "sha": "48f489f7d4b1a98a2f4ac08c4dba98ed6d9a9c8b", "status": "modified" }, { "additions": 7, "blob_url": "https://github.com/projectdanube/xdi2/blob/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Flinkcontracts%2Fevaluation%2FGraphPolicyEvaluationContext.java", "changes": 14, "contents_url": "https://api.github.com/repos/projectdanube/xdi2/contents/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Flinkcontracts%2Fevaluation%2FGraphPolicyEvaluationContext.java?ref=0ca7982fec30c2bb8204efbbea61428a643d2e9c", "deletions": 7, "filename": "core/src/main/java/xdi2/core/features/linkcontracts/evaluation/GraphPolicyEvaluationContext.java", "new_code": "import xdi2.core.syntax.XDIAddress;\r\nimport xdi2.core.syntax.XDIStatement;\r\n\tpublic XDIAddress resolveXri(XDIAddress contextNodeAddress) {\r\n\t\treturn contextNodeAddress;\r\n\tpublic ContextNode getContextNode(XDIAddress contextNodeAddress) {\r\n\t\treturn this.getGraph().getDeepContextNode(contextNodeAddress, false);\r\n\tpublic Statement getStatement(XDIStatement statementXri) {\r", "new_methods": [], "old_code": "import xdi2.core.xri3.XDI3Segment;\r\nimport xdi2.core.xri3.XDI3Statement;\r\n\tpublic XDI3Segment resolveXri(XDI3Segment contextNodeXri) {\r\n\t\treturn contextNodeXri;\r\n\tpublic ContextNode getContextNode(XDI3Segment contextNodeXri) {\r\n\t\treturn this.getGraph().getDeepContextNode(contextNodeXri, false);\r\n\tpublic Statement getStatement(XDI3Statement statementXri) {\r", "old_methods": [], "patch": "@@ -3,8 +3,8 @@\n import xdi2.core.ContextNode;\r\n import xdi2.core.Graph;\r\n import xdi2.core.Statement;\r\n-import xdi2.core.xri3.XDI3Segment;\r\n-import xdi2.core.xri3.XDI3Statement;\r\n+import xdi2.core.syntax.XDIAddress;\r\n+import xdi2.core.syntax.XDIStatement;\r\n \r\n public class GraphPolicyEvaluationContext implements PolicyEvaluationContext {\r\n \r\n@@ -16,19 +16,19 @@ public GraphPolicyEvaluationContext(Graph graph) {\n \t}\r\n \r\n \t@Override\r\n-\tpublic XDI3Segment resolveXri(XDI3Segment contextNodeXri) {\r\n+\tpublic XDIAddress resolveXri(XDIAddress contextNodeAddress) {\r\n \r\n-\t\treturn contextNodeXri;\r\n+\t\treturn contextNodeAddress;\r\n \t}\r\n \r\n \t@Override\r\n-\tpublic ContextNode getContextNode(XDI3Segment contextNodeXri) {\r\n+\tpublic ContextNode getContextNode(XDIAddress contextNodeAddress) {\r\n \r\n-\t\treturn this.getGraph().getDeepContextNode(contextNodeXri, false);\r\n+\t\treturn this.getGraph().getDeepContextNode(contextNodeAddress, false);\r\n \t}\r\n \r\n \t@Override\r\n-\tpublic Statement getStatement(XDI3Statement statementXri) {\r\n+\tpublic Statement getStatement(XDIStatement statementXri) {\r\n \r\n \t\treturn this.getGraph().getStatement(statementXri);\r\n \t}\r", "raw_url": "https://github.com/projectdanube/xdi2/raw/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Flinkcontracts%2Fevaluation%2FGraphPolicyEvaluationContext.java", "sha": "173470b3dd90360baa47f50f0b9707efc29846bd", "status": "modified" }, { "additions": 5, "blob_url": "https://github.com/projectdanube/xdi2/blob/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Flinkcontracts%2Fevaluation%2FPolicyEvaluationContext.java", "changes": 10, "contents_url": "https://api.github.com/repos/projectdanube/xdi2/contents/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Flinkcontracts%2Fevaluation%2FPolicyEvaluationContext.java?ref=0ca7982fec30c2bb8204efbbea61428a643d2e9c", "deletions": 5, "filename": "core/src/main/java/xdi2/core/features/linkcontracts/evaluation/PolicyEvaluationContext.java", "new_code": "import xdi2.core.syntax.XDIAddress;\r\nimport xdi2.core.syntax.XDIStatement;\r\n\tpublic XDIAddress resolveXri(XDIAddress contextNodeAddress);\r\n\tpublic ContextNode getContextNode(XDIAddress contextNodeAddress);\r\n\tpublic Statement getStatement(XDIStatement statementXri);\r", "new_methods": [], "old_code": "import xdi2.core.xri3.XDI3Segment;\r\nimport xdi2.core.xri3.XDI3Statement;\r\n\tpublic XDI3Segment resolveXri(XDI3Segment contextNodeXri);\r\n\tpublic ContextNode getContextNode(XDI3Segment contextNodeXri);\r\n\tpublic Statement getStatement(XDI3Statement statementXri);\r", "old_methods": [], "patch": "@@ -2,8 +2,8 @@\n \r\n import xdi2.core.ContextNode;\r\n import xdi2.core.Statement;\r\n-import xdi2.core.xri3.XDI3Segment;\r\n-import xdi2.core.xri3.XDI3Statement;\r\n+import xdi2.core.syntax.XDIAddress;\r\n+import xdi2.core.syntax.XDIStatement;\r\n \r\n /**\r\n * This interface provides a context for evaluating an XDI policy.\r\n@@ -12,7 +12,7 @@\n */\r\n public interface PolicyEvaluationContext {\r\n \r\n-\tpublic XDI3Segment resolveXri(XDI3Segment contextNodeXri);\r\n-\tpublic ContextNode getContextNode(XDI3Segment contextNodeXri);\r\n-\tpublic Statement getStatement(XDI3Statement statementXri);\r\n+\tpublic XDIAddress resolveXri(XDIAddress contextNodeAddress);\r\n+\tpublic ContextNode getContextNode(XDIAddress contextNodeAddress);\r\n+\tpublic Statement getStatement(XDIStatement statementXri);\r\n }\r", "raw_url": "https://github.com/projectdanube/xdi2/raw/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Flinkcontracts%2Fevaluation%2FPolicyEvaluationContext.java", "sha": "93f69f7b3a804c78b6e566016a88bad10eb686d1", "status": "modified" }, { "additions": 5, "blob_url": "https://github.com/projectdanube/xdi2/blob/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Flinkcontracts%2Foperator%2FConditionOperator.java", "changes": 10, "contents_url": "https://api.github.com/repos/projectdanube/xdi2/contents/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Flinkcontracts%2Foperator%2FConditionOperator.java?ref=0ca7982fec30c2bb8204efbbea61428a643d2e9c", "deletions": 5, "filename": "core/src/main/java/xdi2/core/features/linkcontracts/operator/ConditionOperator.java", "new_code": "import xdi2.core.syntax.XDIStatement;\r\nimport xdi2.core.util.iterators.MappingStatementIterator;\r\n\t\treturn new MappingIterator<XDIStatement, Condition> (\r\n\t\t\t\t\t\tnew MappingStatementIterator(\r\n\t\t\tpublic Condition map(XDIStatement statementXri) {\r", "new_methods": [], "old_code": "import xdi2.core.util.iterators.MappingStatementXriIterator;\r\nimport xdi2.core.xri3.XDI3Statement;\r\n\t\treturn new MappingIterator<XDI3Statement, Condition> (\r\n\t\t\t\t\t\tnew MappingStatementXriIterator(\r\n\t\t\tpublic Condition map(XDI3Statement statementXri) {\r", "old_methods": [], "patch": "@@ -5,11 +5,11 @@\n import xdi2.core.features.linkcontracts.condition.Condition;\r\n import xdi2.core.features.nodetypes.XdiInnerRoot;\r\n import xdi2.core.features.nodetypes.XdiRoot.MappingAbsoluteToRelativeStatementXriIterator;\r\n+import xdi2.core.syntax.XDIStatement;\r\n import xdi2.core.util.iterators.IterableIterator;\r\n import xdi2.core.util.iterators.MappingIterator;\r\n-import xdi2.core.util.iterators.MappingStatementXriIterator;\r\n+import xdi2.core.util.iterators.MappingStatementIterator;\r\n import xdi2.core.util.iterators.SelectingNotImpliedStatementIterator;\r\n-import xdi2.core.xri3.XDI3Statement;\r\n \r\n public abstract class ConditionOperator extends Operator {\r\n \r\n@@ -29,15 +29,15 @@ public IterableIterator<Condition> getConditions() {\n \t\tXdiInnerRoot innerRoot = XdiInnerRoot.fromContextNode(this.getRelation().follow());\r\n \t\tif (innerRoot == null) throw new Xdi2RuntimeException(\"Missing condition in operator: \" + this.getRelation());\r\n \r\n-\t\treturn new MappingIterator<XDI3Statement, Condition> (\r\n+\t\treturn new MappingIterator<XDIStatement, Condition> (\r\n \t\t\t\tnew MappingAbsoluteToRelativeStatementXriIterator(\r\n \t\t\t\t\t\tinnerRoot,\r\n-\t\t\t\t\t\tnew MappingStatementXriIterator(\r\n+\t\t\t\t\t\tnew MappingStatementIterator(\r\n \t\t\t\t\t\t\t\tnew SelectingNotImpliedStatementIterator(\r\n \t\t\t\t\t\t\t\t\t\tinnerRoot.getContextNode().getAllStatements())))) {\r\n \r\n \t\t\t@Override\r\n-\t\t\tpublic Condition map(XDI3Statement statementXri) {\r\n+\t\t\tpublic Condition map(XDIStatement statementXri) {\r\n \r\n \t\t\t\treturn Condition.fromStatement(statementXri);\r\n \t\t\t}\r", "raw_url": "https://github.com/projectdanube/xdi2/raw/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Flinkcontracts%2Foperator%2FConditionOperator.java", "sha": "277895d55b7ae8704c9d2d54d368353a6049abb6", "status": "modified" }, { "additions": 2, "blob_url": "https://github.com/projectdanube/xdi2/blob/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Flinkcontracts%2Foperator%2FFalseOperator.java", "changes": 4, "contents_url": "https://api.github.com/repos/projectdanube/xdi2/contents/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Flinkcontracts%2Foperator%2FFalseOperator.java?ref=0ca7982fec30c2bb8204efbbea61428a643d2e9c", "deletions": 2, "filename": "core/src/main/java/xdi2/core/features/linkcontracts/operator/FalseOperator.java", "new_code": "\t\tif (! XDIConstants.XDI_ADD_FALSE.equals(relation.getArc())) return false;\r\n\t\tXdiInnerRoot xdiInnerRoot = policy.getXdiEntity().getXdiInnerRoot(XDIConstants.XDI_ADD_FALSE, true);\r", "new_methods": [], "old_code": "\t\tif (! XDIConstants.XRI_S_FALSE.equals(relation.getArcXri())) return false;\r\n\t\tXdiInnerRoot xdiInnerRoot = policy.getXdiEntity().getXdiInnerRoot(XDIConstants.XRI_S_FALSE, true);\r", "old_methods": [], "patch": "@@ -40,7 +40,7 @@ public static boolean isValid(Relation relation) {\n \r\n \t\tif (! XdiAbstractEntity.isValid(relation.getContextNode())) return false;\r\n \t\tif (! Policy.isValid(XdiAbstractEntity.fromContextNode(relation.getContextNode()))) return false;\r\n-\t\tif (! XDIConstants.XRI_S_FALSE.equals(relation.getArcXri())) return false;\r\n+\t\tif (! XDIConstants.XDI_ADD_FALSE.equals(relation.getArc())) return false;\r\n \t\tif (! XdiInnerRoot.isValid(relation.follow())) return false;\r\n \r\n \t\treturn true;\r\n@@ -62,7 +62,7 @@ public static FalseOperator createFalseOperator(Policy policy, Condition conditi\n \r\n \t\tif (policy == null) throw new NullPointerException();\r\n \r\n-\t\tXdiInnerRoot xdiInnerRoot = policy.getXdiEntity().getXdiInnerRoot(XDIConstants.XRI_S_FALSE, true);\r\n+\t\tXdiInnerRoot xdiInnerRoot = policy.getXdiEntity().getXdiInnerRoot(XDIConstants.XDI_ADD_FALSE, true);\r\n \t\txdiInnerRoot.getContextNode().setStatement(condition.getStatementXri());\r\n \r\n \t\treturn fromRelation(xdiInnerRoot.getPredicateRelation());\r", "raw_url": "https://github.com/projectdanube/xdi2/raw/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Flinkcontracts%2Foperator%2FFalseOperator.java", "sha": "152ccea571def44ae229e742a9dda762b9a74ada", "status": "modified" }, { "additions": 2, "blob_url": "https://github.com/projectdanube/xdi2/blob/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Flinkcontracts%2Foperator%2FTrueOperator.java", "changes": 4, "contents_url": "https://api.github.com/repos/projectdanube/xdi2/contents/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Flinkcontracts%2Foperator%2FTrueOperator.java?ref=0ca7982fec30c2bb8204efbbea61428a643d2e9c", "deletions": 2, "filename": "core/src/main/java/xdi2/core/features/linkcontracts/operator/TrueOperator.java", "new_code": "\t\tif (! XDIConstants.XDI_ADD_TRUE.equals(relation.getArc())) return false;\r\n\t\tXdiInnerRoot xdiInnerRoot = policy.getXdiEntity().getXdiInnerRoot(XDIConstants.XDI_ADD_TRUE, true);\r", "new_methods": [], "old_code": "\t\tif (! XDIConstants.XRI_S_TRUE.equals(relation.getArcXri())) return false;\r\n\t\tXdiInnerRoot xdiInnerRoot = policy.getXdiEntity().getXdiInnerRoot(XDIConstants.XRI_S_TRUE, true);\r", "old_methods": [], "patch": "@@ -40,7 +40,7 @@ public static boolean isValid(Relation relation) {\n \r\n \t\tif (! XdiAbstractEntity.isValid(relation.getContextNode())) return false;\r\n \t\tif (! Policy.isValid(XdiAbstractEntity.fromContextNode(relation.getContextNode()))) return false;\r\n-\t\tif (! XDIConstants.XRI_S_TRUE.equals(relation.getArcXri())) return false;\r\n+\t\tif (! XDIConstants.XDI_ADD_TRUE.equals(relation.getArc())) return false;\r\n \t\tif (! XdiInnerRoot.isValid(relation.follow())) return false;\r\n \r\n \t\treturn true;\r\n@@ -62,7 +62,7 @@ public static TrueOperator createTrueOperator(Policy policy, Condition condition\n \r\n \t\tif (policy == null) throw new NullPointerException();\r\n \r\n-\t\tXdiInnerRoot xdiInnerRoot = policy.getXdiEntity().getXdiInnerRoot(XDIConstants.XRI_S_TRUE, true);\r\n+\t\tXdiInnerRoot xdiInnerRoot = policy.getXdiEntity().getXdiInnerRoot(XDIConstants.XDI_ADD_TRUE, true);\r\n \t\txdiInnerRoot.getContextNode().setStatement(condition.getStatementXri());\r\n \r\n \t\treturn fromRelation(xdiInnerRoot.getPredicateRelation());\r", "raw_url": "https://github.com/projectdanube/xdi2/raw/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Flinkcontracts%2Foperator%2FTrueOperator.java", "sha": "f55517545182f672e828fad6b64a256b46399c76", "status": "modified" }, { "additions": 17, "blob_url": "https://github.com/projectdanube/xdi2/blob/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Flinkcontracts%2Fpolicy%2FPolicy.java", "changes": 34, "contents_url": "https://api.github.com/repos/projectdanube/xdi2/contents/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Flinkcontracts%2Fpolicy%2FPolicy.java?ref=0ca7982fec30c2bb8204efbbea61428a643d2e9c", "deletions": 17, "filename": "core/src/main/java/xdi2/core/features/linkcontracts/policy/Policy.java", "new_code": "import xdi2.core.syntax.XDIArc;\r\n\tpublic XDIArc getPolicyXri() {\r\n\t\t\treturn ((XdiEntitySingleton) this.getXdiEntity()).getBasearc();\r\n\t\t\treturn ((XdiEntityMemberUnordered) this.getXdiEntity()).getXdiCollection().getBasearc();\r\n\t\t\treturn ((XdiEntityMemberOrdered) this.getXdiEntity()).getXdiCollection().getBasearc();\r\n\t\t\tpolicyAndXdiEntity = this.getXdiEntity().getXdiEntitySingleton(XdiEntitySingleton.createarc(XDIPolicyConstants.XDI_ARC_AND), true);\r\n\t\t\tpolicyAndXdiEntity = this.getXdiEntity().getXdiEntityCollection(XdiEntityCollection.createarc(XDIPolicyConstants.XDI_ARC_AND), true).setXdiMemberUnordered(null);\r\n\t\t\tpolicyOrXdiEntity = this.getXdiEntity().getXdiEntitySingleton(XdiEntitySingleton.createarc(XDIPolicyConstants.XDI_ARC_OR), true);\r\n\t\t\tpolicyOrXdiEntity = this.getXdiEntity().getXdiEntityCollection(XdiEntityCollection.createarc(XDIPolicyConstants.XDI_ARC_OR), true).setXdiMemberUnordered(null);\r\n\t\t\tpolicyNotXdiEntity = this.getXdiEntity().getXdiEntitySingleton(XdiEntitySingleton.createarc(XDIPolicyConstants.XDI_ARC_NOT), true);\r\n\t\t\tpolicyNotXdiEntity = this.getXdiEntity().getXdiEntityCollection(XdiEntityCollection.createarc(XDIPolicyConstants.XDI_ARC_NOT), true).setXdiMemberUnordered(null);\r\n\t\tXdiEntitySingleton policyAndEntitySingleton = this.getXdiEntity().getXdiEntitySingleton(XdiEntitySingleton.createarc(XDIPolicyConstants.XDI_ARC_AND), false);\r\n\t\tXdiEntitySingleton policyOrEntitySingleton = this.getXdiEntity().getXdiEntitySingleton(XdiEntitySingleton.createarc(XDIPolicyConstants.XDI_ARC_OR), false);\r\n\t\tXdiEntitySingleton policyNotEntitySingleton = this.getXdiEntity().getXdiEntitySingleton(XdiEntitySingleton.createarc(XDIPolicyConstants.XDI_ARC_NOT), false);\r\n\t\tXdiEntityCollection policyAndEntityCollection = this.getXdiEntity().getXdiEntityCollection(XdiEntityCollection.createarc(XDIPolicyConstants.XDI_ARC_AND), false);\r\n\t\tXdiEntityCollection policyOrEntityCollection = this.getXdiEntity().getXdiEntityCollection(XdiEntityCollection.createarc(XDIPolicyConstants.XDI_ARC_OR), false);\r\n\t\tXdiEntityCollection policyNotEntityCollection = this.getXdiEntity().getXdiEntityCollection(XdiEntityCollection.createarc(XDIPolicyConstants.XDI_ARC_NOT), false);\r", "new_methods": [], "old_code": "import xdi2.core.xri3.XDI3SubSegment;\r\n\tpublic XDI3SubSegment getPolicyXri() {\r\n\t\t\treturn ((XdiEntitySingleton) this.getXdiEntity()).getBaseArcXri();\r\n\t\t\treturn ((XdiEntityMemberUnordered) this.getXdiEntity()).getXdiCollection().getBaseArcXri();\r\n\t\t\treturn ((XdiEntityMemberOrdered) this.getXdiEntity()).getXdiCollection().getBaseArcXri();\r\n\t\t\tpolicyAndXdiEntity = this.getXdiEntity().getXdiEntitySingleton(XdiEntitySingleton.createArcXri(XDIPolicyConstants.XRI_SS_AND), true);\r\n\t\t\tpolicyAndXdiEntity = this.getXdiEntity().getXdiEntityCollection(XdiEntityCollection.createArcXri(XDIPolicyConstants.XRI_SS_AND), true).setXdiMemberUnordered(null);\r\n\t\t\tpolicyOrXdiEntity = this.getXdiEntity().getXdiEntitySingleton(XdiEntitySingleton.createArcXri(XDIPolicyConstants.XRI_SS_OR), true);\r\n\t\t\tpolicyOrXdiEntity = this.getXdiEntity().getXdiEntityCollection(XdiEntityCollection.createArcXri(XDIPolicyConstants.XRI_SS_OR), true).setXdiMemberUnordered(null);\r\n\t\t\tpolicyNotXdiEntity = this.getXdiEntity().getXdiEntitySingleton(XdiEntitySingleton.createArcXri(XDIPolicyConstants.XRI_SS_NOT), true);\r\n\t\t\tpolicyNotXdiEntity = this.getXdiEntity().getXdiEntityCollection(XdiEntityCollection.createArcXri(XDIPolicyConstants.XRI_SS_NOT), true).setXdiMemberUnordered(null);\r\n\t\tXdiEntitySingleton policyAndEntitySingleton = this.getXdiEntity().getXdiEntitySingleton(XdiEntitySingleton.createArcXri(XDIPolicyConstants.XRI_SS_AND), false);\r\n\t\tXdiEntitySingleton policyOrEntitySingleton = this.getXdiEntity().getXdiEntitySingleton(XdiEntitySingleton.createArcXri(XDIPolicyConstants.XRI_SS_OR), false);\r\n\t\tXdiEntitySingleton policyNotEntitySingleton = this.getXdiEntity().getXdiEntitySingleton(XdiEntitySingleton.createArcXri(XDIPolicyConstants.XRI_SS_NOT), false);\r\n\t\tXdiEntityCollection policyAndEntityCollection = this.getXdiEntity().getXdiEntityCollection(XdiEntityCollection.createArcXri(XDIPolicyConstants.XRI_SS_AND), false);\r\n\t\tXdiEntityCollection policyOrEntityCollection = this.getXdiEntity().getXdiEntityCollection(XdiEntityCollection.createArcXri(XDIPolicyConstants.XRI_SS_OR), false);\r\n\t\tXdiEntityCollection policyNotEntityCollection = this.getXdiEntity().getXdiEntityCollection(XdiEntityCollection.createArcXri(XDIPolicyConstants.XRI_SS_NOT), false);\r", "old_methods": [], "patch": "@@ -19,12 +19,12 @@\n import xdi2.core.features.nodetypes.XdiEntityMemberOrdered;\r\n import xdi2.core.features.nodetypes.XdiEntityMemberUnordered;\r\n import xdi2.core.features.nodetypes.XdiEntitySingleton;\r\n+import xdi2.core.syntax.XDIArc;\r\n import xdi2.core.util.iterators.CompositeIterator;\r\n import xdi2.core.util.iterators.MappingIterator;\r\n import xdi2.core.util.iterators.NotNullIterator;\r\n import xdi2.core.util.iterators.ReadOnlyIterator;\r\n import xdi2.core.util.iterators.SingleItemIterator;\r\n-import xdi2.core.xri3.XDI3SubSegment;\r\n \r\n /**\r\n * An XDI policy, represented as a context node.\r\n@@ -115,14 +115,14 @@ public ContextNode getContextNode() {\n \t * Returns the policy XRI of the XDI policy (e.g. $and, $or).\r\n \t * @return The policy XRI of the XDI policy.\r\n \t */\r\n-\tpublic XDI3SubSegment getPolicyXri() {\r\n+\tpublic XDIArc getPolicyXri() {\r\n \r\n \t\tif (this.getXdiEntity() instanceof XdiEntitySingleton)\r\n-\t\t\treturn ((XdiEntitySingleton) this.getXdiEntity()).getBaseArcXri();\r\n+\t\t\treturn ((XdiEntitySingleton) this.getXdiEntity()).getBasearc();\r\n \t\telse if (this.getXdiEntity() instanceof XdiEntityMemberUnordered)\r\n-\t\t\treturn ((XdiEntityMemberUnordered) this.getXdiEntity()).getXdiCollection().getBaseArcXri();\r\n+\t\t\treturn ((XdiEntityMemberUnordered) this.getXdiEntity()).getXdiCollection().getBasearc();\r\n \t\telse if (this.getXdiEntity() instanceof XdiEntityMemberOrdered)\r\n-\t\t\treturn ((XdiEntityMemberOrdered) this.getXdiEntity()).getXdiCollection().getBaseArcXri();\r\n+\t\t\treturn ((XdiEntityMemberOrdered) this.getXdiEntity()).getXdiCollection().getBasearc();\r\n \r\n \t\treturn null;\r\n \t}\r\n@@ -135,9 +135,9 @@ public PolicyAnd createAndPolicy(boolean singleton) {\n \t\tXdiEntity policyAndXdiEntity; \r\n \t\t\r\n \t\tif (singleton)\r\n-\t\t\tpolicyAndXdiEntity = this.getXdiEntity().getXdiEntitySingleton(XdiEntitySingleton.createArcXri(XDIPolicyConstants.XRI_SS_AND), true);\r\n+\t\t\tpolicyAndXdiEntity = this.getXdiEntity().getXdiEntitySingleton(XdiEntitySingleton.createarc(XDIPolicyConstants.XDI_ARC_AND), true);\r\n \t\telse\r\n-\t\t\tpolicyAndXdiEntity = this.getXdiEntity().getXdiEntityCollection(XdiEntityCollection.createArcXri(XDIPolicyConstants.XRI_SS_AND), true).setXdiMemberUnordered(null);\r\n+\t\t\tpolicyAndXdiEntity = this.getXdiEntity().getXdiEntityCollection(XdiEntityCollection.createarc(XDIPolicyConstants.XDI_ARC_AND), true).setXdiMemberUnordered(null);\r\n \r\n \t\treturn PolicyAnd.fromXdiEntity(policyAndXdiEntity);\r\n \t}\r\n@@ -150,9 +150,9 @@ public PolicyOr createOrPolicy(boolean singleton) {\n \t\tXdiEntity policyOrXdiEntity; \r\n \t\t\r\n \t\tif (singleton)\r\n-\t\t\tpolicyOrXdiEntity = this.getXdiEntity().getXdiEntitySingleton(XdiEntitySingleton.createArcXri(XDIPolicyConstants.XRI_SS_OR), true);\r\n+\t\t\tpolicyOrXdiEntity = this.getXdiEntity().getXdiEntitySingleton(XdiEntitySingleton.createarc(XDIPolicyConstants.XDI_ARC_OR), true);\r\n \t\telse\r\n-\t\t\tpolicyOrXdiEntity = this.getXdiEntity().getXdiEntityCollection(XdiEntityCollection.createArcXri(XDIPolicyConstants.XRI_SS_OR), true).setXdiMemberUnordered(null);\r\n+\t\t\tpolicyOrXdiEntity = this.getXdiEntity().getXdiEntityCollection(XdiEntityCollection.createarc(XDIPolicyConstants.XDI_ARC_OR), true).setXdiMemberUnordered(null);\r\n \r\n \t\treturn PolicyOr.fromXdiEntity(policyOrXdiEntity);\r\n \t}\r\n@@ -165,9 +165,9 @@ public PolicyNot createNotPolicy(boolean singleton) {\n \t\tXdiEntity policyNotXdiEntity; \r\n \t\t\r\n \t\tif (singleton)\r\n-\t\t\tpolicyNotXdiEntity = this.getXdiEntity().getXdiEntitySingleton(XdiEntitySingleton.createArcXri(XDIPolicyConstants.XRI_SS_NOT), true);\r\n+\t\t\tpolicyNotXdiEntity = this.getXdiEntity().getXdiEntitySingleton(XdiEntitySingleton.createarc(XDIPolicyConstants.XDI_ARC_NOT), true);\r\n \t\telse\r\n-\t\t\tpolicyNotXdiEntity = this.getXdiEntity().getXdiEntityCollection(XdiEntityCollection.createArcXri(XDIPolicyConstants.XRI_SS_NOT), true).setXdiMemberUnordered(null);\r\n+\t\t\tpolicyNotXdiEntity = this.getXdiEntity().getXdiEntityCollection(XdiEntityCollection.createarc(XDIPolicyConstants.XDI_ARC_NOT), true).setXdiMemberUnordered(null);\r\n \r\n \t\treturn PolicyNot.fromXdiEntity(policyNotXdiEntity);\r\n \t}\r\n@@ -181,19 +181,19 @@ public ReadOnlyIterator<Policy> getPolicies() {\n \r\n \t\t// add policies that are XDI entity singletons\r\n \r\n-\t\tXdiEntitySingleton policyAndEntitySingleton = this.getXdiEntity().getXdiEntitySingleton(XdiEntitySingleton.createArcXri(XDIPolicyConstants.XRI_SS_AND), false);\r\n-\t\tXdiEntitySingleton policyOrEntitySingleton = this.getXdiEntity().getXdiEntitySingleton(XdiEntitySingleton.createArcXri(XDIPolicyConstants.XRI_SS_OR), false);\r\n-\t\tXdiEntitySingleton policyNotEntitySingleton = this.getXdiEntity().getXdiEntitySingleton(XdiEntitySingleton.createArcXri(XDIPolicyConstants.XRI_SS_NOT), false);\r\n+\t\tXdiEntitySingleton policyAndEntitySingleton = this.getXdiEntity().getXdiEntitySingleton(XdiEntitySingleton.createarc(XDIPolicyConstants.XDI_ARC_AND), false);\r\n+\t\tXdiEntitySingleton policyOrEntitySingleton = this.getXdiEntity().getXdiEntitySingleton(XdiEntitySingleton.createarc(XDIPolicyConstants.XDI_ARC_OR), false);\r\n+\t\tXdiEntitySingleton policyNotEntitySingleton = this.getXdiEntity().getXdiEntitySingleton(XdiEntitySingleton.createarc(XDIPolicyConstants.XDI_ARC_NOT), false);\r\n \r\n \t\tif (policyAndEntitySingleton != null) iterators.add(new SingleItemIterator<Policy> (PolicyAnd.fromXdiEntity(policyAndEntitySingleton)));\r\n \t\tif (policyOrEntitySingleton != null) iterators.add(new SingleItemIterator<Policy> (PolicyOr.fromXdiEntity(policyOrEntitySingleton)));\r\n \t\tif (policyNotEntitySingleton != null) iterators.add(new SingleItemIterator<Policy> (PolicyNot.fromXdiEntity(policyNotEntitySingleton)));\r\n \r\n \t\t// add policies that are XDI entity instances\r\n \r\n-\t\tXdiEntityCollection policyAndEntityCollection = this.getXdiEntity().getXdiEntityCollection(XdiEntityCollection.createArcXri(XDIPolicyConstants.XRI_SS_AND), false);\r\n-\t\tXdiEntityCollection policyOrEntityCollection = this.getXdiEntity().getXdiEntityCollection(XdiEntityCollection.createArcXri(XDIPolicyConstants.XRI_SS_OR), false);\r\n-\t\tXdiEntityCollection policyNotEntityCollection = this.getXdiEntity().getXdiEntityCollection(XdiEntityCollection.createArcXri(XDIPolicyConstants.XRI_SS_NOT), false);\r\n+\t\tXdiEntityCollection policyAndEntityCollection = this.getXdiEntity().getXdiEntityCollection(XdiEntityCollection.createarc(XDIPolicyConstants.XDI_ARC_AND), false);\r\n+\t\tXdiEntityCollection policyOrEntityCollection = this.getXdiEntity().getXdiEntityCollection(XdiEntityCollection.createarc(XDIPolicyConstants.XDI_ARC_OR), false);\r\n+\t\tXdiEntityCollection policyNotEntityCollection = this.getXdiEntity().getXdiEntityCollection(XdiEntityCollection.createarc(XDIPolicyConstants.XDI_ARC_NOT), false);\r\n \r\n \t\tif (policyAndEntityCollection != null) iterators.add(new MappingXdiEntityPolicyAndIterator(policyAndEntityCollection.getXdiMembersDeref()));\r\n \t\tif (policyOrEntityCollection != null) iterators.add(new MappingXdiEntityPolicyOrIterator(policyOrEntityCollection.getXdiMembersDeref()));\r", "raw_url": "https://github.com/projectdanube/xdi2/raw/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Flinkcontracts%2Fpolicy%2FPolicy.java", "sha": "835424599a4a0118fff21af4616ebce5e24d3864", "status": "modified" }, { "additions": 3, "blob_url": "https://github.com/projectdanube/xdi2/blob/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Flinkcontracts%2Fpolicy%2FPolicyAnd.java", "changes": 6, "contents_url": "https://api.github.com/repos/projectdanube/xdi2/contents/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Flinkcontracts%2Fpolicy%2FPolicyAnd.java?ref=0ca7982fec30c2bb8204efbbea61428a643d2e9c", "deletions": 3, "filename": "core/src/main/java/xdi2/core/features/linkcontracts/policy/PolicyAnd.java", "new_code": "\t\t\treturn ((XdiEntitySingleton) xdiEntity).getBasearc().equals(XDIPolicyConstants.XDI_ARC_AND);\r\n\t\t\treturn ((XdiEntityMemberUnordered) xdiEntity).getXdiCollection().getBasearc().equals(XDIPolicyConstants.XDI_ARC_AND);\r\n\t\t\treturn ((XdiEntityMemberOrdered) xdiEntity).getXdiCollection().getBasearc().equals(XDIPolicyConstants.XDI_ARC_AND);\r", "new_methods": [], "old_code": "\t\t\treturn ((XdiEntitySingleton) xdiEntity).getBaseArcXri().equals(XDIPolicyConstants.XRI_SS_AND);\r\n\t\t\treturn ((XdiEntityMemberUnordered) xdiEntity).getXdiCollection().getBaseArcXri().equals(XDIPolicyConstants.XRI_SS_AND);\r\n\t\t\treturn ((XdiEntityMemberOrdered) xdiEntity).getXdiCollection().getBaseArcXri().equals(XDIPolicyConstants.XRI_SS_AND);\r", "old_methods": [], "patch": "@@ -36,11 +36,11 @@ protected PolicyAnd(XdiEntity xdiEntity) {\n \tpublic static boolean isValid(XdiEntity xdiEntity) {\r\n \r\n \t\tif (xdiEntity instanceof XdiEntitySingleton)\r\n-\t\t\treturn ((XdiEntitySingleton) xdiEntity).getBaseArcXri().equals(XDIPolicyConstants.XRI_SS_AND);\r\n+\t\t\treturn ((XdiEntitySingleton) xdiEntity).getBasearc().equals(XDIPolicyConstants.XDI_ARC_AND);\r\n \t\telse if (xdiEntity instanceof XdiEntityMemberUnordered)\r\n-\t\t\treturn ((XdiEntityMemberUnordered) xdiEntity).getXdiCollection().getBaseArcXri().equals(XDIPolicyConstants.XRI_SS_AND);\r\n+\t\t\treturn ((XdiEntityMemberUnordered) xdiEntity).getXdiCollection().getBasearc().equals(XDIPolicyConstants.XDI_ARC_AND);\r\n \t\telse if (xdiEntity instanceof XdiEntityMemberOrdered)\r\n-\t\t\treturn ((XdiEntityMemberOrdered) xdiEntity).getXdiCollection().getBaseArcXri().equals(XDIPolicyConstants.XRI_SS_AND);\r\n+\t\t\treturn ((XdiEntityMemberOrdered) xdiEntity).getXdiCollection().getBasearc().equals(XDIPolicyConstants.XDI_ARC_AND);\r\n \r\n \t\treturn false;\r\n \t}\r", "raw_url": "https://github.com/projectdanube/xdi2/raw/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Flinkcontracts%2Fpolicy%2FPolicyAnd.java", "sha": "cca93224a044c0a683023c70b57a69be44dfc6f2", "status": "modified" }, { "additions": 3, "blob_url": "https://github.com/projectdanube/xdi2/blob/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Flinkcontracts%2Fpolicy%2FPolicyNot.java", "changes": 6, "contents_url": "https://api.github.com/repos/projectdanube/xdi2/contents/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Flinkcontracts%2Fpolicy%2FPolicyNot.java?ref=0ca7982fec30c2bb8204efbbea61428a643d2e9c", "deletions": 3, "filename": "core/src/main/java/xdi2/core/features/linkcontracts/policy/PolicyNot.java", "new_code": "\t\t\treturn ((XdiEntitySingleton) xdiEntity).getBasearc().equals(XDIPolicyConstants.XDI_ARC_NOT);\r\n\t\t\treturn ((XdiEntityMemberUnordered) xdiEntity).getXdiCollection().getBasearc().equals(XDIPolicyConstants.XDI_ARC_NOT);\r\n\t\t\treturn ((XdiEntityMemberOrdered) xdiEntity).getXdiCollection().getBasearc().equals(XDIPolicyConstants.XDI_ARC_NOT);\r", "new_methods": [], "old_code": "\t\t\treturn ((XdiEntitySingleton) xdiEntity).getBaseArcXri().equals(XDIPolicyConstants.XRI_SS_NOT);\r\n\t\t\treturn ((XdiEntityMemberUnordered) xdiEntity).getXdiCollection().getBaseArcXri().equals(XDIPolicyConstants.XRI_SS_NOT);\r\n\t\t\treturn ((XdiEntityMemberOrdered) xdiEntity).getXdiCollection().getBaseArcXri().equals(XDIPolicyConstants.XRI_SS_NOT);\r", "old_methods": [], "patch": "@@ -36,11 +36,11 @@ protected PolicyNot(XdiEntity xdiEntity) {\n \tpublic static boolean isValid(XdiEntity xdiEntity) {\r\n \r\n \t\tif (xdiEntity instanceof XdiEntitySingleton)\r\n-\t\t\treturn ((XdiEntitySingleton) xdiEntity).getBaseArcXri().equals(XDIPolicyConstants.XRI_SS_NOT);\r\n+\t\t\treturn ((XdiEntitySingleton) xdiEntity).getBasearc().equals(XDIPolicyConstants.XDI_ARC_NOT);\r\n \t\telse if (xdiEntity instanceof XdiEntityMemberUnordered)\r\n-\t\t\treturn ((XdiEntityMemberUnordered) xdiEntity).getXdiCollection().getBaseArcXri().equals(XDIPolicyConstants.XRI_SS_NOT);\r\n+\t\t\treturn ((XdiEntityMemberUnordered) xdiEntity).getXdiCollection().getBasearc().equals(XDIPolicyConstants.XDI_ARC_NOT);\r\n \t\telse if (xdiEntity instanceof XdiEntityMemberOrdered)\r\n-\t\t\treturn ((XdiEntityMemberOrdered) xdiEntity).getXdiCollection().getBaseArcXri().equals(XDIPolicyConstants.XRI_SS_NOT);\r\n+\t\t\treturn ((XdiEntityMemberOrdered) xdiEntity).getXdiCollection().getBasearc().equals(XDIPolicyConstants.XDI_ARC_NOT);\r\n \r\n \t\treturn false;\r\n \t}\r", "raw_url": "https://github.com/projectdanube/xdi2/raw/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Flinkcontracts%2Fpolicy%2FPolicyNot.java", "sha": "23527c18292c91c31bdbfe1f79eed76def758158", "status": "modified" }, { "additions": 3, "blob_url": "https://github.com/projectdanube/xdi2/blob/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Flinkcontracts%2Fpolicy%2FPolicyOr.java", "changes": 6, "contents_url": "https://api.github.com/repos/projectdanube/xdi2/contents/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Flinkcontracts%2Fpolicy%2FPolicyOr.java?ref=0ca7982fec30c2bb8204efbbea61428a643d2e9c", "deletions": 3, "filename": "core/src/main/java/xdi2/core/features/linkcontracts/policy/PolicyOr.java", "new_code": "\t\t\treturn ((XdiEntitySingleton) xdiEntity).getBasearc().equals(XDIPolicyConstants.XDI_ARC_OR);\r\n\t\t\treturn ((XdiEntityMemberUnordered) xdiEntity).getXdiCollection().getBasearc().equals(XDIPolicyConstants.XDI_ARC_OR);\r\n\t\t\treturn ((XdiEntityMemberOrdered) xdiEntity).getXdiCollection().getBasearc().equals(XDIPolicyConstants.XDI_ARC_OR);\r", "new_methods": [], "old_code": "\t\t\treturn ((XdiEntitySingleton) xdiEntity).getBaseArcXri().equals(XDIPolicyConstants.XRI_SS_OR);\r\n\t\t\treturn ((XdiEntityMemberUnordered) xdiEntity).getXdiCollection().getBaseArcXri().equals(XDIPolicyConstants.XRI_SS_OR);\r\n\t\t\treturn ((XdiEntityMemberOrdered) xdiEntity).getXdiCollection().getBaseArcXri().equals(XDIPolicyConstants.XRI_SS_OR);\r", "old_methods": [], "patch": "@@ -36,11 +36,11 @@ protected PolicyOr(XdiEntity xdiEntity) {\n \tpublic static boolean isValid(XdiEntity xdiEntity) {\r\n \r\n \t\tif (xdiEntity instanceof XdiEntitySingleton)\r\n-\t\t\treturn ((XdiEntitySingleton) xdiEntity).getBaseArcXri().equals(XDIPolicyConstants.XRI_SS_OR);\r\n+\t\t\treturn ((XdiEntitySingleton) xdiEntity).getBasearc().equals(XDIPolicyConstants.XDI_ARC_OR);\r\n \t\telse if (xdiEntity instanceof XdiEntityMemberUnordered)\r\n-\t\t\treturn ((XdiEntityMemberUnordered) xdiEntity).getXdiCollection().getBaseArcXri().equals(XDIPolicyConstants.XRI_SS_OR);\r\n+\t\t\treturn ((XdiEntityMemberUnordered) xdiEntity).getXdiCollection().getBasearc().equals(XDIPolicyConstants.XDI_ARC_OR);\r\n \t\telse if (xdiEntity instanceof XdiEntityMemberOrdered)\r\n-\t\t\treturn ((XdiEntityMemberOrdered) xdiEntity).getXdiCollection().getBaseArcXri().equals(XDIPolicyConstants.XRI_SS_OR);\r\n+\t\t\treturn ((XdiEntityMemberOrdered) xdiEntity).getXdiCollection().getBasearc().equals(XDIPolicyConstants.XDI_ARC_OR);\r\n \r\n \t\treturn false;\r\n \t}\r", "raw_url": "https://github.com/projectdanube/xdi2/raw/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Flinkcontracts%2Fpolicy%2FPolicyOr.java", "sha": "f0a664b679f2d0b5f1f47037a86fbed50c772254", "status": "modified" }, { "additions": 3, "blob_url": "https://github.com/projectdanube/xdi2/blob/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Flinkcontracts%2Fpolicy%2FPolicyRoot.java", "changes": 6, "contents_url": "https://api.github.com/repos/projectdanube/xdi2/contents/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Flinkcontracts%2Fpolicy%2FPolicyRoot.java?ref=0ca7982fec30c2bb8204efbbea61428a643d2e9c", "deletions": 3, "filename": "core/src/main/java/xdi2/core/features/linkcontracts/policy/PolicyRoot.java", "new_code": "\t\t\treturn ((XdiEntitySingleton) xdiEntity).getBasearc().equals(XDIPolicyConstants.XDI_ARC_IF);\r\n\t\t\treturn ((XdiEntityMemberUnordered) xdiEntity).getXdiCollection().getBasearc().equals(XDIPolicyConstants.XDI_ARC_IF);\r\n\t\t\treturn ((XdiEntityMemberOrdered) xdiEntity).getXdiCollection().getBasearc().equals(XDIPolicyConstants.XDI_ARC_IF);\r", "new_methods": [], "old_code": "\t\t\treturn ((XdiEntitySingleton) xdiEntity).getBaseArcXri().equals(XDIPolicyConstants.XRI_SS_IF);\r\n\t\t\treturn ((XdiEntityMemberUnordered) xdiEntity).getXdiCollection().getBaseArcXri().equals(XDIPolicyConstants.XRI_SS_IF);\r\n\t\t\treturn ((XdiEntityMemberOrdered) xdiEntity).getXdiCollection().getBaseArcXri().equals(XDIPolicyConstants.XRI_SS_IF);\r", "old_methods": [], "patch": "@@ -36,11 +36,11 @@ protected PolicyRoot(XdiEntity xdiEntity) {\n \tpublic static boolean isValid(XdiEntity xdiEntity) {\r\n \r\n \t\tif (xdiEntity instanceof XdiEntitySingleton)\r\n-\t\t\treturn ((XdiEntitySingleton) xdiEntity).getBaseArcXri().equals(XDIPolicyConstants.XRI_SS_IF);\r\n+\t\t\treturn ((XdiEntitySingleton) xdiEntity).getBasearc().equals(XDIPolicyConstants.XDI_ARC_IF);\r\n \t\telse if (xdiEntity instanceof XdiEntityMemberUnordered)\r\n-\t\t\treturn ((XdiEntityMemberUnordered) xdiEntity).getXdiCollection().getBaseArcXri().equals(XDIPolicyConstants.XRI_SS_IF);\r\n+\t\t\treturn ((XdiEntityMemberUnordered) xdiEntity).getXdiCollection().getBasearc().equals(XDIPolicyConstants.XDI_ARC_IF);\r\n \t\telse if (xdiEntity instanceof XdiEntityMemberOrdered)\r\n-\t\t\treturn ((XdiEntityMemberOrdered) xdiEntity).getXdiCollection().getBaseArcXri().equals(XDIPolicyConstants.XRI_SS_IF);\r\n+\t\t\treturn ((XdiEntityMemberOrdered) xdiEntity).getXdiCollection().getBasearc().equals(XDIPolicyConstants.XDI_ARC_IF);\r\n \r\n \t\treturn false;\r\n \t}\r", "raw_url": "https://github.com/projectdanube/xdi2/raw/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Flinkcontracts%2Fpolicy%2FPolicyRoot.java", "sha": "192bdc27839c366a872fffc7acab0df3950f7614", "status": "modified" }, { "additions": 8, "blob_url": "https://github.com/projectdanube/xdi2/blob/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Flinkcontracts%2Fpolicy%2FPolicyUtil.java", "changes": 16, "contents_url": "https://api.github.com/repos/projectdanube/xdi2/contents/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Flinkcontracts%2Fpolicy%2FPolicyUtil.java?ref=0ca7982fec30c2bb8204efbbea61428a643d2e9c", "deletions": 8, "filename": "core/src/main/java/xdi2/core/features/linkcontracts/policy/PolicyUtil.java", "new_code": "import xdi2.core.syntax.XDIAddress;\r\nimport xdi2.core.syntax.XDIStatement;\r\n\tpublic static Operator createSenderIsOperator(Policy policy, XDIAddress sender) {\r\n\t\t\t\tXDIAddress.create(\"{$from}\"), \r\n\t\tCondition condition = GenericCondition.fromStatement(XDIStatement.fromLiteralComponents(\r\n\t\t\t\tXDIAddress.create(\"{$msg}\" + XDIAuthenticationConstants.XDI_ADD_SECRET_TOKEN_VALID + \"&\"), \r\n\t\tCondition condition = GenericCondition.fromStatement(XDIStatement.fromLiteralComponents(\r\n\t\t\t\tXDIAddress.create(\"{$msg}\" + XDIAuthenticationConstants.XDI_ADD_SIGNATURE_VALID + \"&\"), \r", "new_methods": [ { "arguments": [ "Policy policy", " XDIAddress sender" ], "filename": "core/src/main/java/xdi2/core/features/linkcontracts/policy/PolicyUtil.java", "implementation": "XDIAddress.create(\"{$from", "signature": "Operator createSenderIsOperator(Policy policy, XDIAddress sender)" } ], "old_code": "import xdi2.core.xri3.XDI3Segment;\r\nimport xdi2.core.xri3.XDI3Statement;\r\n\tpublic static Operator createSenderIsOperator(Policy policy, XDI3Segment sender) {\r\n\t\t\t\tXDI3Segment.create(\"{$from}\"), \r\n\t\tCondition condition = GenericCondition.fromStatement(XDI3Statement.fromLiteralComponents(\r\n\t\t\t\tXDI3Segment.create(\"{$msg}\" + XDIAuthenticationConstants.XRI_S_SECRET_TOKEN_VALID + \"&\"), \r\n\t\tCondition condition = GenericCondition.fromStatement(XDI3Statement.fromLiteralComponents(\r\n\t\t\t\tXDI3Segment.create(\"{$msg}\" + XDIAuthenticationConstants.XRI_S_SIGNATURE_VALID + \"&\"), \r", "old_methods": [ { "arguments": [ "Policy policy", " XDI3Segment sender" ], "filename": "core/src/main/java/xdi2/core/features/linkcontracts/policy/PolicyUtil.java", "implementation": "XDI3Segment.create(\"{$from", "signature": "Operator createSenderIsOperator(Policy policy, XDI3Segment sender)" } ], "patch": "@@ -6,8 +6,8 @@\n import xdi2.core.features.linkcontracts.condition.IsCondition;\r\n import xdi2.core.features.linkcontracts.operator.Operator;\r\n import xdi2.core.features.linkcontracts.operator.TrueOperator;\r\n-import xdi2.core.xri3.XDI3Segment;\r\n-import xdi2.core.xri3.XDI3Statement;\r\n+import xdi2.core.syntax.XDIAddress;\r\n+import xdi2.core.syntax.XDIStatement;\r\n \r\n /**\r\n * Various utility methods for working with XDI policies.\r\n@@ -22,28 +22,28 @@ private PolicyUtil() { }\n \t * Helper methods to create various XDI policy statements.\r\n \t */\r\n \r\n-\tpublic static Operator createSenderIsOperator(Policy policy, XDI3Segment sender) {\r\n+\tpublic static Operator createSenderIsOperator(Policy policy, XDIAddress sender) {\r\n \r\n \t\tCondition condition = IsCondition.fromSubjectAndObject(\r\n-\t\t\t\tXDI3Segment.create(\"{$from}\"), \r\n+\t\t\t\tXDIAddress.create(\"{$from}\"), \r\n \t\t\t\tsender);\r\n \r\n \t\treturn TrueOperator.createTrueOperator(policy, condition);\r\n \t}\r\n \r\n \tpublic static Operator createSecretTokenValidOperator(Policy policy) {\r\n \r\n-\t\tCondition condition = GenericCondition.fromStatement(XDI3Statement.fromLiteralComponents(\r\n-\t\t\t\tXDI3Segment.create(\"{$msg}\" + XDIAuthenticationConstants.XRI_S_SECRET_TOKEN_VALID + \"&\"), \r\n+\t\tCondition condition = GenericCondition.fromStatement(XDIStatement.fromLiteralComponents(\r\n+\t\t\t\tXDIAddress.create(\"{$msg}\" + XDIAuthenticationConstants.XDI_ADD_SECRET_TOKEN_VALID + \"&\"), \r\n \t\t\t\tBoolean.TRUE));\r\n \r\n \t\treturn TrueOperator.createTrueOperator(policy, condition);\r\n \t}\r\n \r\n \tpublic static Operator createSignatureValidOperator(Policy policy) {\r\n \r\n-\t\tCondition condition = GenericCondition.fromStatement(XDI3Statement.fromLiteralComponents(\r\n-\t\t\t\tXDI3Segment.create(\"{$msg}\" + XDIAuthenticationConstants.XRI_S_SIGNATURE_VALID + \"&\"), \r\n+\t\tCondition condition = GenericCondition.fromStatement(XDIStatement.fromLiteralComponents(\r\n+\t\t\t\tXDIAddress.create(\"{$msg}\" + XDIAuthenticationConstants.XDI_ADD_SIGNATURE_VALID + \"&\"), \r\n \t\t\t\tBoolean.TRUE));\r\n \r\n \t\treturn TrueOperator.createTrueOperator(policy, condition);\r", "raw_url": "https://github.com/projectdanube/xdi2/raw/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Flinkcontracts%2Fpolicy%2FPolicyUtil.java", "sha": "312fc5a05120e62a15b5e55cf9ba5c2a9e30ef29", "status": "modified" }, { "additions": 13, "blob_url": "https://github.com/projectdanube/xdi2/blob/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Fnodetypes%2FXdiAbstractCollection.java", "changes": 26, "contents_url": "https://api.github.com/repos/projectdanube/xdi2/contents/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Fnodetypes%2FXdiAbstractCollection.java?ref=0ca7982fec30c2bb8204efbbea61428a643d2e9c", "deletions": 13, "filename": "core/src/main/java/xdi2/core/features/nodetypes/XdiAbstractCollection.java", "new_code": "import xdi2.core.syntax.XDIArc;\r\n\tpublic static boolean isValidarc(XDIArc arc) {\r\n\t\treturn XdiEntityCollection.isValidarc(arc) || \r\n\t\t\t\tXdiAttributeCollection.isValidarc(arc);\r\n\tpublic U setXdiMemberUnordered(XDIArc arc) {\r\n\t\tif (arc == null) arc = XdiAbstractMemberUnordered.createRandomUuidarc(attribute);\r\n\t\tContextNode memberContextNode = this.getContextNode().setContextNode(arc);\r\n\tpublic U getXdiMemberUnordered(XDIArc arc) {\r\n\t\tContextNode memberContextNode = this.getContextNode().getContextNode(arc, false);\r\n\t\tXDIArc arc = XdiAbstractMemberOrdered.createarc(Long.toString(index), attribute);\r\n\t\tContextNode contextNode = this.getContextNode().setContextNode(arc);\r\n\t\tXDIArc arc = XdiAbstractMemberOrdered.createarc(Long.toString(index), attribute);\r\n\t\tContextNode contextNode = this.getContextNode().getContextNode(arc, false);\r", "new_methods": [], "old_code": "import xdi2.core.xri3.XDI3SubSegment;\r\n\tpublic static boolean isValidArcXri(XDI3SubSegment arcXri) {\r\n\t\treturn XdiEntityCollection.isValidArcXri(arcXri) || \r\n\t\t\t\tXdiAttributeCollection.isValidArcXri(arcXri);\r\n\tpublic U setXdiMemberUnordered(XDI3SubSegment arcXri) {\r\n\t\tif (arcXri == null) arcXri = XdiAbstractMemberUnordered.createRandomUuidArcXri(attribute);\r\n\t\tContextNode memberContextNode = this.getContextNode().setContextNode(arcXri);\r\n\tpublic U getXdiMemberUnordered(XDI3SubSegment arcXri) {\r\n\t\tContextNode memberContextNode = this.getContextNode().getContextNode(arcXri, false);\r\n\t\tXDI3SubSegment arcXri = XdiAbstractMemberOrdered.createArcXri(Long.toString(index), attribute);\r\n\t\tContextNode contextNode = this.getContextNode().setContextNode(arcXri);\r\n\t\tXDI3SubSegment arcXri = XdiAbstractMemberOrdered.createArcXri(Long.toString(index), attribute);\r\n\t\tContextNode contextNode = this.getContextNode().getContextNode(arcXri, false);\r", "old_methods": [], "patch": "@@ -9,6 +9,7 @@\n \r\n import xdi2.core.ContextNode;\r\n import xdi2.core.features.nodetypes.XdiAbstractMemberUnordered.MappingContextNodeXdiMemberUnorderedIterator;\r\n+import xdi2.core.syntax.XDIArc;\r\n import xdi2.core.util.iterators.CastingIterator;\r\n import xdi2.core.util.iterators.CompositeIterator;\r\n import xdi2.core.util.iterators.IteratorCounter;\r\n@@ -17,7 +18,6 @@\n import xdi2.core.util.iterators.NoDuplicatesIterator;\r\n import xdi2.core.util.iterators.NotNullIterator;\r\n import xdi2.core.util.iterators.ReadOnlyIterator;\r\n-import xdi2.core.xri3.XDI3SubSegment;\r\n \r\n public abstract class XdiAbstractCollection<EQC extends XdiCollection<EQC, EQI, C, U, O, I>, EQI extends XdiSubGraph<EQI>, C extends XdiCollection<EQC, EQI, C, U, O, I>, U extends XdiMemberUnordered<EQC, EQI, C, U, O, I>, O extends XdiMemberOrdered<EQC, EQI, C, U, O, I>, I extends XdiMember<EQC, EQI, C, U, O, I>> extends XdiAbstractSubGraph<EQC> implements XdiCollection<EQC, EQI, C, U, O, I> {\r\n \r\n@@ -74,10 +74,10 @@ public static boolean isValid(ContextNode contextNode) {\n \t * Methods for XRIs\r\n \t */\r\n \r\n-\tpublic static boolean isValidArcXri(XDI3SubSegment arcXri) {\r\n+\tpublic static boolean isValidarc(XDIArc arc) {\r\n \r\n-\t\treturn XdiEntityCollection.isValidArcXri(arcXri) || \r\n-\t\t\t\tXdiAttributeCollection.isValidArcXri(arcXri);\r\n+\t\treturn XdiEntityCollection.isValidarc(arc) || \r\n+\t\t\t\tXdiAttributeCollection.isValidarc(arc);\r\n \t}\r\n \r\n \t/*\r\n@@ -89,13 +89,13 @@ public static boolean isValidArcXri(XDI3SubSegment arcXri) {\n \t * @return The XDI instance.\r\n \t */\r\n \t@Override\r\n-\tpublic U setXdiMemberUnordered(XDI3SubSegment arcXri) {\r\n+\tpublic U setXdiMemberUnordered(XDIArc arc) {\r\n \r\n \t\tboolean attribute = this.attribute();\r\n \r\n-\t\tif (arcXri == null) arcXri = XdiAbstractMemberUnordered.createRandomUuidArcXri(attribute);\r\n+\t\tif (arc == null) arc = XdiAbstractMemberUnordered.createRandomUuidarc(attribute);\r\n \r\n-\t\tContextNode memberContextNode = this.getContextNode().setContextNode(arcXri);\r\n+\t\tContextNode memberContextNode = this.getContextNode().setContextNode(arc);\r\n \r\n \t\treturn XdiAbstractContext.fromContextNode(memberContextNode, this.getU());\r\n \t}\r\n@@ -105,9 +105,9 @@ public U setXdiMemberUnordered(XDI3SubSegment arcXri) {\n \t * @return The XDI instance.\r\n \t */\r\n \t@Override\r\n-\tpublic U getXdiMemberUnordered(XDI3SubSegment arcXri) {\r\n+\tpublic U getXdiMemberUnordered(XDIArc arc) {\r\n \t\t\r\n-\t\tContextNode memberContextNode = this.getContextNode().getContextNode(arcXri, false);\r\n+\t\tContextNode memberContextNode = this.getContextNode().getContextNode(arc, false);\r\n \t\tif (memberContextNode == null) return null;\r\n \r\n \t\treturn XdiAbstractContext.fromContextNode(memberContextNode, this.getU());\r\n@@ -143,9 +143,9 @@ public O setXdiMemberOrdered(long index) {\n \r\n \t\tif (index < 0) index = this.getXdiMembersOrderedCount();\r\n \r\n-\t\tXDI3SubSegment arcXri = XdiAbstractMemberOrdered.createArcXri(Long.toString(index), attribute);\r\n+\t\tXDIArc arc = XdiAbstractMemberOrdered.createarc(Long.toString(index), attribute);\r\n \r\n-\t\tContextNode contextNode = this.getContextNode().setContextNode(arcXri);\r\n+\t\tContextNode contextNode = this.getContextNode().setContextNode(arc);\r\n \r\n \t\treturn XdiAbstractContext.fromContextNode(contextNode, this.getO());\r\n \t}\r\n@@ -159,9 +159,9 @@ public O getXdiMemberOrdered(long index) {\n \r\n \t\tboolean attribute = this.attribute();\r\n \r\n-\t\tXDI3SubSegment arcXri = XdiAbstractMemberOrdered.createArcXri(Long.toString(index), attribute);\r\n+\t\tXDIArc arc = XdiAbstractMemberOrdered.createarc(Long.toString(index), attribute);\r\n \r\n-\t\tContextNode contextNode = this.getContextNode().getContextNode(arcXri, false);\r\n+\t\tContextNode contextNode = this.getContextNode().getContextNode(arc, false);\r\n \t\tif (contextNode == null) return null;\r\n \r\n \t\treturn XdiAbstractContext.fromContextNode(contextNode, this.getO());\r", "raw_url": "https://github.com/projectdanube/xdi2/raw/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Fnodetypes%2FXdiAbstractCollection.java", "sha": "0dd56bdab59056d2f3310b5bc619c1ea62ba2831", "status": "modified" }, { "additions": 39, "blob_url": "https://github.com/projectdanube/xdi2/blob/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Fnodetypes%2FXdiAbstractContext.java", "changes": 78, "contents_url": "https://api.github.com/repos/projectdanube/xdi2/contents/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Fnodetypes%2FXdiAbstractContext.java?ref=0ca7982fec30c2bb8204efbbea61428a643d2e9c", "deletions": 39, "filename": "core/src/main/java/xdi2/core/features/nodetypes/XdiAbstractContext.java", "new_code": "import xdi2.core.syntax.XDIAddress;\r\nimport xdi2.core.syntax.XDIArc;\r\n\t * Returns the \"base\" arc, without context node type syntax.\r\n\t * @param arc The arc of a context node.\r\n\t * @return The \"base\" arc.\r\n\tpublic static XDIArc getBasearc(XDIArc arc) {\r\n\t\tif (arc.hasCs()) buffer.append(arc.getCs());\r\n\t\tif (arc.hasLiteral()) buffer.append(arc.getLiteral());\r\n\t\tif (arc.hasXRef()) buffer.append(arc.getXRef());\r\n\t\treturn XDIArc.create(buffer.toString());\r\n\tpublic XDIAddress getXri() {\r\n\t\treturn this.getContextNode().getAddress();\r\n\tpublic XDIArc getArc() {\r\n\t\treturn this.getContextNode().getArc();\r\n\t * Returns the \"base\" arc, without context node type syntax.\r\n\t * @return The \"base\" arc.\r\n\tpublic XDIArc getBasearc() {\r\n\t\treturn getBasearc(this.getArc());\r\n\t\treturn XdiLocalRoot.findLocalRoot(this.getGraph()).getRoot(this.getContextNode().getAddress(), false);\r\n\tpublic XdiInnerRoot getXdiInnerRoot(XDIAddress innerRootPredicateXri, boolean create) {\r\n\t\tXDIAddress innerRootSubjectXri = xdiRoot.absoluteToRelativeXri(this.getContextNode().getAddress());\r\n\tpublic XdiEntityCollection getXdiEntityCollection(XDIArc arc, boolean create) {\r\n\t\tContextNode entityCollectionContextNode = create ? this.getContextNode().setContextNode(arc) : this.getContextNode().getContextNode(arc, false);\r\n\tpublic XdiEntityCollection getXdiEntityCollection(XDIAddress xri, boolean create) {\r\n\tpublic XdiAttributeCollection getXdiAttributeCollection(XDIArc arc, boolean create) {\r\n\t\tContextNode attributeCollectionContextNode = create ? this.getContextNode().setContextNode(arc) : this.getContextNode().getContextNode(arc, false);\r\n\tpublic XdiAttributeCollection getXdiAttributeCollection(XDIAddress xri, boolean create) {\r\n\tpublic XdiEntitySingleton getXdiEntitySingleton(XDIArc arc, boolean create) {\r\n\t\tContextNode entitySingletonContextNode = create ? this.getContextNode().setContextNode(arc) : this.getContextNode().getContextNode(arc, false);\r\n\tpublic XdiEntitySingleton getXdiEntitySingleton(XDIAddress xri, boolean create) {\r\n\tpublic XdiAttributeSingleton getXdiAttributeSingleton(XDIArc arc, boolean create) {\r\n\t\tContextNode attributeSingletonContextNode = create ? this.getContextNode().setContextNode(arc) : this.getContextNode().getContextNode(arc, false);\r\n\tpublic XdiAttributeSingleton getXdiAttributeSingleton(XDIAddress xri, boolean create) {\r\n\tpublic XdiEntity getXdiEntity(XDIArc arc, boolean create) {\r\n\t\tContextNode entityContextNode = create ? this.getContextNode().setContextNode(arc) : this.getContextNode().getContextNode(arc, false);\r\n\tpublic XdiEntity getXdiEntity(XDIAddress xri, boolean create) {\r\n\tpublic XdiAttribute getXdiAttribute(XDIArc arc, boolean create) {\r\n\t\tContextNode attributeContextNode = create ? this.getContextNode().setContextNode(arc) : this.getContextNode().getContextNode(arc, false);\r\n\tpublic XdiAttribute getXdiAttribute(XDIAddress xri, boolean create) {\r", "new_methods": [], "old_code": "import xdi2.core.xri3.XDI3Segment;\r\nimport xdi2.core.xri3.XDI3SubSegment;\r\n\t * Returns the \"base\" arc XRI, without context node type syntax.\r\n\t * @param arcXri The arc XRI of a context node.\r\n\t * @return The \"base\" arc XRI.\r\n\tpublic static XDI3SubSegment getBaseArcXri(XDI3SubSegment arcXri) {\r\n\t\tif (arcXri.hasCs()) buffer.append(arcXri.getCs());\r\n\t\tif (arcXri.hasLiteral()) buffer.append(arcXri.getLiteral());\r\n\t\tif (arcXri.hasXRef()) buffer.append(arcXri.getXRef());\r\n\t\treturn XDI3SubSegment.create(buffer.toString());\r\n\tpublic XDI3Segment getXri() {\r\n\t\treturn this.getContextNode().getXri();\r\n\tpublic XDI3SubSegment getArcXri() {\r\n\t\treturn this.getContextNode().getArcXri();\r\n\t * Returns the \"base\" arc XRI, without context node type syntax.\r\n\t * @return The \"base\" arc XRI.\r\n\tpublic XDI3SubSegment getBaseArcXri() {\r\n\t\treturn getBaseArcXri(this.getArcXri());\r\n\t\treturn XdiLocalRoot.findLocalRoot(this.getGraph()).getRoot(this.getContextNode().getXri(), false);\r\n\tpublic XdiInnerRoot getXdiInnerRoot(XDI3Segment innerRootPredicateXri, boolean create) {\r\n\t\tXDI3Segment innerRootSubjectXri = xdiRoot.absoluteToRelativeXri(this.getContextNode().getXri());\r\n\tpublic XdiEntityCollection getXdiEntityCollection(XDI3SubSegment arcXri, boolean create) {\r\n\t\tContextNode entityCollectionContextNode = create ? this.getContextNode().setContextNode(arcXri) : this.getContextNode().getContextNode(arcXri, false);\r\n\tpublic XdiEntityCollection getXdiEntityCollection(XDI3Segment xri, boolean create) {\r\n\tpublic XdiAttributeCollection getXdiAttributeCollection(XDI3SubSegment arcXri, boolean create) {\r\n\t\tContextNode attributeCollectionContextNode = create ? this.getContextNode().setContextNode(arcXri) : this.getContextNode().getContextNode(arcXri, false);\r\n\tpublic XdiAttributeCollection getXdiAttributeCollection(XDI3Segment xri, boolean create) {\r\n\tpublic XdiEntitySingleton getXdiEntitySingleton(XDI3SubSegment arcXri, boolean create) {\r\n\t\tContextNode entitySingletonContextNode = create ? this.getContextNode().setContextNode(arcXri) : this.getContextNode().getContextNode(arcXri, false);\r\n\tpublic XdiEntitySingleton getXdiEntitySingleton(XDI3Segment xri, boolean create) {\r\n\tpublic XdiAttributeSingleton getXdiAttributeSingleton(XDI3SubSegment arcXri, boolean create) {\r\n\t\tContextNode attributeSingletonContextNode = create ? this.getContextNode().setContextNode(arcXri) : this.getContextNode().getContextNode(arcXri, false);\r\n\tpublic XdiAttributeSingleton getXdiAttributeSingleton(XDI3Segment xri, boolean create) {\r\n\tpublic XdiEntity getXdiEntity(XDI3SubSegment arcXri, boolean create) {\r\n\t\tContextNode entityContextNode = create ? this.getContextNode().setContextNode(arcXri) : this.getContextNode().getContextNode(arcXri, false);\r\n\tpublic XdiEntity getXdiEntity(XDI3Segment xri, boolean create) {\r\n\tpublic XdiAttribute getXdiAttribute(XDI3SubSegment arcXri, boolean create) {\r\n\t\tContextNode attributeContextNode = create ? this.getContextNode().setContextNode(arcXri) : this.getContextNode().getContextNode(arcXri, false);\r\n\tpublic XdiAttribute getXdiAttribute(XDI3Segment xri, boolean create) {\r", "old_methods": [], "patch": "@@ -6,9 +6,9 @@\n import xdi2.core.ContextNode;\r\n import xdi2.core.Graph;\r\n import xdi2.core.features.equivalence.Equivalence;\r\n+import xdi2.core.syntax.XDIAddress;\r\n+import xdi2.core.syntax.XDIArc;\r\n import xdi2.core.util.iterators.MappingIterator;\r\n-import xdi2.core.xri3.XDI3Segment;\r\n-import xdi2.core.xri3.XDI3SubSegment;\r\n \r\n /**\r\n * An XDI subgraph according to the multiplicity pattern, represented as a context node.\r\n@@ -75,19 +75,19 @@ public static <T extends XdiContext<?>> T fromContextNode(ContextNode contextNod\n \t}\r\n \r\n \t/**\r\n-\t * Returns the \"base\" arc XRI, without context node type syntax.\r\n-\t * @param arcXri The arc XRI of a context node.\r\n-\t * @return The \"base\" arc XRI.\r\n+\t * Returns the \"base\" arc, without context node type syntax.\r\n+\t * @param arc The arc of a context node.\r\n+\t * @return The \"base\" arc.\r\n \t */\r\n-\tpublic static XDI3SubSegment getBaseArcXri(XDI3SubSegment arcXri) {\r\n+\tpublic static XDIArc getBasearc(XDIArc arc) {\r\n \r\n \t\tStringBuilder buffer = new StringBuilder();\r\n \r\n-\t\tif (arcXri.hasCs()) buffer.append(arcXri.getCs());\r\n-\t\tif (arcXri.hasLiteral()) buffer.append(arcXri.getLiteral());\r\n-\t\tif (arcXri.hasXRef()) buffer.append(arcXri.getXRef());\r\n+\t\tif (arc.hasCs()) buffer.append(arc.getCs());\r\n+\t\tif (arc.hasLiteral()) buffer.append(arc.getLiteral());\r\n+\t\tif (arc.hasXRef()) buffer.append(arc.getXRef());\r\n \r\n-\t\treturn XDI3SubSegment.create(buffer.toString());\r\n+\t\treturn XDIArc.create(buffer.toString());\r\n \t}\r\n \r\n \t/*\r\n@@ -107,25 +107,25 @@ public Graph getGraph() {\n \t}\r\n \r\n \t@Override\r\n-\tpublic XDI3Segment getXri() {\r\n+\tpublic XDIAddress getXri() {\r\n \r\n-\t\treturn this.getContextNode().getXri();\r\n+\t\treturn this.getContextNode().getAddress();\r\n \t}\r\n \r\n \t@Override\r\n-\tpublic XDI3SubSegment getArcXri() {\r\n+\tpublic XDIArc getArc() {\r\n \r\n-\t\treturn this.getContextNode().getArcXri();\r\n+\t\treturn this.getContextNode().getArc();\r\n \t}\r\n \r\n \t/**\r\n-\t * Returns the \"base\" arc XRI, without context node type syntax.\r\n-\t * @return The \"base\" arc XRI.\r\n+\t * Returns the \"base\" arc, without context node type syntax.\r\n+\t * @return The \"base\" arc.\r\n \t */\r\n \t@Override\r\n-\tpublic XDI3SubSegment getBaseArcXri() {\r\n+\tpublic XDIArc getBasearc() {\r\n \r\n-\t\treturn getBaseArcXri(this.getArcXri());\r\n+\t\treturn getBasearc(this.getArc());\r\n \t}\r\n \r\n \t@Override\r\n@@ -181,7 +181,7 @@ public EQ map(ContextNode identityContextNode) {\n \t@Override\r\n \tpublic XdiRoot findRoot() {\r\n \r\n-\t\treturn XdiLocalRoot.findLocalRoot(this.getGraph()).getRoot(this.getContextNode().getXri(), false);\r\n+\t\treturn XdiLocalRoot.findLocalRoot(this.getGraph()).getRoot(this.getContextNode().getAddress(), false);\r\n \t}\r\n \r\n \t@Override\r\n@@ -191,26 +191,26 @@ public XdiLocalRoot findLocalRoot() {\n \t}\r\n \r\n \t@Override\r\n-\tpublic XdiInnerRoot getXdiInnerRoot(XDI3Segment innerRootPredicateXri, boolean create) {\r\n+\tpublic XdiInnerRoot getXdiInnerRoot(XDIAddress innerRootPredicateXri, boolean create) {\r\n \r\n \t\tXdiRoot xdiRoot = this.findRoot();\r\n \r\n-\t\tXDI3Segment innerRootSubjectXri = xdiRoot.absoluteToRelativeXri(this.getContextNode().getXri());\r\n+\t\tXDIAddress innerRootSubjectXri = xdiRoot.absoluteToRelativeXri(this.getContextNode().getAddress());\r\n \r\n \t\treturn xdiRoot.getInnerRoot(innerRootSubjectXri, innerRootPredicateXri, create);\r\n \t}\r\n \r\n \t@Override\r\n-\tpublic XdiEntityCollection getXdiEntityCollection(XDI3SubSegment arcXri, boolean create) {\r\n+\tpublic XdiEntityCollection getXdiEntityCollection(XDIArc arc, boolean create) {\r\n \r\n-\t\tContextNode entityCollectionContextNode = create ? this.getContextNode().setContextNode(arcXri) : this.getContextNode().getContextNode(arcXri, false);\r\n+\t\tContextNode entityCollectionContextNode = create ? this.getContextNode().setContextNode(arc) : this.getContextNode().getContextNode(arc, false);\r\n \t\tif (entityCollectionContextNode == null) return null;\r\n \r\n \t\treturn XdiEntityCollection.fromContextNode(entityCollectionContextNode);\r\n \t}\r\n \r\n \t@Override\r\n-\tpublic XdiEntityCollection getXdiEntityCollection(XDI3Segment xri, boolean create) {\r\n+\tpublic XdiEntityCollection getXdiEntityCollection(XDIAddress xri, boolean create) {\r\n \r\n \t\tContextNode entityCollectionContextNode = create ? this.getContextNode().setDeepContextNode(xri) : this.getContextNode().getDeepContextNode(xri, false);\r\n \t\tif (entityCollectionContextNode == null) return null;\r\n@@ -219,16 +219,16 @@ public XdiEntityCollection getXdiEntityCollection(XDI3Segment xri, boolean creat\n \t}\r\n \r\n \t@Override\r\n-\tpublic XdiAttributeCollection getXdiAttributeCollection(XDI3SubSegment arcXri, boolean create) {\r\n+\tpublic XdiAttributeCollection getXdiAttributeCollection(XDIArc arc, boolean create) {\r\n \r\n-\t\tContextNode attributeCollectionContextNode = create ? this.getContextNode().setContextNode(arcXri) : this.getContextNode().getContextNode(arcXri, false);\r\n+\t\tContextNode attributeCollectionContextNode = create ? this.getContextNode().setContextNode(arc) : this.getContextNode().getContextNode(arc, false);\r\n \t\tif (attributeCollectionContextNode == null) return null;\r\n \r\n \t\treturn XdiAttributeCollection.fromContextNode(attributeCollectionContextNode);\r\n \t}\r\n \r\n \t@Override\r\n-\tpublic XdiAttributeCollection getXdiAttributeCollection(XDI3Segment xri, boolean create) {\r\n+\tpublic XdiAttributeCollection getXdiAttributeCollection(XDIAddress xri, boolean create) {\r\n \r\n \t\tContextNode attributeCollectionContextNode = create ? this.getContextNode().setDeepContextNode(xri) : this.getContextNode().getDeepContextNode(xri, false);\r\n \t\tif (attributeCollectionContextNode == null) return null;\r\n@@ -237,16 +237,16 @@ public XdiAttributeCollection getXdiAttributeCollection(XDI3Segment xri, boolean\n \t}\r\n \r\n \t@Override\r\n-\tpublic XdiEntitySingleton getXdiEntitySingleton(XDI3SubSegment arcXri, boolean create) {\r\n+\tpublic XdiEntitySingleton getXdiEntitySingleton(XDIArc arc, boolean create) {\r\n \r\n-\t\tContextNode entitySingletonContextNode = create ? this.getContextNode().setContextNode(arcXri) : this.getContextNode().getContextNode(arcXri, false);\r\n+\t\tContextNode entitySingletonContextNode = create ? this.getContextNode().setContextNode(arc) : this.getContextNode().getContextNode(arc, false);\r\n \t\tif (entitySingletonContextNode == null) return null;\r\n \r\n \t\treturn XdiEntitySingleton.fromContextNode(entitySingletonContextNode);\r\n \t}\r\n \r\n \t@Override\r\n-\tpublic XdiEntitySingleton getXdiEntitySingleton(XDI3Segment xri, boolean create) {\r\n+\tpublic XdiEntitySingleton getXdiEntitySingleton(XDIAddress xri, boolean create) {\r\n \r\n \t\tContextNode entitySingletonContextNode = create ? this.getContextNode().setDeepContextNode(xri) : this.getContextNode().getDeepContextNode(xri, false);\r\n \t\tif (entitySingletonContextNode == null) return null;\r\n@@ -255,16 +255,16 @@ public XdiEntitySingleton getXdiEntitySingleton(XDI3Segment xri, boolean create)\n \t}\r\n \r\n \t@Override\r\n-\tpublic XdiAttributeSingleton getXdiAttributeSingleton(XDI3SubSegment arcXri, boolean create) {\r\n+\tpublic XdiAttributeSingleton getXdiAttributeSingleton(XDIArc arc, boolean create) {\r\n \r\n-\t\tContextNode attributeSingletonContextNode = create ? this.getContextNode().setContextNode(arcXri) : this.getContextNode().getContextNode(arcXri, false);\r\n+\t\tContextNode attributeSingletonContextNode = create ? this.getContextNode().setContextNode(arc) : this.getContextNode().getContextNode(arc, false);\r\n \t\tif (attributeSingletonContextNode == null) return null;\r\n \r\n \t\treturn XdiAttributeSingleton.fromContextNode(attributeSingletonContextNode);\r\n \t}\r\n \r\n \t@Override\r\n-\tpublic XdiAttributeSingleton getXdiAttributeSingleton(XDI3Segment xri, boolean create) {\r\n+\tpublic XdiAttributeSingleton getXdiAttributeSingleton(XDIAddress xri, boolean create) {\r\n \r\n \t\tContextNode attributeSingletonContextNode = create ? this.getContextNode().setDeepContextNode(xri) : this.getContextNode().getDeepContextNode(xri, false);\r\n \t\tif (attributeSingletonContextNode == null) return null;\r\n@@ -273,16 +273,16 @@ public XdiAttributeSingleton getXdiAttributeSingleton(XDI3Segment xri, boolean c\n \t}\r\n \r\n \t@Override\r\n-\tpublic XdiEntity getXdiEntity(XDI3SubSegment arcXri, boolean create) {\r\n+\tpublic XdiEntity getXdiEntity(XDIArc arc, boolean create) {\r\n \r\n-\t\tContextNode entityContextNode = create ? this.getContextNode().setContextNode(arcXri) : this.getContextNode().getContextNode(arcXri, false);\r\n+\t\tContextNode entityContextNode = create ? this.getContextNode().setContextNode(arc) : this.getContextNode().getContextNode(arc, false);\r\n \t\tif (entityContextNode == null) return null;\r\n \r\n \t\treturn XdiAbstractEntity.fromContextNode(entityContextNode);\r\n \t}\r\n \r\n \t@Override\r\n-\tpublic XdiEntity getXdiEntity(XDI3Segment xri, boolean create) {\r\n+\tpublic XdiEntity getXdiEntity(XDIAddress xri, boolean create) {\r\n \r\n \t\tContextNode entityContextNode = create ? this.getContextNode().setDeepContextNode(xri) : this.getContextNode().getDeepContextNode(xri, false);\r\n \t\tif (entityContextNode == null) return null;\r\n@@ -291,16 +291,16 @@ public XdiEntity getXdiEntity(XDI3Segment xri, boolean create) {\n \t}\r\n \r\n \t@Override\r\n-\tpublic XdiAttribute getXdiAttribute(XDI3SubSegment arcXri, boolean create) {\r\n+\tpublic XdiAttribute getXdiAttribute(XDIArc arc, boolean create) {\r\n \r\n-\t\tContextNode attributeContextNode = create ? this.getContextNode().setContextNode(arcXri) : this.getContextNode().getContextNode(arcXri, false);\r\n+\t\tContextNode attributeContextNode = create ? this.getContextNode().setContextNode(arc) : this.getContextNode().getContextNode(arc, false);\r\n \t\tif (attributeContextNode == null) return null;\r\n \r\n \t\treturn XdiAbstractAttribute.fromContextNode(attributeContextNode);\r\n \t}\r\n \r\n \t@Override\r\n-\tpublic XdiAttribute getXdiAttribute(XDI3Segment xri, boolean create) {\r\n+\tpublic XdiAttribute getXdiAttribute(XDIAddress xri, boolean create) {\r\n \r\n \t\tContextNode attributeContextNode = create ? this.getContextNode().setDeepContextNode(xri) : this.getContextNode().getDeepContextNode(xri, false);\r\n \t\tif (attributeContextNode == null) return null;\r", "raw_url": "https://github.com/projectdanube/xdi2/raw/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Fnodetypes%2FXdiAbstractContext.java", "sha": "68cfd883c747122b05078b72159c46ca66af0a6b", "status": "modified" }, { "additions": 11, "blob_url": "https://github.com/projectdanube/xdi2/blob/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Fnodetypes%2FXdiAbstractMemberOrdered.java", "changes": 22, "contents_url": "https://api.github.com/repos/projectdanube/xdi2/contents/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Fnodetypes%2FXdiAbstractMemberOrdered.java?ref=0ca7982fec30c2bb8204efbbea61428a643d2e9c", "deletions": 11, "filename": "core/src/main/java/xdi2/core/features/nodetypes/XdiAbstractMemberOrdered.java", "new_code": "import xdi2.core.syntax.XDIArc;\r\n\tpublic static XDIArc createarc(String identifier, boolean attribute) {\r\n\t\treturn XDIArc.create(\"\" + (attribute ? Character.valueOf(XDIConstants.XS_ATTRIBUTE.charAt(0)) : \"\") + XDIConstants.CS_MEMBER_ORDERED + identifier + (attribute ? Character.valueOf(XDIConstants.XS_ATTRIBUTE.charAt(1)) : \"\"));\r\n\tpublic static boolean isValidarc(XDIArc arc, boolean attribute) {\r\n\t\tif (arc == null) return false;\r\n\t\tif (arc.isClassXs()) return false;\r\n\t\tif (attribute && ! arc.isAttributeXs()) return false;\r\n\t\tif (! attribute && arc.isAttributeXs()) return false;\r\n\t\tif (arc.hasXRef()) return false;\r\n\t\tif (! XDIConstants.CS_MEMBER_ORDERED.equals(arc.getCs())) return false;\r\n\t\tif (! arc.hasLiteral()) return false;\r", "new_methods": [], "old_code": "import xdi2.core.xri3.XDI3SubSegment;\r\n\tpublic static XDI3SubSegment createArcXri(String identifier, boolean attribute) {\r\n\t\treturn XDI3SubSegment.create(\"\" + (attribute ? Character.valueOf(XDIConstants.XS_ATTRIBUTE.charAt(0)) : \"\") + XDIConstants.CS_MEMBER_ORDERED + identifier + (attribute ? Character.valueOf(XDIConstants.XS_ATTRIBUTE.charAt(1)) : \"\"));\r\n\tpublic static boolean isValidArcXri(XDI3SubSegment arcXri, boolean attribute) {\r\n\t\tif (arcXri == null) return false;\r\n\t\tif (arcXri.isClassXs()) return false;\r\n\t\tif (attribute && ! arcXri.isAttributeXs()) return false;\r\n\t\tif (! attribute && arcXri.isAttributeXs()) return false;\r\n\t\tif (arcXri.hasXRef()) return false;\r\n\t\tif (! XDIConstants.CS_MEMBER_ORDERED.equals(arcXri.getCs())) return false;\r\n\t\tif (! arcXri.hasLiteral()) return false;\r", "old_methods": [], "patch": "@@ -4,9 +4,9 @@\n \r\n import xdi2.core.ContextNode;\r\n import xdi2.core.constants.XDIConstants;\r\n+import xdi2.core.syntax.XDIArc;\r\n import xdi2.core.util.iterators.MappingIterator;\r\n import xdi2.core.util.iterators.NotNullIterator;\r\n-import xdi2.core.xri3.XDI3SubSegment;\r\n \r\n public abstract class XdiAbstractMemberOrdered<EQC extends XdiCollection<EQC, EQI, C, U, O, I>, EQI extends XdiSubGraph<EQI>, C extends XdiCollection<EQC, EQI, C, U, O, I>, U extends XdiMemberUnordered<EQC, EQI, C, U, O, I>, O extends XdiMemberOrdered<EQC, EQI, C, U, O, I>, I extends XdiMember<EQC, EQI, C, U, O, I>> extends XdiAbstractMember<EQC, EQI, C, U, O, I> implements XdiMemberOrdered<EQC, EQI, C, U, O, I> {\r\n \r\n@@ -53,23 +53,23 @@ public static boolean isValid(ContextNode contextNode) {\n \t * Methods for XRIs\r\n \t */\r\n \r\n-\tpublic static XDI3SubSegment createArcXri(String identifier, boolean attribute) {\r\n+\tpublic static XDIArc createarc(String identifier, boolean attribute) {\r\n \r\n-\t\treturn XDI3SubSegment.create(\"\" + (attribute ? Character.valueOf(XDIConstants.XS_ATTRIBUTE.charAt(0)) : \"\") + XDIConstants.CS_MEMBER_ORDERED + identifier + (attribute ? Character.valueOf(XDIConstants.XS_ATTRIBUTE.charAt(1)) : \"\"));\r\n+\t\treturn XDIArc.create(\"\" + (attribute ? Character.valueOf(XDIConstants.XS_ATTRIBUTE.charAt(0)) : \"\") + XDIConstants.CS_MEMBER_ORDERED + identifier + (attribute ? Character.valueOf(XDIConstants.XS_ATTRIBUTE.charAt(1)) : \"\"));\r\n \t}\r\n \r\n-\tpublic static boolean isValidArcXri(XDI3SubSegment arcXri, boolean attribute) {\r\n+\tpublic static boolean isValidarc(XDIArc arc, boolean attribute) {\r\n \r\n-\t\tif (arcXri == null) return false;\r\n+\t\tif (arc == null) return false;\r\n \r\n-\t\tif (arcXri.isClassXs()) return false;\r\n-\t\tif (attribute && ! arcXri.isAttributeXs()) return false;\r\n-\t\tif (! attribute && arcXri.isAttributeXs()) return false;\r\n-\t\tif (arcXri.hasXRef()) return false;\r\n+\t\tif (arc.isClassXs()) return false;\r\n+\t\tif (attribute && ! arc.isAttributeXs()) return false;\r\n+\t\tif (! attribute && arc.isAttributeXs()) return false;\r\n+\t\tif (arc.hasXRef()) return false;\r\n \r\n-\t\tif (! XDIConstants.CS_MEMBER_ORDERED.equals(arcXri.getCs())) return false;\r\n+\t\tif (! XDIConstants.CS_MEMBER_ORDERED.equals(arc.getCs())) return false;\r\n \r\n-\t\tif (! arcXri.hasLiteral()) return false;\r\n+\t\tif (! arc.hasLiteral()) return false;\r\n \r\n \t\treturn true;\r\n \t}\r", "raw_url": "https://github.com/projectdanube/xdi2/raw/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Fnodetypes%2FXdiAbstractMemberOrdered.java", "sha": "6eed644d396c3ed25b2b4d3e0919c4e64f1798b6", "status": "modified" }, { "additions": 19, "blob_url": "https://github.com/projectdanube/xdi2/blob/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Fnodetypes%2FXdiAbstractMemberUnordered.java", "changes": 38, "contents_url": "https://api.github.com/repos/projectdanube/xdi2/contents/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Fnodetypes%2FXdiAbstractMemberUnordered.java?ref=0ca7982fec30c2bb8204efbbea61428a643d2e9c", "deletions": 19, "filename": "core/src/main/java/xdi2/core/features/nodetypes/XdiAbstractMemberUnordered.java", "new_code": "import xdi2.core.syntax.XDIArc;\r\n\tpublic static XDIArc createarc(String identifier, boolean attribute) {\r\n\t\treturn XDIArc.create(\"\" + (attribute ? Character.valueOf(XDIConstants.XS_ATTRIBUTE.charAt(0)) : \"\") + XDIConstants.CS_MEMBER_UNORDERED + identifier + (attribute ? Character.valueOf(XDIConstants.XS_ATTRIBUTE.charAt(1)) : \"\"));\r\n\tpublic static XDIArc createUuidarc(String uuid, boolean attribute) {\r\n\t\treturn createarc(\":uuid:\" + uuid, attribute);\r\n\tpublic static XDIArc createRandomUuidarc(boolean attribute) {\r\n\t\treturn createUuidarc(uuid, attribute);\r\n\tpublic static XDIArc createDigestarc(String string, boolean attribute, String algorithm) {\r\n\t\treturn createarc(\":\" + algorithm.toLowerCase().replace(\"-\", \"\") + \":\" + hex, attribute);\r\n\tpublic static XDIArc createDigestarc(String string, boolean attribute) {\r\n\t\treturn createDigestarc(string, attribute, \"SHA-512\");\r\n\tpublic static boolean isValidarc(XDIArc arc, boolean attribute) {\r\n\t\tif (arc == null) return false;\r\n\t\tif (arc.isClassXs()) return false;\r\n\t\tif (attribute && ! arc.isAttributeXs()) return false;\r\n\t\tif (! attribute && arc.isAttributeXs()) return false;\r\n\t\tif (arc.hasXRef()) return false;\r\n\t\tif (! XDIConstants.CS_MEMBER_UNORDERED.equals(arc.getCs())) return false;\r\n\t\tif (! arc.hasLiteral()) return false;\r", "new_methods": [], "old_code": "import xdi2.core.xri3.XDI3SubSegment;\r\n\tpublic static XDI3SubSegment createArcXri(String identifier, boolean attribute) {\r\n\t\treturn XDI3SubSegment.create(\"\" + (attribute ? Character.valueOf(XDIConstants.XS_ATTRIBUTE.charAt(0)) : \"\") + XDIConstants.CS_MEMBER_UNORDERED + identifier + (attribute ? Character.valueOf(XDIConstants.XS_ATTRIBUTE.charAt(1)) : \"\"));\r\n\tpublic static XDI3SubSegment createUuidArcXri(String uuid, boolean attribute) {\r\n\t\treturn createArcXri(\":uuid:\" + uuid, attribute);\r\n\tpublic static XDI3SubSegment createRandomUuidArcXri(boolean attribute) {\r\n\t\treturn createUuidArcXri(uuid, attribute);\r\n\tpublic static XDI3SubSegment createDigestArcXri(String string, boolean attribute, String algorithm) {\r\n\t\treturn createArcXri(\":\" + algorithm.toLowerCase().replace(\"-\", \"\") + \":\" + hex, attribute);\r\n\tpublic static XDI3SubSegment createDigestArcXri(String string, boolean attribute) {\r\n\t\treturn createDigestArcXri(string, attribute, \"SHA-512\");\r\n\tpublic static boolean isValidArcXri(XDI3SubSegment arcXri, boolean attribute) {\r\n\t\tif (arcXri == null) return false;\r\n\t\tif (arcXri.isClassXs()) return false;\r\n\t\tif (attribute && ! arcXri.isAttributeXs()) return false;\r\n\t\tif (! attribute && arcXri.isAttributeXs()) return false;\r\n\t\tif (arcXri.hasXRef()) return false;\r\n\t\tif (! XDIConstants.CS_MEMBER_UNORDERED.equals(arcXri.getCs())) return false;\r\n\t\tif (! arcXri.hasLiteral()) return false;\r", "old_methods": [], "patch": "@@ -9,9 +9,9 @@\n import xdi2.core.ContextNode;\r\n import xdi2.core.constants.XDIConstants;\r\n import xdi2.core.exceptions.Xdi2RuntimeException;\r\n+import xdi2.core.syntax.XDIArc;\r\n import xdi2.core.util.iterators.MappingIterator;\r\n import xdi2.core.util.iterators.NotNullIterator;\r\n-import xdi2.core.xri3.XDI3SubSegment;\r\n \r\n public abstract class XdiAbstractMemberUnordered<EQC extends XdiCollection<EQC, EQI, C, U, O, I>, EQI extends XdiSubGraph<EQI>, C extends XdiCollection<EQC, EQI, C, U, O, I>, U extends XdiMemberUnordered<EQC, EQI, C, U, O, I>, O extends XdiMemberOrdered<EQC, EQI, C, U, O, I>, I extends XdiMember<EQC, EQI, C, U, O, I>> extends XdiAbstractMember<EQC, EQI, C, U, O, I> implements XdiMemberUnordered<EQC, EQI, C, U, O, I> {\r\n \r\n@@ -58,24 +58,24 @@ public static boolean isValid(ContextNode contextNode) {\n \t * Methods for XRIs\r\n \t */\r\n \r\n-\tpublic static XDI3SubSegment createArcXri(String identifier, boolean attribute) {\r\n+\tpublic static XDIArc createarc(String identifier, boolean attribute) {\r\n \r\n-\t\treturn XDI3SubSegment.create(\"\" + (attribute ? Character.valueOf(XDIConstants.XS_ATTRIBUTE.charAt(0)) : \"\") + XDIConstants.CS_MEMBER_UNORDERED + identifier + (attribute ? Character.valueOf(XDIConstants.XS_ATTRIBUTE.charAt(1)) : \"\"));\r\n+\t\treturn XDIArc.create(\"\" + (attribute ? Character.valueOf(XDIConstants.XS_ATTRIBUTE.charAt(0)) : \"\") + XDIConstants.CS_MEMBER_UNORDERED + identifier + (attribute ? Character.valueOf(XDIConstants.XS_ATTRIBUTE.charAt(1)) : \"\"));\r\n \t}\r\n \r\n-\tpublic static XDI3SubSegment createUuidArcXri(String uuid, boolean attribute) {\r\n+\tpublic static XDIArc createUuidarc(String uuid, boolean attribute) {\r\n \r\n-\t\treturn createArcXri(\":uuid:\" + uuid, attribute);\r\n+\t\treturn createarc(\":uuid:\" + uuid, attribute);\r\n \t}\r\n \r\n-\tpublic static XDI3SubSegment createRandomUuidArcXri(boolean attribute) {\r\n+\tpublic static XDIArc createRandomUuidarc(boolean attribute) {\r\n \r\n \t\tString uuid = UUID.randomUUID().toString().toLowerCase();\r\n \r\n-\t\treturn createUuidArcXri(uuid, attribute);\r\n+\t\treturn createUuidarc(uuid, attribute);\r\n \t}\r\n \r\n-\tpublic static XDI3SubSegment createDigestArcXri(String string, boolean attribute, String algorithm) {\r\n+\tpublic static XDIArc createDigestarc(String string, boolean attribute, String algorithm) {\r\n \r\n \t\tbyte[] output;\r\n \r\n@@ -91,26 +91,26 @@ public static XDI3SubSegment createDigestArcXri(String string, boolean attribute\n \r\n \t\tString hex = new String(Hex.encodeHex(output));\r\n \r\n-\t\treturn createArcXri(\":\" + algorithm.toLowerCase().replace(\"-\", \"\") + \":\" + hex, attribute);\r\n+\t\treturn createarc(\":\" + algorithm.toLowerCase().replace(\"-\", \"\") + \":\" + hex, attribute);\r\n \t}\r\n \r\n-\tpublic static XDI3SubSegment createDigestArcXri(String string, boolean attribute) {\r\n+\tpublic static XDIArc createDigestarc(String string, boolean attribute) {\r\n \r\n-\t\treturn createDigestArcXri(string, attribute, \"SHA-512\");\r\n+\t\treturn createDigestarc(string, attribute, \"SHA-512\");\r\n \t}\r\n \r\n-\tpublic static boolean isValidArcXri(XDI3SubSegment arcXri, boolean attribute) {\r\n+\tpublic static boolean isValidarc(XDIArc arc, boolean attribute) {\r\n \r\n-\t\tif (arcXri == null) return false;\r\n+\t\tif (arc == null) return false;\r\n \r\n-\t\tif (arcXri.isClassXs()) return false;\r\n-\t\tif (attribute && ! arcXri.isAttributeXs()) return false;\r\n-\t\tif (! attribute && arcXri.isAttributeXs()) return false;\r\n-\t\tif (arcXri.hasXRef()) return false;\r\n+\t\tif (arc.isClassXs()) return false;\r\n+\t\tif (attribute && ! arc.isAttributeXs()) return false;\r\n+\t\tif (! attribute && arc.isAttributeXs()) return false;\r\n+\t\tif (arc.hasXRef()) return false;\r\n \r\n-\t\tif (! XDIConstants.CS_MEMBER_UNORDERED.equals(arcXri.getCs())) return false;\r\n+\t\tif (! XDIConstants.CS_MEMBER_UNORDERED.equals(arc.getCs())) return false;\r\n \r\n-\t\tif (! arcXri.hasLiteral()) return false;\r\n+\t\tif (! arc.hasLiteral()) return false;\r\n \r\n \t\treturn true;\r\n \t}\r", "raw_url": "https://github.com/projectdanube/xdi2/raw/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Fnodetypes%2FXdiAbstractMemberUnordered.java", "sha": "21222483a9287a23387ce4ab9a01f6f9571deff0", "status": "modified" }, { "additions": 29, "blob_url": "https://github.com/projectdanube/xdi2/blob/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Fnodetypes%2FXdiAbstractRoot.java", "changes": 58, "contents_url": "https://api.github.com/repos/projectdanube/xdi2/contents/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Fnodetypes%2FXdiAbstractRoot.java?ref=0ca7982fec30c2bb8204efbbea61428a643d2e9c", "deletions": 29, "filename": "core/src/main/java/xdi2/core/features/nodetypes/XdiAbstractRoot.java", "new_code": "import xdi2.core.syntax.XDIAddress;\r\nimport xdi2.core.syntax.XDIArc;\r\nimport xdi2.core.syntax.XDIStatement;\r\nimport xdi2.core.util.AddressUtil;\r\n\tpublic XdiPeerRoot getPeerRoot(XDIAddress xri, boolean create) {\r\n\t\tXDIArc peerRootarc = XdiPeerRoot.createPeerRootArc(xri);\r\n\t\tContextNode peerRootContextNode = create ? this.getContextNode().setContextNode(peerRootarc) : this.getContextNode().getContextNode(peerRootarc, false);\r\n\tpublic XdiInnerRoot getInnerRoot(XDIAddress subject, XDIAddress predicate, boolean create) {\r\n\t\tXDIArc innerRootarc = XdiInnerRoot.createInnerRootarc(subject, predicate);\r\n\t\tContextNode innerRootContextNode = create ? this.getContextNode().setContextNode(innerRootarc) : this.getContextNode().getContextNode(innerRootarc, false);\r\n\tpublic XdiRoot getRoot(XDIAddress xri, boolean create) {\r\n\t\tfor (int i=0; i<xri.getNumArcs(); i++) {\r\n\t\t\tXDIArc subSegment = xri.getArc(i);\r\n\t\t\tif (XdiPeerRoot.isPeerRootArc(subSegment)) {\r\n\t\t\t} if (XdiInnerRoot.isInnerRootarc(subSegment)) {\r\n\t\t\t\tRelation relation = create ? contextNode.setRelation(XdiInnerRoot.getPredicateOfInnerRootXri(subSegment), innerRootContextNode.getAddress()) : contextNode.getRelation(XdiInnerRoot.getPredicateOfInnerRootXri(subSegment), innerRootContextNode.getAddress());\r\n\tpublic XDIAddress absoluteToRelativeXri(XDIAddress absoluteXri) {\r\n\t\tXDIAddress relativeXri = AddressUtil.removeStartXri(absoluteXri, this.getContextNode().getAddress());\r\n\tpublic XDIAddress relativeToAbsoluteXri(XDIAddress relativeXri) {\r\n\t\tXDIAddress absoluteXri = AddressUtil.concatAddresses(this.getContextNode().getAddress(), relativeXri);\r\n\tpublic XDIStatement absoluteToRelativeStatementXri(XDIStatement absoluteStatementXri) {\r\n\t\tXDIStatement relativeStatementXri = StatementUtil.removeStartAddressStatement(absoluteStatementXri, this.getContextNode().getAddress());\r\n\tpublic XDIStatement relativeToAbsoluteStatementXri(XDIStatement relativeStatementXri) {\r\n\t\tXDIStatement absoluteStatementXri = StatementUtil.concatAddressStatement(this.getContextNode().getAddress(), relativeStatementXri);\r\n\t * @param arc An XDI root XRI.\r\n\tpublic static boolean isRootarc(XDIArc arc) {\r\n\t\tif (log.isTraceEnabled()) log.trace(\"isRootarc(\" + arc + \")\");\r\n\t\tif (XdiPeerRoot.isPeerRootArc(arc)) return true;\r\n\t\tif (XdiInnerRoot.isInnerRootarc(arc)) return true;\r", "new_methods": [ { "arguments": [ "XDIAddress xri", " boolean create" ], "filename": "core/src/main/java/xdi2/core/features/nodetypes/XdiAbstractRoot.java", "implementation": "XDIArc peerRootarc = XdiPeerRoot.createPeerRootArc(xri);\r\n\t\tContextNode peerRootContextNode = create ? this.getContextNode().setContextNode(peerRootarc) : this.getContextNode().getContextNode(peerRootarc, false);\r\n\tpublic XdiInnerRoot getInnerRoot(XDIAddress subject, XDIAddress predicate, boolean create) {\r\n\t\tXDIArc innerRootarc = XdiInnerRoot.createInnerRootarc(subject, predicate);\r\n\t\tContextNode innerRootContextNode = create ? this.getContextNode().setContextNode(innerRootarc) : this.getContextNode().getContextNode(innerRootarc, false);\r\n\tpublic XdiRoot getRoot(XDIAddress xri, boolean create) {\r\n\t\tfor (int i=0; i<xri.getNumArcs(); i++) {\r\n\t\t\tXDIArc subSegment = xri.getArc(i);\r\n\t\t\tif (XdiPeerRoot.isPeerRootArc(subSegment)) {", "signature": "XdiPeerRoot getPeerRoot(XDIAddress xri, boolean create)" } ], "old_code": "import xdi2.core.util.XDI3Util;\r\nimport xdi2.core.xri3.XDI3Segment;\r\nimport xdi2.core.xri3.XDI3Statement;\r\nimport xdi2.core.xri3.XDI3SubSegment;\r\n\tpublic XdiPeerRoot getPeerRoot(XDI3Segment xri, boolean create) {\r\n\t\tXDI3SubSegment peerRootArcXri = XdiPeerRoot.createPeerRootArcXri(xri);\r\n\t\tContextNode peerRootContextNode = create ? this.getContextNode().setContextNode(peerRootArcXri) : this.getContextNode().getContextNode(peerRootArcXri, false);\r\n\tpublic XdiInnerRoot getInnerRoot(XDI3Segment subject, XDI3Segment predicate, boolean create) {\r\n\t\tXDI3SubSegment innerRootArcXri = XdiInnerRoot.createInnerRootArcXri(subject, predicate);\r\n\t\tContextNode innerRootContextNode = create ? this.getContextNode().setContextNode(innerRootArcXri) : this.getContextNode().getContextNode(innerRootArcXri, false);\r\n\tpublic XdiRoot getRoot(XDI3Segment xri, boolean create) {\r\n\t\tfor (int i=0; i<xri.getNumSubSegments(); i++) {\r\n\t\t\tXDI3SubSegment subSegment = xri.getSubSegment(i);\r\n\t\t\tif (XdiPeerRoot.isPeerRootArcXri(subSegment)) {\r\n\t\t\t} if (XdiInnerRoot.isInnerRootArcXri(subSegment)) {\r\n\t\t\t\tRelation relation = create ? contextNode.setRelation(XdiInnerRoot.getPredicateOfInnerRootXri(subSegment), innerRootContextNode.getXri()) : contextNode.getRelation(XdiInnerRoot.getPredicateOfInnerRootXri(subSegment), innerRootContextNode.getXri());\r\n\tpublic XDI3Segment absoluteToRelativeXri(XDI3Segment absoluteXri) {\r\n\t\tXDI3Segment relativeXri = XDI3Util.removeStartXri(absoluteXri, this.getContextNode().getXri());\r\n\tpublic XDI3Segment relativeToAbsoluteXri(XDI3Segment relativeXri) {\r\n\t\tXDI3Segment absoluteXri = XDI3Util.concatXris(this.getContextNode().getXri(), relativeXri);\r\n\tpublic XDI3Statement absoluteToRelativeStatementXri(XDI3Statement absoluteStatementXri) {\r\n\t\tXDI3Statement relativeStatementXri = StatementUtil.removeStartXriStatement(absoluteStatementXri, this.getContextNode().getXri());\r\n\tpublic XDI3Statement relativeToAbsoluteStatementXri(XDI3Statement relativeStatementXri) {\r\n\t\tXDI3Statement absoluteStatementXri = StatementUtil.concatXriStatement(this.getContextNode().getXri(), relativeStatementXri);\r\n\t * @param arcXri An XDI root XRI.\r\n\tpublic static boolean isRootArcXri(XDI3SubSegment arcXri) {\r\n\t\tif (log.isTraceEnabled()) log.trace(\"isRootArcXri(\" + arcXri + \")\");\r\n\t\tif (XdiPeerRoot.isPeerRootArcXri(arcXri)) return true;\r\n\t\tif (XdiInnerRoot.isInnerRootArcXri(arcXri)) return true;\r", "old_methods": [ { "arguments": [ "XDI3Segment xri", " boolean create" ], "filename": "core/src/main/java/xdi2/core/features/nodetypes/XdiAbstractRoot.java", "implementation": "XDI3SubSegment peerRootArcXri = XdiPeerRoot.createPeerRootArcXri(xri);\r\n\t\tContextNode peerRootContextNode = create ? this.getContextNode().setContextNode(peerRootArcXri) : this.getContextNode().getContextNode(peerRootArcXri, false);\r\n\tpublic XdiInnerRoot getInnerRoot(XDI3Segment subject, XDI3Segment predicate, boolean create) {\r\n\t\tXDI3SubSegment innerRootArcXri = XdiInnerRoot.createInnerRootArcXri(subject, predicate);\r\n\t\tContextNode innerRootContextNode = create ? this.getContextNode().setContextNode(innerRootArcXri) : this.getContextNode().getContextNode(innerRootArcXri, false);\r\n\tpublic XdiRoot getRoot(XDI3Segment xri, boolean create) {\r\n\t\tfor (int i=0; i<xri.getNumSubSegments(); i++) {\r\n\t\t\tXDI3SubSegment subSegment = xri.getSubSegment(i);\r\n\t\t\tif (XdiPeerRoot.isPeerRootArcXri(subSegment)) {", "signature": "XdiPeerRoot getPeerRoot(XDI3Segment xri, boolean create)" } ], "patch": "@@ -5,11 +5,11 @@\n \r\n import xdi2.core.ContextNode;\r\n import xdi2.core.Relation;\r\n+import xdi2.core.syntax.XDIAddress;\r\n+import xdi2.core.syntax.XDIArc;\r\n+import xdi2.core.syntax.XDIStatement;\r\n import xdi2.core.util.StatementUtil;\r\n-import xdi2.core.util.XDI3Util;\r\n-import xdi2.core.xri3.XDI3Segment;\r\n-import xdi2.core.xri3.XDI3Statement;\r\n-import xdi2.core.xri3.XDI3SubSegment;\r\n+import xdi2.core.util.AddressUtil;\r\n \r\n public abstract class XdiAbstractRoot extends XdiAbstractContext<XdiRoot> implements XdiRoot {\r\n \r\n@@ -62,59 +62,59 @@ public static XdiRoot fromContextNode(ContextNode contextNode) {\n \t */\r\n \r\n \t@Override\r\n-\tpublic XdiPeerRoot getPeerRoot(XDI3Segment xri, boolean create) {\r\n+\tpublic XdiPeerRoot getPeerRoot(XDIAddress xri, boolean create) {\r\n \r\n \t\tif (log.isTraceEnabled()) log.trace(\"getPeerRoot(\" + xri + \",\" + create + \")\");\r\n \r\n-\t\tXDI3SubSegment peerRootArcXri = XdiPeerRoot.createPeerRootArcXri(xri);\r\n+\t\tXDIArc peerRootarc = XdiPeerRoot.createPeerRootArc(xri);\r\n \r\n-\t\tContextNode peerRootContextNode = create ? this.getContextNode().setContextNode(peerRootArcXri) : this.getContextNode().getContextNode(peerRootArcXri, false);\r\n+\t\tContextNode peerRootContextNode = create ? this.getContextNode().setContextNode(peerRootarc) : this.getContextNode().getContextNode(peerRootarc, false);\r\n \t\tif (peerRootContextNode == null) return null;\r\n \r\n \t\treturn new XdiPeerRoot(peerRootContextNode);\r\n \t}\r\n \r\n \t@Override\r\n-\tpublic XdiInnerRoot getInnerRoot(XDI3Segment subject, XDI3Segment predicate, boolean create) {\r\n+\tpublic XdiInnerRoot getInnerRoot(XDIAddress subject, XDIAddress predicate, boolean create) {\r\n \r\n \t\tif (log.isTraceEnabled()) log.trace(\"getInnerRoot(\" + subject + \",\" + predicate + \",\" + create + \")\");\r\n \r\n-\t\tXDI3SubSegment innerRootArcXri = XdiInnerRoot.createInnerRootArcXri(subject, predicate);\r\n+\t\tXDIArc innerRootarc = XdiInnerRoot.createInnerRootarc(subject, predicate);\r\n \r\n-\t\tContextNode innerRootContextNode = create ? this.getContextNode().setContextNode(innerRootArcXri) : this.getContextNode().getContextNode(innerRootArcXri, false);\r\n+\t\tContextNode innerRootContextNode = create ? this.getContextNode().setContextNode(innerRootarc) : this.getContextNode().getContextNode(innerRootarc, false);\r\n \t\tif (innerRootContextNode == null) return null;\r\n \r\n \t\treturn new XdiInnerRoot(innerRootContextNode);\r\n \t}\r\n \r\n \t@Override\r\n-\tpublic XdiRoot getRoot(XDI3Segment xri, boolean create) {\r\n+\tpublic XdiRoot getRoot(XDIAddress xri, boolean create) {\r\n \r\n \t\tif (log.isTraceEnabled()) log.trace(\"getRoot(\" + xri + \",\" + create + \")\");\r\n \r\n \t\tXdiRoot root = this;\r\n \r\n-\t\tfor (int i=0; i<xri.getNumSubSegments(); i++) {\r\n+\t\tfor (int i=0; i<xri.getNumArcs(); i++) {\r\n \r\n-\t\t\tXDI3SubSegment subSegment = xri.getSubSegment(i);\r\n+\t\t\tXDIArc subSegment = xri.getArc(i);\r\n \r\n \t\t\tXdiRoot nextRoot;\r\n \r\n-\t\t\tif (XdiPeerRoot.isPeerRootArcXri(subSegment)) {\r\n+\t\t\tif (XdiPeerRoot.isPeerRootArc(subSegment)) {\r\n \r\n \t\t\t\tContextNode peerRootContextNode = create ? root.getContextNode().setContextNode(subSegment) : root.getContextNode().getContextNode(subSegment, false);\r\n \t\t\t\tif (peerRootContextNode == null) break;\r\n \r\n \t\t\t\tnextRoot = new XdiPeerRoot(peerRootContextNode);\r\n-\t\t\t} if (XdiInnerRoot.isInnerRootArcXri(subSegment)) {\r\n+\t\t\t} if (XdiInnerRoot.isInnerRootarc(subSegment)) {\r\n \r\n \t\t\t\tContextNode innerRootContextNode = create ? root.getContextNode().setContextNode(subSegment) : root.getContextNode().getContextNode(subSegment, false);\r\n \t\t\t\tif (innerRootContextNode == null) break;\r\n \r\n \t\t\t\tContextNode contextNode = create ? root.getContextNode().setDeepContextNode(XdiInnerRoot.getSubjectOfInnerRootXri(subSegment)) : root.getContextNode().getDeepContextNode(XdiInnerRoot.getSubjectOfInnerRootXri(subSegment), false);\r\n \t\t\t\tif (contextNode == null) break;\r\n \r\n-\t\t\t\tRelation relation = create ? contextNode.setRelation(XdiInnerRoot.getPredicateOfInnerRootXri(subSegment), innerRootContextNode.getXri()) : contextNode.getRelation(XdiInnerRoot.getPredicateOfInnerRootXri(subSegment), innerRootContextNode.getXri());\r\n+\t\t\t\tRelation relation = create ? contextNode.setRelation(XdiInnerRoot.getPredicateOfInnerRootXri(subSegment), innerRootContextNode.getAddress()) : contextNode.getRelation(XdiInnerRoot.getPredicateOfInnerRootXri(subSegment), innerRootContextNode.getAddress());\r\n \t\t\t\tif (relation == null) break;\r\n \r\n \t\t\t\tnextRoot = new XdiInnerRoot(innerRootContextNode);\r\n@@ -134,39 +134,39 @@ public XdiRoot getRoot(XDI3Segment xri, boolean create) {\n \t */\r\n \r\n \t@Override\r\n-\tpublic XDI3Segment absoluteToRelativeXri(XDI3Segment absoluteXri) {\r\n+\tpublic XDIAddress absoluteToRelativeXri(XDIAddress absoluteXri) {\r\n \r\n-\t\tXDI3Segment relativeXri = XDI3Util.removeStartXri(absoluteXri, this.getContextNode().getXri());\r\n+\t\tXDIAddress relativeXri = AddressUtil.removeStartXri(absoluteXri, this.getContextNode().getAddress());\r\n \r\n \t\tif (log.isTraceEnabled()) log.trace(\"absoluteToRelativeXri(\" + absoluteXri + \" --> \" + relativeXri + \")\");\r\n \r\n \t\treturn relativeXri;\r\n \t}\r\n \r\n \t@Override\r\n-\tpublic XDI3Segment relativeToAbsoluteXri(XDI3Segment relativeXri) {\r\n+\tpublic XDIAddress relativeToAbsoluteXri(XDIAddress relativeXri) {\r\n \r\n-\t\tXDI3Segment absoluteXri = XDI3Util.concatXris(this.getContextNode().getXri(), relativeXri);\r\n+\t\tXDIAddress absoluteXri = AddressUtil.concatAddresses(this.getContextNode().getAddress(), relativeXri);\r\n \r\n \t\tif (log.isTraceEnabled()) log.trace(\"relativeToAbsoluteXri(\" + relativeXri + \" --> \" + absoluteXri + \")\");\r\n \r\n \t\treturn absoluteXri;\r\n \t}\r\n \r\n \t@Override\r\n-\tpublic XDI3Statement absoluteToRelativeStatementXri(XDI3Statement absoluteStatementXri) {\r\n+\tpublic XDIStatement absoluteToRelativeStatementXri(XDIStatement absoluteStatementXri) {\r\n \r\n-\t\tXDI3Statement relativeStatementXri = StatementUtil.removeStartXriStatement(absoluteStatementXri, this.getContextNode().getXri());\r\n+\t\tXDIStatement relativeStatementXri = StatementUtil.removeStartAddressStatement(absoluteStatementXri, this.getContextNode().getAddress());\r\n \r\n \t\tif (log.isTraceEnabled()) log.trace(\"absoluteToRelativeStatementXri(\" + absoluteStatementXri + \" --> \" + relativeStatementXri + \")\");\r\n \r\n \t\treturn relativeStatementXri;\r\n \t}\r\n \r\n \t@Override\r\n-\tpublic XDI3Statement relativeToAbsoluteStatementXri(XDI3Statement relativeStatementXri) {\r\n+\tpublic XDIStatement relativeToAbsoluteStatementXri(XDIStatement relativeStatementXri) {\r\n \r\n-\t\tXDI3Statement absoluteStatementXri = StatementUtil.concatXriStatement(this.getContextNode().getXri(), relativeStatementXri);\r\n+\t\tXDIStatement absoluteStatementXri = StatementUtil.concatAddressStatement(this.getContextNode().getAddress(), relativeStatementXri);\r\n \r\n \t\tif (log.isTraceEnabled()) log.trace(\"relativeToAbsoluteStatementXri(\" + relativeStatementXri + \" --> \" + absoluteStatementXri + \")\");\r\n \r\n@@ -179,15 +179,15 @@ public XDI3Statement relativeToAbsoluteStatementXri(XDI3Statement relativeStatem\n \r\n \t/**\r\n \t * Checks if a given XRI is an XDI root XRI.\r\n-\t * @param arcXri An XDI root XRI.\r\n+\t * @param arc An XDI root XRI.\r\n \t * @return True, if the XRI is an XDI root XRI.\r\n \t */\r\n-\tpublic static boolean isRootArcXri(XDI3SubSegment arcXri) {\r\n+\tpublic static boolean isRootarc(XDIArc arc) {\r\n \r\n-\t\tif (log.isTraceEnabled()) log.trace(\"isRootArcXri(\" + arcXri + \")\");\r\n+\t\tif (log.isTraceEnabled()) log.trace(\"isRootarc(\" + arc + \")\");\r\n \r\n-\t\tif (XdiPeerRoot.isPeerRootArcXri(arcXri)) return true;\r\n-\t\tif (XdiInnerRoot.isInnerRootArcXri(arcXri)) return true;\r\n+\t\tif (XdiPeerRoot.isPeerRootArc(arc)) return true;\r\n+\t\tif (XdiInnerRoot.isInnerRootarc(arc)) return true;\r\n \r\n \t\treturn false;\r\n \t}\r", "raw_url": "https://github.com/projectdanube/xdi2/raw/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Fnodetypes%2FXdiAbstractRoot.java", "sha": "351c3a9a0df3be57e2d708952d753c22cc74e313", "status": "modified" }, { "additions": 4, "blob_url": "https://github.com/projectdanube/xdi2/blob/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Fnodetypes%2FXdiAbstractSingleton.java", "changes": 8, "contents_url": "https://api.github.com/repos/projectdanube/xdi2/contents/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Fnodetypes%2FXdiAbstractSingleton.java?ref=0ca7982fec30c2bb8204efbbea61428a643d2e9c", "deletions": 4, "filename": "core/src/main/java/xdi2/core/features/nodetypes/XdiAbstractSingleton.java", "new_code": "import xdi2.core.syntax.XDIArc;\r\n\tpublic static boolean isValidarc(XDIArc arc) {\r\n\t\treturn XdiEntitySingleton.isValidarc(arc) || \r\n\t\t\t\tXdiAttributeSingleton.isValidarc(arc);\r", "new_methods": [], "old_code": "import xdi2.core.xri3.XDI3SubSegment;\r\n\tpublic static boolean isValidArcXri(XDI3SubSegment arcXri) {\r\n\t\treturn XdiEntitySingleton.isValidArcXri(arcXri) || \r\n\t\t\t\tXdiAttributeSingleton.isValidArcXri(arcXri);\r", "old_methods": [], "patch": "@@ -1,7 +1,7 @@\n package xdi2.core.features.nodetypes;\r\n \r\n import xdi2.core.ContextNode;\r\n-import xdi2.core.xri3.XDI3SubSegment;\r\n+import xdi2.core.syntax.XDIArc;\r\n \r\n public abstract class XdiAbstractSingleton<EQ extends XdiSubGraph<EQ>> extends XdiAbstractSubGraph<EQ> implements XdiSingleton<EQ> {\r\n \r\n@@ -48,9 +48,9 @@ public static XdiSingleton<?> fromContextNode(ContextNode contextNode) {\n \t * Methods for XRIs\r\n \t */\r\n \r\n-\tpublic static boolean isValidArcXri(XDI3SubSegment arcXri) {\r\n+\tpublic static boolean isValidarc(XDIArc arc) {\r\n \r\n-\t\treturn XdiEntitySingleton.isValidArcXri(arcXri) || \r\n-\t\t\t\tXdiAttributeSingleton.isValidArcXri(arcXri);\r\n+\t\treturn XdiEntitySingleton.isValidarc(arc) || \r\n+\t\t\t\tXdiAttributeSingleton.isValidarc(arc);\r\n \t}\r\n }\r", "raw_url": "https://github.com/projectdanube/xdi2/raw/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Fnodetypes%2FXdiAbstractSingleton.java", "sha": "3703e98011b9bb1fa53d375045e963aacfa82c0c", "status": "modified" }, { "additions": 10, "blob_url": "https://github.com/projectdanube/xdi2/blob/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Fnodetypes%2FXdiAttributeCollection.java", "changes": 20, "contents_url": "https://api.github.com/repos/projectdanube/xdi2/contents/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Fnodetypes%2FXdiAttributeCollection.java?ref=0ca7982fec30c2bb8204efbbea61428a643d2e9c", "deletions": 10, "filename": "core/src/main/java/xdi2/core/features/nodetypes/XdiAttributeCollection.java", "new_code": "import xdi2.core.syntax.XDIArc;\r\n\t\treturn isValidarc(contextNode.getArc());\r\n\tpublic static XDIArc createarc(XDIArc arc) {\r\n\t\treturn XDIArc.create(\"\" + XDIConstants.XS_CLASS.charAt(0) + XDIConstants.XS_ATTRIBUTE.charAt(0) + arc + XDIConstants.XS_ATTRIBUTE.charAt(1) + XDIConstants.XS_CLASS.charAt(1));\r\n\tpublic static boolean isValidarc(XDIArc arc) {\r\n\t\tif (arc == null) return false;\r\n\t\tif (! arc.isClassXs()) return false;\r\n\t\tif (! arc.isAttributeXs()) return false;\r\n\t\tif (XDIConstants.CS_CLASS_UNRESERVED.equals(arc.getCs()) || XDIConstants.CS_CLASS_RESERVED.equals(arc.getCs())) {\r\n\t\t\tif (! arc.hasLiteral() && ! arc.hasXRef()) return false;\r", "new_methods": [], "old_code": "import xdi2.core.xri3.XDI3SubSegment;\r\n\t\treturn isValidArcXri(contextNode.getArcXri());\r\n\tpublic static XDI3SubSegment createArcXri(XDI3SubSegment arcXri) {\r\n\t\treturn XDI3SubSegment.create(\"\" + XDIConstants.XS_CLASS.charAt(0) + XDIConstants.XS_ATTRIBUTE.charAt(0) + arcXri + XDIConstants.XS_ATTRIBUTE.charAt(1) + XDIConstants.XS_CLASS.charAt(1));\r\n\tpublic static boolean isValidArcXri(XDI3SubSegment arcXri) {\r\n\t\tif (arcXri == null) return false;\r\n\t\tif (! arcXri.isClassXs()) return false;\r\n\t\tif (! arcXri.isAttributeXs()) return false;\r\n\t\tif (XDIConstants.CS_CLASS_UNRESERVED.equals(arcXri.getCs()) || XDIConstants.CS_CLASS_RESERVED.equals(arcXri.getCs())) {\r\n\t\t\tif (! arcXri.hasLiteral() && ! arcXri.hasXRef()) return false;\r", "old_methods": [], "patch": "@@ -4,9 +4,9 @@\n \r\n import xdi2.core.ContextNode;\r\n import xdi2.core.constants.XDIConstants;\r\n+import xdi2.core.syntax.XDIArc;\r\n import xdi2.core.util.iterators.MappingIterator;\r\n import xdi2.core.util.iterators.NotNullIterator;\r\n-import xdi2.core.xri3.XDI3SubSegment;\r\n \r\n /**\r\n * An XDI attribute class (context function), represented as a context node.\r\n@@ -35,7 +35,7 @@ public static boolean isValid(ContextNode contextNode) {\n \r\n \t\tif (contextNode == null) return false;\r\n \r\n-\t\treturn isValidArcXri(contextNode.getArcXri());\r\n+\t\treturn isValidarc(contextNode.getArc());\r\n \t}\r\n \r\n \t/**\r\n@@ -54,21 +54,21 @@ public static XdiAttributeCollection fromContextNode(ContextNode contextNode) {\n \t * Methods for XRIs\r\n \t */\r\n \r\n-\tpublic static XDI3SubSegment createArcXri(XDI3SubSegment arcXri) {\r\n+\tpublic static XDIArc createarc(XDIArc arc) {\r\n \r\n-\t\treturn XDI3SubSegment.create(\"\" + XDIConstants.XS_CLASS.charAt(0) + XDIConstants.XS_ATTRIBUTE.charAt(0) + arcXri + XDIConstants.XS_ATTRIBUTE.charAt(1) + XDIConstants.XS_CLASS.charAt(1));\r\n+\t\treturn XDIArc.create(\"\" + XDIConstants.XS_CLASS.charAt(0) + XDIConstants.XS_ATTRIBUTE.charAt(0) + arc + XDIConstants.XS_ATTRIBUTE.charAt(1) + XDIConstants.XS_CLASS.charAt(1));\r\n \t}\r\n \r\n-\tpublic static boolean isValidArcXri(XDI3SubSegment arcXri) {\r\n+\tpublic static boolean isValidarc(XDIArc arc) {\r\n \r\n-\t\tif (arcXri == null) return false;\r\n+\t\tif (arc == null) return false;\r\n \r\n-\t\tif (! arcXri.isClassXs()) return false;\r\n-\t\tif (! arcXri.isAttributeXs()) return false;\r\n+\t\tif (! arc.isClassXs()) return false;\r\n+\t\tif (! arc.isAttributeXs()) return false;\r\n \r\n-\t\tif (XDIConstants.CS_CLASS_UNRESERVED.equals(arcXri.getCs()) || XDIConstants.CS_CLASS_RESERVED.equals(arcXri.getCs())) {\r\n+\t\tif (XDIConstants.CS_CLASS_UNRESERVED.equals(arc.getCs()) || XDIConstants.CS_CLASS_RESERVED.equals(arc.getCs())) {\r\n \r\n-\t\t\tif (! arcXri.hasLiteral() && ! arcXri.hasXRef()) return false;\r\n+\t\t\tif (! arc.hasLiteral() && ! arc.hasXRef()) return false;\r\n \t\t} else {\r\n \r\n \t\t\treturn false;\r", "raw_url": "https://github.com/projectdanube/xdi2/raw/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Fnodetypes%2FXdiAttributeCollection.java", "sha": "ffc41c6465fcf0e2b5f4017aa60be6f92ffcf3fd", "status": "modified" }, { "additions": 6, "blob_url": "https://github.com/projectdanube/xdi2/blob/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Fnodetypes%2FXdiAttributeMemberOrdered.java", "changes": 12, "contents_url": "https://api.github.com/repos/projectdanube/xdi2/contents/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Fnodetypes%2FXdiAttributeMemberOrdered.java?ref=0ca7982fec30c2bb8204efbbea61428a643d2e9c", "deletions": 6, "filename": "core/src/main/java/xdi2/core/features/nodetypes/XdiAttributeMemberOrdered.java", "new_code": "import xdi2.core.syntax.XDIArc;\r\n\t\t\t\tisValidarc(contextNode.getArc()) &&\r\n\tpublic static boolean isValidarc(XDIArc arc) {\r\n\t\treturn XdiAbstractMemberOrdered.isValidarc(arc, true);\r\n\t\tXDIArc valuearc = XdiValue.createarc();\r\n\t\tContextNode valueContextNode = create ? this.getContextNode().setContextNode(valuearc) : this.getContextNode().getContextNode(valuearc, false);\r", "new_methods": [], "old_code": "import xdi2.core.xri3.XDI3SubSegment;\r\n\t\t\t\tisValidArcXri(contextNode.getArcXri()) &&\r\n\tpublic static boolean isValidArcXri(XDI3SubSegment arcXri) {\r\n\t\treturn XdiAbstractMemberOrdered.isValidArcXri(arcXri, true);\r\n\t\tXDI3SubSegment valueArcXri = XdiValue.createArcXri();\r\n\t\tContextNode valueContextNode = create ? this.getContextNode().setContextNode(valueArcXri) : this.getContextNode().getContextNode(valueArcXri, false);\r", "old_methods": [], "patch": "@@ -3,9 +3,9 @@\n import java.util.Iterator;\r\n \r\n import xdi2.core.ContextNode;\r\n+import xdi2.core.syntax.XDIArc;\r\n import xdi2.core.util.iterators.MappingIterator;\r\n import xdi2.core.util.iterators.NotNullIterator;\r\n-import xdi2.core.xri3.XDI3SubSegment;\r\n \r\n /**\r\n * An XDI ordered attribute members (context function), represented as a context node.\r\n@@ -35,7 +35,7 @@ public static boolean isValid(ContextNode contextNode) {\n \t\tif (contextNode == null) return false;\r\n \r\n \t\treturn\r\n-\t\t\t\tisValidArcXri(contextNode.getArcXri()) &&\r\n+\t\t\t\tisValidarc(contextNode.getArc()) &&\r\n \t\t\t\tXdiAttributeCollection.isValid(contextNode.getContextNode());\r\n \t}\r\n \r\n@@ -55,9 +55,9 @@ public static XdiAttributeMemberOrdered fromContextNode(ContextNode contextNode)\n \t * Methods for XRIs\r\n \t */\r\n \r\n-\tpublic static boolean isValidArcXri(XDI3SubSegment arcXri) {\r\n+\tpublic static boolean isValidarc(XDIArc arc) {\r\n \r\n-\t\treturn XdiAbstractMemberOrdered.isValidArcXri(arcXri, true);\r\n+\t\treturn XdiAbstractMemberOrdered.isValidarc(arc, true);\r\n \t}\r\n \r\n \t/*\r\n@@ -82,9 +82,9 @@ public XdiAttributeCollection getXdiCollection() {\n \t@Override\r\n \tpublic XdiValue getXdiValue(boolean create) {\r\n \r\n-\t\tXDI3SubSegment valueArcXri = XdiValue.createArcXri();\r\n+\t\tXDIArc valuearc = XdiValue.createarc();\r\n \r\n-\t\tContextNode valueContextNode = create ? this.getContextNode().setContextNode(valueArcXri) : this.getContextNode().getContextNode(valueArcXri, false);\r\n+\t\tContextNode valueContextNode = create ? this.getContextNode().setContextNode(valuearc) : this.getContextNode().getContextNode(valuearc, false);\r\n \t\tif (valueContextNode == null) return null;\r\n \r\n \t\treturn new XdiValue(valueContextNode);\r", "raw_url": "https://github.com/projectdanube/xdi2/raw/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Fnodetypes%2FXdiAttributeMemberOrdered.java", "sha": "a39508ba4b73df1933985dad71c89cc2cf91fcf4", "status": "modified" }, { "additions": 6, "blob_url": "https://github.com/projectdanube/xdi2/blob/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Fnodetypes%2FXdiAttributeMemberUnordered.java", "changes": 12, "contents_url": "https://api.github.com/repos/projectdanube/xdi2/contents/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Fnodetypes%2FXdiAttributeMemberUnordered.java?ref=0ca7982fec30c2bb8204efbbea61428a643d2e9c", "deletions": 6, "filename": "core/src/main/java/xdi2/core/features/nodetypes/XdiAttributeMemberUnordered.java", "new_code": "import xdi2.core.syntax.XDIArc;\r\n\t\t\t\tisValidarc(contextNode.getArc(), true) &&\r\n\tpublic static boolean isValidarc(XDIArc arc) {\r\n\t\treturn XdiAbstractMemberUnordered.isValidarc(arc, true);\r\n\t\tXDIArc valuearc = XdiValue.createarc();\r\n\t\tContextNode valueContextNode = create ? this.getContextNode().setContextNode(valuearc) : this.getContextNode().getContextNode(valuearc, false);\r", "new_methods": [], "old_code": "import xdi2.core.xri3.XDI3SubSegment;\r\n\t\t\t\tisValidArcXri(contextNode.getArcXri(), true) &&\r\n\tpublic static boolean isValidArcXri(XDI3SubSegment arcXri) {\r\n\t\treturn XdiAbstractMemberUnordered.isValidArcXri(arcXri, true);\r\n\t\tXDI3SubSegment valueArcXri = XdiValue.createArcXri();\r\n\t\tContextNode valueContextNode = create ? this.getContextNode().setContextNode(valueArcXri) : this.getContextNode().getContextNode(valueArcXri, false);\r", "old_methods": [], "patch": "@@ -3,9 +3,9 @@\n import java.util.Iterator;\r\n \r\n import xdi2.core.ContextNode;\r\n+import xdi2.core.syntax.XDIArc;\r\n import xdi2.core.util.iterators.MappingIterator;\r\n import xdi2.core.util.iterators.NotNullIterator;\r\n-import xdi2.core.xri3.XDI3SubSegment;\r\n \r\n /**\r\n * An XDI unordered attribute member (context function), represented as a context node.\r\n@@ -35,7 +35,7 @@ public static boolean isValid(ContextNode contextNode) {\n \t\tif (contextNode == null) return false;\r\n \r\n \t\treturn\r\n-\t\t\t\tisValidArcXri(contextNode.getArcXri(), true) &&\r\n+\t\t\t\tisValidarc(contextNode.getArc(), true) &&\r\n \t\t\t\tXdiAttributeCollection.isValid(contextNode.getContextNode());\r\n \t}\r\n \r\n@@ -55,9 +55,9 @@ public static XdiAttributeMemberUnordered fromContextNode(ContextNode contextNod\n \t * Methods for XRIs\r\n \t */\r\n \r\n-\tpublic static boolean isValidArcXri(XDI3SubSegment arcXri) {\r\n+\tpublic static boolean isValidarc(XDIArc arc) {\r\n \r\n-\t\treturn XdiAbstractMemberUnordered.isValidArcXri(arcXri, true);\r\n+\t\treturn XdiAbstractMemberUnordered.isValidarc(arc, true);\r\n \t}\r\n \r\n \t/*\r\n@@ -82,9 +82,9 @@ public XdiAttributeCollection getXdiCollection() {\n \t@Override\r\n \tpublic XdiValue getXdiValue(boolean create) {\r\n \r\n-\t\tXDI3SubSegment valueArcXri = XdiValue.createArcXri();\r\n+\t\tXDIArc valuearc = XdiValue.createarc();\r\n \r\n-\t\tContextNode valueContextNode = create ? this.getContextNode().setContextNode(valueArcXri) : this.getContextNode().getContextNode(valueArcXri, false);\r\n+\t\tContextNode valueContextNode = create ? this.getContextNode().setContextNode(valuearc) : this.getContextNode().getContextNode(valuearc, false);\r\n \t\tif (valueContextNode == null) return null;\r\n \r\n \t\treturn new XdiValue(valueContextNode);\r", "raw_url": "https://github.com/projectdanube/xdi2/raw/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Fnodetypes%2FXdiAttributeMemberUnordered.java", "sha": "5aafe3fe4b39664bf9fdaff42245e796979b696f", "status": "modified" }, { "additions": 12, "blob_url": "https://github.com/projectdanube/xdi2/blob/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Fnodetypes%2FXdiAttributeSingleton.java", "changes": 24, "contents_url": "https://api.github.com/repos/projectdanube/xdi2/contents/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Fnodetypes%2FXdiAttributeSingleton.java?ref=0ca7982fec30c2bb8204efbbea61428a643d2e9c", "deletions": 12, "filename": "core/src/main/java/xdi2/core/features/nodetypes/XdiAttributeSingleton.java", "new_code": "import xdi2.core.syntax.XDIArc;\r\n\t\treturn isValidarc(contextNode.getArc());\r\n\t\tXDIArc valuearc = XdiValue.createarc();\r\n\t\tContextNode valueContextNode = create ? this.getContextNode().setContextNode(valuearc) : this.getContextNode().getContextNode(valuearc, false);\r\n\tpublic static XDIArc createarc(XDIArc arc) {\r\n\t\treturn XDIArc.create(\"\" + XDIConstants.XS_ATTRIBUTE.charAt(0) + arc + XDIConstants.XS_ATTRIBUTE.charAt(1));\r\n\tpublic static boolean isValidarc(XDIArc arc) {\r\n\t\tif (arc == null) return false;\r\n\t\tif (arc.isClassXs()) return false;\r\n\t\tif (! arc.isAttributeXs()) return false;\r\n\t\tif (XDIConstants.CS_CLASS_UNRESERVED.equals(arc.getCs()) || XDIConstants.CS_CLASS_RESERVED.equals(arc.getCs())) {\r\n\t\t\tif (! arc.hasLiteral() && ! arc.hasXRef()) return false;\r", "new_methods": [], "old_code": "import xdi2.core.xri3.XDI3SubSegment;\r\n\t\treturn isValidArcXri(contextNode.getArcXri());\r\n\t\tXDI3SubSegment valueArcXri = XdiValue.createArcXri();\r\n\t\tContextNode valueContextNode = create ? this.getContextNode().setContextNode(valueArcXri) : this.getContextNode().getContextNode(valueArcXri, false);\r\n\tpublic static XDI3SubSegment createArcXri(XDI3SubSegment arcXri) {\r\n\t\treturn XDI3SubSegment.create(\"\" + XDIConstants.XS_ATTRIBUTE.charAt(0) + arcXri + XDIConstants.XS_ATTRIBUTE.charAt(1));\r\n\tpublic static boolean isValidArcXri(XDI3SubSegment arcXri) {\r\n\t\tif (arcXri == null) return false;\r\n\t\tif (arcXri.isClassXs()) return false;\r\n\t\tif (! arcXri.isAttributeXs()) return false;\r\n\t\tif (XDIConstants.CS_CLASS_UNRESERVED.equals(arcXri.getCs()) || XDIConstants.CS_CLASS_RESERVED.equals(arcXri.getCs())) {\r\n\t\t\tif (! arcXri.hasLiteral() && ! arcXri.hasXRef()) return false;\r", "old_methods": [], "patch": "@@ -4,9 +4,9 @@\n \r\n import xdi2.core.ContextNode;\r\n import xdi2.core.constants.XDIConstants;\r\n+import xdi2.core.syntax.XDIArc;\r\n import xdi2.core.util.iterators.MappingIterator;\r\n import xdi2.core.util.iterators.NotNullIterator;\r\n-import xdi2.core.xri3.XDI3SubSegment;\r\n \r\n /**\r\n * An XDI attribute singleton (context function), represented as a context node.\r\n@@ -35,7 +35,7 @@ public static boolean isValid(ContextNode contextNode) {\n \r\n \t\tif (contextNode == null) return false;\r\n \t\t\r\n-\t\treturn isValidArcXri(contextNode.getArcXri());\r\n+\t\treturn isValidarc(contextNode.getArc());\r\n \t}\r\n \r\n \t/**\r\n@@ -62,9 +62,9 @@ public static XdiAttributeSingleton fromContextNode(ContextNode contextNode) {\n \t@Override\r\n \tpublic XdiValue getXdiValue(boolean create) {\r\n \r\n-\t\tXDI3SubSegment valueArcXri = XdiValue.createArcXri();\r\n+\t\tXDIArc valuearc = XdiValue.createarc();\r\n \r\n-\t\tContextNode valueContextNode = create ? this.getContextNode().setContextNode(valueArcXri) : this.getContextNode().getContextNode(valueArcXri, false);\r\n+\t\tContextNode valueContextNode = create ? this.getContextNode().setContextNode(valuearc) : this.getContextNode().getContextNode(valuearc, false);\r\n \t\tif (valueContextNode == null) return null;\r\n \r\n \t\treturn new XdiValue(valueContextNode);\r\n@@ -74,21 +74,21 @@ public XdiValue getXdiValue(boolean create) {\n \t * Methods for XRIs\r\n \t */\r\n \r\n-\tpublic static XDI3SubSegment createArcXri(XDI3SubSegment arcXri) {\r\n+\tpublic static XDIArc createarc(XDIArc arc) {\r\n \r\n-\t\treturn XDI3SubSegment.create(\"\" + XDIConstants.XS_ATTRIBUTE.charAt(0) + arcXri + XDIConstants.XS_ATTRIBUTE.charAt(1));\r\n+\t\treturn XDIArc.create(\"\" + XDIConstants.XS_ATTRIBUTE.charAt(0) + arc + XDIConstants.XS_ATTRIBUTE.charAt(1));\r\n \t}\r\n \r\n-\tpublic static boolean isValidArcXri(XDI3SubSegment arcXri) {\r\n+\tpublic static boolean isValidarc(XDIArc arc) {\r\n \r\n-\t\tif (arcXri == null) return false;\r\n+\t\tif (arc == null) return false;\r\n \r\n-\t\tif (arcXri.isClassXs()) return false;\r\n-\t\tif (! arcXri.isAttributeXs()) return false;\r\n+\t\tif (arc.isClassXs()) return false;\r\n+\t\tif (! arc.isAttributeXs()) return false;\r\n \r\n-\t\tif (XDIConstants.CS_CLASS_UNRESERVED.equals(arcXri.getCs()) || XDIConstants.CS_CLASS_RESERVED.equals(arcXri.getCs())) {\r\n+\t\tif (XDIConstants.CS_CLASS_UNRESERVED.equals(arc.getCs()) || XDIConstants.CS_CLASS_RESERVED.equals(arc.getCs())) {\r\n \r\n-\t\t\tif (! arcXri.hasLiteral() && ! arcXri.hasXRef()) return false;\r\n+\t\t\tif (! arc.hasLiteral() && ! arc.hasXRef()) return false;\r\n \t\t} else {\r\n \r\n \t\t\treturn false;\r", "raw_url": "https://github.com/projectdanube/xdi2/raw/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Fnodetypes%2FXdiAttributeSingleton.java", "sha": "5e50ad1c008c7382098319cc251411661d464abe", "status": "modified" }, { "additions": 3, "blob_url": "https://github.com/projectdanube/xdi2/blob/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Fnodetypes%2FXdiCollection.java", "changes": 6, "contents_url": "https://api.github.com/repos/projectdanube/xdi2/contents/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Fnodetypes%2FXdiCollection.java?ref=0ca7982fec30c2bb8204efbbea61428a643d2e9c", "deletions": 3, "filename": "core/src/main/java/xdi2/core/features/nodetypes/XdiCollection.java", "new_code": "import xdi2.core.syntax.XDIArc;\r\n\tpublic U setXdiMemberUnordered(XDIArc arc);\r\n\tpublic U getXdiMemberUnordered(XDIArc arc);\r", "new_methods": [], "old_code": "import xdi2.core.xri3.XDI3SubSegment;\r\n\tpublic U setXdiMemberUnordered(XDI3SubSegment arcXri);\r\n\tpublic U getXdiMemberUnordered(XDI3SubSegment arcXri);\r", "old_methods": [], "patch": "@@ -1,12 +1,12 @@\n package xdi2.core.features.nodetypes;\r\n \r\n+import xdi2.core.syntax.XDIArc;\r\n import xdi2.core.util.iterators.ReadOnlyIterator;\r\n-import xdi2.core.xri3.XDI3SubSegment;\r\n \r\n public interface XdiCollection<EQC extends XdiCollection<EQC, EQI, C, U, O, I>, EQI extends XdiSubGraph<EQI>, C extends XdiCollection<EQC, EQI, C, U, O, I>, U extends XdiMemberUnordered<EQC, EQI, C, U, O, I>, O extends XdiMemberOrdered<EQC, EQI, C, U, O, I>, I extends XdiMember<EQC, EQI, C, U, O, I>> extends XdiSubGraph<EQC> {\r\n \r\n-\tpublic U setXdiMemberUnordered(XDI3SubSegment arcXri);\r\n-\tpublic U getXdiMemberUnordered(XDI3SubSegment arcXri);\r\n+\tpublic U setXdiMemberUnordered(XDIArc arc);\r\n+\tpublic U getXdiMemberUnordered(XDIArc arc);\r\n \tpublic ReadOnlyIterator<U> getXdiMembersUnordered();\r\n \tpublic long getXdiMembersUnorderedCount();\r\n \r", "raw_url": "https://github.com/projectdanube/xdi2/raw/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Fnodetypes%2FXdiCollection.java", "sha": "fe3bb890f30a48faa5f9d88a5095492228dde65c", "status": "modified" }, { "additions": 18, "blob_url": "https://github.com/projectdanube/xdi2/blob/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Fnodetypes%2FXdiContext.java", "changes": 36, "contents_url": "https://api.github.com/repos/projectdanube/xdi2/contents/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Fnodetypes%2FXdiContext.java?ref=0ca7982fec30c2bb8204efbbea61428a643d2e9c", "deletions": 18, "filename": "core/src/main/java/xdi2/core/features/nodetypes/XdiContext.java", "new_code": "import xdi2.core.syntax.XDIAddress;\r\nimport xdi2.core.syntax.XDIArc;\r\n\tpublic XDIArc getArc();\r\n\tpublic XDIAddress getXri();\r\n\tpublic XDIArc getBasearc();\r\n\tpublic XdiInnerRoot getXdiInnerRoot(XDIAddress innerRootPredicateXri, boolean create);\r\n\tpublic XdiEntityCollection getXdiEntityCollection(XDIArc contextNodeArc, boolean create);\r\n\tpublic XdiEntityCollection getXdiEntityCollection(XDIAddress contextNodeAddress, boolean create);\r\n\tpublic XdiAttributeCollection getXdiAttributeCollection(XDIArc contextNodeArc, boolean create);\r\n\tpublic XdiAttributeCollection getXdiAttributeCollection(XDIAddress contextNodeAddress, boolean create);\r\n\tpublic XdiEntitySingleton getXdiEntitySingleton(XDIArc contextNodeArc, boolean create);\r\n\tpublic XdiEntitySingleton getXdiEntitySingleton(XDIAddress contextNodeAddress, boolean create);\r\n\tpublic XdiAttributeSingleton getXdiAttributeSingleton(XDIArc contextNodeArc, boolean create);\r\n\tpublic XdiAttributeSingleton getXdiAttributeSingleton(XDIAddress contextNodeAddress, boolean create);\r\n\tpublic XdiEntity getXdiEntity(XDIArc contextNodeArc, boolean create);\r\n\tpublic XdiEntity getXdiEntity(XDIAddress contextNodeAddress, boolean create);\r\n\tpublic XdiAttribute getXdiAttribute(XDIArc contextNodeArc, boolean create);\r\n\tpublic XdiAttribute getXdiAttribute(XDIAddress contextNodeAddress, boolean create);\r", "new_methods": [], "old_code": "import xdi2.core.xri3.XDI3Segment;\r\nimport xdi2.core.xri3.XDI3SubSegment;\r\n\tpublic XDI3SubSegment getArcXri();\r\n\tpublic XDI3Segment getXri();\r\n\tpublic XDI3SubSegment getBaseArcXri();\r\n\tpublic XdiInnerRoot getXdiInnerRoot(XDI3Segment innerRootPredicateXri, boolean create);\r\n\tpublic XdiEntityCollection getXdiEntityCollection(XDI3SubSegment contextNodeArcXri, boolean create);\r\n\tpublic XdiEntityCollection getXdiEntityCollection(XDI3Segment contextNodeXri, boolean create);\r\n\tpublic XdiAttributeCollection getXdiAttributeCollection(XDI3SubSegment contextNodeArcXri, boolean create);\r\n\tpublic XdiAttributeCollection getXdiAttributeCollection(XDI3Segment contextNodeXri, boolean create);\r\n\tpublic XdiEntitySingleton getXdiEntitySingleton(XDI3SubSegment contextNodeArcXri, boolean create);\r\n\tpublic XdiEntitySingleton getXdiEntitySingleton(XDI3Segment contextNodeXri, boolean create);\r\n\tpublic XdiAttributeSingleton getXdiAttributeSingleton(XDI3SubSegment contextNodeArcXri, boolean create);\r\n\tpublic XdiAttributeSingleton getXdiAttributeSingleton(XDI3Segment contextNodeXri, boolean create);\r\n\tpublic XdiEntity getXdiEntity(XDI3SubSegment contextNodeArcXri, boolean create);\r\n\tpublic XdiEntity getXdiEntity(XDI3Segment contextNodeXri, boolean create);\r\n\tpublic XdiAttribute getXdiAttribute(XDI3SubSegment contextNodeArcXri, boolean create);\r\n\tpublic XdiAttribute getXdiAttribute(XDI3Segment contextNodeXri, boolean create);\r", "old_methods": [], "patch": "@@ -5,16 +5,16 @@\n \r\n import xdi2.core.ContextNode;\r\n import xdi2.core.Graph;\r\n-import xdi2.core.xri3.XDI3Segment;\r\n-import xdi2.core.xri3.XDI3SubSegment;\r\n+import xdi2.core.syntax.XDIAddress;\r\n+import xdi2.core.syntax.XDIArc;\r\n \r\n public interface XdiContext<EQ extends XdiContext<EQ>> extends Serializable, Comparable<XdiContext<?>> {\r\n \r\n \tpublic ContextNode getContextNode();\r\n \tpublic Graph getGraph();\r\n-\tpublic XDI3SubSegment getArcXri();\r\n-\tpublic XDI3Segment getXri();\r\n-\tpublic XDI3SubSegment getBaseArcXri();\r\n+\tpublic XDIArc getArc();\r\n+\tpublic XDIAddress getXri();\r\n+\tpublic XDIArc getBasearc();\r\n \r\n \tpublic EQ dereference();\r\n \tpublic EQ getReferenceXdiContext();\r\n@@ -23,17 +23,17 @@ public interface XdiContext<EQ extends XdiContext<EQ>> extends Serializable, Com\n \r\n \tpublic XdiRoot findRoot();\r\n \tpublic XdiLocalRoot findLocalRoot();\r\n-\tpublic XdiInnerRoot getXdiInnerRoot(XDI3Segment innerRootPredicateXri, boolean create);\r\n-\tpublic XdiEntityCollection getXdiEntityCollection(XDI3SubSegment contextNodeArcXri, boolean create);\r\n-\tpublic XdiEntityCollection getXdiEntityCollection(XDI3Segment contextNodeXri, boolean create);\r\n-\tpublic XdiAttributeCollection getXdiAttributeCollection(XDI3SubSegment contextNodeArcXri, boolean create);\r\n-\tpublic XdiAttributeCollection getXdiAttributeCollection(XDI3Segment contextNodeXri, boolean create);\r\n-\tpublic XdiEntitySingleton getXdiEntitySingleton(XDI3SubSegment contextNodeArcXri, boolean create);\r\n-\tpublic XdiEntitySingleton getXdiEntitySingleton(XDI3Segment contextNodeXri, boolean create);\r\n-\tpublic XdiAttributeSingleton getXdiAttributeSingleton(XDI3SubSegment contextNodeArcXri, boolean create);\r\n-\tpublic XdiAttributeSingleton getXdiAttributeSingleton(XDI3Segment contextNodeXri, boolean create);\r\n-\tpublic XdiEntity getXdiEntity(XDI3SubSegment contextNodeArcXri, boolean create);\r\n-\tpublic XdiEntity getXdiEntity(XDI3Segment contextNodeXri, boolean create);\r\n-\tpublic XdiAttribute getXdiAttribute(XDI3SubSegment contextNodeArcXri, boolean create);\r\n-\tpublic XdiAttribute getXdiAttribute(XDI3Segment contextNodeXri, boolean create);\r\n+\tpublic XdiInnerRoot getXdiInnerRoot(XDIAddress innerRootPredicateXri, boolean create);\r\n+\tpublic XdiEntityCollection getXdiEntityCollection(XDIArc contextNodeArc, boolean create);\r\n+\tpublic XdiEntityCollection getXdiEntityCollection(XDIAddress contextNodeAddress, boolean create);\r\n+\tpublic XdiAttributeCollection getXdiAttributeCollection(XDIArc contextNodeArc, boolean create);\r\n+\tpublic XdiAttributeCollection getXdiAttributeCollection(XDIAddress contextNodeAddress, boolean create);\r\n+\tpublic XdiEntitySingleton getXdiEntitySingleton(XDIArc contextNodeArc, boolean create);\r\n+\tpublic XdiEntitySingleton getXdiEntitySingleton(XDIAddress contextNodeAddress, boolean create);\r\n+\tpublic XdiAttributeSingleton getXdiAttributeSingleton(XDIArc contextNodeArc, boolean create);\r\n+\tpublic XdiAttributeSingleton getXdiAttributeSingleton(XDIAddress contextNodeAddress, boolean create);\r\n+\tpublic XdiEntity getXdiEntity(XDIArc contextNodeArc, boolean create);\r\n+\tpublic XdiEntity getXdiEntity(XDIAddress contextNodeAddress, boolean create);\r\n+\tpublic XdiAttribute getXdiAttribute(XDIArc contextNodeArc, boolean create);\r\n+\tpublic XdiAttribute getXdiAttribute(XDIAddress contextNodeAddress, boolean create);\r\n }\r", "raw_url": "https://github.com/projectdanube/xdi2/raw/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Fnodetypes%2FXdiContext.java", "sha": "3f36a2b7931d7b6de36ec2e9b18dd07a04d48c31", "status": "modified" }, { "additions": 12, "blob_url": "https://github.com/projectdanube/xdi2/blob/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Fnodetypes%2FXdiEntityCollection.java", "changes": 24, "contents_url": "https://api.github.com/repos/projectdanube/xdi2/contents/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Fnodetypes%2FXdiEntityCollection.java?ref=0ca7982fec30c2bb8204efbbea61428a643d2e9c", "deletions": 12, "filename": "core/src/main/java/xdi2/core/features/nodetypes/XdiEntityCollection.java", "new_code": "import xdi2.core.syntax.XDIArc;\r\n\t\t\t\tisValidarc(contextNode.getArc()) &&\r\n\tpublic static XDIArc createarc(XDIArc arc) {\r\n\t\treturn XDIArc.create(\"\" + XDIConstants.XS_CLASS.charAt(0) + arc + XDIConstants.XS_CLASS.charAt(1));\r\n\tpublic static boolean isValidarc(XDIArc arc) {\r\n\t\tif (arc == null) return false;\r\n\t\tif (! arc.isClassXs()) return false;\r\n\t\tif (arc.isAttributeXs()) return false;\r\n\t\tif (XDIConstants.CS_CLASS_UNRESERVED.equals(arc.getCs()) || XDIConstants.CS_CLASS_RESERVED.equals(arc.getCs())) {\r\n\t\t\tif (! arc.hasLiteral() && ! arc.hasXRef()) return false;\r\n\t\t} else if (XDIConstants.CS_AUTHORITY_PERSONAL.equals(arc.getCs()) || XDIConstants.CS_AUTHORITY_LEGAL.equals(arc.getCs()) || XDIConstants.CS_AUTHORITY_GENERAL.equals(arc.getCs())) {\r\n\t\t\tif (arc.hasLiteral() || arc.hasXRef()) return false;\r", "new_methods": [ { "arguments": [ "XDIArc arc" ], "filename": "core/src/main/java/xdi2/core/features/nodetypes/XdiEntityCollection.java", "implementation": "return XDIArc.create(\"\" + XDIConstants.XS_CLASS.charAt(0) + arc + XDIConstants.XS_CLASS.charAt(1));\r\n\tpublic static boolean isValidarc(XDIArc arc) {\r\n\t\tif (arc == null) return false;\r\n\t\tif (! arc.isClassXs()) return false;\r\n\t\tif (arc.isAttributeXs()) return false;\r\n\t\tif (XDIConstants.CS_CLASS_UNRESERVED.equals(arc.getCs()) || XDIConstants.CS_CLASS_RESERVED.equals(arc.getCs())) {\r\n\t\t\tif (! arc.hasLiteral() && ! arc.hasXRef()) return false;", "signature": "XDIArc createarc(XDIArc arc)" } ], "old_code": "import xdi2.core.xri3.XDI3SubSegment;\r\n\t\t\t\tisValidArcXri(contextNode.getArcXri()) &&\r\n\tpublic static XDI3SubSegment createArcXri(XDI3SubSegment arcXri) {\r\n\t\treturn XDI3SubSegment.create(\"\" + XDIConstants.XS_CLASS.charAt(0) + arcXri + XDIConstants.XS_CLASS.charAt(1));\r\n\tpublic static boolean isValidArcXri(XDI3SubSegment arcXri) {\r\n\t\tif (arcXri == null) return false;\r\n\t\tif (! arcXri.isClassXs()) return false;\r\n\t\tif (arcXri.isAttributeXs()) return false;\r\n\t\tif (XDIConstants.CS_CLASS_UNRESERVED.equals(arcXri.getCs()) || XDIConstants.CS_CLASS_RESERVED.equals(arcXri.getCs())) {\r\n\t\t\tif (! arcXri.hasLiteral() && ! arcXri.hasXRef()) return false;\r\n\t\t} else if (XDIConstants.CS_AUTHORITY_PERSONAL.equals(arcXri.getCs()) || XDIConstants.CS_AUTHORITY_LEGAL.equals(arcXri.getCs()) || XDIConstants.CS_AUTHORITY_GENERAL.equals(arcXri.getCs())) {\r\n\t\t\tif (arcXri.hasLiteral() || arcXri.hasXRef()) return false;\r", "old_methods": [ { "arguments": [ "XDI3SubSegment arcXri" ], "filename": "core/src/main/java/xdi2/core/features/nodetypes/XdiEntityCollection.java", "implementation": "return XDI3SubSegment.create(\"\" + XDIConstants.XS_CLASS.charAt(0) + arcXri + XDIConstants.XS_CLASS.charAt(1));\r\n\tpublic static boolean isValidArcXri(XDI3SubSegment arcXri) {\r\n\t\tif (arcXri == null) return false;\r\n\t\tif (! arcXri.isClassXs()) return false;\r\n\t\tif (arcXri.isAttributeXs()) return false;\r\n\t\tif (XDIConstants.CS_CLASS_UNRESERVED.equals(arcXri.getCs()) || XDIConstants.CS_CLASS_RESERVED.equals(arcXri.getCs())) {\r\n\t\t\tif (! arcXri.hasLiteral() && ! arcXri.hasXRef()) return false;", "signature": "XDI3SubSegment createArcXri(XDI3SubSegment arcXri)" } ], "patch": "@@ -4,9 +4,9 @@\n \r\n import xdi2.core.ContextNode;\r\n import xdi2.core.constants.XDIConstants;\r\n+import xdi2.core.syntax.XDIArc;\r\n import xdi2.core.util.iterators.MappingIterator;\r\n import xdi2.core.util.iterators.NotNullIterator;\r\n-import xdi2.core.xri3.XDI3SubSegment;\r\n \r\n /**\r\n * An XDI entity class (context function), represented as a context node.\r\n@@ -36,7 +36,7 @@ public static boolean isValid(ContextNode contextNode) {\n \t\tif (contextNode == null) return false;\r\n \r\n \t\treturn \r\n-\t\t\t\tisValidArcXri(contextNode.getArcXri()) &&\r\n+\t\t\t\tisValidarc(contextNode.getArc()) &&\r\n \t\t\t\t( ! XdiAttributeCollection.isValid(contextNode.getContextNode()) && ! XdiAbstractAttribute.isValid(contextNode.getContextNode()) );\r\n \t}\r\n \r\n@@ -56,24 +56,24 @@ public static XdiEntityCollection fromContextNode(ContextNode contextNode) {\n \t * Methods for XRIs\r\n \t */\r\n \r\n-\tpublic static XDI3SubSegment createArcXri(XDI3SubSegment arcXri) {\r\n+\tpublic static XDIArc createarc(XDIArc arc) {\r\n \r\n-\t\treturn XDI3SubSegment.create(\"\" + XDIConstants.XS_CLASS.charAt(0) + arcXri + XDIConstants.XS_CLASS.charAt(1));\r\n+\t\treturn XDIArc.create(\"\" + XDIConstants.XS_CLASS.charAt(0) + arc + XDIConstants.XS_CLASS.charAt(1));\r\n \t}\r\n \r\n-\tpublic static boolean isValidArcXri(XDI3SubSegment arcXri) {\r\n+\tpublic static boolean isValidarc(XDIArc arc) {\r\n \r\n-\t\tif (arcXri == null) return false;\r\n+\t\tif (arc == null) return false;\r\n \r\n-\t\tif (! arcXri.isClassXs()) return false;\r\n-\t\tif (arcXri.isAttributeXs()) return false;\r\n+\t\tif (! arc.isClassXs()) return false;\r\n+\t\tif (arc.isAttributeXs()) return false;\r\n \r\n-\t\tif (XDIConstants.CS_CLASS_UNRESERVED.equals(arcXri.getCs()) || XDIConstants.CS_CLASS_RESERVED.equals(arcXri.getCs())) {\r\n+\t\tif (XDIConstants.CS_CLASS_UNRESERVED.equals(arc.getCs()) || XDIConstants.CS_CLASS_RESERVED.equals(arc.getCs())) {\r\n \r\n-\t\t\tif (! arcXri.hasLiteral() && ! arcXri.hasXRef()) return false;\r\n-\t\t} else if (XDIConstants.CS_AUTHORITY_PERSONAL.equals(arcXri.getCs()) || XDIConstants.CS_AUTHORITY_LEGAL.equals(arcXri.getCs()) || XDIConstants.CS_AUTHORITY_GENERAL.equals(arcXri.getCs())) {\r\n+\t\t\tif (! arc.hasLiteral() && ! arc.hasXRef()) return false;\r\n+\t\t} else if (XDIConstants.CS_AUTHORITY_PERSONAL.equals(arc.getCs()) || XDIConstants.CS_AUTHORITY_LEGAL.equals(arc.getCs()) || XDIConstants.CS_AUTHORITY_GENERAL.equals(arc.getCs())) {\r\n \r\n-\t\t\tif (arcXri.hasLiteral() || arcXri.hasXRef()) return false;\r\n+\t\t\tif (arc.hasLiteral() || arc.hasXRef()) return false;\r\n \t\t} else {\r\n \r\n \t\t\treturn false;\r", "raw_url": "https://github.com/projectdanube/xdi2/raw/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Fnodetypes%2FXdiEntityCollection.java", "sha": "06553258cfb1cef1640e32f5bdeddd1b77e0e5fd", "status": "modified" }, { "additions": 4, "blob_url": "https://github.com/projectdanube/xdi2/blob/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Fnodetypes%2FXdiEntityMemberOrdered.java", "changes": 8, "contents_url": "https://api.github.com/repos/projectdanube/xdi2/contents/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Fnodetypes%2FXdiEntityMemberOrdered.java?ref=0ca7982fec30c2bb8204efbbea61428a643d2e9c", "deletions": 4, "filename": "core/src/main/java/xdi2/core/features/nodetypes/XdiEntityMemberOrdered.java", "new_code": "import xdi2.core.syntax.XDIArc;\r\n\t\t\t\tisValidarc(contextNode.getArc()) &&\r\n\tpublic static boolean isValidarc(XDIArc arc) {\r\n\t\treturn XdiAbstractMemberOrdered.isValidarc(arc, false);\r", "new_methods": [], "old_code": "import xdi2.core.xri3.XDI3SubSegment;\r\n\t\t\t\tisValidArcXri(contextNode.getArcXri()) &&\r\n\tpublic static boolean isValidArcXri(XDI3SubSegment arcXri) {\r\n\t\treturn XdiAbstractMemberOrdered.isValidArcXri(arcXri, false);\r", "old_methods": [], "patch": "@@ -3,9 +3,9 @@\n import java.util.Iterator;\r\n \r\n import xdi2.core.ContextNode;\r\n+import xdi2.core.syntax.XDIArc;\r\n import xdi2.core.util.iterators.MappingIterator;\r\n import xdi2.core.util.iterators.NotNullIterator;\r\n-import xdi2.core.xri3.XDI3SubSegment;\r\n \r\n /**\r\n * An XDI ordered entity member (context function), represented as a context node.\r\n@@ -35,7 +35,7 @@ public static boolean isValid(ContextNode contextNode) {\n \t\tif (contextNode == null) return false;\r\n \r\n \t\treturn\r\n-\t\t\t\tisValidArcXri(contextNode.getArcXri()) &&\r\n+\t\t\t\tisValidarc(contextNode.getArc()) &&\r\n \t\t\t\tXdiEntityCollection.isValid(contextNode.getContextNode());\r\n \t}\r\n \r\n@@ -55,9 +55,9 @@ public static XdiEntityMemberOrdered fromContextNode(ContextNode contextNode) {\n \t * Methods for XRIs\r\n \t */\r\n \r\n-\tpublic static boolean isValidArcXri(XDI3SubSegment arcXri) {\r\n+\tpublic static boolean isValidarc(XDIArc arc) {\r\n \r\n-\t\treturn XdiAbstractMemberOrdered.isValidArcXri(arcXri, false);\r\n+\t\treturn XdiAbstractMemberOrdered.isValidarc(arc, false);\r\n \t}\r\n \r\n \t/*\r", "raw_url": "https://github.com/projectdanube/xdi2/raw/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Fnodetypes%2FXdiEntityMemberOrdered.java", "sha": "8502a163ca8707e05168b1fe645628750a2efbb7", "status": "modified" }, { "additions": 4, "blob_url": "https://github.com/projectdanube/xdi2/blob/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Fnodetypes%2FXdiEntityMemberUnordered.java", "changes": 8, "contents_url": "https://api.github.com/repos/projectdanube/xdi2/contents/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Fnodetypes%2FXdiEntityMemberUnordered.java?ref=0ca7982fec30c2bb8204efbbea61428a643d2e9c", "deletions": 4, "filename": "core/src/main/java/xdi2/core/features/nodetypes/XdiEntityMemberUnordered.java", "new_code": "import xdi2.core.syntax.XDIArc;\r\n\t\t\t\tisValidarc(contextNode.getArc(), false) &&\r\n\tpublic static boolean isValidarc(XDIArc arc) {\r\n\t\treturn XdiAbstractMemberUnordered.isValidarc(arc, false);\r", "new_methods": [], "old_code": "import xdi2.core.xri3.XDI3SubSegment;\r\n\t\t\t\tisValidArcXri(contextNode.getArcXri(), false) &&\r\n\tpublic static boolean isValidArcXri(XDI3SubSegment arcXri) {\r\n\t\treturn XdiAbstractMemberUnordered.isValidArcXri(arcXri, false);\r", "old_methods": [], "patch": "@@ -3,9 +3,9 @@\n import java.util.Iterator;\r\n \r\n import xdi2.core.ContextNode;\r\n+import xdi2.core.syntax.XDIArc;\r\n import xdi2.core.util.iterators.MappingIterator;\r\n import xdi2.core.util.iterators.NotNullIterator;\r\n-import xdi2.core.xri3.XDI3SubSegment;\r\n \r\n /**\r\n * An XDI unordered entity member (context function), represented as a context node.\r\n@@ -35,7 +35,7 @@ public static boolean isValid(ContextNode contextNode) {\n \t\tif (contextNode == null) return false;\r\n \r\n \t\treturn\r\n-\t\t\t\tisValidArcXri(contextNode.getArcXri(), false) &&\r\n+\t\t\t\tisValidarc(contextNode.getArc(), false) &&\r\n \t\t\t\tXdiEntityCollection.isValid(contextNode.getContextNode());\r\n \t}\r\n \r\n@@ -55,9 +55,9 @@ public static XdiEntityMemberUnordered fromContextNode(ContextNode contextNode)\n \t * Methods for XRIs\r\n \t */\r\n \r\n-\tpublic static boolean isValidArcXri(XDI3SubSegment arcXri) {\r\n+\tpublic static boolean isValidarc(XDIArc arc) {\r\n \r\n-\t\treturn XdiAbstractMemberUnordered.isValidArcXri(arcXri, false);\r\n+\t\treturn XdiAbstractMemberUnordered.isValidarc(arc, false);\r\n \t}\r\n \r\n \t/*\r", "raw_url": "https://github.com/projectdanube/xdi2/raw/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Fnodetypes%2FXdiEntityMemberUnordered.java", "sha": "e347ea6a392432c56f7eb4acf6897c9282a7828e", "status": "modified" }, { "additions": 11, "blob_url": "https://github.com/projectdanube/xdi2/blob/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Fnodetypes%2FXdiEntitySingleton.java", "changes": 22, "contents_url": "https://api.github.com/repos/projectdanube/xdi2/contents/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Fnodetypes%2FXdiEntitySingleton.java?ref=0ca7982fec30c2bb8204efbbea61428a643d2e9c", "deletions": 11, "filename": "core/src/main/java/xdi2/core/features/nodetypes/XdiEntitySingleton.java", "new_code": "import xdi2.core.syntax.XDIArc;\r\n\t\t\t\tisValidarc(contextNode.getArc()) &&\r\n\tpublic static XDIArc createarc(XDIArc arc) {\r\n\t\treturn arc;\r\n\tpublic static boolean isValidarc(XDIArc arc) {\r\n\t\tif (arc == null) return false;\r\n\t\tif (arc.isAttributeXs()) return false;\r\n\t\tif (arc.isClassXs()) return false;\r\n\t\tif (! arc.hasLiteral() && ! arc.hasXRef()) return false;\r\n\t\tif (XDIConstants.CS_CLASS_UNRESERVED.equals(arc.getCs()) || XDIConstants.CS_CLASS_RESERVED.equals(arc.getCs())) {\r\n\t\t} else if (XDIConstants.CS_AUTHORITY_PERSONAL.equals(arc.getCs()) || XDIConstants.CS_AUTHORITY_LEGAL.equals(arc.getCs()) || XDIConstants.CS_AUTHORITY_GENERAL.equals(arc.getCs())) {\r", "new_methods": [ { "arguments": [ "XDIArc arc" ], "filename": "core/src/main/java/xdi2/core/features/nodetypes/XdiEntitySingleton.java", "implementation": "return arc;\r\n\tpublic static boolean isValidarc(XDIArc arc) {\r\n\t\tif (arc == null) return false;\r\n\t\tif (arc.isAttributeXs()) return false;\r\n\t\tif (arc.isClassXs()) return false;\r\n\t\tif (! arc.hasLiteral() && ! arc.hasXRef()) return false;\r\n\t\tif (XDIConstants.CS_CLASS_UNRESERVED.equals(arc.getCs()) || XDIConstants.CS_CLASS_RESERVED.equals(arc.getCs())) {", "signature": "XDIArc createarc(XDIArc arc)" } ], "old_code": "import xdi2.core.xri3.XDI3SubSegment;\r\n\t\t\t\tisValidArcXri(contextNode.getArcXri()) &&\r\n\tpublic static XDI3SubSegment createArcXri(XDI3SubSegment arcXri) {\r\n\t\treturn arcXri;\r\n\tpublic static boolean isValidArcXri(XDI3SubSegment arcXri) {\r\n\t\tif (arcXri == null) return false;\r\n\t\tif (arcXri.isAttributeXs()) return false;\r\n\t\tif (arcXri.isClassXs()) return false;\r\n\t\tif (! arcXri.hasLiteral() && ! arcXri.hasXRef()) return false;\r\n\t\tif (XDIConstants.CS_CLASS_UNRESERVED.equals(arcXri.getCs()) || XDIConstants.CS_CLASS_RESERVED.equals(arcXri.getCs())) {\r\n\t\t} else if (XDIConstants.CS_AUTHORITY_PERSONAL.equals(arcXri.getCs()) || XDIConstants.CS_AUTHORITY_LEGAL.equals(arcXri.getCs()) || XDIConstants.CS_AUTHORITY_GENERAL.equals(arcXri.getCs())) {\r", "old_methods": [ { "arguments": [ "XDI3SubSegment arcXri" ], "filename": "core/src/main/java/xdi2/core/features/nodetypes/XdiEntitySingleton.java", "implementation": "return arcXri;\r\n\tpublic static boolean isValidArcXri(XDI3SubSegment arcXri) {\r\n\t\tif (arcXri == null) return false;\r\n\t\tif (arcXri.isAttributeXs()) return false;\r\n\t\tif (arcXri.isClassXs()) return false;\r\n\t\tif (! arcXri.hasLiteral() && ! arcXri.hasXRef()) return false;\r\n\t\tif (XDIConstants.CS_CLASS_UNRESERVED.equals(arcXri.getCs()) || XDIConstants.CS_CLASS_RESERVED.equals(arcXri.getCs())) {", "signature": "XDI3SubSegment createArcXri(XDI3SubSegment arcXri)" } ], "patch": "@@ -4,9 +4,9 @@\n \r\n import xdi2.core.ContextNode;\r\n import xdi2.core.constants.XDIConstants;\r\n+import xdi2.core.syntax.XDIArc;\r\n import xdi2.core.util.iterators.MappingIterator;\r\n import xdi2.core.util.iterators.NotNullIterator;\r\n-import xdi2.core.xri3.XDI3SubSegment;\r\n \r\n /**\r\n * An XDI entity singleton (context function), represented as a context node.\r\n@@ -36,7 +36,7 @@ public static boolean isValid(ContextNode contextNode) {\n \t\tif (contextNode == null) return false;\r\n \r\n \t\treturn \r\n-\t\t\t\tisValidArcXri(contextNode.getArcXri()) &&\r\n+\t\t\t\tisValidarc(contextNode.getArc()) &&\r\n \t\t\t\t( ! XdiAttributeCollection.isValid(contextNode.getContextNode()) && ! XdiAbstractAttribute.isValid(contextNode.getContextNode()) );\r\n \t}\r\n \r\n@@ -56,23 +56,23 @@ public static XdiEntitySingleton fromContextNode(ContextNode contextNode) {\n \t * Methods for XRIs\r\n \t */\r\n \r\n-\tpublic static XDI3SubSegment createArcXri(XDI3SubSegment arcXri) {\r\n+\tpublic static XDIArc createarc(XDIArc arc) {\r\n \r\n-\t\treturn arcXri;\r\n+\t\treturn arc;\r\n \t}\r\n \r\n-\tpublic static boolean isValidArcXri(XDI3SubSegment arcXri) {\r\n+\tpublic static boolean isValidarc(XDIArc arc) {\r\n \r\n-\t\tif (arcXri == null) return false;\r\n+\t\tif (arc == null) return false;\r\n \r\n-\t\tif (arcXri.isAttributeXs()) return false;\r\n-\t\tif (arcXri.isClassXs()) return false;\r\n+\t\tif (arc.isAttributeXs()) return false;\r\n+\t\tif (arc.isClassXs()) return false;\r\n \r\n-\t\tif (! arcXri.hasLiteral() && ! arcXri.hasXRef()) return false;\r\n+\t\tif (! arc.hasLiteral() && ! arc.hasXRef()) return false;\r\n \r\n-\t\tif (XDIConstants.CS_CLASS_UNRESERVED.equals(arcXri.getCs()) || XDIConstants.CS_CLASS_RESERVED.equals(arcXri.getCs())) {\r\n+\t\tif (XDIConstants.CS_CLASS_UNRESERVED.equals(arc.getCs()) || XDIConstants.CS_CLASS_RESERVED.equals(arc.getCs())) {\r\n \r\n-\t\t} else if (XDIConstants.CS_AUTHORITY_PERSONAL.equals(arcXri.getCs()) || XDIConstants.CS_AUTHORITY_LEGAL.equals(arcXri.getCs()) || XDIConstants.CS_AUTHORITY_GENERAL.equals(arcXri.getCs())) {\r\n+\t\t} else if (XDIConstants.CS_AUTHORITY_PERSONAL.equals(arc.getCs()) || XDIConstants.CS_AUTHORITY_LEGAL.equals(arc.getCs()) || XDIConstants.CS_AUTHORITY_GENERAL.equals(arc.getCs())) {\r\n \r\n \t\t} else {\r\n \r", "raw_url": "https://github.com/projectdanube/xdi2/raw/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Fnodetypes%2FXdiEntitySingleton.java", "sha": "4bd97c8d40cd7b94fe344feb035bdd8b8ec127ff", "status": "modified" }, { "additions": 33, "blob_url": "https://github.com/projectdanube/xdi2/blob/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Fnodetypes%2FXdiInnerRoot.java", "changes": 66, "contents_url": "https://api.github.com/repos/projectdanube/xdi2/contents/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Fnodetypes%2FXdiInnerRoot.java?ref=0ca7982fec30c2bb8204efbbea61428a643d2e9c", "deletions": 33, "filename": "core/src/main/java/xdi2/core/features/nodetypes/XdiInnerRoot.java", "new_code": "import xdi2.core.syntax.XDIAddress;\r\nimport xdi2.core.syntax.XDIArc;\r\nimport xdi2.core.syntax.XDIXRef;\r\n\t\t\t\tisInnerRootarc(contextNode.getArc()) &&\r\n\tpublic XDIAddress getSubjectOfInnerRoot() {\r\n\t\treturn getSubjectOfInnerRootXri(this.getContextNode().getArc());\r\n\tpublic XDIAddress getPredicateOfInnerRoot() {\r\n\t\treturn getPredicateOfInnerRootXri(this.getContextNode().getArc());\r\n\tpublic static XDIArc createInnerRootarc(XDIAddress subject, XDIAddress predicate) {\r\n\t\treturn XDIArc.fromComponents(null, false, false, null, \r\n\t\t\t\tXDIXRef.fromComponents(XDIConstants.XS_ROOT, null, subject, predicate, null, null));\r\n\t\tXDIAddress subject = XdiInnerRoot.getSubjectOfInnerRootXri(contextNode.getArc());\r\n\t\tXDIAddress predicate = XdiInnerRoot.getPredicateOfInnerRootXri(contextNode.getArc());\r\n\t\tRelation predicateRelation = subjectContextNode.getRelation(predicate, contextNode.getAddress());\r\n\t * @param arc An inner root XRI.\r\n\tpublic static XDIAddress getSubjectOfInnerRootXri(XDIArc arc) {\r\n\t\tif (arc == null) return null;\r\n\t\tif (arc.hasCs()) return null;\r\n\t\tif (arc.isClassXs()) return null;\r\n\t\tif (arc.isAttributeXs()) return null;\r\n\t\tif (! arc.hasXRef()) return null;\r\n\t\tXDIXRef xref = arc.getXRef();\r\n\t * @param arc An inner root XRI.\r\n\tpublic static XDIAddress getPredicateOfInnerRootXri(XDIArc arc) {\r\n\t\tif (arc == null) return null;\r\n\t\tif (arc.hasCs()) return null;\r\n\t\tif (arc.isClassXs()) return null;\r\n\t\tif (arc.isAttributeXs()) return null;\r\n\t\tif (! arc.hasXRef()) return null;\r\n\t\tXDIXRef xref = arc.getXRef();\r\n\t * @param arc An inner root XRI.\r\n\tpublic static boolean isInnerRootarc(XDIArc arc) {\r\n\t\treturn getSubjectOfInnerRootXri(arc) != null && getPredicateOfInnerRootXri(arc) != null;\r", "new_methods": [], "old_code": "import xdi2.core.xri3.XDI3Segment;\r\nimport xdi2.core.xri3.XDI3SubSegment;\r\nimport xdi2.core.xri3.XDI3XRef;\r\n\t\t\t\tisInnerRootArcXri(contextNode.getArcXri()) &&\r\n\tpublic XDI3Segment getSubjectOfInnerRoot() {\r\n\t\treturn getSubjectOfInnerRootXri(this.getContextNode().getArcXri());\r\n\tpublic XDI3Segment getPredicateOfInnerRoot() {\r\n\t\treturn getPredicateOfInnerRootXri(this.getContextNode().getArcXri());\r\n\tpublic static XDI3SubSegment createInnerRootArcXri(XDI3Segment subject, XDI3Segment predicate) {\r\n\t\treturn XDI3SubSegment.fromComponents(null, false, false, null, \r\n\t\t\t\tXDI3XRef.fromComponents(XDIConstants.XS_ROOT, null, subject, predicate, null, null));\r\n\t\tXDI3Segment subject = XdiInnerRoot.getSubjectOfInnerRootXri(contextNode.getArcXri());\r\n\t\tXDI3Segment predicate = XdiInnerRoot.getPredicateOfInnerRootXri(contextNode.getArcXri());\r\n\t\tRelation predicateRelation = subjectContextNode.getRelation(predicate, contextNode.getXri());\r\n\t * @param arcXri An inner root XRI.\r\n\tpublic static XDI3Segment getSubjectOfInnerRootXri(XDI3SubSegment arcXri) {\r\n\t\tif (arcXri == null) return null;\r\n\t\tif (arcXri.hasCs()) return null;\r\n\t\tif (arcXri.isClassXs()) return null;\r\n\t\tif (arcXri.isAttributeXs()) return null;\r\n\t\tif (! arcXri.hasXRef()) return null;\r\n\t\tXDI3XRef xref = arcXri.getXRef();\r\n\t * @param arcXri An inner root XRI.\r\n\tpublic static XDI3Segment getPredicateOfInnerRootXri(XDI3SubSegment arcXri) {\r\n\t\tif (arcXri == null) return null;\r\n\t\tif (arcXri.hasCs()) return null;\r\n\t\tif (arcXri.isClassXs()) return null;\r\n\t\tif (arcXri.isAttributeXs()) return null;\r\n\t\tif (! arcXri.hasXRef()) return null;\r\n\t\tXDI3XRef xref = arcXri.getXRef();\r\n\t * @param arcXri An inner root XRI.\r\n\tpublic static boolean isInnerRootArcXri(XDI3SubSegment arcXri) {\r\n\t\treturn getSubjectOfInnerRootXri(arcXri) != null && getPredicateOfInnerRootXri(arcXri) != null;\r", "old_methods": [], "patch": "@@ -5,11 +5,11 @@\n import xdi2.core.ContextNode;\r\n import xdi2.core.Relation;\r\n import xdi2.core.constants.XDIConstants;\r\n+import xdi2.core.syntax.XDIAddress;\r\n+import xdi2.core.syntax.XDIArc;\r\n+import xdi2.core.syntax.XDIXRef;\r\n import xdi2.core.util.iterators.MappingIterator;\r\n import xdi2.core.util.iterators.NotNullIterator;\r\n-import xdi2.core.xri3.XDI3Segment;\r\n-import xdi2.core.xri3.XDI3SubSegment;\r\n-import xdi2.core.xri3.XDI3XRef;\r\n \r\n /**\r\n * An XDI inner root, represented as a context node.\r\n@@ -39,7 +39,7 @@ public static boolean isValid(ContextNode contextNode) {\n \t\tif (contextNode == null) return false;\r\n \r\n \t\treturn\r\n-\t\t\t\tisInnerRootArcXri(contextNode.getArcXri()) &&\r\n+\t\t\t\tisInnerRootarc(contextNode.getArc()) &&\r\n \t\t\t\tXdiAbstractRoot.isValid(contextNode.getContextNode());\r\n \t}\r\n \r\n@@ -81,18 +81,18 @@ public Relation getPredicateRelation() {\n \t * Returns the subject XRI of this XDI inner root.\r\n \t * @return The subject XRI.\r\n \t */\r\n-\tpublic XDI3Segment getSubjectOfInnerRoot() {\r\n+\tpublic XDIAddress getSubjectOfInnerRoot() {\r\n \r\n-\t\treturn getSubjectOfInnerRootXri(this.getContextNode().getArcXri());\r\n+\t\treturn getSubjectOfInnerRootXri(this.getContextNode().getArc());\r\n \t}\r\n \r\n \t/**\r\n \t * Returns the predicate XRI of this XDI inner root.\r\n \t * @return The predicate XRI.\r\n \t */\r\n-\tpublic XDI3Segment getPredicateOfInnerRoot() {\r\n+\tpublic XDIAddress getPredicateOfInnerRoot() {\r\n \r\n-\t\treturn getPredicateOfInnerRootXri(this.getContextNode().getArcXri());\r\n+\t\treturn getPredicateOfInnerRootXri(this.getContextNode().getArc());\r\n \t}\r\n \r\n \t/*\r\n@@ -105,10 +105,10 @@ public XDI3Segment getPredicateOfInnerRoot() {\n \t * @param predicate A subject XRI.\r\n \t * @return The inner root XRI of the subject XRI and the predicate XRI.\r\n \t */\r\n-\tpublic static XDI3SubSegment createInnerRootArcXri(XDI3Segment subject, XDI3Segment predicate) {\r\n+\tpublic static XDIArc createInnerRootarc(XDIAddress subject, XDIAddress predicate) {\r\n \r\n-\t\treturn XDI3SubSegment.fromComponents(null, false, false, null, \r\n-\t\t\t\tXDI3XRef.fromComponents(XDIConstants.XS_ROOT, null, subject, predicate, null, null));\r\n+\t\treturn XDIArc.fromComponents(null, false, false, null, \r\n+\t\t\t\tXDIXRef.fromComponents(XDIConstants.XS_ROOT, null, subject, predicate, null, null));\r\n \t}\r\n \r\n \t/**\r\n@@ -118,7 +118,7 @@ public static XDI3SubSegment createInnerRootArcXri(XDI3Segment subject, XDI3Segm\n \t */\r\n \tpublic static ContextNode getSubjectContextNode(ContextNode contextNode) {\r\n \r\n-\t\tXDI3Segment subject = XdiInnerRoot.getSubjectOfInnerRootXri(contextNode.getArcXri());\r\n+\t\tXDIAddress subject = XdiInnerRoot.getSubjectOfInnerRootXri(contextNode.getArc());\r\n \t\tif (subject == null) return null;\r\n \r\n \t\tContextNode parentContextNode = contextNode.getContextNode();\r\n@@ -137,33 +137,33 @@ public static ContextNode getSubjectContextNode(ContextNode contextNode) {\n \t */\r\n \tpublic static Relation getPredicateRelation(ContextNode contextNode) {\r\n \r\n-\t\tXDI3Segment predicate = XdiInnerRoot.getPredicateOfInnerRootXri(contextNode.getArcXri());\r\n+\t\tXDIAddress predicate = XdiInnerRoot.getPredicateOfInnerRootXri(contextNode.getArc());\r\n \t\tif (predicate == null) return null;\r\n \r\n \t\tContextNode subjectContextNode = getSubjectContextNode(contextNode);\r\n \t\tif (subjectContextNode == null) return null;\r\n \r\n-\t\tRelation predicateRelation = subjectContextNode.getRelation(predicate, contextNode.getXri());\r\n+\t\tRelation predicateRelation = subjectContextNode.getRelation(predicate, contextNode.getAddress());\r\n \t\tif (predicateRelation == null) return null;\r\n \r\n \t\treturn predicateRelation;\r\n \t}\r\n \r\n \t/**\r\n \t * Returns the subject XRI of the inner root XRI.\r\n-\t * @param arcXri An inner root XRI.\r\n+\t * @param arc An inner root XRI.\r\n \t * @return The subject XRI of the inner root XRI.\r\n \t */\r\n-\tpublic static XDI3Segment getSubjectOfInnerRootXri(XDI3SubSegment arcXri) {\r\n+\tpublic static XDIAddress getSubjectOfInnerRootXri(XDIArc arc) {\r\n \r\n-\t\tif (arcXri == null) return null;\r\n+\t\tif (arc == null) return null;\r\n \r\n-\t\tif (arcXri.hasCs()) return null;\r\n-\t\tif (arcXri.isClassXs()) return null;\r\n-\t\tif (arcXri.isAttributeXs()) return null;\r\n-\t\tif (! arcXri.hasXRef()) return null;\r\n+\t\tif (arc.hasCs()) return null;\r\n+\t\tif (arc.isClassXs()) return null;\r\n+\t\tif (arc.isAttributeXs()) return null;\r\n+\t\tif (! arc.hasXRef()) return null;\r\n \r\n-\t\tXDI3XRef xref = arcXri.getXRef();\r\n+\t\tXDIXRef xref = arc.getXRef();\r\n \t\tif (! XDIConstants.XS_ROOT.equals(xref.getXs())) return null;\r\n \t\tif (! xref.hasPartialSubjectAndPredicate()) return null;\r\n \r\n@@ -172,19 +172,19 @@ public static XDI3Segment getSubjectOfInnerRootXri(XDI3SubSegment arcXri) {\n \r\n \t/**\r\n \t * Returns the predicate XRI of the inner root XRI.\r\n-\t * @param arcXri An inner root XRI.\r\n+\t * @param arc An inner root XRI.\r\n \t * @return The predicate XRI of the inner root XRI.\r\n \t */\r\n-\tpublic static XDI3Segment getPredicateOfInnerRootXri(XDI3SubSegment arcXri) {\r\n+\tpublic static XDIAddress getPredicateOfInnerRootXri(XDIArc arc) {\r\n \r\n-\t\tif (arcXri == null) return null;\r\n+\t\tif (arc == null) return null;\r\n \r\n-\t\tif (arcXri.hasCs()) return null;\r\n-\t\tif (arcXri.isClassXs()) return null;\r\n-\t\tif (arcXri.isAttributeXs()) return null;\r\n-\t\tif (! arcXri.hasXRef()) return null;\r\n+\t\tif (arc.hasCs()) return null;\r\n+\t\tif (arc.isClassXs()) return null;\r\n+\t\tif (arc.isAttributeXs()) return null;\r\n+\t\tif (! arc.hasXRef()) return null;\r\n \r\n-\t\tXDI3XRef xref = arcXri.getXRef();\r\n+\t\tXDIXRef xref = arc.getXRef();\r\n \t\tif (! XDIConstants.XS_ROOT.equals(xref.getXs())) return null;\r\n \t\tif (! xref.hasPartialSubjectAndPredicate()) return null;\r\n \r\n@@ -193,12 +193,12 @@ public static XDI3Segment getPredicateOfInnerRootXri(XDI3SubSegment arcXri) {\n \r\n \t/**\r\n \t * Checks if a given XRI is an inner root XRI.\r\n-\t * @param arcXri An inner root XRI.\r\n+\t * @param arc An inner root XRI.\r\n \t * @return True, if the XRI is an inner root XRI.\r\n \t */\r\n-\tpublic static boolean isInnerRootArcXri(XDI3SubSegment arcXri) {\r\n+\tpublic static boolean isInnerRootarc(XDIArc arc) {\r\n \r\n-\t\treturn getSubjectOfInnerRootXri(arcXri) != null && getPredicateOfInnerRootXri(arcXri) != null;\r\n+\t\treturn getSubjectOfInnerRootXri(arc) != null && getPredicateOfInnerRootXri(arc) != null;\r\n \t}\r\n \r\n \t/*\r", "raw_url": "https://github.com/projectdanube/xdi2/raw/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Fnodetypes%2FXdiInnerRoot.java", "sha": "db5d839831e56d612bd21eed30e1d06ac412e9e4", "status": "modified" }, { "additions": 7, "blob_url": "https://github.com/projectdanube/xdi2/blob/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Fnodetypes%2FXdiLocalRoot.java", "changes": 14, "contents_url": "https://api.github.com/repos/projectdanube/xdi2/contents/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Fnodetypes%2FXdiLocalRoot.java?ref=0ca7982fec30c2bb8204efbbea61428a643d2e9c", "deletions": 7, "filename": "core/src/main/java/xdi2/core/features/nodetypes/XdiLocalRoot.java", "new_code": "import xdi2.core.syntax.XDIAddress;\r\n\tpublic XdiPeerRoot setSelfPeerRoot(XDIAddress xri) {\r\n\t\tlocalRootContextNode.delRelations(XDIDictionaryConstants.XDI_ADD_IS_REF);\r\n\t\tlocalRootContextNode.setRelation(XDIDictionaryConstants.XDI_ADD_IS_REF, selfPeerRootContextNode);\r\n\t\tselfPeerRootContextNode.delRelations(XDIDictionaryConstants.XDI_ADD_REF);\r\n\t\tselfPeerRootContextNode.setRelation(XDIDictionaryConstants.XDI_ADD_REF, localRootContextNode);\r\n\t\tRelation relation = this.getContextNode().getRelation(XDIDictionaryConstants.XDI_ADD_IS_REF);\r", "new_methods": [], "old_code": "import xdi2.core.xri3.XDI3Segment;\r\n\tpublic XdiPeerRoot setSelfPeerRoot(XDI3Segment xri) {\r\n\t\tlocalRootContextNode.delRelations(XDIDictionaryConstants.XRI_S_IS_REF);\r\n\t\tlocalRootContextNode.setRelation(XDIDictionaryConstants.XRI_S_IS_REF, selfPeerRootContextNode);\r\n\t\tselfPeerRootContextNode.delRelations(XDIDictionaryConstants.XRI_S_REF);\r\n\t\tselfPeerRootContextNode.setRelation(XDIDictionaryConstants.XRI_S_REF, localRootContextNode);\r\n\t\tRelation relation = this.getContextNode().getRelation(XDIDictionaryConstants.XRI_S_IS_REF);\r", "old_methods": [], "patch": "@@ -6,8 +6,8 @@\n import xdi2.core.constants.XDIDictionaryConstants;\r\n import xdi2.core.features.nodetypes.XdiInnerRoot.MappingContextNodeInnerRootIterator;\r\n import xdi2.core.features.nodetypes.XdiPeerRoot.MappingContextNodePeerRootIterator;\r\n+import xdi2.core.syntax.XDIAddress;\r\n import xdi2.core.util.iterators.ReadOnlyIterator;\r\n-import xdi2.core.xri3.XDI3Segment;\r\n \r\n /**\r\n * An XDI local root, represented as a context node.\r\n@@ -67,7 +67,7 @@ public static XdiLocalRoot fromContextNode(ContextNode contextNode) {\n \t * Instance methods\r\n \t */\r\n \r\n-\tpublic XdiPeerRoot setSelfPeerRoot(XDI3Segment xri) {\r\n+\tpublic XdiPeerRoot setSelfPeerRoot(XDIAddress xri) {\r\n \r\n \t\tXdiPeerRoot selfPeerRoot = this.getSelfPeerRoot();\r\n \t\tif (selfPeerRoot != null) selfPeerRoot.getContextNode().delete();\r\n@@ -79,18 +79,18 @@ public XdiPeerRoot setSelfPeerRoot(XDI3Segment xri) {\n \t\tContextNode localRootContextNode = this.getContextNode();\r\n \t\tContextNode selfPeerRootContextNode = selfPeerRoot.getContextNode();\r\n \r\n-\t\tlocalRootContextNode.delRelations(XDIDictionaryConstants.XRI_S_IS_REF);\r\n-\t\tlocalRootContextNode.setRelation(XDIDictionaryConstants.XRI_S_IS_REF, selfPeerRootContextNode);\r\n+\t\tlocalRootContextNode.delRelations(XDIDictionaryConstants.XDI_ADD_IS_REF);\r\n+\t\tlocalRootContextNode.setRelation(XDIDictionaryConstants.XDI_ADD_IS_REF, selfPeerRootContextNode);\r\n \r\n-\t\tselfPeerRootContextNode.delRelations(XDIDictionaryConstants.XRI_S_REF);\r\n-\t\tselfPeerRootContextNode.setRelation(XDIDictionaryConstants.XRI_S_REF, localRootContextNode);\r\n+\t\tselfPeerRootContextNode.delRelations(XDIDictionaryConstants.XDI_ADD_REF);\r\n+\t\tselfPeerRootContextNode.setRelation(XDIDictionaryConstants.XDI_ADD_REF, localRootContextNode);\r\n \r\n \t\treturn selfPeerRoot;\r\n \t}\r\n \r\n \tpublic XdiPeerRoot getSelfPeerRoot() {\r\n \r\n-\t\tRelation relation = this.getContextNode().getRelation(XDIDictionaryConstants.XRI_S_IS_REF);\r\n+\t\tRelation relation = this.getContextNode().getRelation(XDIDictionaryConstants.XDI_ADD_IS_REF);\r\n \t\tif (relation == null) return null;\r\n \r\n \t\treturn XdiPeerRoot.fromContextNode(relation.follow());\r", "raw_url": "https://github.com/projectdanube/xdi2/raw/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Fnodetypes%2FXdiLocalRoot.java", "sha": "3f795ede994e8d08199e564f553cd6b907e283ca", "status": "modified" }, { "additions": 10, "blob_url": "https://github.com/projectdanube/xdi2/blob/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Fnodetypes%2FXdiMetaClass.java", "changes": 20, "contents_url": "https://api.github.com/repos/projectdanube/xdi2/contents/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Fnodetypes%2FXdiMetaClass.java?ref=0ca7982fec30c2bb8204efbbea61428a643d2e9c", "deletions": 10, "filename": "core/src/main/java/xdi2/core/features/nodetypes/XdiMetaClass.java", "new_code": "import xdi2.core.syntax.XDIArc;\r\n\t\treturn isValidarc(contextNode.getArc());\r\n\tpublic static XDIArc createarc(XDIArc arc) {\r\n\t\treturn XDIArc.create(\"\" + XDIConstants.XS_CLASS.charAt(0) + arc + XDIConstants.XS_CLASS.charAt(1));\r\n\tpublic static boolean isValidarc(XDIArc arc) {\r\n\t\tif (arc == null) return false;\r\n\t\tif (! arc.isClassXs()) return false;\r\n\t\tif (arc.isAttributeXs()) return false;\r\n\t\tif (XDIConstants.CS_CLASS_UNRESERVED.equals(arc.getCs()) || XDIConstants.CS_CLASS_RESERVED.equals(arc.getCs())) {\r\n\t\t\tif (arc.hasLiteral() || arc.hasXRef()) return false;\r", "new_methods": [], "old_code": "import xdi2.core.xri3.XDI3SubSegment;\r\n\t\treturn isValidArcXri(contextNode.getArcXri());\r\n\tpublic static XDI3SubSegment createArcXri(XDI3SubSegment arcXri) {\r\n\t\treturn XDI3SubSegment.create(\"\" + XDIConstants.XS_CLASS.charAt(0) + arcXri + XDIConstants.XS_CLASS.charAt(1));\r\n\tpublic static boolean isValidArcXri(XDI3SubSegment arcXri) {\r\n\t\tif (arcXri == null) return false;\r\n\t\tif (! arcXri.isClassXs()) return false;\r\n\t\tif (arcXri.isAttributeXs()) return false;\r\n\t\tif (XDIConstants.CS_CLASS_UNRESERVED.equals(arcXri.getCs()) || XDIConstants.CS_CLASS_RESERVED.equals(arcXri.getCs())) {\r\n\t\t\tif (arcXri.hasLiteral() || arcXri.hasXRef()) return false;\r", "old_methods": [], "patch": "@@ -4,9 +4,9 @@\n \r\n import xdi2.core.ContextNode;\r\n import xdi2.core.constants.XDIConstants;\r\n+import xdi2.core.syntax.XDIArc;\r\n import xdi2.core.util.iterators.MappingIterator;\r\n import xdi2.core.util.iterators.NotNullIterator;\r\n-import xdi2.core.xri3.XDI3SubSegment;\r\n \r\n /**\r\n * An XDI metaclass (context node type).\r\n@@ -35,7 +35,7 @@ public static boolean isValid(ContextNode contextNode) {\n \r\n \t\tif (contextNode == null) return false;\r\n \r\n-\t\treturn isValidArcXri(contextNode.getArcXri());\r\n+\t\treturn isValidarc(contextNode.getArc());\r\n \t}\r\n \r\n \t/**\r\n@@ -54,21 +54,21 @@ public static XdiMetaClass fromContextNode(ContextNode contextNode) {\n \t * Methods for XRIs\r\n \t */\r\n \r\n-\tpublic static XDI3SubSegment createArcXri(XDI3SubSegment arcXri) {\r\n+\tpublic static XDIArc createarc(XDIArc arc) {\r\n \r\n-\t\treturn XDI3SubSegment.create(\"\" + XDIConstants.XS_CLASS.charAt(0) + arcXri + XDIConstants.XS_CLASS.charAt(1));\r\n+\t\treturn XDIArc.create(\"\" + XDIConstants.XS_CLASS.charAt(0) + arc + XDIConstants.XS_CLASS.charAt(1));\r\n \t}\r\n \r\n-\tpublic static boolean isValidArcXri(XDI3SubSegment arcXri) {\r\n+\tpublic static boolean isValidarc(XDIArc arc) {\r\n \r\n-\t\tif (arcXri == null) return false;\r\n+\t\tif (arc == null) return false;\r\n \r\n-\t\tif (! arcXri.isClassXs()) return false;\r\n-\t\tif (arcXri.isAttributeXs()) return false;\r\n+\t\tif (! arc.isClassXs()) return false;\r\n+\t\tif (arc.isAttributeXs()) return false;\r\n \r\n-\t\tif (XDIConstants.CS_CLASS_UNRESERVED.equals(arcXri.getCs()) || XDIConstants.CS_CLASS_RESERVED.equals(arcXri.getCs())) {\r\n+\t\tif (XDIConstants.CS_CLASS_UNRESERVED.equals(arc.getCs()) || XDIConstants.CS_CLASS_RESERVED.equals(arc.getCs())) {\r\n \r\n-\t\t\tif (arcXri.hasLiteral() || arcXri.hasXRef()) return false;\r\n+\t\t\tif (arc.hasLiteral() || arc.hasXRef()) return false;\r\n \t\t} else {\r\n \r\n \t\t\treturn false;\r", "raw_url": "https://github.com/projectdanube/xdi2/raw/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Fnodetypes%2FXdiMetaClass.java", "sha": "151f0502f57a4ff496d7f1ced047b986953f5111", "status": "modified" }, { "additions": 49, "blob_url": "https://github.com/projectdanube/xdi2/blob/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Fnodetypes%2FXdiPeerRoot.java", "changes": 98, "contents_url": "https://api.github.com/repos/projectdanube/xdi2/contents/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Fnodetypes%2FXdiPeerRoot.java?ref=0ca7982fec30c2bb8204efbbea61428a643d2e9c", "deletions": 49, "filename": "core/src/main/java/xdi2/core/features/nodetypes/XdiPeerRoot.java", "new_code": "import xdi2.core.syntax.XDIAddress;\r\nimport xdi2.core.syntax.XDIArc;\r\nimport xdi2.core.syntax.XDIXRef;\r\n\t\t\t\tisPeerRootArc(contextNode.getArc()) &&\r\n\tpublic XDIAddress getAddressOfPeerRoot() {\r\n\t\treturn getAddressOfPeerRootArc(this.getContextNode().getArc());\r\n\t * Methods for XDI peer root arcs\r\n\t * Returns the peer root arc of an address.\r\n\t * @param address An address.\r\n\t * @return The peer root arc of the address.\r\n\tpublic static XDIArc createPeerRootArc(XDIAddress address) {\r\n\t\treturn XDIArc.create(\"\" + XDIConstants.XS_ROOT.charAt(0) + address + XDIConstants.XS_ROOT.charAt(1));\r\n\t * Returns the address of the peer root arc.\r\n\t * @param arc A peer root arc.\r\n\t * @return The address of the peer root arc.\r\n\tpublic static XDIAddress getAddressOfPeerRootArc(XDIArc arc) {\r\n\t\tif (arc == null) return null;\r\n\t\tif (arc.hasCs()) return null;\r\n\t\tif (arc.isClassXs()) return null;\r\n\t\tif (arc.isAttributeXs()) return null;\r\n\t\tif (! arc.hasXRef()) return null;\r\n\t\tXDIXRef xref = arc.getXRef();\r\n\t\tif (! xref.hasAddress()) return null;\r\n\t\treturn xref.getAddress();\r\n\t * Returns the IRI of the peer root arc.\r\n\t * @param arc A peer root arc.\r\n\t * @return The IRI of the peer root arc.\r\n\tpublic static String getIriOfPeerRootArc(XDIArc arc) {\r\n\t\tif (arc == null) return null;\r\n\t\tif (arc.hasCs()) return null;\r\n\t\tif (arc.isClassXs()) return null;\r\n\t\tif (arc.isAttributeXs()) return null;\r\n\t\tif (! arc.hasXRef()) return null;\r\n\t\tXDIXRef xref = arc.getXRef();\r\n\t * Returns the literal of the peer root arc.\r\n\t * @param arc A peer root arc.\r\n\t * @return The literal of the peer root arc.\r\n\tpublic static String getLiteralOfPeerRootArc(XDIArc arc) {\r\n\t\tif (arc == null) return null;\r\n\t\tif (arc.hasCs()) return null;\r\n\t\tif (arc.isClassXs()) return null;\r\n\t\tif (arc.isAttributeXs()) return null;\r\n\t\tif (! arc.hasXRef()) return null;\r\n\t\tXDIXRef xref = arc.getXRef();\r\n\t * Checks if a given arc is a peer root arc.\r\n\t * @param arc A peer root arc.\r\n\t * @return True, if the arc is a peer root arc.\r\n\tpublic static boolean isPeerRootArc(XDIArc arc) {\r\n\t\treturn getAddressOfPeerRootArc(arc) != null || getIriOfPeerRootArc(arc) != null || getLiteralOfPeerRootArc(arc) != null;\r", "new_methods": [], "old_code": "import xdi2.core.xri3.XDI3Segment;\r\nimport xdi2.core.xri3.XDI3SubSegment;\r\nimport xdi2.core.xri3.XDI3XRef;\r\n\t\t\t\tisPeerRootArcXri(contextNode.getArcXri()) &&\r\n\tpublic XDI3Segment getXriOfPeerRoot() {\r\n\t\treturn getXriOfPeerRootArcXri(this.getContextNode().getArcXri());\r\n\t * Methods for XDI peer root XRIs\r\n\t * Returns the peer root XRI of an XRI.\r\n\t * @param xri An XRI.\r\n\t * @return The peer root XRI of the XRI.\r\n\tpublic static XDI3SubSegment createPeerRootArcXri(XDI3Segment xri) {\r\n\t\treturn XDI3SubSegment.create(\"\" + XDIConstants.XS_ROOT.charAt(0) + xri + XDIConstants.XS_ROOT.charAt(1));\r\n\t * Returns the XRI of the peer root XRI.\r\n\t * @param arcXri A peer root XRI.\r\n\t * @return The XRI of the peer root XRI.\r\n\tpublic static XDI3Segment getXriOfPeerRootArcXri(XDI3SubSegment arcXri) {\r\n\t\tif (arcXri == null) return null;\r\n\t\tif (arcXri.hasCs()) return null;\r\n\t\tif (arcXri.isClassXs()) return null;\r\n\t\tif (arcXri.isAttributeXs()) return null;\r\n\t\tif (! arcXri.hasXRef()) return null;\r\n\t\tXDI3XRef xref = arcXri.getXRef();\r\n\t\tif (! xref.hasSegment()) return null;\r\n\t\treturn xref.getSegment();\r\n\t * Returns the IRI of the peer root XRI.\r\n\t * @param arcXri A peer root XRI.\r\n\t * @return The IRI of the peer root XRI.\r\n\tpublic static String getIriOfPeerRootArcXri(XDI3SubSegment arcXri) {\r\n\t\tif (arcXri == null) return null;\r\n\t\tif (arcXri.hasCs()) return null;\r\n\t\tif (arcXri.isClassXs()) return null;\r\n\t\tif (arcXri.isAttributeXs()) return null;\r\n\t\tif (! arcXri.hasXRef()) return null;\r\n\t\tXDI3XRef xref = arcXri.getXRef();\r\n\t * Returns the literal of the peer root XRI.\r\n\t * @param arcXri A peer root XRI.\r\n\t * @return The literal of the peer root XRI.\r\n\tpublic static String getLiteralOfPeerRootArcXri(XDI3SubSegment arcXri) {\r\n\t\tif (arcXri == null) return null;\r\n\t\tif (arcXri.hasCs()) return null;\r\n\t\tif (arcXri.isClassXs()) return null;\r\n\t\tif (arcXri.isAttributeXs()) return null;\r\n\t\tif (! arcXri.hasXRef()) return null;\r\n\t\tXDI3XRef xref = arcXri.getXRef();\r\n\t * Checks if a given XRI is a peer root XRI.\r\n\t * @param arcXri A peer root XRI.\r\n\t * @return True, if the XRI is a peer root XRI.\r\n\tpublic static boolean isPeerRootArcXri(XDI3SubSegment arcXri) {\r\n\t\treturn getXriOfPeerRootArcXri(arcXri) != null || getIriOfPeerRootArcXri(arcXri) != null || getLiteralOfPeerRootArcXri(arcXri) != null;\r", "old_methods": [], "patch": "@@ -5,11 +5,11 @@\n import xdi2.core.ContextNode;\r\n import xdi2.core.constants.XDIConstants;\r\n import xdi2.core.features.equivalence.Equivalence;\r\n+import xdi2.core.syntax.XDIAddress;\r\n+import xdi2.core.syntax.XDIArc;\r\n+import xdi2.core.syntax.XDIXRef;\r\n import xdi2.core.util.iterators.MappingIterator;\r\n import xdi2.core.util.iterators.NotNullIterator;\r\n-import xdi2.core.xri3.XDI3Segment;\r\n-import xdi2.core.xri3.XDI3SubSegment;\r\n-import xdi2.core.xri3.XDI3XRef;\r\n \r\n /**\r\n * An XDI peer root, represented as a context node.\r\n@@ -39,7 +39,7 @@ public static boolean isValid(ContextNode contextNode) {\n \t\tif (contextNode == null) return false;\r\n \r\n \t\treturn \r\n-\t\t\t\tisPeerRootArcXri(contextNode.getArcXri()) &&\r\n+\t\t\t\tisPeerRootArc(contextNode.getArc()) &&\r\n \t\t\t\tXdiAbstractRoot.isValid(contextNode.getContextNode());\r\n \t}\r\n \r\n@@ -79,96 +79,96 @@ public boolean isSelfPeerRoot() {\n \t\treturn false;\r\n \t}\r\n \r\n-\tpublic XDI3Segment getXriOfPeerRoot() {\r\n+\tpublic XDIAddress getAddressOfPeerRoot() {\r\n \r\n-\t\treturn getXriOfPeerRootArcXri(this.getContextNode().getArcXri());\r\n+\t\treturn getAddressOfPeerRootArc(this.getContextNode().getArc());\r\n \t}\r\n \r\n \t/*\r\n-\t * Methods for XDI peer root XRIs\r\n+\t * Methods for XDI peer root arcs\r\n \t */\r\n \r\n \t/**\r\n-\t * Returns the peer root XRI of an XRI.\r\n-\t * @param xri An XRI.\r\n-\t * @return The peer root XRI of the XRI.\r\n+\t * Returns the peer root arc of an address.\r\n+\t * @param address An address.\r\n+\t * @return The peer root arc of the address.\r\n \t */\r\n-\tpublic static XDI3SubSegment createPeerRootArcXri(XDI3Segment xri) {\r\n+\tpublic static XDIArc createPeerRootArc(XDIAddress address) {\r\n \r\n-\t\treturn XDI3SubSegment.create(\"\" + XDIConstants.XS_ROOT.charAt(0) + xri + XDIConstants.XS_ROOT.charAt(1));\r\n+\t\treturn XDIArc.create(\"\" + XDIConstants.XS_ROOT.charAt(0) + address + XDIConstants.XS_ROOT.charAt(1));\r\n \t}\r\n \r\n \t/**\r\n-\t * Returns the XRI of the peer root XRI.\r\n-\t * @param arcXri A peer root XRI.\r\n-\t * @return The XRI of the peer root XRI.\r\n+\t * Returns the address of the peer root arc.\r\n+\t * @param arc A peer root arc.\r\n+\t * @return The address of the peer root arc.\r\n \t */\r\n-\tpublic static XDI3Segment getXriOfPeerRootArcXri(XDI3SubSegment arcXri) {\r\n+\tpublic static XDIAddress getAddressOfPeerRootArc(XDIArc arc) {\r\n \r\n-\t\tif (arcXri == null) return null;\r\n+\t\tif (arc == null) return null;\r\n \r\n-\t\tif (arcXri.hasCs()) return null;\r\n-\t\tif (arcXri.isClassXs()) return null;\r\n-\t\tif (arcXri.isAttributeXs()) return null;\r\n-\t\tif (! arcXri.hasXRef()) return null;\r\n+\t\tif (arc.hasCs()) return null;\r\n+\t\tif (arc.isClassXs()) return null;\r\n+\t\tif (arc.isAttributeXs()) return null;\r\n+\t\tif (! arc.hasXRef()) return null;\r\n \r\n-\t\tXDI3XRef xref = arcXri.getXRef();\r\n+\t\tXDIXRef xref = arc.getXRef();\r\n \t\tif (! XDIConstants.XS_ROOT.equals(xref.getXs())) return null;\r\n-\t\tif (! xref.hasSegment()) return null;\r\n+\t\tif (! xref.hasAddress()) return null;\r\n \r\n-\t\treturn xref.getSegment();\r\n+\t\treturn xref.getAddress();\r\n \t}\r\n \r\n \t/**\r\n-\t * Returns the IRI of the peer root XRI.\r\n-\t * @param arcXri A peer root XRI.\r\n-\t * @return The IRI of the peer root XRI.\r\n+\t * Returns the IRI of the peer root arc.\r\n+\t * @param arc A peer root arc.\r\n+\t * @return The IRI of the peer root arc.\r\n \t */\r\n-\tpublic static String getIriOfPeerRootArcXri(XDI3SubSegment arcXri) {\r\n+\tpublic static String getIriOfPeerRootArc(XDIArc arc) {\r\n \r\n-\t\tif (arcXri == null) return null;\r\n+\t\tif (arc == null) return null;\r\n \r\n-\t\tif (arcXri.hasCs()) return null;\r\n-\t\tif (arcXri.isClassXs()) return null;\r\n-\t\tif (arcXri.isAttributeXs()) return null;\r\n-\t\tif (! arcXri.hasXRef()) return null;\r\n+\t\tif (arc.hasCs()) return null;\r\n+\t\tif (arc.isClassXs()) return null;\r\n+\t\tif (arc.isAttributeXs()) return null;\r\n+\t\tif (! arc.hasXRef()) return null;\r\n \r\n-\t\tXDI3XRef xref = arcXri.getXRef();\r\n+\t\tXDIXRef xref = arc.getXRef();\r\n \t\tif (! XDIConstants.XS_ROOT.equals(xref.getXs())) return null;\r\n \t\tif (! xref.hasIri()) return null;\r\n \r\n \t\treturn xref.getIri();\r\n \t}\r\n \r\n \t/**\r\n-\t * Returns the literal of the peer root XRI.\r\n-\t * @param arcXri A peer root XRI.\r\n-\t * @return The literal of the peer root XRI.\r\n+\t * Returns the literal of the peer root arc.\r\n+\t * @param arc A peer root arc.\r\n+\t * @return The literal of the peer root arc.\r\n \t */\r\n-\tpublic static String getLiteralOfPeerRootArcXri(XDI3SubSegment arcXri) {\r\n+\tpublic static String getLiteralOfPeerRootArc(XDIArc arc) {\r\n \r\n-\t\tif (arcXri == null) return null;\r\n+\t\tif (arc == null) return null;\r\n \r\n-\t\tif (arcXri.hasCs()) return null;\r\n-\t\tif (arcXri.isClassXs()) return null;\r\n-\t\tif (arcXri.isAttributeXs()) return null;\r\n-\t\tif (! arcXri.hasXRef()) return null;\r\n+\t\tif (arc.hasCs()) return null;\r\n+\t\tif (arc.isClassXs()) return null;\r\n+\t\tif (arc.isAttributeXs()) return null;\r\n+\t\tif (! arc.hasXRef()) return null;\r\n \r\n-\t\tXDI3XRef xref = arcXri.getXRef();\r\n+\t\tXDIXRef xref = arc.getXRef();\r\n \t\tif (! XDIConstants.XS_ROOT.equals(xref.getXs())) return null;\r\n \t\tif (! xref.hasLiteral()) return null;\r\n \r\n \t\treturn xref.getLiteral();\r\n \t}\r\n \r\n \t/**\r\n-\t * Checks if a given XRI is a peer root XRI.\r\n-\t * @param arcXri A peer root XRI.\r\n-\t * @return True, if the XRI is a peer root XRI.\r\n+\t * Checks if a given arc is a peer root arc.\r\n+\t * @param arc A peer root arc.\r\n+\t * @return True, if the arc is a peer root arc.\r\n \t */\r\n-\tpublic static boolean isPeerRootArcXri(XDI3SubSegment arcXri) {\r\n+\tpublic static boolean isPeerRootArc(XDIArc arc) {\r\n \r\n-\t\treturn getXriOfPeerRootArcXri(arcXri) != null || getIriOfPeerRootArcXri(arcXri) != null || getLiteralOfPeerRootArcXri(arcXri) != null;\r\n+\t\treturn getAddressOfPeerRootArc(arc) != null || getIriOfPeerRootArc(arc) != null || getLiteralOfPeerRootArc(arc) != null;\r\n \t}\r\n \r\n \t/*\r", "raw_url": "https://github.com/projectdanube/xdi2/raw/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Fnodetypes%2FXdiPeerRoot.java", "sha": "0a391ab766986ab01abe8880d8914f2bc7e86500", "status": "modified" }, { "additions": 21, "blob_url": "https://github.com/projectdanube/xdi2/blob/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Fnodetypes%2FXdiRoot.java", "changes": 42, "contents_url": "https://api.github.com/repos/projectdanube/xdi2/contents/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Fnodetypes%2FXdiRoot.java?ref=0ca7982fec30c2bb8204efbbea61428a643d2e9c", "deletions": 21, "filename": "core/src/main/java/xdi2/core/features/nodetypes/XdiRoot.java", "new_code": "import xdi2.core.syntax.XDIAddress;\r\nimport xdi2.core.syntax.XDIStatement;\r\n\tpublic XdiPeerRoot getPeerRoot(XDIAddress xri, boolean create);\r\n\tpublic XdiInnerRoot getInnerRoot(XDIAddress subject, XDIAddress predicate, boolean create);\r\n\tpublic XdiRoot getRoot(XDIAddress xri, boolean create);\r\n\tpublic XDIAddress absoluteToRelativeXri(XDIAddress xri);\r\n\tpublic XDIAddress relativeToAbsoluteXri(XDIAddress xri);\r\n\tpublic XDIStatement absoluteToRelativeStatementXri(XDIStatement statementXri);\r\n\tpublic XDIStatement relativeToAbsoluteStatementXri(XDIStatement statementXri);\r\n\tpublic static class MappingAbsoluteToRelativeXriIterator extends MappingIterator<XDIAddress, XDIAddress> {\r\n\t\tpublic MappingAbsoluteToRelativeXriIterator(XdiRoot xdiRoot, Iterator<? extends XDIAddress> iterator) {\r\n\t\tpublic XDIAddress map(XDIAddress xri) {\r\n\tpublic static class MappingRelativeToAbsoluteXriIterator extends MappingIterator<XDIAddress, XDIAddress> {\r\n\t\tpublic MappingRelativeToAbsoluteXriIterator(XdiRoot xdiRoot, Iterator<? extends XDIAddress> iterator) {\r\n\t\tpublic XDIAddress map(XDIAddress xri) {\r\n\tpublic static class MappingAbsoluteToRelativeStatementXriIterator extends MappingIterator<XDIStatement, XDIStatement> {\r\n\t\tpublic MappingAbsoluteToRelativeStatementXriIterator(XdiRoot xdiRoot, Iterator<? extends XDIStatement> iterator) {\r\n\t\tpublic XDIStatement map(XDIStatement statementXri) {\r\n\tpublic static class MappingRelativeToAbsoluteStatementXriIterator extends MappingIterator<XDIStatement, XDIStatement> {\r\n\t\tpublic MappingRelativeToAbsoluteStatementXriIterator(XdiRoot xdiRoot, Iterator<? extends XDIStatement> iterator) {\r\n\t\tpublic XDIStatement map(XDIStatement statementXri) {\r", "new_methods": [], "old_code": "import xdi2.core.xri3.XDI3Segment;\r\nimport xdi2.core.xri3.XDI3Statement;\r\n\tpublic XdiPeerRoot getPeerRoot(XDI3Segment xri, boolean create);\r\n\tpublic XdiInnerRoot getInnerRoot(XDI3Segment subject, XDI3Segment predicate, boolean create);\r\n\tpublic XdiRoot getRoot(XDI3Segment xri, boolean create);\r\n\tpublic XDI3Segment absoluteToRelativeXri(XDI3Segment xri);\r\n\tpublic XDI3Segment relativeToAbsoluteXri(XDI3Segment xri);\r\n\tpublic XDI3Statement absoluteToRelativeStatementXri(XDI3Statement statementXri);\r\n\tpublic XDI3Statement relativeToAbsoluteStatementXri(XDI3Statement statementXri);\r\n\tpublic static class MappingAbsoluteToRelativeXriIterator extends MappingIterator<XDI3Segment, XDI3Segment> {\r\n\t\tpublic MappingAbsoluteToRelativeXriIterator(XdiRoot xdiRoot, Iterator<? extends XDI3Segment> iterator) {\r\n\t\tpublic XDI3Segment map(XDI3Segment xri) {\r\n\tpublic static class MappingRelativeToAbsoluteXriIterator extends MappingIterator<XDI3Segment, XDI3Segment> {\r\n\t\tpublic MappingRelativeToAbsoluteXriIterator(XdiRoot xdiRoot, Iterator<? extends XDI3Segment> iterator) {\r\n\t\tpublic XDI3Segment map(XDI3Segment xri) {\r\n\tpublic static class MappingAbsoluteToRelativeStatementXriIterator extends MappingIterator<XDI3Statement, XDI3Statement> {\r\n\t\tpublic MappingAbsoluteToRelativeStatementXriIterator(XdiRoot xdiRoot, Iterator<? extends XDI3Statement> iterator) {\r\n\t\tpublic XDI3Statement map(XDI3Statement statementXri) {\r\n\tpublic static class MappingRelativeToAbsoluteStatementXriIterator extends MappingIterator<XDI3Statement, XDI3Statement> {\r\n\t\tpublic MappingRelativeToAbsoluteStatementXriIterator(XdiRoot xdiRoot, Iterator<? extends XDI3Statement> iterator) {\r\n\t\tpublic XDI3Statement map(XDI3Statement statementXri) {\r", "old_methods": [], "patch": "@@ -2,9 +2,9 @@\n \r\n import java.util.Iterator;\r\n \r\n+import xdi2.core.syntax.XDIAddress;\r\n+import xdi2.core.syntax.XDIStatement;\r\n import xdi2.core.util.iterators.MappingIterator;\r\n-import xdi2.core.xri3.XDI3Segment;\r\n-import xdi2.core.xri3.XDI3Statement;\r\n \r\n public interface XdiRoot extends XdiContext<XdiRoot> {\r\n \r\n@@ -18,7 +18,7 @@ public interface XdiRoot extends XdiContext<XdiRoot> {\n \t * @param create Whether the XDI peer root should be created, if it does not exist.\r\n \t * @return The XDI peer root.\r\n \t */\r\n-\tpublic XdiPeerRoot getPeerRoot(XDI3Segment xri, boolean create);\r\n+\tpublic XdiPeerRoot getPeerRoot(XDIAddress xri, boolean create);\r\n \r\n \t/**\r\n \t * Returns an XDI inner root under this XDI root.\r\n@@ -27,99 +27,99 @@ public interface XdiRoot extends XdiContext<XdiRoot> {\n \t * @param create Whether the XDI inner root should be created, if it does not exist.\r\n \t * @return The XDI inner root.\r\n \t */\r\n-\tpublic XdiInnerRoot getInnerRoot(XDI3Segment subject, XDI3Segment predicate, boolean create);\r\n+\tpublic XdiInnerRoot getInnerRoot(XDIAddress subject, XDIAddress predicate, boolean create);\r\n \r\n \t/**\r\n \t * Returns an XDI root under this XDI root.\r\n \t * @param xri The XRI contained in the XDI root.\r\n \t * @param create Whether the XDI root should be created, if it does not exist.\r\n \t * @return The XDI root.\r\n \t */\r\n-\tpublic XdiRoot getRoot(XDI3Segment xri, boolean create);\r\n+\tpublic XdiRoot getRoot(XDIAddress xri, boolean create);\r\n \r\n \t/*\r\n \t * XRIs and statements relative to this root\r\n \t */\r\n \r\n-\tpublic XDI3Segment absoluteToRelativeXri(XDI3Segment xri);\r\n+\tpublic XDIAddress absoluteToRelativeXri(XDIAddress xri);\r\n \r\n-\tpublic XDI3Segment relativeToAbsoluteXri(XDI3Segment xri);\r\n+\tpublic XDIAddress relativeToAbsoluteXri(XDIAddress xri);\r\n \r\n-\tpublic XDI3Statement absoluteToRelativeStatementXri(XDI3Statement statementXri);\r\n+\tpublic XDIStatement absoluteToRelativeStatementXri(XDIStatement statementXri);\r\n \r\n-\tpublic XDI3Statement relativeToAbsoluteStatementXri(XDI3Statement statementXri);\r\n+\tpublic XDIStatement relativeToAbsoluteStatementXri(XDIStatement statementXri);\r\n \r\n \t/*\r\n \t * Helper classes\r\n \t */\r\n \r\n-\tpublic static class MappingAbsoluteToRelativeXriIterator extends MappingIterator<XDI3Segment, XDI3Segment> {\r\n+\tpublic static class MappingAbsoluteToRelativeXriIterator extends MappingIterator<XDIAddress, XDIAddress> {\r\n \r\n \t\tprivate XdiRoot xdiRoot;\r\n \r\n-\t\tpublic MappingAbsoluteToRelativeXriIterator(XdiRoot xdiRoot, Iterator<? extends XDI3Segment> iterator) {\r\n+\t\tpublic MappingAbsoluteToRelativeXriIterator(XdiRoot xdiRoot, Iterator<? extends XDIAddress> iterator) {\r\n \r\n \t\t\tsuper(iterator);\r\n \r\n \t\t\tthis.xdiRoot = xdiRoot;\r\n \t\t}\r\n \r\n \t\t@Override\r\n-\t\tpublic XDI3Segment map(XDI3Segment xri) {\r\n+\t\tpublic XDIAddress map(XDIAddress xri) {\r\n \r\n \t\t\treturn this.xdiRoot.absoluteToRelativeXri(xri);\r\n \t\t}\r\n \t}\r\n \r\n-\tpublic static class MappingRelativeToAbsoluteXriIterator extends MappingIterator<XDI3Segment, XDI3Segment> {\r\n+\tpublic static class MappingRelativeToAbsoluteXriIterator extends MappingIterator<XDIAddress, XDIAddress> {\r\n \r\n \t\tprivate XdiRoot xdiRoot;\r\n \r\n-\t\tpublic MappingRelativeToAbsoluteXriIterator(XdiRoot xdiRoot, Iterator<? extends XDI3Segment> iterator) {\r\n+\t\tpublic MappingRelativeToAbsoluteXriIterator(XdiRoot xdiRoot, Iterator<? extends XDIAddress> iterator) {\r\n \r\n \t\t\tsuper(iterator);\r\n \r\n \t\t\tthis.xdiRoot = xdiRoot;\r\n \t\t}\r\n \r\n \t\t@Override\r\n-\t\tpublic XDI3Segment map(XDI3Segment xri) {\r\n+\t\tpublic XDIAddress map(XDIAddress xri) {\r\n \r\n \t\t\treturn this.xdiRoot.relativeToAbsoluteXri(xri);\r\n \t\t}\r\n \t}\r\n \r\n-\tpublic static class MappingAbsoluteToRelativeStatementXriIterator extends MappingIterator<XDI3Statement, XDI3Statement> {\r\n+\tpublic static class MappingAbsoluteToRelativeStatementXriIterator extends MappingIterator<XDIStatement, XDIStatement> {\r\n \r\n \t\tprivate XdiRoot xdiRoot;\r\n \r\n-\t\tpublic MappingAbsoluteToRelativeStatementXriIterator(XdiRoot xdiRoot, Iterator<? extends XDI3Statement> iterator) {\r\n+\t\tpublic MappingAbsoluteToRelativeStatementXriIterator(XdiRoot xdiRoot, Iterator<? extends XDIStatement> iterator) {\r\n \r\n \t\t\tsuper(iterator);\r\n \r\n \t\t\tthis.xdiRoot = xdiRoot;\r\n \t\t}\r\n \r\n \t\t@Override\r\n-\t\tpublic XDI3Statement map(XDI3Statement statementXri) {\r\n+\t\tpublic XDIStatement map(XDIStatement statementXri) {\r\n \r\n \t\t\treturn this.xdiRoot.absoluteToRelativeStatementXri(statementXri);\r\n \t\t}\r\n \t}\r\n \r\n-\tpublic static class MappingRelativeToAbsoluteStatementXriIterator extends MappingIterator<XDI3Statement, XDI3Statement> {\r\n+\tpublic static class MappingRelativeToAbsoluteStatementXriIterator extends MappingIterator<XDIStatement, XDIStatement> {\r\n \r\n \t\tprivate XdiRoot xdiRoot;\r\n \r\n-\t\tpublic MappingRelativeToAbsoluteStatementXriIterator(XdiRoot xdiRoot, Iterator<? extends XDI3Statement> iterator) {\r\n+\t\tpublic MappingRelativeToAbsoluteStatementXriIterator(XdiRoot xdiRoot, Iterator<? extends XDIStatement> iterator) {\r\n \r\n \t\t\tsuper(iterator);\r\n \r\n \t\t\tthis.xdiRoot = xdiRoot;\r\n \t\t}\r\n \r\n \t\t@Override\r\n-\t\tpublic XDI3Statement map(XDI3Statement statementXri) {\r\n+\t\tpublic XDIStatement map(XDIStatement statementXri) {\r\n \r\n \t\t\treturn this.xdiRoot.relativeToAbsoluteStatementXri(statementXri);\r\n \t\t}\r", "raw_url": "https://github.com/projectdanube/xdi2/raw/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Fnodetypes%2FXdiRoot.java", "sha": "912023f04edc0bda9d0f84bbafb11969f0490b25", "status": "modified" }, { "additions": 11, "blob_url": "https://github.com/projectdanube/xdi2/blob/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Fnodetypes%2FXdiValue.java", "changes": 22, "contents_url": "https://api.github.com/repos/projectdanube/xdi2/contents/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Fnodetypes%2FXdiValue.java?ref=0ca7982fec30c2bb8204efbbea61428a643d2e9c", "deletions": 11, "filename": "core/src/main/java/xdi2/core/features/nodetypes/XdiValue.java", "new_code": "import xdi2.core.syntax.XDIArc;\r\n\t\treturn isValidarc(contextNode.getArc()) &&\r\n\tpublic static XDIArc createarc() {\r\n\t\treturn XDIConstants.XDI_ARC_LITERAL;\r\n\tpublic static boolean isValidarc(XDIArc arc) {\r\n\t\tif (arc == null) return false;\r\n\t\tif (arc.isClassXs()) return false;\r\n\t\tif (arc.isAttributeXs()) return false;\r\n\t\tif (arc.hasLiteral()) return false;\r\n\t\tif (arc.hasXRef()) return false;\r\n\t\tif (! XDIConstants.CS_VALUE.equals(arc.getCs())) return false;\r", "new_methods": [], "old_code": "import xdi2.core.xri3.XDI3SubSegment;\r\n\t\treturn isValidArcXri(contextNode.getArcXri()) &&\r\n\tpublic static XDI3SubSegment createArcXri() {\r\n\t\treturn XDIConstants.XRI_SS_LITERAL;\r\n\tpublic static boolean isValidArcXri(XDI3SubSegment arcXri) {\r\n\t\tif (arcXri == null) return false;\r\n\t\tif (arcXri.isClassXs()) return false;\r\n\t\tif (arcXri.isAttributeXs()) return false;\r\n\t\tif (arcXri.hasLiteral()) return false;\r\n\t\tif (arcXri.hasXRef()) return false;\r\n\t\tif (! XDIConstants.CS_VALUE.equals(arcXri.getCs())) return false;\r", "old_methods": [], "patch": "@@ -5,9 +5,9 @@\n import xdi2.core.ContextNode;\r\n import xdi2.core.Literal;\r\n import xdi2.core.constants.XDIConstants;\r\n+import xdi2.core.syntax.XDIArc;\r\n import xdi2.core.util.iterators.MappingIterator;\r\n import xdi2.core.util.iterators.NotNullIterator;\r\n-import xdi2.core.xri3.XDI3SubSegment;\r\n \r\n /**\r\n * An XDI value (context function), represented as a context node.\r\n@@ -36,7 +36,7 @@ public static boolean isValid(ContextNode contextNode) {\n \r\n \t\tif (contextNode == null) return false;\r\n \r\n-\t\treturn isValidArcXri(contextNode.getArcXri()) &&\r\n+\t\treturn isValidarc(contextNode.getArc()) &&\r\n \t\t\t\tXdiAbstractAttribute.isValid(contextNode.getContextNode());\r\n \t}\r\n \r\n@@ -104,21 +104,21 @@ public Literal getLiteralBoolean(Boolean literalData) {\n \t * Methods for XRIs\r\n \t */\r\n \r\n-\tpublic static XDI3SubSegment createArcXri() {\r\n+\tpublic static XDIArc createarc() {\r\n \r\n-\t\treturn XDIConstants.XRI_SS_LITERAL;\r\n+\t\treturn XDIConstants.XDI_ARC_LITERAL;\r\n \t}\r\n \r\n-\tpublic static boolean isValidArcXri(XDI3SubSegment arcXri) {\r\n+\tpublic static boolean isValidarc(XDIArc arc) {\r\n \r\n-\t\tif (arcXri == null) return false;\r\n+\t\tif (arc == null) return false;\r\n \r\n-\t\tif (arcXri.isClassXs()) return false;\r\n-\t\tif (arcXri.isAttributeXs()) return false;\r\n-\t\tif (arcXri.hasLiteral()) return false;\r\n-\t\tif (arcXri.hasXRef()) return false;\r\n+\t\tif (arc.isClassXs()) return false;\r\n+\t\tif (arc.isAttributeXs()) return false;\r\n+\t\tif (arc.hasLiteral()) return false;\r\n+\t\tif (arc.hasXRef()) return false;\r\n \r\n-\t\tif (! XDIConstants.CS_VALUE.equals(arcXri.getCs())) return false;\r\n+\t\tif (! XDIConstants.CS_VALUE.equals(arc.getCs())) return false;\r\n \r\n \t\treturn true;\r\n \t}\r", "raw_url": "https://github.com/projectdanube/xdi2/raw/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Fnodetypes%2FXdiValue.java", "sha": "0f8395791ec093671610bacdf892f019985671bb", "status": "modified" }, { "additions": 5, "blob_url": "https://github.com/projectdanube/xdi2/blob/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Fnodetypes%2FXdiVariable.java", "changes": 10, "contents_url": "https://api.github.com/repos/projectdanube/xdi2/contents/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Fnodetypes%2FXdiVariable.java?ref=0ca7982fec30c2bb8204efbbea61428a643d2e9c", "deletions": 5, "filename": "core/src/main/java/xdi2/core/features/nodetypes/XdiVariable.java", "new_code": "import xdi2.core.syntax.XDIArc;\r\n\t\treturn isValidarc(contextNode.getArc());\r\n\t * @param arc An XDI variable XRI.\r\n\tpublic static boolean isValidarc(XDIArc arc) {\r\n\t\treturn VariableUtil.isVariable(arc);\r", "new_methods": [], "old_code": "import xdi2.core.xri3.XDI3SubSegment;\r\n\t\treturn isValidArcXri(contextNode.getArcXri());\r\n\t * @param arcXri An XDI variable XRI.\r\n\tpublic static boolean isValidArcXri(XDI3SubSegment arcXri) {\r\n\t\treturn VariableUtil.isVariable(arcXri);\r", "old_methods": [], "patch": "@@ -3,10 +3,10 @@\n import java.util.Iterator;\r\n \r\n import xdi2.core.ContextNode;\r\n+import xdi2.core.syntax.XDIArc;\r\n import xdi2.core.util.VariableUtil;\r\n import xdi2.core.util.iterators.MappingIterator;\r\n import xdi2.core.util.iterators.NotNullIterator;\r\n-import xdi2.core.xri3.XDI3SubSegment;\r\n \r\n /**\r\n * An XDI variable (context function), represented as a context node.\r\n@@ -35,7 +35,7 @@ public static boolean isValid(ContextNode contextNode) {\n \r\n \t\tif (contextNode == null) return false;\r\n \r\n-\t\treturn isValidArcXri(contextNode.getArcXri());\r\n+\t\treturn isValidarc(contextNode.getArc());\r\n \t}\r\n \r\n \t/**\r\n@@ -56,12 +56,12 @@ public static XdiVariable fromContextNode(ContextNode contextNode) {\n \r\n \t/**\r\n \t * Checks if a given XRI is an XDI variable XRI.\r\n-\t * @param arcXri An XDI variable XRI.\r\n+\t * @param arc An XDI variable XRI.\r\n \t * @return True, if the XRI is an XDI variable XRI.\r\n \t */\r\n-\tpublic static boolean isValidArcXri(XDI3SubSegment arcXri) {\r\n+\tpublic static boolean isValidarc(XDIArc arc) {\r\n \r\n-\t\treturn VariableUtil.isVariable(arcXri);\r\n+\t\treturn VariableUtil.isVariable(arc);\r\n \t}\r\n \r\n \t/*\r", "raw_url": "https://github.com/projectdanube/xdi2/raw/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Fnodetypes%2FXdiVariable.java", "sha": "7d4fad599fbfb51a5f42b0bea2d5f630cb4312a2", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/projectdanube/xdi2/blob/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Fsecrettokens%2FSecretTokens.java", "changes": 2, "contents_url": "https://api.github.com/repos/projectdanube/xdi2/contents/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Fsecrettokens%2FSecretTokens.java?ref=0ca7982fec30c2bb8204efbbea61428a643d2e9c", "deletions": 1, "filename": "core/src/main/java/xdi2/core/features/secrettokens/SecretTokens.java", "new_code": "\t\tXdiAttribute localSaltAndDigestSecretTokenXdiAttribute = xdiContext.getXdiAttribute(XDIAuthenticationConstants.XDI_ADD_DIGEST_SECRET_TOKEN, false);\r", "new_methods": [], "old_code": "\t\tXdiAttribute localSaltAndDigestSecretTokenXdiAttribute = xdiContext.getXdiAttribute(XDIAuthenticationConstants.XRI_S_DIGEST_SECRET_TOKEN, false);\r", "old_methods": [], "patch": "@@ -28,7 +28,7 @@ public static String getLocalSaltAndDigestSecretToken(XdiContext<?> xdiContext)\n \r\n \t\t// find local salt and digest secret token\r\n \r\n-\t\tXdiAttribute localSaltAndDigestSecretTokenXdiAttribute = xdiContext.getXdiAttribute(XDIAuthenticationConstants.XRI_S_DIGEST_SECRET_TOKEN, false);\r\n+\t\tXdiAttribute localSaltAndDigestSecretTokenXdiAttribute = xdiContext.getXdiAttribute(XDIAuthenticationConstants.XDI_ADD_DIGEST_SECRET_TOKEN, false);\r\n \t\tlocalSaltAndDigestSecretTokenXdiAttribute = localSaltAndDigestSecretTokenXdiAttribute == null ? null : localSaltAndDigestSecretTokenXdiAttribute.dereference();\r\n \r\n \t\tXdiValue localSaltAndDigestSecretTokenXdiValue = localSaltAndDigestSecretTokenXdiAttribute == null ? null : localSaltAndDigestSecretTokenXdiAttribute.getXdiValue(false);\r", "raw_url": "https://github.com/projectdanube/xdi2/raw/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Fsecrettokens%2FSecretTokens.java", "sha": "9dc6b19205f284ae3e9d75a15854617cd92b8be4", "status": "modified" }, { "additions": 2, "blob_url": "https://github.com/projectdanube/xdi2/blob/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Fsignatures%2FKeyPairSignature.java", "changes": 4, "contents_url": "https://api.github.com/repos/projectdanube/xdi2/contents/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Fsignatures%2FKeyPairSignature.java?ref=0ca7982fec30c2bb8204efbbea61428a643d2e9c", "deletions": 2, "filename": "core/src/main/java/xdi2/core/features/signatures/KeyPairSignature.java", "new_code": "\t\t\tif (! ((XdiAttributeSingleton) xdiAttribute).getBasearc().equals(XdiAbstractContext.getBasearc(XDIAuthenticationConstants.XDI_ARC_SIGNATURE))) return false;\r\n\t\t\tif (! ((XdiAttributeMember) xdiAttribute).getXdiCollection().getBasearc().equals(XdiAbstractContext.getBasearc(XDIAuthenticationConstants.XDI_ARC_SIGNATURE))) return false;\r", "new_methods": [], "old_code": "\t\t\tif (! ((XdiAttributeSingleton) xdiAttribute).getBaseArcXri().equals(XdiAbstractContext.getBaseArcXri(XDIAuthenticationConstants.XRI_SS_SIGNATURE))) return false;\r\n\t\t\tif (! ((XdiAttributeMember) xdiAttribute).getXdiCollection().getBaseArcXri().equals(XdiAbstractContext.getBaseArcXri(XDIAuthenticationConstants.XRI_SS_SIGNATURE))) return false;\r", "old_methods": [], "patch": "@@ -47,10 +47,10 @@ public static boolean isValid(XdiAttribute xdiAttribute) {\n \r\n \t\tif (xdiAttribute instanceof XdiAttributeSingleton) {\r\n \r\n-\t\t\tif (! ((XdiAttributeSingleton) xdiAttribute).getBaseArcXri().equals(XdiAbstractContext.getBaseArcXri(XDIAuthenticationConstants.XRI_SS_SIGNATURE))) return false;\r\n+\t\t\tif (! ((XdiAttributeSingleton) xdiAttribute).getBasearc().equals(XdiAbstractContext.getBasearc(XDIAuthenticationConstants.XDI_ARC_SIGNATURE))) return false;\r\n \t\t} else if (xdiAttribute instanceof XdiAttributeMember) {\r\n \r\n-\t\t\tif (! ((XdiAttributeMember) xdiAttribute).getXdiCollection().getBaseArcXri().equals(XdiAbstractContext.getBaseArcXri(XDIAuthenticationConstants.XRI_SS_SIGNATURE))) return false;\r\n+\t\t\tif (! ((XdiAttributeMember) xdiAttribute).getXdiCollection().getBasearc().equals(XdiAbstractContext.getBasearc(XDIAuthenticationConstants.XDI_ARC_SIGNATURE))) return false;\r\n \t\t} else {\r\n \r\n \t\t\treturn false;\r", "raw_url": "https://github.com/projectdanube/xdi2/raw/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Fsignatures%2FKeyPairSignature.java", "sha": "735fb3b5e713f1ed03dc1e755b1f1025c7ba5bc4", "status": "modified" }, { "additions": 22, "blob_url": "https://github.com/projectdanube/xdi2/blob/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Fsignatures%2FSignatures.java", "changes": 44, "contents_url": "https://api.github.com/repos/projectdanube/xdi2/contents/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Fsignatures%2FSignatures.java?ref=0ca7982fec30c2bb8204efbbea61428a643d2e9c", "deletions": 22, "filename": "core/src/main/java/xdi2/core/features/signatures/Signatures.java", "new_code": "import xdi2.core.syntax.XDIAddress;\r\nimport xdi2.core.syntax.XDIArc;\r\n\t\t\tsignatureXdiAttribute = XdiAbstractContext.fromContextNode(contextNode).getXdiAttributeSingleton(XdiAttributeSingleton.createarc(XDIAuthenticationConstants.XDI_ARC_SIGNATURE), true);\r\n\t\t\tsignatureXdiAttribute = XdiAbstractContext.fromContextNode(contextNode).getXdiAttributeCollection(XdiAttributeCollection.createarc(XDIAuthenticationConstants.XDI_ARC_SIGNATURE), true).setXdiMemberUnordered(null);\r\n\t\tXDIAddress dataTypeXri = getDataTypeXri(digestAlgorithm, digestLength, keyAlgorithm, keyLength);\r\n\t\tXdiAttributeSingleton signatureAttributeSingleton = xdiContext.getXdiAttributeSingleton(XdiAttributeSingleton.createarc(XDIAuthenticationConstants.XDI_ARC_SIGNATURE), false);\r\n\t\tXdiAttributeCollection signatureAttributeCollection = xdiContext.getXdiAttributeCollection(XdiAttributeCollection.createarc(XDIAuthenticationConstants.XDI_ARC_SIGNATURE), false);\r\n\t\tif (log.isDebugEnabled()) log.debug(\"Normalized context node \" + contextNode.getAddress() + \": \" + string);\r\n\t\tXDIAddress dataTypeXri = DataTypes.getDataType(xdiAttribute.getContextNode());\r\n\tpublic static String getDigestAlgorithm(XDIAddress dataTypeXri) {\r\n\t\tXDIArc digestAlgorithmXri = dataTypeXri.getNumArcs() > 0 ? dataTypeXri.getArc(0) : null;\r\n\t\tXDIAddress dataTypeXri = DataTypes.getDataType(xdiAttribute.getContextNode());\r\n\tpublic static Integer getDigestLength(XDIAddress dataTypeXri) {\r\n\t\tXDIArc digestLengthXri = dataTypeXri.getNumArcs() > 1 ? dataTypeXri.getArc(1) : null;\r\n\t\tXDIAddress dataTypeXri = DataTypes.getDataType(xdiAttribute.getContextNode());\r\n\tpublic static String getKeyAlgorithm(XDIAddress dataTypeXri) {\r\n\t\tXDIArc keyAlgorithmXri = dataTypeXri.getNumArcs() > 2 ? dataTypeXri.getArc(2) : null;\r\n\t\tXDIAddress dataTypeXri = DataTypes.getDataType(xdiAttribute.getContextNode());\r\n\tpublic static Integer getKeyLength(XDIAddress dataTypeXri) {\r\n\t\tXDIArc keyLengthXri = dataTypeXri.getNumArcs() > 3 ? dataTypeXri.getArc(3) : null;\r\n\tpublic static XDIAddress getDataTypeXri(String digestAlgorithm, int digestLength, String keyAlgorithm, int keyLength) {\r\n\t\treturn XDIAddress.create(builder.toString());\r", "new_methods": [], "old_code": "import xdi2.core.xri3.XDI3Segment;\r\nimport xdi2.core.xri3.XDI3SubSegment;\r\n\t\t\tsignatureXdiAttribute = XdiAbstractContext.fromContextNode(contextNode).getXdiAttributeSingleton(XdiAttributeSingleton.createArcXri(XDIAuthenticationConstants.XRI_SS_SIGNATURE), true);\r\n\t\t\tsignatureXdiAttribute = XdiAbstractContext.fromContextNode(contextNode).getXdiAttributeCollection(XdiAttributeCollection.createArcXri(XDIAuthenticationConstants.XRI_SS_SIGNATURE), true).setXdiMemberUnordered(null);\r\n\t\tXDI3Segment dataTypeXri = getDataTypeXri(digestAlgorithm, digestLength, keyAlgorithm, keyLength);\r\n\t\tXdiAttributeSingleton signatureAttributeSingleton = xdiContext.getXdiAttributeSingleton(XdiAttributeSingleton.createArcXri(XDIAuthenticationConstants.XRI_SS_SIGNATURE), false);\r\n\t\tXdiAttributeCollection signatureAttributeCollection = xdiContext.getXdiAttributeCollection(XdiAttributeCollection.createArcXri(XDIAuthenticationConstants.XRI_SS_SIGNATURE), false);\r\n\t\tif (log.isDebugEnabled()) log.debug(\"Normalized context node \" + contextNode.getXri() + \": \" + string);\r\n\t\tXDI3Segment dataTypeXri = DataTypes.getDataType(xdiAttribute.getContextNode());\r\n\tpublic static String getDigestAlgorithm(XDI3Segment dataTypeXri) {\r\n\t\tXDI3SubSegment digestAlgorithmXri = dataTypeXri.getNumSubSegments() > 0 ? dataTypeXri.getSubSegment(0) : null;\r\n\t\tXDI3Segment dataTypeXri = DataTypes.getDataType(xdiAttribute.getContextNode());\r\n\tpublic static Integer getDigestLength(XDI3Segment dataTypeXri) {\r\n\t\tXDI3SubSegment digestLengthXri = dataTypeXri.getNumSubSegments() > 1 ? dataTypeXri.getSubSegment(1) : null;\r\n\t\tXDI3Segment dataTypeXri = DataTypes.getDataType(xdiAttribute.getContextNode());\r\n\tpublic static String getKeyAlgorithm(XDI3Segment dataTypeXri) {\r\n\t\tXDI3SubSegment keyAlgorithmXri = dataTypeXri.getNumSubSegments() > 2 ? dataTypeXri.getSubSegment(2) : null;\r\n\t\tXDI3Segment dataTypeXri = DataTypes.getDataType(xdiAttribute.getContextNode());\r\n\tpublic static Integer getKeyLength(XDI3Segment dataTypeXri) {\r\n\t\tXDI3SubSegment keyLengthXri = dataTypeXri.getNumSubSegments() > 3 ? dataTypeXri.getSubSegment(3) : null;\r\n\tpublic static XDI3Segment getDataTypeXri(String digestAlgorithm, int digestLength, String keyAlgorithm, int keyLength) {\r\n\t\treturn XDI3Segment.create(builder.toString());\r", "old_methods": [], "patch": "@@ -27,14 +27,14 @@\n import xdi2.core.impl.memory.MemoryGraphFactory;\r\n import xdi2.core.io.XDIWriterRegistry;\r\n import xdi2.core.io.writers.XDIJSONWriter;\r\n+import xdi2.core.syntax.XDIAddress;\r\n+import xdi2.core.syntax.XDIArc;\r\n import xdi2.core.util.CopyUtil;\r\n import xdi2.core.util.iterators.CompositeIterator;\r\n import xdi2.core.util.iterators.MappingIterator;\r\n import xdi2.core.util.iterators.NotNullIterator;\r\n import xdi2.core.util.iterators.ReadOnlyIterator;\r\n import xdi2.core.util.iterators.SingleItemIterator;\r\n-import xdi2.core.xri3.XDI3Segment;\r\n-import xdi2.core.xri3.XDI3SubSegment;\r\n \r\n public class Signatures {\r\n \r\n@@ -64,11 +64,11 @@ private Signatures() { }\n \t\tXdiAttribute signatureXdiAttribute;\r\n \r\n \t\tif (singleton)\r\n-\t\t\tsignatureXdiAttribute = XdiAbstractContext.fromContextNode(contextNode).getXdiAttributeSingleton(XdiAttributeSingleton.createArcXri(XDIAuthenticationConstants.XRI_SS_SIGNATURE), true);\r\n+\t\t\tsignatureXdiAttribute = XdiAbstractContext.fromContextNode(contextNode).getXdiAttributeSingleton(XdiAttributeSingleton.createarc(XDIAuthenticationConstants.XDI_ARC_SIGNATURE), true);\r\n \t\telse\r\n-\t\t\tsignatureXdiAttribute = XdiAbstractContext.fromContextNode(contextNode).getXdiAttributeCollection(XdiAttributeCollection.createArcXri(XDIAuthenticationConstants.XRI_SS_SIGNATURE), true).setXdiMemberUnordered(null);\r\n+\t\t\tsignatureXdiAttribute = XdiAbstractContext.fromContextNode(contextNode).getXdiAttributeCollection(XdiAttributeCollection.createarc(XDIAuthenticationConstants.XDI_ARC_SIGNATURE), true).setXdiMemberUnordered(null);\r\n \r\n-\t\tXDI3Segment dataTypeXri = getDataTypeXri(digestAlgorithm, digestLength, keyAlgorithm, keyLength);\r\n+\t\tXDIAddress dataTypeXri = getDataTypeXri(digestAlgorithm, digestLength, keyAlgorithm, keyLength);\r\n \t\tDataTypes.setDataType(signatureXdiAttribute.getContextNode(), dataTypeXri);\r\n \r\n \t\treturn Signature.fromXdiAttribute(signatureXdiAttribute);\r\n@@ -85,13 +85,13 @@ private Signatures() { }\n \r\n \t\t// add signature that is an XDI attribute singleton\r\n \r\n-\t\tXdiAttributeSingleton signatureAttributeSingleton = xdiContext.getXdiAttributeSingleton(XdiAttributeSingleton.createArcXri(XDIAuthenticationConstants.XRI_SS_SIGNATURE), false);\r\n+\t\tXdiAttributeSingleton signatureAttributeSingleton = xdiContext.getXdiAttributeSingleton(XdiAttributeSingleton.createarc(XDIAuthenticationConstants.XDI_ARC_SIGNATURE), false);\r\n \r\n \t\tif (signatureAttributeSingleton != null) iterators.add(new SingleItemIterator<Signature<?, ?>> (Signature.fromXdiAttribute(signatureAttributeSingleton)));\r\n \r\n \t\t// add signatures that are XDI attribute instances\r\n \r\n-\t\tXdiAttributeCollection signatureAttributeCollection = xdiContext.getXdiAttributeCollection(XdiAttributeCollection.createArcXri(XDIAuthenticationConstants.XRI_SS_SIGNATURE), false);\r\n+\t\tXdiAttributeCollection signatureAttributeCollection = xdiContext.getXdiAttributeCollection(XdiAttributeCollection.createarc(XDIAuthenticationConstants.XDI_ARC_SIGNATURE), false);\r\n \r\n \t\tif (signatureAttributeCollection != null) iterators.add(new MappingXdiAttributeSignatureIterator(signatureAttributeCollection.getXdiMembersDeref()));\r\n \r\n@@ -136,21 +136,21 @@ public static String getNormalizedSerialization(ContextNode contextNode) {\n \t\t\tgraph.close();\r\n \t\t}\r\n \r\n-\t\tif (log.isDebugEnabled()) log.debug(\"Normalized context node \" + contextNode.getXri() + \": \" + string);\r\n+\t\tif (log.isDebugEnabled()) log.debug(\"Normalized context node \" + contextNode.getAddress() + \": \" + string);\r\n \r\n \t\treturn string;\r\n \t}\r\n \r\n \tpublic static String getDigestAlgorithm(XdiAttribute xdiAttribute) {\r\n \r\n-\t\tXDI3Segment dataTypeXri = DataTypes.getDataType(xdiAttribute.getContextNode());\r\n+\t\tXDIAddress dataTypeXri = DataTypes.getDataType(xdiAttribute.getContextNode());\r\n \r\n \t\treturn dataTypeXri == null ? null : getDigestAlgorithm(dataTypeXri);\r\n \t}\r\n \r\n-\tpublic static String getDigestAlgorithm(XDI3Segment dataTypeXri) {\r\n+\tpublic static String getDigestAlgorithm(XDIAddress dataTypeXri) {\r\n \r\n-\t\tXDI3SubSegment digestAlgorithmXri = dataTypeXri.getNumSubSegments() > 0 ? dataTypeXri.getSubSegment(0) : null;\r\n+\t\tXDIArc digestAlgorithmXri = dataTypeXri.getNumArcs() > 0 ? dataTypeXri.getArc(0) : null;\r\n \t\tif (digestAlgorithmXri == null) return null;\r\n \r\n \t\tif (! XDIConstants.CS_CLASS_RESERVED.equals(digestAlgorithmXri.getCs())) return null;\r\n@@ -162,14 +162,14 @@ public static String getDigestAlgorithm(XDI3Segment dataTypeXri) {\n \r\n \tpublic static Integer getDigestLength(XdiAttribute xdiAttribute) {\r\n \r\n-\t\tXDI3Segment dataTypeXri = DataTypes.getDataType(xdiAttribute.getContextNode());\r\n+\t\tXDIAddress dataTypeXri = DataTypes.getDataType(xdiAttribute.getContextNode());\r\n \r\n \t\treturn dataTypeXri == null ? null : getDigestLength(dataTypeXri);\r\n \t}\r\n \r\n-\tpublic static Integer getDigestLength(XDI3Segment dataTypeXri) {\r\n+\tpublic static Integer getDigestLength(XDIAddress dataTypeXri) {\r\n \r\n-\t\tXDI3SubSegment digestLengthXri = dataTypeXri.getNumSubSegments() > 1 ? dataTypeXri.getSubSegment(1) : null;\r\n+\t\tXDIArc digestLengthXri = dataTypeXri.getNumArcs() > 1 ? dataTypeXri.getArc(1) : null;\r\n \t\tif (digestLengthXri == null) return null;\r\n \r\n \t\tif (! XDIConstants.CS_CLASS_RESERVED.equals(digestLengthXri.getCs())) return null;\r\n@@ -181,14 +181,14 @@ public static Integer getDigestLength(XDI3Segment dataTypeXri) {\n \r\n \tpublic static String getKeyAlgorithm(XdiAttribute xdiAttribute) {\r\n \r\n-\t\tXDI3Segment dataTypeXri = DataTypes.getDataType(xdiAttribute.getContextNode());\r\n+\t\tXDIAddress dataTypeXri = DataTypes.getDataType(xdiAttribute.getContextNode());\r\n \r\n \t\treturn dataTypeXri == null ? null : getKeyAlgorithm(dataTypeXri);\r\n \t}\r\n \r\n-\tpublic static String getKeyAlgorithm(XDI3Segment dataTypeXri) {\r\n+\tpublic static String getKeyAlgorithm(XDIAddress dataTypeXri) {\r\n \r\n-\t\tXDI3SubSegment keyAlgorithmXri = dataTypeXri.getNumSubSegments() > 2 ? dataTypeXri.getSubSegment(2) : null;\r\n+\t\tXDIArc keyAlgorithmXri = dataTypeXri.getNumArcs() > 2 ? dataTypeXri.getArc(2) : null;\r\n \t\tif (keyAlgorithmXri == null) return null;\r\n \r\n \t\tif (! XDIConstants.CS_CLASS_RESERVED.equals(keyAlgorithmXri.getCs())) return null;\r\n@@ -200,14 +200,14 @@ public static String getKeyAlgorithm(XDI3Segment dataTypeXri) {\n \r\n \tpublic static Integer getKeyLength(XdiAttribute xdiAttribute) {\r\n \r\n-\t\tXDI3Segment dataTypeXri = DataTypes.getDataType(xdiAttribute.getContextNode());\r\n+\t\tXDIAddress dataTypeXri = DataTypes.getDataType(xdiAttribute.getContextNode());\r\n \r\n \t\treturn dataTypeXri == null ? null : getKeyLength(dataTypeXri);\r\n \t}\r\n \r\n-\tpublic static Integer getKeyLength(XDI3Segment dataTypeXri) {\r\n+\tpublic static Integer getKeyLength(XDIAddress dataTypeXri) {\r\n \r\n-\t\tXDI3SubSegment keyLengthXri = dataTypeXri.getNumSubSegments() > 3 ? dataTypeXri.getSubSegment(3) : null;\r\n+\t\tXDIArc keyLengthXri = dataTypeXri.getNumArcs() > 3 ? dataTypeXri.getArc(3) : null;\r\n \t\tif (keyLengthXri == null) return null;\r\n \r\n \t\tif (! XDIConstants.CS_CLASS_RESERVED.equals(keyLengthXri.getCs())) return null;\r\n@@ -217,7 +217,7 @@ public static Integer getKeyLength(XDI3Segment dataTypeXri) {\n \t\treturn Integer.valueOf(keyLengthXri.getLiteral());\r\n \t}\r\n \r\n-\tpublic static XDI3Segment getDataTypeXri(String digestAlgorithm, int digestLength, String keyAlgorithm, int keyLength) {\r\n+\tpublic static XDIAddress getDataTypeXri(String digestAlgorithm, int digestLength, String keyAlgorithm, int keyLength) {\r\n \r\n \t\tStringBuilder builder = new StringBuilder();\r\n \r\n@@ -226,7 +226,7 @@ public static XDI3Segment getDataTypeXri(String digestAlgorithm, int digestLengt\n \t\tbuilder.append(XDIConstants.CS_CLASS_RESERVED + keyAlgorithm.toLowerCase());\r\n \t\tbuilder.append(XDIConstants.CS_CLASS_RESERVED + Integer.toString(keyLength));\r\n \r\n-\t\treturn XDI3Segment.create(builder.toString());\r\n+\t\treturn XDIAddress.create(builder.toString());\r\n \t}\r\n \r\n \t/*\r", "raw_url": "https://github.com/projectdanube/xdi2/raw/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Fsignatures%2FSignatures.java", "sha": "f69c0593ac73df75073e4d7e91a92809c8165b48", "status": "modified" }, { "additions": 2, "blob_url": "https://github.com/projectdanube/xdi2/blob/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Fsignatures%2FSymmetricKeySignature.java", "changes": 4, "contents_url": "https://api.github.com/repos/projectdanube/xdi2/contents/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Fsignatures%2FSymmetricKeySignature.java?ref=0ca7982fec30c2bb8204efbbea61428a643d2e9c", "deletions": 2, "filename": "core/src/main/java/xdi2/core/features/signatures/SymmetricKeySignature.java", "new_code": "\t\t\tif (! ((XdiAttributeSingleton) xdiAttribute).getBasearc().equals(XdiAbstractContext.getBasearc(XDIAuthenticationConstants.XDI_ARC_SIGNATURE))) return false;\r\n\t\t\tif (! ((XdiAttributeMember) xdiAttribute).getXdiCollection().getBasearc().equals(XdiAbstractContext.getBasearc(XDIAuthenticationConstants.XDI_ARC_SIGNATURE))) return false;\r", "new_methods": [], "old_code": "\t\t\tif (! ((XdiAttributeSingleton) xdiAttribute).getBaseArcXri().equals(XdiAbstractContext.getBaseArcXri(XDIAuthenticationConstants.XRI_SS_SIGNATURE))) return false;\r\n\t\t\tif (! ((XdiAttributeMember) xdiAttribute).getXdiCollection().getBaseArcXri().equals(XdiAbstractContext.getBaseArcXri(XDIAuthenticationConstants.XRI_SS_SIGNATURE))) return false;\r", "old_methods": [], "patch": "@@ -48,10 +48,10 @@ public static boolean isValid(XdiAttribute xdiAttribute) {\n \r\n \t\tif (xdiAttribute instanceof XdiAttributeSingleton) {\r\n \r\n-\t\t\tif (! ((XdiAttributeSingleton) xdiAttribute).getBaseArcXri().equals(XdiAbstractContext.getBaseArcXri(XDIAuthenticationConstants.XRI_SS_SIGNATURE))) return false;\r\n+\t\t\tif (! ((XdiAttributeSingleton) xdiAttribute).getBasearc().equals(XdiAbstractContext.getBasearc(XDIAuthenticationConstants.XDI_ARC_SIGNATURE))) return false;\r\n \t\t} else if (xdiAttribute instanceof XdiAttributeMember) {\r\n \r\n-\t\t\tif (! ((XdiAttributeMember) xdiAttribute).getXdiCollection().getBaseArcXri().equals(XdiAbstractContext.getBaseArcXri(XDIAuthenticationConstants.XRI_SS_SIGNATURE))) return false;\r\n+\t\t\tif (! ((XdiAttributeMember) xdiAttribute).getXdiCollection().getBasearc().equals(XdiAbstractContext.getBasearc(XDIAuthenticationConstants.XDI_ARC_SIGNATURE))) return false;\r\n \t\t} else {\r\n \r\n \t\t\treturn false;\r", "raw_url": "https://github.com/projectdanube/xdi2/raw/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Fsignatures%2FSymmetricKeySignature.java", "sha": "41b2d12106853f65b160dd20644ca82dc1e2b422", "status": "modified" }, { "additions": 6, "blob_url": "https://github.com/projectdanube/xdi2/blob/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Ftimestamps%2FTimestamps.java", "changes": 12, "contents_url": "https://api.github.com/repos/projectdanube/xdi2/contents/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Ftimestamps%2FTimestamps.java?ref=0ca7982fec30c2bb8204efbbea61428a643d2e9c", "deletions": 6, "filename": "core/src/main/java/xdi2/core/features/timestamps/Timestamps.java", "new_code": "import xdi2.core.syntax.XDIAddress;\r\nimport xdi2.core.util.AddressUtil;\r\n\tpublic static Date getContextNodeTimestamp(ContextNode contextNode, XDIAddress modifier) {\r\n\t\tXDIAddress timestampXri = modifier == null ? XDITimestampsConstants.XDI_ADD_AS_T : AddressUtil.concatAddresses(modifier, XDITimestampsConstants.XDI_ARC_AS_T);\r\n\tpublic static void setContextNodeTimestamp(ContextNode contextNode, XDIAddress modifierXri, Date timestamp) {\r\n\t\tXDIAddress timestampXri = modifierXri == null ? XDITimestampsConstants.XDI_ADD_AS_T : AddressUtil.concatAddresses(modifierXri, XDITimestampsConstants.XDI_ARC_AS_T);\r", "new_methods": [], "old_code": "import xdi2.core.util.XDI3Util;\r\nimport xdi2.core.xri3.XDI3Segment;\r\n\tpublic static Date getContextNodeTimestamp(ContextNode contextNode, XDI3Segment modifier) {\r\n\t\tXDI3Segment timestampXri = modifier == null ? XDITimestampsConstants.XRI_S_AS_T : XDI3Util.concatXris(modifier, XDITimestampsConstants.XRI_SS_AS_T);\r\n\tpublic static void setContextNodeTimestamp(ContextNode contextNode, XDI3Segment modifierXri, Date timestamp) {\r\n\t\tXDI3Segment timestampXri = modifierXri == null ? XDITimestampsConstants.XRI_S_AS_T : XDI3Util.concatXris(modifierXri, XDITimestampsConstants.XRI_SS_AS_T);\r", "old_methods": [], "patch": "@@ -13,8 +13,8 @@\n import xdi2.core.features.nodetypes.XdiAbstractContext;\r\n import xdi2.core.features.nodetypes.XdiAttributeSingleton;\r\n import xdi2.core.features.nodetypes.XdiValue;\r\n-import xdi2.core.util.XDI3Util;\r\n-import xdi2.core.xri3.XDI3Segment;\r\n+import xdi2.core.syntax.XDIAddress;\r\n+import xdi2.core.util.AddressUtil;\r\n \r\n public class Timestamps {\r\n \r\n@@ -60,9 +60,9 @@ public static Date stringToTimestamp(String string) {\n \t/**\r\n \t * Get the timestamp associated with a context node.\r\n \t */\r\n-\tpublic static Date getContextNodeTimestamp(ContextNode contextNode, XDI3Segment modifier) {\r\n+\tpublic static Date getContextNodeTimestamp(ContextNode contextNode, XDIAddress modifier) {\r\n \r\n-\t\tXDI3Segment timestampXri = modifier == null ? XDITimestampsConstants.XRI_S_AS_T : XDI3Util.concatXris(modifier, XDITimestampsConstants.XRI_SS_AS_T);\r\n+\t\tXDIAddress timestampXri = modifier == null ? XDITimestampsConstants.XDI_ADD_AS_T : AddressUtil.concatAddresses(modifier, XDITimestampsConstants.XDI_ARC_AS_T);\r\n \r\n \t\tXdiAttributeSingleton xdiAttributeSingleton = XdiAbstractContext.fromContextNode(contextNode).getXdiAttributeSingleton(timestampXri, false);\r\n \t\tif (xdiAttributeSingleton == null) return null;\r\n@@ -85,9 +85,9 @@ public static Date getContextNodeTimestamp(ContextNode contextNode) {\n \t/**\r\n \t * Set the timestamp associated with a context node.\r\n \t */\r\n-\tpublic static void setContextNodeTimestamp(ContextNode contextNode, XDI3Segment modifierXri, Date timestamp) {\r\n+\tpublic static void setContextNodeTimestamp(ContextNode contextNode, XDIAddress modifierXri, Date timestamp) {\r\n \r\n-\t\tXDI3Segment timestampXri = modifierXri == null ? XDITimestampsConstants.XRI_S_AS_T : XDI3Util.concatXris(modifierXri, XDITimestampsConstants.XRI_SS_AS_T);\r\n+\t\tXDIAddress timestampXri = modifierXri == null ? XDITimestampsConstants.XDI_ADD_AS_T : AddressUtil.concatAddresses(modifierXri, XDITimestampsConstants.XDI_ARC_AS_T);\r\n \r\n \t\tString literalData = timestampToString(timestamp);\r\n \r", "raw_url": "https://github.com/projectdanube/xdi2/raw/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Ffeatures%2Ftimestamps%2FTimestamps.java", "sha": "388e2a27e3f29a6f81f41cf9524151a38bc66ef6", "status": "modified" }, { "additions": 132, "blob_url": "https://github.com/projectdanube/xdi2/blob/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Fimpl%2FAbstractContextNode.java", "changes": 264, "contents_url": "https://api.github.com/repos/projectdanube/xdi2/contents/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Fimpl%2FAbstractContextNode.java?ref=0ca7982fec30c2bb8204efbbea61428a643d2e9c", "deletions": 132, "filename": "core/src/main/java/xdi2/core/impl/AbstractContextNode.java", "new_code": "import xdi2.core.syntax.XDIAddress;\r\nimport xdi2.core.syntax.XDIArc;\r\nimport xdi2.core.syntax.XDIStatement;\r\nimport xdi2.core.util.AddressUtil;\r\n\tprivate XDIAddress xri;\r\n\t\t\tthis.getContextNode().delContextNode(this.getArc());\r\n\tpublic XDIAddress getAddress() {\r\n\t\t\t\tthis.xri = XDIConstants.XDI_ADD_ROOT;\r\n\t\t\t\tthis.xri = AddressUtil.concatAddresses(this.getContextNode().getAddress(), this.getArc());\r\n\t//\tpublic ContextNode setContextNode(XDIArc contextNodeArc);\r\n\tpublic ContextNode setDeepContextNode(XDIAddress relativecontextNodeAddress) {\r\n\t\tif (relativecontextNodeAddress == null) return this;\r\n\t\tif (XDIConstants.XDI_ADD_ROOT.equals(relativecontextNodeAddress)) return this;\r\n\t\tfor (XDIArc contextNodeArc : relativecontextNodeAddress.getArcs()) {\r\n\t\t\tcontextNode = contextNode.setContextNode(contextNodeArc);\r\n\tpublic ContextNode getContextNode(XDIArc relativecontextNodeAddress, boolean subgraph) {\r\n\t\t\tif (contextNode.getArc().equals(relativecontextNodeAddress)) return contextNode;\r\n\tpublic ContextNode getContextNode(XDIArc contextNodeArc) {\r\n\t\treturn this.getContextNode(contextNodeArc, false);\r\n\tpublic ContextNode getDeepContextNode(XDIAddress relativecontextNodeAddress, boolean subgraph) {\r\n\t\tif (XDIConstants.XDI_ADD_ROOT.equals(relativecontextNodeAddress)) return this;\r\n\t\tfor (XDIArc contextNodeArc : relativecontextNodeAddress.getArcs()) {\r\n\t\t\tcontextNode = contextNode.getContextNode(contextNodeArc, subgraph);\r\n\tpublic ContextNode getDeepContextNode(XDIAddress relativecontextNodeAddress) {\r\n\t\treturn this.getDeepContextNode(relativecontextNodeAddress, false);\r\n\tpublic ReadOnlyIterator<ContextNode> getDeepContextNodes(XDIAddress relativecontextNodeAddress) {\r\n\t\tContextNode contextNode = this.getDeepContextNode(relativecontextNodeAddress, false);\r\n\tpublic boolean containsContextNode(XDIArc contextNodeArc) {\r\n\t\treturn this.getContextNode(contextNodeArc, false) != null;\r\n\tpublic Relation setRelation(XDIAddress arc, XDIAddress targetContextNodeAddress) {\r\n\t\tContextNode targetContextNode = this.setRelationSetTargetContextNode(targetContextNodeAddress);\r\n\t\tRelation relation = this.setRelation(arc, targetContextNode);\r\n\tpublic Relation setDeepRelation(XDIAddress relativecontextNodeAddress, XDIAddress arc, XDIAddress targetContextNodeAddress) {\r\n\t\tContextNode contextNode = this.setDeepContextNode(relativecontextNodeAddress);\r\n\t\treturn contextNode.setRelation(arc, targetContextNodeAddress);\r\n\t//\tpublic Relation setRelation(XDIAddress arc, ContextNode targetContextNode) {\r\n\tpublic Relation setDeepRelation(XDIAddress relativecontextNodeAddress, XDIAddress arc, ContextNode targetContextNode) {\r\n\t\tContextNode contextNode = this.setDeepContextNode(relativecontextNodeAddress);\r\n\t\treturn contextNode.setRelation(arc, targetContextNode);\r\n\tpublic Relation getRelation(XDIAddress arc, final XDIAddress targetContextNodeAddress) {\r\n\t\tIterator<Relation> selectingIterator = new SelectingIterator<Relation> (this.getRelations(arc)) {\r\n\t\t\t\treturn relation.getTargetContextNodeAddress().equals(targetContextNodeAddress);\r\n\tpublic Relation getDeepRelation(XDIAddress relativecontextNodeAddress, XDIAddress arc, XDIAddress targetContextNodeAddress) {\r\n\t\tContextNode contextNode = this.getDeepContextNode(relativecontextNodeAddress, false);\r\n\t\treturn contextNode.getRelation(arc, targetContextNodeAddress);\r\n\tpublic Relation getRelation(XDIAddress arc) {\r\n\t\treturn new IteratorFirstItem<Relation> (this.getRelations(arc)).item();\r\n\tpublic Relation getDeepRelation(XDIAddress relativecontextNodeAddress, XDIAddress arc) {\r\n\t\tContextNode contextNode = this.getDeepContextNode(relativecontextNodeAddress, false);\r\n\t\treturn contextNode.getRelation(arc);\r\n\tpublic ReadOnlyIterator<Relation> getRelations(final XDIAddress arc) {\r\n\t\t\t\treturn relation.getArc().equals(arc);\r\n\tpublic ReadOnlyIterator<Relation> getDeepRelations(XDIAddress relativecontextNodeAddress, XDIAddress arc) {\r\n\t\tContextNode contextNode = this.getDeepContextNode(relativecontextNodeAddress, false);\r\n\t\treturn contextNode.getRelations(arc);\r\n\tpublic ReadOnlyIterator<Relation> getDeepRelations(XDIAddress relativecontextNodeAddress) {\r\n\t\tContextNode contextNode = this.getDeepContextNode(relativecontextNodeAddress, false);\r\n\tpublic ReadOnlyIterator<Relation> getIncomingRelations(final XDIAddress arc) {\r\n\t\t\t\treturn relation.getArc().equals(arc);\r\n\tpublic boolean containsRelation(XDIAddress arc, XDIAddress targetContextNodeAddress) {\r\n\t\treturn this.getRelation(arc, targetContextNodeAddress) != null;\r\n\tpublic boolean containsRelations(XDIAddress arc) {\r\n\t\treturn this.getRelations(arc).hasNext();\r\n\tpublic boolean containsIncomingRelations(XDIAddress arc) {\r\n\t\treturn this.getIncomingRelations(arc).hasNext();\r\n\tpublic void delRelations(XDIAddress arc) {\r\n\t\tfor (Relation relation : this.getRelations(arc)) relation.delete();\r\n\tpublic long getRelationCount(XDIAddress arc) {\r\n\t\treturn new IteratorCounter(this.getRelations(arc)).count();\r\n\tpublic Literal setDeepLiteral(XDIAddress relativecontextNodeAddress, Object literalData) {\r\n\t\tContextNode contextNode = this.setDeepContextNode(relativecontextNodeAddress);\r\n\tpublic Literal setDeepLiteralString(XDIAddress relativecontextNodeAddress, String literalData) {\r\n\t\treturn this.setDeepLiteral(relativecontextNodeAddress, literalData);\r\n\tpublic Literal setDeepLiteralNumber(XDIAddress relativecontextNodeAddress, Double literalData) {\r\n\t\treturn this.setDeepLiteral(relativecontextNodeAddress, literalData);\r\n\tpublic Literal setDeepLiteralBoolean(XDIAddress relativecontextNodeAddress, Boolean literalData) {\r\n\t\treturn this.setDeepLiteral(relativecontextNodeAddress, literalData);\r\n\tpublic Literal getDeepLiteral(XDIAddress relativecontextNodeAddress, Object literalData) {\r\n\t\tContextNode contextNode = this.getDeepContextNode(relativecontextNodeAddress, false);\r\n\tpublic Literal getDeepLiteralString(XDIAddress relativecontextNodeAddress, String literalData) {\r\n\t\treturn this.getDeepLiteral(relativecontextNodeAddress, literalData);\r\n\tpublic Literal getDeepLiteralNumber(XDIAddress relativecontextNodeAddress, Double literalData) {\r\n\t\treturn this.getDeepLiteral(relativecontextNodeAddress, literalData);\r\n\tpublic Literal getDeepLiteralBoolean(XDIAddress relativecontextNodeAddress, Boolean literalData) {\r\n\t\treturn this.getDeepLiteral(relativecontextNodeAddress, literalData);\r\n\tpublic Literal getDeepLiteral(XDIAddress relativecontextNodeAddress) {\r\n\t\tContextNode contextNode = this.getDeepContextNode(relativecontextNodeAddress, false);\r\n\tpublic Statement setStatement(XDIStatement statementXri) {\r\n\t\t\tContextNode contextNode = this.setDeepContextNode(statementXri.getTargetContextNodeAddress());\r\n\t\t\tRelation relation = this.setDeepRelation(statementXri.getContextNodeAddress(), statementXri.getRelationAddress(), statementXri.getTargetContextNodeAddress());\r\n\t\t\tLiteral literal = this.setDeepLiteral(statementXri.getContextNodeAddress(), statementXri.getLiteralData());\r\n\tpublic Statement getStatement(XDIStatement statementXri) {\r\n\t\t\tContextNode contextNode = baseContextNode.getContextNode(statementXri.getContextNodeArc(), false);\r\n\t\t\tRelation relation = baseContextNode.getRelation(statementXri.getRelationAddress(), statementXri.getTargetContextNodeAddress());\r\n\tpublic boolean containsStatement(XDIStatement statementXri) {\r\n\tprotected void setContextNodeCheckValid(XDIArc arc) throws Xdi2GraphException {\r\n\t\tif (arc == null) throw new NullPointerException();\r\n\t\tif (XDIConstants.XDI_ADD_CONTEXT.equals(arc)) throw new Xdi2GraphException(\"Invalid context node arc: \" + arc);\r\n\t\tif (this.containsRelations(XDIDictionaryConstants.XDI_ADD_REF)) throw new Xdi2GraphException(\"Cannot add \" + arc + \" context node to context node \" + this.getAddress() + \" containing a \" + XDIDictionaryConstants.XDI_ADD_REF + \" relation.\");\r\n\t\tif (this.containsRelations(XDIDictionaryConstants.XDI_ADD_REP)) throw new Xdi2GraphException(\"Cannot add \" + arc + \" context node to context node \" + this.getAddress() + \" containing a \" + XDIDictionaryConstants.XDI_ADD_REP + \" relation.\");\r\n\t\tContextNode tempContextNode = new BasicContextNode(this.getGraph(), this, arc, null, null, null);\r\n\t\tif (! XdiAbstractContext.isValid(tempContextNode)) throw new Xdi2GraphException(\"Invalid subgraph: \" + arc + \" under subgraph \" + this.getAddress());\r\n\tprotected void setRelationCheckValid(XDIAddress arc, XDIAddress targetContextNodeAddress) throws Xdi2GraphException {\r\n\t\tif (arc == null) throw new NullPointerException();\r\n\t\tif (targetContextNodeAddress == null) throw new NullPointerException();\r\n\t\tif (XDIConstants.XDI_ADD_CONTEXT.equals(arc)) throw new Xdi2GraphException(\"Invalid relation arc: \" + arc);\r\n\t\tif (XDIConstants.XDI_ADD_LITERAL.equals(arc)) throw new Xdi2GraphException(\"Invalid relation arc: \" + arc);\r\n\t\t\tif (XDIDictionaryConstants.XDI_ADD_REF.equals(arc)) {\r\n\t\t\t\tif (! this.containsRelation(XDIDictionaryConstants.XDI_ADD_REF, targetContextNodeAddress)) throw new Xdi2GraphException(\"Cannot add \" + arc + \"/\" + targetContextNodeAddress + \" relation to non-empty context node \" + this.getAddress() + \".\");\r\n\t\t\t\tif (this.containsRelations(XDIDictionaryConstants.XDI_ADD_REF)) throw new Xdi2GraphException(\"Cannot add \" + arc + \"/\" + targetContextNodeAddress + \" relation to context node \" + this.getAddress() + \", which already contains a $ref.\");\r\n\t\t\tif (XDIDictionaryConstants.XDI_ADD_REP.equals(arc)) {\r\n\t\t\t\tif (! this.containsRelation(XDIDictionaryConstants.XDI_ADD_REP, targetContextNodeAddress)) throw new Xdi2GraphException(\"Cannot add \" + arc + \"/\" + targetContextNodeAddress + \" relation to non-empty context node \" + this.getAddress() + \".\");\r\n\t\t\t\tif (this.containsRelations(XDIDictionaryConstants.XDI_ADD_REP)) throw new Xdi2GraphException(\"Cannot add \" + arc + \"/\" + targetContextNodeAddress + \" relation to context node \" + this.getAddress() + \", which already contains a $rep.\");\r\n\t\tif (this.containsRelations(XDIDictionaryConstants.XDI_ADD_REF)) throw new Xdi2GraphException(\"Cannot add literal to context node \" + this.getAddress() + \" containing a \" + XDIDictionaryConstants.XDI_ADD_REF + \" relation.\");\r\n\t\tif (this.containsRelations(XDIDictionaryConstants.XDI_ADD_REP)) throw new Xdi2GraphException(\"Cannot add literal to context node \" + this.getAddress() + \" containing a \" + XDIDictionaryConstants.XDI_ADD_REP + \" relation.\");\r\n\tprotected void setContextNodeSetInnerRoot(XDIArc arc, ContextNode contextNode) {\r\n\t\tif (XdiInnerRoot.isInnerRootarc(arc)) {\r\n\t\t\tthis.setDeepContextNode(XdiInnerRoot.getSubjectOfInnerRootXri(arc)).setRelation(XdiInnerRoot.getPredicateOfInnerRootXri(arc), contextNode);\r\n\tprotected ContextNode setRelationSetTargetContextNode(XDIAddress targetContextNodeAddress) {\r\n\t\treturn this.getGraph().setDeepContextNode(targetContextNodeAddress);\r\n\t\t\tcontextNode.delRelationDelInnerRoot(relation.getArc(), relation.getTargetContextNodeAddress());\r\n\tprotected void delRelationDelInnerRoot(XDIAddress arc, XDIAddress targetContextNodeAddress) {\r\n\t\tif (XdiInnerRoot.createInnerRootarc(this.getAddress(), arc).equals(targetContextNodeAddress)) {\r\n\t\t\tthis.getGraph().getDeepContextNode(targetContextNodeAddress, false).delete();\r\n\t\treturn this.getAddress().toString();\r\n\t\treturn this.getAddress().equals(other.getAddress());\r\n\t\thashCode = (hashCode * 31) + this.getAddress().hashCode();\r\n\t\treturn this.getAddress().compareTo(other.getAddress());\r\n\t\tpublic XDIAddress getSubject() {\r\n\t\t\treturn AbstractContextNode.this.getContextNode().getAddress();\r\n\t\tpublic XDIArc getObject() {\r\n\t\t\treturn AbstractContextNode.this.getArc();\r", "new_methods": [], "old_code": "import xdi2.core.util.XDI3Util;\r\nimport xdi2.core.xri3.XDI3Segment;\r\nimport xdi2.core.xri3.XDI3Statement;\r\nimport xdi2.core.xri3.XDI3SubSegment;\r\n\tprivate XDI3Segment xri;\r\n\t\t\tthis.getContextNode().delContextNode(this.getArcXri());\r\n\tpublic XDI3Segment getXri() {\r\n\t\t\t\tthis.xri = XDIConstants.XRI_S_ROOT;\r\n\t\t\t\tthis.xri = XDI3Util.concatXris(this.getContextNode().getXri(), this.getArcXri());\r\n\t//\tpublic ContextNode setContextNode(XDI3SubSegment contextNodeArcXri);\r\n\tpublic ContextNode setDeepContextNode(XDI3Segment relativeContextNodeXri) {\r\n\t\tif (relativeContextNodeXri == null) return this;\r\n\t\tif (XDIConstants.XRI_S_ROOT.equals(relativeContextNodeXri)) return this;\r\n\t\tfor (XDI3SubSegment contextNodeArcXri : relativeContextNodeXri.getSubSegments()) {\r\n\t\t\tcontextNode = contextNode.setContextNode(contextNodeArcXri);\r\n\tpublic ContextNode getContextNode(XDI3SubSegment relativeContextNodeXri, boolean subgraph) {\r\n\t\t\tif (contextNode.getArcXri().equals(relativeContextNodeXri)) return contextNode;\r\n\tpublic ContextNode getContextNode(XDI3SubSegment contextNodeArcXri) {\r\n\t\treturn this.getContextNode(contextNodeArcXri, false);\r\n\tpublic ContextNode getDeepContextNode(XDI3Segment relativeContextNodeXri, boolean subgraph) {\r\n\t\tif (XDIConstants.XRI_S_ROOT.equals(relativeContextNodeXri)) return this;\r\n\t\tfor (XDI3SubSegment contextNodeArcXri : relativeContextNodeXri.getSubSegments()) {\r\n\t\t\tcontextNode = contextNode.getContextNode(contextNodeArcXri, subgraph);\r\n\tpublic ContextNode getDeepContextNode(XDI3Segment relativeContextNodeXri) {\r\n\t\treturn this.getDeepContextNode(relativeContextNodeXri, false);\r\n\tpublic ReadOnlyIterator<ContextNode> getDeepContextNodes(XDI3Segment relativeContextNodeXri) {\r\n\t\tContextNode contextNode = this.getDeepContextNode(relativeContextNodeXri, false);\r\n\tpublic boolean containsContextNode(XDI3SubSegment contextNodeArcXri) {\r\n\t\treturn this.getContextNode(contextNodeArcXri, false) != null;\r\n\tpublic Relation setRelation(XDI3Segment arcXri, XDI3Segment targetContextNodeXri) {\r\n\t\tContextNode targetContextNode = this.setRelationSetTargetContextNode(targetContextNodeXri);\r\n\t\tRelation relation = this.setRelation(arcXri, targetContextNode);\r\n\tpublic Relation setDeepRelation(XDI3Segment relativeContextNodeXri, XDI3Segment arcXri, XDI3Segment targetContextNodeXri) {\r\n\t\tContextNode contextNode = this.setDeepContextNode(relativeContextNodeXri);\r\n\t\treturn contextNode.setRelation(arcXri, targetContextNodeXri);\r\n\t//\tpublic Relation setRelation(XDI3Segment arcXri, ContextNode targetContextNode) {\r\n\tpublic Relation setDeepRelation(XDI3Segment relativeContextNodeXri, XDI3Segment arcXri, ContextNode targetContextNode) {\r\n\t\tContextNode contextNode = this.setDeepContextNode(relativeContextNodeXri);\r\n\t\treturn contextNode.setRelation(arcXri, targetContextNode);\r\n\tpublic Relation getRelation(XDI3Segment arcXri, final XDI3Segment targetContextNodeXri) {\r\n\t\tIterator<Relation> selectingIterator = new SelectingIterator<Relation> (this.getRelations(arcXri)) {\r\n\t\t\t\treturn relation.getTargetContextNodeXri().equals(targetContextNodeXri);\r\n\tpublic Relation getDeepRelation(XDI3Segment relativeContextNodeXri, XDI3Segment arcXri, XDI3Segment targetContextNodeXri) {\r\n\t\tContextNode contextNode = this.getDeepContextNode(relativeContextNodeXri, false);\r\n\t\treturn contextNode.getRelation(arcXri, targetContextNodeXri);\r\n\tpublic Relation getRelation(XDI3Segment arcXri) {\r\n\t\treturn new IteratorFirstItem<Relation> (this.getRelations(arcXri)).item();\r\n\tpublic Relation getDeepRelation(XDI3Segment relativeContextNodeXri, XDI3Segment arcXri) {\r\n\t\tContextNode contextNode = this.getDeepContextNode(relativeContextNodeXri, false);\r\n\t\treturn contextNode.getRelation(arcXri);\r\n\tpublic ReadOnlyIterator<Relation> getRelations(final XDI3Segment arcXri) {\r\n\t\t\t\treturn relation.getArcXri().equals(arcXri);\r\n\tpublic ReadOnlyIterator<Relation> getDeepRelations(XDI3Segment relativeContextNodeXri, XDI3Segment arcXri) {\r\n\t\tContextNode contextNode = this.getDeepContextNode(relativeContextNodeXri, false);\r\n\t\treturn contextNode.getRelations(arcXri);\r\n\tpublic ReadOnlyIterator<Relation> getDeepRelations(XDI3Segment relativeContextNodeXri) {\r\n\t\tContextNode contextNode = this.getDeepContextNode(relativeContextNodeXri, false);\r\n\tpublic ReadOnlyIterator<Relation> getIncomingRelations(final XDI3Segment arcXri) {\r\n\t\t\t\treturn relation.getArcXri().equals(arcXri);\r\n\tpublic boolean containsRelation(XDI3Segment arcXri, XDI3Segment targetContextNodeXri) {\r\n\t\treturn this.getRelation(arcXri, targetContextNodeXri) != null;\r\n\tpublic boolean containsRelations(XDI3Segment arcXri) {\r\n\t\treturn this.getRelations(arcXri).hasNext();\r\n\tpublic boolean containsIncomingRelations(XDI3Segment arcXri) {\r\n\t\treturn this.getIncomingRelations(arcXri).hasNext();\r\n\tpublic void delRelations(XDI3Segment arcXri) {\r\n\t\tfor (Relation relation : this.getRelations(arcXri)) relation.delete();\r\n\tpublic long getRelationCount(XDI3Segment arcXri) {\r\n\t\treturn new IteratorCounter(this.getRelations(arcXri)).count();\r\n\tpublic Literal setDeepLiteral(XDI3Segment relativeContextNodeXri, Object literalData) {\r\n\t\tContextNode contextNode = this.setDeepContextNode(relativeContextNodeXri);\r\n\tpublic Literal setDeepLiteralString(XDI3Segment relativeContextNodeXri, String literalData) {\r\n\t\treturn this.setDeepLiteral(relativeContextNodeXri, literalData);\r\n\tpublic Literal setDeepLiteralNumber(XDI3Segment relativeContextNodeXri, Double literalData) {\r\n\t\treturn this.setDeepLiteral(relativeContextNodeXri, literalData);\r\n\tpublic Literal setDeepLiteralBoolean(XDI3Segment relativeContextNodeXri, Boolean literalData) {\r\n\t\treturn this.setDeepLiteral(relativeContextNodeXri, literalData);\r\n\tpublic Literal getDeepLiteral(XDI3Segment relativeContextNodeXri, Object literalData) {\r\n\t\tContextNode contextNode = this.getDeepContextNode(relativeContextNodeXri, false);\r\n\tpublic Literal getDeepLiteralString(XDI3Segment relativeContextNodeXri, String literalData) {\r\n\t\treturn this.getDeepLiteral(relativeContextNodeXri, literalData);\r\n\tpublic Literal getDeepLiteralNumber(XDI3Segment relativeContextNodeXri, Double literalData) {\r\n\t\treturn this.getDeepLiteral(relativeContextNodeXri, literalData);\r\n\tpublic Literal getDeepLiteralBoolean(XDI3Segment relativeContextNodeXri, Boolean literalData) {\r\n\t\treturn this.getDeepLiteral(relativeContextNodeXri, literalData);\r\n\tpublic Literal getDeepLiteral(XDI3Segment relativeContextNodeXri) {\r\n\t\tContextNode contextNode = this.getDeepContextNode(relativeContextNodeXri, false);\r\n\tpublic Statement setStatement(XDI3Statement statementXri) {\r\n\t\t\tContextNode contextNode = this.setDeepContextNode(statementXri.getTargetContextNodeXri());\r\n\t\t\tRelation relation = this.setDeepRelation(statementXri.getContextNodeXri(), statementXri.getRelationArcXri(), statementXri.getTargetContextNodeXri());\r\n\t\t\tLiteral literal = this.setDeepLiteral(statementXri.getContextNodeXri(), statementXri.getLiteralData());\r\n\tpublic Statement getStatement(XDI3Statement statementXri) {\r\n\t\t\tContextNode contextNode = baseContextNode.getContextNode(statementXri.getContextNodeArcXri(), false);\r\n\t\t\tRelation relation = baseContextNode.getRelation(statementXri.getRelationArcXri(), statementXri.getTargetContextNodeXri());\r\n\tpublic boolean containsStatement(XDI3Statement statementXri) {\r\n\tprotected void setContextNodeCheckValid(XDI3SubSegment arcXri) throws Xdi2GraphException {\r\n\t\tif (arcXri == null) throw new NullPointerException();\r\n\t\tif (XDIConstants.XRI_S_CONTEXT.equals(arcXri)) throw new Xdi2GraphException(\"Invalid context node arc XRI: \" + arcXri);\r\n\t\tif (this.containsRelations(XDIDictionaryConstants.XRI_S_REF)) throw new Xdi2GraphException(\"Cannot add \" + arcXri + \" context node to context node \" + this.getXri() + \" containing a \" + XDIDictionaryConstants.XRI_S_REF + \" relation.\");\r\n\t\tif (this.containsRelations(XDIDictionaryConstants.XRI_S_REP)) throw new Xdi2GraphException(\"Cannot add \" + arcXri + \" context node to context node \" + this.getXri() + \" containing a \" + XDIDictionaryConstants.XRI_S_REP + \" relation.\");\r\n\t\tContextNode tempContextNode = new BasicContextNode(this.getGraph(), this, arcXri, null, null, null);\r\n\t\tif (! XdiAbstractContext.isValid(tempContextNode)) throw new Xdi2GraphException(\"Invalid subgraph: \" + arcXri + \" under subgraph \" + this.getXri());\r\n\tprotected void setRelationCheckValid(XDI3Segment arcXri, XDI3Segment targetContextNodeXri) throws Xdi2GraphException {\r\n\t\tif (arcXri == null) throw new NullPointerException();\r\n\t\tif (targetContextNodeXri == null) throw new NullPointerException();\r\n\t\tif (XDIConstants.XRI_S_CONTEXT.equals(arcXri)) throw new Xdi2GraphException(\"Invalid relation arc XRI: \" + arcXri);\r\n\t\tif (XDIConstants.XRI_S_LITERAL.equals(arcXri)) throw new Xdi2GraphException(\"Invalid relation arc XRI: \" + arcXri);\r\n\t\t\tif (XDIDictionaryConstants.XRI_S_REF.equals(arcXri)) {\r\n\t\t\t\tif (! this.containsRelation(XDIDictionaryConstants.XRI_S_REF, targetContextNodeXri)) throw new Xdi2GraphException(\"Cannot add \" + arcXri + \"/\" + targetContextNodeXri + \" relation to non-empty context node \" + this.getXri() + \".\");\r\n\t\t\t\tif (this.containsRelations(XDIDictionaryConstants.XRI_S_REF)) throw new Xdi2GraphException(\"Cannot add \" + arcXri + \"/\" + targetContextNodeXri + \" relation to context node \" + this.getXri() + \", which already contains a $ref.\");\r\n\t\t\tif (XDIDictionaryConstants.XRI_S_REP.equals(arcXri)) {\r\n\t\t\t\tif (! this.containsRelation(XDIDictionaryConstants.XRI_S_REP, targetContextNodeXri)) throw new Xdi2GraphException(\"Cannot add \" + arcXri + \"/\" + targetContextNodeXri + \" relation to non-empty context node \" + this.getXri() + \".\");\r\n\t\t\t\tif (this.containsRelations(XDIDictionaryConstants.XRI_S_REP)) throw new Xdi2GraphException(\"Cannot add \" + arcXri + \"/\" + targetContextNodeXri + \" relation to context node \" + this.getXri() + \", which already contains a $rep.\");\r\n\t\tif (this.containsRelations(XDIDictionaryConstants.XRI_S_REF)) throw new Xdi2GraphException(\"Cannot add literal to context node \" + this.getXri() + \" containing a \" + XDIDictionaryConstants.XRI_S_REF + \" relation.\");\r\n\t\tif (this.containsRelations(XDIDictionaryConstants.XRI_S_REP)) throw new Xdi2GraphException(\"Cannot add literal to context node \" + this.getXri() + \" containing a \" + XDIDictionaryConstants.XRI_S_REP + \" relation.\");\r\n\tprotected void setContextNodeSetInnerRoot(XDI3SubSegment arcXri, ContextNode contextNode) {\r\n\t\tif (XdiInnerRoot.isInnerRootArcXri(arcXri)) {\r\n\t\t\tthis.setDeepContextNode(XdiInnerRoot.getSubjectOfInnerRootXri(arcXri)).setRelation(XdiInnerRoot.getPredicateOfInnerRootXri(arcXri), contextNode);\r\n\tprotected ContextNode setRelationSetTargetContextNode(XDI3Segment targetContextNodeXri) {\r\n\t\treturn this.getGraph().setDeepContextNode(targetContextNodeXri);\r\n\t\t\tcontextNode.delRelationDelInnerRoot(relation.getArcXri(), relation.getTargetContextNodeXri());\r\n\tprotected void delRelationDelInnerRoot(XDI3Segment arcXri, XDI3Segment targetContextNodeXri) {\r\n\t\tif (XdiInnerRoot.createInnerRootArcXri(this.getXri(), arcXri).equals(targetContextNodeXri)) {\r\n\t\t\tthis.getGraph().getDeepContextNode(targetContextNodeXri, false).delete();\r\n\t\treturn this.getXri().toString();\r\n\t\treturn this.getXri().equals(other.getXri());\r\n\t\thashCode = (hashCode * 31) + this.getXri().hashCode();\r\n\t\treturn this.getXri().compareTo(other.getXri());\r\n\t\tpublic XDI3Segment getSubject() {\r\n\t\t\treturn AbstractContextNode.this.getContextNode().getXri();\r\n\t\tpublic XDI3SubSegment getObject() {\r\n\t\t\treturn AbstractContextNode.this.getArcXri();\r", "old_methods": [], "patch": "@@ -17,7 +17,10 @@\n import xdi2.core.features.nodetypes.XdiInnerRoot;\r\n import xdi2.core.features.nodetypes.XdiValue;\r\n import xdi2.core.impl.AbstractStatement.AbstractContextNodeStatement;\r\n-import xdi2.core.util.XDI3Util;\r\n+import xdi2.core.syntax.XDIAddress;\r\n+import xdi2.core.syntax.XDIArc;\r\n+import xdi2.core.syntax.XDIStatement;\r\n+import xdi2.core.util.AddressUtil;\r\n import xdi2.core.util.iterators.CompositeIterator;\r\n import xdi2.core.util.iterators.DescendingIterator;\r\n import xdi2.core.util.iterators.EmptyIterator;\r\n@@ -27,9 +30,6 @@\n import xdi2.core.util.iterators.ReadOnlyIterator;\r\n import xdi2.core.util.iterators.SelectingIterator;\r\n import xdi2.core.util.iterators.SingleItemIterator;\r\n-import xdi2.core.xri3.XDI3Segment;\r\n-import xdi2.core.xri3.XDI3Statement;\r\n-import xdi2.core.xri3.XDI3SubSegment;\r\n \r\n public abstract class AbstractContextNode implements ContextNode {\r\n \r\n@@ -38,7 +38,7 @@ public abstract class AbstractContextNode implements ContextNode {\n \tprivate Graph graph;\r\n \tprivate ContextNode contextNode;\r\n \r\n-\tprivate XDI3Segment xri;\r\n+\tprivate XDIAddress xri;\r\n \r\n \tpublic AbstractContextNode(Graph graph, ContextNode contextNode) {\r\n \r\n@@ -96,7 +96,7 @@ public synchronized void delete() {\n \t\t\tthis.clear();\r\n \t\t} else {\r\n \r\n-\t\t\tthis.getContextNode().delContextNode(this.getArcXri());\r\n+\t\t\tthis.getContextNode().delContextNode(this.getArc());\r\n \t\t}\r\n \t}\r\n \r\n@@ -115,16 +115,16 @@ public boolean isEmpty() {\n \t}\r\n \r\n \t@Override\r\n-\tpublic XDI3Segment getXri() {\r\n+\tpublic XDIAddress getAddress() {\r\n \r\n \t\tif (this.xri == null) {\r\n \r\n \t\t\tif (this.isRootContextNode()) {\r\n \r\n-\t\t\t\tthis.xri = XDIConstants.XRI_S_ROOT;\r\n+\t\t\t\tthis.xri = XDIConstants.XDI_ADD_ROOT;\r\n \t\t\t} else {\r\n \r\n-\t\t\t\tthis.xri = XDI3Util.concatXris(this.getContextNode().getXri(), this.getArcXri());\r\n+\t\t\t\tthis.xri = AddressUtil.concatAddresses(this.getContextNode().getAddress(), this.getArc());\r\n \t\t\t}\r\n \t\t}\r\n \r\n@@ -135,71 +135,71 @@ public XDI3Segment getXri() {\n \t * Methods related to context nodes of this context node\r\n \t */\r\n \r\n-\t//\tpublic ContextNode setContextNode(XDI3SubSegment contextNodeArcXri);\r\n+\t//\tpublic ContextNode setContextNode(XDIArc contextNodeArc);\r\n \r\n \t@Override\r\n-\tpublic ContextNode setDeepContextNode(XDI3Segment relativeContextNodeXri) {\r\n+\tpublic ContextNode setDeepContextNode(XDIAddress relativecontextNodeAddress) {\r\n \r\n-\t\tif (relativeContextNodeXri == null) return this;\r\n-\t\tif (XDIConstants.XRI_S_ROOT.equals(relativeContextNodeXri)) return this;\r\n+\t\tif (relativecontextNodeAddress == null) return this;\r\n+\t\tif (XDIConstants.XDI_ADD_ROOT.equals(relativecontextNodeAddress)) return this;\r\n \r\n \t\tContextNode contextNode = this;\r\n \r\n-\t\tfor (XDI3SubSegment contextNodeArcXri : relativeContextNodeXri.getSubSegments()) {\r\n+\t\tfor (XDIArc contextNodeArc : relativecontextNodeAddress.getArcs()) {\r\n \r\n-\t\t\tcontextNode = contextNode.setContextNode(contextNodeArcXri);\r\n+\t\t\tcontextNode = contextNode.setContextNode(contextNodeArc);\r\n \t\t}\r\n \r\n \t\treturn contextNode;\r\n \t}\r\n \r\n \t@Override\r\n-\tpublic ContextNode getContextNode(XDI3SubSegment relativeContextNodeXri, boolean subgraph) {\r\n+\tpublic ContextNode getContextNode(XDIArc relativecontextNodeAddress, boolean subgraph) {\r\n \r\n \t\tfor (Iterator<ContextNode> contextNodes = this.getContextNodes(); contextNodes.hasNext(); ) {\r\n \r\n \t\t\tContextNode contextNode = contextNodes.next();\r\n \r\n-\t\t\tif (contextNode.getArcXri().equals(relativeContextNodeXri)) return contextNode;\r\n+\t\t\tif (contextNode.getArc().equals(relativecontextNodeAddress)) return contextNode;\r\n \t\t}\r\n \r\n \t\treturn null;\r\n \t}\r\n \r\n \t@Override\r\n-\tpublic ContextNode getContextNode(XDI3SubSegment contextNodeArcXri) {\r\n+\tpublic ContextNode getContextNode(XDIArc contextNodeArc) {\r\n \r\n-\t\treturn this.getContextNode(contextNodeArcXri, false);\r\n+\t\treturn this.getContextNode(contextNodeArc, false);\r\n \t}\r\n \r\n \t@Override\r\n-\tpublic ContextNode getDeepContextNode(XDI3Segment relativeContextNodeXri, boolean subgraph) {\r\n+\tpublic ContextNode getDeepContextNode(XDIAddress relativecontextNodeAddress, boolean subgraph) {\r\n \r\n-\t\tif (XDIConstants.XRI_S_ROOT.equals(relativeContextNodeXri)) return this;\r\n+\t\tif (XDIConstants.XDI_ADD_ROOT.equals(relativecontextNodeAddress)) return this;\r\n \r\n \t\tContextNode contextNode = this;\r\n \r\n-\t\tfor (XDI3SubSegment contextNodeArcXri : relativeContextNodeXri.getSubSegments()) {\r\n+\t\tfor (XDIArc contextNodeArc : relativecontextNodeAddress.getArcs()) {\r\n \r\n-\t\t\tcontextNode = contextNode.getContextNode(contextNodeArcXri, subgraph);\r\n+\t\t\tcontextNode = contextNode.getContextNode(contextNodeArc, subgraph);\r\n \t\t\tif (contextNode == null) return null;\r\n \t\t}\r\n \r\n \t\treturn contextNode;\r\n \t}\r\n \r\n \t@Override\r\n-\tpublic ContextNode getDeepContextNode(XDI3Segment relativeContextNodeXri) {\r\n+\tpublic ContextNode getDeepContextNode(XDIAddress relativecontextNodeAddress) {\r\n \r\n-\t\treturn this.getDeepContextNode(relativeContextNodeXri, false);\r\n+\t\treturn this.getDeepContextNode(relativecontextNodeAddress, false);\r\n \t}\r\n \r\n \t//\tpublic ReadOnlyIterator<ContextNode> getContextNodes();\r\n \r\n \t@Override\r\n-\tpublic ReadOnlyIterator<ContextNode> getDeepContextNodes(XDI3Segment relativeContextNodeXri) {\r\n+\tpublic ReadOnlyIterator<ContextNode> getDeepContextNodes(XDIAddress relativecontextNodeAddress) {\r\n \r\n-\t\tContextNode contextNode = this.getDeepContextNode(relativeContextNodeXri, false);\r\n+\t\tContextNode contextNode = this.getDeepContextNode(relativecontextNodeAddress, false);\r\n \t\tif (contextNode == null) return new EmptyIterator<ContextNode> ();\r\n \r\n \t\treturn contextNode.getContextNodes();\r\n@@ -238,9 +238,9 @@ public boolean select(ContextNode contextNode) {\n \t}\r\n \r\n \t@Override\r\n-\tpublic boolean containsContextNode(XDI3SubSegment contextNodeArcXri) {\r\n+\tpublic boolean containsContextNode(XDIArc contextNodeArc) {\r\n \r\n-\t\treturn this.getContextNode(contextNodeArcXri, false) != null;\r\n+\t\treturn this.getContextNode(contextNodeArc, false) != null;\r\n \t}\r\n \r\n \t@Override\r\n@@ -272,122 +272,122 @@ public long getAllContextNodeCount() {\n \t */\r\n \r\n \t@Override\r\n-\tpublic Relation setRelation(XDI3Segment arcXri, XDI3Segment targetContextNodeXri) {\r\n+\tpublic Relation setRelation(XDIAddress arc, XDIAddress targetContextNodeAddress) {\r\n \r\n \t\t// set the target context node\r\n \r\n-\t\tContextNode targetContextNode = this.setRelationSetTargetContextNode(targetContextNodeXri);\r\n+\t\tContextNode targetContextNode = this.setRelationSetTargetContextNode(targetContextNodeAddress);\r\n \r\n \t\t// set the relation\r\n \r\n-\t\tRelation relation = this.setRelation(arcXri, targetContextNode);\r\n+\t\tRelation relation = this.setRelation(arc, targetContextNode);\r\n \r\n \t\t// done\r\n \r\n \t\treturn relation;\r\n \t}\r\n \r\n \t@Override\r\n-\tpublic Relation setDeepRelation(XDI3Segment relativeContextNodeXri, XDI3Segment arcXri, XDI3Segment targetContextNodeXri) {\r\n+\tpublic Relation setDeepRelation(XDIAddress relativecontextNodeAddress, XDIAddress arc, XDIAddress targetContextNodeAddress) {\r\n \r\n-\t\tContextNode contextNode = this.setDeepContextNode(relativeContextNodeXri);\r\n+\t\tContextNode contextNode = this.setDeepContextNode(relativecontextNodeAddress);\r\n \t\tif (contextNode == null) return null;\r\n \r\n-\t\treturn contextNode.setRelation(arcXri, targetContextNodeXri);\r\n+\t\treturn contextNode.setRelation(arc, targetContextNodeAddress);\r\n \t}\r\n \r\n-\t//\tpublic Relation setRelation(XDI3Segment arcXri, ContextNode targetContextNode) {\r\n+\t//\tpublic Relation setRelation(XDIAddress arc, ContextNode targetContextNode) {\r\n \r\n \t@Override\r\n-\tpublic Relation setDeepRelation(XDI3Segment relativeContextNodeXri, XDI3Segment arcXri, ContextNode targetContextNode) {\r\n+\tpublic Relation setDeepRelation(XDIAddress relativecontextNodeAddress, XDIAddress arc, ContextNode targetContextNode) {\r\n \r\n-\t\tContextNode contextNode = this.setDeepContextNode(relativeContextNodeXri);\r\n+\t\tContextNode contextNode = this.setDeepContextNode(relativecontextNodeAddress);\r\n \t\tif (contextNode == null) return null;\r\n \r\n-\t\treturn contextNode.setRelation(arcXri, targetContextNode);\r\n+\t\treturn contextNode.setRelation(arc, targetContextNode);\r\n \t}\r\n \r\n \t@Override\r\n-\tpublic Relation getRelation(XDI3Segment arcXri, final XDI3Segment targetContextNodeXri) {\r\n+\tpublic Relation getRelation(XDIAddress arc, final XDIAddress targetContextNodeAddress) {\r\n \r\n-\t\tIterator<Relation> selectingIterator = new SelectingIterator<Relation> (this.getRelations(arcXri)) {\r\n+\t\tIterator<Relation> selectingIterator = new SelectingIterator<Relation> (this.getRelations(arc)) {\r\n \r\n \t\t\t@Override\r\n \t\t\tpublic boolean select(Relation relation) {\r\n \r\n-\t\t\t\treturn relation.getTargetContextNodeXri().equals(targetContextNodeXri);\r\n+\t\t\t\treturn relation.getTargetContextNodeAddress().equals(targetContextNodeAddress);\r\n \t\t\t}\r\n \t\t};\r\n \r\n \t\treturn new IteratorFirstItem<Relation> (selectingIterator).item();\r\n \t}\r\n \r\n \t@Override\r\n-\tpublic Relation getDeepRelation(XDI3Segment relativeContextNodeXri, XDI3Segment arcXri, XDI3Segment targetContextNodeXri) {\r\n+\tpublic Relation getDeepRelation(XDIAddress relativecontextNodeAddress, XDIAddress arc, XDIAddress targetContextNodeAddress) {\r\n \r\n-\t\tContextNode contextNode = this.getDeepContextNode(relativeContextNodeXri, false);\r\n+\t\tContextNode contextNode = this.getDeepContextNode(relativecontextNodeAddress, false);\r\n \t\tif (contextNode == null) return null;\r\n \r\n-\t\treturn contextNode.getRelation(arcXri, targetContextNodeXri);\r\n+\t\treturn contextNode.getRelation(arc, targetContextNodeAddress);\r\n \t}\r\n \r\n \t@Override\r\n-\tpublic Relation getRelation(XDI3Segment arcXri) {\r\n+\tpublic Relation getRelation(XDIAddress arc) {\r\n \r\n-\t\treturn new IteratorFirstItem<Relation> (this.getRelations(arcXri)).item();\r\n+\t\treturn new IteratorFirstItem<Relation> (this.getRelations(arc)).item();\r\n \t}\r\n \r\n \t@Override\r\n-\tpublic Relation getDeepRelation(XDI3Segment relativeContextNodeXri, XDI3Segment arcXri) {\r\n+\tpublic Relation getDeepRelation(XDIAddress relativecontextNodeAddress, XDIAddress arc) {\r\n \r\n-\t\tContextNode contextNode = this.getDeepContextNode(relativeContextNodeXri, false);\r\n+\t\tContextNode contextNode = this.getDeepContextNode(relativecontextNodeAddress, false);\r\n \t\tif (contextNode == null) return null;\r\n \r\n-\t\treturn contextNode.getRelation(arcXri);\r\n+\t\treturn contextNode.getRelation(arc);\r\n \t}\r\n \r\n \t@Override\r\n-\tpublic ReadOnlyIterator<Relation> getRelations(final XDI3Segment arcXri) {\r\n+\tpublic ReadOnlyIterator<Relation> getRelations(final XDIAddress arc) {\r\n \r\n \t\treturn new SelectingIterator<Relation> (this.getRelations()) {\r\n \r\n \t\t\t@Override\r\n \t\t\tpublic boolean select(Relation relation) {\r\n \r\n-\t\t\t\treturn relation.getArcXri().equals(arcXri);\r\n+\t\t\t\treturn relation.getArc().equals(arc);\r\n \t\t\t}\r\n \t\t};\r\n \t}\r\n \r\n \t@Override\r\n-\tpublic ReadOnlyIterator<Relation> getDeepRelations(XDI3Segment relativeContextNodeXri, XDI3Segment arcXri) {\r\n+\tpublic ReadOnlyIterator<Relation> getDeepRelations(XDIAddress relativecontextNodeAddress, XDIAddress arc) {\r\n \r\n-\t\tContextNode contextNode = this.getDeepContextNode(relativeContextNodeXri, false);\r\n+\t\tContextNode contextNode = this.getDeepContextNode(relativecontextNodeAddress, false);\r\n \t\tif (contextNode == null) return new EmptyIterator<Relation> ();\r\n \r\n-\t\treturn contextNode.getRelations(arcXri);\r\n+\t\treturn contextNode.getRelations(arc);\r\n \t}\r\n \r\n \t//\tpublic ReadOnlyIterator<Relation> getRelations();\r\n \r\n \t@Override\r\n-\tpublic ReadOnlyIterator<Relation> getDeepRelations(XDI3Segment relativeContextNodeXri) {\r\n+\tpublic ReadOnlyIterator<Relation> getDeepRelations(XDIAddress relativecontextNodeAddress) {\r\n \r\n-\t\tContextNode contextNode = this.getDeepContextNode(relativeContextNodeXri, false);\r\n+\t\tContextNode contextNode = this.getDeepContextNode(relativecontextNodeAddress, false);\r\n \t\tif (contextNode == null) return null;\r\n \r\n \t\treturn contextNode.getRelations();\r\n \t}\r\n \r\n \t@Override\r\n-\tpublic ReadOnlyIterator<Relation> getIncomingRelations(final XDI3Segment arcXri) {\r\n+\tpublic ReadOnlyIterator<Relation> getIncomingRelations(final XDIAddress arc) {\r\n \r\n \t\treturn new SelectingIterator<Relation> (this.getIncomingRelations()) {\r\n \r\n \t\t\t@Override\r\n \t\t\tpublic boolean select(Relation relation) {\r\n \r\n-\t\t\t\treturn relation.getArcXri().equals(arcXri);\r\n+\t\t\t\treturn relation.getArc().equals(arc);\r\n \t\t\t}\r\n \t\t};\r\n \t}\r\n@@ -447,15 +447,15 @@ public Iterator<Relation> descend(ContextNode contextNode) {\n \t}\r\n \r\n \t@Override\r\n-\tpublic boolean containsRelation(XDI3Segment arcXri, XDI3Segment targetContextNodeXri) {\r\n+\tpublic boolean containsRelation(XDIAddress arc, XDIAddress targetContextNodeAddress) {\r\n \r\n-\t\treturn this.getRelation(arcXri, targetContextNodeXri) != null;\r\n+\t\treturn this.getRelation(arc, targetContextNodeAddress) != null;\r\n \t}\r\n \r\n \t@Override\r\n-\tpublic boolean containsRelations(XDI3Segment arcXri) {\r\n+\tpublic boolean containsRelations(XDIAddress arc) {\r\n \r\n-\t\treturn this.getRelations(arcXri).hasNext();\r\n+\t\treturn this.getRelations(arc).hasNext();\r\n \t}\r\n \r\n \t@Override\r\n@@ -465,9 +465,9 @@ public boolean containsRelations() {\n \t}\r\n \r\n \t@Override\r\n-\tpublic boolean containsIncomingRelations(XDI3Segment arcXri) {\r\n+\tpublic boolean containsIncomingRelations(XDIAddress arc) {\r\n \r\n-\t\treturn this.getIncomingRelations(arcXri).hasNext();\r\n+\t\treturn this.getIncomingRelations(arc).hasNext();\r\n \t}\r\n \r\n \t@Override\r\n@@ -477,9 +477,9 @@ public boolean containsIncomingRelations() {\n \t}\r\n \r\n \t@Override\r\n-\tpublic void delRelations(XDI3Segment arcXri) {\r\n+\tpublic void delRelations(XDIAddress arc) {\r\n \r\n-\t\tfor (Relation relation : this.getRelations(arcXri)) relation.delete();\r\n+\t\tfor (Relation relation : this.getRelations(arc)) relation.delete();\r\n \t}\r\n \r\n \t@Override\r\n@@ -495,9 +495,9 @@ public void delIncomingRelations() {\n \t}\r\n \r\n \t@Override\r\n-\tpublic long getRelationCount(XDI3Segment arcXri) {\r\n+\tpublic long getRelationCount(XDIAddress arc) {\r\n \r\n-\t\treturn new IteratorCounter(this.getRelations(arcXri)).count();\r\n+\t\treturn new IteratorCounter(this.getRelations(arc)).count();\r\n \t}\r\n \r\n \t@Override\r\n@@ -537,30 +537,30 @@ public Literal setLiteralBoolean(Boolean literalData) {\n \t}\r\n \r\n \t@Override\r\n-\tpublic Literal setDeepLiteral(XDI3Segment relativeContextNodeXri, Object literalData) {\r\n+\tpublic Literal setDeepLiteral(XDIAddress relativecontextNodeAddress, Object literalData) {\r\n \r\n-\t\tContextNode contextNode = this.setDeepContextNode(relativeContextNodeXri);\r\n+\t\tContextNode contextNode = this.setDeepContextNode(relativecontextNodeAddress);\r\n \t\tif (contextNode == null) return null;\r\n \r\n \t\treturn contextNode.setLiteral(literalData);\r\n \t}\r\n \r\n \t@Override\r\n-\tpublic Literal setDeepLiteralString(XDI3Segment relativeContextNodeXri, String literalData) {\r\n+\tpublic Literal setDeepLiteralString(XDIAddress relativecontextNodeAddress, String literalData) {\r\n \r\n-\t\treturn this.setDeepLiteral(relativeContextNodeXri, literalData);\r\n+\t\treturn this.setDeepLiteral(relativecontextNodeAddress, literalData);\r\n \t}\r\n \r\n \t@Override\r\n-\tpublic Literal setDeepLiteralNumber(XDI3Segment relativeContextNodeXri, Double literalData) {\r\n+\tpublic Literal setDeepLiteralNumber(XDIAddress relativecontextNodeAddress, Double literalData) {\r\n \r\n-\t\treturn this.setDeepLiteral(relativeContextNodeXri, literalData);\r\n+\t\treturn this.setDeepLiteral(relativecontextNodeAddress, literalData);\r\n \t}\r\n \r\n \t@Override\r\n-\tpublic Literal setDeepLiteralBoolean(XDI3Segment relativeContextNodeXri, Boolean literalData) {\r\n+\tpublic Literal setDeepLiteralBoolean(XDIAddress relativecontextNodeAddress, Boolean literalData) {\r\n \r\n-\t\treturn this.setDeepLiteral(relativeContextNodeXri, literalData);\r\n+\t\treturn this.setDeepLiteral(relativecontextNodeAddress, literalData);\r\n \t}\r\n \r\n \t@Override\r\n@@ -593,38 +593,38 @@ public Literal getLiteralBoolean(Boolean literalData) {\n \t}\r\n \r\n \t@Override\r\n-\tpublic Literal getDeepLiteral(XDI3Segment relativeContextNodeXri, Object literalData) {\r\n+\tpublic Literal getDeepLiteral(XDIAddress relativecontextNodeAddress, Object literalData) {\r\n \r\n-\t\tContextNode contextNode = this.getDeepContextNode(relativeContextNodeXri, false);\r\n+\t\tContextNode contextNode = this.getDeepContextNode(relativecontextNodeAddress, false);\r\n \t\tif (contextNode == null) return null;\r\n \r\n \t\treturn contextNode.getLiteral(literalData);\r\n \t}\r\n \r\n \t@Override\r\n-\tpublic Literal getDeepLiteralString(XDI3Segment relativeContextNodeXri, String literalData) {\r\n+\tpublic Literal getDeepLiteralString(XDIAddress relativecontextNodeAddress, String literalData) {\r\n \r\n-\t\treturn this.getDeepLiteral(relativeContextNodeXri, literalData);\r\n+\t\treturn this.getDeepLiteral(relativecontextNodeAddress, literalData);\r\n \t}\r\n \r\n \t@Override\r\n-\tpublic Literal getDeepLiteralNumber(XDI3Segment relativeContextNodeXri, Double literalData) {\r\n+\tpublic Literal getDeepLiteralNumber(XDIAddress relativecontextNodeAddress, Double literalData) {\r\n \r\n-\t\treturn this.getDeepLiteral(relativeContextNodeXri, literalData);\r\n+\t\treturn this.getDeepLiteral(relativecontextNodeAddress, literalData);\r\n \t}\r\n \r\n \t@Override\r\n-\tpublic Literal getDeepLiteralBoolean(XDI3Segment relativeContextNodeXri, Boolean literalData) {\r\n+\tpublic Literal getDeepLiteralBoolean(XDIAddress relativecontextNodeAddress, Boolean literalData) {\r\n \r\n-\t\treturn this.getDeepLiteral(relativeContextNodeXri, literalData);\r\n+\t\treturn this.getDeepLiteral(relativecontextNodeAddress, literalData);\r\n \t}\r\n \r\n \t//\tpublic Literal getLiteral();\r\n \r\n \t@Override\r\n-\tpublic Literal getDeepLiteral(XDI3Segment relativeContextNodeXri) {\r\n+\tpublic Literal getDeepLiteral(XDIAddress relativecontextNodeAddress) {\r\n \r\n-\t\tContextNode contextNode = this.getDeepContextNode(relativeContextNodeXri, false);\r\n+\t\tContextNode contextNode = this.getDeepContextNode(relativecontextNodeAddress, false);\r\n \t\tif (contextNode == null) return null;\r\n \r\n \t\treturn contextNode.getLiteral();\r\n@@ -704,23 +704,23 @@ public ContextNodeStatement getStatement() {\n \t}\r\n \r\n \t@Override\r\n-\tpublic Statement setStatement(XDI3Statement statementXri) {\r\n+\tpublic Statement setStatement(XDIStatement statementXri) {\r\n \r\n \t\t// set the statement\r\n \r\n \t\tif (statementXri.isContextNodeStatement()) {\r\n \r\n-\t\t\tContextNode contextNode = this.setDeepContextNode(statementXri.getTargetContextNodeXri());\r\n+\t\t\tContextNode contextNode = this.setDeepContextNode(statementXri.getTargetContextNodeAddress());\r\n \r\n \t\t\treturn contextNode.getStatement();\r\n \t\t} else if (statementXri.isRelationStatement()) {\r\n \r\n-\t\t\tRelation relation = this.setDeepRelation(statementXri.getContextNodeXri(), statementXri.getRelationArcXri(), statementXri.getTargetContextNodeXri());\r\n+\t\t\tRelation relation = this.setDeepRelation(statementXri.getContextNodeAddress(), statementXri.getRelationAddress(), statementXri.getTargetContextNodeAddress());\r\n \r\n \t\t\treturn relation.getStatement();\r\n \t\t} else if (statementXri.isLiteralStatement()) {\r\n \r\n-\t\t\tLiteral literal = this.setDeepLiteral(statementXri.getContextNodeXri(), statementXri.getLiteralData());\r\n+\t\t\tLiteral literal = this.setDeepLiteral(statementXri.getContextNodeAddress(), statementXri.getLiteralData());\r\n \r\n \t\t\treturn literal.getStatement();\r\n \t\t} else {\r\n@@ -730,19 +730,19 @@ public Statement setStatement(XDI3Statement statementXri) {\n \t}\r\n \r\n \t@Override\r\n-\tpublic Statement getStatement(XDI3Statement statementXri) {\r\n+\tpublic Statement getStatement(XDIStatement statementXri) {\r\n \r\n \t\tContextNode baseContextNode = this.getDeepContextNode(statementXri.getSubject(), false);\r\n \t\tif (baseContextNode == null) return null;\r\n \r\n \t\tif (statementXri.isContextNodeStatement()) {\r\n \r\n-\t\t\tContextNode contextNode = baseContextNode.getContextNode(statementXri.getContextNodeArcXri(), false);\r\n+\t\t\tContextNode contextNode = baseContextNode.getContextNode(statementXri.getContextNodeArc(), false);\r\n \r\n \t\t\treturn contextNode == null ? null : contextNode.getStatement();\r\n \t\t} else if (statementXri.isRelationStatement()) {\r\n \r\n-\t\t\tRelation relation = baseContextNode.getRelation(statementXri.getRelationArcXri(), statementXri.getTargetContextNodeXri());\r\n+\t\t\tRelation relation = baseContextNode.getRelation(statementXri.getRelationAddress(), statementXri.getTargetContextNodeAddress());\r\n \r\n \t\t\treturn relation == null ? null : relation.getStatement();\r\n \t\t} else if (statementXri.isLiteralStatement()) {\r\n@@ -804,7 +804,7 @@ public Statement map(Relation relation) {\n \t}\r\n \r\n \t@Override\r\n-\tpublic boolean containsStatement(XDI3Statement statementXri) {\r\n+\tpublic boolean containsStatement(XDIStatement statementXri) {\r\n \r\n \t\treturn this.getStatement(statementXri) != null;\r\n \t}\r\n@@ -823,47 +823,47 @@ public long getAllStatementCount() {\n \t * Checks if a context node can be created.\r\n \t * Throws an exception, if the context node cannot be created.\r\n \t */\r\n-\tprotected void setContextNodeCheckValid(XDI3SubSegment arcXri) throws Xdi2GraphException {\r\n+\tprotected void setContextNodeCheckValid(XDIArc arc) throws Xdi2GraphException {\r\n \r\n-\t\tif (arcXri == null) throw new NullPointerException();\r\n+\t\tif (arc == null) throw new NullPointerException();\r\n \r\n-\t\tif (XDIConstants.XRI_S_CONTEXT.equals(arcXri)) throw new Xdi2GraphException(\"Invalid context node arc XRI: \" + arcXri);\r\n+\t\tif (XDIConstants.XDI_ADD_CONTEXT.equals(arc)) throw new Xdi2GraphException(\"Invalid context node arc: \" + arc);\r\n \r\n-\t\tif (this.containsRelations(XDIDictionaryConstants.XRI_S_REF)) throw new Xdi2GraphException(\"Cannot add \" + arcXri + \" context node to context node \" + this.getXri() + \" containing a \" + XDIDictionaryConstants.XRI_S_REF + \" relation.\");\r\n-\t\tif (this.containsRelations(XDIDictionaryConstants.XRI_S_REP)) throw new Xdi2GraphException(\"Cannot add \" + arcXri + \" context node to context node \" + this.getXri() + \" containing a \" + XDIDictionaryConstants.XRI_S_REP + \" relation.\");\r\n+\t\tif (this.containsRelations(XDIDictionaryConstants.XDI_ADD_REF)) throw new Xdi2GraphException(\"Cannot add \" + arc + \" context node to context node \" + this.getAddress() + \" containing a \" + XDIDictionaryConstants.XDI_ADD_REF + \" relation.\");\r\n+\t\tif (this.containsRelations(XDIDictionaryConstants.XDI_ADD_REP)) throw new Xdi2GraphException(\"Cannot add \" + arc + \" context node to context node \" + this.getAddress() + \" containing a \" + XDIDictionaryConstants.XDI_ADD_REP + \" relation.\");\r\n \r\n-\t\tContextNode tempContextNode = new BasicContextNode(this.getGraph(), this, arcXri, null, null, null);\r\n-\t\tif (! XdiAbstractContext.isValid(tempContextNode)) throw new Xdi2GraphException(\"Invalid subgraph: \" + arcXri + \" under subgraph \" + this.getXri());\r\n+\t\tContextNode tempContextNode = new BasicContextNode(this.getGraph(), this, arc, null, null, null);\r\n+\t\tif (! XdiAbstractContext.isValid(tempContextNode)) throw new Xdi2GraphException(\"Invalid subgraph: \" + arc + \" under subgraph \" + this.getAddress());\r\n \t}\r\n \r\n \t/**\r\n \t * Checks if a relation can be created.\r\n \t * Throws an exception, if the relation cannot be created.\r\n \t */\r\n-\tprotected void setRelationCheckValid(XDI3Segment arcXri, XDI3Segment targetContextNodeXri) throws Xdi2GraphException {\r\n+\tprotected void setRelationCheckValid(XDIAddress arc, XDIAddress targetContextNodeAddress) throws Xdi2GraphException {\r\n \r\n-\t\tif (arcXri == null) throw new NullPointerException();\r\n-\t\tif (targetContextNodeXri == null) throw new NullPointerException();\r\n+\t\tif (arc == null) throw new NullPointerException();\r\n+\t\tif (targetContextNodeAddress == null) throw new NullPointerException();\r\n \r\n-\t\tif (XDIConstants.XRI_S_CONTEXT.equals(arcXri)) throw new Xdi2GraphException(\"Invalid relation arc XRI: \" + arcXri);\r\n-\t\tif (XDIConstants.XRI_S_LITERAL.equals(arcXri)) throw new Xdi2GraphException(\"Invalid relation arc XRI: \" + arcXri);\r\n+\t\tif (XDIConstants.XDI_ADD_CONTEXT.equals(arc)) throw new Xdi2GraphException(\"Invalid relation arc: \" + arc);\r\n+\t\tif (XDIConstants.XDI_ADD_LITERAL.equals(arc)) throw new Xdi2GraphException(\"Invalid relation arc: \" + arc);\r\n \r\n \t\tif (! this.isEmpty()) {\r\n \r\n-\t\t\tif (XDIDictionaryConstants.XRI_S_REF.equals(arcXri)) {\r\n+\t\t\tif (XDIDictionaryConstants.XDI_ADD_REF.equals(arc)) {\r\n \r\n-\t\t\t\tif (! this.containsRelation(XDIDictionaryConstants.XRI_S_REF, targetContextNodeXri)) throw new Xdi2GraphException(\"Cannot add \" + arcXri + \"/\" + targetContextNodeXri + \" relation to non-empty context node \" + this.getXri() + \".\");\r\n+\t\t\t\tif (! this.containsRelation(XDIDictionaryConstants.XDI_ADD_REF, targetContextNodeAddress)) throw new Xdi2GraphException(\"Cannot add \" + arc + \"/\" + targetContextNodeAddress + \" relation to non-empty context node \" + this.getAddress() + \".\");\r\n \t\t\t} else {\r\n \r\n-\t\t\t\tif (this.containsRelations(XDIDictionaryConstants.XRI_S_REF)) throw new Xdi2GraphException(\"Cannot add \" + arcXri + \"/\" + targetContextNodeXri + \" relation to context node \" + this.getXri() + \", which already contains a $ref.\");\r\n+\t\t\t\tif (this.containsRelations(XDIDictionaryConstants.XDI_ADD_REF)) throw new Xdi2GraphException(\"Cannot add \" + arc + \"/\" + targetContextNodeAddress + \" relation to context node \" + this.getAddress() + \", which already contains a $ref.\");\r\n \t\t\t}\r\n \r\n-\t\t\tif (XDIDictionaryConstants.XRI_S_REP.equals(arcXri)) {\r\n+\t\t\tif (XDIDictionaryConstants.XDI_ADD_REP.equals(arc)) {\r\n \r\n-\t\t\t\tif (! this.containsRelation(XDIDictionaryConstants.XRI_S_REP, targetContextNodeXri)) throw new Xdi2GraphException(\"Cannot add \" + arcXri + \"/\" + targetContextNodeXri + \" relation to non-empty context node \" + this.getXri() + \".\");\r\n+\t\t\t\tif (! this.containsRelation(XDIDictionaryConstants.XDI_ADD_REP, targetContextNodeAddress)) throw new Xdi2GraphException(\"Cannot add \" + arc + \"/\" + targetContextNodeAddress + \" relation to non-empty context node \" + this.getAddress() + \".\");\r\n \t\t\t} else {\r\n \r\n-\t\t\t\tif (this.containsRelations(XDIDictionaryConstants.XRI_S_REP)) throw new Xdi2GraphException(\"Cannot add \" + arcXri + \"/\" + targetContextNodeXri + \" relation to context node \" + this.getXri() + \", which already contains a $rep.\");\r\n+\t\t\t\tif (this.containsRelations(XDIDictionaryConstants.XDI_ADD_REP)) throw new Xdi2GraphException(\"Cannot add \" + arc + \"/\" + targetContextNodeAddress + \" relation to context node \" + this.getAddress() + \", which already contains a $rep.\");\r\n \t\t\t}\r\n \t\t}\r\n \t}\r\n@@ -878,27 +878,27 @@ protected void setLiteralCheckValid(Object literalData) throws Xdi2GraphExceptio\n \r\n \t\tif (! AbstractLiteral.isValidLiteralData(literalData)) throw new IllegalArgumentException(\"Invalid literal data: \" + literalData.getClass().getSimpleName());\r\n \r\n-\t\tif (this.containsRelations(XDIDictionaryConstants.XRI_S_REF)) throw new Xdi2GraphException(\"Cannot add literal to context node \" + this.getXri() + \" containing a \" + XDIDictionaryConstants.XRI_S_REF + \" relation.\");\r\n-\t\tif (this.containsRelations(XDIDictionaryConstants.XRI_S_REP)) throw new Xdi2GraphException(\"Cannot add literal to context node \" + this.getXri() + \" containing a \" + XDIDictionaryConstants.XRI_S_REP + \" relation.\");\r\n+\t\tif (this.containsRelations(XDIDictionaryConstants.XDI_ADD_REF)) throw new Xdi2GraphException(\"Cannot add literal to context node \" + this.getAddress() + \" containing a \" + XDIDictionaryConstants.XDI_ADD_REF + \" relation.\");\r\n+\t\tif (this.containsRelations(XDIDictionaryConstants.XDI_ADD_REP)) throw new Xdi2GraphException(\"Cannot add literal to context node \" + this.getAddress() + \" containing a \" + XDIDictionaryConstants.XDI_ADD_REP + \" relation.\");\r\n \t}\r\n \r\n \t/**\r\n \t * When a context node is created, check if the inner root subject and predicate have to be created too.\r\n \t */\r\n-\tprotected void setContextNodeSetInnerRoot(XDI3SubSegment arcXri, ContextNode contextNode) {\r\n+\tprotected void setContextNodeSetInnerRoot(XDIArc arc, ContextNode contextNode) {\r\n \r\n-\t\tif (XdiInnerRoot.isInnerRootArcXri(arcXri)) {\r\n+\t\tif (XdiInnerRoot.isInnerRootarc(arc)) {\r\n \r\n-\t\t\tthis.setDeepContextNode(XdiInnerRoot.getSubjectOfInnerRootXri(arcXri)).setRelation(XdiInnerRoot.getPredicateOfInnerRootXri(arcXri), contextNode);\r\n+\t\t\tthis.setDeepContextNode(XdiInnerRoot.getSubjectOfInnerRootXri(arc)).setRelation(XdiInnerRoot.getPredicateOfInnerRootXri(arc), contextNode);\r\n \t\t}\r\n \t}\r\n \r\n \t/**\r\n \t * When a relation is created, check if the target context node has to be created too.\r\n \t */\r\n-\tprotected ContextNode setRelationSetTargetContextNode(XDI3Segment targetContextNodeXri) {\r\n+\tprotected ContextNode setRelationSetTargetContextNode(XDIAddress targetContextNodeAddress) {\r\n \r\n-\t\treturn this.getGraph().setDeepContextNode(targetContextNodeXri);\r\n+\t\treturn this.getGraph().setDeepContextNode(targetContextNodeAddress);\r\n \t}\r\n \r\n \t/**\r\n@@ -910,7 +910,7 @@ protected void delContextNodeDelAllInnerRoots() {\n \r\n \t\t\tAbstractContextNode contextNode = ((AbstractContextNode) relation.getContextNode());\r\n \r\n-\t\t\tcontextNode.delRelationDelInnerRoot(relation.getArcXri(), relation.getTargetContextNodeXri());\r\n+\t\t\tcontextNode.delRelationDelInnerRoot(relation.getArc(), relation.getTargetContextNodeAddress());\r\n \t\t}\r\n \t}\r\n \r\n@@ -933,11 +933,11 @@ protected void delContextNodeDelAllIncomingRelations() {\n \t/**\r\n \t * When a relation is deleted, its inner root has to be deleted too.\r\n \t */\r\n-\tprotected void delRelationDelInnerRoot(XDI3Segment arcXri, XDI3Segment targetContextNodeXri) {\r\n+\tprotected void delRelationDelInnerRoot(XDIAddress arc, XDIAddress targetContextNodeAddress) {\r\n \r\n-\t\tif (XdiInnerRoot.createInnerRootArcXri(this.getXri(), arcXri).equals(targetContextNodeXri)) {\r\n+\t\tif (XdiInnerRoot.createInnerRootarc(this.getAddress(), arc).equals(targetContextNodeAddress)) {\r\n \r\n-\t\t\tthis.getGraph().getDeepContextNode(targetContextNodeXri, false).delete();\r\n+\t\t\tthis.getGraph().getDeepContextNode(targetContextNodeAddress, false).delete();\r\n \t\t}\r\n \t}\r\n \r\n@@ -948,7 +948,7 @@ protected void delRelationDelInnerRoot(XDI3Segment arcXri, XDI3Segment targetCon\n \t@Override\r\n \tpublic String toString() {\r\n \r\n-\t\treturn this.getXri().toString();\r\n+\t\treturn this.getAddress().toString();\r\n \t}\r\n \r\n \t@Override\r\n@@ -961,15 +961,15 @@ public boolean equals(Object object) {\n \r\n \t\t// two context nodes are equal if their XRIs are equal\r\n \r\n-\t\treturn this.getXri().equals(other.getXri());\r\n+\t\treturn this.getAddress().equals(other.getAddress());\r\n \t}\r\n \r\n \t@Override\r\n \tpublic int hashCode() {\r\n \r\n \t\tint hashCode = 1;\r\n \r\n-\t\thashCode = (hashCode * 31) + this.getXri().hashCode();\r\n+\t\thashCode = (hashCode * 31) + this.getAddress().hashCode();\r\n \r\n \t\treturn hashCode;\r\n \t}\r\n@@ -979,7 +979,7 @@ public int compareTo(ContextNode other) {\n \r\n \t\tif (other == null || other == this) return 0;\r\n \r\n-\t\treturn this.getXri().compareTo(other.getXri());\r\n+\t\treturn this.getAddress().compareTo(other.getAddress());\r\n \t}\r\n \r\n \t/**\r\n@@ -991,15 +991,15 @@ public int compareTo(ContextNode other) {\n \t\tprivate static final long serialVersionUID = 5008355182847367563L;\r\n \r\n \t\t@Override\r\n-\t\tpublic XDI3Segment getSubject() {\r\n+\t\tpublic XDIAddress getSubject() {\r\n \r\n-\t\t\treturn AbstractContextNode.this.getContextNode().getXri();\r\n+\t\t\treturn AbstractContextNode.this.getContextNode().getAddress();\r\n \t\t}\r\n \r\n \t\t@Override\r\n-\t\tpublic XDI3SubSegment getObject() {\r\n+\t\tpublic XDIArc getObject() {\r\n \r\n-\t\t\treturn AbstractContextNode.this.getArcXri();\r\n+\t\t\treturn AbstractContextNode.this.getArc();\r\n \t\t}\r\n \r\n \t\t@Override\r", "raw_url": "https://github.com/projectdanube/xdi2/raw/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Fimpl%2FAbstractContextNode.java", "sha": "67feec405f736503d254c2cba8422b38687c854b", "status": "modified" }, { "additions": 44, "blob_url": "https://github.com/projectdanube/xdi2/blob/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Fimpl%2FAbstractGraph.java", "changes": 88, "contents_url": "https://api.github.com/repos/projectdanube/xdi2/contents/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Fimpl%2FAbstractGraph.java?ref=0ca7982fec30c2bb8204efbbea61428a643d2e9c", "deletions": 44, "filename": "core/src/main/java/xdi2/core/impl/AbstractGraph.java", "new_code": "import xdi2.core.syntax.XDIAddress;\r\nimport xdi2.core.syntax.XDIStatement;\r\n\tpublic ContextNode setDeepContextNode(XDIAddress contextNodeAddress) {\r\n\t\treturn this.getRootContextNode(false).setDeepContextNode(contextNodeAddress);\r\n\tpublic ContextNode getDeepContextNode(XDIAddress contextNodeAddress, boolean subgraph) {\r\n\t\tif (XDIConstants.XDI_ADD_ROOT.equals(contextNodeAddress)) {\r\n\t\t\treturn this.getRootContextNode(false).getDeepContextNode(contextNodeAddress, subgraph);\r\n\tpublic ContextNode getDeepContextNode(XDIAddress contextNodeAddress) {\r\n\t\treturn this.getRootContextNode(false).getDeepContextNode(contextNodeAddress);\r\n\tpublic ReadOnlyIterator<ContextNode> getDeepContextNodes(XDIAddress contextNodeAddress) {\r\n\t\treturn this.getRootContextNode(false).getDeepContextNodes(contextNodeAddress);\r\n\tpublic Relation setDeepRelation(XDIAddress contextNodeAddress, XDIAddress arc, XDIAddress targetContextNodeAddress) {\r\n\t\treturn this.getRootContextNode(false).setDeepRelation(contextNodeAddress, arc, targetContextNodeAddress);\r\n\tpublic Relation setDeepRelation(XDIAddress contextNodeAddress, XDIAddress arc, ContextNode targetContextNode) {\r\n\t\treturn this.getRootContextNode(false).setDeepRelation(contextNodeAddress, arc, targetContextNode);\r\n\tpublic Relation getDeepRelation(XDIAddress contextNodeAddress, XDIAddress arc, XDIAddress targetContextNodeAddress) {\r\n\t\treturn this.getRootContextNode(false).getDeepRelation(contextNodeAddress, arc, targetContextNodeAddress);\r\n\tpublic Relation getDeepRelation(XDIAddress contextNodeAddress, XDIAddress arc) {\r\n\t\treturn this.getRootContextNode(false).getDeepRelation(contextNodeAddress, arc);\r\n\tpublic ReadOnlyIterator<Relation> getDeepRelations(XDIAddress contextNodeAddress, XDIAddress arc) {\r\n\t\treturn this.getRootContextNode(false).getDeepRelations(contextNodeAddress, arc);\r\n\tpublic ReadOnlyIterator<Relation> getDeepRelations(XDIAddress contextNodeAddress) {\r\n\t\treturn this.getRootContextNode(false).getDeepRelations(contextNodeAddress);\r\n\tpublic Literal setDeepLiteral(XDIAddress contextNodeAddress, Object literalData) {\r\n\t\treturn this.getRootContextNode(false).setDeepLiteral(contextNodeAddress, literalData);\r\n\tpublic Literal setDeepLiteralString(XDIAddress contextNodeAddress, String literalData) {\r\n\t\treturn this.getRootContextNode(false).setDeepLiteralString(contextNodeAddress, literalData);\r\n\tpublic Literal setDeepLiteralNumber(XDIAddress contextNodeAddress, Double literalData) {\r\n\t\treturn this.getRootContextNode(false).setDeepLiteralNumber(contextNodeAddress, literalData);\r\n\tpublic Literal setDeepLiteralBoolean(XDIAddress contextNodeAddress, Boolean literalData) {\r\n\t\treturn this.getRootContextNode(false).setDeepLiteralBoolean(contextNodeAddress, literalData);\r\n\tpublic Literal getDeepLiteral(XDIAddress contextNodeAddress, Object literalData) {\r\n\t\treturn this.getRootContextNode(false).getDeepLiteral(contextNodeAddress, literalData);\r\n\tpublic Literal getDeepLiteralString(XDIAddress contextNodeAddress, String literalData) {\r\n\t\treturn this.getRootContextNode(false).getDeepLiteralString(contextNodeAddress, literalData);\r\n\tpublic Literal getDeepLiteralNumber(XDIAddress contextNodeAddress, Double literalData) {\r\n\t\treturn this.getRootContextNode(false).getDeepLiteralNumber(contextNodeAddress, literalData);\r\n\tpublic Literal getDeepLiteralBoolean(XDIAddress contextNodeAddress, Boolean literalData) {\r\n\t\treturn this.getRootContextNode(false).getDeepLiteralBoolean(contextNodeAddress, literalData);\r\n\tpublic Literal getDeepLiteral(XDIAddress contextNodeAddress) {\r\n\t\treturn this.getRootContextNode(false).getDeepLiteral(contextNodeAddress);\r\n\tpublic Statement setStatement(XDIStatement statementXri) {\r\n\tpublic Statement getStatement(XDIStatement statementXri) {\r\n\tpublic boolean containsStatement(XDIStatement statementXri) {\r", "new_methods": [], "old_code": "import xdi2.core.xri3.XDI3Segment;\r\nimport xdi2.core.xri3.XDI3Statement;\r\n\tpublic ContextNode setDeepContextNode(XDI3Segment contextNodeXri) {\r\n\t\treturn this.getRootContextNode(false).setDeepContextNode(contextNodeXri);\r\n\tpublic ContextNode getDeepContextNode(XDI3Segment contextNodeXri, boolean subgraph) {\r\n\t\tif (XDIConstants.XRI_S_ROOT.equals(contextNodeXri)) {\r\n\t\t\treturn this.getRootContextNode(false).getDeepContextNode(contextNodeXri, subgraph);\r\n\tpublic ContextNode getDeepContextNode(XDI3Segment contextNodeXri) {\r\n\t\treturn this.getRootContextNode(false).getDeepContextNode(contextNodeXri);\r\n\tpublic ReadOnlyIterator<ContextNode> getDeepContextNodes(XDI3Segment contextNodeXri) {\r\n\t\treturn this.getRootContextNode(false).getDeepContextNodes(contextNodeXri);\r\n\tpublic Relation setDeepRelation(XDI3Segment contextNodeXri, XDI3Segment arcXri, XDI3Segment targetContextNodeXri) {\r\n\t\treturn this.getRootContextNode(false).setDeepRelation(contextNodeXri, arcXri, targetContextNodeXri);\r\n\tpublic Relation setDeepRelation(XDI3Segment contextNodeXri, XDI3Segment arcXri, ContextNode targetContextNode) {\r\n\t\treturn this.getRootContextNode(false).setDeepRelation(contextNodeXri, arcXri, targetContextNode);\r\n\tpublic Relation getDeepRelation(XDI3Segment contextNodeXri, XDI3Segment arcXri, XDI3Segment targetContextNodeXri) {\r\n\t\treturn this.getRootContextNode(false).getDeepRelation(contextNodeXri, arcXri, targetContextNodeXri);\r\n\tpublic Relation getDeepRelation(XDI3Segment contextNodeXri, XDI3Segment arcXri) {\r\n\t\treturn this.getRootContextNode(false).getDeepRelation(contextNodeXri, arcXri);\r\n\tpublic ReadOnlyIterator<Relation> getDeepRelations(XDI3Segment contextNodeXri, XDI3Segment arcXri) {\r\n\t\treturn this.getRootContextNode(false).getDeepRelations(contextNodeXri, arcXri);\r\n\tpublic ReadOnlyIterator<Relation> getDeepRelations(XDI3Segment contextNodeXri) {\r\n\t\treturn this.getRootContextNode(false).getDeepRelations(contextNodeXri);\r\n\tpublic Literal setDeepLiteral(XDI3Segment contextNodeXri, Object literalData) {\r\n\t\treturn this.getRootContextNode(false).setDeepLiteral(contextNodeXri, literalData);\r\n\tpublic Literal setDeepLiteralString(XDI3Segment contextNodeXri, String literalData) {\r\n\t\treturn this.getRootContextNode(false).setDeepLiteralString(contextNodeXri, literalData);\r\n\tpublic Literal setDeepLiteralNumber(XDI3Segment contextNodeXri, Double literalData) {\r\n\t\treturn this.getRootContextNode(false).setDeepLiteralNumber(contextNodeXri, literalData);\r\n\tpublic Literal setDeepLiteralBoolean(XDI3Segment contextNodeXri, Boolean literalData) {\r\n\t\treturn this.getRootContextNode(false).setDeepLiteralBoolean(contextNodeXri, literalData);\r\n\tpublic Literal getDeepLiteral(XDI3Segment contextNodeXri, Object literalData) {\r\n\t\treturn this.getRootContextNode(false).getDeepLiteral(contextNodeXri, literalData);\r\n\tpublic Literal getDeepLiteralString(XDI3Segment contextNodeXri, String literalData) {\r\n\t\treturn this.getRootContextNode(false).getDeepLiteralString(contextNodeXri, literalData);\r\n\tpublic Literal getDeepLiteralNumber(XDI3Segment contextNodeXri, Double literalData) {\r\n\t\treturn this.getRootContextNode(false).getDeepLiteralNumber(contextNodeXri, literalData);\r\n\tpublic Literal getDeepLiteralBoolean(XDI3Segment contextNodeXri, Boolean literalData) {\r\n\t\treturn this.getRootContextNode(false).getDeepLiteralBoolean(contextNodeXri, literalData);\r\n\tpublic Literal getDeepLiteral(XDI3Segment contextNodeXri) {\r\n\t\treturn this.getRootContextNode(false).getDeepLiteral(contextNodeXri);\r\n\tpublic Statement setStatement(XDI3Statement statementXri) {\r\n\tpublic Statement getStatement(XDI3Statement statementXri) {\r\n\tpublic boolean containsStatement(XDI3Statement statementXri) {\r", "old_methods": [], "patch": "@@ -15,9 +15,9 @@\n import xdi2.core.io.MimeType;\r\n import xdi2.core.io.XDIWriter;\r\n import xdi2.core.io.XDIWriterRegistry;\r\n+import xdi2.core.syntax.XDIAddress;\r\n+import xdi2.core.syntax.XDIStatement;\r\n import xdi2.core.util.iterators.ReadOnlyIterator;\r\n-import xdi2.core.xri3.XDI3Segment;\r\n-import xdi2.core.xri3.XDI3Statement;\r\n \r\n public abstract class AbstractGraph implements Graph {\r\n \r\n@@ -111,143 +111,143 @@ public String toString(MimeType mimeType) {\n \t */\r\n \r\n \t@Override\r\n-\tpublic ContextNode setDeepContextNode(XDI3Segment contextNodeXri) {\r\n+\tpublic ContextNode setDeepContextNode(XDIAddress contextNodeAddress) {\r\n \r\n-\t\treturn this.getRootContextNode(false).setDeepContextNode(contextNodeXri);\r\n+\t\treturn this.getRootContextNode(false).setDeepContextNode(contextNodeAddress);\r\n \t}\r\n \r\n \t@Override\r\n-\tpublic ContextNode getDeepContextNode(XDI3Segment contextNodeXri, boolean subgraph) {\r\n+\tpublic ContextNode getDeepContextNode(XDIAddress contextNodeAddress, boolean subgraph) {\r\n \r\n-\t\tif (XDIConstants.XRI_S_ROOT.equals(contextNodeXri)) {\r\n+\t\tif (XDIConstants.XDI_ADD_ROOT.equals(contextNodeAddress)) {\r\n \r\n \t\t\treturn this.getRootContextNode(subgraph);\r\n \t\t} else {\r\n \r\n-\t\t\treturn this.getRootContextNode(false).getDeepContextNode(contextNodeXri, subgraph);\r\n+\t\t\treturn this.getRootContextNode(false).getDeepContextNode(contextNodeAddress, subgraph);\r\n \t\t}\r\n \t}\r\n \r\n \t@Override\r\n-\tpublic ContextNode getDeepContextNode(XDI3Segment contextNodeXri) {\r\n+\tpublic ContextNode getDeepContextNode(XDIAddress contextNodeAddress) {\r\n \r\n-\t\treturn this.getRootContextNode(false).getDeepContextNode(contextNodeXri);\r\n+\t\treturn this.getRootContextNode(false).getDeepContextNode(contextNodeAddress);\r\n \t}\r\n \r\n \t@Override\r\n-\tpublic ReadOnlyIterator<ContextNode> getDeepContextNodes(XDI3Segment contextNodeXri) {\r\n+\tpublic ReadOnlyIterator<ContextNode> getDeepContextNodes(XDIAddress contextNodeAddress) {\r\n \r\n-\t\treturn this.getRootContextNode(false).getDeepContextNodes(contextNodeXri);\r\n+\t\treturn this.getRootContextNode(false).getDeepContextNodes(contextNodeAddress);\r\n \t}\r\n \r\n \t@Override\r\n-\tpublic Relation setDeepRelation(XDI3Segment contextNodeXri, XDI3Segment arcXri, XDI3Segment targetContextNodeXri) {\r\n+\tpublic Relation setDeepRelation(XDIAddress contextNodeAddress, XDIAddress arc, XDIAddress targetContextNodeAddress) {\r\n \r\n-\t\treturn this.getRootContextNode(false).setDeepRelation(contextNodeXri, arcXri, targetContextNodeXri);\r\n+\t\treturn this.getRootContextNode(false).setDeepRelation(contextNodeAddress, arc, targetContextNodeAddress);\r\n \t}\r\n \r\n \t@Override\r\n-\tpublic Relation setDeepRelation(XDI3Segment contextNodeXri, XDI3Segment arcXri, ContextNode targetContextNode) {\r\n+\tpublic Relation setDeepRelation(XDIAddress contextNodeAddress, XDIAddress arc, ContextNode targetContextNode) {\r\n \r\n-\t\treturn this.getRootContextNode(false).setDeepRelation(contextNodeXri, arcXri, targetContextNode);\r\n+\t\treturn this.getRootContextNode(false).setDeepRelation(contextNodeAddress, arc, targetContextNode);\r\n \t}\r\n \r\n \t@Override\r\n-\tpublic Relation getDeepRelation(XDI3Segment contextNodeXri, XDI3Segment arcXri, XDI3Segment targetContextNodeXri) {\r\n+\tpublic Relation getDeepRelation(XDIAddress contextNodeAddress, XDIAddress arc, XDIAddress targetContextNodeAddress) {\r\n \r\n-\t\treturn this.getRootContextNode(false).getDeepRelation(contextNodeXri, arcXri, targetContextNodeXri);\r\n+\t\treturn this.getRootContextNode(false).getDeepRelation(contextNodeAddress, arc, targetContextNodeAddress);\r\n \t}\r\n \r\n \t@Override\r\n-\tpublic Relation getDeepRelation(XDI3Segment contextNodeXri, XDI3Segment arcXri) {\r\n+\tpublic Relation getDeepRelation(XDIAddress contextNodeAddress, XDIAddress arc) {\r\n \r\n-\t\treturn this.getRootContextNode(false).getDeepRelation(contextNodeXri, arcXri);\r\n+\t\treturn this.getRootContextNode(false).getDeepRelation(contextNodeAddress, arc);\r\n \t}\r\n \r\n \t@Override\r\n-\tpublic ReadOnlyIterator<Relation> getDeepRelations(XDI3Segment contextNodeXri, XDI3Segment arcXri) {\r\n+\tpublic ReadOnlyIterator<Relation> getDeepRelations(XDIAddress contextNodeAddress, XDIAddress arc) {\r\n \r\n-\t\treturn this.getRootContextNode(false).getDeepRelations(contextNodeXri, arcXri);\r\n+\t\treturn this.getRootContextNode(false).getDeepRelations(contextNodeAddress, arc);\r\n \t}\r\n \r\n \t@Override\r\n-\tpublic ReadOnlyIterator<Relation> getDeepRelations(XDI3Segment contextNodeXri) {\r\n+\tpublic ReadOnlyIterator<Relation> getDeepRelations(XDIAddress contextNodeAddress) {\r\n \r\n-\t\treturn this.getRootContextNode(false).getDeepRelations(contextNodeXri);\r\n+\t\treturn this.getRootContextNode(false).getDeepRelations(contextNodeAddress);\r\n \t}\r\n \r\n \t@Override\r\n-\tpublic Literal setDeepLiteral(XDI3Segment contextNodeXri, Object literalData) {\r\n+\tpublic Literal setDeepLiteral(XDIAddress contextNodeAddress, Object literalData) {\r\n \r\n-\t\treturn this.getRootContextNode(false).setDeepLiteral(contextNodeXri, literalData);\r\n+\t\treturn this.getRootContextNode(false).setDeepLiteral(contextNodeAddress, literalData);\r\n \t}\r\n \r\n \t@Override\r\n-\tpublic Literal setDeepLiteralString(XDI3Segment contextNodeXri, String literalData) {\r\n+\tpublic Literal setDeepLiteralString(XDIAddress contextNodeAddress, String literalData) {\r\n \r\n-\t\treturn this.getRootContextNode(false).setDeepLiteralString(contextNodeXri, literalData);\r\n+\t\treturn this.getRootContextNode(false).setDeepLiteralString(contextNodeAddress, literalData);\r\n \t}\r\n \r\n \t@Override\r\n-\tpublic Literal setDeepLiteralNumber(XDI3Segment contextNodeXri, Double literalData) {\r\n+\tpublic Literal setDeepLiteralNumber(XDIAddress contextNodeAddress, Double literalData) {\r\n \r\n-\t\treturn this.getRootContextNode(false).setDeepLiteralNumber(contextNodeXri, literalData);\r\n+\t\treturn this.getRootContextNode(false).setDeepLiteralNumber(contextNodeAddress, literalData);\r\n \t}\r\n \r\n \t@Override\r\n-\tpublic Literal setDeepLiteralBoolean(XDI3Segment contextNodeXri, Boolean literalData) {\r\n+\tpublic Literal setDeepLiteralBoolean(XDIAddress contextNodeAddress, Boolean literalData) {\r\n \r\n-\t\treturn this.getRootContextNode(false).setDeepLiteralBoolean(contextNodeXri, literalData);\r\n+\t\treturn this.getRootContextNode(false).setDeepLiteralBoolean(contextNodeAddress, literalData);\r\n \t}\r\n \r\n \t@Override\r\n-\tpublic Literal getDeepLiteral(XDI3Segment contextNodeXri, Object literalData) {\r\n+\tpublic Literal getDeepLiteral(XDIAddress contextNodeAddress, Object literalData) {\r\n \r\n-\t\treturn this.getRootContextNode(false).getDeepLiteral(contextNodeXri, literalData);\r\n+\t\treturn this.getRootContextNode(false).getDeepLiteral(contextNodeAddress, literalData);\r\n \t}\r\n \r\n \t@Override\r\n-\tpublic Literal getDeepLiteralString(XDI3Segment contextNodeXri, String literalData) {\r\n+\tpublic Literal getDeepLiteralString(XDIAddress contextNodeAddress, String literalData) {\r\n \r\n-\t\treturn this.getRootContextNode(false).getDeepLiteralString(contextNodeXri, literalData);\r\n+\t\treturn this.getRootContextNode(false).getDeepLiteralString(contextNodeAddress, literalData);\r\n \t}\r\n \r\n \t@Override\r\n-\tpublic Literal getDeepLiteralNumber(XDI3Segment contextNodeXri, Double literalData) {\r\n+\tpublic Literal getDeepLiteralNumber(XDIAddress contextNodeAddress, Double literalData) {\r\n \r\n-\t\treturn this.getRootContextNode(false).getDeepLiteralNumber(contextNodeXri, literalData);\r\n+\t\treturn this.getRootContextNode(false).getDeepLiteralNumber(contextNodeAddress, literalData);\r\n \t}\r\n \r\n \t@Override\r\n-\tpublic Literal getDeepLiteralBoolean(XDI3Segment contextNodeXri, Boolean literalData) {\r\n+\tpublic Literal getDeepLiteralBoolean(XDIAddress contextNodeAddress, Boolean literalData) {\r\n \r\n-\t\treturn this.getRootContextNode(false).getDeepLiteralBoolean(contextNodeXri, literalData);\r\n+\t\treturn this.getRootContextNode(false).getDeepLiteralBoolean(contextNodeAddress, literalData);\r\n \t}\r\n \r\n \t@Override\r\n-\tpublic Literal getDeepLiteral(XDI3Segment contextNodeXri) {\r\n+\tpublic Literal getDeepLiteral(XDIAddress contextNodeAddress) {\r\n \r\n-\t\treturn this.getRootContextNode(false).getDeepLiteral(contextNodeXri);\r\n+\t\treturn this.getRootContextNode(false).getDeepLiteral(contextNodeAddress);\r\n \t}\r\n \r\n \t/*\r\n \t * Methods related to statements\r\n \t */\r\n \r\n \t@Override\r\n-\tpublic Statement setStatement(XDI3Statement statementXri) {\r\n+\tpublic Statement setStatement(XDIStatement statementXri) {\r\n \r\n \t\treturn this.getRootContextNode(false).setStatement(statementXri);\r\n \t}\r\n \r\n \t@Override\r\n-\tpublic Statement getStatement(XDI3Statement statementXri) {\r\n+\tpublic Statement getStatement(XDIStatement statementXri) {\r\n \r\n \t\treturn this.getRootContextNode(false).getStatement(statementXri);\r\n \t}\r\n \r\n \t@Override\r\n-\tpublic boolean containsStatement(XDI3Statement statementXri) {\r\n+\tpublic boolean containsStatement(XDIStatement statementXri) {\r\n \r\n \t\treturn this.getRootContextNode(false).containsStatement(statementXri);\r\n \t}\r", "raw_url": "https://github.com/projectdanube/xdi2/raw/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Fimpl%2FAbstractGraph.java", "sha": "40e40ee166a0bf66a0f8a29778528e65c8a52842", "status": "modified" }, { "additions": 4, "blob_url": "https://github.com/projectdanube/xdi2/blob/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Fimpl%2FAbstractLiteral.java", "changes": 8, "contents_url": "https://api.github.com/repos/projectdanube/xdi2/contents/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Fimpl%2FAbstractLiteral.java?ref=0ca7982fec30c2bb8204efbbea61428a643d2e9c", "deletions": 4, "filename": "core/src/main/java/xdi2/core/impl/AbstractLiteral.java", "new_code": "import xdi2.core.syntax.XDIAddress;\r\n\t\thashCode = (hashCode * 31) + this.getContextNode().getAddress().hashCode();\r\n\t\tpublic XDIAddress getSubject() {\r\n\t\t\treturn AbstractLiteral.this.getContextNode().getAddress();\r", "new_methods": [], "old_code": "import xdi2.core.xri3.XDI3Segment;\r\n\t\thashCode = (hashCode * 31) + this.getContextNode().getXri().hashCode();\r\n\t\tpublic XDI3Segment getSubject() {\r\n\t\t\treturn AbstractLiteral.this.getContextNode().getXri();\r", "old_methods": [], "patch": "@@ -9,7 +9,7 @@\n import xdi2.core.Statement.LiteralStatement;\r\n import xdi2.core.exceptions.Xdi2RuntimeException;\r\n import xdi2.core.impl.AbstractStatement.AbstractLiteralStatement;\r\n-import xdi2.core.xri3.XDI3Segment;\r\n+import xdi2.core.syntax.XDIAddress;\r\n \r\n import com.google.gson.Gson;\r\n import com.google.gson.GsonBuilder;\r\n@@ -137,7 +137,7 @@ public int hashCode() {\n \r\n \t\tint hashCode = 1;\r\n \r\n-\t\thashCode = (hashCode * 31) + this.getContextNode().getXri().hashCode();\r\n+\t\thashCode = (hashCode * 31) + this.getContextNode().getAddress().hashCode();\r\n \t\thashCode = (hashCode * 31) + this.getLiteralData().hashCode();\r\n \r\n \t\treturn hashCode;\r\n@@ -265,9 +265,9 @@ public static Object jsonElementToLiteralData(JsonElement jsonElement) {\n \t\tprivate static final long serialVersionUID = -8290065911553369697L;\r\n \r\n \t\t@Override\r\n-\t\tpublic XDI3Segment getSubject() {\r\n+\t\tpublic XDIAddress getSubject() {\r\n \r\n-\t\t\treturn AbstractLiteral.this.getContextNode().getXri();\r\n+\t\t\treturn AbstractLiteral.this.getContextNode().getAddress();\r\n \t\t}\r\n \r\n \t\t@Override\r", "raw_url": "https://github.com/projectdanube/xdi2/raw/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Fimpl%2FAbstractLiteral.java", "sha": "52a10603232a81a69b332db2c7fc208bb6e435d6", "status": "modified" }, { "additions": 16, "blob_url": "https://github.com/projectdanube/xdi2/blob/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Fimpl%2FAbstractRelation.java", "changes": 32, "contents_url": "https://api.github.com/repos/projectdanube/xdi2/contents/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Fimpl%2FAbstractRelation.java?ref=0ca7982fec30c2bb8204efbbea61428a643d2e9c", "deletions": 16, "filename": "core/src/main/java/xdi2/core/impl/AbstractRelation.java", "new_code": "import xdi2.core.syntax.XDIAddress;\r\n\t\tthis.getContextNode().delRelation(this.getArc(), this.getTargetContextNodeAddress());\r\n\t\treturn this.getGraph().getDeepContextNode(this.getTargetContextNodeAddress(), false);\r\n\t\t// two relations are equal if their context nodes, arcs, and target context node XRIs are equal\r\n\t\t\t\tthis.getArc().equals(other.getArc()) && \r\n\t\t\t\tthis.getTargetContextNodeAddress().equals(other.getTargetContextNodeAddress());\r\n\t\thashCode = (hashCode * 31) + this.getArc().hashCode();\r\n\t\thashCode = (hashCode * 31) + this.getTargetContextNodeAddress().hashCode();\r\n\t\tif ((compare = this.getArc().compareTo(other.getArc())) != 0) return compare;\r\n\t\tif ((compare = this.getTargetContextNodeAddress().compareTo(other.getTargetContextNodeAddress())) != 0) return compare;\r\n\t\tpublic XDIAddress getSubject() {\r\n\t\t\treturn AbstractRelation.this.getContextNode().getAddress();\r\n\t\tpublic XDIAddress getPredicate() {\r\n\t\t\treturn AbstractRelation.this.getArc();\r\n\t\tpublic XDIAddress getObject() {\r\n\t\t\treturn AbstractRelation.this.getTargetContextNodeAddress();\r", "new_methods": [], "old_code": "import xdi2.core.xri3.XDI3Segment;\r\n\t\tthis.getContextNode().delRelation(this.getArcXri(), this.getTargetContextNodeXri());\r\n\t\treturn this.getGraph().getDeepContextNode(this.getTargetContextNodeXri(), false);\r\n\t\t// two relations are equal if their context nodes, arc XRIs, and target context node XRIs are equal\r\n\t\t\t\tthis.getArcXri().equals(other.getArcXri()) && \r\n\t\t\t\tthis.getTargetContextNodeXri().equals(other.getTargetContextNodeXri());\r\n\t\thashCode = (hashCode * 31) + this.getArcXri().hashCode();\r\n\t\thashCode = (hashCode * 31) + this.getTargetContextNodeXri().hashCode();\r\n\t\tif ((compare = this.getArcXri().compareTo(other.getArcXri())) != 0) return compare;\r\n\t\tif ((compare = this.getTargetContextNodeXri().compareTo(other.getTargetContextNodeXri())) != 0) return compare;\r\n\t\tpublic XDI3Segment getSubject() {\r\n\t\t\treturn AbstractRelation.this.getContextNode().getXri();\r\n\t\tpublic XDI3Segment getPredicate() {\r\n\t\t\treturn AbstractRelation.this.getArcXri();\r\n\t\tpublic XDI3Segment getObject() {\r\n\t\t\treturn AbstractRelation.this.getTargetContextNodeXri();\r", "old_methods": [], "patch": "@@ -5,7 +5,7 @@\n import xdi2.core.Relation;\r\n import xdi2.core.Statement.RelationStatement;\r\n import xdi2.core.impl.AbstractStatement.AbstractRelationStatement;\r\n-import xdi2.core.xri3.XDI3Segment;\r\n+import xdi2.core.syntax.XDIAddress;\r\n \r\n public abstract class AbstractRelation implements Relation {\r\n \r\n@@ -35,13 +35,13 @@ public ContextNode getContextNode() {\n \t@Override\r\n \tpublic synchronized void delete() {\r\n \r\n-\t\tthis.getContextNode().delRelation(this.getArcXri(), this.getTargetContextNodeXri());\r\n+\t\tthis.getContextNode().delRelation(this.getArc(), this.getTargetContextNodeAddress());\r\n \t}\r\n \r\n \t@Override\r\n \tpublic ContextNode follow() {\r\n \r\n-\t\treturn this.getGraph().getDeepContextNode(this.getTargetContextNodeXri(), false);\r\n+\t\treturn this.getGraph().getDeepContextNode(this.getTargetContextNodeAddress(), false);\r\n \t}\r\n \r\n \t/*\r\n@@ -72,12 +72,12 @@ public boolean equals(Object object) {\n \r\n \t\tRelation other = (Relation) object;\r\n \r\n-\t\t// two relations are equal if their context nodes, arc XRIs, and target context node XRIs are equal\r\n+\t\t// two relations are equal if their context nodes, arcs, and target context node XRIs are equal\r\n \r\n \t\treturn \r\n \t\t\t\tthis.getContextNode().equals(other.getContextNode()) &&\r\n-\t\t\t\tthis.getArcXri().equals(other.getArcXri()) && \r\n-\t\t\t\tthis.getTargetContextNodeXri().equals(other.getTargetContextNodeXri());\r\n+\t\t\t\tthis.getArc().equals(other.getArc()) && \r\n+\t\t\t\tthis.getTargetContextNodeAddress().equals(other.getTargetContextNodeAddress());\r\n \t}\r\n \r\n \t@Override\r\n@@ -86,8 +86,8 @@ public int hashCode() {\n \t\tint hashCode = 1;\r\n \r\n \t\thashCode = (hashCode * 31) + this.getContextNode().hashCode();\r\n-\t\thashCode = (hashCode * 31) + this.getArcXri().hashCode();\r\n-\t\thashCode = (hashCode * 31) + this.getTargetContextNodeXri().hashCode();\r\n+\t\thashCode = (hashCode * 31) + this.getArc().hashCode();\r\n+\t\thashCode = (hashCode * 31) + this.getTargetContextNodeAddress().hashCode();\r\n \r\n \t\treturn hashCode;\r\n \t}\r\n@@ -100,8 +100,8 @@ public int compareTo(Relation other) {\n \t\tint compare;\r\n \r\n \t\tif ((compare = this.getContextNode().compareTo(other.getContextNode())) != 0) return compare;\r\n-\t\tif ((compare = this.getArcXri().compareTo(other.getArcXri())) != 0) return compare;\r\n-\t\tif ((compare = this.getTargetContextNodeXri().compareTo(other.getTargetContextNodeXri())) != 0) return compare;\r\n+\t\tif ((compare = this.getArc().compareTo(other.getArc())) != 0) return compare;\r\n+\t\tif ((compare = this.getTargetContextNodeAddress().compareTo(other.getTargetContextNodeAddress())) != 0) return compare;\r\n \r\n \t\treturn 0;\r\n \t}\r\n@@ -115,21 +115,21 @@ public int compareTo(Relation other) {\n \t\tprivate static final long serialVersionUID = 1937380243537401799L;\r\n \r\n \t\t@Override\r\n-\t\tpublic XDI3Segment getSubject() {\r\n+\t\tpublic XDIAddress getSubject() {\r\n \r\n-\t\t\treturn AbstractRelation.this.getContextNode().getXri();\r\n+\t\t\treturn AbstractRelation.this.getContextNode().getAddress();\r\n \t\t}\r\n \r\n \t\t@Override\r\n-\t\tpublic XDI3Segment getPredicate() {\r\n+\t\tpublic XDIAddress getPredicate() {\r\n \r\n-\t\t\treturn AbstractRelation.this.getArcXri();\r\n+\t\t\treturn AbstractRelation.this.getArc();\r\n \t\t}\r\n \r\n \t\t@Override\r\n-\t\tpublic XDI3Segment getObject() {\r\n+\t\tpublic XDIAddress getObject() {\r\n \r\n-\t\t\treturn AbstractRelation.this.getTargetContextNodeXri();\r\n+\t\t\treturn AbstractRelation.this.getTargetContextNodeAddress();\r\n \t\t}\r\n \r\n \t\t@Override\r", "raw_url": "https://github.com/projectdanube/xdi2/raw/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Fimpl%2FAbstractRelation.java", "sha": "cd12f1de1afcd91ad8eca0e7abbea9741eff0aca", "status": "modified" }, { "additions": 10, "blob_url": "https://github.com/projectdanube/xdi2/blob/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Fimpl%2FAbstractStatement.java", "changes": 20, "contents_url": "https://api.github.com/repos/projectdanube/xdi2/contents/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Fimpl%2FAbstractStatement.java?ref=0ca7982fec30c2bb8204efbbea61428a643d2e9c", "deletions": 10, "filename": "core/src/main/java/xdi2/core/impl/AbstractStatement.java", "new_code": "import xdi2.core.syntax.XDIAddress;\r\nimport xdi2.core.syntax.XDIStatement;\r\n\tpublic XDIStatement getXri() {\r\n\t\t\treturn XDIStatement.fromContextNodeComponents(((ContextNodeStatement) this).getSubject(), ((ContextNodeStatement) this).getObject());\r\n\t\t\treturn XDIStatement.fromRelationComponents(((RelationStatement) this).getSubject(), ((RelationStatement) this).getPredicate(), ((RelationStatement) this).getObject());\r\n\t\t\treturn XDIStatement.fromLiteralComponents(((LiteralStatement) this).getSubject(), ((LiteralStatement) this).getObject());\r\n\t\tpublic final XDIAddress getPredicate() {\r\n\t\t\treturn XDIConstants.XDI_ADD_CONTEXT;\r\n\t\tpublic final XDIAddress getPredicate() {\r\n\t\t\treturn XDIConstants.XDI_ADD_LITERAL;\r", "new_methods": [], "old_code": "import xdi2.core.xri3.XDI3Segment;\r\nimport xdi2.core.xri3.XDI3Statement;\r\n\tpublic XDI3Statement getXri() {\r\n\t\t\treturn XDI3Statement.fromContextNodeComponents(((ContextNodeStatement) this).getSubject(), ((ContextNodeStatement) this).getObject());\r\n\t\t\treturn XDI3Statement.fromRelationComponents(((RelationStatement) this).getSubject(), ((RelationStatement) this).getPredicate(), ((RelationStatement) this).getObject());\r\n\t\t\treturn XDI3Statement.fromLiteralComponents(((LiteralStatement) this).getSubject(), ((LiteralStatement) this).getObject());\r\n\t\tpublic final XDI3Segment getPredicate() {\r\n\t\t\treturn XDIConstants.XRI_S_CONTEXT;\r\n\t\tpublic final XDI3Segment getPredicate() {\r\n\t\t\treturn XDIConstants.XRI_S_LITERAL;\r", "old_methods": [], "patch": "@@ -7,8 +7,8 @@\n import xdi2.core.Statement;\r\n import xdi2.core.constants.XDIConstants;\r\n import xdi2.core.features.nodetypes.XdiInnerRoot;\r\n-import xdi2.core.xri3.XDI3Segment;\r\n-import xdi2.core.xri3.XDI3Statement;\r\n+import xdi2.core.syntax.XDIAddress;\r\n+import xdi2.core.syntax.XDIStatement;\r\n \r\n public abstract class AbstractStatement implements Statement {\r\n \r\n@@ -50,17 +50,17 @@ public void delete() {\n \t}\r\n \r\n \t@Override\r\n-\tpublic XDI3Statement getXri() {\r\n+\tpublic XDIStatement getXri() {\r\n \r\n \t\tif (this instanceof ContextNodeStatement) {\r\n \r\n-\t\t\treturn XDI3Statement.fromContextNodeComponents(((ContextNodeStatement) this).getSubject(), ((ContextNodeStatement) this).getObject());\r\n+\t\t\treturn XDIStatement.fromContextNodeComponents(((ContextNodeStatement) this).getSubject(), ((ContextNodeStatement) this).getObject());\r\n \t\t} else if (this instanceof RelationStatement) {\r\n \r\n-\t\t\treturn XDI3Statement.fromRelationComponents(((RelationStatement) this).getSubject(), ((RelationStatement) this).getPredicate(), ((RelationStatement) this).getObject());\r\n+\t\t\treturn XDIStatement.fromRelationComponents(((RelationStatement) this).getSubject(), ((RelationStatement) this).getPredicate(), ((RelationStatement) this).getObject());\r\n \t\t} else if (this instanceof LiteralStatement) {\r\n \r\n-\t\t\treturn XDI3Statement.fromLiteralComponents(((LiteralStatement) this).getSubject(), ((LiteralStatement) this).getObject());\r\n+\t\t\treturn XDIStatement.fromLiteralComponents(((LiteralStatement) this).getSubject(), ((LiteralStatement) this).getObject());\r\n \t\t}\r\n \r\n \t\tthrow new IllegalStateException(\"Invalid statement: \" + this.getClass().getSimpleName());\r\n@@ -139,9 +139,9 @@ public static abstract class AbstractContextNodeStatement extends AbstractStatem\n \t\tprivate static final long serialVersionUID = -7006808512493295364L;\r\n \r\n \t\t@Override\r\n-\t\tpublic final XDI3Segment getPredicate() {\r\n+\t\tpublic final XDIAddress getPredicate() {\r\n \r\n-\t\t\treturn XDIConstants.XRI_S_CONTEXT;\r\n+\t\t\treturn XDIConstants.XDI_ADD_CONTEXT;\r\n \t\t}\r\n \r\n \t\t@Override\r\n@@ -167,9 +167,9 @@ public static abstract class AbstractLiteralStatement extends AbstractStatement\n \t\tprivate static final long serialVersionUID = -7876412291137305476L;\r\n \r\n \t\t@Override\r\n-\t\tpublic final XDI3Segment getPredicate() {\r\n+\t\tpublic final XDIAddress getPredicate() {\r\n \r\n-\t\t\treturn XDIConstants.XRI_S_LITERAL;\r\n+\t\t\treturn XDIConstants.XDI_ADD_LITERAL;\r\n \t\t}\r\n \r\n \t\t@Override\r", "raw_url": "https://github.com/projectdanube/xdi2/raw/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Fimpl%2FAbstractStatement.java", "sha": "30b115a0fb1e121702973d19758ab0d335c948b0", "status": "modified" }, { "additions": 12, "blob_url": "https://github.com/projectdanube/xdi2/blob/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Fimpl%2FBasicContextNode.java", "changes": 24, "contents_url": "https://api.github.com/repos/projectdanube/xdi2/contents/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Fimpl%2FBasicContextNode.java?ref=0ca7982fec30c2bb8204efbbea61428a643d2e9c", "deletions": 12, "filename": "core/src/main/java/xdi2/core/impl/BasicContextNode.java", "new_code": "import xdi2.core.syntax.XDIAddress;\r\nimport xdi2.core.syntax.XDIArc;\r\n\tprivate XDIArc arc;\r\n\tpublic BasicContextNode(Graph graph, ContextNode contextNode, XDIArc arc, Iterable<ContextNode> contextNodes, Iterable<Relation> relations, Literal literal) {\r\n\t\tthis.arc = arc;\r\n\tpublic XDIArc getArc() {\r\n\t\treturn this.arc;\r\n\tpublic ContextNode setContextNode(XDIArc arc) {\r\n\tpublic void delContextNode(XDIArc arc) {\r\n\tpublic Relation setRelation(XDIAddress arc, ContextNode targetContextNode) {\r\n\tpublic void delRelation(XDIAddress arc, XDIAddress targetContextNodeAddress) {\r\n\tpublic void delRelations(XDIAddress arc) {\r", "new_methods": [], "old_code": "import xdi2.core.xri3.XDI3Segment;\r\nimport xdi2.core.xri3.XDI3SubSegment;\r\n\tprivate XDI3SubSegment arcXri;\r\n\tpublic BasicContextNode(Graph graph, ContextNode contextNode, XDI3SubSegment arcXri, Iterable<ContextNode> contextNodes, Iterable<Relation> relations, Literal literal) {\r\n\t\tthis.arcXri = arcXri;\r\n\tpublic XDI3SubSegment getArcXri() {\r\n\t\treturn this.arcXri;\r\n\tpublic ContextNode setContextNode(XDI3SubSegment arcXri) {\r\n\tpublic void delContextNode(XDI3SubSegment arcXri) {\r\n\tpublic Relation setRelation(XDI3Segment arcXri, ContextNode targetContextNode) {\r\n\tpublic void delRelation(XDI3Segment arcXri, XDI3Segment targetContextNodeXri) {\r\n\tpublic void delRelations(XDI3Segment arcXri) {\r", "old_methods": [], "patch": "@@ -6,37 +6,37 @@\n import xdi2.core.Graph;\r\n import xdi2.core.Literal;\r\n import xdi2.core.Relation;\r\n+import xdi2.core.syntax.XDIAddress;\r\n+import xdi2.core.syntax.XDIArc;\r\n import xdi2.core.util.iterators.ReadOnlyIterator;\r\n-import xdi2.core.xri3.XDI3Segment;\r\n-import xdi2.core.xri3.XDI3SubSegment;\r\n \r\n public class BasicContextNode extends AbstractContextNode implements ContextNode {\r\n \r\n \tprivate static final long serialVersionUID = -3684616841641336596L;\r\n \r\n-\tprivate XDI3SubSegment arcXri;\r\n+\tprivate XDIArc arc;\r\n \tprivate Iterable<ContextNode> contextNodes;\r\n \tprivate Iterable<Relation> relations;\r\n \tprivate Literal literal;\r\n \r\n-\tpublic BasicContextNode(Graph graph, ContextNode contextNode, XDI3SubSegment arcXri, Iterable<ContextNode> contextNodes, Iterable<Relation> relations, Literal literal) {\r\n+\tpublic BasicContextNode(Graph graph, ContextNode contextNode, XDIArc arc, Iterable<ContextNode> contextNodes, Iterable<Relation> relations, Literal literal) {\r\n \r\n \t\tsuper(graph, contextNode);\r\n \r\n-\t\tthis.arcXri = arcXri;\r\n+\t\tthis.arc = arc;\r\n \t\tthis.contextNodes = contextNodes == null ? Arrays.asList(new ContextNode[0]) : contextNodes;\r\n \t\tthis.relations = relations == null ? Arrays.asList(new Relation[0]) : relations;\r\n \t\tthis.literal = literal;\r\n \t}\r\n \r\n \t@Override\r\n-\tpublic XDI3SubSegment getArcXri() {\r\n+\tpublic XDIArc getArc() {\r\n \r\n-\t\treturn this.arcXri;\r\n+\t\treturn this.arc;\r\n \t}\r\n \r\n \t@Override\r\n-\tpublic ContextNode setContextNode(XDI3SubSegment arcXri) {\r\n+\tpublic ContextNode setContextNode(XDIArc arc) {\r\n \r\n \t\tthrow new UnsupportedOperationException(\"Not supported.\");\r\n \t}\r\n@@ -48,7 +48,7 @@ public ReadOnlyIterator<ContextNode> getContextNodes() {\n \t}\r\n \r\n \t@Override\r\n-\tpublic void delContextNode(XDI3SubSegment arcXri) {\r\n+\tpublic void delContextNode(XDIArc arc) {\r\n \r\n \t\tthrow new UnsupportedOperationException(\"Not supported.\");\r\n \t}\r\n@@ -60,7 +60,7 @@ public void delContextNodes() {\n \t}\r\n \r\n \t@Override\r\n-\tpublic Relation setRelation(XDI3Segment arcXri, ContextNode targetContextNode) {\r\n+\tpublic Relation setRelation(XDIAddress arc, ContextNode targetContextNode) {\r\n \r\n \t\tthrow new UnsupportedOperationException(\"Not supported.\");\r\n \t}\r\n@@ -72,13 +72,13 @@ public ReadOnlyIterator<Relation> getRelations() {\n \t}\r\n \r\n \t@Override\r\n-\tpublic void delRelation(XDI3Segment arcXri, XDI3Segment targetContextNodeXri) {\r\n+\tpublic void delRelation(XDIAddress arc, XDIAddress targetContextNodeAddress) {\r\n \r\n \t\tthrow new UnsupportedOperationException(\"Not supported.\");\r\n \t}\r\n \r\n \t@Override\r\n-\tpublic void delRelations(XDI3Segment arcXri) {\r\n+\tpublic void delRelations(XDIAddress arc) {\r\n \r\n \t\tthrow new UnsupportedOperationException(\"Not supported.\");\r\n \t}\r", "raw_url": "https://github.com/projectdanube/xdi2/raw/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Fimpl%2FBasicContextNode.java", "sha": "2a5854dda2b2e98864f38f69695fc421d7481b8c", "status": "modified" }, { "additions": 12, "blob_url": "https://github.com/projectdanube/xdi2/blob/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Fimpl%2FBasicRelation.java", "changes": 24, "contents_url": "https://api.github.com/repos/projectdanube/xdi2/contents/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Fimpl%2FBasicRelation.java?ref=0ca7982fec30c2bb8204efbbea61428a643d2e9c", "deletions": 12, "filename": "core/src/main/java/xdi2/core/impl/BasicRelation.java", "new_code": "import xdi2.core.syntax.XDIAddress;\r\n\tprivate XDIAddress arc;\r\n\tprivate XDIAddress targetContextNodeAddress;\r\n\tpublic BasicRelation(ContextNode contextNode, XDIAddress arc, XDIAddress targetContextNodeAddress) {\r\n\t\tthis.arc = arc;\r\n\t\tthis.targetContextNodeAddress = targetContextNodeAddress;\r\n\tpublic BasicRelation(XDIAddress arc, XDIAddress targetContextNodeAddress) {\r\n\t\tthis(new BasicContextNode(new BasicGraph(null, null), null, null, null, null, null), arc, targetContextNodeAddress);\r\n\tpublic XDIAddress getArc() {\r\n\t\treturn this.arc;\r\n\tpublic XDIAddress getTargetContextNodeAddress() {\r\n\t\treturn this.targetContextNodeAddress;\r", "new_methods": [], "old_code": "import xdi2.core.xri3.XDI3Segment;\r\n\tprivate XDI3Segment arcXri;\r\n\tprivate XDI3Segment targetContextNodeXri;\r\n\tpublic BasicRelation(ContextNode contextNode, XDI3Segment arcXri, XDI3Segment targetContextNodeXri) {\r\n\t\tthis.arcXri = arcXri;\r\n\t\tthis.targetContextNodeXri = targetContextNodeXri;\r\n\tpublic BasicRelation(XDI3Segment arcXri, XDI3Segment targetContextNodeXri) {\r\n\t\tthis(new BasicContextNode(new BasicGraph(null, null), null, null, null, null, null), arcXri, targetContextNodeXri);\r\n\tpublic XDI3Segment getArcXri() {\r\n\t\treturn this.arcXri;\r\n\tpublic XDI3Segment getTargetContextNodeXri() {\r\n\t\treturn this.targetContextNodeXri;\r", "old_methods": [], "patch": "@@ -2,37 +2,37 @@\n \r\n import xdi2.core.ContextNode;\r\n import xdi2.core.Relation;\r\n-import xdi2.core.xri3.XDI3Segment;\r\n+import xdi2.core.syntax.XDIAddress;\r\n \r\n public class BasicRelation extends AbstractRelation implements Relation {\r\n \r\n \tprivate static final long serialVersionUID = -8757473050724884998L;\r\n \r\n-\tprivate XDI3Segment arcXri;\r\n-\tprivate XDI3Segment targetContextNodeXri;\r\n+\tprivate XDIAddress arc;\r\n+\tprivate XDIAddress targetContextNodeAddress;\r\n \r\n-\tpublic BasicRelation(ContextNode contextNode, XDI3Segment arcXri, XDI3Segment targetContextNodeXri) {\r\n+\tpublic BasicRelation(ContextNode contextNode, XDIAddress arc, XDIAddress targetContextNodeAddress) {\r\n \r\n \t\tsuper(contextNode);\r\n \r\n-\t\tthis.arcXri = arcXri;\r\n-\t\tthis.targetContextNodeXri = targetContextNodeXri;\r\n+\t\tthis.arc = arc;\r\n+\t\tthis.targetContextNodeAddress = targetContextNodeAddress;\r\n \t}\r\n \r\n-\tpublic BasicRelation(XDI3Segment arcXri, XDI3Segment targetContextNodeXri) {\r\n+\tpublic BasicRelation(XDIAddress arc, XDIAddress targetContextNodeAddress) {\r\n \r\n-\t\tthis(new BasicContextNode(new BasicGraph(null, null), null, null, null, null, null), arcXri, targetContextNodeXri);\r\n+\t\tthis(new BasicContextNode(new BasicGraph(null, null), null, null, null, null, null), arc, targetContextNodeAddress);\r\n \t}\r\n \r\n \t@Override\r\n-\tpublic XDI3Segment getArcXri() {\r\n+\tpublic XDIAddress getArc() {\r\n \r\n-\t\treturn this.arcXri;\r\n+\t\treturn this.arc;\r\n \t}\r\n \r\n \t@Override\r\n-\tpublic XDI3Segment getTargetContextNodeXri() {\r\n+\tpublic XDIAddress getTargetContextNodeAddress() {\r\n \r\n-\t\treturn this.targetContextNodeXri;\r\n+\t\treturn this.targetContextNodeAddress;\r\n \t}\r\n }\r", "raw_url": "https://github.com/projectdanube/xdi2/raw/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Fimpl%2FBasicRelation.java", "sha": "b4f0848da2c15d7de0c4523906425e4accb7648b", "status": "modified" }, { "additions": 70, "blob_url": "https://github.com/projectdanube/xdi2/blob/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Fimpl%2Fjson%2FJSONContextNode.java", "changes": 140, "contents_url": "https://api.github.com/repos/projectdanube/xdi2/contents/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Fimpl%2Fjson%2FJSONContextNode.java?ref=0ca7982fec30c2bb8204efbbea61428a643d2e9c", "deletions": 70, "filename": "core/src/main/java/xdi2/core/impl/json/JSONContextNode.java", "new_code": "import xdi2.core.syntax.XDIAddress;\nimport xdi2.core.syntax.XDIArc;\nimport xdi2.core.util.AddressUtil;\n\tprivate XDIArc arc;\n\tprivate XDIAddress xri;\n\tJSONContextNode(JSONGraph graph, JSONContextNode contextNode, XDIArc arc, XDIAddress xri) {\n\t\tthis.arc = arc;\n\tpublic XDIArc getArc() {\n\t\treturn this.arc;\n\tpublic XDIAddress getAddress() {\n\tpublic ContextNode setContextNode(XDIArc arc) {\n\t\tthis.setContextNodeCheckValid(arc);\n\t\t((JSONGraph) this.getGraph()).jsonSaveToArray(this.getAddress().toString(), XDIConstants.XDI_ADD_CONTEXT.toString(), new JsonPrimitive(arc.toString()));\n\t\tXDIAddress xri = AddressUtil.concatAddresses(this.getAddress(), arc);\n\t\tJSONContextNode contextNode = new JSONContextNode((JSONGraph) this.getGraph(), this, arc, xri);\n\t\tthis.setContextNodeSetInnerRoot(arc, contextNode);\n\tpublic ContextNode getContextNode(XDIArc arc, boolean subgraph) {\n\t\t\tjsonObject = ((JSONGraph) this.getGraph()).jsonLoadWithPrefix(this.getAddress().toString()).get(this.getAddress().toString());\n\t\t\tjsonObject = ((JSONGraph) this.getGraph()).jsonLoad(this.getAddress().toString());\n\t\tfinal JsonArray jsonArrayContexts = jsonObject.getAsJsonArray(XDIConstants.XDI_ADD_CONTEXT.toString());\n\t\tif (! new IteratorContains<JsonElement> (jsonArrayContexts.iterator(), new JsonPrimitive(arc.toString())).contains()) return null;\n\t\tXDIAddress xri = AddressUtil.concatAddresses(this.getAddress(), arc);\n\t\treturn new JSONContextNode((JSONGraph) JSONContextNode.this.getGraph(), JSONContextNode.this, arc, xri);\n\tpublic ContextNode getDeepContextNode(XDIAddress relativecontextNodeAddress, boolean subgraph) {\n\t\tif (XDIConstants.XDI_ADD_ROOT.equals(relativecontextNodeAddress)) return this;\n\t\tXDIAddress contextNodeAddress = AddressUtil.concatAddresses(this.getAddress(), relativecontextNodeAddress);\n\t\tXDIAddress parentcontextNodeAddress = AddressUtil.concatAddresses(this.getAddress(), AddressUtil.parentXri(relativecontextNodeAddress, -1));\n\t\tXDIArc arc = relativecontextNodeAddress.getLastArc();\n\t\tJsonObject jsonObject = ((JSONGraph) this.getGraph()).jsonLoad(parentcontextNodeAddress.toString());\n\t\tfinal JsonArray jsonArrayContexts = jsonObject.getAsJsonArray(XDIConstants.XDI_ADD_CONTEXT.toString());\n\t\tif (! new IteratorContains<JsonElement> (jsonArrayContexts.iterator(), new JsonPrimitive(arc.toString())).contains()) return null;\n\t\tfor (XDIArc temparc : relativecontextNodeAddress.getArcs()) {\n\t\t\tXDIAddress tempXri = AddressUtil.concatAddresses(contextNode.getAddress(), temparc);\n\t\t\tcontextNode = new JSONContextNode((JSONGraph) this.getGraph(), contextNode, temparc, tempXri);\n\t\t\t((JSONGraph) this.getGraph()).jsonLoadWithPrefix(contextNodeAddress.toString());\n\t\tJsonObject jsonObject = ((JSONGraph) this.getGraph()).jsonLoad(this.getAddress().toString());\n\t\tfinal JsonArray jsonArrayContexts = jsonObject.getAsJsonArray(XDIConstants.XDI_ADD_CONTEXT.toString());\n\t\t\t\tXDIArc arc = XDIArc.create(((JsonPrimitive) jsonElement).getAsString());\n\t\t\t\tXDIAddress xri = AddressUtil.concatAddresses(JSONContextNode.this.getAddress(), arc);\n\t\t\t\treturn new JSONContextNode((JSONGraph) JSONContextNode.this.getGraph(), JSONContextNode.this, arc, xri);\n\tpublic void delContextNode(XDIArc arc) {\n\t\tContextNode contextNode = this.getContextNode(arc, true);\n\t\t((JSONGraph) this.getGraph()).jsonDelete(contextNode.getAddress().toString());\n\t\t((JSONGraph) this.getGraph()).jsonDeleteFromArray(this.getAddress().toString(), XDIConstants.XDI_ADD_CONTEXT.toString(), new JsonPrimitive(arc.toString()));\n\tpublic synchronized Relation setRelation(XDIAddress arc, ContextNode targetContextNode) {\n\t\tXDIAddress targetContextNodeAddress = targetContextNode.getAddress();\n\t\tthis.setRelationCheckValid(arc, targetContextNodeAddress);\n\t\t((JSONGraph) this.getGraph()).jsonSaveToArray(this.getAddress().toString(), arc.toString(), new JsonPrimitive(targetContextNodeAddress.toString()));\n\t\t((JSONGraph) this.getGraph()).jsonSaveToArray(targetContextNodeAddress.toString(), \"/\" + arc.toString(), new JsonPrimitive(this.getAddress().toString()));\n\t\tJSONRelation relation = new JSONRelation(this, arc, targetContextNodeAddress);\n\t\tJsonObject jsonObject = ((JSONGraph) this.getGraph()).jsonLoad(this.getAddress().toString());\n\t\t\t\tfinal XDIAddress arc = XDIAddress.create(entry.getKey());\n\t\t\t\tif (XDIConstants.XDI_ADD_CONTEXT.equals(arc)) return null;\n\t\t\t\tif (XDIConstants.XDI_ADD_LITERAL.equals(arc)) return null;\n\t\t\t\t\t\tXDIAddress targetContextNodeAddress = XDIAddress.create(((JsonPrimitive) jsonElement).getAsString());\n\t\t\t\t\t\treturn new JSONRelation(JSONContextNode.this, arc, targetContextNodeAddress);\n\t\tJsonObject jsonObject = ((JSONGraph) this.getGraph()).jsonLoad(this.getAddress().toString());\n\t\t\t\tfinal XDIAddress arc = XDIAddress.create(entry.getKey().substring(1));\n\t\t\t\t\t\tXDIAddress contextNodeAddress = XDIAddress.create(((JsonPrimitive) jsonElement).getAsString());\n\t\t\t\t\t\tContextNode contextNode = JSONContextNode.this.getGraph().getDeepContextNode(contextNodeAddress, false);\n\t\t\t\t\t\t\tlog.warn(\"In context node \" + JSONContextNode.this.getAddress() + \" found incoming relation \" + arc + \" from non-existent context node \" + contextNodeAddress);\n\t\t\t\t\t\treturn new JSONRelation(contextNode, arc, JSONContextNode.this.getAddress());\n\tpublic void delRelation(XDIAddress arc, XDIAddress targetContextNodeAddress) {\n\t\t((JSONGraph) this.getGraph()).jsonDeleteFromArray(this.getAddress().toString(), arc.toString(), new JsonPrimitive(targetContextNodeAddress.toString()));\n\t\t((JSONGraph) this.getGraph()).jsonDeleteFromArray(targetContextNodeAddress.toString(), \"/\" + arc.toString(), new JsonPrimitive(this.getAddress().toString()));\n\t\tthis.delRelationDelInnerRoot(arc, targetContextNodeAddress);\n\t\t((JSONGraph) this.getGraph()).jsonSaveToObject(this.getAddress().toString(), XDIConstants.XDI_ARC_LITERAL.toString(), AbstractLiteral.literalDataToJsonElement(literalData));\n\t\tJsonObject jsonObject = ((JSONGraph) this.getGraph()).jsonLoad(this.getAddress().toString());\n\t\tif (! jsonObject.has(XDIConstants.XDI_ARC_LITERAL.toString())) return null;\n\t\t((JSONGraph) this.getGraph()).jsonDeleteFromObject(this.getAddress().toString(), XDIConstants.XDI_ARC_LITERAL.toString());", "new_methods": [], "old_code": "import xdi2.core.util.XDI3Util;\nimport xdi2.core.xri3.XDI3Segment;\nimport xdi2.core.xri3.XDI3SubSegment;\n\tprivate XDI3SubSegment arcXri;\n\tprivate XDI3Segment xri;\n\tJSONContextNode(JSONGraph graph, JSONContextNode contextNode, XDI3SubSegment arcXri, XDI3Segment xri) {\n\t\tthis.arcXri = arcXri;\n\tpublic XDI3SubSegment getArcXri() {\n\t\treturn this.arcXri;\n\tpublic XDI3Segment getXri() {\n\tpublic ContextNode setContextNode(XDI3SubSegment arcXri) {\n\t\tthis.setContextNodeCheckValid(arcXri);\n\t\t((JSONGraph) this.getGraph()).jsonSaveToArray(this.getXri().toString(), XDIConstants.XRI_S_CONTEXT.toString(), new JsonPrimitive(arcXri.toString()));\n\t\tXDI3Segment xri = XDI3Util.concatXris(this.getXri(), arcXri);\n\t\tJSONContextNode contextNode = new JSONContextNode((JSONGraph) this.getGraph(), this, arcXri, xri);\n\t\tthis.setContextNodeSetInnerRoot(arcXri, contextNode);\n\tpublic ContextNode getContextNode(XDI3SubSegment arcXri, boolean subgraph) {\n\t\t\tjsonObject = ((JSONGraph) this.getGraph()).jsonLoadWithPrefix(this.getXri().toString()).get(this.getXri().toString());\n\t\t\tjsonObject = ((JSONGraph) this.getGraph()).jsonLoad(this.getXri().toString());\n\t\tfinal JsonArray jsonArrayContexts = jsonObject.getAsJsonArray(XDIConstants.XRI_S_CONTEXT.toString());\n\t\tif (! new IteratorContains<JsonElement> (jsonArrayContexts.iterator(), new JsonPrimitive(arcXri.toString())).contains()) return null;\n\t\tXDI3Segment xri = XDI3Util.concatXris(this.getXri(), arcXri);\n\t\treturn new JSONContextNode((JSONGraph) JSONContextNode.this.getGraph(), JSONContextNode.this, arcXri, xri);\n\tpublic ContextNode getDeepContextNode(XDI3Segment relativeContextNodeXri, boolean subgraph) {\n\t\tif (XDIConstants.XRI_S_ROOT.equals(relativeContextNodeXri)) return this;\n\t\tXDI3Segment contextNodeXri = XDI3Util.concatXris(this.getXri(), relativeContextNodeXri);\n\t\tXDI3Segment parentContextNodeXri = XDI3Util.concatXris(this.getXri(), XDI3Util.parentXri(relativeContextNodeXri, -1));\n\t\tXDI3SubSegment arcXri = relativeContextNodeXri.getLastSubSegment();\n\t\tJsonObject jsonObject = ((JSONGraph) this.getGraph()).jsonLoad(parentContextNodeXri.toString());\n\t\tfinal JsonArray jsonArrayContexts = jsonObject.getAsJsonArray(XDIConstants.XRI_S_CONTEXT.toString());\n\t\tif (! new IteratorContains<JsonElement> (jsonArrayContexts.iterator(), new JsonPrimitive(arcXri.toString())).contains()) return null;\n\t\tfor (XDI3SubSegment tempArcXri : relativeContextNodeXri.getSubSegments()) {\n\t\t\tXDI3Segment tempXri = XDI3Util.concatXris(contextNode.getXri(), tempArcXri);\n\t\t\tcontextNode = new JSONContextNode((JSONGraph) this.getGraph(), contextNode, tempArcXri, tempXri);\n\t\t\t((JSONGraph) this.getGraph()).jsonLoadWithPrefix(contextNodeXri.toString());\n\t\tJsonObject jsonObject = ((JSONGraph) this.getGraph()).jsonLoad(this.getXri().toString());\n\t\tfinal JsonArray jsonArrayContexts = jsonObject.getAsJsonArray(XDIConstants.XRI_S_CONTEXT.toString());\n\t\t\t\tXDI3SubSegment arcXri = XDI3SubSegment.create(((JsonPrimitive) jsonElement).getAsString());\n\t\t\t\tXDI3Segment xri = XDI3Util.concatXris(JSONContextNode.this.getXri(), arcXri);\n\t\t\t\treturn new JSONContextNode((JSONGraph) JSONContextNode.this.getGraph(), JSONContextNode.this, arcXri, xri);\n\tpublic void delContextNode(XDI3SubSegment arcXri) {\n\t\tContextNode contextNode = this.getContextNode(arcXri, true);\n\t\t((JSONGraph) this.getGraph()).jsonDelete(contextNode.getXri().toString());\n\t\t((JSONGraph) this.getGraph()).jsonDeleteFromArray(this.getXri().toString(), XDIConstants.XRI_S_CONTEXT.toString(), new JsonPrimitive(arcXri.toString()));\n\tpublic synchronized Relation setRelation(XDI3Segment arcXri, ContextNode targetContextNode) {\n\t\tXDI3Segment targetContextNodeXri = targetContextNode.getXri();\n\t\tthis.setRelationCheckValid(arcXri, targetContextNodeXri);\n\t\t((JSONGraph) this.getGraph()).jsonSaveToArray(this.getXri().toString(), arcXri.toString(), new JsonPrimitive(targetContextNodeXri.toString()));\n\t\t((JSONGraph) this.getGraph()).jsonSaveToArray(targetContextNodeXri.toString(), \"/\" + arcXri.toString(), new JsonPrimitive(this.getXri().toString()));\n\t\tJSONRelation relation = new JSONRelation(this, arcXri, targetContextNodeXri);\n\t\tJsonObject jsonObject = ((JSONGraph) this.getGraph()).jsonLoad(this.getXri().toString());\n\t\t\t\tfinal XDI3Segment arcXri = XDI3Segment.create(entry.getKey());\n\t\t\t\tif (XDIConstants.XRI_S_CONTEXT.equals(arcXri)) return null;\n\t\t\t\tif (XDIConstants.XRI_S_LITERAL.equals(arcXri)) return null;\n\t\t\t\t\t\tXDI3Segment targetContextNodeXri = XDI3Segment.create(((JsonPrimitive) jsonElement).getAsString());\n\t\t\t\t\t\treturn new JSONRelation(JSONContextNode.this, arcXri, targetContextNodeXri);\n\t\tJsonObject jsonObject = ((JSONGraph) this.getGraph()).jsonLoad(this.getXri().toString());\n\t\t\t\tfinal XDI3Segment arcXri = XDI3Segment.create(entry.getKey().substring(1));\n\t\t\t\t\t\tXDI3Segment contextNodeXri = XDI3Segment.create(((JsonPrimitive) jsonElement).getAsString());\n\t\t\t\t\t\tContextNode contextNode = JSONContextNode.this.getGraph().getDeepContextNode(contextNodeXri, false);\n\t\t\t\t\t\t\tlog.warn(\"In context node \" + JSONContextNode.this.getXri() + \" found incoming relation \" + arcXri + \" from non-existent context node \" + contextNodeXri);\n\t\t\t\t\t\treturn new JSONRelation(contextNode, arcXri, JSONContextNode.this.getXri());\n\tpublic void delRelation(XDI3Segment arcXri, XDI3Segment targetContextNodeXri) {\n\t\t((JSONGraph) this.getGraph()).jsonDeleteFromArray(this.getXri().toString(), arcXri.toString(), new JsonPrimitive(targetContextNodeXri.toString()));\n\t\t((JSONGraph) this.getGraph()).jsonDeleteFromArray(targetContextNodeXri.toString(), \"/\" + arcXri.toString(), new JsonPrimitive(this.getXri().toString()));\n\t\tthis.delRelationDelInnerRoot(arcXri, targetContextNodeXri);\n\t\t((JSONGraph) this.getGraph()).jsonSaveToObject(this.getXri().toString(), XDIConstants.XRI_SS_LITERAL.toString(), AbstractLiteral.literalDataToJsonElement(literalData));\n\t\tJsonObject jsonObject = ((JSONGraph) this.getGraph()).jsonLoad(this.getXri().toString());\n\t\tif (! jsonObject.has(XDIConstants.XRI_SS_LITERAL.toString())) return null;\n\t\t((JSONGraph) this.getGraph()).jsonDeleteFromObject(this.getXri().toString(), XDIConstants.XRI_SS_LITERAL.toString());", "old_methods": [], "patch": "@@ -15,16 +15,16 @@\n import xdi2.core.constants.XDIConstants;\n import xdi2.core.impl.AbstractContextNode;\n import xdi2.core.impl.AbstractLiteral;\n-import xdi2.core.util.XDI3Util;\n+import xdi2.core.syntax.XDIAddress;\n+import xdi2.core.syntax.XDIArc;\n+import xdi2.core.util.AddressUtil;\n import xdi2.core.util.iterators.DescendingIterator;\n import xdi2.core.util.iterators.EmptyIterator;\n import xdi2.core.util.iterators.IteratorContains;\n import xdi2.core.util.iterators.IteratorListMaker;\n import xdi2.core.util.iterators.MappingIterator;\n import xdi2.core.util.iterators.NotNullIterator;\n import xdi2.core.util.iterators.ReadOnlyIterator;\n-import xdi2.core.xri3.XDI3Segment;\n-import xdi2.core.xri3.XDI3SubSegment;\n \n import com.google.gson.JsonArray;\n import com.google.gson.JsonElement;\n@@ -37,14 +37,14 @@ public class JSONContextNode extends AbstractContextNode implements ContextNode\n \n \tprivate static final Logger log = LoggerFactory.getLogger(JSONContextNode.class);\n \n-\tprivate XDI3SubSegment arcXri;\n-\tprivate XDI3Segment xri;\n+\tprivate XDIArc arc;\n+\tprivate XDIAddress xri;\n \n-\tJSONContextNode(JSONGraph graph, JSONContextNode contextNode, XDI3SubSegment arcXri, XDI3Segment xri) {\n+\tJSONContextNode(JSONGraph graph, JSONContextNode contextNode, XDIArc arc, XDIAddress xri) {\n \n \t\tsuper(graph, contextNode);\n \n-\t\tthis.arcXri = arcXri;\n+\t\tthis.arc = arc;\n \t\tthis.xri = xri;\n \t}\n \n@@ -61,13 +61,13 @@ public synchronized void clear() {\n \t}\n \n \t@Override\n-\tpublic XDI3SubSegment getArcXri() {\n+\tpublic XDIArc getArc() {\n \n-\t\treturn this.arcXri;\n+\t\treturn this.arc;\n \t}\n \n \t@Override\n-\tpublic XDI3Segment getXri() {\n+\tpublic XDIAddress getAddress() {\n \n \t\treturn this.xri;\n \t}\n@@ -77,86 +77,86 @@ public XDI3Segment getXri() {\n \t */\n \n \t@Override\n-\tpublic ContextNode setContextNode(XDI3SubSegment arcXri) {\n+\tpublic ContextNode setContextNode(XDIArc arc) {\n \n \t\t// check validity\n \n-\t\tthis.setContextNodeCheckValid(arcXri);\n+\t\tthis.setContextNodeCheckValid(arc);\n \n \t\t// set the context node\n \n-\t\t((JSONGraph) this.getGraph()).jsonSaveToArray(this.getXri().toString(), XDIConstants.XRI_S_CONTEXT.toString(), new JsonPrimitive(arcXri.toString()));\n+\t\t((JSONGraph) this.getGraph()).jsonSaveToArray(this.getAddress().toString(), XDIConstants.XDI_ADD_CONTEXT.toString(), new JsonPrimitive(arc.toString()));\n \n-\t\tXDI3Segment xri = XDI3Util.concatXris(this.getXri(), arcXri);\n+\t\tXDIAddress xri = AddressUtil.concatAddresses(this.getAddress(), arc);\n \n-\t\tJSONContextNode contextNode = new JSONContextNode((JSONGraph) this.getGraph(), this, arcXri, xri);\n+\t\tJSONContextNode contextNode = new JSONContextNode((JSONGraph) this.getGraph(), this, arc, xri);\n \n \t\t// set inner root\n \n-\t\tthis.setContextNodeSetInnerRoot(arcXri, contextNode);\n+\t\tthis.setContextNodeSetInnerRoot(arc, contextNode);\n \n \t\t// done\n \n \t\treturn contextNode;\n \t}\n \n \t@Override\n-\tpublic ContextNode getContextNode(XDI3SubSegment arcXri, boolean subgraph) {\n+\tpublic ContextNode getContextNode(XDIArc arc, boolean subgraph) {\n \n \t\tJsonObject jsonObject;\n \n \t\tif (subgraph)\n-\t\t\tjsonObject = ((JSONGraph) this.getGraph()).jsonLoadWithPrefix(this.getXri().toString()).get(this.getXri().toString());\n+\t\t\tjsonObject = ((JSONGraph) this.getGraph()).jsonLoadWithPrefix(this.getAddress().toString()).get(this.getAddress().toString());\n \t\telse\n-\t\t\tjsonObject = ((JSONGraph) this.getGraph()).jsonLoad(this.getXri().toString());\n+\t\t\tjsonObject = ((JSONGraph) this.getGraph()).jsonLoad(this.getAddress().toString());\n \n \t\tif (jsonObject == null) return null;\n \n-\t\tfinal JsonArray jsonArrayContexts = jsonObject.getAsJsonArray(XDIConstants.XRI_S_CONTEXT.toString());\n+\t\tfinal JsonArray jsonArrayContexts = jsonObject.getAsJsonArray(XDIConstants.XDI_ADD_CONTEXT.toString());\n \t\tif (jsonArrayContexts == null) return null;\n \t\tif (jsonArrayContexts.size() < 1) return null;\n \n-\t\tif (! new IteratorContains<JsonElement> (jsonArrayContexts.iterator(), new JsonPrimitive(arcXri.toString())).contains()) return null;\n+\t\tif (! new IteratorContains<JsonElement> (jsonArrayContexts.iterator(), new JsonPrimitive(arc.toString())).contains()) return null;\n \n-\t\tXDI3Segment xri = XDI3Util.concatXris(this.getXri(), arcXri);\n+\t\tXDIAddress xri = AddressUtil.concatAddresses(this.getAddress(), arc);\n \n-\t\treturn new JSONContextNode((JSONGraph) JSONContextNode.this.getGraph(), JSONContextNode.this, arcXri, xri);\n+\t\treturn new JSONContextNode((JSONGraph) JSONContextNode.this.getGraph(), JSONContextNode.this, arc, xri);\n \t}\n \n \t@Override\n-\tpublic ContextNode getDeepContextNode(XDI3Segment relativeContextNodeXri, boolean subgraph) {\n+\tpublic ContextNode getDeepContextNode(XDIAddress relativecontextNodeAddress, boolean subgraph) {\n \n-\t\tif (XDIConstants.XRI_S_ROOT.equals(relativeContextNodeXri)) return this;\n+\t\tif (XDIConstants.XDI_ADD_ROOT.equals(relativecontextNodeAddress)) return this;\n \n-\t\tXDI3Segment contextNodeXri = XDI3Util.concatXris(this.getXri(), relativeContextNodeXri);\n+\t\tXDIAddress contextNodeAddress = AddressUtil.concatAddresses(this.getAddress(), relativecontextNodeAddress);\n \n-\t\tXDI3Segment parentContextNodeXri = XDI3Util.concatXris(this.getXri(), XDI3Util.parentXri(relativeContextNodeXri, -1));\n-\t\tXDI3SubSegment arcXri = relativeContextNodeXri.getLastSubSegment();\n+\t\tXDIAddress parentcontextNodeAddress = AddressUtil.concatAddresses(this.getAddress(), AddressUtil.parentXri(relativecontextNodeAddress, -1));\n+\t\tXDIArc arc = relativecontextNodeAddress.getLastArc();\n \n \t\t// load the JSON object for the parent context node\n \n-\t\tJsonObject jsonObject = ((JSONGraph) this.getGraph()).jsonLoad(parentContextNodeXri.toString());\n+\t\tJsonObject jsonObject = ((JSONGraph) this.getGraph()).jsonLoad(parentcontextNodeAddress.toString());\n \n-\t\tfinal JsonArray jsonArrayContexts = jsonObject.getAsJsonArray(XDIConstants.XRI_S_CONTEXT.toString());\n+\t\tfinal JsonArray jsonArrayContexts = jsonObject.getAsJsonArray(XDIConstants.XDI_ADD_CONTEXT.toString());\n \t\tif (jsonArrayContexts == null) return null;\n \t\tif (jsonArrayContexts.size() < 1) return null;\n \n-\t\tif (! new IteratorContains<JsonElement> (jsonArrayContexts.iterator(), new JsonPrimitive(arcXri.toString())).contains()) return null;\n+\t\tif (! new IteratorContains<JsonElement> (jsonArrayContexts.iterator(), new JsonPrimitive(arc.toString())).contains()) return null;\n \n \t\tJSONContextNode contextNode = this;\n \n-\t\tfor (XDI3SubSegment tempArcXri : relativeContextNodeXri.getSubSegments()) {\n+\t\tfor (XDIArc temparc : relativecontextNodeAddress.getArcs()) {\n \n-\t\t\tXDI3Segment tempXri = XDI3Util.concatXris(contextNode.getXri(), tempArcXri);\n+\t\t\tXDIAddress tempXri = AddressUtil.concatAddresses(contextNode.getAddress(), temparc);\n \n-\t\t\tcontextNode = new JSONContextNode((JSONGraph) this.getGraph(), contextNode, tempArcXri, tempXri);\n+\t\t\tcontextNode = new JSONContextNode((JSONGraph) this.getGraph(), contextNode, temparc, tempXri);\n \t\t}\n \n \t\t// retrieve subgraph?\n \n \t\tif (subgraph) {\n \n-\t\t\t((JSONGraph) this.getGraph()).jsonLoadWithPrefix(contextNodeXri.toString());\n+\t\t\t((JSONGraph) this.getGraph()).jsonLoadWithPrefix(contextNodeAddress.toString());\n \t\t}\n \n \t\t// done\n@@ -167,9 +167,9 @@ public ContextNode getDeepContextNode(XDI3Segment relativeContextNodeXri, boolea\n \t@Override\n \tpublic ReadOnlyIterator<ContextNode> getContextNodes() {\n \n-\t\tJsonObject jsonObject = ((JSONGraph) this.getGraph()).jsonLoad(this.getXri().toString());\n+\t\tJsonObject jsonObject = ((JSONGraph) this.getGraph()).jsonLoad(this.getAddress().toString());\n \n-\t\tfinal JsonArray jsonArrayContexts = jsonObject.getAsJsonArray(XDIConstants.XRI_S_CONTEXT.toString());\n+\t\tfinal JsonArray jsonArrayContexts = jsonObject.getAsJsonArray(XDIConstants.XDI_ADD_CONTEXT.toString());\n \t\tif (jsonArrayContexts == null) return new EmptyIterator<ContextNode> ();\n \t\tif (jsonArrayContexts.size() < 1) return new EmptyIterator<ContextNode> ();\n \n@@ -180,18 +180,18 @@ public ReadOnlyIterator<ContextNode> getContextNodes() {\n \t\t\t@Override\n \t\t\tpublic ContextNode map(JsonElement jsonElement) {\n \n-\t\t\t\tXDI3SubSegment arcXri = XDI3SubSegment.create(((JsonPrimitive) jsonElement).getAsString());\n-\t\t\t\tXDI3Segment xri = XDI3Util.concatXris(JSONContextNode.this.getXri(), arcXri);\n+\t\t\t\tXDIArc arc = XDIArc.create(((JsonPrimitive) jsonElement).getAsString());\n+\t\t\t\tXDIAddress xri = AddressUtil.concatAddresses(JSONContextNode.this.getAddress(), arc);\n \n-\t\t\t\treturn new JSONContextNode((JSONGraph) JSONContextNode.this.getGraph(), JSONContextNode.this, arcXri, xri);\n+\t\t\t\treturn new JSONContextNode((JSONGraph) JSONContextNode.this.getGraph(), JSONContextNode.this, arc, xri);\n \t\t\t}\n \t\t});\n \t}\n \n \t@Override\n-\tpublic void delContextNode(XDI3SubSegment arcXri) {\n+\tpublic void delContextNode(XDIArc arc) {\n \n-\t\tContextNode contextNode = this.getContextNode(arcXri, true);\n+\t\tContextNode contextNode = this.getContextNode(arc, true);\n \t\tif (contextNode == null) return;\n \n \t\t// delete all relations and incoming relations\n@@ -201,25 +201,25 @@ public void delContextNode(XDI3SubSegment arcXri) {\n \n \t\t// delete this context node\n \n-\t\t((JSONGraph) this.getGraph()).jsonDelete(contextNode.getXri().toString());\n-\t\t((JSONGraph) this.getGraph()).jsonDeleteFromArray(this.getXri().toString(), XDIConstants.XRI_S_CONTEXT.toString(), new JsonPrimitive(arcXri.toString()));\n+\t\t((JSONGraph) this.getGraph()).jsonDelete(contextNode.getAddress().toString());\n+\t\t((JSONGraph) this.getGraph()).jsonDeleteFromArray(this.getAddress().toString(), XDIConstants.XDI_ADD_CONTEXT.toString(), new JsonPrimitive(arc.toString()));\n \t}\n \n \t@Override\n-\tpublic synchronized Relation setRelation(XDI3Segment arcXri, ContextNode targetContextNode) {\n+\tpublic synchronized Relation setRelation(XDIAddress arc, ContextNode targetContextNode) {\n \n-\t\tXDI3Segment targetContextNodeXri = targetContextNode.getXri();\n+\t\tXDIAddress targetContextNodeAddress = targetContextNode.getAddress();\n \n \t\t// check validity\n \n-\t\tthis.setRelationCheckValid(arcXri, targetContextNodeXri);\n+\t\tthis.setRelationCheckValid(arc, targetContextNodeAddress);\n \n \t\t// set the relation\n \n-\t\t((JSONGraph) this.getGraph()).jsonSaveToArray(this.getXri().toString(), arcXri.toString(), new JsonPrimitive(targetContextNodeXri.toString()));\n-\t\t((JSONGraph) this.getGraph()).jsonSaveToArray(targetContextNodeXri.toString(), \"/\" + arcXri.toString(), new JsonPrimitive(this.getXri().toString()));\n+\t\t((JSONGraph) this.getGraph()).jsonSaveToArray(this.getAddress().toString(), arc.toString(), new JsonPrimitive(targetContextNodeAddress.toString()));\n+\t\t((JSONGraph) this.getGraph()).jsonSaveToArray(targetContextNodeAddress.toString(), \"/\" + arc.toString(), new JsonPrimitive(this.getAddress().toString()));\n \n-\t\tJSONRelation relation = new JSONRelation(this, arcXri, targetContextNodeXri);\n+\t\tJSONRelation relation = new JSONRelation(this, arc, targetContextNodeAddress);\n \n \t\t// done\n \n@@ -229,7 +229,7 @@ public synchronized Relation setRelation(XDI3Segment arcXri, ContextNode targetC\n \t@Override\n \tpublic ReadOnlyIterator<Relation> getRelations() {\n \n-\t\tJsonObject jsonObject = ((JSONGraph) this.getGraph()).jsonLoad(this.getXri().toString());\n+\t\tJsonObject jsonObject = ((JSONGraph) this.getGraph()).jsonLoad(this.getAddress().toString());\n \n \t\tfinal Set<Entry<String, JsonElement>> entrySet = new HashSet<Entry<String, JsonElement>> (jsonObject.entrySet());\n \n@@ -240,9 +240,9 @@ public Iterator<Relation> descend(Entry<String, JsonElement> entry) {\n \n \t\t\t\tif (entry.getKey().startsWith(\"/\")) return null;\n \n-\t\t\t\tfinal XDI3Segment arcXri = XDI3Segment.create(entry.getKey());\n-\t\t\t\tif (XDIConstants.XRI_S_CONTEXT.equals(arcXri)) return null;\n-\t\t\t\tif (XDIConstants.XRI_S_LITERAL.equals(arcXri)) return null;\n+\t\t\t\tfinal XDIAddress arc = XDIAddress.create(entry.getKey());\n+\t\t\t\tif (XDIConstants.XDI_ADD_CONTEXT.equals(arc)) return null;\n+\t\t\t\tif (XDIConstants.XDI_ADD_LITERAL.equals(arc)) return null;\n \n \t\t\t\tJsonArray jsonArrayRelations = (JsonArray) entry.getValue();\n \n@@ -253,9 +253,9 @@ public Iterator<Relation> descend(Entry<String, JsonElement> entry) {\n \t\t\t\t\t@Override\n \t\t\t\t\tpublic Relation map(JsonElement jsonElement) {\n \n-\t\t\t\t\t\tXDI3Segment targetContextNodeXri = XDI3Segment.create(((JsonPrimitive) jsonElement).getAsString());\n+\t\t\t\t\t\tXDIAddress targetContextNodeAddress = XDIAddress.create(((JsonPrimitive) jsonElement).getAsString());\n \n-\t\t\t\t\t\treturn new JSONRelation(JSONContextNode.this, arcXri, targetContextNodeXri);\n+\t\t\t\t\t\treturn new JSONRelation(JSONContextNode.this, arc, targetContextNodeAddress);\n \t\t\t\t\t}\n \t\t\t\t});\n \t\t\t}\n@@ -265,7 +265,7 @@ public Relation map(JsonElement jsonElement) {\n \t@Override\n \tpublic ReadOnlyIterator<Relation> getIncomingRelations() {\n \n-\t\tJsonObject jsonObject = ((JSONGraph) this.getGraph()).jsonLoad(this.getXri().toString());\n+\t\tJsonObject jsonObject = ((JSONGraph) this.getGraph()).jsonLoad(this.getAddress().toString());\n \n \t\tfinal Set<Entry<String, JsonElement>> entrySet = new HashSet<Entry<String, JsonElement>> (jsonObject.entrySet());\n \n@@ -276,7 +276,7 @@ public Iterator<Relation> descend(Entry<String, JsonElement> entry) {\n \n \t\t\t\tif (! entry.getKey().startsWith(\"/\")) return null;\n \n-\t\t\t\tfinal XDI3Segment arcXri = XDI3Segment.create(entry.getKey().substring(1));\n+\t\t\t\tfinal XDIAddress arc = XDIAddress.create(entry.getKey().substring(1));\n \n \t\t\t\tJsonArray jsonArrayIncomingRelations = (JsonArray) entry.getValue();\n \n@@ -287,35 +287,35 @@ public Iterator<Relation> descend(Entry<String, JsonElement> entry) {\n \t\t\t\t\t@Override\n \t\t\t\t\tpublic Relation map(JsonElement jsonElement) {\n \n-\t\t\t\t\t\tXDI3Segment contextNodeXri = XDI3Segment.create(((JsonPrimitive) jsonElement).getAsString());\n+\t\t\t\t\t\tXDIAddress contextNodeAddress = XDIAddress.create(((JsonPrimitive) jsonElement).getAsString());\n \n-\t\t\t\t\t\tContextNode contextNode = JSONContextNode.this.getGraph().getDeepContextNode(contextNodeXri, false);\n+\t\t\t\t\t\tContextNode contextNode = JSONContextNode.this.getGraph().getDeepContextNode(contextNodeAddress, false);\n \n \t\t\t\t\t\tif (contextNode == null) {\n \n-\t\t\t\t\t\t\tlog.warn(\"In context node \" + JSONContextNode.this.getXri() + \" found incoming relation \" + arcXri + \" from non-existent context node \" + contextNodeXri);\n+\t\t\t\t\t\t\tlog.warn(\"In context node \" + JSONContextNode.this.getAddress() + \" found incoming relation \" + arc + \" from non-existent context node \" + contextNodeAddress);\n \n \t\t\t\t\t\t\treturn null;\n \t\t\t\t\t\t}\n \n-\t\t\t\t\t\treturn new JSONRelation(contextNode, arcXri, JSONContextNode.this.getXri());\n+\t\t\t\t\t\treturn new JSONRelation(contextNode, arc, JSONContextNode.this.getAddress());\n \t\t\t\t\t}\n \t\t\t\t});\n \t\t\t}\n \t\t};\n \t}\n \n \t@Override\n-\tpublic void delRelation(XDI3Segment arcXri, XDI3Segment targetContextNodeXri) {\n+\tpublic void delRelation(XDIAddress arc, XDIAddress targetContextNodeAddress) {\n \n \t\t// delete the relation\n \n-\t\t((JSONGraph) this.getGraph()).jsonDeleteFromArray(this.getXri().toString(), arcXri.toString(), new JsonPrimitive(targetContextNodeXri.toString()));\n-\t\t((JSONGraph) this.getGraph()).jsonDeleteFromArray(targetContextNodeXri.toString(), \"/\" + arcXri.toString(), new JsonPrimitive(this.getXri().toString()));\n+\t\t((JSONGraph) this.getGraph()).jsonDeleteFromArray(this.getAddress().toString(), arc.toString(), new JsonPrimitive(targetContextNodeAddress.toString()));\n+\t\t((JSONGraph) this.getGraph()).jsonDeleteFromArray(targetContextNodeAddress.toString(), \"/\" + arc.toString(), new JsonPrimitive(this.getAddress().toString()));\n \n \t\t// delete inner root\n \n-\t\tthis.delRelationDelInnerRoot(arcXri, targetContextNodeXri);\n+\t\tthis.delRelationDelInnerRoot(arc, targetContextNodeAddress);\n \t}\n \n \t@Override\n@@ -327,7 +327,7 @@ public Literal setLiteral(Object literalData) {\n \n \t\t// set the literal\n \n-\t\t((JSONGraph) this.getGraph()).jsonSaveToObject(this.getXri().toString(), XDIConstants.XRI_SS_LITERAL.toString(), AbstractLiteral.literalDataToJsonElement(literalData));\n+\t\t((JSONGraph) this.getGraph()).jsonSaveToObject(this.getAddress().toString(), XDIConstants.XDI_ARC_LITERAL.toString(), AbstractLiteral.literalDataToJsonElement(literalData));\n \n \t\tJSONLiteral literal = new JSONLiteral(this);\n \n@@ -339,16 +339,16 @@ public Literal setLiteral(Object literalData) {\n \t@Override\n \tpublic Literal getLiteral() {\n \n-\t\tJsonObject jsonObject = ((JSONGraph) this.getGraph()).jsonLoad(this.getXri().toString());\n+\t\tJsonObject jsonObject = ((JSONGraph) this.getGraph()).jsonLoad(this.getAddress().toString());\n \n-\t\tif (! jsonObject.has(XDIConstants.XRI_SS_LITERAL.toString())) return null;\n+\t\tif (! jsonObject.has(XDIConstants.XDI_ARC_LITERAL.toString())) return null;\n \n \t\treturn new JSONLiteral(this);\n \t}\n \n \t@Override\n \tpublic void delLiteral() {\n \n-\t\t((JSONGraph) this.getGraph()).jsonDeleteFromObject(this.getXri().toString(), XDIConstants.XRI_SS_LITERAL.toString());\n+\t\t((JSONGraph) this.getGraph()).jsonDeleteFromObject(this.getAddress().toString(), XDIConstants.XDI_ARC_LITERAL.toString());\n \t}\n }", "raw_url": "https://github.com/projectdanube/xdi2/raw/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Fimpl%2Fjson%2FJSONContextNode.java", "sha": "a2a2eacfc4677ce1d2a98873ee2608bdf5c62ad8", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/projectdanube/xdi2/blob/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Fimpl%2Fjson%2FJSONGraph.java", "changes": 2, "contents_url": "https://api.github.com/repos/projectdanube/xdi2/contents/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Fimpl%2Fjson%2FJSONGraph.java?ref=0ca7982fec30c2bb8204efbbea61428a643d2e9c", "deletions": 1, "filename": "core/src/main/java/xdi2/core/impl/json/JSONGraph.java", "new_code": "\t\tthis.jsonRootContextNode = new JSONContextNode(this, null, null, XDIConstants.XDI_ADD_ROOT);", "new_methods": [], "old_code": "\t\tthis.jsonRootContextNode = new JSONContextNode(this, null, null, XDIConstants.XRI_S_ROOT);", "old_methods": [], "patch": "@@ -49,7 +49,7 @@ public class JSONGraph extends AbstractGraph implements Graph {\n \n \t\tthis.jsonStore = jsonStore;\n \n-\t\tthis.jsonRootContextNode = new JSONContextNode(this, null, null, XDIConstants.XRI_S_ROOT);\n+\t\tthis.jsonRootContextNode = new JSONContextNode(this, null, null, XDIConstants.XDI_ADD_ROOT);\n \n \t\tthis.jsonObjectsCached = new HashMap<String, JsonObject> ();\n \t\tthis.jsonObjectsCachedWithPrefix = new HashSet<String> ();", "raw_url": "https://github.com/projectdanube/xdi2/raw/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Fimpl%2Fjson%2FJSONGraph.java", "sha": "b615bec86579444c47f96681c7ecccc245be469c", "status": "modified" }, { "additions": 3, "blob_url": "https://github.com/projectdanube/xdi2/blob/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Fimpl%2Fjson%2FJSONLiteral.java", "changes": 6, "contents_url": "https://api.github.com/repos/projectdanube/xdi2/contents/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Fimpl%2Fjson%2FJSONLiteral.java?ref=0ca7982fec30c2bb8204efbbea61428a643d2e9c", "deletions": 3, "filename": "core/src/main/java/xdi2/core/impl/json/JSONLiteral.java", "new_code": "\t\tJsonObject jsonObject = ((JSONGraph) this.getGraph()).jsonLoad(jsonContextNode.getAddress().toString());\n\t\treturn AbstractLiteral.jsonElementToLiteralData(jsonObject.get(XDIConstants.XDI_ARC_LITERAL.toString()));\n\t\t((JSONGraph) this.getGraph()).jsonSaveToObject(jsonContextNode.getAddress().toString(), XDIConstants.XDI_ARC_LITERAL.toString(), AbstractLiteral.literalDataToJsonElement(literalData));", "new_methods": [], "old_code": "\t\tJsonObject jsonObject = ((JSONGraph) this.getGraph()).jsonLoad(jsonContextNode.getXri().toString());\n\t\treturn AbstractLiteral.jsonElementToLiteralData(jsonObject.get(XDIConstants.XRI_SS_LITERAL.toString()));\n\t\t((JSONGraph) this.getGraph()).jsonSaveToObject(jsonContextNode.getXri().toString(), XDIConstants.XRI_SS_LITERAL.toString(), AbstractLiteral.literalDataToJsonElement(literalData));", "old_methods": [], "patch": "@@ -21,16 +21,16 @@ public Object getLiteralData() {\n \n \t\tJSONContextNode jsonContextNode = (JSONContextNode) this.getContextNode();\n \n-\t\tJsonObject jsonObject = ((JSONGraph) this.getGraph()).jsonLoad(jsonContextNode.getXri().toString());\n+\t\tJsonObject jsonObject = ((JSONGraph) this.getGraph()).jsonLoad(jsonContextNode.getAddress().toString());\n \n-\t\treturn AbstractLiteral.jsonElementToLiteralData(jsonObject.get(XDIConstants.XRI_SS_LITERAL.toString()));\n+\t\treturn AbstractLiteral.jsonElementToLiteralData(jsonObject.get(XDIConstants.XDI_ARC_LITERAL.toString()));\n \t}\n \n \t@Override\n \tpublic void setLiteralData(Object literalData) {\n \n \t\tJSONContextNode jsonContextNode = (JSONContextNode) this.getContextNode();\n \n-\t\t((JSONGraph) this.getGraph()).jsonSaveToObject(jsonContextNode.getXri().toString(), XDIConstants.XRI_SS_LITERAL.toString(), AbstractLiteral.literalDataToJsonElement(literalData));\n+\t\t((JSONGraph) this.getGraph()).jsonSaveToObject(jsonContextNode.getAddress().toString(), XDIConstants.XDI_ARC_LITERAL.toString(), AbstractLiteral.literalDataToJsonElement(literalData));\n \t}\n }", "raw_url": "https://github.com/projectdanube/xdi2/raw/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Fimpl%2Fjson%2FJSONLiteral.java", "sha": "d63c61a13913ad19554700de35575ec84c315db3", "status": "modified" }, { "additions": 10, "blob_url": "https://github.com/projectdanube/xdi2/blob/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Fimpl%2Fjson%2FJSONRelation.java", "changes": 20, "contents_url": "https://api.github.com/repos/projectdanube/xdi2/contents/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Fimpl%2Fjson%2FJSONRelation.java?ref=0ca7982fec30c2bb8204efbbea61428a643d2e9c", "deletions": 10, "filename": "core/src/main/java/xdi2/core/impl/json/JSONRelation.java", "new_code": "import xdi2.core.syntax.XDIAddress;\n\tprivate XDIAddress arc;\n\tprivate XDIAddress targetContextNodeAddress;\n\tpublic JSONRelation(ContextNode contextNode, XDIAddress arc, XDIAddress targetContextNodeAddress) {\n\t\tthis.arc = arc;\n\t\tthis.targetContextNodeAddress = targetContextNodeAddress;\n\tpublic XDIAddress getArc() {\n\t\treturn this.arc;\n\tpublic XDIAddress getTargetContextNodeAddress() {\n\t\treturn this.targetContextNodeAddress;", "new_methods": [], "old_code": "import xdi2.core.xri3.XDI3Segment;\n\tprivate XDI3Segment arcXri;\n\tprivate XDI3Segment targetContextNodeXri;\n\tpublic JSONRelation(ContextNode contextNode, XDI3Segment arcXri, XDI3Segment targetContextNodeXri) {\n\t\tthis.arcXri = arcXri;\n\t\tthis.targetContextNodeXri = targetContextNodeXri;\n\tpublic XDI3Segment getArcXri() {\n\t\treturn this.arcXri;\n\tpublic XDI3Segment getTargetContextNodeXri() {\n\t\treturn this.targetContextNodeXri;", "old_methods": [], "patch": "@@ -3,32 +3,32 @@\n import xdi2.core.ContextNode;\n import xdi2.core.Relation;\n import xdi2.core.impl.AbstractRelation;\n-import xdi2.core.xri3.XDI3Segment;\n+import xdi2.core.syntax.XDIAddress;\n \n public class JSONRelation extends AbstractRelation implements Relation {\n \n \tprivate static final long serialVersionUID = 60162590532295669L;\n \n-\tprivate XDI3Segment arcXri;\n-\tprivate XDI3Segment targetContextNodeXri;\n+\tprivate XDIAddress arc;\n+\tprivate XDIAddress targetContextNodeAddress;\n \n-\tpublic JSONRelation(ContextNode contextNode, XDI3Segment arcXri, XDI3Segment targetContextNodeXri) {\n+\tpublic JSONRelation(ContextNode contextNode, XDIAddress arc, XDIAddress targetContextNodeAddress) {\n \n \t\tsuper(contextNode);\n \n-\t\tthis.arcXri = arcXri;\n-\t\tthis.targetContextNodeXri = targetContextNodeXri;\n+\t\tthis.arc = arc;\n+\t\tthis.targetContextNodeAddress = targetContextNodeAddress;\n \t}\n \n \t@Override\n-\tpublic XDI3Segment getArcXri() {\n+\tpublic XDIAddress getArc() {\n \n-\t\treturn this.arcXri;\n+\t\treturn this.arc;\n \t}\n \n \t@Override\n-\tpublic XDI3Segment getTargetContextNodeXri() {\n+\tpublic XDIAddress getTargetContextNodeAddress() {\n \n-\t\treturn this.targetContextNodeXri;\n+\t\treturn this.targetContextNodeAddress;\n \t}\n }", "raw_url": "https://github.com/projectdanube/xdi2/raw/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Fimpl%2Fjson%2FJSONRelation.java", "sha": "dc3ae5a13936aae95cf14b934465427b1f107632", "status": "modified" }, { "additions": 77, "blob_url": "https://github.com/projectdanube/xdi2/blob/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Fimpl%2Fkeyvalue%2FKeyValueContextNode.java", "changes": 154, "contents_url": "https://api.github.com/repos/projectdanube/xdi2/contents/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Fimpl%2Fkeyvalue%2FKeyValueContextNode.java?ref=0ca7982fec30c2bb8204efbbea61428a643d2e9c", "deletions": 77, "filename": "core/src/main/java/xdi2/core/impl/keyvalue/KeyValueContextNode.java", "new_code": "import xdi2.core.syntax.XDIAddress;\r\nimport xdi2.core.syntax.XDIArc;\r\n\tprivate XDIArc arc;\r\n\tpublic KeyValueContextNode(KeyValueGraph graph, KeyValueContextNode contextNode, KeyValueStore keyValueStore, String key, XDIArc arc) {\r\n\t\tthis.arc = arc;\r\n\tpublic XDIArc getArc() {\r\n\t\treturn this.arc;\r\n\tpublic synchronized ContextNode setContextNode(XDIArc arc) {\r\n\t\tthis.setContextNodeCheckValid(arc);\r\n\t\tString contextNodeKey = this.getContextNodeKey(arc);\r\n\t\tif (this.keyValueStore.contains(contextNodesKey, arc.toString())) {\r\n\t\t\tKeyValueContextNode contextNode = new KeyValueContextNode((KeyValueGraph) this.getGraph(), this, this.keyValueStore, contextNodeKey, arc);\r\n\t\tthis.keyValueStore.set(contextNodesKey, arc.toString());\r\n\t\tKeyValueContextNode contextNode = new KeyValueContextNode((KeyValueGraph) this.getGraph(), this, this.keyValueStore, contextNodeKey, arc);\r\n\t\tthis.setContextNodeSetInnerRoot(arc, contextNode);\r\n\t\t\t\tXDIArc arc = XDIArc.create(item);\r\n\t\t\t\tString contextNodeKey = KeyValueContextNode.this.getContextNodeKey(arc);\r\n\t\t\t\treturn new KeyValueContextNode((KeyValueGraph) KeyValueContextNode.this.getGraph(), KeyValueContextNode.this, KeyValueContextNode.this.keyValueStore, contextNodeKey, arc);\r\n\tpublic ContextNode getContextNode(XDIArc arc, boolean subgraph) {\r\n\t\tString contextNodeKey = this.getContextNodeKey(arc);\r\n\t\tif (! this.keyValueStore.contains(contextNodesKey, arc.toString())) return null;\r\n\t\treturn new KeyValueContextNode((KeyValueGraph) this.getGraph(), this, this.keyValueStore, contextNodeKey, arc);\r\n\tpublic boolean containsContextNode(XDIArc arc) {\r\n\t\treturn this.keyValueStore.contains(contextNodesKey, arc.toString());\r\n\tpublic synchronized void delContextNode(XDIArc arc) {\r\n\t\tContextNode contextNode = this.getContextNode(arc, true);\r\n\t\tthis.keyValueStore.delete(contextNodesKey, arc.toString());\r\n\tpublic synchronized Relation setRelation(XDIAddress arc, ContextNode targetContextNode) {\r\n\t\tXDIAddress targetContextNodeAddress = targetContextNode.getAddress();\r\n\t\tthis.setRelationCheckValid(arc, targetContextNodeAddress);\r\n\t\tString relationKey = this.getRelationKey(arc);\r\n\t\tthis.keyValueStore.set(relationsKey, arc.toString());\r\n\t\tthis.keyValueStore.set(relationKey, targetContextNodeAddress.toString());\r\n\t\tKeyValueRelation relation = new KeyValueRelation(this, this.keyValueStore, relationKey, arc, targetContextNodeAddress);\r\n\tpublic Relation getRelation(XDIAddress arc, XDIAddress targetContextNodeAddress) {\r\n\t\tString relationKey = this.getRelationKey(arc);\r\n\t\tif (! this.keyValueStore.contains(relationsKey, arc.toString())) return null;\r\n\t\tif (! this.keyValueStore.contains(relationKey, targetContextNodeAddress.toString())) return null;\r\n\t\treturn new KeyValueRelation(this, this.keyValueStore, relationKey, arc, targetContextNodeAddress);\r\n\tpublic Relation getRelation(XDIAddress arc) {\r\n\t\tString relationKey = this.getRelationKey(arc);\r\n\t\tif (! this.keyValueStore.contains(relationsKey, arc.toString())) return null;\r\n\t\tXDIAddress relationXri = XDIAddress.create(this.keyValueStore.getOne(relationKey));\r\n\t\treturn new KeyValueRelation(this, this.keyValueStore, relationKey, arc, relationXri);\r\n\tpublic ReadOnlyIterator<Relation> getRelations(final XDIAddress arc) {\r\n\t\tfinal String relationKey = this.getRelationKey(arc);\r\n\t\tif (! this.keyValueStore.contains(relationsKey, arc.toString())) return new EmptyIterator<Relation> ();\r\n\t\t\t\tXDIAddress relationXri = XDIAddress.create(relationXriString);\r\n\t\t\t\treturn new KeyValueRelation(KeyValueContextNode.this, KeyValueContextNode.this.keyValueStore, relationKey, arc, relationXri);\r\n\t\t\t\tfinal XDIAddress arc = XDIAddress.create(item);\r\n\t\t\t\tfinal String relationKey = KeyValueContextNode.this.getRelationKey(arc);\r\n\t\t\t\t\t\treturn new KeyValueRelation(KeyValueContextNode.this, KeyValueContextNode.this.keyValueStore, relationKey, arc, XDIAddress.create(relationXriString));\r\n\tpublic boolean containsRelation(XDIAddress arc, XDIAddress targetContextNodeAddress) {\r\n\t\tString relationKey = this.getRelationKey(arc);\r\n\t\treturn this.keyValueStore.contains(relationsKey, arc.toString()) && this.keyValueStore.contains(relationKey, targetContextNodeAddress.toString());\r\n\tpublic boolean containsRelations(XDIAddress arc) {\r\n\t\tString relationKey = this.getRelationKey(arc);\r\n\t\treturn this.keyValueStore.contains(relationsKey, arc.toString()) && this.keyValueStore.contains(relationKey);\r\n\tpublic synchronized void delRelation(XDIAddress arc, XDIAddress targetContextNodeAddress) {\r\n\t\tString relationKey = this.getRelationKey(arc);\r\n\t\tthis.keyValueStore.delete(relationKey, targetContextNodeAddress.toString());\r\n\t\t\tthis.keyValueStore.delete(relationsKey, arc.toString());\r\n\t\tthis.delRelationDelInnerRoot(arc, targetContextNodeAddress);\r\n\tpublic synchronized void delRelations(XDIAddress arc) {\r\n\t\tReadOnlyIterator<Relation> relations = this.getRelations(arc);\r\n\t\tthis.keyValueStore.delete(relationsKey, arc.toString());\r\n\t\t\tthis.delRelationDelInnerRoot(relation.getArc(), relation.getTargetContextNodeAddress());\r\n\t\t\tthis.delRelationDelInnerRoot(relation.getArc(), relation.getTargetContextNodeAddress());\r\n\t\t\t\tfinal XDIAddress arc = XDIAddress.create(item);\r\n\t\t\t\tfinal String relationKey = KeyValueContextNode.this.getRelationKey(arc);\r\n\tpublic long getRelationCount(XDIAddress arc) {\r\n\t\tString relationKey = this.getRelationKey(arc);\r\n\t\tif (! this.keyValueStore.contains(relationsKey, arc.toString())) return 0;\r\n\tprivate String getContextNodeKey(XDIArc arc) {\r\n\t\treturn (this.isRootContextNode() ? \"\" : this.key) + arc.toString();\r\n\tprivate String getRelationKey(XDIAddress arc) {\r\n\t\treturn (this.isRootContextNode() ? \"\" : this.key) + \"/\" + arc.toString();\r", "new_methods": [], "old_code": "import xdi2.core.xri3.XDI3Segment;\r\nimport xdi2.core.xri3.XDI3SubSegment;\r\n\tprivate XDI3SubSegment arcXri;\r\n\tpublic KeyValueContextNode(KeyValueGraph graph, KeyValueContextNode contextNode, KeyValueStore keyValueStore, String key, XDI3SubSegment arcXri) {\r\n\t\tthis.arcXri = arcXri;\r\n\tpublic XDI3SubSegment getArcXri() {\r\n\t\treturn this.arcXri;\r\n\tpublic synchronized ContextNode setContextNode(XDI3SubSegment arcXri) {\r\n\t\tthis.setContextNodeCheckValid(arcXri);\r\n\t\tString contextNodeKey = this.getContextNodeKey(arcXri);\r\n\t\tif (this.keyValueStore.contains(contextNodesKey, arcXri.toString())) {\r\n\t\t\tKeyValueContextNode contextNode = new KeyValueContextNode((KeyValueGraph) this.getGraph(), this, this.keyValueStore, contextNodeKey, arcXri);\r\n\t\tthis.keyValueStore.set(contextNodesKey, arcXri.toString());\r\n\t\tKeyValueContextNode contextNode = new KeyValueContextNode((KeyValueGraph) this.getGraph(), this, this.keyValueStore, contextNodeKey, arcXri);\r\n\t\tthis.setContextNodeSetInnerRoot(arcXri, contextNode);\r\n\t\t\t\tXDI3SubSegment arcXri = XDI3SubSegment.create(item);\r\n\t\t\t\tString contextNodeKey = KeyValueContextNode.this.getContextNodeKey(arcXri);\r\n\t\t\t\treturn new KeyValueContextNode((KeyValueGraph) KeyValueContextNode.this.getGraph(), KeyValueContextNode.this, KeyValueContextNode.this.keyValueStore, contextNodeKey, arcXri);\r\n\tpublic ContextNode getContextNode(XDI3SubSegment arcXri, boolean subgraph) {\r\n\t\tString contextNodeKey = this.getContextNodeKey(arcXri);\r\n\t\tif (! this.keyValueStore.contains(contextNodesKey, arcXri.toString())) return null;\r\n\t\treturn new KeyValueContextNode((KeyValueGraph) this.getGraph(), this, this.keyValueStore, contextNodeKey, arcXri);\r\n\tpublic boolean containsContextNode(XDI3SubSegment arcXri) {\r\n\t\treturn this.keyValueStore.contains(contextNodesKey, arcXri.toString());\r\n\tpublic synchronized void delContextNode(XDI3SubSegment arcXri) {\r\n\t\tContextNode contextNode = this.getContextNode(arcXri, true);\r\n\t\tthis.keyValueStore.delete(contextNodesKey, arcXri.toString());\r\n\tpublic synchronized Relation setRelation(XDI3Segment arcXri, ContextNode targetContextNode) {\r\n\t\tXDI3Segment targetContextNodeXri = targetContextNode.getXri();\r\n\t\tthis.setRelationCheckValid(arcXri, targetContextNodeXri);\r\n\t\tString relationKey = this.getRelationKey(arcXri);\r\n\t\tthis.keyValueStore.set(relationsKey, arcXri.toString());\r\n\t\tthis.keyValueStore.set(relationKey, targetContextNodeXri.toString());\r\n\t\tKeyValueRelation relation = new KeyValueRelation(this, this.keyValueStore, relationKey, arcXri, targetContextNodeXri);\r\n\tpublic Relation getRelation(XDI3Segment arcXri, XDI3Segment targetContextNodeXri) {\r\n\t\tString relationKey = this.getRelationKey(arcXri);\r\n\t\tif (! this.keyValueStore.contains(relationsKey, arcXri.toString())) return null;\r\n\t\tif (! this.keyValueStore.contains(relationKey, targetContextNodeXri.toString())) return null;\r\n\t\treturn new KeyValueRelation(this, this.keyValueStore, relationKey, arcXri, targetContextNodeXri);\r\n\tpublic Relation getRelation(XDI3Segment arcXri) {\r\n\t\tString relationKey = this.getRelationKey(arcXri);\r\n\t\tif (! this.keyValueStore.contains(relationsKey, arcXri.toString())) return null;\r\n\t\tXDI3Segment relationXri = XDI3Segment.create(this.keyValueStore.getOne(relationKey));\r\n\t\treturn new KeyValueRelation(this, this.keyValueStore, relationKey, arcXri, relationXri);\r\n\tpublic ReadOnlyIterator<Relation> getRelations(final XDI3Segment arcXri) {\r\n\t\tfinal String relationKey = this.getRelationKey(arcXri);\r\n\t\tif (! this.keyValueStore.contains(relationsKey, arcXri.toString())) return new EmptyIterator<Relation> ();\r\n\t\t\t\tXDI3Segment relationXri = XDI3Segment.create(relationXriString);\r\n\t\t\t\treturn new KeyValueRelation(KeyValueContextNode.this, KeyValueContextNode.this.keyValueStore, relationKey, arcXri, relationXri);\r\n\t\t\t\tfinal XDI3Segment arcXri = XDI3Segment.create(item);\r\n\t\t\t\tfinal String relationKey = KeyValueContextNode.this.getRelationKey(arcXri);\r\n\t\t\t\t\t\treturn new KeyValueRelation(KeyValueContextNode.this, KeyValueContextNode.this.keyValueStore, relationKey, arcXri, XDI3Segment.create(relationXriString));\r\n\tpublic boolean containsRelation(XDI3Segment arcXri, XDI3Segment targetContextNodeXri) {\r\n\t\tString relationKey = this.getRelationKey(arcXri);\r\n\t\treturn this.keyValueStore.contains(relationsKey, arcXri.toString()) && this.keyValueStore.contains(relationKey, targetContextNodeXri.toString());\r\n\tpublic boolean containsRelations(XDI3Segment arcXri) {\r\n\t\tString relationKey = this.getRelationKey(arcXri);\r\n\t\treturn this.keyValueStore.contains(relationsKey, arcXri.toString()) && this.keyValueStore.contains(relationKey);\r\n\tpublic synchronized void delRelation(XDI3Segment arcXri, XDI3Segment targetContextNodeXri) {\r\n\t\tString relationKey = this.getRelationKey(arcXri);\r\n\t\tthis.keyValueStore.delete(relationKey, targetContextNodeXri.toString());\r\n\t\t\tthis.keyValueStore.delete(relationsKey, arcXri.toString());\r\n\t\tthis.delRelationDelInnerRoot(arcXri, targetContextNodeXri);\r\n\tpublic synchronized void delRelations(XDI3Segment arcXri) {\r\n\t\tReadOnlyIterator<Relation> relations = this.getRelations(arcXri);\r\n\t\tthis.keyValueStore.delete(relationsKey, arcXri.toString());\r\n\t\t\tthis.delRelationDelInnerRoot(relation.getArcXri(), relation.getTargetContextNodeXri());\r\n\t\t\tthis.delRelationDelInnerRoot(relation.getArcXri(), relation.getTargetContextNodeXri());\r\n\t\t\t\tfinal XDI3Segment arcXri = XDI3Segment.create(item);\r\n\t\t\t\tfinal String relationKey = KeyValueContextNode.this.getRelationKey(arcXri);\r\n\tpublic long getRelationCount(XDI3Segment arcXri) {\r\n\t\tString relationKey = this.getRelationKey(arcXri);\r\n\t\tif (! this.keyValueStore.contains(relationsKey, arcXri.toString())) return 0;\r\n\tprivate String getContextNodeKey(XDI3SubSegment arcXri) {\r\n\t\treturn (this.isRootContextNode() ? \"\" : this.key) + arcXri.toString();\r\n\tprivate String getRelationKey(XDI3Segment arcXri) {\r\n\t\treturn (this.isRootContextNode() ? \"\" : this.key) + \"/\" + arcXri.toString();\r", "old_methods": [], "patch": "@@ -8,13 +8,13 @@\n import xdi2.core.Relation;\r\n import xdi2.core.impl.AbstractContextNode;\r\n import xdi2.core.impl.AbstractLiteral;\r\n+import xdi2.core.syntax.XDIAddress;\r\n+import xdi2.core.syntax.XDIArc;\r\n import xdi2.core.util.iterators.DescendingIterator;\r\n import xdi2.core.util.iterators.EmptyIterator;\r\n import xdi2.core.util.iterators.IteratorListMaker;\r\n import xdi2.core.util.iterators.MappingIterator;\r\n import xdi2.core.util.iterators.ReadOnlyIterator;\r\n-import xdi2.core.xri3.XDI3Segment;\r\n-import xdi2.core.xri3.XDI3SubSegment;\r\n \r\n public class KeyValueContextNode extends AbstractContextNode implements ContextNode {\r\n \r\n@@ -23,16 +23,16 @@ public class KeyValueContextNode extends AbstractContextNode implements ContextN\n \tprivate KeyValueStore keyValueStore;\r\n \tprivate String key;\r\n \r\n-\tprivate XDI3SubSegment arcXri;\r\n+\tprivate XDIArc arc;\r\n \r\n-\tpublic KeyValueContextNode(KeyValueGraph graph, KeyValueContextNode contextNode, KeyValueStore keyValueStore, String key, XDI3SubSegment arcXri) {\r\n+\tpublic KeyValueContextNode(KeyValueGraph graph, KeyValueContextNode contextNode, KeyValueStore keyValueStore, String key, XDIArc arc) {\r\n \r\n \t\tsuper(graph, contextNode);\r\n \r\n \t\tthis.keyValueStore = keyValueStore;\r\n \t\tthis.key = key;\r\n \r\n-\t\tthis.arcXri = arcXri;\r\n+\t\tthis.arc = arc;\r\n \t}\r\n \r\n \t@Override\r\n@@ -48,43 +48,43 @@ public synchronized void clear() {\n \t}\r\n \r\n \t@Override\r\n-\tpublic XDI3SubSegment getArcXri() {\r\n+\tpublic XDIArc getArc() {\r\n \r\n-\t\treturn this.arcXri;\r\n+\t\treturn this.arc;\r\n \t}\r\n \r\n \t/*\r\n \t * Methods related to context nodes of this context node\r\n \t */\r\n \r\n \t@Override\r\n-\tpublic synchronized ContextNode setContextNode(XDI3SubSegment arcXri) {\r\n+\tpublic synchronized ContextNode setContextNode(XDIArc arc) {\r\n \r\n \t\t// check validity\r\n \r\n-\t\tthis.setContextNodeCheckValid(arcXri);\r\n+\t\tthis.setContextNodeCheckValid(arc);\r\n \r\n \t\t// set the context node\r\n \r\n \t\tString contextNodesKey = this.getContextNodesKey();\r\n-\t\tString contextNodeKey = this.getContextNodeKey(arcXri);\r\n+\t\tString contextNodeKey = this.getContextNodeKey(arc);\r\n \r\n-\t\tif (this.keyValueStore.contains(contextNodesKey, arcXri.toString())) {\r\n+\t\tif (this.keyValueStore.contains(contextNodesKey, arc.toString())) {\r\n \r\n-\t\t\tKeyValueContextNode contextNode = new KeyValueContextNode((KeyValueGraph) this.getGraph(), this, this.keyValueStore, contextNodeKey, arcXri);\r\n+\t\t\tKeyValueContextNode contextNode = new KeyValueContextNode((KeyValueGraph) this.getGraph(), this, this.keyValueStore, contextNodeKey, arc);\r\n \t\t\treturn contextNode;\r\n \t\t}\r\n \r\n-\t\tthis.keyValueStore.set(contextNodesKey, arcXri.toString());\r\n+\t\tthis.keyValueStore.set(contextNodesKey, arc.toString());\r\n \t\tthis.keyValueStore.delete(contextNodeKey + \"/--C\");\r\n \t\tthis.keyValueStore.delete(contextNodeKey + \"/--R\");\r\n \t\tthis.keyValueStore.delete(contextNodeKey + \"/--L\");\r\n \r\n-\t\tKeyValueContextNode contextNode = new KeyValueContextNode((KeyValueGraph) this.getGraph(), this, this.keyValueStore, contextNodeKey, arcXri);\r\n+\t\tKeyValueContextNode contextNode = new KeyValueContextNode((KeyValueGraph) this.getGraph(), this, this.keyValueStore, contextNodeKey, arc);\r\n \r\n \t\t// set inner root\r\n \r\n-\t\tthis.setContextNodeSetInnerRoot(arcXri, contextNode);\r\n+\t\tthis.setContextNodeSetInnerRoot(arc, contextNode);\r\n \r\n \t\t// done\r\n \r\n@@ -101,33 +101,33 @@ public ReadOnlyIterator<ContextNode> getContextNodes() {\n \t\t\t@Override\r\n \t\t\tpublic ContextNode map(String item) {\r\n \r\n-\t\t\t\tXDI3SubSegment arcXri = XDI3SubSegment.create(item);\r\n-\t\t\t\tString contextNodeKey = KeyValueContextNode.this.getContextNodeKey(arcXri);\r\n+\t\t\t\tXDIArc arc = XDIArc.create(item);\r\n+\t\t\t\tString contextNodeKey = KeyValueContextNode.this.getContextNodeKey(arc);\r\n \r\n-\t\t\t\treturn new KeyValueContextNode((KeyValueGraph) KeyValueContextNode.this.getGraph(), KeyValueContextNode.this, KeyValueContextNode.this.keyValueStore, contextNodeKey, arcXri);\r\n+\t\t\t\treturn new KeyValueContextNode((KeyValueGraph) KeyValueContextNode.this.getGraph(), KeyValueContextNode.this, KeyValueContextNode.this.keyValueStore, contextNodeKey, arc);\r\n \t\t\t}\r\n \t\t}).list();\r\n \r\n \t\treturn new ReadOnlyIterator<ContextNode> (list.iterator());\r\n \t}\r\n \r\n \t@Override\r\n-\tpublic ContextNode getContextNode(XDI3SubSegment arcXri, boolean subgraph) {\r\n+\tpublic ContextNode getContextNode(XDIArc arc, boolean subgraph) {\r\n \r\n \t\tString contextNodesKey = this.getContextNodesKey();\r\n-\t\tString contextNodeKey = this.getContextNodeKey(arcXri);\r\n+\t\tString contextNodeKey = this.getContextNodeKey(arc);\r\n \r\n-\t\tif (! this.keyValueStore.contains(contextNodesKey, arcXri.toString())) return null;\r\n+\t\tif (! this.keyValueStore.contains(contextNodesKey, arc.toString())) return null;\r\n \r\n-\t\treturn new KeyValueContextNode((KeyValueGraph) this.getGraph(), this, this.keyValueStore, contextNodeKey, arcXri);\r\n+\t\treturn new KeyValueContextNode((KeyValueGraph) this.getGraph(), this, this.keyValueStore, contextNodeKey, arc);\r\n \t}\r\n \r\n \t@Override\r\n-\tpublic boolean containsContextNode(XDI3SubSegment arcXri) {\r\n+\tpublic boolean containsContextNode(XDIArc arc) {\r\n \r\n \t\tString contextNodesKey = this.getContextNodesKey();\r\n \r\n-\t\treturn this.keyValueStore.contains(contextNodesKey, arcXri.toString());\r\n+\t\treturn this.keyValueStore.contains(contextNodesKey, arc.toString());\r\n \t}\r\n \r\n \t@Override\r\n@@ -139,9 +139,9 @@ public boolean containsContextNodes() {\n \t}\r\n \r\n \t@Override\r\n-\tpublic synchronized void delContextNode(XDI3SubSegment arcXri) {\r\n+\tpublic synchronized void delContextNode(XDIArc arc) {\r\n \r\n-\t\tContextNode contextNode = this.getContextNode(arcXri, true);\r\n+\t\tContextNode contextNode = this.getContextNode(arc, true);\r\n \t\tif (contextNode == null) return;\r\n \r\n \t\t// delete all relations and incoming relations\r\n@@ -153,7 +153,7 @@ public synchronized void delContextNode(XDI3SubSegment arcXri) {\n \r\n \t\tString contextNodesKey = this.getContextNodesKey();\r\n \r\n-\t\tthis.keyValueStore.delete(contextNodesKey, arcXri.toString());\r\n+\t\tthis.keyValueStore.delete(contextNodesKey, arc.toString());\r\n \t}\r\n \r\n \t@Override\r\n@@ -187,72 +187,72 @@ public synchronized long getContextNodeCount() {\n \t */\r\n \r\n \t@Override\r\n-\tpublic synchronized Relation setRelation(XDI3Segment arcXri, ContextNode targetContextNode) {\r\n+\tpublic synchronized Relation setRelation(XDIAddress arc, ContextNode targetContextNode) {\r\n \r\n-\t\tXDI3Segment targetContextNodeXri = targetContextNode.getXri();\r\n+\t\tXDIAddress targetContextNodeAddress = targetContextNode.getAddress();\r\n \r\n \t\t// check validity\r\n \r\n-\t\tthis.setRelationCheckValid(arcXri, targetContextNodeXri);\r\n+\t\tthis.setRelationCheckValid(arc, targetContextNodeAddress);\r\n \r\n \t\t// set the relation\r\n \r\n \t\tString relationsKey = this.getRelationsKey();\r\n-\t\tString relationKey = this.getRelationKey(arcXri);\r\n+\t\tString relationKey = this.getRelationKey(arc);\r\n \r\n-\t\tthis.keyValueStore.set(relationsKey, arcXri.toString());\r\n-\t\tthis.keyValueStore.set(relationKey, targetContextNodeXri.toString());\r\n+\t\tthis.keyValueStore.set(relationsKey, arc.toString());\r\n+\t\tthis.keyValueStore.set(relationKey, targetContextNodeAddress.toString());\r\n \r\n-\t\tKeyValueRelation relation = new KeyValueRelation(this, this.keyValueStore, relationKey, arcXri, targetContextNodeXri);\r\n+\t\tKeyValueRelation relation = new KeyValueRelation(this, this.keyValueStore, relationKey, arc, targetContextNodeAddress);\r\n \r\n \t\t// done\r\n \r\n \t\treturn relation;\r\n \t}\r\n \r\n \t@Override\r\n-\tpublic Relation getRelation(XDI3Segment arcXri, XDI3Segment targetContextNodeXri) {\r\n+\tpublic Relation getRelation(XDIAddress arc, XDIAddress targetContextNodeAddress) {\r\n \r\n \t\tString relationsKey = this.getRelationsKey();\r\n-\t\tString relationKey = this.getRelationKey(arcXri);\r\n+\t\tString relationKey = this.getRelationKey(arc);\r\n \r\n-\t\tif (! this.keyValueStore.contains(relationsKey, arcXri.toString())) return null;\r\n-\t\tif (! this.keyValueStore.contains(relationKey, targetContextNodeXri.toString())) return null;\r\n+\t\tif (! this.keyValueStore.contains(relationsKey, arc.toString())) return null;\r\n+\t\tif (! this.keyValueStore.contains(relationKey, targetContextNodeAddress.toString())) return null;\r\n \r\n-\t\treturn new KeyValueRelation(this, this.keyValueStore, relationKey, arcXri, targetContextNodeXri);\r\n+\t\treturn new KeyValueRelation(this, this.keyValueStore, relationKey, arc, targetContextNodeAddress);\r\n \t}\r\n \r\n \t@Override\r\n-\tpublic Relation getRelation(XDI3Segment arcXri) {\r\n+\tpublic Relation getRelation(XDIAddress arc) {\r\n \r\n \t\tString relationsKey = this.getRelationsKey();\r\n-\t\tString relationKey = this.getRelationKey(arcXri);\r\n+\t\tString relationKey = this.getRelationKey(arc);\r\n \r\n-\t\tif (! this.keyValueStore.contains(relationsKey, arcXri.toString())) return null;\r\n+\t\tif (! this.keyValueStore.contains(relationsKey, arc.toString())) return null;\r\n \t\tif (! this.keyValueStore.contains(relationKey)) return null;\r\n \r\n-\t\tXDI3Segment relationXri = XDI3Segment.create(this.keyValueStore.getOne(relationKey));\r\n+\t\tXDIAddress relationXri = XDIAddress.create(this.keyValueStore.getOne(relationKey));\r\n \r\n-\t\treturn new KeyValueRelation(this, this.keyValueStore, relationKey, arcXri, relationXri);\r\n+\t\treturn new KeyValueRelation(this, this.keyValueStore, relationKey, arc, relationXri);\r\n \t}\r\n \r\n \t@Override\r\n-\tpublic ReadOnlyIterator<Relation> getRelations(final XDI3Segment arcXri) {\r\n+\tpublic ReadOnlyIterator<Relation> getRelations(final XDIAddress arc) {\r\n \r\n \t\tString relationsKey = this.getRelationsKey();\r\n-\t\tfinal String relationKey = this.getRelationKey(arcXri);\r\n+\t\tfinal String relationKey = this.getRelationKey(arc);\r\n \r\n-\t\tif (! this.keyValueStore.contains(relationsKey, arcXri.toString())) return new EmptyIterator<Relation> ();\r\n+\t\tif (! this.keyValueStore.contains(relationsKey, arc.toString())) return new EmptyIterator<Relation> ();\r\n \t\tif (! this.keyValueStore.contains(relationKey)) return new EmptyIterator<Relation> ();\r\n \r\n \t\tList<Relation> list = new IteratorListMaker<Relation> (new MappingIterator<String, Relation> (this.keyValueStore.getAll(relationKey)) {\r\n \r\n \t\t\t@Override\r\n \t\t\tpublic Relation map(String relationXriString) {\r\n \r\n-\t\t\t\tXDI3Segment relationXri = XDI3Segment.create(relationXriString);\r\n+\t\t\t\tXDIAddress relationXri = XDIAddress.create(relationXriString);\r\n \r\n-\t\t\t\treturn new KeyValueRelation(KeyValueContextNode.this, KeyValueContextNode.this.keyValueStore, relationKey, arcXri, relationXri);\r\n+\t\t\t\treturn new KeyValueRelation(KeyValueContextNode.this, KeyValueContextNode.this.keyValueStore, relationKey, arc, relationXri);\r\n \t\t\t}\r\n \t\t}).list();\r\n \r\n@@ -269,15 +269,15 @@ public ReadOnlyIterator<Relation> getRelations() {\n \t\t\t@Override\r\n \t\t\tpublic Iterator<Relation> descend(String item) {\r\n \r\n-\t\t\t\tfinal XDI3Segment arcXri = XDI3Segment.create(item);\r\n-\t\t\t\tfinal String relationKey = KeyValueContextNode.this.getRelationKey(arcXri);\r\n+\t\t\t\tfinal XDIAddress arc = XDIAddress.create(item);\r\n+\t\t\t\tfinal String relationKey = KeyValueContextNode.this.getRelationKey(arc);\r\n \r\n \t\t\t\treturn new MappingIterator<String, Relation> (KeyValueContextNode.this.keyValueStore.getAll(relationKey)) {\r\n \r\n \t\t\t\t\t@Override\r\n \t\t\t\t\tpublic Relation map(String relationXriString) {\r\n \r\n-\t\t\t\t\t\treturn new KeyValueRelation(KeyValueContextNode.this, KeyValueContextNode.this.keyValueStore, relationKey, arcXri, XDI3Segment.create(relationXriString));\r\n+\t\t\t\t\t\treturn new KeyValueRelation(KeyValueContextNode.this, KeyValueContextNode.this.keyValueStore, relationKey, arc, XDIAddress.create(relationXriString));\r\n \t\t\t\t\t}\r\n \t\t\t\t};\r\n \t\t\t}\r\n@@ -287,21 +287,21 @@ public Relation map(String relationXriString) {\n \t}\r\n \r\n \t@Override\r\n-\tpublic boolean containsRelation(XDI3Segment arcXri, XDI3Segment targetContextNodeXri) {\r\n+\tpublic boolean containsRelation(XDIAddress arc, XDIAddress targetContextNodeAddress) {\r\n \r\n \t\tString relationsKey = this.getRelationsKey();\r\n-\t\tString relationKey = this.getRelationKey(arcXri);\r\n+\t\tString relationKey = this.getRelationKey(arc);\r\n \r\n-\t\treturn this.keyValueStore.contains(relationsKey, arcXri.toString()) && this.keyValueStore.contains(relationKey, targetContextNodeXri.toString());\r\n+\t\treturn this.keyValueStore.contains(relationsKey, arc.toString()) && this.keyValueStore.contains(relationKey, targetContextNodeAddress.toString());\r\n \t}\r\n \r\n \t@Override\r\n-\tpublic boolean containsRelations(XDI3Segment arcXri) {\r\n+\tpublic boolean containsRelations(XDIAddress arc) {\r\n \r\n \t\tString relationsKey = this.getRelationsKey();\r\n-\t\tString relationKey = this.getRelationKey(arcXri);\r\n+\t\tString relationKey = this.getRelationKey(arc);\r\n \r\n-\t\treturn this.keyValueStore.contains(relationsKey, arcXri.toString()) && this.keyValueStore.contains(relationKey);\r\n+\t\treturn this.keyValueStore.contains(relationsKey, arc.toString()) && this.keyValueStore.contains(relationKey);\r\n \t}\r\n \r\n \t@Override\r\n@@ -313,41 +313,41 @@ public boolean containsRelations() {\n \t}\r\n \r\n \t@Override\r\n-\tpublic synchronized void delRelation(XDI3Segment arcXri, XDI3Segment targetContextNodeXri) {\r\n+\tpublic synchronized void delRelation(XDIAddress arc, XDIAddress targetContextNodeAddress) {\r\n \r\n \t\t// delete the relation\r\n \r\n \t\tString relationsKey = this.getRelationsKey();\r\n-\t\tString relationKey = this.getRelationKey(arcXri);\r\n+\t\tString relationKey = this.getRelationKey(arc);\r\n \r\n-\t\tthis.keyValueStore.delete(relationKey, targetContextNodeXri.toString());\r\n+\t\tthis.keyValueStore.delete(relationKey, targetContextNodeAddress.toString());\r\n \r\n \t\tif (! this.keyValueStore.contains(relationKey)) {\r\n \r\n-\t\t\tthis.keyValueStore.delete(relationsKey, arcXri.toString());\r\n+\t\t\tthis.keyValueStore.delete(relationsKey, arc.toString());\r\n \t\t}\r\n \r\n \t\t// delete inner root\r\n \r\n-\t\tthis.delRelationDelInnerRoot(arcXri, targetContextNodeXri);\r\n+\t\tthis.delRelationDelInnerRoot(arc, targetContextNodeAddress);\r\n \t}\r\n \r\n \t@Override\r\n-\tpublic synchronized void delRelations(XDI3Segment arcXri) {\r\n+\tpublic synchronized void delRelations(XDIAddress arc) {\r\n \r\n-\t\tReadOnlyIterator<Relation> relations = this.getRelations(arcXri);\r\n+\t\tReadOnlyIterator<Relation> relations = this.getRelations(arc);\r\n \r\n \t\t// delete relations\r\n \r\n \t\tString relationsKey = this.getRelationsKey();\r\n \r\n-\t\tthis.keyValueStore.delete(relationsKey, arcXri.toString());\r\n+\t\tthis.keyValueStore.delete(relationsKey, arc.toString());\r\n \r\n \t\t// delete inner roots\r\n \r\n \t\tfor (Relation relation : relations) {\r\n \r\n-\t\t\tthis.delRelationDelInnerRoot(relation.getArcXri(), relation.getTargetContextNodeXri());\r\n+\t\t\tthis.delRelationDelInnerRoot(relation.getArc(), relation.getTargetContextNodeAddress());\r\n \t\t}\r\n \t}\r\n \r\n@@ -366,7 +366,7 @@ public synchronized void delRelations() {\n \r\n \t\tfor (Relation relation : relations) {\r\n \r\n-\t\t\tthis.delRelationDelInnerRoot(relation.getArcXri(), relation.getTargetContextNodeXri());\r\n+\t\t\tthis.delRelationDelInnerRoot(relation.getArc(), relation.getTargetContextNodeAddress());\r\n \t\t}\r\n \t}\r\n \r\n@@ -380,8 +380,8 @@ public long getRelationCount() {\n \t\t\t@Override\r\n \t\t\tpublic Long map(String item) {\r\n \r\n-\t\t\t\tfinal XDI3Segment arcXri = XDI3Segment.create(item);\r\n-\t\t\t\tfinal String relationKey = KeyValueContextNode.this.getRelationKey(arcXri);\r\n+\t\t\t\tfinal XDIAddress arc = XDIAddress.create(item);\r\n+\t\t\t\tfinal String relationKey = KeyValueContextNode.this.getRelationKey(arc);\r\n \r\n \t\t\t\treturn Long.valueOf(KeyValueContextNode.this.keyValueStore.count(relationKey));\r\n \t\t\t}\r\n@@ -394,12 +394,12 @@ public Long map(String item) {\n \t}\r\n \r\n \t@Override\r\n-\tpublic long getRelationCount(XDI3Segment arcXri) {\r\n+\tpublic long getRelationCount(XDIAddress arc) {\r\n \r\n \t\tString relationsKey = this.getRelationsKey();\r\n-\t\tString relationKey = this.getRelationKey(arcXri);\r\n+\t\tString relationKey = this.getRelationKey(arc);\r\n \r\n-\t\tif (! this.keyValueStore.contains(relationsKey, arcXri.toString())) return 0;\r\n+\t\tif (! this.keyValueStore.contains(relationsKey, arc.toString())) return 0;\r\n \r\n \t\treturn this.keyValueStore.count(relationKey);\r\n \t}\r\n@@ -463,19 +463,19 @@ private String getContextNodesKey() {\n \t\treturn (this.isRootContextNode() ? \"\" : this.key) + \"/--C\";\r\n \t}\r\n \r\n-\tprivate String getContextNodeKey(XDI3SubSegment arcXri) {\r\n+\tprivate String getContextNodeKey(XDIArc arc) {\r\n \r\n-\t\treturn (this.isRootContextNode() ? \"\" : this.key) + arcXri.toString();\r\n+\t\treturn (this.isRootContextNode() ? \"\" : this.key) + arc.toString();\r\n \t}\r\n \r\n \tprivate String getRelationsKey() {\r\n \r\n \t\treturn (this.isRootContextNode() ? \"\" : this.key) + \"/--R\";\r\n \t}\r\n \r\n-\tprivate String getRelationKey(XDI3Segment arcXri) {\r\n+\tprivate String getRelationKey(XDIAddress arc) {\r\n \r\n-\t\treturn (this.isRootContextNode() ? \"\" : this.key) + \"/\" + arcXri.toString();\r\n+\t\treturn (this.isRootContextNode() ? \"\" : this.key) + \"/\" + arc.toString();\r\n \t}\r\n \r\n \tprivate String getLiteralKey() {\r", "raw_url": "https://github.com/projectdanube/xdi2/raw/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Fimpl%2Fkeyvalue%2FKeyValueContextNode.java", "sha": "0b60028bce14e81f0c27745c723476c630eca913", "status": "modified" }, { "additions": 10, "blob_url": "https://github.com/projectdanube/xdi2/blob/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Fimpl%2Fkeyvalue%2FKeyValueRelation.java", "changes": 20, "contents_url": "https://api.github.com/repos/projectdanube/xdi2/contents/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Fimpl%2Fkeyvalue%2FKeyValueRelation.java?ref=0ca7982fec30c2bb8204efbbea61428a643d2e9c", "deletions": 10, "filename": "core/src/main/java/xdi2/core/impl/keyvalue/KeyValueRelation.java", "new_code": "import xdi2.core.syntax.XDIAddress;\r\n\tprivate XDIAddress arc;\r\n\tprivate XDIAddress targetContextNodeAddress;\r\n\tKeyValueRelation(KeyValueContextNode contextNode, KeyValueStore keyValueStore, String key, XDIAddress arc, XDIAddress targetContextNodeAddress) {\r\n\t\tthis.arc = arc;\r\n\t\tthis.targetContextNodeAddress = targetContextNodeAddress;\r\n\tpublic XDIAddress getArc() {\r\n\t\treturn this.arc;\r\n\tpublic XDIAddress getTargetContextNodeAddress() {\r\n\t\treturn this.targetContextNodeAddress;\r", "new_methods": [], "old_code": "import xdi2.core.xri3.XDI3Segment;\r\n\tprivate XDI3Segment arcXri;\r\n\tprivate XDI3Segment targetContextNodeXri;\r\n\tKeyValueRelation(KeyValueContextNode contextNode, KeyValueStore keyValueStore, String key, XDI3Segment arcXri, XDI3Segment targetContextNodeXri) {\r\n\t\tthis.arcXri = arcXri;\r\n\t\tthis.targetContextNodeXri = targetContextNodeXri;\r\n\tpublic XDI3Segment getArcXri() {\r\n\t\treturn this.arcXri;\r\n\tpublic XDI3Segment getTargetContextNodeXri() {\r\n\t\treturn this.targetContextNodeXri;\r", "old_methods": [], "patch": "@@ -2,7 +2,7 @@\n \r\n import xdi2.core.Relation;\r\n import xdi2.core.impl.AbstractRelation;\r\n-import xdi2.core.xri3.XDI3Segment;\r\n+import xdi2.core.syntax.XDIAddress;\r\n \r\n public class KeyValueRelation extends AbstractRelation implements Relation {\r\n \r\n@@ -11,30 +11,30 @@ public class KeyValueRelation extends AbstractRelation implements Relation {\n \tprivate KeyValueStore keyValueStore;\r\n \tprivate String key;\r\n \r\n-\tprivate XDI3Segment arcXri;\r\n-\tprivate XDI3Segment targetContextNodeXri;\r\n+\tprivate XDIAddress arc;\r\n+\tprivate XDIAddress targetContextNodeAddress;\r\n \r\n-\tKeyValueRelation(KeyValueContextNode contextNode, KeyValueStore keyValueStore, String key, XDI3Segment arcXri, XDI3Segment targetContextNodeXri) {\r\n+\tKeyValueRelation(KeyValueContextNode contextNode, KeyValueStore keyValueStore, String key, XDIAddress arc, XDIAddress targetContextNodeAddress) {\r\n \r\n \t\tsuper(contextNode);\r\n \r\n \t\tthis.keyValueStore = keyValueStore;\r\n \t\tthis.key = key;\r\n \r\n-\t\tthis.arcXri = arcXri;\r\n-\t\tthis.targetContextNodeXri = targetContextNodeXri;\r\n+\t\tthis.arc = arc;\r\n+\t\tthis.targetContextNodeAddress = targetContextNodeAddress;\r\n \t}\r\n \r\n \t@Override\r\n-\tpublic XDI3Segment getArcXri() {\r\n+\tpublic XDIAddress getArc() {\r\n \r\n-\t\treturn this.arcXri;\r\n+\t\treturn this.arc;\r\n \t}\r\n \r\n \t@Override\r\n-\tpublic XDI3Segment getTargetContextNodeXri() {\r\n+\tpublic XDIAddress getTargetContextNodeAddress() {\r\n \r\n-\t\treturn this.targetContextNodeXri;\r\n+\t\treturn this.targetContextNodeAddress;\r\n \t}\r\n \r\n \t/*\r", "raw_url": "https://github.com/projectdanube/xdi2/raw/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Fimpl%2Fkeyvalue%2FKeyValueRelation.java", "sha": "70a09e1abccb651b3e2b2826e85aff1b851c5c71", "status": "modified" }, { "additions": 60, "blob_url": "https://github.com/projectdanube/xdi2/blob/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Fimpl%2Fmemory%2FMemoryContextNode.java", "changes": 120, "contents_url": "https://api.github.com/repos/projectdanube/xdi2/contents/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Fimpl%2Fmemory%2FMemoryContextNode.java?ref=0ca7982fec30c2bb8204efbbea61428a643d2e9c", "deletions": 60, "filename": "core/src/main/java/xdi2/core/impl/memory/MemoryContextNode.java", "new_code": "import xdi2.core.syntax.XDIAddress;\r\nimport xdi2.core.syntax.XDIArc;\r\n\tprivate XDIArc arc;\r\n\tprivate Map<XDIArc, MemoryContextNode> contextNodes;\r\n\tprivate Map<XDIAddress, Map<XDIAddress, MemoryRelation>> relations;\r\n\tMemoryContextNode(MemoryGraph graph, MemoryContextNode contextNode, XDIArc arc) {\r\n\t\tthis.arc = arc;\r\n\t\t\tthis.contextNodes = new TreeMap<XDIArc, MemoryContextNode> ();\r\n\t\t\tthis.relations = new TreeMap<XDIAddress, Map<XDIAddress, MemoryRelation>> ();\r\n\t\t\tthis.contextNodes = new LinkedHashMap<XDIArc, MemoryContextNode> ();\r\n\t\t\tthis.relations = new LinkedHashMap<XDIAddress, Map<XDIAddress, MemoryRelation>> ();\r\n\t\t\tthis.contextNodes = new HashMap<XDIArc, MemoryContextNode> ();\r\n\t\t\tthis.relations = new HashMap<XDIAddress, Map<XDIAddress, MemoryRelation>> ();\r\n\tpublic XDIArc getArc() {\r\n\t\treturn this.arc;\r\n\tpublic synchronized ContextNode setContextNode(XDIArc arc) {\r\n\t\tthis.setContextNodeCheckValid(arc);\r\n\t\tContextNode contextNode = this.contextNodes.get(arc);\r\n\t\tcontextNode = new MemoryContextNode((MemoryGraph) this.getGraph(), this, arc);\r\n\t\tthis.contextNodes.put(arc, (MemoryContextNode) contextNode);\r\n\t\tthis.setContextNodeSetInnerRoot(arc, contextNode);\r\n\tpublic ContextNode getContextNode(XDIArc arc, boolean subgraph) {\r\n\t\treturn this.contextNodes.get(arc);\r\n\tpublic boolean containsContextNode(XDIArc arc) {\r\n\t\treturn this.contextNodes.containsKey(arc);\r\n\tpublic synchronized void delContextNode(XDIArc arc) {\r\n\t\tContextNode contextNode = this.getContextNode(arc, true);\r\n\t\tthis.contextNodes.remove(arc);\r\n\tpublic synchronized Relation setRelation(XDIAddress arc, ContextNode targetContextNode) {\r\n\t\tXDIAddress targetContextNodeAddress = targetContextNode.getAddress();\r\n\t\tthis.setRelationCheckValid(arc, targetContextNodeAddress);\r\n\t\tRelation relation = this.getRelation(arc, targetContextNodeAddress);\r\n\t\tMap<XDIAddress, MemoryRelation> relations = this.relations.get(arc);\r\n\t\t\t\trelations = new TreeMap<XDIAddress, MemoryRelation> ();\r\n\t\t\t\trelations = new LinkedHashMap<XDIAddress, MemoryRelation> ();\r\n\t\t\t\trelations = new HashMap<XDIAddress, MemoryRelation> ();\r\n\t\t\tthis.relations.put(arc, relations);\r\n\t\trelation = new MemoryRelation(this, arc, targetContextNodeAddress);\r\n\t\trelations.put(targetContextNodeAddress, (MemoryRelation) relation);\r\n\tpublic Relation getRelation(XDIAddress arc, XDIAddress targetContextNodeAddress) {\r\n\t\tMap<XDIAddress, MemoryRelation> relations = this.relations.get(arc);\r\n\t\treturn relations.get(targetContextNodeAddress);\r\n\tpublic ReadOnlyIterator<Relation> getRelations(XDIAddress arc) {\r\n\t\tMap<XDIAddress, MemoryRelation> relations = this.relations.get(arc);\r\n\t\tfor (Entry<XDIAddress, Map<XDIAddress, MemoryRelation>> relations : this.relations.entrySet()) {\r\n\tpublic boolean containsRelation(XDIAddress arc, XDIAddress targetContextNodeAddress) {\r\n\t\tMap<XDIAddress, MemoryRelation> relations = this.relations.get(arc);\r\n\t\treturn relations.containsKey(targetContextNodeAddress);\r\n\tpublic boolean containsRelations(XDIAddress arc) {\r\n\t\treturn this.relations.containsKey(arc);\r\n\tpublic synchronized void delRelation(XDIAddress arc, XDIAddress targetContextNodeAddress) {\r\n\t\tMap<XDIAddress, MemoryRelation> relations = this.relations.get(arc);\r\n\t\tMemoryRelation relation = relations.remove(targetContextNodeAddress);\r\n\t\t\tthis.relations.remove(arc);\r\n\t\tthis.delRelationDelInnerRoot(arc, targetContextNodeAddress);\r\n\tpublic synchronized void delRelations(XDIAddress arc) {\r\n\t\tReadOnlyIterator<Relation> relations = this.getRelations(arc);\r\n\t\tthis.relations.remove(arc);\r\n\t\t\tthis.delRelationDelInnerRoot(relation.getArc(), relation.getTargetContextNodeAddress());\r\n\t\t\tthis.delRelationDelInnerRoot(relation.getArc(), relation.getTargetContextNodeAddress());\r", "new_methods": [], "old_code": "import xdi2.core.xri3.XDI3Segment;\r\nimport xdi2.core.xri3.XDI3SubSegment;\r\n\tprivate XDI3SubSegment arcXri;\r\n\tprivate Map<XDI3SubSegment, MemoryContextNode> contextNodes;\r\n\tprivate Map<XDI3Segment, Map<XDI3Segment, MemoryRelation>> relations;\r\n\tMemoryContextNode(MemoryGraph graph, MemoryContextNode contextNode, XDI3SubSegment arcXri) {\r\n\t\tthis.arcXri = arcXri;\r\n\t\t\tthis.contextNodes = new TreeMap<XDI3SubSegment, MemoryContextNode> ();\r\n\t\t\tthis.relations = new TreeMap<XDI3Segment, Map<XDI3Segment, MemoryRelation>> ();\r\n\t\t\tthis.contextNodes = new LinkedHashMap<XDI3SubSegment, MemoryContextNode> ();\r\n\t\t\tthis.relations = new LinkedHashMap<XDI3Segment, Map<XDI3Segment, MemoryRelation>> ();\r\n\t\t\tthis.contextNodes = new HashMap<XDI3SubSegment, MemoryContextNode> ();\r\n\t\t\tthis.relations = new HashMap<XDI3Segment, Map<XDI3Segment, MemoryRelation>> ();\r\n\tpublic XDI3SubSegment getArcXri() {\r\n\t\treturn this.arcXri;\r\n\tpublic synchronized ContextNode setContextNode(XDI3SubSegment arcXri) {\r\n\t\tthis.setContextNodeCheckValid(arcXri);\r\n\t\tContextNode contextNode = this.contextNodes.get(arcXri);\r\n\t\tcontextNode = new MemoryContextNode((MemoryGraph) this.getGraph(), this, arcXri);\r\n\t\tthis.contextNodes.put(arcXri, (MemoryContextNode) contextNode);\r\n\t\tthis.setContextNodeSetInnerRoot(arcXri, contextNode);\r\n\tpublic ContextNode getContextNode(XDI3SubSegment arcXri, boolean subgraph) {\r\n\t\treturn this.contextNodes.get(arcXri);\r\n\tpublic boolean containsContextNode(XDI3SubSegment arcXri) {\r\n\t\treturn this.contextNodes.containsKey(arcXri);\r\n\tpublic synchronized void delContextNode(XDI3SubSegment arcXri) {\r\n\t\tContextNode contextNode = this.getContextNode(arcXri, true);\r\n\t\tthis.contextNodes.remove(arcXri);\r\n\tpublic synchronized Relation setRelation(XDI3Segment arcXri, ContextNode targetContextNode) {\r\n\t\tXDI3Segment targetContextNodeXri = targetContextNode.getXri();\r\n\t\tthis.setRelationCheckValid(arcXri, targetContextNodeXri);\r\n\t\tRelation relation = this.getRelation(arcXri, targetContextNodeXri);\r\n\t\tMap<XDI3Segment, MemoryRelation> relations = this.relations.get(arcXri);\r\n\t\t\t\trelations = new TreeMap<XDI3Segment, MemoryRelation> ();\r\n\t\t\t\trelations = new LinkedHashMap<XDI3Segment, MemoryRelation> ();\r\n\t\t\t\trelations = new HashMap<XDI3Segment, MemoryRelation> ();\r\n\t\t\tthis.relations.put(arcXri, relations);\r\n\t\trelation = new MemoryRelation(this, arcXri, targetContextNodeXri);\r\n\t\trelations.put(targetContextNodeXri, (MemoryRelation) relation);\r\n\tpublic Relation getRelation(XDI3Segment arcXri, XDI3Segment targetContextNodeXri) {\r\n\t\tMap<XDI3Segment, MemoryRelation> relations = this.relations.get(arcXri);\r\n\t\treturn relations.get(targetContextNodeXri);\r\n\tpublic ReadOnlyIterator<Relation> getRelations(XDI3Segment arcXri) {\r\n\t\tMap<XDI3Segment, MemoryRelation> relations = this.relations.get(arcXri);\r\n\t\tfor (Entry<XDI3Segment, Map<XDI3Segment, MemoryRelation>> relations : this.relations.entrySet()) {\r\n\tpublic boolean containsRelation(XDI3Segment arcXri, XDI3Segment targetContextNodeXri) {\r\n\t\tMap<XDI3Segment, MemoryRelation> relations = this.relations.get(arcXri);\r\n\t\treturn relations.containsKey(targetContextNodeXri);\r\n\tpublic boolean containsRelations(XDI3Segment arcXri) {\r\n\t\treturn this.relations.containsKey(arcXri);\r\n\tpublic synchronized void delRelation(XDI3Segment arcXri, XDI3Segment targetContextNodeXri) {\r\n\t\tMap<XDI3Segment, MemoryRelation> relations = this.relations.get(arcXri);\r\n\t\tMemoryRelation relation = relations.remove(targetContextNodeXri);\r\n\t\t\tthis.relations.remove(arcXri);\r\n\t\tthis.delRelationDelInnerRoot(arcXri, targetContextNodeXri);\r\n\tpublic synchronized void delRelations(XDI3Segment arcXri) {\r\n\t\tReadOnlyIterator<Relation> relations = this.getRelations(arcXri);\r\n\t\tthis.relations.remove(arcXri);\r\n\t\t\tthis.delRelationDelInnerRoot(relation.getArcXri(), relation.getTargetContextNodeXri());\r\n\t\t\tthis.delRelationDelInnerRoot(relation.getArcXri(), relation.getTargetContextNodeXri());\r", "old_methods": [], "patch": "@@ -12,88 +12,88 @@\n import xdi2.core.Literal;\r\n import xdi2.core.Relation;\r\n import xdi2.core.impl.AbstractContextNode;\r\n+import xdi2.core.syntax.XDIAddress;\r\n+import xdi2.core.syntax.XDIArc;\r\n import xdi2.core.util.iterators.EmptyIterator;\r\n import xdi2.core.util.iterators.ReadOnlyIterator;\r\n-import xdi2.core.xri3.XDI3Segment;\r\n-import xdi2.core.xri3.XDI3SubSegment;\r\n \r\n public class MemoryContextNode extends AbstractContextNode implements ContextNode {\r\n \r\n \tprivate static final long serialVersionUID = 4930852359817860369L;\r\n \r\n-\tprivate XDI3SubSegment arcXri;\r\n+\tprivate XDIArc arc;\r\n \r\n-\tprivate Map<XDI3SubSegment, MemoryContextNode> contextNodes;\r\n-\tprivate Map<XDI3Segment, Map<XDI3Segment, MemoryRelation>> relations;\r\n+\tprivate Map<XDIArc, MemoryContextNode> contextNodes;\r\n+\tprivate Map<XDIAddress, Map<XDIAddress, MemoryRelation>> relations;\r\n \tprivate MemoryLiteral literal;\r\n \r\n-\tMemoryContextNode(MemoryGraph graph, MemoryContextNode contextNode, XDI3SubSegment arcXri) {\r\n+\tMemoryContextNode(MemoryGraph graph, MemoryContextNode contextNode, XDIArc arc) {\r\n \r\n \t\tsuper(graph, contextNode);\r\n \r\n-\t\tthis.arcXri = arcXri;\r\n+\t\tthis.arc = arc;\r\n \r\n \t\tif (graph.getSortMode() == MemoryGraphFactory.SORTMODE_ALPHA) {\r\n \r\n-\t\t\tthis.contextNodes = new TreeMap<XDI3SubSegment, MemoryContextNode> ();\r\n-\t\t\tthis.relations = new TreeMap<XDI3Segment, Map<XDI3Segment, MemoryRelation>> ();\r\n+\t\t\tthis.contextNodes = new TreeMap<XDIArc, MemoryContextNode> ();\r\n+\t\t\tthis.relations = new TreeMap<XDIAddress, Map<XDIAddress, MemoryRelation>> ();\r\n \t\t\tthis.literal = null;\r\n \t\t} else if (graph.getSortMode() == MemoryGraphFactory.SORTMODE_ORDER) {\r\n \r\n-\t\t\tthis.contextNodes = new LinkedHashMap<XDI3SubSegment, MemoryContextNode> ();\r\n-\t\t\tthis.relations = new LinkedHashMap<XDI3Segment, Map<XDI3Segment, MemoryRelation>> ();\r\n+\t\t\tthis.contextNodes = new LinkedHashMap<XDIArc, MemoryContextNode> ();\r\n+\t\t\tthis.relations = new LinkedHashMap<XDIAddress, Map<XDIAddress, MemoryRelation>> ();\r\n \t\t\tthis.literal = null;\r\n \t\t} else {\r\n \r\n-\t\t\tthis.contextNodes = new HashMap<XDI3SubSegment, MemoryContextNode> ();\r\n-\t\t\tthis.relations = new HashMap<XDI3Segment, Map<XDI3Segment, MemoryRelation>> ();\r\n+\t\t\tthis.contextNodes = new HashMap<XDIArc, MemoryContextNode> ();\r\n+\t\t\tthis.relations = new HashMap<XDIAddress, Map<XDIAddress, MemoryRelation>> ();\r\n \t\t\tthis.literal = null;\r\n \t\t}\r\n \t}\r\n \r\n \t@Override\r\n-\tpublic XDI3SubSegment getArcXri() {\r\n+\tpublic XDIArc getArc() {\r\n \r\n-\t\treturn this.arcXri;\r\n+\t\treturn this.arc;\r\n \t}\r\n \r\n \t/*\r\n \t * Methods related to context nodes of this context node\r\n \t */\r\n \r\n \t@Override\r\n-\tpublic synchronized ContextNode setContextNode(XDI3SubSegment arcXri) {\r\n+\tpublic synchronized ContextNode setContextNode(XDIArc arc) {\r\n \r\n \t\t// check validity\r\n \r\n-\t\tthis.setContextNodeCheckValid(arcXri);\r\n+\t\tthis.setContextNodeCheckValid(arc);\r\n \r\n \t\t// set the context node\r\n \r\n-\t\tContextNode contextNode = this.contextNodes.get(arcXri);\r\n+\t\tContextNode contextNode = this.contextNodes.get(arc);\r\n \r\n \t\tif (contextNode != null) {\r\n \t\t\t\r\n \t\t\treturn contextNode;\r\n \t\t}\r\n \r\n-\t\tcontextNode = new MemoryContextNode((MemoryGraph) this.getGraph(), this, arcXri);\r\n+\t\tcontextNode = new MemoryContextNode((MemoryGraph) this.getGraph(), this, arc);\r\n \r\n-\t\tthis.contextNodes.put(arcXri, (MemoryContextNode) contextNode);\r\n+\t\tthis.contextNodes.put(arc, (MemoryContextNode) contextNode);\r\n \r\n \t\t// set inner root\r\n \r\n-\t\tthis.setContextNodeSetInnerRoot(arcXri, contextNode);\r\n+\t\tthis.setContextNodeSetInnerRoot(arc, contextNode);\r\n \r\n \t\t// done\r\n \r\n \t\treturn contextNode;\r\n \t}\r\n \r\n \t@Override\r\n-\tpublic ContextNode getContextNode(XDI3SubSegment arcXri, boolean subgraph) {\r\n+\tpublic ContextNode getContextNode(XDIArc arc, boolean subgraph) {\r\n \r\n-\t\treturn this.contextNodes.get(arcXri);\r\n+\t\treturn this.contextNodes.get(arc);\r\n \t}\r\n \r\n \t@Override\r\n@@ -105,9 +105,9 @@ public ReadOnlyIterator<ContextNode> getContextNodes() {\n \t}\r\n \r\n \t@Override\r\n-\tpublic boolean containsContextNode(XDI3SubSegment arcXri) {\r\n+\tpublic boolean containsContextNode(XDIArc arc) {\r\n \r\n-\t\treturn this.contextNodes.containsKey(arcXri);\r\n+\t\treturn this.contextNodes.containsKey(arc);\r\n \t}\r\n \r\n \t@Override\r\n@@ -117,9 +117,9 @@ public boolean containsContextNodes() {\n \t}\r\n \r\n \t@Override\r\n-\tpublic synchronized void delContextNode(XDI3SubSegment arcXri) {\r\n+\tpublic synchronized void delContextNode(XDIArc arc) {\r\n \r\n-\t\tContextNode contextNode = this.getContextNode(arcXri, true);\r\n+\t\tContextNode contextNode = this.getContextNode(arc, true);\r\n \t\tif (contextNode == null) return;\r\n \r\n \t\t// delete all inner roots and incoming relations\r\n@@ -129,7 +129,7 @@ public synchronized void delContextNode(XDI3SubSegment arcXri) {\n \r\n \t\t// delete this context node\r\n \r\n-\t\tthis.contextNodes.remove(arcXri);\r\n+\t\tthis.contextNodes.remove(arc);\r\n \t}\r\n \r\n \t@Override\r\n@@ -153,58 +153,58 @@ public synchronized void delContextNodes() {\n \t */\r\n \r\n \t@Override\r\n-\tpublic synchronized Relation setRelation(XDI3Segment arcXri, ContextNode targetContextNode) {\r\n+\tpublic synchronized Relation setRelation(XDIAddress arc, ContextNode targetContextNode) {\r\n \r\n-\t\tXDI3Segment targetContextNodeXri = targetContextNode.getXri();\r\n+\t\tXDIAddress targetContextNodeAddress = targetContextNode.getAddress();\r\n \t\t\r\n \t\t// check validity\r\n \r\n-\t\tthis.setRelationCheckValid(arcXri, targetContextNodeXri);\r\n+\t\tthis.setRelationCheckValid(arc, targetContextNodeAddress);\r\n \r\n \t\t// set the relation\r\n \r\n-\t\tRelation relation = this.getRelation(arcXri, targetContextNodeXri);\r\n+\t\tRelation relation = this.getRelation(arc, targetContextNodeAddress);\r\n \t\tif (relation != null) return relation;\r\n \r\n-\t\tMap<XDI3Segment, MemoryRelation> relations = this.relations.get(arcXri);\r\n+\t\tMap<XDIAddress, MemoryRelation> relations = this.relations.get(arc);\r\n \t\tif (relations == null) {\r\n \r\n \t\t\tif (((MemoryGraph) this.getGraph()).getSortMode() == MemoryGraphFactory.SORTMODE_ALPHA) {\r\n \r\n-\t\t\t\trelations = new TreeMap<XDI3Segment, MemoryRelation> ();\r\n+\t\t\t\trelations = new TreeMap<XDIAddress, MemoryRelation> ();\r\n \t\t\t} else if (((MemoryGraph) this.getGraph()).getSortMode() == MemoryGraphFactory.SORTMODE_ORDER) {\r\n \r\n-\t\t\t\trelations = new LinkedHashMap<XDI3Segment, MemoryRelation> ();\r\n+\t\t\t\trelations = new LinkedHashMap<XDIAddress, MemoryRelation> ();\r\n \t\t\t} else {\r\n \r\n-\t\t\t\trelations = new HashMap<XDI3Segment, MemoryRelation> ();\r\n+\t\t\t\trelations = new HashMap<XDIAddress, MemoryRelation> ();\r\n \t\t\t}\r\n \r\n-\t\t\tthis.relations.put(arcXri, relations);\r\n+\t\t\tthis.relations.put(arc, relations);\r\n \t\t}\r\n \t\t\r\n-\t\trelation = new MemoryRelation(this, arcXri, targetContextNodeXri);\r\n+\t\trelation = new MemoryRelation(this, arc, targetContextNodeAddress);\r\n \t\t\r\n-\t\trelations.put(targetContextNodeXri, (MemoryRelation) relation);\r\n+\t\trelations.put(targetContextNodeAddress, (MemoryRelation) relation);\r\n \r\n \t\t// done\r\n \r\n \t\treturn relation;\r\n \t}\r\n \r\n \t@Override\r\n-\tpublic Relation getRelation(XDI3Segment arcXri, XDI3Segment targetContextNodeXri) {\r\n+\tpublic Relation getRelation(XDIAddress arc, XDIAddress targetContextNodeAddress) {\r\n \r\n-\t\tMap<XDI3Segment, MemoryRelation> relations = this.relations.get(arcXri);\r\n+\t\tMap<XDIAddress, MemoryRelation> relations = this.relations.get(arc);\r\n \t\tif (relations == null) return null;\r\n \r\n-\t\treturn relations.get(targetContextNodeXri);\r\n+\t\treturn relations.get(targetContextNodeAddress);\r\n \t}\r\n \r\n \t@Override\r\n-\tpublic ReadOnlyIterator<Relation> getRelations(XDI3Segment arcXri) {\r\n+\tpublic ReadOnlyIterator<Relation> getRelations(XDIAddress arc) {\r\n \r\n-\t\tMap<XDI3Segment, MemoryRelation> relations = this.relations.get(arcXri);\r\n+\t\tMap<XDIAddress, MemoryRelation> relations = this.relations.get(arc);\r\n \t\tif (relations == null) return new EmptyIterator<Relation> ();\r\n \r\n \t\tList<Relation> list = new ArrayList<Relation> (relations.values());\r\n@@ -217,7 +217,7 @@ public ReadOnlyIterator<Relation> getRelations() {\n \r\n \t\tList<Relation> list = new ArrayList<Relation> ();\r\n \r\n-\t\tfor (Entry<XDI3Segment, Map<XDI3Segment, MemoryRelation>> relations : this.relations.entrySet()) {\r\n+\t\tfor (Entry<XDIAddress, Map<XDIAddress, MemoryRelation>> relations : this.relations.entrySet()) {\r\n \r\n \t\t\tlist.addAll(relations.getValue().values());\r\n \t\t}\r\n@@ -226,18 +226,18 @@ public ReadOnlyIterator<Relation> getRelations() {\n \t}\r\n \r\n \t@Override\r\n-\tpublic boolean containsRelation(XDI3Segment arcXri, XDI3Segment targetContextNodeXri) {\r\n+\tpublic boolean containsRelation(XDIAddress arc, XDIAddress targetContextNodeAddress) {\r\n \r\n-\t\tMap<XDI3Segment, MemoryRelation> relations = this.relations.get(arcXri);\r\n+\t\tMap<XDIAddress, MemoryRelation> relations = this.relations.get(arc);\r\n \t\tif (relations == null) return false;\r\n \r\n-\t\treturn relations.containsKey(targetContextNodeXri);\r\n+\t\treturn relations.containsKey(targetContextNodeAddress);\r\n \t}\r\n \r\n \t@Override\r\n-\tpublic boolean containsRelations(XDI3Segment arcXri) {\r\n+\tpublic boolean containsRelations(XDIAddress arc) {\r\n \r\n-\t\treturn this.relations.containsKey(arcXri);\r\n+\t\treturn this.relations.containsKey(arc);\r\n \t}\r\n \r\n \t@Override\r\n@@ -247,40 +247,40 @@ public boolean containsRelations() {\n \t}\r\n \r\n \t@Override\r\n-\tpublic synchronized void delRelation(XDI3Segment arcXri, XDI3Segment targetContextNodeXri) {\r\n+\tpublic synchronized void delRelation(XDIAddress arc, XDIAddress targetContextNodeAddress) {\r\n \r\n \t\t// delete the relation\r\n \r\n-\t\tMap<XDI3Segment, MemoryRelation> relations = this.relations.get(arcXri);\r\n+\t\tMap<XDIAddress, MemoryRelation> relations = this.relations.get(arc);\r\n \t\tif (relations == null) return;\r\n \r\n-\t\tMemoryRelation relation = relations.remove(targetContextNodeXri);\r\n+\t\tMemoryRelation relation = relations.remove(targetContextNodeAddress);\r\n \t\tif (relation == null) return;\r\n \r\n \t\tif (relations.isEmpty()) {\r\n \r\n-\t\t\tthis.relations.remove(arcXri);\r\n+\t\t\tthis.relations.remove(arc);\r\n \t\t}\r\n \r\n \t\t// delete inner root\r\n \r\n-\t\tthis.delRelationDelInnerRoot(arcXri, targetContextNodeXri);\r\n+\t\tthis.delRelationDelInnerRoot(arc, targetContextNodeAddress);\r\n \t}\r\n \r\n \t@Override\r\n-\tpublic synchronized void delRelations(XDI3Segment arcXri) {\r\n+\tpublic synchronized void delRelations(XDIAddress arc) {\r\n \r\n-\t\tReadOnlyIterator<Relation> relations = this.getRelations(arcXri);\r\n+\t\tReadOnlyIterator<Relation> relations = this.getRelations(arc);\r\n \r\n \t\t// delete relations\r\n \r\n-\t\tthis.relations.remove(arcXri);\r\n+\t\tthis.relations.remove(arc);\r\n \r\n \t\t// delete inner roots\r\n \r\n \t\tfor (Relation relation : relations) {\r\n \r\n-\t\t\tthis.delRelationDelInnerRoot(relation.getArcXri(), relation.getTargetContextNodeXri());\r\n+\t\t\tthis.delRelationDelInnerRoot(relation.getArc(), relation.getTargetContextNodeAddress());\r\n \t\t}\r\n \t}\r\n \r\n@@ -297,7 +297,7 @@ public synchronized void delRelations() {\n \r\n \t\tfor (Relation relation : relations) {\r\n \r\n-\t\t\tthis.delRelationDelInnerRoot(relation.getArcXri(), relation.getTargetContextNodeXri());\r\n+\t\t\tthis.delRelationDelInnerRoot(relation.getArc(), relation.getTargetContextNodeAddress());\r\n \t\t}\r\n \t}\r\n \r", "raw_url": "https://github.com/projectdanube/xdi2/raw/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Fimpl%2Fmemory%2FMemoryContextNode.java", "sha": "d5a19cf0465a6baaf753080d5a3b149ed7c98e5e", "status": "modified" }, { "additions": 10, "blob_url": "https://github.com/projectdanube/xdi2/blob/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Fimpl%2Fmemory%2FMemoryRelation.java", "changes": 20, "contents_url": "https://api.github.com/repos/projectdanube/xdi2/contents/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Fimpl%2Fmemory%2FMemoryRelation.java?ref=0ca7982fec30c2bb8204efbbea61428a643d2e9c", "deletions": 10, "filename": "core/src/main/java/xdi2/core/impl/memory/MemoryRelation.java", "new_code": "import xdi2.core.syntax.XDIAddress;\r\n\tprivate XDIAddress arc;\r\n\tprivate XDIAddress targetContextNodeAddress;\r\n\tMemoryRelation(MemoryContextNode contextNode, XDIAddress arc, XDIAddress targetContextNodeAddress) {\r\n\t\tthis.arc = arc;\r\n\t\tthis.targetContextNodeAddress = targetContextNodeAddress;\r\n\tpublic XDIAddress getArc() {\r\n\t\treturn this.arc;\r\n\tpublic XDIAddress getTargetContextNodeAddress() {\r\n\t\treturn this.targetContextNodeAddress;\r", "new_methods": [], "old_code": "import xdi2.core.xri3.XDI3Segment;\r\n\tprivate XDI3Segment arcXri;\r\n\tprivate XDI3Segment targetContextNodeXri;\r\n\tMemoryRelation(MemoryContextNode contextNode, XDI3Segment arcXri, XDI3Segment targetContextNodeXri) {\r\n\t\tthis.arcXri = arcXri;\r\n\t\tthis.targetContextNodeXri = targetContextNodeXri;\r\n\tpublic XDI3Segment getArcXri() {\r\n\t\treturn this.arcXri;\r\n\tpublic XDI3Segment getTargetContextNodeXri() {\r\n\t\treturn this.targetContextNodeXri;\r", "old_methods": [], "patch": "@@ -2,32 +2,32 @@\n \r\n import xdi2.core.Relation;\r\n import xdi2.core.impl.AbstractRelation;\r\n-import xdi2.core.xri3.XDI3Segment;\r\n+import xdi2.core.syntax.XDIAddress;\r\n \r\n public class MemoryRelation extends AbstractRelation implements Relation {\r\n \r\n \tprivate static final long serialVersionUID = -2979718490345210876L;\r\n \r\n-\tprivate XDI3Segment arcXri;\r\n-\tprivate XDI3Segment targetContextNodeXri;\r\n+\tprivate XDIAddress arc;\r\n+\tprivate XDIAddress targetContextNodeAddress;\r\n \r\n-\tMemoryRelation(MemoryContextNode contextNode, XDI3Segment arcXri, XDI3Segment targetContextNodeXri) {\r\n+\tMemoryRelation(MemoryContextNode contextNode, XDIAddress arc, XDIAddress targetContextNodeAddress) {\r\n \r\n \t\tsuper(contextNode);\r\n \r\n-\t\tthis.arcXri = arcXri;\r\n-\t\tthis.targetContextNodeXri = targetContextNodeXri;\r\n+\t\tthis.arc = arc;\r\n+\t\tthis.targetContextNodeAddress = targetContextNodeAddress;\r\n \t}\r\n \r\n \t@Override\r\n-\tpublic XDI3Segment getArcXri() {\r\n+\tpublic XDIAddress getArc() {\r\n \r\n-\t\treturn this.arcXri;\r\n+\t\treturn this.arc;\r\n \t}\r\n \r\n \t@Override\r\n-\tpublic XDI3Segment getTargetContextNodeXri() {\r\n+\tpublic XDIAddress getTargetContextNodeAddress() {\r\n \r\n-\t\treturn this.targetContextNodeXri;\r\n+\t\treturn this.targetContextNodeAddress;\r\n \t}\r\n }\r", "raw_url": "https://github.com/projectdanube/xdi2/raw/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Fimpl%2Fmemory%2FMemoryRelation.java", "sha": "1da1d6a32c6249639de06b4a10ecfeaba26ad36f", "status": "modified" }, { "additions": 26, "blob_url": "https://github.com/projectdanube/xdi2/blob/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Fimpl%2Fwrapped%2FWrappedContextNode.java", "changes": 52, "contents_url": "https://api.github.com/repos/projectdanube/xdi2/contents/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Fimpl%2Fwrapped%2FWrappedContextNode.java?ref=0ca7982fec30c2bb8204efbbea61428a643d2e9c", "deletions": 26, "filename": "core/src/main/java/xdi2/core/impl/wrapped/WrappedContextNode.java", "new_code": "import xdi2.core.syntax.XDIAddress;\r\nimport xdi2.core.syntax.XDIArc;\r\n\tpublic XDIArc getArc() {\r\n\t\treturn this.memoryContextNode.getArc();\r\n\tpublic synchronized ContextNode setContextNode(XDIArc arc) {\r\n\t\tMemoryContextNode ret = (MemoryContextNode) this.memoryContextNode.setContextNode(arc);\r\n\tpublic ContextNode getContextNode(XDIArc arc, boolean subgraph) {\r\n\t\tMemoryContextNode ret = (MemoryContextNode) this.memoryContextNode.getContextNode(arc, subgraph);\r\n\tpublic boolean containsContextNode(XDIArc arc) {\r\n\t\treturn this.memoryContextNode.containsContextNode(arc);\r\n\tpublic synchronized void delContextNode(XDIArc arc) {\r\n\t\tthis.memoryContextNode.delContextNode(arc);\r\n\tpublic synchronized Relation setRelation(XDIAddress arc, ContextNode targetContextNode) {\r\n\t\tMemoryRelation ret = (MemoryRelation) this.memoryContextNode.setRelation(arc, targetContextNode);\r\n\tpublic Relation getRelation(XDIAddress arc, XDIAddress targetContextNodeAddress) {\r\n\t\tMemoryRelation ret = (MemoryRelation) this.memoryContextNode.getRelation(arc, targetContextNodeAddress);\r\n\tpublic ReadOnlyIterator<Relation> getRelations(XDIAddress arc) {\r\n\t\tReadOnlyIterator<Relation> ret = this.memoryContextNode.getRelations(arc);\r\n\tpublic boolean containsRelation(XDIAddress arc, XDIAddress targetContextNodeAddress) {\r\n\t\treturn this.memoryContextNode.containsRelation(arc, targetContextNodeAddress);\r\n\tpublic boolean containsRelations(XDIAddress arc) {\r\n\t\treturn this.memoryContextNode.containsRelations(arc);\r\n\tpublic synchronized void delRelation(XDIAddress arc, XDIAddress targetContextNodeAddress) {\r\n\t\tthis.memoryContextNode.delRelation(arc, targetContextNodeAddress);\r\n\tpublic synchronized void delRelations(XDIAddress arc) {\r\n\t\tthis.memoryContextNode.delRelations(arc);\r", "new_methods": [], "old_code": "import xdi2.core.xri3.XDI3Segment;\r\nimport xdi2.core.xri3.XDI3SubSegment;\r\n\tpublic XDI3SubSegment getArcXri() {\r\n\t\treturn this.memoryContextNode.getArcXri();\r\n\tpublic synchronized ContextNode setContextNode(XDI3SubSegment arcXri) {\r\n\t\tMemoryContextNode ret = (MemoryContextNode) this.memoryContextNode.setContextNode(arcXri);\r\n\tpublic ContextNode getContextNode(XDI3SubSegment arcXri, boolean subgraph) {\r\n\t\tMemoryContextNode ret = (MemoryContextNode) this.memoryContextNode.getContextNode(arcXri, subgraph);\r\n\tpublic boolean containsContextNode(XDI3SubSegment arcXri) {\r\n\t\treturn this.memoryContextNode.containsContextNode(arcXri);\r\n\tpublic synchronized void delContextNode(XDI3SubSegment arcXri) {\r\n\t\tthis.memoryContextNode.delContextNode(arcXri);\r\n\tpublic synchronized Relation setRelation(XDI3Segment arcXri, ContextNode targetContextNode) {\r\n\t\tMemoryRelation ret = (MemoryRelation) this.memoryContextNode.setRelation(arcXri, targetContextNode);\r\n\tpublic Relation getRelation(XDI3Segment arcXri, XDI3Segment targetContextNodeXri) {\r\n\t\tMemoryRelation ret = (MemoryRelation) this.memoryContextNode.getRelation(arcXri, targetContextNodeXri);\r\n\tpublic ReadOnlyIterator<Relation> getRelations(XDI3Segment arcXri) {\r\n\t\tReadOnlyIterator<Relation> ret = this.memoryContextNode.getRelations(arcXri);\r\n\tpublic boolean containsRelation(XDI3Segment arcXri, XDI3Segment targetContextNodeXri) {\r\n\t\treturn this.memoryContextNode.containsRelation(arcXri, targetContextNodeXri);\r\n\tpublic boolean containsRelations(XDI3Segment arcXri) {\r\n\t\treturn this.memoryContextNode.containsRelations(arcXri);\r\n\tpublic synchronized void delRelation(XDI3Segment arcXri, XDI3Segment targetContextNodeXri) {\r\n\t\tthis.memoryContextNode.delRelation(arcXri, targetContextNodeXri);\r\n\tpublic synchronized void delRelations(XDI3Segment arcXri) {\r\n\t\tthis.memoryContextNode.delRelations(arcXri);\r", "old_methods": [], "patch": "@@ -9,10 +9,10 @@\n import xdi2.core.impl.memory.MemoryContextNode;\r\n import xdi2.core.impl.memory.MemoryLiteral;\r\n import xdi2.core.impl.memory.MemoryRelation;\r\n+import xdi2.core.syntax.XDIAddress;\r\n+import xdi2.core.syntax.XDIArc;\r\n import xdi2.core.util.iterators.MappingIterator;\r\n import xdi2.core.util.iterators.ReadOnlyIterator;\r\n-import xdi2.core.xri3.XDI3Segment;\r\n-import xdi2.core.xri3.XDI3SubSegment;\r\n \r\n public class WrappedContextNode extends AbstractContextNode implements ContextNode {\r\n \r\n@@ -28,27 +28,27 @@ public class WrappedContextNode extends AbstractContextNode implements ContextNo\n \t}\r\n \r\n \t@Override\r\n-\tpublic XDI3SubSegment getArcXri() {\r\n+\tpublic XDIArc getArc() {\r\n \r\n-\t\treturn this.memoryContextNode.getArcXri();\r\n+\t\treturn this.memoryContextNode.getArc();\r\n \t}\r\n \r\n \t/*\r\n \t * Methods related to context nodes of this context node\r\n \t */\r\n \r\n \t@Override\r\n-\tpublic synchronized ContextNode setContextNode(XDI3SubSegment arcXri) {\r\n+\tpublic synchronized ContextNode setContextNode(XDIArc arc) {\r\n \r\n-\t\tMemoryContextNode ret = (MemoryContextNode) this.memoryContextNode.setContextNode(arcXri);\r\n+\t\tMemoryContextNode ret = (MemoryContextNode) this.memoryContextNode.setContextNode(arc);\r\n \r\n \t\treturn new WrappedContextNode((WrappedGraph) this.getGraph(), this, ret);\r\n \t}\r\n \r\n \t@Override\r\n-\tpublic ContextNode getContextNode(XDI3SubSegment arcXri, boolean subgraph) {\r\n+\tpublic ContextNode getContextNode(XDIArc arc, boolean subgraph) {\r\n \r\n-\t\tMemoryContextNode ret = (MemoryContextNode) this.memoryContextNode.getContextNode(arcXri, subgraph);\r\n+\t\tMemoryContextNode ret = (MemoryContextNode) this.memoryContextNode.getContextNode(arc, subgraph);\r\n \r\n \t\treturn ret == null ? null : new WrappedContextNode((WrappedGraph) this.getGraph(), this, ret);\r\n \t}\r\n@@ -62,9 +62,9 @@ public ReadOnlyIterator<ContextNode> getContextNodes() {\n \t}\r\n \r\n \t@Override\r\n-\tpublic boolean containsContextNode(XDI3SubSegment arcXri) {\r\n+\tpublic boolean containsContextNode(XDIArc arc) {\r\n \r\n-\t\treturn this.memoryContextNode.containsContextNode(arcXri);\r\n+\t\treturn this.memoryContextNode.containsContextNode(arc);\r\n \t}\r\n \r\n \t@Override\r\n@@ -74,9 +74,9 @@ public boolean containsContextNodes() {\n \t}\r\n \r\n \t@Override\r\n-\tpublic synchronized void delContextNode(XDI3SubSegment arcXri) {\r\n+\tpublic synchronized void delContextNode(XDIArc arc) {\r\n \r\n-\t\tthis.memoryContextNode.delContextNode(arcXri);\r\n+\t\tthis.memoryContextNode.delContextNode(arc);\r\n \t}\r\n \r\n \t@Override\r\n@@ -90,25 +90,25 @@ public synchronized void delContextNodes() {\n \t */\r\n \r\n \t@Override\r\n-\tpublic synchronized Relation setRelation(XDI3Segment arcXri, ContextNode targetContextNode) {\r\n+\tpublic synchronized Relation setRelation(XDIAddress arc, ContextNode targetContextNode) {\r\n \r\n-\t\tMemoryRelation ret = (MemoryRelation) this.memoryContextNode.setRelation(arcXri, targetContextNode);\r\n+\t\tMemoryRelation ret = (MemoryRelation) this.memoryContextNode.setRelation(arc, targetContextNode);\r\n \r\n \t\treturn new WrappedRelation(this, ret);\r\n \t}\r\n \r\n \t@Override\r\n-\tpublic Relation getRelation(XDI3Segment arcXri, XDI3Segment targetContextNodeXri) {\r\n+\tpublic Relation getRelation(XDIAddress arc, XDIAddress targetContextNodeAddress) {\r\n \r\n-\t\tMemoryRelation ret = (MemoryRelation) this.memoryContextNode.getRelation(arcXri, targetContextNodeXri);\r\n+\t\tMemoryRelation ret = (MemoryRelation) this.memoryContextNode.getRelation(arc, targetContextNodeAddress);\r\n \r\n \t\treturn ret == null ? null : new WrappedRelation(this, ret);\r\n \t}\r\n \r\n \t@Override\r\n-\tpublic ReadOnlyIterator<Relation> getRelations(XDI3Segment arcXri) {\r\n+\tpublic ReadOnlyIterator<Relation> getRelations(XDIAddress arc) {\r\n \r\n-\t\tReadOnlyIterator<Relation> ret = this.memoryContextNode.getRelations(arcXri);\r\n+\t\tReadOnlyIterator<Relation> ret = this.memoryContextNode.getRelations(arc);\r\n \r\n \t\treturn new ReadOnlyIterator<Relation> (new WrappedRelationMappingIterator(ret));\r\n \t}\r\n@@ -122,15 +122,15 @@ public ReadOnlyIterator<Relation> getRelations() {\n \t}\r\n \r\n \t@Override\r\n-\tpublic boolean containsRelation(XDI3Segment arcXri, XDI3Segment targetContextNodeXri) {\r\n+\tpublic boolean containsRelation(XDIAddress arc, XDIAddress targetContextNodeAddress) {\r\n \r\n-\t\treturn this.memoryContextNode.containsRelation(arcXri, targetContextNodeXri);\r\n+\t\treturn this.memoryContextNode.containsRelation(arc, targetContextNodeAddress);\r\n \t}\r\n \r\n \t@Override\r\n-\tpublic boolean containsRelations(XDI3Segment arcXri) {\r\n+\tpublic boolean containsRelations(XDIAddress arc) {\r\n \r\n-\t\treturn this.memoryContextNode.containsRelations(arcXri);\r\n+\t\treturn this.memoryContextNode.containsRelations(arc);\r\n \t}\r\n \r\n \t@Override\r\n@@ -140,15 +140,15 @@ public boolean containsRelations() {\n \t}\r\n \r\n \t@Override\r\n-\tpublic synchronized void delRelation(XDI3Segment arcXri, XDI3Segment targetContextNodeXri) {\r\n+\tpublic synchronized void delRelation(XDIAddress arc, XDIAddress targetContextNodeAddress) {\r\n \r\n-\t\tthis.memoryContextNode.delRelation(arcXri, targetContextNodeXri);\r\n+\t\tthis.memoryContextNode.delRelation(arc, targetContextNodeAddress);\r\n \t}\r\n \r\n \t@Override\r\n-\tpublic synchronized void delRelations(XDI3Segment arcXri) {\r\n+\tpublic synchronized void delRelations(XDIAddress arc) {\r\n \r\n-\t\tthis.memoryContextNode.delRelations(arcXri);\r\n+\t\tthis.memoryContextNode.delRelations(arc);\r\n \t}\r\n \r\n \t@Override\r", "raw_url": "https://github.com/projectdanube/xdi2/raw/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Fimpl%2Fwrapped%2FWrappedContextNode.java", "sha": "17d40942d193884acdb11e90b53f3e88b501a277", "status": "modified" }, { "additions": 5, "blob_url": "https://github.com/projectdanube/xdi2/blob/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Fimpl%2Fwrapped%2FWrappedRelation.java", "changes": 10, "contents_url": "https://api.github.com/repos/projectdanube/xdi2/contents/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Fimpl%2Fwrapped%2FWrappedRelation.java?ref=0ca7982fec30c2bb8204efbbea61428a643d2e9c", "deletions": 5, "filename": "core/src/main/java/xdi2/core/impl/wrapped/WrappedRelation.java", "new_code": "import xdi2.core.syntax.XDIAddress;\r\n\tpublic XDIAddress getArc() {\r\n\t\treturn this.memoryRelation.getArc();\r\n\tpublic XDIAddress getTargetContextNodeAddress() {\r\n\t\treturn this.memoryRelation.getTargetContextNodeAddress();\r", "new_methods": [], "old_code": "import xdi2.core.xri3.XDI3Segment;\r\n\tpublic XDI3Segment getArcXri() {\r\n\t\treturn this.memoryRelation.getArcXri();\r\n\tpublic XDI3Segment getTargetContextNodeXri() {\r\n\t\treturn this.memoryRelation.getTargetContextNodeXri();\r", "old_methods": [], "patch": "@@ -3,7 +3,7 @@\n import xdi2.core.Relation;\r\n import xdi2.core.impl.AbstractRelation;\r\n import xdi2.core.impl.memory.MemoryRelation;\r\n-import xdi2.core.xri3.XDI3Segment;\r\n+import xdi2.core.syntax.XDIAddress;\r\n \r\n public class WrappedRelation extends AbstractRelation implements Relation {\r\n \r\n@@ -19,14 +19,14 @@ public class WrappedRelation extends AbstractRelation implements Relation {\n \t}\r\n \r\n \t@Override\r\n-\tpublic XDI3Segment getArcXri() {\r\n+\tpublic XDIAddress getArc() {\r\n \r\n-\t\treturn this.memoryRelation.getArcXri();\r\n+\t\treturn this.memoryRelation.getArc();\r\n \t}\r\n \r\n \t@Override\r\n-\tpublic XDI3Segment getTargetContextNodeXri() {\r\n+\tpublic XDIAddress getTargetContextNodeAddress() {\r\n \r\n-\t\treturn this.memoryRelation.getTargetContextNodeXri();\r\n+\t\treturn this.memoryRelation.getTargetContextNodeAddress();\r\n \t}\r\n }\r", "raw_url": "https://github.com/projectdanube/xdi2/raw/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Fimpl%2Fwrapped%2FWrappedRelation.java", "sha": "cfb322432a57866d730e99360c2ce49e03bb1449", "status": "modified" }, { "additions": 3, "blob_url": "https://github.com/projectdanube/xdi2/blob/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Fio%2Freaders%2FXDIDisplayReader.java", "changes": 6, "contents_url": "https://api.github.com/repos/projectdanube/xdi2/contents/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Fio%2Freaders%2FXDIDisplayReader.java?ref=0ca7982fec30c2bb8204efbbea61428a643d2e9c", "deletions": 3, "filename": "core/src/main/java/xdi2/core/io/readers/XDIDisplayReader.java", "new_code": "import xdi2.core.syntax.XDIStatement;\r\n\t\t\tXDIStatement statementXri;\r\n\t\t\t\tstatementXri = XDIStatement.create(line);\r", "new_methods": [], "old_code": "import xdi2.core.xri3.XDI3Statement;\r\n\t\t\tXDI3Statement statementXri;\r\n\t\t\t\tstatementXri = XDI3Statement.create(line);\r", "old_methods": [], "patch": "@@ -9,7 +9,7 @@\n import xdi2.core.exceptions.Xdi2ParseException;\r\n import xdi2.core.io.AbstractXDIReader;\r\n import xdi2.core.io.MimeType;\r\n-import xdi2.core.xri3.XDI3Statement;\r\n+import xdi2.core.syntax.XDIStatement;\r\n \r\n public class XDIDisplayReader extends AbstractXDIReader {\r\n \r\n@@ -41,11 +41,11 @@ private static void read(Graph graph, BufferedReader bufferedReader) throws IOEx\n \t\t\tline = line.trim();\r\n \t\t\tif (line.isEmpty()) continue;\r\n \r\n-\t\t\tXDI3Statement statementXri;\r\n+\t\t\tXDIStatement statementXri;\r\n \r\n \t\t\ttry {\r\n \r\n-\t\t\t\tstatementXri = XDI3Statement.create(line);\r\n+\t\t\t\tstatementXri = XDIStatement.create(line);\r\n \t\t\t} catch (Exception ex) {\r\n \r\n \t\t\t\tthrow new Xdi2ParseException(\"Parser problem at line \" + lineNr + \": \" + ex.getMessage(), ex);\r", "raw_url": "https://github.com/projectdanube/xdi2/raw/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Fio%2Freaders%2FXDIDisplayReader.java", "sha": "114526be1ced6ea0e19c19bd8e4c25b08e644711", "status": "modified" }, { "additions": 32, "blob_url": "https://github.com/projectdanube/xdi2/blob/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Fio%2Freaders%2FXDIJSONReader.java", "changes": 64, "contents_url": "https://api.github.com/repos/projectdanube/xdi2/contents/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Fio%2Freaders%2FXDIJSONReader.java?ref=0ca7982fec30c2bb8204efbbea61428a643d2e9c", "deletions": 32, "filename": "core/src/main/java/xdi2/core/io/readers/XDIJSONReader.java", "new_code": "import xdi2.core.syntax.XDIAddress;\r\nimport xdi2.core.syntax.XDIArc;\r\nimport xdi2.core.syntax.XDIStatement;\r\nimport xdi2.core.syntax.parser.ParserException;\r\nimport xdi2.core.util.AddressUtil;\r\n\t\t\tif (key.endsWith(\"/\" + XDIConstants.XDI_ADD_CONTEXT.toString())) {\r\n\t\t\t\tXDIStatement statementXri = makeStatement(key + \"/\", state);\r\n\t\t\t\tXDIAddress absoluteSubject = root.relativeToAbsoluteXri(statementXri.getSubject());\r\n\t\t\t\tXDIAddress relativeSubject = statementRoot.absoluteToRelativeXri(absoluteSubject);\r\n\t\t\t\t\tXDIArc arc = makeXDIArc(((JsonPrimitive) jsonEntryArrayElement).getAsString(), state);\r\n\t\t\t\t\tContextNode contextNode = baseContextNode.setContextNode(arc);\r\n\t\t\t\t\tif (log.isTraceEnabled()) log.trace(\"Under \" + baseContextNode.getAddress() + \": Set context node \" + contextNode.getArc() + \" --> \" + contextNode.getAddress());\r\n\t\t\t} else if (key.endsWith(\"/\" + XDIConstants.XDI_ADD_LITERAL.toString())) {\r\n\t\t\t\tXDIStatement statementXri = makeStatement(key + \"/\\\"\\\"\", state);\r\n\t\t\t\tXDIAddress absoluteSubject = root.relativeToAbsoluteXri(statementXri.getSubject());\r\n\t\t\t\tXDIAddress relativeSubject = statementRoot.absoluteToRelativeXri(absoluteSubject);\r\n\t\t\t\tif (log.isTraceEnabled()) log.trace(\"Under \" + baseContextNode.getAddress() + \": Set literal --> \" + literal.getLiteralData());\r\n\t\t\t\tXDIStatement statementXri = makeStatement(key + \"/\", state);\r\n\t\t\t\tXDIAddress arc = statementXri.getPredicate();\r\n\t\t\t\tXDIAddress absoluteSubject = root.relativeToAbsoluteXri(statementXri.getSubject());\r\n\t\t\t\tXDIAddress relativeSubject = statementRoot.absoluteToRelativeXri(absoluteSubject);\r\n\t\t\t\t\t\tXDIAddress subject = root.absoluteToRelativeXri(AddressUtil.concatAddresses(root.getContextNode().getAddress(), statementXri.getSubject()));\r\n\t\t\t\t\t\tXDIAddress predicate = statementXri.getPredicate();\r\n\t\t\t\t\t\tXDIAddress targetContextNodeAddress = makeXDIAddress(((JsonPrimitive) jsonEntryArrayElement).getAsString(), state);\r\n\t\t\t\t\t\tRelation relation = baseContextNode.setRelation(arc, targetContextNodeAddress);\r\n\t\t\t\t\t\tif (log.isTraceEnabled()) log.trace(\"Under \" + baseContextNode.getAddress() + \": Set relation \" + relation.getArc() + \" --> \" + relation.getTargetContextNodeAddress());\r\n\tprivate static XDIStatement makeStatement(String xriString, State state) {\r\n\t\treturn XDIStatement.create(xriString);\r\n\tprivate static XDIAddress makeXDIAddress(String xriString, State state) {\r\n\t\treturn XDIAddress.create(xriString);\r\n\tprivate static XDIArc makeXDIArc(String xriString, State state) {\r\n\t\treturn XDIArc.create(xriString);\r", "new_methods": [], "old_code": "import xdi2.core.util.XDI3Util;\r\nimport xdi2.core.xri3.XDI3Segment;\r\nimport xdi2.core.xri3.XDI3Statement;\r\nimport xdi2.core.xri3.XDI3SubSegment;\r\nimport xdi2.core.xri3.parser.aparse.ParserException;\r\n\t\t\tif (key.endsWith(\"/\" + XDIConstants.XRI_S_CONTEXT.toString())) {\r\n\t\t\t\tXDI3Statement statementXri = makeStatement(key + \"/\", state);\r\n\t\t\t\tXDI3Segment absoluteSubject = root.relativeToAbsoluteXri(statementXri.getSubject());\r\n\t\t\t\tXDI3Segment relativeSubject = statementRoot.absoluteToRelativeXri(absoluteSubject);\r\n\t\t\t\t\tXDI3SubSegment arcXri = makeXDI3SubSegment(((JsonPrimitive) jsonEntryArrayElement).getAsString(), state);\r\n\t\t\t\t\tContextNode contextNode = baseContextNode.setContextNode(arcXri);\r\n\t\t\t\t\tif (log.isTraceEnabled()) log.trace(\"Under \" + baseContextNode.getXri() + \": Set context node \" + contextNode.getArcXri() + \" --> \" + contextNode.getXri());\r\n\t\t\t} else if (key.endsWith(\"/\" + XDIConstants.XRI_S_LITERAL.toString())) {\r\n\t\t\t\tXDI3Statement statementXri = makeStatement(key + \"/\\\"\\\"\", state);\r\n\t\t\t\tXDI3Segment absoluteSubject = root.relativeToAbsoluteXri(statementXri.getSubject());\r\n\t\t\t\tXDI3Segment relativeSubject = statementRoot.absoluteToRelativeXri(absoluteSubject);\r\n\t\t\t\tif (log.isTraceEnabled()) log.trace(\"Under \" + baseContextNode.getXri() + \": Set literal --> \" + literal.getLiteralData());\r\n\t\t\t\tXDI3Statement statementXri = makeStatement(key + \"/\", state);\r\n\t\t\t\tXDI3Segment arcXri = statementXri.getPredicate();\r\n\t\t\t\tXDI3Segment absoluteSubject = root.relativeToAbsoluteXri(statementXri.getSubject());\r\n\t\t\t\tXDI3Segment relativeSubject = statementRoot.absoluteToRelativeXri(absoluteSubject);\r\n\t\t\t\t\t\tXDI3Segment subject = root.absoluteToRelativeXri(XDI3Util.concatXris(root.getContextNode().getXri(), statementXri.getSubject()));\r\n\t\t\t\t\t\tXDI3Segment predicate = statementXri.getPredicate();\r\n\t\t\t\t\t\tXDI3Segment targetContextNodeXri = makeXDI3Segment(((JsonPrimitive) jsonEntryArrayElement).getAsString(), state);\r\n\t\t\t\t\t\tRelation relation = baseContextNode.setRelation(arcXri, targetContextNodeXri);\r\n\t\t\t\t\t\tif (log.isTraceEnabled()) log.trace(\"Under \" + baseContextNode.getXri() + \": Set relation \" + relation.getArcXri() + \" --> \" + relation.getTargetContextNodeXri());\r\n\tprivate static XDI3Statement makeStatement(String xriString, State state) {\r\n\t\treturn XDI3Statement.create(xriString);\r\n\tprivate static XDI3Segment makeXDI3Segment(String xriString, State state) {\r\n\t\treturn XDI3Segment.create(xriString);\r\n\tprivate static XDI3SubSegment makeXDI3SubSegment(String xriString, State state) {\r\n\t\treturn XDI3SubSegment.create(xriString);\r", "old_methods": [], "patch": "@@ -22,11 +22,11 @@\n import xdi2.core.impl.AbstractLiteral;\r\n import xdi2.core.io.AbstractXDIReader;\r\n import xdi2.core.io.MimeType;\r\n-import xdi2.core.util.XDI3Util;\r\n-import xdi2.core.xri3.XDI3Segment;\r\n-import xdi2.core.xri3.XDI3Statement;\r\n-import xdi2.core.xri3.XDI3SubSegment;\r\n-import xdi2.core.xri3.parser.aparse.ParserException;\r\n+import xdi2.core.syntax.XDIAddress;\r\n+import xdi2.core.syntax.XDIArc;\r\n+import xdi2.core.syntax.XDIStatement;\r\n+import xdi2.core.syntax.parser.ParserException;\r\n+import xdi2.core.util.AddressUtil;\r\n \r\n import com.google.gson.Gson;\r\n import com.google.gson.GsonBuilder;\r\n@@ -64,9 +64,9 @@ public void read(XdiRoot root, JsonObject jsonGraphObject, State state) throws I\n \t\t\tString key = entry.getKey();\r\n \t\t\tJsonElement jsonEntryElement = entry.getValue();\r\n \r\n-\t\t\tif (key.endsWith(\"/\" + XDIConstants.XRI_S_CONTEXT.toString())) {\r\n+\t\t\tif (key.endsWith(\"/\" + XDIConstants.XDI_ADD_CONTEXT.toString())) {\r\n \r\n-\t\t\t\tXDI3Statement statementXri = makeStatement(key + \"/\", state);\r\n+\t\t\t\tXDIStatement statementXri = makeStatement(key + \"/\", state);\r\n \r\n \t\t\t\tif (! (jsonEntryElement instanceof JsonArray)) throw new Xdi2ParseException(\"JSON object member must be an array: \" + jsonEntryElement);\r\n \r\n@@ -75,8 +75,8 @@ public void read(XdiRoot root, JsonObject jsonGraphObject, State state) throws I\n \t\t\t\t// find the root and the base context node of this statement\r\n \r\n \t\t\t\tXdiRoot statementRoot = root.getRoot(statementXri.getSubject(), true);\r\n-\t\t\t\tXDI3Segment absoluteSubject = root.relativeToAbsoluteXri(statementXri.getSubject());\r\n-\t\t\t\tXDI3Segment relativeSubject = statementRoot.absoluteToRelativeXri(absoluteSubject);\r\n+\t\t\t\tXDIAddress absoluteSubject = root.relativeToAbsoluteXri(statementXri.getSubject());\r\n+\t\t\t\tXDIAddress relativeSubject = statementRoot.absoluteToRelativeXri(absoluteSubject);\r\n \t\t\t\tContextNode baseContextNode = relativeSubject == null ? statementRoot.getContextNode() : statementRoot.getContextNode().setDeepContextNode(relativeSubject);\r\n \r\n \t\t\t\t// add context nodes\r\n@@ -85,42 +85,42 @@ public void read(XdiRoot root, JsonObject jsonGraphObject, State state) throws I\n \r\n \t\t\t\t\tif (! (jsonEntryArrayElement instanceof JsonPrimitive) || ! ((JsonPrimitive) jsonEntryArrayElement).isString()) throw new Xdi2ParseException(\"JSON array element must be a string: \" + jsonEntryArrayElement);\r\n \r\n-\t\t\t\t\tXDI3SubSegment arcXri = makeXDI3SubSegment(((JsonPrimitive) jsonEntryArrayElement).getAsString(), state);\r\n+\t\t\t\t\tXDIArc arc = makeXDIArc(((JsonPrimitive) jsonEntryArrayElement).getAsString(), state);\r\n \r\n-\t\t\t\t\tContextNode contextNode = baseContextNode.setContextNode(arcXri);\r\n-\t\t\t\t\tif (log.isTraceEnabled()) log.trace(\"Under \" + baseContextNode.getXri() + \": Set context node \" + contextNode.getArcXri() + \" --> \" + contextNode.getXri());\r\n+\t\t\t\t\tContextNode contextNode = baseContextNode.setContextNode(arc);\r\n+\t\t\t\t\tif (log.isTraceEnabled()) log.trace(\"Under \" + baseContextNode.getAddress() + \": Set context node \" + contextNode.getArc() + \" --> \" + contextNode.getAddress());\r\n \t\t\t\t}\r\n-\t\t\t} else if (key.endsWith(\"/\" + XDIConstants.XRI_S_LITERAL.toString())) {\r\n+\t\t\t} else if (key.endsWith(\"/\" + XDIConstants.XDI_ADD_LITERAL.toString())) {\r\n \r\n-\t\t\t\tXDI3Statement statementXri = makeStatement(key + \"/\\\"\\\"\", state);\r\n+\t\t\t\tXDIStatement statementXri = makeStatement(key + \"/\\\"\\\"\", state);\r\n \r\n \t\t\t\tObject literalData = AbstractLiteral.jsonElementToLiteralData(jsonEntryElement);\r\n \r\n \t\t\t\t// find the root and the base context node of this statement\r\n \r\n \t\t\t\tXdiRoot statementRoot = root.getRoot(statementXri.getSubject(), true);\r\n-\t\t\t\tXDI3Segment absoluteSubject = root.relativeToAbsoluteXri(statementXri.getSubject());\r\n-\t\t\t\tXDI3Segment relativeSubject = statementRoot.absoluteToRelativeXri(absoluteSubject);\r\n+\t\t\t\tXDIAddress absoluteSubject = root.relativeToAbsoluteXri(statementXri.getSubject());\r\n+\t\t\t\tXDIAddress relativeSubject = statementRoot.absoluteToRelativeXri(absoluteSubject);\r\n \t\t\t\tContextNode baseContextNode = relativeSubject == null ? statementRoot.getContextNode() : statementRoot.getContextNode().setDeepContextNode(relativeSubject);\r\n \r\n \t\t\t\t// add literal\r\n \r\n \t\t\t\tLiteral literal = baseContextNode.setLiteral(literalData);\r\n-\t\t\t\tif (log.isTraceEnabled()) log.trace(\"Under \" + baseContextNode.getXri() + \": Set literal --> \" + literal.getLiteralData());\r\n+\t\t\t\tif (log.isTraceEnabled()) log.trace(\"Under \" + baseContextNode.getAddress() + \": Set literal --> \" + literal.getLiteralData());\r\n \t\t\t} else {\r\n \r\n-\t\t\t\tXDI3Statement statementXri = makeStatement(key + \"/\", state);\r\n+\t\t\t\tXDIStatement statementXri = makeStatement(key + \"/\", state);\r\n \r\n \t\t\t\tif (! (jsonEntryElement instanceof JsonArray)) throw new Xdi2ParseException(\"JSON object member must be an array: \" + jsonEntryElement);\r\n \r\n-\t\t\t\tXDI3Segment arcXri = statementXri.getPredicate();\r\n+\t\t\t\tXDIAddress arc = statementXri.getPredicate();\r\n \t\t\t\tJsonArray jsonEntryArray = (JsonArray) jsonEntryElement;\r\n \r\n \t\t\t\t// find the root and the base context node of this statement\r\n \r\n \t\t\t\tXdiRoot statementRoot = root.getRoot(statementXri.getSubject(), true);\r\n-\t\t\t\tXDI3Segment absoluteSubject = root.relativeToAbsoluteXri(statementXri.getSubject());\r\n-\t\t\t\tXDI3Segment relativeSubject = statementRoot.absoluteToRelativeXri(absoluteSubject);\r\n+\t\t\t\tXDIAddress absoluteSubject = root.relativeToAbsoluteXri(statementXri.getSubject());\r\n+\t\t\t\tXDIAddress relativeSubject = statementRoot.absoluteToRelativeXri(absoluteSubject);\r\n \t\t\t\tContextNode baseContextNode = relativeSubject == null ? statementRoot.getContextNode() : statementRoot.getContextNode().setDeepContextNode(relativeSubject);\r\n \r\n \t\t\t\t// add inner root and/or relations\r\n@@ -133,18 +133,18 @@ public void read(XdiRoot root, JsonObject jsonGraphObject, State state) throws I\n \r\n \t\t\t\t\t\troot = root.getRoot(statementXri.getSubject(), true);\r\n \r\n-\t\t\t\t\t\tXDI3Segment subject = root.absoluteToRelativeXri(XDI3Util.concatXris(root.getContextNode().getXri(), statementXri.getSubject()));\r\n-\t\t\t\t\t\tXDI3Segment predicate = statementXri.getPredicate();\r\n+\t\t\t\t\t\tXDIAddress subject = root.absoluteToRelativeXri(AddressUtil.concatAddresses(root.getContextNode().getAddress(), statementXri.getSubject()));\r\n+\t\t\t\t\t\tXDIAddress predicate = statementXri.getPredicate();\r\n \r\n \t\t\t\t\t\tXdiInnerRoot innerRoot = root.getInnerRoot(subject, predicate, true);\r\n \r\n \t\t\t\t\t\tthis.read(innerRoot, (JsonObject) jsonEntryArrayElement, state);\r\n \t\t\t\t\t} else if (jsonEntryArrayElement instanceof JsonPrimitive && ((JsonPrimitive) jsonEntryArrayElement).isString()) {\r\n \r\n-\t\t\t\t\t\tXDI3Segment targetContextNodeXri = makeXDI3Segment(((JsonPrimitive) jsonEntryArrayElement).getAsString(), state);\r\n+\t\t\t\t\t\tXDIAddress targetContextNodeAddress = makeXDIAddress(((JsonPrimitive) jsonEntryArrayElement).getAsString(), state);\r\n \r\n-\t\t\t\t\t\tRelation relation = baseContextNode.setRelation(arcXri, targetContextNodeXri);\r\n-\t\t\t\t\t\tif (log.isTraceEnabled()) log.trace(\"Under \" + baseContextNode.getXri() + \": Set relation \" + relation.getArcXri() + \" --> \" + relation.getTargetContextNodeXri());\r\n+\t\t\t\t\t\tRelation relation = baseContextNode.setRelation(arc, targetContextNodeAddress);\r\n+\t\t\t\t\t\tif (log.isTraceEnabled()) log.trace(\"Under \" + baseContextNode.getAddress() + \": Set relation \" + relation.getArc() + \" --> \" + relation.getTargetContextNodeAddress());\r\n \t\t\t\t\t} else {\r\n \r\n \t\t\t\t\t\tthrow new Xdi2ParseException(\"JSON array element must be either an object or a string: \" + jsonEntryArrayElement);\r\n@@ -187,21 +187,21 @@ private static class State {\n \t\tprivate String lastXriString;\r\n \t}\r\n \r\n-\tprivate static XDI3Statement makeStatement(String xriString, State state) {\r\n+\tprivate static XDIStatement makeStatement(String xriString, State state) {\r\n \r\n \t\tstate.lastXriString = xriString;\r\n-\t\treturn XDI3Statement.create(xriString);\r\n+\t\treturn XDIStatement.create(xriString);\r\n \t}\r\n \r\n-\tprivate static XDI3Segment makeXDI3Segment(String xriString, State state) {\r\n+\tprivate static XDIAddress makeXDIAddress(String xriString, State state) {\r\n \r\n \t\tstate.lastXriString = xriString;\r\n-\t\treturn XDI3Segment.create(xriString);\r\n+\t\treturn XDIAddress.create(xriString);\r\n \t}\r\n \r\n-\tprivate static XDI3SubSegment makeXDI3SubSegment(String xriString, State state) {\r\n+\tprivate static XDIArc makeXDIArc(String xriString, State state) {\r\n \r\n \t\tstate.lastXriString = xriString;\r\n-\t\treturn XDI3SubSegment.create(xriString);\r\n+\t\treturn XDIArc.create(xriString);\r\n \t}\r\n }\r", "raw_url": "https://github.com/projectdanube/xdi2/raw/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Fio%2Freaders%2FXDIJSONReader.java", "sha": "5b322130b16d82f55dc7a1f91c86f6f29e667d2c", "status": "modified" }, { "additions": 15, "blob_url": "https://github.com/projectdanube/xdi2/blob/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Fio%2Freaders%2FXDIRawJSONReader.java", "changes": 30, "contents_url": "https://api.github.com/repos/projectdanube/xdi2/contents/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Fio%2Freaders%2FXDIRawJSONReader.java?ref=0ca7982fec30c2bb8204efbbea61428a643d2e9c", "deletions": 15, "filename": "core/src/main/java/xdi2/core/io/readers/XDIRawJSONReader.java", "new_code": "import xdi2.core.syntax.XDIArc;\r\n\t\t\t\tXDIArc arc = Dictionary.nativeIdentifierToInstanceXri(key);\r\n\t\t\t\tXdiEntitySingleton xdiEntitySingleton = xdiContext.getXdiEntitySingleton(XdiEntitySingleton.createarc(arc), true);\r\n\t\t\t\tXDIArc arc = Dictionary.nativeIdentifierToInstanceXri(key);\r\n\t\t\t\treadJsonArray(xdiContext, arc, (JsonArray) jsonElement);\r\n\t\t\t\tXDIArc arc = Dictionary.nativeIdentifierToInstanceXri(key);\r\n\t\t\t\tXdiAttributeSingleton xdiAttributeSingleton = xdiContext.getXdiAttributeSingleton(XdiAttributeSingleton.createarc(arc), true);\r\n\tprivate static void readJsonArray(XdiContext<?> xdiContext, XDIArc arc, JsonArray jsonArray) {\r\n\t\tif (arc == null) {\r\n\t\t\tarc = XDIArc.create(\"$array\");\r\n\t\t\t\tXdiEntityCollection xdiEntityCollection = xdiContext.getXdiEntityCollection(XdiEntityCollection.createarc(arc), true);\r\n\t\t\t\tXdiEntityCollection xdiEntityCollection = xdiContext.getXdiEntityCollection(XdiEntityCollection.createarc(arc), true);\r\n\t\t\t\tXdiAttributeCollection xdiAttributeCollection = xdiContext.getXdiAttributeCollection(XdiAttributeCollection.createarc(arc), true);\r\n\t/*\tprivate static XDIArc jsonContentId(JsonElement jsonElement) {\r\n\t\t\treturn XDIArc.create(XDIConstants.CS_BANG + jsonContentId);\r", "new_methods": [], "old_code": "import xdi2.core.xri3.XDI3SubSegment;\r\n\t\t\t\tXDI3SubSegment arcXri = Dictionary.nativeIdentifierToInstanceXri(key);\r\n\t\t\t\tXdiEntitySingleton xdiEntitySingleton = xdiContext.getXdiEntitySingleton(XdiEntitySingleton.createArcXri(arcXri), true);\r\n\t\t\t\tXDI3SubSegment arcXri = Dictionary.nativeIdentifierToInstanceXri(key);\r\n\t\t\t\treadJsonArray(xdiContext, arcXri, (JsonArray) jsonElement);\r\n\t\t\t\tXDI3SubSegment arcXri = Dictionary.nativeIdentifierToInstanceXri(key);\r\n\t\t\t\tXdiAttributeSingleton xdiAttributeSingleton = xdiContext.getXdiAttributeSingleton(XdiAttributeSingleton.createArcXri(arcXri), true);\r\n\tprivate static void readJsonArray(XdiContext<?> xdiContext, XDI3SubSegment arcXri, JsonArray jsonArray) {\r\n\t\tif (arcXri == null) {\r\n\t\t\tarcXri = XDI3SubSegment.create(\"$array\");\r\n\t\t\t\tXdiEntityCollection xdiEntityCollection = xdiContext.getXdiEntityCollection(XdiEntityCollection.createArcXri(arcXri), true);\r\n\t\t\t\tXdiEntityCollection xdiEntityCollection = xdiContext.getXdiEntityCollection(XdiEntityCollection.createArcXri(arcXri), true);\r\n\t\t\t\tXdiAttributeCollection xdiAttributeCollection = xdiContext.getXdiAttributeCollection(XdiAttributeCollection.createArcXri(arcXri), true);\r\n\t/*\tprivate static XDI3SubSegment jsonContentId(JsonElement jsonElement) {\r\n\t\t\treturn XDI3SubSegment.create(XDIConstants.CS_BANG + jsonContentId);\r", "old_methods": [], "patch": "@@ -22,7 +22,7 @@\n import xdi2.core.impl.AbstractLiteral;\r\n import xdi2.core.io.AbstractXDIReader;\r\n import xdi2.core.io.MimeType;\r\n-import xdi2.core.xri3.XDI3SubSegment;\r\n+import xdi2.core.syntax.XDIArc;\r\n \r\n import com.google.gson.Gson;\r\n import com.google.gson.GsonBuilder;\r\n@@ -60,31 +60,31 @@ private static void readJsonObject(XdiContext<?> xdiContext, JsonObject jsonObje\n \r\n \t\t\tif (jsonElement instanceof JsonObject) {\r\n \r\n-\t\t\t\tXDI3SubSegment arcXri = Dictionary.nativeIdentifierToInstanceXri(key);\r\n+\t\t\t\tXDIArc arc = Dictionary.nativeIdentifierToInstanceXri(key);\r\n \r\n-\t\t\t\tXdiEntitySingleton xdiEntitySingleton = xdiContext.getXdiEntitySingleton(XdiEntitySingleton.createArcXri(arcXri), true);\r\n+\t\t\t\tXdiEntitySingleton xdiEntitySingleton = xdiContext.getXdiEntitySingleton(XdiEntitySingleton.createarc(arc), true);\r\n \t\t\t\treadJsonObject(xdiEntitySingleton, (JsonObject) jsonElement);\r\n \t\t\t} else if (jsonElement instanceof JsonArray) {\r\n \r\n-\t\t\t\tXDI3SubSegment arcXri = Dictionary.nativeIdentifierToInstanceXri(key);\r\n+\t\t\t\tXDIArc arc = Dictionary.nativeIdentifierToInstanceXri(key);\r\n \r\n-\t\t\t\treadJsonArray(xdiContext, arcXri, (JsonArray) jsonElement);\r\n+\t\t\t\treadJsonArray(xdiContext, arc, (JsonArray) jsonElement);\r\n \t\t\t} else if (jsonElement instanceof JsonPrimitive) {\r\n \r\n-\t\t\t\tXDI3SubSegment arcXri = Dictionary.nativeIdentifierToInstanceXri(key);\r\n+\t\t\t\tXDIArc arc = Dictionary.nativeIdentifierToInstanceXri(key);\r\n \r\n-\t\t\t\tXdiAttributeSingleton xdiAttributeSingleton = xdiContext.getXdiAttributeSingleton(XdiAttributeSingleton.createArcXri(arcXri), true);\r\n+\t\t\t\tXdiAttributeSingleton xdiAttributeSingleton = xdiContext.getXdiAttributeSingleton(XdiAttributeSingleton.createarc(arc), true);\r\n \t\t\t\tXdiValue xdiValue = xdiAttributeSingleton.getXdiValue(true);\r\n \t\t\t\txdiValue.getContextNode().setLiteral(AbstractLiteral.jsonElementToLiteralData(jsonElement));\r\n \t\t\t}\r\n \t\t}\r\n \t}\r\n \r\n-\tprivate static void readJsonArray(XdiContext<?> xdiContext, XDI3SubSegment arcXri, JsonArray jsonArray) {\r\n+\tprivate static void readJsonArray(XdiContext<?> xdiContext, XDIArc arc, JsonArray jsonArray) {\r\n \r\n-\t\tif (arcXri == null) {\r\n+\t\tif (arc == null) {\r\n \r\n-\t\t\tarcXri = XDI3SubSegment.create(\"$array\");\r\n+\t\t\tarc = XDIArc.create(\"$array\");\r\n \t\t}\r\n \r\n \t\tlong index = 0;\r\n@@ -93,19 +93,19 @@ private static void readJsonArray(XdiContext<?> xdiContext, XDI3SubSegment arcXr\n \r\n \t\t\tif (jsonElement instanceof JsonObject) {\r\n \r\n-\t\t\t\tXdiEntityCollection xdiEntityCollection = xdiContext.getXdiEntityCollection(XdiEntityCollection.createArcXri(arcXri), true);\r\n+\t\t\t\tXdiEntityCollection xdiEntityCollection = xdiContext.getXdiEntityCollection(XdiEntityCollection.createarc(arc), true);\r\n \r\n \t\t\t\tXdiEntityMemberOrdered xdiEntityMember = xdiEntityCollection.setXdiMemberOrdered(index);\r\n \t\t\t\treadJsonObject(xdiEntityMember, (JsonObject) jsonElement);\r\n \t\t\t} else if (jsonElement instanceof JsonArray) {\r\n \r\n-\t\t\t\tXdiEntityCollection xdiEntityCollection = xdiContext.getXdiEntityCollection(XdiEntityCollection.createArcXri(arcXri), true);\r\n+\t\t\t\tXdiEntityCollection xdiEntityCollection = xdiContext.getXdiEntityCollection(XdiEntityCollection.createarc(arc), true);\r\n \r\n \t\t\t\tXdiEntityMemberOrdered xdiEntityMember = xdiEntityCollection.setXdiMemberOrdered(index);\r\n \t\t\t\treadJsonArray(xdiEntityMember, null, (JsonArray) jsonElement);\r\n \t\t\t} else {\r\n \r\n-\t\t\t\tXdiAttributeCollection xdiAttributeCollection = xdiContext.getXdiAttributeCollection(XdiAttributeCollection.createArcXri(arcXri), true);\r\n+\t\t\t\tXdiAttributeCollection xdiAttributeCollection = xdiContext.getXdiAttributeCollection(XdiAttributeCollection.createarc(arc), true);\r\n \r\n \t\t\t\tXdiAttributeMemberOrdered xdiAttributeMember = xdiAttributeCollection.setXdiMemberOrdered(index);\r\n \t\t\t\tXdiValue xdiValue = xdiAttributeMember.getXdiValue(true);\r\n@@ -116,7 +116,7 @@ private static void readJsonArray(XdiContext<?> xdiContext, XDI3SubSegment arcXr\n \t\t}\r\n \t}\r\n \r\n-\t/*\tprivate static XDI3SubSegment jsonContentId(JsonElement jsonElement) {\r\n+\t/*\tprivate static XDIArc jsonContentId(JsonElement jsonElement) {\r\n \r\n \t\ttry {\r\n \r\n@@ -131,7 +131,7 @@ private static void readJsonArray(XdiContext<?> xdiContext, XDI3SubSegment arcXr\n \t\t\tString jsonContentId = new String(Base64.encodeBase64URLSafe(digest.digest()), \"UTF-8\");\r\n \t\t\tif (log.isDebugEnabled()) log.debug(\"json_content_id: \" + jsonContentId);\r\n \r\n-\t\t\treturn XDI3SubSegment.create(XDIConstants.CS_BANG + jsonContentId);\r\n+\t\t\treturn XDIArc.create(XDIConstants.CS_BANG + jsonContentId);\r\n \t\t} catch (Exception ex) {\r\n \r\n \t\t\tthrow new Xdi2RuntimeException(ex.getMessage(), ex);\r", "raw_url": "https://github.com/projectdanube/xdi2/raw/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Fio%2Freaders%2FXDIRawJSONReader.java", "sha": "7aa5036e984b374fc35b4c3c79717e7c895f4d63", "status": "modified" }, { "additions": 22, "blob_url": "https://github.com/projectdanube/xdi2/blob/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Fio%2Fwriters%2FXDIDisplayWriter.java", "changes": 44, "contents_url": "https://api.github.com/repos/projectdanube/xdi2/contents/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Fio%2Fwriters%2FXDIDisplayWriter.java?ref=0ca7982fec30c2bb8204efbbea61428a643d2e9c", "deletions": 22, "filename": "core/src/main/java/xdi2/core/io/writers/XDIDisplayWriter.java", "new_code": "import xdi2.core.syntax.XDIAddress;\r\nimport xdi2.core.syntax.XDIArc;\r\nimport xdi2.core.syntax.XDIStatement;\r\n\tprivate void writeStatement(BufferedWriter bufferedWriter, XDIStatement statementXri) throws IOException {\r\n\t\tthis.writecontextNodeAddress(bufferedWriter, statementXri.getSubject());\r\n\t\t\tthis.writecontextNodeArc(bufferedWriter, statementXri.getSubject(), (XDIArc) statementXri.getObject());\r\n\t\t\tthis.writecontextNodeAddress(bufferedWriter, (XDIAddress) statementXri.getObject());\r\n\tprivate void writecontextNodeAddress(BufferedWriter bufferedWriter, XDIAddress contextNodeAddress) throws IOException {\r\n\t\t\tfor (XDIArc contextNodeArc : contextNodeAddress.getArcs()) {\r\n\t\t\t\tthis.writecontextNodeArc(bufferedWriter, contextNode, contextNodeArc);\r\n\t\t\t\tif (! XDIConstants.XDI_ADD_ROOT.equals(contextNodeArc)) {\r\n\t\t\t\t\tcontextNode = contextNode.setContextNode(contextNodeArc);\r\n\t\t\tbufferedWriter.write(contextNodeAddress.toString());\r\n\tprivate void writecontextNodeArc(BufferedWriter bufferedWriter, XDIAddress contextNodeAddress, XDIArc contextNodeArc) throws IOException {\r\n\t\tif (! XDIConstants.XDI_ADD_ROOT.equals(contextNodeAddress)) {\r\n\t\t\tcontextNode = contextNode.setDeepContextNode(contextNodeAddress);\r\n\t\tthis.writecontextNodeArc(bufferedWriter, contextNode, contextNodeArc);\r\n\tprivate void writecontextNodeArc(BufferedWriter bufferedWriter, ContextNode contextNode, XDIArc contextNodeArc) throws IOException {\r\n\t\tif (! XDIConstants.XDI_ADD_ROOT.equals(contextNodeArc)) {\r\n\t\t\tcontextNode = contextNode.setContextNode(contextNodeArc);\r\n\t\tbufferedWriter.write(contextNodeArc.toString());\r\n\tprivate void writePredicateXri(BufferedWriter bufferedWriter, XDIAddress predicateXri) throws IOException {\r", "new_methods": [], "old_code": "import xdi2.core.xri3.XDI3Segment;\r\nimport xdi2.core.xri3.XDI3Statement;\r\nimport xdi2.core.xri3.XDI3SubSegment;\r\n\tprivate void writeStatement(BufferedWriter bufferedWriter, XDI3Statement statementXri) throws IOException {\r\n\t\tthis.writeContextNodeXri(bufferedWriter, statementXri.getSubject());\r\n\t\t\tthis.writeContextNodeArcXri(bufferedWriter, statementXri.getSubject(), (XDI3SubSegment) statementXri.getObject());\r\n\t\t\tthis.writeContextNodeXri(bufferedWriter, (XDI3Segment) statementXri.getObject());\r\n\tprivate void writeContextNodeXri(BufferedWriter bufferedWriter, XDI3Segment contextNodeXri) throws IOException {\r\n\t\t\tfor (XDI3SubSegment contextNodeArcXri : contextNodeXri.getSubSegments()) {\r\n\t\t\t\tthis.writeContextNodeArcXri(bufferedWriter, contextNode, contextNodeArcXri);\r\n\t\t\t\tif (! XDIConstants.XRI_S_ROOT.equals(contextNodeArcXri)) {\r\n\t\t\t\t\tcontextNode = contextNode.setContextNode(contextNodeArcXri);\r\n\t\t\tbufferedWriter.write(contextNodeXri.toString());\r\n\tprivate void writeContextNodeArcXri(BufferedWriter bufferedWriter, XDI3Segment contextNodeXri, XDI3SubSegment contextNodeArcXri) throws IOException {\r\n\t\tif (! XDIConstants.XRI_S_ROOT.equals(contextNodeXri)) {\r\n\t\t\tcontextNode = contextNode.setDeepContextNode(contextNodeXri);\r\n\t\tthis.writeContextNodeArcXri(bufferedWriter, contextNode, contextNodeArcXri);\r\n\tprivate void writeContextNodeArcXri(BufferedWriter bufferedWriter, ContextNode contextNode, XDI3SubSegment contextNodeArcXri) throws IOException {\r\n\t\tif (! XDIConstants.XRI_S_ROOT.equals(contextNodeArcXri)) {\r\n\t\t\tcontextNode = contextNode.setContextNode(contextNodeArcXri);\r\n\t\tbufferedWriter.write(contextNodeArcXri.toString());\r\n\tprivate void writePredicateXri(BufferedWriter bufferedWriter, XDI3Segment predicateXri) throws IOException {\r", "old_methods": [], "patch": "@@ -25,16 +25,16 @@\n import xdi2.core.io.AbstractXDIWriter;\r\n import xdi2.core.io.MimeType;\r\n import xdi2.core.io.XDIWriterRegistry;\r\n+import xdi2.core.syntax.XDIAddress;\r\n+import xdi2.core.syntax.XDIArc;\r\n+import xdi2.core.syntax.XDIStatement;\r\n import xdi2.core.util.CopyUtil;\r\n import xdi2.core.util.iterators.CompositeIterator;\r\n import xdi2.core.util.iterators.IterableIterator;\r\n import xdi2.core.util.iterators.MappingContextNodeStatementIterator;\r\n import xdi2.core.util.iterators.MappingLiteralStatementIterator;\r\n import xdi2.core.util.iterators.MappingRelationStatementIterator;\r\n import xdi2.core.util.iterators.SelectingNotImpliedStatementIterator;\r\n-import xdi2.core.xri3.XDI3Segment;\r\n-import xdi2.core.xri3.XDI3Statement;\r\n-import xdi2.core.xri3.XDI3SubSegment;\r\n \r\n public class XDIDisplayWriter extends AbstractXDIWriter {\r\n \r\n@@ -141,21 +141,21 @@ public void write(Graph graph, BufferedWriter bufferedWriter) throws IOException\n \t\tif (orderedGraph != null) orderedGraph.close();\r\n \t}\r\n \r\n-\tprivate void writeStatement(BufferedWriter bufferedWriter, XDI3Statement statementXri) throws IOException {\r\n+\tprivate void writeStatement(BufferedWriter bufferedWriter, XDIStatement statementXri) throws IOException {\r\n \r\n \t\t// write the statement\r\n \r\n-\t\tthis.writeContextNodeXri(bufferedWriter, statementXri.getSubject());\r\n+\t\tthis.writecontextNodeAddress(bufferedWriter, statementXri.getSubject());\r\n \t\tthis.writeSeparator(bufferedWriter);\r\n \t\tthis.writePredicateXri(bufferedWriter, statementXri.getPredicate());\r\n \t\tthis.writeSeparator(bufferedWriter);\r\n \r\n \t\tif (statementXri.isContextNodeStatement()) {\r\n \r\n-\t\t\tthis.writeContextNodeArcXri(bufferedWriter, statementXri.getSubject(), (XDI3SubSegment) statementXri.getObject());\r\n+\t\t\tthis.writecontextNodeArc(bufferedWriter, statementXri.getSubject(), (XDIArc) statementXri.getObject());\r\n \t\t} else if (statementXri.isRelationStatement()) {\r\n \r\n-\t\t\tthis.writeContextNodeXri(bufferedWriter, (XDI3Segment) statementXri.getObject());\r\n+\t\t\tthis.writecontextNodeAddress(bufferedWriter, (XDIAddress) statementXri.getObject());\r\n \t\t} else if (statementXri.isLiteralStatement()) {\r\n \r\n \t\t\tthis.writeLiteralData(bufferedWriter, statementXri.getObject());\r\n@@ -176,44 +176,44 @@ private void writeSeparator(BufferedWriter bufferedWriter) throws IOException {\n \t\t}\r\n \t}\r\n \r\n-\tprivate void writeContextNodeXri(BufferedWriter bufferedWriter, XDI3Segment contextNodeXri) throws IOException {\r\n+\tprivate void writecontextNodeAddress(BufferedWriter bufferedWriter, XDIAddress contextNodeAddress) throws IOException {\r\n \r\n \t\tif (this.writeHtml) {\r\n \r\n \t\t\tContextNode contextNode = MemoryGraphFactory.getInstance().openGraph().getRootContextNode(false);\r\n \r\n-\t\t\tfor (XDI3SubSegment contextNodeArcXri : contextNodeXri.getSubSegments()) {\r\n+\t\t\tfor (XDIArc contextNodeArc : contextNodeAddress.getArcs()) {\r\n \r\n-\t\t\t\tthis.writeContextNodeArcXri(bufferedWriter, contextNode, contextNodeArcXri);\r\n+\t\t\t\tthis.writecontextNodeArc(bufferedWriter, contextNode, contextNodeArc);\r\n \r\n-\t\t\t\tif (! XDIConstants.XRI_S_ROOT.equals(contextNodeArcXri)) {\r\n+\t\t\t\tif (! XDIConstants.XDI_ADD_ROOT.equals(contextNodeArc)) {\r\n \r\n-\t\t\t\t\tcontextNode = contextNode.setContextNode(contextNodeArcXri);\r\n+\t\t\t\t\tcontextNode = contextNode.setContextNode(contextNodeArc);\r\n \t\t\t\t}\r\n \t\t\t}\r\n \t\t} else {\r\n \r\n-\t\t\tbufferedWriter.write(contextNodeXri.toString());\r\n+\t\t\tbufferedWriter.write(contextNodeAddress.toString());\r\n \t\t}\r\n \t}\r\n \r\n-\tprivate void writeContextNodeArcXri(BufferedWriter bufferedWriter, XDI3Segment contextNodeXri, XDI3SubSegment contextNodeArcXri) throws IOException {\r\n+\tprivate void writecontextNodeArc(BufferedWriter bufferedWriter, XDIAddress contextNodeAddress, XDIArc contextNodeArc) throws IOException {\r\n \r\n \t\tContextNode contextNode = MemoryGraphFactory.getInstance().openGraph().getRootContextNode(false);\r\n \r\n-\t\tif (! XDIConstants.XRI_S_ROOT.equals(contextNodeXri)) {\r\n+\t\tif (! XDIConstants.XDI_ADD_ROOT.equals(contextNodeAddress)) {\r\n \r\n-\t\t\tcontextNode = contextNode.setDeepContextNode(contextNodeXri);\r\n+\t\t\tcontextNode = contextNode.setDeepContextNode(contextNodeAddress);\r\n \t\t}\r\n \r\n-\t\tthis.writeContextNodeArcXri(bufferedWriter, contextNode, contextNodeArcXri);\r\n+\t\tthis.writecontextNodeArc(bufferedWriter, contextNode, contextNodeArc);\r\n \t}\r\n \r\n-\tprivate void writeContextNodeArcXri(BufferedWriter bufferedWriter, ContextNode contextNode, XDI3SubSegment contextNodeArcXri) throws IOException {\r\n+\tprivate void writecontextNodeArc(BufferedWriter bufferedWriter, ContextNode contextNode, XDIArc contextNodeArc) throws IOException {\r\n \r\n-\t\tif (! XDIConstants.XRI_S_ROOT.equals(contextNodeArcXri)) {\r\n+\t\tif (! XDIConstants.XDI_ADD_ROOT.equals(contextNodeArc)) {\r\n \r\n-\t\t\tcontextNode = contextNode.setContextNode(contextNodeArcXri);\r\n+\t\t\tcontextNode = contextNode.setContextNode(contextNodeArc);\r\n \t\t}\r\n \r\n \t\tString htmlColorString = null;\r\n@@ -226,12 +226,12 @@ private void writeContextNodeArcXri(BufferedWriter bufferedWriter, ContextNode c\n \t\t}\r\n \r\n \t\tif (htmlColorString != null) bufferedWriter.write(\"<span style=\\\"background-color:\" + htmlColorString + \"\\\">\");\r\n-\t\tbufferedWriter.write(contextNodeArcXri.toString());\r\n+\t\tbufferedWriter.write(contextNodeArc.toString());\r\n \t\tif (htmlColorString != null) bufferedWriter.write(\"</span>\");\r\n \t}\r\n \r\n \t@SuppressWarnings(\"static-method\")\r\n-\tprivate void writePredicateXri(BufferedWriter bufferedWriter, XDI3Segment predicateXri) throws IOException {\r\n+\tprivate void writePredicateXri(BufferedWriter bufferedWriter, XDIAddress predicateXri) throws IOException {\r\n \r\n \t\tbufferedWriter.write(predicateXri.toString());\r\n \t}\r", "raw_url": "https://github.com/projectdanube/xdi2/raw/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Fio%2Fwriters%2FXDIDisplayWriter.java", "sha": "926497e24cd0ee03281e294cad39fbffbdee37f9", "status": "modified" }, { "additions": 18, "blob_url": "https://github.com/projectdanube/xdi2/blob/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Fio%2Fwriters%2FXDIJSONPARSEWriter.java", "changes": 36, "contents_url": "https://api.github.com/repos/projectdanube/xdi2/contents/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Fio%2Fwriters%2FXDIJSONPARSEWriter.java?ref=0ca7982fec30c2bb8204efbbea61428a643d2e9c", "deletions": 18, "filename": "core/src/main/java/xdi2/core/io/writers/XDIJSONPARSEWriter.java", "new_code": "import xdi2.core.syntax.XDIAddress;\r\nimport xdi2.core.syntax.XDIArc;\r\nimport xdi2.core.syntax.XDIStatement;\r\nimport xdi2.core.syntax.XDIXRef;\r\n\t\t\tXDIStatement statementXri = statement.getXri();\r\n\tprivate static JsonArray makeGom(XDIStatement statement) {\r\n\t\tif (statement.getObject() instanceof XDIAddress)\r\n\t\t\tgom.add(makeGom((XDIAddress) statement.getObject()));\r\n\t\telse if (statement.getObject() instanceof XDIArc)\r\n\t\t\tgom.add(makeGom((XDIArc) statement.getObject()));\r\n\tprivate static JsonElement makeGom(XDIAddress segment) {\r\n\t\tif (segment.getNumArcs() == 1) {\r\n\t\t\tgom = makeGom(segment.getFirstArc());\r\n\t\t\tfor (int i=0; i<segment.getNumArcs(); i++) ((JsonArray) gom).add(makeGom(segment.getArc(i)));\r\n\tprivate static JsonElement makeGom(XDIArc subSegment) {\r\n\tprivate static JsonElement makeGom(XDIXRef xref) {\r\n\t\t} else if (xref.hasAddress()) {\r\n\t\t\treturn makeGom(xref.getAddress());\r", "new_methods": [ { "arguments": [ "XDIStatement statement" ], "filename": "core/src/main/java/xdi2/core/io/writers/XDIJSONPARSEWriter.java", "implementation": "if (statement.getObject() instanceof XDIAddress)\r\n\t\t\tgom.add(makeGom((XDIAddress) statement.getObject()));\r\n\t\telse if (statement.getObject() instanceof XDIArc)\r\n\t\t\tgom.add(makeGom((XDIArc) statement.getObject()));\r\n\tprivate static JsonElement makeGom(XDIAddress segment) {\r\n\t\tif (segment.getNumArcs() == 1) {\r\n\t\t\tgom = makeGom(segment.getFirstArc());\r\n\t\t\tfor (int i=0; i<segment.getNumArcs(); i++) ((JsonArray) gom).add(makeGom(segment.getArc(i)));\r\n\tprivate static JsonElement makeGom(XDIArc subSegment) {\r\n\tprivate static JsonElement makeGom(XDIXRef xref) {", "signature": "JsonArray makeGom(XDIStatement statement)" } ], "old_code": "import xdi2.core.xri3.XDI3Segment;\r\nimport xdi2.core.xri3.XDI3Statement;\r\nimport xdi2.core.xri3.XDI3SubSegment;\r\nimport xdi2.core.xri3.XDI3XRef;\r\n\t\t\tXDI3Statement statementXri = statement.getXri();\r\n\tprivate static JsonArray makeGom(XDI3Statement statement) {\r\n\t\tif (statement.getObject() instanceof XDI3Segment)\r\n\t\t\tgom.add(makeGom((XDI3Segment) statement.getObject()));\r\n\t\telse if (statement.getObject() instanceof XDI3SubSegment)\r\n\t\t\tgom.add(makeGom((XDI3SubSegment) statement.getObject()));\r\n\tprivate static JsonElement makeGom(XDI3Segment segment) {\r\n\t\tif (segment.getNumSubSegments() == 1) {\r\n\t\t\tgom = makeGom(segment.getFirstSubSegment());\r\n\t\t\tfor (int i=0; i<segment.getNumSubSegments(); i++) ((JsonArray) gom).add(makeGom(segment.getSubSegment(i)));\r\n\tprivate static JsonElement makeGom(XDI3SubSegment subSegment) {\r\n\tprivate static JsonElement makeGom(XDI3XRef xref) {\r\n\t\t} else if (xref.hasSegment()) {\r\n\t\t\treturn makeGom(xref.getSegment());\r", "old_methods": [ { "arguments": [ "XDI3Statement statement" ], "filename": "core/src/main/java/xdi2/core/io/writers/XDIJSONPARSEWriter.java", "implementation": "if (statement.getObject() instanceof XDI3Segment)\r\n\t\t\tgom.add(makeGom((XDI3Segment) statement.getObject()));\r\n\t\telse if (statement.getObject() instanceof XDI3SubSegment)\r\n\t\t\tgom.add(makeGom((XDI3SubSegment) statement.getObject()));\r\n\tprivate static JsonElement makeGom(XDI3Segment segment) {\r\n\t\tif (segment.getNumSubSegments() == 1) {\r\n\t\t\tgom = makeGom(segment.getFirstSubSegment());\r\n\t\t\tfor (int i=0; i<segment.getNumSubSegments(); i++) ((JsonArray) gom).add(makeGom(segment.getSubSegment(i)));\r\n\tprivate static JsonElement makeGom(XDI3SubSegment subSegment) {\r\n\tprivate static JsonElement makeGom(XDI3XRef xref) {", "signature": "JsonArray makeGom(XDI3Statement statement)" } ], "patch": "@@ -18,17 +18,17 @@\n import xdi2.core.io.AbstractXDIWriter;\r\n import xdi2.core.io.MimeType;\r\n import xdi2.core.io.XDIWriterRegistry;\r\n+import xdi2.core.syntax.XDIAddress;\r\n+import xdi2.core.syntax.XDIArc;\r\n+import xdi2.core.syntax.XDIStatement;\r\n+import xdi2.core.syntax.XDIXRef;\r\n import xdi2.core.util.CopyUtil;\r\n import xdi2.core.util.iterators.CompositeIterator;\r\n import xdi2.core.util.iterators.IterableIterator;\r\n import xdi2.core.util.iterators.MappingContextNodeStatementIterator;\r\n import xdi2.core.util.iterators.MappingLiteralStatementIterator;\r\n import xdi2.core.util.iterators.MappingRelationStatementIterator;\r\n import xdi2.core.util.iterators.SelectingNotImpliedStatementIterator;\r\n-import xdi2.core.xri3.XDI3Segment;\r\n-import xdi2.core.xri3.XDI3Statement;\r\n-import xdi2.core.xri3.XDI3SubSegment;\r\n-import xdi2.core.xri3.XDI3XRef;\r\n \r\n import com.google.gson.Gson;\r\n import com.google.gson.GsonBuilder;\r\n@@ -125,7 +125,7 @@ private static JsonArray makeGom(IterableIterator<Statement> statements) {\n \r\n \t\tfor (Statement statement : statements) {\r\n \r\n-\t\t\tXDI3Statement statementXri = statement.getXri();\r\n+\t\t\tXDIStatement statementXri = statement.getXri();\r\n \r\n \t\t\t// write the statement\r\n \r\n@@ -135,41 +135,41 @@ private static JsonArray makeGom(IterableIterator<Statement> statements) {\n \t\treturn gom;\r\n \t}\r\n \r\n-\tprivate static JsonArray makeGom(XDI3Statement statement) {\r\n+\tprivate static JsonArray makeGom(XDIStatement statement) {\r\n \r\n \t\tJsonArray gom = new JsonArray();\r\n \r\n \t\tgom.add(makeGom(statement.getSubject()));\r\n \t\tgom.add(makeGom(statement.getPredicate()));\r\n \r\n-\t\tif (statement.getObject() instanceof XDI3Segment)\r\n-\t\t\tgom.add(makeGom((XDI3Segment) statement.getObject()));\r\n-\t\telse if (statement.getObject() instanceof XDI3SubSegment)\r\n-\t\t\tgom.add(makeGom((XDI3SubSegment) statement.getObject()));\r\n+\t\tif (statement.getObject() instanceof XDIAddress)\r\n+\t\t\tgom.add(makeGom((XDIAddress) statement.getObject()));\r\n+\t\telse if (statement.getObject() instanceof XDIArc)\r\n+\t\t\tgom.add(makeGom((XDIArc) statement.getObject()));\r\n \t\telse\r\n \t\t\tgom.add(AbstractLiteral.literalDataToJsonElement(statement.getObject()));\r\n \r\n \t\treturn gom;\r\n \t}\r\n \r\n-\tprivate static JsonElement makeGom(XDI3Segment segment) {\r\n+\tprivate static JsonElement makeGom(XDIAddress segment) {\r\n \r\n \t\tJsonElement gom;\r\n \r\n-\t\tif (segment.getNumSubSegments() == 1) {\r\n+\t\tif (segment.getNumArcs() == 1) {\r\n \r\n-\t\t\tgom = makeGom(segment.getFirstSubSegment());\r\n+\t\t\tgom = makeGom(segment.getFirstArc());\r\n \t\t} else {\r\n \r\n \t\t\tgom = new JsonArray();\r\n \r\n-\t\t\tfor (int i=0; i<segment.getNumSubSegments(); i++) ((JsonArray) gom).add(makeGom(segment.getSubSegment(i)));\r\n+\t\t\tfor (int i=0; i<segment.getNumArcs(); i++) ((JsonArray) gom).add(makeGom(segment.getArc(i)));\r\n \t\t}\r\n \r\n \t\treturn gom;\r\n \t}\r\n \r\n-\tprivate static JsonElement makeGom(XDI3SubSegment subSegment) {\r\n+\tprivate static JsonElement makeGom(XDIArc subSegment) {\r\n \r\n \t\tJsonElement gom = null;\r\n \r\n@@ -215,17 +215,17 @@ private static JsonElement makeGom(XDI3SubSegment subSegment) {\n \t\treturn gom;\r\n \t}\r\n \r\n-\tprivate static JsonElement makeGom(XDI3XRef xref) {\r\n+\tprivate static JsonElement makeGom(XDIXRef xref) {\r\n \r\n \t\tif (xref.hasPartialSubjectAndPredicate()) {\r\n \r\n \t\t\tJsonArray gom = new JsonArray();\r\n \t\t\tgom.add(makeGom(xref.getPartialSubject()));\r\n \t\t\tgom.add(makeGom(xref.getPartialPredicate()));\r\n \t\t\treturn gom;\r\n-\t\t} else if (xref.hasSegment()) {\r\n+\t\t} else if (xref.hasAddress()) {\r\n \r\n-\t\t\treturn makeGom(xref.getSegment());\r\n+\t\t\treturn makeGom(xref.getAddress());\r\n \t\t} else {\r\n \r\n \t\t\treturn xref.getValue() == null ? new JsonPrimitive(\"\") : new JsonPrimitive(xref.getValue());\r", "raw_url": "https://github.com/projectdanube/xdi2/raw/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Fio%2Fwriters%2FXDIJSONPARSEWriter.java", "sha": "65873feb41055bd9fafa4e357109e51615d08e16", "status": "modified" }, { "additions": 6, "blob_url": "https://github.com/projectdanube/xdi2/blob/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Fio%2Fwriters%2FXDIJSONTREEWriter.java", "changes": 12, "contents_url": "https://api.github.com/repos/projectdanube/xdi2/contents/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Fio%2Fwriters%2FXDIJSONTREEWriter.java?ref=0ca7982fec30c2bb8204efbbea61428a643d2e9c", "deletions": 6, "filename": "core/src/main/java/xdi2/core/io/writers/XDIJSONTREEWriter.java", "new_code": "\t\t\tif (json.get(innerContextNode.getArc().toString()) == null) {\r\n\t\t\t\tif (innerContextNode.getArc().equals(XDIConstants.CS_VALUE.toString()) && innerContextNode.containsLiteral()) {\r\n\t\t\t\t\tjson.add(innerContextNode.getArc().toString(), makeJson(innerContextNode, writeImplied));\r\n\t\t\tJsonArray relationJson = relationsJson.getAsJsonArray(relation.getArc().toString());\r\n\t\t\tif (relationJson == null) { relationJson = new JsonArray(); relationsJson.add(relation.getArc().toString(), relationJson); }\r\n\t\t\trelationJson.add(new JsonPrimitive(relation.getTargetContextNodeAddress().toString()));\r", "new_methods": [], "old_code": "\t\t\tif (json.get(innerContextNode.getArcXri().toString()) == null) {\r\n\t\t\t\tif (innerContextNode.getArcXri().equals(XDIConstants.CS_VALUE.toString()) && innerContextNode.containsLiteral()) {\r\n\t\t\t\t\tjson.add(innerContextNode.getArcXri().toString(), makeJson(innerContextNode, writeImplied));\r\n\t\t\tJsonArray relationJson = relationsJson.getAsJsonArray(relation.getArcXri().toString());\r\n\t\t\tif (relationJson == null) { relationJson = new JsonArray(); relationsJson.add(relation.getArcXri().toString(), relationJson); }\r\n\t\t\trelationJson.add(new JsonPrimitive(relation.getTargetContextNodeXri().toString()));\r", "old_methods": [], "patch": "@@ -99,14 +99,14 @@ private static JsonObject makeJson(ContextNode contextNode, boolean writeImplied\n \r\n \t\t\tif (! writeImplied && innerContextNode.getStatement().isImplied() && innerContextNode.isEmpty()) continue;\r\n \r\n-\t\t\tif (json.get(innerContextNode.getArcXri().toString()) == null) {\r\n+\t\t\tif (json.get(innerContextNode.getArc().toString()) == null) {\r\n \r\n-\t\t\t\tif (innerContextNode.getArcXri().equals(XDIConstants.CS_VALUE.toString()) && innerContextNode.containsLiteral()) {\r\n+\t\t\t\tif (innerContextNode.getArc().equals(XDIConstants.CS_VALUE.toString()) && innerContextNode.containsLiteral()) {\r\n \r\n \t\t\t\t\tjson.add(XDIConstants.CS_VALUE.toString(), AbstractLiteral.literalDataToJsonElement(innerContextNode.getLiteral().getLiteralData()));\r\n \t\t\t\t} else {\r\n \r\n-\t\t\t\t\tjson.add(innerContextNode.getArcXri().toString(), makeJson(innerContextNode, writeImplied));\r\n+\t\t\t\t\tjson.add(innerContextNode.getArc().toString(), makeJson(innerContextNode, writeImplied));\r\n \t\t\t\t}\r\n \t\t\t}\r\n \t\t}\r\n@@ -120,10 +120,10 @@ private static JsonObject makeJson(ContextNode contextNode, boolean writeImplied\n \t\t\tJsonObject relationsJson = json.getAsJsonObject(\"/\");\r\n \t\t\tif (relationsJson == null) { relationsJson = new JsonObject(); json.add(\"/\", relationsJson); }\r\n \r\n-\t\t\tJsonArray relationJson = relationsJson.getAsJsonArray(relation.getArcXri().toString());\r\n-\t\t\tif (relationJson == null) { relationJson = new JsonArray(); relationsJson.add(relation.getArcXri().toString(), relationJson); }\r\n+\t\t\tJsonArray relationJson = relationsJson.getAsJsonArray(relation.getArc().toString());\r\n+\t\t\tif (relationJson == null) { relationJson = new JsonArray(); relationsJson.add(relation.getArc().toString(), relationJson); }\r\n \r\n-\t\t\trelationJson.add(new JsonPrimitive(relation.getTargetContextNodeXri().toString()));\r\n+\t\t\trelationJson.add(new JsonPrimitive(relation.getTargetContextNodeAddress().toString()));\r\n \t\t}\r\n \r\n \t\t// done\r", "raw_url": "https://github.com/projectdanube/xdi2/raw/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Fio%2Fwriters%2FXDIJSONTREEWriter.java", "sha": "e6b731eec7f65b0923acf6d8a100f675c76c9c59", "status": "modified" }, { "additions": 11, "blob_url": "https://github.com/projectdanube/xdi2/blob/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Fio%2Fwriters%2FXDIJSONWriter.java", "changes": 22, "contents_url": "https://api.github.com/repos/projectdanube/xdi2/contents/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Fio%2Fwriters%2FXDIJSONWriter.java?ref=0ca7982fec30c2bb8204efbbea61428a643d2e9c", "deletions": 11, "filename": "core/src/main/java/xdi2/core/io/writers/XDIJSONWriter.java", "new_code": "import xdi2.core.syntax.XDIAddress;\r\nimport xdi2.core.syntax.XDIArc;\r\nimport xdi2.core.syntax.XDIStatement;\r\n\t\t\tXDIStatement statementXri = statement.getXri();\r\n\tprivate void putStatementIntoJsonObject(XDIStatement statementXri, JsonObject jsonObject) throws IOException {\r\n\tprivate boolean tryPutStatementIntoInnerJsonObject(XDIStatement statementXri, JsonObject jsonObject) throws IOException {\r\n\t\tXDIArc subjectFirstSubSegment = statementXri.getSubject().getFirstArc();\r\n\t\tXDIAddress innerRootSubject = statementXri.getSubject().getFirstArc().getXRef().getPartialSubject();\r\n\t\tXDIAddress innerRootPredicate = statementXri.getSubject().getFirstArc().getXRef().getPartialPredicate();\r\n\t\tXDIStatement reducedStatementXri = StatementUtil.removeStartAddressStatement(statementXri, XDIAddress.fromComponent(subjectFirstSubSegment));\r\n\tprivate static void addObjectToJsonObject(XDIStatement statementXri, JsonObject jsonObject, String key) {\r", "new_methods": [], "old_code": "import xdi2.core.xri3.XDI3Segment;\r\nimport xdi2.core.xri3.XDI3Statement;\r\nimport xdi2.core.xri3.XDI3SubSegment;\r\n\t\t\tXDI3Statement statementXri = statement.getXri();\r\n\tprivate void putStatementIntoJsonObject(XDI3Statement statementXri, JsonObject jsonObject) throws IOException {\r\n\tprivate boolean tryPutStatementIntoInnerJsonObject(XDI3Statement statementXri, JsonObject jsonObject) throws IOException {\r\n\t\tXDI3SubSegment subjectFirstSubSegment = statementXri.getSubject().getFirstSubSegment();\r\n\t\tXDI3Segment innerRootSubject = statementXri.getSubject().getFirstSubSegment().getXRef().getPartialSubject();\r\n\t\tXDI3Segment innerRootPredicate = statementXri.getSubject().getFirstSubSegment().getXRef().getPartialPredicate();\r\n\t\tXDI3Statement reducedStatementXri = StatementUtil.removeStartXriStatement(statementXri, XDI3Segment.fromComponent(subjectFirstSubSegment));\r\n\tprivate static void addObjectToJsonObject(XDI3Statement statementXri, JsonObject jsonObject, String key) {\r", "old_methods": [], "patch": "@@ -17,6 +17,9 @@\n import xdi2.core.io.AbstractXDIWriter;\r\n import xdi2.core.io.MimeType;\r\n import xdi2.core.io.XDIWriterRegistry;\r\n+import xdi2.core.syntax.XDIAddress;\r\n+import xdi2.core.syntax.XDIArc;\r\n+import xdi2.core.syntax.XDIStatement;\r\n import xdi2.core.util.CopyUtil;\r\n import xdi2.core.util.StatementUtil;\r\n import xdi2.core.util.iterators.CompositeIterator;\r\n@@ -25,9 +28,6 @@\n import xdi2.core.util.iterators.MappingLiteralStatementIterator;\r\n import xdi2.core.util.iterators.MappingRelationStatementIterator;\r\n import xdi2.core.util.iterators.SelectingNotImpliedStatementIterator;\r\n-import xdi2.core.xri3.XDI3Segment;\r\n-import xdi2.core.xri3.XDI3Statement;\r\n-import xdi2.core.xri3.XDI3SubSegment;\r\n \r\n import com.google.gson.Gson;\r\n import com.google.gson.GsonBuilder;\r\n@@ -103,7 +103,7 @@ private void writeInternal(Graph graph, JsonObject jsonObject) throws IOExceptio\n \r\n \t\tfor (Statement statement : statements) {\r\n \r\n-\t\t\tXDI3Statement statementXri = statement.getXri();\r\n+\t\t\tXDIStatement statementXri = statement.getXri();\r\n \r\n \t\t\t// put the statement into the JSON object\r\n \r\n@@ -134,7 +134,7 @@ public Writer write(Graph graph, Writer writer) throws IOException {\n \t\treturn writer;\r\n \t}\r\n \r\n-\tprivate void putStatementIntoJsonObject(XDI3Statement statementXri, JsonObject jsonObject) throws IOException {\r\n+\tprivate void putStatementIntoJsonObject(XDIStatement statementXri, JsonObject jsonObject) throws IOException {\r\n \r\n \t\t// nested JSON object?\r\n \r\n@@ -147,16 +147,16 @@ private void putStatementIntoJsonObject(XDI3Statement statementXri, JsonObject j\n \t\taddObjectToJsonObject(statementXri, jsonObject, key);\r\n \t}\r\n \r\n-\tprivate boolean tryPutStatementIntoInnerJsonObject(XDI3Statement statementXri, JsonObject jsonObject) throws IOException {\r\n+\tprivate boolean tryPutStatementIntoInnerJsonObject(XDIStatement statementXri, JsonObject jsonObject) throws IOException {\r\n \r\n-\t\tXDI3SubSegment subjectFirstSubSegment = statementXri.getSubject().getFirstSubSegment();\r\n+\t\tXDIArc subjectFirstSubSegment = statementXri.getSubject().getFirstArc();\r\n \r\n \t\tif (subjectFirstSubSegment == null || (! subjectFirstSubSegment.hasXRef()) || (! subjectFirstSubSegment.getXRef().hasPartialSubjectAndPredicate())) return false;\r\n \r\n-\t\tXDI3Segment innerRootSubject = statementXri.getSubject().getFirstSubSegment().getXRef().getPartialSubject();\r\n-\t\tXDI3Segment innerRootPredicate = statementXri.getSubject().getFirstSubSegment().getXRef().getPartialPredicate();\r\n+\t\tXDIAddress innerRootSubject = statementXri.getSubject().getFirstArc().getXRef().getPartialSubject();\r\n+\t\tXDIAddress innerRootPredicate = statementXri.getSubject().getFirstArc().getXRef().getPartialPredicate();\r\n \r\n-\t\tXDI3Statement reducedStatementXri = StatementUtil.removeStartXriStatement(statementXri, XDI3Segment.fromComponent(subjectFirstSubSegment));\r\n+\t\tXDIStatement reducedStatementXri = StatementUtil.removeStartAddressStatement(statementXri, XDIAddress.fromComponent(subjectFirstSubSegment));\r\n \t\tif (reducedStatementXri == null) return false;\r\n \r\n \t\t// find the inner root JSON array\r\n@@ -200,7 +200,7 @@ private static JsonObject findJsonObjectInJsonArray(JsonArray jsonArray) {\n \t\treturn null;\r\n \t}\r\n \r\n-\tprivate static void addObjectToJsonObject(XDI3Statement statementXri, JsonObject jsonObject, String key) {\r\n+\tprivate static void addObjectToJsonObject(XDIStatement statementXri, JsonObject jsonObject, String key) {\r\n \r\n \t\tif (statementXri.isLiteralStatement()) {\r\n \r", "raw_url": "https://github.com/projectdanube/xdi2/raw/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Fio%2Fwriters%2FXDIJSONWriter.java", "sha": "68be0a20964c33eb0da5105ca76fe883701b0887", "status": "modified" }, { "additions": 29, "blob_url": "https://github.com/projectdanube/xdi2/blob/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Futil%2FCopyUtil.java", "changes": 58, "contents_url": "https://api.github.com/repos/projectdanube/xdi2/contents/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Futil%2FCopyUtil.java?ref=0ca7982fec30c2bb8204efbbea61428a643d2e9c", "deletions": 29, "filename": "core/src/main/java/xdi2/core/util/CopyUtil.java", "new_code": "import xdi2.core.syntax.XDIAddress;\r\nimport xdi2.core.syntax.XDIArc;\r\n\t\tXDIAddress contextNodeAddress = contextNode.getAddress();\r\n\t\t\ttargetContextNode = targetGraph.setDeepContextNode(contextNodeAddress);\r\n\t\tXDIArc contextNodeArc = contextNode.getArc();\r\n\t\tContextNode targetInnerContextNode = targetContextNode.setContextNode(contextNodeArc);\r\n\t\tXDIAddress relationcontextNodeAddress = relation.getContextNode().getAddress();\r\n\t\tContextNode targetContextNode = targetGraph.setDeepContextNode(relationcontextNodeAddress);\r\n\t\tXDIAddress relationcontextNodeAddress = relation.getContextNode().getAddress();\r\n\t\tXDIAddress relationAddress = relation.getArc();\r\n\t\tXDIAddress relationtargetContextNodeAddress = relation.getTargetContextNodeAddress();\r\n\t\tXDIAddress targetContextNodeAddress = targetContextNode.getAddress();\r\n\t\tXdiRoot relationContextNodeXdiRoot = XdiLocalRoot.findLocalRoot(relation.getContextNode().getGraph()).getRoot(relationcontextNodeAddress, false);\r\n\t\tXdiRoot targetContextNodeXdiRoot = XdiLocalRoot.findLocalRoot(targetContextNode.getGraph()).getRoot(targetContextNodeAddress, false);\r\n\t\tXDIAddress relativeRelationcontextNodeAddress = relationContextNodeXdiRoot.absoluteToRelativeXri(relationcontextNodeAddress);\r\n\t\tXDIAddress relativeRelationtargetContextNodeAddress = relationContextNodeXdiRoot.absoluteToRelativeXri(relationtargetContextNodeAddress);\r\n\t\tXDIAddress relativetargetContextNodeAddress = targetContextNodeXdiRoot.absoluteToRelativeXri(targetContextNodeAddress);\r\n\t\tif (relativeRelationtargetContextNodeAddress != null &&\r\n\t\t\t\trelativeRelationtargetContextNodeAddress.getNumArcs() == 1 &&\r\n\t\t\t\tXdiInnerRoot.isInnerRootarc(relativeRelationtargetContextNodeAddress.getFirstArc()) &&\r\n\t\t\t\tXdiInnerRoot.getSubjectOfInnerRootXri(relativeRelationtargetContextNodeAddress.getFirstArc()).equals(relativeRelationcontextNodeAddress) &&\r\n\t\t\t\tXdiInnerRoot.getPredicateOfInnerRootXri(relativeRelationtargetContextNodeAddress.getFirstArc()).equals(relationAddress)) {\r\n\t\t\tif (! targetContextNodeAddress.equals(relationcontextNodeAddress)) {\r\n\t\t\t\trelativeRelationtargetContextNodeAddress = XDIAddress.fromComponent(XdiInnerRoot.createInnerRootarc(relativetargetContextNodeAddress, relationAddress));\r\n\t\t\t\trelationtargetContextNodeAddress = targetContextNodeXdiRoot.relativeToAbsoluteXri(relativeRelationtargetContextNodeAddress);\r\n\t\t\ttargetRelation = targetContextNode.setRelation(relationAddress, relationtargetContextNodeAddress);\r\n\t\t\ttargetRelation = targetContextNode.setRelation(relationAddress, relationtargetContextNodeAddress);\r\n\t\tXDIAddress literalcontextNodeAddress = literal.getContextNode().getAddress();\r\n\t\tContextNode targetContextNode = targetGraph.setDeepContextNode(literalcontextNodeAddress);\r", "new_methods": [], "old_code": "import xdi2.core.xri3.XDI3Segment;\r\nimport xdi2.core.xri3.XDI3SubSegment;\r\n\t\tXDI3Segment contextNodeXri = contextNode.getXri();\r\n\t\t\ttargetContextNode = targetGraph.setDeepContextNode(contextNodeXri);\r\n\t\tXDI3SubSegment contextNodeArcXri = contextNode.getArcXri();\r\n\t\tContextNode targetInnerContextNode = targetContextNode.setContextNode(contextNodeArcXri);\r\n\t\tXDI3Segment relationContextNodeXri = relation.getContextNode().getXri();\r\n\t\tContextNode targetContextNode = targetGraph.setDeepContextNode(relationContextNodeXri);\r\n\t\tXDI3Segment relationContextNodeXri = relation.getContextNode().getXri();\r\n\t\tXDI3Segment relationArcXri = relation.getArcXri();\r\n\t\tXDI3Segment relationTargetContextNodeXri = relation.getTargetContextNodeXri();\r\n\t\tXDI3Segment targetContextNodeXri = targetContextNode.getXri();\r\n\t\tXdiRoot relationContextNodeXdiRoot = XdiLocalRoot.findLocalRoot(relation.getContextNode().getGraph()).getRoot(relationContextNodeXri, false);\r\n\t\tXdiRoot targetContextNodeXdiRoot = XdiLocalRoot.findLocalRoot(targetContextNode.getGraph()).getRoot(targetContextNodeXri, false);\r\n\t\tXDI3Segment relativeRelationContextNodeXri = relationContextNodeXdiRoot.absoluteToRelativeXri(relationContextNodeXri);\r\n\t\tXDI3Segment relativeRelationTargetContextNodeXri = relationContextNodeXdiRoot.absoluteToRelativeXri(relationTargetContextNodeXri);\r\n\t\tXDI3Segment relativeTargetContextNodeXri = targetContextNodeXdiRoot.absoluteToRelativeXri(targetContextNodeXri);\r\n\t\tif (relativeRelationTargetContextNodeXri != null &&\r\n\t\t\t\trelativeRelationTargetContextNodeXri.getNumSubSegments() == 1 &&\r\n\t\t\t\tXdiInnerRoot.isInnerRootArcXri(relativeRelationTargetContextNodeXri.getFirstSubSegment()) &&\r\n\t\t\t\tXdiInnerRoot.getSubjectOfInnerRootXri(relativeRelationTargetContextNodeXri.getFirstSubSegment()).equals(relativeRelationContextNodeXri) &&\r\n\t\t\t\tXdiInnerRoot.getPredicateOfInnerRootXri(relativeRelationTargetContextNodeXri.getFirstSubSegment()).equals(relationArcXri)) {\r\n\t\t\tif (! targetContextNodeXri.equals(relationContextNodeXri)) {\r\n\t\t\t\trelativeRelationTargetContextNodeXri = XDI3Segment.fromComponent(XdiInnerRoot.createInnerRootArcXri(relativeTargetContextNodeXri, relationArcXri));\r\n\t\t\t\trelationTargetContextNodeXri = targetContextNodeXdiRoot.relativeToAbsoluteXri(relativeRelationTargetContextNodeXri);\r\n\t\t\ttargetRelation = targetContextNode.setRelation(relationArcXri, relationTargetContextNodeXri);\r\n\t\t\ttargetRelation = targetContextNode.setRelation(relationArcXri, relationTargetContextNodeXri);\r\n\t\tXDI3Segment literalContextNodeXri = literal.getContextNode().getXri();\r\n\t\tContextNode targetContextNode = targetGraph.setDeepContextNode(literalContextNodeXri);\r", "old_methods": [], "patch": "@@ -13,8 +13,8 @@\n import xdi2.core.features.nodetypes.XdiInnerRoot;\r\n import xdi2.core.features.nodetypes.XdiLocalRoot;\r\n import xdi2.core.features.nodetypes.XdiRoot;\r\n-import xdi2.core.xri3.XDI3Segment;\r\n-import xdi2.core.xri3.XDI3SubSegment;\r\n+import xdi2.core.syntax.XDIAddress;\r\n+import xdi2.core.syntax.XDIArc;\r\n \r\n /**\r\n * Various utility methods for copying statements between graphs.\r\n@@ -63,7 +63,7 @@ public static ContextNode copyContextNode(ContextNode contextNode, Graph targetG\n \r\n \t\tif ((contextNode = copyStrategy.replaceContextNode(contextNode)) == null) return null;\r\n \r\n-\t\tXDI3Segment contextNodeXri = contextNode.getXri();\r\n+\t\tXDIAddress contextNodeAddress = contextNode.getAddress();\r\n \r\n \t\tContextNode targetContextNode;\r\n \r\n@@ -72,7 +72,7 @@ public static ContextNode copyContextNode(ContextNode contextNode, Graph targetG\n \t\t\ttargetContextNode = targetGraph.getRootContextNode(false);\r\n \t\t} else {\r\n \r\n-\t\t\ttargetContextNode = targetGraph.setDeepContextNode(contextNodeXri);\r\n+\t\t\ttargetContextNode = targetGraph.setDeepContextNode(contextNodeAddress);\r\n \t\t}\r\n \r\n \t\tcopyContextNodeContents(contextNode, targetContextNode, copyStrategy);\r\n@@ -95,9 +95,9 @@ public static ContextNode copyContextNode(ContextNode contextNode, ContextNode t\n \r\n \t\tif ((contextNode = copyStrategy.replaceContextNode(contextNode)) == null) return null;\r\n \r\n-\t\tXDI3SubSegment contextNodeArcXri = contextNode.getArcXri();\r\n+\t\tXDIArc contextNodeArc = contextNode.getArc();\r\n \r\n-\t\tContextNode targetInnerContextNode = targetContextNode.setContextNode(contextNodeArcXri);\r\n+\t\tContextNode targetInnerContextNode = targetContextNode.setContextNode(contextNodeArc);\r\n \r\n \t\tcopyContextNodeContents(contextNode, targetInnerContextNode, copyStrategy);\r\n \r\n@@ -144,8 +144,8 @@ public static Relation copyRelation(Relation relation, Graph targetGraph, CopySt\n \t\tif (targetGraph == null) throw new NullPointerException();\r\n \t\tif (copyStrategy == null) copyStrategy = allCopyStrategy;\r\n \r\n-\t\tXDI3Segment relationContextNodeXri = relation.getContextNode().getXri();\r\n-\t\tContextNode targetContextNode = targetGraph.setDeepContextNode(relationContextNodeXri);\r\n+\t\tXDIAddress relationcontextNodeAddress = relation.getContextNode().getAddress();\r\n+\t\tContextNode targetContextNode = targetGraph.setDeepContextNode(relationcontextNodeAddress);\r\n \r\n \t\treturn copyRelation(relation, targetContextNode, copyStrategy);\r\n \t}\r\n@@ -165,45 +165,45 @@ public static Relation copyRelation(Relation relation, ContextNode targetContext\n \r\n \t\tif ((relation = copyStrategy.replaceRelation(relation)) == null) return null;\r\n \r\n-\t\tXDI3Segment relationContextNodeXri = relation.getContextNode().getXri();\r\n-\t\tXDI3Segment relationArcXri = relation.getArcXri();\r\n-\t\tXDI3Segment relationTargetContextNodeXri = relation.getTargetContextNodeXri();\r\n+\t\tXDIAddress relationcontextNodeAddress = relation.getContextNode().getAddress();\r\n+\t\tXDIAddress relationAddress = relation.getArc();\r\n+\t\tXDIAddress relationtargetContextNodeAddress = relation.getTargetContextNodeAddress();\r\n \r\n-\t\tXDI3Segment targetContextNodeXri = targetContextNode.getXri();\r\n+\t\tXDIAddress targetContextNodeAddress = targetContextNode.getAddress();\r\n \r\n-\t\tXdiRoot relationContextNodeXdiRoot = XdiLocalRoot.findLocalRoot(relation.getContextNode().getGraph()).getRoot(relationContextNodeXri, false);\r\n-\t\tXdiRoot targetContextNodeXdiRoot = XdiLocalRoot.findLocalRoot(targetContextNode.getGraph()).getRoot(targetContextNodeXri, false);\r\n+\t\tXdiRoot relationContextNodeXdiRoot = XdiLocalRoot.findLocalRoot(relation.getContextNode().getGraph()).getRoot(relationcontextNodeAddress, false);\r\n+\t\tXdiRoot targetContextNodeXdiRoot = XdiLocalRoot.findLocalRoot(targetContextNode.getGraph()).getRoot(targetContextNodeAddress, false);\r\n \r\n-\t\tXDI3Segment relativeRelationContextNodeXri = relationContextNodeXdiRoot.absoluteToRelativeXri(relationContextNodeXri);\r\n-\t\tXDI3Segment relativeRelationTargetContextNodeXri = relationContextNodeXdiRoot.absoluteToRelativeXri(relationTargetContextNodeXri);\r\n-\t\tXDI3Segment relativeTargetContextNodeXri = targetContextNodeXdiRoot.absoluteToRelativeXri(targetContextNodeXri);\r\n+\t\tXDIAddress relativeRelationcontextNodeAddress = relationContextNodeXdiRoot.absoluteToRelativeXri(relationcontextNodeAddress);\r\n+\t\tXDIAddress relativeRelationtargetContextNodeAddress = relationContextNodeXdiRoot.absoluteToRelativeXri(relationtargetContextNodeAddress);\r\n+\t\tXDIAddress relativetargetContextNodeAddress = targetContextNodeXdiRoot.absoluteToRelativeXri(targetContextNodeAddress);\r\n \r\n \t\tRelation targetRelation;\r\n \r\n \t\t// check if this relation establishes an inner root\r\n \r\n-\t\tif (relativeRelationTargetContextNodeXri != null &&\r\n-\t\t\t\trelativeRelationTargetContextNodeXri.getNumSubSegments() == 1 &&\r\n-\t\t\t\tXdiInnerRoot.isInnerRootArcXri(relativeRelationTargetContextNodeXri.getFirstSubSegment()) &&\r\n-\t\t\t\tXdiInnerRoot.getSubjectOfInnerRootXri(relativeRelationTargetContextNodeXri.getFirstSubSegment()).equals(relativeRelationContextNodeXri) &&\r\n-\t\t\t\tXdiInnerRoot.getPredicateOfInnerRootXri(relativeRelationTargetContextNodeXri.getFirstSubSegment()).equals(relationArcXri)) {\r\n+\t\tif (relativeRelationtargetContextNodeAddress != null &&\r\n+\t\t\t\trelativeRelationtargetContextNodeAddress.getNumArcs() == 1 &&\r\n+\t\t\t\tXdiInnerRoot.isInnerRootarc(relativeRelationtargetContextNodeAddress.getFirstArc()) &&\r\n+\t\t\t\tXdiInnerRoot.getSubjectOfInnerRootXri(relativeRelationtargetContextNodeAddress.getFirstArc()).equals(relativeRelationcontextNodeAddress) &&\r\n+\t\t\t\tXdiInnerRoot.getPredicateOfInnerRootXri(relativeRelationtargetContextNodeAddress.getFirstArc()).equals(relationAddress)) {\r\n \r\n \t\t\t// if the target context node is not the same, we need to adjust the inner root\r\n \r\n-\t\t\tif (! targetContextNodeXri.equals(relationContextNodeXri)) {\r\n+\t\t\tif (! targetContextNodeAddress.equals(relationcontextNodeAddress)) {\r\n \r\n-\t\t\t\trelativeRelationTargetContextNodeXri = XDI3Segment.fromComponent(XdiInnerRoot.createInnerRootArcXri(relativeTargetContextNodeXri, relationArcXri));\r\n-\t\t\t\trelationTargetContextNodeXri = targetContextNodeXdiRoot.relativeToAbsoluteXri(relativeRelationTargetContextNodeXri);\r\n+\t\t\t\trelativeRelationtargetContextNodeAddress = XDIAddress.fromComponent(XdiInnerRoot.createInnerRootarc(relativetargetContextNodeAddress, relationAddress));\r\n+\t\t\t\trelationtargetContextNodeAddress = targetContextNodeXdiRoot.relativeToAbsoluteXri(relativeRelationtargetContextNodeAddress);\r\n \t\t\t}\r\n \r\n-\t\t\ttargetRelation = targetContextNode.setRelation(relationArcXri, relationTargetContextNodeXri);\r\n+\t\t\ttargetRelation = targetContextNode.setRelation(relationAddress, relationtargetContextNodeAddress);\r\n \r\n \t\t\t// also need to copy the contents of the inner root\r\n \r\n \t\t\tcopyContextNodeContents(relation.follow(), targetRelation.follow(), copyStrategy);\r\n \t\t} else {\r\n \r\n-\t\t\ttargetRelation = targetContextNode.setRelation(relationArcXri, relationTargetContextNodeXri);\r\n+\t\t\ttargetRelation = targetContextNode.setRelation(relationAddress, relationtargetContextNodeAddress);\r\n \t\t}\r\n \r\n \t\treturn targetRelation;\r\n@@ -249,8 +249,8 @@ public static Literal copyLiteral(Literal literal, Graph targetGraph, CopyStrate\n \t\tif (targetGraph == null) throw new NullPointerException();\r\n \t\tif (copyStrategy == null) copyStrategy = allCopyStrategy;\r\n \r\n-\t\tXDI3Segment literalContextNodeXri = literal.getContextNode().getXri();\r\n-\t\tContextNode targetContextNode = targetGraph.setDeepContextNode(literalContextNodeXri);\r\n+\t\tXDIAddress literalcontextNodeAddress = literal.getContextNode().getAddress();\r\n+\t\tContextNode targetContextNode = targetGraph.setDeepContextNode(literalcontextNodeAddress);\r\n \r\n \t\treturn copyLiteral(literal, targetContextNode, copyStrategy);\r\n \t}\r", "raw_url": "https://github.com/projectdanube/xdi2/raw/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Futil%2FCopyUtil.java", "sha": "5c17ed7a1d48a20fb4408039d2bb90687ae4950f", "status": "modified" }, { "additions": 21, "blob_url": "https://github.com/projectdanube/xdi2/blob/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Futil%2FGraphUtil.java", "changes": 42, "contents_url": "https://api.github.com/repos/projectdanube/xdi2/contents/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Futil%2FGraphUtil.java?ref=0ca7982fec30c2bb8204efbbea61428a643d2e9c", "deletions": 21, "filename": "core/src/main/java/xdi2/core/util/GraphUtil.java", "new_code": "import xdi2.core.syntax.XDIAddress;\r\nimport xdi2.core.syntax.XDIArc;\r\n\tpublic static XDIArc getOwnerPeerRootXri(Graph graph) {\r\n\t\treturn xdiSelfPeerRoot.getArc();\r\n\tpublic static XDIAddress getOwnerXri(Graph graph) {\r\n\t\tXDIArc ownerPeerRootxri = getOwnerPeerRootXri(graph);\r\n\t\treturn XdiPeerRoot.getAddressOfPeerRootArc(ownerPeerRootxri);\r\n\tpublic static void setOwnerPeerRootXri(Graph graph, XDIArc ownerPeerRootXri) {\r\n\t\tXDIAddress ownerXri = XdiPeerRoot.getAddressOfPeerRootArc(ownerPeerRootXri);\r\n\tpublic static void setOwnerXri(Graph graph, XDIAddress ownerXri) {\r\n\t * @param contextNodeAddress The XRI of the context node.\r\n\tpublic static ContextNode contextNodeFromComponents(XDIAddress contextNodeAddress) {\r\n\t\treturn graph.setDeepContextNode(contextNodeAddress);\r\n\t * @param contextNodeAddress The relation XRI of the context node containing the relation.\r\n\t * @param arc The arc of the relation.\r\n\t * @param targetContextNodeAddress The target context node XRI of the relation.\r\n\tpublic static Relation relationFromComponents(XDIAddress contextNodeAddress, XDIAddress arc, XDIAddress targetContextNodeAddress) {\r\n\t\treturn graph.setDeepContextNode(contextNodeAddress).setRelation(arc, targetContextNodeAddress);\r\n\t * @param contextNodeAddress The XRI of the context node containing the literal.\r\n\tpublic static Literal literalFromComponents(XDIAddress contextNodeAddress, Object literalData) {\r\n\t\treturn graph.setDeepContextNode(contextNodeAddress).setLiteral(literalData);\r", "new_methods": [], "old_code": "import xdi2.core.xri3.XDI3Segment;\r\nimport xdi2.core.xri3.XDI3SubSegment;\r\n\tpublic static XDI3SubSegment getOwnerPeerRootXri(Graph graph) {\r\n\t\treturn xdiSelfPeerRoot.getArcXri();\r\n\tpublic static XDI3Segment getOwnerXri(Graph graph) {\r\n\t\tXDI3SubSegment ownerPeerRootxri = getOwnerPeerRootXri(graph);\r\n\t\treturn XdiPeerRoot.getXriOfPeerRootArcXri(ownerPeerRootxri);\r\n\tpublic static void setOwnerPeerRootXri(Graph graph, XDI3SubSegment ownerPeerRootXri) {\r\n\t\tXDI3Segment ownerXri = XdiPeerRoot.getXriOfPeerRootArcXri(ownerPeerRootXri);\r\n\tpublic static void setOwnerXri(Graph graph, XDI3Segment ownerXri) {\r\n\t * @param contextNodeXri The XRI of the context node.\r\n\tpublic static ContextNode contextNodeFromComponents(XDI3Segment contextNodeXri) {\r\n\t\treturn graph.setDeepContextNode(contextNodeXri);\r\n\t * @param contextNodeXri The relation XRI of the context node containing the relation.\r\n\t * @param arcXri The arc XRI of the relation.\r\n\t * @param targetContextNodeXri The target context node XRI of the relation.\r\n\tpublic static Relation relationFromComponents(XDI3Segment contextNodeXri, XDI3Segment arcXri, XDI3Segment targetContextNodeXri) {\r\n\t\treturn graph.setDeepContextNode(contextNodeXri).setRelation(arcXri, targetContextNodeXri);\r\n\t * @param contextNodeXri The XRI of the context node containing the literal.\r\n\tpublic static Literal literalFromComponents(XDI3Segment contextNodeXri, Object literalData) {\r\n\t\treturn graph.setDeepContextNode(contextNodeXri).setLiteral(literalData);\r", "old_methods": [], "patch": "@@ -7,8 +7,8 @@\n import xdi2.core.features.nodetypes.XdiLocalRoot;\r\n import xdi2.core.features.nodetypes.XdiPeerRoot;\r\n import xdi2.core.impl.memory.MemoryGraphFactory;\r\n-import xdi2.core.xri3.XDI3Segment;\r\n-import xdi2.core.xri3.XDI3SubSegment;\r\n+import xdi2.core.syntax.XDIAddress;\r\n+import xdi2.core.syntax.XDIArc;\r\n \r\n /**\r\n * Various utility methods for working with context nodes, relations and literals.\r\n@@ -19,70 +19,70 @@ public final class GraphUtil {\n \r\n \tprivate GraphUtil() { }\r\n \r\n-\tpublic static XDI3SubSegment getOwnerPeerRootXri(Graph graph) {\r\n+\tpublic static XDIArc getOwnerPeerRootXri(Graph graph) {\r\n \r\n \t\tXdiPeerRoot xdiSelfPeerRoot = XdiLocalRoot.findLocalRoot(graph).getSelfPeerRoot();\r\n \t\tif (xdiSelfPeerRoot == null) return null;\r\n \r\n-\t\treturn xdiSelfPeerRoot.getArcXri();\r\n+\t\treturn xdiSelfPeerRoot.getArc();\r\n \t}\r\n \r\n-\tpublic static XDI3Segment getOwnerXri(Graph graph) {\r\n+\tpublic static XDIAddress getOwnerXri(Graph graph) {\r\n \r\n-\t\tXDI3SubSegment ownerPeerRootxri = getOwnerPeerRootXri(graph);\r\n+\t\tXDIArc ownerPeerRootxri = getOwnerPeerRootXri(graph);\r\n \t\tif (ownerPeerRootxri == null) return null;\r\n \r\n-\t\treturn XdiPeerRoot.getXriOfPeerRootArcXri(ownerPeerRootxri);\r\n+\t\treturn XdiPeerRoot.getAddressOfPeerRootArc(ownerPeerRootxri);\r\n \t}\r\n \r\n-\tpublic static void setOwnerPeerRootXri(Graph graph, XDI3SubSegment ownerPeerRootXri) {\r\n+\tpublic static void setOwnerPeerRootXri(Graph graph, XDIArc ownerPeerRootXri) {\r\n \r\n-\t\tXDI3Segment ownerXri = XdiPeerRoot.getXriOfPeerRootArcXri(ownerPeerRootXri);\r\n+\t\tXDIAddress ownerXri = XdiPeerRoot.getAddressOfPeerRootArc(ownerPeerRootXri);\r\n \r\n \t\tsetOwnerXri(graph, ownerXri);\r\n \t}\r\n \r\n-\tpublic static void setOwnerXri(Graph graph, XDI3Segment ownerXri) {\r\n+\tpublic static void setOwnerXri(Graph graph, XDIAddress ownerXri) {\r\n \r\n \t\tXdiLocalRoot.findLocalRoot(graph).setSelfPeerRoot(ownerXri);\r\n \t}\r\n \r\n \t/**\r\n \t * Creates a context node from its components.\r\n-\t * @param contextNodeXri The XRI of the context node.\r\n+\t * @param contextNodeAddress The XRI of the context node.\r\n \t * @return A context node.\r\n \t */\r\n-\tpublic static ContextNode contextNodeFromComponents(XDI3Segment contextNodeXri) {\r\n+\tpublic static ContextNode contextNodeFromComponents(XDIAddress contextNodeAddress) {\r\n \r\n \t\tGraph graph = MemoryGraphFactory.getInstance().openGraph();\r\n \r\n-\t\treturn graph.setDeepContextNode(contextNodeXri);\r\n+\t\treturn graph.setDeepContextNode(contextNodeAddress);\r\n \t}\r\n \r\n \t/**\r\n \t * Creates a relation from its components.\r\n-\t * @param contextNodeXri The relation XRI of the context node containing the relation.\r\n-\t * @param arcXri The arc XRI of the relation.\r\n-\t * @param targetContextNodeXri The target context node XRI of the relation.\r\n+\t * @param contextNodeAddress The relation XRI of the context node containing the relation.\r\n+\t * @param arc The arc of the relation.\r\n+\t * @param targetContextNodeAddress The target context node XRI of the relation.\r\n \t * @return A relation.\r\n \t */\r\n-\tpublic static Relation relationFromComponents(XDI3Segment contextNodeXri, XDI3Segment arcXri, XDI3Segment targetContextNodeXri) {\r\n+\tpublic static Relation relationFromComponents(XDIAddress contextNodeAddress, XDIAddress arc, XDIAddress targetContextNodeAddress) {\r\n \r\n \t\tGraph graph = MemoryGraphFactory.getInstance().openGraph();\r\n \r\n-\t\treturn graph.setDeepContextNode(contextNodeXri).setRelation(arcXri, targetContextNodeXri);\r\n+\t\treturn graph.setDeepContextNode(contextNodeAddress).setRelation(arc, targetContextNodeAddress);\r\n \t}\r\n \r\n \t/**\r\n \t * Creates a literal from its components.\r\n-\t * @param contextNodeXri The XRI of the context node containing the literal.\r\n+\t * @param contextNodeAddress The XRI of the context node containing the literal.\r\n \t * @param literalData The literal data of the literal.\r\n \t * @return A literal.\r\n \t */\r\n-\tpublic static Literal literalFromComponents(XDI3Segment contextNodeXri, Object literalData) {\r\n+\tpublic static Literal literalFromComponents(XDIAddress contextNodeAddress, Object literalData) {\r\n \r\n \t\tGraph graph = MemoryGraphFactory.getInstance().openGraph();\r\n \r\n-\t\treturn graph.setDeepContextNode(contextNodeXri).setLiteral(literalData);\r\n+\t\treturn graph.setDeepContextNode(contextNodeAddress).setLiteral(literalData);\r\n \t}\r\n }\r", "raw_url": "https://github.com/projectdanube/xdi2/raw/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Futil%2FGraphUtil.java", "sha": "0864e14de4afec1f49887f0a2627c43c814dd27d", "status": "modified" }, { "additions": 27, "blob_url": "https://github.com/projectdanube/xdi2/blob/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Futil%2FStatementUtil.java", "changes": 54, "contents_url": "https://api.github.com/repos/projectdanube/xdi2/contents/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Futil%2FStatementUtil.java?ref=0ca7982fec30c2bb8204efbbea61428a643d2e9c", "deletions": 27, "filename": "core/src/main/java/xdi2/core/util/StatementUtil.java", "new_code": "import xdi2.core.syntax.XDIAddress;\r\nimport xdi2.core.syntax.XDIStatement;\r\n\t * Removes a start address from a statement.\r\n\tpublic static XDIStatement removeStartAddressStatement(final XDIStatement statement, final XDIAddress start, final boolean variablesInAddress, boolean variablesInStart) {\r\n\t\tif (statement == null) throw new NullPointerException();\r\n\t\tXDIStatement result = null;\r\n\t\t\tXDIAddress subject;\r\n\t\t\tXDIAddress predicate;\r\n\t\t\tsubject = AddressUtil.removeStartAddress(statement.getSubject(), start, variablesInAddress, variablesInStart);\r\n\t\t\tpredicate = statement.getPredicate();\r\n\t\t\tobject = statement.getObject();\r\n\t\t\t{ result = XDIStatement.fromComponents(subject, predicate, object); return result; }\r\n\t\t\tif (log.isTraceEnabled()) log.trace(\"removeStartAddressStatement(\" + statement + \",\" + start + \",\" + variablesInAddress + \",\" + variablesInStart + \") --> \" + result);\r\n\t * Removes a start address from a statement.\r\n\tpublic static XDIStatement removeStartAddressStatement(final XDIStatement statement, final XDIAddress start) {\r\n\t\treturn removeStartAddressStatement(statement, start, false, false);\r\n\t * Concats an address and a statement into a new statement.\r\n\tpublic static XDIStatement concatAddressStatement(final XDIAddress address, final XDIStatement statement) {\r\n\t\tif (statement == null) throw new NullPointerException();\r\n\t\tXDIStatement result = null;\r\n\t\t\tXDIAddress subject;\r\n\t\t\tXDIAddress predicate;\r\n\t\t\tsubject = AddressUtil.concatAddresses(address, statement.getSubject());\r\n\t\t\tpredicate = statement.getPredicate();\r\n\t\t\tobject = statement.getObject();\r\n\t\t\t{ result = XDIStatement.fromComponents(subject, predicate, object); return result; }\r\n\t\t\tif (log.isTraceEnabled()) log.trace(\"concatAddressStatement(\" + address + \",\" + statement + \") --> \" + result);\r", "new_methods": [ { "arguments": [ "final XDIStatement statement", " final XDIAddress start", " final boolean variablesInAddress", " boolean variablesInStart" ], "filename": "core/src/main/java/xdi2/core/util/StatementUtil.java", "implementation": "if (statement == null) throw new NullPointerException();\r\n\t\tXDIStatement result = null;\r\n\t\t\tXDIAddress subject;\r\n\t\t\tXDIAddress predicate;\r\n\t\t\tsubject = AddressUtil.removeStartAddress(statement.getSubject(), start, variablesInAddress, variablesInStart);\r\n\t\t\tpredicate = statement.getPredicate();\r\n\t\t\tobject = statement.getObject();\r\n\t\t\t{ result = XDIStatement.fromComponents(subject, predicate, object); return result;", "signature": "XDIStatement removeStartAddressStatement(final XDIStatement statement, final XDIAddress start, final boolean variablesInAddress, boolean variablesInStart)" }, { "arguments": [ "final XDIStatement statement", " final XDIAddress start" ], "filename": "core/src/main/java/xdi2/core/util/StatementUtil.java", "implementation": "return removeStartAddressStatement(statement, start, false, false);\r\n\t * Concats an address and a statement into a new statement.\r\n\tpublic static XDIStatement concatAddressStatement(final XDIAddress address, final XDIStatement statement) {\r\n\t\tif (statement == null) throw new NullPointerException();\r\n\t\tXDIStatement result = null;\r\n\t\t\tXDIAddress subject;\r\n\t\t\tXDIAddress predicate;\r\n\t\t\tsubject = AddressUtil.concatAddresses(address, statement.getSubject());\r\n\t\t\tpredicate = statement.getPredicate();\r\n\t\t\tobject = statement.getObject();\r\n\t\t\t{ result = XDIStatement.fromComponents(subject, predicate, object); return result;", "signature": "XDIStatement removeStartAddressStatement(final XDIStatement statement, final XDIAddress start)" } ], "old_code": "import xdi2.core.xri3.XDI3Segment;\r\nimport xdi2.core.xri3.XDI3Statement;\r\n\t * Removes a start XRI from a statement.\r\n\tpublic static XDI3Statement removeStartXriStatement(final XDI3Statement statementXri, final XDI3Segment start, final boolean variablesInXri, boolean variablesInStart) {\r\n\t\tif (statementXri == null) throw new NullPointerException();\r\n\t\tXDI3Statement result = null;\r\n\t\t\tXDI3Segment subject;\r\n\t\t\tXDI3Segment predicate;\r\n\t\t\tsubject = XDI3Util.removeStartXri(statementXri.getSubject(), start, variablesInXri, variablesInStart);\r\n\t\t\tpredicate = statementXri.getPredicate();\r\n\t\t\tobject = statementXri.getObject();\r\n\t\t\t{ result = XDI3Statement.fromComponents(subject, predicate, object); return result; }\r\n\t\t\tif (log.isTraceEnabled()) log.trace(\"removeStartXriStatement(\" + statementXri + \",\" + start + \",\" + variablesInXri + \",\" + variablesInStart + \") --> \" + result);\r\n\t * Removes a start XRI from a statement.\r\n\tpublic static XDI3Statement removeStartXriStatement(final XDI3Statement statementXri, final XDI3Segment start) {\r\n\t\treturn removeStartXriStatement(statementXri, start, false, false);\r\n\t * Concats an XRI and a statement into a new statement.\r\n\tpublic static XDI3Statement concatXriStatement(final XDI3Segment xri, final XDI3Statement statementXri) {\r\n\t\tif (statementXri == null) throw new NullPointerException();\r\n\t\tXDI3Statement result = null;\r\n\t\t\tXDI3Segment subject;\r\n\t\t\tXDI3Segment predicate;\r\n\t\t\tsubject = XDI3Util.concatXris(xri, statementXri.getSubject());\r\n\t\t\tpredicate = statementXri.getPredicate();\r\n\t\t\tobject = statementXri.getObject();\r\n\t\t\t{ result = XDI3Statement.fromComponents(subject, predicate, object); return result; }\r\n\t\t\tif (log.isTraceEnabled()) log.trace(\"concatXriStatement(\" + xri + \",\" + statementXri + \") --> \" + result);\r", "old_methods": [ { "arguments": [ "final XDI3Statement statementXri", " final XDI3Segment start", " final boolean variablesInXri", " boolean variablesInStart" ], "filename": "core/src/main/java/xdi2/core/util/StatementUtil.java", "implementation": "if (statementXri == null) throw new NullPointerException();\r\n\t\tXDI3Statement result = null;\r\n\t\t\tXDI3Segment subject;\r\n\t\t\tXDI3Segment predicate;\r\n\t\t\tsubject = XDI3Util.removeStartXri(statementXri.getSubject(), start, variablesInXri, variablesInStart);\r\n\t\t\tpredicate = statementXri.getPredicate();\r\n\t\t\tobject = statementXri.getObject();\r\n\t\t\t{ result = XDI3Statement.fromComponents(subject, predicate, object); return result;", "signature": "XDI3Statement removeStartXriStatement(final XDI3Statement statementXri, final XDI3Segment start, final boolean variablesInXri, boolean variablesInStart)" }, { "arguments": [ "final XDI3Statement statementXri", " final XDI3Segment start" ], "filename": "core/src/main/java/xdi2/core/util/StatementUtil.java", "implementation": "return removeStartXriStatement(statementXri, start, false, false);\r\n\t * Concats an XRI and a statement into a new statement.\r\n\tpublic static XDI3Statement concatXriStatement(final XDI3Segment xri, final XDI3Statement statementXri) {\r\n\t\tif (statementXri == null) throw new NullPointerException();\r\n\t\tXDI3Statement result = null;\r\n\t\t\tXDI3Segment subject;\r\n\t\t\tXDI3Segment predicate;\r\n\t\t\tsubject = XDI3Util.concatXris(xri, statementXri.getSubject());\r\n\t\t\tpredicate = statementXri.getPredicate();\r\n\t\t\tobject = statementXri.getObject();\r\n\t\t\t{ result = XDI3Statement.fromComponents(subject, predicate, object); return result;", "signature": "XDI3Statement removeStartXriStatement(final XDI3Statement statementXri, final XDI3Segment start)" } ], "patch": "@@ -3,8 +3,8 @@\n import org.slf4j.Logger;\r\n import org.slf4j.LoggerFactory;\r\n \r\n-import xdi2.core.xri3.XDI3Segment;\r\n-import xdi2.core.xri3.XDI3Statement;\r\n+import xdi2.core.syntax.XDIAddress;\r\n+import xdi2.core.syntax.XDIStatement;\r\n \r\n /**\r\n * Various utility methods for working with statements.\r\n@@ -18,83 +18,83 @@ public final class StatementUtil {\n \tprivate StatementUtil() { }\r\n \r\n \t/**\r\n-\t * Removes a start XRI from a statement.\r\n+\t * Removes a start address from a statement.\r\n \t * E.g. for =a*b*c*d&/&/... and =a*b, this returns *c*d&/&/...\r\n \t */\r\n-\tpublic static XDI3Statement removeStartXriStatement(final XDI3Statement statementXri, final XDI3Segment start, final boolean variablesInXri, boolean variablesInStart) {\r\n+\tpublic static XDIStatement removeStartAddressStatement(final XDIStatement statement, final XDIAddress start, final boolean variablesInAddress, boolean variablesInStart) {\r\n \r\n-\t\tif (statementXri == null) throw new NullPointerException();\r\n+\t\tif (statement == null) throw new NullPointerException();\r\n \t\tif (start == null) throw new NullPointerException();\r\n \r\n-\t\tXDI3Statement result = null;\r\n+\t\tXDIStatement result = null;\r\n \r\n \t\ttry {\r\n \r\n-\t\t\tXDI3Segment subject;\r\n-\t\t\tXDI3Segment predicate;\r\n+\t\t\tXDIAddress subject;\r\n+\t\t\tXDIAddress predicate;\r\n \t\t\tObject object;\r\n \r\n \t\t\t// subject\r\n \r\n-\t\t\tsubject = XDI3Util.removeStartXri(statementXri.getSubject(), start, variablesInXri, variablesInStart);\r\n+\t\t\tsubject = AddressUtil.removeStartAddress(statement.getSubject(), start, variablesInAddress, variablesInStart);\r\n \t\t\tif (subject == null) { result = null; return result; }\r\n \r\n \t\t\t// predicate\r\n \r\n-\t\t\tpredicate = statementXri.getPredicate();\r\n+\t\t\tpredicate = statement.getPredicate();\r\n \r\n \t\t\t// object\r\n \r\n-\t\t\tobject = statementXri.getObject();\r\n+\t\t\tobject = statement.getObject();\r\n \r\n-\t\t\t{ result = XDI3Statement.fromComponents(subject, predicate, object); return result; }\r\n+\t\t\t{ result = XDIStatement.fromComponents(subject, predicate, object); return result; }\r\n \t\t} finally {\r\n \r\n-\t\t\tif (log.isTraceEnabled()) log.trace(\"removeStartXriStatement(\" + statementXri + \",\" + start + \",\" + variablesInXri + \",\" + variablesInStart + \") --> \" + result);\r\n+\t\t\tif (log.isTraceEnabled()) log.trace(\"removeStartAddressStatement(\" + statement + \",\" + start + \",\" + variablesInAddress + \",\" + variablesInStart + \") --> \" + result);\r\n \t\t}\r\n \t}\r\n \r\n \t/**\r\n-\t * Removes a start XRI from a statement.\r\n+\t * Removes a start address from a statement.\r\n \t * E.g. for =a*b*c*d&/&/... and =a*b, this returns *c*d&/&/...\r\n \t */\r\n-\tpublic static XDI3Statement removeStartXriStatement(final XDI3Statement statementXri, final XDI3Segment start) {\r\n+\tpublic static XDIStatement removeStartAddressStatement(final XDIStatement statement, final XDIAddress start) {\r\n \r\n-\t\treturn removeStartXriStatement(statementXri, start, false, false);\r\n+\t\treturn removeStartAddressStatement(statement, start, false, false);\r\n \t}\r\n \r\n \t/**\r\n-\t * Concats an XRI and a statement into a new statement.\r\n+\t * Concats an address and a statement into a new statement.\r\n \t * E.g. for *c*d&/&/... and =a*b, this returns =a*b*c*d&/&/...\r\n \t */\r\n-\tpublic static XDI3Statement concatXriStatement(final XDI3Segment xri, final XDI3Statement statementXri) {\r\n+\tpublic static XDIStatement concatAddressStatement(final XDIAddress address, final XDIStatement statement) {\r\n \r\n-\t\tif (statementXri == null) throw new NullPointerException();\r\n+\t\tif (statement == null) throw new NullPointerException();\r\n \r\n-\t\tXDI3Statement result = null;\r\n+\t\tXDIStatement result = null;\r\n \r\n \t\ttry {\r\n \r\n-\t\t\tXDI3Segment subject;\r\n-\t\t\tXDI3Segment predicate;\r\n+\t\t\tXDIAddress subject;\r\n+\t\t\tXDIAddress predicate;\r\n \t\t\tObject object;\r\n \r\n \t\t\t// subject\r\n \r\n-\t\t\tsubject = XDI3Util.concatXris(xri, statementXri.getSubject());\r\n+\t\t\tsubject = AddressUtil.concatAddresses(address, statement.getSubject());\r\n \r\n \t\t\t// predicate\r\n \r\n-\t\t\tpredicate = statementXri.getPredicate();\r\n+\t\t\tpredicate = statement.getPredicate();\r\n \r\n \t\t\t// object\r\n \r\n-\t\t\tobject = statementXri.getObject();\r\n+\t\t\tobject = statement.getObject();\r\n \r\n-\t\t\t{ result = XDI3Statement.fromComponents(subject, predicate, object); return result; }\r\n+\t\t\t{ result = XDIStatement.fromComponents(subject, predicate, object); return result; }\r\n \t\t} finally {\r\n \r\n-\t\t\tif (log.isTraceEnabled()) log.trace(\"concatXriStatement(\" + xri + \",\" + statementXri + \") --> \" + result);\r\n+\t\t\tif (log.isTraceEnabled()) log.trace(\"concatAddressStatement(\" + address + \",\" + statement + \") --> \" + result);\r\n \t\t}\r\n \t}\r\n }\r", "raw_url": "https://github.com/projectdanube/xdi2/raw/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Futil%2FStatementUtil.java", "sha": "6a300ed807704e8a8ef545e424af30a5a96b3408", "status": "modified" }, { "additions": 30, "blob_url": "https://github.com/projectdanube/xdi2/blob/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Futil%2FVariableUtil.java", "changes": 60, "contents_url": "https://api.github.com/repos/projectdanube/xdi2/contents/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Futil%2FVariableUtil.java?ref=0ca7982fec30c2bb8204efbbea61428a643d2e9c", "deletions": 30, "filename": "core/src/main/java/xdi2/core/util/VariableUtil.java", "new_code": "import xdi2.core.syntax.XDIAddress;\r\nimport xdi2.core.syntax.XDIArc;\r\nimport xdi2.core.syntax.XDIXRef;\r\n\tpublic static boolean isVariable(XDIArc variable) {\r\n\t\t\t\t( variable.getXRef().isEmpty() || variable.getXRef().hasAddress() || variable.getXRef().hasLiteral() );\r\n\tpublic static boolean isVariable(XDIAddress variable) {\r\n\t\tif (variable.getNumArcs() != 1) return false;\r\n\t\treturn isVariable(variable.getFirstArc());\r\n\tpublic static List<XDIArc> getSubSegments(XDIArc variable) {\r\n\t\tif (! isVariable(variable)) return new ArrayList<XDIArc> ();\r\n\t\tif (! variable.getXRef().hasAddress()) return new ArrayList<XDIArc> ();\r\n\t\tXDIAddress segment = variable.getXRef().getAddress();\r\n\t\twhile (segment.getFirstArc().hasXRef()) {\r\n\t\t\tsegment = segment.getFirstArc().getXRef().getAddress();\r\n\t\t\tif (segment == null) return new ArrayList<XDIArc> ();\r\n\t\treturn segment.getArcs();\r\n\tpublic static String getXs(XDIArc variable) {\r\n\t\tif (! variable.getXRef().hasAddress()) return null;\r\n\t\tXDIXRef xref = variable.getXRef().getAddress().getFirstArc().getXRef();\r\n\t\t\tif (! xref.hasAddress()) return null;\r\n\t\t\txref = xref.getAddress().getFirstArc().getXRef();\r\n\tpublic static boolean isMultiple(XDIArc variable) {\r\n\t\tif (! variable.getXRef().hasAddress()) return false;\r\n\t\tif (! variable.getXRef().getAddress().getFirstArc().hasXRef()) return false;\r\n\t\tif (! XDIConstants.XS_VARIABLE.equals(variable.getXRef().getAddress().getFirstArc().getXRef().getXs())) return false;\r\n\tpublic static boolean matches(XDIArc variable, XDIArc subSegment) {\r\n\t\tList<XDIArc> variableSubSegments = getSubSegments(variable);\r\n\t\t\tif (! subSegment.getXRef().hasAddress()) {\r\n\t\t\tsubSegment = subSegment.getXRef().getAddress().getFirstArc();\r\n\t\tfor (XDIArc variableSubSegment : variableSubSegments) {\r", "new_methods": [], "old_code": "import xdi2.core.xri3.XDI3Segment;\r\nimport xdi2.core.xri3.XDI3SubSegment;\r\nimport xdi2.core.xri3.XDI3XRef;\r\n\tpublic static boolean isVariable(XDI3SubSegment variable) {\r\n\t\t\t\t( variable.getXRef().isEmpty() || variable.getXRef().hasSegment() || variable.getXRef().hasLiteral() );\r\n\tpublic static boolean isVariable(XDI3Segment variable) {\r\n\t\tif (variable.getNumSubSegments() != 1) return false;\r\n\t\treturn isVariable(variable.getFirstSubSegment());\r\n\tpublic static List<XDI3SubSegment> getSubSegments(XDI3SubSegment variable) {\r\n\t\tif (! isVariable(variable)) return new ArrayList<XDI3SubSegment> ();\r\n\t\tif (! variable.getXRef().hasSegment()) return new ArrayList<XDI3SubSegment> ();\r\n\t\tXDI3Segment segment = variable.getXRef().getSegment();\r\n\t\twhile (segment.getFirstSubSegment().hasXRef()) {\r\n\t\t\tsegment = segment.getFirstSubSegment().getXRef().getSegment();\r\n\t\t\tif (segment == null) return new ArrayList<XDI3SubSegment> ();\r\n\t\treturn segment.getSubSegments();\r\n\tpublic static String getXs(XDI3SubSegment variable) {\r\n\t\tif (! variable.getXRef().hasSegment()) return null;\r\n\t\tXDI3XRef xref = variable.getXRef().getSegment().getFirstSubSegment().getXRef();\r\n\t\t\tif (! xref.hasSegment()) return null;\r\n\t\t\txref = xref.getSegment().getFirstSubSegment().getXRef();\r\n\tpublic static boolean isMultiple(XDI3SubSegment variable) {\r\n\t\tif (! variable.getXRef().hasSegment()) return false;\r\n\t\tif (! variable.getXRef().getSegment().getFirstSubSegment().hasXRef()) return false;\r\n\t\tif (! XDIConstants.XS_VARIABLE.equals(variable.getXRef().getSegment().getFirstSubSegment().getXRef().getXs())) return false;\r\n\tpublic static boolean matches(XDI3SubSegment variable, XDI3SubSegment subSegment) {\r\n\t\tList<XDI3SubSegment> variableSubSegments = getSubSegments(variable);\r\n\t\t\tif (! subSegment.getXRef().hasSegment()) {\r\n\t\t\tsubSegment = subSegment.getXRef().getSegment().getFirstSubSegment();\r\n\t\tfor (XDI3SubSegment variableSubSegment : variableSubSegments) {\r", "old_methods": [], "patch": "@@ -7,9 +7,9 @@\n import org.slf4j.LoggerFactory;\r\n \r\n import xdi2.core.constants.XDIConstants;\r\n-import xdi2.core.xri3.XDI3Segment;\r\n-import xdi2.core.xri3.XDI3SubSegment;\r\n-import xdi2.core.xri3.XDI3XRef;\r\n+import xdi2.core.syntax.XDIAddress;\r\n+import xdi2.core.syntax.XDIArc;\r\n+import xdi2.core.syntax.XDIXRef;\r\n \r\n /**\r\n * Utility methods for working with variables.\r\n@@ -27,49 +27,49 @@ private VariableUtil() { }\n \t * @param variable The subsegment to check.\r\n \t * @return True if the subsegment is a valid XDI variable.\r\n \t */\r\n-\tpublic static boolean isVariable(XDI3SubSegment variable) {\r\n+\tpublic static boolean isVariable(XDIArc variable) {\r\n \r\n \t\treturn variable.hasXRef() &&\r\n \t\t\t\tXDIConstants.XS_VARIABLE.equals(variable.getXRef().getXs()) &&\r\n-\t\t\t\t( variable.getXRef().isEmpty() || variable.getXRef().hasSegment() || variable.getXRef().hasLiteral() );\r\n+\t\t\t\t( variable.getXRef().isEmpty() || variable.getXRef().hasAddress() || variable.getXRef().hasLiteral() );\r\n \t}\r\n \r\n-\tpublic static boolean isVariable(XDI3Segment variable) {\r\n+\tpublic static boolean isVariable(XDIAddress variable) {\r\n \r\n-\t\tif (variable.getNumSubSegments() != 1) return false;\r\n+\t\tif (variable.getNumArcs() != 1) return false;\r\n \r\n-\t\treturn isVariable(variable.getFirstSubSegment());\r\n+\t\treturn isVariable(variable.getFirstArc());\r\n \t}\r\n \r\n-\tpublic static List<XDI3SubSegment> getSubSegments(XDI3SubSegment variable) {\r\n+\tpublic static List<XDIArc> getSubSegments(XDIArc variable) {\r\n \r\n-\t\tif (! isVariable(variable)) return new ArrayList<XDI3SubSegment> ();\r\n-\t\tif (! variable.getXRef().hasSegment()) return new ArrayList<XDI3SubSegment> ();\r\n+\t\tif (! isVariable(variable)) return new ArrayList<XDIArc> ();\r\n+\t\tif (! variable.getXRef().hasAddress()) return new ArrayList<XDIArc> ();\r\n \r\n-\t\tXDI3Segment segment = variable.getXRef().getSegment();\r\n+\t\tXDIAddress segment = variable.getXRef().getAddress();\r\n \r\n-\t\twhile (segment.getFirstSubSegment().hasXRef()) {\r\n+\t\twhile (segment.getFirstArc().hasXRef()) {\r\n \r\n-\t\t\tsegment = segment.getFirstSubSegment().getXRef().getSegment();\r\n-\t\t\tif (segment == null) return new ArrayList<XDI3SubSegment> ();\r\n+\t\t\tsegment = segment.getFirstArc().getXRef().getAddress();\r\n+\t\t\tif (segment == null) return new ArrayList<XDIArc> ();\r\n \t\t}\r\n \r\n-\t\treturn segment.getSubSegments();\r\n+\t\treturn segment.getArcs();\r\n \t}\r\n \r\n-\tpublic static String getXs(XDI3SubSegment variable) {\r\n+\tpublic static String getXs(XDIArc variable) {\r\n \r\n \t\tif (! isVariable(variable)) return null;\r\n-\t\tif (! variable.getXRef().hasSegment()) return null;\r\n+\t\tif (! variable.getXRef().hasAddress()) return null;\r\n \r\n-\t\tXDI3XRef xref = variable.getXRef().getSegment().getFirstSubSegment().getXRef();\r\n+\t\tXDIXRef xref = variable.getXRef().getAddress().getFirstArc().getXRef();\r\n \t\tif (xref == null) return null;\r\n \r\n \t\tif (XDIConstants.XS_VARIABLE.equals(xref.getXs())) {\r\n \r\n-\t\t\tif (! xref.hasSegment()) return null;\r\n+\t\t\tif (! xref.hasAddress()) return null;\r\n \r\n-\t\t\txref = xref.getSegment().getFirstSubSegment().getXRef();\r\n+\t\t\txref = xref.getAddress().getFirstArc().getXRef();\r\n \t\t\tif (xref == null) return null;\r\n \t\t}\r\n \r\n@@ -81,13 +81,13 @@ public static String getXs(XDI3SubSegment variable) {\n \t * @param variable The variable.\r\n \t * @return True, if the variable matches multiple subsegments.\r\n \t */\r\n-\tpublic static boolean isMultiple(XDI3SubSegment variable) {\r\n+\tpublic static boolean isMultiple(XDIArc variable) {\r\n \r\n \t\tif (! isVariable(variable)) return false;\r\n-\t\tif (! variable.getXRef().hasSegment()) return false;\r\n+\t\tif (! variable.getXRef().hasAddress()) return false;\r\n \r\n-\t\tif (! variable.getXRef().getSegment().getFirstSubSegment().hasXRef()) return false;\r\n-\t\tif (! XDIConstants.XS_VARIABLE.equals(variable.getXRef().getSegment().getFirstSubSegment().getXRef().getXs())) return false;\r\n+\t\tif (! variable.getXRef().getAddress().getFirstArc().hasXRef()) return false;\r\n+\t\tif (! XDIConstants.XS_VARIABLE.equals(variable.getXRef().getAddress().getFirstArc().getXRef().getXs())) return false;\r\n \r\n \t\treturn true;\r\n \t}\r\n@@ -98,9 +98,9 @@ public static boolean isMultiple(XDI3SubSegment variable) {\n \t * @param subSegment The subsegment to match the variable against.\r\n \t * @return True, if the variable matches the subsegment.\r\n \t */\r\n-\tpublic static boolean matches(XDI3SubSegment variable, XDI3SubSegment subSegment) {\r\n+\tpublic static boolean matches(XDIArc variable, XDIArc subSegment) {\r\n \r\n-\t\tList<XDI3SubSegment> variableSubSegments = getSubSegments(variable);\r\n+\t\tList<XDIArc> variableSubSegments = getSubSegments(variable);\r\n \t\tString variableXs = getXs(variable);\r\n \r\n \t\tif (log.isTraceEnabled()) log.trace(\"Matching variable \" + variable + \" against subsegment \" + subSegment + \" (variableSubSegments=\" + variableSubSegments + \", variableXs=\" + variableXs + \")\");\r\n@@ -128,13 +128,13 @@ public static boolean matches(XDI3SubSegment variable, XDI3SubSegment subSegment\n \t\t\t\treturn false;\r\n \t\t\t}\r\n \r\n-\t\t\tif (! subSegment.getXRef().hasSegment()) {\r\n+\t\t\tif (! subSegment.getXRef().hasAddress()) {\r\n \r\n \t\t\t\tif (log.isTraceEnabled()) log.trace(\"Subsegment has no inner subsegment. No match.\");\r\n \t\t\t\treturn false;\r\n \t\t\t}\r\n \r\n-\t\t\tsubSegment = subSegment.getXRef().getSegment().getFirstSubSegment();\r\n+\t\t\tsubSegment = subSegment.getXRef().getAddress().getFirstArc();\r\n \t\t}\r\n \r\n \t\tif (variableSubSegments.size() == 0) {\r\n@@ -149,7 +149,7 @@ public static boolean matches(XDI3SubSegment variable, XDI3SubSegment subSegment\n \t\t\treturn false;\r\n \t\t}\r\n \r\n-\t\tfor (XDI3SubSegment variableSubSegment : variableSubSegments) {\r\n+\t\tfor (XDIArc variableSubSegment : variableSubSegments) {\r\n \r\n \t\t\tif (log.isTraceEnabled()) log.trace(\"Trying to match variable subsegment \" + variableSubSegment + \".\");\r\n \r", "raw_url": "https://github.com/projectdanube/xdi2/raw/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Futil%2FVariableUtil.java", "sha": "cb81021deefc4408d54b028e7bb7850dc2ca1b0a", "status": "modified" }, { "additions": 32, "blob_url": "https://github.com/projectdanube/xdi2/blob/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Futil%2FXRI2Util.java", "changes": 64, "contents_url": "https://api.github.com/repos/projectdanube/xdi2/contents/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Futil%2FXRI2Util.java?ref=0ca7982fec30c2bb8204efbbea61428a643d2e9c", "deletions": 32, "filename": "core/src/main/java/xdi2/core/util/XRI2Util.java", "new_code": "import xdi2.core.syntax.CloudNumber;\r\nimport xdi2.core.syntax.XDIAddress;\r\nimport xdi2.core.syntax.XDIArc;\r\n\t\tXDIAddress xri = cloudNumber.getAddress();\r\n\t\tif (xri.getNumArcs() != 2) return null;\r\n\t\tif (! xri.getFirstArc().isClassXs()) return null;\r\n\t\tif (xri.getFirstArc().hasLiteral()) return null;\r\n\t\tif (xri.getFirstArc().hasXRef()) return null;\r\n\t\tchar cs = xri.getFirstArc().getCs().charValue();\r\n\t\tif (! XDIConstants.CS_MEMBER_UNORDERED.equals(xri.getLastArc().getCs())) return null;\r\n\t\tif (! xri.getLastArc().hasLiteral()) return null;\r\n\t\tif (xri.getLastArc().hasXRef()) return null;\r\n\t\tif (! xri.getLastArc().getLiteral().startsWith(\":uuid\")) return null;\r\n\t\tif (xri.getLastArc().getLiteral().length() != 42) return null;\r\n\t\tparts[0] = xri.getLastArc().getLiteral().substring(6, 10);\r\n\t\tparts[1] = xri.getLastArc().getLiteral().substring(10, 14);\r\n\t\tparts[2] = xri.getLastArc().getLiteral().substring(15, 19);\r\n\t\tparts[3] = xri.getLastArc().getLiteral().substring(20, 24);\r\n\t\tif (! parts[0].equals(xri.getLastArc().getLiteral().substring(25, 29))) return null;\r\n\t\tif (! parts[1].equals(xri.getLastArc().getLiteral().substring(30, 34))) return null;\r\n\t\tif (! parts[2].equals(xri.getLastArc().getLiteral().substring(34, 38))) return null;\r\n\t\tif (! parts[3].equals(xri.getLastArc().getLiteral().substring(38, 42))) return null;\r\n\t * Maps an XRI 2.0 service type to an XDI arc.\r\n\tpublic static XDIArc typeToXdiarc(String type) {\r\n\t\tif (log.isTraceEnabled()) log.trace(\"typeToXdiarc(\" + type + \")\");\r\n\t\tXDIArc xdiarc = null;\r\n\t\ttry { xdiarc = XDIArc.create(type); } catch (Exception ex) { xdiarc = null; }\r\n\t\tif (xdiarc == null) try { xdiarc = XDIArc.create(\"#(\" + type + \")\"); } catch (Exception ex) { xdiarc = null; }\r\n\t\tif (xdiarc == null) try { xdiarc = XDIArc.create(\"#(\" + URLEncoder.encode(type, \"UTF-8\") + \")\"); } catch (Exception ex) { xdiarc = null; }\r\n\t\tif (xdiarc == null) return null;\r\n\t\tif (! XdiAttributeSingleton.isValidarc(xdiarc)) xdiarc = XdiAttributeSingleton.createarc(xdiarc);\r\n\t\treturn xdiarc;\r", "new_methods": [ { "arguments": [ "String type" ], "filename": "core/src/main/java/xdi2/core/util/XRI2Util.java", "implementation": "if (log.isTraceEnabled()) log.trace(\"typeToXdiarc(\" + type + \")\");\r\n\t\tXDIArc xdiarc = null;\r\n\t\ttry { xdiarc = XDIArc.create(type);", "signature": "XDIArc typeToXdiarc(String type)" } ], "old_code": "import xdi2.core.xri3.CloudNumber;\r\nimport xdi2.core.xri3.XDI3Segment;\r\nimport xdi2.core.xri3.XDI3SubSegment;\r\n\t\tXDI3Segment xri = cloudNumber.getXri();\r\n\t\tif (xri.getNumSubSegments() != 2) return null;\r\n\t\tif (! xri.getFirstSubSegment().isClassXs()) return null;\r\n\t\tif (xri.getFirstSubSegment().hasLiteral()) return null;\r\n\t\tif (xri.getFirstSubSegment().hasXRef()) return null;\r\n\t\tchar cs = xri.getFirstSubSegment().getCs().charValue();\r\n\t\tif (! XDIConstants.CS_MEMBER_UNORDERED.equals(xri.getLastSubSegment().getCs())) return null;\r\n\t\tif (! xri.getLastSubSegment().hasLiteral()) return null;\r\n\t\tif (xri.getLastSubSegment().hasXRef()) return null;\r\n\t\tif (! xri.getLastSubSegment().getLiteral().startsWith(\":uuid\")) return null;\r\n\t\tif (xri.getLastSubSegment().getLiteral().length() != 42) return null;\r\n\t\tparts[0] = xri.getLastSubSegment().getLiteral().substring(6, 10);\r\n\t\tparts[1] = xri.getLastSubSegment().getLiteral().substring(10, 14);\r\n\t\tparts[2] = xri.getLastSubSegment().getLiteral().substring(15, 19);\r\n\t\tparts[3] = xri.getLastSubSegment().getLiteral().substring(20, 24);\r\n\t\tif (! parts[0].equals(xri.getLastSubSegment().getLiteral().substring(25, 29))) return null;\r\n\t\tif (! parts[1].equals(xri.getLastSubSegment().getLiteral().substring(30, 34))) return null;\r\n\t\tif (! parts[2].equals(xri.getLastSubSegment().getLiteral().substring(34, 38))) return null;\r\n\t\tif (! parts[3].equals(xri.getLastSubSegment().getLiteral().substring(38, 42))) return null;\r\n\t * Maps an XRI 2.0 service type to an XDI arc XRI.\r\n\tpublic static XDI3SubSegment typeToXdiArcXri(String type) {\r\n\t\tif (log.isTraceEnabled()) log.trace(\"typeToXdiArcXri(\" + type + \")\");\r\n\t\tXDI3SubSegment xdiArcXri = null;\r\n\t\ttry { xdiArcXri = XDI3SubSegment.create(type); } catch (Exception ex) { xdiArcXri = null; }\r\n\t\tif (xdiArcXri == null) try { xdiArcXri = XDI3SubSegment.create(\"#(\" + type + \")\"); } catch (Exception ex) { xdiArcXri = null; }\r\n\t\tif (xdiArcXri == null) try { xdiArcXri = XDI3SubSegment.create(\"#(\" + URLEncoder.encode(type, \"UTF-8\") + \")\"); } catch (Exception ex) { xdiArcXri = null; }\r\n\t\tif (xdiArcXri == null) return null;\r\n\t\tif (! XdiAttributeSingleton.isValidArcXri(xdiArcXri)) xdiArcXri = XdiAttributeSingleton.createArcXri(xdiArcXri);\r\n\t\treturn xdiArcXri;\r", "old_methods": [ { "arguments": [ "String type" ], "filename": "core/src/main/java/xdi2/core/util/XRI2Util.java", "implementation": "if (log.isTraceEnabled()) log.trace(\"typeToXdiArcXri(\" + type + \")\");\r\n\t\tXDI3SubSegment xdiArcXri = null;\r\n\t\ttry { xdiArcXri = XDI3SubSegment.create(type);", "signature": "XDI3SubSegment typeToXdiArcXri(String type)" } ], "patch": "@@ -7,9 +7,9 @@\n \r\n import xdi2.core.constants.XDIConstants;\r\n import xdi2.core.features.nodetypes.XdiAttributeSingleton;\r\n-import xdi2.core.xri3.CloudNumber;\r\n-import xdi2.core.xri3.XDI3Segment;\r\n-import xdi2.core.xri3.XDI3SubSegment;\r\n+import xdi2.core.syntax.CloudNumber;\r\n+import xdi2.core.syntax.XDIAddress;\r\n+import xdi2.core.syntax.XDIArc;\r\n \r\n /**\r\n * Various utility methods for working with XRI 2.0 syntax.\r\n@@ -71,32 +71,32 @@ public static String cloudNumberToINumber(CloudNumber cloudNumber) {\n \r\n \t\tif (log.isTraceEnabled()) log.trace(\"cloudNumberToINumber(\" + cloudNumber + \")\");\r\n \r\n-\t\tXDI3Segment xri = cloudNumber.getXri();\r\n+\t\tXDIAddress xri = cloudNumber.getAddress();\r\n \r\n-\t\tif (xri.getNumSubSegments() != 2) return null;\r\n+\t\tif (xri.getNumArcs() != 2) return null;\r\n \r\n-\t\tif (! xri.getFirstSubSegment().isClassXs()) return null;\r\n-\t\tif (xri.getFirstSubSegment().hasLiteral()) return null;\r\n-\t\tif (xri.getFirstSubSegment().hasXRef()) return null;\r\n+\t\tif (! xri.getFirstArc().isClassXs()) return null;\r\n+\t\tif (xri.getFirstArc().hasLiteral()) return null;\r\n+\t\tif (xri.getFirstArc().hasXRef()) return null;\r\n \r\n-\t\tchar cs = xri.getFirstSubSegment().getCs().charValue();\r\n+\t\tchar cs = xri.getFirstArc().getCs().charValue();\r\n \r\n-\t\tif (! XDIConstants.CS_MEMBER_UNORDERED.equals(xri.getLastSubSegment().getCs())) return null;\r\n-\t\tif (! xri.getLastSubSegment().hasLiteral()) return null;\r\n-\t\tif (xri.getLastSubSegment().hasXRef()) return null;\r\n-\t\tif (! xri.getLastSubSegment().getLiteral().startsWith(\":uuid\")) return null;\r\n-\t\tif (xri.getLastSubSegment().getLiteral().length() != 42) return null;\r\n+\t\tif (! XDIConstants.CS_MEMBER_UNORDERED.equals(xri.getLastArc().getCs())) return null;\r\n+\t\tif (! xri.getLastArc().hasLiteral()) return null;\r\n+\t\tif (xri.getLastArc().hasXRef()) return null;\r\n+\t\tif (! xri.getLastArc().getLiteral().startsWith(\":uuid\")) return null;\r\n+\t\tif (xri.getLastArc().getLiteral().length() != 42) return null;\r\n \r\n \t\tString[] parts = new String[4];\r\n-\t\tparts[0] = xri.getLastSubSegment().getLiteral().substring(6, 10);\r\n-\t\tparts[1] = xri.getLastSubSegment().getLiteral().substring(10, 14);\r\n-\t\tparts[2] = xri.getLastSubSegment().getLiteral().substring(15, 19);\r\n-\t\tparts[3] = xri.getLastSubSegment().getLiteral().substring(20, 24);\r\n+\t\tparts[0] = xri.getLastArc().getLiteral().substring(6, 10);\r\n+\t\tparts[1] = xri.getLastArc().getLiteral().substring(10, 14);\r\n+\t\tparts[2] = xri.getLastArc().getLiteral().substring(15, 19);\r\n+\t\tparts[3] = xri.getLastArc().getLiteral().substring(20, 24);\r\n \r\n-\t\tif (! parts[0].equals(xri.getLastSubSegment().getLiteral().substring(25, 29))) return null;\r\n-\t\tif (! parts[1].equals(xri.getLastSubSegment().getLiteral().substring(30, 34))) return null;\r\n-\t\tif (! parts[2].equals(xri.getLastSubSegment().getLiteral().substring(34, 38))) return null;\r\n-\t\tif (! parts[3].equals(xri.getLastSubSegment().getLiteral().substring(38, 42))) return null;\r\n+\t\tif (! parts[0].equals(xri.getLastArc().getLiteral().substring(25, 29))) return null;\r\n+\t\tif (! parts[1].equals(xri.getLastArc().getLiteral().substring(30, 34))) return null;\r\n+\t\tif (! parts[2].equals(xri.getLastArc().getLiteral().substring(34, 38))) return null;\r\n+\t\tif (! parts[3].equals(xri.getLastArc().getLiteral().substring(38, 42))) return null;\r\n \r\n \t\tfor (int i=0; i<parts.length; i++) {\r\n \r\n@@ -121,25 +121,25 @@ public static String cloudNumberToINumber(CloudNumber cloudNumber) {\n \t}\r\n \r\n \t/**\r\n-\t * Maps an XRI 2.0 service type to an XDI arc XRI.\r\n+\t * Maps an XRI 2.0 service type to an XDI arc.\r\n \t */\r\n-\tpublic static XDI3SubSegment typeToXdiArcXri(String type) {\r\n+\tpublic static XDIArc typeToXdiarc(String type) {\r\n \r\n-\t\tif (log.isTraceEnabled()) log.trace(\"typeToXdiArcXri(\" + type + \")\");\r\n+\t\tif (log.isTraceEnabled()) log.trace(\"typeToXdiarc(\" + type + \")\");\r\n \r\n \t\tif (type.startsWith(\"xri://\")) type = type.substring(6);\r\n \t\ttype = type.replace('+' , '#');\r\n \r\n-\t\tXDI3SubSegment xdiArcXri = null;\r\n+\t\tXDIArc xdiarc = null;\r\n \r\n-\t\ttry { xdiArcXri = XDI3SubSegment.create(type); } catch (Exception ex) { xdiArcXri = null; }\r\n-\t\tif (xdiArcXri == null) try { xdiArcXri = XDI3SubSegment.create(\"#(\" + type + \")\"); } catch (Exception ex) { xdiArcXri = null; }\r\n-\t\tif (xdiArcXri == null) try { xdiArcXri = XDI3SubSegment.create(\"#(\" + URLEncoder.encode(type, \"UTF-8\") + \")\"); } catch (Exception ex) { xdiArcXri = null; }\r\n+\t\ttry { xdiarc = XDIArc.create(type); } catch (Exception ex) { xdiarc = null; }\r\n+\t\tif (xdiarc == null) try { xdiarc = XDIArc.create(\"#(\" + type + \")\"); } catch (Exception ex) { xdiarc = null; }\r\n+\t\tif (xdiarc == null) try { xdiarc = XDIArc.create(\"#(\" + URLEncoder.encode(type, \"UTF-8\") + \")\"); } catch (Exception ex) { xdiarc = null; }\r\n \r\n-\t\tif (xdiArcXri == null) return null;\r\n+\t\tif (xdiarc == null) return null;\r\n \r\n-\t\tif (! XdiAttributeSingleton.isValidArcXri(xdiArcXri)) xdiArcXri = XdiAttributeSingleton.createArcXri(xdiArcXri);\r\n+\t\tif (! XdiAttributeSingleton.isValidarc(xdiarc)) xdiarc = XdiAttributeSingleton.createarc(xdiarc);\r\n \r\n-\t\treturn xdiArcXri;\r\n+\t\treturn xdiarc;\r\n \t}\r\n }\r", "raw_url": "https://github.com/projectdanube/xdi2/raw/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Futil%2FXRI2Util.java", "sha": "e86cb41a075d4f04ef1ddc25ecd3679beaf102da", "status": "modified" }, { "additions": 7, "blob_url": "https://github.com/projectdanube/xdi2/blob/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Futil%2Fiterators%2FMappingCloudNameIterator.java", "changes": 14, "contents_url": "https://api.github.com/repos/projectdanube/xdi2/contents/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Futil%2Fiterators%2FMappingCloudNameIterator.java?ref=0ca7982fec30c2bb8204efbbea61428a643d2e9c", "deletions": 7, "filename": "core/src/main/java/xdi2/core/util/iterators/MappingCloudNameIterator.java", "new_code": "import xdi2.core.syntax.CloudName;\r\nimport xdi2.core.syntax.XDIAddress;\r\npublic class MappingCloudNameIterator extends MappingIterator<XDIAddress, CloudName> {\r\n\tpublic MappingCloudNameIterator(Iterator<XDIAddress> xris) {\r\n\tpublic CloudName map(XDIAddress xri) {\r\n\t\tCloudName cloudName = CloudName.fromAddress(xri);\r\n\t\tif (cloudName == null) cloudName = CloudName.fromPeerRootArc(xri);\r", "new_methods": [], "old_code": "import xdi2.core.xri3.CloudName;\r\nimport xdi2.core.xri3.XDI3Segment;\r\npublic class MappingCloudNameIterator extends MappingIterator<XDI3Segment, CloudName> {\r\n\tpublic MappingCloudNameIterator(Iterator<XDI3Segment> xris) {\r\n\tpublic CloudName map(XDI3Segment xri) {\r\n\t\tCloudName cloudName = CloudName.fromXri(xri);\r\n\t\tif (cloudName == null) cloudName = CloudName.fromPeerRootXri(xri);\r", "old_methods": [], "patch": "@@ -2,26 +2,26 @@\n \r\n import java.util.Iterator;\r\n \r\n-import xdi2.core.xri3.CloudName;\r\n-import xdi2.core.xri3.XDI3Segment;\r\n+import xdi2.core.syntax.CloudName;\r\n+import xdi2.core.syntax.XDIAddress;\r\n \r\n /**\r\n * A MappingIterator that maps XDI segments to Cloud Names.\r\n * \r\n * @author markus\r\n */\r\n-public class MappingCloudNameIterator extends MappingIterator<XDI3Segment, CloudName> {\r\n+public class MappingCloudNameIterator extends MappingIterator<XDIAddress, CloudName> {\r\n \r\n-\tpublic MappingCloudNameIterator(Iterator<XDI3Segment> xris) {\r\n+\tpublic MappingCloudNameIterator(Iterator<XDIAddress> xris) {\r\n \r\n \t\tsuper(xris);\r\n \t}\r\n \r\n \t@Override\r\n-\tpublic CloudName map(XDI3Segment xri) {\r\n+\tpublic CloudName map(XDIAddress xri) {\r\n \r\n-\t\tCloudName cloudName = CloudName.fromXri(xri);\r\n-\t\tif (cloudName == null) cloudName = CloudName.fromPeerRootXri(xri);\r\n+\t\tCloudName cloudName = CloudName.fromAddress(xri);\r\n+\t\tif (cloudName == null) cloudName = CloudName.fromPeerRootArc(xri);\r\n \t\tif (cloudName == null) return null;\r\n \t\t\r\n \t\treturn cloudName;\r", "raw_url": "https://github.com/projectdanube/xdi2/raw/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Futil%2Fiterators%2FMappingCloudNameIterator.java", "sha": "a24be8096f9d3c37cfb2ac58110e3993a94d7155", "status": "modified" }, { "additions": 7, "blob_url": "https://github.com/projectdanube/xdi2/blob/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Futil%2Fiterators%2FMappingCloudNumberIterator.java", "changes": 14, "contents_url": "https://api.github.com/repos/projectdanube/xdi2/contents/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Futil%2Fiterators%2FMappingCloudNumberIterator.java?ref=0ca7982fec30c2bb8204efbbea61428a643d2e9c", "deletions": 7, "filename": "core/src/main/java/xdi2/core/util/iterators/MappingCloudNumberIterator.java", "new_code": "import xdi2.core.syntax.CloudNumber;\r\nimport xdi2.core.syntax.XDIAddress;\r\npublic class MappingCloudNumberIterator extends MappingIterator<XDIAddress, CloudNumber> {\r\n\tpublic MappingCloudNumberIterator(Iterator<XDIAddress> xris) {\r\n\tpublic CloudNumber map(XDIAddress xri) {\r\n\t\tCloudNumber cloudNumber = CloudNumber.fromAddress(xri);\r\n\t\tif (cloudNumber == null) cloudNumber = CloudNumber.fromPeerRootArc(xri);\r", "new_methods": [], "old_code": "import xdi2.core.xri3.CloudNumber;\r\nimport xdi2.core.xri3.XDI3Segment;\r\npublic class MappingCloudNumberIterator extends MappingIterator<XDI3Segment, CloudNumber> {\r\n\tpublic MappingCloudNumberIterator(Iterator<XDI3Segment> xris) {\r\n\tpublic CloudNumber map(XDI3Segment xri) {\r\n\t\tCloudNumber cloudNumber = CloudNumber.fromXri(xri);\r\n\t\tif (cloudNumber == null) cloudNumber = CloudNumber.fromPeerRootXri(xri);\r", "old_methods": [], "patch": "@@ -2,26 +2,26 @@\n \r\n import java.util.Iterator;\r\n \r\n-import xdi2.core.xri3.CloudNumber;\r\n-import xdi2.core.xri3.XDI3Segment;\r\n+import xdi2.core.syntax.CloudNumber;\r\n+import xdi2.core.syntax.XDIAddress;\r\n \r\n /**\r\n * A MappingIterator that maps XDI segments to Cloud Numbers.\r\n * \r\n * @author markus\r\n */\r\n-public class MappingCloudNumberIterator extends MappingIterator<XDI3Segment, CloudNumber> {\r\n+public class MappingCloudNumberIterator extends MappingIterator<XDIAddress, CloudNumber> {\r\n \r\n-\tpublic MappingCloudNumberIterator(Iterator<XDI3Segment> xris) {\r\n+\tpublic MappingCloudNumberIterator(Iterator<XDIAddress> xris) {\r\n \r\n \t\tsuper(xris);\r\n \t}\r\n \r\n \t@Override\r\n-\tpublic CloudNumber map(XDI3Segment xri) {\r\n+\tpublic CloudNumber map(XDIAddress xri) {\r\n \r\n-\t\tCloudNumber cloudNumber = CloudNumber.fromXri(xri);\r\n-\t\tif (cloudNumber == null) cloudNumber = CloudNumber.fromPeerRootXri(xri);\r\n+\t\tCloudNumber cloudNumber = CloudNumber.fromAddress(xri);\r\n+\t\tif (cloudNumber == null) cloudNumber = CloudNumber.fromPeerRootArc(xri);\r\n \t\tif (cloudNumber == null) return null;\r\n \r\n \t\treturn cloudNumber;\r", "raw_url": "https://github.com/projectdanube/xdi2/raw/0ca7982fec30c2bb8204efbbea61428a643d2e9c/core%2Fsrc%2Fmain%2Fjava%2Fxdi2%2Fcore%2Futil%2Fiterators%2FMappingCloudNumberIterator.java", "sha": "346f4adad2fecb468d0713fd30388776cf796ddf", "status": "modified" } ]
103
[ { "name": "projectdanube$xdi2", "new_args": "XDIArc arc", "new_implementation": "return arc;\r\n\tpublic static boolean isValidarc(XDIArc arc) {\r\n\t\tif (arc == null) return false;\r\n\t\tif (arc.isAttributeXs()) return false;\r\n\t\tif (arc.isClassXs()) return false;\r\n\t\tif (! arc.hasLiteral() && ! arc.hasXRef()) return false;\r\n\t\tif (XDIConstants.CS_CLASS_UNRESERVED.equals(arc.getCs()) || XDIConstants.CS_CLASS_RESERVED.equals(arc.getCs())) {", "new_return_type": "XDIArc", "new_signature": "XDIArc createarc(XDIArc arc)", "old_args": "XDI3SubSegment arcXri", "old_implementation": "return arcXri;\r\n\tpublic static boolean isValidArcXri(XDI3SubSegment arcXri) {\r\n\t\tif (arcXri == null) return false;\r\n\t\tif (arcXri.isAttributeXs()) return false;\r\n\t\tif (arcXri.isClassXs()) return false;\r\n\t\tif (! arcXri.hasLiteral() && ! arcXri.hasXRef()) return false;\r\n\t\tif (XDIConstants.CS_CLASS_UNRESERVED.equals(arcXri.getCs()) || XDIConstants.CS_CLASS_RESERVED.equals(arcXri.getCs())) {", "old_return_type": "XDI3SubSegment", "old_signature": "XDI3SubSegment createArcXri(XDI3SubSegment arcXri)" }, { "name": "projectdanube$xdi2", "new_args": "XDIArc arc", "new_implementation": "return arc;\r\n\tpublic static boolean isValidarc(XDIArc arc) {\r\n\t\tif (arc == null) return false;\r\n\t\tif (arc.isAttributeXs()) return false;\r\n\t\tif (arc.isClassXs()) return false;\r\n\t\tif (! arc.hasLiteral() && ! arc.hasXRef()) return false;\r\n\t\tif (XDIConstants.CS_CLASS_UNRESERVED.equals(arc.getCs()) || XDIConstants.CS_CLASS_RESERVED.equals(arc.getCs())) {", "new_return_type": "XDIArc", "new_signature": "XDIArc createarc(XDIArc arc)", "old_args": "XDI3SubSegment arcXri", "old_implementation": "return arcXri;\r\n\tpublic static boolean isValidArcXri(XDI3SubSegment arcXri) {\r\n\t\tif (arcXri == null) return false;\r\n\t\tif (arcXri.isAttributeXs()) return false;\r\n\t\tif (arcXri.isClassXs()) return false;\r\n\t\tif (! arcXri.hasLiteral() && ! arcXri.hasXRef()) return false;\r\n\t\tif (XDIConstants.CS_CLASS_UNRESERVED.equals(arcXri.getCs()) || XDIConstants.CS_CLASS_RESERVED.equals(arcXri.getCs())) {", "old_return_type": "XDI3SubSegment", "old_signature": "XDI3SubSegment createArcXri(XDI3SubSegment arcXri)" }, { "name": "projectdanube$xdi2", "new_args": "XDIArc arc", "new_implementation": "return arc;\r\n\tpublic static boolean isValidarc(XDIArc arc) {\r\n\t\tif (arc == null) return false;\r\n\t\tif (arc.isAttributeXs()) return false;\r\n\t\tif (arc.isClassXs()) return false;\r\n\t\tif (! arc.hasLiteral() && ! arc.hasXRef()) return false;\r\n\t\tif (XDIConstants.CS_CLASS_UNRESERVED.equals(arc.getCs()) || XDIConstants.CS_CLASS_RESERVED.equals(arc.getCs())) {", "new_return_type": "XDIArc", "new_signature": "XDIArc createarc(XDIArc arc)", "old_args": "XDI3SubSegment arcXri", "old_implementation": "return arcXri;\r\n\tpublic static boolean isValidArcXri(XDI3SubSegment arcXri) {\r\n\t\tif (arcXri == null) return false;\r\n\t\tif (arcXri.isAttributeXs()) return false;\r\n\t\tif (arcXri.isClassXs()) return false;\r\n\t\tif (! arcXri.hasLiteral() && ! arcXri.hasXRef()) return false;\r\n\t\tif (XDIConstants.CS_CLASS_UNRESERVED.equals(arcXri.getCs()) || XDIConstants.CS_CLASS_RESERVED.equals(arcXri.getCs())) {", "old_return_type": "XDI3SubSegment", "old_signature": "XDI3SubSegment createArcXri(XDI3SubSegment arcXri)" }, { "name": "projectdanube$xdi2", "new_args": "XDIArc arc", "new_implementation": "return arc;\r\n\tpublic static boolean isValidarc(XDIArc arc) {\r\n\t\tif (arc == null) return false;\r\n\t\tif (arc.isAttributeXs()) return false;\r\n\t\tif (arc.isClassXs()) return false;\r\n\t\tif (! arc.hasLiteral() && ! arc.hasXRef()) return false;\r\n\t\tif (XDIConstants.CS_CLASS_UNRESERVED.equals(arc.getCs()) || XDIConstants.CS_CLASS_RESERVED.equals(arc.getCs())) {", "new_return_type": "XDIArc", "new_signature": "XDIArc createarc(XDIArc arc)", "old_args": "XDI3SubSegment arcXri", "old_implementation": "return arcXri;\r\n\tpublic static boolean isValidArcXri(XDI3SubSegment arcXri) {\r\n\t\tif (arcXri == null) return false;\r\n\t\tif (arcXri.isAttributeXs()) return false;\r\n\t\tif (arcXri.isClassXs()) return false;\r\n\t\tif (! arcXri.hasLiteral() && ! arcXri.hasXRef()) return false;\r\n\t\tif (XDIConstants.CS_CLASS_UNRESERVED.equals(arcXri.getCs()) || XDIConstants.CS_CLASS_RESERVED.equals(arcXri.getCs())) {", "old_return_type": "XDI3SubSegment", "old_signature": "XDI3SubSegment createArcXri(XDI3SubSegment arcXri)" }, { "name": "projectdanube$xdi2", "new_args": "XDIArc arc", "new_implementation": "return arc;\r\n\tpublic static boolean isValidarc(XDIArc arc) {\r\n\t\tif (arc == null) return false;\r\n\t\tif (arc.isAttributeXs()) return false;\r\n\t\tif (arc.isClassXs()) return false;\r\n\t\tif (! arc.hasLiteral() && ! arc.hasXRef()) return false;\r\n\t\tif (XDIConstants.CS_CLASS_UNRESERVED.equals(arc.getCs()) || XDIConstants.CS_CLASS_RESERVED.equals(arc.getCs())) {", "new_return_type": "XDIArc", "new_signature": "XDIArc createarc(XDIArc arc)", "old_args": "XDI3SubSegment arcXri", "old_implementation": "return arcXri;\r\n\tpublic static boolean isValidArcXri(XDI3SubSegment arcXri) {\r\n\t\tif (arcXri == null) return false;\r\n\t\tif (arcXri.isAttributeXs()) return false;\r\n\t\tif (arcXri.isClassXs()) return false;\r\n\t\tif (! arcXri.hasLiteral() && ! arcXri.hasXRef()) return false;\r\n\t\tif (XDIConstants.CS_CLASS_UNRESERVED.equals(arcXri.getCs()) || XDIConstants.CS_CLASS_RESERVED.equals(arcXri.getCs())) {", "old_return_type": "XDI3SubSegment", "old_signature": "XDI3SubSegment createArcXri(XDI3SubSegment arcXri)" }, { "name": "projectdanube$xdi2", "new_args": "XDIArc arc", "new_implementation": "return arc;\r\n\tpublic static boolean isValidarc(XDIArc arc) {\r\n\t\tif (arc == null) return false;\r\n\t\tif (arc.isAttributeXs()) return false;\r\n\t\tif (arc.isClassXs()) return false;\r\n\t\tif (! arc.hasLiteral() && ! arc.hasXRef()) return false;\r\n\t\tif (XDIConstants.CS_CLASS_UNRESERVED.equals(arc.getCs()) || XDIConstants.CS_CLASS_RESERVED.equals(arc.getCs())) {", "new_return_type": "XDIArc", "new_signature": "XDIArc createarc(XDIArc arc)", "old_args": "XDI3SubSegment arcXri", "old_implementation": "return arcXri;\r\n\tpublic static boolean isValidArcXri(XDI3SubSegment arcXri) {\r\n\t\tif (arcXri == null) return false;\r\n\t\tif (arcXri.isAttributeXs()) return false;\r\n\t\tif (arcXri.isClassXs()) return false;\r\n\t\tif (! arcXri.hasLiteral() && ! arcXri.hasXRef()) return false;\r\n\t\tif (XDIConstants.CS_CLASS_UNRESERVED.equals(arcXri.getCs()) || XDIConstants.CS_CLASS_RESERVED.equals(arcXri.getCs())) {", "old_return_type": "XDI3SubSegment", "old_signature": "XDI3SubSegment createArcXri(XDI3SubSegment arcXri)" }, { "name": "projectdanube$xdi2", "new_args": "XDIArc arc", "new_implementation": "return arc;\r\n\tpublic static boolean isValidarc(XDIArc arc) {\r\n\t\tif (arc == null) return false;\r\n\t\tif (arc.isAttributeXs()) return false;\r\n\t\tif (arc.isClassXs()) return false;\r\n\t\tif (! arc.hasLiteral() && ! arc.hasXRef()) return false;\r\n\t\tif (XDIConstants.CS_CLASS_UNRESERVED.equals(arc.getCs()) || XDIConstants.CS_CLASS_RESERVED.equals(arc.getCs())) {", "new_return_type": "XDIArc", "new_signature": "XDIArc createarc(XDIArc arc)", "old_args": "XDI3SubSegment arcXri", "old_implementation": "return arcXri;\r\n\tpublic static boolean isValidArcXri(XDI3SubSegment arcXri) {\r\n\t\tif (arcXri == null) return false;\r\n\t\tif (arcXri.isAttributeXs()) return false;\r\n\t\tif (arcXri.isClassXs()) return false;\r\n\t\tif (! arcXri.hasLiteral() && ! arcXri.hasXRef()) return false;\r\n\t\tif (XDIConstants.CS_CLASS_UNRESERVED.equals(arcXri.getCs()) || XDIConstants.CS_CLASS_RESERVED.equals(arcXri.getCs())) {", "old_return_type": "XDI3SubSegment", "old_signature": "XDI3SubSegment createArcXri(XDI3SubSegment arcXri)" }, { "name": "projectdanube$xdi2", "new_args": "XDIArc arc", "new_implementation": "return arc;\r\n\tpublic static boolean isValidarc(XDIArc arc) {\r\n\t\tif (arc == null) return false;\r\n\t\tif (arc.isAttributeXs()) return false;\r\n\t\tif (arc.isClassXs()) return false;\r\n\t\tif (! arc.hasLiteral() && ! arc.hasXRef()) return false;\r\n\t\tif (XDIConstants.CS_CLASS_UNRESERVED.equals(arc.getCs()) || XDIConstants.CS_CLASS_RESERVED.equals(arc.getCs())) {", "new_return_type": "XDIArc", "new_signature": "XDIArc createarc(XDIArc arc)", "old_args": "XDI3SubSegment arcXri", "old_implementation": "return arcXri;\r\n\tpublic static boolean isValidArcXri(XDI3SubSegment arcXri) {\r\n\t\tif (arcXri == null) return false;\r\n\t\tif (arcXri.isAttributeXs()) return false;\r\n\t\tif (arcXri.isClassXs()) return false;\r\n\t\tif (! arcXri.hasLiteral() && ! arcXri.hasXRef()) return false;\r\n\t\tif (XDIConstants.CS_CLASS_UNRESERVED.equals(arcXri.getCs()) || XDIConstants.CS_CLASS_RESERVED.equals(arcXri.getCs())) {", "old_return_type": "XDI3SubSegment", "old_signature": "XDI3SubSegment createArcXri(XDI3SubSegment arcXri)" }, { "name": "projectdanube$xdi2", "new_args": "String type", "new_implementation": "if (log.isTraceEnabled()) log.trace(\"typeToXdiarc(\" + type + \")\");\r\n\t\tXDIArc xdiarc = null;\r\n\t\ttry { xdiarc = XDIArc.create(type);", "new_return_type": "XDIArc", "new_signature": "XDIArc typeToXdiarc(String type)", "old_args": "String type", "old_implementation": "if (log.isTraceEnabled()) log.trace(\"typeToXdiArcXri(\" + type + \")\");\r\n\t\tXDI3SubSegment xdiArcXri = null;\r\n\t\ttry { xdiArcXri = XDI3SubSegment.create(type);", "old_return_type": "XDI3SubSegment", "old_signature": "XDI3SubSegment typeToXdiArcXri(String type)" } ]
9
58
0d00787f0d8de19464aaac7bc951d9817fd7c518
[ { "name": "eclipse$ecf", "new_args": "String line", "new_implementation": null, "new_return_type": "String", "new_signature": "String createChatLine(String line)", "old_args": "String line", "old_implementation": null, "old_return_type": "String", "old_signature": "String makeChatLine(String line)" }, { "name": "eclipse$ecf", "new_args": "String line", "new_implementation": null, "new_return_type": "String", "new_signature": "String createLineWithTimestamp(String line)", "old_args": "String line", "old_implementation": null, "old_return_type": "String", "old_signature": "String makeLineWithTimestamp(String line)" }, { "name": "eclipse$ecf", "new_args": "ID remoteSpace,Object data", "new_implementation": null, "new_return_type": "ISynchAsynchConnection", "new_signature": "ISynchAsynchConnection abstract(ID remoteSpace,Object data)", "old_args": "ID remoteSpace,Object data", "old_implementation": null, "old_return_type": "ISynchAsynchConnection", "old_signature": "ISynchAsynchConnection abstract(ID remoteSpace,Object data)" }, { "name": "eclipse$ecf", "new_args": "ISharedObjectContainer soContainer,ClientEntry client,IResource proj,User user,String fileDir", "new_implementation": null, "new_return_type": "void", "new_signature": "void createAndAddSharedObject(ISharedObjectContainer soContainer,ClientEntry client,IResource proj,User user,String fileDir)", "old_args": "ISharedObjectContainer soContainer,ClientEntry client,IResource proj,User user,String fileDir", "old_implementation": null, "old_return_type": "void", "old_signature": "void makeAndAddSharedObject(ISharedObjectContainer soContainer,ClientEntry client,IResource proj,User user,String fileDir)" }, { "name": "eclipse$ecf", "new_args": "", "new_implementation": null, "new_return_type": "Callback[]", "new_signature": "Callback[] createAuthorizationCallbacks()", "old_args": "", "old_implementation": null, "old_return_type": "Callback[]", "old_signature": "Callback[] makeAuthorizationCallbacks()" }, { "name": "eclipse$ecf", "new_args": "", "new_implementation": null, "new_return_type": "Callback[]", "new_signature": "Callback[] createAuthorizationCallbacks()", "old_args": "", "old_implementation": null, "old_return_type": "Callback[]", "old_signature": "Callback[] makeAuthorizationCallbacks()" }, { "name": "eclipse$ecf", "new_args": "String groupName", "new_implementation": null, "new_return_type": "ID", "new_signature": "ID createChatRoomID(String groupName)", "old_args": "String groupName", "old_implementation": null, "old_return_type": "ID", "old_signature": "ID makeChatRoomID(String groupName)" }, { "name": "eclipse$ecf", "new_args": "ID targetID", "new_implementation": null, "new_return_type": "ChatWindow", "new_signature": "ChatWindow createChatWindowForTarget(ID targetID)", "old_args": "ID targetID", "old_implementation": null, "old_return_type": "ChatWindow", "old_signature": "ChatWindow makeChatWindowForTarget(ID targetID)" }, { "name": "eclipse$ecf", "new_args": "", "new_implementation": null, "new_return_type": "ISharedObjectContainer", "new_signature": "ISharedObjectContainer createClient()", "old_args": "", "old_implementation": null, "old_return_type": "ISharedObjectContainer", "old_signature": "ISharedObjectContainer makeClient()" }, { "name": "eclipse$ecf", "new_args": "ID target,Callback cbs,Object data", "new_implementation": null, "new_return_type": "Object", "new_signature": "Object createConnectData(ID target,Callback cbs,Object data)", "old_args": "ID target,Callback cbs,Object data", "old_implementation": null, "old_return_type": "Object", "old_signature": "Object makeConnectData(ID target,Callback cbs,Object data)" }, { "name": "eclipse$ecf", "new_args": "ID target,Callback cbs,Object data", "new_implementation": null, "new_return_type": "Object", "new_signature": "Object createConnectData(ID target,Callback cbs,Object data)", "old_args": "ID target,Callback cbs,Object data", "old_implementation": null, "old_return_type": "Object", "old_signature": "Object makeConnectData(ID target,Callback cbs,Object data)" }, { "name": "eclipse$ecf", "new_args": "ID remoteSpace,Object data", "new_implementation": null, "new_return_type": "ISynchAsynchConnection", "new_signature": "ISynchAsynchConnection createConnection(ID remoteSpace,Object data)", "old_args": "ID remoteSpace,Object data", "old_implementation": null, "old_return_type": "ISynchAsynchConnection", "old_signature": "ISynchAsynchConnection makeConnection(ID remoteSpace,Object data)" }, { "name": "eclipse$ecf", "new_args": "ID remoteSpace,Object data", "new_implementation": null, "new_return_type": "ISynchAsynchConnection", "new_signature": "ISynchAsynchConnection createConnection(ID remoteSpace,Object data)", "old_args": "ID remoteSpace,Object data", "old_implementation": null, "old_return_type": "ISynchAsynchConnection", "old_signature": "ISynchAsynchConnection makeConnection(ID remoteSpace,Object data)" }, { "name": "eclipse$ecf", "new_args": "ID remoteSpace,Object data", "new_implementation": null, "new_return_type": "ISynchAsynchConnection", "new_signature": "ISynchAsynchConnection createConnection(ID remoteSpace,Object data)", "old_args": "ID remoteSpace,Object data", "old_implementation": null, "old_return_type": "ISynchAsynchConnection", "old_signature": "ISynchAsynchConnection makeConnection(ID remoteSpace,Object data)" }, { "name": "eclipse$ecf", "new_args": "ID remoteSpace,Object data", "new_implementation": null, "new_return_type": "ISynchAsynchConnection", "new_signature": "ISynchAsynchConnection createConnection(ID remoteSpace,Object data)", "old_args": "ID remoteSpace,Object data", "old_implementation": null, "old_return_type": "ISynchAsynchConnection", "old_signature": "ISynchAsynchConnection makeConnection(ID remoteSpace,Object data)" }, { "name": "eclipse$ecf", "new_args": "HostedRoom room", "new_implementation": null, "new_return_type": "ID", "new_signature": "ID createIDFromHostedRoom(HostedRoom room)", "old_args": "HostedRoom room", "old_implementation": null, "old_return_type": "ID", "old_signature": "ID makeIDFromHostedRoom(HostedRoom room)" }, { "name": "eclipse$ecf", "new_args": "String name", "new_implementation": "result = IDFactory.getDefault().createID(namespace, new Object[] { name", "new_return_type": "ID", "new_signature": "ID createIDFromName(String name)", "old_args": "String name", "old_implementation": "result = IDFactory.getDefault().makeID(namespace, new Object[] { name", "old_return_type": "ID", "old_signature": "ID makeIDFromName(String name)" }, { "name": "eclipse$ecf", "new_args": "Presence xmppPresence", "new_implementation": null, "new_return_type": "IPresence", "new_signature": "IPresence createIPresence(Presence xmppPresence)", "old_args": "Presence xmppPresence", "old_implementation": null, "old_return_type": "IPresence", "old_signature": "IPresence makeIPresence(Presence xmppPresence)" }, { "name": "eclipse$ecf", "new_args": "Presence xmppPresence", "new_implementation": null, "new_return_type": "IPresence", "new_signature": "IPresence createIPresence(Presence xmppPresence)", "old_args": "Presence xmppPresence", "old_implementation": null, "old_return_type": "IPresence", "old_signature": "IPresence makeIPresence(Presence xmppPresence)" }, { "name": "eclipse$ecf", "new_args": "Presence xmppPresence", "new_implementation": null, "new_return_type": "IPresence.Mode", "new_signature": "IPresence.Mode createIPresenceMode(Presence xmppPresence)", "old_args": "Presence xmppPresence", "old_implementation": null, "old_return_type": "IPresence.Mode", "old_signature": "IPresence.Mode makeIPresenceMode(Presence xmppPresence)" }, { "name": "eclipse$ecf", "new_args": "Presence xmppPresence", "new_implementation": null, "new_return_type": "IPresence.Mode", "new_signature": "IPresence.Mode createIPresenceMode(Presence xmppPresence)", "old_args": "Presence xmppPresence", "old_implementation": null, "old_return_type": "IPresence.Mode", "old_signature": "IPresence.Mode makeIPresenceMode(Presence xmppPresence)" }, { "name": "eclipse$ecf", "new_args": "Presence xmppPresence", "new_implementation": null, "new_return_type": "IPresence.Type", "new_signature": "IPresence.Type createIPresenceType(Presence xmppPresence)", "old_args": "Presence xmppPresence", "old_implementation": null, "old_return_type": "IPresence.Type", "old_signature": "IPresence.Type makeIPresenceType(Presence xmppPresence)" }, { "name": "eclipse$ecf", "new_args": "Presence xmppPresence", "new_implementation": null, "new_return_type": "IPresence.Type", "new_signature": "IPresence.Type createIPresenceType(Presence xmppPresence)", "old_args": "Presence xmppPresence", "old_implementation": null, "old_return_type": "IPresence.Type", "old_signature": "IPresence.Type makeIPresenceType(Presence xmppPresence)" }, { "name": "eclipse$ecf", "new_args": "ServiceEvent event", "new_implementation": null, "new_return_type": "IServiceInfo", "new_signature": "IServiceInfo createIServiceInfoFromServiceEvent(ServiceEvent event)", "old_args": "ServiceEvent event", "old_implementation": null, "old_return_type": "IServiceInfo", "old_signature": "IServiceInfo makeIServiceInfoFromServiceEvent(ServiceEvent event)" }, { "name": "eclipse$ecf", "new_args": "ServiceInfo serviceInfo", "new_implementation": null, "new_return_type": "IServiceInfo", "new_signature": "IServiceInfo createIServiceInfoFromServiceInfo(ServiceInfo serviceInfo)", "old_args": "ServiceInfo serviceInfo", "old_implementation": null, "old_return_type": "IServiceInfo", "old_signature": "IServiceInfo makeIServiceInfoFromServiceInfo(ServiceInfo serviceInfo)" }, { "name": "eclipse$ecf", "new_args": "RosterPacket itemType,e ItemTyp", "new_implementation": null, "new_return_type": "IRosterEntry.InterestType", "new_signature": "IRosterEntry.InterestType createInterestType(RosterPacket itemType,e ItemTyp)", "old_args": "RosterPacket itemType,e ItemTyp", "old_implementation": null, "old_return_type": "IRosterEntry.InterestType", "old_signature": "IRosterEntry.InterestType makeInterestType(RosterPacket itemType,e ItemTyp)" }, { "name": "eclipse$ecf", "new_args": "", "new_implementation": null, "new_return_type": "ThreadGroup", "new_signature": "ThreadGroup createLoadingThreadGroup()", "old_args": "", "old_implementation": null, "old_return_type": "ThreadGroup", "old_signature": "ThreadGroup makeLoadingThreadGroup()" }, { "name": "eclipse$ecf", "new_args": "IFile file,EclipseCollabSharedObject marker,r SharedMarke", "new_implementation": null, "new_return_type": "IMarker", "new_signature": "IMarker createMarkerForFile(IFile file,EclipseCollabSharedObject marker,r SharedMarke)", "old_args": "IFile file,EclipseCollabSharedObject marker,r SharedMarke", "old_implementation": null, "old_return_type": "IMarker", "old_signature": "IMarker makeMarkerForFile(IFile file,EclipseCollabSharedObject marker,r SharedMarke)" }, { "name": "eclipse$ecf", "new_args": "Message type,e Typ", "new_implementation": null, "new_return_type": "IMessageListener.Type", "new_signature": "IMessageListener.Type createMessageType(Message type,e Typ)", "old_args": "Message type,e Typ", "old_implementation": null, "old_return_type": "IMessageListener.Type", "old_signature": "IMessageListener.Type makeMessageType(Message type,e Typ)" }, { "name": "eclipse$ecf", "new_args": "Message type,e Typ", "new_implementation": null, "new_return_type": "IMessageListener.Type", "new_signature": "IMessageListener.Type createMessageType(Message type,e Typ)", "old_args": "Message type,e Typ", "old_implementation": null, "old_return_type": "IMessageListener.Type", "old_signature": "IMessageListener.Type makeMessageType(Message type,e Typ)" }, { "name": "eclipse$ecf", "new_args": "ID target,String className,String argTypes,Object args", "new_implementation": null, "new_return_type": "void", "new_signature": "void createObject(ID target,String className,String argTypes,Object args)", "old_args": "ID target,String className,String argTypes,Object args", "old_implementation": null, "old_return_type": "void", "old_signature": "void makeObject(ID target,String className,String argTypes,Object args)" }, { "name": "eclipse$ecf", "new_args": "ID target,String className,String args", "new_implementation": null, "new_return_type": "void", "new_signature": "void createObject(ID target,String className,String args)", "old_args": "ID target,String className,String args", "old_implementation": null, "old_return_type": "void", "old_signature": "void makeObject(ID target,String className,String args)" }, { "name": "eclipse$ecf", "new_args": "EclipseCollabSharedObject stage,boolean server,File file,long length,float rate", "new_implementation": null, "new_return_type": "File", "new_signature": "File createPath(EclipseCollabSharedObject stage,boolean server,File file,long length,float rate)", "old_args": "EclipseCollabSharedObject stage,boolean server,File file,long length,float rate", "old_implementation": null, "old_return_type": "File", "old_signature": "File makePath(EclipseCollabSharedObject stage,boolean server,File file,long length,float rate)" }, { "name": "eclipse$ecf", "new_args": "IPresence ipresence", "new_implementation": null, "new_return_type": "Presence", "new_signature": "Presence createPresence(IPresence ipresence)", "old_args": "IPresence ipresence", "old_implementation": null, "old_return_type": "Presence", "old_signature": "Presence makePresence(IPresence ipresence)" }, { "name": "eclipse$ecf", "new_args": "IPresence presence", "new_implementation": null, "new_return_type": "Presence", "new_signature": "Presence createPresenceFromIPresence(IPresence presence)", "old_args": "IPresence presence", "old_implementation": null, "old_return_type": "Presence", "old_signature": "Presence makePresenceFromIPresence(IPresence presence)" }, { "name": "eclipse$ecf", "new_args": "IPresence ipresence", "new_implementation": null, "new_return_type": "Presence.Mode", "new_signature": "Presence.Mode createPresenceMode(IPresence ipresence)", "old_args": "IPresence ipresence", "old_implementation": null, "old_return_type": "Presence.Mode", "old_signature": "Presence.Mode makePresenceMode(IPresence ipresence)" }, { "name": "eclipse$ecf", "new_args": "IPresence ipresence", "new_implementation": null, "new_return_type": "Presence.Type", "new_signature": "Presence.Type createPresenceType(IPresence ipresence)", "old_args": "IPresence ipresence", "old_implementation": null, "old_return_type": "Presence.Type", "old_signature": "Presence.Type makePresenceType(IPresence ipresence)" }, { "name": "eclipse$ecf", "new_args": "ID target,String className", "new_implementation": null, "new_return_type": "void", "new_signature": "void createProxyObject(ID target,String className)", "old_args": "ID target,String className", "old_implementation": null, "old_return_type": "void", "old_signature": "void makeProxyObject(ID target,String className)" }, { "name": "eclipse$ecf", "new_args": "ID fromID,SharedObjectDescription sd,ISharedObject obj", "new_implementation": null, "new_return_type": "SOConfig", "new_signature": "SOConfig createRemoteSharedObjectConfig(ID fromID,SharedObjectDescription sd,ISharedObject obj)", "old_args": "ID fromID,SharedObjectDescription sd,ISharedObject obj", "old_implementation": null, "old_return_type": "SOConfig", "old_signature": "SOConfig makeRemoteSharedObjectConfig(ID fromID,SharedObjectDescription sd,ISharedObject obj)" }, { "name": "eclipse$ecf", "new_args": "SOConfig soconfig,IQueueEnqueue queue", "new_implementation": null, "new_return_type": "SOContext", "new_signature": "SOContext createRemoteSharedObjectContext(SOConfig soconfig,IQueueEnqueue queue)", "old_args": "SOConfig soconfig,IQueueEnqueue queue", "old_implementation": null, "old_return_type": "SOContext", "old_signature": "SOContext makeRemoteSharedObjectContext(SOConfig soconfig,IQueueEnqueue queue)" }, { "name": "eclipse$ecf", "new_args": "ID fromID,SharedObjectDescription sd,ISharedObject s", "new_implementation": null, "new_return_type": "SOWrapper", "new_signature": "SOWrapper createRemoteSharedObjectWrapper(ID fromID,SharedObjectDescription sd,ISharedObject s)", "old_args": "ID fromID,SharedObjectDescription sd,ISharedObject s", "old_implementation": null, "old_return_type": "SOWrapper", "old_signature": "SOWrapper makeRemoteSharedObjectWrapper(ID fromID,SharedObjectDescription sd,ISharedObject s)" }, { "name": "eclipse$ecf", "new_args": "String from", "new_implementation": null, "new_return_type": "ID", "new_signature": "ID createRoomIDFromName(String from)", "old_args": "String from", "old_implementation": null, "old_return_type": "ID", "old_signature": "ID makeRoomIDFromName(String from)" }, { "name": "eclipse$ecf", "new_args": "RosterEntry entry", "new_implementation": null, "new_return_type": "IRosterEntry", "new_signature": "IRosterEntry createRosterEntry(RosterEntry entry)", "old_args": "RosterEntry entry", "old_implementation": null, "old_return_type": "IRosterEntry", "old_signature": "IRosterEntry makeRosterEntry(RosterEntry entry)" }, { "name": "eclipse$ecf", "new_args": "RosterPacket entry,m Ite", "new_implementation": null, "new_return_type": "IRosterEntry", "new_signature": "IRosterEntry createRosterEntry(RosterPacket entry,m Ite)", "old_args": "RosterPacket entry,m Ite", "old_implementation": null, "old_return_type": "IRosterEntry", "old_signature": "IRosterEntry makeRosterEntry(RosterPacket entry,m Ite)" }, { "name": "eclipse$ecf", "new_args": "RosterGroup grp", "new_implementation": null, "new_return_type": "IRosterGroup", "new_signature": "IRosterGroup createRosterGroup(RosterGroup grp)", "old_args": "RosterGroup grp", "old_implementation": null, "old_return_type": "IRosterGroup", "old_signature": "IRosterGroup makeRosterGroup(RosterGroup grp)" }, { "name": "eclipse$ecf", "new_args": "String grp", "new_implementation": null, "new_return_type": "IRosterGroup", "new_signature": "IRosterGroup createRosterGroup(String grp)", "old_args": "String grp", "old_implementation": null, "old_return_type": "IRosterGroup", "old_signature": "IRosterGroup makeRosterGroup(String grp)" }, { "name": "eclipse$ecf", "new_args": "String id,TCPServerSOContainerGroup group,String path,int keepAlive", "new_implementation": null, "new_return_type": "TCPServerSOContainer", "new_signature": "TCPServerSOContainer createServerContainer(String id,TCPServerSOContainerGroup group,String path,int keepAlive)", "old_args": "String id,TCPServerSOContainerGroup group,String path,int keepAlive", "old_implementation": null, "old_return_type": "TCPServerSOContainer", "old_signature": "TCPServerSOContainer makeServerContainer(String id,TCPServerSOContainerGroup group,String path,int keepAlive)" }, { "name": "eclipse$ecf", "new_args": "String id,TCPServerSOContainerGroup group,String path,int keepAlive", "new_implementation": null, "new_return_type": "TCPServerSOContainer", "new_signature": "TCPServerSOContainer createServerContainer(String id,TCPServerSOContainerGroup group,String path,int keepAlive)", "old_args": "String id,TCPServerSOContainerGroup group,String path,int keepAlive", "old_implementation": null, "old_return_type": "TCPServerSOContainer", "old_signature": "TCPServerSOContainer makeServerContainer(String id,TCPServerSOContainerGroup group,String path,int keepAlive)" }, { "name": "eclipse$ecf", "new_args": "String name,int port", "new_implementation": null, "new_return_type": "TCPServerSOContainerGroup", "new_signature": "TCPServerSOContainerGroup createServerGroup(String name,int port)", "old_args": "String name,int port", "old_implementation": null, "old_return_type": "TCPServerSOContainerGroup", "old_signature": "TCPServerSOContainerGroup makeServerGroup(String name,int port)" }, { "name": "eclipse$ecf", "new_args": "String name,int port", "new_implementation": null, "new_return_type": "TCPServerSOContainerGroup", "new_signature": "TCPServerSOContainerGroup createServerGroup(String name,int port)", "old_args": "String name,int port", "old_implementation": null, "old_return_type": "TCPServerSOContainerGroup", "old_signature": "TCPServerSOContainerGroup makeServerGroup(String name,int port)" }, { "name": "eclipse$ecf", "new_args": "String type,String name", "new_implementation": null, "new_return_type": "ServiceID", "new_signature": "ServiceID createServiceID(String type,String name)", "old_args": "String type,String name", "old_implementation": null, "old_return_type": "ServiceID", "old_signature": "ServiceID makeServiceID(String type,String name)" }, { "name": "eclipse$ecf", "new_args": "IServiceInfo serviceInfo", "new_implementation": null, "new_return_type": "ServiceInfo", "new_signature": "ServiceInfo createServiceInfoFromIServiceInfo(IServiceInfo serviceInfo)", "old_args": "IServiceInfo serviceInfo", "old_implementation": null, "old_return_type": "ServiceInfo", "old_signature": "ServiceInfo makeServiceInfoFromIServiceInfo(IServiceInfo serviceInfo)" }, { "name": "eclipse$ecf", "new_args": "SharedObjectDescription sd,ISharedObject obj", "new_implementation": null, "new_return_type": "SOConfig", "new_signature": "SOConfig createSharedObjectConfig(SharedObjectDescription sd,ISharedObject obj)", "old_args": "SharedObjectDescription sd,ISharedObject obj", "old_implementation": null, "old_return_type": "SOConfig", "old_signature": "SOConfig makeSharedObjectConfig(SharedObjectDescription sd,ISharedObject obj)" }, { "name": "eclipse$ecf", "new_args": "SOConfig soconfig,IQueueEnqueue queue", "new_implementation": null, "new_return_type": "SOContext", "new_signature": "SOContext createSharedObjectContext(SOConfig soconfig,IQueueEnqueue queue)", "old_args": "SOConfig soconfig,IQueueEnqueue queue", "old_implementation": null, "old_return_type": "SOContext", "old_signature": "SOContext makeSharedObjectContext(SOConfig soconfig,IQueueEnqueue queue)" }, { "name": "eclipse$ecf", "new_args": "SOConfig soconfig,IQueueEnqueue queue", "new_implementation": null, "new_return_type": "SOContext", "new_signature": "SOContext createSharedObjectContext(SOConfig soconfig,IQueueEnqueue queue)", "old_args": "SOConfig soconfig,IQueueEnqueue queue", "old_implementation": null, "old_return_type": "SOContext", "old_signature": "SOContext makeSharedObjectContext(SOConfig soconfig,IQueueEnqueue queue)" }, { "name": "eclipse$ecf", "new_args": "SOConfig soconfig,IQueueEnqueue queue", "new_implementation": null, "new_return_type": "SOContext", "new_signature": "SOContext createSharedObjectContext(SOConfig soconfig,IQueueEnqueue queue)", "old_args": "SOConfig soconfig,IQueueEnqueue queue", "old_implementation": null, "old_return_type": "SOContext", "old_signature": "SOContext makeSharedObjectContext(SOConfig soconfig,IQueueEnqueue queue)" }, { "name": "eclipse$ecf", "new_args": "Class newClass,Class argTypes,Object args", "new_implementation": null, "new_return_type": "ISharedObject", "new_signature": "ISharedObject createSharedObjectInstance(Class newClass,Class argTypes,Object args)", "old_args": "Class newClass,Class argTypes,Object args", "old_implementation": null, "old_return_type": "ISharedObject", "old_signature": "ISharedObject makeSharedObjectInstance(Class newClass,Class argTypes,Object args)" }, { "name": "eclipse$ecf", "new_args": "SharedObjectDescription sd,ISharedObject s", "new_implementation": null, "new_return_type": "SOWrapper", "new_signature": "SOWrapper createSharedObjectWrapper(SharedObjectDescription sd,ISharedObject s)", "old_args": "SharedObjectDescription sd,ISharedObject s", "old_implementation": null, "old_return_type": "SOWrapper", "old_signature": "SOWrapper makeSharedObjectWrapper(SharedObjectDescription sd,ISharedObject s)" }, { "name": "eclipse$ecf", "new_args": "String name", "new_implementation": null, "new_return_type": "ID", "new_signature": "ID createUserIDFromName(String name)", "old_args": "String name", "old_implementation": null, "old_return_type": "ID", "old_signature": "ID makeUserIDFromName(String name)" }, { "name": "eclipse$ecf", "new_args": "TreeParent node,Vector ht", "new_implementation": null, "new_return_type": "TreeParent", "new_signature": "TreeParent createUserNode(TreeParent node,Vector ht)", "old_args": "TreeParent node,Vector ht", "old_implementation": null, "old_return_type": "TreeParent", "old_signature": "TreeParent makeUserNode(TreeParent node,Vector ht)" }, { "name": "eclipse$ecf", "new_args": "User ud", "new_implementation": null, "new_return_type": "TreeUser", "new_signature": "TreeUser createUserNode(User ud)", "old_args": "User ud", "old_implementation": null, "old_return_type": "TreeUser", "old_signature": "TreeUser makeUserNode(User ud)" }, { "name": "eclipse$ecf", "new_args": "LineChatHandler lch,String name,String initText,String downloaddir", "new_implementation": null, "new_return_type": "LineChatClientView", "new_signature": "LineChatClientView createClientView(LineChatHandler lch,String name,String initText,String downloaddir)", "old_args": "LineChatHandler lch,String name,String initText,String downloaddir", "old_implementation": null, "old_return_type": "LineChatClientView", "old_signature": "LineChatClientView makeClientView(LineChatHandler lch,String name,String initText,String downloaddir)" }, { "name": "eclipse$ecf", "new_args": "ContainerDescription desc,String argTypes,Object args", "new_implementation": null, "new_return_type": "IContainer", "new_signature": "IContainer createContainer(ContainerDescription desc,String argTypes,Object args)", "old_args": "ContainerDescription desc,String argTypes,Object args", "old_implementation": null, "old_return_type": "IContainer", "old_signature": "IContainer makeContainer(ContainerDescription desc,String argTypes,Object args)" }, { "name": "eclipse$ecf", "new_args": "String descriptionName", "new_implementation": null, "new_return_type": "IContainer", "new_signature": "IContainer createContainer(String descriptionName)", "old_args": "String descriptionName", "old_implementation": null, "old_return_type": "IContainer", "old_signature": "IContainer makeContainer(String descriptionName)" }, { "name": "eclipse$ecf", "new_args": "String descriptionName,Object args", "new_implementation": null, "new_return_type": "IContainer", "new_signature": "IContainer createContainer(String descriptionName,Object args)", "old_args": "String descriptionName,Object args", "old_implementation": null, "old_return_type": "IContainer", "old_signature": "IContainer makeContainer(String descriptionName,Object args)" }, { "name": "eclipse$ecf", "new_args": "String descriptionName,String argsTypes,Object args", "new_implementation": null, "new_return_type": "IContainer", "new_signature": "IContainer createContainer(String descriptionName,String argsTypes,Object args)", "old_args": "String descriptionName,String argsTypes,Object args", "old_implementation": null, "old_return_type": "IContainer", "old_signature": "IContainer makeContainer(String descriptionName,String argsTypes,Object args)" }, { "name": "eclipse$ecf", "new_args": "", "new_implementation": null, "new_return_type": "ID", "new_signature": "ID createGUID()", "old_args": "", "old_implementation": null, "old_return_type": "ID", "old_signature": "ID makeGUID()" }, { "name": "eclipse$ecf", "new_args": "int length", "new_implementation": null, "new_return_type": "ID", "new_signature": "ID createGUID(int length)", "old_args": "int length", "old_implementation": null, "old_return_type": "ID", "old_signature": "ID makeGUID(int length)" }, { "name": "eclipse$ecf", "new_args": "Namespace n,String argTypes,Object args", "new_implementation": null, "new_return_type": "ID", "new_signature": "ID createID(Namespace n,String argTypes,Object args)", "old_args": "Namespace n,String argTypes,Object args", "old_implementation": null, "old_return_type": "ID", "old_signature": "ID makeID(Namespace n,String argTypes,Object args)" }, { "name": "eclipse$ecf", "new_args": "String namespacename,String argTypes,Object args", "new_implementation": null, "new_return_type": "ID", "new_signature": "ID createID(String namespacename,String argTypes,Object args)", "old_args": "String namespacename,String argTypes,Object args", "old_implementation": null, "old_return_type": "ID", "old_signature": "ID makeID(String namespacename,String argTypes,Object args)" }, { "name": "eclipse$ecf", "new_args": "String namespacename,Object args", "new_implementation": null, "new_return_type": "ID", "new_signature": "ID createID(String namespacename,Object args)", "old_args": "String namespacename,Object args", "old_implementation": null, "old_return_type": "ID", "old_signature": "ID makeID(String namespacename,Object args)" }, { "name": "eclipse$ecf", "new_args": "String namespacename,URI uri", "new_implementation": null, "new_return_type": "ID", "new_signature": "ID createID(String namespacename,URI uri)", "old_args": "String namespacename,URI uri", "old_implementation": null, "old_return_type": "ID", "old_signature": "ID makeID(String namespacename,URI uri)" }, { "name": "eclipse$ecf", "new_args": "Class argTypes,Object args", "new_implementation": null, "new_return_type": "ID", "new_signature": "ID createInstance(Class argTypes,Object args)", "old_args": "Class argTypes,Object args", "old_implementation": null, "old_return_type": "ID", "old_signature": "ID makeInstance(Class argTypes,Object args)" }, { "name": "eclipse$ecf", "new_args": "Class argTypes,Object args", "new_implementation": null, "new_return_type": "ID", "new_signature": "ID createInstance(Class argTypes,Object args)", "old_args": "Class argTypes,Object args", "old_implementation": null, "old_return_type": "ID", "old_signature": "ID makeInstance(Class argTypes,Object args)" }, { "name": "eclipse$ecf", "new_args": "Class argTypes,Object args", "new_implementation": null, "new_return_type": "ID", "new_signature": "ID createInstance(Class argTypes,Object args)", "old_args": "Class argTypes,Object args", "old_implementation": null, "old_return_type": "ID", "old_signature": "ID makeInstance(Class argTypes,Object args)" }, { "name": "eclipse$ecf", "new_args": "Class argTypes,Object args", "new_implementation": null, "new_return_type": "ID", "new_signature": "ID createInstance(Class argTypes,Object args)", "old_args": "Class argTypes,Object args", "old_implementation": null, "old_return_type": "ID", "old_signature": "ID makeInstance(Class argTypes,Object args)" }, { "name": "eclipse$ecf", "new_args": "Class argTypes,Object args", "new_implementation": null, "new_return_type": "ID", "new_signature": "ID createInstance(Class argTypes,Object args)", "old_args": "Class argTypes,Object args", "old_implementation": null, "old_return_type": "ID", "old_signature": "ID makeInstance(Class argTypes,Object args)" }, { "name": "eclipse$ecf", "new_args": "Class argTypes,Object args", "new_implementation": null, "new_return_type": "ID", "new_signature": "ID createInstance(Class argTypes,Object args)", "old_args": "Class argTypes,Object args", "old_implementation": null, "old_return_type": "ID", "old_signature": "ID makeInstance(Class argTypes,Object args)" }, { "name": "eclipse$ecf", "new_args": "Class argTypes,Object args", "new_implementation": null, "new_return_type": "ID", "new_signature": "ID createInstance(Class argTypes,Object args)", "old_args": "Class argTypes,Object args", "old_implementation": null, "old_return_type": "ID", "old_signature": "ID makeInstance(Class argTypes,Object args)" }, { "name": "eclipse$ecf", "new_args": "ConnectionDescription description,ISynchAsynchConnectionEventHandler handler,Class clazzes,Object args", "new_implementation": null, "new_return_type": "ISynchAsynchConnection", "new_signature": "ISynchAsynchConnection createInstance(ConnectionDescription description,ISynchAsynchConnectionEventHandler handler,Class clazzes,Object args)", "old_args": "ConnectionDescription description,ISynchAsynchConnectionEventHandler handler,Class clazzes,Object args", "old_implementation": null, "old_return_type": "ISynchAsynchConnection", "old_signature": "ISynchAsynchConnection makeInstance(ConnectionDescription description,ISynchAsynchConnectionEventHandler handler,Class clazzes,Object args)" }, { "name": "eclipse$ecf", "new_args": "ContainerDescription description,Class argTypes,Object args", "new_implementation": null, "new_return_type": "IContainer", "new_signature": "IContainer createInstance(ContainerDescription description,Class argTypes,Object args)", "old_args": "ContainerDescription description,Class argTypes,Object args", "old_implementation": null, "old_return_type": "IContainer", "old_signature": "IContainer makeInstance(ContainerDescription description,Class argTypes,Object args)" }, { "name": "eclipse$ecf", "new_args": "ContainerDescription description,Class argTypes,Object args", "new_implementation": null, "new_return_type": "IContainer", "new_signature": "IContainer createInstance(ContainerDescription description,Class argTypes,Object args)", "old_args": "ContainerDescription description,Class argTypes,Object args", "old_implementation": null, "old_return_type": "IContainer", "old_signature": "IContainer makeInstance(ContainerDescription description,Class argTypes,Object args)" }, { "name": "eclipse$ecf", "new_args": "ContainerDescription description,Class argTypes,Object args", "new_implementation": null, "new_return_type": "IContainer", "new_signature": "IContainer createInstance(ContainerDescription description,Class argTypes,Object args)", "old_args": "ContainerDescription description,Class argTypes,Object args", "old_implementation": null, "old_return_type": "IContainer", "old_signature": "IContainer makeInstance(ContainerDescription description,Class argTypes,Object args)" }, { "name": "eclipse$ecf", "new_args": "ContainerDescription description,Class argTypes,Object args", "new_implementation": null, "new_return_type": "IContainer", "new_signature": "IContainer createInstance(ContainerDescription description,Class argTypes,Object args)", "old_args": "ContainerDescription description,Class argTypes,Object args", "old_implementation": null, "old_return_type": "IContainer", "old_signature": "IContainer makeInstance(ContainerDescription description,Class argTypes,Object args)" }, { "name": "eclipse$ecf", "new_args": "ID from,ID to,long seq,Serializable data", "new_implementation": null, "new_return_type": "ContainerMessage", "new_signature": "ContainerMessage createJoinGroupMessage(ID from,ID to,long seq,Serializable data)", "old_args": "ID from,ID to,long seq,Serializable data", "old_implementation": null, "old_return_type": "ContainerMessage", "old_signature": "ContainerMessage makeJoinGroupMessage(ID from,ID to,long seq,Serializable data)" }, { "name": "eclipse$ecf", "new_args": "ID from,ID to,long seq,Serializable data", "new_implementation": null, "new_return_type": "ContainerMessage", "new_signature": "ContainerMessage createLeaveGroupMessage(ID from,ID to,long seq,Serializable data)", "old_args": "ID from,ID to,long seq,Serializable data", "old_implementation": null, "old_return_type": "ContainerMessage", "old_signature": "ContainerMessage makeLeaveGroupMessage(ID from,ID to,long seq,Serializable data)" }, { "name": "eclipse$ecf", "new_args": "Long l", "new_implementation": null, "new_return_type": "ID", "new_signature": "ID createLongID(Long l)", "old_args": "Long l", "old_implementation": null, "old_return_type": "ID", "old_signature": "ID makeLongID(Long l)" }, { "name": "eclipse$ecf", "new_args": "String className,String methodName,Object param", "new_implementation": null, "new_return_type": "SharedObjectMsg", "new_signature": "SharedObjectMsg createMsg(String className,String methodName,Object param)", "old_args": "String className,String methodName,Object param", "old_implementation": null, "old_return_type": "SharedObjectMsg", "old_signature": "SharedObjectMsg makeMsg(String className,String methodName,Object param)" }, { "name": "eclipse$ecf", "new_args": "String className,String methodName,Object param", "new_implementation": null, "new_return_type": "SharedObjectMsg", "new_signature": "SharedObjectMsg createMsg(String className,String methodName,Object param)", "old_args": "String className,String methodName,Object param", "old_implementation": null, "old_return_type": "SharedObjectMsg", "old_signature": "SharedObjectMsg makeMsg(String className,String methodName,Object param)" }, { "name": "eclipse$ecf", "new_args": "ID target,String className,Map map", "new_implementation": null, "new_return_type": "ID", "new_signature": "ID createObject(ID target,String className,Map map)", "old_args": "ID target,String className,Map map", "old_implementation": null, "old_return_type": "ID", "old_signature": "ID makeObject(ID target,String className,Map map)" }, { "name": "eclipse$ecf", "new_args": "String password", "new_implementation": null, "new_return_type": "IConnectContext", "new_signature": "IConnectContext createPasswordConnectContext(String password)", "old_args": "String password", "old_implementation": null, "old_return_type": "IConnectContext", "old_signature": "IConnectContext makePasswordConnectContext(String password)" }, { "name": "eclipse$ecf", "new_args": "ID target,String proxyClass,String name", "new_implementation": null, "new_return_type": "void", "new_signature": "void createProxyObject(ID target,String proxyClass,String name)", "old_args": "ID target,String proxyClass,String name", "old_implementation": null, "old_return_type": "void", "old_signature": "void makeProxyObject(ID target,String proxyClass,String name)" }, { "name": "eclipse$ecf", "new_args": "String descriptionName", "new_implementation": null, "new_return_type": "ISharedObjectContainer", "new_signature": "ISharedObjectContainer createSharedObjectContainer(String descriptionName)", "old_args": "ContainerDescription desc,String argTypes,Object args", "old_implementation": null, "old_return_type": "ISharedObjectContainer", "old_signature": "ISharedObjectContainer makeSharedObjectContainer(ContainerDescription desc,String argTypes,Object args)" }, { "name": "eclipse$ecf", "new_args": "String descriptionName,Object args", "new_implementation": null, "new_return_type": "ISharedObjectContainer", "new_signature": "ISharedObjectContainer createSharedObjectContainer(String descriptionName,Object args)", "old_args": "String descriptionName,Object args", "old_implementation": null, "old_return_type": "ISharedObjectContainer", "old_signature": "ISharedObjectContainer makeSharedObjectContainer(String descriptionName,Object args)" }, { "name": "eclipse$ecf", "new_args": "String descriptionName,String argsTypes,Object args", "new_implementation": null, "new_return_type": "ISharedObjectContainer", "new_signature": "ISharedObjectContainer createSharedObjectContainer(String descriptionName,String argsTypes,Object args)", "old_args": "String descriptionName,String argsTypes,Object args", "old_implementation": null, "old_return_type": "ISharedObjectContainer", "old_signature": "ISharedObjectContainer makeSharedObjectContainer(String descriptionName,String argsTypes,Object args)" }, { "name": "eclipse$ecf", "new_args": "ID from,ID to,long seq,Serializable data", "new_implementation": null, "new_return_type": "ContainerMessage", "new_signature": "ContainerMessage createSharedObjectCreateMessage(ID from,ID to,long seq,Serializable data)", "old_args": "ID from,ID to,long seq,Serializable data", "old_implementation": null, "old_return_type": "ContainerMessage", "old_signature": "ContainerMessage makeSharedObjectCreateMessage(ID from,ID to,long seq,Serializable data)" }, { "name": "eclipse$ecf", "new_args": "ID from,ID to,long contSeq,ID soID,Throwable e,long sequence", "new_implementation": null, "new_return_type": "ContainerMessage", "new_signature": "ContainerMessage createSharedObjectCreateResponseMessage(ID from,ID to,long contSeq,ID soID,Throwable e,long sequence)", "old_args": "ID from,ID to,long contSeq,ID soID,Throwable e,long sequence", "old_implementation": null, "old_return_type": "ContainerMessage", "old_signature": "ContainerMessage makeSharedObjectCreateResponseMessage(ID from,ID to,long contSeq,ID soID,Throwable e,long sequence)" }, { "name": "eclipse$ecf", "new_args": "ID from,ID to,long seq,ID sharedObjectID", "new_implementation": null, "new_return_type": "ContainerMessage", "new_signature": "ContainerMessage createSharedObjectDisposeMessage(ID from,ID to,long seq,ID sharedObjectID)", "old_args": "ID from,ID to,long seq,ID sharedObjectID", "old_implementation": null, "old_return_type": "ContainerMessage", "old_signature": "ContainerMessage makeSharedObjectDisposeMessage(ID from,ID to,long seq,ID sharedObjectID)" }, { "name": "eclipse$ecf", "new_args": "ID from,ID to,long seq,ID fromSharedObject,Serializable data", "new_implementation": null, "new_return_type": "ContainerMessage", "new_signature": "ContainerMessage createSharedObjectMessage(ID from,ID to,long seq,ID fromSharedObject,Serializable data)", "old_args": "ID from,ID to,long seq,ID fromSharedObject,Serializable data", "old_implementation": null, "old_return_type": "ContainerMessage", "old_signature": "ContainerMessage makeSharedObjectMessage(ID from,ID to,long seq,ID fromSharedObject,Serializable data)" }, { "name": "eclipse$ecf", "new_args": "String idstring", "new_implementation": null, "new_return_type": "ID", "new_signature": "ID createStringID(String idstring)", "old_args": "String idstring", "old_implementation": null, "old_return_type": "ID", "old_signature": "ID makeStringID(String idstring)" }, { "name": "eclipse$ecf", "new_args": "ISynchAsynchConnectionEventHandler handler,String descriptionName", "new_implementation": null, "new_return_type": "ISynchAsynchConnection", "new_signature": "ISynchAsynchConnection createSynchAsynchConnection(ISynchAsynchConnectionEventHandler handler,String descriptionName)", "old_args": "ISynchAsynchConnectionEventHandler handler,ConnectionDescription desc,String argTypes,Object args", "old_implementation": null, "old_return_type": "ISynchAsynchConnection", "old_signature": "ISynchAsynchConnection makeSynchAsynchConnection(ISynchAsynchConnectionEventHandler handler,ConnectionDescription desc,String argTypes,Object args)" }, { "name": "eclipse$ecf", "new_args": "ISynchAsynchConnectionEventHandler handler,ConnectionDescription desc,Object args", "new_implementation": null, "new_return_type": "ISynchAsynchConnection", "new_signature": "ISynchAsynchConnection createSynchAsynchConnection(ISynchAsynchConnectionEventHandler handler,ConnectionDescription desc,Object args)", "old_args": "ISynchAsynchConnectionEventHandler handler,ConnectionDescription desc,Object args", "old_implementation": null, "old_return_type": "ISynchAsynchConnection", "old_signature": "ISynchAsynchConnection makeSynchAsynchConnection(ISynchAsynchConnectionEventHandler handler,ConnectionDescription desc,Object args)" }, { "name": "eclipse$ecf", "new_args": "ISynchAsynchConnectionEventHandler handler,String descriptionName,Object args", "new_implementation": null, "new_return_type": "ISynchAsynchConnection", "new_signature": "ISynchAsynchConnection createSynchAsynchConnection(ISynchAsynchConnectionEventHandler handler,String descriptionName,Object args)", "old_args": "ISynchAsynchConnectionEventHandler handler,String descriptionName", "old_implementation": null, "old_return_type": "ISynchAsynchConnection", "old_signature": "ISynchAsynchConnection makeSynchAsynchConnection(ISynchAsynchConnectionEventHandler handler,String descriptionName)" }, { "name": "eclipse$ecf", "new_args": "ISynchAsynchConnectionEventHandler handler,String descriptionName,String argTypes,Object args", "new_implementation": null, "new_return_type": "ISynchAsynchConnection", "new_signature": "ISynchAsynchConnection createSynchAsynchConnection(ISynchAsynchConnectionEventHandler handler,String descriptionName,String argTypes,Object args)", "old_args": "ISynchAsynchConnectionEventHandler handler,String descriptionName,Object args", "old_implementation": null, "old_return_type": "ISynchAsynchConnection", "old_signature": "ISynchAsynchConnection makeSynchAsynchConnection(ISynchAsynchConnectionEventHandler handler,String descriptionName,Object args)" }, { "name": "eclipse$ecf", "new_args": "String username,Object password", "new_implementation": null, "new_return_type": "IConnectContext", "new_signature": "IConnectContext createUsernamePasswordConnectContext(String username,Object password)", "old_args": "String username,Object password", "old_implementation": null, "old_return_type": "IConnectContext", "old_signature": "IConnectContext makeUsernamePasswordConnectContext(String username,Object password)" }, { "name": "eclipse$ecf", "new_args": "ID from,ID to,long seq,ID ids,boolean add,Serializable data", "new_implementation": null, "new_return_type": "ContainerMessage", "new_signature": "ContainerMessage createViewChangeMessage(ID from,ID to,long seq,ID ids,boolean add,Serializable data)", "old_args": "ID from,ID to,long seq,ID ids,boolean add,Serializable data", "old_implementation": null, "old_return_type": "ContainerMessage", "old_signature": "ContainerMessage makeViewChangeMessage(ID from,ID to,long seq,ID ids,boolean add,Serializable data)" } ]
[ { "additions": 1, "blob_url": "https://github.com/eclipse/ecf/blob/0d00787f0d8de19464aaac7bc951d9817fd7c518/doc%2Fbundles%2Forg.eclipse.ecf.doc%2Fhtml%2Fconcepts%2Fcontainer.html", "changes": 2, "contents_url": "https://api.github.com/repos/eclipse/ecf/contents/doc%2Fbundles%2Forg.eclipse.ecf.doc%2Fhtml%2Fconcepts%2Fcontainer.html?ref=0d00787f0d8de19464aaac7bc951d9817fd7c518", "deletions": 1, "filename": "doc/bundles/org.eclipse.ecf.doc/html/concepts/container.html", "new_code": "SharedObjectContainerFactory.getDefault().createSharedObjectContainer() </li>", "new_methods": [], "old_code": "SharedObjectContainerFactory.getDefault().makeSharedObjectContainer() </li>", "old_methods": [], "patch": "@@ -27,7 +27,7 @@ <h2>SharedObjectContainer Lifecycle - DRAFT</h2>\n The lifecycle of a ISharedObjectContainer is typically as follows:\n <ol>\n <li>An ISharedObjectContainer instance is created via\n-SharedObjectContainerFactory.getDefault().makeSharedObjectContainer() </li>\n+SharedObjectContainerFactory.getDefault().createSharedObjectContainer() </li>\n <li>ISharedObjects are created and added to the\n ISharedObjectContainer </li>\n <li>The ISharedObjectContainer 'joins/connects' with a remote", "raw_url": "https://github.com/eclipse/ecf/raw/0d00787f0d8de19464aaac7bc951d9817fd7c518/doc%2Fbundles%2Forg.eclipse.ecf.doc%2Fhtml%2Fconcepts%2Fcontainer.html", "sha": "12308ff300d1522945c8b6fc00e92b5bdc89b63a", "status": "modified" }, { "additions": 3, "blob_url": "https://github.com/eclipse/ecf/blob/0d00787f0d8de19464aaac7bc951d9817fd7c518/doc%2Fbundles%2Forg.eclipse.ecf.doc%2Fhtml%2Fconcepts%2Fintro.html", "changes": 6, "contents_url": "https://api.github.com/repos/eclipse/ecf/contents/doc%2Fbundles%2Forg.eclipse.ecf.doc%2Fhtml%2Fconcepts%2Fintro.html?ref=0d00787f0d8de19464aaac7bc951d9817fd7c518", "deletions": 3, "filename": "doc/bundles/org.eclipse.ecf.doc/html/concepts/intro.html", "new_code": " IContainer container = ContainerFactory.getDefault().createContainer(\"containertype\");\n IContainer cont = ContainerFactory.getDefault().createContainer(\"ecf.generic.client\");\n ID targetID = IDFactory.getDefault().createID(cont.getConnectNamespace(),\"ecftcp://ecf1.osuosl.org:3282/server\");", "new_methods": [], "old_code": " IContainer container = ContainerFactory.getDefault().makeContainer(\"containertype\");\n IContainer cont = ContainerFactory.getDefault().makeContainer(\"ecf.generic.client\");\n ID targetID = IDFactory.getDefault().makeID(cont.getConnectNamespace(),\"ecftcp://ecf1.osuosl.org:3282/server\");", "old_methods": [], "patch": "@@ -19,7 +19,7 @@ <h3><a name=\"Instance Creation\"></a>Instance Creation</h3>\n Container instance creation is done via ECF-provided factory APIs. For example, here's code to create \n and IContainer instance:\n <pre>\n- IContainer container = ContainerFactory.getDefault().makeContainer(\"containertype\");\n+ IContainer container = ContainerFactory.getDefault().createContainer(\"containertype\");\n </pre>\n Once constructed, <a href=\"http://www.eclipse.org/ecf/org.eclipse.ecf.docs/api/org/eclipse/ecf/core/IContainer.html\">IContainer</a> instances may be used in the manner appropriate for the given application. When\n no longer required the <a href=\"http://www.eclipse.org/ecf/org.eclipse.ecf.docs/api/org/eclipse/ecf/core/IContainer.html#dispose()\">IContainer.dispose()</a> method should be called to release any resources associated with\n@@ -41,9 +41,9 @@ <h3><a name=\"Example Connection Code\"></a>Example Container Creation and Connect\n Here's an example code snippet that shows the creation and connection of an ECF container:\n <pre>\n // make container instance\n- IContainer cont = ContainerFactory.getDefault().makeContainer(\"ecf.generic.client\");\n+ IContainer cont = ContainerFactory.getDefault().createContainer(\"ecf.generic.client\");\n // make targetID\n- ID targetID = IDFactory.getDefault().makeID(cont.getConnectNamespace(),\"ecftcp://ecf1.osuosl.org:3282/server\");\n+ ID targetID = IDFactory.getDefault().createID(cont.getConnectNamespace(),\"ecftcp://ecf1.osuosl.org:3282/server\");\n // then connect to targetID\n cont.connect(targetID,null);\n </pre> ", "raw_url": "https://github.com/eclipse/ecf/raw/0d00787f0d8de19464aaac7bc951d9817fd7c518/doc%2Fbundles%2Forg.eclipse.ecf.doc%2Fhtml%2Fconcepts%2Fintro.html", "sha": "dd5abedbc5332966c4dd52f8824d1f69744100e2", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/eclipse/ecf/blob/0d00787f0d8de19464aaac7bc951d9817fd7c518/doc%2Fbundles%2Forg.eclipse.ecf.doc%2Fhtml%2Fconcepts%2Fsharedobject.html", "changes": 2, "contents_url": "https://api.github.com/repos/eclipse/ecf/contents/doc%2Fbundles%2Forg.eclipse.ecf.doc%2Fhtml%2Fconcepts%2Fsharedobject.html?ref=0d00787f0d8de19464aaac7bc951d9817fd7c518", "deletions": 1, "filename": "doc/bundles/org.eclipse.ecf.doc/html/concepts/sharedobject.html", "new_code": "<pre>ISharedObjectContainer container = SharedObjectContainerFactory.getDefault().createSharedObjectContainer('standalone');<br>ID newID = IDFactory.createStringID('foo');<br>SharedObjectDescription sd = new SharedObjectDescription(newID,TestSharedObject.class);<br>container.getSharedObjectManager().createSharedObject(sd,null);<br></pre>", "new_methods": [], "old_code": "<pre>ISharedObjectContainer container = SharedObjectContainerFactory.getDefault().makeSharedObjectContainer('standalone');<br>ID newID = IDFactory.makeStringID('foo');<br>SharedObjectDescription sd = new SharedObjectDescription(newID,TestSharedObject.class);<br>container.getSharedObjectManager().createSharedObject(sd,null);<br></pre>", "old_methods": [], "patch": "@@ -77,7 +77,7 @@ <h4>ISharedObject removal from a container</h4>\n <h4>Example Creation Code</h4>\n Here is a code snippet that creates a container and adds a single\n shared object to that container:\n-<pre>ISharedObjectContainer container = SharedObjectContainerFactory.getDefault().makeSharedObjectContainer('standalone');<br>ID newID = IDFactory.makeStringID('foo');<br>SharedObjectDescription sd = new SharedObjectDescription(newID,TestSharedObject.class);<br>container.getSharedObjectManager().createSharedObject(sd,null);<br></pre>\n+<pre>ISharedObjectContainer container = SharedObjectContainerFactory.getDefault().createSharedObjectContainer('standalone');<br>ID newID = IDFactory.createStringID('foo');<br>SharedObjectDescription sd = new SharedObjectDescription(newID,TestSharedObject.class);<br>container.getSharedObjectManager().createSharedObject(sd,null);<br></pre>\n Note this creates and adds to the container a ISharedObject instance of\n class \"TestSharedObject\". The TestSharedObject\n null constructor is called, followed by a call to", "raw_url": "https://github.com/eclipse/ecf/raw/0d00787f0d8de19464aaac7bc951d9817fd7c518/doc%2Fbundles%2Forg.eclipse.ecf.doc%2Fhtml%2Fconcepts%2Fsharedobject.html", "sha": "3b515666ce49a44eaa99d66e3abf600a856a67f5", "status": "modified" }, { "additions": 4, "blob_url": "https://github.com/eclipse/ecf/blob/0d00787f0d8de19464aaac7bc951d9817fd7c518/doc%2Fbundles%2Forg.eclipse.ecf.doc%2Fhtml%2Fgettingstarted%2Fhelloworld.html", "changes": 8, "contents_url": "https://api.github.com/repos/eclipse/ecf/contents/doc%2Fbundles%2Forg.eclipse.ecf.doc%2Fhtml%2Fgettingstarted%2Fhelloworld.html?ref=0d00787f0d8de19464aaac7bc951d9817fd7c518", "deletions": 4, "filename": "doc/bundles/org.eclipse.ecf.doc/html/gettingstarted/helloworld.html", "new_code": " client.createAndConnect(IDFactory.createStringID(\"ecftcp://localhost:3282/server\"));\n container = SharedObjectContainerFactory.getDefault().createSharedObjectContainer(DEFAULT_CONTAINER_TYPE);\n ID sharedObjectID = IDFactory.createStringID(SHARED_OBJECT_ID);\n\t\t\t<li>An ID to represent the group of contained object.<pre>client.createAndConnect(IDFactory.createStringID(\"ecftcp://localhost:3282/server\"));</pre>", "new_methods": [], "old_code": " client.createAndConnect(IDFactory.makeStringID(\"ecftcp://localhost:3282/server\"));\n container = SharedObjectContainerFactory.getDefault().makeSharedObjectContainer(DEFAULT_CONTAINER_TYPE);\n ID sharedObjectID = IDFactory.makeStringID(SHARED_OBJECT_ID);\n\t\t\t<li>An ID to represent the group of contained object.<pre>client.createAndConnect(IDFactory.makeStringID(\"ecftcp://localhost:3282/server\"));</pre>", "old_methods": [], "patch": "@@ -13,7 +13,7 @@ <h3>The Plugin Perspective</h3>\n \tthat will trigger the instantiation of our Hello World client class:<br><pre>public void run(IAction action) {\n HelloClient client = new HelloClient();\n try {\n- client.createAndConnect(IDFactory.makeStringID(\"ecftcp://localhost:3282/server\"));\n+ client.createAndConnect(IDFactory.createStringID(\"ecftcp://localhost:3282/server\"));\n } catch (Exception e) {\n e.printStackTrace();\n }\n@@ -33,9 +33,9 @@ <h3>The ECF Perspective</h3>\n ISharedObjectContainer container = null;\n try {\n // Create container instance via ECF container factory\n- container = SharedObjectContainerFactory.getDefault().makeSharedObjectContainer(DEFAULT_CONTAINER_TYPE);\n+ container = SharedObjectContainerFactory.getDefault().createSharedObjectContainer(DEFAULT_CONTAINER_TYPE);\n // Create ID for shared object\n- ID sharedObjectID = IDFactory.makeStringID(SHARED_OBJECT_ID);\n+ ID sharedObjectID = IDFactory.createStringID(SHARED_OBJECT_ID);\n // Create actual shared object\n ISharedObject sharedObject = new HelloSharedObject();\n // Add shared object to container\n@@ -51,7 +51,7 @@ <h3>The ECF Perspective</h3>\n \tWorld example to be able to join a shared container, an instance of <code>org.eclipse.ecf.provider.app.ServerApplication</code> in the \n \t\t<code>org.eclipse.ecf.example.collab</code> needs to be running on the same machine. The configuration information we are passing to the HelloClient is the following:\n \t\t<ol>\n-\t\t\t<li>An ID to represent the group of contained object.<pre>client.createAndConnect(IDFactory.makeStringID(\"ecftcp://localhost:3282/server\"));</pre>\n+\t\t\t<li>An ID to represent the group of contained object.<pre>client.createAndConnect(IDFactory.createStringID(\"ecftcp://localhost:3282/server\"));</pre>\n \t\t\t\t<ul><li>This ID is passed into HelloClient.createAndConnect(). \n \t\t\t\tThis ID is shared among all instances of our application that communicate with each other.</li><li>You may notice a URI-style protocol descriptor in our example. \n \t\t\t\tThis tells the shared container what protocol to use when adding instances of SharedObjects to the container.</li></ul>", "raw_url": "https://github.com/eclipse/ecf/raw/0d00787f0d8de19464aaac7bc951d9817fd7c518/doc%2Fbundles%2Forg.eclipse.ecf.doc%2Fhtml%2Fgettingstarted%2Fhelloworld.html", "sha": "bf84e9416c59790a3f50ecb175d09cbfce76b295", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/eclipse/ecf/blob/0d00787f0d8de19464aaac7bc951d9817fd7c518/examples%2Fbundles%2Forg.eclipse.ecf.example.clients%2Fsrc%2Forg%2Feclipse%2Fecf%2Fexample%2Fclients%2FSOClient.java", "changes": 2, "contents_url": "https://api.github.com/repos/eclipse/ecf/contents/examples%2Fbundles%2Forg.eclipse.ecf.example.clients%2Fsrc%2Forg%2Feclipse%2Fecf%2Fexample%2Fclients%2FSOClient.java?ref=0d00787f0d8de19464aaac7bc951d9817fd7c518", "deletions": 1, "filename": "examples/bundles/org.eclipse.ecf.example.clients/src/org/eclipse/ecf/example/clients/SOClient.java", "new_code": "\t\tcontainer = ContainerFactory.getDefault().createContainer(type);", "new_methods": [], "old_code": "\t\tcontainer = ContainerFactory.getDefault().makeContainer(type);", "old_methods": [], "patch": "@@ -12,7 +12,7 @@ public class SOClient {\n \tID targetID = null;\n \t\n \tprotected void setupContainer(String type) throws Exception {\n-\t\tcontainer = ContainerFactory.getDefault().makeContainer(type);\n+\t\tcontainer = ContainerFactory.getDefault().createContainer(type);\n \t\tsocontainer = (ISharedObjectContainer) container.getAdapter(ISharedObjectContainer.class);\n \t}\n }", "raw_url": "https://github.com/eclipse/ecf/raw/0d00787f0d8de19464aaac7bc951d9817fd7c518/examples%2Fbundles%2Forg.eclipse.ecf.example.clients%2Fsrc%2Forg%2Feclipse%2Fecf%2Fexample%2Fclients%2FSOClient.java", "sha": "8f35468222d549bf4e4d69a58416c23265302c3f", "status": "modified" }, { "additions": 6, "blob_url": "https://github.com/eclipse/ecf/blob/0d00787f0d8de19464aaac7bc951d9817fd7c518/examples%2Fbundles%2Forg.eclipse.ecf.example.clients%2Fsrc%2Forg%2Feclipse%2Fecf%2Fexample%2Fclients%2FXMPPChatClient.java", "changes": 12, "contents_url": "https://api.github.com/repos/eclipse/ecf/contents/examples%2Fbundles%2Forg.eclipse.ecf.example.clients%2Fsrc%2Forg%2Feclipse%2Fecf%2Fexample%2Fclients%2FXMPPChatClient.java?ref=0d00787f0d8de19464aaac7bc951d9817fd7c518", "deletions": 6, "filename": "examples/bundles/org.eclipse.ecf.example.clients/src/org/eclipse/ecf/example/clients/XMPPChatClient.java", "new_code": "\t\tcontainer = ContainerFactory.getDefault().createContainer(CONTAINER_TYPE);\n\t\tID targetID = IDFactory.getDefault().createID(namespace, account);\n\t\tcontainer.connect(targetID,ConnectContextFactory.createPasswordConnectContext(password));\n\t\tchatroom = chatmanager.createChatRoomContainer();\n\t\tID targetChatID = IDFactory.getDefault().createID(chatroom.getConnectNamespace(),chatRoomID);\n\t\t\treturn IDFactory.getDefault().createID(namespace, name);", "new_methods": [], "old_code": "\t\tcontainer = ContainerFactory.getDefault().makeContainer(CONTAINER_TYPE);\n\t\tID targetID = IDFactory.getDefault().makeID(namespace, account);\n\t\tcontainer.connect(targetID,ConnectContextFactory.makePasswordConnectContext(password));\n\t\tchatroom = chatmanager.makeChatRoomContainer();\n\t\tID targetChatID = IDFactory.getDefault().makeID(chatroom.getConnectNamespace(),chatRoomID);\n\t\t\treturn IDFactory.getDefault().makeID(namespace, name);", "old_methods": [], "patch": "@@ -40,9 +40,9 @@ public XMPPChatClient(IMessageReceiver receiver) {\n \t\tthis.receiver = receiver;\n \t}\n \tpublic void connect(String account, String password) throws ECFException {\n-\t\tcontainer = ContainerFactory.getDefault().makeContainer(CONTAINER_TYPE);\n+\t\tcontainer = ContainerFactory.getDefault().createContainer(CONTAINER_TYPE);\n \t\tnamespace = container.getConnectNamespace();\n-\t\tID targetID = IDFactory.getDefault().makeID(namespace, account);\n+\t\tID targetID = IDFactory.getDefault().createID(namespace, account);\n \t\tpresence = (IPresenceContainer) container\n \t\t\t\t.getAdapter(IPresenceContainer.class);\n \t\tsender = presence.getMessageSender();\n@@ -55,20 +55,20 @@ public void handleMessage(ID fromID, ID toID, Type type, String subject, String\n \t\t});\n \t\t//\n \t\t// Now connect\n-\t\tcontainer.connect(targetID,ConnectContextFactory.makePasswordConnectContext(password));\n+\t\tcontainer.connect(targetID,ConnectContextFactory.createPasswordConnectContext(password));\n \t\tuserID = getID(account);\n \t}\n \t\n \tprotected void connectChatRoom(String chatRoomID) throws Exception {\n \t\tchatmanager = presence.getChatRoomManager();\n-\t\tchatroom = chatmanager.makeChatRoomContainer();\n+\t\tchatroom = chatmanager.createChatRoomContainer();\n \t\tsocontainer = (ISharedObjectContainer) chatroom.getAdapter(ISharedObjectContainer.class);\n-\t\tID targetChatID = IDFactory.getDefault().makeID(chatroom.getConnectNamespace(),chatRoomID);\n+\t\tID targetChatID = IDFactory.getDefault().createID(chatroom.getConnectNamespace(),chatRoomID);\n \t\tchatroom.connect(targetChatID, null);\n \t}\n \tprivate ID getID(String name) {\n \t\ttry {\n-\t\t\treturn IDFactory.getDefault().makeID(namespace, name);\n+\t\t\treturn IDFactory.getDefault().createID(namespace, name);\n \t\t} catch (IDInstantiationException e) {\n \t\t\te.printStackTrace();\n \t\t\treturn null;", "raw_url": "https://github.com/eclipse/ecf/raw/0d00787f0d8de19464aaac7bc951d9817fd7c518/examples%2Fbundles%2Forg.eclipse.ecf.example.clients%2Fsrc%2Forg%2Feclipse%2Fecf%2Fexample%2Fclients%2FXMPPChatClient.java", "sha": "4a78d7c4a8c2a39398b4912667402ac3e3813183", "status": "modified" }, { "additions": 4, "blob_url": "https://github.com/eclipse/ecf/blob/0d00787f0d8de19464aaac7bc951d9817fd7c518/examples%2Fbundles%2Forg.eclipse.ecf.example.clients%2Fsrc%2Forg%2Feclipse%2Fecf%2Fexample%2Fclients%2FXMPPClient.java", "changes": 8, "contents_url": "https://api.github.com/repos/eclipse/ecf/contents/examples%2Fbundles%2Forg.eclipse.ecf.example.clients%2Fsrc%2Forg%2Feclipse%2Fecf%2Fexample%2Fclients%2FXMPPClient.java?ref=0d00787f0d8de19464aaac7bc951d9817fd7c518", "deletions": 4, "filename": "examples/bundles/org.eclipse.ecf.example.clients/src/org/eclipse/ecf/example/clients/XMPPClient.java", "new_code": "\t\tcontainer = ContainerFactory.getDefault().createContainer(CONTAINER_TYPE);\n\t\tID targetID = IDFactory.getDefault().createID(namespace, account);\n\t\tcontainer.connect(targetID,ConnectContextFactory.createPasswordConnectContext(password));\n\t\t\treturn IDFactory.getDefault().createID(namespace, name);", "new_methods": [], "old_code": "\t\tcontainer = ContainerFactory.getDefault().makeContainer(CONTAINER_TYPE);\n\t\tID targetID = IDFactory.getDefault().makeID(namespace, account);\n\t\tcontainer.connect(targetID,ConnectContextFactory.makePasswordConnectContext(password));\n\t\t\treturn IDFactory.getDefault().makeID(namespace, name);", "old_methods": [], "patch": "@@ -34,9 +34,9 @@ public XMPPClient(IMessageReceiver receiver) {\n \t\tthis.receiver = receiver;\n \t}\n \tpublic void connect(String account, String password) throws ECFException {\n-\t\tcontainer = ContainerFactory.getDefault().makeContainer(CONTAINER_TYPE);\n+\t\tcontainer = ContainerFactory.getDefault().createContainer(CONTAINER_TYPE);\n \t\tnamespace = container.getConnectNamespace();\n-\t\tID targetID = IDFactory.getDefault().makeID(namespace, account);\n+\t\tID targetID = IDFactory.getDefault().createID(namespace, account);\n \t\tpresence = (IPresenceContainer) container\n \t\t\t\t.getAdapter(IPresenceContainer.class);\n \t\tsender = presence.getMessageSender();\n@@ -48,12 +48,12 @@ public void handleMessage(ID fromID, ID toID, Type type, String subject, String\n \t\t\t}\n \t\t});\n \t\t// Now connect\n-\t\tcontainer.connect(targetID,ConnectContextFactory.makePasswordConnectContext(password));\n+\t\tcontainer.connect(targetID,ConnectContextFactory.createPasswordConnectContext(password));\n \t\tuserID = getID(account);\n \t}\n \tprivate ID getID(String name) {\n \t\ttry {\n-\t\t\treturn IDFactory.getDefault().makeID(namespace, name);\n+\t\t\treturn IDFactory.getDefault().createID(namespace, name);\n \t\t} catch (IDInstantiationException e) {\n \t\t\te.printStackTrace();\n \t\t\treturn null;", "raw_url": "https://github.com/eclipse/ecf/raw/0d00787f0d8de19464aaac7bc951d9817fd7c518/examples%2Fbundles%2Forg.eclipse.ecf.example.clients%2Fsrc%2Forg%2Feclipse%2Fecf%2Fexample%2Fclients%2FXMPPClient.java", "sha": "f1da90a8b28488add119de96dfcc407a91c15efd", "status": "modified" }, { "additions": 6, "blob_url": "https://github.com/eclipse/ecf/blob/0d00787f0d8de19464aaac7bc951d9817fd7c518/examples%2Fbundles%2Forg.eclipse.ecf.example.collab%2Flaunchconfigs%2FECF%20Collab%20Server.launch", "changes": 6, "contents_url": "https://api.github.com/repos/eclipse/ecf/contents/examples%2Fbundles%2Forg.eclipse.ecf.example.collab%2Flaunchconfigs%2FECF%20Collab%20Server.launch?ref=0d00787f0d8de19464aaac7bc951d9817fd7c518", "deletions": 0, "filename": "examples/bundles/org.eclipse.ecf.example.collab/launchconfigs/ECF Collab Server.launch", "new_code": "<listAttribute key=\"org.eclipse.debug.core.MAPPED_RESOURCE_TYPES\">\n<listEntry value=\"4\"/>\n</listAttribute>\n<listAttribute key=\"org.eclipse.debug.core.MAPPED_RESOURCE_PATHS\">\n<listEntry value=\"/org.eclipse.ecf.example.collab\"/>\n</listAttribute>", "new_methods": [], "old_code": "", "old_methods": [], "patch": "@@ -2,12 +2,18 @@\n <launchConfiguration type=\"org.eclipse.jdt.launching.localJavaApplication\">\n <booleanAttribute key=\"org.eclipse.jdt.launching.DEFAULT_CLASSPATH\" value=\"false\"/>\n <stringAttribute key=\"org.eclipse.jdt.launching.MAIN_TYPE\" value=\"org.eclipse.ecf.provider.app.ServerApplication\"/>\n+<listAttribute key=\"org.eclipse.debug.core.MAPPED_RESOURCE_TYPES\">\n+<listEntry value=\"4\"/>\n+</listAttribute>\n <listAttribute key=\"org.eclipse.jdt.launching.CLASSPATH\">\n <listEntry value=\"&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;runtimeClasspathEntry type=&quot;4&quot; path=&quot;1&quot; containerPath=&quot;org.eclipse.jdt.launching.JRE_CONTAINER&quot; javaProject=&quot;org.eclipse.ecf.provider&quot;/&gt;&#10;\"/>\n <listEntry value=\"&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;runtimeClasspathEntry id=&quot;org.eclipse.jdt.launching.classpathentry.defaultClasspath&quot;&gt;&#10;&lt;memento project=&quot;org.eclipse.ecf.provider&quot;/&gt;&#10;&lt;/runtimeClasspathEntry&gt;&#10;\"/>\n <listEntry value=\"&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;runtimeClasspathEntry type=&quot;1&quot; path=&quot;3&quot; projectName=&quot;org.eclipse.ecf.example.collab&quot;/&gt;&#10;\"/>\n </listAttribute>\n <stringAttribute key=\"org.eclipse.jdt.launching.PROJECT_ATTR\" value=\"org.eclipse.ecf.example.collab\"/>\n <stringAttribute key=\"org.eclipse.jdt.launching.VM_ARGUMENTS\" value=\"-Dorg.eclipse.ecf.provider.Trace=true -Dorg.eclipse.ecf.Trace=true\"/>\n+<listAttribute key=\"org.eclipse.debug.core.MAPPED_RESOURCE_PATHS\">\n+<listEntry value=\"/org.eclipse.ecf.example.collab\"/>\n+</listAttribute>\n <booleanAttribute key=\"org.eclipse.debug.core.appendEnvironmentVariables\" value=\"true\"/>\n </launchConfiguration>", "raw_url": "https://github.com/eclipse/ecf/raw/0d00787f0d8de19464aaac7bc951d9817fd7c518/examples%2Fbundles%2Forg.eclipse.ecf.example.collab%2Flaunchconfigs%2FECF%20Collab%20Server.launch", "sha": "83aae3f4d6bfb02a413928bc5a02c5f7f71f345a", "status": "modified" }, { "additions": 270, "blob_url": "https://github.com/eclipse/ecf/blob/0d00787f0d8de19464aaac7bc951d9817fd7c518/examples%2Fbundles%2Forg.eclipse.ecf.example.collab%2Flaunchconfigs%2FECF%20Example%20Collab%20Client%202.launch", "changes": 539, "contents_url": "https://api.github.com/repos/eclipse/ecf/contents/examples%2Fbundles%2Forg.eclipse.ecf.example.collab%2Flaunchconfigs%2FECF%20Example%20Collab%20Client%202.launch?ref=0d00787f0d8de19464aaac7bc951d9817fd7c518", "deletions": 269, "filename": "examples/bundles/org.eclipse.ecf.example.collab/launchconfigs/ECF Example Collab Client 2.launch", "new_code": "<mapEntry key=\"org.eclipse.team.cvs.core/syncchangeevents\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.ecf.provider.xmpp/debug/smackconnection\" value=\"true\"/>\n<mapEntry key=\"org.eclipse.ecf.provider.irc/debug\" value=\"true\"/>\n<mapEntry key=\"org.eclipse.core.resources/perf/listeners\" value=\"500\"/>\n<mapEntry key=\"org.eclipse.team.ftp/debug\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.core.resources/build/needbuild\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.update.configurator/debug\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.ecf/debug/twophasecommiteventprocessor\" value=\"true\"/>\n<mapEntry key=\"org.eclipse.osgi/monitor/activation\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.jdt.ui/perf/content_assist/extensions\" value=\"1000\"/>\n<mapEntry key=\"org.eclipse.team.ftp/requests\" value=\"true\"/>\n<mapEntry key=\"org.eclipse.ui.ide/debug/gc\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.core.resources/contenttype/cache\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.ui/debug/showSystemJobs\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.ecf.sdo/DataGraphSharingFactory\" value=\"true\"/>\n<mapEntry key=\"org.eclipse.core.runtime/url/debug\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.osgi/monitor/classes\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.ecf.provider.xmpp/debug/XMPPClientSOContainer\" value=\"true\"/>\n<mapEntry key=\"org.eclipse.ecf.provider.irc/debug/flag\" value=\"true\"/>\n<mapEntry key=\"org.eclipse.update.core/debug\" value=\"true\"/>\n<mapEntry key=\"org.eclipse.core.runtime/debug/context\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.ui/debug/swtdebug\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.ecf.provider/debug/containerfactory\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.jdt.core/debug/javamodel\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.ecf.provider.yahooim/debug/yahoocontainer\" value=\"true\"/>\n<mapEntry key=\"org.eclipse.ecf/debug\" value=\"true\"/>\n<mapEntry key=\"org.eclipse.ui.intro/trace/printHTML\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.jdt.core/debug/javadelta/verbose\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.jdt.core/debug\" value=\"true\"/>\n<mapEntry key=\"org.eclipse.core.expressions/tracePropertyResolving\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.core.resources/restore\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.ltk.core.refactoring/perf/participants/checkConditions\" value=\"300\"/>\n<mapEntry key=\"org.eclipse.ui/perf/perspective.listeners\" value=\"200\"/>\n<mapEntry key=\"org.eclipse.ecf/debug/filter\" value=\"*\"/>\n<mapEntry key=\"org.eclipse.jdt.core/perf/containerinitializer\" value=\"5000\"/>\n<mapEntry key=\"org.eclipse.osgi/trace/filename\" value=\"runtime.traces\"/>\n<mapEntry key=\"org.eclipse.ecf.provider.jms/debug/servercontainer\" value=\"true\"/>\n<mapEntry key=\"org.eclipse.update.core/debug/web\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.ecf/debug/containerfactory\" value=\"true\"/>\n<mapEntry key=\"org.eclipse.ecf.provider.xmpp/debug/flag\" value=\"true\"/>\n<mapEntry key=\"org.eclipse.core.runtime/registry/debug/resolve\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.osgi/trace/activation\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.ui/perf/perspective.switch\" value=\"800\"/>\n<mapEntry key=\"org.eclipse.ecf/debug/idfactory\" value=\"true\"/>\n<mapEntry key=\"org.eclipse.ecf.provider.yahooim/debug/flag\" value=\"true\"/>\n<mapEntry key=\"org.eclipse.ecf.example.collab/debug/genericsharedobject\" value=\"true\"/>\n<mapEntry key=\"org.eclipse.ecf.provider.jmdns/debug/filter\" value=\"*\"/>\n<mapEntry key=\"org.eclipse.ui/perf/part.input\" value=\"200\"/>\n<mapEntry key=\"org.eclipse.jface.text/debug/AnnotationPainter\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.ecf.provider/debug/sharedobjectmanager\" value=\"true\"/>\n<mapEntry key=\"org.eclipse.ecf.datashare/debug\" value=\"true\"/>\n<mapEntry key=\"org.eclipse.ecf/debug/factoryinit\" value=\"true\"/>\n<mapEntry key=\"org.eclipse.osgi/resolver/imports\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.ecf.sdo/debug\" value=\"true\"/>\n<mapEntry key=\"org.eclipse.osgi/trace/filters\" value=\"trace.properties\"/>\n<mapEntry key=\"org.eclipse.help.ui/debug/infopop\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.osgi/eclipseadaptor/debug/platformadmin/resolver\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.ecf.sdo/EMFUpdateManager\" value=\"true\"/>\n<mapEntry key=\"org.eclipse.ecf.ui/debug/textchatcomposite\" value=\"true\"/>\n<mapEntry key=\"org.eclipse.ecf.datashare/ConsistentMulticaster\" value=\"true\"/>\n<mapEntry key=\"org.eclipse.team.cvs.core/debug\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.ecf.example.collab/debug/flag\" value=\"true\"/>\n<mapEntry key=\"org.eclipse.jdt.ui/perf/search/participants\" value=\"300\"/>\n<mapEntry key=\"org.eclipse.ui/perf/part.listeners\" value=\"200\"/>\n<mapEntry key=\"org.eclipse.osgi/resolver/debug\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.update.core/debug/install\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.core.resources/debug\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.osgi/profile/impl\" value=\"org.eclipse.osgi.internal.profile.DefaultProfileLogger\"/>\n<mapEntry key=\"org.eclipse.osgi/profile/benchmark\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.ecf.provider.xmpp/debug\" value=\"true\"/>\n<mapEntry key=\"org.eclipse.team.cvs.core/cvsprotocol\" value=\"true\"/>\n<mapEntry key=\"org.eclipse.jdt.core/debug/postaction\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.osgi/debug/manifest\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.jdt.core/perf/selection\" value=\"300\"/>\n<mapEntry key=\"org.eclipse.help/debug/context\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.jdt.core/debug/builder\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.osgi/resolver/requires\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.team.cvs.ssh/debug\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.ui/trace/handlers.verbose\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.update.core/debug/installhandler\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.osgi/debug/startlevel\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.ecf.provider.xmpp/debug/filter\" value=\"*\"/>\n<mapEntry key=\"org.eclipse.jdt.core/debug/javadelta\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.core.resources/preferences\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.help/debug/protocols\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.core.resources/perf/save.participants\" value=\"500\"/>\n<mapEntry key=\"org.eclipse.core.resources/natures\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.help.base/debug/search\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.osgi/defaultprofile/buffersize\" value=\"256\"/>\n<mapEntry key=\"org.eclipse.osgi/resolver/cycles\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.jdt.core/perf/variableinitializer\" value=\"5000\"/>\n<mapEntry key=\"org.eclipse.ui/trace/keyBindings.verbose\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.core.runtime/preferences/get\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.core.runtime/perf/success\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.core.runtime/compatibility/debug\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.ecf.provider/debug/transactioneventprocessor\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.ui/debug/declaredImages\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.pde.build/debug\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.ui/trace/contexts.verbose\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.ecf.provider/debug/sharedobjectwrapper\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.ecf.provider.irc/debug/filter\" value=\"*\"/>\n<mapEntry key=\"org.eclipse.help.base/debug\" value=\"true\"/>\n<mapEntry key=\"org.eclipse.core.runtime/jobs\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.ui/listeners/IWorkbenchPage.IPartListener\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.ecf.provider.jms/debug\" value=\"true\"/>\n<mapEntry key=\"org.eclipse.ui/perf/perspective.create\" value=\"800\"/>\n<mapEntry key=\"org.eclipse.core.runtime/contenttypes/debug\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.core.resources/strings\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.jdt.ui/debug/checkCoreBindingGetJavaElement\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.ui/listeners/IWorkbenchPartReference\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.core.resources/save/metainfo\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.core.runtime/perf\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.core.resources/contenttype\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.ui/debug/contributions\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.ui/debug/job.stale\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.jdt.core/debug/completion\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.ui/perf/workbench.start\" value=\"45000\"/>\n<mapEntry key=\"org.eclipse.osgi/eclipseadaptor/debug\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.ui/listeners/IWorkbenchWindow.IPartListener\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.jdt.core/debug/indexmanager\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.ecf.provider.jmdns/debug/container\" value=\"true\"/>\n<mapEntry key=\"org.eclipse.ui/listeners/IWorkbenchWindow.IPerspectiveListener\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.osgi/debug/loader\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.ecf.discovery/debug/flag\" value=\"true\"/>\n<mapEntry key=\"org.eclipse.ecf.provider.yahooim/debug/filter\" value=\"*\"/>\n<mapEntry key=\"org.eclipse.osgi/trace/classLoading\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.core.runtime/debug\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.ui/trace/handlers.verbose.commandId\" value=\"\"/>\n<mapEntry key=\"org.eclipse.osgi/debug/filter\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.ecf.datashare/SimpleMulticaster\" value=\"true\"/>\n<mapEntry key=\"org.eclipse.jdt.ui/debug/ASTProvider\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.ecf.example.collab/debug/filter\" value=\"*\"/>\n<mapEntry key=\"org.eclipse.ecf.provider/debug\" value=\"true\"/>\n<mapEntry key=\"org.eclipse.core.runtime/jobs/timing\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.ecf.example.collab/debug/urlsharedobject\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.help.webapp/debug/workingsets\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.ecf.example.collab/debug\" value=\"true\"/>\n<mapEntry key=\"org.eclipse.ecf.provider.jms/debug/brokercontainer\" value=\"true\"/>\n<mapEntry key=\"org.eclipse.jface.text/debug/ContentAssistSubjectAdapters\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.core.runtime/url/debug/connect\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.core.resources/restore/markers\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.ui/trace/graphics\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.jdt.core/debug/resolution\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.team.cvs.ssh/ssh_protocol\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.core.resources/perf/snapshot\" value=\"1000\"/>\n<mapEntry key=\"org.eclipse.ecf.provider/debug/filter\" value=\"*\"/>\n<mapEntry key=\"org.eclipse.core.runtime/registry/debug\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.osgi/debug/packages\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.ecf.provider.jms/debug/flag\" value=\"true\"/>\n<mapEntry key=\"org.eclipse.ui/perf/part.init\" value=\"800\"/>\n<mapEntry key=\"org.eclipse.ui.intro/trace/logPerformance\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.osgi/eclipseadaptor/converter/debug\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.ecf/debug/abstractsharedobject\" value=\"true\"/>\n<mapEntry key=\"org.eclipse.ui/perf/part.create\" value=\"800\"/>\n<mapEntry key=\"org.eclipse.osgi/eclipseadaptor/debug/platformadmin\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.help.ui/debug/embeddedBrowser\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.core.runtime/preferences/set\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.team.core/streams\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.core.resources/build/stacktrace\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.jdt.ui/debug/TypeConstraints\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.ecf.ui/debug/flag\" value=\"true\"/>\n<mapEntry key=\"org.eclipse.ui/perf/showHeapStatus\" value=\"true\"/>\n<mapEntry key=\"org.eclipse.ecf.example.collab/debug/progsharedobject\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.ui/perf/contentTypes\" value=\"200\"/>\n<mapEntry key=\"org.eclipse.core.resources/build/delta\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.jdt.core/debug/search\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.ecf.provider.irc/debug/irccontainer\" value=\"true\"/>\n<mapEntry key=\"org.eclipse.ecf/debug/connectionfactory\" value=\"true\"/>\n<mapEntry key=\"org.eclipse.jdt.core/perf/completion\" value=\"300\"/>\n<mapEntry key=\"org.eclipse.jdt.core/debug/compiler\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.ecf.example.collab/debug/filetransfersharedobject\" value=\"true\"/>\n<mapEntry key=\"org.eclipse.ecf.provider/debug/connection\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.jdt.ui/debug\" value=\"true\"/>\n<mapEntry key=\"org.eclipse.ecf.provider.jmdns/debug/flag\" value=\"true\"/>\n<mapEntry key=\"org.eclipse.osgi/debug/messageBundles\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.ui/listeners/IWorkbenchWindow.IPartListener2\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.ui/listeners/IWorkbenchPage.IPartListener2\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.jdt.core/perf/reconcile\" value=\"1000\"/>\n<mapEntry key=\"org.eclipse.jdt.core/debug/hierarchy\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.help.webapp/debug\" value=\"true\"/>\n<mapEntry key=\"org.eclipse.ecf/debug/sharedobjectcontainerfactory\" value=\"true\"/>\n<mapEntry key=\"org.eclipse.core.resources/refresh\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.ltk.core.refactoring/perf/participants/createChanges\" value=\"300\"/>\n<mapEntry key=\"org.eclipse.team.core/backgroundevents\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.jdt.core/debug/cpresolution\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.ecf/debug/flag\" value=\"true\"/>\n<mapEntry key=\"org.eclipse.update.core/debug/warning\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.core.resources/save\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.jdt.ui/hideDerivedFromRefactoring\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.ecf.provider/debug/flag\" value=\"true\"/>\n<mapEntry key=\"org.eclipse.update.core/debug/parsing\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.jdt.ui/perf/explorer/makeActions\" value=\"1000\"/>\n<mapEntry key=\"org.eclipse.core.runtime/preferences/general\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.core.resources/restore/syncinfo\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.ui/listeners/IWorkbenchWindow.IPageListener\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.team.core/threading\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.core.runtime/url/debug/cachelookup\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.osgi/debug/packageadmin/timing\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.update.core/debug/reconciler\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.core.resources/save/syncinfo\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.osgi/profile/startup\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.ecf.ui/debug/filter\" value=\"*\"/>\n<mapEntry key=\"org.eclipse.ecf.provider/debug/basesharedobject\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.osgi/debug/services\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.core.resources/save/markers\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.ecf.provider/debug/gmm\" value=\"true\"/>\n<mapEntry key=\"org.eclipse.osgi/monitor/resources\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.jdt.core/debug/selection\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.jdt.ui/debug/ResultCollector\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.jdt.ui/perf/explorer/createPartControl\" value=\"1300\"/>\n<mapEntry key=\"org.eclipse.core.resources/restore/snapshots\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.team.cvs.core/dirtycaching\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.pde.core/cache\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.core.runtime/url/debug/cachecopy\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.core.runtime/jobs/beginend\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.ecf.provider.jms/debug/filter\" value=\"*\"/>\n<mapEntry key=\"org.eclipse.ui/trace/operations.verbose\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.team.cvs.core/metafiles\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.team.core/debug\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.team.ftp/responses\" value=\"true\"/>\n<mapEntry key=\"org.eclipse.ecf.datashare/OrderedMulticaster\" value=\"true\"/>\n<mapEntry key=\"org.eclipse.osgi/debug/events\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.ecf.discovery/debug/filter\" value=\"*\"/>\n<mapEntry key=\"org.eclipse.jdt.ui/debug/useUIBindingGetJavaElement\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.ecf.provider/debug/sharedobjectcontext\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.ui.ide/debug/internalerror/openDialog\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.ecf.provider.xmpp/debug/smackdebug\" value=\"true\"/>\n<mapEntry key=\"org.eclipse.ui/perf/uijob\" value=\"200\"/>\n<mapEntry key=\"org.eclipse.jdt.core/debug/sourcemapper\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.osgi/resolver/wiring\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.jdt.core/perf/javadeltalistener\" value=\"500\"/>\n<mapEntry key=\"org.eclipse.osgi/profile/debug\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.ecf.provider.xmpp/debug/xmppgroupchatsharedobject\" value=\"true\"/>\n<mapEntry key=\"org.eclipse.ui/trace/contexts\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.ecf.provider.xmpp/debug/xmpppresencesharedobject\" value=\"true\"/>\n<mapEntry key=\"org.eclipse.core.resources/build/invoking\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.update.core/debug/type\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.core.resources/perf/builders\" value=\"10000\"/>\n<mapEntry key=\"org.eclipse.ecf.provider.yahooim/debug\" value=\"true\"/>\n<mapEntry key=\"org.eclipse.ui/perf/page.listeners\" value=\"200\"/>\n<mapEntry key=\"org.eclipse.jdt.ui/perf/explorer/RefactorActionGroup\" value=\"150\"/>\n<mapEntry key=\"org.eclipse.core.resources/history\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.team.core/refreshjob\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.ui.intro/debug\" value=\"true\"/>\n<mapEntry key=\"org.eclipse.ecf.discovery/debug\" value=\"true\"/>\n<mapEntry key=\"org.eclipse.debug.core/debug\" value=\"true\"/>\n<mapEntry key=\"org.eclipse.help/debug\" value=\"true\"/>\n<mapEntry key=\"org.eclipse.jface.text.source/debug/RevisionRulerColumn\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.ui/debug\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.osgi/debug/packageadmin\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.core.resources/build/failure\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.ecf.provider/debug/container\" value=\"true\"/>\n<mapEntry key=\"org.eclipse.ui/listeners/IWorkbenchPage.IPropertyChangeListener\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.ecf.ui/debug\" value=\"true\"/>\n<mapEntry key=\"org.eclipse.ui.browser/debug\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.core.resources/save/tree\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.help.ui/debug\" value=\"true\"/>\n<mapEntry key=\"org.eclipse.core.resources/restore/metainfo\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.core.resources/save/mastertable\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.pde.core/debug\" value=\"true\"/>\n<mapEntry key=\"org.eclipse.jdt.core/debug/buffermanager\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.ecf.provider.jmdns/debug/jmdns\" value=\"true\"/>\n<mapEntry key=\"org.eclipse.osgi/resolver/grouping\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.ui.ide/debug\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.jdt.core/formatter/enable_new\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.core.resources/restore/mastertable\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.ui.intro/trace/logInfo\" value=\"true\"/>\n<mapEntry key=\"org.eclipse.pde.core/classpath\" value=\"false\"/>\n<stringAttribute key=\"pde.version\" value=\"3.2\"/>\n<stringAttribute key=\"org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER\" value=\"org.eclipse.pde.ui.workbenchClasspathProvider\"/>", "new_methods": [], "old_code": "<mapEntry key=\"org.eclipse.ecf.provider.xmpp/debug/filter\" value=\"*\"/>\n<mapEntry key=\"org.eclipse.help.ui/debug/embeddedBrowser\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.ui/perf/part.create\" value=\"800\"/>\n<mapEntry key=\"org.eclipse.jdt.core/formatter/enable_new\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.core.resources/save/mastertable\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.jdt.core/debug/selection\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.core.resources/strings\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.ui.ide/debug/internalerror/openDialog\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.ecf.provider.irc/debug/filter\" value=\"*\"/>\n<mapEntry key=\"org.eclipse.ui/listeners/IWorkbenchPage.IPartListener\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.ui/perf/page.listeners\" value=\"200\"/>\n<mapEntry key=\"org.eclipse.core.resources/save/tree\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.jdt.core/debug/postaction\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.ecf.example.collab/debug/urlsharedobject\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.core.runtime/url/debug/cachelookup\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.team.cvs.core/debug\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.osgi/debug/packages\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.osgi/monitor/resources\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.core.resources/restore/markers\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.ecf.ui/debug\" value=\"true\"/>\n<mapEntry key=\"org.eclipse.osgi/debug/messageBundles\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.ecf.ui/debug/filter\" value=\"*\"/>\n<mapEntry key=\"org.eclipse.update.core/debug/parsing\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.core.runtime/url/debug/connect\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.osgi/debug/packageadmin/timing\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.help.base/debug/search\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.pde.core/cache\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.team.core/streams\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.ecf.provider.xmpp/debug\" value=\"true\"/>\n<mapEntry key=\"org.eclipse.osgi/eclipseadaptor/debug/platformadmin/resolver\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.ecf.example.collab/debug/filter\" value=\"*\"/>\n<mapEntry key=\"org.eclipse.ecf.provider/debug/transactioneventprocessor\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.ui/perf/perspective.switch\" value=\"800\"/>\n<mapEntry key=\"org.eclipse.ui/debug/declaredImages\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.ui/perf/contentTypes\" value=\"200\"/>\n<mapEntry key=\"org.eclipse.ui/debug/swtdebug\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.jdt.core/perf/selection\" value=\"300\"/>\n<mapEntry key=\"org.eclipse.ecf.datashare/ConsistentMulticaster\" value=\"true\"/>\n<mapEntry key=\"org.eclipse.osgi/profile/debug\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.core.resources/contenttype/cache\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.ui.ide/debug/gc\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.jdt.core/debug/indexmanager\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.ecf.provider.jms/debug/flag\" value=\"true\"/>\n<mapEntry key=\"org.eclipse.ecf/debug/connectionfactory\" value=\"true\"/>\n<mapEntry key=\"org.eclipse.jdt.core/debug/compiler\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.ecf.provider.xmpp/debug/XMPPClientSOContainer\" value=\"true\"/>\n<mapEntry key=\"org.eclipse.team.cvs.core/syncchangeevents\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.ltk.core.refactoring/perf/participants/checkConditions\" value=\"300\"/>\n<mapEntry key=\"org.eclipse.jdt.ui/perf/explorer/makeActions\" value=\"1000\"/>\n<mapEntry key=\"org.eclipse.ui/perf/workbench.start\" value=\"45000\"/>\n<mapEntry key=\"org.eclipse.core.resources/perf/listeners\" value=\"500\"/>\n<mapEntry key=\"org.eclipse.ui/trace/keyBindings.verbose\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.core.runtime/contenttypes/debug\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.osgi/debug/services\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.update.core/debug/reconciler\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.jdt.core/perf/completion\" value=\"300\"/>\n<mapEntry key=\"org.eclipse.ecf/debug/flag\" value=\"true\"/>\n<mapEntry key=\"org.eclipse.ui/debug/job.stale\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.ui/perf/uijob\" value=\"200\"/>\n<mapEntry key=\"org.eclipse.ecf.provider.irc/debug/irccontainer\" value=\"true\"/>\n<mapEntry key=\"org.eclipse.jdt.core/debug/resolution\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.help.base/debug\" value=\"true\"/>\n<mapEntry key=\"org.eclipse.ui.intro/debug\" value=\"true\"/>\n<mapEntry key=\"org.eclipse.jdt.core/perf/containerinitializer\" value=\"5000\"/>\n<mapEntry key=\"org.eclipse.osgi/eclipseadaptor/debug\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.core.resources/build/invoking\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.ecf.provider/debug/filter\" value=\"*\"/>\n<mapEntry key=\"org.eclipse.osgi/monitor/classes\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.jdt.ui/debug/TypeConstraints\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.ecf.example.collab/debug\" value=\"true\"/>\n<mapEntry key=\"org.eclipse.core.resources/save\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.ui.intro/trace/logPerformance\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.ecf.provider.xmpp/debug/xmppgroupchatsharedobject\" value=\"true\"/>\n<mapEntry key=\"org.eclipse.core.resources/restore/syncinfo\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.debug.core/debug\" value=\"true\"/>\n<mapEntry key=\"org.eclipse.team.ftp/requests\" value=\"true\"/>\n<mapEntry key=\"org.eclipse.osgi/resolver/requires\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.ecf.provider/debug/sharedobjectcontext\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.ecf.provider/debug/container\" value=\"true\"/>\n<mapEntry key=\"org.eclipse.jdt.ui/perf/search/participants\" value=\"300\"/>\n<mapEntry key=\"org.eclipse.core.resources/build/needbuild\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.core.runtime/jobs/timing\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.core.resources/restore/snapshots\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.help.ui/debug\" value=\"true\"/>\n<mapEntry key=\"org.eclipse.osgi/profile/startup\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.ecf.datashare/OrderedMulticaster\" value=\"true\"/>\n<mapEntry key=\"org.eclipse.jdt.core/perf/javadeltalistener\" value=\"500\"/>\n<mapEntry key=\"org.eclipse.ecf.example.collab/debug/filetransfersharedobject\" value=\"true\"/>\n<mapEntry key=\"org.eclipse.core.runtime/registry/debug/resolve\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.jdt.core/debug/javamodel\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.update.core/debug/install\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.update.core/debug/warning\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.team.ftp/responses\" value=\"true\"/>\n<mapEntry key=\"org.eclipse.jdt.ui/perf/explorer/createPartControl\" value=\"1300\"/>\n<mapEntry key=\"org.eclipse.core.runtime/registry/debug\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.ecf.sdo/debug\" value=\"true\"/>\n<mapEntry key=\"org.eclipse.pde.core/debug\" value=\"true\"/>\n<mapEntry key=\"org.eclipse.osgi/monitor/activation\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.core.resources/perf/builders\" value=\"10000\"/>\n<mapEntry key=\"org.eclipse.core.runtime/debug\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.help/debug\" value=\"true\"/>\n<mapEntry key=\"org.eclipse.jdt.core/debug/builder\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.core.runtime/preferences/set\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.ecf.provider/debug/connection\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.core.resources/restore/metainfo\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.team.cvs.ssh/ssh_protocol\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.jdt.core/perf/reconcile\" value=\"1000\"/>\n<mapEntry key=\"org.eclipse.ui/trace/contexts\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.jdt.ui/debug\" value=\"true\"/>\n<mapEntry key=\"org.eclipse.core.runtime/preferences/get\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.ecf.example.collab/debug/flag\" value=\"true\"/>\n<mapEntry key=\"org.eclipse.ui/perf/part.input\" value=\"200\"/>\n<mapEntry key=\"org.eclipse.ecf.provider/debug/sharedobjectwrapper\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.ecf.ui/debug/flag\" value=\"true\"/>\n<mapEntry key=\"org.eclipse.jdt.core/debug/cpresolution\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.ui/debug/showSystemJobs\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.team.cvs.core/cvsprotocol\" value=\"true\"/>\n<mapEntry key=\"org.eclipse.ecf.provider/debug/containerfactory\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.osgi/resolver/cycles\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.ecf.provider.xmpp/debug/smackdebug\" value=\"true\"/>\n<mapEntry key=\"org.eclipse.osgi/eclipseadaptor/converter/debug\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.ui/listeners/IWorkbenchPartReference\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.ecf.provider.xmpp/debug/flag\" value=\"true\"/>\n<mapEntry key=\"org.eclipse.ecf.provider.jmdns/debug/flag\" value=\"true\"/>\n<mapEntry key=\"org.eclipse.core.resources/history\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.ui/listeners/IWorkbenchWindow.IPartListener2\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.help.webapp/debug/workingsets\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.ecf.provider.jmdns/debug/jmdns\" value=\"true\"/>\n<mapEntry key=\"org.eclipse.osgi/resolver/grouping\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.jdt.core/debug/buffermanager\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.core.resources/build/delta\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.osgi/resolver/imports\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.ecf/debug\" value=\"true\"/>\n<mapEntry key=\"org.eclipse.core.resources/save/syncinfo\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.ecf.provider.yahooim/debug/flag\" value=\"true\"/>\n<mapEntry key=\"org.eclipse.jdt.ui/debug/ResultCollector\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.core.expressions/tracePropertyResolving\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.ui/perf/showHeapStatus\" value=\"true\"/>\n<mapEntry key=\"org.eclipse.ui/perf/part.listeners\" value=\"200\"/>\n<mapEntry key=\"org.eclipse.osgi/resolver/wiring\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.core.runtime/url/debug/cachecopy\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.ecf.provider.irc/debug\" value=\"true\"/>\n<mapEntry key=\"org.eclipse.jdt.ui/perf/explorer/RefactorActionGroup\" value=\"150\"/>\n<mapEntry key=\"org.eclipse.jdt.ui/perf/content_assist/extensions\" value=\"1000\"/>\n<mapEntry key=\"org.eclipse.pde.core/classpath\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.core.resources/restore\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.update.core/debug/web\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.ecf.discovery/debug\" value=\"true\"/>\n<mapEntry key=\"org.eclipse.help.webapp/debug\" value=\"true\"/>\n<mapEntry key=\"org.eclipse.jdt.core/debug/search\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.jdt.ui/debug/useUIBindingGetJavaElement\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.ecf.example.collab/debug/progsharedobject\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.osgi/debug/startlevel\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.jdt.core/debug/sourcemapper\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.osgi/defaultprofile/buffersize\" value=\"256\"/>\n<mapEntry key=\"org.eclipse.core.resources/save/markers\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.osgi/debug/manifest\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.ui.intro/trace/logInfo\" value=\"true\"/>\n<mapEntry key=\"org.eclipse.jdt.ui/hideDerivedFromRefactoring\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.core.runtime/perf\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.ecf.ui/debug/textchatcomposite\" value=\"true\"/>\n<mapEntry key=\"org.eclipse.jdt.core/debug/hierarchy\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.ecf.discovery/debug/filter\" value=\"*\"/>\n<mapEntry key=\"org.eclipse.ecf.provider/debug/gmm\" value=\"true\"/>\n<mapEntry key=\"org.eclipse.core.resources/refresh\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.ecf.example.collab/debug/genericsharedobject\" value=\"true\"/>\n<mapEntry key=\"org.eclipse.update.core/debug/installhandler\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.core.resources/save/metainfo\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.ui/debug/contributions\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.ui/trace/operations.verbose\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.jface.text.source/debug/RevisionRulerColumn\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.core.resources/restore/mastertable\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.ecf/debug/sharedobjectcontainerfactory\" value=\"true\"/>\n<mapEntry key=\"org.eclipse.osgi/trace/activation\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.ui.ide/debug\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.update.core/debug/type\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.ecf.datashare/debug\" value=\"true\"/>\n<mapEntry key=\"org.eclipse.ui.browser/debug\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.ecf.provider.yahooim/debug\" value=\"true\"/>\n<mapEntry key=\"org.eclipse.jdt.core/perf/variableinitializer\" value=\"5000\"/>\n<mapEntry key=\"org.eclipse.help/debug/context\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.osgi/debug/packageadmin\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.ecf/debug/factoryinit\" value=\"true\"/>\n<mapEntry key=\"org.eclipse.ecf.provider/debug/sharedobjectmanager\" value=\"true\"/>\n<mapEntry key=\"org.eclipse.jdt.core/debug/completion\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.pde.build/debug\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.jface.text/debug/ContentAssistSubjectAdapters\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.core.runtime/compatibility/debug\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.ui/trace/graphics\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.update.core/debug\" value=\"true\"/>\n<mapEntry key=\"org.eclipse.team.core/debug\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.help.ui/debug/infopop\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.osgi/trace/filename\" value=\"runtime.traces\"/>\n<mapEntry key=\"org.eclipse.ecf.provider.yahooim/debug/yahoocontainer\" value=\"true\"/>\n<mapEntry key=\"org.eclipse.core.runtime/jobs\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.ecf.provider.jms/debug/servercontainer\" value=\"true\"/>\n<mapEntry key=\"org.eclipse.ui/trace/handlers.verbose\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.ecf.sdo/DataGraphSharingFactory\" value=\"true\"/>\n<mapEntry key=\"org.eclipse.osgi/resolver/debug\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.jface.text/debug/AnnotationPainter\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.ui/trace/handlers.verbose.commandId\" value=\"\"/>\n<mapEntry key=\"org.eclipse.ecf/debug/idfactory\" value=\"true\"/>\n<mapEntry key=\"org.eclipse.ui.intro/trace/printHTML\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.ecf.provider.jms/debug\" value=\"true\"/>\n<mapEntry key=\"org.eclipse.ui/listeners/IWorkbenchPage.IPropertyChangeListener\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.team.core/threading\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.jdt.core/debug/javadelta\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.ui/debug\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.team.core/backgroundevents\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.ecf.provider.jms/debug/filter\" value=\"*\"/>\n<mapEntry key=\"org.eclipse.osgi/trace/filters\" value=\"trace.properties\"/>\n<mapEntry key=\"org.eclipse.jdt.core/debug/javadelta/verbose\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.core.resources/debug\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.jdt.ui/debug/checkCoreBindingGetJavaElement\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.core.runtime/debug/context\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.ui/listeners/IWorkbenchWindow.IPerspectiveListener\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.core.resources/build/stacktrace\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.ecf.sdo/EMFUpdateManager\" value=\"true\"/>\n<mapEntry key=\"org.eclipse.ui/listeners/IWorkbenchWindow.IPartListener\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.ecf.provider/debug\" value=\"true\"/>\n<mapEntry key=\"org.eclipse.core.resources/build/failure\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.osgi/profile/impl\" value=\"org.eclipse.osgi.internal.profile.DefaultProfileLogger\"/>\n<mapEntry key=\"org.eclipse.ecf.discovery/debug/flag\" value=\"true\"/>\n<mapEntry key=\"org.eclipse.jdt.core/debug\" value=\"true\"/>\n<mapEntry key=\"org.eclipse.ecf.provider.xmpp/debug/xmpppresencesharedobject\" value=\"true\"/>\n<mapEntry key=\"org.eclipse.osgi/debug/filter\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.ecf/debug/filter\" value=\"*\"/>\n<mapEntry key=\"org.eclipse.ecf.provider.jmdns/debug/container\" value=\"true\"/>\n<mapEntry key=\"org.eclipse.update.configurator/debug\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.ecf.provider.jmdns/debug/filter\" value=\"*\"/>\n<mapEntry key=\"org.eclipse.team.cvs.core/metafiles\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.core.resources/contenttype\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.help/debug/protocols\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.ui/listeners/IWorkbenchPage.IPartListener2\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.ecf.provider.jms/debug/brokercontainer\" value=\"true\"/>\n<mapEntry key=\"org.eclipse.osgi/debug/loader\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.jdt.ui/debug/ASTProvider\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.core.resources/preferences\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.ecf/debug/twophasecommiteventprocessor\" value=\"true\"/>\n<mapEntry key=\"org.eclipse.team.ftp/debug\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.core.resources/perf/snapshot\" value=\"1000\"/>\n<mapEntry key=\"org.eclipse.ui/perf/perspective.listeners\" value=\"200\"/>\n<mapEntry key=\"org.eclipse.core.runtime/jobs/beginend\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.ecf/debug/abstractsharedobject\" value=\"true\"/>\n<mapEntry key=\"org.eclipse.osgi/debug/events\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.osgi/trace/classLoading\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.ecf.provider.irc/debug/flag\" value=\"true\"/>\n<mapEntry key=\"org.eclipse.ecf.datashare/SimpleMulticaster\" value=\"true\"/>\n<mapEntry key=\"org.eclipse.ui/trace/contexts.verbose\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.osgi/profile/benchmark\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.ecf.provider.yahooim/debug/filter\" value=\"*\"/>\n<mapEntry key=\"org.eclipse.ecf.provider/debug/flag\" value=\"true\"/>\n<mapEntry key=\"org.eclipse.ui/perf/perspective.create\" value=\"800\"/>\n<mapEntry key=\"org.eclipse.core.runtime/preferences/general\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.ecf/debug/containerfactory\" value=\"true\"/>\n<mapEntry key=\"org.eclipse.core.runtime/url/debug\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.team.cvs.ssh/debug\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.ui/perf/part.init\" value=\"800\"/>\n<mapEntry key=\"org.eclipse.core.runtime/perf/success\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.ltk.core.refactoring/perf/participants/createChanges\" value=\"300\"/>\n<mapEntry key=\"org.eclipse.ui/listeners/IWorkbenchWindow.IPageListener\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.osgi/eclipseadaptor/debug/platformadmin\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.team.cvs.core/dirtycaching\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.core.resources/natures\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.team.core/refreshjob\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.ecf.provider.xmpp/debug/smackconnection\" value=\"true\"/>\n<mapEntry key=\"org.eclipse.ecf.provider/debug/basesharedobject\" value=\"false\"/>\n<mapEntry key=\"org.eclipse.core.resources/perf/save.participants\" value=\"500\"/>\n<stringAttribute key=\"org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER\" value=\"org.eclipse.pde.ui.workbenchClasspathProvider\"/>", "old_methods": [], "patch": "@@ -8,303 +8,303 @@\n <stringAttribute key=\"location2\" value=\"C:\\eclipse3.1m4\\eclipse\\runtime-workspace\"/>\n <booleanAttribute key=\"automaticValidate\" value=\"false\"/>\n <mapAttribute key=\"tracingOptions\">\n-<mapEntry key=\"org.eclipse.ecf.provider.xmpp/debug/filter\" value=\"*\"/>\n-<mapEntry key=\"org.eclipse.help.ui/debug/embeddedBrowser\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.ui/perf/part.create\" value=\"800\"/>\n-<mapEntry key=\"org.eclipse.jdt.core/formatter/enable_new\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.core.resources/save/mastertable\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.team.cvs.core/syncchangeevents\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.ecf.provider.xmpp/debug/smackconnection\" value=\"true\"/>\n+<mapEntry key=\"org.eclipse.ecf.provider.irc/debug\" value=\"true\"/>\n+<mapEntry key=\"org.eclipse.core.resources/perf/listeners\" value=\"500\"/>\n+<mapEntry key=\"org.eclipse.team.ftp/debug\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.core.resources/build/needbuild\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.update.configurator/debug\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.ecf/debug/twophasecommiteventprocessor\" value=\"true\"/>\n+<mapEntry key=\"org.eclipse.osgi/monitor/activation\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.jdt.ui/perf/content_assist/extensions\" value=\"1000\"/>\n+<mapEntry key=\"org.eclipse.team.ftp/requests\" value=\"true\"/>\n+<mapEntry key=\"org.eclipse.ui.ide/debug/gc\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.core.resources/contenttype/cache\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.ui/debug/showSystemJobs\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.ecf.sdo/DataGraphSharingFactory\" value=\"true\"/>\n+<mapEntry key=\"org.eclipse.core.runtime/url/debug\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.osgi/monitor/classes\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.ecf.provider.xmpp/debug/XMPPClientSOContainer\" value=\"true\"/>\n+<mapEntry key=\"org.eclipse.ecf.provider.irc/debug/flag\" value=\"true\"/>\n+<mapEntry key=\"org.eclipse.update.core/debug\" value=\"true\"/>\n+<mapEntry key=\"org.eclipse.core.runtime/debug/context\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.ui/debug/swtdebug\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.ecf.provider/debug/containerfactory\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.jdt.core/debug/javamodel\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.ecf.provider.yahooim/debug/yahoocontainer\" value=\"true\"/>\n+<mapEntry key=\"org.eclipse.ecf/debug\" value=\"true\"/>\n+<mapEntry key=\"org.eclipse.ui.intro/trace/printHTML\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.jdt.core/debug/javadelta/verbose\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.jdt.core/debug\" value=\"true\"/>\n+<mapEntry key=\"org.eclipse.core.expressions/tracePropertyResolving\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.core.resources/restore\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.ltk.core.refactoring/perf/participants/checkConditions\" value=\"300\"/>\n+<mapEntry key=\"org.eclipse.ui/perf/perspective.listeners\" value=\"200\"/>\n+<mapEntry key=\"org.eclipse.ecf/debug/filter\" value=\"*\"/>\n+<mapEntry key=\"org.eclipse.jdt.core/perf/containerinitializer\" value=\"5000\"/>\n+<mapEntry key=\"org.eclipse.osgi/trace/filename\" value=\"runtime.traces\"/>\n+<mapEntry key=\"org.eclipse.ecf.provider.jms/debug/servercontainer\" value=\"true\"/>\n+<mapEntry key=\"org.eclipse.update.core/debug/web\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.ecf/debug/containerfactory\" value=\"true\"/>\n+<mapEntry key=\"org.eclipse.ecf.provider.xmpp/debug/flag\" value=\"true\"/>\n+<mapEntry key=\"org.eclipse.core.runtime/registry/debug/resolve\" value=\"false\"/>\n <mapEntry key=\"org.eclipse.osgi/debug\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.jdt.core/debug/selection\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.core.resources/strings\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.ui.ide/debug/internalerror/openDialog\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.ecf.provider.irc/debug/filter\" value=\"*\"/>\n-<mapEntry key=\"org.eclipse.ui/listeners/IWorkbenchPage.IPartListener\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.ui/perf/page.listeners\" value=\"200\"/>\n-<mapEntry key=\"org.eclipse.core.resources/save/tree\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.jdt.core/debug/postaction\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.ecf.example.collab/debug/urlsharedobject\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.core.runtime/url/debug/cachelookup\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.team.cvs.core/debug\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.osgi/trace/activation\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.ui/perf/perspective.switch\" value=\"800\"/>\n+<mapEntry key=\"org.eclipse.ecf/debug/idfactory\" value=\"true\"/>\n+<mapEntry key=\"org.eclipse.ecf.provider.yahooim/debug/flag\" value=\"true\"/>\n+<mapEntry key=\"org.eclipse.ecf.example.collab/debug/genericsharedobject\" value=\"true\"/>\n+<mapEntry key=\"org.eclipse.ecf.provider.jmdns/debug/filter\" value=\"*\"/>\n+<mapEntry key=\"org.eclipse.ui/perf/part.input\" value=\"200\"/>\n+<mapEntry key=\"org.eclipse.jface.text/debug/AnnotationPainter\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.ecf.provider/debug/sharedobjectmanager\" value=\"true\"/>\n+<mapEntry key=\"org.eclipse.ecf.datashare/debug\" value=\"true\"/>\n+<mapEntry key=\"org.eclipse.ecf/debug/factoryinit\" value=\"true\"/>\n+<mapEntry key=\"org.eclipse.osgi/resolver/imports\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.ecf.sdo/debug\" value=\"true\"/>\n+<mapEntry key=\"org.eclipse.osgi/trace/filters\" value=\"trace.properties\"/>\n+<mapEntry key=\"org.eclipse.help.ui/debug/infopop\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.osgi/eclipseadaptor/debug/platformadmin/resolver\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.ecf.sdo/EMFUpdateManager\" value=\"true\"/>\n <mapEntry key=\"org.eclipse.core.runtime/registry/debug/events/extension\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.osgi/debug/packages\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.osgi/monitor/resources\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.ecf.ui/debug/textchatcomposite\" value=\"true\"/>\n+<mapEntry key=\"org.eclipse.ecf.datashare/ConsistentMulticaster\" value=\"true\"/>\n <mapEntry key=\"org.eclipse.ecf.example.collab/debug/transactionsharedobject\" value=\"true\"/>\n-<mapEntry key=\"org.eclipse.core.resources/restore/markers\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.ecf.ui/debug\" value=\"true\"/>\n-<mapEntry key=\"org.eclipse.osgi/debug/messageBundles\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.ecf.ui/debug/filter\" value=\"*\"/>\n-<mapEntry key=\"org.eclipse.update.core/debug/parsing\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.core.runtime/url/debug/connect\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.osgi/debug/packageadmin/timing\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.help.base/debug/search\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.pde.core/cache\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.team.core/streams\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.ecf.provider.xmpp/debug\" value=\"true\"/>\n+<mapEntry key=\"org.eclipse.team.cvs.core/debug\" value=\"false\"/>\n <mapEntry key=\"org.eclipse.team.cvs.core/threading\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.osgi/eclipseadaptor/debug/platformadmin/resolver\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.ecf.example.collab/debug/filter\" value=\"*\"/>\n-<mapEntry key=\"org.eclipse.ecf.provider/debug/transactioneventprocessor\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.ui/perf/perspective.switch\" value=\"800\"/>\n-<mapEntry key=\"org.eclipse.ui/debug/declaredImages\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.ui/perf/contentTypes\" value=\"200\"/>\n-<mapEntry key=\"org.eclipse.ui/debug/swtdebug\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.jdt.core/perf/selection\" value=\"300\"/>\n-<mapEntry key=\"org.eclipse.ecf.datashare/ConsistentMulticaster\" value=\"true\"/>\n-<mapEntry key=\"org.eclipse.osgi/profile/debug\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.core.resources/contenttype/cache\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.ui.ide/debug/gc\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.jdt.core/debug/indexmanager\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.ecf.provider.jms/debug/flag\" value=\"true\"/>\n+<mapEntry key=\"org.eclipse.ecf.example.collab/debug/flag\" value=\"true\"/>\n+<mapEntry key=\"org.eclipse.jdt.ui/perf/search/participants\" value=\"300\"/>\n+<mapEntry key=\"org.eclipse.ui/perf/part.listeners\" value=\"200\"/>\n+<mapEntry key=\"org.eclipse.osgi/resolver/debug\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.update.core/debug/install\" value=\"false\"/>\n <mapEntry key=\"org.eclipse.core.runtime/jobs/errorondeadlock\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.ecf/debug/connectionfactory\" value=\"true\"/>\n+<mapEntry key=\"org.eclipse.core.resources/debug\" value=\"false\"/>\n <mapEntry key=\"org.eclipse.help.ui/debug/embeddedBrowser/inprocess\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.jdt.core/debug/compiler\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.ecf.provider.xmpp/debug/XMPPClientSOContainer\" value=\"true\"/>\n-<mapEntry key=\"org.eclipse.team.cvs.core/syncchangeevents\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.ltk.core.refactoring/perf/participants/checkConditions\" value=\"300\"/>\n-<mapEntry key=\"org.eclipse.jdt.ui/perf/explorer/makeActions\" value=\"1000\"/>\n-<mapEntry key=\"org.eclipse.ui/perf/workbench.start\" value=\"45000\"/>\n-<mapEntry key=\"org.eclipse.core.resources/perf/listeners\" value=\"500\"/>\n-<mapEntry key=\"org.eclipse.ui/trace/keyBindings.verbose\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.core.runtime/contenttypes/debug\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.osgi/debug/services\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.update.core/debug/reconciler\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.jdt.core/perf/completion\" value=\"300\"/>\n+<mapEntry key=\"org.eclipse.osgi/profile/impl\" value=\"org.eclipse.osgi.internal.profile.DefaultProfileLogger\"/>\n <mapEntry key=\"org.eclipse.ui/perf/part.control\" value=\"800\"/>\n-<mapEntry key=\"org.eclipse.ecf/debug/flag\" value=\"true\"/>\n-<mapEntry key=\"org.eclipse.ui/debug/job.stale\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.ui/perf/uijob\" value=\"200\"/>\n-<mapEntry key=\"org.eclipse.ecf.provider.irc/debug/irccontainer\" value=\"true\"/>\n-<mapEntry key=\"org.eclipse.jdt.core/debug/resolution\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.help.base/debug\" value=\"true\"/>\n-<mapEntry key=\"org.eclipse.ui.intro/debug\" value=\"true\"/>\n-<mapEntry key=\"org.eclipse.jdt.core/perf/containerinitializer\" value=\"5000\"/>\n-<mapEntry key=\"org.eclipse.osgi/eclipseadaptor/debug\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.core.resources/build/invoking\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.osgi/profile/benchmark\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.ecf.provider.xmpp/debug\" value=\"true\"/>\n+<mapEntry key=\"org.eclipse.team.cvs.core/cvsprotocol\" value=\"true\"/>\n+<mapEntry key=\"org.eclipse.jdt.core/debug/postaction\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.osgi/debug/manifest\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.jdt.core/perf/selection\" value=\"300\"/>\n+<mapEntry key=\"org.eclipse.help/debug/context\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.jdt.core/debug/builder\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.osgi/resolver/requires\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.team.cvs.ssh/debug\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.ui/trace/handlers.verbose\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.update.core/debug/installhandler\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.osgi/debug/startlevel\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.ecf.provider.xmpp/debug/filter\" value=\"*\"/>\n+<mapEntry key=\"org.eclipse.jdt.core/debug/javadelta\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.core.resources/preferences\" value=\"false\"/>\n <mapEntry key=\"org.eclipse.core.resources/restore/tree\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.ecf.provider/debug/filter\" value=\"*\"/>\n-<mapEntry key=\"org.eclipse.osgi/monitor/classes\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.jdt.ui/debug/TypeConstraints\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.ecf.example.collab/debug\" value=\"true\"/>\n+<mapEntry key=\"org.eclipse.help/debug/protocols\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.core.resources/perf/save.participants\" value=\"500\"/>\n+<mapEntry key=\"org.eclipse.core.resources/natures\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.help.base/debug/search\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.osgi/defaultprofile/buffersize\" value=\"256\"/>\n+<mapEntry key=\"org.eclipse.osgi/resolver/cycles\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.jdt.core/perf/variableinitializer\" value=\"5000\"/>\n+<mapEntry key=\"org.eclipse.ui/trace/keyBindings.verbose\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.core.runtime/preferences/get\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.core.runtime/perf/success\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.core.runtime/compatibility/debug\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.ecf.provider/debug/transactioneventprocessor\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.ui/debug/declaredImages\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.pde.build/debug\" value=\"false\"/>\n <mapEntry key=\"org.eclipse.osgi/eclipseadaptor/debug/location\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.core.resources/save\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.ui.intro/trace/logPerformance\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.ecf.provider.xmpp/debug/xmppgroupchatsharedobject\" value=\"true\"/>\n-<mapEntry key=\"org.eclipse.core.resources/restore/syncinfo\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.debug.core/debug\" value=\"true\"/>\n-<mapEntry key=\"org.eclipse.team.ftp/requests\" value=\"true\"/>\n-<mapEntry key=\"org.eclipse.osgi/resolver/requires\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.ecf.provider/debug/sharedobjectcontext\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.ecf.provider/debug/container\" value=\"true\"/>\n-<mapEntry key=\"org.eclipse.jdt.ui/perf/search/participants\" value=\"300\"/>\n-<mapEntry key=\"org.eclipse.core.resources/build/needbuild\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.core.runtime/jobs/timing\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.core.resources/restore/snapshots\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.help.ui/debug\" value=\"true\"/>\n-<mapEntry key=\"org.eclipse.osgi/profile/startup\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.ecf.datashare/OrderedMulticaster\" value=\"true\"/>\n-<mapEntry key=\"org.eclipse.jdt.core/perf/javadeltalistener\" value=\"500\"/>\n-<mapEntry key=\"org.eclipse.ecf.example.collab/debug/filetransfersharedobject\" value=\"true\"/>\n+<mapEntry key=\"org.eclipse.ui/trace/contexts.verbose\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.ecf.provider/debug/sharedobjectwrapper\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.ecf.provider.irc/debug/filter\" value=\"*\"/>\n+<mapEntry key=\"org.eclipse.help.base/debug\" value=\"true\"/>\n+<mapEntry key=\"org.eclipse.core.runtime/jobs\" value=\"false\"/>\n <mapEntry key=\"org.eclipse.ecf.sdo/SharedDataGraph\" value=\"true\"/>\n-<mapEntry key=\"org.eclipse.core.runtime/registry/debug/resolve\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.jdt.core/debug/javamodel\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.update.core/debug/install\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.update.core/debug/warning\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.team.ftp/responses\" value=\"true\"/>\n-<mapEntry key=\"org.eclipse.jdt.ui/perf/explorer/createPartControl\" value=\"1300\"/>\n-<mapEntry key=\"org.eclipse.core.runtime/registry/debug\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.ecf.sdo/debug\" value=\"true\"/>\n-<mapEntry key=\"org.eclipse.pde.core/debug\" value=\"true\"/>\n-<mapEntry key=\"org.eclipse.osgi/monitor/activation\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.core.resources/perf/builders\" value=\"10000\"/>\n-<mapEntry key=\"org.eclipse.core.runtime/debug\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.ui/listeners/IWorkbenchPage.IPartListener\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.ecf.provider.jms/debug\" value=\"true\"/>\n+<mapEntry key=\"org.eclipse.ui/perf/perspective.create\" value=\"800\"/>\n+<mapEntry key=\"org.eclipse.core.runtime/contenttypes/debug\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.core.resources/strings\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.jdt.ui/debug/checkCoreBindingGetJavaElement\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.ui/listeners/IWorkbenchPartReference\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.core.resources/save/metainfo\" value=\"false\"/>\n <mapEntry key=\"org.eclipse.ui/perf/part.activate\" value=\"200\"/>\n-<mapEntry key=\"org.eclipse.help/debug\" value=\"true\"/>\n-<mapEntry key=\"org.eclipse.jdt.core/debug/builder\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.core.runtime/preferences/set\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.core.runtime/perf\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.core.resources/contenttype\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.ui/debug/contributions\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.ui/debug/job.stale\" value=\"false\"/>\n <mapEntry key=\"org.eclipse.jdt.ui/debug/allTypesCache\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.ecf.provider/debug/connection\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.core.resources/restore/metainfo\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.team.cvs.ssh/ssh_protocol\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.jdt.core/perf/reconcile\" value=\"1000\"/>\n-<mapEntry key=\"org.eclipse.ui/trace/contexts\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.jdt.ui/debug\" value=\"true\"/>\n-<mapEntry key=\"org.eclipse.core.runtime/preferences/get\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.ecf.example.collab/debug/flag\" value=\"true\"/>\n-<mapEntry key=\"org.eclipse.ui/perf/part.input\" value=\"200\"/>\n-<mapEntry key=\"org.eclipse.ecf.provider/debug/sharedobjectwrapper\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.ecf.ui/debug/flag\" value=\"true\"/>\n-<mapEntry key=\"org.eclipse.jdt.core/debug/cpresolution\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.ui/debug/showSystemJobs\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.team.cvs.core/cvsprotocol\" value=\"true\"/>\n-<mapEntry key=\"org.eclipse.ecf.provider/debug/containerfactory\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.osgi/resolver/cycles\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.ecf.provider.xmpp/debug/smackdebug\" value=\"true\"/>\n-<mapEntry key=\"org.eclipse.osgi/eclipseadaptor/converter/debug\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.ui/listeners/IWorkbenchPartReference\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.ecf.provider.xmpp/debug/flag\" value=\"true\"/>\n-<mapEntry key=\"org.eclipse.ecf.provider.jmdns/debug/flag\" value=\"true\"/>\n-<mapEntry key=\"org.eclipse.core.resources/history\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.ui/listeners/IWorkbenchWindow.IPartListener2\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.help.webapp/debug/workingsets\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.ecf.provider.jmdns/debug/jmdns\" value=\"true\"/>\n-<mapEntry key=\"org.eclipse.osgi/resolver/grouping\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.jdt.core/debug/buffermanager\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.core.resources/build/delta\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.osgi/resolver/imports\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.jdt.core/debug/completion\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.ui/perf/workbench.start\" value=\"45000\"/>\n+<mapEntry key=\"org.eclipse.osgi/eclipseadaptor/debug\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.ui/listeners/IWorkbenchWindow.IPartListener\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.jdt.core/debug/indexmanager\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.ecf.provider.jmdns/debug/container\" value=\"true\"/>\n+<mapEntry key=\"org.eclipse.ui/listeners/IWorkbenchWindow.IPerspectiveListener\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.osgi/debug/loader\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.ecf.discovery/debug/flag\" value=\"true\"/>\n+<mapEntry key=\"org.eclipse.ecf.provider.yahooim/debug/filter\" value=\"*\"/>\n <mapEntry key=\"org.eclipse.osgi/defaultprofile/logsynchronously\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.ecf/debug\" value=\"true\"/>\n-<mapEntry key=\"org.eclipse.core.resources/save/syncinfo\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.ecf.provider.yahooim/debug/flag\" value=\"true\"/>\n-<mapEntry key=\"org.eclipse.jdt.ui/debug/ResultCollector\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.core.expressions/tracePropertyResolving\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.ui/perf/showHeapStatus\" value=\"true\"/>\n-<mapEntry key=\"org.eclipse.ui/perf/part.listeners\" value=\"200\"/>\n-<mapEntry key=\"org.eclipse.osgi/resolver/wiring\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.core.runtime/url/debug/cachecopy\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.ecf.provider.irc/debug\" value=\"true\"/>\n-<mapEntry key=\"org.eclipse.jdt.ui/perf/explorer/RefactorActionGroup\" value=\"150\"/>\n-<mapEntry key=\"org.eclipse.jdt.ui/perf/content_assist/extensions\" value=\"1000\"/>\n-<mapEntry key=\"org.eclipse.pde.core/classpath\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.core.resources/restore\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.update.core/debug/web\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.ecf.discovery/debug\" value=\"true\"/>\n-<mapEntry key=\"org.eclipse.help.webapp/debug\" value=\"true\"/>\n-<mapEntry key=\"org.eclipse.jdt.core/debug/search\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.jdt.ui/debug/useUIBindingGetJavaElement\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.ecf.example.collab/debug/progsharedobject\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.osgi/trace/classLoading\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.core.runtime/debug\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.ui/trace/handlers.verbose.commandId\" value=\"\"/>\n+<mapEntry key=\"org.eclipse.osgi/debug/filter\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.ecf.datashare/SimpleMulticaster\" value=\"true\"/>\n+<mapEntry key=\"org.eclipse.jdt.ui/debug/ASTProvider\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.ecf.example.collab/debug/filter\" value=\"*\"/>\n+<mapEntry key=\"org.eclipse.ecf.provider/debug\" value=\"true\"/>\n+<mapEntry key=\"org.eclipse.core.runtime/jobs/timing\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.ecf.example.collab/debug/urlsharedobject\" value=\"false\"/>\n <mapEntry key=\"org.eclipse.osgi/defaultprofile/logfilename\" value=\"\"/>\n-<mapEntry key=\"org.eclipse.osgi/debug/startlevel\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.jdt.core/debug/sourcemapper\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.osgi/defaultprofile/buffersize\" value=\"256\"/>\n-<mapEntry key=\"org.eclipse.core.resources/save/markers\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.osgi/debug/manifest\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.ui.intro/trace/logInfo\" value=\"true\"/>\n-<mapEntry key=\"org.eclipse.jdt.ui/hideDerivedFromRefactoring\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.core.runtime/perf\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.ecf.ui/debug/textchatcomposite\" value=\"true\"/>\n-<mapEntry key=\"org.eclipse.jdt.core/debug/hierarchy\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.ecf.discovery/debug/filter\" value=\"*\"/>\n-<mapEntry key=\"org.eclipse.ecf.provider/debug/gmm\" value=\"true\"/>\n-<mapEntry key=\"org.eclipse.core.resources/refresh\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.help.webapp/debug/workingsets\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.ecf.example.collab/debug\" value=\"true\"/>\n+<mapEntry key=\"org.eclipse.ecf.provider.jms/debug/brokercontainer\" value=\"true\"/>\n+<mapEntry key=\"org.eclipse.jface.text/debug/ContentAssistSubjectAdapters\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.core.runtime/url/debug/connect\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.core.resources/restore/markers\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.ui/trace/graphics\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.jdt.core/debug/resolution\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.team.cvs.ssh/ssh_protocol\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.core.resources/perf/snapshot\" value=\"1000\"/>\n+<mapEntry key=\"org.eclipse.ecf.provider/debug/filter\" value=\"*\"/>\n+<mapEntry key=\"org.eclipse.core.runtime/registry/debug\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.osgi/debug/packages\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.ecf.provider.jms/debug/flag\" value=\"true\"/>\n+<mapEntry key=\"org.eclipse.ui/perf/part.init\" value=\"800\"/>\n+<mapEntry key=\"org.eclipse.ui.intro/trace/logPerformance\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.osgi/eclipseadaptor/converter/debug\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.ecf/debug/abstractsharedobject\" value=\"true\"/>\n+<mapEntry key=\"org.eclipse.ui/perf/part.create\" value=\"800\"/>\n+<mapEntry key=\"org.eclipse.osgi/eclipseadaptor/debug/platformadmin\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.help.ui/debug/embeddedBrowser\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.core.runtime/preferences/set\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.team.core/streams\" value=\"false\"/>\n <mapEntry key=\"org.eclipse.core.runtime/jobs/locks\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.ecf.example.collab/debug/genericsharedobject\" value=\"true\"/>\n-<mapEntry key=\"org.eclipse.update.core/debug/installhandler\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.core.resources/save/metainfo\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.ui/debug/contributions\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.ui/trace/operations.verbose\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.jface.text.source/debug/RevisionRulerColumn\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.core.resources/restore/mastertable\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.ecf/debug/sharedobjectcontainerfactory\" value=\"true\"/>\n-<mapEntry key=\"org.eclipse.osgi/trace/activation\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.ui.ide/debug\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.core.resources/build/stacktrace\" value=\"false\"/>\n <mapEntry key=\"org.eclipse.ui/trace/keyBindings\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.update.core/debug/type\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.ecf.datashare/debug\" value=\"true\"/>\n-<mapEntry key=\"org.eclipse.ui.browser/debug\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.ecf.provider.yahooim/debug\" value=\"true\"/>\n-<mapEntry key=\"org.eclipse.jdt.core/perf/variableinitializer\" value=\"5000\"/>\n-<mapEntry key=\"org.eclipse.help/debug/context\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.jdt.ui/debug/TypeConstraints\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.ecf.ui/debug/flag\" value=\"true\"/>\n+<mapEntry key=\"org.eclipse.ui/perf/showHeapStatus\" value=\"true\"/>\n+<mapEntry key=\"org.eclipse.ecf.example.collab/debug/progsharedobject\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.ui/perf/contentTypes\" value=\"200\"/>\n+<mapEntry key=\"org.eclipse.core.resources/build/delta\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.jdt.core/debug/search\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.ecf.provider.irc/debug/irccontainer\" value=\"true\"/>\n+<mapEntry key=\"org.eclipse.ecf/debug/connectionfactory\" value=\"true\"/>\n <mapEntry key=\"org.eclipse.jdt.ui/debug/checkCoreBindingIsEqualTo\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.jdt.core/perf/completion\" value=\"300\"/>\n+<mapEntry key=\"org.eclipse.jdt.core/debug/compiler\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.ecf.example.collab/debug/filetransfersharedobject\" value=\"true\"/>\n+<mapEntry key=\"org.eclipse.ecf.provider/debug/connection\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.jdt.ui/debug\" value=\"true\"/>\n+<mapEntry key=\"org.eclipse.ecf.provider.jmdns/debug/flag\" value=\"true\"/>\n <mapEntry key=\"org.eclipse.update.core/debug/configuration\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.osgi/debug/messageBundles\" value=\"false\"/>\n <mapEntry key=\"org.eclipse.ecf.provider.jms/debug/clientcontainer\" value=\"true\"/>\n-<mapEntry key=\"org.eclipse.osgi/debug/packageadmin\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.ecf/debug/factoryinit\" value=\"true\"/>\n-<mapEntry key=\"org.eclipse.ecf.provider/debug/sharedobjectmanager\" value=\"true\"/>\n-<mapEntry key=\"org.eclipse.jdt.core/debug/completion\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.pde.build/debug\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.jface.text/debug/ContentAssistSubjectAdapters\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.ui/listeners/IWorkbenchWindow.IPartListener2\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.ui/listeners/IWorkbenchPage.IPartListener2\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.jdt.core/perf/reconcile\" value=\"1000\"/>\n+<mapEntry key=\"org.eclipse.jdt.core/debug/hierarchy\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.help.webapp/debug\" value=\"true\"/>\n+<mapEntry key=\"org.eclipse.ecf/debug/sharedobjectcontainerfactory\" value=\"true\"/>\n+<mapEntry key=\"org.eclipse.core.resources/refresh\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.ltk.core.refactoring/perf/participants/createChanges\" value=\"300\"/>\n+<mapEntry key=\"org.eclipse.team.core/backgroundevents\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.jdt.core/debug/cpresolution\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.ecf/debug/flag\" value=\"true\"/>\n+<mapEntry key=\"org.eclipse.update.core/debug/warning\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.core.resources/save\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.jdt.ui/hideDerivedFromRefactoring\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.ecf.provider/debug/flag\" value=\"true\"/>\n+<mapEntry key=\"org.eclipse.update.core/debug/parsing\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.jdt.ui/perf/explorer/makeActions\" value=\"1000\"/>\n+<mapEntry key=\"org.eclipse.core.runtime/preferences/general\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.core.resources/restore/syncinfo\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.ui/listeners/IWorkbenchWindow.IPageListener\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.team.core/threading\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.core.runtime/url/debug/cachelookup\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.osgi/debug/packageadmin/timing\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.update.core/debug/reconciler\" value=\"false\"/>\n <mapEntry key=\"org.eclipse.osgi/debug/security\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.core.runtime/compatibility/debug\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.ui/trace/graphics\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.update.core/debug\" value=\"true\"/>\n+<mapEntry key=\"org.eclipse.core.resources/save/syncinfo\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.osgi/profile/startup\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.ecf.ui/debug/filter\" value=\"*\"/>\n+<mapEntry key=\"org.eclipse.ecf.provider/debug/basesharedobject\" value=\"false\"/>\n <mapEntry key=\"org.eclipse.team.ftp/list\" value=\"true\"/>\n-<mapEntry key=\"org.eclipse.team.core/debug\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.help.ui/debug/infopop\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.osgi/trace/filename\" value=\"runtime.traces\"/>\n-<mapEntry key=\"org.eclipse.ecf.provider.yahooim/debug/yahoocontainer\" value=\"true\"/>\n-<mapEntry key=\"org.eclipse.core.runtime/jobs\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.ecf.provider.jms/debug/servercontainer\" value=\"true\"/>\n-<mapEntry key=\"org.eclipse.ui/trace/handlers.verbose\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.ecf.sdo/DataGraphSharingFactory\" value=\"true\"/>\n-<mapEntry key=\"org.eclipse.osgi/resolver/debug\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.jface.text/debug/AnnotationPainter\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.ui/trace/handlers.verbose.commandId\" value=\"\"/>\n-<mapEntry key=\"org.eclipse.ecf/debug/idfactory\" value=\"true\"/>\n-<mapEntry key=\"org.eclipse.ui.intro/trace/printHTML\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.ecf.provider.jms/debug\" value=\"true\"/>\n-<mapEntry key=\"org.eclipse.ui/listeners/IWorkbenchPage.IPropertyChangeListener\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.team.core/threading\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.jdt.core/debug/javadelta\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.ui/debug\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.osgi/debug/services\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.core.resources/save/markers\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.ecf.provider/debug/gmm\" value=\"true\"/>\n+<mapEntry key=\"org.eclipse.osgi/monitor/resources\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.jdt.core/debug/selection\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.jdt.ui/debug/ResultCollector\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.jdt.ui/perf/explorer/createPartControl\" value=\"1300\"/>\n+<mapEntry key=\"org.eclipse.core.resources/restore/snapshots\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.team.cvs.core/dirtycaching\" value=\"false\"/>\n <mapEntry key=\"org.eclipse.jdt.core/debug/zipaccess\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.team.core/backgroundevents\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.ecf.provider.jms/debug/filter\" value=\"*\"/>\n-<mapEntry key=\"org.eclipse.osgi/trace/filters\" value=\"trace.properties\"/>\n-<mapEntry key=\"org.eclipse.jdt.core/debug/javadelta/verbose\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.core.resources/debug\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.jdt.ui/debug/checkCoreBindingGetJavaElement\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.core.runtime/debug/context\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.ui/listeners/IWorkbenchWindow.IPerspectiveListener\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.core.resources/build/stacktrace\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.ecf.sdo/EMFUpdateManager\" value=\"true\"/>\n-<mapEntry key=\"org.eclipse.ui/listeners/IWorkbenchWindow.IPartListener\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.pde.core/cache\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.core.runtime/url/debug/cachecopy\" value=\"false\"/>\n <mapEntry key=\"org.eclipse.osgi/debug/bundleTime\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.ecf.provider/debug\" value=\"true\"/>\n-<mapEntry key=\"org.eclipse.core.resources/build/failure\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.osgi/profile/impl\" value=\"org.eclipse.osgi.internal.profile.DefaultProfileLogger\"/>\n-<mapEntry key=\"org.eclipse.ecf.discovery/debug/flag\" value=\"true\"/>\n+<mapEntry key=\"org.eclipse.core.runtime/jobs/beginend\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.ecf.provider.jms/debug/filter\" value=\"*\"/>\n+<mapEntry key=\"org.eclipse.ui/trace/operations.verbose\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.team.cvs.core/metafiles\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.team.core/debug\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.team.ftp/responses\" value=\"true\"/>\n+<mapEntry key=\"org.eclipse.ecf.datashare/OrderedMulticaster\" value=\"true\"/>\n <mapEntry key=\"org.eclipse.ui/perf/workbench.restore\" value=\"30000\"/>\n-<mapEntry key=\"org.eclipse.jdt.core/debug\" value=\"true\"/>\n-<mapEntry key=\"org.eclipse.ecf.provider.xmpp/debug/xmpppresencesharedobject\" value=\"true\"/>\n-<mapEntry key=\"org.eclipse.osgi/debug/filter\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.ecf/debug/filter\" value=\"*\"/>\n-<mapEntry key=\"org.eclipse.ecf.provider.jmdns/debug/container\" value=\"true\"/>\n-<mapEntry key=\"org.eclipse.update.configurator/debug\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.osgi/debug/events\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.ecf.discovery/debug/filter\" value=\"*\"/>\n+<mapEntry key=\"org.eclipse.jdt.ui/debug/useUIBindingGetJavaElement\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.ecf.provider/debug/sharedobjectcontext\" value=\"false\"/>\n <mapEntry key=\"org.eclipse.osgi/debug/monitorbundles\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.ecf.provider.jmdns/debug/filter\" value=\"*\"/>\n-<mapEntry key=\"org.eclipse.team.cvs.core/metafiles\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.core.resources/contenttype\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.ui.ide/debug/internalerror/openDialog\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.ecf.provider.xmpp/debug/smackdebug\" value=\"true\"/>\n+<mapEntry key=\"org.eclipse.ui/perf/uijob\" value=\"200\"/>\n+<mapEntry key=\"org.eclipse.jdt.core/debug/sourcemapper\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.osgi/resolver/wiring\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.jdt.core/perf/javadeltalistener\" value=\"500\"/>\n+<mapEntry key=\"org.eclipse.osgi/profile/debug\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.ecf.provider.xmpp/debug/xmppgroupchatsharedobject\" value=\"true\"/>\n+<mapEntry key=\"org.eclipse.ui/trace/contexts\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.ecf.provider.xmpp/debug/xmpppresencesharedobject\" value=\"true\"/>\n+<mapEntry key=\"org.eclipse.core.resources/build/invoking\" value=\"false\"/>\n <mapEntry key=\"org.eclipse.ui/trace/operations\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.help/debug/protocols\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.update.core/debug/type\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.core.resources/perf/builders\" value=\"10000\"/>\n <mapEntry key=\"org.eclipse.ecf.provider.jms/debug/channel\" value=\"true\"/>\n-<mapEntry key=\"org.eclipse.ui/listeners/IWorkbenchPage.IPartListener2\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.ecf.provider.jms/debug/brokercontainer\" value=\"true\"/>\n-<mapEntry key=\"org.eclipse.osgi/debug/loader\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.jdt.ui/debug/ASTProvider\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.core.resources/preferences\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.ecf/debug/twophasecommiteventprocessor\" value=\"true\"/>\n-<mapEntry key=\"org.eclipse.team.ftp/debug\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.core.resources/perf/snapshot\" value=\"1000\"/>\n+<mapEntry key=\"org.eclipse.ecf.provider.yahooim/debug\" value=\"true\"/>\n+<mapEntry key=\"org.eclipse.ui/perf/page.listeners\" value=\"200\"/>\n+<mapEntry key=\"org.eclipse.jdt.ui/perf/explorer/RefactorActionGroup\" value=\"150\"/>\n+<mapEntry key=\"org.eclipse.core.resources/history\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.team.core/refreshjob\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.ui.intro/debug\" value=\"true\"/>\n+<mapEntry key=\"org.eclipse.ecf.discovery/debug\" value=\"true\"/>\n+<mapEntry key=\"org.eclipse.debug.core/debug\" value=\"true\"/>\n+<mapEntry key=\"org.eclipse.help/debug\" value=\"true\"/>\n+<mapEntry key=\"org.eclipse.jface.text.source/debug/RevisionRulerColumn\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.ui/debug\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.osgi/debug/packageadmin\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.core.resources/build/failure\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.ecf.provider/debug/container\" value=\"true\"/>\n <mapEntry key=\"org.eclipse.ui/trace/handlers\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.ui/perf/perspective.listeners\" value=\"200\"/>\n-<mapEntry key=\"org.eclipse.core.runtime/jobs/beginend\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.ecf/debug/abstractsharedobject\" value=\"true\"/>\n-<mapEntry key=\"org.eclipse.osgi/debug/events\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.ui/listeners/IWorkbenchPage.IPropertyChangeListener\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.ecf.ui/debug\" value=\"true\"/>\n <mapEntry key=\"org.eclipse.ecf.provider.jmdns/debug\" value=\"true\"/>\n-<mapEntry key=\"org.eclipse.osgi/trace/classLoading\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.ecf.provider.irc/debug/flag\" value=\"true\"/>\n-<mapEntry key=\"org.eclipse.ecf.datashare/SimpleMulticaster\" value=\"true\"/>\n-<mapEntry key=\"org.eclipse.ui/trace/contexts.verbose\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.osgi/profile/benchmark\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.ecf.provider.yahooim/debug/filter\" value=\"*\"/>\n-<mapEntry key=\"org.eclipse.ecf.provider/debug/flag\" value=\"true\"/>\n-<mapEntry key=\"org.eclipse.ui/perf/perspective.create\" value=\"800\"/>\n-<mapEntry key=\"org.eclipse.core.runtime/preferences/general\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.ecf/debug/containerfactory\" value=\"true\"/>\n-<mapEntry key=\"org.eclipse.core.runtime/url/debug\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.team.cvs.ssh/debug\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.ui/perf/part.init\" value=\"800\"/>\n-<mapEntry key=\"org.eclipse.core.runtime/perf/success\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.ltk.core.refactoring/perf/participants/createChanges\" value=\"300\"/>\n-<mapEntry key=\"org.eclipse.ui/listeners/IWorkbenchWindow.IPageListener\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.osgi/eclipseadaptor/debug/platformadmin\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.team.cvs.core/dirtycaching\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.core.resources/natures\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.team.core/refreshjob\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.ecf.provider.xmpp/debug/smackconnection\" value=\"true\"/>\n-<mapEntry key=\"org.eclipse.ecf.provider/debug/basesharedobject\" value=\"false\"/>\n-<mapEntry key=\"org.eclipse.core.resources/perf/save.participants\" value=\"500\"/>\n+<mapEntry key=\"org.eclipse.ui.browser/debug\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.core.resources/save/tree\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.help.ui/debug\" value=\"true\"/>\n+<mapEntry key=\"org.eclipse.core.resources/restore/metainfo\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.core.resources/save/mastertable\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.pde.core/debug\" value=\"true\"/>\n+<mapEntry key=\"org.eclipse.jdt.core/debug/buffermanager\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.ecf.provider.jmdns/debug/jmdns\" value=\"true\"/>\n+<mapEntry key=\"org.eclipse.osgi/resolver/grouping\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.ui.ide/debug\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.jdt.core/formatter/enable_new\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.core.resources/restore/mastertable\" value=\"false\"/>\n+<mapEntry key=\"org.eclipse.ui.intro/trace/logInfo\" value=\"true\"/>\n+<mapEntry key=\"org.eclipse.pde.core/classpath\" value=\"false\"/>\n </mapAttribute>\n <stringAttribute key=\"selectedPlugin\" value=\"org.eclipse.ecf.provider.xmpp\"/>\n <booleanAttribute key=\"automaticAdd\" value=\"true\"/>\n@@ -314,12 +314,13 @@\n <stringAttribute key=\"configLocation\" value=\"\"/>\n <booleanAttribute key=\"clearws\" value=\"false\"/>\n <stringAttribute key=\"location1\" value=\"C:\\eclipse3.1m4\\eclipse\\second-runtime-workspace\"/>\n+<stringAttribute key=\"pde.version\" value=\"3.2\"/>\n <stringAttribute key=\"templateConfig\" value=\"\"/>\n <booleanAttribute key=\"default\" value=\"true\"/>\n <booleanAttribute key=\"clearConfig\" value=\"true\"/>\n <booleanAttribute key=\"org.eclipse.debug.core.appendEnvironmentVariables\" value=\"true\"/>\n-<stringAttribute key=\"org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER\" value=\"org.eclipse.pde.ui.workbenchClasspathProvider\"/>\n <booleanAttribute key=\"useDefaultConfigArea\" value=\"true\"/>\n+<stringAttribute key=\"org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER\" value=\"org.eclipse.pde.ui.workbenchClasspathProvider\"/>\n <booleanAttribute key=\"useDefaultConfig\" value=\"true\"/>\n <booleanAttribute key=\"askclear\" value=\"true\"/>\n <booleanAttribute key=\"includeOptional\" value=\"true\"/>", "raw_url": "https://github.com/eclipse/ecf/raw/0d00787f0d8de19464aaac7bc951d9817fd7c518/examples%2Fbundles%2Forg.eclipse.ecf.example.collab%2Flaunchconfigs%2FECF%20Example%20Collab%20Client%202.launch", "sha": "51755a91c0953346f7f17c8527ddd245dbc2096b", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/eclipse/ecf/blob/0d00787f0d8de19464aaac7bc951d9817fd7c518/examples%2Fbundles%2Forg.eclipse.ecf.example.collab%2Fsrc%2Forg%2Feclipse%2Fecf%2Fexample%2Fcollab%2FChatRoomManagerUI.java", "changes": 2, "contents_url": "https://api.github.com/repos/eclipse/ecf/contents/examples%2Fbundles%2Forg.eclipse.ecf.example.collab%2Fsrc%2Forg%2Feclipse%2Fecf%2Fexample%2Fcollab%2FChatRoomManagerUI.java?ref=0d00787f0d8de19464aaac7bc951d9817fd7c518", "deletions": 1, "filename": "examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ChatRoomManagerUI.java", "new_code": "\t\t\t\t\t\tchatRoom = manager.createChatRoomContainer();", "new_methods": [], "old_code": "\t\t\t\t\t\tchatRoom = manager.makeChatRoomContainer();", "old_methods": [], "patch": "@@ -40,7 +40,7 @@ public void run() {\n \t\t\t\ttry {\n \t\t\t\t\tIChatRoomContainer chatRoom = null;\n \t\t\t\t\ttry {\n-\t\t\t\t\t\tchatRoom = manager.makeChatRoomContainer();\n+\t\t\t\t\t\tchatRoom = manager.createChatRoomContainer();\n \t\t\t\t\t} catch (ContainerInstantiationException e1) {\n \t\t\t\t\t\t// can't happen\n \t\t\t\t\t}", "raw_url": "https://github.com/eclipse/ecf/raw/0d00787f0d8de19464aaac7bc951d9817fd7c518/examples%2Fbundles%2Forg.eclipse.ecf.example.collab%2Fsrc%2Forg%2Feclipse%2Fecf%2Fexample%2Fcollab%2FChatRoomManagerUI.java", "sha": "0beb3d251f25940b58d7f34751aec3c14729023e", "status": "modified" }, { "additions": 3, "blob_url": "https://github.com/eclipse/ecf/blob/0d00787f0d8de19464aaac7bc951d9817fd7c518/examples%2Fbundles%2Forg.eclipse.ecf.example.collab%2Fsrc%2Forg%2Feclipse%2Fecf%2Fexample%2Fcollab%2FCollabClient.java", "changes": 6, "contents_url": "https://api.github.com/repos/eclipse/ecf/contents/examples%2Fbundles%2Forg.eclipse.ecf.example.collab%2Fsrc%2Forg%2Feclipse%2Fecf%2Fexample%2Fcollab%2FCollabClient.java?ref=0d00787f0d8de19464aaac7bc951d9817fd7c518", "deletions": 3, "filename": "examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/CollabClient.java", "new_code": "\t\t\t\t.getDefault().createContainer(containerType);\n\t\tID targetID = IDFactory.getDefault().createID(targetNamespace, uri);\n\t\t\tnewClient.connect(targetID, ConnectContextFactory.createUsernamePasswordConnectContext(username, connectData));", "new_methods": [], "old_code": "\t\t\t\t.getDefault().makeContainer(containerType);\n\t\tID targetID = IDFactory.getDefault().makeID(targetNamespace, uri);\n\t\t\tnewClient.connect(targetID, ConnectContextFactory.makeUsernamePasswordConnectContext(username, connectData));", "old_methods": [], "patch": "@@ -43,12 +43,12 @@ public void createAndConnectClient(final String containerType, String uri,\n \t\t\tthrows Exception {\n \t\t// First create the new container instance\n \t\tfinal IContainer newClient = ContainerFactory\n-\t\t\t\t.getDefault().makeContainer(containerType);\n+\t\t\t\t.getDefault().createContainer(containerType);\n \t\t\n \t\t// Get the target namespace, so we can create a target ID of appropriate type\n \t\tNamespace targetNamespace = newClient.getConnectNamespace();\n \t\t// Create the targetID instance\n-\t\tID targetID = IDFactory.getDefault().makeID(targetNamespace, uri);\n+\t\tID targetID = IDFactory.getDefault().createID(targetNamespace, uri);\n \t\t\n \t\t// Setup username\n \t\tString username = setupUsername(targetID,nickname);\n@@ -86,7 +86,7 @@ public void createAndConnectClient(final String containerType, String uri,\n \t\t\n \t\t// Now connect\n \t\ttry {\n-\t\t\tnewClient.connect(targetID, ConnectContextFactory.makeUsernamePasswordConnectContext(username, connectData));\n+\t\t\tnewClient.connect(targetID, ConnectContextFactory.createUsernamePasswordConnectContext(username, connectData));\n \t\t} catch (ContainerConnectException e) {\n \t\t\t// If we have a connect exception then we remove any previously added shared object\n \t\t\tEclipseCollabSharedObject so = newClientEntry.getObject();", "raw_url": "https://github.com/eclipse/ecf/raw/0d00787f0d8de19464aaac7bc951d9817fd7c518/examples%2Fbundles%2Forg.eclipse.ecf.example.collab%2Fsrc%2Forg%2Feclipse%2Fecf%2Fexample%2Fcollab%2FCollabClient.java", "sha": "b0e6e5daa8485aa2e95260c6cf891766e5e6783b", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/eclipse/ecf/blob/0d00787f0d8de19464aaac7bc951d9817fd7c518/examples%2Fbundles%2Forg.eclipse.ecf.example.collab%2Fsrc%2Forg%2Feclipse%2Fecf%2Fexample%2Fcollab%2FDiscoveryStartup.java", "changes": 2, "contents_url": "https://api.github.com/repos/eclipse/ecf/contents/examples%2Fbundles%2Forg.eclipse.ecf.example.collab%2Fsrc%2Forg%2Feclipse%2Fecf%2Fexample%2Fcollab%2FDiscoveryStartup.java?ref=0d00787f0d8de19464aaac7bc951d9817fd7c518", "deletions": 1, "filename": "examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/DiscoveryStartup.java", "new_code": "\t\t\tsocontainer = ContainerFactory.getDefault().createContainer(", "new_methods": [], "old_code": "\t\t\tsocontainer = ContainerFactory.getDefault().makeContainer(", "old_methods": [], "patch": "@@ -55,7 +55,7 @@ protected boolean isActive() {\n \t}\n \tprotected void setupDiscovery() throws Exception {\n \t\ttry {\n-\t\t\tsocontainer = ContainerFactory.getDefault().makeContainer(\n+\t\t\tsocontainer = ContainerFactory.getDefault().createContainer(\n \t\t\t\t\tDISCOVERY_CONTAINER);\n \t\t\tdiscovery = (IDiscoveryContainer) socontainer\n \t\t\t\t\t.getAdapter(IDiscoveryContainer.class);", "raw_url": "https://github.com/eclipse/ecf/raw/0d00787f0d8de19464aaac7bc951d9817fd7c518/examples%2Fbundles%2Forg.eclipse.ecf.example.collab%2Fsrc%2Forg%2Feclipse%2Fecf%2Fexample%2Fcollab%2FDiscoveryStartup.java", "sha": "cac8ad863ad98293465f321acc6a8cc2db582500", "status": "modified" }, { "additions": 5, "blob_url": "https://github.com/eclipse/ecf/blob/0d00787f0d8de19464aaac7bc951d9817fd7c518/examples%2Fbundles%2Forg.eclipse.ecf.example.collab%2Fsrc%2Forg%2Feclipse%2Fecf%2Fexample%2Fcollab%2FServerStartup.java", "changes": 10, "contents_url": "https://api.github.com/repos/eclipse/ecf/contents/examples%2Fbundles%2Forg.eclipse.ecf.example.collab%2Fsrc%2Forg%2Feclipse%2Fecf%2Fexample%2Fcollab%2FServerStartup.java?ref=0d00787f0d8de19464aaac7bc951d9817fd7c518", "deletions": 5, "filename": "examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ServerStartup.java", "new_code": "\t\t\t\tserverGroups[j] = createServerGroup(connect.getHostname(),\n\t\t\t\t\tTCPServerSOContainer cont = createServerContainer(group\n\tprotected TCPServerSOContainerGroup createServerGroup(String name, int port) {\n\tprotected TCPServerSOContainer createServerContainer(String id,\n\t\tID newServerID = IDFactory.getDefault().createStringID(id);", "new_methods": [], "old_code": "\t\t\t\tserverGroups[j] = makeServerGroup(connect.getHostname(),\n\t\t\t\t\tTCPServerSOContainer cont = makeServerContainer(group\n\tprotected TCPServerSOContainerGroup makeServerGroup(String name, int port) {\n\tprotected TCPServerSOContainer makeServerContainer(String id,\n\t\tID newServerID = IDFactory.getDefault().makeStringID(id);", "old_methods": [], "patch": "@@ -61,12 +61,12 @@ protected synchronized void createServers(InputStream ins) throws Exception {\n \t\t\tint j = 0;\n \t\t\tfor (Iterator i = connectors.iterator(); i.hasNext();) {\n \t\t\t\tConnector connect = (Connector) i.next();\n-\t\t\t\tserverGroups[j] = makeServerGroup(connect.getHostname(),\n+\t\t\t\tserverGroups[j] = createServerGroup(connect.getHostname(),\n \t\t\t\t\t\tconnect.getPort());\n \t\t\t\tList groups = connect.getGroups();\n \t\t\t\tfor (Iterator g = groups.iterator(); g.hasNext();) {\n \t\t\t\t\tNamedGroup group = (NamedGroup) g.next();\n-\t\t\t\t\tTCPServerSOContainer cont = makeServerContainer(group\n+\t\t\t\t\tTCPServerSOContainer cont = createServerContainer(group\n \t\t\t\t\t\t\t.getIDForGroup(), serverGroups[j], group.getName(),\n \t\t\t\t\t\t\tconnect.getTimeout());\n \t\t\t\t\tservers.add(cont);\n@@ -93,15 +93,15 @@ protected void registerServer(ISharedObjectContainer cont)\n \t\t\tthrows URISyntaxException {\n \t\tDiscoveryStartup.registerService(cont.getID().toURI());\n \t}\n-\tprotected TCPServerSOContainerGroup makeServerGroup(String name, int port) {\n+\tprotected TCPServerSOContainerGroup createServerGroup(String name, int port) {\n \t\tTCPServerSOContainerGroup group = new TCPServerSOContainerGroup(name,\n \t\t\t\tport);\n \t\treturn group;\n \t}\n-\tprotected TCPServerSOContainer makeServerContainer(String id,\n+\tprotected TCPServerSOContainer createServerContainer(String id,\n \t\t\tTCPServerSOContainerGroup group, String path, int keepAlive)\n \t\t\tthrows IDInstantiationException {\n-\t\tID newServerID = IDFactory.getDefault().makeStringID(id);\n+\t\tID newServerID = IDFactory.getDefault().createStringID(id);\n \t\tSOContainerConfig config = new SOContainerConfig(newServerID);\n \t\treturn new TCPServerSOContainer(config, group, path, keepAlive);\n \t}", "raw_url": "https://github.com/eclipse/ecf/raw/0d00787f0d8de19464aaac7bc951d9817fd7c518/examples%2Fbundles%2Forg.eclipse.ecf.example.collab%2Fsrc%2Forg%2Feclipse%2Fecf%2Fexample%2Fcollab%2FServerStartup.java", "sha": "eedb5962017ec969ef3d1ef4ec159f5653e38d3e", "status": "modified" }, { "additions": 3, "blob_url": "https://github.com/eclipse/ecf/blob/0d00787f0d8de19464aaac7bc951d9817fd7c518/examples%2Fbundles%2Forg.eclipse.ecf.example.collab%2Fsrc%2Forg%2Feclipse%2Fecf%2Fexample%2Fcollab%2FSharedObjectContainerUI.java", "changes": 6, "contents_url": "https://api.github.com/repos/eclipse/ecf/contents/examples%2Fbundles%2Forg.eclipse.ecf.example.collab%2Fsrc%2Forg%2Feclipse%2Fecf%2Fexample%2Fcollab%2FSharedObjectContainerUI.java?ref=0d00787f0d8de19464aaac7bc951d9817fd7c518", "deletions": 3, "filename": "examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/SharedObjectContainerUI.java", "new_code": "\t\tcreateAndAddSharedObject(soContainer, client, project, user,\n\tprotected void createAndAddSharedObject(final ISharedObjectContainer soContainer, final ClientEntry client,\n\t\tID newID = IDFactory.getDefault().createStringID(COLLAB_SHARED_OBJECT_ID);", "new_methods": [], "old_code": "\t\tmakeAndAddSharedObject(soContainer, client, project, user,\n\tprotected void makeAndAddSharedObject(final ISharedObjectContainer soContainer, final ClientEntry client,\n\t\tID newID = IDFactory.getDefault().makeStringID(COLLAB_SHARED_OBJECT_ID);", "old_methods": [], "patch": "@@ -81,7 +81,7 @@ void addObjectToClient(ISharedObjectContainer soContainer, ClientEntry client, S\n \t\tIResource project = (proj == null) ? CollabClient.getWorkspace() : proj;\n \t\tUser user = getUserData(client.getClass().getName(), client\n \t\t\t\t.getContainer().getID(), username, proj);\n-\t\tmakeAndAddSharedObject(soContainer, client, project, user,\n+\t\tcreateAndAddSharedObject(soContainer, client, project, user,\n \t\t\t\tgetSharedFileDirectoryForProject(project));\n \t}\n \n@@ -106,7 +106,7 @@ public void handleEvent(IContainerEvent evt) {\n \t\t}, \"\");\n \t}\n \n-\tprotected void makeAndAddSharedObject(final ISharedObjectContainer soContainer, final ClientEntry client,\n+\tprotected void createAndAddSharedObject(final ISharedObjectContainer soContainer, final ClientEntry client,\n \t\t\tfinal IResource proj, User user, String fileDir) throws Exception {\n \t\tIWorkbenchWindow ww = PlatformUI.getWorkbench()\n \t\t\t\t.getActiveWorkbenchWindow();\n@@ -136,7 +136,7 @@ public void windowClosing() {\n \t\t\t\tCollabClient.removeClientForResource(proj, groupID);\n \t\t\t}\n \t\t});\n-\t\tID newID = IDFactory.getDefault().makeStringID(COLLAB_SHARED_OBJECT_ID);\n+\t\tID newID = IDFactory.getDefault().createStringID(COLLAB_SHARED_OBJECT_ID);\n \t\tsoContainer.getSharedObjectManager().addSharedObject(newID,\n \t\t\t\tsharedObject, new HashMap());\n \t\t\tclient.setObject(sharedObject);", "raw_url": "https://github.com/eclipse/ecf/raw/0d00787f0d8de19464aaac7bc951d9817fd7c518/examples%2Fbundles%2Forg.eclipse.ecf.example.collab%2Fsrc%2Forg%2Feclipse%2Fecf%2Fexample%2Fcollab%2FSharedObjectContainerUI.java", "sha": "cb02c309a529338509644fbf6009051e51f85f9d", "status": "modified" }, { "additions": 20, "blob_url": "https://github.com/eclipse/ecf/blob/0d00787f0d8de19464aaac7bc951d9817fd7c518/examples%2Fbundles%2Forg.eclipse.ecf.example.collab%2Fsrc%2Forg%2Feclipse%2Fecf%2Fexample%2Fcollab%2Fshare%2FEclipseCollabSharedObject.java", "changes": 40, "contents_url": "https://api.github.com/repos/eclipse/ecf/contents/examples%2Fbundles%2Forg.eclipse.ecf.example.collab%2Fsrc%2Forg%2Feclipse%2Fecf%2Fexample%2Fcollab%2Fshare%2FEclipseCollabSharedObject.java?ref=0d00787f0d8de19464aaac7bc951d9817fd7c518", "deletions": 20, "filename": "examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/share/EclipseCollabSharedObject.java", "new_code": "\t\t\t\t\tlocalGUI = LineChatView.createClientView(\n\t\t\tcreateObject(cons.getID(), cons.getClassname(), cons.getProperties());\n\t\t\tforwardMsgTo(null, SharedObjectMsg.createMsg(null,\n\tpublic void createProxyObject(ID target, String proxyClass, String name) {\n\t\tSharedObjectMsg m = SharedObjectMsg.createMsg(null, classname, meth,\n\t\t\tforwardMsgTo(null, SharedObjectMsg.createMsg(null,\n\t\t\tforwardMsgTo(touser.getUserID(), SharedObjectMsg.createMsg(null,\n\t\t\tforwardMsgTo(toID, SharedObjectMsg.createMsg(null,\n\t\t\tforwardMsgTo(requestTarget, SharedObjectMsg.createMsg(null,\n\t\t\tSharedObjectMsg m = SharedObjectMsg.createMsg(null,\n\t\t\tSharedObjectMsg m = SharedObjectMsg.createMsg(null,\n\t\t\tforwardMsgTo(null, SharedObjectMsg.createMsg(null,\n\t\t\tforwardMsgTo(toID, SharedObjectMsg.createMsg(null,\n\t\t\tforwardMsgTo(target, SharedObjectMsg.createMsg(null,\n\t\t\tforwardMsgTo(target, SharedObjectMsg.createMsg(null,\n\t\t\tSharedObjectMsg m = SharedObjectMsg.createMsg(null,\n\t\t\tSharedObjectMsg m = SharedObjectMsg.createMsg(null,\n\t\t\tSharedObjectMsg m = SharedObjectMsg.createMsg(null,\n\t\t\tSharedObjectMsg m = SharedObjectMsg.createMsg(null,\n\t\t\tSharedObjectMsg m = SharedObjectMsg.createMsg(null, \"handleShowView\",", "new_methods": [], "old_code": "\t\t\t\t\tlocalGUI = LineChatView.makeClientView(\n\t\t\tmakeObject(cons.getID(), cons.getClassname(), cons.getProperties());\n\t\t\tforwardMsgTo(null, SharedObjectMsg.makeMsg(null,\n\tpublic void makeProxyObject(ID target, String proxyClass, String name) {\n\t\tSharedObjectMsg m = SharedObjectMsg.makeMsg(null, classname, meth,\n\t\t\tforwardMsgTo(null, SharedObjectMsg.makeMsg(null,\n\t\t\tforwardMsgTo(touser.getUserID(), SharedObjectMsg.makeMsg(null,\n\t\t\tforwardMsgTo(toID, SharedObjectMsg.makeMsg(null,\n\t\t\tforwardMsgTo(requestTarget, SharedObjectMsg.makeMsg(null,\n\t\t\tSharedObjectMsg m = SharedObjectMsg.makeMsg(null,\n\t\t\tSharedObjectMsg m = SharedObjectMsg.makeMsg(null,\n\t\t\tforwardMsgTo(null, SharedObjectMsg.makeMsg(null,\n\t\t\tforwardMsgTo(toID, SharedObjectMsg.makeMsg(null,\n\t\t\tforwardMsgTo(target, SharedObjectMsg.makeMsg(null,\n\t\t\tforwardMsgTo(target, SharedObjectMsg.makeMsg(null,\n\t\t\tSharedObjectMsg m = SharedObjectMsg.makeMsg(null,\n\t\t\tSharedObjectMsg m = SharedObjectMsg.makeMsg(null,\n\t\t\tSharedObjectMsg m = SharedObjectMsg.makeMsg(null,\n\t\t\tSharedObjectMsg m = SharedObjectMsg.makeMsg(null,\n\t\t\tSharedObjectMsg m = SharedObjectMsg.makeMsg(null, \"handleShowView\",", "old_methods": [], "patch": "@@ -187,7 +187,7 @@ public void run() {\n \t\t\t\ttry {\n \t\t\t\t\tif (LineChatView.isDisposed())\n \t\t\t\t\tshowView();\n-\t\t\t\t\tlocalGUI = LineChatView.makeClientView(\n+\t\t\t\t\tlocalGUI = LineChatView.createClientView(\n \t\t\t\t\t\t\tEclipseCollabSharedObject.this, pn, init,\n \t\t\t\t\t\t\tgetLocalFullDownloadPath());\n \t\t\t\t\tshow(true);\n@@ -246,7 +246,7 @@ public IWorkbenchWindow getWorkbenchWindow() {\n \t// SharedObjectMsg handlers\n \tprotected void handleCreateObject(SharedObjectDescription cons) {\n \t\ttry {\n-\t\t\tmakeObject(cons.getID(), cons.getClassname(), cons.getProperties());\n+\t\t\tcreateObject(cons.getID(), cons.getClassname(), cons.getProperties());\n \t\t} catch (Exception e) {\n \t\t\tdebugdump(e, \"Exception creating local object \" + cons);\n \t\t}\n@@ -375,7 +375,7 @@ protected synchronized void handleStartedTyping(User user) {\n \t}\n \tpublic void sendStartedTyping() {\n \t\ttry {\n-\t\t\tforwardMsgTo(null, SharedObjectMsg.makeMsg(null,\n+\t\t\tforwardMsgTo(null, SharedObjectMsg.createMsg(null,\n \t\t\t\t\t\"handleStartedTyping\", localUser));\n \t\t} catch (Exception e) {\n \t\t\tdebugdump(e, \"Exception on sendStartedTyping to remote clients\");\n@@ -480,7 +480,7 @@ public Object getObject(ID obj) {\n \t\t\treturn null;\n \t\treturn crs.getSharedObjectManager().getSharedObject(obj);\n \t}\n-\tpublic void makeProxyObject(ID target, String proxyClass, String name) {\n+\tpublic void createProxyObject(ID target, String proxyClass, String name) {\n \t\tID[] targets = new ID[1];\n \t\ttargets[0] = target;\n \t\tif (name == null)\n@@ -513,7 +513,7 @@ public void run() {\n \t}\n \tpublic void messageProxyObject(ID target, String classname, String meth,\n \t\t\tObject[] args) {\n-\t\tSharedObjectMsg m = SharedObjectMsg.makeMsg(null, classname, meth,\n+\t\tSharedObjectMsg m = SharedObjectMsg.createMsg(null, classname, meth,\n \t\t\t\t(Object[]) args);\n \t\ttry {\n \t\t\tforwardMsgTo(target, m);\n@@ -584,15 +584,15 @@ public void removeProxyObject(ID target, String name) {\n \t// SharedObjectMsg senders\n \tpublic void sendNotifyUserAdded() {\n \t\ttry {\n-\t\t\tforwardMsgTo(null, SharedObjectMsg.makeMsg(null,\n+\t\t\tforwardMsgTo(null, SharedObjectMsg.createMsg(null,\n \t\t\t\t\t\"handleNotifyUserAdded\", localUser));\n \t\t} catch (Exception e) {\n \t\t\tdebugdump(e, \"Exception on sendNotifyUserAdded to remote clients\");\n \t\t}\n \t}\n \tpublic void sendPrivateMessageToUser(User touser, String msg) {\n \t\ttry {\n-\t\t\tforwardMsgTo(touser.getUserID(), SharedObjectMsg.makeMsg(null,\n+\t\t\tforwardMsgTo(touser.getUserID(), SharedObjectMsg.createMsg(null,\n \t\t\t\t\t\"handleShowPrivateTextMsg\", localUser, msg));\n \t\t} catch (Exception e) {\n \t\t\tdebugdump(e,\n@@ -601,15 +601,15 @@ public void sendPrivateMessageToUser(User touser, String msg) {\n \t}\n \tpublic void sendRegisterProxy(ID toID, String proxyClass, String name) {\n \t\ttry {\n-\t\t\tforwardMsgTo(toID, SharedObjectMsg.makeMsg(null,\n+\t\t\tforwardMsgTo(toID, SharedObjectMsg.createMsg(null,\n \t\t\t\t\t\"handleRegisterProxy\", localUser, proxyClass, name));\n \t\t} catch (IOException e) {\n \t\t\tdebugdump(e, \"Exception sendRegisterProxy\");\n \t\t}\n \t}\n \tpublic void sendRequestUserUpdate(ID requestTarget) {\n \t\ttry {\n-\t\t\tforwardMsgTo(requestTarget, SharedObjectMsg.makeMsg(null,\n+\t\t\tforwardMsgTo(requestTarget, SharedObjectMsg.createMsg(null,\n \t\t\t\t\t\"handleRequestUserUpdate\", getUniqueID()));\n \t\t} catch (Exception e) {\n \t\t\tdebugdump(e, \"Exception on sendRequestUserUpdate to remote clients\");\n@@ -621,7 +621,7 @@ public void sendCVSProjectUpdateRequest(User touser, String msg) {\n \t\t\treceiver = touser.getUserID();\n \t\t}\n \t\ttry {\n-\t\t\tSharedObjectMsg m = SharedObjectMsg.makeMsg(null,\n+\t\t\tSharedObjectMsg m = SharedObjectMsg.createMsg(null,\n \t\t\t\t\t\"handleCVSProjectUpdateRequest\", getUser(), msg);\n \t\t\tforwardMsgTo(receiver, m);\n \t\t\tif (receiver == null) {\n@@ -667,7 +667,7 @@ public void sendRingMessageToUser(User user, String msg) {\n \t\t\treceiver = user.getUserID();\n \t\t}\n \t\ttry {\n-\t\t\tSharedObjectMsg m = SharedObjectMsg.makeMsg(null,\n+\t\t\tSharedObjectMsg m = SharedObjectMsg.createMsg(null,\n \t\t\t\t\t\"handleUserMessage\", this.localUser, msg);\n \t\t\tforwardMsgTo(receiver, m);\n \t\t\tif (receiver == null)\n@@ -679,31 +679,31 @@ public void sendRingMessageToUser(User user, String msg) {\n \tpublic void sendShowTextMsg(String msg) {\n \t\ttry {\n \t\t\ttrace(\"sendShowTextMsg(\" + msg + \")\");\n-\t\t\tforwardMsgTo(null, SharedObjectMsg.makeMsg(null,\n+\t\t\tforwardMsgTo(null, SharedObjectMsg.createMsg(null,\n \t\t\t\t\t\"handleShowTextMsg\", getUniqueID(), msg));\n \t\t} catch (Exception e) {\n \t\t\tdebugdump(e, \"Exception on sendShowTextMsg to remote clients\");\n \t\t}\n \t}\n \tpublic void sendUnregisterProxy(ID toID, String proxyClass) {\n \t\ttry {\n-\t\t\tforwardMsgTo(toID, SharedObjectMsg.makeMsg(null,\n+\t\t\tforwardMsgTo(toID, SharedObjectMsg.createMsg(null,\n \t\t\t\t\t\"handleUnregisterProxy\", localUser, proxyClass));\n \t\t} catch (IOException e) {\n \t\t\tdebugdump(e, \"Exception sendRegisterProxy\");\n \t\t}\n \t}\n \tpublic void sendUpdateTreeDisplay(ID target, TreeItem item) {\n \t\ttry {\n-\t\t\tforwardMsgTo(target, SharedObjectMsg.makeMsg(null,\n+\t\t\tforwardMsgTo(target, SharedObjectMsg.createMsg(null,\n \t\t\t\t\t\"handleUpdateTreeDisplay\", getUniqueID(), item));\n \t\t} catch (Exception e) {\n \t\t\tdebugdump(e, \"Exception on sendUpdateTreeDisplay to remote clients\");\n \t\t}\n \t}\n \tpublic void sendUserUpdate(ID target) {\n \t\ttry {\n-\t\t\tforwardMsgTo(target, SharedObjectMsg.makeMsg(null,\n+\t\t\tforwardMsgTo(target, SharedObjectMsg.createMsg(null,\n \t\t\t\t\t\"handleUserUpdate\", localUser));\n \t\t} catch (Exception e) {\n \t\t\tdebugdump(e, \"Exception on sendUserUpdate to remote clients\");\n@@ -823,7 +823,7 @@ public void sendAddMarkerForFile(User touser, String resourceName,\n \t\t\treceiver = touser.getUserID();\n \t\t}\n \t\ttry {\n-\t\t\tSharedObjectMsg m = SharedObjectMsg.makeMsg(null,\n+\t\t\tSharedObjectMsg m = SharedObjectMsg.createMsg(null,\n \t\t\t\t\t\"handleAddMarkerForFile\", getUser(), resourceName,\n \t\t\t\t\tnew SharedMarker(\"ECF marker\", new Integer(offset),\n \t\t\t\t\t\t\tnew Integer(length)));\n@@ -842,7 +842,7 @@ public void sendOpenAndSelectForFile(User touser, String resourceName,\n \t\t\treceiver = touser.getUserID();\n \t\t}\n \t\ttry {\n-\t\t\tSharedObjectMsg m = SharedObjectMsg.makeMsg(null,\n+\t\t\tSharedObjectMsg m = SharedObjectMsg.createMsg(null,\n \t\t\t\t\t\"handleOpenAndSelectForFile\", getUser(), resourceName,\n \t\t\t\t\tnew SharedMarker(\"ECF marker\", new Integer(offset),\n \t\t\t\t\t\t\tnew Integer(length)));\n@@ -860,7 +860,7 @@ public void sendLaunchEditorForFile(User touser, String resourceName) {\n \t\t\treceiver = touser.getUserID();\n \t\t}\n \t\ttry {\n-\t\t\tSharedObjectMsg m = SharedObjectMsg.makeMsg(null,\n+\t\t\tSharedObjectMsg m = SharedObjectMsg.createMsg(null,\n \t\t\t\t\t\"handleLaunchEditorForFile\", getUser(), resourceName);\n \t\t\tforwardMsgTo(receiver, m);\n \t\t\tif (receiver == null) {\n@@ -1054,7 +1054,7 @@ public void sendShowViewWithID(User touser, String id, String secID,\n \t\t\treceiver = touser.getUserID();\n \t\t}\n \t\ttry {\n-\t\t\tSharedObjectMsg m = SharedObjectMsg.makeMsg(null,\n+\t\t\tSharedObjectMsg m = SharedObjectMsg.createMsg(null,\n \t\t\t\t\t\"handleShowViewWithID\", getUser(), id, secID, mode);\n \t\t\tforwardMsgTo(receiver, m);\n \t\t\tif (receiver == null) {\n@@ -1070,7 +1070,7 @@ public void sendShowView(User touser, String id) {\n \t\t\treceiver = touser.getUserID();\n \t\t}\n \t\ttry {\n-\t\t\tSharedObjectMsg m = SharedObjectMsg.makeMsg(null, \"handleShowView\",\n+\t\t\tSharedObjectMsg m = SharedObjectMsg.createMsg(null, \"handleShowView\",\n \t\t\t\t\tgetUser(), id);\n \t\t\tforwardMsgTo(receiver, m);\n \t\t\tif (receiver == null) {", "raw_url": "https://github.com/eclipse/ecf/raw/0d00787f0d8de19464aaac7bc951d9817fd7c518/examples%2Fbundles%2Forg.eclipse.ecf.example.collab%2Fsrc%2Forg%2Feclipse%2Fecf%2Fexample%2Fcollab%2Fshare%2FEclipseCollabSharedObject.java", "sha": "e5e3d9cd252246bdb41c8e8b3452479df5f6b0e0", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/eclipse/ecf/blob/0d00787f0d8de19464aaac7bc951d9817fd7c518/examples%2Fbundles%2Forg.eclipse.ecf.example.collab%2Fsrc%2Forg%2Feclipse%2Fecf%2Fexample%2Fcollab%2Fshare%2FEclipseProject.java", "changes": 2, "contents_url": "https://api.github.com/repos/eclipse/ecf/contents/examples%2Fbundles%2Forg.eclipse.ecf.example.collab%2Fsrc%2Forg%2Feclipse%2Fecf%2Fexample%2Fcollab%2Fshare%2FEclipseProject.java?ref=0d00787f0d8de19464aaac7bc951d9817fd7c518", "deletions": 1, "filename": "examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/share/EclipseProject.java", "new_code": "\tpublic void createProxyObject(ID target,String classname,String name);", "new_methods": [], "old_code": "\tpublic void makeProxyObject(ID target,String classname,String name);", "old_methods": [], "patch": "@@ -34,7 +34,7 @@ public interface EclipseProject {\n \t\n \tpublic ISharedObjectContext getContext();\n \n-\tpublic void makeProxyObject(ID target,String classname,String name);\n+\tpublic void createProxyObject(ID target,String classname,String name);\n \tpublic void messageProxyObject(ID target, String name, String meth, Object [] args);\n \tpublic void removeProxyObject(ID target,String name);\n ", "raw_url": "https://github.com/eclipse/ecf/raw/0d00787f0d8de19464aaac7bc951d9817fd7c518/examples%2Fbundles%2Forg.eclipse.ecf.example.collab%2Fsrc%2Forg%2Feclipse%2Fecf%2Fexample%2Fcollab%2Fshare%2FEclipseProject.java", "sha": "a29d1527b64ac8e94dac53115acb6470e5a5c749", "status": "modified" }, { "additions": 2, "blob_url": "https://github.com/eclipse/ecf/blob/0d00787f0d8de19464aaac7bc951d9817fd7c518/examples%2Fbundles%2Forg.eclipse.ecf.example.collab%2Fsrc%2Forg%2Feclipse%2Fecf%2Fexample%2Fcollab%2Fshare%2FEditorHelper.java", "changes": 4, "contents_url": "https://api.github.com/repos/eclipse/ecf/contents/examples%2Fbundles%2Forg.eclipse.ecf.example.collab%2Fsrc%2Forg%2Feclipse%2Fecf%2Fexample%2Fcollab%2Fshare%2FEditorHelper.java?ref=0d00787f0d8de19464aaac7bc951d9817fd7c518", "deletions": 2, "filename": "examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/share/EditorHelper.java", "new_code": "\tprotected IMarker createMarkerForFile(IFile file, EclipseCollabSharedObject.SharedMarker marker) throws CoreException {\n\t\tcreateMarkerForFile(file,marker);\t ", "new_methods": [], "old_code": "\tprotected IMarker makeMarkerForFile(IFile file, EclipseCollabSharedObject.SharedMarker marker) throws CoreException {\n\t\tmakeMarkerForFile(file,marker);\t ", "old_methods": [], "patch": "@@ -52,7 +52,7 @@ protected void openAndSelectForFile(IFile file, int offset, int length) throws P\n \t\tif (textEditor == null) return;\n \t\tsetTextEditorSelection(textEditor,offset,length);\n \t}\n-\tprotected IMarker makeMarkerForFile(IFile file, EclipseCollabSharedObject.SharedMarker marker) throws CoreException {\n+\tprotected IMarker createMarkerForFile(IFile file, EclipseCollabSharedObject.SharedMarker marker) throws CoreException {\n \t\tIMarker m = file.createMarker(EclipseCollabSharedObject.SHARED_MARKER_TYPE);\n \t\tm.setAttribute(EclipseCollabSharedObject.SHARED_MARKER_KEY, \"slewis\");\n \t\t//m.setAttribute(IMarker.MESSAGE, marker.getMessage());\n@@ -79,7 +79,7 @@ protected void openAndAddMarkerForFile(IFile file, EclipseCollabSharedObject.Sha\n \t\t\tString editorId = getEditorIdForFile(file);\n \t\t\tpart = page.openEditor(input, editorId);\n \t\t}\n-\t\tmakeMarkerForFile(file,marker);\t \n+\t\tcreateMarkerForFile(file,marker);\t \n \t}\n \tprotected void setTextEditorSelection(ITextEditor textEditor, int offset, int length) {\n \t\ttextEditor.selectAndReveal(offset, length);", "raw_url": "https://github.com/eclipse/ecf/raw/0d00787f0d8de19464aaac7bc951d9817fd7c518/examples%2Fbundles%2Forg.eclipse.ecf.example.collab%2Fsrc%2Forg%2Feclipse%2Fecf%2Fexample%2Fcollab%2Fshare%2FEditorHelper.java", "sha": "2f0da962208490897e7efa48643a24bb9916138a", "status": "modified" }, { "additions": 5, "blob_url": "https://github.com/eclipse/ecf/blob/0d00787f0d8de19464aaac7bc951d9817fd7c518/examples%2Fbundles%2Forg.eclipse.ecf.example.collab%2Fsrc%2Forg%2Feclipse%2Fecf%2Fexample%2Fcollab%2Fshare%2FGenericSharedObject.java", "changes": 10, "contents_url": "https://api.github.com/repos/eclipse/ecf/contents/examples%2Fbundles%2Forg.eclipse.ecf.example.collab%2Fsrc%2Forg%2Feclipse%2Fecf%2Fexample%2Fcollab%2Fshare%2FGenericSharedObject.java?ref=0d00787f0d8de19464aaac7bc951d9817fd7c518", "deletions": 5, "filename": "examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/share/GenericSharedObject.java", "new_code": " msg = SharedObjectMsg.createMsg(msg.getClassName(), methName, msg\n public ID createObject(ID target, String className, Map map) throws Exception {\n ID newID = IDFactory.getDefault().createStringID(getNewUniqueIDString());\n \"Cannot create object. Have no local creation capability because context is null\");\n + \"'. Cannot create object.\");", "new_methods": [], "old_code": " msg = SharedObjectMsg.makeMsg(msg.getClassName(), methName, msg\n public ID makeObject(ID target, String className, Map map) throws Exception {\n ID newID = IDFactory.getDefault().makeStringID(getNewUniqueIDString());\n \"Cannot make object. Have no local creation capability because context is null\");\n + \"'. Cannot make object.\");", "old_methods": [], "patch": "@@ -147,7 +147,7 @@ protected void execMsg(ID fromID, SharedObjectMsg msg) {\n trace(\" proxy msg=\" + methName);\n trace(\" o=\" + o);\n if (methName != null) {\n- msg = SharedObjectMsg.makeMsg(msg.getClassName(), methName, msg\n+ msg = SharedObjectMsg.createMsg(msg.getClassName(), methName, msg\n .getArgs());\n }\n if (currentMsgFromObjID == null)\n@@ -470,12 +470,12 @@ protected void traceDump(String msg, Throwable t) {\n }\n }\n \n- public ID makeObject(ID target, String className, Map map) throws Exception {\n+ public ID createObject(ID target, String className, Map map) throws Exception {\n ISharedObjectContext crs = getContext();\n- ID newID = IDFactory.getDefault().makeStringID(getNewUniqueIDString());\n+ ID newID = IDFactory.getDefault().createStringID(getNewUniqueIDString());\n if (crs == null) {\n throw new InstantiationException(\n- \"Cannot make object. Have no local creation capability because context is null\");\n+ \"Cannot create object. Have no local creation capability because context is null\");\n } else {\n if (className != null && !className.equals(\"\")) {\n trace(\"Creating new replicated object with class: \" + className);\n@@ -507,7 +507,7 @@ public ID makeObject(ID target, String className, Map map) throws Exception {\n return newID;\n } else {\n trace(\"Invalid classname '\" + className\n- + \"'. Cannot make object.\");\n+ + \"'. Cannot create object.\");\n throw new InstantiationException(\"Invalid classname '\"\n + className);\n }", "raw_url": "https://github.com/eclipse/ecf/raw/0d00787f0d8de19464aaac7bc951d9817fd7c518/examples%2Fbundles%2Forg.eclipse.ecf.example.collab%2Fsrc%2Forg%2Feclipse%2Fecf%2Fexample%2Fcollab%2Fshare%2FGenericSharedObject.java", "sha": "5584eb3ea4913b8fb4d6ec9ed9731a5922311f6c", "status": "modified" }, { "additions": 19, "blob_url": "https://github.com/eclipse/ecf/blob/0d00787f0d8de19464aaac7bc951d9817fd7c518/examples%2Fbundles%2Forg.eclipse.ecf.example.collab%2Fsrc%2Forg%2Feclipse%2Fecf%2Fexample%2Fcollab%2Fshare%2FSharedObjectMsg.java", "changes": 38, "contents_url": "https://api.github.com/repos/eclipse/ecf/contents/examples%2Fbundles%2Forg.eclipse.ecf.example.collab%2Fsrc%2Forg%2Feclipse%2Fecf%2Fexample%2Fcollab%2Fshare%2FSharedObjectMsg.java?ref=0d00787f0d8de19464aaac7bc951d9817fd7c518", "deletions": 19, "filename": "examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/share/SharedObjectMsg.java", "new_code": " public static SharedObjectMsg createMsg(String className, String methodName,\n public static SharedObjectMsg createMsg(String methodName, Object[] param) {\n return createMsg((String) null, methodName, param);\n public static SharedObjectMsg createMsg(String methodName) {\n return createMsg((String) null, methodName, nullArgs);\n public static SharedObjectMsg createMsg(String className, String methodName) {\n return createMsg(className, methodName, nullArgs);\n public static SharedObjectMsg createMsg(String className, String methodName,\n return createMsg(className, methodName, args);\n public static SharedObjectMsg createMsg(String methodName, Object arg) {\n return createMsg((String) null, methodName, arg);\n public static SharedObjectMsg createMsg(String className, String methodName,\n return createMsg(className, methodName, args);\n public static SharedObjectMsg createMsg(String className, String methodName,\n return createMsg(className, methodName, args);\n public static SharedObjectMsg createMsg(String className, String methodName,\n return createMsg(className, methodName, args);\n public static SharedObjectMsg createMsg(String className, String methodName,\n return createMsg(className, methodName, args);", "new_methods": [], "old_code": " public static SharedObjectMsg makeMsg(String className, String methodName,\n public static SharedObjectMsg makeMsg(String methodName, Object[] param) {\n return makeMsg((String) null, methodName, param);\n public static SharedObjectMsg makeMsg(String methodName) {\n return makeMsg((String) null, methodName, nullArgs);\n public static SharedObjectMsg makeMsg(String className, String methodName) {\n return makeMsg(className, methodName, nullArgs);\n public static SharedObjectMsg makeMsg(String className, String methodName,\n return makeMsg(className, methodName, args);\n public static SharedObjectMsg makeMsg(String methodName, Object arg) {\n return makeMsg((String) null, methodName, arg);\n public static SharedObjectMsg makeMsg(String className, String methodName,\n return makeMsg(className, methodName, args);\n public static SharedObjectMsg makeMsg(String className, String methodName,\n return makeMsg(className, methodName, args);\n public static SharedObjectMsg makeMsg(String className, String methodName,\n return makeMsg(className, methodName, args);\n public static SharedObjectMsg makeMsg(String className, String methodName,\n return makeMsg(className, methodName, args);", "old_methods": [], "patch": "@@ -25,7 +25,7 @@ public class SharedObjectMsg implements Serializable {\n public static final Class[] nullTypes = new Class[0];\n \n // Static factory methods for creating SharedObjectMsg instances\n- public static SharedObjectMsg makeMsg(String className, String methodName,\n+ public static SharedObjectMsg createMsg(String className, String methodName,\n Object[] param) {\n if (methodName == null || param == null) {\n throw new NullPointerException(\n@@ -34,50 +34,50 @@ public static SharedObjectMsg makeMsg(String className, String methodName,\n return new SharedObjectMsg(className, methodName, param);\n }\n \n- public static SharedObjectMsg makeMsg(String methodName, Object[] param) {\n- return makeMsg((String) null, methodName, param);\n+ public static SharedObjectMsg createMsg(String methodName, Object[] param) {\n+ return createMsg((String) null, methodName, param);\n }\n \n- public static SharedObjectMsg makeMsg(String methodName) {\n- return makeMsg((String) null, methodName, nullArgs);\n+ public static SharedObjectMsg createMsg(String methodName) {\n+ return createMsg((String) null, methodName, nullArgs);\n }\n \n- public static SharedObjectMsg makeMsg(String className, String methodName) {\n- return makeMsg(className, methodName, nullArgs);\n+ public static SharedObjectMsg createMsg(String className, String methodName) {\n+ return createMsg(className, methodName, nullArgs);\n }\n \n- public static SharedObjectMsg makeMsg(String className, String methodName,\n+ public static SharedObjectMsg createMsg(String className, String methodName,\n Object arg) {\n Object args[] = { arg };\n- return makeMsg(className, methodName, args);\n+ return createMsg(className, methodName, args);\n }\n \n- public static SharedObjectMsg makeMsg(String methodName, Object arg) {\n- return makeMsg((String) null, methodName, arg);\n+ public static SharedObjectMsg createMsg(String methodName, Object arg) {\n+ return createMsg((String) null, methodName, arg);\n }\n \n- public static SharedObjectMsg makeMsg(String className, String methodName,\n+ public static SharedObjectMsg createMsg(String className, String methodName,\n Object arg1, Object arg2) {\n Object args[] = { arg1, arg2 };\n- return makeMsg(className, methodName, args);\n+ return createMsg(className, methodName, args);\n }\n \n- public static SharedObjectMsg makeMsg(String className, String methodName,\n+ public static SharedObjectMsg createMsg(String className, String methodName,\n Object arg1, Object arg2, Object arg3) {\n Object args[] = { arg1, arg2, arg3 };\n- return makeMsg(className, methodName, args);\n+ return createMsg(className, methodName, args);\n }\n \n- public static SharedObjectMsg makeMsg(String className, String methodName,\n+ public static SharedObjectMsg createMsg(String className, String methodName,\n Object arg1, Object arg2, Object arg3, Object arg4) {\n Object args[] = { arg1, arg2, arg3, arg4 };\n- return makeMsg(className, methodName, args);\n+ return createMsg(className, methodName, args);\n }\n \n- public static SharedObjectMsg makeMsg(String className, String methodName,\n+ public static SharedObjectMsg createMsg(String className, String methodName,\n Object arg1, Object arg2, Object arg3, Object arg4, Object arg5) {\n Object args[] = { arg1, arg2, arg3, arg4, arg5 };\n- return makeMsg(className, methodName, args);\n+ return createMsg(className, methodName, args);\n }\n \n /**", "raw_url": "https://github.com/eclipse/ecf/raw/0d00787f0d8de19464aaac7bc951d9817fd7c518/examples%2Fbundles%2Forg.eclipse.ecf.example.collab%2Fsrc%2Forg%2Feclipse%2Fecf%2Fexample%2Fcollab%2Fshare%2FSharedObjectMsg.java", "sha": "0cb757a65fc0958d15cdbfbbebc205133c12328b", "status": "modified" }, { "additions": 2, "blob_url": "https://github.com/eclipse/ecf/blob/0d00787f0d8de19464aaac7bc951d9817fd7c518/examples%2Fbundles%2Forg.eclipse.ecf.example.collab%2Fsrc%2Forg%2Feclipse%2Fecf%2Fexample%2Fcollab%2Fshare%2FTransactionSharedObject.java", "changes": 4, "contents_url": "https://api.github.com/repos/eclipse/ecf/contents/examples%2Fbundles%2Forg.eclipse.ecf.example.collab%2Fsrc%2Forg%2Feclipse%2Fecf%2Fexample%2Fcollab%2Fshare%2FTransactionSharedObject.java?ref=0d00787f0d8de19464aaac7bc951d9817fd7c518", "deletions": 2, "filename": "examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/share/TransactionSharedObject.java", "new_code": " forwardMsgTo(fromID, SharedObjectMsg.createMsg((String) null,REPLICA_COMMIT_METHOD));\n forwardMsgTo(null, SharedObjectMsg.createMsg((String) null,REPLICA_COMMIT_METHOD));", "new_methods": [], "old_code": " forwardMsgTo(fromID, SharedObjectMsg.makeMsg((String) null,REPLICA_COMMIT_METHOD));\n forwardMsgTo(null, SharedObjectMsg.makeMsg((String) null,REPLICA_COMMIT_METHOD));", "old_methods": [], "patch": "@@ -152,7 +152,7 @@ protected void handleVotingCompletedCreateResponse(ID fromID, Throwable e, Long\n if (e == null) {\n // send commit message right back.\n try {\n- forwardMsgTo(fromID, SharedObjectMsg.makeMsg((String) null,REPLICA_COMMIT_METHOD));\n+ forwardMsgTo(fromID, SharedObjectMsg.createMsg((String) null,REPLICA_COMMIT_METHOD));\n } catch (Exception except) {\n traceDump(\"Exception sending commit message to \"+fromID,except);\n }\n@@ -223,7 +223,7 @@ public void doCommit() throws SharedObjectAddAbortException\n if (participantIDs != null && others > 0) {\n // Send replicaCommit message to all remote clients\n try {\n- forwardMsgTo(null, SharedObjectMsg.makeMsg((String) null,REPLICA_COMMIT_METHOD));\n+ forwardMsgTo(null, SharedObjectMsg.createMsg((String) null,REPLICA_COMMIT_METHOD));\n } catch (Exception e2) {\n doAbort(new SharedObjectAddAbortException(\"Exception sending commit message\", e2));\n }", "raw_url": "https://github.com/eclipse/ecf/raw/0d00787f0d8de19464aaac7bc951d9817fd7c518/examples%2Fbundles%2Forg.eclipse.ecf.example.collab%2Fsrc%2Forg%2Feclipse%2Fecf%2Fexample%2Fcollab%2Fshare%2FTransactionSharedObject.java", "sha": "2d8babab91824d59e55e1025f3185bc96bc23a15", "status": "modified" }, { "additions": 2, "blob_url": "https://github.com/eclipse/ecf/blob/0d00787f0d8de19464aaac7bc951d9817fd7c518/examples%2Fbundles%2Forg.eclipse.ecf.example.collab%2Fsrc%2Forg%2Feclipse%2Fecf%2Fexample%2Fcollab%2Fshare%2Fio%2FEclipseFileTransfer.java", "changes": 4, "contents_url": "https://api.github.com/repos/eclipse/ecf/contents/examples%2Fbundles%2Forg.eclipse.ecf.example.collab%2Fsrc%2Forg%2Feclipse%2Fecf%2Fexample%2Fcollab%2Fshare%2Fio%2FEclipseFileTransfer.java?ref=0d00787f0d8de19464aaac7bc951d9817fd7c518", "deletions": 2, "filename": "examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/share/io/EclipseFileTransfer.java", "new_code": "\tprotected File createPath(EclipseCollabSharedObject stage, boolean server,\n\t\t\tlocalFile = createPath(receiverStage, isServer, aFile, length, rate);", "new_methods": [], "old_code": "\tprotected File makePath(EclipseCollabSharedObject stage, boolean server,\n\t\t\tlocalFile = makePath(receiverStage, isServer, aFile, length, rate);", "old_methods": [], "patch": "@@ -118,7 +118,7 @@ public void sendDone(FileTransferSharedObject obj, Exception e) {\n \t\t}\n \t}\n \n-\tprotected File makePath(EclipseCollabSharedObject stage, boolean server,\n+\tprotected File createPath(EclipseCollabSharedObject stage, boolean server,\n \t\t\tFile file, long length, float rate) {\n \n \t\tString downloadpath = null;\n@@ -231,7 +231,7 @@ public void run() {\n \t\t\tif (receiverStage != null) {\n \t\t\t\treceiverUI = receiverStage.getFileReceiverUI(EclipseFileTransfer.this, transferParams);\n \t\t\t}\n-\t\t\tlocalFile = makePath(receiverStage, isServer, aFile, length, rate);\n+\t\t\tlocalFile = createPath(receiverStage, isServer, aFile, length, rate);\n \t\t\t// Our superclass depends upon the transferParams.getRemoteFile() call\n \t\t\t// to give a valid file.\n \t\t\t// We modify this to the new local file we've decided upon", "raw_url": "https://github.com/eclipse/ecf/raw/0d00787f0d8de19464aaac7bc951d9817fd7c518/examples%2Fbundles%2Forg.eclipse.ecf.example.collab%2Fsrc%2Forg%2Feclipse%2Fecf%2Fexample%2Fcollab%2Fshare%2Fio%2FEclipseFileTransfer.java", "sha": "2fd26cbced6bda978943ac165b69d765cd913ddd", "status": "modified" }, { "additions": 5, "blob_url": "https://github.com/eclipse/ecf/blob/0d00787f0d8de19464aaac7bc951d9817fd7c518/examples%2Fbundles%2Forg.eclipse.ecf.example.collab%2Fsrc%2Forg%2Feclipse%2Fecf%2Fexample%2Fcollab%2Fshare%2Fio%2FFileTransferSharedObject.java", "changes": 10, "contents_url": "https://api.github.com/repos/eclipse/ecf/contents/examples%2Fbundles%2Forg.eclipse.ecf.example.collab%2Fsrc%2Forg%2Feclipse%2Fecf%2Fexample%2Fcollab%2Fshare%2Fio%2FFileTransferSharedObject.java?ref=0d00787f0d8de19464aaac7bc951d9817fd7c518", "deletions": 5, "filename": "examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/share/io/FileTransferSharedObject.java", "new_code": " forwardMsgTo(rcvr, SharedObjectMsg.createMsg(recvMethodName, data));\n forwardMsgHome(SharedObjectMsg.createMsg(doneMethodName, e));\n forwardMsgHome(SharedObjectMsg.createMsg(doneMethodName, except));\n sendSelf(SharedObjectMsg.createMsg(\"start\"));\n sendSelf(SharedObjectMsg.createMsg(startMethodName));", "new_methods": [], "old_code": " forwardMsgTo(rcvr, SharedObjectMsg.makeMsg(recvMethodName, data));\n forwardMsgHome(SharedObjectMsg.makeMsg(doneMethodName, e));\n forwardMsgHome(SharedObjectMsg.makeMsg(doneMethodName, except));\n sendSelf(SharedObjectMsg.makeMsg(\"start\"));\n sendSelf(SharedObjectMsg.makeMsg(startMethodName));", "old_methods": [], "patch": "@@ -222,7 +222,7 @@ protected SharedObjectDescription getReplicaDescription(ID remoteMember)\n protected boolean sendData(ID rcvr, FileData data) throws IOException\n {\n // Send it. This does all data delivery.\n- forwardMsgTo(rcvr, SharedObjectMsg.makeMsg(recvMethodName, data));\n+ forwardMsgTo(rcvr, SharedObjectMsg.createMsg(recvMethodName, data));\n return data.isDone();\n }\n \n@@ -278,7 +278,7 @@ protected void saveData(FileData data)\n // Report failure back to host if we're not disconnected\n try {\n // Send it. This does the done msg delivery.\n- forwardMsgHome(SharedObjectMsg.makeMsg(doneMethodName, e));\n+ forwardMsgHome(SharedObjectMsg.createMsg(doneMethodName, e));\n // Make sure everything is cleaned up\n hardClose();\n } catch (Exception e1) {\n@@ -306,7 +306,7 @@ protected void saveData(FileData data)\n // object\n if (progressListener != null) progressListener.receiveDone(this, except);\n try {\n- forwardMsgHome(SharedObjectMsg.makeMsg(doneMethodName, except));\n+ forwardMsgHome(SharedObjectMsg.createMsg(doneMethodName, except));\n } catch (Exception e) {\n \tdebug(e,\"Exception sending done message home\");\n }\n@@ -390,7 +390,7 @@ protected void start()\n wait(DEFAULT_START_WAIT_INTERVAL);\n }\n // Asynchronous tail recursion.\n- sendSelf(SharedObjectMsg.makeMsg(\"start\"));\n+ sendSelf(SharedObjectMsg.createMsg(\"start\"));\n } catch (Exception e) {}\n } else {\n preStartSending();\n@@ -421,7 +421,7 @@ protected void startSendToAll()\n }\n // If all data not sent, send message to self. This results\n // in this method iterating until entire file is sent.\n- sendSelf(SharedObjectMsg.makeMsg(startMethodName));\n+ sendSelf(SharedObjectMsg.createMsg(startMethodName));\n } else {\n // Close input stream.\n hardClose();", "raw_url": "https://github.com/eclipse/ecf/raw/0d00787f0d8de19464aaac7bc951d9817fd7c518/examples%2Fbundles%2Forg.eclipse.ecf.example.collab%2Fsrc%2Forg%2Feclipse%2Fecf%2Fexample%2Fcollab%2Fshare%2Fio%2FFileTransferSharedObject.java", "sha": "60c7b6e46ebed7d6b0dbd97ca2e7412128e0130d", "status": "modified" }, { "additions": 8, "blob_url": "https://github.com/eclipse/ecf/blob/0d00787f0d8de19464aaac7bc951d9817fd7c518/examples%2Fbundles%2Forg.eclipse.ecf.example.collab%2Fsrc%2Forg%2Feclipse%2Fecf%2Fexample%2Fcollab%2Fui%2FChatComposite.java", "changes": 16, "contents_url": "https://api.github.com/repos/eclipse/ecf/contents/examples%2Fbundles%2Forg.eclipse.ecf.example.collab%2Fsrc%2Forg%2Feclipse%2Fecf%2Fexample%2Fcollab%2Fui%2FChatComposite.java?ref=0d00787f0d8de19464aaac7bc951d9817fd7c518", "deletions": 8, "filename": "examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ui/ChatComposite.java", "new_code": "\t\t\t\t\t.getDefault().createStringID(org.eclipse.ecf.example.collab.share.EclipseCollabSharedObject.ECLIPSEOBJECTNAME);\n\t\t\t\t\t\tChatComposite.this.view.createObject(\n\t\t\t\t\t\tChatComposite.this.view.createObject(\n\t\t\t\tID serverID = this.view.lch.createObject(null, LineChatClientView.APPSHARECLASSNAME, map);\n\t\t\tthis.view.createObject(null, LineChatClientView.SHOWURLCLASSNAME, LineChatClientView.SHOWURLARGTYPES,\n\t\t\tthis.view.createProxyObject(userID, res);\n\t\t\tthis.view.createObject(null, LineChatClientView.MESSAGECLASSNAME, args);\n\t\t\tthis.view.createObject(null, getCommand(result), getArgs(result));", "new_methods": [], "old_code": "\t\t\t\t\t.getDefault().makeStringID(org.eclipse.ecf.example.collab.share.EclipseCollabSharedObject.ECLIPSEOBJECTNAME);\n\t\t\t\t\t\tChatComposite.this.view.makeObject(\n\t\t\t\t\t\tChatComposite.this.view.makeObject(\n\t\t\t\tID serverID = this.view.lch.makeObject(null, LineChatClientView.APPSHARECLASSNAME, map);\n\t\t\tthis.view.makeObject(null, LineChatClientView.SHOWURLCLASSNAME, LineChatClientView.SHOWURLARGTYPES,\n\t\t\tthis.view.makeProxyObject(userID, res);\n\t\t\tthis.view.makeObject(null, LineChatClientView.MESSAGECLASSNAME, args);\n\t\t\tthis.view.makeObject(null, getCommand(result), getArgs(result));", "old_methods": [], "patch": "@@ -1100,7 +1100,7 @@ protected void readStreamAndSend(java.io.InputStream local,\n \t\t\tString fileName, Date startDate, ID target, final boolean launch) {\n \t\ttry {\n \t\t\tID eclipseStageID = IDFactory\n-\t\t\t\t\t.getDefault().makeStringID(org.eclipse.ecf.example.collab.share.EclipseCollabSharedObject.ECLIPSEOBJECTNAME);\n+\t\t\t\t\t.getDefault().createStringID(org.eclipse.ecf.example.collab.share.EclipseCollabSharedObject.ECLIPSEOBJECTNAME);\n \t\t\tjava.io.BufferedInputStream ins = new java.io.BufferedInputStream(\n \t\t\t\t\tlocal);\n \t\t\tjava.io.File remoteFile = new File((new File(fileName)).getName());\n@@ -1113,7 +1113,7 @@ protected void readStreamAndSend(java.io.InputStream local,\n \t\t\tnew Thread(new Runnable() {\n \t\t\t\tpublic void run() {\n \t\t\t\t if (launch) {\n-\t\t\t\t\t\tChatComposite.this.view.makeObject(\n+\t\t\t\t\t\tChatComposite.this.view.createObject(\n \t\t\t\t\t\t\t\tnull,\n \t\t\t\t\t\t\t\torg.eclipse.ecf.example.collab.share.io.EclipseFileTransferAndLaunch.class\n \t\t\t\t\t\t\t\t\t\t.getName(), new String[] {\n@@ -1123,7 +1123,7 @@ public void run() {\n \t\t\t\t\t\t\t\t\t\tFileTransferParams.class.getName(),\n \t\t\t\t\t\t\t\t\t\tID.class.getName() }, args);\n \t\t\t\t } else {\n-\t\t\t\t\t\tChatComposite.this.view.makeObject(\n+\t\t\t\t\t\tChatComposite.this.view.createObject(\n \t\t\t\t\t\t\t\tnull,\n \t\t\t\t\t\t\t\torg.eclipse.ecf.example.collab.share.io.EclipseFileTransfer.class\n \t\t\t\t\t\t\t\t\t\t.getName(), new String[] {\n@@ -1185,7 +1185,7 @@ public void run() {\n \t\t\t\tHashMap map = new HashMap();\n \t\t\t\tmap.put(\"args\",args);\n \t\t\t\tmap.put(\"types\",LineChatClientView.APPSHAREARGTYPES);\n-\t\t\t\tID serverID = this.view.lch.makeObject(null, LineChatClientView.APPSHARECLASSNAME, map);\n+\t\t\t\tID serverID = this.view.lch.createObject(null, LineChatClientView.APPSHARECLASSNAME, map);\n \t\t\t\tEclipseAppShareServer server = (EclipseAppShareServer) this.view.lch.getObject(serverID);\n \t\t\t\tif (server != null) {\n \t\t\t\t\tLineChatView.setAppShareID(serverID,server);\n@@ -1219,7 +1219,7 @@ protected void sendCoBrowseToUser(User user) {\n \t\tif (res != null) {\n \t\t\tObject[] args = { userID, res };\n \t\t\t// Do it\n-\t\t\tthis.view.makeObject(null, LineChatClientView.SHOWURLCLASSNAME, LineChatClientView.SHOWURLARGTYPES,\n+\t\t\tthis.view.createObject(null, LineChatClientView.SHOWURLCLASSNAME, LineChatClientView.SHOWURLARGTYPES,\n \t\t\t\t\targs);\n \t\t}\n \t}\n@@ -1238,7 +1238,7 @@ protected void sendEclipseComponent(User user) {\n \t\t\t\t\tinitStr);\n \t\t}\n \t\tif (res != null)\n-\t\t\tthis.view.makeProxyObject(userID, res);\n+\t\t\tthis.view.createProxyObject(userID, res);\n \t}\n \n \tprotected void sendFile(String pathName, final String fileName,\n@@ -1310,7 +1310,7 @@ protected void sendMessageToGroup() {\n \t\t\t\t\"\");\n \t\tif (res != null & !res.equals(\"\")) {\n \t\t\tString[] args = { res, this.view.userdata.getNickname() };\n-\t\t\tthis.view.makeObject(null, LineChatClientView.MESSAGECLASSNAME, args);\n+\t\t\tthis.view.createObject(null, LineChatClientView.MESSAGECLASSNAME, args);\n \t\t}\n \t}\n \n@@ -1329,7 +1329,7 @@ protected void sendRepObjectToGroup(User user) {\n \t\t\t\t\"Replicated Object Class and Args (separated by whitespace):\",\n \t\t\t\t\"\");\n \t\tif (result != null && !result.equals(\"\")) {\n-\t\t\tthis.view.makeObject(null, getCommand(result), getArgs(result));\n+\t\t\tthis.view.createObject(null, getCommand(result), getArgs(result));\n \t\t}\n \t}\n ", "raw_url": "https://github.com/eclipse/ecf/raw/0d00787f0d8de19464aaac7bc951d9817fd7c518/examples%2Fbundles%2Forg.eclipse.ecf.example.collab%2Fsrc%2Forg%2Feclipse%2Fecf%2Fexample%2Fcollab%2Fui%2FChatComposite.java", "sha": "cbadc79fc4f759ba0b0ef5c4fd21539821d81c63", "status": "modified" }, { "additions": 2, "blob_url": "https://github.com/eclipse/ecf/blob/0d00787f0d8de19464aaac7bc951d9817fd7c518/examples%2Fbundles%2Forg.eclipse.ecf.example.collab%2Fsrc%2Forg%2Feclipse%2Fecf%2Fexample%2Fcollab%2Fui%2FJoinGroupWizard.java", "changes": 4, "contents_url": "https://api.github.com/repos/eclipse/ecf/contents/examples%2Fbundles%2Forg.eclipse.ecf.example.collab%2Fsrc%2Forg%2Feclipse%2Fecf%2Fexample%2Fcollab%2Fui%2FJoinGroupWizard.java?ref=0d00787f0d8de19464aaac7bc951d9817fd7c518", "deletions": 2, "filename": "examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ui/JoinGroupWizard.java", "new_code": "\t\t\t\tgroupID = IDFactory.getDefault().createID(namespace,new Object[] { groupName });\n\t\t\t} else groupID = IDFactory.getDefault().createStringID(groupName);", "new_methods": [], "old_code": "\t\t\t\tgroupID = IDFactory.getDefault().makeID(namespace,new Object[] { groupName });\n\t\t\t} else groupID = IDFactory.getDefault().makeStringID(groupName);", "old_methods": [], "patch": "@@ -76,8 +76,8 @@ protected void finishPage(final IProgressMonitor monitor)\n \t/*\n \t\t\tID groupID = null;\n \t\t\tif (namespace != null) {\n-\t\t\t\tgroupID = IDFactory.getDefault().makeID(namespace,new Object[] { groupName });\n-\t\t\t} else groupID = IDFactory.getDefault().makeStringID(groupName);\n+\t\t\t\tgroupID = IDFactory.getDefault().createID(namespace,new Object[] { groupName });\n+\t\t\t} else groupID = IDFactory.getDefault().createStringID(groupName);\n client = new ClientConnectAction();\n client.setProject(project);\n client.setUsername(nickName);", "raw_url": "https://github.com/eclipse/ecf/raw/0d00787f0d8de19464aaac7bc951d9817fd7c518/examples%2Fbundles%2Forg.eclipse.ecf.example.collab%2Fsrc%2Forg%2Feclipse%2Fecf%2Fexample%2Fcollab%2Fui%2FJoinGroupWizard.java", "sha": "cc09a53044cf03247cc49d9f572a1733fae3d87b", "status": "modified" }, { "additions": 22, "blob_url": "https://github.com/eclipse/ecf/blob/0d00787f0d8de19464aaac7bc951d9817fd7c518/examples%2Fbundles%2Forg.eclipse.ecf.example.collab%2Fsrc%2Forg%2Feclipse%2Fecf%2Fexample%2Fcollab%2Fui%2FLineChatClientView.java", "changes": 44, "contents_url": "https://api.github.com/repos/eclipse/ecf/contents/examples%2Fbundles%2Forg.eclipse.ecf.example.collab%2Fsrc%2Forg%2Feclipse%2Fecf%2Fexample%2Fcollab%2Fui%2FLineChatClientView.java?ref=0d00787f0d8de19464aaac7bc951d9817fd7c518", "deletions": 22, "filename": "examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ui/LineChatClientView.java", "new_code": "\t\t\tfinal String str = createChatLine(username + \" \" + ENTER_STRING);\n\tprivate String createChatLine(String line) {\n\t\tTreeUser top = createUserNode(ud);\n\t\t\tprefix += createChatLine(\" \" + HOST_PREFIX + \": \");\n\t\t\tprefix += createChatLine(\" \" + tmp + CLIENT_PREFIX + \": \");\n\t\t\tprefix += createChatLine(\" \" + HOST_PREFIX + \" (private): \");\n\t\t\tprefix += createChatLine(\" \" + tmp + CLIENT_PREFIX + \" (private): \");\n\tprotected void createObject(ID target, String className, String[] args) {\n\t\tcreateObject(target, className, null, args);\n\tprotected void createObject(ID target, final String className,\n\t\t\t\tlch.createObject(target, className, map);\n\t\t\t\tlch.chatException(e, \"createObject(\" + className + \")\");\n\tprotected void createProxyObject(ID target, final String className) {\n\t\t\t\tlch.createProxyObject(target, className, className);\n\t\t\t\tlch.chatException(e, \"createProxyObject(\" + className + \")\");\n\tprotected TreeParent createUserNode(TreeParent node, Vector ht) {\n\t\t\t\tcreateUserNode(tn, (Vector) val);\n\tprotected TreeUser createUserNode(User ud) {\n\t\treturn (TreeUser) createUserNode(tu, ud.getUserFields());\n\t\t\tfinal String str = createChatLine(name + \" \" + LEFT_STRING);\n\t\tcreateObject(null, EXECPROGCLASSNAME, EXECPROGARGTYPES, args);\n\t\t\treturn createUserNode(newRoot, (Vector) val);", "new_methods": [], "old_code": "\t\t\tfinal String str = makeChatLine(username + \" \" + ENTER_STRING);\n\tprivate String makeChatLine(String line) {\n\t\tTreeUser top = makeUserNode(ud);\n\t\t\tprefix += makeChatLine(\" \" + HOST_PREFIX + \": \");\n\t\t\tprefix += makeChatLine(\" \" + tmp + CLIENT_PREFIX + \": \");\n\t\t\tprefix += makeChatLine(\" \" + HOST_PREFIX + \" (private): \");\n\t\t\tprefix += makeChatLine(\" \" + tmp + CLIENT_PREFIX + \" (private): \");\n\tprotected void makeObject(ID target, String className, String[] args) {\n\t\tmakeObject(target, className, null, args);\n\tprotected void makeObject(ID target, final String className,\n\t\t\t\tlch.makeObject(target, className, map);\n\t\t\t\tlch.chatException(e, \"makeObject(\" + className + \")\");\n\tprotected void makeProxyObject(ID target, final String className) {\n\t\t\t\tlch.makeProxyObject(target, className, className);\n\t\t\t\tlch.chatException(e, \"makeProxyObject(\" + className + \")\");\n\tprotected TreeParent makeUserNode(TreeParent node, Vector ht) {\n\t\t\t\tmakeUserNode(tn, (Vector) val);\n\tprotected TreeUser makeUserNode(User ud) {\n\t\treturn (TreeUser) makeUserNode(tu, ud.getUserFields());\n\t\t\tfinal String str = makeChatLine(name + \" \" + LEFT_STRING);\n\t\tmakeObject(null, EXECPROGCLASSNAME, EXECPROGARGTYPES, args);\n\t\t\treturn makeUserNode(newRoot, (Vector) val);", "old_methods": [], "patch": "@@ -126,7 +126,7 @@ public boolean addUser(User ud) {\n \t\t\treturn false;\n \t\t} else {\n \t\t\tmyNames.put(userID, username);\n-\t\t\tfinal String str = makeChatLine(username + \" \" + ENTER_STRING);\n+\t\t\tfinal String str = createChatLine(username + \" \" + ENTER_STRING);\n \t\t\taddUserToTree(ud);\n \t\t\tshowText(new ChatLine(str));\n \t\t\treturn true;\n@@ -139,7 +139,7 @@ public boolean addUser(User ud) {\n \t * @param line Input text\n \t * @return User-defined output of chat text.\n \t */\n-\tprivate String makeChatLine(String line) {\n+\tprivate String createChatLine(String line) {\n \t\tif (showTimestamp) {\n \t\t\treturn dateTime() + line;\n \t\t}\n@@ -153,7 +153,7 @@ protected void addUserToTree(User ud) {\n \t\tTreeParent root = getPresenceRoot();\n \t\tif (root == null)\n \t\t\treturn;\n-\t\tTreeUser top = makeUserNode(ud);\n+\t\tTreeUser top = createUserNode(ud);\n \t\tif (top == null)\n \t\t\treturn;\n \t\troot.addChild(top);\n@@ -233,13 +233,13 @@ protected void expandAll() {\n \tprotected String getPrefix(ID objID) {\n \t\tString prefix = \"\";\n \t\tif (userdata.getUserID().equals(objID)) {\n-\t\t\tprefix += makeChatLine(\" \" + HOST_PREFIX + \": \");\n+\t\t\tprefix += createChatLine(\" \" + HOST_PREFIX + \": \");\n \t\t} else {\n \t\t\tString tmp = getUserData(objID);\n \t\t\tif (tmp == null) {\n \t\t\t\ttmp = objID.toString();\n \t\t\t}\n-\t\t\tprefix += makeChatLine(\" \" + tmp + CLIENT_PREFIX + \": \");\n+\t\t\tprefix += createChatLine(\" \" + tmp + CLIENT_PREFIX + \": \");\n \t\t}\n \t\treturn prefix;\n \t}\n@@ -258,13 +258,13 @@ protected TreeParent getPresenceRoot() {\n \tprotected String getPrivatePrefix(ID objID) {\n \t\tString prefix = \"\";\n \t\tif (userdata.getUserID().equals(objID)) {\n-\t\t\tprefix += makeChatLine(\" \" + HOST_PREFIX + \" (private): \");\n+\t\t\tprefix += createChatLine(\" \" + HOST_PREFIX + \" (private): \");\n \t\t} else {\n \t\t\tString tmp = getUserData(objID);\n \t\t\tif (tmp == null) {\n \t\t\t\ttmp = objID.toString();\n \t\t\t}\n-\t\t\tprefix += makeChatLine(\" \" + tmp + CLIENT_PREFIX + \" (private): \");\n+\t\t\tprefix += createChatLine(\" \" + tmp + CLIENT_PREFIX + \" (private): \");\n \t\t}\n \t\treturn prefix;\n \t}\n@@ -308,18 +308,18 @@ protected void handleTextInput(String text) {\n \t\t\tlch.inputText(text);\n \t}\n \n-\tprotected void makeObject(ID target, String className, String[] args) {\n-\t\tmakeObject(target, className, null, args);\n+\tprotected void createObject(ID target, String className, String[] args) {\n+\t\tcreateObject(target, className, null, args);\n \t}\n \n-\tprotected void makeObject(ID target, final String className,\n+\tprotected void createObject(ID target, final String className,\n \t\t\tString[] argTypes, Object[] args) {\n \t\tif (lch != null) {\n \t\t\tHashMap map = new HashMap();\n \t\t\tmap.put(\"args\", args);\n \t\t\tmap.put(\"types\", argTypes);\n \t\t\ttry {\n-\t\t\t\tlch.makeObject(target, className, map);\n+\t\t\t\tlch.createObject(target, className, map);\n \t\t\t} catch (final Exception e) {\n \t\t\t\tDisplay.getDefault().asyncExec(new Runnable() {\n \t\t\t\t\tpublic void run() {\n@@ -330,18 +330,18 @@ public void run() {\n \t\t\t\t\t}\n \t\t\t\t});\n \t\t\t\te.printStackTrace();\n-\t\t\t\tlch.chatException(e, \"makeObject(\" + className + \")\");\n+\t\t\t\tlch.chatException(e, \"createObject(\" + className + \")\");\n \t\t\t}\n \t\t}\n \t}\n \n-\tprotected void makeProxyObject(ID target, final String className) {\n+\tprotected void createProxyObject(ID target, final String className) {\n \t\tif (lch != null) {\n \t\t\ttry {\n \t\t\t\t// With this interface, we'll simply supply the class name\n \t\t\t\t// as the instance name. Eventually, the user interface should\n \t\t\t\t// allow the creation of some other instance name\n-\t\t\t\tlch.makeProxyObject(target, className, className);\n+\t\t\t\tlch.createProxyObject(target, className, className);\n \t\t\t\tproxyObjects.add(className);\n \t\t\t\tteamChat.enableProxyMessage(true);\n \t\t\t} catch (final Exception e) {\n@@ -354,12 +354,12 @@ public void run() {\n \t\t\t\t\t}\n \t\t\t\t});\n \t\t\t\te.printStackTrace();\n-\t\t\t\tlch.chatException(e, \"makeProxyObject(\" + className + \")\");\n+\t\t\t\tlch.chatException(e, \"createProxyObject(\" + className + \")\");\n \t\t\t}\n \t\t}\n \t}\n \n-\tprotected TreeParent makeUserNode(TreeParent node, Vector ht) {\n+\tprotected TreeParent createUserNode(TreeParent node, Vector ht) {\n \t\tif (node == null || ht == null)\n \t\t\treturn null;\n \t\tfor (Enumeration e = ht.elements(); e.hasMoreElements();) {\n@@ -368,19 +368,19 @@ protected TreeParent makeUserNode(TreeParent node, Vector ht) {\n \t\t\tfinal TreeParent tn = new TreeParent(this, ti);\n \t\t\tif (val instanceof Vector) {\n \t\t\t\t// Create new tree node\n-\t\t\t\tmakeUserNode(tn, (Vector) val);\n+\t\t\t\tcreateUserNode(tn, (Vector) val);\n \t\t\t}\n \t\t\tnode.addChild(tn);\n \t\t}\n \t\trefreshTreeView();\n \t\treturn node;\n \t}\n \n-\tprotected TreeUser makeUserNode(User ud) {\n+\tprotected TreeUser createUserNode(User ud) {\n \t\tif (ud == null)\n \t\t\treturn null;\n \t\tTreeUser tu = new TreeUser(this, ud);\n-\t\treturn (TreeUser) makeUserNode(tu, ud.getUserFields());\n+\t\treturn (TreeUser) createUserNode(tu, ud.getUserFields());\n \t}\n \n \tprotected void messageProxyObject(ID target, String classname, String meth,\n@@ -432,7 +432,7 @@ public void run() {\n \tpublic void removeUser(ID id) {\n \t\tString name = getUserData(id);\n \t\tif (name != null) {\n-\t\t\tfinal String str = makeChatLine(name + \" \" + LEFT_STRING);\n+\t\t\tfinal String str = createChatLine(name + \" \" + LEFT_STRING);\n \t\t\tshowText(new ChatLine(str));\n \t\t}\n \t\tmyNames.remove(id);\n@@ -460,7 +460,7 @@ protected void runProgram(ID receiver, String program, String[] env) {\n \t\tObject[] args = { receiver, cmds, env, new Boolean(receiver == null),\n \t\t\t\tnew Boolean(false) };\n \t\t// Do it\n-\t\tmakeObject(null, EXECPROGCLASSNAME, EXECPROGARGTYPES, args);\n+\t\tcreateObject(null, EXECPROGCLASSNAME, EXECPROGARGTYPES, args);\n \t}\n \n \tpublic void sendData(File aFile, long dataLength) {\n@@ -518,7 +518,7 @@ protected TreeParent updateSubtree(TreeParent root, TreeItem item) {\n \t\tTreeParent newRoot = new TreeParent(this, item);\n \t\tObject val = item.getValue();\n \t\tif (val instanceof Vector) {\n-\t\t\treturn makeUserNode(newRoot, (Vector) val);\n+\t\t\treturn createUserNode(newRoot, (Vector) val);\n \t\t} else\n \t\t\treturn newRoot;\n \t}", "raw_url": "https://github.com/eclipse/ecf/raw/0d00787f0d8de19464aaac7bc951d9817fd7c518/examples%2Fbundles%2Forg.eclipse.ecf.example.collab%2Fsrc%2Forg%2Feclipse%2Fecf%2Fexample%2Fcollab%2Fui%2FLineChatClientView.java", "sha": "b434f807722a52ea4b73f02212f4d711a2e52f08", "status": "modified" }, { "additions": 2, "blob_url": "https://github.com/eclipse/ecf/blob/0d00787f0d8de19464aaac7bc951d9817fd7c518/examples%2Fbundles%2Forg.eclipse.ecf.example.collab%2Fsrc%2Forg%2Feclipse%2Fecf%2Fexample%2Fcollab%2Fui%2FLineChatHandler.java", "changes": 4, "contents_url": "https://api.github.com/repos/eclipse/ecf/contents/examples%2Fbundles%2Forg.eclipse.ecf.example.collab%2Fsrc%2Forg%2Feclipse%2Fecf%2Fexample%2Fcollab%2Fui%2FLineChatHandler.java?ref=0d00787f0d8de19464aaac7bc951d9817fd7c518", "deletions": 2, "filename": "examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ui/LineChatHandler.java", "new_code": " public ID createObject(ID target, String classname, Map map) \n\tpublic void createProxyObject(ID target,String classname,String name);", "new_methods": [], "old_code": " public ID makeObject(ID target, String classname, Map map) \n\tpublic void makeProxyObject(ID target,String classname,String name);", "old_methods": [], "patch": "@@ -32,7 +32,7 @@ public interface LineChatHandler {\n \tpublic void sendStartedTyping(); \n public void inputText(String aString);\n \n- public ID makeObject(ID target, String classname, Map map) \n+ public ID createObject(ID target, String classname, Map map) \n throws Exception;\n \n public Object getObject(ID target);\n@@ -47,7 +47,7 @@ public void joinGroup(ID remote, IConnectContext joinContext)\n public void sendRingMessageToUser(User touser,String msg);\n \tpublic void sendPrivateMessageToUser(User touser, String msg);\n \t\n-\tpublic void makeProxyObject(ID target,String classname,String name);\n+\tpublic void createProxyObject(ID target,String classname,String name);\n \tpublic void messageProxyObject(ID target, String name, String meth, Object [] args);\n \tpublic void removeProxyObject(ID target,String name);\n \t", "raw_url": "https://github.com/eclipse/ecf/raw/0d00787f0d8de19464aaac7bc951d9817fd7c518/examples%2Fbundles%2Forg.eclipse.ecf.example.collab%2Fsrc%2Forg%2Feclipse%2Fecf%2Fexample%2Fcollab%2Fui%2FLineChatHandler.java", "sha": "724cbe9aafa41c3f6f786a469d3a94551d56eaf4", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/eclipse/ecf/blob/0d00787f0d8de19464aaac7bc951d9817fd7c518/examples%2Fbundles%2Forg.eclipse.ecf.example.collab%2Fsrc%2Forg%2Feclipse%2Fecf%2Fexample%2Fcollab%2Fui%2FLineChatView.java", "changes": 2, "contents_url": "https://api.github.com/repos/eclipse/ecf/contents/examples%2Fbundles%2Forg.eclipse.ecf.example.collab%2Fsrc%2Forg%2Feclipse%2Fecf%2Fexample%2Fcollab%2Fui%2FLineChatView.java?ref=0d00787f0d8de19464aaac7bc951d9817fd7c518", "deletions": 1, "filename": "examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ui/LineChatView.java", "new_code": "\tpublic static LineChatClientView createClientView(final LineChatHandler lch, final String name,final String initText,String downloaddir) ", "new_methods": [], "old_code": "\tpublic static LineChatClientView makeClientView(final LineChatHandler lch, final String name,final String initText,String downloaddir) ", "old_methods": [], "patch": "@@ -135,7 +135,7 @@ public void run() {\n \t\t});\n \t}\n \t\n-\tpublic static LineChatClientView makeClientView(final LineChatHandler lch, final String name,final String initText,String downloaddir) \n+\tpublic static LineChatClientView createClientView(final LineChatHandler lch, final String name,final String initText,String downloaddir) \n \t\tthrows Exception {\n \t\tLineChatClientView newView = null;\n \t\tsynchronized (clientViews) {", "raw_url": "https://github.com/eclipse/ecf/raw/0d00787f0d8de19464aaac7bc951d9817fd7c518/examples%2Fbundles%2Forg.eclipse.ecf.example.collab%2Fsrc%2Forg%2Feclipse%2Fecf%2Fexample%2Fcollab%2Fui%2FLineChatView.java", "sha": "2c9017d227ec3b9f1a43ccfb830c5c4397996195", "status": "modified" }, { "additions": 4, "blob_url": "https://github.com/eclipse/ecf/blob/0d00787f0d8de19464aaac7bc951d9817fd7c518/examples%2Fbundles%2Forg.eclipse.ecf.example.sdo.editor%2Fsrc%2Forg%2Feclipse%2Fecf%2Fexample%2Fsdo%2Feditor%2FEditorPlugin.java", "changes": 8, "contents_url": "https://api.github.com/repos/eclipse/ecf/contents/examples%2Fbundles%2Forg.eclipse.ecf.example.sdo.editor%2Fsrc%2Forg%2Feclipse%2Fecf%2Fexample%2Fsdo%2Feditor%2FEditorPlugin.java?ref=0d00787f0d8de19464aaac7bc951d9817fd7c518", "deletions": 4, "filename": "examples/bundles/org.eclipse.ecf.example.sdo.editor/src/org/eclipse/ecf/example/sdo/editor/EditorPlugin.java", "new_code": " ID id = IDFactory.getDefault().createStringID(path);\n ID id = IDFactory.getDefault().createStringID(path);\n return tracker.isPublished(IDFactory.getDefault().createStringID(path));\n ID id = IDFactory.getDefault().createStringID(PublishedGraphTracker.class.getName());", "new_methods": [], "old_code": " ID id = IDFactory.getDefault().makeStringID(path);\n ID id = IDFactory.getDefault().makeStringID(path);\n return tracker.isPublished(IDFactory.getDefault().makeStringID(path));\n ID id = IDFactory.getDefault().makeStringID(PublishedGraphTracker.class.getName());", "old_methods": [], "patch": "@@ -115,7 +115,7 @@ public synchronized ISharedDataGraph subscribe(String path,\n .getWorkspace().getRoot().getProject(p.segment(0)));\n PublishedGraphTracker tracker = getTracker(container);\n \n- ID id = IDFactory.getDefault().makeStringID(path);\n+ ID id = IDFactory.getDefault().createStringID(path);\n WaitableSubscriptionCallback mutex = new WaitableSubscriptionCallback();\n ISharedDataGraph result = DataGraphSharingFactory.getDataGraphSharing(\n container, \"default\").subscribe(id, new EMFUpdateProvider(),\n@@ -141,7 +141,7 @@ public synchronized ISharedDataGraph publish(String path,\n .getWorkspace().getRoot().getProject(p.segment(0)));\n PublishedGraphTracker tracker = getTracker(container);\n \n- ID id = IDFactory.getDefault().makeStringID(path);\n+ ID id = IDFactory.getDefault().createStringID(path);\n WaitablePublicationCallback mutex = new WaitablePublicationCallback();\n ISharedDataGraph result = DataGraphSharingFactory.getDataGraphSharing(\n container, \"default\").publish(dataGraph, id,\n@@ -162,7 +162,7 @@ public synchronized boolean isPublished(String path) throws ECFException {\n ISharedObjectContainer container = getContainer(ResourcesPlugin\n .getWorkspace().getRoot().getProject(p.segment(0)));\n PublishedGraphTracker tracker = getTracker(container);\n- return tracker.isPublished(IDFactory.getDefault().makeStringID(path));\n+ return tracker.isPublished(IDFactory.getDefault().createStringID(path));\n }\n \n public synchronized void checkConnected(IProject project)\n@@ -179,7 +179,7 @@ private ISharedObjectContainer getContainer(IProject project)\n \n private PublishedGraphTracker getTracker(ISharedObjectContainer container)\n throws ECFException {\n- ID id = IDFactory.getDefault().makeStringID(PublishedGraphTracker.class.getName());\n+ ID id = IDFactory.getDefault().createStringID(PublishedGraphTracker.class.getName());\n PublishedGraphTracker tracker = (PublishedGraphTracker) container\n .getSharedObjectManager().getSharedObject(id);\n if (tracker == null) {", "raw_url": "https://github.com/eclipse/ecf/raw/0d00787f0d8de19464aaac7bc951d9817fd7c518/examples%2Fbundles%2Forg.eclipse.ecf.example.sdo.editor%2Fsrc%2Forg%2Feclipse%2Fecf%2Fexample%2Fsdo%2Feditor%2FEditorPlugin.java", "sha": "85f0e9dc89f56a08dc51a2cda23747bed13185f1", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/eclipse/ecf/blob/0d00787f0d8de19464aaac7bc951d9817fd7c518/examples%2Fbundles%2Forg.eclipse.ecf.sdo%2Fsrc%2Forg%2Feclipse%2Fecf%2Finternal%2Fsdo%2FDataGraphSharingManager.java", "changes": 2, "contents_url": "https://api.github.com/repos/eclipse/ecf/contents/examples%2Fbundles%2Forg.eclipse.ecf.sdo%2Fsrc%2Forg%2Feclipse%2Fecf%2Finternal%2Fsdo%2FDataGraphSharingManager.java?ref=0d00787f0d8de19464aaac7bc951d9817fd7c518", "deletions": 1, "filename": "examples/bundles/org.eclipse.ecf.sdo/src/org/eclipse/ecf/internal/sdo/DataGraphSharingManager.java", "new_code": " ID id = IDFactory.getDefault().createStringID(DataGraphSharing.DATA_GRAPH_SHARING_ID);", "new_methods": [], "old_code": " ID id = IDFactory.getDefault().makeStringID(DataGraphSharing.DATA_GRAPH_SHARING_ID);", "old_methods": [], "patch": "@@ -31,7 +31,7 @@ public class DataGraphSharingManager implements IDataGraphSharingManager {\n public synchronized IDataGraphSharing getInstance(\n ISharedObjectContainer container) throws ECFException {\n ISharedObjectManager mgr = container.getSharedObjectManager();\n- ID id = IDFactory.getDefault().makeStringID(DataGraphSharing.DATA_GRAPH_SHARING_ID);\n+ ID id = IDFactory.getDefault().createStringID(DataGraphSharing.DATA_GRAPH_SHARING_ID);\n DataGraphSharing result = (DataGraphSharing) mgr.getSharedObject(id);\n if (result == null) {\n result = new DataGraphSharing();", "raw_url": "https://github.com/eclipse/ecf/raw/0d00787f0d8de19464aaac7bc951d9817fd7c518/examples%2Fbundles%2Forg.eclipse.ecf.sdo%2Fsrc%2Forg%2Feclipse%2Fecf%2Finternal%2Fsdo%2FDataGraphSharingManager.java", "sha": "73634f12563c201a5c2a9e4aeda93062f7d65df6", "status": "modified" }, { "additions": 2, "blob_url": "https://github.com/eclipse/ecf/blob/0d00787f0d8de19464aaac7bc951d9817fd7c518/framework%2Fbundles%2Forg.eclipse.ecf.presence%2Fsrc%2Forg%2Feclipse%2Fecf%2Fpresence%2Fchat%2FIChatRoomManager.java", "changes": 4, "contents_url": "https://api.github.com/repos/eclipse/ecf/contents/framework%2Fbundles%2Forg.eclipse.ecf.presence%2Fsrc%2Forg%2Feclipse%2Fecf%2Fpresence%2Fchat%2FIChatRoomManager.java?ref=0d00787f0d8de19464aaac7bc951d9817fd7c518", "deletions": 2, "filename": "framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/chat/IChatRoomManager.java", "new_code": "\t * Create a new IChatRoomContainer instance\n\tpublic IChatRoomContainer createChatRoomContainer() throws ContainerInstantiationException;", "new_methods": [], "old_code": "\t * Make a new IChatRoomContainer instance\n\tpublic IChatRoomContainer makeChatRoomContainer() throws ContainerInstantiationException;", "old_methods": [], "patch": "@@ -32,10 +32,10 @@ public interface IChatRoomManager {\n \t */\n \tpublic IRoomInfo[] getChatRoomsInfo();\n \t/**\n-\t * Make a new IChatRoomContainer instance\n+\t * Create a new IChatRoomContainer instance\n \t * @return non-null IChatRoomContainer implementer\n \t * @throws ContainerInstantiationException if chat room container cannot be made\n \t */\n-\tpublic IChatRoomContainer makeChatRoomContainer() throws ContainerInstantiationException;\n+\tpublic IChatRoomContainer createChatRoomContainer() throws ContainerInstantiationException;\n \t\n }", "raw_url": "https://github.com/eclipse/ecf/raw/0d00787f0d8de19464aaac7bc951d9817fd7c518/framework%2Fbundles%2Forg.eclipse.ecf.presence%2Fsrc%2Forg%2Feclipse%2Fecf%2Fpresence%2Fchat%2FIChatRoomManager.java", "sha": "788c4c6360bf6331b20133825d1f067ec3a03761", "status": "modified" }, { "additions": 6, "blob_url": "https://github.com/eclipse/ecf/blob/0d00787f0d8de19464aaac7bc951d9817fd7c518/framework%2Fbundles%2Forg.eclipse.ecf.provider%2Fsrc%2Forg%2Feclipse%2Fecf%2Fprovider%2Fapp%2FClientApplication.java", "changes": 12, "contents_url": "https://api.github.com/repos/eclipse/ecf/contents/framework%2Fbundles%2Forg.eclipse.ecf.provider%2Fsrc%2Forg%2Feclipse%2Fecf%2Fprovider%2Fapp%2FClientApplication.java?ref=0d00787f0d8de19464aaac7bc951d9817fd7c518", "deletions": 6, "filename": "framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/app/ClientApplication.java", "new_code": "\t\t\tsm[i] = createClient();\n\tprotected ISharedObjectContainer createClient() throws Exception {\n\t\tID newContainerID = IDFactory.getDefault().createGUID();\n\t\tISharedObjectContainer result = SharedObjectContainerFactory.getDefault().createSharedObjectContainer(contd,null,new Object[] { newContainerID, new Integer(DEFAULT_TIMEOUT)});\n\t\t\t\t\tSharedObjectDescription sd = new SharedObjectDescription(IDFactory.getDefault().createStringID(String.valueOf(aRan.nextInt())),sharedObjectClassNames[i]);\n\t\tID serverID = IDFactory.getDefault().createStringID(st.serverName);", "new_methods": [], "old_code": "\t\t\tsm[i] = makeClient();\n\tprotected ISharedObjectContainer makeClient() throws Exception {\n\t\tID newContainerID = IDFactory.getDefault().makeGUID();\n\t\tISharedObjectContainer result = SharedObjectContainerFactory.getDefault().makeSharedObjectContainer(contd,null,new Object[] { newContainerID, new Integer(DEFAULT_TIMEOUT)});\n\t\t\t\t\tSharedObjectDescription sd = new SharedObjectDescription(IDFactory.getDefault().makeStringID(String.valueOf(aRan.nextInt())),sharedObjectClassNames[i]);\n\t\tID serverID = IDFactory.getDefault().makeStringID(st.serverName);", "old_methods": [], "patch": "@@ -71,14 +71,14 @@ public void init(String [] args) throws Exception {\n \t\tcontd = new ContainerDescription(ClientApplication.class.getClassLoader(),CONTAINER_FACTORY_NAME,CONTAINER_FACTORY_CLASS,null);\n \t\tContainerFactory.getDefault().addDescription(contd);\n \t\tfor(int i=0; i < clientCount; i++) {\n-\t\t\tsm[i] = makeClient();\n+\t\t\tsm[i] = createClient();\n \t\t}\n \t}\n \t\n-\tprotected ISharedObjectContainer makeClient() throws Exception {\n+\tprotected ISharedObjectContainer createClient() throws Exception {\n \t\t// Make identity instance for the new container\n-\t\tID newContainerID = IDFactory.getDefault().makeGUID();\n-\t\tISharedObjectContainer result = SharedObjectContainerFactory.getDefault().makeSharedObjectContainer(contd,null,new Object[] { newContainerID, new Integer(DEFAULT_TIMEOUT)});\n+\t\tID newContainerID = IDFactory.getDefault().createGUID();\n+\t\tISharedObjectContainer result = SharedObjectContainerFactory.getDefault().createSharedObjectContainer(contd,null,new Object[] { newContainerID, new Integer(DEFAULT_TIMEOUT)});\n \t\treturn result;\n \t}\n \t\n@@ -104,7 +104,7 @@ public void createStages() throws Exception {\n \t\t\t\tISharedObjectContainer scg = sm[j];\n \t\t\t\tfor(int i=0; i < sharedObjectClassNames.length; i++) {\n \t\t\t\t\tSystem.out.println(\"Creating sharedObject: \"+sharedObjectClassNames[i]+\" for client \"+scg.getID().getName());\n-\t\t\t\t\tSharedObjectDescription sd = new SharedObjectDescription(IDFactory.getDefault().makeStringID(String.valueOf(aRan.nextInt())),sharedObjectClassNames[i]);\n+\t\t\t\t\tSharedObjectDescription sd = new SharedObjectDescription(IDFactory.getDefault().createStringID(String.valueOf(aRan.nextInt())),sharedObjectClassNames[i]);\n \t\t\t\t\tscg.getSharedObjectManager().createSharedObject(sd);\n \t\t\t\t\tSystem.out.println(\"Created sharedObject for client \"+scg.getID().getName());\n \t\t\t\t}\n@@ -125,7 +125,7 @@ public static void main(String[] args) throws Exception {\n \t\tClientApplication st = new ClientApplication();\n \t\tst.init(args);\n \t\t// Get server id to join\n-\t\tID serverID = IDFactory.getDefault().makeStringID(st.serverName);\n+\t\tID serverID = IDFactory.getDefault().createStringID(st.serverName);\n \t\tst.connect(serverID);\n \t\tst.createStages();\n \t\tSystem.out.println(\"Waiting \"+DEFAULT_WAITTIME+\" ms...\");", "raw_url": "https://github.com/eclipse/ecf/raw/0d00787f0d8de19464aaac7bc951d9817fd7c518/framework%2Fbundles%2Forg.eclipse.ecf.provider%2Fsrc%2Forg%2Feclipse%2Fecf%2Fprovider%2Fapp%2FClientApplication.java", "sha": "c16c2447f9e3159786fc370ce52e104ae43a0718", "status": "modified" }, { "additions": 6, "blob_url": "https://github.com/eclipse/ecf/blob/0d00787f0d8de19464aaac7bc951d9817fd7c518/framework%2Fbundles%2Forg.eclipse.ecf.provider%2Fsrc%2Forg%2Feclipse%2Fecf%2Fprovider%2Fapp%2FServerApplication.java", "changes": 12, "contents_url": "https://api.github.com/repos/eclipse/ecf/contents/framework%2Fbundles%2Forg.eclipse.ecf.provider%2Fsrc%2Forg%2Feclipse%2Fecf%2Fprovider%2Fapp%2FServerApplication.java?ref=0d00787f0d8de19464aaac7bc951d9817fd7c518", "deletions": 6, "filename": "framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/app/ServerApplication.java", "new_code": "\t\t\t\tserverGroups[j] = createServerGroup(connect.getHostname(),connect.getPort());\n\t\t\t\t\tTCPServerSOContainer cont = createServerContainer(group.getIDForGroup(),serverGroups[j],group.getName(),connect.getTimeout());\n\t ID id = IDFactory.getDefault().createStringID(serverName);\n\tprotected static TCPServerSOContainerGroup createServerGroup(String name, int port) {\n\tprotected static TCPServerSOContainer createServerContainer(String id, TCPServerSOContainerGroup group, String path, int keepAlive) throws IDInstantiationException {\n\t\tID newServerID = IDFactory.getDefault().createStringID(id);", "new_methods": [], "old_code": "\t\t\t\tserverGroups[j] = makeServerGroup(connect.getHostname(),connect.getPort());\n\t\t\t\t\tTCPServerSOContainer cont = makeServerContainer(group.getIDForGroup(),serverGroups[j],group.getName(),connect.getTimeout());\n\t ID id = IDFactory.getDefault().makeStringID(serverName);\n\tprotected static TCPServerSOContainerGroup makeServerGroup(String name, int port) {\n\tprotected static TCPServerSOContainer makeServerContainer(String id, TCPServerSOContainerGroup group, String path, int keepAlive) throws IDInstantiationException {\n\t\tID newServerID = IDFactory.getDefault().makeStringID(id);", "old_methods": [], "patch": "@@ -75,12 +75,12 @@ public static void main(String args[]) throws Exception {\n \t\t\tint j=0;\n \t\t\tfor(Iterator i=connectors.iterator(); i.hasNext(); ) {\n \t\t\t\tConnector connect = (Connector) i.next();\n-\t\t\t\tserverGroups[j] = makeServerGroup(connect.getHostname(),connect.getPort());\n+\t\t\t\tserverGroups[j] = createServerGroup(connect.getHostname(),connect.getPort());\n \t\t\t\tList groups = connect.getGroups();\n \t\t\t\t\n \t\t\t\tfor(Iterator g=groups.iterator(); g.hasNext(); ) {\n \t\t\t\t\tNamedGroup group = (NamedGroup) g.next();\n-\t\t\t\t\tTCPServerSOContainer cont = makeServerContainer(group.getIDForGroup(),serverGroups[j],group.getName(),connect.getTimeout());\n+\t\t\t\t\tTCPServerSOContainer cont = createServerContainer(group.getIDForGroup(),serverGroups[j],group.getName(),connect.getTimeout());\n \t\t\t\t\tservers.add(cont);\n \t\t\t\t}\n \t\t\t\tSystem.out.println(\"Putting server \"+connect.getHostname()+\" on the air\");\n@@ -105,7 +105,7 @@ public static void main(String args[]) throws Exception {\n \t // Setup server group\n \t serverGroups[0] = new TCPServerSOContainerGroup(anURL.getPort());\n \t // Create identity for server\n-\t ID id = IDFactory.getDefault().makeStringID(serverName);\n+\t ID id = IDFactory.getDefault().createStringID(serverName);\n \t // Create server config object with identity and default timeout\n \t SOContainerConfig config = new SOContainerConfig(id);\n \t // Make server instance\n@@ -127,14 +127,14 @@ public static void main(String args[]) throws Exception {\n \t\t}\n }\n \t\n-\tprotected static TCPServerSOContainerGroup makeServerGroup(String name, int port) {\n+\tprotected static TCPServerSOContainerGroup createServerGroup(String name, int port) {\n \t\tSystem.out.println(\"Creating server group named \"+name+\" to listen on port \"+port);\n \t\tTCPServerSOContainerGroup group = new TCPServerSOContainerGroup(name,port);\n \t\treturn group;\n \t}\n-\tprotected static TCPServerSOContainer makeServerContainer(String id, TCPServerSOContainerGroup group, String path, int keepAlive) throws IDInstantiationException {\n+\tprotected static TCPServerSOContainer createServerContainer(String id, TCPServerSOContainerGroup group, String path, int keepAlive) throws IDInstantiationException {\n \t\tSystem.out.println(\" Creating container with id=\"+id+\", group=\"+path+\" keepAlive=\"+keepAlive);\n-\t\tID newServerID = IDFactory.getDefault().makeStringID(id);\n+\t\tID newServerID = IDFactory.getDefault().createStringID(id);\n \t\tSOContainerConfig config = new SOContainerConfig(newServerID);\n \t\treturn new TCPServerSOContainer(config,group,path,keepAlive);\n \t}", "raw_url": "https://github.com/eclipse/ecf/raw/0d00787f0d8de19464aaac7bc951d9817fd7c518/framework%2Fbundles%2Forg.eclipse.ecf.provider%2Fsrc%2Forg%2Feclipse%2Fecf%2Fprovider%2Fapp%2FServerApplication.java", "sha": "dcc8d83f36154a4927870c70a5b2915ca6992753", "status": "modified" }, { "additions": 2, "blob_url": "https://github.com/eclipse/ecf/blob/0d00787f0d8de19464aaac7bc951d9817fd7c518/framework%2Fbundles%2Forg.eclipse.ecf.provider%2Fsrc%2Forg%2Feclipse%2Fecf%2Fprovider%2Fcomm%2Ftcp%2FClient.java", "changes": 4, "contents_url": "https://api.github.com/repos/eclipse/ecf/contents/framework%2Fbundles%2Forg.eclipse.ecf.provider%2Fsrc%2Forg%2Feclipse%2Fecf%2Fprovider%2Fcomm%2Ftcp%2FClient.java?ref=0d00787f0d8de19464aaac7bc951d9817fd7c518", "deletions": 2, "filename": "framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/tcp/Client.java", "new_code": " public ISynchAsynchConnection createInstance(ConnectionDescription description,\n retID = IDFactory.getDefault().createStringID(PROTOCOL + \"://\"", "new_methods": [], "old_code": " public ISynchAsynchConnection makeInstance(ConnectionDescription description,\n retID = IDFactory.getDefault().makeStringID(PROTOCOL + \"://\"", "old_methods": [], "patch": "@@ -46,7 +46,7 @@\n \n public final class Client implements ISynchAsynchConnection {\n public static class Creator implements ISynchAsynchConnectionInstantiator {\n- public ISynchAsynchConnection makeInstance(ConnectionDescription description,\n+ public ISynchAsynchConnection createInstance(ConnectionDescription description,\n ISynchAsynchConnectionEventHandler handler, Class[] clazzes,\n Object[] args) throws ConnectionInstantiationException {\n try {\n@@ -189,7 +189,7 @@ public synchronized ID getLocalID() {\n return null;\n ID retID = null;\n try {\n- retID = IDFactory.getDefault().makeStringID(PROTOCOL + \"://\"\n+ retID = IDFactory.getDefault().createStringID(PROTOCOL + \"://\"\n + socket.getLocalAddress().getHostName() + \":\" + socket.getLocalPort());\n } catch (Exception e) {\n \tdumpStack(\"Exception in getLocalID()\",e);", "raw_url": "https://github.com/eclipse/ecf/raw/0d00787f0d8de19464aaac7bc951d9817fd7c518/framework%2Fbundles%2Forg.eclipse.ecf.provider%2Fsrc%2Forg%2Feclipse%2Fecf%2Fprovider%2Fcomm%2Ftcp%2FClient.java", "sha": "a95ee43b4cac41c4771b4248de74d0a348724694", "status": "modified" }, { "additions": 8, "blob_url": "https://github.com/eclipse/ecf/blob/0d00787f0d8de19464aaac7bc951d9817fd7c518/framework%2Fbundles%2Forg.eclipse.ecf.provider%2Fsrc%2Forg%2Feclipse%2Fecf%2Fprovider%2Fgeneric%2FClientSOContainer.java", "changes": 16, "contents_url": "https://api.github.com/repos/eclipse/ecf/contents/framework%2Fbundles%2Forg.eclipse.ecf.provider%2Fsrc%2Forg%2Feclipse%2Fecf%2Fprovider%2Fgeneric%2FClientSOContainer.java?ref=0d00787f0d8de19464aaac7bc951d9817fd7c518", "deletions": 8, "filename": "framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/ClientSOContainer.java", "new_code": "\tprotected Callback[] createAuthorizationCallbacks() {\n\t\t\tISynchAsynchConnection aConnection = createConnection(remote,\n\t\t\tCallback[] callbacks = createAuthorizationCallbacks();\n\t\t\t\t\tObject connectData = createConnectData(remote, callbacks,\n\tprotected Object createConnectData(ID target, Callback[] cbs, Object data) {\n\t\treturn ContainerMessage.createJoinGroupMessage(getID(), target,\n\t\t\t\t\t\t\t\t\t\t.createLeaveGroupMessage(getID(),\n\tprotected abstract ISynchAsynchConnection createConnection(ID remoteSpace,", "new_methods": [], "old_code": "\tprotected Callback[] makeAuthorizationCallbacks() {\n\t\t\tISynchAsynchConnection aConnection = makeConnection(remote,\n\t\t\tCallback[] callbacks = makeAuthorizationCallbacks();\n\t\t\t\t\tObject connectData = makeConnectData(remote, callbacks,\n\tprotected Object makeConnectData(ID target, Callback[] cbs, Object data) {\n\t\treturn ContainerMessage.makeJoinGroupMessage(getID(), target,\n\t\t\t\t\t\t\t\t\t\t.makeLeaveGroupMessage(getID(),\n\tprotected abstract ISynchAsynchConnection makeConnection(ID remoteSpace,", "old_methods": [], "patch": "@@ -88,7 +88,7 @@ public ID getConnectedID() {\n \t\t}\n \t}\n \n-\tprotected Callback[] makeAuthorizationCallbacks() {\n+\tprotected Callback[] createAuthorizationCallbacks() {\n \t\treturn null;\n \t}\n \n@@ -101,7 +101,7 @@ public void connect(ID remote, IConnectContext joinContext)\n \t\t\tif (isClosing)\n \t\t\t\tthrow new IllegalStateException(\"container is closing\");\n \t\t\tdebug(\"connect:\" + remote + \":\" + joinContext);\n-\t\t\tISynchAsynchConnection aConnection = makeConnection(remote,\n+\t\t\tISynchAsynchConnection aConnection = createConnection(remote,\n \t\t\t\t\tjoinContext);\n \t\t\tObject response = null;\n \t\t\tsynchronized (connectLock) {\n@@ -123,7 +123,7 @@ public void connect(ID remote, IConnectContext joinContext)\n \t\t\t\tconnection = aConnection;\n \t\t\t}\n \t\t\t// Now call join callback handler, if it exists\n-\t\t\tCallback[] callbacks = makeAuthorizationCallbacks();\n+\t\t\tCallback[] callbacks = createAuthorizationCallbacks();\n \t\t\tif (joinContext != null) {\n \t\t\t\tCallbackHandler handler = joinContext.getCallbackHandler();\n \t\t\t\tif (handler != null) {\n@@ -133,7 +133,7 @@ public void connect(ID remote, IConnectContext joinContext)\n \n \t\t\tsynchronized (aConnection) {\n \t\t\t\ttry {\n-\t\t\t\t\tObject connectData = makeConnectData(remote, callbacks,\n+\t\t\t\t\tObject connectData = createConnectData(remote, callbacks,\n \t\t\t\t\t\t\tnull);\n \t\t\t\t\t// Make connect call\n \t\t\t\t\tresponse = aConnection.connect(remote, connectData,\n@@ -271,8 +271,8 @@ protected void forwardExcluding(ID from, ID excluding, ContainerMessage data)\n \t\t// NOP\n \t}\n \n-\tprotected Object makeConnectData(ID target, Callback[] cbs, Object data) {\n-\t\treturn ContainerMessage.makeJoinGroupMessage(getID(), target,\n+\tprotected Object createConnectData(ID target, Callback[] cbs, Object data) {\n+\t\treturn ContainerMessage.createJoinGroupMessage(getID(), target,\n \t\t\t\tgetNextSequenceNumber(), (Serializable) data);\n \t}\n \n@@ -292,7 +292,7 @@ public void disconnect() {\n \t\t\t\t\ttry {\n \t\t\t\t\t\tconnection.sendSynch(groupID,\n \t\t\t\t\t\t\t\tserializeObject(ContainerMessage\n-\t\t\t\t\t\t\t\t\t\t.makeLeaveGroupMessage(getID(),\n+\t\t\t\t\t\t\t\t\t\t.createLeaveGroupMessage(getID(),\n \t\t\t\t\t\t\t\t\t\t\t\tgroupID,\n \t\t\t\t\t\t\t\t\t\t\t\tgetNextSequenceNumber(),\n \t\t\t\t\t\t\t\t\t\t\t\tgetLeaveData(groupID))));\n@@ -312,7 +312,7 @@ public void disconnect() {\n \t\t\t\t.getID(), groupID));\n \t}\n \n-\tprotected abstract ISynchAsynchConnection makeConnection(ID remoteSpace,\n+\tprotected abstract ISynchAsynchConnection createConnection(ID remoteSpace,\n \t\t\tObject data) throws ConnectionInstantiationException;\n \n \tprotected void queueContainerMessage(ContainerMessage message)", "raw_url": "https://github.com/eclipse/ecf/raw/0d00787f0d8de19464aaac7bc951d9817fd7c518/framework%2Fbundles%2Forg.eclipse.ecf.provider%2Fsrc%2Forg%2Feclipse%2Fecf%2Fprovider%2Fgeneric%2FClientSOContainer.java", "sha": "3f76e2af2c2c072afae5b12abc1e5c10ece1e4bc", "status": "modified" }, { "additions": 5, "blob_url": "https://github.com/eclipse/ecf/blob/0d00787f0d8de19464aaac7bc951d9817fd7c518/framework%2Fbundles%2Forg.eclipse.ecf.provider%2Fsrc%2Forg%2Feclipse%2Fecf%2Fprovider%2Fgeneric%2FContainerInstantiator.java", "changes": 10, "contents_url": "https://api.github.com/repos/eclipse/ecf/contents/framework%2Fbundles%2Forg.eclipse.ecf.provider%2Fsrc%2Forg%2Feclipse%2Fecf%2Fprovider%2Fgeneric%2FContainerInstantiator.java?ref=0d00787f0d8de19464aaac7bc951d9817fd7c518", "deletions": 5, "filename": "framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/ContainerInstantiator.java", "new_code": " return IDFactory.getDefault().createGUID();\n } else return IDFactory.getDefault().createStringID((String) arg);\n return IDFactory.getDefault().createGUID(((Integer) arg).intValue());\n return IDFactory.getDefault().createGUID();\n public IContainer createInstance(", "new_methods": [], "old_code": " return IDFactory.getDefault().makeGUID();\n } else return IDFactory.getDefault().makeStringID((String) arg);\n return IDFactory.getDefault().makeGUID(((Integer) arg).intValue());\n return IDFactory.getDefault().makeGUID();\n public IContainer makeInstance(", "old_methods": [], "patch": "@@ -42,12 +42,12 @@ protected ID getIDFromArg(Class type, Object arg)\n if (arg instanceof String) {\n String val = (String) arg;\n if (val == null || val.equals(\"\")) {\n- return IDFactory.getDefault().makeGUID();\n- } else return IDFactory.getDefault().makeStringID((String) arg);\n+ return IDFactory.getDefault().createGUID();\n+ } else return IDFactory.getDefault().createStringID((String) arg);\n } else if (arg instanceof Integer) {\n- return IDFactory.getDefault().makeGUID(((Integer) arg).intValue());\n+ return IDFactory.getDefault().createGUID(((Integer) arg).intValue());\n } else\n- return IDFactory.getDefault().makeGUID();\n+ return IDFactory.getDefault().createGUID();\n }\n \n protected Integer getIntegerFromArg(Class type, Object arg)\n@@ -59,7 +59,7 @@ else if (arg != null) {\n } else return new Integer(-1);\n }\n \n- public IContainer makeInstance(\n+ public IContainer createInstance(\n ContainerDescription description, Class[] argTypes,\n Object[] args) throws ContainerInstantiationException {\n boolean isClient = true;", "raw_url": "https://github.com/eclipse/ecf/raw/0d00787f0d8de19464aaac7bc951d9817fd7c518/framework%2Fbundles%2Forg.eclipse.ecf.provider%2Fsrc%2Forg%2Feclipse%2Fecf%2Fprovider%2Fgeneric%2FContainerInstantiator.java", "sha": "679ee56756690fc747e5df31dfc5817703797cfa", "status": "modified" }, { "additions": 7, "blob_url": "https://github.com/eclipse/ecf/blob/0d00787f0d8de19464aaac7bc951d9817fd7c518/framework%2Fbundles%2Forg.eclipse.ecf.provider%2Fsrc%2Forg%2Feclipse%2Fecf%2Fprovider%2Fgeneric%2FContainerMessage.java", "changes": 14, "contents_url": "https://api.github.com/repos/eclipse/ecf/contents/framework%2Fbundles%2Forg.eclipse.ecf.provider%2Fsrc%2Forg%2Feclipse%2Fecf%2Fprovider%2Fgeneric%2FContainerMessage.java?ref=0d00787f0d8de19464aaac7bc951d9817fd7c518", "deletions": 7, "filename": "framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/ContainerMessage.java", "new_code": " public static ContainerMessage createViewChangeMessage(ID from, ID to, long seq,\n public static ContainerMessage createJoinGroupMessage(ID from, ID to, long seq,\n public static ContainerMessage createLeaveGroupMessage(ID from, ID to, long seq,\n public static ContainerMessage createSharedObjectCreateMessage(ID from, ID to,\n public static ContainerMessage createSharedObjectCreateResponseMessage(ID from,\n public static ContainerMessage createSharedObjectMessage(ID from, ID to, long seq,\n public static ContainerMessage createSharedObjectDisposeMessage(ID from, ID to,", "new_methods": [], "old_code": " public static ContainerMessage makeViewChangeMessage(ID from, ID to, long seq,\n public static ContainerMessage makeJoinGroupMessage(ID from, ID to, long seq,\n public static ContainerMessage makeLeaveGroupMessage(ID from, ID to, long seq,\n public static ContainerMessage makeSharedObjectCreateMessage(ID from, ID to,\n public static ContainerMessage makeSharedObjectCreateResponseMessage(ID from,\n public static ContainerMessage makeSharedObjectMessage(ID from, ID to, long seq,\n public static ContainerMessage makeSharedObjectDisposeMessage(ID from, ID to,", "old_methods": [], "patch": "@@ -81,40 +81,40 @@ public void setToContainerID(ID toContainerID) {\n this.toContainerID = toContainerID;\n }\n \n- public static ContainerMessage makeViewChangeMessage(ID from, ID to, long seq,\n+ public static ContainerMessage createViewChangeMessage(ID from, ID to, long seq,\n ID ids[], boolean add, Serializable data) {\n return new ContainerMessage(from, to, seq, new ViewChangeMessage(ids,\n add, data));\n }\n \n- public static ContainerMessage makeJoinGroupMessage(ID from, ID to, long seq,\n+ public static ContainerMessage createJoinGroupMessage(ID from, ID to, long seq,\n Serializable data) {\n return new ContainerMessage(from, to, seq, new JoinGroupMessage(data));\n }\n \n- public static ContainerMessage makeLeaveGroupMessage(ID from, ID to, long seq,\n+ public static ContainerMessage createLeaveGroupMessage(ID from, ID to, long seq,\n Serializable data) {\n return new ContainerMessage(from, to, seq, new LeaveGroupMessage(data));\n }\n \n- public static ContainerMessage makeSharedObjectCreateMessage(ID from, ID to,\n+ public static ContainerMessage createSharedObjectCreateMessage(ID from, ID to,\n long seq, Serializable data) {\n return new ContainerMessage(from, to, seq, new CreateMessage(data));\n }\n \n- public static ContainerMessage makeSharedObjectCreateResponseMessage(ID from,\n+ public static ContainerMessage createSharedObjectCreateResponseMessage(ID from,\n ID to, long contSeq, ID soID, Throwable e, long sequence) {\n return new ContainerMessage(from, to, contSeq,\n new CreateResponseMessage(soID, e, sequence));\n }\n \n- public static ContainerMessage makeSharedObjectMessage(ID from, ID to, long seq,\n+ public static ContainerMessage createSharedObjectMessage(ID from, ID to, long seq,\n ID fromSharedObject, Serializable data) {\n return new ContainerMessage(from, to, seq, new SharedObjectMessage(\n fromSharedObject, data));\n }\n \n- public static ContainerMessage makeSharedObjectDisposeMessage(ID from, ID to,\n+ public static ContainerMessage createSharedObjectDisposeMessage(ID from, ID to,\n long seq, ID sharedObjectID) {\n return new ContainerMessage(from, to, seq,\n new SharedObjectDisposeMessage(sharedObjectID));", "raw_url": "https://github.com/eclipse/ecf/raw/0d00787f0d8de19464aaac7bc951d9817fd7c518/framework%2Fbundles%2Forg.eclipse.ecf.provider%2Fsrc%2Forg%2Feclipse%2Fecf%2Fprovider%2Fgeneric%2FContainerMessage.java", "sha": "f3ed10c16bae4bf3965d66e4686e7ba6d48e700d", "status": "modified" }, { "additions": 2, "blob_url": "https://github.com/eclipse/ecf/blob/0d00787f0d8de19464aaac7bc951d9817fd7c518/framework%2Fbundles%2Forg.eclipse.ecf.provider%2Fsrc%2Forg%2Feclipse%2Fecf%2Fprovider%2Fgeneric%2FSOConfig.java", "changes": 4, "contents_url": "https://api.github.com/repos/eclipse/ecf/contents/framework%2Fbundles%2Forg.eclipse.ecf.provider%2Fsrc%2Forg%2Feclipse%2Fecf%2Fprovider%2Fgeneric%2FSOConfig.java?ref=0d00787f0d8de19464aaac7bc951d9817fd7c518", "deletions": 2, "filename": "framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOConfig.java", "new_code": " this.context = container.createSharedObjectContext(this,queue);\n this.context = container.createRemoteSharedObjectContext(this,queue);", "new_methods": [], "old_code": " this.context = container.makeSharedObjectContext(this,queue);\n this.context = container.makeRemoteSharedObjectContext(this,queue);", "old_methods": [], "patch": "@@ -42,9 +42,9 @@ public SOConfig(ID sharedObjectID, ID homeContainerID, SOContainer cont,\n protected void makeActive(IQueueEnqueue queue) {\n isActive = true;\n if (container.getID().equals(homeContainerID)) {\n- this.context = container.makeSharedObjectContext(this,queue);\n+ this.context = container.createSharedObjectContext(this,queue);\n } else {\n- this.context = container.makeRemoteSharedObjectContext(this,queue);\n+ this.context = container.createRemoteSharedObjectContext(this,queue);\n }\n }\n ", "raw_url": "https://github.com/eclipse/ecf/raw/0d00787f0d8de19464aaac7bc951d9817fd7c518/framework%2Fbundles%2Forg.eclipse.ecf.provider%2Fsrc%2Forg%2Feclipse%2Fecf%2Fprovider%2Fgeneric%2FSOConfig.java", "sha": "e82092179a73594d8c0f7389b5004c3f709ff1b9", "status": "modified" }, { "additions": 18, "blob_url": "https://github.com/eclipse/ecf/blob/0d00787f0d8de19464aaac7bc951d9817fd7c518/framework%2Fbundles%2Forg.eclipse.ecf.provider%2Fsrc%2Forg%2Feclipse%2Fecf%2Fprovider%2Fgeneric%2FSOContainer.java", "changes": 36, "contents_url": "https://api.github.com/repos/eclipse/ecf/contents/framework%2Fbundles%2Forg.eclipse.ecf.provider%2Fsrc%2Forg%2Feclipse%2Fecf%2Fprovider%2Fgeneric%2FSOContainer.java?ref=0d00787f0d8de19464aaac7bc951d9817fd7c518", "deletions": 18, "filename": "framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOContainer.java", "new_code": "\t\t\t\t\t\tSOWrapper wrap = createRemoteSharedObjectWrapper(fromID,\n\t\tloadingThreadGroup = createLoadingThreadGroup();\n\t\treturn addSharedObjectWrapper(createSharedObjectWrapper(sd, s));\n\tprotected ThreadGroup createLoadingThreadGroup() {\n\tprotected SOConfig createSharedObjectConfig(SharedObjectDescription sd,\n\tprotected SOConfig createRemoteSharedObjectConfig(ID fromID,\n\tprotected SOContext createSharedObjectContext(SOConfig soconfig,\n\tprotected SOContext createRemoteSharedObjectContext(SOConfig soconfig,\n\tprotected SOWrapper createSharedObjectWrapper(SharedObjectDescription sd,\n\t\tSOConfig newConfig = createSharedObjectConfig(sd, s);\n\tprotected SOWrapper createRemoteSharedObjectWrapper(ID fromID,\n\t\tSOConfig newConfig = createRemoteSharedObjectConfig(fromID, sd, s);\n\t\t\t\t\t\t.createViewChangeMessage(getID(), null,\n\t\tsendMessage(ContainerMessage.createSharedObjectCreateResponseMessage(\n\t\t\t\tsendMessage(ContainerMessage.createSharedObjectCreateMessage(\n\t\t\t\tsendMessage(ContainerMessage.createSharedObjectCreateMessage(\n\t\tsendMessage(ContainerMessage.createSharedObjectDisposeMessage(getID(),\n\t\tsendMessage(ContainerMessage.createSharedObjectMessage(getID(),", "new_methods": [], "old_code": "\t\t\t\t\t\tSOWrapper wrap = makeRemoteSharedObjectWrapper(fromID,\n\t\tloadingThreadGroup = makeLoadingThreadGroup();\n\t\treturn addSharedObjectWrapper(makeSharedObjectWrapper(sd, s));\n\tprotected ThreadGroup makeLoadingThreadGroup() {\n\tprotected SOConfig makeSharedObjectConfig(SharedObjectDescription sd,\n\tprotected SOConfig makeRemoteSharedObjectConfig(ID fromID,\n\tprotected SOContext makeSharedObjectContext(SOConfig soconfig,\n\tprotected SOContext makeRemoteSharedObjectContext(SOConfig soconfig,\n\tprotected SOWrapper makeSharedObjectWrapper(SharedObjectDescription sd,\n\t\tSOConfig newConfig = makeSharedObjectConfig(sd, s);\n\tprotected SOWrapper makeRemoteSharedObjectWrapper(ID fromID,\n\t\tSOConfig newConfig = makeRemoteSharedObjectConfig(fromID, sd, s);\n\t\t\t\t\t\t.makeViewChangeMessage(getID(), null,\n\t\tsendMessage(ContainerMessage.makeSharedObjectCreateResponseMessage(\n\t\t\t\tsendMessage(ContainerMessage.makeSharedObjectCreateMessage(\n\t\t\t\tsendMessage(ContainerMessage.makeSharedObjectCreateMessage(\n\t\tsendMessage(ContainerMessage.makeSharedObjectDisposeMessage(getID(),\n\t\tsendMessage(ContainerMessage.makeSharedObjectMessage(getID(),", "old_methods": [], "patch": "@@ -105,7 +105,7 @@ public void run() {\n \t\t\t\t\t\tISharedObject obj = load(description);\n \t\t\t\t\t\t// Create wrapper object and move from loading to active\n \t\t\t\t\t\t// list.\n-\t\t\t\t\t\tSOWrapper wrap = makeRemoteSharedObjectWrapper(fromID,\n+\t\t\t\t\t\tSOWrapper wrap = createRemoteSharedObjectWrapper(fromID,\n \t\t\t\t\t\t\t\tdescription, obj);\n \t\t\t\t\t\twrap.init();\n \t\t\t\t\t\t// Check to make sure thread has not been\n@@ -238,7 +238,7 @@ public SOContainer(ISharedObjectContainerConfig config) {\n \t\tthis.config = config;\n \t\tgroupManager = new SOContainerGMM(this, new Member(config.getID()));\n \t\tsharedObjectManager = new SOManager(this);\n-\t\tloadingThreadGroup = makeLoadingThreadGroup();\n+\t\tloadingThreadGroup = createLoadingThreadGroup();\n \t\tsharedObjectThreadGroup = getSharedObjectThreadGroup();\n \t\tlisteners = new Vector();\n \t\treceiver = new MessageReceiver();\n@@ -266,7 +266,7 @@ protected boolean addNewRemoteMember(ID memberID, Object data) {\n \t}\n \tprotected ISharedObjectContainerTransaction addSharedObject0(\n \t\t\tSharedObjectDescription sd, ISharedObject s) throws Exception {\n-\t\treturn addSharedObjectWrapper(makeSharedObjectWrapper(sd, s));\n+\t\treturn addSharedObjectWrapper(createSharedObjectWrapper(sd, s));\n \t}\n \tprotected void addSharedObjectAndWait(SharedObjectDescription sd,\n \t\t\tISharedObject s) throws Exception {\n@@ -764,41 +764,41 @@ protected void log(String msg) {\n \tprotected void logException(String msg, Throwable e) {\n \t\tdumpStack(msg, e);\n \t}\n-\tprotected ThreadGroup makeLoadingThreadGroup() {\n+\tprotected ThreadGroup createLoadingThreadGroup() {\n \t\treturn new ThreadGroup(getID() + \":load\");\n \t}\n-\tprotected SOConfig makeSharedObjectConfig(SharedObjectDescription sd,\n+\tprotected SOConfig createSharedObjectConfig(SharedObjectDescription sd,\n \t\t\tISharedObject obj) {\n \t\tID homeID = sd.getHomeID();\n \t\tif (homeID == null)\n \t\t\thomeID = getID();\n \t\treturn new SOConfig(sd.getID(), homeID, this, sd.getProperties());\n \t}\n-\tprotected SOConfig makeRemoteSharedObjectConfig(ID fromID,\n+\tprotected SOConfig createRemoteSharedObjectConfig(ID fromID,\n \t\t\tSharedObjectDescription sd, ISharedObject obj) {\n \t\tID homeID = sd.getHomeID();\n \t\tif (homeID == null)\n \t\t\thomeID = fromID;\n \t\treturn new SOConfig(sd.getID(), homeID, this, sd.getProperties());\n \t}\n-\tprotected SOContext makeSharedObjectContext(SOConfig soconfig,\n+\tprotected SOContext createSharedObjectContext(SOConfig soconfig,\n \t\t\tIQueueEnqueue queue) {\n \t\treturn new SOContext(soconfig.getSharedObjectID(), soconfig\n \t\t\t\t.getHomeContainerID(), this, soconfig.getProperties(), queue);\n \t}\n-\tprotected SOContext makeRemoteSharedObjectContext(SOConfig soconfig,\n+\tprotected SOContext createRemoteSharedObjectContext(SOConfig soconfig,\n \t\t\tIQueueEnqueue queue) {\n \t\treturn new SOContext(soconfig.getSharedObjectID(), soconfig\n \t\t\t\t.getHomeContainerID(), this, soconfig.getProperties(), queue);\n \t}\n-\tprotected SOWrapper makeSharedObjectWrapper(SharedObjectDescription sd,\n+\tprotected SOWrapper createSharedObjectWrapper(SharedObjectDescription sd,\n \t\t\tISharedObject s) {\n-\t\tSOConfig newConfig = makeSharedObjectConfig(sd, s);\n+\t\tSOConfig newConfig = createSharedObjectConfig(sd, s);\n \t\treturn new SOWrapper(newConfig, s, this);\n \t}\n-\tprotected SOWrapper makeRemoteSharedObjectWrapper(ID fromID,\n+\tprotected SOWrapper createRemoteSharedObjectWrapper(ID fromID,\n \t\t\tSharedObjectDescription sd, ISharedObject s) {\n-\t\tSOConfig newConfig = makeRemoteSharedObjectConfig(fromID, sd, s);\n+\t\tSOConfig newConfig = createRemoteSharedObjectConfig(fromID, sd, s);\n \t\treturn new SOWrapper(newConfig, s, this);\n \t}\n \tprotected void memberLeave(ID target, IConnection conn) {\n@@ -807,7 +807,7 @@ protected void memberLeave(ID target, IConnection conn) {\n \t\tif (groupManager.removeMember(target)) {\n \t\t\ttry {\n \t\t\t\tforwardExcluding(getID(), target, ContainerMessage\n-\t\t\t\t\t\t.makeViewChangeMessage(getID(), null,\n+\t\t\t\t\t\t.createViewChangeMessage(getID(), null,\n \t\t\t\t\t\t\t\tgetNextSequenceNumber(), new ID[] { target },\n \t\t\t\t\t\t\t\tfalse, null));\n \t\t\t} catch (IOException e) {\n@@ -961,7 +961,7 @@ protected void sendCreateResponse(ID homeID, ID sharedObjectID,\n \t}\n \tprotected void sendCreateResponseSharedObjectMessage(ID toContainerID,\n \t\t\tID fromSharedObject, Throwable t, long ident) throws IOException {\n-\t\tsendMessage(ContainerMessage.makeSharedObjectCreateResponseMessage(\n+\t\tsendMessage(ContainerMessage.createSharedObjectCreateResponseMessage(\n \t\t\t\tgetID(), toContainerID, getNextSequenceNumber(),\n \t\t\t\tfromSharedObject, t, ident));\n \t}\n@@ -971,7 +971,7 @@ protected ID[] sendCreateSharedObjectMessage(ID toContainerID,\n \t\tif (toContainerID == null) {\n \t\t\tsynchronized (getGroupMembershipLock()) {\n \t\t\t\t// Send message to all\n-\t\t\t\tsendMessage(ContainerMessage.makeSharedObjectCreateMessage(\n+\t\t\t\tsendMessage(ContainerMessage.createSharedObjectCreateMessage(\n \t\t\t\t\t\tgetID(), toContainerID, getNextSequenceNumber(), sd));\n \t\t\t\treturnIDs = getOtherMemberIDs();\n \t\t\t}\n@@ -980,7 +980,7 @@ protected ID[] sendCreateSharedObjectMessage(ID toContainerID,\n \t\t\tif (getID().equals(toContainerID)) {\n \t\t\t\treturnIDs = new ID[0];\n \t\t\t} else {\n-\t\t\t\tsendMessage(ContainerMessage.makeSharedObjectCreateMessage(\n+\t\t\t\tsendMessage(ContainerMessage.createSharedObjectCreateMessage(\n \t\t\t\t\t\tgetID(), toContainerID, getNextSequenceNumber(), sd));\n \t\t\t\treturnIDs = new ID[1];\n \t\t\t\treturnIDs[0] = toContainerID;\n@@ -994,7 +994,7 @@ protected void sendDispose(ID toContainerID, ID sharedObjectID)\n \t}\n \tprotected void sendDisposeSharedObjectMessage(ID toContainerID,\n \t\t\tID fromSharedObject) throws IOException {\n-\t\tsendMessage(ContainerMessage.makeSharedObjectDisposeMessage(getID(),\n+\t\tsendMessage(ContainerMessage.createSharedObjectDisposeMessage(getID(),\n \t\t\t\ttoContainerID, getNextSequenceNumber(), fromSharedObject));\n \t}\n \tprotected void sendMessage(ContainerMessage data) throws IOException {\n@@ -1054,7 +1054,7 @@ protected void sendMessage(ID toContainerID, ID sharedObjectID,\n \t}\n \tprotected void sendSharedObjectMessage(ID toContainerID,\n \t\t\tID fromSharedObject, Serializable data) throws IOException {\n-\t\tsendMessage(ContainerMessage.makeSharedObjectMessage(getID(),\n+\t\tsendMessage(ContainerMessage.createSharedObjectMessage(getID(),\n \t\t\t\ttoContainerID, getNextSequenceNumber(), fromSharedObject, data));\n \t}\n \tprotected void setIsClosing() {", "raw_url": "https://github.com/eclipse/ecf/raw/0d00787f0d8de19464aaac7bc951d9817fd7c518/framework%2Fbundles%2Forg.eclipse.ecf.provider%2Fsrc%2Forg%2Feclipse%2Fecf%2Fprovider%2Fgeneric%2FSOContainer.java", "sha": "a403261c6bf1859a81b42e19820922ed2594e7f6", "status": "modified" }, { "additions": 4, "blob_url": "https://github.com/eclipse/ecf/blob/0d00787f0d8de19464aaac7bc951d9817fd7c518/framework%2Fbundles%2Forg.eclipse.ecf.provider%2Fsrc%2Forg%2Feclipse%2Fecf%2Fprovider%2Fgeneric%2FSOManager.java", "changes": 8, "contents_url": "https://api.github.com/repos/eclipse/ecf/contents/framework%2Fbundles%2Forg.eclipse.ecf.provider%2Fsrc%2Forg%2Feclipse%2Fecf%2Fprovider%2Fgeneric%2FSOManager.java?ref=0d00787f0d8de19464aaac7bc951d9817fd7c518", "deletions": 4, "filename": "framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOManager.java", "new_code": "\tprotected ISharedObject createSharedObjectInstance(final Class newClass,\n\t\treturn createSharedObjectInstance(newClass, argTypes, args);\n\t\t\t// Get from to create sure it's there\n\t\t\t// OK now we've got ids and wrappers, create a connector", "new_methods": [], "old_code": "\tprotected ISharedObject makeSharedObjectInstance(final Class newClass,\n\t\treturn makeSharedObjectInstance(newClass, argTypes, args);\n\t\t\t// Get from to make sure it's there\n\t\t\t// OK now we've got ids and wrappers, make a connector", "old_methods": [], "patch": "@@ -88,7 +88,7 @@ protected Class[] getArgTypes(String[] argTypes, Object[] args,\n \t\treturn AbstractFactory.getClassesForTypes(argTypes, args, cl);\n \t}\n \n-\tprotected ISharedObject makeSharedObjectInstance(final Class newClass,\n+\tprotected ISharedObject createSharedObjectInstance(final Class newClass,\n \t\t\tfinal Class[] argTypes, final Object[] args) throws Exception {\n \t\tObject newObject = null;\n \t\ttry {\n@@ -126,7 +126,7 @@ protected ISharedObject loadSharedObject(SharedObjectDescription sd)\n \t\tClass[] argTypes = getArgTypes(types, args, cl);\n \t\t// Now load top-level class\n \t\tfinal Class newClass = Class.forName(sd.getClassname(), true, cl);\n-\t\treturn makeSharedObjectInstance(newClass, argTypes, args);\n+\t\treturn createSharedObjectInstance(newClass, argTypes, args);\n \t}\n \n \t/*\n@@ -255,7 +255,7 @@ public ISharedObjectConnector connectSharedObjects(ID sharedObjectFrom,\n \t\t\tthrow new SharedObjectConnectException(\"receivers cannot be null\");\n \t\tISharedObjectConnector result = null;\n \t\tsynchronized (container.getGroupMembershipLock()) {\n-\t\t\t// Get from to make sure it's there\n+\t\t\t// Get from to create sure it's there\n \t\t\tSOWrapper wrap = container.getSharedObjectWrapper(sharedObjectFrom);\n \t\t\tif (wrap == null)\n \t\t\t\tthrow new SharedObjectConnectException(\"sender object \"\n@@ -269,7 +269,7 @@ public ISharedObjectConnector connectSharedObjects(ID sharedObjectFrom,\n \t\t\t\t\t\t\t+ sharedObjectsTo[i].getName() + \" not found\");\n \t\t\t\tqueues[i] = new QueueEnqueueImpl(w.getQueue());\n \t\t\t}\n-\t\t\t// OK now we've got ids and wrappers, make a connector\n+\t\t\t// OK now we've got ids and wrappers, create a connector\n \t\t\tresult = new SOConnector(sharedObjectFrom, sharedObjectsTo, queues);\n \t\t}\n \t\treturn result;", "raw_url": "https://github.com/eclipse/ecf/raw/0d00787f0d8de19464aaac7bc951d9817fd7c518/framework%2Fbundles%2Forg.eclipse.ecf.provider%2Fsrc%2Forg%2Feclipse%2Fecf%2Fprovider%2Fgeneric%2FSOManager.java", "sha": "d96e994ea86f429328cbd28acb38436ef606126f", "status": "modified" }, { "additions": 3, "blob_url": "https://github.com/eclipse/ecf/blob/0d00787f0d8de19464aaac7bc951d9817fd7c518/framework%2Fbundles%2Forg.eclipse.ecf.provider%2Fsrc%2Forg%2Feclipse%2Fecf%2Fprovider%2Fgeneric%2FServerSOContainer.java", "changes": 6, "contents_url": "https://api.github.com/repos/eclipse/ecf/contents/framework%2Fbundles%2Forg.eclipse.ecf.provider%2Fsrc%2Forg%2Feclipse%2Fecf%2Fprovider%2Fgeneric%2FServerSOContainer.java?ref=0d00787f0d8de19464aaac7bc951d9817fd7c518", "deletions": 3, "filename": "framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/ServerSOContainer.java", "new_code": " .createViewChangeMessage(getID(), remoteID,\n return ContainerMessage.createViewChangeMessage(getID(), remoteID,\n .createLeaveGroupMessage(getID(), memberID,", "new_methods": [], "old_code": " .makeViewChangeMessage(getID(), remoteID,\n return ContainerMessage.makeViewChangeMessage(getID(), remoteID,\n .makeLeaveGroupMessage(getID(), memberID,", "old_methods": [], "patch": "@@ -141,7 +141,7 @@ protected ContainerMessage acceptNewClient(Socket socket, String target,\n // Notify existing remotes about new member\n try {\n forwardExcluding(getID(), remoteID, ContainerMessage\n- .makeViewChangeMessage(getID(), remoteID,\n+ .createViewChangeMessage(getID(), remoteID,\n getNextSequenceNumber(),\n new ID[] { remoteID }, true, null));\n } catch (IOException e) {\n@@ -160,7 +160,7 @@ protected ContainerMessage acceptNewClient(Socket socket, String target,\n // notify listeners\n fireContainerEvent(new ContainerConnectedEvent(this.getID(),remoteID));\n \n- return ContainerMessage.makeViewChangeMessage(getID(), remoteID,\n+ return ContainerMessage.createViewChangeMessage(getID(), remoteID,\n getNextSequenceNumber(), memberIDs, true, null);\n } catch (Exception e) {\n logException(\"Exception in acceptNewClient(\" + socket + \",\"\n@@ -198,7 +198,7 @@ public void ejectGroupMember(ID memberID, Serializable reason) {\n return;\n try {\n conn.sendSynch(memberID, serializeObject(ContainerMessage\n- .makeLeaveGroupMessage(getID(), memberID,\n+ .createLeaveGroupMessage(getID(), memberID,\n getNextSequenceNumber(), reason)));\n } catch (Exception e) {\n logException(\"Exception in ejectGroupMember.sendAsynch()\",e);", "raw_url": "https://github.com/eclipse/ecf/raw/0d00787f0d8de19464aaac7bc951d9817fd7c518/framework%2Fbundles%2Forg.eclipse.ecf.provider%2Fsrc%2Forg%2Feclipse%2Fecf%2Fprovider%2Fgeneric%2FServerSOContainer.java", "sha": "813bce7e2c7e3d27226ffe44647c7dd22bc5e0e1", "status": "modified" }, { "additions": 4, "blob_url": "https://github.com/eclipse/ecf/blob/0d00787f0d8de19464aaac7bc951d9817fd7c518/framework%2Fbundles%2Forg.eclipse.ecf.provider%2Fsrc%2Forg%2Feclipse%2Fecf%2Fprovider%2Fgeneric%2FTCPClientSOContainer.java", "changes": 8, "contents_url": "https://api.github.com/repos/eclipse/ecf/contents/framework%2Fbundles%2Forg.eclipse.ecf.provider%2Fsrc%2Forg%2Feclipse%2Fecf%2Fprovider%2Fgeneric%2FTCPClientSOContainer.java?ref=0d00787f0d8de19464aaac7bc951d9817fd7c518", "deletions": 4, "filename": "framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/TCPClientSOContainer.java", "new_code": " protected ISynchAsynchConnection createConnection(ID remoteSpace,\n conn = ConnectionFactory.createSynchAsynchConnection(receiver,\n .getDefault().createGUID());\n ID serverID = IDFactory.getDefault().createStringID(TCPServerSOContainer", "new_methods": [], "old_code": " protected ISynchAsynchConnection makeConnection(ID remoteSpace,\n conn = ConnectionFactory.makeSynchAsynchConnection(receiver,\n .getDefault().makeGUID());\n ID serverID = IDFactory.getDefault().makeStringID(TCPServerSOContainer", "old_methods": [], "patch": "@@ -32,22 +32,22 @@ public TCPClientSOContainer(ISharedObjectContainerConfig config, int ka) {\n keepAlive = ka;\n }\n \n- protected ISynchAsynchConnection makeConnection(ID remoteSpace,\n+ protected ISynchAsynchConnection createConnection(ID remoteSpace,\n Object data) throws ConnectionInstantiationException {\n debug(\"getClientConnection:\" + remoteSpace + \":\" + data);\n Object[] args = { new Integer(keepAlive) };\n ISynchAsynchConnection conn = null;\n- conn = ConnectionFactory.makeSynchAsynchConnection(receiver,\n+ conn = ConnectionFactory.createSynchAsynchConnection(receiver,\n DEFAULT_COMM_NAME, args);\n return conn;\n }\n \n public static final void main(String[] args) throws Exception {\n ISharedObjectContainerConfig config = new SOContainerConfig(IDFactory\n- .getDefault().makeGUID());\n+ .getDefault().createGUID());\n TCPClientSOContainer container = new TCPClientSOContainer(config);\n // now join group\n- ID serverID = IDFactory.getDefault().makeStringID(TCPServerSOContainer\n+ ID serverID = IDFactory.getDefault().createStringID(TCPServerSOContainer\n .getDefaultServerURL());\n container.connect(serverID, null);\n Thread.sleep(200000);", "raw_url": "https://github.com/eclipse/ecf/raw/0d00787f0d8de19464aaac7bc951d9817fd7c518/framework%2Fbundles%2Forg.eclipse.ecf.provider%2Fsrc%2Forg%2Feclipse%2Fecf%2Fprovider%2Fgeneric%2FTCPClientSOContainer.java", "sha": "900e6cdbf79ad9a059ed54038c14f632a7d109cd", "status": "modified" }, { "additions": 4, "blob_url": "https://github.com/eclipse/ecf/blob/0d00787f0d8de19464aaac7bc951d9817fd7c518/framework%2Fbundles%2Forg.eclipse.ecf.ui%2Fsrc%2Forg%2Feclipse%2Fecf%2Fui%2Fviews%2FRosterView.java", "changes": 8, "contents_url": "https://api.github.com/repos/eclipse/ecf/contents/framework%2Fbundles%2Forg.eclipse.ecf.ui%2Fsrc%2Forg%2Feclipse%2Fecf%2Fui%2Fviews%2FRosterView.java?ref=0d00787f0d8de19464aaac7bc951d9817fd7c518", "deletions": 4, "filename": "framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/views/RosterView.java", "new_code": "\t\t\t\t\ttarget = IDFactory.getDefault().createStringID(strres);\n\t\t\tchatRoom = selectedManager.createChatRoomContainer();\n\t\t\t\twindow = createChatWindowForTarget(targetID);\n\tprotected ChatWindow createChatWindowForTarget(ID targetID) {", "new_methods": [], "old_code": "\t\t\t\t\ttarget = IDFactory.getDefault().makeStringID(strres);\n\t\t\tchatRoom = selectedManager.makeChatRoomContainer();\n\t\t\t\twindow = makeChatWindowForTarget(targetID);\n\tprotected ChatWindow makeChatWindowForTarget(ID targetID) {", "old_methods": [], "patch": "@@ -877,7 +877,7 @@ protected ID inputIMTarget() {\n \t\t\tif (strres != null && !strres.equals(\"\")) {\n \t\t\t\tID target = null;\n \t\t\t\ttry {\n-\t\t\t\t\ttarget = IDFactory.getDefault().makeStringID(strres);\n+\t\t\t\t\ttarget = IDFactory.getDefault().createStringID(strres);\n \t\t\t\t} catch (Exception e) {\n \t\t\t\t\tMessageDialog.openError(getSite().getShell(), \"Error\",\n \t\t\t\t\t\t\t\"Error in IM target\");\n@@ -1008,7 +1008,7 @@ protected void showChatRooms(IChatRoomManager [] managers) {\n \t\t// now, create chat room instance\n \t\tIChatRoomContainer chatRoom = null;\n \t\ttry {\n-\t\t\tchatRoom = selectedManager.makeChatRoomContainer();\n+\t\t\tchatRoom = selectedManager.createChatRoomContainer();\n \t\t} catch (ContainerInstantiationException e1) {\n \t\t\tMessageDialog.openError(RosterView.this.getViewSite()\n \t\t\t\t\t.getShell(), \"Could not create chat room\",\n@@ -1164,7 +1164,7 @@ protected ChatWindow openChatWindowForTarget(ID targetID) {\n \t\tsynchronized (chatThreads) {\n \t\t\twindow = (ChatWindow) chatThreads.get(targetID);\n \t\t\tif (window == null) {\n-\t\t\t\twindow = makeChatWindowForTarget(targetID);\n+\t\t\t\twindow = createChatWindowForTarget(targetID);\n \t\t\t\tif (window != null)\n \t\t\t\t\twindow.open();\n \t\t\t} else {\n@@ -1177,7 +1177,7 @@ protected ChatWindow openChatWindowForTarget(ID targetID) {\n \t\t}\n \t\treturn window;\n \t}\n-\tprotected ChatWindow makeChatWindowForTarget(ID targetID) {\n+\tprotected ChatWindow createChatWindowForTarget(ID targetID) {\n \t\tUserAccount account = getAccountForUser(targetID);\n \t\tif (account == null)\n \t\t\treturn null;", "raw_url": "https://github.com/eclipse/ecf/raw/0d00787f0d8de19464aaac7bc951d9817fd7c518/framework%2Fbundles%2Forg.eclipse.ecf.ui%2Fsrc%2Forg%2Feclipse%2Fecf%2Fui%2Fviews%2FRosterView.java", "sha": "5a1b6a1f9b2d44594bea28dd0408280c81fc1a77", "status": "modified" }, { "additions": 2, "blob_url": "https://github.com/eclipse/ecf/blob/0d00787f0d8de19464aaac7bc951d9817fd7c518/framework%2Fbundles%2Forg.eclipse.ecf.ui%2Fsrc%2Forg%2Feclipse%2Fecf%2Fui%2Fviews%2FTextChatComposite.java", "changes": 4, "contents_url": "https://api.github.com/repos/eclipse/ecf/contents/framework%2Fbundles%2Forg.eclipse.ecf.ui%2Fsrc%2Forg%2Feclipse%2Fecf%2Fui%2Fviews%2FTextChatComposite.java?ref=0d00787f0d8de19464aaac7bc951d9817fd7c518", "deletions": 2, "filename": "framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/views/TextChatComposite.java", "new_code": " private String createLineWithTimestamp(String line) {\n sb.append(createLineWithTimestamp(text.getOriginator().getName() + \": \"));", "new_methods": [], "old_code": " private String makeLineWithTimestamp(String line) {\n sb.append(makeLineWithTimestamp(text.getOriginator().getName() + \": \"));", "old_methods": [], "patch": "@@ -288,7 +288,7 @@ protected String getCurrentDateTime() {\n sb.append(df.format(new Date())).append(\") \");\n return sb.toString();\n }\n- private String makeLineWithTimestamp(String line) {\n+ private String createLineWithTimestamp(String line) {\n if (showTimestamp) {\n return getCurrentDateTime() + line;\n }\n@@ -308,7 +308,7 @@ public void appendText(ChatLine text) {\n StringBuffer sb = new StringBuffer();\n \n if (text.getOriginator() != null) {\n- sb.append(makeLineWithTimestamp(text.getOriginator().getName() + \": \"));\n+ sb.append(createLineWithTimestamp(text.getOriginator().getName() + \": \"));\n StyleRange sr = new StyleRange();\n sr.start = startRange;\n sr.length = sb.length();", "raw_url": "https://github.com/eclipse/ecf/raw/0d00787f0d8de19464aaac7bc951d9817fd7c518/framework%2Fbundles%2Forg.eclipse.ecf.ui%2Fsrc%2Forg%2Feclipse%2Fecf%2Fui%2Fviews%2FTextChatComposite.java", "sha": "90ee9e7823315c1712fd69cc702b3cd8ecd4bcb4", "status": "modified" }, { "additions": 16, "blob_url": "https://github.com/eclipse/ecf/blob/0d00787f0d8de19464aaac7bc951d9817fd7c518/framework%2Fbundles%2Forg.eclipse.ecf%2Fsrc%2Forg%2Feclipse%2Fecf%2Fcore%2FContainerFactory.java", "changes": 32, "contents_url": "https://api.github.com/repos/eclipse/ecf/contents/framework%2Fbundles%2Forg.eclipse.ecf%2Fsrc%2Forg%2Feclipse%2Fecf%2Fcore%2FContainerFactory.java?ref=0d00787f0d8de19464aaac7bc951d9817fd7c518", "deletions": 16, "filename": "framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/ContainerFactory.java", "new_code": " * \t\t\tContainerFactory.getDefault().createContainer('standalone');\n\t * @see org.eclipse.ecf.core.IContainerFactory#createContainer(org.eclipse.ecf.core.ContainerDescription,\n\tpublic IContainer createContainer(ContainerDescription desc,\n\t\ttrace(\"createContainer(\" + desc + \",\"\n\t\t\t\t\t\"createContainer exception with description: \" + desc + \": \"\n\t\t\tdumpStack(\"Exception in createContainer\", newexcept);\n\t\treturn (IContainer) instantiator.createInstance(desc, clazzes, args);\n\t * @see org.eclipse.ecf.core.IContainerFactory#createContainer(java.lang.String)\n\tpublic IContainer createContainer(String descriptionName)\n\t\treturn createContainer(getDescriptionByName(descriptionName), null, null);\n\t * @see org.eclipse.ecf.core.IContainerFactory#createContainer(java.lang.String,\n\tpublic IContainer createContainer(String descriptionName, Object[] args)\n\t\treturn createContainer(getDescriptionByName(descriptionName), null, args);\n\t * @see org.eclipse.ecf.core.IContainerFactory#createContainer(java.lang.String,\n\tpublic IContainer createContainer(String descriptionName, String[] argsTypes,\n\t\treturn createContainer(getDescriptionByName(descriptionName), argsTypes,", "new_methods": [], "old_code": " * \t\t\tContainerFactory.getDefault().makeContainer('standalone');\n\t * @see org.eclipse.ecf.core.IContainerFactory#makeContainer(org.eclipse.ecf.core.ContainerDescription,\n\tpublic IContainer makeContainer(ContainerDescription desc,\n\t\ttrace(\"makeContainer(\" + desc + \",\"\n\t\t\t\t\t\"makeContainer exception with description: \" + desc + \": \"\n\t\t\tdumpStack(\"Exception in makeContainer\", newexcept);\n\t\treturn (IContainer) instantiator.makeInstance(desc, clazzes, args);\n\t * @see org.eclipse.ecf.core.IContainerFactory#makeContainer(java.lang.String)\n\tpublic IContainer makeContainer(String descriptionName)\n\t\treturn makeContainer(getDescriptionByName(descriptionName), null, null);\n\t * @see org.eclipse.ecf.core.IContainerFactory#makeContainer(java.lang.String,\n\tpublic IContainer makeContainer(String descriptionName, Object[] args)\n\t\treturn makeContainer(getDescriptionByName(descriptionName), null, args);\n\t * @see org.eclipse.ecf.core.IContainerFactory#makeContainer(java.lang.String,\n\tpublic IContainer makeContainer(String descriptionName, String[] argsTypes,\n\t\treturn makeContainer(getDescriptionByName(descriptionName), argsTypes,", "old_methods": [], "patch": "@@ -24,7 +24,7 @@\n * <br>\n * <code>\n * \t IContainer container = <br>\n- * \t\t\tContainerFactory.getDefault().makeContainer('standalone');\n+ * \t\t\tContainerFactory.getDefault().createContainer('standalone');\n * <br><br>\n * ...further use of container variable here...\n * </code>\n@@ -132,13 +132,13 @@ public ContainerDescription getDescriptionByName(String name)\n \t/*\n \t * (non-Javadoc)\n \t * \n-\t * @see org.eclipse.ecf.core.IContainerFactory#makeContainer(org.eclipse.ecf.core.ContainerDescription,\n+\t * @see org.eclipse.ecf.core.IContainerFactory#createContainer(org.eclipse.ecf.core.ContainerDescription,\n \t * java.lang.String[], java.lang.Object[])\n \t */\n-\tpublic IContainer makeContainer(ContainerDescription desc,\n+\tpublic IContainer createContainer(ContainerDescription desc,\n \t\t\tString[] argTypes, Object[] args)\n \t\t\tthrows ContainerInstantiationException {\n-\t\ttrace(\"makeContainer(\" + desc + \",\"\n+\t\ttrace(\"createContainer(\" + desc + \",\"\n \t\t\t\t+ Trace.convertStringAToString(argTypes) + \",\"\n \t\t\t\t+ Trace.convertObjectAToString(args) + \")\");\n \t\tif (desc == null)\n@@ -157,50 +157,50 @@ public IContainer makeContainer(ContainerDescription desc,\n \t\t\t\t\t.getClassLoader());\n \t\t} catch (Exception e) {\n \t\t\tContainerInstantiationException newexcept = new ContainerInstantiationException(\n-\t\t\t\t\t\"makeContainer exception with description: \" + desc + \": \"\n+\t\t\t\t\t\"createContainer exception with description: \" + desc + \": \"\n \t\t\t\t\t\t\t+ e.getClass().getName() + \": \" + e.getMessage());\n \t\t\tnewexcept.setStackTrace(e.getStackTrace());\n-\t\t\tdumpStack(\"Exception in makeContainer\", newexcept);\n+\t\t\tdumpStack(\"Exception in createContainer\", newexcept);\n \t\t\tthrow newexcept;\n \t\t}\n \t\tif (instantiator == null)\n \t\t\tthrow new ContainerInstantiationException(\n \t\t\t\t\t\"Instantiator for ContainerDescription \" + cd.getName()\n \t\t\t\t\t\t\t+ \" is null\");\n \t\t// Ask instantiator to actually create instance\n-\t\treturn (IContainer) instantiator.makeInstance(desc, clazzes, args);\n+\t\treturn (IContainer) instantiator.createInstance(desc, clazzes, args);\n \t}\n \n \t/*\n \t * (non-Javadoc)\n \t * \n-\t * @see org.eclipse.ecf.core.IContainerFactory#makeContainer(java.lang.String)\n+\t * @see org.eclipse.ecf.core.IContainerFactory#createContainer(java.lang.String)\n \t */\n-\tpublic IContainer makeContainer(String descriptionName)\n+\tpublic IContainer createContainer(String descriptionName)\n \t\t\tthrows ContainerInstantiationException {\n-\t\treturn makeContainer(getDescriptionByName(descriptionName), null, null);\n+\t\treturn createContainer(getDescriptionByName(descriptionName), null, null);\n \t}\n \n \t/*\n \t * (non-Javadoc)\n \t * \n-\t * @see org.eclipse.ecf.core.IContainerFactory#makeContainer(java.lang.String,\n+\t * @see org.eclipse.ecf.core.IContainerFactory#createContainer(java.lang.String,\n \t * java.lang.Object[])\n \t */\n-\tpublic IContainer makeContainer(String descriptionName, Object[] args)\n+\tpublic IContainer createContainer(String descriptionName, Object[] args)\n \t\t\tthrows ContainerInstantiationException {\n-\t\treturn makeContainer(getDescriptionByName(descriptionName), null, args);\n+\t\treturn createContainer(getDescriptionByName(descriptionName), null, args);\n \t}\n \n \t/*\n \t * (non-Javadoc)\n \t * \n-\t * @see org.eclipse.ecf.core.IContainerFactory#makeContainer(java.lang.String,\n+\t * @see org.eclipse.ecf.core.IContainerFactory#createContainer(java.lang.String,\n \t * java.lang.String[], java.lang.Object[])\n \t */\n-\tpublic IContainer makeContainer(String descriptionName, String[] argsTypes,\n+\tpublic IContainer createContainer(String descriptionName, String[] argsTypes,\n \t\t\tObject[] args) throws ContainerInstantiationException {\n-\t\treturn makeContainer(getDescriptionByName(descriptionName), argsTypes,\n+\t\treturn createContainer(getDescriptionByName(descriptionName), argsTypes,\n \t\t\t\targs);\n \t}\n ", "raw_url": "https://github.com/eclipse/ecf/raw/0d00787f0d8de19464aaac7bc951d9817fd7c518/framework%2Fbundles%2Forg.eclipse.ecf%2Fsrc%2Forg%2Feclipse%2Fecf%2Fcore%2FContainerFactory.java", "sha": "05c9f2966689195a3bc09e8ed6cd50be537b443a", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/eclipse/ecf/blob/0d00787f0d8de19464aaac7bc951d9817fd7c518/framework%2Fbundles%2Forg.eclipse.ecf%2Fsrc%2Forg%2Feclipse%2Fecf%2Fcore%2FIContainer.java", "changes": 2, "contents_url": "https://api.github.com/repos/eclipse/ecf/contents/framework%2Fbundles%2Forg.eclipse.ecf%2Fsrc%2Forg%2Feclipse%2Fecf%2Fcore%2FIContainer.java?ref=0d00787f0d8de19464aaac7bc951d9817fd7c518", "deletions": 1, "filename": "framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/IContainer.java", "new_code": "\t * IContainer newContainer = ContainerFactory.createContainer(type);", "new_methods": [], "old_code": "\t * IContainer newContainer = ContainerFactory.makeContainer(type);", "old_methods": [], "patch": "@@ -71,7 +71,7 @@ public void connect(ID targetID, IConnectContext connectContext)\n \t * </p>\n \t * \n \t * <pre>\n-\t * IContainer newContainer = ContainerFactory.makeContainer(type);\n+\t * IContainer newContainer = ContainerFactory.createContainer(type);\n \t * ISharedObjectContainer soContainer = (ISharedObjectContainer) newContainer\n \t * \t\t.getAdapter(ISharedObjectContainer.class);\n \t * if (soContainer == null)", "raw_url": "https://github.com/eclipse/ecf/raw/0d00787f0d8de19464aaac7bc951d9817fd7c518/framework%2Fbundles%2Forg.eclipse.ecf%2Fsrc%2Forg%2Feclipse%2Fecf%2Fcore%2FIContainer.java", "sha": "6a623e92ca33b2ea08171f80f7941ccd02fe3fdb", "status": "modified" }, { "additions": 11, "blob_url": "https://github.com/eclipse/ecf/blob/0d00787f0d8de19464aaac7bc951d9817fd7c518/framework%2Fbundles%2Forg.eclipse.ecf%2Fsrc%2Forg%2Feclipse%2Fecf%2Fcore%2FIContainerFactory.java", "changes": 22, "contents_url": "https://api.github.com/repos/eclipse/ecf/contents/framework%2Fbundles%2Forg.eclipse.ecf%2Fsrc%2Forg%2Feclipse%2Fecf%2Fcore%2FIContainerFactory.java?ref=0d00787f0d8de19464aaac7bc951d9817fd7c518", "deletions": 11, "filename": "framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/IContainerFactory.java", "new_code": "\t * <li>Call the IContainerInstantiator.createInstance method to return an\n\t * an Object [] of arguments passed to the createInstance method of\n\tpublic IContainer createContainer(ContainerDescription desc,\n\t * <li>Call the IContainerInstantiator.createInstance method to return an\n\tpublic IContainer createContainer(String descriptionName)\n\t * <li>Call the IContainerInstantiator.createInstance method to return an\n\t * IContainerInstantiator.createInstance method\n\tpublic IContainer createContainer(String descriptionName, Object[] args)\n\t * <li>Call the IContainerInstantiator.createInstance method to return an\n\t * IContainerInstantiator.createInstance method\n\tpublic IContainer createContainer(String descriptionName, String[] argsTypes,", "new_methods": [], "old_code": "\t * <li>Call the IContainerInstantiator.makeInstance method to return an\n\t * an Object [] of arguments passed to the makeInstance method of\n\tpublic IContainer makeContainer(ContainerDescription desc,\n\t * <li>Call the IContainerInstantiator.makeInstance method to return an\n\tpublic IContainer makeContainer(String descriptionName)\n\t * <li>Call the IContainerInstantiator.makeInstance method to return an\n\t * IContainerInstantiator.makeInstance method\n\tpublic IContainer makeContainer(String descriptionName, Object[] args)\n\t * <li>Call the IContainerInstantiator.makeInstance method to return an\n\t * IContainerInstantiator.makeInstance method\n\tpublic IContainer makeContainer(String descriptionName, String[] argsTypes,", "old_methods": [], "patch": "@@ -53,7 +53,7 @@ public ContainerDescription getDescriptionByName(String name)\n \t * <li>lookup the known ContainerDescriptions to find one of matching name</li>\n \t * <li>if found, will retrieve or create an IContainerInstantiator for that\n \t * description</li>\n-\t * <li>Call the IContainerInstantiator.makeInstance method to return an\n+\t * <li>Call the IContainerInstantiator.createInstance method to return an\n \t * instance of IContainer</li>\n \t * </ul>\n \t * \n@@ -62,12 +62,12 @@ public ContainerDescription getDescriptionByName(String name)\n \t * @param argTypes\n \t * a String [] defining the types of the args parameter\n \t * @param args\n-\t * an Object [] of arguments passed to the makeInstance method of\n+\t * an Object [] of arguments passed to the createInstance method of\n \t * the IContainerInstantiator\n \t * @return a valid instance of IContainer\n \t * @throws ContainerInstantiationException\n \t */\n-\tpublic IContainer makeContainer(ContainerDescription desc,\n+\tpublic IContainer createContainer(ContainerDescription desc,\n \t\t\tString[] argTypes, Object[] args)\n \t\t\tthrows ContainerInstantiationException;\n \n@@ -79,7 +79,7 @@ public IContainer makeContainer(ContainerDescription desc,\n \t * <li>lookup the known ContainerDescriptions to find one of matching name</li>\n \t * <li>if found, will retrieve or create an IContainerInstantiator for that\n \t * description</li>\n-\t * <li>Call the IContainerInstantiator.makeInstance method to return an\n+\t * <li>Call the IContainerInstantiator.createInstance method to return an\n \t * instance of IContainer</li>\n \t * </ul>\n \t * \n@@ -88,7 +88,7 @@ public IContainer makeContainer(ContainerDescription desc,\n \t * @return a valid instance of IContainer\n \t * @throws ContainerInstantiationException\n \t */\n-\tpublic IContainer makeContainer(String descriptionName)\n+\tpublic IContainer createContainer(String descriptionName)\n \t\t\tthrows ContainerInstantiationException;\n \n \t/**\n@@ -99,19 +99,19 @@ public IContainer makeContainer(String descriptionName)\n \t * <li>lookup the known ContainerDescriptions to find one of matching name</li>\n \t * <li>if found, will retrieve or create an IContainerInstantiator for that\n \t * description</li>\n-\t * <li>Call the IContainerInstantiator.makeInstance method to return an\n+\t * <li>Call the IContainerInstantiator.createInstance method to return an\n \t * instance of IContainer</li>\n \t * </ul>\n \t * \n \t * @param descriptionName\n \t * the ContainerDescription name to lookup\n \t * @param args\n \t * the Object [] of arguments passed to the\n-\t * IContainerInstantiator.makeInstance method\n+\t * IContainerInstantiator.createInstance method\n \t * @return a valid instance of IContainer\n \t * @throws ContainerInstantiationException\n \t */\n-\tpublic IContainer makeContainer(String descriptionName, Object[] args)\n+\tpublic IContainer createContainer(String descriptionName, Object[] args)\n \t\t\tthrows ContainerInstantiationException;\n \n \t/**\n@@ -122,7 +122,7 @@ public IContainer makeContainer(String descriptionName, Object[] args)\n \t * <li>lookup the known ContainerDescriptions to find one of matching name</li>\n \t * <li>if found, will retrieve or create an IContainerInstantiator for that\n \t * description</li>\n-\t * <li>Call the IContainerInstantiator.makeInstance method to return an\n+\t * <li>Call the IContainerInstantiator.createInstance method to return an\n \t * instance of IContainer</li>\n \t * </ul>\n \t * \n@@ -132,11 +132,11 @@ public IContainer makeContainer(String descriptionName, Object[] args)\n \t * the String [] of argument types of the following args\n \t * @param args\n \t * the Object [] of arguments passed to the\n-\t * IContainerInstantiator.makeInstance method\n+\t * IContainerInstantiator.createInstance method\n \t * @return a valid instance of IContainer\n \t * @throws ContainerInstantiationException\n \t */\n-\tpublic IContainer makeContainer(String descriptionName, String[] argsTypes,\n+\tpublic IContainer createContainer(String descriptionName, String[] argsTypes,\n \t\t\tObject[] args) throws ContainerInstantiationException;\n \n \t/**", "raw_url": "https://github.com/eclipse/ecf/raw/0d00787f0d8de19464aaac7bc951d9817fd7c518/framework%2Fbundles%2Forg.eclipse.ecf%2Fsrc%2Forg%2Feclipse%2Fecf%2Fcore%2FIContainerFactory.java", "sha": "9867184bf2fa0b427c2e7c35546db5e834880f01", "status": "modified" }, { "additions": 7, "blob_url": "https://github.com/eclipse/ecf/blob/0d00787f0d8de19464aaac7bc951d9817fd7c518/framework%2Fbundles%2Forg.eclipse.ecf%2Fsrc%2Forg%2Feclipse%2Fecf%2Fcore%2FISharedObjectContainerFactory.java", "changes": 14, "contents_url": "https://api.github.com/repos/eclipse/ecf/contents/framework%2Fbundles%2Forg.eclipse.ecf%2Fsrc%2Forg%2Feclipse%2Fecf%2Fcore%2FISharedObjectContainerFactory.java?ref=0d00787f0d8de19464aaac7bc951d9817fd7c518", "deletions": 7, "filename": "framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/ISharedObjectContainerFactory.java", "new_code": "\t * an Object [] of arguments passed to the createInstance method of\n\tpublic ISharedObjectContainer createSharedObjectContainer(\n\tpublic ISharedObjectContainer createSharedObjectContainer(\n\t * IContainerInstantiator.createInstance method\n\tpublic ISharedObjectContainer createSharedObjectContainer(\n\t * IContainerInstantiator.createInstance method\n\tpublic ISharedObjectContainer createSharedObjectContainer(", "new_methods": [], "old_code": "\t * an Object [] of arguments passed to the makeInstance method of\n\tpublic ISharedObjectContainer makeSharedObjectContainer(\n\tpublic ISharedObjectContainer makeSharedObjectContainer(\n\t * IContainerInstantiator.makeInstance method\n\tpublic ISharedObjectContainer makeSharedObjectContainer(\n\t * IContainerInstantiator.makeInstance method\n\tpublic ISharedObjectContainer makeSharedObjectContainer(", "old_methods": [], "patch": "@@ -12,12 +12,12 @@ public interface ISharedObjectContainerFactory {\n \t * @param argTypes\n \t * a String [] defining the types of the args parameter\n \t * @param args\n-\t * an Object [] of arguments passed to the makeInstance method of\n+\t * an Object [] of arguments passed to the createInstance method of\n \t * the IContainerInstantiator\n \t * @return a valid instance of ISharedObjectContainer\n \t * @throws ContainerInstantiationException\n \t */\n-\tpublic ISharedObjectContainer makeSharedObjectContainer(\n+\tpublic ISharedObjectContainer createSharedObjectContainer(\n \t\t\tContainerDescription desc, String[] argTypes, Object[] args)\n \t\t\tthrows ContainerInstantiationException;\n \n@@ -29,7 +29,7 @@ public ISharedObjectContainer makeSharedObjectContainer(\n \t * @return a valid instance of ISharedObjectContainer\n \t * @throws ContainerInstantiationException\n \t */\n-\tpublic ISharedObjectContainer makeSharedObjectContainer(\n+\tpublic ISharedObjectContainer createSharedObjectContainer(\n \t\t\tString descriptionName) throws ContainerInstantiationException;\n \n \t/**\n@@ -39,11 +39,11 @@ public ISharedObjectContainer makeSharedObjectContainer(\n \t * the ContainerDescription name to lookup\n \t * @param args\n \t * the Object [] of arguments passed to the\n-\t * IContainerInstantiator.makeInstance method\n+\t * IContainerInstantiator.createInstance method\n \t * @return a valid instance of ISharedObjectContainer\n \t * @throws ContainerInstantiationException\n \t */\n-\tpublic ISharedObjectContainer makeSharedObjectContainer(\n+\tpublic ISharedObjectContainer createSharedObjectContainer(\n \t\t\tString descriptionName, Object[] args)\n \t\t\tthrows ContainerInstantiationException;\n \n@@ -56,11 +56,11 @@ public ISharedObjectContainer makeSharedObjectContainer(\n \t * the String [] of argument types of the following args\n \t * @param args\n \t * the Object [] of arguments passed to the\n-\t * IContainerInstantiator.makeInstance method\n+\t * IContainerInstantiator.createInstance method\n \t * @return a valid instance of ISharedObjectContainer\n \t * @throws ContainerInstantiationException\n \t */\n-\tpublic ISharedObjectContainer makeSharedObjectContainer(\n+\tpublic ISharedObjectContainer createSharedObjectContainer(\n \t\t\tString descriptionName, String[] argsTypes, Object[] args)\n \t\t\tthrows ContainerInstantiationException;\n }\n\\ No newline at end of file", "raw_url": "https://github.com/eclipse/ecf/raw/0d00787f0d8de19464aaac7bc951d9817fd7c518/framework%2Fbundles%2Forg.eclipse.ecf%2Fsrc%2Forg%2Feclipse%2Fecf%2Fcore%2FISharedObjectContainerFactory.java", "sha": "90c1ddac11afdb15ca5686d6f5f5face8dc4deee", "status": "modified" }, { "additions": 14, "blob_url": "https://github.com/eclipse/ecf/blob/0d00787f0d8de19464aaac7bc951d9817fd7c518/framework%2Fbundles%2Forg.eclipse.ecf%2Fsrc%2Forg%2Feclipse%2Fecf%2Fcore%2FSharedObjectContainerFactory.java", "changes": 28, "contents_url": "https://api.github.com/repos/eclipse/ecf/contents/framework%2Fbundles%2Forg.eclipse.ecf%2Fsrc%2Forg%2Feclipse%2Fecf%2Fcore%2FSharedObjectContainerFactory.java?ref=0d00787f0d8de19464aaac7bc951d9817fd7c518", "deletions": 14, "filename": "framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/SharedObjectContainerFactory.java", "new_code": " * \t\t\tSharedObjectContainerFactory.getDefault().createSharedObjectContainer('standalone');\n\t * @see org.eclipse.ecf.core.ISharedObjectContainerFactory#createSharedObjectContainer(org.eclipse.ecf.core.SharedObjectContainerDescription,\n\tpublic ISharedObjectContainer createSharedObjectContainer(\n\t\ttrace(\"createSharedObjectContainer(\" + desc + \",\"\n\t\tIContainer newContainer = ContainerFactory.getDefault().createContainer(\n\t * @see org.eclipse.ecf.core.ISharedObjectContainerFactory#createSharedObjectContainer(java.lang.String)\n\tpublic ISharedObjectContainer createSharedObjectContainer(\n\t\treturn createSharedObjectContainer(ContainerFactory.getDefault()\n\t * @see org.eclipse.ecf.core.ISharedObjectContainerFactory#createSharedObjectContainer(java.lang.String,\n\tpublic ISharedObjectContainer createSharedObjectContainer(\n\t\treturn createSharedObjectContainer(ContainerFactory.getDefault()\n\t * @see org.eclipse.ecf.core.ISharedObjectContainerFactory#createSharedObjectContainer(java.lang.String,\n\tpublic ISharedObjectContainer createSharedObjectContainer(\n\t\treturn createSharedObjectContainer(ContainerFactory.getDefault()", "new_methods": [], "old_code": " * \t\t\tSharedObjectContainerFactory.getDefault().makeSharedObjectContainer('standalone');\n\t * @see org.eclipse.ecf.core.ISharedObjectContainerFactory#makeSharedObjectContainer(org.eclipse.ecf.core.SharedObjectContainerDescription,\n\tpublic ISharedObjectContainer makeSharedObjectContainer(\n\t\ttrace(\"makeSharedObjectContainer(\" + desc + \",\"\n\t\tIContainer newContainer = ContainerFactory.getDefault().makeContainer(\n\t * @see org.eclipse.ecf.core.ISharedObjectContainerFactory#makeSharedObjectContainer(java.lang.String)\n\tpublic ISharedObjectContainer makeSharedObjectContainer(\n\t\treturn makeSharedObjectContainer(ContainerFactory.getDefault()\n\t * @see org.eclipse.ecf.core.ISharedObjectContainerFactory#makeSharedObjectContainer(java.lang.String,\n\tpublic ISharedObjectContainer makeSharedObjectContainer(\n\t\treturn makeSharedObjectContainer(ContainerFactory.getDefault()\n\t * @see org.eclipse.ecf.core.ISharedObjectContainerFactory#makeSharedObjectContainer(java.lang.String,\n\tpublic ISharedObjectContainer makeSharedObjectContainer(\n\t\treturn makeSharedObjectContainer(ContainerFactory.getDefault()", "old_methods": [], "patch": "@@ -21,7 +21,7 @@\n * <br>\n * <code>\n * \t ISharedObjectContainer container = <br>\n- * \t\t\tSharedObjectContainerFactory.getDefault().makeSharedObjectContainer('standalone');\n+ * \t\t\tSharedObjectContainerFactory.getDefault().createSharedObjectContainer('standalone');\n * <br><br>\n * ...further use of container variable here...\n * </code>\n@@ -51,19 +51,19 @@ private static void trace(String msg) {\n \t/*\n \t * (non-Javadoc)\n \t * \n-\t * @see org.eclipse.ecf.core.ISharedObjectContainerFactory#makeSharedObjectContainer(org.eclipse.ecf.core.SharedObjectContainerDescription,\n+\t * @see org.eclipse.ecf.core.ISharedObjectContainerFactory#createSharedObjectContainer(org.eclipse.ecf.core.SharedObjectContainerDescription,\n \t * java.lang.String[], java.lang.Object[])\n \t */\n-\tpublic ISharedObjectContainer makeSharedObjectContainer(\n+\tpublic ISharedObjectContainer createSharedObjectContainer(\n \t\t\tContainerDescription desc, String[] argTypes, Object[] args)\n \t\t\tthrows ContainerInstantiationException {\n-\t\ttrace(\"makeSharedObjectContainer(\" + desc + \",\"\n+\t\ttrace(\"createSharedObjectContainer(\" + desc + \",\"\n \t\t\t\t+ Trace.convertStringAToString(argTypes) + \",\"\n \t\t\t\t+ Trace.convertObjectAToString(args) + \")\");\n \t\tif (desc == null)\n \t\t\tthrow new ContainerInstantiationException(\n \t\t\t\t\t\"ContainerDescription cannot be null\");\n-\t\tIContainer newContainer = ContainerFactory.getDefault().makeContainer(\n+\t\tIContainer newContainer = ContainerFactory.getDefault().createContainer(\n \t\t\t\tdesc, argTypes, args);\n \t\tISharedObjectContainer soContainer = (ISharedObjectContainer) newContainer\n \t\t\t\t.getAdapter(ISharedObjectContainer.class);\n@@ -78,37 +78,37 @@ public ISharedObjectContainer makeSharedObjectContainer(\n \t/*\n \t * (non-Javadoc)\n \t * \n-\t * @see org.eclipse.ecf.core.ISharedObjectContainerFactory#makeSharedObjectContainer(java.lang.String)\n+\t * @see org.eclipse.ecf.core.ISharedObjectContainerFactory#createSharedObjectContainer(java.lang.String)\n \t */\n-\tpublic ISharedObjectContainer makeSharedObjectContainer(\n+\tpublic ISharedObjectContainer createSharedObjectContainer(\n \t\t\tString descriptionName) throws ContainerInstantiationException {\n-\t\treturn makeSharedObjectContainer(ContainerFactory.getDefault()\n+\t\treturn createSharedObjectContainer(ContainerFactory.getDefault()\n \t\t\t\t.getDescriptionByName(descriptionName), null, null);\n \t}\n \n \t/*\n \t * (non-Javadoc)\n \t * \n-\t * @see org.eclipse.ecf.core.ISharedObjectContainerFactory#makeSharedObjectContainer(java.lang.String,\n+\t * @see org.eclipse.ecf.core.ISharedObjectContainerFactory#createSharedObjectContainer(java.lang.String,\n \t * java.lang.Object[])\n \t */\n-\tpublic ISharedObjectContainer makeSharedObjectContainer(\n+\tpublic ISharedObjectContainer createSharedObjectContainer(\n \t\t\tString descriptionName, Object[] args)\n \t\t\tthrows ContainerInstantiationException {\n-\t\treturn makeSharedObjectContainer(ContainerFactory.getDefault()\n+\t\treturn createSharedObjectContainer(ContainerFactory.getDefault()\n \t\t\t\t.getDescriptionByName(descriptionName), null, args);\n \t}\n \n \t/*\n \t * (non-Javadoc)\n \t * \n-\t * @see org.eclipse.ecf.core.ISharedObjectContainerFactory#makeSharedObjectContainer(java.lang.String,\n+\t * @see org.eclipse.ecf.core.ISharedObjectContainerFactory#createSharedObjectContainer(java.lang.String,\n \t * java.lang.String[], java.lang.Object[])\n \t */\n-\tpublic ISharedObjectContainer makeSharedObjectContainer(\n+\tpublic ISharedObjectContainer createSharedObjectContainer(\n \t\t\tString descriptionName, String[] argsTypes, Object[] args)\n \t\t\tthrows ContainerInstantiationException {\n-\t\treturn makeSharedObjectContainer(ContainerFactory.getDefault()\n+\t\treturn createSharedObjectContainer(ContainerFactory.getDefault()\n \t\t\t\t.getDescriptionByName(descriptionName), argsTypes, args);\n \t}\n }\n\\ No newline at end of file", "raw_url": "https://github.com/eclipse/ecf/raw/0d00787f0d8de19464aaac7bc951d9817fd7c518/framework%2Fbundles%2Forg.eclipse.ecf%2Fsrc%2Forg%2Feclipse%2Fecf%2Fcore%2FSharedObjectContainerFactory.java", "sha": "e5c4f8299a6a9e03a8838bffe745d9538d220f7e", "status": "modified" }, { "additions": 13, "blob_url": "https://github.com/eclipse/ecf/blob/0d00787f0d8de19464aaac7bc951d9817fd7c518/framework%2Fbundles%2Forg.eclipse.ecf%2Fsrc%2Forg%2Feclipse%2Fecf%2Fcore%2Fcomm%2FConnectionFactory.java", "changes": 26, "contents_url": "https://api.github.com/repos/eclipse/ecf/contents/framework%2Fbundles%2Forg.eclipse.ecf%2Fsrc%2Forg%2Feclipse%2Fecf%2Fcore%2Fcomm%2FConnectionFactory.java?ref=0d00787f0d8de19464aaac7bc951d9817fd7c518", "deletions": 13, "filename": "framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/comm/ConnectionFactory.java", "new_code": "\tpublic static ISynchAsynchConnection createSynchAsynchConnection(\n\t\treturn createSynchAsynchConnection(handler, desc, null, args);\n\tpublic static ISynchAsynchConnection createSynchAsynchConnection(\n\t\tdebug(\"createSynchAsynchConnection(\" + handler + \",\" + desc + \",\"\n\t\t\t\t\t\"createSynchAsynchConnection exception with description: \"\n\t\t\tdumpStack(\"Exception in createSynchAsynchConnection\", newexcept);\n\t\treturn instantiator.createInstance(desc, handler, clazzes, args);\n\tpublic static ISynchAsynchConnection createSynchAsynchConnection(\n\t\treturn createSynchAsynchConnection(handler, desc, null, null);\n\tpublic static ISynchAsynchConnection createSynchAsynchConnection(\n\t\treturn createSynchAsynchConnection(handler, desc, args);\n\tpublic static ISynchAsynchConnection createSynchAsynchConnection(\n\t\treturn createSynchAsynchConnection(handler, desc, argTypes, args);", "new_methods": [], "old_code": "\tpublic static ISynchAsynchConnection makeSynchAsynchConnection(\n\t\treturn makeSynchAsynchConnection(handler, desc, null, args);\n\tpublic static ISynchAsynchConnection makeSynchAsynchConnection(\n\t\tdebug(\"makeSynchAsynchConnection(\" + handler + \",\" + desc + \",\"\n\t\t\t\t\t\"makeSynchAsynchConnection exception with description: \"\n\t\t\tdumpStack(\"Exception in makeSynchAsynchConnection\", newexcept);\n\t\treturn instantiator.makeInstance(desc, handler, clazzes, args);\n\tpublic static ISynchAsynchConnection makeSynchAsynchConnection(\n\t\treturn makeSynchAsynchConnection(handler, desc, null, null);\n\tpublic static ISynchAsynchConnection makeSynchAsynchConnection(\n\t\treturn makeSynchAsynchConnection(handler, desc, args);\n\tpublic static ISynchAsynchConnection makeSynchAsynchConnection(\n\t\treturn makeSynchAsynchConnection(handler, desc, argTypes, args);", "old_methods": [], "patch": "@@ -84,20 +84,20 @@ protected static List getDescriptions0() {\n \t\treturn new ArrayList(connectiontypes.values());\n \t}\n \n-\tpublic static ISynchAsynchConnection makeSynchAsynchConnection(\n+\tpublic static ISynchAsynchConnection createSynchAsynchConnection(\n \t\t\tISynchAsynchConnectionEventHandler handler,\n \t\t\tConnectionDescription desc, Object[] args)\n \t\t\tthrows ConnectionInstantiationException {\n \t\tif (handler == null)\n \t\t\tthrow new ConnectionInstantiationException(\"handler cannot be null\");\n-\t\treturn makeSynchAsynchConnection(handler, desc, null, args);\n+\t\treturn createSynchAsynchConnection(handler, desc, null, args);\n \t}\n \n-\tpublic static ISynchAsynchConnection makeSynchAsynchConnection(\n+\tpublic static ISynchAsynchConnection createSynchAsynchConnection(\n \t\t\tISynchAsynchConnectionEventHandler handler,\n \t\t\tConnectionDescription desc, String[] argTypes, Object[] args)\n \t\t\tthrows ConnectionInstantiationException {\n-\t\tdebug(\"makeSynchAsynchConnection(\" + handler + \",\" + desc + \",\"\n+\t\tdebug(\"createSynchAsynchConnection(\" + handler + \",\" + desc + \",\"\n \t\t\t\t+ Trace.convertStringAToString(argTypes) + \",\"\n \t\t\t\t+ Trace.convertObjectAToString(args) + \")\");\n \t\tif (handler == null)\n@@ -123,18 +123,18 @@ public static ISynchAsynchConnection makeSynchAsynchConnection(\n \t\t\t\t\t\t\t\t+ cd.getName() + \" is null\");\n \t\t} catch (Exception e) {\n \t\t\tConnectionInstantiationException newexcept = new ConnectionInstantiationException(\n-\t\t\t\t\t\"makeSynchAsynchConnection exception with description: \"\n+\t\t\t\t\t\"createSynchAsynchConnection exception with description: \"\n \t\t\t\t\t\t\t+ desc + \": \" + e.getClass().getName() + \": \"\n \t\t\t\t\t\t\t+ e.getMessage());\n \t\t\tnewexcept.setStackTrace(e.getStackTrace());\n-\t\t\tdumpStack(\"Exception in makeSynchAsynchConnection\", newexcept);\n+\t\t\tdumpStack(\"Exception in createSynchAsynchConnection\", newexcept);\n \t\t\tthrow newexcept;\n \t\t}\n \t\t// Ask instantiator to actually create instance\n-\t\treturn instantiator.makeInstance(desc, handler, clazzes, args);\n+\t\treturn instantiator.createInstance(desc, handler, clazzes, args);\n \t}\n \n-\tpublic static ISynchAsynchConnection makeSynchAsynchConnection(\n+\tpublic static ISynchAsynchConnection createSynchAsynchConnection(\n \t\t\tISynchAsynchConnectionEventHandler handler, String descriptionName)\n \t\t\tthrows ConnectionInstantiationException {\n \t\tif (handler == null)\n@@ -144,10 +144,10 @@ public static ISynchAsynchConnection makeSynchAsynchConnection(\n \t\tif (desc == null)\n \t\t\tthrow new ConnectionInstantiationException(\n \t\t\t\t\t\"Connection type named '\" + descriptionName + \"' not found\");\n-\t\treturn makeSynchAsynchConnection(handler, desc, null, null);\n+\t\treturn createSynchAsynchConnection(handler, desc, null, null);\n \t}\n \n-\tpublic static ISynchAsynchConnection makeSynchAsynchConnection(\n+\tpublic static ISynchAsynchConnection createSynchAsynchConnection(\n \t\t\tISynchAsynchConnectionEventHandler handler, String descriptionName,\n \t\t\tObject[] args) throws ConnectionInstantiationException {\n \t\tif (handler == null)\n@@ -157,10 +157,10 @@ public static ISynchAsynchConnection makeSynchAsynchConnection(\n \t\tif (desc == null)\n \t\t\tthrow new ConnectionInstantiationException(\n \t\t\t\t\t\"Connection type named '\" + descriptionName + \"' not found\");\n-\t\treturn makeSynchAsynchConnection(handler, desc, args);\n+\t\treturn createSynchAsynchConnection(handler, desc, args);\n \t}\n \n-\tpublic static ISynchAsynchConnection makeSynchAsynchConnection(\n+\tpublic static ISynchAsynchConnection createSynchAsynchConnection(\n \t\t\tISynchAsynchConnectionEventHandler handler, String descriptionName,\n \t\t\tString[] argTypes, Object[] args)\n \t\t\tthrows ConnectionInstantiationException {\n@@ -171,7 +171,7 @@ public static ISynchAsynchConnection makeSynchAsynchConnection(\n \t\tif (desc == null)\n \t\t\tthrow new ConnectionInstantiationException(\n \t\t\t\t\t\"Connection type named '\" + descriptionName + \"' not found\");\n-\t\treturn makeSynchAsynchConnection(handler, desc, argTypes, args);\n+\t\treturn createSynchAsynchConnection(handler, desc, argTypes, args);\n \t}\n \n \tpublic final static ConnectionDescription removeDescription(", "raw_url": "https://github.com/eclipse/ecf/raw/0d00787f0d8de19464aaac7bc951d9817fd7c518/framework%2Fbundles%2Forg.eclipse.ecf%2Fsrc%2Forg%2Feclipse%2Fecf%2Fcore%2Fcomm%2FConnectionFactory.java", "sha": "8371bceb7fdf5fac59ccf8dc6a91291e034a5c97", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/eclipse/ecf/blob/0d00787f0d8de19464aaac7bc951d9817fd7c518/framework%2Fbundles%2Forg.eclipse.ecf%2Fsrc%2Forg%2Feclipse%2Fecf%2Fcore%2Fcomm%2Fprovider%2FISynchAsynchConnectionInstantiator.java", "changes": 2, "contents_url": "https://api.github.com/repos/eclipse/ecf/contents/framework%2Fbundles%2Forg.eclipse.ecf%2Fsrc%2Forg%2Feclipse%2Fecf%2Fcore%2Fcomm%2Fprovider%2FISynchAsynchConnectionInstantiator.java?ref=0d00787f0d8de19464aaac7bc951d9817fd7c518", "deletions": 1, "filename": "framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/comm/provider/ISynchAsynchConnectionInstantiator.java", "new_code": "\tpublic ISynchAsynchConnection createInstance(", "new_methods": [], "old_code": "\tpublic ISynchAsynchConnection makeInstance(", "old_methods": [], "patch": "@@ -14,7 +14,7 @@\n import org.eclipse.ecf.core.comm.ISynchAsynchConnectionEventHandler;\n \n public interface ISynchAsynchConnectionInstantiator {\n-\tpublic ISynchAsynchConnection makeInstance(\n+\tpublic ISynchAsynchConnection createInstance(\n \t\t\tConnectionDescription description,\n \t\t\tISynchAsynchConnectionEventHandler handler, Class[] clazzes,\n \t\t\tObject[] args) throws ConnectionInstantiationException;", "raw_url": "https://github.com/eclipse/ecf/raw/0d00787f0d8de19464aaac7bc951d9817fd7c518/framework%2Fbundles%2Forg.eclipse.ecf%2Fsrc%2Forg%2Feclipse%2Fecf%2Fcore%2Fcomm%2Fprovider%2FISynchAsynchConnectionInstantiator.java", "sha": "31de42871da733aa18529d8f7cc723861cf45d47", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/eclipse/ecf/blob/0d00787f0d8de19464aaac7bc951d9817fd7c518/framework%2Fbundles%2Forg.eclipse.ecf%2Fsrc%2Forg%2Feclipse%2Fecf%2Fcore%2Fidentity%2FGUID.java", "changes": 2, "contents_url": "https://api.github.com/repos/eclipse/ecf/contents/framework%2Fbundles%2Forg.eclipse.ecf%2Fsrc%2Forg%2Feclipse%2Fecf%2Fcore%2Fidentity%2FGUID.java?ref=0d00787f0d8de19464aaac7bc951d9817fd7c518", "deletions": 1, "filename": "framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/identity/GUID.java", "new_code": "\t\tpublic ID createInstance(Class[] argTypes, Object[] args)", "new_methods": [], "old_code": "\t\tpublic ID makeInstance(Class[] argTypes, Object[] args)", "old_methods": [], "patch": "@@ -28,7 +28,7 @@ public GUIDNamespace() {\n \t\t\tsuper(GUID.class.getName(), \"GUID Namespace\");\n \t\t}\n \n-\t\tpublic ID makeInstance(Class[] argTypes, Object[] args)\n+\t\tpublic ID createInstance(Class[] argTypes, Object[] args)\n \t\t\t\tthrows IDInstantiationException {\n \t\t\tif (args.length == 1)\n \t\t\t\treturn new GUID(this, ((Integer) args[0]).intValue());", "raw_url": "https://github.com/eclipse/ecf/raw/0d00787f0d8de19464aaac7bc951d9817fd7c518/framework%2Fbundles%2Forg.eclipse.ecf%2Fsrc%2Forg%2Feclipse%2Fecf%2Fcore%2Fidentity%2FGUID.java", "sha": "1546a85ea47ff1f91f451459687c8ac8ae554bb6", "status": "modified" }, { "additions": 38, "blob_url": "https://github.com/eclipse/ecf/blob/0d00787f0d8de19464aaac7bc951d9817fd7c518/framework%2Fbundles%2Forg.eclipse.ecf%2Fsrc%2Forg%2Feclipse%2Fecf%2Fcore%2Fidentity%2FIDFactory.java", "changes": 76, "contents_url": "https://api.github.com/repos/eclipse/ecf/contents/framework%2Fbundles%2Forg.eclipse.ecf%2Fsrc%2Forg%2Feclipse%2Fecf%2Fcore%2Fidentity%2FIDFactory.java?ref=0d00787f0d8de19464aaac7bc951d9817fd7c518", "deletions": 38, "filename": "framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/identity/IDFactory.java", "new_code": "\t * @see org.eclipse.ecf.core.identity.IIDFactory#createGUID()\n\tpublic ID createGUID() throws IDInstantiationException {\n\t\treturn createGUID(GUID.DEFAULT_BYTE_LENGTH);\n\t * @see org.eclipse.ecf.core.identity.IIDFactory#createGUID(int)\n\tpublic ID createGUID(int length) throws IDInstantiationException {\n\t\tdebug(\"createGUID(\" + length + \")\");\n\t\treturn createID(n, new String[] { Namespace.class.getName(),\n\t * @see org.eclipse.ecf.core.identity.IIDFactory#createID(org.eclipse.ecf.core.identity.Namespace,\n\tpublic ID createID(Namespace n, String[] argTypes, Object[] args)\n\t\tdebug(\"createID(\" + n + \",\" + Trace.convertStringAToString(argTypes)\n\t\treturn ns.createInstance(clazzes, args);\n\t * @see org.eclipse.ecf.core.identity.IIDFactory#createID(java.lang.String,\n\tpublic ID createID(String namespacename, String[] argTypes, Object[] args)\n\t\treturn createID(n, argTypes, args);\n\t * @see org.eclipse.ecf.core.identity.IIDFactory#createID(org.eclipse.ecf.core.identity.Namespace,\n\tpublic ID createID(Namespace n, Object[] args)\n\t\treturn createID(n, null, args);\n\t * @see org.eclipse.ecf.core.identity.IIDFactory#createID(java.lang.String,\n\tpublic ID createID(String namespacename, Object[] args)\n\t\treturn createID(n, args);\n\tpublic ID createID(Namespace namespace, URI uri) throws IDInstantiationException {\n\t\treturn createID(namespace,new Object[] { uri });\n\t * @see org.eclipse.ecf.core.identity.IIDFactory#createID(java.lang.String,\n\tpublic ID createID(String namespacename, URI uri)\n\t\treturn createID(n, new Object[] { uri });\n\tpublic ID createID(Namespace namespace, String uri) throws IDInstantiationException {\n\t\treturn createID(namespace,new Object[] { uri });\n\tpublic ID createID(String namespace, String uri) throws IDInstantiationException {\n\t\treturn createID(namespace,new Object[] { uri });\t\t\n\t * @see org.eclipse.ecf.core.identity.IIDFactory#createStringID(java.lang.String)\n\tpublic ID createStringID(String idstring) throws IDInstantiationException {\n\t\treturn createID(n, new String[] { String.class.getName() },\n\t * @see org.eclipse.ecf.core.identity.IIDFactory#createLongID(java.lang.Long)\n\tpublic ID createLongID(Long l) throws IDInstantiationException {\n\t\treturn createID(n, new String[] { String.class.getName() },\n\t * @see org.eclipse.ecf.core.identity.IIDFactory#createLongID(long)\n\tpublic ID createLongID(long l) throws IDInstantiationException {\n\t\treturn createID(n, new String[] { String.class.getName() },", "new_methods": [], "old_code": "\t * @see org.eclipse.ecf.core.identity.IIDFactory#makeGUID()\n\tpublic ID makeGUID() throws IDInstantiationException {\n\t\treturn makeGUID(GUID.DEFAULT_BYTE_LENGTH);\n\t * @see org.eclipse.ecf.core.identity.IIDFactory#makeGUID(int)\n\tpublic ID makeGUID(int length) throws IDInstantiationException {\n\t\tdebug(\"makeGUID(\" + length + \")\");\n\t\treturn makeID(n, new String[] { Namespace.class.getName(),\n\t * @see org.eclipse.ecf.core.identity.IIDFactory#makeID(org.eclipse.ecf.core.identity.Namespace,\n\tpublic ID makeID(Namespace n, String[] argTypes, Object[] args)\n\t\tdebug(\"makeID(\" + n + \",\" + Trace.convertStringAToString(argTypes)\n\t\treturn ns.makeInstance(clazzes, args);\n\t * @see org.eclipse.ecf.core.identity.IIDFactory#makeID(java.lang.String,\n\tpublic ID makeID(String namespacename, String[] argTypes, Object[] args)\n\t\treturn makeID(n, argTypes, args);\n\t * @see org.eclipse.ecf.core.identity.IIDFactory#makeID(org.eclipse.ecf.core.identity.Namespace,\n\tpublic ID makeID(Namespace n, Object[] args)\n\t\treturn makeID(n, null, args);\n\t * @see org.eclipse.ecf.core.identity.IIDFactory#makeID(java.lang.String,\n\tpublic ID makeID(String namespacename, Object[] args)\n\t\treturn makeID(n, args);\n\tpublic ID makeID(Namespace namespace, URI uri) throws IDInstantiationException {\n\t\treturn makeID(namespace,new Object[] { uri });\n\t * @see org.eclipse.ecf.core.identity.IIDFactory#makeID(java.lang.String,\n\tpublic ID makeID(String namespacename, URI uri)\n\t\treturn makeID(n, new Object[] { uri });\n\tpublic ID makeID(Namespace namespace, String uri) throws IDInstantiationException {\n\t\treturn makeID(namespace,new Object[] { uri });\n\tpublic ID makeID(String namespace, String uri) throws IDInstantiationException {\n\t\treturn makeID(namespace,new Object[] { uri });\t\t\n\t * @see org.eclipse.ecf.core.identity.IIDFactory#makeStringID(java.lang.String)\n\tpublic ID makeStringID(String idstring) throws IDInstantiationException {\n\t\treturn makeID(n, new String[] { String.class.getName() },\n\t * @see org.eclipse.ecf.core.identity.IIDFactory#makeLongID(java.lang.Long)\n\tpublic ID makeLongID(Long l) throws IDInstantiationException {\n\t\treturn makeID(n, new String[] { String.class.getName() },\n\t * @see org.eclipse.ecf.core.identity.IIDFactory#makeLongID(long)\n\tpublic ID makeLongID(long l) throws IDInstantiationException {\n\t\treturn makeID(n, new String[] { String.class.getName() },", "old_methods": [], "patch": "@@ -154,21 +154,21 @@ protected final static Namespace getNamespace0(String name) {\n \t/*\n \t * (non-Javadoc)\n \t * \n-\t * @see org.eclipse.ecf.core.identity.IIDFactory#makeGUID()\n+\t * @see org.eclipse.ecf.core.identity.IIDFactory#createGUID()\n \t */\n-\tpublic ID makeGUID() throws IDInstantiationException {\n-\t\treturn makeGUID(GUID.DEFAULT_BYTE_LENGTH);\n+\tpublic ID createGUID() throws IDInstantiationException {\n+\t\treturn createGUID(GUID.DEFAULT_BYTE_LENGTH);\n \t}\n \n \t/*\n \t * (non-Javadoc)\n \t * \n-\t * @see org.eclipse.ecf.core.identity.IIDFactory#makeGUID(int)\n+\t * @see org.eclipse.ecf.core.identity.IIDFactory#createGUID(int)\n \t */\n-\tpublic ID makeGUID(int length) throws IDInstantiationException {\n-\t\tdebug(\"makeGUID(\" + length + \")\");\n+\tpublic ID createGUID(int length) throws IDInstantiationException {\n+\t\tdebug(\"createGUID(\" + length + \")\");\n \t\tNamespace n = new GUID.GUIDNamespace();\n-\t\treturn makeID(n, new String[] { Namespace.class.getName(),\n+\t\treturn createID(n, new String[] { Namespace.class.getName(),\n \t\t\t\tInteger.class.getName() }, new Object[] { n,\n \t\t\t\tnew Integer(length) });\n \t}\n@@ -204,12 +204,12 @@ protected static void logAndThrow(String s) throws IDInstantiationException {\n \t/*\n \t * (non-Javadoc)\n \t * \n-\t * @see org.eclipse.ecf.core.identity.IIDFactory#makeID(org.eclipse.ecf.core.identity.Namespace,\n+\t * @see org.eclipse.ecf.core.identity.IIDFactory#createID(org.eclipse.ecf.core.identity.Namespace,\n \t * java.lang.String[], java.lang.Object[])\n \t */\n-\tpublic ID makeID(Namespace n, String[] argTypes, Object[] args)\n+\tpublic ID createID(Namespace n, String[] argTypes, Object[] args)\n \t\t\tthrows IDInstantiationException {\n-\t\tdebug(\"makeID(\" + n + \",\" + Trace.convertStringAToString(argTypes)\n+\t\tdebug(\"createID(\" + n + \",\" + Trace.convertStringAToString(argTypes)\n \t\t\t\t+ \",\" + Trace.convertObjectAToString(args) + \")\");\n \t\t// Verify namespace is non-null\n \t\tif (n == null)\n@@ -229,109 +229,109 @@ public ID makeID(Namespace n, String[] argTypes, Object[] args)\n \t\t\tlogAndThrow(\"Exception in getClassesForTypes\", e);\n \t\t}\n \t\t// Ask instantiator to actually create instance\n-\t\treturn ns.makeInstance(clazzes, args);\n+\t\treturn ns.createInstance(clazzes, args);\n \t}\n \n \t/*\n \t * (non-Javadoc)\n \t * \n-\t * @see org.eclipse.ecf.core.identity.IIDFactory#makeID(java.lang.String,\n+\t * @see org.eclipse.ecf.core.identity.IIDFactory#createID(java.lang.String,\n \t * java.lang.String[], java.lang.Object[])\n \t */\n-\tpublic ID makeID(String namespacename, String[] argTypes, Object[] args)\n+\tpublic ID createID(String namespacename, String[] argTypes, Object[] args)\n \t\t\tthrows IDInstantiationException {\n \t\tNamespace n = getNamespaceByName(namespacename);\n \t\tif (n == null)\n \t\t\tthrow new IDInstantiationException(\"Namespace named \"\n \t\t\t\t\t+ namespacename + \" not found\");\n-\t\treturn makeID(n, argTypes, args);\n+\t\treturn createID(n, argTypes, args);\n \t}\n \n \t/*\n \t * (non-Javadoc)\n \t * \n-\t * @see org.eclipse.ecf.core.identity.IIDFactory#makeID(org.eclipse.ecf.core.identity.Namespace,\n+\t * @see org.eclipse.ecf.core.identity.IIDFactory#createID(org.eclipse.ecf.core.identity.Namespace,\n \t * java.lang.Object[])\n \t */\n-\tpublic ID makeID(Namespace n, Object[] args)\n+\tpublic ID createID(Namespace n, Object[] args)\n \t\t\tthrows IDInstantiationException {\n-\t\treturn makeID(n, null, args);\n+\t\treturn createID(n, null, args);\n \t}\n \n \t/*\n \t * (non-Javadoc)\n \t * \n-\t * @see org.eclipse.ecf.core.identity.IIDFactory#makeID(java.lang.String,\n+\t * @see org.eclipse.ecf.core.identity.IIDFactory#createID(java.lang.String,\n \t * java.lang.Object[])\n \t */\n-\tpublic ID makeID(String namespacename, Object[] args)\n+\tpublic ID createID(String namespacename, Object[] args)\n \t\t\tthrows IDInstantiationException {\n \t\tNamespace n = getNamespaceByName(namespacename);\n \t\tif (n == null)\n \t\t\tthrow new IDInstantiationException(\"Namespace \" + namespacename\n \t\t\t\t\t+ \" not found\");\n-\t\treturn makeID(n, args);\n+\t\treturn createID(n, args);\n \t}\n \n-\tpublic ID makeID(Namespace namespace, URI uri) throws IDInstantiationException {\n-\t\treturn makeID(namespace,new Object[] { uri });\n+\tpublic ID createID(Namespace namespace, URI uri) throws IDInstantiationException {\n+\t\treturn createID(namespace,new Object[] { uri });\n \t}\n \t/*\n \t * (non-Javadoc)\n \t * \n-\t * @see org.eclipse.ecf.core.identity.IIDFactory#makeID(java.lang.String,\n+\t * @see org.eclipse.ecf.core.identity.IIDFactory#createID(java.lang.String,\n \t * java.net.URI)\n \t */\n-\tpublic ID makeID(String namespacename, URI uri)\n+\tpublic ID createID(String namespacename, URI uri)\n \t\t\tthrows IDInstantiationException {\n \t\tif (uri == null)\n \t\t\tthrow new IDInstantiationException(\"Null uri not allowed\");\n \t\tNamespace n = getNamespaceByName(namespacename);\n \t\tif (n == null)\n \t\t\tthrow new IDInstantiationException(\"Namespace \" + n + \" not found\");\n-\t\treturn makeID(n, new Object[] { uri });\n+\t\treturn createID(n, new Object[] { uri });\n \t}\n \n-\tpublic ID makeID(Namespace namespace, String uri) throws IDInstantiationException {\n-\t\treturn makeID(namespace,new Object[] { uri });\n+\tpublic ID createID(Namespace namespace, String uri) throws IDInstantiationException {\n+\t\treturn createID(namespace,new Object[] { uri });\n \t}\n-\tpublic ID makeID(String namespace, String uri) throws IDInstantiationException {\n-\t\treturn makeID(namespace,new Object[] { uri });\t\t\n+\tpublic ID createID(String namespace, String uri) throws IDInstantiationException {\n+\t\treturn createID(namespace,new Object[] { uri });\t\t\n \t}\n \t/*\n \t * (non-Javadoc)\n \t * \n-\t * @see org.eclipse.ecf.core.identity.IIDFactory#makeStringID(java.lang.String)\n+\t * @see org.eclipse.ecf.core.identity.IIDFactory#createStringID(java.lang.String)\n \t */\n-\tpublic ID makeStringID(String idstring) throws IDInstantiationException {\n+\tpublic ID createStringID(String idstring) throws IDInstantiationException {\n \t\tif (idstring == null)\n \t\t\tthrow new IDInstantiationException(\"String cannot be null\");\n \t\tNamespace n = new StringID.StringIDNamespace();\n-\t\treturn makeID(n, new String[] { String.class.getName() },\n+\t\treturn createID(n, new String[] { String.class.getName() },\n \t\t\t\tnew Object[] { idstring });\n \t}\n \n \t/*\n \t * (non-Javadoc)\n \t * \n-\t * @see org.eclipse.ecf.core.identity.IIDFactory#makeLongID(java.lang.Long)\n+\t * @see org.eclipse.ecf.core.identity.IIDFactory#createLongID(java.lang.Long)\n \t */\n-\tpublic ID makeLongID(Long l) throws IDInstantiationException {\n+\tpublic ID createLongID(Long l) throws IDInstantiationException {\n \t\tif (l == null)\n \t\t\tthrow new IDInstantiationException(\"Long cannot be null\");\n \t\tNamespace n = new LongID.LongNamespace();\n-\t\treturn makeID(n, new String[] { String.class.getName() },\n+\t\treturn createID(n, new String[] { String.class.getName() },\n \t\t\t\tnew Object[] { l });\n \t}\n \n \t/*\n \t * (non-Javadoc)\n \t * \n-\t * @see org.eclipse.ecf.core.identity.IIDFactory#makeLongID(long)\n+\t * @see org.eclipse.ecf.core.identity.IIDFactory#createLongID(long)\n \t */\n-\tpublic ID makeLongID(long l) throws IDInstantiationException {\n+\tpublic ID createLongID(long l) throws IDInstantiationException {\n \t\tNamespace n = new LongID.LongNamespace();\n-\t\treturn makeID(n, new String[] { String.class.getName() },\n+\t\treturn createID(n, new String[] { String.class.getName() },\n \t\t\t\tnew Object[] { new Long(l) });\n \t}\n ", "raw_url": "https://github.com/eclipse/ecf/raw/0d00787f0d8de19464aaac7bc951d9817fd7c518/framework%2Fbundles%2Forg.eclipse.ecf%2Fsrc%2Forg%2Feclipse%2Fecf%2Fcore%2Fidentity%2FIDFactory.java", "sha": "6302e08f61016b0c8fb9e079f67d8578823f3159", "status": "modified" }, { "additions": 22, "blob_url": "https://github.com/eclipse/ecf/blob/0d00787f0d8de19464aaac7bc951d9817fd7c518/framework%2Fbundles%2Forg.eclipse.ecf%2Fsrc%2Forg%2Feclipse%2Fecf%2Fcore%2Fidentity%2FIIDFactory.java", "changes": 44, "contents_url": "https://api.github.com/repos/eclipse/ecf/contents/framework%2Fbundles%2Forg.eclipse.ecf%2Fsrc%2Forg%2Feclipse%2Fecf%2Fcore%2Fidentity%2FIIDFactory.java?ref=0d00787f0d8de19464aaac7bc951d9817fd7c518", "deletions": 22, "filename": "framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/identity/IIDFactory.java", "new_code": "\tpublic ID createGUID() throws IDInstantiationException;\n\tpublic ID createGUID(int length) throws IDInstantiationException;\n\tpublic ID createID(Namespace n, String[] argTypes, Object[] args)\n\tpublic ID createID(String namespacename, String[] argTypes, Object[] args)\n\tpublic ID createID(Namespace n, Object[] args)\n\tpublic ID createID(String namespacename, Object[] args)\n\t * the namespace to use to create the ID\n\t * the String uri to use to create the ID\n\tpublic ID createID(Namespace namespace, String uri)\n\t * the result is passed into createID(Namespace,String).\n\t * the namespacename to use to create the ID\n\t * the String uri to use to create the ID\n\tpublic ID createID(String namespacename, String uri)\n\t * the namespace to use to create the ID\n\t * the URI to use to create ID.\n\tpublic ID createID(Namespace namespace, URI uri)\n\t * the name of the namespace to use to create the ID\n\t * the URI to use to create ID.\n\tpublic ID createID(String namespacename, URI uri)\n\tpublic ID createStringID(String idstring) throws IDInstantiationException;\n\tpublic ID createLongID(Long l) throws IDInstantiationException;\n\tpublic ID createLongID(long l) throws IDInstantiationException;", "new_methods": [], "old_code": "\tpublic ID makeGUID() throws IDInstantiationException;\n\tpublic ID makeGUID(int length) throws IDInstantiationException;\n\tpublic ID makeID(Namespace n, String[] argTypes, Object[] args)\n\tpublic ID makeID(String namespacename, String[] argTypes, Object[] args)\n\tpublic ID makeID(Namespace n, Object[] args)\n\tpublic ID makeID(String namespacename, Object[] args)\n\t * the namespace to use to make the ID\n\t * the String uri to use to make the ID\n\tpublic ID makeID(Namespace namespace, String uri)\n\t * the result is passed into makeID(Namespace,String).\n\t * the namespacename to use to make the ID\n\t * the String uri to use to make the ID\n\tpublic ID makeID(String namespacename, String uri)\n\t * the namespace to use to make the ID\n\t * the URI to use to make ID.\n\tpublic ID makeID(Namespace namespace, URI uri)\n\t * the name of the namespace to use to make the ID\n\t * the URI to use to make ID.\n\tpublic ID makeID(String namespacename, URI uri)\n\tpublic ID makeStringID(String idstring) throws IDInstantiationException;\n\tpublic ID makeLongID(Long l) throws IDInstantiationException;\n\tpublic ID makeLongID(long l) throws IDInstantiationException;", "old_methods": [], "patch": "@@ -73,7 +73,7 @@ public interface IIDFactory {\n \t * @return new ID instance\n \t * @throws IDInstantiationException if ID cannot be constructed\n \t */\n-\tpublic ID makeGUID() throws IDInstantiationException;\n+\tpublic ID createGUID() throws IDInstantiationException;\n \n \t/**\n \t * Make a GUID using SHA-1 hash algorithm and a default of 16bits of data length. The\n@@ -83,7 +83,7 @@ public interface IIDFactory {\n \t * @return new ID instance\n \t * @throws IDInstantiationException if ID cannot be constructed\n \t */\n-\tpublic ID makeGUID(int length) throws IDInstantiationException;\n+\tpublic ID createGUID(int length) throws IDInstantiationException;\n \n \t/**\n \t * Make a new identity. Given a Namespace instance, constructor argument\n@@ -101,7 +101,7 @@ public interface IIDFactory {\n \t * loaded, if something goes wrong during instance\n \t * construction\n \t */\n-\tpublic ID makeID(Namespace n, String[] argTypes, Object[] args)\n+\tpublic ID createID(Namespace n, String[] argTypes, Object[] args)\n \t\t\tthrows IDInstantiationException;\n \n \t/**\n@@ -120,7 +120,7 @@ public ID makeID(Namespace n, String[] argTypes, Object[] args)\n \t * loaded, if something goes wrong during instance\n \t * construction\n \t */\n-\tpublic ID makeID(String namespacename, String[] argTypes, Object[] args)\n+\tpublic ID createID(String namespacename, String[] argTypes, Object[] args)\n \t\t\tthrows IDInstantiationException;\n \n \t/**\n@@ -137,7 +137,7 @@ public ID makeID(String namespacename, String[] argTypes, Object[] args)\n \t * loaded, if something goes wrong during instance\n \t * construction\n \t */\n-\tpublic ID makeID(Namespace n, Object[] args)\n+\tpublic ID createID(Namespace n, Object[] args)\n \t\t\tthrows IDInstantiationException;\n \n \t/**\n@@ -154,69 +154,69 @@ public ID makeID(Namespace n, Object[] args)\n \t * loaded, if something goes wrong during instance\n \t * construction\n \t */\n-\tpublic ID makeID(String namespacename, Object[] args)\n+\tpublic ID createID(String namespacename, Object[] args)\n \t\t\tthrows IDInstantiationException;\n \n \t/**\n \t * Make a new identity instance from a namespace and String.\n \t * \n \t * @param namespace\n-\t * the namespace to use to make the ID\n+\t * the namespace to use to create the ID\n \t * @param uri\n-\t * the String uri to use to make the ID\n+\t * the String uri to use to create the ID\n \t * @exception IDInstantiationException\n \t * thrown if class for instantiator or ID instance can't be\n \t * loaded, if something goes wrong during instance\n \t * construction\n \t */\n-\tpublic ID makeID(Namespace namespace, String uri)\n+\tpublic ID createID(Namespace namespace, String uri)\n \t\t\tthrows IDInstantiationException;\n \n \t/**\n \t * Make a new identity instance from a namespacename and URI. The namespacename\n \t * is first used to lookup the namespace with getNamespaceByName(), and then\n-\t * the result is passed into makeID(Namespace,String).\n+\t * the result is passed into createID(Namespace,String).\n \t * \n \t * @param namespacename\n-\t * the namespacename to use to make the ID\n+\t * the namespacename to use to create the ID\n \t * @param uri\n-\t * the String uri to use to make the ID\n+\t * the String uri to use to create the ID\n \t * @exception IDInstantiationException\n \t * thrown if class for instantiator or ID instance can't be\n \t * loaded, if something goes wrong during instance\n \t * construction\n \t */\n-\tpublic ID makeID(String namespacename, String uri)\n+\tpublic ID createID(String namespacename, String uri)\n \t\t\tthrows IDInstantiationException;\n \n \t/**\n \t * Make a new identity instance from a namespace and URI.\n \t * \n \t * @param namespace\n-\t * the namespace to use to make the ID\n+\t * the namespace to use to create the ID\n \t * @param uri\n-\t * the URI to use to make ID.\n+\t * the URI to use to create ID.\n \t * @exception IDInstantiationException\n \t * thrown if class for instantiator or ID instance can't be\n \t * loaded, if something goes wrong during instance\n \t * construction\n \t */\n-\tpublic ID makeID(Namespace namespace, URI uri)\n+\tpublic ID createID(Namespace namespace, URI uri)\n \t\t\tthrows IDInstantiationException;\n \n \t/**\n \t * Make a new identity instance from a namespace name and URI.\n \t * \n \t * @param namespacename\n-\t * the name of the namespace to use to make the ID\n+\t * the name of the namespace to use to create the ID\n \t * @param uri\n-\t * the URI to use to make ID.\n+\t * the URI to use to create ID.\n \t * @exception IDInstantiationException\n \t * thrown if class for instantiator or ID instance can't be\n \t * loaded, if something goes wrong during instance\n \t * construction\n \t */\n-\tpublic ID makeID(String namespacename, URI uri)\n+\tpublic ID createID(String namespacename, URI uri)\n \t\t\tthrows IDInstantiationException;\n \n \t/**\n@@ -231,7 +231,7 @@ public ID makeID(String namespacename, URI uri)\n \t * loaded, if something goes wrong during instance\n \t * construction\n \t */\n-\tpublic ID makeStringID(String idstring) throws IDInstantiationException;\n+\tpublic ID createStringID(String idstring) throws IDInstantiationException;\n \n \t/**\n \t * Make a an ID from a Long\n@@ -245,7 +245,7 @@ public ID makeID(String namespacename, URI uri)\n \t * loaded, if something goes wrong during instance\n \t * construction\n \t */\n-\tpublic ID makeLongID(Long l) throws IDInstantiationException;\n+\tpublic ID createLongID(Long l) throws IDInstantiationException;\n \n \t/**\n \t * Make a an ID from a long\n@@ -259,7 +259,7 @@ public ID makeID(String namespacename, URI uri)\n \t * loaded, if something goes wrong during instance\n \t * construction\n \t */\n-\tpublic ID makeLongID(long l) throws IDInstantiationException;\n+\tpublic ID createLongID(long l) throws IDInstantiationException;\n \n \t/**\n \t * Remove the given Namespace from our table of available Namespaces", "raw_url": "https://github.com/eclipse/ecf/raw/0d00787f0d8de19464aaac7bc951d9817fd7c518/framework%2Fbundles%2Forg.eclipse.ecf%2Fsrc%2Forg%2Feclipse%2Fecf%2Fcore%2Fidentity%2FIIDFactory.java", "sha": "41e097fc6e78136f32e5b1834617c84cc3ad8c7a", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/eclipse/ecf/blob/0d00787f0d8de19464aaac7bc951d9817fd7c518/framework%2Fbundles%2Forg.eclipse.ecf%2Fsrc%2Forg%2Feclipse%2Fecf%2Fcore%2Fidentity%2FLongID.java", "changes": 2, "contents_url": "https://api.github.com/repos/eclipse/ecf/contents/framework%2Fbundles%2Forg.eclipse.ecf%2Fsrc%2Forg%2Feclipse%2Fecf%2Fcore%2Fidentity%2FLongID.java?ref=0d00787f0d8de19464aaac7bc951d9817fd7c518", "deletions": 1, "filename": "framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/identity/LongID.java", "new_code": "\t\tpublic ID createInstance(Class[] argTypes, Object[] args)", "new_methods": [], "old_code": "\t\tpublic ID makeInstance(Class[] argTypes, Object[] args)", "old_methods": [], "patch": "@@ -25,7 +25,7 @@ public LongNamespace() {\n \t\t\tsuper(LongID.class.getName(), \"Long Namespace\");\n \t\t}\n \n-\t\tpublic ID makeInstance(Class[] argTypes, Object[] args)\n+\t\tpublic ID createInstance(Class[] argTypes, Object[] args)\n \t\t\t\tthrows IDInstantiationException {\n \t\t\treturn new LongID(this, (Long) args[0]);\n \t\t}", "raw_url": "https://github.com/eclipse/ecf/raw/0d00787f0d8de19464aaac7bc951d9817fd7c518/framework%2Fbundles%2Forg.eclipse.ecf%2Fsrc%2Forg%2Feclipse%2Fecf%2Fcore%2Fidentity%2FLongID.java", "sha": "cb91d16c141ffdccb4619f6a9f309291b843c0ab", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/eclipse/ecf/blob/0d00787f0d8de19464aaac7bc951d9817fd7c518/framework%2Fbundles%2Forg.eclipse.ecf%2Fsrc%2Forg%2Feclipse%2Fecf%2Fcore%2Fidentity%2FNamespace.java", "changes": 2, "contents_url": "https://api.github.com/repos/eclipse/ecf/contents/framework%2Fbundles%2Forg.eclipse.ecf%2Fsrc%2Forg%2Feclipse%2Fecf%2Fcore%2Fidentity%2FNamespace.java?ref=0d00787f0d8de19464aaac7bc951d9817fd7c518", "deletions": 1, "filename": "framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/identity/Namespace.java", "new_code": "\tpublic abstract ID createInstance(Class[] argTypes, Object[] args)", "new_methods": [], "old_code": "\tpublic abstract ID makeInstance(Class[] argTypes, Object[] args)", "old_methods": [], "patch": "@@ -121,7 +121,7 @@ public String getDescription() {\n \t * the ID interface directly\n \t * @throws IDInstantiationException if construction fails\n \t */\n-\tpublic abstract ID makeInstance(Class[] argTypes, Object[] args)\n+\tpublic abstract ID createInstance(Class[] argTypes, Object[] args)\n \t\t\tthrows IDInstantiationException;\n \n \t/**", "raw_url": "https://github.com/eclipse/ecf/raw/0d00787f0d8de19464aaac7bc951d9817fd7c518/framework%2Fbundles%2Forg.eclipse.ecf%2Fsrc%2Forg%2Feclipse%2Fecf%2Fcore%2Fidentity%2FNamespace.java", "sha": "2160964e4222b4f1c97cda2780212afdab859331", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/eclipse/ecf/blob/0d00787f0d8de19464aaac7bc951d9817fd7c518/framework%2Fbundles%2Forg.eclipse.ecf%2Fsrc%2Forg%2Feclipse%2Fecf%2Fcore%2Fidentity%2FStringID.java", "changes": 2, "contents_url": "https://api.github.com/repos/eclipse/ecf/contents/framework%2Fbundles%2Forg.eclipse.ecf%2Fsrc%2Forg%2Feclipse%2Fecf%2Fcore%2Fidentity%2FStringID.java?ref=0d00787f0d8de19464aaac7bc951d9817fd7c518", "deletions": 1, "filename": "framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/identity/StringID.java", "new_code": "\t\tpublic ID createInstance(Class[] argTypes, Object[] args)", "new_methods": [], "old_code": "\t\tpublic ID makeInstance(Class[] argTypes, Object[] args)", "old_methods": [], "patch": "@@ -29,7 +29,7 @@ public StringIDNamespace() {\n \t\t\tsuper(StringID.class.getName(), \"String Namespace\");\n \t\t}\n \n-\t\tpublic ID makeInstance(Class[] argTypes, Object[] args)\n+\t\tpublic ID createInstance(Class[] argTypes, Object[] args)\n \t\t\t\tthrows IDInstantiationException {\n \t\t\treturn new StringID(this, (String) args[0]);\n \t\t}", "raw_url": "https://github.com/eclipse/ecf/raw/0d00787f0d8de19464aaac7bc951d9817fd7c518/framework%2Fbundles%2Forg.eclipse.ecf%2Fsrc%2Forg%2Feclipse%2Fecf%2Fcore%2Fidentity%2FStringID.java", "sha": "e3fc29455c3857b303b4f7398159ec9143b13af7", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/eclipse/ecf/blob/0d00787f0d8de19464aaac7bc951d9817fd7c518/framework%2Fbundles%2Forg.eclipse.ecf%2Fsrc%2Forg%2Feclipse%2Fecf%2Fcore%2Fprovider%2FIContainerInstantiator.java", "changes": 2, "contents_url": "https://api.github.com/repos/eclipse/ecf/contents/framework%2Fbundles%2Forg.eclipse.ecf%2Fsrc%2Forg%2Feclipse%2Fecf%2Fcore%2Fprovider%2FIContainerInstantiator.java?ref=0d00787f0d8de19464aaac7bc951d9817fd7c518", "deletions": 1, "filename": "framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/provider/IContainerInstantiator.java", "new_code": "\tpublic IContainer createInstance(ContainerDescription description,", "new_methods": [], "old_code": "\tpublic IContainer makeInstance(ContainerDescription description,", "old_methods": [], "patch": "@@ -13,7 +13,7 @@\n import org.eclipse.ecf.core.IContainer;\n \n public interface IContainerInstantiator {\n-\tpublic IContainer makeInstance(ContainerDescription description,\n+\tpublic IContainer createInstance(ContainerDescription description,\n \t\t\tClass[] argTypes, Object[] args)\n \t\t\tthrows ContainerInstantiationException;\n }\n\\ No newline at end of file", "raw_url": "https://github.com/eclipse/ecf/raw/0d00787f0d8de19464aaac7bc951d9817fd7c518/framework%2Fbundles%2Forg.eclipse.ecf%2Fsrc%2Forg%2Feclipse%2Fecf%2Fcore%2Fprovider%2FIContainerInstantiator.java", "sha": "864d268cde979ecee7a3aee2a86fab7c1b99cec5", "status": "modified" }, { "additions": 2, "blob_url": "https://github.com/eclipse/ecf/blob/0d00787f0d8de19464aaac7bc951d9817fd7c518/framework%2Fbundles%2Forg.eclipse.ecf%2Fsrc%2Forg%2Feclipse%2Fecf%2Fcore%2Fsecurity%2FConnectContextFactory.java", "changes": 4, "contents_url": "https://api.github.com/repos/eclipse/ecf/contents/framework%2Fbundles%2Forg.eclipse.ecf%2Fsrc%2Forg%2Feclipse%2Fecf%2Fcore%2Fsecurity%2FConnectContextFactory.java?ref=0d00787f0d8de19464aaac7bc951d9817fd7c518", "deletions": 2, "filename": "framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/security/ConnectContextFactory.java", "new_code": "\tpublic static IConnectContext createUsernamePasswordConnectContext(final String username, final Object password) {\n\tpublic static IConnectContext createPasswordConnectContext(final String password) {", "new_methods": [], "old_code": "\tpublic static IConnectContext makeUsernamePasswordConnectContext(final String username, final Object password) {\n\tpublic static IConnectContext makePasswordConnectContext(final String password) {", "old_methods": [], "patch": "@@ -14,7 +14,7 @@ public class ConnectContextFactory {\n \tprivate ConnectContextFactory() {\n \t\tsuper();\n \t}\n-\tpublic static IConnectContext makeUsernamePasswordConnectContext(final String username, final Object password) {\n+\tpublic static IConnectContext createUsernamePasswordConnectContext(final String username, final Object password) {\n \t\treturn new IConnectContext() {\n \t\t\tpublic CallbackHandler getCallbackHandler() {\n \t\t\t\treturn new CallbackHandler() {\n@@ -37,7 +37,7 @@ public void handle(Callback[] callbacks)\n \t\t};\n \t}\n \t\n-\tpublic static IConnectContext makePasswordConnectContext(final String password) {\n+\tpublic static IConnectContext createPasswordConnectContext(final String password) {\n \t\treturn new IConnectContext() {\n \t\t\tpublic CallbackHandler getCallbackHandler() {\n \t\t\t\treturn new CallbackHandler() {", "raw_url": "https://github.com/eclipse/ecf/raw/0d00787f0d8de19464aaac7bc951d9817fd7c518/framework%2Fbundles%2Forg.eclipse.ecf%2Fsrc%2Forg%2Feclipse%2Fecf%2Fcore%2Fsecurity%2FConnectContextFactory.java", "sha": "4afe0e2ccca9f037a3d35125a549c8962e42f828", "status": "modified" }, { "additions": 19, "blob_url": "https://github.com/eclipse/ecf/blob/0d00787f0d8de19464aaac7bc951d9817fd7c518/framework%2Fbundles%2Forg.eclipse.ecf%2Fsrc%2Forg%2Feclipse%2Fecf%2Fcore%2Fsharedobject%2FSharedObjectMsg.java", "changes": 38, "contents_url": "https://api.github.com/repos/eclipse/ecf/contents/framework%2Fbundles%2Forg.eclipse.ecf%2Fsrc%2Forg%2Feclipse%2Fecf%2Fcore%2Fsharedobject%2FSharedObjectMsg.java?ref=0d00787f0d8de19464aaac7bc951d9817fd7c518", "deletions": 19, "filename": "framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/sharedobject/SharedObjectMsg.java", "new_code": "\tpublic static SharedObjectMsg createMsg(String className, String methodName,\n\tpublic static SharedObjectMsg createMsg(String methodName, Object[] param) {\n\t\treturn createMsg((String) null, methodName, param);\n\tpublic static SharedObjectMsg createMsg(String methodName) {\n\t\treturn createMsg((String) null, methodName, nullArgs);\n\tpublic static SharedObjectMsg createMsg(String className, String methodName) {\n\t\treturn createMsg(className, methodName, nullArgs);\n\tpublic static SharedObjectMsg createMsg(String className, String methodName,\n\t\treturn createMsg(className, methodName, args);\n\tpublic static SharedObjectMsg createMsg(String methodName, Object arg) {\n\t\treturn createMsg((String) null, methodName, arg);\n\tpublic static SharedObjectMsg createMsg(String className, String methodName,\n\t\treturn createMsg(className, methodName, args);\n\tpublic static SharedObjectMsg createMsg(String className, String methodName,\n\t\treturn createMsg(className, methodName, args);\n\tpublic static SharedObjectMsg createMsg(String className, String methodName,\n\t\treturn createMsg(className, methodName, args);\n\tpublic static SharedObjectMsg createMsg(String className, String methodName,\n\t\treturn createMsg(className, methodName, args);", "new_methods": [], "old_code": "\tpublic static SharedObjectMsg makeMsg(String className, String methodName,\n\tpublic static SharedObjectMsg makeMsg(String methodName, Object[] param) {\n\t\treturn makeMsg((String) null, methodName, param);\n\tpublic static SharedObjectMsg makeMsg(String methodName) {\n\t\treturn makeMsg((String) null, methodName, nullArgs);\n\tpublic static SharedObjectMsg makeMsg(String className, String methodName) {\n\t\treturn makeMsg(className, methodName, nullArgs);\n\tpublic static SharedObjectMsg makeMsg(String className, String methodName,\n\t\treturn makeMsg(className, methodName, args);\n\tpublic static SharedObjectMsg makeMsg(String methodName, Object arg) {\n\t\treturn makeMsg((String) null, methodName, arg);\n\tpublic static SharedObjectMsg makeMsg(String className, String methodName,\n\t\treturn makeMsg(className, methodName, args);\n\tpublic static SharedObjectMsg makeMsg(String className, String methodName,\n\t\treturn makeMsg(className, methodName, args);\n\tpublic static SharedObjectMsg makeMsg(String className, String methodName,\n\t\treturn makeMsg(className, methodName, args);\n\tpublic static SharedObjectMsg makeMsg(String className, String methodName,\n\t\treturn makeMsg(className, methodName, args);", "old_methods": [], "patch": "@@ -27,50 +27,50 @@ public class SharedObjectMsg implements Serializable {\n \tpublic static final Object[] nullArgs = new Object[0];\n \tpublic static final Class[] nullTypes = new Class[0];\n \t// Static factory methods for creating SharedObjectMsg instances\n-\tpublic static SharedObjectMsg makeMsg(String className, String methodName,\n+\tpublic static SharedObjectMsg createMsg(String className, String methodName,\n \t\t\tObject[] param) {\n \t\tif (methodName == null || param == null) {\n \t\t\tthrow new NullPointerException(\n \t\t\t\t\t\"Invalid SharedObjectMsg construction\");\n \t\t}\n \t\treturn new SharedObjectMsg(className, methodName, param);\n \t}\n-\tpublic static SharedObjectMsg makeMsg(String methodName, Object[] param) {\n-\t\treturn makeMsg((String) null, methodName, param);\n+\tpublic static SharedObjectMsg createMsg(String methodName, Object[] param) {\n+\t\treturn createMsg((String) null, methodName, param);\n \t}\n-\tpublic static SharedObjectMsg makeMsg(String methodName) {\n-\t\treturn makeMsg((String) null, methodName, nullArgs);\n+\tpublic static SharedObjectMsg createMsg(String methodName) {\n+\t\treturn createMsg((String) null, methodName, nullArgs);\n \t}\n-\tpublic static SharedObjectMsg makeMsg(String className, String methodName) {\n-\t\treturn makeMsg(className, methodName, nullArgs);\n+\tpublic static SharedObjectMsg createMsg(String className, String methodName) {\n+\t\treturn createMsg(className, methodName, nullArgs);\n \t}\n-\tpublic static SharedObjectMsg makeMsg(String className, String methodName,\n+\tpublic static SharedObjectMsg createMsg(String className, String methodName,\n \t\t\tObject arg) {\n \t\tObject args[] = { arg };\n-\t\treturn makeMsg(className, methodName, args);\n+\t\treturn createMsg(className, methodName, args);\n \t}\n-\tpublic static SharedObjectMsg makeMsg(String methodName, Object arg) {\n-\t\treturn makeMsg((String) null, methodName, arg);\n+\tpublic static SharedObjectMsg createMsg(String methodName, Object arg) {\n+\t\treturn createMsg((String) null, methodName, arg);\n \t}\n-\tpublic static SharedObjectMsg makeMsg(String className, String methodName,\n+\tpublic static SharedObjectMsg createMsg(String className, String methodName,\n \t\t\tObject arg1, Object arg2) {\n \t\tObject args[] = { arg1, arg2 };\n-\t\treturn makeMsg(className, methodName, args);\n+\t\treturn createMsg(className, methodName, args);\n \t}\n-\tpublic static SharedObjectMsg makeMsg(String className, String methodName,\n+\tpublic static SharedObjectMsg createMsg(String className, String methodName,\n \t\t\tObject arg1, Object arg2, Object arg3) {\n \t\tObject args[] = { arg1, arg2, arg3 };\n-\t\treturn makeMsg(className, methodName, args);\n+\t\treturn createMsg(className, methodName, args);\n \t}\n-\tpublic static SharedObjectMsg makeMsg(String className, String methodName,\n+\tpublic static SharedObjectMsg createMsg(String className, String methodName,\n \t\t\tObject arg1, Object arg2, Object arg3, Object arg4) {\n \t\tObject args[] = { arg1, arg2, arg3, arg4 };\n-\t\treturn makeMsg(className, methodName, args);\n+\t\treturn createMsg(className, methodName, args);\n \t}\n-\tpublic static SharedObjectMsg makeMsg(String className, String methodName,\n+\tpublic static SharedObjectMsg createMsg(String className, String methodName,\n \t\t\tObject arg1, Object arg2, Object arg3, Object arg4, Object arg5) {\n \t\tObject args[] = { arg1, arg2, arg3, arg4, arg5 };\n-\t\treturn makeMsg(className, methodName, args);\n+\t\treturn createMsg(className, methodName, args);\n \t}\n \t/**\n \t * Utility for getting a Class instance from a String class name. Calls", "raw_url": "https://github.com/eclipse/ecf/raw/0d00787f0d8de19464aaac7bc951d9817fd7c518/framework%2Fbundles%2Forg.eclipse.ecf%2Fsrc%2Forg%2Feclipse%2Fecf%2Fcore%2Fsharedobject%2FSharedObjectMsg.java", "sha": "26a5f9b5e77d82fee7920453c9b860748699b934", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/eclipse/ecf/blob/0d00787f0d8de19464aaac7bc951d9817fd7c518/providers%2Fbundles%2Forg.eclipse.ecf.provider.jmdns%2Fsrc%2Forg%2Feclipse%2Fecf%2Fprovider%2Fjmdns%2Fcontainer%2FContainerInstantiator.java", "changes": 2, "contents_url": "https://api.github.com/repos/eclipse/ecf/contents/providers%2Fbundles%2Forg.eclipse.ecf.provider.jmdns%2Fsrc%2Forg%2Feclipse%2Fecf%2Fprovider%2Fjmdns%2Fcontainer%2FContainerInstantiator.java?ref=0d00787f0d8de19464aaac7bc951d9817fd7c518", "deletions": 1, "filename": "providers/bundles/org.eclipse.ecf.provider.jmdns/src/org/eclipse/ecf/provider/jmdns/container/ContainerInstantiator.java", "new_code": "\tpublic IContainer createInstance(", "new_methods": [], "old_code": "\tpublic IContainer makeInstance(", "old_methods": [], "patch": "@@ -15,7 +15,7 @@ public ContainerInstantiator() {\n \t\tsuper();\n \t}\n \n-\tpublic IContainer makeInstance(\n+\tpublic IContainer createInstance(\n \t\t\tContainerDescription description, Class[] argTypes,\n \t\t\tObject[] args) throws ContainerInstantiationException {\n \t\t\ttry {", "raw_url": "https://github.com/eclipse/ecf/raw/0d00787f0d8de19464aaac7bc951d9817fd7c518/providers%2Fbundles%2Forg.eclipse.ecf.provider.jmdns%2Fsrc%2Forg%2Feclipse%2Fecf%2Fprovider%2Fjmdns%2Fcontainer%2FContainerInstantiator.java", "sha": "669a843e8d4c55aaf5c4e6461dd92cb509d7c4a2", "status": "modified" }, { "additions": 21, "blob_url": "https://github.com/eclipse/ecf/blob/0d00787f0d8de19464aaac7bc951d9817fd7c518/providers%2Fbundles%2Forg.eclipse.ecf.provider.jmdns%2Fsrc%2Forg%2Feclipse%2Fecf%2Fprovider%2Fjmdns%2Fcontainer%2FJMDNSDiscoveryContainer.java", "changes": 42, "contents_url": "https://api.github.com/repos/eclipse/ecf/contents/providers%2Fbundles%2Forg.eclipse.ecf.provider.jmdns%2Fsrc%2Forg%2Feclipse%2Fecf%2Fprovider%2Fjmdns%2Fcontainer%2FJMDNSDiscoveryContainer.java?ref=0d00787f0d8de19464aaac7bc951d9817fd7c518", "deletions": 21, "filename": "providers/bundles/org.eclipse.ecf.provider.jmdns/src/org/eclipse/ecf/provider/jmdns/container/JMDNSDiscoveryContainer.java", "new_code": "\t\t\t\t.getDefault().createStringID(JMDNSDiscoveryContainer.class.getName()));\n\t\tIServiceInfo iinfo = createIServiceInfoFromServiceEvent(arg0);\n\t\tServiceID svcID = createServiceID(arg0.getType(), null);\n\t\tIServiceInfo iinfo = createIServiceInfoFromServiceEvent(arg0);\n\t\tServiceID svcID = createServiceID(arg0.getType(), null);\n\t\tIServiceInfo iinfo = createIServiceInfoFromServiceEvent(arg0);\n\t\tServiceID svcID = createServiceID(arg0.getType(), null);\n\t\t\t\t\t\t\t\tcreateIServiceInfoFromServiceEvent(arg0), config\n\t\t\t\treturn createIServiceInfoFromServiceInfo(jmdns.getServiceInfo(\n\t\t\t\t\t\tsvs[i] = createIServiceInfoFromServiceInfo(svcs[i]);\n\tprotected IServiceInfo createIServiceInfoFromServiceEvent(ServiceEvent event) {\n\t\tServiceID sID = createServiceID(event.getType(), event.getName());\n\t\t\treturn createIServiceInfoFromServiceInfo(sinfo);\n\tprotected IServiceInfo createIServiceInfoFromServiceInfo(\n\t\tServiceID sID = createServiceID(serviceInfo.getType(), serviceInfo\n\tprotected ServiceID createServiceID(String type, String name) {\n\t\t\tid = (ServiceID) IDFactory.getDefault().createID(JMDNS_NAMESPACE_ID, new Object[] {\n\t\t\t\ttrace.dumpStack(e, \"JDNSDiscoveryContainer.createServiceID\");\n\tprotected ServiceInfo createServiceInfoFromIServiceInfo(\n\t\t\tjmdns.registerService(createServiceInfoFromIServiceInfo(serviceInfo));\n\t\t\t\t\t\t.unregisterService(createServiceInfoFromIServiceInfo(serviceInfo));", "new_methods": [], "old_code": "\t\t\t\t.getDefault().makeStringID(JMDNSDiscoveryContainer.class.getName()));\n\t\tIServiceInfo iinfo = makeIServiceInfoFromServiceEvent(arg0);\n\t\tServiceID svcID = makeServiceID(arg0.getType(), null);\n\t\tIServiceInfo iinfo = makeIServiceInfoFromServiceEvent(arg0);\n\t\tServiceID svcID = makeServiceID(arg0.getType(), null);\n\t\tIServiceInfo iinfo = makeIServiceInfoFromServiceEvent(arg0);\n\t\tServiceID svcID = makeServiceID(arg0.getType(), null);\n\t\t\t\t\t\t\t\tmakeIServiceInfoFromServiceEvent(arg0), config\n\t\t\t\treturn makeIServiceInfoFromServiceInfo(jmdns.getServiceInfo(\n\t\t\t\t\t\tsvs[i] = makeIServiceInfoFromServiceInfo(svcs[i]);\n\tprotected IServiceInfo makeIServiceInfoFromServiceEvent(ServiceEvent event) {\n\t\tServiceID sID = makeServiceID(event.getType(), event.getName());\n\t\t\treturn makeIServiceInfoFromServiceInfo(sinfo);\n\tprotected IServiceInfo makeIServiceInfoFromServiceInfo(\n\t\tServiceID sID = makeServiceID(serviceInfo.getType(), serviceInfo\n\tprotected ServiceID makeServiceID(String type, String name) {\n\t\t\tid = (ServiceID) IDFactory.getDefault().makeID(JMDNS_NAMESPACE_ID, new Object[] {\n\t\t\t\ttrace.dumpStack(e, \"JDNSDiscoveryContainer.makeServiceID\");\n\tprotected ServiceInfo makeServiceInfoFromIServiceInfo(\n\t\t\tjmdns.registerService(makeServiceInfoFromIServiceInfo(serviceInfo));\n\t\t\t\t\t\t.unregisterService(makeServiceInfoFromIServiceInfo(serviceInfo));", "old_methods": [], "patch": "@@ -82,7 +82,7 @@ public JMDNSDiscoveryContainer(InetAddress addr) throws IOException,\n \t\ttrace(\"<init>\");\n \t\tintf = (addr == null) ? InetAddress.getLocalHost() : addr;\n \t\tthis.config = new ContainerConfig(IDFactory\n-\t\t\t\t.getDefault().makeStringID(JMDNSDiscoveryContainer.class.getName()));\n+\t\t\t\t.getDefault().createStringID(JMDNSDiscoveryContainer.class.getName()));\n \t}\n \n \tpublic void addServiceListener(ServiceID type, IServiceListener listener) {\n@@ -116,8 +116,8 @@ public void dispose() {\n \t}\n \n \tprotected void fireServiceAdded(ServiceEvent arg0) {\n-\t\tIServiceInfo iinfo = makeIServiceInfoFromServiceEvent(arg0);\n-\t\tServiceID svcID = makeServiceID(arg0.getType(), null);\n+\t\tIServiceInfo iinfo = createIServiceInfoFromServiceEvent(arg0);\n+\t\tServiceID svcID = createServiceID(arg0.getType(), null);\n \t\tsynchronized (serviceListeners) {\n \t\t\tVector v = (Vector) serviceListeners.get(svcID);\n \t\t\tif (v != null) {\n@@ -131,8 +131,8 @@ protected void fireServiceAdded(ServiceEvent arg0) {\n \t}\n \n \tprotected void fireServiceRemoved(ServiceEvent arg0) {\n-\t\tIServiceInfo iinfo = makeIServiceInfoFromServiceEvent(arg0);\n-\t\tServiceID svcID = makeServiceID(arg0.getType(), null);\n+\t\tIServiceInfo iinfo = createIServiceInfoFromServiceEvent(arg0);\n+\t\tServiceID svcID = createServiceID(arg0.getType(), null);\n \t\tsynchronized (serviceListeners) {\n \t\t\tVector v = (Vector) serviceListeners.get(svcID);\n \t\t\tif (v != null) {\n@@ -146,8 +146,8 @@ protected void fireServiceRemoved(ServiceEvent arg0) {\n \t}\n \n \tprotected void fireServiceResolved(ServiceEvent arg0) {\n-\t\tIServiceInfo iinfo = makeIServiceInfoFromServiceEvent(arg0);\n-\t\tServiceID svcID = makeServiceID(arg0.getType(), null);\n+\t\tIServiceInfo iinfo = createIServiceInfoFromServiceEvent(arg0);\n+\t\tServiceID svcID = createServiceID(arg0.getType(), null);\n \t\tsynchronized (serviceListeners) {\n \t\t\tVector v = (Vector) serviceListeners.get(svcID);\n \t\t\tif (v != null) {\n@@ -166,7 +166,7 @@ protected void fireServiceTypeAdded(ServiceEvent arg0) {\n \t\t\t\tIServiceTypeListener l = (IServiceTypeListener) i.next();\n \t\t\t\tl\n \t\t\t\t\t\t.serviceTypeAdded(new ServiceContainerEvent(\n-\t\t\t\t\t\t\t\tmakeIServiceInfoFromServiceEvent(arg0), config\n+\t\t\t\t\t\t\t\tcreateIServiceInfoFromServiceEvent(arg0), config\n \t\t\t\t\t\t\t\t\t\t.getID()));\n \t\t\t}\n \t\t}\n@@ -188,7 +188,7 @@ public IServiceInfo getServiceInfo(ServiceID service, int timeout) {\n \t\ttrace(\"getServiceInfo(\" + service + \",\" + timeout + \")\");\n \t\tsynchronized (lock) {\n \t\t\tif (jmdns != null) {\n-\t\t\t\treturn makeIServiceInfoFromServiceInfo(jmdns.getServiceInfo(\n+\t\t\t\treturn createIServiceInfoFromServiceInfo(jmdns.getServiceInfo(\n \t\t\t\t\t\tservice.getServiceType(), service.getServiceName(),\n \t\t\t\t\t\ttimeout));\n \t\t\t} else\n@@ -204,7 +204,7 @@ public IServiceInfo[] getServices(ServiceID type) {\n \t\t\t\tif (svcs != null) {\n \t\t\t\t\tsvs = new IServiceInfo[svcs.length];\n \t\t\t\t\tfor (int i = 0; i < svcs.length; i++) {\n-\t\t\t\t\t\tsvs[i] = makeIServiceInfoFromServiceInfo(svcs[i]);\n+\t\t\t\t\t\tsvs[i] = createIServiceInfoFromServiceInfo(svcs[i]);\n \t\t\t\t\t}\n \t\t\t\t}\n \t\t\t}\n@@ -257,22 +257,22 @@ public void disconnect() {\n \t\t\t\t.getID(), getConnectedID()));\n \t}\n \n-\tprotected IServiceInfo makeIServiceInfoFromServiceEvent(ServiceEvent event) {\n-\t\tServiceID sID = makeServiceID(event.getType(), event.getName());\n+\tprotected IServiceInfo createIServiceInfoFromServiceEvent(ServiceEvent event) {\n+\t\tServiceID sID = createServiceID(event.getType(), event.getName());\n \t\tServiceInfo sinfo = event.getInfo();\n \t\tif (sinfo != null) {\n-\t\t\treturn makeIServiceInfoFromServiceInfo(sinfo);\n+\t\t\treturn createIServiceInfoFromServiceInfo(sinfo);\n \t\t}\n \t\tIServiceInfo newInfo = new JMDNSServiceInfo(null, sID, -1, -1, -1,\n \t\t\t\tnew ServiceProperties());\n \t\treturn newInfo;\n \t}\n \n-\tprotected IServiceInfo makeIServiceInfoFromServiceInfo(\n+\tprotected IServiceInfo createIServiceInfoFromServiceInfo(\n \t\t\tfinal ServiceInfo serviceInfo) {\n \t\tif (serviceInfo == null)\n \t\t\treturn null;\n-\t\tServiceID sID = makeServiceID(serviceInfo.getType(), serviceInfo\n+\t\tServiceID sID = createServiceID(serviceInfo.getType(), serviceInfo\n \t\t\t\t.getName());\n \t\tInetAddress addr = serviceInfo.getAddress();\n \t\tint port = serviceInfo.getPort();\n@@ -297,20 +297,20 @@ public Object getProperty(String name) {\n \t\treturn newInfo;\n \t}\n \n-\tprotected ServiceID makeServiceID(String type, String name) {\n+\tprotected ServiceID createServiceID(String type, String name) {\n \t\tServiceID id = null;\n \t\ttry {\n-\t\t\tid = (ServiceID) IDFactory.getDefault().makeID(JMDNS_NAMESPACE_ID, new Object[] {\n+\t\t\tid = (ServiceID) IDFactory.getDefault().createID(JMDNS_NAMESPACE_ID, new Object[] {\n \t\t\t\t\ttype, name });\n \t\t} catch (IDInstantiationException e) {\n \t\t\t// Should never happen\n \t\t\tif (trace != null) {\n-\t\t\t\ttrace.dumpStack(e, \"JDNSDiscoveryContainer.makeServiceID\");\n+\t\t\t\ttrace.dumpStack(e, \"JDNSDiscoveryContainer.createServiceID\");\n \t\t\t}\n \t\t}\n \t\treturn id;\n \t}\n-\tprotected ServiceInfo makeServiceInfoFromIServiceInfo(\n+\tprotected ServiceInfo createServiceInfoFromIServiceInfo(\n \t\t\tIServiceInfo serviceInfo) {\n \t\tif (serviceInfo == null)\n \t\t\treturn null;\n@@ -366,7 +366,7 @@ protected void registerServiceWithJmDNS(IServiceInfo serviceInfo)\n \t\t\tif (trace != null) {\n \t\t\t\ttrace.msg(\"registering service with jmdns: \" + serviceInfo);\n \t\t\t}\n-\t\t\tjmdns.registerService(makeServiceInfoFromIServiceInfo(serviceInfo));\n+\t\t\tjmdns.registerService(createServiceInfoFromIServiceInfo(serviceInfo));\n \t\t}\n \t}\n \n@@ -480,7 +480,7 @@ public void unregisterService(IServiceInfo serviceInfo) {\n \t\t\t\t\t\t\t\t\t+ serviceInfo);\n \t\t\t\t}\n \t\t\t\tjmdns\n-\t\t\t\t\t\t.unregisterService(makeServiceInfoFromIServiceInfo(serviceInfo));\n+\t\t\t\t\t\t.unregisterService(createServiceInfoFromIServiceInfo(serviceInfo));\n \t\t\t}\n \t\t}\n \t}", "raw_url": "https://github.com/eclipse/ecf/raw/0d00787f0d8de19464aaac7bc951d9817fd7c518/providers%2Fbundles%2Forg.eclipse.ecf.provider.jmdns%2Fsrc%2Forg%2Feclipse%2Fecf%2Fprovider%2Fjmdns%2Fcontainer%2FJMDNSDiscoveryContainer.java", "sha": "51dfcc6e77ee76643bd6f5e135b2fecc174d91e7", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/eclipse/ecf/blob/0d00787f0d8de19464aaac7bc951d9817fd7c518/providers%2Fbundles%2Forg.eclipse.ecf.provider.jmdns%2Fsrc%2Forg%2Feclipse%2Fecf%2Fprovider%2Fjmdns%2Fidentity%2FJMDNSNamespace.java", "changes": 2, "contents_url": "https://api.github.com/repos/eclipse/ecf/contents/providers%2Fbundles%2Forg.eclipse.ecf.provider.jmdns%2Fsrc%2Forg%2Feclipse%2Fecf%2Fprovider%2Fjmdns%2Fidentity%2FJMDNSNamespace.java?ref=0d00787f0d8de19464aaac7bc951d9817fd7c518", "deletions": 1, "filename": "providers/bundles/org.eclipse.ecf.provider.jmdns/src/org/eclipse/ecf/provider/jmdns/identity/JMDNSNamespace.java", "new_code": "\tpublic ID createInstance(Class[] argTypes, Object[] args)", "new_methods": [], "old_code": "\tpublic ID makeInstance(Class[] argTypes, Object[] args)", "old_methods": [], "patch": "@@ -8,7 +8,7 @@ public class JMDNSNamespace extends Namespace {\n \tprivate static final long serialVersionUID = 1L;\n \tprivate static final String JMDNS_SCHEME = \"jmdns\";\n \t\n-\tpublic ID makeInstance(Class[] argTypes, Object[] args)\n+\tpublic ID createInstance(Class[] argTypes, Object[] args)\n \t\t\tthrows IDInstantiationException {\n \t\tString type = (String) args[0];\n \t\tString name = null;", "raw_url": "https://github.com/eclipse/ecf/raw/0d00787f0d8de19464aaac7bc951d9817fd7c518/providers%2Fbundles%2Forg.eclipse.ecf.provider.jmdns%2Fsrc%2Forg%2Feclipse%2Fecf%2Fprovider%2Fjmdns%2Fidentity%2FJMDNSNamespace.java", "sha": "ec76727a5d7b4ab8e2d331881ddce358af0b84e7", "status": "modified" }, { "additions": 6, "blob_url": "https://github.com/eclipse/ecf/blob/0d00787f0d8de19464aaac7bc951d9817fd7c518/providers%2Fbundles%2Forg.eclipse.ecf.provider.xmpp%2Fsrc%2Forg%2Feclipse%2Fecf%2Fprovider%2Fxmpp%2Fcontainer%2FContainerInstantiator.java", "changes": 12, "contents_url": "https://api.github.com/repos/eclipse/ecf/contents/providers%2Fbundles%2Forg.eclipse.ecf.provider.xmpp%2Fsrc%2Forg%2Feclipse%2Fecf%2Fprovider%2Fxmpp%2Fcontainer%2FContainerInstantiator.java?ref=0d00787f0d8de19464aaac7bc951d9817fd7c518", "deletions": 6, "filename": "providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/container/ContainerInstantiator.java", "new_code": " return IDFactory.getDefault().createGUID();\n return IDFactory.getDefault().createStringID((String) arg);\n return IDFactory.getDefault().createGUID(((Integer) arg).intValue());\n return IDFactory.getDefault().createGUID();\n * @see org.eclipse.ecf.core.provider.IContainerInstantiator#createInstance(.ContainerDescription,\n public IContainer createInstance(", "new_methods": [], "old_code": " return IDFactory.getDefault().makeGUID();\n return IDFactory.getDefault().makeStringID((String) arg);\n return IDFactory.getDefault().makeGUID(((Integer) arg).intValue());\n return IDFactory.getDefault().makeGUID();\n * @see org.eclipse.ecf.core.provider.IContainerInstantiator#makeInstance(.ContainerDescription,\n public IContainer makeInstance(", "old_methods": [], "patch": "@@ -28,13 +28,13 @@ protected ID getIDFromArg(Class type, Object arg)\n if (arg instanceof String) {\n String val = (String) arg;\n if (val == null || val.equals(\"\")) {\n- return IDFactory.getDefault().makeGUID();\n+ return IDFactory.getDefault().createGUID();\n } else\n- return IDFactory.getDefault().makeStringID((String) arg);\n+ return IDFactory.getDefault().createStringID((String) arg);\n } else if (arg instanceof Integer) {\n- return IDFactory.getDefault().makeGUID(((Integer) arg).intValue());\n+ return IDFactory.getDefault().createGUID(((Integer) arg).intValue());\n } else\n- return IDFactory.getDefault().makeGUID();\n+ return IDFactory.getDefault().createGUID();\n }\n \n protected Integer getIntegerFromArg(Class type, Object arg)\n@@ -50,10 +50,10 @@ else if (arg != null) {\n /*\n * (non-Javadoc)\n * \n- * @see org.eclipse.ecf.core.provider.IContainerInstantiator#makeInstance(.ContainerDescription,\n+ * @see org.eclipse.ecf.core.provider.IContainerInstantiator#createInstance(.ContainerDescription,\n * java.lang.Class[], java.lang.Object[])\n */\n- public IContainer makeInstance(\n+ public IContainer createInstance(\n ContainerDescription description, Class[] argTypes,\n Object[] args)\n throws ContainerInstantiationException {", "raw_url": "https://github.com/eclipse/ecf/raw/0d00787f0d8de19464aaac7bc951d9817fd7c518/providers%2Fbundles%2Forg.eclipse.ecf.provider.xmpp%2Fsrc%2Forg%2Feclipse%2Fecf%2Fprovider%2Fxmpp%2Fcontainer%2FContainerInstantiator.java", "sha": "e7bcd95a193d9d44227ec649a2bbf32063e12b91", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/eclipse/ecf/blob/0d00787f0d8de19464aaac7bc951d9817fd7c518/providers%2Fbundles%2Forg.eclipse.ecf.provider.xmpp%2Fsrc%2Forg%2Feclipse%2Fecf%2Fprovider%2Fxmpp%2Fcontainer%2FSecureContainerInstantiator.java", "changes": 2, "contents_url": "https://api.github.com/repos/eclipse/ecf/contents/providers%2Fbundles%2Forg.eclipse.ecf.provider.xmpp%2Fsrc%2Forg%2Feclipse%2Fecf%2Fprovider%2Fxmpp%2Fcontainer%2FSecureContainerInstantiator.java?ref=0d00787f0d8de19464aaac7bc951d9817fd7c518", "deletions": 1, "filename": "providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/container/SecureContainerInstantiator.java", "new_code": " public IContainer createInstance(", "new_methods": [], "old_code": " public IContainer makeInstance(", "old_methods": [], "patch": "@@ -8,7 +8,7 @@ public class SecureContainerInstantiator extends ContainerInstantiator {\n \tpublic SecureContainerInstantiator() {\n \t\tsuper();\n \t}\n- public IContainer makeInstance(\n+ public IContainer createInstance(\n ContainerDescription description, Class[] argTypes,\n Object[] args)\n throws ContainerInstantiationException {", "raw_url": "https://github.com/eclipse/ecf/raw/0d00787f0d8de19464aaac7bc951d9817fd7c518/providers%2Fbundles%2Forg.eclipse.ecf.provider.xmpp%2Fsrc%2Forg%2Feclipse%2Fecf%2Fprovider%2Fxmpp%2Fcontainer%2FSecureContainerInstantiator.java", "sha": "94c3067f8e1dfd4f2956224c0cc360cea3fc2f48", "status": "modified" }, { "additions": 14, "blob_url": "https://github.com/eclipse/ecf/blob/0d00787f0d8de19464aaac7bc951d9817fd7c518/providers%2Fbundles%2Forg.eclipse.ecf.provider.xmpp%2Fsrc%2Forg%2Feclipse%2Fecf%2Fprovider%2Fxmpp%2Fcontainer%2FXMPPClientSOContainer.java", "changes": 28, "contents_url": "https://api.github.com/repos/eclipse/ecf/contents/providers%2Fbundles%2Forg.eclipse.ecf.provider.xmpp%2Fsrc%2Forg%2Feclipse%2Fecf%2Fprovider%2Fxmpp%2Fcontainer%2FXMPPClientSOContainer.java?ref=0d00787f0d8de19464aaac7bc951d9817fd7c518", "deletions": 14, "filename": "providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/container/XMPPClientSOContainer.java", "new_code": "\t\tsuper(new SOContainerConfig(IDFactory.getDefault().createGUID()));\n\t\tsuper(new SOContainerConfig(IDFactory.getDefault().createStringID(userhost)));\n\tprotected ISynchAsynchConnection createConnection(ID remoteSpace,\n\tprotected Object createConnectData(ID target, Callback [] cbs, Object data) {\n\tprotected Callback[] createAuthorizationCallbacks() {\n\t\tsharedObjectID = IDFactory.getDefault().createStringID(XMPP_SHARED_OBJECT_ID);\n\tprotected SOContext createSharedObjectContext(SOConfig soconfig,\n\tprotected Presence createPresenceFromIPresence(IPresence presence) {\n\t\treturn sharedObject.createPresence(presence);\n\t\t\t\t\t\t\t\tPresence newPresence = createPresenceFromIPresence(presence);\n\t\t\t\t\t\tpublic IChatRoomContainer createChatRoomContainer() throws ContainerInstantiationException {\n protected ID createIDFromHostedRoom(HostedRoom room) {\n \t\tdumpStack(\"Exception in createIDFromHostedRoom(\"+room+\")\",e);\n \t\t\t\tID roomID = createIDFromHostedRoom(room);", "new_methods": [], "old_code": "\t\tsuper(new SOContainerConfig(IDFactory.getDefault().makeGUID()));\n\t\tsuper(new SOContainerConfig(IDFactory.getDefault().makeStringID(userhost)));\n\tprotected ISynchAsynchConnection makeConnection(ID remoteSpace,\n\tprotected Object makeConnectData(ID target, Callback [] cbs, Object data) {\n\tprotected Callback[] makeAuthorizationCallbacks() {\n\t\tsharedObjectID = IDFactory.getDefault().makeStringID(XMPP_SHARED_OBJECT_ID);\n\tprotected SOContext makeSharedObjectContext(SOConfig soconfig,\n\tprotected Presence makePresenceFromIPresence(IPresence presence) {\n\t\treturn sharedObject.makePresence(presence);\n\t\t\t\t\t\t\t\tPresence newPresence = makePresenceFromIPresence(presence);\n\t\t\t\t\t\tpublic IChatRoomContainer makeChatRoomContainer() throws ContainerInstantiationException {\n protected ID makeIDFromHostedRoom(HostedRoom room) {\n \t\tdumpStack(\"Exception in makeIDFromHostedRoom(\"+room+\")\",e);\n \t\t\t\tID roomID = makeIDFromHostedRoom(room);", "old_methods": [], "patch": "@@ -115,13 +115,13 @@ public XMPPClientSOContainer() throws Exception {\n \t}\n \n \tpublic XMPPClientSOContainer(int ka) throws Exception {\n-\t\tsuper(new SOContainerConfig(IDFactory.getDefault().makeGUID()));\n+\t\tsuper(new SOContainerConfig(IDFactory.getDefault().createGUID()));\n \t\tkeepAlive = ka;\n \t\tinitializeSharedObject();\n \t}\n \n \tpublic XMPPClientSOContainer(String userhost, int ka) throws Exception {\n-\t\tsuper(new SOContainerConfig(IDFactory.getDefault().makeStringID(userhost)));\n+\t\tsuper(new SOContainerConfig(IDFactory.getDefault().createStringID(userhost)));\n \t\tkeepAlive = ka;\n \t\tinitializeSharedObject();\n \t}\n@@ -190,7 +190,7 @@ public void dispose() {\n \t\tsuper.dispose();\n \t}\n \n-\tprotected ISynchAsynchConnection makeConnection(ID remoteSpace,\n+\tprotected ISynchAsynchConnection createConnection(ID remoteSpace,\n \t\t\tObject data) throws ConnectionInstantiationException {\n \t\tISynchAsynchConnection conn = null;\n \t\tboolean google = false;\n@@ -210,7 +210,7 @@ protected ISynchAsynchConnection makeConnection(ID remoteSpace,\n \t\treturn conn;\n \t}\n \n-\tprotected Object makeConnectData(ID target, Callback [] cbs, Object data) {\n+\tprotected Object createConnectData(ID target, Callback [] cbs, Object data) {\n \t\t// first one is password callback\n \t\tif (cbs.length > 0) {\n \t\t\tif (cbs[0] instanceof ObjectCallback) {\n@@ -221,7 +221,7 @@ protected Object makeConnectData(ID target, Callback [] cbs, Object data) {\n \t\treturn data;\n \t}\n \n-\tprotected Callback[] makeAuthorizationCallbacks() {\n+\tprotected Callback[] createAuthorizationCallbacks() {\n \t\tCallback [] cbs = new Callback[1];\n \t\tcbs[0] = new ObjectCallback();\n \t\treturn cbs;\n@@ -351,7 +351,7 @@ protected void handleXMPPMessage(Packet aPacket) throws IOException {\n \t}\n \n \tprotected void initializeSharedObject() throws Exception {\n-\t\tsharedObjectID = IDFactory.getDefault().makeStringID(XMPP_SHARED_OBJECT_ID);\n+\t\tsharedObjectID = IDFactory.getDefault().createStringID(XMPP_SHARED_OBJECT_ID);\n \t\tsharedObject = new XMPPPresenceSharedObject();\n \t}\n \n@@ -399,7 +399,7 @@ public void disconnect() {\n \t\tdispose();\n \t}\n \n-\tprotected SOContext makeSharedObjectContext(SOConfig soconfig,\n+\tprotected SOContext createSharedObjectContext(SOConfig soconfig,\n \t\t\tIQueueEnqueue queue) {\n \t\treturn new XMPPContainerContext(soconfig.getSharedObjectID(), soconfig\n \t\t\t\t.getHomeContainerID(), this, soconfig.getProperties(), queue);\n@@ -437,8 +437,8 @@ public void sendMessage(ID target, String message) throws IOException {\n \t\t}\n \t}\n \n-\tprotected Presence makePresenceFromIPresence(IPresence presence) {\n-\t\treturn sharedObject.makePresence(presence);\n+\tprotected Presence createPresenceFromIPresence(IPresence presence) {\n+\t\treturn sharedObject.createPresence(presence);\n \t}\n \tprotected void sendPresenceUpdate(ID target, Presence presence) throws IOException {\n \t\tif (messageSender != null) {\n@@ -490,7 +490,7 @@ public IPresenceSender getPresenceSender() {\n \t\t\t\t\treturn new IPresenceSender() {\n \t\t\t\t\t\tpublic void sendPresenceUpdate(ID fromID, ID toID, IPresence presence) {\n try {\n-\t\t\t\t\t\t\t\tPresence newPresence = makePresenceFromIPresence(presence);\n+\t\t\t\t\t\t\t\tPresence newPresence = createPresenceFromIPresence(presence);\n XMPPClientSOContainer.this.sendPresenceUpdate(toID,newPresence);\n } catch (IOException e) {\n dumpStack(\"Exception in sendPresenceUpdate to \"+toID+\" with presence \"+presence,e);\n@@ -551,7 +551,7 @@ public ID[] getChatRooms() {\n \t\t\t\t\t\tpublic IRoomInfo getChatRoomInfo(ID roomID) {\n \t\t\t\t\t\t\treturn XMPPClientSOContainer.this.getChatRoomInfo(roomID);\n \t\t\t\t\t\t}\n-\t\t\t\t\t\tpublic IChatRoomContainer makeChatRoomContainer() throws ContainerInstantiationException {\n+\t\t\t\t\t\tpublic IChatRoomContainer createChatRoomContainer() throws ContainerInstantiationException {\n \t\t\t\t\t\t\tIChatRoomContainer chatContainer = null;\n \t\t\t\t\t\t\ttry {\n \t\t\t\t\t\t\t\tchatContainer = new XMPPGroupChatSOContainer(XMPPClientSOContainer.this.getConnection(),sharedObject.getConnection(),getConnectNamespace());\n@@ -589,12 +589,12 @@ public IRoomInfo[] getChatRoomsInfo() {\n protected Collection getHostedRoomForService(String svc) throws XMPPException {\n \t\treturn MultiUserChat.getHostedRooms(sharedObject.getConnection(),svc);\n }\n- protected ID makeIDFromHostedRoom(HostedRoom room) {\n+ protected ID createIDFromHostedRoom(HostedRoom room) {\n \ttry {\n \t\treturn new XMPPRoomID(getConnectNamespace(),sharedObject.getConnection(),room.getJid(),room.getName());\n \t} catch (URISyntaxException e) {\n \t\t// debug output\n- \t\tdumpStack(\"Exception in makeIDFromHostedRoom(\"+room+\")\",e);\n+ \t\tdumpStack(\"Exception in createIDFromHostedRoom(\"+room+\")\",e);\n \t\treturn null;\n \t}\n }\n@@ -610,7 +610,7 @@ protected ID[] getChatRooms() {\n \t\t\tCollection rooms = getHostedRoomForService(svc);\n \t\t\tfor(Iterator roomsi = rooms.iterator(); roomsi.hasNext(); ) {\n \t\t\t\tHostedRoom room = (HostedRoom) roomsi.next();\n- \t\t\t\tID roomID = makeIDFromHostedRoom(room);\n+ \t\t\t\tID roomID = createIDFromHostedRoom(room);\n \t\t\t\tif (roomID != null) result.add(roomID);\n \t\t\t}\n \t\t}", "raw_url": "https://github.com/eclipse/ecf/raw/0d00787f0d8de19464aaac7bc951d9817fd7c518/providers%2Fbundles%2Forg.eclipse.ecf.provider.xmpp%2Fsrc%2Forg%2Feclipse%2Fecf%2Fprovider%2Fxmpp%2Fcontainer%2FXMPPClientSOContainer.java", "sha": "f5dd1d07f3ba889790b33e406d44101896bb4456", "status": "modified" }, { "additions": 9, "blob_url": "https://github.com/eclipse/ecf/blob/0d00787f0d8de19464aaac7bc951d9817fd7c518/providers%2Fbundles%2Forg.eclipse.ecf.provider.xmpp%2Fsrc%2Forg%2Feclipse%2Fecf%2Fprovider%2Fxmpp%2Fcontainer%2FXMPPGroupChatSOContainer.java", "changes": 24, "contents_url": "https://api.github.com/repos/eclipse/ecf/contents/providers%2Fbundles%2Forg.eclipse.ecf.provider.xmpp%2Fsrc%2Forg%2Feclipse%2Fecf%2Fprovider%2Fxmpp%2Fcontainer%2FXMPPGroupChatSOContainer.java?ref=0d00787f0d8de19464aaac7bc951d9817fd7c518", "deletions": 15, "filename": "providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/container/XMPPGroupChatSOContainer.java", "new_code": "\n\n\t\tthis(new SOContainerConfig(IDFactory.getDefault().createGUID()), conn,\n\t\tsharedObjectID = IDFactory.getDefault().createStringID(\n\tprotected SOContext createSharedObjectContext(SOConfig soconfig,\n\tprotected ID createChatRoomID(String groupName)\n\t\tID targetID = IDFactory.getDefault().createID(ns,\n\tprotected ISynchAsynchConnection createConnection(ID remoteSpace, Object data)\n\t\t\ttargetID = createChatRoomID(groupName);", "new_methods": [], "old_code": "\t\tthis(new SOContainerConfig(IDFactory.getDefault().makeGUID()), conn,\n\t\tsharedObjectID = IDFactory.getDefault().makeStringID(\n\t\t\t\t\t\t\tpublic void kicked(String arg0) {\n\t\t\t\t\t\t\t\t// TODO Auto-generated method stub\n\t\t\t\t\t\t\t\tSystem.out.println(\"kicked(\" + arg0 + \")\");\n\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\tpublic void banned(String arg0) {\n\t\t\t\t\t\t\t\t// TODO Auto-generated method stub\n\t\t\t\t\t\t\t\tSystem.out.println(\"banned(\" + arg0 + \")\");\n\t\t\t\t\t\t\t}\n\tprotected SOContext makeSharedObjectContext(SOConfig soconfig,\n\tprotected ID makeChatRoomID(String groupName)\n\t\tID targetID = IDFactory.getDefault().makeID(ns,\n\tprotected ISynchAsynchConnection makeConnection(ID remoteSpace, Object data)\n\t\t\ttargetID = makeChatRoomID(groupName);", "old_methods": [ { "arguments": [ "String arg0" ], "filename": "providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/container/XMPPGroupChatSOContainer.java", "implementation": "// TODO Auto-generated method stub\n\t\t\t\t\t\t\t\tSystem.out.println(\"kicked(\" + arg0 + \")\");", "signature": "void kicked(String arg0)" }, { "arguments": [ "String arg0" ], "filename": "providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/container/XMPPGroupChatSOContainer.java", "implementation": "// TODO Auto-generated method stub\n\t\t\t\t\t\t\t\tSystem.out.println(\"banned(\" + arg0 + \")\");", "signature": "void banned(String arg0)" } ], "patch": "@@ -10,9 +10,11 @@\n \n import java.io.IOException;\n import java.util.HashMap;\n+\n import javax.security.auth.callback.Callback;\n import javax.security.auth.callback.CallbackHandler;\n import javax.security.auth.callback.NameCallback;\n+\n import org.eclipse.ecf.core.ContainerConnectException;\n import org.eclipse.ecf.core.ISharedObjectContainerConfig;\n import org.eclipse.ecf.core.SharedObjectAddException;\n@@ -82,7 +84,7 @@ public XMPPGroupChatSOContainer(ISharedObjectContainerConfig config,\n \tpublic XMPPGroupChatSOContainer(ISynchAsynchConnection conn,\n \t\t\tXMPPConnection xmppconn, Namespace usernamespace)\n \t\t\tthrows IDInstantiationException {\n-\t\tthis(new SOContainerConfig(IDFactory.getDefault().makeGUID()), conn,\n+\t\tthis(new SOContainerConfig(IDFactory.getDefault().createGUID()), conn,\n \t\t\t\txmppconn, usernamespace);\n \t}\n \tpublic void dispose() {\n@@ -177,7 +179,7 @@ protected void handleInvitationMessage(XMPPConnection arg0, String arg1,\n \t\t}\n \t}\n \tprotected void initializeSharedObject() throws IDInstantiationException {\n-\t\tsharedObjectID = IDFactory.getDefault().makeStringID(\n+\t\tsharedObjectID = IDFactory.getDefault().createStringID(\n \t\t\t\tXMPP_GROUP_CHAT_SHARED_OBJECT_ID);\n \t\tsharedObject = new XMPPGroupChatSharedObject(usernamespace,\n \t\t\t\txmppconnection);\n@@ -261,10 +263,6 @@ public void joined(String arg0) {\n \t\t\t\t\t\t\tpublic void left(String arg0) {\n \t\t\t\t\t\t\t\thandleChatMembershipEvent(arg0, false);\n \t\t\t\t\t\t\t}\n-\t\t\t\t\t\t\tpublic void kicked(String arg0) {\n-\t\t\t\t\t\t\t\t// TODO Auto-generated method stub\n-\t\t\t\t\t\t\t\tSystem.out.println(\"kicked(\" + arg0 + \")\");\n-\t\t\t\t\t\t\t}\n \t\t\t\t\t\t\tpublic void voiceGranted(String arg0) {\n \t\t\t\t\t\t\t\t// TODO Auto-generated method stub\n \t\t\t\t\t\t\t\tSystem.out\n@@ -275,10 +273,6 @@ public void voiceRevoked(String arg0) {\n \t\t\t\t\t\t\t\tSystem.out\n \t\t\t\t\t\t\t\t\t\t.println(\"voiceRevoked(\" + arg0 + \")\");\n \t\t\t\t\t\t\t}\n-\t\t\t\t\t\t\tpublic void banned(String arg0) {\n-\t\t\t\t\t\t\t\t// TODO Auto-generated method stub\n-\t\t\t\t\t\t\t\tSystem.out.println(\"banned(\" + arg0 + \")\");\n-\t\t\t\t\t\t\t}\n \t\t\t\t\t\t\tpublic void membershipGranted(String arg0) {\n \t\t\t\t\t\t\t\t// TODO Auto-generated method stub\n \t\t\t\t\t\t\t\tSystem.out.println(\"membershipGranted(\" + arg0\n@@ -391,24 +385,24 @@ public void disconnect() {\n \t\tfireContainerEvent(new ContainerDisconnectedEvent(this\n \t\t\t\t.getID(), groupID));\n \t}\n-\tprotected SOContext makeSharedObjectContext(SOConfig soconfig,\n+\tprotected SOContext createSharedObjectContext(SOConfig soconfig,\n \t\t\tIQueueEnqueue queue) {\n \t\treturn new XMPPContainerContext(soconfig.getSharedObjectID(), soconfig\n \t\t\t\t.getHomeContainerID(), this, soconfig.getProperties(), queue);\n \t}\n-\tprotected ID makeChatRoomID(String groupName)\n+\tprotected ID createChatRoomID(String groupName)\n \t\t\tthrows IDInstantiationException {\n \t\tString username = xmppconnection.getUser();\n \t\tint atIndex = username.indexOf('@');\n \t\tif (atIndex > 0)\n \t\t\tusername = username.substring(0, atIndex);\n \t\tString host = xmppconnection.getHost();\n \t\tNamespace ns = getConnectNamespace();\n-\t\tID targetID = IDFactory.getDefault().makeID(ns,\n+\t\tID targetID = IDFactory.getDefault().createID(ns,\n \t\t\t\tnew Object[] { username, host, null, groupName, username });\n \t\treturn targetID;\n \t}\n-\tprotected ISynchAsynchConnection makeConnection(ID remoteSpace, Object data)\n+\tprotected ISynchAsynchConnection createConnection(ID remoteSpace, Object data)\n \t\t\tthrows ConnectionInstantiationException {\n \t\treturn null;\n \t}\n@@ -436,7 +430,7 @@ public void sendMessage(String messageBody) throws IOException {\n \tpublic void connect(String groupName) throws ContainerConnectException {\n \t\tID targetID = null;\n \t\ttry {\n-\t\t\ttargetID = makeChatRoomID(groupName);\n+\t\t\ttargetID = createChatRoomID(groupName);\n \t\t} catch (IDInstantiationException e) {\n \t\t\tthrow new ContainerConnectException(\n \t\t\t\t\t\"Exception creating chat room id\", e);", "raw_url": "https://github.com/eclipse/ecf/raw/0d00787f0d8de19464aaac7bc951d9817fd7c518/providers%2Fbundles%2Forg.eclipse.ecf.provider.xmpp%2Fsrc%2Forg%2Feclipse%2Fecf%2Fprovider%2Fxmpp%2Fcontainer%2FXMPPGroupChatSOContainer.java", "sha": "d81f6824899a6aef7f9583d95ce126d46f7a1685", "status": "modified" }, { "additions": 19, "blob_url": "https://github.com/eclipse/ecf/blob/0d00787f0d8de19464aaac7bc951d9817fd7c518/providers%2Fbundles%2Forg.eclipse.ecf.provider.xmpp%2Fsrc%2Forg%2Feclipse%2Fecf%2Fprovider%2Fxmpp%2Fcontainer%2FXMPPGroupChatSharedObject.java", "changes": 38, "contents_url": "https://api.github.com/repos/eclipse/ecf/contents/providers%2Fbundles%2Forg.eclipse.ecf.provider.xmpp%2Fsrc%2Forg%2Feclipse%2Fecf%2Fprovider%2Fxmpp%2Fcontainer%2FXMPPGroupChatSharedObject.java?ref=0d00787f0d8de19464aaac7bc951d9817fd7c518", "deletions": 19, "filename": "providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/container/XMPPGroupChatSharedObject.java", "new_code": " protected ID createUserIDFromName(String name) {\n dumpStack(\"Exception in createIDFromName\", e);\n protected IMessageListener.Type createMessageType(Message.Type type) {\n protected ID createRoomIDFromName(String from) {\n dumpStack(\"Exception in createRoomIDFromName\", e);\n ID fromID = createUserIDFromName(canonicalizeRoomFrom(from));\n ID toID = createUserIDFromName(canonicalizeRoomTo(to));\n if (msg != null) fireMessage(fromID, toID, createMessageType(msg.getType()), subject, body);\n protected IPresence.Type createIPresenceType(Presence xmppPresence) {\n protected IPresence.Mode createIPresenceMode(Presence xmppPresence) {\n protected IPresence createIPresence(Presence xmppPresence) {\n createIPresenceType(xmppPresence), priority, status,\n createIPresenceMode(xmppPresence));\n IPresence newPresence = createIPresence(xmppPresence);\n ID fromID = createUserIDFromName(from);\n ID fromID = createUserIDFromName(from);\n\t \tID roomID = createRoomIDFromName(event.getRoom());\n\t \tID fromID = createUserIDFromName(event.getInviter());\n\t \tID toID = createUserIDFromName(mess.getTo());", "new_methods": [], "old_code": " protected ID makeUserIDFromName(String name) {\n dumpStack(\"Exception in makeIDFromName\", e);\n protected IMessageListener.Type makeMessageType(Message.Type type) {\n protected ID makeRoomIDFromName(String from) {\n dumpStack(\"Exception in makeRoomIDFromName\", e);\n ID fromID = makeUserIDFromName(canonicalizeRoomFrom(from));\n ID toID = makeUserIDFromName(canonicalizeRoomTo(to));\n if (msg != null) fireMessage(fromID, toID, makeMessageType(msg.getType()), subject, body);\n protected IPresence.Type makeIPresenceType(Presence xmppPresence) {\n protected IPresence.Mode makeIPresenceMode(Presence xmppPresence) {\n protected IPresence makeIPresence(Presence xmppPresence) {\n makeIPresenceType(xmppPresence), priority, status,\n makeIPresenceMode(xmppPresence));\n IPresence newPresence = makeIPresence(xmppPresence);\n ID fromID = makeUserIDFromName(from);\n ID fromID = makeUserIDFromName(from);\n\t \tID roomID = makeRoomIDFromName(event.getRoom());\n\t \tID fromID = makeUserIDFromName(event.getInviter());\n\t \tID toID = makeUserIDFromName(mess.getTo());", "old_methods": [], "patch": "@@ -91,13 +91,13 @@ public void init(ISharedObjectConfig initData)\n this.config = initData;\n }\n \n- protected ID makeUserIDFromName(String name) {\n+ protected ID createUserIDFromName(String name) {\n ID result = null;\n try {\n result = new XMPPID(usernamespace,name);\n return result;\n } catch (Exception e) {\n- dumpStack(\"Exception in makeIDFromName\", e);\n+ dumpStack(\"Exception in createIDFromName\", e);\n return null;\n }\n }\n@@ -125,7 +125,7 @@ protected String canonicalizeRoomFrom(String from) {\n }\n return from;\n }\n- protected IMessageListener.Type makeMessageType(Message.Type type) {\n+ protected IMessageListener.Type createMessageType(Message.Type type) {\n if (type == null)\n return IMessageListener.Type.NORMAL;\n if (type == Message.Type.CHAT) {\n@@ -158,11 +158,11 @@ protected String canonicalizeRoomTo(String to) {\n return to;\n }\n \n- protected ID makeRoomIDFromName(String from) {\n+ protected ID createRoomIDFromName(String from) {\n \ttry {\n \t\treturn new XMPPRoomID(usernamespace,connection,from);\n \t} catch (URISyntaxException e) {\n- dumpStack(\"Exception in makeRoomIDFromName\", e);\n+ dumpStack(\"Exception in createRoomIDFromName\", e);\n return null;\n \t}\n }\n@@ -173,13 +173,13 @@ protected void handleMessageEvent(MessageEvent evt) {\n String to = msg.getTo();\n String body = msg.getBody();\n String subject = msg.getSubject();\n- ID fromID = makeUserIDFromName(canonicalizeRoomFrom(from));\n- ID toID = makeUserIDFromName(canonicalizeRoomTo(to));\n+ ID fromID = createUserIDFromName(canonicalizeRoomFrom(from));\n+ ID toID = createUserIDFromName(canonicalizeRoomTo(to));\n msg = filterMessageType(msg);\n- if (msg != null) fireMessage(fromID, toID, makeMessageType(msg.getType()), subject, body);\n+ if (msg != null) fireMessage(fromID, toID, createMessageType(msg.getType()), subject, body);\n }\n \n- protected IPresence.Type makeIPresenceType(Presence xmppPresence) {\n+ protected IPresence.Type createIPresenceType(Presence xmppPresence) {\n if (xmppPresence == null)\n return IPresence.Type.AVAILABLE;\n Type type = xmppPresence.getType();\n@@ -201,7 +201,7 @@ protected IPresence.Type makeIPresenceType(Presence xmppPresence) {\n return IPresence.Type.AVAILABLE;\n }\n \n- protected IPresence.Mode makeIPresenceMode(Presence xmppPresence) {\n+ protected IPresence.Mode createIPresenceMode(Presence xmppPresence) {\n if (xmppPresence == null)\n return IPresence.Mode.AVAILABLE;\n Mode mode = xmppPresence.getMode();\n@@ -220,26 +220,26 @@ protected IPresence.Mode makeIPresenceMode(Presence xmppPresence) {\n }\n return IPresence.Mode.AVAILABLE;\n }\n- protected IPresence makeIPresence(Presence xmppPresence) {\n+ protected IPresence createIPresence(Presence xmppPresence) {\n int priority = xmppPresence.getPriority();\n String status = xmppPresence.getStatus();\n IPresence newPresence = new org.eclipse.ecf.presence.impl.Presence(\n- makeIPresenceType(xmppPresence), priority, status,\n- makeIPresenceMode(xmppPresence));\n+ createIPresenceType(xmppPresence), priority, status,\n+ createIPresenceMode(xmppPresence));\n return newPresence;\n }\n \n protected void handlePresenceEvent(PresenceEvent evt) {\n Presence xmppPresence = evt.getPresence();\n String from = canonicalizeRoomFrom(xmppPresence.getFrom());\n- IPresence newPresence = makeIPresence(xmppPresence);\n- ID fromID = makeUserIDFromName(from);\n+ IPresence newPresence = createIPresence(xmppPresence);\n+ ID fromID = createUserIDFromName(from);\n \t\tfireParticipant(fromID, newPresence);\n }\n \n protected void handleChatMembershipEvent(ChatMembershipEvent evt) {\n \tString from = canonicalizeRoomFrom(evt.getFrom());\n- ID fromID = makeUserIDFromName(from);\n+ ID fromID = createUserIDFromName(from);\n fireChatParticipant(fromID,evt.isAdd());\n }\n protected void fireParticipant(ID fromID, IPresence presence) {\n@@ -292,10 +292,10 @@ public void handleEvent(Event event) {\n protected void handleInvitationEvent(InvitationReceivedEvent event) {\n \tXMPPConnection conn = event.getConnection();\n \tif (conn == connection) {\n-\t \tID roomID = makeRoomIDFromName(event.getRoom());\n-\t \tID fromID = makeUserIDFromName(event.getInviter());\n+\t \tID roomID = createRoomIDFromName(event.getRoom());\n+\t \tID fromID = createUserIDFromName(event.getInviter());\n \t \tMessage mess = event.getMessage();\n-\t \tID toID = makeUserIDFromName(mess.getTo());\n+\t \tID toID = createUserIDFromName(mess.getTo());\n \t \tString subject = mess.getSubject();\n \t \tString body = event.getReason();\n \t \tfireInvitationReceived(roomID,fromID,toID,subject,body);", "raw_url": "https://github.com/eclipse/ecf/raw/0d00787f0d8de19464aaac7bc951d9817fd7c518/providers%2Fbundles%2Forg.eclipse.ecf.provider.xmpp%2Fsrc%2Forg%2Feclipse%2Fecf%2Fprovider%2Fxmpp%2Fcontainer%2FXMPPGroupChatSharedObject.java", "sha": "672502b4cec3024d4ec35775d1d78d7fec871aff", "status": "modified" }, { "additions": 34, "blob_url": "https://github.com/eclipse/ecf/blob/0d00787f0d8de19464aaac7bc951d9817fd7c518/providers%2Fbundles%2Forg.eclipse.ecf.provider.xmpp%2Fsrc%2Forg%2Feclipse%2Fecf%2Fprovider%2Fxmpp%2Fcontainer%2FXMPPPresenceSharedObject.java", "changes": 68, "contents_url": "https://api.github.com/repos/eclipse/ecf/contents/providers%2Fbundles%2Forg.eclipse.ecf.provider.xmpp%2Fsrc%2Forg%2Feclipse%2Fecf%2Fprovider%2Fxmpp%2Fcontainer%2FXMPPPresenceSharedObject.java?ref=0d00787f0d8de19464aaac7bc951d9817fd7c518", "deletions": 34, "filename": "providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/container/XMPPPresenceSharedObject.java", "new_code": " IRosterEntry entry = createRosterEntry((RosterPacket.Item) i\n ID fromID = createIDFromName(canonicalizePresenceFrom(from));\n ID toID = createIDFromName(canonicalizePresenceFrom(to));\n if (msg != null) fireMessage(fromID, toID, createMessageType(msg.getType()), subject, body);\n IPresence newPresence = createIPresence(xmppPresence);\n ID fromID = createIDFromName(from);\n IRosterEntry entry = createRosterEntry((RosterEntry) i.next());\n protected ID createIDFromName(String name) {\n result = IDFactory.getDefault().createID(namespace, new Object[] { name });\n dumpStack(\"Exception in createIDFromName\", e);\n protected IRosterEntry.InterestType createInterestType(\n protected IMessageListener.Type createMessageType(Message.Type type) {\n protected IPresence createIPresence(Presence xmppPresence) {\n createIPresenceType(xmppPresence), priority, status,\n createIPresenceMode(xmppPresence));\n protected Presence createPresence(IPresence ipresence) {\n createPresenceType(ipresence), status, priority,\n createPresenceMode(ipresence));\n protected IPresence.Mode createIPresenceMode(Presence xmppPresence) {\n protected Presence.Mode createPresenceMode(IPresence ipresence) {\n protected IPresence.Type createIPresenceType(Presence xmppPresence) {\n protected Presence.Type createPresenceType(IPresence ipresence) {\n protected IRosterEntry createRosterEntry(RosterEntry entry) {\n ID userID = createIDFromName(entry.getUser());\n IRosterEntry.InterestType iType = createInterestType(itemType);\n IRosterGroup localGrp = createRosterGroup(grp);\n dumpStack(\"Exception in createRosterEntry\", e);\n protected IRosterEntry createRosterEntry(RosterPacket.Item entry) {\n ID userID = createIDFromName(entry.getUser());\n IRosterEntry.InterestType iType = createInterestType(itemType);\n IRosterGroup localGrp = createRosterGroup(grp);\n dumpStack(\"Exception in createRosterEntry\", e);\n protected IRosterGroup createRosterGroup(RosterGroup grp) {\n protected IRosterGroup createRosterGroup(String grp) {", "new_methods": [ { "arguments": [ "String name" ], "filename": "providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/container/XMPPPresenceSharedObject.java", "implementation": "result = IDFactory.getDefault().createID(namespace, new Object[] { name", "signature": "ID createIDFromName(String name)" } ], "old_code": " IRosterEntry entry = makeRosterEntry((RosterPacket.Item) i\n ID fromID = makeIDFromName(canonicalizePresenceFrom(from));\n ID toID = makeIDFromName(canonicalizePresenceFrom(to));\n if (msg != null) fireMessage(fromID, toID, makeMessageType(msg.getType()), subject, body);\n IPresence newPresence = makeIPresence(xmppPresence);\n ID fromID = makeIDFromName(from);\n IRosterEntry entry = makeRosterEntry((RosterEntry) i.next());\n protected ID makeIDFromName(String name) {\n result = IDFactory.getDefault().makeID(namespace, new Object[] { name });\n dumpStack(\"Exception in makeIDFromName\", e);\n protected IRosterEntry.InterestType makeInterestType(\n protected IMessageListener.Type makeMessageType(Message.Type type) {\n protected IPresence makeIPresence(Presence xmppPresence) {\n makeIPresenceType(xmppPresence), priority, status,\n makeIPresenceMode(xmppPresence));\n protected Presence makePresence(IPresence ipresence) {\n makePresenceType(ipresence), status, priority,\n makePresenceMode(ipresence));\n protected IPresence.Mode makeIPresenceMode(Presence xmppPresence) {\n protected Presence.Mode makePresenceMode(IPresence ipresence) {\n protected IPresence.Type makeIPresenceType(Presence xmppPresence) {\n protected Presence.Type makePresenceType(IPresence ipresence) {\n protected IRosterEntry makeRosterEntry(RosterEntry entry) {\n ID userID = makeIDFromName(entry.getUser());\n IRosterEntry.InterestType iType = makeInterestType(itemType);\n IRosterGroup localGrp = makeRosterGroup(grp);\n dumpStack(\"Exception in makeRosterEntry\", e);\n protected IRosterEntry makeRosterEntry(RosterPacket.Item entry) {\n ID userID = makeIDFromName(entry.getUser());\n IRosterEntry.InterestType iType = makeInterestType(itemType);\n IRosterGroup localGrp = makeRosterGroup(grp);\n dumpStack(\"Exception in makeRosterEntry\", e);\n protected IRosterGroup makeRosterGroup(RosterGroup grp) {\n protected IRosterGroup makeRosterGroup(String grp) {", "old_methods": [ { "arguments": [ "String name" ], "filename": "providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/container/XMPPPresenceSharedObject.java", "implementation": "result = IDFactory.getDefault().makeID(namespace, new Object[] { name", "signature": "ID makeIDFromName(String name)" } ], "patch": "@@ -274,7 +274,7 @@ protected void handleIQEvent(IQEvent evt) {\n RosterPacket rosterPacket = (RosterPacket) iq;\n \t\t\tif (rosterPacket.getType() == IQ.Type.SET || rosterPacket.getType() == IQ.Type.RESULT) {\n for (Iterator i = rosterPacket.getRosterItems(); i.hasNext();) {\n- IRosterEntry entry = makeRosterEntry((RosterPacket.Item) i\n+ IRosterEntry entry = createRosterEntry((RosterPacket.Item) i\n .next());\n fireSetRosterEntry(entry);\n }\n@@ -303,17 +303,17 @@ protected void handleMessageEvent(MessageEvent evt) {\n String to = msg.getTo();\n String body = msg.getBody();\n String subject = msg.getSubject();\n- ID fromID = makeIDFromName(canonicalizePresenceFrom(from));\n- ID toID = makeIDFromName(canonicalizePresenceFrom(to));\n+ ID fromID = createIDFromName(canonicalizePresenceFrom(from));\n+ ID toID = createIDFromName(canonicalizePresenceFrom(to));\n msg = filterMessageType(msg);\n- if (msg != null) fireMessage(fromID, toID, makeMessageType(msg.getType()), subject, body);\n+ if (msg != null) fireMessage(fromID, toID, createMessageType(msg.getType()), subject, body);\n }\n \n protected void handlePresenceEvent(PresenceEvent evt) {\n Presence xmppPresence = evt.getPresence();\n String from = canonicalizePresenceFrom(xmppPresence.getFrom());\n- IPresence newPresence = makeIPresence(xmppPresence);\n- ID fromID = makeIDFromName(from);\n+ IPresence newPresence = createIPresence(xmppPresence);\n+ ID fromID = createIDFromName(from);\n \t\tif (newPresence.getType().equals(IPresence.Type.SUBSCRIBE) || \n \t\t\t\tnewPresence.getType().equals(IPresence.Type.UNSUBSCRIBE) ||\n \t\t\t\tnewPresence.getType().equals(IPresence.Type.SUBSCRIBED) ||\n@@ -324,7 +324,7 @@ protected void handlePresenceEvent(PresenceEvent evt) {\n \n protected void handleRoster(Roster roster) {\n for (Iterator i = roster.getEntries(); i.hasNext();) {\n- IRosterEntry entry = makeRosterEntry((RosterEntry) i.next());\n+ IRosterEntry entry = createRosterEntry((RosterEntry) i.next());\n fireRosterEntry(entry);\n }\n }\n@@ -340,18 +340,18 @@ public void init(ISharedObjectConfig initData)\n this.namespace = getContext().getConnectNamespace();\n }\n \n- protected ID makeIDFromName(String name) {\n+ protected ID createIDFromName(String name) {\n ID result = null;\n try {\n- result = IDFactory.getDefault().makeID(namespace, new Object[] { name });\n+ result = IDFactory.getDefault().createID(namespace, new Object[] { name });\n return result;\n } catch (Exception e) {\n- dumpStack(\"Exception in makeIDFromName\", e);\n+ dumpStack(\"Exception in createIDFromName\", e);\n return null;\n }\n }\n \n- protected IRosterEntry.InterestType makeInterestType(\n+ protected IRosterEntry.InterestType createInterestType(\n RosterPacket.ItemType itemType) {\n if (itemType == RosterPacket.ItemType.BOTH) {\n return IRosterEntry.InterestType.BOTH;\n@@ -367,7 +367,7 @@ protected IRosterEntry.InterestType makeInterestType(\n return IRosterEntry.InterestType.BOTH;\n }\n \n- protected IMessageListener.Type makeMessageType(Message.Type type) {\n+ protected IMessageListener.Type createMessageType(Message.Type type) {\n if (type == null)\n return IMessageListener.Type.NORMAL;\n if (type == Message.Type.CHAT) {\n@@ -384,25 +384,25 @@ protected IMessageListener.Type makeMessageType(Message.Type type) {\n return IMessageListener.Type.NORMAL;\n }\n \n- protected IPresence makeIPresence(Presence xmppPresence) {\n+ protected IPresence createIPresence(Presence xmppPresence) {\n int priority = xmppPresence.getPriority();\n String status = xmppPresence.getStatus();\n IPresence newPresence = new org.eclipse.ecf.presence.impl.Presence(\n- makeIPresenceType(xmppPresence), priority, status,\n- makeIPresenceMode(xmppPresence));\n+ createIPresenceType(xmppPresence), priority, status,\n+ createIPresenceMode(xmppPresence));\n return newPresence;\n }\n \n- protected Presence makePresence(IPresence ipresence) {\n+ protected Presence createPresence(IPresence ipresence) {\n int priority = ipresence.getPriority();\n String status = ipresence.getStatus();\n Presence newPresence = new Presence(\n- makePresenceType(ipresence), status, priority,\n- makePresenceMode(ipresence));\n+ createPresenceType(ipresence), status, priority,\n+ createPresenceMode(ipresence));\n return newPresence;\n }\n \n- protected IPresence.Mode makeIPresenceMode(Presence xmppPresence) {\n+ protected IPresence.Mode createIPresenceMode(Presence xmppPresence) {\n if (xmppPresence == null)\n return IPresence.Mode.AVAILABLE;\n Mode mode = xmppPresence.getMode();\n@@ -422,7 +422,7 @@ protected IPresence.Mode makeIPresenceMode(Presence xmppPresence) {\n return IPresence.Mode.AVAILABLE;\n }\n \n- protected Presence.Mode makePresenceMode(IPresence ipresence) {\n+ protected Presence.Mode createPresenceMode(IPresence ipresence) {\n if (ipresence == null)\n return Presence.Mode.AVAILABLE;\n IPresence.Mode mode = ipresence.getMode();\n@@ -442,7 +442,7 @@ protected Presence.Mode makePresenceMode(IPresence ipresence) {\n return Presence.Mode.AVAILABLE;\n }\n \n- protected IPresence.Type makeIPresenceType(Presence xmppPresence) {\n+ protected IPresence.Type createIPresenceType(Presence xmppPresence) {\n if (xmppPresence == null)\n return IPresence.Type.AVAILABLE;\n Type type = xmppPresence.getType();\n@@ -464,7 +464,7 @@ protected IPresence.Type makeIPresenceType(Presence xmppPresence) {\n return IPresence.Type.AVAILABLE;\n }\n \n- protected Presence.Type makePresenceType(IPresence ipresence) {\n+ protected Presence.Type createPresenceType(IPresence ipresence) {\n if (ipresence == null)\n return Presence.Type.AVAILABLE;\n IPresence.Type type = ipresence.getType();\n@@ -486,55 +486,55 @@ protected Presence.Type makePresenceType(IPresence ipresence) {\n return Presence.Type.AVAILABLE;\n }\n \n- protected IRosterEntry makeRosterEntry(RosterEntry entry) {\n+ protected IRosterEntry createRosterEntry(RosterEntry entry) {\n try {\n- ID userID = makeIDFromName(entry.getUser());\n+ ID userID = createIDFromName(entry.getUser());\n String name = entry.getName();\n RosterPacket.ItemType itemType = entry.getType();\n- IRosterEntry.InterestType iType = makeInterestType(itemType);\n+ IRosterEntry.InterestType iType = createInterestType(itemType);\n ID svcID = getContext().getConnectedID();\n IRosterEntry newEntry = new org.eclipse.ecf.presence.impl.RosterEntry(svcID,\n userID, name, iType);\n Iterator grps = entry.getGroups();\n for (; grps.hasNext();) {\n RosterGroup grp = (RosterGroup) grps.next();\n- IRosterGroup localGrp = makeRosterGroup(grp);\n+ IRosterGroup localGrp = createRosterGroup(grp);\n newEntry.add(localGrp);\n }\n return newEntry;\n } catch (Exception e) {\n- dumpStack(\"Exception in makeRosterEntry\", e);\n+ dumpStack(\"Exception in createRosterEntry\", e);\n }\n return null;\n }\n \n- protected IRosterEntry makeRosterEntry(RosterPacket.Item entry) {\n+ protected IRosterEntry createRosterEntry(RosterPacket.Item entry) {\n try {\n- ID userID = makeIDFromName(entry.getUser());\n+ ID userID = createIDFromName(entry.getUser());\n String name = entry.getName();\n RosterPacket.ItemType itemType = entry.getItemType();\n- IRosterEntry.InterestType iType = makeInterestType(itemType);\n+ IRosterEntry.InterestType iType = createInterestType(itemType);\n ID svcID = getContext().getConnectedID();\n IRosterEntry newEntry = new org.eclipse.ecf.presence.impl.RosterEntry(svcID,\n userID, name, iType);\n Iterator grps = entry.getGroupNames();\n for (; grps.hasNext();) {\n String grp = (String) grps.next();\n- IRosterGroup localGrp = makeRosterGroup(grp);\n+ IRosterGroup localGrp = createRosterGroup(grp);\n newEntry.add(localGrp);\n }\n return newEntry;\n } catch (Exception e) {\n- dumpStack(\"Exception in makeRosterEntry\", e);\n+ dumpStack(\"Exception in createRosterEntry\", e);\n }\n return null;\n }\n \n- protected IRosterGroup makeRosterGroup(RosterGroup grp) {\n+ protected IRosterGroup createRosterGroup(RosterGroup grp) {\n return new org.eclipse.ecf.presence.impl.RosterGroup(grp.getName());\n }\n \n- protected IRosterGroup makeRosterGroup(String grp) {\n+ protected IRosterGroup createRosterGroup(String grp) {\n return new org.eclipse.ecf.presence.impl.RosterGroup(grp);\n }\n ", "raw_url": "https://github.com/eclipse/ecf/raw/0d00787f0d8de19464aaac7bc951d9817fd7c518/providers%2Fbundles%2Forg.eclipse.ecf.provider.xmpp%2Fsrc%2Forg%2Feclipse%2Fecf%2Fprovider%2Fxmpp%2Fcontainer%2FXMPPPresenceSharedObject.java", "sha": "85aa576038278e0e1be6b3a42215f8a6fdc53c75", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/eclipse/ecf/blob/0d00787f0d8de19464aaac7bc951d9817fd7c518/providers%2Fbundles%2Forg.eclipse.ecf.provider.xmpp%2Fsrc%2Forg%2Feclipse%2Fecf%2Fprovider%2Fxmpp%2Fcontainer%2FXMPPSClientSOContainer.java", "changes": 2, "contents_url": "https://api.github.com/repos/eclipse/ecf/contents/providers%2Fbundles%2Forg.eclipse.ecf.provider.xmpp%2Fsrc%2Forg%2Feclipse%2Fecf%2Fprovider%2Fxmpp%2Fcontainer%2FXMPPSClientSOContainer.java?ref=0d00787f0d8de19464aaac7bc951d9817fd7c518", "deletions": 1, "filename": "providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/container/XMPPSClientSOContainer.java", "new_code": "\tprotected ISynchAsynchConnection createConnection(ID remoteSpace,", "new_methods": [], "old_code": "\tprotected ISynchAsynchConnection makeConnection(ID remoteSpace,", "old_methods": [], "patch": "@@ -34,7 +34,7 @@ public XMPPSClientSOContainer(String userhost, int ka) throws Exception {\n \tpublic Namespace getConnectNamespace() {\n \t\treturn IDFactory.getDefault().getNamespaceByName(XmppPlugin.getDefault().getSecureNamespaceIdentifier());\n \t}\n-\tprotected ISynchAsynchConnection makeConnection(ID remoteSpace,\n+\tprotected ISynchAsynchConnection createConnection(ID remoteSpace,\n \t\t\tObject data) throws ConnectionInstantiationException {\n \t\tISynchAsynchConnection conn = null;\n \t\tboolean google = false;", "raw_url": "https://github.com/eclipse/ecf/raw/0d00787f0d8de19464aaac7bc951d9817fd7c518/providers%2Fbundles%2Forg.eclipse.ecf.provider.xmpp%2Fsrc%2Forg%2Feclipse%2Fecf%2Fprovider%2Fxmpp%2Fcontainer%2FXMPPSClientSOContainer.java", "sha": "4387a4cc05abe99b9a2014c2b77de72dfbb95b36", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/eclipse/ecf/blob/0d00787f0d8de19464aaac7bc951d9817fd7c518/providers%2Fbundles%2Forg.eclipse.ecf.provider.xmpp%2Fsrc%2Forg%2Feclipse%2Fecf%2Fprovider%2Fxmpp%2Fidentity%2FXMPPNamespace.java", "changes": 2, "contents_url": "https://api.github.com/repos/eclipse/ecf/contents/providers%2Fbundles%2Forg.eclipse.ecf.provider.xmpp%2Fsrc%2Forg%2Feclipse%2Fecf%2Fprovider%2Fxmpp%2Fidentity%2FXMPPNamespace.java?ref=0d00787f0d8de19464aaac7bc951d9817fd7c518", "deletions": 1, "filename": "providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/identity/XMPPNamespace.java", "new_code": "\tpublic ID createInstance(Class[] argTypes, Object[] args)", "new_methods": [], "old_code": "\tpublic ID makeInstance(Class[] argTypes, Object[] args)", "old_methods": [], "patch": "@@ -10,7 +10,7 @@ public class XMPPNamespace extends Namespace {\n \n \tprivate static final String XMPP_PROTOCOL = \"xmpp\";\n \t\n-\tpublic ID makeInstance(Class[] argTypes, Object[] args)\n+\tpublic ID createInstance(Class[] argTypes, Object[] args)\n \t\t\tthrows IDInstantiationException {\n \t\ttry {\n \t\t\treturn new XMPPID(this, (String) args[0]);", "raw_url": "https://github.com/eclipse/ecf/raw/0d00787f0d8de19464aaac7bc951d9817fd7c518/providers%2Fbundles%2Forg.eclipse.ecf.provider.xmpp%2Fsrc%2Forg%2Feclipse%2Fecf%2Fprovider%2Fxmpp%2Fidentity%2FXMPPNamespace.java", "sha": "57318fb0300f63c1e341d70227bc72ebc2c8daf1", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/eclipse/ecf/blob/0d00787f0d8de19464aaac7bc951d9817fd7c518/providers%2Fbundles%2Forg.eclipse.ecf.provider.xmpp%2Fsrc%2Forg%2Feclipse%2Fecf%2Fprovider%2Fxmpp%2Fidentity%2FXMPPRoomNamespace.java", "changes": 2, "contents_url": "https://api.github.com/repos/eclipse/ecf/contents/providers%2Fbundles%2Forg.eclipse.ecf.provider.xmpp%2Fsrc%2Forg%2Feclipse%2Fecf%2Fprovider%2Fxmpp%2Fidentity%2FXMPPRoomNamespace.java?ref=0d00787f0d8de19464aaac7bc951d9817fd7c518", "deletions": 1, "filename": "providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/identity/XMPPRoomNamespace.java", "new_code": "\tpublic ID createInstance(Class[] argTypes, Object[] args)", "new_methods": [], "old_code": "\tpublic ID makeInstance(Class[] argTypes, Object[] args)", "old_methods": [], "patch": "@@ -9,7 +9,7 @@ public class XMPPRoomNamespace extends Namespace {\n \tprivate static final long serialVersionUID = 4348545761410397583L;\n \tprivate static final String XMPP_ROOM_PROTOCOL = \"xmpp.muc\";\n \t\n-\tpublic ID makeInstance(Class[] argTypes, Object[] args)\n+\tpublic ID createInstance(Class[] argTypes, Object[] args)\n \t\t\tthrows IDInstantiationException {\n \t\ttry {\n \t\t\tif (args.length == 5) {", "raw_url": "https://github.com/eclipse/ecf/raw/0d00787f0d8de19464aaac7bc951d9817fd7c518/providers%2Fbundles%2Forg.eclipse.ecf.provider.xmpp%2Fsrc%2Forg%2Feclipse%2Fecf%2Fprovider%2Fxmpp%2Fidentity%2FXMPPRoomNamespace.java", "sha": "6a2e3b715d699265aab7d29489d639f3c6523985", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/eclipse/ecf/blob/0d00787f0d8de19464aaac7bc951d9817fd7c518/providers%2Fbundles%2Forg.eclipse.ecf.provider.xmpp%2Fsrc%2Forg%2Feclipse%2Fecf%2Fprovider%2Fxmpp%2Fidentity%2FXMPPSNamespace.java", "changes": 2, "contents_url": "https://api.github.com/repos/eclipse/ecf/contents/providers%2Fbundles%2Forg.eclipse.ecf.provider.xmpp%2Fsrc%2Forg%2Feclipse%2Fecf%2Fprovider%2Fxmpp%2Fidentity%2FXMPPSNamespace.java?ref=0d00787f0d8de19464aaac7bc951d9817fd7c518", "deletions": 1, "filename": "providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/identity/XMPPSNamespace.java", "new_code": "\tpublic ID createInstance(Class[] argTypes, Object[] args)", "new_methods": [], "old_code": "\tpublic ID makeInstance(Class[] argTypes, Object[] args)", "old_methods": [], "patch": "@@ -9,7 +9,7 @@ public class XMPPSNamespace extends Namespace {\n \tprivate static final long serialVersionUID = 390139788867091795L;\n \tprivate static final String XMPP_PROTOCOL = \"xmpps\";\n \t\n-\tpublic ID makeInstance(Class[] argTypes, Object[] args)\n+\tpublic ID createInstance(Class[] argTypes, Object[] args)\n \t\t\tthrows IDInstantiationException {\n \t\ttry {\n \t\t\treturn new XMPPID(this, (String) args[0]);", "raw_url": "https://github.com/eclipse/ecf/raw/0d00787f0d8de19464aaac7bc951d9817fd7c518/providers%2Fbundles%2Forg.eclipse.ecf.provider.xmpp%2Fsrc%2Forg%2Feclipse%2Fecf%2Fprovider%2Fxmpp%2Fidentity%2FXMPPSNamespace.java", "sha": "8bed9334b340ee78bc704ddedad1e7669405ad92", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/eclipse/ecf/blob/0d00787f0d8de19464aaac7bc951d9817fd7c518/providers%2Fbundles%2Forg.eclipse.ecf.provider.xmpp%2Fsrc%2Forg%2Feclipse%2Fecf%2Fprovider%2Fxmpp%2Fsmack%2FECFConnection.java", "changes": 2, "contents_url": "https://api.github.com/repos/eclipse/ecf/contents/providers%2Fbundles%2Forg.eclipse.ecf.provider.xmpp%2Fsrc%2Forg%2Feclipse%2Fecf%2Fprovider%2Fxmpp%2Fsmack%2FECFConnection.java?ref=0d00787f0d8de19464aaac7bc951d9817fd7c518", "deletions": 1, "filename": "providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/smack/ECFConnection.java", "new_code": "\t\t\treturn IDFactory.getDefault().createID(namespace.getName(), new Object[] { connection", "new_methods": [], "old_code": "\t\t\treturn IDFactory.getDefault().makeID(namespace.getName(), new Object[] { connection", "old_methods": [], "patch": "@@ -198,7 +198,7 @@ public synchronized ID getLocalID() {\n \t\tif (!isConnected())\n \t\t\treturn null;\n \t\ttry {\n-\t\t\treturn IDFactory.getDefault().makeID(namespace.getName(), new Object[] { connection\n+\t\t\treturn IDFactory.getDefault().createID(namespace.getName(), new Object[] { connection\n \t\t\t\t\t.getConnectionID() });\n \t\t} catch (Exception e) {\n \t\t\tlogException(\"Exception in getLocalID\", e);", "raw_url": "https://github.com/eclipse/ecf/raw/0d00787f0d8de19464aaac7bc951d9817fd7c518/providers%2Fbundles%2Forg.eclipse.ecf.provider.xmpp%2Fsrc%2Forg%2Feclipse%2Fecf%2Fprovider%2Fxmpp%2Fsmack%2FECFConnection.java", "sha": "f4720e04f0e8b9fb101f61ad4e3474d0f422360c", "status": "modified" }, { "additions": 12, "blob_url": "https://github.com/eclipse/ecf/blob/0d00787f0d8de19464aaac7bc951d9817fd7c518/server-side%2Ffeatures%2Forg.eclipse.ecf.server-feature%2Fbin%2Fstartserver.cmd", "changes": 24, "contents_url": "https://api.github.com/repos/eclipse/ecf/contents/server-side%2Ffeatures%2Forg.eclipse.ecf.server-feature%2Fbin%2Fstartserver.cmd?ref=0d00787f0d8de19464aaac7bc951d9817fd7c518", "deletions": 12, "filename": "server-side/features/org.eclipse.ecf.server-feature/bin/startserver.cmd", "new_code": "set ECF=%RP%\\org.eclipse.ecf_0.6.0\\ecf.jar\nset UI=%RP%\\org.eclipse.ecf.ui_0.6.0\\ui.jar\nset SDO=%RP%\\org.eclipse.ecf.sdo_0.6.0\\ecf.sdo.jar\nset DS=%RP%\\org.eclipse.ecf.datashare_0.6.0\\datashare.jar\nset PROVIDER=%RP%\\org.eclipse.ecf.provider_0.6.0\\provider.jar\nset PRESENCE=%RP%\\org.eclipse.ecf.presence_0.6.0\\presence.jar\nset GED=%RP%\\org.eclipse.ecf.example.sdo.gefeditor_0.6.0\\editor.jar\nset ED=%RP%\\org.eclipse.ecf.example.sdo.editor_0.6.0\\editor.jar\nset LIBRARY=%RP%\\org.eclipse.ecf.example.sdo.library_0.6.0\\runtime\\org.eclipse.ecf.example.library.jar\nset DISCOVERY=%RP%\\org.eclipse.ecf.discovery_0.6.0\\discovery.jar\nset HELLO=%RP%\\org.eclipse.ecf.example.hello_0.6.0\\hello.jar\nset COLLAB=%RP%\\org.eclipse.ecf.example.collab_0.6.0\\client.jar", "new_methods": [], "old_code": "set ECF=%RP%\\org.eclipse.ecf_0.5.5\\ecf.jar\nset UI=%RP%\\org.eclipse.ecf.ui_0.5.5\\ui.jar\nset SDO=%RP%\\org.eclipse.ecf.sdo_0.5.5\\ecf.sdo.jar\nset DS=%RP%\\org.eclipse.ecf.datashare_0.5.5\\datashare.jar\nset PROVIDER=%RP%\\org.eclipse.ecf.provider_0.5.5\\provider.jar\nset PRESENCE=%RP%\\org.eclipse.ecf.presence_0.5.5\\presence.jar\nset GED=%RP%\\org.eclipse.ecf.example.sdo.gefeditor_0.5.5\\editor.jar\nset ED=%RP%\\org.eclipse.ecf.example.sdo.editor_0.5.5\\editor.jar\nset LIBRARY=%RP%\\org.eclipse.ecf.example.sdo.library_0.5.5\\runtime\\org.eclipse.ecf.example.library.jar\nset DISCOVERY=%RP%\\org.eclipse.ecf.discovery_0.5.5\\discovery.jar\nset HELLO=%RP%\\org.eclipse.ecf.example.hello_0.5.5\\hello.jar\nset COLLAB=%RP%\\org.eclipse.ecf.example.collab_0.5.5\\client.jar", "old_methods": [], "patch": "@@ -2,18 +2,18 @@ echo off\n setlocal\n cd %~dp0\n set RP=..\\..\\..\\plugins\n-set ECF=%RP%\\org.eclipse.ecf_0.5.5\\ecf.jar\n-set UI=%RP%\\org.eclipse.ecf.ui_0.5.5\\ui.jar\n-set SDO=%RP%\\org.eclipse.ecf.sdo_0.5.5\\ecf.sdo.jar\n-set DS=%RP%\\org.eclipse.ecf.datashare_0.5.5\\datashare.jar\n-set PROVIDER=%RP%\\org.eclipse.ecf.provider_0.5.5\\provider.jar\n-set PRESENCE=%RP%\\org.eclipse.ecf.presence_0.5.5\\presence.jar\n-set GED=%RP%\\org.eclipse.ecf.example.sdo.gefeditor_0.5.5\\editor.jar\n-set ED=%RP%\\org.eclipse.ecf.example.sdo.editor_0.5.5\\editor.jar\n-set LIBRARY=%RP%\\org.eclipse.ecf.example.sdo.library_0.5.5\\runtime\\org.eclipse.ecf.example.library.jar\n-set DISCOVERY=%RP%\\org.eclipse.ecf.discovery_0.5.5\\discovery.jar\n-set HELLO=%RP%\\org.eclipse.ecf.example.hello_0.5.5\\hello.jar\n-set COLLAB=%RP%\\org.eclipse.ecf.example.collab_0.5.5\\client.jar\n+set ECF=%RP%\\org.eclipse.ecf_0.6.0\\ecf.jar\n+set UI=%RP%\\org.eclipse.ecf.ui_0.6.0\\ui.jar\n+set SDO=%RP%\\org.eclipse.ecf.sdo_0.6.0\\ecf.sdo.jar\n+set DS=%RP%\\org.eclipse.ecf.datashare_0.6.0\\datashare.jar\n+set PROVIDER=%RP%\\org.eclipse.ecf.provider_0.6.0\\provider.jar\n+set PRESENCE=%RP%\\org.eclipse.ecf.presence_0.6.0\\presence.jar\n+set GED=%RP%\\org.eclipse.ecf.example.sdo.gefeditor_0.6.0\\editor.jar\n+set ED=%RP%\\org.eclipse.ecf.example.sdo.editor_0.6.0\\editor.jar\n+set LIBRARY=%RP%\\org.eclipse.ecf.example.sdo.library_0.6.0\\runtime\\org.eclipse.ecf.example.library.jar\n+set DISCOVERY=%RP%\\org.eclipse.ecf.discovery_0.6.0\\discovery.jar\n+set HELLO=%RP%\\org.eclipse.ecf.example.hello_0.6.0\\hello.jar\n+set COLLAB=%RP%\\org.eclipse.ecf.example.collab_0.6.0\\client.jar\n \n set CP=\"..\\lib\\core.jar;..\\lib\\runtime.jar;..\\lib\\osgi.jar;%ECF%;%UI%;%SDO%;%PROVIDER%;%PRESENCE%;%GED%;%ED%;%LIBRARY%;%HELLO%;%DS%;%DISCOVERY%;%COLLAB%;.\"\n ", "raw_url": "https://github.com/eclipse/ecf/raw/0d00787f0d8de19464aaac7bc951d9817fd7c518/server-side%2Ffeatures%2Forg.eclipse.ecf.server-feature%2Fbin%2Fstartserver.cmd", "sha": "db6763230fee5783efe4b6341c00e78cc1851a3d", "status": "modified" }, { "additions": 12, "blob_url": "https://github.com/eclipse/ecf/blob/0d00787f0d8de19464aaac7bc951d9817fd7c518/server-side%2Ffeatures%2Forg.eclipse.ecf.server-feature%2Fbin%2Fstartserver.sh", "changes": 24, "contents_url": "https://api.github.com/repos/eclipse/ecf/contents/server-side%2Ffeatures%2Forg.eclipse.ecf.server-feature%2Fbin%2Fstartserver.sh?ref=0d00787f0d8de19464aaac7bc951d9817fd7c518", "deletions": 12, "filename": "server-side/features/org.eclipse.ecf.server-feature/bin/startserver.sh", "new_code": "ECF=${RP}/org.eclipse.ecf_0.6.0/ecf.jar\nUI=${RP}/org.eclipse.ecf.ui_0.6.0/ui.jar\nSDO=${RP}/org.eclipse.ecf.sdo_0.6.0/ecf.sdo.jar\nDS=${RP}/org.eclipse.ecf.datashare_0.6.0/datashare.jar\nPROVIDER=${RP}/org.eclipse.ecf.provider_0.6.0/provider.jar\nPRESENCE=${RP}/org.eclipse.ecf.presence_0.6.0/presence.jar\nGED=${RP}/org.eclipse.ecf.example.sdo.gefeditor_0.6.0/editor.jar\nED=${RP}/org.eclipse.ecf.example.sdo.editor_0.6.0/editor.jar\nLIBRARY=${RP}/org.eclipse.ecf.example.sdo.library_0.6.0/runtime/org.eclipse.ecf.example.library.jar\nDISCOVERY=${RP}/org.eclipse.ecf.discovery_0.6.0/discovery.jar\nHELLO=${RP}/org.eclipse.ecf.example.hello_0.6.0/hello.jar\nCOLLAB=${RP}/org.eclipse.ecf.example.collab_0.6.0/client.jar", "new_methods": [], "old_code": "ECF=${RP}/org.eclipse.ecf_0.5.5/ecf.jar\nUI=${RP}/org.eclipse.ecf.ui_0.5.5/ui.jar\nSDO=${RP}/org.eclipse.ecf.sdo_0.5.5/ecf.sdo.jar\nDS=${RP}/org.eclipse.ecf.datashare_0.5.5/datashare.jar\nPROVIDER=${RP}/org.eclipse.ecf.provider_0.5.5/provider.jar\nPRESENCE=${RP}/org.eclipse.ecf.presence_0.5.5/presence.jar\nGED=${RP}/org.eclipse.ecf.example.sdo.gefeditor_0.5.5/editor.jar\nED=${RP}/org.eclipse.ecf.example.sdo.editor_0.5.5/editor.jar\nLIBRARY=${RP}/org.eclipse.ecf.example.sdo.library_0.5.5/runtime/org.eclipse.ecf.example.library.jar\nDISCOVERY=${RP}/org.eclipse.ecf.discovery_0.5.5/discovery.jar\nHELLO=${RP}/org.eclipse.ecf.example.hello_0.5.5/hello.jar\nCOLLAB=${RP}/org.eclipse.ecf.example.collab_0.5.5/client.jar", "old_methods": [], "patch": "@@ -4,18 +4,18 @@ RP=../../../plugins\n CURRENT=`pwd`\n cd ${CURRENT}\n # Relative path for accessing plugins\n-ECF=${RP}/org.eclipse.ecf_0.5.5/ecf.jar\n-UI=${RP}/org.eclipse.ecf.ui_0.5.5/ui.jar\n-SDO=${RP}/org.eclipse.ecf.sdo_0.5.5/ecf.sdo.jar\n-DS=${RP}/org.eclipse.ecf.datashare_0.5.5/datashare.jar\n-PROVIDER=${RP}/org.eclipse.ecf.provider_0.5.5/provider.jar\n-PRESENCE=${RP}/org.eclipse.ecf.presence_0.5.5/presence.jar\n-GED=${RP}/org.eclipse.ecf.example.sdo.gefeditor_0.5.5/editor.jar\n-ED=${RP}/org.eclipse.ecf.example.sdo.editor_0.5.5/editor.jar\n-LIBRARY=${RP}/org.eclipse.ecf.example.sdo.library_0.5.5/runtime/org.eclipse.ecf.example.library.jar\n-DISCOVERY=${RP}/org.eclipse.ecf.discovery_0.5.5/discovery.jar\n-HELLO=${RP}/org.eclipse.ecf.example.hello_0.5.5/hello.jar\n-COLLAB=${RP}/org.eclipse.ecf.example.collab_0.5.5/client.jar\n+ECF=${RP}/org.eclipse.ecf_0.6.0/ecf.jar\n+UI=${RP}/org.eclipse.ecf.ui_0.6.0/ui.jar\n+SDO=${RP}/org.eclipse.ecf.sdo_0.6.0/ecf.sdo.jar\n+DS=${RP}/org.eclipse.ecf.datashare_0.6.0/datashare.jar\n+PROVIDER=${RP}/org.eclipse.ecf.provider_0.6.0/provider.jar\n+PRESENCE=${RP}/org.eclipse.ecf.presence_0.6.0/presence.jar\n+GED=${RP}/org.eclipse.ecf.example.sdo.gefeditor_0.6.0/editor.jar\n+ED=${RP}/org.eclipse.ecf.example.sdo.editor_0.6.0/editor.jar\n+LIBRARY=${RP}/org.eclipse.ecf.example.sdo.library_0.6.0/runtime/org.eclipse.ecf.example.library.jar\n+DISCOVERY=${RP}/org.eclipse.ecf.discovery_0.6.0/discovery.jar\n+HELLO=${RP}/org.eclipse.ecf.example.hello_0.6.0/hello.jar\n+COLLAB=${RP}/org.eclipse.ecf.example.collab_0.6.0/client.jar\n \n CP=\"../lib/core.jar:../lib/runtime.jar:../lib/osgi.jar:${ECF}:${UI}:${SDO}:${PROVIDER}:${PRESENCE}:${GED}:${ED}:${LIBRARY}:${DS}:${HELLO}:${DISCOVERY}:${COLLAB}:.\"\n ", "raw_url": "https://github.com/eclipse/ecf/raw/0d00787f0d8de19464aaac7bc951d9817fd7c518/server-side%2Ffeatures%2Forg.eclipse.ecf.server-feature%2Fbin%2Fstartserver.sh", "sha": "89308fc43ec9772d431896712c5b807ef0dc488b", "status": "modified" }, { "additions": 12, "blob_url": "https://github.com/eclipse/ecf/blob/0d00787f0d8de19464aaac7bc951d9817fd7c518/server-side%2Ffeatures%2Forg.eclipse.ecf.server-feature%2Fbin%2Fstartserverlog.sh", "changes": 24, "contents_url": "https://api.github.com/repos/eclipse/ecf/contents/server-side%2Ffeatures%2Forg.eclipse.ecf.server-feature%2Fbin%2Fstartserverlog.sh?ref=0d00787f0d8de19464aaac7bc951d9817fd7c518", "deletions": 12, "filename": "server-side/features/org.eclipse.ecf.server-feature/bin/startserverlog.sh", "new_code": "ECF=${RP}/org.eclipse.ecf_0.6.0/ecf.jar\r\nUI=${RP}/org.eclipse.ecf.ui_0.6.0/ui.jar\r\nSDO=${RP}/org.eclipse.ecf.sdo_0.6.0/ecf.sdo.jar\r\nDS=${RP}/org.eclipse.ecf.datashare_0.6.0/datashare.jar\r\nPROVIDER=${RP}/org.eclipse.ecf.provider_0.6.0/provider.jar\r\nPRESENCE=${RP}/org.eclipse.ecf.presence_0.6.0/presence.jar\r\nGED=${RP}/org.eclipse.ecf.example.sdo.gefeditor_0.6.0/editor.jar\r\nED=${RP}/org.eclipse.ecf.example.sdo.editor_0.6.0/editor.jar\r\nLIBRARY=${RP}/org.eclipse.ecf.example.sdo.library_0.6.0/runtime/org.eclipse.ecf.example.library.jar\r\nDISCOVERY=${RP}/org.eclipse.ecf.discovery_0.6.0/discovery.jar\r\nHELLO=${RP}/org.eclipse.ecf.example.hello_0.6.0/hello.jar\r\nCOLLAB=${RP}/org.eclipse.ecf.example.collab_0.6.0/client.jar\r", "new_methods": [], "old_code": "ECF=${RP}/org.eclipse.ecf_0.5.5/ecf.jar\r\nUI=${RP}/org.eclipse.ecf.ui_0.5.5/ui.jar\r\nSDO=${RP}/org.eclipse.ecf.sdo_0.5.5/ecf.sdo.jar\r\nDS=${RP}/org.eclipse.ecf.datashare_0.5.5/datashare.jar\r\nPROVIDER=${RP}/org.eclipse.ecf.provider_0.5.5/provider.jar\r\nPRESENCE=${RP}/org.eclipse.ecf.presence_0.5.5/presence.jar\r\nGED=${RP}/org.eclipse.ecf.example.sdo.gefeditor_0.5.5/editor.jar\r\nED=${RP}/org.eclipse.ecf.example.sdo.editor_0.5.5/editor.jar\r\nLIBRARY=${RP}/org.eclipse.ecf.example.sdo.library_0.5.5/runtime/org.eclipse.ecf.example.library.jar\r\nDISCOVERY=${RP}/org.eclipse.ecf.discovery_0.5.5/discovery.jar\r\nHELLO=${RP}/org.eclipse.ecf.example.hello_0.5.5/hello.jar\r\nCOLLAB=${RP}/org.eclipse.ecf.example.collab_0.5.5/client.jar\r", "old_methods": [], "patch": "@@ -4,18 +4,18 @@ RP=../../../plugins\n CURRENT=`pwd`\r\n cd ${CURRENT}\r\n # Relative path for accessing plugins\r\n-ECF=${RP}/org.eclipse.ecf_0.5.5/ecf.jar\r\n-UI=${RP}/org.eclipse.ecf.ui_0.5.5/ui.jar\r\n-SDO=${RP}/org.eclipse.ecf.sdo_0.5.5/ecf.sdo.jar\r\n-DS=${RP}/org.eclipse.ecf.datashare_0.5.5/datashare.jar\r\n-PROVIDER=${RP}/org.eclipse.ecf.provider_0.5.5/provider.jar\r\n-PRESENCE=${RP}/org.eclipse.ecf.presence_0.5.5/presence.jar\r\n-GED=${RP}/org.eclipse.ecf.example.sdo.gefeditor_0.5.5/editor.jar\r\n-ED=${RP}/org.eclipse.ecf.example.sdo.editor_0.5.5/editor.jar\r\n-LIBRARY=${RP}/org.eclipse.ecf.example.sdo.library_0.5.5/runtime/org.eclipse.ecf.example.library.jar\r\n-DISCOVERY=${RP}/org.eclipse.ecf.discovery_0.5.5/discovery.jar\r\n-HELLO=${RP}/org.eclipse.ecf.example.hello_0.5.5/hello.jar\r\n-COLLAB=${RP}/org.eclipse.ecf.example.collab_0.5.5/client.jar\r\n+ECF=${RP}/org.eclipse.ecf_0.6.0/ecf.jar\r\n+UI=${RP}/org.eclipse.ecf.ui_0.6.0/ui.jar\r\n+SDO=${RP}/org.eclipse.ecf.sdo_0.6.0/ecf.sdo.jar\r\n+DS=${RP}/org.eclipse.ecf.datashare_0.6.0/datashare.jar\r\n+PROVIDER=${RP}/org.eclipse.ecf.provider_0.6.0/provider.jar\r\n+PRESENCE=${RP}/org.eclipse.ecf.presence_0.6.0/presence.jar\r\n+GED=${RP}/org.eclipse.ecf.example.sdo.gefeditor_0.6.0/editor.jar\r\n+ED=${RP}/org.eclipse.ecf.example.sdo.editor_0.6.0/editor.jar\r\n+LIBRARY=${RP}/org.eclipse.ecf.example.sdo.library_0.6.0/runtime/org.eclipse.ecf.example.library.jar\r\n+DISCOVERY=${RP}/org.eclipse.ecf.discovery_0.6.0/discovery.jar\r\n+HELLO=${RP}/org.eclipse.ecf.example.hello_0.6.0/hello.jar\r\n+COLLAB=${RP}/org.eclipse.ecf.example.collab_0.6.0/client.jar\r\n \r\n CP=\"../lib/core.jar:../lib/runtime.jar:../lib/osgi.jar:${ECF}:${UI}:${SDO}:${PROVIDER}:${PRESENCE}:${GED}:${ED}:${LIBRARY}:${DS}:${HELLO}:${DISCOVERY}:${COLLAB}:.\"\r\n \r", "raw_url": "https://github.com/eclipse/ecf/raw/0d00787f0d8de19464aaac7bc951d9817fd7c518/server-side%2Ffeatures%2Forg.eclipse.ecf.server-feature%2Fbin%2Fstartserverlog.sh", "sha": "df25eebcdf1c552649bfd57655ebff14a2f64d67", "status": "modified" } ]
76
[ { "name": "eclipse$ecf", "new_args": "String name", "new_implementation": "result = IDFactory.getDefault().createID(namespace, new Object[] { name", "new_return_type": "ID", "new_signature": "ID createIDFromName(String name)", "old_args": "String name", "old_implementation": "result = IDFactory.getDefault().makeID(namespace, new Object[] { name", "old_return_type": "ID", "old_signature": "ID makeIDFromName(String name)" } ]
1
106
0f04d91efdf50447d8e84e926ef98d7462103dc0
[ { "name": "iee$iee", "new_args": "MatrixMultiplication op", "new_implementation": null, "new_return_type": "StringConcatenation", "new_signature": "StringConcatenation _compileMatrixExpression(MatrixMultiplication op)", "old_args": "Interval op", "old_implementation": null, "old_return_type": "StringConcatenation", "old_signature": "StringConcatenation _compileExpression(Interval op)" }, { "name": "iee$iee", "new_args": "MatrixMultiplication op", "new_implementation": null, "new_return_type": "StringConcatenation", "new_signature": "StringConcatenation _compileMatrixExpression(MatrixMultiplication op)", "old_args": "Interval op", "old_implementation": null, "old_return_type": "StringConcatenation", "old_signature": "StringConcatenation _compileExpression(Interval op)" }, { "name": "iee$iee", "new_args": "EObject semanticObject,ISynNavigable transition,List<INode> nodes", "new_implementation": null, "new_return_type": "void", "new_signature": "void emit_MatrixRow_CommaKeyword_1_2_q(EObject semanticObject,ISynNavigable transition,List<INode> nodes)", "old_args": "EObject semanticObject,ISynTransition transition,INode fromNode,INode toNode", "old_implementation": null, "old_return_type": "void", "old_signature": "void emit_MatrixDefinition_CommaKeyword_3_2_q(EObject semanticObject,ISynTransition transition,INode fromNode,INode toNode)" }, { "name": "iee$iee", "new_args": "EObject semanticObject,ISynNavigable transition,List<INode> nodes", "new_implementation": null, "new_return_type": "void", "new_signature": "void emit_MatrixRow_CommaKeyword_1_2_q(EObject semanticObject,ISynNavigable transition,List<INode> nodes)", "old_args": "EObject semanticObject,ISynTransition transition,INode fromNode,INode toNode", "old_implementation": null, "old_return_type": "void", "old_signature": "void emit_MatrixDefinition_CommaKeyword_3_2_q(EObject semanticObject,ISynTransition transition,INode fromNode,INode toNode)" }, { "name": "iee$iee", "new_args": "EObject semanticObject,ISynNavigable transition,List<INode> nodes", "new_implementation": null, "new_return_type": "void", "new_signature": "void emit_Matrix_CommaKeyword_1_2_q(EObject semanticObject,ISynNavigable transition,List<INode> nodes)", "old_args": "EObject semanticObject,ISynTransition transition,INode fromNode,INode toNode", "old_implementation": null, "old_return_type": "void", "old_signature": "void emit_MatrixRow_CommaKeyword_1_2_q(EObject semanticObject,ISynTransition transition,INode fromNode,INode toNode)" }, { "name": "iee$iee", "new_args": "EObject semanticObject,ISynNavigable transition,List<INode> nodes", "new_implementation": null, "new_return_type": "void", "new_signature": "void emit_Matrix_CommaKeyword_1_2_q(EObject semanticObject,ISynNavigable transition,List<INode> nodes)", "old_args": "EObject semanticObject,ISynTransition transition,INode fromNode,INode toNode", "old_implementation": null, "old_return_type": "void", "old_signature": "void emit_MatrixRow_CommaKeyword_1_2_q(EObject semanticObject,ISynTransition transition,INode fromNode,INode toNode)" }, { "name": "iee$iee", "new_args": "EObject semanticObject,ISynNavigable transition,List<INode> nodes", "new_implementation": null, "new_return_type": "void", "new_signature": "void emit_PrimaryMatrix_LeftParenthesisKeyword_3_0_a(EObject semanticObject,ISynNavigable transition,List<INode> nodes)", "old_args": "EObject semanticObject,ISynTransition transition,INode fromNode,INode toNode", "old_implementation": null, "old_return_type": "void", "old_signature": "void emit_Primary_LeftParenthesisKeyword_3_0_a(EObject semanticObject,ISynTransition transition,INode fromNode,INode toNode)" }, { "name": "iee$iee", "new_args": "EObject semanticObject,ISynNavigable transition,List<INode> nodes", "new_implementation": null, "new_return_type": "void", "new_signature": "void emit_PrimaryMatrix_LeftParenthesisKeyword_3_0_a(EObject semanticObject,ISynNavigable transition,List<INode> nodes)", "old_args": "EObject semanticObject,ISynTransition transition,INode fromNode,INode toNode", "old_implementation": null, "old_return_type": "void", "old_signature": "void emit_Primary_LeftParenthesisKeyword_3_0_a(EObject semanticObject,ISynTransition transition,INode fromNode,INode toNode)" }, { "name": "iee$iee", "new_args": "EObject semanticObject,ISynNavigable transition,List<INode> nodes", "new_implementation": null, "new_return_type": "void", "new_signature": "void emit_PrimaryMatrix_LeftParenthesisKeyword_3_0_p(EObject semanticObject,ISynNavigable transition,List<INode> nodes)", "old_args": "EObject semanticObject,ISynTransition transition,INode fromNode,INode toNode", "old_implementation": null, "old_return_type": "void", "old_signature": "void emit_Primary_LeftParenthesisKeyword_3_0_p(EObject semanticObject,ISynTransition transition,INode fromNode,INode toNode)" }, { "name": "iee$iee", "new_args": "EObject semanticObject,ISynNavigable transition,List<INode> nodes", "new_implementation": null, "new_return_type": "void", "new_signature": "void emit_PrimaryMatrix_LeftParenthesisKeyword_3_0_p(EObject semanticObject,ISynNavigable transition,List<INode> nodes)", "old_args": "EObject semanticObject,ISynTransition transition,INode fromNode,INode toNode", "old_implementation": null, "old_return_type": "void", "old_signature": "void emit_Primary_LeftParenthesisKeyword_3_0_p(EObject semanticObject,ISynTransition transition,INode fromNode,INode toNode)" }, { "name": "iee$iee", "new_args": "EObject context,Addition semanticObject", "new_implementation": null, "new_return_type": "void", "new_signature": "void sequence_Addition(EObject context,Addition semanticObject)", "old_args": "EObject context,Addition semanticObject", "old_implementation": null, "old_return_type": "void", "old_signature": "void sequence_Addition_Addition(EObject context,Addition semanticObject)" }, { "name": "iee$iee", "new_args": "EObject context,Addition semanticObject", "new_implementation": null, "new_return_type": "void", "new_signature": "void sequence_Addition(EObject context,Addition semanticObject)", "old_args": "EObject context,Addition semanticObject", "old_implementation": null, "old_return_type": "void", "old_signature": "void sequence_Addition_Addition(EObject context,Addition semanticObject)" }, { "name": "iee$iee", "new_args": "EObject context,Expression semanticObject", "new_implementation": null, "new_return_type": "void", "new_signature": "void sequence_AdditionInBrackets(EObject context,Expression semanticObject)", "old_args": "EObject context,Subtraction semanticObject", "old_implementation": null, "old_return_type": "void", "old_signature": "void sequence_Addition_Subtraction(EObject context,Subtraction semanticObject)" }, { "name": "iee$iee", "new_args": "EObject context,MatrixAssignment semanticObject", "new_implementation": null, "new_return_type": "void", "new_signature": "void sequence_MatrixAssignment(EObject context,MatrixAssignment semanticObject)", "old_args": "EObject context,Assignment semanticObject", "old_implementation": null, "old_return_type": "void", "old_signature": "void sequence_Assignment_Assignment(EObject context,Assignment semanticObject)" }, { "name": "iee$iee", "new_args": "EObject context,MatrixAssignment semanticObject", "new_implementation": null, "new_return_type": "void", "new_signature": "void sequence_MatrixAssignment(EObject context,MatrixAssignment semanticObject)", "old_args": "EObject context,Assignment semanticObject", "old_implementation": null, "old_return_type": "void", "old_signature": "void sequence_Assignment_Assignment(EObject context,Assignment semanticObject)" }, { "name": "iee$iee", "new_args": "EObject context,Exponent semanticObject", "new_implementation": null, "new_return_type": "void", "new_signature": "void sequence_Exponent(EObject context,Exponent semanticObject)", "old_args": "EObject context,Exponent semanticObject", "old_implementation": null, "old_return_type": "void", "old_signature": "void sequence_Exponent_Exponent(EObject context,Exponent semanticObject)" }, { "name": "iee$iee", "new_args": "EObject context,Exponent semanticObject", "new_implementation": null, "new_return_type": "void", "new_signature": "void sequence_Exponent(EObject context,Exponent semanticObject)", "old_args": "EObject context,Exponent semanticObject", "old_implementation": null, "old_return_type": "void", "old_signature": "void sequence_Exponent_Exponent(EObject context,Exponent semanticObject)" }, { "name": "iee$iee", "new_args": "EObject context,Formula semanticObject", "new_implementation": null, "new_return_type": "void", "new_signature": "void sequence_Formula(EObject context,Formula semanticObject)", "old_args": "EObject context,Formula semanticObject", "old_implementation": null, "old_return_type": "void", "old_signature": "void sequence_Formula_Formula(EObject context,Formula semanticObject)" }, { "name": "iee$iee", "new_args": "EObject context,Formula semanticObject", "new_implementation": null, "new_return_type": "void", "new_signature": "void sequence_Formula(EObject context,Formula semanticObject)", "old_args": "EObject context,Formula semanticObject", "old_implementation": null, "old_return_type": "void", "old_signature": "void sequence_Formula_Formula(EObject context,Formula semanticObject)" }, { "name": "iee$iee", "new_args": "EObject context,FunctionDefinition semanticObject", "new_implementation": null, "new_return_type": "void", "new_signature": "void sequence_FunctionDefinition(EObject context,FunctionDefinition semanticObject)", "old_args": "EObject context,FunctionDefinition semanticObject", "old_implementation": null, "old_return_type": "void", "old_signature": "void sequence_FunctionDefinition_FunctionDefinition(EObject context,FunctionDefinition semanticObject)" }, { "name": "iee$iee", "new_args": "EObject context,FunctionDefinition semanticObject", "new_implementation": null, "new_return_type": "void", "new_signature": "void sequence_FunctionDefinition(EObject context,FunctionDefinition semanticObject)", "old_args": "EObject context,FunctionDefinition semanticObject", "old_implementation": null, "old_return_type": "void", "old_signature": "void sequence_FunctionDefinition_FunctionDefinition(EObject context,FunctionDefinition semanticObject)" }, { "name": "iee$iee", "new_args": "EObject context,Expression semanticObject", "new_implementation": null, "new_return_type": "void", "new_signature": "void sequence_Function(EObject context,Expression semanticObject)", "old_args": "EObject context,Expression semanticObject", "old_implementation": null, "old_return_type": "void", "old_signature": "void sequence_Function_Expression(EObject context,Expression semanticObject)" }, { "name": "iee$iee", "new_args": "EObject context,Expression semanticObject", "new_implementation": null, "new_return_type": "void", "new_signature": "void sequence_Function(EObject context,Expression semanticObject)", "old_args": "EObject context,Expression semanticObject", "old_implementation": null, "old_return_type": "void", "old_signature": "void sequence_Function_Expression(EObject context,Expression semanticObject)" }, { "name": "iee$iee", "new_args": "EObject context,MatrixMultiplication semanticObject", "new_implementation": null, "new_return_type": "void", "new_signature": "void sequence_MatrixMultiplication(EObject context,MatrixMultiplication semanticObject)", "old_args": "EObject context,MatrixDefinition semanticObject", "old_implementation": null, "old_return_type": "void", "old_signature": "void sequence_MatrixDefinition_MatrixDefinition(EObject context,MatrixDefinition semanticObject)" }, { "name": "iee$iee", "new_args": "EObject context,MatrixMultiplication semanticObject", "new_implementation": null, "new_return_type": "void", "new_signature": "void sequence_MatrixMultiplication(EObject context,MatrixMultiplication semanticObject)", "old_args": "EObject context,MatrixDefinition semanticObject", "old_implementation": null, "old_return_type": "void", "old_signature": "void sequence_MatrixDefinition_MatrixDefinition(EObject context,MatrixDefinition semanticObject)" }, { "name": "iee$iee", "new_args": "EObject context,MatrixRow semanticObject", "new_implementation": null, "new_return_type": "void", "new_signature": "void sequence_MatrixRow(EObject context,MatrixRow semanticObject)", "old_args": "EObject context,MatrixRow semanticObject", "old_implementation": null, "old_return_type": "void", "old_signature": "void sequence_MatrixRow_MatrixRow(EObject context,MatrixRow semanticObject)" }, { "name": "iee$iee", "new_args": "EObject context,Division semanticObject", "new_implementation": null, "new_return_type": "void", "new_signature": "void sequence_Multiplication(EObject context,Division semanticObject)", "old_args": "EObject context,Division semanticObject", "old_implementation": null, "old_return_type": "void", "old_signature": "void sequence_Multiplication_Division(EObject context,Division semanticObject)" }, { "name": "iee$iee", "new_args": "EObject context,Division semanticObject", "new_implementation": null, "new_return_type": "void", "new_signature": "void sequence_Multiplication(EObject context,Division semanticObject)", "old_args": "EObject context,Division semanticObject", "old_implementation": null, "old_return_type": "void", "old_signature": "void sequence_Multiplication_Division(EObject context,Division semanticObject)" }, { "name": "iee$iee", "new_args": "EObject context,Modulo semanticObject", "new_implementation": null, "new_return_type": "void", "new_signature": "void sequence_Multiplication(EObject context,Modulo semanticObject)", "old_args": "EObject context,Modulo semanticObject", "old_implementation": null, "old_return_type": "void", "old_signature": "void sequence_Multiplication_Modulo(EObject context,Modulo semanticObject)" }, { "name": "iee$iee", "new_args": "EObject context,Modulo semanticObject", "new_implementation": null, "new_return_type": "void", "new_signature": "void sequence_Multiplication(EObject context,Modulo semanticObject)", "old_args": "EObject context,Modulo semanticObject", "old_implementation": null, "old_return_type": "void", "old_signature": "void sequence_Multiplication_Modulo(EObject context,Modulo semanticObject)" }, { "name": "iee$iee", "new_args": "EObject context,Multiplication semanticObject", "new_implementation": null, "new_return_type": "void", "new_signature": "void sequence_Multiplication(EObject context,Multiplication semanticObject)", "old_args": "EObject context,Multiplication semanticObject", "old_implementation": null, "old_return_type": "void", "old_signature": "void sequence_Multiplication_Multiplication(EObject context,Multiplication semanticObject)" }, { "name": "iee$iee", "new_args": "EObject context,Multiplication semanticObject", "new_implementation": null, "new_return_type": "void", "new_signature": "void sequence_Multiplication(EObject context,Multiplication semanticObject)", "old_args": "EObject context,Multiplication semanticObject", "old_implementation": null, "old_return_type": "void", "old_signature": "void sequence_Multiplication_Multiplication(EObject context,Multiplication semanticObject)" }, { "name": "iee$iee", "new_args": "EObject context,Float semanticObject", "new_implementation": null, "new_return_type": "void", "new_signature": "void sequence_Primary(EObject context,Float semanticObject)", "old_args": "EObject context,Float semanticObject", "old_implementation": null, "old_return_type": "void", "old_signature": "void sequence_Primary_Float(EObject context,Float semanticObject)" }, { "name": "iee$iee", "new_args": "EObject context,MatrixInBrackets semanticObject", "new_implementation": null, "new_return_type": "void", "new_signature": "void sequence_PrimaryMatrix(EObject context,MatrixInBrackets semanticObject)", "old_args": "EObject context,Float semanticObject", "old_implementation": null, "old_return_type": "void", "old_signature": "void sequence_Primary_Float(EObject context,Float semanticObject)" }, { "name": "iee$iee", "new_args": "EObject context,Function semanticObject", "new_implementation": null, "new_return_type": "void", "new_signature": "void sequence_Primary(EObject context,Function semanticObject)", "old_args": "EObject context,Function semanticObject", "old_implementation": null, "old_return_type": "void", "old_signature": "void sequence_Primary_Function(EObject context,Function semanticObject)" }, { "name": "iee$iee", "new_args": "EObject context,MatrixVariable semanticObject", "new_implementation": null, "new_return_type": "void", "new_signature": "void sequence_PrimaryMatrix(EObject context,MatrixVariable semanticObject)", "old_args": "EObject context,Function semanticObject", "old_implementation": null, "old_return_type": "void", "old_signature": "void sequence_Primary_Function(EObject context,Function semanticObject)" }, { "name": "iee$iee", "new_args": "EObject context,MatrixElement semanticObject", "new_implementation": null, "new_return_type": "void", "new_signature": "void sequence_Primary(EObject context,MatrixElement semanticObject)", "old_args": "EObject context,Variable semanticObject", "old_implementation": null, "old_return_type": "void", "old_signature": "void sequence_Primary_Variable(EObject context,Variable semanticObject)" }, { "name": "iee$iee", "new_args": "EObject context,NewMatrix semanticObject", "new_implementation": null, "new_return_type": "void", "new_signature": "void sequence_PrimaryMatrix(EObject context,NewMatrix semanticObject)", "old_args": "EObject context,Variable semanticObject", "old_implementation": null, "old_return_type": "void", "old_signature": "void sequence_Primary_Variable(EObject context,Variable semanticObject)" }, { "name": "iee$iee", "new_args": "EObject context,Statement semanticObject", "new_implementation": null, "new_return_type": "void", "new_signature": "void sequence_Statement(EObject context,Statement semanticObject)", "old_args": "EObject context,Statement semanticObject", "old_implementation": null, "old_return_type": "void", "old_signature": "void sequence_Statement_Statement(EObject context,Statement semanticObject)" }, { "name": "iee$iee", "new_args": "EObject context,Statement semanticObject", "new_implementation": null, "new_return_type": "void", "new_signature": "void sequence_Statement(EObject context,Statement semanticObject)", "old_args": "EObject context,Statement semanticObject", "old_implementation": null, "old_return_type": "void", "old_signature": "void sequence_Statement_Statement(EObject context,Statement semanticObject)" }, { "name": "iee$iee", "new_args": "EObject context,Factorial semanticObject", "new_implementation": null, "new_return_type": "void", "new_signature": "void sequence_UnaryExpression(EObject context,Factorial semanticObject)", "old_args": "EObject context,Factorial semanticObject", "old_implementation": null, "old_return_type": "void", "old_signature": "void sequence_UnaryExpression_Factorial(EObject context,Factorial semanticObject)" }, { "name": "iee$iee", "new_args": "EObject context,Factorial semanticObject", "new_implementation": null, "new_return_type": "void", "new_signature": "void sequence_UnaryExpression(EObject context,Factorial semanticObject)", "old_args": "EObject context,Factorial semanticObject", "old_implementation": null, "old_return_type": "void", "old_signature": "void sequence_UnaryExpression_Factorial(EObject context,Factorial semanticObject)" }, { "name": "iee$iee", "new_args": "EObject context,Invert semanticObject", "new_implementation": null, "new_return_type": "void", "new_signature": "void sequence_UnaryExpression(EObject context,Invert semanticObject)", "old_args": "EObject context,Interval semanticObject", "old_implementation": null, "old_return_type": "void", "old_signature": "void sequence_UnaryExpression_Interval(EObject context,Interval semanticObject)" }, { "name": "iee$iee", "new_args": "EObject context,Invert semanticObject", "new_implementation": null, "new_return_type": "void", "new_signature": "void sequence_UnaryExpression(EObject context,Invert semanticObject)", "old_args": "EObject context,Interval semanticObject", "old_implementation": null, "old_return_type": "void", "old_signature": "void sequence_UnaryExpression_Interval(EObject context,Interval semanticObject)" }, { "name": "iee$iee", "new_args": "EObject context,MatrixAddition semanticObject", "new_implementation": null, "new_return_type": "void", "new_signature": "void sequence_MatrixAddition(EObject context,MatrixAddition semanticObject)", "old_args": "EObject context,Invert semanticObject", "old_implementation": null, "old_return_type": "void", "old_signature": "void sequence_UnaryExpression_Invert(EObject context,Invert semanticObject)" }, { "name": "iee$iee", "new_args": "VariableAssignment newVariableAssignment,NotificationChain msgs", "new_implementation": null, "new_return_type": "NotificationChain", "new_signature": "NotificationChain basicSetVariableAssignment(VariableAssignment newVariableAssignment,NotificationChain msgs)", "old_args": "Assignment newAssignment,NotificationChain msgs", "old_implementation": null, "old_return_type": "NotificationChain", "old_signature": "NotificationChain basicSetAssignment(Assignment newAssignment,NotificationChain msgs)" }, { "name": "iee$iee", "new_args": "VariableAssignment newVariableAssignment,NotificationChain msgs", "new_implementation": null, "new_return_type": "NotificationChain", "new_signature": "NotificationChain basicSetVariableAssignment(VariableAssignment newVariableAssignment,NotificationChain msgs)", "old_args": "Assignment newAssignment,NotificationChain msgs", "old_implementation": null, "old_return_type": "NotificationChain", "old_signature": "NotificationChain basicSetAssignment(Assignment newAssignment,NotificationChain msgs)" }, { "name": "iee$iee", "new_args": "MatrixAssignment newMatrixAssignment,NotificationChain msgs", "new_implementation": null, "new_return_type": "NotificationChain", "new_signature": "NotificationChain basicSetMatrixAssignment(MatrixAssignment newMatrixAssignment,NotificationChain msgs)", "old_args": "MatrixDefinition newMatrixDefinition,NotificationChain msgs", "old_implementation": null, "old_return_type": "NotificationChain", "old_signature": "NotificationChain basicSetMatrixDefinition(MatrixDefinition newMatrixDefinition,NotificationChain msgs)" }, { "name": "iee$iee", "new_args": "MatrixAssignment newMatrixAssignment,NotificationChain msgs", "new_implementation": null, "new_return_type": "NotificationChain", "new_signature": "NotificationChain basicSetMatrixAssignment(MatrixAssignment newMatrixAssignment,NotificationChain msgs)", "old_args": "MatrixDefinition newMatrixDefinition,NotificationChain msgs", "old_implementation": null, "old_return_type": "NotificationChain", "old_signature": "NotificationChain basicSetMatrixDefinition(MatrixDefinition newMatrixDefinition,NotificationChain msgs)" }, { "name": "iee$iee", "new_args": "MatrixAssignment object", "new_implementation": null, "new_return_type": "T", "new_signature": "T caseMatrixAssignment(MatrixAssignment object)", "old_args": "Assignment object", "old_implementation": null, "old_return_type": "T", "old_signature": "T caseAssignment(Assignment object)" }, { "name": "iee$iee", "new_args": "MatrixAssignment object", "new_implementation": null, "new_return_type": "T", "new_signature": "T caseMatrixAssignment(MatrixAssignment object)", "old_args": "Assignment object", "old_implementation": null, "old_return_type": "T", "old_signature": "T caseAssignment(Assignment object)" }, { "name": "iee$iee", "new_args": "Matrix object", "new_implementation": null, "new_return_type": "T", "new_signature": "T caseMatrix(Matrix object)", "old_args": "Interval object", "old_implementation": null, "old_return_type": "T", "old_signature": "T caseInterval(Interval object)" }, { "name": "iee$iee", "new_args": "Matrix object", "new_implementation": null, "new_return_type": "T", "new_signature": "T caseMatrix(Matrix object)", "old_args": "Interval object", "old_implementation": null, "old_return_type": "T", "old_signature": "T caseInterval(Interval object)" }, { "name": "iee$iee", "new_args": "MatrixAddition object", "new_implementation": null, "new_return_type": "T", "new_signature": "T caseMatrixAddition(MatrixAddition object)", "old_args": "MatrixDefinition object", "old_implementation": null, "old_return_type": "T", "old_signature": "T caseMatrixDefinition(MatrixDefinition object)" }, { "name": "iee$iee", "new_args": "MatrixAddition object", "new_implementation": null, "new_return_type": "T", "new_signature": "T caseMatrixAddition(MatrixAddition object)", "old_args": "MatrixDefinition object", "old_implementation": null, "old_return_type": "T", "old_signature": "T caseMatrixDefinition(MatrixDefinition object)" }, { "name": "iee$iee", "new_args": "VariableAssignment a", "new_implementation": null, "new_return_type": "StringConcatenation", "new_signature": "StringConcatenation compileVariableAssignment(VariableAssignment a)", "old_args": "Assignment a", "old_implementation": null, "old_return_type": "StringConcatenation", "old_signature": "StringConcatenation compileAssignment(Assignment a)" }, { "name": "iee$iee", "new_args": "", "new_implementation": null, "new_return_type": "Adapter", "new_signature": "Adapter createMatrixAssignmentAdapter()", "old_args": "", "old_implementation": null, "old_return_type": "Adapter", "old_signature": "Adapter createAssignmentAdapter()" }, { "name": "iee$iee", "new_args": "", "new_implementation": null, "new_return_type": "Adapter", "new_signature": "Adapter createMatrixAssignmentAdapter()", "old_args": "", "old_implementation": null, "old_return_type": "Adapter", "old_signature": "Adapter createAssignmentAdapter()" }, { "name": "iee$iee", "new_args": "", "new_implementation": null, "new_return_type": "Adapter", "new_signature": "Adapter createMatrixAdapter()", "old_args": "", "old_implementation": null, "old_return_type": "Adapter", "old_signature": "Adapter createIntervalAdapter()" }, { "name": "iee$iee", "new_args": "", "new_implementation": null, "new_return_type": "Adapter", "new_signature": "Adapter createMatrixAdapter()", "old_args": "", "old_implementation": null, "old_return_type": "Adapter", "old_signature": "Adapter createIntervalAdapter()" }, { "name": "iee$iee", "new_args": "", "new_implementation": null, "new_return_type": "Adapter", "new_signature": "Adapter createMatrixAdditionAdapter()", "old_args": "", "old_implementation": null, "old_return_type": "Adapter", "old_signature": "Adapter createMatrixDefinitionAdapter()" }, { "name": "iee$iee", "new_args": "", "new_implementation": null, "new_return_type": "Adapter", "new_signature": "Adapter createMatrixAdditionAdapter()", "old_args": "", "old_implementation": null, "old_return_type": "Adapter", "old_signature": "Adapter createMatrixDefinitionAdapter()" }, { "name": "iee$iee", "new_args": "", "new_implementation": null, "new_return_type": "EObject", "new_signature": "EObject entryRuleMatrixAssignment()", "old_args": "", "old_implementation": null, "old_return_type": "EObject", "old_signature": "EObject entryRuleAssignment()" }, { "name": "iee$iee", "new_args": "", "new_implementation": null, "new_return_type": "EObject", "new_signature": "EObject entryRuleMatrixAssignment()", "old_args": "", "old_implementation": null, "old_return_type": "EObject", "old_signature": "EObject entryRuleAssignment()" }, { "name": "iee$iee", "new_args": "", "new_implementation": null, "new_return_type": "EObject", "new_signature": "EObject entryRuleMatrixAddition()", "old_args": "", "old_implementation": null, "old_return_type": "EObject", "old_signature": "EObject entryRuleMatrixDefinition()" }, { "name": "iee$iee", "new_args": "", "new_implementation": null, "new_return_type": "EObject", "new_signature": "EObject entryRuleMatrixAddition()", "old_args": "", "old_implementation": null, "old_return_type": "EObject", "old_signature": "EObject entryRuleMatrixDefinition()" }, { "name": "iee$iee", "new_args": "", "new_implementation": "return cAdditionParserRuleCall_4_1;", "new_return_type": "RuleCall", "new_signature": "RuleCall getAdditionParserRuleCall_4_1()", "old_args": "", "old_implementation": "return cAdditionParserRuleCall_3_1;", "old_return_type": "RuleCall", "old_signature": "RuleCall getAdditionParserRuleCall_3_1()" }, { "name": "iee$iee", "new_args": "", "new_implementation": null, "new_return_type": "RuleCall", "new_signature": "RuleCall getRowINTTerminalRuleCall_3_3_0()", "old_args": "", "old_implementation": null, "old_return_type": "RuleCall", "old_signature": "RuleCall getAdditionParserRuleCall_3_1()" }, { "name": "iee$iee", "new_args": "", "new_implementation": null, "new_return_type": "EClass", "new_signature": "EClass getMatrixAssignment()", "old_args": "", "old_implementation": null, "old_return_type": "EClass", "old_signature": "EClass getAssignment()" }, { "name": "iee$iee", "new_args": "", "new_implementation": null, "new_return_type": "EClass", "new_signature": "EClass getMatrixAssignment()", "old_args": "", "old_implementation": null, "old_return_type": "EClass", "old_signature": "EClass getAssignment()" }, { "name": "iee$iee", "new_args": "", "new_implementation": "return (pVariableAssignment != null) ? pVariableAssignment : (pVariableAssignment = new VariableAssignmentElements());\n\tpublic ParserRule getVariableAssignmentRule() {\n\t\treturn getVariableAssignmentAccess().getRule();\n\t//\tExponent | \"(-\" {Invert", "new_return_type": "VariableAssignmentElements", "new_signature": "VariableAssignmentElements getVariableAssignmentAccess()", "old_args": "", "old_implementation": "return (pAssignment != null) ? pAssignment : (pAssignment = new AssignmentElements());\n\tpublic ParserRule getAssignmentRule() {\n\t\treturn getAssignmentAccess().getRule();\n\t//\n\t//\n\t//\n\t//\tExponent | \"-\" {Invert", "old_return_type": "AssignmentElements", "old_signature": "AssignmentElements getAssignmentAccess()" }, { "name": "iee$iee", "new_args": "", "new_implementation": "return (pVariableAssignment != null) ? pVariableAssignment : (pVariableAssignment = new VariableAssignmentElements());\n\tpublic ParserRule getVariableAssignmentRule() {\n\t\treturn getVariableAssignmentAccess().getRule();\n\t//\tExponent | \"(-\" {Invert", "new_return_type": "VariableAssignmentElements", "new_signature": "VariableAssignmentElements getVariableAssignmentAccess()", "old_args": "", "old_implementation": "return (pAssignment != null) ? pAssignment : (pAssignment = new AssignmentElements());\n\tpublic ParserRule getAssignmentRule() {\n\t\treturn getAssignmentAccess().getRule();\n\t//\n\t//\n\t//\n\t//\tExponent | \"-\" {Invert", "old_return_type": "AssignmentElements", "old_signature": "AssignmentElements getAssignmentAccess()" }, { "name": "iee$iee", "new_args": "", "new_implementation": "return cVariableAssignmentVariableAssignmentParserRuleCall_1_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getVariableAssignmentVariableAssignmentParserRuleCall_1_0()", "old_args": "", "old_implementation": "return cAssignmentAssignmentParserRuleCall_2_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getAssignmentAssignmentParserRuleCall_2_0()" }, { "name": "iee$iee", "new_args": "", "new_implementation": "return cVariableAssignmentVariableAssignmentParserRuleCall_1_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getVariableAssignmentVariableAssignmentParserRuleCall_1_0()", "old_args": "", "old_implementation": "return cAssignmentAssignmentParserRuleCall_2_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getAssignmentAssignmentParserRuleCall_2_0()" }, { "name": "iee$iee", "new_args": "", "new_implementation": "return cVariableAssignmentAssignment_1;", "new_return_type": "Assignment", "new_signature": "Assignment getVariableAssignmentAssignment_1()", "old_args": "", "old_implementation": "return cAssignmentAssignment_2;", "old_return_type": "Assignment", "old_signature": "Assignment getAssignmentAssignment_2()" }, { "name": "iee$iee", "new_args": "", "new_implementation": "return cVariableAssignmentAssignment_1;", "new_return_type": "Assignment", "new_signature": "Assignment getVariableAssignmentAssignment_1()", "old_args": "", "old_implementation": "return cAssignmentAssignment_2;", "old_return_type": "Assignment", "old_signature": "Assignment getAssignmentAssignment_2()" }, { "name": "iee$iee", "new_args": "", "new_implementation": null, "new_return_type": "ParserRule", "new_signature": "ParserRule getVariableAssignmentRule()", "old_args": "", "old_implementation": null, "old_return_type": "ParserRule", "old_signature": "ParserRule getAssignmentRule()" }, { "name": "iee$iee", "new_args": "", "new_implementation": null, "new_return_type": "ParserRule", "new_signature": "ParserRule getVariableAssignmentRule()", "old_args": "", "old_implementation": null, "old_return_type": "ParserRule", "old_signature": "ParserRule getAssignmentRule()" }, { "name": "iee$iee", "new_args": "", "new_implementation": null, "new_return_type": "EReference", "new_signature": "EReference getMatrixAssignment_Value()", "old_args": "", "old_implementation": null, "old_return_type": "EReference", "old_signature": "EReference getAssignment_Value()" }, { "name": "iee$iee", "new_args": "", "new_implementation": null, "new_return_type": "EReference", "new_signature": "EReference getMatrixAssignment_Value()", "old_args": "", "old_implementation": null, "old_return_type": "EReference", "old_signature": "EReference getAssignment_Value()" }, { "name": "iee$iee", "new_args": "", "new_implementation": null, "new_return_type": "EAttribute", "new_signature": "EAttribute getMatrixAssignment_Variable()", "old_args": "", "old_implementation": null, "old_return_type": "EAttribute", "old_signature": "EAttribute getAssignment_Variable()" }, { "name": "iee$iee", "new_args": "", "new_implementation": null, "new_return_type": "EAttribute", "new_signature": "EAttribute getMatrixAssignment_Variable()", "old_args": "", "old_implementation": null, "old_return_type": "EAttribute", "old_signature": "EAttribute getAssignment_Variable()" }, { "name": "iee$iee", "new_args": "", "new_implementation": "return cFormulaAssignment_2;", "new_return_type": "Assignment", "new_signature": "Assignment getFormulaAssignment_2()", "old_args": "", "old_implementation": "return cFormulaAssignment_3;", "old_return_type": "Assignment", "old_signature": "Assignment getFormulaAssignment_3()" }, { "name": "iee$iee", "new_args": "", "new_implementation": "return cFormulaAssignment_2;", "new_return_type": "Assignment", "new_signature": "Assignment getFormulaAssignment_2()", "old_args": "", "old_implementation": "return cFormulaAssignment_3;", "old_return_type": "Assignment", "old_signature": "Assignment getFormulaAssignment_3()" }, { "name": "iee$iee", "new_args": "", "new_implementation": "return cFormulaFormulaParserRuleCall_2_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getFormulaFormulaParserRuleCall_2_0()", "old_args": "", "old_implementation": "return cFormulaFormulaParserRuleCall_3_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getFormulaFormulaParserRuleCall_3_0()" }, { "name": "iee$iee", "new_args": "", "new_implementation": "return cFormulaFormulaParserRuleCall_2_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getFormulaFormulaParserRuleCall_2_0()", "old_args": "", "old_implementation": "return cFormulaFormulaParserRuleCall_3_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getFormulaFormulaParserRuleCall_3_0()" }, { "name": "iee$iee", "new_args": "", "new_implementation": "return cFunctionAction_3_0;", "new_return_type": "Action", "new_signature": "Action getFunctionAction_3_0()", "old_args": "", "old_implementation": "return cFunctionAction_2_0;", "old_return_type": "Action", "old_signature": "Action getFunctionAction_2_0()" }, { "name": "iee$iee", "new_args": "", "new_implementation": "return cFunctionAssignment_3_1;", "new_return_type": "Assignment", "new_signature": "Assignment getFunctionAssignment_3_1()", "old_args": "", "old_implementation": "return cFunctionAssignment_2_1;", "old_return_type": "Assignment", "old_signature": "Assignment getFunctionAssignment_2_1()" }, { "name": "iee$iee", "new_args": "", "new_implementation": "return cFunctionFunctionParserRuleCall_3_1_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getFunctionFunctionParserRuleCall_3_1_0()", "old_args": "", "old_implementation": "return cFunctionFunctionParserRuleCall_2_1_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getFunctionFunctionParserRuleCall_2_1_0()" }, { "name": "iee$iee", "new_args": "", "new_implementation": null, "new_return_type": "EClass", "new_signature": "EClass getMatrix()", "old_args": "", "old_implementation": null, "old_return_type": "EClass", "old_signature": "EClass getInterval()" }, { "name": "iee$iee", "new_args": "", "new_implementation": null, "new_return_type": "EClass", "new_signature": "EClass getMatrix()", "old_args": "", "old_implementation": null, "old_return_type": "EClass", "old_signature": "EClass getInterval()" }, { "name": "iee$iee", "new_args": "", "new_implementation": null, "new_return_type": "EReference", "new_signature": "EReference getMatrixAddition_Right()", "old_args": "", "old_implementation": null, "old_return_type": "EReference", "old_signature": "EReference getInterval_Ceil()" }, { "name": "iee$iee", "new_args": "", "new_implementation": null, "new_return_type": "EReference", "new_signature": "EReference getMatrixAddition_Right()", "old_args": "", "old_implementation": null, "old_return_type": "EReference", "old_signature": "EReference getInterval_Ceil()" }, { "name": "iee$iee", "new_args": "", "new_implementation": null, "new_return_type": "EReference", "new_signature": "EReference getMatrixMultiplication_RightScalar()", "old_args": "", "old_implementation": null, "old_return_type": "EReference", "old_signature": "EReference getInterval_Floor()" }, { "name": "iee$iee", "new_args": "", "new_implementation": null, "new_return_type": "EAttribute", "new_signature": "EAttribute getMatrixElement_Element()", "old_args": "", "old_implementation": null, "old_return_type": "EAttribute", "old_signature": "EAttribute getInterval_OpeningBracket()" }, { "name": "iee$iee", "new_args": "", "new_implementation": null, "new_return_type": "EAttribute", "new_signature": "EAttribute getMatrixElement_Element()", "old_args": "", "old_implementation": null, "old_return_type": "EAttribute", "old_signature": "EAttribute getInterval_OpeningBracket()" }, { "name": "iee$iee", "new_args": "", "new_implementation": null, "new_return_type": "Keyword", "new_signature": "Keyword getLeftParenthesisKeyword_4_0()", "old_args": "", "old_implementation": null, "old_return_type": "Keyword", "old_signature": "Keyword getLeftParenthesisKeyword_3_0()" }, { "name": "iee$iee", "new_args": "", "new_implementation": null, "new_return_type": "Keyword", "new_signature": "Keyword getLeftSquareBracketKeyword_3_2()", "old_args": "", "old_implementation": null, "old_return_type": "Keyword", "old_signature": "Keyword getLeftParenthesisKeyword_3_0()" }, { "name": "iee$iee", "new_args": "", "new_implementation": "return cLeftParenthesisHyphenMinusKeyword_1_0;", "new_return_type": "Keyword", "new_signature": "Keyword getLeftParenthesisHyphenMinusKeyword_1_0()", "old_args": "", "old_implementation": "return cLeftParenthesisKeyword_3_2;", "old_return_type": "Keyword", "old_signature": "Keyword getLeftParenthesisKeyword_3_2()" }, { "name": "iee$iee", "new_args": "", "new_implementation": "return cLeftParenthesisHyphenMinusKeyword_1_0;", "new_return_type": "Keyword", "new_signature": "Keyword getLeftParenthesisHyphenMinusKeyword_1_0()", "old_args": "", "old_implementation": "return cLeftParenthesisKeyword_3_2;", "old_return_type": "Keyword", "old_signature": "Keyword getLeftParenthesisKeyword_3_2()" }, { "name": "iee$iee", "new_args": "", "new_implementation": null, "new_return_type": "EClass", "new_signature": "EClass getMatrixExpression()", "old_args": "", "old_implementation": null, "old_return_type": "EClass", "old_signature": "EClass getMatrixDefinition()" }, { "name": "iee$iee", "new_args": "", "new_implementation": null, "new_return_type": "EClass", "new_signature": "EClass getMatrixExpression()", "old_args": "", "old_implementation": null, "old_return_type": "EClass", "old_signature": "EClass getMatrixDefinition()" }, { "name": "iee$iee", "new_args": "", "new_implementation": "return (pMatrixAssignment != null) ? pMatrixAssignment : (pMatrixAssignment = new MatrixAssignmentElements());", "new_return_type": "MatrixAssignmentElements", "new_signature": "MatrixAssignmentElements getMatrixAssignmentAccess()", "old_args": "", "old_implementation": "return (pMatrixDefinition != null) ? pMatrixDefinition : (pMatrixDefinition = new MatrixDefinitionElements());", "old_return_type": "MatrixDefinitionElements", "old_signature": "MatrixDefinitionElements getMatrixDefinitionAccess()" }, { "name": "iee$iee", "new_args": "", "new_implementation": "return (pMatrixFormula != null) ? pMatrixFormula : (pMatrixFormula = new MatrixFormulaElements());", "new_return_type": "MatrixFormulaElements", "new_signature": "MatrixFormulaElements getMatrixFormulaAccess()", "old_args": "", "old_implementation": "return (pMatrixDefinition != null) ? pMatrixDefinition : (pMatrixDefinition = new MatrixDefinitionElements());", "old_return_type": "MatrixDefinitionElements", "old_signature": "MatrixDefinitionElements getMatrixDefinitionAccess()" }, { "name": "iee$iee", "new_args": "", "new_implementation": "return cMatrixAssignmentAssignment_3;", "new_return_type": "Assignment", "new_signature": "Assignment getMatrixAssignmentAssignment_3()", "old_args": "", "old_implementation": "return cMatrixDefinitionAssignment_1;", "old_return_type": "Assignment", "old_signature": "Assignment getMatrixDefinitionAssignment_1()" }, { "name": "iee$iee", "new_args": "", "new_implementation": "return cMatrixAssignmentAssignment_3;", "new_return_type": "Assignment", "new_signature": "Assignment getMatrixAssignmentAssignment_3()", "old_args": "", "old_implementation": "return cMatrixDefinitionAssignment_1;", "old_return_type": "Assignment", "old_signature": "Assignment getMatrixDefinitionAssignment_1()" }, { "name": "iee$iee", "new_args": "", "new_implementation": "return cMatrixAssignmentMatrixAssignmentParserRuleCall_3_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getMatrixAssignmentMatrixAssignmentParserRuleCall_3_0()", "old_args": "", "old_implementation": "return cMatrixDefinitionMatrixDefinitionParserRuleCall_1_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getMatrixDefinitionMatrixDefinitionParserRuleCall_1_0()" }, { "name": "iee$iee", "new_args": "", "new_implementation": "return cMatrixAssignmentMatrixAssignmentParserRuleCall_3_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getMatrixAssignmentMatrixAssignmentParserRuleCall_3_0()", "old_args": "", "old_implementation": "return cMatrixDefinitionMatrixDefinitionParserRuleCall_1_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getMatrixDefinitionMatrixDefinitionParserRuleCall_1_0()" }, { "name": "iee$iee", "new_args": "", "new_implementation": "return getMatrixAdditionAccess().getRule();", "new_return_type": "ParserRule", "new_signature": "ParserRule getMatrixAdditionRule()", "old_args": "", "old_implementation": "return getMatrixDefinitionAccess().getRule();", "old_return_type": "ParserRule", "old_signature": "ParserRule getMatrixDefinitionRule()" }, { "name": "iee$iee", "new_args": "", "new_implementation": "return getMatrixAdditionAccess().getRule();", "new_return_type": "ParserRule", "new_signature": "ParserRule getMatrixAdditionRule()", "old_args": "", "old_implementation": "return getMatrixDefinitionAccess().getRule();", "old_return_type": "ParserRule", "old_signature": "ParserRule getMatrixDefinitionRule()" }, { "name": "iee$iee", "new_args": "", "new_implementation": null, "new_return_type": "EAttribute", "new_signature": "EAttribute getVariableAssignment_Variable()", "old_args": "", "old_implementation": null, "old_return_type": "EAttribute", "old_signature": "EAttribute getMatrixDefinition_Name()" }, { "name": "iee$iee", "new_args": "", "new_implementation": null, "new_return_type": "EAttribute", "new_signature": "EAttribute getVariableAssignment_Variable()", "old_args": "", "old_implementation": null, "old_return_type": "EAttribute", "old_signature": "EAttribute getMatrixDefinition_Name()" }, { "name": "iee$iee", "new_args": "", "new_implementation": null, "new_return_type": "EReference", "new_signature": "EReference getVariableAssignment_Value()", "old_args": "", "old_implementation": null, "old_return_type": "EReference", "old_signature": "EReference getMatrixDefinition_Rows()" }, { "name": "iee$iee", "new_args": "", "new_implementation": null, "new_return_type": "EReference", "new_signature": "EReference getVariableAssignment_Value()", "old_args": "", "old_implementation": null, "old_return_type": "EReference", "old_signature": "EReference getMatrixDefinition_Rows()" }, { "name": "iee$iee", "new_args": "", "new_implementation": null, "new_return_type": "Keyword", "new_signature": "Keyword getRightParenthesisKeyword_4_2()", "old_args": "", "old_implementation": null, "old_return_type": "Keyword", "old_signature": "Keyword getRightParenthesisKeyword_3_2()" }, { "name": "iee$iee", "new_args": "", "new_implementation": null, "new_return_type": "Keyword", "new_signature": "Keyword getRightSquareBracketKeyword_3_4()", "old_args": "", "old_implementation": null, "old_return_type": "Keyword", "old_signature": "Keyword getRightParenthesisKeyword_3_2()" }, { "name": "iee$iee", "new_args": "", "new_implementation": "return cRightParenthesisKeyword_1_3;", "new_return_type": "Keyword", "new_signature": "Keyword getRightParenthesisKeyword_1_3()", "old_args": "", "old_implementation": "return cRightParenthesisKeyword_3_4;", "old_return_type": "Keyword", "old_signature": "Keyword getRightParenthesisKeyword_3_4()" }, { "name": "iee$iee", "new_args": "", "new_implementation": "return cRightParenthesisKeyword_1_3;", "new_return_type": "Keyword", "new_signature": "Keyword getRightParenthesisKeyword_1_3()", "old_args": "", "old_implementation": "return cRightParenthesisKeyword_3_4;", "old_return_type": "Keyword", "old_signature": "Keyword getRightParenthesisKeyword_3_4()" }, { "name": "iee$iee", "new_args": "", "new_implementation": null, "new_return_type": "EReference", "new_signature": "EReference getStatement_MatrixAssignment()", "old_args": "", "old_implementation": null, "old_return_type": "EReference", "old_signature": "EReference getStatement_Assignment()" }, { "name": "iee$iee", "new_args": "", "new_implementation": null, "new_return_type": "EReference", "new_signature": "EReference getStatement_MatrixAssignment()", "old_args": "", "old_implementation": null, "old_return_type": "EReference", "old_signature": "EReference getStatement_Assignment()" }, { "name": "iee$iee", "new_args": "", "new_implementation": null, "new_return_type": "EReference", "new_signature": "EReference getStatement_VariableAssignment()", "old_args": "", "old_implementation": null, "old_return_type": "EReference", "old_signature": "EReference getStatement_MatrixDefinition()" }, { "name": "iee$iee", "new_args": "", "new_implementation": null, "new_return_type": "EReference", "new_signature": "EReference getStatement_VariableAssignment()", "old_args": "", "old_implementation": null, "old_return_type": "EReference", "old_signature": "EReference getStatement_MatrixDefinition()" }, { "name": "iee$iee", "new_args": "", "new_implementation": null, "new_return_type": "EObject", "new_signature": "EObject entryRuleVariableAssignment()", "old_args": "", "old_implementation": null, "old_return_type": "EObject", "old_signature": "EObject ruleAssignment()" }, { "name": "iee$iee", "new_args": "", "new_implementation": null, "new_return_type": "EObject", "new_signature": "EObject entryRuleVariableAssignment()", "old_args": "", "old_implementation": null, "old_return_type": "EObject", "old_signature": "EObject ruleAssignment()" }, { "name": "iee$iee", "new_args": "", "new_implementation": null, "new_return_type": "EObject", "new_signature": "EObject ruleMatrixMultiplication()", "old_args": "", "old_implementation": null, "old_return_type": "EObject", "old_signature": "EObject ruleMatrixDefinition()" }, { "name": "iee$iee", "new_args": "", "new_implementation": null, "new_return_type": "EObject", "new_signature": "EObject rulePrimaryMatrix()", "old_args": "", "old_implementation": null, "old_return_type": "EObject", "old_signature": "EObject ruleMatrixDefinition()" }, { "name": "iee$iee", "new_args": "MatrixAssignment newMatrixAssignment", "new_implementation": null, "new_return_type": "void", "new_signature": "void setMatrixAssignment(MatrixAssignment newMatrixAssignment)", "old_args": "Assignment newAssignment", "old_implementation": null, "old_return_type": "void", "old_signature": "void setAssignment(Assignment newAssignment)" }, { "name": "iee$iee", "new_args": "MatrixAssignment newMatrixAssignment", "new_implementation": null, "new_return_type": "void", "new_signature": "void setMatrixAssignment(MatrixAssignment newMatrixAssignment)", "old_args": "Assignment newAssignment", "old_implementation": null, "old_return_type": "void", "old_signature": "void setAssignment(Assignment newAssignment)" }, { "name": "iee$iee", "new_args": "VariableAssignment newVariableAssignment", "new_implementation": null, "new_return_type": "void", "new_signature": "void setVariableAssignment(VariableAssignment newVariableAssignment)", "old_args": "MatrixDefinition newMatrixDefinition", "old_implementation": null, "old_return_type": "void", "old_signature": "void setMatrixDefinition(MatrixDefinition newMatrixDefinition)" }, { "name": "iee$iee", "new_args": "VariableAssignment newVariableAssignment", "new_implementation": null, "new_return_type": "void", "new_signature": "void setVariableAssignment(VariableAssignment newVariableAssignment)", "old_args": "MatrixDefinition newMatrixDefinition", "old_implementation": null, "old_return_type": "void", "old_signature": "void setMatrixDefinition(MatrixDefinition newMatrixDefinition)" }, { "name": "iee$iee", "new_args": "", "new_implementation": null, "new_return_type": "boolean", "new_signature": "boolean synpred10_InternalMath()", "old_args": "", "old_implementation": null, "old_return_type": "boolean", "old_signature": "boolean synpred11_InternalMath()" }, { "name": "iee$iee", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void synpred6_InternalMath_fragment()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void synpred11_InternalMath_fragment()" }, { "name": "iee$iee", "new_args": "", "new_implementation": null, "new_return_type": "boolean", "new_signature": "boolean synpred10_InternalMex()", "old_args": "", "old_implementation": null, "old_return_type": "boolean", "old_signature": "boolean synpred11_InternalMex()" }, { "name": "iee$iee", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void synpred6_InternalMex_fragment()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void synpred11_InternalMex_fragment()" }, { "name": "iee$iee", "new_args": "", "new_implementation": null, "new_return_type": "boolean", "new_signature": "boolean synpred5_InternalMath()", "old_args": "", "old_implementation": null, "old_return_type": "boolean", "old_signature": "boolean synpred9_InternalMath()" }, { "name": "iee$iee", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void synpred10_InternalMath_fragment()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void synpred9_InternalMath_fragment()" }, { "name": "iee$iee", "new_args": "", "new_implementation": null, "new_return_type": "boolean", "new_signature": "boolean synpred6_InternalMex()", "old_args": "", "old_implementation": null, "old_return_type": "boolean", "old_signature": "boolean synpred9_InternalMex()" }, { "name": "iee$iee", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void synpred10_InternalMex_fragment()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void synpred9_InternalMex_fragment()" } ]
[ { "additions": 58, "blob_url": "https://github.com/iee/iee/blob/0f04d91efdf50447d8e84e926ef98d7462103dc0/org.eclipse.iee.translator.Jmole%2Forg.eclipse.iee.translator.jmole.math%2Fbin%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fjmole%2Fmath%2FMath.ecore", "changes": 78, "contents_url": "https://api.github.com/repos/iee/iee/contents/org.eclipse.iee.translator.Jmole%2Forg.eclipse.iee.translator.jmole.math%2Fbin%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fjmole%2Fmath%2FMath.ecore?ref=0f04d91efdf50447d8e84e926ef98d7462103dc0", "deletions": 20, "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/bin/org/eclipse/iee/translator/jmole/math/Math.ecore", "new_code": " <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"variableAssignment\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//VariableAssignment\"\n <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"matrixAssignment\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixAssignment\"\n containment=\"true\"/>\n <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"matrixFormula\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixFormula\"\n containment=\"true\"/>\n <eClassifiers xsi:type=\"ecore:EClass\" name=\"VariableAssignment\">\n <eClassifiers xsi:type=\"ecore:EClass\" name=\"Matrix\">\n <eClassifiers xsi:type=\"ecore:EClass\" name=\"MatrixAssignment\">\n <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"variable\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString\"/>\n <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"value\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixFormula\"\n containment=\"true\"/>\n </eClassifiers>\n <eClassifiers xsi:type=\"ecore:EClass\" name=\"MatrixFormula\">\n <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"expression\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixExpression\"\n containment=\"true\"/>\n </eClassifiers>\n <eClassifiers xsi:type=\"ecore:EClass\" name=\"MatrixExpression\"/>\n <eClassifiers xsi:type=\"ecore:EClass\" name=\"FunctionDefinition\">\n <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"function\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Expression\"\n containment=\"true\"/>\n <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"formula\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Formula\"\n containment=\"true\"/>\n </eClassifiers>\n <eClassifiers xsi:type=\"ecore:EClass\" name=\"MatrixElement\" eSuperTypes=\"platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Expression\">\n <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"element\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString\"/>\n <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"row\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt\"/>\n <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"column\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt\"/>\n </eClassifiers>\n <eClassifiers xsi:type=\"ecore:EClass\" name=\"MatrixAddition\" eSuperTypes=\"platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixExpression\">\n <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"left\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixExpression\"\n containment=\"true\"/>\n <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"right\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixExpression\"\n containment=\"true\"/>\n </eClassifiers>\n <eClassifiers xsi:type=\"ecore:EClass\" name=\"MatrixSubtraction\" eSuperTypes=\"platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixExpression\">\n <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"left\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixExpression\"\n containment=\"true\"/>\n <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"right\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixExpression\"\n containment=\"true\"/>\n </eClassifiers>\n <eClassifiers xsi:type=\"ecore:EClass\" name=\"MatrixMultiplication\" eSuperTypes=\"platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixExpression\">\n <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"left\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixExpression\"\n containment=\"true\"/>\n <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"rightMatrix\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixExpression\"\n containment=\"true\"/>\n <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"rightScalar\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Formula\"\n containment=\"true\"/>\n </eClassifiers>\n <eClassifiers xsi:type=\"ecore:EClass\" name=\"NewMatrix\" eSuperTypes=\"platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixExpression\">\n <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"matrix\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Matrix\"\n containment=\"true\"/>\n </eClassifiers>\n <eClassifiers xsi:type=\"ecore:EClass\" name=\"TransposeMatrix\" eSuperTypes=\"platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixExpression\">\n <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"name\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString\"/>\n </eClassifiers>\n <eClassifiers xsi:type=\"ecore:EClass\" name=\"MatrixVariable\" eSuperTypes=\"platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixExpression\">\n <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"name\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString\"/>\n </eClassifiers>", "new_methods": [], "old_code": " <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"matrixDefinition\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixDefinition\"\n containment=\"true\"/>\n <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"assignment\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Assignment\"\n <eClassifiers xsi:type=\"ecore:EClass\" name=\"Assignment\">\n <eClassifiers xsi:type=\"ecore:EClass\" name=\"FunctionDefinition\">\n <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"function\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Expression\"\n containment=\"true\"/>\n <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"formula\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Formula\"\n containment=\"true\"/>\n </eClassifiers>\n <eClassifiers xsi:type=\"ecore:EClass\" name=\"MatrixDefinition\">\n <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"name\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString\"/>\n <eClassifiers xsi:type=\"ecore:EClass\" name=\"Interval\" eSuperTypes=\"platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Expression\">\n <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"openingBracket\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString\"/>\n <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"ceil\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Expression\"\n containment=\"true\"/>\n <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"floor\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Expression\"\n containment=\"true\"/>\n <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"closingBracket\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString\"/>\n </eClassifiers>", "old_methods": [], "patch": "@@ -6,14 +6,16 @@\n <eClassifiers xsi:type=\"ecore:EClass\" name=\"Statement\">\n <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"functionDefinition\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//FunctionDefinition\"\n containment=\"true\"/>\n- <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"matrixDefinition\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixDefinition\"\n- containment=\"true\"/>\n- <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"assignment\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Assignment\"\n+ <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"variableAssignment\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//VariableAssignment\"\n containment=\"true\"/>\n <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"formula\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Formula\"\n containment=\"true\"/>\n+ <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"matrixAssignment\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixAssignment\"\n+ containment=\"true\"/>\n+ <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"matrixFormula\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixFormula\"\n+ containment=\"true\"/>\n </eClassifiers>\n- <eClassifiers xsi:type=\"ecore:EClass\" name=\"Assignment\">\n+ <eClassifiers xsi:type=\"ecore:EClass\" name=\"VariableAssignment\">\n <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"variable\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString\"/>\n <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"value\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Formula\"\n containment=\"true\"/>\n@@ -28,21 +30,30 @@\n eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Formula\"\n containment=\"true\"/>\n </eClassifiers>\n- <eClassifiers xsi:type=\"ecore:EClass\" name=\"FunctionDefinition\">\n- <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"function\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Expression\"\n- containment=\"true\"/>\n- <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"formula\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Formula\"\n- containment=\"true\"/>\n- </eClassifiers>\n- <eClassifiers xsi:type=\"ecore:EClass\" name=\"MatrixDefinition\">\n- <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"name\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString\"/>\n+ <eClassifiers xsi:type=\"ecore:EClass\" name=\"Matrix\">\n <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"rows\" upperBound=\"-1\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixRow\"\n containment=\"true\"/>\n </eClassifiers>\n <eClassifiers xsi:type=\"ecore:EClass\" name=\"MatrixRow\">\n <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"elements\" unique=\"false\"\n upperBound=\"-1\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString\"/>\n </eClassifiers>\n+ <eClassifiers xsi:type=\"ecore:EClass\" name=\"MatrixAssignment\">\n+ <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"variable\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString\"/>\n+ <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"value\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixFormula\"\n+ containment=\"true\"/>\n+ </eClassifiers>\n+ <eClassifiers xsi:type=\"ecore:EClass\" name=\"MatrixFormula\">\n+ <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"expression\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixExpression\"\n+ containment=\"true\"/>\n+ </eClassifiers>\n+ <eClassifiers xsi:type=\"ecore:EClass\" name=\"MatrixExpression\"/>\n+ <eClassifiers xsi:type=\"ecore:EClass\" name=\"FunctionDefinition\">\n+ <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"function\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Expression\"\n+ containment=\"true\"/>\n+ <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"formula\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Formula\"\n+ containment=\"true\"/>\n+ </eClassifiers>\n <eClassifiers xsi:type=\"ecore:EClass\" name=\"Addition\" eSuperTypes=\"platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Expression\">\n <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"left\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Expression\"\n containment=\"true\"/>\n@@ -81,14 +92,6 @@\n <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"expression\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Expression\"\n containment=\"true\"/>\n </eClassifiers>\n- <eClassifiers xsi:type=\"ecore:EClass\" name=\"Interval\" eSuperTypes=\"platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Expression\">\n- <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"openingBracket\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString\"/>\n- <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"ceil\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Expression\"\n- containment=\"true\"/>\n- <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"floor\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Expression\"\n- containment=\"true\"/>\n- <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"closingBracket\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString\"/>\n- </eClassifiers>\n <eClassifiers xsi:type=\"ecore:EClass\" name=\"Exponent\" eSuperTypes=\"platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Expression\">\n <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"left\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Expression\"\n containment=\"true\"/>\n@@ -99,8 +102,43 @@\n <eClassifiers xsi:type=\"ecore:EClass\" name=\"Float\" eSuperTypes=\"platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Expression\">\n <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"value\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString\"/>\n </eClassifiers>\n+ <eClassifiers xsi:type=\"ecore:EClass\" name=\"MatrixElement\" eSuperTypes=\"platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Expression\">\n+ <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"element\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString\"/>\n+ <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"row\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt\"/>\n+ <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"column\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt\"/>\n+ </eClassifiers>\n <eClassifiers xsi:type=\"ecore:EClass\" name=\"Function\" eSuperTypes=\"platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Expression\">\n <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"function\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Expression\"\n containment=\"true\"/>\n </eClassifiers>\n+ <eClassifiers xsi:type=\"ecore:EClass\" name=\"MatrixAddition\" eSuperTypes=\"platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixExpression\">\n+ <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"left\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixExpression\"\n+ containment=\"true\"/>\n+ <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"right\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixExpression\"\n+ containment=\"true\"/>\n+ </eClassifiers>\n+ <eClassifiers xsi:type=\"ecore:EClass\" name=\"MatrixSubtraction\" eSuperTypes=\"platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixExpression\">\n+ <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"left\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixExpression\"\n+ containment=\"true\"/>\n+ <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"right\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixExpression\"\n+ containment=\"true\"/>\n+ </eClassifiers>\n+ <eClassifiers xsi:type=\"ecore:EClass\" name=\"MatrixMultiplication\" eSuperTypes=\"platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixExpression\">\n+ <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"left\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixExpression\"\n+ containment=\"true\"/>\n+ <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"rightMatrix\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixExpression\"\n+ containment=\"true\"/>\n+ <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"rightScalar\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Formula\"\n+ containment=\"true\"/>\n+ </eClassifiers>\n+ <eClassifiers xsi:type=\"ecore:EClass\" name=\"NewMatrix\" eSuperTypes=\"platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixExpression\">\n+ <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"matrix\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Matrix\"\n+ containment=\"true\"/>\n+ </eClassifiers>\n+ <eClassifiers xsi:type=\"ecore:EClass\" name=\"TransposeMatrix\" eSuperTypes=\"platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixExpression\">\n+ <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"name\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString\"/>\n+ </eClassifiers>\n+ <eClassifiers xsi:type=\"ecore:EClass\" name=\"MatrixVariable\" eSuperTypes=\"platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixExpression\">\n+ <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"name\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString\"/>\n+ </eClassifiers>\n </ecore:EPackage>", "raw_url": "https://github.com/iee/iee/raw/0f04d91efdf50447d8e84e926ef98d7462103dc0/org.eclipse.iee.translator.Jmole%2Forg.eclipse.iee.translator.jmole.math%2Fbin%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fjmole%2Fmath%2FMath.ecore", "sha": "1e33bf66f7ba9ca9d14a1a38c79e55e3e220cb41", "status": "modified" }, { "additions": 47, "blob_url": "https://github.com/iee/iee/blob/0f04d91efdf50447d8e84e926ef98d7462103dc0/org.eclipse.iee.translator.Jmole%2Forg.eclipse.iee.translator.jmole.math%2Fbin%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fjmole%2Fmath%2FMath.genmodel", "changes": 65, "contents_url": "https://api.github.com/repos/iee/iee/contents/org.eclipse.iee.translator.Jmole%2Forg.eclipse.iee.translator.jmole.math%2Fbin%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fjmole%2Fmath%2FMath.genmodel?ref=0f04d91efdf50447d8e84e926ef98d7462103dc0", "deletions": 18, "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/bin/org/eclipse/iee/translator/jmole/math/Math.genmodel", "new_code": " <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Statement/variableAssignment\"/>\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Statement/matrixAssignment\"/>\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Statement/matrixFormula\"/>\n <genClasses ecoreClass=\"platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//VariableAssignment\">\n <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//VariableAssignment/variable\"/>\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//VariableAssignment/value\"/>\n <genClasses ecoreClass=\"platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Matrix\">\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Matrix/rows\"/>\n <genClasses ecoreClass=\"platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixAssignment\">\n <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixAssignment/variable\"/>\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixAssignment/value\"/>\n </genClasses>\n <genClasses ecoreClass=\"platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixFormula\">\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixFormula/expression\"/>\n </genClasses>\n <genClasses ecoreClass=\"platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixExpression\"/>\n <genClasses ecoreClass=\"platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//FunctionDefinition\">\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//FunctionDefinition/function\"/>\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//FunctionDefinition/formula\"/>\n </genClasses>\n <genClasses ecoreClass=\"platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixElement\">\n <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixElement/element\"/>\n <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixElement/row\"/>\n <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixElement/column\"/>\n </genClasses>\n <genClasses ecoreClass=\"platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixAddition\">\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixAddition/left\"/>\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixAddition/right\"/>\n </genClasses>\n <genClasses ecoreClass=\"platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixSubtraction\">\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixSubtraction/left\"/>\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixSubtraction/right\"/>\n </genClasses>\n <genClasses ecoreClass=\"platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixMultiplication\">\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixMultiplication/left\"/>\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixMultiplication/rightMatrix\"/>\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixMultiplication/rightScalar\"/>\n </genClasses>\n <genClasses ecoreClass=\"platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//NewMatrix\">\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//NewMatrix/matrix\"/>\n </genClasses>\n <genClasses ecoreClass=\"platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//TransposeMatrix\">\n <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//TransposeMatrix/name\"/>\n </genClasses>\n <genClasses ecoreClass=\"platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixVariable\">\n <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixVariable/name\"/>\n </genClasses>", "new_methods": [], "old_code": " <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Statement/matrixDefinition\"/>\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Statement/assignment\"/>\n <genClasses ecoreClass=\"platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Assignment\">\n <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Assignment/variable\"/>\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Assignment/value\"/>\n <genClasses ecoreClass=\"platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//FunctionDefinition\">\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//FunctionDefinition/function\"/>\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//FunctionDefinition/formula\"/>\n </genClasses>\n <genClasses ecoreClass=\"platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixDefinition\">\n <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixDefinition/name\"/>\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixDefinition/rows\"/>\n <genClasses ecoreClass=\"platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Interval\">\n <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Interval/openingBracket\"/>\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Interval/ceil\"/>\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Interval/floor\"/>\n <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Interval/closingBracket\"/>\n </genClasses>", "old_methods": [], "patch": "@@ -11,13 +11,14 @@\n ecorePackage=\"platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#/\">\n <genClasses ecoreClass=\"platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Statement\">\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Statement/functionDefinition\"/>\n- <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Statement/matrixDefinition\"/>\n- <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Statement/assignment\"/>\n+ <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Statement/variableAssignment\"/>\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Statement/formula\"/>\n+ <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Statement/matrixAssignment\"/>\n+ <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Statement/matrixFormula\"/>\n </genClasses>\n- <genClasses ecoreClass=\"platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Assignment\">\n- <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Assignment/variable\"/>\n- <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Assignment/value\"/>\n+ <genClasses ecoreClass=\"platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//VariableAssignment\">\n+ <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//VariableAssignment/variable\"/>\n+ <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//VariableAssignment/value\"/>\n </genClasses>\n <genClasses ecoreClass=\"platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Formula\">\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Formula/expression\"/>\n@@ -26,17 +27,24 @@\n <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Expression/name\"/>\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Expression/parameters\"/>\n </genClasses>\n- <genClasses ecoreClass=\"platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//FunctionDefinition\">\n- <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//FunctionDefinition/function\"/>\n- <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//FunctionDefinition/formula\"/>\n- </genClasses>\n- <genClasses ecoreClass=\"platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixDefinition\">\n- <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixDefinition/name\"/>\n- <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixDefinition/rows\"/>\n+ <genClasses ecoreClass=\"platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Matrix\">\n+ <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Matrix/rows\"/>\n </genClasses>\n <genClasses ecoreClass=\"platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixRow\">\n <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixRow/elements\"/>\n </genClasses>\n+ <genClasses ecoreClass=\"platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixAssignment\">\n+ <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixAssignment/variable\"/>\n+ <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixAssignment/value\"/>\n+ </genClasses>\n+ <genClasses ecoreClass=\"platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixFormula\">\n+ <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixFormula/expression\"/>\n+ </genClasses>\n+ <genClasses ecoreClass=\"platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixExpression\"/>\n+ <genClasses ecoreClass=\"platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//FunctionDefinition\">\n+ <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//FunctionDefinition/function\"/>\n+ <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//FunctionDefinition/formula\"/>\n+ </genClasses>\n <genClasses ecoreClass=\"platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Addition\">\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Addition/left\"/>\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Addition/right\"/>\n@@ -63,12 +71,6 @@\n <genClasses ecoreClass=\"platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Factorial\">\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Factorial/expression\"/>\n </genClasses>\n- <genClasses ecoreClass=\"platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Interval\">\n- <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Interval/openingBracket\"/>\n- <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Interval/ceil\"/>\n- <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Interval/floor\"/>\n- <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Interval/closingBracket\"/>\n- </genClasses>\n <genClasses ecoreClass=\"platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Exponent\">\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Exponent/left\"/>\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Exponent/right\"/>\n@@ -77,8 +79,35 @@\n <genClasses ecoreClass=\"platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Float\">\n <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Float/value\"/>\n </genClasses>\n+ <genClasses ecoreClass=\"platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixElement\">\n+ <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixElement/element\"/>\n+ <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixElement/row\"/>\n+ <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixElement/column\"/>\n+ </genClasses>\n <genClasses ecoreClass=\"platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Function\">\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Function/function\"/>\n </genClasses>\n+ <genClasses ecoreClass=\"platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixAddition\">\n+ <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixAddition/left\"/>\n+ <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixAddition/right\"/>\n+ </genClasses>\n+ <genClasses ecoreClass=\"platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixSubtraction\">\n+ <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixSubtraction/left\"/>\n+ <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixSubtraction/right\"/>\n+ </genClasses>\n+ <genClasses ecoreClass=\"platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixMultiplication\">\n+ <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixMultiplication/left\"/>\n+ <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixMultiplication/rightMatrix\"/>\n+ <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixMultiplication/rightScalar\"/>\n+ </genClasses>\n+ <genClasses ecoreClass=\"platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//NewMatrix\">\n+ <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//NewMatrix/matrix\"/>\n+ </genClasses>\n+ <genClasses ecoreClass=\"platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//TransposeMatrix\">\n+ <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//TransposeMatrix/name\"/>\n+ </genClasses>\n+ <genClasses ecoreClass=\"platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixVariable\">\n+ <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixVariable/name\"/>\n+ </genClasses>\n </genPackages>\n </genmodel:GenModel>", "raw_url": "https://github.com/iee/iee/raw/0f04d91efdf50447d8e84e926ef98d7462103dc0/org.eclipse.iee.translator.Jmole%2Forg.eclipse.iee.translator.jmole.math%2Fbin%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fjmole%2Fmath%2FMath.genmodel", "sha": "753e79ff1a42386f5fb070f2e10972e5be5a015f", "status": "modified" }, { "additions": 214, "blob_url": "https://github.com/iee/iee/blob/0f04d91efdf50447d8e84e926ef98d7462103dc0/org.eclipse.iee.translator.Jmole%2Forg.eclipse.iee.translator.jmole.math%2Fbin%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fjmole%2Fmath%2FMath.xmi", "changes": 304, "contents_url": "https://api.github.com/repos/iee/iee/contents/org.eclipse.iee.translator.Jmole%2Forg.eclipse.iee.translator.jmole.math%2Fbin%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fjmole%2Fmath%2FMath.xmi?ref=0f04d91efdf50447d8e84e926ef98d7462103dc0", "deletions": 90, "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/bin/org/eclipse/iee/translator/jmole/math/Math.xmi", "new_code": " <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.17\"/>\n <elements xsi:type=\"xtext:Assignment\" feature=\"variableAssignment\" operator=\"=\">\n <elements xsi:type=\"xtext:Assignment\" feature=\"matrixAssignment\" operator=\"=\">\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.10\"/>\n </elements>\n <elements xsi:type=\"xtext:Assignment\" feature=\"matrixFormula\" operator=\"=\">\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.11\"/>\n </elements>\n <rules xsi:type=\"xtext:ParserRule\" name=\"VariableAssignment\">\n <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/iee/translator/jmole/math/Math#//VariableAssignment\"/>\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.18\"/>\n <elements xsi:type=\"xtext:Keyword\" value=\"(-\"/>\n <elements xsi:type=\"xtext:Keyword\" value=\")\"/>\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.18\"/>\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.15\"/>\n <elements xsi:type=\"xtext:Group\">\n <elements xsi:type=\"xtext:Action\">\n <type metamodel=\"/0/@metamodelDeclarations.1\">\n <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/iee/translator/jmole/math/Math#//MatrixElement\"/>\n </type>\n </elements>\n <elements xsi:type=\"xtext:Assignment\" feature=\"element\" operator=\"=\">\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.18\"/>\n </elements>\n <elements xsi:type=\"xtext:Keyword\" value=\"[\"/>\n <elements xsi:type=\"xtext:Assignment\" feature=\"row\" operator=\"=\">\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/1/@rules.1\"/>\n </elements>\n <elements xsi:type=\"xtext:Keyword\" value=\"]\"/>\n <elements xsi:type=\"xtext:Keyword\" value=\"[\"/>\n <elements xsi:type=\"xtext:Assignment\" feature=\"column\" operator=\"=\">\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/1/@rules.1\"/>\n </elements>\n <elements xsi:type=\"xtext:Keyword\" value=\"]\"/>\n </elements>\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.16\"/>\n <rules xsi:type=\"xtext:ParserRule\" name=\"Matrix\">\n <type metamodel=\"/0/@metamodelDeclarations.1\">\n <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/iee/translator/jmole/math/Math#//Matrix\"/>\n </type>\n <alternatives xsi:type=\"xtext:Group\">\n <elements xsi:type=\"xtext:Keyword\" value=\"{\"/>\n <elements xsi:type=\"xtext:Group\" cardinality=\"?\">\n <elements xsi:type=\"xtext:Assignment\" feature=\"rows\" operator=\"+=\">\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.9\"/>\n </elements>\n <elements xsi:type=\"xtext:Group\" cardinality=\"*\">\n <elements xsi:type=\"xtext:Keyword\" value=\",\"/>\n <elements xsi:type=\"xtext:Assignment\" feature=\"rows\" operator=\"+=\">\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.9\"/>\n </elements>\n </elements>\n <elements xsi:type=\"xtext:Keyword\" cardinality=\"?\" value=\",\"/>\n </elements>\n <elements xsi:type=\"xtext:Keyword\" value=\"}\"/>\n </alternatives>\n </rules>\n <rules xsi:type=\"xtext:ParserRule\" name=\"MatrixRow\">\n <type metamodel=\"/0/@metamodelDeclarations.1\">\n <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/iee/translator/jmole/math/Math#//MatrixRow\"/>\n </type>\n <alternatives xsi:type=\"xtext:Group\">\n <elements xsi:type=\"xtext:Keyword\" value=\"{\"/>\n <elements xsi:type=\"xtext:Group\" cardinality=\"?\">\n <elements xsi:type=\"xtext:Assignment\" feature=\"elements\" operator=\"+=\">\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.15\"/>\n </elements>\n <elements xsi:type=\"xtext:Group\" cardinality=\"*\">\n <elements xsi:type=\"xtext:Keyword\" value=\",\"/>\n <elements xsi:type=\"xtext:Assignment\" feature=\"elements\" operator=\"+=\">\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.15\"/>\n </elements>\n </elements>\n <elements xsi:type=\"xtext:Keyword\" cardinality=\"?\" value=\",\"/>\n </elements>\n <elements xsi:type=\"xtext:Keyword\" value=\"}\"/>\n </alternatives>\n </rules>\n <rules xsi:type=\"xtext:ParserRule\" name=\"MatrixAssignment\">\n <type metamodel=\"/0/@metamodelDeclarations.1\">\n <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/iee/translator/jmole/math/Math#//MatrixAssignment\"/>\n </type>\n <alternatives xsi:type=\"xtext:Group\">\n <elements xsi:type=\"xtext:Keyword\" value=\"[\"/>\n <elements xsi:type=\"xtext:Assignment\" feature=\"variable\" operator=\"=\">\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.18\"/>\n </elements>\n <elements xsi:type=\"xtext:Keyword\" value=\"]\"/>\n <elements xsi:type=\"xtext:Keyword\" value=\"=\"/>\n <elements xsi:type=\"xtext:Assignment\" feature=\"value\" operator=\"=\">\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.11\"/>\n </elements>\n </alternatives>\n </rules>\n <rules xsi:type=\"xtext:ParserRule\" name=\"MatrixFormula\">\n <type metamodel=\"/0/@metamodelDeclarations.1\">\n <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/iee/translator/jmole/math/Math#//MatrixFormula\"/>\n </type>\n <alternatives xsi:type=\"xtext:Assignment\" feature=\"expression\" operator=\"=\">\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.12\"/>\n </alternatives>\n </rules>\n <rules xsi:type=\"xtext:ParserRule\" name=\"MatrixAddition\">\n <type metamodel=\"/0/@metamodelDeclarations.1\">\n <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/iee/translator/jmole/math/Math#//MatrixExpression\"/>\n </type>\n <alternatives xsi:type=\"xtext:Group\">\n <elements xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.13\"/>\n <elements xsi:type=\"xtext:Alternatives\" cardinality=\"*\">\n <elements xsi:type=\"xtext:Group\">\n <elements xsi:type=\"xtext:Keyword\" value=\"+\"/>\n <elements xsi:type=\"xtext:Action\" feature=\"left\" operator=\"=\">\n <type metamodel=\"/0/@metamodelDeclarations.1\">\n <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/iee/translator/jmole/math/Math#//MatrixAddition\"/>\n </type>\n </elements>\n <elements xsi:type=\"xtext:Assignment\" feature=\"right\" operator=\"=\">\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.13\"/>\n </elements>\n </elements>\n <elements xsi:type=\"xtext:Group\">\n <elements xsi:type=\"xtext:Keyword\" value=\"-\"/>\n <elements xsi:type=\"xtext:Action\" feature=\"left\" operator=\"=\">\n <type metamodel=\"/0/@metamodelDeclarations.1\">\n <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/iee/translator/jmole/math/Math#//MatrixSubtraction\"/>\n </type>\n </elements>\n <elements xsi:type=\"xtext:Assignment\" feature=\"right\" operator=\"=\">\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.13\"/>\n </elements>\n </elements>\n </elements>\n </alternatives>\n </rules>\n <rules xsi:type=\"xtext:ParserRule\" name=\"MatrixMultiplication\">\n <type metamodel=\"/0/@metamodelDeclarations.1\">\n <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/iee/translator/jmole/math/Math#//MatrixExpression\"/>\n </type>\n <alternatives xsi:type=\"xtext:Group\">\n <elements xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.14\"/>\n <elements xsi:type=\"xtext:Alternatives\" cardinality=\"*\">\n <elements xsi:type=\"xtext:Group\">\n <elements xsi:type=\"xtext:Keyword\" value=\"*\"/>\n <elements xsi:type=\"xtext:Action\" feature=\"left\" operator=\"=\">\n <type metamodel=\"/0/@metamodelDeclarations.1\">\n <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/iee/translator/jmole/math/Math#//MatrixMultiplication\"/>\n </type>\n </elements>\n <elements xsi:type=\"xtext:Assignment\" feature=\"rightMatrix\" operator=\"=\">\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.14\"/>\n </elements>\n </elements>\n <elements xsi:type=\"xtext:Group\">\n <elements xsi:type=\"xtext:Keyword\" value=\"*\"/>\n <elements xsi:type=\"xtext:Action\" feature=\"left\" operator=\"=\">\n <type metamodel=\"/0/@metamodelDeclarations.1\">\n <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/iee/translator/jmole/math/Math#//MatrixMultiplication\"/>\n </type>\n </elements>\n <elements xsi:type=\"xtext:Assignment\" feature=\"rightScalar\" operator=\"=\">\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.2\"/>\n </elements>\n </elements>\n </elements>\n </alternatives>\n </rules>\n <rules xsi:type=\"xtext:ParserRule\" name=\"PrimaryMatrix\">\n <type metamodel=\"/0/@metamodelDeclarations.1\">\n <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/iee/translator/jmole/math/Math#//MatrixExpression\"/>\n </type>\n <alternatives xsi:type=\"xtext:Alternatives\">\n <elements xsi:type=\"xtext:Group\">\n <elements xsi:type=\"xtext:Action\">\n <type metamodel=\"/0/@metamodelDeclarations.1\">\n <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/iee/translator/jmole/math/Math#//NewMatrix\"/>\n </type>\n </elements>\n <elements xsi:type=\"xtext:Assignment\" feature=\"matrix\" operator=\"=\">\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.8\"/>\n </elements>\n </elements>\n <elements xsi:type=\"xtext:Group\">\n <elements xsi:type=\"xtext:Action\">\n <type metamodel=\"/0/@metamodelDeclarations.1\">\n <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/iee/translator/jmole/math/Math#//TransposeMatrix\"/>\n </type>\n </elements>\n <elements xsi:type=\"xtext:Keyword\" value=\"[\"/>\n <elements xsi:type=\"xtext:Assignment\" feature=\"name\" operator=\"=\">\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.18\"/>\n </elements>\n <elements xsi:type=\"xtext:Keyword\" value=\"]^T\"/>\n </elements>\n <elements xsi:type=\"xtext:Group\">\n <elements xsi:type=\"xtext:Action\">\n <type metamodel=\"/0/@metamodelDeclarations.1\">\n <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/iee/translator/jmole/math/Math#//MatrixVariable\"/>\n </type>\n </elements>\n <elements xsi:type=\"xtext:Keyword\" value=\"[\"/>\n <elements xsi:type=\"xtext:Assignment\" feature=\"name\" operator=\"=\">\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.18\"/>\n </elements>\n <elements xsi:type=\"xtext:Keyword\" value=\"]\"/>\n </elements>\n <elements xsi:type=\"xtext:Group\">\n <elements xsi:type=\"xtext:Keyword\" value=\"(\"/>\n <elements xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.12\"/>\n <elements xsi:type=\"xtext:Keyword\" value=\")\"/>\n </elements>\n </alternatives>\n </rules>\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.18\"/>\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.16\"/>", "new_methods": [], "old_code": " <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.10\"/>\n </elements>\n <elements xsi:type=\"xtext:Assignment\" feature=\"matrixDefinition\" operator=\"=\">\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.11\"/>\n <elements xsi:type=\"xtext:Assignment\" feature=\"assignment\" operator=\"=\">\n <rules xsi:type=\"xtext:ParserRule\" name=\"Assignment\">\n <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/iee/translator/jmole/math/Math#//Assignment\"/>\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.13\"/>\n <elements xsi:type=\"xtext:Keyword\" value=\"-\"/>\n <elements xsi:type=\"xtext:Group\">\n <elements xsi:type=\"xtext:Action\">\n <type metamodel=\"/0/@metamodelDeclarations.1\">\n <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/iee/translator/jmole/math/Math#//Interval\"/>\n </type>\n </elements>\n <elements xsi:type=\"xtext:Assignment\" feature=\"openingBracket\" operator=\"=\">\n <terminal xsi:type=\"xtext:Alternatives\">\n <elements xsi:type=\"xtext:Keyword\" value=\"[\"/>\n <elements xsi:type=\"xtext:Keyword\" value=\"(\"/>\n </terminal>\n </elements>\n <elements xsi:type=\"xtext:Keyword\" value=\"(\"/>\n <elements xsi:type=\"xtext:Assignment\" feature=\"ceil\" operator=\"=\">\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.5\"/>\n </elements>\n <elements xsi:type=\"xtext:Keyword\" value=\")\"/>\n <elements xsi:type=\"xtext:Keyword\" value=\"..\"/>\n <elements xsi:type=\"xtext:Keyword\" value=\"(\"/>\n <elements xsi:type=\"xtext:Assignment\" feature=\"floor\" operator=\"=\">\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.5\"/>\n </elements>\n <elements xsi:type=\"xtext:Keyword\" value=\")\"/>\n <elements xsi:type=\"xtext:Assignment\" feature=\"closingBracket\" operator=\"=\">\n <terminal xsi:type=\"xtext:Alternatives\">\n <elements xsi:type=\"xtext:Keyword\" value=\"]\"/>\n <elements xsi:type=\"xtext:Keyword\" value=\")\"/>\n </terminal>\n </elements>\n </elements>\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.13\"/>\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.8\"/>\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.9\"/>\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.13\"/>\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.9\"/>\n <rules xsi:type=\"xtext:ParserRule\" name=\"MatrixDefinition\">\n <type metamodel=\"/0/@metamodelDeclarations.1\">\n <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/iee/translator/jmole/math/Math#//MatrixDefinition\"/>\n </type>\n <alternatives xsi:type=\"xtext:Group\">\n <elements xsi:type=\"xtext:Assignment\" feature=\"name\" operator=\"=\">\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.13\"/>\n </elements>\n <elements xsi:type=\"xtext:Keyword\" value=\"=\"/>\n <elements xsi:type=\"xtext:Keyword\" value=\"{\"/>\n <elements xsi:type=\"xtext:Group\" cardinality=\"?\">\n <elements xsi:type=\"xtext:Assignment\" feature=\"rows\" operator=\"+=\">\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.12\"/>\n </elements>\n <elements xsi:type=\"xtext:Group\" cardinality=\"*\">\n <elements xsi:type=\"xtext:Keyword\" value=\",\"/>\n <elements xsi:type=\"xtext:Assignment\" feature=\"rows\" operator=\"+=\">\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.12\"/>\n </elements>\n </elements>\n <elements xsi:type=\"xtext:Keyword\" cardinality=\"?\" value=\",\"/>\n </elements>\n <elements xsi:type=\"xtext:Keyword\" value=\"}\"/>\n </alternatives>\n </rules>\n <rules xsi:type=\"xtext:ParserRule\" name=\"MatrixRow\">\n <type metamodel=\"/0/@metamodelDeclarations.1\">\n <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/iee/translator/jmole/math/Math#//MatrixRow\"/>\n </type>\n <alternatives xsi:type=\"xtext:Group\">\n <elements xsi:type=\"xtext:Keyword\" value=\"{\"/>\n <elements xsi:type=\"xtext:Group\" cardinality=\"?\">\n <elements xsi:type=\"xtext:Assignment\" feature=\"elements\" operator=\"+=\">\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.8\"/>\n </elements>\n <elements xsi:type=\"xtext:Group\" cardinality=\"*\">\n <elements xsi:type=\"xtext:Keyword\" value=\",\"/>\n <elements xsi:type=\"xtext:Assignment\" feature=\"elements\" operator=\"+=\">\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.8\"/>\n </elements>\n </elements>\n <elements xsi:type=\"xtext:Keyword\" cardinality=\"?\" value=\",\"/>\n </elements>\n <elements xsi:type=\"xtext:Keyword\" value=\"}\"/>\n </alternatives>\n </rules>", "old_methods": [], "patch": "@@ -13,26 +13,29 @@\n </type>\n <alternatives xsi:type=\"xtext:Alternatives\">\n <elements xsi:type=\"xtext:Assignment\" feature=\"functionDefinition\" operator=\"=\">\n- <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.10\"/>\n- </elements>\n- <elements xsi:type=\"xtext:Assignment\" feature=\"matrixDefinition\" operator=\"=\">\n- <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.11\"/>\n+ <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.17\"/>\n </elements>\n- <elements xsi:type=\"xtext:Assignment\" feature=\"assignment\" operator=\"=\">\n+ <elements xsi:type=\"xtext:Assignment\" feature=\"variableAssignment\" operator=\"=\">\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.1\"/>\n </elements>\n <elements xsi:type=\"xtext:Assignment\" feature=\"formula\" operator=\"=\">\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.2\"/>\n </elements>\n+ <elements xsi:type=\"xtext:Assignment\" feature=\"matrixAssignment\" operator=\"=\">\n+ <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.10\"/>\n+ </elements>\n+ <elements xsi:type=\"xtext:Assignment\" feature=\"matrixFormula\" operator=\"=\">\n+ <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.11\"/>\n+ </elements>\n </alternatives>\n </rules>\n- <rules xsi:type=\"xtext:ParserRule\" name=\"Assignment\">\n+ <rules xsi:type=\"xtext:ParserRule\" name=\"VariableAssignment\">\n <type metamodel=\"/0/@metamodelDeclarations.1\">\n- <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/iee/translator/jmole/math/Math#//Assignment\"/>\n+ <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/iee/translator/jmole/math/Math#//VariableAssignment\"/>\n </type>\n <alternatives xsi:type=\"xtext:Group\">\n <elements xsi:type=\"xtext:Assignment\" feature=\"variable\" operator=\"=\">\n- <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.13\"/>\n+ <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.18\"/>\n </elements>\n <elements xsi:type=\"xtext:Keyword\" value=\"=\"/>\n <elements xsi:type=\"xtext:Assignment\" feature=\"value\" operator=\"=\">\n@@ -130,7 +133,7 @@\n <alternatives xsi:type=\"xtext:Alternatives\">\n <elements xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.6\"/>\n <elements xsi:type=\"xtext:Group\">\n- <elements xsi:type=\"xtext:Keyword\" value=\"-\"/>\n+ <elements xsi:type=\"xtext:Keyword\" value=\"(-\"/>\n <elements xsi:type=\"xtext:Action\">\n <type metamodel=\"/0/@metamodelDeclarations.1\">\n <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/iee/translator/jmole/math/Math#//Invert\"/>\n@@ -139,6 +142,7 @@\n <elements xsi:type=\"xtext:Assignment\" feature=\"expression\" operator=\"=\">\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.5\"/>\n </elements>\n+ <elements xsi:type=\"xtext:Keyword\" value=\")\"/>\n </elements>\n <elements xsi:type=\"xtext:Group\">\n <elements xsi:type=\"xtext:Keyword\" value=\"(\"/>\n@@ -152,36 +156,6 @@\n </elements>\n <elements xsi:type=\"xtext:Keyword\" value=\")!\"/>\n </elements>\n- <elements xsi:type=\"xtext:Group\">\n- <elements xsi:type=\"xtext:Action\">\n- <type metamodel=\"/0/@metamodelDeclarations.1\">\n- <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/iee/translator/jmole/math/Math#//Interval\"/>\n- </type>\n- </elements>\n- <elements xsi:type=\"xtext:Assignment\" feature=\"openingBracket\" operator=\"=\">\n- <terminal xsi:type=\"xtext:Alternatives\">\n- <elements xsi:type=\"xtext:Keyword\" value=\"[\"/>\n- <elements xsi:type=\"xtext:Keyword\" value=\"(\"/>\n- </terminal>\n- </elements>\n- <elements xsi:type=\"xtext:Keyword\" value=\"(\"/>\n- <elements xsi:type=\"xtext:Assignment\" feature=\"ceil\" operator=\"=\">\n- <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.5\"/>\n- </elements>\n- <elements xsi:type=\"xtext:Keyword\" value=\")\"/>\n- <elements xsi:type=\"xtext:Keyword\" value=\"..\"/>\n- <elements xsi:type=\"xtext:Keyword\" value=\"(\"/>\n- <elements xsi:type=\"xtext:Assignment\" feature=\"floor\" operator=\"=\">\n- <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.5\"/>\n- </elements>\n- <elements xsi:type=\"xtext:Keyword\" value=\")\"/>\n- <elements xsi:type=\"xtext:Assignment\" feature=\"closingBracket\" operator=\"=\">\n- <terminal xsi:type=\"xtext:Alternatives\">\n- <elements xsi:type=\"xtext:Keyword\" value=\"]\"/>\n- <elements xsi:type=\"xtext:Keyword\" value=\")\"/>\n- </terminal>\n- </elements>\n- </elements>\n </alternatives>\n </rules>\n <rules xsi:type=\"xtext:ParserRule\" name=\"Exponent\">\n@@ -215,7 +189,7 @@\n </type>\n </elements>\n <elements xsi:type=\"xtext:Assignment\" feature=\"name\" operator=\"=\">\n- <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.13\"/>\n+ <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.18\"/>\n </elements>\n </elements>\n <elements xsi:type=\"xtext:Group\">\n@@ -225,17 +199,37 @@\n </type>\n </elements>\n <elements xsi:type=\"xtext:Assignment\" feature=\"value\" operator=\"=\">\n- <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.8\"/>\n+ <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.15\"/>\n </elements>\n </elements>\n+ <elements xsi:type=\"xtext:Group\">\n+ <elements xsi:type=\"xtext:Action\">\n+ <type metamodel=\"/0/@metamodelDeclarations.1\">\n+ <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/iee/translator/jmole/math/Math#//MatrixElement\"/>\n+ </type>\n+ </elements>\n+ <elements xsi:type=\"xtext:Assignment\" feature=\"element\" operator=\"=\">\n+ <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.18\"/>\n+ </elements>\n+ <elements xsi:type=\"xtext:Keyword\" value=\"[\"/>\n+ <elements xsi:type=\"xtext:Assignment\" feature=\"row\" operator=\"=\">\n+ <terminal xsi:type=\"xtext:RuleCall\" rule=\"/1/@rules.1\"/>\n+ </elements>\n+ <elements xsi:type=\"xtext:Keyword\" value=\"]\"/>\n+ <elements xsi:type=\"xtext:Keyword\" value=\"[\"/>\n+ <elements xsi:type=\"xtext:Assignment\" feature=\"column\" operator=\"=\">\n+ <terminal xsi:type=\"xtext:RuleCall\" rule=\"/1/@rules.1\"/>\n+ </elements>\n+ <elements xsi:type=\"xtext:Keyword\" value=\"]\"/>\n+ </elements>\n <elements xsi:type=\"xtext:Group\">\n <elements xsi:type=\"xtext:Action\">\n <type metamodel=\"/0/@metamodelDeclarations.1\">\n <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/iee/translator/jmole/math/Math#//Function\"/>\n </type>\n </elements>\n <elements xsi:type=\"xtext:Assignment\" feature=\"function\" operator=\"=\">\n- <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.9\"/>\n+ <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.16\"/>\n </elements>\n </elements>\n <elements xsi:type=\"xtext:Group\">\n@@ -245,6 +239,182 @@\n </elements>\n </alternatives>\n </rules>\n+ <rules xsi:type=\"xtext:ParserRule\" name=\"Matrix\">\n+ <type metamodel=\"/0/@metamodelDeclarations.1\">\n+ <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/iee/translator/jmole/math/Math#//Matrix\"/>\n+ </type>\n+ <alternatives xsi:type=\"xtext:Group\">\n+ <elements xsi:type=\"xtext:Keyword\" value=\"{\"/>\n+ <elements xsi:type=\"xtext:Group\" cardinality=\"?\">\n+ <elements xsi:type=\"xtext:Assignment\" feature=\"rows\" operator=\"+=\">\n+ <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.9\"/>\n+ </elements>\n+ <elements xsi:type=\"xtext:Group\" cardinality=\"*\">\n+ <elements xsi:type=\"xtext:Keyword\" value=\",\"/>\n+ <elements xsi:type=\"xtext:Assignment\" feature=\"rows\" operator=\"+=\">\n+ <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.9\"/>\n+ </elements>\n+ </elements>\n+ <elements xsi:type=\"xtext:Keyword\" cardinality=\"?\" value=\",\"/>\n+ </elements>\n+ <elements xsi:type=\"xtext:Keyword\" value=\"}\"/>\n+ </alternatives>\n+ </rules>\n+ <rules xsi:type=\"xtext:ParserRule\" name=\"MatrixRow\">\n+ <type metamodel=\"/0/@metamodelDeclarations.1\">\n+ <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/iee/translator/jmole/math/Math#//MatrixRow\"/>\n+ </type>\n+ <alternatives xsi:type=\"xtext:Group\">\n+ <elements xsi:type=\"xtext:Keyword\" value=\"{\"/>\n+ <elements xsi:type=\"xtext:Group\" cardinality=\"?\">\n+ <elements xsi:type=\"xtext:Assignment\" feature=\"elements\" operator=\"+=\">\n+ <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.15\"/>\n+ </elements>\n+ <elements xsi:type=\"xtext:Group\" cardinality=\"*\">\n+ <elements xsi:type=\"xtext:Keyword\" value=\",\"/>\n+ <elements xsi:type=\"xtext:Assignment\" feature=\"elements\" operator=\"+=\">\n+ <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.15\"/>\n+ </elements>\n+ </elements>\n+ <elements xsi:type=\"xtext:Keyword\" cardinality=\"?\" value=\",\"/>\n+ </elements>\n+ <elements xsi:type=\"xtext:Keyword\" value=\"}\"/>\n+ </alternatives>\n+ </rules>\n+ <rules xsi:type=\"xtext:ParserRule\" name=\"MatrixAssignment\">\n+ <type metamodel=\"/0/@metamodelDeclarations.1\">\n+ <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/iee/translator/jmole/math/Math#//MatrixAssignment\"/>\n+ </type>\n+ <alternatives xsi:type=\"xtext:Group\">\n+ <elements xsi:type=\"xtext:Keyword\" value=\"[\"/>\n+ <elements xsi:type=\"xtext:Assignment\" feature=\"variable\" operator=\"=\">\n+ <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.18\"/>\n+ </elements>\n+ <elements xsi:type=\"xtext:Keyword\" value=\"]\"/>\n+ <elements xsi:type=\"xtext:Keyword\" value=\"=\"/>\n+ <elements xsi:type=\"xtext:Assignment\" feature=\"value\" operator=\"=\">\n+ <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.11\"/>\n+ </elements>\n+ </alternatives>\n+ </rules>\n+ <rules xsi:type=\"xtext:ParserRule\" name=\"MatrixFormula\">\n+ <type metamodel=\"/0/@metamodelDeclarations.1\">\n+ <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/iee/translator/jmole/math/Math#//MatrixFormula\"/>\n+ </type>\n+ <alternatives xsi:type=\"xtext:Assignment\" feature=\"expression\" operator=\"=\">\n+ <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.12\"/>\n+ </alternatives>\n+ </rules>\n+ <rules xsi:type=\"xtext:ParserRule\" name=\"MatrixAddition\">\n+ <type metamodel=\"/0/@metamodelDeclarations.1\">\n+ <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/iee/translator/jmole/math/Math#//MatrixExpression\"/>\n+ </type>\n+ <alternatives xsi:type=\"xtext:Group\">\n+ <elements xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.13\"/>\n+ <elements xsi:type=\"xtext:Alternatives\" cardinality=\"*\">\n+ <elements xsi:type=\"xtext:Group\">\n+ <elements xsi:type=\"xtext:Keyword\" value=\"+\"/>\n+ <elements xsi:type=\"xtext:Action\" feature=\"left\" operator=\"=\">\n+ <type metamodel=\"/0/@metamodelDeclarations.1\">\n+ <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/iee/translator/jmole/math/Math#//MatrixAddition\"/>\n+ </type>\n+ </elements>\n+ <elements xsi:type=\"xtext:Assignment\" feature=\"right\" operator=\"=\">\n+ <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.13\"/>\n+ </elements>\n+ </elements>\n+ <elements xsi:type=\"xtext:Group\">\n+ <elements xsi:type=\"xtext:Keyword\" value=\"-\"/>\n+ <elements xsi:type=\"xtext:Action\" feature=\"left\" operator=\"=\">\n+ <type metamodel=\"/0/@metamodelDeclarations.1\">\n+ <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/iee/translator/jmole/math/Math#//MatrixSubtraction\"/>\n+ </type>\n+ </elements>\n+ <elements xsi:type=\"xtext:Assignment\" feature=\"right\" operator=\"=\">\n+ <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.13\"/>\n+ </elements>\n+ </elements>\n+ </elements>\n+ </alternatives>\n+ </rules>\n+ <rules xsi:type=\"xtext:ParserRule\" name=\"MatrixMultiplication\">\n+ <type metamodel=\"/0/@metamodelDeclarations.1\">\n+ <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/iee/translator/jmole/math/Math#//MatrixExpression\"/>\n+ </type>\n+ <alternatives xsi:type=\"xtext:Group\">\n+ <elements xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.14\"/>\n+ <elements xsi:type=\"xtext:Alternatives\" cardinality=\"*\">\n+ <elements xsi:type=\"xtext:Group\">\n+ <elements xsi:type=\"xtext:Keyword\" value=\"*\"/>\n+ <elements xsi:type=\"xtext:Action\" feature=\"left\" operator=\"=\">\n+ <type metamodel=\"/0/@metamodelDeclarations.1\">\n+ <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/iee/translator/jmole/math/Math#//MatrixMultiplication\"/>\n+ </type>\n+ </elements>\n+ <elements xsi:type=\"xtext:Assignment\" feature=\"rightMatrix\" operator=\"=\">\n+ <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.14\"/>\n+ </elements>\n+ </elements>\n+ <elements xsi:type=\"xtext:Group\">\n+ <elements xsi:type=\"xtext:Keyword\" value=\"*\"/>\n+ <elements xsi:type=\"xtext:Action\" feature=\"left\" operator=\"=\">\n+ <type metamodel=\"/0/@metamodelDeclarations.1\">\n+ <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/iee/translator/jmole/math/Math#//MatrixMultiplication\"/>\n+ </type>\n+ </elements>\n+ <elements xsi:type=\"xtext:Assignment\" feature=\"rightScalar\" operator=\"=\">\n+ <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.2\"/>\n+ </elements>\n+ </elements>\n+ </elements>\n+ </alternatives>\n+ </rules>\n+ <rules xsi:type=\"xtext:ParserRule\" name=\"PrimaryMatrix\">\n+ <type metamodel=\"/0/@metamodelDeclarations.1\">\n+ <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/iee/translator/jmole/math/Math#//MatrixExpression\"/>\n+ </type>\n+ <alternatives xsi:type=\"xtext:Alternatives\">\n+ <elements xsi:type=\"xtext:Group\">\n+ <elements xsi:type=\"xtext:Action\">\n+ <type metamodel=\"/0/@metamodelDeclarations.1\">\n+ <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/iee/translator/jmole/math/Math#//NewMatrix\"/>\n+ </type>\n+ </elements>\n+ <elements xsi:type=\"xtext:Assignment\" feature=\"matrix\" operator=\"=\">\n+ <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.8\"/>\n+ </elements>\n+ </elements>\n+ <elements xsi:type=\"xtext:Group\">\n+ <elements xsi:type=\"xtext:Action\">\n+ <type metamodel=\"/0/@metamodelDeclarations.1\">\n+ <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/iee/translator/jmole/math/Math#//TransposeMatrix\"/>\n+ </type>\n+ </elements>\n+ <elements xsi:type=\"xtext:Keyword\" value=\"[\"/>\n+ <elements xsi:type=\"xtext:Assignment\" feature=\"name\" operator=\"=\">\n+ <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.18\"/>\n+ </elements>\n+ <elements xsi:type=\"xtext:Keyword\" value=\"]^T\"/>\n+ </elements>\n+ <elements xsi:type=\"xtext:Group\">\n+ <elements xsi:type=\"xtext:Action\">\n+ <type metamodel=\"/0/@metamodelDeclarations.1\">\n+ <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/iee/translator/jmole/math/Math#//MatrixVariable\"/>\n+ </type>\n+ </elements>\n+ <elements xsi:type=\"xtext:Keyword\" value=\"[\"/>\n+ <elements xsi:type=\"xtext:Assignment\" feature=\"name\" operator=\"=\">\n+ <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.18\"/>\n+ </elements>\n+ <elements xsi:type=\"xtext:Keyword\" value=\"]\"/>\n+ </elements>\n+ <elements xsi:type=\"xtext:Group\">\n+ <elements xsi:type=\"xtext:Keyword\" value=\"(\"/>\n+ <elements xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.12\"/>\n+ <elements xsi:type=\"xtext:Keyword\" value=\")\"/>\n+ </elements>\n+ </alternatives>\n+ </rules>\n <rules xsi:type=\"xtext:ParserRule\" name=\"Float\">\n <type metamodel=\"/0/@metamodelDeclarations.0\">\n <classifier xsi:type=\"ecore:EDataType\" href=\"http://www.eclipse.org/emf/2002/Ecore#//EString\"/>\n@@ -271,7 +441,7 @@\n </type>\n <alternatives xsi:type=\"xtext:Group\">\n <elements xsi:type=\"xtext:Assignment\" feature=\"name\" operator=\"=\">\n- <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.13\"/>\n+ <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.18\"/>\n </elements>\n <elements xsi:type=\"xtext:Keyword\" value=\"(\"/>\n <elements xsi:type=\"xtext:Group\" cardinality=\"?\">\n@@ -295,60 +465,14 @@\n </type>\n <alternatives xsi:type=\"xtext:Group\">\n <elements xsi:type=\"xtext:Assignment\" feature=\"function\" operator=\"=\">\n- <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.9\"/>\n+ <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.16\"/>\n </elements>\n <elements xsi:type=\"xtext:Keyword\" value=\"=\"/>\n <elements xsi:type=\"xtext:Assignment\" feature=\"formula\" operator=\"=\">\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.2\"/>\n </elements>\n </alternatives>\n </rules>\n- <rules xsi:type=\"xtext:ParserRule\" name=\"MatrixDefinition\">\n- <type metamodel=\"/0/@metamodelDeclarations.1\">\n- <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/iee/translator/jmole/math/Math#//MatrixDefinition\"/>\n- </type>\n- <alternatives xsi:type=\"xtext:Group\">\n- <elements xsi:type=\"xtext:Assignment\" feature=\"name\" operator=\"=\">\n- <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.13\"/>\n- </elements>\n- <elements xsi:type=\"xtext:Keyword\" value=\"=\"/>\n- <elements xsi:type=\"xtext:Keyword\" value=\"{\"/>\n- <elements xsi:type=\"xtext:Group\" cardinality=\"?\">\n- <elements xsi:type=\"xtext:Assignment\" feature=\"rows\" operator=\"+=\">\n- <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.12\"/>\n- </elements>\n- <elements xsi:type=\"xtext:Group\" cardinality=\"*\">\n- <elements xsi:type=\"xtext:Keyword\" value=\",\"/>\n- <elements xsi:type=\"xtext:Assignment\" feature=\"rows\" operator=\"+=\">\n- <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.12\"/>\n- </elements>\n- </elements>\n- <elements xsi:type=\"xtext:Keyword\" cardinality=\"?\" value=\",\"/>\n- </elements>\n- <elements xsi:type=\"xtext:Keyword\" value=\"}\"/>\n- </alternatives>\n- </rules>\n- <rules xsi:type=\"xtext:ParserRule\" name=\"MatrixRow\">\n- <type metamodel=\"/0/@metamodelDeclarations.1\">\n- <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/iee/translator/jmole/math/Math#//MatrixRow\"/>\n- </type>\n- <alternatives xsi:type=\"xtext:Group\">\n- <elements xsi:type=\"xtext:Keyword\" value=\"{\"/>\n- <elements xsi:type=\"xtext:Group\" cardinality=\"?\">\n- <elements xsi:type=\"xtext:Assignment\" feature=\"elements\" operator=\"+=\">\n- <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.8\"/>\n- </elements>\n- <elements xsi:type=\"xtext:Group\" cardinality=\"*\">\n- <elements xsi:type=\"xtext:Keyword\" value=\",\"/>\n- <elements xsi:type=\"xtext:Assignment\" feature=\"elements\" operator=\"+=\">\n- <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.8\"/>\n- </elements>\n- </elements>\n- <elements xsi:type=\"xtext:Keyword\" cardinality=\"?\" value=\",\"/>\n- </elements>\n- <elements xsi:type=\"xtext:Keyword\" value=\"}\"/>\n- </alternatives>\n- </rules>\n <rules xsi:type=\"xtext:TerminalRule\" name=\"MATH_NAME\">\n <type metamodel=\"/0/@metamodelDeclarations.0\">\n <classifier xsi:type=\"ecore:EDataType\" href=\"http://www.eclipse.org/emf/2002/Ecore#//EString\"/>", "raw_url": "https://github.com/iee/iee/raw/0f04d91efdf50447d8e84e926ef98d7462103dc0/org.eclipse.iee.translator.Jmole%2Forg.eclipse.iee.translator.jmole.math%2Fbin%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fjmole%2Fmath%2FMath.xmi", "sha": "f20f0b4c4bbec3af389940b5732653f0af267e50", "status": "modified" }, { "additions": 38, "blob_url": "https://github.com/iee/iee/blob/0f04d91efdf50447d8e84e926ef98d7462103dc0/org.eclipse.iee.translator.Jmole%2Forg.eclipse.iee.translator.jmole.math%2Fbin%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fjmole%2Fmath%2FMath.xtext", "changes": 54, "contents_url": "https://api.github.com/repos/iee/iee/contents/org.eclipse.iee.translator.Jmole%2Forg.eclipse.iee.translator.jmole.math%2Fbin%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fjmole%2Fmath%2FMath.xtext?ref=0f04d91efdf50447d8e84e926ef98d7462103dc0", "deletions": 16, "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/bin/org/eclipse/iee/translator/jmole/math/Math.xtext", "new_code": "\tvariableAssignment=VariableAssignment |\n\tformula=Formula |\n\tmatrixAssignment=MatrixAssignment |\n\tmatrixFormula=MatrixFormula;\nVariableAssignment:\n\t'(-' {Invert} expression=UnaryExpression')' |\n\t'(' {Factorial} expression=UnaryExpression ')!';\n\t\n\t{MatrixElement} element=MATH_NAME '[' row=INT ']' '[' column=INT ']' | \nMatrix:\n\t'{' (rows+=MatrixRow (',' rows+=MatrixRow)* ','?)? '}';\n\t\nMatrixRow:\n\t'{' (elements+=Float (',' elements+=Float)* ','?)? '}';\n\nMatrixAssignment:\n\t'[' variable=MATH_NAME ']' '=' value=MatrixFormula;\n\nMatrixFormula:\n\texpression=MatrixAddition;\n\nMatrixAddition returns MatrixExpression:\n\tMatrixMultiplication ('+' {MatrixAddition.left=current} right=MatrixMultiplication | '-' {MatrixSubtraction.left=current}\n\tright=MatrixMultiplication)*;\n\t\nMatrixMultiplication returns MatrixExpression:\n\tPrimaryMatrix ('*' {MatrixMultiplication.left=current} rightMatrix=PrimaryMatrix |\n\t\t\t\t '*' {MatrixMultiplication.left=current} rightScalar=Formula\n\t)*;\n\t\nPrimaryMatrix returns MatrixExpression:\n\t{NewMatrix} matrix=Matrix |\n\t{TransposeMatrix} '[' name=MATH_NAME ']^T'|\n\t{MatrixVariable} '[' name=MATH_NAME ']' |\n\t'(' MatrixAddition ')';\n\n\tname=MATH_NAME '(' (parameters+=Formula (',' parameters+=Formula)* ','?)? ')';\n\t", "new_methods": [], "old_code": "\tmatrixDefinition=MatrixDefinition |\n\tassignment=Assignment |\n\tformula=Formula;\nAssignment:\n\t('-' {Invert} expression=UnaryExpression) |\n\t'(' {Factorial} expression=UnaryExpression ')!'|\n\t{Interval} openingBracket=('['|'(') '('ceil=UnaryExpression')' '..' '('floor=UnaryExpression')' closingBracket=(']'|')');\n\n\t(name=MATH_NAME) '(' (parameters+=Formula (',' parameters+=Formula)* ','?)? ')';\n\nMatrixDefinition:\n\t(name=MATH_NAME) '=' '{' (rows+=MatrixRow (',' rows+=MatrixRow)* ','?)? '}';\n\nMatrixRow:\n\t'{' (elements+=Float (',' elements+=Float)* ','?)? '}';\n", "old_methods": [], "patch": "@@ -5,11 +5,12 @@ generate math \"http://www.eclipse.org/iee/translator/jmole/math/Math\"\n \n Statement:\n \tfunctionDefinition=FunctionDefinition |\n-\tmatrixDefinition=MatrixDefinition |\n-\tassignment=Assignment |\n-\tformula=Formula;\n+\tvariableAssignment=VariableAssignment |\n+\tformula=Formula |\n+\tmatrixAssignment=MatrixAssignment |\n+\tmatrixFormula=MatrixFormula;\n \n-Assignment:\n+VariableAssignment:\n \tvariable=MATH_NAME '=' value=Formula;\n \n Formula:\n@@ -28,34 +29,55 @@ Multiplication returns Expression:\n \t// Unary operators: right associative, priority 2\n UnaryExpression returns Expression:\n \tExponent |\n-\t('-' {Invert} expression=UnaryExpression) |\n-\t'(' {Factorial} expression=UnaryExpression ')!'|\n-\t{Interval} openingBracket=('['|'(') '('ceil=UnaryExpression')' '..' '('floor=UnaryExpression')' closingBracket=(']'|')');\n-\n+\t'(-' {Invert} expression=UnaryExpression')' |\n+\t'(' {Factorial} expression=UnaryExpression ')!';\n+\t\n \t// exponentiation: right associative, priority 3\n Exponent returns Expression:\n \tPrimary ({Exponent.left=current} '^' right=Primary)?;\n \n Primary returns Expression:\n \t{Variable} name=MATH_NAME |\n \t{Float} value=Float |\n+\t{MatrixElement} element=MATH_NAME '[' row=INT ']' '[' column=INT ']' | \n \t{Function} function=Function |\n \t'(' Addition ')';\n \n+Matrix:\n+\t'{' (rows+=MatrixRow (',' rows+=MatrixRow)* ','?)? '}';\n+\t\n+MatrixRow:\n+\t'{' (elements+=Float (',' elements+=Float)* ','?)? '}';\n+\n+MatrixAssignment:\n+\t'[' variable=MATH_NAME ']' '=' value=MatrixFormula;\n+\n+MatrixFormula:\n+\texpression=MatrixAddition;\n+\n+MatrixAddition returns MatrixExpression:\n+\tMatrixMultiplication ('+' {MatrixAddition.left=current} right=MatrixMultiplication | '-' {MatrixSubtraction.left=current}\n+\tright=MatrixMultiplication)*;\n+\t\n+MatrixMultiplication returns MatrixExpression:\n+\tPrimaryMatrix ('*' {MatrixMultiplication.left=current} rightMatrix=PrimaryMatrix |\n+\t\t\t\t '*' {MatrixMultiplication.left=current} rightScalar=Formula\n+\t)*;\n+\t\n+PrimaryMatrix returns MatrixExpression:\n+\t{NewMatrix} matrix=Matrix |\n+\t{TransposeMatrix} '[' name=MATH_NAME ']^T'|\n+\t{MatrixVariable} '[' name=MATH_NAME ']' |\n+\t'(' MatrixAddition ')';\n+\n Float:\n \tINT+ ('.' INT+ (('E' | 'e') ('-')? (INT)+)?)?;\n \n Function returns Expression:\n-\t(name=MATH_NAME) '(' (parameters+=Formula (',' parameters+=Formula)* ','?)? ')';\n+\tname=MATH_NAME '(' (parameters+=Formula (',' parameters+=Formula)* ','?)? ')';\n \n FunctionDefinition:\n \tfunction=Function '=' formula=Formula;\n-\n-MatrixDefinition:\n-\t(name=MATH_NAME) '=' '{' (rows+=MatrixRow (',' rows+=MatrixRow)* ','?)? '}';\n-\n-MatrixRow:\n-\t'{' (elements+=Float (',' elements+=Float)* ','?)? '}';\n-\n+\t\n terminal MATH_NAME returns ecore::EString:\n \t('a'..'z' | 'A'..'Z' | '_') ('a'..'z' | 'A'..'Z' | '_' | '0'..'9')*;\n\\ No newline at end of file", "raw_url": "https://github.com/iee/iee/raw/0f04d91efdf50447d8e84e926ef98d7462103dc0/org.eclipse.iee.translator.Jmole%2Forg.eclipse.iee.translator.jmole.math%2Fbin%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fjmole%2Fmath%2FMath.xtext", "sha": "4c5ef668d0e8f6e1552f90fcba741b594f14c7a5", "status": "modified" }, { "additions": 59, "blob_url": "https://github.com/iee/iee/blob/0f04d91efdf50447d8e84e926ef98d7462103dc0/org.eclipse.iee.translator.Jmole%2Forg.eclipse.iee.translator.jmole.math%2Fbin%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fjmole%2Fmath%2Fgenerator%2FMathGenerator.xtend", "changes": 88, "contents_url": "https://api.github.com/repos/iee/iee/contents/org.eclipse.iee.translator.Jmole%2Forg.eclipse.iee.translator.jmole.math%2Fbin%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fjmole%2Fmath%2Fgenerator%2FMathGenerator.xtend?ref=0f04d91efdf50447d8e84e926ef98d7462103dc0", "deletions": 29, "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/bin/org/eclipse/iee/translator/jmole/math/generator/MathGenerator.xtend", "new_code": "\t'''\t\n\t\t�IF s.variableAssignment != null��compileVariableAssignment(s.variableAssignment)�;�ENDIF�\n\t\t�IF s.matrixAssignment != null��compileMatrixAssignment(s.matrixAssignment)�;�ENDIF�\n\t\t�IF s.matrixFormula != null��compileMatrixFormula(s.matrixFormula)�;�ENDIF�\n\tdef compileVariableAssignment(VariableAssignment a)\n\tdef compileMatrixFormula(MatrixFormula f) \n\t\t�compileMatrixExpression(f.expression)�\n\tdef compileMatrixAssignment(MatrixAssignment a)\n\t{\n\t '''\n\t \t�a.variable� = �compileMatrixFormula(a.value)�\n\t '''\n\t}\n\t\n\t\n\t//Expressions\n\t\t\n\tdef dispatch compileExpression(MatrixElement e) '''\n\t\t�e.element�.get(�e.row�,�e.column�)'''\t\n\t\t\n\t\tMath.pow((�compileExpression(op.left)�),(�compileExpression(op.right)�))'''\n\t\n\t//Matrix Expressions\n\tdef dispatch compileMatrixExpression(MatrixVariable n) '''\n\t\t�n.name�'''\n\t\t\n\tdef dispatch compileMatrixExpression(NewMatrix m) '''\n\t\tnew Matrix(new double[][]\n\t\t{\n\t\t�var j = 0�\n\t\t�FOR row:m.matrix.rows�\n\t\t �IF row != null�\n\t\t {\n\t\t \t�var i = 0�\n\t \t\t�FOR element:row.elements�\n\t\t\t �IF element != null�\n\t\t\t \t�element�\n\t\t\t �ENDIF�\n\t\t\t �IF (i = i + 1) != row.elements.size()�,�ENDIF�\n\t\t\t�ENDFOR�\n\t\t }\n\t\t �ENDIF�\n\t\t �IF (j = j + 1) != m.matrix.rows.size()�,�ENDIF�\n\t\t�ENDFOR�\n\t\t})'''\t\n\t\n\tdef dispatch compileMatrixExpression(TransposeMatrix n) '''\n\t\t�n.name�.transpose()'''\t\t\n\t\t\n\tdef dispatch compileMatrixExpression(MatrixAddition op) '''\n\t\t�compileMatrixExpression(op.left)�.plus(�compileMatrixExpression(op.right)�)'''\n\t\n\tdef dispatch compileMatrixExpression(MatrixSubtraction op) '''\n\t\t�compileMatrixExpression(op.left)�.minus(�compileMatrixExpression(op.right)�)'''\n\t\n\tdef dispatch compileMatrixExpression(MatrixMultiplication op) '''\n\t\t�IF op.rightMatrix != null��compileMatrixExpression(op.left)�.times(�compileMatrixExpression(op.rightMatrix)�)�ENDIF�\n\t\t�IF op.rightScalar != null��compileMatrixExpression(op.left)�.times(�compileFormula(op.rightScalar)�)�ENDIF�'''\n\t \t", "new_methods": [ { "arguments": [ "MatrixAssignment a" ], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/bin/org/eclipse/iee/translator/jmole/math/generator/MathGenerator.xtend", "implementation": "'''\n\t \t�a.variable� = �compileMatrixFormula(a.value)�\n\t '''", "signature": "def compileMatrixAssignment(MatrixAssignment a)" } ], "old_code": "\t'''\n\t\t�IF s.matrixDefinition != null��compileMatrixDefinition(s.matrixDefinition)�;�ENDIF�\n\t\t�IF s.assignment != null��compileAssignment(s.assignment)�;�ENDIF�\n\t\t\n\tdef compileAssignment(Assignment a)\n\tdef compileMatrixDefinition(MatrixDefinition m) \n\t\tMatrix �m.name� = new Matrix(new double[][]\n\t\t{\n\t\t�var j = 0�\n\t\t�FOR row:m.rows�\n\t\t �IF row != null�\n\t\t {\n\t\t \t�var i = 0�\n\t \t\t�FOR element:row.elements�\n\t\t\t �IF element != null�\n\t\t\t \t�element�\n\t\t\t �ENDIF�\n\t\t\t �IF (i = i + 1) != row.elements.size()�,�ENDIF�\n\t\t\t�ENDFOR�\n\t\t }\n\t\t �ENDIF�\n\t\t �IF (j = j + 1) != m.rows.size()�,�ENDIF�\n\t\t�ENDFOR�\n\t\t})\n\t\t\t\n\tdef dispatch compileExpression(Interval op) '''\n\t�IF op.ceil != null && op.floor != null��op.openingBracket�(�compileExpression(op.ceil)�)..(�compileExpression(op.floor)�)�op.closingBracket��ENDIF�''' \n\t\n\t\t(�compileExpression(op.left)�) ^ (�compileExpression(op.right)�)'''", "old_methods": [], "patch": "@@ -31,12 +31,12 @@ class MathGenerator implements IGenerator {\n \t\n \tdef compileStatement(Statement s)\n \t{\n-\t'''\n+\t'''\t\n \t\t�IF s.functionDefinition != null��compileFunctionDefinition(s.functionDefinition)��ENDIF�\n-\t\t�IF s.matrixDefinition != null��compileMatrixDefinition(s.matrixDefinition)�;�ENDIF�\n-\t\t�IF s.assignment != null��compileAssignment(s.assignment)�;�ENDIF�\n+\t\t�IF s.variableAssignment != null��compileVariableAssignment(s.variableAssignment)�;�ENDIF�\n+\t\t�IF s.matrixAssignment != null��compileMatrixAssignment(s.matrixAssignment)�;�ENDIF�\n \t\t�IF s.formula != null��compileFormula(s.formula)�;�ENDIF�\n-\t\t\n+\t\t�IF s.matrixFormula != null��compileMatrixFormula(s.matrixFormula)�;�ENDIF�\n \t'''\n \t}\n \t\n@@ -52,7 +52,7 @@ class MathGenerator implements IGenerator {\n \t'''\n \t}\n \t\n-\tdef compileAssignment(Assignment a)\n+\tdef compileVariableAssignment(VariableAssignment a)\n \t{\n \t '''\n \t \t�a.variable� = �compileFormula(a.value)�\n@@ -66,44 +66,39 @@ class MathGenerator implements IGenerator {\n \t'''\n \t}\n \t\n-\tdef compileMatrixDefinition(MatrixDefinition m) \n+\tdef compileMatrixFormula(MatrixFormula f) \n \t{\n \t'''\n-\t\tMatrix �m.name� = new Matrix(new double[][]\n-\t\t{\n-\t\t�var j = 0�\n-\t\t�FOR row:m.rows�\n-\t\t �IF row != null�\n-\t\t {\n-\t\t \t�var i = 0�\n-\t \t\t�FOR element:row.elements�\n-\t\t\t �IF element != null�\n-\t\t\t \t�element�\n-\t\t\t �ENDIF�\n-\t\t\t �IF (i = i + 1) != row.elements.size()�,�ENDIF�\n-\t\t\t�ENDFOR�\n-\t\t }\n-\t\t �ENDIF�\n-\t\t �IF (j = j + 1) != m.rows.size()�,�ENDIF�\n-\t\t�ENDFOR�\n-\t\t})\n+\t\t�compileMatrixExpression(f.expression)�\n \t'''\n \t}\n \t\n+\tdef compileMatrixAssignment(MatrixAssignment a)\n+\t{\n+\t '''\n+\t \t�a.variable� = �compileMatrixFormula(a.value)�\n+\t '''\n+\t}\n+\t\n \tdef compileFunction(Function f) '''\n \t\t�f.function.name�\n \t\t(�FOR param:f.function.parameters�\n \t\t �IF param != null��compileFormula(param)��ENDIF�\n \t\t �IF f.function.parameters.last() != param�,�ENDIF�\n \t\t�ENDFOR�)\n \t'''\n-\t\t\t\n+\t\n+\t//Expressions\n+\t\t\n \tdef dispatch compileExpression(Variable n) '''\n \t\t�n.name�'''\n \t\t\n \tdef dispatch compileExpression(Float n) '''\n \t\t�n.value�'''\n \t\t\n+\tdef dispatch compileExpression(MatrixElement e) '''\n+\t\t�e.element�.get(�e.row�,�e.column�)'''\t\n+\t\t\n \tdef dispatch compileExpression(Function f) '''\n \t\t�compileFunction(f)�'''\n \t\n@@ -128,9 +123,44 @@ class MathGenerator implements IGenerator {\n \tdef dispatch compileExpression(Factorial op) '''\n \t�IF op.expression != null� (�compileExpression(op.expression)�)! �ENDIF�''' \n \t\n-\tdef dispatch compileExpression(Interval op) '''\n-\t�IF op.ceil != null && op.floor != null��op.openingBracket�(�compileExpression(op.ceil)�)..(�compileExpression(op.floor)�)�op.closingBracket��ENDIF�''' \n-\t\n \tdef dispatch compileExpression(Exponent op) '''\n-\t\t(�compileExpression(op.left)�) ^ (�compileExpression(op.right)�)'''\n+\t\tMath.pow((�compileExpression(op.left)�),(�compileExpression(op.right)�))'''\n+\t\n+\t//Matrix Expressions\n+\tdef dispatch compileMatrixExpression(MatrixVariable n) '''\n+\t\t�n.name�'''\n+\t\t\n+\tdef dispatch compileMatrixExpression(NewMatrix m) '''\n+\t\tnew Matrix(new double[][]\n+\t\t{\n+\t\t�var j = 0�\n+\t\t�FOR row:m.matrix.rows�\n+\t\t �IF row != null�\n+\t\t {\n+\t\t \t�var i = 0�\n+\t \t\t�FOR element:row.elements�\n+\t\t\t �IF element != null�\n+\t\t\t \t�element�\n+\t\t\t �ENDIF�\n+\t\t\t �IF (i = i + 1) != row.elements.size()�,�ENDIF�\n+\t\t\t�ENDFOR�\n+\t\t }\n+\t\t �ENDIF�\n+\t\t �IF (j = j + 1) != m.matrix.rows.size()�,�ENDIF�\n+\t\t�ENDFOR�\n+\t\t})'''\t\n+\t\n+\tdef dispatch compileMatrixExpression(TransposeMatrix n) '''\n+\t\t�n.name�.transpose()'''\t\t\n+\t\t\n+\tdef dispatch compileMatrixExpression(MatrixAddition op) '''\n+\t\t�compileMatrixExpression(op.left)�.plus(�compileMatrixExpression(op.right)�)'''\n+\t\n+\tdef dispatch compileMatrixExpression(MatrixSubtraction op) '''\n+\t\t�compileMatrixExpression(op.left)�.minus(�compileMatrixExpression(op.right)�)'''\n+\t\n+\tdef dispatch compileMatrixExpression(MatrixMultiplication op) '''\n+\t\t�IF op.rightMatrix != null��compileMatrixExpression(op.left)�.times(�compileMatrixExpression(op.rightMatrix)�)�ENDIF�\n+\t\t�IF op.rightScalar != null��compileMatrixExpression(op.left)�.times(�compileFormula(op.rightScalar)�)�ENDIF�'''\n+\t \t\n }\n\\ No newline at end of file", "raw_url": "https://github.com/iee/iee/raw/0f04d91efdf50447d8e84e926ef98d7462103dc0/org.eclipse.iee.translator.Jmole%2Forg.eclipse.iee.translator.jmole.math%2Fbin%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fjmole%2Fmath%2Fgenerator%2FMathGenerator.xtend", "sha": "42b4feb50acad2bc2ffe491b1bada89a4fd14fa5", "status": "modified" }, { "additions": 15, "blob_url": "https://github.com/iee/iee/blob/0f04d91efdf50447d8e84e926ef98d7462103dc0/org.eclipse.iee.translator.Jmole%2Forg.eclipse.iee.translator.jmole.math%2Fbin%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fjmole%2Fmath%2Fparser%2Fantlr%2Finternal%2FInternalMath.tokens", "changes": 28, "contents_url": "https://api.github.com/repos/iee/iee/contents/org.eclipse.iee.translator.Jmole%2Forg.eclipse.iee.translator.jmole.math%2Fbin%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fjmole%2Fmath%2Fparser%2Fantlr%2Finternal%2FInternalMath.tokens?ref=0f04d91efdf50447d8e84e926ef98d7462103dc0", "deletions": 13, "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/bin/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.tokens", "new_code": "T__31=31\n'(-'=18\n'}'=27\n')!'=21\n'{'=25\n'e'=31\n'('=20\n'['=23\n']^T'=28\n','=26\n'E'=30\n'.'=29\n')'=19\n'^'=22\n']'=24", "new_methods": [], "old_code": "'..'=22\n'}'=30\n')!'=19\n'{'=29\n'e'=27\n'('=18\n'['=20\n','=28\n'E'=26\n'.'=25\n')'=21\n'^'=24\n']'=23", "old_methods": [], "patch": "@@ -15,6 +15,7 @@ RULE_MATH_NAME=4\n RULE_ML_COMMENT=8\n T__30=30\n T__19=19\n+T__31=31\n RULE_STRING=7\n T__16=16\n T__15=15\n@@ -25,22 +26,23 @@ T__14=14\n T__13=13\n RULE_INT=5\n RULE_WS=10\n-'..'=22\n-'}'=30\n+'(-'=18\n+'}'=27\n '/'=16\n-')!'=19\n-'{'=29\n-'e'=27\n+')!'=21\n+'{'=25\n+'e'=31\n '='=12\n-'('=18\n+'('=20\n '-'=14\n '*'=15\n-'['=20\n+'['=23\n '+'=13\n-','=28\n-'E'=26\n-'.'=25\n-')'=21\n-'^'=24\n+']^T'=28\n+','=26\n+'E'=30\n+'.'=29\n+')'=19\n+'^'=22\n '%'=17\n-']'=23\n+']'=24", "raw_url": "https://github.com/iee/iee/raw/0f04d91efdf50447d8e84e926ef98d7462103dc0/org.eclipse.iee.translator.Jmole%2Forg.eclipse.iee.translator.jmole.math%2Fbin%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fjmole%2Fmath%2Fparser%2Fantlr%2Finternal%2FInternalMath.tokens", "sha": "10f871d96eb7658a3ec21b5d0fc2235b16fa3b42", "status": "modified" }, { "additions": 58, "blob_url": "https://github.com/iee/iee/blob/0f04d91efdf50447d8e84e926ef98d7462103dc0/org.eclipse.iee.translator.Jmole%2Forg.eclipse.iee.translator.jmole.math%2Fsrc-gen%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fjmole%2Fmath%2FMath.ecore", "changes": 78, "contents_url": "https://api.github.com/repos/iee/iee/contents/org.eclipse.iee.translator.Jmole%2Forg.eclipse.iee.translator.jmole.math%2Fsrc-gen%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fjmole%2Fmath%2FMath.ecore?ref=0f04d91efdf50447d8e84e926ef98d7462103dc0", "deletions": 20, "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore", "new_code": " <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"variableAssignment\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//VariableAssignment\"\n <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"matrixAssignment\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixAssignment\"\n containment=\"true\"/>\n <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"matrixFormula\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixFormula\"\n containment=\"true\"/>\n <eClassifiers xsi:type=\"ecore:EClass\" name=\"VariableAssignment\">\n <eClassifiers xsi:type=\"ecore:EClass\" name=\"Matrix\">\n <eClassifiers xsi:type=\"ecore:EClass\" name=\"MatrixAssignment\">\n <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"variable\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString\"/>\n <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"value\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixFormula\"\n containment=\"true\"/>\n </eClassifiers>\n <eClassifiers xsi:type=\"ecore:EClass\" name=\"MatrixFormula\">\n <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"expression\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixExpression\"\n containment=\"true\"/>\n </eClassifiers>\n <eClassifiers xsi:type=\"ecore:EClass\" name=\"MatrixExpression\"/>\n <eClassifiers xsi:type=\"ecore:EClass\" name=\"FunctionDefinition\">\n <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"function\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Expression\"\n containment=\"true\"/>\n <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"formula\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Formula\"\n containment=\"true\"/>\n </eClassifiers>\n <eClassifiers xsi:type=\"ecore:EClass\" name=\"MatrixElement\" eSuperTypes=\"platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Expression\">\n <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"element\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString\"/>\n <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"row\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt\"/>\n <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"column\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt\"/>\n </eClassifiers>\n <eClassifiers xsi:type=\"ecore:EClass\" name=\"MatrixAddition\" eSuperTypes=\"platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixExpression\">\n <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"left\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixExpression\"\n containment=\"true\"/>\n <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"right\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixExpression\"\n containment=\"true\"/>\n </eClassifiers>\n <eClassifiers xsi:type=\"ecore:EClass\" name=\"MatrixSubtraction\" eSuperTypes=\"platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixExpression\">\n <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"left\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixExpression\"\n containment=\"true\"/>\n <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"right\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixExpression\"\n containment=\"true\"/>\n </eClassifiers>\n <eClassifiers xsi:type=\"ecore:EClass\" name=\"MatrixMultiplication\" eSuperTypes=\"platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixExpression\">\n <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"left\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixExpression\"\n containment=\"true\"/>\n <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"rightMatrix\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixExpression\"\n containment=\"true\"/>\n <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"rightScalar\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Formula\"\n containment=\"true\"/>\n </eClassifiers>\n <eClassifiers xsi:type=\"ecore:EClass\" name=\"NewMatrix\" eSuperTypes=\"platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixExpression\">\n <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"matrix\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Matrix\"\n containment=\"true\"/>\n </eClassifiers>\n <eClassifiers xsi:type=\"ecore:EClass\" name=\"TransposeMatrix\" eSuperTypes=\"platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixExpression\">\n <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"name\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString\"/>\n </eClassifiers>\n <eClassifiers xsi:type=\"ecore:EClass\" name=\"MatrixVariable\" eSuperTypes=\"platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixExpression\">\n <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"name\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString\"/>\n </eClassifiers>", "new_methods": [], "old_code": " <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"matrixDefinition\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixDefinition\"\n containment=\"true\"/>\n <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"assignment\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Assignment\"\n <eClassifiers xsi:type=\"ecore:EClass\" name=\"Assignment\">\n <eClassifiers xsi:type=\"ecore:EClass\" name=\"FunctionDefinition\">\n <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"function\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Expression\"\n containment=\"true\"/>\n <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"formula\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Formula\"\n containment=\"true\"/>\n </eClassifiers>\n <eClassifiers xsi:type=\"ecore:EClass\" name=\"MatrixDefinition\">\n <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"name\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString\"/>\n <eClassifiers xsi:type=\"ecore:EClass\" name=\"Interval\" eSuperTypes=\"platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Expression\">\n <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"openingBracket\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString\"/>\n <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"ceil\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Expression\"\n containment=\"true\"/>\n <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"floor\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Expression\"\n containment=\"true\"/>\n <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"closingBracket\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString\"/>\n </eClassifiers>", "old_methods": [], "patch": "@@ -6,14 +6,16 @@\n <eClassifiers xsi:type=\"ecore:EClass\" name=\"Statement\">\n <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"functionDefinition\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//FunctionDefinition\"\n containment=\"true\"/>\n- <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"matrixDefinition\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixDefinition\"\n- containment=\"true\"/>\n- <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"assignment\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Assignment\"\n+ <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"variableAssignment\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//VariableAssignment\"\n containment=\"true\"/>\n <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"formula\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Formula\"\n containment=\"true\"/>\n+ <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"matrixAssignment\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixAssignment\"\n+ containment=\"true\"/>\n+ <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"matrixFormula\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixFormula\"\n+ containment=\"true\"/>\n </eClassifiers>\n- <eClassifiers xsi:type=\"ecore:EClass\" name=\"Assignment\">\n+ <eClassifiers xsi:type=\"ecore:EClass\" name=\"VariableAssignment\">\n <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"variable\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString\"/>\n <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"value\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Formula\"\n containment=\"true\"/>\n@@ -28,21 +30,30 @@\n eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Formula\"\n containment=\"true\"/>\n </eClassifiers>\n- <eClassifiers xsi:type=\"ecore:EClass\" name=\"FunctionDefinition\">\n- <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"function\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Expression\"\n- containment=\"true\"/>\n- <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"formula\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Formula\"\n- containment=\"true\"/>\n- </eClassifiers>\n- <eClassifiers xsi:type=\"ecore:EClass\" name=\"MatrixDefinition\">\n- <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"name\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString\"/>\n+ <eClassifiers xsi:type=\"ecore:EClass\" name=\"Matrix\">\n <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"rows\" upperBound=\"-1\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixRow\"\n containment=\"true\"/>\n </eClassifiers>\n <eClassifiers xsi:type=\"ecore:EClass\" name=\"MatrixRow\">\n <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"elements\" unique=\"false\"\n upperBound=\"-1\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString\"/>\n </eClassifiers>\n+ <eClassifiers xsi:type=\"ecore:EClass\" name=\"MatrixAssignment\">\n+ <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"variable\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString\"/>\n+ <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"value\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixFormula\"\n+ containment=\"true\"/>\n+ </eClassifiers>\n+ <eClassifiers xsi:type=\"ecore:EClass\" name=\"MatrixFormula\">\n+ <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"expression\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixExpression\"\n+ containment=\"true\"/>\n+ </eClassifiers>\n+ <eClassifiers xsi:type=\"ecore:EClass\" name=\"MatrixExpression\"/>\n+ <eClassifiers xsi:type=\"ecore:EClass\" name=\"FunctionDefinition\">\n+ <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"function\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Expression\"\n+ containment=\"true\"/>\n+ <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"formula\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Formula\"\n+ containment=\"true\"/>\n+ </eClassifiers>\n <eClassifiers xsi:type=\"ecore:EClass\" name=\"Addition\" eSuperTypes=\"platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Expression\">\n <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"left\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Expression\"\n containment=\"true\"/>\n@@ -81,14 +92,6 @@\n <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"expression\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Expression\"\n containment=\"true\"/>\n </eClassifiers>\n- <eClassifiers xsi:type=\"ecore:EClass\" name=\"Interval\" eSuperTypes=\"platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Expression\">\n- <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"openingBracket\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString\"/>\n- <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"ceil\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Expression\"\n- containment=\"true\"/>\n- <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"floor\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Expression\"\n- containment=\"true\"/>\n- <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"closingBracket\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString\"/>\n- </eClassifiers>\n <eClassifiers xsi:type=\"ecore:EClass\" name=\"Exponent\" eSuperTypes=\"platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Expression\">\n <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"left\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Expression\"\n containment=\"true\"/>\n@@ -99,8 +102,43 @@\n <eClassifiers xsi:type=\"ecore:EClass\" name=\"Float\" eSuperTypes=\"platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Expression\">\n <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"value\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString\"/>\n </eClassifiers>\n+ <eClassifiers xsi:type=\"ecore:EClass\" name=\"MatrixElement\" eSuperTypes=\"platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Expression\">\n+ <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"element\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString\"/>\n+ <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"row\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt\"/>\n+ <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"column\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt\"/>\n+ </eClassifiers>\n <eClassifiers xsi:type=\"ecore:EClass\" name=\"Function\" eSuperTypes=\"platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Expression\">\n <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"function\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Expression\"\n containment=\"true\"/>\n </eClassifiers>\n+ <eClassifiers xsi:type=\"ecore:EClass\" name=\"MatrixAddition\" eSuperTypes=\"platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixExpression\">\n+ <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"left\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixExpression\"\n+ containment=\"true\"/>\n+ <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"right\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixExpression\"\n+ containment=\"true\"/>\n+ </eClassifiers>\n+ <eClassifiers xsi:type=\"ecore:EClass\" name=\"MatrixSubtraction\" eSuperTypes=\"platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixExpression\">\n+ <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"left\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixExpression\"\n+ containment=\"true\"/>\n+ <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"right\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixExpression\"\n+ containment=\"true\"/>\n+ </eClassifiers>\n+ <eClassifiers xsi:type=\"ecore:EClass\" name=\"MatrixMultiplication\" eSuperTypes=\"platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixExpression\">\n+ <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"left\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixExpression\"\n+ containment=\"true\"/>\n+ <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"rightMatrix\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixExpression\"\n+ containment=\"true\"/>\n+ <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"rightScalar\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Formula\"\n+ containment=\"true\"/>\n+ </eClassifiers>\n+ <eClassifiers xsi:type=\"ecore:EClass\" name=\"NewMatrix\" eSuperTypes=\"platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixExpression\">\n+ <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"matrix\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Matrix\"\n+ containment=\"true\"/>\n+ </eClassifiers>\n+ <eClassifiers xsi:type=\"ecore:EClass\" name=\"TransposeMatrix\" eSuperTypes=\"platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixExpression\">\n+ <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"name\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString\"/>\n+ </eClassifiers>\n+ <eClassifiers xsi:type=\"ecore:EClass\" name=\"MatrixVariable\" eSuperTypes=\"platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixExpression\">\n+ <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"name\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString\"/>\n+ </eClassifiers>\n </ecore:EPackage>", "raw_url": "https://github.com/iee/iee/raw/0f04d91efdf50447d8e84e926ef98d7462103dc0/org.eclipse.iee.translator.Jmole%2Forg.eclipse.iee.translator.jmole.math%2Fsrc-gen%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fjmole%2Fmath%2FMath.ecore", "sha": "1e33bf66f7ba9ca9d14a1a38c79e55e3e220cb41", "status": "modified" }, { "additions": 47, "blob_url": "https://github.com/iee/iee/blob/0f04d91efdf50447d8e84e926ef98d7462103dc0/org.eclipse.iee.translator.Jmole%2Forg.eclipse.iee.translator.jmole.math%2Fsrc-gen%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fjmole%2Fmath%2FMath.genmodel", "changes": 65, "contents_url": "https://api.github.com/repos/iee/iee/contents/org.eclipse.iee.translator.Jmole%2Forg.eclipse.iee.translator.jmole.math%2Fsrc-gen%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fjmole%2Fmath%2FMath.genmodel?ref=0f04d91efdf50447d8e84e926ef98d7462103dc0", "deletions": 18, "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.genmodel", "new_code": " <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Statement/variableAssignment\"/>\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Statement/matrixAssignment\"/>\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Statement/matrixFormula\"/>\n <genClasses ecoreClass=\"platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//VariableAssignment\">\n <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//VariableAssignment/variable\"/>\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//VariableAssignment/value\"/>\n <genClasses ecoreClass=\"platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Matrix\">\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Matrix/rows\"/>\n <genClasses ecoreClass=\"platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixAssignment\">\n <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixAssignment/variable\"/>\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixAssignment/value\"/>\n </genClasses>\n <genClasses ecoreClass=\"platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixFormula\">\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixFormula/expression\"/>\n </genClasses>\n <genClasses ecoreClass=\"platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixExpression\"/>\n <genClasses ecoreClass=\"platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//FunctionDefinition\">\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//FunctionDefinition/function\"/>\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//FunctionDefinition/formula\"/>\n </genClasses>\n <genClasses ecoreClass=\"platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixElement\">\n <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixElement/element\"/>\n <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixElement/row\"/>\n <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixElement/column\"/>\n </genClasses>\n <genClasses ecoreClass=\"platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixAddition\">\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixAddition/left\"/>\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixAddition/right\"/>\n </genClasses>\n <genClasses ecoreClass=\"platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixSubtraction\">\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixSubtraction/left\"/>\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixSubtraction/right\"/>\n </genClasses>\n <genClasses ecoreClass=\"platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixMultiplication\">\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixMultiplication/left\"/>\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixMultiplication/rightMatrix\"/>\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixMultiplication/rightScalar\"/>\n </genClasses>\n <genClasses ecoreClass=\"platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//NewMatrix\">\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//NewMatrix/matrix\"/>\n </genClasses>\n <genClasses ecoreClass=\"platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//TransposeMatrix\">\n <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//TransposeMatrix/name\"/>\n </genClasses>\n <genClasses ecoreClass=\"platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixVariable\">\n <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixVariable/name\"/>\n </genClasses>", "new_methods": [], "old_code": " <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Statement/matrixDefinition\"/>\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Statement/assignment\"/>\n <genClasses ecoreClass=\"platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Assignment\">\n <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Assignment/variable\"/>\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Assignment/value\"/>\n <genClasses ecoreClass=\"platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//FunctionDefinition\">\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//FunctionDefinition/function\"/>\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//FunctionDefinition/formula\"/>\n </genClasses>\n <genClasses ecoreClass=\"platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixDefinition\">\n <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixDefinition/name\"/>\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixDefinition/rows\"/>\n <genClasses ecoreClass=\"platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Interval\">\n <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Interval/openingBracket\"/>\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Interval/ceil\"/>\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Interval/floor\"/>\n <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Interval/closingBracket\"/>\n </genClasses>", "old_methods": [], "patch": "@@ -11,13 +11,14 @@\n ecorePackage=\"platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#/\">\n <genClasses ecoreClass=\"platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Statement\">\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Statement/functionDefinition\"/>\n- <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Statement/matrixDefinition\"/>\n- <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Statement/assignment\"/>\n+ <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Statement/variableAssignment\"/>\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Statement/formula\"/>\n+ <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Statement/matrixAssignment\"/>\n+ <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Statement/matrixFormula\"/>\n </genClasses>\n- <genClasses ecoreClass=\"platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Assignment\">\n- <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Assignment/variable\"/>\n- <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Assignment/value\"/>\n+ <genClasses ecoreClass=\"platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//VariableAssignment\">\n+ <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//VariableAssignment/variable\"/>\n+ <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//VariableAssignment/value\"/>\n </genClasses>\n <genClasses ecoreClass=\"platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Formula\">\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Formula/expression\"/>\n@@ -26,17 +27,24 @@\n <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Expression/name\"/>\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Expression/parameters\"/>\n </genClasses>\n- <genClasses ecoreClass=\"platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//FunctionDefinition\">\n- <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//FunctionDefinition/function\"/>\n- <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//FunctionDefinition/formula\"/>\n- </genClasses>\n- <genClasses ecoreClass=\"platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixDefinition\">\n- <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixDefinition/name\"/>\n- <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixDefinition/rows\"/>\n+ <genClasses ecoreClass=\"platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Matrix\">\n+ <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Matrix/rows\"/>\n </genClasses>\n <genClasses ecoreClass=\"platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixRow\">\n <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixRow/elements\"/>\n </genClasses>\n+ <genClasses ecoreClass=\"platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixAssignment\">\n+ <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixAssignment/variable\"/>\n+ <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixAssignment/value\"/>\n+ </genClasses>\n+ <genClasses ecoreClass=\"platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixFormula\">\n+ <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixFormula/expression\"/>\n+ </genClasses>\n+ <genClasses ecoreClass=\"platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixExpression\"/>\n+ <genClasses ecoreClass=\"platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//FunctionDefinition\">\n+ <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//FunctionDefinition/function\"/>\n+ <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//FunctionDefinition/formula\"/>\n+ </genClasses>\n <genClasses ecoreClass=\"platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Addition\">\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Addition/left\"/>\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Addition/right\"/>\n@@ -63,12 +71,6 @@\n <genClasses ecoreClass=\"platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Factorial\">\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Factorial/expression\"/>\n </genClasses>\n- <genClasses ecoreClass=\"platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Interval\">\n- <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Interval/openingBracket\"/>\n- <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Interval/ceil\"/>\n- <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Interval/floor\"/>\n- <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Interval/closingBracket\"/>\n- </genClasses>\n <genClasses ecoreClass=\"platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Exponent\">\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Exponent/left\"/>\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Exponent/right\"/>\n@@ -77,8 +79,35 @@\n <genClasses ecoreClass=\"platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Float\">\n <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Float/value\"/>\n </genClasses>\n+ <genClasses ecoreClass=\"platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixElement\">\n+ <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixElement/element\"/>\n+ <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixElement/row\"/>\n+ <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixElement/column\"/>\n+ </genClasses>\n <genClasses ecoreClass=\"platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Function\">\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//Function/function\"/>\n </genClasses>\n+ <genClasses ecoreClass=\"platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixAddition\">\n+ <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixAddition/left\"/>\n+ <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixAddition/right\"/>\n+ </genClasses>\n+ <genClasses ecoreClass=\"platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixSubtraction\">\n+ <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixSubtraction/left\"/>\n+ <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixSubtraction/right\"/>\n+ </genClasses>\n+ <genClasses ecoreClass=\"platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixMultiplication\">\n+ <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixMultiplication/left\"/>\n+ <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixMultiplication/rightMatrix\"/>\n+ <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixMultiplication/rightScalar\"/>\n+ </genClasses>\n+ <genClasses ecoreClass=\"platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//NewMatrix\">\n+ <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//NewMatrix/matrix\"/>\n+ </genClasses>\n+ <genClasses ecoreClass=\"platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//TransposeMatrix\">\n+ <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//TransposeMatrix/name\"/>\n+ </genClasses>\n+ <genClasses ecoreClass=\"platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixVariable\">\n+ <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute platform:/resource/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.ecore#//MatrixVariable/name\"/>\n+ </genClasses>\n </genPackages>\n </genmodel:GenModel>", "raw_url": "https://github.com/iee/iee/raw/0f04d91efdf50447d8e84e926ef98d7462103dc0/org.eclipse.iee.translator.Jmole%2Forg.eclipse.iee.translator.jmole.math%2Fsrc-gen%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fjmole%2Fmath%2FMath.genmodel", "sha": "753e79ff1a42386f5fb070f2e10972e5be5a015f", "status": "modified" }, { "additions": 214, "blob_url": "https://github.com/iee/iee/blob/0f04d91efdf50447d8e84e926ef98d7462103dc0/org.eclipse.iee.translator.Jmole%2Forg.eclipse.iee.translator.jmole.math%2Fsrc-gen%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fjmole%2Fmath%2FMath.xmi", "changes": 304, "contents_url": "https://api.github.com/repos/iee/iee/contents/org.eclipse.iee.translator.Jmole%2Forg.eclipse.iee.translator.jmole.math%2Fsrc-gen%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fjmole%2Fmath%2FMath.xmi?ref=0f04d91efdf50447d8e84e926ef98d7462103dc0", "deletions": 90, "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/Math.xmi", "new_code": " <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.17\"/>\n <elements xsi:type=\"xtext:Assignment\" feature=\"variableAssignment\" operator=\"=\">\n <elements xsi:type=\"xtext:Assignment\" feature=\"matrixAssignment\" operator=\"=\">\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.10\"/>\n </elements>\n <elements xsi:type=\"xtext:Assignment\" feature=\"matrixFormula\" operator=\"=\">\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.11\"/>\n </elements>\n <rules xsi:type=\"xtext:ParserRule\" name=\"VariableAssignment\">\n <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/iee/translator/jmole/math/Math#//VariableAssignment\"/>\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.18\"/>\n <elements xsi:type=\"xtext:Keyword\" value=\"(-\"/>\n <elements xsi:type=\"xtext:Keyword\" value=\")\"/>\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.18\"/>\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.15\"/>\n <elements xsi:type=\"xtext:Group\">\n <elements xsi:type=\"xtext:Action\">\n <type metamodel=\"/0/@metamodelDeclarations.1\">\n <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/iee/translator/jmole/math/Math#//MatrixElement\"/>\n </type>\n </elements>\n <elements xsi:type=\"xtext:Assignment\" feature=\"element\" operator=\"=\">\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.18\"/>\n </elements>\n <elements xsi:type=\"xtext:Keyword\" value=\"[\"/>\n <elements xsi:type=\"xtext:Assignment\" feature=\"row\" operator=\"=\">\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/1/@rules.1\"/>\n </elements>\n <elements xsi:type=\"xtext:Keyword\" value=\"]\"/>\n <elements xsi:type=\"xtext:Keyword\" value=\"[\"/>\n <elements xsi:type=\"xtext:Assignment\" feature=\"column\" operator=\"=\">\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/1/@rules.1\"/>\n </elements>\n <elements xsi:type=\"xtext:Keyword\" value=\"]\"/>\n </elements>\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.16\"/>\n <rules xsi:type=\"xtext:ParserRule\" name=\"Matrix\">\n <type metamodel=\"/0/@metamodelDeclarations.1\">\n <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/iee/translator/jmole/math/Math#//Matrix\"/>\n </type>\n <alternatives xsi:type=\"xtext:Group\">\n <elements xsi:type=\"xtext:Keyword\" value=\"{\"/>\n <elements xsi:type=\"xtext:Group\" cardinality=\"?\">\n <elements xsi:type=\"xtext:Assignment\" feature=\"rows\" operator=\"+=\">\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.9\"/>\n </elements>\n <elements xsi:type=\"xtext:Group\" cardinality=\"*\">\n <elements xsi:type=\"xtext:Keyword\" value=\",\"/>\n <elements xsi:type=\"xtext:Assignment\" feature=\"rows\" operator=\"+=\">\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.9\"/>\n </elements>\n </elements>\n <elements xsi:type=\"xtext:Keyword\" cardinality=\"?\" value=\",\"/>\n </elements>\n <elements xsi:type=\"xtext:Keyword\" value=\"}\"/>\n </alternatives>\n </rules>\n <rules xsi:type=\"xtext:ParserRule\" name=\"MatrixRow\">\n <type metamodel=\"/0/@metamodelDeclarations.1\">\n <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/iee/translator/jmole/math/Math#//MatrixRow\"/>\n </type>\n <alternatives xsi:type=\"xtext:Group\">\n <elements xsi:type=\"xtext:Keyword\" value=\"{\"/>\n <elements xsi:type=\"xtext:Group\" cardinality=\"?\">\n <elements xsi:type=\"xtext:Assignment\" feature=\"elements\" operator=\"+=\">\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.15\"/>\n </elements>\n <elements xsi:type=\"xtext:Group\" cardinality=\"*\">\n <elements xsi:type=\"xtext:Keyword\" value=\",\"/>\n <elements xsi:type=\"xtext:Assignment\" feature=\"elements\" operator=\"+=\">\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.15\"/>\n </elements>\n </elements>\n <elements xsi:type=\"xtext:Keyword\" cardinality=\"?\" value=\",\"/>\n </elements>\n <elements xsi:type=\"xtext:Keyword\" value=\"}\"/>\n </alternatives>\n </rules>\n <rules xsi:type=\"xtext:ParserRule\" name=\"MatrixAssignment\">\n <type metamodel=\"/0/@metamodelDeclarations.1\">\n <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/iee/translator/jmole/math/Math#//MatrixAssignment\"/>\n </type>\n <alternatives xsi:type=\"xtext:Group\">\n <elements xsi:type=\"xtext:Keyword\" value=\"[\"/>\n <elements xsi:type=\"xtext:Assignment\" feature=\"variable\" operator=\"=\">\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.18\"/>\n </elements>\n <elements xsi:type=\"xtext:Keyword\" value=\"]\"/>\n <elements xsi:type=\"xtext:Keyword\" value=\"=\"/>\n <elements xsi:type=\"xtext:Assignment\" feature=\"value\" operator=\"=\">\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.11\"/>\n </elements>\n </alternatives>\n </rules>\n <rules xsi:type=\"xtext:ParserRule\" name=\"MatrixFormula\">\n <type metamodel=\"/0/@metamodelDeclarations.1\">\n <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/iee/translator/jmole/math/Math#//MatrixFormula\"/>\n </type>\n <alternatives xsi:type=\"xtext:Assignment\" feature=\"expression\" operator=\"=\">\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.12\"/>\n </alternatives>\n </rules>\n <rules xsi:type=\"xtext:ParserRule\" name=\"MatrixAddition\">\n <type metamodel=\"/0/@metamodelDeclarations.1\">\n <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/iee/translator/jmole/math/Math#//MatrixExpression\"/>\n </type>\n <alternatives xsi:type=\"xtext:Group\">\n <elements xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.13\"/>\n <elements xsi:type=\"xtext:Alternatives\" cardinality=\"*\">\n <elements xsi:type=\"xtext:Group\">\n <elements xsi:type=\"xtext:Keyword\" value=\"+\"/>\n <elements xsi:type=\"xtext:Action\" feature=\"left\" operator=\"=\">\n <type metamodel=\"/0/@metamodelDeclarations.1\">\n <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/iee/translator/jmole/math/Math#//MatrixAddition\"/>\n </type>\n </elements>\n <elements xsi:type=\"xtext:Assignment\" feature=\"right\" operator=\"=\">\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.13\"/>\n </elements>\n </elements>\n <elements xsi:type=\"xtext:Group\">\n <elements xsi:type=\"xtext:Keyword\" value=\"-\"/>\n <elements xsi:type=\"xtext:Action\" feature=\"left\" operator=\"=\">\n <type metamodel=\"/0/@metamodelDeclarations.1\">\n <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/iee/translator/jmole/math/Math#//MatrixSubtraction\"/>\n </type>\n </elements>\n <elements xsi:type=\"xtext:Assignment\" feature=\"right\" operator=\"=\">\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.13\"/>\n </elements>\n </elements>\n </elements>\n </alternatives>\n </rules>\n <rules xsi:type=\"xtext:ParserRule\" name=\"MatrixMultiplication\">\n <type metamodel=\"/0/@metamodelDeclarations.1\">\n <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/iee/translator/jmole/math/Math#//MatrixExpression\"/>\n </type>\n <alternatives xsi:type=\"xtext:Group\">\n <elements xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.14\"/>\n <elements xsi:type=\"xtext:Alternatives\" cardinality=\"*\">\n <elements xsi:type=\"xtext:Group\">\n <elements xsi:type=\"xtext:Keyword\" value=\"*\"/>\n <elements xsi:type=\"xtext:Action\" feature=\"left\" operator=\"=\">\n <type metamodel=\"/0/@metamodelDeclarations.1\">\n <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/iee/translator/jmole/math/Math#//MatrixMultiplication\"/>\n </type>\n </elements>\n <elements xsi:type=\"xtext:Assignment\" feature=\"rightMatrix\" operator=\"=\">\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.14\"/>\n </elements>\n </elements>\n <elements xsi:type=\"xtext:Group\">\n <elements xsi:type=\"xtext:Keyword\" value=\"*\"/>\n <elements xsi:type=\"xtext:Action\" feature=\"left\" operator=\"=\">\n <type metamodel=\"/0/@metamodelDeclarations.1\">\n <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/iee/translator/jmole/math/Math#//MatrixMultiplication\"/>\n </type>\n </elements>\n <elements xsi:type=\"xtext:Assignment\" feature=\"rightScalar\" operator=\"=\">\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.2\"/>\n </elements>\n </elements>\n </elements>\n </alternatives>\n </rules>\n <rules xsi:type=\"xtext:ParserRule\" name=\"PrimaryMatrix\">\n <type metamodel=\"/0/@metamodelDeclarations.1\">\n <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/iee/translator/jmole/math/Math#//MatrixExpression\"/>\n </type>\n <alternatives xsi:type=\"xtext:Alternatives\">\n <elements xsi:type=\"xtext:Group\">\n <elements xsi:type=\"xtext:Action\">\n <type metamodel=\"/0/@metamodelDeclarations.1\">\n <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/iee/translator/jmole/math/Math#//NewMatrix\"/>\n </type>\n </elements>\n <elements xsi:type=\"xtext:Assignment\" feature=\"matrix\" operator=\"=\">\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.8\"/>\n </elements>\n </elements>\n <elements xsi:type=\"xtext:Group\">\n <elements xsi:type=\"xtext:Action\">\n <type metamodel=\"/0/@metamodelDeclarations.1\">\n <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/iee/translator/jmole/math/Math#//TransposeMatrix\"/>\n </type>\n </elements>\n <elements xsi:type=\"xtext:Keyword\" value=\"[\"/>\n <elements xsi:type=\"xtext:Assignment\" feature=\"name\" operator=\"=\">\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.18\"/>\n </elements>\n <elements xsi:type=\"xtext:Keyword\" value=\"]^T\"/>\n </elements>\n <elements xsi:type=\"xtext:Group\">\n <elements xsi:type=\"xtext:Action\">\n <type metamodel=\"/0/@metamodelDeclarations.1\">\n <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/iee/translator/jmole/math/Math#//MatrixVariable\"/>\n </type>\n </elements>\n <elements xsi:type=\"xtext:Keyword\" value=\"[\"/>\n <elements xsi:type=\"xtext:Assignment\" feature=\"name\" operator=\"=\">\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.18\"/>\n </elements>\n <elements xsi:type=\"xtext:Keyword\" value=\"]\"/>\n </elements>\n <elements xsi:type=\"xtext:Group\">\n <elements xsi:type=\"xtext:Keyword\" value=\"(\"/>\n <elements xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.12\"/>\n <elements xsi:type=\"xtext:Keyword\" value=\")\"/>\n </elements>\n </alternatives>\n </rules>\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.18\"/>\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.16\"/>", "new_methods": [], "old_code": " <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.10\"/>\n </elements>\n <elements xsi:type=\"xtext:Assignment\" feature=\"matrixDefinition\" operator=\"=\">\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.11\"/>\n <elements xsi:type=\"xtext:Assignment\" feature=\"assignment\" operator=\"=\">\n <rules xsi:type=\"xtext:ParserRule\" name=\"Assignment\">\n <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/iee/translator/jmole/math/Math#//Assignment\"/>\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.13\"/>\n <elements xsi:type=\"xtext:Keyword\" value=\"-\"/>\n <elements xsi:type=\"xtext:Group\">\n <elements xsi:type=\"xtext:Action\">\n <type metamodel=\"/0/@metamodelDeclarations.1\">\n <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/iee/translator/jmole/math/Math#//Interval\"/>\n </type>\n </elements>\n <elements xsi:type=\"xtext:Assignment\" feature=\"openingBracket\" operator=\"=\">\n <terminal xsi:type=\"xtext:Alternatives\">\n <elements xsi:type=\"xtext:Keyword\" value=\"[\"/>\n <elements xsi:type=\"xtext:Keyword\" value=\"(\"/>\n </terminal>\n </elements>\n <elements xsi:type=\"xtext:Keyword\" value=\"(\"/>\n <elements xsi:type=\"xtext:Assignment\" feature=\"ceil\" operator=\"=\">\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.5\"/>\n </elements>\n <elements xsi:type=\"xtext:Keyword\" value=\")\"/>\n <elements xsi:type=\"xtext:Keyword\" value=\"..\"/>\n <elements xsi:type=\"xtext:Keyword\" value=\"(\"/>\n <elements xsi:type=\"xtext:Assignment\" feature=\"floor\" operator=\"=\">\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.5\"/>\n </elements>\n <elements xsi:type=\"xtext:Keyword\" value=\")\"/>\n <elements xsi:type=\"xtext:Assignment\" feature=\"closingBracket\" operator=\"=\">\n <terminal xsi:type=\"xtext:Alternatives\">\n <elements xsi:type=\"xtext:Keyword\" value=\"]\"/>\n <elements xsi:type=\"xtext:Keyword\" value=\")\"/>\n </terminal>\n </elements>\n </elements>\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.13\"/>\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.8\"/>\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.9\"/>\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.13\"/>\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.9\"/>\n <rules xsi:type=\"xtext:ParserRule\" name=\"MatrixDefinition\">\n <type metamodel=\"/0/@metamodelDeclarations.1\">\n <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/iee/translator/jmole/math/Math#//MatrixDefinition\"/>\n </type>\n <alternatives xsi:type=\"xtext:Group\">\n <elements xsi:type=\"xtext:Assignment\" feature=\"name\" operator=\"=\">\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.13\"/>\n </elements>\n <elements xsi:type=\"xtext:Keyword\" value=\"=\"/>\n <elements xsi:type=\"xtext:Keyword\" value=\"{\"/>\n <elements xsi:type=\"xtext:Group\" cardinality=\"?\">\n <elements xsi:type=\"xtext:Assignment\" feature=\"rows\" operator=\"+=\">\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.12\"/>\n </elements>\n <elements xsi:type=\"xtext:Group\" cardinality=\"*\">\n <elements xsi:type=\"xtext:Keyword\" value=\",\"/>\n <elements xsi:type=\"xtext:Assignment\" feature=\"rows\" operator=\"+=\">\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.12\"/>\n </elements>\n </elements>\n <elements xsi:type=\"xtext:Keyword\" cardinality=\"?\" value=\",\"/>\n </elements>\n <elements xsi:type=\"xtext:Keyword\" value=\"}\"/>\n </alternatives>\n </rules>\n <rules xsi:type=\"xtext:ParserRule\" name=\"MatrixRow\">\n <type metamodel=\"/0/@metamodelDeclarations.1\">\n <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/iee/translator/jmole/math/Math#//MatrixRow\"/>\n </type>\n <alternatives xsi:type=\"xtext:Group\">\n <elements xsi:type=\"xtext:Keyword\" value=\"{\"/>\n <elements xsi:type=\"xtext:Group\" cardinality=\"?\">\n <elements xsi:type=\"xtext:Assignment\" feature=\"elements\" operator=\"+=\">\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.8\"/>\n </elements>\n <elements xsi:type=\"xtext:Group\" cardinality=\"*\">\n <elements xsi:type=\"xtext:Keyword\" value=\",\"/>\n <elements xsi:type=\"xtext:Assignment\" feature=\"elements\" operator=\"+=\">\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.8\"/>\n </elements>\n </elements>\n <elements xsi:type=\"xtext:Keyword\" cardinality=\"?\" value=\",\"/>\n </elements>\n <elements xsi:type=\"xtext:Keyword\" value=\"}\"/>\n </alternatives>\n </rules>", "old_methods": [], "patch": "@@ -13,26 +13,29 @@\n </type>\n <alternatives xsi:type=\"xtext:Alternatives\">\n <elements xsi:type=\"xtext:Assignment\" feature=\"functionDefinition\" operator=\"=\">\n- <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.10\"/>\n- </elements>\n- <elements xsi:type=\"xtext:Assignment\" feature=\"matrixDefinition\" operator=\"=\">\n- <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.11\"/>\n+ <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.17\"/>\n </elements>\n- <elements xsi:type=\"xtext:Assignment\" feature=\"assignment\" operator=\"=\">\n+ <elements xsi:type=\"xtext:Assignment\" feature=\"variableAssignment\" operator=\"=\">\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.1\"/>\n </elements>\n <elements xsi:type=\"xtext:Assignment\" feature=\"formula\" operator=\"=\">\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.2\"/>\n </elements>\n+ <elements xsi:type=\"xtext:Assignment\" feature=\"matrixAssignment\" operator=\"=\">\n+ <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.10\"/>\n+ </elements>\n+ <elements xsi:type=\"xtext:Assignment\" feature=\"matrixFormula\" operator=\"=\">\n+ <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.11\"/>\n+ </elements>\n </alternatives>\n </rules>\n- <rules xsi:type=\"xtext:ParserRule\" name=\"Assignment\">\n+ <rules xsi:type=\"xtext:ParserRule\" name=\"VariableAssignment\">\n <type metamodel=\"/0/@metamodelDeclarations.1\">\n- <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/iee/translator/jmole/math/Math#//Assignment\"/>\n+ <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/iee/translator/jmole/math/Math#//VariableAssignment\"/>\n </type>\n <alternatives xsi:type=\"xtext:Group\">\n <elements xsi:type=\"xtext:Assignment\" feature=\"variable\" operator=\"=\">\n- <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.13\"/>\n+ <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.18\"/>\n </elements>\n <elements xsi:type=\"xtext:Keyword\" value=\"=\"/>\n <elements xsi:type=\"xtext:Assignment\" feature=\"value\" operator=\"=\">\n@@ -130,7 +133,7 @@\n <alternatives xsi:type=\"xtext:Alternatives\">\n <elements xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.6\"/>\n <elements xsi:type=\"xtext:Group\">\n- <elements xsi:type=\"xtext:Keyword\" value=\"-\"/>\n+ <elements xsi:type=\"xtext:Keyword\" value=\"(-\"/>\n <elements xsi:type=\"xtext:Action\">\n <type metamodel=\"/0/@metamodelDeclarations.1\">\n <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/iee/translator/jmole/math/Math#//Invert\"/>\n@@ -139,6 +142,7 @@\n <elements xsi:type=\"xtext:Assignment\" feature=\"expression\" operator=\"=\">\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.5\"/>\n </elements>\n+ <elements xsi:type=\"xtext:Keyword\" value=\")\"/>\n </elements>\n <elements xsi:type=\"xtext:Group\">\n <elements xsi:type=\"xtext:Keyword\" value=\"(\"/>\n@@ -152,36 +156,6 @@\n </elements>\n <elements xsi:type=\"xtext:Keyword\" value=\")!\"/>\n </elements>\n- <elements xsi:type=\"xtext:Group\">\n- <elements xsi:type=\"xtext:Action\">\n- <type metamodel=\"/0/@metamodelDeclarations.1\">\n- <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/iee/translator/jmole/math/Math#//Interval\"/>\n- </type>\n- </elements>\n- <elements xsi:type=\"xtext:Assignment\" feature=\"openingBracket\" operator=\"=\">\n- <terminal xsi:type=\"xtext:Alternatives\">\n- <elements xsi:type=\"xtext:Keyword\" value=\"[\"/>\n- <elements xsi:type=\"xtext:Keyword\" value=\"(\"/>\n- </terminal>\n- </elements>\n- <elements xsi:type=\"xtext:Keyword\" value=\"(\"/>\n- <elements xsi:type=\"xtext:Assignment\" feature=\"ceil\" operator=\"=\">\n- <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.5\"/>\n- </elements>\n- <elements xsi:type=\"xtext:Keyword\" value=\")\"/>\n- <elements xsi:type=\"xtext:Keyword\" value=\"..\"/>\n- <elements xsi:type=\"xtext:Keyword\" value=\"(\"/>\n- <elements xsi:type=\"xtext:Assignment\" feature=\"floor\" operator=\"=\">\n- <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.5\"/>\n- </elements>\n- <elements xsi:type=\"xtext:Keyword\" value=\")\"/>\n- <elements xsi:type=\"xtext:Assignment\" feature=\"closingBracket\" operator=\"=\">\n- <terminal xsi:type=\"xtext:Alternatives\">\n- <elements xsi:type=\"xtext:Keyword\" value=\"]\"/>\n- <elements xsi:type=\"xtext:Keyword\" value=\")\"/>\n- </terminal>\n- </elements>\n- </elements>\n </alternatives>\n </rules>\n <rules xsi:type=\"xtext:ParserRule\" name=\"Exponent\">\n@@ -215,7 +189,7 @@\n </type>\n </elements>\n <elements xsi:type=\"xtext:Assignment\" feature=\"name\" operator=\"=\">\n- <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.13\"/>\n+ <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.18\"/>\n </elements>\n </elements>\n <elements xsi:type=\"xtext:Group\">\n@@ -225,17 +199,37 @@\n </type>\n </elements>\n <elements xsi:type=\"xtext:Assignment\" feature=\"value\" operator=\"=\">\n- <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.8\"/>\n+ <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.15\"/>\n </elements>\n </elements>\n+ <elements xsi:type=\"xtext:Group\">\n+ <elements xsi:type=\"xtext:Action\">\n+ <type metamodel=\"/0/@metamodelDeclarations.1\">\n+ <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/iee/translator/jmole/math/Math#//MatrixElement\"/>\n+ </type>\n+ </elements>\n+ <elements xsi:type=\"xtext:Assignment\" feature=\"element\" operator=\"=\">\n+ <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.18\"/>\n+ </elements>\n+ <elements xsi:type=\"xtext:Keyword\" value=\"[\"/>\n+ <elements xsi:type=\"xtext:Assignment\" feature=\"row\" operator=\"=\">\n+ <terminal xsi:type=\"xtext:RuleCall\" rule=\"/1/@rules.1\"/>\n+ </elements>\n+ <elements xsi:type=\"xtext:Keyword\" value=\"]\"/>\n+ <elements xsi:type=\"xtext:Keyword\" value=\"[\"/>\n+ <elements xsi:type=\"xtext:Assignment\" feature=\"column\" operator=\"=\">\n+ <terminal xsi:type=\"xtext:RuleCall\" rule=\"/1/@rules.1\"/>\n+ </elements>\n+ <elements xsi:type=\"xtext:Keyword\" value=\"]\"/>\n+ </elements>\n <elements xsi:type=\"xtext:Group\">\n <elements xsi:type=\"xtext:Action\">\n <type metamodel=\"/0/@metamodelDeclarations.1\">\n <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/iee/translator/jmole/math/Math#//Function\"/>\n </type>\n </elements>\n <elements xsi:type=\"xtext:Assignment\" feature=\"function\" operator=\"=\">\n- <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.9\"/>\n+ <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.16\"/>\n </elements>\n </elements>\n <elements xsi:type=\"xtext:Group\">\n@@ -245,6 +239,182 @@\n </elements>\n </alternatives>\n </rules>\n+ <rules xsi:type=\"xtext:ParserRule\" name=\"Matrix\">\n+ <type metamodel=\"/0/@metamodelDeclarations.1\">\n+ <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/iee/translator/jmole/math/Math#//Matrix\"/>\n+ </type>\n+ <alternatives xsi:type=\"xtext:Group\">\n+ <elements xsi:type=\"xtext:Keyword\" value=\"{\"/>\n+ <elements xsi:type=\"xtext:Group\" cardinality=\"?\">\n+ <elements xsi:type=\"xtext:Assignment\" feature=\"rows\" operator=\"+=\">\n+ <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.9\"/>\n+ </elements>\n+ <elements xsi:type=\"xtext:Group\" cardinality=\"*\">\n+ <elements xsi:type=\"xtext:Keyword\" value=\",\"/>\n+ <elements xsi:type=\"xtext:Assignment\" feature=\"rows\" operator=\"+=\">\n+ <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.9\"/>\n+ </elements>\n+ </elements>\n+ <elements xsi:type=\"xtext:Keyword\" cardinality=\"?\" value=\",\"/>\n+ </elements>\n+ <elements xsi:type=\"xtext:Keyword\" value=\"}\"/>\n+ </alternatives>\n+ </rules>\n+ <rules xsi:type=\"xtext:ParserRule\" name=\"MatrixRow\">\n+ <type metamodel=\"/0/@metamodelDeclarations.1\">\n+ <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/iee/translator/jmole/math/Math#//MatrixRow\"/>\n+ </type>\n+ <alternatives xsi:type=\"xtext:Group\">\n+ <elements xsi:type=\"xtext:Keyword\" value=\"{\"/>\n+ <elements xsi:type=\"xtext:Group\" cardinality=\"?\">\n+ <elements xsi:type=\"xtext:Assignment\" feature=\"elements\" operator=\"+=\">\n+ <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.15\"/>\n+ </elements>\n+ <elements xsi:type=\"xtext:Group\" cardinality=\"*\">\n+ <elements xsi:type=\"xtext:Keyword\" value=\",\"/>\n+ <elements xsi:type=\"xtext:Assignment\" feature=\"elements\" operator=\"+=\">\n+ <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.15\"/>\n+ </elements>\n+ </elements>\n+ <elements xsi:type=\"xtext:Keyword\" cardinality=\"?\" value=\",\"/>\n+ </elements>\n+ <elements xsi:type=\"xtext:Keyword\" value=\"}\"/>\n+ </alternatives>\n+ </rules>\n+ <rules xsi:type=\"xtext:ParserRule\" name=\"MatrixAssignment\">\n+ <type metamodel=\"/0/@metamodelDeclarations.1\">\n+ <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/iee/translator/jmole/math/Math#//MatrixAssignment\"/>\n+ </type>\n+ <alternatives xsi:type=\"xtext:Group\">\n+ <elements xsi:type=\"xtext:Keyword\" value=\"[\"/>\n+ <elements xsi:type=\"xtext:Assignment\" feature=\"variable\" operator=\"=\">\n+ <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.18\"/>\n+ </elements>\n+ <elements xsi:type=\"xtext:Keyword\" value=\"]\"/>\n+ <elements xsi:type=\"xtext:Keyword\" value=\"=\"/>\n+ <elements xsi:type=\"xtext:Assignment\" feature=\"value\" operator=\"=\">\n+ <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.11\"/>\n+ </elements>\n+ </alternatives>\n+ </rules>\n+ <rules xsi:type=\"xtext:ParserRule\" name=\"MatrixFormula\">\n+ <type metamodel=\"/0/@metamodelDeclarations.1\">\n+ <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/iee/translator/jmole/math/Math#//MatrixFormula\"/>\n+ </type>\n+ <alternatives xsi:type=\"xtext:Assignment\" feature=\"expression\" operator=\"=\">\n+ <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.12\"/>\n+ </alternatives>\n+ </rules>\n+ <rules xsi:type=\"xtext:ParserRule\" name=\"MatrixAddition\">\n+ <type metamodel=\"/0/@metamodelDeclarations.1\">\n+ <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/iee/translator/jmole/math/Math#//MatrixExpression\"/>\n+ </type>\n+ <alternatives xsi:type=\"xtext:Group\">\n+ <elements xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.13\"/>\n+ <elements xsi:type=\"xtext:Alternatives\" cardinality=\"*\">\n+ <elements xsi:type=\"xtext:Group\">\n+ <elements xsi:type=\"xtext:Keyword\" value=\"+\"/>\n+ <elements xsi:type=\"xtext:Action\" feature=\"left\" operator=\"=\">\n+ <type metamodel=\"/0/@metamodelDeclarations.1\">\n+ <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/iee/translator/jmole/math/Math#//MatrixAddition\"/>\n+ </type>\n+ </elements>\n+ <elements xsi:type=\"xtext:Assignment\" feature=\"right\" operator=\"=\">\n+ <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.13\"/>\n+ </elements>\n+ </elements>\n+ <elements xsi:type=\"xtext:Group\">\n+ <elements xsi:type=\"xtext:Keyword\" value=\"-\"/>\n+ <elements xsi:type=\"xtext:Action\" feature=\"left\" operator=\"=\">\n+ <type metamodel=\"/0/@metamodelDeclarations.1\">\n+ <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/iee/translator/jmole/math/Math#//MatrixSubtraction\"/>\n+ </type>\n+ </elements>\n+ <elements xsi:type=\"xtext:Assignment\" feature=\"right\" operator=\"=\">\n+ <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.13\"/>\n+ </elements>\n+ </elements>\n+ </elements>\n+ </alternatives>\n+ </rules>\n+ <rules xsi:type=\"xtext:ParserRule\" name=\"MatrixMultiplication\">\n+ <type metamodel=\"/0/@metamodelDeclarations.1\">\n+ <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/iee/translator/jmole/math/Math#//MatrixExpression\"/>\n+ </type>\n+ <alternatives xsi:type=\"xtext:Group\">\n+ <elements xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.14\"/>\n+ <elements xsi:type=\"xtext:Alternatives\" cardinality=\"*\">\n+ <elements xsi:type=\"xtext:Group\">\n+ <elements xsi:type=\"xtext:Keyword\" value=\"*\"/>\n+ <elements xsi:type=\"xtext:Action\" feature=\"left\" operator=\"=\">\n+ <type metamodel=\"/0/@metamodelDeclarations.1\">\n+ <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/iee/translator/jmole/math/Math#//MatrixMultiplication\"/>\n+ </type>\n+ </elements>\n+ <elements xsi:type=\"xtext:Assignment\" feature=\"rightMatrix\" operator=\"=\">\n+ <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.14\"/>\n+ </elements>\n+ </elements>\n+ <elements xsi:type=\"xtext:Group\">\n+ <elements xsi:type=\"xtext:Keyword\" value=\"*\"/>\n+ <elements xsi:type=\"xtext:Action\" feature=\"left\" operator=\"=\">\n+ <type metamodel=\"/0/@metamodelDeclarations.1\">\n+ <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/iee/translator/jmole/math/Math#//MatrixMultiplication\"/>\n+ </type>\n+ </elements>\n+ <elements xsi:type=\"xtext:Assignment\" feature=\"rightScalar\" operator=\"=\">\n+ <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.2\"/>\n+ </elements>\n+ </elements>\n+ </elements>\n+ </alternatives>\n+ </rules>\n+ <rules xsi:type=\"xtext:ParserRule\" name=\"PrimaryMatrix\">\n+ <type metamodel=\"/0/@metamodelDeclarations.1\">\n+ <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/iee/translator/jmole/math/Math#//MatrixExpression\"/>\n+ </type>\n+ <alternatives xsi:type=\"xtext:Alternatives\">\n+ <elements xsi:type=\"xtext:Group\">\n+ <elements xsi:type=\"xtext:Action\">\n+ <type metamodel=\"/0/@metamodelDeclarations.1\">\n+ <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/iee/translator/jmole/math/Math#//NewMatrix\"/>\n+ </type>\n+ </elements>\n+ <elements xsi:type=\"xtext:Assignment\" feature=\"matrix\" operator=\"=\">\n+ <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.8\"/>\n+ </elements>\n+ </elements>\n+ <elements xsi:type=\"xtext:Group\">\n+ <elements xsi:type=\"xtext:Action\">\n+ <type metamodel=\"/0/@metamodelDeclarations.1\">\n+ <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/iee/translator/jmole/math/Math#//TransposeMatrix\"/>\n+ </type>\n+ </elements>\n+ <elements xsi:type=\"xtext:Keyword\" value=\"[\"/>\n+ <elements xsi:type=\"xtext:Assignment\" feature=\"name\" operator=\"=\">\n+ <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.18\"/>\n+ </elements>\n+ <elements xsi:type=\"xtext:Keyword\" value=\"]^T\"/>\n+ </elements>\n+ <elements xsi:type=\"xtext:Group\">\n+ <elements xsi:type=\"xtext:Action\">\n+ <type metamodel=\"/0/@metamodelDeclarations.1\">\n+ <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/iee/translator/jmole/math/Math#//MatrixVariable\"/>\n+ </type>\n+ </elements>\n+ <elements xsi:type=\"xtext:Keyword\" value=\"[\"/>\n+ <elements xsi:type=\"xtext:Assignment\" feature=\"name\" operator=\"=\">\n+ <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.18\"/>\n+ </elements>\n+ <elements xsi:type=\"xtext:Keyword\" value=\"]\"/>\n+ </elements>\n+ <elements xsi:type=\"xtext:Group\">\n+ <elements xsi:type=\"xtext:Keyword\" value=\"(\"/>\n+ <elements xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.12\"/>\n+ <elements xsi:type=\"xtext:Keyword\" value=\")\"/>\n+ </elements>\n+ </alternatives>\n+ </rules>\n <rules xsi:type=\"xtext:ParserRule\" name=\"Float\">\n <type metamodel=\"/0/@metamodelDeclarations.0\">\n <classifier xsi:type=\"ecore:EDataType\" href=\"http://www.eclipse.org/emf/2002/Ecore#//EString\"/>\n@@ -271,7 +441,7 @@\n </type>\n <alternatives xsi:type=\"xtext:Group\">\n <elements xsi:type=\"xtext:Assignment\" feature=\"name\" operator=\"=\">\n- <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.13\"/>\n+ <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.18\"/>\n </elements>\n <elements xsi:type=\"xtext:Keyword\" value=\"(\"/>\n <elements xsi:type=\"xtext:Group\" cardinality=\"?\">\n@@ -295,60 +465,14 @@\n </type>\n <alternatives xsi:type=\"xtext:Group\">\n <elements xsi:type=\"xtext:Assignment\" feature=\"function\" operator=\"=\">\n- <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.9\"/>\n+ <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.16\"/>\n </elements>\n <elements xsi:type=\"xtext:Keyword\" value=\"=\"/>\n <elements xsi:type=\"xtext:Assignment\" feature=\"formula\" operator=\"=\">\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.2\"/>\n </elements>\n </alternatives>\n </rules>\n- <rules xsi:type=\"xtext:ParserRule\" name=\"MatrixDefinition\">\n- <type metamodel=\"/0/@metamodelDeclarations.1\">\n- <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/iee/translator/jmole/math/Math#//MatrixDefinition\"/>\n- </type>\n- <alternatives xsi:type=\"xtext:Group\">\n- <elements xsi:type=\"xtext:Assignment\" feature=\"name\" operator=\"=\">\n- <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.13\"/>\n- </elements>\n- <elements xsi:type=\"xtext:Keyword\" value=\"=\"/>\n- <elements xsi:type=\"xtext:Keyword\" value=\"{\"/>\n- <elements xsi:type=\"xtext:Group\" cardinality=\"?\">\n- <elements xsi:type=\"xtext:Assignment\" feature=\"rows\" operator=\"+=\">\n- <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.12\"/>\n- </elements>\n- <elements xsi:type=\"xtext:Group\" cardinality=\"*\">\n- <elements xsi:type=\"xtext:Keyword\" value=\",\"/>\n- <elements xsi:type=\"xtext:Assignment\" feature=\"rows\" operator=\"+=\">\n- <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.12\"/>\n- </elements>\n- </elements>\n- <elements xsi:type=\"xtext:Keyword\" cardinality=\"?\" value=\",\"/>\n- </elements>\n- <elements xsi:type=\"xtext:Keyword\" value=\"}\"/>\n- </alternatives>\n- </rules>\n- <rules xsi:type=\"xtext:ParserRule\" name=\"MatrixRow\">\n- <type metamodel=\"/0/@metamodelDeclarations.1\">\n- <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/iee/translator/jmole/math/Math#//MatrixRow\"/>\n- </type>\n- <alternatives xsi:type=\"xtext:Group\">\n- <elements xsi:type=\"xtext:Keyword\" value=\"{\"/>\n- <elements xsi:type=\"xtext:Group\" cardinality=\"?\">\n- <elements xsi:type=\"xtext:Assignment\" feature=\"elements\" operator=\"+=\">\n- <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.8\"/>\n- </elements>\n- <elements xsi:type=\"xtext:Group\" cardinality=\"*\">\n- <elements xsi:type=\"xtext:Keyword\" value=\",\"/>\n- <elements xsi:type=\"xtext:Assignment\" feature=\"elements\" operator=\"+=\">\n- <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.8\"/>\n- </elements>\n- </elements>\n- <elements xsi:type=\"xtext:Keyword\" cardinality=\"?\" value=\",\"/>\n- </elements>\n- <elements xsi:type=\"xtext:Keyword\" value=\"}\"/>\n- </alternatives>\n- </rules>\n <rules xsi:type=\"xtext:TerminalRule\" name=\"MATH_NAME\">\n <type metamodel=\"/0/@metamodelDeclarations.0\">\n <classifier xsi:type=\"ecore:EDataType\" href=\"http://www.eclipse.org/emf/2002/Ecore#//EString\"/>", "raw_url": "https://github.com/iee/iee/raw/0f04d91efdf50447d8e84e926ef98d7462103dc0/org.eclipse.iee.translator.Jmole%2Forg.eclipse.iee.translator.jmole.math%2Fsrc-gen%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fjmole%2Fmath%2FMath.xmi", "sha": "f20f0b4c4bbec3af389940b5732653f0af267e50", "status": "modified" }, { "additions": 102, "blob_url": "https://github.com/iee/iee/blob/0f04d91efdf50447d8e84e926ef98d7462103dc0/org.eclipse.iee.translator.Jmole%2Forg.eclipse.iee.translator.jmole.math%2Fsrc-gen%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fjmole%2Fmath%2Fmath%2FMathFactory.java", "changes": 123, "contents_url": "https://api.github.com/repos/iee/iee/contents/org.eclipse.iee.translator.Jmole%2Forg.eclipse.iee.translator.jmole.math%2Fsrc-gen%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fjmole%2Fmath%2Fmath%2FMathFactory.java?ref=0f04d91efdf50447d8e84e926ef98d7462103dc0", "deletions": 21, "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/math/MathFactory.java", "new_code": " * Returns a new object of class '<em>Variable Assignment</em>'.\n * @return a new object of class '<em>Variable Assignment</em>'.\n VariableAssignment createVariableAssignment();\n * Returns a new object of class '<em>Matrix</em>'.\n * @return a new object of class '<em>Matrix</em>'.\n Matrix createMatrix();\n * Returns a new object of class '<em>Matrix Row</em>'.\n * @return a new object of class '<em>Matrix Row</em>'.\n MatrixRow createMatrixRow();\n * Returns a new object of class '<em>Matrix Assignment</em>'.\n * @return a new object of class '<em>Matrix Assignment</em>'.\n MatrixAssignment createMatrixAssignment();\n\n /**\n * Returns a new object of class '<em>Matrix Formula</em>'.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @return a new object of class '<em>Matrix Formula</em>'.\n * @generated\n */\n MatrixFormula createMatrixFormula();\n\n /**\n * Returns a new object of class '<em>Matrix Expression</em>'.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @return a new object of class '<em>Matrix Expression</em>'.\n * @generated\n */\n MatrixExpression createMatrixExpression();\n\n /**\n * Returns a new object of class '<em>Function Definition</em>'.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @return a new object of class '<em>Function Definition</em>'.\n * @generated\n */\n FunctionDefinition createFunctionDefinition();\n /**\n * Returns a new object of class '<em>Matrix Element</em>'.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @return a new object of class '<em>Matrix Element</em>'.\n * @generated\n */\n MatrixElement createMatrixElement();\n\n /**\n * Returns a new object of class '<em>Matrix Addition</em>'.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @return a new object of class '<em>Matrix Addition</em>'.\n * @generated\n */\n MatrixAddition createMatrixAddition();\n\n /**\n * Returns a new object of class '<em>Matrix Subtraction</em>'.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @return a new object of class '<em>Matrix Subtraction</em>'.\n * @generated\n */\n MatrixSubtraction createMatrixSubtraction();\n\n /**\n * Returns a new object of class '<em>Matrix Multiplication</em>'.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @return a new object of class '<em>Matrix Multiplication</em>'.\n * @generated\n */\n MatrixMultiplication createMatrixMultiplication();\n\n /**\n * Returns a new object of class '<em>New Matrix</em>'.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @return a new object of class '<em>New Matrix</em>'.\n * @generated\n */\n NewMatrix createNewMatrix();\n\n /**\n * Returns a new object of class '<em>Transpose Matrix</em>'.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @return a new object of class '<em>Transpose Matrix</em>'.\n * @generated\n */\n TransposeMatrix createTransposeMatrix();\n\n /**\n * Returns a new object of class '<em>Matrix Variable</em>'.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @return a new object of class '<em>Matrix Variable</em>'.\n * @generated\n */\n MatrixVariable createMatrixVariable();\n", "new_methods": [], "old_code": " * Returns a new object of class '<em>Assignment</em>'.\n * @return a new object of class '<em>Assignment</em>'.\n Assignment createAssignment();\n * Returns a new object of class '<em>Function Definition</em>'.\n * @return a new object of class '<em>Function Definition</em>'.\n FunctionDefinition createFunctionDefinition();\n * Returns a new object of class '<em>Matrix Definition</em>'.\n * @return a new object of class '<em>Matrix Definition</em>'.\n MatrixDefinition createMatrixDefinition();\n * Returns a new object of class '<em>Matrix Row</em>'.\n * @return a new object of class '<em>Matrix Row</em>'.\n MatrixRow createMatrixRow();\n /**\n * Returns a new object of class '<em>Interval</em>'.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @return a new object of class '<em>Interval</em>'.\n * @generated\n */\n Interval createInterval();\n", "old_methods": [], "patch": "@@ -36,13 +36,13 @@ public interface MathFactory extends EFactory\n Statement createStatement();\n \n /**\n- * Returns a new object of class '<em>Assignment</em>'.\n+ * Returns a new object of class '<em>Variable Assignment</em>'.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n- * @return a new object of class '<em>Assignment</em>'.\n+ * @return a new object of class '<em>Variable Assignment</em>'.\n * @generated\n */\n- Assignment createAssignment();\n+ VariableAssignment createVariableAssignment();\n \n /**\n * Returns a new object of class '<em>Formula</em>'.\n@@ -63,31 +63,58 @@ public interface MathFactory extends EFactory\n Expression createExpression();\n \n /**\n- * Returns a new object of class '<em>Function Definition</em>'.\n+ * Returns a new object of class '<em>Matrix</em>'.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n- * @return a new object of class '<em>Function Definition</em>'.\n+ * @return a new object of class '<em>Matrix</em>'.\n * @generated\n */\n- FunctionDefinition createFunctionDefinition();\n+ Matrix createMatrix();\n \n /**\n- * Returns a new object of class '<em>Matrix Definition</em>'.\n+ * Returns a new object of class '<em>Matrix Row</em>'.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n- * @return a new object of class '<em>Matrix Definition</em>'.\n+ * @return a new object of class '<em>Matrix Row</em>'.\n * @generated\n */\n- MatrixDefinition createMatrixDefinition();\n+ MatrixRow createMatrixRow();\n \n /**\n- * Returns a new object of class '<em>Matrix Row</em>'.\n+ * Returns a new object of class '<em>Matrix Assignment</em>'.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n- * @return a new object of class '<em>Matrix Row</em>'.\n+ * @return a new object of class '<em>Matrix Assignment</em>'.\n * @generated\n */\n- MatrixRow createMatrixRow();\n+ MatrixAssignment createMatrixAssignment();\n+\n+ /**\n+ * Returns a new object of class '<em>Matrix Formula</em>'.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @return a new object of class '<em>Matrix Formula</em>'.\n+ * @generated\n+ */\n+ MatrixFormula createMatrixFormula();\n+\n+ /**\n+ * Returns a new object of class '<em>Matrix Expression</em>'.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @return a new object of class '<em>Matrix Expression</em>'.\n+ * @generated\n+ */\n+ MatrixExpression createMatrixExpression();\n+\n+ /**\n+ * Returns a new object of class '<em>Function Definition</em>'.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @return a new object of class '<em>Function Definition</em>'.\n+ * @generated\n+ */\n+ FunctionDefinition createFunctionDefinition();\n \n /**\n * Returns a new object of class '<em>Addition</em>'.\n@@ -152,15 +179,6 @@ public interface MathFactory extends EFactory\n */\n Factorial createFactorial();\n \n- /**\n- * Returns a new object of class '<em>Interval</em>'.\n- * <!-- begin-user-doc -->\n- * <!-- end-user-doc -->\n- * @return a new object of class '<em>Interval</em>'.\n- * @generated\n- */\n- Interval createInterval();\n-\n /**\n * Returns a new object of class '<em>Exponent</em>'.\n * <!-- begin-user-doc -->\n@@ -188,6 +206,15 @@ public interface MathFactory extends EFactory\n */\n Float createFloat();\n \n+ /**\n+ * Returns a new object of class '<em>Matrix Element</em>'.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @return a new object of class '<em>Matrix Element</em>'.\n+ * @generated\n+ */\n+ MatrixElement createMatrixElement();\n+\n /**\n * Returns a new object of class '<em>Function</em>'.\n * <!-- begin-user-doc -->\n@@ -197,6 +224,60 @@ public interface MathFactory extends EFactory\n */\n Function createFunction();\n \n+ /**\n+ * Returns a new object of class '<em>Matrix Addition</em>'.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @return a new object of class '<em>Matrix Addition</em>'.\n+ * @generated\n+ */\n+ MatrixAddition createMatrixAddition();\n+\n+ /**\n+ * Returns a new object of class '<em>Matrix Subtraction</em>'.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @return a new object of class '<em>Matrix Subtraction</em>'.\n+ * @generated\n+ */\n+ MatrixSubtraction createMatrixSubtraction();\n+\n+ /**\n+ * Returns a new object of class '<em>Matrix Multiplication</em>'.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @return a new object of class '<em>Matrix Multiplication</em>'.\n+ * @generated\n+ */\n+ MatrixMultiplication createMatrixMultiplication();\n+\n+ /**\n+ * Returns a new object of class '<em>New Matrix</em>'.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @return a new object of class '<em>New Matrix</em>'.\n+ * @generated\n+ */\n+ NewMatrix createNewMatrix();\n+\n+ /**\n+ * Returns a new object of class '<em>Transpose Matrix</em>'.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @return a new object of class '<em>Transpose Matrix</em>'.\n+ * @generated\n+ */\n+ TransposeMatrix createTransposeMatrix();\n+\n+ /**\n+ * Returns a new object of class '<em>Matrix Variable</em>'.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @return a new object of class '<em>Matrix Variable</em>'.\n+ * @generated\n+ */\n+ MatrixVariable createMatrixVariable();\n+\n /**\n * Returns the package supported by this factory.\n * <!-- begin-user-doc -->", "raw_url": "https://github.com/iee/iee/raw/0f04d91efdf50447d8e84e926ef98d7462103dc0/org.eclipse.iee.translator.Jmole%2Forg.eclipse.iee.translator.jmole.math%2Fsrc-gen%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fjmole%2Fmath%2Fmath%2FMathFactory.java", "sha": "592c14760213a1a34c881c75dbca7ebe08d94388", "status": "modified" }, { "additions": 1018, "blob_url": "https://github.com/iee/iee/blob/0f04d91efdf50447d8e84e926ef98d7462103dc0/org.eclipse.iee.translator.Jmole%2Forg.eclipse.iee.translator.jmole.math%2Fsrc-gen%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fjmole%2Fmath%2Fmath%2FMathPackage.java", "changes": 1349, "contents_url": "https://api.github.com/repos/iee/iee/contents/org.eclipse.iee.translator.Jmole%2Forg.eclipse.iee.translator.jmole.math%2Fsrc-gen%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fjmole%2Fmath%2Fmath%2FMathPackage.java?ref=0f04d91efdf50447d8e84e926ef98d7462103dc0", "deletions": 331, "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/math/MathPackage.java", "new_code": " * The feature id for the '<em><b>Variable Assignment</b></em>' containment reference.\n int STATEMENT__VARIABLE_ASSIGNMENT = 1;\n * The feature id for the '<em><b>Formula</b></em>' containment reference.\n int STATEMENT__FORMULA = 2;\n * The feature id for the '<em><b>Matrix Assignment</b></em>' containment reference.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n * @ordered\n */\n int STATEMENT__MATRIX_ASSIGNMENT = 3;\n\n /**\n * The feature id for the '<em><b>Matrix Formula</b></em>' containment reference.\n int STATEMENT__MATRIX_FORMULA = 4;\n int STATEMENT_FEATURE_COUNT = 5;\n * The meta object id for the '{@link org.eclipse.iee.translator.jmole.math.math.impl.VariableAssignmentImpl <em>Variable Assignment</em>}' class.\n * @see org.eclipse.iee.translator.jmole.math.math.impl.VariableAssignmentImpl\n * @see org.eclipse.iee.translator.jmole.math.math.impl.MathPackageImpl#getVariableAssignment()\n int VARIABLE_ASSIGNMENT = 1;\n int VARIABLE_ASSIGNMENT__VARIABLE = 0;\n int VARIABLE_ASSIGNMENT__VALUE = 1;\n * The number of structural features of the '<em>Variable Assignment</em>' class.\n int VARIABLE_ASSIGNMENT_FEATURE_COUNT = 2;\n * The meta object id for the '{@link org.eclipse.iee.translator.jmole.math.math.impl.MatrixImpl <em>Matrix</em>}' class.\n * @see org.eclipse.iee.translator.jmole.math.math.impl.MatrixImpl\n * @see org.eclipse.iee.translator.jmole.math.math.impl.MathPackageImpl#getMatrix()\n int MATRIX = 4;\n * The feature id for the '<em><b>Rows</b></em>' containment reference list.\n int MATRIX__ROWS = 0;\n * The number of structural features of the '<em>Matrix</em>' class.\n int MATRIX_FEATURE_COUNT = 1;\n * The meta object id for the '{@link org.eclipse.iee.translator.jmole.math.math.impl.MatrixRowImpl <em>Matrix Row</em>}' class.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @see org.eclipse.iee.translator.jmole.math.math.impl.MatrixRowImpl\n * @see org.eclipse.iee.translator.jmole.math.math.impl.MathPackageImpl#getMatrixRow()\n * @generated\n */\n int MATRIX_ROW = 5;\n\n /**\n * The feature id for the '<em><b>Elements</b></em>' attribute list.\n int MATRIX_ROW__ELEMENTS = 0;\n\n /**\n * The number of structural features of the '<em>Matrix Row</em>' class.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n * @ordered\n */\n int MATRIX_ROW_FEATURE_COUNT = 1;\n * The meta object id for the '{@link org.eclipse.iee.translator.jmole.math.math.impl.MatrixAssignmentImpl <em>Matrix Assignment</em>}' class.\n * @see org.eclipse.iee.translator.jmole.math.math.impl.MatrixAssignmentImpl\n * @see org.eclipse.iee.translator.jmole.math.math.impl.MathPackageImpl#getMatrixAssignment()\n int MATRIX_ASSIGNMENT = 6;\n * The feature id for the '<em><b>Variable</b></em>' attribute.\n int MATRIX_ASSIGNMENT__VARIABLE = 0;\n * The feature id for the '<em><b>Value</b></em>' containment reference.\n int MATRIX_ASSIGNMENT__VALUE = 1;\n * The number of structural features of the '<em>Matrix Assignment</em>' class.\n int MATRIX_ASSIGNMENT_FEATURE_COUNT = 2;\n * The meta object id for the '{@link org.eclipse.iee.translator.jmole.math.math.impl.MatrixFormulaImpl <em>Matrix Formula</em>}' class.\n * @see org.eclipse.iee.translator.jmole.math.math.impl.MatrixFormulaImpl\n * @see org.eclipse.iee.translator.jmole.math.math.impl.MathPackageImpl#getMatrixFormula()\n int MATRIX_FORMULA = 7;\n * The feature id for the '<em><b>Expression</b></em>' containment reference.\n int MATRIX_FORMULA__EXPRESSION = 0;\n * The number of structural features of the '<em>Matrix Formula</em>' class.\n int MATRIX_FORMULA_FEATURE_COUNT = 1;\n\n /**\n * The meta object id for the '{@link org.eclipse.iee.translator.jmole.math.math.impl.MatrixExpressionImpl <em>Matrix Expression</em>}' class.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @see org.eclipse.iee.translator.jmole.math.math.impl.MatrixExpressionImpl\n * @see org.eclipse.iee.translator.jmole.math.math.impl.MathPackageImpl#getMatrixExpression()\n * @generated\n */\n int MATRIX_EXPRESSION = 8;\n\n /**\n * The number of structural features of the '<em>Matrix Expression</em>' class.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n * @ordered\n */\n int MATRIX_EXPRESSION_FEATURE_COUNT = 0;\n\n /**\n * The meta object id for the '{@link org.eclipse.iee.translator.jmole.math.math.impl.FunctionDefinitionImpl <em>Function Definition</em>}' class.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @see org.eclipse.iee.translator.jmole.math.math.impl.FunctionDefinitionImpl\n * @see org.eclipse.iee.translator.jmole.math.math.impl.MathPackageImpl#getFunctionDefinition()\n * @generated\n */\n int FUNCTION_DEFINITION = 9;\n\n /**\n * The feature id for the '<em><b>Function</b></em>' containment reference.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n * @ordered\n */\n int FUNCTION_DEFINITION__FUNCTION = 0;\n\n /**\n * The feature id for the '<em><b>Formula</b></em>' containment reference.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n * @ordered\n */\n int FUNCTION_DEFINITION__FORMULA = 1;\n\n /**\n * The number of structural features of the '<em>Function Definition</em>' class.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n * @ordered\n */\n int FUNCTION_DEFINITION_FEATURE_COUNT = 2;\n int ADDITION = 10;\n int SUBTRACTION = 11;\n int MULTIPLICATION = 12;\n int DIVISION = 13;\n int MODULO = 14;\n int INVERT = 15;\n int FACTORIAL = 16;\n * The meta object id for the '{@link org.eclipse.iee.translator.jmole.math.math.impl.ExponentImpl <em>Exponent</em>}' class.\n * @see org.eclipse.iee.translator.jmole.math.math.impl.ExponentImpl\n * @see org.eclipse.iee.translator.jmole.math.math.impl.MathPackageImpl#getExponent()\n int EXPONENT = 17;\n int EXPONENT__NAME = EXPRESSION__NAME;\n int EXPONENT__PARAMETERS = EXPRESSION__PARAMETERS;\n * The feature id for the '<em><b>Left</b></em>' containment reference.\n int EXPONENT__LEFT = EXPRESSION_FEATURE_COUNT + 0;\n * The feature id for the '<em><b>Right</b></em>' containment reference.\n int EXPONENT__RIGHT = EXPRESSION_FEATURE_COUNT + 1;\n * The number of structural features of the '<em>Exponent</em>' class.\n int EXPONENT_FEATURE_COUNT = EXPRESSION_FEATURE_COUNT + 2;\n * The meta object id for the '{@link org.eclipse.iee.translator.jmole.math.math.impl.VariableImpl <em>Variable</em>}' class.\n * @see org.eclipse.iee.translator.jmole.math.math.impl.VariableImpl\n * @see org.eclipse.iee.translator.jmole.math.math.impl.MathPackageImpl#getVariable()\n int VARIABLE = 18;\n * The feature id for the '<em><b>Name</b></em>' attribute.\n int VARIABLE__NAME = EXPRESSION__NAME;\n * The feature id for the '<em><b>Parameters</b></em>' containment reference list.\n int VARIABLE__PARAMETERS = EXPRESSION__PARAMETERS;\n * The number of structural features of the '<em>Variable</em>' class.\n int VARIABLE_FEATURE_COUNT = EXPRESSION_FEATURE_COUNT + 0;\n * The meta object id for the '{@link org.eclipse.iee.translator.jmole.math.math.impl.FloatImpl <em>Float</em>}' class.\n * @see org.eclipse.iee.translator.jmole.math.math.impl.FloatImpl\n * @see org.eclipse.iee.translator.jmole.math.math.impl.MathPackageImpl#getFloat()\n int FLOAT = 19;\n * The feature id for the '<em><b>Name</b></em>' attribute.\n int FLOAT__NAME = EXPRESSION__NAME;\n * The feature id for the '<em><b>Parameters</b></em>' containment reference list.\n int FLOAT__PARAMETERS = EXPRESSION__PARAMETERS;\n * The feature id for the '<em><b>Value</b></em>' attribute.\n * @ordered\n int FLOAT__VALUE = EXPRESSION_FEATURE_COUNT + 0;\n * The number of structural features of the '<em>Float</em>' class.\n int FLOAT_FEATURE_COUNT = EXPRESSION_FEATURE_COUNT + 1;\n * The meta object id for the '{@link org.eclipse.iee.translator.jmole.math.math.impl.MatrixElementImpl <em>Matrix Element</em>}' class.\n * @see org.eclipse.iee.translator.jmole.math.math.impl.MatrixElementImpl\n * @see org.eclipse.iee.translator.jmole.math.math.impl.MathPackageImpl#getMatrixElement()\n int MATRIX_ELEMENT = 20;\n * The feature id for the '<em><b>Name</b></em>' attribute.\n int MATRIX_ELEMENT__NAME = EXPRESSION__NAME;\n * The feature id for the '<em><b>Parameters</b></em>' containment reference list.\n * @ordered\n int MATRIX_ELEMENT__PARAMETERS = EXPRESSION__PARAMETERS;\n * The feature id for the '<em><b>Element</b></em>' attribute.\n int MATRIX_ELEMENT__ELEMENT = EXPRESSION_FEATURE_COUNT + 0;\n * The feature id for the '<em><b>Row</b></em>' attribute.\n int MATRIX_ELEMENT__ROW = EXPRESSION_FEATURE_COUNT + 1;\n * The feature id for the '<em><b>Column</b></em>' attribute.\n int MATRIX_ELEMENT__COLUMN = EXPRESSION_FEATURE_COUNT + 2;\n * The number of structural features of the '<em>Matrix Element</em>' class.\n int MATRIX_ELEMENT_FEATURE_COUNT = EXPRESSION_FEATURE_COUNT + 3;\n int FUNCTION = 21;\n * The meta object id for the '{@link org.eclipse.iee.translator.jmole.math.math.impl.MatrixAdditionImpl <em>Matrix Addition</em>}' class.\n * @see org.eclipse.iee.translator.jmole.math.math.impl.MatrixAdditionImpl\n * @see org.eclipse.iee.translator.jmole.math.math.impl.MathPackageImpl#getMatrixAddition()\n int MATRIX_ADDITION = 22;\n * The feature id for the '<em><b>Left</b></em>' containment reference.\n * @ordered\n int MATRIX_ADDITION__LEFT = MATRIX_EXPRESSION_FEATURE_COUNT + 0;\n * The feature id for the '<em><b>Right</b></em>' containment reference.\n * @ordered\n int MATRIX_ADDITION__RIGHT = MATRIX_EXPRESSION_FEATURE_COUNT + 1;\n * The number of structural features of the '<em>Matrix Addition</em>' class.\n * @ordered\n int MATRIX_ADDITION_FEATURE_COUNT = MATRIX_EXPRESSION_FEATURE_COUNT + 2;\n * The meta object id for the '{@link org.eclipse.iee.translator.jmole.math.math.impl.MatrixSubtractionImpl <em>Matrix Subtraction</em>}' class.\n * @see org.eclipse.iee.translator.jmole.math.math.impl.MatrixSubtractionImpl\n * @see org.eclipse.iee.translator.jmole.math.math.impl.MathPackageImpl#getMatrixSubtraction()\n int MATRIX_SUBTRACTION = 23;\n * The feature id for the '<em><b>Left</b></em>' containment reference.\n * @ordered\n int MATRIX_SUBTRACTION__LEFT = MATRIX_EXPRESSION_FEATURE_COUNT + 0;\n * The feature id for the '<em><b>Right</b></em>' containment reference.\n * @ordered\n int MATRIX_SUBTRACTION__RIGHT = MATRIX_EXPRESSION_FEATURE_COUNT + 1;\n * The number of structural features of the '<em>Matrix Subtraction</em>' class.\n * @ordered\n int MATRIX_SUBTRACTION_FEATURE_COUNT = MATRIX_EXPRESSION_FEATURE_COUNT + 2;\n * The meta object id for the '{@link org.eclipse.iee.translator.jmole.math.math.impl.MatrixMultiplicationImpl <em>Matrix Multiplication</em>}' class.\n * @see org.eclipse.iee.translator.jmole.math.math.impl.MatrixMultiplicationImpl\n * @see org.eclipse.iee.translator.jmole.math.math.impl.MathPackageImpl#getMatrixMultiplication()\n int MATRIX_MULTIPLICATION = 24;\n * The feature id for the '<em><b>Left</b></em>' containment reference.\n * @ordered\n int MATRIX_MULTIPLICATION__LEFT = MATRIX_EXPRESSION_FEATURE_COUNT + 0;\n * The feature id for the '<em><b>Right Matrix</b></em>' containment reference.\n * @ordered\n int MATRIX_MULTIPLICATION__RIGHT_MATRIX = MATRIX_EXPRESSION_FEATURE_COUNT + 1;\n * The feature id for the '<em><b>Right Scalar</b></em>' containment reference.\n * @ordered\n int MATRIX_MULTIPLICATION__RIGHT_SCALAR = MATRIX_EXPRESSION_FEATURE_COUNT + 2;\n * The number of structural features of the '<em>Matrix Multiplication</em>' class.\n * @ordered\n int MATRIX_MULTIPLICATION_FEATURE_COUNT = MATRIX_EXPRESSION_FEATURE_COUNT + 3;\n * The meta object id for the '{@link org.eclipse.iee.translator.jmole.math.math.impl.NewMatrixImpl <em>New Matrix</em>}' class.\n * @see org.eclipse.iee.translator.jmole.math.math.impl.NewMatrixImpl\n * @see org.eclipse.iee.translator.jmole.math.math.impl.MathPackageImpl#getNewMatrix()\n int NEW_MATRIX = 25;\n * The feature id for the '<em><b>Matrix</b></em>' containment reference.\n * @ordered\n int NEW_MATRIX__MATRIX = MATRIX_EXPRESSION_FEATURE_COUNT + 0;\n * The number of structural features of the '<em>New Matrix</em>' class.\n * @ordered\n int NEW_MATRIX_FEATURE_COUNT = MATRIX_EXPRESSION_FEATURE_COUNT + 1;\n * The meta object id for the '{@link org.eclipse.iee.translator.jmole.math.math.impl.TransposeMatrixImpl <em>Transpose Matrix</em>}' class.\n * @see org.eclipse.iee.translator.jmole.math.math.impl.TransposeMatrixImpl\n * @see org.eclipse.iee.translator.jmole.math.math.impl.MathPackageImpl#getTransposeMatrix()\n int TRANSPOSE_MATRIX = 26;\n * The feature id for the '<em><b>Name</b></em>' attribute.\n * @ordered\n int TRANSPOSE_MATRIX__NAME = MATRIX_EXPRESSION_FEATURE_COUNT + 0;\n * The number of structural features of the '<em>Transpose Matrix</em>' class.\n * @ordered\n int TRANSPOSE_MATRIX_FEATURE_COUNT = MATRIX_EXPRESSION_FEATURE_COUNT + 1;\n * The meta object id for the '{@link org.eclipse.iee.translator.jmole.math.math.impl.MatrixVariableImpl <em>Matrix Variable</em>}' class.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @see org.eclipse.iee.translator.jmole.math.math.impl.MatrixVariableImpl\n * @see org.eclipse.iee.translator.jmole.math.math.impl.MathPackageImpl#getMatrixVariable()\n * @generated\n */\n int MATRIX_VARIABLE = 27;\n\n /**\n * The feature id for the '<em><b>Name</b></em>' attribute.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n * @ordered\n */\n int MATRIX_VARIABLE__NAME = MATRIX_EXPRESSION_FEATURE_COUNT + 0;\n\n /**\n * The number of structural features of the '<em>Matrix Variable</em>' class.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n * @ordered\n */\n int MATRIX_VARIABLE_FEATURE_COUNT = MATRIX_EXPRESSION_FEATURE_COUNT + 1;\n\n\n /**\n * Returns the meta object for class '{@link org.eclipse.iee.translator.jmole.math.math.Statement <em>Statement</em>}'.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @return the meta object for class '<em>Statement</em>'.\n * @see org.eclipse.iee.translator.jmole.math.math.Statement\n * @generated\n */\n EClass getStatement();\n\n /**\n * Returns the meta object for the containment reference '{@link org.eclipse.iee.translator.jmole.math.math.Statement#getFunctionDefinition <em>Function Definition</em>}'.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @return the meta object for the containment reference '<em>Function Definition</em>'.\n * @see org.eclipse.iee.translator.jmole.math.math.Statement#getFunctionDefinition()\n * @see #getStatement()\n * @generated\n */\n EReference getStatement_FunctionDefinition();\n\n /**\n * Returns the meta object for the containment reference '{@link org.eclipse.iee.translator.jmole.math.math.Statement#getVariableAssignment <em>Variable Assignment</em>}'.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @return the meta object for the containment reference '<em>Variable Assignment</em>'.\n * @see org.eclipse.iee.translator.jmole.math.math.Statement#getVariableAssignment()\n * @see #getStatement()\n * @generated\n */\n EReference getStatement_VariableAssignment();\n\n /**\n * Returns the meta object for the containment reference '{@link org.eclipse.iee.translator.jmole.math.math.Statement#getFormula <em>Formula</em>}'.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @return the meta object for the containment reference '<em>Formula</em>'.\n * @see org.eclipse.iee.translator.jmole.math.math.Statement#getFormula()\n * @see #getStatement()\n * @generated\n */\n EReference getStatement_Formula();\n\n /**\n * Returns the meta object for the containment reference '{@link org.eclipse.iee.translator.jmole.math.math.Statement#getMatrixAssignment <em>Matrix Assignment</em>}'.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @return the meta object for the containment reference '<em>Matrix Assignment</em>'.\n * @see org.eclipse.iee.translator.jmole.math.math.Statement#getMatrixAssignment()\n * @see #getStatement()\n * @generated\n */\n EReference getStatement_MatrixAssignment();\n\n /**\n * Returns the meta object for the containment reference '{@link org.eclipse.iee.translator.jmole.math.math.Statement#getMatrixFormula <em>Matrix Formula</em>}'.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @return the meta object for the containment reference '<em>Matrix Formula</em>'.\n * @see org.eclipse.iee.translator.jmole.math.math.Statement#getMatrixFormula()\n * @see #getStatement()\n * @generated\n */\n EReference getStatement_MatrixFormula();\n\n /**\n * Returns the meta object for class '{@link org.eclipse.iee.translator.jmole.math.math.VariableAssignment <em>Variable Assignment</em>}'.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @return the meta object for class '<em>Variable Assignment</em>'.\n * @see org.eclipse.iee.translator.jmole.math.math.VariableAssignment\n * @generated\n */\n EClass getVariableAssignment();\n\n /**\n * Returns the meta object for the attribute '{@link org.eclipse.iee.translator.jmole.math.math.VariableAssignment#getVariable <em>Variable</em>}'.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @return the meta object for the attribute '<em>Variable</em>'.\n * @see org.eclipse.iee.translator.jmole.math.math.VariableAssignment#getVariable()\n * @see #getVariableAssignment()\n * @generated\n */\n EAttribute getVariableAssignment_Variable();\n\n /**\n * Returns the meta object for the containment reference '{@link org.eclipse.iee.translator.jmole.math.math.VariableAssignment#getValue <em>Value</em>}'.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @return the meta object for the containment reference '<em>Value</em>'.\n * @see org.eclipse.iee.translator.jmole.math.math.VariableAssignment#getValue()\n * @see #getVariableAssignment()\n * @generated\n */\n EReference getVariableAssignment_Value();\n\n /**\n * Returns the meta object for class '{@link org.eclipse.iee.translator.jmole.math.math.Formula <em>Formula</em>}'.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @return the meta object for class '<em>Formula</em>'.\n * @see org.eclipse.iee.translator.jmole.math.math.Formula\n * @generated\n */\n EClass getFormula();\n\n /**\n * Returns the meta object for the containment reference '{@link org.eclipse.iee.translator.jmole.math.math.Formula#getExpression <em>Expression</em>}'.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @return the meta object for the containment reference '<em>Expression</em>'.\n * @see org.eclipse.iee.translator.jmole.math.math.Formula#getExpression()\n * @see #getFormula()\n * @generated\n */\n EReference getFormula_Expression();\n\n /**\n * Returns the meta object for class '{@link org.eclipse.iee.translator.jmole.math.math.Expression <em>Expression</em>}'.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @return the meta object for class '<em>Expression</em>'.\n * @see org.eclipse.iee.translator.jmole.math.math.Expression\n * @generated\n */\n EClass getExpression();\n\n /**\n * Returns the meta object for the attribute '{@link org.eclipse.iee.translator.jmole.math.math.Expression#getName <em>Name</em>}'.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @return the meta object for the attribute '<em>Name</em>'.\n * @see org.eclipse.iee.translator.jmole.math.math.Expression#getName()\n * @see #getExpression()\n * @generated\n */\n EAttribute getExpression_Name();\n\n /**\n * Returns the meta object for the containment reference list '{@link org.eclipse.iee.translator.jmole.math.math.Expression#getParameters <em>Parameters</em>}'.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @return the meta object for the containment reference list '<em>Parameters</em>'.\n * @see org.eclipse.iee.translator.jmole.math.math.Expression#getParameters()\n * @see #getExpression()\n * @generated\n */\n EReference getExpression_Parameters();\n\n /**\n * Returns the meta object for class '{@link org.eclipse.iee.translator.jmole.math.math.Matrix <em>Matrix</em>}'.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @return the meta object for class '<em>Matrix</em>'.\n * @see org.eclipse.iee.translator.jmole.math.math.Matrix\n * @generated\n */\n EClass getMatrix();\n\n /**\n * Returns the meta object for the containment reference list '{@link org.eclipse.iee.translator.jmole.math.math.Matrix#getRows <em>Rows</em>}'.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @return the meta object for the containment reference list '<em>Rows</em>'.\n * @see org.eclipse.iee.translator.jmole.math.math.Matrix#getRows()\n * @see #getMatrix()\n * @generated\n */\n EReference getMatrix_Rows();\n\n /**\n * Returns the meta object for class '{@link org.eclipse.iee.translator.jmole.math.math.MatrixRow <em>Matrix Row</em>}'.\n /**\n * Returns the meta object for class '{@link org.eclipse.iee.translator.jmole.math.math.MatrixAssignment <em>Matrix Assignment</em>}'.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @return the meta object for class '<em>Matrix Assignment</em>'.\n * @see org.eclipse.iee.translator.jmole.math.math.MatrixAssignment\n * @generated\n */\n EClass getMatrixAssignment();\n\n /**\n * Returns the meta object for the attribute '{@link org.eclipse.iee.translator.jmole.math.math.MatrixAssignment#getVariable <em>Variable</em>}'.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @return the meta object for the attribute '<em>Variable</em>'.\n * @see org.eclipse.iee.translator.jmole.math.math.MatrixAssignment#getVariable()\n * @see #getMatrixAssignment()\n * @generated\n */\n EAttribute getMatrixAssignment_Variable();\n\n /**\n * Returns the meta object for the containment reference '{@link org.eclipse.iee.translator.jmole.math.math.MatrixAssignment#getValue <em>Value</em>}'.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @return the meta object for the containment reference '<em>Value</em>'.\n * @see org.eclipse.iee.translator.jmole.math.math.MatrixAssignment#getValue()\n * @see #getMatrixAssignment()\n * @generated\n */\n EReference getMatrixAssignment_Value();\n\n /**\n * Returns the meta object for class '{@link org.eclipse.iee.translator.jmole.math.math.MatrixFormula <em>Matrix Formula</em>}'.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @return the meta object for class '<em>Matrix Formula</em>'.\n * @see org.eclipse.iee.translator.jmole.math.math.MatrixFormula\n * @generated\n */\n EClass getMatrixFormula();\n\n /**\n * Returns the meta object for the containment reference '{@link org.eclipse.iee.translator.jmole.math.math.MatrixFormula#getExpression <em>Expression</em>}'.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @return the meta object for the containment reference '<em>Expression</em>'.\n * @see org.eclipse.iee.translator.jmole.math.math.MatrixFormula#getExpression()\n * @see #getMatrixFormula()\n * @generated\n */\n EReference getMatrixFormula_Expression();\n\n /**\n * Returns the meta object for class '{@link org.eclipse.iee.translator.jmole.math.math.MatrixExpression <em>Matrix Expression</em>}'.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @return the meta object for class '<em>Matrix Expression</em>'.\n * @see org.eclipse.iee.translator.jmole.math.math.MatrixExpression\n * @generated\n */\n EClass getMatrixExpression();\n\n /**\n * Returns the meta object for class '{@link org.eclipse.iee.translator.jmole.math.math.FunctionDefinition <em>Function Definition</em>}'.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @return the meta object for class '<em>Function Definition</em>'.\n * @see org.eclipse.iee.translator.jmole.math.math.FunctionDefinition\n * @generated\n */\n EClass getFunctionDefinition();\n\n /**\n * Returns the meta object for the containment reference '{@link org.eclipse.iee.translator.jmole.math.math.FunctionDefinition#getFunction <em>Function</em>}'.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @return the meta object for the containment reference '<em>Function</em>'.\n * @see org.eclipse.iee.translator.jmole.math.math.FunctionDefinition#getFunction()\n * @see #getFunctionDefinition()\n * @generated\n */\n EReference getFunctionDefinition_Function();\n\n /**\n * Returns the meta object for the containment reference '{@link org.eclipse.iee.translator.jmole.math.math.FunctionDefinition#getFormula <em>Formula</em>}'.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @return the meta object for the containment reference '<em>Formula</em>'.\n * @see org.eclipse.iee.translator.jmole.math.math.FunctionDefinition#getFormula()\n * @see #getFunctionDefinition()\n * @generated\n */\n EReference getFunctionDefinition_Formula();\n\n * Returns the meta object for class '{@link org.eclipse.iee.translator.jmole.math.math.Exponent <em>Exponent</em>}'.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @return the meta object for class '<em>Exponent</em>'.\n * @see org.eclipse.iee.translator.jmole.math.math.Exponent\n * @generated\n */\n EClass getExponent();\n\n /**\n * Returns the meta object for the containment reference '{@link org.eclipse.iee.translator.jmole.math.math.Exponent#getLeft <em>Left</em>}'.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @return the meta object for the containment reference '<em>Left</em>'.\n * @see org.eclipse.iee.translator.jmole.math.math.Exponent#getLeft()\n * @see #getExponent()\n * @generated\n */\n EReference getExponent_Left();\n\n /**\n * Returns the meta object for the containment reference '{@link org.eclipse.iee.translator.jmole.math.math.Exponent#getRight <em>Right</em>}'.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @return the meta object for the containment reference '<em>Right</em>'.\n * @see org.eclipse.iee.translator.jmole.math.math.Exponent#getRight()\n * @see #getExponent()\n * @generated\n */\n EReference getExponent_Right();\n\n /**\n * Returns the meta object for class '{@link org.eclipse.iee.translator.jmole.math.math.Variable <em>Variable</em>}'.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @return the meta object for class '<em>Variable</em>'.\n * @see org.eclipse.iee.translator.jmole.math.math.Variable\n * @generated\n */\n EClass getVariable();\n\n /**\n * Returns the meta object for class '{@link org.eclipse.iee.translator.jmole.math.math.Float <em>Float</em>}'.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @return the meta object for class '<em>Float</em>'.\n * @see org.eclipse.iee.translator.jmole.math.math.Float\n * @generated\n */\n EClass getFloat();\n\n /**\n * Returns the meta object for the attribute '{@link org.eclipse.iee.translator.jmole.math.math.Float#getValue <em>Value</em>}'.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @return the meta object for the attribute '<em>Value</em>'.\n * @see org.eclipse.iee.translator.jmole.math.math.Float#getValue()\n * @see #getFloat()\n * @generated\n */\n EAttribute getFloat_Value();\n\n /**\n * Returns the meta object for class '{@link org.eclipse.iee.translator.jmole.math.math.MatrixElement <em>Matrix Element</em>}'.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @return the meta object for class '<em>Matrix Element</em>'.\n * @see org.eclipse.iee.translator.jmole.math.math.MatrixElement\n * @generated\n */\n EClass getMatrixElement();\n\n /**\n * Returns the meta object for the attribute '{@link org.eclipse.iee.translator.jmole.math.math.MatrixElement#getElement <em>Element</em>}'.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @return the meta object for the attribute '<em>Element</em>'.\n * @see org.eclipse.iee.translator.jmole.math.math.MatrixElement#getElement()\n * @see #getMatrixElement()\n * @generated\n */\n EAttribute getMatrixElement_Element();\n\n /**\n * Returns the meta object for the attribute '{@link org.eclipse.iee.translator.jmole.math.math.MatrixElement#getRow <em>Row</em>}'.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @return the meta object for the attribute '<em>Row</em>'.\n * @see org.eclipse.iee.translator.jmole.math.math.MatrixElement#getRow()\n * @see #getMatrixElement()\n * @generated\n */\n EAttribute getMatrixElement_Row();\n\n /**\n * Returns the meta object for the attribute '{@link org.eclipse.iee.translator.jmole.math.math.MatrixElement#getColumn <em>Column</em>}'.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @return the meta object for the attribute '<em>Column</em>'.\n * @see org.eclipse.iee.translator.jmole.math.math.MatrixElement#getColumn()\n * @see #getMatrixElement()\n * @generated\n */\n EAttribute getMatrixElement_Column();\n\n /**\n * Returns the meta object for class '{@link org.eclipse.iee.translator.jmole.math.math.Function <em>Function</em>}'.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @return the meta object for class '<em>Function</em>'.\n * @see org.eclipse.iee.translator.jmole.math.math.Function\n * @generated\n */\n EClass getFunction();\n\n /**\n * Returns the meta object for the containment reference '{@link org.eclipse.iee.translator.jmole.math.math.Function#getFunction <em>Function</em>}'.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @return the meta object for the containment reference '<em>Function</em>'.\n * @see org.eclipse.iee.translator.jmole.math.math.Function#getFunction()\n * @see #getFunction()\n * @generated\n */\n EReference getFunction_Function();\n\n /**\n * Returns the meta object for class '{@link org.eclipse.iee.translator.jmole.math.math.MatrixAddition <em>Matrix Addition</em>}'.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @return the meta object for class '<em>Matrix Addition</em>'.\n * @see org.eclipse.iee.translator.jmole.math.math.MatrixAddition\n * @generated\n */\n EClass getMatrixAddition();\n\n /**\n * Returns the meta object for the containment reference '{@link org.eclipse.iee.translator.jmole.math.math.MatrixAddition#getLeft <em>Left</em>}'.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @return the meta object for the containment reference '<em>Left</em>'.\n * @see org.eclipse.iee.translator.jmole.math.math.MatrixAddition#getLeft()\n * @see #getMatrixAddition()\n * @generated\n */\n EReference getMatrixAddition_Left();\n\n /**\n * Returns the meta object for the containment reference '{@link org.eclipse.iee.translator.jmole.math.math.MatrixAddition#getRight <em>Right</em>}'.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @return the meta object for the containment reference '<em>Right</em>'.\n * @see org.eclipse.iee.translator.jmole.math.math.MatrixAddition#getRight()\n * @see #getMatrixAddition()\n * @generated\n */\n EReference getMatrixAddition_Right();\n\n /**\n * Returns the meta object for class '{@link org.eclipse.iee.translator.jmole.math.math.MatrixSubtraction <em>Matrix Subtraction</em>}'.\n * @return the meta object for class '<em>Matrix Subtraction</em>'.\n * @see org.eclipse.iee.translator.jmole.math.math.MatrixSubtraction\n EClass getMatrixSubtraction();\n * Returns the meta object for the containment reference '{@link org.eclipse.iee.translator.jmole.math.math.MatrixSubtraction#getLeft <em>Left</em>}'.\n * @return the meta object for the containment reference '<em>Left</em>'.\n * @see org.eclipse.iee.translator.jmole.math.math.MatrixSubtraction#getLeft()\n * @see #getMatrixSubtraction()\n EReference getMatrixSubtraction_Left();\n * Returns the meta object for the containment reference '{@link org.eclipse.iee.translator.jmole.math.math.MatrixSubtraction#getRight <em>Right</em>}'.\n * @return the meta object for the containment reference '<em>Right</em>'.\n * @see org.eclipse.iee.translator.jmole.math.math.MatrixSubtraction#getRight()\n * @see #getMatrixSubtraction()\n EReference getMatrixSubtraction_Right();\n * Returns the meta object for class '{@link org.eclipse.iee.translator.jmole.math.math.MatrixMultiplication <em>Matrix Multiplication</em>}'.\n * @return the meta object for class '<em>Matrix Multiplication</em>'.\n * @see org.eclipse.iee.translator.jmole.math.math.MatrixMultiplication\n EClass getMatrixMultiplication();\n * Returns the meta object for the containment reference '{@link org.eclipse.iee.translator.jmole.math.math.MatrixMultiplication#getLeft <em>Left</em>}'.\n * @return the meta object for the containment reference '<em>Left</em>'.\n * @see org.eclipse.iee.translator.jmole.math.math.MatrixMultiplication#getLeft()\n * @see #getMatrixMultiplication()\n EReference getMatrixMultiplication_Left();\n * Returns the meta object for the containment reference '{@link org.eclipse.iee.translator.jmole.math.math.MatrixMultiplication#getRightMatrix <em>Right Matrix</em>}'.\n * @return the meta object for the containment reference '<em>Right Matrix</em>'.\n * @see org.eclipse.iee.translator.jmole.math.math.MatrixMultiplication#getRightMatrix()\n * @see #getMatrixMultiplication()\n EReference getMatrixMultiplication_RightMatrix();\n * Returns the meta object for the containment reference '{@link org.eclipse.iee.translator.jmole.math.math.MatrixMultiplication#getRightScalar <em>Right Scalar</em>}'.\n * @return the meta object for the containment reference '<em>Right Scalar</em>'.\n * @see org.eclipse.iee.translator.jmole.math.math.MatrixMultiplication#getRightScalar()\n * @see #getMatrixMultiplication()\n EReference getMatrixMultiplication_RightScalar();\n * Returns the meta object for class '{@link org.eclipse.iee.translator.jmole.math.math.NewMatrix <em>New Matrix</em>}'.\n * @return the meta object for class '<em>New Matrix</em>'.\n * @see org.eclipse.iee.translator.jmole.math.math.NewMatrix\n EClass getNewMatrix();\n * Returns the meta object for the containment reference '{@link org.eclipse.iee.translator.jmole.math.math.NewMatrix#getMatrix <em>Matrix</em>}'.\n * @return the meta object for the containment reference '<em>Matrix</em>'.\n * @see org.eclipse.iee.translator.jmole.math.math.NewMatrix#getMatrix()\n * @see #getNewMatrix()\n EReference getNewMatrix_Matrix();\n * Returns the meta object for class '{@link org.eclipse.iee.translator.jmole.math.math.TransposeMatrix <em>Transpose Matrix</em>}'.\n * @return the meta object for class '<em>Transpose Matrix</em>'.\n * @see org.eclipse.iee.translator.jmole.math.math.TransposeMatrix\n EClass getTransposeMatrix();\n * Returns the meta object for the attribute '{@link org.eclipse.iee.translator.jmole.math.math.TransposeMatrix#getName <em>Name</em>}'.\n * @return the meta object for the attribute '<em>Name</em>'.\n * @see org.eclipse.iee.translator.jmole.math.math.TransposeMatrix#getName()\n * @see #getTransposeMatrix()\n EAttribute getTransposeMatrix_Name();\n * Returns the meta object for class '{@link org.eclipse.iee.translator.jmole.math.math.MatrixVariable <em>Matrix Variable</em>}'.\n * @return the meta object for class '<em>Matrix Variable</em>'.\n * @see org.eclipse.iee.translator.jmole.math.math.MatrixVariable\n EClass getMatrixVariable();\n * Returns the meta object for the attribute '{@link org.eclipse.iee.translator.jmole.math.math.MatrixVariable#getName <em>Name</em>}'.\n * @return the meta object for the attribute '<em>Name</em>'.\n * @see org.eclipse.iee.translator.jmole.math.math.MatrixVariable#getName()\n * @see #getMatrixVariable()\n EAttribute getMatrixVariable_Name();\n * The meta object literal for the '<em><b>Variable Assignment</b></em>' containment reference feature.\n EReference STATEMENT__VARIABLE_ASSIGNMENT = eINSTANCE.getStatement_VariableAssignment();\n * The meta object literal for the '<em><b>Formula</b></em>' containment reference feature.\n EReference STATEMENT__FORMULA = eINSTANCE.getStatement_Formula();\n * The meta object literal for the '<em><b>Matrix Assignment</b></em>' containment reference feature.\n EReference STATEMENT__MATRIX_ASSIGNMENT = eINSTANCE.getStatement_MatrixAssignment();\n\n /**\n * The meta object literal for the '<em><b>Matrix Formula</b></em>' containment reference feature.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n EReference STATEMENT__MATRIX_FORMULA = eINSTANCE.getStatement_MatrixFormula();\n * The meta object literal for the '{@link org.eclipse.iee.translator.jmole.math.math.impl.VariableAssignmentImpl <em>Variable Assignment</em>}' class.\n * @see org.eclipse.iee.translator.jmole.math.math.impl.VariableAssignmentImpl\n * @see org.eclipse.iee.translator.jmole.math.math.impl.MathPackageImpl#getVariableAssignment()\n EClass VARIABLE_ASSIGNMENT = eINSTANCE.getVariableAssignment();\n EAttribute VARIABLE_ASSIGNMENT__VARIABLE = eINSTANCE.getVariableAssignment_Variable();\n EReference VARIABLE_ASSIGNMENT__VALUE = eINSTANCE.getVariableAssignment_Value();\n * The meta object literal for the '{@link org.eclipse.iee.translator.jmole.math.math.impl.MatrixImpl <em>Matrix</em>}' class.\n * @see org.eclipse.iee.translator.jmole.math.math.impl.MatrixImpl\n * @see org.eclipse.iee.translator.jmole.math.math.impl.MathPackageImpl#getMatrix()\n EClass MATRIX = eINSTANCE.getMatrix();\n * The meta object literal for the '<em><b>Rows</b></em>' containment reference list feature.\n EReference MATRIX__ROWS = eINSTANCE.getMatrix_Rows();\n * The meta object literal for the '{@link org.eclipse.iee.translator.jmole.math.math.impl.MatrixRowImpl <em>Matrix Row</em>}' class.\n * @see org.eclipse.iee.translator.jmole.math.math.impl.MatrixRowImpl\n * @see org.eclipse.iee.translator.jmole.math.math.impl.MathPackageImpl#getMatrixRow()\n EClass MATRIX_ROW = eINSTANCE.getMatrixRow();\n * The meta object literal for the '<em><b>Elements</b></em>' attribute list feature.\n EAttribute MATRIX_ROW__ELEMENTS = eINSTANCE.getMatrixRow_Elements();\n * The meta object literal for the '{@link org.eclipse.iee.translator.jmole.math.math.impl.MatrixAssignmentImpl <em>Matrix Assignment</em>}' class.\n * @see org.eclipse.iee.translator.jmole.math.math.impl.MatrixAssignmentImpl\n * @see org.eclipse.iee.translator.jmole.math.math.impl.MathPackageImpl#getMatrixAssignment()\n EClass MATRIX_ASSIGNMENT = eINSTANCE.getMatrixAssignment();\n * The meta object literal for the '<em><b>Variable</b></em>' attribute feature.\n EAttribute MATRIX_ASSIGNMENT__VARIABLE = eINSTANCE.getMatrixAssignment_Variable();\n * The meta object literal for the '<em><b>Value</b></em>' containment reference feature.\n EReference MATRIX_ASSIGNMENT__VALUE = eINSTANCE.getMatrixAssignment_Value();\n * The meta object literal for the '{@link org.eclipse.iee.translator.jmole.math.math.impl.MatrixFormulaImpl <em>Matrix Formula</em>}' class.\n * @see org.eclipse.iee.translator.jmole.math.math.impl.MatrixFormulaImpl\n * @see org.eclipse.iee.translator.jmole.math.math.impl.MathPackageImpl#getMatrixFormula()\n EClass MATRIX_FORMULA = eINSTANCE.getMatrixFormula();\n\n /**\n * The meta object literal for the '<em><b>Expression</b></em>' containment reference feature.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n EReference MATRIX_FORMULA__EXPRESSION = eINSTANCE.getMatrixFormula_Expression();\n\n /**\n * The meta object literal for the '{@link org.eclipse.iee.translator.jmole.math.math.impl.MatrixExpressionImpl <em>Matrix Expression</em>}' class.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @see org.eclipse.iee.translator.jmole.math.math.impl.MatrixExpressionImpl\n * @see org.eclipse.iee.translator.jmole.math.math.impl.MathPackageImpl#getMatrixExpression()\n * @generated\n */\n EClass MATRIX_EXPRESSION = eINSTANCE.getMatrixExpression();\n\n /**\n * The meta object literal for the '{@link org.eclipse.iee.translator.jmole.math.math.impl.FunctionDefinitionImpl <em>Function Definition</em>}' class.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @see org.eclipse.iee.translator.jmole.math.math.impl.FunctionDefinitionImpl\n * @see org.eclipse.iee.translator.jmole.math.math.impl.MathPackageImpl#getFunctionDefinition()\n * @generated\n */\n EClass FUNCTION_DEFINITION = eINSTANCE.getFunctionDefinition();\n\n /**\n * The meta object literal for the '<em><b>Function</b></em>' containment reference feature.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n EReference FUNCTION_DEFINITION__FUNCTION = eINSTANCE.getFunctionDefinition_Function();\n\n /**\n * The meta object literal for the '<em><b>Formula</b></em>' containment reference feature.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n EReference FUNCTION_DEFINITION__FORMULA = eINSTANCE.getFunctionDefinition_Formula();\n * The meta object literal for the '{@link org.eclipse.iee.translator.jmole.math.math.impl.ExponentImpl <em>Exponent</em>}' class.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @see org.eclipse.iee.translator.jmole.math.math.impl.ExponentImpl\n * @see org.eclipse.iee.translator.jmole.math.math.impl.MathPackageImpl#getExponent()\n * @generated\n */\n EClass EXPONENT = eINSTANCE.getExponent();\n\n /**\n * The meta object literal for the '<em><b>Left</b></em>' containment reference feature.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n EReference EXPONENT__LEFT = eINSTANCE.getExponent_Left();\n\n /**\n * The meta object literal for the '<em><b>Right</b></em>' containment reference feature.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n EReference EXPONENT__RIGHT = eINSTANCE.getExponent_Right();\n\n /**\n * The meta object literal for the '{@link org.eclipse.iee.translator.jmole.math.math.impl.VariableImpl <em>Variable</em>}' class.\n * @see org.eclipse.iee.translator.jmole.math.math.impl.VariableImpl\n * @see org.eclipse.iee.translator.jmole.math.math.impl.MathPackageImpl#getVariable()\n EClass VARIABLE = eINSTANCE.getVariable();\n * The meta object literal for the '{@link org.eclipse.iee.translator.jmole.math.math.impl.FloatImpl <em>Float</em>}' class.\n * @see org.eclipse.iee.translator.jmole.math.math.impl.FloatImpl\n * @see org.eclipse.iee.translator.jmole.math.math.impl.MathPackageImpl#getFloat()\n EClass FLOAT = eINSTANCE.getFloat();\n * The meta object literal for the '<em><b>Value</b></em>' attribute feature.\n EAttribute FLOAT__VALUE = eINSTANCE.getFloat_Value();\n * The meta object literal for the '{@link org.eclipse.iee.translator.jmole.math.math.impl.MatrixElementImpl <em>Matrix Element</em>}' class.\n * @see org.eclipse.iee.translator.jmole.math.math.impl.MatrixElementImpl\n * @see org.eclipse.iee.translator.jmole.math.math.impl.MathPackageImpl#getMatrixElement()\n EClass MATRIX_ELEMENT = eINSTANCE.getMatrixElement();\n * The meta object literal for the '<em><b>Element</b></em>' attribute feature.\n EAttribute MATRIX_ELEMENT__ELEMENT = eINSTANCE.getMatrixElement_Element();\n * The meta object literal for the '<em><b>Row</b></em>' attribute feature.\n EAttribute MATRIX_ELEMENT__ROW = eINSTANCE.getMatrixElement_Row();\n\n /**\n * The meta object literal for the '<em><b>Column</b></em>' attribute feature.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n EAttribute MATRIX_ELEMENT__COLUMN = eINSTANCE.getMatrixElement_Column();\n\n /**\n * The meta object literal for the '{@link org.eclipse.iee.translator.jmole.math.math.impl.FunctionImpl <em>Function</em>}' class.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @see org.eclipse.iee.translator.jmole.math.math.impl.FunctionImpl\n * @see org.eclipse.iee.translator.jmole.math.math.impl.MathPackageImpl#getFunction()\n * @generated\n */\n EClass FUNCTION = eINSTANCE.getFunction();\n\n /**\n * The meta object literal for the '<em><b>Function</b></em>' containment reference feature.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n EReference FUNCTION__FUNCTION = eINSTANCE.getFunction_Function();\n\n /**\n * The meta object literal for the '{@link org.eclipse.iee.translator.jmole.math.math.impl.MatrixAdditionImpl <em>Matrix Addition</em>}' class.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @see org.eclipse.iee.translator.jmole.math.math.impl.MatrixAdditionImpl\n * @see org.eclipse.iee.translator.jmole.math.math.impl.MathPackageImpl#getMatrixAddition()\n * @generated\n */\n EClass MATRIX_ADDITION = eINSTANCE.getMatrixAddition();\n EReference MATRIX_ADDITION__LEFT = eINSTANCE.getMatrixAddition_Left();\n EReference MATRIX_ADDITION__RIGHT = eINSTANCE.getMatrixAddition_Right();\n * The meta object literal for the '{@link org.eclipse.iee.translator.jmole.math.math.impl.MatrixSubtractionImpl <em>Matrix Subtraction</em>}' class.\n * @see org.eclipse.iee.translator.jmole.math.math.impl.MatrixSubtractionImpl\n * @see org.eclipse.iee.translator.jmole.math.math.impl.MathPackageImpl#getMatrixSubtraction()\n EClass MATRIX_SUBTRACTION = eINSTANCE.getMatrixSubtraction();\n * The meta object literal for the '<em><b>Left</b></em>' containment reference feature.\n EReference MATRIX_SUBTRACTION__LEFT = eINSTANCE.getMatrixSubtraction_Left();\n * The meta object literal for the '<em><b>Right</b></em>' containment reference feature.\n EReference MATRIX_SUBTRACTION__RIGHT = eINSTANCE.getMatrixSubtraction_Right();\n * The meta object literal for the '{@link org.eclipse.iee.translator.jmole.math.math.impl.MatrixMultiplicationImpl <em>Matrix Multiplication</em>}' class.\n * @see org.eclipse.iee.translator.jmole.math.math.impl.MatrixMultiplicationImpl\n * @see org.eclipse.iee.translator.jmole.math.math.impl.MathPackageImpl#getMatrixMultiplication()\n EClass MATRIX_MULTIPLICATION = eINSTANCE.getMatrixMultiplication();\n * The meta object literal for the '<em><b>Left</b></em>' containment reference feature.\n EReference MATRIX_MULTIPLICATION__LEFT = eINSTANCE.getMatrixMultiplication_Left();\n\n /**\n * The meta object literal for the '<em><b>Right Matrix</b></em>' containment reference feature.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n EReference MATRIX_MULTIPLICATION__RIGHT_MATRIX = eINSTANCE.getMatrixMultiplication_RightMatrix();\n\n /**\n * The meta object literal for the '<em><b>Right Scalar</b></em>' containment reference feature.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n EReference MATRIX_MULTIPLICATION__RIGHT_SCALAR = eINSTANCE.getMatrixMultiplication_RightScalar();\n\n /**\n * The meta object literal for the '{@link org.eclipse.iee.translator.jmole.math.math.impl.NewMatrixImpl <em>New Matrix</em>}' class.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @see org.eclipse.iee.translator.jmole.math.math.impl.NewMatrixImpl\n * @see org.eclipse.iee.translator.jmole.math.math.impl.MathPackageImpl#getNewMatrix()\n * @generated\n */\n EClass NEW_MATRIX = eINSTANCE.getNewMatrix();\n\n /**\n * The meta object literal for the '<em><b>Matrix</b></em>' containment reference feature.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n EReference NEW_MATRIX__MATRIX = eINSTANCE.getNewMatrix_Matrix();\n\n /**\n * The meta object literal for the '{@link org.eclipse.iee.translator.jmole.math.math.impl.TransposeMatrixImpl <em>Transpose Matrix</em>}' class.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @see org.eclipse.iee.translator.jmole.math.math.impl.TransposeMatrixImpl\n * @see org.eclipse.iee.translator.jmole.math.math.impl.MathPackageImpl#getTransposeMatrix()\n * @generated\n */\n EClass TRANSPOSE_MATRIX = eINSTANCE.getTransposeMatrix();\n\n /**\n * The meta object literal for the '<em><b>Name</b></em>' attribute feature.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n EAttribute TRANSPOSE_MATRIX__NAME = eINSTANCE.getTransposeMatrix_Name();\n\n /**\n * The meta object literal for the '{@link org.eclipse.iee.translator.jmole.math.math.impl.MatrixVariableImpl <em>Matrix Variable</em>}' class.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @see org.eclipse.iee.translator.jmole.math.math.impl.MatrixVariableImpl\n * @see org.eclipse.iee.translator.jmole.math.math.impl.MathPackageImpl#getMatrixVariable()\n * @generated\n */\n EClass MATRIX_VARIABLE = eINSTANCE.getMatrixVariable();\n\n /**\n * The meta object literal for the '<em><b>Name</b></em>' attribute feature.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n EAttribute MATRIX_VARIABLE__NAME = eINSTANCE.getMatrixVariable_Name();", "new_methods": [], "old_code": " * The feature id for the '<em><b>Matrix Definition</b></em>' containment reference.\n int STATEMENT__MATRIX_DEFINITION = 1;\n * The feature id for the '<em><b>Assignment</b></em>' containment reference.\n int STATEMENT__ASSIGNMENT = 2;\n * The feature id for the '<em><b>Formula</b></em>' containment reference.\n int STATEMENT__FORMULA = 3;\n int STATEMENT_FEATURE_COUNT = 4;\n * The meta object id for the '{@link org.eclipse.iee.translator.jmole.math.math.impl.AssignmentImpl <em>Assignment</em>}' class.\n * @see org.eclipse.iee.translator.jmole.math.math.impl.AssignmentImpl\n * @see org.eclipse.iee.translator.jmole.math.math.impl.MathPackageImpl#getAssignment()\n int ASSIGNMENT = 1;\n int ASSIGNMENT__VARIABLE = 0;\n int ASSIGNMENT__VALUE = 1;\n * The number of structural features of the '<em>Assignment</em>' class.\n int ASSIGNMENT_FEATURE_COUNT = 2;\n * The meta object id for the '{@link org.eclipse.iee.translator.jmole.math.math.impl.FunctionDefinitionImpl <em>Function Definition</em>}' class.\n * @see org.eclipse.iee.translator.jmole.math.math.impl.FunctionDefinitionImpl\n * @see org.eclipse.iee.translator.jmole.math.math.impl.MathPackageImpl#getFunctionDefinition()\n int FUNCTION_DEFINITION = 4;\n * The feature id for the '<em><b>Function</b></em>' containment reference.\n int FUNCTION_DEFINITION__FUNCTION = 0;\n * The feature id for the '<em><b>Formula</b></em>' containment reference.\n int FUNCTION_DEFINITION__FORMULA = 1;\n * The number of structural features of the '<em>Function Definition</em>' class.\n int FUNCTION_DEFINITION_FEATURE_COUNT = 2;\n * The meta object id for the '{@link org.eclipse.iee.translator.jmole.math.math.impl.MatrixDefinitionImpl <em>Matrix Definition</em>}' class.\n * @see org.eclipse.iee.translator.jmole.math.math.impl.MatrixDefinitionImpl\n * @see org.eclipse.iee.translator.jmole.math.math.impl.MathPackageImpl#getMatrixDefinition()\n int MATRIX_DEFINITION = 5;\n * The feature id for the '<em><b>Name</b></em>' attribute.\n int MATRIX_DEFINITION__NAME = 0;\n * The feature id for the '<em><b>Rows</b></em>' containment reference list.\n int MATRIX_DEFINITION__ROWS = 1;\n * The number of structural features of the '<em>Matrix Definition</em>' class.\n int MATRIX_DEFINITION_FEATURE_COUNT = 2;\n * The meta object id for the '{@link org.eclipse.iee.translator.jmole.math.math.impl.MatrixRowImpl <em>Matrix Row</em>}' class.\n * @see org.eclipse.iee.translator.jmole.math.math.impl.MatrixRowImpl\n * @see org.eclipse.iee.translator.jmole.math.math.impl.MathPackageImpl#getMatrixRow()\n int MATRIX_ROW = 6;\n * The feature id for the '<em><b>Elements</b></em>' attribute list.\n int MATRIX_ROW__ELEMENTS = 0;\n * The number of structural features of the '<em>Matrix Row</em>' class.\n int MATRIX_ROW_FEATURE_COUNT = 1;\n int ADDITION = 7;\n int SUBTRACTION = 8;\n int MULTIPLICATION = 9;\n int DIVISION = 10;\n int MODULO = 11;\n int INVERT = 12;\n int FACTORIAL = 13;\n * The meta object id for the '{@link org.eclipse.iee.translator.jmole.math.math.impl.IntervalImpl <em>Interval</em>}' class.\n * @see org.eclipse.iee.translator.jmole.math.math.impl.IntervalImpl\n * @see org.eclipse.iee.translator.jmole.math.math.impl.MathPackageImpl#getInterval()\n int INTERVAL = 14;\n int INTERVAL__NAME = EXPRESSION__NAME;\n int INTERVAL__PARAMETERS = EXPRESSION__PARAMETERS;\n * The feature id for the '<em><b>Opening Bracket</b></em>' attribute.\n int INTERVAL__OPENING_BRACKET = EXPRESSION_FEATURE_COUNT + 0;\n * The feature id for the '<em><b>Ceil</b></em>' containment reference.\n int INTERVAL__CEIL = EXPRESSION_FEATURE_COUNT + 1;\n * The feature id for the '<em><b>Floor</b></em>' containment reference.\n int INTERVAL__FLOOR = EXPRESSION_FEATURE_COUNT + 2;\n * The feature id for the '<em><b>Closing Bracket</b></em>' attribute.\n * @ordered\n int INTERVAL__CLOSING_BRACKET = EXPRESSION_FEATURE_COUNT + 3;\n * The number of structural features of the '<em>Interval</em>' class.\n int INTERVAL_FEATURE_COUNT = EXPRESSION_FEATURE_COUNT + 4;\n\n /**\n * The meta object id for the '{@link org.eclipse.iee.translator.jmole.math.math.impl.ExponentImpl <em>Exponent</em>}' class.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @see org.eclipse.iee.translator.jmole.math.math.impl.ExponentImpl\n * @see org.eclipse.iee.translator.jmole.math.math.impl.MathPackageImpl#getExponent()\n * @generated\n */\n int EXPONENT = 15;\n * The feature id for the '<em><b>Name</b></em>' attribute.\n int EXPONENT__NAME = EXPRESSION__NAME;\n * The feature id for the '<em><b>Parameters</b></em>' containment reference list.\n int EXPONENT__PARAMETERS = EXPRESSION__PARAMETERS;\n * The feature id for the '<em><b>Left</b></em>' containment reference.\n * @ordered\n int EXPONENT__LEFT = EXPRESSION_FEATURE_COUNT + 0;\n * The feature id for the '<em><b>Right</b></em>' containment reference.\n int EXPONENT__RIGHT = EXPRESSION_FEATURE_COUNT + 1;\n * The number of structural features of the '<em>Exponent</em>' class.\n int EXPONENT_FEATURE_COUNT = EXPRESSION_FEATURE_COUNT + 2;\n * The meta object id for the '{@link org.eclipse.iee.translator.jmole.math.math.impl.VariableImpl <em>Variable</em>}' class.\n * @see org.eclipse.iee.translator.jmole.math.math.impl.VariableImpl\n * @see org.eclipse.iee.translator.jmole.math.math.impl.MathPackageImpl#getVariable()\n int VARIABLE = 16;\n * The feature id for the '<em><b>Name</b></em>' attribute.\n int VARIABLE__NAME = EXPRESSION__NAME;\n * The feature id for the '<em><b>Parameters</b></em>' containment reference list.\n * @ordered\n int VARIABLE__PARAMETERS = EXPRESSION__PARAMETERS;\n * The number of structural features of the '<em>Variable</em>' class.\n int VARIABLE_FEATURE_COUNT = EXPRESSION_FEATURE_COUNT + 0;\n * The meta object id for the '{@link org.eclipse.iee.translator.jmole.math.math.impl.FloatImpl <em>Float</em>}' class.\n * @see org.eclipse.iee.translator.jmole.math.math.impl.FloatImpl\n * @see org.eclipse.iee.translator.jmole.math.math.impl.MathPackageImpl#getFloat()\n int FLOAT = 17;\n * The feature id for the '<em><b>Name</b></em>' attribute.\n int FLOAT__NAME = EXPRESSION__NAME;\n * The feature id for the '<em><b>Parameters</b></em>' containment reference list.\n int FLOAT__PARAMETERS = EXPRESSION__PARAMETERS;\n * The feature id for the '<em><b>Value</b></em>' attribute.\n int FLOAT__VALUE = EXPRESSION_FEATURE_COUNT + 0;\n * The number of structural features of the '<em>Float</em>' class.\n int FLOAT_FEATURE_COUNT = EXPRESSION_FEATURE_COUNT + 1;\n int FUNCTION = 18;\n\n * Returns the meta object for class '{@link org.eclipse.iee.translator.jmole.math.math.Statement <em>Statement</em>}'.\n * @return the meta object for class '<em>Statement</em>'.\n * @see org.eclipse.iee.translator.jmole.math.math.Statement\n EClass getStatement();\n * Returns the meta object for the containment reference '{@link org.eclipse.iee.translator.jmole.math.math.Statement#getFunctionDefinition <em>Function Definition</em>}'.\n * @return the meta object for the containment reference '<em>Function Definition</em>'.\n * @see org.eclipse.iee.translator.jmole.math.math.Statement#getFunctionDefinition()\n * @see #getStatement()\n EReference getStatement_FunctionDefinition();\n * Returns the meta object for the containment reference '{@link org.eclipse.iee.translator.jmole.math.math.Statement#getMatrixDefinition <em>Matrix Definition</em>}'.\n * @return the meta object for the containment reference '<em>Matrix Definition</em>'.\n * @see org.eclipse.iee.translator.jmole.math.math.Statement#getMatrixDefinition()\n * @see #getStatement()\n EReference getStatement_MatrixDefinition();\n * Returns the meta object for the containment reference '{@link org.eclipse.iee.translator.jmole.math.math.Statement#getAssignment <em>Assignment</em>}'.\n * @return the meta object for the containment reference '<em>Assignment</em>'.\n * @see org.eclipse.iee.translator.jmole.math.math.Statement#getAssignment()\n * @see #getStatement()\n EReference getStatement_Assignment();\n * Returns the meta object for the containment reference '{@link org.eclipse.iee.translator.jmole.math.math.Statement#getFormula <em>Formula</em>}'.\n * @return the meta object for the containment reference '<em>Formula</em>'.\n * @see org.eclipse.iee.translator.jmole.math.math.Statement#getFormula()\n * @see #getStatement()\n EReference getStatement_Formula();\n * Returns the meta object for class '{@link org.eclipse.iee.translator.jmole.math.math.Assignment <em>Assignment</em>}'.\n * @return the meta object for class '<em>Assignment</em>'.\n * @see org.eclipse.iee.translator.jmole.math.math.Assignment\n EClass getAssignment();\n * Returns the meta object for the attribute '{@link org.eclipse.iee.translator.jmole.math.math.Assignment#getVariable <em>Variable</em>}'.\n * @return the meta object for the attribute '<em>Variable</em>'.\n * @see org.eclipse.iee.translator.jmole.math.math.Assignment#getVariable()\n * @see #getAssignment()\n EAttribute getAssignment_Variable();\n * Returns the meta object for the containment reference '{@link org.eclipse.iee.translator.jmole.math.math.Assignment#getValue <em>Value</em>}'.\n * @return the meta object for the containment reference '<em>Value</em>'.\n * @see org.eclipse.iee.translator.jmole.math.math.Assignment#getValue()\n * @see #getAssignment()\n EReference getAssignment_Value();\n * Returns the meta object for class '{@link org.eclipse.iee.translator.jmole.math.math.Formula <em>Formula</em>}'.\n * @return the meta object for class '<em>Formula</em>'.\n * @see org.eclipse.iee.translator.jmole.math.math.Formula\n EClass getFormula();\n * Returns the meta object for the containment reference '{@link org.eclipse.iee.translator.jmole.math.math.Formula#getExpression <em>Expression</em>}'.\n * @return the meta object for the containment reference '<em>Expression</em>'.\n * @see org.eclipse.iee.translator.jmole.math.math.Formula#getExpression()\n * @see #getFormula()\n EReference getFormula_Expression();\n * Returns the meta object for class '{@link org.eclipse.iee.translator.jmole.math.math.Expression <em>Expression</em>}'.\n * @return the meta object for class '<em>Expression</em>'.\n * @see org.eclipse.iee.translator.jmole.math.math.Expression\n EClass getExpression();\n * Returns the meta object for the attribute '{@link org.eclipse.iee.translator.jmole.math.math.Expression#getName <em>Name</em>}'.\n * @return the meta object for the attribute '<em>Name</em>'.\n * @see org.eclipse.iee.translator.jmole.math.math.Expression#getName()\n * @see #getExpression()\n EAttribute getExpression_Name();\n * Returns the meta object for the containment reference list '{@link org.eclipse.iee.translator.jmole.math.math.Expression#getParameters <em>Parameters</em>}'.\n * @return the meta object for the containment reference list '<em>Parameters</em>'.\n * @see org.eclipse.iee.translator.jmole.math.math.Expression#getParameters()\n * @see #getExpression()\n EReference getExpression_Parameters();\n * Returns the meta object for class '{@link org.eclipse.iee.translator.jmole.math.math.FunctionDefinition <em>Function Definition</em>}'.\n * @return the meta object for class '<em>Function Definition</em>'.\n * @see org.eclipse.iee.translator.jmole.math.math.FunctionDefinition\n EClass getFunctionDefinition();\n * Returns the meta object for the containment reference '{@link org.eclipse.iee.translator.jmole.math.math.FunctionDefinition#getFunction <em>Function</em>}'.\n * @return the meta object for the containment reference '<em>Function</em>'.\n * @see org.eclipse.iee.translator.jmole.math.math.FunctionDefinition#getFunction()\n * @see #getFunctionDefinition()\n EReference getFunctionDefinition_Function();\n * Returns the meta object for the containment reference '{@link org.eclipse.iee.translator.jmole.math.math.FunctionDefinition#getFormula <em>Formula</em>}'.\n * @return the meta object for the containment reference '<em>Formula</em>'.\n * @see org.eclipse.iee.translator.jmole.math.math.FunctionDefinition#getFormula()\n * @see #getFunctionDefinition()\n EReference getFunctionDefinition_Formula();\n * Returns the meta object for class '{@link org.eclipse.iee.translator.jmole.math.math.MatrixDefinition <em>Matrix Definition</em>}'.\n * @return the meta object for class '<em>Matrix Definition</em>'.\n * @see org.eclipse.iee.translator.jmole.math.math.MatrixDefinition\n EClass getMatrixDefinition();\n * Returns the meta object for the attribute '{@link org.eclipse.iee.translator.jmole.math.math.MatrixDefinition#getName <em>Name</em>}'.\n * @return the meta object for the attribute '<em>Name</em>'.\n * @see org.eclipse.iee.translator.jmole.math.math.MatrixDefinition#getName()\n * @see #getMatrixDefinition()\n EAttribute getMatrixDefinition_Name();\n * Returns the meta object for the containment reference list '{@link org.eclipse.iee.translator.jmole.math.math.MatrixDefinition#getRows <em>Rows</em>}'.\n * @return the meta object for the containment reference list '<em>Rows</em>'.\n * @see org.eclipse.iee.translator.jmole.math.math.MatrixDefinition#getRows()\n * @see #getMatrixDefinition()\n EReference getMatrixDefinition_Rows();\n * Returns the meta object for class '{@link org.eclipse.iee.translator.jmole.math.math.MatrixRow <em>Matrix Row</em>}'.\n * Returns the meta object for class '{@link org.eclipse.iee.translator.jmole.math.math.Interval <em>Interval</em>}'.\n * @return the meta object for class '<em>Interval</em>'.\n * @see org.eclipse.iee.translator.jmole.math.math.Interval\n EClass getInterval();\n * Returns the meta object for the attribute '{@link org.eclipse.iee.translator.jmole.math.math.Interval#getOpeningBracket <em>Opening Bracket</em>}'.\n * @return the meta object for the attribute '<em>Opening Bracket</em>'.\n * @see org.eclipse.iee.translator.jmole.math.math.Interval#getOpeningBracket()\n * @see #getInterval()\n EAttribute getInterval_OpeningBracket();\n * Returns the meta object for the containment reference '{@link org.eclipse.iee.translator.jmole.math.math.Interval#getCeil <em>Ceil</em>}'.\n * @return the meta object for the containment reference '<em>Ceil</em>'.\n * @see org.eclipse.iee.translator.jmole.math.math.Interval#getCeil()\n * @see #getInterval()\n EReference getInterval_Ceil();\n * Returns the meta object for the containment reference '{@link org.eclipse.iee.translator.jmole.math.math.Interval#getFloor <em>Floor</em>}'.\n * @return the meta object for the containment reference '<em>Floor</em>'.\n * @see org.eclipse.iee.translator.jmole.math.math.Interval#getFloor()\n * @see #getInterval()\n EReference getInterval_Floor();\n * Returns the meta object for the attribute '{@link org.eclipse.iee.translator.jmole.math.math.Interval#getClosingBracket <em>Closing Bracket</em>}'.\n * @return the meta object for the attribute '<em>Closing Bracket</em>'.\n * @see org.eclipse.iee.translator.jmole.math.math.Interval#getClosingBracket()\n * @see #getInterval()\n EAttribute getInterval_ClosingBracket();\n * Returns the meta object for class '{@link org.eclipse.iee.translator.jmole.math.math.Exponent <em>Exponent</em>}'.\n * @return the meta object for class '<em>Exponent</em>'.\n * @see org.eclipse.iee.translator.jmole.math.math.Exponent\n EClass getExponent();\n * Returns the meta object for the containment reference '{@link org.eclipse.iee.translator.jmole.math.math.Exponent#getLeft <em>Left</em>}'.\n * @return the meta object for the containment reference '<em>Left</em>'.\n * @see org.eclipse.iee.translator.jmole.math.math.Exponent#getLeft()\n * @see #getExponent()\n EReference getExponent_Left();\n * Returns the meta object for the containment reference '{@link org.eclipse.iee.translator.jmole.math.math.Exponent#getRight <em>Right</em>}'.\n * @return the meta object for the containment reference '<em>Right</em>'.\n * @see org.eclipse.iee.translator.jmole.math.math.Exponent#getRight()\n * @see #getExponent()\n EReference getExponent_Right();\n * Returns the meta object for class '{@link org.eclipse.iee.translator.jmole.math.math.Variable <em>Variable</em>}'.\n * @return the meta object for class '<em>Variable</em>'.\n * @see org.eclipse.iee.translator.jmole.math.math.Variable\n EClass getVariable();\n * Returns the meta object for class '{@link org.eclipse.iee.translator.jmole.math.math.Float <em>Float</em>}'.\n * @return the meta object for class '<em>Float</em>'.\n * @see org.eclipse.iee.translator.jmole.math.math.Float\n EClass getFloat();\n * Returns the meta object for the attribute '{@link org.eclipse.iee.translator.jmole.math.math.Float#getValue <em>Value</em>}'.\n * @return the meta object for the attribute '<em>Value</em>'.\n * @see org.eclipse.iee.translator.jmole.math.math.Float#getValue()\n * @see #getFloat()\n EAttribute getFloat_Value();\n * Returns the meta object for class '{@link org.eclipse.iee.translator.jmole.math.math.Function <em>Function</em>}'.\n * @return the meta object for class '<em>Function</em>'.\n * @see org.eclipse.iee.translator.jmole.math.math.Function\n EClass getFunction();\n * Returns the meta object for the containment reference '{@link org.eclipse.iee.translator.jmole.math.math.Function#getFunction <em>Function</em>}'.\n * @return the meta object for the containment reference '<em>Function</em>'.\n * @see org.eclipse.iee.translator.jmole.math.math.Function#getFunction()\n * @see #getFunction()\n EReference getFunction_Function();\n * The meta object literal for the '<em><b>Matrix Definition</b></em>' containment reference feature.\n EReference STATEMENT__MATRIX_DEFINITION = eINSTANCE.getStatement_MatrixDefinition();\n * The meta object literal for the '<em><b>Assignment</b></em>' containment reference feature.\n EReference STATEMENT__ASSIGNMENT = eINSTANCE.getStatement_Assignment();\n * The meta object literal for the '<em><b>Formula</b></em>' containment reference feature.\n EReference STATEMENT__FORMULA = eINSTANCE.getStatement_Formula();\n * The meta object literal for the '{@link org.eclipse.iee.translator.jmole.math.math.impl.AssignmentImpl <em>Assignment</em>}' class.\n * @see org.eclipse.iee.translator.jmole.math.math.impl.AssignmentImpl\n * @see org.eclipse.iee.translator.jmole.math.math.impl.MathPackageImpl#getAssignment()\n EClass ASSIGNMENT = eINSTANCE.getAssignment();\n EAttribute ASSIGNMENT__VARIABLE = eINSTANCE.getAssignment_Variable();\n EReference ASSIGNMENT__VALUE = eINSTANCE.getAssignment_Value();\n * The meta object literal for the '{@link org.eclipse.iee.translator.jmole.math.math.impl.FunctionDefinitionImpl <em>Function Definition</em>}' class.\n * @see org.eclipse.iee.translator.jmole.math.math.impl.FunctionDefinitionImpl\n * @see org.eclipse.iee.translator.jmole.math.math.impl.MathPackageImpl#getFunctionDefinition()\n EClass FUNCTION_DEFINITION = eINSTANCE.getFunctionDefinition();\n * The meta object literal for the '<em><b>Function</b></em>' containment reference feature.\n EReference FUNCTION_DEFINITION__FUNCTION = eINSTANCE.getFunctionDefinition_Function();\n * The meta object literal for the '<em><b>Formula</b></em>' containment reference feature.\n EReference FUNCTION_DEFINITION__FORMULA = eINSTANCE.getFunctionDefinition_Formula();\n * The meta object literal for the '{@link org.eclipse.iee.translator.jmole.math.math.impl.MatrixDefinitionImpl <em>Matrix Definition</em>}' class.\n * @see org.eclipse.iee.translator.jmole.math.math.impl.MatrixDefinitionImpl\n * @see org.eclipse.iee.translator.jmole.math.math.impl.MathPackageImpl#getMatrixDefinition()\n EClass MATRIX_DEFINITION = eINSTANCE.getMatrixDefinition();\n * The meta object literal for the '<em><b>Name</b></em>' attribute feature.\n EAttribute MATRIX_DEFINITION__NAME = eINSTANCE.getMatrixDefinition_Name();\n * The meta object literal for the '<em><b>Rows</b></em>' containment reference list feature.\n EReference MATRIX_DEFINITION__ROWS = eINSTANCE.getMatrixDefinition_Rows();\n * The meta object literal for the '{@link org.eclipse.iee.translator.jmole.math.math.impl.MatrixRowImpl <em>Matrix Row</em>}' class.\n * @see org.eclipse.iee.translator.jmole.math.math.impl.MatrixRowImpl\n * @see org.eclipse.iee.translator.jmole.math.math.impl.MathPackageImpl#getMatrixRow()\n EClass MATRIX_ROW = eINSTANCE.getMatrixRow();\n * The meta object literal for the '<em><b>Elements</b></em>' attribute list feature.\n EAttribute MATRIX_ROW__ELEMENTS = eINSTANCE.getMatrixRow_Elements();\n * The meta object literal for the '{@link org.eclipse.iee.translator.jmole.math.math.impl.IntervalImpl <em>Interval</em>}' class.\n * @see org.eclipse.iee.translator.jmole.math.math.impl.IntervalImpl\n * @see org.eclipse.iee.translator.jmole.math.math.impl.MathPackageImpl#getInterval()\n EClass INTERVAL = eINSTANCE.getInterval();\n * The meta object literal for the '<em><b>Opening Bracket</b></em>' attribute feature.\n EAttribute INTERVAL__OPENING_BRACKET = eINSTANCE.getInterval_OpeningBracket();\n * The meta object literal for the '<em><b>Ceil</b></em>' containment reference feature.\n EReference INTERVAL__CEIL = eINSTANCE.getInterval_Ceil();\n * The meta object literal for the '<em><b>Floor</b></em>' containment reference feature.\n EReference INTERVAL__FLOOR = eINSTANCE.getInterval_Floor();\n * The meta object literal for the '<em><b>Closing Bracket</b></em>' attribute feature.\n EAttribute INTERVAL__CLOSING_BRACKET = eINSTANCE.getInterval_ClosingBracket();\n * The meta object literal for the '{@link org.eclipse.iee.translator.jmole.math.math.impl.ExponentImpl <em>Exponent</em>}' class.\n * @see org.eclipse.iee.translator.jmole.math.math.impl.ExponentImpl\n * @see org.eclipse.iee.translator.jmole.math.math.impl.MathPackageImpl#getExponent()\n EClass EXPONENT = eINSTANCE.getExponent();\n EReference EXPONENT__LEFT = eINSTANCE.getExponent_Left();\n EReference EXPONENT__RIGHT = eINSTANCE.getExponent_Right();\n * The meta object literal for the '{@link org.eclipse.iee.translator.jmole.math.math.impl.VariableImpl <em>Variable</em>}' class.\n * @see org.eclipse.iee.translator.jmole.math.math.impl.VariableImpl\n * @see org.eclipse.iee.translator.jmole.math.math.impl.MathPackageImpl#getVariable()\n EClass VARIABLE = eINSTANCE.getVariable();\n * The meta object literal for the '{@link org.eclipse.iee.translator.jmole.math.math.impl.FloatImpl <em>Float</em>}' class.\n * @see org.eclipse.iee.translator.jmole.math.math.impl.FloatImpl\n * @see org.eclipse.iee.translator.jmole.math.math.impl.MathPackageImpl#getFloat()\n EClass FLOAT = eINSTANCE.getFloat();\n * The meta object literal for the '<em><b>Value</b></em>' attribute feature.\n EAttribute FLOAT__VALUE = eINSTANCE.getFloat_Value();\n * The meta object literal for the '{@link org.eclipse.iee.translator.jmole.math.math.impl.FunctionImpl <em>Function</em>}' class.\n * @see org.eclipse.iee.translator.jmole.math.math.impl.FunctionImpl\n * @see org.eclipse.iee.translator.jmole.math.math.impl.MathPackageImpl#getFunction()\n EClass FUNCTION = eINSTANCE.getFunction();\n * The meta object literal for the '<em><b>Function</b></em>' containment reference feature.\n EReference FUNCTION__FUNCTION = eINSTANCE.getFunction_Function();", "old_methods": [], "patch": "@@ -80,31 +80,40 @@ public interface MathPackage extends EPackage\n int STATEMENT__FUNCTION_DEFINITION = 0;\n \n /**\n- * The feature id for the '<em><b>Matrix Definition</b></em>' containment reference.\n+ * The feature id for the '<em><b>Variable Assignment</b></em>' containment reference.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n * @ordered\n */\n- int STATEMENT__MATRIX_DEFINITION = 1;\n+ int STATEMENT__VARIABLE_ASSIGNMENT = 1;\n \n /**\n- * The feature id for the '<em><b>Assignment</b></em>' containment reference.\n+ * The feature id for the '<em><b>Formula</b></em>' containment reference.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n * @ordered\n */\n- int STATEMENT__ASSIGNMENT = 2;\n+ int STATEMENT__FORMULA = 2;\n \n /**\n- * The feature id for the '<em><b>Formula</b></em>' containment reference.\n+ * The feature id for the '<em><b>Matrix Assignment</b></em>' containment reference.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ * @ordered\n+ */\n+ int STATEMENT__MATRIX_ASSIGNMENT = 3;\n+\n+ /**\n+ * The feature id for the '<em><b>Matrix Formula</b></em>' containment reference.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n * @ordered\n */\n- int STATEMENT__FORMULA = 3;\n+ int STATEMENT__MATRIX_FORMULA = 4;\n \n /**\n * The number of structural features of the '<em>Statement</em>' class.\n@@ -113,17 +122,17 @@ public interface MathPackage extends EPackage\n * @generated\n * @ordered\n */\n- int STATEMENT_FEATURE_COUNT = 4;\n+ int STATEMENT_FEATURE_COUNT = 5;\n \n /**\n- * The meta object id for the '{@link org.eclipse.iee.translator.jmole.math.math.impl.AssignmentImpl <em>Assignment</em>}' class.\n+ * The meta object id for the '{@link org.eclipse.iee.translator.jmole.math.math.impl.VariableAssignmentImpl <em>Variable Assignment</em>}' class.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n- * @see org.eclipse.iee.translator.jmole.math.math.impl.AssignmentImpl\n- * @see org.eclipse.iee.translator.jmole.math.math.impl.MathPackageImpl#getAssignment()\n+ * @see org.eclipse.iee.translator.jmole.math.math.impl.VariableAssignmentImpl\n+ * @see org.eclipse.iee.translator.jmole.math.math.impl.MathPackageImpl#getVariableAssignment()\n * @generated\n */\n- int ASSIGNMENT = 1;\n+ int VARIABLE_ASSIGNMENT = 1;\n \n /**\n * The feature id for the '<em><b>Variable</b></em>' attribute.\n@@ -132,7 +141,7 @@ public interface MathPackage extends EPackage\n * @generated\n * @ordered\n */\n- int ASSIGNMENT__VARIABLE = 0;\n+ int VARIABLE_ASSIGNMENT__VARIABLE = 0;\n \n /**\n * The feature id for the '<em><b>Value</b></em>' containment reference.\n@@ -141,16 +150,16 @@ public interface MathPackage extends EPackage\n * @generated\n * @ordered\n */\n- int ASSIGNMENT__VALUE = 1;\n+ int VARIABLE_ASSIGNMENT__VALUE = 1;\n \n /**\n- * The number of structural features of the '<em>Assignment</em>' class.\n+ * The number of structural features of the '<em>Variable Assignment</em>' class.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n * @ordered\n */\n- int ASSIGNMENT_FEATURE_COUNT = 2;\n+ int VARIABLE_ASSIGNMENT_FEATURE_COUNT = 2;\n \n /**\n * The meta object id for the '{@link org.eclipse.iee.translator.jmole.math.math.impl.FormulaImpl <em>Formula</em>}' class.\n@@ -218,106 +227,181 @@ public interface MathPackage extends EPackage\n int EXPRESSION_FEATURE_COUNT = 2;\n \n /**\n- * The meta object id for the '{@link org.eclipse.iee.translator.jmole.math.math.impl.FunctionDefinitionImpl <em>Function Definition</em>}' class.\n+ * The meta object id for the '{@link org.eclipse.iee.translator.jmole.math.math.impl.MatrixImpl <em>Matrix</em>}' class.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n- * @see org.eclipse.iee.translator.jmole.math.math.impl.FunctionDefinitionImpl\n- * @see org.eclipse.iee.translator.jmole.math.math.impl.MathPackageImpl#getFunctionDefinition()\n+ * @see org.eclipse.iee.translator.jmole.math.math.impl.MatrixImpl\n+ * @see org.eclipse.iee.translator.jmole.math.math.impl.MathPackageImpl#getMatrix()\n * @generated\n */\n- int FUNCTION_DEFINITION = 4;\n+ int MATRIX = 4;\n \n /**\n- * The feature id for the '<em><b>Function</b></em>' containment reference.\n+ * The feature id for the '<em><b>Rows</b></em>' containment reference list.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n * @ordered\n */\n- int FUNCTION_DEFINITION__FUNCTION = 0;\n+ int MATRIX__ROWS = 0;\n \n /**\n- * The feature id for the '<em><b>Formula</b></em>' containment reference.\n+ * The number of structural features of the '<em>Matrix</em>' class.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n * @ordered\n */\n- int FUNCTION_DEFINITION__FORMULA = 1;\n+ int MATRIX_FEATURE_COUNT = 1;\n \n /**\n- * The number of structural features of the '<em>Function Definition</em>' class.\n+ * The meta object id for the '{@link org.eclipse.iee.translator.jmole.math.math.impl.MatrixRowImpl <em>Matrix Row</em>}' class.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @see org.eclipse.iee.translator.jmole.math.math.impl.MatrixRowImpl\n+ * @see org.eclipse.iee.translator.jmole.math.math.impl.MathPackageImpl#getMatrixRow()\n+ * @generated\n+ */\n+ int MATRIX_ROW = 5;\n+\n+ /**\n+ * The feature id for the '<em><b>Elements</b></em>' attribute list.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n * @ordered\n */\n- int FUNCTION_DEFINITION_FEATURE_COUNT = 2;\n+ int MATRIX_ROW__ELEMENTS = 0;\n+\n+ /**\n+ * The number of structural features of the '<em>Matrix Row</em>' class.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ * @ordered\n+ */\n+ int MATRIX_ROW_FEATURE_COUNT = 1;\n \n /**\n- * The meta object id for the '{@link org.eclipse.iee.translator.jmole.math.math.impl.MatrixDefinitionImpl <em>Matrix Definition</em>}' class.\n+ * The meta object id for the '{@link org.eclipse.iee.translator.jmole.math.math.impl.MatrixAssignmentImpl <em>Matrix Assignment</em>}' class.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n- * @see org.eclipse.iee.translator.jmole.math.math.impl.MatrixDefinitionImpl\n- * @see org.eclipse.iee.translator.jmole.math.math.impl.MathPackageImpl#getMatrixDefinition()\n+ * @see org.eclipse.iee.translator.jmole.math.math.impl.MatrixAssignmentImpl\n+ * @see org.eclipse.iee.translator.jmole.math.math.impl.MathPackageImpl#getMatrixAssignment()\n * @generated\n */\n- int MATRIX_DEFINITION = 5;\n+ int MATRIX_ASSIGNMENT = 6;\n \n /**\n- * The feature id for the '<em><b>Name</b></em>' attribute.\n+ * The feature id for the '<em><b>Variable</b></em>' attribute.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n * @ordered\n */\n- int MATRIX_DEFINITION__NAME = 0;\n+ int MATRIX_ASSIGNMENT__VARIABLE = 0;\n \n /**\n- * The feature id for the '<em><b>Rows</b></em>' containment reference list.\n+ * The feature id for the '<em><b>Value</b></em>' containment reference.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n * @ordered\n */\n- int MATRIX_DEFINITION__ROWS = 1;\n+ int MATRIX_ASSIGNMENT__VALUE = 1;\n \n /**\n- * The number of structural features of the '<em>Matrix Definition</em>' class.\n+ * The number of structural features of the '<em>Matrix Assignment</em>' class.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n * @ordered\n */\n- int MATRIX_DEFINITION_FEATURE_COUNT = 2;\n+ int MATRIX_ASSIGNMENT_FEATURE_COUNT = 2;\n \n /**\n- * The meta object id for the '{@link org.eclipse.iee.translator.jmole.math.math.impl.MatrixRowImpl <em>Matrix Row</em>}' class.\n+ * The meta object id for the '{@link org.eclipse.iee.translator.jmole.math.math.impl.MatrixFormulaImpl <em>Matrix Formula</em>}' class.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n- * @see org.eclipse.iee.translator.jmole.math.math.impl.MatrixRowImpl\n- * @see org.eclipse.iee.translator.jmole.math.math.impl.MathPackageImpl#getMatrixRow()\n+ * @see org.eclipse.iee.translator.jmole.math.math.impl.MatrixFormulaImpl\n+ * @see org.eclipse.iee.translator.jmole.math.math.impl.MathPackageImpl#getMatrixFormula()\n * @generated\n */\n- int MATRIX_ROW = 6;\n+ int MATRIX_FORMULA = 7;\n \n /**\n- * The feature id for the '<em><b>Elements</b></em>' attribute list.\n+ * The feature id for the '<em><b>Expression</b></em>' containment reference.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n * @ordered\n */\n- int MATRIX_ROW__ELEMENTS = 0;\n+ int MATRIX_FORMULA__EXPRESSION = 0;\n \n /**\n- * The number of structural features of the '<em>Matrix Row</em>' class.\n+ * The number of structural features of the '<em>Matrix Formula</em>' class.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n * @ordered\n */\n- int MATRIX_ROW_FEATURE_COUNT = 1;\n+ int MATRIX_FORMULA_FEATURE_COUNT = 1;\n+\n+ /**\n+ * The meta object id for the '{@link org.eclipse.iee.translator.jmole.math.math.impl.MatrixExpressionImpl <em>Matrix Expression</em>}' class.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @see org.eclipse.iee.translator.jmole.math.math.impl.MatrixExpressionImpl\n+ * @see org.eclipse.iee.translator.jmole.math.math.impl.MathPackageImpl#getMatrixExpression()\n+ * @generated\n+ */\n+ int MATRIX_EXPRESSION = 8;\n+\n+ /**\n+ * The number of structural features of the '<em>Matrix Expression</em>' class.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ * @ordered\n+ */\n+ int MATRIX_EXPRESSION_FEATURE_COUNT = 0;\n+\n+ /**\n+ * The meta object id for the '{@link org.eclipse.iee.translator.jmole.math.math.impl.FunctionDefinitionImpl <em>Function Definition</em>}' class.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @see org.eclipse.iee.translator.jmole.math.math.impl.FunctionDefinitionImpl\n+ * @see org.eclipse.iee.translator.jmole.math.math.impl.MathPackageImpl#getFunctionDefinition()\n+ * @generated\n+ */\n+ int FUNCTION_DEFINITION = 9;\n+\n+ /**\n+ * The feature id for the '<em><b>Function</b></em>' containment reference.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ * @ordered\n+ */\n+ int FUNCTION_DEFINITION__FUNCTION = 0;\n+\n+ /**\n+ * The feature id for the '<em><b>Formula</b></em>' containment reference.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ * @ordered\n+ */\n+ int FUNCTION_DEFINITION__FORMULA = 1;\n+\n+ /**\n+ * The number of structural features of the '<em>Function Definition</em>' class.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ * @ordered\n+ */\n+ int FUNCTION_DEFINITION_FEATURE_COUNT = 2;\n \n /**\n * The meta object id for the '{@link org.eclipse.iee.translator.jmole.math.math.impl.AdditionImpl <em>Addition</em>}' class.\n@@ -327,7 +411,7 @@ public interface MathPackage extends EPackage\n * @see org.eclipse.iee.translator.jmole.math.math.impl.MathPackageImpl#getAddition()\n * @generated\n */\n- int ADDITION = 7;\n+ int ADDITION = 10;\n \n /**\n * The feature id for the '<em><b>Name</b></em>' attribute.\n@@ -382,7 +466,7 @@ public interface MathPackage extends EPackage\n * @see org.eclipse.iee.translator.jmole.math.math.impl.MathPackageImpl#getSubtraction()\n * @generated\n */\n- int SUBTRACTION = 8;\n+ int SUBTRACTION = 11;\n \n /**\n * The feature id for the '<em><b>Name</b></em>' attribute.\n@@ -437,7 +521,7 @@ public interface MathPackage extends EPackage\n * @see org.eclipse.iee.translator.jmole.math.math.impl.MathPackageImpl#getMultiplication()\n * @generated\n */\n- int MULTIPLICATION = 9;\n+ int MULTIPLICATION = 12;\n \n /**\n * The feature id for the '<em><b>Name</b></em>' attribute.\n@@ -492,7 +576,7 @@ public interface MathPackage extends EPackage\n * @see org.eclipse.iee.translator.jmole.math.math.impl.MathPackageImpl#getDivision()\n * @generated\n */\n- int DIVISION = 10;\n+ int DIVISION = 13;\n \n /**\n * The feature id for the '<em><b>Name</b></em>' attribute.\n@@ -547,7 +631,7 @@ public interface MathPackage extends EPackage\n * @see org.eclipse.iee.translator.jmole.math.math.impl.MathPackageImpl#getModulo()\n * @generated\n */\n- int MODULO = 11;\n+ int MODULO = 14;\n \n /**\n * The feature id for the '<em><b>Name</b></em>' attribute.\n@@ -602,7 +686,7 @@ public interface MathPackage extends EPackage\n * @see org.eclipse.iee.translator.jmole.math.math.impl.MathPackageImpl#getInvert()\n * @generated\n */\n- int INVERT = 12;\n+ int INVERT = 15;\n \n /**\n * The feature id for the '<em><b>Name</b></em>' attribute.\n@@ -648,7 +732,7 @@ public interface MathPackage extends EPackage\n * @see org.eclipse.iee.translator.jmole.math.math.impl.MathPackageImpl#getFactorial()\n * @generated\n */\n- int FACTORIAL = 13;\n+ int FACTORIAL = 16;\n \n /**\n * The feature id for the '<em><b>Name</b></em>' attribute.\n@@ -687,14 +771,14 @@ public interface MathPackage extends EPackage\n int FACTORIAL_FEATURE_COUNT = EXPRESSION_FEATURE_COUNT + 1;\n \n /**\n- * The meta object id for the '{@link org.eclipse.iee.translator.jmole.math.math.impl.IntervalImpl <em>Interval</em>}' class.\n+ * The meta object id for the '{@link org.eclipse.iee.translator.jmole.math.math.impl.ExponentImpl <em>Exponent</em>}' class.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n- * @see org.eclipse.iee.translator.jmole.math.math.impl.IntervalImpl\n- * @see org.eclipse.iee.translator.jmole.math.math.impl.MathPackageImpl#getInterval()\n+ * @see org.eclipse.iee.translator.jmole.math.math.impl.ExponentImpl\n+ * @see org.eclipse.iee.translator.jmole.math.math.impl.MathPackageImpl#getExponent()\n * @generated\n */\n- int INTERVAL = 14;\n+ int EXPONENT = 17;\n \n /**\n * The feature id for the '<em><b>Name</b></em>' attribute.\n@@ -703,7 +787,7 @@ public interface MathPackage extends EPackage\n * @generated\n * @ordered\n */\n- int INTERVAL__NAME = EXPRESSION__NAME;\n+ int EXPONENT__NAME = EXPRESSION__NAME;\n \n /**\n * The feature id for the '<em><b>Parameters</b></em>' containment reference list.\n@@ -712,190 +796,181 @@ public interface MathPackage extends EPackage\n * @generated\n * @ordered\n */\n- int INTERVAL__PARAMETERS = EXPRESSION__PARAMETERS;\n+ int EXPONENT__PARAMETERS = EXPRESSION__PARAMETERS;\n \n /**\n- * The feature id for the '<em><b>Opening Bracket</b></em>' attribute.\n+ * The feature id for the '<em><b>Left</b></em>' containment reference.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n * @ordered\n */\n- int INTERVAL__OPENING_BRACKET = EXPRESSION_FEATURE_COUNT + 0;\n+ int EXPONENT__LEFT = EXPRESSION_FEATURE_COUNT + 0;\n \n /**\n- * The feature id for the '<em><b>Ceil</b></em>' containment reference.\n+ * The feature id for the '<em><b>Right</b></em>' containment reference.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n * @ordered\n */\n- int INTERVAL__CEIL = EXPRESSION_FEATURE_COUNT + 1;\n+ int EXPONENT__RIGHT = EXPRESSION_FEATURE_COUNT + 1;\n \n /**\n- * The feature id for the '<em><b>Floor</b></em>' containment reference.\n+ * The number of structural features of the '<em>Exponent</em>' class.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n * @ordered\n */\n- int INTERVAL__FLOOR = EXPRESSION_FEATURE_COUNT + 2;\n+ int EXPONENT_FEATURE_COUNT = EXPRESSION_FEATURE_COUNT + 2;\n \n /**\n- * The feature id for the '<em><b>Closing Bracket</b></em>' attribute.\n+ * The meta object id for the '{@link org.eclipse.iee.translator.jmole.math.math.impl.VariableImpl <em>Variable</em>}' class.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n+ * @see org.eclipse.iee.translator.jmole.math.math.impl.VariableImpl\n+ * @see org.eclipse.iee.translator.jmole.math.math.impl.MathPackageImpl#getVariable()\n * @generated\n- * @ordered\n */\n- int INTERVAL__CLOSING_BRACKET = EXPRESSION_FEATURE_COUNT + 3;\n+ int VARIABLE = 18;\n \n /**\n- * The number of structural features of the '<em>Interval</em>' class.\n+ * The feature id for the '<em><b>Name</b></em>' attribute.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n * @ordered\n */\n- int INTERVAL_FEATURE_COUNT = EXPRESSION_FEATURE_COUNT + 4;\n-\n- /**\n- * The meta object id for the '{@link org.eclipse.iee.translator.jmole.math.math.impl.ExponentImpl <em>Exponent</em>}' class.\n- * <!-- begin-user-doc -->\n- * <!-- end-user-doc -->\n- * @see org.eclipse.iee.translator.jmole.math.math.impl.ExponentImpl\n- * @see org.eclipse.iee.translator.jmole.math.math.impl.MathPackageImpl#getExponent()\n- * @generated\n- */\n- int EXPONENT = 15;\n+ int VARIABLE__NAME = EXPRESSION__NAME;\n \n /**\n- * The feature id for the '<em><b>Name</b></em>' attribute.\n+ * The feature id for the '<em><b>Parameters</b></em>' containment reference list.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n * @ordered\n */\n- int EXPONENT__NAME = EXPRESSION__NAME;\n+ int VARIABLE__PARAMETERS = EXPRESSION__PARAMETERS;\n \n /**\n- * The feature id for the '<em><b>Parameters</b></em>' containment reference list.\n+ * The number of structural features of the '<em>Variable</em>' class.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n * @ordered\n */\n- int EXPONENT__PARAMETERS = EXPRESSION__PARAMETERS;\n+ int VARIABLE_FEATURE_COUNT = EXPRESSION_FEATURE_COUNT + 0;\n \n /**\n- * The feature id for the '<em><b>Left</b></em>' containment reference.\n+ * The meta object id for the '{@link org.eclipse.iee.translator.jmole.math.math.impl.FloatImpl <em>Float</em>}' class.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n+ * @see org.eclipse.iee.translator.jmole.math.math.impl.FloatImpl\n+ * @see org.eclipse.iee.translator.jmole.math.math.impl.MathPackageImpl#getFloat()\n * @generated\n- * @ordered\n */\n- int EXPONENT__LEFT = EXPRESSION_FEATURE_COUNT + 0;\n+ int FLOAT = 19;\n \n /**\n- * The feature id for the '<em><b>Right</b></em>' containment reference.\n+ * The feature id for the '<em><b>Name</b></em>' attribute.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n * @ordered\n */\n- int EXPONENT__RIGHT = EXPRESSION_FEATURE_COUNT + 1;\n+ int FLOAT__NAME = EXPRESSION__NAME;\n \n /**\n- * The number of structural features of the '<em>Exponent</em>' class.\n+ * The feature id for the '<em><b>Parameters</b></em>' containment reference list.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n * @ordered\n */\n- int EXPONENT_FEATURE_COUNT = EXPRESSION_FEATURE_COUNT + 2;\n+ int FLOAT__PARAMETERS = EXPRESSION__PARAMETERS;\n \n /**\n- * The meta object id for the '{@link org.eclipse.iee.translator.jmole.math.math.impl.VariableImpl <em>Variable</em>}' class.\n+ * The feature id for the '<em><b>Value</b></em>' attribute.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n- * @see org.eclipse.iee.translator.jmole.math.math.impl.VariableImpl\n- * @see org.eclipse.iee.translator.jmole.math.math.impl.MathPackageImpl#getVariable()\n * @generated\n+ * @ordered\n */\n- int VARIABLE = 16;\n+ int FLOAT__VALUE = EXPRESSION_FEATURE_COUNT + 0;\n \n /**\n- * The feature id for the '<em><b>Name</b></em>' attribute.\n+ * The number of structural features of the '<em>Float</em>' class.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n * @ordered\n */\n- int VARIABLE__NAME = EXPRESSION__NAME;\n+ int FLOAT_FEATURE_COUNT = EXPRESSION_FEATURE_COUNT + 1;\n \n /**\n- * The feature id for the '<em><b>Parameters</b></em>' containment reference list.\n+ * The meta object id for the '{@link org.eclipse.iee.translator.jmole.math.math.impl.MatrixElementImpl <em>Matrix Element</em>}' class.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n+ * @see org.eclipse.iee.translator.jmole.math.math.impl.MatrixElementImpl\n+ * @see org.eclipse.iee.translator.jmole.math.math.impl.MathPackageImpl#getMatrixElement()\n * @generated\n- * @ordered\n */\n- int VARIABLE__PARAMETERS = EXPRESSION__PARAMETERS;\n+ int MATRIX_ELEMENT = 20;\n \n /**\n- * The number of structural features of the '<em>Variable</em>' class.\n+ * The feature id for the '<em><b>Name</b></em>' attribute.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n * @ordered\n */\n- int VARIABLE_FEATURE_COUNT = EXPRESSION_FEATURE_COUNT + 0;\n+ int MATRIX_ELEMENT__NAME = EXPRESSION__NAME;\n \n /**\n- * The meta object id for the '{@link org.eclipse.iee.translator.jmole.math.math.impl.FloatImpl <em>Float</em>}' class.\n+ * The feature id for the '<em><b>Parameters</b></em>' containment reference list.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n- * @see org.eclipse.iee.translator.jmole.math.math.impl.FloatImpl\n- * @see org.eclipse.iee.translator.jmole.math.math.impl.MathPackageImpl#getFloat()\n * @generated\n+ * @ordered\n */\n- int FLOAT = 17;\n+ int MATRIX_ELEMENT__PARAMETERS = EXPRESSION__PARAMETERS;\n \n /**\n- * The feature id for the '<em><b>Name</b></em>' attribute.\n+ * The feature id for the '<em><b>Element</b></em>' attribute.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n * @ordered\n */\n- int FLOAT__NAME = EXPRESSION__NAME;\n+ int MATRIX_ELEMENT__ELEMENT = EXPRESSION_FEATURE_COUNT + 0;\n \n /**\n- * The feature id for the '<em><b>Parameters</b></em>' containment reference list.\n+ * The feature id for the '<em><b>Row</b></em>' attribute.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n * @ordered\n */\n- int FLOAT__PARAMETERS = EXPRESSION__PARAMETERS;\n+ int MATRIX_ELEMENT__ROW = EXPRESSION_FEATURE_COUNT + 1;\n \n /**\n- * The feature id for the '<em><b>Value</b></em>' attribute.\n+ * The feature id for the '<em><b>Column</b></em>' attribute.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n * @ordered\n */\n- int FLOAT__VALUE = EXPRESSION_FEATURE_COUNT + 0;\n+ int MATRIX_ELEMENT__COLUMN = EXPRESSION_FEATURE_COUNT + 2;\n \n /**\n- * The number of structural features of the '<em>Float</em>' class.\n+ * The number of structural features of the '<em>Matrix Element</em>' class.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n * @ordered\n */\n- int FLOAT_FEATURE_COUNT = EXPRESSION_FEATURE_COUNT + 1;\n+ int MATRIX_ELEMENT_FEATURE_COUNT = EXPRESSION_FEATURE_COUNT + 3;\n \n /**\n * The meta object id for the '{@link org.eclipse.iee.translator.jmole.math.math.impl.FunctionImpl <em>Function</em>}' class.\n@@ -905,7 +980,7 @@ public interface MathPackage extends EPackage\n * @see org.eclipse.iee.translator.jmole.math.math.impl.MathPackageImpl#getFunction()\n * @generated\n */\n- int FUNCTION = 18;\n+ int FUNCTION = 21;\n \n /**\n * The feature id for the '<em><b>Name</b></em>' attribute.\n@@ -943,212 +1018,384 @@ public interface MathPackage extends EPackage\n */\n int FUNCTION_FEATURE_COUNT = EXPRESSION_FEATURE_COUNT + 1;\n \n-\n /**\n- * Returns the meta object for class '{@link org.eclipse.iee.translator.jmole.math.math.Statement <em>Statement</em>}'.\n+ * The meta object id for the '{@link org.eclipse.iee.translator.jmole.math.math.impl.MatrixAdditionImpl <em>Matrix Addition</em>}' class.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n- * @return the meta object for class '<em>Statement</em>'.\n- * @see org.eclipse.iee.translator.jmole.math.math.Statement\n+ * @see org.eclipse.iee.translator.jmole.math.math.impl.MatrixAdditionImpl\n+ * @see org.eclipse.iee.translator.jmole.math.math.impl.MathPackageImpl#getMatrixAddition()\n * @generated\n */\n- EClass getStatement();\n+ int MATRIX_ADDITION = 22;\n \n /**\n- * Returns the meta object for the containment reference '{@link org.eclipse.iee.translator.jmole.math.math.Statement#getFunctionDefinition <em>Function Definition</em>}'.\n+ * The feature id for the '<em><b>Left</b></em>' containment reference.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n- * @return the meta object for the containment reference '<em>Function Definition</em>'.\n- * @see org.eclipse.iee.translator.jmole.math.math.Statement#getFunctionDefinition()\n- * @see #getStatement()\n * @generated\n+ * @ordered\n */\n- EReference getStatement_FunctionDefinition();\n+ int MATRIX_ADDITION__LEFT = MATRIX_EXPRESSION_FEATURE_COUNT + 0;\n \n /**\n- * Returns the meta object for the containment reference '{@link org.eclipse.iee.translator.jmole.math.math.Statement#getMatrixDefinition <em>Matrix Definition</em>}'.\n+ * The feature id for the '<em><b>Right</b></em>' containment reference.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n- * @return the meta object for the containment reference '<em>Matrix Definition</em>'.\n- * @see org.eclipse.iee.translator.jmole.math.math.Statement#getMatrixDefinition()\n- * @see #getStatement()\n * @generated\n+ * @ordered\n */\n- EReference getStatement_MatrixDefinition();\n+ int MATRIX_ADDITION__RIGHT = MATRIX_EXPRESSION_FEATURE_COUNT + 1;\n \n /**\n- * Returns the meta object for the containment reference '{@link org.eclipse.iee.translator.jmole.math.math.Statement#getAssignment <em>Assignment</em>}'.\n+ * The number of structural features of the '<em>Matrix Addition</em>' class.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n- * @return the meta object for the containment reference '<em>Assignment</em>'.\n- * @see org.eclipse.iee.translator.jmole.math.math.Statement#getAssignment()\n- * @see #getStatement()\n * @generated\n+ * @ordered\n */\n- EReference getStatement_Assignment();\n+ int MATRIX_ADDITION_FEATURE_COUNT = MATRIX_EXPRESSION_FEATURE_COUNT + 2;\n \n /**\n- * Returns the meta object for the containment reference '{@link org.eclipse.iee.translator.jmole.math.math.Statement#getFormula <em>Formula</em>}'.\n+ * The meta object id for the '{@link org.eclipse.iee.translator.jmole.math.math.impl.MatrixSubtractionImpl <em>Matrix Subtraction</em>}' class.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n- * @return the meta object for the containment reference '<em>Formula</em>'.\n- * @see org.eclipse.iee.translator.jmole.math.math.Statement#getFormula()\n- * @see #getStatement()\n+ * @see org.eclipse.iee.translator.jmole.math.math.impl.MatrixSubtractionImpl\n+ * @see org.eclipse.iee.translator.jmole.math.math.impl.MathPackageImpl#getMatrixSubtraction()\n * @generated\n */\n- EReference getStatement_Formula();\n+ int MATRIX_SUBTRACTION = 23;\n \n /**\n- * Returns the meta object for class '{@link org.eclipse.iee.translator.jmole.math.math.Assignment <em>Assignment</em>}'.\n+ * The feature id for the '<em><b>Left</b></em>' containment reference.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n- * @return the meta object for class '<em>Assignment</em>'.\n- * @see org.eclipse.iee.translator.jmole.math.math.Assignment\n * @generated\n+ * @ordered\n */\n- EClass getAssignment();\n+ int MATRIX_SUBTRACTION__LEFT = MATRIX_EXPRESSION_FEATURE_COUNT + 0;\n \n /**\n- * Returns the meta object for the attribute '{@link org.eclipse.iee.translator.jmole.math.math.Assignment#getVariable <em>Variable</em>}'.\n+ * The feature id for the '<em><b>Right</b></em>' containment reference.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n- * @return the meta object for the attribute '<em>Variable</em>'.\n- * @see org.eclipse.iee.translator.jmole.math.math.Assignment#getVariable()\n- * @see #getAssignment()\n * @generated\n+ * @ordered\n */\n- EAttribute getAssignment_Variable();\n+ int MATRIX_SUBTRACTION__RIGHT = MATRIX_EXPRESSION_FEATURE_COUNT + 1;\n \n /**\n- * Returns the meta object for the containment reference '{@link org.eclipse.iee.translator.jmole.math.math.Assignment#getValue <em>Value</em>}'.\n+ * The number of structural features of the '<em>Matrix Subtraction</em>' class.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n- * @return the meta object for the containment reference '<em>Value</em>'.\n- * @see org.eclipse.iee.translator.jmole.math.math.Assignment#getValue()\n- * @see #getAssignment()\n * @generated\n+ * @ordered\n */\n- EReference getAssignment_Value();\n+ int MATRIX_SUBTRACTION_FEATURE_COUNT = MATRIX_EXPRESSION_FEATURE_COUNT + 2;\n \n /**\n- * Returns the meta object for class '{@link org.eclipse.iee.translator.jmole.math.math.Formula <em>Formula</em>}'.\n+ * The meta object id for the '{@link org.eclipse.iee.translator.jmole.math.math.impl.MatrixMultiplicationImpl <em>Matrix Multiplication</em>}' class.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n- * @return the meta object for class '<em>Formula</em>'.\n- * @see org.eclipse.iee.translator.jmole.math.math.Formula\n+ * @see org.eclipse.iee.translator.jmole.math.math.impl.MatrixMultiplicationImpl\n+ * @see org.eclipse.iee.translator.jmole.math.math.impl.MathPackageImpl#getMatrixMultiplication()\n * @generated\n */\n- EClass getFormula();\n+ int MATRIX_MULTIPLICATION = 24;\n \n /**\n- * Returns the meta object for the containment reference '{@link org.eclipse.iee.translator.jmole.math.math.Formula#getExpression <em>Expression</em>}'.\n+ * The feature id for the '<em><b>Left</b></em>' containment reference.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n- * @return the meta object for the containment reference '<em>Expression</em>'.\n- * @see org.eclipse.iee.translator.jmole.math.math.Formula#getExpression()\n- * @see #getFormula()\n * @generated\n+ * @ordered\n */\n- EReference getFormula_Expression();\n+ int MATRIX_MULTIPLICATION__LEFT = MATRIX_EXPRESSION_FEATURE_COUNT + 0;\n \n /**\n- * Returns the meta object for class '{@link org.eclipse.iee.translator.jmole.math.math.Expression <em>Expression</em>}'.\n+ * The feature id for the '<em><b>Right Matrix</b></em>' containment reference.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n- * @return the meta object for class '<em>Expression</em>'.\n- * @see org.eclipse.iee.translator.jmole.math.math.Expression\n * @generated\n+ * @ordered\n */\n- EClass getExpression();\n+ int MATRIX_MULTIPLICATION__RIGHT_MATRIX = MATRIX_EXPRESSION_FEATURE_COUNT + 1;\n \n /**\n- * Returns the meta object for the attribute '{@link org.eclipse.iee.translator.jmole.math.math.Expression#getName <em>Name</em>}'.\n+ * The feature id for the '<em><b>Right Scalar</b></em>' containment reference.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n- * @return the meta object for the attribute '<em>Name</em>'.\n- * @see org.eclipse.iee.translator.jmole.math.math.Expression#getName()\n- * @see #getExpression()\n * @generated\n+ * @ordered\n */\n- EAttribute getExpression_Name();\n+ int MATRIX_MULTIPLICATION__RIGHT_SCALAR = MATRIX_EXPRESSION_FEATURE_COUNT + 2;\n \n /**\n- * Returns the meta object for the containment reference list '{@link org.eclipse.iee.translator.jmole.math.math.Expression#getParameters <em>Parameters</em>}'.\n+ * The number of structural features of the '<em>Matrix Multiplication</em>' class.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n- * @return the meta object for the containment reference list '<em>Parameters</em>'.\n- * @see org.eclipse.iee.translator.jmole.math.math.Expression#getParameters()\n- * @see #getExpression()\n * @generated\n+ * @ordered\n */\n- EReference getExpression_Parameters();\n+ int MATRIX_MULTIPLICATION_FEATURE_COUNT = MATRIX_EXPRESSION_FEATURE_COUNT + 3;\n \n /**\n- * Returns the meta object for class '{@link org.eclipse.iee.translator.jmole.math.math.FunctionDefinition <em>Function Definition</em>}'.\n+ * The meta object id for the '{@link org.eclipse.iee.translator.jmole.math.math.impl.NewMatrixImpl <em>New Matrix</em>}' class.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n- * @return the meta object for class '<em>Function Definition</em>'.\n- * @see org.eclipse.iee.translator.jmole.math.math.FunctionDefinition\n+ * @see org.eclipse.iee.translator.jmole.math.math.impl.NewMatrixImpl\n+ * @see org.eclipse.iee.translator.jmole.math.math.impl.MathPackageImpl#getNewMatrix()\n * @generated\n */\n- EClass getFunctionDefinition();\n+ int NEW_MATRIX = 25;\n \n /**\n- * Returns the meta object for the containment reference '{@link org.eclipse.iee.translator.jmole.math.math.FunctionDefinition#getFunction <em>Function</em>}'.\n+ * The feature id for the '<em><b>Matrix</b></em>' containment reference.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n- * @return the meta object for the containment reference '<em>Function</em>'.\n- * @see org.eclipse.iee.translator.jmole.math.math.FunctionDefinition#getFunction()\n- * @see #getFunctionDefinition()\n * @generated\n+ * @ordered\n */\n- EReference getFunctionDefinition_Function();\n+ int NEW_MATRIX__MATRIX = MATRIX_EXPRESSION_FEATURE_COUNT + 0;\n \n /**\n- * Returns the meta object for the containment reference '{@link org.eclipse.iee.translator.jmole.math.math.FunctionDefinition#getFormula <em>Formula</em>}'.\n+ * The number of structural features of the '<em>New Matrix</em>' class.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n- * @return the meta object for the containment reference '<em>Formula</em>'.\n- * @see org.eclipse.iee.translator.jmole.math.math.FunctionDefinition#getFormula()\n- * @see #getFunctionDefinition()\n * @generated\n+ * @ordered\n */\n- EReference getFunctionDefinition_Formula();\n+ int NEW_MATRIX_FEATURE_COUNT = MATRIX_EXPRESSION_FEATURE_COUNT + 1;\n \n /**\n- * Returns the meta object for class '{@link org.eclipse.iee.translator.jmole.math.math.MatrixDefinition <em>Matrix Definition</em>}'.\n+ * The meta object id for the '{@link org.eclipse.iee.translator.jmole.math.math.impl.TransposeMatrixImpl <em>Transpose Matrix</em>}' class.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n- * @return the meta object for class '<em>Matrix Definition</em>'.\n- * @see org.eclipse.iee.translator.jmole.math.math.MatrixDefinition\n+ * @see org.eclipse.iee.translator.jmole.math.math.impl.TransposeMatrixImpl\n+ * @see org.eclipse.iee.translator.jmole.math.math.impl.MathPackageImpl#getTransposeMatrix()\n * @generated\n */\n- EClass getMatrixDefinition();\n+ int TRANSPOSE_MATRIX = 26;\n \n /**\n- * Returns the meta object for the attribute '{@link org.eclipse.iee.translator.jmole.math.math.MatrixDefinition#getName <em>Name</em>}'.\n+ * The feature id for the '<em><b>Name</b></em>' attribute.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n- * @return the meta object for the attribute '<em>Name</em>'.\n- * @see org.eclipse.iee.translator.jmole.math.math.MatrixDefinition#getName()\n- * @see #getMatrixDefinition()\n * @generated\n+ * @ordered\n */\n- EAttribute getMatrixDefinition_Name();\n+ int TRANSPOSE_MATRIX__NAME = MATRIX_EXPRESSION_FEATURE_COUNT + 0;\n \n /**\n- * Returns the meta object for the containment reference list '{@link org.eclipse.iee.translator.jmole.math.math.MatrixDefinition#getRows <em>Rows</em>}'.\n+ * The number of structural features of the '<em>Transpose Matrix</em>' class.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n- * @return the meta object for the containment reference list '<em>Rows</em>'.\n- * @see org.eclipse.iee.translator.jmole.math.math.MatrixDefinition#getRows()\n- * @see #getMatrixDefinition()\n * @generated\n+ * @ordered\n */\n- EReference getMatrixDefinition_Rows();\n+ int TRANSPOSE_MATRIX_FEATURE_COUNT = MATRIX_EXPRESSION_FEATURE_COUNT + 1;\n \n /**\n- * Returns the meta object for class '{@link org.eclipse.iee.translator.jmole.math.math.MatrixRow <em>Matrix Row</em>}'.\n+ * The meta object id for the '{@link org.eclipse.iee.translator.jmole.math.math.impl.MatrixVariableImpl <em>Matrix Variable</em>}' class.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @see org.eclipse.iee.translator.jmole.math.math.impl.MatrixVariableImpl\n+ * @see org.eclipse.iee.translator.jmole.math.math.impl.MathPackageImpl#getMatrixVariable()\n+ * @generated\n+ */\n+ int MATRIX_VARIABLE = 27;\n+\n+ /**\n+ * The feature id for the '<em><b>Name</b></em>' attribute.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ * @ordered\n+ */\n+ int MATRIX_VARIABLE__NAME = MATRIX_EXPRESSION_FEATURE_COUNT + 0;\n+\n+ /**\n+ * The number of structural features of the '<em>Matrix Variable</em>' class.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ * @ordered\n+ */\n+ int MATRIX_VARIABLE_FEATURE_COUNT = MATRIX_EXPRESSION_FEATURE_COUNT + 1;\n+\n+\n+ /**\n+ * Returns the meta object for class '{@link org.eclipse.iee.translator.jmole.math.math.Statement <em>Statement</em>}'.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @return the meta object for class '<em>Statement</em>'.\n+ * @see org.eclipse.iee.translator.jmole.math.math.Statement\n+ * @generated\n+ */\n+ EClass getStatement();\n+\n+ /**\n+ * Returns the meta object for the containment reference '{@link org.eclipse.iee.translator.jmole.math.math.Statement#getFunctionDefinition <em>Function Definition</em>}'.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @return the meta object for the containment reference '<em>Function Definition</em>'.\n+ * @see org.eclipse.iee.translator.jmole.math.math.Statement#getFunctionDefinition()\n+ * @see #getStatement()\n+ * @generated\n+ */\n+ EReference getStatement_FunctionDefinition();\n+\n+ /**\n+ * Returns the meta object for the containment reference '{@link org.eclipse.iee.translator.jmole.math.math.Statement#getVariableAssignment <em>Variable Assignment</em>}'.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @return the meta object for the containment reference '<em>Variable Assignment</em>'.\n+ * @see org.eclipse.iee.translator.jmole.math.math.Statement#getVariableAssignment()\n+ * @see #getStatement()\n+ * @generated\n+ */\n+ EReference getStatement_VariableAssignment();\n+\n+ /**\n+ * Returns the meta object for the containment reference '{@link org.eclipse.iee.translator.jmole.math.math.Statement#getFormula <em>Formula</em>}'.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @return the meta object for the containment reference '<em>Formula</em>'.\n+ * @see org.eclipse.iee.translator.jmole.math.math.Statement#getFormula()\n+ * @see #getStatement()\n+ * @generated\n+ */\n+ EReference getStatement_Formula();\n+\n+ /**\n+ * Returns the meta object for the containment reference '{@link org.eclipse.iee.translator.jmole.math.math.Statement#getMatrixAssignment <em>Matrix Assignment</em>}'.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @return the meta object for the containment reference '<em>Matrix Assignment</em>'.\n+ * @see org.eclipse.iee.translator.jmole.math.math.Statement#getMatrixAssignment()\n+ * @see #getStatement()\n+ * @generated\n+ */\n+ EReference getStatement_MatrixAssignment();\n+\n+ /**\n+ * Returns the meta object for the containment reference '{@link org.eclipse.iee.translator.jmole.math.math.Statement#getMatrixFormula <em>Matrix Formula</em>}'.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @return the meta object for the containment reference '<em>Matrix Formula</em>'.\n+ * @see org.eclipse.iee.translator.jmole.math.math.Statement#getMatrixFormula()\n+ * @see #getStatement()\n+ * @generated\n+ */\n+ EReference getStatement_MatrixFormula();\n+\n+ /**\n+ * Returns the meta object for class '{@link org.eclipse.iee.translator.jmole.math.math.VariableAssignment <em>Variable Assignment</em>}'.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @return the meta object for class '<em>Variable Assignment</em>'.\n+ * @see org.eclipse.iee.translator.jmole.math.math.VariableAssignment\n+ * @generated\n+ */\n+ EClass getVariableAssignment();\n+\n+ /**\n+ * Returns the meta object for the attribute '{@link org.eclipse.iee.translator.jmole.math.math.VariableAssignment#getVariable <em>Variable</em>}'.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @return the meta object for the attribute '<em>Variable</em>'.\n+ * @see org.eclipse.iee.translator.jmole.math.math.VariableAssignment#getVariable()\n+ * @see #getVariableAssignment()\n+ * @generated\n+ */\n+ EAttribute getVariableAssignment_Variable();\n+\n+ /**\n+ * Returns the meta object for the containment reference '{@link org.eclipse.iee.translator.jmole.math.math.VariableAssignment#getValue <em>Value</em>}'.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @return the meta object for the containment reference '<em>Value</em>'.\n+ * @see org.eclipse.iee.translator.jmole.math.math.VariableAssignment#getValue()\n+ * @see #getVariableAssignment()\n+ * @generated\n+ */\n+ EReference getVariableAssignment_Value();\n+\n+ /**\n+ * Returns the meta object for class '{@link org.eclipse.iee.translator.jmole.math.math.Formula <em>Formula</em>}'.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @return the meta object for class '<em>Formula</em>'.\n+ * @see org.eclipse.iee.translator.jmole.math.math.Formula\n+ * @generated\n+ */\n+ EClass getFormula();\n+\n+ /**\n+ * Returns the meta object for the containment reference '{@link org.eclipse.iee.translator.jmole.math.math.Formula#getExpression <em>Expression</em>}'.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @return the meta object for the containment reference '<em>Expression</em>'.\n+ * @see org.eclipse.iee.translator.jmole.math.math.Formula#getExpression()\n+ * @see #getFormula()\n+ * @generated\n+ */\n+ EReference getFormula_Expression();\n+\n+ /**\n+ * Returns the meta object for class '{@link org.eclipse.iee.translator.jmole.math.math.Expression <em>Expression</em>}'.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @return the meta object for class '<em>Expression</em>'.\n+ * @see org.eclipse.iee.translator.jmole.math.math.Expression\n+ * @generated\n+ */\n+ EClass getExpression();\n+\n+ /**\n+ * Returns the meta object for the attribute '{@link org.eclipse.iee.translator.jmole.math.math.Expression#getName <em>Name</em>}'.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @return the meta object for the attribute '<em>Name</em>'.\n+ * @see org.eclipse.iee.translator.jmole.math.math.Expression#getName()\n+ * @see #getExpression()\n+ * @generated\n+ */\n+ EAttribute getExpression_Name();\n+\n+ /**\n+ * Returns the meta object for the containment reference list '{@link org.eclipse.iee.translator.jmole.math.math.Expression#getParameters <em>Parameters</em>}'.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @return the meta object for the containment reference list '<em>Parameters</em>'.\n+ * @see org.eclipse.iee.translator.jmole.math.math.Expression#getParameters()\n+ * @see #getExpression()\n+ * @generated\n+ */\n+ EReference getExpression_Parameters();\n+\n+ /**\n+ * Returns the meta object for class '{@link org.eclipse.iee.translator.jmole.math.math.Matrix <em>Matrix</em>}'.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @return the meta object for class '<em>Matrix</em>'.\n+ * @see org.eclipse.iee.translator.jmole.math.math.Matrix\n+ * @generated\n+ */\n+ EClass getMatrix();\n+\n+ /**\n+ * Returns the meta object for the containment reference list '{@link org.eclipse.iee.translator.jmole.math.math.Matrix#getRows <em>Rows</em>}'.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @return the meta object for the containment reference list '<em>Rows</em>'.\n+ * @see org.eclipse.iee.translator.jmole.math.math.Matrix#getRows()\n+ * @see #getMatrix()\n+ * @generated\n+ */\n+ EReference getMatrix_Rows();\n+\n+ /**\n+ * Returns the meta object for class '{@link org.eclipse.iee.translator.jmole.math.math.MatrixRow <em>Matrix Row</em>}'.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @return the meta object for class '<em>Matrix Row</em>'.\n@@ -1168,6 +1415,101 @@ public interface MathPackage extends EPackage\n */\n EAttribute getMatrixRow_Elements();\n \n+ /**\n+ * Returns the meta object for class '{@link org.eclipse.iee.translator.jmole.math.math.MatrixAssignment <em>Matrix Assignment</em>}'.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @return the meta object for class '<em>Matrix Assignment</em>'.\n+ * @see org.eclipse.iee.translator.jmole.math.math.MatrixAssignment\n+ * @generated\n+ */\n+ EClass getMatrixAssignment();\n+\n+ /**\n+ * Returns the meta object for the attribute '{@link org.eclipse.iee.translator.jmole.math.math.MatrixAssignment#getVariable <em>Variable</em>}'.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @return the meta object for the attribute '<em>Variable</em>'.\n+ * @see org.eclipse.iee.translator.jmole.math.math.MatrixAssignment#getVariable()\n+ * @see #getMatrixAssignment()\n+ * @generated\n+ */\n+ EAttribute getMatrixAssignment_Variable();\n+\n+ /**\n+ * Returns the meta object for the containment reference '{@link org.eclipse.iee.translator.jmole.math.math.MatrixAssignment#getValue <em>Value</em>}'.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @return the meta object for the containment reference '<em>Value</em>'.\n+ * @see org.eclipse.iee.translator.jmole.math.math.MatrixAssignment#getValue()\n+ * @see #getMatrixAssignment()\n+ * @generated\n+ */\n+ EReference getMatrixAssignment_Value();\n+\n+ /**\n+ * Returns the meta object for class '{@link org.eclipse.iee.translator.jmole.math.math.MatrixFormula <em>Matrix Formula</em>}'.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @return the meta object for class '<em>Matrix Formula</em>'.\n+ * @see org.eclipse.iee.translator.jmole.math.math.MatrixFormula\n+ * @generated\n+ */\n+ EClass getMatrixFormula();\n+\n+ /**\n+ * Returns the meta object for the containment reference '{@link org.eclipse.iee.translator.jmole.math.math.MatrixFormula#getExpression <em>Expression</em>}'.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @return the meta object for the containment reference '<em>Expression</em>'.\n+ * @see org.eclipse.iee.translator.jmole.math.math.MatrixFormula#getExpression()\n+ * @see #getMatrixFormula()\n+ * @generated\n+ */\n+ EReference getMatrixFormula_Expression();\n+\n+ /**\n+ * Returns the meta object for class '{@link org.eclipse.iee.translator.jmole.math.math.MatrixExpression <em>Matrix Expression</em>}'.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @return the meta object for class '<em>Matrix Expression</em>'.\n+ * @see org.eclipse.iee.translator.jmole.math.math.MatrixExpression\n+ * @generated\n+ */\n+ EClass getMatrixExpression();\n+\n+ /**\n+ * Returns the meta object for class '{@link org.eclipse.iee.translator.jmole.math.math.FunctionDefinition <em>Function Definition</em>}'.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @return the meta object for class '<em>Function Definition</em>'.\n+ * @see org.eclipse.iee.translator.jmole.math.math.FunctionDefinition\n+ * @generated\n+ */\n+ EClass getFunctionDefinition();\n+\n+ /**\n+ * Returns the meta object for the containment reference '{@link org.eclipse.iee.translator.jmole.math.math.FunctionDefinition#getFunction <em>Function</em>}'.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @return the meta object for the containment reference '<em>Function</em>'.\n+ * @see org.eclipse.iee.translator.jmole.math.math.FunctionDefinition#getFunction()\n+ * @see #getFunctionDefinition()\n+ * @generated\n+ */\n+ EReference getFunctionDefinition_Function();\n+\n+ /**\n+ * Returns the meta object for the containment reference '{@link org.eclipse.iee.translator.jmole.math.math.FunctionDefinition#getFormula <em>Formula</em>}'.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @return the meta object for the containment reference '<em>Formula</em>'.\n+ * @see org.eclipse.iee.translator.jmole.math.math.FunctionDefinition#getFormula()\n+ * @see #getFunctionDefinition()\n+ * @generated\n+ */\n+ EReference getFunctionDefinition_Formula();\n+\n /**\n * Returns the meta object for class '{@link org.eclipse.iee.translator.jmole.math.math.Addition <em>Addition</em>}'.\n * <!-- begin-user-doc -->\n@@ -1371,142 +1713,301 @@ public interface MathPackage extends EPackage\n EReference getFactorial_Expression();\n \n /**\n- * Returns the meta object for class '{@link org.eclipse.iee.translator.jmole.math.math.Interval <em>Interval</em>}'.\n+ * Returns the meta object for class '{@link org.eclipse.iee.translator.jmole.math.math.Exponent <em>Exponent</em>}'.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @return the meta object for class '<em>Exponent</em>'.\n+ * @see org.eclipse.iee.translator.jmole.math.math.Exponent\n+ * @generated\n+ */\n+ EClass getExponent();\n+\n+ /**\n+ * Returns the meta object for the containment reference '{@link org.eclipse.iee.translator.jmole.math.math.Exponent#getLeft <em>Left</em>}'.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @return the meta object for the containment reference '<em>Left</em>'.\n+ * @see org.eclipse.iee.translator.jmole.math.math.Exponent#getLeft()\n+ * @see #getExponent()\n+ * @generated\n+ */\n+ EReference getExponent_Left();\n+\n+ /**\n+ * Returns the meta object for the containment reference '{@link org.eclipse.iee.translator.jmole.math.math.Exponent#getRight <em>Right</em>}'.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @return the meta object for the containment reference '<em>Right</em>'.\n+ * @see org.eclipse.iee.translator.jmole.math.math.Exponent#getRight()\n+ * @see #getExponent()\n+ * @generated\n+ */\n+ EReference getExponent_Right();\n+\n+ /**\n+ * Returns the meta object for class '{@link org.eclipse.iee.translator.jmole.math.math.Variable <em>Variable</em>}'.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @return the meta object for class '<em>Variable</em>'.\n+ * @see org.eclipse.iee.translator.jmole.math.math.Variable\n+ * @generated\n+ */\n+ EClass getVariable();\n+\n+ /**\n+ * Returns the meta object for class '{@link org.eclipse.iee.translator.jmole.math.math.Float <em>Float</em>}'.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @return the meta object for class '<em>Float</em>'.\n+ * @see org.eclipse.iee.translator.jmole.math.math.Float\n+ * @generated\n+ */\n+ EClass getFloat();\n+\n+ /**\n+ * Returns the meta object for the attribute '{@link org.eclipse.iee.translator.jmole.math.math.Float#getValue <em>Value</em>}'.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @return the meta object for the attribute '<em>Value</em>'.\n+ * @see org.eclipse.iee.translator.jmole.math.math.Float#getValue()\n+ * @see #getFloat()\n+ * @generated\n+ */\n+ EAttribute getFloat_Value();\n+\n+ /**\n+ * Returns the meta object for class '{@link org.eclipse.iee.translator.jmole.math.math.MatrixElement <em>Matrix Element</em>}'.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @return the meta object for class '<em>Matrix Element</em>'.\n+ * @see org.eclipse.iee.translator.jmole.math.math.MatrixElement\n+ * @generated\n+ */\n+ EClass getMatrixElement();\n+\n+ /**\n+ * Returns the meta object for the attribute '{@link org.eclipse.iee.translator.jmole.math.math.MatrixElement#getElement <em>Element</em>}'.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @return the meta object for the attribute '<em>Element</em>'.\n+ * @see org.eclipse.iee.translator.jmole.math.math.MatrixElement#getElement()\n+ * @see #getMatrixElement()\n+ * @generated\n+ */\n+ EAttribute getMatrixElement_Element();\n+\n+ /**\n+ * Returns the meta object for the attribute '{@link org.eclipse.iee.translator.jmole.math.math.MatrixElement#getRow <em>Row</em>}'.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @return the meta object for the attribute '<em>Row</em>'.\n+ * @see org.eclipse.iee.translator.jmole.math.math.MatrixElement#getRow()\n+ * @see #getMatrixElement()\n+ * @generated\n+ */\n+ EAttribute getMatrixElement_Row();\n+\n+ /**\n+ * Returns the meta object for the attribute '{@link org.eclipse.iee.translator.jmole.math.math.MatrixElement#getColumn <em>Column</em>}'.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @return the meta object for the attribute '<em>Column</em>'.\n+ * @see org.eclipse.iee.translator.jmole.math.math.MatrixElement#getColumn()\n+ * @see #getMatrixElement()\n+ * @generated\n+ */\n+ EAttribute getMatrixElement_Column();\n+\n+ /**\n+ * Returns the meta object for class '{@link org.eclipse.iee.translator.jmole.math.math.Function <em>Function</em>}'.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @return the meta object for class '<em>Function</em>'.\n+ * @see org.eclipse.iee.translator.jmole.math.math.Function\n+ * @generated\n+ */\n+ EClass getFunction();\n+\n+ /**\n+ * Returns the meta object for the containment reference '{@link org.eclipse.iee.translator.jmole.math.math.Function#getFunction <em>Function</em>}'.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @return the meta object for the containment reference '<em>Function</em>'.\n+ * @see org.eclipse.iee.translator.jmole.math.math.Function#getFunction()\n+ * @see #getFunction()\n+ * @generated\n+ */\n+ EReference getFunction_Function();\n+\n+ /**\n+ * Returns the meta object for class '{@link org.eclipse.iee.translator.jmole.math.math.MatrixAddition <em>Matrix Addition</em>}'.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @return the meta object for class '<em>Matrix Addition</em>'.\n+ * @see org.eclipse.iee.translator.jmole.math.math.MatrixAddition\n+ * @generated\n+ */\n+ EClass getMatrixAddition();\n+\n+ /**\n+ * Returns the meta object for the containment reference '{@link org.eclipse.iee.translator.jmole.math.math.MatrixAddition#getLeft <em>Left</em>}'.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @return the meta object for the containment reference '<em>Left</em>'.\n+ * @see org.eclipse.iee.translator.jmole.math.math.MatrixAddition#getLeft()\n+ * @see #getMatrixAddition()\n+ * @generated\n+ */\n+ EReference getMatrixAddition_Left();\n+\n+ /**\n+ * Returns the meta object for the containment reference '{@link org.eclipse.iee.translator.jmole.math.math.MatrixAddition#getRight <em>Right</em>}'.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @return the meta object for the containment reference '<em>Right</em>'.\n+ * @see org.eclipse.iee.translator.jmole.math.math.MatrixAddition#getRight()\n+ * @see #getMatrixAddition()\n+ * @generated\n+ */\n+ EReference getMatrixAddition_Right();\n+\n+ /**\n+ * Returns the meta object for class '{@link org.eclipse.iee.translator.jmole.math.math.MatrixSubtraction <em>Matrix Subtraction</em>}'.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n- * @return the meta object for class '<em>Interval</em>'.\n- * @see org.eclipse.iee.translator.jmole.math.math.Interval\n+ * @return the meta object for class '<em>Matrix Subtraction</em>'.\n+ * @see org.eclipse.iee.translator.jmole.math.math.MatrixSubtraction\n * @generated\n */\n- EClass getInterval();\n+ EClass getMatrixSubtraction();\n \n /**\n- * Returns the meta object for the attribute '{@link org.eclipse.iee.translator.jmole.math.math.Interval#getOpeningBracket <em>Opening Bracket</em>}'.\n+ * Returns the meta object for the containment reference '{@link org.eclipse.iee.translator.jmole.math.math.MatrixSubtraction#getLeft <em>Left</em>}'.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n- * @return the meta object for the attribute '<em>Opening Bracket</em>'.\n- * @see org.eclipse.iee.translator.jmole.math.math.Interval#getOpeningBracket()\n- * @see #getInterval()\n+ * @return the meta object for the containment reference '<em>Left</em>'.\n+ * @see org.eclipse.iee.translator.jmole.math.math.MatrixSubtraction#getLeft()\n+ * @see #getMatrixSubtraction()\n * @generated\n */\n- EAttribute getInterval_OpeningBracket();\n+ EReference getMatrixSubtraction_Left();\n \n /**\n- * Returns the meta object for the containment reference '{@link org.eclipse.iee.translator.jmole.math.math.Interval#getCeil <em>Ceil</em>}'.\n+ * Returns the meta object for the containment reference '{@link org.eclipse.iee.translator.jmole.math.math.MatrixSubtraction#getRight <em>Right</em>}'.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n- * @return the meta object for the containment reference '<em>Ceil</em>'.\n- * @see org.eclipse.iee.translator.jmole.math.math.Interval#getCeil()\n- * @see #getInterval()\n+ * @return the meta object for the containment reference '<em>Right</em>'.\n+ * @see org.eclipse.iee.translator.jmole.math.math.MatrixSubtraction#getRight()\n+ * @see #getMatrixSubtraction()\n * @generated\n */\n- EReference getInterval_Ceil();\n+ EReference getMatrixSubtraction_Right();\n \n /**\n- * Returns the meta object for the containment reference '{@link org.eclipse.iee.translator.jmole.math.math.Interval#getFloor <em>Floor</em>}'.\n+ * Returns the meta object for class '{@link org.eclipse.iee.translator.jmole.math.math.MatrixMultiplication <em>Matrix Multiplication</em>}'.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n- * @return the meta object for the containment reference '<em>Floor</em>'.\n- * @see org.eclipse.iee.translator.jmole.math.math.Interval#getFloor()\n- * @see #getInterval()\n+ * @return the meta object for class '<em>Matrix Multiplication</em>'.\n+ * @see org.eclipse.iee.translator.jmole.math.math.MatrixMultiplication\n * @generated\n */\n- EReference getInterval_Floor();\n+ EClass getMatrixMultiplication();\n \n /**\n- * Returns the meta object for the attribute '{@link org.eclipse.iee.translator.jmole.math.math.Interval#getClosingBracket <em>Closing Bracket</em>}'.\n+ * Returns the meta object for the containment reference '{@link org.eclipse.iee.translator.jmole.math.math.MatrixMultiplication#getLeft <em>Left</em>}'.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n- * @return the meta object for the attribute '<em>Closing Bracket</em>'.\n- * @see org.eclipse.iee.translator.jmole.math.math.Interval#getClosingBracket()\n- * @see #getInterval()\n+ * @return the meta object for the containment reference '<em>Left</em>'.\n+ * @see org.eclipse.iee.translator.jmole.math.math.MatrixMultiplication#getLeft()\n+ * @see #getMatrixMultiplication()\n * @generated\n */\n- EAttribute getInterval_ClosingBracket();\n+ EReference getMatrixMultiplication_Left();\n \n /**\n- * Returns the meta object for class '{@link org.eclipse.iee.translator.jmole.math.math.Exponent <em>Exponent</em>}'.\n+ * Returns the meta object for the containment reference '{@link org.eclipse.iee.translator.jmole.math.math.MatrixMultiplication#getRightMatrix <em>Right Matrix</em>}'.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n- * @return the meta object for class '<em>Exponent</em>'.\n- * @see org.eclipse.iee.translator.jmole.math.math.Exponent\n+ * @return the meta object for the containment reference '<em>Right Matrix</em>'.\n+ * @see org.eclipse.iee.translator.jmole.math.math.MatrixMultiplication#getRightMatrix()\n+ * @see #getMatrixMultiplication()\n * @generated\n */\n- EClass getExponent();\n+ EReference getMatrixMultiplication_RightMatrix();\n \n /**\n- * Returns the meta object for the containment reference '{@link org.eclipse.iee.translator.jmole.math.math.Exponent#getLeft <em>Left</em>}'.\n+ * Returns the meta object for the containment reference '{@link org.eclipse.iee.translator.jmole.math.math.MatrixMultiplication#getRightScalar <em>Right Scalar</em>}'.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n- * @return the meta object for the containment reference '<em>Left</em>'.\n- * @see org.eclipse.iee.translator.jmole.math.math.Exponent#getLeft()\n- * @see #getExponent()\n+ * @return the meta object for the containment reference '<em>Right Scalar</em>'.\n+ * @see org.eclipse.iee.translator.jmole.math.math.MatrixMultiplication#getRightScalar()\n+ * @see #getMatrixMultiplication()\n * @generated\n */\n- EReference getExponent_Left();\n+ EReference getMatrixMultiplication_RightScalar();\n \n /**\n- * Returns the meta object for the containment reference '{@link org.eclipse.iee.translator.jmole.math.math.Exponent#getRight <em>Right</em>}'.\n+ * Returns the meta object for class '{@link org.eclipse.iee.translator.jmole.math.math.NewMatrix <em>New Matrix</em>}'.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n- * @return the meta object for the containment reference '<em>Right</em>'.\n- * @see org.eclipse.iee.translator.jmole.math.math.Exponent#getRight()\n- * @see #getExponent()\n+ * @return the meta object for class '<em>New Matrix</em>'.\n+ * @see org.eclipse.iee.translator.jmole.math.math.NewMatrix\n * @generated\n */\n- EReference getExponent_Right();\n+ EClass getNewMatrix();\n \n /**\n- * Returns the meta object for class '{@link org.eclipse.iee.translator.jmole.math.math.Variable <em>Variable</em>}'.\n+ * Returns the meta object for the containment reference '{@link org.eclipse.iee.translator.jmole.math.math.NewMatrix#getMatrix <em>Matrix</em>}'.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n- * @return the meta object for class '<em>Variable</em>'.\n- * @see org.eclipse.iee.translator.jmole.math.math.Variable\n+ * @return the meta object for the containment reference '<em>Matrix</em>'.\n+ * @see org.eclipse.iee.translator.jmole.math.math.NewMatrix#getMatrix()\n+ * @see #getNewMatrix()\n * @generated\n */\n- EClass getVariable();\n+ EReference getNewMatrix_Matrix();\n \n /**\n- * Returns the meta object for class '{@link org.eclipse.iee.translator.jmole.math.math.Float <em>Float</em>}'.\n+ * Returns the meta object for class '{@link org.eclipse.iee.translator.jmole.math.math.TransposeMatrix <em>Transpose Matrix</em>}'.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n- * @return the meta object for class '<em>Float</em>'.\n- * @see org.eclipse.iee.translator.jmole.math.math.Float\n+ * @return the meta object for class '<em>Transpose Matrix</em>'.\n+ * @see org.eclipse.iee.translator.jmole.math.math.TransposeMatrix\n * @generated\n */\n- EClass getFloat();\n+ EClass getTransposeMatrix();\n \n /**\n- * Returns the meta object for the attribute '{@link org.eclipse.iee.translator.jmole.math.math.Float#getValue <em>Value</em>}'.\n+ * Returns the meta object for the attribute '{@link org.eclipse.iee.translator.jmole.math.math.TransposeMatrix#getName <em>Name</em>}'.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n- * @return the meta object for the attribute '<em>Value</em>'.\n- * @see org.eclipse.iee.translator.jmole.math.math.Float#getValue()\n- * @see #getFloat()\n+ * @return the meta object for the attribute '<em>Name</em>'.\n+ * @see org.eclipse.iee.translator.jmole.math.math.TransposeMatrix#getName()\n+ * @see #getTransposeMatrix()\n * @generated\n */\n- EAttribute getFloat_Value();\n+ EAttribute getTransposeMatrix_Name();\n \n /**\n- * Returns the meta object for class '{@link org.eclipse.iee.translator.jmole.math.math.Function <em>Function</em>}'.\n+ * Returns the meta object for class '{@link org.eclipse.iee.translator.jmole.math.math.MatrixVariable <em>Matrix Variable</em>}'.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n- * @return the meta object for class '<em>Function</em>'.\n- * @see org.eclipse.iee.translator.jmole.math.math.Function\n+ * @return the meta object for class '<em>Matrix Variable</em>'.\n+ * @see org.eclipse.iee.translator.jmole.math.math.MatrixVariable\n * @generated\n */\n- EClass getFunction();\n+ EClass getMatrixVariable();\n \n /**\n- * Returns the meta object for the containment reference '{@link org.eclipse.iee.translator.jmole.math.math.Function#getFunction <em>Function</em>}'.\n+ * Returns the meta object for the attribute '{@link org.eclipse.iee.translator.jmole.math.math.MatrixVariable#getName <em>Name</em>}'.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n- * @return the meta object for the containment reference '<em>Function</em>'.\n- * @see org.eclipse.iee.translator.jmole.math.math.Function#getFunction()\n- * @see #getFunction()\n+ * @return the meta object for the attribute '<em>Name</em>'.\n+ * @see org.eclipse.iee.translator.jmole.math.math.MatrixVariable#getName()\n+ * @see #getMatrixVariable()\n * @generated\n */\n- EReference getFunction_Function();\n+ EAttribute getMatrixVariable_Name();\n \n /**\n * Returns the factory that creates the instances of the model.\n@@ -1550,54 +2051,62 @@ interface Literals\n EReference STATEMENT__FUNCTION_DEFINITION = eINSTANCE.getStatement_FunctionDefinition();\n \n /**\n- * The meta object literal for the '<em><b>Matrix Definition</b></em>' containment reference feature.\n+ * The meta object literal for the '<em><b>Variable Assignment</b></em>' containment reference feature.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n- EReference STATEMENT__MATRIX_DEFINITION = eINSTANCE.getStatement_MatrixDefinition();\n+ EReference STATEMENT__VARIABLE_ASSIGNMENT = eINSTANCE.getStatement_VariableAssignment();\n \n /**\n- * The meta object literal for the '<em><b>Assignment</b></em>' containment reference feature.\n+ * The meta object literal for the '<em><b>Formula</b></em>' containment reference feature.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n- EReference STATEMENT__ASSIGNMENT = eINSTANCE.getStatement_Assignment();\n+ EReference STATEMENT__FORMULA = eINSTANCE.getStatement_Formula();\n \n /**\n- * The meta object literal for the '<em><b>Formula</b></em>' containment reference feature.\n+ * The meta object literal for the '<em><b>Matrix Assignment</b></em>' containment reference feature.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n- EReference STATEMENT__FORMULA = eINSTANCE.getStatement_Formula();\n+ EReference STATEMENT__MATRIX_ASSIGNMENT = eINSTANCE.getStatement_MatrixAssignment();\n+\n+ /**\n+ * The meta object literal for the '<em><b>Matrix Formula</b></em>' containment reference feature.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ */\n+ EReference STATEMENT__MATRIX_FORMULA = eINSTANCE.getStatement_MatrixFormula();\n \n /**\n- * The meta object literal for the '{@link org.eclipse.iee.translator.jmole.math.math.impl.AssignmentImpl <em>Assignment</em>}' class.\n+ * The meta object literal for the '{@link org.eclipse.iee.translator.jmole.math.math.impl.VariableAssignmentImpl <em>Variable Assignment</em>}' class.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n- * @see org.eclipse.iee.translator.jmole.math.math.impl.AssignmentImpl\n- * @see org.eclipse.iee.translator.jmole.math.math.impl.MathPackageImpl#getAssignment()\n+ * @see org.eclipse.iee.translator.jmole.math.math.impl.VariableAssignmentImpl\n+ * @see org.eclipse.iee.translator.jmole.math.math.impl.MathPackageImpl#getVariableAssignment()\n * @generated\n */\n- EClass ASSIGNMENT = eINSTANCE.getAssignment();\n+ EClass VARIABLE_ASSIGNMENT = eINSTANCE.getVariableAssignment();\n \n /**\n * The meta object literal for the '<em><b>Variable</b></em>' attribute feature.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n- EAttribute ASSIGNMENT__VARIABLE = eINSTANCE.getAssignment_Variable();\n+ EAttribute VARIABLE_ASSIGNMENT__VARIABLE = eINSTANCE.getVariableAssignment_Variable();\n \n /**\n * The meta object literal for the '<em><b>Value</b></em>' containment reference feature.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n- EReference ASSIGNMENT__VALUE = eINSTANCE.getAssignment_Value();\n+ EReference VARIABLE_ASSIGNMENT__VALUE = eINSTANCE.getVariableAssignment_Value();\n \n /**\n * The meta object literal for the '{@link org.eclipse.iee.translator.jmole.math.math.impl.FormulaImpl <em>Formula</em>}' class.\n@@ -1644,74 +2153,120 @@ interface Literals\n EReference EXPRESSION__PARAMETERS = eINSTANCE.getExpression_Parameters();\n \n /**\n- * The meta object literal for the '{@link org.eclipse.iee.translator.jmole.math.math.impl.FunctionDefinitionImpl <em>Function Definition</em>}' class.\n+ * The meta object literal for the '{@link org.eclipse.iee.translator.jmole.math.math.impl.MatrixImpl <em>Matrix</em>}' class.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n- * @see org.eclipse.iee.translator.jmole.math.math.impl.FunctionDefinitionImpl\n- * @see org.eclipse.iee.translator.jmole.math.math.impl.MathPackageImpl#getFunctionDefinition()\n+ * @see org.eclipse.iee.translator.jmole.math.math.impl.MatrixImpl\n+ * @see org.eclipse.iee.translator.jmole.math.math.impl.MathPackageImpl#getMatrix()\n * @generated\n */\n- EClass FUNCTION_DEFINITION = eINSTANCE.getFunctionDefinition();\n+ EClass MATRIX = eINSTANCE.getMatrix();\n \n /**\n- * The meta object literal for the '<em><b>Function</b></em>' containment reference feature.\n+ * The meta object literal for the '<em><b>Rows</b></em>' containment reference list feature.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n- EReference FUNCTION_DEFINITION__FUNCTION = eINSTANCE.getFunctionDefinition_Function();\n+ EReference MATRIX__ROWS = eINSTANCE.getMatrix_Rows();\n \n /**\n- * The meta object literal for the '<em><b>Formula</b></em>' containment reference feature.\n+ * The meta object literal for the '{@link org.eclipse.iee.translator.jmole.math.math.impl.MatrixRowImpl <em>Matrix Row</em>}' class.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n+ * @see org.eclipse.iee.translator.jmole.math.math.impl.MatrixRowImpl\n+ * @see org.eclipse.iee.translator.jmole.math.math.impl.MathPackageImpl#getMatrixRow()\n * @generated\n */\n- EReference FUNCTION_DEFINITION__FORMULA = eINSTANCE.getFunctionDefinition_Formula();\n+ EClass MATRIX_ROW = eINSTANCE.getMatrixRow();\n \n /**\n- * The meta object literal for the '{@link org.eclipse.iee.translator.jmole.math.math.impl.MatrixDefinitionImpl <em>Matrix Definition</em>}' class.\n+ * The meta object literal for the '<em><b>Elements</b></em>' attribute list feature.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n- * @see org.eclipse.iee.translator.jmole.math.math.impl.MatrixDefinitionImpl\n- * @see org.eclipse.iee.translator.jmole.math.math.impl.MathPackageImpl#getMatrixDefinition()\n * @generated\n */\n- EClass MATRIX_DEFINITION = eINSTANCE.getMatrixDefinition();\n+ EAttribute MATRIX_ROW__ELEMENTS = eINSTANCE.getMatrixRow_Elements();\n \n /**\n- * The meta object literal for the '<em><b>Name</b></em>' attribute feature.\n+ * The meta object literal for the '{@link org.eclipse.iee.translator.jmole.math.math.impl.MatrixAssignmentImpl <em>Matrix Assignment</em>}' class.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n+ * @see org.eclipse.iee.translator.jmole.math.math.impl.MatrixAssignmentImpl\n+ * @see org.eclipse.iee.translator.jmole.math.math.impl.MathPackageImpl#getMatrixAssignment()\n * @generated\n */\n- EAttribute MATRIX_DEFINITION__NAME = eINSTANCE.getMatrixDefinition_Name();\n+ EClass MATRIX_ASSIGNMENT = eINSTANCE.getMatrixAssignment();\n \n /**\n- * The meta object literal for the '<em><b>Rows</b></em>' containment reference list feature.\n+ * The meta object literal for the '<em><b>Variable</b></em>' attribute feature.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n- EReference MATRIX_DEFINITION__ROWS = eINSTANCE.getMatrixDefinition_Rows();\n+ EAttribute MATRIX_ASSIGNMENT__VARIABLE = eINSTANCE.getMatrixAssignment_Variable();\n \n /**\n- * The meta object literal for the '{@link org.eclipse.iee.translator.jmole.math.math.impl.MatrixRowImpl <em>Matrix Row</em>}' class.\n+ * The meta object literal for the '<em><b>Value</b></em>' containment reference feature.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n- * @see org.eclipse.iee.translator.jmole.math.math.impl.MatrixRowImpl\n- * @see org.eclipse.iee.translator.jmole.math.math.impl.MathPackageImpl#getMatrixRow()\n * @generated\n */\n- EClass MATRIX_ROW = eINSTANCE.getMatrixRow();\n+ EReference MATRIX_ASSIGNMENT__VALUE = eINSTANCE.getMatrixAssignment_Value();\n \n /**\n- * The meta object literal for the '<em><b>Elements</b></em>' attribute list feature.\n+ * The meta object literal for the '{@link org.eclipse.iee.translator.jmole.math.math.impl.MatrixFormulaImpl <em>Matrix Formula</em>}' class.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n+ * @see org.eclipse.iee.translator.jmole.math.math.impl.MatrixFormulaImpl\n+ * @see org.eclipse.iee.translator.jmole.math.math.impl.MathPackageImpl#getMatrixFormula()\n * @generated\n */\n- EAttribute MATRIX_ROW__ELEMENTS = eINSTANCE.getMatrixRow_Elements();\n+ EClass MATRIX_FORMULA = eINSTANCE.getMatrixFormula();\n+\n+ /**\n+ * The meta object literal for the '<em><b>Expression</b></em>' containment reference feature.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ */\n+ EReference MATRIX_FORMULA__EXPRESSION = eINSTANCE.getMatrixFormula_Expression();\n+\n+ /**\n+ * The meta object literal for the '{@link org.eclipse.iee.translator.jmole.math.math.impl.MatrixExpressionImpl <em>Matrix Expression</em>}' class.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @see org.eclipse.iee.translator.jmole.math.math.impl.MatrixExpressionImpl\n+ * @see org.eclipse.iee.translator.jmole.math.math.impl.MathPackageImpl#getMatrixExpression()\n+ * @generated\n+ */\n+ EClass MATRIX_EXPRESSION = eINSTANCE.getMatrixExpression();\n+\n+ /**\n+ * The meta object literal for the '{@link org.eclipse.iee.translator.jmole.math.math.impl.FunctionDefinitionImpl <em>Function Definition</em>}' class.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @see org.eclipse.iee.translator.jmole.math.math.impl.FunctionDefinitionImpl\n+ * @see org.eclipse.iee.translator.jmole.math.math.impl.MathPackageImpl#getFunctionDefinition()\n+ * @generated\n+ */\n+ EClass FUNCTION_DEFINITION = eINSTANCE.getFunctionDefinition();\n+\n+ /**\n+ * The meta object literal for the '<em><b>Function</b></em>' containment reference feature.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ */\n+ EReference FUNCTION_DEFINITION__FUNCTION = eINSTANCE.getFunctionDefinition_Function();\n+\n+ /**\n+ * The meta object literal for the '<em><b>Formula</b></em>' containment reference feature.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ */\n+ EReference FUNCTION_DEFINITION__FORMULA = eINSTANCE.getFunctionDefinition_Formula();\n \n /**\n * The meta object literal for the '{@link org.eclipse.iee.translator.jmole.math.math.impl.AdditionImpl <em>Addition</em>}' class.\n@@ -1880,118 +2435,250 @@ interface Literals\n EReference FACTORIAL__EXPRESSION = eINSTANCE.getFactorial_Expression();\n \n /**\n- * The meta object literal for the '{@link org.eclipse.iee.translator.jmole.math.math.impl.IntervalImpl <em>Interval</em>}' class.\n+ * The meta object literal for the '{@link org.eclipse.iee.translator.jmole.math.math.impl.ExponentImpl <em>Exponent</em>}' class.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @see org.eclipse.iee.translator.jmole.math.math.impl.ExponentImpl\n+ * @see org.eclipse.iee.translator.jmole.math.math.impl.MathPackageImpl#getExponent()\n+ * @generated\n+ */\n+ EClass EXPONENT = eINSTANCE.getExponent();\n+\n+ /**\n+ * The meta object literal for the '<em><b>Left</b></em>' containment reference feature.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ */\n+ EReference EXPONENT__LEFT = eINSTANCE.getExponent_Left();\n+\n+ /**\n+ * The meta object literal for the '<em><b>Right</b></em>' containment reference feature.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ */\n+ EReference EXPONENT__RIGHT = eINSTANCE.getExponent_Right();\n+\n+ /**\n+ * The meta object literal for the '{@link org.eclipse.iee.translator.jmole.math.math.impl.VariableImpl <em>Variable</em>}' class.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n- * @see org.eclipse.iee.translator.jmole.math.math.impl.IntervalImpl\n- * @see org.eclipse.iee.translator.jmole.math.math.impl.MathPackageImpl#getInterval()\n+ * @see org.eclipse.iee.translator.jmole.math.math.impl.VariableImpl\n+ * @see org.eclipse.iee.translator.jmole.math.math.impl.MathPackageImpl#getVariable()\n * @generated\n */\n- EClass INTERVAL = eINSTANCE.getInterval();\n+ EClass VARIABLE = eINSTANCE.getVariable();\n \n /**\n- * The meta object literal for the '<em><b>Opening Bracket</b></em>' attribute feature.\n+ * The meta object literal for the '{@link org.eclipse.iee.translator.jmole.math.math.impl.FloatImpl <em>Float</em>}' class.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n+ * @see org.eclipse.iee.translator.jmole.math.math.impl.FloatImpl\n+ * @see org.eclipse.iee.translator.jmole.math.math.impl.MathPackageImpl#getFloat()\n * @generated\n */\n- EAttribute INTERVAL__OPENING_BRACKET = eINSTANCE.getInterval_OpeningBracket();\n+ EClass FLOAT = eINSTANCE.getFloat();\n \n /**\n- * The meta object literal for the '<em><b>Ceil</b></em>' containment reference feature.\n+ * The meta object literal for the '<em><b>Value</b></em>' attribute feature.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n- EReference INTERVAL__CEIL = eINSTANCE.getInterval_Ceil();\n+ EAttribute FLOAT__VALUE = eINSTANCE.getFloat_Value();\n \n /**\n- * The meta object literal for the '<em><b>Floor</b></em>' containment reference feature.\n+ * The meta object literal for the '{@link org.eclipse.iee.translator.jmole.math.math.impl.MatrixElementImpl <em>Matrix Element</em>}' class.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n+ * @see org.eclipse.iee.translator.jmole.math.math.impl.MatrixElementImpl\n+ * @see org.eclipse.iee.translator.jmole.math.math.impl.MathPackageImpl#getMatrixElement()\n * @generated\n */\n- EReference INTERVAL__FLOOR = eINSTANCE.getInterval_Floor();\n+ EClass MATRIX_ELEMENT = eINSTANCE.getMatrixElement();\n \n /**\n- * The meta object literal for the '<em><b>Closing Bracket</b></em>' attribute feature.\n+ * The meta object literal for the '<em><b>Element</b></em>' attribute feature.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n- EAttribute INTERVAL__CLOSING_BRACKET = eINSTANCE.getInterval_ClosingBracket();\n+ EAttribute MATRIX_ELEMENT__ELEMENT = eINSTANCE.getMatrixElement_Element();\n \n /**\n- * The meta object literal for the '{@link org.eclipse.iee.translator.jmole.math.math.impl.ExponentImpl <em>Exponent</em>}' class.\n+ * The meta object literal for the '<em><b>Row</b></em>' attribute feature.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n- * @see org.eclipse.iee.translator.jmole.math.math.impl.ExponentImpl\n- * @see org.eclipse.iee.translator.jmole.math.math.impl.MathPackageImpl#getExponent()\n * @generated\n */\n- EClass EXPONENT = eINSTANCE.getExponent();\n+ EAttribute MATRIX_ELEMENT__ROW = eINSTANCE.getMatrixElement_Row();\n+\n+ /**\n+ * The meta object literal for the '<em><b>Column</b></em>' attribute feature.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ */\n+ EAttribute MATRIX_ELEMENT__COLUMN = eINSTANCE.getMatrixElement_Column();\n+\n+ /**\n+ * The meta object literal for the '{@link org.eclipse.iee.translator.jmole.math.math.impl.FunctionImpl <em>Function</em>}' class.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @see org.eclipse.iee.translator.jmole.math.math.impl.FunctionImpl\n+ * @see org.eclipse.iee.translator.jmole.math.math.impl.MathPackageImpl#getFunction()\n+ * @generated\n+ */\n+ EClass FUNCTION = eINSTANCE.getFunction();\n+\n+ /**\n+ * The meta object literal for the '<em><b>Function</b></em>' containment reference feature.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ */\n+ EReference FUNCTION__FUNCTION = eINSTANCE.getFunction_Function();\n+\n+ /**\n+ * The meta object literal for the '{@link org.eclipse.iee.translator.jmole.math.math.impl.MatrixAdditionImpl <em>Matrix Addition</em>}' class.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @see org.eclipse.iee.translator.jmole.math.math.impl.MatrixAdditionImpl\n+ * @see org.eclipse.iee.translator.jmole.math.math.impl.MathPackageImpl#getMatrixAddition()\n+ * @generated\n+ */\n+ EClass MATRIX_ADDITION = eINSTANCE.getMatrixAddition();\n \n /**\n * The meta object literal for the '<em><b>Left</b></em>' containment reference feature.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n- EReference EXPONENT__LEFT = eINSTANCE.getExponent_Left();\n+ EReference MATRIX_ADDITION__LEFT = eINSTANCE.getMatrixAddition_Left();\n \n /**\n * The meta object literal for the '<em><b>Right</b></em>' containment reference feature.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n- EReference EXPONENT__RIGHT = eINSTANCE.getExponent_Right();\n+ EReference MATRIX_ADDITION__RIGHT = eINSTANCE.getMatrixAddition_Right();\n \n /**\n- * The meta object literal for the '{@link org.eclipse.iee.translator.jmole.math.math.impl.VariableImpl <em>Variable</em>}' class.\n+ * The meta object literal for the '{@link org.eclipse.iee.translator.jmole.math.math.impl.MatrixSubtractionImpl <em>Matrix Subtraction</em>}' class.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n- * @see org.eclipse.iee.translator.jmole.math.math.impl.VariableImpl\n- * @see org.eclipse.iee.translator.jmole.math.math.impl.MathPackageImpl#getVariable()\n+ * @see org.eclipse.iee.translator.jmole.math.math.impl.MatrixSubtractionImpl\n+ * @see org.eclipse.iee.translator.jmole.math.math.impl.MathPackageImpl#getMatrixSubtraction()\n * @generated\n */\n- EClass VARIABLE = eINSTANCE.getVariable();\n+ EClass MATRIX_SUBTRACTION = eINSTANCE.getMatrixSubtraction();\n \n /**\n- * The meta object literal for the '{@link org.eclipse.iee.translator.jmole.math.math.impl.FloatImpl <em>Float</em>}' class.\n+ * The meta object literal for the '<em><b>Left</b></em>' containment reference feature.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n- * @see org.eclipse.iee.translator.jmole.math.math.impl.FloatImpl\n- * @see org.eclipse.iee.translator.jmole.math.math.impl.MathPackageImpl#getFloat()\n * @generated\n */\n- EClass FLOAT = eINSTANCE.getFloat();\n+ EReference MATRIX_SUBTRACTION__LEFT = eINSTANCE.getMatrixSubtraction_Left();\n \n /**\n- * The meta object literal for the '<em><b>Value</b></em>' attribute feature.\n+ * The meta object literal for the '<em><b>Right</b></em>' containment reference feature.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n- EAttribute FLOAT__VALUE = eINSTANCE.getFloat_Value();\n+ EReference MATRIX_SUBTRACTION__RIGHT = eINSTANCE.getMatrixSubtraction_Right();\n \n /**\n- * The meta object literal for the '{@link org.eclipse.iee.translator.jmole.math.math.impl.FunctionImpl <em>Function</em>}' class.\n+ * The meta object literal for the '{@link org.eclipse.iee.translator.jmole.math.math.impl.MatrixMultiplicationImpl <em>Matrix Multiplication</em>}' class.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n- * @see org.eclipse.iee.translator.jmole.math.math.impl.FunctionImpl\n- * @see org.eclipse.iee.translator.jmole.math.math.impl.MathPackageImpl#getFunction()\n+ * @see org.eclipse.iee.translator.jmole.math.math.impl.MatrixMultiplicationImpl\n+ * @see org.eclipse.iee.translator.jmole.math.math.impl.MathPackageImpl#getMatrixMultiplication()\n * @generated\n */\n- EClass FUNCTION = eINSTANCE.getFunction();\n+ EClass MATRIX_MULTIPLICATION = eINSTANCE.getMatrixMultiplication();\n \n /**\n- * The meta object literal for the '<em><b>Function</b></em>' containment reference feature.\n+ * The meta object literal for the '<em><b>Left</b></em>' containment reference feature.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n- EReference FUNCTION__FUNCTION = eINSTANCE.getFunction_Function();\n+ EReference MATRIX_MULTIPLICATION__LEFT = eINSTANCE.getMatrixMultiplication_Left();\n+\n+ /**\n+ * The meta object literal for the '<em><b>Right Matrix</b></em>' containment reference feature.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ */\n+ EReference MATRIX_MULTIPLICATION__RIGHT_MATRIX = eINSTANCE.getMatrixMultiplication_RightMatrix();\n+\n+ /**\n+ * The meta object literal for the '<em><b>Right Scalar</b></em>' containment reference feature.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ */\n+ EReference MATRIX_MULTIPLICATION__RIGHT_SCALAR = eINSTANCE.getMatrixMultiplication_RightScalar();\n+\n+ /**\n+ * The meta object literal for the '{@link org.eclipse.iee.translator.jmole.math.math.impl.NewMatrixImpl <em>New Matrix</em>}' class.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @see org.eclipse.iee.translator.jmole.math.math.impl.NewMatrixImpl\n+ * @see org.eclipse.iee.translator.jmole.math.math.impl.MathPackageImpl#getNewMatrix()\n+ * @generated\n+ */\n+ EClass NEW_MATRIX = eINSTANCE.getNewMatrix();\n+\n+ /**\n+ * The meta object literal for the '<em><b>Matrix</b></em>' containment reference feature.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ */\n+ EReference NEW_MATRIX__MATRIX = eINSTANCE.getNewMatrix_Matrix();\n+\n+ /**\n+ * The meta object literal for the '{@link org.eclipse.iee.translator.jmole.math.math.impl.TransposeMatrixImpl <em>Transpose Matrix</em>}' class.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @see org.eclipse.iee.translator.jmole.math.math.impl.TransposeMatrixImpl\n+ * @see org.eclipse.iee.translator.jmole.math.math.impl.MathPackageImpl#getTransposeMatrix()\n+ * @generated\n+ */\n+ EClass TRANSPOSE_MATRIX = eINSTANCE.getTransposeMatrix();\n+\n+ /**\n+ * The meta object literal for the '<em><b>Name</b></em>' attribute feature.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ */\n+ EAttribute TRANSPOSE_MATRIX__NAME = eINSTANCE.getTransposeMatrix_Name();\n+\n+ /**\n+ * The meta object literal for the '{@link org.eclipse.iee.translator.jmole.math.math.impl.MatrixVariableImpl <em>Matrix Variable</em>}' class.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @see org.eclipse.iee.translator.jmole.math.math.impl.MatrixVariableImpl\n+ * @see org.eclipse.iee.translator.jmole.math.math.impl.MathPackageImpl#getMatrixVariable()\n+ * @generated\n+ */\n+ EClass MATRIX_VARIABLE = eINSTANCE.getMatrixVariable();\n+\n+ /**\n+ * The meta object literal for the '<em><b>Name</b></em>' attribute feature.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ */\n+ EAttribute MATRIX_VARIABLE__NAME = eINSTANCE.getMatrixVariable_Name();\n \n }\n ", "raw_url": "https://github.com/iee/iee/raw/0f04d91efdf50447d8e84e926ef98d7462103dc0/org.eclipse.iee.translator.Jmole%2Forg.eclipse.iee.translator.jmole.math%2Fsrc-gen%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fjmole%2Fmath%2Fmath%2FMathPackage.java", "sha": "7fd7b67431a4fe6914ee7319f3bd1924dfadf157", "status": "modified" }, { "additions": 59, "blob_url": "https://github.com/iee/iee/blob/0f04d91efdf50447d8e84e926ef98d7462103dc0/org.eclipse.iee.translator.Jmole%2Forg.eclipse.iee.translator.jmole.math%2Fsrc-gen%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fjmole%2Fmath%2Fmath%2FStatement.java", "changes": 91, "contents_url": "https://api.github.com/repos/iee/iee/contents/org.eclipse.iee.translator.Jmole%2Forg.eclipse.iee.translator.jmole.math%2Fsrc-gen%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fjmole%2Fmath%2Fmath%2FStatement.java?ref=0f04d91efdf50447d8e84e926ef98d7462103dc0", "deletions": 32, "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/math/Statement.java", "new_code": " * <li>{@link org.eclipse.iee.translator.jmole.math.math.Statement#getVariableAssignment <em>Variable Assignment</em>}</li>\n * <li>{@link org.eclipse.iee.translator.jmole.math.math.Statement#getMatrixAssignment <em>Matrix Assignment</em>}</li>\n * <li>{@link org.eclipse.iee.translator.jmole.math.math.Statement#getMatrixFormula <em>Matrix Formula</em>}</li>\n * Returns the value of the '<em><b>Variable Assignment</b></em>' containment reference.\n * If the meaning of the '<em>Variable Assignment</em>' containment reference isn't clear,\n * @return the value of the '<em>Variable Assignment</em>' containment reference.\n * @see #setVariableAssignment(VariableAssignment)\n * @see org.eclipse.iee.translator.jmole.math.math.MathPackage#getStatement_VariableAssignment()\n VariableAssignment getVariableAssignment();\n * Sets the value of the '{@link org.eclipse.iee.translator.jmole.math.math.Statement#getVariableAssignment <em>Variable Assignment</em>}' containment reference.\n * @param value the new value of the '<em>Variable Assignment</em>' containment reference.\n * @see #getVariableAssignment()\n void setVariableAssignment(VariableAssignment value);\n * Returns the value of the '<em><b>Formula</b></em>' containment reference.\n * If the meaning of the '<em>Formula</em>' containment reference isn't clear,\n * @return the value of the '<em>Formula</em>' containment reference.\n * @see #setFormula(Formula)\n * @see org.eclipse.iee.translator.jmole.math.math.MathPackage#getStatement_Formula()\n Formula getFormula();\n * Sets the value of the '{@link org.eclipse.iee.translator.jmole.math.math.Statement#getFormula <em>Formula</em>}' containment reference.\n * @param value the new value of the '<em>Formula</em>' containment reference.\n * @see #getFormula()\n void setFormula(Formula value);\n * Returns the value of the '<em><b>Matrix Assignment</b></em>' containment reference.\n * If the meaning of the '<em>Matrix Assignment</em>' containment reference isn't clear,\n * @return the value of the '<em>Matrix Assignment</em>' containment reference.\n * @see #setMatrixAssignment(MatrixAssignment)\n * @see org.eclipse.iee.translator.jmole.math.math.MathPackage#getStatement_MatrixAssignment()\n MatrixAssignment getMatrixAssignment();\n * Sets the value of the '{@link org.eclipse.iee.translator.jmole.math.math.Statement#getMatrixAssignment <em>Matrix Assignment</em>}' containment reference.\n * @param value the new value of the '<em>Matrix Assignment</em>' containment reference.\n * @see #getMatrixAssignment()\n void setMatrixAssignment(MatrixAssignment value);\n\n /**\n * Returns the value of the '<em><b>Matrix Formula</b></em>' containment reference.\n * <!-- begin-user-doc -->\n * <p>\n * If the meaning of the '<em>Matrix Formula</em>' containment reference isn't clear,\n * there really should be more of a description here...\n * </p>\n * <!-- end-user-doc -->\n * @return the value of the '<em>Matrix Formula</em>' containment reference.\n * @see #setMatrixFormula(MatrixFormula)\n * @see org.eclipse.iee.translator.jmole.math.math.MathPackage#getStatement_MatrixFormula()\n * @model containment=\"true\"\n * @generated\n */\n MatrixFormula getMatrixFormula();\n\n /**\n * Sets the value of the '{@link org.eclipse.iee.translator.jmole.math.math.Statement#getMatrixFormula <em>Matrix Formula</em>}' containment reference.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @param value the new value of the '<em>Matrix Formula</em>' containment reference.\n * @see #getMatrixFormula()\n * @generated\n */\n void setMatrixFormula(MatrixFormula value);", "new_methods": [], "old_code": " * <li>{@link org.eclipse.iee.translator.jmole.math.math.Statement#getMatrixDefinition <em>Matrix Definition</em>}</li>\n * <li>{@link org.eclipse.iee.translator.jmole.math.math.Statement#getAssignment <em>Assignment</em>}</li>\n * Returns the value of the '<em><b>Matrix Definition</b></em>' containment reference.\n * If the meaning of the '<em>Matrix Definition</em>' containment reference isn't clear,\n * @return the value of the '<em>Matrix Definition</em>' containment reference.\n * @see #setMatrixDefinition(MatrixDefinition)\n * @see org.eclipse.iee.translator.jmole.math.math.MathPackage#getStatement_MatrixDefinition()\n MatrixDefinition getMatrixDefinition();\n * Sets the value of the '{@link org.eclipse.iee.translator.jmole.math.math.Statement#getMatrixDefinition <em>Matrix Definition</em>}' containment reference.\n * @param value the new value of the '<em>Matrix Definition</em>' containment reference.\n * @see #getMatrixDefinition()\n void setMatrixDefinition(MatrixDefinition value);\n * Returns the value of the '<em><b>Assignment</b></em>' containment reference.\n * If the meaning of the '<em>Assignment</em>' containment reference isn't clear,\n * @return the value of the '<em>Assignment</em>' containment reference.\n * @see #setAssignment(Assignment)\n * @see org.eclipse.iee.translator.jmole.math.math.MathPackage#getStatement_Assignment()\n Assignment getAssignment();\n * Sets the value of the '{@link org.eclipse.iee.translator.jmole.math.math.Statement#getAssignment <em>Assignment</em>}' containment reference.\n * @param value the new value of the '<em>Assignment</em>' containment reference.\n * @see #getAssignment()\n void setAssignment(Assignment value);\n * Returns the value of the '<em><b>Formula</b></em>' containment reference.\n * If the meaning of the '<em>Formula</em>' containment reference isn't clear,\n * @return the value of the '<em>Formula</em>' containment reference.\n * @see #setFormula(Formula)\n * @see org.eclipse.iee.translator.jmole.math.math.MathPackage#getStatement_Formula()\n Formula getFormula();\n * Sets the value of the '{@link org.eclipse.iee.translator.jmole.math.math.Statement#getFormula <em>Formula</em>}' containment reference.\n * @param value the new value of the '<em>Formula</em>' containment reference.\n * @see #getFormula()\n void setFormula(Formula value);", "old_methods": [], "patch": "@@ -17,9 +17,10 @@\n * The following features are supported:\n * <ul>\n * <li>{@link org.eclipse.iee.translator.jmole.math.math.Statement#getFunctionDefinition <em>Function Definition</em>}</li>\n- * <li>{@link org.eclipse.iee.translator.jmole.math.math.Statement#getMatrixDefinition <em>Matrix Definition</em>}</li>\n- * <li>{@link org.eclipse.iee.translator.jmole.math.math.Statement#getAssignment <em>Assignment</em>}</li>\n+ * <li>{@link org.eclipse.iee.translator.jmole.math.math.Statement#getVariableAssignment <em>Variable Assignment</em>}</li>\n * <li>{@link org.eclipse.iee.translator.jmole.math.math.Statement#getFormula <em>Formula</em>}</li>\n+ * <li>{@link org.eclipse.iee.translator.jmole.math.math.Statement#getMatrixAssignment <em>Matrix Assignment</em>}</li>\n+ * <li>{@link org.eclipse.iee.translator.jmole.math.math.Statement#getMatrixFormula <em>Matrix Formula</em>}</li>\n * </ul>\n * </p>\n *\n@@ -56,81 +57,107 @@ public interface Statement extends EObject\n void setFunctionDefinition(FunctionDefinition value);\n \n /**\n- * Returns the value of the '<em><b>Matrix Definition</b></em>' containment reference.\n+ * Returns the value of the '<em><b>Variable Assignment</b></em>' containment reference.\n * <!-- begin-user-doc -->\n * <p>\n- * If the meaning of the '<em>Matrix Definition</em>' containment reference isn't clear,\n+ * If the meaning of the '<em>Variable Assignment</em>' containment reference isn't clear,\n * there really should be more of a description here...\n * </p>\n * <!-- end-user-doc -->\n- * @return the value of the '<em>Matrix Definition</em>' containment reference.\n- * @see #setMatrixDefinition(MatrixDefinition)\n- * @see org.eclipse.iee.translator.jmole.math.math.MathPackage#getStatement_MatrixDefinition()\n+ * @return the value of the '<em>Variable Assignment</em>' containment reference.\n+ * @see #setVariableAssignment(VariableAssignment)\n+ * @see org.eclipse.iee.translator.jmole.math.math.MathPackage#getStatement_VariableAssignment()\n * @model containment=\"true\"\n * @generated\n */\n- MatrixDefinition getMatrixDefinition();\n+ VariableAssignment getVariableAssignment();\n \n /**\n- * Sets the value of the '{@link org.eclipse.iee.translator.jmole.math.math.Statement#getMatrixDefinition <em>Matrix Definition</em>}' containment reference.\n+ * Sets the value of the '{@link org.eclipse.iee.translator.jmole.math.math.Statement#getVariableAssignment <em>Variable Assignment</em>}' containment reference.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n- * @param value the new value of the '<em>Matrix Definition</em>' containment reference.\n- * @see #getMatrixDefinition()\n+ * @param value the new value of the '<em>Variable Assignment</em>' containment reference.\n+ * @see #getVariableAssignment()\n * @generated\n */\n- void setMatrixDefinition(MatrixDefinition value);\n+ void setVariableAssignment(VariableAssignment value);\n \n /**\n- * Returns the value of the '<em><b>Assignment</b></em>' containment reference.\n+ * Returns the value of the '<em><b>Formula</b></em>' containment reference.\n * <!-- begin-user-doc -->\n * <p>\n- * If the meaning of the '<em>Assignment</em>' containment reference isn't clear,\n+ * If the meaning of the '<em>Formula</em>' containment reference isn't clear,\n * there really should be more of a description here...\n * </p>\n * <!-- end-user-doc -->\n- * @return the value of the '<em>Assignment</em>' containment reference.\n- * @see #setAssignment(Assignment)\n- * @see org.eclipse.iee.translator.jmole.math.math.MathPackage#getStatement_Assignment()\n+ * @return the value of the '<em>Formula</em>' containment reference.\n+ * @see #setFormula(Formula)\n+ * @see org.eclipse.iee.translator.jmole.math.math.MathPackage#getStatement_Formula()\n * @model containment=\"true\"\n * @generated\n */\n- Assignment getAssignment();\n+ Formula getFormula();\n \n /**\n- * Sets the value of the '{@link org.eclipse.iee.translator.jmole.math.math.Statement#getAssignment <em>Assignment</em>}' containment reference.\n+ * Sets the value of the '{@link org.eclipse.iee.translator.jmole.math.math.Statement#getFormula <em>Formula</em>}' containment reference.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n- * @param value the new value of the '<em>Assignment</em>' containment reference.\n- * @see #getAssignment()\n+ * @param value the new value of the '<em>Formula</em>' containment reference.\n+ * @see #getFormula()\n * @generated\n */\n- void setAssignment(Assignment value);\n+ void setFormula(Formula value);\n \n /**\n- * Returns the value of the '<em><b>Formula</b></em>' containment reference.\n+ * Returns the value of the '<em><b>Matrix Assignment</b></em>' containment reference.\n * <!-- begin-user-doc -->\n * <p>\n- * If the meaning of the '<em>Formula</em>' containment reference isn't clear,\n+ * If the meaning of the '<em>Matrix Assignment</em>' containment reference isn't clear,\n * there really should be more of a description here...\n * </p>\n * <!-- end-user-doc -->\n- * @return the value of the '<em>Formula</em>' containment reference.\n- * @see #setFormula(Formula)\n- * @see org.eclipse.iee.translator.jmole.math.math.MathPackage#getStatement_Formula()\n+ * @return the value of the '<em>Matrix Assignment</em>' containment reference.\n+ * @see #setMatrixAssignment(MatrixAssignment)\n+ * @see org.eclipse.iee.translator.jmole.math.math.MathPackage#getStatement_MatrixAssignment()\n * @model containment=\"true\"\n * @generated\n */\n- Formula getFormula();\n+ MatrixAssignment getMatrixAssignment();\n \n /**\n- * Sets the value of the '{@link org.eclipse.iee.translator.jmole.math.math.Statement#getFormula <em>Formula</em>}' containment reference.\n+ * Sets the value of the '{@link org.eclipse.iee.translator.jmole.math.math.Statement#getMatrixAssignment <em>Matrix Assignment</em>}' containment reference.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n- * @param value the new value of the '<em>Formula</em>' containment reference.\n- * @see #getFormula()\n+ * @param value the new value of the '<em>Matrix Assignment</em>' containment reference.\n+ * @see #getMatrixAssignment()\n * @generated\n */\n- void setFormula(Formula value);\n+ void setMatrixAssignment(MatrixAssignment value);\n+\n+ /**\n+ * Returns the value of the '<em><b>Matrix Formula</b></em>' containment reference.\n+ * <!-- begin-user-doc -->\n+ * <p>\n+ * If the meaning of the '<em>Matrix Formula</em>' containment reference isn't clear,\n+ * there really should be more of a description here...\n+ * </p>\n+ * <!-- end-user-doc -->\n+ * @return the value of the '<em>Matrix Formula</em>' containment reference.\n+ * @see #setMatrixFormula(MatrixFormula)\n+ * @see org.eclipse.iee.translator.jmole.math.math.MathPackage#getStatement_MatrixFormula()\n+ * @model containment=\"true\"\n+ * @generated\n+ */\n+ MatrixFormula getMatrixFormula();\n+\n+ /**\n+ * Sets the value of the '{@link org.eclipse.iee.translator.jmole.math.math.Statement#getMatrixFormula <em>Matrix Formula</em>}' containment reference.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @param value the new value of the '<em>Matrix Formula</em>' containment reference.\n+ * @see #getMatrixFormula()\n+ * @generated\n+ */\n+ void setMatrixFormula(MatrixFormula value);\n \n } // Statement", "raw_url": "https://github.com/iee/iee/raw/0f04d91efdf50447d8e84e926ef98d7462103dc0/org.eclipse.iee.translator.Jmole%2Forg.eclipse.iee.translator.jmole.math%2Fsrc-gen%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fjmole%2Fmath%2Fmath%2FStatement.java", "sha": "d45ef70d04dfb183ad60b23c4b202ceb47add157", "status": "modified" }, { "additions": 147, "blob_url": "https://github.com/iee/iee/blob/0f04d91efdf50447d8e84e926ef98d7462103dc0/org.eclipse.iee.translator.Jmole%2Forg.eclipse.iee.translator.jmole.math%2Fsrc-gen%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fjmole%2Fmath%2Fmath%2Fimpl%2FMathFactoryImpl.java", "changes": 177, "contents_url": "https://api.github.com/repos/iee/iee/contents/org.eclipse.iee.translator.Jmole%2Forg.eclipse.iee.translator.jmole.math%2Fsrc-gen%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fjmole%2Fmath%2Fmath%2Fimpl%2FMathFactoryImpl.java?ref=0f04d91efdf50447d8e84e926ef98d7462103dc0", "deletions": 30, "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/math/impl/MathFactoryImpl.java", "new_code": "import org.eclipse.iee.translator.jmole.math.math.Matrix;\nimport org.eclipse.iee.translator.jmole.math.math.MatrixAddition;\nimport org.eclipse.iee.translator.jmole.math.math.MatrixAssignment;\nimport org.eclipse.iee.translator.jmole.math.math.MatrixElement;\nimport org.eclipse.iee.translator.jmole.math.math.MatrixExpression;\nimport org.eclipse.iee.translator.jmole.math.math.MatrixFormula;\nimport org.eclipse.iee.translator.jmole.math.math.MatrixMultiplication;\nimport org.eclipse.iee.translator.jmole.math.math.MatrixSubtraction;\nimport org.eclipse.iee.translator.jmole.math.math.MatrixVariable;\nimport org.eclipse.iee.translator.jmole.math.math.NewMatrix;\nimport org.eclipse.iee.translator.jmole.math.math.TransposeMatrix;\nimport org.eclipse.iee.translator.jmole.math.math.VariableAssignment;\n case MathPackage.VARIABLE_ASSIGNMENT: return createVariableAssignment();\n case MathPackage.MATRIX: return createMatrix();\n case MathPackage.MATRIX_ASSIGNMENT: return createMatrixAssignment();\n case MathPackage.MATRIX_FORMULA: return createMatrixFormula();\n case MathPackage.MATRIX_EXPRESSION: return createMatrixExpression();\n case MathPackage.FUNCTION_DEFINITION: return createFunctionDefinition();\n case MathPackage.MATRIX_ELEMENT: return createMatrixElement();\n case MathPackage.MATRIX_ADDITION: return createMatrixAddition();\n case MathPackage.MATRIX_SUBTRACTION: return createMatrixSubtraction();\n case MathPackage.MATRIX_MULTIPLICATION: return createMatrixMultiplication();\n case MathPackage.NEW_MATRIX: return createNewMatrix();\n case MathPackage.TRANSPOSE_MATRIX: return createTransposeMatrix();\n case MathPackage.MATRIX_VARIABLE: return createMatrixVariable();\n public VariableAssignment createVariableAssignment()\n VariableAssignmentImpl variableAssignment = new VariableAssignmentImpl();\n return variableAssignment;\n public Matrix createMatrix()\n MatrixImpl matrix = new MatrixImpl();\n return matrix;\n public MatrixRow createMatrixRow()\n MatrixRowImpl matrixRow = new MatrixRowImpl();\n return matrixRow;\n public MatrixAssignment createMatrixAssignment()\n MatrixAssignmentImpl matrixAssignment = new MatrixAssignmentImpl();\n return matrixAssignment;\n }\n\n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n public MatrixFormula createMatrixFormula()\n {\n MatrixFormulaImpl matrixFormula = new MatrixFormulaImpl();\n return matrixFormula;\n }\n\n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n public MatrixExpression createMatrixExpression()\n {\n MatrixExpressionImpl matrixExpression = new MatrixExpressionImpl();\n return matrixExpression;\n }\n\n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n public FunctionDefinition createFunctionDefinition()\n {\n FunctionDefinitionImpl functionDefinition = new FunctionDefinitionImpl();\n return functionDefinition;\n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n public MatrixElement createMatrixElement()\n {\n MatrixElementImpl matrixElement = new MatrixElementImpl();\n return matrixElement;\n }\n\n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n public MatrixAddition createMatrixAddition()\n {\n MatrixAdditionImpl matrixAddition = new MatrixAdditionImpl();\n return matrixAddition;\n }\n\n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n public MatrixSubtraction createMatrixSubtraction()\n {\n MatrixSubtractionImpl matrixSubtraction = new MatrixSubtractionImpl();\n return matrixSubtraction;\n }\n\n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n public MatrixMultiplication createMatrixMultiplication()\n {\n MatrixMultiplicationImpl matrixMultiplication = new MatrixMultiplicationImpl();\n return matrixMultiplication;\n }\n\n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n public NewMatrix createNewMatrix()\n {\n NewMatrixImpl newMatrix = new NewMatrixImpl();\n return newMatrix;\n }\n\n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n public TransposeMatrix createTransposeMatrix()\n {\n TransposeMatrixImpl transposeMatrix = new TransposeMatrixImpl();\n return transposeMatrix;\n }\n\n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n public MatrixVariable createMatrixVariable()\n {\n MatrixVariableImpl matrixVariable = new MatrixVariableImpl();\n return matrixVariable;\n }\n", "new_methods": [ { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/math/impl/MathFactoryImpl.java", "implementation": "MatrixFormulaImpl matrixFormula = new MatrixFormulaImpl();\n return matrixFormula;", "signature": "MatrixFormula createMatrixFormula()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/math/impl/MathFactoryImpl.java", "implementation": "MatrixExpressionImpl matrixExpression = new MatrixExpressionImpl();\n return matrixExpression;", "signature": "MatrixExpression createMatrixExpression()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/math/impl/MathFactoryImpl.java", "implementation": "FunctionDefinitionImpl functionDefinition = new FunctionDefinitionImpl();\n return functionDefinition;\n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n public MatrixElement createMatrixElement()\n {\n MatrixElementImpl matrixElement = new MatrixElementImpl();\n return matrixElement;", "signature": "FunctionDefinition createFunctionDefinition()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/math/impl/MathFactoryImpl.java", "implementation": "MatrixAdditionImpl matrixAddition = new MatrixAdditionImpl();\n return matrixAddition;", "signature": "MatrixAddition createMatrixAddition()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/math/impl/MathFactoryImpl.java", "implementation": "MatrixSubtractionImpl matrixSubtraction = new MatrixSubtractionImpl();\n return matrixSubtraction;", "signature": "MatrixSubtraction createMatrixSubtraction()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/math/impl/MathFactoryImpl.java", "implementation": "MatrixMultiplicationImpl matrixMultiplication = new MatrixMultiplicationImpl();\n return matrixMultiplication;", "signature": "MatrixMultiplication createMatrixMultiplication()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/math/impl/MathFactoryImpl.java", "implementation": "NewMatrixImpl newMatrix = new NewMatrixImpl();\n return newMatrix;", "signature": "NewMatrix createNewMatrix()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/math/impl/MathFactoryImpl.java", "implementation": "TransposeMatrixImpl transposeMatrix = new TransposeMatrixImpl();\n return transposeMatrix;", "signature": "TransposeMatrix createTransposeMatrix()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/math/impl/MathFactoryImpl.java", "implementation": "MatrixVariableImpl matrixVariable = new MatrixVariableImpl();\n return matrixVariable;", "signature": "MatrixVariable createMatrixVariable()" } ], "old_code": "import org.eclipse.iee.translator.jmole.math.math.Assignment;\nimport org.eclipse.iee.translator.jmole.math.math.Interval;\nimport org.eclipse.iee.translator.jmole.math.math.MatrixDefinition;\n case MathPackage.ASSIGNMENT: return createAssignment();\n case MathPackage.FUNCTION_DEFINITION: return createFunctionDefinition();\n case MathPackage.MATRIX_DEFINITION: return createMatrixDefinition();\n case MathPackage.INTERVAL: return createInterval();\n public Assignment createAssignment()\n AssignmentImpl assignment = new AssignmentImpl();\n return assignment;\n public FunctionDefinition createFunctionDefinition()\n FunctionDefinitionImpl functionDefinition = new FunctionDefinitionImpl();\n return functionDefinition;\n public MatrixDefinition createMatrixDefinition()\n MatrixDefinitionImpl matrixDefinition = new MatrixDefinitionImpl();\n return matrixDefinition;\n public MatrixRow createMatrixRow()\n MatrixRowImpl matrixRow = new MatrixRowImpl();\n return matrixRow;\n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n public Interval createInterval()\n {\n IntervalImpl interval = new IntervalImpl();\n return interval;\n }\n", "old_methods": [ { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/math/impl/MathFactoryImpl.java", "implementation": "IntervalImpl interval = new IntervalImpl();\n return interval;", "signature": "Interval createInterval()" } ], "patch": "@@ -15,25 +15,34 @@\n import org.eclipse.emf.ecore.plugin.EcorePlugin;\n \n import org.eclipse.iee.translator.jmole.math.math.Addition;\n-import org.eclipse.iee.translator.jmole.math.math.Assignment;\n import org.eclipse.iee.translator.jmole.math.math.Division;\n import org.eclipse.iee.translator.jmole.math.math.Exponent;\n import org.eclipse.iee.translator.jmole.math.math.Expression;\n import org.eclipse.iee.translator.jmole.math.math.Factorial;\n import org.eclipse.iee.translator.jmole.math.math.Formula;\n import org.eclipse.iee.translator.jmole.math.math.Function;\n import org.eclipse.iee.translator.jmole.math.math.FunctionDefinition;\n-import org.eclipse.iee.translator.jmole.math.math.Interval;\n import org.eclipse.iee.translator.jmole.math.math.Invert;\n import org.eclipse.iee.translator.jmole.math.math.MathFactory;\n import org.eclipse.iee.translator.jmole.math.math.MathPackage;\n-import org.eclipse.iee.translator.jmole.math.math.MatrixDefinition;\n+import org.eclipse.iee.translator.jmole.math.math.Matrix;\n+import org.eclipse.iee.translator.jmole.math.math.MatrixAddition;\n+import org.eclipse.iee.translator.jmole.math.math.MatrixAssignment;\n+import org.eclipse.iee.translator.jmole.math.math.MatrixElement;\n+import org.eclipse.iee.translator.jmole.math.math.MatrixExpression;\n+import org.eclipse.iee.translator.jmole.math.math.MatrixFormula;\n+import org.eclipse.iee.translator.jmole.math.math.MatrixMultiplication;\n import org.eclipse.iee.translator.jmole.math.math.MatrixRow;\n+import org.eclipse.iee.translator.jmole.math.math.MatrixSubtraction;\n+import org.eclipse.iee.translator.jmole.math.math.MatrixVariable;\n import org.eclipse.iee.translator.jmole.math.math.Modulo;\n import org.eclipse.iee.translator.jmole.math.math.Multiplication;\n+import org.eclipse.iee.translator.jmole.math.math.NewMatrix;\n import org.eclipse.iee.translator.jmole.math.math.Statement;\n import org.eclipse.iee.translator.jmole.math.math.Subtraction;\n+import org.eclipse.iee.translator.jmole.math.math.TransposeMatrix;\n import org.eclipse.iee.translator.jmole.math.math.Variable;\n+import org.eclipse.iee.translator.jmole.math.math.VariableAssignment;\n \n /**\n * <!-- begin-user-doc -->\n@@ -88,24 +97,33 @@ public EObject create(EClass eClass)\n switch (eClass.getClassifierID())\n {\n case MathPackage.STATEMENT: return createStatement();\n- case MathPackage.ASSIGNMENT: return createAssignment();\n+ case MathPackage.VARIABLE_ASSIGNMENT: return createVariableAssignment();\n case MathPackage.FORMULA: return createFormula();\n case MathPackage.EXPRESSION: return createExpression();\n- case MathPackage.FUNCTION_DEFINITION: return createFunctionDefinition();\n- case MathPackage.MATRIX_DEFINITION: return createMatrixDefinition();\n+ case MathPackage.MATRIX: return createMatrix();\n case MathPackage.MATRIX_ROW: return createMatrixRow();\n+ case MathPackage.MATRIX_ASSIGNMENT: return createMatrixAssignment();\n+ case MathPackage.MATRIX_FORMULA: return createMatrixFormula();\n+ case MathPackage.MATRIX_EXPRESSION: return createMatrixExpression();\n+ case MathPackage.FUNCTION_DEFINITION: return createFunctionDefinition();\n case MathPackage.ADDITION: return createAddition();\n case MathPackage.SUBTRACTION: return createSubtraction();\n case MathPackage.MULTIPLICATION: return createMultiplication();\n case MathPackage.DIVISION: return createDivision();\n case MathPackage.MODULO: return createModulo();\n case MathPackage.INVERT: return createInvert();\n case MathPackage.FACTORIAL: return createFactorial();\n- case MathPackage.INTERVAL: return createInterval();\n case MathPackage.EXPONENT: return createExponent();\n case MathPackage.VARIABLE: return createVariable();\n case MathPackage.FLOAT: return createFloat();\n+ case MathPackage.MATRIX_ELEMENT: return createMatrixElement();\n case MathPackage.FUNCTION: return createFunction();\n+ case MathPackage.MATRIX_ADDITION: return createMatrixAddition();\n+ case MathPackage.MATRIX_SUBTRACTION: return createMatrixSubtraction();\n+ case MathPackage.MATRIX_MULTIPLICATION: return createMatrixMultiplication();\n+ case MathPackage.NEW_MATRIX: return createNewMatrix();\n+ case MathPackage.TRANSPOSE_MATRIX: return createTransposeMatrix();\n+ case MathPackage.MATRIX_VARIABLE: return createMatrixVariable();\n default:\n throw new IllegalArgumentException(\"The class '\" + eClass.getName() + \"' is not a valid classifier\");\n }\n@@ -127,10 +145,10 @@ public Statement createStatement()\n * <!-- end-user-doc -->\n * @generated\n */\n- public Assignment createAssignment()\n+ public VariableAssignment createVariableAssignment()\n {\n- AssignmentImpl assignment = new AssignmentImpl();\n- return assignment;\n+ VariableAssignmentImpl variableAssignment = new VariableAssignmentImpl();\n+ return variableAssignment;\n }\n \n /**\n@@ -160,32 +178,65 @@ public Expression createExpression()\n * <!-- end-user-doc -->\n * @generated\n */\n- public FunctionDefinition createFunctionDefinition()\n+ public Matrix createMatrix()\n {\n- FunctionDefinitionImpl functionDefinition = new FunctionDefinitionImpl();\n- return functionDefinition;\n+ MatrixImpl matrix = new MatrixImpl();\n+ return matrix;\n }\n \n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n- public MatrixDefinition createMatrixDefinition()\n+ public MatrixRow createMatrixRow()\n {\n- MatrixDefinitionImpl matrixDefinition = new MatrixDefinitionImpl();\n- return matrixDefinition;\n+ MatrixRowImpl matrixRow = new MatrixRowImpl();\n+ return matrixRow;\n }\n \n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n- public MatrixRow createMatrixRow()\n+ public MatrixAssignment createMatrixAssignment()\n {\n- MatrixRowImpl matrixRow = new MatrixRowImpl();\n- return matrixRow;\n+ MatrixAssignmentImpl matrixAssignment = new MatrixAssignmentImpl();\n+ return matrixAssignment;\n+ }\n+\n+ /**\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ */\n+ public MatrixFormula createMatrixFormula()\n+ {\n+ MatrixFormulaImpl matrixFormula = new MatrixFormulaImpl();\n+ return matrixFormula;\n+ }\n+\n+ /**\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ */\n+ public MatrixExpression createMatrixExpression()\n+ {\n+ MatrixExpressionImpl matrixExpression = new MatrixExpressionImpl();\n+ return matrixExpression;\n+ }\n+\n+ /**\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ */\n+ public FunctionDefinition createFunctionDefinition()\n+ {\n+ FunctionDefinitionImpl functionDefinition = new FunctionDefinitionImpl();\n+ return functionDefinition;\n }\n \n /**\n@@ -265,17 +316,6 @@ public Factorial createFactorial()\n return factorial;\n }\n \n- /**\n- * <!-- begin-user-doc -->\n- * <!-- end-user-doc -->\n- * @generated\n- */\n- public Interval createInterval()\n- {\n- IntervalImpl interval = new IntervalImpl();\n- return interval;\n- }\n-\n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n@@ -309,6 +349,17 @@ public org.eclipse.iee.translator.jmole.math.math.Float createFloat()\n return float_;\n }\n \n+ /**\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ */\n+ public MatrixElement createMatrixElement()\n+ {\n+ MatrixElementImpl matrixElement = new MatrixElementImpl();\n+ return matrixElement;\n+ }\n+\n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n@@ -320,6 +371,72 @@ public Function createFunction()\n return function;\n }\n \n+ /**\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ */\n+ public MatrixAddition createMatrixAddition()\n+ {\n+ MatrixAdditionImpl matrixAddition = new MatrixAdditionImpl();\n+ return matrixAddition;\n+ }\n+\n+ /**\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ */\n+ public MatrixSubtraction createMatrixSubtraction()\n+ {\n+ MatrixSubtractionImpl matrixSubtraction = new MatrixSubtractionImpl();\n+ return matrixSubtraction;\n+ }\n+\n+ /**\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ */\n+ public MatrixMultiplication createMatrixMultiplication()\n+ {\n+ MatrixMultiplicationImpl matrixMultiplication = new MatrixMultiplicationImpl();\n+ return matrixMultiplication;\n+ }\n+\n+ /**\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ */\n+ public NewMatrix createNewMatrix()\n+ {\n+ NewMatrixImpl newMatrix = new NewMatrixImpl();\n+ return newMatrix;\n+ }\n+\n+ /**\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ */\n+ public TransposeMatrix createTransposeMatrix()\n+ {\n+ TransposeMatrixImpl transposeMatrix = new TransposeMatrixImpl();\n+ return transposeMatrix;\n+ }\n+\n+ /**\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ */\n+ public MatrixVariable createMatrixVariable()\n+ {\n+ MatrixVariableImpl matrixVariable = new MatrixVariableImpl();\n+ return matrixVariable;\n+ }\n+\n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->", "raw_url": "https://github.com/iee/iee/raw/0f04d91efdf50447d8e84e926ef98d7462103dc0/org.eclipse.iee.translator.Jmole%2Forg.eclipse.iee.translator.jmole.math%2Fsrc-gen%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fjmole%2Fmath%2Fmath%2Fimpl%2FMathFactoryImpl.java", "sha": "06d37364011cc2a512e54853e9020435cf382eca", "status": "modified" }, { "additions": 447, "blob_url": "https://github.com/iee/iee/blob/0f04d91efdf50447d8e84e926ef98d7462103dc0/org.eclipse.iee.translator.Jmole%2Forg.eclipse.iee.translator.jmole.math%2Fsrc-gen%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fjmole%2Fmath%2Fmath%2Fimpl%2FMathPackageImpl.java", "changes": 546, "contents_url": "https://api.github.com/repos/iee/iee/contents/org.eclipse.iee.translator.Jmole%2Forg.eclipse.iee.translator.jmole.math%2Fsrc-gen%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fjmole%2Fmath%2Fmath%2Fimpl%2FMathPackageImpl.java?ref=0f04d91efdf50447d8e84e926ef98d7462103dc0", "deletions": 99, "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/math/impl/MathPackageImpl.java", "new_code": "import org.eclipse.iee.translator.jmole.math.math.Matrix;\nimport org.eclipse.iee.translator.jmole.math.math.MatrixAddition;\nimport org.eclipse.iee.translator.jmole.math.math.MatrixAssignment;\nimport org.eclipse.iee.translator.jmole.math.math.MatrixElement;\nimport org.eclipse.iee.translator.jmole.math.math.MatrixExpression;\nimport org.eclipse.iee.translator.jmole.math.math.MatrixFormula;\nimport org.eclipse.iee.translator.jmole.math.math.MatrixMultiplication;\nimport org.eclipse.iee.translator.jmole.math.math.MatrixSubtraction;\nimport org.eclipse.iee.translator.jmole.math.math.MatrixVariable;\nimport org.eclipse.iee.translator.jmole.math.math.NewMatrix;\nimport org.eclipse.iee.translator.jmole.math.math.TransposeMatrix;\nimport org.eclipse.iee.translator.jmole.math.math.VariableAssignment;\n private EClass variableAssignmentEClass = null;\n private EClass matrixEClass = null;\n private EClass matrixRowEClass = null;\n private EClass matrixAssignmentEClass = null;\n\n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n private EClass matrixFormulaEClass = null;\n\n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n private EClass matrixExpressionEClass = null;\n\n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n private EClass functionDefinitionEClass = null;\n private EClass exponentEClass = null;\n private EClass variableEClass = null;\n private EClass floatEClass = null;\n private EClass matrixElementEClass = null;\n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n private EClass matrixAdditionEClass = null;\n\n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n private EClass matrixSubtractionEClass = null;\n\n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n private EClass matrixMultiplicationEClass = null;\n\n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n private EClass newMatrixEClass = null;\n\n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n private EClass transposeMatrixEClass = null;\n\n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n private EClass matrixVariableEClass = null;\n\n public EReference getStatement_VariableAssignment()\n public EReference getStatement_Formula()\n public EReference getStatement_MatrixAssignment()\n public EReference getStatement_MatrixFormula()\n {\n return (EReference)statementEClass.getEStructuralFeatures().get(4);\n }\n\n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n public EClass getVariableAssignment()\n return variableAssignmentEClass;\n public EAttribute getVariableAssignment_Variable()\n return (EAttribute)variableAssignmentEClass.getEStructuralFeatures().get(0);\n public EReference getVariableAssignment_Value()\n return (EReference)variableAssignmentEClass.getEStructuralFeatures().get(1);\n public EClass getMatrix()\n return matrixEClass;\n public EReference getMatrix_Rows()\n return (EReference)matrixEClass.getEStructuralFeatures().get(0);\n public EClass getMatrixRow()\n return matrixRowEClass;\n public EAttribute getMatrixRow_Elements()\n return (EAttribute)matrixRowEClass.getEStructuralFeatures().get(0);\n public EClass getMatrixAssignment()\n return matrixAssignmentEClass;\n public EAttribute getMatrixAssignment_Variable()\n return (EAttribute)matrixAssignmentEClass.getEStructuralFeatures().get(0);\n public EReference getMatrixAssignment_Value()\n return (EReference)matrixAssignmentEClass.getEStructuralFeatures().get(1);\n public EClass getMatrixFormula()\n return matrixFormulaEClass;\n }\n\n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n public EReference getMatrixFormula_Expression()\n {\n return (EReference)matrixFormulaEClass.getEStructuralFeatures().get(0);\n }\n\n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n public EClass getMatrixExpression()\n {\n return matrixExpressionEClass;\n }\n\n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n public EClass getFunctionDefinition()\n {\n return functionDefinitionEClass;\n }\n\n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n public EReference getFunctionDefinition_Function()\n {\n return (EReference)functionDefinitionEClass.getEStructuralFeatures().get(0);\n }\n\n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n public EReference getFunctionDefinition_Formula()\n {\n return (EReference)functionDefinitionEClass.getEStructuralFeatures().get(1);\n public EClass getExponent()\n return exponentEClass;\n public EReference getExponent_Left()\n return (EReference)exponentEClass.getEStructuralFeatures().get(0);\n public EReference getExponent_Right()\n return (EReference)exponentEClass.getEStructuralFeatures().get(1);\n public EClass getVariable()\n return variableEClass;\n public EClass getFloat()\n return floatEClass;\n public EAttribute getFloat_Value()\n return (EAttribute)floatEClass.getEStructuralFeatures().get(0);\n public EClass getMatrixElement()\n return matrixElementEClass;\n public EAttribute getMatrixElement_Element()\n return (EAttribute)matrixElementEClass.getEStructuralFeatures().get(0);\n public EAttribute getMatrixElement_Row()\n return (EAttribute)matrixElementEClass.getEStructuralFeatures().get(1);\n public EAttribute getMatrixElement_Column()\n return (EAttribute)matrixElementEClass.getEStructuralFeatures().get(2);\n public EClass getFunction()\n return functionEClass;\n public EReference getFunction_Function()\n return (EReference)functionEClass.getEStructuralFeatures().get(0);\n public EClass getMatrixAddition()\n return matrixAdditionEClass;\n }\n\n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n public EReference getMatrixAddition_Left()\n {\n return (EReference)matrixAdditionEClass.getEStructuralFeatures().get(0);\n }\n\n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n public EReference getMatrixAddition_Right()\n {\n return (EReference)matrixAdditionEClass.getEStructuralFeatures().get(1);\n }\n\n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n public EClass getMatrixSubtraction()\n {\n return matrixSubtractionEClass;\n }\n\n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n public EReference getMatrixSubtraction_Left()\n {\n return (EReference)matrixSubtractionEClass.getEStructuralFeatures().get(0);\n }\n\n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n public EReference getMatrixSubtraction_Right()\n {\n return (EReference)matrixSubtractionEClass.getEStructuralFeatures().get(1);\n }\n\n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n public EClass getMatrixMultiplication()\n {\n return matrixMultiplicationEClass;\n }\n\n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n public EReference getMatrixMultiplication_Left()\n {\n return (EReference)matrixMultiplicationEClass.getEStructuralFeatures().get(0);\n }\n\n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n public EReference getMatrixMultiplication_RightMatrix()\n {\n return (EReference)matrixMultiplicationEClass.getEStructuralFeatures().get(1);\n }\n\n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n public EReference getMatrixMultiplication_RightScalar()\n {\n return (EReference)matrixMultiplicationEClass.getEStructuralFeatures().get(2);\n }\n\n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n public EClass getNewMatrix()\n {\n return newMatrixEClass;\n }\n\n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n public EReference getNewMatrix_Matrix()\n {\n return (EReference)newMatrixEClass.getEStructuralFeatures().get(0);\n }\n\n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n public EClass getTransposeMatrix()\n {\n return transposeMatrixEClass;\n }\n\n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n public EAttribute getTransposeMatrix_Name()\n {\n return (EAttribute)transposeMatrixEClass.getEStructuralFeatures().get(0);\n }\n\n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n public EClass getMatrixVariable()\n {\n return matrixVariableEClass;\n }\n\n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n public EAttribute getMatrixVariable_Name()\n {\n return (EAttribute)matrixVariableEClass.getEStructuralFeatures().get(0);\n createEReference(statementEClass, STATEMENT__VARIABLE_ASSIGNMENT);\n createEReference(statementEClass, STATEMENT__MATRIX_ASSIGNMENT);\n createEReference(statementEClass, STATEMENT__MATRIX_FORMULA);\n variableAssignmentEClass = createEClass(VARIABLE_ASSIGNMENT);\n createEAttribute(variableAssignmentEClass, VARIABLE_ASSIGNMENT__VARIABLE);\n createEReference(variableAssignmentEClass, VARIABLE_ASSIGNMENT__VALUE);\n matrixEClass = createEClass(MATRIX);\n createEReference(matrixEClass, MATRIX__ROWS);\n matrixAssignmentEClass = createEClass(MATRIX_ASSIGNMENT);\n createEAttribute(matrixAssignmentEClass, MATRIX_ASSIGNMENT__VARIABLE);\n createEReference(matrixAssignmentEClass, MATRIX_ASSIGNMENT__VALUE);\n\n matrixFormulaEClass = createEClass(MATRIX_FORMULA);\n createEReference(matrixFormulaEClass, MATRIX_FORMULA__EXPRESSION);\n\n matrixExpressionEClass = createEClass(MATRIX_EXPRESSION);\n\n functionDefinitionEClass = createEClass(FUNCTION_DEFINITION);\n createEReference(functionDefinitionEClass, FUNCTION_DEFINITION__FUNCTION);\n createEReference(functionDefinitionEClass, FUNCTION_DEFINITION__FORMULA);\n\n matrixElementEClass = createEClass(MATRIX_ELEMENT);\n createEAttribute(matrixElementEClass, MATRIX_ELEMENT__ELEMENT);\n createEAttribute(matrixElementEClass, MATRIX_ELEMENT__ROW);\n createEAttribute(matrixElementEClass, MATRIX_ELEMENT__COLUMN);\n\n\n matrixAdditionEClass = createEClass(MATRIX_ADDITION);\n createEReference(matrixAdditionEClass, MATRIX_ADDITION__LEFT);\n createEReference(matrixAdditionEClass, MATRIX_ADDITION__RIGHT);\n\n matrixSubtractionEClass = createEClass(MATRIX_SUBTRACTION);\n createEReference(matrixSubtractionEClass, MATRIX_SUBTRACTION__LEFT);\n createEReference(matrixSubtractionEClass, MATRIX_SUBTRACTION__RIGHT);\n\n matrixMultiplicationEClass = createEClass(MATRIX_MULTIPLICATION);\n createEReference(matrixMultiplicationEClass, MATRIX_MULTIPLICATION__LEFT);\n createEReference(matrixMultiplicationEClass, MATRIX_MULTIPLICATION__RIGHT_MATRIX);\n createEReference(matrixMultiplicationEClass, MATRIX_MULTIPLICATION__RIGHT_SCALAR);\n\n newMatrixEClass = createEClass(NEW_MATRIX);\n createEReference(newMatrixEClass, NEW_MATRIX__MATRIX);\n\n transposeMatrixEClass = createEClass(TRANSPOSE_MATRIX);\n createEAttribute(transposeMatrixEClass, TRANSPOSE_MATRIX__NAME);\n\n matrixVariableEClass = createEClass(MATRIX_VARIABLE);\n createEAttribute(matrixVariableEClass, MATRIX_VARIABLE__NAME);\n matrixElementEClass.getESuperTypes().add(this.getExpression());\n matrixAdditionEClass.getESuperTypes().add(this.getMatrixExpression());\n matrixSubtractionEClass.getESuperTypes().add(this.getMatrixExpression());\n matrixMultiplicationEClass.getESuperTypes().add(this.getMatrixExpression());\n newMatrixEClass.getESuperTypes().add(this.getMatrixExpression());\n transposeMatrixEClass.getESuperTypes().add(this.getMatrixExpression());\n matrixVariableEClass.getESuperTypes().add(this.getMatrixExpression());\n initEReference(getStatement_VariableAssignment(), this.getVariableAssignment(), null, \"variableAssignment\", null, 0, 1, Statement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n initEReference(getStatement_MatrixAssignment(), this.getMatrixAssignment(), null, \"matrixAssignment\", null, 0, 1, Statement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n initEReference(getStatement_MatrixFormula(), this.getMatrixFormula(), null, \"matrixFormula\", null, 0, 1, Statement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n initEClass(variableAssignmentEClass, VariableAssignment.class, \"VariableAssignment\", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\n initEAttribute(getVariableAssignment_Variable(), ecorePackage.getEString(), \"variable\", null, 0, 1, VariableAssignment.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n initEReference(getVariableAssignment_Value(), this.getFormula(), null, \"value\", null, 0, 1, VariableAssignment.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n initEClass(matrixEClass, Matrix.class, \"Matrix\", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\n initEReference(getMatrix_Rows(), this.getMatrixRow(), null, \"rows\", null, 0, -1, Matrix.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n initEClass(matrixAssignmentEClass, MatrixAssignment.class, \"MatrixAssignment\", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\n initEAttribute(getMatrixAssignment_Variable(), ecorePackage.getEString(), \"variable\", null, 0, 1, MatrixAssignment.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n initEReference(getMatrixAssignment_Value(), this.getMatrixFormula(), null, \"value\", null, 0, 1, MatrixAssignment.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n\n initEClass(matrixFormulaEClass, MatrixFormula.class, \"MatrixFormula\", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\n initEReference(getMatrixFormula_Expression(), this.getMatrixExpression(), null, \"expression\", null, 0, 1, MatrixFormula.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n\n initEClass(matrixExpressionEClass, MatrixExpression.class, \"MatrixExpression\", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\n\n initEClass(functionDefinitionEClass, FunctionDefinition.class, \"FunctionDefinition\", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\n initEReference(getFunctionDefinition_Function(), this.getExpression(), null, \"function\", null, 0, 1, FunctionDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n initEReference(getFunctionDefinition_Formula(), this.getFormula(), null, \"formula\", null, 0, 1, FunctionDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n\n initEClass(matrixElementEClass, MatrixElement.class, \"MatrixElement\", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\n initEAttribute(getMatrixElement_Element(), ecorePackage.getEString(), \"element\", null, 0, 1, MatrixElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n initEAttribute(getMatrixElement_Row(), ecorePackage.getEInt(), \"row\", null, 0, 1, MatrixElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n initEAttribute(getMatrixElement_Column(), ecorePackage.getEInt(), \"column\", null, 0, 1, MatrixElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n\n initEClass(matrixAdditionEClass, MatrixAddition.class, \"MatrixAddition\", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\n initEReference(getMatrixAddition_Left(), this.getMatrixExpression(), null, \"left\", null, 0, 1, MatrixAddition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n initEReference(getMatrixAddition_Right(), this.getMatrixExpression(), null, \"right\", null, 0, 1, MatrixAddition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n\n initEClass(matrixSubtractionEClass, MatrixSubtraction.class, \"MatrixSubtraction\", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\n initEReference(getMatrixSubtraction_Left(), this.getMatrixExpression(), null, \"left\", null, 0, 1, MatrixSubtraction.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n initEReference(getMatrixSubtraction_Right(), this.getMatrixExpression(), null, \"right\", null, 0, 1, MatrixSubtraction.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n\n initEClass(matrixMultiplicationEClass, MatrixMultiplication.class, \"MatrixMultiplication\", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\n initEReference(getMatrixMultiplication_Left(), this.getMatrixExpression(), null, \"left\", null, 0, 1, MatrixMultiplication.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n initEReference(getMatrixMultiplication_RightMatrix(), this.getMatrixExpression(), null, \"rightMatrix\", null, 0, 1, MatrixMultiplication.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n initEReference(getMatrixMultiplication_RightScalar(), this.getFormula(), null, \"rightScalar\", null, 0, 1, MatrixMultiplication.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n\n initEClass(newMatrixEClass, NewMatrix.class, \"NewMatrix\", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\n initEReference(getNewMatrix_Matrix(), this.getMatrix(), null, \"matrix\", null, 0, 1, NewMatrix.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n\n initEClass(transposeMatrixEClass, TransposeMatrix.class, \"TransposeMatrix\", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\n initEAttribute(getTransposeMatrix_Name(), ecorePackage.getEString(), \"name\", null, 0, 1, TransposeMatrix.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n\n initEClass(matrixVariableEClass, MatrixVariable.class, \"MatrixVariable\", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\n initEAttribute(getMatrixVariable_Name(), ecorePackage.getEString(), \"name\", null, 0, 1, MatrixVariable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n", "new_methods": [ { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/math/impl/MathPackageImpl.java", "implementation": "return (EReference)statementEClass.getEStructuralFeatures().get(4);", "signature": "EReference getStatement_MatrixFormula()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/math/impl/MathPackageImpl.java", "implementation": "return (EReference)matrixFormulaEClass.getEStructuralFeatures().get(0);", "signature": "EReference getMatrixFormula_Expression()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/math/impl/MathPackageImpl.java", "implementation": "return matrixExpressionEClass;", "signature": "EClass getMatrixExpression()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/math/impl/MathPackageImpl.java", "implementation": "return functionDefinitionEClass;", "signature": "EClass getFunctionDefinition()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/math/impl/MathPackageImpl.java", "implementation": "return (EReference)functionDefinitionEClass.getEStructuralFeatures().get(0);", "signature": "EReference getFunctionDefinition_Function()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/math/impl/MathPackageImpl.java", "implementation": "return (EReference)functionDefinitionEClass.getEStructuralFeatures().get(1);\n public EClass getExponent()\n return exponentEClass;\n public EReference getExponent_Left()\n return (EReference)exponentEClass.getEStructuralFeatures().get(0);\n public EReference getExponent_Right()\n return (EReference)exponentEClass.getEStructuralFeatures().get(1);\n public EClass getVariable()\n return variableEClass;\n public EClass getFloat()\n return floatEClass;\n public EAttribute getFloat_Value()\n return (EAttribute)floatEClass.getEStructuralFeatures().get(0);\n public EClass getMatrixElement()\n return matrixElementEClass;\n public EAttribute getMatrixElement_Element()\n return (EAttribute)matrixElementEClass.getEStructuralFeatures().get(0);\n public EAttribute getMatrixElement_Row()\n return (EAttribute)matrixElementEClass.getEStructuralFeatures().get(1);\n public EAttribute getMatrixElement_Column()\n return (EAttribute)matrixElementEClass.getEStructuralFeatures().get(2);\n public EClass getFunction()\n return functionEClass;\n public EReference getFunction_Function()\n return (EReference)functionEClass.getEStructuralFeatures().get(0);\n public EClass getMatrixAddition()\n return matrixAdditionEClass;", "signature": "EReference getFunctionDefinition_Formula()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/math/impl/MathPackageImpl.java", "implementation": "return (EReference)matrixAdditionEClass.getEStructuralFeatures().get(0);", "signature": "EReference getMatrixAddition_Left()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/math/impl/MathPackageImpl.java", "implementation": "return (EReference)matrixAdditionEClass.getEStructuralFeatures().get(1);", "signature": "EReference getMatrixAddition_Right()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/math/impl/MathPackageImpl.java", "implementation": "return matrixSubtractionEClass;", "signature": "EClass getMatrixSubtraction()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/math/impl/MathPackageImpl.java", "implementation": "return (EReference)matrixSubtractionEClass.getEStructuralFeatures().get(0);", "signature": "EReference getMatrixSubtraction_Left()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/math/impl/MathPackageImpl.java", "implementation": "return (EReference)matrixSubtractionEClass.getEStructuralFeatures().get(1);", "signature": "EReference getMatrixSubtraction_Right()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/math/impl/MathPackageImpl.java", "implementation": "return matrixMultiplicationEClass;", "signature": "EClass getMatrixMultiplication()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/math/impl/MathPackageImpl.java", "implementation": "return (EReference)matrixMultiplicationEClass.getEStructuralFeatures().get(0);", "signature": "EReference getMatrixMultiplication_Left()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/math/impl/MathPackageImpl.java", "implementation": "return (EReference)matrixMultiplicationEClass.getEStructuralFeatures().get(1);", "signature": "EReference getMatrixMultiplication_RightMatrix()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/math/impl/MathPackageImpl.java", "implementation": "return (EReference)matrixMultiplicationEClass.getEStructuralFeatures().get(2);", "signature": "EReference getMatrixMultiplication_RightScalar()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/math/impl/MathPackageImpl.java", "implementation": "return newMatrixEClass;", "signature": "EClass getNewMatrix()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/math/impl/MathPackageImpl.java", "implementation": "return (EReference)newMatrixEClass.getEStructuralFeatures().get(0);", "signature": "EReference getNewMatrix_Matrix()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/math/impl/MathPackageImpl.java", "implementation": "return transposeMatrixEClass;", "signature": "EClass getTransposeMatrix()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/math/impl/MathPackageImpl.java", "implementation": "return (EAttribute)transposeMatrixEClass.getEStructuralFeatures().get(0);", "signature": "EAttribute getTransposeMatrix_Name()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/math/impl/MathPackageImpl.java", "implementation": "return matrixVariableEClass;", "signature": "EClass getMatrixVariable()" } ], "old_code": "import org.eclipse.iee.translator.jmole.math.math.Assignment;\nimport org.eclipse.iee.translator.jmole.math.math.Interval;\nimport org.eclipse.iee.translator.jmole.math.math.MatrixDefinition;\n private EClass assignmentEClass = null;\n private EClass functionDefinitionEClass = null;\n private EClass matrixDefinitionEClass = null;\n private EClass matrixRowEClass = null;\n private EClass intervalEClass = null;\n private EClass exponentEClass = null;\n private EClass variableEClass = null;\n private EClass floatEClass = null;\n public EReference getStatement_MatrixDefinition()\n public EReference getStatement_Assignment()\n public EReference getStatement_Formula()\n public EClass getAssignment()\n return assignmentEClass;\n public EAttribute getAssignment_Variable()\n return (EAttribute)assignmentEClass.getEStructuralFeatures().get(0);\n public EReference getAssignment_Value()\n return (EReference)assignmentEClass.getEStructuralFeatures().get(1);\n public EClass getFunctionDefinition()\n return functionDefinitionEClass;\n public EReference getFunctionDefinition_Function()\n return (EReference)functionDefinitionEClass.getEStructuralFeatures().get(0);\n public EReference getFunctionDefinition_Formula()\n return (EReference)functionDefinitionEClass.getEStructuralFeatures().get(1);\n public EClass getMatrixDefinition()\n return matrixDefinitionEClass;\n public EAttribute getMatrixDefinition_Name()\n return (EAttribute)matrixDefinitionEClass.getEStructuralFeatures().get(0);\n public EReference getMatrixDefinition_Rows()\n return (EReference)matrixDefinitionEClass.getEStructuralFeatures().get(1);\n public EClass getMatrixRow()\n return matrixRowEClass;\n public EAttribute getMatrixRow_Elements()\n return (EAttribute)matrixRowEClass.getEStructuralFeatures().get(0);\n public EClass getInterval()\n return intervalEClass;\n public EAttribute getInterval_OpeningBracket()\n return (EAttribute)intervalEClass.getEStructuralFeatures().get(0);\n public EReference getInterval_Ceil()\n return (EReference)intervalEClass.getEStructuralFeatures().get(1);\n public EReference getInterval_Floor()\n return (EReference)intervalEClass.getEStructuralFeatures().get(2);\n public EAttribute getInterval_ClosingBracket()\n return (EAttribute)intervalEClass.getEStructuralFeatures().get(3);\n public EClass getExponent()\n return exponentEClass;\n public EReference getExponent_Left()\n return (EReference)exponentEClass.getEStructuralFeatures().get(0);\n public EReference getExponent_Right()\n return (EReference)exponentEClass.getEStructuralFeatures().get(1);\n public EClass getVariable()\n return variableEClass;\n public EClass getFloat()\n return floatEClass;\n public EAttribute getFloat_Value()\n return (EAttribute)floatEClass.getEStructuralFeatures().get(0);\n public EClass getFunction()\n return functionEClass;\n public EReference getFunction_Function()\n return (EReference)functionEClass.getEStructuralFeatures().get(0);\n createEReference(statementEClass, STATEMENT__MATRIX_DEFINITION);\n createEReference(statementEClass, STATEMENT__ASSIGNMENT);\n assignmentEClass = createEClass(ASSIGNMENT);\n createEAttribute(assignmentEClass, ASSIGNMENT__VARIABLE);\n createEReference(assignmentEClass, ASSIGNMENT__VALUE);\n functionDefinitionEClass = createEClass(FUNCTION_DEFINITION);\n createEReference(functionDefinitionEClass, FUNCTION_DEFINITION__FUNCTION);\n createEReference(functionDefinitionEClass, FUNCTION_DEFINITION__FORMULA);\n\n matrixDefinitionEClass = createEClass(MATRIX_DEFINITION);\n createEAttribute(matrixDefinitionEClass, MATRIX_DEFINITION__NAME);\n createEReference(matrixDefinitionEClass, MATRIX_DEFINITION__ROWS);\n intervalEClass = createEClass(INTERVAL);\n createEAttribute(intervalEClass, INTERVAL__OPENING_BRACKET);\n createEReference(intervalEClass, INTERVAL__CEIL);\n createEReference(intervalEClass, INTERVAL__FLOOR);\n createEAttribute(intervalEClass, INTERVAL__CLOSING_BRACKET);\n\n intervalEClass.getESuperTypes().add(this.getExpression());\n initEReference(getStatement_MatrixDefinition(), this.getMatrixDefinition(), null, \"matrixDefinition\", null, 0, 1, Statement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n initEReference(getStatement_Assignment(), this.getAssignment(), null, \"assignment\", null, 0, 1, Statement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n initEClass(assignmentEClass, Assignment.class, \"Assignment\", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\n initEAttribute(getAssignment_Variable(), ecorePackage.getEString(), \"variable\", null, 0, 1, Assignment.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n initEReference(getAssignment_Value(), this.getFormula(), null, \"value\", null, 0, 1, Assignment.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n initEClass(functionDefinitionEClass, FunctionDefinition.class, \"FunctionDefinition\", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\n initEReference(getFunctionDefinition_Function(), this.getExpression(), null, \"function\", null, 0, 1, FunctionDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n initEReference(getFunctionDefinition_Formula(), this.getFormula(), null, \"formula\", null, 0, 1, FunctionDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n\n initEClass(matrixDefinitionEClass, MatrixDefinition.class, \"MatrixDefinition\", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\n initEAttribute(getMatrixDefinition_Name(), ecorePackage.getEString(), \"name\", null, 0, 1, MatrixDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n initEReference(getMatrixDefinition_Rows(), this.getMatrixRow(), null, \"rows\", null, 0, -1, MatrixDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n initEClass(intervalEClass, Interval.class, \"Interval\", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\n initEAttribute(getInterval_OpeningBracket(), ecorePackage.getEString(), \"openingBracket\", null, 0, 1, Interval.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n initEReference(getInterval_Ceil(), this.getExpression(), null, \"ceil\", null, 0, 1, Interval.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n initEReference(getInterval_Floor(), this.getExpression(), null, \"floor\", null, 0, 1, Interval.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n initEAttribute(getInterval_ClosingBracket(), ecorePackage.getEString(), \"closingBracket\", null, 0, 1, Interval.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n", "old_methods": [], "patch": "@@ -14,25 +14,34 @@\n import org.eclipse.emf.ecore.impl.EPackageImpl;\n \n import org.eclipse.iee.translator.jmole.math.math.Addition;\n-import org.eclipse.iee.translator.jmole.math.math.Assignment;\n import org.eclipse.iee.translator.jmole.math.math.Division;\n import org.eclipse.iee.translator.jmole.math.math.Exponent;\n import org.eclipse.iee.translator.jmole.math.math.Expression;\n import org.eclipse.iee.translator.jmole.math.math.Factorial;\n import org.eclipse.iee.translator.jmole.math.math.Formula;\n import org.eclipse.iee.translator.jmole.math.math.Function;\n import org.eclipse.iee.translator.jmole.math.math.FunctionDefinition;\n-import org.eclipse.iee.translator.jmole.math.math.Interval;\n import org.eclipse.iee.translator.jmole.math.math.Invert;\n import org.eclipse.iee.translator.jmole.math.math.MathFactory;\n import org.eclipse.iee.translator.jmole.math.math.MathPackage;\n-import org.eclipse.iee.translator.jmole.math.math.MatrixDefinition;\n+import org.eclipse.iee.translator.jmole.math.math.Matrix;\n+import org.eclipse.iee.translator.jmole.math.math.MatrixAddition;\n+import org.eclipse.iee.translator.jmole.math.math.MatrixAssignment;\n+import org.eclipse.iee.translator.jmole.math.math.MatrixElement;\n+import org.eclipse.iee.translator.jmole.math.math.MatrixExpression;\n+import org.eclipse.iee.translator.jmole.math.math.MatrixFormula;\n+import org.eclipse.iee.translator.jmole.math.math.MatrixMultiplication;\n import org.eclipse.iee.translator.jmole.math.math.MatrixRow;\n+import org.eclipse.iee.translator.jmole.math.math.MatrixSubtraction;\n+import org.eclipse.iee.translator.jmole.math.math.MatrixVariable;\n import org.eclipse.iee.translator.jmole.math.math.Modulo;\n import org.eclipse.iee.translator.jmole.math.math.Multiplication;\n+import org.eclipse.iee.translator.jmole.math.math.NewMatrix;\n import org.eclipse.iee.translator.jmole.math.math.Statement;\n import org.eclipse.iee.translator.jmole.math.math.Subtraction;\n+import org.eclipse.iee.translator.jmole.math.math.TransposeMatrix;\n import org.eclipse.iee.translator.jmole.math.math.Variable;\n+import org.eclipse.iee.translator.jmole.math.math.VariableAssignment;\n \n /**\n * <!-- begin-user-doc -->\n@@ -54,7 +63,7 @@ public class MathPackageImpl extends EPackageImpl implements MathPackage\n * <!-- end-user-doc -->\n * @generated\n */\n- private EClass assignmentEClass = null;\n+ private EClass variableAssignmentEClass = null;\n \n /**\n * <!-- begin-user-doc -->\n@@ -75,21 +84,42 @@ public class MathPackageImpl extends EPackageImpl implements MathPackage\n * <!-- end-user-doc -->\n * @generated\n */\n- private EClass functionDefinitionEClass = null;\n+ private EClass matrixEClass = null;\n \n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n- private EClass matrixDefinitionEClass = null;\n+ private EClass matrixRowEClass = null;\n \n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n- private EClass matrixRowEClass = null;\n+ private EClass matrixAssignmentEClass = null;\n+\n+ /**\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ */\n+ private EClass matrixFormulaEClass = null;\n+\n+ /**\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ */\n+ private EClass matrixExpressionEClass = null;\n+\n+ /**\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ */\n+ private EClass functionDefinitionEClass = null;\n \n /**\n * <!-- begin-user-doc -->\n@@ -145,28 +175,28 @@ public class MathPackageImpl extends EPackageImpl implements MathPackage\n * <!-- end-user-doc -->\n * @generated\n */\n- private EClass intervalEClass = null;\n+ private EClass exponentEClass = null;\n \n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n- private EClass exponentEClass = null;\n+ private EClass variableEClass = null;\n \n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n- private EClass variableEClass = null;\n+ private EClass floatEClass = null;\n \n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n- private EClass floatEClass = null;\n+ private EClass matrixElementEClass = null;\n \n /**\n * <!-- begin-user-doc -->\n@@ -175,6 +205,48 @@ public class MathPackageImpl extends EPackageImpl implements MathPackage\n */\n private EClass functionEClass = null;\n \n+ /**\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ */\n+ private EClass matrixAdditionEClass = null;\n+\n+ /**\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ */\n+ private EClass matrixSubtractionEClass = null;\n+\n+ /**\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ */\n+ private EClass matrixMultiplicationEClass = null;\n+\n+ /**\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ */\n+ private EClass newMatrixEClass = null;\n+\n+ /**\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ */\n+ private EClass transposeMatrixEClass = null;\n+\n+ /**\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ */\n+ private EClass matrixVariableEClass = null;\n+\n /**\n * Creates an instance of the model <b>Package</b>, registered with\n * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package\n@@ -263,7 +335,7 @@ public EReference getStatement_FunctionDefinition()\n * <!-- end-user-doc -->\n * @generated\n */\n- public EReference getStatement_MatrixDefinition()\n+ public EReference getStatement_VariableAssignment()\n {\n return (EReference)statementEClass.getEStructuralFeatures().get(1);\n }\n@@ -273,7 +345,7 @@ public EReference getStatement_MatrixDefinition()\n * <!-- end-user-doc -->\n * @generated\n */\n- public EReference getStatement_Assignment()\n+ public EReference getStatement_Formula()\n {\n return (EReference)statementEClass.getEStructuralFeatures().get(2);\n }\n@@ -283,7 +355,7 @@ public EReference getStatement_Assignment()\n * <!-- end-user-doc -->\n * @generated\n */\n- public EReference getStatement_Formula()\n+ public EReference getStatement_MatrixAssignment()\n {\n return (EReference)statementEClass.getEStructuralFeatures().get(3);\n }\n@@ -293,29 +365,39 @@ public EReference getStatement_Formula()\n * <!-- end-user-doc -->\n * @generated\n */\n- public EClass getAssignment()\n+ public EReference getStatement_MatrixFormula()\n+ {\n+ return (EReference)statementEClass.getEStructuralFeatures().get(4);\n+ }\n+\n+ /**\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ */\n+ public EClass getVariableAssignment()\n {\n- return assignmentEClass;\n+ return variableAssignmentEClass;\n }\n \n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n- public EAttribute getAssignment_Variable()\n+ public EAttribute getVariableAssignment_Variable()\n {\n- return (EAttribute)assignmentEClass.getEStructuralFeatures().get(0);\n+ return (EAttribute)variableAssignmentEClass.getEStructuralFeatures().get(0);\n }\n \n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n- public EReference getAssignment_Value()\n+ public EReference getVariableAssignment_Value()\n {\n- return (EReference)assignmentEClass.getEStructuralFeatures().get(1);\n+ return (EReference)variableAssignmentEClass.getEStructuralFeatures().get(1);\n }\n \n /**\n@@ -373,79 +455,129 @@ public EReference getExpression_Parameters()\n * <!-- end-user-doc -->\n * @generated\n */\n- public EClass getFunctionDefinition()\n+ public EClass getMatrix()\n {\n- return functionDefinitionEClass;\n+ return matrixEClass;\n }\n \n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n- public EReference getFunctionDefinition_Function()\n+ public EReference getMatrix_Rows()\n {\n- return (EReference)functionDefinitionEClass.getEStructuralFeatures().get(0);\n+ return (EReference)matrixEClass.getEStructuralFeatures().get(0);\n }\n \n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n- public EReference getFunctionDefinition_Formula()\n+ public EClass getMatrixRow()\n {\n- return (EReference)functionDefinitionEClass.getEStructuralFeatures().get(1);\n+ return matrixRowEClass;\n }\n \n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n- public EClass getMatrixDefinition()\n+ public EAttribute getMatrixRow_Elements()\n {\n- return matrixDefinitionEClass;\n+ return (EAttribute)matrixRowEClass.getEStructuralFeatures().get(0);\n }\n \n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n- public EAttribute getMatrixDefinition_Name()\n+ public EClass getMatrixAssignment()\n {\n- return (EAttribute)matrixDefinitionEClass.getEStructuralFeatures().get(0);\n+ return matrixAssignmentEClass;\n }\n \n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n- public EReference getMatrixDefinition_Rows()\n+ public EAttribute getMatrixAssignment_Variable()\n {\n- return (EReference)matrixDefinitionEClass.getEStructuralFeatures().get(1);\n+ return (EAttribute)matrixAssignmentEClass.getEStructuralFeatures().get(0);\n }\n \n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n- public EClass getMatrixRow()\n+ public EReference getMatrixAssignment_Value()\n {\n- return matrixRowEClass;\n+ return (EReference)matrixAssignmentEClass.getEStructuralFeatures().get(1);\n }\n \n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n- public EAttribute getMatrixRow_Elements()\n+ public EClass getMatrixFormula()\n {\n- return (EAttribute)matrixRowEClass.getEStructuralFeatures().get(0);\n+ return matrixFormulaEClass;\n+ }\n+\n+ /**\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ */\n+ public EReference getMatrixFormula_Expression()\n+ {\n+ return (EReference)matrixFormulaEClass.getEStructuralFeatures().get(0);\n+ }\n+\n+ /**\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ */\n+ public EClass getMatrixExpression()\n+ {\n+ return matrixExpressionEClass;\n+ }\n+\n+ /**\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ */\n+ public EClass getFunctionDefinition()\n+ {\n+ return functionDefinitionEClass;\n+ }\n+\n+ /**\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ */\n+ public EReference getFunctionDefinition_Function()\n+ {\n+ return (EReference)functionDefinitionEClass.getEStructuralFeatures().get(0);\n+ }\n+\n+ /**\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ */\n+ public EReference getFunctionDefinition_Formula()\n+ {\n+ return (EReference)functionDefinitionEClass.getEStructuralFeatures().get(1);\n }\n \n /**\n@@ -643,129 +775,279 @@ public EReference getFactorial_Expression()\n * <!-- end-user-doc -->\n * @generated\n */\n- public EClass getInterval()\n+ public EClass getExponent()\n {\n- return intervalEClass;\n+ return exponentEClass;\n }\n \n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n- public EAttribute getInterval_OpeningBracket()\n+ public EReference getExponent_Left()\n {\n- return (EAttribute)intervalEClass.getEStructuralFeatures().get(0);\n+ return (EReference)exponentEClass.getEStructuralFeatures().get(0);\n }\n \n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n- public EReference getInterval_Ceil()\n+ public EReference getExponent_Right()\n {\n- return (EReference)intervalEClass.getEStructuralFeatures().get(1);\n+ return (EReference)exponentEClass.getEStructuralFeatures().get(1);\n }\n \n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n- public EReference getInterval_Floor()\n+ public EClass getVariable()\n {\n- return (EReference)intervalEClass.getEStructuralFeatures().get(2);\n+ return variableEClass;\n }\n \n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n- public EAttribute getInterval_ClosingBracket()\n+ public EClass getFloat()\n {\n- return (EAttribute)intervalEClass.getEStructuralFeatures().get(3);\n+ return floatEClass;\n }\n \n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n- public EClass getExponent()\n+ public EAttribute getFloat_Value()\n {\n- return exponentEClass;\n+ return (EAttribute)floatEClass.getEStructuralFeatures().get(0);\n }\n \n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n- public EReference getExponent_Left()\n+ public EClass getMatrixElement()\n {\n- return (EReference)exponentEClass.getEStructuralFeatures().get(0);\n+ return matrixElementEClass;\n }\n \n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n- public EReference getExponent_Right()\n+ public EAttribute getMatrixElement_Element()\n {\n- return (EReference)exponentEClass.getEStructuralFeatures().get(1);\n+ return (EAttribute)matrixElementEClass.getEStructuralFeatures().get(0);\n }\n \n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n- public EClass getVariable()\n+ public EAttribute getMatrixElement_Row()\n {\n- return variableEClass;\n+ return (EAttribute)matrixElementEClass.getEStructuralFeatures().get(1);\n }\n \n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n- public EClass getFloat()\n+ public EAttribute getMatrixElement_Column()\n {\n- return floatEClass;\n+ return (EAttribute)matrixElementEClass.getEStructuralFeatures().get(2);\n }\n \n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n- public EAttribute getFloat_Value()\n+ public EClass getFunction()\n {\n- return (EAttribute)floatEClass.getEStructuralFeatures().get(0);\n+ return functionEClass;\n }\n \n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n- public EClass getFunction()\n+ public EReference getFunction_Function()\n {\n- return functionEClass;\n+ return (EReference)functionEClass.getEStructuralFeatures().get(0);\n }\n \n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n- public EReference getFunction_Function()\n+ public EClass getMatrixAddition()\n {\n- return (EReference)functionEClass.getEStructuralFeatures().get(0);\n+ return matrixAdditionEClass;\n+ }\n+\n+ /**\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ */\n+ public EReference getMatrixAddition_Left()\n+ {\n+ return (EReference)matrixAdditionEClass.getEStructuralFeatures().get(0);\n+ }\n+\n+ /**\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ */\n+ public EReference getMatrixAddition_Right()\n+ {\n+ return (EReference)matrixAdditionEClass.getEStructuralFeatures().get(1);\n+ }\n+\n+ /**\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ */\n+ public EClass getMatrixSubtraction()\n+ {\n+ return matrixSubtractionEClass;\n+ }\n+\n+ /**\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ */\n+ public EReference getMatrixSubtraction_Left()\n+ {\n+ return (EReference)matrixSubtractionEClass.getEStructuralFeatures().get(0);\n+ }\n+\n+ /**\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ */\n+ public EReference getMatrixSubtraction_Right()\n+ {\n+ return (EReference)matrixSubtractionEClass.getEStructuralFeatures().get(1);\n+ }\n+\n+ /**\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ */\n+ public EClass getMatrixMultiplication()\n+ {\n+ return matrixMultiplicationEClass;\n+ }\n+\n+ /**\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ */\n+ public EReference getMatrixMultiplication_Left()\n+ {\n+ return (EReference)matrixMultiplicationEClass.getEStructuralFeatures().get(0);\n+ }\n+\n+ /**\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ */\n+ public EReference getMatrixMultiplication_RightMatrix()\n+ {\n+ return (EReference)matrixMultiplicationEClass.getEStructuralFeatures().get(1);\n+ }\n+\n+ /**\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ */\n+ public EReference getMatrixMultiplication_RightScalar()\n+ {\n+ return (EReference)matrixMultiplicationEClass.getEStructuralFeatures().get(2);\n+ }\n+\n+ /**\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ */\n+ public EClass getNewMatrix()\n+ {\n+ return newMatrixEClass;\n+ }\n+\n+ /**\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ */\n+ public EReference getNewMatrix_Matrix()\n+ {\n+ return (EReference)newMatrixEClass.getEStructuralFeatures().get(0);\n+ }\n+\n+ /**\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ */\n+ public EClass getTransposeMatrix()\n+ {\n+ return transposeMatrixEClass;\n+ }\n+\n+ /**\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ */\n+ public EAttribute getTransposeMatrix_Name()\n+ {\n+ return (EAttribute)transposeMatrixEClass.getEStructuralFeatures().get(0);\n+ }\n+\n+ /**\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ */\n+ public EClass getMatrixVariable()\n+ {\n+ return matrixVariableEClass;\n+ }\n+\n+ /**\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ */\n+ public EAttribute getMatrixVariable_Name()\n+ {\n+ return (EAttribute)matrixVariableEClass.getEStructuralFeatures().get(0);\n }\n \n /**\n@@ -800,13 +1082,14 @@ public void createPackageContents()\n // Create classes and their features\n statementEClass = createEClass(STATEMENT);\n createEReference(statementEClass, STATEMENT__FUNCTION_DEFINITION);\n- createEReference(statementEClass, STATEMENT__MATRIX_DEFINITION);\n- createEReference(statementEClass, STATEMENT__ASSIGNMENT);\n+ createEReference(statementEClass, STATEMENT__VARIABLE_ASSIGNMENT);\n createEReference(statementEClass, STATEMENT__FORMULA);\n+ createEReference(statementEClass, STATEMENT__MATRIX_ASSIGNMENT);\n+ createEReference(statementEClass, STATEMENT__MATRIX_FORMULA);\n \n- assignmentEClass = createEClass(ASSIGNMENT);\n- createEAttribute(assignmentEClass, ASSIGNMENT__VARIABLE);\n- createEReference(assignmentEClass, ASSIGNMENT__VALUE);\n+ variableAssignmentEClass = createEClass(VARIABLE_ASSIGNMENT);\n+ createEAttribute(variableAssignmentEClass, VARIABLE_ASSIGNMENT__VARIABLE);\n+ createEReference(variableAssignmentEClass, VARIABLE_ASSIGNMENT__VALUE);\n \n formulaEClass = createEClass(FORMULA);\n createEReference(formulaEClass, FORMULA__EXPRESSION);\n@@ -815,17 +1098,25 @@ public void createPackageContents()\n createEAttribute(expressionEClass, EXPRESSION__NAME);\n createEReference(expressionEClass, EXPRESSION__PARAMETERS);\n \n- functionDefinitionEClass = createEClass(FUNCTION_DEFINITION);\n- createEReference(functionDefinitionEClass, FUNCTION_DEFINITION__FUNCTION);\n- createEReference(functionDefinitionEClass, FUNCTION_DEFINITION__FORMULA);\n-\n- matrixDefinitionEClass = createEClass(MATRIX_DEFINITION);\n- createEAttribute(matrixDefinitionEClass, MATRIX_DEFINITION__NAME);\n- createEReference(matrixDefinitionEClass, MATRIX_DEFINITION__ROWS);\n+ matrixEClass = createEClass(MATRIX);\n+ createEReference(matrixEClass, MATRIX__ROWS);\n \n matrixRowEClass = createEClass(MATRIX_ROW);\n createEAttribute(matrixRowEClass, MATRIX_ROW__ELEMENTS);\n \n+ matrixAssignmentEClass = createEClass(MATRIX_ASSIGNMENT);\n+ createEAttribute(matrixAssignmentEClass, MATRIX_ASSIGNMENT__VARIABLE);\n+ createEReference(matrixAssignmentEClass, MATRIX_ASSIGNMENT__VALUE);\n+\n+ matrixFormulaEClass = createEClass(MATRIX_FORMULA);\n+ createEReference(matrixFormulaEClass, MATRIX_FORMULA__EXPRESSION);\n+\n+ matrixExpressionEClass = createEClass(MATRIX_EXPRESSION);\n+\n+ functionDefinitionEClass = createEClass(FUNCTION_DEFINITION);\n+ createEReference(functionDefinitionEClass, FUNCTION_DEFINITION__FUNCTION);\n+ createEReference(functionDefinitionEClass, FUNCTION_DEFINITION__FORMULA);\n+\n additionEClass = createEClass(ADDITION);\n createEReference(additionEClass, ADDITION__LEFT);\n createEReference(additionEClass, ADDITION__RIGHT);\n@@ -852,12 +1143,6 @@ public void createPackageContents()\n factorialEClass = createEClass(FACTORIAL);\n createEReference(factorialEClass, FACTORIAL__EXPRESSION);\n \n- intervalEClass = createEClass(INTERVAL);\n- createEAttribute(intervalEClass, INTERVAL__OPENING_BRACKET);\n- createEReference(intervalEClass, INTERVAL__CEIL);\n- createEReference(intervalEClass, INTERVAL__FLOOR);\n- createEAttribute(intervalEClass, INTERVAL__CLOSING_BRACKET);\n-\n exponentEClass = createEClass(EXPONENT);\n createEReference(exponentEClass, EXPONENT__LEFT);\n createEReference(exponentEClass, EXPONENT__RIGHT);\n@@ -867,8 +1152,35 @@ public void createPackageContents()\n floatEClass = createEClass(FLOAT);\n createEAttribute(floatEClass, FLOAT__VALUE);\n \n+ matrixElementEClass = createEClass(MATRIX_ELEMENT);\n+ createEAttribute(matrixElementEClass, MATRIX_ELEMENT__ELEMENT);\n+ createEAttribute(matrixElementEClass, MATRIX_ELEMENT__ROW);\n+ createEAttribute(matrixElementEClass, MATRIX_ELEMENT__COLUMN);\n+\n functionEClass = createEClass(FUNCTION);\n createEReference(functionEClass, FUNCTION__FUNCTION);\n+\n+ matrixAdditionEClass = createEClass(MATRIX_ADDITION);\n+ createEReference(matrixAdditionEClass, MATRIX_ADDITION__LEFT);\n+ createEReference(matrixAdditionEClass, MATRIX_ADDITION__RIGHT);\n+\n+ matrixSubtractionEClass = createEClass(MATRIX_SUBTRACTION);\n+ createEReference(matrixSubtractionEClass, MATRIX_SUBTRACTION__LEFT);\n+ createEReference(matrixSubtractionEClass, MATRIX_SUBTRACTION__RIGHT);\n+\n+ matrixMultiplicationEClass = createEClass(MATRIX_MULTIPLICATION);\n+ createEReference(matrixMultiplicationEClass, MATRIX_MULTIPLICATION__LEFT);\n+ createEReference(matrixMultiplicationEClass, MATRIX_MULTIPLICATION__RIGHT_MATRIX);\n+ createEReference(matrixMultiplicationEClass, MATRIX_MULTIPLICATION__RIGHT_SCALAR);\n+\n+ newMatrixEClass = createEClass(NEW_MATRIX);\n+ createEReference(newMatrixEClass, NEW_MATRIX__MATRIX);\n+\n+ transposeMatrixEClass = createEClass(TRANSPOSE_MATRIX);\n+ createEAttribute(transposeMatrixEClass, TRANSPOSE_MATRIX__NAME);\n+\n+ matrixVariableEClass = createEClass(MATRIX_VARIABLE);\n+ createEAttribute(matrixVariableEClass, MATRIX_VARIABLE__NAME);\n }\n \n /**\n@@ -907,22 +1219,29 @@ public void initializePackageContents()\n moduloEClass.getESuperTypes().add(this.getExpression());\n invertEClass.getESuperTypes().add(this.getExpression());\n factorialEClass.getESuperTypes().add(this.getExpression());\n- intervalEClass.getESuperTypes().add(this.getExpression());\n exponentEClass.getESuperTypes().add(this.getExpression());\n variableEClass.getESuperTypes().add(this.getExpression());\n floatEClass.getESuperTypes().add(this.getExpression());\n+ matrixElementEClass.getESuperTypes().add(this.getExpression());\n functionEClass.getESuperTypes().add(this.getExpression());\n+ matrixAdditionEClass.getESuperTypes().add(this.getMatrixExpression());\n+ matrixSubtractionEClass.getESuperTypes().add(this.getMatrixExpression());\n+ matrixMultiplicationEClass.getESuperTypes().add(this.getMatrixExpression());\n+ newMatrixEClass.getESuperTypes().add(this.getMatrixExpression());\n+ transposeMatrixEClass.getESuperTypes().add(this.getMatrixExpression());\n+ matrixVariableEClass.getESuperTypes().add(this.getMatrixExpression());\n \n // Initialize classes and features; add operations and parameters\n initEClass(statementEClass, Statement.class, \"Statement\", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\n initEReference(getStatement_FunctionDefinition(), this.getFunctionDefinition(), null, \"functionDefinition\", null, 0, 1, Statement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n- initEReference(getStatement_MatrixDefinition(), this.getMatrixDefinition(), null, \"matrixDefinition\", null, 0, 1, Statement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n- initEReference(getStatement_Assignment(), this.getAssignment(), null, \"assignment\", null, 0, 1, Statement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n+ initEReference(getStatement_VariableAssignment(), this.getVariableAssignment(), null, \"variableAssignment\", null, 0, 1, Statement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n initEReference(getStatement_Formula(), this.getFormula(), null, \"formula\", null, 0, 1, Statement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n+ initEReference(getStatement_MatrixAssignment(), this.getMatrixAssignment(), null, \"matrixAssignment\", null, 0, 1, Statement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n+ initEReference(getStatement_MatrixFormula(), this.getMatrixFormula(), null, \"matrixFormula\", null, 0, 1, Statement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n \n- initEClass(assignmentEClass, Assignment.class, \"Assignment\", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\n- initEAttribute(getAssignment_Variable(), ecorePackage.getEString(), \"variable\", null, 0, 1, Assignment.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n- initEReference(getAssignment_Value(), this.getFormula(), null, \"value\", null, 0, 1, Assignment.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n+ initEClass(variableAssignmentEClass, VariableAssignment.class, \"VariableAssignment\", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\n+ initEAttribute(getVariableAssignment_Variable(), ecorePackage.getEString(), \"variable\", null, 0, 1, VariableAssignment.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n+ initEReference(getVariableAssignment_Value(), this.getFormula(), null, \"value\", null, 0, 1, VariableAssignment.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n \n initEClass(formulaEClass, Formula.class, \"Formula\", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\n initEReference(getFormula_Expression(), this.getExpression(), null, \"expression\", null, 0, 1, Formula.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n@@ -931,17 +1250,25 @@ public void initializePackageContents()\n initEAttribute(getExpression_Name(), ecorePackage.getEString(), \"name\", null, 0, 1, Expression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n initEReference(getExpression_Parameters(), this.getFormula(), null, \"parameters\", null, 0, -1, Expression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n \n- initEClass(functionDefinitionEClass, FunctionDefinition.class, \"FunctionDefinition\", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\n- initEReference(getFunctionDefinition_Function(), this.getExpression(), null, \"function\", null, 0, 1, FunctionDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n- initEReference(getFunctionDefinition_Formula(), this.getFormula(), null, \"formula\", null, 0, 1, FunctionDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n-\n- initEClass(matrixDefinitionEClass, MatrixDefinition.class, \"MatrixDefinition\", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\n- initEAttribute(getMatrixDefinition_Name(), ecorePackage.getEString(), \"name\", null, 0, 1, MatrixDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n- initEReference(getMatrixDefinition_Rows(), this.getMatrixRow(), null, \"rows\", null, 0, -1, MatrixDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n+ initEClass(matrixEClass, Matrix.class, \"Matrix\", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\n+ initEReference(getMatrix_Rows(), this.getMatrixRow(), null, \"rows\", null, 0, -1, Matrix.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n \n initEClass(matrixRowEClass, MatrixRow.class, \"MatrixRow\", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\n initEAttribute(getMatrixRow_Elements(), ecorePackage.getEString(), \"elements\", null, 0, -1, MatrixRow.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n \n+ initEClass(matrixAssignmentEClass, MatrixAssignment.class, \"MatrixAssignment\", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\n+ initEAttribute(getMatrixAssignment_Variable(), ecorePackage.getEString(), \"variable\", null, 0, 1, MatrixAssignment.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n+ initEReference(getMatrixAssignment_Value(), this.getMatrixFormula(), null, \"value\", null, 0, 1, MatrixAssignment.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n+\n+ initEClass(matrixFormulaEClass, MatrixFormula.class, \"MatrixFormula\", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\n+ initEReference(getMatrixFormula_Expression(), this.getMatrixExpression(), null, \"expression\", null, 0, 1, MatrixFormula.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n+\n+ initEClass(matrixExpressionEClass, MatrixExpression.class, \"MatrixExpression\", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\n+\n+ initEClass(functionDefinitionEClass, FunctionDefinition.class, \"FunctionDefinition\", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\n+ initEReference(getFunctionDefinition_Function(), this.getExpression(), null, \"function\", null, 0, 1, FunctionDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n+ initEReference(getFunctionDefinition_Formula(), this.getFormula(), null, \"formula\", null, 0, 1, FunctionDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n+\n initEClass(additionEClass, Addition.class, \"Addition\", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\n initEReference(getAddition_Left(), this.getExpression(), null, \"left\", null, 0, 1, Addition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n initEReference(getAddition_Right(), this.getExpression(), null, \"right\", null, 0, 1, Addition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n@@ -968,12 +1295,6 @@ public void initializePackageContents()\n initEClass(factorialEClass, Factorial.class, \"Factorial\", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\n initEReference(getFactorial_Expression(), this.getExpression(), null, \"expression\", null, 0, 1, Factorial.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n \n- initEClass(intervalEClass, Interval.class, \"Interval\", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\n- initEAttribute(getInterval_OpeningBracket(), ecorePackage.getEString(), \"openingBracket\", null, 0, 1, Interval.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n- initEReference(getInterval_Ceil(), this.getExpression(), null, \"ceil\", null, 0, 1, Interval.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n- initEReference(getInterval_Floor(), this.getExpression(), null, \"floor\", null, 0, 1, Interval.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n- initEAttribute(getInterval_ClosingBracket(), ecorePackage.getEString(), \"closingBracket\", null, 0, 1, Interval.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n-\n initEClass(exponentEClass, Exponent.class, \"Exponent\", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\n initEReference(getExponent_Left(), this.getExpression(), null, \"left\", null, 0, 1, Exponent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n initEReference(getExponent_Right(), this.getExpression(), null, \"right\", null, 0, 1, Exponent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n@@ -983,9 +1304,36 @@ public void initializePackageContents()\n initEClass(floatEClass, org.eclipse.iee.translator.jmole.math.math.Float.class, \"Float\", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\n initEAttribute(getFloat_Value(), ecorePackage.getEString(), \"value\", null, 0, 1, org.eclipse.iee.translator.jmole.math.math.Float.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n \n+ initEClass(matrixElementEClass, MatrixElement.class, \"MatrixElement\", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\n+ initEAttribute(getMatrixElement_Element(), ecorePackage.getEString(), \"element\", null, 0, 1, MatrixElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n+ initEAttribute(getMatrixElement_Row(), ecorePackage.getEInt(), \"row\", null, 0, 1, MatrixElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n+ initEAttribute(getMatrixElement_Column(), ecorePackage.getEInt(), \"column\", null, 0, 1, MatrixElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n+\n initEClass(functionEClass, Function.class, \"Function\", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\n initEReference(getFunction_Function(), this.getExpression(), null, \"function\", null, 0, 1, Function.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n \n+ initEClass(matrixAdditionEClass, MatrixAddition.class, \"MatrixAddition\", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\n+ initEReference(getMatrixAddition_Left(), this.getMatrixExpression(), null, \"left\", null, 0, 1, MatrixAddition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n+ initEReference(getMatrixAddition_Right(), this.getMatrixExpression(), null, \"right\", null, 0, 1, MatrixAddition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n+\n+ initEClass(matrixSubtractionEClass, MatrixSubtraction.class, \"MatrixSubtraction\", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\n+ initEReference(getMatrixSubtraction_Left(), this.getMatrixExpression(), null, \"left\", null, 0, 1, MatrixSubtraction.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n+ initEReference(getMatrixSubtraction_Right(), this.getMatrixExpression(), null, \"right\", null, 0, 1, MatrixSubtraction.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n+\n+ initEClass(matrixMultiplicationEClass, MatrixMultiplication.class, \"MatrixMultiplication\", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\n+ initEReference(getMatrixMultiplication_Left(), this.getMatrixExpression(), null, \"left\", null, 0, 1, MatrixMultiplication.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n+ initEReference(getMatrixMultiplication_RightMatrix(), this.getMatrixExpression(), null, \"rightMatrix\", null, 0, 1, MatrixMultiplication.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n+ initEReference(getMatrixMultiplication_RightScalar(), this.getFormula(), null, \"rightScalar\", null, 0, 1, MatrixMultiplication.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n+\n+ initEClass(newMatrixEClass, NewMatrix.class, \"NewMatrix\", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\n+ initEReference(getNewMatrix_Matrix(), this.getMatrix(), null, \"matrix\", null, 0, 1, NewMatrix.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n+\n+ initEClass(transposeMatrixEClass, TransposeMatrix.class, \"TransposeMatrix\", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\n+ initEAttribute(getTransposeMatrix_Name(), ecorePackage.getEString(), \"name\", null, 0, 1, TransposeMatrix.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n+\n+ initEClass(matrixVariableEClass, MatrixVariable.class, \"MatrixVariable\", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\n+ initEAttribute(getMatrixVariable_Name(), ecorePackage.getEString(), \"name\", null, 0, 1, MatrixVariable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n+\n // Create resource\n createResource(eNS_URI);\n }", "raw_url": "https://github.com/iee/iee/raw/0f04d91efdf50447d8e84e926ef98d7462103dc0/org.eclipse.iee.translator.Jmole%2Forg.eclipse.iee.translator.jmole.math%2Fsrc-gen%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fjmole%2Fmath%2Fmath%2Fimpl%2FMathPackageImpl.java", "sha": "624add62695488635dfc1c8169ea9a29dd6605ed", "status": "modified" }, { "additions": 149, "blob_url": "https://github.com/iee/iee/blob/0f04d91efdf50447d8e84e926ef98d7462103dc0/org.eclipse.iee.translator.Jmole%2Forg.eclipse.iee.translator.jmole.math%2Fsrc-gen%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fjmole%2Fmath%2Fmath%2Fimpl%2FStatementImpl.java", "changes": 226, "contents_url": "https://api.github.com/repos/iee/iee/contents/org.eclipse.iee.translator.Jmole%2Forg.eclipse.iee.translator.jmole.math%2Fsrc-gen%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fjmole%2Fmath%2Fmath%2Fimpl%2FStatementImpl.java?ref=0f04d91efdf50447d8e84e926ef98d7462103dc0", "deletions": 77, "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/math/impl/StatementImpl.java", "new_code": "import org.eclipse.iee.translator.jmole.math.math.MatrixAssignment;\nimport org.eclipse.iee.translator.jmole.math.math.MatrixFormula;\nimport org.eclipse.iee.translator.jmole.math.math.VariableAssignment;\n * <li>{@link org.eclipse.iee.translator.jmole.math.math.impl.StatementImpl#getVariableAssignment <em>Variable Assignment</em>}</li>\n * <li>{@link org.eclipse.iee.translator.jmole.math.math.impl.StatementImpl#getMatrixAssignment <em>Matrix Assignment</em>}</li>\n * <li>{@link org.eclipse.iee.translator.jmole.math.math.impl.StatementImpl#getMatrixFormula <em>Matrix Formula</em>}</li>\n * The cached value of the '{@link #getVariableAssignment() <em>Variable Assignment</em>}' containment reference.\n * @see #getVariableAssignment()\n protected VariableAssignment variableAssignment;\n * The cached value of the '{@link #getFormula() <em>Formula</em>}' containment reference.\n * @see #getFormula()\n protected Formula formula;\n * The cached value of the '{@link #getMatrixAssignment() <em>Matrix Assignment</em>}' containment reference.\n * @see #getMatrixAssignment()\n protected MatrixAssignment matrixAssignment;\n\n /**\n * The cached value of the '{@link #getMatrixFormula() <em>Matrix Formula</em>}' containment reference.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @see #getMatrixFormula()\n * @generated\n * @ordered\n */\n protected MatrixFormula matrixFormula;\n public VariableAssignment getVariableAssignment()\n return variableAssignment;\n public NotificationChain basicSetVariableAssignment(VariableAssignment newVariableAssignment, NotificationChain msgs)\n VariableAssignment oldVariableAssignment = variableAssignment;\n variableAssignment = newVariableAssignment;\n ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, MathPackage.STATEMENT__VARIABLE_ASSIGNMENT, oldVariableAssignment, newVariableAssignment);\n public void setVariableAssignment(VariableAssignment newVariableAssignment)\n if (newVariableAssignment != variableAssignment)\n if (variableAssignment != null)\n msgs = ((InternalEObject)variableAssignment).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - MathPackage.STATEMENT__VARIABLE_ASSIGNMENT, null, msgs);\n if (newVariableAssignment != null)\n msgs = ((InternalEObject)newVariableAssignment).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - MathPackage.STATEMENT__VARIABLE_ASSIGNMENT, null, msgs);\n msgs = basicSetVariableAssignment(newVariableAssignment, msgs);\n eNotify(new ENotificationImpl(this, Notification.SET, MathPackage.STATEMENT__VARIABLE_ASSIGNMENT, newVariableAssignment, newVariableAssignment));\n public Formula getFormula()\n return formula;\n public NotificationChain basicSetFormula(Formula newFormula, NotificationChain msgs)\n Formula oldFormula = formula;\n formula = newFormula;\n ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, MathPackage.STATEMENT__FORMULA, oldFormula, newFormula);\n public void setFormula(Formula newFormula)\n if (newFormula != formula)\n if (formula != null)\n msgs = ((InternalEObject)formula).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - MathPackage.STATEMENT__FORMULA, null, msgs);\n if (newFormula != null)\n msgs = ((InternalEObject)newFormula).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - MathPackage.STATEMENT__FORMULA, null, msgs);\n msgs = basicSetFormula(newFormula, msgs);\n eNotify(new ENotificationImpl(this, Notification.SET, MathPackage.STATEMENT__FORMULA, newFormula, newFormula));\n public MatrixAssignment getMatrixAssignment()\n return matrixAssignment;\n public NotificationChain basicSetMatrixAssignment(MatrixAssignment newMatrixAssignment, NotificationChain msgs)\n MatrixAssignment oldMatrixAssignment = matrixAssignment;\n matrixAssignment = newMatrixAssignment;\n ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, MathPackage.STATEMENT__MATRIX_ASSIGNMENT, oldMatrixAssignment, newMatrixAssignment);\n public void setMatrixAssignment(MatrixAssignment newMatrixAssignment)\n if (newMatrixAssignment != matrixAssignment)\n if (matrixAssignment != null)\n msgs = ((InternalEObject)matrixAssignment).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - MathPackage.STATEMENT__MATRIX_ASSIGNMENT, null, msgs);\n if (newMatrixAssignment != null)\n msgs = ((InternalEObject)newMatrixAssignment).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - MathPackage.STATEMENT__MATRIX_ASSIGNMENT, null, msgs);\n msgs = basicSetMatrixAssignment(newMatrixAssignment, msgs);\n eNotify(new ENotificationImpl(this, Notification.SET, MathPackage.STATEMENT__MATRIX_ASSIGNMENT, newMatrixAssignment, newMatrixAssignment));\n }\n\n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n public MatrixFormula getMatrixFormula()\n {\n return matrixFormula;\n }\n\n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n public NotificationChain basicSetMatrixFormula(MatrixFormula newMatrixFormula, NotificationChain msgs)\n {\n MatrixFormula oldMatrixFormula = matrixFormula;\n matrixFormula = newMatrixFormula;\n if (eNotificationRequired())\n {\n ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, MathPackage.STATEMENT__MATRIX_FORMULA, oldMatrixFormula, newMatrixFormula);\n if (msgs == null) msgs = notification; else msgs.add(notification);\n }\n return msgs;\n }\n\n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n public void setMatrixFormula(MatrixFormula newMatrixFormula)\n {\n if (newMatrixFormula != matrixFormula)\n {\n NotificationChain msgs = null;\n if (matrixFormula != null)\n msgs = ((InternalEObject)matrixFormula).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - MathPackage.STATEMENT__MATRIX_FORMULA, null, msgs);\n if (newMatrixFormula != null)\n msgs = ((InternalEObject)newMatrixFormula).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - MathPackage.STATEMENT__MATRIX_FORMULA, null, msgs);\n msgs = basicSetMatrixFormula(newMatrixFormula, msgs);\n if (msgs != null) msgs.dispatch();\n }\n else if (eNotificationRequired())\n eNotify(new ENotificationImpl(this, Notification.SET, MathPackage.STATEMENT__MATRIX_FORMULA, newMatrixFormula, newMatrixFormula));\n case MathPackage.STATEMENT__VARIABLE_ASSIGNMENT:\n return basicSetVariableAssignment(null, msgs);\n case MathPackage.STATEMENT__MATRIX_ASSIGNMENT:\n return basicSetMatrixAssignment(null, msgs);\n case MathPackage.STATEMENT__MATRIX_FORMULA:\n return basicSetMatrixFormula(null, msgs);\n case MathPackage.STATEMENT__VARIABLE_ASSIGNMENT:\n return getVariableAssignment();\n case MathPackage.STATEMENT__MATRIX_ASSIGNMENT:\n return getMatrixAssignment();\n case MathPackage.STATEMENT__MATRIX_FORMULA:\n return getMatrixFormula();\n case MathPackage.STATEMENT__VARIABLE_ASSIGNMENT:\n setVariableAssignment((VariableAssignment)newValue);\n case MathPackage.STATEMENT__MATRIX_ASSIGNMENT:\n setMatrixAssignment((MatrixAssignment)newValue);\n return;\n case MathPackage.STATEMENT__MATRIX_FORMULA:\n setMatrixFormula((MatrixFormula)newValue);\n return;\n case MathPackage.STATEMENT__VARIABLE_ASSIGNMENT:\n setVariableAssignment((VariableAssignment)null);\n case MathPackage.STATEMENT__MATRIX_ASSIGNMENT:\n setMatrixAssignment((MatrixAssignment)null);\n return;\n case MathPackage.STATEMENT__MATRIX_FORMULA:\n setMatrixFormula((MatrixFormula)null);\n return;\n case MathPackage.STATEMENT__VARIABLE_ASSIGNMENT:\n return variableAssignment != null;\n case MathPackage.STATEMENT__MATRIX_ASSIGNMENT:\n return matrixAssignment != null;\n case MathPackage.STATEMENT__MATRIX_FORMULA:\n return matrixFormula != null;", "new_methods": [ { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/math/impl/StatementImpl.java", "implementation": "return matrixFormula;", "signature": "MatrixFormula getMatrixFormula()" }, { "arguments": [ "MatrixFormula newMatrixFormula", " NotificationChain msgs" ], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/math/impl/StatementImpl.java", "implementation": "MatrixFormula oldMatrixFormula = matrixFormula;\n matrixFormula = newMatrixFormula;\n if (eNotificationRequired())\n {\n ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, MathPackage.STATEMENT__MATRIX_FORMULA, oldMatrixFormula, newMatrixFormula);\n if (msgs == null) msgs = notification; else msgs.add(notification);", "signature": "NotificationChain basicSetMatrixFormula(MatrixFormula newMatrixFormula, NotificationChain msgs)" }, { "arguments": [ "MatrixFormula newMatrixFormula" ], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/math/impl/StatementImpl.java", "implementation": "if (newMatrixFormula != matrixFormula)\n {\n NotificationChain msgs = null;\n if (matrixFormula != null)\n msgs = ((InternalEObject)matrixFormula).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - MathPackage.STATEMENT__MATRIX_FORMULA, null, msgs);\n if (newMatrixFormula != null)\n msgs = ((InternalEObject)newMatrixFormula).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - MathPackage.STATEMENT__MATRIX_FORMULA, null, msgs);\n msgs = basicSetMatrixFormula(newMatrixFormula, msgs);\n if (msgs != null) msgs.dispatch();", "signature": "void setMatrixFormula(MatrixFormula newMatrixFormula)" } ], "old_code": "import org.eclipse.iee.translator.jmole.math.math.Assignment;\nimport org.eclipse.iee.translator.jmole.math.math.MatrixDefinition;\n * <li>{@link org.eclipse.iee.translator.jmole.math.math.impl.StatementImpl#getMatrixDefinition <em>Matrix Definition</em>}</li>\n * <li>{@link org.eclipse.iee.translator.jmole.math.math.impl.StatementImpl#getAssignment <em>Assignment</em>}</li>\n * The cached value of the '{@link #getMatrixDefinition() <em>Matrix Definition</em>}' containment reference.\n * @see #getMatrixDefinition()\n protected MatrixDefinition matrixDefinition;\n * The cached value of the '{@link #getAssignment() <em>Assignment</em>}' containment reference.\n * @see #getAssignment()\n protected Assignment assignment;\n * The cached value of the '{@link #getFormula() <em>Formula</em>}' containment reference.\n * @see #getFormula()\n protected Formula formula;\n public MatrixDefinition getMatrixDefinition()\n return matrixDefinition;\n public NotificationChain basicSetMatrixDefinition(MatrixDefinition newMatrixDefinition, NotificationChain msgs)\n MatrixDefinition oldMatrixDefinition = matrixDefinition;\n matrixDefinition = newMatrixDefinition;\n ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, MathPackage.STATEMENT__MATRIX_DEFINITION, oldMatrixDefinition, newMatrixDefinition);\n public void setMatrixDefinition(MatrixDefinition newMatrixDefinition)\n if (newMatrixDefinition != matrixDefinition)\n if (matrixDefinition != null)\n msgs = ((InternalEObject)matrixDefinition).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - MathPackage.STATEMENT__MATRIX_DEFINITION, null, msgs);\n if (newMatrixDefinition != null)\n msgs = ((InternalEObject)newMatrixDefinition).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - MathPackage.STATEMENT__MATRIX_DEFINITION, null, msgs);\n msgs = basicSetMatrixDefinition(newMatrixDefinition, msgs);\n eNotify(new ENotificationImpl(this, Notification.SET, MathPackage.STATEMENT__MATRIX_DEFINITION, newMatrixDefinition, newMatrixDefinition));\n public Assignment getAssignment()\n return assignment;\n public NotificationChain basicSetAssignment(Assignment newAssignment, NotificationChain msgs)\n Assignment oldAssignment = assignment;\n assignment = newAssignment;\n ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, MathPackage.STATEMENT__ASSIGNMENT, oldAssignment, newAssignment);\n public void setAssignment(Assignment newAssignment)\n if (newAssignment != assignment)\n if (assignment != null)\n msgs = ((InternalEObject)assignment).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - MathPackage.STATEMENT__ASSIGNMENT, null, msgs);\n if (newAssignment != null)\n msgs = ((InternalEObject)newAssignment).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - MathPackage.STATEMENT__ASSIGNMENT, null, msgs);\n msgs = basicSetAssignment(newAssignment, msgs);\n eNotify(new ENotificationImpl(this, Notification.SET, MathPackage.STATEMENT__ASSIGNMENT, newAssignment, newAssignment));\n public Formula getFormula()\n return formula;\n public NotificationChain basicSetFormula(Formula newFormula, NotificationChain msgs)\n Formula oldFormula = formula;\n formula = newFormula;\n ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, MathPackage.STATEMENT__FORMULA, oldFormula, newFormula);\n public void setFormula(Formula newFormula)\n if (newFormula != formula)\n if (formula != null)\n msgs = ((InternalEObject)formula).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - MathPackage.STATEMENT__FORMULA, null, msgs);\n if (newFormula != null)\n msgs = ((InternalEObject)newFormula).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - MathPackage.STATEMENT__FORMULA, null, msgs);\n msgs = basicSetFormula(newFormula, msgs);\n eNotify(new ENotificationImpl(this, Notification.SET, MathPackage.STATEMENT__FORMULA, newFormula, newFormula));\n case MathPackage.STATEMENT__MATRIX_DEFINITION:\n return basicSetMatrixDefinition(null, msgs);\n case MathPackage.STATEMENT__ASSIGNMENT:\n return basicSetAssignment(null, msgs);\n case MathPackage.STATEMENT__MATRIX_DEFINITION:\n return getMatrixDefinition();\n case MathPackage.STATEMENT__ASSIGNMENT:\n return getAssignment();\n case MathPackage.STATEMENT__MATRIX_DEFINITION:\n setMatrixDefinition((MatrixDefinition)newValue);\n return;\n case MathPackage.STATEMENT__ASSIGNMENT:\n setAssignment((Assignment)newValue);\n case MathPackage.STATEMENT__MATRIX_DEFINITION:\n setMatrixDefinition((MatrixDefinition)null);\n return;\n case MathPackage.STATEMENT__ASSIGNMENT:\n setAssignment((Assignment)null);\n case MathPackage.STATEMENT__MATRIX_DEFINITION:\n return matrixDefinition != null;\n case MathPackage.STATEMENT__ASSIGNMENT:\n return assignment != null;", "old_methods": [], "patch": "@@ -15,12 +15,13 @@\n import org.eclipse.emf.ecore.impl.ENotificationImpl;\n import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;\n \n-import org.eclipse.iee.translator.jmole.math.math.Assignment;\n import org.eclipse.iee.translator.jmole.math.math.Formula;\n import org.eclipse.iee.translator.jmole.math.math.FunctionDefinition;\n import org.eclipse.iee.translator.jmole.math.math.MathPackage;\n-import org.eclipse.iee.translator.jmole.math.math.MatrixDefinition;\n+import org.eclipse.iee.translator.jmole.math.math.MatrixAssignment;\n+import org.eclipse.iee.translator.jmole.math.math.MatrixFormula;\n import org.eclipse.iee.translator.jmole.math.math.Statement;\n+import org.eclipse.iee.translator.jmole.math.math.VariableAssignment;\n \n /**\n * <!-- begin-user-doc -->\n@@ -30,9 +31,10 @@\n * The following features are implemented:\n * <ul>\n * <li>{@link org.eclipse.iee.translator.jmole.math.math.impl.StatementImpl#getFunctionDefinition <em>Function Definition</em>}</li>\n- * <li>{@link org.eclipse.iee.translator.jmole.math.math.impl.StatementImpl#getMatrixDefinition <em>Matrix Definition</em>}</li>\n- * <li>{@link org.eclipse.iee.translator.jmole.math.math.impl.StatementImpl#getAssignment <em>Assignment</em>}</li>\n+ * <li>{@link org.eclipse.iee.translator.jmole.math.math.impl.StatementImpl#getVariableAssignment <em>Variable Assignment</em>}</li>\n * <li>{@link org.eclipse.iee.translator.jmole.math.math.impl.StatementImpl#getFormula <em>Formula</em>}</li>\n+ * <li>{@link org.eclipse.iee.translator.jmole.math.math.impl.StatementImpl#getMatrixAssignment <em>Matrix Assignment</em>}</li>\n+ * <li>{@link org.eclipse.iee.translator.jmole.math.math.impl.StatementImpl#getMatrixFormula <em>Matrix Formula</em>}</li>\n * </ul>\n * </p>\n *\n@@ -51,34 +53,44 @@ public class StatementImpl extends MinimalEObjectImpl.Container implements State\n protected FunctionDefinition functionDefinition;\n \n /**\n- * The cached value of the '{@link #getMatrixDefinition() <em>Matrix Definition</em>}' containment reference.\n+ * The cached value of the '{@link #getVariableAssignment() <em>Variable Assignment</em>}' containment reference.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n- * @see #getMatrixDefinition()\n+ * @see #getVariableAssignment()\n * @generated\n * @ordered\n */\n- protected MatrixDefinition matrixDefinition;\n+ protected VariableAssignment variableAssignment;\n \n /**\n- * The cached value of the '{@link #getAssignment() <em>Assignment</em>}' containment reference.\n+ * The cached value of the '{@link #getFormula() <em>Formula</em>}' containment reference.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n- * @see #getAssignment()\n+ * @see #getFormula()\n * @generated\n * @ordered\n */\n- protected Assignment assignment;\n+ protected Formula formula;\n \n /**\n- * The cached value of the '{@link #getFormula() <em>Formula</em>}' containment reference.\n+ * The cached value of the '{@link #getMatrixAssignment() <em>Matrix Assignment</em>}' containment reference.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n- * @see #getFormula()\n+ * @see #getMatrixAssignment()\n * @generated\n * @ordered\n */\n- protected Formula formula;\n+ protected MatrixAssignment matrixAssignment;\n+\n+ /**\n+ * The cached value of the '{@link #getMatrixFormula() <em>Matrix Formula</em>}' containment reference.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @see #getMatrixFormula()\n+ * @generated\n+ * @ordered\n+ */\n+ protected MatrixFormula matrixFormula;\n \n /**\n * <!-- begin-user-doc -->\n@@ -154,23 +166,23 @@ else if (eNotificationRequired())\n * <!-- end-user-doc -->\n * @generated\n */\n- public MatrixDefinition getMatrixDefinition()\n+ public VariableAssignment getVariableAssignment()\n {\n- return matrixDefinition;\n+ return variableAssignment;\n }\n \n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n- public NotificationChain basicSetMatrixDefinition(MatrixDefinition newMatrixDefinition, NotificationChain msgs)\n+ public NotificationChain basicSetVariableAssignment(VariableAssignment newVariableAssignment, NotificationChain msgs)\n {\n- MatrixDefinition oldMatrixDefinition = matrixDefinition;\n- matrixDefinition = newMatrixDefinition;\n+ VariableAssignment oldVariableAssignment = variableAssignment;\n+ variableAssignment = newVariableAssignment;\n if (eNotificationRequired())\n {\n- ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, MathPackage.STATEMENT__MATRIX_DEFINITION, oldMatrixDefinition, newMatrixDefinition);\n+ ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, MathPackage.STATEMENT__VARIABLE_ASSIGNMENT, oldVariableAssignment, newVariableAssignment);\n if (msgs == null) msgs = notification; else msgs.add(notification);\n }\n return msgs;\n@@ -181,44 +193,44 @@ public NotificationChain basicSetMatrixDefinition(MatrixDefinition newMatrixDefi\n * <!-- end-user-doc -->\n * @generated\n */\n- public void setMatrixDefinition(MatrixDefinition newMatrixDefinition)\n+ public void setVariableAssignment(VariableAssignment newVariableAssignment)\n {\n- if (newMatrixDefinition != matrixDefinition)\n+ if (newVariableAssignment != variableAssignment)\n {\n NotificationChain msgs = null;\n- if (matrixDefinition != null)\n- msgs = ((InternalEObject)matrixDefinition).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - MathPackage.STATEMENT__MATRIX_DEFINITION, null, msgs);\n- if (newMatrixDefinition != null)\n- msgs = ((InternalEObject)newMatrixDefinition).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - MathPackage.STATEMENT__MATRIX_DEFINITION, null, msgs);\n- msgs = basicSetMatrixDefinition(newMatrixDefinition, msgs);\n+ if (variableAssignment != null)\n+ msgs = ((InternalEObject)variableAssignment).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - MathPackage.STATEMENT__VARIABLE_ASSIGNMENT, null, msgs);\n+ if (newVariableAssignment != null)\n+ msgs = ((InternalEObject)newVariableAssignment).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - MathPackage.STATEMENT__VARIABLE_ASSIGNMENT, null, msgs);\n+ msgs = basicSetVariableAssignment(newVariableAssignment, msgs);\n if (msgs != null) msgs.dispatch();\n }\n else if (eNotificationRequired())\n- eNotify(new ENotificationImpl(this, Notification.SET, MathPackage.STATEMENT__MATRIX_DEFINITION, newMatrixDefinition, newMatrixDefinition));\n+ eNotify(new ENotificationImpl(this, Notification.SET, MathPackage.STATEMENT__VARIABLE_ASSIGNMENT, newVariableAssignment, newVariableAssignment));\n }\n \n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n- public Assignment getAssignment()\n+ public Formula getFormula()\n {\n- return assignment;\n+ return formula;\n }\n \n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n- public NotificationChain basicSetAssignment(Assignment newAssignment, NotificationChain msgs)\n+ public NotificationChain basicSetFormula(Formula newFormula, NotificationChain msgs)\n {\n- Assignment oldAssignment = assignment;\n- assignment = newAssignment;\n+ Formula oldFormula = formula;\n+ formula = newFormula;\n if (eNotificationRequired())\n {\n- ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, MathPackage.STATEMENT__ASSIGNMENT, oldAssignment, newAssignment);\n+ ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, MathPackage.STATEMENT__FORMULA, oldFormula, newFormula);\n if (msgs == null) msgs = notification; else msgs.add(notification);\n }\n return msgs;\n@@ -229,44 +241,44 @@ public NotificationChain basicSetAssignment(Assignment newAssignment, Notificati\n * <!-- end-user-doc -->\n * @generated\n */\n- public void setAssignment(Assignment newAssignment)\n+ public void setFormula(Formula newFormula)\n {\n- if (newAssignment != assignment)\n+ if (newFormula != formula)\n {\n NotificationChain msgs = null;\n- if (assignment != null)\n- msgs = ((InternalEObject)assignment).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - MathPackage.STATEMENT__ASSIGNMENT, null, msgs);\n- if (newAssignment != null)\n- msgs = ((InternalEObject)newAssignment).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - MathPackage.STATEMENT__ASSIGNMENT, null, msgs);\n- msgs = basicSetAssignment(newAssignment, msgs);\n+ if (formula != null)\n+ msgs = ((InternalEObject)formula).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - MathPackage.STATEMENT__FORMULA, null, msgs);\n+ if (newFormula != null)\n+ msgs = ((InternalEObject)newFormula).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - MathPackage.STATEMENT__FORMULA, null, msgs);\n+ msgs = basicSetFormula(newFormula, msgs);\n if (msgs != null) msgs.dispatch();\n }\n else if (eNotificationRequired())\n- eNotify(new ENotificationImpl(this, Notification.SET, MathPackage.STATEMENT__ASSIGNMENT, newAssignment, newAssignment));\n+ eNotify(new ENotificationImpl(this, Notification.SET, MathPackage.STATEMENT__FORMULA, newFormula, newFormula));\n }\n \n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n- public Formula getFormula()\n+ public MatrixAssignment getMatrixAssignment()\n {\n- return formula;\n+ return matrixAssignment;\n }\n \n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n- public NotificationChain basicSetFormula(Formula newFormula, NotificationChain msgs)\n+ public NotificationChain basicSetMatrixAssignment(MatrixAssignment newMatrixAssignment, NotificationChain msgs)\n {\n- Formula oldFormula = formula;\n- formula = newFormula;\n+ MatrixAssignment oldMatrixAssignment = matrixAssignment;\n+ matrixAssignment = newMatrixAssignment;\n if (eNotificationRequired())\n {\n- ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, MathPackage.STATEMENT__FORMULA, oldFormula, newFormula);\n+ ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, MathPackage.STATEMENT__MATRIX_ASSIGNMENT, oldMatrixAssignment, newMatrixAssignment);\n if (msgs == null) msgs = notification; else msgs.add(notification);\n }\n return msgs;\n@@ -277,20 +289,68 @@ public NotificationChain basicSetFormula(Formula newFormula, NotificationChain m\n * <!-- end-user-doc -->\n * @generated\n */\n- public void setFormula(Formula newFormula)\n+ public void setMatrixAssignment(MatrixAssignment newMatrixAssignment)\n {\n- if (newFormula != formula)\n+ if (newMatrixAssignment != matrixAssignment)\n {\n NotificationChain msgs = null;\n- if (formula != null)\n- msgs = ((InternalEObject)formula).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - MathPackage.STATEMENT__FORMULA, null, msgs);\n- if (newFormula != null)\n- msgs = ((InternalEObject)newFormula).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - MathPackage.STATEMENT__FORMULA, null, msgs);\n- msgs = basicSetFormula(newFormula, msgs);\n+ if (matrixAssignment != null)\n+ msgs = ((InternalEObject)matrixAssignment).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - MathPackage.STATEMENT__MATRIX_ASSIGNMENT, null, msgs);\n+ if (newMatrixAssignment != null)\n+ msgs = ((InternalEObject)newMatrixAssignment).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - MathPackage.STATEMENT__MATRIX_ASSIGNMENT, null, msgs);\n+ msgs = basicSetMatrixAssignment(newMatrixAssignment, msgs);\n if (msgs != null) msgs.dispatch();\n }\n else if (eNotificationRequired())\n- eNotify(new ENotificationImpl(this, Notification.SET, MathPackage.STATEMENT__FORMULA, newFormula, newFormula));\n+ eNotify(new ENotificationImpl(this, Notification.SET, MathPackage.STATEMENT__MATRIX_ASSIGNMENT, newMatrixAssignment, newMatrixAssignment));\n+ }\n+\n+ /**\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ */\n+ public MatrixFormula getMatrixFormula()\n+ {\n+ return matrixFormula;\n+ }\n+\n+ /**\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ */\n+ public NotificationChain basicSetMatrixFormula(MatrixFormula newMatrixFormula, NotificationChain msgs)\n+ {\n+ MatrixFormula oldMatrixFormula = matrixFormula;\n+ matrixFormula = newMatrixFormula;\n+ if (eNotificationRequired())\n+ {\n+ ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, MathPackage.STATEMENT__MATRIX_FORMULA, oldMatrixFormula, newMatrixFormula);\n+ if (msgs == null) msgs = notification; else msgs.add(notification);\n+ }\n+ return msgs;\n+ }\n+\n+ /**\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ */\n+ public void setMatrixFormula(MatrixFormula newMatrixFormula)\n+ {\n+ if (newMatrixFormula != matrixFormula)\n+ {\n+ NotificationChain msgs = null;\n+ if (matrixFormula != null)\n+ msgs = ((InternalEObject)matrixFormula).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - MathPackage.STATEMENT__MATRIX_FORMULA, null, msgs);\n+ if (newMatrixFormula != null)\n+ msgs = ((InternalEObject)newMatrixFormula).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - MathPackage.STATEMENT__MATRIX_FORMULA, null, msgs);\n+ msgs = basicSetMatrixFormula(newMatrixFormula, msgs);\n+ if (msgs != null) msgs.dispatch();\n+ }\n+ else if (eNotificationRequired())\n+ eNotify(new ENotificationImpl(this, Notification.SET, MathPackage.STATEMENT__MATRIX_FORMULA, newMatrixFormula, newMatrixFormula));\n }\n \n /**\n@@ -305,12 +365,14 @@ public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID,\n {\n case MathPackage.STATEMENT__FUNCTION_DEFINITION:\n return basicSetFunctionDefinition(null, msgs);\n- case MathPackage.STATEMENT__MATRIX_DEFINITION:\n- return basicSetMatrixDefinition(null, msgs);\n- case MathPackage.STATEMENT__ASSIGNMENT:\n- return basicSetAssignment(null, msgs);\n+ case MathPackage.STATEMENT__VARIABLE_ASSIGNMENT:\n+ return basicSetVariableAssignment(null, msgs);\n case MathPackage.STATEMENT__FORMULA:\n return basicSetFormula(null, msgs);\n+ case MathPackage.STATEMENT__MATRIX_ASSIGNMENT:\n+ return basicSetMatrixAssignment(null, msgs);\n+ case MathPackage.STATEMENT__MATRIX_FORMULA:\n+ return basicSetMatrixFormula(null, msgs);\n }\n return super.eInverseRemove(otherEnd, featureID, msgs);\n }\n@@ -327,12 +389,14 @@ public Object eGet(int featureID, boolean resolve, boolean coreType)\n {\n case MathPackage.STATEMENT__FUNCTION_DEFINITION:\n return getFunctionDefinition();\n- case MathPackage.STATEMENT__MATRIX_DEFINITION:\n- return getMatrixDefinition();\n- case MathPackage.STATEMENT__ASSIGNMENT:\n- return getAssignment();\n+ case MathPackage.STATEMENT__VARIABLE_ASSIGNMENT:\n+ return getVariableAssignment();\n case MathPackage.STATEMENT__FORMULA:\n return getFormula();\n+ case MathPackage.STATEMENT__MATRIX_ASSIGNMENT:\n+ return getMatrixAssignment();\n+ case MathPackage.STATEMENT__MATRIX_FORMULA:\n+ return getMatrixFormula();\n }\n return super.eGet(featureID, resolve, coreType);\n }\n@@ -350,15 +414,18 @@ public void eSet(int featureID, Object newValue)\n case MathPackage.STATEMENT__FUNCTION_DEFINITION:\n setFunctionDefinition((FunctionDefinition)newValue);\n return;\n- case MathPackage.STATEMENT__MATRIX_DEFINITION:\n- setMatrixDefinition((MatrixDefinition)newValue);\n- return;\n- case MathPackage.STATEMENT__ASSIGNMENT:\n- setAssignment((Assignment)newValue);\n+ case MathPackage.STATEMENT__VARIABLE_ASSIGNMENT:\n+ setVariableAssignment((VariableAssignment)newValue);\n return;\n case MathPackage.STATEMENT__FORMULA:\n setFormula((Formula)newValue);\n return;\n+ case MathPackage.STATEMENT__MATRIX_ASSIGNMENT:\n+ setMatrixAssignment((MatrixAssignment)newValue);\n+ return;\n+ case MathPackage.STATEMENT__MATRIX_FORMULA:\n+ setMatrixFormula((MatrixFormula)newValue);\n+ return;\n }\n super.eSet(featureID, newValue);\n }\n@@ -376,15 +443,18 @@ public void eUnset(int featureID)\n case MathPackage.STATEMENT__FUNCTION_DEFINITION:\n setFunctionDefinition((FunctionDefinition)null);\n return;\n- case MathPackage.STATEMENT__MATRIX_DEFINITION:\n- setMatrixDefinition((MatrixDefinition)null);\n- return;\n- case MathPackage.STATEMENT__ASSIGNMENT:\n- setAssignment((Assignment)null);\n+ case MathPackage.STATEMENT__VARIABLE_ASSIGNMENT:\n+ setVariableAssignment((VariableAssignment)null);\n return;\n case MathPackage.STATEMENT__FORMULA:\n setFormula((Formula)null);\n return;\n+ case MathPackage.STATEMENT__MATRIX_ASSIGNMENT:\n+ setMatrixAssignment((MatrixAssignment)null);\n+ return;\n+ case MathPackage.STATEMENT__MATRIX_FORMULA:\n+ setMatrixFormula((MatrixFormula)null);\n+ return;\n }\n super.eUnset(featureID);\n }\n@@ -401,12 +471,14 @@ public boolean eIsSet(int featureID)\n {\n case MathPackage.STATEMENT__FUNCTION_DEFINITION:\n return functionDefinition != null;\n- case MathPackage.STATEMENT__MATRIX_DEFINITION:\n- return matrixDefinition != null;\n- case MathPackage.STATEMENT__ASSIGNMENT:\n- return assignment != null;\n+ case MathPackage.STATEMENT__VARIABLE_ASSIGNMENT:\n+ return variableAssignment != null;\n case MathPackage.STATEMENT__FORMULA:\n return formula != null;\n+ case MathPackage.STATEMENT__MATRIX_ASSIGNMENT:\n+ return matrixAssignment != null;\n+ case MathPackage.STATEMENT__MATRIX_FORMULA:\n+ return matrixFormula != null;\n }\n return super.eIsSet(featureID);\n }", "raw_url": "https://github.com/iee/iee/raw/0f04d91efdf50447d8e84e926ef98d7462103dc0/org.eclipse.iee.translator.Jmole%2Forg.eclipse.iee.translator.jmole.math%2Fsrc-gen%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fjmole%2Fmath%2Fmath%2Fimpl%2FStatementImpl.java", "sha": "9b66edbd65fdd0eb7e2c628cd5b3f057da47c84c", "status": "modified" }, { "additions": 229, "blob_url": "https://github.com/iee/iee/blob/0f04d91efdf50447d8e84e926ef98d7462103dc0/org.eclipse.iee.translator.Jmole%2Forg.eclipse.iee.translator.jmole.math%2Fsrc-gen%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fjmole%2Fmath%2Fmath%2Futil%2FMathAdapterFactory.java", "changes": 269, "contents_url": "https://api.github.com/repos/iee/iee/contents/org.eclipse.iee.translator.Jmole%2Forg.eclipse.iee.translator.jmole.math%2Fsrc-gen%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fjmole%2Fmath%2Fmath%2Futil%2FMathAdapterFactory.java?ref=0f04d91efdf50447d8e84e926ef98d7462103dc0", "deletions": 40, "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/math/util/MathAdapterFactory.java", "new_code": "import org.eclipse.iee.translator.jmole.math.math.Matrix;\nimport org.eclipse.iee.translator.jmole.math.math.MatrixAddition;\nimport org.eclipse.iee.translator.jmole.math.math.MatrixAssignment;\nimport org.eclipse.iee.translator.jmole.math.math.MatrixElement;\nimport org.eclipse.iee.translator.jmole.math.math.MatrixExpression;\nimport org.eclipse.iee.translator.jmole.math.math.MatrixFormula;\nimport org.eclipse.iee.translator.jmole.math.math.MatrixMultiplication;\nimport org.eclipse.iee.translator.jmole.math.math.MatrixSubtraction;\nimport org.eclipse.iee.translator.jmole.math.math.MatrixVariable;\nimport org.eclipse.iee.translator.jmole.math.math.NewMatrix;\nimport org.eclipse.iee.translator.jmole.math.math.TransposeMatrix;\nimport org.eclipse.iee.translator.jmole.math.math.VariableAssignment;\n public Adapter caseVariableAssignment(VariableAssignment object)\n return createVariableAssignmentAdapter();\n public Adapter caseMatrix(Matrix object)\n return createMatrixAdapter();\n public Adapter caseMatrixRow(MatrixRow object)\n return createMatrixRowAdapter();\n public Adapter caseMatrixAssignment(MatrixAssignment object)\n return createMatrixAssignmentAdapter();\n }\n @Override\n public Adapter caseMatrixFormula(MatrixFormula object)\n {\n return createMatrixFormulaAdapter();\n }\n @Override\n public Adapter caseMatrixExpression(MatrixExpression object)\n {\n return createMatrixExpressionAdapter();\n }\n @Override\n public Adapter caseFunctionDefinition(FunctionDefinition object)\n {\n return createFunctionDefinitionAdapter();\n public Adapter caseMatrixElement(MatrixElement object)\n {\n return createMatrixElementAdapter();\n }\n @Override\n public Adapter caseMatrixAddition(MatrixAddition object)\n {\n return createMatrixAdditionAdapter();\n }\n @Override\n public Adapter caseMatrixSubtraction(MatrixSubtraction object)\n {\n return createMatrixSubtractionAdapter();\n }\n @Override\n public Adapter caseMatrixMultiplication(MatrixMultiplication object)\n {\n return createMatrixMultiplicationAdapter();\n }\n @Override\n public Adapter caseNewMatrix(NewMatrix object)\n {\n return createNewMatrixAdapter();\n }\n @Override\n public Adapter caseTransposeMatrix(TransposeMatrix object)\n {\n return createTransposeMatrixAdapter();\n }\n @Override\n public Adapter caseMatrixVariable(MatrixVariable object)\n {\n return createMatrixVariableAdapter();\n }\n @Override\n * Creates a new adapter for an object of class '{@link org.eclipse.iee.translator.jmole.math.math.VariableAssignment <em>Variable Assignment</em>}'.\n * @see org.eclipse.iee.translator.jmole.math.math.VariableAssignment\n public Adapter createVariableAssignmentAdapter()\n * Creates a new adapter for an object of class '{@link org.eclipse.iee.translator.jmole.math.math.Matrix <em>Matrix</em>}'.\n * @see org.eclipse.iee.translator.jmole.math.math.Matrix\n public Adapter createMatrixAdapter()\n {\n return null;\n }\n\n /**\n * Creates a new adapter for an object of class '{@link org.eclipse.iee.translator.jmole.math.math.MatrixRow <em>Matrix Row</em>}'.\n * <!-- begin-user-doc -->\n * This default implementation returns null so that we can easily ignore cases;\n * it's useful to ignore a case when inheritance will catch all the cases anyway.\n * <!-- end-user-doc -->\n * @return the new adapter.\n * @see org.eclipse.iee.translator.jmole.math.math.MatrixRow\n * @generated\n */\n public Adapter createMatrixRowAdapter()\n * Creates a new adapter for an object of class '{@link org.eclipse.iee.translator.jmole.math.math.MatrixAssignment <em>Matrix Assignment</em>}'.\n * @see org.eclipse.iee.translator.jmole.math.math.MatrixAssignment\n public Adapter createMatrixAssignmentAdapter()\n * Creates a new adapter for an object of class '{@link org.eclipse.iee.translator.jmole.math.math.MatrixFormula <em>Matrix Formula</em>}'.\n * @see org.eclipse.iee.translator.jmole.math.math.MatrixFormula\n public Adapter createMatrixFormulaAdapter()\n {\n return null;\n }\n\n /**\n * Creates a new adapter for an object of class '{@link org.eclipse.iee.translator.jmole.math.math.MatrixExpression <em>Matrix Expression</em>}'.\n * <!-- begin-user-doc -->\n * This default implementation returns null so that we can easily ignore cases;\n * it's useful to ignore a case when inheritance will catch all the cases anyway.\n * <!-- end-user-doc -->\n * @return the new adapter.\n * @see org.eclipse.iee.translator.jmole.math.math.MatrixExpression\n * @generated\n */\n public Adapter createMatrixExpressionAdapter()\n {\n return null;\n }\n\n /**\n * Creates a new adapter for an object of class '{@link org.eclipse.iee.translator.jmole.math.math.FunctionDefinition <em>Function Definition</em>}'.\n * <!-- begin-user-doc -->\n * This default implementation returns null so that we can easily ignore cases;\n * it's useful to ignore a case when inheritance will catch all the cases anyway.\n * <!-- end-user-doc -->\n * @return the new adapter.\n * @see org.eclipse.iee.translator.jmole.math.math.FunctionDefinition\n * @generated\n */\n public Adapter createFunctionDefinitionAdapter()\n * Creates a new adapter for an object of class '{@link org.eclipse.iee.translator.jmole.math.math.Exponent <em>Exponent</em>}'.\n * @see org.eclipse.iee.translator.jmole.math.math.Exponent\n public Adapter createExponentAdapter()\n * Creates a new adapter for an object of class '{@link org.eclipse.iee.translator.jmole.math.math.Variable <em>Variable</em>}'.\n * @see org.eclipse.iee.translator.jmole.math.math.Variable\n public Adapter createVariableAdapter()\n * Creates a new adapter for an object of class '{@link org.eclipse.iee.translator.jmole.math.math.Float <em>Float</em>}'.\n * @see org.eclipse.iee.translator.jmole.math.math.Float\n public Adapter createFloatAdapter()\n * Creates a new adapter for an object of class '{@link org.eclipse.iee.translator.jmole.math.math.MatrixElement <em>Matrix Element</em>}'.\n * @see org.eclipse.iee.translator.jmole.math.math.MatrixElement\n public Adapter createMatrixElementAdapter()\n /**\n * Creates a new adapter for an object of class '{@link org.eclipse.iee.translator.jmole.math.math.MatrixAddition <em>Matrix Addition</em>}'.\n * <!-- begin-user-doc -->\n * This default implementation returns null so that we can easily ignore cases;\n * it's useful to ignore a case when inheritance will catch all the cases anyway.\n * <!-- end-user-doc -->\n * @return the new adapter.\n * @see org.eclipse.iee.translator.jmole.math.math.MatrixAddition\n * @generated\n */\n public Adapter createMatrixAdditionAdapter()\n {\n return null;\n }\n\n /**\n * Creates a new adapter for an object of class '{@link org.eclipse.iee.translator.jmole.math.math.MatrixSubtraction <em>Matrix Subtraction</em>}'.\n * <!-- begin-user-doc -->\n * This default implementation returns null so that we can easily ignore cases;\n * it's useful to ignore a case when inheritance will catch all the cases anyway.\n * <!-- end-user-doc -->\n * @return the new adapter.\n * @see org.eclipse.iee.translator.jmole.math.math.MatrixSubtraction\n * @generated\n */\n public Adapter createMatrixSubtractionAdapter()\n {\n return null;\n }\n\n /**\n * Creates a new adapter for an object of class '{@link org.eclipse.iee.translator.jmole.math.math.MatrixMultiplication <em>Matrix Multiplication</em>}'.\n * <!-- begin-user-doc -->\n * This default implementation returns null so that we can easily ignore cases;\n * it's useful to ignore a case when inheritance will catch all the cases anyway.\n * <!-- end-user-doc -->\n * @return the new adapter.\n * @see org.eclipse.iee.translator.jmole.math.math.MatrixMultiplication\n * @generated\n */\n public Adapter createMatrixMultiplicationAdapter()\n {\n return null;\n }\n\n /**\n * Creates a new adapter for an object of class '{@link org.eclipse.iee.translator.jmole.math.math.NewMatrix <em>New Matrix</em>}'.\n * <!-- begin-user-doc -->\n * This default implementation returns null so that we can easily ignore cases;\n * it's useful to ignore a case when inheritance will catch all the cases anyway.\n * <!-- end-user-doc -->\n * @return the new adapter.\n * @see org.eclipse.iee.translator.jmole.math.math.NewMatrix\n * @generated\n */\n public Adapter createNewMatrixAdapter()\n {\n return null;\n }\n\n /**\n * Creates a new adapter for an object of class '{@link org.eclipse.iee.translator.jmole.math.math.TransposeMatrix <em>Transpose Matrix</em>}'.\n * <!-- begin-user-doc -->\n * This default implementation returns null so that we can easily ignore cases;\n * it's useful to ignore a case when inheritance will catch all the cases anyway.\n * <!-- end-user-doc -->\n * @return the new adapter.\n * @see org.eclipse.iee.translator.jmole.math.math.TransposeMatrix\n * @generated\n */\n public Adapter createTransposeMatrixAdapter()\n {\n return null;\n }\n\n /**\n * Creates a new adapter for an object of class '{@link org.eclipse.iee.translator.jmole.math.math.MatrixVariable <em>Matrix Variable</em>}'.\n * <!-- begin-user-doc -->\n * This default implementation returns null so that we can easily ignore cases;\n * it's useful to ignore a case when inheritance will catch all the cases anyway.\n * <!-- end-user-doc -->\n * @return the new adapter.\n * @see org.eclipse.iee.translator.jmole.math.math.MatrixVariable\n * @generated\n */\n public Adapter createMatrixVariableAdapter()\n {\n return null;\n }\n", "new_methods": [ { "arguments": [ "MatrixFormula object" ], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/math/util/MathAdapterFactory.java", "implementation": "return createMatrixFormulaAdapter();", "signature": "Adapter caseMatrixFormula(MatrixFormula object)" }, { "arguments": [ "MatrixExpression object" ], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/math/util/MathAdapterFactory.java", "implementation": "return createMatrixExpressionAdapter();", "signature": "Adapter caseMatrixExpression(MatrixExpression object)" }, { "arguments": [ "FunctionDefinition object" ], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/math/util/MathAdapterFactory.java", "implementation": "return createFunctionDefinitionAdapter();\n public Adapter caseMatrixElement(MatrixElement object)\n {\n return createMatrixElementAdapter();", "signature": "Adapter caseFunctionDefinition(FunctionDefinition object)" }, { "arguments": [ "MatrixAddition object" ], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/math/util/MathAdapterFactory.java", "implementation": "return createMatrixAdditionAdapter();", "signature": "Adapter caseMatrixAddition(MatrixAddition object)" }, { "arguments": [ "MatrixSubtraction object" ], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/math/util/MathAdapterFactory.java", "implementation": "return createMatrixSubtractionAdapter();", "signature": "Adapter caseMatrixSubtraction(MatrixSubtraction object)" }, { "arguments": [ "MatrixMultiplication object" ], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/math/util/MathAdapterFactory.java", "implementation": "return createMatrixMultiplicationAdapter();", "signature": "Adapter caseMatrixMultiplication(MatrixMultiplication object)" }, { "arguments": [ "NewMatrix object" ], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/math/util/MathAdapterFactory.java", "implementation": "return createNewMatrixAdapter();", "signature": "Adapter caseNewMatrix(NewMatrix object)" }, { "arguments": [ "TransposeMatrix object" ], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/math/util/MathAdapterFactory.java", "implementation": "return createTransposeMatrixAdapter();", "signature": "Adapter caseTransposeMatrix(TransposeMatrix object)" }, { "arguments": [ "MatrixVariable object" ], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/math/util/MathAdapterFactory.java", "implementation": "return createMatrixVariableAdapter();", "signature": "Adapter caseMatrixVariable(MatrixVariable object)" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/math/util/MathAdapterFactory.java", "implementation": "return null;", "signature": "Adapter createMatrixAdapter()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/math/util/MathAdapterFactory.java", "implementation": "return null;", "signature": "Adapter createMatrixFormulaAdapter()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/math/util/MathAdapterFactory.java", "implementation": "return null;", "signature": "Adapter createMatrixExpressionAdapter()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/math/util/MathAdapterFactory.java", "implementation": "return null;", "signature": "Adapter createMatrixAdditionAdapter()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/math/util/MathAdapterFactory.java", "implementation": "return null;", "signature": "Adapter createMatrixSubtractionAdapter()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/math/util/MathAdapterFactory.java", "implementation": "return null;", "signature": "Adapter createMatrixMultiplicationAdapter()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/math/util/MathAdapterFactory.java", "implementation": "return null;", "signature": "Adapter createNewMatrixAdapter()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/math/util/MathAdapterFactory.java", "implementation": "return null;", "signature": "Adapter createTransposeMatrixAdapter()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/math/util/MathAdapterFactory.java", "implementation": "return null;", "signature": "Adapter createMatrixVariableAdapter()" } ], "old_code": "import org.eclipse.iee.translator.jmole.math.math.Assignment;\nimport org.eclipse.iee.translator.jmole.math.math.Interval;\nimport org.eclipse.iee.translator.jmole.math.math.MatrixDefinition;\n public Adapter caseAssignment(Assignment object)\n return createAssignmentAdapter();\n public Adapter caseFunctionDefinition(FunctionDefinition object)\n return createFunctionDefinitionAdapter();\n public Adapter caseMatrixDefinition(MatrixDefinition object)\n return createMatrixDefinitionAdapter();\n public Adapter caseMatrixRow(MatrixRow object)\n return createMatrixRowAdapter();\n public Adapter caseInterval(Interval object)\n {\n return createIntervalAdapter();\n }\n @Override\n * Creates a new adapter for an object of class '{@link org.eclipse.iee.translator.jmole.math.math.Assignment <em>Assignment</em>}'.\n * @see org.eclipse.iee.translator.jmole.math.math.Assignment\n public Adapter createAssignmentAdapter()\n * Creates a new adapter for an object of class '{@link org.eclipse.iee.translator.jmole.math.math.FunctionDefinition <em>Function Definition</em>}'.\n * @see org.eclipse.iee.translator.jmole.math.math.FunctionDefinition\n public Adapter createFunctionDefinitionAdapter()\n * Creates a new adapter for an object of class '{@link org.eclipse.iee.translator.jmole.math.math.MatrixDefinition <em>Matrix Definition</em>}'.\n * @see org.eclipse.iee.translator.jmole.math.math.MatrixDefinition\n public Adapter createMatrixDefinitionAdapter()\n * Creates a new adapter for an object of class '{@link org.eclipse.iee.translator.jmole.math.math.MatrixRow <em>Matrix Row</em>}'.\n * @see org.eclipse.iee.translator.jmole.math.math.MatrixRow\n public Adapter createMatrixRowAdapter()\n * Creates a new adapter for an object of class '{@link org.eclipse.iee.translator.jmole.math.math.Interval <em>Interval</em>}'.\n * @see org.eclipse.iee.translator.jmole.math.math.Interval\n public Adapter createIntervalAdapter()\n * Creates a new adapter for an object of class '{@link org.eclipse.iee.translator.jmole.math.math.Exponent <em>Exponent</em>}'.\n * @see org.eclipse.iee.translator.jmole.math.math.Exponent\n public Adapter createExponentAdapter()\n * Creates a new adapter for an object of class '{@link org.eclipse.iee.translator.jmole.math.math.Variable <em>Variable</em>}'.\n * @see org.eclipse.iee.translator.jmole.math.math.Variable\n public Adapter createVariableAdapter()\n * Creates a new adapter for an object of class '{@link org.eclipse.iee.translator.jmole.math.math.Float <em>Float</em>}'.\n * @see org.eclipse.iee.translator.jmole.math.math.Float\n public Adapter createFloatAdapter()", "old_methods": [ { "arguments": [ "Interval object" ], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/math/util/MathAdapterFactory.java", "implementation": "return createIntervalAdapter();", "signature": "Adapter caseInterval(Interval object)" } ], "patch": "@@ -14,24 +14,33 @@\n import org.eclipse.emf.ecore.EObject;\n \n import org.eclipse.iee.translator.jmole.math.math.Addition;\n-import org.eclipse.iee.translator.jmole.math.math.Assignment;\n import org.eclipse.iee.translator.jmole.math.math.Division;\n import org.eclipse.iee.translator.jmole.math.math.Exponent;\n import org.eclipse.iee.translator.jmole.math.math.Expression;\n import org.eclipse.iee.translator.jmole.math.math.Factorial;\n import org.eclipse.iee.translator.jmole.math.math.Formula;\n import org.eclipse.iee.translator.jmole.math.math.Function;\n import org.eclipse.iee.translator.jmole.math.math.FunctionDefinition;\n-import org.eclipse.iee.translator.jmole.math.math.Interval;\n import org.eclipse.iee.translator.jmole.math.math.Invert;\n import org.eclipse.iee.translator.jmole.math.math.MathPackage;\n-import org.eclipse.iee.translator.jmole.math.math.MatrixDefinition;\n+import org.eclipse.iee.translator.jmole.math.math.Matrix;\n+import org.eclipse.iee.translator.jmole.math.math.MatrixAddition;\n+import org.eclipse.iee.translator.jmole.math.math.MatrixAssignment;\n+import org.eclipse.iee.translator.jmole.math.math.MatrixElement;\n+import org.eclipse.iee.translator.jmole.math.math.MatrixExpression;\n+import org.eclipse.iee.translator.jmole.math.math.MatrixFormula;\n+import org.eclipse.iee.translator.jmole.math.math.MatrixMultiplication;\n import org.eclipse.iee.translator.jmole.math.math.MatrixRow;\n+import org.eclipse.iee.translator.jmole.math.math.MatrixSubtraction;\n+import org.eclipse.iee.translator.jmole.math.math.MatrixVariable;\n import org.eclipse.iee.translator.jmole.math.math.Modulo;\n import org.eclipse.iee.translator.jmole.math.math.Multiplication;\n+import org.eclipse.iee.translator.jmole.math.math.NewMatrix;\n import org.eclipse.iee.translator.jmole.math.math.Statement;\n import org.eclipse.iee.translator.jmole.math.math.Subtraction;\n+import org.eclipse.iee.translator.jmole.math.math.TransposeMatrix;\n import org.eclipse.iee.translator.jmole.math.math.Variable;\n+import org.eclipse.iee.translator.jmole.math.math.VariableAssignment;\n \n /**\n * <!-- begin-user-doc -->\n@@ -102,9 +111,9 @@ public Adapter caseStatement(Statement object)\n return createStatementAdapter();\n }\n @Override\n- public Adapter caseAssignment(Assignment object)\n+ public Adapter caseVariableAssignment(VariableAssignment object)\n {\n- return createAssignmentAdapter();\n+ return createVariableAssignmentAdapter();\n }\n @Override\n public Adapter caseFormula(Formula object)\n@@ -117,19 +126,34 @@ public Adapter caseExpression(Expression object)\n return createExpressionAdapter();\n }\n @Override\n- public Adapter caseFunctionDefinition(FunctionDefinition object)\n+ public Adapter caseMatrix(Matrix object)\n {\n- return createFunctionDefinitionAdapter();\n+ return createMatrixAdapter();\n }\n @Override\n- public Adapter caseMatrixDefinition(MatrixDefinition object)\n+ public Adapter caseMatrixRow(MatrixRow object)\n {\n- return createMatrixDefinitionAdapter();\n+ return createMatrixRowAdapter();\n }\n @Override\n- public Adapter caseMatrixRow(MatrixRow object)\n+ public Adapter caseMatrixAssignment(MatrixAssignment object)\n {\n- return createMatrixRowAdapter();\n+ return createMatrixAssignmentAdapter();\n+ }\n+ @Override\n+ public Adapter caseMatrixFormula(MatrixFormula object)\n+ {\n+ return createMatrixFormulaAdapter();\n+ }\n+ @Override\n+ public Adapter caseMatrixExpression(MatrixExpression object)\n+ {\n+ return createMatrixExpressionAdapter();\n+ }\n+ @Override\n+ public Adapter caseFunctionDefinition(FunctionDefinition object)\n+ {\n+ return createFunctionDefinitionAdapter();\n }\n @Override\n public Adapter caseAddition(Addition object)\n@@ -167,11 +191,6 @@ public Adapter caseFactorial(Factorial object)\n return createFactorialAdapter();\n }\n @Override\n- public Adapter caseInterval(Interval object)\n- {\n- return createIntervalAdapter();\n- }\n- @Override\n public Adapter caseExponent(Exponent object)\n {\n return createExponentAdapter();\n@@ -187,11 +206,46 @@ public Adapter caseFloat(org.eclipse.iee.translator.jmole.math.math.Float object\n return createFloatAdapter();\n }\n @Override\n+ public Adapter caseMatrixElement(MatrixElement object)\n+ {\n+ return createMatrixElementAdapter();\n+ }\n+ @Override\n public Adapter caseFunction(Function object)\n {\n return createFunctionAdapter();\n }\n @Override\n+ public Adapter caseMatrixAddition(MatrixAddition object)\n+ {\n+ return createMatrixAdditionAdapter();\n+ }\n+ @Override\n+ public Adapter caseMatrixSubtraction(MatrixSubtraction object)\n+ {\n+ return createMatrixSubtractionAdapter();\n+ }\n+ @Override\n+ public Adapter caseMatrixMultiplication(MatrixMultiplication object)\n+ {\n+ return createMatrixMultiplicationAdapter();\n+ }\n+ @Override\n+ public Adapter caseNewMatrix(NewMatrix object)\n+ {\n+ return createNewMatrixAdapter();\n+ }\n+ @Override\n+ public Adapter caseTransposeMatrix(TransposeMatrix object)\n+ {\n+ return createTransposeMatrixAdapter();\n+ }\n+ @Override\n+ public Adapter caseMatrixVariable(MatrixVariable object)\n+ {\n+ return createMatrixVariableAdapter();\n+ }\n+ @Override\n public Adapter defaultCase(EObject object)\n {\n return createEObjectAdapter();\n@@ -229,16 +283,16 @@ public Adapter createStatementAdapter()\n }\n \n /**\n- * Creates a new adapter for an object of class '{@link org.eclipse.iee.translator.jmole.math.math.Assignment <em>Assignment</em>}'.\n+ * Creates a new adapter for an object of class '{@link org.eclipse.iee.translator.jmole.math.math.VariableAssignment <em>Variable Assignment</em>}'.\n * <!-- begin-user-doc -->\n * This default implementation returns null so that we can easily ignore cases;\n * it's useful to ignore a case when inheritance will catch all the cases anyway.\n * <!-- end-user-doc -->\n * @return the new adapter.\n- * @see org.eclipse.iee.translator.jmole.math.math.Assignment\n+ * @see org.eclipse.iee.translator.jmole.math.math.VariableAssignment\n * @generated\n */\n- public Adapter createAssignmentAdapter()\n+ public Adapter createVariableAssignmentAdapter()\n {\n return null;\n }\n@@ -274,46 +328,91 @@ public Adapter createExpressionAdapter()\n }\n \n /**\n- * Creates a new adapter for an object of class '{@link org.eclipse.iee.translator.jmole.math.math.FunctionDefinition <em>Function Definition</em>}'.\n+ * Creates a new adapter for an object of class '{@link org.eclipse.iee.translator.jmole.math.math.Matrix <em>Matrix</em>}'.\n * <!-- begin-user-doc -->\n * This default implementation returns null so that we can easily ignore cases;\n * it's useful to ignore a case when inheritance will catch all the cases anyway.\n * <!-- end-user-doc -->\n * @return the new adapter.\n- * @see org.eclipse.iee.translator.jmole.math.math.FunctionDefinition\n+ * @see org.eclipse.iee.translator.jmole.math.math.Matrix\n * @generated\n */\n- public Adapter createFunctionDefinitionAdapter()\n+ public Adapter createMatrixAdapter()\n+ {\n+ return null;\n+ }\n+\n+ /**\n+ * Creates a new adapter for an object of class '{@link org.eclipse.iee.translator.jmole.math.math.MatrixRow <em>Matrix Row</em>}'.\n+ * <!-- begin-user-doc -->\n+ * This default implementation returns null so that we can easily ignore cases;\n+ * it's useful to ignore a case when inheritance will catch all the cases anyway.\n+ * <!-- end-user-doc -->\n+ * @return the new adapter.\n+ * @see org.eclipse.iee.translator.jmole.math.math.MatrixRow\n+ * @generated\n+ */\n+ public Adapter createMatrixRowAdapter()\n {\n return null;\n }\n \n /**\n- * Creates a new adapter for an object of class '{@link org.eclipse.iee.translator.jmole.math.math.MatrixDefinition <em>Matrix Definition</em>}'.\n+ * Creates a new adapter for an object of class '{@link org.eclipse.iee.translator.jmole.math.math.MatrixAssignment <em>Matrix Assignment</em>}'.\n * <!-- begin-user-doc -->\n * This default implementation returns null so that we can easily ignore cases;\n * it's useful to ignore a case when inheritance will catch all the cases anyway.\n * <!-- end-user-doc -->\n * @return the new adapter.\n- * @see org.eclipse.iee.translator.jmole.math.math.MatrixDefinition\n+ * @see org.eclipse.iee.translator.jmole.math.math.MatrixAssignment\n * @generated\n */\n- public Adapter createMatrixDefinitionAdapter()\n+ public Adapter createMatrixAssignmentAdapter()\n {\n return null;\n }\n \n /**\n- * Creates a new adapter for an object of class '{@link org.eclipse.iee.translator.jmole.math.math.MatrixRow <em>Matrix Row</em>}'.\n+ * Creates a new adapter for an object of class '{@link org.eclipse.iee.translator.jmole.math.math.MatrixFormula <em>Matrix Formula</em>}'.\n * <!-- begin-user-doc -->\n * This default implementation returns null so that we can easily ignore cases;\n * it's useful to ignore a case when inheritance will catch all the cases anyway.\n * <!-- end-user-doc -->\n * @return the new adapter.\n- * @see org.eclipse.iee.translator.jmole.math.math.MatrixRow\n+ * @see org.eclipse.iee.translator.jmole.math.math.MatrixFormula\n * @generated\n */\n- public Adapter createMatrixRowAdapter()\n+ public Adapter createMatrixFormulaAdapter()\n+ {\n+ return null;\n+ }\n+\n+ /**\n+ * Creates a new adapter for an object of class '{@link org.eclipse.iee.translator.jmole.math.math.MatrixExpression <em>Matrix Expression</em>}'.\n+ * <!-- begin-user-doc -->\n+ * This default implementation returns null so that we can easily ignore cases;\n+ * it's useful to ignore a case when inheritance will catch all the cases anyway.\n+ * <!-- end-user-doc -->\n+ * @return the new adapter.\n+ * @see org.eclipse.iee.translator.jmole.math.math.MatrixExpression\n+ * @generated\n+ */\n+ public Adapter createMatrixExpressionAdapter()\n+ {\n+ return null;\n+ }\n+\n+ /**\n+ * Creates a new adapter for an object of class '{@link org.eclipse.iee.translator.jmole.math.math.FunctionDefinition <em>Function Definition</em>}'.\n+ * <!-- begin-user-doc -->\n+ * This default implementation returns null so that we can easily ignore cases;\n+ * it's useful to ignore a case when inheritance will catch all the cases anyway.\n+ * <!-- end-user-doc -->\n+ * @return the new adapter.\n+ * @see org.eclipse.iee.translator.jmole.math.math.FunctionDefinition\n+ * @generated\n+ */\n+ public Adapter createFunctionDefinitionAdapter()\n {\n return null;\n }\n@@ -424,61 +523,61 @@ public Adapter createFactorialAdapter()\n }\n \n /**\n- * Creates a new adapter for an object of class '{@link org.eclipse.iee.translator.jmole.math.math.Interval <em>Interval</em>}'.\n+ * Creates a new adapter for an object of class '{@link org.eclipse.iee.translator.jmole.math.math.Exponent <em>Exponent</em>}'.\n * <!-- begin-user-doc -->\n * This default implementation returns null so that we can easily ignore cases;\n * it's useful to ignore a case when inheritance will catch all the cases anyway.\n * <!-- end-user-doc -->\n * @return the new adapter.\n- * @see org.eclipse.iee.translator.jmole.math.math.Interval\n+ * @see org.eclipse.iee.translator.jmole.math.math.Exponent\n * @generated\n */\n- public Adapter createIntervalAdapter()\n+ public Adapter createExponentAdapter()\n {\n return null;\n }\n \n /**\n- * Creates a new adapter for an object of class '{@link org.eclipse.iee.translator.jmole.math.math.Exponent <em>Exponent</em>}'.\n+ * Creates a new adapter for an object of class '{@link org.eclipse.iee.translator.jmole.math.math.Variable <em>Variable</em>}'.\n * <!-- begin-user-doc -->\n * This default implementation returns null so that we can easily ignore cases;\n * it's useful to ignore a case when inheritance will catch all the cases anyway.\n * <!-- end-user-doc -->\n * @return the new adapter.\n- * @see org.eclipse.iee.translator.jmole.math.math.Exponent\n+ * @see org.eclipse.iee.translator.jmole.math.math.Variable\n * @generated\n */\n- public Adapter createExponentAdapter()\n+ public Adapter createVariableAdapter()\n {\n return null;\n }\n \n /**\n- * Creates a new adapter for an object of class '{@link org.eclipse.iee.translator.jmole.math.math.Variable <em>Variable</em>}'.\n+ * Creates a new adapter for an object of class '{@link org.eclipse.iee.translator.jmole.math.math.Float <em>Float</em>}'.\n * <!-- begin-user-doc -->\n * This default implementation returns null so that we can easily ignore cases;\n * it's useful to ignore a case when inheritance will catch all the cases anyway.\n * <!-- end-user-doc -->\n * @return the new adapter.\n- * @see org.eclipse.iee.translator.jmole.math.math.Variable\n+ * @see org.eclipse.iee.translator.jmole.math.math.Float\n * @generated\n */\n- public Adapter createVariableAdapter()\n+ public Adapter createFloatAdapter()\n {\n return null;\n }\n \n /**\n- * Creates a new adapter for an object of class '{@link org.eclipse.iee.translator.jmole.math.math.Float <em>Float</em>}'.\n+ * Creates a new adapter for an object of class '{@link org.eclipse.iee.translator.jmole.math.math.MatrixElement <em>Matrix Element</em>}'.\n * <!-- begin-user-doc -->\n * This default implementation returns null so that we can easily ignore cases;\n * it's useful to ignore a case when inheritance will catch all the cases anyway.\n * <!-- end-user-doc -->\n * @return the new adapter.\n- * @see org.eclipse.iee.translator.jmole.math.math.Float\n+ * @see org.eclipse.iee.translator.jmole.math.math.MatrixElement\n * @generated\n */\n- public Adapter createFloatAdapter()\n+ public Adapter createMatrixElementAdapter()\n {\n return null;\n }\n@@ -498,6 +597,96 @@ public Adapter createFunctionAdapter()\n return null;\n }\n \n+ /**\n+ * Creates a new adapter for an object of class '{@link org.eclipse.iee.translator.jmole.math.math.MatrixAddition <em>Matrix Addition</em>}'.\n+ * <!-- begin-user-doc -->\n+ * This default implementation returns null so that we can easily ignore cases;\n+ * it's useful to ignore a case when inheritance will catch all the cases anyway.\n+ * <!-- end-user-doc -->\n+ * @return the new adapter.\n+ * @see org.eclipse.iee.translator.jmole.math.math.MatrixAddition\n+ * @generated\n+ */\n+ public Adapter createMatrixAdditionAdapter()\n+ {\n+ return null;\n+ }\n+\n+ /**\n+ * Creates a new adapter for an object of class '{@link org.eclipse.iee.translator.jmole.math.math.MatrixSubtraction <em>Matrix Subtraction</em>}'.\n+ * <!-- begin-user-doc -->\n+ * This default implementation returns null so that we can easily ignore cases;\n+ * it's useful to ignore a case when inheritance will catch all the cases anyway.\n+ * <!-- end-user-doc -->\n+ * @return the new adapter.\n+ * @see org.eclipse.iee.translator.jmole.math.math.MatrixSubtraction\n+ * @generated\n+ */\n+ public Adapter createMatrixSubtractionAdapter()\n+ {\n+ return null;\n+ }\n+\n+ /**\n+ * Creates a new adapter for an object of class '{@link org.eclipse.iee.translator.jmole.math.math.MatrixMultiplication <em>Matrix Multiplication</em>}'.\n+ * <!-- begin-user-doc -->\n+ * This default implementation returns null so that we can easily ignore cases;\n+ * it's useful to ignore a case when inheritance will catch all the cases anyway.\n+ * <!-- end-user-doc -->\n+ * @return the new adapter.\n+ * @see org.eclipse.iee.translator.jmole.math.math.MatrixMultiplication\n+ * @generated\n+ */\n+ public Adapter createMatrixMultiplicationAdapter()\n+ {\n+ return null;\n+ }\n+\n+ /**\n+ * Creates a new adapter for an object of class '{@link org.eclipse.iee.translator.jmole.math.math.NewMatrix <em>New Matrix</em>}'.\n+ * <!-- begin-user-doc -->\n+ * This default implementation returns null so that we can easily ignore cases;\n+ * it's useful to ignore a case when inheritance will catch all the cases anyway.\n+ * <!-- end-user-doc -->\n+ * @return the new adapter.\n+ * @see org.eclipse.iee.translator.jmole.math.math.NewMatrix\n+ * @generated\n+ */\n+ public Adapter createNewMatrixAdapter()\n+ {\n+ return null;\n+ }\n+\n+ /**\n+ * Creates a new adapter for an object of class '{@link org.eclipse.iee.translator.jmole.math.math.TransposeMatrix <em>Transpose Matrix</em>}'.\n+ * <!-- begin-user-doc -->\n+ * This default implementation returns null so that we can easily ignore cases;\n+ * it's useful to ignore a case when inheritance will catch all the cases anyway.\n+ * <!-- end-user-doc -->\n+ * @return the new adapter.\n+ * @see org.eclipse.iee.translator.jmole.math.math.TransposeMatrix\n+ * @generated\n+ */\n+ public Adapter createTransposeMatrixAdapter()\n+ {\n+ return null;\n+ }\n+\n+ /**\n+ * Creates a new adapter for an object of class '{@link org.eclipse.iee.translator.jmole.math.math.MatrixVariable <em>Matrix Variable</em>}'.\n+ * <!-- begin-user-doc -->\n+ * This default implementation returns null so that we can easily ignore cases;\n+ * it's useful to ignore a case when inheritance will catch all the cases anyway.\n+ * <!-- end-user-doc -->\n+ * @return the new adapter.\n+ * @see org.eclipse.iee.translator.jmole.math.math.MatrixVariable\n+ * @generated\n+ */\n+ public Adapter createMatrixVariableAdapter()\n+ {\n+ return null;\n+ }\n+\n /**\n * Creates a new adapter for the default case.\n * <!-- begin-user-doc -->", "raw_url": "https://github.com/iee/iee/raw/0f04d91efdf50447d8e84e926ef98d7462103dc0/org.eclipse.iee.translator.Jmole%2Forg.eclipse.iee.translator.jmole.math%2Fsrc-gen%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fjmole%2Fmath%2Fmath%2Futil%2FMathAdapterFactory.java", "sha": "29e1930770abdfe2a4fec731375425d0fbd95565", "status": "modified" }, { "additions": 269, "blob_url": "https://github.com/iee/iee/blob/0f04d91efdf50447d8e84e926ef98d7462103dc0/org.eclipse.iee.translator.Jmole%2Forg.eclipse.iee.translator.jmole.math%2Fsrc-gen%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fjmole%2Fmath%2Fmath%2Futil%2FMathSwitch.java", "changes": 316, "contents_url": "https://api.github.com/repos/iee/iee/contents/org.eclipse.iee.translator.Jmole%2Forg.eclipse.iee.translator.jmole.math%2Fsrc-gen%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fjmole%2Fmath%2Fmath%2Futil%2FMathSwitch.java?ref=0f04d91efdf50447d8e84e926ef98d7462103dc0", "deletions": 47, "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/math/util/MathSwitch.java", "new_code": "import org.eclipse.iee.translator.jmole.math.math.Matrix;\nimport org.eclipse.iee.translator.jmole.math.math.MatrixAddition;\nimport org.eclipse.iee.translator.jmole.math.math.MatrixAssignment;\nimport org.eclipse.iee.translator.jmole.math.math.MatrixElement;\nimport org.eclipse.iee.translator.jmole.math.math.MatrixExpression;\nimport org.eclipse.iee.translator.jmole.math.math.MatrixFormula;\nimport org.eclipse.iee.translator.jmole.math.math.MatrixMultiplication;\nimport org.eclipse.iee.translator.jmole.math.math.MatrixSubtraction;\nimport org.eclipse.iee.translator.jmole.math.math.MatrixVariable;\nimport org.eclipse.iee.translator.jmole.math.math.NewMatrix;\nimport org.eclipse.iee.translator.jmole.math.math.TransposeMatrix;\nimport org.eclipse.iee.translator.jmole.math.math.VariableAssignment;\n case MathPackage.VARIABLE_ASSIGNMENT:\n VariableAssignment variableAssignment = (VariableAssignment)theEObject;\n T result = caseVariableAssignment(variableAssignment);\n case MathPackage.MATRIX:\n Matrix matrix = (Matrix)theEObject;\n T result = caseMatrix(matrix);\n case MathPackage.MATRIX_ROW:\n MatrixRow matrixRow = (MatrixRow)theEObject;\n T result = caseMatrixRow(matrixRow);\n case MathPackage.MATRIX_ASSIGNMENT:\n MatrixAssignment matrixAssignment = (MatrixAssignment)theEObject;\n T result = caseMatrixAssignment(matrixAssignment);\n if (result == null) result = defaultCase(theEObject);\n return result;\n }\n case MathPackage.MATRIX_FORMULA:\n {\n MatrixFormula matrixFormula = (MatrixFormula)theEObject;\n T result = caseMatrixFormula(matrixFormula);\n if (result == null) result = defaultCase(theEObject);\n return result;\n }\n case MathPackage.MATRIX_EXPRESSION:\n {\n MatrixExpression matrixExpression = (MatrixExpression)theEObject;\n T result = caseMatrixExpression(matrixExpression);\n if (result == null) result = defaultCase(theEObject);\n return result;\n }\n case MathPackage.FUNCTION_DEFINITION:\n {\n FunctionDefinition functionDefinition = (FunctionDefinition)theEObject;\n T result = caseFunctionDefinition(functionDefinition);\n case MathPackage.MATRIX_ELEMENT:\n {\n MatrixElement matrixElement = (MatrixElement)theEObject;\n T result = caseMatrixElement(matrixElement);\n if (result == null) result = caseExpression(matrixElement);\n if (result == null) result = defaultCase(theEObject);\n return result;\n }\n case MathPackage.MATRIX_ADDITION:\n {\n MatrixAddition matrixAddition = (MatrixAddition)theEObject;\n T result = caseMatrixAddition(matrixAddition);\n if (result == null) result = caseMatrixExpression(matrixAddition);\n if (result == null) result = defaultCase(theEObject);\n return result;\n }\n case MathPackage.MATRIX_SUBTRACTION:\n {\n MatrixSubtraction matrixSubtraction = (MatrixSubtraction)theEObject;\n T result = caseMatrixSubtraction(matrixSubtraction);\n if (result == null) result = caseMatrixExpression(matrixSubtraction);\n if (result == null) result = defaultCase(theEObject);\n return result;\n }\n case MathPackage.MATRIX_MULTIPLICATION:\n {\n MatrixMultiplication matrixMultiplication = (MatrixMultiplication)theEObject;\n T result = caseMatrixMultiplication(matrixMultiplication);\n if (result == null) result = caseMatrixExpression(matrixMultiplication);\n if (result == null) result = defaultCase(theEObject);\n return result;\n }\n case MathPackage.NEW_MATRIX:\n {\n NewMatrix newMatrix = (NewMatrix)theEObject;\n T result = caseNewMatrix(newMatrix);\n if (result == null) result = caseMatrixExpression(newMatrix);\n if (result == null) result = defaultCase(theEObject);\n return result;\n }\n case MathPackage.TRANSPOSE_MATRIX:\n {\n TransposeMatrix transposeMatrix = (TransposeMatrix)theEObject;\n T result = caseTransposeMatrix(transposeMatrix);\n if (result == null) result = caseMatrixExpression(transposeMatrix);\n if (result == null) result = defaultCase(theEObject);\n return result;\n }\n case MathPackage.MATRIX_VARIABLE:\n {\n MatrixVariable matrixVariable = (MatrixVariable)theEObject;\n T result = caseMatrixVariable(matrixVariable);\n if (result == null) result = caseMatrixExpression(matrixVariable);\n if (result == null) result = defaultCase(theEObject);\n return result;\n }\n * Returns the result of interpreting the object as an instance of '<em>Variable Assignment</em>'.\n * @return the result of interpreting the object as an instance of '<em>Variable Assignment</em>'.\n public T caseVariableAssignment(VariableAssignment object)\n * Returns the result of interpreting the object as an instance of '<em>Matrix</em>'.\n * @return the result of interpreting the object as an instance of '<em>Matrix</em>'.\n public T caseMatrix(Matrix object)\n * Returns the result of interpreting the object as an instance of '<em>Matrix Row</em>'.\n * @return the result of interpreting the object as an instance of '<em>Matrix Row</em>'.\n public T caseMatrixRow(MatrixRow object)\n * Returns the result of interpreting the object as an instance of '<em>Matrix Assignment</em>'.\n * @return the result of interpreting the object as an instance of '<em>Matrix Assignment</em>'.\n public T caseMatrixAssignment(MatrixAssignment object)\n {\n return null;\n }\n\n /**\n * Returns the result of interpreting the object as an instance of '<em>Matrix Formula</em>'.\n * <!-- begin-user-doc -->\n * This implementation returns null;\n * returning a non-null result will terminate the switch.\n * <!-- end-user-doc -->\n * @param object the target of the switch.\n * @return the result of interpreting the object as an instance of '<em>Matrix Formula</em>'.\n * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)\n * @generated\n */\n public T caseMatrixFormula(MatrixFormula object)\n {\n return null;\n }\n\n /**\n * Returns the result of interpreting the object as an instance of '<em>Matrix Expression</em>'.\n * <!-- begin-user-doc -->\n * This implementation returns null;\n * returning a non-null result will terminate the switch.\n * <!-- end-user-doc -->\n * @param object the target of the switch.\n * @return the result of interpreting the object as an instance of '<em>Matrix Expression</em>'.\n * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)\n * @generated\n */\n public T caseMatrixExpression(MatrixExpression object)\n {\n return null;\n }\n\n /**\n * Returns the result of interpreting the object as an instance of '<em>Function Definition</em>'.\n * <!-- begin-user-doc -->\n * This implementation returns null;\n * returning a non-null result will terminate the switch.\n * <!-- end-user-doc -->\n * @param object the target of the switch.\n * @return the result of interpreting the object as an instance of '<em>Function Definition</em>'.\n * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)\n * @generated\n */\n public T caseFunctionDefinition(FunctionDefinition object)\n * Returns the result of interpreting the object as an instance of '<em>Exponent</em>'.\n * @return the result of interpreting the object as an instance of '<em>Exponent</em>'.\n public T caseExponent(Exponent object)\n * Returns the result of interpreting the object as an instance of '<em>Variable</em>'.\n * @return the result of interpreting the object as an instance of '<em>Variable</em>'.\n public T caseVariable(Variable object)\n * Returns the result of interpreting the object as an instance of '<em>Float</em>'.\n * @return the result of interpreting the object as an instance of '<em>Float</em>'.\n public T caseFloat(org.eclipse.iee.translator.jmole.math.math.Float object)\n * Returns the result of interpreting the object as an instance of '<em>Matrix Element</em>'.\n * @return the result of interpreting the object as an instance of '<em>Matrix Element</em>'.\n public T caseMatrixElement(MatrixElement object)\n /**\n * Returns the result of interpreting the object as an instance of '<em>Matrix Addition</em>'.\n * <!-- begin-user-doc -->\n * This implementation returns null;\n * returning a non-null result will terminate the switch.\n * <!-- end-user-doc -->\n * @param object the target of the switch.\n * @return the result of interpreting the object as an instance of '<em>Matrix Addition</em>'.\n * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)\n * @generated\n */\n public T caseMatrixAddition(MatrixAddition object)\n {\n return null;\n }\n\n /**\n * Returns the result of interpreting the object as an instance of '<em>Matrix Subtraction</em>'.\n * <!-- begin-user-doc -->\n * This implementation returns null;\n * returning a non-null result will terminate the switch.\n * <!-- end-user-doc -->\n * @param object the target of the switch.\n * @return the result of interpreting the object as an instance of '<em>Matrix Subtraction</em>'.\n * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)\n * @generated\n */\n public T caseMatrixSubtraction(MatrixSubtraction object)\n {\n return null;\n }\n\n /**\n * Returns the result of interpreting the object as an instance of '<em>Matrix Multiplication</em>'.\n * <!-- begin-user-doc -->\n * This implementation returns null;\n * returning a non-null result will terminate the switch.\n * <!-- end-user-doc -->\n * @param object the target of the switch.\n * @return the result of interpreting the object as an instance of '<em>Matrix Multiplication</em>'.\n * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)\n * @generated\n */\n public T caseMatrixMultiplication(MatrixMultiplication object)\n {\n return null;\n }\n\n /**\n * Returns the result of interpreting the object as an instance of '<em>New Matrix</em>'.\n * <!-- begin-user-doc -->\n * This implementation returns null;\n * returning a non-null result will terminate the switch.\n * <!-- end-user-doc -->\n * @param object the target of the switch.\n * @return the result of interpreting the object as an instance of '<em>New Matrix</em>'.\n * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)\n * @generated\n */\n public T caseNewMatrix(NewMatrix object)\n {\n return null;\n }\n\n /**\n * Returns the result of interpreting the object as an instance of '<em>Transpose Matrix</em>'.\n * <!-- begin-user-doc -->\n * This implementation returns null;\n * returning a non-null result will terminate the switch.\n * <!-- end-user-doc -->\n * @param object the target of the switch.\n * @return the result of interpreting the object as an instance of '<em>Transpose Matrix</em>'.\n * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)\n * @generated\n */\n public T caseTransposeMatrix(TransposeMatrix object)\n {\n return null;\n }\n\n /**\n * Returns the result of interpreting the object as an instance of '<em>Matrix Variable</em>'.\n * <!-- begin-user-doc -->\n * This implementation returns null;\n * returning a non-null result will terminate the switch.\n * <!-- end-user-doc -->\n * @param object the target of the switch.\n * @return the result of interpreting the object as an instance of '<em>Matrix Variable</em>'.\n * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)\n * @generated\n */\n public T caseMatrixVariable(MatrixVariable object)\n {\n return null;\n }\n", "new_methods": [ { "arguments": [ "MatrixAssignment object" ], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/math/util/MathSwitch.java", "implementation": "return null;", "signature": "T caseMatrixAssignment(MatrixAssignment object)" }, { "arguments": [ "MatrixFormula object" ], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/math/util/MathSwitch.java", "implementation": "return null;", "signature": "T caseMatrixFormula(MatrixFormula object)" }, { "arguments": [ "MatrixExpression object" ], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/math/util/MathSwitch.java", "implementation": "return null;", "signature": "T caseMatrixExpression(MatrixExpression object)" }, { "arguments": [ "MatrixAddition object" ], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/math/util/MathSwitch.java", "implementation": "return null;", "signature": "T caseMatrixAddition(MatrixAddition object)" }, { "arguments": [ "MatrixSubtraction object" ], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/math/util/MathSwitch.java", "implementation": "return null;", "signature": "T caseMatrixSubtraction(MatrixSubtraction object)" }, { "arguments": [ "MatrixMultiplication object" ], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/math/util/MathSwitch.java", "implementation": "return null;", "signature": "T caseMatrixMultiplication(MatrixMultiplication object)" }, { "arguments": [ "NewMatrix object" ], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/math/util/MathSwitch.java", "implementation": "return null;", "signature": "T caseNewMatrix(NewMatrix object)" }, { "arguments": [ "TransposeMatrix object" ], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/math/util/MathSwitch.java", "implementation": "return null;", "signature": "T caseTransposeMatrix(TransposeMatrix object)" }, { "arguments": [ "MatrixVariable object" ], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/math/util/MathSwitch.java", "implementation": "return null;", "signature": "T caseMatrixVariable(MatrixVariable object)" } ], "old_code": "import org.eclipse.iee.translator.jmole.math.math.Assignment;\nimport org.eclipse.iee.translator.jmole.math.math.Interval;\nimport org.eclipse.iee.translator.jmole.math.math.MatrixDefinition;\n case MathPackage.ASSIGNMENT:\n Assignment assignment = (Assignment)theEObject;\n T result = caseAssignment(assignment);\n case MathPackage.FUNCTION_DEFINITION:\n FunctionDefinition functionDefinition = (FunctionDefinition)theEObject;\n T result = caseFunctionDefinition(functionDefinition);\n case MathPackage.MATRIX_DEFINITION:\n MatrixDefinition matrixDefinition = (MatrixDefinition)theEObject;\n T result = caseMatrixDefinition(matrixDefinition);\n case MathPackage.MATRIX_ROW:\n MatrixRow matrixRow = (MatrixRow)theEObject;\n T result = caseMatrixRow(matrixRow);\n case MathPackage.INTERVAL:\n {\n Interval interval = (Interval)theEObject;\n T result = caseInterval(interval);\n if (result == null) result = caseExpression(interval);\n if (result == null) result = defaultCase(theEObject);\n return result;\n }\n * Returns the result of interpreting the object as an instance of '<em>Assignment</em>'.\n * @return the result of interpreting the object as an instance of '<em>Assignment</em>'.\n public T caseAssignment(Assignment object)\n * Returns the result of interpreting the object as an instance of '<em>Function Definition</em>'.\n * @return the result of interpreting the object as an instance of '<em>Function Definition</em>'.\n public T caseFunctionDefinition(FunctionDefinition object)\n * Returns the result of interpreting the object as an instance of '<em>Matrix Definition</em>'.\n * @return the result of interpreting the object as an instance of '<em>Matrix Definition</em>'.\n public T caseMatrixDefinition(MatrixDefinition object)\n * Returns the result of interpreting the object as an instance of '<em>Matrix Row</em>'.\n * @return the result of interpreting the object as an instance of '<em>Matrix Row</em>'.\n public T caseMatrixRow(MatrixRow object)\n * Returns the result of interpreting the object as an instance of '<em>Interval</em>'.\n * @return the result of interpreting the object as an instance of '<em>Interval</em>'.\n public T caseInterval(Interval object)\n * Returns the result of interpreting the object as an instance of '<em>Exponent</em>'.\n * @return the result of interpreting the object as an instance of '<em>Exponent</em>'.\n public T caseExponent(Exponent object)\n * Returns the result of interpreting the object as an instance of '<em>Variable</em>'.\n * @return the result of interpreting the object as an instance of '<em>Variable</em>'.\n public T caseVariable(Variable object)\n * Returns the result of interpreting the object as an instance of '<em>Float</em>'.\n * @return the result of interpreting the object as an instance of '<em>Float</em>'.\n public T caseFloat(org.eclipse.iee.translator.jmole.math.math.Float object)", "old_methods": [], "patch": "@@ -12,24 +12,33 @@\n import org.eclipse.emf.ecore.util.Switch;\n \n import org.eclipse.iee.translator.jmole.math.math.Addition;\n-import org.eclipse.iee.translator.jmole.math.math.Assignment;\n import org.eclipse.iee.translator.jmole.math.math.Division;\n import org.eclipse.iee.translator.jmole.math.math.Exponent;\n import org.eclipse.iee.translator.jmole.math.math.Expression;\n import org.eclipse.iee.translator.jmole.math.math.Factorial;\n import org.eclipse.iee.translator.jmole.math.math.Formula;\n import org.eclipse.iee.translator.jmole.math.math.Function;\n import org.eclipse.iee.translator.jmole.math.math.FunctionDefinition;\n-import org.eclipse.iee.translator.jmole.math.math.Interval;\n import org.eclipse.iee.translator.jmole.math.math.Invert;\n import org.eclipse.iee.translator.jmole.math.math.MathPackage;\n-import org.eclipse.iee.translator.jmole.math.math.MatrixDefinition;\n+import org.eclipse.iee.translator.jmole.math.math.Matrix;\n+import org.eclipse.iee.translator.jmole.math.math.MatrixAddition;\n+import org.eclipse.iee.translator.jmole.math.math.MatrixAssignment;\n+import org.eclipse.iee.translator.jmole.math.math.MatrixElement;\n+import org.eclipse.iee.translator.jmole.math.math.MatrixExpression;\n+import org.eclipse.iee.translator.jmole.math.math.MatrixFormula;\n+import org.eclipse.iee.translator.jmole.math.math.MatrixMultiplication;\n import org.eclipse.iee.translator.jmole.math.math.MatrixRow;\n+import org.eclipse.iee.translator.jmole.math.math.MatrixSubtraction;\n+import org.eclipse.iee.translator.jmole.math.math.MatrixVariable;\n import org.eclipse.iee.translator.jmole.math.math.Modulo;\n import org.eclipse.iee.translator.jmole.math.math.Multiplication;\n+import org.eclipse.iee.translator.jmole.math.math.NewMatrix;\n import org.eclipse.iee.translator.jmole.math.math.Statement;\n import org.eclipse.iee.translator.jmole.math.math.Subtraction;\n+import org.eclipse.iee.translator.jmole.math.math.TransposeMatrix;\n import org.eclipse.iee.translator.jmole.math.math.Variable;\n+import org.eclipse.iee.translator.jmole.math.math.VariableAssignment;\n \n /**\n * <!-- begin-user-doc -->\n@@ -101,10 +110,10 @@ protected T doSwitch(int classifierID, EObject theEObject)\n if (result == null) result = defaultCase(theEObject);\n return result;\n }\n- case MathPackage.ASSIGNMENT:\n+ case MathPackage.VARIABLE_ASSIGNMENT:\n {\n- Assignment assignment = (Assignment)theEObject;\n- T result = caseAssignment(assignment);\n+ VariableAssignment variableAssignment = (VariableAssignment)theEObject;\n+ T result = caseVariableAssignment(variableAssignment);\n if (result == null) result = defaultCase(theEObject);\n return result;\n }\n@@ -122,24 +131,45 @@ protected T doSwitch(int classifierID, EObject theEObject)\n if (result == null) result = defaultCase(theEObject);\n return result;\n }\n- case MathPackage.FUNCTION_DEFINITION:\n+ case MathPackage.MATRIX:\n {\n- FunctionDefinition functionDefinition = (FunctionDefinition)theEObject;\n- T result = caseFunctionDefinition(functionDefinition);\n+ Matrix matrix = (Matrix)theEObject;\n+ T result = caseMatrix(matrix);\n if (result == null) result = defaultCase(theEObject);\n return result;\n }\n- case MathPackage.MATRIX_DEFINITION:\n+ case MathPackage.MATRIX_ROW:\n {\n- MatrixDefinition matrixDefinition = (MatrixDefinition)theEObject;\n- T result = caseMatrixDefinition(matrixDefinition);\n+ MatrixRow matrixRow = (MatrixRow)theEObject;\n+ T result = caseMatrixRow(matrixRow);\n if (result == null) result = defaultCase(theEObject);\n return result;\n }\n- case MathPackage.MATRIX_ROW:\n+ case MathPackage.MATRIX_ASSIGNMENT:\n {\n- MatrixRow matrixRow = (MatrixRow)theEObject;\n- T result = caseMatrixRow(matrixRow);\n+ MatrixAssignment matrixAssignment = (MatrixAssignment)theEObject;\n+ T result = caseMatrixAssignment(matrixAssignment);\n+ if (result == null) result = defaultCase(theEObject);\n+ return result;\n+ }\n+ case MathPackage.MATRIX_FORMULA:\n+ {\n+ MatrixFormula matrixFormula = (MatrixFormula)theEObject;\n+ T result = caseMatrixFormula(matrixFormula);\n+ if (result == null) result = defaultCase(theEObject);\n+ return result;\n+ }\n+ case MathPackage.MATRIX_EXPRESSION:\n+ {\n+ MatrixExpression matrixExpression = (MatrixExpression)theEObject;\n+ T result = caseMatrixExpression(matrixExpression);\n+ if (result == null) result = defaultCase(theEObject);\n+ return result;\n+ }\n+ case MathPackage.FUNCTION_DEFINITION:\n+ {\n+ FunctionDefinition functionDefinition = (FunctionDefinition)theEObject;\n+ T result = caseFunctionDefinition(functionDefinition);\n if (result == null) result = defaultCase(theEObject);\n return result;\n }\n@@ -199,14 +229,6 @@ protected T doSwitch(int classifierID, EObject theEObject)\n if (result == null) result = defaultCase(theEObject);\n return result;\n }\n- case MathPackage.INTERVAL:\n- {\n- Interval interval = (Interval)theEObject;\n- T result = caseInterval(interval);\n- if (result == null) result = caseExpression(interval);\n- if (result == null) result = defaultCase(theEObject);\n- return result;\n- }\n case MathPackage.EXPONENT:\n {\n Exponent exponent = (Exponent)theEObject;\n@@ -231,6 +253,14 @@ protected T doSwitch(int classifierID, EObject theEObject)\n if (result == null) result = defaultCase(theEObject);\n return result;\n }\n+ case MathPackage.MATRIX_ELEMENT:\n+ {\n+ MatrixElement matrixElement = (MatrixElement)theEObject;\n+ T result = caseMatrixElement(matrixElement);\n+ if (result == null) result = caseExpression(matrixElement);\n+ if (result == null) result = defaultCase(theEObject);\n+ return result;\n+ }\n case MathPackage.FUNCTION:\n {\n Function function = (Function)theEObject;\n@@ -239,6 +269,54 @@ protected T doSwitch(int classifierID, EObject theEObject)\n if (result == null) result = defaultCase(theEObject);\n return result;\n }\n+ case MathPackage.MATRIX_ADDITION:\n+ {\n+ MatrixAddition matrixAddition = (MatrixAddition)theEObject;\n+ T result = caseMatrixAddition(matrixAddition);\n+ if (result == null) result = caseMatrixExpression(matrixAddition);\n+ if (result == null) result = defaultCase(theEObject);\n+ return result;\n+ }\n+ case MathPackage.MATRIX_SUBTRACTION:\n+ {\n+ MatrixSubtraction matrixSubtraction = (MatrixSubtraction)theEObject;\n+ T result = caseMatrixSubtraction(matrixSubtraction);\n+ if (result == null) result = caseMatrixExpression(matrixSubtraction);\n+ if (result == null) result = defaultCase(theEObject);\n+ return result;\n+ }\n+ case MathPackage.MATRIX_MULTIPLICATION:\n+ {\n+ MatrixMultiplication matrixMultiplication = (MatrixMultiplication)theEObject;\n+ T result = caseMatrixMultiplication(matrixMultiplication);\n+ if (result == null) result = caseMatrixExpression(matrixMultiplication);\n+ if (result == null) result = defaultCase(theEObject);\n+ return result;\n+ }\n+ case MathPackage.NEW_MATRIX:\n+ {\n+ NewMatrix newMatrix = (NewMatrix)theEObject;\n+ T result = caseNewMatrix(newMatrix);\n+ if (result == null) result = caseMatrixExpression(newMatrix);\n+ if (result == null) result = defaultCase(theEObject);\n+ return result;\n+ }\n+ case MathPackage.TRANSPOSE_MATRIX:\n+ {\n+ TransposeMatrix transposeMatrix = (TransposeMatrix)theEObject;\n+ T result = caseTransposeMatrix(transposeMatrix);\n+ if (result == null) result = caseMatrixExpression(transposeMatrix);\n+ if (result == null) result = defaultCase(theEObject);\n+ return result;\n+ }\n+ case MathPackage.MATRIX_VARIABLE:\n+ {\n+ MatrixVariable matrixVariable = (MatrixVariable)theEObject;\n+ T result = caseMatrixVariable(matrixVariable);\n+ if (result == null) result = caseMatrixExpression(matrixVariable);\n+ if (result == null) result = defaultCase(theEObject);\n+ return result;\n+ }\n default: return defaultCase(theEObject);\n }\n }\n@@ -260,17 +338,17 @@ public T caseStatement(Statement object)\n }\n \n /**\n- * Returns the result of interpreting the object as an instance of '<em>Assignment</em>'.\n+ * Returns the result of interpreting the object as an instance of '<em>Variable Assignment</em>'.\n * <!-- begin-user-doc -->\n * This implementation returns null;\n * returning a non-null result will terminate the switch.\n * <!-- end-user-doc -->\n * @param object the target of the switch.\n- * @return the result of interpreting the object as an instance of '<em>Assignment</em>'.\n+ * @return the result of interpreting the object as an instance of '<em>Variable Assignment</em>'.\n * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)\n * @generated\n */\n- public T caseAssignment(Assignment object)\n+ public T caseVariableAssignment(VariableAssignment object)\n {\n return null;\n }\n@@ -308,49 +386,97 @@ public T caseExpression(Expression object)\n }\n \n /**\n- * Returns the result of interpreting the object as an instance of '<em>Function Definition</em>'.\n+ * Returns the result of interpreting the object as an instance of '<em>Matrix</em>'.\n * <!-- begin-user-doc -->\n * This implementation returns null;\n * returning a non-null result will terminate the switch.\n * <!-- end-user-doc -->\n * @param object the target of the switch.\n- * @return the result of interpreting the object as an instance of '<em>Function Definition</em>'.\n+ * @return the result of interpreting the object as an instance of '<em>Matrix</em>'.\n * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)\n * @generated\n */\n- public T caseFunctionDefinition(FunctionDefinition object)\n+ public T caseMatrix(Matrix object)\n {\n return null;\n }\n \n /**\n- * Returns the result of interpreting the object as an instance of '<em>Matrix Definition</em>'.\n+ * Returns the result of interpreting the object as an instance of '<em>Matrix Row</em>'.\n * <!-- begin-user-doc -->\n * This implementation returns null;\n * returning a non-null result will terminate the switch.\n * <!-- end-user-doc -->\n * @param object the target of the switch.\n- * @return the result of interpreting the object as an instance of '<em>Matrix Definition</em>'.\n+ * @return the result of interpreting the object as an instance of '<em>Matrix Row</em>'.\n * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)\n * @generated\n */\n- public T caseMatrixDefinition(MatrixDefinition object)\n+ public T caseMatrixRow(MatrixRow object)\n {\n return null;\n }\n \n /**\n- * Returns the result of interpreting the object as an instance of '<em>Matrix Row</em>'.\n+ * Returns the result of interpreting the object as an instance of '<em>Matrix Assignment</em>'.\n * <!-- begin-user-doc -->\n * This implementation returns null;\n * returning a non-null result will terminate the switch.\n * <!-- end-user-doc -->\n * @param object the target of the switch.\n- * @return the result of interpreting the object as an instance of '<em>Matrix Row</em>'.\n+ * @return the result of interpreting the object as an instance of '<em>Matrix Assignment</em>'.\n * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)\n * @generated\n */\n- public T caseMatrixRow(MatrixRow object)\n+ public T caseMatrixAssignment(MatrixAssignment object)\n+ {\n+ return null;\n+ }\n+\n+ /**\n+ * Returns the result of interpreting the object as an instance of '<em>Matrix Formula</em>'.\n+ * <!-- begin-user-doc -->\n+ * This implementation returns null;\n+ * returning a non-null result will terminate the switch.\n+ * <!-- end-user-doc -->\n+ * @param object the target of the switch.\n+ * @return the result of interpreting the object as an instance of '<em>Matrix Formula</em>'.\n+ * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)\n+ * @generated\n+ */\n+ public T caseMatrixFormula(MatrixFormula object)\n+ {\n+ return null;\n+ }\n+\n+ /**\n+ * Returns the result of interpreting the object as an instance of '<em>Matrix Expression</em>'.\n+ * <!-- begin-user-doc -->\n+ * This implementation returns null;\n+ * returning a non-null result will terminate the switch.\n+ * <!-- end-user-doc -->\n+ * @param object the target of the switch.\n+ * @return the result of interpreting the object as an instance of '<em>Matrix Expression</em>'.\n+ * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)\n+ * @generated\n+ */\n+ public T caseMatrixExpression(MatrixExpression object)\n+ {\n+ return null;\n+ }\n+\n+ /**\n+ * Returns the result of interpreting the object as an instance of '<em>Function Definition</em>'.\n+ * <!-- begin-user-doc -->\n+ * This implementation returns null;\n+ * returning a non-null result will terminate the switch.\n+ * <!-- end-user-doc -->\n+ * @param object the target of the switch.\n+ * @return the result of interpreting the object as an instance of '<em>Function Definition</em>'.\n+ * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)\n+ * @generated\n+ */\n+ public T caseFunctionDefinition(FunctionDefinition object)\n {\n return null;\n }\n@@ -468,65 +594,65 @@ public T caseFactorial(Factorial object)\n }\n \n /**\n- * Returns the result of interpreting the object as an instance of '<em>Interval</em>'.\n+ * Returns the result of interpreting the object as an instance of '<em>Exponent</em>'.\n * <!-- begin-user-doc -->\n * This implementation returns null;\n * returning a non-null result will terminate the switch.\n * <!-- end-user-doc -->\n * @param object the target of the switch.\n- * @return the result of interpreting the object as an instance of '<em>Interval</em>'.\n+ * @return the result of interpreting the object as an instance of '<em>Exponent</em>'.\n * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)\n * @generated\n */\n- public T caseInterval(Interval object)\n+ public T caseExponent(Exponent object)\n {\n return null;\n }\n \n /**\n- * Returns the result of interpreting the object as an instance of '<em>Exponent</em>'.\n+ * Returns the result of interpreting the object as an instance of '<em>Variable</em>'.\n * <!-- begin-user-doc -->\n * This implementation returns null;\n * returning a non-null result will terminate the switch.\n * <!-- end-user-doc -->\n * @param object the target of the switch.\n- * @return the result of interpreting the object as an instance of '<em>Exponent</em>'.\n+ * @return the result of interpreting the object as an instance of '<em>Variable</em>'.\n * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)\n * @generated\n */\n- public T caseExponent(Exponent object)\n+ public T caseVariable(Variable object)\n {\n return null;\n }\n \n /**\n- * Returns the result of interpreting the object as an instance of '<em>Variable</em>'.\n+ * Returns the result of interpreting the object as an instance of '<em>Float</em>'.\n * <!-- begin-user-doc -->\n * This implementation returns null;\n * returning a non-null result will terminate the switch.\n * <!-- end-user-doc -->\n * @param object the target of the switch.\n- * @return the result of interpreting the object as an instance of '<em>Variable</em>'.\n+ * @return the result of interpreting the object as an instance of '<em>Float</em>'.\n * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)\n * @generated\n */\n- public T caseVariable(Variable object)\n+ public T caseFloat(org.eclipse.iee.translator.jmole.math.math.Float object)\n {\n return null;\n }\n \n /**\n- * Returns the result of interpreting the object as an instance of '<em>Float</em>'.\n+ * Returns the result of interpreting the object as an instance of '<em>Matrix Element</em>'.\n * <!-- begin-user-doc -->\n * This implementation returns null;\n * returning a non-null result will terminate the switch.\n * <!-- end-user-doc -->\n * @param object the target of the switch.\n- * @return the result of interpreting the object as an instance of '<em>Float</em>'.\n+ * @return the result of interpreting the object as an instance of '<em>Matrix Element</em>'.\n * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)\n * @generated\n */\n- public T caseFloat(org.eclipse.iee.translator.jmole.math.math.Float object)\n+ public T caseMatrixElement(MatrixElement object)\n {\n return null;\n }\n@@ -547,6 +673,102 @@ public T caseFunction(Function object)\n return null;\n }\n \n+ /**\n+ * Returns the result of interpreting the object as an instance of '<em>Matrix Addition</em>'.\n+ * <!-- begin-user-doc -->\n+ * This implementation returns null;\n+ * returning a non-null result will terminate the switch.\n+ * <!-- end-user-doc -->\n+ * @param object the target of the switch.\n+ * @return the result of interpreting the object as an instance of '<em>Matrix Addition</em>'.\n+ * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)\n+ * @generated\n+ */\n+ public T caseMatrixAddition(MatrixAddition object)\n+ {\n+ return null;\n+ }\n+\n+ /**\n+ * Returns the result of interpreting the object as an instance of '<em>Matrix Subtraction</em>'.\n+ * <!-- begin-user-doc -->\n+ * This implementation returns null;\n+ * returning a non-null result will terminate the switch.\n+ * <!-- end-user-doc -->\n+ * @param object the target of the switch.\n+ * @return the result of interpreting the object as an instance of '<em>Matrix Subtraction</em>'.\n+ * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)\n+ * @generated\n+ */\n+ public T caseMatrixSubtraction(MatrixSubtraction object)\n+ {\n+ return null;\n+ }\n+\n+ /**\n+ * Returns the result of interpreting the object as an instance of '<em>Matrix Multiplication</em>'.\n+ * <!-- begin-user-doc -->\n+ * This implementation returns null;\n+ * returning a non-null result will terminate the switch.\n+ * <!-- end-user-doc -->\n+ * @param object the target of the switch.\n+ * @return the result of interpreting the object as an instance of '<em>Matrix Multiplication</em>'.\n+ * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)\n+ * @generated\n+ */\n+ public T caseMatrixMultiplication(MatrixMultiplication object)\n+ {\n+ return null;\n+ }\n+\n+ /**\n+ * Returns the result of interpreting the object as an instance of '<em>New Matrix</em>'.\n+ * <!-- begin-user-doc -->\n+ * This implementation returns null;\n+ * returning a non-null result will terminate the switch.\n+ * <!-- end-user-doc -->\n+ * @param object the target of the switch.\n+ * @return the result of interpreting the object as an instance of '<em>New Matrix</em>'.\n+ * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)\n+ * @generated\n+ */\n+ public T caseNewMatrix(NewMatrix object)\n+ {\n+ return null;\n+ }\n+\n+ /**\n+ * Returns the result of interpreting the object as an instance of '<em>Transpose Matrix</em>'.\n+ * <!-- begin-user-doc -->\n+ * This implementation returns null;\n+ * returning a non-null result will terminate the switch.\n+ * <!-- end-user-doc -->\n+ * @param object the target of the switch.\n+ * @return the result of interpreting the object as an instance of '<em>Transpose Matrix</em>'.\n+ * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)\n+ * @generated\n+ */\n+ public T caseTransposeMatrix(TransposeMatrix object)\n+ {\n+ return null;\n+ }\n+\n+ /**\n+ * Returns the result of interpreting the object as an instance of '<em>Matrix Variable</em>'.\n+ * <!-- begin-user-doc -->\n+ * This implementation returns null;\n+ * returning a non-null result will terminate the switch.\n+ * <!-- end-user-doc -->\n+ * @param object the target of the switch.\n+ * @return the result of interpreting the object as an instance of '<em>Matrix Variable</em>'.\n+ * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)\n+ * @generated\n+ */\n+ public T caseMatrixVariable(MatrixVariable object)\n+ {\n+ return null;\n+ }\n+\n /**\n * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.\n * <!-- begin-user-doc -->", "raw_url": "https://github.com/iee/iee/raw/0f04d91efdf50447d8e84e926ef98d7462103dc0/org.eclipse.iee.translator.Jmole%2Forg.eclipse.iee.translator.jmole.math%2Fsrc-gen%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fjmole%2Fmath%2Fmath%2Futil%2FMathSwitch.java", "sha": "ce5d8ac9c65b30443b38a5d9b85412cc38ed7330", "status": "modified" }, { "additions": 766, "blob_url": "https://github.com/iee/iee/blob/0f04d91efdf50447d8e84e926ef98d7462103dc0/org.eclipse.iee.translator.Jmole%2Forg.eclipse.iee.translator.jmole.math%2Fsrc-gen%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fjmole%2Fmath%2Fparser%2Fantlr%2Finternal%2FInternalMath.g", "changes": 1136, "contents_url": "https://api.github.com/repos/iee/iee/contents/org.eclipse.iee.translator.Jmole%2Forg.eclipse.iee.translator.jmole.math%2Fsrc-gen%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fjmole%2Fmath%2Fparser%2Fantlr%2Finternal%2FInternalMath.g?ref=0f04d91efdf50447d8e84e926ef98d7462103dc0", "deletions": 370, "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g", "new_code": "\t newCompositeNode(grammarAccess.getStatementAccess().getVariableAssignmentVariableAssignmentParserRuleCall_1_0()); \n\t\tlv_variableAssignment_1_0=ruleVariableAssignment\t\t{\n \t\t\t\"variableAssignment\",\n \t\tlv_variableAssignment_1_0, \n \t\t\"VariableAssignment\");\n\t newCompositeNode(grammarAccess.getStatementAccess().getFormulaFormulaParserRuleCall_2_0()); \n\t\tlv_formula_2_0=ruleFormula\t\t{\n \t\t\t\"formula\",\n \t\tlv_formula_2_0, \n \t\t\"Formula\");\n\t newCompositeNode(grammarAccess.getStatementAccess().getMatrixAssignmentMatrixAssignmentParserRuleCall_3_0()); \n\t\tlv_matrixAssignment_3_0=ruleMatrixAssignment\t\t{\n \t\t\t\"matrixAssignment\",\n \t\tlv_matrixAssignment_3_0, \n \t\t\"MatrixAssignment\");\n\t afterParserOrEnumRuleCall();\n\t }\n\n)\n)\n |(\n(\n\t\t{ \n\t newCompositeNode(grammarAccess.getStatementAccess().getMatrixFormulaMatrixFormulaParserRuleCall_4_0()); \n\t }\n\t\tlv_matrixFormula_4_0=ruleMatrixFormula\t\t{\n\t if ($current==null) {\n\t $current = createModelElementForParent(grammarAccess.getStatementRule());\n\t }\n \t\tset(\n \t\t\t$current, \n \t\t\t\"matrixFormula\",\n \t\tlv_matrixFormula_4_0, \n \t\t\"MatrixFormula\");\n// Entry rule entryRuleVariableAssignment\nentryRuleVariableAssignment returns [EObject current=null] \n\t{ newCompositeNode(grammarAccess.getVariableAssignmentRule()); }\n\t iv_ruleVariableAssignment=ruleVariableAssignment \n\t { $current=$iv_ruleVariableAssignment.current; } \n// Rule VariableAssignment\nruleVariableAssignment returns [EObject current=null] \n\t\t\tnewLeafNode(lv_variable_0_0, grammarAccess.getVariableAssignmentAccess().getVariableMATH_NAMETerminalRuleCall_0_0()); \n\t $current = createModelElement(grammarAccess.getVariableAssignmentRule());\n \tnewLeafNode(otherlv_1, grammarAccess.getVariableAssignmentAccess().getEqualsSignKeyword_1());\n\t newCompositeNode(grammarAccess.getVariableAssignmentAccess().getValueFormulaParserRuleCall_2_0()); \n\t $current = createModelElementForParent(grammarAccess.getVariableAssignmentRule());\n |(\totherlv_1='(-' \n \tnewLeafNode(otherlv_1, grammarAccess.getUnaryExpressionAccess().getLeftParenthesisHyphenMinusKeyword_1_0());\n)\totherlv_4=')' \n {\n \tnewLeafNode(otherlv_4, grammarAccess.getUnaryExpressionAccess().getRightParenthesisKeyword_1_3());\n }\n)\n |(\totherlv_5='(' \n \tnewLeafNode(otherlv_5, grammarAccess.getUnaryExpressionAccess().getLeftParenthesisKeyword_2_0());\n\t\tlv_expression_7_0=ruleUnaryExpression\t\t{\n \t\tlv_expression_7_0, \n)\totherlv_8=')!' \n \tnewLeafNode(otherlv_8, grammarAccess.getUnaryExpressionAccess().getRightParenthesisExclamationMarkKeyword_2_3());\n))\n grammarAccess.getPrimaryAccess().getMatrixElementAction_2_0(),\n $current);\n }\n)(\n(\n\t\tlv_element_5_0=RULE_MATH_NAME\n\t\t{\n\t\t\tnewLeafNode(lv_element_5_0, grammarAccess.getPrimaryAccess().getElementMATH_NAMETerminalRuleCall_2_1_0()); \n\t\t}\n\t\t{\n\t if ($current==null) {\n\t $current = createModelElement(grammarAccess.getPrimaryRule());\n\t }\n \t\tsetWithLastConsumed(\n \t\t\t$current, \n \t\t\t\"element\",\n \t\tlv_element_5_0, \n \t\t\"MATH_NAME\");\n\t }\n\n)\n)\totherlv_6='[' \n {\n \tnewLeafNode(otherlv_6, grammarAccess.getPrimaryAccess().getLeftSquareBracketKeyword_2_2());\n }\n(\n(\n\t\tlv_row_7_0=RULE_INT\n\t\t{\n\t\t\tnewLeafNode(lv_row_7_0, grammarAccess.getPrimaryAccess().getRowINTTerminalRuleCall_2_3_0()); \n\t\t}\n\t\t{\n\t if ($current==null) {\n\t $current = createModelElement(grammarAccess.getPrimaryRule());\n\t }\n \t\tsetWithLastConsumed(\n \t\t\t$current, \n \t\t\t\"row\",\n \t\tlv_row_7_0, \n \t\t\"INT\");\n\t }\n\n)\n)\totherlv_8=']' \n {\n \tnewLeafNode(otherlv_8, grammarAccess.getPrimaryAccess().getRightSquareBracketKeyword_2_4());\n }\n\totherlv_9='[' \n {\n \tnewLeafNode(otherlv_9, grammarAccess.getPrimaryAccess().getLeftSquareBracketKeyword_2_5());\n }\n(\n(\n\t\tlv_column_10_0=RULE_INT\n\t\t{\n\t\t\tnewLeafNode(lv_column_10_0, grammarAccess.getPrimaryAccess().getColumnINTTerminalRuleCall_2_6_0()); \n\t\t}\n\t\t{\n\t if ($current==null) {\n\t $current = createModelElement(grammarAccess.getPrimaryRule());\n\t }\n \t\tsetWithLastConsumed(\n \t\t\t$current, \n \t\t\t\"column\",\n \t\tlv_column_10_0, \n \t\t\"INT\");\n\t }\n\n)\n)\totherlv_11=']' \n {\n \tnewLeafNode(otherlv_11, grammarAccess.getPrimaryAccess().getRightSquareBracketKeyword_2_7());\n }\n)\n |((\n\t{ \n\t /* */ \n\t}\n {\n $current = forceCreateModelElement(\n grammarAccess.getPrimaryAccess().getFunctionAction_3_0(),\n\t newCompositeNode(grammarAccess.getPrimaryAccess().getFunctionFunctionParserRuleCall_3_1_0()); \n\t\tlv_function_13_0=ruleFunction\t\t{\n \t\tlv_function_13_0, \n |(\totherlv_14='(' \n \tnewLeafNode(otherlv_14, grammarAccess.getPrimaryAccess().getLeftParenthesisKeyword_4_0());\n newCompositeNode(grammarAccess.getPrimaryAccess().getAdditionParserRuleCall_4_1()); \n this_Addition_15=ruleAddition\n $current = $this_Addition_15.current; \n\totherlv_16=')' \n \tnewLeafNode(otherlv_16, grammarAccess.getPrimaryAccess().getRightParenthesisKeyword_4_2());\n// Entry rule entryRuleMatrix\nentryRuleMatrix returns [EObject current=null] \n\t{ newCompositeNode(grammarAccess.getMatrixRule()); }\n\t iv_ruleMatrix=ruleMatrix \n\t { $current=$iv_ruleMatrix.current; } \n// Rule Matrix\nruleMatrix returns [EObject current=null] \n(\totherlv_0='{' \n \tnewLeafNode(otherlv_0, grammarAccess.getMatrixAccess().getLeftCurlyBracketKeyword_0());\n((\n(\n\t\t{ \n\t newCompositeNode(grammarAccess.getMatrixAccess().getRowsMatrixRowParserRuleCall_1_0_0()); \n\t }\n\t\tlv_rows_1_0=ruleMatrixRow\t\t{\n\t if ($current==null) {\n\t $current = createModelElementForParent(grammarAccess.getMatrixRule());\n\t }\n \t\tadd(\n \t\t\t$current, \n \t\t\t\"rows\",\n \t\tlv_rows_1_0, \n \t\t\"MatrixRow\");\n\t afterParserOrEnumRuleCall();\n\t }\n)\n)(\totherlv_2=',' \n \tnewLeafNode(otherlv_2, grammarAccess.getMatrixAccess().getCommaKeyword_1_1_0());\n(\n(\n\t\t{ \n\t newCompositeNode(grammarAccess.getMatrixAccess().getRowsMatrixRowParserRuleCall_1_1_1_0()); \n\t }\n\t\tlv_rows_3_0=ruleMatrixRow\t\t{\n\t if ($current==null) {\n\t $current = createModelElementForParent(grammarAccess.getMatrixRule());\n\t }\n \t\tadd(\n \t\t\t$current, \n \t\t\t\"rows\",\n \t\tlv_rows_3_0, \n \t\t\"MatrixRow\");\n\t afterParserOrEnumRuleCall();\n\t }\n)\n))*(\totherlv_4=',' \n \tnewLeafNode(otherlv_4, grammarAccess.getMatrixAccess().getCommaKeyword_1_2());\n)?)?\totherlv_5='}' \n \tnewLeafNode(otherlv_5, grammarAccess.getMatrixAccess().getRightCurlyBracketKeyword_2());\n)\n;\n// Entry rule entryRuleMatrixRow\nentryRuleMatrixRow returns [EObject current=null] \n\t{ newCompositeNode(grammarAccess.getMatrixRowRule()); }\n\t iv_ruleMatrixRow=ruleMatrixRow \n\t { $current=$iv_ruleMatrixRow.current; } \n\t EOF \n// Rule MatrixRow\nruleMatrixRow returns [EObject current=null] \n(\totherlv_0='{' \n \tnewLeafNode(otherlv_0, grammarAccess.getMatrixRowAccess().getLeftCurlyBracketKeyword_0());\n\t newCompositeNode(grammarAccess.getMatrixRowAccess().getElementsFloatParserRuleCall_1_0_0()); \n\t\tlv_elements_1_0=ruleFloat\t\t{\n\t $current = createModelElementForParent(grammarAccess.getMatrixRowRule());\n \t\t\t\"elements\",\n \t\tlv_elements_1_0, \n \t\t\"Float\");\n)(\totherlv_2=',' \n \tnewLeafNode(otherlv_2, grammarAccess.getMatrixRowAccess().getCommaKeyword_1_1_0());\n\t newCompositeNode(grammarAccess.getMatrixRowAccess().getElementsFloatParserRuleCall_1_1_1_0()); \n\t\tlv_elements_3_0=ruleFloat\t\t{\n\t $current = createModelElementForParent(grammarAccess.getMatrixRowRule());\n \t\t\t\"elements\",\n \t\tlv_elements_3_0, \n \t\t\"Float\");\n))*(\totherlv_4=',' \n \tnewLeafNode(otherlv_4, grammarAccess.getMatrixRowAccess().getCommaKeyword_1_2());\n)?)?\totherlv_5='}' \n \tnewLeafNode(otherlv_5, grammarAccess.getMatrixRowAccess().getRightCurlyBracketKeyword_2());\n// Entry rule entryRuleMatrixAssignment\nentryRuleMatrixAssignment returns [EObject current=null] \n\t{ newCompositeNode(grammarAccess.getMatrixAssignmentRule()); }\n\t iv_ruleMatrixAssignment=ruleMatrixAssignment \n\t { $current=$iv_ruleMatrixAssignment.current; } \n// Rule MatrixAssignment\nruleMatrixAssignment returns [EObject current=null] \n(\totherlv_0='[' \n {\n \tnewLeafNode(otherlv_0, grammarAccess.getMatrixAssignmentAccess().getLeftSquareBracketKeyword_0());\n }\n(\n\t\tlv_variable_1_0=RULE_MATH_NAME\n\t\t{\n\t\t\tnewLeafNode(lv_variable_1_0, grammarAccess.getMatrixAssignmentAccess().getVariableMATH_NAMETerminalRuleCall_1_0()); \n\t\t}\n\t\t{\n\t $current = createModelElement(grammarAccess.getMatrixAssignmentRule());\n \t\tsetWithLastConsumed(\n \t\t\t\"variable\",\n \t\tlv_variable_1_0, \n \t\t\"MATH_NAME\");\n)\totherlv_2=']' \n \tnewLeafNode(otherlv_2, grammarAccess.getMatrixAssignmentAccess().getRightSquareBracketKeyword_2());\n }\n\totherlv_3='=' \n {\n \tnewLeafNode(otherlv_3, grammarAccess.getMatrixAssignmentAccess().getEqualsSignKeyword_3());\n\t newCompositeNode(grammarAccess.getMatrixAssignmentAccess().getValueMatrixFormulaParserRuleCall_4_0()); \n\t\tlv_value_4_0=ruleMatrixFormula\t\t{\n\t $current = createModelElementForParent(grammarAccess.getMatrixAssignmentRule());\n \t\t\t\"value\",\n \t\tlv_value_4_0, \n \t\t\"MatrixFormula\");\n// Entry rule entryRuleMatrixFormula\nentryRuleMatrixFormula returns [EObject current=null] \n\t{ newCompositeNode(grammarAccess.getMatrixFormulaRule()); }\n\t iv_ruleMatrixFormula=ruleMatrixFormula \n\t { $current=$iv_ruleMatrixFormula.current; } \n// Rule MatrixFormula\nruleMatrixFormula returns [EObject current=null] \n(\n\t\t{ \n\t newCompositeNode(grammarAccess.getMatrixFormulaAccess().getExpressionMatrixAdditionParserRuleCall_0()); \n\t }\n\t\tlv_expression_0_0=ruleMatrixAddition\t\t{\n\t $current = createModelElementForParent(grammarAccess.getMatrixFormulaRule());\n \t\tset(\n \t\t\t\"expression\",\n \t\tlv_expression_0_0, \n \t\t\"MatrixAddition\");\n\t afterParserOrEnumRuleCall();\n)\n;\n\n\n\n\n\n// Entry rule entryRuleMatrixAddition\nentryRuleMatrixAddition returns [EObject current=null] \n\t:\n\t{ newCompositeNode(grammarAccess.getMatrixAdditionRule()); }\n\t iv_ruleMatrixAddition=ruleMatrixAddition \n\t { $current=$iv_ruleMatrixAddition.current; } \n\t EOF \n;\n\n// Rule MatrixAddition\nruleMatrixAddition returns [EObject current=null] \n @init { enterRule(); \n }\n @after { leaveRule(); }:\n(\n\t{ \n\t /* */ \n\t}\n { \n newCompositeNode(grammarAccess.getMatrixAdditionAccess().getMatrixMultiplicationParserRuleCall_0()); \n }\n this_MatrixMultiplication_0=ruleMatrixMultiplication\n { \n $current = $this_MatrixMultiplication_0.current; \n afterParserOrEnumRuleCall();\n }\n((\totherlv_1='+' \n \tnewLeafNode(otherlv_1, grammarAccess.getMatrixAdditionAccess().getPlusSignKeyword_1_0_0());\n(\n\t{ \n\t /* */ \n\t}\n $current = forceCreateModelElementAndSet(\n grammarAccess.getMatrixAdditionAccess().getMatrixAdditionLeftAction_1_0_1(),\n $current);\n)(\n\t newCompositeNode(grammarAccess.getMatrixAdditionAccess().getRightMatrixMultiplicationParserRuleCall_1_0_2_0()); \n\t\tlv_right_3_0=ruleMatrixMultiplication\t\t{\n\t $current = createModelElementForParent(grammarAccess.getMatrixAdditionRule());\n \t\tset(\n \t\t\t\"right\",\n \t\tlv_right_3_0, \n \t\t\"MatrixMultiplication\");\n))\n |(\totherlv_4='-' \n \tnewLeafNode(otherlv_4, grammarAccess.getMatrixAdditionAccess().getHyphenMinusKeyword_1_1_0());\n\t{ \n\t /* */ \n\t}\n {\n $current = forceCreateModelElementAndSet(\n grammarAccess.getMatrixAdditionAccess().getMatrixSubtractionLeftAction_1_1_1(),\n $current);\n }\n)(\n\t newCompositeNode(grammarAccess.getMatrixAdditionAccess().getRightMatrixMultiplicationParserRuleCall_1_1_2_0()); \n\t\tlv_right_6_0=ruleMatrixMultiplication\t\t{\n\t $current = createModelElementForParent(grammarAccess.getMatrixAdditionRule());\n \t\tset(\n \t\t\t\"right\",\n \t\tlv_right_6_0, \n \t\t\"MatrixMultiplication\");\n)))*)\n// Entry rule entryRuleMatrixMultiplication\nentryRuleMatrixMultiplication returns [EObject current=null] \n\t{ newCompositeNode(grammarAccess.getMatrixMultiplicationRule()); }\n\t iv_ruleMatrixMultiplication=ruleMatrixMultiplication \n\t { $current=$iv_ruleMatrixMultiplication.current; } \n// Rule MatrixMultiplication\nruleMatrixMultiplication returns [EObject current=null] \n(\n\t{ \n\t /* */ \n\t}\n { \n newCompositeNode(grammarAccess.getMatrixMultiplicationAccess().getPrimaryMatrixParserRuleCall_0()); \n }\n this_PrimaryMatrix_0=rulePrimaryMatrix\n { \n $current = $this_PrimaryMatrix_0.current; \n afterParserOrEnumRuleCall();\n }\n((\totherlv_1='*' \n \tnewLeafNode(otherlv_1, grammarAccess.getMatrixMultiplicationAccess().getAsteriskKeyword_1_0_0());\n(\n\t{ \n\t /* */ \n\t}\n {\n $current = forceCreateModelElementAndSet(\n grammarAccess.getMatrixMultiplicationAccess().getMatrixMultiplicationLeftAction_1_0_1(),\n $current);\n }\n)(\n\t newCompositeNode(grammarAccess.getMatrixMultiplicationAccess().getRightMatrixPrimaryMatrixParserRuleCall_1_0_2_0()); \n\t\tlv_rightMatrix_3_0=rulePrimaryMatrix\t\t{\n\t $current = createModelElementForParent(grammarAccess.getMatrixMultiplicationRule());\n \t\tset(\n \t\t\t\"rightMatrix\",\n \t\tlv_rightMatrix_3_0, \n \t\t\"PrimaryMatrix\");\n))\n |(\totherlv_4='*' \n \tnewLeafNode(otherlv_4, grammarAccess.getMatrixMultiplicationAccess().getAsteriskKeyword_1_1_0());\n\t{ \n\t /* */ \n\t}\n {\n $current = forceCreateModelElementAndSet(\n grammarAccess.getMatrixMultiplicationAccess().getMatrixMultiplicationLeftAction_1_1_1(),\n $current);\n }\n)(\n\t newCompositeNode(grammarAccess.getMatrixMultiplicationAccess().getRightScalarFormulaParserRuleCall_1_1_2_0()); \n\t\tlv_rightScalar_6_0=ruleFormula\t\t{\n\t $current = createModelElementForParent(grammarAccess.getMatrixMultiplicationRule());\n \t\tset(\n \t\t\t\"rightScalar\",\n \t\tlv_rightScalar_6_0, \n \t\t\"Formula\");\n)))*)\n;\n\n\n\n\n\n// Entry rule entryRulePrimaryMatrix\nentryRulePrimaryMatrix returns [EObject current=null] \n\t:\n\t{ newCompositeNode(grammarAccess.getPrimaryMatrixRule()); }\n\t iv_rulePrimaryMatrix=rulePrimaryMatrix \n\t { $current=$iv_rulePrimaryMatrix.current; } \n\t EOF \n;\n\n// Rule PrimaryMatrix\nrulePrimaryMatrix returns [EObject current=null] \n @init { enterRule(); \n @after { leaveRule(); }:\n(((\n\t{ \n\t /* */ \n\t}\n $current = forceCreateModelElement(\n grammarAccess.getPrimaryMatrixAccess().getNewMatrixAction_0_0(),\n $current);\n)(\n(\n\t\t{ \n\t newCompositeNode(grammarAccess.getPrimaryMatrixAccess().getMatrixMatrixParserRuleCall_0_1_0()); \n\t }\n\t\tlv_matrix_1_0=ruleMatrix\t\t{\n\t if ($current==null) {\n\t $current = createModelElementForParent(grammarAccess.getPrimaryMatrixRule());\n\t }\n \t\tset(\n \t\t\t$current, \n \t\t\t\"matrix\",\n \t\tlv_matrix_1_0, \n \t\t\"Matrix\");\n\t afterParserOrEnumRuleCall();\n\t }\n\n))\n |((\n\t{ \n\t /* */ \n\t}\n {\n $current = forceCreateModelElement(\n grammarAccess.getPrimaryMatrixAccess().getTransposeMatrixAction_1_0(),\n $current);\n }\n)\totherlv_3='[' \n {\n \tnewLeafNode(otherlv_3, grammarAccess.getPrimaryMatrixAccess().getLeftSquareBracketKeyword_1_1());\n }\n(\n(\n\t\tlv_name_4_0=RULE_MATH_NAME\n\t\t{\n\t\t\tnewLeafNode(lv_name_4_0, grammarAccess.getPrimaryMatrixAccess().getNameMATH_NAMETerminalRuleCall_1_2_0()); \n\t\t}\n\t\t{\n\t if ($current==null) {\n\t $current = createModelElement(grammarAccess.getPrimaryMatrixRule());\n\t }\n \t\tsetWithLastConsumed(\n \t\t\t$current, \n \t\t\t\"name\",\n \t\tlv_name_4_0, \n \t\t\"MATH_NAME\");\n\t }\n\n)\n)\totherlv_5=']^T' \n {\n \tnewLeafNode(otherlv_5, grammarAccess.getPrimaryMatrixAccess().getTKeyword_1_3());\n }\n)\n |((\n\t{ \n\t /* */ \n\t}\n {\n $current = forceCreateModelElement(\n grammarAccess.getPrimaryMatrixAccess().getMatrixVariableAction_2_0(),\n $current);\n }\n)\totherlv_7='[' \n {\n \tnewLeafNode(otherlv_7, grammarAccess.getPrimaryMatrixAccess().getLeftSquareBracketKeyword_2_1());\n }\n(\n(\n\t\tlv_name_8_0=RULE_MATH_NAME\n\t\t{\n\t\t\tnewLeafNode(lv_name_8_0, grammarAccess.getPrimaryMatrixAccess().getNameMATH_NAMETerminalRuleCall_2_2_0()); \n\t\t}\n\t\t{\n\t if ($current==null) {\n\t $current = createModelElement(grammarAccess.getPrimaryMatrixRule());\n\t }\n \t\tsetWithLastConsumed(\n \t\t\t$current, \n \t\t\t\"name\",\n \t\tlv_name_8_0, \n \t\t\"MATH_NAME\");\n\t }\n\n)\n)\totherlv_9=']' \n {\n \tnewLeafNode(otherlv_9, grammarAccess.getPrimaryMatrixAccess().getRightSquareBracketKeyword_2_3());\n }\n)\n |(\totherlv_10='(' \n {\n \tnewLeafNode(otherlv_10, grammarAccess.getPrimaryMatrixAccess().getLeftParenthesisKeyword_3_0());\n }\n\n\t{ \n\t /* */ \n\t}\n { \n newCompositeNode(grammarAccess.getPrimaryMatrixAccess().getMatrixAdditionParserRuleCall_3_1()); \n }\n this_MatrixAddition_11=ruleMatrixAddition\n { \n $current = $this_MatrixAddition_11.current; \n afterParserOrEnumRuleCall();\n }\n\totherlv_12=')' \n {\n \tnewLeafNode(otherlv_12, grammarAccess.getPrimaryMatrixAccess().getRightParenthesisKeyword_3_2());\n }\n))\n;\n\n\n\n\n\n// Entry rule entryRuleFloat\nentryRuleFloat returns [String current=null] \n\t:\n\t{ newCompositeNode(grammarAccess.getFloatRule()); } \n\t iv_ruleFloat=ruleFloat \n\t { $current=$iv_ruleFloat.current.getText(); } \n\t EOF \n;\n\n// Rule Float\nruleFloat returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] \n @init { enterRule(); \n }\n @after { leaveRule(); }:\n(( this_INT_0=RULE_INT {\n\t\t$current.merge(this_INT_0);\n }\n\n { \n newLeafNode(this_INT_0, grammarAccess.getFloatAccess().getINTTerminalRuleCall_0()); \n }\n)+(\n\tkw='.' \n {\n $current.merge(kw);\n newLeafNode(kw, grammarAccess.getFloatAccess().getFullStopKeyword_1_0()); \n }\n( this_INT_2=RULE_INT {\n\t\t$current.merge(this_INT_2);\n }\n\n { \n newLeafNode(this_INT_2, grammarAccess.getFloatAccess().getINTTerminalRuleCall_1_1()); \n }\n)+((\n\tkw='E' \n {\n $current.merge(kw);\n newLeafNode(kw, grammarAccess.getFloatAccess().getEKeyword_1_2_0_0()); \n }\n\n |\n\tkw='e' \n {\n $current.merge(kw);\n newLeafNode(kw, grammarAccess.getFloatAccess().getEKeyword_1_2_0_1()); \n }\n)(\n\tkw='-' \n {\n $current.merge(kw);\n newLeafNode(kw, grammarAccess.getFloatAccess().getHyphenMinusKeyword_1_2_1()); \n }\n)?( this_INT_6=RULE_INT {\n\t\t$current.merge(this_INT_6);\n }\n\n { \n newLeafNode(this_INT_6, grammarAccess.getFloatAccess().getINTTerminalRuleCall_1_2_2()); \n }\n)+)?)?)\n ;\n\n\n\n\n\n// Entry rule entryRuleFunction\nentryRuleFunction returns [EObject current=null] \n\t:\n\t{ newCompositeNode(grammarAccess.getFunctionRule()); }\n\t iv_ruleFunction=ruleFunction \n\t { $current=$iv_ruleFunction.current; } \n\t EOF \n;\n\n// Rule Function\nruleFunction returns [EObject current=null] \n @init { enterRule(); \n }\n @after { leaveRule(); }:\n((\n(\n\t\tlv_name_0_0=RULE_MATH_NAME\n\t\t{\n\t\t\tnewLeafNode(lv_name_0_0, grammarAccess.getFunctionAccess().getNameMATH_NAMETerminalRuleCall_0_0()); \n\t\t}\n\t\t{\n\t if ($current==null) {\n\t $current = createModelElement(grammarAccess.getFunctionRule());\n\t }\n \t\tsetWithLastConsumed(\n \t\t\t$current, \n \t\t\t\"name\",\n \t\tlv_name_0_0, \n \t\t\"MATH_NAME\");\n\t }\n\n)\n)\totherlv_1='(' \n {\n \tnewLeafNode(otherlv_1, grammarAccess.getFunctionAccess().getLeftParenthesisKeyword_1());\n }\n((\n(\n\t\t{ \n\t newCompositeNode(grammarAccess.getFunctionAccess().getParametersFormulaParserRuleCall_2_0_0()); \n\t }\n\t\tlv_parameters_2_0=ruleFormula\t\t{\n\t if ($current==null) {\n\t $current = createModelElementForParent(grammarAccess.getFunctionRule());\n\t }\n \t\tadd(\n \t\t\t$current, \n \t\t\t\"parameters\",\n \t\tlv_parameters_2_0, \n \t\t\"Formula\");\n\t afterParserOrEnumRuleCall();\n\t }\n\n)\n)(\totherlv_3=',' \n {\n \tnewLeafNode(otherlv_3, grammarAccess.getFunctionAccess().getCommaKeyword_2_1_0());\n }\n(\n(\n\t\t{ \n\t newCompositeNode(grammarAccess.getFunctionAccess().getParametersFormulaParserRuleCall_2_1_1_0()); \n\t }\n\t\tlv_parameters_4_0=ruleFormula\t\t{\n\t if ($current==null) {\n\t $current = createModelElementForParent(grammarAccess.getFunctionRule());\n\t }\n \t\tadd(\n \t\t\t$current, \n \t\t\t\"parameters\",\n \t\tlv_parameters_4_0, \n \t\t\"Formula\");\n\t afterParserOrEnumRuleCall();\n\t }\n\n)\n))*(\totherlv_5=',' \n {\n \tnewLeafNode(otherlv_5, grammarAccess.getFunctionAccess().getCommaKeyword_2_2());\n }\n)?)?\totherlv_6=')' \n {\n \tnewLeafNode(otherlv_6, grammarAccess.getFunctionAccess().getRightParenthesisKeyword_3());\n }\n)\n;\n\n\n\n\n\n// Entry rule entryRuleFunctionDefinition\nentryRuleFunctionDefinition returns [EObject current=null] \n\t:\n\t{ newCompositeNode(grammarAccess.getFunctionDefinitionRule()); }\n\t iv_ruleFunctionDefinition=ruleFunctionDefinition \n\t { $current=$iv_ruleFunctionDefinition.current; } \n\t EOF \n;\n\n// Rule FunctionDefinition\nruleFunctionDefinition returns [EObject current=null] \n @init { enterRule(); \n }\n @after { leaveRule(); }:\n((\n(\n\t\t{ \n\t newCompositeNode(grammarAccess.getFunctionDefinitionAccess().getFunctionFunctionParserRuleCall_0_0()); \n\t }\n\t\tlv_function_0_0=ruleFunction\t\t{\n\t if ($current==null) {\n\t $current = createModelElementForParent(grammarAccess.getFunctionDefinitionRule());\n\t }\n \t\tset(\n \t\t\t$current, \n \t\t\t\"function\",\n \t\tlv_function_0_0, \n \t\t\"Function\");\n\t afterParserOrEnumRuleCall();\n\t }\n\n)\n)\totherlv_1='=' \n {\n \tnewLeafNode(otherlv_1, grammarAccess.getFunctionDefinitionAccess().getEqualsSignKeyword_1());\n }\n(\n(\n\t\t{ \n\t newCompositeNode(grammarAccess.getFunctionDefinitionAccess().getFormulaFormulaParserRuleCall_2_0()); \n\t }\n\t\tlv_formula_2_0=ruleFormula\t\t{\n\t if ($current==null) {\n\t $current = createModelElementForParent(grammarAccess.getFunctionDefinitionRule());\n\t }\n \t\tset(\n \t\t\t$current, \n \t\t\t\"formula\",\n \t\tlv_formula_2_0, \n \t\t\"Formula\");\n\t afterParserOrEnumRuleCall();\n\t }\n\n)\n))", "new_methods": [], "old_code": "\t newCompositeNode(grammarAccess.getStatementAccess().getMatrixDefinitionMatrixDefinitionParserRuleCall_1_0()); \n\t\tlv_matrixDefinition_1_0=ruleMatrixDefinition\t\t{\n \t\t\t\"matrixDefinition\",\n \t\tlv_matrixDefinition_1_0, \n \t\t\"MatrixDefinition\");\n\t newCompositeNode(grammarAccess.getStatementAccess().getAssignmentAssignmentParserRuleCall_2_0()); \n\t\tlv_assignment_2_0=ruleAssignment\t\t{\n \t\t\t\"assignment\",\n \t\tlv_assignment_2_0, \n \t\t\"Assignment\");\n\t newCompositeNode(grammarAccess.getStatementAccess().getFormulaFormulaParserRuleCall_3_0()); \n\t\tlv_formula_3_0=ruleFormula\t\t{\n \t\t\t\"formula\",\n \t\tlv_formula_3_0, \n \t\t\"Formula\");\n// Entry rule entryRuleAssignment\nentryRuleAssignment returns [EObject current=null] \n\t{ newCompositeNode(grammarAccess.getAssignmentRule()); }\n\t iv_ruleAssignment=ruleAssignment \n\t { $current=$iv_ruleAssignment.current; } \n// Rule Assignment\nruleAssignment returns [EObject current=null] \n\t\t\tnewLeafNode(lv_variable_0_0, grammarAccess.getAssignmentAccess().getVariableMATH_NAMETerminalRuleCall_0_0()); \n\t $current = createModelElement(grammarAccess.getAssignmentRule());\n \tnewLeafNode(otherlv_1, grammarAccess.getAssignmentAccess().getEqualsSignKeyword_1());\n\t newCompositeNode(grammarAccess.getAssignmentAccess().getValueFormulaParserRuleCall_2_0()); \n\t $current = createModelElementForParent(grammarAccess.getAssignmentRule());\n |(\totherlv_1='-' \n \tnewLeafNode(otherlv_1, grammarAccess.getUnaryExpressionAccess().getHyphenMinusKeyword_1_0());\n))\n |(\totherlv_4='(' \n \tnewLeafNode(otherlv_4, grammarAccess.getUnaryExpressionAccess().getLeftParenthesisKeyword_2_0());\n\t\tlv_expression_6_0=ruleUnaryExpression\t\t{\n \t\tlv_expression_6_0, \n \t\t\"UnaryExpression\");\n\t afterParserOrEnumRuleCall();\n\t }\n\n)\n)\totherlv_7=')!' \n {\n \tnewLeafNode(otherlv_7, grammarAccess.getUnaryExpressionAccess().getRightParenthesisExclamationMarkKeyword_2_3());\n }\n)\n |((\n\t{ \n\t /* */ \n\t}\n {\n $current = forceCreateModelElement(\n grammarAccess.getUnaryExpressionAccess().getIntervalAction_3_0(),\n $current);\n }\n)(\n(\n(\n\t\tlv_openingBracket_9_1=\t'[' \n {\n newLeafNode(lv_openingBracket_9_1, grammarAccess.getUnaryExpressionAccess().getOpeningBracketLeftSquareBracketKeyword_3_1_0_0());\n }\n \n\t {\n\t if ($current==null) {\n\t $current = createModelElement(grammarAccess.getUnaryExpressionRule());\n\t }\n \t\tsetWithLastConsumed($current, \"openingBracket\", lv_openingBracket_9_1, null);\n\t }\n\n |\t\tlv_openingBracket_9_2=\t'(' \n {\n newLeafNode(lv_openingBracket_9_2, grammarAccess.getUnaryExpressionAccess().getOpeningBracketLeftParenthesisKeyword_3_1_0_1());\n }\n \n\t {\n\t if ($current==null) {\n\t $current = createModelElement(grammarAccess.getUnaryExpressionRule());\n\t }\n \t\tsetWithLastConsumed($current, \"openingBracket\", lv_openingBracket_9_2, null);\n\t }\n\n)\n\n)\n)\totherlv_10='(' \n {\n \tnewLeafNode(otherlv_10, grammarAccess.getUnaryExpressionAccess().getLeftParenthesisKeyword_3_2());\n }\n(\n(\n\t\t{ \n\t newCompositeNode(grammarAccess.getUnaryExpressionAccess().getCeilUnaryExpressionParserRuleCall_3_3_0()); \n\t }\n\t\tlv_ceil_11_0=ruleUnaryExpression\t\t{\n\t if ($current==null) {\n\t $current = createModelElementForParent(grammarAccess.getUnaryExpressionRule());\n\t }\n \t\tset(\n \t\t\t$current, \n \t\t\t\"ceil\",\n \t\tlv_ceil_11_0, \n \t\t\"UnaryExpression\");\n\t afterParserOrEnumRuleCall();\n\t }\n\n)\n)\totherlv_12=')' \n {\n \tnewLeafNode(otherlv_12, grammarAccess.getUnaryExpressionAccess().getRightParenthesisKeyword_3_4());\n }\n\totherlv_13='..' \n {\n \tnewLeafNode(otherlv_13, grammarAccess.getUnaryExpressionAccess().getFullStopFullStopKeyword_3_5());\n }\n\totherlv_14='(' \n {\n \tnewLeafNode(otherlv_14, grammarAccess.getUnaryExpressionAccess().getLeftParenthesisKeyword_3_6());\n }\n(\n(\n\t\t{ \n\t newCompositeNode(grammarAccess.getUnaryExpressionAccess().getFloorUnaryExpressionParserRuleCall_3_7_0()); \n\t }\n\t\tlv_floor_15_0=ruleUnaryExpression\t\t{\n\t if ($current==null) {\n\t $current = createModelElementForParent(grammarAccess.getUnaryExpressionRule());\n\t }\n \t\tset(\n \t\t\t$current, \n \t\t\t\"floor\",\n \t\tlv_floor_15_0, \n)\totherlv_16=')' \n {\n \tnewLeafNode(otherlv_16, grammarAccess.getUnaryExpressionAccess().getRightParenthesisKeyword_3_8());\n }\n(\n(\n(\n\t\tlv_closingBracket_17_1=\t']' \n newLeafNode(lv_closingBracket_17_1, grammarAccess.getUnaryExpressionAccess().getClosingBracketRightSquareBracketKeyword_3_9_0_0());\n \n\t {\n\t if ($current==null) {\n\t $current = createModelElement(grammarAccess.getUnaryExpressionRule());\n\t }\n \t\tsetWithLastConsumed($current, \"closingBracket\", lv_closingBracket_17_1, null);\n\t }\n\n |\t\tlv_closingBracket_17_2=\t')' \n {\n newLeafNode(lv_closingBracket_17_2, grammarAccess.getUnaryExpressionAccess().getClosingBracketRightParenthesisKeyword_3_9_0_1());\n }\n \n\t {\n\t if ($current==null) {\n\t $current = createModelElement(grammarAccess.getUnaryExpressionRule());\n\t }\n \t\tsetWithLastConsumed($current, \"closingBracket\", lv_closingBracket_17_2, null);\n\t }\n\n)\n\n)\n)))\n grammarAccess.getPrimaryAccess().getFunctionAction_2_0(),\n\t newCompositeNode(grammarAccess.getPrimaryAccess().getFunctionFunctionParserRuleCall_2_1_0()); \n\t\tlv_function_5_0=ruleFunction\t\t{\n \t\tlv_function_5_0, \n |(\totherlv_6='(' \n \tnewLeafNode(otherlv_6, grammarAccess.getPrimaryAccess().getLeftParenthesisKeyword_3_0());\n newCompositeNode(grammarAccess.getPrimaryAccess().getAdditionParserRuleCall_3_1()); \n this_Addition_7=ruleAddition\n $current = $this_Addition_7.current; \n\totherlv_8=')' \n \tnewLeafNode(otherlv_8, grammarAccess.getPrimaryAccess().getRightParenthesisKeyword_3_2());\n// Entry rule entryRuleFloat\nentryRuleFloat returns [String current=null] \n\t{ newCompositeNode(grammarAccess.getFloatRule()); } \n\t iv_ruleFloat=ruleFloat \n\t { $current=$iv_ruleFloat.current.getText(); } \n// Rule Float\nruleFloat returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] \n(( this_INT_0=RULE_INT {\n\t\t$current.merge(this_INT_0);\n }\n\n { \n newLeafNode(this_INT_0, grammarAccess.getFloatAccess().getINTTerminalRuleCall_0()); \n }\n)+(\n\tkw='.' \n $current.merge(kw);\n newLeafNode(kw, grammarAccess.getFloatAccess().getFullStopKeyword_1_0()); \n }\n( this_INT_2=RULE_INT {\n\t\t$current.merge(this_INT_2);\n { \n newLeafNode(this_INT_2, grammarAccess.getFloatAccess().getINTTerminalRuleCall_1_1()); \n }\n)+((\n\tkw='E' \n $current.merge(kw);\n newLeafNode(kw, grammarAccess.getFloatAccess().getEKeyword_1_2_0_0()); \n |\n\tkw='e' \n $current.merge(kw);\n newLeafNode(kw, grammarAccess.getFloatAccess().getEKeyword_1_2_0_1()); \n)(\n\tkw='-' \n $current.merge(kw);\n newLeafNode(kw, grammarAccess.getFloatAccess().getHyphenMinusKeyword_1_2_1()); \n }\n)?( this_INT_6=RULE_INT {\n\t\t$current.merge(this_INT_6);\n\n { \n newLeafNode(this_INT_6, grammarAccess.getFloatAccess().getINTTerminalRuleCall_1_2_2()); \n }\n)+)?)?)\n ;\n// Entry rule entryRuleFunction\nentryRuleFunction returns [EObject current=null] \n\t{ newCompositeNode(grammarAccess.getFunctionRule()); }\n\t iv_ruleFunction=ruleFunction \n\t { $current=$iv_ruleFunction.current; } \n\t EOF \n// Rule Function\nruleFunction returns [EObject current=null] \n((\n(\n\t\tlv_name_0_0=RULE_MATH_NAME\n\t\t{\n\t\t\tnewLeafNode(lv_name_0_0, grammarAccess.getFunctionAccess().getNameMATH_NAMETerminalRuleCall_0_0()); \n\t\t}\n\t\t{\n\t if ($current==null) {\n\t $current = createModelElement(grammarAccess.getFunctionRule());\n\t }\n \t\tsetWithLastConsumed(\n \t\t\t$current, \n \t\t\t\"name\",\n \t\tlv_name_0_0, \n \t\t\"MATH_NAME\");\n\t }\n\n)\n)\totherlv_1='(' \n \tnewLeafNode(otherlv_1, grammarAccess.getFunctionAccess().getLeftParenthesisKeyword_1());\n\t newCompositeNode(grammarAccess.getFunctionAccess().getParametersFormulaParserRuleCall_2_0_0()); \n\t\tlv_parameters_2_0=ruleFormula\t\t{\n\t $current = createModelElementForParent(grammarAccess.getFunctionRule());\n \t\t\t\"parameters\",\n \t\tlv_parameters_2_0, \n \t\t\"Formula\");\n)(\totherlv_3=',' \n \tnewLeafNode(otherlv_3, grammarAccess.getFunctionAccess().getCommaKeyword_2_1_0());\n\t newCompositeNode(grammarAccess.getFunctionAccess().getParametersFormulaParserRuleCall_2_1_1_0()); \n\t\tlv_parameters_4_0=ruleFormula\t\t{\n\t $current = createModelElementForParent(grammarAccess.getFunctionRule());\n \t\t\t\"parameters\",\n \t\tlv_parameters_4_0, \n \t\t\"Formula\");\n))*(\totherlv_5=',' \n \tnewLeafNode(otherlv_5, grammarAccess.getFunctionAccess().getCommaKeyword_2_2());\n)?)?\totherlv_6=')' \n \tnewLeafNode(otherlv_6, grammarAccess.getFunctionAccess().getRightParenthesisKeyword_3());\n// Entry rule entryRuleFunctionDefinition\nentryRuleFunctionDefinition returns [EObject current=null] \n\t{ newCompositeNode(grammarAccess.getFunctionDefinitionRule()); }\n\t iv_ruleFunctionDefinition=ruleFunctionDefinition \n\t { $current=$iv_ruleFunctionDefinition.current; } \n// Rule FunctionDefinition\nruleFunctionDefinition returns [EObject current=null] \n((\n\t\t{ \n\t newCompositeNode(grammarAccess.getFunctionDefinitionAccess().getFunctionFunctionParserRuleCall_0_0()); \n\t }\n\t\tlv_function_0_0=ruleFunction\t\t{\n\t $current = createModelElementForParent(grammarAccess.getFunctionDefinitionRule());\n \t\tset(\n \t\t\t\"function\",\n \t\tlv_function_0_0, \n \t\t\"Function\");\n\t afterParserOrEnumRuleCall();\n)\totherlv_1='=' \n \tnewLeafNode(otherlv_1, grammarAccess.getFunctionDefinitionAccess().getEqualsSignKeyword_1());\n\t newCompositeNode(grammarAccess.getFunctionDefinitionAccess().getFormulaFormulaParserRuleCall_2_0()); \n\t\tlv_formula_2_0=ruleFormula\t\t{\n\t $current = createModelElementForParent(grammarAccess.getFunctionDefinitionRule());\n \t\t\t\"formula\",\n \t\tlv_formula_2_0, \n \t\t\"Formula\");\n// Entry rule entryRuleMatrixDefinition\nentryRuleMatrixDefinition returns [EObject current=null] \n\t{ newCompositeNode(grammarAccess.getMatrixDefinitionRule()); }\n\t iv_ruleMatrixDefinition=ruleMatrixDefinition \n\t { $current=$iv_ruleMatrixDefinition.current; } \n// Rule MatrixDefinition\nruleMatrixDefinition returns [EObject current=null] \n((\n\t\tlv_name_0_0=RULE_MATH_NAME\n\t\t{\n\t\t\tnewLeafNode(lv_name_0_0, grammarAccess.getMatrixDefinitionAccess().getNameMATH_NAMETerminalRuleCall_0_0()); \n\t\t}\n\t\t{\n\t $current = createModelElement(grammarAccess.getMatrixDefinitionRule());\n \t\tsetWithLastConsumed(\n \t\t\t\"name\",\n \t\tlv_name_0_0, \n \t\t\"MATH_NAME\");\n)\totherlv_1='=' \n \tnewLeafNode(otherlv_1, grammarAccess.getMatrixDefinitionAccess().getEqualsSignKeyword_1());\n\totherlv_2='{' \n \tnewLeafNode(otherlv_2, grammarAccess.getMatrixDefinitionAccess().getLeftCurlyBracketKeyword_2());\n((\n\t newCompositeNode(grammarAccess.getMatrixDefinitionAccess().getRowsMatrixRowParserRuleCall_3_0_0()); \n\t\tlv_rows_3_0=ruleMatrixRow\t\t{\n\t $current = createModelElementForParent(grammarAccess.getMatrixDefinitionRule());\n \t\tadd(\n \t\t\t\"rows\",\n \t\tlv_rows_3_0, \n \t\t\"MatrixRow\");\n)(\totherlv_4=',' \n \tnewLeafNode(otherlv_4, grammarAccess.getMatrixDefinitionAccess().getCommaKeyword_3_1_0());\n\t newCompositeNode(grammarAccess.getMatrixDefinitionAccess().getRowsMatrixRowParserRuleCall_3_1_1_0()); \n\t\tlv_rows_5_0=ruleMatrixRow\t\t{\n\t $current = createModelElementForParent(grammarAccess.getMatrixDefinitionRule());\n \t\tadd(\n \t\t\t\"rows\",\n \t\tlv_rows_5_0, \n \t\t\"MatrixRow\");\n))*(\totherlv_6=',' \n {\n \tnewLeafNode(otherlv_6, grammarAccess.getMatrixDefinitionAccess().getCommaKeyword_3_2());\n }\n)?)?\totherlv_7='}' \n {\n \tnewLeafNode(otherlv_7, grammarAccess.getMatrixDefinitionAccess().getRightCurlyBracketKeyword_4());\n }\n)\n// Entry rule entryRuleMatrixRow\nentryRuleMatrixRow returns [EObject current=null] \n\t{ newCompositeNode(grammarAccess.getMatrixRowRule()); }\n\t iv_ruleMatrixRow=ruleMatrixRow \n\t { $current=$iv_ruleMatrixRow.current; } \n// Rule MatrixRow\nruleMatrixRow returns [EObject current=null] \n(\totherlv_0='{' \n \tnewLeafNode(otherlv_0, grammarAccess.getMatrixRowAccess().getLeftCurlyBracketKeyword_0());\n((\n\t newCompositeNode(grammarAccess.getMatrixRowAccess().getElementsFloatParserRuleCall_1_0_0()); \n\t\tlv_elements_1_0=ruleFloat\t\t{\n\t $current = createModelElementForParent(grammarAccess.getMatrixRowRule());\n \t\tadd(\n \t\t\t\"elements\",\n \t\tlv_elements_1_0, \n \t\t\"Float\");\n)(\totherlv_2=',' \n \tnewLeafNode(otherlv_2, grammarAccess.getMatrixRowAccess().getCommaKeyword_1_1_0());\n\t newCompositeNode(grammarAccess.getMatrixRowAccess().getElementsFloatParserRuleCall_1_1_1_0()); \n\t\tlv_elements_3_0=ruleFloat\t\t{\n\t $current = createModelElementForParent(grammarAccess.getMatrixRowRule());\n \t\tadd(\n \t\t\t\"elements\",\n \t\tlv_elements_3_0, \n \t\t\"Float\");\n))*(\totherlv_4=',' \n {\n \tnewLeafNode(otherlv_4, grammarAccess.getMatrixRowAccess().getCommaKeyword_1_2());\n)?)?\totherlv_5='}' \n \tnewLeafNode(otherlv_5, grammarAccess.getMatrixRowAccess().getRightCurlyBracketKeyword_2());", "old_methods": [], "patch": "@@ -105,17 +105,17 @@ ruleStatement returns [EObject current=null]\n |(\n (\n \t\t{ \n-\t newCompositeNode(grammarAccess.getStatementAccess().getMatrixDefinitionMatrixDefinitionParserRuleCall_1_0()); \n+\t newCompositeNode(grammarAccess.getStatementAccess().getVariableAssignmentVariableAssignmentParserRuleCall_1_0()); \n \t }\n-\t\tlv_matrixDefinition_1_0=ruleMatrixDefinition\t\t{\n+\t\tlv_variableAssignment_1_0=ruleVariableAssignment\t\t{\n \t if ($current==null) {\n \t $current = createModelElementForParent(grammarAccess.getStatementRule());\n \t }\n \t\tset(\n \t\t\t$current, \n- \t\t\t\"matrixDefinition\",\n- \t\tlv_matrixDefinition_1_0, \n- \t\t\"MatrixDefinition\");\n+ \t\t\t\"variableAssignment\",\n+ \t\tlv_variableAssignment_1_0, \n+ \t\t\"VariableAssignment\");\n \t afterParserOrEnumRuleCall();\n \t }\n \n@@ -124,17 +124,17 @@ ruleStatement returns [EObject current=null]\n |(\n (\n \t\t{ \n-\t newCompositeNode(grammarAccess.getStatementAccess().getAssignmentAssignmentParserRuleCall_2_0()); \n+\t newCompositeNode(grammarAccess.getStatementAccess().getFormulaFormulaParserRuleCall_2_0()); \n \t }\n-\t\tlv_assignment_2_0=ruleAssignment\t\t{\n+\t\tlv_formula_2_0=ruleFormula\t\t{\n \t if ($current==null) {\n \t $current = createModelElementForParent(grammarAccess.getStatementRule());\n \t }\n \t\tset(\n \t\t\t$current, \n- \t\t\t\"assignment\",\n- \t\tlv_assignment_2_0, \n- \t\t\"Assignment\");\n+ \t\t\t\"formula\",\n+ \t\tlv_formula_2_0, \n+ \t\t\"Formula\");\n \t afterParserOrEnumRuleCall();\n \t }\n \n@@ -143,17 +143,36 @@ ruleStatement returns [EObject current=null]\n |(\n (\n \t\t{ \n-\t newCompositeNode(grammarAccess.getStatementAccess().getFormulaFormulaParserRuleCall_3_0()); \n+\t newCompositeNode(grammarAccess.getStatementAccess().getMatrixAssignmentMatrixAssignmentParserRuleCall_3_0()); \n \t }\n-\t\tlv_formula_3_0=ruleFormula\t\t{\n+\t\tlv_matrixAssignment_3_0=ruleMatrixAssignment\t\t{\n \t if ($current==null) {\n \t $current = createModelElementForParent(grammarAccess.getStatementRule());\n \t }\n \t\tset(\n \t\t\t$current, \n- \t\t\t\"formula\",\n- \t\tlv_formula_3_0, \n- \t\t\"Formula\");\n+ \t\t\t\"matrixAssignment\",\n+ \t\tlv_matrixAssignment_3_0, \n+ \t\t\"MatrixAssignment\");\n+\t afterParserOrEnumRuleCall();\n+\t }\n+\n+)\n+)\n+ |(\n+(\n+\t\t{ \n+\t newCompositeNode(grammarAccess.getStatementAccess().getMatrixFormulaMatrixFormulaParserRuleCall_4_0()); \n+\t }\n+\t\tlv_matrixFormula_4_0=ruleMatrixFormula\t\t{\n+\t if ($current==null) {\n+\t $current = createModelElementForParent(grammarAccess.getStatementRule());\n+\t }\n+ \t\tset(\n+ \t\t\t$current, \n+ \t\t\t\"matrixFormula\",\n+ \t\tlv_matrixFormula_4_0, \n+ \t\t\"MatrixFormula\");\n \t afterParserOrEnumRuleCall();\n \t }\n \n@@ -165,29 +184,29 @@ ruleStatement returns [EObject current=null]\n \n \n \n-// Entry rule entryRuleAssignment\n-entryRuleAssignment returns [EObject current=null] \n+// Entry rule entryRuleVariableAssignment\n+entryRuleVariableAssignment returns [EObject current=null] \n \t:\n-\t{ newCompositeNode(grammarAccess.getAssignmentRule()); }\n-\t iv_ruleAssignment=ruleAssignment \n-\t { $current=$iv_ruleAssignment.current; } \n+\t{ newCompositeNode(grammarAccess.getVariableAssignmentRule()); }\n+\t iv_ruleVariableAssignment=ruleVariableAssignment \n+\t { $current=$iv_ruleVariableAssignment.current; } \n \t EOF \n ;\n \n-// Rule Assignment\n-ruleAssignment returns [EObject current=null] \n+// Rule VariableAssignment\n+ruleVariableAssignment returns [EObject current=null] \n @init { enterRule(); \n }\n @after { leaveRule(); }:\n ((\n (\n \t\tlv_variable_0_0=RULE_MATH_NAME\n \t\t{\n-\t\t\tnewLeafNode(lv_variable_0_0, grammarAccess.getAssignmentAccess().getVariableMATH_NAMETerminalRuleCall_0_0()); \n+\t\t\tnewLeafNode(lv_variable_0_0, grammarAccess.getVariableAssignmentAccess().getVariableMATH_NAMETerminalRuleCall_0_0()); \n \t\t}\n \t\t{\n \t if ($current==null) {\n-\t $current = createModelElement(grammarAccess.getAssignmentRule());\n+\t $current = createModelElement(grammarAccess.getVariableAssignmentRule());\n \t }\n \t\tsetWithLastConsumed(\n \t\t\t$current, \n@@ -199,16 +218,16 @@ ruleAssignment returns [EObject current=null]\n )\n )\totherlv_1='=' \n {\n- \tnewLeafNode(otherlv_1, grammarAccess.getAssignmentAccess().getEqualsSignKeyword_1());\n+ \tnewLeafNode(otherlv_1, grammarAccess.getVariableAssignmentAccess().getEqualsSignKeyword_1());\n }\n (\n (\n \t\t{ \n-\t newCompositeNode(grammarAccess.getAssignmentAccess().getValueFormulaParserRuleCall_2_0()); \n+\t newCompositeNode(grammarAccess.getVariableAssignmentAccess().getValueFormulaParserRuleCall_2_0()); \n \t }\n \t\tlv_value_2_0=ruleFormula\t\t{\n \t if ($current==null) {\n-\t $current = createModelElementForParent(grammarAccess.getAssignmentRule());\n+\t $current = createModelElementForParent(grammarAccess.getVariableAssignmentRule());\n \t }\n \t\tset(\n \t\t\t$current, \n@@ -516,9 +535,9 @@ ruleUnaryExpression returns [EObject current=null]\n afterParserOrEnumRuleCall();\n }\n \n- |(\totherlv_1='-' \n+ |(\totherlv_1='(-' \n {\n- \tnewLeafNode(otherlv_1, grammarAccess.getUnaryExpressionAccess().getHyphenMinusKeyword_1_0());\n+ \tnewLeafNode(otherlv_1, grammarAccess.getUnaryExpressionAccess().getLeftParenthesisHyphenMinusKeyword_1_0());\n }\n (\n \t{ \n@@ -547,10 +566,14 @@ ruleUnaryExpression returns [EObject current=null]\n \t }\n \n )\n-))\n- |(\totherlv_4='(' \n+)\totherlv_4=')' \n+ {\n+ \tnewLeafNode(otherlv_4, grammarAccess.getUnaryExpressionAccess().getRightParenthesisKeyword_1_3());\n+ }\n+)\n+ |(\totherlv_5='(' \n {\n- \tnewLeafNode(otherlv_4, grammarAccess.getUnaryExpressionAccess().getLeftParenthesisKeyword_2_0());\n+ \tnewLeafNode(otherlv_5, grammarAccess.getUnaryExpressionAccess().getLeftParenthesisKeyword_2_0());\n }\n (\n \t{ \n@@ -566,150 +589,24 @@ ruleUnaryExpression returns [EObject current=null]\n \t\t{ \n \t newCompositeNode(grammarAccess.getUnaryExpressionAccess().getExpressionUnaryExpressionParserRuleCall_2_2_0()); \n \t }\n-\t\tlv_expression_6_0=ruleUnaryExpression\t\t{\n+\t\tlv_expression_7_0=ruleUnaryExpression\t\t{\n \t if ($current==null) {\n \t $current = createModelElementForParent(grammarAccess.getUnaryExpressionRule());\n \t }\n \t\tset(\n \t\t\t$current, \n \t\t\t\"expression\",\n- \t\tlv_expression_6_0, \n- \t\t\"UnaryExpression\");\n-\t afterParserOrEnumRuleCall();\n-\t }\n-\n-)\n-)\totherlv_7=')!' \n- {\n- \tnewLeafNode(otherlv_7, grammarAccess.getUnaryExpressionAccess().getRightParenthesisExclamationMarkKeyword_2_3());\n- }\n-)\n- |((\n-\t{ \n-\t /* */ \n-\t}\n- {\n- $current = forceCreateModelElement(\n- grammarAccess.getUnaryExpressionAccess().getIntervalAction_3_0(),\n- $current);\n- }\n-)(\n-(\n-(\n-\t\tlv_openingBracket_9_1=\t'[' \n- {\n- newLeafNode(lv_openingBracket_9_1, grammarAccess.getUnaryExpressionAccess().getOpeningBracketLeftSquareBracketKeyword_3_1_0_0());\n- }\n- \n-\t {\n-\t if ($current==null) {\n-\t $current = createModelElement(grammarAccess.getUnaryExpressionRule());\n-\t }\n- \t\tsetWithLastConsumed($current, \"openingBracket\", lv_openingBracket_9_1, null);\n-\t }\n-\n- |\t\tlv_openingBracket_9_2=\t'(' \n- {\n- newLeafNode(lv_openingBracket_9_2, grammarAccess.getUnaryExpressionAccess().getOpeningBracketLeftParenthesisKeyword_3_1_0_1());\n- }\n- \n-\t {\n-\t if ($current==null) {\n-\t $current = createModelElement(grammarAccess.getUnaryExpressionRule());\n-\t }\n- \t\tsetWithLastConsumed($current, \"openingBracket\", lv_openingBracket_9_2, null);\n-\t }\n-\n-)\n-\n-)\n-)\totherlv_10='(' \n- {\n- \tnewLeafNode(otherlv_10, grammarAccess.getUnaryExpressionAccess().getLeftParenthesisKeyword_3_2());\n- }\n-(\n-(\n-\t\t{ \n-\t newCompositeNode(grammarAccess.getUnaryExpressionAccess().getCeilUnaryExpressionParserRuleCall_3_3_0()); \n-\t }\n-\t\tlv_ceil_11_0=ruleUnaryExpression\t\t{\n-\t if ($current==null) {\n-\t $current = createModelElementForParent(grammarAccess.getUnaryExpressionRule());\n-\t }\n- \t\tset(\n- \t\t\t$current, \n- \t\t\t\"ceil\",\n- \t\tlv_ceil_11_0, \n- \t\t\"UnaryExpression\");\n-\t afterParserOrEnumRuleCall();\n-\t }\n-\n-)\n-)\totherlv_12=')' \n- {\n- \tnewLeafNode(otherlv_12, grammarAccess.getUnaryExpressionAccess().getRightParenthesisKeyword_3_4());\n- }\n-\totherlv_13='..' \n- {\n- \tnewLeafNode(otherlv_13, grammarAccess.getUnaryExpressionAccess().getFullStopFullStopKeyword_3_5());\n- }\n-\totherlv_14='(' \n- {\n- \tnewLeafNode(otherlv_14, grammarAccess.getUnaryExpressionAccess().getLeftParenthesisKeyword_3_6());\n- }\n-(\n-(\n-\t\t{ \n-\t newCompositeNode(grammarAccess.getUnaryExpressionAccess().getFloorUnaryExpressionParserRuleCall_3_7_0()); \n-\t }\n-\t\tlv_floor_15_0=ruleUnaryExpression\t\t{\n-\t if ($current==null) {\n-\t $current = createModelElementForParent(grammarAccess.getUnaryExpressionRule());\n-\t }\n- \t\tset(\n- \t\t\t$current, \n- \t\t\t\"floor\",\n- \t\tlv_floor_15_0, \n+ \t\tlv_expression_7_0, \n \t\t\"UnaryExpression\");\n \t afterParserOrEnumRuleCall();\n \t }\n \n )\n-)\totherlv_16=')' \n- {\n- \tnewLeafNode(otherlv_16, grammarAccess.getUnaryExpressionAccess().getRightParenthesisKeyword_3_8());\n- }\n-(\n-(\n-(\n-\t\tlv_closingBracket_17_1=\t']' \n+)\totherlv_8=')!' \n {\n- newLeafNode(lv_closingBracket_17_1, grammarAccess.getUnaryExpressionAccess().getClosingBracketRightSquareBracketKeyword_3_9_0_0());\n+ \tnewLeafNode(otherlv_8, grammarAccess.getUnaryExpressionAccess().getRightParenthesisExclamationMarkKeyword_2_3());\n }\n- \n-\t {\n-\t if ($current==null) {\n-\t $current = createModelElement(grammarAccess.getUnaryExpressionRule());\n-\t }\n- \t\tsetWithLastConsumed($current, \"closingBracket\", lv_closingBracket_17_1, null);\n-\t }\n-\n- |\t\tlv_closingBracket_17_2=\t')' \n- {\n- newLeafNode(lv_closingBracket_17_2, grammarAccess.getUnaryExpressionAccess().getClosingBracketRightParenthesisKeyword_3_9_0_1());\n- }\n- \n-\t {\n-\t if ($current==null) {\n-\t $current = createModelElement(grammarAccess.getUnaryExpressionRule());\n-\t }\n- \t\tsetWithLastConsumed($current, \"closingBracket\", lv_closingBracket_17_2, null);\n-\t }\n-\n-)\n-\n-)\n-)))\n+))\n ;\n \n \n@@ -856,47 +753,127 @@ rulePrimary returns [EObject current=null]\n \t}\n {\n $current = forceCreateModelElement(\n- grammarAccess.getPrimaryAccess().getFunctionAction_2_0(),\n+ grammarAccess.getPrimaryAccess().getMatrixElementAction_2_0(),\n+ $current);\n+ }\n+)(\n+(\n+\t\tlv_element_5_0=RULE_MATH_NAME\n+\t\t{\n+\t\t\tnewLeafNode(lv_element_5_0, grammarAccess.getPrimaryAccess().getElementMATH_NAMETerminalRuleCall_2_1_0()); \n+\t\t}\n+\t\t{\n+\t if ($current==null) {\n+\t $current = createModelElement(grammarAccess.getPrimaryRule());\n+\t }\n+ \t\tsetWithLastConsumed(\n+ \t\t\t$current, \n+ \t\t\t\"element\",\n+ \t\tlv_element_5_0, \n+ \t\t\"MATH_NAME\");\n+\t }\n+\n+)\n+)\totherlv_6='[' \n+ {\n+ \tnewLeafNode(otherlv_6, grammarAccess.getPrimaryAccess().getLeftSquareBracketKeyword_2_2());\n+ }\n+(\n+(\n+\t\tlv_row_7_0=RULE_INT\n+\t\t{\n+\t\t\tnewLeafNode(lv_row_7_0, grammarAccess.getPrimaryAccess().getRowINTTerminalRuleCall_2_3_0()); \n+\t\t}\n+\t\t{\n+\t if ($current==null) {\n+\t $current = createModelElement(grammarAccess.getPrimaryRule());\n+\t }\n+ \t\tsetWithLastConsumed(\n+ \t\t\t$current, \n+ \t\t\t\"row\",\n+ \t\tlv_row_7_0, \n+ \t\t\"INT\");\n+\t }\n+\n+)\n+)\totherlv_8=']' \n+ {\n+ \tnewLeafNode(otherlv_8, grammarAccess.getPrimaryAccess().getRightSquareBracketKeyword_2_4());\n+ }\n+\totherlv_9='[' \n+ {\n+ \tnewLeafNode(otherlv_9, grammarAccess.getPrimaryAccess().getLeftSquareBracketKeyword_2_5());\n+ }\n+(\n+(\n+\t\tlv_column_10_0=RULE_INT\n+\t\t{\n+\t\t\tnewLeafNode(lv_column_10_0, grammarAccess.getPrimaryAccess().getColumnINTTerminalRuleCall_2_6_0()); \n+\t\t}\n+\t\t{\n+\t if ($current==null) {\n+\t $current = createModelElement(grammarAccess.getPrimaryRule());\n+\t }\n+ \t\tsetWithLastConsumed(\n+ \t\t\t$current, \n+ \t\t\t\"column\",\n+ \t\tlv_column_10_0, \n+ \t\t\"INT\");\n+\t }\n+\n+)\n+)\totherlv_11=']' \n+ {\n+ \tnewLeafNode(otherlv_11, grammarAccess.getPrimaryAccess().getRightSquareBracketKeyword_2_7());\n+ }\n+)\n+ |((\n+\t{ \n+\t /* */ \n+\t}\n+ {\n+ $current = forceCreateModelElement(\n+ grammarAccess.getPrimaryAccess().getFunctionAction_3_0(),\n $current);\n }\n )(\n (\n \t\t{ \n-\t newCompositeNode(grammarAccess.getPrimaryAccess().getFunctionFunctionParserRuleCall_2_1_0()); \n+\t newCompositeNode(grammarAccess.getPrimaryAccess().getFunctionFunctionParserRuleCall_3_1_0()); \n \t }\n-\t\tlv_function_5_0=ruleFunction\t\t{\n+\t\tlv_function_13_0=ruleFunction\t\t{\n \t if ($current==null) {\n \t $current = createModelElementForParent(grammarAccess.getPrimaryRule());\n \t }\n \t\tset(\n \t\t\t$current, \n \t\t\t\"function\",\n- \t\tlv_function_5_0, \n+ \t\tlv_function_13_0, \n \t\t\"Function\");\n \t afterParserOrEnumRuleCall();\n \t }\n \n )\n ))\n- |(\totherlv_6='(' \n+ |(\totherlv_14='(' \n {\n- \tnewLeafNode(otherlv_6, grammarAccess.getPrimaryAccess().getLeftParenthesisKeyword_3_0());\n+ \tnewLeafNode(otherlv_14, grammarAccess.getPrimaryAccess().getLeftParenthesisKeyword_4_0());\n }\n \n \t{ \n \t /* */ \n \t}\n { \n- newCompositeNode(grammarAccess.getPrimaryAccess().getAdditionParserRuleCall_3_1()); \n+ newCompositeNode(grammarAccess.getPrimaryAccess().getAdditionParserRuleCall_4_1()); \n }\n- this_Addition_7=ruleAddition\n+ this_Addition_15=ruleAddition\n { \n- $current = $this_Addition_7.current; \n+ $current = $this_Addition_15.current; \n afterParserOrEnumRuleCall();\n }\n-\totherlv_8=')' \n+\totherlv_16=')' \n {\n- \tnewLeafNode(otherlv_8, grammarAccess.getPrimaryAccess().getRightParenthesisKeyword_3_2());\n+ \tnewLeafNode(otherlv_16, grammarAccess.getPrimaryAccess().getRightParenthesisKeyword_4_2());\n }\n ))\n ;\n@@ -905,156 +882,144 @@ rulePrimary returns [EObject current=null]\n \n \n \n-// Entry rule entryRuleFloat\n-entryRuleFloat returns [String current=null] \n+// Entry rule entryRuleMatrix\n+entryRuleMatrix returns [EObject current=null] \n \t:\n-\t{ newCompositeNode(grammarAccess.getFloatRule()); } \n-\t iv_ruleFloat=ruleFloat \n-\t { $current=$iv_ruleFloat.current.getText(); } \n+\t{ newCompositeNode(grammarAccess.getMatrixRule()); }\n+\t iv_ruleMatrix=ruleMatrix \n+\t { $current=$iv_ruleMatrix.current; } \n \t EOF \n ;\n \n-// Rule Float\n-ruleFloat returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] \n+// Rule Matrix\n+ruleMatrix returns [EObject current=null] \n @init { enterRule(); \n }\n @after { leaveRule(); }:\n-(( this_INT_0=RULE_INT {\n-\t\t$current.merge(this_INT_0);\n- }\n-\n- { \n- newLeafNode(this_INT_0, grammarAccess.getFloatAccess().getINTTerminalRuleCall_0()); \n- }\n-)+(\n-\tkw='.' \n+(\totherlv_0='{' \n {\n- $current.merge(kw);\n- newLeafNode(kw, grammarAccess.getFloatAccess().getFullStopKeyword_1_0()); \n- }\n-( this_INT_2=RULE_INT {\n-\t\t$current.merge(this_INT_2);\n+ \tnewLeafNode(otherlv_0, grammarAccess.getMatrixAccess().getLeftCurlyBracketKeyword_0());\n }\n+((\n+(\n+\t\t{ \n+\t newCompositeNode(grammarAccess.getMatrixAccess().getRowsMatrixRowParserRuleCall_1_0_0()); \n+\t }\n+\t\tlv_rows_1_0=ruleMatrixRow\t\t{\n+\t if ($current==null) {\n+\t $current = createModelElementForParent(grammarAccess.getMatrixRule());\n+\t }\n+ \t\tadd(\n+ \t\t\t$current, \n+ \t\t\t\"rows\",\n+ \t\tlv_rows_1_0, \n+ \t\t\"MatrixRow\");\n+\t afterParserOrEnumRuleCall();\n+\t }\n \n- { \n- newLeafNode(this_INT_2, grammarAccess.getFloatAccess().getINTTerminalRuleCall_1_1()); \n- }\n-)+((\n-\tkw='E' \n+)\n+)(\totherlv_2=',' \n {\n- $current.merge(kw);\n- newLeafNode(kw, grammarAccess.getFloatAccess().getEKeyword_1_2_0_0()); \n+ \tnewLeafNode(otherlv_2, grammarAccess.getMatrixAccess().getCommaKeyword_1_1_0());\n }\n+(\n+(\n+\t\t{ \n+\t newCompositeNode(grammarAccess.getMatrixAccess().getRowsMatrixRowParserRuleCall_1_1_1_0()); \n+\t }\n+\t\tlv_rows_3_0=ruleMatrixRow\t\t{\n+\t if ($current==null) {\n+\t $current = createModelElementForParent(grammarAccess.getMatrixRule());\n+\t }\n+ \t\tadd(\n+ \t\t\t$current, \n+ \t\t\t\"rows\",\n+ \t\tlv_rows_3_0, \n+ \t\t\"MatrixRow\");\n+\t afterParserOrEnumRuleCall();\n+\t }\n \n- |\n-\tkw='e' \n+)\n+))*(\totherlv_4=',' \n {\n- $current.merge(kw);\n- newLeafNode(kw, grammarAccess.getFloatAccess().getEKeyword_1_2_0_1()); \n+ \tnewLeafNode(otherlv_4, grammarAccess.getMatrixAccess().getCommaKeyword_1_2());\n }\n-)(\n-\tkw='-' \n+)?)?\totherlv_5='}' \n {\n- $current.merge(kw);\n- newLeafNode(kw, grammarAccess.getFloatAccess().getHyphenMinusKeyword_1_2_1()); \n- }\n-)?( this_INT_6=RULE_INT {\n-\t\t$current.merge(this_INT_6);\n+ \tnewLeafNode(otherlv_5, grammarAccess.getMatrixAccess().getRightCurlyBracketKeyword_2());\n }\n-\n- { \n- newLeafNode(this_INT_6, grammarAccess.getFloatAccess().getINTTerminalRuleCall_1_2_2()); \n- }\n-)+)?)?)\n- ;\n+)\n+;\n \n \n \n \n \n-// Entry rule entryRuleFunction\n-entryRuleFunction returns [EObject current=null] \n+// Entry rule entryRuleMatrixRow\n+entryRuleMatrixRow returns [EObject current=null] \n \t:\n-\t{ newCompositeNode(grammarAccess.getFunctionRule()); }\n-\t iv_ruleFunction=ruleFunction \n-\t { $current=$iv_ruleFunction.current; } \n-\t EOF \n+\t{ newCompositeNode(grammarAccess.getMatrixRowRule()); }\n+\t iv_ruleMatrixRow=ruleMatrixRow \n+\t { $current=$iv_ruleMatrixRow.current; } \n+\t EOF \n ;\n \n-// Rule Function\n-ruleFunction returns [EObject current=null] \n+// Rule MatrixRow\n+ruleMatrixRow returns [EObject current=null] \n @init { enterRule(); \n }\n @after { leaveRule(); }:\n-((\n-(\n-\t\tlv_name_0_0=RULE_MATH_NAME\n-\t\t{\n-\t\t\tnewLeafNode(lv_name_0_0, grammarAccess.getFunctionAccess().getNameMATH_NAMETerminalRuleCall_0_0()); \n-\t\t}\n-\t\t{\n-\t if ($current==null) {\n-\t $current = createModelElement(grammarAccess.getFunctionRule());\n-\t }\n- \t\tsetWithLastConsumed(\n- \t\t\t$current, \n- \t\t\t\"name\",\n- \t\tlv_name_0_0, \n- \t\t\"MATH_NAME\");\n-\t }\n-\n-)\n-)\totherlv_1='(' \n+(\totherlv_0='{' \n {\n- \tnewLeafNode(otherlv_1, grammarAccess.getFunctionAccess().getLeftParenthesisKeyword_1());\n+ \tnewLeafNode(otherlv_0, grammarAccess.getMatrixRowAccess().getLeftCurlyBracketKeyword_0());\n }\n ((\n (\n \t\t{ \n-\t newCompositeNode(grammarAccess.getFunctionAccess().getParametersFormulaParserRuleCall_2_0_0()); \n+\t newCompositeNode(grammarAccess.getMatrixRowAccess().getElementsFloatParserRuleCall_1_0_0()); \n \t }\n-\t\tlv_parameters_2_0=ruleFormula\t\t{\n+\t\tlv_elements_1_0=ruleFloat\t\t{\n \t if ($current==null) {\n-\t $current = createModelElementForParent(grammarAccess.getFunctionRule());\n+\t $current = createModelElementForParent(grammarAccess.getMatrixRowRule());\n \t }\n \t\tadd(\n \t\t\t$current, \n- \t\t\t\"parameters\",\n- \t\tlv_parameters_2_0, \n- \t\t\"Formula\");\n+ \t\t\t\"elements\",\n+ \t\tlv_elements_1_0, \n+ \t\t\"Float\");\n \t afterParserOrEnumRuleCall();\n \t }\n \n )\n-)(\totherlv_3=',' \n+)(\totherlv_2=',' \n {\n- \tnewLeafNode(otherlv_3, grammarAccess.getFunctionAccess().getCommaKeyword_2_1_0());\n+ \tnewLeafNode(otherlv_2, grammarAccess.getMatrixRowAccess().getCommaKeyword_1_1_0());\n }\n (\n (\n \t\t{ \n-\t newCompositeNode(grammarAccess.getFunctionAccess().getParametersFormulaParserRuleCall_2_1_1_0()); \n+\t newCompositeNode(grammarAccess.getMatrixRowAccess().getElementsFloatParserRuleCall_1_1_1_0()); \n \t }\n-\t\tlv_parameters_4_0=ruleFormula\t\t{\n+\t\tlv_elements_3_0=ruleFloat\t\t{\n \t if ($current==null) {\n-\t $current = createModelElementForParent(grammarAccess.getFunctionRule());\n+\t $current = createModelElementForParent(grammarAccess.getMatrixRowRule());\n \t }\n \t\tadd(\n \t\t\t$current, \n- \t\t\t\"parameters\",\n- \t\tlv_parameters_4_0, \n- \t\t\"Formula\");\n+ \t\t\t\"elements\",\n+ \t\tlv_elements_3_0, \n+ \t\t\"Float\");\n \t afterParserOrEnumRuleCall();\n \t }\n \n )\n-))*(\totherlv_5=',' \n+))*(\totherlv_4=',' \n {\n- \tnewLeafNode(otherlv_5, grammarAccess.getFunctionAccess().getCommaKeyword_2_2());\n+ \tnewLeafNode(otherlv_4, grammarAccess.getMatrixRowAccess().getCommaKeyword_1_2());\n }\n-)?)?\totherlv_6=')' \n+)?)?\totherlv_5='}' \n {\n- \tnewLeafNode(otherlv_6, grammarAccess.getFunctionAccess().getRightParenthesisKeyword_3());\n+ \tnewLeafNode(otherlv_5, grammarAccess.getMatrixRowAccess().getRightCurlyBracketKeyword_2());\n }\n )\n ;\n@@ -1063,56 +1028,64 @@ ruleFunction returns [EObject current=null]\n \n \n \n-// Entry rule entryRuleFunctionDefinition\n-entryRuleFunctionDefinition returns [EObject current=null] \n+// Entry rule entryRuleMatrixAssignment\n+entryRuleMatrixAssignment returns [EObject current=null] \n \t:\n-\t{ newCompositeNode(grammarAccess.getFunctionDefinitionRule()); }\n-\t iv_ruleFunctionDefinition=ruleFunctionDefinition \n-\t { $current=$iv_ruleFunctionDefinition.current; } \n+\t{ newCompositeNode(grammarAccess.getMatrixAssignmentRule()); }\n+\t iv_ruleMatrixAssignment=ruleMatrixAssignment \n+\t { $current=$iv_ruleMatrixAssignment.current; } \n \t EOF \n ;\n \n-// Rule FunctionDefinition\n-ruleFunctionDefinition returns [EObject current=null] \n+// Rule MatrixAssignment\n+ruleMatrixAssignment returns [EObject current=null] \n @init { enterRule(); \n }\n @after { leaveRule(); }:\n-((\n+(\totherlv_0='[' \n+ {\n+ \tnewLeafNode(otherlv_0, grammarAccess.getMatrixAssignmentAccess().getLeftSquareBracketKeyword_0());\n+ }\n (\n-\t\t{ \n-\t newCompositeNode(grammarAccess.getFunctionDefinitionAccess().getFunctionFunctionParserRuleCall_0_0()); \n-\t }\n-\t\tlv_function_0_0=ruleFunction\t\t{\n+(\n+\t\tlv_variable_1_0=RULE_MATH_NAME\n+\t\t{\n+\t\t\tnewLeafNode(lv_variable_1_0, grammarAccess.getMatrixAssignmentAccess().getVariableMATH_NAMETerminalRuleCall_1_0()); \n+\t\t}\n+\t\t{\n \t if ($current==null) {\n-\t $current = createModelElementForParent(grammarAccess.getFunctionDefinitionRule());\n+\t $current = createModelElement(grammarAccess.getMatrixAssignmentRule());\n \t }\n- \t\tset(\n+ \t\tsetWithLastConsumed(\n \t\t\t$current, \n- \t\t\t\"function\",\n- \t\tlv_function_0_0, \n- \t\t\"Function\");\n-\t afterParserOrEnumRuleCall();\n+ \t\t\t\"variable\",\n+ \t\tlv_variable_1_0, \n+ \t\t\"MATH_NAME\");\n \t }\n \n )\n-)\totherlv_1='=' \n+)\totherlv_2=']' \n {\n- \tnewLeafNode(otherlv_1, grammarAccess.getFunctionDefinitionAccess().getEqualsSignKeyword_1());\n+ \tnewLeafNode(otherlv_2, grammarAccess.getMatrixAssignmentAccess().getRightSquareBracketKeyword_2());\n+ }\n+\totherlv_3='=' \n+ {\n+ \tnewLeafNode(otherlv_3, grammarAccess.getMatrixAssignmentAccess().getEqualsSignKeyword_3());\n }\n (\n (\n \t\t{ \n-\t newCompositeNode(grammarAccess.getFunctionDefinitionAccess().getFormulaFormulaParserRuleCall_2_0()); \n+\t newCompositeNode(grammarAccess.getMatrixAssignmentAccess().getValueMatrixFormulaParserRuleCall_4_0()); \n \t }\n-\t\tlv_formula_2_0=ruleFormula\t\t{\n+\t\tlv_value_4_0=ruleMatrixFormula\t\t{\n \t if ($current==null) {\n-\t $current = createModelElementForParent(grammarAccess.getFunctionDefinitionRule());\n+\t $current = createModelElementForParent(grammarAccess.getMatrixAssignmentRule());\n \t }\n \t\tset(\n \t\t\t$current, \n- \t\t\t\"formula\",\n- \t\tlv_formula_2_0, \n- \t\t\"Formula\");\n+ \t\t\t\"value\",\n+ \t\tlv_value_4_0, \n+ \t\t\"MatrixFormula\");\n \t afterParserOrEnumRuleCall();\n \t }\n \n@@ -1124,168 +1097,591 @@ ruleFunctionDefinition returns [EObject current=null]\n \n \n \n-// Entry rule entryRuleMatrixDefinition\n-entryRuleMatrixDefinition returns [EObject current=null] \n+// Entry rule entryRuleMatrixFormula\n+entryRuleMatrixFormula returns [EObject current=null] \n \t:\n-\t{ newCompositeNode(grammarAccess.getMatrixDefinitionRule()); }\n-\t iv_ruleMatrixDefinition=ruleMatrixDefinition \n-\t { $current=$iv_ruleMatrixDefinition.current; } \n+\t{ newCompositeNode(grammarAccess.getMatrixFormulaRule()); }\n+\t iv_ruleMatrixFormula=ruleMatrixFormula \n+\t { $current=$iv_ruleMatrixFormula.current; } \n \t EOF \n ;\n \n-// Rule MatrixDefinition\n-ruleMatrixDefinition returns [EObject current=null] \n+// Rule MatrixFormula\n+ruleMatrixFormula returns [EObject current=null] \n @init { enterRule(); \n }\n @after { leaveRule(); }:\n-((\n (\n-\t\tlv_name_0_0=RULE_MATH_NAME\n-\t\t{\n-\t\t\tnewLeafNode(lv_name_0_0, grammarAccess.getMatrixDefinitionAccess().getNameMATH_NAMETerminalRuleCall_0_0()); \n-\t\t}\n-\t\t{\n+(\n+\t\t{ \n+\t newCompositeNode(grammarAccess.getMatrixFormulaAccess().getExpressionMatrixAdditionParserRuleCall_0()); \n+\t }\n+\t\tlv_expression_0_0=ruleMatrixAddition\t\t{\n \t if ($current==null) {\n-\t $current = createModelElement(grammarAccess.getMatrixDefinitionRule());\n+\t $current = createModelElementForParent(grammarAccess.getMatrixFormulaRule());\n \t }\n- \t\tsetWithLastConsumed(\n+ \t\tset(\n \t\t\t$current, \n- \t\t\t\"name\",\n- \t\tlv_name_0_0, \n- \t\t\"MATH_NAME\");\n+ \t\t\t\"expression\",\n+ \t\tlv_expression_0_0, \n+ \t\t\"MatrixAddition\");\n+\t afterParserOrEnumRuleCall();\n \t }\n \n )\n-)\totherlv_1='=' \n+)\n+;\n+\n+\n+\n+\n+\n+// Entry rule entryRuleMatrixAddition\n+entryRuleMatrixAddition returns [EObject current=null] \n+\t:\n+\t{ newCompositeNode(grammarAccess.getMatrixAdditionRule()); }\n+\t iv_ruleMatrixAddition=ruleMatrixAddition \n+\t { $current=$iv_ruleMatrixAddition.current; } \n+\t EOF \n+;\n+\n+// Rule MatrixAddition\n+ruleMatrixAddition returns [EObject current=null] \n+ @init { enterRule(); \n+ }\n+ @after { leaveRule(); }:\n+(\n+\t{ \n+\t /* */ \n+\t}\n+ { \n+ newCompositeNode(grammarAccess.getMatrixAdditionAccess().getMatrixMultiplicationParserRuleCall_0()); \n+ }\n+ this_MatrixMultiplication_0=ruleMatrixMultiplication\n+ { \n+ $current = $this_MatrixMultiplication_0.current; \n+ afterParserOrEnumRuleCall();\n+ }\n+((\totherlv_1='+' \n {\n- \tnewLeafNode(otherlv_1, grammarAccess.getMatrixDefinitionAccess().getEqualsSignKeyword_1());\n+ \tnewLeafNode(otherlv_1, grammarAccess.getMatrixAdditionAccess().getPlusSignKeyword_1_0_0());\n }\n-\totherlv_2='{' \n+(\n+\t{ \n+\t /* */ \n+\t}\n {\n- \tnewLeafNode(otherlv_2, grammarAccess.getMatrixDefinitionAccess().getLeftCurlyBracketKeyword_2());\n+ $current = forceCreateModelElementAndSet(\n+ grammarAccess.getMatrixAdditionAccess().getMatrixAdditionLeftAction_1_0_1(),\n+ $current);\n }\n-((\n+)(\n (\n \t\t{ \n-\t newCompositeNode(grammarAccess.getMatrixDefinitionAccess().getRowsMatrixRowParserRuleCall_3_0_0()); \n+\t newCompositeNode(grammarAccess.getMatrixAdditionAccess().getRightMatrixMultiplicationParserRuleCall_1_0_2_0()); \n \t }\n-\t\tlv_rows_3_0=ruleMatrixRow\t\t{\n+\t\tlv_right_3_0=ruleMatrixMultiplication\t\t{\n \t if ($current==null) {\n-\t $current = createModelElementForParent(grammarAccess.getMatrixDefinitionRule());\n+\t $current = createModelElementForParent(grammarAccess.getMatrixAdditionRule());\n \t }\n- \t\tadd(\n+ \t\tset(\n \t\t\t$current, \n- \t\t\t\"rows\",\n- \t\tlv_rows_3_0, \n- \t\t\"MatrixRow\");\n+ \t\t\t\"right\",\n+ \t\tlv_right_3_0, \n+ \t\t\"MatrixMultiplication\");\n \t afterParserOrEnumRuleCall();\n \t }\n \n )\n-)(\totherlv_4=',' \n+))\n+ |(\totherlv_4='-' \n {\n- \tnewLeafNode(otherlv_4, grammarAccess.getMatrixDefinitionAccess().getCommaKeyword_3_1_0());\n+ \tnewLeafNode(otherlv_4, grammarAccess.getMatrixAdditionAccess().getHyphenMinusKeyword_1_1_0());\n }\n (\n+\t{ \n+\t /* */ \n+\t}\n+ {\n+ $current = forceCreateModelElementAndSet(\n+ grammarAccess.getMatrixAdditionAccess().getMatrixSubtractionLeftAction_1_1_1(),\n+ $current);\n+ }\n+)(\n (\n \t\t{ \n-\t newCompositeNode(grammarAccess.getMatrixDefinitionAccess().getRowsMatrixRowParserRuleCall_3_1_1_0()); \n+\t newCompositeNode(grammarAccess.getMatrixAdditionAccess().getRightMatrixMultiplicationParserRuleCall_1_1_2_0()); \n \t }\n-\t\tlv_rows_5_0=ruleMatrixRow\t\t{\n+\t\tlv_right_6_0=ruleMatrixMultiplication\t\t{\n \t if ($current==null) {\n-\t $current = createModelElementForParent(grammarAccess.getMatrixDefinitionRule());\n+\t $current = createModelElementForParent(grammarAccess.getMatrixAdditionRule());\n \t }\n- \t\tadd(\n+ \t\tset(\n \t\t\t$current, \n- \t\t\t\"rows\",\n- \t\tlv_rows_5_0, \n- \t\t\"MatrixRow\");\n+ \t\t\t\"right\",\n+ \t\tlv_right_6_0, \n+ \t\t\"MatrixMultiplication\");\n \t afterParserOrEnumRuleCall();\n \t }\n \n )\n-))*(\totherlv_6=',' \n- {\n- \tnewLeafNode(otherlv_6, grammarAccess.getMatrixDefinitionAccess().getCommaKeyword_3_2());\n- }\n-)?)?\totherlv_7='}' \n- {\n- \tnewLeafNode(otherlv_7, grammarAccess.getMatrixDefinitionAccess().getRightCurlyBracketKeyword_4());\n- }\n-)\n+)))*)\n ;\n \n \n \n \n \n-// Entry rule entryRuleMatrixRow\n-entryRuleMatrixRow returns [EObject current=null] \n+// Entry rule entryRuleMatrixMultiplication\n+entryRuleMatrixMultiplication returns [EObject current=null] \n \t:\n-\t{ newCompositeNode(grammarAccess.getMatrixRowRule()); }\n-\t iv_ruleMatrixRow=ruleMatrixRow \n-\t { $current=$iv_ruleMatrixRow.current; } \n+\t{ newCompositeNode(grammarAccess.getMatrixMultiplicationRule()); }\n+\t iv_ruleMatrixMultiplication=ruleMatrixMultiplication \n+\t { $current=$iv_ruleMatrixMultiplication.current; } \n \t EOF \n ;\n \n-// Rule MatrixRow\n-ruleMatrixRow returns [EObject current=null] \n+// Rule MatrixMultiplication\n+ruleMatrixMultiplication returns [EObject current=null] \n @init { enterRule(); \n }\n @after { leaveRule(); }:\n-(\totherlv_0='{' \n+(\n+\t{ \n+\t /* */ \n+\t}\n+ { \n+ newCompositeNode(grammarAccess.getMatrixMultiplicationAccess().getPrimaryMatrixParserRuleCall_0()); \n+ }\n+ this_PrimaryMatrix_0=rulePrimaryMatrix\n+ { \n+ $current = $this_PrimaryMatrix_0.current; \n+ afterParserOrEnumRuleCall();\n+ }\n+((\totherlv_1='*' \n {\n- \tnewLeafNode(otherlv_0, grammarAccess.getMatrixRowAccess().getLeftCurlyBracketKeyword_0());\n+ \tnewLeafNode(otherlv_1, grammarAccess.getMatrixMultiplicationAccess().getAsteriskKeyword_1_0_0());\n }\n-((\n+(\n+\t{ \n+\t /* */ \n+\t}\n+ {\n+ $current = forceCreateModelElementAndSet(\n+ grammarAccess.getMatrixMultiplicationAccess().getMatrixMultiplicationLeftAction_1_0_1(),\n+ $current);\n+ }\n+)(\n (\n \t\t{ \n-\t newCompositeNode(grammarAccess.getMatrixRowAccess().getElementsFloatParserRuleCall_1_0_0()); \n+\t newCompositeNode(grammarAccess.getMatrixMultiplicationAccess().getRightMatrixPrimaryMatrixParserRuleCall_1_0_2_0()); \n \t }\n-\t\tlv_elements_1_0=ruleFloat\t\t{\n+\t\tlv_rightMatrix_3_0=rulePrimaryMatrix\t\t{\n \t if ($current==null) {\n-\t $current = createModelElementForParent(grammarAccess.getMatrixRowRule());\n+\t $current = createModelElementForParent(grammarAccess.getMatrixMultiplicationRule());\n \t }\n- \t\tadd(\n+ \t\tset(\n \t\t\t$current, \n- \t\t\t\"elements\",\n- \t\tlv_elements_1_0, \n- \t\t\"Float\");\n+ \t\t\t\"rightMatrix\",\n+ \t\tlv_rightMatrix_3_0, \n+ \t\t\"PrimaryMatrix\");\n \t afterParserOrEnumRuleCall();\n \t }\n \n )\n-)(\totherlv_2=',' \n+))\n+ |(\totherlv_4='*' \n {\n- \tnewLeafNode(otherlv_2, grammarAccess.getMatrixRowAccess().getCommaKeyword_1_1_0());\n+ \tnewLeafNode(otherlv_4, grammarAccess.getMatrixMultiplicationAccess().getAsteriskKeyword_1_1_0());\n }\n (\n+\t{ \n+\t /* */ \n+\t}\n+ {\n+ $current = forceCreateModelElementAndSet(\n+ grammarAccess.getMatrixMultiplicationAccess().getMatrixMultiplicationLeftAction_1_1_1(),\n+ $current);\n+ }\n+)(\n (\n \t\t{ \n-\t newCompositeNode(grammarAccess.getMatrixRowAccess().getElementsFloatParserRuleCall_1_1_1_0()); \n+\t newCompositeNode(grammarAccess.getMatrixMultiplicationAccess().getRightScalarFormulaParserRuleCall_1_1_2_0()); \n \t }\n-\t\tlv_elements_3_0=ruleFloat\t\t{\n+\t\tlv_rightScalar_6_0=ruleFormula\t\t{\n \t if ($current==null) {\n-\t $current = createModelElementForParent(grammarAccess.getMatrixRowRule());\n+\t $current = createModelElementForParent(grammarAccess.getMatrixMultiplicationRule());\n \t }\n- \t\tadd(\n+ \t\tset(\n \t\t\t$current, \n- \t\t\t\"elements\",\n- \t\tlv_elements_3_0, \n- \t\t\"Float\");\n+ \t\t\t\"rightScalar\",\n+ \t\tlv_rightScalar_6_0, \n+ \t\t\"Formula\");\n \t afterParserOrEnumRuleCall();\n \t }\n \n )\n-))*(\totherlv_4=',' \n- {\n- \tnewLeafNode(otherlv_4, grammarAccess.getMatrixRowAccess().getCommaKeyword_1_2());\n+)))*)\n+;\n+\n+\n+\n+\n+\n+// Entry rule entryRulePrimaryMatrix\n+entryRulePrimaryMatrix returns [EObject current=null] \n+\t:\n+\t{ newCompositeNode(grammarAccess.getPrimaryMatrixRule()); }\n+\t iv_rulePrimaryMatrix=rulePrimaryMatrix \n+\t { $current=$iv_rulePrimaryMatrix.current; } \n+\t EOF \n+;\n+\n+// Rule PrimaryMatrix\n+rulePrimaryMatrix returns [EObject current=null] \n+ @init { enterRule(); \n }\n-)?)?\totherlv_5='}' \n+ @after { leaveRule(); }:\n+(((\n+\t{ \n+\t /* */ \n+\t}\n {\n- \tnewLeafNode(otherlv_5, grammarAccess.getMatrixRowAccess().getRightCurlyBracketKeyword_2());\n+ $current = forceCreateModelElement(\n+ grammarAccess.getPrimaryMatrixAccess().getNewMatrixAction_0_0(),\n+ $current);\n }\n+)(\n+(\n+\t\t{ \n+\t newCompositeNode(grammarAccess.getPrimaryMatrixAccess().getMatrixMatrixParserRuleCall_0_1_0()); \n+\t }\n+\t\tlv_matrix_1_0=ruleMatrix\t\t{\n+\t if ($current==null) {\n+\t $current = createModelElementForParent(grammarAccess.getPrimaryMatrixRule());\n+\t }\n+ \t\tset(\n+ \t\t\t$current, \n+ \t\t\t\"matrix\",\n+ \t\tlv_matrix_1_0, \n+ \t\t\"Matrix\");\n+\t afterParserOrEnumRuleCall();\n+\t }\n+\n )\n+))\n+ |((\n+\t{ \n+\t /* */ \n+\t}\n+ {\n+ $current = forceCreateModelElement(\n+ grammarAccess.getPrimaryMatrixAccess().getTransposeMatrixAction_1_0(),\n+ $current);\n+ }\n+)\totherlv_3='[' \n+ {\n+ \tnewLeafNode(otherlv_3, grammarAccess.getPrimaryMatrixAccess().getLeftSquareBracketKeyword_1_1());\n+ }\n+(\n+(\n+\t\tlv_name_4_0=RULE_MATH_NAME\n+\t\t{\n+\t\t\tnewLeafNode(lv_name_4_0, grammarAccess.getPrimaryMatrixAccess().getNameMATH_NAMETerminalRuleCall_1_2_0()); \n+\t\t}\n+\t\t{\n+\t if ($current==null) {\n+\t $current = createModelElement(grammarAccess.getPrimaryMatrixRule());\n+\t }\n+ \t\tsetWithLastConsumed(\n+ \t\t\t$current, \n+ \t\t\t\"name\",\n+ \t\tlv_name_4_0, \n+ \t\t\"MATH_NAME\");\n+\t }\n+\n+)\n+)\totherlv_5=']^T' \n+ {\n+ \tnewLeafNode(otherlv_5, grammarAccess.getPrimaryMatrixAccess().getTKeyword_1_3());\n+ }\n+)\n+ |((\n+\t{ \n+\t /* */ \n+\t}\n+ {\n+ $current = forceCreateModelElement(\n+ grammarAccess.getPrimaryMatrixAccess().getMatrixVariableAction_2_0(),\n+ $current);\n+ }\n+)\totherlv_7='[' \n+ {\n+ \tnewLeafNode(otherlv_7, grammarAccess.getPrimaryMatrixAccess().getLeftSquareBracketKeyword_2_1());\n+ }\n+(\n+(\n+\t\tlv_name_8_0=RULE_MATH_NAME\n+\t\t{\n+\t\t\tnewLeafNode(lv_name_8_0, grammarAccess.getPrimaryMatrixAccess().getNameMATH_NAMETerminalRuleCall_2_2_0()); \n+\t\t}\n+\t\t{\n+\t if ($current==null) {\n+\t $current = createModelElement(grammarAccess.getPrimaryMatrixRule());\n+\t }\n+ \t\tsetWithLastConsumed(\n+ \t\t\t$current, \n+ \t\t\t\"name\",\n+ \t\tlv_name_8_0, \n+ \t\t\"MATH_NAME\");\n+\t }\n+\n+)\n+)\totherlv_9=']' \n+ {\n+ \tnewLeafNode(otherlv_9, grammarAccess.getPrimaryMatrixAccess().getRightSquareBracketKeyword_2_3());\n+ }\n+)\n+ |(\totherlv_10='(' \n+ {\n+ \tnewLeafNode(otherlv_10, grammarAccess.getPrimaryMatrixAccess().getLeftParenthesisKeyword_3_0());\n+ }\n+\n+\t{ \n+\t /* */ \n+\t}\n+ { \n+ newCompositeNode(grammarAccess.getPrimaryMatrixAccess().getMatrixAdditionParserRuleCall_3_1()); \n+ }\n+ this_MatrixAddition_11=ruleMatrixAddition\n+ { \n+ $current = $this_MatrixAddition_11.current; \n+ afterParserOrEnumRuleCall();\n+ }\n+\totherlv_12=')' \n+ {\n+ \tnewLeafNode(otherlv_12, grammarAccess.getPrimaryMatrixAccess().getRightParenthesisKeyword_3_2());\n+ }\n+))\n+;\n+\n+\n+\n+\n+\n+// Entry rule entryRuleFloat\n+entryRuleFloat returns [String current=null] \n+\t:\n+\t{ newCompositeNode(grammarAccess.getFloatRule()); } \n+\t iv_ruleFloat=ruleFloat \n+\t { $current=$iv_ruleFloat.current.getText(); } \n+\t EOF \n+;\n+\n+// Rule Float\n+ruleFloat returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] \n+ @init { enterRule(); \n+ }\n+ @after { leaveRule(); }:\n+(( this_INT_0=RULE_INT {\n+\t\t$current.merge(this_INT_0);\n+ }\n+\n+ { \n+ newLeafNode(this_INT_0, grammarAccess.getFloatAccess().getINTTerminalRuleCall_0()); \n+ }\n+)+(\n+\tkw='.' \n+ {\n+ $current.merge(kw);\n+ newLeafNode(kw, grammarAccess.getFloatAccess().getFullStopKeyword_1_0()); \n+ }\n+( this_INT_2=RULE_INT {\n+\t\t$current.merge(this_INT_2);\n+ }\n+\n+ { \n+ newLeafNode(this_INT_2, grammarAccess.getFloatAccess().getINTTerminalRuleCall_1_1()); \n+ }\n+)+((\n+\tkw='E' \n+ {\n+ $current.merge(kw);\n+ newLeafNode(kw, grammarAccess.getFloatAccess().getEKeyword_1_2_0_0()); \n+ }\n+\n+ |\n+\tkw='e' \n+ {\n+ $current.merge(kw);\n+ newLeafNode(kw, grammarAccess.getFloatAccess().getEKeyword_1_2_0_1()); \n+ }\n+)(\n+\tkw='-' \n+ {\n+ $current.merge(kw);\n+ newLeafNode(kw, grammarAccess.getFloatAccess().getHyphenMinusKeyword_1_2_1()); \n+ }\n+)?( this_INT_6=RULE_INT {\n+\t\t$current.merge(this_INT_6);\n+ }\n+\n+ { \n+ newLeafNode(this_INT_6, grammarAccess.getFloatAccess().getINTTerminalRuleCall_1_2_2()); \n+ }\n+)+)?)?)\n+ ;\n+\n+\n+\n+\n+\n+// Entry rule entryRuleFunction\n+entryRuleFunction returns [EObject current=null] \n+\t:\n+\t{ newCompositeNode(grammarAccess.getFunctionRule()); }\n+\t iv_ruleFunction=ruleFunction \n+\t { $current=$iv_ruleFunction.current; } \n+\t EOF \n+;\n+\n+// Rule Function\n+ruleFunction returns [EObject current=null] \n+ @init { enterRule(); \n+ }\n+ @after { leaveRule(); }:\n+((\n+(\n+\t\tlv_name_0_0=RULE_MATH_NAME\n+\t\t{\n+\t\t\tnewLeafNode(lv_name_0_0, grammarAccess.getFunctionAccess().getNameMATH_NAMETerminalRuleCall_0_0()); \n+\t\t}\n+\t\t{\n+\t if ($current==null) {\n+\t $current = createModelElement(grammarAccess.getFunctionRule());\n+\t }\n+ \t\tsetWithLastConsumed(\n+ \t\t\t$current, \n+ \t\t\t\"name\",\n+ \t\tlv_name_0_0, \n+ \t\t\"MATH_NAME\");\n+\t }\n+\n+)\n+)\totherlv_1='(' \n+ {\n+ \tnewLeafNode(otherlv_1, grammarAccess.getFunctionAccess().getLeftParenthesisKeyword_1());\n+ }\n+((\n+(\n+\t\t{ \n+\t newCompositeNode(grammarAccess.getFunctionAccess().getParametersFormulaParserRuleCall_2_0_0()); \n+\t }\n+\t\tlv_parameters_2_0=ruleFormula\t\t{\n+\t if ($current==null) {\n+\t $current = createModelElementForParent(grammarAccess.getFunctionRule());\n+\t }\n+ \t\tadd(\n+ \t\t\t$current, \n+ \t\t\t\"parameters\",\n+ \t\tlv_parameters_2_0, \n+ \t\t\"Formula\");\n+\t afterParserOrEnumRuleCall();\n+\t }\n+\n+)\n+)(\totherlv_3=',' \n+ {\n+ \tnewLeafNode(otherlv_3, grammarAccess.getFunctionAccess().getCommaKeyword_2_1_0());\n+ }\n+(\n+(\n+\t\t{ \n+\t newCompositeNode(grammarAccess.getFunctionAccess().getParametersFormulaParserRuleCall_2_1_1_0()); \n+\t }\n+\t\tlv_parameters_4_0=ruleFormula\t\t{\n+\t if ($current==null) {\n+\t $current = createModelElementForParent(grammarAccess.getFunctionRule());\n+\t }\n+ \t\tadd(\n+ \t\t\t$current, \n+ \t\t\t\"parameters\",\n+ \t\tlv_parameters_4_0, \n+ \t\t\"Formula\");\n+\t afterParserOrEnumRuleCall();\n+\t }\n+\n+)\n+))*(\totherlv_5=',' \n+ {\n+ \tnewLeafNode(otherlv_5, grammarAccess.getFunctionAccess().getCommaKeyword_2_2());\n+ }\n+)?)?\totherlv_6=')' \n+ {\n+ \tnewLeafNode(otherlv_6, grammarAccess.getFunctionAccess().getRightParenthesisKeyword_3());\n+ }\n+)\n+;\n+\n+\n+\n+\n+\n+// Entry rule entryRuleFunctionDefinition\n+entryRuleFunctionDefinition returns [EObject current=null] \n+\t:\n+\t{ newCompositeNode(grammarAccess.getFunctionDefinitionRule()); }\n+\t iv_ruleFunctionDefinition=ruleFunctionDefinition \n+\t { $current=$iv_ruleFunctionDefinition.current; } \n+\t EOF \n+;\n+\n+// Rule FunctionDefinition\n+ruleFunctionDefinition returns [EObject current=null] \n+ @init { enterRule(); \n+ }\n+ @after { leaveRule(); }:\n+((\n+(\n+\t\t{ \n+\t newCompositeNode(grammarAccess.getFunctionDefinitionAccess().getFunctionFunctionParserRuleCall_0_0()); \n+\t }\n+\t\tlv_function_0_0=ruleFunction\t\t{\n+\t if ($current==null) {\n+\t $current = createModelElementForParent(grammarAccess.getFunctionDefinitionRule());\n+\t }\n+ \t\tset(\n+ \t\t\t$current, \n+ \t\t\t\"function\",\n+ \t\tlv_function_0_0, \n+ \t\t\"Function\");\n+\t afterParserOrEnumRuleCall();\n+\t }\n+\n+)\n+)\totherlv_1='=' \n+ {\n+ \tnewLeafNode(otherlv_1, grammarAccess.getFunctionDefinitionAccess().getEqualsSignKeyword_1());\n+ }\n+(\n+(\n+\t\t{ \n+\t newCompositeNode(grammarAccess.getFunctionDefinitionAccess().getFormulaFormulaParserRuleCall_2_0()); \n+\t }\n+\t\tlv_formula_2_0=ruleFormula\t\t{\n+\t if ($current==null) {\n+\t $current = createModelElementForParent(grammarAccess.getFunctionDefinitionRule());\n+\t }\n+ \t\tset(\n+ \t\t\t$current, \n+ \t\t\t\"formula\",\n+ \t\tlv_formula_2_0, \n+ \t\t\"Formula\");\n+\t afterParserOrEnumRuleCall();\n+\t }\n+\n+)\n+))\n ;\n \n ", "raw_url": "https://github.com/iee/iee/raw/0f04d91efdf50447d8e84e926ef98d7462103dc0/org.eclipse.iee.translator.Jmole%2Forg.eclipse.iee.translator.jmole.math%2Fsrc-gen%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fjmole%2Fmath%2Fparser%2Fantlr%2Finternal%2FInternalMath.g", "sha": "6cf4e5b540395f3116a7f6929708aaced0c9e2c8", "status": "modified" }, { "additions": 15, "blob_url": "https://github.com/iee/iee/blob/0f04d91efdf50447d8e84e926ef98d7462103dc0/org.eclipse.iee.translator.Jmole%2Forg.eclipse.iee.translator.jmole.math%2Fsrc-gen%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fjmole%2Fmath%2Fparser%2Fantlr%2Finternal%2FInternalMath.tokens", "changes": 28, "contents_url": "https://api.github.com/repos/iee/iee/contents/org.eclipse.iee.translator.Jmole%2Forg.eclipse.iee.translator.jmole.math%2Fsrc-gen%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fjmole%2Fmath%2Fparser%2Fantlr%2Finternal%2FInternalMath.tokens?ref=0f04d91efdf50447d8e84e926ef98d7462103dc0", "deletions": 13, "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.tokens", "new_code": "T__31=31\n'(-'=18\n'}'=27\n')!'=21\n'{'=25\n'e'=31\n'('=20\n'['=23\n']^T'=28\n','=26\n'E'=30\n'.'=29\n')'=19\n'^'=22\n']'=24", "new_methods": [], "old_code": "'..'=22\n'}'=30\n')!'=19\n'{'=29\n'e'=27\n'('=18\n'['=20\n','=28\n'E'=26\n'.'=25\n')'=21\n'^'=24\n']'=23", "old_methods": [], "patch": "@@ -15,6 +15,7 @@ RULE_MATH_NAME=4\n RULE_ML_COMMENT=8\n T__30=30\n T__19=19\n+T__31=31\n RULE_STRING=7\n T__16=16\n T__15=15\n@@ -25,22 +26,23 @@ T__14=14\n T__13=13\n RULE_INT=5\n RULE_WS=10\n-'..'=22\n-'}'=30\n+'(-'=18\n+'}'=27\n '/'=16\n-')!'=19\n-'{'=29\n-'e'=27\n+')!'=21\n+'{'=25\n+'e'=31\n '='=12\n-'('=18\n+'('=20\n '-'=14\n '*'=15\n-'['=20\n+'['=23\n '+'=13\n-','=28\n-'E'=26\n-'.'=25\n-')'=21\n-'^'=24\n+']^T'=28\n+','=26\n+'E'=30\n+'.'=29\n+')'=19\n+'^'=22\n '%'=17\n-']'=23\n+']'=24", "raw_url": "https://github.com/iee/iee/raw/0f04d91efdf50447d8e84e926ef98d7462103dc0/org.eclipse.iee.translator.Jmole%2Forg.eclipse.iee.translator.jmole.math%2Fsrc-gen%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fjmole%2Fmath%2Fparser%2Fantlr%2Finternal%2FInternalMath.tokens", "sha": "10f871d96eb7658a3ec21b5d0fc2235b16fa3b42", "status": "modified" }, { "additions": 181, "blob_url": "https://github.com/iee/iee/blob/0f04d91efdf50447d8e84e926ef98d7462103dc0/org.eclipse.iee.translator.Jmole%2Forg.eclipse.iee.translator.jmole.math%2Fsrc-gen%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fjmole%2Fmath%2Fparser%2Fantlr%2Finternal%2FInternalMathLexer.java", "changes": 332, "contents_url": "https://api.github.com/repos/iee/iee/contents/org.eclipse.iee.translator.Jmole%2Forg.eclipse.iee.translator.jmole.math%2Fsrc-gen%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fjmole%2Fmath%2Fparser%2Fantlr%2Finternal%2FInternalMathLexer.java?ref=0f04d91efdf50447d8e84e926ef98d7462103dc0", "deletions": 151, "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMathLexer.java", "new_code": " public static final int T__31=31;\n // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:17:7: ( '(-' )\n // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:17:9: '(-'\n match(\"(-\"); \n\n // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:18:7: ( ')' )\n // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:18:9: ')'\n match(')'); \n // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:19:7: ( '(' )\n // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:19:9: '('\n match('('); \n // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:20:7: ( ')!' )\n // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:20:9: ')!'\n match(\")!\"); \n\n // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:21:7: ( '^' )\n // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:21:9: '^'\n match('^'); \n // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:22:7: ( '[' )\n // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:22:9: '['\n match('['); \n // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:23:7: ( ']' )\n // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:23:9: ']'\n match(']'); \n // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:24:7: ( '{' )\n // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:24:9: '{'\n match('{'); \n // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:25:7: ( ',' )\n // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:25:9: ','\n match(','); \n // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:26:7: ( '}' )\n // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:26:9: '}'\n match('}'); \n // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:27:7: ( ']^T' )\n // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:27:9: ']^T'\n match(\"]^T\"); \n\n // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:28:7: ( '.' )\n // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:28:9: '.'\n match('.'); \n // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:29:7: ( 'E' )\n // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:29:9: 'E'\n match('E'); \n // $ANTLR start \"T__31\"\n public final void mT__31() throws RecognitionException {\n try {\n int _type = T__31;\n int _channel = DEFAULT_TOKEN_CHANNEL;\n // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:30:7: ( 'e' )\n // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:30:9: 'e'\n {\n match('e'); \n\n }\n\n state.type = _type;\n state.channel = _channel;\n }\n finally {\n }\n }\n // $ANTLR end \"T__31\"\n\n // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1691:16: ( ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )\n // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1691:18: ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*\n // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1691:42: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*\n // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1693:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )\n // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1693:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*\n // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1693:11: ( '^' )?\n // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1693:11: '^'\n // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1693:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*\n // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1695:10: ( ( '0' .. '9' )+ )\n // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1695:12: ( '0' .. '9' )+\n // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1695:12: ( '0' .. '9' )+\n \t // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1695:13: '0' .. '9'\n // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1697:13: ( ( '\\\"' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\"' ) ) )* '\\\"' | '\\\\'' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\\'' ) ) )* '\\\\'' ) )\n // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1697:15: ( '\\\"' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\"' ) ) )* '\\\"' | '\\\\'' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\\'' ) ) )* '\\\\'' )\n // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1697:15: ( '\\\"' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\"' ) ) )* '\\\"' | '\\\\'' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\\'' ) ) )* '\\\\'' )\n // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1697:16: '\\\"' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\"' ) ) )* '\\\"'\n // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1697:20: ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\"' ) ) )*\n \t // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1697:21: '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' )\n \t // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1697:66: ~ ( ( '\\\\\\\\' | '\\\"' ) )\n // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1697:86: '\\\\'' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\\'' ) ) )* '\\\\''\n // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1697:91: ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\\'' ) ) )*\n \t // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1697:92: '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' )\n \t // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1697:137: ~ ( ( '\\\\\\\\' | '\\\\'' ) )\n // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1699:17: ( '/*' ( options {greedy=false; } : . )* '*/' )\n // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1699:19: '/*' ( options {greedy=false; } : . )* '*/'\n // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1699:24: ( options {greedy=false; } : . )*\n \t // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1699:52: .\n // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1701:17: ( '//' (~ ( ( '\\\\n' | '\\\\r' ) ) )* ( ( '\\\\r' )? '\\\\n' )? )\n // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1701:19: '//' (~ ( ( '\\\\n' | '\\\\r' ) ) )* ( ( '\\\\r' )? '\\\\n' )?\n // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1701:24: (~ ( ( '\\\\n' | '\\\\r' ) ) )*\n \t // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1701:24: ~ ( ( '\\\\n' | '\\\\r' ) )\n // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1701:40: ( ( '\\\\r' )? '\\\\n' )?\n // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1701:41: ( '\\\\r' )? '\\\\n'\n // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1701:41: ( '\\\\r' )?\n // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1701:41: '\\\\r'\n // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1703:9: ( ( ' ' | '\\\\t' | '\\\\r' | '\\\\n' )+ )\n // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1703:11: ( ' ' | '\\\\t' | '\\\\r' | '\\\\n' )+\n // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1703:11: ( ' ' | '\\\\t' | '\\\\r' | '\\\\n' )+\n // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1705:16: ( . )\n // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1705:18: .\n // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1:8: ( T__12 | T__13 | T__14 | T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | RULE_MATH_NAME | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )\n int alt13=28;\n // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1:124: T__31\n mT__31(); \n // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1:130: RULE_MATH_NAME\n mRULE_MATH_NAME(); \n // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1:145: RULE_ID\n mRULE_ID(); \n // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1:153: RULE_INT\n mRULE_INT(); \n // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1:162: RULE_STRING\n mRULE_STRING(); \n // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1:174: RULE_ML_COMMENT\n mRULE_ML_COMMENT(); \n // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1:190: RULE_SL_COMMENT\n mRULE_SL_COMMENT(); \n // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1:206: RULE_WS\n {\n mRULE_WS(); \n\n }\n break;\n case 28 :\n // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1:214: RULE_ANY_OTHER\n \"\\5\\uffff\\1\\36\\1\\uffff\\1\\41\\1\\43\\1\\44\\1\\uffff\\1\\50\\4\\uffff\\1\\56\"+\n \"\\1\\57\\1\\60\\1\\uffff\\2\\27\\27\\uffff\\1\\60\\6\\uffff\";\n \"\\64\\uffff\";\n \"\\1\\0\\4\\uffff\\1\\52\\1\\uffff\\1\\55\\1\\41\\1\\101\\1\\uffff\\1\\136\\4\\uffff\"+\n \"\\3\\60\\1\\uffff\\2\\0\\27\\uffff\\1\\60\\6\\uffff\";\n \"\\1\\uffff\\4\\uffff\\1\\57\\1\\uffff\\1\\55\\1\\41\\1\\172\\1\\uffff\\1\\136\\4\\uffff\"+\n \"\\3\\172\\1\\uffff\\2\\uffff\\27\\uffff\\1\\172\\6\\uffff\";\n \"\\1\\uffff\\1\\1\\1\\2\\1\\3\\1\\4\\1\\uffff\\1\\6\\3\\uffff\\1\\14\\1\\uffff\\1\\16\"+\n \"\\1\\17\\1\\20\\1\\22\\3\\uffff\\1\\27\\2\\uffff\\1\\33\\1\\34\\1\\1\\1\\2\\1\\3\\1\\4\\1\"+\n \"\\31\\1\\32\\1\\5\\1\\6\\1\\7\\1\\11\\1\\12\\1\\10\\1\\13\\1\\26\\1\\14\\1\\21\\1\\15\\1\\16\"+\n \"\\1\\17\\1\\20\\1\\22\\1\\uffff\\1\\23\\1\\24\\1\\25\\1\\27\\1\\30\\1\\33\";\n \"\\1\\2\\23\\uffff\\1\\1\\1\\0\\36\\uffff}>\";\n \"\\25\\1\\7\\1\\10\\1\\4\\1\\2\\1\\15\\1\\3\\1\\17\\1\\5\\12\\23\\3\\27\\1\\1\\3\\27\\4\"+\n \"\\22\\1\\20\\25\\22\\1\\12\\1\\27\\1\\13\\1\\11\\1\\22\\1\\27\\4\\22\\1\\21\\25\\22\"+\n \"\\1\\14\\1\\27\\1\\16\\uff82\\27\",\n \"\\1\\40\",\n \"\\1\\42\",\n \"\\32\\45\\4\\uffff\\1\\45\\1\\uffff\\32\\45\",\n \"\\1\\47\",\n \"\\12\\55\\7\\uffff\\32\\55\\4\\uffff\\1\\55\\1\\uffff\\32\\55\",\n \"\\12\\55\\7\\uffff\\32\\55\\4\\uffff\\1\\55\\1\\uffff\\32\\55\",\n \"\\12\\55\\7\\uffff\\32\\55\\4\\uffff\\1\\55\\1\\uffff\\32\\55\",\n \"\\0\\62\",\n \"\\0\\62\",\n \"\\12\\55\\7\\uffff\\32\\55\\4\\uffff\\1\\55\\1\\uffff\\32\\55\",\n return \"1:1: Tokens : ( T__12 | T__13 | T__14 | T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | RULE_MATH_NAME | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER );\";\n int LA13_21 = input.LA(1);\n\n s = -1;\n if ( ((LA13_21>='\\u0000' && LA13_21<='\\uFFFF')) ) {s = 50;}\n\n else s = 23;\n\n if ( s>=0 ) return s;\n break;\n case 1 : \n int LA13_20 = input.LA(1);\n\n s = -1;\n if ( ((LA13_20>='\\u0000' && LA13_20<='\\uFFFF')) ) {s = 50;}\n\n else s = 23;\n\n if ( s>=0 ) return s;\n break;\n case 2 : \n else if ( (LA13_0=='^') ) {s = 9;}\n else if ( (LA13_0=='[') ) {s = 10;}\n else if ( (LA13_0=='{') ) {s = 12;}\n else if ( (LA13_0==',') ) {s = 13;}\n else if ( (LA13_0=='}') ) {s = 14;}\n else if ( (LA13_0=='.') ) {s = 15;}\n else if ( (LA13_0=='E') ) {s = 16;}\n else if ( (LA13_0=='e') ) {s = 17;}", "new_methods": [], "old_code": " // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:17:7: ( '(' )\n // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:17:9: '('\n match('('); \n // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:18:7: ( ')!' )\n // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:18:9: ')!'\n match(\")!\"); \n\n // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:19:7: ( '[' )\n // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:19:9: '['\n match('['); \n // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:20:7: ( ')' )\n // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:20:9: ')'\n match(')'); \n // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:21:7: ( '..' )\n // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:21:9: '..'\n match(\"..\"); \n\n // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:22:7: ( ']' )\n // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:22:9: ']'\n match(']'); \n // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:23:7: ( '^' )\n // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:23:9: '^'\n match('^'); \n // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:24:7: ( '.' )\n // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:24:9: '.'\n match('.'); \n // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:25:7: ( 'E' )\n // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:25:9: 'E'\n match('E'); \n // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:26:7: ( 'e' )\n // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:26:9: 'e'\n match('e'); \n // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:27:7: ( ',' )\n // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:27:9: ','\n match(','); \n // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:28:7: ( '{' )\n // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:28:9: '{'\n match('{'); \n // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:29:7: ( '}' )\n // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:29:9: '}'\n match('}'); \n // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1295:16: ( ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )\n // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1295:18: ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*\n // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1295:42: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*\n // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1297:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )\n // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1297:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*\n // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1297:11: ( '^' )?\n // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1297:11: '^'\n // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1297:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*\n // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1299:10: ( ( '0' .. '9' )+ )\n // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1299:12: ( '0' .. '9' )+\n // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1299:12: ( '0' .. '9' )+\n \t // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1299:13: '0' .. '9'\n // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1301:13: ( ( '\\\"' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\"' ) ) )* '\\\"' | '\\\\'' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\\'' ) ) )* '\\\\'' ) )\n // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1301:15: ( '\\\"' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\"' ) ) )* '\\\"' | '\\\\'' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\\'' ) ) )* '\\\\'' )\n // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1301:15: ( '\\\"' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\"' ) ) )* '\\\"' | '\\\\'' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\\'' ) ) )* '\\\\'' )\n // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1301:16: '\\\"' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\"' ) ) )* '\\\"'\n // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1301:20: ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\"' ) ) )*\n \t // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1301:21: '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' )\n \t // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1301:66: ~ ( ( '\\\\\\\\' | '\\\"' ) )\n // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1301:86: '\\\\'' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\\'' ) ) )* '\\\\''\n // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1301:91: ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\\'' ) ) )*\n \t // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1301:92: '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' )\n \t // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1301:137: ~ ( ( '\\\\\\\\' | '\\\\'' ) )\n // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1303:17: ( '/*' ( options {greedy=false; } : . )* '*/' )\n // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1303:19: '/*' ( options {greedy=false; } : . )* '*/'\n // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1303:24: ( options {greedy=false; } : . )*\n \t // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1303:52: .\n // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1305:17: ( '//' (~ ( ( '\\\\n' | '\\\\r' ) ) )* ( ( '\\\\r' )? '\\\\n' )? )\n // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1305:19: '//' (~ ( ( '\\\\n' | '\\\\r' ) ) )* ( ( '\\\\r' )? '\\\\n' )?\n // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1305:24: (~ ( ( '\\\\n' | '\\\\r' ) ) )*\n \t // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1305:24: ~ ( ( '\\\\n' | '\\\\r' ) )\n // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1305:40: ( ( '\\\\r' )? '\\\\n' )?\n // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1305:41: ( '\\\\r' )? '\\\\n'\n // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1305:41: ( '\\\\r' )?\n // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1305:41: '\\\\r'\n // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1307:9: ( ( ' ' | '\\\\t' | '\\\\r' | '\\\\n' )+ )\n // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1307:11: ( ' ' | '\\\\t' | '\\\\r' | '\\\\n' )+\n // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1307:11: ( ' ' | '\\\\t' | '\\\\r' | '\\\\n' )+\n // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1309:16: ( . )\n // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1309:18: .\n // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1:8: ( T__12 | T__13 | T__14 | T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | RULE_MATH_NAME | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )\n int alt13=27;\n // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1:124: RULE_MATH_NAME\n mRULE_MATH_NAME(); \n // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1:139: RULE_ID\n mRULE_ID(); \n // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1:147: RULE_INT\n mRULE_INT(); \n // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1:156: RULE_STRING\n mRULE_STRING(); \n // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1:168: RULE_ML_COMMENT\n mRULE_ML_COMMENT(); \n // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1:184: RULE_SL_COMMENT\n mRULE_SL_COMMENT(); \n // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1:200: RULE_WS\n mRULE_WS(); \n // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1:208: RULE_ANY_OTHER\n \"\\5\\uffff\\1\\36\\2\\uffff\\1\\42\\1\\uffff\\1\\45\\1\\uffff\\1\\47\\1\\52\\1\\53\"+\n \"\\3\\uffff\\1\\57\\1\\uffff\\2\\27\\23\\uffff\\1\\57\\11\\uffff\";\n \"\\63\\uffff\";\n \"\\1\\0\\4\\uffff\\1\\52\\2\\uffff\\1\\41\\1\\uffff\\1\\56\\1\\uffff\\1\\101\\2\\60\"+\n \"\\3\\uffff\\1\\60\\1\\uffff\\2\\0\\23\\uffff\\1\\60\\11\\uffff\";\n \"\\1\\uffff\\4\\uffff\\1\\57\\2\\uffff\\1\\41\\1\\uffff\\1\\56\\1\\uffff\\3\\172\\3\"+\n \"\\uffff\\1\\172\\1\\uffff\\2\\uffff\\23\\uffff\\1\\172\\11\\uffff\";\n \"\\1\\uffff\\1\\1\\1\\2\\1\\3\\1\\4\\1\\uffff\\1\\6\\1\\7\\1\\uffff\\1\\11\\1\\uffff\\1\"+\n \"\\14\\3\\uffff\\1\\21\\1\\22\\1\\23\\1\\uffff\\1\\26\\2\\uffff\\1\\32\\1\\33\\1\\1\\1\"+\n \"\\2\\1\\3\\1\\4\\1\\30\\1\\31\\1\\5\\1\\6\\1\\7\\1\\10\\1\\12\\1\\11\\1\\13\\1\\16\\1\\14\\1\"+\n \"\\15\\1\\25\\1\\uffff\\1\\17\\1\\20\\1\\21\\1\\22\\1\\23\\1\\24\\1\\26\\1\\27\\1\\32\";\n \"\\1\\0\\23\\uffff\\1\\1\\1\\2\\35\\uffff}>\";\n \"\\25\\1\\7\\1\\10\\1\\4\\1\\2\\1\\17\\1\\3\\1\\12\\1\\5\\12\\23\\3\\27\\1\\1\\3\\27\\4\"+\n \"\\22\\1\\15\\25\\22\\1\\11\\1\\27\\1\\13\\1\\14\\1\\22\\1\\27\\4\\22\\1\\16\\25\\22\"+\n \"\\1\\20\\1\\27\\1\\21\\uff82\\27\",\n \"\\1\\41\",\n \"\\1\\44\",\n \"\\32\\50\\4\\uffff\\1\\50\\1\\uffff\\32\\50\",\n \"\\12\\51\\7\\uffff\\32\\51\\4\\uffff\\1\\51\\1\\uffff\\32\\51\",\n \"\\12\\51\\7\\uffff\\32\\51\\4\\uffff\\1\\51\\1\\uffff\\32\\51\",\n \"\\12\\51\\7\\uffff\\32\\51\\4\\uffff\\1\\51\\1\\uffff\\32\\51\",\n \"\\0\\61\",\n \"\\0\\61\",\n \"\\12\\51\\7\\uffff\\32\\51\\4\\uffff\\1\\51\\1\\uffff\\32\\51\",\n return \"1:1: Tokens : ( T__12 | T__13 | T__14 | T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | RULE_MATH_NAME | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER );\";\n else if ( (LA13_0=='[') ) {s = 9;}\n else if ( (LA13_0=='.') ) {s = 10;}\n else if ( (LA13_0=='^') ) {s = 12;}\n else if ( (LA13_0=='E') ) {s = 13;}\n else if ( (LA13_0=='e') ) {s = 14;}\n else if ( (LA13_0==',') ) {s = 15;}\n else if ( (LA13_0=='{') ) {s = 16;}\n else if ( (LA13_0=='}') ) {s = 17;}\n if ( s>=0 ) return s;\n break;\n case 1 : \n int LA13_20 = input.LA(1);\n\n s = -1;\n if ( ((LA13_20>='\\u0000' && LA13_20<='\\uFFFF')) ) {s = 49;}\n\n else s = 23;\n\n if ( s>=0 ) return s;\n break;\n case 2 : \n int LA13_21 = input.LA(1);\n\n s = -1;\n if ( ((LA13_21>='\\u0000' && LA13_21<='\\uFFFF')) ) {s = 49;}\n\n else s = 23;\n", "old_methods": [], "patch": "@@ -30,6 +30,7 @@ public class InternalMathLexer extends Lexer {\n public static final int RULE_ML_COMMENT=8;\n public static final int T__19=19;\n public static final int T__30=30;\n+ public static final int T__31=31;\n public static final int RULE_STRING=7;\n public static final int T__16=16;\n public static final int T__15=15;\n@@ -179,10 +180,11 @@ public final void mT__18() throws RecognitionException {\n try {\n int _type = T__18;\n int _channel = DEFAULT_TOKEN_CHANNEL;\n- // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:17:7: ( '(' )\n- // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:17:9: '('\n+ // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:17:7: ( '(-' )\n+ // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:17:9: '(-'\n {\n- match('('); \n+ match(\"(-\"); \n+\n \n }\n \n@@ -199,11 +201,10 @@ public final void mT__19() throws RecognitionException {\n try {\n int _type = T__19;\n int _channel = DEFAULT_TOKEN_CHANNEL;\n- // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:18:7: ( ')!' )\n- // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:18:9: ')!'\n+ // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:18:7: ( ')' )\n+ // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:18:9: ')'\n {\n- match(\")!\"); \n-\n+ match(')'); \n \n }\n \n@@ -220,10 +221,10 @@ public final void mT__20() throws RecognitionException {\n try {\n int _type = T__20;\n int _channel = DEFAULT_TOKEN_CHANNEL;\n- // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:19:7: ( '[' )\n- // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:19:9: '['\n+ // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:19:7: ( '(' )\n+ // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:19:9: '('\n {\n- match('['); \n+ match('('); \n \n }\n \n@@ -240,10 +241,11 @@ public final void mT__21() throws RecognitionException {\n try {\n int _type = T__21;\n int _channel = DEFAULT_TOKEN_CHANNEL;\n- // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:20:7: ( ')' )\n- // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:20:9: ')'\n+ // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:20:7: ( ')!' )\n+ // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:20:9: ')!'\n {\n- match(')'); \n+ match(\")!\"); \n+\n \n }\n \n@@ -260,11 +262,10 @@ public final void mT__22() throws RecognitionException {\n try {\n int _type = T__22;\n int _channel = DEFAULT_TOKEN_CHANNEL;\n- // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:21:7: ( '..' )\n- // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:21:9: '..'\n+ // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:21:7: ( '^' )\n+ // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:21:9: '^'\n {\n- match(\"..\"); \n-\n+ match('^'); \n \n }\n \n@@ -281,10 +282,10 @@ public final void mT__23() throws RecognitionException {\n try {\n int _type = T__23;\n int _channel = DEFAULT_TOKEN_CHANNEL;\n- // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:22:7: ( ']' )\n- // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:22:9: ']'\n+ // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:22:7: ( '[' )\n+ // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:22:9: '['\n {\n- match(']'); \n+ match('['); \n \n }\n \n@@ -301,10 +302,10 @@ public final void mT__24() throws RecognitionException {\n try {\n int _type = T__24;\n int _channel = DEFAULT_TOKEN_CHANNEL;\n- // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:23:7: ( '^' )\n- // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:23:9: '^'\n+ // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:23:7: ( ']' )\n+ // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:23:9: ']'\n {\n- match('^'); \n+ match(']'); \n \n }\n \n@@ -321,10 +322,10 @@ public final void mT__25() throws RecognitionException {\n try {\n int _type = T__25;\n int _channel = DEFAULT_TOKEN_CHANNEL;\n- // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:24:7: ( '.' )\n- // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:24:9: '.'\n+ // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:24:7: ( '{' )\n+ // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:24:9: '{'\n {\n- match('.'); \n+ match('{'); \n \n }\n \n@@ -341,10 +342,10 @@ public final void mT__26() throws RecognitionException {\n try {\n int _type = T__26;\n int _channel = DEFAULT_TOKEN_CHANNEL;\n- // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:25:7: ( 'E' )\n- // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:25:9: 'E'\n+ // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:25:7: ( ',' )\n+ // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:25:9: ','\n {\n- match('E'); \n+ match(','); \n \n }\n \n@@ -361,10 +362,10 @@ public final void mT__27() throws RecognitionException {\n try {\n int _type = T__27;\n int _channel = DEFAULT_TOKEN_CHANNEL;\n- // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:26:7: ( 'e' )\n- // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:26:9: 'e'\n+ // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:26:7: ( '}' )\n+ // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:26:9: '}'\n {\n- match('e'); \n+ match('}'); \n \n }\n \n@@ -381,10 +382,11 @@ public final void mT__28() throws RecognitionException {\n try {\n int _type = T__28;\n int _channel = DEFAULT_TOKEN_CHANNEL;\n- // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:27:7: ( ',' )\n- // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:27:9: ','\n+ // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:27:7: ( ']^T' )\n+ // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:27:9: ']^T'\n {\n- match(','); \n+ match(\"]^T\"); \n+\n \n }\n \n@@ -401,10 +403,10 @@ public final void mT__29() throws RecognitionException {\n try {\n int _type = T__29;\n int _channel = DEFAULT_TOKEN_CHANNEL;\n- // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:28:7: ( '{' )\n- // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:28:9: '{'\n+ // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:28:7: ( '.' )\n+ // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:28:9: '.'\n {\n- match('{'); \n+ match('.'); \n \n }\n \n@@ -421,10 +423,10 @@ public final void mT__30() throws RecognitionException {\n try {\n int _type = T__30;\n int _channel = DEFAULT_TOKEN_CHANNEL;\n- // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:29:7: ( '}' )\n- // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:29:9: '}'\n+ // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:29:7: ( 'E' )\n+ // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:29:9: 'E'\n {\n- match('}'); \n+ match('E'); \n \n }\n \n@@ -436,13 +438,33 @@ public final void mT__30() throws RecognitionException {\n }\n // $ANTLR end \"T__30\"\n \n+ // $ANTLR start \"T__31\"\n+ public final void mT__31() throws RecognitionException {\n+ try {\n+ int _type = T__31;\n+ int _channel = DEFAULT_TOKEN_CHANNEL;\n+ // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:30:7: ( 'e' )\n+ // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:30:9: 'e'\n+ {\n+ match('e'); \n+\n+ }\n+\n+ state.type = _type;\n+ state.channel = _channel;\n+ }\n+ finally {\n+ }\n+ }\n+ // $ANTLR end \"T__31\"\n+\n // $ANTLR start \"RULE_MATH_NAME\"\n public final void mRULE_MATH_NAME() throws RecognitionException {\n try {\n int _type = RULE_MATH_NAME;\n int _channel = DEFAULT_TOKEN_CHANNEL;\n- // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1295:16: ( ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )\n- // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1295:18: ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*\n+ // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1691:16: ( ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )\n+ // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1691:18: ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*\n {\n if ( (input.LA(1)>='A' && input.LA(1)<='Z')||input.LA(1)=='_'||(input.LA(1)>='a' && input.LA(1)<='z') ) {\n input.consume();\n@@ -453,7 +475,7 @@ public final void mRULE_MATH_NAME() throws RecognitionException {\n recover(mse);\n throw mse;}\n \n- // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1295:42: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*\n+ // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1691:42: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*\n loop1:\n do {\n int alt1=2;\n@@ -502,10 +524,10 @@ public final void mRULE_ID() throws RecognitionException {\n try {\n int _type = RULE_ID;\n int _channel = DEFAULT_TOKEN_CHANNEL;\n- // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1297:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )\n- // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1297:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*\n+ // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1693:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )\n+ // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1693:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*\n {\n- // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1297:11: ( '^' )?\n+ // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1693:11: ( '^' )?\n int alt2=2;\n int LA2_0 = input.LA(1);\n \n@@ -514,7 +536,7 @@ public final void mRULE_ID() throws RecognitionException {\n }\n switch (alt2) {\n case 1 :\n- // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1297:11: '^'\n+ // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1693:11: '^'\n {\n match('^'); \n \n@@ -532,7 +554,7 @@ public final void mRULE_ID() throws RecognitionException {\n recover(mse);\n throw mse;}\n \n- // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1297:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*\n+ // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1693:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*\n loop3:\n do {\n int alt3=2;\n@@ -581,10 +603,10 @@ public final void mRULE_INT() throws RecognitionException {\n try {\n int _type = RULE_INT;\n int _channel = DEFAULT_TOKEN_CHANNEL;\n- // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1299:10: ( ( '0' .. '9' )+ )\n- // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1299:12: ( '0' .. '9' )+\n+ // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1695:10: ( ( '0' .. '9' )+ )\n+ // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1695:12: ( '0' .. '9' )+\n {\n- // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1299:12: ( '0' .. '9' )+\n+ // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1695:12: ( '0' .. '9' )+\n int cnt4=0;\n loop4:\n do {\n@@ -598,7 +620,7 @@ public final void mRULE_INT() throws RecognitionException {\n \n switch (alt4) {\n \tcase 1 :\n- \t // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1299:13: '0' .. '9'\n+ \t // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1695:13: '0' .. '9'\n \t {\n \t matchRange('0','9'); \n \n@@ -630,10 +652,10 @@ public final void mRULE_STRING() throws RecognitionException {\n try {\n int _type = RULE_STRING;\n int _channel = DEFAULT_TOKEN_CHANNEL;\n- // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1301:13: ( ( '\\\"' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\"' ) ) )* '\\\"' | '\\\\'' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\\'' ) ) )* '\\\\'' ) )\n- // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1301:15: ( '\\\"' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\"' ) ) )* '\\\"' | '\\\\'' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\\'' ) ) )* '\\\\'' )\n+ // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1697:13: ( ( '\\\"' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\"' ) ) )* '\\\"' | '\\\\'' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\\'' ) ) )* '\\\\'' ) )\n+ // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1697:15: ( '\\\"' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\"' ) ) )* '\\\"' | '\\\\'' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\\'' ) ) )* '\\\\'' )\n {\n- // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1301:15: ( '\\\"' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\"' ) ) )* '\\\"' | '\\\\'' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\\'' ) ) )* '\\\\'' )\n+ // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1697:15: ( '\\\"' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\"' ) ) )* '\\\"' | '\\\\'' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\\'' ) ) )* '\\\\'' )\n int alt7=2;\n int LA7_0 = input.LA(1);\n \n@@ -651,10 +673,10 @@ else if ( (LA7_0=='\\'') ) {\n }\n switch (alt7) {\n case 1 :\n- // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1301:16: '\\\"' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\"' ) ) )* '\\\"'\n+ // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1697:16: '\\\"' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\"' ) ) )* '\\\"'\n {\n match('\\\"'); \n- // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1301:20: ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\"' ) ) )*\n+ // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1697:20: ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\"' ) ) )*\n loop5:\n do {\n int alt5=3;\n@@ -670,7 +692,7 @@ else if ( ((LA5_0>='\\u0000' && LA5_0<='!')||(LA5_0>='#' && LA5_0<='[')||(LA5_0>=\n \n switch (alt5) {\n \tcase 1 :\n- \t // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1301:21: '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' )\n+ \t // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1697:21: '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' )\n \t {\n \t match('\\\\'); \n \t if ( input.LA(1)=='\\\"'||input.LA(1)=='\\''||input.LA(1)=='\\\\'||input.LA(1)=='b'||input.LA(1)=='f'||input.LA(1)=='n'||input.LA(1)=='r'||(input.LA(1)>='t' && input.LA(1)<='u') ) {\n@@ -686,7 +708,7 @@ else if ( ((LA5_0>='\\u0000' && LA5_0<='!')||(LA5_0>='#' && LA5_0<='[')||(LA5_0>=\n \t }\n \t break;\n \tcase 2 :\n- \t // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1301:66: ~ ( ( '\\\\\\\\' | '\\\"' ) )\n+ \t // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1697:66: ~ ( ( '\\\\\\\\' | '\\\"' ) )\n \t {\n \t if ( (input.LA(1)>='\\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\\uFFFF') ) {\n \t input.consume();\n@@ -711,10 +733,10 @@ else if ( ((LA5_0>='\\u0000' && LA5_0<='!')||(LA5_0>='#' && LA5_0<='[')||(LA5_0>=\n }\n break;\n case 2 :\n- // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1301:86: '\\\\'' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\\'' ) ) )* '\\\\''\n+ // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1697:86: '\\\\'' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\\'' ) ) )* '\\\\''\n {\n match('\\''); \n- // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1301:91: ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\\'' ) ) )*\n+ // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1697:91: ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\\'' ) ) )*\n loop6:\n do {\n int alt6=3;\n@@ -730,7 +752,7 @@ else if ( ((LA6_0>='\\u0000' && LA6_0<='&')||(LA6_0>='(' && LA6_0<='[')||(LA6_0>=\n \n switch (alt6) {\n \tcase 1 :\n- \t // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1301:92: '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' )\n+ \t // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1697:92: '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' )\n \t {\n \t match('\\\\'); \n \t if ( input.LA(1)=='\\\"'||input.LA(1)=='\\''||input.LA(1)=='\\\\'||input.LA(1)=='b'||input.LA(1)=='f'||input.LA(1)=='n'||input.LA(1)=='r'||(input.LA(1)>='t' && input.LA(1)<='u') ) {\n@@ -746,7 +768,7 @@ else if ( ((LA6_0>='\\u0000' && LA6_0<='&')||(LA6_0>='(' && LA6_0<='[')||(LA6_0>=\n \t }\n \t break;\n \tcase 2 :\n- \t // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1301:137: ~ ( ( '\\\\\\\\' | '\\\\'' ) )\n+ \t // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1697:137: ~ ( ( '\\\\\\\\' | '\\\\'' ) )\n \t {\n \t if ( (input.LA(1)>='\\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\\uFFFF') ) {\n \t input.consume();\n@@ -789,12 +811,12 @@ public final void mRULE_ML_COMMENT() throws RecognitionException {\n try {\n int _type = RULE_ML_COMMENT;\n int _channel = DEFAULT_TOKEN_CHANNEL;\n- // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1303:17: ( '/*' ( options {greedy=false; } : . )* '*/' )\n- // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1303:19: '/*' ( options {greedy=false; } : . )* '*/'\n+ // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1699:17: ( '/*' ( options {greedy=false; } : . )* '*/' )\n+ // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1699:19: '/*' ( options {greedy=false; } : . )* '*/'\n {\n match(\"/*\"); \n \n- // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1303:24: ( options {greedy=false; } : . )*\n+ // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1699:24: ( options {greedy=false; } : . )*\n loop8:\n do {\n int alt8=2;\n@@ -819,7 +841,7 @@ else if ( ((LA8_0>='\\u0000' && LA8_0<=')')||(LA8_0>='+' && LA8_0<='\\uFFFF')) ) {\n \n switch (alt8) {\n \tcase 1 :\n- \t // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1303:52: .\n+ \t // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1699:52: .\n \t {\n \t matchAny(); \n \n@@ -849,12 +871,12 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {\n try {\n int _type = RULE_SL_COMMENT;\n int _channel = DEFAULT_TOKEN_CHANNEL;\n- // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1305:17: ( '//' (~ ( ( '\\\\n' | '\\\\r' ) ) )* ( ( '\\\\r' )? '\\\\n' )? )\n- // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1305:19: '//' (~ ( ( '\\\\n' | '\\\\r' ) ) )* ( ( '\\\\r' )? '\\\\n' )?\n+ // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1701:17: ( '//' (~ ( ( '\\\\n' | '\\\\r' ) ) )* ( ( '\\\\r' )? '\\\\n' )? )\n+ // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1701:19: '//' (~ ( ( '\\\\n' | '\\\\r' ) ) )* ( ( '\\\\r' )? '\\\\n' )?\n {\n match(\"//\"); \n \n- // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1305:24: (~ ( ( '\\\\n' | '\\\\r' ) ) )*\n+ // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1701:24: (~ ( ( '\\\\n' | '\\\\r' ) ) )*\n loop9:\n do {\n int alt9=2;\n@@ -867,7 +889,7 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {\n \n switch (alt9) {\n \tcase 1 :\n- \t // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1305:24: ~ ( ( '\\\\n' | '\\\\r' ) )\n+ \t // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1701:24: ~ ( ( '\\\\n' | '\\\\r' ) )\n \t {\n \t if ( (input.LA(1)>='\\u0000' && input.LA(1)<='\\t')||(input.LA(1)>='\\u000B' && input.LA(1)<='\\f')||(input.LA(1)>='\\u000E' && input.LA(1)<='\\uFFFF') ) {\n \t input.consume();\n@@ -887,7 +909,7 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {\n }\n } while (true);\n \n- // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1305:40: ( ( '\\\\r' )? '\\\\n' )?\n+ // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1701:40: ( ( '\\\\r' )? '\\\\n' )?\n int alt11=2;\n int LA11_0 = input.LA(1);\n \n@@ -896,9 +918,9 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {\n }\n switch (alt11) {\n case 1 :\n- // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1305:41: ( '\\\\r' )? '\\\\n'\n+ // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1701:41: ( '\\\\r' )? '\\\\n'\n {\n- // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1305:41: ( '\\\\r' )?\n+ // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1701:41: ( '\\\\r' )?\n int alt10=2;\n int LA10_0 = input.LA(1);\n \n@@ -907,7 +929,7 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {\n }\n switch (alt10) {\n case 1 :\n- // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1305:41: '\\\\r'\n+ // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1701:41: '\\\\r'\n {\n match('\\r'); \n \n@@ -939,10 +961,10 @@ public final void mRULE_WS() throws RecognitionException {\n try {\n int _type = RULE_WS;\n int _channel = DEFAULT_TOKEN_CHANNEL;\n- // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1307:9: ( ( ' ' | '\\\\t' | '\\\\r' | '\\\\n' )+ )\n- // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1307:11: ( ' ' | '\\\\t' | '\\\\r' | '\\\\n' )+\n+ // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1703:9: ( ( ' ' | '\\\\t' | '\\\\r' | '\\\\n' )+ )\n+ // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1703:11: ( ' ' | '\\\\t' | '\\\\r' | '\\\\n' )+\n {\n- // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1307:11: ( ' ' | '\\\\t' | '\\\\r' | '\\\\n' )+\n+ // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1703:11: ( ' ' | '\\\\t' | '\\\\r' | '\\\\n' )+\n int cnt12=0;\n loop12:\n do {\n@@ -996,8 +1018,8 @@ public final void mRULE_ANY_OTHER() throws RecognitionException {\n try {\n int _type = RULE_ANY_OTHER;\n int _channel = DEFAULT_TOKEN_CHANNEL;\n- // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1309:16: ( . )\n- // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1309:18: .\n+ // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1705:16: ( . )\n+ // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1705:18: .\n {\n matchAny(); \n \n@@ -1012,8 +1034,8 @@ public final void mRULE_ANY_OTHER() throws RecognitionException {\n // $ANTLR end \"RULE_ANY_OTHER\"\n \n public void mTokens() throws RecognitionException {\n- // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1:8: ( T__12 | T__13 | T__14 | T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | RULE_MATH_NAME | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )\n- int alt13=27;\n+ // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1:8: ( T__12 | T__13 | T__14 | T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | RULE_MATH_NAME | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )\n+ int alt13=28;\n alt13 = dfa13.predict(input);\n switch (alt13) {\n case 1 :\n@@ -1150,56 +1172,63 @@ public void mTokens() throws RecognitionException {\n }\n break;\n case 20 :\n- // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1:124: RULE_MATH_NAME\n+ // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1:124: T__31\n {\n- mRULE_MATH_NAME(); \n+ mT__31(); \n \n }\n break;\n case 21 :\n- // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1:139: RULE_ID\n+ // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1:130: RULE_MATH_NAME\n {\n- mRULE_ID(); \n+ mRULE_MATH_NAME(); \n \n }\n break;\n case 22 :\n- // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1:147: RULE_INT\n+ // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1:145: RULE_ID\n {\n- mRULE_INT(); \n+ mRULE_ID(); \n \n }\n break;\n case 23 :\n- // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1:156: RULE_STRING\n+ // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1:153: RULE_INT\n {\n- mRULE_STRING(); \n+ mRULE_INT(); \n \n }\n break;\n case 24 :\n- // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1:168: RULE_ML_COMMENT\n+ // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1:162: RULE_STRING\n {\n- mRULE_ML_COMMENT(); \n+ mRULE_STRING(); \n \n }\n break;\n case 25 :\n- // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1:184: RULE_SL_COMMENT\n+ // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1:174: RULE_ML_COMMENT\n {\n- mRULE_SL_COMMENT(); \n+ mRULE_ML_COMMENT(); \n \n }\n break;\n case 26 :\n- // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1:200: RULE_WS\n+ // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1:190: RULE_SL_COMMENT\n {\n- mRULE_WS(); \n+ mRULE_SL_COMMENT(); \n \n }\n break;\n case 27 :\n- // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1:208: RULE_ANY_OTHER\n+ // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1:206: RULE_WS\n+ {\n+ mRULE_WS(); \n+\n+ }\n+ break;\n+ case 28 :\n+ // ../org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/parser/antlr/internal/InternalMath.g:1:214: RULE_ANY_OTHER\n {\n mRULE_ANY_OTHER(); \n \n@@ -1213,49 +1242,50 @@ public void mTokens() throws RecognitionException {\n \n protected DFA13 dfa13 = new DFA13(this);\n static final String DFA13_eotS =\n- \"\\5\\uffff\\1\\36\\2\\uffff\\1\\42\\1\\uffff\\1\\45\\1\\uffff\\1\\47\\1\\52\\1\\53\"+\n- \"\\3\\uffff\\1\\57\\1\\uffff\\2\\27\\23\\uffff\\1\\57\\11\\uffff\";\n+ \"\\5\\uffff\\1\\36\\1\\uffff\\1\\41\\1\\43\\1\\44\\1\\uffff\\1\\50\\4\\uffff\\1\\56\"+\n+ \"\\1\\57\\1\\60\\1\\uffff\\2\\27\\27\\uffff\\1\\60\\6\\uffff\";\n static final String DFA13_eofS =\n- \"\\63\\uffff\";\n+ \"\\64\\uffff\";\n static final String DFA13_minS =\n- \"\\1\\0\\4\\uffff\\1\\52\\2\\uffff\\1\\41\\1\\uffff\\1\\56\\1\\uffff\\1\\101\\2\\60\"+\n- \"\\3\\uffff\\1\\60\\1\\uffff\\2\\0\\23\\uffff\\1\\60\\11\\uffff\";\n+ \"\\1\\0\\4\\uffff\\1\\52\\1\\uffff\\1\\55\\1\\41\\1\\101\\1\\uffff\\1\\136\\4\\uffff\"+\n+ \"\\3\\60\\1\\uffff\\2\\0\\27\\uffff\\1\\60\\6\\uffff\";\n static final String DFA13_maxS =\n- \"\\1\\uffff\\4\\uffff\\1\\57\\2\\uffff\\1\\41\\1\\uffff\\1\\56\\1\\uffff\\3\\172\\3\"+\n- \"\\uffff\\1\\172\\1\\uffff\\2\\uffff\\23\\uffff\\1\\172\\11\\uffff\";\n+ \"\\1\\uffff\\4\\uffff\\1\\57\\1\\uffff\\1\\55\\1\\41\\1\\172\\1\\uffff\\1\\136\\4\\uffff\"+\n+ \"\\3\\172\\1\\uffff\\2\\uffff\\27\\uffff\\1\\172\\6\\uffff\";\n static final String DFA13_acceptS =\n- \"\\1\\uffff\\1\\1\\1\\2\\1\\3\\1\\4\\1\\uffff\\1\\6\\1\\7\\1\\uffff\\1\\11\\1\\uffff\\1\"+\n- \"\\14\\3\\uffff\\1\\21\\1\\22\\1\\23\\1\\uffff\\1\\26\\2\\uffff\\1\\32\\1\\33\\1\\1\\1\"+\n- \"\\2\\1\\3\\1\\4\\1\\30\\1\\31\\1\\5\\1\\6\\1\\7\\1\\10\\1\\12\\1\\11\\1\\13\\1\\16\\1\\14\\1\"+\n- \"\\15\\1\\25\\1\\uffff\\1\\17\\1\\20\\1\\21\\1\\22\\1\\23\\1\\24\\1\\26\\1\\27\\1\\32\";\n+ \"\\1\\uffff\\1\\1\\1\\2\\1\\3\\1\\4\\1\\uffff\\1\\6\\3\\uffff\\1\\14\\1\\uffff\\1\\16\"+\n+ \"\\1\\17\\1\\20\\1\\22\\3\\uffff\\1\\27\\2\\uffff\\1\\33\\1\\34\\1\\1\\1\\2\\1\\3\\1\\4\\1\"+\n+ \"\\31\\1\\32\\1\\5\\1\\6\\1\\7\\1\\11\\1\\12\\1\\10\\1\\13\\1\\26\\1\\14\\1\\21\\1\\15\\1\\16\"+\n+ \"\\1\\17\\1\\20\\1\\22\\1\\uffff\\1\\23\\1\\24\\1\\25\\1\\27\\1\\30\\1\\33\";\n static final String DFA13_specialS =\n- \"\\1\\0\\23\\uffff\\1\\1\\1\\2\\35\\uffff}>\";\n+ \"\\1\\2\\23\\uffff\\1\\1\\1\\0\\36\\uffff}>\";\n static final String[] DFA13_transitionS = {\n \"\\11\\27\\2\\26\\2\\27\\1\\26\\22\\27\\1\\26\\1\\27\\1\\24\\2\\27\\1\\6\\1\\27\\1\"+\n- \"\\25\\1\\7\\1\\10\\1\\4\\1\\2\\1\\17\\1\\3\\1\\12\\1\\5\\12\\23\\3\\27\\1\\1\\3\\27\\4\"+\n- \"\\22\\1\\15\\25\\22\\1\\11\\1\\27\\1\\13\\1\\14\\1\\22\\1\\27\\4\\22\\1\\16\\25\\22\"+\n- \"\\1\\20\\1\\27\\1\\21\\uff82\\27\",\n+ \"\\25\\1\\7\\1\\10\\1\\4\\1\\2\\1\\15\\1\\3\\1\\17\\1\\5\\12\\23\\3\\27\\1\\1\\3\\27\\4\"+\n+ \"\\22\\1\\20\\25\\22\\1\\12\\1\\27\\1\\13\\1\\11\\1\\22\\1\\27\\4\\22\\1\\21\\25\\22\"+\n+ \"\\1\\14\\1\\27\\1\\16\\uff82\\27\",\n \"\",\n \"\",\n \"\",\n \"\",\n \"\\1\\34\\4\\uffff\\1\\35\",\n \"\",\n+ \"\\1\\40\",\n+ \"\\1\\42\",\n+ \"\\32\\45\\4\\uffff\\1\\45\\1\\uffff\\32\\45\",\n \"\",\n- \"\\1\\41\",\n+ \"\\1\\47\",\n \"\",\n- \"\\1\\44\",\n \"\",\n- \"\\32\\50\\4\\uffff\\1\\50\\1\\uffff\\32\\50\",\n- \"\\12\\51\\7\\uffff\\32\\51\\4\\uffff\\1\\51\\1\\uffff\\32\\51\",\n- \"\\12\\51\\7\\uffff\\32\\51\\4\\uffff\\1\\51\\1\\uffff\\32\\51\",\n \"\",\n \"\",\n+ \"\\12\\55\\7\\uffff\\32\\55\\4\\uffff\\1\\55\\1\\uffff\\32\\55\",\n+ \"\\12\\55\\7\\uffff\\32\\55\\4\\uffff\\1\\55\\1\\uffff\\32\\55\",\n+ \"\\12\\55\\7\\uffff\\32\\55\\4\\uffff\\1\\55\\1\\uffff\\32\\55\",\n \"\",\n- \"\\12\\51\\7\\uffff\\32\\51\\4\\uffff\\1\\51\\1\\uffff\\32\\51\",\n+ \"\\0\\62\",\n+ \"\\0\\62\",\n \"\",\n- \"\\0\\61\",\n- \"\\0\\61\",\n \"\",\n \"\",\n \"\",\n@@ -1275,10 +1305,10 @@ public void mTokens() throws RecognitionException {\n \"\",\n \"\",\n \"\",\n- \"\\12\\51\\7\\uffff\\32\\51\\4\\uffff\\1\\51\\1\\uffff\\32\\51\",\n \"\",\n \"\",\n \"\",\n+ \"\\12\\55\\7\\uffff\\32\\55\\4\\uffff\\1\\55\\1\\uffff\\32\\55\",\n \"\",\n \"\",\n \"\",\n@@ -1317,13 +1347,33 @@ public DFA13(BaseRecognizer recognizer) {\n this.transition = DFA13_transition;\n }\n public String getDescription() {\n- return \"1:1: Tokens : ( T__12 | T__13 | T__14 | T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | RULE_MATH_NAME | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER );\";\n+ return \"1:1: Tokens : ( T__12 | T__13 | T__14 | T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | RULE_MATH_NAME | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER );\";\n }\n public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {\n IntStream input = _input;\n \tint _s = s;\n switch ( s ) {\n case 0 : \n+ int LA13_21 = input.LA(1);\n+\n+ s = -1;\n+ if ( ((LA13_21>='\\u0000' && LA13_21<='\\uFFFF')) ) {s = 50;}\n+\n+ else s = 23;\n+\n+ if ( s>=0 ) return s;\n+ break;\n+ case 1 : \n+ int LA13_20 = input.LA(1);\n+\n+ s = -1;\n+ if ( ((LA13_20>='\\u0000' && LA13_20<='\\uFFFF')) ) {s = 50;}\n+\n+ else s = 23;\n+\n+ if ( s>=0 ) return s;\n+ break;\n+ case 2 : \n int LA13_0 = input.LA(1);\n \n s = -1;\n@@ -1343,23 +1393,23 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc\n \n else if ( (LA13_0==')') ) {s = 8;}\n \n- else if ( (LA13_0=='[') ) {s = 9;}\n+ else if ( (LA13_0=='^') ) {s = 9;}\n \n- else if ( (LA13_0=='.') ) {s = 10;}\n+ else if ( (LA13_0=='[') ) {s = 10;}\n \n else if ( (LA13_0==']') ) {s = 11;}\n \n- else if ( (LA13_0=='^') ) {s = 12;}\n+ else if ( (LA13_0=='{') ) {s = 12;}\n \n- else if ( (LA13_0=='E') ) {s = 13;}\n+ else if ( (LA13_0==',') ) {s = 13;}\n \n- else if ( (LA13_0=='e') ) {s = 14;}\n+ else if ( (LA13_0=='}') ) {s = 14;}\n \n- else if ( (LA13_0==',') ) {s = 15;}\n+ else if ( (LA13_0=='.') ) {s = 15;}\n \n- else if ( (LA13_0=='{') ) {s = 16;}\n+ else if ( (LA13_0=='E') ) {s = 16;}\n \n- else if ( (LA13_0=='}') ) {s = 17;}\n+ else if ( (LA13_0=='e') ) {s = 17;}\n \n else if ( ((LA13_0>='A' && LA13_0<='D')||(LA13_0>='F' && LA13_0<='Z')||LA13_0=='_'||(LA13_0>='a' && LA13_0<='d')||(LA13_0>='f' && LA13_0<='z')) ) {s = 18;}\n \n@@ -1373,26 +1423,6 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc\n \n else if ( ((LA13_0>='\\u0000' && LA13_0<='\\b')||(LA13_0>='\\u000B' && LA13_0<='\\f')||(LA13_0>='\\u000E' && LA13_0<='\\u001F')||LA13_0=='!'||(LA13_0>='#' && LA13_0<='$')||LA13_0=='&'||(LA13_0>=':' && LA13_0<='<')||(LA13_0>='>' && LA13_0<='@')||LA13_0=='\\\\'||LA13_0=='`'||LA13_0=='|'||(LA13_0>='~' && LA13_0<='\\uFFFF')) ) {s = 23;}\n \n- if ( s>=0 ) return s;\n- break;\n- case 1 : \n- int LA13_20 = input.LA(1);\n-\n- s = -1;\n- if ( ((LA13_20>='\\u0000' && LA13_20<='\\uFFFF')) ) {s = 49;}\n-\n- else s = 23;\n-\n- if ( s>=0 ) return s;\n- break;\n- case 2 : \n- int LA13_21 = input.LA(1);\n-\n- s = -1;\n- if ( ((LA13_21>='\\u0000' && LA13_21<='\\uFFFF')) ) {s = 49;}\n-\n- else s = 23;\n-\n if ( s>=0 ) return s;\n break;\n }", "raw_url": "https://github.com/iee/iee/raw/0f04d91efdf50447d8e84e926ef98d7462103dc0/org.eclipse.iee.translator.Jmole%2Forg.eclipse.iee.translator.jmole.math%2Fsrc-gen%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fjmole%2Fmath%2Fparser%2Fantlr%2Finternal%2FInternalMathLexer.java", "sha": "492cc122b8421d3adce64f307a025943c471db83", "status": "modified" }, { "additions": 428, "blob_url": "https://github.com/iee/iee/blob/0f04d91efdf50447d8e84e926ef98d7462103dc0/org.eclipse.iee.translator.Jmole%2Forg.eclipse.iee.translator.jmole.math%2Fsrc-gen%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fjmole%2Fmath%2Fserializer%2FAbstractMathSemanticSequencer.java", "changes": 581, "contents_url": "https://api.github.com/repos/iee/iee/contents/org.eclipse.iee.translator.Jmole%2Forg.eclipse.iee.translator.jmole.math%2Fsrc-gen%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fjmole%2Fmath%2Fserializer%2FAbstractMathSemanticSequencer.java?ref=0f04d91efdf50447d8e84e926ef98d7462103dc0", "deletions": 153, "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/serializer/AbstractMathSemanticSequencer.java", "new_code": "import org.eclipse.iee.translator.jmole.math.math.Matrix;\nimport org.eclipse.iee.translator.jmole.math.math.MatrixAddition;\nimport org.eclipse.iee.translator.jmole.math.math.MatrixAssignment;\nimport org.eclipse.iee.translator.jmole.math.math.MatrixElement;\nimport org.eclipse.iee.translator.jmole.math.math.MatrixFormula;\nimport org.eclipse.iee.translator.jmole.math.math.MatrixMultiplication;\nimport org.eclipse.iee.translator.jmole.math.math.MatrixSubtraction;\nimport org.eclipse.iee.translator.jmole.math.math.MatrixVariable;\nimport org.eclipse.iee.translator.jmole.math.math.NewMatrix;\nimport org.eclipse.iee.translator.jmole.math.math.TransposeMatrix;\nimport org.eclipse.iee.translator.jmole.math.math.VariableAssignment;\n\t\t\t\t context == grammarAccess.getExponentRule() ||\n\t\t\t\t context == grammarAccess.getExponentAccess().getExponentLeftAction_1_0() ||\n\t\t\t\t context == grammarAccess.getMultiplicationAccess().getMultiplicationLeftAction_1_0_1() ||\n\t\t\t\t context == grammarAccess.getPrimaryRule() ||\n\t\t\t\t context == grammarAccess.getUnaryExpressionRule()) {\n\t\t\t\t\tsequence_Addition(context, (Addition) semanticObject); \n\t\t\t\t context == grammarAccess.getExponentRule() ||\n\t\t\t\t context == grammarAccess.getExponentAccess().getExponentLeftAction_1_0() ||\n\t\t\t\t context == grammarAccess.getMultiplicationAccess().getMultiplicationLeftAction_1_0_1() ||\n\t\t\t\t context == grammarAccess.getPrimaryRule() ||\n\t\t\t\t context == grammarAccess.getUnaryExpressionRule()) {\n\t\t\t\t\tsequence_Multiplication(context, (Division) semanticObject); \n\t\t\t\t context == grammarAccess.getExponentRule() ||\n\t\t\t\t context == grammarAccess.getExponentAccess().getExponentLeftAction_1_0() ||\n\t\t\t\t context == grammarAccess.getMultiplicationAccess().getMultiplicationLeftAction_1_0_1() ||\n\t\t\t\t context == grammarAccess.getPrimaryRule() ||\n\t\t\t\t context == grammarAccess.getUnaryExpressionRule()) {\n\t\t\t\t\tsequence_Exponent(context, (Exponent) semanticObject); \n\t\t\t\t\tsequence_Function(context, (Expression) semanticObject); \n\t\t\t\t context == grammarAccess.getExponentRule() ||\n\t\t\t\t context == grammarAccess.getExponentAccess().getExponentLeftAction_1_0() ||\n\t\t\t\t context == grammarAccess.getMultiplicationAccess().getMultiplicationLeftAction_1_0_1() ||\n\t\t\t\t context == grammarAccess.getPrimaryRule() ||\n\t\t\t\t context == grammarAccess.getUnaryExpressionRule()) {\n\t\t\t\t\tsequence_UnaryExpression(context, (Factorial) semanticObject); \n\t\t\t\t context == grammarAccess.getExponentRule() ||\n\t\t\t\t context == grammarAccess.getExponentAccess().getExponentLeftAction_1_0() ||\n\t\t\t\t context == grammarAccess.getMultiplicationAccess().getMultiplicationLeftAction_1_0_1() ||\n\t\t\t\t context == grammarAccess.getPrimaryRule() ||\n\t\t\t\t context == grammarAccess.getUnaryExpressionRule()) {\n\t\t\t\t\tsequence_Primary(context, (org.eclipse.iee.translator.jmole.math.math.Float) semanticObject); \n\t\t\t\t\tsequence_Formula(context, (Formula) semanticObject); \n\t\t\t\t context == grammarAccess.getExponentRule() ||\n\t\t\t\t context == grammarAccess.getExponentAccess().getExponentLeftAction_1_0() ||\n\t\t\t\t context == grammarAccess.getMultiplicationAccess().getMultiplicationLeftAction_1_0_1() ||\n\t\t\t\t context == grammarAccess.getPrimaryRule() ||\n\t\t\t\t context == grammarAccess.getUnaryExpressionRule()) {\n\t\t\t\t\tsequence_Primary(context, (Function) semanticObject); \n\t\t\t\t\tsequence_FunctionDefinition(context, (FunctionDefinition) semanticObject); \n\t\t\tcase MathPackage.INVERT:\n\t\t\t\t context == grammarAccess.getExponentRule() ||\n\t\t\t\t context == grammarAccess.getExponentAccess().getExponentLeftAction_1_0() ||\n\t\t\t\t context == grammarAccess.getMultiplicationAccess().getMultiplicationLeftAction_1_0_1() ||\n\t\t\t\t context == grammarAccess.getPrimaryRule() ||\n\t\t\t\t context == grammarAccess.getUnaryExpressionRule()) {\n\t\t\t\t\tsequence_UnaryExpression(context, (Invert) semanticObject); \n\t\t\tcase MathPackage.MATRIX:\n\t\t\t\tif(context == grammarAccess.getMatrixRule()) {\n\t\t\t\t\tsequence_Matrix(context, (Matrix) semanticObject); \n\t\t\t\t\treturn; \n\t\t\t\t}\n\t\t\t\telse break;\n\t\t\tcase MathPackage.MATRIX_ADDITION:\n\t\t\t\tif(context == grammarAccess.getMatrixAdditionRule() ||\n\t\t\t\t context == grammarAccess.getMatrixAdditionAccess().getMatrixAdditionLeftAction_1_0_1() ||\n\t\t\t\t context == grammarAccess.getMatrixAdditionAccess().getMatrixSubtractionLeftAction_1_1_1() ||\n\t\t\t\t context == grammarAccess.getMatrixMultiplicationRule() ||\n\t\t\t\t context == grammarAccess.getMatrixMultiplicationAccess().getMatrixMultiplicationLeftAction_1_0_1() ||\n\t\t\t\t context == grammarAccess.getMatrixMultiplicationAccess().getMatrixMultiplicationLeftAction_1_1_1() ||\n\t\t\t\t context == grammarAccess.getPrimaryMatrixRule()) {\n\t\t\t\t\tsequence_MatrixAddition(context, (MatrixAddition) semanticObject); \n\t\t\t\t\treturn; \n\t\t\t\t}\n\t\t\t\telse break;\n\t\t\tcase MathPackage.MATRIX_ASSIGNMENT:\n\t\t\t\tif(context == grammarAccess.getMatrixAssignmentRule()) {\n\t\t\t\t\tsequence_MatrixAssignment(context, (MatrixAssignment) semanticObject); \n\t\t\t\t\treturn; \n\t\t\t\t}\n\t\t\t\telse break;\n\t\t\tcase MathPackage.MATRIX_ELEMENT:\n\t\t\t\t context == grammarAccess.getExponentRule() ||\n\t\t\t\t context == grammarAccess.getExponentAccess().getExponentLeftAction_1_0() ||\n\t\t\t\t context == grammarAccess.getMultiplicationAccess().getMultiplicationLeftAction_1_0_1() ||\n\t\t\t\t context == grammarAccess.getPrimaryRule() ||\n\t\t\t\t context == grammarAccess.getUnaryExpressionRule()) {\n\t\t\t\t\tsequence_Primary(context, (MatrixElement) semanticObject); \n\t\t\t\t\treturn; \n\t\t\t\t}\n\t\t\t\telse break;\n\t\t\tcase MathPackage.MATRIX_FORMULA:\n\t\t\t\tif(context == grammarAccess.getMatrixFormulaRule()) {\n\t\t\t\t\tsequence_MatrixFormula(context, (MatrixFormula) semanticObject); \n\t\t\tcase MathPackage.MATRIX_MULTIPLICATION:\n\t\t\t\tif(context == grammarAccess.getMatrixAdditionRule() ||\n\t\t\t\t context == grammarAccess.getMatrixAdditionAccess().getMatrixAdditionLeftAction_1_0_1() ||\n\t\t\t\t context == grammarAccess.getMatrixAdditionAccess().getMatrixSubtractionLeftAction_1_1_1() ||\n\t\t\t\t context == grammarAccess.getMatrixMultiplicationRule() ||\n\t\t\t\t context == grammarAccess.getMatrixMultiplicationAccess().getMatrixMultiplicationLeftAction_1_0_1() ||\n\t\t\t\t context == grammarAccess.getMatrixMultiplicationAccess().getMatrixMultiplicationLeftAction_1_1_1() ||\n\t\t\t\t context == grammarAccess.getPrimaryMatrixRule()) {\n\t\t\t\t\tsequence_MatrixMultiplication(context, (MatrixMultiplication) semanticObject); \n\t\t\t\t\tsequence_MatrixRow(context, (MatrixRow) semanticObject); \n\t\t\t\t\treturn; \n\t\t\t\t}\n\t\t\t\telse break;\n\t\t\tcase MathPackage.MATRIX_SUBTRACTION:\n\t\t\t\tif(context == grammarAccess.getMatrixAdditionRule() ||\n\t\t\t\t context == grammarAccess.getMatrixAdditionAccess().getMatrixAdditionLeftAction_1_0_1() ||\n\t\t\t\t context == grammarAccess.getMatrixAdditionAccess().getMatrixSubtractionLeftAction_1_1_1() ||\n\t\t\t\t context == grammarAccess.getMatrixMultiplicationRule() ||\n\t\t\t\t context == grammarAccess.getMatrixMultiplicationAccess().getMatrixMultiplicationLeftAction_1_0_1() ||\n\t\t\t\t context == grammarAccess.getMatrixMultiplicationAccess().getMatrixMultiplicationLeftAction_1_1_1() ||\n\t\t\t\t context == grammarAccess.getPrimaryMatrixRule()) {\n\t\t\t\t\tsequence_MatrixAddition(context, (MatrixSubtraction) semanticObject); \n\t\t\t\t\treturn; \n\t\t\t\t}\n\t\t\t\telse break;\n\t\t\tcase MathPackage.MATRIX_VARIABLE:\n\t\t\t\tif(context == grammarAccess.getMatrixAdditionRule() ||\n\t\t\t\t context == grammarAccess.getMatrixAdditionAccess().getMatrixAdditionLeftAction_1_0_1() ||\n\t\t\t\t context == grammarAccess.getMatrixAdditionAccess().getMatrixSubtractionLeftAction_1_1_1() ||\n\t\t\t\t context == grammarAccess.getMatrixMultiplicationRule() ||\n\t\t\t\t context == grammarAccess.getMatrixMultiplicationAccess().getMatrixMultiplicationLeftAction_1_0_1() ||\n\t\t\t\t context == grammarAccess.getMatrixMultiplicationAccess().getMatrixMultiplicationLeftAction_1_1_1() ||\n\t\t\t\t context == grammarAccess.getPrimaryMatrixRule()) {\n\t\t\t\t\tsequence_PrimaryMatrix(context, (MatrixVariable) semanticObject); \n\t\t\t\t context == grammarAccess.getExponentRule() ||\n\t\t\t\t context == grammarAccess.getExponentAccess().getExponentLeftAction_1_0() ||\n\t\t\t\t context == grammarAccess.getMultiplicationAccess().getMultiplicationLeftAction_1_0_1() ||\n\t\t\t\t context == grammarAccess.getPrimaryRule() ||\n\t\t\t\t context == grammarAccess.getUnaryExpressionRule()) {\n\t\t\t\t\tsequence_Multiplication(context, (Modulo) semanticObject); \n\t\t\t\t context == grammarAccess.getExponentRule() ||\n\t\t\t\t context == grammarAccess.getExponentAccess().getExponentLeftAction_1_0() ||\n\t\t\t\t context == grammarAccess.getMultiplicationAccess().getMultiplicationLeftAction_1_0_1() ||\n\t\t\t\t context == grammarAccess.getPrimaryRule() ||\n\t\t\t\t context == grammarAccess.getUnaryExpressionRule()) {\n\t\t\t\t\tsequence_Multiplication(context, (Multiplication) semanticObject); \n\t\t\t\t\treturn; \n\t\t\t\t}\n\t\t\t\telse break;\n\t\t\tcase MathPackage.NEW_MATRIX:\n\t\t\t\tif(context == grammarAccess.getMatrixAdditionRule() ||\n\t\t\t\t context == grammarAccess.getMatrixAdditionAccess().getMatrixAdditionLeftAction_1_0_1() ||\n\t\t\t\t context == grammarAccess.getMatrixAdditionAccess().getMatrixSubtractionLeftAction_1_1_1() ||\n\t\t\t\t context == grammarAccess.getMatrixMultiplicationRule() ||\n\t\t\t\t context == grammarAccess.getMatrixMultiplicationAccess().getMatrixMultiplicationLeftAction_1_0_1() ||\n\t\t\t\t context == grammarAccess.getMatrixMultiplicationAccess().getMatrixMultiplicationLeftAction_1_1_1() ||\n\t\t\t\t context == grammarAccess.getPrimaryMatrixRule()) {\n\t\t\t\t\tsequence_PrimaryMatrix(context, (NewMatrix) semanticObject); \n\t\t\t\t\tsequence_Statement(context, (Statement) semanticObject); \n\t\t\t\t context == grammarAccess.getExponentRule() ||\n\t\t\t\t context == grammarAccess.getExponentAccess().getExponentLeftAction_1_0() ||\n\t\t\t\t context == grammarAccess.getMultiplicationAccess().getMultiplicationLeftAction_1_0_1() ||\n\t\t\t\t context == grammarAccess.getPrimaryRule() ||\n\t\t\t\t context == grammarAccess.getUnaryExpressionRule()) {\n\t\t\t\t\tsequence_Addition(context, (Subtraction) semanticObject); \n\t\t\t\t\treturn; \n\t\t\t\t}\n\t\t\t\telse break;\n\t\t\tcase MathPackage.TRANSPOSE_MATRIX:\n\t\t\t\tif(context == grammarAccess.getMatrixAdditionRule() ||\n\t\t\t\t context == grammarAccess.getMatrixAdditionAccess().getMatrixAdditionLeftAction_1_0_1() ||\n\t\t\t\t context == grammarAccess.getMatrixAdditionAccess().getMatrixSubtractionLeftAction_1_1_1() ||\n\t\t\t\t context == grammarAccess.getMatrixMultiplicationRule() ||\n\t\t\t\t context == grammarAccess.getMatrixMultiplicationAccess().getMatrixMultiplicationLeftAction_1_0_1() ||\n\t\t\t\t context == grammarAccess.getMatrixMultiplicationAccess().getMatrixMultiplicationLeftAction_1_1_1() ||\n\t\t\t\t context == grammarAccess.getPrimaryMatrixRule()) {\n\t\t\t\t\tsequence_PrimaryMatrix(context, (TransposeMatrix) semanticObject); \n\t\t\t\t context == grammarAccess.getExponentRule() ||\n\t\t\t\t context == grammarAccess.getExponentAccess().getExponentLeftAction_1_0() ||\n\t\t\t\t context == grammarAccess.getMultiplicationAccess().getMultiplicationLeftAction_1_0_1() ||\n\t\t\t\t context == grammarAccess.getPrimaryRule() ||\n\t\t\t\t context == grammarAccess.getUnaryExpressionRule()) {\n\t\t\t\t\tsequence_Primary(context, (Variable) semanticObject); \n\t\t\t\t\treturn; \n\t\t\t\t}\n\t\t\t\telse break;\n\t\t\tcase MathPackage.VARIABLE_ASSIGNMENT:\n\t\t\t\tif(context == grammarAccess.getVariableAssignmentRule()) {\n\t\t\t\t\tsequence_VariableAssignment(context, (VariableAssignment) semanticObject); \n\tprotected void sequence_Addition(EObject context, Addition semanticObject) {\n\tprotected void sequence_Addition(EObject context, Subtraction semanticObject) {\n\tprotected void sequence_Exponent(EObject context, Exponent semanticObject) {\n\tprotected void sequence_Formula(EObject context, Formula semanticObject) {\n\tprotected void sequence_FunctionDefinition(EObject context, FunctionDefinition semanticObject) {\n\tprotected void sequence_Function(EObject context, Expression semanticObject) {\n\t * (left=MatrixAddition_MatrixAddition_1_0_1 right=MatrixMultiplication)\n\t * left[1, 1]\n\t * right[1, 1]\n\t */\n\tprotected void sequence_MatrixAddition(EObject context, MatrixAddition semanticObject) {\n\t\tif(errorAcceptor != null) {\n\t\t\tif(transientValues.isValueTransient(semanticObject, MathPackage.Literals.MATRIX_ADDITION__LEFT) == ValueTransient.YES)\n\t\t\t\terrorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, MathPackage.Literals.MATRIX_ADDITION__LEFT));\n\t\t\tif(transientValues.isValueTransient(semanticObject, MathPackage.Literals.MATRIX_ADDITION__RIGHT) == ValueTransient.YES)\n\t\t\t\terrorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, MathPackage.Literals.MATRIX_ADDITION__RIGHT));\n\t\t}\n\t\tINodesForEObjectProvider nodes = createNodeProvider(semanticObject);\n\t\tSequenceFeeder feeder = createSequencerFeeder(semanticObject, nodes);\n\t\tfeeder.accept(grammarAccess.getMatrixAdditionAccess().getMatrixAdditionLeftAction_1_0_1(), semanticObject.getLeft());\n\t\tfeeder.accept(grammarAccess.getMatrixAdditionAccess().getRightMatrixMultiplicationParserRuleCall_1_0_2_0(), semanticObject.getRight());\n\t\tfeeder.finish();\n\t}\n\t\n\t\n\t/**\n\t * Constraint:\n\t * (left=MatrixAddition_MatrixSubtraction_1_1_1 right=MatrixMultiplication)\n\t *\n\t * Features:\n\t * left[1, 1]\n\t * right[1, 1]\n\tprotected void sequence_MatrixAddition(EObject context, MatrixSubtraction semanticObject) {\n\t\tif(errorAcceptor != null) {\n\t\t\tif(transientValues.isValueTransient(semanticObject, MathPackage.Literals.MATRIX_SUBTRACTION__LEFT) == ValueTransient.YES)\n\t\t\t\terrorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, MathPackage.Literals.MATRIX_SUBTRACTION__LEFT));\n\t\t\tif(transientValues.isValueTransient(semanticObject, MathPackage.Literals.MATRIX_SUBTRACTION__RIGHT) == ValueTransient.YES)\n\t\t\t\terrorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, MathPackage.Literals.MATRIX_SUBTRACTION__RIGHT));\n\t\t}\n\t\tINodesForEObjectProvider nodes = createNodeProvider(semanticObject);\n\t\tSequenceFeeder feeder = createSequencerFeeder(semanticObject, nodes);\n\t\tfeeder.accept(grammarAccess.getMatrixAdditionAccess().getMatrixSubtractionLeftAction_1_1_1(), semanticObject.getLeft());\n\t\tfeeder.accept(grammarAccess.getMatrixAdditionAccess().getRightMatrixMultiplicationParserRuleCall_1_1_2_0(), semanticObject.getRight());\n\t\tfeeder.finish();\n\t}\n\t\n\t\n\t/**\n\t * Constraint:\n\t * (variable=MATH_NAME value=MatrixFormula)\n\t *\n\t * Features:\n\t * variable[1, 1]\n\t * value[1, 1]\n\t */\n\tprotected void sequence_MatrixAssignment(EObject context, MatrixAssignment semanticObject) {\n\t\tif(errorAcceptor != null) {\n\t\t\tif(transientValues.isValueTransient(semanticObject, MathPackage.Literals.MATRIX_ASSIGNMENT__VARIABLE) == ValueTransient.YES)\n\t\t\t\terrorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, MathPackage.Literals.MATRIX_ASSIGNMENT__VARIABLE));\n\t\t\tif(transientValues.isValueTransient(semanticObject, MathPackage.Literals.MATRIX_ASSIGNMENT__VALUE) == ValueTransient.YES)\n\t\t\t\terrorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, MathPackage.Literals.MATRIX_ASSIGNMENT__VALUE));\n\t\t}\n\t\tINodesForEObjectProvider nodes = createNodeProvider(semanticObject);\n\t\tSequenceFeeder feeder = createSequencerFeeder(semanticObject, nodes);\n\t\tfeeder.accept(grammarAccess.getMatrixAssignmentAccess().getVariableMATH_NAMETerminalRuleCall_1_0(), semanticObject.getVariable());\n\t\tfeeder.accept(grammarAccess.getMatrixAssignmentAccess().getValueMatrixFormulaParserRuleCall_4_0(), semanticObject.getValue());\n\t\tfeeder.finish();\n\t}\n\t\n\t\n\t/**\n\t * Constraint:\n\t * expression=MatrixAddition\n\t *\n\t * Features:\n\t * expression[1, 1]\n\t */\n\tprotected void sequence_MatrixFormula(EObject context, MatrixFormula semanticObject) {\n\t\tif(errorAcceptor != null) {\n\t\t\tif(transientValues.isValueTransient(semanticObject, MathPackage.Literals.MATRIX_FORMULA__EXPRESSION) == ValueTransient.YES)\n\t\t\t\terrorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, MathPackage.Literals.MATRIX_FORMULA__EXPRESSION));\n\t\t}\n\t\tINodesForEObjectProvider nodes = createNodeProvider(semanticObject);\n\t\tSequenceFeeder feeder = createSequencerFeeder(semanticObject, nodes);\n\t\tfeeder.accept(grammarAccess.getMatrixFormulaAccess().getExpressionMatrixAdditionParserRuleCall_0(), semanticObject.getExpression());\n\t\tfeeder.finish();\n\t}\n\t\n\t\n\t/**\n\t * Constraint:\n\t * (\n\t * (left=MatrixMultiplication_MatrixMultiplication_1_0_1 rightMatrix=PrimaryMatrix) | \n\t * (left=MatrixMultiplication_MatrixMultiplication_1_1_1 rightScalar=Formula)\n\t * )\n\t *\n\t * Features:\n\t * left[0, 2]\n\t * rightMatrix[0, 1]\n\t * EXCLUDE_IF_UNSET left\n\t * MANDATORY_IF_SET left\n\t * EXCLUDE_IF_SET left\n\t * EXCLUDE_IF_SET rightScalar\n\t * rightScalar[0, 1]\n\t * EXCLUDE_IF_UNSET left\n\t * MANDATORY_IF_SET left\n\t * EXCLUDE_IF_SET left\n\t * EXCLUDE_IF_SET rightMatrix\n\t */\n\tprotected void sequence_MatrixMultiplication(EObject context, MatrixMultiplication semanticObject) {\n\tprotected void sequence_MatrixRow(EObject context, MatrixRow semanticObject) {\n\t\tgenericSequencer.createSequence(context, semanticObject);\n\t}\n\t\n\t\n\t/**\n\t * Constraint:\n\t * (rows+=MatrixRow rows+=MatrixRow*)?\n\t *\n\t * Features:\n\t * rows[0, *]\n\t */\n\tprotected void sequence_Matrix(EObject context, Matrix semanticObject) {\n\tprotected void sequence_Multiplication(EObject context, Division semanticObject) {\n\tprotected void sequence_Multiplication(EObject context, Modulo semanticObject) {\n\tprotected void sequence_Multiplication(EObject context, Multiplication semanticObject) {\n\t/**\n\t * Constraint:\n\t * name=MATH_NAME\n\t *\n\t * Features:\n\t * name[1, 1]\n\t */\n\tprotected void sequence_PrimaryMatrix(EObject context, MatrixVariable semanticObject) {\n\t\tif(errorAcceptor != null) {\n\t\t\tif(transientValues.isValueTransient(semanticObject, MathPackage.Literals.MATRIX_VARIABLE__NAME) == ValueTransient.YES)\n\t\t\t\terrorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, MathPackage.Literals.MATRIX_VARIABLE__NAME));\n\t\t}\n\t\tINodesForEObjectProvider nodes = createNodeProvider(semanticObject);\n\t\tSequenceFeeder feeder = createSequencerFeeder(semanticObject, nodes);\n\t\tfeeder.accept(grammarAccess.getPrimaryMatrixAccess().getNameMATH_NAMETerminalRuleCall_2_2_0(), semanticObject.getName());\n\t\tfeeder.finish();\n\t}\n\t\n\t\n\t/**\n\t * Constraint:\n\t * matrix=Matrix\n\t *\n\t * Features:\n\t * matrix[1, 1]\n\t */\n\tprotected void sequence_PrimaryMatrix(EObject context, NewMatrix semanticObject) {\n\t\tif(errorAcceptor != null) {\n\t\t\tif(transientValues.isValueTransient(semanticObject, MathPackage.Literals.NEW_MATRIX__MATRIX) == ValueTransient.YES)\n\t\t\t\terrorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, MathPackage.Literals.NEW_MATRIX__MATRIX));\n\t\t}\n\t\tINodesForEObjectProvider nodes = createNodeProvider(semanticObject);\n\t\tSequenceFeeder feeder = createSequencerFeeder(semanticObject, nodes);\n\t\tfeeder.accept(grammarAccess.getPrimaryMatrixAccess().getMatrixMatrixParserRuleCall_0_1_0(), semanticObject.getMatrix());\n\t\tfeeder.finish();\n\t}\n\t\n\t\n\t/**\n\t * Constraint:\n\t * name=MATH_NAME\n\t *\n\t * Features:\n\t * name[1, 1]\n\t */\n\tprotected void sequence_PrimaryMatrix(EObject context, TransposeMatrix semanticObject) {\n\t\tif(errorAcceptor != null) {\n\t\t\tif(transientValues.isValueTransient(semanticObject, MathPackage.Literals.TRANSPOSE_MATRIX__NAME) == ValueTransient.YES)\n\t\t\t\terrorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, MathPackage.Literals.TRANSPOSE_MATRIX__NAME));\n\t\t}\n\t\tINodesForEObjectProvider nodes = createNodeProvider(semanticObject);\n\t\tSequenceFeeder feeder = createSequencerFeeder(semanticObject, nodes);\n\t\tfeeder.accept(grammarAccess.getPrimaryMatrixAccess().getNameMATH_NAMETerminalRuleCall_1_2_0(), semanticObject.getName());\n\t\tfeeder.finish();\n\t}\n\t\n\t\n\tprotected void sequence_Primary(EObject context, org.eclipse.iee.translator.jmole.math.math.Float semanticObject) {\n\tprotected void sequence_Primary(EObject context, Function semanticObject) {\n\t\tgenericSequencer.createSequence(context, semanticObject);\n\t}\n\t\n\t\n\t/**\n\t * Constraint:\n\t * (element=MATH_NAME row=INT column=INT)\n\t *\n\t * Features:\n\t * element[1, 1]\n\t * row[1, 1]\n\t * column[1, 1]\n\t */\n\tprotected void sequence_Primary(EObject context, MatrixElement semanticObject) {\n\tprotected void sequence_Primary(EObject context, Variable semanticObject) {\n\t * (\n\t * functionDefinition=FunctionDefinition | \n\t * variableAssignment=VariableAssignment | \n\t * formula=Formula | \n\t * matrixAssignment=MatrixAssignment | \n\t * matrixFormula=MatrixFormula\n\t * )\n\t * EXCLUDE_IF_SET variableAssignment\n\t * EXCLUDE_IF_SET matrixAssignment\n\t * EXCLUDE_IF_SET matrixFormula\n\t * variableAssignment[0, 1]\n\t * EXCLUDE_IF_SET matrixAssignment\n\t * EXCLUDE_IF_SET matrixFormula\n\t * formula[0, 1]\n\t * EXCLUDE_IF_SET variableAssignment\n\t * EXCLUDE_IF_SET matrixAssignment\n\t * EXCLUDE_IF_SET matrixFormula\n\t * matrixAssignment[0, 1]\n\t * EXCLUDE_IF_SET functionDefinition\n\t * EXCLUDE_IF_SET variableAssignment\n\t * EXCLUDE_IF_SET matrixFormula\n\t * matrixFormula[0, 1]\n\t * EXCLUDE_IF_SET variableAssignment\n\t * EXCLUDE_IF_SET formula\n\t * EXCLUDE_IF_SET matrixAssignment\n\tprotected void sequence_Statement(EObject context, Statement semanticObject) {\n\tprotected void sequence_UnaryExpression(EObject context, Factorial semanticObject) {\n\t * expression=UnaryExpression\n\t * expression[1, 1]\n\tprotected void sequence_UnaryExpression(EObject context, Invert semanticObject) {\n\t * (variable=MATH_NAME value=Formula)\n\t * variable[1, 1]\n\t * value[1, 1]\n\tprotected void sequence_VariableAssignment(EObject context, VariableAssignment semanticObject) {\n\t\tif(errorAcceptor != null) {\n\t\t\tif(transientValues.isValueTransient(semanticObject, MathPackage.Literals.VARIABLE_ASSIGNMENT__VARIABLE) == ValueTransient.YES)\n\t\t\t\terrorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, MathPackage.Literals.VARIABLE_ASSIGNMENT__VARIABLE));\n\t\t\tif(transientValues.isValueTransient(semanticObject, MathPackage.Literals.VARIABLE_ASSIGNMENT__VALUE) == ValueTransient.YES)\n\t\t\t\terrorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, MathPackage.Literals.VARIABLE_ASSIGNMENT__VALUE));\n\t\t}\n\t\tINodesForEObjectProvider nodes = createNodeProvider(semanticObject);\n\t\tSequenceFeeder feeder = createSequencerFeeder(semanticObject, nodes);\n\t\tfeeder.accept(grammarAccess.getVariableAssignmentAccess().getVariableMATH_NAMETerminalRuleCall_0_0(), semanticObject.getVariable());\n\t\tfeeder.accept(grammarAccess.getVariableAssignmentAccess().getValueFormulaParserRuleCall_2_0(), semanticObject.getValue());\n\t\tfeeder.finish();", "new_methods": [ { "arguments": [ "EObject context", " Addition semanticObject" ], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/serializer/AbstractMathSemanticSequencer.java", "implementation": "protected void sequence_Addition(EObject context, Subtraction semanticObject) {\n\tprotected void sequence_Exponent(EObject context, Exponent semanticObject) {\n\tprotected void sequence_Formula(EObject context, Formula semanticObject) {\n\tprotected void sequence_FunctionDefinition(EObject context, FunctionDefinition semanticObject) {\n\tprotected void sequence_Function(EObject context, Expression semanticObject) {\n\t * (left=MatrixAddition_MatrixAddition_1_0_1 right=MatrixMultiplication)\n\t * left[1, 1]\n\t * right[1, 1]\n\t */\n\tprotected void sequence_MatrixAddition(EObject context, MatrixAddition semanticObject) {\n\t\tif(errorAcceptor != null) {\n\t\t\tif(transientValues.isValueTransient(semanticObject, MathPackage.Literals.MATRIX_ADDITION__LEFT) == ValueTransient.YES)\n\t\t\t\terrorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, MathPackage.Literals.MATRIX_ADDITION__LEFT));\n\t\t\tif(transientValues.isValueTransient(semanticObject, MathPackage.Literals.MATRIX_ADDITION__RIGHT) == ValueTransient.YES)\n\t\t\t\terrorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, MathPackage.Literals.MATRIX_ADDITION__RIGHT));", "signature": "void sequence_Addition(EObject context, Addition semanticObject)" }, { "arguments": [ "EObject context", " MatrixSubtraction semanticObject" ], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/serializer/AbstractMathSemanticSequencer.java", "implementation": "if(errorAcceptor != null) {\n\t\t\tif(transientValues.isValueTransient(semanticObject, MathPackage.Literals.MATRIX_SUBTRACTION__LEFT) == ValueTransient.YES)\n\t\t\t\terrorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, MathPackage.Literals.MATRIX_SUBTRACTION__LEFT));\n\t\t\tif(transientValues.isValueTransient(semanticObject, MathPackage.Literals.MATRIX_SUBTRACTION__RIGHT) == ValueTransient.YES)\n\t\t\t\terrorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, MathPackage.Literals.MATRIX_SUBTRACTION__RIGHT));", "signature": "void sequence_MatrixAddition(EObject context, MatrixSubtraction semanticObject)" }, { "arguments": [ "EObject context", " MatrixAssignment semanticObject" ], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/serializer/AbstractMathSemanticSequencer.java", "implementation": "if(errorAcceptor != null) {\n\t\t\tif(transientValues.isValueTransient(semanticObject, MathPackage.Literals.MATRIX_ASSIGNMENT__VARIABLE) == ValueTransient.YES)\n\t\t\t\terrorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, MathPackage.Literals.MATRIX_ASSIGNMENT__VARIABLE));\n\t\t\tif(transientValues.isValueTransient(semanticObject, MathPackage.Literals.MATRIX_ASSIGNMENT__VALUE) == ValueTransient.YES)\n\t\t\t\terrorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, MathPackage.Literals.MATRIX_ASSIGNMENT__VALUE));", "signature": "void sequence_MatrixAssignment(EObject context, MatrixAssignment semanticObject)" }, { "arguments": [ "EObject context", " MatrixFormula semanticObject" ], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/serializer/AbstractMathSemanticSequencer.java", "implementation": "if(errorAcceptor != null) {\n\t\t\tif(transientValues.isValueTransient(semanticObject, MathPackage.Literals.MATRIX_FORMULA__EXPRESSION) == ValueTransient.YES)\n\t\t\t\terrorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, MathPackage.Literals.MATRIX_FORMULA__EXPRESSION));", "signature": "void sequence_MatrixFormula(EObject context, MatrixFormula semanticObject)" }, { "arguments": [ "EObject context", " MatrixMultiplication semanticObject" ], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/serializer/AbstractMathSemanticSequencer.java", "implementation": "protected void sequence_MatrixRow(EObject context, MatrixRow semanticObject) {\n\t\tgenericSequencer.createSequence(context, semanticObject);", "signature": "void sequence_MatrixMultiplication(EObject context, MatrixMultiplication semanticObject)" }, { "arguments": [ "EObject context", " Matrix semanticObject" ], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/serializer/AbstractMathSemanticSequencer.java", "implementation": "protected void sequence_Multiplication(EObject context, Division semanticObject) {\n\tprotected void sequence_Multiplication(EObject context, Modulo semanticObject) {\n\tprotected void sequence_Multiplication(EObject context, Multiplication semanticObject) {\n\t/**\n\t * Constraint:\n\t * name=MATH_NAME\n\t *\n\t * Features:\n\t * name[1, 1]\n\t */\n\tprotected void sequence_PrimaryMatrix(EObject context, MatrixVariable semanticObject) {\n\t\tif(errorAcceptor != null) {\n\t\t\tif(transientValues.isValueTransient(semanticObject, MathPackage.Literals.MATRIX_VARIABLE__NAME) == ValueTransient.YES)\n\t\t\t\terrorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, MathPackage.Literals.MATRIX_VARIABLE__NAME));", "signature": "void sequence_Matrix(EObject context, Matrix semanticObject)" }, { "arguments": [ "EObject context", " NewMatrix semanticObject" ], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/serializer/AbstractMathSemanticSequencer.java", "implementation": "if(errorAcceptor != null) {\n\t\t\tif(transientValues.isValueTransient(semanticObject, MathPackage.Literals.NEW_MATRIX__MATRIX) == ValueTransient.YES)\n\t\t\t\terrorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, MathPackage.Literals.NEW_MATRIX__MATRIX));", "signature": "void sequence_PrimaryMatrix(EObject context, NewMatrix semanticObject)" }, { "arguments": [ "EObject context", " TransposeMatrix semanticObject" ], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/serializer/AbstractMathSemanticSequencer.java", "implementation": "if(errorAcceptor != null) {\n\t\t\tif(transientValues.isValueTransient(semanticObject, MathPackage.Literals.TRANSPOSE_MATRIX__NAME) == ValueTransient.YES)\n\t\t\t\terrorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, MathPackage.Literals.TRANSPOSE_MATRIX__NAME));", "signature": "void sequence_PrimaryMatrix(EObject context, TransposeMatrix semanticObject)" }, { "arguments": [ "EObject context", " org.eclipse.iee.translator.jmole.math.math.Float semanticObject" ], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/serializer/AbstractMathSemanticSequencer.java", "implementation": "protected void sequence_Primary(EObject context, Function semanticObject) {\n\t\tgenericSequencer.createSequence(context, semanticObject);", "signature": "void sequence_Primary(EObject context, org.eclipse.iee.translator.jmole.math.math.Float semanticObject)" }, { "arguments": [ "EObject context", " MatrixElement semanticObject" ], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/serializer/AbstractMathSemanticSequencer.java", "implementation": "protected void sequence_Primary(EObject context, Variable semanticObject) {\n\t * (\n\t * functionDefinition=FunctionDefinition | \n\t * variableAssignment=VariableAssignment | \n\t * formula=Formula | \n\t * matrixAssignment=MatrixAssignment | \n\t * matrixFormula=MatrixFormula\n\t * )\n\t * EXCLUDE_IF_SET variableAssignment\n\t * EXCLUDE_IF_SET matrixAssignment\n\t * EXCLUDE_IF_SET matrixFormula\n\t * variableAssignment[0, 1]\n\t * EXCLUDE_IF_SET matrixAssignment\n\t * EXCLUDE_IF_SET matrixFormula\n\t * formula[0, 1]\n\t * EXCLUDE_IF_SET variableAssignment\n\t * EXCLUDE_IF_SET matrixAssignment\n\t * EXCLUDE_IF_SET matrixFormula\n\t * matrixAssignment[0, 1]\n\t * EXCLUDE_IF_SET functionDefinition\n\t * EXCLUDE_IF_SET variableAssignment\n\t * EXCLUDE_IF_SET matrixFormula\n\t * matrixFormula[0, 1]\n\t * EXCLUDE_IF_SET variableAssignment\n\t * EXCLUDE_IF_SET formula\n\t * EXCLUDE_IF_SET matrixAssignment\n\tprotected void sequence_Statement(EObject context, Statement semanticObject) {\n\tprotected void sequence_UnaryExpression(EObject context, Factorial semanticObject) {\n\t * expression=UnaryExpression\n\t * expression[1, 1]\n\tprotected void sequence_UnaryExpression(EObject context, Invert semanticObject) {\n\t * (variable=MATH_NAME value=Formula)\n\t * variable[1, 1]\n\t * value[1, 1]\n\tprotected void sequence_VariableAssignment(EObject context, VariableAssignment semanticObject) {\n\t\tif(errorAcceptor != null) {\n\t\t\tif(transientValues.isValueTransient(semanticObject, MathPackage.Literals.VARIABLE_ASSIGNMENT__VARIABLE) == ValueTransient.YES)\n\t\t\t\terrorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, MathPackage.Literals.VARIABLE_ASSIGNMENT__VARIABLE));\n\t\t\tif(transientValues.isValueTransient(semanticObject, MathPackage.Literals.VARIABLE_ASSIGNMENT__VALUE) == ValueTransient.YES)\n\t\t\t\terrorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, MathPackage.Literals.VARIABLE_ASSIGNMENT__VALUE));", "signature": "void sequence_Primary(EObject context, MatrixElement semanticObject)" } ], "old_code": "import org.eclipse.iee.translator.jmole.math.math.Assignment;\nimport org.eclipse.iee.translator.jmole.math.math.Interval;\nimport org.eclipse.iee.translator.jmole.math.math.MatrixDefinition;\n\t\t\t\t context == grammarAccess.getMultiplicationAccess().getMultiplicationLeftAction_1_0_1() ||\n\t\t\t\t context == grammarAccess.getUnaryExpressionRule() ||\n\t\t\t\t context == grammarAccess.getExponentRule() ||\n\t\t\t\t context == grammarAccess.getExponentAccess().getExponentLeftAction_1_0() ||\n\t\t\t\t context == grammarAccess.getPrimaryRule()) {\n\t\t\t\t\tsequence_Addition_Addition(context, (Addition) semanticObject); \n\t\t\t\t\treturn; \n\t\t\t\t}\n\t\t\t\telse break;\n\t\t\tcase MathPackage.ASSIGNMENT:\n\t\t\t\tif(context == grammarAccess.getAssignmentRule()) {\n\t\t\t\t\tsequence_Assignment_Assignment(context, (Assignment) semanticObject); \n\t\t\t\t context == grammarAccess.getMultiplicationAccess().getMultiplicationLeftAction_1_0_1() ||\n\t\t\t\t context == grammarAccess.getUnaryExpressionRule() ||\n\t\t\t\t context == grammarAccess.getExponentRule() ||\n\t\t\t\t context == grammarAccess.getExponentAccess().getExponentLeftAction_1_0() ||\n\t\t\t\t context == grammarAccess.getPrimaryRule()) {\n\t\t\t\t\tsequence_Multiplication_Division(context, (Division) semanticObject); \n\t\t\t\t context == grammarAccess.getMultiplicationAccess().getMultiplicationLeftAction_1_0_1() ||\n\t\t\t\t context == grammarAccess.getUnaryExpressionRule() ||\n\t\t\t\t context == grammarAccess.getExponentRule() ||\n\t\t\t\t context == grammarAccess.getExponentAccess().getExponentLeftAction_1_0() ||\n\t\t\t\t context == grammarAccess.getPrimaryRule()) {\n\t\t\t\t\tsequence_Exponent_Exponent(context, (Exponent) semanticObject); \n\t\t\t\t\tsequence_Function_Expression(context, (Expression) semanticObject); \n\t\t\t\t context == grammarAccess.getMultiplicationAccess().getMultiplicationLeftAction_1_0_1() ||\n\t\t\t\t context == grammarAccess.getUnaryExpressionRule() ||\n\t\t\t\t context == grammarAccess.getExponentRule() ||\n\t\t\t\t context == grammarAccess.getExponentAccess().getExponentLeftAction_1_0() ||\n\t\t\t\t context == grammarAccess.getPrimaryRule()) {\n\t\t\t\t\tsequence_UnaryExpression_Factorial(context, (Factorial) semanticObject); \n\t\t\t\t context == grammarAccess.getMultiplicationAccess().getMultiplicationLeftAction_1_0_1() ||\n\t\t\t\t context == grammarAccess.getUnaryExpressionRule() ||\n\t\t\t\t context == grammarAccess.getExponentRule() ||\n\t\t\t\t context == grammarAccess.getExponentAccess().getExponentLeftAction_1_0() ||\n\t\t\t\t context == grammarAccess.getPrimaryRule()) {\n\t\t\t\t\tsequence_Primary_Float(context, (org.eclipse.iee.translator.jmole.math.math.Float) semanticObject); \n\t\t\t\t\tsequence_Formula_Formula(context, (Formula) semanticObject); \n\t\t\t\t context == grammarAccess.getMultiplicationAccess().getMultiplicationLeftAction_1_0_1() ||\n\t\t\t\t context == grammarAccess.getUnaryExpressionRule() ||\n\t\t\t\t context == grammarAccess.getExponentRule() ||\n\t\t\t\t context == grammarAccess.getExponentAccess().getExponentLeftAction_1_0() ||\n\t\t\t\t context == grammarAccess.getPrimaryRule()) {\n\t\t\t\t\tsequence_Primary_Function(context, (Function) semanticObject); \n\t\t\t\t\tsequence_FunctionDefinition_FunctionDefinition(context, (FunctionDefinition) semanticObject); \n\t\t\tcase MathPackage.INTERVAL:\n\t\t\t\t context == grammarAccess.getMultiplicationAccess().getMultiplicationLeftAction_1_0_1() ||\n\t\t\t\t context == grammarAccess.getUnaryExpressionRule() ||\n\t\t\t\t context == grammarAccess.getExponentRule() ||\n\t\t\t\t context == grammarAccess.getExponentAccess().getExponentLeftAction_1_0() ||\n\t\t\t\t context == grammarAccess.getPrimaryRule()) {\n\t\t\t\t\tsequence_UnaryExpression_Interval(context, (Interval) semanticObject); \n\t\t\tcase MathPackage.INVERT:\n\t\t\t\t context == grammarAccess.getMultiplicationAccess().getMultiplicationLeftAction_1_0_1() ||\n\t\t\t\t context == grammarAccess.getUnaryExpressionRule() ||\n\t\t\t\t context == grammarAccess.getExponentRule() ||\n\t\t\t\t context == grammarAccess.getExponentAccess().getExponentLeftAction_1_0() ||\n\t\t\t\t context == grammarAccess.getPrimaryRule()) {\n\t\t\t\t\tsequence_UnaryExpression_Invert(context, (Invert) semanticObject); \n\t\t\tcase MathPackage.MATRIX_DEFINITION:\n\t\t\t\tif(context == grammarAccess.getMatrixDefinitionRule()) {\n\t\t\t\t\tsequence_MatrixDefinition_MatrixDefinition(context, (MatrixDefinition) semanticObject); \n\t\t\t\t\tsequence_MatrixRow_MatrixRow(context, (MatrixRow) semanticObject); \n\t\t\t\t context == grammarAccess.getMultiplicationAccess().getMultiplicationLeftAction_1_0_1() ||\n\t\t\t\t context == grammarAccess.getUnaryExpressionRule() ||\n\t\t\t\t context == grammarAccess.getExponentRule() ||\n\t\t\t\t context == grammarAccess.getExponentAccess().getExponentLeftAction_1_0() ||\n\t\t\t\t context == grammarAccess.getPrimaryRule()) {\n\t\t\t\t\tsequence_Multiplication_Modulo(context, (Modulo) semanticObject); \n\t\t\t\t context == grammarAccess.getMultiplicationAccess().getMultiplicationLeftAction_1_0_1() ||\n\t\t\t\t context == grammarAccess.getUnaryExpressionRule() ||\n\t\t\t\t context == grammarAccess.getExponentRule() ||\n\t\t\t\t context == grammarAccess.getExponentAccess().getExponentLeftAction_1_0() ||\n\t\t\t\t context == grammarAccess.getPrimaryRule()) {\n\t\t\t\t\tsequence_Multiplication_Multiplication(context, (Multiplication) semanticObject); \n\t\t\t\t\tsequence_Statement_Statement(context, (Statement) semanticObject); \n\t\t\t\t context == grammarAccess.getMultiplicationAccess().getMultiplicationLeftAction_1_0_1() ||\n\t\t\t\t context == grammarAccess.getUnaryExpressionRule() ||\n\t\t\t\t context == grammarAccess.getExponentRule() ||\n\t\t\t\t context == grammarAccess.getExponentAccess().getExponentLeftAction_1_0() ||\n\t\t\t\t context == grammarAccess.getPrimaryRule()) {\n\t\t\t\t\tsequence_Addition_Subtraction(context, (Subtraction) semanticObject); \n\t\t\t\t context == grammarAccess.getMultiplicationAccess().getMultiplicationLeftAction_1_0_1() ||\n\t\t\t\t context == grammarAccess.getUnaryExpressionRule() ||\n\t\t\t\t context == grammarAccess.getExponentRule() ||\n\t\t\t\t context == grammarAccess.getExponentAccess().getExponentLeftAction_1_0() ||\n\t\t\t\t context == grammarAccess.getPrimaryRule()) {\n\t\t\t\t\tsequence_Primary_Variable(context, (Variable) semanticObject); \n\tprotected void sequence_Addition_Addition(EObject context, Addition semanticObject) {\n\tprotected void sequence_Addition_Subtraction(EObject context, Subtraction semanticObject) {\n\t/**\n\t * Constraint:\n\t * (variable=MATH_NAME value=Formula)\n\t *\n\t * Features:\n\t * variable[1, 1]\n\t * value[1, 1]\n\t */\n\tprotected void sequence_Assignment_Assignment(EObject context, Assignment semanticObject) {\n\t\tif(errorAcceptor != null) {\n\t\t\tif(transientValues.isValueTransient(semanticObject, MathPackage.Literals.ASSIGNMENT__VARIABLE) == ValueTransient.YES)\n\t\t\t\terrorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, MathPackage.Literals.ASSIGNMENT__VARIABLE));\n\t\t\tif(transientValues.isValueTransient(semanticObject, MathPackage.Literals.ASSIGNMENT__VALUE) == ValueTransient.YES)\n\t\t\t\terrorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, MathPackage.Literals.ASSIGNMENT__VALUE));\n\t\t}\n\t\tINodesForEObjectProvider nodes = createNodeProvider(semanticObject);\n\t\tSequenceFeeder feeder = createSequencerFeeder(semanticObject, nodes);\n\t\tfeeder.accept(grammarAccess.getAssignmentAccess().getVariableMATH_NAMETerminalRuleCall_0_0(), semanticObject.getVariable());\n\t\tfeeder.accept(grammarAccess.getAssignmentAccess().getValueFormulaParserRuleCall_2_0(), semanticObject.getValue());\n\t\tfeeder.finish();\n\t}\n\t\n\t\n\tprotected void sequence_Exponent_Exponent(EObject context, Exponent semanticObject) {\n\tprotected void sequence_Formula_Formula(EObject context, Formula semanticObject) {\n\tprotected void sequence_FunctionDefinition_FunctionDefinition(EObject context, FunctionDefinition semanticObject) {\n\tprotected void sequence_Function_Expression(EObject context, Expression semanticObject) {\n\t * (name=MATH_NAME (rows+=MatrixRow rows+=MatrixRow*)?)\n\t * name[1, 1]\n\t * rows[0, *]\n\tprotected void sequence_MatrixDefinition_MatrixDefinition(EObject context, MatrixDefinition semanticObject) {\n\tprotected void sequence_MatrixRow_MatrixRow(EObject context, MatrixRow semanticObject) {\n\tprotected void sequence_Multiplication_Division(EObject context, Division semanticObject) {\n\tprotected void sequence_Multiplication_Modulo(EObject context, Modulo semanticObject) {\n\tprotected void sequence_Multiplication_Multiplication(EObject context, Multiplication semanticObject) {\n\tprotected void sequence_Primary_Float(EObject context, org.eclipse.iee.translator.jmole.math.math.Float semanticObject) {\n\tprotected void sequence_Primary_Function(EObject context, Function semanticObject) {\n\tprotected void sequence_Primary_Variable(EObject context, Variable semanticObject) {\n\t * (functionDefinition=FunctionDefinition | matrixDefinition=MatrixDefinition | assignment=Assignment | formula=Formula)\n\t * EXCLUDE_IF_SET matrixDefinition\n\t * EXCLUDE_IF_SET assignment\n\t * matrixDefinition[0, 1]\n\t * EXCLUDE_IF_SET assignment\n\t * assignment[0, 1]\n\t * EXCLUDE_IF_SET matrixDefinition\n\t * formula[0, 1]\n\t * EXCLUDE_IF_SET matrixDefinition\n\t * EXCLUDE_IF_SET assignment\n\tprotected void sequence_Statement_Statement(EObject context, Statement semanticObject) {\n\tprotected void sequence_UnaryExpression_Factorial(EObject context, Factorial semanticObject) {\n\t * ((openingBracket='[' | openingBracket='(') ceil=UnaryExpression floor=UnaryExpression (closingBracket=']' | closingBracket=')'))\n\t * openingBracket[0, 2]\n\t * ceil[1, 1]\n\t * floor[1, 1]\n\t * closingBracket[0, 2]\n\tprotected void sequence_UnaryExpression_Interval(EObject context, Interval semanticObject) {\n\t * expression=UnaryExpression\n\t * expression[1, 1]\n\tprotected void sequence_UnaryExpression_Invert(EObject context, Invert semanticObject) {\n\t\tgenericSequencer.createSequence(context, semanticObject);", "old_methods": [ { "arguments": [ "EObject context", " Addition semanticObject" ], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/serializer/AbstractMathSemanticSequencer.java", "implementation": "protected void sequence_Addition_Subtraction(EObject context, Subtraction semanticObject) {\n\t/**\n\t * Constraint:\n\t * (variable=MATH_NAME value=Formula)\n\t *\n\t * Features:\n\t * variable[1, 1]\n\t * value[1, 1]\n\t */\n\tprotected void sequence_Assignment_Assignment(EObject context, Assignment semanticObject) {\n\t\tif(errorAcceptor != null) {\n\t\t\tif(transientValues.isValueTransient(semanticObject, MathPackage.Literals.ASSIGNMENT__VARIABLE) == ValueTransient.YES)\n\t\t\t\terrorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, MathPackage.Literals.ASSIGNMENT__VARIABLE));\n\t\t\tif(transientValues.isValueTransient(semanticObject, MathPackage.Literals.ASSIGNMENT__VALUE) == ValueTransient.YES)\n\t\t\t\terrorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, MathPackage.Literals.ASSIGNMENT__VALUE));", "signature": "void sequence_Addition_Addition(EObject context, Addition semanticObject)" } ], "patch": "@@ -4,24 +4,32 @@\n import com.google.inject.Provider;\n import org.eclipse.emf.ecore.EObject;\n import org.eclipse.iee.translator.jmole.math.math.Addition;\n-import org.eclipse.iee.translator.jmole.math.math.Assignment;\n import org.eclipse.iee.translator.jmole.math.math.Division;\n import org.eclipse.iee.translator.jmole.math.math.Exponent;\n import org.eclipse.iee.translator.jmole.math.math.Expression;\n import org.eclipse.iee.translator.jmole.math.math.Factorial;\n import org.eclipse.iee.translator.jmole.math.math.Formula;\n import org.eclipse.iee.translator.jmole.math.math.Function;\n import org.eclipse.iee.translator.jmole.math.math.FunctionDefinition;\n-import org.eclipse.iee.translator.jmole.math.math.Interval;\n import org.eclipse.iee.translator.jmole.math.math.Invert;\n import org.eclipse.iee.translator.jmole.math.math.MathPackage;\n-import org.eclipse.iee.translator.jmole.math.math.MatrixDefinition;\n+import org.eclipse.iee.translator.jmole.math.math.Matrix;\n+import org.eclipse.iee.translator.jmole.math.math.MatrixAddition;\n+import org.eclipse.iee.translator.jmole.math.math.MatrixAssignment;\n+import org.eclipse.iee.translator.jmole.math.math.MatrixElement;\n+import org.eclipse.iee.translator.jmole.math.math.MatrixFormula;\n+import org.eclipse.iee.translator.jmole.math.math.MatrixMultiplication;\n import org.eclipse.iee.translator.jmole.math.math.MatrixRow;\n+import org.eclipse.iee.translator.jmole.math.math.MatrixSubtraction;\n+import org.eclipse.iee.translator.jmole.math.math.MatrixVariable;\n import org.eclipse.iee.translator.jmole.math.math.Modulo;\n import org.eclipse.iee.translator.jmole.math.math.Multiplication;\n+import org.eclipse.iee.translator.jmole.math.math.NewMatrix;\n import org.eclipse.iee.translator.jmole.math.math.Statement;\n import org.eclipse.iee.translator.jmole.math.math.Subtraction;\n+import org.eclipse.iee.translator.jmole.math.math.TransposeMatrix;\n import org.eclipse.iee.translator.jmole.math.math.Variable;\n+import org.eclipse.iee.translator.jmole.math.math.VariableAssignment;\n import org.eclipse.iee.translator.jmole.math.services.MathGrammarAccess;\n import org.eclipse.xtext.serializer.acceptor.ISemanticSequenceAcceptor;\n import org.eclipse.xtext.serializer.acceptor.SequenceFeeder;\n@@ -66,233 +74,317 @@ public void createSequence(EObject context, EObject semanticObject) {\n \t\t\t\tif(context == grammarAccess.getAdditionRule() ||\n \t\t\t\t context == grammarAccess.getAdditionAccess().getAdditionLeftAction_1_0_1() ||\n \t\t\t\t context == grammarAccess.getAdditionAccess().getSubtractionLeftAction_1_1_1() ||\n+\t\t\t\t context == grammarAccess.getExponentRule() ||\n+\t\t\t\t context == grammarAccess.getExponentAccess().getExponentLeftAction_1_0() ||\n \t\t\t\t context == grammarAccess.getMultiplicationRule() ||\n-\t\t\t\t context == grammarAccess.getMultiplicationAccess().getMultiplicationLeftAction_1_0_1() ||\n \t\t\t\t context == grammarAccess.getMultiplicationAccess().getDivisionLeftAction_1_1_1() ||\n \t\t\t\t context == grammarAccess.getMultiplicationAccess().getModuloLeftAction_1_2_1() ||\n-\t\t\t\t context == grammarAccess.getUnaryExpressionRule() ||\n-\t\t\t\t context == grammarAccess.getExponentRule() ||\n-\t\t\t\t context == grammarAccess.getExponentAccess().getExponentLeftAction_1_0() ||\n-\t\t\t\t context == grammarAccess.getPrimaryRule()) {\n-\t\t\t\t\tsequence_Addition_Addition(context, (Addition) semanticObject); \n-\t\t\t\t\treturn; \n-\t\t\t\t}\n-\t\t\t\telse break;\n-\t\t\tcase MathPackage.ASSIGNMENT:\n-\t\t\t\tif(context == grammarAccess.getAssignmentRule()) {\n-\t\t\t\t\tsequence_Assignment_Assignment(context, (Assignment) semanticObject); \n+\t\t\t\t context == grammarAccess.getMultiplicationAccess().getMultiplicationLeftAction_1_0_1() ||\n+\t\t\t\t context == grammarAccess.getPrimaryRule() ||\n+\t\t\t\t context == grammarAccess.getUnaryExpressionRule()) {\n+\t\t\t\t\tsequence_Addition(context, (Addition) semanticObject); \n \t\t\t\t\treturn; \n \t\t\t\t}\n \t\t\t\telse break;\n \t\t\tcase MathPackage.DIVISION:\n \t\t\t\tif(context == grammarAccess.getAdditionRule() ||\n \t\t\t\t context == grammarAccess.getAdditionAccess().getAdditionLeftAction_1_0_1() ||\n \t\t\t\t context == grammarAccess.getAdditionAccess().getSubtractionLeftAction_1_1_1() ||\n+\t\t\t\t context == grammarAccess.getExponentRule() ||\n+\t\t\t\t context == grammarAccess.getExponentAccess().getExponentLeftAction_1_0() ||\n \t\t\t\t context == grammarAccess.getMultiplicationRule() ||\n-\t\t\t\t context == grammarAccess.getMultiplicationAccess().getMultiplicationLeftAction_1_0_1() ||\n \t\t\t\t context == grammarAccess.getMultiplicationAccess().getDivisionLeftAction_1_1_1() ||\n \t\t\t\t context == grammarAccess.getMultiplicationAccess().getModuloLeftAction_1_2_1() ||\n-\t\t\t\t context == grammarAccess.getUnaryExpressionRule() ||\n-\t\t\t\t context == grammarAccess.getExponentRule() ||\n-\t\t\t\t context == grammarAccess.getExponentAccess().getExponentLeftAction_1_0() ||\n-\t\t\t\t context == grammarAccess.getPrimaryRule()) {\n-\t\t\t\t\tsequence_Multiplication_Division(context, (Division) semanticObject); \n+\t\t\t\t context == grammarAccess.getMultiplicationAccess().getMultiplicationLeftAction_1_0_1() ||\n+\t\t\t\t context == grammarAccess.getPrimaryRule() ||\n+\t\t\t\t context == grammarAccess.getUnaryExpressionRule()) {\n+\t\t\t\t\tsequence_Multiplication(context, (Division) semanticObject); \n \t\t\t\t\treturn; \n \t\t\t\t}\n \t\t\t\telse break;\n \t\t\tcase MathPackage.EXPONENT:\n \t\t\t\tif(context == grammarAccess.getAdditionRule() ||\n \t\t\t\t context == grammarAccess.getAdditionAccess().getAdditionLeftAction_1_0_1() ||\n \t\t\t\t context == grammarAccess.getAdditionAccess().getSubtractionLeftAction_1_1_1() ||\n+\t\t\t\t context == grammarAccess.getExponentRule() ||\n+\t\t\t\t context == grammarAccess.getExponentAccess().getExponentLeftAction_1_0() ||\n \t\t\t\t context == grammarAccess.getMultiplicationRule() ||\n-\t\t\t\t context == grammarAccess.getMultiplicationAccess().getMultiplicationLeftAction_1_0_1() ||\n \t\t\t\t context == grammarAccess.getMultiplicationAccess().getDivisionLeftAction_1_1_1() ||\n \t\t\t\t context == grammarAccess.getMultiplicationAccess().getModuloLeftAction_1_2_1() ||\n-\t\t\t\t context == grammarAccess.getUnaryExpressionRule() ||\n-\t\t\t\t context == grammarAccess.getExponentRule() ||\n-\t\t\t\t context == grammarAccess.getExponentAccess().getExponentLeftAction_1_0() ||\n-\t\t\t\t context == grammarAccess.getPrimaryRule()) {\n-\t\t\t\t\tsequence_Exponent_Exponent(context, (Exponent) semanticObject); \n+\t\t\t\t context == grammarAccess.getMultiplicationAccess().getMultiplicationLeftAction_1_0_1() ||\n+\t\t\t\t context == grammarAccess.getPrimaryRule() ||\n+\t\t\t\t context == grammarAccess.getUnaryExpressionRule()) {\n+\t\t\t\t\tsequence_Exponent(context, (Exponent) semanticObject); \n \t\t\t\t\treturn; \n \t\t\t\t}\n \t\t\t\telse break;\n \t\t\tcase MathPackage.EXPRESSION:\n \t\t\t\tif(context == grammarAccess.getFunctionRule()) {\n-\t\t\t\t\tsequence_Function_Expression(context, (Expression) semanticObject); \n+\t\t\t\t\tsequence_Function(context, (Expression) semanticObject); \n \t\t\t\t\treturn; \n \t\t\t\t}\n \t\t\t\telse break;\n \t\t\tcase MathPackage.FACTORIAL:\n \t\t\t\tif(context == grammarAccess.getAdditionRule() ||\n \t\t\t\t context == grammarAccess.getAdditionAccess().getAdditionLeftAction_1_0_1() ||\n \t\t\t\t context == grammarAccess.getAdditionAccess().getSubtractionLeftAction_1_1_1() ||\n+\t\t\t\t context == grammarAccess.getExponentRule() ||\n+\t\t\t\t context == grammarAccess.getExponentAccess().getExponentLeftAction_1_0() ||\n \t\t\t\t context == grammarAccess.getMultiplicationRule() ||\n-\t\t\t\t context == grammarAccess.getMultiplicationAccess().getMultiplicationLeftAction_1_0_1() ||\n \t\t\t\t context == grammarAccess.getMultiplicationAccess().getDivisionLeftAction_1_1_1() ||\n \t\t\t\t context == grammarAccess.getMultiplicationAccess().getModuloLeftAction_1_2_1() ||\n-\t\t\t\t context == grammarAccess.getUnaryExpressionRule() ||\n-\t\t\t\t context == grammarAccess.getExponentRule() ||\n-\t\t\t\t context == grammarAccess.getExponentAccess().getExponentLeftAction_1_0() ||\n-\t\t\t\t context == grammarAccess.getPrimaryRule()) {\n-\t\t\t\t\tsequence_UnaryExpression_Factorial(context, (Factorial) semanticObject); \n+\t\t\t\t context == grammarAccess.getMultiplicationAccess().getMultiplicationLeftAction_1_0_1() ||\n+\t\t\t\t context == grammarAccess.getPrimaryRule() ||\n+\t\t\t\t context == grammarAccess.getUnaryExpressionRule()) {\n+\t\t\t\t\tsequence_UnaryExpression(context, (Factorial) semanticObject); \n \t\t\t\t\treturn; \n \t\t\t\t}\n \t\t\t\telse break;\n \t\t\tcase MathPackage.FLOAT:\n \t\t\t\tif(context == grammarAccess.getAdditionRule() ||\n \t\t\t\t context == grammarAccess.getAdditionAccess().getAdditionLeftAction_1_0_1() ||\n \t\t\t\t context == grammarAccess.getAdditionAccess().getSubtractionLeftAction_1_1_1() ||\n+\t\t\t\t context == grammarAccess.getExponentRule() ||\n+\t\t\t\t context == grammarAccess.getExponentAccess().getExponentLeftAction_1_0() ||\n \t\t\t\t context == grammarAccess.getMultiplicationRule() ||\n-\t\t\t\t context == grammarAccess.getMultiplicationAccess().getMultiplicationLeftAction_1_0_1() ||\n \t\t\t\t context == grammarAccess.getMultiplicationAccess().getDivisionLeftAction_1_1_1() ||\n \t\t\t\t context == grammarAccess.getMultiplicationAccess().getModuloLeftAction_1_2_1() ||\n-\t\t\t\t context == grammarAccess.getUnaryExpressionRule() ||\n-\t\t\t\t context == grammarAccess.getExponentRule() ||\n-\t\t\t\t context == grammarAccess.getExponentAccess().getExponentLeftAction_1_0() ||\n-\t\t\t\t context == grammarAccess.getPrimaryRule()) {\n-\t\t\t\t\tsequence_Primary_Float(context, (org.eclipse.iee.translator.jmole.math.math.Float) semanticObject); \n+\t\t\t\t context == grammarAccess.getMultiplicationAccess().getMultiplicationLeftAction_1_0_1() ||\n+\t\t\t\t context == grammarAccess.getPrimaryRule() ||\n+\t\t\t\t context == grammarAccess.getUnaryExpressionRule()) {\n+\t\t\t\t\tsequence_Primary(context, (org.eclipse.iee.translator.jmole.math.math.Float) semanticObject); \n \t\t\t\t\treturn; \n \t\t\t\t}\n \t\t\t\telse break;\n \t\t\tcase MathPackage.FORMULA:\n \t\t\t\tif(context == grammarAccess.getFormulaRule()) {\n-\t\t\t\t\tsequence_Formula_Formula(context, (Formula) semanticObject); \n+\t\t\t\t\tsequence_Formula(context, (Formula) semanticObject); \n \t\t\t\t\treturn; \n \t\t\t\t}\n \t\t\t\telse break;\n \t\t\tcase MathPackage.FUNCTION:\n \t\t\t\tif(context == grammarAccess.getAdditionRule() ||\n \t\t\t\t context == grammarAccess.getAdditionAccess().getAdditionLeftAction_1_0_1() ||\n \t\t\t\t context == grammarAccess.getAdditionAccess().getSubtractionLeftAction_1_1_1() ||\n+\t\t\t\t context == grammarAccess.getExponentRule() ||\n+\t\t\t\t context == grammarAccess.getExponentAccess().getExponentLeftAction_1_0() ||\n \t\t\t\t context == grammarAccess.getMultiplicationRule() ||\n-\t\t\t\t context == grammarAccess.getMultiplicationAccess().getMultiplicationLeftAction_1_0_1() ||\n \t\t\t\t context == grammarAccess.getMultiplicationAccess().getDivisionLeftAction_1_1_1() ||\n \t\t\t\t context == grammarAccess.getMultiplicationAccess().getModuloLeftAction_1_2_1() ||\n-\t\t\t\t context == grammarAccess.getUnaryExpressionRule() ||\n-\t\t\t\t context == grammarAccess.getExponentRule() ||\n-\t\t\t\t context == grammarAccess.getExponentAccess().getExponentLeftAction_1_0() ||\n-\t\t\t\t context == grammarAccess.getPrimaryRule()) {\n-\t\t\t\t\tsequence_Primary_Function(context, (Function) semanticObject); \n+\t\t\t\t context == grammarAccess.getMultiplicationAccess().getMultiplicationLeftAction_1_0_1() ||\n+\t\t\t\t context == grammarAccess.getPrimaryRule() ||\n+\t\t\t\t context == grammarAccess.getUnaryExpressionRule()) {\n+\t\t\t\t\tsequence_Primary(context, (Function) semanticObject); \n \t\t\t\t\treturn; \n \t\t\t\t}\n \t\t\t\telse break;\n \t\t\tcase MathPackage.FUNCTION_DEFINITION:\n \t\t\t\tif(context == grammarAccess.getFunctionDefinitionRule()) {\n-\t\t\t\t\tsequence_FunctionDefinition_FunctionDefinition(context, (FunctionDefinition) semanticObject); \n+\t\t\t\t\tsequence_FunctionDefinition(context, (FunctionDefinition) semanticObject); \n \t\t\t\t\treturn; \n \t\t\t\t}\n \t\t\t\telse break;\n-\t\t\tcase MathPackage.INTERVAL:\n+\t\t\tcase MathPackage.INVERT:\n \t\t\t\tif(context == grammarAccess.getAdditionRule() ||\n \t\t\t\t context == grammarAccess.getAdditionAccess().getAdditionLeftAction_1_0_1() ||\n \t\t\t\t context == grammarAccess.getAdditionAccess().getSubtractionLeftAction_1_1_1() ||\n+\t\t\t\t context == grammarAccess.getExponentRule() ||\n+\t\t\t\t context == grammarAccess.getExponentAccess().getExponentLeftAction_1_0() ||\n \t\t\t\t context == grammarAccess.getMultiplicationRule() ||\n-\t\t\t\t context == grammarAccess.getMultiplicationAccess().getMultiplicationLeftAction_1_0_1() ||\n \t\t\t\t context == grammarAccess.getMultiplicationAccess().getDivisionLeftAction_1_1_1() ||\n \t\t\t\t context == grammarAccess.getMultiplicationAccess().getModuloLeftAction_1_2_1() ||\n-\t\t\t\t context == grammarAccess.getUnaryExpressionRule() ||\n-\t\t\t\t context == grammarAccess.getExponentRule() ||\n-\t\t\t\t context == grammarAccess.getExponentAccess().getExponentLeftAction_1_0() ||\n-\t\t\t\t context == grammarAccess.getPrimaryRule()) {\n-\t\t\t\t\tsequence_UnaryExpression_Interval(context, (Interval) semanticObject); \n+\t\t\t\t context == grammarAccess.getMultiplicationAccess().getMultiplicationLeftAction_1_0_1() ||\n+\t\t\t\t context == grammarAccess.getPrimaryRule() ||\n+\t\t\t\t context == grammarAccess.getUnaryExpressionRule()) {\n+\t\t\t\t\tsequence_UnaryExpression(context, (Invert) semanticObject); \n \t\t\t\t\treturn; \n \t\t\t\t}\n \t\t\t\telse break;\n-\t\t\tcase MathPackage.INVERT:\n+\t\t\tcase MathPackage.MATRIX:\n+\t\t\t\tif(context == grammarAccess.getMatrixRule()) {\n+\t\t\t\t\tsequence_Matrix(context, (Matrix) semanticObject); \n+\t\t\t\t\treturn; \n+\t\t\t\t}\n+\t\t\t\telse break;\n+\t\t\tcase MathPackage.MATRIX_ADDITION:\n+\t\t\t\tif(context == grammarAccess.getMatrixAdditionRule() ||\n+\t\t\t\t context == grammarAccess.getMatrixAdditionAccess().getMatrixAdditionLeftAction_1_0_1() ||\n+\t\t\t\t context == grammarAccess.getMatrixAdditionAccess().getMatrixSubtractionLeftAction_1_1_1() ||\n+\t\t\t\t context == grammarAccess.getMatrixMultiplicationRule() ||\n+\t\t\t\t context == grammarAccess.getMatrixMultiplicationAccess().getMatrixMultiplicationLeftAction_1_0_1() ||\n+\t\t\t\t context == grammarAccess.getMatrixMultiplicationAccess().getMatrixMultiplicationLeftAction_1_1_1() ||\n+\t\t\t\t context == grammarAccess.getPrimaryMatrixRule()) {\n+\t\t\t\t\tsequence_MatrixAddition(context, (MatrixAddition) semanticObject); \n+\t\t\t\t\treturn; \n+\t\t\t\t}\n+\t\t\t\telse break;\n+\t\t\tcase MathPackage.MATRIX_ASSIGNMENT:\n+\t\t\t\tif(context == grammarAccess.getMatrixAssignmentRule()) {\n+\t\t\t\t\tsequence_MatrixAssignment(context, (MatrixAssignment) semanticObject); \n+\t\t\t\t\treturn; \n+\t\t\t\t}\n+\t\t\t\telse break;\n+\t\t\tcase MathPackage.MATRIX_ELEMENT:\n \t\t\t\tif(context == grammarAccess.getAdditionRule() ||\n \t\t\t\t context == grammarAccess.getAdditionAccess().getAdditionLeftAction_1_0_1() ||\n \t\t\t\t context == grammarAccess.getAdditionAccess().getSubtractionLeftAction_1_1_1() ||\n+\t\t\t\t context == grammarAccess.getExponentRule() ||\n+\t\t\t\t context == grammarAccess.getExponentAccess().getExponentLeftAction_1_0() ||\n \t\t\t\t context == grammarAccess.getMultiplicationRule() ||\n-\t\t\t\t context == grammarAccess.getMultiplicationAccess().getMultiplicationLeftAction_1_0_1() ||\n \t\t\t\t context == grammarAccess.getMultiplicationAccess().getDivisionLeftAction_1_1_1() ||\n \t\t\t\t context == grammarAccess.getMultiplicationAccess().getModuloLeftAction_1_2_1() ||\n-\t\t\t\t context == grammarAccess.getUnaryExpressionRule() ||\n-\t\t\t\t context == grammarAccess.getExponentRule() ||\n-\t\t\t\t context == grammarAccess.getExponentAccess().getExponentLeftAction_1_0() ||\n-\t\t\t\t context == grammarAccess.getPrimaryRule()) {\n-\t\t\t\t\tsequence_UnaryExpression_Invert(context, (Invert) semanticObject); \n+\t\t\t\t context == grammarAccess.getMultiplicationAccess().getMultiplicationLeftAction_1_0_1() ||\n+\t\t\t\t context == grammarAccess.getPrimaryRule() ||\n+\t\t\t\t context == grammarAccess.getUnaryExpressionRule()) {\n+\t\t\t\t\tsequence_Primary(context, (MatrixElement) semanticObject); \n+\t\t\t\t\treturn; \n+\t\t\t\t}\n+\t\t\t\telse break;\n+\t\t\tcase MathPackage.MATRIX_FORMULA:\n+\t\t\t\tif(context == grammarAccess.getMatrixFormulaRule()) {\n+\t\t\t\t\tsequence_MatrixFormula(context, (MatrixFormula) semanticObject); \n \t\t\t\t\treturn; \n \t\t\t\t}\n \t\t\t\telse break;\n-\t\t\tcase MathPackage.MATRIX_DEFINITION:\n-\t\t\t\tif(context == grammarAccess.getMatrixDefinitionRule()) {\n-\t\t\t\t\tsequence_MatrixDefinition_MatrixDefinition(context, (MatrixDefinition) semanticObject); \n+\t\t\tcase MathPackage.MATRIX_MULTIPLICATION:\n+\t\t\t\tif(context == grammarAccess.getMatrixAdditionRule() ||\n+\t\t\t\t context == grammarAccess.getMatrixAdditionAccess().getMatrixAdditionLeftAction_1_0_1() ||\n+\t\t\t\t context == grammarAccess.getMatrixAdditionAccess().getMatrixSubtractionLeftAction_1_1_1() ||\n+\t\t\t\t context == grammarAccess.getMatrixMultiplicationRule() ||\n+\t\t\t\t context == grammarAccess.getMatrixMultiplicationAccess().getMatrixMultiplicationLeftAction_1_0_1() ||\n+\t\t\t\t context == grammarAccess.getMatrixMultiplicationAccess().getMatrixMultiplicationLeftAction_1_1_1() ||\n+\t\t\t\t context == grammarAccess.getPrimaryMatrixRule()) {\n+\t\t\t\t\tsequence_MatrixMultiplication(context, (MatrixMultiplication) semanticObject); \n \t\t\t\t\treturn; \n \t\t\t\t}\n \t\t\t\telse break;\n \t\t\tcase MathPackage.MATRIX_ROW:\n \t\t\t\tif(context == grammarAccess.getMatrixRowRule()) {\n-\t\t\t\t\tsequence_MatrixRow_MatrixRow(context, (MatrixRow) semanticObject); \n+\t\t\t\t\tsequence_MatrixRow(context, (MatrixRow) semanticObject); \n+\t\t\t\t\treturn; \n+\t\t\t\t}\n+\t\t\t\telse break;\n+\t\t\tcase MathPackage.MATRIX_SUBTRACTION:\n+\t\t\t\tif(context == grammarAccess.getMatrixAdditionRule() ||\n+\t\t\t\t context == grammarAccess.getMatrixAdditionAccess().getMatrixAdditionLeftAction_1_0_1() ||\n+\t\t\t\t context == grammarAccess.getMatrixAdditionAccess().getMatrixSubtractionLeftAction_1_1_1() ||\n+\t\t\t\t context == grammarAccess.getMatrixMultiplicationRule() ||\n+\t\t\t\t context == grammarAccess.getMatrixMultiplicationAccess().getMatrixMultiplicationLeftAction_1_0_1() ||\n+\t\t\t\t context == grammarAccess.getMatrixMultiplicationAccess().getMatrixMultiplicationLeftAction_1_1_1() ||\n+\t\t\t\t context == grammarAccess.getPrimaryMatrixRule()) {\n+\t\t\t\t\tsequence_MatrixAddition(context, (MatrixSubtraction) semanticObject); \n+\t\t\t\t\treturn; \n+\t\t\t\t}\n+\t\t\t\telse break;\n+\t\t\tcase MathPackage.MATRIX_VARIABLE:\n+\t\t\t\tif(context == grammarAccess.getMatrixAdditionRule() ||\n+\t\t\t\t context == grammarAccess.getMatrixAdditionAccess().getMatrixAdditionLeftAction_1_0_1() ||\n+\t\t\t\t context == grammarAccess.getMatrixAdditionAccess().getMatrixSubtractionLeftAction_1_1_1() ||\n+\t\t\t\t context == grammarAccess.getMatrixMultiplicationRule() ||\n+\t\t\t\t context == grammarAccess.getMatrixMultiplicationAccess().getMatrixMultiplicationLeftAction_1_0_1() ||\n+\t\t\t\t context == grammarAccess.getMatrixMultiplicationAccess().getMatrixMultiplicationLeftAction_1_1_1() ||\n+\t\t\t\t context == grammarAccess.getPrimaryMatrixRule()) {\n+\t\t\t\t\tsequence_PrimaryMatrix(context, (MatrixVariable) semanticObject); \n \t\t\t\t\treturn; \n \t\t\t\t}\n \t\t\t\telse break;\n \t\t\tcase MathPackage.MODULO:\n \t\t\t\tif(context == grammarAccess.getAdditionRule() ||\n \t\t\t\t context == grammarAccess.getAdditionAccess().getAdditionLeftAction_1_0_1() ||\n \t\t\t\t context == grammarAccess.getAdditionAccess().getSubtractionLeftAction_1_1_1() ||\n+\t\t\t\t context == grammarAccess.getExponentRule() ||\n+\t\t\t\t context == grammarAccess.getExponentAccess().getExponentLeftAction_1_0() ||\n \t\t\t\t context == grammarAccess.getMultiplicationRule() ||\n-\t\t\t\t context == grammarAccess.getMultiplicationAccess().getMultiplicationLeftAction_1_0_1() ||\n \t\t\t\t context == grammarAccess.getMultiplicationAccess().getDivisionLeftAction_1_1_1() ||\n \t\t\t\t context == grammarAccess.getMultiplicationAccess().getModuloLeftAction_1_2_1() ||\n-\t\t\t\t context == grammarAccess.getUnaryExpressionRule() ||\n-\t\t\t\t context == grammarAccess.getExponentRule() ||\n-\t\t\t\t context == grammarAccess.getExponentAccess().getExponentLeftAction_1_0() ||\n-\t\t\t\t context == grammarAccess.getPrimaryRule()) {\n-\t\t\t\t\tsequence_Multiplication_Modulo(context, (Modulo) semanticObject); \n+\t\t\t\t context == grammarAccess.getMultiplicationAccess().getMultiplicationLeftAction_1_0_1() ||\n+\t\t\t\t context == grammarAccess.getPrimaryRule() ||\n+\t\t\t\t context == grammarAccess.getUnaryExpressionRule()) {\n+\t\t\t\t\tsequence_Multiplication(context, (Modulo) semanticObject); \n \t\t\t\t\treturn; \n \t\t\t\t}\n \t\t\t\telse break;\n \t\t\tcase MathPackage.MULTIPLICATION:\n \t\t\t\tif(context == grammarAccess.getAdditionRule() ||\n \t\t\t\t context == grammarAccess.getAdditionAccess().getAdditionLeftAction_1_0_1() ||\n \t\t\t\t context == grammarAccess.getAdditionAccess().getSubtractionLeftAction_1_1_1() ||\n+\t\t\t\t context == grammarAccess.getExponentRule() ||\n+\t\t\t\t context == grammarAccess.getExponentAccess().getExponentLeftAction_1_0() ||\n \t\t\t\t context == grammarAccess.getMultiplicationRule() ||\n-\t\t\t\t context == grammarAccess.getMultiplicationAccess().getMultiplicationLeftAction_1_0_1() ||\n \t\t\t\t context == grammarAccess.getMultiplicationAccess().getDivisionLeftAction_1_1_1() ||\n \t\t\t\t context == grammarAccess.getMultiplicationAccess().getModuloLeftAction_1_2_1() ||\n-\t\t\t\t context == grammarAccess.getUnaryExpressionRule() ||\n-\t\t\t\t context == grammarAccess.getExponentRule() ||\n-\t\t\t\t context == grammarAccess.getExponentAccess().getExponentLeftAction_1_0() ||\n-\t\t\t\t context == grammarAccess.getPrimaryRule()) {\n-\t\t\t\t\tsequence_Multiplication_Multiplication(context, (Multiplication) semanticObject); \n+\t\t\t\t context == grammarAccess.getMultiplicationAccess().getMultiplicationLeftAction_1_0_1() ||\n+\t\t\t\t context == grammarAccess.getPrimaryRule() ||\n+\t\t\t\t context == grammarAccess.getUnaryExpressionRule()) {\n+\t\t\t\t\tsequence_Multiplication(context, (Multiplication) semanticObject); \n+\t\t\t\t\treturn; \n+\t\t\t\t}\n+\t\t\t\telse break;\n+\t\t\tcase MathPackage.NEW_MATRIX:\n+\t\t\t\tif(context == grammarAccess.getMatrixAdditionRule() ||\n+\t\t\t\t context == grammarAccess.getMatrixAdditionAccess().getMatrixAdditionLeftAction_1_0_1() ||\n+\t\t\t\t context == grammarAccess.getMatrixAdditionAccess().getMatrixSubtractionLeftAction_1_1_1() ||\n+\t\t\t\t context == grammarAccess.getMatrixMultiplicationRule() ||\n+\t\t\t\t context == grammarAccess.getMatrixMultiplicationAccess().getMatrixMultiplicationLeftAction_1_0_1() ||\n+\t\t\t\t context == grammarAccess.getMatrixMultiplicationAccess().getMatrixMultiplicationLeftAction_1_1_1() ||\n+\t\t\t\t context == grammarAccess.getPrimaryMatrixRule()) {\n+\t\t\t\t\tsequence_PrimaryMatrix(context, (NewMatrix) semanticObject); \n \t\t\t\t\treturn; \n \t\t\t\t}\n \t\t\t\telse break;\n \t\t\tcase MathPackage.STATEMENT:\n \t\t\t\tif(context == grammarAccess.getStatementRule()) {\n-\t\t\t\t\tsequence_Statement_Statement(context, (Statement) semanticObject); \n+\t\t\t\t\tsequence_Statement(context, (Statement) semanticObject); \n \t\t\t\t\treturn; \n \t\t\t\t}\n \t\t\t\telse break;\n \t\t\tcase MathPackage.SUBTRACTION:\n \t\t\t\tif(context == grammarAccess.getAdditionRule() ||\n \t\t\t\t context == grammarAccess.getAdditionAccess().getAdditionLeftAction_1_0_1() ||\n \t\t\t\t context == grammarAccess.getAdditionAccess().getSubtractionLeftAction_1_1_1() ||\n+\t\t\t\t context == grammarAccess.getExponentRule() ||\n+\t\t\t\t context == grammarAccess.getExponentAccess().getExponentLeftAction_1_0() ||\n \t\t\t\t context == grammarAccess.getMultiplicationRule() ||\n-\t\t\t\t context == grammarAccess.getMultiplicationAccess().getMultiplicationLeftAction_1_0_1() ||\n \t\t\t\t context == grammarAccess.getMultiplicationAccess().getDivisionLeftAction_1_1_1() ||\n \t\t\t\t context == grammarAccess.getMultiplicationAccess().getModuloLeftAction_1_2_1() ||\n-\t\t\t\t context == grammarAccess.getUnaryExpressionRule() ||\n-\t\t\t\t context == grammarAccess.getExponentRule() ||\n-\t\t\t\t context == grammarAccess.getExponentAccess().getExponentLeftAction_1_0() ||\n-\t\t\t\t context == grammarAccess.getPrimaryRule()) {\n-\t\t\t\t\tsequence_Addition_Subtraction(context, (Subtraction) semanticObject); \n+\t\t\t\t context == grammarAccess.getMultiplicationAccess().getMultiplicationLeftAction_1_0_1() ||\n+\t\t\t\t context == grammarAccess.getPrimaryRule() ||\n+\t\t\t\t context == grammarAccess.getUnaryExpressionRule()) {\n+\t\t\t\t\tsequence_Addition(context, (Subtraction) semanticObject); \n+\t\t\t\t\treturn; \n+\t\t\t\t}\n+\t\t\t\telse break;\n+\t\t\tcase MathPackage.TRANSPOSE_MATRIX:\n+\t\t\t\tif(context == grammarAccess.getMatrixAdditionRule() ||\n+\t\t\t\t context == grammarAccess.getMatrixAdditionAccess().getMatrixAdditionLeftAction_1_0_1() ||\n+\t\t\t\t context == grammarAccess.getMatrixAdditionAccess().getMatrixSubtractionLeftAction_1_1_1() ||\n+\t\t\t\t context == grammarAccess.getMatrixMultiplicationRule() ||\n+\t\t\t\t context == grammarAccess.getMatrixMultiplicationAccess().getMatrixMultiplicationLeftAction_1_0_1() ||\n+\t\t\t\t context == grammarAccess.getMatrixMultiplicationAccess().getMatrixMultiplicationLeftAction_1_1_1() ||\n+\t\t\t\t context == grammarAccess.getPrimaryMatrixRule()) {\n+\t\t\t\t\tsequence_PrimaryMatrix(context, (TransposeMatrix) semanticObject); \n \t\t\t\t\treturn; \n \t\t\t\t}\n \t\t\t\telse break;\n \t\t\tcase MathPackage.VARIABLE:\n \t\t\t\tif(context == grammarAccess.getAdditionRule() ||\n \t\t\t\t context == grammarAccess.getAdditionAccess().getAdditionLeftAction_1_0_1() ||\n \t\t\t\t context == grammarAccess.getAdditionAccess().getSubtractionLeftAction_1_1_1() ||\n+\t\t\t\t context == grammarAccess.getExponentRule() ||\n+\t\t\t\t context == grammarAccess.getExponentAccess().getExponentLeftAction_1_0() ||\n \t\t\t\t context == grammarAccess.getMultiplicationRule() ||\n-\t\t\t\t context == grammarAccess.getMultiplicationAccess().getMultiplicationLeftAction_1_0_1() ||\n \t\t\t\t context == grammarAccess.getMultiplicationAccess().getDivisionLeftAction_1_1_1() ||\n \t\t\t\t context == grammarAccess.getMultiplicationAccess().getModuloLeftAction_1_2_1() ||\n-\t\t\t\t context == grammarAccess.getUnaryExpressionRule() ||\n-\t\t\t\t context == grammarAccess.getExponentRule() ||\n-\t\t\t\t context == grammarAccess.getExponentAccess().getExponentLeftAction_1_0() ||\n-\t\t\t\t context == grammarAccess.getPrimaryRule()) {\n-\t\t\t\t\tsequence_Primary_Variable(context, (Variable) semanticObject); \n+\t\t\t\t context == grammarAccess.getMultiplicationAccess().getMultiplicationLeftAction_1_0_1() ||\n+\t\t\t\t context == grammarAccess.getPrimaryRule() ||\n+\t\t\t\t context == grammarAccess.getUnaryExpressionRule()) {\n+\t\t\t\t\tsequence_Primary(context, (Variable) semanticObject); \n+\t\t\t\t\treturn; \n+\t\t\t\t}\n+\t\t\t\telse break;\n+\t\t\tcase MathPackage.VARIABLE_ASSIGNMENT:\n+\t\t\t\tif(context == grammarAccess.getVariableAssignmentRule()) {\n+\t\t\t\t\tsequence_VariableAssignment(context, (VariableAssignment) semanticObject); \n \t\t\t\t\treturn; \n \t\t\t\t}\n \t\t\t\telse break;\n@@ -308,7 +400,7 @@ public void createSequence(EObject context, EObject semanticObject) {\n \t * left[1, 1]\n \t * right[1, 1]\n \t */\n-\tprotected void sequence_Addition_Addition(EObject context, Addition semanticObject) {\n+\tprotected void sequence_Addition(EObject context, Addition semanticObject) {\n \t\tgenericSequencer.createSequence(context, semanticObject);\n \t}\n \t\n@@ -321,34 +413,11 @@ protected void sequence_Addition_Addition(EObject context, Addition semanticObje\n \t * left[1, 1]\n \t * right[1, 1]\n \t */\n-\tprotected void sequence_Addition_Subtraction(EObject context, Subtraction semanticObject) {\n+\tprotected void sequence_Addition(EObject context, Subtraction semanticObject) {\n \t\tgenericSequencer.createSequence(context, semanticObject);\n \t}\n \t\n \t\n-\t/**\n-\t * Constraint:\n-\t * (variable=MATH_NAME value=Formula)\n-\t *\n-\t * Features:\n-\t * variable[1, 1]\n-\t * value[1, 1]\n-\t */\n-\tprotected void sequence_Assignment_Assignment(EObject context, Assignment semanticObject) {\n-\t\tif(errorAcceptor != null) {\n-\t\t\tif(transientValues.isValueTransient(semanticObject, MathPackage.Literals.ASSIGNMENT__VARIABLE) == ValueTransient.YES)\n-\t\t\t\terrorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, MathPackage.Literals.ASSIGNMENT__VARIABLE));\n-\t\t\tif(transientValues.isValueTransient(semanticObject, MathPackage.Literals.ASSIGNMENT__VALUE) == ValueTransient.YES)\n-\t\t\t\terrorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, MathPackage.Literals.ASSIGNMENT__VALUE));\n-\t\t}\n-\t\tINodesForEObjectProvider nodes = createNodeProvider(semanticObject);\n-\t\tSequenceFeeder feeder = createSequencerFeeder(semanticObject, nodes);\n-\t\tfeeder.accept(grammarAccess.getAssignmentAccess().getVariableMATH_NAMETerminalRuleCall_0_0(), semanticObject.getVariable());\n-\t\tfeeder.accept(grammarAccess.getAssignmentAccess().getValueFormulaParserRuleCall_2_0(), semanticObject.getValue());\n-\t\tfeeder.finish();\n-\t}\n-\t\n-\t\n \t/**\n \t * Constraint:\n \t * (left=Exponent_Exponent_1_0 right=Primary)\n@@ -357,7 +426,7 @@ protected void sequence_Assignment_Assignment(EObject context, Assignment semant\n \t * left[1, 1]\n \t * right[1, 1]\n \t */\n-\tprotected void sequence_Exponent_Exponent(EObject context, Exponent semanticObject) {\n+\tprotected void sequence_Exponent(EObject context, Exponent semanticObject) {\n \t\tgenericSequencer.createSequence(context, semanticObject);\n \t}\n \t\n@@ -369,7 +438,7 @@ protected void sequence_Exponent_Exponent(EObject context, Exponent semanticObje\n \t * Features:\n \t * expression[1, 1]\n \t */\n-\tprotected void sequence_Formula_Formula(EObject context, Formula semanticObject) {\n+\tprotected void sequence_Formula(EObject context, Formula semanticObject) {\n \t\tif(errorAcceptor != null) {\n \t\t\tif(transientValues.isValueTransient(semanticObject, MathPackage.Literals.FORMULA__EXPRESSION) == ValueTransient.YES)\n \t\t\t\terrorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, MathPackage.Literals.FORMULA__EXPRESSION));\n@@ -389,7 +458,7 @@ protected void sequence_Formula_Formula(EObject context, Formula semanticObject)\n \t * function[1, 1]\n \t * formula[1, 1]\n \t */\n-\tprotected void sequence_FunctionDefinition_FunctionDefinition(EObject context, FunctionDefinition semanticObject) {\n+\tprotected void sequence_FunctionDefinition(EObject context, FunctionDefinition semanticObject) {\n \t\tif(errorAcceptor != null) {\n \t\t\tif(transientValues.isValueTransient(semanticObject, MathPackage.Literals.FUNCTION_DEFINITION__FUNCTION) == ValueTransient.YES)\n \t\t\t\terrorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, MathPackage.Literals.FUNCTION_DEFINITION__FUNCTION));\n@@ -412,20 +481,120 @@ protected void sequence_FunctionDefinition_FunctionDefinition(EObject context, F\n \t * name[1, 1]\n \t * parameters[0, *]\n \t */\n-\tprotected void sequence_Function_Expression(EObject context, Expression semanticObject) {\n+\tprotected void sequence_Function(EObject context, Expression semanticObject) {\n \t\tgenericSequencer.createSequence(context, semanticObject);\n \t}\n \t\n \t\n \t/**\n \t * Constraint:\n-\t * (name=MATH_NAME (rows+=MatrixRow rows+=MatrixRow*)?)\n+\t * (left=MatrixAddition_MatrixAddition_1_0_1 right=MatrixMultiplication)\n \t *\n \t * Features:\n-\t * name[1, 1]\n-\t * rows[0, *]\n+\t * left[1, 1]\n+\t * right[1, 1]\n+\t */\n+\tprotected void sequence_MatrixAddition(EObject context, MatrixAddition semanticObject) {\n+\t\tif(errorAcceptor != null) {\n+\t\t\tif(transientValues.isValueTransient(semanticObject, MathPackage.Literals.MATRIX_ADDITION__LEFT) == ValueTransient.YES)\n+\t\t\t\terrorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, MathPackage.Literals.MATRIX_ADDITION__LEFT));\n+\t\t\tif(transientValues.isValueTransient(semanticObject, MathPackage.Literals.MATRIX_ADDITION__RIGHT) == ValueTransient.YES)\n+\t\t\t\terrorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, MathPackage.Literals.MATRIX_ADDITION__RIGHT));\n+\t\t}\n+\t\tINodesForEObjectProvider nodes = createNodeProvider(semanticObject);\n+\t\tSequenceFeeder feeder = createSequencerFeeder(semanticObject, nodes);\n+\t\tfeeder.accept(grammarAccess.getMatrixAdditionAccess().getMatrixAdditionLeftAction_1_0_1(), semanticObject.getLeft());\n+\t\tfeeder.accept(grammarAccess.getMatrixAdditionAccess().getRightMatrixMultiplicationParserRuleCall_1_0_2_0(), semanticObject.getRight());\n+\t\tfeeder.finish();\n+\t}\n+\t\n+\t\n+\t/**\n+\t * Constraint:\n+\t * (left=MatrixAddition_MatrixSubtraction_1_1_1 right=MatrixMultiplication)\n+\t *\n+\t * Features:\n+\t * left[1, 1]\n+\t * right[1, 1]\n \t */\n-\tprotected void sequence_MatrixDefinition_MatrixDefinition(EObject context, MatrixDefinition semanticObject) {\n+\tprotected void sequence_MatrixAddition(EObject context, MatrixSubtraction semanticObject) {\n+\t\tif(errorAcceptor != null) {\n+\t\t\tif(transientValues.isValueTransient(semanticObject, MathPackage.Literals.MATRIX_SUBTRACTION__LEFT) == ValueTransient.YES)\n+\t\t\t\terrorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, MathPackage.Literals.MATRIX_SUBTRACTION__LEFT));\n+\t\t\tif(transientValues.isValueTransient(semanticObject, MathPackage.Literals.MATRIX_SUBTRACTION__RIGHT) == ValueTransient.YES)\n+\t\t\t\terrorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, MathPackage.Literals.MATRIX_SUBTRACTION__RIGHT));\n+\t\t}\n+\t\tINodesForEObjectProvider nodes = createNodeProvider(semanticObject);\n+\t\tSequenceFeeder feeder = createSequencerFeeder(semanticObject, nodes);\n+\t\tfeeder.accept(grammarAccess.getMatrixAdditionAccess().getMatrixSubtractionLeftAction_1_1_1(), semanticObject.getLeft());\n+\t\tfeeder.accept(grammarAccess.getMatrixAdditionAccess().getRightMatrixMultiplicationParserRuleCall_1_1_2_0(), semanticObject.getRight());\n+\t\tfeeder.finish();\n+\t}\n+\t\n+\t\n+\t/**\n+\t * Constraint:\n+\t * (variable=MATH_NAME value=MatrixFormula)\n+\t *\n+\t * Features:\n+\t * variable[1, 1]\n+\t * value[1, 1]\n+\t */\n+\tprotected void sequence_MatrixAssignment(EObject context, MatrixAssignment semanticObject) {\n+\t\tif(errorAcceptor != null) {\n+\t\t\tif(transientValues.isValueTransient(semanticObject, MathPackage.Literals.MATRIX_ASSIGNMENT__VARIABLE) == ValueTransient.YES)\n+\t\t\t\terrorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, MathPackage.Literals.MATRIX_ASSIGNMENT__VARIABLE));\n+\t\t\tif(transientValues.isValueTransient(semanticObject, MathPackage.Literals.MATRIX_ASSIGNMENT__VALUE) == ValueTransient.YES)\n+\t\t\t\terrorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, MathPackage.Literals.MATRIX_ASSIGNMENT__VALUE));\n+\t\t}\n+\t\tINodesForEObjectProvider nodes = createNodeProvider(semanticObject);\n+\t\tSequenceFeeder feeder = createSequencerFeeder(semanticObject, nodes);\n+\t\tfeeder.accept(grammarAccess.getMatrixAssignmentAccess().getVariableMATH_NAMETerminalRuleCall_1_0(), semanticObject.getVariable());\n+\t\tfeeder.accept(grammarAccess.getMatrixAssignmentAccess().getValueMatrixFormulaParserRuleCall_4_0(), semanticObject.getValue());\n+\t\tfeeder.finish();\n+\t}\n+\t\n+\t\n+\t/**\n+\t * Constraint:\n+\t * expression=MatrixAddition\n+\t *\n+\t * Features:\n+\t * expression[1, 1]\n+\t */\n+\tprotected void sequence_MatrixFormula(EObject context, MatrixFormula semanticObject) {\n+\t\tif(errorAcceptor != null) {\n+\t\t\tif(transientValues.isValueTransient(semanticObject, MathPackage.Literals.MATRIX_FORMULA__EXPRESSION) == ValueTransient.YES)\n+\t\t\t\terrorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, MathPackage.Literals.MATRIX_FORMULA__EXPRESSION));\n+\t\t}\n+\t\tINodesForEObjectProvider nodes = createNodeProvider(semanticObject);\n+\t\tSequenceFeeder feeder = createSequencerFeeder(semanticObject, nodes);\n+\t\tfeeder.accept(grammarAccess.getMatrixFormulaAccess().getExpressionMatrixAdditionParserRuleCall_0(), semanticObject.getExpression());\n+\t\tfeeder.finish();\n+\t}\n+\t\n+\t\n+\t/**\n+\t * Constraint:\n+\t * (\n+\t * (left=MatrixMultiplication_MatrixMultiplication_1_0_1 rightMatrix=PrimaryMatrix) | \n+\t * (left=MatrixMultiplication_MatrixMultiplication_1_1_1 rightScalar=Formula)\n+\t * )\n+\t *\n+\t * Features:\n+\t * left[0, 2]\n+\t * rightMatrix[0, 1]\n+\t * EXCLUDE_IF_UNSET left\n+\t * MANDATORY_IF_SET left\n+\t * EXCLUDE_IF_SET left\n+\t * EXCLUDE_IF_SET rightScalar\n+\t * rightScalar[0, 1]\n+\t * EXCLUDE_IF_UNSET left\n+\t * MANDATORY_IF_SET left\n+\t * EXCLUDE_IF_SET left\n+\t * EXCLUDE_IF_SET rightMatrix\n+\t */\n+\tprotected void sequence_MatrixMultiplication(EObject context, MatrixMultiplication semanticObject) {\n \t\tgenericSequencer.createSequence(context, semanticObject);\n \t}\n \t\n@@ -437,7 +606,19 @@ protected void sequence_MatrixDefinition_MatrixDefinition(EObject context, Matri\n \t * Features:\n \t * elements[0, *]\n \t */\n-\tprotected void sequence_MatrixRow_MatrixRow(EObject context, MatrixRow semanticObject) {\n+\tprotected void sequence_MatrixRow(EObject context, MatrixRow semanticObject) {\n+\t\tgenericSequencer.createSequence(context, semanticObject);\n+\t}\n+\t\n+\t\n+\t/**\n+\t * Constraint:\n+\t * (rows+=MatrixRow rows+=MatrixRow*)?\n+\t *\n+\t * Features:\n+\t * rows[0, *]\n+\t */\n+\tprotected void sequence_Matrix(EObject context, Matrix semanticObject) {\n \t\tgenericSequencer.createSequence(context, semanticObject);\n \t}\n \t\n@@ -450,7 +631,7 @@ protected void sequence_MatrixRow_MatrixRow(EObject context, MatrixRow semanticO\n \t * left[1, 1]\n \t * right[1, 1]\n \t */\n-\tprotected void sequence_Multiplication_Division(EObject context, Division semanticObject) {\n+\tprotected void sequence_Multiplication(EObject context, Division semanticObject) {\n \t\tgenericSequencer.createSequence(context, semanticObject);\n \t}\n \t\n@@ -463,7 +644,7 @@ protected void sequence_Multiplication_Division(EObject context, Division semant\n \t * left[1, 1]\n \t * right[1, 1]\n \t */\n-\tprotected void sequence_Multiplication_Modulo(EObject context, Modulo semanticObject) {\n+\tprotected void sequence_Multiplication(EObject context, Modulo semanticObject) {\n \t\tgenericSequencer.createSequence(context, semanticObject);\n \t}\n \t\n@@ -476,19 +657,76 @@ protected void sequence_Multiplication_Modulo(EObject context, Modulo semanticOb\n \t * left[1, 1]\n \t * right[1, 1]\n \t */\n-\tprotected void sequence_Multiplication_Multiplication(EObject context, Multiplication semanticObject) {\n+\tprotected void sequence_Multiplication(EObject context, Multiplication semanticObject) {\n \t\tgenericSequencer.createSequence(context, semanticObject);\n \t}\n \t\n \t\n+\t/**\n+\t * Constraint:\n+\t * name=MATH_NAME\n+\t *\n+\t * Features:\n+\t * name[1, 1]\n+\t */\n+\tprotected void sequence_PrimaryMatrix(EObject context, MatrixVariable semanticObject) {\n+\t\tif(errorAcceptor != null) {\n+\t\t\tif(transientValues.isValueTransient(semanticObject, MathPackage.Literals.MATRIX_VARIABLE__NAME) == ValueTransient.YES)\n+\t\t\t\terrorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, MathPackage.Literals.MATRIX_VARIABLE__NAME));\n+\t\t}\n+\t\tINodesForEObjectProvider nodes = createNodeProvider(semanticObject);\n+\t\tSequenceFeeder feeder = createSequencerFeeder(semanticObject, nodes);\n+\t\tfeeder.accept(grammarAccess.getPrimaryMatrixAccess().getNameMATH_NAMETerminalRuleCall_2_2_0(), semanticObject.getName());\n+\t\tfeeder.finish();\n+\t}\n+\t\n+\t\n+\t/**\n+\t * Constraint:\n+\t * matrix=Matrix\n+\t *\n+\t * Features:\n+\t * matrix[1, 1]\n+\t */\n+\tprotected void sequence_PrimaryMatrix(EObject context, NewMatrix semanticObject) {\n+\t\tif(errorAcceptor != null) {\n+\t\t\tif(transientValues.isValueTransient(semanticObject, MathPackage.Literals.NEW_MATRIX__MATRIX) == ValueTransient.YES)\n+\t\t\t\terrorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, MathPackage.Literals.NEW_MATRIX__MATRIX));\n+\t\t}\n+\t\tINodesForEObjectProvider nodes = createNodeProvider(semanticObject);\n+\t\tSequenceFeeder feeder = createSequencerFeeder(semanticObject, nodes);\n+\t\tfeeder.accept(grammarAccess.getPrimaryMatrixAccess().getMatrixMatrixParserRuleCall_0_1_0(), semanticObject.getMatrix());\n+\t\tfeeder.finish();\n+\t}\n+\t\n+\t\n+\t/**\n+\t * Constraint:\n+\t * name=MATH_NAME\n+\t *\n+\t * Features:\n+\t * name[1, 1]\n+\t */\n+\tprotected void sequence_PrimaryMatrix(EObject context, TransposeMatrix semanticObject) {\n+\t\tif(errorAcceptor != null) {\n+\t\t\tif(transientValues.isValueTransient(semanticObject, MathPackage.Literals.TRANSPOSE_MATRIX__NAME) == ValueTransient.YES)\n+\t\t\t\terrorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, MathPackage.Literals.TRANSPOSE_MATRIX__NAME));\n+\t\t}\n+\t\tINodesForEObjectProvider nodes = createNodeProvider(semanticObject);\n+\t\tSequenceFeeder feeder = createSequencerFeeder(semanticObject, nodes);\n+\t\tfeeder.accept(grammarAccess.getPrimaryMatrixAccess().getNameMATH_NAMETerminalRuleCall_1_2_0(), semanticObject.getName());\n+\t\tfeeder.finish();\n+\t}\n+\t\n+\t\n \t/**\n \t * Constraint:\n \t * value=Float\n \t *\n \t * Features:\n \t * value[1, 1]\n \t */\n-\tprotected void sequence_Primary_Float(EObject context, org.eclipse.iee.translator.jmole.math.math.Float semanticObject) {\n+\tprotected void sequence_Primary(EObject context, org.eclipse.iee.translator.jmole.math.math.Float semanticObject) {\n \t\tgenericSequencer.createSequence(context, semanticObject);\n \t}\n \t\n@@ -500,7 +738,21 @@ protected void sequence_Primary_Float(EObject context, org.eclipse.iee.translato\n \t * Features:\n \t * function[1, 1]\n \t */\n-\tprotected void sequence_Primary_Function(EObject context, Function semanticObject) {\n+\tprotected void sequence_Primary(EObject context, Function semanticObject) {\n+\t\tgenericSequencer.createSequence(context, semanticObject);\n+\t}\n+\t\n+\t\n+\t/**\n+\t * Constraint:\n+\t * (element=MATH_NAME row=INT column=INT)\n+\t *\n+\t * Features:\n+\t * element[1, 1]\n+\t * row[1, 1]\n+\t * column[1, 1]\n+\t */\n+\tprotected void sequence_Primary(EObject context, MatrixElement semanticObject) {\n \t\tgenericSequencer.createSequence(context, semanticObject);\n \t}\n \t\n@@ -512,34 +764,49 @@ protected void sequence_Primary_Function(EObject context, Function semanticObjec\n \t * Features:\n \t * name[1, 1]\n \t */\n-\tprotected void sequence_Primary_Variable(EObject context, Variable semanticObject) {\n+\tprotected void sequence_Primary(EObject context, Variable semanticObject) {\n \t\tgenericSequencer.createSequence(context, semanticObject);\n \t}\n \t\n \t\n \t/**\n \t * Constraint:\n-\t * (functionDefinition=FunctionDefinition | matrixDefinition=MatrixDefinition | assignment=Assignment | formula=Formula)\n+\t * (\n+\t * functionDefinition=FunctionDefinition | \n+\t * variableAssignment=VariableAssignment | \n+\t * formula=Formula | \n+\t * matrixAssignment=MatrixAssignment | \n+\t * matrixFormula=MatrixFormula\n+\t * )\n \t *\n \t * Features:\n \t * functionDefinition[0, 1]\n-\t * EXCLUDE_IF_SET matrixDefinition\n-\t * EXCLUDE_IF_SET assignment\n+\t * EXCLUDE_IF_SET variableAssignment\n \t * EXCLUDE_IF_SET formula\n-\t * matrixDefinition[0, 1]\n+\t * EXCLUDE_IF_SET matrixAssignment\n+\t * EXCLUDE_IF_SET matrixFormula\n+\t * variableAssignment[0, 1]\n \t * EXCLUDE_IF_SET functionDefinition\n-\t * EXCLUDE_IF_SET assignment\n \t * EXCLUDE_IF_SET formula\n-\t * assignment[0, 1]\n+\t * EXCLUDE_IF_SET matrixAssignment\n+\t * EXCLUDE_IF_SET matrixFormula\n+\t * formula[0, 1]\n \t * EXCLUDE_IF_SET functionDefinition\n-\t * EXCLUDE_IF_SET matrixDefinition\n+\t * EXCLUDE_IF_SET variableAssignment\n+\t * EXCLUDE_IF_SET matrixAssignment\n+\t * EXCLUDE_IF_SET matrixFormula\n+\t * matrixAssignment[0, 1]\n+\t * EXCLUDE_IF_SET functionDefinition\n+\t * EXCLUDE_IF_SET variableAssignment\n \t * EXCLUDE_IF_SET formula\n-\t * formula[0, 1]\n+\t * EXCLUDE_IF_SET matrixFormula\n+\t * matrixFormula[0, 1]\n \t * EXCLUDE_IF_SET functionDefinition\n-\t * EXCLUDE_IF_SET matrixDefinition\n-\t * EXCLUDE_IF_SET assignment\n+\t * EXCLUDE_IF_SET variableAssignment\n+\t * EXCLUDE_IF_SET formula\n+\t * EXCLUDE_IF_SET matrixAssignment\n \t */\n-\tprotected void sequence_Statement_Statement(EObject context, Statement semanticObject) {\n+\tprotected void sequence_Statement(EObject context, Statement semanticObject) {\n \t\tgenericSequencer.createSequence(context, semanticObject);\n \t}\n \t\n@@ -551,34 +818,42 @@ protected void sequence_Statement_Statement(EObject context, Statement semanticO\n \t * Features:\n \t * expression[1, 1]\n \t */\n-\tprotected void sequence_UnaryExpression_Factorial(EObject context, Factorial semanticObject) {\n+\tprotected void sequence_UnaryExpression(EObject context, Factorial semanticObject) {\n \t\tgenericSequencer.createSequence(context, semanticObject);\n \t}\n \t\n \t\n \t/**\n \t * Constraint:\n-\t * ((openingBracket='[' | openingBracket='(') ceil=UnaryExpression floor=UnaryExpression (closingBracket=']' | closingBracket=')'))\n+\t * expression=UnaryExpression\n \t *\n \t * Features:\n-\t * openingBracket[0, 2]\n-\t * ceil[1, 1]\n-\t * floor[1, 1]\n-\t * closingBracket[0, 2]\n+\t * expression[1, 1]\n \t */\n-\tprotected void sequence_UnaryExpression_Interval(EObject context, Interval semanticObject) {\n+\tprotected void sequence_UnaryExpression(EObject context, Invert semanticObject) {\n \t\tgenericSequencer.createSequence(context, semanticObject);\n \t}\n \t\n \t\n \t/**\n \t * Constraint:\n-\t * expression=UnaryExpression\n+\t * (variable=MATH_NAME value=Formula)\n \t *\n \t * Features:\n-\t * expression[1, 1]\n+\t * variable[1, 1]\n+\t * value[1, 1]\n \t */\n-\tprotected void sequence_UnaryExpression_Invert(EObject context, Invert semanticObject) {\n-\t\tgenericSequencer.createSequence(context, semanticObject);\n+\tprotected void sequence_VariableAssignment(EObject context, VariableAssignment semanticObject) {\n+\t\tif(errorAcceptor != null) {\n+\t\t\tif(transientValues.isValueTransient(semanticObject, MathPackage.Literals.VARIABLE_ASSIGNMENT__VARIABLE) == ValueTransient.YES)\n+\t\t\t\terrorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, MathPackage.Literals.VARIABLE_ASSIGNMENT__VARIABLE));\n+\t\t\tif(transientValues.isValueTransient(semanticObject, MathPackage.Literals.VARIABLE_ASSIGNMENT__VALUE) == ValueTransient.YES)\n+\t\t\t\terrorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, MathPackage.Literals.VARIABLE_ASSIGNMENT__VALUE));\n+\t\t}\n+\t\tINodesForEObjectProvider nodes = createNodeProvider(semanticObject);\n+\t\tSequenceFeeder feeder = createSequencerFeeder(semanticObject, nodes);\n+\t\tfeeder.accept(grammarAccess.getVariableAssignmentAccess().getVariableMATH_NAMETerminalRuleCall_0_0(), semanticObject.getVariable());\n+\t\tfeeder.accept(grammarAccess.getVariableAssignmentAccess().getValueFormulaParserRuleCall_2_0(), semanticObject.getValue());\n+\t\tfeeder.finish();\n \t}\n }", "raw_url": "https://github.com/iee/iee/raw/0f04d91efdf50447d8e84e926ef98d7462103dc0/org.eclipse.iee.translator.Jmole%2Forg.eclipse.iee.translator.jmole.math%2Fsrc-gen%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fjmole%2Fmath%2Fserializer%2FAbstractMathSemanticSequencer.java", "sha": "f0e39f6cce0ee6f7c21feb0c6fdaaa1408ec1a36", "status": "modified" }, { "additions": 59, "blob_url": "https://github.com/iee/iee/blob/0f04d91efdf50447d8e84e926ef98d7462103dc0/org.eclipse.iee.translator.Jmole%2Forg.eclipse.iee.translator.jmole.math%2Fsrc-gen%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fjmole%2Fmath%2Fserializer%2FAbstractMathSyntacticSequencer.java", "changes": 89, "contents_url": "https://api.github.com/repos/iee/iee/contents/org.eclipse.iee.translator.Jmole%2Forg.eclipse.iee.translator.jmole.math%2Fsrc-gen%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fjmole%2Fmath%2Fserializer%2FAbstractMathSyntacticSequencer.java?ref=0f04d91efdf50447d8e84e926ef98d7462103dc0", "deletions": 30, "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/serializer/AbstractMathSyntacticSequencer.java", "new_code": "import java.util.List;\nimport org.eclipse.xtext.serializer.analysis.ISyntacticSequencerPDAProvider.ISynNavigable;\n\tprotected AbstractElementAlias match_Matrix_CommaKeyword_1_2_q;\n\tprotected AbstractElementAlias match_PrimaryMatrix_LeftParenthesisKeyword_3_0_a;\n\tprotected AbstractElementAlias match_PrimaryMatrix_LeftParenthesisKeyword_3_0_p;\n\tprotected AbstractElementAlias match_Primary_LeftParenthesisKeyword_4_0_a;\n\tprotected AbstractElementAlias match_Primary_LeftParenthesisKeyword_4_0_p;\n\t\tmatch_Matrix_CommaKeyword_1_2_q = new TokenAlias(true, false, grammarAccess.getMatrixAccess().getCommaKeyword_1_2());\n\t\tmatch_PrimaryMatrix_LeftParenthesisKeyword_3_0_a = new TokenAlias(true, true, grammarAccess.getPrimaryMatrixAccess().getLeftParenthesisKeyword_3_0());\n\t\tmatch_PrimaryMatrix_LeftParenthesisKeyword_3_0_p = new TokenAlias(false, true, grammarAccess.getPrimaryMatrixAccess().getLeftParenthesisKeyword_3_0());\n\t\tmatch_Primary_LeftParenthesisKeyword_4_0_a = new TokenAlias(true, true, grammarAccess.getPrimaryAccess().getLeftParenthesisKeyword_4_0());\n\t\tmatch_Primary_LeftParenthesisKeyword_4_0_p = new TokenAlias(false, true, grammarAccess.getPrimaryAccess().getLeftParenthesisKeyword_4_0());\n\tprotected String getUnassignedRuleCallToken(EObject semanticObject, RuleCall ruleCall, INode node) {\n\t\tif (transition.getAmbiguousSyntaxes().isEmpty()) return;\n\t\tList<INode> transitionNodes = collectNodes(fromNode, toNode);\n\t\tfor (AbstractElementAlias syntax : transition.getAmbiguousSyntaxes()) {\n\t\t\tList<INode> syntaxNodes = getNodesFor(transitionNodes, syntax);\n\t\t\tif(match_Function_CommaKeyword_2_2_q.equals(syntax))\n\t\t\t\temit_Function_CommaKeyword_2_2_q(semanticObject, getLastNavigableState(), syntaxNodes);\n\t\t\telse if(match_MatrixRow_CommaKeyword_1_2_q.equals(syntax))\n\t\t\t\temit_MatrixRow_CommaKeyword_1_2_q(semanticObject, getLastNavigableState(), syntaxNodes);\n\t\t\telse if(match_Matrix_CommaKeyword_1_2_q.equals(syntax))\n\t\t\t\temit_Matrix_CommaKeyword_1_2_q(semanticObject, getLastNavigableState(), syntaxNodes);\n\t\t\telse if(match_PrimaryMatrix_LeftParenthesisKeyword_3_0_a.equals(syntax))\n\t\t\t\temit_PrimaryMatrix_LeftParenthesisKeyword_3_0_a(semanticObject, getLastNavigableState(), syntaxNodes);\n\t\t\telse if(match_PrimaryMatrix_LeftParenthesisKeyword_3_0_p.equals(syntax))\n\t\t\t\temit_PrimaryMatrix_LeftParenthesisKeyword_3_0_p(semanticObject, getLastNavigableState(), syntaxNodes);\n\t\t\telse if(match_Primary_LeftParenthesisKeyword_4_0_a.equals(syntax))\n\t\t\t\temit_Primary_LeftParenthesisKeyword_4_0_a(semanticObject, getLastNavigableState(), syntaxNodes);\n\t\t\telse if(match_Primary_LeftParenthesisKeyword_4_0_p.equals(syntax))\n\t\t\t\temit_Primary_LeftParenthesisKeyword_4_0_p(semanticObject, getLastNavigableState(), syntaxNodes);\n\t\t\telse acceptNodes(getLastNavigableState(), syntaxNodes);\n\t\t}\n\tprotected void emit_Function_CommaKeyword_2_2_q(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {\n\t\tacceptNodes(transition, nodes);\n\tprotected void emit_MatrixRow_CommaKeyword_1_2_q(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {\n\t\tacceptNodes(transition, nodes);\n\tprotected void emit_Matrix_CommaKeyword_1_2_q(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {\n\t\tacceptNodes(transition, nodes);\n\tprotected void emit_PrimaryMatrix_LeftParenthesisKeyword_3_0_a(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {\n\t\tacceptNodes(transition, nodes);\n\tprotected void emit_PrimaryMatrix_LeftParenthesisKeyword_3_0_p(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {\n\t\tacceptNodes(transition, nodes);\n\t}\n\t\n\t/**\n\t * Syntax:\n\t * '('*\n\t */\n\tprotected void emit_Primary_LeftParenthesisKeyword_4_0_a(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {\n\t\tacceptNodes(transition, nodes);\n\t}\n\t\n\t/**\n\t * Syntax:\n\t * '('+\n\t */\n\tprotected void emit_Primary_LeftParenthesisKeyword_4_0_p(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {\n\t\tacceptNodes(transition, nodes);", "new_methods": [ { "arguments": [ "EObject semanticObject", " RuleCall ruleCall", " INode node" ], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/serializer/AbstractMathSyntacticSequencer.java", "implementation": "if (transition.getAmbiguousSyntaxes().isEmpty()) return;\n\t\tList<INode> transitionNodes = collectNodes(fromNode, toNode);\n\t\tfor (AbstractElementAlias syntax : transition.getAmbiguousSyntaxes()) {\n\t\t\tList<INode> syntaxNodes = getNodesFor(transitionNodes, syntax);\n\t\t\tif(match_Function_CommaKeyword_2_2_q.equals(syntax))\n\t\t\t\temit_Function_CommaKeyword_2_2_q(semanticObject, getLastNavigableState(), syntaxNodes);\n\t\t\telse if(match_MatrixRow_CommaKeyword_1_2_q.equals(syntax))\n\t\t\t\temit_MatrixRow_CommaKeyword_1_2_q(semanticObject, getLastNavigableState(), syntaxNodes);\n\t\t\telse if(match_Matrix_CommaKeyword_1_2_q.equals(syntax))\n\t\t\t\temit_Matrix_CommaKeyword_1_2_q(semanticObject, getLastNavigableState(), syntaxNodes);\n\t\t\telse if(match_PrimaryMatrix_LeftParenthesisKeyword_3_0_a.equals(syntax))\n\t\t\t\temit_PrimaryMatrix_LeftParenthesisKeyword_3_0_a(semanticObject, getLastNavigableState(), syntaxNodes);\n\t\t\telse if(match_PrimaryMatrix_LeftParenthesisKeyword_3_0_p.equals(syntax))\n\t\t\t\temit_PrimaryMatrix_LeftParenthesisKeyword_3_0_p(semanticObject, getLastNavigableState(), syntaxNodes);\n\t\t\telse if(match_Primary_LeftParenthesisKeyword_4_0_a.equals(syntax))\n\t\t\t\temit_Primary_LeftParenthesisKeyword_4_0_a(semanticObject, getLastNavigableState(), syntaxNodes);\n\t\t\telse if(match_Primary_LeftParenthesisKeyword_4_0_p.equals(syntax))\n\t\t\t\temit_Primary_LeftParenthesisKeyword_4_0_p(semanticObject, getLastNavigableState(), syntaxNodes);\n\t\t\telse acceptNodes(getLastNavigableState(), syntaxNodes);", "signature": "String getUnassignedRuleCallToken(EObject semanticObject, RuleCall ruleCall, INode node)" }, { "arguments": [ "EObject semanticObject", " ISynNavigable transition", " List<INode> nodes" ], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/serializer/AbstractMathSyntacticSequencer.java", "implementation": "acceptNodes(transition, nodes);\n\tprotected void emit_MatrixRow_CommaKeyword_1_2_q(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {\n\t\tacceptNodes(transition, nodes);\n\tprotected void emit_Matrix_CommaKeyword_1_2_q(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {\n\t\tacceptNodes(transition, nodes);\n\tprotected void emit_PrimaryMatrix_LeftParenthesisKeyword_3_0_a(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {\n\t\tacceptNodes(transition, nodes);\n\tprotected void emit_PrimaryMatrix_LeftParenthesisKeyword_3_0_p(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {\n\t\tacceptNodes(transition, nodes);", "signature": "void emit_Function_CommaKeyword_2_2_q(EObject semanticObject, ISynNavigable transition, List<INode> nodes)" }, { "arguments": [ "EObject semanticObject", " ISynNavigable transition", " List<INode> nodes" ], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/serializer/AbstractMathSyntacticSequencer.java", "implementation": "acceptNodes(transition, nodes);", "signature": "void emit_Primary_LeftParenthesisKeyword_4_0_a(EObject semanticObject, ISynNavigable transition, List<INode> nodes)" } ], "old_code": "\tprotected AbstractElementAlias match_MatrixDefinition_CommaKeyword_3_2_q;\n\tprotected AbstractElementAlias match_Primary_LeftParenthesisKeyword_3_0_a;\n\tprotected AbstractElementAlias match_Primary_LeftParenthesisKeyword_3_0_p;\n\t\tmatch_MatrixDefinition_CommaKeyword_3_2_q = new TokenAlias(true, false, grammarAccess.getMatrixDefinitionAccess().getCommaKeyword_3_2());\n\t\tmatch_Primary_LeftParenthesisKeyword_3_0_a = new TokenAlias(true, true, grammarAccess.getPrimaryAccess().getLeftParenthesisKeyword_3_0());\n\t\tmatch_Primary_LeftParenthesisKeyword_3_0_p = new TokenAlias(false, true, grammarAccess.getPrimaryAccess().getLeftParenthesisKeyword_3_0());\n\tprotected String getUnassignedRuleCallToken(RuleCall ruleCall, INode node) {\n\t\tif (!transition.isSyntacticallyAmbiguous())\n\t\t\treturn;\n\t\tif(match_Function_CommaKeyword_2_2_q.equals(transition.getAmbiguousSyntax()))\n\t\t\temit_Function_CommaKeyword_2_2_q(semanticObject, transition, fromNode, toNode);\n\t\telse if(match_MatrixDefinition_CommaKeyword_3_2_q.equals(transition.getAmbiguousSyntax()))\n\t\t\temit_MatrixDefinition_CommaKeyword_3_2_q(semanticObject, transition, fromNode, toNode);\n\t\telse if(match_MatrixRow_CommaKeyword_1_2_q.equals(transition.getAmbiguousSyntax()))\n\t\t\temit_MatrixRow_CommaKeyword_1_2_q(semanticObject, transition, fromNode, toNode);\n\t\telse if(match_Primary_LeftParenthesisKeyword_3_0_a.equals(transition.getAmbiguousSyntax()))\n\t\t\temit_Primary_LeftParenthesisKeyword_3_0_a(semanticObject, transition, fromNode, toNode);\n\t\telse if(match_Primary_LeftParenthesisKeyword_3_0_p.equals(transition.getAmbiguousSyntax()))\n\t\t\temit_Primary_LeftParenthesisKeyword_3_0_p(semanticObject, transition, fromNode, toNode);\n\t\telse acceptNodes(transition, fromNode, toNode);\n\tprotected void emit_Function_CommaKeyword_2_2_q(EObject semanticObject, ISynTransition transition, INode fromNode, INode toNode) {\n\t\tacceptNodes(transition, fromNode, toNode);\n\tprotected void emit_MatrixDefinition_CommaKeyword_3_2_q(EObject semanticObject, ISynTransition transition, INode fromNode, INode toNode) {\n\t\tacceptNodes(transition, fromNode, toNode);\n\tprotected void emit_MatrixRow_CommaKeyword_1_2_q(EObject semanticObject, ISynTransition transition, INode fromNode, INode toNode) {\n\t\tacceptNodes(transition, fromNode, toNode);\n\tprotected void emit_Primary_LeftParenthesisKeyword_3_0_a(EObject semanticObject, ISynTransition transition, INode fromNode, INode toNode) {\n\t\tacceptNodes(transition, fromNode, toNode);\n\tprotected void emit_Primary_LeftParenthesisKeyword_3_0_p(EObject semanticObject, ISynTransition transition, INode fromNode, INode toNode) {\n\t\tacceptNodes(transition, fromNode, toNode);", "old_methods": [], "patch": "@@ -1,13 +1,15 @@\n package org.eclipse.iee.translator.jmole.math.serializer;\n \n import com.google.inject.Inject;\n+import java.util.List;\n import org.eclipse.emf.ecore.EObject;\n import org.eclipse.iee.translator.jmole.math.services.MathGrammarAccess;\n import org.eclipse.xtext.IGrammarAccess;\n import org.eclipse.xtext.RuleCall;\n import org.eclipse.xtext.nodemodel.INode;\n import org.eclipse.xtext.serializer.analysis.GrammarAlias.AbstractElementAlias;\n import org.eclipse.xtext.serializer.analysis.GrammarAlias.TokenAlias;\n+import org.eclipse.xtext.serializer.analysis.ISyntacticSequencerPDAProvider.ISynNavigable;\n import org.eclipse.xtext.serializer.analysis.ISyntacticSequencerPDAProvider.ISynTransition;\n import org.eclipse.xtext.serializer.sequencer.AbstractSyntacticSequencer;\n \n@@ -16,82 +18,109 @@ public class AbstractMathSyntacticSequencer extends AbstractSyntacticSequencer {\n \n \tprotected MathGrammarAccess grammarAccess;\n \tprotected AbstractElementAlias match_Function_CommaKeyword_2_2_q;\n-\tprotected AbstractElementAlias match_MatrixDefinition_CommaKeyword_3_2_q;\n \tprotected AbstractElementAlias match_MatrixRow_CommaKeyword_1_2_q;\n-\tprotected AbstractElementAlias match_Primary_LeftParenthesisKeyword_3_0_a;\n-\tprotected AbstractElementAlias match_Primary_LeftParenthesisKeyword_3_0_p;\n+\tprotected AbstractElementAlias match_Matrix_CommaKeyword_1_2_q;\n+\tprotected AbstractElementAlias match_PrimaryMatrix_LeftParenthesisKeyword_3_0_a;\n+\tprotected AbstractElementAlias match_PrimaryMatrix_LeftParenthesisKeyword_3_0_p;\n+\tprotected AbstractElementAlias match_Primary_LeftParenthesisKeyword_4_0_a;\n+\tprotected AbstractElementAlias match_Primary_LeftParenthesisKeyword_4_0_p;\n \t\n \t@Inject\n \tprotected void init(IGrammarAccess access) {\n \t\tgrammarAccess = (MathGrammarAccess) access;\n \t\tmatch_Function_CommaKeyword_2_2_q = new TokenAlias(true, false, grammarAccess.getFunctionAccess().getCommaKeyword_2_2());\n-\t\tmatch_MatrixDefinition_CommaKeyword_3_2_q = new TokenAlias(true, false, grammarAccess.getMatrixDefinitionAccess().getCommaKeyword_3_2());\n \t\tmatch_MatrixRow_CommaKeyword_1_2_q = new TokenAlias(true, false, grammarAccess.getMatrixRowAccess().getCommaKeyword_1_2());\n-\t\tmatch_Primary_LeftParenthesisKeyword_3_0_a = new TokenAlias(true, true, grammarAccess.getPrimaryAccess().getLeftParenthesisKeyword_3_0());\n-\t\tmatch_Primary_LeftParenthesisKeyword_3_0_p = new TokenAlias(false, true, grammarAccess.getPrimaryAccess().getLeftParenthesisKeyword_3_0());\n+\t\tmatch_Matrix_CommaKeyword_1_2_q = new TokenAlias(true, false, grammarAccess.getMatrixAccess().getCommaKeyword_1_2());\n+\t\tmatch_PrimaryMatrix_LeftParenthesisKeyword_3_0_a = new TokenAlias(true, true, grammarAccess.getPrimaryMatrixAccess().getLeftParenthesisKeyword_3_0());\n+\t\tmatch_PrimaryMatrix_LeftParenthesisKeyword_3_0_p = new TokenAlias(false, true, grammarAccess.getPrimaryMatrixAccess().getLeftParenthesisKeyword_3_0());\n+\t\tmatch_Primary_LeftParenthesisKeyword_4_0_a = new TokenAlias(true, true, grammarAccess.getPrimaryAccess().getLeftParenthesisKeyword_4_0());\n+\t\tmatch_Primary_LeftParenthesisKeyword_4_0_p = new TokenAlias(false, true, grammarAccess.getPrimaryAccess().getLeftParenthesisKeyword_4_0());\n \t}\n \t\n \t@Override\n-\tprotected String getUnassignedRuleCallToken(RuleCall ruleCall, INode node) {\n+\tprotected String getUnassignedRuleCallToken(EObject semanticObject, RuleCall ruleCall, INode node) {\n \t\treturn \"\";\n \t}\n \t\n \t\n \t@Override\n \tprotected void emitUnassignedTokens(EObject semanticObject, ISynTransition transition, INode fromNode, INode toNode) {\n-\t\tif (!transition.isSyntacticallyAmbiguous())\n-\t\t\treturn;\n-\t\tif(match_Function_CommaKeyword_2_2_q.equals(transition.getAmbiguousSyntax()))\n-\t\t\temit_Function_CommaKeyword_2_2_q(semanticObject, transition, fromNode, toNode);\n-\t\telse if(match_MatrixDefinition_CommaKeyword_3_2_q.equals(transition.getAmbiguousSyntax()))\n-\t\t\temit_MatrixDefinition_CommaKeyword_3_2_q(semanticObject, transition, fromNode, toNode);\n-\t\telse if(match_MatrixRow_CommaKeyword_1_2_q.equals(transition.getAmbiguousSyntax()))\n-\t\t\temit_MatrixRow_CommaKeyword_1_2_q(semanticObject, transition, fromNode, toNode);\n-\t\telse if(match_Primary_LeftParenthesisKeyword_3_0_a.equals(transition.getAmbiguousSyntax()))\n-\t\t\temit_Primary_LeftParenthesisKeyword_3_0_a(semanticObject, transition, fromNode, toNode);\n-\t\telse if(match_Primary_LeftParenthesisKeyword_3_0_p.equals(transition.getAmbiguousSyntax()))\n-\t\t\temit_Primary_LeftParenthesisKeyword_3_0_p(semanticObject, transition, fromNode, toNode);\n-\t\telse acceptNodes(transition, fromNode, toNode);\n+\t\tif (transition.getAmbiguousSyntaxes().isEmpty()) return;\n+\t\tList<INode> transitionNodes = collectNodes(fromNode, toNode);\n+\t\tfor (AbstractElementAlias syntax : transition.getAmbiguousSyntaxes()) {\n+\t\t\tList<INode> syntaxNodes = getNodesFor(transitionNodes, syntax);\n+\t\t\tif(match_Function_CommaKeyword_2_2_q.equals(syntax))\n+\t\t\t\temit_Function_CommaKeyword_2_2_q(semanticObject, getLastNavigableState(), syntaxNodes);\n+\t\t\telse if(match_MatrixRow_CommaKeyword_1_2_q.equals(syntax))\n+\t\t\t\temit_MatrixRow_CommaKeyword_1_2_q(semanticObject, getLastNavigableState(), syntaxNodes);\n+\t\t\telse if(match_Matrix_CommaKeyword_1_2_q.equals(syntax))\n+\t\t\t\temit_Matrix_CommaKeyword_1_2_q(semanticObject, getLastNavigableState(), syntaxNodes);\n+\t\t\telse if(match_PrimaryMatrix_LeftParenthesisKeyword_3_0_a.equals(syntax))\n+\t\t\t\temit_PrimaryMatrix_LeftParenthesisKeyword_3_0_a(semanticObject, getLastNavigableState(), syntaxNodes);\n+\t\t\telse if(match_PrimaryMatrix_LeftParenthesisKeyword_3_0_p.equals(syntax))\n+\t\t\t\temit_PrimaryMatrix_LeftParenthesisKeyword_3_0_p(semanticObject, getLastNavigableState(), syntaxNodes);\n+\t\t\telse if(match_Primary_LeftParenthesisKeyword_4_0_a.equals(syntax))\n+\t\t\t\temit_Primary_LeftParenthesisKeyword_4_0_a(semanticObject, getLastNavigableState(), syntaxNodes);\n+\t\t\telse if(match_Primary_LeftParenthesisKeyword_4_0_p.equals(syntax))\n+\t\t\t\temit_Primary_LeftParenthesisKeyword_4_0_p(semanticObject, getLastNavigableState(), syntaxNodes);\n+\t\t\telse acceptNodes(getLastNavigableState(), syntaxNodes);\n+\t\t}\n \t}\n \n \t/**\n \t * Syntax:\n \t * ','?\n \t */\n-\tprotected void emit_Function_CommaKeyword_2_2_q(EObject semanticObject, ISynTransition transition, INode fromNode, INode toNode) {\n-\t\tacceptNodes(transition, fromNode, toNode);\n+\tprotected void emit_Function_CommaKeyword_2_2_q(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {\n+\t\tacceptNodes(transition, nodes);\n \t}\n \t\n \t/**\n \t * Syntax:\n \t * ','?\n \t */\n-\tprotected void emit_MatrixDefinition_CommaKeyword_3_2_q(EObject semanticObject, ISynTransition transition, INode fromNode, INode toNode) {\n-\t\tacceptNodes(transition, fromNode, toNode);\n+\tprotected void emit_MatrixRow_CommaKeyword_1_2_q(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {\n+\t\tacceptNodes(transition, nodes);\n \t}\n \t\n \t/**\n \t * Syntax:\n \t * ','?\n \t */\n-\tprotected void emit_MatrixRow_CommaKeyword_1_2_q(EObject semanticObject, ISynTransition transition, INode fromNode, INode toNode) {\n-\t\tacceptNodes(transition, fromNode, toNode);\n+\tprotected void emit_Matrix_CommaKeyword_1_2_q(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {\n+\t\tacceptNodes(transition, nodes);\n \t}\n \t\n \t/**\n \t * Syntax:\n \t * '('*\n \t */\n-\tprotected void emit_Primary_LeftParenthesisKeyword_3_0_a(EObject semanticObject, ISynTransition transition, INode fromNode, INode toNode) {\n-\t\tacceptNodes(transition, fromNode, toNode);\n+\tprotected void emit_PrimaryMatrix_LeftParenthesisKeyword_3_0_a(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {\n+\t\tacceptNodes(transition, nodes);\n \t}\n \t\n \t/**\n \t * Syntax:\n \t * '('+\n \t */\n-\tprotected void emit_Primary_LeftParenthesisKeyword_3_0_p(EObject semanticObject, ISynTransition transition, INode fromNode, INode toNode) {\n-\t\tacceptNodes(transition, fromNode, toNode);\n+\tprotected void emit_PrimaryMatrix_LeftParenthesisKeyword_3_0_p(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {\n+\t\tacceptNodes(transition, nodes);\n+\t}\n+\t\n+\t/**\n+\t * Syntax:\n+\t * '('*\n+\t */\n+\tprotected void emit_Primary_LeftParenthesisKeyword_4_0_a(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {\n+\t\tacceptNodes(transition, nodes);\n+\t}\n+\t\n+\t/**\n+\t * Syntax:\n+\t * '('+\n+\t */\n+\tprotected void emit_Primary_LeftParenthesisKeyword_4_0_p(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {\n+\t\tacceptNodes(transition, nodes);\n \t}\n \t\n }", "raw_url": "https://github.com/iee/iee/raw/0f04d91efdf50447d8e84e926ef98d7462103dc0/org.eclipse.iee.translator.Jmole%2Forg.eclipse.iee.translator.jmole.math%2Fsrc-gen%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fjmole%2Fmath%2Fserializer%2FAbstractMathSyntacticSequencer.java", "sha": "c1ec1ad39d3431d46cabf52d79548e1ab87506c5", "status": "modified" }, { "additions": 578, "blob_url": "https://github.com/iee/iee/blob/0f04d91efdf50447d8e84e926ef98d7462103dc0/org.eclipse.iee.translator.Jmole%2Forg.eclipse.iee.translator.jmole.math%2Fsrc-gen%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fjmole%2Fmath%2Fservices%2FMathGrammarAccess.java", "changes": 856, "contents_url": "https://api.github.com/repos/iee/iee/contents/org.eclipse.iee.translator.Jmole%2Forg.eclipse.iee.translator.jmole.math%2Fsrc-gen%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fjmole%2Fmath%2Fservices%2FMathGrammarAccess.java?ref=0f04d91efdf50447d8e84e926ef98d7462103dc0", "deletions": 278, "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "new_code": "\t\tprivate final Assignment cVariableAssignmentAssignment_1 = (Assignment)cAlternatives.eContents().get(1);\n\t\tprivate final RuleCall cVariableAssignmentVariableAssignmentParserRuleCall_1_0 = (RuleCall)cVariableAssignmentAssignment_1.eContents().get(0);\n\t\tprivate final Assignment cFormulaAssignment_2 = (Assignment)cAlternatives.eContents().get(2);\n\t\tprivate final RuleCall cFormulaFormulaParserRuleCall_2_0 = (RuleCall)cFormulaAssignment_2.eContents().get(0);\n\t\tprivate final Assignment cMatrixAssignmentAssignment_3 = (Assignment)cAlternatives.eContents().get(3);\n\t\tprivate final RuleCall cMatrixAssignmentMatrixAssignmentParserRuleCall_3_0 = (RuleCall)cMatrixAssignmentAssignment_3.eContents().get(0);\n\t\tprivate final Assignment cMatrixFormulaAssignment_4 = (Assignment)cAlternatives.eContents().get(4);\n\t\tprivate final RuleCall cMatrixFormulaMatrixFormulaParserRuleCall_4_0 = (RuleCall)cMatrixFormulaAssignment_4.eContents().get(0);\n\t\t//\tfunctionDefinition=FunctionDefinition | variableAssignment=VariableAssignment | formula=Formula |\n\t\t//\tmatrixAssignment=MatrixAssignment | matrixFormula=MatrixFormula;\n\t\t//functionDefinition=FunctionDefinition | variableAssignment=VariableAssignment | formula=Formula |\n\t\t//matrixAssignment=MatrixAssignment | matrixFormula=MatrixFormula\n\t\t//variableAssignment=VariableAssignment\n\t\tpublic Assignment getVariableAssignmentAssignment_1() { return cVariableAssignmentAssignment_1; }\n\t\t//VariableAssignment\n\t\tpublic RuleCall getVariableAssignmentVariableAssignmentParserRuleCall_1_0() { return cVariableAssignmentVariableAssignmentParserRuleCall_1_0; }\n\t\tpublic Assignment getFormulaAssignment_2() { return cFormulaAssignment_2; }\n\t\tpublic RuleCall getFormulaFormulaParserRuleCall_2_0() { return cFormulaFormulaParserRuleCall_2_0; }\n\n\t\t//matrixAssignment=MatrixAssignment\n\t\tpublic Assignment getMatrixAssignmentAssignment_3() { return cMatrixAssignmentAssignment_3; }\n\n\t\t//MatrixAssignment\n\t\tpublic RuleCall getMatrixAssignmentMatrixAssignmentParserRuleCall_3_0() { return cMatrixAssignmentMatrixAssignmentParserRuleCall_3_0; }\n\n\t\t//matrixFormula=MatrixFormula\n\t\tpublic Assignment getMatrixFormulaAssignment_4() { return cMatrixFormulaAssignment_4; }\n\n\t\t//MatrixFormula\n\t\tpublic RuleCall getMatrixFormulaMatrixFormulaParserRuleCall_4_0() { return cMatrixFormulaMatrixFormulaParserRuleCall_4_0; }\n\tpublic class VariableAssignmentElements extends AbstractParserRuleElementFinder {\n\t\tprivate final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), \"VariableAssignment\");\n\t\t//VariableAssignment:\n\t\tprivate final Keyword cLeftParenthesisHyphenMinusKeyword_1_0 = (Keyword)cGroup_1.eContents().get(0);\n\t\tprivate final Keyword cRightParenthesisKeyword_1_3 = (Keyword)cGroup_1.eContents().get(3);\n\t\t//\tExponent | \"(-\" {Invert} expression=UnaryExpression \")\" | \"(\" {Factorial} expression=UnaryExpression \")!\";\n\t\t//Exponent | \"(-\" {Invert} expression=UnaryExpression \")\" | \"(\" {Factorial} expression=UnaryExpression \")!\"\n\t\t//\"(-\" {Invert} expression=UnaryExpression \")\"\n\t\t//\"(-\"\n\t\tpublic Keyword getLeftParenthesisHyphenMinusKeyword_1_0() { return cLeftParenthesisHyphenMinusKeyword_1_0; }\n\t\t//\")\"\n\t\tpublic Keyword getRightParenthesisKeyword_1_3() { return cRightParenthesisKeyword_1_3; }\n\n\t\tprivate final Action cMatrixElementAction_2_0 = (Action)cGroup_2.eContents().get(0);\n\t\tprivate final Assignment cElementAssignment_2_1 = (Assignment)cGroup_2.eContents().get(1);\n\t\tprivate final RuleCall cElementMATH_NAMETerminalRuleCall_2_1_0 = (RuleCall)cElementAssignment_2_1.eContents().get(0);\n\t\tprivate final Keyword cLeftSquareBracketKeyword_2_2 = (Keyword)cGroup_2.eContents().get(2);\n\t\tprivate final Assignment cRowAssignment_2_3 = (Assignment)cGroup_2.eContents().get(3);\n\t\tprivate final RuleCall cRowINTTerminalRuleCall_2_3_0 = (RuleCall)cRowAssignment_2_3.eContents().get(0);\n\t\tprivate final Keyword cRightSquareBracketKeyword_2_4 = (Keyword)cGroup_2.eContents().get(4);\n\t\tprivate final Keyword cLeftSquareBracketKeyword_2_5 = (Keyword)cGroup_2.eContents().get(5);\n\t\tprivate final Assignment cColumnAssignment_2_6 = (Assignment)cGroup_2.eContents().get(6);\n\t\tprivate final RuleCall cColumnINTTerminalRuleCall_2_6_0 = (RuleCall)cColumnAssignment_2_6.eContents().get(0);\n\t\tprivate final Keyword cRightSquareBracketKeyword_2_7 = (Keyword)cGroup_2.eContents().get(7);\n\t\tprivate final Action cFunctionAction_3_0 = (Action)cGroup_3.eContents().get(0);\n\t\tprivate final Assignment cFunctionAssignment_3_1 = (Assignment)cGroup_3.eContents().get(1);\n\t\tprivate final RuleCall cFunctionFunctionParserRuleCall_3_1_0 = (RuleCall)cFunctionAssignment_3_1.eContents().get(0);\n\t\tprivate final Group cGroup_4 = (Group)cAlternatives.eContents().get(4);\n\t\tprivate final Keyword cLeftParenthesisKeyword_4_0 = (Keyword)cGroup_4.eContents().get(0);\n\t\tprivate final RuleCall cAdditionParserRuleCall_4_1 = (RuleCall)cGroup_4.eContents().get(1);\n\t\tprivate final Keyword cRightParenthesisKeyword_4_2 = (Keyword)cGroup_4.eContents().get(2);\n\t\t//\t{Variable} name=MATH_NAME | {Float} value=Float | {MatrixElement} element=MATH_NAME \"[\" row=INT \"]\" \"[\" column=INT \"]\"\n\t\t//\t| {Function} function=Function | \"(\" Addition \")\";\n\t\t//{Variable} name=MATH_NAME | {Float} value=Float | {MatrixElement} element=MATH_NAME \"[\" row=INT \"]\" \"[\" column=INT \"]\" |\n\t\t//{Function} function=Function | \"(\" Addition \")\"\n\t\t//{MatrixElement} element=MATH_NAME \"[\" row=INT \"]\" \"[\" column=INT \"]\"\n\t\t//{MatrixElement}\n\t\tpublic Action getMatrixElementAction_2_0() { return cMatrixElementAction_2_0; }\n\n\t\t//element=MATH_NAME\n\t\tpublic Assignment getElementAssignment_2_1() { return cElementAssignment_2_1; }\n\n\t\t//MATH_NAME\n\t\tpublic RuleCall getElementMATH_NAMETerminalRuleCall_2_1_0() { return cElementMATH_NAMETerminalRuleCall_2_1_0; }\n\n\t\t//\"[\"\n\t\tpublic Keyword getLeftSquareBracketKeyword_2_2() { return cLeftSquareBracketKeyword_2_2; }\n\n\t\t//row=INT\n\t\tpublic Assignment getRowAssignment_2_3() { return cRowAssignment_2_3; }\n\n\t\t//INT\n\t\tpublic RuleCall getRowINTTerminalRuleCall_2_3_0() { return cRowINTTerminalRuleCall_2_3_0; }\n\n\t\t//\"]\"\n\t\tpublic Keyword getRightSquareBracketKeyword_2_4() { return cRightSquareBracketKeyword_2_4; }\n\n\t\t//\"[\"\n\t\tpublic Keyword getLeftSquareBracketKeyword_2_5() { return cLeftSquareBracketKeyword_2_5; }\n\n\t\t//column=INT\n\t\tpublic Assignment getColumnAssignment_2_6() { return cColumnAssignment_2_6; }\n\n\t\t//INT\n\t\tpublic RuleCall getColumnINTTerminalRuleCall_2_6_0() { return cColumnINTTerminalRuleCall_2_6_0; }\n\n\t\t//\"]\"\n\t\tpublic Keyword getRightSquareBracketKeyword_2_7() { return cRightSquareBracketKeyword_2_7; }\n\n\t\t//{Function} function=Function\n\t\tpublic Group getGroup_3() { return cGroup_3; }\n\n\t\tpublic Action getFunctionAction_3_0() { return cFunctionAction_3_0; }\n\t\tpublic Assignment getFunctionAssignment_3_1() { return cFunctionAssignment_3_1; }\n\t\tpublic RuleCall getFunctionFunctionParserRuleCall_3_1_0() { return cFunctionFunctionParserRuleCall_3_1_0; }\n\t\tpublic Group getGroup_4() { return cGroup_4; }\n\n\t\t//\"(\"\n\t\tpublic Keyword getLeftParenthesisKeyword_4_0() { return cLeftParenthesisKeyword_4_0; }\n\n\t\t//Addition\n\t\tpublic RuleCall getAdditionParserRuleCall_4_1() { return cAdditionParserRuleCall_4_1; }\n\n\t\t//\")\"\n\t\tpublic Keyword getRightParenthesisKeyword_4_2() { return cRightParenthesisKeyword_4_2; }\n\t}\n\n\tpublic class MatrixElements extends AbstractParserRuleElementFinder {\n\t\tprivate final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), \"Matrix\");\n\t\tprivate final Group cGroup = (Group)rule.eContents().get(1);\n\t\tprivate final Keyword cLeftCurlyBracketKeyword_0 = (Keyword)cGroup.eContents().get(0);\n\t\tprivate final Group cGroup_1 = (Group)cGroup.eContents().get(1);\n\t\tprivate final Assignment cRowsAssignment_1_0 = (Assignment)cGroup_1.eContents().get(0);\n\t\tprivate final RuleCall cRowsMatrixRowParserRuleCall_1_0_0 = (RuleCall)cRowsAssignment_1_0.eContents().get(0);\n\t\tprivate final Group cGroup_1_1 = (Group)cGroup_1.eContents().get(1);\n\t\tprivate final Keyword cCommaKeyword_1_1_0 = (Keyword)cGroup_1_1.eContents().get(0);\n\t\tprivate final Assignment cRowsAssignment_1_1_1 = (Assignment)cGroup_1_1.eContents().get(1);\n\t\tprivate final RuleCall cRowsMatrixRowParserRuleCall_1_1_1_0 = (RuleCall)cRowsAssignment_1_1_1.eContents().get(0);\n\t\tprivate final Keyword cCommaKeyword_1_2 = (Keyword)cGroup_1.eContents().get(2);\n\t\tprivate final Keyword cRightCurlyBracketKeyword_2 = (Keyword)cGroup.eContents().get(2);\n\t\t\n\t\t//Matrix:\n\t\t//\t\"{\" (rows+=MatrixRow (\",\" rows+=MatrixRow)* \",\"?)? \"}\";\n\t\tpublic ParserRule getRule() { return rule; }\n\n\t\t//\"{\" (rows+=MatrixRow (\",\" rows+=MatrixRow)* \",\"?)? \"}\"\n\t\tpublic Group getGroup() { return cGroup; }\n\n\t\t//\"{\"\n\t\tpublic Keyword getLeftCurlyBracketKeyword_0() { return cLeftCurlyBracketKeyword_0; }\n\n\t\t//(rows+=MatrixRow (\",\" rows+=MatrixRow)* \",\"?)?\n\t\tpublic Group getGroup_1() { return cGroup_1; }\n\n\t\t//rows+=MatrixRow\n\t\tpublic Assignment getRowsAssignment_1_0() { return cRowsAssignment_1_0; }\n\n\t\t//MatrixRow\n\t\tpublic RuleCall getRowsMatrixRowParserRuleCall_1_0_0() { return cRowsMatrixRowParserRuleCall_1_0_0; }\n\n\t\t//(\",\" rows+=MatrixRow)*\n\t\tpublic Group getGroup_1_1() { return cGroup_1_1; }\n\n\t\t//\",\"\n\t\tpublic Keyword getCommaKeyword_1_1_0() { return cCommaKeyword_1_1_0; }\n\n\t\t//rows+=MatrixRow\n\t\tpublic Assignment getRowsAssignment_1_1_1() { return cRowsAssignment_1_1_1; }\n\n\t\t//MatrixRow\n\t\tpublic RuleCall getRowsMatrixRowParserRuleCall_1_1_1_0() { return cRowsMatrixRowParserRuleCall_1_1_1_0; }\n\n\t\t//\",\"?\n\t\tpublic Keyword getCommaKeyword_1_2() { return cCommaKeyword_1_2; }\n\n\t\t//\"}\"\n\t\tpublic Keyword getRightCurlyBracketKeyword_2() { return cRightCurlyBracketKeyword_2; }\n\t}\n\n\tpublic class MatrixRowElements extends AbstractParserRuleElementFinder {\n\t\tprivate final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), \"MatrixRow\");\n\t\tprivate final Group cGroup = (Group)rule.eContents().get(1);\n\t\tprivate final Keyword cLeftCurlyBracketKeyword_0 = (Keyword)cGroup.eContents().get(0);\n\t\tprivate final Group cGroup_1 = (Group)cGroup.eContents().get(1);\n\t\tprivate final Assignment cElementsAssignment_1_0 = (Assignment)cGroup_1.eContents().get(0);\n\t\tprivate final RuleCall cElementsFloatParserRuleCall_1_0_0 = (RuleCall)cElementsAssignment_1_0.eContents().get(0);\n\t\tprivate final Group cGroup_1_1 = (Group)cGroup_1.eContents().get(1);\n\t\tprivate final Keyword cCommaKeyword_1_1_0 = (Keyword)cGroup_1_1.eContents().get(0);\n\t\tprivate final Assignment cElementsAssignment_1_1_1 = (Assignment)cGroup_1_1.eContents().get(1);\n\t\tprivate final RuleCall cElementsFloatParserRuleCall_1_1_1_0 = (RuleCall)cElementsAssignment_1_1_1.eContents().get(0);\n\t\tprivate final Keyword cCommaKeyword_1_2 = (Keyword)cGroup_1.eContents().get(2);\n\t\tprivate final Keyword cRightCurlyBracketKeyword_2 = (Keyword)cGroup.eContents().get(2);\n\t\t\n\t\t//MatrixRow:\n\t\t//\t\"{\" (elements+=Float (\",\" elements+=Float)* \",\"?)? \"}\";\n\t\tpublic ParserRule getRule() { return rule; }\n\n\t\t//\"{\" (elements+=Float (\",\" elements+=Float)* \",\"?)? \"}\"\n\t\tpublic Group getGroup() { return cGroup; }\n\n\t\t//\"{\"\n\t\tpublic Keyword getLeftCurlyBracketKeyword_0() { return cLeftCurlyBracketKeyword_0; }\n\n\t\t//(elements+=Float (\",\" elements+=Float)* \",\"?)?\n\t\tpublic Group getGroup_1() { return cGroup_1; }\n\n\t\t//elements+=Float\n\t\tpublic Assignment getElementsAssignment_1_0() { return cElementsAssignment_1_0; }\n\n\t\t//Float\n\t\tpublic RuleCall getElementsFloatParserRuleCall_1_0_0() { return cElementsFloatParserRuleCall_1_0_0; }\n\n\t\t//(\",\" elements+=Float)*\n\t\tpublic Group getGroup_1_1() { return cGroup_1_1; }\n\n\t\t//\",\"\n\t\tpublic Keyword getCommaKeyword_1_1_0() { return cCommaKeyword_1_1_0; }\n\n\t\t//elements+=Float\n\t\tpublic Assignment getElementsAssignment_1_1_1() { return cElementsAssignment_1_1_1; }\n\n\t\t//Float\n\t\tpublic RuleCall getElementsFloatParserRuleCall_1_1_1_0() { return cElementsFloatParserRuleCall_1_1_1_0; }\n\n\t\t//\",\"?\n\t\tpublic Keyword getCommaKeyword_1_2() { return cCommaKeyword_1_2; }\n\n\t\t//\"}\"\n\t\tpublic Keyword getRightCurlyBracketKeyword_2() { return cRightCurlyBracketKeyword_2; }\n\t}\n\n\tpublic class MatrixAssignmentElements extends AbstractParserRuleElementFinder {\n\t\tprivate final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), \"MatrixAssignment\");\n\t\tprivate final Group cGroup = (Group)rule.eContents().get(1);\n\t\tprivate final Keyword cLeftSquareBracketKeyword_0 = (Keyword)cGroup.eContents().get(0);\n\t\tprivate final Assignment cVariableAssignment_1 = (Assignment)cGroup.eContents().get(1);\n\t\tprivate final RuleCall cVariableMATH_NAMETerminalRuleCall_1_0 = (RuleCall)cVariableAssignment_1.eContents().get(0);\n\t\tprivate final Keyword cRightSquareBracketKeyword_2 = (Keyword)cGroup.eContents().get(2);\n\t\tprivate final Keyword cEqualsSignKeyword_3 = (Keyword)cGroup.eContents().get(3);\n\t\tprivate final Assignment cValueAssignment_4 = (Assignment)cGroup.eContents().get(4);\n\t\tprivate final RuleCall cValueMatrixFormulaParserRuleCall_4_0 = (RuleCall)cValueAssignment_4.eContents().get(0);\n\t\t\n\t\t//MatrixAssignment:\n\t\t//\t\"[\" variable=MATH_NAME \"]\" \"=\" value=MatrixFormula;\n\t\tpublic ParserRule getRule() { return rule; }\n\n\t\t//\"[\" variable=MATH_NAME \"]\" \"=\" value=MatrixFormula\n\t\tpublic Group getGroup() { return cGroup; }\n\n\t\t//\"[\"\n\t\tpublic Keyword getLeftSquareBracketKeyword_0() { return cLeftSquareBracketKeyword_0; }\n\n\t\t//variable=MATH_NAME\n\t\tpublic Assignment getVariableAssignment_1() { return cVariableAssignment_1; }\n\n\t\t//MATH_NAME\n\t\tpublic RuleCall getVariableMATH_NAMETerminalRuleCall_1_0() { return cVariableMATH_NAMETerminalRuleCall_1_0; }\n\n\t\t//\"]\"\n\t\tpublic Keyword getRightSquareBracketKeyword_2() { return cRightSquareBracketKeyword_2; }\n\n\t\t//\"=\"\n\t\tpublic Keyword getEqualsSignKeyword_3() { return cEqualsSignKeyword_3; }\n\n\t\t//value=MatrixFormula\n\t\tpublic Assignment getValueAssignment_4() { return cValueAssignment_4; }\n\n\t\t//MatrixFormula\n\t\tpublic RuleCall getValueMatrixFormulaParserRuleCall_4_0() { return cValueMatrixFormulaParserRuleCall_4_0; }\n\t}\n\n\tpublic class MatrixFormulaElements extends AbstractParserRuleElementFinder {\n\t\tprivate final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), \"MatrixFormula\");\n\t\tprivate final Assignment cExpressionAssignment = (Assignment)rule.eContents().get(1);\n\t\tprivate final RuleCall cExpressionMatrixAdditionParserRuleCall_0 = (RuleCall)cExpressionAssignment.eContents().get(0);\n\t\t\n\t\t//MatrixFormula:\n\t\t//\texpression=MatrixAddition;\n\t\tpublic ParserRule getRule() { return rule; }\n\n\t\t//expression=MatrixAddition\n\t\tpublic Assignment getExpressionAssignment() { return cExpressionAssignment; }\n\n\t\t//MatrixAddition\n\t\tpublic RuleCall getExpressionMatrixAdditionParserRuleCall_0() { return cExpressionMatrixAdditionParserRuleCall_0; }\n\t}\n\n\tpublic class MatrixAdditionElements extends AbstractParserRuleElementFinder {\n\t\tprivate final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), \"MatrixAddition\");\n\t\tprivate final Group cGroup = (Group)rule.eContents().get(1);\n\t\tprivate final RuleCall cMatrixMultiplicationParserRuleCall_0 = (RuleCall)cGroup.eContents().get(0);\n\t\tprivate final Alternatives cAlternatives_1 = (Alternatives)cGroup.eContents().get(1);\n\t\tprivate final Group cGroup_1_0 = (Group)cAlternatives_1.eContents().get(0);\n\t\tprivate final Keyword cPlusSignKeyword_1_0_0 = (Keyword)cGroup_1_0.eContents().get(0);\n\t\tprivate final Action cMatrixAdditionLeftAction_1_0_1 = (Action)cGroup_1_0.eContents().get(1);\n\t\tprivate final Assignment cRightAssignment_1_0_2 = (Assignment)cGroup_1_0.eContents().get(2);\n\t\tprivate final RuleCall cRightMatrixMultiplicationParserRuleCall_1_0_2_0 = (RuleCall)cRightAssignment_1_0_2.eContents().get(0);\n\t\tprivate final Group cGroup_1_1 = (Group)cAlternatives_1.eContents().get(1);\n\t\tprivate final Keyword cHyphenMinusKeyword_1_1_0 = (Keyword)cGroup_1_1.eContents().get(0);\n\t\tprivate final Action cMatrixSubtractionLeftAction_1_1_1 = (Action)cGroup_1_1.eContents().get(1);\n\t\tprivate final Assignment cRightAssignment_1_1_2 = (Assignment)cGroup_1_1.eContents().get(2);\n\t\tprivate final RuleCall cRightMatrixMultiplicationParserRuleCall_1_1_2_0 = (RuleCall)cRightAssignment_1_1_2.eContents().get(0);\n\t\t\n\t\t//MatrixAddition returns MatrixExpression:\n\t\t//\tMatrixMultiplication (\"+\" {MatrixAddition.left=current} right=MatrixMultiplication | \"-\"\n\t\t//\t{MatrixSubtraction.left=current} right=MatrixMultiplication)*;\n\t\tpublic ParserRule getRule() { return rule; }\n\n\t\t//MatrixMultiplication (\"+\" {MatrixAddition.left=current} right=MatrixMultiplication | \"-\"\n\t\t//{MatrixSubtraction.left=current} right=MatrixMultiplication)*\n\t\tpublic Group getGroup() { return cGroup; }\n\n\t\t//MatrixMultiplication\n\t\tpublic RuleCall getMatrixMultiplicationParserRuleCall_0() { return cMatrixMultiplicationParserRuleCall_0; }\n\n\t\t//(\"+\" {MatrixAddition.left=current} right=MatrixMultiplication | \"-\" {MatrixSubtraction.left=current}\n\t\t//right=MatrixMultiplication)*\n\t\tpublic Alternatives getAlternatives_1() { return cAlternatives_1; }\n\n\t\t//\"+\" {MatrixAddition.left=current} right=MatrixMultiplication\n\t\tpublic Group getGroup_1_0() { return cGroup_1_0; }\n\n\t\t//\"+\"\n\t\tpublic Keyword getPlusSignKeyword_1_0_0() { return cPlusSignKeyword_1_0_0; }\n\n\t\t//{MatrixAddition.left=current}\n\t\tpublic Action getMatrixAdditionLeftAction_1_0_1() { return cMatrixAdditionLeftAction_1_0_1; }\n\n\t\t//right=MatrixMultiplication\n\t\tpublic Assignment getRightAssignment_1_0_2() { return cRightAssignment_1_0_2; }\n\n\t\t//MatrixMultiplication\n\t\tpublic RuleCall getRightMatrixMultiplicationParserRuleCall_1_0_2_0() { return cRightMatrixMultiplicationParserRuleCall_1_0_2_0; }\n\n\t\t//\"-\" {MatrixSubtraction.left=current} right=MatrixMultiplication\n\t\tpublic Group getGroup_1_1() { return cGroup_1_1; }\n\n\t\t//\"-\"\n\t\tpublic Keyword getHyphenMinusKeyword_1_1_0() { return cHyphenMinusKeyword_1_1_0; }\n\n\t\t//{MatrixSubtraction.left=current}\n\t\tpublic Action getMatrixSubtractionLeftAction_1_1_1() { return cMatrixSubtractionLeftAction_1_1_1; }\n\n\t\t//right=MatrixMultiplication\n\t\tpublic Assignment getRightAssignment_1_1_2() { return cRightAssignment_1_1_2; }\n\n\t\t//MatrixMultiplication\n\t\tpublic RuleCall getRightMatrixMultiplicationParserRuleCall_1_1_2_0() { return cRightMatrixMultiplicationParserRuleCall_1_1_2_0; }\n\t}\n\n\tpublic class MatrixMultiplicationElements extends AbstractParserRuleElementFinder {\n\t\tprivate final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), \"MatrixMultiplication\");\n\t\tprivate final Group cGroup = (Group)rule.eContents().get(1);\n\t\tprivate final RuleCall cPrimaryMatrixParserRuleCall_0 = (RuleCall)cGroup.eContents().get(0);\n\t\tprivate final Alternatives cAlternatives_1 = (Alternatives)cGroup.eContents().get(1);\n\t\tprivate final Group cGroup_1_0 = (Group)cAlternatives_1.eContents().get(0);\n\t\tprivate final Keyword cAsteriskKeyword_1_0_0 = (Keyword)cGroup_1_0.eContents().get(0);\n\t\tprivate final Action cMatrixMultiplicationLeftAction_1_0_1 = (Action)cGroup_1_0.eContents().get(1);\n\t\tprivate final Assignment cRightMatrixAssignment_1_0_2 = (Assignment)cGroup_1_0.eContents().get(2);\n\t\tprivate final RuleCall cRightMatrixPrimaryMatrixParserRuleCall_1_0_2_0 = (RuleCall)cRightMatrixAssignment_1_0_2.eContents().get(0);\n\t\tprivate final Group cGroup_1_1 = (Group)cAlternatives_1.eContents().get(1);\n\t\tprivate final Keyword cAsteriskKeyword_1_1_0 = (Keyword)cGroup_1_1.eContents().get(0);\n\t\tprivate final Action cMatrixMultiplicationLeftAction_1_1_1 = (Action)cGroup_1_1.eContents().get(1);\n\t\tprivate final Assignment cRightScalarAssignment_1_1_2 = (Assignment)cGroup_1_1.eContents().get(2);\n\t\tprivate final RuleCall cRightScalarFormulaParserRuleCall_1_1_2_0 = (RuleCall)cRightScalarAssignment_1_1_2.eContents().get(0);\n\t\t\n\t\t//MatrixMultiplication returns MatrixExpression:\n\t\t//\tPrimaryMatrix (\"*\" {MatrixMultiplication.left=current} rightMatrix=PrimaryMatrix | \"*\"\n\t\t//\t{MatrixMultiplication.left=current} rightScalar=Formula)*;\n\t\tpublic ParserRule getRule() { return rule; }\n\n\t\t//PrimaryMatrix (\"*\" {MatrixMultiplication.left=current} rightMatrix=PrimaryMatrix | \"*\"\n\t\t//{MatrixMultiplication.left=current} rightScalar=Formula)*\n\t\tpublic Group getGroup() { return cGroup; }\n\n\t\t//PrimaryMatrix\n\t\tpublic RuleCall getPrimaryMatrixParserRuleCall_0() { return cPrimaryMatrixParserRuleCall_0; }\n\n\t\t//(\"*\" {MatrixMultiplication.left=current} rightMatrix=PrimaryMatrix | \"*\" {MatrixMultiplication.left=current}\n\t\t//rightScalar=Formula)*\n\t\tpublic Alternatives getAlternatives_1() { return cAlternatives_1; }\n\n\t\t//\"*\" {MatrixMultiplication.left=current} rightMatrix=PrimaryMatrix\n\t\tpublic Group getGroup_1_0() { return cGroup_1_0; }\n\n\t\t//\"*\"\n\t\tpublic Keyword getAsteriskKeyword_1_0_0() { return cAsteriskKeyword_1_0_0; }\n\n\t\t//{MatrixMultiplication.left=current}\n\t\tpublic Action getMatrixMultiplicationLeftAction_1_0_1() { return cMatrixMultiplicationLeftAction_1_0_1; }\n\n\t\t//rightMatrix=PrimaryMatrix\n\t\tpublic Assignment getRightMatrixAssignment_1_0_2() { return cRightMatrixAssignment_1_0_2; }\n\n\t\t//PrimaryMatrix\n\t\tpublic RuleCall getRightMatrixPrimaryMatrixParserRuleCall_1_0_2_0() { return cRightMatrixPrimaryMatrixParserRuleCall_1_0_2_0; }\n\n\t\t//\"*\" {MatrixMultiplication.left=current} rightScalar=Formula\n\t\tpublic Group getGroup_1_1() { return cGroup_1_1; }\n\n\t\t//\"*\"\n\t\tpublic Keyword getAsteriskKeyword_1_1_0() { return cAsteriskKeyword_1_1_0; }\n\n\t\t//{MatrixMultiplication.left=current}\n\t\tpublic Action getMatrixMultiplicationLeftAction_1_1_1() { return cMatrixMultiplicationLeftAction_1_1_1; }\n\n\t\t//rightScalar=Formula\n\t\tpublic Assignment getRightScalarAssignment_1_1_2() { return cRightScalarAssignment_1_1_2; }\n\n\t\t//Formula\n\t\tpublic RuleCall getRightScalarFormulaParserRuleCall_1_1_2_0() { return cRightScalarFormulaParserRuleCall_1_1_2_0; }\n\t}\n\n\tpublic class PrimaryMatrixElements extends AbstractParserRuleElementFinder {\n\t\tprivate final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), \"PrimaryMatrix\");\n\t\tprivate final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);\n\t\tprivate final Group cGroup_0 = (Group)cAlternatives.eContents().get(0);\n\t\tprivate final Action cNewMatrixAction_0_0 = (Action)cGroup_0.eContents().get(0);\n\t\tprivate final Assignment cMatrixAssignment_0_1 = (Assignment)cGroup_0.eContents().get(1);\n\t\tprivate final RuleCall cMatrixMatrixParserRuleCall_0_1_0 = (RuleCall)cMatrixAssignment_0_1.eContents().get(0);\n\t\tprivate final Group cGroup_1 = (Group)cAlternatives.eContents().get(1);\n\t\tprivate final Action cTransposeMatrixAction_1_0 = (Action)cGroup_1.eContents().get(0);\n\t\tprivate final Keyword cLeftSquareBracketKeyword_1_1 = (Keyword)cGroup_1.eContents().get(1);\n\t\tprivate final Assignment cNameAssignment_1_2 = (Assignment)cGroup_1.eContents().get(2);\n\t\tprivate final RuleCall cNameMATH_NAMETerminalRuleCall_1_2_0 = (RuleCall)cNameAssignment_1_2.eContents().get(0);\n\t\tprivate final Keyword cTKeyword_1_3 = (Keyword)cGroup_1.eContents().get(3);\n\t\tprivate final Group cGroup_2 = (Group)cAlternatives.eContents().get(2);\n\t\tprivate final Action cMatrixVariableAction_2_0 = (Action)cGroup_2.eContents().get(0);\n\t\tprivate final Keyword cLeftSquareBracketKeyword_2_1 = (Keyword)cGroup_2.eContents().get(1);\n\t\tprivate final Assignment cNameAssignment_2_2 = (Assignment)cGroup_2.eContents().get(2);\n\t\tprivate final RuleCall cNameMATH_NAMETerminalRuleCall_2_2_0 = (RuleCall)cNameAssignment_2_2.eContents().get(0);\n\t\tprivate final Keyword cRightSquareBracketKeyword_2_3 = (Keyword)cGroup_2.eContents().get(3);\n\t\tprivate final Group cGroup_3 = (Group)cAlternatives.eContents().get(3);\n\t\tprivate final Keyword cLeftParenthesisKeyword_3_0 = (Keyword)cGroup_3.eContents().get(0);\n\t\tprivate final RuleCall cMatrixAdditionParserRuleCall_3_1 = (RuleCall)cGroup_3.eContents().get(1);\n\t\tprivate final Keyword cRightParenthesisKeyword_3_2 = (Keyword)cGroup_3.eContents().get(2);\n\t\t\n\t\t//PrimaryMatrix returns MatrixExpression:\n\t\t//\t{NewMatrix} matrix=Matrix | {TransposeMatrix} \"[\" name=MATH_NAME \"]^T\" | {MatrixVariable} \"[\" name=MATH_NAME \"]\" | \"(\"\n\t\t//\tMatrixAddition \")\";\n\t\tpublic ParserRule getRule() { return rule; }\n\n\t\t//{NewMatrix} matrix=Matrix | {TransposeMatrix} \"[\" name=MATH_NAME \"]^T\" | {MatrixVariable} \"[\" name=MATH_NAME \"]\" | \"(\"\n\t\t//MatrixAddition \")\"\n\t\tpublic Alternatives getAlternatives() { return cAlternatives; }\n\n\t\t//{NewMatrix} matrix=Matrix\n\t\tpublic Group getGroup_0() { return cGroup_0; }\n\n\t\t//{NewMatrix}\n\t\tpublic Action getNewMatrixAction_0_0() { return cNewMatrixAction_0_0; }\n\n\t\t//matrix=Matrix\n\t\tpublic Assignment getMatrixAssignment_0_1() { return cMatrixAssignment_0_1; }\n\n\t\t//Matrix\n\t\tpublic RuleCall getMatrixMatrixParserRuleCall_0_1_0() { return cMatrixMatrixParserRuleCall_0_1_0; }\n\n\t\t//{TransposeMatrix} \"[\" name=MATH_NAME \"]^T\"\n\t\tpublic Group getGroup_1() { return cGroup_1; }\n\n\t\t//{TransposeMatrix}\n\t\tpublic Action getTransposeMatrixAction_1_0() { return cTransposeMatrixAction_1_0; }\n\n\t\t//\"[\"\n\t\tpublic Keyword getLeftSquareBracketKeyword_1_1() { return cLeftSquareBracketKeyword_1_1; }\n\n\t\t//name=MATH_NAME\n\t\tpublic Assignment getNameAssignment_1_2() { return cNameAssignment_1_2; }\n\n\t\t//MATH_NAME\n\t\tpublic RuleCall getNameMATH_NAMETerminalRuleCall_1_2_0() { return cNameMATH_NAMETerminalRuleCall_1_2_0; }\n\n\t\t//\"]^T\"\n\t\tpublic Keyword getTKeyword_1_3() { return cTKeyword_1_3; }\n\n\t\t//{MatrixVariable} \"[\" name=MATH_NAME \"]\"\n\t\tpublic Group getGroup_2() { return cGroup_2; }\n\n\t\t//{MatrixVariable}\n\t\tpublic Action getMatrixVariableAction_2_0() { return cMatrixVariableAction_2_0; }\n\n\t\t//\"[\"\n\t\tpublic Keyword getLeftSquareBracketKeyword_2_1() { return cLeftSquareBracketKeyword_2_1; }\n\n\t\t//name=MATH_NAME\n\t\tpublic Assignment getNameAssignment_2_2() { return cNameAssignment_2_2; }\n\n\t\t//MATH_NAME\n\t\tpublic RuleCall getNameMATH_NAMETerminalRuleCall_2_2_0() { return cNameMATH_NAMETerminalRuleCall_2_2_0; }\n\n\t\t//\"]\"\n\t\tpublic Keyword getRightSquareBracketKeyword_2_3() { return cRightSquareBracketKeyword_2_3; }\n\n\t\t//\"(\" MatrixAddition \")\"\n\t\t//MatrixAddition\n\t\tpublic RuleCall getMatrixAdditionParserRuleCall_3_1() { return cMatrixAdditionParserRuleCall_3_1; }\n\tprivate VariableAssignmentElements pVariableAssignment;\n\tprivate MatrixElements pMatrix;\n\tprivate MatrixRowElements pMatrixRow;\n\tprivate MatrixAssignmentElements pMatrixAssignment;\n\tprivate MatrixFormulaElements pMatrixFormula;\n\tprivate MatrixAdditionElements pMatrixAddition;\n\tprivate MatrixMultiplicationElements pMatrixMultiplication;\n\tprivate PrimaryMatrixElements pPrimaryMatrix;\n\t//\tfunctionDefinition=FunctionDefinition | variableAssignment=VariableAssignment | formula=Formula |\n\t//\tmatrixAssignment=MatrixAssignment | matrixFormula=MatrixFormula;\n\t//VariableAssignment:\n\tpublic VariableAssignmentElements getVariableAssignmentAccess() {\n\t\treturn (pVariableAssignment != null) ? pVariableAssignment : (pVariableAssignment = new VariableAssignmentElements());\n\tpublic ParserRule getVariableAssignmentRule() {\n\t\treturn getVariableAssignmentAccess().getRule();\n\t//\tExponent | \"(-\" {Invert} expression=UnaryExpression \")\" | \"(\" {Factorial} expression=UnaryExpression \")!\";\n\t//\t{Variable} name=MATH_NAME | {Float} value=Float | {MatrixElement} element=MATH_NAME \"[\" row=INT \"]\" \"[\" column=INT \"]\"\n\t//\t| {Function} function=Function | \"(\" Addition \")\";\n\t//Matrix:\n\t//\t\"{\" (rows+=MatrixRow (\",\" rows+=MatrixRow)* \",\"?)? \"}\";\n\tpublic MatrixElements getMatrixAccess() {\n\t\treturn (pMatrix != null) ? pMatrix : (pMatrix = new MatrixElements());\n\t}\n\t\n\tpublic ParserRule getMatrixRule() {\n\t\treturn getMatrixAccess().getRule();\n\t}\n\n\t//MatrixRow:\n\t//\t\"{\" (elements+=Float (\",\" elements+=Float)* \",\"?)? \"}\";\n\tpublic MatrixRowElements getMatrixRowAccess() {\n\t\treturn (pMatrixRow != null) ? pMatrixRow : (pMatrixRow = new MatrixRowElements());\n\t}\n\t\n\tpublic ParserRule getMatrixRowRule() {\n\t\treturn getMatrixRowAccess().getRule();\n\t}\n\n\t//MatrixAssignment:\n\t//\t\"[\" variable=MATH_NAME \"]\" \"=\" value=MatrixFormula;\n\tpublic MatrixAssignmentElements getMatrixAssignmentAccess() {\n\t\treturn (pMatrixAssignment != null) ? pMatrixAssignment : (pMatrixAssignment = new MatrixAssignmentElements());\n\t}\n\t\n\tpublic ParserRule getMatrixAssignmentRule() {\n\t\treturn getMatrixAssignmentAccess().getRule();\n\t}\n\n\t//MatrixFormula:\n\t//\texpression=MatrixAddition;\n\tpublic MatrixFormulaElements getMatrixFormulaAccess() {\n\t\treturn (pMatrixFormula != null) ? pMatrixFormula : (pMatrixFormula = new MatrixFormulaElements());\n\t}\n\t\n\tpublic ParserRule getMatrixFormulaRule() {\n\t\treturn getMatrixFormulaAccess().getRule();\n\t}\n\n\t//MatrixAddition returns MatrixExpression:\n\t//\tMatrixMultiplication (\"+\" {MatrixAddition.left=current} right=MatrixMultiplication | \"-\"\n\t//\t{MatrixSubtraction.left=current} right=MatrixMultiplication)*;\n\tpublic MatrixAdditionElements getMatrixAdditionAccess() {\n\t\treturn (pMatrixAddition != null) ? pMatrixAddition : (pMatrixAddition = new MatrixAdditionElements());\n\t}\n\t\n\tpublic ParserRule getMatrixAdditionRule() {\n\t\treturn getMatrixAdditionAccess().getRule();\n\t}\n\n\t//MatrixMultiplication returns MatrixExpression:\n\t//\tPrimaryMatrix (\"*\" {MatrixMultiplication.left=current} rightMatrix=PrimaryMatrix | \"*\"\n\t//\t{MatrixMultiplication.left=current} rightScalar=Formula)*;\n\tpublic MatrixMultiplicationElements getMatrixMultiplicationAccess() {\n\t\treturn (pMatrixMultiplication != null) ? pMatrixMultiplication : (pMatrixMultiplication = new MatrixMultiplicationElements());\n\t}\n\t\n\tpublic ParserRule getMatrixMultiplicationRule() {\n\t\treturn getMatrixMultiplicationAccess().getRule();\n\t}\n\n\t//PrimaryMatrix returns MatrixExpression:\n\t//\t{NewMatrix} matrix=Matrix | {TransposeMatrix} \"[\" name=MATH_NAME \"]^T\" | {MatrixVariable} \"[\" name=MATH_NAME \"]\" | \"(\"\n\t//\tMatrixAddition \")\";\n\tpublic PrimaryMatrixElements getPrimaryMatrixAccess() {\n\t\treturn (pPrimaryMatrix != null) ? pPrimaryMatrix : (pPrimaryMatrix = new PrimaryMatrixElements());\n\t}\n\t\n\tpublic ParserRule getPrimaryMatrixRule() {\n\t\treturn getPrimaryMatrixAccess().getRule();\n\t}\n", "new_methods": [ { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cVariableAssignmentAssignment_1;", "signature": "Assignment getVariableAssignmentAssignment_1()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cVariableAssignmentVariableAssignmentParserRuleCall_1_0;", "signature": "RuleCall getVariableAssignmentVariableAssignmentParserRuleCall_1_0()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cFormulaAssignment_2;", "signature": "Assignment getFormulaAssignment_2()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cFormulaFormulaParserRuleCall_2_0;", "signature": "RuleCall getFormulaFormulaParserRuleCall_2_0()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cMatrixAssignmentAssignment_3;", "signature": "Assignment getMatrixAssignmentAssignment_3()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cMatrixAssignmentMatrixAssignmentParserRuleCall_3_0;", "signature": "RuleCall getMatrixAssignmentMatrixAssignmentParserRuleCall_3_0()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cMatrixFormulaAssignment_4;", "signature": "Assignment getMatrixFormulaAssignment_4()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cMatrixFormulaMatrixFormulaParserRuleCall_4_0;", "signature": "RuleCall getMatrixFormulaMatrixFormulaParserRuleCall_4_0()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cLeftParenthesisHyphenMinusKeyword_1_0;", "signature": "Keyword getLeftParenthesisHyphenMinusKeyword_1_0()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cRightParenthesisKeyword_1_3;", "signature": "Keyword getRightParenthesisKeyword_1_3()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cMatrixElementAction_2_0;", "signature": "Action getMatrixElementAction_2_0()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cElementAssignment_2_1;", "signature": "Assignment getElementAssignment_2_1()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cElementMATH_NAMETerminalRuleCall_2_1_0;", "signature": "RuleCall getElementMATH_NAMETerminalRuleCall_2_1_0()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cLeftSquareBracketKeyword_2_2;", "signature": "Keyword getLeftSquareBracketKeyword_2_2()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cRowAssignment_2_3;", "signature": "Assignment getRowAssignment_2_3()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cRowINTTerminalRuleCall_2_3_0;", "signature": "RuleCall getRowINTTerminalRuleCall_2_3_0()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cRightSquareBracketKeyword_2_4;", "signature": "Keyword getRightSquareBracketKeyword_2_4()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cLeftSquareBracketKeyword_2_5;", "signature": "Keyword getLeftSquareBracketKeyword_2_5()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cColumnAssignment_2_6;", "signature": "Assignment getColumnAssignment_2_6()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cColumnINTTerminalRuleCall_2_6_0;", "signature": "RuleCall getColumnINTTerminalRuleCall_2_6_0()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cRightSquareBracketKeyword_2_7;", "signature": "Keyword getRightSquareBracketKeyword_2_7()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cGroup_3;", "signature": "Group getGroup_3()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cFunctionAction_3_0;", "signature": "Action getFunctionAction_3_0()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cFunctionAssignment_3_1;", "signature": "Assignment getFunctionAssignment_3_1()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cFunctionFunctionParserRuleCall_3_1_0;", "signature": "RuleCall getFunctionFunctionParserRuleCall_3_1_0()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cGroup_4;", "signature": "Group getGroup_4()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cLeftParenthesisKeyword_4_0;", "signature": "Keyword getLeftParenthesisKeyword_4_0()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cAdditionParserRuleCall_4_1;", "signature": "RuleCall getAdditionParserRuleCall_4_1()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cRightParenthesisKeyword_4_2;", "signature": "Keyword getRightParenthesisKeyword_4_2()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return rule;", "signature": "ParserRule getRule()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cGroup;", "signature": "Group getGroup()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cLeftCurlyBracketKeyword_0;", "signature": "Keyword getLeftCurlyBracketKeyword_0()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cGroup_1;", "signature": "Group getGroup_1()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cRowsAssignment_1_0;", "signature": "Assignment getRowsAssignment_1_0()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cRowsMatrixRowParserRuleCall_1_0_0;", "signature": "RuleCall getRowsMatrixRowParserRuleCall_1_0_0()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cGroup_1_1;", "signature": "Group getGroup_1_1()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cCommaKeyword_1_1_0;", "signature": "Keyword getCommaKeyword_1_1_0()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cRowsAssignment_1_1_1;", "signature": "Assignment getRowsAssignment_1_1_1()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cRowsMatrixRowParserRuleCall_1_1_1_0;", "signature": "RuleCall getRowsMatrixRowParserRuleCall_1_1_1_0()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cCommaKeyword_1_2;", "signature": "Keyword getCommaKeyword_1_2()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cRightCurlyBracketKeyword_2;", "signature": "Keyword getRightCurlyBracketKeyword_2()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return rule;", "signature": "ParserRule getRule()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cGroup;", "signature": "Group getGroup()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cLeftCurlyBracketKeyword_0;", "signature": "Keyword getLeftCurlyBracketKeyword_0()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cGroup_1;", "signature": "Group getGroup_1()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cElementsAssignment_1_0;", "signature": "Assignment getElementsAssignment_1_0()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cElementsFloatParserRuleCall_1_0_0;", "signature": "RuleCall getElementsFloatParserRuleCall_1_0_0()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cGroup_1_1;", "signature": "Group getGroup_1_1()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cCommaKeyword_1_1_0;", "signature": "Keyword getCommaKeyword_1_1_0()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cElementsAssignment_1_1_1;", "signature": "Assignment getElementsAssignment_1_1_1()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cElementsFloatParserRuleCall_1_1_1_0;", "signature": "RuleCall getElementsFloatParserRuleCall_1_1_1_0()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cCommaKeyword_1_2;", "signature": "Keyword getCommaKeyword_1_2()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cRightCurlyBracketKeyword_2;", "signature": "Keyword getRightCurlyBracketKeyword_2()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return rule;", "signature": "ParserRule getRule()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cGroup;", "signature": "Group getGroup()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cLeftSquareBracketKeyword_0;", "signature": "Keyword getLeftSquareBracketKeyword_0()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cVariableAssignment_1;", "signature": "Assignment getVariableAssignment_1()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cVariableMATH_NAMETerminalRuleCall_1_0;", "signature": "RuleCall getVariableMATH_NAMETerminalRuleCall_1_0()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cRightSquareBracketKeyword_2;", "signature": "Keyword getRightSquareBracketKeyword_2()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cEqualsSignKeyword_3;", "signature": "Keyword getEqualsSignKeyword_3()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cValueAssignment_4;", "signature": "Assignment getValueAssignment_4()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cValueMatrixFormulaParserRuleCall_4_0;", "signature": "RuleCall getValueMatrixFormulaParserRuleCall_4_0()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return rule;", "signature": "ParserRule getRule()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cExpressionAssignment;", "signature": "Assignment getExpressionAssignment()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cExpressionMatrixAdditionParserRuleCall_0;", "signature": "RuleCall getExpressionMatrixAdditionParserRuleCall_0()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return rule;", "signature": "ParserRule getRule()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cGroup;", "signature": "Group getGroup()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cMatrixMultiplicationParserRuleCall_0;", "signature": "RuleCall getMatrixMultiplicationParserRuleCall_0()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cAlternatives_1;", "signature": "Alternatives getAlternatives_1()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cGroup_1_0;", "signature": "Group getGroup_1_0()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cPlusSignKeyword_1_0_0;", "signature": "Keyword getPlusSignKeyword_1_0_0()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cMatrixAdditionLeftAction_1_0_1;", "signature": "Action getMatrixAdditionLeftAction_1_0_1()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cRightAssignment_1_0_2;", "signature": "Assignment getRightAssignment_1_0_2()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cRightMatrixMultiplicationParserRuleCall_1_0_2_0;", "signature": "RuleCall getRightMatrixMultiplicationParserRuleCall_1_0_2_0()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cGroup_1_1;", "signature": "Group getGroup_1_1()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cHyphenMinusKeyword_1_1_0;", "signature": "Keyword getHyphenMinusKeyword_1_1_0()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cMatrixSubtractionLeftAction_1_1_1;", "signature": "Action getMatrixSubtractionLeftAction_1_1_1()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cRightAssignment_1_1_2;", "signature": "Assignment getRightAssignment_1_1_2()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cRightMatrixMultiplicationParserRuleCall_1_1_2_0;", "signature": "RuleCall getRightMatrixMultiplicationParserRuleCall_1_1_2_0()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return rule;", "signature": "ParserRule getRule()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cGroup;", "signature": "Group getGroup()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cPrimaryMatrixParserRuleCall_0;", "signature": "RuleCall getPrimaryMatrixParserRuleCall_0()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cAlternatives_1;", "signature": "Alternatives getAlternatives_1()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cGroup_1_0;", "signature": "Group getGroup_1_0()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cAsteriskKeyword_1_0_0;", "signature": "Keyword getAsteriskKeyword_1_0_0()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cMatrixMultiplicationLeftAction_1_0_1;", "signature": "Action getMatrixMultiplicationLeftAction_1_0_1()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cRightMatrixAssignment_1_0_2;", "signature": "Assignment getRightMatrixAssignment_1_0_2()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cRightMatrixPrimaryMatrixParserRuleCall_1_0_2_0;", "signature": "RuleCall getRightMatrixPrimaryMatrixParserRuleCall_1_0_2_0()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cGroup_1_1;", "signature": "Group getGroup_1_1()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cAsteriskKeyword_1_1_0;", "signature": "Keyword getAsteriskKeyword_1_1_0()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cMatrixMultiplicationLeftAction_1_1_1;", "signature": "Action getMatrixMultiplicationLeftAction_1_1_1()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cRightScalarAssignment_1_1_2;", "signature": "Assignment getRightScalarAssignment_1_1_2()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cRightScalarFormulaParserRuleCall_1_1_2_0;", "signature": "RuleCall getRightScalarFormulaParserRuleCall_1_1_2_0()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return rule;", "signature": "ParserRule getRule()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cAlternatives;", "signature": "Alternatives getAlternatives()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cGroup_0;", "signature": "Group getGroup_0()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cNewMatrixAction_0_0;", "signature": "Action getNewMatrixAction_0_0()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cMatrixAssignment_0_1;", "signature": "Assignment getMatrixAssignment_0_1()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cMatrixMatrixParserRuleCall_0_1_0;", "signature": "RuleCall getMatrixMatrixParserRuleCall_0_1_0()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cGroup_1;", "signature": "Group getGroup_1()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cTransposeMatrixAction_1_0;", "signature": "Action getTransposeMatrixAction_1_0()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cLeftSquareBracketKeyword_1_1;", "signature": "Keyword getLeftSquareBracketKeyword_1_1()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cNameAssignment_1_2;", "signature": "Assignment getNameAssignment_1_2()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cNameMATH_NAMETerminalRuleCall_1_2_0;", "signature": "RuleCall getNameMATH_NAMETerminalRuleCall_1_2_0()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cTKeyword_1_3;", "signature": "Keyword getTKeyword_1_3()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cGroup_2;", "signature": "Group getGroup_2()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cMatrixVariableAction_2_0;", "signature": "Action getMatrixVariableAction_2_0()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cLeftSquareBracketKeyword_2_1;", "signature": "Keyword getLeftSquareBracketKeyword_2_1()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cNameAssignment_2_2;", "signature": "Assignment getNameAssignment_2_2()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cNameMATH_NAMETerminalRuleCall_2_2_0;", "signature": "RuleCall getNameMATH_NAMETerminalRuleCall_2_2_0()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cRightSquareBracketKeyword_2_3;", "signature": "Keyword getRightSquareBracketKeyword_2_3()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cMatrixAdditionParserRuleCall_3_1;", "signature": "RuleCall getMatrixAdditionParserRuleCall_3_1()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return (pVariableAssignment != null) ? pVariableAssignment : (pVariableAssignment = new VariableAssignmentElements());\n\tpublic ParserRule getVariableAssignmentRule() {\n\t\treturn getVariableAssignmentAccess().getRule();\n\t//\tExponent | \"(-\" {Invert", "signature": "VariableAssignmentElements getVariableAssignmentAccess()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return (pMatrix != null) ? pMatrix : (pMatrix = new MatrixElements());", "signature": "MatrixElements getMatrixAccess()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return getMatrixAccess().getRule();", "signature": "ParserRule getMatrixRule()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return (pMatrixRow != null) ? pMatrixRow : (pMatrixRow = new MatrixRowElements());", "signature": "MatrixRowElements getMatrixRowAccess()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return getMatrixRowAccess().getRule();", "signature": "ParserRule getMatrixRowRule()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return (pMatrixAssignment != null) ? pMatrixAssignment : (pMatrixAssignment = new MatrixAssignmentElements());", "signature": "MatrixAssignmentElements getMatrixAssignmentAccess()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return getMatrixAssignmentAccess().getRule();", "signature": "ParserRule getMatrixAssignmentRule()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return (pMatrixFormula != null) ? pMatrixFormula : (pMatrixFormula = new MatrixFormulaElements());", "signature": "MatrixFormulaElements getMatrixFormulaAccess()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return getMatrixFormulaAccess().getRule();", "signature": "ParserRule getMatrixFormulaRule()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return (pMatrixAddition != null) ? pMatrixAddition : (pMatrixAddition = new MatrixAdditionElements());", "signature": "MatrixAdditionElements getMatrixAdditionAccess()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return getMatrixAdditionAccess().getRule();", "signature": "ParserRule getMatrixAdditionRule()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return (pMatrixMultiplication != null) ? pMatrixMultiplication : (pMatrixMultiplication = new MatrixMultiplicationElements());", "signature": "MatrixMultiplicationElements getMatrixMultiplicationAccess()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return getMatrixMultiplicationAccess().getRule();", "signature": "ParserRule getMatrixMultiplicationRule()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return (pPrimaryMatrix != null) ? pPrimaryMatrix : (pPrimaryMatrix = new PrimaryMatrixElements());", "signature": "PrimaryMatrixElements getPrimaryMatrixAccess()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return getPrimaryMatrixAccess().getRule();", "signature": "ParserRule getPrimaryMatrixRule()" } ], "old_code": "\t\tprivate final Assignment cMatrixDefinitionAssignment_1 = (Assignment)cAlternatives.eContents().get(1);\n\t\tprivate final RuleCall cMatrixDefinitionMatrixDefinitionParserRuleCall_1_0 = (RuleCall)cMatrixDefinitionAssignment_1.eContents().get(0);\n\t\tprivate final Assignment cAssignmentAssignment_2 = (Assignment)cAlternatives.eContents().get(2);\n\t\tprivate final RuleCall cAssignmentAssignmentParserRuleCall_2_0 = (RuleCall)cAssignmentAssignment_2.eContents().get(0);\n\t\tprivate final Assignment cFormulaAssignment_3 = (Assignment)cAlternatives.eContents().get(3);\n\t\tprivate final RuleCall cFormulaFormulaParserRuleCall_3_0 = (RuleCall)cFormulaAssignment_3.eContents().get(0);\n\t\t//\tfunctionDefinition=FunctionDefinition | matrixDefinition=MatrixDefinition | assignment=Assignment | formula=Formula;\n\t\t//functionDefinition=FunctionDefinition | matrixDefinition=MatrixDefinition | assignment=Assignment | formula=Formula\n\t\t//matrixDefinition=MatrixDefinition\n\t\tpublic Assignment getMatrixDefinitionAssignment_1() { return cMatrixDefinitionAssignment_1; }\n\n\t\t//MatrixDefinition\n\t\tpublic RuleCall getMatrixDefinitionMatrixDefinitionParserRuleCall_1_0() { return cMatrixDefinitionMatrixDefinitionParserRuleCall_1_0; }\n\t\t//assignment=Assignment\n\t\tpublic Assignment getAssignmentAssignment_2() { return cAssignmentAssignment_2; }\n\n\t\t//Assignment\n\t\tpublic RuleCall getAssignmentAssignmentParserRuleCall_2_0() { return cAssignmentAssignmentParserRuleCall_2_0; }\n\t\tpublic Assignment getFormulaAssignment_3() { return cFormulaAssignment_3; }\n\t\tpublic RuleCall getFormulaFormulaParserRuleCall_3_0() { return cFormulaFormulaParserRuleCall_3_0; }\n\tpublic class AssignmentElements extends AbstractParserRuleElementFinder {\n\t\tprivate final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), \"Assignment\");\n\t\t//Assignment:\n\t\t//\n\t\t//\n\t\tprivate final Keyword cHyphenMinusKeyword_1_0 = (Keyword)cGroup_1.eContents().get(0);\n\t\tprivate final Group cGroup_3 = (Group)cAlternatives.eContents().get(3);\n\t\tprivate final Action cIntervalAction_3_0 = (Action)cGroup_3.eContents().get(0);\n\t\tprivate final Assignment cOpeningBracketAssignment_3_1 = (Assignment)cGroup_3.eContents().get(1);\n\t\tprivate final Alternatives cOpeningBracketAlternatives_3_1_0 = (Alternatives)cOpeningBracketAssignment_3_1.eContents().get(0);\n\t\tprivate final Keyword cOpeningBracketLeftSquareBracketKeyword_3_1_0_0 = (Keyword)cOpeningBracketAlternatives_3_1_0.eContents().get(0);\n\t\tprivate final Keyword cOpeningBracketLeftParenthesisKeyword_3_1_0_1 = (Keyword)cOpeningBracketAlternatives_3_1_0.eContents().get(1);\n\t\tprivate final Keyword cLeftParenthesisKeyword_3_2 = (Keyword)cGroup_3.eContents().get(2);\n\t\tprivate final Assignment cCeilAssignment_3_3 = (Assignment)cGroup_3.eContents().get(3);\n\t\tprivate final RuleCall cCeilUnaryExpressionParserRuleCall_3_3_0 = (RuleCall)cCeilAssignment_3_3.eContents().get(0);\n\t\tprivate final Keyword cRightParenthesisKeyword_3_4 = (Keyword)cGroup_3.eContents().get(4);\n\t\tprivate final Keyword cFullStopFullStopKeyword_3_5 = (Keyword)cGroup_3.eContents().get(5);\n\t\tprivate final Keyword cLeftParenthesisKeyword_3_6 = (Keyword)cGroup_3.eContents().get(6);\n\t\tprivate final Assignment cFloorAssignment_3_7 = (Assignment)cGroup_3.eContents().get(7);\n\t\tprivate final RuleCall cFloorUnaryExpressionParserRuleCall_3_7_0 = (RuleCall)cFloorAssignment_3_7.eContents().get(0);\n\t\tprivate final Keyword cRightParenthesisKeyword_3_8 = (Keyword)cGroup_3.eContents().get(8);\n\t\tprivate final Assignment cClosingBracketAssignment_3_9 = (Assignment)cGroup_3.eContents().get(9);\n\t\tprivate final Alternatives cClosingBracketAlternatives_3_9_0 = (Alternatives)cClosingBracketAssignment_3_9.eContents().get(0);\n\t\tprivate final Keyword cClosingBracketRightSquareBracketKeyword_3_9_0_0 = (Keyword)cClosingBracketAlternatives_3_9_0.eContents().get(0);\n\t\tprivate final Keyword cClosingBracketRightParenthesisKeyword_3_9_0_1 = (Keyword)cClosingBracketAlternatives_3_9_0.eContents().get(1);\n\t\t//\n\t\t//\tExponent | \"-\" {Invert} expression=UnaryExpression | \"(\" {Factorial} expression=UnaryExpression \")!\" | {Interval}\n\t\t//\topeningBracket=(\"[\" | \"(\") \"(\" ceil=UnaryExpression \")\" \"..\" \"(\" floor=UnaryExpression \")\" closingBracket=(\"]\" | \")\");\n\t\t//Exponent | \"-\" {Invert} expression=UnaryExpression | \"(\" {Factorial} expression=UnaryExpression \")!\" | {Interval}\n\t\t//openingBracket=(\"[\" | \"(\") \"(\" ceil=UnaryExpression \")\" \"..\" \"(\" floor=UnaryExpression \")\" closingBracket=(\"]\" | \")\")\n\t\t//\"-\" {Invert} expression=UnaryExpression\n\t\t//\"-\"\n\t\tpublic Keyword getHyphenMinusKeyword_1_0() { return cHyphenMinusKeyword_1_0; }\n\n\t\t//{Interval} openingBracket=(\"[\" | \"(\") \"(\" ceil=UnaryExpression \")\" \"..\" \"(\" floor=UnaryExpression \")\"\n\t\t//closingBracket=(\"]\" | \")\")\n\t\tpublic Group getGroup_3() { return cGroup_3; }\n\n\t\t//{Interval}\n\t\tpublic Action getIntervalAction_3_0() { return cIntervalAction_3_0; }\n\n\t\t//openingBracket=(\"[\" | \"(\")\n\t\tpublic Assignment getOpeningBracketAssignment_3_1() { return cOpeningBracketAssignment_3_1; }\n\n\t\t//\"[\" | \"(\"\n\t\tpublic Alternatives getOpeningBracketAlternatives_3_1_0() { return cOpeningBracketAlternatives_3_1_0; }\n\n\t\t//\"[\"\n\t\tpublic Keyword getOpeningBracketLeftSquareBracketKeyword_3_1_0_0() { return cOpeningBracketLeftSquareBracketKeyword_3_1_0_0; }\n\n\t\t//\"(\"\n\t\tpublic Keyword getOpeningBracketLeftParenthesisKeyword_3_1_0_1() { return cOpeningBracketLeftParenthesisKeyword_3_1_0_1; }\n\n\t\t//\"(\"\n\t\tpublic Keyword getLeftParenthesisKeyword_3_2() { return cLeftParenthesisKeyword_3_2; }\n\n\t\t//ceil=UnaryExpression\n\t\tpublic Assignment getCeilAssignment_3_3() { return cCeilAssignment_3_3; }\n\n\t\t//UnaryExpression\n\t\tpublic RuleCall getCeilUnaryExpressionParserRuleCall_3_3_0() { return cCeilUnaryExpressionParserRuleCall_3_3_0; }\n\n\t\t//\")\"\n\t\tpublic Keyword getRightParenthesisKeyword_3_4() { return cRightParenthesisKeyword_3_4; }\n\n\t\t//\"..\"\n\t\tpublic Keyword getFullStopFullStopKeyword_3_5() { return cFullStopFullStopKeyword_3_5; }\n\n\t\t//\"(\"\n\t\tpublic Keyword getLeftParenthesisKeyword_3_6() { return cLeftParenthesisKeyword_3_6; }\n\n\t\t//floor=UnaryExpression\n\t\tpublic Assignment getFloorAssignment_3_7() { return cFloorAssignment_3_7; }\n\n\t\t//UnaryExpression\n\t\tpublic RuleCall getFloorUnaryExpressionParserRuleCall_3_7_0() { return cFloorUnaryExpressionParserRuleCall_3_7_0; }\n\n\t\t//\")\"\n\t\tpublic Keyword getRightParenthesisKeyword_3_8() { return cRightParenthesisKeyword_3_8; }\n\n\t\t//closingBracket=(\"]\" | \")\")\n\t\tpublic Assignment getClosingBracketAssignment_3_9() { return cClosingBracketAssignment_3_9; }\n\n\t\t//\"]\" | \")\"\n\t\tpublic Alternatives getClosingBracketAlternatives_3_9_0() { return cClosingBracketAlternatives_3_9_0; }\n\n\t\t//\"]\"\n\t\tpublic Keyword getClosingBracketRightSquareBracketKeyword_3_9_0_0() { return cClosingBracketRightSquareBracketKeyword_3_9_0_0; }\n\n\t\t//\")\"\n\t\tpublic Keyword getClosingBracketRightParenthesisKeyword_3_9_0_1() { return cClosingBracketRightParenthesisKeyword_3_9_0_1; }\n\t\t//\n\t\tprivate final Action cFunctionAction_2_0 = (Action)cGroup_2.eContents().get(0);\n\t\tprivate final Assignment cFunctionAssignment_2_1 = (Assignment)cGroup_2.eContents().get(1);\n\t\tprivate final RuleCall cFunctionFunctionParserRuleCall_2_1_0 = (RuleCall)cFunctionAssignment_2_1.eContents().get(0);\n\t\tprivate final Keyword cLeftParenthesisKeyword_3_0 = (Keyword)cGroup_3.eContents().get(0);\n\t\tprivate final RuleCall cAdditionParserRuleCall_3_1 = (RuleCall)cGroup_3.eContents().get(1);\n\t\tprivate final Keyword cRightParenthesisKeyword_3_2 = (Keyword)cGroup_3.eContents().get(2);\n\t\t//\t{Variable} name=MATH_NAME | {Float} value=Float | {Function} function=Function | \"(\" Addition \")\";\n\t\t//{Variable} name=MATH_NAME | {Float} value=Float | {Function} function=Function | \"(\" Addition \")\"\n\t\t//{Function} function=Function\n\t\tpublic Action getFunctionAction_2_0() { return cFunctionAction_2_0; }\n\t\tpublic Assignment getFunctionAssignment_2_1() { return cFunctionAssignment_2_1; }\n\t\tpublic RuleCall getFunctionFunctionParserRuleCall_2_1_0() { return cFunctionFunctionParserRuleCall_2_1_0; }\n\t\t//Addition\n\t\tpublic RuleCall getAdditionParserRuleCall_3_1() { return cAdditionParserRuleCall_3_1; }\n\n\tpublic class MatrixDefinitionElements extends AbstractParserRuleElementFinder {\n\t\tprivate final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), \"MatrixDefinition\");\n\t\tprivate final Group cGroup = (Group)rule.eContents().get(1);\n\t\tprivate final Assignment cNameAssignment_0 = (Assignment)cGroup.eContents().get(0);\n\t\tprivate final RuleCall cNameMATH_NAMETerminalRuleCall_0_0 = (RuleCall)cNameAssignment_0.eContents().get(0);\n\t\tprivate final Keyword cEqualsSignKeyword_1 = (Keyword)cGroup.eContents().get(1);\n\t\tprivate final Keyword cLeftCurlyBracketKeyword_2 = (Keyword)cGroup.eContents().get(2);\n\t\tprivate final Group cGroup_3 = (Group)cGroup.eContents().get(3);\n\t\tprivate final Assignment cRowsAssignment_3_0 = (Assignment)cGroup_3.eContents().get(0);\n\t\tprivate final RuleCall cRowsMatrixRowParserRuleCall_3_0_0 = (RuleCall)cRowsAssignment_3_0.eContents().get(0);\n\t\tprivate final Group cGroup_3_1 = (Group)cGroup_3.eContents().get(1);\n\t\tprivate final Keyword cCommaKeyword_3_1_0 = (Keyword)cGroup_3_1.eContents().get(0);\n\t\tprivate final Assignment cRowsAssignment_3_1_1 = (Assignment)cGroup_3_1.eContents().get(1);\n\t\tprivate final RuleCall cRowsMatrixRowParserRuleCall_3_1_1_0 = (RuleCall)cRowsAssignment_3_1_1.eContents().get(0);\n\t\tprivate final Keyword cCommaKeyword_3_2 = (Keyword)cGroup_3.eContents().get(2);\n\t\tprivate final Keyword cRightCurlyBracketKeyword_4 = (Keyword)cGroup.eContents().get(4);\n\t\t\n\t\t//MatrixDefinition:\n\t\t//\tname=MATH_NAME \"=\" \"{\" (rows+=MatrixRow (\",\" rows+=MatrixRow)* \",\"?)? \"}\";\n\t\tpublic ParserRule getRule() { return rule; }\n\n\t\t//name=MATH_NAME \"=\" \"{\" (rows+=MatrixRow (\",\" rows+=MatrixRow)* \",\"?)? \"}\"\n\t\tpublic Group getGroup() { return cGroup; }\n\n\t\t//name=MATH_NAME\n\t\tpublic Assignment getNameAssignment_0() { return cNameAssignment_0; }\n\n\t\t//MATH_NAME\n\t\tpublic RuleCall getNameMATH_NAMETerminalRuleCall_0_0() { return cNameMATH_NAMETerminalRuleCall_0_0; }\n\n\t\t//\"=\"\n\t\tpublic Keyword getEqualsSignKeyword_1() { return cEqualsSignKeyword_1; }\n\n\t\t//\"{\"\n\t\tpublic Keyword getLeftCurlyBracketKeyword_2() { return cLeftCurlyBracketKeyword_2; }\n\n\t\t//(rows+=MatrixRow (\",\" rows+=MatrixRow)* \",\"?)?\n\t\tpublic Group getGroup_3() { return cGroup_3; }\n\n\t\t//rows+=MatrixRow\n\t\tpublic Assignment getRowsAssignment_3_0() { return cRowsAssignment_3_0; }\n\n\t\t//MatrixRow\n\t\tpublic RuleCall getRowsMatrixRowParserRuleCall_3_0_0() { return cRowsMatrixRowParserRuleCall_3_0_0; }\n\n\t\t//(\",\" rows+=MatrixRow)*\n\t\tpublic Group getGroup_3_1() { return cGroup_3_1; }\n\n\t\t//\",\"\n\t\tpublic Keyword getCommaKeyword_3_1_0() { return cCommaKeyword_3_1_0; }\n\n\t\t//rows+=MatrixRow\n\t\tpublic Assignment getRowsAssignment_3_1_1() { return cRowsAssignment_3_1_1; }\n\n\t\t//MatrixRow\n\t\tpublic RuleCall getRowsMatrixRowParserRuleCall_3_1_1_0() { return cRowsMatrixRowParserRuleCall_3_1_1_0; }\n\n\t\t//\",\"?\n\t\tpublic Keyword getCommaKeyword_3_2() { return cCommaKeyword_3_2; }\n\n\t\t//\"}\"\n\t\tpublic Keyword getRightCurlyBracketKeyword_4() { return cRightCurlyBracketKeyword_4; }\n\t}\n\n\tpublic class MatrixRowElements extends AbstractParserRuleElementFinder {\n\t\tprivate final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), \"MatrixRow\");\n\t\tprivate final Group cGroup = (Group)rule.eContents().get(1);\n\t\tprivate final Keyword cLeftCurlyBracketKeyword_0 = (Keyword)cGroup.eContents().get(0);\n\t\tprivate final Group cGroup_1 = (Group)cGroup.eContents().get(1);\n\t\tprivate final Assignment cElementsAssignment_1_0 = (Assignment)cGroup_1.eContents().get(0);\n\t\tprivate final RuleCall cElementsFloatParserRuleCall_1_0_0 = (RuleCall)cElementsAssignment_1_0.eContents().get(0);\n\t\tprivate final Group cGroup_1_1 = (Group)cGroup_1.eContents().get(1);\n\t\tprivate final Keyword cCommaKeyword_1_1_0 = (Keyword)cGroup_1_1.eContents().get(0);\n\t\tprivate final Assignment cElementsAssignment_1_1_1 = (Assignment)cGroup_1_1.eContents().get(1);\n\t\tprivate final RuleCall cElementsFloatParserRuleCall_1_1_1_0 = (RuleCall)cElementsAssignment_1_1_1.eContents().get(0);\n\t\tprivate final Keyword cCommaKeyword_1_2 = (Keyword)cGroup_1.eContents().get(2);\n\t\tprivate final Keyword cRightCurlyBracketKeyword_2 = (Keyword)cGroup.eContents().get(2);\n\t\t\n\t\t//MatrixRow:\n\t\t//\t\"{\" (elements+=Float (\",\" elements+=Float)* \",\"?)? \"}\";\n\t\tpublic ParserRule getRule() { return rule; }\n\n\t\t//\"{\" (elements+=Float (\",\" elements+=Float)* \",\"?)? \"}\"\n\t\tpublic Group getGroup() { return cGroup; }\n\n\t\t//\"{\"\n\t\tpublic Keyword getLeftCurlyBracketKeyword_0() { return cLeftCurlyBracketKeyword_0; }\n\n\t\t//(elements+=Float (\",\" elements+=Float)* \",\"?)?\n\t\tpublic Group getGroup_1() { return cGroup_1; }\n\n\t\t//elements+=Float\n\t\tpublic Assignment getElementsAssignment_1_0() { return cElementsAssignment_1_0; }\n\n\t\t//Float\n\t\tpublic RuleCall getElementsFloatParserRuleCall_1_0_0() { return cElementsFloatParserRuleCall_1_0_0; }\n\n\t\t//(\",\" elements+=Float)*\n\t\tpublic Group getGroup_1_1() { return cGroup_1_1; }\n\n\t\t//\",\"\n\t\tpublic Keyword getCommaKeyword_1_1_0() { return cCommaKeyword_1_1_0; }\n\n\t\t//elements+=Float\n\t\tpublic Assignment getElementsAssignment_1_1_1() { return cElementsAssignment_1_1_1; }\n\n\t\t//Float\n\t\tpublic RuleCall getElementsFloatParserRuleCall_1_1_1_0() { return cElementsFloatParserRuleCall_1_1_1_0; }\n\n\t\t//\",\"?\n\t\tpublic Keyword getCommaKeyword_1_2() { return cCommaKeyword_1_2; }\n\n\t\t//\"}\"\n\t\tpublic Keyword getRightCurlyBracketKeyword_2() { return cRightCurlyBracketKeyword_2; }\n\t}\n\tprivate AssignmentElements pAssignment;\n\tprivate MatrixDefinitionElements pMatrixDefinition;\n\tprivate MatrixRowElements pMatrixRow;\n\t//\tfunctionDefinition=FunctionDefinition | matrixDefinition=MatrixDefinition | assignment=Assignment | formula=Formula;\n\t//Assignment:\n\tpublic AssignmentElements getAssignmentAccess() {\n\t\treturn (pAssignment != null) ? pAssignment : (pAssignment = new AssignmentElements());\n\tpublic ParserRule getAssignmentRule() {\n\t\treturn getAssignmentAccess().getRule();\n\t//\n\t//\n\t//\n\t//\tExponent | \"-\" {Invert} expression=UnaryExpression | \"(\" {Factorial} expression=UnaryExpression \")!\" | {Interval}\n\t//\topeningBracket=(\"[\" | \"(\") \"(\" ceil=UnaryExpression \")\" \"..\" \"(\" floor=UnaryExpression \")\" closingBracket=(\"]\" | \")\");\n\t//\n\t//\t{Variable} name=MATH_NAME | {Float} value=Float | {Function} function=Function | \"(\" Addition \")\";\n\t//MatrixDefinition:\n\t//\tname=MATH_NAME \"=\" \"{\" (rows+=MatrixRow (\",\" rows+=MatrixRow)* \",\"?)? \"}\";\n\tpublic MatrixDefinitionElements getMatrixDefinitionAccess() {\n\t\treturn (pMatrixDefinition != null) ? pMatrixDefinition : (pMatrixDefinition = new MatrixDefinitionElements());\n\t}\n\t\n\tpublic ParserRule getMatrixDefinitionRule() {\n\t\treturn getMatrixDefinitionAccess().getRule();\n\t}\n\n\t//MatrixRow:\n\t//\t\"{\" (elements+=Float (\",\" elements+=Float)* \",\"?)? \"}\";\n\tpublic MatrixRowElements getMatrixRowAccess() {\n\t\treturn (pMatrixRow != null) ? pMatrixRow : (pMatrixRow = new MatrixRowElements());\n\t}\n\t\n\tpublic ParserRule getMatrixRowRule() {\n\t\treturn getMatrixRowAccess().getRule();\n\t}\n", "old_methods": [ { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cMatrixDefinitionAssignment_1;", "signature": "Assignment getMatrixDefinitionAssignment_1()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cMatrixDefinitionMatrixDefinitionParserRuleCall_1_0;", "signature": "RuleCall getMatrixDefinitionMatrixDefinitionParserRuleCall_1_0()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cAssignmentAssignment_2;", "signature": "Assignment getAssignmentAssignment_2()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cAssignmentAssignmentParserRuleCall_2_0;", "signature": "RuleCall getAssignmentAssignmentParserRuleCall_2_0()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cFormulaAssignment_3;", "signature": "Assignment getFormulaAssignment_3()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cFormulaFormulaParserRuleCall_3_0;", "signature": "RuleCall getFormulaFormulaParserRuleCall_3_0()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cHyphenMinusKeyword_1_0;", "signature": "Keyword getHyphenMinusKeyword_1_0()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cGroup_3;", "signature": "Group getGroup_3()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cIntervalAction_3_0;", "signature": "Action getIntervalAction_3_0()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cOpeningBracketAssignment_3_1;", "signature": "Assignment getOpeningBracketAssignment_3_1()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cOpeningBracketAlternatives_3_1_0;", "signature": "Alternatives getOpeningBracketAlternatives_3_1_0()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cOpeningBracketLeftSquareBracketKeyword_3_1_0_0;", "signature": "Keyword getOpeningBracketLeftSquareBracketKeyword_3_1_0_0()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cOpeningBracketLeftParenthesisKeyword_3_1_0_1;", "signature": "Keyword getOpeningBracketLeftParenthesisKeyword_3_1_0_1()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cLeftParenthesisKeyword_3_2;", "signature": "Keyword getLeftParenthesisKeyword_3_2()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cCeilAssignment_3_3;", "signature": "Assignment getCeilAssignment_3_3()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cCeilUnaryExpressionParserRuleCall_3_3_0;", "signature": "RuleCall getCeilUnaryExpressionParserRuleCall_3_3_0()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cRightParenthesisKeyword_3_4;", "signature": "Keyword getRightParenthesisKeyword_3_4()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cFullStopFullStopKeyword_3_5;", "signature": "Keyword getFullStopFullStopKeyword_3_5()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cLeftParenthesisKeyword_3_6;", "signature": "Keyword getLeftParenthesisKeyword_3_6()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cFloorAssignment_3_7;", "signature": "Assignment getFloorAssignment_3_7()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cFloorUnaryExpressionParserRuleCall_3_7_0;", "signature": "RuleCall getFloorUnaryExpressionParserRuleCall_3_7_0()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cRightParenthesisKeyword_3_8;", "signature": "Keyword getRightParenthesisKeyword_3_8()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cClosingBracketAssignment_3_9;", "signature": "Assignment getClosingBracketAssignment_3_9()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cClosingBracketAlternatives_3_9_0;", "signature": "Alternatives getClosingBracketAlternatives_3_9_0()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cClosingBracketRightSquareBracketKeyword_3_9_0_0;", "signature": "Keyword getClosingBracketRightSquareBracketKeyword_3_9_0_0()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cClosingBracketRightParenthesisKeyword_3_9_0_1;", "signature": "Keyword getClosingBracketRightParenthesisKeyword_3_9_0_1()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cFunctionAction_2_0;", "signature": "Action getFunctionAction_2_0()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cFunctionAssignment_2_1;", "signature": "Assignment getFunctionAssignment_2_1()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cFunctionFunctionParserRuleCall_2_1_0;", "signature": "RuleCall getFunctionFunctionParserRuleCall_2_1_0()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cAdditionParserRuleCall_3_1;", "signature": "RuleCall getAdditionParserRuleCall_3_1()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return rule;", "signature": "ParserRule getRule()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cGroup;", "signature": "Group getGroup()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cNameAssignment_0;", "signature": "Assignment getNameAssignment_0()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cNameMATH_NAMETerminalRuleCall_0_0;", "signature": "RuleCall getNameMATH_NAMETerminalRuleCall_0_0()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cEqualsSignKeyword_1;", "signature": "Keyword getEqualsSignKeyword_1()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cLeftCurlyBracketKeyword_2;", "signature": "Keyword getLeftCurlyBracketKeyword_2()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cGroup_3;", "signature": "Group getGroup_3()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cRowsAssignment_3_0;", "signature": "Assignment getRowsAssignment_3_0()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cRowsMatrixRowParserRuleCall_3_0_0;", "signature": "RuleCall getRowsMatrixRowParserRuleCall_3_0_0()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cGroup_3_1;", "signature": "Group getGroup_3_1()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cCommaKeyword_3_1_0;", "signature": "Keyword getCommaKeyword_3_1_0()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cRowsAssignment_3_1_1;", "signature": "Assignment getRowsAssignment_3_1_1()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cRowsMatrixRowParserRuleCall_3_1_1_0;", "signature": "RuleCall getRowsMatrixRowParserRuleCall_3_1_1_0()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cCommaKeyword_3_2;", "signature": "Keyword getCommaKeyword_3_2()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cRightCurlyBracketKeyword_4;", "signature": "Keyword getRightCurlyBracketKeyword_4()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return rule;", "signature": "ParserRule getRule()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cGroup;", "signature": "Group getGroup()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cLeftCurlyBracketKeyword_0;", "signature": "Keyword getLeftCurlyBracketKeyword_0()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cGroup_1;", "signature": "Group getGroup_1()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cElementsAssignment_1_0;", "signature": "Assignment getElementsAssignment_1_0()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cElementsFloatParserRuleCall_1_0_0;", "signature": "RuleCall getElementsFloatParserRuleCall_1_0_0()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cGroup_1_1;", "signature": "Group getGroup_1_1()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cCommaKeyword_1_1_0;", "signature": "Keyword getCommaKeyword_1_1_0()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cElementsAssignment_1_1_1;", "signature": "Assignment getElementsAssignment_1_1_1()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cElementsFloatParserRuleCall_1_1_1_0;", "signature": "RuleCall getElementsFloatParserRuleCall_1_1_1_0()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cCommaKeyword_1_2;", "signature": "Keyword getCommaKeyword_1_2()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return cRightCurlyBracketKeyword_2;", "signature": "Keyword getRightCurlyBracketKeyword_2()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return (pAssignment != null) ? pAssignment : (pAssignment = new AssignmentElements());\n\tpublic ParserRule getAssignmentRule() {\n\t\treturn getAssignmentAccess().getRule();\n\t//\n\t//\n\t//\n\t//\tExponent | \"-\" {Invert", "signature": "AssignmentElements getAssignmentAccess()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return (pMatrixDefinition != null) ? pMatrixDefinition : (pMatrixDefinition = new MatrixDefinitionElements());", "signature": "MatrixDefinitionElements getMatrixDefinitionAccess()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return getMatrixDefinitionAccess().getRule();", "signature": "ParserRule getMatrixDefinitionRule()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return (pMatrixRow != null) ? pMatrixRow : (pMatrixRow = new MatrixRowElements());", "signature": "MatrixRowElements getMatrixRowAccess()" }, { "arguments": [], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src-gen/org/eclipse/iee/translator/jmole/math/services/MathGrammarAccess.java", "implementation": "return getMatrixRowAccess().getRule();", "signature": "ParserRule getMatrixRowRule()" } ], "patch": "@@ -22,18 +22,22 @@ public class StatementElements extends AbstractParserRuleElementFinder {\n \t\tprivate final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);\n \t\tprivate final Assignment cFunctionDefinitionAssignment_0 = (Assignment)cAlternatives.eContents().get(0);\n \t\tprivate final RuleCall cFunctionDefinitionFunctionDefinitionParserRuleCall_0_0 = (RuleCall)cFunctionDefinitionAssignment_0.eContents().get(0);\n-\t\tprivate final Assignment cMatrixDefinitionAssignment_1 = (Assignment)cAlternatives.eContents().get(1);\n-\t\tprivate final RuleCall cMatrixDefinitionMatrixDefinitionParserRuleCall_1_0 = (RuleCall)cMatrixDefinitionAssignment_1.eContents().get(0);\n-\t\tprivate final Assignment cAssignmentAssignment_2 = (Assignment)cAlternatives.eContents().get(2);\n-\t\tprivate final RuleCall cAssignmentAssignmentParserRuleCall_2_0 = (RuleCall)cAssignmentAssignment_2.eContents().get(0);\n-\t\tprivate final Assignment cFormulaAssignment_3 = (Assignment)cAlternatives.eContents().get(3);\n-\t\tprivate final RuleCall cFormulaFormulaParserRuleCall_3_0 = (RuleCall)cFormulaAssignment_3.eContents().get(0);\n+\t\tprivate final Assignment cVariableAssignmentAssignment_1 = (Assignment)cAlternatives.eContents().get(1);\n+\t\tprivate final RuleCall cVariableAssignmentVariableAssignmentParserRuleCall_1_0 = (RuleCall)cVariableAssignmentAssignment_1.eContents().get(0);\n+\t\tprivate final Assignment cFormulaAssignment_2 = (Assignment)cAlternatives.eContents().get(2);\n+\t\tprivate final RuleCall cFormulaFormulaParserRuleCall_2_0 = (RuleCall)cFormulaAssignment_2.eContents().get(0);\n+\t\tprivate final Assignment cMatrixAssignmentAssignment_3 = (Assignment)cAlternatives.eContents().get(3);\n+\t\tprivate final RuleCall cMatrixAssignmentMatrixAssignmentParserRuleCall_3_0 = (RuleCall)cMatrixAssignmentAssignment_3.eContents().get(0);\n+\t\tprivate final Assignment cMatrixFormulaAssignment_4 = (Assignment)cAlternatives.eContents().get(4);\n+\t\tprivate final RuleCall cMatrixFormulaMatrixFormulaParserRuleCall_4_0 = (RuleCall)cMatrixFormulaAssignment_4.eContents().get(0);\n \t\t\n \t\t//Statement:\n-\t\t//\tfunctionDefinition=FunctionDefinition | matrixDefinition=MatrixDefinition | assignment=Assignment | formula=Formula;\n+\t\t//\tfunctionDefinition=FunctionDefinition | variableAssignment=VariableAssignment | formula=Formula |\n+\t\t//\tmatrixAssignment=MatrixAssignment | matrixFormula=MatrixFormula;\n \t\tpublic ParserRule getRule() { return rule; }\n \n-\t\t//functionDefinition=FunctionDefinition | matrixDefinition=MatrixDefinition | assignment=Assignment | formula=Formula\n+\t\t//functionDefinition=FunctionDefinition | variableAssignment=VariableAssignment | formula=Formula |\n+\t\t//matrixAssignment=MatrixAssignment | matrixFormula=MatrixFormula\n \t\tpublic Alternatives getAlternatives() { return cAlternatives; }\n \n \t\t//functionDefinition=FunctionDefinition\n@@ -42,35 +46,41 @@ public class StatementElements extends AbstractParserRuleElementFinder {\n \t\t//FunctionDefinition\n \t\tpublic RuleCall getFunctionDefinitionFunctionDefinitionParserRuleCall_0_0() { return cFunctionDefinitionFunctionDefinitionParserRuleCall_0_0; }\n \n-\t\t//matrixDefinition=MatrixDefinition\n-\t\tpublic Assignment getMatrixDefinitionAssignment_1() { return cMatrixDefinitionAssignment_1; }\n-\n-\t\t//MatrixDefinition\n-\t\tpublic RuleCall getMatrixDefinitionMatrixDefinitionParserRuleCall_1_0() { return cMatrixDefinitionMatrixDefinitionParserRuleCall_1_0; }\n+\t\t//variableAssignment=VariableAssignment\n+\t\tpublic Assignment getVariableAssignmentAssignment_1() { return cVariableAssignmentAssignment_1; }\n \n-\t\t//assignment=Assignment\n-\t\tpublic Assignment getAssignmentAssignment_2() { return cAssignmentAssignment_2; }\n-\n-\t\t//Assignment\n-\t\tpublic RuleCall getAssignmentAssignmentParserRuleCall_2_0() { return cAssignmentAssignmentParserRuleCall_2_0; }\n+\t\t//VariableAssignment\n+\t\tpublic RuleCall getVariableAssignmentVariableAssignmentParserRuleCall_1_0() { return cVariableAssignmentVariableAssignmentParserRuleCall_1_0; }\n \n \t\t//formula=Formula\n-\t\tpublic Assignment getFormulaAssignment_3() { return cFormulaAssignment_3; }\n+\t\tpublic Assignment getFormulaAssignment_2() { return cFormulaAssignment_2; }\n \n \t\t//Formula\n-\t\tpublic RuleCall getFormulaFormulaParserRuleCall_3_0() { return cFormulaFormulaParserRuleCall_3_0; }\n+\t\tpublic RuleCall getFormulaFormulaParserRuleCall_2_0() { return cFormulaFormulaParserRuleCall_2_0; }\n+\n+\t\t//matrixAssignment=MatrixAssignment\n+\t\tpublic Assignment getMatrixAssignmentAssignment_3() { return cMatrixAssignmentAssignment_3; }\n+\n+\t\t//MatrixAssignment\n+\t\tpublic RuleCall getMatrixAssignmentMatrixAssignmentParserRuleCall_3_0() { return cMatrixAssignmentMatrixAssignmentParserRuleCall_3_0; }\n+\n+\t\t//matrixFormula=MatrixFormula\n+\t\tpublic Assignment getMatrixFormulaAssignment_4() { return cMatrixFormulaAssignment_4; }\n+\n+\t\t//MatrixFormula\n+\t\tpublic RuleCall getMatrixFormulaMatrixFormulaParserRuleCall_4_0() { return cMatrixFormulaMatrixFormulaParserRuleCall_4_0; }\n \t}\n \n-\tpublic class AssignmentElements extends AbstractParserRuleElementFinder {\n-\t\tprivate final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), \"Assignment\");\n+\tpublic class VariableAssignmentElements extends AbstractParserRuleElementFinder {\n+\t\tprivate final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), \"VariableAssignment\");\n \t\tprivate final Group cGroup = (Group)rule.eContents().get(1);\n \t\tprivate final Assignment cVariableAssignment_0 = (Assignment)cGroup.eContents().get(0);\n \t\tprivate final RuleCall cVariableMATH_NAMETerminalRuleCall_0_0 = (RuleCall)cVariableAssignment_0.eContents().get(0);\n \t\tprivate final Keyword cEqualsSignKeyword_1 = (Keyword)cGroup.eContents().get(1);\n \t\tprivate final Assignment cValueAssignment_2 = (Assignment)cGroup.eContents().get(2);\n \t\tprivate final RuleCall cValueFormulaParserRuleCall_2_0 = (RuleCall)cValueAssignment_2.eContents().get(0);\n \t\t\n-\t\t//Assignment:\n+\t\t//VariableAssignment:\n \t\t//\tvariable=MATH_NAME \"=\" value=Formula;\n \t\tpublic ParserRule getRule() { return rule; }\n \n@@ -126,7 +136,6 @@ public class AdditionElements extends AbstractParserRuleElementFinder {\n \t\tprivate final RuleCall cRightMultiplicationParserRuleCall_1_1_2_0 = (RuleCall)cRightAssignment_1_1_2.eContents().get(0);\n \t\t\n \t\t//// addition/subtraction: left associative, priority 0\n-\t\t//\n \t\t//Addition returns Expression:\n \t\t//\tMultiplication (\"+\" {Addition.left=current} right=Multiplication | \"-\" {Subtraction.left=current}\n \t\t//\tright=Multiplication)*;\n@@ -194,7 +203,6 @@ public class MultiplicationElements extends AbstractParserRuleElementFinder {\n \t\tprivate final RuleCall cRightUnaryExpressionParserRuleCall_1_2_2_0 = (RuleCall)cRightAssignment_1_2_2.eContents().get(0);\n \t\t\n \t\t//// multiplication/division, left associative, priority 1\n-\t\t//\n \t\t//Multiplication returns Expression:\n \t\t//\tUnaryExpression (\"*\" {Multiplication.left=current} right=UnaryExpression | \"/\" {Division.left=current}\n \t\t//\tright=UnaryExpression | \"%\" {Modulo.left=current} right=UnaryExpression)*;\n@@ -262,55 +270,34 @@ public class UnaryExpressionElements extends AbstractParserRuleElementFinder {\n \t\tprivate final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);\n \t\tprivate final RuleCall cExponentParserRuleCall_0 = (RuleCall)cAlternatives.eContents().get(0);\n \t\tprivate final Group cGroup_1 = (Group)cAlternatives.eContents().get(1);\n-\t\tprivate final Keyword cHyphenMinusKeyword_1_0 = (Keyword)cGroup_1.eContents().get(0);\n+\t\tprivate final Keyword cLeftParenthesisHyphenMinusKeyword_1_0 = (Keyword)cGroup_1.eContents().get(0);\n \t\tprivate final Action cInvertAction_1_1 = (Action)cGroup_1.eContents().get(1);\n \t\tprivate final Assignment cExpressionAssignment_1_2 = (Assignment)cGroup_1.eContents().get(2);\n \t\tprivate final RuleCall cExpressionUnaryExpressionParserRuleCall_1_2_0 = (RuleCall)cExpressionAssignment_1_2.eContents().get(0);\n+\t\tprivate final Keyword cRightParenthesisKeyword_1_3 = (Keyword)cGroup_1.eContents().get(3);\n \t\tprivate final Group cGroup_2 = (Group)cAlternatives.eContents().get(2);\n \t\tprivate final Keyword cLeftParenthesisKeyword_2_0 = (Keyword)cGroup_2.eContents().get(0);\n \t\tprivate final Action cFactorialAction_2_1 = (Action)cGroup_2.eContents().get(1);\n \t\tprivate final Assignment cExpressionAssignment_2_2 = (Assignment)cGroup_2.eContents().get(2);\n \t\tprivate final RuleCall cExpressionUnaryExpressionParserRuleCall_2_2_0 = (RuleCall)cExpressionAssignment_2_2.eContents().get(0);\n \t\tprivate final Keyword cRightParenthesisExclamationMarkKeyword_2_3 = (Keyword)cGroup_2.eContents().get(3);\n-\t\tprivate final Group cGroup_3 = (Group)cAlternatives.eContents().get(3);\n-\t\tprivate final Action cIntervalAction_3_0 = (Action)cGroup_3.eContents().get(0);\n-\t\tprivate final Assignment cOpeningBracketAssignment_3_1 = (Assignment)cGroup_3.eContents().get(1);\n-\t\tprivate final Alternatives cOpeningBracketAlternatives_3_1_0 = (Alternatives)cOpeningBracketAssignment_3_1.eContents().get(0);\n-\t\tprivate final Keyword cOpeningBracketLeftSquareBracketKeyword_3_1_0_0 = (Keyword)cOpeningBracketAlternatives_3_1_0.eContents().get(0);\n-\t\tprivate final Keyword cOpeningBracketLeftParenthesisKeyword_3_1_0_1 = (Keyword)cOpeningBracketAlternatives_3_1_0.eContents().get(1);\n-\t\tprivate final Keyword cLeftParenthesisKeyword_3_2 = (Keyword)cGroup_3.eContents().get(2);\n-\t\tprivate final Assignment cCeilAssignment_3_3 = (Assignment)cGroup_3.eContents().get(3);\n-\t\tprivate final RuleCall cCeilUnaryExpressionParserRuleCall_3_3_0 = (RuleCall)cCeilAssignment_3_3.eContents().get(0);\n-\t\tprivate final Keyword cRightParenthesisKeyword_3_4 = (Keyword)cGroup_3.eContents().get(4);\n-\t\tprivate final Keyword cFullStopFullStopKeyword_3_5 = (Keyword)cGroup_3.eContents().get(5);\n-\t\tprivate final Keyword cLeftParenthesisKeyword_3_6 = (Keyword)cGroup_3.eContents().get(6);\n-\t\tprivate final Assignment cFloorAssignment_3_7 = (Assignment)cGroup_3.eContents().get(7);\n-\t\tprivate final RuleCall cFloorUnaryExpressionParserRuleCall_3_7_0 = (RuleCall)cFloorAssignment_3_7.eContents().get(0);\n-\t\tprivate final Keyword cRightParenthesisKeyword_3_8 = (Keyword)cGroup_3.eContents().get(8);\n-\t\tprivate final Assignment cClosingBracketAssignment_3_9 = (Assignment)cGroup_3.eContents().get(9);\n-\t\tprivate final Alternatives cClosingBracketAlternatives_3_9_0 = (Alternatives)cClosingBracketAssignment_3_9.eContents().get(0);\n-\t\tprivate final Keyword cClosingBracketRightSquareBracketKeyword_3_9_0_0 = (Keyword)cClosingBracketAlternatives_3_9_0.eContents().get(0);\n-\t\tprivate final Keyword cClosingBracketRightParenthesisKeyword_3_9_0_1 = (Keyword)cClosingBracketAlternatives_3_9_0.eContents().get(1);\n \t\t\n \t\t//// Unary operators: right associative, priority 2\n-\t\t//\n \t\t//UnaryExpression returns Expression:\n-\t\t//\tExponent | \"-\" {Invert} expression=UnaryExpression | \"(\" {Factorial} expression=UnaryExpression \")!\" | {Interval}\n-\t\t//\topeningBracket=(\"[\" | \"(\") \"(\" ceil=UnaryExpression \")\" \"..\" \"(\" floor=UnaryExpression \")\" closingBracket=(\"]\" | \")\");\n+\t\t//\tExponent | \"(-\" {Invert} expression=UnaryExpression \")\" | \"(\" {Factorial} expression=UnaryExpression \")!\";\n \t\tpublic ParserRule getRule() { return rule; }\n \n-\t\t//Exponent | \"-\" {Invert} expression=UnaryExpression | \"(\" {Factorial} expression=UnaryExpression \")!\" | {Interval}\n-\t\t//openingBracket=(\"[\" | \"(\") \"(\" ceil=UnaryExpression \")\" \"..\" \"(\" floor=UnaryExpression \")\" closingBracket=(\"]\" | \")\")\n+\t\t//Exponent | \"(-\" {Invert} expression=UnaryExpression \")\" | \"(\" {Factorial} expression=UnaryExpression \")!\"\n \t\tpublic Alternatives getAlternatives() { return cAlternatives; }\n \n \t\t//Exponent\n \t\tpublic RuleCall getExponentParserRuleCall_0() { return cExponentParserRuleCall_0; }\n \n-\t\t//\"-\" {Invert} expression=UnaryExpression\n+\t\t//\"(-\" {Invert} expression=UnaryExpression \")\"\n \t\tpublic Group getGroup_1() { return cGroup_1; }\n \n-\t\t//\"-\"\n-\t\tpublic Keyword getHyphenMinusKeyword_1_0() { return cHyphenMinusKeyword_1_0; }\n+\t\t//\"(-\"\n+\t\tpublic Keyword getLeftParenthesisHyphenMinusKeyword_1_0() { return cLeftParenthesisHyphenMinusKeyword_1_0; }\n \n \t\t//{Invert}\n \t\tpublic Action getInvertAction_1_1() { return cInvertAction_1_1; }\n@@ -321,6 +308,9 @@ public class UnaryExpressionElements extends AbstractParserRuleElementFinder {\n \t\t//UnaryExpression\n \t\tpublic RuleCall getExpressionUnaryExpressionParserRuleCall_1_2_0() { return cExpressionUnaryExpressionParserRuleCall_1_2_0; }\n \n+\t\t//\")\"\n+\t\tpublic Keyword getRightParenthesisKeyword_1_3() { return cRightParenthesisKeyword_1_3; }\n+\n \t\t//\"(\" {Factorial} expression=UnaryExpression \")!\"\n \t\tpublic Group getGroup_2() { return cGroup_2; }\n \n@@ -338,64 +328,6 @@ public class UnaryExpressionElements extends AbstractParserRuleElementFinder {\n \n \t\t//\")!\"\n \t\tpublic Keyword getRightParenthesisExclamationMarkKeyword_2_3() { return cRightParenthesisExclamationMarkKeyword_2_3; }\n-\n-\t\t//{Interval} openingBracket=(\"[\" | \"(\") \"(\" ceil=UnaryExpression \")\" \"..\" \"(\" floor=UnaryExpression \")\"\n-\t\t//closingBracket=(\"]\" | \")\")\n-\t\tpublic Group getGroup_3() { return cGroup_3; }\n-\n-\t\t//{Interval}\n-\t\tpublic Action getIntervalAction_3_0() { return cIntervalAction_3_0; }\n-\n-\t\t//openingBracket=(\"[\" | \"(\")\n-\t\tpublic Assignment getOpeningBracketAssignment_3_1() { return cOpeningBracketAssignment_3_1; }\n-\n-\t\t//\"[\" | \"(\"\n-\t\tpublic Alternatives getOpeningBracketAlternatives_3_1_0() { return cOpeningBracketAlternatives_3_1_0; }\n-\n-\t\t//\"[\"\n-\t\tpublic Keyword getOpeningBracketLeftSquareBracketKeyword_3_1_0_0() { return cOpeningBracketLeftSquareBracketKeyword_3_1_0_0; }\n-\n-\t\t//\"(\"\n-\t\tpublic Keyword getOpeningBracketLeftParenthesisKeyword_3_1_0_1() { return cOpeningBracketLeftParenthesisKeyword_3_1_0_1; }\n-\n-\t\t//\"(\"\n-\t\tpublic Keyword getLeftParenthesisKeyword_3_2() { return cLeftParenthesisKeyword_3_2; }\n-\n-\t\t//ceil=UnaryExpression\n-\t\tpublic Assignment getCeilAssignment_3_3() { return cCeilAssignment_3_3; }\n-\n-\t\t//UnaryExpression\n-\t\tpublic RuleCall getCeilUnaryExpressionParserRuleCall_3_3_0() { return cCeilUnaryExpressionParserRuleCall_3_3_0; }\n-\n-\t\t//\")\"\n-\t\tpublic Keyword getRightParenthesisKeyword_3_4() { return cRightParenthesisKeyword_3_4; }\n-\n-\t\t//\"..\"\n-\t\tpublic Keyword getFullStopFullStopKeyword_3_5() { return cFullStopFullStopKeyword_3_5; }\n-\n-\t\t//\"(\"\n-\t\tpublic Keyword getLeftParenthesisKeyword_3_6() { return cLeftParenthesisKeyword_3_6; }\n-\n-\t\t//floor=UnaryExpression\n-\t\tpublic Assignment getFloorAssignment_3_7() { return cFloorAssignment_3_7; }\n-\n-\t\t//UnaryExpression\n-\t\tpublic RuleCall getFloorUnaryExpressionParserRuleCall_3_7_0() { return cFloorUnaryExpressionParserRuleCall_3_7_0; }\n-\n-\t\t//\")\"\n-\t\tpublic Keyword getRightParenthesisKeyword_3_8() { return cRightParenthesisKeyword_3_8; }\n-\n-\t\t//closingBracket=(\"]\" | \")\")\n-\t\tpublic Assignment getClosingBracketAssignment_3_9() { return cClosingBracketAssignment_3_9; }\n-\n-\t\t//\"]\" | \")\"\n-\t\tpublic Alternatives getClosingBracketAlternatives_3_9_0() { return cClosingBracketAlternatives_3_9_0; }\n-\n-\t\t//\"]\"\n-\t\tpublic Keyword getClosingBracketRightSquareBracketKeyword_3_9_0_0() { return cClosingBracketRightSquareBracketKeyword_3_9_0_0; }\n-\n-\t\t//\")\"\n-\t\tpublic Keyword getClosingBracketRightParenthesisKeyword_3_9_0_1() { return cClosingBracketRightParenthesisKeyword_3_9_0_1; }\n \t}\n \n \tpublic class ExponentElements extends AbstractParserRuleElementFinder {\n@@ -409,7 +341,6 @@ public class ExponentElements extends AbstractParserRuleElementFinder {\n \t\tprivate final RuleCall cRightPrimaryParserRuleCall_1_2_0 = (RuleCall)cRightAssignment_1_2.eContents().get(0);\n \t\t\n \t\t//// exponentiation: right associative, priority 3\n-\t\t//\n \t\t//Exponent returns Expression:\n \t\t//\tPrimary ({Exponent.left=current} \"^\" right=Primary)?;\n \t\tpublic ParserRule getRule() { return rule; }\n@@ -448,19 +379,33 @@ public class PrimaryElements extends AbstractParserRuleElementFinder {\n \t\tprivate final Assignment cValueAssignment_1_1 = (Assignment)cGroup_1.eContents().get(1);\n \t\tprivate final RuleCall cValueFloatParserRuleCall_1_1_0 = (RuleCall)cValueAssignment_1_1.eContents().get(0);\n \t\tprivate final Group cGroup_2 = (Group)cAlternatives.eContents().get(2);\n-\t\tprivate final Action cFunctionAction_2_0 = (Action)cGroup_2.eContents().get(0);\n-\t\tprivate final Assignment cFunctionAssignment_2_1 = (Assignment)cGroup_2.eContents().get(1);\n-\t\tprivate final RuleCall cFunctionFunctionParserRuleCall_2_1_0 = (RuleCall)cFunctionAssignment_2_1.eContents().get(0);\n+\t\tprivate final Action cMatrixElementAction_2_0 = (Action)cGroup_2.eContents().get(0);\n+\t\tprivate final Assignment cElementAssignment_2_1 = (Assignment)cGroup_2.eContents().get(1);\n+\t\tprivate final RuleCall cElementMATH_NAMETerminalRuleCall_2_1_0 = (RuleCall)cElementAssignment_2_1.eContents().get(0);\n+\t\tprivate final Keyword cLeftSquareBracketKeyword_2_2 = (Keyword)cGroup_2.eContents().get(2);\n+\t\tprivate final Assignment cRowAssignment_2_3 = (Assignment)cGroup_2.eContents().get(3);\n+\t\tprivate final RuleCall cRowINTTerminalRuleCall_2_3_0 = (RuleCall)cRowAssignment_2_3.eContents().get(0);\n+\t\tprivate final Keyword cRightSquareBracketKeyword_2_4 = (Keyword)cGroup_2.eContents().get(4);\n+\t\tprivate final Keyword cLeftSquareBracketKeyword_2_5 = (Keyword)cGroup_2.eContents().get(5);\n+\t\tprivate final Assignment cColumnAssignment_2_6 = (Assignment)cGroup_2.eContents().get(6);\n+\t\tprivate final RuleCall cColumnINTTerminalRuleCall_2_6_0 = (RuleCall)cColumnAssignment_2_6.eContents().get(0);\n+\t\tprivate final Keyword cRightSquareBracketKeyword_2_7 = (Keyword)cGroup_2.eContents().get(7);\n \t\tprivate final Group cGroup_3 = (Group)cAlternatives.eContents().get(3);\n-\t\tprivate final Keyword cLeftParenthesisKeyword_3_0 = (Keyword)cGroup_3.eContents().get(0);\n-\t\tprivate final RuleCall cAdditionParserRuleCall_3_1 = (RuleCall)cGroup_3.eContents().get(1);\n-\t\tprivate final Keyword cRightParenthesisKeyword_3_2 = (Keyword)cGroup_3.eContents().get(2);\n+\t\tprivate final Action cFunctionAction_3_0 = (Action)cGroup_3.eContents().get(0);\n+\t\tprivate final Assignment cFunctionAssignment_3_1 = (Assignment)cGroup_3.eContents().get(1);\n+\t\tprivate final RuleCall cFunctionFunctionParserRuleCall_3_1_0 = (RuleCall)cFunctionAssignment_3_1.eContents().get(0);\n+\t\tprivate final Group cGroup_4 = (Group)cAlternatives.eContents().get(4);\n+\t\tprivate final Keyword cLeftParenthesisKeyword_4_0 = (Keyword)cGroup_4.eContents().get(0);\n+\t\tprivate final RuleCall cAdditionParserRuleCall_4_1 = (RuleCall)cGroup_4.eContents().get(1);\n+\t\tprivate final Keyword cRightParenthesisKeyword_4_2 = (Keyword)cGroup_4.eContents().get(2);\n \t\t\n \t\t//Primary returns Expression:\n-\t\t//\t{Variable} name=MATH_NAME | {Float} value=Float | {Function} function=Function | \"(\" Addition \")\";\n+\t\t//\t{Variable} name=MATH_NAME | {Float} value=Float | {MatrixElement} element=MATH_NAME \"[\" row=INT \"]\" \"[\" column=INT \"]\"\n+\t\t//\t| {Function} function=Function | \"(\" Addition \")\";\n \t\tpublic ParserRule getRule() { return rule; }\n \n-\t\t//{Variable} name=MATH_NAME | {Float} value=Float | {Function} function=Function | \"(\" Addition \")\"\n+\t\t//{Variable} name=MATH_NAME | {Float} value=Float | {MatrixElement} element=MATH_NAME \"[\" row=INT \"]\" \"[\" column=INT \"]\" |\n+\t\t//{Function} function=Function | \"(\" Addition \")\"\n \t\tpublic Alternatives getAlternatives() { return cAlternatives; }\n \n \t\t//{Variable} name=MATH_NAME\n@@ -487,26 +432,442 @@ public class PrimaryElements extends AbstractParserRuleElementFinder {\n \t\t//Float\n \t\tpublic RuleCall getValueFloatParserRuleCall_1_1_0() { return cValueFloatParserRuleCall_1_1_0; }\n \n-\t\t//{Function} function=Function\n+\t\t//{MatrixElement} element=MATH_NAME \"[\" row=INT \"]\" \"[\" column=INT \"]\"\n \t\tpublic Group getGroup_2() { return cGroup_2; }\n \n+\t\t//{MatrixElement}\n+\t\tpublic Action getMatrixElementAction_2_0() { return cMatrixElementAction_2_0; }\n+\n+\t\t//element=MATH_NAME\n+\t\tpublic Assignment getElementAssignment_2_1() { return cElementAssignment_2_1; }\n+\n+\t\t//MATH_NAME\n+\t\tpublic RuleCall getElementMATH_NAMETerminalRuleCall_2_1_0() { return cElementMATH_NAMETerminalRuleCall_2_1_0; }\n+\n+\t\t//\"[\"\n+\t\tpublic Keyword getLeftSquareBracketKeyword_2_2() { return cLeftSquareBracketKeyword_2_2; }\n+\n+\t\t//row=INT\n+\t\tpublic Assignment getRowAssignment_2_3() { return cRowAssignment_2_3; }\n+\n+\t\t//INT\n+\t\tpublic RuleCall getRowINTTerminalRuleCall_2_3_0() { return cRowINTTerminalRuleCall_2_3_0; }\n+\n+\t\t//\"]\"\n+\t\tpublic Keyword getRightSquareBracketKeyword_2_4() { return cRightSquareBracketKeyword_2_4; }\n+\n+\t\t//\"[\"\n+\t\tpublic Keyword getLeftSquareBracketKeyword_2_5() { return cLeftSquareBracketKeyword_2_5; }\n+\n+\t\t//column=INT\n+\t\tpublic Assignment getColumnAssignment_2_6() { return cColumnAssignment_2_6; }\n+\n+\t\t//INT\n+\t\tpublic RuleCall getColumnINTTerminalRuleCall_2_6_0() { return cColumnINTTerminalRuleCall_2_6_0; }\n+\n+\t\t//\"]\"\n+\t\tpublic Keyword getRightSquareBracketKeyword_2_7() { return cRightSquareBracketKeyword_2_7; }\n+\n+\t\t//{Function} function=Function\n+\t\tpublic Group getGroup_3() { return cGroup_3; }\n+\n \t\t//{Function}\n-\t\tpublic Action getFunctionAction_2_0() { return cFunctionAction_2_0; }\n+\t\tpublic Action getFunctionAction_3_0() { return cFunctionAction_3_0; }\n \n \t\t//function=Function\n-\t\tpublic Assignment getFunctionAssignment_2_1() { return cFunctionAssignment_2_1; }\n+\t\tpublic Assignment getFunctionAssignment_3_1() { return cFunctionAssignment_3_1; }\n \n \t\t//Function\n-\t\tpublic RuleCall getFunctionFunctionParserRuleCall_2_1_0() { return cFunctionFunctionParserRuleCall_2_1_0; }\n+\t\tpublic RuleCall getFunctionFunctionParserRuleCall_3_1_0() { return cFunctionFunctionParserRuleCall_3_1_0; }\n \n \t\t//\"(\" Addition \")\"\n+\t\tpublic Group getGroup_4() { return cGroup_4; }\n+\n+\t\t//\"(\"\n+\t\tpublic Keyword getLeftParenthesisKeyword_4_0() { return cLeftParenthesisKeyword_4_0; }\n+\n+\t\t//Addition\n+\t\tpublic RuleCall getAdditionParserRuleCall_4_1() { return cAdditionParserRuleCall_4_1; }\n+\n+\t\t//\")\"\n+\t\tpublic Keyword getRightParenthesisKeyword_4_2() { return cRightParenthesisKeyword_4_2; }\n+\t}\n+\n+\tpublic class MatrixElements extends AbstractParserRuleElementFinder {\n+\t\tprivate final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), \"Matrix\");\n+\t\tprivate final Group cGroup = (Group)rule.eContents().get(1);\n+\t\tprivate final Keyword cLeftCurlyBracketKeyword_0 = (Keyword)cGroup.eContents().get(0);\n+\t\tprivate final Group cGroup_1 = (Group)cGroup.eContents().get(1);\n+\t\tprivate final Assignment cRowsAssignment_1_0 = (Assignment)cGroup_1.eContents().get(0);\n+\t\tprivate final RuleCall cRowsMatrixRowParserRuleCall_1_0_0 = (RuleCall)cRowsAssignment_1_0.eContents().get(0);\n+\t\tprivate final Group cGroup_1_1 = (Group)cGroup_1.eContents().get(1);\n+\t\tprivate final Keyword cCommaKeyword_1_1_0 = (Keyword)cGroup_1_1.eContents().get(0);\n+\t\tprivate final Assignment cRowsAssignment_1_1_1 = (Assignment)cGroup_1_1.eContents().get(1);\n+\t\tprivate final RuleCall cRowsMatrixRowParserRuleCall_1_1_1_0 = (RuleCall)cRowsAssignment_1_1_1.eContents().get(0);\n+\t\tprivate final Keyword cCommaKeyword_1_2 = (Keyword)cGroup_1.eContents().get(2);\n+\t\tprivate final Keyword cRightCurlyBracketKeyword_2 = (Keyword)cGroup.eContents().get(2);\n+\t\t\n+\t\t//Matrix:\n+\t\t//\t\"{\" (rows+=MatrixRow (\",\" rows+=MatrixRow)* \",\"?)? \"}\";\n+\t\tpublic ParserRule getRule() { return rule; }\n+\n+\t\t//\"{\" (rows+=MatrixRow (\",\" rows+=MatrixRow)* \",\"?)? \"}\"\n+\t\tpublic Group getGroup() { return cGroup; }\n+\n+\t\t//\"{\"\n+\t\tpublic Keyword getLeftCurlyBracketKeyword_0() { return cLeftCurlyBracketKeyword_0; }\n+\n+\t\t//(rows+=MatrixRow (\",\" rows+=MatrixRow)* \",\"?)?\n+\t\tpublic Group getGroup_1() { return cGroup_1; }\n+\n+\t\t//rows+=MatrixRow\n+\t\tpublic Assignment getRowsAssignment_1_0() { return cRowsAssignment_1_0; }\n+\n+\t\t//MatrixRow\n+\t\tpublic RuleCall getRowsMatrixRowParserRuleCall_1_0_0() { return cRowsMatrixRowParserRuleCall_1_0_0; }\n+\n+\t\t//(\",\" rows+=MatrixRow)*\n+\t\tpublic Group getGroup_1_1() { return cGroup_1_1; }\n+\n+\t\t//\",\"\n+\t\tpublic Keyword getCommaKeyword_1_1_0() { return cCommaKeyword_1_1_0; }\n+\n+\t\t//rows+=MatrixRow\n+\t\tpublic Assignment getRowsAssignment_1_1_1() { return cRowsAssignment_1_1_1; }\n+\n+\t\t//MatrixRow\n+\t\tpublic RuleCall getRowsMatrixRowParserRuleCall_1_1_1_0() { return cRowsMatrixRowParserRuleCall_1_1_1_0; }\n+\n+\t\t//\",\"?\n+\t\tpublic Keyword getCommaKeyword_1_2() { return cCommaKeyword_1_2; }\n+\n+\t\t//\"}\"\n+\t\tpublic Keyword getRightCurlyBracketKeyword_2() { return cRightCurlyBracketKeyword_2; }\n+\t}\n+\n+\tpublic class MatrixRowElements extends AbstractParserRuleElementFinder {\n+\t\tprivate final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), \"MatrixRow\");\n+\t\tprivate final Group cGroup = (Group)rule.eContents().get(1);\n+\t\tprivate final Keyword cLeftCurlyBracketKeyword_0 = (Keyword)cGroup.eContents().get(0);\n+\t\tprivate final Group cGroup_1 = (Group)cGroup.eContents().get(1);\n+\t\tprivate final Assignment cElementsAssignment_1_0 = (Assignment)cGroup_1.eContents().get(0);\n+\t\tprivate final RuleCall cElementsFloatParserRuleCall_1_0_0 = (RuleCall)cElementsAssignment_1_0.eContents().get(0);\n+\t\tprivate final Group cGroup_1_1 = (Group)cGroup_1.eContents().get(1);\n+\t\tprivate final Keyword cCommaKeyword_1_1_0 = (Keyword)cGroup_1_1.eContents().get(0);\n+\t\tprivate final Assignment cElementsAssignment_1_1_1 = (Assignment)cGroup_1_1.eContents().get(1);\n+\t\tprivate final RuleCall cElementsFloatParserRuleCall_1_1_1_0 = (RuleCall)cElementsAssignment_1_1_1.eContents().get(0);\n+\t\tprivate final Keyword cCommaKeyword_1_2 = (Keyword)cGroup_1.eContents().get(2);\n+\t\tprivate final Keyword cRightCurlyBracketKeyword_2 = (Keyword)cGroup.eContents().get(2);\n+\t\t\n+\t\t//MatrixRow:\n+\t\t//\t\"{\" (elements+=Float (\",\" elements+=Float)* \",\"?)? \"}\";\n+\t\tpublic ParserRule getRule() { return rule; }\n+\n+\t\t//\"{\" (elements+=Float (\",\" elements+=Float)* \",\"?)? \"}\"\n+\t\tpublic Group getGroup() { return cGroup; }\n+\n+\t\t//\"{\"\n+\t\tpublic Keyword getLeftCurlyBracketKeyword_0() { return cLeftCurlyBracketKeyword_0; }\n+\n+\t\t//(elements+=Float (\",\" elements+=Float)* \",\"?)?\n+\t\tpublic Group getGroup_1() { return cGroup_1; }\n+\n+\t\t//elements+=Float\n+\t\tpublic Assignment getElementsAssignment_1_0() { return cElementsAssignment_1_0; }\n+\n+\t\t//Float\n+\t\tpublic RuleCall getElementsFloatParserRuleCall_1_0_0() { return cElementsFloatParserRuleCall_1_0_0; }\n+\n+\t\t//(\",\" elements+=Float)*\n+\t\tpublic Group getGroup_1_1() { return cGroup_1_1; }\n+\n+\t\t//\",\"\n+\t\tpublic Keyword getCommaKeyword_1_1_0() { return cCommaKeyword_1_1_0; }\n+\n+\t\t//elements+=Float\n+\t\tpublic Assignment getElementsAssignment_1_1_1() { return cElementsAssignment_1_1_1; }\n+\n+\t\t//Float\n+\t\tpublic RuleCall getElementsFloatParserRuleCall_1_1_1_0() { return cElementsFloatParserRuleCall_1_1_1_0; }\n+\n+\t\t//\",\"?\n+\t\tpublic Keyword getCommaKeyword_1_2() { return cCommaKeyword_1_2; }\n+\n+\t\t//\"}\"\n+\t\tpublic Keyword getRightCurlyBracketKeyword_2() { return cRightCurlyBracketKeyword_2; }\n+\t}\n+\n+\tpublic class MatrixAssignmentElements extends AbstractParserRuleElementFinder {\n+\t\tprivate final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), \"MatrixAssignment\");\n+\t\tprivate final Group cGroup = (Group)rule.eContents().get(1);\n+\t\tprivate final Keyword cLeftSquareBracketKeyword_0 = (Keyword)cGroup.eContents().get(0);\n+\t\tprivate final Assignment cVariableAssignment_1 = (Assignment)cGroup.eContents().get(1);\n+\t\tprivate final RuleCall cVariableMATH_NAMETerminalRuleCall_1_0 = (RuleCall)cVariableAssignment_1.eContents().get(0);\n+\t\tprivate final Keyword cRightSquareBracketKeyword_2 = (Keyword)cGroup.eContents().get(2);\n+\t\tprivate final Keyword cEqualsSignKeyword_3 = (Keyword)cGroup.eContents().get(3);\n+\t\tprivate final Assignment cValueAssignment_4 = (Assignment)cGroup.eContents().get(4);\n+\t\tprivate final RuleCall cValueMatrixFormulaParserRuleCall_4_0 = (RuleCall)cValueAssignment_4.eContents().get(0);\n+\t\t\n+\t\t//MatrixAssignment:\n+\t\t//\t\"[\" variable=MATH_NAME \"]\" \"=\" value=MatrixFormula;\n+\t\tpublic ParserRule getRule() { return rule; }\n+\n+\t\t//\"[\" variable=MATH_NAME \"]\" \"=\" value=MatrixFormula\n+\t\tpublic Group getGroup() { return cGroup; }\n+\n+\t\t//\"[\"\n+\t\tpublic Keyword getLeftSquareBracketKeyword_0() { return cLeftSquareBracketKeyword_0; }\n+\n+\t\t//variable=MATH_NAME\n+\t\tpublic Assignment getVariableAssignment_1() { return cVariableAssignment_1; }\n+\n+\t\t//MATH_NAME\n+\t\tpublic RuleCall getVariableMATH_NAMETerminalRuleCall_1_0() { return cVariableMATH_NAMETerminalRuleCall_1_0; }\n+\n+\t\t//\"]\"\n+\t\tpublic Keyword getRightSquareBracketKeyword_2() { return cRightSquareBracketKeyword_2; }\n+\n+\t\t//\"=\"\n+\t\tpublic Keyword getEqualsSignKeyword_3() { return cEqualsSignKeyword_3; }\n+\n+\t\t//value=MatrixFormula\n+\t\tpublic Assignment getValueAssignment_4() { return cValueAssignment_4; }\n+\n+\t\t//MatrixFormula\n+\t\tpublic RuleCall getValueMatrixFormulaParserRuleCall_4_0() { return cValueMatrixFormulaParserRuleCall_4_0; }\n+\t}\n+\n+\tpublic class MatrixFormulaElements extends AbstractParserRuleElementFinder {\n+\t\tprivate final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), \"MatrixFormula\");\n+\t\tprivate final Assignment cExpressionAssignment = (Assignment)rule.eContents().get(1);\n+\t\tprivate final RuleCall cExpressionMatrixAdditionParserRuleCall_0 = (RuleCall)cExpressionAssignment.eContents().get(0);\n+\t\t\n+\t\t//MatrixFormula:\n+\t\t//\texpression=MatrixAddition;\n+\t\tpublic ParserRule getRule() { return rule; }\n+\n+\t\t//expression=MatrixAddition\n+\t\tpublic Assignment getExpressionAssignment() { return cExpressionAssignment; }\n+\n+\t\t//MatrixAddition\n+\t\tpublic RuleCall getExpressionMatrixAdditionParserRuleCall_0() { return cExpressionMatrixAdditionParserRuleCall_0; }\n+\t}\n+\n+\tpublic class MatrixAdditionElements extends AbstractParserRuleElementFinder {\n+\t\tprivate final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), \"MatrixAddition\");\n+\t\tprivate final Group cGroup = (Group)rule.eContents().get(1);\n+\t\tprivate final RuleCall cMatrixMultiplicationParserRuleCall_0 = (RuleCall)cGroup.eContents().get(0);\n+\t\tprivate final Alternatives cAlternatives_1 = (Alternatives)cGroup.eContents().get(1);\n+\t\tprivate final Group cGroup_1_0 = (Group)cAlternatives_1.eContents().get(0);\n+\t\tprivate final Keyword cPlusSignKeyword_1_0_0 = (Keyword)cGroup_1_0.eContents().get(0);\n+\t\tprivate final Action cMatrixAdditionLeftAction_1_0_1 = (Action)cGroup_1_0.eContents().get(1);\n+\t\tprivate final Assignment cRightAssignment_1_0_2 = (Assignment)cGroup_1_0.eContents().get(2);\n+\t\tprivate final RuleCall cRightMatrixMultiplicationParserRuleCall_1_0_2_0 = (RuleCall)cRightAssignment_1_0_2.eContents().get(0);\n+\t\tprivate final Group cGroup_1_1 = (Group)cAlternatives_1.eContents().get(1);\n+\t\tprivate final Keyword cHyphenMinusKeyword_1_1_0 = (Keyword)cGroup_1_1.eContents().get(0);\n+\t\tprivate final Action cMatrixSubtractionLeftAction_1_1_1 = (Action)cGroup_1_1.eContents().get(1);\n+\t\tprivate final Assignment cRightAssignment_1_1_2 = (Assignment)cGroup_1_1.eContents().get(2);\n+\t\tprivate final RuleCall cRightMatrixMultiplicationParserRuleCall_1_1_2_0 = (RuleCall)cRightAssignment_1_1_2.eContents().get(0);\n+\t\t\n+\t\t//MatrixAddition returns MatrixExpression:\n+\t\t//\tMatrixMultiplication (\"+\" {MatrixAddition.left=current} right=MatrixMultiplication | \"-\"\n+\t\t//\t{MatrixSubtraction.left=current} right=MatrixMultiplication)*;\n+\t\tpublic ParserRule getRule() { return rule; }\n+\n+\t\t//MatrixMultiplication (\"+\" {MatrixAddition.left=current} right=MatrixMultiplication | \"-\"\n+\t\t//{MatrixSubtraction.left=current} right=MatrixMultiplication)*\n+\t\tpublic Group getGroup() { return cGroup; }\n+\n+\t\t//MatrixMultiplication\n+\t\tpublic RuleCall getMatrixMultiplicationParserRuleCall_0() { return cMatrixMultiplicationParserRuleCall_0; }\n+\n+\t\t//(\"+\" {MatrixAddition.left=current} right=MatrixMultiplication | \"-\" {MatrixSubtraction.left=current}\n+\t\t//right=MatrixMultiplication)*\n+\t\tpublic Alternatives getAlternatives_1() { return cAlternatives_1; }\n+\n+\t\t//\"+\" {MatrixAddition.left=current} right=MatrixMultiplication\n+\t\tpublic Group getGroup_1_0() { return cGroup_1_0; }\n+\n+\t\t//\"+\"\n+\t\tpublic Keyword getPlusSignKeyword_1_0_0() { return cPlusSignKeyword_1_0_0; }\n+\n+\t\t//{MatrixAddition.left=current}\n+\t\tpublic Action getMatrixAdditionLeftAction_1_0_1() { return cMatrixAdditionLeftAction_1_0_1; }\n+\n+\t\t//right=MatrixMultiplication\n+\t\tpublic Assignment getRightAssignment_1_0_2() { return cRightAssignment_1_0_2; }\n+\n+\t\t//MatrixMultiplication\n+\t\tpublic RuleCall getRightMatrixMultiplicationParserRuleCall_1_0_2_0() { return cRightMatrixMultiplicationParserRuleCall_1_0_2_0; }\n+\n+\t\t//\"-\" {MatrixSubtraction.left=current} right=MatrixMultiplication\n+\t\tpublic Group getGroup_1_1() { return cGroup_1_1; }\n+\n+\t\t//\"-\"\n+\t\tpublic Keyword getHyphenMinusKeyword_1_1_0() { return cHyphenMinusKeyword_1_1_0; }\n+\n+\t\t//{MatrixSubtraction.left=current}\n+\t\tpublic Action getMatrixSubtractionLeftAction_1_1_1() { return cMatrixSubtractionLeftAction_1_1_1; }\n+\n+\t\t//right=MatrixMultiplication\n+\t\tpublic Assignment getRightAssignment_1_1_2() { return cRightAssignment_1_1_2; }\n+\n+\t\t//MatrixMultiplication\n+\t\tpublic RuleCall getRightMatrixMultiplicationParserRuleCall_1_1_2_0() { return cRightMatrixMultiplicationParserRuleCall_1_1_2_0; }\n+\t}\n+\n+\tpublic class MatrixMultiplicationElements extends AbstractParserRuleElementFinder {\n+\t\tprivate final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), \"MatrixMultiplication\");\n+\t\tprivate final Group cGroup = (Group)rule.eContents().get(1);\n+\t\tprivate final RuleCall cPrimaryMatrixParserRuleCall_0 = (RuleCall)cGroup.eContents().get(0);\n+\t\tprivate final Alternatives cAlternatives_1 = (Alternatives)cGroup.eContents().get(1);\n+\t\tprivate final Group cGroup_1_0 = (Group)cAlternatives_1.eContents().get(0);\n+\t\tprivate final Keyword cAsteriskKeyword_1_0_0 = (Keyword)cGroup_1_0.eContents().get(0);\n+\t\tprivate final Action cMatrixMultiplicationLeftAction_1_0_1 = (Action)cGroup_1_0.eContents().get(1);\n+\t\tprivate final Assignment cRightMatrixAssignment_1_0_2 = (Assignment)cGroup_1_0.eContents().get(2);\n+\t\tprivate final RuleCall cRightMatrixPrimaryMatrixParserRuleCall_1_0_2_0 = (RuleCall)cRightMatrixAssignment_1_0_2.eContents().get(0);\n+\t\tprivate final Group cGroup_1_1 = (Group)cAlternatives_1.eContents().get(1);\n+\t\tprivate final Keyword cAsteriskKeyword_1_1_0 = (Keyword)cGroup_1_1.eContents().get(0);\n+\t\tprivate final Action cMatrixMultiplicationLeftAction_1_1_1 = (Action)cGroup_1_1.eContents().get(1);\n+\t\tprivate final Assignment cRightScalarAssignment_1_1_2 = (Assignment)cGroup_1_1.eContents().get(2);\n+\t\tprivate final RuleCall cRightScalarFormulaParserRuleCall_1_1_2_0 = (RuleCall)cRightScalarAssignment_1_1_2.eContents().get(0);\n+\t\t\n+\t\t//MatrixMultiplication returns MatrixExpression:\n+\t\t//\tPrimaryMatrix (\"*\" {MatrixMultiplication.left=current} rightMatrix=PrimaryMatrix | \"*\"\n+\t\t//\t{MatrixMultiplication.left=current} rightScalar=Formula)*;\n+\t\tpublic ParserRule getRule() { return rule; }\n+\n+\t\t//PrimaryMatrix (\"*\" {MatrixMultiplication.left=current} rightMatrix=PrimaryMatrix | \"*\"\n+\t\t//{MatrixMultiplication.left=current} rightScalar=Formula)*\n+\t\tpublic Group getGroup() { return cGroup; }\n+\n+\t\t//PrimaryMatrix\n+\t\tpublic RuleCall getPrimaryMatrixParserRuleCall_0() { return cPrimaryMatrixParserRuleCall_0; }\n+\n+\t\t//(\"*\" {MatrixMultiplication.left=current} rightMatrix=PrimaryMatrix | \"*\" {MatrixMultiplication.left=current}\n+\t\t//rightScalar=Formula)*\n+\t\tpublic Alternatives getAlternatives_1() { return cAlternatives_1; }\n+\n+\t\t//\"*\" {MatrixMultiplication.left=current} rightMatrix=PrimaryMatrix\n+\t\tpublic Group getGroup_1_0() { return cGroup_1_0; }\n+\n+\t\t//\"*\"\n+\t\tpublic Keyword getAsteriskKeyword_1_0_0() { return cAsteriskKeyword_1_0_0; }\n+\n+\t\t//{MatrixMultiplication.left=current}\n+\t\tpublic Action getMatrixMultiplicationLeftAction_1_0_1() { return cMatrixMultiplicationLeftAction_1_0_1; }\n+\n+\t\t//rightMatrix=PrimaryMatrix\n+\t\tpublic Assignment getRightMatrixAssignment_1_0_2() { return cRightMatrixAssignment_1_0_2; }\n+\n+\t\t//PrimaryMatrix\n+\t\tpublic RuleCall getRightMatrixPrimaryMatrixParserRuleCall_1_0_2_0() { return cRightMatrixPrimaryMatrixParserRuleCall_1_0_2_0; }\n+\n+\t\t//\"*\" {MatrixMultiplication.left=current} rightScalar=Formula\n+\t\tpublic Group getGroup_1_1() { return cGroup_1_1; }\n+\n+\t\t//\"*\"\n+\t\tpublic Keyword getAsteriskKeyword_1_1_0() { return cAsteriskKeyword_1_1_0; }\n+\n+\t\t//{MatrixMultiplication.left=current}\n+\t\tpublic Action getMatrixMultiplicationLeftAction_1_1_1() { return cMatrixMultiplicationLeftAction_1_1_1; }\n+\n+\t\t//rightScalar=Formula\n+\t\tpublic Assignment getRightScalarAssignment_1_1_2() { return cRightScalarAssignment_1_1_2; }\n+\n+\t\t//Formula\n+\t\tpublic RuleCall getRightScalarFormulaParserRuleCall_1_1_2_0() { return cRightScalarFormulaParserRuleCall_1_1_2_0; }\n+\t}\n+\n+\tpublic class PrimaryMatrixElements extends AbstractParserRuleElementFinder {\n+\t\tprivate final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), \"PrimaryMatrix\");\n+\t\tprivate final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);\n+\t\tprivate final Group cGroup_0 = (Group)cAlternatives.eContents().get(0);\n+\t\tprivate final Action cNewMatrixAction_0_0 = (Action)cGroup_0.eContents().get(0);\n+\t\tprivate final Assignment cMatrixAssignment_0_1 = (Assignment)cGroup_0.eContents().get(1);\n+\t\tprivate final RuleCall cMatrixMatrixParserRuleCall_0_1_0 = (RuleCall)cMatrixAssignment_0_1.eContents().get(0);\n+\t\tprivate final Group cGroup_1 = (Group)cAlternatives.eContents().get(1);\n+\t\tprivate final Action cTransposeMatrixAction_1_0 = (Action)cGroup_1.eContents().get(0);\n+\t\tprivate final Keyword cLeftSquareBracketKeyword_1_1 = (Keyword)cGroup_1.eContents().get(1);\n+\t\tprivate final Assignment cNameAssignment_1_2 = (Assignment)cGroup_1.eContents().get(2);\n+\t\tprivate final RuleCall cNameMATH_NAMETerminalRuleCall_1_2_0 = (RuleCall)cNameAssignment_1_2.eContents().get(0);\n+\t\tprivate final Keyword cTKeyword_1_3 = (Keyword)cGroup_1.eContents().get(3);\n+\t\tprivate final Group cGroup_2 = (Group)cAlternatives.eContents().get(2);\n+\t\tprivate final Action cMatrixVariableAction_2_0 = (Action)cGroup_2.eContents().get(0);\n+\t\tprivate final Keyword cLeftSquareBracketKeyword_2_1 = (Keyword)cGroup_2.eContents().get(1);\n+\t\tprivate final Assignment cNameAssignment_2_2 = (Assignment)cGroup_2.eContents().get(2);\n+\t\tprivate final RuleCall cNameMATH_NAMETerminalRuleCall_2_2_0 = (RuleCall)cNameAssignment_2_2.eContents().get(0);\n+\t\tprivate final Keyword cRightSquareBracketKeyword_2_3 = (Keyword)cGroup_2.eContents().get(3);\n+\t\tprivate final Group cGroup_3 = (Group)cAlternatives.eContents().get(3);\n+\t\tprivate final Keyword cLeftParenthesisKeyword_3_0 = (Keyword)cGroup_3.eContents().get(0);\n+\t\tprivate final RuleCall cMatrixAdditionParserRuleCall_3_1 = (RuleCall)cGroup_3.eContents().get(1);\n+\t\tprivate final Keyword cRightParenthesisKeyword_3_2 = (Keyword)cGroup_3.eContents().get(2);\n+\t\t\n+\t\t//PrimaryMatrix returns MatrixExpression:\n+\t\t//\t{NewMatrix} matrix=Matrix | {TransposeMatrix} \"[\" name=MATH_NAME \"]^T\" | {MatrixVariable} \"[\" name=MATH_NAME \"]\" | \"(\"\n+\t\t//\tMatrixAddition \")\";\n+\t\tpublic ParserRule getRule() { return rule; }\n+\n+\t\t//{NewMatrix} matrix=Matrix | {TransposeMatrix} \"[\" name=MATH_NAME \"]^T\" | {MatrixVariable} \"[\" name=MATH_NAME \"]\" | \"(\"\n+\t\t//MatrixAddition \")\"\n+\t\tpublic Alternatives getAlternatives() { return cAlternatives; }\n+\n+\t\t//{NewMatrix} matrix=Matrix\n+\t\tpublic Group getGroup_0() { return cGroup_0; }\n+\n+\t\t//{NewMatrix}\n+\t\tpublic Action getNewMatrixAction_0_0() { return cNewMatrixAction_0_0; }\n+\n+\t\t//matrix=Matrix\n+\t\tpublic Assignment getMatrixAssignment_0_1() { return cMatrixAssignment_0_1; }\n+\n+\t\t//Matrix\n+\t\tpublic RuleCall getMatrixMatrixParserRuleCall_0_1_0() { return cMatrixMatrixParserRuleCall_0_1_0; }\n+\n+\t\t//{TransposeMatrix} \"[\" name=MATH_NAME \"]^T\"\n+\t\tpublic Group getGroup_1() { return cGroup_1; }\n+\n+\t\t//{TransposeMatrix}\n+\t\tpublic Action getTransposeMatrixAction_1_0() { return cTransposeMatrixAction_1_0; }\n+\n+\t\t//\"[\"\n+\t\tpublic Keyword getLeftSquareBracketKeyword_1_1() { return cLeftSquareBracketKeyword_1_1; }\n+\n+\t\t//name=MATH_NAME\n+\t\tpublic Assignment getNameAssignment_1_2() { return cNameAssignment_1_2; }\n+\n+\t\t//MATH_NAME\n+\t\tpublic RuleCall getNameMATH_NAMETerminalRuleCall_1_2_0() { return cNameMATH_NAMETerminalRuleCall_1_2_0; }\n+\n+\t\t//\"]^T\"\n+\t\tpublic Keyword getTKeyword_1_3() { return cTKeyword_1_3; }\n+\n+\t\t//{MatrixVariable} \"[\" name=MATH_NAME \"]\"\n+\t\tpublic Group getGroup_2() { return cGroup_2; }\n+\n+\t\t//{MatrixVariable}\n+\t\tpublic Action getMatrixVariableAction_2_0() { return cMatrixVariableAction_2_0; }\n+\n+\t\t//\"[\"\n+\t\tpublic Keyword getLeftSquareBracketKeyword_2_1() { return cLeftSquareBracketKeyword_2_1; }\n+\n+\t\t//name=MATH_NAME\n+\t\tpublic Assignment getNameAssignment_2_2() { return cNameAssignment_2_2; }\n+\n+\t\t//MATH_NAME\n+\t\tpublic RuleCall getNameMATH_NAMETerminalRuleCall_2_2_0() { return cNameMATH_NAMETerminalRuleCall_2_2_0; }\n+\n+\t\t//\"]\"\n+\t\tpublic Keyword getRightSquareBracketKeyword_2_3() { return cRightSquareBracketKeyword_2_3; }\n+\n+\t\t//\"(\" MatrixAddition \")\"\n \t\tpublic Group getGroup_3() { return cGroup_3; }\n \n \t\t//\"(\"\n \t\tpublic Keyword getLeftParenthesisKeyword_3_0() { return cLeftParenthesisKeyword_3_0; }\n \n-\t\t//Addition\n-\t\tpublic RuleCall getAdditionParserRuleCall_3_1() { return cAdditionParserRuleCall_3_1; }\n+\t\t//MatrixAddition\n+\t\tpublic RuleCall getMatrixAdditionParserRuleCall_3_1() { return cMatrixAdditionParserRuleCall_3_1; }\n \n \t\t//\")\"\n \t\tpublic Keyword getRightParenthesisKeyword_3_2() { return cRightParenthesisKeyword_3_2; }\n@@ -655,137 +1016,26 @@ public class FunctionDefinitionElements extends AbstractParserRuleElementFinder\n \t\t//Formula\n \t\tpublic RuleCall getFormulaFormulaParserRuleCall_2_0() { return cFormulaFormulaParserRuleCall_2_0; }\n \t}\n-\n-\tpublic class MatrixDefinitionElements extends AbstractParserRuleElementFinder {\n-\t\tprivate final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), \"MatrixDefinition\");\n-\t\tprivate final Group cGroup = (Group)rule.eContents().get(1);\n-\t\tprivate final Assignment cNameAssignment_0 = (Assignment)cGroup.eContents().get(0);\n-\t\tprivate final RuleCall cNameMATH_NAMETerminalRuleCall_0_0 = (RuleCall)cNameAssignment_0.eContents().get(0);\n-\t\tprivate final Keyword cEqualsSignKeyword_1 = (Keyword)cGroup.eContents().get(1);\n-\t\tprivate final Keyword cLeftCurlyBracketKeyword_2 = (Keyword)cGroup.eContents().get(2);\n-\t\tprivate final Group cGroup_3 = (Group)cGroup.eContents().get(3);\n-\t\tprivate final Assignment cRowsAssignment_3_0 = (Assignment)cGroup_3.eContents().get(0);\n-\t\tprivate final RuleCall cRowsMatrixRowParserRuleCall_3_0_0 = (RuleCall)cRowsAssignment_3_0.eContents().get(0);\n-\t\tprivate final Group cGroup_3_1 = (Group)cGroup_3.eContents().get(1);\n-\t\tprivate final Keyword cCommaKeyword_3_1_0 = (Keyword)cGroup_3_1.eContents().get(0);\n-\t\tprivate final Assignment cRowsAssignment_3_1_1 = (Assignment)cGroup_3_1.eContents().get(1);\n-\t\tprivate final RuleCall cRowsMatrixRowParserRuleCall_3_1_1_0 = (RuleCall)cRowsAssignment_3_1_1.eContents().get(0);\n-\t\tprivate final Keyword cCommaKeyword_3_2 = (Keyword)cGroup_3.eContents().get(2);\n-\t\tprivate final Keyword cRightCurlyBracketKeyword_4 = (Keyword)cGroup.eContents().get(4);\n-\t\t\n-\t\t//MatrixDefinition:\n-\t\t//\tname=MATH_NAME \"=\" \"{\" (rows+=MatrixRow (\",\" rows+=MatrixRow)* \",\"?)? \"}\";\n-\t\tpublic ParserRule getRule() { return rule; }\n-\n-\t\t//name=MATH_NAME \"=\" \"{\" (rows+=MatrixRow (\",\" rows+=MatrixRow)* \",\"?)? \"}\"\n-\t\tpublic Group getGroup() { return cGroup; }\n-\n-\t\t//name=MATH_NAME\n-\t\tpublic Assignment getNameAssignment_0() { return cNameAssignment_0; }\n-\n-\t\t//MATH_NAME\n-\t\tpublic RuleCall getNameMATH_NAMETerminalRuleCall_0_0() { return cNameMATH_NAMETerminalRuleCall_0_0; }\n-\n-\t\t//\"=\"\n-\t\tpublic Keyword getEqualsSignKeyword_1() { return cEqualsSignKeyword_1; }\n-\n-\t\t//\"{\"\n-\t\tpublic Keyword getLeftCurlyBracketKeyword_2() { return cLeftCurlyBracketKeyword_2; }\n-\n-\t\t//(rows+=MatrixRow (\",\" rows+=MatrixRow)* \",\"?)?\n-\t\tpublic Group getGroup_3() { return cGroup_3; }\n-\n-\t\t//rows+=MatrixRow\n-\t\tpublic Assignment getRowsAssignment_3_0() { return cRowsAssignment_3_0; }\n-\n-\t\t//MatrixRow\n-\t\tpublic RuleCall getRowsMatrixRowParserRuleCall_3_0_0() { return cRowsMatrixRowParserRuleCall_3_0_0; }\n-\n-\t\t//(\",\" rows+=MatrixRow)*\n-\t\tpublic Group getGroup_3_1() { return cGroup_3_1; }\n-\n-\t\t//\",\"\n-\t\tpublic Keyword getCommaKeyword_3_1_0() { return cCommaKeyword_3_1_0; }\n-\n-\t\t//rows+=MatrixRow\n-\t\tpublic Assignment getRowsAssignment_3_1_1() { return cRowsAssignment_3_1_1; }\n-\n-\t\t//MatrixRow\n-\t\tpublic RuleCall getRowsMatrixRowParserRuleCall_3_1_1_0() { return cRowsMatrixRowParserRuleCall_3_1_1_0; }\n-\n-\t\t//\",\"?\n-\t\tpublic Keyword getCommaKeyword_3_2() { return cCommaKeyword_3_2; }\n-\n-\t\t//\"}\"\n-\t\tpublic Keyword getRightCurlyBracketKeyword_4() { return cRightCurlyBracketKeyword_4; }\n-\t}\n-\n-\tpublic class MatrixRowElements extends AbstractParserRuleElementFinder {\n-\t\tprivate final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), \"MatrixRow\");\n-\t\tprivate final Group cGroup = (Group)rule.eContents().get(1);\n-\t\tprivate final Keyword cLeftCurlyBracketKeyword_0 = (Keyword)cGroup.eContents().get(0);\n-\t\tprivate final Group cGroup_1 = (Group)cGroup.eContents().get(1);\n-\t\tprivate final Assignment cElementsAssignment_1_0 = (Assignment)cGroup_1.eContents().get(0);\n-\t\tprivate final RuleCall cElementsFloatParserRuleCall_1_0_0 = (RuleCall)cElementsAssignment_1_0.eContents().get(0);\n-\t\tprivate final Group cGroup_1_1 = (Group)cGroup_1.eContents().get(1);\n-\t\tprivate final Keyword cCommaKeyword_1_1_0 = (Keyword)cGroup_1_1.eContents().get(0);\n-\t\tprivate final Assignment cElementsAssignment_1_1_1 = (Assignment)cGroup_1_1.eContents().get(1);\n-\t\tprivate final RuleCall cElementsFloatParserRuleCall_1_1_1_0 = (RuleCall)cElementsAssignment_1_1_1.eContents().get(0);\n-\t\tprivate final Keyword cCommaKeyword_1_2 = (Keyword)cGroup_1.eContents().get(2);\n-\t\tprivate final Keyword cRightCurlyBracketKeyword_2 = (Keyword)cGroup.eContents().get(2);\n-\t\t\n-\t\t//MatrixRow:\n-\t\t//\t\"{\" (elements+=Float (\",\" elements+=Float)* \",\"?)? \"}\";\n-\t\tpublic ParserRule getRule() { return rule; }\n-\n-\t\t//\"{\" (elements+=Float (\",\" elements+=Float)* \",\"?)? \"}\"\n-\t\tpublic Group getGroup() { return cGroup; }\n-\n-\t\t//\"{\"\n-\t\tpublic Keyword getLeftCurlyBracketKeyword_0() { return cLeftCurlyBracketKeyword_0; }\n-\n-\t\t//(elements+=Float (\",\" elements+=Float)* \",\"?)?\n-\t\tpublic Group getGroup_1() { return cGroup_1; }\n-\n-\t\t//elements+=Float\n-\t\tpublic Assignment getElementsAssignment_1_0() { return cElementsAssignment_1_0; }\n-\n-\t\t//Float\n-\t\tpublic RuleCall getElementsFloatParserRuleCall_1_0_0() { return cElementsFloatParserRuleCall_1_0_0; }\n-\n-\t\t//(\",\" elements+=Float)*\n-\t\tpublic Group getGroup_1_1() { return cGroup_1_1; }\n-\n-\t\t//\",\"\n-\t\tpublic Keyword getCommaKeyword_1_1_0() { return cCommaKeyword_1_1_0; }\n-\n-\t\t//elements+=Float\n-\t\tpublic Assignment getElementsAssignment_1_1_1() { return cElementsAssignment_1_1_1; }\n-\n-\t\t//Float\n-\t\tpublic RuleCall getElementsFloatParserRuleCall_1_1_1_0() { return cElementsFloatParserRuleCall_1_1_1_0; }\n-\n-\t\t//\",\"?\n-\t\tpublic Keyword getCommaKeyword_1_2() { return cCommaKeyword_1_2; }\n-\n-\t\t//\"}\"\n-\t\tpublic Keyword getRightCurlyBracketKeyword_2() { return cRightCurlyBracketKeyword_2; }\n-\t}\n \t\n \t\n \tprivate StatementElements pStatement;\n-\tprivate AssignmentElements pAssignment;\n+\tprivate VariableAssignmentElements pVariableAssignment;\n \tprivate FormulaElements pFormula;\n \tprivate AdditionElements pAddition;\n \tprivate MultiplicationElements pMultiplication;\n \tprivate UnaryExpressionElements pUnaryExpression;\n \tprivate ExponentElements pExponent;\n \tprivate PrimaryElements pPrimary;\n+\tprivate MatrixElements pMatrix;\n+\tprivate MatrixRowElements pMatrixRow;\n+\tprivate MatrixAssignmentElements pMatrixAssignment;\n+\tprivate MatrixFormulaElements pMatrixFormula;\n+\tprivate MatrixAdditionElements pMatrixAddition;\n+\tprivate MatrixMultiplicationElements pMatrixMultiplication;\n+\tprivate PrimaryMatrixElements pPrimaryMatrix;\n \tprivate FloatElements pFloat;\n \tprivate FunctionElements pFunction;\n \tprivate FunctionDefinitionElements pFunctionDefinition;\n-\tprivate MatrixDefinitionElements pMatrixDefinition;\n-\tprivate MatrixRowElements pMatrixRow;\n \tprivate TerminalRule tMATH_NAME;\n \t\n \tprivate final GrammarProvider grammarProvider;\n@@ -810,7 +1060,8 @@ public TerminalsGrammarAccess getTerminalsGrammarAccess() {\n \n \t\n \t//Statement:\n-\t//\tfunctionDefinition=FunctionDefinition | matrixDefinition=MatrixDefinition | assignment=Assignment | formula=Formula;\n+\t//\tfunctionDefinition=FunctionDefinition | variableAssignment=VariableAssignment | formula=Formula |\n+\t//\tmatrixAssignment=MatrixAssignment | matrixFormula=MatrixFormula;\n \tpublic StatementElements getStatementAccess() {\n \t\treturn (pStatement != null) ? pStatement : (pStatement = new StatementElements());\n \t}\n@@ -819,14 +1070,14 @@ public ParserRule getStatementRule() {\n \t\treturn getStatementAccess().getRule();\n \t}\n \n-\t//Assignment:\n+\t//VariableAssignment:\n \t//\tvariable=MATH_NAME \"=\" value=Formula;\n-\tpublic AssignmentElements getAssignmentAccess() {\n-\t\treturn (pAssignment != null) ? pAssignment : (pAssignment = new AssignmentElements());\n+\tpublic VariableAssignmentElements getVariableAssignmentAccess() {\n+\t\treturn (pVariableAssignment != null) ? pVariableAssignment : (pVariableAssignment = new VariableAssignmentElements());\n \t}\n \t\n-\tpublic ParserRule getAssignmentRule() {\n-\t\treturn getAssignmentAccess().getRule();\n+\tpublic ParserRule getVariableAssignmentRule() {\n+\t\treturn getVariableAssignmentAccess().getRule();\n \t}\n \n \t//Formula:\n@@ -840,7 +1091,6 @@ public ParserRule getFormulaRule() {\n \t}\n \n \t//// addition/subtraction: left associative, priority 0\n-\t//\n \t//Addition returns Expression:\n \t//\tMultiplication (\"+\" {Addition.left=current} right=Multiplication | \"-\" {Subtraction.left=current}\n \t//\tright=Multiplication)*;\n@@ -853,7 +1103,6 @@ public ParserRule getAdditionRule() {\n \t}\n \n \t//// multiplication/division, left associative, priority 1\n-\t//\n \t//Multiplication returns Expression:\n \t//\tUnaryExpression (\"*\" {Multiplication.left=current} right=UnaryExpression | \"/\" {Division.left=current}\n \t//\tright=UnaryExpression | \"%\" {Modulo.left=current} right=UnaryExpression)*;\n@@ -866,10 +1115,8 @@ public ParserRule getMultiplicationRule() {\n \t}\n \n \t//// Unary operators: right associative, priority 2\n-\t//\n \t//UnaryExpression returns Expression:\n-\t//\tExponent | \"-\" {Invert} expression=UnaryExpression | \"(\" {Factorial} expression=UnaryExpression \")!\" | {Interval}\n-\t//\topeningBracket=(\"[\" | \"(\") \"(\" ceil=UnaryExpression \")\" \"..\" \"(\" floor=UnaryExpression \")\" closingBracket=(\"]\" | \")\");\n+\t//\tExponent | \"(-\" {Invert} expression=UnaryExpression \")\" | \"(\" {Factorial} expression=UnaryExpression \")!\";\n \tpublic UnaryExpressionElements getUnaryExpressionAccess() {\n \t\treturn (pUnaryExpression != null) ? pUnaryExpression : (pUnaryExpression = new UnaryExpressionElements());\n \t}\n@@ -879,7 +1126,6 @@ public ParserRule getUnaryExpressionRule() {\n \t}\n \n \t//// exponentiation: right associative, priority 3\n-\t//\n \t//Exponent returns Expression:\n \t//\tPrimary ({Exponent.left=current} \"^\" right=Primary)?;\n \tpublic ExponentElements getExponentAccess() {\n@@ -891,7 +1137,8 @@ public ParserRule getExponentRule() {\n \t}\n \n \t//Primary returns Expression:\n-\t//\t{Variable} name=MATH_NAME | {Float} value=Float | {Function} function=Function | \"(\" Addition \")\";\n+\t//\t{Variable} name=MATH_NAME | {Float} value=Float | {MatrixElement} element=MATH_NAME \"[\" row=INT \"]\" \"[\" column=INT \"]\"\n+\t//\t| {Function} function=Function | \"(\" Addition \")\";\n \tpublic PrimaryElements getPrimaryAccess() {\n \t\treturn (pPrimary != null) ? pPrimary : (pPrimary = new PrimaryElements());\n \t}\n@@ -900,6 +1147,79 @@ public ParserRule getPrimaryRule() {\n \t\treturn getPrimaryAccess().getRule();\n \t}\n \n+\t//Matrix:\n+\t//\t\"{\" (rows+=MatrixRow (\",\" rows+=MatrixRow)* \",\"?)? \"}\";\n+\tpublic MatrixElements getMatrixAccess() {\n+\t\treturn (pMatrix != null) ? pMatrix : (pMatrix = new MatrixElements());\n+\t}\n+\t\n+\tpublic ParserRule getMatrixRule() {\n+\t\treturn getMatrixAccess().getRule();\n+\t}\n+\n+\t//MatrixRow:\n+\t//\t\"{\" (elements+=Float (\",\" elements+=Float)* \",\"?)? \"}\";\n+\tpublic MatrixRowElements getMatrixRowAccess() {\n+\t\treturn (pMatrixRow != null) ? pMatrixRow : (pMatrixRow = new MatrixRowElements());\n+\t}\n+\t\n+\tpublic ParserRule getMatrixRowRule() {\n+\t\treturn getMatrixRowAccess().getRule();\n+\t}\n+\n+\t//MatrixAssignment:\n+\t//\t\"[\" variable=MATH_NAME \"]\" \"=\" value=MatrixFormula;\n+\tpublic MatrixAssignmentElements getMatrixAssignmentAccess() {\n+\t\treturn (pMatrixAssignment != null) ? pMatrixAssignment : (pMatrixAssignment = new MatrixAssignmentElements());\n+\t}\n+\t\n+\tpublic ParserRule getMatrixAssignmentRule() {\n+\t\treturn getMatrixAssignmentAccess().getRule();\n+\t}\n+\n+\t//MatrixFormula:\n+\t//\texpression=MatrixAddition;\n+\tpublic MatrixFormulaElements getMatrixFormulaAccess() {\n+\t\treturn (pMatrixFormula != null) ? pMatrixFormula : (pMatrixFormula = new MatrixFormulaElements());\n+\t}\n+\t\n+\tpublic ParserRule getMatrixFormulaRule() {\n+\t\treturn getMatrixFormulaAccess().getRule();\n+\t}\n+\n+\t//MatrixAddition returns MatrixExpression:\n+\t//\tMatrixMultiplication (\"+\" {MatrixAddition.left=current} right=MatrixMultiplication | \"-\"\n+\t//\t{MatrixSubtraction.left=current} right=MatrixMultiplication)*;\n+\tpublic MatrixAdditionElements getMatrixAdditionAccess() {\n+\t\treturn (pMatrixAddition != null) ? pMatrixAddition : (pMatrixAddition = new MatrixAdditionElements());\n+\t}\n+\t\n+\tpublic ParserRule getMatrixAdditionRule() {\n+\t\treturn getMatrixAdditionAccess().getRule();\n+\t}\n+\n+\t//MatrixMultiplication returns MatrixExpression:\n+\t//\tPrimaryMatrix (\"*\" {MatrixMultiplication.left=current} rightMatrix=PrimaryMatrix | \"*\"\n+\t//\t{MatrixMultiplication.left=current} rightScalar=Formula)*;\n+\tpublic MatrixMultiplicationElements getMatrixMultiplicationAccess() {\n+\t\treturn (pMatrixMultiplication != null) ? pMatrixMultiplication : (pMatrixMultiplication = new MatrixMultiplicationElements());\n+\t}\n+\t\n+\tpublic ParserRule getMatrixMultiplicationRule() {\n+\t\treturn getMatrixMultiplicationAccess().getRule();\n+\t}\n+\n+\t//PrimaryMatrix returns MatrixExpression:\n+\t//\t{NewMatrix} matrix=Matrix | {TransposeMatrix} \"[\" name=MATH_NAME \"]^T\" | {MatrixVariable} \"[\" name=MATH_NAME \"]\" | \"(\"\n+\t//\tMatrixAddition \")\";\n+\tpublic PrimaryMatrixElements getPrimaryMatrixAccess() {\n+\t\treturn (pPrimaryMatrix != null) ? pPrimaryMatrix : (pPrimaryMatrix = new PrimaryMatrixElements());\n+\t}\n+\t\n+\tpublic ParserRule getPrimaryMatrixRule() {\n+\t\treturn getPrimaryMatrixAccess().getRule();\n+\t}\n+\n \t//Float:\n \t//\tINT+ (\".\" INT+ ((\"E\" | \"e\") \"-\"? INT+)?)?;\n \tpublic FloatElements getFloatAccess() {\n@@ -930,26 +1250,6 @@ public ParserRule getFunctionDefinitionRule() {\n \t\treturn getFunctionDefinitionAccess().getRule();\n \t}\n \n-\t//MatrixDefinition:\n-\t//\tname=MATH_NAME \"=\" \"{\" (rows+=MatrixRow (\",\" rows+=MatrixRow)* \",\"?)? \"}\";\n-\tpublic MatrixDefinitionElements getMatrixDefinitionAccess() {\n-\t\treturn (pMatrixDefinition != null) ? pMatrixDefinition : (pMatrixDefinition = new MatrixDefinitionElements());\n-\t}\n-\t\n-\tpublic ParserRule getMatrixDefinitionRule() {\n-\t\treturn getMatrixDefinitionAccess().getRule();\n-\t}\n-\n-\t//MatrixRow:\n-\t//\t\"{\" (elements+=Float (\",\" elements+=Float)* \",\"?)? \"}\";\n-\tpublic MatrixRowElements getMatrixRowAccess() {\n-\t\treturn (pMatrixRow != null) ? pMatrixRow : (pMatrixRow = new MatrixRowElements());\n-\t}\n-\t\n-\tpublic ParserRule getMatrixRowRule() {\n-\t\treturn getMatrixRowAccess().getRule();\n-\t}\n-\n \t//terminal MATH_NAME:\n \t//\t(\"a\"..\"z\" | \"A\"..\"Z\" | \"_\") (\"a\"..\"z\" | \"A\"..\"Z\" | \"_\" | \"0\"..\"9\")*;\n \tpublic TerminalRule getMATH_NAMERule() {", "raw_url": "https://github.com/iee/iee/raw/0f04d91efdf50447d8e84e926ef98d7462103dc0/org.eclipse.iee.translator.Jmole%2Forg.eclipse.iee.translator.jmole.math%2Fsrc-gen%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fjmole%2Fmath%2Fservices%2FMathGrammarAccess.java", "sha": "c8333ec3a6d218265850cd9a7a9e028c5e840a12", "status": "modified" }, { "additions": 38, "blob_url": "https://github.com/iee/iee/blob/0f04d91efdf50447d8e84e926ef98d7462103dc0/org.eclipse.iee.translator.Jmole%2Forg.eclipse.iee.translator.jmole.math%2Fsrc%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fjmole%2Fmath%2FMath.xtext", "changes": 54, "contents_url": "https://api.github.com/repos/iee/iee/contents/org.eclipse.iee.translator.Jmole%2Forg.eclipse.iee.translator.jmole.math%2Fsrc%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fjmole%2Fmath%2FMath.xtext?ref=0f04d91efdf50447d8e84e926ef98d7462103dc0", "deletions": 16, "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src/org/eclipse/iee/translator/jmole/math/Math.xtext", "new_code": "\tvariableAssignment=VariableAssignment |\n\tformula=Formula |\n\tmatrixAssignment=MatrixAssignment |\n\tmatrixFormula=MatrixFormula;\nVariableAssignment:\n\t'(-' {Invert} expression=UnaryExpression')' |\n\t'(' {Factorial} expression=UnaryExpression ')!';\n\t\n\t{MatrixElement} element=MATH_NAME '[' row=INT ']' '[' column=INT ']' | \nMatrix:\n\t'{' (rows+=MatrixRow (',' rows+=MatrixRow)* ','?)? '}';\n\t\nMatrixRow:\n\t'{' (elements+=Float (',' elements+=Float)* ','?)? '}';\n\nMatrixAssignment:\n\t'[' variable=MATH_NAME ']' '=' value=MatrixFormula;\n\nMatrixFormula:\n\texpression=MatrixAddition;\n\nMatrixAddition returns MatrixExpression:\n\tMatrixMultiplication ('+' {MatrixAddition.left=current} right=MatrixMultiplication | '-' {MatrixSubtraction.left=current}\n\tright=MatrixMultiplication)*;\n\t\nMatrixMultiplication returns MatrixExpression:\n\tPrimaryMatrix ('*' {MatrixMultiplication.left=current} rightMatrix=PrimaryMatrix |\n\t\t\t\t '*' {MatrixMultiplication.left=current} rightScalar=Formula\n\t)*;\n\t\nPrimaryMatrix returns MatrixExpression:\n\t{NewMatrix} matrix=Matrix |\n\t{TransposeMatrix} '[' name=MATH_NAME ']^T'|\n\t{MatrixVariable} '[' name=MATH_NAME ']' |\n\t'(' MatrixAddition ')';\n\n\tname=MATH_NAME '(' (parameters+=Formula (',' parameters+=Formula)* ','?)? ')';\n\t", "new_methods": [], "old_code": "\tmatrixDefinition=MatrixDefinition |\n\tassignment=Assignment |\n\tformula=Formula;\nAssignment:\n\t('-' {Invert} expression=UnaryExpression) |\n\t'(' {Factorial} expression=UnaryExpression ')!'|\n\t{Interval} openingBracket=('['|'(') '('ceil=UnaryExpression')' '..' '('floor=UnaryExpression')' closingBracket=(']'|')');\n\n\t(name=MATH_NAME) '(' (parameters+=Formula (',' parameters+=Formula)* ','?)? ')';\n\nMatrixDefinition:\n\t(name=MATH_NAME) '=' '{' (rows+=MatrixRow (',' rows+=MatrixRow)* ','?)? '}';\n\nMatrixRow:\n\t'{' (elements+=Float (',' elements+=Float)* ','?)? '}';\n", "old_methods": [], "patch": "@@ -5,11 +5,12 @@ generate math \"http://www.eclipse.org/iee/translator/jmole/math/Math\"\n \n Statement:\n \tfunctionDefinition=FunctionDefinition |\n-\tmatrixDefinition=MatrixDefinition |\n-\tassignment=Assignment |\n-\tformula=Formula;\n+\tvariableAssignment=VariableAssignment |\n+\tformula=Formula |\n+\tmatrixAssignment=MatrixAssignment |\n+\tmatrixFormula=MatrixFormula;\n \n-Assignment:\n+VariableAssignment:\n \tvariable=MATH_NAME '=' value=Formula;\n \n Formula:\n@@ -28,34 +29,55 @@ Multiplication returns Expression:\n \t// Unary operators: right associative, priority 2\n UnaryExpression returns Expression:\n \tExponent |\n-\t('-' {Invert} expression=UnaryExpression) |\n-\t'(' {Factorial} expression=UnaryExpression ')!'|\n-\t{Interval} openingBracket=('['|'(') '('ceil=UnaryExpression')' '..' '('floor=UnaryExpression')' closingBracket=(']'|')');\n-\n+\t'(-' {Invert} expression=UnaryExpression')' |\n+\t'(' {Factorial} expression=UnaryExpression ')!';\n+\t\n \t// exponentiation: right associative, priority 3\n Exponent returns Expression:\n \tPrimary ({Exponent.left=current} '^' right=Primary)?;\n \n Primary returns Expression:\n \t{Variable} name=MATH_NAME |\n \t{Float} value=Float |\n+\t{MatrixElement} element=MATH_NAME '[' row=INT ']' '[' column=INT ']' | \n \t{Function} function=Function |\n \t'(' Addition ')';\n \n+Matrix:\n+\t'{' (rows+=MatrixRow (',' rows+=MatrixRow)* ','?)? '}';\n+\t\n+MatrixRow:\n+\t'{' (elements+=Float (',' elements+=Float)* ','?)? '}';\n+\n+MatrixAssignment:\n+\t'[' variable=MATH_NAME ']' '=' value=MatrixFormula;\n+\n+MatrixFormula:\n+\texpression=MatrixAddition;\n+\n+MatrixAddition returns MatrixExpression:\n+\tMatrixMultiplication ('+' {MatrixAddition.left=current} right=MatrixMultiplication | '-' {MatrixSubtraction.left=current}\n+\tright=MatrixMultiplication)*;\n+\t\n+MatrixMultiplication returns MatrixExpression:\n+\tPrimaryMatrix ('*' {MatrixMultiplication.left=current} rightMatrix=PrimaryMatrix |\n+\t\t\t\t '*' {MatrixMultiplication.left=current} rightScalar=Formula\n+\t)*;\n+\t\n+PrimaryMatrix returns MatrixExpression:\n+\t{NewMatrix} matrix=Matrix |\n+\t{TransposeMatrix} '[' name=MATH_NAME ']^T'|\n+\t{MatrixVariable} '[' name=MATH_NAME ']' |\n+\t'(' MatrixAddition ')';\n+\n Float:\n \tINT+ ('.' INT+ (('E' | 'e') ('-')? (INT)+)?)?;\n \n Function returns Expression:\n-\t(name=MATH_NAME) '(' (parameters+=Formula (',' parameters+=Formula)* ','?)? ')';\n+\tname=MATH_NAME '(' (parameters+=Formula (',' parameters+=Formula)* ','?)? ')';\n \n FunctionDefinition:\n \tfunction=Function '=' formula=Formula;\n-\n-MatrixDefinition:\n-\t(name=MATH_NAME) '=' '{' (rows+=MatrixRow (',' rows+=MatrixRow)* ','?)? '}';\n-\n-MatrixRow:\n-\t'{' (elements+=Float (',' elements+=Float)* ','?)? '}';\n-\n+\t\n terminal MATH_NAME returns ecore::EString:\n \t('a'..'z' | 'A'..'Z' | '_') ('a'..'z' | 'A'..'Z' | '_' | '0'..'9')*;\n\\ No newline at end of file", "raw_url": "https://github.com/iee/iee/raw/0f04d91efdf50447d8e84e926ef98d7462103dc0/org.eclipse.iee.translator.Jmole%2Forg.eclipse.iee.translator.jmole.math%2Fsrc%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fjmole%2Fmath%2FMath.xtext", "sha": "4c5ef668d0e8f6e1552f90fcba741b594f14c7a5", "status": "modified" }, { "additions": 59, "blob_url": "https://github.com/iee/iee/blob/0f04d91efdf50447d8e84e926ef98d7462103dc0/org.eclipse.iee.translator.Jmole%2Forg.eclipse.iee.translator.jmole.math%2Fsrc%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fjmole%2Fmath%2Fgenerator%2FMathGenerator.xtend", "changes": 88, "contents_url": "https://api.github.com/repos/iee/iee/contents/org.eclipse.iee.translator.Jmole%2Forg.eclipse.iee.translator.jmole.math%2Fsrc%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fjmole%2Fmath%2Fgenerator%2FMathGenerator.xtend?ref=0f04d91efdf50447d8e84e926ef98d7462103dc0", "deletions": 29, "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src/org/eclipse/iee/translator/jmole/math/generator/MathGenerator.xtend", "new_code": "\t'''\t\n\t\t�IF s.variableAssignment != null��compileVariableAssignment(s.variableAssignment)�;�ENDIF�\n\t\t�IF s.matrixAssignment != null��compileMatrixAssignment(s.matrixAssignment)�;�ENDIF�\n\t\t�IF s.matrixFormula != null��compileMatrixFormula(s.matrixFormula)�;�ENDIF�\n\tdef compileVariableAssignment(VariableAssignment a)\n\tdef compileMatrixFormula(MatrixFormula f) \n\t\t�compileMatrixExpression(f.expression)�\n\tdef compileMatrixAssignment(MatrixAssignment a)\n\t{\n\t '''\n\t \t�a.variable� = �compileMatrixFormula(a.value)�\n\t '''\n\t}\n\t\n\t\n\t//Expressions\n\t\t\n\tdef dispatch compileExpression(MatrixElement e) '''\n\t\t�e.element�.get(�e.row�,�e.column�)'''\t\n\t\t\n\t\tMath.pow((�compileExpression(op.left)�),(�compileExpression(op.right)�))'''\n\t\n\t//Matrix Expressions\n\tdef dispatch compileMatrixExpression(MatrixVariable n) '''\n\t\t�n.name�'''\n\t\t\n\tdef dispatch compileMatrixExpression(NewMatrix m) '''\n\t\tnew Matrix(new double[][]\n\t\t{\n\t\t�var j = 0�\n\t\t�FOR row:m.matrix.rows�\n\t\t �IF row != null�\n\t\t {\n\t\t \t�var i = 0�\n\t \t\t�FOR element:row.elements�\n\t\t\t �IF element != null�\n\t\t\t \t�element�\n\t\t\t �ENDIF�\n\t\t\t �IF (i = i + 1) != row.elements.size()�,�ENDIF�\n\t\t\t�ENDFOR�\n\t\t }\n\t\t �ENDIF�\n\t\t �IF (j = j + 1) != m.matrix.rows.size()�,�ENDIF�\n\t\t�ENDFOR�\n\t\t})'''\t\n\t\n\tdef dispatch compileMatrixExpression(TransposeMatrix n) '''\n\t\t�n.name�.transpose()'''\t\t\n\t\t\n\tdef dispatch compileMatrixExpression(MatrixAddition op) '''\n\t\t�compileMatrixExpression(op.left)�.plus(�compileMatrixExpression(op.right)�)'''\n\t\n\tdef dispatch compileMatrixExpression(MatrixSubtraction op) '''\n\t\t�compileMatrixExpression(op.left)�.minus(�compileMatrixExpression(op.right)�)'''\n\t\n\tdef dispatch compileMatrixExpression(MatrixMultiplication op) '''\n\t\t�IF op.rightMatrix != null��compileMatrixExpression(op.left)�.times(�compileMatrixExpression(op.rightMatrix)�)�ENDIF�\n\t\t�IF op.rightScalar != null��compileMatrixExpression(op.left)�.times(�compileFormula(op.rightScalar)�)�ENDIF�'''\n\t \t", "new_methods": [ { "arguments": [ "MatrixAssignment a" ], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/src/org/eclipse/iee/translator/jmole/math/generator/MathGenerator.xtend", "implementation": "'''\n\t \t�a.variable� = �compileMatrixFormula(a.value)�\n\t '''", "signature": "def compileMatrixAssignment(MatrixAssignment a)" } ], "old_code": "\t'''\n\t\t�IF s.matrixDefinition != null��compileMatrixDefinition(s.matrixDefinition)�;�ENDIF�\n\t\t�IF s.assignment != null��compileAssignment(s.assignment)�;�ENDIF�\n\t\t\n\tdef compileAssignment(Assignment a)\n\tdef compileMatrixDefinition(MatrixDefinition m) \n\t\tMatrix �m.name� = new Matrix(new double[][]\n\t\t{\n\t\t�var j = 0�\n\t\t�FOR row:m.rows�\n\t\t �IF row != null�\n\t\t {\n\t\t \t�var i = 0�\n\t \t\t�FOR element:row.elements�\n\t\t\t �IF element != null�\n\t\t\t \t�element�\n\t\t\t �ENDIF�\n\t\t\t �IF (i = i + 1) != row.elements.size()�,�ENDIF�\n\t\t\t�ENDFOR�\n\t\t }\n\t\t �ENDIF�\n\t\t �IF (j = j + 1) != m.rows.size()�,�ENDIF�\n\t\t�ENDFOR�\n\t\t})\n\t\t\t\n\tdef dispatch compileExpression(Interval op) '''\n\t�IF op.ceil != null && op.floor != null��op.openingBracket�(�compileExpression(op.ceil)�)..(�compileExpression(op.floor)�)�op.closingBracket��ENDIF�''' \n\t\n\t\t(�compileExpression(op.left)�) ^ (�compileExpression(op.right)�)'''", "old_methods": [], "patch": "@@ -31,12 +31,12 @@ class MathGenerator implements IGenerator {\n \t\n \tdef compileStatement(Statement s)\n \t{\n-\t'''\n+\t'''\t\n \t\t�IF s.functionDefinition != null��compileFunctionDefinition(s.functionDefinition)��ENDIF�\n-\t\t�IF s.matrixDefinition != null��compileMatrixDefinition(s.matrixDefinition)�;�ENDIF�\n-\t\t�IF s.assignment != null��compileAssignment(s.assignment)�;�ENDIF�\n+\t\t�IF s.variableAssignment != null��compileVariableAssignment(s.variableAssignment)�;�ENDIF�\n+\t\t�IF s.matrixAssignment != null��compileMatrixAssignment(s.matrixAssignment)�;�ENDIF�\n \t\t�IF s.formula != null��compileFormula(s.formula)�;�ENDIF�\n-\t\t\n+\t\t�IF s.matrixFormula != null��compileMatrixFormula(s.matrixFormula)�;�ENDIF�\n \t'''\n \t}\n \t\n@@ -52,7 +52,7 @@ class MathGenerator implements IGenerator {\n \t'''\n \t}\n \t\n-\tdef compileAssignment(Assignment a)\n+\tdef compileVariableAssignment(VariableAssignment a)\n \t{\n \t '''\n \t \t�a.variable� = �compileFormula(a.value)�\n@@ -66,44 +66,39 @@ class MathGenerator implements IGenerator {\n \t'''\n \t}\n \t\n-\tdef compileMatrixDefinition(MatrixDefinition m) \n+\tdef compileMatrixFormula(MatrixFormula f) \n \t{\n \t'''\n-\t\tMatrix �m.name� = new Matrix(new double[][]\n-\t\t{\n-\t\t�var j = 0�\n-\t\t�FOR row:m.rows�\n-\t\t �IF row != null�\n-\t\t {\n-\t\t \t�var i = 0�\n-\t \t\t�FOR element:row.elements�\n-\t\t\t �IF element != null�\n-\t\t\t \t�element�\n-\t\t\t �ENDIF�\n-\t\t\t �IF (i = i + 1) != row.elements.size()�,�ENDIF�\n-\t\t\t�ENDFOR�\n-\t\t }\n-\t\t �ENDIF�\n-\t\t �IF (j = j + 1) != m.rows.size()�,�ENDIF�\n-\t\t�ENDFOR�\n-\t\t})\n+\t\t�compileMatrixExpression(f.expression)�\n \t'''\n \t}\n \t\n+\tdef compileMatrixAssignment(MatrixAssignment a)\n+\t{\n+\t '''\n+\t \t�a.variable� = �compileMatrixFormula(a.value)�\n+\t '''\n+\t}\n+\t\n \tdef compileFunction(Function f) '''\n \t\t�f.function.name�\n \t\t(�FOR param:f.function.parameters�\n \t\t �IF param != null��compileFormula(param)��ENDIF�\n \t\t �IF f.function.parameters.last() != param�,�ENDIF�\n \t\t�ENDFOR�)\n \t'''\n-\t\t\t\n+\t\n+\t//Expressions\n+\t\t\n \tdef dispatch compileExpression(Variable n) '''\n \t\t�n.name�'''\n \t\t\n \tdef dispatch compileExpression(Float n) '''\n \t\t�n.value�'''\n \t\t\n+\tdef dispatch compileExpression(MatrixElement e) '''\n+\t\t�e.element�.get(�e.row�,�e.column�)'''\t\n+\t\t\n \tdef dispatch compileExpression(Function f) '''\n \t\t�compileFunction(f)�'''\n \t\n@@ -128,9 +123,44 @@ class MathGenerator implements IGenerator {\n \tdef dispatch compileExpression(Factorial op) '''\n \t�IF op.expression != null� (�compileExpression(op.expression)�)! �ENDIF�''' \n \t\n-\tdef dispatch compileExpression(Interval op) '''\n-\t�IF op.ceil != null && op.floor != null��op.openingBracket�(�compileExpression(op.ceil)�)..(�compileExpression(op.floor)�)�op.closingBracket��ENDIF�''' \n-\t\n \tdef dispatch compileExpression(Exponent op) '''\n-\t\t(�compileExpression(op.left)�) ^ (�compileExpression(op.right)�)'''\n+\t\tMath.pow((�compileExpression(op.left)�),(�compileExpression(op.right)�))'''\n+\t\n+\t//Matrix Expressions\n+\tdef dispatch compileMatrixExpression(MatrixVariable n) '''\n+\t\t�n.name�'''\n+\t\t\n+\tdef dispatch compileMatrixExpression(NewMatrix m) '''\n+\t\tnew Matrix(new double[][]\n+\t\t{\n+\t\t�var j = 0�\n+\t\t�FOR row:m.matrix.rows�\n+\t\t �IF row != null�\n+\t\t {\n+\t\t \t�var i = 0�\n+\t \t\t�FOR element:row.elements�\n+\t\t\t �IF element != null�\n+\t\t\t \t�element�\n+\t\t\t �ENDIF�\n+\t\t\t �IF (i = i + 1) != row.elements.size()�,�ENDIF�\n+\t\t\t�ENDFOR�\n+\t\t }\n+\t\t �ENDIF�\n+\t\t �IF (j = j + 1) != m.matrix.rows.size()�,�ENDIF�\n+\t\t�ENDFOR�\n+\t\t})'''\t\n+\t\n+\tdef dispatch compileMatrixExpression(TransposeMatrix n) '''\n+\t\t�n.name�.transpose()'''\t\t\n+\t\t\n+\tdef dispatch compileMatrixExpression(MatrixAddition op) '''\n+\t\t�compileMatrixExpression(op.left)�.plus(�compileMatrixExpression(op.right)�)'''\n+\t\n+\tdef dispatch compileMatrixExpression(MatrixSubtraction op) '''\n+\t\t�compileMatrixExpression(op.left)�.minus(�compileMatrixExpression(op.right)�)'''\n+\t\n+\tdef dispatch compileMatrixExpression(MatrixMultiplication op) '''\n+\t\t�IF op.rightMatrix != null��compileMatrixExpression(op.left)�.times(�compileMatrixExpression(op.rightMatrix)�)�ENDIF�\n+\t\t�IF op.rightScalar != null��compileMatrixExpression(op.left)�.times(�compileFormula(op.rightScalar)�)�ENDIF�'''\n+\t \t\n }\n\\ No newline at end of file", "raw_url": "https://github.com/iee/iee/raw/0f04d91efdf50447d8e84e926ef98d7462103dc0/org.eclipse.iee.translator.Jmole%2Forg.eclipse.iee.translator.jmole.math%2Fsrc%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fjmole%2Fmath%2Fgenerator%2FMathGenerator.xtend", "sha": "42b4feb50acad2bc2ffe491b1bada89a4fd14fa5", "status": "modified" }, { "additions": 228, "blob_url": "https://github.com/iee/iee/blob/0f04d91efdf50447d8e84e926ef98d7462103dc0/org.eclipse.iee.translator.Jmole%2Forg.eclipse.iee.translator.jmole.math%2Fxtend-gen%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fjmole%2Fmath%2Fgenerator%2FMathGenerator.java", "changes": 343, "contents_url": "https://api.github.com/repos/iee/iee/contents/org.eclipse.iee.translator.Jmole%2Forg.eclipse.iee.translator.jmole.math%2Fxtend-gen%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fjmole%2Fmath%2Fgenerator%2FMathGenerator.java?ref=0f04d91efdf50447d8e84e926ef98d7462103dc0", "deletions": 115, "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/xtend-gen/org/eclipse/iee/translator/jmole/math/generator/MathGenerator.java", "new_code": "import org.eclipse.iee.translator.jmole.math.math.Matrix;\nimport org.eclipse.iee.translator.jmole.math.math.MatrixAddition;\nimport org.eclipse.iee.translator.jmole.math.math.MatrixAssignment;\nimport org.eclipse.iee.translator.jmole.math.math.MatrixElement;\nimport org.eclipse.iee.translator.jmole.math.math.MatrixExpression;\nimport org.eclipse.iee.translator.jmole.math.math.MatrixFormula;\nimport org.eclipse.iee.translator.jmole.math.math.MatrixMultiplication;\nimport org.eclipse.iee.translator.jmole.math.math.MatrixSubtraction;\nimport org.eclipse.iee.translator.jmole.math.math.MatrixVariable;\nimport org.eclipse.iee.translator.jmole.math.math.NewMatrix;\nimport org.eclipse.iee.translator.jmole.math.math.TransposeMatrix;\nimport org.eclipse.iee.translator.jmole.math.math.VariableAssignment;\n VariableAssignment _variableAssignment = s.getVariableAssignment();\n boolean _operator_notEquals_1 = ObjectExtensions.operator_notEquals(_variableAssignment, null);\n VariableAssignment _variableAssignment_1 = s.getVariableAssignment();\n StringConcatenation _compileVariableAssignment = this.compileVariableAssignment(_variableAssignment_1);\n _builder.append(_compileVariableAssignment, \"\");\n MatrixAssignment _matrixAssignment = s.getMatrixAssignment();\n boolean _operator_notEquals_2 = ObjectExtensions.operator_notEquals(_matrixAssignment, null);\n MatrixAssignment _matrixAssignment_1 = s.getMatrixAssignment();\n StringConcatenation _compileMatrixAssignment = this.compileMatrixAssignment(_matrixAssignment_1);\n _builder.append(_compileMatrixAssignment, \"\");\n {\n MatrixFormula _matrixFormula = s.getMatrixFormula();\n boolean _operator_notEquals_4 = ObjectExtensions.operator_notEquals(_matrixFormula, null);\n if (_operator_notEquals_4) {\n MatrixFormula _matrixFormula_1 = s.getMatrixFormula();\n StringConcatenation _compileMatrixFormula = this.compileMatrixFormula(_matrixFormula_1);\n _builder.append(_compileMatrixFormula, \"\");\n _builder.append(\";\");\n }\n }\n _builder.newLineIfNotEmpty();\n for(final Formula param : _parameters) {\n public StringConcatenation compileVariableAssignment(final VariableAssignment a) {\n public StringConcatenation compileMatrixFormula(final MatrixFormula f) {\n MatrixExpression _expression = f.getExpression();\n StringConcatenation _compileMatrixExpression = this.compileMatrixExpression(_expression);\n _builder.append(_compileMatrixExpression, \"\");\n return _builder;\n }\n \n public StringConcatenation compileMatrixAssignment(final MatrixAssignment a) {\n StringConcatenation _builder = new StringConcatenation();\n String _variable = a.getVariable();\n _builder.append(_variable, \"\");\n _builder.append(\" = \");\n MatrixFormula _value = a.getValue();\n StringConcatenation _compileMatrixFormula = this.compileMatrixFormula(_value);\n _builder.append(_compileMatrixFormula, \"\");\n for(final Formula param : _parameters) {\n protected StringConcatenation _compileExpression(final MatrixElement e) {\n StringConcatenation _builder = new StringConcatenation();\n String _element = e.getElement();\n _builder.append(_element, \"\");\n _builder.append(\".get(\");\n int _row = e.getRow();\n _builder.append(_row, \"\");\n _builder.append(\",\");\n int _column = e.getColumn();\n _builder.append(_column, \"\");\n _builder.append(\")\");\n return _builder;\n }\n \n _builder.append(\"Math.pow((\");\n _builder.append(\"),(\");\n _builder.append(\"))\");\n return _builder;\n }\n \n protected StringConcatenation _compileMatrixExpression(final MatrixVariable n) {\n StringConcatenation _builder = new StringConcatenation();\n String _name = n.getName();\n _builder.append(_name, \"\");\n return _builder;\n }\n \n protected StringConcatenation _compileMatrixExpression(final NewMatrix m) {\n StringConcatenation _builder = new StringConcatenation();\n _builder.append(\"new Matrix(new double[][]\");\n _builder.newLine();\n _builder.append(\"{\");\n _builder.newLine();\n int j = 0;\n _builder.newLineIfNotEmpty();\n {\n Matrix _matrix = m.getMatrix();\n EList<MatrixRow> _rows = _matrix.getRows();\n for(final MatrixRow row : _rows) {\n {\n boolean _operator_notEquals = ObjectExtensions.operator_notEquals(row, null);\n if (_operator_notEquals) {\n _builder.append(\"{\");\n _builder.newLine();\n _builder.append(\"\\t\");\n int i = 0;\n _builder.newLineIfNotEmpty();\n {\n EList<String> _elements = row.getElements();\n for(final String element : _elements) {\n {\n boolean _operator_notEquals_1 = ObjectExtensions.operator_notEquals(element, null);\n if (_operator_notEquals_1) {\n _builder.append(element, \"\");\n _builder.newLineIfNotEmpty();\n }\n }\n {\n int _operator_plus = IntegerExtensions.operator_plus(((Integer)i), ((Integer)1));\n int _i = i = _operator_plus;\n EList<String> _elements_1 = row.getElements();\n int _size = _elements_1.size();\n boolean _operator_notEquals_2 = ObjectExtensions.operator_notEquals(((Integer)_i), ((Integer)_size));\n if (_operator_notEquals_2) {\n _builder.append(\",\");\n }\n }\n _builder.newLineIfNotEmpty();\n }\n }\n _builder.append(\"}\");\n _builder.newLine();\n }\n }\n {\n int _operator_plus_1 = IntegerExtensions.operator_plus(((Integer)j), ((Integer)1));\n int _j = j = _operator_plus_1;\n Matrix _matrix_1 = m.getMatrix();\n EList<MatrixRow> _rows_1 = _matrix_1.getRows();\n int _size_1 = _rows_1.size();\n boolean _operator_notEquals_3 = ObjectExtensions.operator_notEquals(((Integer)_j), ((Integer)_size_1));\n if (_operator_notEquals_3) {\n _builder.append(\",\");\n }\n }\n _builder.newLineIfNotEmpty();\n }\n }\n _builder.append(\"})\");\n return _builder;\n }\n \n protected StringConcatenation _compileMatrixExpression(final TransposeMatrix n) {\n StringConcatenation _builder = new StringConcatenation();\n String _name = n.getName();\n _builder.append(_name, \"\");\n _builder.append(\".transpose()\");\n return _builder;\n }\n \n protected StringConcatenation _compileMatrixExpression(final MatrixAddition op) {\n StringConcatenation _builder = new StringConcatenation();\n MatrixExpression _left = op.getLeft();\n StringConcatenation _compileMatrixExpression = this.compileMatrixExpression(_left);\n _builder.append(_compileMatrixExpression, \"\");\n _builder.append(\".plus(\");\n MatrixExpression _right = op.getRight();\n StringConcatenation _compileMatrixExpression_1 = this.compileMatrixExpression(_right);\n _builder.append(_compileMatrixExpression_1, \"\");\n _builder.append(\")\");\n return _builder;\n }\n \n protected StringConcatenation _compileMatrixExpression(final MatrixSubtraction op) {\n StringConcatenation _builder = new StringConcatenation();\n MatrixExpression _left = op.getLeft();\n StringConcatenation _compileMatrixExpression = this.compileMatrixExpression(_left);\n _builder.append(_compileMatrixExpression, \"\");\n _builder.append(\".minus(\");\n MatrixExpression _right = op.getRight();\n StringConcatenation _compileMatrixExpression_1 = this.compileMatrixExpression(_right);\n _builder.append(_compileMatrixExpression_1, \"\");\n protected StringConcatenation _compileMatrixExpression(final MatrixMultiplication op) {\n StringConcatenation _builder = new StringConcatenation();\n {\n MatrixExpression _rightMatrix = op.getRightMatrix();\n boolean _operator_notEquals = ObjectExtensions.operator_notEquals(_rightMatrix, null);\n if (_operator_notEquals) {\n MatrixExpression _left = op.getLeft();\n StringConcatenation _compileMatrixExpression = this.compileMatrixExpression(_left);\n _builder.append(_compileMatrixExpression, \"\");\n _builder.append(\".times(\");\n MatrixExpression _rightMatrix_1 = op.getRightMatrix();\n StringConcatenation _compileMatrixExpression_1 = this.compileMatrixExpression(_rightMatrix_1);\n _builder.append(_compileMatrixExpression_1, \"\");\n _builder.append(\")\");\n }\n }\n _builder.newLineIfNotEmpty();\n {\n Formula _rightScalar = op.getRightScalar();\n boolean _operator_notEquals_1 = ObjectExtensions.operator_notEquals(_rightScalar, null);\n if (_operator_notEquals_1) {\n MatrixExpression _left_1 = op.getLeft();\n StringConcatenation _compileMatrixExpression_2 = this.compileMatrixExpression(_left_1);\n _builder.append(_compileMatrixExpression_2, \"\");\n _builder.append(\".times(\");\n Formula _rightScalar_1 = op.getRightScalar();\n StringConcatenation _compileFormula = this.compileFormula(_rightScalar_1);\n _builder.append(_compileFormula, \"\");\n _builder.append(\")\");\n }\n }\n return _builder;\n }\n \n } else if ((op instanceof MatrixElement)) {\n return _compileExpression((MatrixElement)op);\n \n public StringConcatenation compileMatrixExpression(final MatrixExpression op) {\n if ((op instanceof MatrixAddition)) {\n return _compileMatrixExpression((MatrixAddition)op);\n } else if ((op instanceof MatrixMultiplication)) {\n return _compileMatrixExpression((MatrixMultiplication)op);\n } else if ((op instanceof MatrixSubtraction)) {\n return _compileMatrixExpression((MatrixSubtraction)op);\n } else if ((op instanceof MatrixVariable)) {\n return _compileMatrixExpression((MatrixVariable)op);\n } else if ((op instanceof NewMatrix)) {\n return _compileMatrixExpression((NewMatrix)op);\n } else if ((op instanceof TransposeMatrix)) {\n return _compileMatrixExpression((TransposeMatrix)op);\n } else {\n throw new IllegalArgumentException(\"Unhandled parameter types: \" +\n java.util.Arrays.<Object>asList(op).toString());\n }\n }", "new_methods": [ { "arguments": [ "final VariableAssignment a" ], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/xtend-gen/org/eclipse/iee/translator/jmole/math/generator/MathGenerator.java", "implementation": "public StringConcatenation compileMatrixFormula(final MatrixFormula f) {\n MatrixExpression _expression = f.getExpression();\n StringConcatenation _compileMatrixExpression = this.compileMatrixExpression(_expression);\n _builder.append(_compileMatrixExpression, \"\");\n return _builder;", "signature": "StringConcatenation compileVariableAssignment(final VariableAssignment a)" }, { "arguments": [ "final MatrixAssignment a" ], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/xtend-gen/org/eclipse/iee/translator/jmole/math/generator/MathGenerator.java", "implementation": "StringConcatenation _builder = new StringConcatenation();\n String _variable = a.getVariable();\n _builder.append(_variable, \"\");\n _builder.append(\" = \");\n MatrixFormula _value = a.getValue();\n StringConcatenation _compileMatrixFormula = this.compileMatrixFormula(_value);\n _builder.append(_compileMatrixFormula, \"\");\n for(final Formula param : _parameters) {\n protected StringConcatenation _compileExpression(final MatrixElement e) {\n StringConcatenation _builder = new StringConcatenation();\n String _element = e.getElement();\n _builder.append(_element, \"\");\n _builder.append(\".get(\");\n int _row = e.getRow();\n _builder.append(_row, \"\");\n _builder.append(\",\");\n int _column = e.getColumn();\n _builder.append(_column, \"\");\n _builder.append(\")\");\n return _builder;", "signature": "StringConcatenation compileMatrixAssignment(final MatrixAssignment a)" }, { "arguments": [ "final MatrixVariable n" ], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/xtend-gen/org/eclipse/iee/translator/jmole/math/generator/MathGenerator.java", "implementation": "StringConcatenation _builder = new StringConcatenation();\n String _name = n.getName();\n _builder.append(_name, \"\");\n return _builder;", "signature": "StringConcatenation _compileMatrixExpression(final MatrixVariable n)" }, { "arguments": [ "final NewMatrix m" ], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/xtend-gen/org/eclipse/iee/translator/jmole/math/generator/MathGenerator.java", "implementation": "StringConcatenation _builder = new StringConcatenation();\n _builder.append(\"new Matrix(new double[][]\");\n _builder.newLine();\n _builder.append(\"{\");\n _builder.newLine();\n int j = 0;\n _builder.newLineIfNotEmpty();\n {\n Matrix _matrix = m.getMatrix();\n EList<MatrixRow> _rows = _matrix.getRows();\n for(final MatrixRow row : _rows) {\n {\n boolean _operator_notEquals = ObjectExtensions.operator_notEquals(row, null);\n if (_operator_notEquals) {\n _builder.append(\"{\");\n _builder.newLine();\n _builder.append(\"\\t\");\n int i = 0;\n _builder.newLineIfNotEmpty();\n {\n EList<String> _elements = row.getElements();\n for(final String element : _elements) {\n {\n boolean _operator_notEquals_1 = ObjectExtensions.operator_notEquals(element, null);\n if (_operator_notEquals_1) {\n _builder.append(element, \"\");\n _builder.newLineIfNotEmpty();", "signature": "StringConcatenation _compileMatrixExpression(final NewMatrix m)" }, { "arguments": [ "final TransposeMatrix n" ], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/xtend-gen/org/eclipse/iee/translator/jmole/math/generator/MathGenerator.java", "implementation": "StringConcatenation _builder = new StringConcatenation();\n String _name = n.getName();\n _builder.append(_name, \"\");\n _builder.append(\".transpose()\");\n return _builder;", "signature": "StringConcatenation _compileMatrixExpression(final TransposeMatrix n)" }, { "arguments": [ "final MatrixAddition op" ], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/xtend-gen/org/eclipse/iee/translator/jmole/math/generator/MathGenerator.java", "implementation": "StringConcatenation _builder = new StringConcatenation();\n MatrixExpression _left = op.getLeft();\n StringConcatenation _compileMatrixExpression = this.compileMatrixExpression(_left);\n _builder.append(_compileMatrixExpression, \"\");\n _builder.append(\".plus(\");\n MatrixExpression _right = op.getRight();\n StringConcatenation _compileMatrixExpression_1 = this.compileMatrixExpression(_right);\n _builder.append(_compileMatrixExpression_1, \"\");\n _builder.append(\")\");\n return _builder;", "signature": "StringConcatenation _compileMatrixExpression(final MatrixAddition op)" }, { "arguments": [ "final MatrixSubtraction op" ], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/xtend-gen/org/eclipse/iee/translator/jmole/math/generator/MathGenerator.java", "implementation": "StringConcatenation _builder = new StringConcatenation();\n MatrixExpression _left = op.getLeft();\n StringConcatenation _compileMatrixExpression = this.compileMatrixExpression(_left);\n _builder.append(_compileMatrixExpression, \"\");\n _builder.append(\".minus(\");\n MatrixExpression _right = op.getRight();\n StringConcatenation _compileMatrixExpression_1 = this.compileMatrixExpression(_right);\n _builder.append(_compileMatrixExpression_1, \"\");\n protected StringConcatenation _compileMatrixExpression(final MatrixMultiplication op) {\n StringConcatenation _builder = new StringConcatenation();\n {\n MatrixExpression _rightMatrix = op.getRightMatrix();\n boolean _operator_notEquals = ObjectExtensions.operator_notEquals(_rightMatrix, null);\n if (_operator_notEquals) {\n MatrixExpression _left = op.getLeft();\n StringConcatenation _compileMatrixExpression = this.compileMatrixExpression(_left);\n _builder.append(_compileMatrixExpression, \"\");\n _builder.append(\".times(\");\n MatrixExpression _rightMatrix_1 = op.getRightMatrix();\n StringConcatenation _compileMatrixExpression_1 = this.compileMatrixExpression(_rightMatrix_1);\n _builder.append(_compileMatrixExpression_1, \"\");\n _builder.append(\")\");", "signature": "StringConcatenation _compileMatrixExpression(final MatrixSubtraction op)" }, { "arguments": [ "final MatrixExpression op" ], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/xtend-gen/org/eclipse/iee/translator/jmole/math/generator/MathGenerator.java", "implementation": "if ((op instanceof MatrixAddition)) {\n return _compileMatrixExpression((MatrixAddition)op);", "signature": "StringConcatenation compileMatrixExpression(final MatrixExpression op)" } ], "old_code": "import org.eclipse.iee.translator.jmole.math.math.Assignment;\nimport org.eclipse.iee.translator.jmole.math.math.Interval;\nimport org.eclipse.iee.translator.jmole.math.math.MatrixDefinition;\nimport org.eclipse.xtext.xbase.lib.BooleanExtensions;\n MatrixDefinition _matrixDefinition = s.getMatrixDefinition();\n boolean _operator_notEquals_1 = ObjectExtensions.operator_notEquals(_matrixDefinition, null);\n MatrixDefinition _matrixDefinition_1 = s.getMatrixDefinition();\n StringConcatenation _compileMatrixDefinition = this.compileMatrixDefinition(_matrixDefinition_1);\n _builder.append(_compileMatrixDefinition, \"\");\n Assignment _assignment = s.getAssignment();\n boolean _operator_notEquals_2 = ObjectExtensions.operator_notEquals(_assignment, null);\n Assignment _assignment_1 = s.getAssignment();\n StringConcatenation _compileAssignment = this.compileAssignment(_assignment_1);\n _builder.append(_compileAssignment, \"\");\n _builder.newLine();\n for(Formula param : _parameters) {\n public StringConcatenation compileAssignment(final Assignment a) {\n public StringConcatenation compileMatrixDefinition(final MatrixDefinition m) {\n _builder.append(\"Matrix \");\n String _name = m.getName();\n _builder.append(_name, \"\");\n _builder.append(\" = new Matrix(new double[][]\");\n _builder.append(\"{\");\n _builder.newLine();\n int j = 0;\n {\n EList<MatrixRow> _rows = m.getRows();\n for(MatrixRow row : _rows) {\n {\n boolean _operator_notEquals = ObjectExtensions.operator_notEquals(row, null);\n if (_operator_notEquals) {\n _builder.append(\"{\");\n _builder.newLine();\n _builder.append(\"\\t\");\n int i = 0;\n _builder.newLineIfNotEmpty();\n {\n EList<String> _elements = row.getElements();\n for(String element : _elements) {\n {\n boolean _operator_notEquals_1 = ObjectExtensions.operator_notEquals(element, null);\n if (_operator_notEquals_1) {\n _builder.append(element, \"\");\n _builder.newLineIfNotEmpty();\n }\n }\n {\n int _operator_plus = IntegerExtensions.operator_plus(((Integer)i), ((Integer)1));\n int _i = i = _operator_plus;\n EList<String> _elements_1 = row.getElements();\n int _size = _elements_1.size();\n boolean _operator_notEquals_2 = ObjectExtensions.operator_notEquals(((Integer)_i), ((Integer)_size));\n if (_operator_notEquals_2) {\n _builder.append(\",\");\n }\n }\n _builder.newLineIfNotEmpty();\n }\n }\n _builder.append(\"}\");\n _builder.newLine();\n }\n }\n {\n int _operator_plus_1 = IntegerExtensions.operator_plus(((Integer)j), ((Integer)1));\n int _j = j = _operator_plus_1;\n EList<MatrixRow> _rows_1 = m.getRows();\n int _size_1 = _rows_1.size();\n boolean _operator_notEquals_3 = ObjectExtensions.operator_notEquals(((Integer)_j), ((Integer)_size_1));\n if (_operator_notEquals_3) {\n _builder.append(\",\");\n }\n }\n _builder.newLineIfNotEmpty();\n }\n }\n _builder.append(\"})\");\n _builder.newLine();\n for(Formula param : _parameters) {\n protected StringConcatenation _compileExpression(final Interval op) {\n StringConcatenation _builder = new StringConcatenation();\n {\n boolean _operator_and = false;\n Expression _ceil = op.getCeil();\n boolean _operator_notEquals = ObjectExtensions.operator_notEquals(_ceil, null);\n if (!_operator_notEquals) {\n _operator_and = false;\n } else {\n Expression _floor = op.getFloor();\n boolean _operator_notEquals_1 = ObjectExtensions.operator_notEquals(_floor, null);\n _operator_and = BooleanExtensions.operator_and(_operator_notEquals, _operator_notEquals_1);\n }\n if (_operator_and) {\n String _openingBracket = op.getOpeningBracket();\n _builder.append(_openingBracket, \"\");\n _builder.append(\"(\");\n Expression _ceil_1 = op.getCeil();\n StringConcatenation _compileExpression = this.compileExpression(_ceil_1);\n _builder.append(_compileExpression, \"\");\n _builder.append(\")..(\");\n Expression _floor_1 = op.getFloor();\n StringConcatenation _compileExpression_1 = this.compileExpression(_floor_1);\n _builder.append(_compileExpression_1, \"\");\n _builder.append(\")\");\n String _closingBracket = op.getClosingBracket();\n _builder.append(_closingBracket, \"\");\n }\n }\n return _builder;\n }\n \n _builder.append(\"(\");\n _builder.append(\") ^ (\");\n } else if ((op instanceof Interval)) {\n return _compileExpression((Interval)op);", "old_methods": [ { "arguments": [ "final Assignment a" ], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/xtend-gen/org/eclipse/iee/translator/jmole/math/generator/MathGenerator.java", "implementation": "public StringConcatenation compileMatrixDefinition(final MatrixDefinition m) {\n _builder.append(\"Matrix \");\n String _name = m.getName();\n _builder.append(_name, \"\");\n _builder.append(\" = new Matrix(new double[][]\");\n _builder.append(\"{\");\n _builder.newLine();\n int j = 0;\n {\n EList<MatrixRow> _rows = m.getRows();\n for(MatrixRow row : _rows) {\n {\n boolean _operator_notEquals = ObjectExtensions.operator_notEquals(row, null);\n if (_operator_notEquals) {\n _builder.append(\"{\");\n _builder.newLine();\n _builder.append(\"\\t\");\n int i = 0;\n _builder.newLineIfNotEmpty();\n {\n EList<String> _elements = row.getElements();\n for(String element : _elements) {\n {\n boolean _operator_notEquals_1 = ObjectExtensions.operator_notEquals(element, null);\n if (_operator_notEquals_1) {\n _builder.append(element, \"\");\n _builder.newLineIfNotEmpty();", "signature": "StringConcatenation compileAssignment(final Assignment a)" }, { "arguments": [ "final Interval op" ], "filename": "org.eclipse.iee.translator.Jmole/org.eclipse.iee.translator.jmole.math/xtend-gen/org/eclipse/iee/translator/jmole/math/generator/MathGenerator.java", "implementation": "StringConcatenation _builder = new StringConcatenation();\n {\n boolean _operator_and = false;\n Expression _ceil = op.getCeil();\n boolean _operator_notEquals = ObjectExtensions.operator_notEquals(_ceil, null);\n if (!_operator_notEquals) {\n _operator_and = false;", "signature": "StringConcatenation _compileExpression(final Interval op)" } ], "patch": "@@ -4,7 +4,6 @@\n import org.eclipse.emf.ecore.EObject;\n import org.eclipse.emf.ecore.resource.Resource;\n import org.eclipse.iee.translator.jmole.math.math.Addition;\n-import org.eclipse.iee.translator.jmole.math.math.Assignment;\n import org.eclipse.iee.translator.jmole.math.math.Division;\n import org.eclipse.iee.translator.jmole.math.math.Exponent;\n import org.eclipse.iee.translator.jmole.math.math.Expression;\n@@ -13,18 +12,27 @@\n import org.eclipse.iee.translator.jmole.math.math.Formula;\n import org.eclipse.iee.translator.jmole.math.math.Function;\n import org.eclipse.iee.translator.jmole.math.math.FunctionDefinition;\n-import org.eclipse.iee.translator.jmole.math.math.Interval;\n import org.eclipse.iee.translator.jmole.math.math.Invert;\n-import org.eclipse.iee.translator.jmole.math.math.MatrixDefinition;\n+import org.eclipse.iee.translator.jmole.math.math.Matrix;\n+import org.eclipse.iee.translator.jmole.math.math.MatrixAddition;\n+import org.eclipse.iee.translator.jmole.math.math.MatrixAssignment;\n+import org.eclipse.iee.translator.jmole.math.math.MatrixElement;\n+import org.eclipse.iee.translator.jmole.math.math.MatrixExpression;\n+import org.eclipse.iee.translator.jmole.math.math.MatrixFormula;\n+import org.eclipse.iee.translator.jmole.math.math.MatrixMultiplication;\n import org.eclipse.iee.translator.jmole.math.math.MatrixRow;\n+import org.eclipse.iee.translator.jmole.math.math.MatrixSubtraction;\n+import org.eclipse.iee.translator.jmole.math.math.MatrixVariable;\n import org.eclipse.iee.translator.jmole.math.math.Modulo;\n import org.eclipse.iee.translator.jmole.math.math.Multiplication;\n+import org.eclipse.iee.translator.jmole.math.math.NewMatrix;\n import org.eclipse.iee.translator.jmole.math.math.Statement;\n import org.eclipse.iee.translator.jmole.math.math.Subtraction;\n+import org.eclipse.iee.translator.jmole.math.math.TransposeMatrix;\n import org.eclipse.iee.translator.jmole.math.math.Variable;\n+import org.eclipse.iee.translator.jmole.math.math.VariableAssignment;\n import org.eclipse.xtext.generator.IFileSystemAccess;\n import org.eclipse.xtext.generator.IGenerator;\n-import org.eclipse.xtext.xbase.lib.BooleanExtensions;\n import org.eclipse.xtext.xbase.lib.IntegerExtensions;\n import org.eclipse.xtext.xbase.lib.IterableExtensions;\n import org.eclipse.xtext.xbase.lib.ObjectExtensions;\n@@ -66,23 +74,23 @@ public StringConcatenation compileStatement(final Statement s) {\n }\n _builder.newLineIfNotEmpty();\n {\n- MatrixDefinition _matrixDefinition = s.getMatrixDefinition();\n- boolean _operator_notEquals_1 = ObjectExtensions.operator_notEquals(_matrixDefinition, null);\n+ VariableAssignment _variableAssignment = s.getVariableAssignment();\n+ boolean _operator_notEquals_1 = ObjectExtensions.operator_notEquals(_variableAssignment, null);\n if (_operator_notEquals_1) {\n- MatrixDefinition _matrixDefinition_1 = s.getMatrixDefinition();\n- StringConcatenation _compileMatrixDefinition = this.compileMatrixDefinition(_matrixDefinition_1);\n- _builder.append(_compileMatrixDefinition, \"\");\n+ VariableAssignment _variableAssignment_1 = s.getVariableAssignment();\n+ StringConcatenation _compileVariableAssignment = this.compileVariableAssignment(_variableAssignment_1);\n+ _builder.append(_compileVariableAssignment, \"\");\n _builder.append(\";\");\n }\n }\n _builder.newLineIfNotEmpty();\n {\n- Assignment _assignment = s.getAssignment();\n- boolean _operator_notEquals_2 = ObjectExtensions.operator_notEquals(_assignment, null);\n+ MatrixAssignment _matrixAssignment = s.getMatrixAssignment();\n+ boolean _operator_notEquals_2 = ObjectExtensions.operator_notEquals(_matrixAssignment, null);\n if (_operator_notEquals_2) {\n- Assignment _assignment_1 = s.getAssignment();\n- StringConcatenation _compileAssignment = this.compileAssignment(_assignment_1);\n- _builder.append(_compileAssignment, \"\");\n+ MatrixAssignment _matrixAssignment_1 = s.getMatrixAssignment();\n+ StringConcatenation _compileMatrixAssignment = this.compileMatrixAssignment(_matrixAssignment_1);\n+ _builder.append(_compileMatrixAssignment, \"\");\n _builder.append(\";\");\n }\n }\n@@ -98,7 +106,17 @@ public StringConcatenation compileStatement(final Statement s) {\n }\n }\n _builder.newLineIfNotEmpty();\n- _builder.newLine();\n+ {\n+ MatrixFormula _matrixFormula = s.getMatrixFormula();\n+ boolean _operator_notEquals_4 = ObjectExtensions.operator_notEquals(_matrixFormula, null);\n+ if (_operator_notEquals_4) {\n+ MatrixFormula _matrixFormula_1 = s.getMatrixFormula();\n+ StringConcatenation _compileMatrixFormula = this.compileMatrixFormula(_matrixFormula_1);\n+ _builder.append(_compileMatrixFormula, \"\");\n+ _builder.append(\";\");\n+ }\n+ }\n+ _builder.newLineIfNotEmpty();\n return _builder;\n }\n \n@@ -113,7 +131,7 @@ public StringConcatenation compileFunctionDefinition(final FunctionDefinition fu\n {\n Expression _function_1 = funcDef.getFunction();\n EList<Formula> _parameters = _function_1.getParameters();\n- for(Formula param : _parameters) {\n+ for(final Formula param : _parameters) {\n {\n boolean _operator_notEquals = ObjectExtensions.operator_notEquals(param, null);\n if (_operator_notEquals) {\n@@ -155,7 +173,7 @@ public StringConcatenation compileFunctionDefinition(final FunctionDefinition fu\n return _builder;\n }\n \n- public StringConcatenation compileAssignment(final Assignment a) {\n+ public StringConcatenation compileVariableAssignment(final VariableAssignment a) {\n StringConcatenation _builder = new StringConcatenation();\n String _variable = a.getVariable();\n _builder.append(_variable, \"\");\n@@ -176,70 +194,24 @@ public StringConcatenation compileFormula(final Formula f) {\n return _builder;\n }\n \n- public StringConcatenation compileMatrixDefinition(final MatrixDefinition m) {\n+ public StringConcatenation compileMatrixFormula(final MatrixFormula f) {\n StringConcatenation _builder = new StringConcatenation();\n- _builder.append(\"Matrix \");\n- String _name = m.getName();\n- _builder.append(_name, \"\");\n- _builder.append(\" = new Matrix(new double[][]\");\n+ MatrixExpression _expression = f.getExpression();\n+ StringConcatenation _compileMatrixExpression = this.compileMatrixExpression(_expression);\n+ _builder.append(_compileMatrixExpression, \"\");\n _builder.newLineIfNotEmpty();\n- _builder.append(\"{\");\n- _builder.newLine();\n- int j = 0;\n+ return _builder;\n+ }\n+ \n+ public StringConcatenation compileMatrixAssignment(final MatrixAssignment a) {\n+ StringConcatenation _builder = new StringConcatenation();\n+ String _variable = a.getVariable();\n+ _builder.append(_variable, \"\");\n+ _builder.append(\" = \");\n+ MatrixFormula _value = a.getValue();\n+ StringConcatenation _compileMatrixFormula = this.compileMatrixFormula(_value);\n+ _builder.append(_compileMatrixFormula, \"\");\n _builder.newLineIfNotEmpty();\n- {\n- EList<MatrixRow> _rows = m.getRows();\n- for(MatrixRow row : _rows) {\n- {\n- boolean _operator_notEquals = ObjectExtensions.operator_notEquals(row, null);\n- if (_operator_notEquals) {\n- _builder.append(\"{\");\n- _builder.newLine();\n- _builder.append(\"\\t\");\n- int i = 0;\n- _builder.newLineIfNotEmpty();\n- {\n- EList<String> _elements = row.getElements();\n- for(String element : _elements) {\n- {\n- boolean _operator_notEquals_1 = ObjectExtensions.operator_notEquals(element, null);\n- if (_operator_notEquals_1) {\n- _builder.append(element, \"\");\n- _builder.newLineIfNotEmpty();\n- }\n- }\n- {\n- int _operator_plus = IntegerExtensions.operator_plus(((Integer)i), ((Integer)1));\n- int _i = i = _operator_plus;\n- EList<String> _elements_1 = row.getElements();\n- int _size = _elements_1.size();\n- boolean _operator_notEquals_2 = ObjectExtensions.operator_notEquals(((Integer)_i), ((Integer)_size));\n- if (_operator_notEquals_2) {\n- _builder.append(\",\");\n- }\n- }\n- _builder.newLineIfNotEmpty();\n- }\n- }\n- _builder.append(\"}\");\n- _builder.newLine();\n- }\n- }\n- {\n- int _operator_plus_1 = IntegerExtensions.operator_plus(((Integer)j), ((Integer)1));\n- int _j = j = _operator_plus_1;\n- EList<MatrixRow> _rows_1 = m.getRows();\n- int _size_1 = _rows_1.size();\n- boolean _operator_notEquals_3 = ObjectExtensions.operator_notEquals(((Integer)_j), ((Integer)_size_1));\n- if (_operator_notEquals_3) {\n- _builder.append(\",\");\n- }\n- }\n- _builder.newLineIfNotEmpty();\n- }\n- }\n- _builder.append(\"})\");\n- _builder.newLine();\n return _builder;\n }\n \n@@ -253,7 +225,7 @@ public StringConcatenation compileFunction(final Function f) {\n {\n Expression _function_1 = f.getFunction();\n EList<Formula> _parameters = _function_1.getParameters();\n- for(Formula param : _parameters) {\n+ for(final Formula param : _parameters) {\n _builder.newLineIfNotEmpty();\n {\n boolean _operator_notEquals = ObjectExtensions.operator_notEquals(param, null);\n@@ -295,6 +267,20 @@ protected StringConcatenation _compileExpression(final Float n) {\n return _builder;\n }\n \n+ protected StringConcatenation _compileExpression(final MatrixElement e) {\n+ StringConcatenation _builder = new StringConcatenation();\n+ String _element = e.getElement();\n+ _builder.append(_element, \"\");\n+ _builder.append(\".get(\");\n+ int _row = e.getRow();\n+ _builder.append(_row, \"\");\n+ _builder.append(\",\");\n+ int _column = e.getColumn();\n+ _builder.append(_column, \"\");\n+ _builder.append(\")\");\n+ return _builder;\n+ }\n+ \n protected StringConcatenation _compileExpression(final Function f) {\n StringConcatenation _builder = new StringConcatenation();\n StringConcatenation _compileFunction = this.compileFunction(f);\n@@ -404,52 +390,160 @@ protected StringConcatenation _compileExpression(final Factorial op) {\n return _builder;\n }\n \n- protected StringConcatenation _compileExpression(final Interval op) {\n- StringConcatenation _builder = new StringConcatenation();\n- {\n- boolean _operator_and = false;\n- Expression _ceil = op.getCeil();\n- boolean _operator_notEquals = ObjectExtensions.operator_notEquals(_ceil, null);\n- if (!_operator_notEquals) {\n- _operator_and = false;\n- } else {\n- Expression _floor = op.getFloor();\n- boolean _operator_notEquals_1 = ObjectExtensions.operator_notEquals(_floor, null);\n- _operator_and = BooleanExtensions.operator_and(_operator_notEquals, _operator_notEquals_1);\n- }\n- if (_operator_and) {\n- String _openingBracket = op.getOpeningBracket();\n- _builder.append(_openingBracket, \"\");\n- _builder.append(\"(\");\n- Expression _ceil_1 = op.getCeil();\n- StringConcatenation _compileExpression = this.compileExpression(_ceil_1);\n- _builder.append(_compileExpression, \"\");\n- _builder.append(\")..(\");\n- Expression _floor_1 = op.getFloor();\n- StringConcatenation _compileExpression_1 = this.compileExpression(_floor_1);\n- _builder.append(_compileExpression_1, \"\");\n- _builder.append(\")\");\n- String _closingBracket = op.getClosingBracket();\n- _builder.append(_closingBracket, \"\");\n- }\n- }\n- return _builder;\n- }\n- \n protected StringConcatenation _compileExpression(final Exponent op) {\n StringConcatenation _builder = new StringConcatenation();\n- _builder.append(\"(\");\n+ _builder.append(\"Math.pow((\");\n Expression _left = op.getLeft();\n StringConcatenation _compileExpression = this.compileExpression(_left);\n _builder.append(_compileExpression, \"\");\n- _builder.append(\") ^ (\");\n+ _builder.append(\"),(\");\n Expression _right = op.getRight();\n StringConcatenation _compileExpression_1 = this.compileExpression(_right);\n _builder.append(_compileExpression_1, \"\");\n+ _builder.append(\"))\");\n+ return _builder;\n+ }\n+ \n+ protected StringConcatenation _compileMatrixExpression(final MatrixVariable n) {\n+ StringConcatenation _builder = new StringConcatenation();\n+ String _name = n.getName();\n+ _builder.append(_name, \"\");\n+ return _builder;\n+ }\n+ \n+ protected StringConcatenation _compileMatrixExpression(final NewMatrix m) {\n+ StringConcatenation _builder = new StringConcatenation();\n+ _builder.append(\"new Matrix(new double[][]\");\n+ _builder.newLine();\n+ _builder.append(\"{\");\n+ _builder.newLine();\n+ int j = 0;\n+ _builder.newLineIfNotEmpty();\n+ {\n+ Matrix _matrix = m.getMatrix();\n+ EList<MatrixRow> _rows = _matrix.getRows();\n+ for(final MatrixRow row : _rows) {\n+ {\n+ boolean _operator_notEquals = ObjectExtensions.operator_notEquals(row, null);\n+ if (_operator_notEquals) {\n+ _builder.append(\"{\");\n+ _builder.newLine();\n+ _builder.append(\"\\t\");\n+ int i = 0;\n+ _builder.newLineIfNotEmpty();\n+ {\n+ EList<String> _elements = row.getElements();\n+ for(final String element : _elements) {\n+ {\n+ boolean _operator_notEquals_1 = ObjectExtensions.operator_notEquals(element, null);\n+ if (_operator_notEquals_1) {\n+ _builder.append(element, \"\");\n+ _builder.newLineIfNotEmpty();\n+ }\n+ }\n+ {\n+ int _operator_plus = IntegerExtensions.operator_plus(((Integer)i), ((Integer)1));\n+ int _i = i = _operator_plus;\n+ EList<String> _elements_1 = row.getElements();\n+ int _size = _elements_1.size();\n+ boolean _operator_notEquals_2 = ObjectExtensions.operator_notEquals(((Integer)_i), ((Integer)_size));\n+ if (_operator_notEquals_2) {\n+ _builder.append(\",\");\n+ }\n+ }\n+ _builder.newLineIfNotEmpty();\n+ }\n+ }\n+ _builder.append(\"}\");\n+ _builder.newLine();\n+ }\n+ }\n+ {\n+ int _operator_plus_1 = IntegerExtensions.operator_plus(((Integer)j), ((Integer)1));\n+ int _j = j = _operator_plus_1;\n+ Matrix _matrix_1 = m.getMatrix();\n+ EList<MatrixRow> _rows_1 = _matrix_1.getRows();\n+ int _size_1 = _rows_1.size();\n+ boolean _operator_notEquals_3 = ObjectExtensions.operator_notEquals(((Integer)_j), ((Integer)_size_1));\n+ if (_operator_notEquals_3) {\n+ _builder.append(\",\");\n+ }\n+ }\n+ _builder.newLineIfNotEmpty();\n+ }\n+ }\n+ _builder.append(\"})\");\n+ return _builder;\n+ }\n+ \n+ protected StringConcatenation _compileMatrixExpression(final TransposeMatrix n) {\n+ StringConcatenation _builder = new StringConcatenation();\n+ String _name = n.getName();\n+ _builder.append(_name, \"\");\n+ _builder.append(\".transpose()\");\n+ return _builder;\n+ }\n+ \n+ protected StringConcatenation _compileMatrixExpression(final MatrixAddition op) {\n+ StringConcatenation _builder = new StringConcatenation();\n+ MatrixExpression _left = op.getLeft();\n+ StringConcatenation _compileMatrixExpression = this.compileMatrixExpression(_left);\n+ _builder.append(_compileMatrixExpression, \"\");\n+ _builder.append(\".plus(\");\n+ MatrixExpression _right = op.getRight();\n+ StringConcatenation _compileMatrixExpression_1 = this.compileMatrixExpression(_right);\n+ _builder.append(_compileMatrixExpression_1, \"\");\n+ _builder.append(\")\");\n+ return _builder;\n+ }\n+ \n+ protected StringConcatenation _compileMatrixExpression(final MatrixSubtraction op) {\n+ StringConcatenation _builder = new StringConcatenation();\n+ MatrixExpression _left = op.getLeft();\n+ StringConcatenation _compileMatrixExpression = this.compileMatrixExpression(_left);\n+ _builder.append(_compileMatrixExpression, \"\");\n+ _builder.append(\".minus(\");\n+ MatrixExpression _right = op.getRight();\n+ StringConcatenation _compileMatrixExpression_1 = this.compileMatrixExpression(_right);\n+ _builder.append(_compileMatrixExpression_1, \"\");\n _builder.append(\")\");\n return _builder;\n }\n \n+ protected StringConcatenation _compileMatrixExpression(final MatrixMultiplication op) {\n+ StringConcatenation _builder = new StringConcatenation();\n+ {\n+ MatrixExpression _rightMatrix = op.getRightMatrix();\n+ boolean _operator_notEquals = ObjectExtensions.operator_notEquals(_rightMatrix, null);\n+ if (_operator_notEquals) {\n+ MatrixExpression _left = op.getLeft();\n+ StringConcatenation _compileMatrixExpression = this.compileMatrixExpression(_left);\n+ _builder.append(_compileMatrixExpression, \"\");\n+ _builder.append(\".times(\");\n+ MatrixExpression _rightMatrix_1 = op.getRightMatrix();\n+ StringConcatenation _compileMatrixExpression_1 = this.compileMatrixExpression(_rightMatrix_1);\n+ _builder.append(_compileMatrixExpression_1, \"\");\n+ _builder.append(\")\");\n+ }\n+ }\n+ _builder.newLineIfNotEmpty();\n+ {\n+ Formula _rightScalar = op.getRightScalar();\n+ boolean _operator_notEquals_1 = ObjectExtensions.operator_notEquals(_rightScalar, null);\n+ if (_operator_notEquals_1) {\n+ MatrixExpression _left_1 = op.getLeft();\n+ StringConcatenation _compileMatrixExpression_2 = this.compileMatrixExpression(_left_1);\n+ _builder.append(_compileMatrixExpression_2, \"\");\n+ _builder.append(\".times(\");\n+ Formula _rightScalar_1 = op.getRightScalar();\n+ StringConcatenation _compileFormula = this.compileFormula(_rightScalar_1);\n+ _builder.append(_compileFormula, \"\");\n+ _builder.append(\")\");\n+ }\n+ }\n+ return _builder;\n+ }\n+ \n public StringConcatenation compileExpression(final Expression op) {\n if ((op instanceof Addition)) {\n return _compileExpression((Addition)op);\n@@ -463,10 +557,10 @@ public StringConcatenation compileExpression(final Expression op) {\n return _compileExpression((Float)op);\n } else if ((op instanceof Function)) {\n return _compileExpression((Function)op);\n- } else if ((op instanceof Interval)) {\n- return _compileExpression((Interval)op);\n } else if ((op instanceof Invert)) {\n return _compileExpression((Invert)op);\n+ } else if ((op instanceof MatrixElement)) {\n+ return _compileExpression((MatrixElement)op);\n } else if ((op instanceof Modulo)) {\n return _compileExpression((Modulo)op);\n } else if ((op instanceof Multiplication)) {\n@@ -480,4 +574,23 @@ public StringConcatenation compileExpression(final Expression op) {\n java.util.Arrays.<Object>asList(op).toString());\n }\n }\n+ \n+ public StringConcatenation compileMatrixExpression(final MatrixExpression op) {\n+ if ((op instanceof MatrixAddition)) {\n+ return _compileMatrixExpression((MatrixAddition)op);\n+ } else if ((op instanceof MatrixMultiplication)) {\n+ return _compileMatrixExpression((MatrixMultiplication)op);\n+ } else if ((op instanceof MatrixSubtraction)) {\n+ return _compileMatrixExpression((MatrixSubtraction)op);\n+ } else if ((op instanceof MatrixVariable)) {\n+ return _compileMatrixExpression((MatrixVariable)op);\n+ } else if ((op instanceof NewMatrix)) {\n+ return _compileMatrixExpression((NewMatrix)op);\n+ } else if ((op instanceof TransposeMatrix)) {\n+ return _compileMatrixExpression((TransposeMatrix)op);\n+ } else {\n+ throw new IllegalArgumentException(\"Unhandled parameter types: \" +\n+ java.util.Arrays.<Object>asList(op).toString());\n+ }\n+ }\n }\n\\ No newline at end of file", "raw_url": "https://github.com/iee/iee/raw/0f04d91efdf50447d8e84e926ef98d7462103dc0/org.eclipse.iee.translator.Jmole%2Forg.eclipse.iee.translator.jmole.math%2Fxtend-gen%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fjmole%2Fmath%2Fgenerator%2FMathGenerator.java", "sha": "e77cb4a6813eff16177db86e7e0cf705838977ba", "status": "modified" }, { "additions": 71, "blob_url": "https://github.com/iee/iee/blob/0f04d91efdf50447d8e84e926ef98d7462103dc0/org.eclipse.iee.translator.TeXmole%2Forg.eclipse.iee.translator.molex.mex%2Fbin%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fmolex%2Fmex%2FMex.ecore", "changes": 91, "contents_url": "https://api.github.com/repos/iee/iee/contents/org.eclipse.iee.translator.TeXmole%2Forg.eclipse.iee.translator.molex.mex%2Fbin%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fmolex%2Fmex%2FMex.ecore?ref=0f04d91efdf50447d8e84e926ef98d7462103dc0", "deletions": 20, "filename": "org.eclipse.iee.translator.TeXmole/org.eclipse.iee.translator.molex.mex/bin/org/eclipse/iee/translator/molex/mex/Mex.ecore", "new_code": " <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"variableAssignment\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//VariableAssignment\"\n <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"matrixAssignment\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//MatrixAssignment\"\n containment=\"true\"/>\n <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"matrixFormula\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//MatrixFormula\"\n containment=\"true\"/>\n <eClassifiers xsi:type=\"ecore:EClass\" name=\"VariableAssignment\">\n <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"addition\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//Expression\"\n containment=\"true\"/>\n <eClassifiers xsi:type=\"ecore:EClass\" name=\"Matrix\">\n <eClassifiers xsi:type=\"ecore:EClass\" name=\"MatrixAssignment\">\n <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"variable\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString\"/>\n <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"value\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//MatrixFormula\"\n containment=\"true\"/>\n </eClassifiers>\n <eClassifiers xsi:type=\"ecore:EClass\" name=\"MatrixFormula\">\n <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"expression\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//MatrixExpression\"\n containment=\"true\"/>\n </eClassifiers>\n <eClassifiers xsi:type=\"ecore:EClass\" name=\"MatrixExpression\">\n <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"addition\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//MatrixExpression\"\n containment=\"true\"/>\n </eClassifiers>\n <eClassifiers xsi:type=\"ecore:EClass\" name=\"FunctionDefinition\">\n <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"function\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//Expression\"\n containment=\"true\"/>\n <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"formula\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//Formula\"\n containment=\"true\"/>\n </eClassifiers>\n <eClassifiers xsi:type=\"ecore:EClass\" name=\"MatrixElement\" eSuperTypes=\"platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//Expression\">\n <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"element\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString\"/>\n <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"row\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt\"/>\n <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"column\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt\"/>\n </eClassifiers>\n <eClassifiers xsi:type=\"ecore:EClass\" name=\"InBrackets\" eSuperTypes=\"platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//Expression\">\n <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"inBrackets\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//Expression\"\n containment=\"true\"/>\n </eClassifiers>\n <eClassifiers xsi:type=\"ecore:EClass\" name=\"MatrixAddition\" eSuperTypes=\"platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//MatrixExpression\">\n <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"left\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//MatrixExpression\"\n containment=\"true\"/>\n <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"right\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//MatrixExpression\"\n containment=\"true\"/>\n </eClassifiers>\n <eClassifiers xsi:type=\"ecore:EClass\" name=\"MatrixSubtraction\" eSuperTypes=\"platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//MatrixExpression\">\n <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"left\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//MatrixExpression\"\n containment=\"true\"/>\n <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"right\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//MatrixExpression\"\n containment=\"true\"/>\n </eClassifiers>\n <eClassifiers xsi:type=\"ecore:EClass\" name=\"MatrixMultiplication\" eSuperTypes=\"platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//MatrixExpression\">\n <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"left\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//MatrixExpression\"\n containment=\"true\"/>\n <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"rightMatrix\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//MatrixExpression\"\n containment=\"true\"/>\n <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"rightScalar\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//Formula\"\n containment=\"true\"/>\n </eClassifiers>\n <eClassifiers xsi:type=\"ecore:EClass\" name=\"NewMatrix\" eSuperTypes=\"platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//MatrixExpression\">\n <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"matrix\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//Matrix\"\n containment=\"true\"/>\n </eClassifiers>\n <eClassifiers xsi:type=\"ecore:EClass\" name=\"TransposeMatrix\" eSuperTypes=\"platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//MatrixExpression\">\n <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"name\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString\"/>\n </eClassifiers>\n <eClassifiers xsi:type=\"ecore:EClass\" name=\"MatrixVariable\" eSuperTypes=\"platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//MatrixExpression\">\n <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"name\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString\"/>\n </eClassifiers>\n <eClassifiers xsi:type=\"ecore:EClass\" name=\"MatrixInBrackets\" eSuperTypes=\"platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//MatrixExpression\">\n <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"inBrackets\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//MatrixExpression\"\n containment=\"true\"/>\n </eClassifiers>", "new_methods": [], "old_code": " <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"matrixDefinition\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//MatrixDefinition\"\n containment=\"true\"/>\n <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"assignment\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//Assignment\"\n <eClassifiers xsi:type=\"ecore:EClass\" name=\"Assignment\">\n <eClassifiers xsi:type=\"ecore:EClass\" name=\"FunctionDefinition\">\n <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"function\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//Expression\"\n containment=\"true\"/>\n <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"formula\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//Formula\"\n containment=\"true\"/>\n </eClassifiers>\n <eClassifiers xsi:type=\"ecore:EClass\" name=\"MatrixDefinition\">\n <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"name\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString\"/>\n <eClassifiers xsi:type=\"ecore:EClass\" name=\"Interval\" eSuperTypes=\"platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//Expression\">\n <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"openingBracket\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString\"/>\n <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"ceil\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//Expression\"\n containment=\"true\"/>\n <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"floor\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//Expression\"\n containment=\"true\"/>\n <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"closingBracket\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString\"/>\n </eClassifiers>", "old_methods": [], "patch": "@@ -6,14 +6,16 @@\n <eClassifiers xsi:type=\"ecore:EClass\" name=\"Statement\">\n <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"functionDefinition\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//FunctionDefinition\"\n containment=\"true\"/>\n- <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"matrixDefinition\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//MatrixDefinition\"\n- containment=\"true\"/>\n- <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"assignment\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//Assignment\"\n+ <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"variableAssignment\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//VariableAssignment\"\n containment=\"true\"/>\n <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"formula\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//Formula\"\n containment=\"true\"/>\n+ <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"matrixAssignment\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//MatrixAssignment\"\n+ containment=\"true\"/>\n+ <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"matrixFormula\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//MatrixFormula\"\n+ containment=\"true\"/>\n </eClassifiers>\n- <eClassifiers xsi:type=\"ecore:EClass\" name=\"Assignment\">\n+ <eClassifiers xsi:type=\"ecore:EClass\" name=\"VariableAssignment\">\n <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"variable\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString\"/>\n <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"value\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//Formula\"\n containment=\"true\"/>\n@@ -23,26 +25,40 @@\n containment=\"true\"/>\n </eClassifiers>\n <eClassifiers xsi:type=\"ecore:EClass\" name=\"Expression\">\n+ <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"addition\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//Expression\"\n+ containment=\"true\"/>\n <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"name\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString\"/>\n <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"parameters\" upperBound=\"-1\"\n eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//Formula\"\n containment=\"true\"/>\n </eClassifiers>\n- <eClassifiers xsi:type=\"ecore:EClass\" name=\"FunctionDefinition\">\n- <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"function\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//Expression\"\n- containment=\"true\"/>\n- <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"formula\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//Formula\"\n- containment=\"true\"/>\n- </eClassifiers>\n- <eClassifiers xsi:type=\"ecore:EClass\" name=\"MatrixDefinition\">\n- <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"name\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString\"/>\n+ <eClassifiers xsi:type=\"ecore:EClass\" name=\"Matrix\">\n <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"rows\" upperBound=\"-1\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//MatrixRow\"\n containment=\"true\"/>\n </eClassifiers>\n <eClassifiers xsi:type=\"ecore:EClass\" name=\"MatrixRow\">\n <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"elements\" unique=\"false\"\n upperBound=\"-1\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString\"/>\n </eClassifiers>\n+ <eClassifiers xsi:type=\"ecore:EClass\" name=\"MatrixAssignment\">\n+ <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"variable\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString\"/>\n+ <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"value\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//MatrixFormula\"\n+ containment=\"true\"/>\n+ </eClassifiers>\n+ <eClassifiers xsi:type=\"ecore:EClass\" name=\"MatrixFormula\">\n+ <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"expression\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//MatrixExpression\"\n+ containment=\"true\"/>\n+ </eClassifiers>\n+ <eClassifiers xsi:type=\"ecore:EClass\" name=\"MatrixExpression\">\n+ <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"addition\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//MatrixExpression\"\n+ containment=\"true\"/>\n+ </eClassifiers>\n+ <eClassifiers xsi:type=\"ecore:EClass\" name=\"FunctionDefinition\">\n+ <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"function\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//Expression\"\n+ containment=\"true\"/>\n+ <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"formula\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//Formula\"\n+ containment=\"true\"/>\n+ </eClassifiers>\n <eClassifiers xsi:type=\"ecore:EClass\" name=\"Addition\" eSuperTypes=\"platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//Expression\">\n <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"left\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//Expression\"\n containment=\"true\"/>\n@@ -81,14 +97,6 @@\n <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"expression\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//Expression\"\n containment=\"true\"/>\n </eClassifiers>\n- <eClassifiers xsi:type=\"ecore:EClass\" name=\"Interval\" eSuperTypes=\"platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//Expression\">\n- <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"openingBracket\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString\"/>\n- <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"ceil\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//Expression\"\n- containment=\"true\"/>\n- <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"floor\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//Expression\"\n- containment=\"true\"/>\n- <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"closingBracket\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString\"/>\n- </eClassifiers>\n <eClassifiers xsi:type=\"ecore:EClass\" name=\"Exponent\" eSuperTypes=\"platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//Expression\">\n <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"left\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//Expression\"\n containment=\"true\"/>\n@@ -103,4 +111,47 @@\n <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"function\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//Expression\"\n containment=\"true\"/>\n </eClassifiers>\n+ <eClassifiers xsi:type=\"ecore:EClass\" name=\"MatrixElement\" eSuperTypes=\"platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//Expression\">\n+ <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"element\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString\"/>\n+ <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"row\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt\"/>\n+ <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"column\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt\"/>\n+ </eClassifiers>\n+ <eClassifiers xsi:type=\"ecore:EClass\" name=\"InBrackets\" eSuperTypes=\"platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//Expression\">\n+ <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"inBrackets\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//Expression\"\n+ containment=\"true\"/>\n+ </eClassifiers>\n+ <eClassifiers xsi:type=\"ecore:EClass\" name=\"MatrixAddition\" eSuperTypes=\"platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//MatrixExpression\">\n+ <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"left\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//MatrixExpression\"\n+ containment=\"true\"/>\n+ <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"right\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//MatrixExpression\"\n+ containment=\"true\"/>\n+ </eClassifiers>\n+ <eClassifiers xsi:type=\"ecore:EClass\" name=\"MatrixSubtraction\" eSuperTypes=\"platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//MatrixExpression\">\n+ <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"left\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//MatrixExpression\"\n+ containment=\"true\"/>\n+ <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"right\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//MatrixExpression\"\n+ containment=\"true\"/>\n+ </eClassifiers>\n+ <eClassifiers xsi:type=\"ecore:EClass\" name=\"MatrixMultiplication\" eSuperTypes=\"platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//MatrixExpression\">\n+ <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"left\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//MatrixExpression\"\n+ containment=\"true\"/>\n+ <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"rightMatrix\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//MatrixExpression\"\n+ containment=\"true\"/>\n+ <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"rightScalar\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//Formula\"\n+ containment=\"true\"/>\n+ </eClassifiers>\n+ <eClassifiers xsi:type=\"ecore:EClass\" name=\"NewMatrix\" eSuperTypes=\"platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//MatrixExpression\">\n+ <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"matrix\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//Matrix\"\n+ containment=\"true\"/>\n+ </eClassifiers>\n+ <eClassifiers xsi:type=\"ecore:EClass\" name=\"TransposeMatrix\" eSuperTypes=\"platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//MatrixExpression\">\n+ <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"name\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString\"/>\n+ </eClassifiers>\n+ <eClassifiers xsi:type=\"ecore:EClass\" name=\"MatrixVariable\" eSuperTypes=\"platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//MatrixExpression\">\n+ <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"name\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString\"/>\n+ </eClassifiers>\n+ <eClassifiers xsi:type=\"ecore:EClass\" name=\"MatrixInBrackets\" eSuperTypes=\"platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//MatrixExpression\">\n+ <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"inBrackets\" eType=\"ecore:EClass platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//MatrixExpression\"\n+ containment=\"true\"/>\n+ </eClassifiers>\n </ecore:EPackage>", "raw_url": "https://github.com/iee/iee/raw/0f04d91efdf50447d8e84e926ef98d7462103dc0/org.eclipse.iee.translator.TeXmole%2Forg.eclipse.iee.translator.molex.mex%2Fbin%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fmolex%2Fmex%2FMex.ecore", "sha": "3711c7cad95460171e5f8ff35069c3617b50277e", "status": "modified" }, { "additions": 56, "blob_url": "https://github.com/iee/iee/blob/0f04d91efdf50447d8e84e926ef98d7462103dc0/org.eclipse.iee.translator.TeXmole%2Forg.eclipse.iee.translator.molex.mex%2Fbin%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fmolex%2Fmex%2FMex.genmodel", "changes": 74, "contents_url": "https://api.github.com/repos/iee/iee/contents/org.eclipse.iee.translator.TeXmole%2Forg.eclipse.iee.translator.molex.mex%2Fbin%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fmolex%2Fmex%2FMex.genmodel?ref=0f04d91efdf50447d8e84e926ef98d7462103dc0", "deletions": 18, "filename": "org.eclipse.iee.translator.TeXmole/org.eclipse.iee.translator.molex.mex/bin/org/eclipse/iee/translator/molex/mex/Mex.genmodel", "new_code": " <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//Statement/variableAssignment\"/>\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//Statement/matrixAssignment\"/>\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//Statement/matrixFormula\"/>\n <genClasses ecoreClass=\"platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//VariableAssignment\">\n <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//VariableAssignment/variable\"/>\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//VariableAssignment/value\"/>\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//Expression/addition\"/>\n <genClasses ecoreClass=\"platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//Matrix\">\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//Matrix/rows\"/>\n <genClasses ecoreClass=\"platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//MatrixAssignment\">\n <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//MatrixAssignment/variable\"/>\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//MatrixAssignment/value\"/>\n </genClasses>\n <genClasses ecoreClass=\"platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//MatrixFormula\">\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//MatrixFormula/expression\"/>\n </genClasses>\n <genClasses ecoreClass=\"platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//MatrixExpression\">\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//MatrixExpression/addition\"/>\n </genClasses>\n <genClasses ecoreClass=\"platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//FunctionDefinition\">\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//FunctionDefinition/function\"/>\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//FunctionDefinition/formula\"/>\n </genClasses>\n <genClasses ecoreClass=\"platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//MatrixElement\">\n <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//MatrixElement/element\"/>\n <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//MatrixElement/row\"/>\n <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//MatrixElement/column\"/>\n </genClasses>\n <genClasses ecoreClass=\"platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//InBrackets\">\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//InBrackets/inBrackets\"/>\n </genClasses>\n <genClasses ecoreClass=\"platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//MatrixAddition\">\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//MatrixAddition/left\"/>\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//MatrixAddition/right\"/>\n </genClasses>\n <genClasses ecoreClass=\"platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//MatrixSubtraction\">\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//MatrixSubtraction/left\"/>\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//MatrixSubtraction/right\"/>\n </genClasses>\n <genClasses ecoreClass=\"platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//MatrixMultiplication\">\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//MatrixMultiplication/left\"/>\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//MatrixMultiplication/rightMatrix\"/>\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//MatrixMultiplication/rightScalar\"/>\n </genClasses>\n <genClasses ecoreClass=\"platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//NewMatrix\">\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//NewMatrix/matrix\"/>\n </genClasses>\n <genClasses ecoreClass=\"platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//TransposeMatrix\">\n <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//TransposeMatrix/name\"/>\n </genClasses>\n <genClasses ecoreClass=\"platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//MatrixVariable\">\n <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//MatrixVariable/name\"/>\n </genClasses>\n <genClasses ecoreClass=\"platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//MatrixInBrackets\">\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//MatrixInBrackets/inBrackets\"/>\n </genClasses>", "new_methods": [], "old_code": " <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//Statement/matrixDefinition\"/>\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//Statement/assignment\"/>\n <genClasses ecoreClass=\"platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//Assignment\">\n <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//Assignment/variable\"/>\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//Assignment/value\"/>\n <genClasses ecoreClass=\"platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//FunctionDefinition\">\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//FunctionDefinition/function\"/>\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//FunctionDefinition/formula\"/>\n </genClasses>\n <genClasses ecoreClass=\"platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//MatrixDefinition\">\n <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//MatrixDefinition/name\"/>\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//MatrixDefinition/rows\"/>\n <genClasses ecoreClass=\"platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//Interval\">\n <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//Interval/openingBracket\"/>\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//Interval/ceil\"/>\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//Interval/floor\"/>\n <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//Interval/closingBracket\"/>\n </genClasses>", "old_methods": [], "patch": "@@ -11,32 +11,43 @@\n ecorePackage=\"platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#/\">\n <genClasses ecoreClass=\"platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//Statement\">\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//Statement/functionDefinition\"/>\n- <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//Statement/matrixDefinition\"/>\n- <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//Statement/assignment\"/>\n+ <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//Statement/variableAssignment\"/>\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//Statement/formula\"/>\n+ <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//Statement/matrixAssignment\"/>\n+ <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//Statement/matrixFormula\"/>\n </genClasses>\n- <genClasses ecoreClass=\"platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//Assignment\">\n- <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//Assignment/variable\"/>\n- <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//Assignment/value\"/>\n+ <genClasses ecoreClass=\"platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//VariableAssignment\">\n+ <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//VariableAssignment/variable\"/>\n+ <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//VariableAssignment/value\"/>\n </genClasses>\n <genClasses ecoreClass=\"platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//Formula\">\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//Formula/expression\"/>\n </genClasses>\n <genClasses ecoreClass=\"platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//Expression\">\n+ <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//Expression/addition\"/>\n <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//Expression/name\"/>\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//Expression/parameters\"/>\n </genClasses>\n- <genClasses ecoreClass=\"platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//FunctionDefinition\">\n- <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//FunctionDefinition/function\"/>\n- <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//FunctionDefinition/formula\"/>\n- </genClasses>\n- <genClasses ecoreClass=\"platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//MatrixDefinition\">\n- <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//MatrixDefinition/name\"/>\n- <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//MatrixDefinition/rows\"/>\n+ <genClasses ecoreClass=\"platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//Matrix\">\n+ <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//Matrix/rows\"/>\n </genClasses>\n <genClasses ecoreClass=\"platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//MatrixRow\">\n <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//MatrixRow/elements\"/>\n </genClasses>\n+ <genClasses ecoreClass=\"platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//MatrixAssignment\">\n+ <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//MatrixAssignment/variable\"/>\n+ <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//MatrixAssignment/value\"/>\n+ </genClasses>\n+ <genClasses ecoreClass=\"platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//MatrixFormula\">\n+ <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//MatrixFormula/expression\"/>\n+ </genClasses>\n+ <genClasses ecoreClass=\"platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//MatrixExpression\">\n+ <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//MatrixExpression/addition\"/>\n+ </genClasses>\n+ <genClasses ecoreClass=\"platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//FunctionDefinition\">\n+ <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//FunctionDefinition/function\"/>\n+ <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//FunctionDefinition/formula\"/>\n+ </genClasses>\n <genClasses ecoreClass=\"platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//Addition\">\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//Addition/left\"/>\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//Addition/right\"/>\n@@ -63,12 +74,6 @@\n <genClasses ecoreClass=\"platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//Factorial\">\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//Factorial/expression\"/>\n </genClasses>\n- <genClasses ecoreClass=\"platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//Interval\">\n- <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//Interval/openingBracket\"/>\n- <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//Interval/ceil\"/>\n- <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//Interval/floor\"/>\n- <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//Interval/closingBracket\"/>\n- </genClasses>\n <genClasses ecoreClass=\"platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//Exponent\">\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//Exponent/left\"/>\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//Exponent/right\"/>\n@@ -80,5 +85,38 @@\n <genClasses ecoreClass=\"platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//Function\">\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//Function/function\"/>\n </genClasses>\n+ <genClasses ecoreClass=\"platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//MatrixElement\">\n+ <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//MatrixElement/element\"/>\n+ <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//MatrixElement/row\"/>\n+ <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//MatrixElement/column\"/>\n+ </genClasses>\n+ <genClasses ecoreClass=\"platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//InBrackets\">\n+ <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//InBrackets/inBrackets\"/>\n+ </genClasses>\n+ <genClasses ecoreClass=\"platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//MatrixAddition\">\n+ <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//MatrixAddition/left\"/>\n+ <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//MatrixAddition/right\"/>\n+ </genClasses>\n+ <genClasses ecoreClass=\"platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//MatrixSubtraction\">\n+ <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//MatrixSubtraction/left\"/>\n+ <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//MatrixSubtraction/right\"/>\n+ </genClasses>\n+ <genClasses ecoreClass=\"platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//MatrixMultiplication\">\n+ <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//MatrixMultiplication/left\"/>\n+ <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//MatrixMultiplication/rightMatrix\"/>\n+ <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//MatrixMultiplication/rightScalar\"/>\n+ </genClasses>\n+ <genClasses ecoreClass=\"platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//NewMatrix\">\n+ <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//NewMatrix/matrix\"/>\n+ </genClasses>\n+ <genClasses ecoreClass=\"platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//TransposeMatrix\">\n+ <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//TransposeMatrix/name\"/>\n+ </genClasses>\n+ <genClasses ecoreClass=\"platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//MatrixVariable\">\n+ <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//MatrixVariable/name\"/>\n+ </genClasses>\n+ <genClasses ecoreClass=\"platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//MatrixInBrackets\">\n+ <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference platform:/resource/org.eclipse.iee.translator.molex.mex/src-gen/org/eclipse/iee/translator/molex/mex/Mex.ecore#//MatrixInBrackets/inBrackets\"/>\n+ </genClasses>\n </genPackages>\n </genmodel:GenModel>", "raw_url": "https://github.com/iee/iee/raw/0f04d91efdf50447d8e84e926ef98d7462103dc0/org.eclipse.iee.translator.TeXmole%2Forg.eclipse.iee.translator.molex.mex%2Fbin%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fmolex%2Fmex%2FMex.genmodel", "sha": "e7e32f3ac7ddad3abe1c73597d8453cf3968abe2", "status": "modified" }, { "additions": 266, "blob_url": "https://github.com/iee/iee/blob/0f04d91efdf50447d8e84e926ef98d7462103dc0/org.eclipse.iee.translator.TeXmole%2Forg.eclipse.iee.translator.molex.mex%2Fbin%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fmolex%2Fmex%2FMex.xmi", "changes": 369, "contents_url": "https://api.github.com/repos/iee/iee/contents/org.eclipse.iee.translator.TeXmole%2Forg.eclipse.iee.translator.molex.mex%2Fbin%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fmolex%2Fmex%2FMex.xmi?ref=0f04d91efdf50447d8e84e926ef98d7462103dc0", "deletions": 103, "filename": "org.eclipse.iee.translator.TeXmole/org.eclipse.iee.translator.molex.mex/bin/org/eclipse/iee/translator/molex/mex/Mex.xmi", "new_code": " <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.19\"/>\n <elements xsi:type=\"xtext:Assignment\" feature=\"variableAssignment\" operator=\"=\">\n <elements xsi:type=\"xtext:Assignment\" feature=\"matrixAssignment\" operator=\"=\">\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.11\"/>\n </elements>\n <elements xsi:type=\"xtext:Assignment\" feature=\"matrixFormula\" operator=\"=\">\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.12\"/>\n </elements>\n <rules xsi:type=\"xtext:ParserRule\" name=\"VariableAssignment\">\n <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/iee/translator/molex/mex/Mex#//VariableAssignment\"/>\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.20\"/>\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.4\"/>\n </alternatives>\n </rules>\n <rules xsi:type=\"xtext:ParserRule\" name=\"AdditionInBrackets\">\n <type metamodel=\"/0/@metamodelDeclarations.1\">\n <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/iee/translator/molex/mex/Mex#//Expression\"/>\n </type>\n <alternatives xsi:type=\"xtext:Group\">\n <elements xsi:type=\"xtext:Keyword\" value=\"(\"/>\n <elements xsi:type=\"xtext:Assignment\" feature=\"addition\" operator=\"=\">\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.4\"/>\n </elements>\n <elements xsi:type=\"xtext:Keyword\" value=\")\"/>\n <elements xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.5\"/>\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.5\"/>\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.5\"/>\n <elements xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.6\"/>\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.6\"/>\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.6\"/>\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.6\"/>\n <elements xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.7\"/>\n <elements xsi:type=\"xtext:Keyword\" value=\"(-\"/>\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.6\"/>\n <elements xsi:type=\"xtext:Keyword\" value=\")\"/>\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.6\"/>\n <elements xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.8\"/>\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.8\"/>\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.20\"/>\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.17\"/>\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.18\"/>\n </elements>\n </elements>\n <elements xsi:type=\"xtext:Group\">\n <elements xsi:type=\"xtext:Action\">\n <type metamodel=\"/0/@metamodelDeclarations.1\">\n <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/iee/translator/molex/mex/Mex#//MatrixElement\"/>\n </type>\n </elements>\n <elements xsi:type=\"xtext:Assignment\" feature=\"element\" operator=\"=\">\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.20\"/>\n </elements>\n <elements xsi:type=\"xtext:Keyword\" value=\"[\"/>\n <elements xsi:type=\"xtext:Assignment\" feature=\"row\" operator=\"=\">\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/1/@rules.1\"/>\n </elements>\n <elements xsi:type=\"xtext:Keyword\" value=\"]\"/>\n <elements xsi:type=\"xtext:Keyword\" value=\"[\"/>\n <elements xsi:type=\"xtext:Assignment\" feature=\"column\" operator=\"=\">\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/1/@rules.1\"/>\n </elements>\n <elements xsi:type=\"xtext:Keyword\" value=\"]\"/>\n </elements>\n <elements xsi:type=\"xtext:Group\">\n <elements xsi:type=\"xtext:Action\">\n <type metamodel=\"/0/@metamodelDeclarations.1\">\n <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/iee/translator/molex/mex/Mex#//InBrackets\"/>\n </type>\n </elements>\n <elements xsi:type=\"xtext:Assignment\" feature=\"inBrackets\" operator=\"=\">\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.3\"/>\n </elements>\n </elements>\n </alternatives>\n </rules>\n <rules xsi:type=\"xtext:ParserRule\" name=\"Matrix\">\n <type metamodel=\"/0/@metamodelDeclarations.1\">\n <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/iee/translator/molex/mex/Mex#//Matrix\"/>\n </type>\n <alternatives xsi:type=\"xtext:Group\">\n <elements xsi:type=\"xtext:Keyword\" value=\"{\"/>\n <elements xsi:type=\"xtext:Group\" cardinality=\"?\">\n <elements xsi:type=\"xtext:Assignment\" feature=\"rows\" operator=\"+=\">\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.10\"/>\n </elements>\n <elements xsi:type=\"xtext:Group\" cardinality=\"*\">\n <elements xsi:type=\"xtext:Keyword\" value=\",\"/>\n <elements xsi:type=\"xtext:Assignment\" feature=\"rows\" operator=\"+=\">\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.10\"/>\n </elements>\n </elements>\n <elements xsi:type=\"xtext:Keyword\" cardinality=\"?\" value=\",\"/>\n </elements>\n <elements xsi:type=\"xtext:Keyword\" value=\"}\"/>\n </alternatives>\n </rules>\n <rules xsi:type=\"xtext:ParserRule\" name=\"MatrixRow\">\n <type metamodel=\"/0/@metamodelDeclarations.1\">\n <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/iee/translator/molex/mex/Mex#//MatrixRow\"/>\n </type>\n <alternatives xsi:type=\"xtext:Group\">\n <elements xsi:type=\"xtext:Keyword\" value=\"{\"/>\n <elements xsi:type=\"xtext:Group\" cardinality=\"?\">\n <elements xsi:type=\"xtext:Assignment\" feature=\"elements\" operator=\"+=\">\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.17\"/>\n </elements>\n <elements xsi:type=\"xtext:Group\" cardinality=\"*\">\n <elements xsi:type=\"xtext:Keyword\" value=\",\"/>\n <elements xsi:type=\"xtext:Assignment\" feature=\"elements\" operator=\"+=\">\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.17\"/>\n </elements>\n </elements>\n <elements xsi:type=\"xtext:Keyword\" cardinality=\"?\" value=\",\"/>\n </elements>\n <elements xsi:type=\"xtext:Keyword\" value=\"}\"/>\n </alternatives>\n </rules>\n <rules xsi:type=\"xtext:ParserRule\" name=\"MatrixAssignment\">\n <type metamodel=\"/0/@metamodelDeclarations.1\">\n <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/iee/translator/molex/mex/Mex#//MatrixAssignment\"/>\n </type>\n <alternatives xsi:type=\"xtext:Group\">\n <elements xsi:type=\"xtext:Keyword\" value=\"[\"/>\n <elements xsi:type=\"xtext:Assignment\" feature=\"variable\" operator=\"=\">\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.20\"/>\n </elements>\n <elements xsi:type=\"xtext:Keyword\" value=\"]\"/>\n <elements xsi:type=\"xtext:Keyword\" value=\"=\"/>\n <elements xsi:type=\"xtext:Assignment\" feature=\"value\" operator=\"=\">\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.12\"/>\n </elements>\n </alternatives>\n </rules>\n <rules xsi:type=\"xtext:ParserRule\" name=\"MatrixFormula\">\n <type metamodel=\"/0/@metamodelDeclarations.1\">\n <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/iee/translator/molex/mex/Mex#//MatrixFormula\"/>\n </type>\n <alternatives xsi:type=\"xtext:Assignment\" feature=\"expression\" operator=\"=\">\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.14\"/>\n </alternatives>\n </rules>\n <rules xsi:type=\"xtext:ParserRule\" name=\"MatrixAdditionInBrackets\">\n <type metamodel=\"/0/@metamodelDeclarations.1\">\n <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/iee/translator/molex/mex/Mex#//MatrixExpression\"/>\n </type>\n <alternatives xsi:type=\"xtext:Group\">\n <elements xsi:type=\"xtext:Keyword\" value=\"(\"/>\n <elements xsi:type=\"xtext:Assignment\" feature=\"addition\" operator=\"=\">\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.14\"/>\n </elements>\n <elements xsi:type=\"xtext:Keyword\" value=\")\"/>\n </alternatives>\n </rules>\n <rules xsi:type=\"xtext:ParserRule\" name=\"MatrixAddition\">\n <type metamodel=\"/0/@metamodelDeclarations.1\">\n <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/iee/translator/molex/mex/Mex#//MatrixExpression\"/>\n </type>\n <alternatives xsi:type=\"xtext:Group\">\n <elements xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.15\"/>\n <elements xsi:type=\"xtext:Alternatives\" cardinality=\"*\">\n <elements xsi:type=\"xtext:Group\">\n <elements xsi:type=\"xtext:Keyword\" value=\"+\"/>\n <elements xsi:type=\"xtext:Action\" feature=\"left\" operator=\"=\">\n <type metamodel=\"/0/@metamodelDeclarations.1\">\n <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/iee/translator/molex/mex/Mex#//MatrixAddition\"/>\n </type>\n </elements>\n <elements xsi:type=\"xtext:Assignment\" feature=\"right\" operator=\"=\">\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.15\"/>\n </elements>\n </elements>\n <elements xsi:type=\"xtext:Group\">\n <elements xsi:type=\"xtext:Keyword\" value=\"-\"/>\n <elements xsi:type=\"xtext:Action\" feature=\"left\" operator=\"=\">\n <type metamodel=\"/0/@metamodelDeclarations.1\">\n <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/iee/translator/molex/mex/Mex#//MatrixSubtraction\"/>\n </type>\n </elements>\n <elements xsi:type=\"xtext:Assignment\" feature=\"right\" operator=\"=\">\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.15\"/>\n </elements>\n </elements>\n </elements>\n </alternatives>\n </rules>\n <rules xsi:type=\"xtext:ParserRule\" name=\"MatrixMultiplication\">\n <type metamodel=\"/0/@metamodelDeclarations.1\">\n <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/iee/translator/molex/mex/Mex#//MatrixExpression\"/>\n </type>\n <alternatives xsi:type=\"xtext:Group\">\n <elements xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.16\"/>\n <elements xsi:type=\"xtext:Alternatives\" cardinality=\"*\">\n <elements xsi:type=\"xtext:Group\">\n <elements xsi:type=\"xtext:Keyword\" value=\"*\"/>\n <elements xsi:type=\"xtext:Action\" feature=\"left\" operator=\"=\">\n <type metamodel=\"/0/@metamodelDeclarations.1\">\n <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/iee/translator/molex/mex/Mex#//MatrixMultiplication\"/>\n </type>\n </elements>\n <elements xsi:type=\"xtext:Assignment\" feature=\"rightMatrix\" operator=\"=\">\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.16\"/>\n </elements>\n </elements>\n <elements xsi:type=\"xtext:Group\">\n <elements xsi:type=\"xtext:Keyword\" value=\"*\"/>\n <elements xsi:type=\"xtext:Action\" feature=\"left\" operator=\"=\">\n <type metamodel=\"/0/@metamodelDeclarations.1\">\n <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/iee/translator/molex/mex/Mex#//MatrixMultiplication\"/>\n </type>\n </elements>\n <elements xsi:type=\"xtext:Assignment\" feature=\"rightScalar\" operator=\"=\">\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.2\"/>\n </elements>\n </elements>\n </elements>\n </alternatives>\n </rules>\n <rules xsi:type=\"xtext:ParserRule\" name=\"PrimaryMatrix\">\n <type metamodel=\"/0/@metamodelDeclarations.1\">\n <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/iee/translator/molex/mex/Mex#//MatrixExpression\"/>\n </type>\n <alternatives xsi:type=\"xtext:Alternatives\">\n <elements xsi:type=\"xtext:Group\">\n <elements xsi:type=\"xtext:Action\">\n <type metamodel=\"/0/@metamodelDeclarations.1\">\n <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/iee/translator/molex/mex/Mex#//NewMatrix\"/>\n </type>\n </elements>\n <elements xsi:type=\"xtext:Assignment\" feature=\"matrix\" operator=\"=\">\n <elements xsi:type=\"xtext:Group\">\n <elements xsi:type=\"xtext:Action\">\n <type metamodel=\"/0/@metamodelDeclarations.1\">\n <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/iee/translator/molex/mex/Mex#//TransposeMatrix\"/>\n </type>\n </elements>\n <elements xsi:type=\"xtext:Keyword\" value=\"[\"/>\n <elements xsi:type=\"xtext:Assignment\" feature=\"name\" operator=\"=\">\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.20\"/>\n </elements>\n <elements xsi:type=\"xtext:Keyword\" value=\"]^T\"/>\n </elements>\n <elements xsi:type=\"xtext:Group\">\n <elements xsi:type=\"xtext:Action\">\n <type metamodel=\"/0/@metamodelDeclarations.1\">\n <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/iee/translator/molex/mex/Mex#//MatrixVariable\"/>\n </type>\n </elements>\n <elements xsi:type=\"xtext:Keyword\" value=\"[\"/>\n <elements xsi:type=\"xtext:Assignment\" feature=\"name\" operator=\"=\">\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.20\"/>\n </elements>\n <elements xsi:type=\"xtext:Keyword\" value=\"]\"/>\n </elements>\n <elements xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.14\"/>\n <elements xsi:type=\"xtext:Group\">\n <elements xsi:type=\"xtext:Action\">\n <type metamodel=\"/0/@metamodelDeclarations.1\">\n <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/iee/translator/molex/mex/Mex#//MatrixInBrackets\"/>\n </type>\n </elements>\n <elements xsi:type=\"xtext:Assignment\" feature=\"inBrackets\" operator=\"=\">\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.13\"/>\n </elements>\n </elements>\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.20\"/>\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.18\"/>", "new_methods": [], "old_code": " <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.10\"/>\n <elements xsi:type=\"xtext:Assignment\" feature=\"matrixDefinition\" operator=\"=\">\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.11\"/>\n </elements>\n <elements xsi:type=\"xtext:Assignment\" feature=\"assignment\" operator=\"=\">\n <rules xsi:type=\"xtext:ParserRule\" name=\"Assignment\">\n <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/iee/translator/molex/mex/Mex#//Assignment\"/>\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.13\"/>\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.3\"/>\n <elements xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.4\"/>\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.4\"/>\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.4\"/>\n <elements xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.5\"/>\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.5\"/>\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.5\"/>\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.5\"/>\n <elements xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.6\"/>\n <elements xsi:type=\"xtext:Keyword\" value=\"-\"/>\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.5\"/>\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.5\"/>\n <elements xsi:type=\"xtext:Group\">\n <elements xsi:type=\"xtext:Action\">\n <type metamodel=\"/0/@metamodelDeclarations.1\">\n <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/iee/translator/molex/mex/Mex#//Interval\"/>\n </type>\n </elements>\n <elements xsi:type=\"xtext:Assignment\" feature=\"openingBracket\" operator=\"=\">\n <terminal xsi:type=\"xtext:Alternatives\">\n <elements xsi:type=\"xtext:Keyword\" value=\"[\"/>\n <elements xsi:type=\"xtext:Keyword\" value=\"(\"/>\n </terminal>\n </elements>\n <elements xsi:type=\"xtext:Keyword\" value=\"(\"/>\n <elements xsi:type=\"xtext:Assignment\" feature=\"ceil\" operator=\"=\">\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.5\"/>\n </elements>\n <elements xsi:type=\"xtext:Keyword\" value=\")\"/>\n <elements xsi:type=\"xtext:Keyword\" value=\"..\"/>\n <elements xsi:type=\"xtext:Keyword\" value=\"(\"/>\n <elements xsi:type=\"xtext:Assignment\" feature=\"floor\" operator=\"=\">\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.5\"/>\n </elements>\n <elements xsi:type=\"xtext:Keyword\" value=\")\"/>\n <elements xsi:type=\"xtext:Assignment\" feature=\"closingBracket\" operator=\"=\">\n <terminal xsi:type=\"xtext:Alternatives\">\n <elements xsi:type=\"xtext:Keyword\" value=\"]\"/>\n <elements xsi:type=\"xtext:Keyword\" value=\")\"/>\n </terminal>\n </elements>\n </elements>\n <elements xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.7\"/>\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.7\"/>\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.13\"/>\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.8\"/>\n <elements xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.3\"/>\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.13\"/>\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.9\"/>\n <rules xsi:type=\"xtext:ParserRule\" name=\"MatrixDefinition\">\n <type metamodel=\"/0/@metamodelDeclarations.1\">\n <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/iee/translator/molex/mex/Mex#//MatrixDefinition\"/>\n </type>\n <alternatives xsi:type=\"xtext:Group\">\n <elements xsi:type=\"xtext:Assignment\" feature=\"name\" operator=\"=\">\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.13\"/>\n </elements>\n <elements xsi:type=\"xtext:Keyword\" value=\"=\"/>\n <elements xsi:type=\"xtext:Keyword\" value=\"{\"/>\n <elements xsi:type=\"xtext:Group\" cardinality=\"?\">\n <elements xsi:type=\"xtext:Assignment\" feature=\"rows\" operator=\"+=\">\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.12\"/>\n </elements>\n <elements xsi:type=\"xtext:Group\" cardinality=\"*\">\n <elements xsi:type=\"xtext:Keyword\" value=\",\"/>\n <elements xsi:type=\"xtext:Assignment\" feature=\"rows\" operator=\"+=\">\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.12\"/>\n </elements>\n </elements>\n <elements xsi:type=\"xtext:Keyword\" cardinality=\"?\" value=\",\"/>\n </elements>\n <elements xsi:type=\"xtext:Keyword\" value=\"}\"/>\n </alternatives>\n </rules>\n <rules xsi:type=\"xtext:ParserRule\" name=\"MatrixRow\">\n <type metamodel=\"/0/@metamodelDeclarations.1\">\n <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/iee/translator/molex/mex/Mex#//MatrixRow\"/>\n </type>\n <alternatives xsi:type=\"xtext:Group\">\n <elements xsi:type=\"xtext:Keyword\" value=\"{\"/>\n <elements xsi:type=\"xtext:Group\" cardinality=\"?\">\n <elements xsi:type=\"xtext:Assignment\" feature=\"elements\" operator=\"+=\">\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.8\"/>\n </elements>\n <elements xsi:type=\"xtext:Group\" cardinality=\"*\">\n <elements xsi:type=\"xtext:Keyword\" value=\",\"/>\n <elements xsi:type=\"xtext:Assignment\" feature=\"elements\" operator=\"+=\">\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.8\"/>\n </elements>\n </elements>\n <elements xsi:type=\"xtext:Keyword\" cardinality=\"?\" value=\",\"/>\n </elements>\n <elements xsi:type=\"xtext:Keyword\" value=\"}\"/>\n </alternatives>\n </rules>", "old_methods": [], "patch": "@@ -13,26 +13,29 @@\n </type>\n <alternatives xsi:type=\"xtext:Alternatives\">\n <elements xsi:type=\"xtext:Assignment\" feature=\"functionDefinition\" operator=\"=\">\n- <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.10\"/>\n+ <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.19\"/>\n </elements>\n- <elements xsi:type=\"xtext:Assignment\" feature=\"matrixDefinition\" operator=\"=\">\n- <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.11\"/>\n- </elements>\n- <elements xsi:type=\"xtext:Assignment\" feature=\"assignment\" operator=\"=\">\n+ <elements xsi:type=\"xtext:Assignment\" feature=\"variableAssignment\" operator=\"=\">\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.1\"/>\n </elements>\n <elements xsi:type=\"xtext:Assignment\" feature=\"formula\" operator=\"=\">\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.2\"/>\n </elements>\n+ <elements xsi:type=\"xtext:Assignment\" feature=\"matrixAssignment\" operator=\"=\">\n+ <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.11\"/>\n+ </elements>\n+ <elements xsi:type=\"xtext:Assignment\" feature=\"matrixFormula\" operator=\"=\">\n+ <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.12\"/>\n+ </elements>\n </alternatives>\n </rules>\n- <rules xsi:type=\"xtext:ParserRule\" name=\"Assignment\">\n+ <rules xsi:type=\"xtext:ParserRule\" name=\"VariableAssignment\">\n <type metamodel=\"/0/@metamodelDeclarations.1\">\n- <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/iee/translator/molex/mex/Mex#//Assignment\"/>\n+ <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/iee/translator/molex/mex/Mex#//VariableAssignment\"/>\n </type>\n <alternatives xsi:type=\"xtext:Group\">\n <elements xsi:type=\"xtext:Assignment\" feature=\"variable\" operator=\"=\">\n- <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.13\"/>\n+ <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.20\"/>\n </elements>\n <elements xsi:type=\"xtext:Keyword\" value=\"=\"/>\n <elements xsi:type=\"xtext:Assignment\" feature=\"value\" operator=\"=\">\n@@ -45,15 +48,27 @@\n <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/iee/translator/molex/mex/Mex#//Formula\"/>\n </type>\n <alternatives xsi:type=\"xtext:Assignment\" feature=\"expression\" operator=\"=\">\n- <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.3\"/>\n+ <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.4\"/>\n+ </alternatives>\n+ </rules>\n+ <rules xsi:type=\"xtext:ParserRule\" name=\"AdditionInBrackets\">\n+ <type metamodel=\"/0/@metamodelDeclarations.1\">\n+ <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/iee/translator/molex/mex/Mex#//Expression\"/>\n+ </type>\n+ <alternatives xsi:type=\"xtext:Group\">\n+ <elements xsi:type=\"xtext:Keyword\" value=\"(\"/>\n+ <elements xsi:type=\"xtext:Assignment\" feature=\"addition\" operator=\"=\">\n+ <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.4\"/>\n+ </elements>\n+ <elements xsi:type=\"xtext:Keyword\" value=\")\"/>\n </alternatives>\n </rules>\n <rules xsi:type=\"xtext:ParserRule\" name=\"Addition\">\n <type metamodel=\"/0/@metamodelDeclarations.1\">\n <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/iee/translator/molex/mex/Mex#//Expression\"/>\n </type>\n <alternatives xsi:type=\"xtext:Group\">\n- <elements xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.4\"/>\n+ <elements xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.5\"/>\n <elements xsi:type=\"xtext:Alternatives\" cardinality=\"*\">\n <elements xsi:type=\"xtext:Group\">\n <elements xsi:type=\"xtext:Keyword\" value=\"+\"/>\n@@ -63,7 +78,7 @@\n </type>\n </elements>\n <elements xsi:type=\"xtext:Assignment\" feature=\"right\" operator=\"=\">\n- <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.4\"/>\n+ <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.5\"/>\n </elements>\n </elements>\n <elements xsi:type=\"xtext:Group\">\n@@ -74,7 +89,7 @@\n </type>\n </elements>\n <elements xsi:type=\"xtext:Assignment\" feature=\"right\" operator=\"=\">\n- <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.4\"/>\n+ <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.5\"/>\n </elements>\n </elements>\n </elements>\n@@ -85,7 +100,7 @@\n <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/iee/translator/molex/mex/Mex#//Expression\"/>\n </type>\n <alternatives xsi:type=\"xtext:Group\">\n- <elements xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.5\"/>\n+ <elements xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.6\"/>\n <elements xsi:type=\"xtext:Alternatives\" cardinality=\"*\">\n <elements xsi:type=\"xtext:Group\">\n <elements xsi:type=\"xtext:Keyword\" value=\"*\"/>\n@@ -95,7 +110,7 @@\n </type>\n </elements>\n <elements xsi:type=\"xtext:Assignment\" feature=\"right\" operator=\"=\">\n- <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.5\"/>\n+ <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.6\"/>\n </elements>\n </elements>\n <elements xsi:type=\"xtext:Group\">\n@@ -106,7 +121,7 @@\n </type>\n </elements>\n <elements xsi:type=\"xtext:Assignment\" feature=\"right\" operator=\"=\">\n- <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.5\"/>\n+ <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.6\"/>\n </elements>\n </elements>\n <elements xsi:type=\"xtext:Group\">\n@@ -117,7 +132,7 @@\n </type>\n </elements>\n <elements xsi:type=\"xtext:Assignment\" feature=\"right\" operator=\"=\">\n- <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.5\"/>\n+ <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.6\"/>\n </elements>\n </elements>\n </elements>\n@@ -128,17 +143,18 @@\n <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/iee/translator/molex/mex/Mex#//Expression\"/>\n </type>\n <alternatives xsi:type=\"xtext:Alternatives\">\n- <elements xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.6\"/>\n+ <elements xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.7\"/>\n <elements xsi:type=\"xtext:Group\">\n- <elements xsi:type=\"xtext:Keyword\" value=\"-\"/>\n+ <elements xsi:type=\"xtext:Keyword\" value=\"(-\"/>\n <elements xsi:type=\"xtext:Action\">\n <type metamodel=\"/0/@metamodelDeclarations.1\">\n <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/iee/translator/molex/mex/Mex#//Invert\"/>\n </type>\n </elements>\n <elements xsi:type=\"xtext:Assignment\" feature=\"expression\" operator=\"=\">\n- <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.5\"/>\n+ <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.6\"/>\n </elements>\n+ <elements xsi:type=\"xtext:Keyword\" value=\")\"/>\n </elements>\n <elements xsi:type=\"xtext:Group\">\n <elements xsi:type=\"xtext:Keyword\" value=\"(\"/>\n@@ -148,48 +164,18 @@\n </type>\n </elements>\n <elements xsi:type=\"xtext:Assignment\" feature=\"expression\" operator=\"=\">\n- <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.5\"/>\n+ <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.6\"/>\n </elements>\n <elements xsi:type=\"xtext:Keyword\" value=\")!\"/>\n </elements>\n- <elements xsi:type=\"xtext:Group\">\n- <elements xsi:type=\"xtext:Action\">\n- <type metamodel=\"/0/@metamodelDeclarations.1\">\n- <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/iee/translator/molex/mex/Mex#//Interval\"/>\n- </type>\n- </elements>\n- <elements xsi:type=\"xtext:Assignment\" feature=\"openingBracket\" operator=\"=\">\n- <terminal xsi:type=\"xtext:Alternatives\">\n- <elements xsi:type=\"xtext:Keyword\" value=\"[\"/>\n- <elements xsi:type=\"xtext:Keyword\" value=\"(\"/>\n- </terminal>\n- </elements>\n- <elements xsi:type=\"xtext:Keyword\" value=\"(\"/>\n- <elements xsi:type=\"xtext:Assignment\" feature=\"ceil\" operator=\"=\">\n- <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.5\"/>\n- </elements>\n- <elements xsi:type=\"xtext:Keyword\" value=\")\"/>\n- <elements xsi:type=\"xtext:Keyword\" value=\"..\"/>\n- <elements xsi:type=\"xtext:Keyword\" value=\"(\"/>\n- <elements xsi:type=\"xtext:Assignment\" feature=\"floor\" operator=\"=\">\n- <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.5\"/>\n- </elements>\n- <elements xsi:type=\"xtext:Keyword\" value=\")\"/>\n- <elements xsi:type=\"xtext:Assignment\" feature=\"closingBracket\" operator=\"=\">\n- <terminal xsi:type=\"xtext:Alternatives\">\n- <elements xsi:type=\"xtext:Keyword\" value=\"]\"/>\n- <elements xsi:type=\"xtext:Keyword\" value=\")\"/>\n- </terminal>\n- </elements>\n- </elements>\n </alternatives>\n </rules>\n <rules xsi:type=\"xtext:ParserRule\" name=\"Exponent\">\n <type metamodel=\"/0/@metamodelDeclarations.1\">\n <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/iee/translator/molex/mex/Mex#//Expression\"/>\n </type>\n <alternatives xsi:type=\"xtext:Group\">\n- <elements xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.7\"/>\n+ <elements xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.8\"/>\n <elements xsi:type=\"xtext:Group\" cardinality=\"?\">\n <elements xsi:type=\"xtext:Action\" feature=\"left\" operator=\"=\">\n <type metamodel=\"/0/@metamodelDeclarations.1\">\n@@ -198,7 +184,7 @@\n </elements>\n <elements xsi:type=\"xtext:Keyword\" value=\"^\"/>\n <elements xsi:type=\"xtext:Assignment\" feature=\"right\" operator=\"=\">\n- <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.7\"/>\n+ <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.8\"/>\n </elements>\n </elements>\n </alternatives>\n@@ -215,7 +201,7 @@\n </type>\n </elements>\n <elements xsi:type=\"xtext:Assignment\" feature=\"name\" operator=\"=\">\n- <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.13\"/>\n+ <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.20\"/>\n </elements>\n </elements>\n <elements xsi:type=\"xtext:Group\">\n@@ -225,7 +211,7 @@\n </type>\n </elements>\n <elements xsi:type=\"xtext:Assignment\" feature=\"value\" operator=\"=\">\n- <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.8\"/>\n+ <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.17\"/>\n </elements>\n </elements>\n <elements xsi:type=\"xtext:Group\">\n@@ -235,14 +221,237 @@\n </type>\n </elements>\n <elements xsi:type=\"xtext:Assignment\" feature=\"function\" operator=\"=\">\n+ <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.18\"/>\n+ </elements>\n+ </elements>\n+ <elements xsi:type=\"xtext:Group\">\n+ <elements xsi:type=\"xtext:Action\">\n+ <type metamodel=\"/0/@metamodelDeclarations.1\">\n+ <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/iee/translator/molex/mex/Mex#//MatrixElement\"/>\n+ </type>\n+ </elements>\n+ <elements xsi:type=\"xtext:Assignment\" feature=\"element\" operator=\"=\">\n+ <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.20\"/>\n+ </elements>\n+ <elements xsi:type=\"xtext:Keyword\" value=\"[\"/>\n+ <elements xsi:type=\"xtext:Assignment\" feature=\"row\" operator=\"=\">\n+ <terminal xsi:type=\"xtext:RuleCall\" rule=\"/1/@rules.1\"/>\n+ </elements>\n+ <elements xsi:type=\"xtext:Keyword\" value=\"]\"/>\n+ <elements xsi:type=\"xtext:Keyword\" value=\"[\"/>\n+ <elements xsi:type=\"xtext:Assignment\" feature=\"column\" operator=\"=\">\n+ <terminal xsi:type=\"xtext:RuleCall\" rule=\"/1/@rules.1\"/>\n+ </elements>\n+ <elements xsi:type=\"xtext:Keyword\" value=\"]\"/>\n+ </elements>\n+ <elements xsi:type=\"xtext:Group\">\n+ <elements xsi:type=\"xtext:Action\">\n+ <type metamodel=\"/0/@metamodelDeclarations.1\">\n+ <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/iee/translator/molex/mex/Mex#//InBrackets\"/>\n+ </type>\n+ </elements>\n+ <elements xsi:type=\"xtext:Assignment\" feature=\"inBrackets\" operator=\"=\">\n+ <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.3\"/>\n+ </elements>\n+ </elements>\n+ </alternatives>\n+ </rules>\n+ <rules xsi:type=\"xtext:ParserRule\" name=\"Matrix\">\n+ <type metamodel=\"/0/@metamodelDeclarations.1\">\n+ <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/iee/translator/molex/mex/Mex#//Matrix\"/>\n+ </type>\n+ <alternatives xsi:type=\"xtext:Group\">\n+ <elements xsi:type=\"xtext:Keyword\" value=\"{\"/>\n+ <elements xsi:type=\"xtext:Group\" cardinality=\"?\">\n+ <elements xsi:type=\"xtext:Assignment\" feature=\"rows\" operator=\"+=\">\n+ <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.10\"/>\n+ </elements>\n+ <elements xsi:type=\"xtext:Group\" cardinality=\"*\">\n+ <elements xsi:type=\"xtext:Keyword\" value=\",\"/>\n+ <elements xsi:type=\"xtext:Assignment\" feature=\"rows\" operator=\"+=\">\n+ <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.10\"/>\n+ </elements>\n+ </elements>\n+ <elements xsi:type=\"xtext:Keyword\" cardinality=\"?\" value=\",\"/>\n+ </elements>\n+ <elements xsi:type=\"xtext:Keyword\" value=\"}\"/>\n+ </alternatives>\n+ </rules>\n+ <rules xsi:type=\"xtext:ParserRule\" name=\"MatrixRow\">\n+ <type metamodel=\"/0/@metamodelDeclarations.1\">\n+ <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/iee/translator/molex/mex/Mex#//MatrixRow\"/>\n+ </type>\n+ <alternatives xsi:type=\"xtext:Group\">\n+ <elements xsi:type=\"xtext:Keyword\" value=\"{\"/>\n+ <elements xsi:type=\"xtext:Group\" cardinality=\"?\">\n+ <elements xsi:type=\"xtext:Assignment\" feature=\"elements\" operator=\"+=\">\n+ <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.17\"/>\n+ </elements>\n+ <elements xsi:type=\"xtext:Group\" cardinality=\"*\">\n+ <elements xsi:type=\"xtext:Keyword\" value=\",\"/>\n+ <elements xsi:type=\"xtext:Assignment\" feature=\"elements\" operator=\"+=\">\n+ <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.17\"/>\n+ </elements>\n+ </elements>\n+ <elements xsi:type=\"xtext:Keyword\" cardinality=\"?\" value=\",\"/>\n+ </elements>\n+ <elements xsi:type=\"xtext:Keyword\" value=\"}\"/>\n+ </alternatives>\n+ </rules>\n+ <rules xsi:type=\"xtext:ParserRule\" name=\"MatrixAssignment\">\n+ <type metamodel=\"/0/@metamodelDeclarations.1\">\n+ <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/iee/translator/molex/mex/Mex#//MatrixAssignment\"/>\n+ </type>\n+ <alternatives xsi:type=\"xtext:Group\">\n+ <elements xsi:type=\"xtext:Keyword\" value=\"[\"/>\n+ <elements xsi:type=\"xtext:Assignment\" feature=\"variable\" operator=\"=\">\n+ <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.20\"/>\n+ </elements>\n+ <elements xsi:type=\"xtext:Keyword\" value=\"]\"/>\n+ <elements xsi:type=\"xtext:Keyword\" value=\"=\"/>\n+ <elements xsi:type=\"xtext:Assignment\" feature=\"value\" operator=\"=\">\n+ <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.12\"/>\n+ </elements>\n+ </alternatives>\n+ </rules>\n+ <rules xsi:type=\"xtext:ParserRule\" name=\"MatrixFormula\">\n+ <type metamodel=\"/0/@metamodelDeclarations.1\">\n+ <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/iee/translator/molex/mex/Mex#//MatrixFormula\"/>\n+ </type>\n+ <alternatives xsi:type=\"xtext:Assignment\" feature=\"expression\" operator=\"=\">\n+ <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.14\"/>\n+ </alternatives>\n+ </rules>\n+ <rules xsi:type=\"xtext:ParserRule\" name=\"MatrixAdditionInBrackets\">\n+ <type metamodel=\"/0/@metamodelDeclarations.1\">\n+ <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/iee/translator/molex/mex/Mex#//MatrixExpression\"/>\n+ </type>\n+ <alternatives xsi:type=\"xtext:Group\">\n+ <elements xsi:type=\"xtext:Keyword\" value=\"(\"/>\n+ <elements xsi:type=\"xtext:Assignment\" feature=\"addition\" operator=\"=\">\n+ <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.14\"/>\n+ </elements>\n+ <elements xsi:type=\"xtext:Keyword\" value=\")\"/>\n+ </alternatives>\n+ </rules>\n+ <rules xsi:type=\"xtext:ParserRule\" name=\"MatrixAddition\">\n+ <type metamodel=\"/0/@metamodelDeclarations.1\">\n+ <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/iee/translator/molex/mex/Mex#//MatrixExpression\"/>\n+ </type>\n+ <alternatives xsi:type=\"xtext:Group\">\n+ <elements xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.15\"/>\n+ <elements xsi:type=\"xtext:Alternatives\" cardinality=\"*\">\n+ <elements xsi:type=\"xtext:Group\">\n+ <elements xsi:type=\"xtext:Keyword\" value=\"+\"/>\n+ <elements xsi:type=\"xtext:Action\" feature=\"left\" operator=\"=\">\n+ <type metamodel=\"/0/@metamodelDeclarations.1\">\n+ <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/iee/translator/molex/mex/Mex#//MatrixAddition\"/>\n+ </type>\n+ </elements>\n+ <elements xsi:type=\"xtext:Assignment\" feature=\"right\" operator=\"=\">\n+ <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.15\"/>\n+ </elements>\n+ </elements>\n+ <elements xsi:type=\"xtext:Group\">\n+ <elements xsi:type=\"xtext:Keyword\" value=\"-\"/>\n+ <elements xsi:type=\"xtext:Action\" feature=\"left\" operator=\"=\">\n+ <type metamodel=\"/0/@metamodelDeclarations.1\">\n+ <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/iee/translator/molex/mex/Mex#//MatrixSubtraction\"/>\n+ </type>\n+ </elements>\n+ <elements xsi:type=\"xtext:Assignment\" feature=\"right\" operator=\"=\">\n+ <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.15\"/>\n+ </elements>\n+ </elements>\n+ </elements>\n+ </alternatives>\n+ </rules>\n+ <rules xsi:type=\"xtext:ParserRule\" name=\"MatrixMultiplication\">\n+ <type metamodel=\"/0/@metamodelDeclarations.1\">\n+ <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/iee/translator/molex/mex/Mex#//MatrixExpression\"/>\n+ </type>\n+ <alternatives xsi:type=\"xtext:Group\">\n+ <elements xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.16\"/>\n+ <elements xsi:type=\"xtext:Alternatives\" cardinality=\"*\">\n+ <elements xsi:type=\"xtext:Group\">\n+ <elements xsi:type=\"xtext:Keyword\" value=\"*\"/>\n+ <elements xsi:type=\"xtext:Action\" feature=\"left\" operator=\"=\">\n+ <type metamodel=\"/0/@metamodelDeclarations.1\">\n+ <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/iee/translator/molex/mex/Mex#//MatrixMultiplication\"/>\n+ </type>\n+ </elements>\n+ <elements xsi:type=\"xtext:Assignment\" feature=\"rightMatrix\" operator=\"=\">\n+ <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.16\"/>\n+ </elements>\n+ </elements>\n+ <elements xsi:type=\"xtext:Group\">\n+ <elements xsi:type=\"xtext:Keyword\" value=\"*\"/>\n+ <elements xsi:type=\"xtext:Action\" feature=\"left\" operator=\"=\">\n+ <type metamodel=\"/0/@metamodelDeclarations.1\">\n+ <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/iee/translator/molex/mex/Mex#//MatrixMultiplication\"/>\n+ </type>\n+ </elements>\n+ <elements xsi:type=\"xtext:Assignment\" feature=\"rightScalar\" operator=\"=\">\n+ <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.2\"/>\n+ </elements>\n+ </elements>\n+ </elements>\n+ </alternatives>\n+ </rules>\n+ <rules xsi:type=\"xtext:ParserRule\" name=\"PrimaryMatrix\">\n+ <type metamodel=\"/0/@metamodelDeclarations.1\">\n+ <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/iee/translator/molex/mex/Mex#//MatrixExpression\"/>\n+ </type>\n+ <alternatives xsi:type=\"xtext:Alternatives\">\n+ <elements xsi:type=\"xtext:Group\">\n+ <elements xsi:type=\"xtext:Action\">\n+ <type metamodel=\"/0/@metamodelDeclarations.1\">\n+ <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/iee/translator/molex/mex/Mex#//NewMatrix\"/>\n+ </type>\n+ </elements>\n+ <elements xsi:type=\"xtext:Assignment\" feature=\"matrix\" operator=\"=\">\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.9\"/>\n </elements>\n </elements>\n+ <elements xsi:type=\"xtext:Group\">\n+ <elements xsi:type=\"xtext:Action\">\n+ <type metamodel=\"/0/@metamodelDeclarations.1\">\n+ <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/iee/translator/molex/mex/Mex#//TransposeMatrix\"/>\n+ </type>\n+ </elements>\n+ <elements xsi:type=\"xtext:Keyword\" value=\"[\"/>\n+ <elements xsi:type=\"xtext:Assignment\" feature=\"name\" operator=\"=\">\n+ <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.20\"/>\n+ </elements>\n+ <elements xsi:type=\"xtext:Keyword\" value=\"]^T\"/>\n+ </elements>\n+ <elements xsi:type=\"xtext:Group\">\n+ <elements xsi:type=\"xtext:Action\">\n+ <type metamodel=\"/0/@metamodelDeclarations.1\">\n+ <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/iee/translator/molex/mex/Mex#//MatrixVariable\"/>\n+ </type>\n+ </elements>\n+ <elements xsi:type=\"xtext:Keyword\" value=\"[\"/>\n+ <elements xsi:type=\"xtext:Assignment\" feature=\"name\" operator=\"=\">\n+ <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.20\"/>\n+ </elements>\n+ <elements xsi:type=\"xtext:Keyword\" value=\"]\"/>\n+ </elements>\n <elements xsi:type=\"xtext:Group\">\n <elements xsi:type=\"xtext:Keyword\" value=\"(\"/>\n- <elements xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.3\"/>\n+ <elements xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.14\"/>\n <elements xsi:type=\"xtext:Keyword\" value=\")\"/>\n </elements>\n+ <elements xsi:type=\"xtext:Group\">\n+ <elements xsi:type=\"xtext:Action\">\n+ <type metamodel=\"/0/@metamodelDeclarations.1\">\n+ <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/iee/translator/molex/mex/Mex#//MatrixInBrackets\"/>\n+ </type>\n+ </elements>\n+ <elements xsi:type=\"xtext:Assignment\" feature=\"inBrackets\" operator=\"=\">\n+ <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.13\"/>\n+ </elements>\n+ </elements>\n </alternatives>\n </rules>\n <rules xsi:type=\"xtext:ParserRule\" name=\"Float\">\n@@ -271,7 +480,7 @@\n </type>\n <alternatives xsi:type=\"xtext:Group\">\n <elements xsi:type=\"xtext:Assignment\" feature=\"name\" operator=\"=\">\n- <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.13\"/>\n+ <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.20\"/>\n </elements>\n <elements xsi:type=\"xtext:Keyword\" value=\"(\"/>\n <elements xsi:type=\"xtext:Group\" cardinality=\"?\">\n@@ -295,60 +504,14 @@\n </type>\n <alternatives xsi:type=\"xtext:Group\">\n <elements xsi:type=\"xtext:Assignment\" feature=\"function\" operator=\"=\">\n- <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.9\"/>\n+ <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.18\"/>\n </elements>\n <elements xsi:type=\"xtext:Keyword\" value=\"=\"/>\n <elements xsi:type=\"xtext:Assignment\" feature=\"formula\" operator=\"=\">\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.2\"/>\n </elements>\n </alternatives>\n </rules>\n- <rules xsi:type=\"xtext:ParserRule\" name=\"MatrixDefinition\">\n- <type metamodel=\"/0/@metamodelDeclarations.1\">\n- <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/iee/translator/molex/mex/Mex#//MatrixDefinition\"/>\n- </type>\n- <alternatives xsi:type=\"xtext:Group\">\n- <elements xsi:type=\"xtext:Assignment\" feature=\"name\" operator=\"=\">\n- <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.13\"/>\n- </elements>\n- <elements xsi:type=\"xtext:Keyword\" value=\"=\"/>\n- <elements xsi:type=\"xtext:Keyword\" value=\"{\"/>\n- <elements xsi:type=\"xtext:Group\" cardinality=\"?\">\n- <elements xsi:type=\"xtext:Assignment\" feature=\"rows\" operator=\"+=\">\n- <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.12\"/>\n- </elements>\n- <elements xsi:type=\"xtext:Group\" cardinality=\"*\">\n- <elements xsi:type=\"xtext:Keyword\" value=\",\"/>\n- <elements xsi:type=\"xtext:Assignment\" feature=\"rows\" operator=\"+=\">\n- <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.12\"/>\n- </elements>\n- </elements>\n- <elements xsi:type=\"xtext:Keyword\" cardinality=\"?\" value=\",\"/>\n- </elements>\n- <elements xsi:type=\"xtext:Keyword\" value=\"}\"/>\n- </alternatives>\n- </rules>\n- <rules xsi:type=\"xtext:ParserRule\" name=\"MatrixRow\">\n- <type metamodel=\"/0/@metamodelDeclarations.1\">\n- <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/iee/translator/molex/mex/Mex#//MatrixRow\"/>\n- </type>\n- <alternatives xsi:type=\"xtext:Group\">\n- <elements xsi:type=\"xtext:Keyword\" value=\"{\"/>\n- <elements xsi:type=\"xtext:Group\" cardinality=\"?\">\n- <elements xsi:type=\"xtext:Assignment\" feature=\"elements\" operator=\"+=\">\n- <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.8\"/>\n- </elements>\n- <elements xsi:type=\"xtext:Group\" cardinality=\"*\">\n- <elements xsi:type=\"xtext:Keyword\" value=\",\"/>\n- <elements xsi:type=\"xtext:Assignment\" feature=\"elements\" operator=\"+=\">\n- <terminal xsi:type=\"xtext:RuleCall\" rule=\"/0/@rules.8\"/>\n- </elements>\n- </elements>\n- <elements xsi:type=\"xtext:Keyword\" cardinality=\"?\" value=\",\"/>\n- </elements>\n- <elements xsi:type=\"xtext:Keyword\" value=\"}\"/>\n- </alternatives>\n- </rules>\n <rules xsi:type=\"xtext:TerminalRule\" name=\"MATH_NAME\">\n <type metamodel=\"/0/@metamodelDeclarations.0\">\n <classifier xsi:type=\"ecore:EDataType\" href=\"http://www.eclipse.org/emf/2002/Ecore#//EString\"/>", "raw_url": "https://github.com/iee/iee/raw/0f04d91efdf50447d8e84e926ef98d7462103dc0/org.eclipse.iee.translator.TeXmole%2Forg.eclipse.iee.translator.molex.mex%2Fbin%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fmolex%2Fmex%2FMex.xmi", "sha": "f64d40be02be8ac836eb013d75282630c9775db1", "status": "modified" }, { "additions": 48, "blob_url": "https://github.com/iee/iee/blob/0f04d91efdf50447d8e84e926ef98d7462103dc0/org.eclipse.iee.translator.TeXmole%2Forg.eclipse.iee.translator.molex.mex%2Fbin%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fmolex%2Fmex%2FMex.xtext", "changes": 66, "contents_url": "https://api.github.com/repos/iee/iee/contents/org.eclipse.iee.translator.TeXmole%2Forg.eclipse.iee.translator.molex.mex%2Fbin%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fmolex%2Fmex%2FMex.xtext?ref=0f04d91efdf50447d8e84e926ef98d7462103dc0", "deletions": 18, "filename": "org.eclipse.iee.translator.TeXmole/org.eclipse.iee.translator.molex.mex/bin/org/eclipse/iee/translator/molex/mex/Mex.xtext", "new_code": "\tvariableAssignment=VariableAssignment |\n\tformula=Formula |\n\tmatrixAssignment=MatrixAssignment |\n\tmatrixFormula=MatrixFormula;\nVariableAssignment:\nAdditionInBrackets returns Expression:\n\t'(' addition=Addition ')'\n;\n\t'(-' {Invert} expression=UnaryExpression')' |\n\t'(' {Factorial} expression=UnaryExpression ')!';\n\t\n\t{MatrixElement} element=MATH_NAME '[' row=INT ']' '[' column=INT ']' | \n\t{InBrackets} inBrackets=AdditionInBrackets;\n\nMatrix:\n\t'{' (rows+=MatrixRow (',' rows+=MatrixRow)* ','?)? '}';\n\t\nMatrixRow:\n\t'{' (elements+=Float (',' elements+=Float)* ','?)? '}';\n\nMatrixAssignment:\n\t'[' variable=MATH_NAME ']' '=' value=MatrixFormula;\n\nMatrixFormula:\n\texpression=MatrixAddition;\n\nMatrixAdditionInBrackets returns MatrixExpression:\n\t'(' addition=MatrixAddition ')'\n;\n\nMatrixAddition returns MatrixExpression:\n\tMatrixMultiplication ('+' {MatrixAddition.left=current} right=MatrixMultiplication | '-' {MatrixSubtraction.left=current}\n\tright=MatrixMultiplication)*;\n\t\nMatrixMultiplication returns MatrixExpression:\n\tPrimaryMatrix ('*' {MatrixMultiplication.left=current} rightMatrix=PrimaryMatrix |\n\t\t\t\t '*' {MatrixMultiplication.left=current} rightScalar=Formula\n\t)*;\n\t\nPrimaryMatrix returns MatrixExpression:\n\t{NewMatrix} matrix=Matrix |\n\t{TransposeMatrix} '[' name=MATH_NAME ']^T'|\n\t{MatrixVariable} '[' name=MATH_NAME ']' |\n\t'(' MatrixAddition ')' |\n\t{MatrixInBrackets} inBrackets=MatrixAdditionInBrackets;\n\tname=MATH_NAME '(' (parameters+=Formula (',' parameters+=Formula)* ','?)? ')';\n\t\n\t('a'..'z' | 'A'..'Z' | '_') ('a'..'z' | 'A'..'Z' | '_' | '0'..'9')*;", "new_methods": [], "old_code": "\tmatrixDefinition=MatrixDefinition |\n\tassignment=Assignment |\n\tformula=Formula;\nAssignment:\n\t('-' {Invert} expression=UnaryExpression) |\n\t'(' {Factorial} expression=UnaryExpression ')!'|\n\t{Interval} openingBracket=('['|'(') '('ceil=UnaryExpression')' '..' '('floor=UnaryExpression')' closingBracket=(']'|')');\n\n\t'(' Addition ')';\n\t(name=MATH_NAME) '(' (parameters+=Formula (',' parameters+=Formula)* ','?)? ')';\n\nMatrixDefinition:\n\t(name=MATH_NAME) '=' '{' (rows+=MatrixRow (',' rows+=MatrixRow)* ','?)? '}';\n\nMatrixRow:\n\t'{' (elements+=Float (',' elements+=Float)* ','?)? '}';\n\n\t('a'..'z' | 'A'..'Z' | '_') ('a'..'z' | 'A'..'Z' | '_' | '0'..'9')*;", "old_methods": [], "patch": "@@ -5,16 +5,20 @@ generate mex \"http://www.eclipse.org/iee/translator/molex/mex/Mex\"\n \n Statement:\n \tfunctionDefinition=FunctionDefinition |\n-\tmatrixDefinition=MatrixDefinition |\n-\tassignment=Assignment |\n-\tformula=Formula;\n+\tvariableAssignment=VariableAssignment |\n+\tformula=Formula |\n+\tmatrixAssignment=MatrixAssignment |\n+\tmatrixFormula=MatrixFormula;\n \n-Assignment:\n+VariableAssignment:\n \tvariable=MATH_NAME '=' value=Formula;\n \n Formula:\n \texpression=(Addition);\n \n+AdditionInBrackets returns Expression:\n+\t'(' addition=Addition ')'\n+;\n \t// addition/subtraction: left associative, priority 0\n Addition returns Expression:\n \tMultiplication ('+' {Addition.left=current} right=Multiplication | '-' {Subtraction.left=current}\n@@ -28,10 +32,9 @@ Multiplication returns Expression:\n \t// Unary operators: right associative, priority 2\n UnaryExpression returns Expression:\n \tExponent |\n-\t('-' {Invert} expression=UnaryExpression) |\n-\t'(' {Factorial} expression=UnaryExpression ')!'|\n-\t{Interval} openingBracket=('['|'(') '('ceil=UnaryExpression')' '..' '('floor=UnaryExpression')' closingBracket=(']'|')');\n-\n+\t'(-' {Invert} expression=UnaryExpression')' |\n+\t'(' {Factorial} expression=UnaryExpression ')!';\n+\t\n \t// exponentiation: right associative, priority 3\n Exponent returns Expression:\n \tPrimary ({Exponent.left=current} '^' right=Primary)?;\n@@ -40,22 +43,49 @@ Primary returns Expression:\n \t{Variable} name=MATH_NAME |\n \t{Float} value=Float |\n \t{Function} function=Function |\n-\t'(' Addition ')';\n+\t{MatrixElement} element=MATH_NAME '[' row=INT ']' '[' column=INT ']' | \n+\t{InBrackets} inBrackets=AdditionInBrackets;\n+\n+Matrix:\n+\t'{' (rows+=MatrixRow (',' rows+=MatrixRow)* ','?)? '}';\n+\t\n+MatrixRow:\n+\t'{' (elements+=Float (',' elements+=Float)* ','?)? '}';\n+\n+MatrixAssignment:\n+\t'[' variable=MATH_NAME ']' '=' value=MatrixFormula;\n+\n+MatrixFormula:\n+\texpression=MatrixAddition;\n+\n+MatrixAdditionInBrackets returns MatrixExpression:\n+\t'(' addition=MatrixAddition ')'\n+;\n+\n+MatrixAddition returns MatrixExpression:\n+\tMatrixMultiplication ('+' {MatrixAddition.left=current} right=MatrixMultiplication | '-' {MatrixSubtraction.left=current}\n+\tright=MatrixMultiplication)*;\n+\t\n+MatrixMultiplication returns MatrixExpression:\n+\tPrimaryMatrix ('*' {MatrixMultiplication.left=current} rightMatrix=PrimaryMatrix |\n+\t\t\t\t '*' {MatrixMultiplication.left=current} rightScalar=Formula\n+\t)*;\n+\t\n+PrimaryMatrix returns MatrixExpression:\n+\t{NewMatrix} matrix=Matrix |\n+\t{TransposeMatrix} '[' name=MATH_NAME ']^T'|\n+\t{MatrixVariable} '[' name=MATH_NAME ']' |\n+\t'(' MatrixAddition ')' |\n+\t{MatrixInBrackets} inBrackets=MatrixAdditionInBrackets;\n \n Float:\n \tINT+ ('.' INT+ (('E' | 'e') ('-')? (INT)+)?)?;\n \n Function returns Expression:\n-\t(name=MATH_NAME) '(' (parameters+=Formula (',' parameters+=Formula)* ','?)? ')';\n+\tname=MATH_NAME '(' (parameters+=Formula (',' parameters+=Formula)* ','?)? ')';\n \n FunctionDefinition:\n \tfunction=Function '=' formula=Formula;\n-\n-MatrixDefinition:\n-\t(name=MATH_NAME) '=' '{' (rows+=MatrixRow (',' rows+=MatrixRow)* ','?)? '}';\n-\n-MatrixRow:\n-\t'{' (elements+=Float (',' elements+=Float)* ','?)? '}';\n-\n+\t\n terminal MATH_NAME returns ecore::EString:\n-\t('a'..'z' | 'A'..'Z' | '_') ('a'..'z' | 'A'..'Z' | '_' | '0'..'9')*;\n+\t('a'..'z' | 'A'..'Z' | '_') ('a'..'z' | 'A'..'Z' | '_' | '0'..'9')*;\n\\ No newline at end of file", "raw_url": "https://github.com/iee/iee/raw/0f04d91efdf50447d8e84e926ef98d7462103dc0/org.eclipse.iee.translator.TeXmole%2Forg.eclipse.iee.translator.molex.mex%2Fbin%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fmolex%2Fmex%2FMex.xtext", "sha": "b3bd748d17b20d16d5fbcc39cfb3605b41621bb7", "status": "modified" }, { "additions": 166, "blob_url": "https://github.com/iee/iee/blob/0f04d91efdf50447d8e84e926ef98d7462103dc0/org.eclipse.iee.translator.TeXmole%2Forg.eclipse.iee.translator.molex.mex%2Fbin%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fmolex%2Fmex%2Fgenerator%2FMexGenerator.xtend", "changes": 199, "contents_url": "https://api.github.com/repos/iee/iee/contents/org.eclipse.iee.translator.TeXmole%2Forg.eclipse.iee.translator.molex.mex%2Fbin%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fmolex%2Fmex%2Fgenerator%2FMexGenerator.xtend?ref=0f04d91efdf50447d8e84e926ef98d7462103dc0", "deletions": 33, "filename": "org.eclipse.iee.translator.TeXmole/org.eclipse.iee.translator.molex.mex/bin/org/eclipse/iee/translator/molex/mex/generator/MexGenerator.xtend", "new_code": "\t\t�IF s.variableAssignment != null��compileVariableAssignment(s.variableAssignment)��ENDIF�\n\t\t�IF s.matrixAssignment != null��compileMatrixAssignment(s.matrixAssignment)��ENDIF�\n\t\t�IF s.matrixFormula != null��compileMatrixFormula(s.matrixFormula)��ENDIF�\n\t\t�IF funcDef.function.name == \"alpha\" || funcDef.function.name == \"beta\" || funcDef.function.name == \"gamma\" ||\n\t\t funcDef.function.name == \"delta\" || funcDef.function.name == \"epsilon\" || funcDef.function.name == \"varepsilon\" ||\n\t\t funcDef.function.name == \"zeta\" || funcDef.function.name == \"eta\" || funcDef.function.name == \"theta\" ||\n\t\t funcDef.function.name == \"vartheta\" || funcDef.function.name == \"gamma\" || funcDef.function.name == \"kappa\" ||\n\t\t\tfuncDef.function.name == \"lambda\" || funcDef.function.name == \"mu\" || funcDef.function.name == \"nu\" || \n\t\t\tfuncDef.function.name == \"xi\" || funcDef.function.name == \"pi\" || funcDef.function.name == \"varpi\" || \n\t\t\tfuncDef.function.name == \"rho\" || funcDef.function.name == \"varrho\" || funcDef.function.name == \"sigma\" ||\n\t\t\tfuncDef.function.name == \"varsigma\" || funcDef.function.name == \"tau\" || funcDef.function.name == \"upsilon\" ||\n\t\t\tfuncDef.function.name == \"phi\" || funcDef.function.name == \"varphi\" || funcDef.function.name == \"chi\" || \n\t\t\tfuncDef.function.name == \"psi\" || funcDef.function.name == \"omega\" || funcDef.function.name == \"Gamma\" ||\n\t\t\tfuncDef.function.name == \"Delta\" || funcDef.function.name == \"Theta\" || funcDef.function.name == \"Lambda\" ||\n\t\t\tfuncDef.function.name == \"Xi\" || funcDef.function.name == \"Pi\" || funcDef.function.name == \"Sigma\" || \n\t\t\tfuncDef.function.name == \"Upsilon\" || funcDef.function.name == \"Phi\" || funcDef.function.name == \"Psi\" || \n\t\t\tfuncDef.function.name == \"Omega\"�\n\t\t\t\\\n\t\t�ENDIF�\n\tdef compileVariableAssignment(VariableAssignment a)\n\t \t�IF a.variable == \"alpha\" || a.variable == \"beta\" || a.variable == \"gamma\" ||\n\t\t a.variable == \"delta\" || a.variable == \"epsilon\" || a.variable == \"varepsilon\" ||\n\t\t a.variable == \"zeta\" || a.variable == \"eta\" || a.variable == \"theta\" ||\n\t\t a.variable == \"vartheta\" || a.variable == \"gamma\" || a.variable == \"kappa\" ||\n\t\t\ta.variable == \"lambda\" || a.variable == \"mu\" || a.variable == \"nu\" || \n\t\t\ta.variable == \"xi\" || a.variable == \"pi\" || a.variable == \"varpi\" || \n\t\t\ta.variable == \"rho\" || a.variable == \"varrho\" || a.variable == \"sigma\" ||\n\t\t\ta.variable == \"varsigma\" || a.variable == \"tau\" || a.variable == \"upsilon\" ||\n\t\t\ta.variable == \"phi\" || a.variable == \"varphi\" || a.variable == \"chi\" || \n\t\t\ta.variable == \"psi\" || a.variable == \"omega\" || a.variable == \"Gamma\" ||\n\t\t\ta.variable == \"Delta\" || a.variable == \"Theta\" || a.variable == \"Lambda\" ||\n\t\t\ta.variable == \"Xi\" || a.variable == \"Pi\" || a.variable == \"Sigma\" || \n\t\t\ta.variable == \"Upsilon\" || a.variable == \"Phi\" || a.variable == \"Psi\" || \n\t\t\ta.variable == \"Omega\"�\n\t\t\t\\\n\t\t�ENDIF�\n\tdef compileMatrixFormula(MatrixFormula f) \n\t\t�compileMatrixExpression(f.expression)�\n\tdef compileMatrixAssignment(MatrixAssignment a)\n\t{\n\t '''\n\t \t�IF a.variable == \"alpha\" || a.variable == \"beta\" || a.variable == \"gamma\" ||\n\t\t a.variable == \"delta\" || a.variable == \"epsilon\" || a.variable == \"varepsilon\" ||\n\t\t a.variable == \"zeta\" || a.variable == \"eta\" || a.variable == \"theta\" ||\n\t\t a.variable == \"vartheta\" || a.variable == \"gamma\" || a.variable == \"kappa\" ||\n\t\t\ta.variable == \"lambda\" || a.variable == \"mu\" || a.variable == \"nu\" || \n\t\t\ta.variable == \"xi\" || a.variable == \"pi\" || a.variable == \"varpi\" || \n\t\t\ta.variable == \"rho\" || a.variable == \"varrho\" || a.variable == \"sigma\" ||\n\t\t\ta.variable == \"varsigma\" || a.variable == \"tau\" || a.variable == \"upsilon\" ||\n\t\t\ta.variable == \"phi\" || a.variable == \"varphi\" || a.variable == \"chi\" || \n\t\t\ta.variable == \"psi\" || a.variable == \"omega\" || a.variable == \"Gamma\" ||\n\t\t\ta.variable == \"Delta\" || a.variable == \"Theta\" || a.variable == \"Lambda\" ||\n\t\t\ta.variable == \"Xi\" || a.variable == \"Pi\" || a.variable == \"Sigma\" || \n\t\t\ta.variable == \"Upsilon\" || a.variable == \"Phi\" || a.variable == \"Psi\" || \n\t\t\ta.variable == \"Omega\"�\n\t\t\t\\\n\t\t�ENDIF�\n\t \t�a.variable� = �compileMatrixFormula(a.value)�\n\t '''\n\t}\n\t\n\t\t�IF f.function.name == \"alpha\" || f.function.name == \"beta\" || f.function.name == \"gamma\" ||\n\t\t f.function.name == \"delta\" || f.function.name == \"epsilon\" || f.function.name == \"varepsilon\" ||\n\t\t f.function.name == \"zeta\" || f.function.name == \"eta\" || f.function.name == \"theta\" ||\n\t\t f.function.name == \"vartheta\" || f.function.name == \"gamma\" || f.function.name == \"kappa\" ||\n\t\t\tf.function.name == \"lambda\" || f.function.name == \"mu\" || f.function.name == \"nu\" || \n\t\t\tf.function.name == \"xi\" || f.function.name == \"pi\" || f.function.name == \"varpi\" || \n\t\t\tf.function.name == \"rho\" || f.function.name == \"varrho\" || f.function.name == \"sigma\" ||\n\t\t\tf.function.name == \"varsigma\" || f.function.name == \"tau\" || f.function.name == \"upsilon\" ||\n\t\t\tf.function.name == \"phi\" || f.function.name == \"varphi\" || f.function.name == \"chi\" || \n\t\t\tf.function.name == \"psi\" || f.function.name == \"omega\" || f.function.name == \"Gamma\" ||\n\t\t\tf.function.name == \"Delta\" || f.function.name == \"Theta\" || f.function.name == \"Lambda\" ||\n\t\t\tf.function.name == \"Xi\" || f.function.name == \"Pi\" || f.function.name == \"Sigma\" || \n\t\t\tf.function.name == \"Upsilon\" || f.function.name == \"Phi\" || f.function.name == \"Psi\" || \n\t\t\tf.function.name == \"Omega\"�\n\t\t\t\\\n\t\t�ENDIF�\n\t\t\\\\�f.function.name�\n\t\n\t//Expression\n\t\t\n\t\t�IF n.name == \"alpha\" || n.name == \"beta\" || n.name == \"gamma\" ||\n\t\t n.name == \"delta\" || n.name == \"epsilon\" || n.name == \"varepsilon\" ||\n\t\t n.name == \"zeta\" || n.name == \"eta\" || n.name == \"theta\" ||\n\t\t n.name == \"vartheta\" || n.name == \"gamma\" || n.name == \"kappa\" ||\n\t\t\tn.name == \"lambda\" || n.name == \"mu\" || n.name == \"nu\" || \n\t\t\tn.name == \"xi\" || n.name == \"pi\" || n.name == \"varpi\" || \n\t\t\tn.name == \"rho\" || n.name == \"varrho\" || n.name == \"sigma\" ||\n\t\t\tn.name == \"varsigma\" || n.name == \"tau\" || n.name == \"upsilon\" ||\n\t\t\tn.name == \"phi\" || n.name == \"varphi\" || n.name == \"chi\" || \n\t\t\tn.name == \"psi\" || n.name == \"omega\" || n.name == \"Gamma\" ||\n\t\t\tn.name == \"Delta\" || n.name == \"Theta\" || n.name == \"Lambda\" ||\n\t\t\tn.name == \"Xi\" || n.name == \"Pi\" || n.name == \"Sigma\" || \n\t\t\tn.name == \"Upsilon\" || n.name == \"Phi\" || n.name == \"Psi\" || \n\t\t\tn.name == \"Omega\"�\n\t\t\t\\\n\t\t�ENDIF�\n\tdef dispatch compileExpression(MatrixElement e) '''\n\t\t�IF e.element == \"alpha\" || e.element == \"beta\" || e.element == \"gamma\" ||\n\t\t e.element == \"delta\" || e.element == \"epsilon\" || e.element == \"varepsilon\" ||\n\t\t e.element == \"zeta\" || e.element == \"eta\" || e.element == \"theta\" ||\n\t\t e.element == \"vartheta\" || e.element == \"gamma\" || e.element == \"kappa\" ||\n\t\t\te.element == \"lambda\" || e.element == \"mu\" || e.element == \"nu\" || \n\t\t\te.element == \"xi\" || e.element == \"pi\" || e.element == \"varpi\" || \n\t\t\te.element == \"rho\" || e.element == \"varrho\" || e.element == \"sigma\" ||\n\t\t\te.element == \"varsigma\" || e.element == \"tau\" || e.element == \"upsilon\" ||\n\t\t\te.element == \"phi\" || e.element == \"varphi\" || e.element == \"chi\" || \n\t\t\te.element == \"psi\" || e.element == \"omega\" || e.element == \"Gamma\" ||\n\t\t\te.element == \"Delta\" || e.element == \"Theta\" || e.element == \"Lambda\" ||\n\t\t\te.element == \"Xi\" || e.element == \"Pi\" || e.element == \"Sigma\" || \n\t\t\te.element == \"Upsilon\" || e.element == \"Phi\" || e.element == \"Psi\" || \n\t\t\te.element == \"Omega\"�\n\t\t\t\\\n\t\t�ENDIF�\n\t\t�e.element�_{�e.row�,�e.column�}'''\n\t\t\n\tdef dispatch compileExpression(InBrackets op) '''\n\t\t(�compileExpression(op.inBrackets.addition)�)'''\n\t\n\t\t\\frac{�compileExpression(op.left)�}{�compileExpression(op.right)�}'''\n\t�IF op.expression != null� (-�compileExpression(op.expression)�) �ENDIF�''' \n\t\t\n\t\n\t//Matrix Expressions\n\tdef dispatch compileMatrixExpression(MatrixVariable n) '''\n\t\t�n.name�'''\t\n\t\n\tdef dispatch compileMatrixExpression(NewMatrix m) '''\n\t\t$$\\left(\\begin{array}{\n\t\t�FOR row:m.matrix.rows�\n\t\t\tc\n\t\t�ENDFOR�\t\n\t\t}\n\t\t�var j = 0�\n\t\t�FOR row:m.matrix.rows�\n\t\t �IF row != null�\n\t\t \t�var i = 0�\n\t \t\t�FOR element:row.elements�\n\t\t\t �IF element != null�\n\t\t\t \t�element�\n\t\t\t �ENDIF�\n\t\t\t �IF (i = i + 1) != row.elements.size()�&�ENDIF�\n\t\t\t�ENDFOR�\n\t\t �ENDIF�\n\t\t �IF (j = j + 1) != m.matrix.rows.size()�\\\\�ENDIF�\n\t\t�ENDFOR�\n\t\t\\end{array}\\right)$$\n\t\t'''\t\n\t\t\n\tdef dispatch compileMatrixExpression(TransposeMatrix n) '''\n\t\t�n.name�^T'''\t\n\t\t\n\tdef dispatch compileMatrixExpression(MatrixInBrackets op) '''\n\t\t(�compileMatrixExpression(op.inBrackets.addition)�)'''\t\n\t\t\n\tdef dispatch compileMatrixExpression(MatrixAddition op) '''\n\t\t�compileMatrixExpression(op.left)�+�compileMatrixExpression(op.right)�'''\n\t\n\tdef dispatch compileMatrixExpression(MatrixSubtraction op) '''\n\t\t�compileMatrixExpression(op.left)�-�compileMatrixExpression(op.right)�'''\n\t\n\tdef dispatch compileMatrixExpression(MatrixMultiplication op) '''\n\t\t�IF op.rightMatrix != null��compileMatrixExpression(op.left)�*�compileMatrixExpression(op.rightMatrix)��ENDIF�\n\t\t�IF op.rightScalar != null��compileMatrixExpression(op.left)�*�compileFormula(op.rightScalar)��ENDIF�'''\n\t\t\n\t", "new_methods": [ { "arguments": [ "MatrixAssignment a" ], "filename": "org.eclipse.iee.translator.TeXmole/org.eclipse.iee.translator.molex.mex/bin/org/eclipse/iee/translator/molex/mex/generator/MexGenerator.xtend", "implementation": "'''\n\t \t�IF a.variable == \"alpha\" || a.variable == \"beta\" || a.variable == \"gamma\" ||\n\t\t a.variable == \"delta\" || a.variable == \"epsilon\" || a.variable == \"varepsilon\" ||\n\t\t a.variable == \"zeta\" || a.variable == \"eta\" || a.variable == \"theta\" ||\n\t\t a.variable == \"vartheta\" || a.variable == \"gamma\" || a.variable == \"kappa\" ||\n\t\t\ta.variable == \"lambda\" || a.variable == \"mu\" || a.variable == \"nu\" || \n\t\t\ta.variable == \"xi\" || a.variable == \"pi\" || a.variable == \"varpi\" || \n\t\t\ta.variable == \"rho\" || a.variable == \"varrho\" || a.variable == \"sigma\" ||\n\t\t\ta.variable == \"varsigma\" || a.variable == \"tau\" || a.variable == \"upsilon\" ||\n\t\t\ta.variable == \"phi\" || a.variable == \"varphi\" || a.variable == \"chi\" || \n\t\t\ta.variable == \"psi\" || a.variable == \"omega\" || a.variable == \"Gamma\" ||\n\t\t\ta.variable == \"Delta\" || a.variable == \"Theta\" || a.variable == \"Lambda\" ||\n\t\t\ta.variable == \"Xi\" || a.variable == \"Pi\" || a.variable == \"Sigma\" || \n\t\t\ta.variable == \"Upsilon\" || a.variable == \"Phi\" || a.variable == \"Psi\" || \n\t\t\ta.variable == \"Omega\"�\n\t\t\t\\\n\t\t�ENDIF�\n\t \t�a.variable� = �compileMatrixFormula(a.value)�\n\t '''", "signature": "def compileMatrixAssignment(MatrixAssignment a)" } ], "old_code": "\t\t�IF s.matrixDefinition != null��compileMatrixDefinition(s.matrixDefinition)��ENDIF�\n\t\t�IF s.assignment != null��compileAssignment(s.assignment)��ENDIF�\n\t\t\n\tdef compileAssignment(Assignment a)\n\tdef compileMatrixDefinition(MatrixDefinition m) \n\t\t�m.name�=\n\t\t$$\\left(\\begin{array}{\n\t\t�FOR row:m.rows�\n\t\t\tc\n\t\t�ENDFOR�\t\n\t\t}\n\t\t�var j = 0�\n\t\t�FOR row:m.rows�\n\t\t �IF row != null�\n\t\t \t�var i = 0�\n\t \t\t�FOR element:row.elements�\n\t\t\t �IF element != null�\n\t\t\t \t�element�\n\t\t\t �ENDIF�\n\t\t\t �IF (i = i + 1) != row.elements.size()�&�ENDIF�\n\t\t\t�ENDFOR�\n\t\t �ENDIF�\n\t\t �IF (j = j + 1) != m.rows.size()�\\\\�ENDIF�\n\t\t�ENDFOR�\n\t\t\\end{array}\\right)$$\n\t\t\\\\�f.function.name.toLowerCase()�\n\t\t\t\n\t\t\\\\frac{�compileExpression(op.left)�}{�compileExpression(op.right)�}'''\n\t�IF op.expression != null� (-(�compileExpression(op.expression)�)) �ENDIF�''' \n\t\n\tdef dispatch compileExpression(Interval op) '''\n\t�IF op.ceil != null && op.floor != null��op.openingBracket�(�compileExpression(op.ceil)�)..(�compileExpression(op.floor)�)�op.closingBracket��ENDIF�''' \n\t", "old_methods": [], "patch": "@@ -33,16 +33,32 @@ class MexGenerator implements IGenerator {\n \t{\n \t'''\n \t\t�IF s.functionDefinition != null��compileFunctionDefinition(s.functionDefinition)��ENDIF�\n-\t\t�IF s.matrixDefinition != null��compileMatrixDefinition(s.matrixDefinition)��ENDIF�\n-\t\t�IF s.assignment != null��compileAssignment(s.assignment)��ENDIF�\n \t\t�IF s.formula != null��compileFormula(s.formula)��ENDIF�\n-\t\t\n+\t\t�IF s.variableAssignment != null��compileVariableAssignment(s.variableAssignment)��ENDIF�\n+\t\t�IF s.matrixAssignment != null��compileMatrixAssignment(s.matrixAssignment)��ENDIF�\n+\t\t�IF s.matrixFormula != null��compileMatrixFormula(s.matrixFormula)��ENDIF�\n \t'''\n \t}\n \t\n \tdef compileFunctionDefinition(FunctionDefinition funcDef)\n \t{\n \t'''\n+\t\t�IF funcDef.function.name == \"alpha\" || funcDef.function.name == \"beta\" || funcDef.function.name == \"gamma\" ||\n+\t\t funcDef.function.name == \"delta\" || funcDef.function.name == \"epsilon\" || funcDef.function.name == \"varepsilon\" ||\n+\t\t funcDef.function.name == \"zeta\" || funcDef.function.name == \"eta\" || funcDef.function.name == \"theta\" ||\n+\t\t funcDef.function.name == \"vartheta\" || funcDef.function.name == \"gamma\" || funcDef.function.name == \"kappa\" ||\n+\t\t\tfuncDef.function.name == \"lambda\" || funcDef.function.name == \"mu\" || funcDef.function.name == \"nu\" || \n+\t\t\tfuncDef.function.name == \"xi\" || funcDef.function.name == \"pi\" || funcDef.function.name == \"varpi\" || \n+\t\t\tfuncDef.function.name == \"rho\" || funcDef.function.name == \"varrho\" || funcDef.function.name == \"sigma\" ||\n+\t\t\tfuncDef.function.name == \"varsigma\" || funcDef.function.name == \"tau\" || funcDef.function.name == \"upsilon\" ||\n+\t\t\tfuncDef.function.name == \"phi\" || funcDef.function.name == \"varphi\" || funcDef.function.name == \"chi\" || \n+\t\t\tfuncDef.function.name == \"psi\" || funcDef.function.name == \"omega\" || funcDef.function.name == \"Gamma\" ||\n+\t\t\tfuncDef.function.name == \"Delta\" || funcDef.function.name == \"Theta\" || funcDef.function.name == \"Lambda\" ||\n+\t\t\tfuncDef.function.name == \"Xi\" || funcDef.function.name == \"Pi\" || funcDef.function.name == \"Sigma\" || \n+\t\t\tfuncDef.function.name == \"Upsilon\" || funcDef.function.name == \"Phi\" || funcDef.function.name == \"Psi\" || \n+\t\t\tfuncDef.function.name == \"Omega\"�\n+\t\t\t\\\n+\t\t�ENDIF�\n \t\t�funcDef.function.name� ( \n \t\t�FOR param:funcDef.function.parameters�\n \t\t �IF param != null��compileFormula(param)��ENDIF�\n@@ -52,9 +68,25 @@ class MexGenerator implements IGenerator {\n \t'''\n \t}\n \t\n-\tdef compileAssignment(Assignment a)\n+\tdef compileVariableAssignment(VariableAssignment a)\n \t{\n \t '''\n+\t \t�IF a.variable == \"alpha\" || a.variable == \"beta\" || a.variable == \"gamma\" ||\n+\t\t a.variable == \"delta\" || a.variable == \"epsilon\" || a.variable == \"varepsilon\" ||\n+\t\t a.variable == \"zeta\" || a.variable == \"eta\" || a.variable == \"theta\" ||\n+\t\t a.variable == \"vartheta\" || a.variable == \"gamma\" || a.variable == \"kappa\" ||\n+\t\t\ta.variable == \"lambda\" || a.variable == \"mu\" || a.variable == \"nu\" || \n+\t\t\ta.variable == \"xi\" || a.variable == \"pi\" || a.variable == \"varpi\" || \n+\t\t\ta.variable == \"rho\" || a.variable == \"varrho\" || a.variable == \"sigma\" ||\n+\t\t\ta.variable == \"varsigma\" || a.variable == \"tau\" || a.variable == \"upsilon\" ||\n+\t\t\ta.variable == \"phi\" || a.variable == \"varphi\" || a.variable == \"chi\" || \n+\t\t\ta.variable == \"psi\" || a.variable == \"omega\" || a.variable == \"Gamma\" ||\n+\t\t\ta.variable == \"Delta\" || a.variable == \"Theta\" || a.variable == \"Lambda\" ||\n+\t\t\ta.variable == \"Xi\" || a.variable == \"Pi\" || a.variable == \"Sigma\" || \n+\t\t\ta.variable == \"Upsilon\" || a.variable == \"Phi\" || a.variable == \"Psi\" || \n+\t\t\ta.variable == \"Omega\"�\n+\t\t\t\\\n+\t\t�ENDIF�\n \t \t�a.variable� = �compileFormula(a.value)�\n \t '''\n \t}\n@@ -66,50 +98,110 @@ class MexGenerator implements IGenerator {\n \t'''\n \t}\n \t\n-\tdef compileMatrixDefinition(MatrixDefinition m) \n+\tdef compileMatrixFormula(MatrixFormula f) \n \t{\n \t'''\n-\t\t�m.name�=\n-\t\t$$\\left(\\begin{array}{\n-\t\t�FOR row:m.rows�\n-\t\t\tc\n-\t\t�ENDFOR�\t\n-\t\t}\n-\t\t�var j = 0�\n-\t\t�FOR row:m.rows�\n-\t\t �IF row != null�\n-\t\t \t�var i = 0�\n-\t \t\t�FOR element:row.elements�\n-\t\t\t �IF element != null�\n-\t\t\t \t�element�\n-\t\t\t �ENDIF�\n-\t\t\t �IF (i = i + 1) != row.elements.size()�&�ENDIF�\n-\t\t\t�ENDFOR�\n-\t\t �ENDIF�\n-\t\t �IF (j = j + 1) != m.rows.size()�\\\\�ENDIF�\n-\t\t�ENDFOR�\n-\t\t\\end{array}\\right)$$\n+\t\t�compileMatrixExpression(f.expression)�\n \t'''\n \t}\n \t\n+\tdef compileMatrixAssignment(MatrixAssignment a)\n+\t{\n+\t '''\n+\t \t�IF a.variable == \"alpha\" || a.variable == \"beta\" || a.variable == \"gamma\" ||\n+\t\t a.variable == \"delta\" || a.variable == \"epsilon\" || a.variable == \"varepsilon\" ||\n+\t\t a.variable == \"zeta\" || a.variable == \"eta\" || a.variable == \"theta\" ||\n+\t\t a.variable == \"vartheta\" || a.variable == \"gamma\" || a.variable == \"kappa\" ||\n+\t\t\ta.variable == \"lambda\" || a.variable == \"mu\" || a.variable == \"nu\" || \n+\t\t\ta.variable == \"xi\" || a.variable == \"pi\" || a.variable == \"varpi\" || \n+\t\t\ta.variable == \"rho\" || a.variable == \"varrho\" || a.variable == \"sigma\" ||\n+\t\t\ta.variable == \"varsigma\" || a.variable == \"tau\" || a.variable == \"upsilon\" ||\n+\t\t\ta.variable == \"phi\" || a.variable == \"varphi\" || a.variable == \"chi\" || \n+\t\t\ta.variable == \"psi\" || a.variable == \"omega\" || a.variable == \"Gamma\" ||\n+\t\t\ta.variable == \"Delta\" || a.variable == \"Theta\" || a.variable == \"Lambda\" ||\n+\t\t\ta.variable == \"Xi\" || a.variable == \"Pi\" || a.variable == \"Sigma\" || \n+\t\t\ta.variable == \"Upsilon\" || a.variable == \"Phi\" || a.variable == \"Psi\" || \n+\t\t\ta.variable == \"Omega\"�\n+\t\t\t\\\n+\t\t�ENDIF�\n+\t \t�a.variable� = �compileMatrixFormula(a.value)�\n+\t '''\n+\t}\n+\t\n \t/*TODO: add function check */\n \tdef compileFunction(Function f) '''\n-\t\t\\\\�f.function.name.toLowerCase()�\n+\t\t�IF f.function.name == \"alpha\" || f.function.name == \"beta\" || f.function.name == \"gamma\" ||\n+\t\t f.function.name == \"delta\" || f.function.name == \"epsilon\" || f.function.name == \"varepsilon\" ||\n+\t\t f.function.name == \"zeta\" || f.function.name == \"eta\" || f.function.name == \"theta\" ||\n+\t\t f.function.name == \"vartheta\" || f.function.name == \"gamma\" || f.function.name == \"kappa\" ||\n+\t\t\tf.function.name == \"lambda\" || f.function.name == \"mu\" || f.function.name == \"nu\" || \n+\t\t\tf.function.name == \"xi\" || f.function.name == \"pi\" || f.function.name == \"varpi\" || \n+\t\t\tf.function.name == \"rho\" || f.function.name == \"varrho\" || f.function.name == \"sigma\" ||\n+\t\t\tf.function.name == \"varsigma\" || f.function.name == \"tau\" || f.function.name == \"upsilon\" ||\n+\t\t\tf.function.name == \"phi\" || f.function.name == \"varphi\" || f.function.name == \"chi\" || \n+\t\t\tf.function.name == \"psi\" || f.function.name == \"omega\" || f.function.name == \"Gamma\" ||\n+\t\t\tf.function.name == \"Delta\" || f.function.name == \"Theta\" || f.function.name == \"Lambda\" ||\n+\t\t\tf.function.name == \"Xi\" || f.function.name == \"Pi\" || f.function.name == \"Sigma\" || \n+\t\t\tf.function.name == \"Upsilon\" || f.function.name == \"Phi\" || f.function.name == \"Psi\" || \n+\t\t\tf.function.name == \"Omega\"�\n+\t\t\t\\\n+\t\t�ENDIF�\n+\t\t\\\\�f.function.name�\n \t\t(�FOR param:f.function.parameters�\n \t\t �IF param != null��compileFormula(param)��ENDIF�\n \t\t �IF f.function.parameters.last() != param�,�ENDIF�\n \t\t�ENDFOR�)\n \t'''\n-\t\t\t\n+\t\n+\t//Expression\n+\t\t\n \tdef dispatch compileExpression(Variable n) '''\n+\t\t�IF n.name == \"alpha\" || n.name == \"beta\" || n.name == \"gamma\" ||\n+\t\t n.name == \"delta\" || n.name == \"epsilon\" || n.name == \"varepsilon\" ||\n+\t\t n.name == \"zeta\" || n.name == \"eta\" || n.name == \"theta\" ||\n+\t\t n.name == \"vartheta\" || n.name == \"gamma\" || n.name == \"kappa\" ||\n+\t\t\tn.name == \"lambda\" || n.name == \"mu\" || n.name == \"nu\" || \n+\t\t\tn.name == \"xi\" || n.name == \"pi\" || n.name == \"varpi\" || \n+\t\t\tn.name == \"rho\" || n.name == \"varrho\" || n.name == \"sigma\" ||\n+\t\t\tn.name == \"varsigma\" || n.name == \"tau\" || n.name == \"upsilon\" ||\n+\t\t\tn.name == \"phi\" || n.name == \"varphi\" || n.name == \"chi\" || \n+\t\t\tn.name == \"psi\" || n.name == \"omega\" || n.name == \"Gamma\" ||\n+\t\t\tn.name == \"Delta\" || n.name == \"Theta\" || n.name == \"Lambda\" ||\n+\t\t\tn.name == \"Xi\" || n.name == \"Pi\" || n.name == \"Sigma\" || \n+\t\t\tn.name == \"Upsilon\" || n.name == \"Phi\" || n.name == \"Psi\" || \n+\t\t\tn.name == \"Omega\"�\n+\t\t\t\\\n+\t\t�ENDIF�\n \t\t�n.name�'''\n \t\t\n \tdef dispatch compileExpression(Float n) '''\n \t\t�n.value�'''\n \t\t\n+\tdef dispatch compileExpression(MatrixElement e) '''\n+\t\t�IF e.element == \"alpha\" || e.element == \"beta\" || e.element == \"gamma\" ||\n+\t\t e.element == \"delta\" || e.element == \"epsilon\" || e.element == \"varepsilon\" ||\n+\t\t e.element == \"zeta\" || e.element == \"eta\" || e.element == \"theta\" ||\n+\t\t e.element == \"vartheta\" || e.element == \"gamma\" || e.element == \"kappa\" ||\n+\t\t\te.element == \"lambda\" || e.element == \"mu\" || e.element == \"nu\" || \n+\t\t\te.element == \"xi\" || e.element == \"pi\" || e.element == \"varpi\" || \n+\t\t\te.element == \"rho\" || e.element == \"varrho\" || e.element == \"sigma\" ||\n+\t\t\te.element == \"varsigma\" || e.element == \"tau\" || e.element == \"upsilon\" ||\n+\t\t\te.element == \"phi\" || e.element == \"varphi\" || e.element == \"chi\" || \n+\t\t\te.element == \"psi\" || e.element == \"omega\" || e.element == \"Gamma\" ||\n+\t\t\te.element == \"Delta\" || e.element == \"Theta\" || e.element == \"Lambda\" ||\n+\t\t\te.element == \"Xi\" || e.element == \"Pi\" || e.element == \"Sigma\" || \n+\t\t\te.element == \"Upsilon\" || e.element == \"Phi\" || e.element == \"Psi\" || \n+\t\t\te.element == \"Omega\"�\n+\t\t\t\\\n+\t\t�ENDIF�\n+\t\t�e.element�_{�e.row�,�e.column�}'''\n+\t\t\n \tdef dispatch compileExpression(Function f) '''\n \t\t�compileFunction(f)�'''\n \t\n+\tdef dispatch compileExpression(InBrackets op) '''\n+\t\t(�compileExpression(op.inBrackets.addition)�)'''\n+\t\n \tdef dispatch compileExpression(Addition op) '''\n \t\t�compileExpression(op.left)�+�compileExpression(op.right)�'''\n \t\n@@ -120,20 +212,61 @@ class MexGenerator implements IGenerator {\n \t\t�compileExpression(op.left)�*�compileExpression(op.right)�'''\n \t\n \tdef dispatch compileExpression(Division op) '''\n-\t\t\\\\frac{�compileExpression(op.left)�}{�compileExpression(op.right)�}'''\n+\t\t\\frac{�compileExpression(op.left)�}{�compileExpression(op.right)�}'''\n \t\n \tdef dispatch compileExpression(Modulo op) '''\n \t\t�compileExpression(op.left)� \\mod �compileExpression(op.right)�'''\n \t\n \tdef dispatch compileExpression(Invert op) '''\n-\t�IF op.expression != null� (-(�compileExpression(op.expression)�)) �ENDIF�''' \n+\t�IF op.expression != null� (-�compileExpression(op.expression)�) �ENDIF�''' \n \t\n \tdef dispatch compileExpression(Factorial op) '''\n \t�IF op.expression != null� �compileExpression(op.expression)�! �ENDIF�''' \n-\t\n-\tdef dispatch compileExpression(Interval op) '''\n-\t�IF op.ceil != null && op.floor != null��op.openingBracket�(�compileExpression(op.ceil)�)..(�compileExpression(op.floor)�)�op.closingBracket��ENDIF�''' \n-\t\n+\t\t\n \tdef dispatch compileExpression(Exponent op) '''\n \t\t�compileExpression(op.left)�^�compileExpression(op.right)�'''\n+\t\n+\t//Matrix Expressions\n+\tdef dispatch compileMatrixExpression(MatrixVariable n) '''\n+\t\t�n.name�'''\t\n+\t\n+\tdef dispatch compileMatrixExpression(NewMatrix m) '''\n+\t\t$$\\left(\\begin{array}{\n+\t\t�FOR row:m.matrix.rows�\n+\t\t\tc\n+\t\t�ENDFOR�\t\n+\t\t}\n+\t\t�var j = 0�\n+\t\t�FOR row:m.matrix.rows�\n+\t\t �IF row != null�\n+\t\t \t�var i = 0�\n+\t \t\t�FOR element:row.elements�\n+\t\t\t �IF element != null�\n+\t\t\t \t�element�\n+\t\t\t �ENDIF�\n+\t\t\t �IF (i = i + 1) != row.elements.size()�&�ENDIF�\n+\t\t\t�ENDFOR�\n+\t\t �ENDIF�\n+\t\t �IF (j = j + 1) != m.matrix.rows.size()�\\\\�ENDIF�\n+\t\t�ENDFOR�\n+\t\t\\end{array}\\right)$$\n+\t\t'''\t\n+\t\t\n+\tdef dispatch compileMatrixExpression(TransposeMatrix n) '''\n+\t\t�n.name�^T'''\t\n+\t\t\n+\tdef dispatch compileMatrixExpression(MatrixInBrackets op) '''\n+\t\t(�compileMatrixExpression(op.inBrackets.addition)�)'''\t\n+\t\t\n+\tdef dispatch compileMatrixExpression(MatrixAddition op) '''\n+\t\t�compileMatrixExpression(op.left)�+�compileMatrixExpression(op.right)�'''\n+\t\n+\tdef dispatch compileMatrixExpression(MatrixSubtraction op) '''\n+\t\t�compileMatrixExpression(op.left)�-�compileMatrixExpression(op.right)�'''\n+\t\n+\tdef dispatch compileMatrixExpression(MatrixMultiplication op) '''\n+\t\t�IF op.rightMatrix != null��compileMatrixExpression(op.left)�*�compileMatrixExpression(op.rightMatrix)��ENDIF�\n+\t\t�IF op.rightScalar != null��compileMatrixExpression(op.left)�*�compileFormula(op.rightScalar)��ENDIF�'''\n+\t\t\n+\t\n }", "raw_url": "https://github.com/iee/iee/raw/0f04d91efdf50447d8e84e926ef98d7462103dc0/org.eclipse.iee.translator.TeXmole%2Forg.eclipse.iee.translator.molex.mex%2Fbin%2Forg%2Feclipse%2Fiee%2Ftranslator%2Fmolex%2Fmex%2Fgenerator%2FMexGenerator.xtend", "sha": "27abb150947405a2c5839b410fa78b222499c71b", "status": "modified" } ]
31
[ { "name": "iee$iee", "new_args": "", "new_implementation": "return cAdditionParserRuleCall_4_1;", "new_return_type": "RuleCall", "new_signature": "RuleCall getAdditionParserRuleCall_4_1()", "old_args": "", "old_implementation": "return cAdditionParserRuleCall_3_1;", "old_return_type": "RuleCall", "old_signature": "RuleCall getAdditionParserRuleCall_3_1()" }, { "name": "iee$iee", "new_args": "", "new_implementation": "return (pVariableAssignment != null) ? pVariableAssignment : (pVariableAssignment = new VariableAssignmentElements());\n\tpublic ParserRule getVariableAssignmentRule() {\n\t\treturn getVariableAssignmentAccess().getRule();\n\t//\tExponent | \"(-\" {Invert", "new_return_type": "VariableAssignmentElements", "new_signature": "VariableAssignmentElements getVariableAssignmentAccess()", "old_args": "", "old_implementation": "return (pAssignment != null) ? pAssignment : (pAssignment = new AssignmentElements());\n\tpublic ParserRule getAssignmentRule() {\n\t\treturn getAssignmentAccess().getRule();\n\t//\n\t//\n\t//\n\t//\tExponent | \"-\" {Invert", "old_return_type": "AssignmentElements", "old_signature": "AssignmentElements getAssignmentAccess()" }, { "name": "iee$iee", "new_args": "", "new_implementation": "return (pVariableAssignment != null) ? pVariableAssignment : (pVariableAssignment = new VariableAssignmentElements());\n\tpublic ParserRule getVariableAssignmentRule() {\n\t\treturn getVariableAssignmentAccess().getRule();\n\t//\tExponent | \"(-\" {Invert", "new_return_type": "VariableAssignmentElements", "new_signature": "VariableAssignmentElements getVariableAssignmentAccess()", "old_args": "", "old_implementation": "return (pAssignment != null) ? pAssignment : (pAssignment = new AssignmentElements());\n\tpublic ParserRule getAssignmentRule() {\n\t\treturn getAssignmentAccess().getRule();\n\t//\n\t//\n\t//\n\t//\tExponent | \"-\" {Invert", "old_return_type": "AssignmentElements", "old_signature": "AssignmentElements getAssignmentAccess()" }, { "name": "iee$iee", "new_args": "", "new_implementation": "return cVariableAssignmentVariableAssignmentParserRuleCall_1_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getVariableAssignmentVariableAssignmentParserRuleCall_1_0()", "old_args": "", "old_implementation": "return cAssignmentAssignmentParserRuleCall_2_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getAssignmentAssignmentParserRuleCall_2_0()" }, { "name": "iee$iee", "new_args": "", "new_implementation": "return cVariableAssignmentVariableAssignmentParserRuleCall_1_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getVariableAssignmentVariableAssignmentParserRuleCall_1_0()", "old_args": "", "old_implementation": "return cAssignmentAssignmentParserRuleCall_2_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getAssignmentAssignmentParserRuleCall_2_0()" }, { "name": "iee$iee", "new_args": "", "new_implementation": "return cVariableAssignmentAssignment_1;", "new_return_type": "Assignment", "new_signature": "Assignment getVariableAssignmentAssignment_1()", "old_args": "", "old_implementation": "return cAssignmentAssignment_2;", "old_return_type": "Assignment", "old_signature": "Assignment getAssignmentAssignment_2()" }, { "name": "iee$iee", "new_args": "", "new_implementation": "return cVariableAssignmentAssignment_1;", "new_return_type": "Assignment", "new_signature": "Assignment getVariableAssignmentAssignment_1()", "old_args": "", "old_implementation": "return cAssignmentAssignment_2;", "old_return_type": "Assignment", "old_signature": "Assignment getAssignmentAssignment_2()" }, { "name": "iee$iee", "new_args": "", "new_implementation": "return cFormulaAssignment_2;", "new_return_type": "Assignment", "new_signature": "Assignment getFormulaAssignment_2()", "old_args": "", "old_implementation": "return cFormulaAssignment_3;", "old_return_type": "Assignment", "old_signature": "Assignment getFormulaAssignment_3()" }, { "name": "iee$iee", "new_args": "", "new_implementation": "return cFormulaAssignment_2;", "new_return_type": "Assignment", "new_signature": "Assignment getFormulaAssignment_2()", "old_args": "", "old_implementation": "return cFormulaAssignment_3;", "old_return_type": "Assignment", "old_signature": "Assignment getFormulaAssignment_3()" }, { "name": "iee$iee", "new_args": "", "new_implementation": "return cFormulaFormulaParserRuleCall_2_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getFormulaFormulaParserRuleCall_2_0()", "old_args": "", "old_implementation": "return cFormulaFormulaParserRuleCall_3_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getFormulaFormulaParserRuleCall_3_0()" }, { "name": "iee$iee", "new_args": "", "new_implementation": "return cFormulaFormulaParserRuleCall_2_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getFormulaFormulaParserRuleCall_2_0()", "old_args": "", "old_implementation": "return cFormulaFormulaParserRuleCall_3_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getFormulaFormulaParserRuleCall_3_0()" }, { "name": "iee$iee", "new_args": "", "new_implementation": "return cFunctionAction_3_0;", "new_return_type": "Action", "new_signature": "Action getFunctionAction_3_0()", "old_args": "", "old_implementation": "return cFunctionAction_2_0;", "old_return_type": "Action", "old_signature": "Action getFunctionAction_2_0()" }, { "name": "iee$iee", "new_args": "", "new_implementation": "return cFunctionAssignment_3_1;", "new_return_type": "Assignment", "new_signature": "Assignment getFunctionAssignment_3_1()", "old_args": "", "old_implementation": "return cFunctionAssignment_2_1;", "old_return_type": "Assignment", "old_signature": "Assignment getFunctionAssignment_2_1()" }, { "name": "iee$iee", "new_args": "", "new_implementation": "return cFunctionFunctionParserRuleCall_3_1_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getFunctionFunctionParserRuleCall_3_1_0()", "old_args": "", "old_implementation": "return cFunctionFunctionParserRuleCall_2_1_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getFunctionFunctionParserRuleCall_2_1_0()" }, { "name": "iee$iee", "new_args": "", "new_implementation": "return cLeftParenthesisHyphenMinusKeyword_1_0;", "new_return_type": "Keyword", "new_signature": "Keyword getLeftParenthesisHyphenMinusKeyword_1_0()", "old_args": "", "old_implementation": "return cLeftParenthesisKeyword_3_2;", "old_return_type": "Keyword", "old_signature": "Keyword getLeftParenthesisKeyword_3_2()" }, { "name": "iee$iee", "new_args": "", "new_implementation": "return cLeftParenthesisHyphenMinusKeyword_1_0;", "new_return_type": "Keyword", "new_signature": "Keyword getLeftParenthesisHyphenMinusKeyword_1_0()", "old_args": "", "old_implementation": "return cLeftParenthesisKeyword_3_2;", "old_return_type": "Keyword", "old_signature": "Keyword getLeftParenthesisKeyword_3_2()" }, { "name": "iee$iee", "new_args": "", "new_implementation": "return (pMatrixAssignment != null) ? pMatrixAssignment : (pMatrixAssignment = new MatrixAssignmentElements());", "new_return_type": "MatrixAssignmentElements", "new_signature": "MatrixAssignmentElements getMatrixAssignmentAccess()", "old_args": "", "old_implementation": "return (pMatrixDefinition != null) ? pMatrixDefinition : (pMatrixDefinition = new MatrixDefinitionElements());", "old_return_type": "MatrixDefinitionElements", "old_signature": "MatrixDefinitionElements getMatrixDefinitionAccess()" }, { "name": "iee$iee", "new_args": "", "new_implementation": "return (pMatrixFormula != null) ? pMatrixFormula : (pMatrixFormula = new MatrixFormulaElements());", "new_return_type": "MatrixFormulaElements", "new_signature": "MatrixFormulaElements getMatrixFormulaAccess()", "old_args": "", "old_implementation": "return (pMatrixDefinition != null) ? pMatrixDefinition : (pMatrixDefinition = new MatrixDefinitionElements());", "old_return_type": "MatrixDefinitionElements", "old_signature": "MatrixDefinitionElements getMatrixDefinitionAccess()" }, { "name": "iee$iee", "new_args": "", "new_implementation": "return cMatrixAssignmentAssignment_3;", "new_return_type": "Assignment", "new_signature": "Assignment getMatrixAssignmentAssignment_3()", "old_args": "", "old_implementation": "return cMatrixDefinitionAssignment_1;", "old_return_type": "Assignment", "old_signature": "Assignment getMatrixDefinitionAssignment_1()" }, { "name": "iee$iee", "new_args": "", "new_implementation": "return cMatrixAssignmentAssignment_3;", "new_return_type": "Assignment", "new_signature": "Assignment getMatrixAssignmentAssignment_3()", "old_args": "", "old_implementation": "return cMatrixDefinitionAssignment_1;", "old_return_type": "Assignment", "old_signature": "Assignment getMatrixDefinitionAssignment_1()" }, { "name": "iee$iee", "new_args": "", "new_implementation": "return cMatrixAssignmentMatrixAssignmentParserRuleCall_3_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getMatrixAssignmentMatrixAssignmentParserRuleCall_3_0()", "old_args": "", "old_implementation": "return cMatrixDefinitionMatrixDefinitionParserRuleCall_1_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getMatrixDefinitionMatrixDefinitionParserRuleCall_1_0()" }, { "name": "iee$iee", "new_args": "", "new_implementation": "return cMatrixAssignmentMatrixAssignmentParserRuleCall_3_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getMatrixAssignmentMatrixAssignmentParserRuleCall_3_0()", "old_args": "", "old_implementation": "return cMatrixDefinitionMatrixDefinitionParserRuleCall_1_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getMatrixDefinitionMatrixDefinitionParserRuleCall_1_0()" }, { "name": "iee$iee", "new_args": "", "new_implementation": "return getMatrixAdditionAccess().getRule();", "new_return_type": "ParserRule", "new_signature": "ParserRule getMatrixAdditionRule()", "old_args": "", "old_implementation": "return getMatrixDefinitionAccess().getRule();", "old_return_type": "ParserRule", "old_signature": "ParserRule getMatrixDefinitionRule()" }, { "name": "iee$iee", "new_args": "", "new_implementation": "return getMatrixAdditionAccess().getRule();", "new_return_type": "ParserRule", "new_signature": "ParserRule getMatrixAdditionRule()", "old_args": "", "old_implementation": "return getMatrixDefinitionAccess().getRule();", "old_return_type": "ParserRule", "old_signature": "ParserRule getMatrixDefinitionRule()" }, { "name": "iee$iee", "new_args": "", "new_implementation": "return cRightParenthesisKeyword_1_3;", "new_return_type": "Keyword", "new_signature": "Keyword getRightParenthesisKeyword_1_3()", "old_args": "", "old_implementation": "return cRightParenthesisKeyword_3_4;", "old_return_type": "Keyword", "old_signature": "Keyword getRightParenthesisKeyword_3_4()" }, { "name": "iee$iee", "new_args": "", "new_implementation": "return cRightParenthesisKeyword_1_3;", "new_return_type": "Keyword", "new_signature": "Keyword getRightParenthesisKeyword_1_3()", "old_args": "", "old_implementation": "return cRightParenthesisKeyword_3_4;", "old_return_type": "Keyword", "old_signature": "Keyword getRightParenthesisKeyword_3_4()" } ]
26
138
0f60d39106094eb564d221904d2bb7a6dc39102d
[ { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new DirectDebitTransactionSDD();\n * Create an instance of {@link RestrictedIdentificationSDD", "new_return_type": "DirectDebitTransactionSDD", "new_signature": "DirectDebitTransactionSDD createDirectDebitTransactionSDD()", "old_args": "", "old_implementation": "return new AccountIdentificationSEPA();\n * Create an instance of {@link BranchAndFinancialInstitutionIdentificationSEPA3", "old_return_type": "AccountIdentificationSEPA", "old_signature": "AccountIdentificationSEPA createAccountIdentificationSEPA()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new ReferredDocumentAmount1Choice();\n * Create an instance of {@link CreditorReferenceType1", "new_return_type": "ReferredDocumentAmount1Choice", "new_signature": "ReferredDocumentAmount1Choice createReferredDocumentAmount1Choice()", "old_args": "", "old_implementation": "return new AccountIdentificationSEPA();\n * Create an instance of {@link BranchAndFinancialInstitutionIdentificationSEPA3", "old_return_type": "AccountIdentificationSEPA", "old_signature": "AccountIdentificationSEPA createAccountIdentificationSEPA()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new FinancialInstitutionIdentification5();\n * Create an instance of {@link RemittanceInformation3", "new_return_type": "FinancialInstitutionIdentification5", "new_signature": "FinancialInstitutionIdentification5 createFinancialInstitutionIdentification5()", "old_args": "", "old_implementation": "return new ActiveOrHistoricCurrencyAndAmountSEPA();\n * Create an instance of {@link OrganisationIdentificationSEPAChoice", "old_return_type": "ActiveOrHistoricCurrencyAndAmountSEPA", "old_signature": "ActiveOrHistoricCurrencyAndAmountSEPA createActiveOrHistoricCurrencyAndAmountSEPA()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new Pain00800101();\n * Create an instance of {@link DirectDebitTransactionInformationSDD", "new_return_type": "Pain00800101", "new_signature": "Pain00800101 createPain00800101()", "old_args": "", "old_implementation": "return new ActiveOrHistoricCurrencyAndAmountSEPA();\n * Create an instance of {@link OrganisationIdentificationSEPAChoice", "old_return_type": "ActiveOrHistoricCurrencyAndAmountSEPA", "old_signature": "ActiveOrHistoricCurrencyAndAmountSEPA createActiveOrHistoricCurrencyAndAmountSEPA()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new PartyIdentification20();\n * Create an instance of {@link ReferredDocumentType1", "new_return_type": "PartyIdentification20", "new_signature": "PartyIdentification20 createPartyIdentification20()", "old_args": "", "old_implementation": "return new AmountTypeSEPA();\n * Create an instance of {@link CreditTransferTransactionInformationSCT", "old_return_type": "AmountTypeSEPA", "old_signature": "AmountTypeSEPA createAmountTypeSEPA()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new PaymentInstructionInformationSDD();\n * Create an instance of {@link PersonIdentificationSEPA1Choice", "new_return_type": "PaymentInstructionInformationSDD", "new_signature": "PaymentInstructionInformationSDD createPaymentInstructionInformationSDD()", "old_args": "", "old_implementation": "return new AmountTypeSEPA();\n * Create an instance of {@link CreditTransferTransactionInformationSCT", "old_return_type": "AmountTypeSEPA", "old_signature": "AmountTypeSEPA createAmountTypeSEPA()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new PaymentInstructionInformationSDD();\n * Create an instance of {@link PersonIdentificationSEPA1Choice", "new_return_type": "PaymentInstructionInformationSDD", "new_signature": "PaymentInstructionInformationSDD createPaymentInstructionInformationSDD()", "old_args": "", "old_implementation": "return new AmountTypeSEPA();\n * Create an instance of {@link CreditTransferTransactionInformationSCT", "old_return_type": "AmountTypeSEPA", "old_signature": "AmountTypeSEPA createAmountTypeSEPA()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new PurposeSDD();\n * Create an instance of {@link PersonIdentificationSDD1", "new_return_type": "PurposeSDD", "new_signature": "PurposeSDD createPurposeSDD()", "old_args": "", "old_implementation": "return new AmountTypeSEPA();\n * Create an instance of {@link CreditTransferTransactionInformationSCT", "old_return_type": "AmountTypeSEPA", "old_signature": "AmountTypeSEPA createAmountTypeSEPA()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": null, "new_return_type": "BranchAndFinancialInstitutionIdentificationSEPA2", "new_signature": "BranchAndFinancialInstitutionIdentificationSEPA2 createBranchAndFinancialInstitutionIdentificationSEPA2()", "old_args": "", "old_implementation": null, "old_return_type": "BranchAndFinancialInstitutionIdentificationSEPA1", "old_signature": "BranchAndFinancialInstitutionIdentificationSEPA1 createBranchAndFinancialInstitutionIdentificationSEPA1()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new PostalAddress5();\n * Create an instance of {@link CurrencyAndAmount", "new_return_type": "PostalAddress5", "new_signature": "PostalAddress5 createPostalAddress5()", "old_args": "", "old_implementation": "return new BranchAndFinancialInstitutionIdentificationSEPA1();\n * Create an instance of {@link PersonIdentificationSchemeName1Choice", "old_return_type": "BranchAndFinancialInstitutionIdentificationSEPA1", "old_signature": "BranchAndFinancialInstitutionIdentificationSEPA1 createBranchAndFinancialInstitutionIdentificationSEPA1()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new PostalAddressSDD();\n * Create an instance of {@link ServiceLevelSDD", "new_return_type": "PostalAddressSDD", "new_signature": "PostalAddressSDD createPostalAddressSDD()", "old_args": "", "old_implementation": "return new BranchAndFinancialInstitutionIdentificationSEPA1();\n * Create an instance of {@link PersonIdentificationSchemeName1Choice", "old_return_type": "BranchAndFinancialInstitutionIdentificationSEPA1", "old_signature": "BranchAndFinancialInstitutionIdentificationSEPA1 createBranchAndFinancialInstitutionIdentificationSEPA1()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new CreditorReferenceType1();\n * Create an instance of {@link Party5Choice", "new_return_type": "CreditorReferenceType1", "new_signature": "CreditorReferenceType1 createCreditorReferenceType1()", "old_args": "", "old_implementation": "return new BranchAndFinancialInstitutionIdentificationSEPA3();\n * Create an instance of {@link PartySEPAChoice", "old_return_type": "BranchAndFinancialInstitutionIdentificationSEPA3", "old_signature": "BranchAndFinancialInstitutionIdentificationSEPA3 createBranchAndFinancialInstitutionIdentificationSEPA3()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new DirectDebitTransactionSDD();\n /**\n * Create an instance of {@link BranchAndFinancialInstitutionIdentificationSEPA2", "new_return_type": "DirectDebitTransactionSDD", "new_signature": "DirectDebitTransactionSDD createDirectDebitTransactionSDD()", "old_args": "", "old_implementation": "return new BranchAndFinancialInstitutionIdentificationSEPA3();\n /**\n * Create an instance of {@link OthrIdentification", "old_return_type": "BranchAndFinancialInstitutionIdentificationSEPA3", "old_signature": "BranchAndFinancialInstitutionIdentificationSEPA3 createBranchAndFinancialInstitutionIdentificationSEPA3()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new RestrictedIdentificationSDD();\n * Create an instance of {@link LocalInstrumentSDD", "new_return_type": "RestrictedIdentificationSDD", "new_signature": "RestrictedIdentificationSDD createRestrictedIdentificationSDD()", "old_args": "", "old_implementation": "return new BranchAndFinancialInstitutionIdentificationSEPA3();\n * Create an instance of {@link PartySEPAChoice", "old_return_type": "BranchAndFinancialInstitutionIdentificationSEPA3", "old_signature": "BranchAndFinancialInstitutionIdentificationSEPA3 createBranchAndFinancialInstitutionIdentificationSEPA3()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new OrganisationIdentificationSDDChoice();\n * Create an instance of {@link StructuredRemittanceInformationSDD", "new_return_type": "OrganisationIdentificationSDDChoice", "new_signature": "OrganisationIdentificationSDDChoice createOrganisationIdentificationSDDChoice()", "old_args": "", "old_implementation": "return new CashAccountSEPA1();\n * Create an instance of {@link OthrIdentification", "old_return_type": "CashAccountSEPA1", "old_signature": "CashAccountSEPA1 createCashAccountSEPA1()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new PartyIdentification22();\n * Create an instance of {@link PartyIdentification12", "new_return_type": "PartyIdentification22", "new_signature": "PartyIdentification22 createPartyIdentification22()", "old_args": "", "old_implementation": "return new CashAccountSEPA1();\n * Create an instance of {@link OthrIdentification", "old_return_type": "CashAccountSEPA1", "old_signature": "CashAccountSEPA1 createCashAccountSEPA1()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new CashAccountSDD1();\n * Create an instance of {@link AccountIdentificationSDD", "new_return_type": "CashAccountSDD1", "new_signature": "CashAccountSDD1 createCashAccountSDD1()", "old_args": "", "old_implementation": "return new CashAccountSEPA2();\n * Create an instance of {@link PostalAddressSEPA", "old_return_type": "CashAccountSEPA2", "old_signature": "CashAccountSEPA2 createCashAccountSEPA2()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new PartyIdentification23();\n * Create an instance of {@link PartyIdentification11", "new_return_type": "PartyIdentification23", "new_signature": "PartyIdentification23 createPartyIdentification23()", "old_args": "", "old_implementation": "return new CashAccountSEPA2();\n * Create an instance of {@link PostalAddressSEPA", "old_return_type": "CashAccountSEPA2", "old_signature": "CashAccountSEPA2 createCashAccountSEPA2()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new FinancialInstitution2();", "new_return_type": "FinancialInstitution2", "new_signature": "FinancialInstitution2 createFinancialInstitution2()", "old_args": "", "old_implementation": "return new CategoryPurposeSEPA();\n * Create an instance of {@link CreditorReferenceTypeSEPA", "old_return_type": "CategoryPurposeSEPA", "old_signature": "CategoryPurposeSEPA createCategoryPurposeSEPA()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new GenericIdentification3();", "new_return_type": "GenericIdentification3", "new_signature": "GenericIdentification3 createGenericIdentification3()", "old_args": "", "old_implementation": "return new CategoryPurposeSEPA();\n * Create an instance of {@link CreditorReferenceTypeSEPA", "old_return_type": "CategoryPurposeSEPA", "old_signature": "CategoryPurposeSEPA createCategoryPurposeSEPA()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new PartySEPA2();", "new_return_type": "PartySEPA2", "new_signature": "PartySEPA2 createPartySEPA2()", "old_args": "", "old_implementation": "return new CreditTransferTransactionInformationSCT();\n * Create an instance of {@link PaymentInstructionInformationSCT", "old_return_type": "CreditTransferTransactionInformationSCT", "old_signature": "CreditTransferTransactionInformationSCT createCreditTransferTransactionInformationSCT()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new PartySEPA2();", "new_return_type": "PartySEPA2", "new_signature": "PartySEPA2 createPartySEPA2()", "old_args": "", "old_implementation": "return new CreditTransferTransactionInformationSCT();\n * Create an instance of {@link PaymentInstructionInformationSCT", "old_return_type": "CreditTransferTransactionInformationSCT", "old_signature": "CreditTransferTransactionInformationSCT createCreditTransferTransactionInformationSCT()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new PersonIdentificationSDD1();\n * Create an instance of {@link PersonIdentificationSDD2", "new_return_type": "PersonIdentificationSDD1", "new_signature": "PersonIdentificationSDD1 createPersonIdentificationSDD1()", "old_args": "", "old_implementation": "return new CreditTransferTransactionInformationSCT();\n * Create an instance of {@link PaymentInstructionInformationSCT", "old_return_type": "CreditTransferTransactionInformationSCT", "old_signature": "CreditTransferTransactionInformationSCT createCreditTransferTransactionInformationSCT()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new ReferredDocumentType1();\n * Create an instance of {@link PaymentIdentification1", "new_return_type": "ReferredDocumentType1", "new_signature": "ReferredDocumentType1 createReferredDocumentType1()", "old_args": "", "old_implementation": "return new CreditTransferTransactionInformationSCT();\n * Create an instance of {@link PaymentInstructionInformationSCT", "old_return_type": "CreditTransferTransactionInformationSCT", "old_signature": "CreditTransferTransactionInformationSCT createCreditTransferTransactionInformationSCT()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new StatusReasonInformationSEPA();\n * Create an instance of {@link CreditorReferenceInformationSEPA", "new_return_type": "StatusReasonInformationSEPA", "new_signature": "StatusReasonInformationSEPA createStatusReasonInformationSEPA()", "old_args": "", "old_implementation": "return new CreditTransferTransactionInformationSCT();\n * Create an instance of {@link PaymentInstructionInformationSCT", "old_return_type": "CreditTransferTransactionInformationSCT", "old_signature": "CreditTransferTransactionInformationSCT createCreditTransferTransactionInformationSCT()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new CreditorReferenceTypeSDD();\n * Create an instance of {@link BranchAndFinancialInstitutionIdentificationSDD2", "new_return_type": "CreditorReferenceTypeSDD", "new_signature": "CreditorReferenceTypeSDD createCreditorReferenceTypeSDD()", "old_args": "", "old_implementation": "return new CreditorReferenceInformationSEPA1();\n * Create an instance of {@link GenericPersonIdentification1", "old_return_type": "CreditorReferenceInformationSEPA1", "old_signature": "CreditorReferenceInformationSEPA1 createCreditorReferenceInformationSEPA1()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new PaymentTypeInformation8();\n * Create an instance of {@link PaymentInstructionInformation5", "new_return_type": "PaymentTypeInformation8", "new_signature": "PaymentTypeInformation8 createPaymentTypeInformation8()", "old_args": "", "old_implementation": "return new CreditorReferenceInformationSEPA1();\n * Create an instance of {@link GenericPersonIdentification1", "old_return_type": "CreditorReferenceInformationSEPA1", "old_signature": "CreditorReferenceInformationSEPA1 createCreditorReferenceInformationSEPA1()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": null, "new_return_type": "PaymentTypeInformationSEPA", "new_signature": "PaymentTypeInformationSEPA createPaymentTypeInformationSEPA()", "old_args": "", "old_implementation": null, "old_return_type": "CreditorReferenceInformationSEPA1", "old_signature": "CreditorReferenceInformationSEPA1 createCreditorReferenceInformationSEPA1()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new DirectDebitTransaction4();\n * Create an instance of {@link ServiceLevel4", "new_return_type": "DirectDebitTransaction4", "new_signature": "DirectDebitTransaction4 createDirectDebitTransaction4()", "old_args": "", "old_implementation": "return new CreditorReferenceTypeCodeSEPA();\n * Create an instance of {@link FinancialInstitutionIdentificationSEPA3", "old_return_type": "CreditorReferenceTypeCodeSEPA", "old_signature": "CreditorReferenceTypeCodeSEPA createCreditorReferenceTypeCodeSEPA()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new PartySDDChoice();\n * Create an instance of {@link PartyIdentificationSDD2", "new_return_type": "PartySDDChoice", "new_signature": "PartySDDChoice createPartySDDChoice()", "old_args": "", "old_implementation": "return new CreditorReferenceTypeCodeSEPA();\n * Create an instance of {@link FinancialInstitutionIdentificationSEPA3", "old_return_type": "CreditorReferenceTypeCodeSEPA", "old_signature": "CreditorReferenceTypeCodeSEPA createCreditorReferenceTypeCodeSEPA()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": null, "new_return_type": "GroupHeaderSDD", "new_signature": "GroupHeaderSDD createGroupHeaderSDD()", "old_args": "", "old_implementation": null, "old_return_type": "CreditorReferenceTypeSEPA", "old_signature": "CreditorReferenceTypeSEPA createCreditorReferenceTypeSEPA()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": null, "new_return_type": "Party2Choice", "new_signature": "Party2Choice createParty2Choice()", "old_args": "", "old_implementation": null, "old_return_type": "CreditorReferenceTypeSEPA", "old_signature": "CreditorReferenceTypeSEPA createCreditorReferenceTypeSEPA()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new AmendmentInformationDetailsSDD();\n * Create an instance of {@link DirectDebitTransactionSDD", "new_return_type": "AmendmentInformationDetailsSDD", "new_signature": "AmendmentInformationDetailsSDD createAmendmentInformationDetailsSDD()", "old_args": "", "old_implementation": "return new CustomerCreditTransferInitiationV03();\n * Create an instance of {@link BranchAndFinancialInstitutionIdentificationSEPA3", "old_return_type": "CustomerCreditTransferInitiationV03", "old_signature": "CustomerCreditTransferInitiationV03 createCustomerCreditTransferInitiationV03()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new AmendmentInformationDetailsSDD();\n * Create an instance of {@link DirectDebitTransactionSDD", "new_return_type": "AmendmentInformationDetailsSDD", "new_signature": "AmendmentInformationDetailsSDD createAmendmentInformationDetailsSDD()", "old_args": "", "old_implementation": "return new CustomerCreditTransferInitiationV03();\n * Create an instance of {@link BranchAndFinancialInstitutionIdentificationSEPA3", "old_return_type": "CustomerCreditTransferInitiationV03", "old_signature": "CustomerCreditTransferInitiationV03 createCustomerCreditTransferInitiationV03()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new GenericIdentificationSDD();\n * Create an instance of {@link DirectDebitTransactionSDD", "new_return_type": "GenericIdentificationSDD", "new_signature": "GenericIdentificationSDD createGenericIdentificationSDD()", "old_args": "", "old_implementation": "return new CustomerCreditTransferInitiationV03();\n * Create an instance of {@link AccountIdentificationSEPA", "old_return_type": "CustomerCreditTransferInitiationV03", "old_signature": "CustomerCreditTransferInitiationV03 createCustomerCreditTransferInitiationV03()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new OrganisationIdentification2();\n * Create an instance of {@link ReferredDocumentAmount1Choice", "new_return_type": "OrganisationIdentification2", "new_signature": "OrganisationIdentification2 createOrganisationIdentification2()", "old_args": "", "old_implementation": "return new CustomerCreditTransferInitiationV03();\n * Create an instance of {@link AccountIdentificationSEPA", "old_return_type": "CustomerCreditTransferInitiationV03", "old_signature": "CustomerCreditTransferInitiationV03 createCustomerCreditTransferInitiationV03()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new OriginalTransactionReferenceSEPA();\n /**\n * Create an instance of {@link BranchAndFinancialInstitutionIdentificationSEPA2", "new_return_type": "OriginalTransactionReferenceSEPA", "new_signature": "OriginalTransactionReferenceSEPA createOriginalTransactionReferenceSEPA()", "old_args": "", "old_implementation": "return new CustomerCreditTransferInitiationV03();\n * Create an instance of {@link RemittanceInformationSEPA1Choice", "old_return_type": "CustomerCreditTransferInitiationV03", "old_signature": "CustomerCreditTransferInitiationV03 createCustomerCreditTransferInitiationV03()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new DirectDebitTransactionInformation2();\n * Create an instance of {@link DirectDebitTransaction4", "new_return_type": "DirectDebitTransactionInformation2", "new_signature": "DirectDebitTransactionInformation2 createDirectDebitTransactionInformation2()", "old_args": "", "old_implementation": "return new FinancialInstitutionIdentificationSEPA1();\n * Create an instance of {@link CreditorReferenceTypeCodeSEPA", "old_return_type": "FinancialInstitutionIdentificationSEPA1", "old_signature": "FinancialInstitutionIdentificationSEPA1 createFinancialInstitutionIdentificationSEPA1()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new FinancialInstitutionIdentificationSEPA2();\n * Create an instance of {@link PersonIdentificationSEPA2", "new_return_type": "FinancialInstitutionIdentificationSEPA2", "new_signature": "FinancialInstitutionIdentificationSEPA2 createFinancialInstitutionIdentificationSEPA2()", "old_args": "", "old_implementation": "return new FinancialInstitutionIdentificationSEPA1();\n * Create an instance of {@link GroupHeaderSCT", "old_return_type": "FinancialInstitutionIdentificationSEPA1", "old_signature": "FinancialInstitutionIdentificationSEPA1 createFinancialInstitutionIdentificationSEPA1()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new PartySDD();\n * Create an instance of {@link PartySDDChoice", "new_return_type": "PartySDD", "new_signature": "PartySDD createPartySDD()", "old_args": "", "old_implementation": "return new FinancialInstitutionIdentificationSEPA1();\n * Create an instance of {@link CreditorReferenceTypeCodeSEPA", "old_return_type": "FinancialInstitutionIdentificationSEPA1", "old_signature": "FinancialInstitutionIdentificationSEPA1 createFinancialInstitutionIdentificationSEPA1()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new FinancialInstitutionIdentificationSEPA2();", "new_return_type": "FinancialInstitutionIdentificationSEPA2", "new_signature": "FinancialInstitutionIdentificationSEPA2 createFinancialInstitutionIdentificationSEPA2()", "old_args": "", "old_implementation": "return new FinancialInstitutionIdentificationSEPA3();\n * Create an instance of {@link GroupHeaderSCT", "old_return_type": "FinancialInstitutionIdentificationSEPA3", "old_signature": "FinancialInstitutionIdentificationSEPA3 createFinancialInstitutionIdentificationSEPA3()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new PartyIdentificationSDD2();\n * Create an instance of {@link PartyIdentificationSDD1", "new_return_type": "PartyIdentificationSDD2", "new_signature": "PartyIdentificationSDD2 createPartyIdentificationSDD2()", "old_args": "", "old_implementation": "return new FinancialInstitutionIdentificationSEPA3();\n * Create an instance of {@link GroupHeaderSCT", "old_return_type": "FinancialInstitutionIdentificationSEPA3", "old_signature": "FinancialInstitutionIdentificationSEPA3 createFinancialInstitutionIdentificationSEPA3()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new ServiceLevel4();\n * Create an instance of {@link PersonIdentification3", "new_return_type": "ServiceLevel4", "new_signature": "ServiceLevel4 createServiceLevel4()", "old_args": "", "old_implementation": "return new FinancialInstitutionIdentificationSEPA3();\n * Create an instance of {@link GroupHeaderSCT", "old_return_type": "FinancialInstitutionIdentificationSEPA3", "old_signature": "FinancialInstitutionIdentificationSEPA3 createFinancialInstitutionIdentificationSEPA3()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new PartyIdentificationSDD5();\n * Create an instance of {@link PartyIdentificationSDD4", "new_return_type": "PartyIdentificationSDD5", "new_signature": "PartyIdentificationSDD5 createPartyIdentificationSDD5()", "old_args": "", "old_implementation": "return new GenericOrganisationIdentification1();\n * Create an instance of {@link PaymentTypeInformationSCT2", "old_return_type": "GenericOrganisationIdentification1", "old_signature": "GenericOrganisationIdentification1 createGenericOrganisationIdentification1()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new PersonIdentification4();\n * Create an instance of {@link StructuredRemittanceInformation6", "new_return_type": "PersonIdentification4", "new_signature": "PersonIdentification4 createPersonIdentification4()", "old_args": "", "old_implementation": "return new GenericOrganisationIdentification1();\n * Create an instance of {@link PaymentTypeInformationSCT2", "old_return_type": "GenericOrganisationIdentification1", "old_signature": "GenericOrganisationIdentification1 createGenericOrganisationIdentification1()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new GenericIdentification4();\n * Create an instance of {@link FinancialInstitutionIdentificationSDD2", "new_return_type": "GenericIdentification4", "new_signature": "GenericIdentification4 createGenericIdentification4()", "old_args": "", "old_implementation": "return new GenericPersonIdentification1();\n * Create an instance of {@link CategoryPurposeSEPA", "old_return_type": "GenericPersonIdentification1", "old_signature": "GenericPersonIdentification1 createGenericPersonIdentification1()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new MandateRelatedInformation4();", "new_return_type": "MandateRelatedInformation4", "new_signature": "MandateRelatedInformation4 createMandateRelatedInformation4()", "old_args": "", "old_implementation": "return new GenericPersonIdentification1();\n * Create an instance of {@link DateAndPlaceOfBirth", "old_return_type": "GenericPersonIdentification1", "old_signature": "GenericPersonIdentification1 createGenericPersonIdentification1()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new PartyIdentificationSDD1();\n * Create an instance of {@link PartyIdentificationSDD5", "new_return_type": "PartyIdentificationSDD1", "new_signature": "PartyIdentificationSDD1 createPartyIdentificationSDD1()", "old_args": "", "old_implementation": "return new GroupHeaderSCT();\n * Create an instance of {@link GenericOrganisationIdentification1", "old_return_type": "GroupHeaderSCT", "old_signature": "GroupHeaderSCT createGroupHeaderSCT()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new PartyIdentificationSEPA3();", "new_return_type": "PartyIdentificationSEPA3", "new_signature": "PartyIdentificationSEPA3 createPartyIdentificationSEPA3()", "old_args": "", "old_implementation": "return new GroupHeaderSCT();\n * Create an instance of {@link GenericOrganisationIdentification1", "old_return_type": "GroupHeaderSCT", "old_signature": "GroupHeaderSCT createGroupHeaderSCT()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new PersonIdentification3();\n * Create an instance of {@link PersonIdentification4", "new_return_type": "PersonIdentification3", "new_signature": "PersonIdentification3 createPersonIdentification3()", "old_args": "", "old_implementation": "return new GroupHeaderSCT();\n * Create an instance of {@link GenericOrganisationIdentification1", "old_return_type": "GroupHeaderSCT", "old_signature": "GroupHeaderSCT createGroupHeaderSCT()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new PersonIdentificationSEPA2();\n * Create an instance of {@link PartyIdentificationSEPA5", "new_return_type": "PersonIdentificationSEPA2", "new_signature": "PersonIdentificationSEPA2 createPersonIdentificationSEPA2()", "old_args": "", "old_implementation": "return new GroupHeaderSCT();\n * Create an instance of {@link GenericOrganisationIdentification1", "old_return_type": "GroupHeaderSCT", "old_signature": "GroupHeaderSCT createGroupHeaderSCT()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new PersonIdentificationSEPA2();\n * Create an instance of {@link PartyIdentificationSEPA5", "new_return_type": "PersonIdentificationSEPA2", "new_signature": "PersonIdentificationSEPA2 createPersonIdentificationSEPA2()", "old_args": "", "old_implementation": "return new GroupHeaderSCT();\n * Create an instance of {@link GenericOrganisationIdentification1", "old_return_type": "GroupHeaderSCT", "old_signature": "GroupHeaderSCT createGroupHeaderSCT()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new DirectDebitTransactionInformationSDD();\n * Create an instance of {@link MandateRelatedInformationSDD", "new_return_type": "DirectDebitTransactionInformationSDD", "new_signature": "DirectDebitTransactionInformationSDD createDirectDebitTransactionInformationSDD()", "old_args": "", "old_implementation": "return new OrganisationIdentificationSEPAChoice();\n * Create an instance of {@link StructuredRemittanceInformationSEPA1", "old_return_type": "OrganisationIdentificationSEPAChoice", "old_signature": "OrganisationIdentificationSEPAChoice createOrganisationIdentificationSEPAChoice()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new RemittanceInformation3();\n * Create an instance of {@link AmendmentInformationDetails4", "new_return_type": "RemittanceInformation3", "new_signature": "RemittanceInformation3 createRemittanceInformation3()", "old_args": "", "old_implementation": "return new OrganisationIdentificationSEPAChoice();\n * Create an instance of {@link StructuredRemittanceInformationSEPA1", "old_return_type": "OrganisationIdentificationSEPAChoice", "old_signature": "OrganisationIdentificationSEPAChoice createOrganisationIdentificationSEPAChoice()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new FinancialInstitutionIdentification4();\n * Create an instance of {@link PartyIdentification20", "new_return_type": "FinancialInstitutionIdentification4", "new_signature": "FinancialInstitutionIdentification4 createFinancialInstitutionIdentification4()", "old_args": "", "old_implementation": "return new OrganisationIdentificationSchemeName1Choice();\n * Create an instance of {@link AmountTypeSEPA", "old_return_type": "OrganisationIdentificationSchemeName1Choice", "old_signature": "OrganisationIdentificationSchemeName1Choice createOrganisationIdentificationSchemeName1Choice()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new RemittanceInformationSDDChoice();\n * Create an instance of {@link PurposeSDD", "new_return_type": "RemittanceInformationSDDChoice", "new_signature": "RemittanceInformationSDDChoice createRemittanceInformationSDDChoice()", "old_args": "", "old_implementation": "return new OrganisationIdentificationSchemeName1Choice();\n * Create an instance of {@link AmountTypeSEPA", "old_return_type": "OrganisationIdentificationSchemeName1Choice", "old_signature": "OrganisationIdentificationSchemeName1Choice createOrganisationIdentificationSchemeName1Choice()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new PartyIdentification12();\n * Create an instance of {@link FinancialInstitutionIdentification4", "new_return_type": "PartyIdentification12", "new_signature": "PartyIdentification12 createPartyIdentification12()", "old_args": "", "old_implementation": "return new OthrIdentification();\n * Create an instance of {@link OrganisationIdentificationSchemeName1Choice", "old_return_type": "OthrIdentification", "old_signature": "OthrIdentification createOthrIdentification()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new StructuredRemittanceInformationSDD();\n * Create an instance of {@link RemittanceInformationSDDChoice", "new_return_type": "StructuredRemittanceInformationSDD", "new_signature": "StructuredRemittanceInformationSDD createStructuredRemittanceInformationSDD()", "old_args": "", "old_implementation": "return new OthrIdentification();\n * Create an instance of {@link OrganisationIdentificationSchemeName1Choice", "old_return_type": "OthrIdentification", "old_signature": "OthrIdentification createOthrIdentification()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new AmendmentInformationDetailsSDD();\n * Create an instance of {@link CurrencyAndAmountSDD", "new_return_type": "AmendmentInformationDetailsSDD", "new_signature": "AmendmentInformationDetailsSDD createAmendmentInformationDetailsSDD()", "old_args": "", "old_implementation": "return new PartyIdentificationSEPA1();\n * Create an instance of {@link PaymentTypeInformationSCT1", "old_return_type": "PartyIdentificationSEPA1", "old_signature": "PartyIdentificationSEPA1 createPartyIdentificationSEPA1()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new ReferredDocumentInformation1();\n * Create an instance of {@link GroupHeader20", "new_return_type": "ReferredDocumentInformation1", "new_signature": "ReferredDocumentInformation1 createReferredDocumentInformation1()", "old_args": "", "old_implementation": "return new PartyIdentificationSEPA1();\n * Create an instance of {@link PaymentTypeInformationSCT1", "old_return_type": "PartyIdentificationSEPA1", "old_signature": "PartyIdentificationSEPA1 createPartyIdentificationSEPA1()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new CashAccount8();\n * Create an instance of {@link ReferredDocumentInformation1", "new_return_type": "CashAccount8", "new_signature": "CashAccount8 createCashAccount8()", "old_args": "", "old_implementation": "return new PartyIdentificationSEPA2();\n * Create an instance of {@link PartyIdentificationSEPA1", "old_return_type": "PartyIdentificationSEPA2", "old_signature": "PartyIdentificationSEPA2 createPartyIdentificationSEPA2()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new PartyIdentificationSDD3();\n * Create an instance of {@link AmendmentInformationDetailsSDD", "new_return_type": "PartyIdentificationSDD3", "new_signature": "PartyIdentificationSDD3 createPartyIdentificationSDD3()", "old_args": "", "old_implementation": "return new PartyIdentificationSEPA2();\n * Create an instance of {@link PartyIdentificationSEPA1", "old_return_type": "PartyIdentificationSEPA2", "old_signature": "PartyIdentificationSEPA2 createPartyIdentificationSEPA2()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new LocalInstrumentSDD();\n * Create an instance of {@link PostalAddressSDD", "new_return_type": "LocalInstrumentSDD", "new_signature": "LocalInstrumentSDD createLocalInstrumentSDD()", "old_args": "", "old_implementation": "return new PartySEPAChoice();\n * Create an instance of {@link BranchAndFinancialInstitutionIdentificationSEPA1", "old_return_type": "PartySEPAChoice", "old_signature": "PartySEPAChoice createPartySEPAChoice()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new Party5Choice();\n * Create an instance of {@link PostalAddress5", "new_return_type": "Party5Choice", "new_signature": "Party5Choice createParty5Choice()", "old_args": "", "old_implementation": "return new PartySEPAChoice();\n * Create an instance of {@link BranchAndFinancialInstitutionIdentificationSEPA1", "old_return_type": "PartySEPAChoice", "old_signature": "PartySEPAChoice createPartySEPAChoice()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new PartyPrivate1();\n * Create an instance of {@link DirectDebitTransactionInformation2", "new_return_type": "PartyPrivate1", "new_signature": "PartyPrivate1 createPartyPrivate1()", "old_args": "", "old_implementation": "return new PaymentIdentificationSEPA();\n * Create an instance of {@link FinancialInstitutionIdentificationSEPA1", "old_return_type": "PaymentIdentificationSEPA", "old_signature": "PaymentIdentificationSEPA createPaymentIdentificationSEPA()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new PaymentTypeInformationSDD();\n * Create an instance of {@link PartySDD", "new_return_type": "PaymentTypeInformationSDD", "new_signature": "PaymentTypeInformationSDD createPaymentTypeInformationSDD()", "old_args": "", "old_implementation": "return new PaymentIdentificationSEPA();\n * Create an instance of {@link FinancialInstitutionIdentificationSEPA1", "old_return_type": "PaymentIdentificationSEPA", "old_signature": "PaymentIdentificationSEPA createPaymentIdentificationSEPA()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new PaymentIdentification1();\n * Create an instance of {@link CashAccountSDD2", "new_return_type": "PaymentIdentification1", "new_signature": "PaymentIdentification1 createPaymentIdentification1()", "old_args": "", "old_implementation": "return new PaymentInstructionInformationSCT();\n * Create an instance of {@link PersonIdentificationSEPA1Choice", "old_return_type": "PaymentInstructionInformationSCT", "old_signature": "PaymentInstructionInformationSCT createPaymentInstructionInformationSCT()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new PersonIdentificationSDD2();\n * Create an instance of {@link PaymentInstructionInformationSDD", "new_return_type": "PersonIdentificationSDD2", "new_signature": "PersonIdentificationSDD2 createPersonIdentificationSDD2()", "old_args": "", "old_implementation": "return new PaymentInstructionInformationSCT();\n * Create an instance of {@link PersonIdentificationSEPA1Choice", "old_return_type": "PaymentInstructionInformationSCT", "old_signature": "PaymentInstructionInformationSCT createPaymentInstructionInformationSCT()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new StatusReasonSEPA();\n * Create an instance of {@link StructuredRemittanceInformationSEPA2", "new_return_type": "StatusReasonSEPA", "new_signature": "StatusReasonSEPA createStatusReasonSEPA()", "old_args": "", "old_implementation": "return new PaymentInstructionInformationSCT();\n * Create an instance of {@link StructuredRemittanceInformationSEPA1", "old_return_type": "PaymentInstructionInformationSCT", "old_signature": "PaymentInstructionInformationSCT createPaymentInstructionInformationSCT()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new CurrencyAndAmountSDD();\n * Create an instance of {@link CreditorReferenceInformationSDD", "new_return_type": "CurrencyAndAmountSDD", "new_signature": "CurrencyAndAmountSDD createCurrencyAndAmountSDD()", "old_args": "", "old_implementation": "return new PaymentTypeInformationSCT1();\n * Create an instance of {@link PurposeSEPA", "old_return_type": "PaymentTypeInformationSCT1", "old_signature": "PaymentTypeInformationSCT1 createPaymentTypeInformationSCT1()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new GroupHeader20();\n * Create an instance of {@link AccountIdentification2", "new_return_type": "GroupHeader20", "new_signature": "GroupHeader20 createGroupHeader20()", "old_args": "", "old_implementation": "return new PaymentTypeInformationSCT1();\n * Create an instance of {@link PurposeSEPA", "old_return_type": "PaymentTypeInformationSCT1", "old_signature": "PaymentTypeInformationSCT1 createPaymentTypeInformationSCT1()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new OrganisationIdentificationSEPA();", "new_return_type": "OrganisationIdentificationSEPA", "new_signature": "OrganisationIdentificationSEPA createOrganisationIdentificationSEPA()", "old_args": "", "old_implementation": "return new PaymentTypeInformationSCT1();\n * Create an instance of {@link PurposeSEPA", "old_return_type": "PaymentTypeInformationSCT1", "old_signature": "PaymentTypeInformationSCT1 createPaymentTypeInformationSCT1()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new PartyIdentificationSEPA3();", "new_return_type": "PartyIdentificationSEPA3", "new_signature": "PartyIdentificationSEPA3 createPartyIdentificationSEPA3()", "old_args": "", "old_implementation": "return new PaymentTypeInformationSCT1();\n * Create an instance of {@link PurposeSEPA", "old_return_type": "PaymentTypeInformationSCT1", "old_signature": "PaymentTypeInformationSCT1 createPaymentTypeInformationSCT1()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new PartyIdentificationSDD4();\n * Create an instance of {@link PartyIdentificationSDD3", "new_return_type": "PartyIdentificationSDD4", "new_signature": "PartyIdentificationSDD4 createPartyIdentificationSDD4()", "old_args": "", "old_implementation": "return new PaymentTypeInformationSCT2();\n * Create an instance of {@link PartyIdentificationSEPA2", "old_return_type": "PaymentTypeInformationSCT2", "old_signature": "PaymentTypeInformationSCT2 createPaymentTypeInformationSCT2()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new PersonIdentificationSEPA2();\n * Create an instance of {@link PartyIdentificationSEPA5", "new_return_type": "PersonIdentificationSEPA2", "new_signature": "PersonIdentificationSEPA2 createPersonIdentificationSEPA2()", "old_args": "", "old_implementation": "return new PaymentTypeInformationSCT2();\n * Create an instance of {@link PaymentTypeInformationSCT1", "old_return_type": "PaymentTypeInformationSCT2", "old_signature": "PaymentTypeInformationSCT2 createPaymentTypeInformationSCT2()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new RemittanceInformationSEPA2Choice();", "new_return_type": "RemittanceInformationSEPA2Choice", "new_signature": "RemittanceInformationSEPA2Choice createRemittanceInformationSEPA2Choice()", "old_args": "", "old_implementation": "return new PaymentTypeInformationSCT2();\n * Create an instance of {@link PaymentTypeInformationSCT1", "old_return_type": "PaymentTypeInformationSCT2", "old_signature": "PaymentTypeInformationSCT2 createPaymentTypeInformationSCT2()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new StructuredRemittanceInformation6();\n * Create an instance of {@link CashAccount8", "new_return_type": "StructuredRemittanceInformation6", "new_signature": "StructuredRemittanceInformation6 createStructuredRemittanceInformation6()", "old_args": "", "old_implementation": "return new PaymentTypeInformationSCT2();\n * Create an instance of {@link PartyIdentificationSEPA2", "old_return_type": "PaymentTypeInformationSCT2", "old_signature": "PaymentTypeInformationSCT2 createPaymentTypeInformationSCT2()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new PartyIdentification17();\n * Create an instance of {@link FinancialInstitutionIdentification5", "new_return_type": "PartyIdentification17", "new_signature": "PartyIdentification17 createPartyIdentification17()", "old_args": "", "old_implementation": "return new PersonIdentificationSEPA1Choice();\n * Create an instance of {@link ActiveOrHistoricCurrencyAndAmountSEPA", "old_return_type": "PersonIdentificationSEPA1Choice", "old_signature": "PersonIdentificationSEPA1Choice createPersonIdentificationSEPA1Choice()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new PaymentInstructionInformationSDD();\n * Create an instance of {@link PersonIdentificationSEPA1Choice", "new_return_type": "PaymentInstructionInformationSDD", "new_signature": "PaymentInstructionInformationSDD createPaymentInstructionInformationSDD()", "old_args": "", "old_implementation": "return new PersonIdentificationSEPA1Choice();\n * Create an instance of {@link ActiveOrHistoricCurrencyAndAmountSEPA", "old_return_type": "PersonIdentificationSEPA1Choice", "old_signature": "PersonIdentificationSEPA1Choice createPersonIdentificationSEPA1Choice()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new CurrencyAndAmount();\n * Create an instance of {@link EuroMax9Amount", "new_return_type": "CurrencyAndAmount", "new_signature": "CurrencyAndAmount createCurrencyAndAmount()", "old_args": "", "old_implementation": "return new PersonIdentificationSchemeName1Choice();\n * Create an instance of {@link RemittanceInformationSEPA1Choice", "old_return_type": "PersonIdentificationSchemeName1Choice", "old_signature": "PersonIdentificationSchemeName1Choice createPersonIdentificationSchemeName1Choice()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new ServiceLevelSDD();\n * Create an instance of {@link PaymentIdentification1", "new_return_type": "ServiceLevelSDD", "new_signature": "ServiceLevelSDD createServiceLevelSDD()", "old_args": "", "old_implementation": "return new PersonIdentificationSchemeName1Choice();\n * Create an instance of {@link RemittanceInformationSEPA1Choice", "old_return_type": "PersonIdentificationSchemeName1Choice", "old_signature": "PersonIdentificationSchemeName1Choice createPersonIdentificationSchemeName1Choice()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new AccountIdentificationSDD();\n * Create an instance of {@link OrganisationIdentificationSDDChoice", "new_return_type": "AccountIdentificationSDD", "new_signature": "AccountIdentificationSDD createAccountIdentificationSDD()", "old_args": "", "old_implementation": "return new PostalAddressSEPA();\n * Create an instance of {@link CashAccountSEPA1", "old_return_type": "PostalAddressSEPA", "old_signature": "PostalAddressSEPA createPostalAddressSEPA()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new PartyIdentification11();\n * Create an instance of {@link PartyIdentification22", "new_return_type": "PartyIdentification11", "new_signature": "PartyIdentification11 createPartyIdentification11()", "old_args": "", "old_implementation": "return new PostalAddressSEPA();\n * Create an instance of {@link CashAccountSEPA1", "old_return_type": "PostalAddressSEPA", "old_signature": "PostalAddressSEPA createPostalAddressSEPA()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new AccountIdentification2();\n * Create an instance of {@link OrganisationIdentification2", "new_return_type": "AccountIdentification2", "new_signature": "AccountIdentification2 createAccountIdentification2()", "old_args": "", "old_implementation": "return new PurposeSEPA();\n * Create an instance of {@link CustomerCreditTransferInitiationV03", "old_return_type": "PurposeSEPA", "old_signature": "PurposeSEPA createPurposeSEPA()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new CreditorReferenceInformationSDD();\n * Create an instance of {@link GenericIdentificationSDD", "new_return_type": "CreditorReferenceInformationSDD", "new_signature": "CreditorReferenceInformationSDD createCreditorReferenceInformationSDD()", "old_args": "", "old_implementation": "return new PurposeSEPA();\n * Create an instance of {@link CustomerCreditTransferInitiationV03", "old_return_type": "PurposeSEPA", "old_signature": "PurposeSEPA createPurposeSEPA()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new CustomerPaymentStatusReportV03();\n /**\n * Create an instance of {@link PartySEPA1", "new_return_type": "CustomerPaymentStatusReportV03", "new_signature": "CustomerPaymentStatusReportV03 createCustomerPaymentStatusReportV03()", "old_args": "", "old_implementation": "return new RemittanceInformationSEPA1Choice();\n * Create an instance of {@link CreditTransferTransactionInformationSCT", "old_return_type": "RemittanceInformationSEPA1Choice", "old_signature": "RemittanceInformationSEPA1Choice createRemittanceInformationSEPA1Choice()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new EuroMax9Amount();\n * Create an instance of {@link PostalAddress1", "new_return_type": "EuroMax9Amount", "new_signature": "EuroMax9Amount createEuroMax9Amount()", "old_args": "", "old_implementation": "return new RemittanceInformationSEPA1Choice();\n * Create an instance of {@link ServiceLevelSEPA", "old_return_type": "RemittanceInformationSEPA1Choice", "old_signature": "RemittanceInformationSEPA1Choice createRemittanceInformationSEPA1Choice()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new PaymentIdentification1();\n * Create an instance of {@link CashAccountSDD2", "new_return_type": "PaymentIdentification1", "new_signature": "PaymentIdentification1 createPaymentIdentification1()", "old_args": "", "old_implementation": "return new RemittanceInformationSEPA1Choice();\n * Create an instance of {@link ServiceLevelSEPA", "old_return_type": "RemittanceInformationSEPA1Choice", "old_signature": "RemittanceInformationSEPA1Choice createRemittanceInformationSEPA1Choice()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new CashAccountSDD2();\n * Create an instance of {@link CashAccountSDD1", "new_return_type": "CashAccountSDD2", "new_signature": "CashAccountSDD2 createCashAccountSDD2()", "old_args": "", "old_implementation": "return new ServiceLevelSEPA();\n * Create an instance of {@link CashAccountSEPA2", "old_return_type": "ServiceLevelSEPA", "old_signature": "ServiceLevelSEPA createServiceLevelSEPA()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new PostalAddress1();\n * Create an instance of {@link PartyIdentification23", "new_return_type": "PostalAddress1", "new_signature": "PostalAddress1 createPostalAddress1()", "old_args": "", "old_implementation": "return new ServiceLevelSEPA();\n * Create an instance of {@link CashAccountSEPA2", "old_return_type": "ServiceLevelSEPA", "old_signature": "ServiceLevelSEPA createServiceLevelSEPA()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new AmendmentInformationDetails4();\n * Create an instance of {@link PaymentTypeInformation8", "new_return_type": "AmendmentInformationDetails4", "new_signature": "AmendmentInformationDetails4 createAmendmentInformationDetails4()", "old_args": "", "old_implementation": "return new StructuredRemittanceInformationSEPA1();\n * Create an instance of {@link CreditorReferenceInformationSEPA1", "old_return_type": "StructuredRemittanceInformationSEPA1", "old_signature": "StructuredRemittanceInformationSEPA1 createStructuredRemittanceInformationSEPA1()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new MandateRelatedInformationSDD();\n * Create an instance of {@link CreditorReferenceTypeSDD", "new_return_type": "MandateRelatedInformationSDD", "new_signature": "MandateRelatedInformationSDD createMandateRelatedInformationSDD()", "old_args": "", "old_implementation": "return new StructuredRemittanceInformationSEPA1();\n * Create an instance of {@link CreditorReferenceInformationSEPA1", "old_return_type": "StructuredRemittanceInformationSEPA1", "old_signature": "StructuredRemittanceInformationSEPA1 createStructuredRemittanceInformationSEPA1()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new StructuredRemittanceInformationSEPA2();", "new_return_type": "StructuredRemittanceInformationSEPA2", "new_signature": "StructuredRemittanceInformationSEPA2 createStructuredRemittanceInformationSEPA2()", "old_args": "", "old_implementation": "return new StructuredRemittanceInformationSEPA1();\n * Create an instance of {@link CreditorReferenceInformationSEPA1", "old_return_type": "StructuredRemittanceInformationSEPA1", "old_signature": "StructuredRemittanceInformationSEPA1 createStructuredRemittanceInformationSEPA1()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return cstmrDrctDbtInitn;\n * Sets the value of the cstmrDrctDbtInitn property.\n * {@link CustomerDirectDebitInitiationV02", "new_return_type": "CustomerDirectDebitInitiationV02", "new_signature": "CustomerDirectDebitInitiationV02 getCstmrDrctDbtInitn()", "old_args": "", "old_implementation": "return cstmrCdtTrfInitn;\n * Sets the value of the cstmrCdtTrfInitn property.\n * {@link CustomerCreditTransferInitiationV03", "old_return_type": "CustomerCreditTransferInitiationV03", "old_signature": "CustomerCreditTransferInitiationV03 getCstmrCdtTrfInitn()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return cstmrDrctDbtInitn;\n * Sets the value of the cstmrDrctDbtInitn property.\n * {@link CustomerDirectDebitInitiationV02", "new_return_type": "CustomerDirectDebitInitiationV02", "new_signature": "CustomerDirectDebitInitiationV02 getCstmrDrctDbtInitn()", "old_args": "", "old_implementation": "return cstmrCdtTrfInitn;\n * Sets the value of the cstmrCdtTrfInitn property.\n * {@link CustomerCreditTransferInitiationV03", "old_return_type": "CustomerCreditTransferInitiationV03", "old_signature": "CustomerCreditTransferInitiationV03 getCstmrCdtTrfInitn()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return cstmrPmtStsRpt;\n * Sets the value of the cstmrPmtStsRpt property.\n * {@link CustomerPaymentStatusReportV03", "new_return_type": "CustomerPaymentStatusReportV03", "new_signature": "CustomerPaymentStatusReportV03 getCstmrPmtStsRpt()", "old_args": "", "old_implementation": "return cstmrCdtTrfInitn;\n * Sets the value of the cstmrCdtTrfInitn property.\n * {@link CustomerCreditTransferInitiationV03", "old_return_type": "CustomerCreditTransferInitiationV03", "old_signature": "CustomerCreditTransferInitiationV03 getCstmrCdtTrfInitn()" }, { "name": "willuhn$hbci4java", "new_args": "CustomerDirectDebitInitiationV02 value", "new_implementation": null, "new_return_type": "void", "new_signature": "void setCstmrDrctDbtInitn(CustomerDirectDebitInitiationV02 value)", "old_args": "CustomerCreditTransferInitiationV03 value", "old_implementation": null, "old_return_type": "void", "old_signature": "void setCstmrCdtTrfInitn(CustomerCreditTransferInitiationV03 value)" }, { "name": "willuhn$hbci4java", "new_args": "CustomerDirectDebitInitiationV02 value", "new_implementation": null, "new_return_type": "void", "new_signature": "void setCstmrDrctDbtInitn(CustomerDirectDebitInitiationV02 value)", "old_args": "CustomerCreditTransferInitiationV03 value", "old_implementation": null, "old_return_type": "void", "old_signature": "void setCstmrCdtTrfInitn(CustomerCreditTransferInitiationV03 value)" }, { "name": "willuhn$hbci4java", "new_args": "CustomerPaymentStatusReportV03 value", "new_implementation": null, "new_return_type": "void", "new_signature": "void setCstmrPmtStsRpt(CustomerPaymentStatusReportV03 value)", "old_args": "CustomerCreditTransferInitiationV03 value", "old_implementation": null, "old_return_type": "void", "old_signature": "void setCstmrCdtTrfInitn(CustomerCreditTransferInitiationV03 value)" }, { "name": "willuhn$hbci4java", "new_args": "Pain00800101 value", "new_implementation": null, "new_return_type": "void", "new_signature": "void setPain00800101(Pain00800101 value)", "old_args": "CustomerCreditTransferInitiationV03 value", "old_implementation": null, "old_return_type": "void", "old_signature": "void setCstmrCdtTrfInitn(CustomerCreditTransferInitiationV03 value)" }, { "name": "willuhn$hbci4java", "new_args": "Pain00800101 value", "new_implementation": null, "new_return_type": "void", "new_signature": "void setPain00800101(Pain00800101 value)", "old_args": "CustomerCreditTransferInitiationV03 value", "old_implementation": null, "old_return_type": "void", "old_signature": "void setCstmrCdtTrfInitn(CustomerCreditTransferInitiationV03 value)" } ]
[ { "additions": 5, "blob_url": "https://github.com/willuhn/hbci4java/blob/0f60d39106094eb564d221904d2bb7a6dc39102d/build.xml", "changes": 10, "contents_url": "https://api.github.com/repos/willuhn/hbci4java/contents/build.xml?ref=0f60d39106094eb564d221904d2bb7a6dc39102d", "deletions": 5, "filename": "build.xml", "new_code": "\t\t\t<param name=\"param.schema\" value=\"pain.002.003.03.xsd\" />\n\t\t\t<param name=\"param.schema\" value=\"pain.008.001.01.xsd\" />\n\t\t\t<param name=\"param.schema\" value=\"pain.008.002.01.xsd\" />\n\t\t\t<param name=\"param.schema\" value=\"pain.008.002.02.xsd\" />\n\t\t\t<param name=\"param.schema\" value=\"pain.008.003.02.xsd\" />", "new_methods": [], "old_code": "\t\t\t<param name=\"param.schema\" value=\"pain.001.003.03.xsd\" />\n\t\t\t<param name=\"param.schema\" value=\"pain.001.003.03.xsd\" />\n\t\t\t<param name=\"param.schema\" value=\"pain.001.003.03.xsd\" />\n\t\t\t<param name=\"param.schema\" value=\"pain.001.003.03.xsd\" />\n\t\t\t<param name=\"param.schema\" value=\"pain.001.003.03.xsd\" />", "old_methods": [], "patch": "@@ -37,24 +37,24 @@\n \t\t</antcall>\n \t\t<antcall target=\"sub_jaxb\">\n \t\t\t<param name=\"param.package\" value=\"pain_002_003_03\" />\n-\t\t\t<param name=\"param.schema\" value=\"pain.001.003.03.xsd\" />\n+\t\t\t<param name=\"param.schema\" value=\"pain.002.003.03.xsd\" />\n \t\t</antcall>\n \t\t\n \t\t<antcall target=\"sub_jaxb\">\n \t\t\t<param name=\"param.package\" value=\"pain_008_001_01\" />\n-\t\t\t<param name=\"param.schema\" value=\"pain.001.003.03.xsd\" />\n+\t\t\t<param name=\"param.schema\" value=\"pain.008.001.01.xsd\" />\n \t\t</antcall>\n \t\t<antcall target=\"sub_jaxb\">\n \t\t\t<param name=\"param.package\" value=\"pain_008_002_01\" />\n-\t\t\t<param name=\"param.schema\" value=\"pain.001.003.03.xsd\" />\n+\t\t\t<param name=\"param.schema\" value=\"pain.008.002.01.xsd\" />\n \t\t</antcall>\n \t\t<antcall target=\"sub_jaxb\">\n \t\t\t<param name=\"param.package\" value=\"pain_008_002_02\" />\n-\t\t\t<param name=\"param.schema\" value=\"pain.001.003.03.xsd\" />\n+\t\t\t<param name=\"param.schema\" value=\"pain.008.002.02.xsd\" />\n \t\t</antcall>\n \t\t<antcall target=\"sub_jaxb\">\n \t\t\t<param name=\"param.package\" value=\"pain_008_003_02\" />\n-\t\t\t<param name=\"param.schema\" value=\"pain.001.003.03.xsd\" />\n+\t\t\t<param name=\"param.schema\" value=\"pain.008.003.02.xsd\" />\n \t\t</antcall>\n \t</target>\n \t<!--", "raw_url": "https://github.com/willuhn/hbci4java/raw/0f60d39106094eb564d221904d2bb7a6dc39102d/build.xml", "sha": "11659deb18716e615ca25b4b1ba9a80a4d10a4a4", "status": "modified" }, { "additions": 3, "blob_url": "https://github.com/willuhn/hbci4java/blob/0f60d39106094eb564d221904d2bb7a6dc39102d/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_002_003_03%2FAccountIdentificationSEPA.java", "changes": 6, "contents_url": "https://api.github.com/repos/willuhn/hbci4java/contents/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_002_003_03%2FAccountIdentificationSEPA.java?ref=0f60d39106094eb564d221904d2bb7a6dc39102d", "deletions": 3, "filename": "src/org/kapott/hbci/sepa/jaxb/pain_002_003_03/AccountIdentificationSEPA.java", "new_code": " * &lt;element name=\"IBAN\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.002.003.03}IBAN2007Identifier\"/>\n@XmlType(name = \"AccountIdentificationSEPA\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\", propOrder = {\n @XmlElement(name = \"IBAN\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\", required = true)", "new_methods": [], "old_code": " * &lt;element name=\"IBAN\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}IBAN2007Identifier\"/>\n@XmlType(name = \"AccountIdentificationSEPA\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", propOrder = {\n @XmlElement(name = \"IBAN\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", required = true)", "old_methods": [], "patch": "@@ -17,7 +17,7 @@\n * &lt;complexContent>\n * &lt;restriction base=\"{http://www.w3.org/2001/XMLSchema}anyType\">\n * &lt;sequence>\n- * &lt;element name=\"IBAN\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}IBAN2007Identifier\"/>\n+ * &lt;element name=\"IBAN\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.002.003.03}IBAN2007Identifier\"/>\n * &lt;/sequence>\n * &lt;/restriction>\n * &lt;/complexContent>\n@@ -27,12 +27,12 @@\n * \n */\n @XmlAccessorType(XmlAccessType.FIELD)\n-@XmlType(name = \"AccountIdentificationSEPA\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", propOrder = {\n+@XmlType(name = \"AccountIdentificationSEPA\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\", propOrder = {\n \"iban\"\n })\n public class AccountIdentificationSEPA {\n \n- @XmlElement(name = \"IBAN\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", required = true)\n+ @XmlElement(name = \"IBAN\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\", required = true)\n protected String iban;\n \n /**", "raw_url": "https://github.com/willuhn/hbci4java/raw/0f60d39106094eb564d221904d2bb7a6dc39102d/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_002_003_03%2FAccountIdentificationSEPA.java", "sha": "672b4fceae4c62181df7483542b7bbd9cb5e2f90", "status": "modified" }, { "additions": 3, "blob_url": "https://github.com/willuhn/hbci4java/blob/0f60d39106094eb564d221904d2bb7a6dc39102d/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_002_003_03%2FActiveOrHistoricCurrencyAndAmountSEPA.java", "changes": 6, "contents_url": "https://api.github.com/repos/willuhn/hbci4java/contents/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_002_003_03%2FActiveOrHistoricCurrencyAndAmountSEPA.java?ref=0f60d39106094eb564d221904d2bb7a6dc39102d", "deletions": 3, "filename": "src/org/kapott/hbci/sepa/jaxb/pain_002_003_03/ActiveOrHistoricCurrencyAndAmountSEPA.java", "new_code": " * &lt;extension base=\"&lt;urn:iso:std:iso:20022:tech:xsd:pain.002.003.03>ActiveOrHistoricCurrencyAndAmount_SimpleTypeSEPA\">\n * &lt;attribute name=\"Ccy\" use=\"required\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.002.003.03}ActiveOrHistoricCurrencyCodeEUR\" />\n@XmlType(name = \"ActiveOrHistoricCurrencyAndAmountSEPA\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\", propOrder = {", "new_methods": [], "old_code": " * &lt;extension base=\"&lt;urn:iso:std:iso:20022:tech:xsd:pain.001.003.03>ActiveOrHistoricCurrencyAndAmount_SimpleTypeSEPA\">\n * &lt;attribute name=\"Ccy\" use=\"required\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}ActiveOrHistoricCurrencyCodeEUR\" />\n@XmlType(name = \"ActiveOrHistoricCurrencyAndAmountSEPA\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", propOrder = {", "old_methods": [], "patch": "@@ -17,8 +17,8 @@\n * <pre>\n * &lt;complexType name=\"ActiveOrHistoricCurrencyAndAmountSEPA\">\n * &lt;simpleContent>\n- * &lt;extension base=\"&lt;urn:iso:std:iso:20022:tech:xsd:pain.001.003.03>ActiveOrHistoricCurrencyAndAmount_SimpleTypeSEPA\">\n- * &lt;attribute name=\"Ccy\" use=\"required\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}ActiveOrHistoricCurrencyCodeEUR\" />\n+ * &lt;extension base=\"&lt;urn:iso:std:iso:20022:tech:xsd:pain.002.003.03>ActiveOrHistoricCurrencyAndAmount_SimpleTypeSEPA\">\n+ * &lt;attribute name=\"Ccy\" use=\"required\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.002.003.03}ActiveOrHistoricCurrencyCodeEUR\" />\n * &lt;/extension>\n * &lt;/simpleContent>\n * &lt;/complexType>\n@@ -27,7 +27,7 @@\n * \n */\n @XmlAccessorType(XmlAccessType.FIELD)\n-@XmlType(name = \"ActiveOrHistoricCurrencyAndAmountSEPA\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", propOrder = {\n+@XmlType(name = \"ActiveOrHistoricCurrencyAndAmountSEPA\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\", propOrder = {\n \"value\"\n })\n public class ActiveOrHistoricCurrencyAndAmountSEPA {", "raw_url": "https://github.com/willuhn/hbci4java/raw/0f60d39106094eb564d221904d2bb7a6dc39102d/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_002_003_03%2FActiveOrHistoricCurrencyAndAmountSEPA.java", "sha": "a26749f6f7d892cfdc401de9a7d6105b8f2ba186", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/willuhn/hbci4java/blob/0f60d39106094eb564d221904d2bb7a6dc39102d/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_002_003_03%2FActiveOrHistoricCurrencyCodeEUR.java", "changes": 2, "contents_url": "https://api.github.com/repos/willuhn/hbci4java/contents/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_002_003_03%2FActiveOrHistoricCurrencyCodeEUR.java?ref=0f60d39106094eb564d221904d2bb7a6dc39102d", "deletions": 1, "filename": "src/org/kapott/hbci/sepa/jaxb/pain_002_003_03/ActiveOrHistoricCurrencyCodeEUR.java", "new_code": "@XmlType(name = \"ActiveOrHistoricCurrencyCodeEUR\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\")", "new_methods": [], "old_code": "@XmlType(name = \"ActiveOrHistoricCurrencyCodeEUR\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\")", "old_methods": [], "patch": "@@ -19,7 +19,7 @@\n * </pre>\n * \n */\n-@XmlType(name = \"ActiveOrHistoricCurrencyCodeEUR\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\")\n+@XmlType(name = \"ActiveOrHistoricCurrencyCodeEUR\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\")\n @XmlEnum\n public enum ActiveOrHistoricCurrencyCodeEUR {\n ", "raw_url": "https://github.com/willuhn/hbci4java/raw/0f60d39106094eb564d221904d2bb7a6dc39102d/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_002_003_03%2FActiveOrHistoricCurrencyCodeEUR.java", "sha": "546b377cd2d3020d912245a299f466d3be068103", "status": "modified" }, { "additions": 3, "blob_url": "https://github.com/willuhn/hbci4java/blob/0f60d39106094eb564d221904d2bb7a6dc39102d/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_002_003_03%2FAmountTypeSEPA.java", "changes": 6, "contents_url": "https://api.github.com/repos/willuhn/hbci4java/contents/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_002_003_03%2FAmountTypeSEPA.java?ref=0f60d39106094eb564d221904d2bb7a6dc39102d", "deletions": 3, "filename": "src/org/kapott/hbci/sepa/jaxb/pain_002_003_03/AmountTypeSEPA.java", "new_code": " * &lt;element name=\"InstdAmt\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.002.003.03}ActiveOrHistoricCurrencyAndAmountSEPA\"/>\n@XmlType(name = \"AmountTypeSEPA\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\", propOrder = {\n @XmlElement(name = \"InstdAmt\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\", required = true)", "new_methods": [], "old_code": " * &lt;element name=\"InstdAmt\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}ActiveOrHistoricCurrencyAndAmountSEPA\"/>\n@XmlType(name = \"AmountTypeSEPA\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", propOrder = {\n @XmlElement(name = \"InstdAmt\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", required = true)", "old_methods": [], "patch": "@@ -17,7 +17,7 @@\n * &lt;complexContent>\n * &lt;restriction base=\"{http://www.w3.org/2001/XMLSchema}anyType\">\n * &lt;sequence>\n- * &lt;element name=\"InstdAmt\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}ActiveOrHistoricCurrencyAndAmountSEPA\"/>\n+ * &lt;element name=\"InstdAmt\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.002.003.03}ActiveOrHistoricCurrencyAndAmountSEPA\"/>\n * &lt;/sequence>\n * &lt;/restriction>\n * &lt;/complexContent>\n@@ -27,12 +27,12 @@\n * \n */\n @XmlAccessorType(XmlAccessType.FIELD)\n-@XmlType(name = \"AmountTypeSEPA\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", propOrder = {\n+@XmlType(name = \"AmountTypeSEPA\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\", propOrder = {\n \"instdAmt\"\n })\n public class AmountTypeSEPA {\n \n- @XmlElement(name = \"InstdAmt\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", required = true)\n+ @XmlElement(name = \"InstdAmt\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\", required = true)\n protected ActiveOrHistoricCurrencyAndAmountSEPA instdAmt;\n \n /**", "raw_url": "https://github.com/willuhn/hbci4java/raw/0f60d39106094eb564d221904d2bb7a6dc39102d/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_002_003_03%2FAmountTypeSEPA.java", "sha": "35971cb0ddf41c006d2b90fd0794a92b115e8720", "status": "modified" }, { "additions": 3, "blob_url": "https://github.com/willuhn/hbci4java/blob/0f60d39106094eb564d221904d2bb7a6dc39102d/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_002_003_03%2FBranchAndFinancialInstitutionIdentificationSEPA1.java", "changes": 6, "contents_url": "https://api.github.com/repos/willuhn/hbci4java/contents/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_002_003_03%2FBranchAndFinancialInstitutionIdentificationSEPA1.java?ref=0f60d39106094eb564d221904d2bb7a6dc39102d", "deletions": 3, "filename": "src/org/kapott/hbci/sepa/jaxb/pain_002_003_03/BranchAndFinancialInstitutionIdentificationSEPA1.java", "new_code": " * &lt;element name=\"FinInstnId\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.002.003.03}FinancialInstitutionIdentificationSEPA1\"/>\n@XmlType(name = \"BranchAndFinancialInstitutionIdentificationSEPA1\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\", propOrder = {\n @XmlElement(name = \"FinInstnId\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\", required = true)", "new_methods": [], "old_code": " * &lt;element name=\"FinInstnId\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}FinancialInstitutionIdentificationSEPA1\"/>\n@XmlType(name = \"BranchAndFinancialInstitutionIdentificationSEPA1\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", propOrder = {\n @XmlElement(name = \"FinInstnId\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", required = true)", "old_methods": [], "patch": "@@ -17,7 +17,7 @@\n * &lt;complexContent>\n * &lt;restriction base=\"{http://www.w3.org/2001/XMLSchema}anyType\">\n * &lt;sequence>\n- * &lt;element name=\"FinInstnId\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}FinancialInstitutionIdentificationSEPA1\"/>\n+ * &lt;element name=\"FinInstnId\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.002.003.03}FinancialInstitutionIdentificationSEPA1\"/>\n * &lt;/sequence>\n * &lt;/restriction>\n * &lt;/complexContent>\n@@ -27,12 +27,12 @@\n * \n */\n @XmlAccessorType(XmlAccessType.FIELD)\n-@XmlType(name = \"BranchAndFinancialInstitutionIdentificationSEPA1\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", propOrder = {\n+@XmlType(name = \"BranchAndFinancialInstitutionIdentificationSEPA1\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\", propOrder = {\n \"finInstnId\"\n })\n public class BranchAndFinancialInstitutionIdentificationSEPA1 {\n \n- @XmlElement(name = \"FinInstnId\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", required = true)\n+ @XmlElement(name = \"FinInstnId\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\", required = true)\n protected FinancialInstitutionIdentificationSEPA1 finInstnId;\n \n /**", "raw_url": "https://github.com/willuhn/hbci4java/raw/0f60d39106094eb564d221904d2bb7a6dc39102d/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_002_003_03%2FBranchAndFinancialInstitutionIdentificationSEPA1.java", "sha": "001748ee3e0a5197c8c5a9709c01d8e66497dd5b", "status": "modified" }, { "additions": 3, "blob_url": "https://github.com/willuhn/hbci4java/blob/0f60d39106094eb564d221904d2bb7a6dc39102d/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_002_003_03%2FBranchAndFinancialInstitutionIdentificationSEPA3.java", "changes": 6, "contents_url": "https://api.github.com/repos/willuhn/hbci4java/contents/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_002_003_03%2FBranchAndFinancialInstitutionIdentificationSEPA3.java?ref=0f60d39106094eb564d221904d2bb7a6dc39102d", "deletions": 3, "filename": "src/org/kapott/hbci/sepa/jaxb/pain_002_003_03/BranchAndFinancialInstitutionIdentificationSEPA3.java", "new_code": " * &lt;element name=\"FinInstnId\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.002.003.03}FinancialInstitutionIdentificationSEPA3\"/>\n@XmlType(name = \"BranchAndFinancialInstitutionIdentificationSEPA3\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\", propOrder = {\n @XmlElement(name = \"FinInstnId\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\", required = true)", "new_methods": [], "old_code": " * &lt;element name=\"FinInstnId\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}FinancialInstitutionIdentificationSEPA3\"/>\n@XmlType(name = \"BranchAndFinancialInstitutionIdentificationSEPA3\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", propOrder = {\n @XmlElement(name = \"FinInstnId\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", required = true)", "old_methods": [], "patch": "@@ -17,7 +17,7 @@\n * &lt;complexContent>\n * &lt;restriction base=\"{http://www.w3.org/2001/XMLSchema}anyType\">\n * &lt;sequence>\n- * &lt;element name=\"FinInstnId\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}FinancialInstitutionIdentificationSEPA3\"/>\n+ * &lt;element name=\"FinInstnId\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.002.003.03}FinancialInstitutionIdentificationSEPA3\"/>\n * &lt;/sequence>\n * &lt;/restriction>\n * &lt;/complexContent>\n@@ -27,12 +27,12 @@\n * \n */\n @XmlAccessorType(XmlAccessType.FIELD)\n-@XmlType(name = \"BranchAndFinancialInstitutionIdentificationSEPA3\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", propOrder = {\n+@XmlType(name = \"BranchAndFinancialInstitutionIdentificationSEPA3\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\", propOrder = {\n \"finInstnId\"\n })\n public class BranchAndFinancialInstitutionIdentificationSEPA3 {\n \n- @XmlElement(name = \"FinInstnId\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", required = true)\n+ @XmlElement(name = \"FinInstnId\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\", required = true)\n protected FinancialInstitutionIdentificationSEPA3 finInstnId;\n \n /**", "raw_url": "https://github.com/willuhn/hbci4java/raw/0f60d39106094eb564d221904d2bb7a6dc39102d/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_002_003_03%2FBranchAndFinancialInstitutionIdentificationSEPA3.java", "sha": "5f9234ef47e7cbe1b3fe19c127c38d9321943c64", "status": "modified" }, { "additions": 5, "blob_url": "https://github.com/willuhn/hbci4java/blob/0f60d39106094eb564d221904d2bb7a6dc39102d/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_002_003_03%2FCashAccountSEPA1.java", "changes": 10, "contents_url": "https://api.github.com/repos/willuhn/hbci4java/contents/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_002_003_03%2FCashAccountSEPA1.java?ref=0f60d39106094eb564d221904d2bb7a6dc39102d", "deletions": 5, "filename": "src/org/kapott/hbci/sepa/jaxb/pain_002_003_03/CashAccountSEPA1.java", "new_code": " * &lt;element name=\"Id\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.002.003.03}AccountIdentificationSEPA\"/>\n * &lt;element name=\"Ccy\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.002.003.03}ActiveOrHistoricCurrencyCode\" minOccurs=\"0\"/>\n@XmlType(name = \"CashAccountSEPA1\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\", propOrder = {\n @XmlElement(name = \"Id\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\", required = true)\n @XmlElement(name = \"Ccy\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\")", "new_methods": [], "old_code": " * &lt;element name=\"Id\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}AccountIdentificationSEPA\"/>\n * &lt;element name=\"Ccy\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}ActiveOrHistoricCurrencyCode\" minOccurs=\"0\"/>\n@XmlType(name = \"CashAccountSEPA1\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", propOrder = {\n @XmlElement(name = \"Id\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", required = true)\n @XmlElement(name = \"Ccy\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\")", "old_methods": [], "patch": "@@ -17,8 +17,8 @@\n * &lt;complexContent>\n * &lt;restriction base=\"{http://www.w3.org/2001/XMLSchema}anyType\">\n * &lt;sequence>\n- * &lt;element name=\"Id\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}AccountIdentificationSEPA\"/>\n- * &lt;element name=\"Ccy\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}ActiveOrHistoricCurrencyCode\" minOccurs=\"0\"/>\n+ * &lt;element name=\"Id\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.002.003.03}AccountIdentificationSEPA\"/>\n+ * &lt;element name=\"Ccy\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.002.003.03}ActiveOrHistoricCurrencyCode\" minOccurs=\"0\"/>\n * &lt;/sequence>\n * &lt;/restriction>\n * &lt;/complexContent>\n@@ -28,15 +28,15 @@\n * \n */\n @XmlAccessorType(XmlAccessType.FIELD)\n-@XmlType(name = \"CashAccountSEPA1\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", propOrder = {\n+@XmlType(name = \"CashAccountSEPA1\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\", propOrder = {\n \"id\",\n \"ccy\"\n })\n public class CashAccountSEPA1 {\n \n- @XmlElement(name = \"Id\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", required = true)\n+ @XmlElement(name = \"Id\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\", required = true)\n protected AccountIdentificationSEPA id;\n- @XmlElement(name = \"Ccy\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\")\n+ @XmlElement(name = \"Ccy\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\")\n protected String ccy;\n \n /**", "raw_url": "https://github.com/willuhn/hbci4java/raw/0f60d39106094eb564d221904d2bb7a6dc39102d/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_002_003_03%2FCashAccountSEPA1.java", "sha": "d4bef7d40caeda181c5d6244b25523d11b26a141", "status": "modified" }, { "additions": 3, "blob_url": "https://github.com/willuhn/hbci4java/blob/0f60d39106094eb564d221904d2bb7a6dc39102d/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_002_003_03%2FCashAccountSEPA2.java", "changes": 6, "contents_url": "https://api.github.com/repos/willuhn/hbci4java/contents/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_002_003_03%2FCashAccountSEPA2.java?ref=0f60d39106094eb564d221904d2bb7a6dc39102d", "deletions": 3, "filename": "src/org/kapott/hbci/sepa/jaxb/pain_002_003_03/CashAccountSEPA2.java", "new_code": " * &lt;element name=\"Id\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.002.003.03}AccountIdentificationSEPA\"/>\n@XmlType(name = \"CashAccountSEPA2\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\", propOrder = {\n @XmlElement(name = \"Id\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\", required = true)", "new_methods": [], "old_code": " * &lt;element name=\"Id\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}AccountIdentificationSEPA\"/>\n@XmlType(name = \"CashAccountSEPA2\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", propOrder = {\n @XmlElement(name = \"Id\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", required = true)", "old_methods": [], "patch": "@@ -17,7 +17,7 @@\n * &lt;complexContent>\n * &lt;restriction base=\"{http://www.w3.org/2001/XMLSchema}anyType\">\n * &lt;sequence>\n- * &lt;element name=\"Id\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}AccountIdentificationSEPA\"/>\n+ * &lt;element name=\"Id\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.002.003.03}AccountIdentificationSEPA\"/>\n * &lt;/sequence>\n * &lt;/restriction>\n * &lt;/complexContent>\n@@ -27,12 +27,12 @@\n * \n */\n @XmlAccessorType(XmlAccessType.FIELD)\n-@XmlType(name = \"CashAccountSEPA2\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", propOrder = {\n+@XmlType(name = \"CashAccountSEPA2\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\", propOrder = {\n \"id\"\n })\n public class CashAccountSEPA2 {\n \n- @XmlElement(name = \"Id\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", required = true)\n+ @XmlElement(name = \"Id\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\", required = true)\n protected AccountIdentificationSEPA id;\n \n /**", "raw_url": "https://github.com/willuhn/hbci4java/raw/0f60d39106094eb564d221904d2bb7a6dc39102d/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_002_003_03%2FCashAccountSEPA2.java", "sha": "f7f016156ae867d50499e2edbd3a512105fdce6d", "status": "modified" }, { "additions": 3, "blob_url": "https://github.com/willuhn/hbci4java/blob/0f60d39106094eb564d221904d2bb7a6dc39102d/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_002_003_03%2FCategoryPurposeSEPA.java", "changes": 6, "contents_url": "https://api.github.com/repos/willuhn/hbci4java/contents/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_002_003_03%2FCategoryPurposeSEPA.java?ref=0f60d39106094eb564d221904d2bb7a6dc39102d", "deletions": 3, "filename": "src/org/kapott/hbci/sepa/jaxb/pain_002_003_03/CategoryPurposeSEPA.java", "new_code": " * &lt;element name=\"Cd\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.002.003.03}ExternalCategoryPurpose1Code\"/>\n@XmlType(name = \"CategoryPurposeSEPA\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\", propOrder = {\n @XmlElement(name = \"Cd\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\", required = true)", "new_methods": [], "old_code": " * &lt;element name=\"Cd\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}ExternalCategoryPurpose1Code\"/>\n@XmlType(name = \"CategoryPurposeSEPA\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", propOrder = {\n @XmlElement(name = \"Cd\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", required = true)", "old_methods": [], "patch": "@@ -17,7 +17,7 @@\n * &lt;complexContent>\n * &lt;restriction base=\"{http://www.w3.org/2001/XMLSchema}anyType\">\n * &lt;sequence>\n- * &lt;element name=\"Cd\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}ExternalCategoryPurpose1Code\"/>\n+ * &lt;element name=\"Cd\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.002.003.03}ExternalCategoryPurpose1Code\"/>\n * &lt;/sequence>\n * &lt;/restriction>\n * &lt;/complexContent>\n@@ -27,12 +27,12 @@\n * \n */\n @XmlAccessorType(XmlAccessType.FIELD)\n-@XmlType(name = \"CategoryPurposeSEPA\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", propOrder = {\n+@XmlType(name = \"CategoryPurposeSEPA\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\", propOrder = {\n \"cd\"\n })\n public class CategoryPurposeSEPA {\n \n- @XmlElement(name = \"Cd\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", required = true)\n+ @XmlElement(name = \"Cd\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\", required = true)\n protected String cd;\n \n /**", "raw_url": "https://github.com/willuhn/hbci4java/raw/0f60d39106094eb564d221904d2bb7a6dc39102d/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_002_003_03%2FCategoryPurposeSEPA.java", "sha": "ca4bbd07ba6412387059e18e823718f67c625728", "status": "modified" }, { "additions": 3, "blob_url": "https://github.com/willuhn/hbci4java/blob/0f60d39106094eb564d221904d2bb7a6dc39102d/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_002_003_03%2FCreditorReferenceTypeCodeSEPA.java", "changes": 6, "contents_url": "https://api.github.com/repos/willuhn/hbci4java/contents/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_002_003_03%2FCreditorReferenceTypeCodeSEPA.java?ref=0f60d39106094eb564d221904d2bb7a6dc39102d", "deletions": 3, "filename": "src/org/kapott/hbci/sepa/jaxb/pain_002_003_03/CreditorReferenceTypeCodeSEPA.java", "new_code": " * &lt;element name=\"Cd\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.002.003.03}DocumentType3CodeSEPA\"/>\n@XmlType(name = \"CreditorReferenceTypeCodeSEPA\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\", propOrder = {\n @XmlElement(name = \"Cd\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\", required = true)", "new_methods": [], "old_code": " * &lt;element name=\"Cd\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}DocumentType3CodeSEPA\"/>\n@XmlType(name = \"CreditorReferenceTypeCodeSEPA\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", propOrder = {\n @XmlElement(name = \"Cd\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", required = true)", "old_methods": [], "patch": "@@ -17,7 +17,7 @@\n * &lt;complexContent>\n * &lt;restriction base=\"{http://www.w3.org/2001/XMLSchema}anyType\">\n * &lt;sequence>\n- * &lt;element name=\"Cd\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}DocumentType3CodeSEPA\"/>\n+ * &lt;element name=\"Cd\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.002.003.03}DocumentType3CodeSEPA\"/>\n * &lt;/sequence>\n * &lt;/restriction>\n * &lt;/complexContent>\n@@ -27,12 +27,12 @@\n * \n */\n @XmlAccessorType(XmlAccessType.FIELD)\n-@XmlType(name = \"CreditorReferenceTypeCodeSEPA\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", propOrder = {\n+@XmlType(name = \"CreditorReferenceTypeCodeSEPA\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\", propOrder = {\n \"cd\"\n })\n public class CreditorReferenceTypeCodeSEPA {\n \n- @XmlElement(name = \"Cd\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", required = true)\n+ @XmlElement(name = \"Cd\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\", required = true)\n protected DocumentType3CodeSEPA cd;\n \n /**", "raw_url": "https://github.com/willuhn/hbci4java/raw/0f60d39106094eb564d221904d2bb7a6dc39102d/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_002_003_03%2FCreditorReferenceTypeCodeSEPA.java", "sha": "06268d6a0010af872017e3e4fce11cdebd0376ed", "status": "modified" }, { "additions": 5, "blob_url": "https://github.com/willuhn/hbci4java/blob/0f60d39106094eb564d221904d2bb7a6dc39102d/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_002_003_03%2FCreditorReferenceTypeSEPA.java", "changes": 10, "contents_url": "https://api.github.com/repos/willuhn/hbci4java/contents/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_002_003_03%2FCreditorReferenceTypeSEPA.java?ref=0f60d39106094eb564d221904d2bb7a6dc39102d", "deletions": 5, "filename": "src/org/kapott/hbci/sepa/jaxb/pain_002_003_03/CreditorReferenceTypeSEPA.java", "new_code": " * &lt;element name=\"CdOrPrtry\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.002.003.03}CreditorReferenceTypeCodeSEPA\"/>\n * &lt;element name=\"Issr\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.002.003.03}Max35Text\" minOccurs=\"0\"/>\n@XmlType(name = \"CreditorReferenceTypeSEPA\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\", propOrder = {\n @XmlElement(name = \"CdOrPrtry\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\", required = true)\n @XmlElement(name = \"Issr\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\")", "new_methods": [], "old_code": " * &lt;element name=\"CdOrPrtry\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}CreditorReferenceTypeCodeSEPA\"/>\n * &lt;element name=\"Issr\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}Max35Text\" minOccurs=\"0\"/>\n@XmlType(name = \"CreditorReferenceTypeSEPA\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", propOrder = {\n @XmlElement(name = \"CdOrPrtry\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", required = true)\n @XmlElement(name = \"Issr\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\")", "old_methods": [], "patch": "@@ -17,8 +17,8 @@\n * &lt;complexContent>\n * &lt;restriction base=\"{http://www.w3.org/2001/XMLSchema}anyType\">\n * &lt;sequence>\n- * &lt;element name=\"CdOrPrtry\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}CreditorReferenceTypeCodeSEPA\"/>\n- * &lt;element name=\"Issr\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}Max35Text\" minOccurs=\"0\"/>\n+ * &lt;element name=\"CdOrPrtry\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.002.003.03}CreditorReferenceTypeCodeSEPA\"/>\n+ * &lt;element name=\"Issr\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.002.003.03}Max35Text\" minOccurs=\"0\"/>\n * &lt;/sequence>\n * &lt;/restriction>\n * &lt;/complexContent>\n@@ -28,15 +28,15 @@\n * \n */\n @XmlAccessorType(XmlAccessType.FIELD)\n-@XmlType(name = \"CreditorReferenceTypeSEPA\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", propOrder = {\n+@XmlType(name = \"CreditorReferenceTypeSEPA\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\", propOrder = {\n \"cdOrPrtry\",\n \"issr\"\n })\n public class CreditorReferenceTypeSEPA {\n \n- @XmlElement(name = \"CdOrPrtry\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", required = true)\n+ @XmlElement(name = \"CdOrPrtry\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\", required = true)\n protected CreditorReferenceTypeCodeSEPA cdOrPrtry;\n- @XmlElement(name = \"Issr\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\")\n+ @XmlElement(name = \"Issr\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\")\n protected String issr;\n \n /**", "raw_url": "https://github.com/willuhn/hbci4java/raw/0f60d39106094eb564d221904d2bb7a6dc39102d/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_002_003_03%2FCreditorReferenceTypeSEPA.java", "sha": "455855930354a91e91a04cda32e6876e475b6e0f", "status": "modified" }, { "additions": 9, "blob_url": "https://github.com/willuhn/hbci4java/blob/0f60d39106094eb564d221904d2bb7a6dc39102d/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_002_003_03%2FDateAndPlaceOfBirth.java", "changes": 18, "contents_url": "https://api.github.com/repos/willuhn/hbci4java/contents/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_002_003_03%2FDateAndPlaceOfBirth.java?ref=0f60d39106094eb564d221904d2bb7a6dc39102d", "deletions": 9, "filename": "src/org/kapott/hbci/sepa/jaxb/pain_002_003_03/DateAndPlaceOfBirth.java", "new_code": " * &lt;element name=\"BirthDt\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.002.003.03}ISODate\"/>\n * &lt;element name=\"PrvcOfBirth\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.002.003.03}Max35Text\" minOccurs=\"0\"/>\n * &lt;element name=\"CityOfBirth\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.002.003.03}Max35Text\"/>\n * &lt;element name=\"CtryOfBirth\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.002.003.03}CountryCode\"/>\n@XmlType(name = \"DateAndPlaceOfBirth\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\", propOrder = {\n @XmlElement(name = \"BirthDt\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\", required = true)\n @XmlElement(name = \"PrvcOfBirth\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\")\n @XmlElement(name = \"CityOfBirth\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\", required = true)\n @XmlElement(name = \"CtryOfBirth\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\", required = true)", "new_methods": [], "old_code": " * &lt;element name=\"BirthDt\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}ISODate\"/>\n * &lt;element name=\"PrvcOfBirth\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}Max35Text\" minOccurs=\"0\"/>\n * &lt;element name=\"CityOfBirth\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}Max35Text\"/>\n * &lt;element name=\"CtryOfBirth\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}CountryCode\"/>\n@XmlType(name = \"DateAndPlaceOfBirth\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", propOrder = {\n @XmlElement(name = \"BirthDt\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", required = true)\n @XmlElement(name = \"PrvcOfBirth\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\")\n @XmlElement(name = \"CityOfBirth\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", required = true)\n @XmlElement(name = \"CtryOfBirth\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", required = true)", "old_methods": [], "patch": "@@ -18,10 +18,10 @@\n * &lt;complexContent>\n * &lt;restriction base=\"{http://www.w3.org/2001/XMLSchema}anyType\">\n * &lt;sequence>\n- * &lt;element name=\"BirthDt\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}ISODate\"/>\n- * &lt;element name=\"PrvcOfBirth\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}Max35Text\" minOccurs=\"0\"/>\n- * &lt;element name=\"CityOfBirth\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}Max35Text\"/>\n- * &lt;element name=\"CtryOfBirth\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}CountryCode\"/>\n+ * &lt;element name=\"BirthDt\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.002.003.03}ISODate\"/>\n+ * &lt;element name=\"PrvcOfBirth\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.002.003.03}Max35Text\" minOccurs=\"0\"/>\n+ * &lt;element name=\"CityOfBirth\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.002.003.03}Max35Text\"/>\n+ * &lt;element name=\"CtryOfBirth\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.002.003.03}CountryCode\"/>\n * &lt;/sequence>\n * &lt;/restriction>\n * &lt;/complexContent>\n@@ -31,21 +31,21 @@\n * \n */\n @XmlAccessorType(XmlAccessType.FIELD)\n-@XmlType(name = \"DateAndPlaceOfBirth\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", propOrder = {\n+@XmlType(name = \"DateAndPlaceOfBirth\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\", propOrder = {\n \"birthDt\",\n \"prvcOfBirth\",\n \"cityOfBirth\",\n \"ctryOfBirth\"\n })\n public class DateAndPlaceOfBirth {\n \n- @XmlElement(name = \"BirthDt\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", required = true)\n+ @XmlElement(name = \"BirthDt\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\", required = true)\n protected XMLGregorianCalendar birthDt;\n- @XmlElement(name = \"PrvcOfBirth\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\")\n+ @XmlElement(name = \"PrvcOfBirth\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\")\n protected String prvcOfBirth;\n- @XmlElement(name = \"CityOfBirth\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", required = true)\n+ @XmlElement(name = \"CityOfBirth\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\", required = true)\n protected String cityOfBirth;\n- @XmlElement(name = \"CtryOfBirth\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", required = true)\n+ @XmlElement(name = \"CtryOfBirth\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\", required = true)\n protected String ctryOfBirth;\n \n /**", "raw_url": "https://github.com/willuhn/hbci4java/raw/0f60d39106094eb564d221904d2bb7a6dc39102d/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_002_003_03%2FDateAndPlaceOfBirth.java", "sha": "a53c0a31f493c42e54f893ea773b9c0faad351d6", "status": "modified" }, { "additions": 13, "blob_url": "https://github.com/willuhn/hbci4java/blob/0f60d39106094eb564d221904d2bb7a6dc39102d/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_002_003_03%2FDocument.java", "changes": 26, "contents_url": "https://api.github.com/repos/willuhn/hbci4java/contents/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_002_003_03%2FDocument.java?ref=0f60d39106094eb564d221904d2bb7a6dc39102d", "deletions": 13, "filename": "src/org/kapott/hbci/sepa/jaxb/pain_002_003_03/Document.java", "new_code": " * &lt;element name=\"CstmrPmtStsRpt\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.002.003.03}CustomerPaymentStatusReportV03\"/>\n@XmlType(name = \"Document\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\", propOrder = {\n \"cstmrPmtStsRpt\"\n @XmlElement(name = \"CstmrPmtStsRpt\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\", required = true)\n protected CustomerPaymentStatusReportV03 cstmrPmtStsRpt;\n * Gets the value of the cstmrPmtStsRpt property.\n * {@link CustomerPaymentStatusReportV03 }\n public CustomerPaymentStatusReportV03 getCstmrPmtStsRpt() {\n return cstmrPmtStsRpt;\n * Sets the value of the cstmrPmtStsRpt property.\n * {@link CustomerPaymentStatusReportV03 }\n public void setCstmrPmtStsRpt(CustomerPaymentStatusReportV03 value) {\n this.cstmrPmtStsRpt = value;", "new_methods": [ { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_002_003_03/Document.java", "implementation": "return cstmrPmtStsRpt;\n * Sets the value of the cstmrPmtStsRpt property.\n * {@link CustomerPaymentStatusReportV03", "signature": "CustomerPaymentStatusReportV03 getCstmrPmtStsRpt()" } ], "old_code": " * &lt;element name=\"CstmrCdtTrfInitn\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}CustomerCreditTransferInitiationV03\"/>\n@XmlType(name = \"Document\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", propOrder = {\n \"cstmrCdtTrfInitn\"\n @XmlElement(name = \"CstmrCdtTrfInitn\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", required = true)\n protected CustomerCreditTransferInitiationV03 cstmrCdtTrfInitn;\n * Gets the value of the cstmrCdtTrfInitn property.\n * {@link CustomerCreditTransferInitiationV03 }\n public CustomerCreditTransferInitiationV03 getCstmrCdtTrfInitn() {\n return cstmrCdtTrfInitn;\n * Sets the value of the cstmrCdtTrfInitn property.\n * {@link CustomerCreditTransferInitiationV03 }\n public void setCstmrCdtTrfInitn(CustomerCreditTransferInitiationV03 value) {\n this.cstmrCdtTrfInitn = value;", "old_methods": [ { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_002_003_03/Document.java", "implementation": "return cstmrCdtTrfInitn;\n * Sets the value of the cstmrCdtTrfInitn property.\n * {@link CustomerCreditTransferInitiationV03", "signature": "CustomerCreditTransferInitiationV03 getCstmrCdtTrfInitn()" } ], "patch": "@@ -17,7 +17,7 @@\n * &lt;complexContent>\n * &lt;restriction base=\"{http://www.w3.org/2001/XMLSchema}anyType\">\n * &lt;sequence>\n- * &lt;element name=\"CstmrCdtTrfInitn\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}CustomerCreditTransferInitiationV03\"/>\n+ * &lt;element name=\"CstmrPmtStsRpt\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.002.003.03}CustomerPaymentStatusReportV03\"/>\n * &lt;/sequence>\n * &lt;/restriction>\n * &lt;/complexContent>\n@@ -27,36 +27,36 @@\n * \n */\n @XmlAccessorType(XmlAccessType.FIELD)\n-@XmlType(name = \"Document\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", propOrder = {\n- \"cstmrCdtTrfInitn\"\n+@XmlType(name = \"Document\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\", propOrder = {\n+ \"cstmrPmtStsRpt\"\n })\n public class Document {\n \n- @XmlElement(name = \"CstmrCdtTrfInitn\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", required = true)\n- protected CustomerCreditTransferInitiationV03 cstmrCdtTrfInitn;\n+ @XmlElement(name = \"CstmrPmtStsRpt\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\", required = true)\n+ protected CustomerPaymentStatusReportV03 cstmrPmtStsRpt;\n \n /**\n- * Gets the value of the cstmrCdtTrfInitn property.\n+ * Gets the value of the cstmrPmtStsRpt property.\n * \n * @return\n * possible object is\n- * {@link CustomerCreditTransferInitiationV03 }\n+ * {@link CustomerPaymentStatusReportV03 }\n * \n */\n- public CustomerCreditTransferInitiationV03 getCstmrCdtTrfInitn() {\n- return cstmrCdtTrfInitn;\n+ public CustomerPaymentStatusReportV03 getCstmrPmtStsRpt() {\n+ return cstmrPmtStsRpt;\n }\n \n /**\n- * Sets the value of the cstmrCdtTrfInitn property.\n+ * Sets the value of the cstmrPmtStsRpt property.\n * \n * @param value\n * allowed object is\n- * {@link CustomerCreditTransferInitiationV03 }\n+ * {@link CustomerPaymentStatusReportV03 }\n * \n */\n- public void setCstmrCdtTrfInitn(CustomerCreditTransferInitiationV03 value) {\n- this.cstmrCdtTrfInitn = value;\n+ public void setCstmrPmtStsRpt(CustomerPaymentStatusReportV03 value) {\n+ this.cstmrPmtStsRpt = value;\n }\n \n }", "raw_url": "https://github.com/willuhn/hbci4java/raw/0f60d39106094eb564d221904d2bb7a6dc39102d/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_002_003_03%2FDocument.java", "sha": "9f29485b3201c6aab707ad8d970dd11b2611e0fb", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/willuhn/hbci4java/blob/0f60d39106094eb564d221904d2bb7a6dc39102d/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_002_003_03%2FDocumentType3CodeSEPA.java", "changes": 2, "contents_url": "https://api.github.com/repos/willuhn/hbci4java/contents/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_002_003_03%2FDocumentType3CodeSEPA.java?ref=0f60d39106094eb564d221904d2bb7a6dc39102d", "deletions": 1, "filename": "src/org/kapott/hbci/sepa/jaxb/pain_002_003_03/DocumentType3CodeSEPA.java", "new_code": "@XmlType(name = \"DocumentType3CodeSEPA\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\")", "new_methods": [], "old_code": "@XmlType(name = \"DocumentType3CodeSEPA\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\")", "old_methods": [], "patch": "@@ -19,7 +19,7 @@\n * </pre>\n * \n */\n-@XmlType(name = \"DocumentType3CodeSEPA\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\")\n+@XmlType(name = \"DocumentType3CodeSEPA\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\")\n @XmlEnum\n public enum DocumentType3CodeSEPA {\n ", "raw_url": "https://github.com/willuhn/hbci4java/raw/0f60d39106094eb564d221904d2bb7a6dc39102d/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_002_003_03%2FDocumentType3CodeSEPA.java", "sha": "b3aa4c0c99bb49cdb5fc2eb358ebe696303698d9", "status": "modified" }, { "additions": 3, "blob_url": "https://github.com/willuhn/hbci4java/blob/0f60d39106094eb564d221904d2bb7a6dc39102d/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_002_003_03%2FFinancialInstitutionIdentificationSEPA1.java", "changes": 6, "contents_url": "https://api.github.com/repos/willuhn/hbci4java/contents/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_002_003_03%2FFinancialInstitutionIdentificationSEPA1.java?ref=0f60d39106094eb564d221904d2bb7a6dc39102d", "deletions": 3, "filename": "src/org/kapott/hbci/sepa/jaxb/pain_002_003_03/FinancialInstitutionIdentificationSEPA1.java", "new_code": " * &lt;element name=\"BIC\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.002.003.03}BICIdentifier\"/>\n@XmlType(name = \"FinancialInstitutionIdentificationSEPA1\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\", propOrder = {\n @XmlElement(name = \"BIC\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\", required = true)", "new_methods": [], "old_code": " * &lt;element name=\"BIC\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}BICIdentifier\"/>\n@XmlType(name = \"FinancialInstitutionIdentificationSEPA1\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", propOrder = {\n @XmlElement(name = \"BIC\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", required = true)", "old_methods": [], "patch": "@@ -17,7 +17,7 @@\n * &lt;complexContent>\n * &lt;restriction base=\"{http://www.w3.org/2001/XMLSchema}anyType\">\n * &lt;sequence>\n- * &lt;element name=\"BIC\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}BICIdentifier\"/>\n+ * &lt;element name=\"BIC\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.002.003.03}BICIdentifier\"/>\n * &lt;/sequence>\n * &lt;/restriction>\n * &lt;/complexContent>\n@@ -27,12 +27,12 @@\n * \n */\n @XmlAccessorType(XmlAccessType.FIELD)\n-@XmlType(name = \"FinancialInstitutionIdentificationSEPA1\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", propOrder = {\n+@XmlType(name = \"FinancialInstitutionIdentificationSEPA1\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\", propOrder = {\n \"bic\"\n })\n public class FinancialInstitutionIdentificationSEPA1 {\n \n- @XmlElement(name = \"BIC\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", required = true)\n+ @XmlElement(name = \"BIC\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\", required = true)\n protected String bic;\n \n /**", "raw_url": "https://github.com/willuhn/hbci4java/raw/0f60d39106094eb564d221904d2bb7a6dc39102d/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_002_003_03%2FFinancialInstitutionIdentificationSEPA1.java", "sha": "a18e5d9cb19db51057e52de475de2570635edf9a", "status": "modified" }, { "additions": 5, "blob_url": "https://github.com/willuhn/hbci4java/blob/0f60d39106094eb564d221904d2bb7a6dc39102d/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_002_003_03%2FFinancialInstitutionIdentificationSEPA3.java", "changes": 10, "contents_url": "https://api.github.com/repos/willuhn/hbci4java/contents/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_002_003_03%2FFinancialInstitutionIdentificationSEPA3.java?ref=0f60d39106094eb564d221904d2bb7a6dc39102d", "deletions": 5, "filename": "src/org/kapott/hbci/sepa/jaxb/pain_002_003_03/FinancialInstitutionIdentificationSEPA3.java", "new_code": " * &lt;element name=\"BIC\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.002.003.03}BICIdentifier\"/>\n * &lt;element name=\"Othr\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.002.003.03}OthrIdentification\"/>\n@XmlType(name = \"FinancialInstitutionIdentificationSEPA3\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\", propOrder = {\n @XmlElement(name = \"BIC\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\")\n @XmlElement(name = \"Othr\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\")", "new_methods": [], "old_code": " * &lt;element name=\"BIC\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}BICIdentifier\"/>\n * &lt;element name=\"Othr\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}OthrIdentification\"/>\n@XmlType(name = \"FinancialInstitutionIdentificationSEPA3\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", propOrder = {\n @XmlElement(name = \"BIC\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\")\n @XmlElement(name = \"Othr\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\")", "old_methods": [], "patch": "@@ -18,8 +18,8 @@\n * &lt;restriction base=\"{http://www.w3.org/2001/XMLSchema}anyType\">\n * &lt;sequence>\n * &lt;choice>\n- * &lt;element name=\"BIC\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}BICIdentifier\"/>\n- * &lt;element name=\"Othr\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}OthrIdentification\"/>\n+ * &lt;element name=\"BIC\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.002.003.03}BICIdentifier\"/>\n+ * &lt;element name=\"Othr\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.002.003.03}OthrIdentification\"/>\n * &lt;/choice>\n * &lt;/sequence>\n * &lt;/restriction>\n@@ -30,15 +30,15 @@\n * \n */\n @XmlAccessorType(XmlAccessType.FIELD)\n-@XmlType(name = \"FinancialInstitutionIdentificationSEPA3\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", propOrder = {\n+@XmlType(name = \"FinancialInstitutionIdentificationSEPA3\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\", propOrder = {\n \"bic\",\n \"othr\"\n })\n public class FinancialInstitutionIdentificationSEPA3 {\n \n- @XmlElement(name = \"BIC\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\")\n+ @XmlElement(name = \"BIC\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\")\n protected String bic;\n- @XmlElement(name = \"Othr\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\")\n+ @XmlElement(name = \"Othr\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\")\n protected OthrIdentification othr;\n \n /**", "raw_url": "https://github.com/willuhn/hbci4java/raw/0f60d39106094eb564d221904d2bb7a6dc39102d/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_002_003_03%2FFinancialInstitutionIdentificationSEPA3.java", "sha": "fadc6948fa1118a5f30c26d282a463fdc9a85891", "status": "modified" }, { "additions": 7, "blob_url": "https://github.com/willuhn/hbci4java/blob/0f60d39106094eb564d221904d2bb7a6dc39102d/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_002_003_03%2FGenericOrganisationIdentification1.java", "changes": 14, "contents_url": "https://api.github.com/repos/willuhn/hbci4java/contents/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_002_003_03%2FGenericOrganisationIdentification1.java?ref=0f60d39106094eb564d221904d2bb7a6dc39102d", "deletions": 7, "filename": "src/org/kapott/hbci/sepa/jaxb/pain_002_003_03/GenericOrganisationIdentification1.java", "new_code": " * &lt;element name=\"Id\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.002.003.03}Max35Text\"/>\n * &lt;element name=\"SchmeNm\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.002.003.03}OrganisationIdentificationSchemeName1Choice\" minOccurs=\"0\"/>\n * &lt;element name=\"Issr\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.002.003.03}Max35Text\" minOccurs=\"0\"/>\n@XmlType(name = \"GenericOrganisationIdentification1\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\", propOrder = {\n @XmlElement(name = \"Id\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\", required = true)\n @XmlElement(name = \"SchmeNm\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\")\n @XmlElement(name = \"Issr\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\")", "new_methods": [], "old_code": " * &lt;element name=\"Id\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}Max35Text\"/>\n * &lt;element name=\"SchmeNm\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}OrganisationIdentificationSchemeName1Choice\" minOccurs=\"0\"/>\n * &lt;element name=\"Issr\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}Max35Text\" minOccurs=\"0\"/>\n@XmlType(name = \"GenericOrganisationIdentification1\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", propOrder = {\n @XmlElement(name = \"Id\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", required = true)\n @XmlElement(name = \"SchmeNm\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\")\n @XmlElement(name = \"Issr\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\")", "old_methods": [], "patch": "@@ -17,9 +17,9 @@\n * &lt;complexContent>\n * &lt;restriction base=\"{http://www.w3.org/2001/XMLSchema}anyType\">\n * &lt;sequence>\n- * &lt;element name=\"Id\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}Max35Text\"/>\n- * &lt;element name=\"SchmeNm\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}OrganisationIdentificationSchemeName1Choice\" minOccurs=\"0\"/>\n- * &lt;element name=\"Issr\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}Max35Text\" minOccurs=\"0\"/>\n+ * &lt;element name=\"Id\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.002.003.03}Max35Text\"/>\n+ * &lt;element name=\"SchmeNm\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.002.003.03}OrganisationIdentificationSchemeName1Choice\" minOccurs=\"0\"/>\n+ * &lt;element name=\"Issr\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.002.003.03}Max35Text\" minOccurs=\"0\"/>\n * &lt;/sequence>\n * &lt;/restriction>\n * &lt;/complexContent>\n@@ -29,18 +29,18 @@\n * \n */\n @XmlAccessorType(XmlAccessType.FIELD)\n-@XmlType(name = \"GenericOrganisationIdentification1\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", propOrder = {\n+@XmlType(name = \"GenericOrganisationIdentification1\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\", propOrder = {\n \"id\",\n \"schmeNm\",\n \"issr\"\n })\n public class GenericOrganisationIdentification1 {\n \n- @XmlElement(name = \"Id\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", required = true)\n+ @XmlElement(name = \"Id\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\", required = true)\n protected String id;\n- @XmlElement(name = \"SchmeNm\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\")\n+ @XmlElement(name = \"SchmeNm\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\")\n protected OrganisationIdentificationSchemeName1Choice schmeNm;\n- @XmlElement(name = \"Issr\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\")\n+ @XmlElement(name = \"Issr\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\")\n protected String issr;\n \n /**", "raw_url": "https://github.com/willuhn/hbci4java/raw/0f60d39106094eb564d221904d2bb7a6dc39102d/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_002_003_03%2FGenericOrganisationIdentification1.java", "sha": "0281f2914669453731f984dd8040951958a1bb70", "status": "modified" }, { "additions": 7, "blob_url": "https://github.com/willuhn/hbci4java/blob/0f60d39106094eb564d221904d2bb7a6dc39102d/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_002_003_03%2FGenericPersonIdentification1.java", "changes": 14, "contents_url": "https://api.github.com/repos/willuhn/hbci4java/contents/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_002_003_03%2FGenericPersonIdentification1.java?ref=0f60d39106094eb564d221904d2bb7a6dc39102d", "deletions": 7, "filename": "src/org/kapott/hbci/sepa/jaxb/pain_002_003_03/GenericPersonIdentification1.java", "new_code": " * &lt;element name=\"Id\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.002.003.03}Max35Text\"/>\n * &lt;element name=\"SchmeNm\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.002.003.03}PersonIdentificationSchemeName1Choice\" minOccurs=\"0\"/>\n * &lt;element name=\"Issr\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.002.003.03}Max35Text\" minOccurs=\"0\"/>\n@XmlType(name = \"GenericPersonIdentification1\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\", propOrder = {\n @XmlElement(name = \"Id\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\", required = true)\n @XmlElement(name = \"SchmeNm\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\")\n @XmlElement(name = \"Issr\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\")", "new_methods": [], "old_code": " * &lt;element name=\"Id\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}Max35Text\"/>\n * &lt;element name=\"SchmeNm\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}PersonIdentificationSchemeName1Choice\" minOccurs=\"0\"/>\n * &lt;element name=\"Issr\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}Max35Text\" minOccurs=\"0\"/>\n@XmlType(name = \"GenericPersonIdentification1\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", propOrder = {\n @XmlElement(name = \"Id\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", required = true)\n @XmlElement(name = \"SchmeNm\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\")\n @XmlElement(name = \"Issr\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\")", "old_methods": [], "patch": "@@ -17,9 +17,9 @@\n * &lt;complexContent>\n * &lt;restriction base=\"{http://www.w3.org/2001/XMLSchema}anyType\">\n * &lt;sequence>\n- * &lt;element name=\"Id\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}Max35Text\"/>\n- * &lt;element name=\"SchmeNm\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}PersonIdentificationSchemeName1Choice\" minOccurs=\"0\"/>\n- * &lt;element name=\"Issr\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}Max35Text\" minOccurs=\"0\"/>\n+ * &lt;element name=\"Id\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.002.003.03}Max35Text\"/>\n+ * &lt;element name=\"SchmeNm\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.002.003.03}PersonIdentificationSchemeName1Choice\" minOccurs=\"0\"/>\n+ * &lt;element name=\"Issr\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.002.003.03}Max35Text\" minOccurs=\"0\"/>\n * &lt;/sequence>\n * &lt;/restriction>\n * &lt;/complexContent>\n@@ -29,18 +29,18 @@\n * \n */\n @XmlAccessorType(XmlAccessType.FIELD)\n-@XmlType(name = \"GenericPersonIdentification1\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", propOrder = {\n+@XmlType(name = \"GenericPersonIdentification1\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\", propOrder = {\n \"id\",\n \"schmeNm\",\n \"issr\"\n })\n public class GenericPersonIdentification1 {\n \n- @XmlElement(name = \"Id\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", required = true)\n+ @XmlElement(name = \"Id\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\", required = true)\n protected String id;\n- @XmlElement(name = \"SchmeNm\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\")\n+ @XmlElement(name = \"SchmeNm\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\")\n protected PersonIdentificationSchemeName1Choice schmeNm;\n- @XmlElement(name = \"Issr\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\")\n+ @XmlElement(name = \"Issr\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\")\n protected String issr;\n \n /**", "raw_url": "https://github.com/willuhn/hbci4java/raw/0f60d39106094eb564d221904d2bb7a6dc39102d/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_002_003_03%2FGenericPersonIdentification1.java", "sha": "9bc78ec52846c03a11f5b963e4ea05e59483f0d7", "status": "modified" }, { "additions": 169, "blob_url": "https://github.com/willuhn/hbci4java/blob/0f60d39106094eb564d221904d2bb7a6dc39102d/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_002_003_03%2FObjectFactory.java", "changes": 210, "contents_url": "https://api.github.com/repos/willuhn/hbci4java/contents/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_002_003_03%2FObjectFactory.java?ref=0f60d39106094eb564d221904d2bb7a6dc39102d", "deletions": 41, "filename": "src/org/kapott/hbci/sepa/jaxb/pain_002_003_03/ObjectFactory.java", "new_code": " private final static QName _Document_QNAME = new QName(\"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\", \"Document\");\n * Create an instance of {@link FinancialInstitutionIdentificationSEPA1 }\n public FinancialInstitutionIdentificationSEPA1 createFinancialInstitutionIdentificationSEPA1() {\n return new FinancialInstitutionIdentificationSEPA1();\n * Create an instance of {@link FinancialInstitutionIdentificationSEPA2 }\n public FinancialInstitutionIdentificationSEPA2 createFinancialInstitutionIdentificationSEPA2() {\n return new FinancialInstitutionIdentificationSEPA2();\n * Create an instance of {@link PersonIdentificationSEPA2 }\n public PersonIdentificationSEPA2 createPersonIdentificationSEPA2() {\n return new PersonIdentificationSEPA2();\n * Create an instance of {@link PartyIdentificationSEPA4 }\n public PartyIdentificationSEPA4 createPartyIdentificationSEPA4() {\n return new PartyIdentificationSEPA4();\n * Create an instance of {@link RemittanceInformationSEPA2Choice }\n public RemittanceInformationSEPA2Choice createRemittanceInformationSEPA2Choice() {\n return new RemittanceInformationSEPA2Choice();\n }\n\n /**\n * Create an instance of {@link PartyIdentificationSEPA3 }\n * \n */\n public PartyIdentificationSEPA3 createPartyIdentificationSEPA3() {\n return new PartyIdentificationSEPA3();\n }\n\n /**\n * Create an instance of {@link GenericOrganisationIdentification1 }\n * \n */\n public GenericOrganisationIdentification1 createGenericOrganisationIdentification1() {\n return new GenericOrganisationIdentification1();\n * Create an instance of {@link OrganisationIdentificationSEPA }\n * \n */\n public OrganisationIdentificationSEPA createOrganisationIdentificationSEPA() {\n return new OrganisationIdentificationSEPA();\n }\n\n /**\n * Create an instance of {@link LocalInstrumentSEPA }\n * \n */\n public LocalInstrumentSEPA createLocalInstrumentSEPA() {\n return new LocalInstrumentSEPA();\n }\n\n /**\n * Create an instance of {@link RestrictedPersonIdentificationSchemeNameSEPA }\n public RestrictedPersonIdentificationSchemeNameSEPA createRestrictedPersonIdentificationSchemeNameSEPA() {\n return new RestrictedPersonIdentificationSchemeNameSEPA();\n * Create an instance of {@link GroupHeaderSEPA }\n public GroupHeaderSEPA createGroupHeaderSEPA() {\n return new GroupHeaderSEPA();\n * Create an instance of {@link OriginalTransactionReferenceSEPA }\n public OriginalTransactionReferenceSEPA createOriginalTransactionReferenceSEPA() {\n return new OriginalTransactionReferenceSEPA();\n /**\n * Create an instance of {@link BranchAndFinancialInstitutionIdentificationSEPA2 }\n * \n */\n public BranchAndFinancialInstitutionIdentificationSEPA2 createBranchAndFinancialInstitutionIdentificationSEPA2() {\n return new BranchAndFinancialInstitutionIdentificationSEPA2();\n }\n\n * Create an instance of {@link CustomerPaymentStatusReportV03 }\n public CustomerPaymentStatusReportV03 createCustomerPaymentStatusReportV03() {\n return new CustomerPaymentStatusReportV03();\n /**\n * Create an instance of {@link PartySEPA1 }\n * \n */\n public PartySEPA1 createPartySEPA1() {\n return new PartySEPA1();\n }\n\n /**\n * Create an instance of {@link PartySEPA2 }\n * \n */\n public PartySEPA2 createPartySEPA2() {\n return new PartySEPA2();\n }\n\n /**\n * Create an instance of {@link PaymentTransactionInformationSEPA }\n * \n */\n public PaymentTransactionInformationSEPA createPaymentTransactionInformationSEPA() {\n return new PaymentTransactionInformationSEPA();\n }\n\n * Create an instance of {@link StatusReasonInformationSEPA }\n public StatusReasonInformationSEPA createStatusReasonInformationSEPA() {\n return new StatusReasonInformationSEPA();\n * Create an instance of {@link CreditorReferenceInformationSEPA }\n public CreditorReferenceInformationSEPA createCreditorReferenceInformationSEPA() {\n return new CreditorReferenceInformationSEPA();\n }\n\n /**\n * Create an instance of {@link StatusReasonSEPA }\n * \n */\n public StatusReasonSEPA createStatusReasonSEPA() {\n return new StatusReasonSEPA();\n * Create an instance of {@link StructuredRemittanceInformationSEPA2 }\n * \n */\n public StructuredRemittanceInformationSEPA2 createStructuredRemittanceInformationSEPA2() {\n return new StructuredRemittanceInformationSEPA2();\n }\n\n /**\n * Create an instance of {@link MandateRelatedInformationSEPA }\n * \n */\n public MandateRelatedInformationSEPA createMandateRelatedInformationSEPA() {\n return new MandateRelatedInformationSEPA();\n }\n\n /**\n * Create an instance of {@link PartyIdentificationSEPA6Choice }\n * \n */\n public PartyIdentificationSEPA6Choice createPartyIdentificationSEPA6Choice() {\n return new PartyIdentificationSEPA6Choice();\n }\n\n /**\n * Create an instance of {@link RestrictedPersonIdentificationSEPA }\n * \n */\n public RestrictedPersonIdentificationSEPA createRestrictedPersonIdentificationSEPA() {\n return new RestrictedPersonIdentificationSEPA();\n }\n\n /**\n * Create an instance of {@link OriginalPaymentInformationSEPA }\n * \n */\n public OriginalPaymentInformationSEPA createOriginalPaymentInformationSEPA() {\n return new OriginalPaymentInformationSEPA();\n }\n\n /**\n * Create an instance of {@link OriginalGroupInformationSEPA }\n * \n */\n public OriginalGroupInformationSEPA createOriginalGroupInformationSEPA() {\n return new OriginalGroupInformationSEPA();\n }\n\n /**\n * Create an instance of {@link AmendmentInformationDetailsSEPA }\n * \n */\n public AmendmentInformationDetailsSEPA createAmendmentInformationDetailsSEPA() {\n return new AmendmentInformationDetailsSEPA();\n }\n\n /**\n * Create an instance of {@link RestrictedFinancialIdentificationSEPA }\n public RestrictedFinancialIdentificationSEPA createRestrictedFinancialIdentificationSEPA() {\n return new RestrictedFinancialIdentificationSEPA();\n * Create an instance of {@link PaymentTypeInformationSEPA }\n public PaymentTypeInformationSEPA createPaymentTypeInformationSEPA() {\n return new PaymentTypeInformationSEPA();\n @XmlElementDecl(namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\", name = \"Document\")", "new_methods": [ { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_002_003_03/ObjectFactory.java", "implementation": "return new FinancialInstitutionIdentificationSEPA1();\n * Create an instance of {@link FinancialInstitutionIdentificationSEPA2", "signature": "FinancialInstitutionIdentificationSEPA1 createFinancialInstitutionIdentificationSEPA1()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_002_003_03/ObjectFactory.java", "implementation": "return new FinancialInstitutionIdentificationSEPA2();\n * Create an instance of {@link PersonIdentificationSEPA2", "signature": "FinancialInstitutionIdentificationSEPA2 createFinancialInstitutionIdentificationSEPA2()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_002_003_03/ObjectFactory.java", "implementation": "return new PersonIdentificationSEPA2();\n * Create an instance of {@link PartyIdentificationSEPA4", "signature": "PersonIdentificationSEPA2 createPersonIdentificationSEPA2()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_002_003_03/ObjectFactory.java", "implementation": "return new PartyIdentificationSEPA4();\n * Create an instance of {@link RemittanceInformationSEPA2Choice", "signature": "PartyIdentificationSEPA4 createPartyIdentificationSEPA4()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_002_003_03/ObjectFactory.java", "implementation": "return new RemittanceInformationSEPA2Choice();", "signature": "RemittanceInformationSEPA2Choice createRemittanceInformationSEPA2Choice()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_002_003_03/ObjectFactory.java", "implementation": "return new PartyIdentificationSEPA3();", "signature": "PartyIdentificationSEPA3 createPartyIdentificationSEPA3()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_002_003_03/ObjectFactory.java", "implementation": "return new GenericOrganisationIdentification1();\n * Create an instance of {@link OrganisationIdentificationSEPA", "signature": "GenericOrganisationIdentification1 createGenericOrganisationIdentification1()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_002_003_03/ObjectFactory.java", "implementation": "return new OrganisationIdentificationSEPA();", "signature": "OrganisationIdentificationSEPA createOrganisationIdentificationSEPA()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_002_003_03/ObjectFactory.java", "implementation": "return new LocalInstrumentSEPA();", "signature": "LocalInstrumentSEPA createLocalInstrumentSEPA()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_002_003_03/ObjectFactory.java", "implementation": "return new RestrictedPersonIdentificationSchemeNameSEPA();\n * Create an instance of {@link GroupHeaderSEPA", "signature": "RestrictedPersonIdentificationSchemeNameSEPA createRestrictedPersonIdentificationSchemeNameSEPA()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_002_003_03/ObjectFactory.java", "implementation": "return new GroupHeaderSEPA();\n * Create an instance of {@link OriginalTransactionReferenceSEPA", "signature": "GroupHeaderSEPA createGroupHeaderSEPA()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_002_003_03/ObjectFactory.java", "implementation": "return new OriginalTransactionReferenceSEPA();\n /**\n * Create an instance of {@link BranchAndFinancialInstitutionIdentificationSEPA2", "signature": "OriginalTransactionReferenceSEPA createOriginalTransactionReferenceSEPA()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_002_003_03/ObjectFactory.java", "implementation": "return new BranchAndFinancialInstitutionIdentificationSEPA2();", "signature": "BranchAndFinancialInstitutionIdentificationSEPA2 createBranchAndFinancialInstitutionIdentificationSEPA2()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_002_003_03/ObjectFactory.java", "implementation": "return new CustomerPaymentStatusReportV03();\n /**\n * Create an instance of {@link PartySEPA1", "signature": "CustomerPaymentStatusReportV03 createCustomerPaymentStatusReportV03()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_002_003_03/ObjectFactory.java", "implementation": "return new PartySEPA1();", "signature": "PartySEPA1 createPartySEPA1()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_002_003_03/ObjectFactory.java", "implementation": "return new PartySEPA2();", "signature": "PartySEPA2 createPartySEPA2()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_002_003_03/ObjectFactory.java", "implementation": "return new PaymentTransactionInformationSEPA();", "signature": "PaymentTransactionInformationSEPA createPaymentTransactionInformationSEPA()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_002_003_03/ObjectFactory.java", "implementation": "return new StatusReasonInformationSEPA();\n * Create an instance of {@link CreditorReferenceInformationSEPA", "signature": "StatusReasonInformationSEPA createStatusReasonInformationSEPA()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_002_003_03/ObjectFactory.java", "implementation": "return new CreditorReferenceInformationSEPA();", "signature": "CreditorReferenceInformationSEPA createCreditorReferenceInformationSEPA()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_002_003_03/ObjectFactory.java", "implementation": "return new StatusReasonSEPA();\n * Create an instance of {@link StructuredRemittanceInformationSEPA2", "signature": "StatusReasonSEPA createStatusReasonSEPA()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_002_003_03/ObjectFactory.java", "implementation": "return new StructuredRemittanceInformationSEPA2();", "signature": "StructuredRemittanceInformationSEPA2 createStructuredRemittanceInformationSEPA2()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_002_003_03/ObjectFactory.java", "implementation": "return new MandateRelatedInformationSEPA();", "signature": "MandateRelatedInformationSEPA createMandateRelatedInformationSEPA()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_002_003_03/ObjectFactory.java", "implementation": "return new PartyIdentificationSEPA6Choice();", "signature": "PartyIdentificationSEPA6Choice createPartyIdentificationSEPA6Choice()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_002_003_03/ObjectFactory.java", "implementation": "return new RestrictedPersonIdentificationSEPA();", "signature": "RestrictedPersonIdentificationSEPA createRestrictedPersonIdentificationSEPA()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_002_003_03/ObjectFactory.java", "implementation": "return new OriginalPaymentInformationSEPA();", "signature": "OriginalPaymentInformationSEPA createOriginalPaymentInformationSEPA()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_002_003_03/ObjectFactory.java", "implementation": "return new OriginalGroupInformationSEPA();", "signature": "OriginalGroupInformationSEPA createOriginalGroupInformationSEPA()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_002_003_03/ObjectFactory.java", "implementation": "return new AmendmentInformationDetailsSEPA();", "signature": "AmendmentInformationDetailsSEPA createAmendmentInformationDetailsSEPA()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_002_003_03/ObjectFactory.java", "implementation": "return new RestrictedFinancialIdentificationSEPA();\n * Create an instance of {@link PaymentTypeInformationSEPA", "signature": "RestrictedFinancialIdentificationSEPA createRestrictedFinancialIdentificationSEPA()" } ], "old_code": " private final static QName _Document_QNAME = new QName(\"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", \"Document\");\n * Create an instance of {@link PaymentIdentificationSEPA }\n public PaymentIdentificationSEPA createPaymentIdentificationSEPA() {\n return new PaymentIdentificationSEPA();\n * Create an instance of {@link FinancialInstitutionIdentificationSEPA1 }\n public FinancialInstitutionIdentificationSEPA1 createFinancialInstitutionIdentificationSEPA1() {\n return new FinancialInstitutionIdentificationSEPA1();\n * Create an instance of {@link GroupHeaderSCT }\n public GroupHeaderSCT createGroupHeaderSCT() {\n return new GroupHeaderSCT();\n * Create an instance of {@link GenericOrganisationIdentification1 }\n public GenericOrganisationIdentification1 createGenericOrganisationIdentification1() {\n return new GenericOrganisationIdentification1();\n * Create an instance of {@link PaymentTypeInformationSCT2 }\n public PaymentTypeInformationSCT2 createPaymentTypeInformationSCT2() {\n return new PaymentTypeInformationSCT2();\n * Create an instance of {@link PaymentTypeInformationSCT1 }\n public PaymentTypeInformationSCT1 createPaymentTypeInformationSCT1() {\n return new PaymentTypeInformationSCT1();\n * Create an instance of {@link PurposeSEPA }\n public PurposeSEPA createPurposeSEPA() {\n return new PurposeSEPA();\n * Create an instance of {@link CustomerCreditTransferInitiationV03 }\n public CustomerCreditTransferInitiationV03 createCustomerCreditTransferInitiationV03() {\n return new CustomerCreditTransferInitiationV03();\n * Create an instance of {@link RemittanceInformationSEPA1Choice }\n public RemittanceInformationSEPA1Choice createRemittanceInformationSEPA1Choice() {\n return new RemittanceInformationSEPA1Choice();\n * Create an instance of {@link CreditTransferTransactionInformationSCT }\n public CreditTransferTransactionInformationSCT createCreditTransferTransactionInformationSCT() {\n return new CreditTransferTransactionInformationSCT();\n * Create an instance of {@link PaymentInstructionInformationSCT }\n public PaymentInstructionInformationSCT createPaymentInstructionInformationSCT() {\n return new PaymentInstructionInformationSCT();\n * Create an instance of {@link StructuredRemittanceInformationSEPA1 }\n public StructuredRemittanceInformationSEPA1 createStructuredRemittanceInformationSEPA1() {\n return new StructuredRemittanceInformationSEPA1();\n * Create an instance of {@link CreditorReferenceInformationSEPA1 }\n public CreditorReferenceInformationSEPA1 createCreditorReferenceInformationSEPA1() {\n return new CreditorReferenceInformationSEPA1();\n @XmlElementDecl(namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", name = \"Document\")", "old_methods": [ { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_002_003_03/ObjectFactory.java", "implementation": "return new PaymentIdentificationSEPA();\n * Create an instance of {@link FinancialInstitutionIdentificationSEPA1", "signature": "PaymentIdentificationSEPA createPaymentIdentificationSEPA()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_002_003_03/ObjectFactory.java", "implementation": "return new FinancialInstitutionIdentificationSEPA1();\n * Create an instance of {@link GroupHeaderSCT", "signature": "FinancialInstitutionIdentificationSEPA1 createFinancialInstitutionIdentificationSEPA1()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_002_003_03/ObjectFactory.java", "implementation": "return new GroupHeaderSCT();\n * Create an instance of {@link GenericOrganisationIdentification1", "signature": "GroupHeaderSCT createGroupHeaderSCT()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_002_003_03/ObjectFactory.java", "implementation": "return new GenericOrganisationIdentification1();\n * Create an instance of {@link PaymentTypeInformationSCT2", "signature": "GenericOrganisationIdentification1 createGenericOrganisationIdentification1()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_002_003_03/ObjectFactory.java", "implementation": "return new PaymentTypeInformationSCT2();\n * Create an instance of {@link PaymentTypeInformationSCT1", "signature": "PaymentTypeInformationSCT2 createPaymentTypeInformationSCT2()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_002_003_03/ObjectFactory.java", "implementation": "return new PaymentTypeInformationSCT1();\n * Create an instance of {@link PurposeSEPA", "signature": "PaymentTypeInformationSCT1 createPaymentTypeInformationSCT1()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_002_003_03/ObjectFactory.java", "implementation": "return new PurposeSEPA();\n * Create an instance of {@link CustomerCreditTransferInitiationV03", "signature": "PurposeSEPA createPurposeSEPA()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_002_003_03/ObjectFactory.java", "implementation": "return new CustomerCreditTransferInitiationV03();\n * Create an instance of {@link RemittanceInformationSEPA1Choice", "signature": "CustomerCreditTransferInitiationV03 createCustomerCreditTransferInitiationV03()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_002_003_03/ObjectFactory.java", "implementation": "return new RemittanceInformationSEPA1Choice();\n * Create an instance of {@link CreditTransferTransactionInformationSCT", "signature": "RemittanceInformationSEPA1Choice createRemittanceInformationSEPA1Choice()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_002_003_03/ObjectFactory.java", "implementation": "return new CreditTransferTransactionInformationSCT();\n * Create an instance of {@link PaymentInstructionInformationSCT", "signature": "CreditTransferTransactionInformationSCT createCreditTransferTransactionInformationSCT()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_002_003_03/ObjectFactory.java", "implementation": "return new PaymentInstructionInformationSCT();\n * Create an instance of {@link StructuredRemittanceInformationSEPA1", "signature": "PaymentInstructionInformationSCT createPaymentInstructionInformationSCT()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_002_003_03/ObjectFactory.java", "implementation": "return new StructuredRemittanceInformationSEPA1();\n * Create an instance of {@link CreditorReferenceInformationSEPA1", "signature": "StructuredRemittanceInformationSEPA1 createStructuredRemittanceInformationSEPA1()" } ], "patch": "@@ -24,7 +24,7 @@\n @XmlRegistry\n public class ObjectFactory {\n \n- private final static QName _Document_QNAME = new QName(\"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", \"Document\");\n+ private final static QName _Document_QNAME = new QName(\"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\", \"Document\");\n \n /**\n * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.kapott.hbci.sepa.jaxb.pain_002_003_03\n@@ -42,19 +42,19 @@ public Document createDocument() {\n }\n \n /**\n- * Create an instance of {@link PaymentIdentificationSEPA }\n+ * Create an instance of {@link FinancialInstitutionIdentificationSEPA1 }\n * \n */\n- public PaymentIdentificationSEPA createPaymentIdentificationSEPA() {\n- return new PaymentIdentificationSEPA();\n+ public FinancialInstitutionIdentificationSEPA1 createFinancialInstitutionIdentificationSEPA1() {\n+ return new FinancialInstitutionIdentificationSEPA1();\n }\n \n /**\n- * Create an instance of {@link FinancialInstitutionIdentificationSEPA1 }\n+ * Create an instance of {@link FinancialInstitutionIdentificationSEPA2 }\n * \n */\n- public FinancialInstitutionIdentificationSEPA1 createFinancialInstitutionIdentificationSEPA1() {\n- return new FinancialInstitutionIdentificationSEPA1();\n+ public FinancialInstitutionIdentificationSEPA2 createFinancialInstitutionIdentificationSEPA2() {\n+ return new FinancialInstitutionIdentificationSEPA2();\n }\n \n /**\n@@ -74,27 +74,43 @@ public FinancialInstitutionIdentificationSEPA3 createFinancialInstitutionIdentif\n }\n \n /**\n- * Create an instance of {@link GroupHeaderSCT }\n+ * Create an instance of {@link PersonIdentificationSEPA2 }\n * \n */\n- public GroupHeaderSCT createGroupHeaderSCT() {\n- return new GroupHeaderSCT();\n+ public PersonIdentificationSEPA2 createPersonIdentificationSEPA2() {\n+ return new PersonIdentificationSEPA2();\n }\n \n /**\n- * Create an instance of {@link GenericOrganisationIdentification1 }\n+ * Create an instance of {@link PartyIdentificationSEPA4 }\n * \n */\n- public GenericOrganisationIdentification1 createGenericOrganisationIdentification1() {\n- return new GenericOrganisationIdentification1();\n+ public PartyIdentificationSEPA4 createPartyIdentificationSEPA4() {\n+ return new PartyIdentificationSEPA4();\n }\n \n /**\n- * Create an instance of {@link PaymentTypeInformationSCT2 }\n+ * Create an instance of {@link RemittanceInformationSEPA2Choice }\n * \n */\n- public PaymentTypeInformationSCT2 createPaymentTypeInformationSCT2() {\n- return new PaymentTypeInformationSCT2();\n+ public RemittanceInformationSEPA2Choice createRemittanceInformationSEPA2Choice() {\n+ return new RemittanceInformationSEPA2Choice();\n+ }\n+\n+ /**\n+ * Create an instance of {@link PartyIdentificationSEPA3 }\n+ * \n+ */\n+ public PartyIdentificationSEPA3 createPartyIdentificationSEPA3() {\n+ return new PartyIdentificationSEPA3();\n+ }\n+\n+ /**\n+ * Create an instance of {@link GenericOrganisationIdentification1 }\n+ * \n+ */\n+ public GenericOrganisationIdentification1 createGenericOrganisationIdentification1() {\n+ return new GenericOrganisationIdentification1();\n }\n \n /**\n@@ -114,27 +130,43 @@ public PartyIdentificationSEPA1 createPartyIdentificationSEPA1() {\n }\n \n /**\n- * Create an instance of {@link PaymentTypeInformationSCT1 }\n+ * Create an instance of {@link OrganisationIdentificationSEPA }\n+ * \n+ */\n+ public OrganisationIdentificationSEPA createOrganisationIdentificationSEPA() {\n+ return new OrganisationIdentificationSEPA();\n+ }\n+\n+ /**\n+ * Create an instance of {@link LocalInstrumentSEPA }\n+ * \n+ */\n+ public LocalInstrumentSEPA createLocalInstrumentSEPA() {\n+ return new LocalInstrumentSEPA();\n+ }\n+\n+ /**\n+ * Create an instance of {@link RestrictedPersonIdentificationSchemeNameSEPA }\n * \n */\n- public PaymentTypeInformationSCT1 createPaymentTypeInformationSCT1() {\n- return new PaymentTypeInformationSCT1();\n+ public RestrictedPersonIdentificationSchemeNameSEPA createRestrictedPersonIdentificationSchemeNameSEPA() {\n+ return new RestrictedPersonIdentificationSchemeNameSEPA();\n }\n \n /**\n- * Create an instance of {@link PurposeSEPA }\n+ * Create an instance of {@link GroupHeaderSEPA }\n * \n */\n- public PurposeSEPA createPurposeSEPA() {\n- return new PurposeSEPA();\n+ public GroupHeaderSEPA createGroupHeaderSEPA() {\n+ return new GroupHeaderSEPA();\n }\n \n /**\n- * Create an instance of {@link CustomerCreditTransferInitiationV03 }\n+ * Create an instance of {@link OriginalTransactionReferenceSEPA }\n * \n */\n- public CustomerCreditTransferInitiationV03 createCustomerCreditTransferInitiationV03() {\n- return new CustomerCreditTransferInitiationV03();\n+ public OriginalTransactionReferenceSEPA createOriginalTransactionReferenceSEPA() {\n+ return new OriginalTransactionReferenceSEPA();\n }\n \n /**\n@@ -161,6 +193,14 @@ public PartySEPAChoice createPartySEPAChoice() {\n return new PartySEPAChoice();\n }\n \n+ /**\n+ * Create an instance of {@link BranchAndFinancialInstitutionIdentificationSEPA2 }\n+ * \n+ */\n+ public BranchAndFinancialInstitutionIdentificationSEPA2 createBranchAndFinancialInstitutionIdentificationSEPA2() {\n+ return new BranchAndFinancialInstitutionIdentificationSEPA2();\n+ }\n+\n /**\n * Create an instance of {@link BranchAndFinancialInstitutionIdentificationSEPA1 }\n * \n@@ -178,11 +218,11 @@ public PersonIdentificationSchemeName1Choice createPersonIdentificationSchemeNam\n }\n \n /**\n- * Create an instance of {@link RemittanceInformationSEPA1Choice }\n+ * Create an instance of {@link CustomerPaymentStatusReportV03 }\n * \n */\n- public RemittanceInformationSEPA1Choice createRemittanceInformationSEPA1Choice() {\n- return new RemittanceInformationSEPA1Choice();\n+ public CustomerPaymentStatusReportV03 createCustomerPaymentStatusReportV03() {\n+ return new CustomerPaymentStatusReportV03();\n }\n \n /**\n@@ -193,6 +233,22 @@ public ServiceLevelSEPA createServiceLevelSEPA() {\n return new ServiceLevelSEPA();\n }\n \n+ /**\n+ * Create an instance of {@link PartySEPA1 }\n+ * \n+ */\n+ public PartySEPA1 createPartySEPA1() {\n+ return new PartySEPA1();\n+ }\n+\n+ /**\n+ * Create an instance of {@link PartySEPA2 }\n+ * \n+ */\n+ public PartySEPA2 createPartySEPA2() {\n+ return new PartySEPA2();\n+ }\n+\n /**\n * Create an instance of {@link CashAccountSEPA2 }\n * \n@@ -233,6 +289,14 @@ public OrganisationIdentificationSchemeName1Choice createOrganisationIdentificat\n return new OrganisationIdentificationSchemeName1Choice();\n }\n \n+ /**\n+ * Create an instance of {@link PaymentTransactionInformationSEPA }\n+ * \n+ */\n+ public PaymentTransactionInformationSEPA createPaymentTransactionInformationSEPA() {\n+ return new PaymentTransactionInformationSEPA();\n+ }\n+\n /**\n * Create an instance of {@link AmountTypeSEPA }\n * \n@@ -242,19 +306,27 @@ public AmountTypeSEPA createAmountTypeSEPA() {\n }\n \n /**\n- * Create an instance of {@link CreditTransferTransactionInformationSCT }\n+ * Create an instance of {@link StatusReasonInformationSEPA }\n * \n */\n- public CreditTransferTransactionInformationSCT createCreditTransferTransactionInformationSCT() {\n- return new CreditTransferTransactionInformationSCT();\n+ public StatusReasonInformationSEPA createStatusReasonInformationSEPA() {\n+ return new StatusReasonInformationSEPA();\n }\n \n /**\n- * Create an instance of {@link PaymentInstructionInformationSCT }\n+ * Create an instance of {@link CreditorReferenceInformationSEPA }\n * \n */\n- public PaymentInstructionInformationSCT createPaymentInstructionInformationSCT() {\n- return new PaymentInstructionInformationSCT();\n+ public CreditorReferenceInformationSEPA createCreditorReferenceInformationSEPA() {\n+ return new CreditorReferenceInformationSEPA();\n+ }\n+\n+ /**\n+ * Create an instance of {@link StatusReasonSEPA }\n+ * \n+ */\n+ public StatusReasonSEPA createStatusReasonSEPA() {\n+ return new StatusReasonSEPA();\n }\n \n /**\n@@ -282,19 +354,75 @@ public OrganisationIdentificationSEPAChoice createOrganisationIdentificationSEPA\n }\n \n /**\n- * Create an instance of {@link StructuredRemittanceInformationSEPA1 }\n+ * Create an instance of {@link StructuredRemittanceInformationSEPA2 }\n+ * \n+ */\n+ public StructuredRemittanceInformationSEPA2 createStructuredRemittanceInformationSEPA2() {\n+ return new StructuredRemittanceInformationSEPA2();\n+ }\n+\n+ /**\n+ * Create an instance of {@link MandateRelatedInformationSEPA }\n+ * \n+ */\n+ public MandateRelatedInformationSEPA createMandateRelatedInformationSEPA() {\n+ return new MandateRelatedInformationSEPA();\n+ }\n+\n+ /**\n+ * Create an instance of {@link PartyIdentificationSEPA6Choice }\n+ * \n+ */\n+ public PartyIdentificationSEPA6Choice createPartyIdentificationSEPA6Choice() {\n+ return new PartyIdentificationSEPA6Choice();\n+ }\n+\n+ /**\n+ * Create an instance of {@link RestrictedPersonIdentificationSEPA }\n+ * \n+ */\n+ public RestrictedPersonIdentificationSEPA createRestrictedPersonIdentificationSEPA() {\n+ return new RestrictedPersonIdentificationSEPA();\n+ }\n+\n+ /**\n+ * Create an instance of {@link OriginalPaymentInformationSEPA }\n+ * \n+ */\n+ public OriginalPaymentInformationSEPA createOriginalPaymentInformationSEPA() {\n+ return new OriginalPaymentInformationSEPA();\n+ }\n+\n+ /**\n+ * Create an instance of {@link OriginalGroupInformationSEPA }\n+ * \n+ */\n+ public OriginalGroupInformationSEPA createOriginalGroupInformationSEPA() {\n+ return new OriginalGroupInformationSEPA();\n+ }\n+\n+ /**\n+ * Create an instance of {@link AmendmentInformationDetailsSEPA }\n+ * \n+ */\n+ public AmendmentInformationDetailsSEPA createAmendmentInformationDetailsSEPA() {\n+ return new AmendmentInformationDetailsSEPA();\n+ }\n+\n+ /**\n+ * Create an instance of {@link RestrictedFinancialIdentificationSEPA }\n * \n */\n- public StructuredRemittanceInformationSEPA1 createStructuredRemittanceInformationSEPA1() {\n- return new StructuredRemittanceInformationSEPA1();\n+ public RestrictedFinancialIdentificationSEPA createRestrictedFinancialIdentificationSEPA() {\n+ return new RestrictedFinancialIdentificationSEPA();\n }\n \n /**\n- * Create an instance of {@link CreditorReferenceInformationSEPA1 }\n+ * Create an instance of {@link PaymentTypeInformationSEPA }\n * \n */\n- public CreditorReferenceInformationSEPA1 createCreditorReferenceInformationSEPA1() {\n- return new CreditorReferenceInformationSEPA1();\n+ public PaymentTypeInformationSEPA createPaymentTypeInformationSEPA() {\n+ return new PaymentTypeInformationSEPA();\n }\n \n /**\n@@ -333,7 +461,7 @@ public CreditorReferenceTypeSEPA createCreditorReferenceTypeSEPA() {\n * Create an instance of {@link JAXBElement }{@code <}{@link Document }{@code >}}\n * \n */\n- @XmlElementDecl(namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", name = \"Document\")\n+ @XmlElementDecl(namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\", name = \"Document\")\n public JAXBElement<Document> createDocument(Document value) {\n return new JAXBElement<Document>(_Document_QNAME, Document.class, null, value);\n }", "raw_url": "https://github.com/willuhn/hbci4java/raw/0f60d39106094eb564d221904d2bb7a6dc39102d/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_002_003_03%2FObjectFactory.java", "sha": "cf797e34e226f1e1fc739292d5aa5d429e856033", "status": "modified" }, { "additions": 5, "blob_url": "https://github.com/willuhn/hbci4java/blob/0f60d39106094eb564d221904d2bb7a6dc39102d/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_002_003_03%2FOrganisationIdentificationSEPAChoice.java", "changes": 10, "contents_url": "https://api.github.com/repos/willuhn/hbci4java/contents/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_002_003_03%2FOrganisationIdentificationSEPAChoice.java?ref=0f60d39106094eb564d221904d2bb7a6dc39102d", "deletions": 5, "filename": "src/org/kapott/hbci/sepa/jaxb/pain_002_003_03/OrganisationIdentificationSEPAChoice.java", "new_code": " * &lt;element name=\"BICOrBEI\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.002.003.03}AnyBICIdentifier\"/>\n * &lt;element name=\"Othr\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.002.003.03}GenericOrganisationIdentification1\"/>\n@XmlType(name = \"OrganisationIdentificationSEPAChoice\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\", propOrder = {\n @XmlElement(name = \"BICOrBEI\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\")\n @XmlElement(name = \"Othr\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\")", "new_methods": [], "old_code": " * &lt;element name=\"BICOrBEI\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}AnyBICIdentifier\"/>\n * &lt;element name=\"Othr\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}GenericOrganisationIdentification1\"/>\n@XmlType(name = \"OrganisationIdentificationSEPAChoice\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", propOrder = {\n @XmlElement(name = \"BICOrBEI\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\")\n @XmlElement(name = \"Othr\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\")", "old_methods": [], "patch": "@@ -18,8 +18,8 @@\n * &lt;restriction base=\"{http://www.w3.org/2001/XMLSchema}anyType\">\n * &lt;sequence>\n * &lt;choice>\n- * &lt;element name=\"BICOrBEI\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}AnyBICIdentifier\"/>\n- * &lt;element name=\"Othr\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}GenericOrganisationIdentification1\"/>\n+ * &lt;element name=\"BICOrBEI\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.002.003.03}AnyBICIdentifier\"/>\n+ * &lt;element name=\"Othr\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.002.003.03}GenericOrganisationIdentification1\"/>\n * &lt;/choice>\n * &lt;/sequence>\n * &lt;/restriction>\n@@ -30,15 +30,15 @@\n * \n */\n @XmlAccessorType(XmlAccessType.FIELD)\n-@XmlType(name = \"OrganisationIdentificationSEPAChoice\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", propOrder = {\n+@XmlType(name = \"OrganisationIdentificationSEPAChoice\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\", propOrder = {\n \"bicOrBEI\",\n \"othr\"\n })\n public class OrganisationIdentificationSEPAChoice {\n \n- @XmlElement(name = \"BICOrBEI\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\")\n+ @XmlElement(name = \"BICOrBEI\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\")\n protected String bicOrBEI;\n- @XmlElement(name = \"Othr\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\")\n+ @XmlElement(name = \"Othr\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\")\n protected GenericOrganisationIdentification1 othr;\n \n /**", "raw_url": "https://github.com/willuhn/hbci4java/raw/0f60d39106094eb564d221904d2bb7a6dc39102d/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_002_003_03%2FOrganisationIdentificationSEPAChoice.java", "sha": "368a7f3acc29420449ef8b01615b1e3f0ff79871", "status": "modified" }, { "additions": 5, "blob_url": "https://github.com/willuhn/hbci4java/blob/0f60d39106094eb564d221904d2bb7a6dc39102d/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_002_003_03%2FOrganisationIdentificationSchemeName1Choice.java", "changes": 10, "contents_url": "https://api.github.com/repos/willuhn/hbci4java/contents/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_002_003_03%2FOrganisationIdentificationSchemeName1Choice.java?ref=0f60d39106094eb564d221904d2bb7a6dc39102d", "deletions": 5, "filename": "src/org/kapott/hbci/sepa/jaxb/pain_002_003_03/OrganisationIdentificationSchemeName1Choice.java", "new_code": " * &lt;element name=\"Cd\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.002.003.03}ExternalOrganisationIdentification1Code\"/>\n * &lt;element name=\"Prtry\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.002.003.03}Max35Text\"/>\n@XmlType(name = \"OrganisationIdentificationSchemeName1Choice\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\", propOrder = {\n @XmlElement(name = \"Cd\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\")\n @XmlElement(name = \"Prtry\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\")", "new_methods": [], "old_code": " * &lt;element name=\"Cd\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}ExternalOrganisationIdentification1Code\"/>\n * &lt;element name=\"Prtry\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}Max35Text\"/>\n@XmlType(name = \"OrganisationIdentificationSchemeName1Choice\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", propOrder = {\n @XmlElement(name = \"Cd\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\")\n @XmlElement(name = \"Prtry\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\")", "old_methods": [], "patch": "@@ -18,8 +18,8 @@\n * &lt;restriction base=\"{http://www.w3.org/2001/XMLSchema}anyType\">\n * &lt;sequence>\n * &lt;choice>\n- * &lt;element name=\"Cd\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}ExternalOrganisationIdentification1Code\"/>\n- * &lt;element name=\"Prtry\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}Max35Text\"/>\n+ * &lt;element name=\"Cd\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.002.003.03}ExternalOrganisationIdentification1Code\"/>\n+ * &lt;element name=\"Prtry\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.002.003.03}Max35Text\"/>\n * &lt;/choice>\n * &lt;/sequence>\n * &lt;/restriction>\n@@ -30,15 +30,15 @@\n * \n */\n @XmlAccessorType(XmlAccessType.FIELD)\n-@XmlType(name = \"OrganisationIdentificationSchemeName1Choice\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", propOrder = {\n+@XmlType(name = \"OrganisationIdentificationSchemeName1Choice\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\", propOrder = {\n \"cd\",\n \"prtry\"\n })\n public class OrganisationIdentificationSchemeName1Choice {\n \n- @XmlElement(name = \"Cd\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\")\n+ @XmlElement(name = \"Cd\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\")\n protected String cd;\n- @XmlElement(name = \"Prtry\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\")\n+ @XmlElement(name = \"Prtry\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\")\n protected String prtry;\n \n /**", "raw_url": "https://github.com/willuhn/hbci4java/raw/0f60d39106094eb564d221904d2bb7a6dc39102d/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_002_003_03%2FOrganisationIdentificationSchemeName1Choice.java", "sha": "a7067458644485263da5a84ba52f6b8e6e0a336e", "status": "modified" }, { "additions": 3, "blob_url": "https://github.com/willuhn/hbci4java/blob/0f60d39106094eb564d221904d2bb7a6dc39102d/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_002_003_03%2FOthrIdentification.java", "changes": 6, "contents_url": "https://api.github.com/repos/willuhn/hbci4java/contents/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_002_003_03%2FOthrIdentification.java?ref=0f60d39106094eb564d221904d2bb7a6dc39102d", "deletions": 3, "filename": "src/org/kapott/hbci/sepa/jaxb/pain_002_003_03/OthrIdentification.java", "new_code": " * &lt;element name=\"Id\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.002.003.03}OthrIdentificationCode\"/>\n@XmlType(name = \"OthrIdentification\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\", propOrder = {\n @XmlElement(name = \"Id\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\", required = true)", "new_methods": [], "old_code": " * &lt;element name=\"Id\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}OthrIdentificationCode\"/>\n@XmlType(name = \"OthrIdentification\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", propOrder = {\n @XmlElement(name = \"Id\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", required = true)", "old_methods": [], "patch": "@@ -17,7 +17,7 @@\n * &lt;complexContent>\n * &lt;restriction base=\"{http://www.w3.org/2001/XMLSchema}anyType\">\n * &lt;sequence>\n- * &lt;element name=\"Id\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}OthrIdentificationCode\"/>\n+ * &lt;element name=\"Id\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.002.003.03}OthrIdentificationCode\"/>\n * &lt;/sequence>\n * &lt;/restriction>\n * &lt;/complexContent>\n@@ -27,12 +27,12 @@\n * \n */\n @XmlAccessorType(XmlAccessType.FIELD)\n-@XmlType(name = \"OthrIdentification\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", propOrder = {\n+@XmlType(name = \"OthrIdentification\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\", propOrder = {\n \"id\"\n })\n public class OthrIdentification {\n \n- @XmlElement(name = \"Id\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", required = true)\n+ @XmlElement(name = \"Id\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\", required = true)\n protected OthrIdentificationCode id;\n \n /**", "raw_url": "https://github.com/willuhn/hbci4java/raw/0f60d39106094eb564d221904d2bb7a6dc39102d/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_002_003_03%2FOthrIdentification.java", "sha": "99d37db8e162dc21e5f4013df29c180fe4cc66b0", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/willuhn/hbci4java/blob/0f60d39106094eb564d221904d2bb7a6dc39102d/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_002_003_03%2FOthrIdentificationCode.java", "changes": 2, "contents_url": "https://api.github.com/repos/willuhn/hbci4java/contents/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_002_003_03%2FOthrIdentificationCode.java?ref=0f60d39106094eb564d221904d2bb7a6dc39102d", "deletions": 1, "filename": "src/org/kapott/hbci/sepa/jaxb/pain_002_003_03/OthrIdentificationCode.java", "new_code": "@XmlType(name = \"OthrIdentificationCode\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\")", "new_methods": [], "old_code": "@XmlType(name = \"OthrIdentificationCode\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\")", "old_methods": [], "patch": "@@ -19,7 +19,7 @@\n * </pre>\n * \n */\n-@XmlType(name = \"OthrIdentificationCode\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\")\n+@XmlType(name = \"OthrIdentificationCode\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\")\n @XmlEnum\n public enum OthrIdentificationCode {\n ", "raw_url": "https://github.com/willuhn/hbci4java/raw/0f60d39106094eb564d221904d2bb7a6dc39102d/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_002_003_03%2FOthrIdentificationCode.java", "sha": "993e98a01031f6e19ce26c6beed0fe1e45c5d7c5", "status": "modified" }, { "additions": 5, "blob_url": "https://github.com/willuhn/hbci4java/blob/0f60d39106094eb564d221904d2bb7a6dc39102d/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_002_003_03%2FPartyIdentificationSEPA1.java", "changes": 10, "contents_url": "https://api.github.com/repos/willuhn/hbci4java/contents/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_002_003_03%2FPartyIdentificationSEPA1.java?ref=0f60d39106094eb564d221904d2bb7a6dc39102d", "deletions": 5, "filename": "src/org/kapott/hbci/sepa/jaxb/pain_002_003_03/PartyIdentificationSEPA1.java", "new_code": " * &lt;element name=\"Nm\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.002.003.03}Max70Text\" minOccurs=\"0\"/>\n * &lt;element name=\"Id\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.002.003.03}PartySEPAChoice\" minOccurs=\"0\"/>\n@XmlType(name = \"PartyIdentificationSEPA1\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\", propOrder = {\n @XmlElement(name = \"Nm\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\")\n @XmlElement(name = \"Id\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\")", "new_methods": [], "old_code": " * &lt;element name=\"Nm\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}Max70Text\" minOccurs=\"0\"/>\n * &lt;element name=\"Id\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}PartySEPAChoice\" minOccurs=\"0\"/>\n@XmlType(name = \"PartyIdentificationSEPA1\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", propOrder = {\n @XmlElement(name = \"Nm\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\")\n @XmlElement(name = \"Id\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\")", "old_methods": [], "patch": "@@ -17,8 +17,8 @@\n * &lt;complexContent>\n * &lt;restriction base=\"{http://www.w3.org/2001/XMLSchema}anyType\">\n * &lt;sequence>\n- * &lt;element name=\"Nm\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}Max70Text\" minOccurs=\"0\"/>\n- * &lt;element name=\"Id\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}PartySEPAChoice\" minOccurs=\"0\"/>\n+ * &lt;element name=\"Nm\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.002.003.03}Max70Text\" minOccurs=\"0\"/>\n+ * &lt;element name=\"Id\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.002.003.03}PartySEPAChoice\" minOccurs=\"0\"/>\n * &lt;/sequence>\n * &lt;/restriction>\n * &lt;/complexContent>\n@@ -28,15 +28,15 @@\n * \n */\n @XmlAccessorType(XmlAccessType.FIELD)\n-@XmlType(name = \"PartyIdentificationSEPA1\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", propOrder = {\n+@XmlType(name = \"PartyIdentificationSEPA1\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\", propOrder = {\n \"nm\",\n \"id\"\n })\n public class PartyIdentificationSEPA1 {\n \n- @XmlElement(name = \"Nm\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\")\n+ @XmlElement(name = \"Nm\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\")\n protected String nm;\n- @XmlElement(name = \"Id\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\")\n+ @XmlElement(name = \"Id\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\")\n protected PartySEPAChoice id;\n \n /**", "raw_url": "https://github.com/willuhn/hbci4java/raw/0f60d39106094eb564d221904d2bb7a6dc39102d/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_002_003_03%2FPartyIdentificationSEPA1.java", "sha": "d3de6c1d2d11a68b4ff969b7d9a32500a24c2347", "status": "modified" }, { "additions": 7, "blob_url": "https://github.com/willuhn/hbci4java/blob/0f60d39106094eb564d221904d2bb7a6dc39102d/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_002_003_03%2FPartyIdentificationSEPA2.java", "changes": 14, "contents_url": "https://api.github.com/repos/willuhn/hbci4java/contents/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_002_003_03%2FPartyIdentificationSEPA2.java?ref=0f60d39106094eb564d221904d2bb7a6dc39102d", "deletions": 7, "filename": "src/org/kapott/hbci/sepa/jaxb/pain_002_003_03/PartyIdentificationSEPA2.java", "new_code": " * &lt;element name=\"Nm\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.002.003.03}Max70Text\" minOccurs=\"0\"/>\n * &lt;element name=\"PstlAdr\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.002.003.03}PostalAddressSEPA\" minOccurs=\"0\"/>\n * &lt;element name=\"Id\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.002.003.03}PartySEPAChoice\" minOccurs=\"0\"/>\n@XmlType(name = \"PartyIdentificationSEPA2\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\", propOrder = {\n @XmlElement(name = \"Nm\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\")\n @XmlElement(name = \"PstlAdr\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\")\n @XmlElement(name = \"Id\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\")", "new_methods": [], "old_code": " * &lt;element name=\"Nm\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}Max70Text\"/>\n * &lt;element name=\"PstlAdr\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}PostalAddressSEPA\" minOccurs=\"0\"/>\n * &lt;element name=\"Id\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}PartySEPAChoice\" minOccurs=\"0\"/>\n@XmlType(name = \"PartyIdentificationSEPA2\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", propOrder = {\n @XmlElement(name = \"Nm\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", required = true)\n @XmlElement(name = \"PstlAdr\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\")\n @XmlElement(name = \"Id\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\")", "old_methods": [], "patch": "@@ -17,9 +17,9 @@\n * &lt;complexContent>\n * &lt;restriction base=\"{http://www.w3.org/2001/XMLSchema}anyType\">\n * &lt;sequence>\n- * &lt;element name=\"Nm\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}Max70Text\"/>\n- * &lt;element name=\"PstlAdr\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}PostalAddressSEPA\" minOccurs=\"0\"/>\n- * &lt;element name=\"Id\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}PartySEPAChoice\" minOccurs=\"0\"/>\n+ * &lt;element name=\"Nm\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.002.003.03}Max70Text\" minOccurs=\"0\"/>\n+ * &lt;element name=\"PstlAdr\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.002.003.03}PostalAddressSEPA\" minOccurs=\"0\"/>\n+ * &lt;element name=\"Id\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.002.003.03}PartySEPAChoice\" minOccurs=\"0\"/>\n * &lt;/sequence>\n * &lt;/restriction>\n * &lt;/complexContent>\n@@ -29,18 +29,18 @@\n * \n */\n @XmlAccessorType(XmlAccessType.FIELD)\n-@XmlType(name = \"PartyIdentificationSEPA2\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", propOrder = {\n+@XmlType(name = \"PartyIdentificationSEPA2\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\", propOrder = {\n \"nm\",\n \"pstlAdr\",\n \"id\"\n })\n public class PartyIdentificationSEPA2 {\n \n- @XmlElement(name = \"Nm\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", required = true)\n+ @XmlElement(name = \"Nm\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\")\n protected String nm;\n- @XmlElement(name = \"PstlAdr\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\")\n+ @XmlElement(name = \"PstlAdr\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\")\n protected PostalAddressSEPA pstlAdr;\n- @XmlElement(name = \"Id\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\")\n+ @XmlElement(name = \"Id\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\")\n protected PartySEPAChoice id;\n \n /**", "raw_url": "https://github.com/willuhn/hbci4java/raw/0f60d39106094eb564d221904d2bb7a6dc39102d/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_002_003_03%2FPartyIdentificationSEPA2.java", "sha": "42030f9bf52612f6dbb64c239323fc1363601bd2", "status": "modified" }, { "additions": 5, "blob_url": "https://github.com/willuhn/hbci4java/blob/0f60d39106094eb564d221904d2bb7a6dc39102d/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_002_003_03%2FPartySEPAChoice.java", "changes": 10, "contents_url": "https://api.github.com/repos/willuhn/hbci4java/contents/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_002_003_03%2FPartySEPAChoice.java?ref=0f60d39106094eb564d221904d2bb7a6dc39102d", "deletions": 5, "filename": "src/org/kapott/hbci/sepa/jaxb/pain_002_003_03/PartySEPAChoice.java", "new_code": " * &lt;element name=\"OrgId\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.002.003.03}OrganisationIdentificationSEPAChoice\"/>\n * &lt;element name=\"PrvtId\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.002.003.03}PersonIdentificationSEPA1Choice\"/>\n@XmlType(name = \"PartySEPAChoice\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\", propOrder = {\n @XmlElement(name = \"OrgId\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\")\n @XmlElement(name = \"PrvtId\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\")", "new_methods": [], "old_code": " * &lt;element name=\"OrgId\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}OrganisationIdentificationSEPAChoice\"/>\n * &lt;element name=\"PrvtId\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}PersonIdentificationSEPA1Choice\"/>\n@XmlType(name = \"PartySEPAChoice\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", propOrder = {\n @XmlElement(name = \"OrgId\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\")\n @XmlElement(name = \"PrvtId\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\")", "old_methods": [], "patch": "@@ -18,8 +18,8 @@\n * &lt;restriction base=\"{http://www.w3.org/2001/XMLSchema}anyType\">\n * &lt;sequence>\n * &lt;choice>\n- * &lt;element name=\"OrgId\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}OrganisationIdentificationSEPAChoice\"/>\n- * &lt;element name=\"PrvtId\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}PersonIdentificationSEPA1Choice\"/>\n+ * &lt;element name=\"OrgId\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.002.003.03}OrganisationIdentificationSEPAChoice\"/>\n+ * &lt;element name=\"PrvtId\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.002.003.03}PersonIdentificationSEPA1Choice\"/>\n * &lt;/choice>\n * &lt;/sequence>\n * &lt;/restriction>\n@@ -30,15 +30,15 @@\n * \n */\n @XmlAccessorType(XmlAccessType.FIELD)\n-@XmlType(name = \"PartySEPAChoice\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", propOrder = {\n+@XmlType(name = \"PartySEPAChoice\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\", propOrder = {\n \"orgId\",\n \"prvtId\"\n })\n public class PartySEPAChoice {\n \n- @XmlElement(name = \"OrgId\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\")\n+ @XmlElement(name = \"OrgId\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\")\n protected OrganisationIdentificationSEPAChoice orgId;\n- @XmlElement(name = \"PrvtId\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\")\n+ @XmlElement(name = \"PrvtId\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\")\n protected PersonIdentificationSEPA1Choice prvtId;\n \n /**", "raw_url": "https://github.com/willuhn/hbci4java/raw/0f60d39106094eb564d221904d2bb7a6dc39102d/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_002_003_03%2FPartySEPAChoice.java", "sha": "f020e82779ac67a51ee7f0c304de72c040f01284", "status": "modified" }, { "additions": 5, "blob_url": "https://github.com/willuhn/hbci4java/blob/0f60d39106094eb564d221904d2bb7a6dc39102d/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_002_003_03%2FPersonIdentificationSEPA1Choice.java", "changes": 10, "contents_url": "https://api.github.com/repos/willuhn/hbci4java/contents/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_002_003_03%2FPersonIdentificationSEPA1Choice.java?ref=0f60d39106094eb564d221904d2bb7a6dc39102d", "deletions": 5, "filename": "src/org/kapott/hbci/sepa/jaxb/pain_002_003_03/PersonIdentificationSEPA1Choice.java", "new_code": " * &lt;element name=\"DtAndPlcOfBirth\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.002.003.03}DateAndPlaceOfBirth\"/>\n * &lt;element name=\"Othr\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.002.003.03}GenericPersonIdentification1\"/>\n@XmlType(name = \"PersonIdentificationSEPA1Choice\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\", propOrder = {\n @XmlElement(name = \"DtAndPlcOfBirth\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\")\n @XmlElement(name = \"Othr\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\")", "new_methods": [], "old_code": " * &lt;element name=\"DtAndPlcOfBirth\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}DateAndPlaceOfBirth\"/>\n * &lt;element name=\"Othr\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}GenericPersonIdentification1\"/>\n@XmlType(name = \"PersonIdentificationSEPA1Choice\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", propOrder = {\n @XmlElement(name = \"DtAndPlcOfBirth\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\")\n @XmlElement(name = \"Othr\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\")", "old_methods": [], "patch": "@@ -18,8 +18,8 @@\n * &lt;restriction base=\"{http://www.w3.org/2001/XMLSchema}anyType\">\n * &lt;sequence>\n * &lt;choice>\n- * &lt;element name=\"DtAndPlcOfBirth\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}DateAndPlaceOfBirth\"/>\n- * &lt;element name=\"Othr\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}GenericPersonIdentification1\"/>\n+ * &lt;element name=\"DtAndPlcOfBirth\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.002.003.03}DateAndPlaceOfBirth\"/>\n+ * &lt;element name=\"Othr\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.002.003.03}GenericPersonIdentification1\"/>\n * &lt;/choice>\n * &lt;/sequence>\n * &lt;/restriction>\n@@ -30,15 +30,15 @@\n * \n */\n @XmlAccessorType(XmlAccessType.FIELD)\n-@XmlType(name = \"PersonIdentificationSEPA1Choice\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", propOrder = {\n+@XmlType(name = \"PersonIdentificationSEPA1Choice\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\", propOrder = {\n \"dtAndPlcOfBirth\",\n \"othr\"\n })\n public class PersonIdentificationSEPA1Choice {\n \n- @XmlElement(name = \"DtAndPlcOfBirth\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\")\n+ @XmlElement(name = \"DtAndPlcOfBirth\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\")\n protected DateAndPlaceOfBirth dtAndPlcOfBirth;\n- @XmlElement(name = \"Othr\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\")\n+ @XmlElement(name = \"Othr\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\")\n protected GenericPersonIdentification1 othr;\n \n /**", "raw_url": "https://github.com/willuhn/hbci4java/raw/0f60d39106094eb564d221904d2bb7a6dc39102d/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_002_003_03%2FPersonIdentificationSEPA1Choice.java", "sha": "6326cf8c5ff2456b4a9f0e74aba0fe62e69ffa42", "status": "modified" }, { "additions": 5, "blob_url": "https://github.com/willuhn/hbci4java/blob/0f60d39106094eb564d221904d2bb7a6dc39102d/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_002_003_03%2FPersonIdentificationSchemeName1Choice.java", "changes": 10, "contents_url": "https://api.github.com/repos/willuhn/hbci4java/contents/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_002_003_03%2FPersonIdentificationSchemeName1Choice.java?ref=0f60d39106094eb564d221904d2bb7a6dc39102d", "deletions": 5, "filename": "src/org/kapott/hbci/sepa/jaxb/pain_002_003_03/PersonIdentificationSchemeName1Choice.java", "new_code": " * &lt;element name=\"Cd\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.002.003.03}ExternalPersonIdentification1Code\"/>\n * &lt;element name=\"Prtry\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.002.003.03}Max35Text\"/>\n@XmlType(name = \"PersonIdentificationSchemeName1Choice\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\", propOrder = {\n @XmlElement(name = \"Cd\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\")\n @XmlElement(name = \"Prtry\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\")", "new_methods": [], "old_code": " * &lt;element name=\"Cd\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}ExternalPersonIdentification1Code\"/>\n * &lt;element name=\"Prtry\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}Max35Text\"/>\n@XmlType(name = \"PersonIdentificationSchemeName1Choice\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", propOrder = {\n @XmlElement(name = \"Cd\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\")\n @XmlElement(name = \"Prtry\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\")", "old_methods": [], "patch": "@@ -18,8 +18,8 @@\n * &lt;restriction base=\"{http://www.w3.org/2001/XMLSchema}anyType\">\n * &lt;sequence>\n * &lt;choice>\n- * &lt;element name=\"Cd\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}ExternalPersonIdentification1Code\"/>\n- * &lt;element name=\"Prtry\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}Max35Text\"/>\n+ * &lt;element name=\"Cd\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.002.003.03}ExternalPersonIdentification1Code\"/>\n+ * &lt;element name=\"Prtry\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.002.003.03}Max35Text\"/>\n * &lt;/choice>\n * &lt;/sequence>\n * &lt;/restriction>\n@@ -30,15 +30,15 @@\n * \n */\n @XmlAccessorType(XmlAccessType.FIELD)\n-@XmlType(name = \"PersonIdentificationSchemeName1Choice\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", propOrder = {\n+@XmlType(name = \"PersonIdentificationSchemeName1Choice\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\", propOrder = {\n \"cd\",\n \"prtry\"\n })\n public class PersonIdentificationSchemeName1Choice {\n \n- @XmlElement(name = \"Cd\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\")\n+ @XmlElement(name = \"Cd\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\")\n protected String cd;\n- @XmlElement(name = \"Prtry\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\")\n+ @XmlElement(name = \"Prtry\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\")\n protected String prtry;\n \n /**", "raw_url": "https://github.com/willuhn/hbci4java/raw/0f60d39106094eb564d221904d2bb7a6dc39102d/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_002_003_03%2FPersonIdentificationSchemeName1Choice.java", "sha": "d543dd2cd494a08eab1c684e85024dc72d299fce", "status": "modified" }, { "additions": 5, "blob_url": "https://github.com/willuhn/hbci4java/blob/0f60d39106094eb564d221904d2bb7a6dc39102d/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_002_003_03%2FPostalAddressSEPA.java", "changes": 10, "contents_url": "https://api.github.com/repos/willuhn/hbci4java/contents/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_002_003_03%2FPostalAddressSEPA.java?ref=0f60d39106094eb564d221904d2bb7a6dc39102d", "deletions": 5, "filename": "src/org/kapott/hbci/sepa/jaxb/pain_002_003_03/PostalAddressSEPA.java", "new_code": " * &lt;element name=\"Ctry\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.002.003.03}CountryCode\" minOccurs=\"0\"/>\n * &lt;element name=\"AdrLine\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.002.003.03}Max70Text\" maxOccurs=\"2\" minOccurs=\"0\"/>\n@XmlType(name = \"PostalAddressSEPA\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\", propOrder = {\n @XmlElement(name = \"Ctry\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\")\n @XmlElement(name = \"AdrLine\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\")", "new_methods": [], "old_code": " * &lt;element name=\"Ctry\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}CountryCode\" minOccurs=\"0\"/>\n * &lt;element name=\"AdrLine\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}Max70Text\" maxOccurs=\"2\" minOccurs=\"0\"/>\n@XmlType(name = \"PostalAddressSEPA\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", propOrder = {\n @XmlElement(name = \"Ctry\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\")\n @XmlElement(name = \"AdrLine\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\")", "old_methods": [], "patch": "@@ -19,8 +19,8 @@\n * &lt;complexContent>\n * &lt;restriction base=\"{http://www.w3.org/2001/XMLSchema}anyType\">\n * &lt;sequence>\n- * &lt;element name=\"Ctry\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}CountryCode\" minOccurs=\"0\"/>\n- * &lt;element name=\"AdrLine\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}Max70Text\" maxOccurs=\"2\" minOccurs=\"0\"/>\n+ * &lt;element name=\"Ctry\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.002.003.03}CountryCode\" minOccurs=\"0\"/>\n+ * &lt;element name=\"AdrLine\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.002.003.03}Max70Text\" maxOccurs=\"2\" minOccurs=\"0\"/>\n * &lt;/sequence>\n * &lt;/restriction>\n * &lt;/complexContent>\n@@ -30,15 +30,15 @@\n * \n */\n @XmlAccessorType(XmlAccessType.FIELD)\n-@XmlType(name = \"PostalAddressSEPA\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", propOrder = {\n+@XmlType(name = \"PostalAddressSEPA\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\", propOrder = {\n \"ctry\",\n \"adrLine\"\n })\n public class PostalAddressSEPA {\n \n- @XmlElement(name = \"Ctry\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\")\n+ @XmlElement(name = \"Ctry\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\")\n protected String ctry;\n- @XmlElement(name = \"AdrLine\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\")\n+ @XmlElement(name = \"AdrLine\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\")\n protected List<String> adrLine;\n \n /**", "raw_url": "https://github.com/willuhn/hbci4java/raw/0f60d39106094eb564d221904d2bb7a6dc39102d/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_002_003_03%2FPostalAddressSEPA.java", "sha": "75c282a6ca93e68cc128ba22ef98b4ea0dfcc221", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/willuhn/hbci4java/blob/0f60d39106094eb564d221904d2bb7a6dc39102d/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_002_003_03%2FPriority2Code.java", "changes": 2, "contents_url": "https://api.github.com/repos/willuhn/hbci4java/contents/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_002_003_03%2FPriority2Code.java?ref=0f60d39106094eb564d221904d2bb7a6dc39102d", "deletions": 1, "filename": "src/org/kapott/hbci/sepa/jaxb/pain_002_003_03/Priority2Code.java", "new_code": "@XmlType(name = \"Priority2Code\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\")", "new_methods": [], "old_code": "@XmlType(name = \"Priority2Code\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\")", "old_methods": [], "patch": "@@ -20,7 +20,7 @@\n * </pre>\n * \n */\n-@XmlType(name = \"Priority2Code\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\")\n+@XmlType(name = \"Priority2Code\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\")\n @XmlEnum\n public enum Priority2Code {\n ", "raw_url": "https://github.com/willuhn/hbci4java/raw/0f60d39106094eb564d221904d2bb7a6dc39102d/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_002_003_03%2FPriority2Code.java", "sha": "652c9fb2d625ec7e9776fd5448c29dbfe32a47f0", "status": "modified" }, { "additions": 3, "blob_url": "https://github.com/willuhn/hbci4java/blob/0f60d39106094eb564d221904d2bb7a6dc39102d/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_002_003_03%2FServiceLevelSEPA.java", "changes": 6, "contents_url": "https://api.github.com/repos/willuhn/hbci4java/contents/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_002_003_03%2FServiceLevelSEPA.java?ref=0f60d39106094eb564d221904d2bb7a6dc39102d", "deletions": 3, "filename": "src/org/kapott/hbci/sepa/jaxb/pain_002_003_03/ServiceLevelSEPA.java", "new_code": " * &lt;element name=\"Cd\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.002.003.03}ExternalServiceLevel1Code\"/>\n@XmlType(name = \"ServiceLevelSEPA\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\", propOrder = {\n @XmlElement(name = \"Cd\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\", required = true)", "new_methods": [], "old_code": " * &lt;element name=\"Cd\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}ExternalServiceLevel1Code\"/>\n@XmlType(name = \"ServiceLevelSEPA\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", propOrder = {\n @XmlElement(name = \"Cd\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", required = true)", "old_methods": [], "patch": "@@ -17,7 +17,7 @@\n * &lt;complexContent>\n * &lt;restriction base=\"{http://www.w3.org/2001/XMLSchema}anyType\">\n * &lt;sequence>\n- * &lt;element name=\"Cd\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}ExternalServiceLevel1Code\"/>\n+ * &lt;element name=\"Cd\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.002.003.03}ExternalServiceLevel1Code\"/>\n * &lt;/sequence>\n * &lt;/restriction>\n * &lt;/complexContent>\n@@ -27,12 +27,12 @@\n * \n */\n @XmlAccessorType(XmlAccessType.FIELD)\n-@XmlType(name = \"ServiceLevelSEPA\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", propOrder = {\n+@XmlType(name = \"ServiceLevelSEPA\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\", propOrder = {\n \"cd\"\n })\n public class ServiceLevelSEPA {\n \n- @XmlElement(name = \"Cd\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", required = true)\n+ @XmlElement(name = \"Cd\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.002.003.03\", required = true)\n protected String cd;\n \n /**", "raw_url": "https://github.com/willuhn/hbci4java/raw/0f60d39106094eb564d221904d2bb7a6dc39102d/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_002_003_03%2FServiceLevelSEPA.java", "sha": "70a8d5207dee7a613823967393d8c4a6844c3fd4", "status": "modified" }, { "additions": 9, "blob_url": "https://github.com/willuhn/hbci4java/blob/0f60d39106094eb564d221904d2bb7a6dc39102d/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_008_001_01%2FDateAndPlaceOfBirth.java", "changes": 18, "contents_url": "https://api.github.com/repos/willuhn/hbci4java/contents/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_008_001_01%2FDateAndPlaceOfBirth.java?ref=0f60d39106094eb564d221904d2bb7a6dc39102d", "deletions": 9, "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_001_01/DateAndPlaceOfBirth.java", "new_code": " * &lt;element name=\"BirthDt\" type=\"{urn:sepade:xsd:pain.008.001.01}ISODate\"/>\n * &lt;element name=\"PrvcOfBirth\" type=\"{urn:sepade:xsd:pain.008.001.01}Max35Text\" minOccurs=\"0\"/>\n * &lt;element name=\"CityOfBirth\" type=\"{urn:sepade:xsd:pain.008.001.01}Max35Text\"/>\n * &lt;element name=\"CtryOfBirth\" type=\"{urn:sepade:xsd:pain.008.001.01}CountryCode\"/>\n@XmlType(name = \"DateAndPlaceOfBirth\", namespace = \"urn:sepade:xsd:pain.008.001.01\", propOrder = {\n @XmlElement(name = \"BirthDt\", namespace = \"urn:sepade:xsd:pain.008.001.01\", required = true)\n @XmlElement(name = \"PrvcOfBirth\", namespace = \"urn:sepade:xsd:pain.008.001.01\")\n @XmlElement(name = \"CityOfBirth\", namespace = \"urn:sepade:xsd:pain.008.001.01\", required = true)\n @XmlElement(name = \"CtryOfBirth\", namespace = \"urn:sepade:xsd:pain.008.001.01\", required = true)", "new_methods": [], "old_code": " * &lt;element name=\"BirthDt\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}ISODate\"/>\n * &lt;element name=\"PrvcOfBirth\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}Max35Text\" minOccurs=\"0\"/>\n * &lt;element name=\"CityOfBirth\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}Max35Text\"/>\n * &lt;element name=\"CtryOfBirth\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}CountryCode\"/>\n@XmlType(name = \"DateAndPlaceOfBirth\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", propOrder = {\n @XmlElement(name = \"BirthDt\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", required = true)\n @XmlElement(name = \"PrvcOfBirth\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\")\n @XmlElement(name = \"CityOfBirth\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", required = true)\n @XmlElement(name = \"CtryOfBirth\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", required = true)", "old_methods": [], "patch": "@@ -18,10 +18,10 @@\n * &lt;complexContent>\n * &lt;restriction base=\"{http://www.w3.org/2001/XMLSchema}anyType\">\n * &lt;sequence>\n- * &lt;element name=\"BirthDt\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}ISODate\"/>\n- * &lt;element name=\"PrvcOfBirth\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}Max35Text\" minOccurs=\"0\"/>\n- * &lt;element name=\"CityOfBirth\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}Max35Text\"/>\n- * &lt;element name=\"CtryOfBirth\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}CountryCode\"/>\n+ * &lt;element name=\"BirthDt\" type=\"{urn:sepade:xsd:pain.008.001.01}ISODate\"/>\n+ * &lt;element name=\"PrvcOfBirth\" type=\"{urn:sepade:xsd:pain.008.001.01}Max35Text\" minOccurs=\"0\"/>\n+ * &lt;element name=\"CityOfBirth\" type=\"{urn:sepade:xsd:pain.008.001.01}Max35Text\"/>\n+ * &lt;element name=\"CtryOfBirth\" type=\"{urn:sepade:xsd:pain.008.001.01}CountryCode\"/>\n * &lt;/sequence>\n * &lt;/restriction>\n * &lt;/complexContent>\n@@ -31,21 +31,21 @@\n * \n */\n @XmlAccessorType(XmlAccessType.FIELD)\n-@XmlType(name = \"DateAndPlaceOfBirth\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", propOrder = {\n+@XmlType(name = \"DateAndPlaceOfBirth\", namespace = \"urn:sepade:xsd:pain.008.001.01\", propOrder = {\n \"birthDt\",\n \"prvcOfBirth\",\n \"cityOfBirth\",\n \"ctryOfBirth\"\n })\n public class DateAndPlaceOfBirth {\n \n- @XmlElement(name = \"BirthDt\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", required = true)\n+ @XmlElement(name = \"BirthDt\", namespace = \"urn:sepade:xsd:pain.008.001.01\", required = true)\n protected XMLGregorianCalendar birthDt;\n- @XmlElement(name = \"PrvcOfBirth\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\")\n+ @XmlElement(name = \"PrvcOfBirth\", namespace = \"urn:sepade:xsd:pain.008.001.01\")\n protected String prvcOfBirth;\n- @XmlElement(name = \"CityOfBirth\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", required = true)\n+ @XmlElement(name = \"CityOfBirth\", namespace = \"urn:sepade:xsd:pain.008.001.01\", required = true)\n protected String cityOfBirth;\n- @XmlElement(name = \"CtryOfBirth\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", required = true)\n+ @XmlElement(name = \"CtryOfBirth\", namespace = \"urn:sepade:xsd:pain.008.001.01\", required = true)\n protected String ctryOfBirth;\n \n /**", "raw_url": "https://github.com/willuhn/hbci4java/raw/0f60d39106094eb564d221904d2bb7a6dc39102d/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_008_001_01%2FDateAndPlaceOfBirth.java", "sha": "e57e5e3476cee534cc591e98e59eced67d0e2cad", "status": "modified" }, { "additions": 13, "blob_url": "https://github.com/willuhn/hbci4java/blob/0f60d39106094eb564d221904d2bb7a6dc39102d/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_008_001_01%2FDocument.java", "changes": 26, "contents_url": "https://api.github.com/repos/willuhn/hbci4java/contents/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_008_001_01%2FDocument.java?ref=0f60d39106094eb564d221904d2bb7a6dc39102d", "deletions": 13, "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_001_01/Document.java", "new_code": " * &lt;element name=\"pain.008.001.01\" type=\"{urn:sepade:xsd:pain.008.001.01}pain.008.001.01\"/>\n@XmlType(name = \"Document\", namespace = \"urn:sepade:xsd:pain.008.001.01\", propOrder = {\n \"pain00800101\"\n @XmlElement(name = \"pain.008.001.01\", namespace = \"urn:sepade:xsd:pain.008.001.01\", required = true)\n protected Pain00800101 pain00800101;\n * Gets the value of the pain00800101 property.\n * {@link Pain00800101 }\n public Pain00800101 getPain00800101() {\n return pain00800101;\n * Sets the value of the pain00800101 property.\n * {@link Pain00800101 }\n public void setPain00800101(Pain00800101 value) {\n this.pain00800101 = value;", "new_methods": [ { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_001_01/Document.java", "implementation": "return pain00800101;\n * Sets the value of the pain00800101 property.\n * {@link Pain00800101", "signature": "Pain00800101 getPain00800101()" } ], "old_code": " * &lt;element name=\"CstmrCdtTrfInitn\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}CustomerCreditTransferInitiationV03\"/>\n@XmlType(name = \"Document\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", propOrder = {\n \"cstmrCdtTrfInitn\"\n @XmlElement(name = \"CstmrCdtTrfInitn\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", required = true)\n protected CustomerCreditTransferInitiationV03 cstmrCdtTrfInitn;\n * Gets the value of the cstmrCdtTrfInitn property.\n * {@link CustomerCreditTransferInitiationV03 }\n public CustomerCreditTransferInitiationV03 getCstmrCdtTrfInitn() {\n return cstmrCdtTrfInitn;\n * Sets the value of the cstmrCdtTrfInitn property.\n * {@link CustomerCreditTransferInitiationV03 }\n public void setCstmrCdtTrfInitn(CustomerCreditTransferInitiationV03 value) {\n this.cstmrCdtTrfInitn = value;", "old_methods": [ { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_001_01/Document.java", "implementation": "return cstmrCdtTrfInitn;\n * Sets the value of the cstmrCdtTrfInitn property.\n * {@link CustomerCreditTransferInitiationV03", "signature": "CustomerCreditTransferInitiationV03 getCstmrCdtTrfInitn()" } ], "patch": "@@ -17,7 +17,7 @@\n * &lt;complexContent>\n * &lt;restriction base=\"{http://www.w3.org/2001/XMLSchema}anyType\">\n * &lt;sequence>\n- * &lt;element name=\"CstmrCdtTrfInitn\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}CustomerCreditTransferInitiationV03\"/>\n+ * &lt;element name=\"pain.008.001.01\" type=\"{urn:sepade:xsd:pain.008.001.01}pain.008.001.01\"/>\n * &lt;/sequence>\n * &lt;/restriction>\n * &lt;/complexContent>\n@@ -27,36 +27,36 @@\n * \n */\n @XmlAccessorType(XmlAccessType.FIELD)\n-@XmlType(name = \"Document\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", propOrder = {\n- \"cstmrCdtTrfInitn\"\n+@XmlType(name = \"Document\", namespace = \"urn:sepade:xsd:pain.008.001.01\", propOrder = {\n+ \"pain00800101\"\n })\n public class Document {\n \n- @XmlElement(name = \"CstmrCdtTrfInitn\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", required = true)\n- protected CustomerCreditTransferInitiationV03 cstmrCdtTrfInitn;\n+ @XmlElement(name = \"pain.008.001.01\", namespace = \"urn:sepade:xsd:pain.008.001.01\", required = true)\n+ protected Pain00800101 pain00800101;\n \n /**\n- * Gets the value of the cstmrCdtTrfInitn property.\n+ * Gets the value of the pain00800101 property.\n * \n * @return\n * possible object is\n- * {@link CustomerCreditTransferInitiationV03 }\n+ * {@link Pain00800101 }\n * \n */\n- public CustomerCreditTransferInitiationV03 getCstmrCdtTrfInitn() {\n- return cstmrCdtTrfInitn;\n+ public Pain00800101 getPain00800101() {\n+ return pain00800101;\n }\n \n /**\n- * Sets the value of the cstmrCdtTrfInitn property.\n+ * Sets the value of the pain00800101 property.\n * \n * @param value\n * allowed object is\n- * {@link CustomerCreditTransferInitiationV03 }\n+ * {@link Pain00800101 }\n * \n */\n- public void setCstmrCdtTrfInitn(CustomerCreditTransferInitiationV03 value) {\n- this.cstmrCdtTrfInitn = value;\n+ public void setPain00800101(Pain00800101 value) {\n+ this.pain00800101 = value;\n }\n \n }", "raw_url": "https://github.com/willuhn/hbci4java/raw/0f60d39106094eb564d221904d2bb7a6dc39102d/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_008_001_01%2FDocument.java", "sha": "6c173da37e8a0671d4cbda627f867a2ee46c9db7", "status": "modified" }, { "additions": 182, "blob_url": "https://github.com/willuhn/hbci4java/blob/0f60d39106094eb564d221904d2bb7a6dc39102d/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_008_001_01%2FObjectFactory.java", "changes": 292, "contents_url": "https://api.github.com/repos/willuhn/hbci4java/contents/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_008_001_01%2FObjectFactory.java?ref=0f60d39106094eb564d221904d2bb7a6dc39102d", "deletions": 110, "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_001_01/ObjectFactory.java", "new_code": " private final static QName _Document_QNAME = new QName(\"urn:sepade:xsd:pain.008.001.01\", \"Document\");\n * Create an instance of {@link PartyPrivate1 }\n public PartyPrivate1 createPartyPrivate1() {\n return new PartyPrivate1();\n * Create an instance of {@link DirectDebitTransactionInformation2 }\n public DirectDebitTransactionInformation2 createDirectDebitTransactionInformation2() {\n return new DirectDebitTransactionInformation2();\n * Create an instance of {@link DirectDebitTransaction4 }\n public DirectDebitTransaction4 createDirectDebitTransaction4() {\n return new DirectDebitTransaction4();\n * Create an instance of {@link ServiceLevel4 }\n public ServiceLevel4 createServiceLevel4() {\n return new ServiceLevel4();\n * Create an instance of {@link PersonIdentification3 }\n public PersonIdentification3 createPersonIdentification3() {\n return new PersonIdentification3();\n * Create an instance of {@link PersonIdentification4 }\n public PersonIdentification4 createPersonIdentification4() {\n return new PersonIdentification4();\n * Create an instance of {@link StructuredRemittanceInformation6 }\n public StructuredRemittanceInformation6 createStructuredRemittanceInformation6() {\n return new StructuredRemittanceInformation6();\n * Create an instance of {@link CashAccount8 }\n public CashAccount8 createCashAccount8() {\n return new CashAccount8();\n * Create an instance of {@link ReferredDocumentInformation1 }\n public ReferredDocumentInformation1 createReferredDocumentInformation1() {\n return new ReferredDocumentInformation1();\n * Create an instance of {@link GroupHeader20 }\n public GroupHeader20 createGroupHeader20() {\n return new GroupHeader20();\n * Create an instance of {@link AccountIdentification2 }\n public AccountIdentification2 createAccountIdentification2() {\n return new AccountIdentification2();\n * Create an instance of {@link OrganisationIdentification2 }\n public OrganisationIdentification2 createOrganisationIdentification2() {\n return new OrganisationIdentification2();\n * Create an instance of {@link ReferredDocumentAmount1Choice }\n public ReferredDocumentAmount1Choice createReferredDocumentAmount1Choice() {\n return new ReferredDocumentAmount1Choice();\n * Create an instance of {@link CreditorReferenceType1 }\n public CreditorReferenceType1 createCreditorReferenceType1() {\n return new CreditorReferenceType1();\n * Create an instance of {@link Party5Choice }\n public Party5Choice createParty5Choice() {\n return new Party5Choice();\n * Create an instance of {@link PostalAddress5 }\n public PostalAddress5 createPostalAddress5() {\n return new PostalAddress5();\n * Create an instance of {@link CurrencyAndAmount }\n public CurrencyAndAmount createCurrencyAndAmount() {\n return new CurrencyAndAmount();\n * Create an instance of {@link EuroMax9Amount }\n public EuroMax9Amount createEuroMax9Amount() {\n return new EuroMax9Amount();\n * Create an instance of {@link PostalAddress1 }\n public PostalAddress1 createPostalAddress1() {\n return new PostalAddress1();\n * Create an instance of {@link PartyIdentification23 }\n public PartyIdentification23 createPartyIdentification23() {\n return new PartyIdentification23();\n * Create an instance of {@link PartyIdentification11 }\n public PartyIdentification11 createPartyIdentification11() {\n return new PartyIdentification11();\n * Create an instance of {@link PartyIdentification22 }\n public PartyIdentification22 createPartyIdentification22() {\n return new PartyIdentification22();\n * Create an instance of {@link PartyIdentification12 }\n public PartyIdentification12 createPartyIdentification12() {\n return new PartyIdentification12();\n * Create an instance of {@link FinancialInstitutionIdentification4 }\n public FinancialInstitutionIdentification4 createFinancialInstitutionIdentification4() {\n return new FinancialInstitutionIdentification4();\n * Create an instance of {@link PartyIdentification20 }\n public PartyIdentification20 createPartyIdentification20() {\n return new PartyIdentification20();\n * Create an instance of {@link ReferredDocumentType1 }\n public ReferredDocumentType1 createReferredDocumentType1() {\n return new ReferredDocumentType1();\n * Create an instance of {@link PaymentIdentification1 }\n public PaymentIdentification1 createPaymentIdentification1() {\n return new PaymentIdentification1();\n * Create an instance of {@link PartyIdentification17 }\n public PartyIdentification17 createPartyIdentification17() {\n return new PartyIdentification17();\n * Create an instance of {@link FinancialInstitutionIdentification5 }\n public FinancialInstitutionIdentification5 createFinancialInstitutionIdentification5() {\n return new FinancialInstitutionIdentification5();\n * Create an instance of {@link RemittanceInformation3 }\n public RemittanceInformation3 createRemittanceInformation3() {\n return new RemittanceInformation3();\n * Create an instance of {@link AmendmentInformationDetails4 }\n public AmendmentInformationDetails4 createAmendmentInformationDetails4() {\n return new AmendmentInformationDetails4();\n * Create an instance of {@link PaymentTypeInformation8 }\n public PaymentTypeInformation8 createPaymentTypeInformation8() {\n return new PaymentTypeInformation8();\n * Create an instance of {@link PaymentInstructionInformation5 }\n public PaymentInstructionInformation5 createPaymentInstructionInformation5() {\n return new PaymentInstructionInformation5();\n * Create an instance of {@link FinancialInstitution3 }\n public FinancialInstitution3 createFinancialInstitution3() {\n return new FinancialInstitution3();\n }\n\n /**\n * Create an instance of {@link FinancialInstitution2 }\n * \n */\n public FinancialInstitution2 createFinancialInstitution2() {\n return new FinancialInstitution2();\n }\n\n /**\n * Create an instance of {@link Party2Choice }\n * \n */\n public Party2Choice createParty2Choice() {\n return new Party2Choice();\n * Create an instance of {@link Pain00800101 }\n public Pain00800101 createPain00800101() {\n return new Pain00800101();\n * Create an instance of {@link PartyIdentification8 }\n public PartyIdentification8 createPartyIdentification8() {\n return new PartyIdentification8();\n }\n\n /**\n * Create an instance of {@link RestrictedIdentification2 }\n * \n */\n public RestrictedIdentification2 createRestrictedIdentification2() {\n return new RestrictedIdentification2();\n }\n\n /**\n * Create an instance of {@link RestrictedIdentification1 }\n * \n */\n public RestrictedIdentification1 createRestrictedIdentification1() {\n return new RestrictedIdentification1();\n }\n\n /**\n * Create an instance of {@link CreditorReferenceInformation1 }\n * \n */\n public CreditorReferenceInformation1 createCreditorReferenceInformation1() {\n return new CreditorReferenceInformation1();\n }\n\n /**\n * Create an instance of {@link GenericIdentification3 }\n * \n */\n public GenericIdentification3 createGenericIdentification3() {\n return new GenericIdentification3();\n }\n\n /**\n * Create an instance of {@link GenericIdentification4 }\n * \n */\n public GenericIdentification4 createGenericIdentification4() {\n return new GenericIdentification4();\n }\n\n /**\n * Create an instance of {@link MandateRelatedInformation4 }\n * \n */\n public MandateRelatedInformation4 createMandateRelatedInformation4() {\n return new MandateRelatedInformation4();\n }\n\n /**\n * Create an instance of {@link DateAndPlaceOfBirth }\n * \n */\n public DateAndPlaceOfBirth createDateAndPlaceOfBirth() {\n return new DateAndPlaceOfBirth();\n @XmlElementDecl(namespace = \"urn:sepade:xsd:pain.008.001.01\", name = \"Document\")", "new_methods": [ { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_001_01/ObjectFactory.java", "implementation": "return new PartyPrivate1();\n * Create an instance of {@link DirectDebitTransactionInformation2", "signature": "PartyPrivate1 createPartyPrivate1()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_001_01/ObjectFactory.java", "implementation": "return new DirectDebitTransactionInformation2();\n * Create an instance of {@link DirectDebitTransaction4", "signature": "DirectDebitTransactionInformation2 createDirectDebitTransactionInformation2()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_001_01/ObjectFactory.java", "implementation": "return new DirectDebitTransaction4();\n * Create an instance of {@link ServiceLevel4", "signature": "DirectDebitTransaction4 createDirectDebitTransaction4()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_001_01/ObjectFactory.java", "implementation": "return new ServiceLevel4();\n * Create an instance of {@link PersonIdentification3", "signature": "ServiceLevel4 createServiceLevel4()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_001_01/ObjectFactory.java", "implementation": "return new PersonIdentification3();\n * Create an instance of {@link PersonIdentification4", "signature": "PersonIdentification3 createPersonIdentification3()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_001_01/ObjectFactory.java", "implementation": "return new PersonIdentification4();\n * Create an instance of {@link StructuredRemittanceInformation6", "signature": "PersonIdentification4 createPersonIdentification4()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_001_01/ObjectFactory.java", "implementation": "return new StructuredRemittanceInformation6();\n * Create an instance of {@link CashAccount8", "signature": "StructuredRemittanceInformation6 createStructuredRemittanceInformation6()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_001_01/ObjectFactory.java", "implementation": "return new CashAccount8();\n * Create an instance of {@link ReferredDocumentInformation1", "signature": "CashAccount8 createCashAccount8()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_001_01/ObjectFactory.java", "implementation": "return new ReferredDocumentInformation1();\n * Create an instance of {@link GroupHeader20", "signature": "ReferredDocumentInformation1 createReferredDocumentInformation1()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_001_01/ObjectFactory.java", "implementation": "return new GroupHeader20();\n * Create an instance of {@link AccountIdentification2", "signature": "GroupHeader20 createGroupHeader20()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_001_01/ObjectFactory.java", "implementation": "return new AccountIdentification2();\n * Create an instance of {@link OrganisationIdentification2", "signature": "AccountIdentification2 createAccountIdentification2()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_001_01/ObjectFactory.java", "implementation": "return new OrganisationIdentification2();\n * Create an instance of {@link ReferredDocumentAmount1Choice", "signature": "OrganisationIdentification2 createOrganisationIdentification2()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_001_01/ObjectFactory.java", "implementation": "return new ReferredDocumentAmount1Choice();\n * Create an instance of {@link CreditorReferenceType1", "signature": "ReferredDocumentAmount1Choice createReferredDocumentAmount1Choice()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_001_01/ObjectFactory.java", "implementation": "return new CreditorReferenceType1();\n * Create an instance of {@link Party5Choice", "signature": "CreditorReferenceType1 createCreditorReferenceType1()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_001_01/ObjectFactory.java", "implementation": "return new Party5Choice();\n * Create an instance of {@link PostalAddress5", "signature": "Party5Choice createParty5Choice()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_001_01/ObjectFactory.java", "implementation": "return new PostalAddress5();\n * Create an instance of {@link CurrencyAndAmount", "signature": "PostalAddress5 createPostalAddress5()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_001_01/ObjectFactory.java", "implementation": "return new CurrencyAndAmount();\n * Create an instance of {@link EuroMax9Amount", "signature": "CurrencyAndAmount createCurrencyAndAmount()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_001_01/ObjectFactory.java", "implementation": "return new EuroMax9Amount();\n * Create an instance of {@link PostalAddress1", "signature": "EuroMax9Amount createEuroMax9Amount()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_001_01/ObjectFactory.java", "implementation": "return new PostalAddress1();\n * Create an instance of {@link PartyIdentification23", "signature": "PostalAddress1 createPostalAddress1()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_001_01/ObjectFactory.java", "implementation": "return new PartyIdentification23();\n * Create an instance of {@link PartyIdentification11", "signature": "PartyIdentification23 createPartyIdentification23()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_001_01/ObjectFactory.java", "implementation": "return new PartyIdentification11();\n * Create an instance of {@link PartyIdentification22", "signature": "PartyIdentification11 createPartyIdentification11()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_001_01/ObjectFactory.java", "implementation": "return new PartyIdentification22();\n * Create an instance of {@link PartyIdentification12", "signature": "PartyIdentification22 createPartyIdentification22()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_001_01/ObjectFactory.java", "implementation": "return new PartyIdentification12();\n * Create an instance of {@link FinancialInstitutionIdentification4", "signature": "PartyIdentification12 createPartyIdentification12()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_001_01/ObjectFactory.java", "implementation": "return new FinancialInstitutionIdentification4();\n * Create an instance of {@link PartyIdentification20", "signature": "FinancialInstitutionIdentification4 createFinancialInstitutionIdentification4()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_001_01/ObjectFactory.java", "implementation": "return new PartyIdentification20();\n * Create an instance of {@link ReferredDocumentType1", "signature": "PartyIdentification20 createPartyIdentification20()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_001_01/ObjectFactory.java", "implementation": "return new ReferredDocumentType1();\n * Create an instance of {@link PaymentIdentification1", "signature": "ReferredDocumentType1 createReferredDocumentType1()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_001_01/ObjectFactory.java", "implementation": "return new PaymentIdentification1();\n * Create an instance of {@link PartyIdentification17", "signature": "PaymentIdentification1 createPaymentIdentification1()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_001_01/ObjectFactory.java", "implementation": "return new PartyIdentification17();\n * Create an instance of {@link FinancialInstitutionIdentification5", "signature": "PartyIdentification17 createPartyIdentification17()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_001_01/ObjectFactory.java", "implementation": "return new FinancialInstitutionIdentification5();\n * Create an instance of {@link RemittanceInformation3", "signature": "FinancialInstitutionIdentification5 createFinancialInstitutionIdentification5()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_001_01/ObjectFactory.java", "implementation": "return new RemittanceInformation3();\n * Create an instance of {@link AmendmentInformationDetails4", "signature": "RemittanceInformation3 createRemittanceInformation3()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_001_01/ObjectFactory.java", "implementation": "return new AmendmentInformationDetails4();\n * Create an instance of {@link PaymentTypeInformation8", "signature": "AmendmentInformationDetails4 createAmendmentInformationDetails4()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_001_01/ObjectFactory.java", "implementation": "return new PaymentTypeInformation8();\n * Create an instance of {@link PaymentInstructionInformation5", "signature": "PaymentTypeInformation8 createPaymentTypeInformation8()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_001_01/ObjectFactory.java", "implementation": "return new PaymentInstructionInformation5();\n * Create an instance of {@link FinancialInstitution3", "signature": "PaymentInstructionInformation5 createPaymentInstructionInformation5()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_001_01/ObjectFactory.java", "implementation": "return new FinancialInstitution3();", "signature": "FinancialInstitution3 createFinancialInstitution3()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_001_01/ObjectFactory.java", "implementation": "return new FinancialInstitution2();", "signature": "FinancialInstitution2 createFinancialInstitution2()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_001_01/ObjectFactory.java", "implementation": "return new Party2Choice();\n * Create an instance of {@link Pain00800101", "signature": "Party2Choice createParty2Choice()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_001_01/ObjectFactory.java", "implementation": "return new Pain00800101();\n * Create an instance of {@link PartyIdentification8", "signature": "Pain00800101 createPain00800101()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_001_01/ObjectFactory.java", "implementation": "return new PartyIdentification8();", "signature": "PartyIdentification8 createPartyIdentification8()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_001_01/ObjectFactory.java", "implementation": "return new RestrictedIdentification2();", "signature": "RestrictedIdentification2 createRestrictedIdentification2()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_001_01/ObjectFactory.java", "implementation": "return new RestrictedIdentification1();", "signature": "RestrictedIdentification1 createRestrictedIdentification1()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_001_01/ObjectFactory.java", "implementation": "return new CreditorReferenceInformation1();", "signature": "CreditorReferenceInformation1 createCreditorReferenceInformation1()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_001_01/ObjectFactory.java", "implementation": "return new GenericIdentification3();", "signature": "GenericIdentification3 createGenericIdentification3()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_001_01/ObjectFactory.java", "implementation": "return new GenericIdentification4();", "signature": "GenericIdentification4 createGenericIdentification4()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_001_01/ObjectFactory.java", "implementation": "return new MandateRelatedInformation4();", "signature": "MandateRelatedInformation4 createMandateRelatedInformation4()" } ], "old_code": " private final static QName _Document_QNAME = new QName(\"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", \"Document\");\n * Create an instance of {@link PaymentIdentificationSEPA }\n public PaymentIdentificationSEPA createPaymentIdentificationSEPA() {\n return new PaymentIdentificationSEPA();\n * Create an instance of {@link FinancialInstitutionIdentificationSEPA1 }\n public FinancialInstitutionIdentificationSEPA1 createFinancialInstitutionIdentificationSEPA1() {\n return new FinancialInstitutionIdentificationSEPA1();\n * Create an instance of {@link CreditorReferenceTypeCodeSEPA }\n public CreditorReferenceTypeCodeSEPA createCreditorReferenceTypeCodeSEPA() {\n return new CreditorReferenceTypeCodeSEPA();\n * Create an instance of {@link FinancialInstitutionIdentificationSEPA3 }\n public FinancialInstitutionIdentificationSEPA3 createFinancialInstitutionIdentificationSEPA3() {\n return new FinancialInstitutionIdentificationSEPA3();\n * Create an instance of {@link GroupHeaderSCT }\n public GroupHeaderSCT createGroupHeaderSCT() {\n return new GroupHeaderSCT();\n * Create an instance of {@link GenericOrganisationIdentification1 }\n public GenericOrganisationIdentification1 createGenericOrganisationIdentification1() {\n return new GenericOrganisationIdentification1();\n * Create an instance of {@link PaymentTypeInformationSCT2 }\n public PaymentTypeInformationSCT2 createPaymentTypeInformationSCT2() {\n return new PaymentTypeInformationSCT2();\n * Create an instance of {@link PartyIdentificationSEPA2 }\n public PartyIdentificationSEPA2 createPartyIdentificationSEPA2() {\n return new PartyIdentificationSEPA2();\n * Create an instance of {@link PartyIdentificationSEPA1 }\n public PartyIdentificationSEPA1 createPartyIdentificationSEPA1() {\n return new PartyIdentificationSEPA1();\n * Create an instance of {@link PaymentTypeInformationSCT1 }\n public PaymentTypeInformationSCT1 createPaymentTypeInformationSCT1() {\n return new PaymentTypeInformationSCT1();\n * Create an instance of {@link PurposeSEPA }\n public PurposeSEPA createPurposeSEPA() {\n return new PurposeSEPA();\n * Create an instance of {@link CustomerCreditTransferInitiationV03 }\n public CustomerCreditTransferInitiationV03 createCustomerCreditTransferInitiationV03() {\n return new CustomerCreditTransferInitiationV03();\n * Create an instance of {@link AccountIdentificationSEPA }\n public AccountIdentificationSEPA createAccountIdentificationSEPA() {\n return new AccountIdentificationSEPA();\n * Create an instance of {@link BranchAndFinancialInstitutionIdentificationSEPA3 }\n public BranchAndFinancialInstitutionIdentificationSEPA3 createBranchAndFinancialInstitutionIdentificationSEPA3() {\n return new BranchAndFinancialInstitutionIdentificationSEPA3();\n * Create an instance of {@link PartySEPAChoice }\n public PartySEPAChoice createPartySEPAChoice() {\n return new PartySEPAChoice();\n * Create an instance of {@link BranchAndFinancialInstitutionIdentificationSEPA1 }\n public BranchAndFinancialInstitutionIdentificationSEPA1 createBranchAndFinancialInstitutionIdentificationSEPA1() {\n return new BranchAndFinancialInstitutionIdentificationSEPA1();\n * Create an instance of {@link PersonIdentificationSchemeName1Choice }\n public PersonIdentificationSchemeName1Choice createPersonIdentificationSchemeName1Choice() {\n return new PersonIdentificationSchemeName1Choice();\n * Create an instance of {@link RemittanceInformationSEPA1Choice }\n public RemittanceInformationSEPA1Choice createRemittanceInformationSEPA1Choice() {\n return new RemittanceInformationSEPA1Choice();\n * Create an instance of {@link ServiceLevelSEPA }\n public ServiceLevelSEPA createServiceLevelSEPA() {\n return new ServiceLevelSEPA();\n * Create an instance of {@link CashAccountSEPA2 }\n public CashAccountSEPA2 createCashAccountSEPA2() {\n return new CashAccountSEPA2();\n * Create an instance of {@link PostalAddressSEPA }\n public PostalAddressSEPA createPostalAddressSEPA() {\n return new PostalAddressSEPA();\n * Create an instance of {@link CashAccountSEPA1 }\n public CashAccountSEPA1 createCashAccountSEPA1() {\n return new CashAccountSEPA1();\n * Create an instance of {@link OthrIdentification }\n public OthrIdentification createOthrIdentification() {\n return new OthrIdentification();\n * Create an instance of {@link OrganisationIdentificationSchemeName1Choice }\n public OrganisationIdentificationSchemeName1Choice createOrganisationIdentificationSchemeName1Choice() {\n return new OrganisationIdentificationSchemeName1Choice();\n * Create an instance of {@link AmountTypeSEPA }\n public AmountTypeSEPA createAmountTypeSEPA() {\n return new AmountTypeSEPA();\n * Create an instance of {@link CreditTransferTransactionInformationSCT }\n public CreditTransferTransactionInformationSCT createCreditTransferTransactionInformationSCT() {\n return new CreditTransferTransactionInformationSCT();\n * Create an instance of {@link PaymentInstructionInformationSCT }\n public PaymentInstructionInformationSCT createPaymentInstructionInformationSCT() {\n return new PaymentInstructionInformationSCT();\n * Create an instance of {@link PersonIdentificationSEPA1Choice }\n public PersonIdentificationSEPA1Choice createPersonIdentificationSEPA1Choice() {\n return new PersonIdentificationSEPA1Choice();\n * Create an instance of {@link ActiveOrHistoricCurrencyAndAmountSEPA }\n public ActiveOrHistoricCurrencyAndAmountSEPA createActiveOrHistoricCurrencyAndAmountSEPA() {\n return new ActiveOrHistoricCurrencyAndAmountSEPA();\n * Create an instance of {@link OrganisationIdentificationSEPAChoice }\n public OrganisationIdentificationSEPAChoice createOrganisationIdentificationSEPAChoice() {\n return new OrganisationIdentificationSEPAChoice();\n * Create an instance of {@link StructuredRemittanceInformationSEPA1 }\n public StructuredRemittanceInformationSEPA1 createStructuredRemittanceInformationSEPA1() {\n return new StructuredRemittanceInformationSEPA1();\n * Create an instance of {@link CreditorReferenceInformationSEPA1 }\n public CreditorReferenceInformationSEPA1 createCreditorReferenceInformationSEPA1() {\n return new CreditorReferenceInformationSEPA1();\n * Create an instance of {@link GenericPersonIdentification1 }\n public GenericPersonIdentification1 createGenericPersonIdentification1() {\n return new GenericPersonIdentification1();\n * Create an instance of {@link DateAndPlaceOfBirth }\n public DateAndPlaceOfBirth createDateAndPlaceOfBirth() {\n return new DateAndPlaceOfBirth();\n * Create an instance of {@link CategoryPurposeSEPA }\n public CategoryPurposeSEPA createCategoryPurposeSEPA() {\n return new CategoryPurposeSEPA();\n * Create an instance of {@link CreditorReferenceTypeSEPA }\n public CreditorReferenceTypeSEPA createCreditorReferenceTypeSEPA() {\n return new CreditorReferenceTypeSEPA();\n @XmlElementDecl(namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", name = \"Document\")", "old_methods": [ { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_001_01/ObjectFactory.java", "implementation": "return new PaymentIdentificationSEPA();\n * Create an instance of {@link FinancialInstitutionIdentificationSEPA1", "signature": "PaymentIdentificationSEPA createPaymentIdentificationSEPA()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_001_01/ObjectFactory.java", "implementation": "return new FinancialInstitutionIdentificationSEPA1();\n * Create an instance of {@link CreditorReferenceTypeCodeSEPA", "signature": "FinancialInstitutionIdentificationSEPA1 createFinancialInstitutionIdentificationSEPA1()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_001_01/ObjectFactory.java", "implementation": "return new CreditorReferenceTypeCodeSEPA();\n * Create an instance of {@link FinancialInstitutionIdentificationSEPA3", "signature": "CreditorReferenceTypeCodeSEPA createCreditorReferenceTypeCodeSEPA()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_001_01/ObjectFactory.java", "implementation": "return new FinancialInstitutionIdentificationSEPA3();\n * Create an instance of {@link GroupHeaderSCT", "signature": "FinancialInstitutionIdentificationSEPA3 createFinancialInstitutionIdentificationSEPA3()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_001_01/ObjectFactory.java", "implementation": "return new GroupHeaderSCT();\n * Create an instance of {@link GenericOrganisationIdentification1", "signature": "GroupHeaderSCT createGroupHeaderSCT()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_001_01/ObjectFactory.java", "implementation": "return new GenericOrganisationIdentification1();\n * Create an instance of {@link PaymentTypeInformationSCT2", "signature": "GenericOrganisationIdentification1 createGenericOrganisationIdentification1()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_001_01/ObjectFactory.java", "implementation": "return new PaymentTypeInformationSCT2();\n * Create an instance of {@link PartyIdentificationSEPA2", "signature": "PaymentTypeInformationSCT2 createPaymentTypeInformationSCT2()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_001_01/ObjectFactory.java", "implementation": "return new PartyIdentificationSEPA2();\n * Create an instance of {@link PartyIdentificationSEPA1", "signature": "PartyIdentificationSEPA2 createPartyIdentificationSEPA2()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_001_01/ObjectFactory.java", "implementation": "return new PartyIdentificationSEPA1();\n * Create an instance of {@link PaymentTypeInformationSCT1", "signature": "PartyIdentificationSEPA1 createPartyIdentificationSEPA1()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_001_01/ObjectFactory.java", "implementation": "return new PaymentTypeInformationSCT1();\n * Create an instance of {@link PurposeSEPA", "signature": "PaymentTypeInformationSCT1 createPaymentTypeInformationSCT1()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_001_01/ObjectFactory.java", "implementation": "return new PurposeSEPA();\n * Create an instance of {@link CustomerCreditTransferInitiationV03", "signature": "PurposeSEPA createPurposeSEPA()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_001_01/ObjectFactory.java", "implementation": "return new CustomerCreditTransferInitiationV03();\n * Create an instance of {@link AccountIdentificationSEPA", "signature": "CustomerCreditTransferInitiationV03 createCustomerCreditTransferInitiationV03()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_001_01/ObjectFactory.java", "implementation": "return new AccountIdentificationSEPA();\n * Create an instance of {@link BranchAndFinancialInstitutionIdentificationSEPA3", "signature": "AccountIdentificationSEPA createAccountIdentificationSEPA()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_001_01/ObjectFactory.java", "implementation": "return new BranchAndFinancialInstitutionIdentificationSEPA3();\n * Create an instance of {@link PartySEPAChoice", "signature": "BranchAndFinancialInstitutionIdentificationSEPA3 createBranchAndFinancialInstitutionIdentificationSEPA3()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_001_01/ObjectFactory.java", "implementation": "return new PartySEPAChoice();\n * Create an instance of {@link BranchAndFinancialInstitutionIdentificationSEPA1", "signature": "PartySEPAChoice createPartySEPAChoice()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_001_01/ObjectFactory.java", "implementation": "return new BranchAndFinancialInstitutionIdentificationSEPA1();\n * Create an instance of {@link PersonIdentificationSchemeName1Choice", "signature": "BranchAndFinancialInstitutionIdentificationSEPA1 createBranchAndFinancialInstitutionIdentificationSEPA1()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_001_01/ObjectFactory.java", "implementation": "return new PersonIdentificationSchemeName1Choice();\n * Create an instance of {@link RemittanceInformationSEPA1Choice", "signature": "PersonIdentificationSchemeName1Choice createPersonIdentificationSchemeName1Choice()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_001_01/ObjectFactory.java", "implementation": "return new RemittanceInformationSEPA1Choice();\n * Create an instance of {@link ServiceLevelSEPA", "signature": "RemittanceInformationSEPA1Choice createRemittanceInformationSEPA1Choice()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_001_01/ObjectFactory.java", "implementation": "return new ServiceLevelSEPA();\n * Create an instance of {@link CashAccountSEPA2", "signature": "ServiceLevelSEPA createServiceLevelSEPA()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_001_01/ObjectFactory.java", "implementation": "return new CashAccountSEPA2();\n * Create an instance of {@link PostalAddressSEPA", "signature": "CashAccountSEPA2 createCashAccountSEPA2()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_001_01/ObjectFactory.java", "implementation": "return new PostalAddressSEPA();\n * Create an instance of {@link CashAccountSEPA1", "signature": "PostalAddressSEPA createPostalAddressSEPA()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_001_01/ObjectFactory.java", "implementation": "return new CashAccountSEPA1();\n * Create an instance of {@link OthrIdentification", "signature": "CashAccountSEPA1 createCashAccountSEPA1()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_001_01/ObjectFactory.java", "implementation": "return new OthrIdentification();\n * Create an instance of {@link OrganisationIdentificationSchemeName1Choice", "signature": "OthrIdentification createOthrIdentification()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_001_01/ObjectFactory.java", "implementation": "return new OrganisationIdentificationSchemeName1Choice();\n * Create an instance of {@link AmountTypeSEPA", "signature": "OrganisationIdentificationSchemeName1Choice createOrganisationIdentificationSchemeName1Choice()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_001_01/ObjectFactory.java", "implementation": "return new AmountTypeSEPA();\n * Create an instance of {@link CreditTransferTransactionInformationSCT", "signature": "AmountTypeSEPA createAmountTypeSEPA()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_001_01/ObjectFactory.java", "implementation": "return new CreditTransferTransactionInformationSCT();\n * Create an instance of {@link PaymentInstructionInformationSCT", "signature": "CreditTransferTransactionInformationSCT createCreditTransferTransactionInformationSCT()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_001_01/ObjectFactory.java", "implementation": "return new PaymentInstructionInformationSCT();\n * Create an instance of {@link PersonIdentificationSEPA1Choice", "signature": "PaymentInstructionInformationSCT createPaymentInstructionInformationSCT()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_001_01/ObjectFactory.java", "implementation": "return new PersonIdentificationSEPA1Choice();\n * Create an instance of {@link ActiveOrHistoricCurrencyAndAmountSEPA", "signature": "PersonIdentificationSEPA1Choice createPersonIdentificationSEPA1Choice()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_001_01/ObjectFactory.java", "implementation": "return new ActiveOrHistoricCurrencyAndAmountSEPA();\n * Create an instance of {@link OrganisationIdentificationSEPAChoice", "signature": "ActiveOrHistoricCurrencyAndAmountSEPA createActiveOrHistoricCurrencyAndAmountSEPA()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_001_01/ObjectFactory.java", "implementation": "return new OrganisationIdentificationSEPAChoice();\n * Create an instance of {@link StructuredRemittanceInformationSEPA1", "signature": "OrganisationIdentificationSEPAChoice createOrganisationIdentificationSEPAChoice()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_001_01/ObjectFactory.java", "implementation": "return new StructuredRemittanceInformationSEPA1();\n * Create an instance of {@link CreditorReferenceInformationSEPA1", "signature": "StructuredRemittanceInformationSEPA1 createStructuredRemittanceInformationSEPA1()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_001_01/ObjectFactory.java", "implementation": "return new CreditorReferenceInformationSEPA1();\n * Create an instance of {@link GenericPersonIdentification1", "signature": "CreditorReferenceInformationSEPA1 createCreditorReferenceInformationSEPA1()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_001_01/ObjectFactory.java", "implementation": "return new GenericPersonIdentification1();\n * Create an instance of {@link DateAndPlaceOfBirth", "signature": "GenericPersonIdentification1 createGenericPersonIdentification1()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_001_01/ObjectFactory.java", "implementation": "return new DateAndPlaceOfBirth();\n * Create an instance of {@link CategoryPurposeSEPA", "signature": "DateAndPlaceOfBirth createDateAndPlaceOfBirth()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_001_01/ObjectFactory.java", "implementation": "return new CategoryPurposeSEPA();\n * Create an instance of {@link CreditorReferenceTypeSEPA", "signature": "CategoryPurposeSEPA createCategoryPurposeSEPA()" } ], "patch": "@@ -24,7 +24,7 @@\n @XmlRegistry\n public class ObjectFactory {\n \n- private final static QName _Document_QNAME = new QName(\"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", \"Document\");\n+ private final static QName _Document_QNAME = new QName(\"urn:sepade:xsd:pain.008.001.01\", \"Document\");\n \n /**\n * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.kapott.hbci.sepa.jaxb.pain_008_001_01\n@@ -42,298 +42,370 @@ public Document createDocument() {\n }\n \n /**\n- * Create an instance of {@link PaymentIdentificationSEPA }\n+ * Create an instance of {@link PartyPrivate1 }\n * \n */\n- public PaymentIdentificationSEPA createPaymentIdentificationSEPA() {\n- return new PaymentIdentificationSEPA();\n+ public PartyPrivate1 createPartyPrivate1() {\n+ return new PartyPrivate1();\n }\n \n /**\n- * Create an instance of {@link FinancialInstitutionIdentificationSEPA1 }\n+ * Create an instance of {@link DirectDebitTransactionInformation2 }\n * \n */\n- public FinancialInstitutionIdentificationSEPA1 createFinancialInstitutionIdentificationSEPA1() {\n- return new FinancialInstitutionIdentificationSEPA1();\n+ public DirectDebitTransactionInformation2 createDirectDebitTransactionInformation2() {\n+ return new DirectDebitTransactionInformation2();\n }\n \n /**\n- * Create an instance of {@link CreditorReferenceTypeCodeSEPA }\n+ * Create an instance of {@link DirectDebitTransaction4 }\n * \n */\n- public CreditorReferenceTypeCodeSEPA createCreditorReferenceTypeCodeSEPA() {\n- return new CreditorReferenceTypeCodeSEPA();\n+ public DirectDebitTransaction4 createDirectDebitTransaction4() {\n+ return new DirectDebitTransaction4();\n }\n \n /**\n- * Create an instance of {@link FinancialInstitutionIdentificationSEPA3 }\n+ * Create an instance of {@link ServiceLevel4 }\n * \n */\n- public FinancialInstitutionIdentificationSEPA3 createFinancialInstitutionIdentificationSEPA3() {\n- return new FinancialInstitutionIdentificationSEPA3();\n+ public ServiceLevel4 createServiceLevel4() {\n+ return new ServiceLevel4();\n }\n \n /**\n- * Create an instance of {@link GroupHeaderSCT }\n+ * Create an instance of {@link PersonIdentification3 }\n * \n */\n- public GroupHeaderSCT createGroupHeaderSCT() {\n- return new GroupHeaderSCT();\n+ public PersonIdentification3 createPersonIdentification3() {\n+ return new PersonIdentification3();\n }\n \n /**\n- * Create an instance of {@link GenericOrganisationIdentification1 }\n+ * Create an instance of {@link PersonIdentification4 }\n * \n */\n- public GenericOrganisationIdentification1 createGenericOrganisationIdentification1() {\n- return new GenericOrganisationIdentification1();\n+ public PersonIdentification4 createPersonIdentification4() {\n+ return new PersonIdentification4();\n }\n \n /**\n- * Create an instance of {@link PaymentTypeInformationSCT2 }\n+ * Create an instance of {@link StructuredRemittanceInformation6 }\n * \n */\n- public PaymentTypeInformationSCT2 createPaymentTypeInformationSCT2() {\n- return new PaymentTypeInformationSCT2();\n+ public StructuredRemittanceInformation6 createStructuredRemittanceInformation6() {\n+ return new StructuredRemittanceInformation6();\n }\n \n /**\n- * Create an instance of {@link PartyIdentificationSEPA2 }\n+ * Create an instance of {@link CashAccount8 }\n * \n */\n- public PartyIdentificationSEPA2 createPartyIdentificationSEPA2() {\n- return new PartyIdentificationSEPA2();\n+ public CashAccount8 createCashAccount8() {\n+ return new CashAccount8();\n }\n \n /**\n- * Create an instance of {@link PartyIdentificationSEPA1 }\n+ * Create an instance of {@link ReferredDocumentInformation1 }\n * \n */\n- public PartyIdentificationSEPA1 createPartyIdentificationSEPA1() {\n- return new PartyIdentificationSEPA1();\n+ public ReferredDocumentInformation1 createReferredDocumentInformation1() {\n+ return new ReferredDocumentInformation1();\n }\n \n /**\n- * Create an instance of {@link PaymentTypeInformationSCT1 }\n+ * Create an instance of {@link GroupHeader20 }\n * \n */\n- public PaymentTypeInformationSCT1 createPaymentTypeInformationSCT1() {\n- return new PaymentTypeInformationSCT1();\n+ public GroupHeader20 createGroupHeader20() {\n+ return new GroupHeader20();\n }\n \n /**\n- * Create an instance of {@link PurposeSEPA }\n+ * Create an instance of {@link AccountIdentification2 }\n * \n */\n- public PurposeSEPA createPurposeSEPA() {\n- return new PurposeSEPA();\n+ public AccountIdentification2 createAccountIdentification2() {\n+ return new AccountIdentification2();\n }\n \n /**\n- * Create an instance of {@link CustomerCreditTransferInitiationV03 }\n+ * Create an instance of {@link OrganisationIdentification2 }\n * \n */\n- public CustomerCreditTransferInitiationV03 createCustomerCreditTransferInitiationV03() {\n- return new CustomerCreditTransferInitiationV03();\n+ public OrganisationIdentification2 createOrganisationIdentification2() {\n+ return new OrganisationIdentification2();\n }\n \n /**\n- * Create an instance of {@link AccountIdentificationSEPA }\n+ * Create an instance of {@link ReferredDocumentAmount1Choice }\n * \n */\n- public AccountIdentificationSEPA createAccountIdentificationSEPA() {\n- return new AccountIdentificationSEPA();\n+ public ReferredDocumentAmount1Choice createReferredDocumentAmount1Choice() {\n+ return new ReferredDocumentAmount1Choice();\n }\n \n /**\n- * Create an instance of {@link BranchAndFinancialInstitutionIdentificationSEPA3 }\n+ * Create an instance of {@link CreditorReferenceType1 }\n * \n */\n- public BranchAndFinancialInstitutionIdentificationSEPA3 createBranchAndFinancialInstitutionIdentificationSEPA3() {\n- return new BranchAndFinancialInstitutionIdentificationSEPA3();\n+ public CreditorReferenceType1 createCreditorReferenceType1() {\n+ return new CreditorReferenceType1();\n }\n \n /**\n- * Create an instance of {@link PartySEPAChoice }\n+ * Create an instance of {@link Party5Choice }\n * \n */\n- public PartySEPAChoice createPartySEPAChoice() {\n- return new PartySEPAChoice();\n+ public Party5Choice createParty5Choice() {\n+ return new Party5Choice();\n }\n \n /**\n- * Create an instance of {@link BranchAndFinancialInstitutionIdentificationSEPA1 }\n+ * Create an instance of {@link PostalAddress5 }\n * \n */\n- public BranchAndFinancialInstitutionIdentificationSEPA1 createBranchAndFinancialInstitutionIdentificationSEPA1() {\n- return new BranchAndFinancialInstitutionIdentificationSEPA1();\n+ public PostalAddress5 createPostalAddress5() {\n+ return new PostalAddress5();\n }\n \n /**\n- * Create an instance of {@link PersonIdentificationSchemeName1Choice }\n+ * Create an instance of {@link CurrencyAndAmount }\n * \n */\n- public PersonIdentificationSchemeName1Choice createPersonIdentificationSchemeName1Choice() {\n- return new PersonIdentificationSchemeName1Choice();\n+ public CurrencyAndAmount createCurrencyAndAmount() {\n+ return new CurrencyAndAmount();\n }\n \n /**\n- * Create an instance of {@link RemittanceInformationSEPA1Choice }\n+ * Create an instance of {@link EuroMax9Amount }\n * \n */\n- public RemittanceInformationSEPA1Choice createRemittanceInformationSEPA1Choice() {\n- return new RemittanceInformationSEPA1Choice();\n+ public EuroMax9Amount createEuroMax9Amount() {\n+ return new EuroMax9Amount();\n }\n \n /**\n- * Create an instance of {@link ServiceLevelSEPA }\n+ * Create an instance of {@link PostalAddress1 }\n * \n */\n- public ServiceLevelSEPA createServiceLevelSEPA() {\n- return new ServiceLevelSEPA();\n+ public PostalAddress1 createPostalAddress1() {\n+ return new PostalAddress1();\n }\n \n /**\n- * Create an instance of {@link CashAccountSEPA2 }\n+ * Create an instance of {@link PartyIdentification23 }\n * \n */\n- public CashAccountSEPA2 createCashAccountSEPA2() {\n- return new CashAccountSEPA2();\n+ public PartyIdentification23 createPartyIdentification23() {\n+ return new PartyIdentification23();\n }\n \n /**\n- * Create an instance of {@link PostalAddressSEPA }\n+ * Create an instance of {@link PartyIdentification11 }\n * \n */\n- public PostalAddressSEPA createPostalAddressSEPA() {\n- return new PostalAddressSEPA();\n+ public PartyIdentification11 createPartyIdentification11() {\n+ return new PartyIdentification11();\n }\n \n /**\n- * Create an instance of {@link CashAccountSEPA1 }\n+ * Create an instance of {@link PartyIdentification22 }\n * \n */\n- public CashAccountSEPA1 createCashAccountSEPA1() {\n- return new CashAccountSEPA1();\n+ public PartyIdentification22 createPartyIdentification22() {\n+ return new PartyIdentification22();\n }\n \n /**\n- * Create an instance of {@link OthrIdentification }\n+ * Create an instance of {@link PartyIdentification12 }\n * \n */\n- public OthrIdentification createOthrIdentification() {\n- return new OthrIdentification();\n+ public PartyIdentification12 createPartyIdentification12() {\n+ return new PartyIdentification12();\n }\n \n /**\n- * Create an instance of {@link OrganisationIdentificationSchemeName1Choice }\n+ * Create an instance of {@link FinancialInstitutionIdentification4 }\n * \n */\n- public OrganisationIdentificationSchemeName1Choice createOrganisationIdentificationSchemeName1Choice() {\n- return new OrganisationIdentificationSchemeName1Choice();\n+ public FinancialInstitutionIdentification4 createFinancialInstitutionIdentification4() {\n+ return new FinancialInstitutionIdentification4();\n }\n \n /**\n- * Create an instance of {@link AmountTypeSEPA }\n+ * Create an instance of {@link PartyIdentification20 }\n * \n */\n- public AmountTypeSEPA createAmountTypeSEPA() {\n- return new AmountTypeSEPA();\n+ public PartyIdentification20 createPartyIdentification20() {\n+ return new PartyIdentification20();\n }\n \n /**\n- * Create an instance of {@link CreditTransferTransactionInformationSCT }\n+ * Create an instance of {@link ReferredDocumentType1 }\n * \n */\n- public CreditTransferTransactionInformationSCT createCreditTransferTransactionInformationSCT() {\n- return new CreditTransferTransactionInformationSCT();\n+ public ReferredDocumentType1 createReferredDocumentType1() {\n+ return new ReferredDocumentType1();\n }\n \n /**\n- * Create an instance of {@link PaymentInstructionInformationSCT }\n+ * Create an instance of {@link PaymentIdentification1 }\n * \n */\n- public PaymentInstructionInformationSCT createPaymentInstructionInformationSCT() {\n- return new PaymentInstructionInformationSCT();\n+ public PaymentIdentification1 createPaymentIdentification1() {\n+ return new PaymentIdentification1();\n }\n \n /**\n- * Create an instance of {@link PersonIdentificationSEPA1Choice }\n+ * Create an instance of {@link PartyIdentification17 }\n * \n */\n- public PersonIdentificationSEPA1Choice createPersonIdentificationSEPA1Choice() {\n- return new PersonIdentificationSEPA1Choice();\n+ public PartyIdentification17 createPartyIdentification17() {\n+ return new PartyIdentification17();\n }\n \n /**\n- * Create an instance of {@link ActiveOrHistoricCurrencyAndAmountSEPA }\n+ * Create an instance of {@link FinancialInstitutionIdentification5 }\n * \n */\n- public ActiveOrHistoricCurrencyAndAmountSEPA createActiveOrHistoricCurrencyAndAmountSEPA() {\n- return new ActiveOrHistoricCurrencyAndAmountSEPA();\n+ public FinancialInstitutionIdentification5 createFinancialInstitutionIdentification5() {\n+ return new FinancialInstitutionIdentification5();\n }\n \n /**\n- * Create an instance of {@link OrganisationIdentificationSEPAChoice }\n+ * Create an instance of {@link RemittanceInformation3 }\n * \n */\n- public OrganisationIdentificationSEPAChoice createOrganisationIdentificationSEPAChoice() {\n- return new OrganisationIdentificationSEPAChoice();\n+ public RemittanceInformation3 createRemittanceInformation3() {\n+ return new RemittanceInformation3();\n }\n \n /**\n- * Create an instance of {@link StructuredRemittanceInformationSEPA1 }\n+ * Create an instance of {@link AmendmentInformationDetails4 }\n * \n */\n- public StructuredRemittanceInformationSEPA1 createStructuredRemittanceInformationSEPA1() {\n- return new StructuredRemittanceInformationSEPA1();\n+ public AmendmentInformationDetails4 createAmendmentInformationDetails4() {\n+ return new AmendmentInformationDetails4();\n }\n \n /**\n- * Create an instance of {@link CreditorReferenceInformationSEPA1 }\n+ * Create an instance of {@link PaymentTypeInformation8 }\n * \n */\n- public CreditorReferenceInformationSEPA1 createCreditorReferenceInformationSEPA1() {\n- return new CreditorReferenceInformationSEPA1();\n+ public PaymentTypeInformation8 createPaymentTypeInformation8() {\n+ return new PaymentTypeInformation8();\n }\n \n /**\n- * Create an instance of {@link GenericPersonIdentification1 }\n+ * Create an instance of {@link PaymentInstructionInformation5 }\n * \n */\n- public GenericPersonIdentification1 createGenericPersonIdentification1() {\n- return new GenericPersonIdentification1();\n+ public PaymentInstructionInformation5 createPaymentInstructionInformation5() {\n+ return new PaymentInstructionInformation5();\n }\n \n /**\n- * Create an instance of {@link DateAndPlaceOfBirth }\n+ * Create an instance of {@link FinancialInstitution3 }\n * \n */\n- public DateAndPlaceOfBirth createDateAndPlaceOfBirth() {\n- return new DateAndPlaceOfBirth();\n+ public FinancialInstitution3 createFinancialInstitution3() {\n+ return new FinancialInstitution3();\n+ }\n+\n+ /**\n+ * Create an instance of {@link FinancialInstitution2 }\n+ * \n+ */\n+ public FinancialInstitution2 createFinancialInstitution2() {\n+ return new FinancialInstitution2();\n+ }\n+\n+ /**\n+ * Create an instance of {@link Party2Choice }\n+ * \n+ */\n+ public Party2Choice createParty2Choice() {\n+ return new Party2Choice();\n }\n \n /**\n- * Create an instance of {@link CategoryPurposeSEPA }\n+ * Create an instance of {@link Pain00800101 }\n * \n */\n- public CategoryPurposeSEPA createCategoryPurposeSEPA() {\n- return new CategoryPurposeSEPA();\n+ public Pain00800101 createPain00800101() {\n+ return new Pain00800101();\n }\n \n /**\n- * Create an instance of {@link CreditorReferenceTypeSEPA }\n+ * Create an instance of {@link PartyIdentification8 }\n * \n */\n- public CreditorReferenceTypeSEPA createCreditorReferenceTypeSEPA() {\n- return new CreditorReferenceTypeSEPA();\n+ public PartyIdentification8 createPartyIdentification8() {\n+ return new PartyIdentification8();\n+ }\n+\n+ /**\n+ * Create an instance of {@link RestrictedIdentification2 }\n+ * \n+ */\n+ public RestrictedIdentification2 createRestrictedIdentification2() {\n+ return new RestrictedIdentification2();\n+ }\n+\n+ /**\n+ * Create an instance of {@link RestrictedIdentification1 }\n+ * \n+ */\n+ public RestrictedIdentification1 createRestrictedIdentification1() {\n+ return new RestrictedIdentification1();\n+ }\n+\n+ /**\n+ * Create an instance of {@link CreditorReferenceInformation1 }\n+ * \n+ */\n+ public CreditorReferenceInformation1 createCreditorReferenceInformation1() {\n+ return new CreditorReferenceInformation1();\n+ }\n+\n+ /**\n+ * Create an instance of {@link GenericIdentification3 }\n+ * \n+ */\n+ public GenericIdentification3 createGenericIdentification3() {\n+ return new GenericIdentification3();\n+ }\n+\n+ /**\n+ * Create an instance of {@link GenericIdentification4 }\n+ * \n+ */\n+ public GenericIdentification4 createGenericIdentification4() {\n+ return new GenericIdentification4();\n+ }\n+\n+ /**\n+ * Create an instance of {@link MandateRelatedInformation4 }\n+ * \n+ */\n+ public MandateRelatedInformation4 createMandateRelatedInformation4() {\n+ return new MandateRelatedInformation4();\n+ }\n+\n+ /**\n+ * Create an instance of {@link DateAndPlaceOfBirth }\n+ * \n+ */\n+ public DateAndPlaceOfBirth createDateAndPlaceOfBirth() {\n+ return new DateAndPlaceOfBirth();\n }\n \n /**\n * Create an instance of {@link JAXBElement }{@code <}{@link Document }{@code >}}\n * \n */\n- @XmlElementDecl(namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", name = \"Document\")\n+ @XmlElementDecl(namespace = \"urn:sepade:xsd:pain.008.001.01\", name = \"Document\")\n public JAXBElement<Document> createDocument(Document value) {\n return new JAXBElement<Document>(_Document_QNAME, Document.class, null, value);\n }", "raw_url": "https://github.com/willuhn/hbci4java/raw/0f60d39106094eb564d221904d2bb7a6dc39102d/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_008_001_01%2FObjectFactory.java", "sha": "907bedb71d721b6f179d9c5773825b3732893fa2", "status": "modified" }, { "additions": 9, "blob_url": "https://github.com/willuhn/hbci4java/blob/0f60d39106094eb564d221904d2bb7a6dc39102d/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_008_002_01%2FDateAndPlaceOfBirth.java", "changes": 18, "contents_url": "https://api.github.com/repos/willuhn/hbci4java/contents/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_008_002_01%2FDateAndPlaceOfBirth.java?ref=0f60d39106094eb564d221904d2bb7a6dc39102d", "deletions": 9, "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_002_01/DateAndPlaceOfBirth.java", "new_code": " * &lt;element name=\"BirthDt\" type=\"{urn:swift:xsd:$pain.008.002.01}ISODate\"/>\n * &lt;element name=\"PrvcOfBirth\" type=\"{urn:swift:xsd:$pain.008.002.01}Max35Text\" minOccurs=\"0\"/>\n * &lt;element name=\"CityOfBirth\" type=\"{urn:swift:xsd:$pain.008.002.01}Max35Text\"/>\n * &lt;element name=\"CtryOfBirth\" type=\"{urn:swift:xsd:$pain.008.002.01}CountryCode\"/>\n@XmlType(name = \"DateAndPlaceOfBirth\", namespace = \"urn:swift:xsd:$pain.008.002.01\", propOrder = {\n @XmlElement(name = \"BirthDt\", namespace = \"urn:swift:xsd:$pain.008.002.01\", required = true)\n @XmlElement(name = \"PrvcOfBirth\", namespace = \"urn:swift:xsd:$pain.008.002.01\")\n @XmlElement(name = \"CityOfBirth\", namespace = \"urn:swift:xsd:$pain.008.002.01\", required = true)\n @XmlElement(name = \"CtryOfBirth\", namespace = \"urn:swift:xsd:$pain.008.002.01\", required = true)", "new_methods": [], "old_code": " * &lt;element name=\"BirthDt\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}ISODate\"/>\n * &lt;element name=\"PrvcOfBirth\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}Max35Text\" minOccurs=\"0\"/>\n * &lt;element name=\"CityOfBirth\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}Max35Text\"/>\n * &lt;element name=\"CtryOfBirth\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}CountryCode\"/>\n@XmlType(name = \"DateAndPlaceOfBirth\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", propOrder = {\n @XmlElement(name = \"BirthDt\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", required = true)\n @XmlElement(name = \"PrvcOfBirth\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\")\n @XmlElement(name = \"CityOfBirth\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", required = true)\n @XmlElement(name = \"CtryOfBirth\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", required = true)", "old_methods": [], "patch": "@@ -18,10 +18,10 @@\n * &lt;complexContent>\n * &lt;restriction base=\"{http://www.w3.org/2001/XMLSchema}anyType\">\n * &lt;sequence>\n- * &lt;element name=\"BirthDt\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}ISODate\"/>\n- * &lt;element name=\"PrvcOfBirth\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}Max35Text\" minOccurs=\"0\"/>\n- * &lt;element name=\"CityOfBirth\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}Max35Text\"/>\n- * &lt;element name=\"CtryOfBirth\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}CountryCode\"/>\n+ * &lt;element name=\"BirthDt\" type=\"{urn:swift:xsd:$pain.008.002.01}ISODate\"/>\n+ * &lt;element name=\"PrvcOfBirth\" type=\"{urn:swift:xsd:$pain.008.002.01}Max35Text\" minOccurs=\"0\"/>\n+ * &lt;element name=\"CityOfBirth\" type=\"{urn:swift:xsd:$pain.008.002.01}Max35Text\"/>\n+ * &lt;element name=\"CtryOfBirth\" type=\"{urn:swift:xsd:$pain.008.002.01}CountryCode\"/>\n * &lt;/sequence>\n * &lt;/restriction>\n * &lt;/complexContent>\n@@ -31,21 +31,21 @@\n * \n */\n @XmlAccessorType(XmlAccessType.FIELD)\n-@XmlType(name = \"DateAndPlaceOfBirth\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", propOrder = {\n+@XmlType(name = \"DateAndPlaceOfBirth\", namespace = \"urn:swift:xsd:$pain.008.002.01\", propOrder = {\n \"birthDt\",\n \"prvcOfBirth\",\n \"cityOfBirth\",\n \"ctryOfBirth\"\n })\n public class DateAndPlaceOfBirth {\n \n- @XmlElement(name = \"BirthDt\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", required = true)\n+ @XmlElement(name = \"BirthDt\", namespace = \"urn:swift:xsd:$pain.008.002.01\", required = true)\n protected XMLGregorianCalendar birthDt;\n- @XmlElement(name = \"PrvcOfBirth\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\")\n+ @XmlElement(name = \"PrvcOfBirth\", namespace = \"urn:swift:xsd:$pain.008.002.01\")\n protected String prvcOfBirth;\n- @XmlElement(name = \"CityOfBirth\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", required = true)\n+ @XmlElement(name = \"CityOfBirth\", namespace = \"urn:swift:xsd:$pain.008.002.01\", required = true)\n protected String cityOfBirth;\n- @XmlElement(name = \"CtryOfBirth\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", required = true)\n+ @XmlElement(name = \"CtryOfBirth\", namespace = \"urn:swift:xsd:$pain.008.002.01\", required = true)\n protected String ctryOfBirth;\n \n /**", "raw_url": "https://github.com/willuhn/hbci4java/raw/0f60d39106094eb564d221904d2bb7a6dc39102d/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_008_002_01%2FDateAndPlaceOfBirth.java", "sha": "dff00c05a834150d83b3addabe5f4e0e75fe1c23", "status": "modified" }, { "additions": 13, "blob_url": "https://github.com/willuhn/hbci4java/blob/0f60d39106094eb564d221904d2bb7a6dc39102d/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_008_002_01%2FDocument.java", "changes": 26, "contents_url": "https://api.github.com/repos/willuhn/hbci4java/contents/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_008_002_01%2FDocument.java?ref=0f60d39106094eb564d221904d2bb7a6dc39102d", "deletions": 13, "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_002_01/Document.java", "new_code": " * &lt;element name=\"pain.008.001.01\" type=\"{urn:swift:xsd:$pain.008.002.01}pain.008.001.01\"/>\n@XmlType(name = \"Document\", namespace = \"urn:swift:xsd:$pain.008.002.01\", propOrder = {\n \"pain00800101\"\n @XmlElement(name = \"pain.008.001.01\", namespace = \"urn:swift:xsd:$pain.008.002.01\", required = true)\n protected Pain00800101 pain00800101;\n * Gets the value of the pain00800101 property.\n * {@link Pain00800101 }\n public Pain00800101 getPain00800101() {\n return pain00800101;\n * Sets the value of the pain00800101 property.\n * {@link Pain00800101 }\n public void setPain00800101(Pain00800101 value) {\n this.pain00800101 = value;", "new_methods": [ { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_002_01/Document.java", "implementation": "return pain00800101;\n * Sets the value of the pain00800101 property.\n * {@link Pain00800101", "signature": "Pain00800101 getPain00800101()" } ], "old_code": " * &lt;element name=\"CstmrCdtTrfInitn\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}CustomerCreditTransferInitiationV03\"/>\n@XmlType(name = \"Document\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", propOrder = {\n \"cstmrCdtTrfInitn\"\n @XmlElement(name = \"CstmrCdtTrfInitn\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", required = true)\n protected CustomerCreditTransferInitiationV03 cstmrCdtTrfInitn;\n * Gets the value of the cstmrCdtTrfInitn property.\n * {@link CustomerCreditTransferInitiationV03 }\n public CustomerCreditTransferInitiationV03 getCstmrCdtTrfInitn() {\n return cstmrCdtTrfInitn;\n * Sets the value of the cstmrCdtTrfInitn property.\n * {@link CustomerCreditTransferInitiationV03 }\n public void setCstmrCdtTrfInitn(CustomerCreditTransferInitiationV03 value) {\n this.cstmrCdtTrfInitn = value;", "old_methods": [ { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_002_01/Document.java", "implementation": "return cstmrCdtTrfInitn;\n * Sets the value of the cstmrCdtTrfInitn property.\n * {@link CustomerCreditTransferInitiationV03", "signature": "CustomerCreditTransferInitiationV03 getCstmrCdtTrfInitn()" } ], "patch": "@@ -17,7 +17,7 @@\n * &lt;complexContent>\n * &lt;restriction base=\"{http://www.w3.org/2001/XMLSchema}anyType\">\n * &lt;sequence>\n- * &lt;element name=\"CstmrCdtTrfInitn\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}CustomerCreditTransferInitiationV03\"/>\n+ * &lt;element name=\"pain.008.001.01\" type=\"{urn:swift:xsd:$pain.008.002.01}pain.008.001.01\"/>\n * &lt;/sequence>\n * &lt;/restriction>\n * &lt;/complexContent>\n@@ -27,36 +27,36 @@\n * \n */\n @XmlAccessorType(XmlAccessType.FIELD)\n-@XmlType(name = \"Document\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", propOrder = {\n- \"cstmrCdtTrfInitn\"\n+@XmlType(name = \"Document\", namespace = \"urn:swift:xsd:$pain.008.002.01\", propOrder = {\n+ \"pain00800101\"\n })\n public class Document {\n \n- @XmlElement(name = \"CstmrCdtTrfInitn\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", required = true)\n- protected CustomerCreditTransferInitiationV03 cstmrCdtTrfInitn;\n+ @XmlElement(name = \"pain.008.001.01\", namespace = \"urn:swift:xsd:$pain.008.002.01\", required = true)\n+ protected Pain00800101 pain00800101;\n \n /**\n- * Gets the value of the cstmrCdtTrfInitn property.\n+ * Gets the value of the pain00800101 property.\n * \n * @return\n * possible object is\n- * {@link CustomerCreditTransferInitiationV03 }\n+ * {@link Pain00800101 }\n * \n */\n- public CustomerCreditTransferInitiationV03 getCstmrCdtTrfInitn() {\n- return cstmrCdtTrfInitn;\n+ public Pain00800101 getPain00800101() {\n+ return pain00800101;\n }\n \n /**\n- * Sets the value of the cstmrCdtTrfInitn property.\n+ * Sets the value of the pain00800101 property.\n * \n * @param value\n * allowed object is\n- * {@link CustomerCreditTransferInitiationV03 }\n+ * {@link Pain00800101 }\n * \n */\n- public void setCstmrCdtTrfInitn(CustomerCreditTransferInitiationV03 value) {\n- this.cstmrCdtTrfInitn = value;\n+ public void setPain00800101(Pain00800101 value) {\n+ this.pain00800101 = value;\n }\n \n }", "raw_url": "https://github.com/willuhn/hbci4java/raw/0f60d39106094eb564d221904d2bb7a6dc39102d/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_008_002_01%2FDocument.java", "sha": "2d58c4a2a98bffd3b95ff48a735096f490dcb940", "status": "modified" }, { "additions": 139, "blob_url": "https://github.com/willuhn/hbci4java/blob/0f60d39106094eb564d221904d2bb7a6dc39102d/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_008_002_01%2FObjectFactory.java", "changes": 246, "contents_url": "https://api.github.com/repos/willuhn/hbci4java/contents/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_008_002_01%2FObjectFactory.java?ref=0f60d39106094eb564d221904d2bb7a6dc39102d", "deletions": 107, "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_002_01/ObjectFactory.java", "new_code": " private final static QName _Document_QNAME = new QName(\"urn:swift:xsd:$pain.008.002.01\", \"Document\");\n * Create an instance of {@link PaymentTypeInformationSDD }\n public PaymentTypeInformationSDD createPaymentTypeInformationSDD() {\n return new PaymentTypeInformationSDD();\n * Create an instance of {@link PartySDD }\n public PartySDD createPartySDD() {\n return new PartySDD();\n * Create an instance of {@link PartySDDChoice }\n public PartySDDChoice createPartySDDChoice() {\n return new PartySDDChoice();\n * Create an instance of {@link PartyIdentificationSDD2 }\n public PartyIdentificationSDD2 createPartyIdentificationSDD2() {\n return new PartyIdentificationSDD2();\n * Create an instance of {@link PartyIdentificationSDD1 }\n public PartyIdentificationSDD1 createPartyIdentificationSDD1() {\n return new PartyIdentificationSDD1();\n * Create an instance of {@link PartyIdentificationSDD5 }\n public PartyIdentificationSDD5 createPartyIdentificationSDD5() {\n return new PartyIdentificationSDD5();\n * Create an instance of {@link PartyIdentificationSDD4 }\n public PartyIdentificationSDD4 createPartyIdentificationSDD4() {\n return new PartyIdentificationSDD4();\n * Create an instance of {@link PartyIdentificationSDD3 }\n public PartyIdentificationSDD3 createPartyIdentificationSDD3() {\n return new PartyIdentificationSDD3();\n * Create an instance of {@link AmendmentInformationDetailsSDD }\n public AmendmentInformationDetailsSDD createAmendmentInformationDetailsSDD() {\n return new AmendmentInformationDetailsSDD();\n * Create an instance of {@link CurrencyAndAmountSDD }\n public CurrencyAndAmountSDD createCurrencyAndAmountSDD() {\n return new CurrencyAndAmountSDD();\n * Create an instance of {@link CreditorReferenceInformationSDD }\n public CreditorReferenceInformationSDD createCreditorReferenceInformationSDD() {\n return new CreditorReferenceInformationSDD();\n * Create an instance of {@link GenericIdentificationSDD }\n public GenericIdentificationSDD createGenericIdentificationSDD() {\n return new GenericIdentificationSDD();\n * Create an instance of {@link DirectDebitTransactionSDD }\n public DirectDebitTransactionSDD createDirectDebitTransactionSDD() {\n return new DirectDebitTransactionSDD();\n * Create an instance of {@link RestrictedIdentificationSDD }\n public RestrictedIdentificationSDD createRestrictedIdentificationSDD() {\n return new RestrictedIdentificationSDD();\n * Create an instance of {@link LocalInstrumentSDD }\n public LocalInstrumentSDD createLocalInstrumentSDD() {\n return new LocalInstrumentSDD();\n * Create an instance of {@link PostalAddressSDD }\n public PostalAddressSDD createPostalAddressSDD() {\n return new PostalAddressSDD();\n * Create an instance of {@link ServiceLevelSDD }\n public ServiceLevelSDD createServiceLevelSDD() {\n return new ServiceLevelSDD();\n * Create an instance of {@link PaymentIdentification1 }\n public PaymentIdentification1 createPaymentIdentification1() {\n return new PaymentIdentification1();\n * Create an instance of {@link CashAccountSDD2 }\n public CashAccountSDD2 createCashAccountSDD2() {\n return new CashAccountSDD2();\n * Create an instance of {@link CashAccountSDD1 }\n public CashAccountSDD1 createCashAccountSDD1() {\n return new CashAccountSDD1();\n * Create an instance of {@link AccountIdentificationSDD }\n public AccountIdentificationSDD createAccountIdentificationSDD() {\n return new AccountIdentificationSDD();\n * Create an instance of {@link OrganisationIdentificationSDDChoice }\n public OrganisationIdentificationSDDChoice createOrganisationIdentificationSDDChoice() {\n return new OrganisationIdentificationSDDChoice();\n * Create an instance of {@link StructuredRemittanceInformationSDD }\n public StructuredRemittanceInformationSDD createStructuredRemittanceInformationSDD() {\n return new StructuredRemittanceInformationSDD();\n * Create an instance of {@link RemittanceInformationSDDChoice }\n public RemittanceInformationSDDChoice createRemittanceInformationSDDChoice() {\n return new RemittanceInformationSDDChoice();\n * Create an instance of {@link PurposeSDD }\n public PurposeSDD createPurposeSDD() {\n return new PurposeSDD();\n * Create an instance of {@link PersonIdentificationSDD1 }\n public PersonIdentificationSDD1 createPersonIdentificationSDD1() {\n return new PersonIdentificationSDD1();\n * Create an instance of {@link PersonIdentificationSDD2 }\n public PersonIdentificationSDD2 createPersonIdentificationSDD2() {\n return new PersonIdentificationSDD2();\n * Create an instance of {@link PaymentInstructionInformationSDD }\n public PaymentInstructionInformationSDD createPaymentInstructionInformationSDD() {\n return new PaymentInstructionInformationSDD();\n * Create an instance of {@link Pain00800101 }\n public Pain00800101 createPain00800101() {\n return new Pain00800101();\n * Create an instance of {@link DirectDebitTransactionInformationSDD }\n public DirectDebitTransactionInformationSDD createDirectDebitTransactionInformationSDD() {\n return new DirectDebitTransactionInformationSDD();\n * Create an instance of {@link MandateRelatedInformationSDD }\n public MandateRelatedInformationSDD createMandateRelatedInformationSDD() {\n return new MandateRelatedInformationSDD();\n * Create an instance of {@link CreditorReferenceTypeSDD }\n public CreditorReferenceTypeSDD createCreditorReferenceTypeSDD() {\n return new CreditorReferenceTypeSDD();\n * Create an instance of {@link BranchAndFinancialInstitutionIdentificationSDD2 }\n public BranchAndFinancialInstitutionIdentificationSDD2 createBranchAndFinancialInstitutionIdentificationSDD2() {\n return new BranchAndFinancialInstitutionIdentificationSDD2();\n }\n\n /**\n * Create an instance of {@link BranchAndFinancialInstitutionIdentificationSDD1 }\n * \n */\n public BranchAndFinancialInstitutionIdentificationSDD1 createBranchAndFinancialInstitutionIdentificationSDD1() {\n return new BranchAndFinancialInstitutionIdentificationSDD1();\n }\n\n /**\n * Create an instance of {@link GenericIdentification3 }\n * \n */\n public GenericIdentification3 createGenericIdentification3() {\n return new GenericIdentification3();\n }\n\n /**\n * Create an instance of {@link GenericIdentification4 }\n * \n */\n public GenericIdentification4 createGenericIdentification4() {\n return new GenericIdentification4();\n * Create an instance of {@link FinancialInstitutionIdentificationSDD2 }\n * \n */\n public FinancialInstitutionIdentificationSDD2 createFinancialInstitutionIdentificationSDD2() {\n return new FinancialInstitutionIdentificationSDD2();\n }\n\n /**\n * Create an instance of {@link FinancialInstitutionIdentificationSDD1 }\n public FinancialInstitutionIdentificationSDD1 createFinancialInstitutionIdentificationSDD1() {\n return new FinancialInstitutionIdentificationSDD1();\n * Create an instance of {@link GroupHeaderSDD }\n public GroupHeaderSDD createGroupHeaderSDD() {\n return new GroupHeaderSDD();\n @XmlElementDecl(namespace = \"urn:swift:xsd:$pain.008.002.01\", name = \"Document\")", "new_methods": [ { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_002_01/ObjectFactory.java", "implementation": "return new PaymentTypeInformationSDD();\n * Create an instance of {@link PartySDD", "signature": "PaymentTypeInformationSDD createPaymentTypeInformationSDD()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_002_01/ObjectFactory.java", "implementation": "return new PartySDD();\n * Create an instance of {@link PartySDDChoice", "signature": "PartySDD createPartySDD()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_002_01/ObjectFactory.java", "implementation": "return new PartySDDChoice();\n * Create an instance of {@link PartyIdentificationSDD2", "signature": "PartySDDChoice createPartySDDChoice()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_002_01/ObjectFactory.java", "implementation": "return new PartyIdentificationSDD2();\n * Create an instance of {@link PartyIdentificationSDD1", "signature": "PartyIdentificationSDD2 createPartyIdentificationSDD2()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_002_01/ObjectFactory.java", "implementation": "return new PartyIdentificationSDD1();\n * Create an instance of {@link PartyIdentificationSDD5", "signature": "PartyIdentificationSDD1 createPartyIdentificationSDD1()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_002_01/ObjectFactory.java", "implementation": "return new PartyIdentificationSDD5();\n * Create an instance of {@link PartyIdentificationSDD4", "signature": "PartyIdentificationSDD5 createPartyIdentificationSDD5()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_002_01/ObjectFactory.java", "implementation": "return new PartyIdentificationSDD4();\n * Create an instance of {@link PartyIdentificationSDD3", "signature": "PartyIdentificationSDD4 createPartyIdentificationSDD4()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_002_01/ObjectFactory.java", "implementation": "return new PartyIdentificationSDD3();\n * Create an instance of {@link AmendmentInformationDetailsSDD", "signature": "PartyIdentificationSDD3 createPartyIdentificationSDD3()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_002_01/ObjectFactory.java", "implementation": "return new AmendmentInformationDetailsSDD();\n * Create an instance of {@link CurrencyAndAmountSDD", "signature": "AmendmentInformationDetailsSDD createAmendmentInformationDetailsSDD()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_002_01/ObjectFactory.java", "implementation": "return new CurrencyAndAmountSDD();\n * Create an instance of {@link CreditorReferenceInformationSDD", "signature": "CurrencyAndAmountSDD createCurrencyAndAmountSDD()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_002_01/ObjectFactory.java", "implementation": "return new CreditorReferenceInformationSDD();\n * Create an instance of {@link GenericIdentificationSDD", "signature": "CreditorReferenceInformationSDD createCreditorReferenceInformationSDD()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_002_01/ObjectFactory.java", "implementation": "return new GenericIdentificationSDD();\n * Create an instance of {@link DirectDebitTransactionSDD", "signature": "GenericIdentificationSDD createGenericIdentificationSDD()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_002_01/ObjectFactory.java", "implementation": "return new DirectDebitTransactionSDD();\n * Create an instance of {@link RestrictedIdentificationSDD", "signature": "DirectDebitTransactionSDD createDirectDebitTransactionSDD()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_002_01/ObjectFactory.java", "implementation": "return new RestrictedIdentificationSDD();\n * Create an instance of {@link LocalInstrumentSDD", "signature": "RestrictedIdentificationSDD createRestrictedIdentificationSDD()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_002_01/ObjectFactory.java", "implementation": "return new LocalInstrumentSDD();\n * Create an instance of {@link PostalAddressSDD", "signature": "LocalInstrumentSDD createLocalInstrumentSDD()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_002_01/ObjectFactory.java", "implementation": "return new PostalAddressSDD();\n * Create an instance of {@link ServiceLevelSDD", "signature": "PostalAddressSDD createPostalAddressSDD()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_002_01/ObjectFactory.java", "implementation": "return new ServiceLevelSDD();\n * Create an instance of {@link PaymentIdentification1", "signature": "ServiceLevelSDD createServiceLevelSDD()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_002_01/ObjectFactory.java", "implementation": "return new PaymentIdentification1();\n * Create an instance of {@link CashAccountSDD2", "signature": "PaymentIdentification1 createPaymentIdentification1()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_002_01/ObjectFactory.java", "implementation": "return new CashAccountSDD2();\n * Create an instance of {@link CashAccountSDD1", "signature": "CashAccountSDD2 createCashAccountSDD2()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_002_01/ObjectFactory.java", "implementation": "return new CashAccountSDD1();\n * Create an instance of {@link AccountIdentificationSDD", "signature": "CashAccountSDD1 createCashAccountSDD1()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_002_01/ObjectFactory.java", "implementation": "return new AccountIdentificationSDD();\n * Create an instance of {@link OrganisationIdentificationSDDChoice", "signature": "AccountIdentificationSDD createAccountIdentificationSDD()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_002_01/ObjectFactory.java", "implementation": "return new OrganisationIdentificationSDDChoice();\n * Create an instance of {@link StructuredRemittanceInformationSDD", "signature": "OrganisationIdentificationSDDChoice createOrganisationIdentificationSDDChoice()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_002_01/ObjectFactory.java", "implementation": "return new StructuredRemittanceInformationSDD();\n * Create an instance of {@link RemittanceInformationSDDChoice", "signature": "StructuredRemittanceInformationSDD createStructuredRemittanceInformationSDD()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_002_01/ObjectFactory.java", "implementation": "return new RemittanceInformationSDDChoice();\n * Create an instance of {@link PurposeSDD", "signature": "RemittanceInformationSDDChoice createRemittanceInformationSDDChoice()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_002_01/ObjectFactory.java", "implementation": "return new PurposeSDD();\n * Create an instance of {@link PersonIdentificationSDD1", "signature": "PurposeSDD createPurposeSDD()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_002_01/ObjectFactory.java", "implementation": "return new PersonIdentificationSDD1();\n * Create an instance of {@link PersonIdentificationSDD2", "signature": "PersonIdentificationSDD1 createPersonIdentificationSDD1()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_002_01/ObjectFactory.java", "implementation": "return new PersonIdentificationSDD2();\n * Create an instance of {@link PaymentInstructionInformationSDD", "signature": "PersonIdentificationSDD2 createPersonIdentificationSDD2()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_002_01/ObjectFactory.java", "implementation": "return new PaymentInstructionInformationSDD();\n * Create an instance of {@link Pain00800101", "signature": "PaymentInstructionInformationSDD createPaymentInstructionInformationSDD()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_002_01/ObjectFactory.java", "implementation": "return new Pain00800101();\n * Create an instance of {@link DirectDebitTransactionInformationSDD", "signature": "Pain00800101 createPain00800101()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_002_01/ObjectFactory.java", "implementation": "return new DirectDebitTransactionInformationSDD();\n * Create an instance of {@link MandateRelatedInformationSDD", "signature": "DirectDebitTransactionInformationSDD createDirectDebitTransactionInformationSDD()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_002_01/ObjectFactory.java", "implementation": "return new MandateRelatedInformationSDD();\n * Create an instance of {@link CreditorReferenceTypeSDD", "signature": "MandateRelatedInformationSDD createMandateRelatedInformationSDD()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_002_01/ObjectFactory.java", "implementation": "return new CreditorReferenceTypeSDD();\n * Create an instance of {@link BranchAndFinancialInstitutionIdentificationSDD2", "signature": "CreditorReferenceTypeSDD createCreditorReferenceTypeSDD()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_002_01/ObjectFactory.java", "implementation": "return new BranchAndFinancialInstitutionIdentificationSDD2();", "signature": "BranchAndFinancialInstitutionIdentificationSDD2 createBranchAndFinancialInstitutionIdentificationSDD2()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_002_01/ObjectFactory.java", "implementation": "return new BranchAndFinancialInstitutionIdentificationSDD1();", "signature": "BranchAndFinancialInstitutionIdentificationSDD1 createBranchAndFinancialInstitutionIdentificationSDD1()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_002_01/ObjectFactory.java", "implementation": "return new GenericIdentification3();", "signature": "GenericIdentification3 createGenericIdentification3()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_002_01/ObjectFactory.java", "implementation": "return new GenericIdentification4();\n * Create an instance of {@link FinancialInstitutionIdentificationSDD2", "signature": "GenericIdentification4 createGenericIdentification4()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_002_01/ObjectFactory.java", "implementation": "return new FinancialInstitutionIdentificationSDD2();", "signature": "FinancialInstitutionIdentificationSDD2 createFinancialInstitutionIdentificationSDD2()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_002_01/ObjectFactory.java", "implementation": "return new FinancialInstitutionIdentificationSDD1();\n * Create an instance of {@link GroupHeaderSDD", "signature": "FinancialInstitutionIdentificationSDD1 createFinancialInstitutionIdentificationSDD1()" } ], "old_code": " private final static QName _Document_QNAME = new QName(\"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", \"Document\");\n * Create an instance of {@link PaymentIdentificationSEPA }\n public PaymentIdentificationSEPA createPaymentIdentificationSEPA() {\n return new PaymentIdentificationSEPA();\n * Create an instance of {@link FinancialInstitutionIdentificationSEPA1 }\n public FinancialInstitutionIdentificationSEPA1 createFinancialInstitutionIdentificationSEPA1() {\n return new FinancialInstitutionIdentificationSEPA1();\n * Create an instance of {@link CreditorReferenceTypeCodeSEPA }\n public CreditorReferenceTypeCodeSEPA createCreditorReferenceTypeCodeSEPA() {\n return new CreditorReferenceTypeCodeSEPA();\n * Create an instance of {@link FinancialInstitutionIdentificationSEPA3 }\n public FinancialInstitutionIdentificationSEPA3 createFinancialInstitutionIdentificationSEPA3() {\n return new FinancialInstitutionIdentificationSEPA3();\n * Create an instance of {@link GroupHeaderSCT }\n public GroupHeaderSCT createGroupHeaderSCT() {\n return new GroupHeaderSCT();\n * Create an instance of {@link GenericOrganisationIdentification1 }\n public GenericOrganisationIdentification1 createGenericOrganisationIdentification1() {\n return new GenericOrganisationIdentification1();\n * Create an instance of {@link PaymentTypeInformationSCT2 }\n public PaymentTypeInformationSCT2 createPaymentTypeInformationSCT2() {\n return new PaymentTypeInformationSCT2();\n * Create an instance of {@link PartyIdentificationSEPA2 }\n public PartyIdentificationSEPA2 createPartyIdentificationSEPA2() {\n return new PartyIdentificationSEPA2();\n * Create an instance of {@link PartyIdentificationSEPA1 }\n public PartyIdentificationSEPA1 createPartyIdentificationSEPA1() {\n return new PartyIdentificationSEPA1();\n * Create an instance of {@link PaymentTypeInformationSCT1 }\n public PaymentTypeInformationSCT1 createPaymentTypeInformationSCT1() {\n return new PaymentTypeInformationSCT1();\n * Create an instance of {@link PurposeSEPA }\n public PurposeSEPA createPurposeSEPA() {\n return new PurposeSEPA();\n * Create an instance of {@link CustomerCreditTransferInitiationV03 }\n public CustomerCreditTransferInitiationV03 createCustomerCreditTransferInitiationV03() {\n return new CustomerCreditTransferInitiationV03();\n * Create an instance of {@link AccountIdentificationSEPA }\n public AccountIdentificationSEPA createAccountIdentificationSEPA() {\n return new AccountIdentificationSEPA();\n * Create an instance of {@link BranchAndFinancialInstitutionIdentificationSEPA3 }\n public BranchAndFinancialInstitutionIdentificationSEPA3 createBranchAndFinancialInstitutionIdentificationSEPA3() {\n return new BranchAndFinancialInstitutionIdentificationSEPA3();\n * Create an instance of {@link PartySEPAChoice }\n public PartySEPAChoice createPartySEPAChoice() {\n return new PartySEPAChoice();\n * Create an instance of {@link BranchAndFinancialInstitutionIdentificationSEPA1 }\n public BranchAndFinancialInstitutionIdentificationSEPA1 createBranchAndFinancialInstitutionIdentificationSEPA1() {\n return new BranchAndFinancialInstitutionIdentificationSEPA1();\n * Create an instance of {@link PersonIdentificationSchemeName1Choice }\n public PersonIdentificationSchemeName1Choice createPersonIdentificationSchemeName1Choice() {\n return new PersonIdentificationSchemeName1Choice();\n * Create an instance of {@link RemittanceInformationSEPA1Choice }\n public RemittanceInformationSEPA1Choice createRemittanceInformationSEPA1Choice() {\n return new RemittanceInformationSEPA1Choice();\n * Create an instance of {@link ServiceLevelSEPA }\n public ServiceLevelSEPA createServiceLevelSEPA() {\n return new ServiceLevelSEPA();\n * Create an instance of {@link CashAccountSEPA2 }\n public CashAccountSEPA2 createCashAccountSEPA2() {\n return new CashAccountSEPA2();\n * Create an instance of {@link PostalAddressSEPA }\n public PostalAddressSEPA createPostalAddressSEPA() {\n return new PostalAddressSEPA();\n * Create an instance of {@link CashAccountSEPA1 }\n public CashAccountSEPA1 createCashAccountSEPA1() {\n return new CashAccountSEPA1();\n * Create an instance of {@link OthrIdentification }\n public OthrIdentification createOthrIdentification() {\n return new OthrIdentification();\n * Create an instance of {@link OrganisationIdentificationSchemeName1Choice }\n public OrganisationIdentificationSchemeName1Choice createOrganisationIdentificationSchemeName1Choice() {\n return new OrganisationIdentificationSchemeName1Choice();\n * Create an instance of {@link AmountTypeSEPA }\n public AmountTypeSEPA createAmountTypeSEPA() {\n return new AmountTypeSEPA();\n * Create an instance of {@link CreditTransferTransactionInformationSCT }\n public CreditTransferTransactionInformationSCT createCreditTransferTransactionInformationSCT() {\n return new CreditTransferTransactionInformationSCT();\n * Create an instance of {@link PaymentInstructionInformationSCT }\n public PaymentInstructionInformationSCT createPaymentInstructionInformationSCT() {\n return new PaymentInstructionInformationSCT();\n * Create an instance of {@link PersonIdentificationSEPA1Choice }\n public PersonIdentificationSEPA1Choice createPersonIdentificationSEPA1Choice() {\n return new PersonIdentificationSEPA1Choice();\n * Create an instance of {@link ActiveOrHistoricCurrencyAndAmountSEPA }\n public ActiveOrHistoricCurrencyAndAmountSEPA createActiveOrHistoricCurrencyAndAmountSEPA() {\n return new ActiveOrHistoricCurrencyAndAmountSEPA();\n * Create an instance of {@link OrganisationIdentificationSEPAChoice }\n public OrganisationIdentificationSEPAChoice createOrganisationIdentificationSEPAChoice() {\n return new OrganisationIdentificationSEPAChoice();\n * Create an instance of {@link StructuredRemittanceInformationSEPA1 }\n public StructuredRemittanceInformationSEPA1 createStructuredRemittanceInformationSEPA1() {\n return new StructuredRemittanceInformationSEPA1();\n * Create an instance of {@link CreditorReferenceInformationSEPA1 }\n public CreditorReferenceInformationSEPA1 createCreditorReferenceInformationSEPA1() {\n return new CreditorReferenceInformationSEPA1();\n * Create an instance of {@link GenericPersonIdentification1 }\n public GenericPersonIdentification1 createGenericPersonIdentification1() {\n return new GenericPersonIdentification1();\n * Create an instance of {@link CategoryPurposeSEPA }\n public CategoryPurposeSEPA createCategoryPurposeSEPA() {\n return new CategoryPurposeSEPA();\n * Create an instance of {@link CreditorReferenceTypeSEPA }\n public CreditorReferenceTypeSEPA createCreditorReferenceTypeSEPA() {\n return new CreditorReferenceTypeSEPA();\n @XmlElementDecl(namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", name = \"Document\")", "old_methods": [ { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_002_01/ObjectFactory.java", "implementation": "return new PaymentIdentificationSEPA();\n * Create an instance of {@link FinancialInstitutionIdentificationSEPA1", "signature": "PaymentIdentificationSEPA createPaymentIdentificationSEPA()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_002_01/ObjectFactory.java", "implementation": "return new FinancialInstitutionIdentificationSEPA1();\n * Create an instance of {@link CreditorReferenceTypeCodeSEPA", "signature": "FinancialInstitutionIdentificationSEPA1 createFinancialInstitutionIdentificationSEPA1()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_002_01/ObjectFactory.java", "implementation": "return new CreditorReferenceTypeCodeSEPA();\n * Create an instance of {@link FinancialInstitutionIdentificationSEPA3", "signature": "CreditorReferenceTypeCodeSEPA createCreditorReferenceTypeCodeSEPA()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_002_01/ObjectFactory.java", "implementation": "return new FinancialInstitutionIdentificationSEPA3();\n * Create an instance of {@link GroupHeaderSCT", "signature": "FinancialInstitutionIdentificationSEPA3 createFinancialInstitutionIdentificationSEPA3()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_002_01/ObjectFactory.java", "implementation": "return new GroupHeaderSCT();\n * Create an instance of {@link GenericOrganisationIdentification1", "signature": "GroupHeaderSCT createGroupHeaderSCT()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_002_01/ObjectFactory.java", "implementation": "return new GenericOrganisationIdentification1();\n * Create an instance of {@link PaymentTypeInformationSCT2", "signature": "GenericOrganisationIdentification1 createGenericOrganisationIdentification1()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_002_01/ObjectFactory.java", "implementation": "return new PaymentTypeInformationSCT2();\n * Create an instance of {@link PartyIdentificationSEPA2", "signature": "PaymentTypeInformationSCT2 createPaymentTypeInformationSCT2()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_002_01/ObjectFactory.java", "implementation": "return new PartyIdentificationSEPA2();\n * Create an instance of {@link PartyIdentificationSEPA1", "signature": "PartyIdentificationSEPA2 createPartyIdentificationSEPA2()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_002_01/ObjectFactory.java", "implementation": "return new PartyIdentificationSEPA1();\n * Create an instance of {@link PaymentTypeInformationSCT1", "signature": "PartyIdentificationSEPA1 createPartyIdentificationSEPA1()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_002_01/ObjectFactory.java", "implementation": "return new PaymentTypeInformationSCT1();\n * Create an instance of {@link PurposeSEPA", "signature": "PaymentTypeInformationSCT1 createPaymentTypeInformationSCT1()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_002_01/ObjectFactory.java", "implementation": "return new PurposeSEPA();\n * Create an instance of {@link CustomerCreditTransferInitiationV03", "signature": "PurposeSEPA createPurposeSEPA()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_002_01/ObjectFactory.java", "implementation": "return new CustomerCreditTransferInitiationV03();\n * Create an instance of {@link AccountIdentificationSEPA", "signature": "CustomerCreditTransferInitiationV03 createCustomerCreditTransferInitiationV03()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_002_01/ObjectFactory.java", "implementation": "return new AccountIdentificationSEPA();\n * Create an instance of {@link BranchAndFinancialInstitutionIdentificationSEPA3", "signature": "AccountIdentificationSEPA createAccountIdentificationSEPA()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_002_01/ObjectFactory.java", "implementation": "return new BranchAndFinancialInstitutionIdentificationSEPA3();\n * Create an instance of {@link PartySEPAChoice", "signature": "BranchAndFinancialInstitutionIdentificationSEPA3 createBranchAndFinancialInstitutionIdentificationSEPA3()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_002_01/ObjectFactory.java", "implementation": "return new PartySEPAChoice();\n * Create an instance of {@link BranchAndFinancialInstitutionIdentificationSEPA1", "signature": "PartySEPAChoice createPartySEPAChoice()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_002_01/ObjectFactory.java", "implementation": "return new BranchAndFinancialInstitutionIdentificationSEPA1();\n * Create an instance of {@link PersonIdentificationSchemeName1Choice", "signature": "BranchAndFinancialInstitutionIdentificationSEPA1 createBranchAndFinancialInstitutionIdentificationSEPA1()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_002_01/ObjectFactory.java", "implementation": "return new PersonIdentificationSchemeName1Choice();\n * Create an instance of {@link RemittanceInformationSEPA1Choice", "signature": "PersonIdentificationSchemeName1Choice createPersonIdentificationSchemeName1Choice()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_002_01/ObjectFactory.java", "implementation": "return new RemittanceInformationSEPA1Choice();\n * Create an instance of {@link ServiceLevelSEPA", "signature": "RemittanceInformationSEPA1Choice createRemittanceInformationSEPA1Choice()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_002_01/ObjectFactory.java", "implementation": "return new ServiceLevelSEPA();\n * Create an instance of {@link CashAccountSEPA2", "signature": "ServiceLevelSEPA createServiceLevelSEPA()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_002_01/ObjectFactory.java", "implementation": "return new CashAccountSEPA2();\n * Create an instance of {@link PostalAddressSEPA", "signature": "CashAccountSEPA2 createCashAccountSEPA2()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_002_01/ObjectFactory.java", "implementation": "return new PostalAddressSEPA();\n * Create an instance of {@link CashAccountSEPA1", "signature": "PostalAddressSEPA createPostalAddressSEPA()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_002_01/ObjectFactory.java", "implementation": "return new CashAccountSEPA1();\n * Create an instance of {@link OthrIdentification", "signature": "CashAccountSEPA1 createCashAccountSEPA1()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_002_01/ObjectFactory.java", "implementation": "return new OthrIdentification();\n * Create an instance of {@link OrganisationIdentificationSchemeName1Choice", "signature": "OthrIdentification createOthrIdentification()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_002_01/ObjectFactory.java", "implementation": "return new OrganisationIdentificationSchemeName1Choice();\n * Create an instance of {@link AmountTypeSEPA", "signature": "OrganisationIdentificationSchemeName1Choice createOrganisationIdentificationSchemeName1Choice()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_002_01/ObjectFactory.java", "implementation": "return new AmountTypeSEPA();\n * Create an instance of {@link CreditTransferTransactionInformationSCT", "signature": "AmountTypeSEPA createAmountTypeSEPA()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_002_01/ObjectFactory.java", "implementation": "return new CreditTransferTransactionInformationSCT();\n * Create an instance of {@link PaymentInstructionInformationSCT", "signature": "CreditTransferTransactionInformationSCT createCreditTransferTransactionInformationSCT()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_002_01/ObjectFactory.java", "implementation": "return new PaymentInstructionInformationSCT();\n * Create an instance of {@link PersonIdentificationSEPA1Choice", "signature": "PaymentInstructionInformationSCT createPaymentInstructionInformationSCT()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_002_01/ObjectFactory.java", "implementation": "return new PersonIdentificationSEPA1Choice();\n * Create an instance of {@link ActiveOrHistoricCurrencyAndAmountSEPA", "signature": "PersonIdentificationSEPA1Choice createPersonIdentificationSEPA1Choice()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_002_01/ObjectFactory.java", "implementation": "return new ActiveOrHistoricCurrencyAndAmountSEPA();\n * Create an instance of {@link OrganisationIdentificationSEPAChoice", "signature": "ActiveOrHistoricCurrencyAndAmountSEPA createActiveOrHistoricCurrencyAndAmountSEPA()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_002_01/ObjectFactory.java", "implementation": "return new OrganisationIdentificationSEPAChoice();\n * Create an instance of {@link StructuredRemittanceInformationSEPA1", "signature": "OrganisationIdentificationSEPAChoice createOrganisationIdentificationSEPAChoice()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_002_01/ObjectFactory.java", "implementation": "return new StructuredRemittanceInformationSEPA1();\n * Create an instance of {@link CreditorReferenceInformationSEPA1", "signature": "StructuredRemittanceInformationSEPA1 createStructuredRemittanceInformationSEPA1()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_002_01/ObjectFactory.java", "implementation": "return new CreditorReferenceInformationSEPA1();\n * Create an instance of {@link GenericPersonIdentification1", "signature": "CreditorReferenceInformationSEPA1 createCreditorReferenceInformationSEPA1()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_002_01/ObjectFactory.java", "implementation": "return new GenericPersonIdentification1();\n * Create an instance of {@link CategoryPurposeSEPA", "signature": "GenericPersonIdentification1 createGenericPersonIdentification1()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_002_01/ObjectFactory.java", "implementation": "return new CategoryPurposeSEPA();\n * Create an instance of {@link CreditorReferenceTypeSEPA", "signature": "CategoryPurposeSEPA createCategoryPurposeSEPA()" } ], "patch": "@@ -24,7 +24,7 @@\n @XmlRegistry\n public class ObjectFactory {\n \n- private final static QName _Document_QNAME = new QName(\"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", \"Document\");\n+ private final static QName _Document_QNAME = new QName(\"urn:swift:xsd:$pain.008.002.01\", \"Document\");\n \n /**\n * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.kapott.hbci.sepa.jaxb.pain_008_002_01\n@@ -42,267 +42,291 @@ public Document createDocument() {\n }\n \n /**\n- * Create an instance of {@link PaymentIdentificationSEPA }\n+ * Create an instance of {@link PaymentTypeInformationSDD }\n * \n */\n- public PaymentIdentificationSEPA createPaymentIdentificationSEPA() {\n- return new PaymentIdentificationSEPA();\n+ public PaymentTypeInformationSDD createPaymentTypeInformationSDD() {\n+ return new PaymentTypeInformationSDD();\n }\n \n /**\n- * Create an instance of {@link FinancialInstitutionIdentificationSEPA1 }\n+ * Create an instance of {@link PartySDD }\n * \n */\n- public FinancialInstitutionIdentificationSEPA1 createFinancialInstitutionIdentificationSEPA1() {\n- return new FinancialInstitutionIdentificationSEPA1();\n+ public PartySDD createPartySDD() {\n+ return new PartySDD();\n }\n \n /**\n- * Create an instance of {@link CreditorReferenceTypeCodeSEPA }\n+ * Create an instance of {@link PartySDDChoice }\n * \n */\n- public CreditorReferenceTypeCodeSEPA createCreditorReferenceTypeCodeSEPA() {\n- return new CreditorReferenceTypeCodeSEPA();\n+ public PartySDDChoice createPartySDDChoice() {\n+ return new PartySDDChoice();\n }\n \n /**\n- * Create an instance of {@link FinancialInstitutionIdentificationSEPA3 }\n+ * Create an instance of {@link PartyIdentificationSDD2 }\n * \n */\n- public FinancialInstitutionIdentificationSEPA3 createFinancialInstitutionIdentificationSEPA3() {\n- return new FinancialInstitutionIdentificationSEPA3();\n+ public PartyIdentificationSDD2 createPartyIdentificationSDD2() {\n+ return new PartyIdentificationSDD2();\n }\n \n /**\n- * Create an instance of {@link GroupHeaderSCT }\n+ * Create an instance of {@link PartyIdentificationSDD1 }\n * \n */\n- public GroupHeaderSCT createGroupHeaderSCT() {\n- return new GroupHeaderSCT();\n+ public PartyIdentificationSDD1 createPartyIdentificationSDD1() {\n+ return new PartyIdentificationSDD1();\n }\n \n /**\n- * Create an instance of {@link GenericOrganisationIdentification1 }\n+ * Create an instance of {@link PartyIdentificationSDD5 }\n * \n */\n- public GenericOrganisationIdentification1 createGenericOrganisationIdentification1() {\n- return new GenericOrganisationIdentification1();\n+ public PartyIdentificationSDD5 createPartyIdentificationSDD5() {\n+ return new PartyIdentificationSDD5();\n }\n \n /**\n- * Create an instance of {@link PaymentTypeInformationSCT2 }\n+ * Create an instance of {@link PartyIdentificationSDD4 }\n * \n */\n- public PaymentTypeInformationSCT2 createPaymentTypeInformationSCT2() {\n- return new PaymentTypeInformationSCT2();\n+ public PartyIdentificationSDD4 createPartyIdentificationSDD4() {\n+ return new PartyIdentificationSDD4();\n }\n \n /**\n- * Create an instance of {@link PartyIdentificationSEPA2 }\n+ * Create an instance of {@link PartyIdentificationSDD3 }\n * \n */\n- public PartyIdentificationSEPA2 createPartyIdentificationSEPA2() {\n- return new PartyIdentificationSEPA2();\n+ public PartyIdentificationSDD3 createPartyIdentificationSDD3() {\n+ return new PartyIdentificationSDD3();\n }\n \n /**\n- * Create an instance of {@link PartyIdentificationSEPA1 }\n+ * Create an instance of {@link AmendmentInformationDetailsSDD }\n * \n */\n- public PartyIdentificationSEPA1 createPartyIdentificationSEPA1() {\n- return new PartyIdentificationSEPA1();\n+ public AmendmentInformationDetailsSDD createAmendmentInformationDetailsSDD() {\n+ return new AmendmentInformationDetailsSDD();\n }\n \n /**\n- * Create an instance of {@link PaymentTypeInformationSCT1 }\n+ * Create an instance of {@link CurrencyAndAmountSDD }\n * \n */\n- public PaymentTypeInformationSCT1 createPaymentTypeInformationSCT1() {\n- return new PaymentTypeInformationSCT1();\n+ public CurrencyAndAmountSDD createCurrencyAndAmountSDD() {\n+ return new CurrencyAndAmountSDD();\n }\n \n /**\n- * Create an instance of {@link PurposeSEPA }\n+ * Create an instance of {@link CreditorReferenceInformationSDD }\n * \n */\n- public PurposeSEPA createPurposeSEPA() {\n- return new PurposeSEPA();\n+ public CreditorReferenceInformationSDD createCreditorReferenceInformationSDD() {\n+ return new CreditorReferenceInformationSDD();\n }\n \n /**\n- * Create an instance of {@link CustomerCreditTransferInitiationV03 }\n+ * Create an instance of {@link GenericIdentificationSDD }\n * \n */\n- public CustomerCreditTransferInitiationV03 createCustomerCreditTransferInitiationV03() {\n- return new CustomerCreditTransferInitiationV03();\n+ public GenericIdentificationSDD createGenericIdentificationSDD() {\n+ return new GenericIdentificationSDD();\n }\n \n /**\n- * Create an instance of {@link AccountIdentificationSEPA }\n+ * Create an instance of {@link DirectDebitTransactionSDD }\n * \n */\n- public AccountIdentificationSEPA createAccountIdentificationSEPA() {\n- return new AccountIdentificationSEPA();\n+ public DirectDebitTransactionSDD createDirectDebitTransactionSDD() {\n+ return new DirectDebitTransactionSDD();\n }\n \n /**\n- * Create an instance of {@link BranchAndFinancialInstitutionIdentificationSEPA3 }\n+ * Create an instance of {@link RestrictedIdentificationSDD }\n * \n */\n- public BranchAndFinancialInstitutionIdentificationSEPA3 createBranchAndFinancialInstitutionIdentificationSEPA3() {\n- return new BranchAndFinancialInstitutionIdentificationSEPA3();\n+ public RestrictedIdentificationSDD createRestrictedIdentificationSDD() {\n+ return new RestrictedIdentificationSDD();\n }\n \n /**\n- * Create an instance of {@link PartySEPAChoice }\n+ * Create an instance of {@link LocalInstrumentSDD }\n * \n */\n- public PartySEPAChoice createPartySEPAChoice() {\n- return new PartySEPAChoice();\n+ public LocalInstrumentSDD createLocalInstrumentSDD() {\n+ return new LocalInstrumentSDD();\n }\n \n /**\n- * Create an instance of {@link BranchAndFinancialInstitutionIdentificationSEPA1 }\n+ * Create an instance of {@link PostalAddressSDD }\n * \n */\n- public BranchAndFinancialInstitutionIdentificationSEPA1 createBranchAndFinancialInstitutionIdentificationSEPA1() {\n- return new BranchAndFinancialInstitutionIdentificationSEPA1();\n+ public PostalAddressSDD createPostalAddressSDD() {\n+ return new PostalAddressSDD();\n }\n \n /**\n- * Create an instance of {@link PersonIdentificationSchemeName1Choice }\n+ * Create an instance of {@link ServiceLevelSDD }\n * \n */\n- public PersonIdentificationSchemeName1Choice createPersonIdentificationSchemeName1Choice() {\n- return new PersonIdentificationSchemeName1Choice();\n+ public ServiceLevelSDD createServiceLevelSDD() {\n+ return new ServiceLevelSDD();\n }\n \n /**\n- * Create an instance of {@link RemittanceInformationSEPA1Choice }\n+ * Create an instance of {@link PaymentIdentification1 }\n * \n */\n- public RemittanceInformationSEPA1Choice createRemittanceInformationSEPA1Choice() {\n- return new RemittanceInformationSEPA1Choice();\n+ public PaymentIdentification1 createPaymentIdentification1() {\n+ return new PaymentIdentification1();\n }\n \n /**\n- * Create an instance of {@link ServiceLevelSEPA }\n+ * Create an instance of {@link CashAccountSDD2 }\n * \n */\n- public ServiceLevelSEPA createServiceLevelSEPA() {\n- return new ServiceLevelSEPA();\n+ public CashAccountSDD2 createCashAccountSDD2() {\n+ return new CashAccountSDD2();\n }\n \n /**\n- * Create an instance of {@link CashAccountSEPA2 }\n+ * Create an instance of {@link CashAccountSDD1 }\n * \n */\n- public CashAccountSEPA2 createCashAccountSEPA2() {\n- return new CashAccountSEPA2();\n+ public CashAccountSDD1 createCashAccountSDD1() {\n+ return new CashAccountSDD1();\n }\n \n /**\n- * Create an instance of {@link PostalAddressSEPA }\n+ * Create an instance of {@link AccountIdentificationSDD }\n * \n */\n- public PostalAddressSEPA createPostalAddressSEPA() {\n- return new PostalAddressSEPA();\n+ public AccountIdentificationSDD createAccountIdentificationSDD() {\n+ return new AccountIdentificationSDD();\n }\n \n /**\n- * Create an instance of {@link CashAccountSEPA1 }\n+ * Create an instance of {@link OrganisationIdentificationSDDChoice }\n * \n */\n- public CashAccountSEPA1 createCashAccountSEPA1() {\n- return new CashAccountSEPA1();\n+ public OrganisationIdentificationSDDChoice createOrganisationIdentificationSDDChoice() {\n+ return new OrganisationIdentificationSDDChoice();\n }\n \n /**\n- * Create an instance of {@link OthrIdentification }\n+ * Create an instance of {@link StructuredRemittanceInformationSDD }\n * \n */\n- public OthrIdentification createOthrIdentification() {\n- return new OthrIdentification();\n+ public StructuredRemittanceInformationSDD createStructuredRemittanceInformationSDD() {\n+ return new StructuredRemittanceInformationSDD();\n }\n \n /**\n- * Create an instance of {@link OrganisationIdentificationSchemeName1Choice }\n+ * Create an instance of {@link RemittanceInformationSDDChoice }\n * \n */\n- public OrganisationIdentificationSchemeName1Choice createOrganisationIdentificationSchemeName1Choice() {\n- return new OrganisationIdentificationSchemeName1Choice();\n+ public RemittanceInformationSDDChoice createRemittanceInformationSDDChoice() {\n+ return new RemittanceInformationSDDChoice();\n }\n \n /**\n- * Create an instance of {@link AmountTypeSEPA }\n+ * Create an instance of {@link PurposeSDD }\n * \n */\n- public AmountTypeSEPA createAmountTypeSEPA() {\n- return new AmountTypeSEPA();\n+ public PurposeSDD createPurposeSDD() {\n+ return new PurposeSDD();\n }\n \n /**\n- * Create an instance of {@link CreditTransferTransactionInformationSCT }\n+ * Create an instance of {@link PersonIdentificationSDD1 }\n * \n */\n- public CreditTransferTransactionInformationSCT createCreditTransferTransactionInformationSCT() {\n- return new CreditTransferTransactionInformationSCT();\n+ public PersonIdentificationSDD1 createPersonIdentificationSDD1() {\n+ return new PersonIdentificationSDD1();\n }\n \n /**\n- * Create an instance of {@link PaymentInstructionInformationSCT }\n+ * Create an instance of {@link PersonIdentificationSDD2 }\n * \n */\n- public PaymentInstructionInformationSCT createPaymentInstructionInformationSCT() {\n- return new PaymentInstructionInformationSCT();\n+ public PersonIdentificationSDD2 createPersonIdentificationSDD2() {\n+ return new PersonIdentificationSDD2();\n }\n \n /**\n- * Create an instance of {@link PersonIdentificationSEPA1Choice }\n+ * Create an instance of {@link PaymentInstructionInformationSDD }\n * \n */\n- public PersonIdentificationSEPA1Choice createPersonIdentificationSEPA1Choice() {\n- return new PersonIdentificationSEPA1Choice();\n+ public PaymentInstructionInformationSDD createPaymentInstructionInformationSDD() {\n+ return new PaymentInstructionInformationSDD();\n }\n \n /**\n- * Create an instance of {@link ActiveOrHistoricCurrencyAndAmountSEPA }\n+ * Create an instance of {@link Pain00800101 }\n * \n */\n- public ActiveOrHistoricCurrencyAndAmountSEPA createActiveOrHistoricCurrencyAndAmountSEPA() {\n- return new ActiveOrHistoricCurrencyAndAmountSEPA();\n+ public Pain00800101 createPain00800101() {\n+ return new Pain00800101();\n }\n \n /**\n- * Create an instance of {@link OrganisationIdentificationSEPAChoice }\n+ * Create an instance of {@link DirectDebitTransactionInformationSDD }\n * \n */\n- public OrganisationIdentificationSEPAChoice createOrganisationIdentificationSEPAChoice() {\n- return new OrganisationIdentificationSEPAChoice();\n+ public DirectDebitTransactionInformationSDD createDirectDebitTransactionInformationSDD() {\n+ return new DirectDebitTransactionInformationSDD();\n }\n \n /**\n- * Create an instance of {@link StructuredRemittanceInformationSEPA1 }\n+ * Create an instance of {@link MandateRelatedInformationSDD }\n * \n */\n- public StructuredRemittanceInformationSEPA1 createStructuredRemittanceInformationSEPA1() {\n- return new StructuredRemittanceInformationSEPA1();\n+ public MandateRelatedInformationSDD createMandateRelatedInformationSDD() {\n+ return new MandateRelatedInformationSDD();\n }\n \n /**\n- * Create an instance of {@link CreditorReferenceInformationSEPA1 }\n+ * Create an instance of {@link CreditorReferenceTypeSDD }\n * \n */\n- public CreditorReferenceInformationSEPA1 createCreditorReferenceInformationSEPA1() {\n- return new CreditorReferenceInformationSEPA1();\n+ public CreditorReferenceTypeSDD createCreditorReferenceTypeSDD() {\n+ return new CreditorReferenceTypeSDD();\n }\n \n /**\n- * Create an instance of {@link GenericPersonIdentification1 }\n+ * Create an instance of {@link BranchAndFinancialInstitutionIdentificationSDD2 }\n * \n */\n- public GenericPersonIdentification1 createGenericPersonIdentification1() {\n- return new GenericPersonIdentification1();\n+ public BranchAndFinancialInstitutionIdentificationSDD2 createBranchAndFinancialInstitutionIdentificationSDD2() {\n+ return new BranchAndFinancialInstitutionIdentificationSDD2();\n+ }\n+\n+ /**\n+ * Create an instance of {@link BranchAndFinancialInstitutionIdentificationSDD1 }\n+ * \n+ */\n+ public BranchAndFinancialInstitutionIdentificationSDD1 createBranchAndFinancialInstitutionIdentificationSDD1() {\n+ return new BranchAndFinancialInstitutionIdentificationSDD1();\n+ }\n+\n+ /**\n+ * Create an instance of {@link GenericIdentification3 }\n+ * \n+ */\n+ public GenericIdentification3 createGenericIdentification3() {\n+ return new GenericIdentification3();\n+ }\n+\n+ /**\n+ * Create an instance of {@link GenericIdentification4 }\n+ * \n+ */\n+ public GenericIdentification4 createGenericIdentification4() {\n+ return new GenericIdentification4();\n }\n \n /**\n@@ -314,26 +338,34 @@ public DateAndPlaceOfBirth createDateAndPlaceOfBirth() {\n }\n \n /**\n- * Create an instance of {@link CategoryPurposeSEPA }\n+ * Create an instance of {@link FinancialInstitutionIdentificationSDD2 }\n+ * \n+ */\n+ public FinancialInstitutionIdentificationSDD2 createFinancialInstitutionIdentificationSDD2() {\n+ return new FinancialInstitutionIdentificationSDD2();\n+ }\n+\n+ /**\n+ * Create an instance of {@link FinancialInstitutionIdentificationSDD1 }\n * \n */\n- public CategoryPurposeSEPA createCategoryPurposeSEPA() {\n- return new CategoryPurposeSEPA();\n+ public FinancialInstitutionIdentificationSDD1 createFinancialInstitutionIdentificationSDD1() {\n+ return new FinancialInstitutionIdentificationSDD1();\n }\n \n /**\n- * Create an instance of {@link CreditorReferenceTypeSEPA }\n+ * Create an instance of {@link GroupHeaderSDD }\n * \n */\n- public CreditorReferenceTypeSEPA createCreditorReferenceTypeSEPA() {\n- return new CreditorReferenceTypeSEPA();\n+ public GroupHeaderSDD createGroupHeaderSDD() {\n+ return new GroupHeaderSDD();\n }\n \n /**\n * Create an instance of {@link JAXBElement }{@code <}{@link Document }{@code >}}\n * \n */\n- @XmlElementDecl(namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", name = \"Document\")\n+ @XmlElementDecl(namespace = \"urn:swift:xsd:$pain.008.002.01\", name = \"Document\")\n public JAXBElement<Document> createDocument(Document value) {\n return new JAXBElement<Document>(_Document_QNAME, Document.class, null, value);\n }", "raw_url": "https://github.com/willuhn/hbci4java/raw/0f60d39106094eb564d221904d2bb7a6dc39102d/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_008_002_01%2FObjectFactory.java", "sha": "6cddbbd5bdd3021b875c4ae0432921b6d8f39402", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/willuhn/hbci4java/blob/0f60d39106094eb564d221904d2bb7a6dc39102d/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_008_002_01%2FPriority2Code.java", "changes": 2, "contents_url": "https://api.github.com/repos/willuhn/hbci4java/contents/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_008_002_01%2FPriority2Code.java?ref=0f60d39106094eb564d221904d2bb7a6dc39102d", "deletions": 1, "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_002_01/Priority2Code.java", "new_code": "@XmlType(name = \"Priority2Code\", namespace = \"urn:swift:xsd:$pain.008.002.01\")", "new_methods": [], "old_code": "@XmlType(name = \"Priority2Code\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\")", "old_methods": [], "patch": "@@ -20,7 +20,7 @@\n * </pre>\n * \n */\n-@XmlType(name = \"Priority2Code\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\")\n+@XmlType(name = \"Priority2Code\", namespace = \"urn:swift:xsd:$pain.008.002.01\")\n @XmlEnum\n public enum Priority2Code {\n ", "raw_url": "https://github.com/willuhn/hbci4java/raw/0f60d39106094eb564d221904d2bb7a6dc39102d/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_008_002_01%2FPriority2Code.java", "sha": "0623f102d30444684ae6e97c5c56328569676aa4", "status": "modified" }, { "additions": 3, "blob_url": "https://github.com/willuhn/hbci4java/blob/0f60d39106094eb564d221904d2bb7a6dc39102d/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_008_002_02%2FAccountIdentificationSEPA.java", "changes": 6, "contents_url": "https://api.github.com/repos/willuhn/hbci4java/contents/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_008_002_02%2FAccountIdentificationSEPA.java?ref=0f60d39106094eb564d221904d2bb7a6dc39102d", "deletions": 3, "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_002_02/AccountIdentificationSEPA.java", "new_code": " * &lt;element name=\"IBAN\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.008.002.02}IBAN2007Identifier\"/>\n@XmlType(name = \"AccountIdentificationSEPA\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\", propOrder = {\n @XmlElement(name = \"IBAN\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\", required = true)", "new_methods": [], "old_code": " * &lt;element name=\"IBAN\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}IBAN2007Identifier\"/>\n@XmlType(name = \"AccountIdentificationSEPA\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", propOrder = {\n @XmlElement(name = \"IBAN\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", required = true)", "old_methods": [], "patch": "@@ -17,7 +17,7 @@\n * &lt;complexContent>\n * &lt;restriction base=\"{http://www.w3.org/2001/XMLSchema}anyType\">\n * &lt;sequence>\n- * &lt;element name=\"IBAN\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}IBAN2007Identifier\"/>\n+ * &lt;element name=\"IBAN\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.008.002.02}IBAN2007Identifier\"/>\n * &lt;/sequence>\n * &lt;/restriction>\n * &lt;/complexContent>\n@@ -27,12 +27,12 @@\n * \n */\n @XmlAccessorType(XmlAccessType.FIELD)\n-@XmlType(name = \"AccountIdentificationSEPA\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", propOrder = {\n+@XmlType(name = \"AccountIdentificationSEPA\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\", propOrder = {\n \"iban\"\n })\n public class AccountIdentificationSEPA {\n \n- @XmlElement(name = \"IBAN\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", required = true)\n+ @XmlElement(name = \"IBAN\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\", required = true)\n protected String iban;\n \n /**", "raw_url": "https://github.com/willuhn/hbci4java/raw/0f60d39106094eb564d221904d2bb7a6dc39102d/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_008_002_02%2FAccountIdentificationSEPA.java", "sha": "8c0a83bbe2faa79c0775ccd63963791bdcb2321d", "status": "modified" }, { "additions": 3, "blob_url": "https://github.com/willuhn/hbci4java/blob/0f60d39106094eb564d221904d2bb7a6dc39102d/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_008_002_02%2FActiveOrHistoricCurrencyAndAmountSEPA.java", "changes": 6, "contents_url": "https://api.github.com/repos/willuhn/hbci4java/contents/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_008_002_02%2FActiveOrHistoricCurrencyAndAmountSEPA.java?ref=0f60d39106094eb564d221904d2bb7a6dc39102d", "deletions": 3, "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_002_02/ActiveOrHistoricCurrencyAndAmountSEPA.java", "new_code": " * &lt;extension base=\"&lt;urn:iso:std:iso:20022:tech:xsd:pain.008.002.02>ActiveOrHistoricCurrencyAndAmount_SimpleTypeSEPA\">\n * &lt;attribute name=\"Ccy\" use=\"required\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.008.002.02}ActiveOrHistoricCurrencyCodeEUR\" />\n@XmlType(name = \"ActiveOrHistoricCurrencyAndAmountSEPA\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\", propOrder = {", "new_methods": [], "old_code": " * &lt;extension base=\"&lt;urn:iso:std:iso:20022:tech:xsd:pain.001.003.03>ActiveOrHistoricCurrencyAndAmount_SimpleTypeSEPA\">\n * &lt;attribute name=\"Ccy\" use=\"required\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}ActiveOrHistoricCurrencyCodeEUR\" />\n@XmlType(name = \"ActiveOrHistoricCurrencyAndAmountSEPA\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", propOrder = {", "old_methods": [], "patch": "@@ -17,8 +17,8 @@\n * <pre>\n * &lt;complexType name=\"ActiveOrHistoricCurrencyAndAmountSEPA\">\n * &lt;simpleContent>\n- * &lt;extension base=\"&lt;urn:iso:std:iso:20022:tech:xsd:pain.001.003.03>ActiveOrHistoricCurrencyAndAmount_SimpleTypeSEPA\">\n- * &lt;attribute name=\"Ccy\" use=\"required\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}ActiveOrHistoricCurrencyCodeEUR\" />\n+ * &lt;extension base=\"&lt;urn:iso:std:iso:20022:tech:xsd:pain.008.002.02>ActiveOrHistoricCurrencyAndAmount_SimpleTypeSEPA\">\n+ * &lt;attribute name=\"Ccy\" use=\"required\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.008.002.02}ActiveOrHistoricCurrencyCodeEUR\" />\n * &lt;/extension>\n * &lt;/simpleContent>\n * &lt;/complexType>\n@@ -27,7 +27,7 @@\n * \n */\n @XmlAccessorType(XmlAccessType.FIELD)\n-@XmlType(name = \"ActiveOrHistoricCurrencyAndAmountSEPA\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", propOrder = {\n+@XmlType(name = \"ActiveOrHistoricCurrencyAndAmountSEPA\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\", propOrder = {\n \"value\"\n })\n public class ActiveOrHistoricCurrencyAndAmountSEPA {", "raw_url": "https://github.com/willuhn/hbci4java/raw/0f60d39106094eb564d221904d2bb7a6dc39102d/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_008_002_02%2FActiveOrHistoricCurrencyAndAmountSEPA.java", "sha": "9dd4000052eb50cbdd1be5b3b751983d14b33b3a", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/willuhn/hbci4java/blob/0f60d39106094eb564d221904d2bb7a6dc39102d/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_008_002_02%2FActiveOrHistoricCurrencyCodeEUR.java", "changes": 2, "contents_url": "https://api.github.com/repos/willuhn/hbci4java/contents/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_008_002_02%2FActiveOrHistoricCurrencyCodeEUR.java?ref=0f60d39106094eb564d221904d2bb7a6dc39102d", "deletions": 1, "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_002_02/ActiveOrHistoricCurrencyCodeEUR.java", "new_code": "@XmlType(name = \"ActiveOrHistoricCurrencyCodeEUR\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\")", "new_methods": [], "old_code": "@XmlType(name = \"ActiveOrHistoricCurrencyCodeEUR\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\")", "old_methods": [], "patch": "@@ -19,7 +19,7 @@\n * </pre>\n * \n */\n-@XmlType(name = \"ActiveOrHistoricCurrencyCodeEUR\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\")\n+@XmlType(name = \"ActiveOrHistoricCurrencyCodeEUR\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\")\n @XmlEnum\n public enum ActiveOrHistoricCurrencyCodeEUR {\n ", "raw_url": "https://github.com/willuhn/hbci4java/raw/0f60d39106094eb564d221904d2bb7a6dc39102d/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_008_002_02%2FActiveOrHistoricCurrencyCodeEUR.java", "sha": "219812c66397bc25059efbfd4389423094ecfecf", "status": "modified" }, { "additions": 3, "blob_url": "https://github.com/willuhn/hbci4java/blob/0f60d39106094eb564d221904d2bb7a6dc39102d/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_008_002_02%2FBranchAndFinancialInstitutionIdentificationSEPA1.java", "changes": 6, "contents_url": "https://api.github.com/repos/willuhn/hbci4java/contents/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_008_002_02%2FBranchAndFinancialInstitutionIdentificationSEPA1.java?ref=0f60d39106094eb564d221904d2bb7a6dc39102d", "deletions": 3, "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_002_02/BranchAndFinancialInstitutionIdentificationSEPA1.java", "new_code": " * &lt;element name=\"FinInstnId\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.008.002.02}FinancialInstitutionIdentificationSEPA1\"/>\n@XmlType(name = \"BranchAndFinancialInstitutionIdentificationSEPA1\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\", propOrder = {\n @XmlElement(name = \"FinInstnId\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\", required = true)", "new_methods": [], "old_code": " * &lt;element name=\"FinInstnId\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}FinancialInstitutionIdentificationSEPA1\"/>\n@XmlType(name = \"BranchAndFinancialInstitutionIdentificationSEPA1\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", propOrder = {\n @XmlElement(name = \"FinInstnId\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", required = true)", "old_methods": [], "patch": "@@ -17,7 +17,7 @@\n * &lt;complexContent>\n * &lt;restriction base=\"{http://www.w3.org/2001/XMLSchema}anyType\">\n * &lt;sequence>\n- * &lt;element name=\"FinInstnId\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}FinancialInstitutionIdentificationSEPA1\"/>\n+ * &lt;element name=\"FinInstnId\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.008.002.02}FinancialInstitutionIdentificationSEPA1\"/>\n * &lt;/sequence>\n * &lt;/restriction>\n * &lt;/complexContent>\n@@ -27,12 +27,12 @@\n * \n */\n @XmlAccessorType(XmlAccessType.FIELD)\n-@XmlType(name = \"BranchAndFinancialInstitutionIdentificationSEPA1\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", propOrder = {\n+@XmlType(name = \"BranchAndFinancialInstitutionIdentificationSEPA1\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\", propOrder = {\n \"finInstnId\"\n })\n public class BranchAndFinancialInstitutionIdentificationSEPA1 {\n \n- @XmlElement(name = \"FinInstnId\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", required = true)\n+ @XmlElement(name = \"FinInstnId\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\", required = true)\n protected FinancialInstitutionIdentificationSEPA1 finInstnId;\n \n /**", "raw_url": "https://github.com/willuhn/hbci4java/raw/0f60d39106094eb564d221904d2bb7a6dc39102d/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_008_002_02%2FBranchAndFinancialInstitutionIdentificationSEPA1.java", "sha": "fb8349a8035f338aa72b89db84a1b8d165b5f1dc", "status": "modified" }, { "additions": 5, "blob_url": "https://github.com/willuhn/hbci4java/blob/0f60d39106094eb564d221904d2bb7a6dc39102d/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_008_002_02%2FCashAccountSEPA1.java", "changes": 10, "contents_url": "https://api.github.com/repos/willuhn/hbci4java/contents/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_008_002_02%2FCashAccountSEPA1.java?ref=0f60d39106094eb564d221904d2bb7a6dc39102d", "deletions": 5, "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_002_02/CashAccountSEPA1.java", "new_code": " * &lt;element name=\"Id\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.008.002.02}AccountIdentificationSEPA\"/>\n * &lt;element name=\"Ccy\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.008.002.02}ActiveOrHistoricCurrencyCode\" minOccurs=\"0\"/>\n@XmlType(name = \"CashAccountSEPA1\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\", propOrder = {\n @XmlElement(name = \"Id\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\", required = true)\n @XmlElement(name = \"Ccy\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\")", "new_methods": [], "old_code": " * &lt;element name=\"Id\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}AccountIdentificationSEPA\"/>\n * &lt;element name=\"Ccy\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}ActiveOrHistoricCurrencyCode\" minOccurs=\"0\"/>\n@XmlType(name = \"CashAccountSEPA1\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", propOrder = {\n @XmlElement(name = \"Id\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", required = true)\n @XmlElement(name = \"Ccy\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\")", "old_methods": [], "patch": "@@ -17,8 +17,8 @@\n * &lt;complexContent>\n * &lt;restriction base=\"{http://www.w3.org/2001/XMLSchema}anyType\">\n * &lt;sequence>\n- * &lt;element name=\"Id\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}AccountIdentificationSEPA\"/>\n- * &lt;element name=\"Ccy\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}ActiveOrHistoricCurrencyCode\" minOccurs=\"0\"/>\n+ * &lt;element name=\"Id\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.008.002.02}AccountIdentificationSEPA\"/>\n+ * &lt;element name=\"Ccy\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.008.002.02}ActiveOrHistoricCurrencyCode\" minOccurs=\"0\"/>\n * &lt;/sequence>\n * &lt;/restriction>\n * &lt;/complexContent>\n@@ -28,15 +28,15 @@\n * \n */\n @XmlAccessorType(XmlAccessType.FIELD)\n-@XmlType(name = \"CashAccountSEPA1\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", propOrder = {\n+@XmlType(name = \"CashAccountSEPA1\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\", propOrder = {\n \"id\",\n \"ccy\"\n })\n public class CashAccountSEPA1 {\n \n- @XmlElement(name = \"Id\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", required = true)\n+ @XmlElement(name = \"Id\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\", required = true)\n protected AccountIdentificationSEPA id;\n- @XmlElement(name = \"Ccy\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\")\n+ @XmlElement(name = \"Ccy\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\")\n protected String ccy;\n \n /**", "raw_url": "https://github.com/willuhn/hbci4java/raw/0f60d39106094eb564d221904d2bb7a6dc39102d/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_008_002_02%2FCashAccountSEPA1.java", "sha": "933c3724a39bf406f4c8a8d4346ed04737930c54", "status": "modified" }, { "additions": 3, "blob_url": "https://github.com/willuhn/hbci4java/blob/0f60d39106094eb564d221904d2bb7a6dc39102d/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_008_002_02%2FCashAccountSEPA2.java", "changes": 6, "contents_url": "https://api.github.com/repos/willuhn/hbci4java/contents/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_008_002_02%2FCashAccountSEPA2.java?ref=0f60d39106094eb564d221904d2bb7a6dc39102d", "deletions": 3, "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_002_02/CashAccountSEPA2.java", "new_code": " * &lt;element name=\"Id\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.008.002.02}AccountIdentificationSEPA\"/>\n@XmlType(name = \"CashAccountSEPA2\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\", propOrder = {\n @XmlElement(name = \"Id\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\", required = true)", "new_methods": [], "old_code": " * &lt;element name=\"Id\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}AccountIdentificationSEPA\"/>\n@XmlType(name = \"CashAccountSEPA2\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", propOrder = {\n @XmlElement(name = \"Id\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", required = true)", "old_methods": [], "patch": "@@ -17,7 +17,7 @@\n * &lt;complexContent>\n * &lt;restriction base=\"{http://www.w3.org/2001/XMLSchema}anyType\">\n * &lt;sequence>\n- * &lt;element name=\"Id\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}AccountIdentificationSEPA\"/>\n+ * &lt;element name=\"Id\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.008.002.02}AccountIdentificationSEPA\"/>\n * &lt;/sequence>\n * &lt;/restriction>\n * &lt;/complexContent>\n@@ -27,12 +27,12 @@\n * \n */\n @XmlAccessorType(XmlAccessType.FIELD)\n-@XmlType(name = \"CashAccountSEPA2\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", propOrder = {\n+@XmlType(name = \"CashAccountSEPA2\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\", propOrder = {\n \"id\"\n })\n public class CashAccountSEPA2 {\n \n- @XmlElement(name = \"Id\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", required = true)\n+ @XmlElement(name = \"Id\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\", required = true)\n protected AccountIdentificationSEPA id;\n \n /**", "raw_url": "https://github.com/willuhn/hbci4java/raw/0f60d39106094eb564d221904d2bb7a6dc39102d/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_008_002_02%2FCashAccountSEPA2.java", "sha": "9ad794080c107dcbcbc19186674086836dfcc82e", "status": "modified" }, { "additions": 3, "blob_url": "https://github.com/willuhn/hbci4java/blob/0f60d39106094eb564d221904d2bb7a6dc39102d/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_008_002_02%2FCategoryPurposeSEPA.java", "changes": 6, "contents_url": "https://api.github.com/repos/willuhn/hbci4java/contents/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_008_002_02%2FCategoryPurposeSEPA.java?ref=0f60d39106094eb564d221904d2bb7a6dc39102d", "deletions": 3, "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_002_02/CategoryPurposeSEPA.java", "new_code": " * &lt;element name=\"Cd\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.008.002.02}ExternalCategoryPurpose1Code\"/>\n@XmlType(name = \"CategoryPurposeSEPA\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\", propOrder = {\n @XmlElement(name = \"Cd\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\", required = true)", "new_methods": [], "old_code": " * &lt;element name=\"Cd\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}ExternalCategoryPurpose1Code\"/>\n@XmlType(name = \"CategoryPurposeSEPA\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", propOrder = {\n @XmlElement(name = \"Cd\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", required = true)", "old_methods": [], "patch": "@@ -17,7 +17,7 @@\n * &lt;complexContent>\n * &lt;restriction base=\"{http://www.w3.org/2001/XMLSchema}anyType\">\n * &lt;sequence>\n- * &lt;element name=\"Cd\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}ExternalCategoryPurpose1Code\"/>\n+ * &lt;element name=\"Cd\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.008.002.02}ExternalCategoryPurpose1Code\"/>\n * &lt;/sequence>\n * &lt;/restriction>\n * &lt;/complexContent>\n@@ -27,12 +27,12 @@\n * \n */\n @XmlAccessorType(XmlAccessType.FIELD)\n-@XmlType(name = \"CategoryPurposeSEPA\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", propOrder = {\n+@XmlType(name = \"CategoryPurposeSEPA\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\", propOrder = {\n \"cd\"\n })\n public class CategoryPurposeSEPA {\n \n- @XmlElement(name = \"Cd\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", required = true)\n+ @XmlElement(name = \"Cd\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\", required = true)\n protected String cd;\n \n /**", "raw_url": "https://github.com/willuhn/hbci4java/raw/0f60d39106094eb564d221904d2bb7a6dc39102d/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_008_002_02%2FCategoryPurposeSEPA.java", "sha": "711a90d624db880544ac47547d14a5c2ea600de5", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/willuhn/hbci4java/blob/0f60d39106094eb564d221904d2bb7a6dc39102d/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_008_002_02%2FChargeBearerTypeSEPACode.java", "changes": 2, "contents_url": "https://api.github.com/repos/willuhn/hbci4java/contents/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_008_002_02%2FChargeBearerTypeSEPACode.java?ref=0f60d39106094eb564d221904d2bb7a6dc39102d", "deletions": 1, "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_002_02/ChargeBearerTypeSEPACode.java", "new_code": "@XmlType(name = \"ChargeBearerTypeSEPACode\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\")", "new_methods": [], "old_code": "@XmlType(name = \"ChargeBearerTypeSEPACode\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\")", "old_methods": [], "patch": "@@ -19,7 +19,7 @@\n * </pre>\n * \n */\n-@XmlType(name = \"ChargeBearerTypeSEPACode\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\")\n+@XmlType(name = \"ChargeBearerTypeSEPACode\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\")\n @XmlEnum\n public enum ChargeBearerTypeSEPACode {\n ", "raw_url": "https://github.com/willuhn/hbci4java/raw/0f60d39106094eb564d221904d2bb7a6dc39102d/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_008_002_02%2FChargeBearerTypeSEPACode.java", "sha": "a66efd2770e20f6f2316864930bd47e4cc42e55c", "status": "modified" }, { "additions": 5, "blob_url": "https://github.com/willuhn/hbci4java/blob/0f60d39106094eb564d221904d2bb7a6dc39102d/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_008_002_02%2FCreditorReferenceInformationSEPA1.java", "changes": 10, "contents_url": "https://api.github.com/repos/willuhn/hbci4java/contents/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_008_002_02%2FCreditorReferenceInformationSEPA1.java?ref=0f60d39106094eb564d221904d2bb7a6dc39102d", "deletions": 5, "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_002_02/CreditorReferenceInformationSEPA1.java", "new_code": " * &lt;element name=\"Tp\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.008.002.02}CreditorReferenceTypeSEPA\"/>\n * &lt;element name=\"Ref\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.008.002.02}Max35Text\"/>\n@XmlType(name = \"CreditorReferenceInformationSEPA1\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\", propOrder = {\n @XmlElement(name = \"Tp\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\", required = true)\n @XmlElement(name = \"Ref\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\", required = true)", "new_methods": [], "old_code": " * &lt;element name=\"Tp\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}CreditorReferenceTypeSEPA\"/>\n * &lt;element name=\"Ref\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}Max35Text\"/>\n@XmlType(name = \"CreditorReferenceInformationSEPA1\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", propOrder = {\n @XmlElement(name = \"Tp\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", required = true)\n @XmlElement(name = \"Ref\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", required = true)", "old_methods": [], "patch": "@@ -17,8 +17,8 @@\n * &lt;complexContent>\n * &lt;restriction base=\"{http://www.w3.org/2001/XMLSchema}anyType\">\n * &lt;sequence>\n- * &lt;element name=\"Tp\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}CreditorReferenceTypeSEPA\"/>\n- * &lt;element name=\"Ref\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}Max35Text\"/>\n+ * &lt;element name=\"Tp\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.008.002.02}CreditorReferenceTypeSEPA\"/>\n+ * &lt;element name=\"Ref\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.008.002.02}Max35Text\"/>\n * &lt;/sequence>\n * &lt;/restriction>\n * &lt;/complexContent>\n@@ -28,15 +28,15 @@\n * \n */\n @XmlAccessorType(XmlAccessType.FIELD)\n-@XmlType(name = \"CreditorReferenceInformationSEPA1\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", propOrder = {\n+@XmlType(name = \"CreditorReferenceInformationSEPA1\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\", propOrder = {\n \"tp\",\n \"ref\"\n })\n public class CreditorReferenceInformationSEPA1 {\n \n- @XmlElement(name = \"Tp\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", required = true)\n+ @XmlElement(name = \"Tp\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\", required = true)\n protected CreditorReferenceTypeSEPA tp;\n- @XmlElement(name = \"Ref\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", required = true)\n+ @XmlElement(name = \"Ref\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\", required = true)\n protected String ref;\n \n /**", "raw_url": "https://github.com/willuhn/hbci4java/raw/0f60d39106094eb564d221904d2bb7a6dc39102d/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_008_002_02%2FCreditorReferenceInformationSEPA1.java", "sha": "7a87bcba421940700f8ae7c891551a166fc10a65", "status": "modified" }, { "additions": 3, "blob_url": "https://github.com/willuhn/hbci4java/blob/0f60d39106094eb564d221904d2bb7a6dc39102d/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_008_002_02%2FCreditorReferenceTypeCodeSEPA.java", "changes": 6, "contents_url": "https://api.github.com/repos/willuhn/hbci4java/contents/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_008_002_02%2FCreditorReferenceTypeCodeSEPA.java?ref=0f60d39106094eb564d221904d2bb7a6dc39102d", "deletions": 3, "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_002_02/CreditorReferenceTypeCodeSEPA.java", "new_code": " * &lt;element name=\"Cd\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.008.002.02}DocumentType3CodeSEPA\"/>\n@XmlType(name = \"CreditorReferenceTypeCodeSEPA\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\", propOrder = {\n @XmlElement(name = \"Cd\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\", required = true)", "new_methods": [], "old_code": " * &lt;element name=\"Cd\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}DocumentType3CodeSEPA\"/>\n@XmlType(name = \"CreditorReferenceTypeCodeSEPA\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", propOrder = {\n @XmlElement(name = \"Cd\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", required = true)", "old_methods": [], "patch": "@@ -17,7 +17,7 @@\n * &lt;complexContent>\n * &lt;restriction base=\"{http://www.w3.org/2001/XMLSchema}anyType\">\n * &lt;sequence>\n- * &lt;element name=\"Cd\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}DocumentType3CodeSEPA\"/>\n+ * &lt;element name=\"Cd\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.008.002.02}DocumentType3CodeSEPA\"/>\n * &lt;/sequence>\n * &lt;/restriction>\n * &lt;/complexContent>\n@@ -27,12 +27,12 @@\n * \n */\n @XmlAccessorType(XmlAccessType.FIELD)\n-@XmlType(name = \"CreditorReferenceTypeCodeSEPA\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", propOrder = {\n+@XmlType(name = \"CreditorReferenceTypeCodeSEPA\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\", propOrder = {\n \"cd\"\n })\n public class CreditorReferenceTypeCodeSEPA {\n \n- @XmlElement(name = \"Cd\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", required = true)\n+ @XmlElement(name = \"Cd\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\", required = true)\n protected DocumentType3CodeSEPA cd;\n \n /**", "raw_url": "https://github.com/willuhn/hbci4java/raw/0f60d39106094eb564d221904d2bb7a6dc39102d/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_008_002_02%2FCreditorReferenceTypeCodeSEPA.java", "sha": "2d2ead7ceae2b49b2718fc1a6da447a99a50bf99", "status": "modified" }, { "additions": 5, "blob_url": "https://github.com/willuhn/hbci4java/blob/0f60d39106094eb564d221904d2bb7a6dc39102d/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_008_002_02%2FCreditorReferenceTypeSEPA.java", "changes": 10, "contents_url": "https://api.github.com/repos/willuhn/hbci4java/contents/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_008_002_02%2FCreditorReferenceTypeSEPA.java?ref=0f60d39106094eb564d221904d2bb7a6dc39102d", "deletions": 5, "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_002_02/CreditorReferenceTypeSEPA.java", "new_code": " * &lt;element name=\"CdOrPrtry\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.008.002.02}CreditorReferenceTypeCodeSEPA\"/>\n * &lt;element name=\"Issr\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.008.002.02}Max35Text\" minOccurs=\"0\"/>\n@XmlType(name = \"CreditorReferenceTypeSEPA\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\", propOrder = {\n @XmlElement(name = \"CdOrPrtry\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\", required = true)\n @XmlElement(name = \"Issr\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\")", "new_methods": [], "old_code": " * &lt;element name=\"CdOrPrtry\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}CreditorReferenceTypeCodeSEPA\"/>\n * &lt;element name=\"Issr\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}Max35Text\" minOccurs=\"0\"/>\n@XmlType(name = \"CreditorReferenceTypeSEPA\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", propOrder = {\n @XmlElement(name = \"CdOrPrtry\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", required = true)\n @XmlElement(name = \"Issr\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\")", "old_methods": [], "patch": "@@ -17,8 +17,8 @@\n * &lt;complexContent>\n * &lt;restriction base=\"{http://www.w3.org/2001/XMLSchema}anyType\">\n * &lt;sequence>\n- * &lt;element name=\"CdOrPrtry\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}CreditorReferenceTypeCodeSEPA\"/>\n- * &lt;element name=\"Issr\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}Max35Text\" minOccurs=\"0\"/>\n+ * &lt;element name=\"CdOrPrtry\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.008.002.02}CreditorReferenceTypeCodeSEPA\"/>\n+ * &lt;element name=\"Issr\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.008.002.02}Max35Text\" minOccurs=\"0\"/>\n * &lt;/sequence>\n * &lt;/restriction>\n * &lt;/complexContent>\n@@ -28,15 +28,15 @@\n * \n */\n @XmlAccessorType(XmlAccessType.FIELD)\n-@XmlType(name = \"CreditorReferenceTypeSEPA\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", propOrder = {\n+@XmlType(name = \"CreditorReferenceTypeSEPA\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\", propOrder = {\n \"cdOrPrtry\",\n \"issr\"\n })\n public class CreditorReferenceTypeSEPA {\n \n- @XmlElement(name = \"CdOrPrtry\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", required = true)\n+ @XmlElement(name = \"CdOrPrtry\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\", required = true)\n protected CreditorReferenceTypeCodeSEPA cdOrPrtry;\n- @XmlElement(name = \"Issr\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\")\n+ @XmlElement(name = \"Issr\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\")\n protected String issr;\n \n /**", "raw_url": "https://github.com/willuhn/hbci4java/raw/0f60d39106094eb564d221904d2bb7a6dc39102d/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_008_002_02%2FCreditorReferenceTypeSEPA.java", "sha": "a82f6cbd356c303ac0c83f460b4227c486c87804", "status": "modified" }, { "additions": 9, "blob_url": "https://github.com/willuhn/hbci4java/blob/0f60d39106094eb564d221904d2bb7a6dc39102d/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_008_002_02%2FDateAndPlaceOfBirth.java", "changes": 18, "contents_url": "https://api.github.com/repos/willuhn/hbci4java/contents/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_008_002_02%2FDateAndPlaceOfBirth.java?ref=0f60d39106094eb564d221904d2bb7a6dc39102d", "deletions": 9, "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_002_02/DateAndPlaceOfBirth.java", "new_code": " * &lt;element name=\"BirthDt\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.008.002.02}ISODate\"/>\n * &lt;element name=\"PrvcOfBirth\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.008.002.02}Max35Text\" minOccurs=\"0\"/>\n * &lt;element name=\"CityOfBirth\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.008.002.02}Max35Text\"/>\n * &lt;element name=\"CtryOfBirth\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.008.002.02}CountryCode\"/>\n@XmlType(name = \"DateAndPlaceOfBirth\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\", propOrder = {\n @XmlElement(name = \"BirthDt\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\", required = true)\n @XmlElement(name = \"PrvcOfBirth\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\")\n @XmlElement(name = \"CityOfBirth\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\", required = true)\n @XmlElement(name = \"CtryOfBirth\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\", required = true)", "new_methods": [], "old_code": " * &lt;element name=\"BirthDt\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}ISODate\"/>\n * &lt;element name=\"PrvcOfBirth\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}Max35Text\" minOccurs=\"0\"/>\n * &lt;element name=\"CityOfBirth\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}Max35Text\"/>\n * &lt;element name=\"CtryOfBirth\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}CountryCode\"/>\n@XmlType(name = \"DateAndPlaceOfBirth\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", propOrder = {\n @XmlElement(name = \"BirthDt\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", required = true)\n @XmlElement(name = \"PrvcOfBirth\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\")\n @XmlElement(name = \"CityOfBirth\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", required = true)\n @XmlElement(name = \"CtryOfBirth\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", required = true)", "old_methods": [], "patch": "@@ -18,10 +18,10 @@\n * &lt;complexContent>\n * &lt;restriction base=\"{http://www.w3.org/2001/XMLSchema}anyType\">\n * &lt;sequence>\n- * &lt;element name=\"BirthDt\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}ISODate\"/>\n- * &lt;element name=\"PrvcOfBirth\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}Max35Text\" minOccurs=\"0\"/>\n- * &lt;element name=\"CityOfBirth\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}Max35Text\"/>\n- * &lt;element name=\"CtryOfBirth\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}CountryCode\"/>\n+ * &lt;element name=\"BirthDt\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.008.002.02}ISODate\"/>\n+ * &lt;element name=\"PrvcOfBirth\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.008.002.02}Max35Text\" minOccurs=\"0\"/>\n+ * &lt;element name=\"CityOfBirth\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.008.002.02}Max35Text\"/>\n+ * &lt;element name=\"CtryOfBirth\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.008.002.02}CountryCode\"/>\n * &lt;/sequence>\n * &lt;/restriction>\n * &lt;/complexContent>\n@@ -31,21 +31,21 @@\n * \n */\n @XmlAccessorType(XmlAccessType.FIELD)\n-@XmlType(name = \"DateAndPlaceOfBirth\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", propOrder = {\n+@XmlType(name = \"DateAndPlaceOfBirth\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\", propOrder = {\n \"birthDt\",\n \"prvcOfBirth\",\n \"cityOfBirth\",\n \"ctryOfBirth\"\n })\n public class DateAndPlaceOfBirth {\n \n- @XmlElement(name = \"BirthDt\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", required = true)\n+ @XmlElement(name = \"BirthDt\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\", required = true)\n protected XMLGregorianCalendar birthDt;\n- @XmlElement(name = \"PrvcOfBirth\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\")\n+ @XmlElement(name = \"PrvcOfBirth\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\")\n protected String prvcOfBirth;\n- @XmlElement(name = \"CityOfBirth\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", required = true)\n+ @XmlElement(name = \"CityOfBirth\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\", required = true)\n protected String cityOfBirth;\n- @XmlElement(name = \"CtryOfBirth\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", required = true)\n+ @XmlElement(name = \"CtryOfBirth\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\", required = true)\n protected String ctryOfBirth;\n \n /**", "raw_url": "https://github.com/willuhn/hbci4java/raw/0f60d39106094eb564d221904d2bb7a6dc39102d/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_008_002_02%2FDateAndPlaceOfBirth.java", "sha": "2bb59155761a0d2b7f0c13d91d010406f93ed27d", "status": "modified" }, { "additions": 13, "blob_url": "https://github.com/willuhn/hbci4java/blob/0f60d39106094eb564d221904d2bb7a6dc39102d/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_008_002_02%2FDocument.java", "changes": 26, "contents_url": "https://api.github.com/repos/willuhn/hbci4java/contents/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_008_002_02%2FDocument.java?ref=0f60d39106094eb564d221904d2bb7a6dc39102d", "deletions": 13, "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_002_02/Document.java", "new_code": " * &lt;element name=\"CstmrDrctDbtInitn\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.008.002.02}CustomerDirectDebitInitiationV02\"/>\n@XmlType(name = \"Document\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\", propOrder = {\n \"cstmrDrctDbtInitn\"\n @XmlElement(name = \"CstmrDrctDbtInitn\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\", required = true)\n protected CustomerDirectDebitInitiationV02 cstmrDrctDbtInitn;\n * Gets the value of the cstmrDrctDbtInitn property.\n * {@link CustomerDirectDebitInitiationV02 }\n public CustomerDirectDebitInitiationV02 getCstmrDrctDbtInitn() {\n return cstmrDrctDbtInitn;\n * Sets the value of the cstmrDrctDbtInitn property.\n * {@link CustomerDirectDebitInitiationV02 }\n public void setCstmrDrctDbtInitn(CustomerDirectDebitInitiationV02 value) {\n this.cstmrDrctDbtInitn = value;", "new_methods": [ { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_002_02/Document.java", "implementation": "return cstmrDrctDbtInitn;\n * Sets the value of the cstmrDrctDbtInitn property.\n * {@link CustomerDirectDebitInitiationV02", "signature": "CustomerDirectDebitInitiationV02 getCstmrDrctDbtInitn()" } ], "old_code": " * &lt;element name=\"CstmrCdtTrfInitn\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}CustomerCreditTransferInitiationV03\"/>\n@XmlType(name = \"Document\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", propOrder = {\n \"cstmrCdtTrfInitn\"\n @XmlElement(name = \"CstmrCdtTrfInitn\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", required = true)\n protected CustomerCreditTransferInitiationV03 cstmrCdtTrfInitn;\n * Gets the value of the cstmrCdtTrfInitn property.\n * {@link CustomerCreditTransferInitiationV03 }\n public CustomerCreditTransferInitiationV03 getCstmrCdtTrfInitn() {\n return cstmrCdtTrfInitn;\n * Sets the value of the cstmrCdtTrfInitn property.\n * {@link CustomerCreditTransferInitiationV03 }\n public void setCstmrCdtTrfInitn(CustomerCreditTransferInitiationV03 value) {\n this.cstmrCdtTrfInitn = value;", "old_methods": [ { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_002_02/Document.java", "implementation": "return cstmrCdtTrfInitn;\n * Sets the value of the cstmrCdtTrfInitn property.\n * {@link CustomerCreditTransferInitiationV03", "signature": "CustomerCreditTransferInitiationV03 getCstmrCdtTrfInitn()" } ], "patch": "@@ -17,7 +17,7 @@\n * &lt;complexContent>\n * &lt;restriction base=\"{http://www.w3.org/2001/XMLSchema}anyType\">\n * &lt;sequence>\n- * &lt;element name=\"CstmrCdtTrfInitn\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}CustomerCreditTransferInitiationV03\"/>\n+ * &lt;element name=\"CstmrDrctDbtInitn\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.008.002.02}CustomerDirectDebitInitiationV02\"/>\n * &lt;/sequence>\n * &lt;/restriction>\n * &lt;/complexContent>\n@@ -27,36 +27,36 @@\n * \n */\n @XmlAccessorType(XmlAccessType.FIELD)\n-@XmlType(name = \"Document\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", propOrder = {\n- \"cstmrCdtTrfInitn\"\n+@XmlType(name = \"Document\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\", propOrder = {\n+ \"cstmrDrctDbtInitn\"\n })\n public class Document {\n \n- @XmlElement(name = \"CstmrCdtTrfInitn\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", required = true)\n- protected CustomerCreditTransferInitiationV03 cstmrCdtTrfInitn;\n+ @XmlElement(name = \"CstmrDrctDbtInitn\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\", required = true)\n+ protected CustomerDirectDebitInitiationV02 cstmrDrctDbtInitn;\n \n /**\n- * Gets the value of the cstmrCdtTrfInitn property.\n+ * Gets the value of the cstmrDrctDbtInitn property.\n * \n * @return\n * possible object is\n- * {@link CustomerCreditTransferInitiationV03 }\n+ * {@link CustomerDirectDebitInitiationV02 }\n * \n */\n- public CustomerCreditTransferInitiationV03 getCstmrCdtTrfInitn() {\n- return cstmrCdtTrfInitn;\n+ public CustomerDirectDebitInitiationV02 getCstmrDrctDbtInitn() {\n+ return cstmrDrctDbtInitn;\n }\n \n /**\n- * Sets the value of the cstmrCdtTrfInitn property.\n+ * Sets the value of the cstmrDrctDbtInitn property.\n * \n * @param value\n * allowed object is\n- * {@link CustomerCreditTransferInitiationV03 }\n+ * {@link CustomerDirectDebitInitiationV02 }\n * \n */\n- public void setCstmrCdtTrfInitn(CustomerCreditTransferInitiationV03 value) {\n- this.cstmrCdtTrfInitn = value;\n+ public void setCstmrDrctDbtInitn(CustomerDirectDebitInitiationV02 value) {\n+ this.cstmrDrctDbtInitn = value;\n }\n \n }", "raw_url": "https://github.com/willuhn/hbci4java/raw/0f60d39106094eb564d221904d2bb7a6dc39102d/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_008_002_02%2FDocument.java", "sha": "e2da0113bb3e2616a6fe4ef2462020bc7b6a0ed7", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/willuhn/hbci4java/blob/0f60d39106094eb564d221904d2bb7a6dc39102d/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_008_002_02%2FDocumentType3CodeSEPA.java", "changes": 2, "contents_url": "https://api.github.com/repos/willuhn/hbci4java/contents/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_008_002_02%2FDocumentType3CodeSEPA.java?ref=0f60d39106094eb564d221904d2bb7a6dc39102d", "deletions": 1, "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_002_02/DocumentType3CodeSEPA.java", "new_code": "@XmlType(name = \"DocumentType3CodeSEPA\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\")", "new_methods": [], "old_code": "@XmlType(name = \"DocumentType3CodeSEPA\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\")", "old_methods": [], "patch": "@@ -19,7 +19,7 @@\n * </pre>\n * \n */\n-@XmlType(name = \"DocumentType3CodeSEPA\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\")\n+@XmlType(name = \"DocumentType3CodeSEPA\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\")\n @XmlEnum\n public enum DocumentType3CodeSEPA {\n ", "raw_url": "https://github.com/willuhn/hbci4java/raw/0f60d39106094eb564d221904d2bb7a6dc39102d/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_008_002_02%2FDocumentType3CodeSEPA.java", "sha": "f417fb0e10f2af817a7c1f6c40f260c49484a731", "status": "modified" }, { "additions": 3, "blob_url": "https://github.com/willuhn/hbci4java/blob/0f60d39106094eb564d221904d2bb7a6dc39102d/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_008_002_02%2FFinancialInstitutionIdentificationSEPA1.java", "changes": 6, "contents_url": "https://api.github.com/repos/willuhn/hbci4java/contents/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_008_002_02%2FFinancialInstitutionIdentificationSEPA1.java?ref=0f60d39106094eb564d221904d2bb7a6dc39102d", "deletions": 3, "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_002_02/FinancialInstitutionIdentificationSEPA1.java", "new_code": " * &lt;element name=\"BIC\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.008.002.02}BICIdentifier\"/>\n@XmlType(name = \"FinancialInstitutionIdentificationSEPA1\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\", propOrder = {\n @XmlElement(name = \"BIC\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\", required = true)", "new_methods": [], "old_code": " * &lt;element name=\"BIC\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}BICIdentifier\"/>\n@XmlType(name = \"FinancialInstitutionIdentificationSEPA1\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", propOrder = {\n @XmlElement(name = \"BIC\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", required = true)", "old_methods": [], "patch": "@@ -17,7 +17,7 @@\n * &lt;complexContent>\n * &lt;restriction base=\"{http://www.w3.org/2001/XMLSchema}anyType\">\n * &lt;sequence>\n- * &lt;element name=\"BIC\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}BICIdentifier\"/>\n+ * &lt;element name=\"BIC\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.008.002.02}BICIdentifier\"/>\n * &lt;/sequence>\n * &lt;/restriction>\n * &lt;/complexContent>\n@@ -27,12 +27,12 @@\n * \n */\n @XmlAccessorType(XmlAccessType.FIELD)\n-@XmlType(name = \"FinancialInstitutionIdentificationSEPA1\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", propOrder = {\n+@XmlType(name = \"FinancialInstitutionIdentificationSEPA1\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\", propOrder = {\n \"bic\"\n })\n public class FinancialInstitutionIdentificationSEPA1 {\n \n- @XmlElement(name = \"BIC\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", required = true)\n+ @XmlElement(name = \"BIC\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\", required = true)\n protected String bic;\n \n /**", "raw_url": "https://github.com/willuhn/hbci4java/raw/0f60d39106094eb564d221904d2bb7a6dc39102d/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_008_002_02%2FFinancialInstitutionIdentificationSEPA1.java", "sha": "ff0282df59acc4c5c8b159b2b826a4887192014b", "status": "modified" }, { "additions": 7, "blob_url": "https://github.com/willuhn/hbci4java/blob/0f60d39106094eb564d221904d2bb7a6dc39102d/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_008_002_02%2FGenericOrganisationIdentification1.java", "changes": 14, "contents_url": "https://api.github.com/repos/willuhn/hbci4java/contents/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_008_002_02%2FGenericOrganisationIdentification1.java?ref=0f60d39106094eb564d221904d2bb7a6dc39102d", "deletions": 7, "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_002_02/GenericOrganisationIdentification1.java", "new_code": " * &lt;element name=\"Id\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.008.002.02}Max35Text\"/>\n * &lt;element name=\"SchmeNm\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.008.002.02}OrganisationIdentificationSchemeName1Choice\" minOccurs=\"0\"/>\n * &lt;element name=\"Issr\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.008.002.02}Max35Text\" minOccurs=\"0\"/>\n@XmlType(name = \"GenericOrganisationIdentification1\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\", propOrder = {\n @XmlElement(name = \"Id\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\", required = true)\n @XmlElement(name = \"SchmeNm\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\")\n @XmlElement(name = \"Issr\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\")", "new_methods": [], "old_code": " * &lt;element name=\"Id\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}Max35Text\"/>\n * &lt;element name=\"SchmeNm\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}OrganisationIdentificationSchemeName1Choice\" minOccurs=\"0\"/>\n * &lt;element name=\"Issr\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}Max35Text\" minOccurs=\"0\"/>\n@XmlType(name = \"GenericOrganisationIdentification1\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", propOrder = {\n @XmlElement(name = \"Id\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", required = true)\n @XmlElement(name = \"SchmeNm\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\")\n @XmlElement(name = \"Issr\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\")", "old_methods": [], "patch": "@@ -17,9 +17,9 @@\n * &lt;complexContent>\n * &lt;restriction base=\"{http://www.w3.org/2001/XMLSchema}anyType\">\n * &lt;sequence>\n- * &lt;element name=\"Id\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}Max35Text\"/>\n- * &lt;element name=\"SchmeNm\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}OrganisationIdentificationSchemeName1Choice\" minOccurs=\"0\"/>\n- * &lt;element name=\"Issr\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}Max35Text\" minOccurs=\"0\"/>\n+ * &lt;element name=\"Id\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.008.002.02}Max35Text\"/>\n+ * &lt;element name=\"SchmeNm\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.008.002.02}OrganisationIdentificationSchemeName1Choice\" minOccurs=\"0\"/>\n+ * &lt;element name=\"Issr\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.008.002.02}Max35Text\" minOccurs=\"0\"/>\n * &lt;/sequence>\n * &lt;/restriction>\n * &lt;/complexContent>\n@@ -29,18 +29,18 @@\n * \n */\n @XmlAccessorType(XmlAccessType.FIELD)\n-@XmlType(name = \"GenericOrganisationIdentification1\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", propOrder = {\n+@XmlType(name = \"GenericOrganisationIdentification1\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\", propOrder = {\n \"id\",\n \"schmeNm\",\n \"issr\"\n })\n public class GenericOrganisationIdentification1 {\n \n- @XmlElement(name = \"Id\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", required = true)\n+ @XmlElement(name = \"Id\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\", required = true)\n protected String id;\n- @XmlElement(name = \"SchmeNm\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\")\n+ @XmlElement(name = \"SchmeNm\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\")\n protected OrganisationIdentificationSchemeName1Choice schmeNm;\n- @XmlElement(name = \"Issr\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\")\n+ @XmlElement(name = \"Issr\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\")\n protected String issr;\n \n /**", "raw_url": "https://github.com/willuhn/hbci4java/raw/0f60d39106094eb564d221904d2bb7a6dc39102d/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_008_002_02%2FGenericOrganisationIdentification1.java", "sha": "5d481b8bc5f044f9466a9e5b4c5f7785595cacbb", "status": "modified" }, { "additions": 7, "blob_url": "https://github.com/willuhn/hbci4java/blob/0f60d39106094eb564d221904d2bb7a6dc39102d/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_008_002_02%2FGenericPersonIdentification1.java", "changes": 14, "contents_url": "https://api.github.com/repos/willuhn/hbci4java/contents/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_008_002_02%2FGenericPersonIdentification1.java?ref=0f60d39106094eb564d221904d2bb7a6dc39102d", "deletions": 7, "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_002_02/GenericPersonIdentification1.java", "new_code": " * &lt;element name=\"Id\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.008.002.02}Max35Text\"/>\n * &lt;element name=\"SchmeNm\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.008.002.02}PersonIdentificationSchemeName1Choice\" minOccurs=\"0\"/>\n * &lt;element name=\"Issr\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.008.002.02}Max35Text\" minOccurs=\"0\"/>\n@XmlType(name = \"GenericPersonIdentification1\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\", propOrder = {\n @XmlElement(name = \"Id\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\", required = true)\n @XmlElement(name = \"SchmeNm\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\")\n @XmlElement(name = \"Issr\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\")", "new_methods": [], "old_code": " * &lt;element name=\"Id\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}Max35Text\"/>\n * &lt;element name=\"SchmeNm\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}PersonIdentificationSchemeName1Choice\" minOccurs=\"0\"/>\n * &lt;element name=\"Issr\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}Max35Text\" minOccurs=\"0\"/>\n@XmlType(name = \"GenericPersonIdentification1\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", propOrder = {\n @XmlElement(name = \"Id\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", required = true)\n @XmlElement(name = \"SchmeNm\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\")\n @XmlElement(name = \"Issr\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\")", "old_methods": [], "patch": "@@ -17,9 +17,9 @@\n * &lt;complexContent>\n * &lt;restriction base=\"{http://www.w3.org/2001/XMLSchema}anyType\">\n * &lt;sequence>\n- * &lt;element name=\"Id\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}Max35Text\"/>\n- * &lt;element name=\"SchmeNm\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}PersonIdentificationSchemeName1Choice\" minOccurs=\"0\"/>\n- * &lt;element name=\"Issr\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}Max35Text\" minOccurs=\"0\"/>\n+ * &lt;element name=\"Id\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.008.002.02}Max35Text\"/>\n+ * &lt;element name=\"SchmeNm\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.008.002.02}PersonIdentificationSchemeName1Choice\" minOccurs=\"0\"/>\n+ * &lt;element name=\"Issr\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.008.002.02}Max35Text\" minOccurs=\"0\"/>\n * &lt;/sequence>\n * &lt;/restriction>\n * &lt;/complexContent>\n@@ -29,18 +29,18 @@\n * \n */\n @XmlAccessorType(XmlAccessType.FIELD)\n-@XmlType(name = \"GenericPersonIdentification1\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", propOrder = {\n+@XmlType(name = \"GenericPersonIdentification1\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\", propOrder = {\n \"id\",\n \"schmeNm\",\n \"issr\"\n })\n public class GenericPersonIdentification1 {\n \n- @XmlElement(name = \"Id\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", required = true)\n+ @XmlElement(name = \"Id\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\", required = true)\n protected String id;\n- @XmlElement(name = \"SchmeNm\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\")\n+ @XmlElement(name = \"SchmeNm\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\")\n protected PersonIdentificationSchemeName1Choice schmeNm;\n- @XmlElement(name = \"Issr\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\")\n+ @XmlElement(name = \"Issr\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\")\n protected String issr;\n \n /**", "raw_url": "https://github.com/willuhn/hbci4java/raw/0f60d39106094eb564d221904d2bb7a6dc39102d/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_008_002_02%2FGenericPersonIdentification1.java", "sha": "1d658b8a2d6e60cabd9e2cff494051cad2cde384", "status": "modified" }, { "additions": 124, "blob_url": "https://github.com/willuhn/hbci4java/blob/0f60d39106094eb564d221904d2bb7a6dc39102d/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_008_002_02%2FObjectFactory.java", "changes": 176, "contents_url": "https://api.github.com/repos/willuhn/hbci4java/contents/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_008_002_02%2FObjectFactory.java?ref=0f60d39106094eb564d221904d2bb7a6dc39102d", "deletions": 52, "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_002_02/ObjectFactory.java", "new_code": " private final static QName _Document_QNAME = new QName(\"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\", \"Document\");\n /**\n * Create an instance of {@link PaymentTypeInformationSDD }\n * \n */\n public PaymentTypeInformationSDD createPaymentTypeInformationSDD() {\n return new PaymentTypeInformationSDD();\n }\n\n /**\n * Create an instance of {@link FinancialInstitutionIdentificationSEPA2 }\n * \n */\n public FinancialInstitutionIdentificationSEPA2 createFinancialInstitutionIdentificationSEPA2() {\n return new FinancialInstitutionIdentificationSEPA2();\n }\n\n /**\n * Create an instance of {@link CustomerDirectDebitInitiationV02 }\n * \n */\n public CustomerDirectDebitInitiationV02 createCustomerDirectDebitInitiationV02() {\n return new CustomerDirectDebitInitiationV02();\n }\n\n * Create an instance of {@link PersonIdentificationSEPA2 }\n public PersonIdentificationSEPA2 createPersonIdentificationSEPA2() {\n return new PersonIdentificationSEPA2();\n * Create an instance of {@link PartyIdentificationSEPA5 }\n public PartyIdentificationSEPA5 createPartyIdentificationSEPA5() {\n return new PartyIdentificationSEPA5();\n * Create an instance of {@link PartyIdentificationSEPA4 }\n public PartyIdentificationSEPA4 createPartyIdentificationSEPA4() {\n return new PartyIdentificationSEPA4();\n * Create an instance of {@link PartyIdentificationSEPA3 }\n public PartyIdentificationSEPA3 createPartyIdentificationSEPA3() {\n return new PartyIdentificationSEPA3();\n }\n\n /**\n * Create an instance of {@link GenericOrganisationIdentification1 }\n * \n */\n public GenericOrganisationIdentification1 createGenericOrganisationIdentification1() {\n return new GenericOrganisationIdentification1();\n * Create an instance of {@link PurposeSEPA }\n public PurposeSEPA createPurposeSEPA() {\n return new PurposeSEPA();\n * Create an instance of {@link LocalInstrumentSEPA }\n public LocalInstrumentSEPA createLocalInstrumentSEPA() {\n return new LocalInstrumentSEPA();\n * Create an instance of {@link RestrictedPersonIdentificationSchemeNameSEPA }\n public RestrictedPersonIdentificationSchemeNameSEPA createRestrictedPersonIdentificationSchemeNameSEPA() {\n return new RestrictedPersonIdentificationSchemeNameSEPA();\n }\n\n /**\n * Create an instance of {@link AmendmentInformationDetailsSDD }\n * \n */\n public AmendmentInformationDetailsSDD createAmendmentInformationDetailsSDD() {\n return new AmendmentInformationDetailsSDD();\n * Create an instance of {@link DirectDebitTransactionSDD }\n public DirectDebitTransactionSDD createDirectDebitTransactionSDD() {\n return new DirectDebitTransactionSDD();\n /**\n * Create an instance of {@link BranchAndFinancialInstitutionIdentificationSEPA2 }\n * \n */\n public BranchAndFinancialInstitutionIdentificationSEPA2 createBranchAndFinancialInstitutionIdentificationSEPA2() {\n return new BranchAndFinancialInstitutionIdentificationSEPA2();\n }\n\n /**\n * Create an instance of {@link PartySEPA2 }\n * \n */\n public PartySEPA2 createPartySEPA2() {\n return new PartySEPA2();\n }\n\n * Create an instance of {@link PaymentInstructionInformationSDD }\n public PaymentInstructionInformationSDD createPaymentInstructionInformationSDD() {\n return new PaymentInstructionInformationSDD();\n * Create an instance of {@link PersonIdentificationSEPA1Choice }\n public PersonIdentificationSEPA1Choice createPersonIdentificationSEPA1Choice() {\n return new PersonIdentificationSEPA1Choice();\n * Create an instance of {@link ActiveOrHistoricCurrencyAndAmountSEPA }\n public ActiveOrHistoricCurrencyAndAmountSEPA createActiveOrHistoricCurrencyAndAmountSEPA() {\n return new ActiveOrHistoricCurrencyAndAmountSEPA();\n * Create an instance of {@link DirectDebitTransactionInformationSDD }\n public DirectDebitTransactionInformationSDD createDirectDebitTransactionInformationSDD() {\n return new DirectDebitTransactionInformationSDD();\n * Create an instance of {@link OrganisationIdentificationSEPAChoice }\n public OrganisationIdentificationSEPAChoice createOrganisationIdentificationSEPAChoice() {\n return new OrganisationIdentificationSEPAChoice();\n * Create an instance of {@link MandateRelatedInformationSDD }\n public MandateRelatedInformationSDD createMandateRelatedInformationSDD() {\n return new MandateRelatedInformationSDD();\n /**\n * Create an instance of {@link RestrictedPersonIdentificationSEPA }\n * \n */\n public RestrictedPersonIdentificationSEPA createRestrictedPersonIdentificationSEPA() {\n return new RestrictedPersonIdentificationSEPA();\n }\n\n /**\n * Create an instance of {@link RestrictedFinancialIdentificationSEPA }\n * \n */\n public RestrictedFinancialIdentificationSEPA createRestrictedFinancialIdentificationSEPA() {\n return new RestrictedFinancialIdentificationSEPA();\n }\n\n /**\n * Create an instance of {@link GroupHeaderSDD }\n * \n */\n public GroupHeaderSDD createGroupHeaderSDD() {\n return new GroupHeaderSDD();\n }\n\n @XmlElementDecl(namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\", name = \"Document\")", "new_methods": [ { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_002_02/ObjectFactory.java", "implementation": "return new PaymentTypeInformationSDD();", "signature": "PaymentTypeInformationSDD createPaymentTypeInformationSDD()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_002_02/ObjectFactory.java", "implementation": "return new FinancialInstitutionIdentificationSEPA2();", "signature": "FinancialInstitutionIdentificationSEPA2 createFinancialInstitutionIdentificationSEPA2()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_002_02/ObjectFactory.java", "implementation": "return new CustomerDirectDebitInitiationV02();", "signature": "CustomerDirectDebitInitiationV02 createCustomerDirectDebitInitiationV02()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_002_02/ObjectFactory.java", "implementation": "return new PersonIdentificationSEPA2();\n * Create an instance of {@link PartyIdentificationSEPA5", "signature": "PersonIdentificationSEPA2 createPersonIdentificationSEPA2()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_002_02/ObjectFactory.java", "implementation": "return new PartyIdentificationSEPA5();\n * Create an instance of {@link PartyIdentificationSEPA4", "signature": "PartyIdentificationSEPA5 createPartyIdentificationSEPA5()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_002_02/ObjectFactory.java", "implementation": "return new PartyIdentificationSEPA4();\n * Create an instance of {@link PartyIdentificationSEPA3", "signature": "PartyIdentificationSEPA4 createPartyIdentificationSEPA4()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_002_02/ObjectFactory.java", "implementation": "return new PartyIdentificationSEPA3();", "signature": "PartyIdentificationSEPA3 createPartyIdentificationSEPA3()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_002_02/ObjectFactory.java", "implementation": "return new GenericOrganisationIdentification1();\n * Create an instance of {@link PurposeSEPA", "signature": "GenericOrganisationIdentification1 createGenericOrganisationIdentification1()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_002_02/ObjectFactory.java", "implementation": "return new PurposeSEPA();\n * Create an instance of {@link LocalInstrumentSEPA", "signature": "PurposeSEPA createPurposeSEPA()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_002_02/ObjectFactory.java", "implementation": "return new LocalInstrumentSEPA();\n * Create an instance of {@link RestrictedPersonIdentificationSchemeNameSEPA", "signature": "LocalInstrumentSEPA createLocalInstrumentSEPA()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_002_02/ObjectFactory.java", "implementation": "return new RestrictedPersonIdentificationSchemeNameSEPA();", "signature": "RestrictedPersonIdentificationSchemeNameSEPA createRestrictedPersonIdentificationSchemeNameSEPA()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_002_02/ObjectFactory.java", "implementation": "return new AmendmentInformationDetailsSDD();\n * Create an instance of {@link DirectDebitTransactionSDD", "signature": "AmendmentInformationDetailsSDD createAmendmentInformationDetailsSDD()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_002_02/ObjectFactory.java", "implementation": "return new DirectDebitTransactionSDD();\n /**\n * Create an instance of {@link BranchAndFinancialInstitutionIdentificationSEPA2", "signature": "DirectDebitTransactionSDD createDirectDebitTransactionSDD()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_002_02/ObjectFactory.java", "implementation": "return new BranchAndFinancialInstitutionIdentificationSEPA2();", "signature": "BranchAndFinancialInstitutionIdentificationSEPA2 createBranchAndFinancialInstitutionIdentificationSEPA2()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_002_02/ObjectFactory.java", "implementation": "return new PartySEPA2();", "signature": "PartySEPA2 createPartySEPA2()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_002_02/ObjectFactory.java", "implementation": "return new PaymentInstructionInformationSDD();\n * Create an instance of {@link PersonIdentificationSEPA1Choice", "signature": "PaymentInstructionInformationSDD createPaymentInstructionInformationSDD()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_002_02/ObjectFactory.java", "implementation": "return new PersonIdentificationSEPA1Choice();\n * Create an instance of {@link ActiveOrHistoricCurrencyAndAmountSEPA", "signature": "PersonIdentificationSEPA1Choice createPersonIdentificationSEPA1Choice()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_002_02/ObjectFactory.java", "implementation": "return new ActiveOrHistoricCurrencyAndAmountSEPA();\n * Create an instance of {@link DirectDebitTransactionInformationSDD", "signature": "ActiveOrHistoricCurrencyAndAmountSEPA createActiveOrHistoricCurrencyAndAmountSEPA()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_002_02/ObjectFactory.java", "implementation": "return new DirectDebitTransactionInformationSDD();\n * Create an instance of {@link OrganisationIdentificationSEPAChoice", "signature": "DirectDebitTransactionInformationSDD createDirectDebitTransactionInformationSDD()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_002_02/ObjectFactory.java", "implementation": "return new OrganisationIdentificationSEPAChoice();\n * Create an instance of {@link MandateRelatedInformationSDD", "signature": "OrganisationIdentificationSEPAChoice createOrganisationIdentificationSEPAChoice()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_002_02/ObjectFactory.java", "implementation": "return new MandateRelatedInformationSDD();\n /**\n * Create an instance of {@link RestrictedPersonIdentificationSEPA", "signature": "MandateRelatedInformationSDD createMandateRelatedInformationSDD()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_002_02/ObjectFactory.java", "implementation": "return new RestrictedPersonIdentificationSEPA();", "signature": "RestrictedPersonIdentificationSEPA createRestrictedPersonIdentificationSEPA()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_002_02/ObjectFactory.java", "implementation": "return new RestrictedFinancialIdentificationSEPA();", "signature": "RestrictedFinancialIdentificationSEPA createRestrictedFinancialIdentificationSEPA()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_002_02/ObjectFactory.java", "implementation": "return new GroupHeaderSDD();", "signature": "GroupHeaderSDD createGroupHeaderSDD()" } ], "old_code": " private final static QName _Document_QNAME = new QName(\"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", \"Document\");\n * Create an instance of {@link FinancialInstitutionIdentificationSEPA3 }\n public FinancialInstitutionIdentificationSEPA3 createFinancialInstitutionIdentificationSEPA3() {\n return new FinancialInstitutionIdentificationSEPA3();\n * Create an instance of {@link GroupHeaderSCT }\n public GroupHeaderSCT createGroupHeaderSCT() {\n return new GroupHeaderSCT();\n * Create an instance of {@link GenericOrganisationIdentification1 }\n public GenericOrganisationIdentification1 createGenericOrganisationIdentification1() {\n return new GenericOrganisationIdentification1();\n * Create an instance of {@link PaymentTypeInformationSCT2 }\n public PaymentTypeInformationSCT2 createPaymentTypeInformationSCT2() {\n return new PaymentTypeInformationSCT2();\n * Create an instance of {@link PaymentTypeInformationSCT1 }\n public PaymentTypeInformationSCT1 createPaymentTypeInformationSCT1() {\n return new PaymentTypeInformationSCT1();\n * Create an instance of {@link PurposeSEPA }\n public PurposeSEPA createPurposeSEPA() {\n return new PurposeSEPA();\n * Create an instance of {@link CustomerCreditTransferInitiationV03 }\n public CustomerCreditTransferInitiationV03 createCustomerCreditTransferInitiationV03() {\n return new CustomerCreditTransferInitiationV03();\n * Create an instance of {@link BranchAndFinancialInstitutionIdentificationSEPA3 }\n public BranchAndFinancialInstitutionIdentificationSEPA3 createBranchAndFinancialInstitutionIdentificationSEPA3() {\n return new BranchAndFinancialInstitutionIdentificationSEPA3();\n /**\n * Create an instance of {@link OthrIdentification }\n * \n */\n public OthrIdentification createOthrIdentification() {\n return new OthrIdentification();\n }\n\n * Create an instance of {@link AmountTypeSEPA }\n public AmountTypeSEPA createAmountTypeSEPA() {\n return new AmountTypeSEPA();\n * Create an instance of {@link CreditTransferTransactionInformationSCT }\n public CreditTransferTransactionInformationSCT createCreditTransferTransactionInformationSCT() {\n return new CreditTransferTransactionInformationSCT();\n * Create an instance of {@link PaymentInstructionInformationSCT }\n public PaymentInstructionInformationSCT createPaymentInstructionInformationSCT() {\n return new PaymentInstructionInformationSCT();\n * Create an instance of {@link PersonIdentificationSEPA1Choice }\n public PersonIdentificationSEPA1Choice createPersonIdentificationSEPA1Choice() {\n return new PersonIdentificationSEPA1Choice();\n * Create an instance of {@link ActiveOrHistoricCurrencyAndAmountSEPA }\n public ActiveOrHistoricCurrencyAndAmountSEPA createActiveOrHistoricCurrencyAndAmountSEPA() {\n return new ActiveOrHistoricCurrencyAndAmountSEPA();\n * Create an instance of {@link OrganisationIdentificationSEPAChoice }\n public OrganisationIdentificationSEPAChoice createOrganisationIdentificationSEPAChoice() {\n return new OrganisationIdentificationSEPAChoice();\n @XmlElementDecl(namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", name = \"Document\")", "old_methods": [ { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_002_02/ObjectFactory.java", "implementation": "return new FinancialInstitutionIdentificationSEPA3();\n * Create an instance of {@link GroupHeaderSCT", "signature": "FinancialInstitutionIdentificationSEPA3 createFinancialInstitutionIdentificationSEPA3()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_002_02/ObjectFactory.java", "implementation": "return new GroupHeaderSCT();\n * Create an instance of {@link GenericOrganisationIdentification1", "signature": "GroupHeaderSCT createGroupHeaderSCT()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_002_02/ObjectFactory.java", "implementation": "return new GenericOrganisationIdentification1();\n * Create an instance of {@link PaymentTypeInformationSCT2", "signature": "GenericOrganisationIdentification1 createGenericOrganisationIdentification1()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_002_02/ObjectFactory.java", "implementation": "return new PaymentTypeInformationSCT2();\n * Create an instance of {@link PaymentTypeInformationSCT1", "signature": "PaymentTypeInformationSCT2 createPaymentTypeInformationSCT2()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_002_02/ObjectFactory.java", "implementation": "return new PaymentTypeInformationSCT1();\n * Create an instance of {@link PurposeSEPA", "signature": "PaymentTypeInformationSCT1 createPaymentTypeInformationSCT1()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_002_02/ObjectFactory.java", "implementation": "return new PurposeSEPA();\n * Create an instance of {@link CustomerCreditTransferInitiationV03", "signature": "PurposeSEPA createPurposeSEPA()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_002_02/ObjectFactory.java", "implementation": "return new CustomerCreditTransferInitiationV03();\n * Create an instance of {@link BranchAndFinancialInstitutionIdentificationSEPA3", "signature": "CustomerCreditTransferInitiationV03 createCustomerCreditTransferInitiationV03()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_002_02/ObjectFactory.java", "implementation": "return new BranchAndFinancialInstitutionIdentificationSEPA3();\n /**\n * Create an instance of {@link OthrIdentification", "signature": "BranchAndFinancialInstitutionIdentificationSEPA3 createBranchAndFinancialInstitutionIdentificationSEPA3()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_002_02/ObjectFactory.java", "implementation": "return new OthrIdentification();", "signature": "OthrIdentification createOthrIdentification()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_002_02/ObjectFactory.java", "implementation": "return new AmountTypeSEPA();\n * Create an instance of {@link CreditTransferTransactionInformationSCT", "signature": "AmountTypeSEPA createAmountTypeSEPA()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_002_02/ObjectFactory.java", "implementation": "return new CreditTransferTransactionInformationSCT();\n * Create an instance of {@link PaymentInstructionInformationSCT", "signature": "CreditTransferTransactionInformationSCT createCreditTransferTransactionInformationSCT()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_002_02/ObjectFactory.java", "implementation": "return new PaymentInstructionInformationSCT();\n * Create an instance of {@link PersonIdentificationSEPA1Choice", "signature": "PaymentInstructionInformationSCT createPaymentInstructionInformationSCT()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_002_02/ObjectFactory.java", "implementation": "return new PersonIdentificationSEPA1Choice();\n * Create an instance of {@link ActiveOrHistoricCurrencyAndAmountSEPA", "signature": "PersonIdentificationSEPA1Choice createPersonIdentificationSEPA1Choice()" }, { "arguments": [], "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_002_02/ObjectFactory.java", "implementation": "return new ActiveOrHistoricCurrencyAndAmountSEPA();\n * Create an instance of {@link OrganisationIdentificationSEPAChoice", "signature": "ActiveOrHistoricCurrencyAndAmountSEPA createActiveOrHistoricCurrencyAndAmountSEPA()" } ], "patch": "@@ -24,7 +24,7 @@\n @XmlRegistry\n public class ObjectFactory {\n \n- private final static QName _Document_QNAME = new QName(\"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", \"Document\");\n+ private final static QName _Document_QNAME = new QName(\"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\", \"Document\");\n \n /**\n * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.kapott.hbci.sepa.jaxb.pain_008_002_02\n@@ -49,6 +49,14 @@ public PaymentIdentificationSEPA createPaymentIdentificationSEPA() {\n return new PaymentIdentificationSEPA();\n }\n \n+ /**\n+ * Create an instance of {@link PaymentTypeInformationSDD }\n+ * \n+ */\n+ public PaymentTypeInformationSDD createPaymentTypeInformationSDD() {\n+ return new PaymentTypeInformationSDD();\n+ }\n+\n /**\n * Create an instance of {@link FinancialInstitutionIdentificationSEPA1 }\n * \n@@ -57,6 +65,22 @@ public FinancialInstitutionIdentificationSEPA1 createFinancialInstitutionIdentif\n return new FinancialInstitutionIdentificationSEPA1();\n }\n \n+ /**\n+ * Create an instance of {@link FinancialInstitutionIdentificationSEPA2 }\n+ * \n+ */\n+ public FinancialInstitutionIdentificationSEPA2 createFinancialInstitutionIdentificationSEPA2() {\n+ return new FinancialInstitutionIdentificationSEPA2();\n+ }\n+\n+ /**\n+ * Create an instance of {@link CustomerDirectDebitInitiationV02 }\n+ * \n+ */\n+ public CustomerDirectDebitInitiationV02 createCustomerDirectDebitInitiationV02() {\n+ return new CustomerDirectDebitInitiationV02();\n+ }\n+\n /**\n * Create an instance of {@link CreditorReferenceTypeCodeSEPA }\n * \n@@ -66,35 +90,43 @@ public CreditorReferenceTypeCodeSEPA createCreditorReferenceTypeCodeSEPA() {\n }\n \n /**\n- * Create an instance of {@link FinancialInstitutionIdentificationSEPA3 }\n+ * Create an instance of {@link PersonIdentificationSEPA2 }\n * \n */\n- public FinancialInstitutionIdentificationSEPA3 createFinancialInstitutionIdentificationSEPA3() {\n- return new FinancialInstitutionIdentificationSEPA3();\n+ public PersonIdentificationSEPA2 createPersonIdentificationSEPA2() {\n+ return new PersonIdentificationSEPA2();\n }\n \n /**\n- * Create an instance of {@link GroupHeaderSCT }\n+ * Create an instance of {@link PartyIdentificationSEPA5 }\n * \n */\n- public GroupHeaderSCT createGroupHeaderSCT() {\n- return new GroupHeaderSCT();\n+ public PartyIdentificationSEPA5 createPartyIdentificationSEPA5() {\n+ return new PartyIdentificationSEPA5();\n }\n \n /**\n- * Create an instance of {@link GenericOrganisationIdentification1 }\n+ * Create an instance of {@link PartyIdentificationSEPA4 }\n * \n */\n- public GenericOrganisationIdentification1 createGenericOrganisationIdentification1() {\n- return new GenericOrganisationIdentification1();\n+ public PartyIdentificationSEPA4 createPartyIdentificationSEPA4() {\n+ return new PartyIdentificationSEPA4();\n }\n \n /**\n- * Create an instance of {@link PaymentTypeInformationSCT2 }\n+ * Create an instance of {@link PartyIdentificationSEPA3 }\n * \n */\n- public PaymentTypeInformationSCT2 createPaymentTypeInformationSCT2() {\n- return new PaymentTypeInformationSCT2();\n+ public PartyIdentificationSEPA3 createPartyIdentificationSEPA3() {\n+ return new PartyIdentificationSEPA3();\n+ }\n+\n+ /**\n+ * Create an instance of {@link GenericOrganisationIdentification1 }\n+ * \n+ */\n+ public GenericOrganisationIdentification1 createGenericOrganisationIdentification1() {\n+ return new GenericOrganisationIdentification1();\n }\n \n /**\n@@ -114,27 +146,35 @@ public PartyIdentificationSEPA1 createPartyIdentificationSEPA1() {\n }\n \n /**\n- * Create an instance of {@link PaymentTypeInformationSCT1 }\n+ * Create an instance of {@link PurposeSEPA }\n * \n */\n- public PaymentTypeInformationSCT1 createPaymentTypeInformationSCT1() {\n- return new PaymentTypeInformationSCT1();\n+ public PurposeSEPA createPurposeSEPA() {\n+ return new PurposeSEPA();\n }\n \n /**\n- * Create an instance of {@link PurposeSEPA }\n+ * Create an instance of {@link LocalInstrumentSEPA }\n * \n */\n- public PurposeSEPA createPurposeSEPA() {\n- return new PurposeSEPA();\n+ public LocalInstrumentSEPA createLocalInstrumentSEPA() {\n+ return new LocalInstrumentSEPA();\n }\n \n /**\n- * Create an instance of {@link CustomerCreditTransferInitiationV03 }\n+ * Create an instance of {@link RestrictedPersonIdentificationSchemeNameSEPA }\n * \n */\n- public CustomerCreditTransferInitiationV03 createCustomerCreditTransferInitiationV03() {\n- return new CustomerCreditTransferInitiationV03();\n+ public RestrictedPersonIdentificationSchemeNameSEPA createRestrictedPersonIdentificationSchemeNameSEPA() {\n+ return new RestrictedPersonIdentificationSchemeNameSEPA();\n+ }\n+\n+ /**\n+ * Create an instance of {@link AmendmentInformationDetailsSDD }\n+ * \n+ */\n+ public AmendmentInformationDetailsSDD createAmendmentInformationDetailsSDD() {\n+ return new AmendmentInformationDetailsSDD();\n }\n \n /**\n@@ -146,11 +186,11 @@ public AccountIdentificationSEPA createAccountIdentificationSEPA() {\n }\n \n /**\n- * Create an instance of {@link BranchAndFinancialInstitutionIdentificationSEPA3 }\n+ * Create an instance of {@link DirectDebitTransactionSDD }\n * \n */\n- public BranchAndFinancialInstitutionIdentificationSEPA3 createBranchAndFinancialInstitutionIdentificationSEPA3() {\n- return new BranchAndFinancialInstitutionIdentificationSEPA3();\n+ public DirectDebitTransactionSDD createDirectDebitTransactionSDD() {\n+ return new DirectDebitTransactionSDD();\n }\n \n /**\n@@ -161,6 +201,14 @@ public PartySEPAChoice createPartySEPAChoice() {\n return new PartySEPAChoice();\n }\n \n+ /**\n+ * Create an instance of {@link BranchAndFinancialInstitutionIdentificationSEPA2 }\n+ * \n+ */\n+ public BranchAndFinancialInstitutionIdentificationSEPA2 createBranchAndFinancialInstitutionIdentificationSEPA2() {\n+ return new BranchAndFinancialInstitutionIdentificationSEPA2();\n+ }\n+\n /**\n * Create an instance of {@link BranchAndFinancialInstitutionIdentificationSEPA1 }\n * \n@@ -193,6 +241,14 @@ public ServiceLevelSEPA createServiceLevelSEPA() {\n return new ServiceLevelSEPA();\n }\n \n+ /**\n+ * Create an instance of {@link PartySEPA2 }\n+ * \n+ */\n+ public PartySEPA2 createPartySEPA2() {\n+ return new PartySEPA2();\n+ }\n+\n /**\n * Create an instance of {@link CashAccountSEPA2 }\n * \n@@ -217,14 +273,6 @@ public CashAccountSEPA1 createCashAccountSEPA1() {\n return new CashAccountSEPA1();\n }\n \n- /**\n- * Create an instance of {@link OthrIdentification }\n- * \n- */\n- public OthrIdentification createOthrIdentification() {\n- return new OthrIdentification();\n- }\n-\n /**\n * Create an instance of {@link OrganisationIdentificationSchemeName1Choice }\n * \n@@ -234,51 +282,51 @@ public OrganisationIdentificationSchemeName1Choice createOrganisationIdentificat\n }\n \n /**\n- * Create an instance of {@link AmountTypeSEPA }\n+ * Create an instance of {@link PaymentInstructionInformationSDD }\n * \n */\n- public AmountTypeSEPA createAmountTypeSEPA() {\n- return new AmountTypeSEPA();\n+ public PaymentInstructionInformationSDD createPaymentInstructionInformationSDD() {\n+ return new PaymentInstructionInformationSDD();\n }\n \n /**\n- * Create an instance of {@link CreditTransferTransactionInformationSCT }\n+ * Create an instance of {@link PersonIdentificationSEPA1Choice }\n * \n */\n- public CreditTransferTransactionInformationSCT createCreditTransferTransactionInformationSCT() {\n- return new CreditTransferTransactionInformationSCT();\n+ public PersonIdentificationSEPA1Choice createPersonIdentificationSEPA1Choice() {\n+ return new PersonIdentificationSEPA1Choice();\n }\n \n /**\n- * Create an instance of {@link PaymentInstructionInformationSCT }\n+ * Create an instance of {@link ActiveOrHistoricCurrencyAndAmountSEPA }\n * \n */\n- public PaymentInstructionInformationSCT createPaymentInstructionInformationSCT() {\n- return new PaymentInstructionInformationSCT();\n+ public ActiveOrHistoricCurrencyAndAmountSEPA createActiveOrHistoricCurrencyAndAmountSEPA() {\n+ return new ActiveOrHistoricCurrencyAndAmountSEPA();\n }\n \n /**\n- * Create an instance of {@link PersonIdentificationSEPA1Choice }\n+ * Create an instance of {@link DirectDebitTransactionInformationSDD }\n * \n */\n- public PersonIdentificationSEPA1Choice createPersonIdentificationSEPA1Choice() {\n- return new PersonIdentificationSEPA1Choice();\n+ public DirectDebitTransactionInformationSDD createDirectDebitTransactionInformationSDD() {\n+ return new DirectDebitTransactionInformationSDD();\n }\n \n /**\n- * Create an instance of {@link ActiveOrHistoricCurrencyAndAmountSEPA }\n+ * Create an instance of {@link OrganisationIdentificationSEPAChoice }\n * \n */\n- public ActiveOrHistoricCurrencyAndAmountSEPA createActiveOrHistoricCurrencyAndAmountSEPA() {\n- return new ActiveOrHistoricCurrencyAndAmountSEPA();\n+ public OrganisationIdentificationSEPAChoice createOrganisationIdentificationSEPAChoice() {\n+ return new OrganisationIdentificationSEPAChoice();\n }\n \n /**\n- * Create an instance of {@link OrganisationIdentificationSEPAChoice }\n+ * Create an instance of {@link MandateRelatedInformationSDD }\n * \n */\n- public OrganisationIdentificationSEPAChoice createOrganisationIdentificationSEPAChoice() {\n- return new OrganisationIdentificationSEPAChoice();\n+ public MandateRelatedInformationSDD createMandateRelatedInformationSDD() {\n+ return new MandateRelatedInformationSDD();\n }\n \n /**\n@@ -297,6 +345,22 @@ public CreditorReferenceInformationSEPA1 createCreditorReferenceInformationSEPA1\n return new CreditorReferenceInformationSEPA1();\n }\n \n+ /**\n+ * Create an instance of {@link RestrictedPersonIdentificationSEPA }\n+ * \n+ */\n+ public RestrictedPersonIdentificationSEPA createRestrictedPersonIdentificationSEPA() {\n+ return new RestrictedPersonIdentificationSEPA();\n+ }\n+\n+ /**\n+ * Create an instance of {@link RestrictedFinancialIdentificationSEPA }\n+ * \n+ */\n+ public RestrictedFinancialIdentificationSEPA createRestrictedFinancialIdentificationSEPA() {\n+ return new RestrictedFinancialIdentificationSEPA();\n+ }\n+\n /**\n * Create an instance of {@link GenericPersonIdentification1 }\n * \n@@ -321,6 +385,14 @@ public CategoryPurposeSEPA createCategoryPurposeSEPA() {\n return new CategoryPurposeSEPA();\n }\n \n+ /**\n+ * Create an instance of {@link GroupHeaderSDD }\n+ * \n+ */\n+ public GroupHeaderSDD createGroupHeaderSDD() {\n+ return new GroupHeaderSDD();\n+ }\n+\n /**\n * Create an instance of {@link CreditorReferenceTypeSEPA }\n * \n@@ -333,7 +405,7 @@ public CreditorReferenceTypeSEPA createCreditorReferenceTypeSEPA() {\n * Create an instance of {@link JAXBElement }{@code <}{@link Document }{@code >}}\n * \n */\n- @XmlElementDecl(namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", name = \"Document\")\n+ @XmlElementDecl(namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\", name = \"Document\")\n public JAXBElement<Document> createDocument(Document value) {\n return new JAXBElement<Document>(_Document_QNAME, Document.class, null, value);\n }", "raw_url": "https://github.com/willuhn/hbci4java/raw/0f60d39106094eb564d221904d2bb7a6dc39102d/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_008_002_02%2FObjectFactory.java", "sha": "ba67efd63d5782a4f71210883b87947f5f4766c9", "status": "modified" }, { "additions": 5, "blob_url": "https://github.com/willuhn/hbci4java/blob/0f60d39106094eb564d221904d2bb7a6dc39102d/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_008_002_02%2FOrganisationIdentificationSEPAChoice.java", "changes": 10, "contents_url": "https://api.github.com/repos/willuhn/hbci4java/contents/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_008_002_02%2FOrganisationIdentificationSEPAChoice.java?ref=0f60d39106094eb564d221904d2bb7a6dc39102d", "deletions": 5, "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_002_02/OrganisationIdentificationSEPAChoice.java", "new_code": " * &lt;element name=\"BICOrBEI\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.008.002.02}AnyBICIdentifier\"/>\n * &lt;element name=\"Othr\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.008.002.02}GenericOrganisationIdentification1\"/>\n@XmlType(name = \"OrganisationIdentificationSEPAChoice\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\", propOrder = {\n @XmlElement(name = \"BICOrBEI\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\")\n @XmlElement(name = \"Othr\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\")", "new_methods": [], "old_code": " * &lt;element name=\"BICOrBEI\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}AnyBICIdentifier\"/>\n * &lt;element name=\"Othr\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}GenericOrganisationIdentification1\"/>\n@XmlType(name = \"OrganisationIdentificationSEPAChoice\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", propOrder = {\n @XmlElement(name = \"BICOrBEI\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\")\n @XmlElement(name = \"Othr\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\")", "old_methods": [], "patch": "@@ -18,8 +18,8 @@\n * &lt;restriction base=\"{http://www.w3.org/2001/XMLSchema}anyType\">\n * &lt;sequence>\n * &lt;choice>\n- * &lt;element name=\"BICOrBEI\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}AnyBICIdentifier\"/>\n- * &lt;element name=\"Othr\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}GenericOrganisationIdentification1\"/>\n+ * &lt;element name=\"BICOrBEI\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.008.002.02}AnyBICIdentifier\"/>\n+ * &lt;element name=\"Othr\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.008.002.02}GenericOrganisationIdentification1\"/>\n * &lt;/choice>\n * &lt;/sequence>\n * &lt;/restriction>\n@@ -30,15 +30,15 @@\n * \n */\n @XmlAccessorType(XmlAccessType.FIELD)\n-@XmlType(name = \"OrganisationIdentificationSEPAChoice\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", propOrder = {\n+@XmlType(name = \"OrganisationIdentificationSEPAChoice\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\", propOrder = {\n \"bicOrBEI\",\n \"othr\"\n })\n public class OrganisationIdentificationSEPAChoice {\n \n- @XmlElement(name = \"BICOrBEI\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\")\n+ @XmlElement(name = \"BICOrBEI\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\")\n protected String bicOrBEI;\n- @XmlElement(name = \"Othr\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\")\n+ @XmlElement(name = \"Othr\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\")\n protected GenericOrganisationIdentification1 othr;\n \n /**", "raw_url": "https://github.com/willuhn/hbci4java/raw/0f60d39106094eb564d221904d2bb7a6dc39102d/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_008_002_02%2FOrganisationIdentificationSEPAChoice.java", "sha": "0b16e8a594b66f68c9ba1dc32825143b866b70d1", "status": "modified" }, { "additions": 5, "blob_url": "https://github.com/willuhn/hbci4java/blob/0f60d39106094eb564d221904d2bb7a6dc39102d/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_008_002_02%2FOrganisationIdentificationSchemeName1Choice.java", "changes": 10, "contents_url": "https://api.github.com/repos/willuhn/hbci4java/contents/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_008_002_02%2FOrganisationIdentificationSchemeName1Choice.java?ref=0f60d39106094eb564d221904d2bb7a6dc39102d", "deletions": 5, "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_002_02/OrganisationIdentificationSchemeName1Choice.java", "new_code": " * &lt;element name=\"Cd\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.008.002.02}ExternalOrganisationIdentification1Code\"/>\n * &lt;element name=\"Prtry\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.008.002.02}Max35Text\"/>\n@XmlType(name = \"OrganisationIdentificationSchemeName1Choice\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\", propOrder = {\n @XmlElement(name = \"Cd\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\")\n @XmlElement(name = \"Prtry\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\")", "new_methods": [], "old_code": " * &lt;element name=\"Cd\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}ExternalOrganisationIdentification1Code\"/>\n * &lt;element name=\"Prtry\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}Max35Text\"/>\n@XmlType(name = \"OrganisationIdentificationSchemeName1Choice\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", propOrder = {\n @XmlElement(name = \"Cd\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\")\n @XmlElement(name = \"Prtry\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\")", "old_methods": [], "patch": "@@ -18,8 +18,8 @@\n * &lt;restriction base=\"{http://www.w3.org/2001/XMLSchema}anyType\">\n * &lt;sequence>\n * &lt;choice>\n- * &lt;element name=\"Cd\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}ExternalOrganisationIdentification1Code\"/>\n- * &lt;element name=\"Prtry\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}Max35Text\"/>\n+ * &lt;element name=\"Cd\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.008.002.02}ExternalOrganisationIdentification1Code\"/>\n+ * &lt;element name=\"Prtry\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.008.002.02}Max35Text\"/>\n * &lt;/choice>\n * &lt;/sequence>\n * &lt;/restriction>\n@@ -30,15 +30,15 @@\n * \n */\n @XmlAccessorType(XmlAccessType.FIELD)\n-@XmlType(name = \"OrganisationIdentificationSchemeName1Choice\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", propOrder = {\n+@XmlType(name = \"OrganisationIdentificationSchemeName1Choice\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\", propOrder = {\n \"cd\",\n \"prtry\"\n })\n public class OrganisationIdentificationSchemeName1Choice {\n \n- @XmlElement(name = \"Cd\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\")\n+ @XmlElement(name = \"Cd\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\")\n protected String cd;\n- @XmlElement(name = \"Prtry\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\")\n+ @XmlElement(name = \"Prtry\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\")\n protected String prtry;\n \n /**", "raw_url": "https://github.com/willuhn/hbci4java/raw/0f60d39106094eb564d221904d2bb7a6dc39102d/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_008_002_02%2FOrganisationIdentificationSchemeName1Choice.java", "sha": "e98af23a168d2f0e2872567f8f8b6be1107a0da2", "status": "modified" }, { "additions": 5, "blob_url": "https://github.com/willuhn/hbci4java/blob/0f60d39106094eb564d221904d2bb7a6dc39102d/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_008_002_02%2FPartyIdentificationSEPA1.java", "changes": 10, "contents_url": "https://api.github.com/repos/willuhn/hbci4java/contents/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_008_002_02%2FPartyIdentificationSEPA1.java?ref=0f60d39106094eb564d221904d2bb7a6dc39102d", "deletions": 5, "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_002_02/PartyIdentificationSEPA1.java", "new_code": " * &lt;element name=\"Nm\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.008.002.02}Max70Text\" minOccurs=\"0\"/>\n * &lt;element name=\"Id\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.008.002.02}PartySEPAChoice\" minOccurs=\"0\"/>\n@XmlType(name = \"PartyIdentificationSEPA1\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\", propOrder = {\n @XmlElement(name = \"Nm\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\")\n @XmlElement(name = \"Id\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\")", "new_methods": [], "old_code": " * &lt;element name=\"Nm\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}Max70Text\" minOccurs=\"0\"/>\n * &lt;element name=\"Id\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}PartySEPAChoice\" minOccurs=\"0\"/>\n@XmlType(name = \"PartyIdentificationSEPA1\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", propOrder = {\n @XmlElement(name = \"Nm\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\")\n @XmlElement(name = \"Id\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\")", "old_methods": [], "patch": "@@ -17,8 +17,8 @@\n * &lt;complexContent>\n * &lt;restriction base=\"{http://www.w3.org/2001/XMLSchema}anyType\">\n * &lt;sequence>\n- * &lt;element name=\"Nm\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}Max70Text\" minOccurs=\"0\"/>\n- * &lt;element name=\"Id\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}PartySEPAChoice\" minOccurs=\"0\"/>\n+ * &lt;element name=\"Nm\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.008.002.02}Max70Text\" minOccurs=\"0\"/>\n+ * &lt;element name=\"Id\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.008.002.02}PartySEPAChoice\" minOccurs=\"0\"/>\n * &lt;/sequence>\n * &lt;/restriction>\n * &lt;/complexContent>\n@@ -28,15 +28,15 @@\n * \n */\n @XmlAccessorType(XmlAccessType.FIELD)\n-@XmlType(name = \"PartyIdentificationSEPA1\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", propOrder = {\n+@XmlType(name = \"PartyIdentificationSEPA1\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\", propOrder = {\n \"nm\",\n \"id\"\n })\n public class PartyIdentificationSEPA1 {\n \n- @XmlElement(name = \"Nm\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\")\n+ @XmlElement(name = \"Nm\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\")\n protected String nm;\n- @XmlElement(name = \"Id\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\")\n+ @XmlElement(name = \"Id\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\")\n protected PartySEPAChoice id;\n \n /**", "raw_url": "https://github.com/willuhn/hbci4java/raw/0f60d39106094eb564d221904d2bb7a6dc39102d/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_008_002_02%2FPartyIdentificationSEPA1.java", "sha": "621f2f1d79a889e9366b65bd5f1831a2030d11a7", "status": "modified" }, { "additions": 7, "blob_url": "https://github.com/willuhn/hbci4java/blob/0f60d39106094eb564d221904d2bb7a6dc39102d/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_008_002_02%2FPartyIdentificationSEPA2.java", "changes": 14, "contents_url": "https://api.github.com/repos/willuhn/hbci4java/contents/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_008_002_02%2FPartyIdentificationSEPA2.java?ref=0f60d39106094eb564d221904d2bb7a6dc39102d", "deletions": 7, "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_002_02/PartyIdentificationSEPA2.java", "new_code": " * &lt;element name=\"Nm\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.008.002.02}Max70Text\"/>\n * &lt;element name=\"PstlAdr\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.008.002.02}PostalAddressSEPA\" minOccurs=\"0\"/>\n * &lt;element name=\"Id\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.008.002.02}PartySEPAChoice\" minOccurs=\"0\"/>\n@XmlType(name = \"PartyIdentificationSEPA2\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\", propOrder = {\n @XmlElement(name = \"Nm\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\", required = true)\n @XmlElement(name = \"PstlAdr\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\")\n @XmlElement(name = \"Id\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\")", "new_methods": [], "old_code": " * &lt;element name=\"Nm\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}Max70Text\"/>\n * &lt;element name=\"PstlAdr\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}PostalAddressSEPA\" minOccurs=\"0\"/>\n * &lt;element name=\"Id\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}PartySEPAChoice\" minOccurs=\"0\"/>\n@XmlType(name = \"PartyIdentificationSEPA2\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", propOrder = {\n @XmlElement(name = \"Nm\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", required = true)\n @XmlElement(name = \"PstlAdr\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\")\n @XmlElement(name = \"Id\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\")", "old_methods": [], "patch": "@@ -17,9 +17,9 @@\n * &lt;complexContent>\n * &lt;restriction base=\"{http://www.w3.org/2001/XMLSchema}anyType\">\n * &lt;sequence>\n- * &lt;element name=\"Nm\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}Max70Text\"/>\n- * &lt;element name=\"PstlAdr\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}PostalAddressSEPA\" minOccurs=\"0\"/>\n- * &lt;element name=\"Id\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}PartySEPAChoice\" minOccurs=\"0\"/>\n+ * &lt;element name=\"Nm\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.008.002.02}Max70Text\"/>\n+ * &lt;element name=\"PstlAdr\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.008.002.02}PostalAddressSEPA\" minOccurs=\"0\"/>\n+ * &lt;element name=\"Id\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.008.002.02}PartySEPAChoice\" minOccurs=\"0\"/>\n * &lt;/sequence>\n * &lt;/restriction>\n * &lt;/complexContent>\n@@ -29,18 +29,18 @@\n * \n */\n @XmlAccessorType(XmlAccessType.FIELD)\n-@XmlType(name = \"PartyIdentificationSEPA2\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", propOrder = {\n+@XmlType(name = \"PartyIdentificationSEPA2\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\", propOrder = {\n \"nm\",\n \"pstlAdr\",\n \"id\"\n })\n public class PartyIdentificationSEPA2 {\n \n- @XmlElement(name = \"Nm\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", required = true)\n+ @XmlElement(name = \"Nm\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\", required = true)\n protected String nm;\n- @XmlElement(name = \"PstlAdr\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\")\n+ @XmlElement(name = \"PstlAdr\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\")\n protected PostalAddressSEPA pstlAdr;\n- @XmlElement(name = \"Id\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\")\n+ @XmlElement(name = \"Id\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\")\n protected PartySEPAChoice id;\n \n /**", "raw_url": "https://github.com/willuhn/hbci4java/raw/0f60d39106094eb564d221904d2bb7a6dc39102d/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_008_002_02%2FPartyIdentificationSEPA2.java", "sha": "66e823647c44c3c07a412f860bad82689aabfd2c", "status": "modified" }, { "additions": 5, "blob_url": "https://github.com/willuhn/hbci4java/blob/0f60d39106094eb564d221904d2bb7a6dc39102d/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_008_002_02%2FPartySEPAChoice.java", "changes": 10, "contents_url": "https://api.github.com/repos/willuhn/hbci4java/contents/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_008_002_02%2FPartySEPAChoice.java?ref=0f60d39106094eb564d221904d2bb7a6dc39102d", "deletions": 5, "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_002_02/PartySEPAChoice.java", "new_code": " * &lt;element name=\"OrgId\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.008.002.02}OrganisationIdentificationSEPAChoice\"/>\n * &lt;element name=\"PrvtId\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.008.002.02}PersonIdentificationSEPA1Choice\"/>\n@XmlType(name = \"PartySEPAChoice\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\", propOrder = {\n @XmlElement(name = \"OrgId\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\")\n @XmlElement(name = \"PrvtId\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\")", "new_methods": [], "old_code": " * &lt;element name=\"OrgId\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}OrganisationIdentificationSEPAChoice\"/>\n * &lt;element name=\"PrvtId\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}PersonIdentificationSEPA1Choice\"/>\n@XmlType(name = \"PartySEPAChoice\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", propOrder = {\n @XmlElement(name = \"OrgId\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\")\n @XmlElement(name = \"PrvtId\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\")", "old_methods": [], "patch": "@@ -18,8 +18,8 @@\n * &lt;restriction base=\"{http://www.w3.org/2001/XMLSchema}anyType\">\n * &lt;sequence>\n * &lt;choice>\n- * &lt;element name=\"OrgId\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}OrganisationIdentificationSEPAChoice\"/>\n- * &lt;element name=\"PrvtId\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}PersonIdentificationSEPA1Choice\"/>\n+ * &lt;element name=\"OrgId\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.008.002.02}OrganisationIdentificationSEPAChoice\"/>\n+ * &lt;element name=\"PrvtId\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.008.002.02}PersonIdentificationSEPA1Choice\"/>\n * &lt;/choice>\n * &lt;/sequence>\n * &lt;/restriction>\n@@ -30,15 +30,15 @@\n * \n */\n @XmlAccessorType(XmlAccessType.FIELD)\n-@XmlType(name = \"PartySEPAChoice\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", propOrder = {\n+@XmlType(name = \"PartySEPAChoice\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\", propOrder = {\n \"orgId\",\n \"prvtId\"\n })\n public class PartySEPAChoice {\n \n- @XmlElement(name = \"OrgId\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\")\n+ @XmlElement(name = \"OrgId\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\")\n protected OrganisationIdentificationSEPAChoice orgId;\n- @XmlElement(name = \"PrvtId\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\")\n+ @XmlElement(name = \"PrvtId\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\")\n protected PersonIdentificationSEPA1Choice prvtId;\n \n /**", "raw_url": "https://github.com/willuhn/hbci4java/raw/0f60d39106094eb564d221904d2bb7a6dc39102d/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_008_002_02%2FPartySEPAChoice.java", "sha": "03808274a606625856163eca57c94a58c6571f6f", "status": "modified" }, { "additions": 5, "blob_url": "https://github.com/willuhn/hbci4java/blob/0f60d39106094eb564d221904d2bb7a6dc39102d/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_008_002_02%2FPaymentIdentificationSEPA.java", "changes": 10, "contents_url": "https://api.github.com/repos/willuhn/hbci4java/contents/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_008_002_02%2FPaymentIdentificationSEPA.java?ref=0f60d39106094eb564d221904d2bb7a6dc39102d", "deletions": 5, "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_002_02/PaymentIdentificationSEPA.java", "new_code": " * &lt;element name=\"InstrId\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.008.002.02}RestrictedIdentificationSEPA1\" minOccurs=\"0\"/>\n * &lt;element name=\"EndToEndId\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.008.002.02}RestrictedIdentificationSEPA1\"/>\n@XmlType(name = \"PaymentIdentificationSEPA\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\", propOrder = {\n @XmlElement(name = \"InstrId\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\")\n @XmlElement(name = \"EndToEndId\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\", required = true)", "new_methods": [], "old_code": " * &lt;element name=\"InstrId\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}RestrictedIdentificationSEPA1\" minOccurs=\"0\"/>\n * &lt;element name=\"EndToEndId\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}RestrictedIdentificationSEPA1\"/>\n@XmlType(name = \"PaymentIdentificationSEPA\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", propOrder = {\n @XmlElement(name = \"InstrId\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\")\n @XmlElement(name = \"EndToEndId\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", required = true)", "old_methods": [], "patch": "@@ -17,8 +17,8 @@\n * &lt;complexContent>\n * &lt;restriction base=\"{http://www.w3.org/2001/XMLSchema}anyType\">\n * &lt;sequence>\n- * &lt;element name=\"InstrId\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}RestrictedIdentificationSEPA1\" minOccurs=\"0\"/>\n- * &lt;element name=\"EndToEndId\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}RestrictedIdentificationSEPA1\"/>\n+ * &lt;element name=\"InstrId\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.008.002.02}RestrictedIdentificationSEPA1\" minOccurs=\"0\"/>\n+ * &lt;element name=\"EndToEndId\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.008.002.02}RestrictedIdentificationSEPA1\"/>\n * &lt;/sequence>\n * &lt;/restriction>\n * &lt;/complexContent>\n@@ -28,15 +28,15 @@\n * \n */\n @XmlAccessorType(XmlAccessType.FIELD)\n-@XmlType(name = \"PaymentIdentificationSEPA\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", propOrder = {\n+@XmlType(name = \"PaymentIdentificationSEPA\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\", propOrder = {\n \"instrId\",\n \"endToEndId\"\n })\n public class PaymentIdentificationSEPA {\n \n- @XmlElement(name = \"InstrId\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\")\n+ @XmlElement(name = \"InstrId\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\")\n protected String instrId;\n- @XmlElement(name = \"EndToEndId\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", required = true)\n+ @XmlElement(name = \"EndToEndId\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\", required = true)\n protected String endToEndId;\n \n /**", "raw_url": "https://github.com/willuhn/hbci4java/raw/0f60d39106094eb564d221904d2bb7a6dc39102d/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_008_002_02%2FPaymentIdentificationSEPA.java", "sha": "81adee0680e4e5b4156b2a9aa242766a147f6204", "status": "modified" }, { "additions": 5, "blob_url": "https://github.com/willuhn/hbci4java/blob/0f60d39106094eb564d221904d2bb7a6dc39102d/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_008_002_02%2FPersonIdentificationSEPA1Choice.java", "changes": 10, "contents_url": "https://api.github.com/repos/willuhn/hbci4java/contents/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_008_002_02%2FPersonIdentificationSEPA1Choice.java?ref=0f60d39106094eb564d221904d2bb7a6dc39102d", "deletions": 5, "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_002_02/PersonIdentificationSEPA1Choice.java", "new_code": " * &lt;element name=\"DtAndPlcOfBirth\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.008.002.02}DateAndPlaceOfBirth\"/>\n * &lt;element name=\"Othr\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.008.002.02}GenericPersonIdentification1\"/>\n@XmlType(name = \"PersonIdentificationSEPA1Choice\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\", propOrder = {\n @XmlElement(name = \"DtAndPlcOfBirth\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\")\n @XmlElement(name = \"Othr\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\")", "new_methods": [], "old_code": " * &lt;element name=\"DtAndPlcOfBirth\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}DateAndPlaceOfBirth\"/>\n * &lt;element name=\"Othr\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}GenericPersonIdentification1\"/>\n@XmlType(name = \"PersonIdentificationSEPA1Choice\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", propOrder = {\n @XmlElement(name = \"DtAndPlcOfBirth\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\")\n @XmlElement(name = \"Othr\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\")", "old_methods": [], "patch": "@@ -18,8 +18,8 @@\n * &lt;restriction base=\"{http://www.w3.org/2001/XMLSchema}anyType\">\n * &lt;sequence>\n * &lt;choice>\n- * &lt;element name=\"DtAndPlcOfBirth\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}DateAndPlaceOfBirth\"/>\n- * &lt;element name=\"Othr\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}GenericPersonIdentification1\"/>\n+ * &lt;element name=\"DtAndPlcOfBirth\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.008.002.02}DateAndPlaceOfBirth\"/>\n+ * &lt;element name=\"Othr\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.008.002.02}GenericPersonIdentification1\"/>\n * &lt;/choice>\n * &lt;/sequence>\n * &lt;/restriction>\n@@ -30,15 +30,15 @@\n * \n */\n @XmlAccessorType(XmlAccessType.FIELD)\n-@XmlType(name = \"PersonIdentificationSEPA1Choice\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", propOrder = {\n+@XmlType(name = \"PersonIdentificationSEPA1Choice\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\", propOrder = {\n \"dtAndPlcOfBirth\",\n \"othr\"\n })\n public class PersonIdentificationSEPA1Choice {\n \n- @XmlElement(name = \"DtAndPlcOfBirth\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\")\n+ @XmlElement(name = \"DtAndPlcOfBirth\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\")\n protected DateAndPlaceOfBirth dtAndPlcOfBirth;\n- @XmlElement(name = \"Othr\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\")\n+ @XmlElement(name = \"Othr\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\")\n protected GenericPersonIdentification1 othr;\n \n /**", "raw_url": "https://github.com/willuhn/hbci4java/raw/0f60d39106094eb564d221904d2bb7a6dc39102d/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_008_002_02%2FPersonIdentificationSEPA1Choice.java", "sha": "5b7241d1055f3918b2f0fed7ef538f3c9a2dfd23", "status": "modified" }, { "additions": 5, "blob_url": "https://github.com/willuhn/hbci4java/blob/0f60d39106094eb564d221904d2bb7a6dc39102d/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_008_002_02%2FPersonIdentificationSchemeName1Choice.java", "changes": 10, "contents_url": "https://api.github.com/repos/willuhn/hbci4java/contents/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_008_002_02%2FPersonIdentificationSchemeName1Choice.java?ref=0f60d39106094eb564d221904d2bb7a6dc39102d", "deletions": 5, "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_002_02/PersonIdentificationSchemeName1Choice.java", "new_code": " * &lt;element name=\"Cd\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.008.002.02}ExternalPersonIdentification1Code\"/>\n * &lt;element name=\"Prtry\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.008.002.02}Max35Text\"/>\n@XmlType(name = \"PersonIdentificationSchemeName1Choice\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\", propOrder = {\n @XmlElement(name = \"Cd\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\")\n @XmlElement(name = \"Prtry\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\")", "new_methods": [], "old_code": " * &lt;element name=\"Cd\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}ExternalPersonIdentification1Code\"/>\n * &lt;element name=\"Prtry\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}Max35Text\"/>\n@XmlType(name = \"PersonIdentificationSchemeName1Choice\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", propOrder = {\n @XmlElement(name = \"Cd\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\")\n @XmlElement(name = \"Prtry\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\")", "old_methods": [], "patch": "@@ -18,8 +18,8 @@\n * &lt;restriction base=\"{http://www.w3.org/2001/XMLSchema}anyType\">\n * &lt;sequence>\n * &lt;choice>\n- * &lt;element name=\"Cd\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}ExternalPersonIdentification1Code\"/>\n- * &lt;element name=\"Prtry\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}Max35Text\"/>\n+ * &lt;element name=\"Cd\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.008.002.02}ExternalPersonIdentification1Code\"/>\n+ * &lt;element name=\"Prtry\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.008.002.02}Max35Text\"/>\n * &lt;/choice>\n * &lt;/sequence>\n * &lt;/restriction>\n@@ -30,15 +30,15 @@\n * \n */\n @XmlAccessorType(XmlAccessType.FIELD)\n-@XmlType(name = \"PersonIdentificationSchemeName1Choice\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", propOrder = {\n+@XmlType(name = \"PersonIdentificationSchemeName1Choice\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\", propOrder = {\n \"cd\",\n \"prtry\"\n })\n public class PersonIdentificationSchemeName1Choice {\n \n- @XmlElement(name = \"Cd\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\")\n+ @XmlElement(name = \"Cd\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\")\n protected String cd;\n- @XmlElement(name = \"Prtry\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\")\n+ @XmlElement(name = \"Prtry\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\")\n protected String prtry;\n \n /**", "raw_url": "https://github.com/willuhn/hbci4java/raw/0f60d39106094eb564d221904d2bb7a6dc39102d/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_008_002_02%2FPersonIdentificationSchemeName1Choice.java", "sha": "d24f7b7fc9195ea137b8096b66c6ccba1b654a11", "status": "modified" }, { "additions": 5, "blob_url": "https://github.com/willuhn/hbci4java/blob/0f60d39106094eb564d221904d2bb7a6dc39102d/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_008_002_02%2FPostalAddressSEPA.java", "changes": 10, "contents_url": "https://api.github.com/repos/willuhn/hbci4java/contents/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_008_002_02%2FPostalAddressSEPA.java?ref=0f60d39106094eb564d221904d2bb7a6dc39102d", "deletions": 5, "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_002_02/PostalAddressSEPA.java", "new_code": " * &lt;element name=\"Ctry\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.008.002.02}CountryCode\" minOccurs=\"0\"/>\n * &lt;element name=\"AdrLine\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.008.002.02}Max70Text\" maxOccurs=\"2\" minOccurs=\"0\"/>\n@XmlType(name = \"PostalAddressSEPA\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\", propOrder = {\n @XmlElement(name = \"Ctry\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\")\n @XmlElement(name = \"AdrLine\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\")", "new_methods": [], "old_code": " * &lt;element name=\"Ctry\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}CountryCode\" minOccurs=\"0\"/>\n * &lt;element name=\"AdrLine\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}Max70Text\" maxOccurs=\"2\" minOccurs=\"0\"/>\n@XmlType(name = \"PostalAddressSEPA\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", propOrder = {\n @XmlElement(name = \"Ctry\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\")\n @XmlElement(name = \"AdrLine\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\")", "old_methods": [], "patch": "@@ -19,8 +19,8 @@\n * &lt;complexContent>\n * &lt;restriction base=\"{http://www.w3.org/2001/XMLSchema}anyType\">\n * &lt;sequence>\n- * &lt;element name=\"Ctry\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}CountryCode\" minOccurs=\"0\"/>\n- * &lt;element name=\"AdrLine\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}Max70Text\" maxOccurs=\"2\" minOccurs=\"0\"/>\n+ * &lt;element name=\"Ctry\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.008.002.02}CountryCode\" minOccurs=\"0\"/>\n+ * &lt;element name=\"AdrLine\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.008.002.02}Max70Text\" maxOccurs=\"2\" minOccurs=\"0\"/>\n * &lt;/sequence>\n * &lt;/restriction>\n * &lt;/complexContent>\n@@ -30,15 +30,15 @@\n * \n */\n @XmlAccessorType(XmlAccessType.FIELD)\n-@XmlType(name = \"PostalAddressSEPA\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", propOrder = {\n+@XmlType(name = \"PostalAddressSEPA\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\", propOrder = {\n \"ctry\",\n \"adrLine\"\n })\n public class PostalAddressSEPA {\n \n- @XmlElement(name = \"Ctry\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\")\n+ @XmlElement(name = \"Ctry\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\")\n protected String ctry;\n- @XmlElement(name = \"AdrLine\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\")\n+ @XmlElement(name = \"AdrLine\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\")\n protected List<String> adrLine;\n \n /**", "raw_url": "https://github.com/willuhn/hbci4java/raw/0f60d39106094eb564d221904d2bb7a6dc39102d/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_008_002_02%2FPostalAddressSEPA.java", "sha": "07456ff7c69308ce1bab1083db9afbdbf4064593", "status": "modified" }, { "additions": 3, "blob_url": "https://github.com/willuhn/hbci4java/blob/0f60d39106094eb564d221904d2bb7a6dc39102d/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_008_002_02%2FPurposeSEPA.java", "changes": 6, "contents_url": "https://api.github.com/repos/willuhn/hbci4java/contents/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_008_002_02%2FPurposeSEPA.java?ref=0f60d39106094eb564d221904d2bb7a6dc39102d", "deletions": 3, "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_002_02/PurposeSEPA.java", "new_code": " * &lt;element name=\"Cd\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.008.002.02}ExternalPurpose1Code\"/>\n@XmlType(name = \"PurposeSEPA\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\", propOrder = {\n @XmlElement(name = \"Cd\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\", required = true)", "new_methods": [], "old_code": " * &lt;element name=\"Cd\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}ExternalPurpose1Code\"/>\n@XmlType(name = \"PurposeSEPA\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", propOrder = {\n @XmlElement(name = \"Cd\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", required = true)", "old_methods": [], "patch": "@@ -17,7 +17,7 @@\n * &lt;complexContent>\n * &lt;restriction base=\"{http://www.w3.org/2001/XMLSchema}anyType\">\n * &lt;sequence>\n- * &lt;element name=\"Cd\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}ExternalPurpose1Code\"/>\n+ * &lt;element name=\"Cd\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.008.002.02}ExternalPurpose1Code\"/>\n * &lt;/sequence>\n * &lt;/restriction>\n * &lt;/complexContent>\n@@ -27,12 +27,12 @@\n * \n */\n @XmlAccessorType(XmlAccessType.FIELD)\n-@XmlType(name = \"PurposeSEPA\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", propOrder = {\n+@XmlType(name = \"PurposeSEPA\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\", propOrder = {\n \"cd\"\n })\n public class PurposeSEPA {\n \n- @XmlElement(name = \"Cd\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", required = true)\n+ @XmlElement(name = \"Cd\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\", required = true)\n protected String cd;\n \n /**", "raw_url": "https://github.com/willuhn/hbci4java/raw/0f60d39106094eb564d221904d2bb7a6dc39102d/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_008_002_02%2FPurposeSEPA.java", "sha": "88b740b4e6afea37f7edb83ae0a8d7188a467f72", "status": "modified" }, { "additions": 5, "blob_url": "https://github.com/willuhn/hbci4java/blob/0f60d39106094eb564d221904d2bb7a6dc39102d/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_008_002_02%2FRemittanceInformationSEPA1Choice.java", "changes": 10, "contents_url": "https://api.github.com/repos/willuhn/hbci4java/contents/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_008_002_02%2FRemittanceInformationSEPA1Choice.java?ref=0f60d39106094eb564d221904d2bb7a6dc39102d", "deletions": 5, "filename": "src/org/kapott/hbci/sepa/jaxb/pain_008_002_02/RemittanceInformationSEPA1Choice.java", "new_code": " * &lt;element name=\"Ustrd\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.008.002.02}Max140Text\"/>\n * &lt;element name=\"Strd\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.008.002.02}StructuredRemittanceInformationSEPA1\"/>\n@XmlType(name = \"RemittanceInformationSEPA1Choice\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\", propOrder = {\n @XmlElement(name = \"Ustrd\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\")\n @XmlElement(name = \"Strd\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\")", "new_methods": [], "old_code": " * &lt;element name=\"Ustrd\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}Max140Text\"/>\n * &lt;element name=\"Strd\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}StructuredRemittanceInformationSEPA1\"/>\n@XmlType(name = \"RemittanceInformationSEPA1Choice\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", propOrder = {\n @XmlElement(name = \"Ustrd\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\")\n @XmlElement(name = \"Strd\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\")", "old_methods": [], "patch": "@@ -18,8 +18,8 @@\n * &lt;restriction base=\"{http://www.w3.org/2001/XMLSchema}anyType\">\n * &lt;sequence>\n * &lt;choice>\n- * &lt;element name=\"Ustrd\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}Max140Text\"/>\n- * &lt;element name=\"Strd\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.001.003.03}StructuredRemittanceInformationSEPA1\"/>\n+ * &lt;element name=\"Ustrd\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.008.002.02}Max140Text\"/>\n+ * &lt;element name=\"Strd\" type=\"{urn:iso:std:iso:20022:tech:xsd:pain.008.002.02}StructuredRemittanceInformationSEPA1\"/>\n * &lt;/choice>\n * &lt;/sequence>\n * &lt;/restriction>\n@@ -30,15 +30,15 @@\n * \n */\n @XmlAccessorType(XmlAccessType.FIELD)\n-@XmlType(name = \"RemittanceInformationSEPA1Choice\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\", propOrder = {\n+@XmlType(name = \"RemittanceInformationSEPA1Choice\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\", propOrder = {\n \"ustrd\",\n \"strd\"\n })\n public class RemittanceInformationSEPA1Choice {\n \n- @XmlElement(name = \"Ustrd\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\")\n+ @XmlElement(name = \"Ustrd\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\")\n protected String ustrd;\n- @XmlElement(name = \"Strd\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.001.003.03\")\n+ @XmlElement(name = \"Strd\", namespace = \"urn:iso:std:iso:20022:tech:xsd:pain.008.002.02\")\n protected StructuredRemittanceInformationSEPA1 strd;\n \n /**", "raw_url": "https://github.com/willuhn/hbci4java/raw/0f60d39106094eb564d221904d2bb7a6dc39102d/src%2Forg%2Fkapott%2Fhbci%2Fsepa%2Fjaxb%2Fpain_008_002_02%2FRemittanceInformationSEPA1Choice.java", "sha": "66d7c18238e0ed7668c5ad80eca03d9996c49669", "status": "modified" } ]
68
[ { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return cstmrPmtStsRpt;\n * Sets the value of the cstmrPmtStsRpt property.\n * {@link CustomerPaymentStatusReportV03", "new_return_type": "CustomerPaymentStatusReportV03", "new_signature": "CustomerPaymentStatusReportV03 getCstmrPmtStsRpt()", "old_args": "", "old_implementation": "return cstmrCdtTrfInitn;\n * Sets the value of the cstmrCdtTrfInitn property.\n * {@link CustomerCreditTransferInitiationV03", "old_return_type": "CustomerCreditTransferInitiationV03", "old_signature": "CustomerCreditTransferInitiationV03 getCstmrCdtTrfInitn()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new PartySEPA2();", "new_return_type": "PartySEPA2", "new_signature": "PartySEPA2 createPartySEPA2()", "old_args": "", "old_implementation": "return new CreditTransferTransactionInformationSCT();\n * Create an instance of {@link PaymentInstructionInformationSCT", "old_return_type": "CreditTransferTransactionInformationSCT", "old_signature": "CreditTransferTransactionInformationSCT createCreditTransferTransactionInformationSCT()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new PartySEPA2();", "new_return_type": "PartySEPA2", "new_signature": "PartySEPA2 createPartySEPA2()", "old_args": "", "old_implementation": "return new CreditTransferTransactionInformationSCT();\n * Create an instance of {@link PaymentInstructionInformationSCT", "old_return_type": "CreditTransferTransactionInformationSCT", "old_signature": "CreditTransferTransactionInformationSCT createCreditTransferTransactionInformationSCT()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new StatusReasonInformationSEPA();\n * Create an instance of {@link CreditorReferenceInformationSEPA", "new_return_type": "StatusReasonInformationSEPA", "new_signature": "StatusReasonInformationSEPA createStatusReasonInformationSEPA()", "old_args": "", "old_implementation": "return new CreditTransferTransactionInformationSCT();\n * Create an instance of {@link PaymentInstructionInformationSCT", "old_return_type": "CreditTransferTransactionInformationSCT", "old_signature": "CreditTransferTransactionInformationSCT createCreditTransferTransactionInformationSCT()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new OriginalTransactionReferenceSEPA();\n /**\n * Create an instance of {@link BranchAndFinancialInstitutionIdentificationSEPA2", "new_return_type": "OriginalTransactionReferenceSEPA", "new_signature": "OriginalTransactionReferenceSEPA createOriginalTransactionReferenceSEPA()", "old_args": "", "old_implementation": "return new CustomerCreditTransferInitiationV03();\n * Create an instance of {@link RemittanceInformationSEPA1Choice", "old_return_type": "CustomerCreditTransferInitiationV03", "old_signature": "CustomerCreditTransferInitiationV03 createCustomerCreditTransferInitiationV03()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new FinancialInstitutionIdentificationSEPA2();\n * Create an instance of {@link PersonIdentificationSEPA2", "new_return_type": "FinancialInstitutionIdentificationSEPA2", "new_signature": "FinancialInstitutionIdentificationSEPA2 createFinancialInstitutionIdentificationSEPA2()", "old_args": "", "old_implementation": "return new FinancialInstitutionIdentificationSEPA1();\n * Create an instance of {@link GroupHeaderSCT", "old_return_type": "FinancialInstitutionIdentificationSEPA1", "old_signature": "FinancialInstitutionIdentificationSEPA1 createFinancialInstitutionIdentificationSEPA1()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new PartyIdentificationSEPA3();", "new_return_type": "PartyIdentificationSEPA3", "new_signature": "PartyIdentificationSEPA3 createPartyIdentificationSEPA3()", "old_args": "", "old_implementation": "return new GroupHeaderSCT();\n * Create an instance of {@link GenericOrganisationIdentification1", "old_return_type": "GroupHeaderSCT", "old_signature": "GroupHeaderSCT createGroupHeaderSCT()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new PersonIdentificationSEPA2();\n * Create an instance of {@link PartyIdentificationSEPA5", "new_return_type": "PersonIdentificationSEPA2", "new_signature": "PersonIdentificationSEPA2 createPersonIdentificationSEPA2()", "old_args": "", "old_implementation": "return new GroupHeaderSCT();\n * Create an instance of {@link GenericOrganisationIdentification1", "old_return_type": "GroupHeaderSCT", "old_signature": "GroupHeaderSCT createGroupHeaderSCT()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new PersonIdentificationSEPA2();\n * Create an instance of {@link PartyIdentificationSEPA5", "new_return_type": "PersonIdentificationSEPA2", "new_signature": "PersonIdentificationSEPA2 createPersonIdentificationSEPA2()", "old_args": "", "old_implementation": "return new GroupHeaderSCT();\n * Create an instance of {@link GenericOrganisationIdentification1", "old_return_type": "GroupHeaderSCT", "old_signature": "GroupHeaderSCT createGroupHeaderSCT()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new StatusReasonSEPA();\n * Create an instance of {@link StructuredRemittanceInformationSEPA2", "new_return_type": "StatusReasonSEPA", "new_signature": "StatusReasonSEPA createStatusReasonSEPA()", "old_args": "", "old_implementation": "return new PaymentInstructionInformationSCT();\n * Create an instance of {@link StructuredRemittanceInformationSEPA1", "old_return_type": "PaymentInstructionInformationSCT", "old_signature": "PaymentInstructionInformationSCT createPaymentInstructionInformationSCT()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new OrganisationIdentificationSEPA();", "new_return_type": "OrganisationIdentificationSEPA", "new_signature": "OrganisationIdentificationSEPA createOrganisationIdentificationSEPA()", "old_args": "", "old_implementation": "return new PaymentTypeInformationSCT1();\n * Create an instance of {@link PurposeSEPA", "old_return_type": "PaymentTypeInformationSCT1", "old_signature": "PaymentTypeInformationSCT1 createPaymentTypeInformationSCT1()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new PartyIdentificationSEPA3();", "new_return_type": "PartyIdentificationSEPA3", "new_signature": "PartyIdentificationSEPA3 createPartyIdentificationSEPA3()", "old_args": "", "old_implementation": "return new PaymentTypeInformationSCT1();\n * Create an instance of {@link PurposeSEPA", "old_return_type": "PaymentTypeInformationSCT1", "old_signature": "PaymentTypeInformationSCT1 createPaymentTypeInformationSCT1()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new PersonIdentificationSEPA2();\n * Create an instance of {@link PartyIdentificationSEPA5", "new_return_type": "PersonIdentificationSEPA2", "new_signature": "PersonIdentificationSEPA2 createPersonIdentificationSEPA2()", "old_args": "", "old_implementation": "return new PaymentTypeInformationSCT2();\n * Create an instance of {@link PaymentTypeInformationSCT1", "old_return_type": "PaymentTypeInformationSCT2", "old_signature": "PaymentTypeInformationSCT2 createPaymentTypeInformationSCT2()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new RemittanceInformationSEPA2Choice();", "new_return_type": "RemittanceInformationSEPA2Choice", "new_signature": "RemittanceInformationSEPA2Choice createRemittanceInformationSEPA2Choice()", "old_args": "", "old_implementation": "return new PaymentTypeInformationSCT2();\n * Create an instance of {@link PaymentTypeInformationSCT1", "old_return_type": "PaymentTypeInformationSCT2", "old_signature": "PaymentTypeInformationSCT2 createPaymentTypeInformationSCT2()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new CustomerPaymentStatusReportV03();\n /**\n * Create an instance of {@link PartySEPA1", "new_return_type": "CustomerPaymentStatusReportV03", "new_signature": "CustomerPaymentStatusReportV03 createCustomerPaymentStatusReportV03()", "old_args": "", "old_implementation": "return new RemittanceInformationSEPA1Choice();\n * Create an instance of {@link CreditTransferTransactionInformationSCT", "old_return_type": "RemittanceInformationSEPA1Choice", "old_signature": "RemittanceInformationSEPA1Choice createRemittanceInformationSEPA1Choice()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new StructuredRemittanceInformationSEPA2();", "new_return_type": "StructuredRemittanceInformationSEPA2", "new_signature": "StructuredRemittanceInformationSEPA2 createStructuredRemittanceInformationSEPA2()", "old_args": "", "old_implementation": "return new StructuredRemittanceInformationSEPA1();\n * Create an instance of {@link CreditorReferenceInformationSEPA1", "old_return_type": "StructuredRemittanceInformationSEPA1", "old_signature": "StructuredRemittanceInformationSEPA1 createStructuredRemittanceInformationSEPA1()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new ReferredDocumentAmount1Choice();\n * Create an instance of {@link CreditorReferenceType1", "new_return_type": "ReferredDocumentAmount1Choice", "new_signature": "ReferredDocumentAmount1Choice createReferredDocumentAmount1Choice()", "old_args": "", "old_implementation": "return new AccountIdentificationSEPA();\n * Create an instance of {@link BranchAndFinancialInstitutionIdentificationSEPA3", "old_return_type": "AccountIdentificationSEPA", "old_signature": "AccountIdentificationSEPA createAccountIdentificationSEPA()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new FinancialInstitutionIdentification5();\n * Create an instance of {@link RemittanceInformation3", "new_return_type": "FinancialInstitutionIdentification5", "new_signature": "FinancialInstitutionIdentification5 createFinancialInstitutionIdentification5()", "old_args": "", "old_implementation": "return new ActiveOrHistoricCurrencyAndAmountSEPA();\n * Create an instance of {@link OrganisationIdentificationSEPAChoice", "old_return_type": "ActiveOrHistoricCurrencyAndAmountSEPA", "old_signature": "ActiveOrHistoricCurrencyAndAmountSEPA createActiveOrHistoricCurrencyAndAmountSEPA()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new Pain00800101();\n * Create an instance of {@link DirectDebitTransactionInformationSDD", "new_return_type": "Pain00800101", "new_signature": "Pain00800101 createPain00800101()", "old_args": "", "old_implementation": "return new ActiveOrHistoricCurrencyAndAmountSEPA();\n * Create an instance of {@link OrganisationIdentificationSEPAChoice", "old_return_type": "ActiveOrHistoricCurrencyAndAmountSEPA", "old_signature": "ActiveOrHistoricCurrencyAndAmountSEPA createActiveOrHistoricCurrencyAndAmountSEPA()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new PartyIdentification20();\n * Create an instance of {@link ReferredDocumentType1", "new_return_type": "PartyIdentification20", "new_signature": "PartyIdentification20 createPartyIdentification20()", "old_args": "", "old_implementation": "return new AmountTypeSEPA();\n * Create an instance of {@link CreditTransferTransactionInformationSCT", "old_return_type": "AmountTypeSEPA", "old_signature": "AmountTypeSEPA createAmountTypeSEPA()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new PostalAddress5();\n * Create an instance of {@link CurrencyAndAmount", "new_return_type": "PostalAddress5", "new_signature": "PostalAddress5 createPostalAddress5()", "old_args": "", "old_implementation": "return new BranchAndFinancialInstitutionIdentificationSEPA1();\n * Create an instance of {@link PersonIdentificationSchemeName1Choice", "old_return_type": "BranchAndFinancialInstitutionIdentificationSEPA1", "old_signature": "BranchAndFinancialInstitutionIdentificationSEPA1 createBranchAndFinancialInstitutionIdentificationSEPA1()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new CreditorReferenceType1();\n * Create an instance of {@link Party5Choice", "new_return_type": "CreditorReferenceType1", "new_signature": "CreditorReferenceType1 createCreditorReferenceType1()", "old_args": "", "old_implementation": "return new BranchAndFinancialInstitutionIdentificationSEPA3();\n * Create an instance of {@link PartySEPAChoice", "old_return_type": "BranchAndFinancialInstitutionIdentificationSEPA3", "old_signature": "BranchAndFinancialInstitutionIdentificationSEPA3 createBranchAndFinancialInstitutionIdentificationSEPA3()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new PartyIdentification22();\n * Create an instance of {@link PartyIdentification12", "new_return_type": "PartyIdentification22", "new_signature": "PartyIdentification22 createPartyIdentification22()", "old_args": "", "old_implementation": "return new CashAccountSEPA1();\n * Create an instance of {@link OthrIdentification", "old_return_type": "CashAccountSEPA1", "old_signature": "CashAccountSEPA1 createCashAccountSEPA1()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new PartyIdentification23();\n * Create an instance of {@link PartyIdentification11", "new_return_type": "PartyIdentification23", "new_signature": "PartyIdentification23 createPartyIdentification23()", "old_args": "", "old_implementation": "return new CashAccountSEPA2();\n * Create an instance of {@link PostalAddressSEPA", "old_return_type": "CashAccountSEPA2", "old_signature": "CashAccountSEPA2 createCashAccountSEPA2()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new FinancialInstitution2();", "new_return_type": "FinancialInstitution2", "new_signature": "FinancialInstitution2 createFinancialInstitution2()", "old_args": "", "old_implementation": "return new CategoryPurposeSEPA();\n * Create an instance of {@link CreditorReferenceTypeSEPA", "old_return_type": "CategoryPurposeSEPA", "old_signature": "CategoryPurposeSEPA createCategoryPurposeSEPA()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new GenericIdentification3();", "new_return_type": "GenericIdentification3", "new_signature": "GenericIdentification3 createGenericIdentification3()", "old_args": "", "old_implementation": "return new CategoryPurposeSEPA();\n * Create an instance of {@link CreditorReferenceTypeSEPA", "old_return_type": "CategoryPurposeSEPA", "old_signature": "CategoryPurposeSEPA createCategoryPurposeSEPA()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new ReferredDocumentType1();\n * Create an instance of {@link PaymentIdentification1", "new_return_type": "ReferredDocumentType1", "new_signature": "ReferredDocumentType1 createReferredDocumentType1()", "old_args": "", "old_implementation": "return new CreditTransferTransactionInformationSCT();\n * Create an instance of {@link PaymentInstructionInformationSCT", "old_return_type": "CreditTransferTransactionInformationSCT", "old_signature": "CreditTransferTransactionInformationSCT createCreditTransferTransactionInformationSCT()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new PaymentTypeInformation8();\n * Create an instance of {@link PaymentInstructionInformation5", "new_return_type": "PaymentTypeInformation8", "new_signature": "PaymentTypeInformation8 createPaymentTypeInformation8()", "old_args": "", "old_implementation": "return new CreditorReferenceInformationSEPA1();\n * Create an instance of {@link GenericPersonIdentification1", "old_return_type": "CreditorReferenceInformationSEPA1", "old_signature": "CreditorReferenceInformationSEPA1 createCreditorReferenceInformationSEPA1()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new DirectDebitTransaction4();\n * Create an instance of {@link ServiceLevel4", "new_return_type": "DirectDebitTransaction4", "new_signature": "DirectDebitTransaction4 createDirectDebitTransaction4()", "old_args": "", "old_implementation": "return new CreditorReferenceTypeCodeSEPA();\n * Create an instance of {@link FinancialInstitutionIdentificationSEPA3", "old_return_type": "CreditorReferenceTypeCodeSEPA", "old_signature": "CreditorReferenceTypeCodeSEPA createCreditorReferenceTypeCodeSEPA()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new OrganisationIdentification2();\n * Create an instance of {@link ReferredDocumentAmount1Choice", "new_return_type": "OrganisationIdentification2", "new_signature": "OrganisationIdentification2 createOrganisationIdentification2()", "old_args": "", "old_implementation": "return new CustomerCreditTransferInitiationV03();\n * Create an instance of {@link AccountIdentificationSEPA", "old_return_type": "CustomerCreditTransferInitiationV03", "old_signature": "CustomerCreditTransferInitiationV03 createCustomerCreditTransferInitiationV03()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new DirectDebitTransactionInformation2();\n * Create an instance of {@link DirectDebitTransaction4", "new_return_type": "DirectDebitTransactionInformation2", "new_signature": "DirectDebitTransactionInformation2 createDirectDebitTransactionInformation2()", "old_args": "", "old_implementation": "return new FinancialInstitutionIdentificationSEPA1();\n * Create an instance of {@link CreditorReferenceTypeCodeSEPA", "old_return_type": "FinancialInstitutionIdentificationSEPA1", "old_signature": "FinancialInstitutionIdentificationSEPA1 createFinancialInstitutionIdentificationSEPA1()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new ServiceLevel4();\n * Create an instance of {@link PersonIdentification3", "new_return_type": "ServiceLevel4", "new_signature": "ServiceLevel4 createServiceLevel4()", "old_args": "", "old_implementation": "return new FinancialInstitutionIdentificationSEPA3();\n * Create an instance of {@link GroupHeaderSCT", "old_return_type": "FinancialInstitutionIdentificationSEPA3", "old_signature": "FinancialInstitutionIdentificationSEPA3 createFinancialInstitutionIdentificationSEPA3()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new PersonIdentification4();\n * Create an instance of {@link StructuredRemittanceInformation6", "new_return_type": "PersonIdentification4", "new_signature": "PersonIdentification4 createPersonIdentification4()", "old_args": "", "old_implementation": "return new GenericOrganisationIdentification1();\n * Create an instance of {@link PaymentTypeInformationSCT2", "old_return_type": "GenericOrganisationIdentification1", "old_signature": "GenericOrganisationIdentification1 createGenericOrganisationIdentification1()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new GenericIdentification4();\n * Create an instance of {@link FinancialInstitutionIdentificationSDD2", "new_return_type": "GenericIdentification4", "new_signature": "GenericIdentification4 createGenericIdentification4()", "old_args": "", "old_implementation": "return new GenericPersonIdentification1();\n * Create an instance of {@link CategoryPurposeSEPA", "old_return_type": "GenericPersonIdentification1", "old_signature": "GenericPersonIdentification1 createGenericPersonIdentification1()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new MandateRelatedInformation4();", "new_return_type": "MandateRelatedInformation4", "new_signature": "MandateRelatedInformation4 createMandateRelatedInformation4()", "old_args": "", "old_implementation": "return new GenericPersonIdentification1();\n * Create an instance of {@link DateAndPlaceOfBirth", "old_return_type": "GenericPersonIdentification1", "old_signature": "GenericPersonIdentification1 createGenericPersonIdentification1()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new PersonIdentification3();\n * Create an instance of {@link PersonIdentification4", "new_return_type": "PersonIdentification3", "new_signature": "PersonIdentification3 createPersonIdentification3()", "old_args": "", "old_implementation": "return new GroupHeaderSCT();\n * Create an instance of {@link GenericOrganisationIdentification1", "old_return_type": "GroupHeaderSCT", "old_signature": "GroupHeaderSCT createGroupHeaderSCT()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new RemittanceInformation3();\n * Create an instance of {@link AmendmentInformationDetails4", "new_return_type": "RemittanceInformation3", "new_signature": "RemittanceInformation3 createRemittanceInformation3()", "old_args": "", "old_implementation": "return new OrganisationIdentificationSEPAChoice();\n * Create an instance of {@link StructuredRemittanceInformationSEPA1", "old_return_type": "OrganisationIdentificationSEPAChoice", "old_signature": "OrganisationIdentificationSEPAChoice createOrganisationIdentificationSEPAChoice()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new FinancialInstitutionIdentification4();\n * Create an instance of {@link PartyIdentification20", "new_return_type": "FinancialInstitutionIdentification4", "new_signature": "FinancialInstitutionIdentification4 createFinancialInstitutionIdentification4()", "old_args": "", "old_implementation": "return new OrganisationIdentificationSchemeName1Choice();\n * Create an instance of {@link AmountTypeSEPA", "old_return_type": "OrganisationIdentificationSchemeName1Choice", "old_signature": "OrganisationIdentificationSchemeName1Choice createOrganisationIdentificationSchemeName1Choice()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new PartyIdentification12();\n * Create an instance of {@link FinancialInstitutionIdentification4", "new_return_type": "PartyIdentification12", "new_signature": "PartyIdentification12 createPartyIdentification12()", "old_args": "", "old_implementation": "return new OthrIdentification();\n * Create an instance of {@link OrganisationIdentificationSchemeName1Choice", "old_return_type": "OthrIdentification", "old_signature": "OthrIdentification createOthrIdentification()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new ReferredDocumentInformation1();\n * Create an instance of {@link GroupHeader20", "new_return_type": "ReferredDocumentInformation1", "new_signature": "ReferredDocumentInformation1 createReferredDocumentInformation1()", "old_args": "", "old_implementation": "return new PartyIdentificationSEPA1();\n * Create an instance of {@link PaymentTypeInformationSCT1", "old_return_type": "PartyIdentificationSEPA1", "old_signature": "PartyIdentificationSEPA1 createPartyIdentificationSEPA1()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new CashAccount8();\n * Create an instance of {@link ReferredDocumentInformation1", "new_return_type": "CashAccount8", "new_signature": "CashAccount8 createCashAccount8()", "old_args": "", "old_implementation": "return new PartyIdentificationSEPA2();\n * Create an instance of {@link PartyIdentificationSEPA1", "old_return_type": "PartyIdentificationSEPA2", "old_signature": "PartyIdentificationSEPA2 createPartyIdentificationSEPA2()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new Party5Choice();\n * Create an instance of {@link PostalAddress5", "new_return_type": "Party5Choice", "new_signature": "Party5Choice createParty5Choice()", "old_args": "", "old_implementation": "return new PartySEPAChoice();\n * Create an instance of {@link BranchAndFinancialInstitutionIdentificationSEPA1", "old_return_type": "PartySEPAChoice", "old_signature": "PartySEPAChoice createPartySEPAChoice()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new PartyPrivate1();\n * Create an instance of {@link DirectDebitTransactionInformation2", "new_return_type": "PartyPrivate1", "new_signature": "PartyPrivate1 createPartyPrivate1()", "old_args": "", "old_implementation": "return new PaymentIdentificationSEPA();\n * Create an instance of {@link FinancialInstitutionIdentificationSEPA1", "old_return_type": "PaymentIdentificationSEPA", "old_signature": "PaymentIdentificationSEPA createPaymentIdentificationSEPA()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new PaymentIdentification1();\n * Create an instance of {@link CashAccountSDD2", "new_return_type": "PaymentIdentification1", "new_signature": "PaymentIdentification1 createPaymentIdentification1()", "old_args": "", "old_implementation": "return new PaymentInstructionInformationSCT();\n * Create an instance of {@link PersonIdentificationSEPA1Choice", "old_return_type": "PaymentInstructionInformationSCT", "old_signature": "PaymentInstructionInformationSCT createPaymentInstructionInformationSCT()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new GroupHeader20();\n * Create an instance of {@link AccountIdentification2", "new_return_type": "GroupHeader20", "new_signature": "GroupHeader20 createGroupHeader20()", "old_args": "", "old_implementation": "return new PaymentTypeInformationSCT1();\n * Create an instance of {@link PurposeSEPA", "old_return_type": "PaymentTypeInformationSCT1", "old_signature": "PaymentTypeInformationSCT1 createPaymentTypeInformationSCT1()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new StructuredRemittanceInformation6();\n * Create an instance of {@link CashAccount8", "new_return_type": "StructuredRemittanceInformation6", "new_signature": "StructuredRemittanceInformation6 createStructuredRemittanceInformation6()", "old_args": "", "old_implementation": "return new PaymentTypeInformationSCT2();\n * Create an instance of {@link PartyIdentificationSEPA2", "old_return_type": "PaymentTypeInformationSCT2", "old_signature": "PaymentTypeInformationSCT2 createPaymentTypeInformationSCT2()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new PartyIdentification17();\n * Create an instance of {@link FinancialInstitutionIdentification5", "new_return_type": "PartyIdentification17", "new_signature": "PartyIdentification17 createPartyIdentification17()", "old_args": "", "old_implementation": "return new PersonIdentificationSEPA1Choice();\n * Create an instance of {@link ActiveOrHistoricCurrencyAndAmountSEPA", "old_return_type": "PersonIdentificationSEPA1Choice", "old_signature": "PersonIdentificationSEPA1Choice createPersonIdentificationSEPA1Choice()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new CurrencyAndAmount();\n * Create an instance of {@link EuroMax9Amount", "new_return_type": "CurrencyAndAmount", "new_signature": "CurrencyAndAmount createCurrencyAndAmount()", "old_args": "", "old_implementation": "return new PersonIdentificationSchemeName1Choice();\n * Create an instance of {@link RemittanceInformationSEPA1Choice", "old_return_type": "PersonIdentificationSchemeName1Choice", "old_signature": "PersonIdentificationSchemeName1Choice createPersonIdentificationSchemeName1Choice()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new PartyIdentification11();\n * Create an instance of {@link PartyIdentification22", "new_return_type": "PartyIdentification11", "new_signature": "PartyIdentification11 createPartyIdentification11()", "old_args": "", "old_implementation": "return new PostalAddressSEPA();\n * Create an instance of {@link CashAccountSEPA1", "old_return_type": "PostalAddressSEPA", "old_signature": "PostalAddressSEPA createPostalAddressSEPA()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new AccountIdentification2();\n * Create an instance of {@link OrganisationIdentification2", "new_return_type": "AccountIdentification2", "new_signature": "AccountIdentification2 createAccountIdentification2()", "old_args": "", "old_implementation": "return new PurposeSEPA();\n * Create an instance of {@link CustomerCreditTransferInitiationV03", "old_return_type": "PurposeSEPA", "old_signature": "PurposeSEPA createPurposeSEPA()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new EuroMax9Amount();\n * Create an instance of {@link PostalAddress1", "new_return_type": "EuroMax9Amount", "new_signature": "EuroMax9Amount createEuroMax9Amount()", "old_args": "", "old_implementation": "return new RemittanceInformationSEPA1Choice();\n * Create an instance of {@link ServiceLevelSEPA", "old_return_type": "RemittanceInformationSEPA1Choice", "old_signature": "RemittanceInformationSEPA1Choice createRemittanceInformationSEPA1Choice()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new PaymentIdentification1();\n * Create an instance of {@link CashAccountSDD2", "new_return_type": "PaymentIdentification1", "new_signature": "PaymentIdentification1 createPaymentIdentification1()", "old_args": "", "old_implementation": "return new RemittanceInformationSEPA1Choice();\n * Create an instance of {@link ServiceLevelSEPA", "old_return_type": "RemittanceInformationSEPA1Choice", "old_signature": "RemittanceInformationSEPA1Choice createRemittanceInformationSEPA1Choice()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new PostalAddress1();\n * Create an instance of {@link PartyIdentification23", "new_return_type": "PostalAddress1", "new_signature": "PostalAddress1 createPostalAddress1()", "old_args": "", "old_implementation": "return new ServiceLevelSEPA();\n * Create an instance of {@link CashAccountSEPA2", "old_return_type": "ServiceLevelSEPA", "old_signature": "ServiceLevelSEPA createServiceLevelSEPA()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new AmendmentInformationDetails4();\n * Create an instance of {@link PaymentTypeInformation8", "new_return_type": "AmendmentInformationDetails4", "new_signature": "AmendmentInformationDetails4 createAmendmentInformationDetails4()", "old_args": "", "old_implementation": "return new StructuredRemittanceInformationSEPA1();\n * Create an instance of {@link CreditorReferenceInformationSEPA1", "old_return_type": "StructuredRemittanceInformationSEPA1", "old_signature": "StructuredRemittanceInformationSEPA1 createStructuredRemittanceInformationSEPA1()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new DirectDebitTransactionSDD();\n * Create an instance of {@link RestrictedIdentificationSDD", "new_return_type": "DirectDebitTransactionSDD", "new_signature": "DirectDebitTransactionSDD createDirectDebitTransactionSDD()", "old_args": "", "old_implementation": "return new AccountIdentificationSEPA();\n * Create an instance of {@link BranchAndFinancialInstitutionIdentificationSEPA3", "old_return_type": "AccountIdentificationSEPA", "old_signature": "AccountIdentificationSEPA createAccountIdentificationSEPA()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new Pain00800101();\n * Create an instance of {@link DirectDebitTransactionInformationSDD", "new_return_type": "Pain00800101", "new_signature": "Pain00800101 createPain00800101()", "old_args": "", "old_implementation": "return new ActiveOrHistoricCurrencyAndAmountSEPA();\n * Create an instance of {@link OrganisationIdentificationSEPAChoice", "old_return_type": "ActiveOrHistoricCurrencyAndAmountSEPA", "old_signature": "ActiveOrHistoricCurrencyAndAmountSEPA createActiveOrHistoricCurrencyAndAmountSEPA()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new PaymentInstructionInformationSDD();\n * Create an instance of {@link PersonIdentificationSEPA1Choice", "new_return_type": "PaymentInstructionInformationSDD", "new_signature": "PaymentInstructionInformationSDD createPaymentInstructionInformationSDD()", "old_args": "", "old_implementation": "return new AmountTypeSEPA();\n * Create an instance of {@link CreditTransferTransactionInformationSCT", "old_return_type": "AmountTypeSEPA", "old_signature": "AmountTypeSEPA createAmountTypeSEPA()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new PaymentInstructionInformationSDD();\n * Create an instance of {@link PersonIdentificationSEPA1Choice", "new_return_type": "PaymentInstructionInformationSDD", "new_signature": "PaymentInstructionInformationSDD createPaymentInstructionInformationSDD()", "old_args": "", "old_implementation": "return new AmountTypeSEPA();\n * Create an instance of {@link CreditTransferTransactionInformationSCT", "old_return_type": "AmountTypeSEPA", "old_signature": "AmountTypeSEPA createAmountTypeSEPA()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new PurposeSDD();\n * Create an instance of {@link PersonIdentificationSDD1", "new_return_type": "PurposeSDD", "new_signature": "PurposeSDD createPurposeSDD()", "old_args": "", "old_implementation": "return new AmountTypeSEPA();\n * Create an instance of {@link CreditTransferTransactionInformationSCT", "old_return_type": "AmountTypeSEPA", "old_signature": "AmountTypeSEPA createAmountTypeSEPA()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new PostalAddressSDD();\n * Create an instance of {@link ServiceLevelSDD", "new_return_type": "PostalAddressSDD", "new_signature": "PostalAddressSDD createPostalAddressSDD()", "old_args": "", "old_implementation": "return new BranchAndFinancialInstitutionIdentificationSEPA1();\n * Create an instance of {@link PersonIdentificationSchemeName1Choice", "old_return_type": "BranchAndFinancialInstitutionIdentificationSEPA1", "old_signature": "BranchAndFinancialInstitutionIdentificationSEPA1 createBranchAndFinancialInstitutionIdentificationSEPA1()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new DirectDebitTransactionSDD();\n /**\n * Create an instance of {@link BranchAndFinancialInstitutionIdentificationSEPA2", "new_return_type": "DirectDebitTransactionSDD", "new_signature": "DirectDebitTransactionSDD createDirectDebitTransactionSDD()", "old_args": "", "old_implementation": "return new BranchAndFinancialInstitutionIdentificationSEPA3();\n /**\n * Create an instance of {@link OthrIdentification", "old_return_type": "BranchAndFinancialInstitutionIdentificationSEPA3", "old_signature": "BranchAndFinancialInstitutionIdentificationSEPA3 createBranchAndFinancialInstitutionIdentificationSEPA3()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new RestrictedIdentificationSDD();\n * Create an instance of {@link LocalInstrumentSDD", "new_return_type": "RestrictedIdentificationSDD", "new_signature": "RestrictedIdentificationSDD createRestrictedIdentificationSDD()", "old_args": "", "old_implementation": "return new BranchAndFinancialInstitutionIdentificationSEPA3();\n * Create an instance of {@link PartySEPAChoice", "old_return_type": "BranchAndFinancialInstitutionIdentificationSEPA3", "old_signature": "BranchAndFinancialInstitutionIdentificationSEPA3 createBranchAndFinancialInstitutionIdentificationSEPA3()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new OrganisationIdentificationSDDChoice();\n * Create an instance of {@link StructuredRemittanceInformationSDD", "new_return_type": "OrganisationIdentificationSDDChoice", "new_signature": "OrganisationIdentificationSDDChoice createOrganisationIdentificationSDDChoice()", "old_args": "", "old_implementation": "return new CashAccountSEPA1();\n * Create an instance of {@link OthrIdentification", "old_return_type": "CashAccountSEPA1", "old_signature": "CashAccountSEPA1 createCashAccountSEPA1()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new CashAccountSDD1();\n * Create an instance of {@link AccountIdentificationSDD", "new_return_type": "CashAccountSDD1", "new_signature": "CashAccountSDD1 createCashAccountSDD1()", "old_args": "", "old_implementation": "return new CashAccountSEPA2();\n * Create an instance of {@link PostalAddressSEPA", "old_return_type": "CashAccountSEPA2", "old_signature": "CashAccountSEPA2 createCashAccountSEPA2()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new GenericIdentification3();", "new_return_type": "GenericIdentification3", "new_signature": "GenericIdentification3 createGenericIdentification3()", "old_args": "", "old_implementation": "return new CategoryPurposeSEPA();\n * Create an instance of {@link CreditorReferenceTypeSEPA", "old_return_type": "CategoryPurposeSEPA", "old_signature": "CategoryPurposeSEPA createCategoryPurposeSEPA()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new PersonIdentificationSDD1();\n * Create an instance of {@link PersonIdentificationSDD2", "new_return_type": "PersonIdentificationSDD1", "new_signature": "PersonIdentificationSDD1 createPersonIdentificationSDD1()", "old_args": "", "old_implementation": "return new CreditTransferTransactionInformationSCT();\n * Create an instance of {@link PaymentInstructionInformationSCT", "old_return_type": "CreditTransferTransactionInformationSCT", "old_signature": "CreditTransferTransactionInformationSCT createCreditTransferTransactionInformationSCT()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new CreditorReferenceTypeSDD();\n * Create an instance of {@link BranchAndFinancialInstitutionIdentificationSDD2", "new_return_type": "CreditorReferenceTypeSDD", "new_signature": "CreditorReferenceTypeSDD createCreditorReferenceTypeSDD()", "old_args": "", "old_implementation": "return new CreditorReferenceInformationSEPA1();\n * Create an instance of {@link GenericPersonIdentification1", "old_return_type": "CreditorReferenceInformationSEPA1", "old_signature": "CreditorReferenceInformationSEPA1 createCreditorReferenceInformationSEPA1()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new PartySDDChoice();\n * Create an instance of {@link PartyIdentificationSDD2", "new_return_type": "PartySDDChoice", "new_signature": "PartySDDChoice createPartySDDChoice()", "old_args": "", "old_implementation": "return new CreditorReferenceTypeCodeSEPA();\n * Create an instance of {@link FinancialInstitutionIdentificationSEPA3", "old_return_type": "CreditorReferenceTypeCodeSEPA", "old_signature": "CreditorReferenceTypeCodeSEPA createCreditorReferenceTypeCodeSEPA()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new AmendmentInformationDetailsSDD();\n * Create an instance of {@link DirectDebitTransactionSDD", "new_return_type": "AmendmentInformationDetailsSDD", "new_signature": "AmendmentInformationDetailsSDD createAmendmentInformationDetailsSDD()", "old_args": "", "old_implementation": "return new CustomerCreditTransferInitiationV03();\n * Create an instance of {@link BranchAndFinancialInstitutionIdentificationSEPA3", "old_return_type": "CustomerCreditTransferInitiationV03", "old_signature": "CustomerCreditTransferInitiationV03 createCustomerCreditTransferInitiationV03()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new AmendmentInformationDetailsSDD();\n * Create an instance of {@link DirectDebitTransactionSDD", "new_return_type": "AmendmentInformationDetailsSDD", "new_signature": "AmendmentInformationDetailsSDD createAmendmentInformationDetailsSDD()", "old_args": "", "old_implementation": "return new CustomerCreditTransferInitiationV03();\n * Create an instance of {@link BranchAndFinancialInstitutionIdentificationSEPA3", "old_return_type": "CustomerCreditTransferInitiationV03", "old_signature": "CustomerCreditTransferInitiationV03 createCustomerCreditTransferInitiationV03()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new GenericIdentificationSDD();\n * Create an instance of {@link DirectDebitTransactionSDD", "new_return_type": "GenericIdentificationSDD", "new_signature": "GenericIdentificationSDD createGenericIdentificationSDD()", "old_args": "", "old_implementation": "return new CustomerCreditTransferInitiationV03();\n * Create an instance of {@link AccountIdentificationSEPA", "old_return_type": "CustomerCreditTransferInitiationV03", "old_signature": "CustomerCreditTransferInitiationV03 createCustomerCreditTransferInitiationV03()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new PartySDD();\n * Create an instance of {@link PartySDDChoice", "new_return_type": "PartySDD", "new_signature": "PartySDD createPartySDD()", "old_args": "", "old_implementation": "return new FinancialInstitutionIdentificationSEPA1();\n * Create an instance of {@link CreditorReferenceTypeCodeSEPA", "old_return_type": "FinancialInstitutionIdentificationSEPA1", "old_signature": "FinancialInstitutionIdentificationSEPA1 createFinancialInstitutionIdentificationSEPA1()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new PartyIdentificationSDD2();\n * Create an instance of {@link PartyIdentificationSDD1", "new_return_type": "PartyIdentificationSDD2", "new_signature": "PartyIdentificationSDD2 createPartyIdentificationSDD2()", "old_args": "", "old_implementation": "return new FinancialInstitutionIdentificationSEPA3();\n * Create an instance of {@link GroupHeaderSCT", "old_return_type": "FinancialInstitutionIdentificationSEPA3", "old_signature": "FinancialInstitutionIdentificationSEPA3 createFinancialInstitutionIdentificationSEPA3()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new PartyIdentificationSDD5();\n * Create an instance of {@link PartyIdentificationSDD4", "new_return_type": "PartyIdentificationSDD5", "new_signature": "PartyIdentificationSDD5 createPartyIdentificationSDD5()", "old_args": "", "old_implementation": "return new GenericOrganisationIdentification1();\n * Create an instance of {@link PaymentTypeInformationSCT2", "old_return_type": "GenericOrganisationIdentification1", "old_signature": "GenericOrganisationIdentification1 createGenericOrganisationIdentification1()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new GenericIdentification4();\n * Create an instance of {@link FinancialInstitutionIdentificationSDD2", "new_return_type": "GenericIdentification4", "new_signature": "GenericIdentification4 createGenericIdentification4()", "old_args": "", "old_implementation": "return new GenericPersonIdentification1();\n * Create an instance of {@link CategoryPurposeSEPA", "old_return_type": "GenericPersonIdentification1", "old_signature": "GenericPersonIdentification1 createGenericPersonIdentification1()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new PartyIdentificationSDD1();\n * Create an instance of {@link PartyIdentificationSDD5", "new_return_type": "PartyIdentificationSDD1", "new_signature": "PartyIdentificationSDD1 createPartyIdentificationSDD1()", "old_args": "", "old_implementation": "return new GroupHeaderSCT();\n * Create an instance of {@link GenericOrganisationIdentification1", "old_return_type": "GroupHeaderSCT", "old_signature": "GroupHeaderSCT createGroupHeaderSCT()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new DirectDebitTransactionInformationSDD();\n * Create an instance of {@link MandateRelatedInformationSDD", "new_return_type": "DirectDebitTransactionInformationSDD", "new_signature": "DirectDebitTransactionInformationSDD createDirectDebitTransactionInformationSDD()", "old_args": "", "old_implementation": "return new OrganisationIdentificationSEPAChoice();\n * Create an instance of {@link StructuredRemittanceInformationSEPA1", "old_return_type": "OrganisationIdentificationSEPAChoice", "old_signature": "OrganisationIdentificationSEPAChoice createOrganisationIdentificationSEPAChoice()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new RemittanceInformationSDDChoice();\n * Create an instance of {@link PurposeSDD", "new_return_type": "RemittanceInformationSDDChoice", "new_signature": "RemittanceInformationSDDChoice createRemittanceInformationSDDChoice()", "old_args": "", "old_implementation": "return new OrganisationIdentificationSchemeName1Choice();\n * Create an instance of {@link AmountTypeSEPA", "old_return_type": "OrganisationIdentificationSchemeName1Choice", "old_signature": "OrganisationIdentificationSchemeName1Choice createOrganisationIdentificationSchemeName1Choice()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new StructuredRemittanceInformationSDD();\n * Create an instance of {@link RemittanceInformationSDDChoice", "new_return_type": "StructuredRemittanceInformationSDD", "new_signature": "StructuredRemittanceInformationSDD createStructuredRemittanceInformationSDD()", "old_args": "", "old_implementation": "return new OthrIdentification();\n * Create an instance of {@link OrganisationIdentificationSchemeName1Choice", "old_return_type": "OthrIdentification", "old_signature": "OthrIdentification createOthrIdentification()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new AmendmentInformationDetailsSDD();\n * Create an instance of {@link CurrencyAndAmountSDD", "new_return_type": "AmendmentInformationDetailsSDD", "new_signature": "AmendmentInformationDetailsSDD createAmendmentInformationDetailsSDD()", "old_args": "", "old_implementation": "return new PartyIdentificationSEPA1();\n * Create an instance of {@link PaymentTypeInformationSCT1", "old_return_type": "PartyIdentificationSEPA1", "old_signature": "PartyIdentificationSEPA1 createPartyIdentificationSEPA1()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new PartyIdentificationSDD3();\n * Create an instance of {@link AmendmentInformationDetailsSDD", "new_return_type": "PartyIdentificationSDD3", "new_signature": "PartyIdentificationSDD3 createPartyIdentificationSDD3()", "old_args": "", "old_implementation": "return new PartyIdentificationSEPA2();\n * Create an instance of {@link PartyIdentificationSEPA1", "old_return_type": "PartyIdentificationSEPA2", "old_signature": "PartyIdentificationSEPA2 createPartyIdentificationSEPA2()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new LocalInstrumentSDD();\n * Create an instance of {@link PostalAddressSDD", "new_return_type": "LocalInstrumentSDD", "new_signature": "LocalInstrumentSDD createLocalInstrumentSDD()", "old_args": "", "old_implementation": "return new PartySEPAChoice();\n * Create an instance of {@link BranchAndFinancialInstitutionIdentificationSEPA1", "old_return_type": "PartySEPAChoice", "old_signature": "PartySEPAChoice createPartySEPAChoice()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new PaymentTypeInformationSDD();\n * Create an instance of {@link PartySDD", "new_return_type": "PaymentTypeInformationSDD", "new_signature": "PaymentTypeInformationSDD createPaymentTypeInformationSDD()", "old_args": "", "old_implementation": "return new PaymentIdentificationSEPA();\n * Create an instance of {@link FinancialInstitutionIdentificationSEPA1", "old_return_type": "PaymentIdentificationSEPA", "old_signature": "PaymentIdentificationSEPA createPaymentIdentificationSEPA()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new PaymentIdentification1();\n * Create an instance of {@link CashAccountSDD2", "new_return_type": "PaymentIdentification1", "new_signature": "PaymentIdentification1 createPaymentIdentification1()", "old_args": "", "old_implementation": "return new PaymentInstructionInformationSCT();\n * Create an instance of {@link PersonIdentificationSEPA1Choice", "old_return_type": "PaymentInstructionInformationSCT", "old_signature": "PaymentInstructionInformationSCT createPaymentInstructionInformationSCT()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new PersonIdentificationSDD2();\n * Create an instance of {@link PaymentInstructionInformationSDD", "new_return_type": "PersonIdentificationSDD2", "new_signature": "PersonIdentificationSDD2 createPersonIdentificationSDD2()", "old_args": "", "old_implementation": "return new PaymentInstructionInformationSCT();\n * Create an instance of {@link PersonIdentificationSEPA1Choice", "old_return_type": "PaymentInstructionInformationSCT", "old_signature": "PaymentInstructionInformationSCT createPaymentInstructionInformationSCT()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new CurrencyAndAmountSDD();\n * Create an instance of {@link CreditorReferenceInformationSDD", "new_return_type": "CurrencyAndAmountSDD", "new_signature": "CurrencyAndAmountSDD createCurrencyAndAmountSDD()", "old_args": "", "old_implementation": "return new PaymentTypeInformationSCT1();\n * Create an instance of {@link PurposeSEPA", "old_return_type": "PaymentTypeInformationSCT1", "old_signature": "PaymentTypeInformationSCT1 createPaymentTypeInformationSCT1()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new PartyIdentificationSDD4();\n * Create an instance of {@link PartyIdentificationSDD3", "new_return_type": "PartyIdentificationSDD4", "new_signature": "PartyIdentificationSDD4 createPartyIdentificationSDD4()", "old_args": "", "old_implementation": "return new PaymentTypeInformationSCT2();\n * Create an instance of {@link PartyIdentificationSEPA2", "old_return_type": "PaymentTypeInformationSCT2", "old_signature": "PaymentTypeInformationSCT2 createPaymentTypeInformationSCT2()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new PaymentInstructionInformationSDD();\n * Create an instance of {@link PersonIdentificationSEPA1Choice", "new_return_type": "PaymentInstructionInformationSDD", "new_signature": "PaymentInstructionInformationSDD createPaymentInstructionInformationSDD()", "old_args": "", "old_implementation": "return new PersonIdentificationSEPA1Choice();\n * Create an instance of {@link ActiveOrHistoricCurrencyAndAmountSEPA", "old_return_type": "PersonIdentificationSEPA1Choice", "old_signature": "PersonIdentificationSEPA1Choice createPersonIdentificationSEPA1Choice()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new ServiceLevelSDD();\n * Create an instance of {@link PaymentIdentification1", "new_return_type": "ServiceLevelSDD", "new_signature": "ServiceLevelSDD createServiceLevelSDD()", "old_args": "", "old_implementation": "return new PersonIdentificationSchemeName1Choice();\n * Create an instance of {@link RemittanceInformationSEPA1Choice", "old_return_type": "PersonIdentificationSchemeName1Choice", "old_signature": "PersonIdentificationSchemeName1Choice createPersonIdentificationSchemeName1Choice()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new AccountIdentificationSDD();\n * Create an instance of {@link OrganisationIdentificationSDDChoice", "new_return_type": "AccountIdentificationSDD", "new_signature": "AccountIdentificationSDD createAccountIdentificationSDD()", "old_args": "", "old_implementation": "return new PostalAddressSEPA();\n * Create an instance of {@link CashAccountSEPA1", "old_return_type": "PostalAddressSEPA", "old_signature": "PostalAddressSEPA createPostalAddressSEPA()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new CreditorReferenceInformationSDD();\n * Create an instance of {@link GenericIdentificationSDD", "new_return_type": "CreditorReferenceInformationSDD", "new_signature": "CreditorReferenceInformationSDD createCreditorReferenceInformationSDD()", "old_args": "", "old_implementation": "return new PurposeSEPA();\n * Create an instance of {@link CustomerCreditTransferInitiationV03", "old_return_type": "PurposeSEPA", "old_signature": "PurposeSEPA createPurposeSEPA()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new PaymentIdentification1();\n * Create an instance of {@link CashAccountSDD2", "new_return_type": "PaymentIdentification1", "new_signature": "PaymentIdentification1 createPaymentIdentification1()", "old_args": "", "old_implementation": "return new RemittanceInformationSEPA1Choice();\n * Create an instance of {@link ServiceLevelSEPA", "old_return_type": "RemittanceInformationSEPA1Choice", "old_signature": "RemittanceInformationSEPA1Choice createRemittanceInformationSEPA1Choice()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new CashAccountSDD2();\n * Create an instance of {@link CashAccountSDD1", "new_return_type": "CashAccountSDD2", "new_signature": "CashAccountSDD2 createCashAccountSDD2()", "old_args": "", "old_implementation": "return new ServiceLevelSEPA();\n * Create an instance of {@link CashAccountSEPA2", "old_return_type": "ServiceLevelSEPA", "old_signature": "ServiceLevelSEPA createServiceLevelSEPA()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new MandateRelatedInformationSDD();\n * Create an instance of {@link CreditorReferenceTypeSDD", "new_return_type": "MandateRelatedInformationSDD", "new_signature": "MandateRelatedInformationSDD createMandateRelatedInformationSDD()", "old_args": "", "old_implementation": "return new StructuredRemittanceInformationSEPA1();\n * Create an instance of {@link CreditorReferenceInformationSEPA1", "old_return_type": "StructuredRemittanceInformationSEPA1", "old_signature": "StructuredRemittanceInformationSEPA1 createStructuredRemittanceInformationSEPA1()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return cstmrDrctDbtInitn;\n * Sets the value of the cstmrDrctDbtInitn property.\n * {@link CustomerDirectDebitInitiationV02", "new_return_type": "CustomerDirectDebitInitiationV02", "new_signature": "CustomerDirectDebitInitiationV02 getCstmrDrctDbtInitn()", "old_args": "", "old_implementation": "return cstmrCdtTrfInitn;\n * Sets the value of the cstmrCdtTrfInitn property.\n * {@link CustomerCreditTransferInitiationV03", "old_return_type": "CustomerCreditTransferInitiationV03", "old_signature": "CustomerCreditTransferInitiationV03 getCstmrCdtTrfInitn()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return cstmrDrctDbtInitn;\n * Sets the value of the cstmrDrctDbtInitn property.\n * {@link CustomerDirectDebitInitiationV02", "new_return_type": "CustomerDirectDebitInitiationV02", "new_signature": "CustomerDirectDebitInitiationV02 getCstmrDrctDbtInitn()", "old_args": "", "old_implementation": "return cstmrCdtTrfInitn;\n * Sets the value of the cstmrCdtTrfInitn property.\n * {@link CustomerCreditTransferInitiationV03", "old_return_type": "CustomerCreditTransferInitiationV03", "old_signature": "CustomerCreditTransferInitiationV03 getCstmrCdtTrfInitn()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new PaymentInstructionInformationSDD();\n * Create an instance of {@link PersonIdentificationSEPA1Choice", "new_return_type": "PaymentInstructionInformationSDD", "new_signature": "PaymentInstructionInformationSDD createPaymentInstructionInformationSDD()", "old_args": "", "old_implementation": "return new AmountTypeSEPA();\n * Create an instance of {@link CreditTransferTransactionInformationSCT", "old_return_type": "AmountTypeSEPA", "old_signature": "AmountTypeSEPA createAmountTypeSEPA()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new PaymentInstructionInformationSDD();\n * Create an instance of {@link PersonIdentificationSEPA1Choice", "new_return_type": "PaymentInstructionInformationSDD", "new_signature": "PaymentInstructionInformationSDD createPaymentInstructionInformationSDD()", "old_args": "", "old_implementation": "return new AmountTypeSEPA();\n * Create an instance of {@link CreditTransferTransactionInformationSCT", "old_return_type": "AmountTypeSEPA", "old_signature": "AmountTypeSEPA createAmountTypeSEPA()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new DirectDebitTransactionSDD();\n /**\n * Create an instance of {@link BranchAndFinancialInstitutionIdentificationSEPA2", "new_return_type": "DirectDebitTransactionSDD", "new_signature": "DirectDebitTransactionSDD createDirectDebitTransactionSDD()", "old_args": "", "old_implementation": "return new BranchAndFinancialInstitutionIdentificationSEPA3();\n /**\n * Create an instance of {@link OthrIdentification", "old_return_type": "BranchAndFinancialInstitutionIdentificationSEPA3", "old_signature": "BranchAndFinancialInstitutionIdentificationSEPA3 createBranchAndFinancialInstitutionIdentificationSEPA3()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new PartySEPA2();", "new_return_type": "PartySEPA2", "new_signature": "PartySEPA2 createPartySEPA2()", "old_args": "", "old_implementation": "return new CreditTransferTransactionInformationSCT();\n * Create an instance of {@link PaymentInstructionInformationSCT", "old_return_type": "CreditTransferTransactionInformationSCT", "old_signature": "CreditTransferTransactionInformationSCT createCreditTransferTransactionInformationSCT()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new PartySEPA2();", "new_return_type": "PartySEPA2", "new_signature": "PartySEPA2 createPartySEPA2()", "old_args": "", "old_implementation": "return new CreditTransferTransactionInformationSCT();\n * Create an instance of {@link PaymentInstructionInformationSCT", "old_return_type": "CreditTransferTransactionInformationSCT", "old_signature": "CreditTransferTransactionInformationSCT createCreditTransferTransactionInformationSCT()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new AmendmentInformationDetailsSDD();\n * Create an instance of {@link DirectDebitTransactionSDD", "new_return_type": "AmendmentInformationDetailsSDD", "new_signature": "AmendmentInformationDetailsSDD createAmendmentInformationDetailsSDD()", "old_args": "", "old_implementation": "return new CustomerCreditTransferInitiationV03();\n * Create an instance of {@link BranchAndFinancialInstitutionIdentificationSEPA3", "old_return_type": "CustomerCreditTransferInitiationV03", "old_signature": "CustomerCreditTransferInitiationV03 createCustomerCreditTransferInitiationV03()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new AmendmentInformationDetailsSDD();\n * Create an instance of {@link DirectDebitTransactionSDD", "new_return_type": "AmendmentInformationDetailsSDD", "new_signature": "AmendmentInformationDetailsSDD createAmendmentInformationDetailsSDD()", "old_args": "", "old_implementation": "return new CustomerCreditTransferInitiationV03();\n * Create an instance of {@link BranchAndFinancialInstitutionIdentificationSEPA3", "old_return_type": "CustomerCreditTransferInitiationV03", "old_signature": "CustomerCreditTransferInitiationV03 createCustomerCreditTransferInitiationV03()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new FinancialInstitutionIdentificationSEPA2();", "new_return_type": "FinancialInstitutionIdentificationSEPA2", "new_signature": "FinancialInstitutionIdentificationSEPA2 createFinancialInstitutionIdentificationSEPA2()", "old_args": "", "old_implementation": "return new FinancialInstitutionIdentificationSEPA3();\n * Create an instance of {@link GroupHeaderSCT", "old_return_type": "FinancialInstitutionIdentificationSEPA3", "old_signature": "FinancialInstitutionIdentificationSEPA3 createFinancialInstitutionIdentificationSEPA3()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new PartyIdentificationSEPA3();", "new_return_type": "PartyIdentificationSEPA3", "new_signature": "PartyIdentificationSEPA3 createPartyIdentificationSEPA3()", "old_args": "", "old_implementation": "return new GroupHeaderSCT();\n * Create an instance of {@link GenericOrganisationIdentification1", "old_return_type": "GroupHeaderSCT", "old_signature": "GroupHeaderSCT createGroupHeaderSCT()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new PersonIdentificationSEPA2();\n * Create an instance of {@link PartyIdentificationSEPA5", "new_return_type": "PersonIdentificationSEPA2", "new_signature": "PersonIdentificationSEPA2 createPersonIdentificationSEPA2()", "old_args": "", "old_implementation": "return new GroupHeaderSCT();\n * Create an instance of {@link GenericOrganisationIdentification1", "old_return_type": "GroupHeaderSCT", "old_signature": "GroupHeaderSCT createGroupHeaderSCT()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new PersonIdentificationSEPA2();\n * Create an instance of {@link PartyIdentificationSEPA5", "new_return_type": "PersonIdentificationSEPA2", "new_signature": "PersonIdentificationSEPA2 createPersonIdentificationSEPA2()", "old_args": "", "old_implementation": "return new GroupHeaderSCT();\n * Create an instance of {@link GenericOrganisationIdentification1", "old_return_type": "GroupHeaderSCT", "old_signature": "GroupHeaderSCT createGroupHeaderSCT()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new PartyIdentificationSEPA3();", "new_return_type": "PartyIdentificationSEPA3", "new_signature": "PartyIdentificationSEPA3 createPartyIdentificationSEPA3()", "old_args": "", "old_implementation": "return new PaymentTypeInformationSCT1();\n * Create an instance of {@link PurposeSEPA", "old_return_type": "PaymentTypeInformationSCT1", "old_signature": "PaymentTypeInformationSCT1 createPaymentTypeInformationSCT1()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new PersonIdentificationSEPA2();\n * Create an instance of {@link PartyIdentificationSEPA5", "new_return_type": "PersonIdentificationSEPA2", "new_signature": "PersonIdentificationSEPA2 createPersonIdentificationSEPA2()", "old_args": "", "old_implementation": "return new PaymentTypeInformationSCT2();\n * Create an instance of {@link PaymentTypeInformationSCT1", "old_return_type": "PaymentTypeInformationSCT2", "old_signature": "PaymentTypeInformationSCT2 createPaymentTypeInformationSCT2()" }, { "name": "willuhn$hbci4java", "new_args": "", "new_implementation": "return new PaymentInstructionInformationSDD();\n * Create an instance of {@link PersonIdentificationSEPA1Choice", "new_return_type": "PaymentInstructionInformationSDD", "new_signature": "PaymentInstructionInformationSDD createPaymentInstructionInformationSDD()", "old_args": "", "old_implementation": "return new PersonIdentificationSEPA1Choice();\n * Create an instance of {@link ActiveOrHistoricCurrencyAndAmountSEPA", "old_return_type": "PersonIdentificationSEPA1Choice", "old_signature": "PersonIdentificationSEPA1Choice createPersonIdentificationSEPA1Choice()" } ]
110
101
110fa3222ae2931978d7921dc8e6af8c7f43abd3
[ { "name": "nasa$certware", "new_args": "ValueRange newRange,NotificationChain msgs", "new_implementation": null, "new_return_type": "NotificationChain", "new_signature": "NotificationChain basicSetRange(ValueRange newRange,NotificationChain msgs)", "old_args": "BigUnitValue newRate,NotificationChain msgs", "old_implementation": null, "old_return_type": "NotificationChain", "old_signature": "NotificationChain basicSetRate(BigUnitValue newRate,NotificationChain msgs)" }, { "name": "nasa$certware", "new_args": "EObject model,Assignment assignment,ContentAssistContext context,ICompletionProposalAcceptor acceptor", "new_implementation": null, "new_return_type": "void", "new_signature": "void completeInput_AppearsIn(EObject model,Assignment assignment,ContentAssistContext context,ICompletionProposalAcceptor acceptor)", "old_args": "EObject model,Assignment assignment,ContentAssistContext context,ICompletionProposalAcceptor acceptor", "old_implementation": null, "old_return_type": "void", "old_signature": "void completeInput_Lower(EObject model,Assignment assignment,ContentAssistContext context,ICompletionProposalAcceptor acceptor)" }, { "name": "nasa$certware", "new_args": "EObject model,Assignment assignment,ContentAssistContext context,ICompletionProposalAcceptor acceptor", "new_implementation": null, "new_return_type": "void", "new_signature": "void completeValueRange_Upper(EObject model,Assignment assignment,ContentAssistContext context,ICompletionProposalAcceptor acceptor)", "old_args": "EObject model,Assignment assignment,ContentAssistContext context,ICompletionProposalAcceptor acceptor", "old_implementation": null, "old_return_type": "void", "old_signature": "void completeInput_RangeType(EObject model,Assignment assignment,ContentAssistContext context,ICompletionProposalAcceptor acceptor)" }, { "name": "nasa$certware", "new_args": "EObject model,Assignment assignment,ContentAssistContext context,ICompletionProposalAcceptor acceptor", "new_implementation": null, "new_return_type": "void", "new_signature": "void completeInput_Granularity(EObject model,Assignment assignment,ContentAssistContext context,ICompletionProposalAcceptor acceptor)", "old_args": "EObject model,Assignment assignment,ContentAssistContext context,ICompletionProposalAcceptor acceptor", "old_implementation": null, "old_return_type": "void", "old_signature": "void completeInput_RangeUnits(EObject model,Assignment assignment,ContentAssistContext context,ICompletionProposalAcceptor acceptor)" }, { "name": "nasa$certware", "new_args": "EObject model,Assignment assignment,ContentAssistContext context,ICompletionProposalAcceptor acceptor", "new_implementation": null, "new_return_type": "void", "new_signature": "void completeInput_ArrivalRateAvg(EObject model,Assignment assignment,ContentAssistContext context,ICompletionProposalAcceptor acceptor)", "old_args": "EObject model,Assignment assignment,ContentAssistContext context,ICompletionProposalAcceptor acceptor", "old_implementation": null, "old_return_type": "void", "old_signature": "void completeInput_Rate(EObject model,Assignment assignment,ContentAssistContext context,ICompletionProposalAcceptor acceptor)" }, { "name": "nasa$certware", "new_args": "EObject model,Assignment assignment,ContentAssistContext context,ICompletionProposalAcceptor acceptor", "new_implementation": null, "new_return_type": "void", "new_signature": "void completeInput_Structure(EObject model,Assignment assignment,ContentAssistContext context,ICompletionProposalAcceptor acceptor)", "old_args": "EObject model,Assignment assignment,ContentAssistContext context,ICompletionProposalAcceptor acceptor", "old_implementation": null, "old_return_type": "void", "old_signature": "void completeInput_Upper(EObject model,Assignment assignment,ContentAssistContext context,ICompletionProposalAcceptor acceptor)" }, { "name": "nasa$certware", "new_args": "EObject model,Assignment assignment,ContentAssistContext context,ICompletionProposalAcceptor acceptor", "new_implementation": null, "new_return_type": "void", "new_signature": "void completeValueList_Values(EObject model,Assignment assignment,ContentAssistContext context,ICompletionProposalAcceptor acceptor)", "old_args": "EObject model,Assignment assignment,ContentAssistContext context,ICompletionProposalAcceptor acceptor", "old_implementation": null, "old_return_type": "void", "old_signature": "void completeInput_Values(EObject model,Assignment assignment,ContentAssistContext context,ICompletionProposalAcceptor acceptor)" }, { "name": "nasa$certware", "new_args": "EObject model,Assignment assignment,ContentAssistContext context,ICompletionProposalAcceptor acceptor", "new_implementation": null, "new_return_type": "void", "new_signature": "void completeInput_ValueHandling(EObject model,Assignment assignment,ContentAssistContext context,ICompletionProposalAcceptor acceptor)", "old_args": "EObject model,Assignment assignment,ContentAssistContext context,ICompletionProposalAcceptor acceptor", "old_implementation": null, "old_return_type": "void", "old_signature": "void completeInput_Variables(EObject model,Assignment assignment,ContentAssistContext context,ICompletionProposalAcceptor acceptor)" }, { "name": "nasa$certware", "new_args": "EObject model,Assignment assignment,ContentAssistContext context,ICompletionProposalAcceptor acceptor", "new_implementation": null, "new_return_type": "void", "new_signature": "void completeOutput_Range(EObject model,Assignment assignment,ContentAssistContext context,ICompletionProposalAcceptor acceptor)", "old_args": "EObject model,Assignment assignment,ContentAssistContext context,ICompletionProposalAcceptor acceptor", "old_implementation": null, "old_return_type": "void", "old_signature": "void completeOutput_Lower(EObject model,Assignment assignment,ContentAssistContext context,ICompletionProposalAcceptor acceptor)" }, { "name": "nasa$certware", "new_args": "EObject model,Assignment assignment,ContentAssistContext context,ICompletionProposalAcceptor acceptor", "new_implementation": null, "new_return_type": "void", "new_signature": "void completeInput_Range(EObject model,Assignment assignment,ContentAssistContext context,ICompletionProposalAcceptor acceptor)", "old_args": "EObject model,Assignment assignment,ContentAssistContext context,ICompletionProposalAcceptor acceptor", "old_implementation": null, "old_return_type": "void", "old_signature": "void completeOutput_RangeType(EObject model,Assignment assignment,ContentAssistContext context,ICompletionProposalAcceptor acceptor)" }, { "name": "nasa$certware", "new_args": "EObject model,Assignment assignment,ContentAssistContext context,ICompletionProposalAcceptor acceptor", "new_implementation": null, "new_return_type": "void", "new_signature": "void completeValueRange_RangeUnits(EObject model,Assignment assignment,ContentAssistContext context,ICompletionProposalAcceptor acceptor)", "old_args": "EObject model,Assignment assignment,ContentAssistContext context,ICompletionProposalAcceptor acceptor", "old_implementation": null, "old_return_type": "void", "old_signature": "void completeOutput_RangeUnits(EObject model,Assignment assignment,ContentAssistContext context,ICompletionProposalAcceptor acceptor)" }, { "name": "nasa$certware", "new_args": "EObject model,Assignment assignment,ContentAssistContext context,ICompletionProposalAcceptor acceptor", "new_implementation": null, "new_return_type": "void", "new_signature": "void completeOutput_ValueList(EObject model,Assignment assignment,ContentAssistContext context,ICompletionProposalAcceptor acceptor)", "old_args": "EObject model,Assignment assignment,ContentAssistContext context,ICompletionProposalAcceptor acceptor", "old_implementation": null, "old_return_type": "void", "old_signature": "void completeOutput_Upper(EObject model,Assignment assignment,ContentAssistContext context,ICompletionProposalAcceptor acceptor)" }, { "name": "nasa$certware", "new_args": "EObject model,Assignment assignment,ContentAssistContext context,ICompletionProposalAcceptor acceptor", "new_implementation": null, "new_return_type": "void", "new_signature": "void completeInput_ValueList(EObject model,Assignment assignment,ContentAssistContext context,ICompletionProposalAcceptor acceptor)", "old_args": "EObject model,Assignment assignment,ContentAssistContext context,ICompletionProposalAcceptor acceptor", "old_implementation": null, "old_return_type": "void", "old_signature": "void completeOutput_Values(EObject model,Assignment assignment,ContentAssistContext context,ICompletionProposalAcceptor acceptor)" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cReferencesAssignment_13_1;", "new_return_type": "Assignment", "new_signature": "Assignment getReferencesAssignment_13_1()", "old_args": "", "old_implementation": "return cCommentsAssignment_13_1;", "old_return_type": "Assignment", "old_signature": "Assignment getCommentsAssignment_13_1()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cDescriptionAssignment_11_1;", "new_return_type": "Assignment", "new_signature": "Assignment getDescriptionAssignment_11_1()", "old_args": "", "old_implementation": "return cCommentsAssignment_5_1;", "old_return_type": "Assignment", "old_signature": "Assignment getCommentsAssignment_5_1()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cCommentsKeyword_14_0;", "new_return_type": "Keyword", "new_signature": "Keyword getCommentsKeyword_14_0()", "old_args": "", "old_implementation": "return cCommentsKeyword_13_0;", "old_return_type": "Keyword", "old_signature": "Keyword getCommentsKeyword_13_0()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cArrivalRateMaximumKeyword_7_0;", "new_return_type": "Keyword", "new_signature": "Keyword getArrivalRateMaximumKeyword_7_0()", "old_args": "", "old_implementation": "return cCommentsKeyword_5_0;", "old_return_type": "Keyword", "old_signature": "Keyword getCommentsKeyword_5_0()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cCommentsSTRINGTerminalRuleCall_14_1_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getCommentsSTRINGTerminalRuleCall_14_1_0()", "old_args": "", "old_implementation": "return cCommentsSTRINGTerminalRuleCall_13_1_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getCommentsSTRINGTerminalRuleCall_13_1_0()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cStructureTriggerTableParserRuleCall_13_1_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getStructureTriggerTableParserRuleCall_13_1_0()", "old_args": "", "old_implementation": "return cCommentsSTRINGTerminalRuleCall_5_1_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getCommentsSTRINGTerminalRuleCall_5_1_0()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cCompletionDeadlineKeyword_5_0;", "new_return_type": "Keyword", "new_signature": "Keyword getCompletionDeadlineKeyword_5_0()", "old_args": "", "old_implementation": "return cCompletionDeadlineKeyword_4_0;", "old_return_type": "Keyword", "old_signature": "Keyword getCompletionDeadlineKeyword_4_0()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cCompletionExceptionKeyword_6_0;", "new_return_type": "Keyword", "new_signature": "Keyword getCompletionExceptionKeyword_6_0()", "old_args": "", "old_implementation": "return cCompletionExceptionKeyword_5_0;", "old_return_type": "Keyword", "old_signature": "Keyword getCompletionExceptionKeyword_5_0()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cCompletionHandlingAssignment_6_1;", "new_return_type": "Assignment", "new_signature": "Assignment getCompletionHandlingAssignment_6_1()", "old_args": "", "old_implementation": "return cCompletionHandlingAssignment_5_1;", "old_return_type": "Assignment", "old_signature": "Assignment getCompletionHandlingAssignment_5_1()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cCompletionHandlingSTRINGTerminalRuleCall_6_1_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getCompletionHandlingSTRINGTerminalRuleCall_6_1_0()", "old_args": "", "old_implementation": "return cCompletionHandlingSTRINGTerminalRuleCall_5_1_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getCompletionHandlingSTRINGTerminalRuleCall_5_1_0()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cCommentsAssignment_14_1;", "new_return_type": "Assignment", "new_signature": "Assignment getCommentsAssignment_14_1()", "old_args": "", "old_implementation": "return cContentsAssignment_14_1;", "old_return_type": "Assignment", "old_signature": "Assignment getContentsAssignment_14_1()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cContentsKeyword_15_0;", "new_return_type": "Keyword", "new_signature": "Keyword getContentsKeyword_15_0()", "old_args": "", "old_implementation": "return cContentsKeyword_14_0;", "old_return_type": "Keyword", "old_signature": "Keyword getContentsKeyword_14_0()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cContentsSTRINGTerminalRuleCall_15_1_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getContentsSTRINGTerminalRuleCall_15_1_0()", "old_args": "", "old_implementation": "return cContentsSTRINGTerminalRuleCall_14_1_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getContentsSTRINGTerminalRuleCall_14_1_0()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cDelayAssignment_4_1;", "new_return_type": "Assignment", "new_signature": "Assignment getDelayAssignment_4_1()", "old_args": "", "old_implementation": "return cDeadlineAssignment_4_1;", "old_return_type": "Assignment", "old_signature": "Assignment getDeadlineAssignment_4_1()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cRateBigUnitValueParserRuleCall_3_1_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getRateBigUnitValueParserRuleCall_3_1_0()", "old_args": "", "old_implementation": "return cDeadlineBigUnitValueParserRuleCall_4_1_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getDeadlineBigUnitValueParserRuleCall_4_1_0()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cRateAssignment_3_1;", "new_return_type": "Assignment", "new_signature": "Assignment getRateAssignment_3_1()", "old_args": "", "old_implementation": "return cDelayAssignment_3_1;", "old_return_type": "Assignment", "old_signature": "Assignment getDelayAssignment_3_1()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cValueListValueListParserRuleCall_2_1_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getValueListValueListParserRuleCall_2_1_0()", "old_args": "", "old_implementation": "return cDelayBigUnitValueParserRuleCall_3_1_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getDelayBigUnitValueParserRuleCall_3_1_0()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cFeebackHandlingAssignment_11_1;", "new_return_type": "Assignment", "new_signature": "Assignment getFeebackHandlingAssignment_11_1()", "old_args": "", "old_implementation": "return cFeebackHandlingAssignment_10_1;", "old_return_type": "Assignment", "old_signature": "Assignment getFeebackHandlingAssignment_10_1()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cFeebackHandlingSTRINGTerminalRuleCall_11_1_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getFeebackHandlingSTRINGTerminalRuleCall_11_1_0()", "old_args": "", "old_implementation": "return cFeebackHandlingSTRINGTerminalRuleCall_10_1_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getFeebackHandlingSTRINGTerminalRuleCall_10_1_0()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cFeedbackExceptionKeyword_11_0;", "new_return_type": "Keyword", "new_signature": "Keyword getFeedbackExceptionKeyword_11_0()", "old_args": "", "old_implementation": "return cFeedbackExceptionKeyword_10_0;", "old_return_type": "Keyword", "old_signature": "Keyword getFeedbackExceptionKeyword_10_0()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cValueExceptionKeyword_3_0;", "new_return_type": "Keyword", "new_signature": "Keyword getValueExceptionKeyword_3_0()", "old_args": "", "old_implementation": "return cFullStopFullStopFullStopKeyword_1_0_3;", "old_return_type": "Keyword", "old_signature": "Keyword getFullStopFullStopFullStopKeyword_1_0_3()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cGroup_1;", "new_return_type": "Group", "new_signature": "Group getGroup_1()", "old_args": "", "old_implementation": "return cGroup_1_0;", "old_return_type": "Group", "old_signature": "Group getGroup_1_0()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cGroup_10;", "new_return_type": "Group", "new_signature": "Group getGroup_10()", "old_args": "", "old_implementation": "return cGroup_1_0;", "old_return_type": "Group", "old_signature": "Group getGroup_1_0()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cGroup_11;", "new_return_type": "Group", "new_signature": "Group getGroup_11()", "old_args": "", "old_implementation": "return cGroup_1_1;", "old_return_type": "Group", "old_signature": "Group getGroup_1_1()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cInitiationDelayKeyword_4_0;", "new_return_type": "Keyword", "new_signature": "Keyword getInitiationDelayKeyword_4_0()", "old_args": "", "old_implementation": "return cInitiationDelayKeyword_3_0;", "old_return_type": "Keyword", "old_signature": "Keyword getInitiationDelayKeyword_3_0()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": null, "new_return_type": "EReference", "new_signature": "EReference getInput_Range()", "old_args": "", "old_implementation": null, "old_return_type": "EAttribute", "old_signature": "EAttribute getInput_Lower()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": null, "new_return_type": "EAttribute", "new_signature": "EAttribute getInput_ValueHandling()", "old_args": "", "old_implementation": null, "old_return_type": "EAttribute", "old_signature": "EAttribute getInput_RangeType()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": null, "new_return_type": "EReference", "new_signature": "EReference getInput_Granularity()", "old_args": "", "old_implementation": null, "old_return_type": "EAttribute", "old_signature": "EAttribute getInput_RangeUnits()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": null, "new_return_type": "EReference", "new_signature": "EReference getInput_ArrivalRateMinimum()", "old_args": "", "old_implementation": null, "old_return_type": "EReference", "old_signature": "EReference getInput_Rate()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": null, "new_return_type": "EReference", "new_signature": "EReference getInput_ValueList()", "old_args": "", "old_implementation": null, "old_return_type": "EAttribute", "old_signature": "EAttribute getInput_Upper()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": null, "new_return_type": "EReference", "new_signature": "EReference getInput_ArrivalRateAvg()", "old_args": "", "old_implementation": null, "old_return_type": "EAttribute", "old_signature": "EAttribute getInput_Values()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": null, "new_return_type": "EReference", "new_signature": "EReference getInput_ArrivalRateMaximum()", "old_args": "", "old_implementation": null, "old_return_type": "EAttribute", "old_signature": "EAttribute getInput_Variables()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cReferencesKeyword_9_0;", "new_return_type": "Keyword", "new_signature": "Keyword getReferencesKeyword_9_0()", "old_args": "", "old_implementation": "return cLeftCurlyBracketKeyword_1_0_1;", "old_return_type": "Keyword", "old_signature": "Keyword getLeftCurlyBracketKeyword_1_0_1()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cDescriptionKeyword_11_0;", "new_return_type": "Keyword", "new_signature": "Keyword getDescriptionKeyword_11_0()", "old_args": "", "old_implementation": "return cLeftCurlyBracketKeyword_1_1_1;", "old_return_type": "Keyword", "old_signature": "Keyword getLeftCurlyBracketKeyword_1_1_1()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cRangeAssignment_1_1;", "new_return_type": "Assignment", "new_signature": "Assignment getRangeAssignment_1_1()", "old_args": "", "old_implementation": "return cLowerAssignment_1_0_2;", "old_return_type": "Assignment", "old_signature": "Assignment getLowerAssignment_1_0_2()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cMinResponseBigUnitValueParserRuleCall_9_1_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getMinResponseBigUnitValueParserRuleCall_9_1_0()", "old_args": "", "old_implementation": "return cLowerBigDecimalTypeParserRuleCall_1_0_2_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getLowerBigDecimalTypeParserRuleCall_1_0_2_0()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cRangeValueRangeParserRuleCall_1_1_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getRangeValueRangeParserRuleCall_1_1_0()", "old_args": "", "old_implementation": "return cLowerBigDecimalTypeParserRuleCall_1_0_2_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getLowerBigDecimalTypeParserRuleCall_1_0_2_0()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cMinResponseAssignment_9_1;", "new_return_type": "Assignment", "new_signature": "Assignment getMinResponseAssignment_9_1()", "old_args": "", "old_implementation": "return cMaxResponseAssignment_9_1;", "old_return_type": "Assignment", "old_signature": "Assignment getMaxResponseAssignment_9_1()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cDeadlineBigUnitValueParserRuleCall_5_1_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getDeadlineBigUnitValueParserRuleCall_5_1_0()", "old_args": "", "old_implementation": "return cMaxResponseBigUnitValueParserRuleCall_9_1_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getMaxResponseBigUnitValueParserRuleCall_9_1_0()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cMaxResponseTimeKeyword_10_0;", "new_return_type": "Keyword", "new_signature": "Keyword getMaxResponseTimeKeyword_10_0()", "old_args": "", "old_implementation": "return cMaxResponseTimeKeyword_9_0;", "old_return_type": "Keyword", "old_signature": "Keyword getMaxResponseTimeKeyword_9_0()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cRelationshipAssignment_8_1;", "new_return_type": "Assignment", "new_signature": "Assignment getRelationshipAssignment_8_1()", "old_args": "", "old_implementation": "return cMinResponseAssignment_8_1;", "old_return_type": "Assignment", "old_signature": "Assignment getMinResponseAssignment_8_1()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cDelayBigUnitValueParserRuleCall_4_1_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getDelayBigUnitValueParserRuleCall_4_1_0()", "old_args": "", "old_implementation": "return cMinResponseBigUnitValueParserRuleCall_8_1_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getMinResponseBigUnitValueParserRuleCall_8_1_0()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cMinResponseTimeKeyword_9_0;", "new_return_type": "Keyword", "new_signature": "Keyword getMinResponseTimeKeyword_9_0()", "old_args": "", "old_implementation": "return cMinResponseTimeKeyword_8_0;", "old_return_type": "Keyword", "old_signature": "Keyword getMinResponseTimeKeyword_8_0()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": null, "new_return_type": "EReference", "new_signature": "EReference getOutput_Range()", "old_args": "", "old_implementation": null, "old_return_type": "EAttribute", "old_signature": "EAttribute getOutput_Lower()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": null, "new_return_type": "EAttribute", "new_signature": "EAttribute getValueRange_RangeType()", "old_args": "", "old_implementation": null, "old_return_type": "EAttribute", "old_signature": "EAttribute getOutput_RangeType()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": null, "new_return_type": "EAttribute", "new_signature": "EAttribute getValueRange_RangeUnits()", "old_args": "", "old_implementation": null, "old_return_type": "EAttribute", "old_signature": "EAttribute getOutput_RangeUnits()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": null, "new_return_type": "EReference", "new_signature": "EReference getOutput_ValueList()", "old_args": "", "old_implementation": null, "old_return_type": "EAttribute", "old_signature": "EAttribute getOutput_Upper()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cRangeKeyword_1_0;", "new_return_type": "Keyword", "new_signature": "Keyword getRangeKeyword_1_0()", "old_args": "", "old_implementation": "return cRangeKeyword_1_0_0;", "old_return_type": "Keyword", "old_signature": "Keyword getRangeKeyword_1_0_0()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cRangeKeyword_1_0;", "new_return_type": "Keyword", "new_signature": "Keyword getRangeKeyword_1_0()", "old_args": "", "old_implementation": "return cRangeKeyword_1_0_0;", "old_return_type": "Keyword", "old_signature": "Keyword getRangeKeyword_1_0_0()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cValueListAssignment_2_1;", "new_return_type": "Assignment", "new_signature": "Assignment getValueListAssignment_2_1()", "old_args": "", "old_implementation": "return cRangeTypeAssignment_1_0_7;", "old_return_type": "Assignment", "old_signature": "Assignment getRangeTypeAssignment_1_0_7()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cAppearsInSTRINGTerminalRuleCall_10_1_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getAppearsInSTRINGTerminalRuleCall_10_1_0()", "old_args": "", "old_implementation": "return cRangeTypeSTRINGTerminalRuleCall_1_0_7_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getRangeTypeSTRINGTerminalRuleCall_1_0_7_0()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": null, "new_return_type": "String", "new_signature": "String getAppearsIn()", "old_args": "", "old_implementation": null, "old_return_type": "String", "old_signature": "String getRangeUnits()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cCommentsAssignment_12_1;", "new_return_type": "Assignment", "new_signature": "Assignment getCommentsAssignment_12_1()", "old_args": "", "old_implementation": "return cRangeUnitsAssignment_1_0_9;", "old_return_type": "Assignment", "old_signature": "Assignment getRangeUnitsAssignment_1_0_9()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cCommentsSTRINGTerminalRuleCall_12_1_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getCommentsSTRINGTerminalRuleCall_12_1_0()", "old_args": "", "old_implementation": "return cRangeUnitsSTRINGTerminalRuleCall_1_0_9_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getRangeUnitsSTRINGTerminalRuleCall_1_0_9_0()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": null, "new_return_type": "BigUnitValue", "new_signature": "BigUnitValue getGranularity()", "old_args": "", "old_implementation": null, "old_return_type": "BigUnitValue", "old_signature": "BigUnitValue getRate()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cRangeAssignment_1_1;", "new_return_type": "Assignment", "new_signature": "Assignment getRangeAssignment_1_1()", "old_args": "", "old_implementation": "return cRateAssignment_2_1;", "old_return_type": "Assignment", "old_signature": "Assignment getRateAssignment_2_1()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cReferencesAssignment_9_1;", "new_return_type": "Assignment", "new_signature": "Assignment getReferencesAssignment_9_1()", "old_args": "", "old_implementation": "return cRateAssignment_2_1;", "old_return_type": "Assignment", "old_signature": "Assignment getRateAssignment_2_1()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cGranularityBigUnitValueParserRuleCall_4_1_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getGranularityBigUnitValueParserRuleCall_4_1_0()", "old_args": "", "old_implementation": "return cRateBigUnitValueParserRuleCall_2_1_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getRateBigUnitValueParserRuleCall_2_1_0()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cRangeValueRangeParserRuleCall_1_1_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getRangeValueRangeParserRuleCall_1_1_0()", "old_args": "", "old_implementation": "return cRateBigUnitValueParserRuleCall_2_1_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getRateBigUnitValueParserRuleCall_2_1_0()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cArrivalRateAvgKeyword_5_0;", "new_return_type": "Keyword", "new_signature": "Keyword getArrivalRateAvgKeyword_5_0()", "old_args": "", "old_implementation": "return cRateKeyword_2_0;", "old_return_type": "Keyword", "old_signature": "Keyword getRateKeyword_2_0()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cRateKeyword_3_0;", "new_return_type": "Keyword", "new_signature": "Keyword getRateKeyword_3_0()", "old_args": "", "old_implementation": "return cRateKeyword_2_0;", "old_return_type": "Keyword", "old_signature": "Keyword getRateKeyword_2_0()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cReversedAssignment_12_1;", "new_return_type": "Assignment", "new_signature": "Assignment getReversedAssignment_12_1()", "old_args": "", "old_implementation": "return cReferencesAssignment_12_1;", "old_return_type": "Assignment", "old_signature": "Assignment getReferencesAssignment_12_1()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cObsolescenceAssignment_8_1;", "new_return_type": "Assignment", "new_signature": "Assignment getObsolescenceAssignment_8_1()", "old_args": "", "old_implementation": "return cReferencesAssignment_4_1;", "old_return_type": "Assignment", "old_signature": "Assignment getReferencesAssignment_4_1()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cReferencesKeyword_13_0;", "new_return_type": "Keyword", "new_signature": "Keyword getReferencesKeyword_13_0()", "old_args": "", "old_implementation": "return cReferencesKeyword_12_0;", "old_return_type": "Keyword", "old_signature": "Keyword getReferencesKeyword_12_0()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cArrivalRateMinimumKeyword_6_0;", "new_return_type": "Keyword", "new_signature": "Keyword getArrivalRateMinimumKeyword_6_0()", "old_args": "", "old_implementation": "return cReferencesKeyword_4_0;", "old_return_type": "Keyword", "old_signature": "Keyword getReferencesKeyword_4_0()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cReferencesSTRINGTerminalRuleCall_13_1_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getReferencesSTRINGTerminalRuleCall_13_1_0()", "old_args": "", "old_implementation": "return cReferencesSTRINGTerminalRuleCall_12_1_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getReferencesSTRINGTerminalRuleCall_12_1_0()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cDescriptionSTRINGTerminalRuleCall_11_1_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getDescriptionSTRINGTerminalRuleCall_11_1_0()", "old_args": "", "old_implementation": "return cReferencesSTRINGTerminalRuleCall_4_1_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getReferencesSTRINGTerminalRuleCall_4_1_0()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cVariablesAssignment_7_1;", "new_return_type": "Assignment", "new_signature": "Assignment getVariablesAssignment_7_1()", "old_args": "", "old_implementation": "return cRelationshipAssignment_7_1;", "old_return_type": "Assignment", "old_signature": "Assignment getRelationshipAssignment_7_1()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cRelationshipKeyword_8_0;", "new_return_type": "Keyword", "new_signature": "Keyword getRelationshipKeyword_8_0()", "old_args": "", "old_implementation": "return cRelationshipKeyword_7_0;", "old_return_type": "Keyword", "old_signature": "Keyword getRelationshipKeyword_7_0()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cRelationshipSTRINGTerminalRuleCall_8_1_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getRelationshipSTRINGTerminalRuleCall_8_1_0()", "old_args": "", "old_implementation": "return cRelationshipSTRINGTerminalRuleCall_7_1_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getRelationshipSTRINGTerminalRuleCall_7_1_0()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cMaxResponseAssignment_10_1;", "new_return_type": "Assignment", "new_signature": "Assignment getMaxResponseAssignment_10_1()", "old_args": "", "old_implementation": "return cReversedAssignment_11_1;", "old_return_type": "Assignment", "old_signature": "Assignment getReversedAssignment_11_1()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cReversedByKeyword_12_0;", "new_return_type": "Keyword", "new_signature": "Keyword getReversedByKeyword_12_0()", "old_args": "", "old_implementation": "return cReversedByKeyword_11_0;", "old_return_type": "Keyword", "old_signature": "Keyword getReversedByKeyword_11_0()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cReversedSTRINGTerminalRuleCall_12_1_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getReversedSTRINGTerminalRuleCall_12_1_0()", "old_args": "", "old_implementation": "return cReversedSTRINGTerminalRuleCall_11_1_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getReversedSTRINGTerminalRuleCall_11_1_0()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cGranularityKeyword_4_0;", "new_return_type": "Keyword", "new_signature": "Keyword getGranularityKeyword_4_0()", "old_args": "", "old_implementation": "return cRightCurlyBracketKeyword_1_0_5;", "old_return_type": "Keyword", "old_signature": "Keyword getRightCurlyBracketKeyword_1_0_5()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cTriggeringKeyword_13_0;", "new_return_type": "Keyword", "new_signature": "Keyword getTriggeringKeyword_13_0()", "old_args": "", "old_implementation": "return cRightCurlyBracketKeyword_1_1_3;", "old_return_type": "Keyword", "old_signature": "Keyword getRightCurlyBracketKeyword_1_1_3()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cContentsAssignment_15_1;", "new_return_type": "Assignment", "new_signature": "Assignment getContentsAssignment_15_1()", "old_args": "", "old_implementation": "return cTableAssignment_15_1;", "old_return_type": "Assignment", "old_signature": "Assignment getTableAssignment_15_1()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cTableTriggerTableParserRuleCall_16_1_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getTableTriggerTableParserRuleCall_16_1_0()", "old_args": "", "old_implementation": "return cTableTriggerTableParserRuleCall_15_1_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getTableTriggerTableParserRuleCall_15_1_0()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cTriggeringKeyword_16_0;", "new_return_type": "Keyword", "new_signature": "Keyword getTriggeringKeyword_16_0()", "old_args": "", "old_implementation": "return cTriggeringKeyword_15_0;", "old_return_type": "Keyword", "old_signature": "Keyword getTriggeringKeyword_15_0()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cAppearsInKeyword_10_0;", "new_return_type": "Keyword", "new_signature": "Keyword getAppearsInKeyword_10_0()", "old_args": "", "old_implementation": "return cTypeKeyword_1_0_6;", "old_return_type": "Keyword", "old_signature": "Keyword getTypeKeyword_1_0_6()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cCommentsKeyword_12_0;", "new_return_type": "Keyword", "new_signature": "Keyword getCommentsKeyword_12_0()", "old_args": "", "old_implementation": "return cUnitsKeyword_1_0_8;", "old_return_type": "Keyword", "old_signature": "Keyword getUnitsKeyword_1_0_8()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cAppearsInAssignment_10_1;", "new_return_type": "Assignment", "new_signature": "Assignment getAppearsInAssignment_10_1()", "old_args": "", "old_implementation": "return cUpperAssignment_1_0_4;", "old_return_type": "Assignment", "old_signature": "Assignment getUpperAssignment_1_0_4()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cMaxResponseBigUnitValueParserRuleCall_10_1_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getMaxResponseBigUnitValueParserRuleCall_10_1_0()", "old_args": "", "old_implementation": "return cUpperBigDecimalTypeParserRuleCall_1_0_4_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getUpperBigDecimalTypeParserRuleCall_1_0_4_0()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cValueListValueListParserRuleCall_2_1_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getValueListValueListParserRuleCall_2_1_0()", "old_args": "", "old_implementation": "return cUpperBigDecimalTypeParserRuleCall_1_0_4_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getUpperBigDecimalTypeParserRuleCall_1_0_4_0()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cValueHandlingAssignment_3_1;", "new_return_type": "Assignment", "new_signature": "Assignment getValueHandlingAssignment_3_1()", "old_args": "", "old_implementation": "return cValuesAssignment_1_1_2;", "old_return_type": "Assignment", "old_signature": "Assignment getValuesAssignment_1_1_2()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cValueListAssignment_2_1;", "new_return_type": "Assignment", "new_signature": "Assignment getValueListAssignment_2_1()", "old_args": "", "old_implementation": "return cValuesAssignment_1_1_2;", "old_return_type": "Assignment", "old_signature": "Assignment getValuesAssignment_1_1_2()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cValueListKeyword_2_0;", "new_return_type": "Keyword", "new_signature": "Keyword getValueListKeyword_2_0()", "old_args": "", "old_implementation": "return cValuesKeyword_1_1_0;", "old_return_type": "Keyword", "old_signature": "Keyword getValuesKeyword_1_1_0()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cValueListKeyword_2_0;", "new_return_type": "Keyword", "new_signature": "Keyword getValueListKeyword_2_0()", "old_args": "", "old_implementation": "return cValuesKeyword_1_1_0;", "old_return_type": "Keyword", "old_signature": "Keyword getValuesKeyword_1_1_0()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cValueHandlingSTRINGTerminalRuleCall_3_1_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getValueHandlingSTRINGTerminalRuleCall_3_1_0()", "old_args": "", "old_implementation": "return cValuesSTRINGTerminalRuleCall_1_1_2_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getValuesSTRINGTerminalRuleCall_1_1_2_0()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": null, "new_return_type": "String", "new_signature": "String getValueHandling()", "old_args": "", "old_implementation": null, "old_return_type": "String", "old_signature": "String getVariables()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cStructureAssignment_13_1;", "new_return_type": "Assignment", "new_signature": "Assignment getStructureAssignment_13_1()", "old_args": "", "old_implementation": "return cVariablesAssignment_3_1;", "old_return_type": "Assignment", "old_signature": "Assignment getVariablesAssignment_3_1()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cDeadlineAssignment_5_1;", "new_return_type": "Assignment", "new_signature": "Assignment getDeadlineAssignment_5_1()", "old_args": "", "old_implementation": "return cVariablesAssignment_6_1;", "old_return_type": "Assignment", "old_signature": "Assignment getVariablesAssignment_6_1()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cObsolescenceKeyword_8_0;", "new_return_type": "Keyword", "new_signature": "Keyword getObsolescenceKeyword_8_0()", "old_args": "", "old_implementation": "return cVariablesKeyword_3_0;", "old_return_type": "Keyword", "old_signature": "Keyword getVariablesKeyword_3_0()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cVariablesKeyword_7_0;", "new_return_type": "Keyword", "new_signature": "Keyword getVariablesKeyword_7_0()", "old_args": "", "old_implementation": "return cVariablesKeyword_6_0;", "old_return_type": "Keyword", "old_signature": "Keyword getVariablesKeyword_6_0()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cReferencesSTRINGTerminalRuleCall_9_1_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getReferencesSTRINGTerminalRuleCall_9_1_0()", "old_args": "", "old_implementation": "return cVariablesSTRINGTerminalRuleCall_3_1_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getVariablesSTRINGTerminalRuleCall_3_1_0()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cVariablesSTRINGTerminalRuleCall_7_1_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getVariablesSTRINGTerminalRuleCall_7_1_0()", "old_args": "", "old_implementation": "return cVariablesSTRINGTerminalRuleCall_6_1_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getVariablesSTRINGTerminalRuleCall_6_1_0()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void ruleValueList()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Input__Alternatives_1()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Input__ArrivalRateAvgAssignment_5_1()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Input__CommentsAssignment_5_1()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Input__Group__10__Impl()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Input__Group_1_0__0()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Input__Group_10__0__Impl()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Input__Group_1_0__0__Impl()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Input__Group_10__0()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Input__Group_1_0__1()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Input__Group_9__0__Impl()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Input__Group_1_0__1__Impl()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Input__Group__12__Impl()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Input__Group_1_0__2()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Input__Group_1__1__Impl()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Input__Group_1_0__2__Impl()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Input__Group_12__0()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Input__Group_1_0__3()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Input__Group_11__0__Impl()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Input__Group_1_0__3__Impl()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Input__Group__13__Impl()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Input__Group_1_0__4()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Input__Group_10__1()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Input__Group_1_0__4__Impl()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Input__Group_13__0()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Input__Group_1_0__5()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Input__Group_13__0__Impl()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Input__Group_1_0__5__Impl()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Input__Group__11__Impl()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Input__Group_1_0__6()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Input__Group_12__0__Impl()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Input__Group_1_0__6__Impl()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Input__Group_11__0()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Input__Group_1_0__7()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Input__Group_10__1__Impl()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Input__Group_1_0__7__Impl()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Input__Group__6__Impl()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Input__Group_1_0__8()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Input__Group_8__0__Impl()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Input__Group_1_0__8__Impl()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Input__Group_12__1()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Input__Group_1_0__9()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Input__Group_12__1__Impl()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Input__Group_1_0__9__Impl()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Input__Group_9__0()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Input__Group_1_1__0()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Input__Group_7__0__Impl()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Input__Group_1_1__0__Impl()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Input__Group_6__0()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Input__Group_1_1__1()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Input__Group_6__0__Impl()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Input__Group_1_1__1__Impl()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Input__Group__7__Impl()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Input__Group_1_1__2()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Input__Group__8__Impl()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Input__Group_1_1__2__Impl()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Input__Group_11__1()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Input__Group_1_1__3()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Input__Group_13__1()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Input__Group_1_1__3__Impl()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Input__RangeAssignment_1_1()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Input__LowerAssignment_1_0_2()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Input__AppearsInAssignment_10_1()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Input__RangeTypeAssignment_1_0_7()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Input__CommentsAssignment_12_1()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Input__RangeUnitsAssignment_1_0_9()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Input__ValueListAssignment_2_1()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Input__RateAssignment_2_1()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Input__GranularityAssignment_4_1()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Input__ReferencesAssignment_4_1()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Output__TableAssignment_16_1()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Input__UpperAssignment_1_0_4()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__ValueList__ValuesAssignment_1()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Input__ValuesAssignment_1_1_2()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Input__ValueHandlingAssignment_3_1()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Input__VariablesAssignment_3_1()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void entryRuleValueList()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Output__Alternatives_1()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Output__ReferencesAssignment_13_1()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Output__CommentsAssignment_13_1()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Output__DeadlineAssignment_5_1()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Output__CompletionHandlingAssignment_5_1()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Output__CommentsAssignment_14_1()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Output__ContentsAssignment_14_1()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Output__DelayAssignment_4_1()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Output__DeadlineAssignment_4_1()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Output__RateAssignment_3_1()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Output__DelayAssignment_3_1()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Output__MaxResponseAssignment_10_1()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Output__FeebackHandlingAssignment_10_1()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Output__Group_1__0()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Output__Group_1_0__0()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Output__Group_1__0__Impl()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Output__Group_1_0__0__Impl()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Output__Group__16__Impl()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Output__Group_1_0__1()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__ValueList__Group__0__Impl()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Output__Group_1_0__1__Impl()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Output__Group_16__0()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Output__Group_1_0__2()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Output__Group_1__1()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Output__Group_1_0__2__Impl()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Input__Group_1__0()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Output__Group_1_0__3()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__ValueRange__Group__2__Impl()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Output__Group_1_0__3__Impl()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Input__Group__6()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Output__Group_1_0__4()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Output__Group_1__1__Impl()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Output__Group_1_0__4__Impl()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Input__Group__7()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Output__Group_1_0__5()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__ValueList__Group__2()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Output__Group_1_0__5__Impl()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Input__Group__8()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Output__Group_1_0__6()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Input__Group_1__0__Impl()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Output__Group_1_0__6__Impl()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Input__Group__9()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Output__Group_1_0__7()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Output__Group_16__1()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Output__Group_1_0__7__Impl()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Input__Group__10()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Output__Group_1_0__8()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Output__Group_16__0__Impl()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Output__Group_1_0__8__Impl()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Output__Group__16()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Output__Group_1_0__9()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Output__Group_16__1__Impl()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Output__Group_1_0__9__Impl()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Input__Group__11()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Output__Group_1_1__0()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__ValueRange__Group__7__Impl()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Output__Group_1_1__0__Impl()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Input__Group__12()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Output__Group_1_1__1()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__ValueRange__Group__0__Impl()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Output__Group_1_1__1__Impl()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__ValueList__Group__0()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Output__Group_1_1__2()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__ValueList__Group__1()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Output__Group_1_1__2__Impl()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Input__Group_1__1()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Output__Group_1_1__3()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__ValueList__Group__2__Impl()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Output__Group_1_1__3__Impl()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__ValueRange__LowerAssignment_1()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Output__LowerAssignment_1_0_2()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Output__MinResponseAssignment_9_1()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Output__MaxResponseAssignment_9_1()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Output__RelationshipAssignment_8_1()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Output__MinResponseAssignment_8_1()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Output__ValueListAssignment_2_1()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Output__RateAssignment_2_1()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Output__ReversedAssignment_12_1()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Output__ReferencesAssignment_12_1()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Output__VariablesAssignment_7_1()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Output__RelationshipAssignment_7_1()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Output__FeebackHandlingAssignment_11_1()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Output__ReversedAssignment_11_1()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Output__ContentsAssignment_15_1()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Output__TableAssignment_15_1()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__ValueRange__UpperAssignment_3()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Output__UpperAssignment_1_0_4()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Output__CompletionHandlingAssignment_6_1()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Output__VariablesAssignment_6_1()" }, { "name": "nasa$certware", "new_args": "String newAppearsIn", "new_implementation": null, "new_return_type": "void", "new_signature": "void setAppearsIn(String newAppearsIn)", "old_args": "String newRangeType", "old_implementation": null, "old_return_type": "void", "old_signature": "void setRangeType(String newRangeType)" }, { "name": "nasa$certware", "new_args": "String newValueHandling", "new_implementation": null, "new_return_type": "void", "new_signature": "void setValueHandling(String newValueHandling)", "old_args": "String newRangeUnits", "old_implementation": null, "old_return_type": "void", "old_signature": "void setRangeUnits(String newRangeUnits)" }, { "name": "nasa$certware", "new_args": "TriggerTable newStructure", "new_implementation": null, "new_return_type": "void", "new_signature": "void setStructure(TriggerTable newStructure)", "old_args": "BigUnitValue newRate", "old_implementation": null, "old_return_type": "void", "old_signature": "void setRate(BigUnitValue newRate)" }, { "name": "nasa$certware", "new_args": "String newDescription", "new_implementation": null, "new_return_type": "void", "new_signature": "void setDescription(String newDescription)", "old_args": "String newVariables", "old_implementation": null, "old_return_type": "void", "old_signature": "void setVariables(String newVariables)" } ]
[ { "additions": 36, "blob_url": "https://github.com/nasa/CertWare/blob/110fa3222ae2931978d7921dc8e6af8c7f43abd3/net.certware.intent.state.ui%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fstate%2Fui%2Fcontentassist%2FAbstractStateSpecificationProposalProvider.java", "changes": 48, "contents_url": "https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent.state.ui%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fstate%2Fui%2Fcontentassist%2FAbstractStateSpecificationProposalProvider.java?ref=110fa3222ae2931978d7921dc8e6af8c7f43abd3", "deletions": 12, "filename": "net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/AbstractStateSpecificationProposalProvider.java", "new_code": "\tpublic void completeValueRange_Lower(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n\tpublic void completeValueRange_Upper(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n\tpublic void completeValueRange_RangeType(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n\tpublic void completeValueRange_RangeUnits(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n\tpublic void completeValueList_Values(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n\t\tcompleteRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);\n\t}\n\tpublic void completeOutput_Range(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n\t\tcompleteRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);\n\t}\n\tpublic void completeOutput_ValueList(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n\tpublic void completeInput_Range(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n\tpublic void completeInput_ValueList(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n\tpublic void completeInput_ValueHandling(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n\tpublic void completeInput_Granularity(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n\tpublic void completeInput_ArrivalRateAvg(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n\tpublic void completeInput_ArrivalRateMinimum(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n\tpublic void completeInput_ArrivalRateMaximum(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n\t\tcompleteRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);\n\t}\n\tpublic void completeInput_Obsolescence(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n\tpublic void completeInput_AppearsIn(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n\t\tcompleteRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);\n\t}\n\tpublic void completeInput_Description(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n\t\tcompleteRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);\n\t}\n\tpublic void completeInput_Structure(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n\t\tcompleteRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);\n\t}\n\tpublic void complete_ValueRange(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n\t\t// subclasses may override\n\t}\n\tpublic void complete_ValueList(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n\t\t// subclasses may override\n\t}", "new_methods": [ { "arguments": [ "EObject model", " Assignment assignment", " ContentAssistContext context", " ICompletionProposalAcceptor acceptor" ], "filename": "net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/AbstractStateSpecificationProposalProvider.java", "implementation": "public void completeValueRange_Upper(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n\tpublic void completeValueRange_RangeType(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n\tpublic void completeValueRange_RangeUnits(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n\tpublic void completeValueList_Values(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n\t\tcompleteRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);", "signature": "void completeValueRange_Lower(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor)" }, { "arguments": [ "EObject model", " Assignment assignment", " ContentAssistContext context", " ICompletionProposalAcceptor acceptor" ], "filename": "net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/AbstractStateSpecificationProposalProvider.java", "implementation": "completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);", "signature": "void completeOutput_Range(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor)" }, { "arguments": [ "EObject model", " Assignment assignment", " ContentAssistContext context", " ICompletionProposalAcceptor acceptor" ], "filename": "net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/AbstractStateSpecificationProposalProvider.java", "implementation": "public void completeInput_Range(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n\tpublic void completeInput_ValueList(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n\tpublic void completeInput_ValueHandling(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n\tpublic void completeInput_Granularity(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n\tpublic void completeInput_ArrivalRateAvg(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n\tpublic void completeInput_ArrivalRateMinimum(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n\tpublic void completeInput_ArrivalRateMaximum(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n\t\tcompleteRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);", "signature": "void completeOutput_ValueList(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor)" }, { "arguments": [ "EObject model", " Assignment assignment", " ContentAssistContext context", " ICompletionProposalAcceptor acceptor" ], "filename": "net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/AbstractStateSpecificationProposalProvider.java", "implementation": "public void completeInput_AppearsIn(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n\t\tcompleteRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);", "signature": "void completeInput_Obsolescence(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor)" }, { "arguments": [ "EObject model", " Assignment assignment", " ContentAssistContext context", " ICompletionProposalAcceptor acceptor" ], "filename": "net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/AbstractStateSpecificationProposalProvider.java", "implementation": "completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);", "signature": "void completeInput_Description(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor)" }, { "arguments": [ "EObject model", " Assignment assignment", " ContentAssistContext context", " ICompletionProposalAcceptor acceptor" ], "filename": "net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/AbstractStateSpecificationProposalProvider.java", "implementation": "completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);", "signature": "void completeInput_Structure(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor)" }, { "arguments": [ "EObject model", " RuleCall ruleCall", " ContentAssistContext context", " ICompletionProposalAcceptor acceptor" ], "filename": "net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/AbstractStateSpecificationProposalProvider.java", "implementation": "// subclasses may override", "signature": "void complete_ValueRange(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor)" }, { "arguments": [ "EObject model", " RuleCall ruleCall", " ContentAssistContext context", " ICompletionProposalAcceptor acceptor" ], "filename": "net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/AbstractStateSpecificationProposalProvider.java", "implementation": "// subclasses may override", "signature": "void complete_ValueList(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor)" } ], "old_code": "\tpublic void completeOutput_Lower(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n\tpublic void completeOutput_Upper(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n\tpublic void completeOutput_RangeType(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n\tpublic void completeOutput_RangeUnits(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n\tpublic void completeOutput_Values(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n\tpublic void completeInput_Lower(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n\tpublic void completeInput_Upper(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n\tpublic void completeInput_RangeType(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n\tpublic void completeInput_RangeUnits(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n\tpublic void completeInput_Values(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n\tpublic void completeInput_Rate(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n\tpublic void completeInput_Variables(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {", "old_methods": [], "patch": "@@ -162,19 +162,25 @@ public void completeTrigger_Value(EObject model, Assignment assignment, ContentA\n \tpublic void completeTriggerTable_Rows(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n \t\tcompleteRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);\n \t}\n-\tpublic void completeOutput_Lower(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n+\tpublic void completeValueRange_Lower(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n \t\tcompleteRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);\n \t}\n-\tpublic void completeOutput_Upper(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n+\tpublic void completeValueRange_Upper(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n \t\tcompleteRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);\n \t}\n-\tpublic void completeOutput_RangeType(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n+\tpublic void completeValueRange_RangeType(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n \t\tcompleteRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);\n \t}\n-\tpublic void completeOutput_RangeUnits(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n+\tpublic void completeValueRange_RangeUnits(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n \t\tcompleteRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);\n \t}\n-\tpublic void completeOutput_Values(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n+\tpublic void completeValueList_Values(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n+\t\tcompleteRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);\n+\t}\n+\tpublic void completeOutput_Range(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n+\t\tcompleteRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);\n+\t}\n+\tpublic void completeOutput_ValueList(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n \t\tcompleteRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);\n \t}\n \tpublic void completeOutput_Rate(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n@@ -219,33 +225,45 @@ public void completeOutput_Contents(EObject model, Assignment assignment, Conten\n \tpublic void completeOutput_Table(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n \t\tcompleteRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);\n \t}\n-\tpublic void completeInput_Lower(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n+\tpublic void completeInput_Range(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n \t\tcompleteRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);\n \t}\n-\tpublic void completeInput_Upper(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n+\tpublic void completeInput_ValueList(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n \t\tcompleteRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);\n \t}\n-\tpublic void completeInput_RangeType(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n+\tpublic void completeInput_ValueHandling(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n \t\tcompleteRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);\n \t}\n-\tpublic void completeInput_RangeUnits(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n+\tpublic void completeInput_Granularity(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n \t\tcompleteRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);\n \t}\n-\tpublic void completeInput_Values(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n+\tpublic void completeInput_ArrivalRateAvg(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n \t\tcompleteRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);\n \t}\n-\tpublic void completeInput_Rate(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n+\tpublic void completeInput_ArrivalRateMinimum(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n \t\tcompleteRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);\n \t}\n-\tpublic void completeInput_Variables(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n+\tpublic void completeInput_ArrivalRateMaximum(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n+\t\tcompleteRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);\n+\t}\n+\tpublic void completeInput_Obsolescence(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n \t\tcompleteRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);\n \t}\n \tpublic void completeInput_References(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n \t\tcompleteRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);\n \t}\n+\tpublic void completeInput_AppearsIn(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n+\t\tcompleteRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);\n+\t}\n+\tpublic void completeInput_Description(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n+\t\tcompleteRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);\n+\t}\n \tpublic void completeInput_Comments(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n \t\tcompleteRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);\n \t}\n+\tpublic void completeInput_Structure(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n+\t\tcompleteRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);\n+\t}\n \n \tpublic void complete_Specification(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n \t\t// subclasses may override\n@@ -307,6 +325,12 @@ public void complete_Trigger(EObject model, RuleCall ruleCall, ContentAssistCont\n \tpublic void complete_TriggerTable(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n \t\t// subclasses may override\n \t}\n+\tpublic void complete_ValueRange(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n+\t\t// subclasses may override\n+\t}\n+\tpublic void complete_ValueList(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n+\t\t// subclasses may override\n+\t}\n \tpublic void complete_Output(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n \t\t// subclasses may override\n \t}", "raw_url": "https://github.com/nasa/CertWare/raw/110fa3222ae2931978d7921dc8e6af8c7f43abd3/net.certware.intent.state.ui%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fstate%2Fui%2Fcontentassist%2FAbstractStateSpecificationProposalProvider.java", "sha": "32565f0383a7f281e8c327ee2612c24db4f7bfd8", "status": "modified" }, { "additions": 47, "blob_url": "https://github.com/nasa/CertWare/blob/110fa3222ae2931978d7921dc8e6af8c7f43abd3/net.certware.intent.state.ui%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fstate%2Fui%2Fcontentassist%2Fantlr%2FStateSpecificationParser.java", "changes": 81, "contents_url": "https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent.state.ui%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fstate%2Fui%2Fcontentassist%2Fantlr%2FStateSpecificationParser.java?ref=110fa3222ae2931978d7921dc8e6af8c7f43abd3", "deletions": 34, "filename": "net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/StateSpecificationParser.java", "new_code": "\t\t\t\t\tput(grammarAccess.getValueRangeAccess().getGroup(), \"rule__ValueRange__Group__0\");\n\t\t\t\t\tput(grammarAccess.getValueListAccess().getGroup(), \"rule__ValueList__Group__0\");\n\t\t\t\t\tput(grammarAccess.getOutputAccess().getGroup_1(), \"rule__Output__Group_1__0\");\n\t\t\t\t\tput(grammarAccess.getOutputAccess().getGroup_16(), \"rule__Output__Group_16__0\");\n\t\t\t\t\tput(grammarAccess.getInputAccess().getGroup_1(), \"rule__Input__Group_1__0\");\n\t\t\t\t\tput(grammarAccess.getInputAccess().getGroup_6(), \"rule__Input__Group_6__0\");\n\t\t\t\t\tput(grammarAccess.getInputAccess().getGroup_7(), \"rule__Input__Group_7__0\");\n\t\t\t\t\tput(grammarAccess.getInputAccess().getGroup_8(), \"rule__Input__Group_8__0\");\n\t\t\t\t\tput(grammarAccess.getInputAccess().getGroup_9(), \"rule__Input__Group_9__0\");\n\t\t\t\t\tput(grammarAccess.getInputAccess().getGroup_10(), \"rule__Input__Group_10__0\");\n\t\t\t\t\tput(grammarAccess.getInputAccess().getGroup_11(), \"rule__Input__Group_11__0\");\n\t\t\t\t\tput(grammarAccess.getInputAccess().getGroup_12(), \"rule__Input__Group_12__0\");\n\t\t\t\t\tput(grammarAccess.getInputAccess().getGroup_13(), \"rule__Input__Group_13__0\");\n\t\t\t\t\tput(grammarAccess.getValueRangeAccess().getLowerAssignment_1(), \"rule__ValueRange__LowerAssignment_1\");\n\t\t\t\t\tput(grammarAccess.getValueRangeAccess().getUpperAssignment_3(), \"rule__ValueRange__UpperAssignment_3\");\n\t\t\t\t\tput(grammarAccess.getValueRangeAccess().getRangeTypeAssignment_6(), \"rule__ValueRange__RangeTypeAssignment_6\");\n\t\t\t\t\tput(grammarAccess.getValueRangeAccess().getRangeUnitsAssignment_8(), \"rule__ValueRange__RangeUnitsAssignment_8\");\n\t\t\t\t\tput(grammarAccess.getValueListAccess().getValuesAssignment_1(), \"rule__ValueList__ValuesAssignment_1\");\n\t\t\t\t\tput(grammarAccess.getOutputAccess().getRangeAssignment_1_1(), \"rule__Output__RangeAssignment_1_1\");\n\t\t\t\t\tput(grammarAccess.getOutputAccess().getValueListAssignment_2_1(), \"rule__Output__ValueListAssignment_2_1\");\n\t\t\t\t\tput(grammarAccess.getOutputAccess().getRateAssignment_3_1(), \"rule__Output__RateAssignment_3_1\");\n\t\t\t\t\tput(grammarAccess.getOutputAccess().getDelayAssignment_4_1(), \"rule__Output__DelayAssignment_4_1\");\n\t\t\t\t\tput(grammarAccess.getOutputAccess().getDeadlineAssignment_5_1(), \"rule__Output__DeadlineAssignment_5_1\");\n\t\t\t\t\tput(grammarAccess.getOutputAccess().getCompletionHandlingAssignment_6_1(), \"rule__Output__CompletionHandlingAssignment_6_1\");\n\t\t\t\t\tput(grammarAccess.getOutputAccess().getVariablesAssignment_7_1(), \"rule__Output__VariablesAssignment_7_1\");\n\t\t\t\t\tput(grammarAccess.getOutputAccess().getRelationshipAssignment_8_1(), \"rule__Output__RelationshipAssignment_8_1\");\n\t\t\t\t\tput(grammarAccess.getOutputAccess().getMinResponseAssignment_9_1(), \"rule__Output__MinResponseAssignment_9_1\");\n\t\t\t\t\tput(grammarAccess.getOutputAccess().getMaxResponseAssignment_10_1(), \"rule__Output__MaxResponseAssignment_10_1\");\n\t\t\t\t\tput(grammarAccess.getOutputAccess().getFeebackHandlingAssignment_11_1(), \"rule__Output__FeebackHandlingAssignment_11_1\");\n\t\t\t\t\tput(grammarAccess.getOutputAccess().getReversedAssignment_12_1(), \"rule__Output__ReversedAssignment_12_1\");\n\t\t\t\t\tput(grammarAccess.getOutputAccess().getReferencesAssignment_13_1(), \"rule__Output__ReferencesAssignment_13_1\");\n\t\t\t\t\tput(grammarAccess.getOutputAccess().getCommentsAssignment_14_1(), \"rule__Output__CommentsAssignment_14_1\");\n\t\t\t\t\tput(grammarAccess.getOutputAccess().getContentsAssignment_15_1(), \"rule__Output__ContentsAssignment_15_1\");\n\t\t\t\t\tput(grammarAccess.getOutputAccess().getTableAssignment_16_1(), \"rule__Output__TableAssignment_16_1\");\n\t\t\t\t\tput(grammarAccess.getInputAccess().getRangeAssignment_1_1(), \"rule__Input__RangeAssignment_1_1\");\n\t\t\t\t\tput(grammarAccess.getInputAccess().getValueListAssignment_2_1(), \"rule__Input__ValueListAssignment_2_1\");\n\t\t\t\t\tput(grammarAccess.getInputAccess().getValueHandlingAssignment_3_1(), \"rule__Input__ValueHandlingAssignment_3_1\");\n\t\t\t\t\tput(grammarAccess.getInputAccess().getGranularityAssignment_4_1(), \"rule__Input__GranularityAssignment_4_1\");\n\t\t\t\t\tput(grammarAccess.getInputAccess().getArrivalRateAvgAssignment_5_1(), \"rule__Input__ArrivalRateAvgAssignment_5_1\");\n\t\t\t\t\tput(grammarAccess.getInputAccess().getArrivalRateMinimumAssignment_6_1(), \"rule__Input__ArrivalRateMinimumAssignment_6_1\");\n\t\t\t\t\tput(grammarAccess.getInputAccess().getArrivalRateMaximumAssignment_7_1(), \"rule__Input__ArrivalRateMaximumAssignment_7_1\");\n\t\t\t\t\tput(grammarAccess.getInputAccess().getObsolescenceAssignment_8_1(), \"rule__Input__ObsolescenceAssignment_8_1\");\n\t\t\t\t\tput(grammarAccess.getInputAccess().getReferencesAssignment_9_1(), \"rule__Input__ReferencesAssignment_9_1\");\n\t\t\t\t\tput(grammarAccess.getInputAccess().getAppearsInAssignment_10_1(), \"rule__Input__AppearsInAssignment_10_1\");\n\t\t\t\t\tput(grammarAccess.getInputAccess().getDescriptionAssignment_11_1(), \"rule__Input__DescriptionAssignment_11_1\");\n\t\t\t\t\tput(grammarAccess.getInputAccess().getCommentsAssignment_12_1(), \"rule__Input__CommentsAssignment_12_1\");\n\t\t\t\t\tput(grammarAccess.getInputAccess().getStructureAssignment_13_1(), \"rule__Input__StructureAssignment_13_1\");", "new_methods": [], "old_code": "\t\t\t\t\tput(grammarAccess.getOutputAccess().getAlternatives_1(), \"rule__Output__Alternatives_1\");\n\t\t\t\t\tput(grammarAccess.getInputAccess().getAlternatives_1(), \"rule__Input__Alternatives_1\");\n\t\t\t\t\tput(grammarAccess.getOutputAccess().getGroup_1_0(), \"rule__Output__Group_1_0__0\");\n\t\t\t\t\tput(grammarAccess.getOutputAccess().getGroup_1_1(), \"rule__Output__Group_1_1__0\");\n\t\t\t\t\tput(grammarAccess.getInputAccess().getGroup_1_0(), \"rule__Input__Group_1_0__0\");\n\t\t\t\t\tput(grammarAccess.getInputAccess().getGroup_1_1(), \"rule__Input__Group_1_1__0\");\n\t\t\t\t\tput(grammarAccess.getOutputAccess().getLowerAssignment_1_0_2(), \"rule__Output__LowerAssignment_1_0_2\");\n\t\t\t\t\tput(grammarAccess.getOutputAccess().getUpperAssignment_1_0_4(), \"rule__Output__UpperAssignment_1_0_4\");\n\t\t\t\t\tput(grammarAccess.getOutputAccess().getRangeTypeAssignment_1_0_7(), \"rule__Output__RangeTypeAssignment_1_0_7\");\n\t\t\t\t\tput(grammarAccess.getOutputAccess().getRangeUnitsAssignment_1_0_9(), \"rule__Output__RangeUnitsAssignment_1_0_9\");\n\t\t\t\t\tput(grammarAccess.getOutputAccess().getValuesAssignment_1_1_2(), \"rule__Output__ValuesAssignment_1_1_2\");\n\t\t\t\t\tput(grammarAccess.getOutputAccess().getRateAssignment_2_1(), \"rule__Output__RateAssignment_2_1\");\n\t\t\t\t\tput(grammarAccess.getOutputAccess().getDelayAssignment_3_1(), \"rule__Output__DelayAssignment_3_1\");\n\t\t\t\t\tput(grammarAccess.getOutputAccess().getDeadlineAssignment_4_1(), \"rule__Output__DeadlineAssignment_4_1\");\n\t\t\t\t\tput(grammarAccess.getOutputAccess().getCompletionHandlingAssignment_5_1(), \"rule__Output__CompletionHandlingAssignment_5_1\");\n\t\t\t\t\tput(grammarAccess.getOutputAccess().getVariablesAssignment_6_1(), \"rule__Output__VariablesAssignment_6_1\");\n\t\t\t\t\tput(grammarAccess.getOutputAccess().getRelationshipAssignment_7_1(), \"rule__Output__RelationshipAssignment_7_1\");\n\t\t\t\t\tput(grammarAccess.getOutputAccess().getMinResponseAssignment_8_1(), \"rule__Output__MinResponseAssignment_8_1\");\n\t\t\t\t\tput(grammarAccess.getOutputAccess().getMaxResponseAssignment_9_1(), \"rule__Output__MaxResponseAssignment_9_1\");\n\t\t\t\t\tput(grammarAccess.getOutputAccess().getFeebackHandlingAssignment_10_1(), \"rule__Output__FeebackHandlingAssignment_10_1\");\n\t\t\t\t\tput(grammarAccess.getOutputAccess().getReversedAssignment_11_1(), \"rule__Output__ReversedAssignment_11_1\");\n\t\t\t\t\tput(grammarAccess.getOutputAccess().getReferencesAssignment_12_1(), \"rule__Output__ReferencesAssignment_12_1\");\n\t\t\t\t\tput(grammarAccess.getOutputAccess().getCommentsAssignment_13_1(), \"rule__Output__CommentsAssignment_13_1\");\n\t\t\t\t\tput(grammarAccess.getOutputAccess().getContentsAssignment_14_1(), \"rule__Output__ContentsAssignment_14_1\");\n\t\t\t\t\tput(grammarAccess.getOutputAccess().getTableAssignment_15_1(), \"rule__Output__TableAssignment_15_1\");\n\t\t\t\t\tput(grammarAccess.getInputAccess().getLowerAssignment_1_0_2(), \"rule__Input__LowerAssignment_1_0_2\");\n\t\t\t\t\tput(grammarAccess.getInputAccess().getUpperAssignment_1_0_4(), \"rule__Input__UpperAssignment_1_0_4\");\n\t\t\t\t\tput(grammarAccess.getInputAccess().getRangeTypeAssignment_1_0_7(), \"rule__Input__RangeTypeAssignment_1_0_7\");\n\t\t\t\t\tput(grammarAccess.getInputAccess().getRangeUnitsAssignment_1_0_9(), \"rule__Input__RangeUnitsAssignment_1_0_9\");\n\t\t\t\t\tput(grammarAccess.getInputAccess().getValuesAssignment_1_1_2(), \"rule__Input__ValuesAssignment_1_1_2\");\n\t\t\t\t\tput(grammarAccess.getInputAccess().getRateAssignment_2_1(), \"rule__Input__RateAssignment_2_1\");\n\t\t\t\t\tput(grammarAccess.getInputAccess().getVariablesAssignment_3_1(), \"rule__Input__VariablesAssignment_3_1\");\n\t\t\t\t\tput(grammarAccess.getInputAccess().getReferencesAssignment_4_1(), \"rule__Input__ReferencesAssignment_4_1\");\n\t\t\t\t\tput(grammarAccess.getInputAccess().getCommentsAssignment_5_1(), \"rule__Input__CommentsAssignment_5_1\");", "old_methods": [], "patch": "@@ -40,8 +40,6 @@ protected String getRuleName(AbstractElement element) {\n \t\t\t\t\tput(grammarAccess.getModeElementTypeAccess().getElementTypeAlternatives_0(), \"rule__ModeElementType__ElementTypeAlternatives_0\");\n \t\t\t\t\tput(grammarAccess.getStateValueAccess().getValueAlternatives_0(), \"rule__StateValue__ValueAlternatives_0\");\n \t\t\t\t\tput(grammarAccess.getTriggerAccess().getAlternatives(), \"rule__Trigger__Alternatives\");\n-\t\t\t\t\tput(grammarAccess.getOutputAccess().getAlternatives_1(), \"rule__Output__Alternatives_1\");\n-\t\t\t\t\tput(grammarAccess.getInputAccess().getAlternatives_1(), \"rule__Input__Alternatives_1\");\n \t\t\t\t\tput(grammarAccess.getSpecificationAccess().getGroup(), \"rule__Specification__Group__0\");\n \t\t\t\t\tput(grammarAccess.getSpecificationAccess().getGroup_2(), \"rule__Specification__Group_2__0\");\n \t\t\t\t\tput(grammarAccess.getBigDecimalTypeAccess().getGroup(), \"rule__BigDecimalType__Group__0\");\n@@ -73,9 +71,10 @@ protected String getRuleName(AbstractElement element) {\n \t\t\t\t\tput(grammarAccess.getTriggerAccess().getGroup_0(), \"rule__Trigger__Group_0__0\");\n \t\t\t\t\tput(grammarAccess.getTriggerAccess().getGroup_1(), \"rule__Trigger__Group_1__0\");\n \t\t\t\t\tput(grammarAccess.getTriggerTableAccess().getGroup(), \"rule__TriggerTable__Group__0\");\n+\t\t\t\t\tput(grammarAccess.getValueRangeAccess().getGroup(), \"rule__ValueRange__Group__0\");\n+\t\t\t\t\tput(grammarAccess.getValueListAccess().getGroup(), \"rule__ValueList__Group__0\");\n \t\t\t\t\tput(grammarAccess.getOutputAccess().getGroup(), \"rule__Output__Group__0\");\n-\t\t\t\t\tput(grammarAccess.getOutputAccess().getGroup_1_0(), \"rule__Output__Group_1_0__0\");\n-\t\t\t\t\tput(grammarAccess.getOutputAccess().getGroup_1_1(), \"rule__Output__Group_1_1__0\");\n+\t\t\t\t\tput(grammarAccess.getOutputAccess().getGroup_1(), \"rule__Output__Group_1__0\");\n \t\t\t\t\tput(grammarAccess.getOutputAccess().getGroup_2(), \"rule__Output__Group_2__0\");\n \t\t\t\t\tput(grammarAccess.getOutputAccess().getGroup_3(), \"rule__Output__Group_3__0\");\n \t\t\t\t\tput(grammarAccess.getOutputAccess().getGroup_4(), \"rule__Output__Group_4__0\");\n@@ -90,13 +89,21 @@ protected String getRuleName(AbstractElement element) {\n \t\t\t\t\tput(grammarAccess.getOutputAccess().getGroup_13(), \"rule__Output__Group_13__0\");\n \t\t\t\t\tput(grammarAccess.getOutputAccess().getGroup_14(), \"rule__Output__Group_14__0\");\n \t\t\t\t\tput(grammarAccess.getOutputAccess().getGroup_15(), \"rule__Output__Group_15__0\");\n+\t\t\t\t\tput(grammarAccess.getOutputAccess().getGroup_16(), \"rule__Output__Group_16__0\");\n \t\t\t\t\tput(grammarAccess.getInputAccess().getGroup(), \"rule__Input__Group__0\");\n-\t\t\t\t\tput(grammarAccess.getInputAccess().getGroup_1_0(), \"rule__Input__Group_1_0__0\");\n-\t\t\t\t\tput(grammarAccess.getInputAccess().getGroup_1_1(), \"rule__Input__Group_1_1__0\");\n+\t\t\t\t\tput(grammarAccess.getInputAccess().getGroup_1(), \"rule__Input__Group_1__0\");\n \t\t\t\t\tput(grammarAccess.getInputAccess().getGroup_2(), \"rule__Input__Group_2__0\");\n \t\t\t\t\tput(grammarAccess.getInputAccess().getGroup_3(), \"rule__Input__Group_3__0\");\n \t\t\t\t\tput(grammarAccess.getInputAccess().getGroup_4(), \"rule__Input__Group_4__0\");\n \t\t\t\t\tput(grammarAccess.getInputAccess().getGroup_5(), \"rule__Input__Group_5__0\");\n+\t\t\t\t\tput(grammarAccess.getInputAccess().getGroup_6(), \"rule__Input__Group_6__0\");\n+\t\t\t\t\tput(grammarAccess.getInputAccess().getGroup_7(), \"rule__Input__Group_7__0\");\n+\t\t\t\t\tput(grammarAccess.getInputAccess().getGroup_8(), \"rule__Input__Group_8__0\");\n+\t\t\t\t\tput(grammarAccess.getInputAccess().getGroup_9(), \"rule__Input__Group_9__0\");\n+\t\t\t\t\tput(grammarAccess.getInputAccess().getGroup_10(), \"rule__Input__Group_10__0\");\n+\t\t\t\t\tput(grammarAccess.getInputAccess().getGroup_11(), \"rule__Input__Group_11__0\");\n+\t\t\t\t\tput(grammarAccess.getInputAccess().getGroup_12(), \"rule__Input__Group_12__0\");\n+\t\t\t\t\tput(grammarAccess.getInputAccess().getGroup_13(), \"rule__Input__Group_13__0\");\n \t\t\t\t\tput(grammarAccess.getSpecificationAccess().getNameAssignment_1(), \"rule__Specification__NameAssignment_1\");\n \t\t\t\t\tput(grammarAccess.getSpecificationAccess().getDevicesAssignment_2_2(), \"rule__Specification__DevicesAssignment_2_2\");\n \t\t\t\t\tput(grammarAccess.getSpecificationAccess().getComponentsAssignment_3(), \"rule__Specification__ComponentsAssignment_3\");\n@@ -145,34 +152,40 @@ protected String getRuleName(AbstractElement element) {\n \t\t\t\t\tput(grammarAccess.getTriggerAccess().getValueAssignment_1_2(), \"rule__Trigger__ValueAssignment_1_2\");\n \t\t\t\t\tput(grammarAccess.getTriggerAccess().getListAssignment_1_3(), \"rule__Trigger__ListAssignment_1_3\");\n \t\t\t\t\tput(grammarAccess.getTriggerTableAccess().getRowsAssignment_2(), \"rule__TriggerTable__RowsAssignment_2\");\n-\t\t\t\t\tput(grammarAccess.getOutputAccess().getLowerAssignment_1_0_2(), \"rule__Output__LowerAssignment_1_0_2\");\n-\t\t\t\t\tput(grammarAccess.getOutputAccess().getUpperAssignment_1_0_4(), \"rule__Output__UpperAssignment_1_0_4\");\n-\t\t\t\t\tput(grammarAccess.getOutputAccess().getRangeTypeAssignment_1_0_7(), \"rule__Output__RangeTypeAssignment_1_0_7\");\n-\t\t\t\t\tput(grammarAccess.getOutputAccess().getRangeUnitsAssignment_1_0_9(), \"rule__Output__RangeUnitsAssignment_1_0_9\");\n-\t\t\t\t\tput(grammarAccess.getOutputAccess().getValuesAssignment_1_1_2(), \"rule__Output__ValuesAssignment_1_1_2\");\n-\t\t\t\t\tput(grammarAccess.getOutputAccess().getRateAssignment_2_1(), \"rule__Output__RateAssignment_2_1\");\n-\t\t\t\t\tput(grammarAccess.getOutputAccess().getDelayAssignment_3_1(), \"rule__Output__DelayAssignment_3_1\");\n-\t\t\t\t\tput(grammarAccess.getOutputAccess().getDeadlineAssignment_4_1(), \"rule__Output__DeadlineAssignment_4_1\");\n-\t\t\t\t\tput(grammarAccess.getOutputAccess().getCompletionHandlingAssignment_5_1(), \"rule__Output__CompletionHandlingAssignment_5_1\");\n-\t\t\t\t\tput(grammarAccess.getOutputAccess().getVariablesAssignment_6_1(), \"rule__Output__VariablesAssignment_6_1\");\n-\t\t\t\t\tput(grammarAccess.getOutputAccess().getRelationshipAssignment_7_1(), \"rule__Output__RelationshipAssignment_7_1\");\n-\t\t\t\t\tput(grammarAccess.getOutputAccess().getMinResponseAssignment_8_1(), \"rule__Output__MinResponseAssignment_8_1\");\n-\t\t\t\t\tput(grammarAccess.getOutputAccess().getMaxResponseAssignment_9_1(), \"rule__Output__MaxResponseAssignment_9_1\");\n-\t\t\t\t\tput(grammarAccess.getOutputAccess().getFeebackHandlingAssignment_10_1(), \"rule__Output__FeebackHandlingAssignment_10_1\");\n-\t\t\t\t\tput(grammarAccess.getOutputAccess().getReversedAssignment_11_1(), \"rule__Output__ReversedAssignment_11_1\");\n-\t\t\t\t\tput(grammarAccess.getOutputAccess().getReferencesAssignment_12_1(), \"rule__Output__ReferencesAssignment_12_1\");\n-\t\t\t\t\tput(grammarAccess.getOutputAccess().getCommentsAssignment_13_1(), \"rule__Output__CommentsAssignment_13_1\");\n-\t\t\t\t\tput(grammarAccess.getOutputAccess().getContentsAssignment_14_1(), \"rule__Output__ContentsAssignment_14_1\");\n-\t\t\t\t\tput(grammarAccess.getOutputAccess().getTableAssignment_15_1(), \"rule__Output__TableAssignment_15_1\");\n-\t\t\t\t\tput(grammarAccess.getInputAccess().getLowerAssignment_1_0_2(), \"rule__Input__LowerAssignment_1_0_2\");\n-\t\t\t\t\tput(grammarAccess.getInputAccess().getUpperAssignment_1_0_4(), \"rule__Input__UpperAssignment_1_0_4\");\n-\t\t\t\t\tput(grammarAccess.getInputAccess().getRangeTypeAssignment_1_0_7(), \"rule__Input__RangeTypeAssignment_1_0_7\");\n-\t\t\t\t\tput(grammarAccess.getInputAccess().getRangeUnitsAssignment_1_0_9(), \"rule__Input__RangeUnitsAssignment_1_0_9\");\n-\t\t\t\t\tput(grammarAccess.getInputAccess().getValuesAssignment_1_1_2(), \"rule__Input__ValuesAssignment_1_1_2\");\n-\t\t\t\t\tput(grammarAccess.getInputAccess().getRateAssignment_2_1(), \"rule__Input__RateAssignment_2_1\");\n-\t\t\t\t\tput(grammarAccess.getInputAccess().getVariablesAssignment_3_1(), \"rule__Input__VariablesAssignment_3_1\");\n-\t\t\t\t\tput(grammarAccess.getInputAccess().getReferencesAssignment_4_1(), \"rule__Input__ReferencesAssignment_4_1\");\n-\t\t\t\t\tput(grammarAccess.getInputAccess().getCommentsAssignment_5_1(), \"rule__Input__CommentsAssignment_5_1\");\n+\t\t\t\t\tput(grammarAccess.getValueRangeAccess().getLowerAssignment_1(), \"rule__ValueRange__LowerAssignment_1\");\n+\t\t\t\t\tput(grammarAccess.getValueRangeAccess().getUpperAssignment_3(), \"rule__ValueRange__UpperAssignment_3\");\n+\t\t\t\t\tput(grammarAccess.getValueRangeAccess().getRangeTypeAssignment_6(), \"rule__ValueRange__RangeTypeAssignment_6\");\n+\t\t\t\t\tput(grammarAccess.getValueRangeAccess().getRangeUnitsAssignment_8(), \"rule__ValueRange__RangeUnitsAssignment_8\");\n+\t\t\t\t\tput(grammarAccess.getValueListAccess().getValuesAssignment_1(), \"rule__ValueList__ValuesAssignment_1\");\n+\t\t\t\t\tput(grammarAccess.getOutputAccess().getRangeAssignment_1_1(), \"rule__Output__RangeAssignment_1_1\");\n+\t\t\t\t\tput(grammarAccess.getOutputAccess().getValueListAssignment_2_1(), \"rule__Output__ValueListAssignment_2_1\");\n+\t\t\t\t\tput(grammarAccess.getOutputAccess().getRateAssignment_3_1(), \"rule__Output__RateAssignment_3_1\");\n+\t\t\t\t\tput(grammarAccess.getOutputAccess().getDelayAssignment_4_1(), \"rule__Output__DelayAssignment_4_1\");\n+\t\t\t\t\tput(grammarAccess.getOutputAccess().getDeadlineAssignment_5_1(), \"rule__Output__DeadlineAssignment_5_1\");\n+\t\t\t\t\tput(grammarAccess.getOutputAccess().getCompletionHandlingAssignment_6_1(), \"rule__Output__CompletionHandlingAssignment_6_1\");\n+\t\t\t\t\tput(grammarAccess.getOutputAccess().getVariablesAssignment_7_1(), \"rule__Output__VariablesAssignment_7_1\");\n+\t\t\t\t\tput(grammarAccess.getOutputAccess().getRelationshipAssignment_8_1(), \"rule__Output__RelationshipAssignment_8_1\");\n+\t\t\t\t\tput(grammarAccess.getOutputAccess().getMinResponseAssignment_9_1(), \"rule__Output__MinResponseAssignment_9_1\");\n+\t\t\t\t\tput(grammarAccess.getOutputAccess().getMaxResponseAssignment_10_1(), \"rule__Output__MaxResponseAssignment_10_1\");\n+\t\t\t\t\tput(grammarAccess.getOutputAccess().getFeebackHandlingAssignment_11_1(), \"rule__Output__FeebackHandlingAssignment_11_1\");\n+\t\t\t\t\tput(grammarAccess.getOutputAccess().getReversedAssignment_12_1(), \"rule__Output__ReversedAssignment_12_1\");\n+\t\t\t\t\tput(grammarAccess.getOutputAccess().getReferencesAssignment_13_1(), \"rule__Output__ReferencesAssignment_13_1\");\n+\t\t\t\t\tput(grammarAccess.getOutputAccess().getCommentsAssignment_14_1(), \"rule__Output__CommentsAssignment_14_1\");\n+\t\t\t\t\tput(grammarAccess.getOutputAccess().getContentsAssignment_15_1(), \"rule__Output__ContentsAssignment_15_1\");\n+\t\t\t\t\tput(grammarAccess.getOutputAccess().getTableAssignment_16_1(), \"rule__Output__TableAssignment_16_1\");\n+\t\t\t\t\tput(grammarAccess.getInputAccess().getRangeAssignment_1_1(), \"rule__Input__RangeAssignment_1_1\");\n+\t\t\t\t\tput(grammarAccess.getInputAccess().getValueListAssignment_2_1(), \"rule__Input__ValueListAssignment_2_1\");\n+\t\t\t\t\tput(grammarAccess.getInputAccess().getValueHandlingAssignment_3_1(), \"rule__Input__ValueHandlingAssignment_3_1\");\n+\t\t\t\t\tput(grammarAccess.getInputAccess().getGranularityAssignment_4_1(), \"rule__Input__GranularityAssignment_4_1\");\n+\t\t\t\t\tput(grammarAccess.getInputAccess().getArrivalRateAvgAssignment_5_1(), \"rule__Input__ArrivalRateAvgAssignment_5_1\");\n+\t\t\t\t\tput(grammarAccess.getInputAccess().getArrivalRateMinimumAssignment_6_1(), \"rule__Input__ArrivalRateMinimumAssignment_6_1\");\n+\t\t\t\t\tput(grammarAccess.getInputAccess().getArrivalRateMaximumAssignment_7_1(), \"rule__Input__ArrivalRateMaximumAssignment_7_1\");\n+\t\t\t\t\tput(grammarAccess.getInputAccess().getObsolescenceAssignment_8_1(), \"rule__Input__ObsolescenceAssignment_8_1\");\n+\t\t\t\t\tput(grammarAccess.getInputAccess().getReferencesAssignment_9_1(), \"rule__Input__ReferencesAssignment_9_1\");\n+\t\t\t\t\tput(grammarAccess.getInputAccess().getAppearsInAssignment_10_1(), \"rule__Input__AppearsInAssignment_10_1\");\n+\t\t\t\t\tput(grammarAccess.getInputAccess().getDescriptionAssignment_11_1(), \"rule__Input__DescriptionAssignment_11_1\");\n+\t\t\t\t\tput(grammarAccess.getInputAccess().getCommentsAssignment_12_1(), \"rule__Input__CommentsAssignment_12_1\");\n+\t\t\t\t\tput(grammarAccess.getInputAccess().getStructureAssignment_13_1(), \"rule__Input__StructureAssignment_13_1\");\n \t\t\t\t}\n \t\t\t};\n \t\t}", "raw_url": "https://github.com/nasa/CertWare/raw/110fa3222ae2931978d7921dc8e6af8c7f43abd3/net.certware.intent.state.ui%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fstate%2Fui%2Fcontentassist%2Fantlr%2FStateSpecificationParser.java", "sha": "2c20d7dd63ef2490a4450e59991826d8cbd18684", "status": "modified" }, { "additions": 22, "blob_url": "https://github.com/nasa/CertWare/blob/110fa3222ae2931978d7921dc8e6af8c7f43abd3/net.certware.intent.state.ui%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fstate%2Fui%2Fcontentassist%2Fantlr%2Finternal%2FInternalStateSpecification.tokens", "changes": 28, "contents_url": "https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent.state.ui%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fstate%2Fui%2Fcontentassist%2Fantlr%2Finternal%2FInternalStateSpecification.tokens?ref=110fa3222ae2931978d7921dc8e6af8c7f43abd3", "deletions": 6, "filename": "net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.tokens", "new_code": "T__68=68\nT__66=66\nT__67=67\nT__64=64\nT__65=65\nT__62=62\nT__63=63\nT__61=61\n'value-exception'=59\n'type'=42\n'value-list'=44\n'...'=41\n'arrival-rate-maximum'=63\n'obsolescence'=64\n'inferred'=67\n'appears-in'=65\n'granularity'=60\n'initial'=68\n'arrival-rate-minimum'=62\n'description'=66\n'range'=43\n'arrival-rate-avg'=61", "new_methods": [], "old_code": "'type'=43\n'...'=42\n'values'=44\n'inferred'=59\n'initial'=60\n'range'=41", "old_methods": [], "patch": "@@ -1,7 +1,14 @@\n+T__68=68\n RULE_ID=5\n+T__66=66\n+T__67=67\n+T__64=64\n T__29=29\n+T__65=65\n T__28=28\n+T__62=62\n T__27=27\n+T__63=63\n T__26=26\n T__25=25\n T__24=24\n@@ -10,6 +17,7 @@ T__22=22\n RULE_ANY_OTHER=10\n T__21=21\n T__20=20\n+T__61=61\n T__60=60\n T__55=55\n T__56=56\n@@ -57,51 +65,59 @@ T__39=39\n RULE_WS=9\n 'rate'=45\n 'F'=15\n+'value-exception'=59\n 'initiation-delay'=46\n-'type'=43\n+'type'=42\n+'value-list'=44\n ';'=28\n 'value'=36\n '.'=16\n 'inputs'=26\n 'comments'=56\n 'max-response-time'=52\n '{'=30\n-'...'=42\n+'...'=41\n 'triggering'=58\n 'completion-deadline'=47\n 'completion-exception'=48\n '?'=17\n 'outputs'=27\n+'arrival-rate-maximum'=63\n 'device'=33\n '-'=22\n 'variables'=49\n 'input'=34\n 'other'=13\n ']'=21\n-'values'=44\n+'obsolescence'=64\n 'mode'=32\n 'references'=55\n 'T'=14\n 'supervisory'=11\n-'inferred'=59\n+'inferred'=67\n+'appears-in'=65\n+'granularity'=60\n 'contents'=57\n 'output'=37\n 'relationship'=50\n 'table'=40\n 'modes'=24\n 'source'=35\n 'operating'=12\n-'initial'=60\n+'initial'=68\n 'target'=38\n 'reversed-by'=54\n+'arrival-rate-minimum'=62\n 'specification'=18\n 'min-response-time'=51\n '}'=31\n 'states'=25\n 'units'=39\n-'range'=41\n+'description'=66\n+'range'=43\n 'feedback-exception'=53\n 'devices'=20\n 'state'=29\n '['=19\n+'arrival-rate-avg'=61\n 'component'=23", "raw_url": "https://github.com/nasa/CertWare/raw/110fa3222ae2931978d7921dc8e6af8c7f43abd3/net.certware.intent.state.ui%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fstate%2Fui%2Fcontentassist%2Fantlr%2Finternal%2FInternalStateSpecification.tokens", "sha": "5a48a42e5836cf5ab6c9fded29b3fe54fa36861e", "status": "modified" }, { "additions": 597, "blob_url": "https://github.com/nasa/CertWare/blob/110fa3222ae2931978d7921dc8e6af8c7f43abd3/net.certware.intent.state.ui%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fstate%2Fui%2Fcontentassist%2Fantlr%2Finternal%2FInternalStateSpecificationLexer.java", "changes": 885, "contents_url": "https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent.state.ui%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fstate%2Fui%2Fcontentassist%2Fantlr%2Finternal%2FInternalStateSpecificationLexer.java?ref=110fa3222ae2931978d7921dc8e6af8c7f43abd3", "deletions": 288, "filename": "net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecificationLexer.java", "new_code": " public static final int T__68=68;\n public static final int T__66=66;\n public static final int T__67=67;\n public static final int T__64=64;\n public static final int T__65=65;\n public static final int T__62=62;\n public static final int T__63=63;\n public static final int T__21=21;\n public static final int T__61=61;\n public static final int T__60=60;\n public static final int T__19=19;\n // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:41:7: ( '...' )\n // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:41:9: '...'\n match(\"...\"); \n // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:42:7: ( 'type' )\n // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:42:9: 'type'\n match(\"type\"); \n // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:43:7: ( 'range' )\n // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:43:9: 'range'\n match(\"range\"); \n // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:44:7: ( 'value-list' )\n // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:44:9: 'value-list'\n match(\"value-list\"); \n // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:59:7: ( 'value-exception' )\n // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:59:9: 'value-exception'\n match(\"value-exception\"); \n // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:60:7: ( 'granularity' )\n // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:60:9: 'granularity'\n match(\"granularity\"); \n // $ANTLR start \"T__61\"\n public final void mT__61() throws RecognitionException {\n try {\n int _type = T__61;\n int _channel = DEFAULT_TOKEN_CHANNEL;\n // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:61:7: ( 'arrival-rate-avg' )\n // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:61:9: 'arrival-rate-avg'\n {\n match(\"arrival-rate-avg\"); \n\n\n }\n\n state.type = _type;\n state.channel = _channel;\n }\n finally {\n }\n }\n // $ANTLR end \"T__61\"\n\n // $ANTLR start \"T__62\"\n public final void mT__62() throws RecognitionException {\n try {\n int _type = T__62;\n int _channel = DEFAULT_TOKEN_CHANNEL;\n // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:62:7: ( 'arrival-rate-minimum' )\n // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:62:9: 'arrival-rate-minimum'\n {\n match(\"arrival-rate-minimum\"); \n\n\n }\n\n state.type = _type;\n state.channel = _channel;\n }\n finally {\n }\n }\n // $ANTLR end \"T__62\"\n\n // $ANTLR start \"T__63\"\n public final void mT__63() throws RecognitionException {\n try {\n int _type = T__63;\n int _channel = DEFAULT_TOKEN_CHANNEL;\n // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:63:7: ( 'arrival-rate-maximum' )\n // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:63:9: 'arrival-rate-maximum'\n {\n match(\"arrival-rate-maximum\"); \n\n\n }\n\n state.type = _type;\n state.channel = _channel;\n }\n finally {\n }\n }\n // $ANTLR end \"T__63\"\n\n // $ANTLR start \"T__64\"\n public final void mT__64() throws RecognitionException {\n try {\n int _type = T__64;\n int _channel = DEFAULT_TOKEN_CHANNEL;\n // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:64:7: ( 'obsolescence' )\n // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:64:9: 'obsolescence'\n {\n match(\"obsolescence\"); \n\n\n }\n\n state.type = _type;\n state.channel = _channel;\n }\n finally {\n }\n }\n // $ANTLR end \"T__64\"\n\n // $ANTLR start \"T__65\"\n public final void mT__65() throws RecognitionException {\n try {\n int _type = T__65;\n int _channel = DEFAULT_TOKEN_CHANNEL;\n // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:65:7: ( 'appears-in' )\n // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:65:9: 'appears-in'\n {\n match(\"appears-in\"); \n\n\n }\n\n state.type = _type;\n state.channel = _channel;\n }\n finally {\n }\n }\n // $ANTLR end \"T__65\"\n\n // $ANTLR start \"T__66\"\n public final void mT__66() throws RecognitionException {\n try {\n int _type = T__66;\n int _channel = DEFAULT_TOKEN_CHANNEL;\n // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:66:7: ( 'description' )\n // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:66:9: 'description'\n {\n match(\"description\"); \n\n\n }\n\n state.type = _type;\n state.channel = _channel;\n }\n finally {\n }\n }\n // $ANTLR end \"T__66\"\n\n // $ANTLR start \"T__67\"\n public final void mT__67() throws RecognitionException {\n try {\n int _type = T__67;\n int _channel = DEFAULT_TOKEN_CHANNEL;\n // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:67:7: ( 'inferred' )\n // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:67:9: 'inferred'\n {\n match(\"inferred\"); \n\n\n }\n\n state.type = _type;\n state.channel = _channel;\n }\n finally {\n }\n }\n // $ANTLR end \"T__67\"\n\n // $ANTLR start \"T__68\"\n public final void mT__68() throws RecognitionException {\n try {\n int _type = T__68;\n int _channel = DEFAULT_TOKEN_CHANNEL;\n // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:68:7: ( 'initial' )\n // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:68:9: 'initial'\n {\n match(\"initial\"); \n\n\n }\n\n state.type = _type;\n state.channel = _channel;\n }\n finally {\n }\n }\n // $ANTLR end \"T__68\"\n\n // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:8564:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )\n // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:8564:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*\n // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:8564:11: ( '^' )?\n // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:8564:11: '^'\n // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:8564:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*\n // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:8566:10: ( ( '0' .. '9' )+ )\n // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:8566:12: ( '0' .. '9' )+\n // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:8566:12: ( '0' .. '9' )+\n \t // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:8566:13: '0' .. '9'\n // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:8568:13: ( ( '\\\"' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\"' ) ) )* '\\\"' | '\\\\'' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\\'' ) ) )* '\\\\'' ) )\n // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:8568:15: ( '\\\"' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\"' ) ) )* '\\\"' | '\\\\'' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\\'' ) ) )* '\\\\'' )\n // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:8568:15: ( '\\\"' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\"' ) ) )* '\\\"' | '\\\\'' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\\'' ) ) )* '\\\\'' )\n // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:8568:16: '\\\"' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\"' ) ) )* '\\\"'\n // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:8568:20: ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\"' ) ) )*\n \t // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:8568:21: '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' )\n \t // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:8568:66: ~ ( ( '\\\\\\\\' | '\\\"' ) )\n // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:8568:86: '\\\\'' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\\'' ) ) )* '\\\\''\n // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:8568:91: ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\\'' ) ) )*\n \t // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:8568:92: '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' )\n \t // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:8568:137: ~ ( ( '\\\\\\\\' | '\\\\'' ) )\n // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:8570:17: ( '/*' ( options {greedy=false; } : . )* '*/' )\n // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:8570:19: '/*' ( options {greedy=false; } : . )* '*/'\n // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:8570:24: ( options {greedy=false; } : . )*\n \t // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:8570:52: .\n // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:8572:17: ( '//' (~ ( ( '\\\\n' | '\\\\r' ) ) )* ( ( '\\\\r' )? '\\\\n' )? )\n // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:8572:19: '//' (~ ( ( '\\\\n' | '\\\\r' ) ) )* ( ( '\\\\r' )? '\\\\n' )?\n // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:8572:24: (~ ( ( '\\\\n' | '\\\\r' ) ) )*\n \t // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:8572:24: ~ ( ( '\\\\n' | '\\\\r' ) )\n // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:8572:40: ( ( '\\\\r' )? '\\\\n' )?\n // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:8572:41: ( '\\\\r' )? '\\\\n'\n // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:8572:41: ( '\\\\r' )?\n // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:8572:41: '\\\\r'\n // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:8574:9: ( ( ' ' | '\\\\t' | '\\\\r' | '\\\\n' )+ )\n // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:8574:11: ( ' ' | '\\\\t' | '\\\\r' | '\\\\n' )+\n // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:8574:11: ( ' ' | '\\\\t' | '\\\\r' | '\\\\n' )+\n // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:8576:16: ( . )\n // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:8576:18: .\n // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:1:8: ( T__11 | T__12 | T__13 | T__14 | T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | T__38 | T__39 | T__40 | T__41 | T__42 | T__43 | T__44 | T__45 | T__46 | T__47 | T__48 | T__49 | T__50 | T__51 | T__52 | T__53 | T__54 | T__55 | T__56 | T__57 | T__58 | T__59 | T__60 | T__61 | T__62 | T__63 | T__64 | T__65 | T__66 | T__67 | T__68 | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )\n int alt12=65;\n // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:1:310: T__61\n mT__61(); \n // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:1:316: T__62\n mT__62(); \n // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:1:322: T__63\n mT__63(); \n // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:1:328: T__64\n mT__64(); \n // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:1:334: T__65\n mT__65(); \n // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:1:340: T__66\n mT__66(); \n // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:1:346: T__67\n {\n mT__67(); \n\n }\n break;\n case 58 :\n // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:1:352: T__68\n {\n mT__68(); \n\n }\n break;\n case 59 :\n // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:1:358: RULE_ID\n {\n mRULE_ID(); \n\n }\n break;\n case 60 :\n // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:1:366: RULE_INT\n {\n mRULE_INT(); \n\n }\n break;\n case 61 :\n // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:1:375: RULE_STRING\n {\n mRULE_STRING(); \n\n }\n break;\n case 62 :\n // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:1:387: RULE_ML_COMMENT\n {\n mRULE_ML_COMMENT(); \n\n }\n break;\n case 63 :\n // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:1:403: RULE_SL_COMMENT\n {\n mRULE_SL_COMMENT(); \n\n }\n break;\n case 64 :\n // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:1:419: RULE_WS\n {\n mRULE_WS(); \n\n }\n break;\n case 65 :\n // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:1:427: RULE_ANY_OTHER\n \"\\1\\uffff\\2\\44\\1\\51\\1\\52\\1\\54\\2\\uffff\\1\\44\\2\\uffff\\3\\44\\3\\uffff\\7\"+\n \"\\44\\1\\37\\2\\uffff\\3\\37\\2\\uffff\\4\\44\\1\\uffff\\4\\44\\6\\uffff\\1\\44\\2\\uffff\"+\n \"\\5\\44\\3\\uffff\\13\\44\\5\\uffff\\57\\44\\1\\u009e\\2\\uffff\\7\\44\\1\\u00a6\\3\"+\n \"\\44\\1\\u00aa\\11\\44\\1\\u00b5\\2\\44\\1\\u00b8\\10\\44\\1\\u00c1\\1\\uffff\\1\\u00c3\"+\n \"\\2\\44\\1\\u00c7\\2\\44\\1\\u00ca\\1\\uffff\\1\\44\\1\\u00cc\\1\\u00cd\\1\\uffff\"+\n \"\\11\\44\\1\\u00d7\\1\\uffff\\1\\u00d8\\1\\44\\1\\uffff\\1\\u00db\\1\\44\\1\\u00de\"+\n \"\\5\\44\\1\\uffff\\1\\u00e4\\1\\uffff\\2\\44\\2\\uffff\\1\\44\\1\\u00eb\\1\\uffff\"+\n \"\\1\\44\\2\\uffff\\11\\44\\2\\uffff\\1\\44\\1\\u00f7\\1\\uffff\\1\\44\\1\\u00f9\\1\"+\n \"\\uffff\\5\\44\\1\\uffff\\1\\44\\1\\u0100\\1\\44\\2\\uffff\\1\\44\\1\\uffff\\13\\44\"+\n \"\\1\\uffff\\1\\44\\1\\uffff\\3\\44\\1\\u0112\\1\\u0113\\1\\44\\1\\uffff\\1\\u0115\"+\n \"\\7\\44\\2\\uffff\\2\\44\\1\\u0120\\2\\44\\1\\u0123\\1\\44\\2\\uffff\\1\\44\\1\\uffff\"+\n \"\\1\\u0126\\2\\44\\1\\uffff\\1\\44\\1\\uffff\\1\\44\\1\\uffff\\2\\44\\1\\uffff\\2\\44\"+\n \"\\1\\uffff\\2\\44\\1\\uffff\\1\\u0132\\1\\44\\1\\u0134\\1\\44\\1\\uffff\\1\\u0137\"+\n \"\\2\\44\\1\\u013a\\3\\uffff\\1\\44\\1\\uffff\\1\\u013e\\2\\uffff\\1\\44\\1\\u0141\"+\n \"\\3\\uffff\\1\\u0142\\2\\uffff\\1\\u0144\\10\\uffff\";\n \"\\u0149\\uffff\";\n \"\\1\\0\\1\\157\\1\\142\\2\\60\\1\\56\\2\\uffff\\1\\145\\2\\uffff\\1\\157\\1\\141\\1\\156\"+\n \"\\3\\uffff\\2\\141\\1\\156\\1\\141\\1\\145\\1\\162\\1\\160\\1\\101\\2\\uffff\\2\\0\\1\"+\n \"\\52\\2\\uffff\\1\\160\\1\\145\\1\\141\\1\\165\\1\\uffff\\1\\145\\1\\150\\1\\164\\1\"+\n \"\\163\\6\\uffff\\1\\163\\2\\uffff\\1\\155\\1\\144\\1\\156\\1\\170\\1\\146\\3\\uffff\"+\n \"\\1\\154\\1\\142\\1\\160\\2\\151\\1\\156\\1\\146\\1\\145\\1\\141\\1\\162\\1\\160\\5\\uffff\"+\n \"\\1\\145\\1\\143\\1\\164\\2\\162\\1\\145\\1\\160\\1\\157\\1\\151\\1\\143\\1\\155\\1\\164\"+\n \"\\1\\145\\2\\55\\1\\165\\1\\164\\1\\145\\1\\165\\1\\151\\1\\147\\1\\154\\1\\145\\1\\147\"+\n \"\\1\\164\\1\\147\\1\\145\\1\\141\\2\\145\\1\\144\\1\\156\\1\\151\\1\\145\\1\\162\\1\\151\"+\n \"\\1\\145\\1\\143\\1\\141\\1\\162\\1\\165\\1\\154\\1\\143\\1\\162\\1\\154\\2\\145\\1\\60\"+\n \"\\2\\uffff\\1\\164\\1\\151\\1\\162\\1\\145\\1\\141\\2\\145\\1\\60\\1\\147\\1\\163\\1\"+\n \"\\145\\1\\60\\1\\164\\2\\162\\1\\142\\1\\165\\1\\166\\1\\141\\1\\166\\1\\146\\1\\60\\1\"+\n \"\\145\\1\\164\\1\\60\\1\\164\\2\\145\\1\\151\\1\\156\\1\\145\\2\\156\\1\\60\\1\\uffff\"+\n \"\\1\\60\\1\\141\\1\\162\\1\\55\\1\\142\\1\\164\\1\\60\\1\\uffff\\1\\145\\2\\60\\1\\uffff\"+\n \"\\1\\151\\1\\163\\1\\145\\1\\141\\1\\154\\1\\141\\1\\162\\2\\151\\1\\60\\1\\uffff\\1\"+\n \"\\60\\1\\151\\1\\uffff\\1\\60\\1\\163\\1\\60\\1\\160\\1\\145\\3\\164\\1\\uffff\\1\\60\"+\n \"\\1\\uffff\\1\\154\\2\\145\\1\\uffff\\1\\154\\1\\60\\1\\uffff\\1\\162\\2\\uffff\\1\"+\n \"\\157\\1\\145\\1\\156\\1\\143\\1\\141\\1\\154\\2\\163\\1\\143\\2\\uffff\\1\\156\\1\\60\"+\n \"\\1\\uffff\\1\\143\\1\\60\\1\\uffff\\1\\164\\1\\156\\1\\151\\2\\163\\1\\uffff\\1\\151\"+\n \"\\1\\60\\1\\144\\2\\uffff\\1\\145\\1\\uffff\\1\\151\\1\\156\\1\\144\\1\\143\\1\\153\"+\n \"\\1\\162\\2\\55\\1\\157\\1\\141\\1\\147\\1\\uffff\\1\\145\\1\\uffff\\1\\151\\1\\164\"+\n \"\\1\\157\\2\\60\\1\\157\\1\\uffff\\1\\60\\1\\163\\1\\156\\1\\163\\1\\55\\1\\145\\1\\55\"+\n \"\\1\\151\\1\\162\\1\\uffff\\1\\162\\1\\164\\1\\60\\1\\156\\1\\157\\1\\60\\1\\156\\2\\uffff\"+\n \"\\1\\156\\1\\uffff\\1\\60\\1\\147\\1\\150\\1\\uffff\\1\\163\\1\\uffff\\1\\164\\1\\141\"+\n \"\\1\\171\\1\\151\\1\\uffff\\1\\143\\1\\156\\1\\uffff\\2\\55\\1\\uffff\\1\\60\\1\\151\"+\n \"\\1\\60\\1\\171\\1\\164\\1\\60\\1\\157\\1\\145\\1\\60\\1\\144\\2\\uffff\\1\\160\\1\\uffff\"+\n \"\\1\\60\\1\\145\\1\\uffff\\1\\156\\1\\60\\3\\uffff\\1\\60\\1\\uffff\\1\\55\\1\\60\\2\"+\n \"\\uffff\\1\\141\\2\\uffff\\1\\141\\2\\uffff\";\n \"\\1\\141\\1\\171\\1\\156\\2\\145\\2\\162\\1\\172\\2\\uffff\\2\\uffff\\1\\57\\2\\uffff\"+\n \"\\1\\160\\1\\145\\1\\141\\1\\165\\1\\uffff\\1\\145\\1\\150\\1\\164\\1\\163\\6\\uffff\"+\n \"\\1\\166\\2\\uffff\\1\\156\\1\\144\\1\\156\\1\\170\\1\\160\\3\\uffff\\2\\162\\1\\160\"+\n \"\\2\\151\\1\\164\\1\\166\\1\\145\\1\\141\\1\\162\\1\\160\\5\\uffff\\1\\145\\1\\143\\1\"+\n \"\\164\\2\\162\\1\\145\\1\\160\\1\\157\\1\\151\\1\\143\\1\\160\\1\\164\\1\\145\\2\\55\"+\n \"\\1\\165\\1\\164\\1\\145\\1\\165\\1\\151\\1\\147\\1\\154\\1\\145\\1\\147\\1\\164\\1\\147\"+\n \"\\1\\145\\1\\141\\2\\145\\1\\144\\1\\156\\1\\151\\1\\145\\1\\162\\1\\151\\1\\145\\1\\143\"+\n \"\\1\\141\\1\\162\\1\\165\\1\\154\\1\\143\\1\\162\\1\\157\\2\\145\\1\\172\\2\\uffff\\1\"+\n \"\\164\\1\\151\\1\\162\\1\\145\\1\\141\\2\\145\\1\\172\\1\\147\\1\\163\\1\\145\\1\\172\"+\n \"\\1\\164\\2\\162\\1\\142\\1\\165\\1\\166\\1\\141\\1\\166\\1\\146\\1\\172\\1\\145\\1\\164\"+\n \"\\1\\172\\1\\164\\2\\145\\1\\151\\1\\156\\1\\145\\2\\156\\1\\172\\1\\uffff\\1\\172\\1\"+\n \"\\141\\1\\162\\1\\172\\1\\142\\1\\164\\1\\172\\1\\uffff\\1\\145\\2\\172\\1\\uffff\\1\"+\n \"\\151\\1\\163\\1\\145\\1\\141\\1\\154\\1\\141\\1\\162\\2\\151\\1\\172\\1\\uffff\\1\\172\"+\n \"\\1\\151\\1\\uffff\\1\\172\\1\\163\\1\\172\\1\\160\\1\\145\\3\\164\\1\\uffff\\1\\172\"+\n \"\\1\\uffff\\1\\164\\1\\145\\1\\154\\1\\uffff\\1\\154\\1\\172\\1\\uffff\\1\\162\\2\\uffff\"+\n \"\\1\\157\\1\\145\\1\\156\\1\\143\\1\\141\\1\\154\\2\\163\\1\\143\\2\\uffff\\1\\156\\1\"+\n \"\\172\\1\\uffff\\1\\143\\1\\172\\1\\uffff\\1\\164\\1\\156\\1\\151\\2\\163\\1\\uffff\"+\n \"\\1\\151\\1\\172\\1\\144\\2\\uffff\\1\\145\\1\\uffff\\1\\151\\1\\156\\1\\144\\1\\143\"+\n \"\\1\\153\\1\\162\\2\\55\\1\\157\\1\\141\\1\\147\\1\\uffff\\1\\145\\1\\uffff\\1\\151\"+\n \"\\145\\1\\55\\1\\151\\1\\162\\1\\uffff\\1\\162\\1\\164\\1\\172\\1\\156\\1\\157\\1\\172\"+\n \"\\1\\156\\2\\uffff\\1\\156\\1\\uffff\\1\\172\\1\\147\\1\\150\\1\\uffff\\1\\163\\1\\uffff\"+\n \"\\1\\164\\1\\141\\1\\171\\1\\151\\1\\uffff\\1\\143\\1\\156\\1\\uffff\\2\\55\\1\\uffff\"+\n \"\\1\\172\\1\\151\\1\\172\\1\\171\\1\\164\\1\\172\\1\\157\\1\\145\\1\\172\\1\\145\\2\\uffff\"+\n \"\\1\\160\\1\\uffff\\1\\172\\1\\145\\1\\uffff\\1\\156\\1\\172\\3\\uffff\\1\\172\\1\\uffff\"+\n \"\\1\\55\\1\\172\\2\\uffff\\1\\155\\2\\uffff\\1\\151\\2\\uffff\";\n \"\\6\\uffff\\1\\7\\1\\11\\1\\uffff\\1\\13\\1\\14\\3\\uffff\\1\\22\\1\\24\\1\\25\\10\\uffff\"+\n \"\\1\\73\\1\\74\\3\\uffff\\1\\100\\1\\101\\4\\uffff\\1\\73\\4\\uffff\\1\\4\\1\\5\\1\\37\"+\n \"\\1\\6\\1\\7\\1\\11\\1\\uffff\\1\\13\\1\\14\\5\\uffff\\1\\22\\1\\24\\1\\25\\13\\uffff\"+\n \"\\1\\74\\1\\75\\1\\76\\1\\77\\1\\100\\60\\uffff\\1\\51\\1\\52\\42\\uffff\\1\\26\\7\\uffff\"+\n \"\\1\\40\\3\\uffff\\1\\43\\12\\uffff\\1\\23\\2\\uffff\\1\\3\\10\\uffff\\1\\16\\1\\uffff\"+\n \"\\1\\30\\3\\uffff\\1\\32\\2\\uffff\\1\\36\\1\\uffff\\1\\35\\1\\41\\11\\uffff\\1\\17\"+\n \"\\1\\31\\2\\uffff\\1\\33\\2\\uffff\\1\\27\\5\\uffff\\1\\20\\3\\uffff\\1\\42\\1\\61\\1\"+\n \"\\uffff\\1\\34\\13\\uffff\\1\\21\\1\\uffff\\1\\12\\6\\uffff\\1\\72\\11\\uffff\\1\\67\"+\n \"\\7\\uffff\\1\\56\\1\\57\\1\\uffff\\1\\71\\3\\uffff\\1\\54\\1\\uffff\\1\\53\\4\\uffff\"+\n \"\\1\\2\\2\\uffff\\1\\15\\2\\uffff\\1\\47\\12\\uffff\\1\\44\\1\\60\\1\\uffff\\1\\55\\2\"+\n \"\\uffff\\1\\1\\2\\uffff\\1\\70\\1\\45\\1\\46\\1\\uffff\\1\\62\\2\\uffff\\1\\66\\1\\50\"+\n \"\\1\\uffff\\1\\10\\1\\63\\1\\uffff\\1\\64\\1\\65\";\n \"\\1\\1\\32\\uffff\\1\\0\\1\\2\\u012c\\uffff}>\";\n \"\\11\\37\\2\\36\\2\\37\\1\\36\\22\\37\\1\\36\\1\\37\\1\\33\\4\\37\\1\\34\\5\\37\\1\"+\n \"\\12\\1\\5\\1\\35\\12\\32\\1\\37\\1\\16\\3\\37\\1\\6\\1\\37\\5\\31\\1\\4\\15\\31\\1\"+\n \"\\3\\6\\31\\1\\7\\1\\37\\1\\11\\1\\30\\1\\31\\1\\37\\1\\27\\1\\31\\1\\13\\1\\10\\1\\31\"+\n \"\\1\\25\\1\\26\\1\\31\\1\\15\\3\\31\\1\\14\\1\\31\\1\\2\\2\\31\\1\\24\\1\\1\\1\\22\\1\"+\n \"\\23\\1\\21\\4\\31\\1\\17\\1\\37\\1\\20\\uff82\\37\",\n \"\\1\\43\\1\\41\\3\\uffff\\1\\42\\1\\40\",\n \"\\1\\50\\15\\uffff\\1\\45\\3\\uffff\\1\\46\\1\\47\",\n \"\\12\\44\\7\\uffff\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\32\\44\",\n \"\\12\\44\\7\\uffff\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\32\\44\",\n \"\\1\\53\",\n \"\\1\\57\",\n \"\\1\\62\",\n \"\\1\\65\\7\\uffff\\1\\64\\5\\uffff\\1\\63\",\n \"\\1\\66\",\n \"\\1\\72\",\n \"\\1\\73\\20\\uffff\\1\\75\\6\\uffff\\1\\74\",\n \"\\1\\77\\3\\uffff\\1\\100\",\n \"\\1\\101\",\n \"\\1\\102\",\n \"\\1\\104\\1\\uffff\\1\\103\",\n \"\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\32\\44\",\n \"\\0\\106\",\n \"\\0\\106\",\n \"\\1\\107\\4\\uffff\\1\\110\",\n \"\\1\\114\",\n \"\\1\\115\",\n \"\\1\\121\",\n \"\",\n \"\\1\\123\\2\\uffff\\1\\122\",\n \"\",\n \"\",\n \"\\1\\124\\1\\125\",\n \"\\1\\126\",\n \"\\1\\127\",\n \"\\1\\130\",\n \"\\1\\133\\2\\uffff\\1\\132\\6\\uffff\\1\\131\",\n \"\\1\\134\\5\\uffff\\1\\135\",\n \"\\1\\137\\17\\uffff\\1\\136\",\n \"\\1\\140\",\n \"\\1\\143\\5\\uffff\\1\\144\",\n \"\\1\\147\\5\\uffff\\1\\145\\11\\uffff\\1\\146\",\n \"\\1\\151\",\n \"\\1\\152\",\n \"\",\n \"\",\n \"\",\n \"\",\n \"\",\n \"\\1\\167\\2\\uffff\\1\\166\",\n \"\\1\\u0087\",\n \"\\1\\u0088\",\n \"\\1\\u008b\",\n \"\\1\\u008c\",\n \"\\1\\u0094\",\n \"\\1\\u0098\",\n \"\\1\\u009a\\2\\uffff\\1\\u0099\",\n \"\\12\\44\\7\\uffff\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\22\\44\\1\\u009d\\7\\44\",\n \"\",\n \"\",\n \"\\1\\u009f\",\n \"\\1\\u00a0\",\n \"\\1\\u00a3\",\n \"\\12\\44\\7\\uffff\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\32\\44\",\n \"\\12\\44\\7\\uffff\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\32\\44\",\n \"\\1\\u00ab\",\n \"\\1\\u00ac\",\n \"\\1\\u00af\",\n \"\\1\\u00b0\",\n \"\\1\\u00b3\",\n \"\\12\\44\\7\\uffff\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\22\\44\\1\\u00b4\\7\\44\",\n \"\\1\\u00b6\",\n \"\\12\\44\\7\\uffff\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\32\\44\",\n \"\\1\\u00bd\",\n \"\\1\\u00be\",\n \"\\1\\u00c0\",\n \"\\12\\44\\7\\uffff\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\32\\44\",\n \"\\12\\44\\7\\uffff\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\22\\44\\1\\u00c2\\7\\44\",\n \"\\1\\u00c6\\2\\uffff\\12\\44\\7\\uffff\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\32\"+\n \"\\44\",\n \"\\1\\u00c8\",\n \"\\1\\u00c9\",\n \"\\12\\44\\7\\uffff\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\32\\44\",\n \"\\12\\44\\7\\uffff\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\32\\44\",\n \"\\12\\44\\7\\uffff\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\32\\44\",\n \"\\1\\u00ce\",\n \"\\12\\44\\7\\uffff\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\32\\44\",\n \"\\12\\44\\7\\uffff\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\32\\44\",\n \"\\12\\44\\7\\uffff\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\22\\44\\1\\u00da\\7\\44\",\n \"\\1\\u00dc\",\n \"\\12\\44\\7\\uffff\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\22\\44\\1\\u00dd\\7\\44\",\n \"\\12\\44\\7\\uffff\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\32\\44\",\n \"\",\n \"\\1\\u00e6\\7\\uffff\\1\\u00e5\",\n \"\\1\\u00e7\",\n \"\\1\\u00e9\\6\\uffff\\1\\u00e8\",\n \"\\12\\44\\7\\uffff\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\32\\44\",\n \"\",\n \"\\1\\u00ec\",\n \"\",\n \"\\1\\u00ed\",\n \"\\1\\u00ee\",\n \"\",\n \"\",\n \"\\12\\44\\7\\uffff\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\32\\44\",\n \"\\1\\u00f8\",\n \"\\12\\44\\7\\uffff\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\32\\44\",\n \"\\1\\u00fb\",\n \"\\12\\44\\7\\uffff\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\32\\44\",\n \"\\1\\u0101\",\n \"\\1\\u0103\",\n \"\\1\\u0105\",\n \"\\1\\u0106\",\n \"\\1\\u0108\",\n \"\\1\\u0109\",\n \"\\1\\u010a\",\n \"\\1\\u010b\",\n \"\\1\\u010c\",\n \"\\1\\u010d\",\n \"\\1\\u010e\",\n \"\\1\\u010f\",\n \"\\1\\u0110\",\n \"\\1\\u0111\",\n \"\\12\\44\\7\\uffff\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\32\\44\",\n \"\\12\\44\\7\\uffff\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\32\\44\",\n \"\\1\\u0114\",\n \"\\12\\44\\7\\uffff\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\32\\44\",\n \"\\1\\u0116\",\n \"\\1\\u0117\",\n \"\\1\\u0118\",\n \"\\1\\u0119\",\n \"\\1\\u011a\",\n \"\\1\\u011b\",\n \"\\1\\u011c\",\n \"\\1\\u011d\",\n \"\\1\\u011e\",\n \"\\1\\u011f\",\n \"\\12\\44\\7\\uffff\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\32\\44\",\n \"\\1\\u0121\",\n \"\\1\\u0122\",\n \"\\12\\44\\7\\uffff\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\32\\44\",\n \"\\1\\u0124\",\n \"\",\n \"\",\n \"\\1\\u0125\",\n \"\",\n \"\\12\\44\\7\\uffff\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\32\\44\",\n \"\\1\\u0127\",\n \"\\1\\u0128\",\n \"\",\n \"\\1\\u0129\",\n \"\",\n \"\\1\\u012a\",\n \"\\1\\u012b\",\n \"\\1\\u012c\",\n \"\\1\\u012d\",\n \"\\1\\u012e\",\n \"\\1\\u012f\",\n \"\\1\\u0130\",\n \"\\1\\u0131\",\n \"\",\n \"\\12\\44\\7\\uffff\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\32\\44\",\n \"\\1\\u0133\",\n \"\\12\\44\\7\\uffff\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\32\\44\",\n \"\\1\\u0135\",\n \"\\1\\u0136\",\n \"\\12\\44\\7\\uffff\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\32\\44\",\n \"\\1\\u0138\",\n \"\\1\\u0139\",\n \"\\12\\44\\7\\uffff\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\32\\44\",\n \"\\1\\u013b\\1\\u013c\",\n \"\",\n \"\",\n \"\\1\\u013d\",\n \"\",\n \"\\12\\44\\7\\uffff\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\32\\44\",\n \"\\1\\u013f\",\n \"\",\n \"\\1\\u0140\",\n \"\\12\\44\\7\\uffff\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\32\\44\",\n \"\",\n \"\",\n \"\",\n \"\\12\\44\\7\\uffff\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\32\\44\",\n \"\",\n \"\\1\\u0143\",\n \"\\12\\44\\7\\uffff\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\32\\44\",\n \"\",\n \"\",\n \"\\1\\u0145\\13\\uffff\\1\\u0146\",\n \"\",\n \"\",\n \"\\1\\u0148\\7\\uffff\\1\\u0147\",\n return \"1:1: Tokens : ( T__11 | T__12 | T__13 | T__14 | T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | T__38 | T__39 | T__40 | T__41 | T__42 | T__43 | T__44 | T__45 | T__46 | T__47 | T__48 | T__49 | T__50 | T__51 | T__52 | T__53 | T__54 | T__55 | T__56 | T__57 | T__58 | T__59 | T__60 | T__61 | T__62 | T__63 | T__64 | T__65 | T__66 | T__67 | T__68 | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER );\";\n int LA12_27 = input.LA(1);\n if ( ((LA12_27>='\\u0000' && LA12_27<='\\uFFFF')) ) {s = 70;}\n else s = 31;\n else if ( (LA12_0=='g') ) {s = 22;}\n\n else if ( (LA12_0=='a') ) {s = 23;}\n\n else if ( (LA12_0=='^') ) {s = 24;}\n else if ( ((LA12_0>='A' && LA12_0<='E')||(LA12_0>='G' && LA12_0<='S')||(LA12_0>='U' && LA12_0<='Z')||LA12_0=='_'||LA12_0=='b'||LA12_0=='e'||LA12_0=='h'||(LA12_0>='j' && LA12_0<='l')||LA12_0=='n'||(LA12_0>='p' && LA12_0<='q')||(LA12_0>='w' && LA12_0<='z')) ) {s = 25;}\n else if ( ((LA12_0>='0' && LA12_0<='9')) ) {s = 26;}\n else if ( (LA12_0=='\\\"') ) {s = 27;}\n else if ( (LA12_0=='\\'') ) {s = 28;}\n else if ( (LA12_0=='/') ) {s = 29;}\n else if ( ((LA12_0>='\\t' && LA12_0<='\\n')||LA12_0=='\\r'||LA12_0==' ') ) {s = 30;}\n else if ( ((LA12_0>='\\u0000' && LA12_0<='\\b')||(LA12_0>='\\u000B' && LA12_0<='\\f')||(LA12_0>='\\u000E' && LA12_0<='\\u001F')||LA12_0=='!'||(LA12_0>='#' && LA12_0<='&')||(LA12_0>='(' && LA12_0<=',')||LA12_0==':'||(LA12_0>='<' && LA12_0<='>')||LA12_0=='@'||LA12_0=='\\\\'||LA12_0=='`'||LA12_0=='|'||(LA12_0>='~' && LA12_0<='\\uFFFF')) ) {s = 31;}\n int LA12_28 = input.LA(1);\n if ( ((LA12_28>='\\u0000' && LA12_28<='\\uFFFF')) ) {s = 70;}\n else s = 31;", "new_methods": [], "old_code": " public static final int T__21=21;\n public static final int T__60=60;\n public static final int T__19=19;\n // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:41:7: ( 'range' )\n // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:41:9: 'range'\n match(\"range\"); \n // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:42:7: ( '...' )\n // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:42:9: '...'\n match(\"...\"); \n // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:43:7: ( 'type' )\n // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:43:9: 'type'\n match(\"type\"); \n // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:44:7: ( 'values' )\n // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:44:9: 'values'\n match(\"values\"); \n // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:59:7: ( 'inferred' )\n // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:59:9: 'inferred'\n match(\"inferred\"); \n // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:60:7: ( 'initial' )\n // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:60:9: 'initial'\n match(\"initial\"); \n // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:7966:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )\n // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:7966:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*\n // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:7966:11: ( '^' )?\n // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:7966:11: '^'\n // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:7966:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*\n // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:7968:10: ( ( '0' .. '9' )+ )\n // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:7968:12: ( '0' .. '9' )+\n // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:7968:12: ( '0' .. '9' )+\n \t // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:7968:13: '0' .. '9'\n // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:7970:13: ( ( '\\\"' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\"' ) ) )* '\\\"' | '\\\\'' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\\'' ) ) )* '\\\\'' ) )\n // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:7970:15: ( '\\\"' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\"' ) ) )* '\\\"' | '\\\\'' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\\'' ) ) )* '\\\\'' )\n // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:7970:15: ( '\\\"' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\"' ) ) )* '\\\"' | '\\\\'' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\\'' ) ) )* '\\\\'' )\n // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:7970:16: '\\\"' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\"' ) ) )* '\\\"'\n // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:7970:20: ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\"' ) ) )*\n \t // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:7970:21: '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' )\n \t // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:7970:66: ~ ( ( '\\\\\\\\' | '\\\"' ) )\n // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:7970:86: '\\\\'' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\\'' ) ) )* '\\\\''\n // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:7970:91: ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\\'' ) ) )*\n \t // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:7970:92: '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' )\n \t // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:7970:137: ~ ( ( '\\\\\\\\' | '\\\\'' ) )\n // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:7972:17: ( '/*' ( options {greedy=false; } : . )* '*/' )\n // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:7972:19: '/*' ( options {greedy=false; } : . )* '*/'\n // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:7972:24: ( options {greedy=false; } : . )*\n \t // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:7972:52: .\n // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:7974:17: ( '//' (~ ( ( '\\\\n' | '\\\\r' ) ) )* ( ( '\\\\r' )? '\\\\n' )? )\n // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:7974:19: '//' (~ ( ( '\\\\n' | '\\\\r' ) ) )* ( ( '\\\\r' )? '\\\\n' )?\n // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:7974:24: (~ ( ( '\\\\n' | '\\\\r' ) ) )*\n \t // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:7974:24: ~ ( ( '\\\\n' | '\\\\r' ) )\n // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:7974:40: ( ( '\\\\r' )? '\\\\n' )?\n // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:7974:41: ( '\\\\r' )? '\\\\n'\n // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:7974:41: ( '\\\\r' )?\n // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:7974:41: '\\\\r'\n // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:7976:9: ( ( ' ' | '\\\\t' | '\\\\r' | '\\\\n' )+ )\n // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:7976:11: ( ' ' | '\\\\t' | '\\\\r' | '\\\\n' )+\n // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:7976:11: ( ' ' | '\\\\t' | '\\\\r' | '\\\\n' )+\n // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:7978:16: ( . )\n // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:7978:18: .\n // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:1:8: ( T__11 | T__12 | T__13 | T__14 | T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | T__38 | T__39 | T__40 | T__41 | T__42 | T__43 | T__44 | T__45 | T__46 | T__47 | T__48 | T__49 | T__50 | T__51 | T__52 | T__53 | T__54 | T__55 | T__56 | T__57 | T__58 | T__59 | T__60 | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )\n int alt12=57;\n // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:1:310: RULE_ID\n mRULE_ID(); \n // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:1:318: RULE_INT\n mRULE_INT(); \n // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:1:327: RULE_STRING\n mRULE_STRING(); \n // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:1:339: RULE_ML_COMMENT\n mRULE_ML_COMMENT(); \n // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:1:355: RULE_SL_COMMENT\n mRULE_SL_COMMENT(); \n // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:1:371: RULE_WS\n mRULE_WS(); \n // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:1:379: RULE_ANY_OTHER\n \"\\1\\uffff\\2\\42\\1\\46\\1\\47\\1\\51\\2\\uffff\\1\\42\\2\\uffff\\3\\42\\3\\uffff\\5\"+\n \"\\42\\1\\35\\2\\uffff\\3\\35\\2\\uffff\\4\\42\\1\\uffff\\3\\42\\6\\uffff\\1\\42\\2\\uffff\"+\n \"\\5\\42\\3\\uffff\\10\\42\\5\\uffff\\50\\42\\1\\u008c\\2\\uffff\\7\\42\\1\\u0094\\3\"+\n \"\\42\\1\\u0098\\6\\42\\1\\u00a0\\2\\42\\1\\u00a3\\6\\42\\1\\u00aa\\1\\uffff\\1\\u00ac\"+\n \"\\2\\42\\1\\u00b0\\2\\42\\1\\u00b3\\1\\uffff\\1\\42\\1\\u00b5\\1\\u00b6\\1\\uffff\"+\n \"\\6\\42\\1\\u00bd\\1\\uffff\\1\\u00be\\1\\42\\1\\uffff\\1\\u00c1\\1\\u00c3\\4\\42\"+\n \"\\1\\uffff\\1\\u00c8\\1\\uffff\\2\\42\\1\\u00cc\\1\\uffff\\1\\42\\1\\u00ce\\1\\uffff\"+\n \"\\1\\42\\2\\uffff\\6\\42\\2\\uffff\\1\\42\\1\\u00d7\\1\\uffff\\1\\u00d8\\1\\uffff\"+\n \"\\4\\42\\1\\uffff\\1\\42\\1\\u00de\\1\\42\\1\\uffff\\1\\42\\1\\uffff\\10\\42\\2\\uffff\"+\n \"\\2\\42\\1\\u00eb\\1\\u00ec\\1\\42\\1\\uffff\\1\\u00ee\\10\\42\\1\\u00f7\\1\\u00f8\"+\n \"\\1\\42\\2\\uffff\\1\\42\\1\\uffff\\1\\u00fb\\2\\42\\1\\uffff\\1\\42\\1\\uffff\\2\\42\"+\n \"\\2\\uffff\\2\\42\\1\\uffff\\1\\u0103\\1\\42\\1\\u0105\\1\\u0106\\1\\42\\3\\uffff\"+\n \"\\1\\42\\2\\uffff\\1\\42\\2\\uffff\\1\\u010c\\1\\u010d\\2\\uffff\";\n \"\\u010e\\uffff\";\n \"\\1\\0\\1\\157\\1\\160\\2\\60\\1\\56\\2\\uffff\\1\\145\\2\\uffff\\1\\157\\1\\141\\1\\156\"+\n \"\\3\\uffff\\2\\141\\1\\156\\1\\141\\1\\145\\1\\101\\2\\uffff\\2\\0\\1\\52\\2\\uffff\"+\n \"\\1\\160\\1\\145\\1\\141\\1\\165\\1\\uffff\\1\\145\\1\\150\\1\\164\\6\\uffff\\1\\166\"+\n \"\\2\\uffff\\1\\155\\1\\144\\1\\156\\1\\170\\1\\146\\3\\uffff\\1\\154\\1\\142\\1\\160\"+\n \"\\2\\151\\1\\156\\1\\146\\1\\145\\5\\uffff\\1\\145\\1\\143\\1\\164\\2\\162\\1\\145\\1\"+\n \"\\160\\1\\151\\1\\155\\1\\164\\1\\145\\2\\55\\1\\165\\1\\164\\1\\145\\1\\165\\1\\151\"+\n \"\\1\\147\\1\\154\\1\\145\\1\\147\\1\\164\\1\\147\\1\\145\\1\\141\\2\\145\\1\\144\\1\\162\"+\n \"\\1\\151\\1\\145\\1\\143\\1\\141\\1\\162\\1\\165\\1\\143\\1\\154\\2\\145\\1\\60\\2\\uffff\"+\n \"\\1\\164\\1\\151\\1\\162\\1\\145\\1\\141\\2\\145\\1\\60\\1\\147\\1\\163\\1\\145\\1\\60\"+\n \"\\1\\164\\2\\162\\1\\142\\1\\166\\1\\146\\1\\60\\1\\145\\1\\164\\1\\60\\1\\164\\1\\145\"+\n \"\\1\\156\\1\\145\\2\\156\\1\\60\\1\\uffff\\1\\60\\1\\141\\1\\162\\1\\60\\1\\142\\1\\164\"+\n \"\\1\\60\\1\\uffff\\1\\145\\2\\60\\1\\uffff\\1\\151\\1\\163\\1\\145\\1\\141\\2\\151\\1\"+\n \"\\60\\1\\uffff\\1\\60\\1\\151\\1\\uffff\\2\\60\\1\\145\\3\\164\\1\\uffff\\1\\60\\1\\uffff\"+\n \"\\1\\154\\1\\145\\1\\60\\1\\uffff\\1\\154\\1\\60\\1\\uffff\\1\\162\\2\\uffff\\1\\157\"+\n \"\\1\\145\\1\\156\\1\\143\\1\\163\\1\\143\\2\\uffff\\1\\156\\1\\60\\1\\uffff\\1\\60\\1\"+\n \"\\uffff\\1\\156\\1\\151\\2\\163\\1\\uffff\\1\\151\\1\\60\\1\\144\\1\\uffff\\1\\145\"+\n \"\\1\\uffff\\1\\151\\1\\156\\1\\144\\1\\143\\1\\153\\1\\157\\1\\141\\1\\147\\2\\uffff\"+\n \"\\1\\164\\1\\157\\2\\60\\1\\157\\1\\uffff\\1\\60\\1\\163\\1\\156\\1\\163\\1\\55\\1\\145\"+\n \"\\1\\55\\1\\162\\1\\164\\2\\60\\1\\156\\2\\uffff\\1\\156\\1\\uffff\\1\\60\\1\\147\\1\"+\n \"\\150\\1\\uffff\\1\\163\\1\\uffff\\1\\171\\1\\151\\2\\uffff\\2\\55\\1\\uffff\\1\\60\"+\n \"\\1\\151\\2\\60\\1\\157\\1\\144\\2\\uffff\\1\\160\\2\\uffff\\1\\156\\2\\uffff\\2\\60\"+\n \"\\2\\uffff\";\n \"\\1\\141\\1\\171\\1\\156\\2\\145\\1\\172\\2\\uffff\\2\\uffff\\1\\57\\2\\uffff\\1\\160\"+\n \"\\1\\145\\1\\141\\1\\165\\1\\uffff\\1\\145\\1\\150\\1\\164\\6\\uffff\\1\\166\\2\\uffff\"+\n \"\\1\\156\\1\\144\\1\\156\\1\\170\\1\\160\\3\\uffff\\2\\162\\1\\160\\2\\151\\1\\164\\1\"+\n \"\\166\\1\\145\\5\\uffff\\1\\145\\1\\143\\1\\164\\2\\162\\1\\145\\1\\160\\1\\151\\1\\160\"+\n \"\\1\\164\\1\\145\\2\\55\\1\\165\\1\\164\\1\\145\\1\\165\\1\\151\\1\\147\\1\\154\\1\\145\"+\n \"\\1\\147\\1\\164\\1\\147\\1\\145\\1\\141\\2\\145\\1\\144\\1\\162\\1\\151\\1\\145\\1\\143\"+\n \"\\1\\141\\1\\162\\1\\165\\1\\143\\1\\157\\2\\145\\1\\172\\2\\uffff\\1\\164\\1\\151\\1\"+\n \"\\162\\1\\145\\1\\141\\2\\145\\1\\172\\1\\147\\1\\163\\1\\145\\1\\172\\1\\164\\2\\162\"+\n \"\\1\\142\\1\\166\\1\\146\\1\\172\\1\\145\\1\\164\\1\\172\\1\\164\\1\\145\\1\\156\\1\\145\"+\n \"\\2\\156\\1\\172\\1\\uffff\\1\\172\\1\\141\\1\\162\\1\\172\\1\\142\\1\\164\\1\\172\\1\"+\n \"\\uffff\\1\\145\\2\\172\\1\\uffff\\1\\151\\1\\163\\1\\145\\1\\141\\2\\151\\1\\172\\1\"+\n \"\\uffff\\1\\172\\1\\151\\1\\uffff\\2\\172\\1\\145\\3\\164\\1\\uffff\\1\\172\\1\\uffff\"+\n \"\\1\\164\\1\\145\\1\\172\\1\\uffff\\1\\154\\1\\172\\1\\uffff\\1\\162\\2\\uffff\\1\\157\"+\n \"\\1\\145\\1\\156\\1\\143\\1\\163\\1\\143\\2\\uffff\\1\\156\\1\\172\\1\\uffff\\1\\172\"+\n \"\\1\\uffff\\1\\156\\1\\151\\2\\163\\1\\uffff\\1\\151\\1\\172\\1\\144\\1\\uffff\\1\\145\"+\n \"\\1\\uffff\\1\\151\\1\\156\\1\\144\\1\\143\\1\\153\\1\\157\\1\\141\\1\\147\\2\\uffff\"+\n \"\\145\\1\\55\\1\\162\\1\\164\\2\\172\\1\\156\\2\\uffff\\1\\156\\1\\uffff\\1\\172\\1\"+\n \"\\147\\1\\150\\1\\uffff\\1\\163\\1\\uffff\\1\\171\\1\\151\\2\\uffff\\2\\55\\1\\uffff\"+\n \"\\1\\172\\1\\151\\2\\172\\1\\157\\1\\145\\2\\uffff\\1\\160\\2\\uffff\\1\\156\\2\\uffff\"+\n \"\\2\\172\\2\\uffff\";\n \"\\6\\uffff\\1\\7\\1\\11\\1\\uffff\\1\\13\\1\\14\\3\\uffff\\1\\22\\1\\24\\1\\25\\6\\uffff\"+\n \"\\1\\63\\1\\64\\3\\uffff\\1\\70\\1\\71\\4\\uffff\\1\\63\\3\\uffff\\1\\4\\1\\5\\1\\40\\1\"+\n \"\\6\\1\\7\\1\\11\\1\\uffff\\1\\13\\1\\14\\5\\uffff\\1\\22\\1\\24\\1\\25\\10\\uffff\\1\"+\n \"\\64\\1\\65\\1\\66\\1\\67\\1\\70\\51\\uffff\\1\\51\\1\\52\\35\\uffff\\1\\26\\7\\uffff\"+\n \"\\1\\41\\3\\uffff\\1\\43\\7\\uffff\\1\\23\\2\\uffff\\1\\3\\6\\uffff\\1\\16\\1\\uffff\"+\n \"\\1\\30\\3\\uffff\\1\\32\\2\\uffff\\1\\36\\1\\uffff\\1\\35\\1\\37\\6\\uffff\\1\\17\\1\"+\n \"\\31\\2\\uffff\\1\\33\\1\\uffff\\1\\27\\4\\uffff\\1\\20\\3\\uffff\\1\\42\\1\\uffff\"+\n \"\\1\\34\\10\\uffff\\1\\21\\1\\12\\5\\uffff\\1\\62\\14\\uffff\\1\\56\\1\\57\\1\\uffff\"+\n \"\\1\\61\\3\\uffff\\1\\54\\1\\uffff\\1\\53\\2\\uffff\\1\\2\\1\\15\\2\\uffff\\1\\47\\6\"+\n \"\\uffff\\1\\44\\1\\60\\1\\uffff\\1\\55\\1\\1\\1\\uffff\\1\\45\\1\\46\\2\\uffff\\1\\50\"+\n \"\\1\\10\";\n \"\\1\\1\\30\\uffff\\1\\2\\1\\0\\u00f3\\uffff}>\";\n \"\\11\\35\\2\\34\\2\\35\\1\\34\\22\\35\\1\\34\\1\\35\\1\\31\\4\\35\\1\\32\\5\\35\\1\"+\n \"\\12\\1\\5\\1\\33\\12\\30\\1\\35\\1\\16\\3\\35\\1\\6\\1\\35\\5\\27\\1\\4\\15\\27\\1\"+\n \"\\3\\6\\27\\1\\7\\1\\35\\1\\11\\1\\26\\1\\27\\1\\35\\2\\27\\1\\13\\1\\10\\1\\27\\1\\25\"+\n \"\\2\\27\\1\\15\\3\\27\\1\\14\\1\\27\\1\\2\\2\\27\\1\\24\\1\\1\\1\\22\\1\\23\\1\\21\\4\"+\n \"\\27\\1\\17\\1\\35\\1\\20\\uff82\\35\",\n \"\\1\\41\\1\\37\\3\\uffff\\1\\40\\1\\36\",\n \"\\1\\43\\3\\uffff\\1\\44\\1\\45\",\n \"\\12\\42\\7\\uffff\\32\\42\\4\\uffff\\1\\42\\1\\uffff\\32\\42\",\n \"\\12\\42\\7\\uffff\\32\\42\\4\\uffff\\1\\42\\1\\uffff\\32\\42\",\n \"\\1\\50\",\n \"\\1\\54\",\n \"\\1\\57\",\n \"\\1\\62\\7\\uffff\\1\\61\\5\\uffff\\1\\60\",\n \"\\1\\63\",\n \"\\1\\67\",\n \"\\1\\70\\20\\uffff\\1\\72\\6\\uffff\\1\\71\",\n \"\\1\\73\",\n \"\\1\\74\\3\\uffff\\1\\75\",\n \"\\32\\42\\4\\uffff\\1\\42\\1\\uffff\\32\\42\",\n \"\",\n \"\\0\\100\",\n \"\\0\\100\",\n \"\\1\\101\\4\\uffff\\1\\102\",\n \"\\1\\104\",\n \"\\1\\105\",\n \"\\1\\106\",\n \"\\1\\107\",\n \"\\1\\110\",\n \"\\1\\111\",\n \"\",\n \"\",\n \"\",\n \"\",\n \"\",\n \"\",\n \"\",\n \"\\1\\114\\1\\115\",\n \"\\1\\123\\2\\uffff\\1\\122\\6\\uffff\\1\\121\",\n \"\\1\\124\\5\\uffff\\1\\125\",\n \"\\1\\127\\17\\uffff\\1\\126\",\n \"\\1\\130\",\n \"\\1\\131\",\n \"\\1\\132\",\n \"\\1\\133\\5\\uffff\\1\\134\",\n \"\\1\\137\\5\\uffff\\1\\135\\11\\uffff\\1\\136\",\n \"\\1\\140\",\n \"\\1\\143\",\n \"\\1\\144\",\n \"\\1\\145\",\n \"\\1\\146\",\n \"\\1\\147\",\n \"\\1\\152\\2\\uffff\\1\\151\",\n \"\\1\\166\",\n \"\\1\\167\",\n \"\\1\\u0088\\2\\uffff\\1\\u0087\",\n \"\\12\\42\\7\\uffff\\32\\42\\4\\uffff\\1\\42\\1\\uffff\\22\\42\\1\\u008b\\7\\42\",\n \"\",\n \"\",\n \"\\12\\42\\7\\uffff\\32\\42\\4\\uffff\\1\\42\\1\\uffff\\32\\42\",\n \"\\12\\42\\7\\uffff\\32\\42\\4\\uffff\\1\\42\\1\\uffff\\32\\42\",\n \"\\1\\u0099\",\n \"\\1\\u009a\",\n \"\\1\\u009d\",\n \"\\1\\u009e\",\n \"\\12\\42\\7\\uffff\\32\\42\\4\\uffff\\1\\42\\1\\uffff\\22\\42\\1\\u009f\\7\\42\",\n \"\\12\\42\\7\\uffff\\32\\42\\4\\uffff\\1\\42\\1\\uffff\\32\\42\",\n \"\\1\\u00a6\",\n \"\\12\\42\\7\\uffff\\32\\42\\4\\uffff\\1\\42\\1\\uffff\\32\\42\",\n \"\",\n \"\\12\\42\\7\\uffff\\32\\42\\4\\uffff\\1\\42\\1\\uffff\\22\\42\\1\\u00ab\\7\\42\",\n \"\\12\\42\\7\\uffff\\32\\42\\4\\uffff\\1\\42\\1\\uffff\\22\\42\\1\\u00af\\7\\42\",\n \"\\12\\42\\7\\uffff\\32\\42\\4\\uffff\\1\\42\\1\\uffff\\32\\42\",\n \"\",\n \"\\1\\u00b4\",\n \"\\12\\42\\7\\uffff\\32\\42\\4\\uffff\\1\\42\\1\\uffff\\32\\42\",\n \"\\12\\42\\7\\uffff\\32\\42\\4\\uffff\\1\\42\\1\\uffff\\32\\42\",\n \"\",\n \"\\1\\u00b8\",\n \"\\12\\42\\7\\uffff\\32\\42\\4\\uffff\\1\\42\\1\\uffff\\32\\42\",\n \"\",\n \"\\12\\42\\7\\uffff\\32\\42\\4\\uffff\\1\\42\\1\\uffff\\32\\42\",\n \"\\12\\42\\7\\uffff\\32\\42\\4\\uffff\\1\\42\\1\\uffff\\22\\42\\1\\u00c0\\7\\42\",\n \"\\12\\42\\7\\uffff\\32\\42\\4\\uffff\\1\\42\\1\\uffff\\22\\42\\1\\u00c2\\7\\42\",\n \"\\1\\u00c6\",\n \"\\1\\u00c7\",\n \"\\12\\42\\7\\uffff\\32\\42\\4\\uffff\\1\\42\\1\\uffff\\32\\42\",\n \"\",\n \"\\1\\u00ca\\7\\uffff\\1\\u00c9\",\n \"\\12\\42\\7\\uffff\\32\\42\\4\\uffff\\1\\42\\1\\uffff\\32\\42\",\n \"\",\n \"\\1\\u00cd\",\n \"\\12\\42\\7\\uffff\\32\\42\\4\\uffff\\1\\42\\1\\uffff\\32\\42\",\n \"\",\n \"\",\n \"\",\n \"\",\n \"\\12\\42\\7\\uffff\\32\\42\\4\\uffff\\1\\42\\1\\uffff\\32\\42\",\n \"\",\n \"\\12\\42\\7\\uffff\\32\\42\\4\\uffff\\1\\42\\1\\uffff\\32\\42\",\n \"\\1\\u00da\",\n \"\\1\\u00db\",\n \"\\1\\u00dc\",\n \"\\1\\u00dd\",\n \"\\12\\42\\7\\uffff\\32\\42\\4\\uffff\\1\\42\\1\\uffff\\32\\42\",\n \"\",\n \"\",\n \"\\1\\u00e4\",\n \"\\1\\u00e5\",\n \"\\1\\u00e6\",\n \"\\1\\u00e7\",\n \"\\1\\u00e8\",\n \"\\1\\u00e9\",\n \"\\12\\42\\7\\uffff\\32\\42\\4\\uffff\\1\\42\\1\\uffff\\32\\42\",\n \"\\12\\42\\7\\uffff\\32\\42\\4\\uffff\\1\\42\\1\\uffff\\32\\42\",\n \"\\1\\u00ed\",\n \"\\12\\42\\7\\uffff\\32\\42\\4\\uffff\\1\\42\\1\\uffff\\32\\42\",\n \"\\12\\42\\7\\uffff\\32\\42\\4\\uffff\\1\\42\\1\\uffff\\32\\42\",\n \"\\12\\42\\7\\uffff\\32\\42\\4\\uffff\\1\\42\\1\\uffff\\32\\42\",\n \"\\1\\u00f9\",\n \"\",\n \"\\12\\42\\7\\uffff\\32\\42\\4\\uffff\\1\\42\\1\\uffff\\32\\42\",\n \"\",\n \"\\1\\u0100\",\n \"\\1\\u0101\",\n \"\\12\\42\\7\\uffff\\32\\42\\4\\uffff\\1\\42\\1\\uffff\\32\\42\",\n \"\\12\\42\\7\\uffff\\32\\42\\4\\uffff\\1\\42\\1\\uffff\\32\\42\",\n \"\\12\\42\\7\\uffff\\32\\42\\4\\uffff\\1\\42\\1\\uffff\\32\\42\",\n \"\\1\\u0108\\1\\u0109\",\n \"\\1\\u010a\",\n \"\\1\\u010b\",\n \"\\12\\42\\7\\uffff\\32\\42\\4\\uffff\\1\\42\\1\\uffff\\32\\42\",\n \"\\12\\42\\7\\uffff\\32\\42\\4\\uffff\\1\\42\\1\\uffff\\32\\42\",\n return \"1:1: Tokens : ( T__11 | T__12 | T__13 | T__14 | T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | T__38 | T__39 | T__40 | T__41 | T__42 | T__43 | T__44 | T__45 | T__46 | T__47 | T__48 | T__49 | T__50 | T__51 | T__52 | T__53 | T__54 | T__55 | T__56 | T__57 | T__58 | T__59 | T__60 | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER );\";\n int LA12_26 = input.LA(1);\n if ( ((LA12_26>='\\u0000' && LA12_26<='\\uFFFF')) ) {s = 64;}\n else s = 29;\n else if ( (LA12_0=='^') ) {s = 22;}\n else if ( ((LA12_0>='A' && LA12_0<='E')||(LA12_0>='G' && LA12_0<='S')||(LA12_0>='U' && LA12_0<='Z')||LA12_0=='_'||(LA12_0>='a' && LA12_0<='b')||LA12_0=='e'||(LA12_0>='g' && LA12_0<='h')||(LA12_0>='j' && LA12_0<='l')||LA12_0=='n'||(LA12_0>='p' && LA12_0<='q')||(LA12_0>='w' && LA12_0<='z')) ) {s = 23;}\n else if ( ((LA12_0>='0' && LA12_0<='9')) ) {s = 24;}\n else if ( (LA12_0=='\\\"') ) {s = 25;}\n else if ( (LA12_0=='\\'') ) {s = 26;}\n else if ( (LA12_0=='/') ) {s = 27;}\n else if ( ((LA12_0>='\\t' && LA12_0<='\\n')||LA12_0=='\\r'||LA12_0==' ') ) {s = 28;}\n else if ( ((LA12_0>='\\u0000' && LA12_0<='\\b')||(LA12_0>='\\u000B' && LA12_0<='\\f')||(LA12_0>='\\u000E' && LA12_0<='\\u001F')||LA12_0=='!'||(LA12_0>='#' && LA12_0<='&')||(LA12_0>='(' && LA12_0<=',')||LA12_0==':'||(LA12_0>='<' && LA12_0<='>')||LA12_0=='@'||LA12_0=='\\\\'||LA12_0=='`'||LA12_0=='|'||(LA12_0>='~' && LA12_0<='\\uFFFF')) ) {s = 29;}\n int LA12_25 = input.LA(1);\n if ( ((LA12_25>='\\u0000' && LA12_25<='\\uFFFF')) ) {s = 64;}\n else s = 29;", "old_methods": [], "patch": "@@ -12,23 +12,31 @@\n \n @SuppressWarnings(\"all\")\n public class InternalStateSpecificationLexer extends Lexer {\n+ public static final int T__68=68;\n public static final int RULE_ID=5;\n+ public static final int T__66=66;\n+ public static final int T__67=67;\n public static final int T__29=29;\n+ public static final int T__64=64;\n public static final int T__28=28;\n+ public static final int T__65=65;\n public static final int T__27=27;\n+ public static final int T__62=62;\n public static final int T__26=26;\n+ public static final int T__63=63;\n public static final int T__25=25;\n public static final int T__24=24;\n public static final int T__23=23;\n public static final int T__22=22;\n- public static final int T__21=21;\n public static final int RULE_ANY_OTHER=10;\n+ public static final int T__21=21;\n public static final int T__20=20;\n- public static final int T__60=60;\n+ public static final int T__61=61;\n public static final int EOF=-1;\n+ public static final int T__60=60;\n public static final int T__55=55;\n- public static final int T__19=19;\n public static final int T__56=56;\n+ public static final int T__19=19;\n public static final int T__57=57;\n public static final int T__58=58;\n public static final int T__51=51;\n@@ -709,10 +717,10 @@ public final void mT__41() throws RecognitionException {\n try {\n int _type = T__41;\n int _channel = DEFAULT_TOKEN_CHANNEL;\n- // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:41:7: ( 'range' )\n- // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:41:9: 'range'\n+ // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:41:7: ( '...' )\n+ // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:41:9: '...'\n {\n- match(\"range\"); \n+ match(\"...\"); \n \n \n }\n@@ -730,10 +738,10 @@ public final void mT__42() throws RecognitionException {\n try {\n int _type = T__42;\n int _channel = DEFAULT_TOKEN_CHANNEL;\n- // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:42:7: ( '...' )\n- // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:42:9: '...'\n+ // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:42:7: ( 'type' )\n+ // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:42:9: 'type'\n {\n- match(\"...\"); \n+ match(\"type\"); \n \n \n }\n@@ -751,10 +759,10 @@ public final void mT__43() throws RecognitionException {\n try {\n int _type = T__43;\n int _channel = DEFAULT_TOKEN_CHANNEL;\n- // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:43:7: ( 'type' )\n- // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:43:9: 'type'\n+ // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:43:7: ( 'range' )\n+ // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:43:9: 'range'\n {\n- match(\"type\"); \n+ match(\"range\"); \n \n \n }\n@@ -772,10 +780,10 @@ public final void mT__44() throws RecognitionException {\n try {\n int _type = T__44;\n int _channel = DEFAULT_TOKEN_CHANNEL;\n- // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:44:7: ( 'values' )\n- // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:44:9: 'values'\n+ // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:44:7: ( 'value-list' )\n+ // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:44:9: 'value-list'\n {\n- match(\"values\"); \n+ match(\"value-list\"); \n \n \n }\n@@ -1087,10 +1095,10 @@ public final void mT__59() throws RecognitionException {\n try {\n int _type = T__59;\n int _channel = DEFAULT_TOKEN_CHANNEL;\n- // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:59:7: ( 'inferred' )\n- // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:59:9: 'inferred'\n+ // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:59:7: ( 'value-exception' )\n+ // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:59:9: 'value-exception'\n {\n- match(\"inferred\"); \n+ match(\"value-exception\"); \n \n \n }\n@@ -1108,10 +1116,10 @@ public final void mT__60() throws RecognitionException {\n try {\n int _type = T__60;\n int _channel = DEFAULT_TOKEN_CHANNEL;\n- // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:60:7: ( 'initial' )\n- // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:60:9: 'initial'\n+ // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:60:7: ( 'granularity' )\n+ // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:60:9: 'granularity'\n {\n- match(\"initial\"); \n+ match(\"granularity\"); \n \n \n }\n@@ -1124,15 +1132,183 @@ public final void mT__60() throws RecognitionException {\n }\n // $ANTLR end \"T__60\"\n \n+ // $ANTLR start \"T__61\"\n+ public final void mT__61() throws RecognitionException {\n+ try {\n+ int _type = T__61;\n+ int _channel = DEFAULT_TOKEN_CHANNEL;\n+ // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:61:7: ( 'arrival-rate-avg' )\n+ // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:61:9: 'arrival-rate-avg'\n+ {\n+ match(\"arrival-rate-avg\"); \n+\n+\n+ }\n+\n+ state.type = _type;\n+ state.channel = _channel;\n+ }\n+ finally {\n+ }\n+ }\n+ // $ANTLR end \"T__61\"\n+\n+ // $ANTLR start \"T__62\"\n+ public final void mT__62() throws RecognitionException {\n+ try {\n+ int _type = T__62;\n+ int _channel = DEFAULT_TOKEN_CHANNEL;\n+ // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:62:7: ( 'arrival-rate-minimum' )\n+ // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:62:9: 'arrival-rate-minimum'\n+ {\n+ match(\"arrival-rate-minimum\"); \n+\n+\n+ }\n+\n+ state.type = _type;\n+ state.channel = _channel;\n+ }\n+ finally {\n+ }\n+ }\n+ // $ANTLR end \"T__62\"\n+\n+ // $ANTLR start \"T__63\"\n+ public final void mT__63() throws RecognitionException {\n+ try {\n+ int _type = T__63;\n+ int _channel = DEFAULT_TOKEN_CHANNEL;\n+ // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:63:7: ( 'arrival-rate-maximum' )\n+ // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:63:9: 'arrival-rate-maximum'\n+ {\n+ match(\"arrival-rate-maximum\"); \n+\n+\n+ }\n+\n+ state.type = _type;\n+ state.channel = _channel;\n+ }\n+ finally {\n+ }\n+ }\n+ // $ANTLR end \"T__63\"\n+\n+ // $ANTLR start \"T__64\"\n+ public final void mT__64() throws RecognitionException {\n+ try {\n+ int _type = T__64;\n+ int _channel = DEFAULT_TOKEN_CHANNEL;\n+ // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:64:7: ( 'obsolescence' )\n+ // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:64:9: 'obsolescence'\n+ {\n+ match(\"obsolescence\"); \n+\n+\n+ }\n+\n+ state.type = _type;\n+ state.channel = _channel;\n+ }\n+ finally {\n+ }\n+ }\n+ // $ANTLR end \"T__64\"\n+\n+ // $ANTLR start \"T__65\"\n+ public final void mT__65() throws RecognitionException {\n+ try {\n+ int _type = T__65;\n+ int _channel = DEFAULT_TOKEN_CHANNEL;\n+ // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:65:7: ( 'appears-in' )\n+ // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:65:9: 'appears-in'\n+ {\n+ match(\"appears-in\"); \n+\n+\n+ }\n+\n+ state.type = _type;\n+ state.channel = _channel;\n+ }\n+ finally {\n+ }\n+ }\n+ // $ANTLR end \"T__65\"\n+\n+ // $ANTLR start \"T__66\"\n+ public final void mT__66() throws RecognitionException {\n+ try {\n+ int _type = T__66;\n+ int _channel = DEFAULT_TOKEN_CHANNEL;\n+ // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:66:7: ( 'description' )\n+ // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:66:9: 'description'\n+ {\n+ match(\"description\"); \n+\n+\n+ }\n+\n+ state.type = _type;\n+ state.channel = _channel;\n+ }\n+ finally {\n+ }\n+ }\n+ // $ANTLR end \"T__66\"\n+\n+ // $ANTLR start \"T__67\"\n+ public final void mT__67() throws RecognitionException {\n+ try {\n+ int _type = T__67;\n+ int _channel = DEFAULT_TOKEN_CHANNEL;\n+ // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:67:7: ( 'inferred' )\n+ // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:67:9: 'inferred'\n+ {\n+ match(\"inferred\"); \n+\n+\n+ }\n+\n+ state.type = _type;\n+ state.channel = _channel;\n+ }\n+ finally {\n+ }\n+ }\n+ // $ANTLR end \"T__67\"\n+\n+ // $ANTLR start \"T__68\"\n+ public final void mT__68() throws RecognitionException {\n+ try {\n+ int _type = T__68;\n+ int _channel = DEFAULT_TOKEN_CHANNEL;\n+ // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:68:7: ( 'initial' )\n+ // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:68:9: 'initial'\n+ {\n+ match(\"initial\"); \n+\n+\n+ }\n+\n+ state.type = _type;\n+ state.channel = _channel;\n+ }\n+ finally {\n+ }\n+ }\n+ // $ANTLR end \"T__68\"\n+\n // $ANTLR start \"RULE_ID\"\n public final void mRULE_ID() throws RecognitionException {\n try {\n int _type = RULE_ID;\n int _channel = DEFAULT_TOKEN_CHANNEL;\n- // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:7966:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )\n- // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:7966:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*\n+ // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:8564:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )\n+ // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:8564:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*\n {\n- // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:7966:11: ( '^' )?\n+ // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:8564:11: ( '^' )?\n int alt1=2;\n int LA1_0 = input.LA(1);\n \n@@ -1141,7 +1317,7 @@ public final void mRULE_ID() throws RecognitionException {\n }\n switch (alt1) {\n case 1 :\n- // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:7966:11: '^'\n+ // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:8564:11: '^'\n {\n match('^'); \n \n@@ -1159,7 +1335,7 @@ public final void mRULE_ID() throws RecognitionException {\n recover(mse);\n throw mse;}\n \n- // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:7966:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*\n+ // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:8564:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*\n loop2:\n do {\n int alt2=2;\n@@ -1208,10 +1384,10 @@ public final void mRULE_INT() throws RecognitionException {\n try {\n int _type = RULE_INT;\n int _channel = DEFAULT_TOKEN_CHANNEL;\n- // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:7968:10: ( ( '0' .. '9' )+ )\n- // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:7968:12: ( '0' .. '9' )+\n+ // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:8566:10: ( ( '0' .. '9' )+ )\n+ // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:8566:12: ( '0' .. '9' )+\n {\n- // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:7968:12: ( '0' .. '9' )+\n+ // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:8566:12: ( '0' .. '9' )+\n int cnt3=0;\n loop3:\n do {\n@@ -1225,7 +1401,7 @@ public final void mRULE_INT() throws RecognitionException {\n \n switch (alt3) {\n \tcase 1 :\n- \t // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:7968:13: '0' .. '9'\n+ \t // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:8566:13: '0' .. '9'\n \t {\n \t matchRange('0','9'); \n \n@@ -1257,10 +1433,10 @@ public final void mRULE_STRING() throws RecognitionException {\n try {\n int _type = RULE_STRING;\n int _channel = DEFAULT_TOKEN_CHANNEL;\n- // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:7970:13: ( ( '\\\"' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\"' ) ) )* '\\\"' | '\\\\'' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\\'' ) ) )* '\\\\'' ) )\n- // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:7970:15: ( '\\\"' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\"' ) ) )* '\\\"' | '\\\\'' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\\'' ) ) )* '\\\\'' )\n+ // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:8568:13: ( ( '\\\"' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\"' ) ) )* '\\\"' | '\\\\'' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\\'' ) ) )* '\\\\'' ) )\n+ // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:8568:15: ( '\\\"' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\"' ) ) )* '\\\"' | '\\\\'' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\\'' ) ) )* '\\\\'' )\n {\n- // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:7970:15: ( '\\\"' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\"' ) ) )* '\\\"' | '\\\\'' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\\'' ) ) )* '\\\\'' )\n+ // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:8568:15: ( '\\\"' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\"' ) ) )* '\\\"' | '\\\\'' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\\'' ) ) )* '\\\\'' )\n int alt6=2;\n int LA6_0 = input.LA(1);\n \n@@ -1278,10 +1454,10 @@ else if ( (LA6_0=='\\'') ) {\n }\n switch (alt6) {\n case 1 :\n- // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:7970:16: '\\\"' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\"' ) ) )* '\\\"'\n+ // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:8568:16: '\\\"' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\"' ) ) )* '\\\"'\n {\n match('\\\"'); \n- // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:7970:20: ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\"' ) ) )*\n+ // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:8568:20: ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\"' ) ) )*\n loop4:\n do {\n int alt4=3;\n@@ -1297,7 +1473,7 @@ else if ( ((LA4_0>='\\u0000' && LA4_0<='!')||(LA4_0>='#' && LA4_0<='[')||(LA4_0>=\n \n switch (alt4) {\n \tcase 1 :\n- \t // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:7970:21: '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' )\n+ \t // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:8568:21: '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' )\n \t {\n \t match('\\\\'); \n \t if ( input.LA(1)=='\\\"'||input.LA(1)=='\\''||input.LA(1)=='\\\\'||input.LA(1)=='b'||input.LA(1)=='f'||input.LA(1)=='n'||input.LA(1)=='r'||(input.LA(1)>='t' && input.LA(1)<='u') ) {\n@@ -1313,7 +1489,7 @@ else if ( ((LA4_0>='\\u0000' && LA4_0<='!')||(LA4_0>='#' && LA4_0<='[')||(LA4_0>=\n \t }\n \t break;\n \tcase 2 :\n- \t // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:7970:66: ~ ( ( '\\\\\\\\' | '\\\"' ) )\n+ \t // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:8568:66: ~ ( ( '\\\\\\\\' | '\\\"' ) )\n \t {\n \t if ( (input.LA(1)>='\\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\\uFFFF') ) {\n \t input.consume();\n@@ -1338,10 +1514,10 @@ else if ( ((LA4_0>='\\u0000' && LA4_0<='!')||(LA4_0>='#' && LA4_0<='[')||(LA4_0>=\n }\n break;\n case 2 :\n- // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:7970:86: '\\\\'' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\\'' ) ) )* '\\\\''\n+ // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:8568:86: '\\\\'' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\\'' ) ) )* '\\\\''\n {\n match('\\''); \n- // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:7970:91: ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\\'' ) ) )*\n+ // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:8568:91: ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\\'' ) ) )*\n loop5:\n do {\n int alt5=3;\n@@ -1357,7 +1533,7 @@ else if ( ((LA5_0>='\\u0000' && LA5_0<='&')||(LA5_0>='(' && LA5_0<='[')||(LA5_0>=\n \n switch (alt5) {\n \tcase 1 :\n- \t // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:7970:92: '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' )\n+ \t // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:8568:92: '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' )\n \t {\n \t match('\\\\'); \n \t if ( input.LA(1)=='\\\"'||input.LA(1)=='\\''||input.LA(1)=='\\\\'||input.LA(1)=='b'||input.LA(1)=='f'||input.LA(1)=='n'||input.LA(1)=='r'||(input.LA(1)>='t' && input.LA(1)<='u') ) {\n@@ -1373,7 +1549,7 @@ else if ( ((LA5_0>='\\u0000' && LA5_0<='&')||(LA5_0>='(' && LA5_0<='[')||(LA5_0>=\n \t }\n \t break;\n \tcase 2 :\n- \t // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:7970:137: ~ ( ( '\\\\\\\\' | '\\\\'' ) )\n+ \t // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:8568:137: ~ ( ( '\\\\\\\\' | '\\\\'' ) )\n \t {\n \t if ( (input.LA(1)>='\\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\\uFFFF') ) {\n \t input.consume();\n@@ -1416,12 +1592,12 @@ public final void mRULE_ML_COMMENT() throws RecognitionException {\n try {\n int _type = RULE_ML_COMMENT;\n int _channel = DEFAULT_TOKEN_CHANNEL;\n- // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:7972:17: ( '/*' ( options {greedy=false; } : . )* '*/' )\n- // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:7972:19: '/*' ( options {greedy=false; } : . )* '*/'\n+ // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:8570:17: ( '/*' ( options {greedy=false; } : . )* '*/' )\n+ // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:8570:19: '/*' ( options {greedy=false; } : . )* '*/'\n {\n match(\"/*\"); \n \n- // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:7972:24: ( options {greedy=false; } : . )*\n+ // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:8570:24: ( options {greedy=false; } : . )*\n loop7:\n do {\n int alt7=2;\n@@ -1446,7 +1622,7 @@ else if ( ((LA7_0>='\\u0000' && LA7_0<=')')||(LA7_0>='+' && LA7_0<='\\uFFFF')) ) {\n \n switch (alt7) {\n \tcase 1 :\n- \t // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:7972:52: .\n+ \t // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:8570:52: .\n \t {\n \t matchAny(); \n \n@@ -1476,12 +1652,12 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {\n try {\n int _type = RULE_SL_COMMENT;\n int _channel = DEFAULT_TOKEN_CHANNEL;\n- // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:7974:17: ( '//' (~ ( ( '\\\\n' | '\\\\r' ) ) )* ( ( '\\\\r' )? '\\\\n' )? )\n- // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:7974:19: '//' (~ ( ( '\\\\n' | '\\\\r' ) ) )* ( ( '\\\\r' )? '\\\\n' )?\n+ // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:8572:17: ( '//' (~ ( ( '\\\\n' | '\\\\r' ) ) )* ( ( '\\\\r' )? '\\\\n' )? )\n+ // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:8572:19: '//' (~ ( ( '\\\\n' | '\\\\r' ) ) )* ( ( '\\\\r' )? '\\\\n' )?\n {\n match(\"//\"); \n \n- // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:7974:24: (~ ( ( '\\\\n' | '\\\\r' ) ) )*\n+ // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:8572:24: (~ ( ( '\\\\n' | '\\\\r' ) ) )*\n loop8:\n do {\n int alt8=2;\n@@ -1494,7 +1670,7 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {\n \n switch (alt8) {\n \tcase 1 :\n- \t // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:7974:24: ~ ( ( '\\\\n' | '\\\\r' ) )\n+ \t // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:8572:24: ~ ( ( '\\\\n' | '\\\\r' ) )\n \t {\n \t if ( (input.LA(1)>='\\u0000' && input.LA(1)<='\\t')||(input.LA(1)>='\\u000B' && input.LA(1)<='\\f')||(input.LA(1)>='\\u000E' && input.LA(1)<='\\uFFFF') ) {\n \t input.consume();\n@@ -1514,7 +1690,7 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {\n }\n } while (true);\n \n- // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:7974:40: ( ( '\\\\r' )? '\\\\n' )?\n+ // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:8572:40: ( ( '\\\\r' )? '\\\\n' )?\n int alt10=2;\n int LA10_0 = input.LA(1);\n \n@@ -1523,9 +1699,9 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {\n }\n switch (alt10) {\n case 1 :\n- // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:7974:41: ( '\\\\r' )? '\\\\n'\n+ // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:8572:41: ( '\\\\r' )? '\\\\n'\n {\n- // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:7974:41: ( '\\\\r' )?\n+ // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:8572:41: ( '\\\\r' )?\n int alt9=2;\n int LA9_0 = input.LA(1);\n \n@@ -1534,7 +1710,7 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {\n }\n switch (alt9) {\n case 1 :\n- // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:7974:41: '\\\\r'\n+ // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:8572:41: '\\\\r'\n {\n match('\\r'); \n \n@@ -1566,10 +1742,10 @@ public final void mRULE_WS() throws RecognitionException {\n try {\n int _type = RULE_WS;\n int _channel = DEFAULT_TOKEN_CHANNEL;\n- // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:7976:9: ( ( ' ' | '\\\\t' | '\\\\r' | '\\\\n' )+ )\n- // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:7976:11: ( ' ' | '\\\\t' | '\\\\r' | '\\\\n' )+\n+ // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:8574:9: ( ( ' ' | '\\\\t' | '\\\\r' | '\\\\n' )+ )\n+ // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:8574:11: ( ' ' | '\\\\t' | '\\\\r' | '\\\\n' )+\n {\n- // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:7976:11: ( ' ' | '\\\\t' | '\\\\r' | '\\\\n' )+\n+ // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:8574:11: ( ' ' | '\\\\t' | '\\\\r' | '\\\\n' )+\n int cnt11=0;\n loop11:\n do {\n@@ -1623,8 +1799,8 @@ public final void mRULE_ANY_OTHER() throws RecognitionException {\n try {\n int _type = RULE_ANY_OTHER;\n int _channel = DEFAULT_TOKEN_CHANNEL;\n- // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:7978:16: ( . )\n- // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:7978:18: .\n+ // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:8576:16: ( . )\n+ // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:8576:18: .\n {\n matchAny(); \n \n@@ -1639,8 +1815,8 @@ public final void mRULE_ANY_OTHER() throws RecognitionException {\n // $ANTLR end \"RULE_ANY_OTHER\"\n \n public void mTokens() throws RecognitionException {\n- // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:1:8: ( T__11 | T__12 | T__13 | T__14 | T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | T__38 | T__39 | T__40 | T__41 | T__42 | T__43 | T__44 | T__45 | T__46 | T__47 | T__48 | T__49 | T__50 | T__51 | T__52 | T__53 | T__54 | T__55 | T__56 | T__57 | T__58 | T__59 | T__60 | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )\n- int alt12=57;\n+ // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:1:8: ( T__11 | T__12 | T__13 | T__14 | T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | T__38 | T__39 | T__40 | T__41 | T__42 | T__43 | T__44 | T__45 | T__46 | T__47 | T__48 | T__49 | T__50 | T__51 | T__52 | T__53 | T__54 | T__55 | T__56 | T__57 | T__58 | T__59 | T__60 | T__61 | T__62 | T__63 | T__64 | T__65 | T__66 | T__67 | T__68 | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )\n+ int alt12=65;\n alt12 = dfa12.predict(input);\n switch (alt12) {\n case 1 :\n@@ -1994,49 +2170,105 @@ public void mTokens() throws RecognitionException {\n }\n break;\n case 51 :\n- // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:1:310: RULE_ID\n+ // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:1:310: T__61\n {\n- mRULE_ID(); \n+ mT__61(); \n \n }\n break;\n case 52 :\n- // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:1:318: RULE_INT\n+ // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:1:316: T__62\n {\n- mRULE_INT(); \n+ mT__62(); \n \n }\n break;\n case 53 :\n- // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:1:327: RULE_STRING\n+ // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:1:322: T__63\n {\n- mRULE_STRING(); \n+ mT__63(); \n \n }\n break;\n case 54 :\n- // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:1:339: RULE_ML_COMMENT\n+ // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:1:328: T__64\n {\n- mRULE_ML_COMMENT(); \n+ mT__64(); \n \n }\n break;\n case 55 :\n- // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:1:355: RULE_SL_COMMENT\n+ // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:1:334: T__65\n {\n- mRULE_SL_COMMENT(); \n+ mT__65(); \n \n }\n break;\n case 56 :\n- // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:1:371: RULE_WS\n+ // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:1:340: T__66\n {\n- mRULE_WS(); \n+ mT__66(); \n \n }\n break;\n case 57 :\n- // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:1:379: RULE_ANY_OTHER\n+ // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:1:346: T__67\n+ {\n+ mT__67(); \n+\n+ }\n+ break;\n+ case 58 :\n+ // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:1:352: T__68\n+ {\n+ mT__68(); \n+\n+ }\n+ break;\n+ case 59 :\n+ // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:1:358: RULE_ID\n+ {\n+ mRULE_ID(); \n+\n+ }\n+ break;\n+ case 60 :\n+ // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:1:366: RULE_INT\n+ {\n+ mRULE_INT(); \n+\n+ }\n+ break;\n+ case 61 :\n+ // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:1:375: RULE_STRING\n+ {\n+ mRULE_STRING(); \n+\n+ }\n+ break;\n+ case 62 :\n+ // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:1:387: RULE_ML_COMMENT\n+ {\n+ mRULE_ML_COMMENT(); \n+\n+ }\n+ break;\n+ case 63 :\n+ // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:1:403: RULE_SL_COMMENT\n+ {\n+ mRULE_SL_COMMENT(); \n+\n+ }\n+ break;\n+ case 64 :\n+ // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:1:419: RULE_WS\n+ {\n+ mRULE_WS(); \n+\n+ }\n+ break;\n+ case 65 :\n+ // ../net.certware.intent.state.ui/src-gen/net/certware/intent/state/ui/contentassist/antlr/internal/InternalStateSpecification.g:1:427: RULE_ANY_OTHER\n {\n mRULE_ANY_OTHER(); \n \n@@ -2050,164 +2282,173 @@ public void mTokens() throws RecognitionException {\n \n protected DFA12 dfa12 = new DFA12(this);\n static final String DFA12_eotS =\n- \"\\1\\uffff\\2\\42\\1\\46\\1\\47\\1\\51\\2\\uffff\\1\\42\\2\\uffff\\3\\42\\3\\uffff\\5\"+\n- \"\\42\\1\\35\\2\\uffff\\3\\35\\2\\uffff\\4\\42\\1\\uffff\\3\\42\\6\\uffff\\1\\42\\2\\uffff\"+\n- \"\\5\\42\\3\\uffff\\10\\42\\5\\uffff\\50\\42\\1\\u008c\\2\\uffff\\7\\42\\1\\u0094\\3\"+\n- \"\\42\\1\\u0098\\6\\42\\1\\u00a0\\2\\42\\1\\u00a3\\6\\42\\1\\u00aa\\1\\uffff\\1\\u00ac\"+\n- \"\\2\\42\\1\\u00b0\\2\\42\\1\\u00b3\\1\\uffff\\1\\42\\1\\u00b5\\1\\u00b6\\1\\uffff\"+\n- \"\\6\\42\\1\\u00bd\\1\\uffff\\1\\u00be\\1\\42\\1\\uffff\\1\\u00c1\\1\\u00c3\\4\\42\"+\n- \"\\1\\uffff\\1\\u00c8\\1\\uffff\\2\\42\\1\\u00cc\\1\\uffff\\1\\42\\1\\u00ce\\1\\uffff\"+\n- \"\\1\\42\\2\\uffff\\6\\42\\2\\uffff\\1\\42\\1\\u00d7\\1\\uffff\\1\\u00d8\\1\\uffff\"+\n- \"\\4\\42\\1\\uffff\\1\\42\\1\\u00de\\1\\42\\1\\uffff\\1\\42\\1\\uffff\\10\\42\\2\\uffff\"+\n- \"\\2\\42\\1\\u00eb\\1\\u00ec\\1\\42\\1\\uffff\\1\\u00ee\\10\\42\\1\\u00f7\\1\\u00f8\"+\n- \"\\1\\42\\2\\uffff\\1\\42\\1\\uffff\\1\\u00fb\\2\\42\\1\\uffff\\1\\42\\1\\uffff\\2\\42\"+\n- \"\\2\\uffff\\2\\42\\1\\uffff\\1\\u0103\\1\\42\\1\\u0105\\1\\u0106\\1\\42\\3\\uffff\"+\n- \"\\1\\42\\2\\uffff\\1\\42\\2\\uffff\\1\\u010c\\1\\u010d\\2\\uffff\";\n+ \"\\1\\uffff\\2\\44\\1\\51\\1\\52\\1\\54\\2\\uffff\\1\\44\\2\\uffff\\3\\44\\3\\uffff\\7\"+\n+ \"\\44\\1\\37\\2\\uffff\\3\\37\\2\\uffff\\4\\44\\1\\uffff\\4\\44\\6\\uffff\\1\\44\\2\\uffff\"+\n+ \"\\5\\44\\3\\uffff\\13\\44\\5\\uffff\\57\\44\\1\\u009e\\2\\uffff\\7\\44\\1\\u00a6\\3\"+\n+ \"\\44\\1\\u00aa\\11\\44\\1\\u00b5\\2\\44\\1\\u00b8\\10\\44\\1\\u00c1\\1\\uffff\\1\\u00c3\"+\n+ \"\\2\\44\\1\\u00c7\\2\\44\\1\\u00ca\\1\\uffff\\1\\44\\1\\u00cc\\1\\u00cd\\1\\uffff\"+\n+ \"\\11\\44\\1\\u00d7\\1\\uffff\\1\\u00d8\\1\\44\\1\\uffff\\1\\u00db\\1\\44\\1\\u00de\"+\n+ \"\\5\\44\\1\\uffff\\1\\u00e4\\1\\uffff\\2\\44\\2\\uffff\\1\\44\\1\\u00eb\\1\\uffff\"+\n+ \"\\1\\44\\2\\uffff\\11\\44\\2\\uffff\\1\\44\\1\\u00f7\\1\\uffff\\1\\44\\1\\u00f9\\1\"+\n+ \"\\uffff\\5\\44\\1\\uffff\\1\\44\\1\\u0100\\1\\44\\2\\uffff\\1\\44\\1\\uffff\\13\\44\"+\n+ \"\\1\\uffff\\1\\44\\1\\uffff\\3\\44\\1\\u0112\\1\\u0113\\1\\44\\1\\uffff\\1\\u0115\"+\n+ \"\\7\\44\\2\\uffff\\2\\44\\1\\u0120\\2\\44\\1\\u0123\\1\\44\\2\\uffff\\1\\44\\1\\uffff\"+\n+ \"\\1\\u0126\\2\\44\\1\\uffff\\1\\44\\1\\uffff\\1\\44\\1\\uffff\\2\\44\\1\\uffff\\2\\44\"+\n+ \"\\1\\uffff\\2\\44\\1\\uffff\\1\\u0132\\1\\44\\1\\u0134\\1\\44\\1\\uffff\\1\\u0137\"+\n+ \"\\2\\44\\1\\u013a\\3\\uffff\\1\\44\\1\\uffff\\1\\u013e\\2\\uffff\\1\\44\\1\\u0141\"+\n+ \"\\3\\uffff\\1\\u0142\\2\\uffff\\1\\u0144\\10\\uffff\";\n static final String DFA12_eofS =\n- \"\\u010e\\uffff\";\n+ \"\\u0149\\uffff\";\n static final String DFA12_minS =\n- \"\\1\\0\\1\\157\\1\\160\\2\\60\\1\\56\\2\\uffff\\1\\145\\2\\uffff\\1\\157\\1\\141\\1\\156\"+\n- \"\\3\\uffff\\2\\141\\1\\156\\1\\141\\1\\145\\1\\101\\2\\uffff\\2\\0\\1\\52\\2\\uffff\"+\n- \"\\1\\160\\1\\145\\1\\141\\1\\165\\1\\uffff\\1\\145\\1\\150\\1\\164\\6\\uffff\\1\\166\"+\n- \"\\2\\uffff\\1\\155\\1\\144\\1\\156\\1\\170\\1\\146\\3\\uffff\\1\\154\\1\\142\\1\\160\"+\n- \"\\2\\151\\1\\156\\1\\146\\1\\145\\5\\uffff\\1\\145\\1\\143\\1\\164\\2\\162\\1\\145\\1\"+\n- \"\\160\\1\\151\\1\\155\\1\\164\\1\\145\\2\\55\\1\\165\\1\\164\\1\\145\\1\\165\\1\\151\"+\n- \"\\1\\147\\1\\154\\1\\145\\1\\147\\1\\164\\1\\147\\1\\145\\1\\141\\2\\145\\1\\144\\1\\162\"+\n- \"\\1\\151\\1\\145\\1\\143\\1\\141\\1\\162\\1\\165\\1\\143\\1\\154\\2\\145\\1\\60\\2\\uffff\"+\n- \"\\1\\164\\1\\151\\1\\162\\1\\145\\1\\141\\2\\145\\1\\60\\1\\147\\1\\163\\1\\145\\1\\60\"+\n- \"\\1\\164\\2\\162\\1\\142\\1\\166\\1\\146\\1\\60\\1\\145\\1\\164\\1\\60\\1\\164\\1\\145\"+\n- \"\\1\\156\\1\\145\\2\\156\\1\\60\\1\\uffff\\1\\60\\1\\141\\1\\162\\1\\60\\1\\142\\1\\164\"+\n- \"\\1\\60\\1\\uffff\\1\\145\\2\\60\\1\\uffff\\1\\151\\1\\163\\1\\145\\1\\141\\2\\151\\1\"+\n- \"\\60\\1\\uffff\\1\\60\\1\\151\\1\\uffff\\2\\60\\1\\145\\3\\164\\1\\uffff\\1\\60\\1\\uffff\"+\n- \"\\1\\154\\1\\145\\1\\60\\1\\uffff\\1\\154\\1\\60\\1\\uffff\\1\\162\\2\\uffff\\1\\157\"+\n- \"\\1\\145\\1\\156\\1\\143\\1\\163\\1\\143\\2\\uffff\\1\\156\\1\\60\\1\\uffff\\1\\60\\1\"+\n- \"\\uffff\\1\\156\\1\\151\\2\\163\\1\\uffff\\1\\151\\1\\60\\1\\144\\1\\uffff\\1\\145\"+\n- \"\\1\\uffff\\1\\151\\1\\156\\1\\144\\1\\143\\1\\153\\1\\157\\1\\141\\1\\147\\2\\uffff\"+\n- \"\\1\\164\\1\\157\\2\\60\\1\\157\\1\\uffff\\1\\60\\1\\163\\1\\156\\1\\163\\1\\55\\1\\145\"+\n- \"\\1\\55\\1\\162\\1\\164\\2\\60\\1\\156\\2\\uffff\\1\\156\\1\\uffff\\1\\60\\1\\147\\1\"+\n- \"\\150\\1\\uffff\\1\\163\\1\\uffff\\1\\171\\1\\151\\2\\uffff\\2\\55\\1\\uffff\\1\\60\"+\n- \"\\1\\151\\2\\60\\1\\157\\1\\144\\2\\uffff\\1\\160\\2\\uffff\\1\\156\\2\\uffff\\2\\60\"+\n- \"\\2\\uffff\";\n+ \"\\1\\0\\1\\157\\1\\142\\2\\60\\1\\56\\2\\uffff\\1\\145\\2\\uffff\\1\\157\\1\\141\\1\\156\"+\n+ \"\\3\\uffff\\2\\141\\1\\156\\1\\141\\1\\145\\1\\162\\1\\160\\1\\101\\2\\uffff\\2\\0\\1\"+\n+ \"\\52\\2\\uffff\\1\\160\\1\\145\\1\\141\\1\\165\\1\\uffff\\1\\145\\1\\150\\1\\164\\1\"+\n+ \"\\163\\6\\uffff\\1\\163\\2\\uffff\\1\\155\\1\\144\\1\\156\\1\\170\\1\\146\\3\\uffff\"+\n+ \"\\1\\154\\1\\142\\1\\160\\2\\151\\1\\156\\1\\146\\1\\145\\1\\141\\1\\162\\1\\160\\5\\uffff\"+\n+ \"\\1\\145\\1\\143\\1\\164\\2\\162\\1\\145\\1\\160\\1\\157\\1\\151\\1\\143\\1\\155\\1\\164\"+\n+ \"\\1\\145\\2\\55\\1\\165\\1\\164\\1\\145\\1\\165\\1\\151\\1\\147\\1\\154\\1\\145\\1\\147\"+\n+ \"\\1\\164\\1\\147\\1\\145\\1\\141\\2\\145\\1\\144\\1\\156\\1\\151\\1\\145\\1\\162\\1\\151\"+\n+ \"\\1\\145\\1\\143\\1\\141\\1\\162\\1\\165\\1\\154\\1\\143\\1\\162\\1\\154\\2\\145\\1\\60\"+\n+ \"\\2\\uffff\\1\\164\\1\\151\\1\\162\\1\\145\\1\\141\\2\\145\\1\\60\\1\\147\\1\\163\\1\"+\n+ \"\\145\\1\\60\\1\\164\\2\\162\\1\\142\\1\\165\\1\\166\\1\\141\\1\\166\\1\\146\\1\\60\\1\"+\n+ \"\\145\\1\\164\\1\\60\\1\\164\\2\\145\\1\\151\\1\\156\\1\\145\\2\\156\\1\\60\\1\\uffff\"+\n+ \"\\1\\60\\1\\141\\1\\162\\1\\55\\1\\142\\1\\164\\1\\60\\1\\uffff\\1\\145\\2\\60\\1\\uffff\"+\n+ \"\\1\\151\\1\\163\\1\\145\\1\\141\\1\\154\\1\\141\\1\\162\\2\\151\\1\\60\\1\\uffff\\1\"+\n+ \"\\60\\1\\151\\1\\uffff\\1\\60\\1\\163\\1\\60\\1\\160\\1\\145\\3\\164\\1\\uffff\\1\\60\"+\n+ \"\\1\\uffff\\1\\154\\2\\145\\1\\uffff\\1\\154\\1\\60\\1\\uffff\\1\\162\\2\\uffff\\1\"+\n+ \"\\157\\1\\145\\1\\156\\1\\143\\1\\141\\1\\154\\2\\163\\1\\143\\2\\uffff\\1\\156\\1\\60\"+\n+ \"\\1\\uffff\\1\\143\\1\\60\\1\\uffff\\1\\164\\1\\156\\1\\151\\2\\163\\1\\uffff\\1\\151\"+\n+ \"\\1\\60\\1\\144\\2\\uffff\\1\\145\\1\\uffff\\1\\151\\1\\156\\1\\144\\1\\143\\1\\153\"+\n+ \"\\1\\162\\2\\55\\1\\157\\1\\141\\1\\147\\1\\uffff\\1\\145\\1\\uffff\\1\\151\\1\\164\"+\n+ \"\\1\\157\\2\\60\\1\\157\\1\\uffff\\1\\60\\1\\163\\1\\156\\1\\163\\1\\55\\1\\145\\1\\55\"+\n+ \"\\1\\151\\1\\162\\1\\uffff\\1\\162\\1\\164\\1\\60\\1\\156\\1\\157\\1\\60\\1\\156\\2\\uffff\"+\n+ \"\\1\\156\\1\\uffff\\1\\60\\1\\147\\1\\150\\1\\uffff\\1\\163\\1\\uffff\\1\\164\\1\\141\"+\n+ \"\\1\\171\\1\\151\\1\\uffff\\1\\143\\1\\156\\1\\uffff\\2\\55\\1\\uffff\\1\\60\\1\\151\"+\n+ \"\\1\\60\\1\\171\\1\\164\\1\\60\\1\\157\\1\\145\\1\\60\\1\\144\\2\\uffff\\1\\160\\1\\uffff\"+\n+ \"\\1\\60\\1\\145\\1\\uffff\\1\\156\\1\\60\\3\\uffff\\1\\60\\1\\uffff\\1\\55\\1\\60\\2\"+\n+ \"\\uffff\\1\\141\\2\\uffff\\1\\141\\2\\uffff\";\n static final String DFA12_maxS =\n \"\\1\\uffff\\2\\165\\2\\172\\1\\56\\2\\uffff\\1\\145\\2\\uffff\\2\\157\\1\\156\\3\\uffff\"+\n- \"\\1\\141\\1\\171\\1\\156\\2\\145\\1\\172\\2\\uffff\\2\\uffff\\1\\57\\2\\uffff\\1\\160\"+\n- \"\\1\\145\\1\\141\\1\\165\\1\\uffff\\1\\145\\1\\150\\1\\164\\6\\uffff\\1\\166\\2\\uffff\"+\n- \"\\1\\156\\1\\144\\1\\156\\1\\170\\1\\160\\3\\uffff\\2\\162\\1\\160\\2\\151\\1\\164\\1\"+\n- \"\\166\\1\\145\\5\\uffff\\1\\145\\1\\143\\1\\164\\2\\162\\1\\145\\1\\160\\1\\151\\1\\160\"+\n- \"\\1\\164\\1\\145\\2\\55\\1\\165\\1\\164\\1\\145\\1\\165\\1\\151\\1\\147\\1\\154\\1\\145\"+\n- \"\\1\\147\\1\\164\\1\\147\\1\\145\\1\\141\\2\\145\\1\\144\\1\\162\\1\\151\\1\\145\\1\\143\"+\n- \"\\1\\141\\1\\162\\1\\165\\1\\143\\1\\157\\2\\145\\1\\172\\2\\uffff\\1\\164\\1\\151\\1\"+\n- \"\\162\\1\\145\\1\\141\\2\\145\\1\\172\\1\\147\\1\\163\\1\\145\\1\\172\\1\\164\\2\\162\"+\n- \"\\1\\142\\1\\166\\1\\146\\1\\172\\1\\145\\1\\164\\1\\172\\1\\164\\1\\145\\1\\156\\1\\145\"+\n- \"\\2\\156\\1\\172\\1\\uffff\\1\\172\\1\\141\\1\\162\\1\\172\\1\\142\\1\\164\\1\\172\\1\"+\n- \"\\uffff\\1\\145\\2\\172\\1\\uffff\\1\\151\\1\\163\\1\\145\\1\\141\\2\\151\\1\\172\\1\"+\n- \"\\uffff\\1\\172\\1\\151\\1\\uffff\\2\\172\\1\\145\\3\\164\\1\\uffff\\1\\172\\1\\uffff\"+\n- \"\\1\\164\\1\\145\\1\\172\\1\\uffff\\1\\154\\1\\172\\1\\uffff\\1\\162\\2\\uffff\\1\\157\"+\n- \"\\1\\145\\1\\156\\1\\143\\1\\163\\1\\143\\2\\uffff\\1\\156\\1\\172\\1\\uffff\\1\\172\"+\n- \"\\1\\uffff\\1\\156\\1\\151\\2\\163\\1\\uffff\\1\\151\\1\\172\\1\\144\\1\\uffff\\1\\145\"+\n- \"\\1\\uffff\\1\\151\\1\\156\\1\\144\\1\\143\\1\\153\\1\\157\\1\\141\\1\\147\\2\\uffff\"+\n+ \"\\1\\141\\1\\171\\1\\156\\2\\145\\2\\162\\1\\172\\2\\uffff\\2\\uffff\\1\\57\\2\\uffff\"+\n+ \"\\1\\160\\1\\145\\1\\141\\1\\165\\1\\uffff\\1\\145\\1\\150\\1\\164\\1\\163\\6\\uffff\"+\n+ \"\\1\\166\\2\\uffff\\1\\156\\1\\144\\1\\156\\1\\170\\1\\160\\3\\uffff\\2\\162\\1\\160\"+\n+ \"\\2\\151\\1\\164\\1\\166\\1\\145\\1\\141\\1\\162\\1\\160\\5\\uffff\\1\\145\\1\\143\\1\"+\n+ \"\\164\\2\\162\\1\\145\\1\\160\\1\\157\\1\\151\\1\\143\\1\\160\\1\\164\\1\\145\\2\\55\"+\n+ \"\\1\\165\\1\\164\\1\\145\\1\\165\\1\\151\\1\\147\\1\\154\\1\\145\\1\\147\\1\\164\\1\\147\"+\n+ \"\\1\\145\\1\\141\\2\\145\\1\\144\\1\\156\\1\\151\\1\\145\\1\\162\\1\\151\\1\\145\\1\\143\"+\n+ \"\\1\\141\\1\\162\\1\\165\\1\\154\\1\\143\\1\\162\\1\\157\\2\\145\\1\\172\\2\\uffff\\1\"+\n+ \"\\164\\1\\151\\1\\162\\1\\145\\1\\141\\2\\145\\1\\172\\1\\147\\1\\163\\1\\145\\1\\172\"+\n+ \"\\1\\164\\2\\162\\1\\142\\1\\165\\1\\166\\1\\141\\1\\166\\1\\146\\1\\172\\1\\145\\1\\164\"+\n+ \"\\1\\172\\1\\164\\2\\145\\1\\151\\1\\156\\1\\145\\2\\156\\1\\172\\1\\uffff\\1\\172\\1\"+\n+ \"\\141\\1\\162\\1\\172\\1\\142\\1\\164\\1\\172\\1\\uffff\\1\\145\\2\\172\\1\\uffff\\1\"+\n+ \"\\151\\1\\163\\1\\145\\1\\141\\1\\154\\1\\141\\1\\162\\2\\151\\1\\172\\1\\uffff\\1\\172\"+\n+ \"\\1\\151\\1\\uffff\\1\\172\\1\\163\\1\\172\\1\\160\\1\\145\\3\\164\\1\\uffff\\1\\172\"+\n+ \"\\1\\uffff\\1\\164\\1\\145\\1\\154\\1\\uffff\\1\\154\\1\\172\\1\\uffff\\1\\162\\2\\uffff\"+\n+ \"\\1\\157\\1\\145\\1\\156\\1\\143\\1\\141\\1\\154\\2\\163\\1\\143\\2\\uffff\\1\\156\\1\"+\n+ \"\\172\\1\\uffff\\1\\143\\1\\172\\1\\uffff\\1\\164\\1\\156\\1\\151\\2\\163\\1\\uffff\"+\n+ \"\\1\\151\\1\\172\\1\\144\\2\\uffff\\1\\145\\1\\uffff\\1\\151\\1\\156\\1\\144\\1\\143\"+\n+ \"\\1\\153\\1\\162\\2\\55\\1\\157\\1\\141\\1\\147\\1\\uffff\\1\\145\\1\\uffff\\1\\151\"+\n \"\\1\\164\\1\\157\\2\\172\\1\\157\\1\\uffff\\1\\172\\1\\163\\1\\156\\1\\163\\1\\55\\1\"+\n- \"\\145\\1\\55\\1\\162\\1\\164\\2\\172\\1\\156\\2\\uffff\\1\\156\\1\\uffff\\1\\172\\1\"+\n- \"\\147\\1\\150\\1\\uffff\\1\\163\\1\\uffff\\1\\171\\1\\151\\2\\uffff\\2\\55\\1\\uffff\"+\n- \"\\1\\172\\1\\151\\2\\172\\1\\157\\1\\145\\2\\uffff\\1\\160\\2\\uffff\\1\\156\\2\\uffff\"+\n- \"\\2\\172\\2\\uffff\";\n+ \"\\145\\1\\55\\1\\151\\1\\162\\1\\uffff\\1\\162\\1\\164\\1\\172\\1\\156\\1\\157\\1\\172\"+\n+ \"\\1\\156\\2\\uffff\\1\\156\\1\\uffff\\1\\172\\1\\147\\1\\150\\1\\uffff\\1\\163\\1\\uffff\"+\n+ \"\\1\\164\\1\\141\\1\\171\\1\\151\\1\\uffff\\1\\143\\1\\156\\1\\uffff\\2\\55\\1\\uffff\"+\n+ \"\\1\\172\\1\\151\\1\\172\\1\\171\\1\\164\\1\\172\\1\\157\\1\\145\\1\\172\\1\\145\\2\\uffff\"+\n+ \"\\1\\160\\1\\uffff\\1\\172\\1\\145\\1\\uffff\\1\\156\\1\\172\\3\\uffff\\1\\172\\1\\uffff\"+\n+ \"\\1\\55\\1\\172\\2\\uffff\\1\\155\\2\\uffff\\1\\151\\2\\uffff\";\n static final String DFA12_acceptS =\n- \"\\6\\uffff\\1\\7\\1\\11\\1\\uffff\\1\\13\\1\\14\\3\\uffff\\1\\22\\1\\24\\1\\25\\6\\uffff\"+\n- \"\\1\\63\\1\\64\\3\\uffff\\1\\70\\1\\71\\4\\uffff\\1\\63\\3\\uffff\\1\\4\\1\\5\\1\\40\\1\"+\n- \"\\6\\1\\7\\1\\11\\1\\uffff\\1\\13\\1\\14\\5\\uffff\\1\\22\\1\\24\\1\\25\\10\\uffff\\1\"+\n- \"\\64\\1\\65\\1\\66\\1\\67\\1\\70\\51\\uffff\\1\\51\\1\\52\\35\\uffff\\1\\26\\7\\uffff\"+\n- \"\\1\\41\\3\\uffff\\1\\43\\7\\uffff\\1\\23\\2\\uffff\\1\\3\\6\\uffff\\1\\16\\1\\uffff\"+\n- \"\\1\\30\\3\\uffff\\1\\32\\2\\uffff\\1\\36\\1\\uffff\\1\\35\\1\\37\\6\\uffff\\1\\17\\1\"+\n- \"\\31\\2\\uffff\\1\\33\\1\\uffff\\1\\27\\4\\uffff\\1\\20\\3\\uffff\\1\\42\\1\\uffff\"+\n- \"\\1\\34\\10\\uffff\\1\\21\\1\\12\\5\\uffff\\1\\62\\14\\uffff\\1\\56\\1\\57\\1\\uffff\"+\n- \"\\1\\61\\3\\uffff\\1\\54\\1\\uffff\\1\\53\\2\\uffff\\1\\2\\1\\15\\2\\uffff\\1\\47\\6\"+\n- \"\\uffff\\1\\44\\1\\60\\1\\uffff\\1\\55\\1\\1\\1\\uffff\\1\\45\\1\\46\\2\\uffff\\1\\50\"+\n- \"\\1\\10\";\n+ \"\\6\\uffff\\1\\7\\1\\11\\1\\uffff\\1\\13\\1\\14\\3\\uffff\\1\\22\\1\\24\\1\\25\\10\\uffff\"+\n+ \"\\1\\73\\1\\74\\3\\uffff\\1\\100\\1\\101\\4\\uffff\\1\\73\\4\\uffff\\1\\4\\1\\5\\1\\37\"+\n+ \"\\1\\6\\1\\7\\1\\11\\1\\uffff\\1\\13\\1\\14\\5\\uffff\\1\\22\\1\\24\\1\\25\\13\\uffff\"+\n+ \"\\1\\74\\1\\75\\1\\76\\1\\77\\1\\100\\60\\uffff\\1\\51\\1\\52\\42\\uffff\\1\\26\\7\\uffff\"+\n+ \"\\1\\40\\3\\uffff\\1\\43\\12\\uffff\\1\\23\\2\\uffff\\1\\3\\10\\uffff\\1\\16\\1\\uffff\"+\n+ \"\\1\\30\\3\\uffff\\1\\32\\2\\uffff\\1\\36\\1\\uffff\\1\\35\\1\\41\\11\\uffff\\1\\17\"+\n+ \"\\1\\31\\2\\uffff\\1\\33\\2\\uffff\\1\\27\\5\\uffff\\1\\20\\3\\uffff\\1\\42\\1\\61\\1\"+\n+ \"\\uffff\\1\\34\\13\\uffff\\1\\21\\1\\uffff\\1\\12\\6\\uffff\\1\\72\\11\\uffff\\1\\67\"+\n+ \"\\7\\uffff\\1\\56\\1\\57\\1\\uffff\\1\\71\\3\\uffff\\1\\54\\1\\uffff\\1\\53\\4\\uffff\"+\n+ \"\\1\\2\\2\\uffff\\1\\15\\2\\uffff\\1\\47\\12\\uffff\\1\\44\\1\\60\\1\\uffff\\1\\55\\2\"+\n+ \"\\uffff\\1\\1\\2\\uffff\\1\\70\\1\\45\\1\\46\\1\\uffff\\1\\62\\2\\uffff\\1\\66\\1\\50\"+\n+ \"\\1\\uffff\\1\\10\\1\\63\\1\\uffff\\1\\64\\1\\65\";\n static final String DFA12_specialS =\n- \"\\1\\1\\30\\uffff\\1\\2\\1\\0\\u00f3\\uffff}>\";\n+ \"\\1\\1\\32\\uffff\\1\\0\\1\\2\\u012c\\uffff}>\";\n static final String[] DFA12_transitionS = {\n- \"\\11\\35\\2\\34\\2\\35\\1\\34\\22\\35\\1\\34\\1\\35\\1\\31\\4\\35\\1\\32\\5\\35\\1\"+\n- \"\\12\\1\\5\\1\\33\\12\\30\\1\\35\\1\\16\\3\\35\\1\\6\\1\\35\\5\\27\\1\\4\\15\\27\\1\"+\n- \"\\3\\6\\27\\1\\7\\1\\35\\1\\11\\1\\26\\1\\27\\1\\35\\2\\27\\1\\13\\1\\10\\1\\27\\1\\25\"+\n- \"\\2\\27\\1\\15\\3\\27\\1\\14\\1\\27\\1\\2\\2\\27\\1\\24\\1\\1\\1\\22\\1\\23\\1\\21\\4\"+\n- \"\\27\\1\\17\\1\\35\\1\\20\\uff82\\35\",\n- \"\\1\\41\\1\\37\\3\\uffff\\1\\40\\1\\36\",\n- \"\\1\\43\\3\\uffff\\1\\44\\1\\45\",\n- \"\\12\\42\\7\\uffff\\32\\42\\4\\uffff\\1\\42\\1\\uffff\\32\\42\",\n- \"\\12\\42\\7\\uffff\\32\\42\\4\\uffff\\1\\42\\1\\uffff\\32\\42\",\n- \"\\1\\50\",\n+ \"\\11\\37\\2\\36\\2\\37\\1\\36\\22\\37\\1\\36\\1\\37\\1\\33\\4\\37\\1\\34\\5\\37\\1\"+\n+ \"\\12\\1\\5\\1\\35\\12\\32\\1\\37\\1\\16\\3\\37\\1\\6\\1\\37\\5\\31\\1\\4\\15\\31\\1\"+\n+ \"\\3\\6\\31\\1\\7\\1\\37\\1\\11\\1\\30\\1\\31\\1\\37\\1\\27\\1\\31\\1\\13\\1\\10\\1\\31\"+\n+ \"\\1\\25\\1\\26\\1\\31\\1\\15\\3\\31\\1\\14\\1\\31\\1\\2\\2\\31\\1\\24\\1\\1\\1\\22\\1\"+\n+ \"\\23\\1\\21\\4\\31\\1\\17\\1\\37\\1\\20\\uff82\\37\",\n+ \"\\1\\43\\1\\41\\3\\uffff\\1\\42\\1\\40\",\n+ \"\\1\\50\\15\\uffff\\1\\45\\3\\uffff\\1\\46\\1\\47\",\n+ \"\\12\\44\\7\\uffff\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\32\\44\",\n+ \"\\12\\44\\7\\uffff\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\32\\44\",\n+ \"\\1\\53\",\n \"\",\n \"\",\n- \"\\1\\54\",\n+ \"\\1\\57\",\n \"\",\n \"\",\n- \"\\1\\57\",\n- \"\\1\\62\\7\\uffff\\1\\61\\5\\uffff\\1\\60\",\n- \"\\1\\63\",\n+ \"\\1\\62\",\n+ \"\\1\\65\\7\\uffff\\1\\64\\5\\uffff\\1\\63\",\n+ \"\\1\\66\",\n \"\",\n \"\",\n \"\",\n- \"\\1\\67\",\n- \"\\1\\70\\20\\uffff\\1\\72\\6\\uffff\\1\\71\",\n- \"\\1\\73\",\n- \"\\1\\74\\3\\uffff\\1\\75\",\n+ \"\\1\\72\",\n+ \"\\1\\73\\20\\uffff\\1\\75\\6\\uffff\\1\\74\",\n \"\\1\\76\",\n- \"\\32\\42\\4\\uffff\\1\\42\\1\\uffff\\32\\42\",\n- \"\",\n+ \"\\1\\77\\3\\uffff\\1\\100\",\n+ \"\\1\\101\",\n+ \"\\1\\102\",\n+ \"\\1\\104\\1\\uffff\\1\\103\",\n+ \"\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\32\\44\",\n \"\",\n- \"\\0\\100\",\n- \"\\0\\100\",\n- \"\\1\\101\\4\\uffff\\1\\102\",\n \"\",\n+ \"\\0\\106\",\n+ \"\\0\\106\",\n+ \"\\1\\107\\4\\uffff\\1\\110\",\n \"\",\n- \"\\1\\104\",\n- \"\\1\\105\",\n- \"\\1\\106\",\n- \"\\1\\107\",\n \"\",\n- \"\\1\\110\",\n- \"\\1\\111\",\n \"\\1\\112\",\n- \"\",\n- \"\",\n- \"\",\n- \"\",\n- \"\",\n- \"\",\n \"\\1\\113\",\n+ \"\\1\\114\",\n+ \"\\1\\115\",\n \"\",\n- \"\",\n- \"\\1\\114\\1\\115\",\n \"\\1\\116\",\n \"\\1\\117\",\n \"\\1\\120\",\n- \"\\1\\123\\2\\uffff\\1\\122\\6\\uffff\\1\\121\",\n+ \"\\1\\121\",\n+ \"\",\n \"\",\n \"\",\n \"\",\n- \"\\1\\124\\5\\uffff\\1\\125\",\n- \"\\1\\127\\17\\uffff\\1\\126\",\n- \"\\1\\130\",\n- \"\\1\\131\",\n- \"\\1\\132\",\n- \"\\1\\133\\5\\uffff\\1\\134\",\n- \"\\1\\137\\5\\uffff\\1\\135\\11\\uffff\\1\\136\",\n- \"\\1\\140\",\n \"\",\n \"\",\n+ \"\\1\\123\\2\\uffff\\1\\122\",\n+ \"\",\n+ \"\",\n+ \"\\1\\124\\1\\125\",\n+ \"\\1\\126\",\n+ \"\\1\\127\",\n+ \"\\1\\130\",\n+ \"\\1\\133\\2\\uffff\\1\\132\\6\\uffff\\1\\131\",\n \"\",\n \"\",\n \"\",\n+ \"\\1\\134\\5\\uffff\\1\\135\",\n+ \"\\1\\137\\17\\uffff\\1\\136\",\n+ \"\\1\\140\",\n \"\\1\\141\",\n \"\\1\\142\",\n- \"\\1\\143\",\n- \"\\1\\144\",\n- \"\\1\\145\",\n- \"\\1\\146\",\n- \"\\1\\147\",\n+ \"\\1\\143\\5\\uffff\\1\\144\",\n+ \"\\1\\147\\5\\uffff\\1\\145\\11\\uffff\\1\\146\",\n \"\\1\\150\",\n- \"\\1\\152\\2\\uffff\\1\\151\",\n+ \"\\1\\151\",\n+ \"\\1\\152\",\n \"\\1\\153\",\n+ \"\",\n+ \"\",\n+ \"\",\n+ \"\",\n+ \"\",\n \"\\1\\154\",\n \"\\1\\155\",\n \"\\1\\156\",\n@@ -2218,8 +2459,7 @@ public void mTokens() throws RecognitionException {\n \"\\1\\163\",\n \"\\1\\164\",\n \"\\1\\165\",\n- \"\\1\\166\",\n- \"\\1\\167\",\n+ \"\\1\\167\\2\\uffff\\1\\166\",\n \"\\1\\170\",\n \"\\1\\171\",\n \"\\1\\172\",\n@@ -2235,169 +2475,234 @@ public void mTokens() throws RecognitionException {\n \"\\1\\u0084\",\n \"\\1\\u0085\",\n \"\\1\\u0086\",\n- \"\\1\\u0088\\2\\uffff\\1\\u0087\",\n+ \"\\1\\u0087\",\n+ \"\\1\\u0088\",\n \"\\1\\u0089\",\n \"\\1\\u008a\",\n- \"\\12\\42\\7\\uffff\\32\\42\\4\\uffff\\1\\42\\1\\uffff\\22\\42\\1\\u008b\\7\\42\",\n- \"\",\n- \"\",\n+ \"\\1\\u008b\",\n+ \"\\1\\u008c\",\n \"\\1\\u008d\",\n \"\\1\\u008e\",\n \"\\1\\u008f\",\n \"\\1\\u0090\",\n \"\\1\\u0091\",\n \"\\1\\u0092\",\n \"\\1\\u0093\",\n- \"\\12\\42\\7\\uffff\\32\\42\\4\\uffff\\1\\42\\1\\uffff\\32\\42\",\n+ \"\\1\\u0094\",\n \"\\1\\u0095\",\n \"\\1\\u0096\",\n \"\\1\\u0097\",\n- \"\\12\\42\\7\\uffff\\32\\42\\4\\uffff\\1\\42\\1\\uffff\\32\\42\",\n- \"\\1\\u0099\",\n- \"\\1\\u009a\",\n+ \"\\1\\u0098\",\n+ \"\\1\\u009a\\2\\uffff\\1\\u0099\",\n \"\\1\\u009b\",\n \"\\1\\u009c\",\n- \"\\1\\u009d\",\n- \"\\1\\u009e\",\n- \"\\12\\42\\7\\uffff\\32\\42\\4\\uffff\\1\\42\\1\\uffff\\22\\42\\1\\u009f\\7\\42\",\n+ \"\\12\\44\\7\\uffff\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\22\\44\\1\\u009d\\7\\44\",\n+ \"\",\n+ \"\",\n+ \"\\1\\u009f\",\n+ \"\\1\\u00a0\",\n \"\\1\\u00a1\",\n \"\\1\\u00a2\",\n- \"\\12\\42\\7\\uffff\\32\\42\\4\\uffff\\1\\42\\1\\uffff\\32\\42\",\n+ \"\\1\\u00a3\",\n \"\\1\\u00a4\",\n \"\\1\\u00a5\",\n- \"\\1\\u00a6\",\n+ \"\\12\\44\\7\\uffff\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\32\\44\",\n \"\\1\\u00a7\",\n \"\\1\\u00a8\",\n \"\\1\\u00a9\",\n- \"\\12\\42\\7\\uffff\\32\\42\\4\\uffff\\1\\42\\1\\uffff\\32\\42\",\n- \"\",\n- \"\\12\\42\\7\\uffff\\32\\42\\4\\uffff\\1\\42\\1\\uffff\\22\\42\\1\\u00ab\\7\\42\",\n+ \"\\12\\44\\7\\uffff\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\32\\44\",\n+ \"\\1\\u00ab\",\n+ \"\\1\\u00ac\",\n \"\\1\\u00ad\",\n \"\\1\\u00ae\",\n- \"\\12\\42\\7\\uffff\\32\\42\\4\\uffff\\1\\42\\1\\uffff\\22\\42\\1\\u00af\\7\\42\",\n+ \"\\1\\u00af\",\n+ \"\\1\\u00b0\",\n \"\\1\\u00b1\",\n \"\\1\\u00b2\",\n- \"\\12\\42\\7\\uffff\\32\\42\\4\\uffff\\1\\42\\1\\uffff\\32\\42\",\n- \"\",\n- \"\\1\\u00b4\",\n- \"\\12\\42\\7\\uffff\\32\\42\\4\\uffff\\1\\42\\1\\uffff\\32\\42\",\n- \"\\12\\42\\7\\uffff\\32\\42\\4\\uffff\\1\\42\\1\\uffff\\32\\42\",\n- \"\",\n+ \"\\1\\u00b3\",\n+ \"\\12\\44\\7\\uffff\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\22\\44\\1\\u00b4\\7\\44\",\n+ \"\\1\\u00b6\",\n \"\\1\\u00b7\",\n- \"\\1\\u00b8\",\n+ \"\\12\\44\\7\\uffff\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\32\\44\",\n \"\\1\\u00b9\",\n \"\\1\\u00ba\",\n \"\\1\\u00bb\",\n \"\\1\\u00bc\",\n- \"\\12\\42\\7\\uffff\\32\\42\\4\\uffff\\1\\42\\1\\uffff\\32\\42\",\n- \"\",\n- \"\\12\\42\\7\\uffff\\32\\42\\4\\uffff\\1\\42\\1\\uffff\\32\\42\",\n+ \"\\1\\u00bd\",\n+ \"\\1\\u00be\",\n \"\\1\\u00bf\",\n+ \"\\1\\u00c0\",\n+ \"\\12\\44\\7\\uffff\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\32\\44\",\n \"\",\n- \"\\12\\42\\7\\uffff\\32\\42\\4\\uffff\\1\\42\\1\\uffff\\22\\42\\1\\u00c0\\7\\42\",\n- \"\\12\\42\\7\\uffff\\32\\42\\4\\uffff\\1\\42\\1\\uffff\\22\\42\\1\\u00c2\\7\\42\",\n+ \"\\12\\44\\7\\uffff\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\22\\44\\1\\u00c2\\7\\44\",\n \"\\1\\u00c4\",\n \"\\1\\u00c5\",\n- \"\\1\\u00c6\",\n- \"\\1\\u00c7\",\n+ \"\\1\\u00c6\\2\\uffff\\12\\44\\7\\uffff\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\32\"+\n+ \"\\44\",\n+ \"\\1\\u00c8\",\n+ \"\\1\\u00c9\",\n+ \"\\12\\44\\7\\uffff\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\32\\44\",\n \"\",\n- \"\\12\\42\\7\\uffff\\32\\42\\4\\uffff\\1\\42\\1\\uffff\\32\\42\",\n- \"\",\n- \"\\1\\u00ca\\7\\uffff\\1\\u00c9\",\n \"\\1\\u00cb\",\n- \"\\12\\42\\7\\uffff\\32\\42\\4\\uffff\\1\\42\\1\\uffff\\32\\42\",\n- \"\",\n- \"\\1\\u00cd\",\n- \"\\12\\42\\7\\uffff\\32\\42\\4\\uffff\\1\\42\\1\\uffff\\32\\42\",\n+ \"\\12\\44\\7\\uffff\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\32\\44\",\n+ \"\\12\\44\\7\\uffff\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\32\\44\",\n \"\",\n+ \"\\1\\u00ce\",\n \"\\1\\u00cf\",\n- \"\",\n- \"\",\n \"\\1\\u00d0\",\n \"\\1\\u00d1\",\n \"\\1\\u00d2\",\n \"\\1\\u00d3\",\n \"\\1\\u00d4\",\n \"\\1\\u00d5\",\n- \"\",\n- \"\",\n \"\\1\\u00d6\",\n- \"\\12\\42\\7\\uffff\\32\\42\\4\\uffff\\1\\42\\1\\uffff\\32\\42\",\n- \"\",\n- \"\\12\\42\\7\\uffff\\32\\42\\4\\uffff\\1\\42\\1\\uffff\\32\\42\",\n+ \"\\12\\44\\7\\uffff\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\32\\44\",\n \"\",\n+ \"\\12\\44\\7\\uffff\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\32\\44\",\n \"\\1\\u00d9\",\n- \"\\1\\u00da\",\n- \"\\1\\u00db\",\n- \"\\1\\u00dc\",\n \"\",\n- \"\\1\\u00dd\",\n- \"\\12\\42\\7\\uffff\\32\\42\\4\\uffff\\1\\42\\1\\uffff\\32\\42\",\n+ \"\\12\\44\\7\\uffff\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\22\\44\\1\\u00da\\7\\44\",\n+ \"\\1\\u00dc\",\n+ \"\\12\\44\\7\\uffff\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\22\\44\\1\\u00dd\\7\\44\",\n \"\\1\\u00df\",\n- \"\",\n \"\\1\\u00e0\",\n- \"\",\n \"\\1\\u00e1\",\n \"\\1\\u00e2\",\n \"\\1\\u00e3\",\n- \"\\1\\u00e4\",\n- \"\\1\\u00e5\",\n- \"\\1\\u00e6\",\n- \"\\1\\u00e7\",\n- \"\\1\\u00e8\",\n \"\",\n+ \"\\12\\44\\7\\uffff\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\32\\44\",\n+ \"\",\n+ \"\\1\\u00e6\\7\\uffff\\1\\u00e5\",\n+ \"\\1\\u00e7\",\n+ \"\\1\\u00e9\\6\\uffff\\1\\u00e8\",\n \"\",\n- \"\\1\\u00e9\",\n \"\\1\\u00ea\",\n- \"\\12\\42\\7\\uffff\\32\\42\\4\\uffff\\1\\42\\1\\uffff\\32\\42\",\n- \"\\12\\42\\7\\uffff\\32\\42\\4\\uffff\\1\\42\\1\\uffff\\32\\42\",\n- \"\\1\\u00ed\",\n+ \"\\12\\44\\7\\uffff\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\32\\44\",\n+ \"\",\n+ \"\\1\\u00ec\",\n+ \"\",\n \"\",\n- \"\\12\\42\\7\\uffff\\32\\42\\4\\uffff\\1\\42\\1\\uffff\\32\\42\",\n+ \"\\1\\u00ed\",\n+ \"\\1\\u00ee\",\n \"\\1\\u00ef\",\n \"\\1\\u00f0\",\n \"\\1\\u00f1\",\n \"\\1\\u00f2\",\n \"\\1\\u00f3\",\n \"\\1\\u00f4\",\n \"\\1\\u00f5\",\n+ \"\",\n+ \"\",\n \"\\1\\u00f6\",\n- \"\\12\\42\\7\\uffff\\32\\42\\4\\uffff\\1\\42\\1\\uffff\\32\\42\",\n- \"\\12\\42\\7\\uffff\\32\\42\\4\\uffff\\1\\42\\1\\uffff\\32\\42\",\n- \"\\1\\u00f9\",\n+ \"\\12\\44\\7\\uffff\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\32\\44\",\n \"\",\n+ \"\\1\\u00f8\",\n+ \"\\12\\44\\7\\uffff\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\32\\44\",\n \"\",\n \"\\1\\u00fa\",\n- \"\",\n- \"\\12\\42\\7\\uffff\\32\\42\\4\\uffff\\1\\42\\1\\uffff\\32\\42\",\n+ \"\\1\\u00fb\",\n \"\\1\\u00fc\",\n \"\\1\\u00fd\",\n- \"\",\n \"\\1\\u00fe\",\n \"\",\n \"\\1\\u00ff\",\n- \"\\1\\u0100\",\n+ \"\\12\\44\\7\\uffff\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\32\\44\",\n+ \"\\1\\u0101\",\n \"\",\n \"\",\n- \"\\1\\u0101\",\n \"\\1\\u0102\",\n \"\",\n- \"\\12\\42\\7\\uffff\\32\\42\\4\\uffff\\1\\42\\1\\uffff\\32\\42\",\n+ \"\\1\\u0103\",\n \"\\1\\u0104\",\n- \"\\12\\42\\7\\uffff\\32\\42\\4\\uffff\\1\\42\\1\\uffff\\32\\42\",\n- \"\\12\\42\\7\\uffff\\32\\42\\4\\uffff\\1\\42\\1\\uffff\\32\\42\",\n+ \"\\1\\u0105\",\n+ \"\\1\\u0106\",\n \"\\1\\u0107\",\n- \"\\1\\u0108\\1\\u0109\",\n+ \"\\1\\u0108\",\n+ \"\\1\\u0109\",\n+ \"\\1\\u010a\",\n+ \"\\1\\u010b\",\n+ \"\\1\\u010c\",\n+ \"\\1\\u010d\",\n \"\",\n+ \"\\1\\u010e\",\n \"\",\n- \"\\1\\u010a\",\n+ \"\\1\\u010f\",\n+ \"\\1\\u0110\",\n+ \"\\1\\u0111\",\n+ \"\\12\\44\\7\\uffff\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\32\\44\",\n+ \"\\12\\44\\7\\uffff\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\32\\44\",\n+ \"\\1\\u0114\",\n \"\",\n+ \"\\12\\44\\7\\uffff\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\32\\44\",\n+ \"\\1\\u0116\",\n+ \"\\1\\u0117\",\n+ \"\\1\\u0118\",\n+ \"\\1\\u0119\",\n+ \"\\1\\u011a\",\n+ \"\\1\\u011b\",\n+ \"\\1\\u011c\",\n+ \"\\1\\u011d\",\n \"\",\n- \"\\1\\u010b\",\n+ \"\\1\\u011e\",\n+ \"\\1\\u011f\",\n+ \"\\12\\44\\7\\uffff\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\32\\44\",\n+ \"\\1\\u0121\",\n+ \"\\1\\u0122\",\n+ \"\\12\\44\\7\\uffff\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\32\\44\",\n+ \"\\1\\u0124\",\n+ \"\",\n+ \"\",\n+ \"\\1\\u0125\",\n+ \"\",\n+ \"\\12\\44\\7\\uffff\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\32\\44\",\n+ \"\\1\\u0127\",\n+ \"\\1\\u0128\",\n+ \"\",\n+ \"\\1\\u0129\",\n+ \"\",\n+ \"\\1\\u012a\",\n+ \"\\1\\u012b\",\n+ \"\\1\\u012c\",\n+ \"\\1\\u012d\",\n \"\",\n+ \"\\1\\u012e\",\n+ \"\\1\\u012f\",\n \"\",\n- \"\\12\\42\\7\\uffff\\32\\42\\4\\uffff\\1\\42\\1\\uffff\\32\\42\",\n- \"\\12\\42\\7\\uffff\\32\\42\\4\\uffff\\1\\42\\1\\uffff\\32\\42\",\n+ \"\\1\\u0130\",\n+ \"\\1\\u0131\",\n+ \"\",\n+ \"\\12\\44\\7\\uffff\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\32\\44\",\n+ \"\\1\\u0133\",\n+ \"\\12\\44\\7\\uffff\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\32\\44\",\n+ \"\\1\\u0135\",\n+ \"\\1\\u0136\",\n+ \"\\12\\44\\7\\uffff\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\32\\44\",\n+ \"\\1\\u0138\",\n+ \"\\1\\u0139\",\n+ \"\\12\\44\\7\\uffff\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\32\\44\",\n+ \"\\1\\u013b\\1\\u013c\",\n+ \"\",\n+ \"\",\n+ \"\\1\\u013d\",\n+ \"\",\n+ \"\\12\\44\\7\\uffff\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\32\\44\",\n+ \"\\1\\u013f\",\n+ \"\",\n+ \"\\1\\u0140\",\n+ \"\\12\\44\\7\\uffff\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\32\\44\",\n+ \"\",\n+ \"\",\n+ \"\",\n+ \"\\12\\44\\7\\uffff\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\32\\44\",\n+ \"\",\n+ \"\\1\\u0143\",\n+ \"\\12\\44\\7\\uffff\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\32\\44\",\n+ \"\",\n+ \"\",\n+ \"\\1\\u0145\\13\\uffff\\1\\u0146\",\n+ \"\",\n+ \"\",\n+ \"\\1\\u0148\\7\\uffff\\1\\u0147\",\n \"\",\n \"\"\n };\n@@ -2432,19 +2737,19 @@ public DFA12(BaseRecognizer recognizer) {\n this.transition = DFA12_transition;\n }\n public String getDescription() {\n- return \"1:1: Tokens : ( T__11 | T__12 | T__13 | T__14 | T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | T__38 | T__39 | T__40 | T__41 | T__42 | T__43 | T__44 | T__45 | T__46 | T__47 | T__48 | T__49 | T__50 | T__51 | T__52 | T__53 | T__54 | T__55 | T__56 | T__57 | T__58 | T__59 | T__60 | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER );\";\n+ return \"1:1: Tokens : ( T__11 | T__12 | T__13 | T__14 | T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | T__38 | T__39 | T__40 | T__41 | T__42 | T__43 | T__44 | T__45 | T__46 | T__47 | T__48 | T__49 | T__50 | T__51 | T__52 | T__53 | T__54 | T__55 | T__56 | T__57 | T__58 | T__59 | T__60 | T__61 | T__62 | T__63 | T__64 | T__65 | T__66 | T__67 | T__68 | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER );\";\n }\n public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {\n IntStream input = _input;\n \tint _s = s;\n switch ( s ) {\n case 0 : \n- int LA12_26 = input.LA(1);\n+ int LA12_27 = input.LA(1);\n \n s = -1;\n- if ( ((LA12_26>='\\u0000' && LA12_26<='\\uFFFF')) ) {s = 64;}\n+ if ( ((LA12_27>='\\u0000' && LA12_27<='\\uFFFF')) ) {s = 70;}\n \n- else s = 29;\n+ else s = 31;\n \n if ( s>=0 ) return s;\n break;\n@@ -2494,31 +2799,35 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc\n \n else if ( (LA12_0=='f') ) {s = 21;}\n \n- else if ( (LA12_0=='^') ) {s = 22;}\n+ else if ( (LA12_0=='g') ) {s = 22;}\n+\n+ else if ( (LA12_0=='a') ) {s = 23;}\n+\n+ else if ( (LA12_0=='^') ) {s = 24;}\n \n- else if ( ((LA12_0>='A' && LA12_0<='E')||(LA12_0>='G' && LA12_0<='S')||(LA12_0>='U' && LA12_0<='Z')||LA12_0=='_'||(LA12_0>='a' && LA12_0<='b')||LA12_0=='e'||(LA12_0>='g' && LA12_0<='h')||(LA12_0>='j' && LA12_0<='l')||LA12_0=='n'||(LA12_0>='p' && LA12_0<='q')||(LA12_0>='w' && LA12_0<='z')) ) {s = 23;}\n+ else if ( ((LA12_0>='A' && LA12_0<='E')||(LA12_0>='G' && LA12_0<='S')||(LA12_0>='U' && LA12_0<='Z')||LA12_0=='_'||LA12_0=='b'||LA12_0=='e'||LA12_0=='h'||(LA12_0>='j' && LA12_0<='l')||LA12_0=='n'||(LA12_0>='p' && LA12_0<='q')||(LA12_0>='w' && LA12_0<='z')) ) {s = 25;}\n \n- else if ( ((LA12_0>='0' && LA12_0<='9')) ) {s = 24;}\n+ else if ( ((LA12_0>='0' && LA12_0<='9')) ) {s = 26;}\n \n- else if ( (LA12_0=='\\\"') ) {s = 25;}\n+ else if ( (LA12_0=='\\\"') ) {s = 27;}\n \n- else if ( (LA12_0=='\\'') ) {s = 26;}\n+ else if ( (LA12_0=='\\'') ) {s = 28;}\n \n- else if ( (LA12_0=='/') ) {s = 27;}\n+ else if ( (LA12_0=='/') ) {s = 29;}\n \n- else if ( ((LA12_0>='\\t' && LA12_0<='\\n')||LA12_0=='\\r'||LA12_0==' ') ) {s = 28;}\n+ else if ( ((LA12_0>='\\t' && LA12_0<='\\n')||LA12_0=='\\r'||LA12_0==' ') ) {s = 30;}\n \n- else if ( ((LA12_0>='\\u0000' && LA12_0<='\\b')||(LA12_0>='\\u000B' && LA12_0<='\\f')||(LA12_0>='\\u000E' && LA12_0<='\\u001F')||LA12_0=='!'||(LA12_0>='#' && LA12_0<='&')||(LA12_0>='(' && LA12_0<=',')||LA12_0==':'||(LA12_0>='<' && LA12_0<='>')||LA12_0=='@'||LA12_0=='\\\\'||LA12_0=='`'||LA12_0=='|'||(LA12_0>='~' && LA12_0<='\\uFFFF')) ) {s = 29;}\n+ else if ( ((LA12_0>='\\u0000' && LA12_0<='\\b')||(LA12_0>='\\u000B' && LA12_0<='\\f')||(LA12_0>='\\u000E' && LA12_0<='\\u001F')||LA12_0=='!'||(LA12_0>='#' && LA12_0<='&')||(LA12_0>='(' && LA12_0<=',')||LA12_0==':'||(LA12_0>='<' && LA12_0<='>')||LA12_0=='@'||LA12_0=='\\\\'||LA12_0=='`'||LA12_0=='|'||(LA12_0>='~' && LA12_0<='\\uFFFF')) ) {s = 31;}\n \n if ( s>=0 ) return s;\n break;\n case 2 : \n- int LA12_25 = input.LA(1);\n+ int LA12_28 = input.LA(1);\n \n s = -1;\n- if ( ((LA12_25>='\\u0000' && LA12_25<='\\uFFFF')) ) {s = 64;}\n+ if ( ((LA12_28>='\\u0000' && LA12_28<='\\uFFFF')) ) {s = 70;}\n \n- else s = 29;\n+ else s = 31;\n \n if ( s>=0 ) return s;\n break;", "raw_url": "https://github.com/nasa/CertWare/raw/110fa3222ae2931978d7921dc8e6af8c7f43abd3/net.certware.intent.state.ui%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fstate%2Fui%2Fcontentassist%2Fantlr%2Finternal%2FInternalStateSpecificationLexer.java", "sha": "3e5946a316aefba89e7f97014fcf97f0d2d714d2", "status": "modified" }, { "additions": 27, "blob_url": "https://github.com/nasa/CertWare/blob/110fa3222ae2931978d7921dc8e6af8c7f43abd3/net.certware.intent.state%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fstate%2FStateSpecification.ecore", "changes": 36, "contents_url": "https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent.state%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fstate%2FStateSpecification.ecore?ref=110fa3222ae2931978d7921dc8e6af8c7f43abd3", "deletions": 9, "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/StateSpecification.ecore", "new_code": " <eClassifiers xsi:type=\"ecore:EClass\" name=\"ValueRange\">\n </eClassifiers>\n <eClassifiers xsi:type=\"ecore:EClass\" name=\"ValueList\">\n </eClassifiers>\n <eClassifiers xsi:type=\"ecore:EClass\" name=\"Output\">\n <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"range\" eType=\"#//ValueRange\"\n containment=\"true\"/>\n <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"valueList\" eType=\"#//ValueList\"\n containment=\"true\"/>\n <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"range\" eType=\"#//ValueRange\"\n containment=\"true\"/>\n <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"valueList\" eType=\"#//ValueList\"\n containment=\"true\"/>\n <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"valueHandling\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString\"/>\n <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"granularity\" eType=\"#//BigUnitValue\"\n containment=\"true\"/>\n <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"arrivalRateAvg\" eType=\"#//BigUnitValue\"\n containment=\"true\"/>\n <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"arrivalRateMinimum\" eType=\"#//BigUnitValue\"\n containment=\"true\"/>\n <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"arrivalRateMaximum\" eType=\"#//BigUnitValue\"\n containment=\"true\"/>\n <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"obsolescence\" eType=\"#//BigUnitValue\"\n <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"appearsIn\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString\"/>\n <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"description\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString\"/>\n <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"structure\" eType=\"#//TriggerTable\"\n containment=\"true\"/>", "new_methods": [], "old_code": " <eClassifiers xsi:type=\"ecore:EClass\" name=\"Output\">\n <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"lower\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBigDecimal\"/>\n <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"upper\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBigDecimal\"/>\n <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"rangeType\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString\"/>\n <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"rangeUnits\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString\"/>\n <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"values\" unique=\"false\"\n upperBound=\"-1\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString\"/>\n <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"rate\" eType=\"#//BigUnitValue\"\n <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"variables\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString\"/>", "old_methods": [], "patch": "@@ -103,13 +103,21 @@\n <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"rows\" upperBound=\"-1\" eType=\"#//Trigger\"\n containment=\"true\"/>\n </eClassifiers>\n- <eClassifiers xsi:type=\"ecore:EClass\" name=\"Output\">\n+ <eClassifiers xsi:type=\"ecore:EClass\" name=\"ValueRange\">\n <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"lower\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBigDecimal\"/>\n <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"upper\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBigDecimal\"/>\n <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"rangeType\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString\"/>\n <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"rangeUnits\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString\"/>\n+ </eClassifiers>\n+ <eClassifiers xsi:type=\"ecore:EClass\" name=\"ValueList\">\n <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"values\" unique=\"false\"\n upperBound=\"-1\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString\"/>\n+ </eClassifiers>\n+ <eClassifiers xsi:type=\"ecore:EClass\" name=\"Output\">\n+ <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"range\" eType=\"#//ValueRange\"\n+ containment=\"true\"/>\n+ <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"valueList\" eType=\"#//ValueList\"\n+ containment=\"true\"/>\n <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"rate\" eType=\"#//BigUnitValue\"\n containment=\"true\"/>\n <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"delay\" eType=\"#//BigUnitValue\"\n@@ -132,16 +140,26 @@\n containment=\"true\"/>\n </eClassifiers>\n <eClassifiers xsi:type=\"ecore:EClass\" name=\"Input\">\n- <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"lower\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBigDecimal\"/>\n- <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"upper\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBigDecimal\"/>\n- <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"rangeType\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString\"/>\n- <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"rangeUnits\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString\"/>\n- <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"values\" unique=\"false\"\n- upperBound=\"-1\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString\"/>\n- <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"rate\" eType=\"#//BigUnitValue\"\n+ <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"range\" eType=\"#//ValueRange\"\n+ containment=\"true\"/>\n+ <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"valueList\" eType=\"#//ValueList\"\n+ containment=\"true\"/>\n+ <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"valueHandling\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString\"/>\n+ <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"granularity\" eType=\"#//BigUnitValue\"\n+ containment=\"true\"/>\n+ <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"arrivalRateAvg\" eType=\"#//BigUnitValue\"\n+ containment=\"true\"/>\n+ <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"arrivalRateMinimum\" eType=\"#//BigUnitValue\"\n+ containment=\"true\"/>\n+ <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"arrivalRateMaximum\" eType=\"#//BigUnitValue\"\n+ containment=\"true\"/>\n+ <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"obsolescence\" eType=\"#//BigUnitValue\"\n containment=\"true\"/>\n- <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"variables\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString\"/>\n <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"references\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString\"/>\n+ <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"appearsIn\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString\"/>\n+ <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"description\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString\"/>\n <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"comments\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString\"/>\n+ <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"structure\" eType=\"#//TriggerTable\"\n+ containment=\"true\"/>\n </eClassifiers>\n </ecore:EPackage>", "raw_url": "https://github.com/nasa/CertWare/raw/110fa3222ae2931978d7921dc8e6af8c7f43abd3/net.certware.intent.state%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fstate%2FStateSpecification.ecore", "sha": "919766651d67729923cdefcbbe8b9b694b9666bf", "status": "modified" }, { "additions": 22, "blob_url": "https://github.com/nasa/CertWare/blob/110fa3222ae2931978d7921dc8e6af8c7f43abd3/net.certware.intent.state%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fstate%2FStateSpecification.genmodel", "changes": 34, "contents_url": "https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent.state%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fstate%2FStateSpecification.genmodel?ref=110fa3222ae2931978d7921dc8e6af8c7f43abd3", "deletions": 12, "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/StateSpecification.genmodel", "new_code": " <genClasses ecoreClass=\"StateSpecification.ecore#//ValueRange\">\n <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute StateSpecification.ecore#//ValueRange/lower\"/>\n <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute StateSpecification.ecore#//ValueRange/upper\"/>\n <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute StateSpecification.ecore#//ValueRange/rangeType\"/>\n <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute StateSpecification.ecore#//ValueRange/rangeUnits\"/>\n </genClasses>\n <genClasses ecoreClass=\"StateSpecification.ecore#//ValueList\">\n <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute StateSpecification.ecore#//ValueList/values\"/>\n </genClasses>\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference StateSpecification.ecore#//Output/range\"/>\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference StateSpecification.ecore#//Output/valueList\"/>\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference StateSpecification.ecore#//Input/range\"/>\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference StateSpecification.ecore#//Input/valueList\"/>\n <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute StateSpecification.ecore#//Input/valueHandling\"/>\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference StateSpecification.ecore#//Input/granularity\"/>\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference StateSpecification.ecore#//Input/arrivalRateAvg\"/>\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference StateSpecification.ecore#//Input/arrivalRateMinimum\"/>\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference StateSpecification.ecore#//Input/arrivalRateMaximum\"/>\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference StateSpecification.ecore#//Input/obsolescence\"/>\n <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute StateSpecification.ecore#//Input/appearsIn\"/>\n <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute StateSpecification.ecore#//Input/description\"/>\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference StateSpecification.ecore#//Input/structure\"/>", "new_methods": [], "old_code": " <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute StateSpecification.ecore#//Output/lower\"/>\n <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute StateSpecification.ecore#//Output/upper\"/>\n <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute StateSpecification.ecore#//Output/rangeType\"/>\n <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute StateSpecification.ecore#//Output/rangeUnits\"/>\n <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute StateSpecification.ecore#//Output/values\"/>\n <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute StateSpecification.ecore#//Input/lower\"/>\n <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute StateSpecification.ecore#//Input/upper\"/>\n <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute StateSpecification.ecore#//Input/rangeType\"/>\n <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute StateSpecification.ecore#//Input/rangeUnits\"/>\n <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute StateSpecification.ecore#//Input/values\"/>\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference StateSpecification.ecore#//Input/rate\"/>\n <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute StateSpecification.ecore#//Input/variables\"/>", "old_methods": [], "patch": "@@ -92,12 +92,18 @@\n <genClasses ecoreClass=\"StateSpecification.ecore#//TriggerTable\">\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference StateSpecification.ecore#//TriggerTable/rows\"/>\n </genClasses>\n+ <genClasses ecoreClass=\"StateSpecification.ecore#//ValueRange\">\n+ <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute StateSpecification.ecore#//ValueRange/lower\"/>\n+ <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute StateSpecification.ecore#//ValueRange/upper\"/>\n+ <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute StateSpecification.ecore#//ValueRange/rangeType\"/>\n+ <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute StateSpecification.ecore#//ValueRange/rangeUnits\"/>\n+ </genClasses>\n+ <genClasses ecoreClass=\"StateSpecification.ecore#//ValueList\">\n+ <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute StateSpecification.ecore#//ValueList/values\"/>\n+ </genClasses>\n <genClasses ecoreClass=\"StateSpecification.ecore#//Output\">\n- <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute StateSpecification.ecore#//Output/lower\"/>\n- <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute StateSpecification.ecore#//Output/upper\"/>\n- <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute StateSpecification.ecore#//Output/rangeType\"/>\n- <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute StateSpecification.ecore#//Output/rangeUnits\"/>\n- <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute StateSpecification.ecore#//Output/values\"/>\n+ <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference StateSpecification.ecore#//Output/range\"/>\n+ <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference StateSpecification.ecore#//Output/valueList\"/>\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference StateSpecification.ecore#//Output/rate\"/>\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference StateSpecification.ecore#//Output/delay\"/>\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference StateSpecification.ecore#//Output/deadline\"/>\n@@ -114,15 +120,19 @@\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference StateSpecification.ecore#//Output/table\"/>\n </genClasses>\n <genClasses ecoreClass=\"StateSpecification.ecore#//Input\">\n- <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute StateSpecification.ecore#//Input/lower\"/>\n- <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute StateSpecification.ecore#//Input/upper\"/>\n- <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute StateSpecification.ecore#//Input/rangeType\"/>\n- <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute StateSpecification.ecore#//Input/rangeUnits\"/>\n- <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute StateSpecification.ecore#//Input/values\"/>\n- <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference StateSpecification.ecore#//Input/rate\"/>\n- <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute StateSpecification.ecore#//Input/variables\"/>\n+ <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference StateSpecification.ecore#//Input/range\"/>\n+ <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference StateSpecification.ecore#//Input/valueList\"/>\n+ <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute StateSpecification.ecore#//Input/valueHandling\"/>\n+ <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference StateSpecification.ecore#//Input/granularity\"/>\n+ <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference StateSpecification.ecore#//Input/arrivalRateAvg\"/>\n+ <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference StateSpecification.ecore#//Input/arrivalRateMinimum\"/>\n+ <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference StateSpecification.ecore#//Input/arrivalRateMaximum\"/>\n+ <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference StateSpecification.ecore#//Input/obsolescence\"/>\n <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute StateSpecification.ecore#//Input/references\"/>\n+ <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute StateSpecification.ecore#//Input/appearsIn\"/>\n+ <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute StateSpecification.ecore#//Input/description\"/>\n <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute StateSpecification.ecore#//Input/comments\"/>\n+ <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference StateSpecification.ecore#//Input/structure\"/>\n </genClasses>\n </genPackages>\n </genmodel:GenModel>", "raw_url": "https://github.com/nasa/CertWare/raw/110fa3222ae2931978d7921dc8e6af8c7f43abd3/net.certware.intent.state%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fstate%2FStateSpecification.genmodel", "sha": "bf9e47920489e92b523c4a54b557a87a2e1f68a6", "status": "modified" }, { "additions": 356, "blob_url": "https://github.com/nasa/CertWare/blob/110fa3222ae2931978d7921dc8e6af8c7f43abd3/net.certware.intent.state%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fstate%2Fparser%2Fantlr%2Finternal%2FInternalStateSpecification.g", "changes": 560, "contents_url": "https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent.state%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fstate%2Fparser%2Fantlr%2Finternal%2FInternalStateSpecification.g?ref=110fa3222ae2931978d7921dc8e6af8c7f43abd3", "deletions": 204, "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g", "new_code": "// Entry rule entryRuleValueRange\nentryRuleValueRange returns [EObject current=null] \n\t{ newCompositeNode(grammarAccess.getValueRangeRule()); }\n\t iv_ruleValueRange=ruleValueRange \n\t { $current=$iv_ruleValueRange.current; } \n// Rule ValueRange\nruleValueRange returns [EObject current=null] \n(\totherlv_0='{' \n \tnewLeafNode(otherlv_0, grammarAccess.getValueRangeAccess().getLeftCurlyBracketKeyword_0());\n\t newCompositeNode(grammarAccess.getValueRangeAccess().getLowerBigDecimalTypeParserRuleCall_1_0()); \n\t\tlv_lower_1_0=ruleBigDecimalType\t\t{\n\t $current = createModelElementForParent(grammarAccess.getValueRangeRule());\n \t\tlv_lower_1_0, \n)\totherlv_2='...' \n \tnewLeafNode(otherlv_2, grammarAccess.getValueRangeAccess().getFullStopFullStopFullStopKeyword_2());\n\t newCompositeNode(grammarAccess.getValueRangeAccess().getUpperBigDecimalTypeParserRuleCall_3_0()); \n\t\tlv_upper_3_0=ruleBigDecimalType\t\t{\n\t $current = createModelElementForParent(grammarAccess.getValueRangeRule());\n \t\tlv_upper_3_0, \n)\totherlv_4='}' \n \tnewLeafNode(otherlv_4, grammarAccess.getValueRangeAccess().getRightCurlyBracketKeyword_4());\n\totherlv_5='type' \n \tnewLeafNode(otherlv_5, grammarAccess.getValueRangeAccess().getTypeKeyword_5());\n\t\tlv_rangeType_6_0=RULE_STRING\n\t\t\tnewLeafNode(lv_rangeType_6_0, grammarAccess.getValueRangeAccess().getRangeTypeSTRINGTerminalRuleCall_6_0()); \n\t $current = createModelElement(grammarAccess.getValueRangeRule());\n \t\tlv_rangeType_6_0, \n)\totherlv_7='units' \n \tnewLeafNode(otherlv_7, grammarAccess.getValueRangeAccess().getUnitsKeyword_7());\n\t\tlv_rangeUnits_8_0=RULE_STRING\n\t\t\tnewLeafNode(lv_rangeUnits_8_0, grammarAccess.getValueRangeAccess().getRangeUnitsSTRINGTerminalRuleCall_8_0()); \n\t $current = createModelElement(grammarAccess.getValueRangeRule());\n \t\tlv_rangeUnits_8_0, \n)\totherlv_9='}' \n \tnewLeafNode(otherlv_9, grammarAccess.getValueRangeAccess().getRightCurlyBracketKeyword_9());\n }\n)\n;\n\n\n\n\n\n// Entry rule entryRuleValueList\nentryRuleValueList returns [EObject current=null] \n\t:\n\t{ newCompositeNode(grammarAccess.getValueListRule()); }\n\t iv_ruleValueList=ruleValueList \n\t { $current=$iv_ruleValueList.current; } \n\t EOF \n;\n\n// Rule ValueList\nruleValueList returns [EObject current=null] \n @init { enterRule(); \n @after { leaveRule(); }:\n(\totherlv_0='{' \n \tnewLeafNode(otherlv_0, grammarAccess.getValueListAccess().getLeftCurlyBracketKeyword_0());\n\t\tlv_values_1_0=RULE_STRING\n\t\t\tnewLeafNode(lv_values_1_0, grammarAccess.getValueListAccess().getValuesSTRINGTerminalRuleCall_1_0()); \n\t $current = createModelElement(grammarAccess.getValueListRule());\n \t\tlv_values_1_0, \n)+\totherlv_2='}' \n {\n \tnewLeafNode(otherlv_2, grammarAccess.getValueListAccess().getRightCurlyBracketKeyword_2());\n }\n)\n;\n\n\n\n\n\n// Entry rule entryRuleOutput\nentryRuleOutput returns [EObject current=null] \n\t:\n\t{ newCompositeNode(grammarAccess.getOutputRule()); }\n\t iv_ruleOutput=ruleOutput \n\t { $current=$iv_ruleOutput.current; } \n\t EOF \n;\n\n// Rule Output\nruleOutput returns [EObject current=null] \n @init { enterRule(); \n }\n @after { leaveRule(); }:\n((\n {\n $current = forceCreateModelElement(\n grammarAccess.getOutputAccess().getOutputAction_0(),\n $current);\n }\n)(\totherlv_1='range' \n {\n \tnewLeafNode(otherlv_1, grammarAccess.getOutputAccess().getRangeKeyword_1_0());\n }\n(\n(\n\t\t{ \n\t newCompositeNode(grammarAccess.getOutputAccess().getRangeValueRangeParserRuleCall_1_1_0()); \n\t }\n\t\tlv_range_2_0=ruleValueRange\t\t{\n\t if ($current==null) {\n\t $current = createModelElementForParent(grammarAccess.getOutputRule());\n\t }\n \t\tset(\n \t\t\t$current, \n \t\t\t\"range\",\n \t\tlv_range_2_0, \n \t\t\"ValueRange\");\n\t afterParserOrEnumRuleCall();\n\t }\n\n)\n))?(\totherlv_3='value-list' \n \tnewLeafNode(otherlv_3, grammarAccess.getOutputAccess().getValueListKeyword_2_0());\n(\n(\n\t\t{ \n\t newCompositeNode(grammarAccess.getOutputAccess().getValueListValueListParserRuleCall_2_1_0()); \n\t }\n\t\tlv_valueList_4_0=ruleValueList\t\t{\n\t if ($current==null) {\n\t $current = createModelElementForParent(grammarAccess.getOutputRule());\n\t }\n \t\tset(\n \t\t\t$current, \n \t\t\t\"valueList\",\n \t\tlv_valueList_4_0, \n \t\t\"ValueList\");\n\t afterParserOrEnumRuleCall();\n\t }\n\n)\n))?(\totherlv_5='rate' \n \tnewLeafNode(otherlv_5, grammarAccess.getOutputAccess().getRateKeyword_3_0());\n\t newCompositeNode(grammarAccess.getOutputAccess().getRateBigUnitValueParserRuleCall_3_1_0()); \n\t\tlv_rate_6_0=ruleBigUnitValue\t\t{\n \t\tlv_rate_6_0, \n))?(\totherlv_7='initiation-delay' \n \tnewLeafNode(otherlv_7, grammarAccess.getOutputAccess().getInitiationDelayKeyword_4_0());\n\t newCompositeNode(grammarAccess.getOutputAccess().getDelayBigUnitValueParserRuleCall_4_1_0()); \n\t\tlv_delay_8_0=ruleBigUnitValue\t\t{\n \t\tlv_delay_8_0, \n))?(\totherlv_9='completion-deadline' \n \tnewLeafNode(otherlv_9, grammarAccess.getOutputAccess().getCompletionDeadlineKeyword_5_0());\n\t newCompositeNode(grammarAccess.getOutputAccess().getDeadlineBigUnitValueParserRuleCall_5_1_0()); \n\t\tlv_deadline_10_0=ruleBigUnitValue\t\t{\n \t\tlv_deadline_10_0, \n))?(\totherlv_11='completion-exception' \n \tnewLeafNode(otherlv_11, grammarAccess.getOutputAccess().getCompletionExceptionKeyword_6_0());\n\t\tlv_completionHandling_12_0=RULE_STRING\n\t\t\tnewLeafNode(lv_completionHandling_12_0, grammarAccess.getOutputAccess().getCompletionHandlingSTRINGTerminalRuleCall_6_1_0()); \n \t\tlv_completionHandling_12_0, \n))?(\totherlv_13='variables' \n \tnewLeafNode(otherlv_13, grammarAccess.getOutputAccess().getVariablesKeyword_7_0());\n\t\tlv_variables_14_0=RULE_STRING\n\t\t\tnewLeafNode(lv_variables_14_0, grammarAccess.getOutputAccess().getVariablesSTRINGTerminalRuleCall_7_1_0()); \n \t\tlv_variables_14_0, \n))?(\totherlv_15='relationship' \n \tnewLeafNode(otherlv_15, grammarAccess.getOutputAccess().getRelationshipKeyword_8_0());\n\t\tlv_relationship_16_0=RULE_STRING\n\t\t\tnewLeafNode(lv_relationship_16_0, grammarAccess.getOutputAccess().getRelationshipSTRINGTerminalRuleCall_8_1_0()); \n \t\tlv_relationship_16_0, \n))?(\totherlv_17='min-response-time' \n \tnewLeafNode(otherlv_17, grammarAccess.getOutputAccess().getMinResponseTimeKeyword_9_0());\n\t newCompositeNode(grammarAccess.getOutputAccess().getMinResponseBigUnitValueParserRuleCall_9_1_0()); \n\t\tlv_minResponse_18_0=ruleBigUnitValue\t\t{\n \t\tlv_minResponse_18_0, \n))?(\totherlv_19='max-response-time' \n \tnewLeafNode(otherlv_19, grammarAccess.getOutputAccess().getMaxResponseTimeKeyword_10_0());\n\t newCompositeNode(grammarAccess.getOutputAccess().getMaxResponseBigUnitValueParserRuleCall_10_1_0()); \n\t\tlv_maxResponse_20_0=ruleBigUnitValue\t\t{\n \t\tlv_maxResponse_20_0, \n))?(\totherlv_21='feedback-exception' \n \tnewLeafNode(otherlv_21, grammarAccess.getOutputAccess().getFeedbackExceptionKeyword_11_0());\n\t\tlv_feebackHandling_22_0=RULE_STRING\n\t\t\tnewLeafNode(lv_feebackHandling_22_0, grammarAccess.getOutputAccess().getFeebackHandlingSTRINGTerminalRuleCall_11_1_0()); \n \t\tlv_feebackHandling_22_0, \n))?(\totherlv_23='reversed-by' \n \tnewLeafNode(otherlv_23, grammarAccess.getOutputAccess().getReversedByKeyword_12_0());\n\t\tlv_reversed_24_0=RULE_STRING\n\t\t\tnewLeafNode(lv_reversed_24_0, grammarAccess.getOutputAccess().getReversedSTRINGTerminalRuleCall_12_1_0()); \n \t\tlv_reversed_24_0, \n))?(\totherlv_25='references' \n \tnewLeafNode(otherlv_25, grammarAccess.getOutputAccess().getReferencesKeyword_13_0());\n\t\tlv_references_26_0=RULE_STRING\n\t\t\tnewLeafNode(lv_references_26_0, grammarAccess.getOutputAccess().getReferencesSTRINGTerminalRuleCall_13_1_0()); \n \t\tlv_references_26_0, \n))?(\totherlv_27='comments' \n \tnewLeafNode(otherlv_27, grammarAccess.getOutputAccess().getCommentsKeyword_14_0());\n\t\tlv_comments_28_0=RULE_STRING\n\t\t\tnewLeafNode(lv_comments_28_0, grammarAccess.getOutputAccess().getCommentsSTRINGTerminalRuleCall_14_1_0()); \n \t\tlv_comments_28_0, \n))?(\totherlv_29='contents' \n \tnewLeafNode(otherlv_29, grammarAccess.getOutputAccess().getContentsKeyword_15_0());\n\t\tlv_contents_30_0=RULE_STRING\n\t\t\tnewLeafNode(lv_contents_30_0, grammarAccess.getOutputAccess().getContentsSTRINGTerminalRuleCall_15_1_0()); \n \t\tlv_contents_30_0, \n))?(\totherlv_31='triggering' \n \tnewLeafNode(otherlv_31, grammarAccess.getOutputAccess().getTriggeringKeyword_16_0());\n\t newCompositeNode(grammarAccess.getOutputAccess().getTableTriggerTableParserRuleCall_16_1_0()); \n\t\tlv_table_32_0=ruleTriggerTable\t\t{\n \t\tlv_table_32_0, \n)(\totherlv_1='range' \n \tnewLeafNode(otherlv_1, grammarAccess.getInputAccess().getRangeKeyword_1_0());\n\t newCompositeNode(grammarAccess.getInputAccess().getRangeValueRangeParserRuleCall_1_1_0()); \n\t\tlv_range_2_0=ruleValueRange\t\t{\n \t\t\t\"range\",\n \t\tlv_range_2_0, \n \t\t\"ValueRange\");\n))?(\totherlv_3='value-list' \n \tnewLeafNode(otherlv_3, grammarAccess.getInputAccess().getValueListKeyword_2_0());\n\t newCompositeNode(grammarAccess.getInputAccess().getValueListValueListParserRuleCall_2_1_0()); \n\t\tlv_valueList_4_0=ruleValueList\t\t{\n \t\t\t\"valueList\",\n \t\tlv_valueList_4_0, \n \t\t\"ValueList\");\n))?(\totherlv_5='value-exception' \n \tnewLeafNode(otherlv_5, grammarAccess.getInputAccess().getValueExceptionKeyword_3_0());\n\t\tlv_valueHandling_6_0=RULE_STRING\n\t\t\tnewLeafNode(lv_valueHandling_6_0, grammarAccess.getInputAccess().getValueHandlingSTRINGTerminalRuleCall_3_1_0()); \n \t\t\t\"valueHandling\",\n \t\tlv_valueHandling_6_0, \n))?(\totherlv_7='granularity' \n \tnewLeafNode(otherlv_7, grammarAccess.getInputAccess().getGranularityKeyword_4_0());\n\t\t{ \n\t newCompositeNode(grammarAccess.getInputAccess().getGranularityBigUnitValueParserRuleCall_4_1_0()); \n\t }\n\t\tlv_granularity_8_0=ruleBigUnitValue\t\t{\n\t $current = createModelElementForParent(grammarAccess.getInputRule());\n \t\tset(\n \t\t\t\"granularity\",\n \t\tlv_granularity_8_0, \n \t\t\"BigUnitValue\");\n\t afterParserOrEnumRuleCall();\n))?(\totherlv_9='arrival-rate-avg' \n \tnewLeafNode(otherlv_9, grammarAccess.getInputAccess().getArrivalRateAvgKeyword_5_0());\n(\n(\n\t\t{ \n\t newCompositeNode(grammarAccess.getInputAccess().getArrivalRateAvgBigUnitValueParserRuleCall_5_1_0()); \n\t }\n\t\tlv_arrivalRateAvg_10_0=ruleBigUnitValue\t\t{\n\t if ($current==null) {\n\t $current = createModelElementForParent(grammarAccess.getInputRule());\n\t }\n \t\tset(\n \t\t\t$current, \n \t\t\t\"arrivalRateAvg\",\n \t\tlv_arrivalRateAvg_10_0, \n \t\t\"BigUnitValue\");\n\t afterParserOrEnumRuleCall();\n\t }\n\n)\n))?(\totherlv_11='arrival-rate-minimum' \n \tnewLeafNode(otherlv_11, grammarAccess.getInputAccess().getArrivalRateMinimumKeyword_6_0());\n\t\t{ \n\t newCompositeNode(grammarAccess.getInputAccess().getArrivalRateMinimumBigUnitValueParserRuleCall_6_1_0()); \n\t }\n\t\tlv_arrivalRateMinimum_12_0=ruleBigUnitValue\t\t{\n\t $current = createModelElementForParent(grammarAccess.getInputRule());\n \t\tset(\n \t\t\t\"arrivalRateMinimum\",\n \t\tlv_arrivalRateMinimum_12_0, \n \t\t\"BigUnitValue\");\n\t afterParserOrEnumRuleCall();\n))?(\totherlv_13='arrival-rate-maximum' \n \tnewLeafNode(otherlv_13, grammarAccess.getInputAccess().getArrivalRateMaximumKeyword_7_0());\n(\n(\n\t\t{ \n\t newCompositeNode(grammarAccess.getInputAccess().getArrivalRateMaximumBigUnitValueParserRuleCall_7_1_0()); \n\t }\n\t\tlv_arrivalRateMaximum_14_0=ruleBigUnitValue\t\t{\n\t if ($current==null) {\n\t $current = createModelElementForParent(grammarAccess.getInputRule());\n\t }\n \t\tset(\n \t\t\t$current, \n \t\t\t\"arrivalRateMaximum\",\n \t\tlv_arrivalRateMaximum_14_0, \n \t\t\"BigUnitValue\");\n\t afterParserOrEnumRuleCall();\n\t }\n\n)\n))?(\totherlv_15='obsolescence' \n \tnewLeafNode(otherlv_15, grammarAccess.getInputAccess().getObsolescenceKeyword_8_0());\n\t newCompositeNode(grammarAccess.getInputAccess().getObsolescenceBigUnitValueParserRuleCall_8_1_0()); \n\t\tlv_obsolescence_16_0=ruleBigUnitValue\t\t{\n \t\t\t\"obsolescence\",\n \t\tlv_obsolescence_16_0, \n))?(\totherlv_17='references' \n \tnewLeafNode(otherlv_17, grammarAccess.getInputAccess().getReferencesKeyword_9_0());\n\t\tlv_references_18_0=RULE_STRING\n\t\t\tnewLeafNode(lv_references_18_0, grammarAccess.getInputAccess().getReferencesSTRINGTerminalRuleCall_9_1_0()); \n \t\t\t\"references\",\n \t\tlv_references_18_0, \n))?(\totherlv_19='appears-in' \n \tnewLeafNode(otherlv_19, grammarAccess.getInputAccess().getAppearsInKeyword_10_0());\n\t\tlv_appearsIn_20_0=RULE_STRING\n\t\t\tnewLeafNode(lv_appearsIn_20_0, grammarAccess.getInputAccess().getAppearsInSTRINGTerminalRuleCall_10_1_0()); \n \t\t\t\"appearsIn\",\n \t\tlv_appearsIn_20_0, \n \t\t\"STRING\");\n\t }\n\n)\n))?(\totherlv_21='description' \n {\n \tnewLeafNode(otherlv_21, grammarAccess.getInputAccess().getDescriptionKeyword_11_0());\n }\n(\n(\n\t\tlv_description_22_0=RULE_STRING\n\t\t{\n\t\t\tnewLeafNode(lv_description_22_0, grammarAccess.getInputAccess().getDescriptionSTRINGTerminalRuleCall_11_1_0()); \n\t\t}\n\t\t{\n\t if ($current==null) {\n\t $current = createModelElement(grammarAccess.getInputRule());\n\t }\n \t\tsetWithLastConsumed(\n \t\t\t$current, \n \t\t\t\"description\",\n \t\tlv_description_22_0, \n))?(\totherlv_23='comments' \n \tnewLeafNode(otherlv_23, grammarAccess.getInputAccess().getCommentsKeyword_12_0());\n\t\tlv_comments_24_0=RULE_STRING\n\t\t\tnewLeafNode(lv_comments_24_0, grammarAccess.getInputAccess().getCommentsSTRINGTerminalRuleCall_12_1_0()); \n \t\tlv_comments_24_0, \n)\n))?(\totherlv_25='triggering' \n {\n \tnewLeafNode(otherlv_25, grammarAccess.getInputAccess().getTriggeringKeyword_13_0());\n }\n(\n(\n\t\t{ \n\t newCompositeNode(grammarAccess.getInputAccess().getStructureTriggerTableParserRuleCall_13_1_0()); \n\t }\n\t\tlv_structure_26_0=ruleTriggerTable\t\t{\n\t if ($current==null) {\n\t $current = createModelElementForParent(grammarAccess.getInputRule());\n\t }\n \t\tset(\n \t\t\t$current, \n \t\t\t\"structure\",\n \t\tlv_structure_26_0, \n \t\t\"TriggerTable\");\n\t afterParserOrEnumRuleCall();\n\t }\n", "new_methods": [], "old_code": "// Entry rule entryRuleOutput\nentryRuleOutput returns [EObject current=null] \n\t{ newCompositeNode(grammarAccess.getOutputRule()); }\n\t iv_ruleOutput=ruleOutput \n\t { $current=$iv_ruleOutput.current; } \n// Rule Output\nruleOutput returns [EObject current=null] \n((\n {\n $current = forceCreateModelElement(\n grammarAccess.getOutputAccess().getOutputAction_0(),\n $current);\n }\n)((\totherlv_1='range' \n {\n \tnewLeafNode(otherlv_1, grammarAccess.getOutputAccess().getRangeKeyword_1_0_0());\n }\n\totherlv_2='{' \n \tnewLeafNode(otherlv_2, grammarAccess.getOutputAccess().getLeftCurlyBracketKeyword_1_0_1());\n\t newCompositeNode(grammarAccess.getOutputAccess().getLowerBigDecimalTypeParserRuleCall_1_0_2_0()); \n\t\tlv_lower_3_0=ruleBigDecimalType\t\t{\n\t $current = createModelElementForParent(grammarAccess.getOutputRule());\n \t\tlv_lower_3_0, \n)\totherlv_4='...' \n \tnewLeafNode(otherlv_4, grammarAccess.getOutputAccess().getFullStopFullStopFullStopKeyword_1_0_3());\n\t newCompositeNode(grammarAccess.getOutputAccess().getUpperBigDecimalTypeParserRuleCall_1_0_4_0()); \n\t\tlv_upper_5_0=ruleBigDecimalType\t\t{\n\t $current = createModelElementForParent(grammarAccess.getOutputRule());\n \t\tlv_upper_5_0, \n)\totherlv_6='}' \n \tnewLeafNode(otherlv_6, grammarAccess.getOutputAccess().getRightCurlyBracketKeyword_1_0_5());\n\totherlv_7='type' \n \tnewLeafNode(otherlv_7, grammarAccess.getOutputAccess().getTypeKeyword_1_0_6());\n\t\tlv_rangeType_8_0=RULE_STRING\n\t\t\tnewLeafNode(lv_rangeType_8_0, grammarAccess.getOutputAccess().getRangeTypeSTRINGTerminalRuleCall_1_0_7_0()); \n\t $current = createModelElement(grammarAccess.getOutputRule());\n \t\tlv_rangeType_8_0, \n)\totherlv_9='units' \n \tnewLeafNode(otherlv_9, grammarAccess.getOutputAccess().getUnitsKeyword_1_0_8());\n\t\tlv_rangeUnits_10_0=RULE_STRING\n\t\t\tnewLeafNode(lv_rangeUnits_10_0, grammarAccess.getOutputAccess().getRangeUnitsSTRINGTerminalRuleCall_1_0_9_0()); \n\t $current = createModelElement(grammarAccess.getOutputRule());\n \t\tlv_rangeUnits_10_0, \n))\n |(\totherlv_11='values' \n \tnewLeafNode(otherlv_11, grammarAccess.getOutputAccess().getValuesKeyword_1_1_0());\n\totherlv_12='{' \n \tnewLeafNode(otherlv_12, grammarAccess.getOutputAccess().getLeftCurlyBracketKeyword_1_1_1());\n\t\tlv_values_13_0=RULE_STRING\n\t\t\tnewLeafNode(lv_values_13_0, grammarAccess.getOutputAccess().getValuesSTRINGTerminalRuleCall_1_1_2_0()); \n\t $current = createModelElement(grammarAccess.getOutputRule());\n \t\tlv_values_13_0, \n)*\totherlv_14='}' \n \tnewLeafNode(otherlv_14, grammarAccess.getOutputAccess().getRightCurlyBracketKeyword_1_1_3());\n))(\totherlv_15='rate' \n \tnewLeafNode(otherlv_15, grammarAccess.getOutputAccess().getRateKeyword_2_0());\n\t newCompositeNode(grammarAccess.getOutputAccess().getRateBigUnitValueParserRuleCall_2_1_0()); \n\t\tlv_rate_16_0=ruleBigUnitValue\t\t{\n \t\tlv_rate_16_0, \n))?(\totherlv_17='initiation-delay' \n \tnewLeafNode(otherlv_17, grammarAccess.getOutputAccess().getInitiationDelayKeyword_3_0());\n\t newCompositeNode(grammarAccess.getOutputAccess().getDelayBigUnitValueParserRuleCall_3_1_0()); \n\t\tlv_delay_18_0=ruleBigUnitValue\t\t{\n \t\tlv_delay_18_0, \n))?(\totherlv_19='completion-deadline' \n \tnewLeafNode(otherlv_19, grammarAccess.getOutputAccess().getCompletionDeadlineKeyword_4_0());\n\t newCompositeNode(grammarAccess.getOutputAccess().getDeadlineBigUnitValueParserRuleCall_4_1_0()); \n\t\tlv_deadline_20_0=ruleBigUnitValue\t\t{\n \t\tlv_deadline_20_0, \n))?(\totherlv_21='completion-exception' \n \tnewLeafNode(otherlv_21, grammarAccess.getOutputAccess().getCompletionExceptionKeyword_5_0());\n\t\tlv_completionHandling_22_0=RULE_STRING\n\t\t\tnewLeafNode(lv_completionHandling_22_0, grammarAccess.getOutputAccess().getCompletionHandlingSTRINGTerminalRuleCall_5_1_0()); \n \t\tlv_completionHandling_22_0, \n))?(\totherlv_23='variables' \n \tnewLeafNode(otherlv_23, grammarAccess.getOutputAccess().getVariablesKeyword_6_0());\n\t\tlv_variables_24_0=RULE_STRING\n\t\t\tnewLeafNode(lv_variables_24_0, grammarAccess.getOutputAccess().getVariablesSTRINGTerminalRuleCall_6_1_0()); \n \t\tlv_variables_24_0, \n))?(\totherlv_25='relationship' \n \tnewLeafNode(otherlv_25, grammarAccess.getOutputAccess().getRelationshipKeyword_7_0());\n\t\tlv_relationship_26_0=RULE_STRING\n\t\t\tnewLeafNode(lv_relationship_26_0, grammarAccess.getOutputAccess().getRelationshipSTRINGTerminalRuleCall_7_1_0()); \n \t\tlv_relationship_26_0, \n))?(\totherlv_27='min-response-time' \n \tnewLeafNode(otherlv_27, grammarAccess.getOutputAccess().getMinResponseTimeKeyword_8_0());\n\t newCompositeNode(grammarAccess.getOutputAccess().getMinResponseBigUnitValueParserRuleCall_8_1_0()); \n\t\tlv_minResponse_28_0=ruleBigUnitValue\t\t{\n \t\tlv_minResponse_28_0, \n))?(\totherlv_29='max-response-time' \n \tnewLeafNode(otherlv_29, grammarAccess.getOutputAccess().getMaxResponseTimeKeyword_9_0());\n\t newCompositeNode(grammarAccess.getOutputAccess().getMaxResponseBigUnitValueParserRuleCall_9_1_0()); \n\t\tlv_maxResponse_30_0=ruleBigUnitValue\t\t{\n \t\tlv_maxResponse_30_0, \n))?(\totherlv_31='feedback-exception' \n \tnewLeafNode(otherlv_31, grammarAccess.getOutputAccess().getFeedbackExceptionKeyword_10_0());\n\t\tlv_feebackHandling_32_0=RULE_STRING\n\t\t\tnewLeafNode(lv_feebackHandling_32_0, grammarAccess.getOutputAccess().getFeebackHandlingSTRINGTerminalRuleCall_10_1_0()); \n \t\tlv_feebackHandling_32_0, \n))?(\totherlv_33='reversed-by' \n \tnewLeafNode(otherlv_33, grammarAccess.getOutputAccess().getReversedByKeyword_11_0());\n\t\tlv_reversed_34_0=RULE_STRING\n\t\t\tnewLeafNode(lv_reversed_34_0, grammarAccess.getOutputAccess().getReversedSTRINGTerminalRuleCall_11_1_0()); \n \t\tlv_reversed_34_0, \n))?(\totherlv_35='references' \n \tnewLeafNode(otherlv_35, grammarAccess.getOutputAccess().getReferencesKeyword_12_0());\n\t\tlv_references_36_0=RULE_STRING\n\t\t\tnewLeafNode(lv_references_36_0, grammarAccess.getOutputAccess().getReferencesSTRINGTerminalRuleCall_12_1_0()); \n \t\tlv_references_36_0, \n))?(\totherlv_37='comments' \n \tnewLeafNode(otherlv_37, grammarAccess.getOutputAccess().getCommentsKeyword_13_0());\n\t\tlv_comments_38_0=RULE_STRING\n\t\t\tnewLeafNode(lv_comments_38_0, grammarAccess.getOutputAccess().getCommentsSTRINGTerminalRuleCall_13_1_0()); \n \t\tlv_comments_38_0, \n))?(\totherlv_39='contents' \n \tnewLeafNode(otherlv_39, grammarAccess.getOutputAccess().getContentsKeyword_14_0());\n\t\tlv_contents_40_0=RULE_STRING\n\t\t\tnewLeafNode(lv_contents_40_0, grammarAccess.getOutputAccess().getContentsSTRINGTerminalRuleCall_14_1_0()); \n \t\tlv_contents_40_0, \n))?(\totherlv_41='triggering' \n \tnewLeafNode(otherlv_41, grammarAccess.getOutputAccess().getTriggeringKeyword_15_0());\n\t newCompositeNode(grammarAccess.getOutputAccess().getTableTriggerTableParserRuleCall_15_1_0()); \n\t\tlv_table_42_0=ruleTriggerTable\t\t{\n \t\tlv_table_42_0, \n)((\totherlv_1='range' \n {\n \tnewLeafNode(otherlv_1, grammarAccess.getInputAccess().getRangeKeyword_1_0_0());\n }\n\totherlv_2='{' \n \tnewLeafNode(otherlv_2, grammarAccess.getInputAccess().getLeftCurlyBracketKeyword_1_0_1());\n\t newCompositeNode(grammarAccess.getInputAccess().getLowerBigDecimalTypeParserRuleCall_1_0_2_0()); \n\t\tlv_lower_3_0=ruleBigDecimalType\t\t{\n \t\t\t\"lower\",\n \t\tlv_lower_3_0, \n \t\t\"BigDecimalType\");\n)\totherlv_4='...' \n \tnewLeafNode(otherlv_4, grammarAccess.getInputAccess().getFullStopFullStopFullStopKeyword_1_0_3());\n\t newCompositeNode(grammarAccess.getInputAccess().getUpperBigDecimalTypeParserRuleCall_1_0_4_0()); \n\t\tlv_upper_5_0=ruleBigDecimalType\t\t{\n \t\t\t\"upper\",\n \t\tlv_upper_5_0, \n \t\t\"BigDecimalType\");\n)\totherlv_6='}' \n {\n \tnewLeafNode(otherlv_6, grammarAccess.getInputAccess().getRightCurlyBracketKeyword_1_0_5());\n }\n\totherlv_7='type' \n \tnewLeafNode(otherlv_7, grammarAccess.getInputAccess().getTypeKeyword_1_0_6());\n\t\tlv_rangeType_8_0=RULE_STRING\n\t\t\tnewLeafNode(lv_rangeType_8_0, grammarAccess.getInputAccess().getRangeTypeSTRINGTerminalRuleCall_1_0_7_0()); \n \t\t\t\"rangeType\",\n \t\tlv_rangeType_8_0, \n)\totherlv_9='units' \n \tnewLeafNode(otherlv_9, grammarAccess.getInputAccess().getUnitsKeyword_1_0_8());\n\t\tlv_rangeUnits_10_0=RULE_STRING\n\t\t{\n\t\t\tnewLeafNode(lv_rangeUnits_10_0, grammarAccess.getInputAccess().getRangeUnitsSTRINGTerminalRuleCall_1_0_9_0()); \n\t\t}\n\t\t{\n\t $current = createModelElement(grammarAccess.getInputRule());\n \t\tsetWithLastConsumed(\n \t\t\t\"rangeUnits\",\n \t\tlv_rangeUnits_10_0, \n \t\t\"STRING\");\n))\n |(\totherlv_11='values' \n \tnewLeafNode(otherlv_11, grammarAccess.getInputAccess().getValuesKeyword_1_1_0());\n\totherlv_12='{' \n \tnewLeafNode(otherlv_12, grammarAccess.getInputAccess().getLeftCurlyBracketKeyword_1_1_1());\n\t\tlv_values_13_0=RULE_STRING\n\t\t{\n\t\t\tnewLeafNode(lv_values_13_0, grammarAccess.getInputAccess().getValuesSTRINGTerminalRuleCall_1_1_2_0()); \n\t\t}\n\t\t{\n\t $current = createModelElement(grammarAccess.getInputRule());\n \t\taddWithLastConsumed(\n \t\t\t\"values\",\n \t\tlv_values_13_0, \n \t\t\"STRING\");\n)*\totherlv_14='}' \n \tnewLeafNode(otherlv_14, grammarAccess.getInputAccess().getRightCurlyBracketKeyword_1_1_3());\n))(\totherlv_15='rate' \n \tnewLeafNode(otherlv_15, grammarAccess.getInputAccess().getRateKeyword_2_0());\n\t newCompositeNode(grammarAccess.getInputAccess().getRateBigUnitValueParserRuleCall_2_1_0()); \n\t\tlv_rate_16_0=ruleBigUnitValue\t\t{\n \t\t\t\"rate\",\n \t\tlv_rate_16_0, \n))?(\totherlv_17='variables' \n \tnewLeafNode(otherlv_17, grammarAccess.getInputAccess().getVariablesKeyword_3_0());\n\t\tlv_variables_18_0=RULE_STRING\n\t\t\tnewLeafNode(lv_variables_18_0, grammarAccess.getInputAccess().getVariablesSTRINGTerminalRuleCall_3_1_0()); \n \t\t\t\"variables\",\n \t\tlv_variables_18_0, \n))?(\totherlv_19='references' \n \tnewLeafNode(otherlv_19, grammarAccess.getInputAccess().getReferencesKeyword_4_0());\n\t\tlv_references_20_0=RULE_STRING\n\t\t\tnewLeafNode(lv_references_20_0, grammarAccess.getInputAccess().getReferencesSTRINGTerminalRuleCall_4_1_0()); \n \t\t\t\"references\",\n \t\tlv_references_20_0, \n))?(\totherlv_21='comments' \n \tnewLeafNode(otherlv_21, grammarAccess.getInputAccess().getCommentsKeyword_5_0());\n\t\tlv_comments_22_0=RULE_STRING\n\t\t\tnewLeafNode(lv_comments_22_0, grammarAccess.getInputAccess().getCommentsSTRINGTerminalRuleCall_5_1_0()); \n \t\tlv_comments_22_0, ", "old_methods": [], "patch": "@@ -1545,228 +1545,309 @@ ruleTriggerTable returns [EObject current=null]\n \n \n \n-// Entry rule entryRuleOutput\n-entryRuleOutput returns [EObject current=null] \n+// Entry rule entryRuleValueRange\n+entryRuleValueRange returns [EObject current=null] \n \t:\n-\t{ newCompositeNode(grammarAccess.getOutputRule()); }\n-\t iv_ruleOutput=ruleOutput \n-\t { $current=$iv_ruleOutput.current; } \n+\t{ newCompositeNode(grammarAccess.getValueRangeRule()); }\n+\t iv_ruleValueRange=ruleValueRange \n+\t { $current=$iv_ruleValueRange.current; } \n \t EOF \n ;\n \n-// Rule Output\n-ruleOutput returns [EObject current=null] \n+// Rule ValueRange\n+ruleValueRange returns [EObject current=null] \n @init { enterRule(); \n }\n @after { leaveRule(); }:\n-((\n- {\n- $current = forceCreateModelElement(\n- grammarAccess.getOutputAccess().getOutputAction_0(),\n- $current);\n- }\n-)((\totherlv_1='range' \n- {\n- \tnewLeafNode(otherlv_1, grammarAccess.getOutputAccess().getRangeKeyword_1_0_0());\n- }\n-\totherlv_2='{' \n+(\totherlv_0='{' \n {\n- \tnewLeafNode(otherlv_2, grammarAccess.getOutputAccess().getLeftCurlyBracketKeyword_1_0_1());\n+ \tnewLeafNode(otherlv_0, grammarAccess.getValueRangeAccess().getLeftCurlyBracketKeyword_0());\n }\n (\n (\n \t\t{ \n-\t newCompositeNode(grammarAccess.getOutputAccess().getLowerBigDecimalTypeParserRuleCall_1_0_2_0()); \n+\t newCompositeNode(grammarAccess.getValueRangeAccess().getLowerBigDecimalTypeParserRuleCall_1_0()); \n \t }\n-\t\tlv_lower_3_0=ruleBigDecimalType\t\t{\n+\t\tlv_lower_1_0=ruleBigDecimalType\t\t{\n \t if ($current==null) {\n-\t $current = createModelElementForParent(grammarAccess.getOutputRule());\n+\t $current = createModelElementForParent(grammarAccess.getValueRangeRule());\n \t }\n \t\tset(\n \t\t\t$current, \n \t\t\t\"lower\",\n- \t\tlv_lower_3_0, \n+ \t\tlv_lower_1_0, \n \t\t\"BigDecimalType\");\n \t afterParserOrEnumRuleCall();\n \t }\n \n )\n-)\totherlv_4='...' \n+)\totherlv_2='...' \n {\n- \tnewLeafNode(otherlv_4, grammarAccess.getOutputAccess().getFullStopFullStopFullStopKeyword_1_0_3());\n+ \tnewLeafNode(otherlv_2, grammarAccess.getValueRangeAccess().getFullStopFullStopFullStopKeyword_2());\n }\n (\n (\n \t\t{ \n-\t newCompositeNode(grammarAccess.getOutputAccess().getUpperBigDecimalTypeParserRuleCall_1_0_4_0()); \n+\t newCompositeNode(grammarAccess.getValueRangeAccess().getUpperBigDecimalTypeParserRuleCall_3_0()); \n \t }\n-\t\tlv_upper_5_0=ruleBigDecimalType\t\t{\n+\t\tlv_upper_3_0=ruleBigDecimalType\t\t{\n \t if ($current==null) {\n-\t $current = createModelElementForParent(grammarAccess.getOutputRule());\n+\t $current = createModelElementForParent(grammarAccess.getValueRangeRule());\n \t }\n \t\tset(\n \t\t\t$current, \n \t\t\t\"upper\",\n- \t\tlv_upper_5_0, \n+ \t\tlv_upper_3_0, \n \t\t\"BigDecimalType\");\n \t afterParserOrEnumRuleCall();\n \t }\n \n )\n-)\totherlv_6='}' \n+)\totherlv_4='}' \n {\n- \tnewLeafNode(otherlv_6, grammarAccess.getOutputAccess().getRightCurlyBracketKeyword_1_0_5());\n+ \tnewLeafNode(otherlv_4, grammarAccess.getValueRangeAccess().getRightCurlyBracketKeyword_4());\n }\n-\totherlv_7='type' \n+\totherlv_5='type' \n {\n- \tnewLeafNode(otherlv_7, grammarAccess.getOutputAccess().getTypeKeyword_1_0_6());\n+ \tnewLeafNode(otherlv_5, grammarAccess.getValueRangeAccess().getTypeKeyword_5());\n }\n (\n (\n-\t\tlv_rangeType_8_0=RULE_STRING\n+\t\tlv_rangeType_6_0=RULE_STRING\n \t\t{\n-\t\t\tnewLeafNode(lv_rangeType_8_0, grammarAccess.getOutputAccess().getRangeTypeSTRINGTerminalRuleCall_1_0_7_0()); \n+\t\t\tnewLeafNode(lv_rangeType_6_0, grammarAccess.getValueRangeAccess().getRangeTypeSTRINGTerminalRuleCall_6_0()); \n \t\t}\n \t\t{\n \t if ($current==null) {\n-\t $current = createModelElement(grammarAccess.getOutputRule());\n+\t $current = createModelElement(grammarAccess.getValueRangeRule());\n \t }\n \t\tsetWithLastConsumed(\n \t\t\t$current, \n \t\t\t\"rangeType\",\n- \t\tlv_rangeType_8_0, \n+ \t\tlv_rangeType_6_0, \n \t\t\"STRING\");\n \t }\n \n )\n-)\totherlv_9='units' \n+)\totherlv_7='units' \n {\n- \tnewLeafNode(otherlv_9, grammarAccess.getOutputAccess().getUnitsKeyword_1_0_8());\n+ \tnewLeafNode(otherlv_7, grammarAccess.getValueRangeAccess().getUnitsKeyword_7());\n }\n (\n (\n-\t\tlv_rangeUnits_10_0=RULE_STRING\n+\t\tlv_rangeUnits_8_0=RULE_STRING\n \t\t{\n-\t\t\tnewLeafNode(lv_rangeUnits_10_0, grammarAccess.getOutputAccess().getRangeUnitsSTRINGTerminalRuleCall_1_0_9_0()); \n+\t\t\tnewLeafNode(lv_rangeUnits_8_0, grammarAccess.getValueRangeAccess().getRangeUnitsSTRINGTerminalRuleCall_8_0()); \n \t\t}\n \t\t{\n \t if ($current==null) {\n-\t $current = createModelElement(grammarAccess.getOutputRule());\n+\t $current = createModelElement(grammarAccess.getValueRangeRule());\n \t }\n \t\tsetWithLastConsumed(\n \t\t\t$current, \n \t\t\t\"rangeUnits\",\n- \t\tlv_rangeUnits_10_0, \n+ \t\tlv_rangeUnits_8_0, \n \t\t\"STRING\");\n \t }\n \n )\n-))\n- |(\totherlv_11='values' \n+)\totherlv_9='}' \n {\n- \tnewLeafNode(otherlv_11, grammarAccess.getOutputAccess().getValuesKeyword_1_1_0());\n+ \tnewLeafNode(otherlv_9, grammarAccess.getValueRangeAccess().getRightCurlyBracketKeyword_9());\n+ }\n+)\n+;\n+\n+\n+\n+\n+\n+// Entry rule entryRuleValueList\n+entryRuleValueList returns [EObject current=null] \n+\t:\n+\t{ newCompositeNode(grammarAccess.getValueListRule()); }\n+\t iv_ruleValueList=ruleValueList \n+\t { $current=$iv_ruleValueList.current; } \n+\t EOF \n+;\n+\n+// Rule ValueList\n+ruleValueList returns [EObject current=null] \n+ @init { enterRule(); \n }\n-\totherlv_12='{' \n+ @after { leaveRule(); }:\n+(\totherlv_0='{' \n {\n- \tnewLeafNode(otherlv_12, grammarAccess.getOutputAccess().getLeftCurlyBracketKeyword_1_1_1());\n+ \tnewLeafNode(otherlv_0, grammarAccess.getValueListAccess().getLeftCurlyBracketKeyword_0());\n }\n (\n (\n-\t\tlv_values_13_0=RULE_STRING\n+\t\tlv_values_1_0=RULE_STRING\n \t\t{\n-\t\t\tnewLeafNode(lv_values_13_0, grammarAccess.getOutputAccess().getValuesSTRINGTerminalRuleCall_1_1_2_0()); \n+\t\t\tnewLeafNode(lv_values_1_0, grammarAccess.getValueListAccess().getValuesSTRINGTerminalRuleCall_1_0()); \n \t\t}\n \t\t{\n \t if ($current==null) {\n-\t $current = createModelElement(grammarAccess.getOutputRule());\n+\t $current = createModelElement(grammarAccess.getValueListRule());\n \t }\n \t\taddWithLastConsumed(\n \t\t\t$current, \n \t\t\t\"values\",\n- \t\tlv_values_13_0, \n+ \t\tlv_values_1_0, \n \t\t\"STRING\");\n \t }\n \n )\n-)*\totherlv_14='}' \n+)+\totherlv_2='}' \n+ {\n+ \tnewLeafNode(otherlv_2, grammarAccess.getValueListAccess().getRightCurlyBracketKeyword_2());\n+ }\n+)\n+;\n+\n+\n+\n+\n+\n+// Entry rule entryRuleOutput\n+entryRuleOutput returns [EObject current=null] \n+\t:\n+\t{ newCompositeNode(grammarAccess.getOutputRule()); }\n+\t iv_ruleOutput=ruleOutput \n+\t { $current=$iv_ruleOutput.current; } \n+\t EOF \n+;\n+\n+// Rule Output\n+ruleOutput returns [EObject current=null] \n+ @init { enterRule(); \n+ }\n+ @after { leaveRule(); }:\n+((\n+ {\n+ $current = forceCreateModelElement(\n+ grammarAccess.getOutputAccess().getOutputAction_0(),\n+ $current);\n+ }\n+)(\totherlv_1='range' \n+ {\n+ \tnewLeafNode(otherlv_1, grammarAccess.getOutputAccess().getRangeKeyword_1_0());\n+ }\n+(\n+(\n+\t\t{ \n+\t newCompositeNode(grammarAccess.getOutputAccess().getRangeValueRangeParserRuleCall_1_1_0()); \n+\t }\n+\t\tlv_range_2_0=ruleValueRange\t\t{\n+\t if ($current==null) {\n+\t $current = createModelElementForParent(grammarAccess.getOutputRule());\n+\t }\n+ \t\tset(\n+ \t\t\t$current, \n+ \t\t\t\"range\",\n+ \t\tlv_range_2_0, \n+ \t\t\"ValueRange\");\n+\t afterParserOrEnumRuleCall();\n+\t }\n+\n+)\n+))?(\totherlv_3='value-list' \n {\n- \tnewLeafNode(otherlv_14, grammarAccess.getOutputAccess().getRightCurlyBracketKeyword_1_1_3());\n+ \tnewLeafNode(otherlv_3, grammarAccess.getOutputAccess().getValueListKeyword_2_0());\n }\n-))(\totherlv_15='rate' \n+(\n+(\n+\t\t{ \n+\t newCompositeNode(grammarAccess.getOutputAccess().getValueListValueListParserRuleCall_2_1_0()); \n+\t }\n+\t\tlv_valueList_4_0=ruleValueList\t\t{\n+\t if ($current==null) {\n+\t $current = createModelElementForParent(grammarAccess.getOutputRule());\n+\t }\n+ \t\tset(\n+ \t\t\t$current, \n+ \t\t\t\"valueList\",\n+ \t\tlv_valueList_4_0, \n+ \t\t\"ValueList\");\n+\t afterParserOrEnumRuleCall();\n+\t }\n+\n+)\n+))?(\totherlv_5='rate' \n {\n- \tnewLeafNode(otherlv_15, grammarAccess.getOutputAccess().getRateKeyword_2_0());\n+ \tnewLeafNode(otherlv_5, grammarAccess.getOutputAccess().getRateKeyword_3_0());\n }\n (\n (\n \t\t{ \n-\t newCompositeNode(grammarAccess.getOutputAccess().getRateBigUnitValueParserRuleCall_2_1_0()); \n+\t newCompositeNode(grammarAccess.getOutputAccess().getRateBigUnitValueParserRuleCall_3_1_0()); \n \t }\n-\t\tlv_rate_16_0=ruleBigUnitValue\t\t{\n+\t\tlv_rate_6_0=ruleBigUnitValue\t\t{\n \t if ($current==null) {\n \t $current = createModelElementForParent(grammarAccess.getOutputRule());\n \t }\n \t\tset(\n \t\t\t$current, \n \t\t\t\"rate\",\n- \t\tlv_rate_16_0, \n+ \t\tlv_rate_6_0, \n \t\t\"BigUnitValue\");\n \t afterParserOrEnumRuleCall();\n \t }\n \n )\n-))?(\totherlv_17='initiation-delay' \n+))?(\totherlv_7='initiation-delay' \n {\n- \tnewLeafNode(otherlv_17, grammarAccess.getOutputAccess().getInitiationDelayKeyword_3_0());\n+ \tnewLeafNode(otherlv_7, grammarAccess.getOutputAccess().getInitiationDelayKeyword_4_0());\n }\n (\n (\n \t\t{ \n-\t newCompositeNode(grammarAccess.getOutputAccess().getDelayBigUnitValueParserRuleCall_3_1_0()); \n+\t newCompositeNode(grammarAccess.getOutputAccess().getDelayBigUnitValueParserRuleCall_4_1_0()); \n \t }\n-\t\tlv_delay_18_0=ruleBigUnitValue\t\t{\n+\t\tlv_delay_8_0=ruleBigUnitValue\t\t{\n \t if ($current==null) {\n \t $current = createModelElementForParent(grammarAccess.getOutputRule());\n \t }\n \t\tset(\n \t\t\t$current, \n \t\t\t\"delay\",\n- \t\tlv_delay_18_0, \n+ \t\tlv_delay_8_0, \n \t\t\"BigUnitValue\");\n \t afterParserOrEnumRuleCall();\n \t }\n \n )\n-))?(\totherlv_19='completion-deadline' \n+))?(\totherlv_9='completion-deadline' \n {\n- \tnewLeafNode(otherlv_19, grammarAccess.getOutputAccess().getCompletionDeadlineKeyword_4_0());\n+ \tnewLeafNode(otherlv_9, grammarAccess.getOutputAccess().getCompletionDeadlineKeyword_5_0());\n }\n (\n (\n \t\t{ \n-\t newCompositeNode(grammarAccess.getOutputAccess().getDeadlineBigUnitValueParserRuleCall_4_1_0()); \n+\t newCompositeNode(grammarAccess.getOutputAccess().getDeadlineBigUnitValueParserRuleCall_5_1_0()); \n \t }\n-\t\tlv_deadline_20_0=ruleBigUnitValue\t\t{\n+\t\tlv_deadline_10_0=ruleBigUnitValue\t\t{\n \t if ($current==null) {\n \t $current = createModelElementForParent(grammarAccess.getOutputRule());\n \t }\n \t\tset(\n \t\t\t$current, \n \t\t\t\"deadline\",\n- \t\tlv_deadline_20_0, \n+ \t\tlv_deadline_10_0, \n \t\t\"BigUnitValue\");\n \t afterParserOrEnumRuleCall();\n \t }\n \n )\n-))?(\totherlv_21='completion-exception' \n+))?(\totherlv_11='completion-exception' \n {\n- \tnewLeafNode(otherlv_21, grammarAccess.getOutputAccess().getCompletionExceptionKeyword_5_0());\n+ \tnewLeafNode(otherlv_11, grammarAccess.getOutputAccess().getCompletionExceptionKeyword_6_0());\n }\n (\n (\n-\t\tlv_completionHandling_22_0=RULE_STRING\n+\t\tlv_completionHandling_12_0=RULE_STRING\n \t\t{\n-\t\t\tnewLeafNode(lv_completionHandling_22_0, grammarAccess.getOutputAccess().getCompletionHandlingSTRINGTerminalRuleCall_5_1_0()); \n+\t\t\tnewLeafNode(lv_completionHandling_12_0, grammarAccess.getOutputAccess().getCompletionHandlingSTRINGTerminalRuleCall_6_1_0()); \n \t\t}\n \t\t{\n \t if ($current==null) {\n@@ -1775,20 +1856,20 @@ ruleOutput returns [EObject current=null]\n \t\tsetWithLastConsumed(\n \t\t\t$current, \n \t\t\t\"completionHandling\",\n- \t\tlv_completionHandling_22_0, \n+ \t\tlv_completionHandling_12_0, \n \t\t\"STRING\");\n \t }\n \n )\n-))?(\totherlv_23='variables' \n+))?(\totherlv_13='variables' \n {\n- \tnewLeafNode(otherlv_23, grammarAccess.getOutputAccess().getVariablesKeyword_6_0());\n+ \tnewLeafNode(otherlv_13, grammarAccess.getOutputAccess().getVariablesKeyword_7_0());\n }\n (\n (\n-\t\tlv_variables_24_0=RULE_STRING\n+\t\tlv_variables_14_0=RULE_STRING\n \t\t{\n-\t\t\tnewLeafNode(lv_variables_24_0, grammarAccess.getOutputAccess().getVariablesSTRINGTerminalRuleCall_6_1_0()); \n+\t\t\tnewLeafNode(lv_variables_14_0, grammarAccess.getOutputAccess().getVariablesSTRINGTerminalRuleCall_7_1_0()); \n \t\t}\n \t\t{\n \t if ($current==null) {\n@@ -1797,20 +1878,20 @@ ruleOutput returns [EObject current=null]\n \t\tsetWithLastConsumed(\n \t\t\t$current, \n \t\t\t\"variables\",\n- \t\tlv_variables_24_0, \n+ \t\tlv_variables_14_0, \n \t\t\"STRING\");\n \t }\n \n )\n-))?(\totherlv_25='relationship' \n+))?(\totherlv_15='relationship' \n {\n- \tnewLeafNode(otherlv_25, grammarAccess.getOutputAccess().getRelationshipKeyword_7_0());\n+ \tnewLeafNode(otherlv_15, grammarAccess.getOutputAccess().getRelationshipKeyword_8_0());\n }\n (\n (\n-\t\tlv_relationship_26_0=RULE_STRING\n+\t\tlv_relationship_16_0=RULE_STRING\n \t\t{\n-\t\t\tnewLeafNode(lv_relationship_26_0, grammarAccess.getOutputAccess().getRelationshipSTRINGTerminalRuleCall_7_1_0()); \n+\t\t\tnewLeafNode(lv_relationship_16_0, grammarAccess.getOutputAccess().getRelationshipSTRINGTerminalRuleCall_8_1_0()); \n \t\t}\n \t\t{\n \t if ($current==null) {\n@@ -1819,64 +1900,64 @@ ruleOutput returns [EObject current=null]\n \t\tsetWithLastConsumed(\n \t\t\t$current, \n \t\t\t\"relationship\",\n- \t\tlv_relationship_26_0, \n+ \t\tlv_relationship_16_0, \n \t\t\"STRING\");\n \t }\n \n )\n-))?(\totherlv_27='min-response-time' \n+))?(\totherlv_17='min-response-time' \n {\n- \tnewLeafNode(otherlv_27, grammarAccess.getOutputAccess().getMinResponseTimeKeyword_8_0());\n+ \tnewLeafNode(otherlv_17, grammarAccess.getOutputAccess().getMinResponseTimeKeyword_9_0());\n }\n (\n (\n \t\t{ \n-\t newCompositeNode(grammarAccess.getOutputAccess().getMinResponseBigUnitValueParserRuleCall_8_1_0()); \n+\t newCompositeNode(grammarAccess.getOutputAccess().getMinResponseBigUnitValueParserRuleCall_9_1_0()); \n \t }\n-\t\tlv_minResponse_28_0=ruleBigUnitValue\t\t{\n+\t\tlv_minResponse_18_0=ruleBigUnitValue\t\t{\n \t if ($current==null) {\n \t $current = createModelElementForParent(grammarAccess.getOutputRule());\n \t }\n \t\tset(\n \t\t\t$current, \n \t\t\t\"minResponse\",\n- \t\tlv_minResponse_28_0, \n+ \t\tlv_minResponse_18_0, \n \t\t\"BigUnitValue\");\n \t afterParserOrEnumRuleCall();\n \t }\n \n )\n-))?(\totherlv_29='max-response-time' \n+))?(\totherlv_19='max-response-time' \n {\n- \tnewLeafNode(otherlv_29, grammarAccess.getOutputAccess().getMaxResponseTimeKeyword_9_0());\n+ \tnewLeafNode(otherlv_19, grammarAccess.getOutputAccess().getMaxResponseTimeKeyword_10_0());\n }\n (\n (\n \t\t{ \n-\t newCompositeNode(grammarAccess.getOutputAccess().getMaxResponseBigUnitValueParserRuleCall_9_1_0()); \n+\t newCompositeNode(grammarAccess.getOutputAccess().getMaxResponseBigUnitValueParserRuleCall_10_1_0()); \n \t }\n-\t\tlv_maxResponse_30_0=ruleBigUnitValue\t\t{\n+\t\tlv_maxResponse_20_0=ruleBigUnitValue\t\t{\n \t if ($current==null) {\n \t $current = createModelElementForParent(grammarAccess.getOutputRule());\n \t }\n \t\tset(\n \t\t\t$current, \n \t\t\t\"maxResponse\",\n- \t\tlv_maxResponse_30_0, \n+ \t\tlv_maxResponse_20_0, \n \t\t\"BigUnitValue\");\n \t afterParserOrEnumRuleCall();\n \t }\n \n )\n-))?(\totherlv_31='feedback-exception' \n+))?(\totherlv_21='feedback-exception' \n {\n- \tnewLeafNode(otherlv_31, grammarAccess.getOutputAccess().getFeedbackExceptionKeyword_10_0());\n+ \tnewLeafNode(otherlv_21, grammarAccess.getOutputAccess().getFeedbackExceptionKeyword_11_0());\n }\n (\n (\n-\t\tlv_feebackHandling_32_0=RULE_STRING\n+\t\tlv_feebackHandling_22_0=RULE_STRING\n \t\t{\n-\t\t\tnewLeafNode(lv_feebackHandling_32_0, grammarAccess.getOutputAccess().getFeebackHandlingSTRINGTerminalRuleCall_10_1_0()); \n+\t\t\tnewLeafNode(lv_feebackHandling_22_0, grammarAccess.getOutputAccess().getFeebackHandlingSTRINGTerminalRuleCall_11_1_0()); \n \t\t}\n \t\t{\n \t if ($current==null) {\n@@ -1885,20 +1966,20 @@ ruleOutput returns [EObject current=null]\n \t\tsetWithLastConsumed(\n \t\t\t$current, \n \t\t\t\"feebackHandling\",\n- \t\tlv_feebackHandling_32_0, \n+ \t\tlv_feebackHandling_22_0, \n \t\t\"STRING\");\n \t }\n \n )\n-))?(\totherlv_33='reversed-by' \n+))?(\totherlv_23='reversed-by' \n {\n- \tnewLeafNode(otherlv_33, grammarAccess.getOutputAccess().getReversedByKeyword_11_0());\n+ \tnewLeafNode(otherlv_23, grammarAccess.getOutputAccess().getReversedByKeyword_12_0());\n }\n (\n (\n-\t\tlv_reversed_34_0=RULE_STRING\n+\t\tlv_reversed_24_0=RULE_STRING\n \t\t{\n-\t\t\tnewLeafNode(lv_reversed_34_0, grammarAccess.getOutputAccess().getReversedSTRINGTerminalRuleCall_11_1_0()); \n+\t\t\tnewLeafNode(lv_reversed_24_0, grammarAccess.getOutputAccess().getReversedSTRINGTerminalRuleCall_12_1_0()); \n \t\t}\n \t\t{\n \t if ($current==null) {\n@@ -1907,20 +1988,20 @@ ruleOutput returns [EObject current=null]\n \t\tsetWithLastConsumed(\n \t\t\t$current, \n \t\t\t\"reversed\",\n- \t\tlv_reversed_34_0, \n+ \t\tlv_reversed_24_0, \n \t\t\"STRING\");\n \t }\n \n )\n-))?(\totherlv_35='references' \n+))?(\totherlv_25='references' \n {\n- \tnewLeafNode(otherlv_35, grammarAccess.getOutputAccess().getReferencesKeyword_12_0());\n+ \tnewLeafNode(otherlv_25, grammarAccess.getOutputAccess().getReferencesKeyword_13_0());\n }\n (\n (\n-\t\tlv_references_36_0=RULE_STRING\n+\t\tlv_references_26_0=RULE_STRING\n \t\t{\n-\t\t\tnewLeafNode(lv_references_36_0, grammarAccess.getOutputAccess().getReferencesSTRINGTerminalRuleCall_12_1_0()); \n+\t\t\tnewLeafNode(lv_references_26_0, grammarAccess.getOutputAccess().getReferencesSTRINGTerminalRuleCall_13_1_0()); \n \t\t}\n \t\t{\n \t if ($current==null) {\n@@ -1929,20 +2010,20 @@ ruleOutput returns [EObject current=null]\n \t\tsetWithLastConsumed(\n \t\t\t$current, \n \t\t\t\"references\",\n- \t\tlv_references_36_0, \n+ \t\tlv_references_26_0, \n \t\t\"STRING\");\n \t }\n \n )\n-))?(\totherlv_37='comments' \n+))?(\totherlv_27='comments' \n {\n- \tnewLeafNode(otherlv_37, grammarAccess.getOutputAccess().getCommentsKeyword_13_0());\n+ \tnewLeafNode(otherlv_27, grammarAccess.getOutputAccess().getCommentsKeyword_14_0());\n }\n (\n (\n-\t\tlv_comments_38_0=RULE_STRING\n+\t\tlv_comments_28_0=RULE_STRING\n \t\t{\n-\t\t\tnewLeafNode(lv_comments_38_0, grammarAccess.getOutputAccess().getCommentsSTRINGTerminalRuleCall_13_1_0()); \n+\t\t\tnewLeafNode(lv_comments_28_0, grammarAccess.getOutputAccess().getCommentsSTRINGTerminalRuleCall_14_1_0()); \n \t\t}\n \t\t{\n \t if ($current==null) {\n@@ -1951,20 +2032,20 @@ ruleOutput returns [EObject current=null]\n \t\tsetWithLastConsumed(\n \t\t\t$current, \n \t\t\t\"comments\",\n- \t\tlv_comments_38_0, \n+ \t\tlv_comments_28_0, \n \t\t\"STRING\");\n \t }\n \n )\n-))?(\totherlv_39='contents' \n+))?(\totherlv_29='contents' \n {\n- \tnewLeafNode(otherlv_39, grammarAccess.getOutputAccess().getContentsKeyword_14_0());\n+ \tnewLeafNode(otherlv_29, grammarAccess.getOutputAccess().getContentsKeyword_15_0());\n }\n (\n (\n-\t\tlv_contents_40_0=RULE_STRING\n+\t\tlv_contents_30_0=RULE_STRING\n \t\t{\n-\t\t\tnewLeafNode(lv_contents_40_0, grammarAccess.getOutputAccess().getContentsSTRINGTerminalRuleCall_14_1_0()); \n+\t\t\tnewLeafNode(lv_contents_30_0, grammarAccess.getOutputAccess().getContentsSTRINGTerminalRuleCall_15_1_0()); \n \t\t}\n \t\t{\n \t if ($current==null) {\n@@ -1973,28 +2054,28 @@ ruleOutput returns [EObject current=null]\n \t\tsetWithLastConsumed(\n \t\t\t$current, \n \t\t\t\"contents\",\n- \t\tlv_contents_40_0, \n+ \t\tlv_contents_30_0, \n \t\t\"STRING\");\n \t }\n \n )\n-))?(\totherlv_41='triggering' \n+))?(\totherlv_31='triggering' \n {\n- \tnewLeafNode(otherlv_41, grammarAccess.getOutputAccess().getTriggeringKeyword_15_0());\n+ \tnewLeafNode(otherlv_31, grammarAccess.getOutputAccess().getTriggeringKeyword_16_0());\n }\n (\n (\n \t\t{ \n-\t newCompositeNode(grammarAccess.getOutputAccess().getTableTriggerTableParserRuleCall_15_1_0()); \n+\t newCompositeNode(grammarAccess.getOutputAccess().getTableTriggerTableParserRuleCall_16_1_0()); \n \t }\n-\t\tlv_table_42_0=ruleTriggerTable\t\t{\n+\t\tlv_table_32_0=ruleTriggerTable\t\t{\n \t if ($current==null) {\n \t $current = createModelElementForParent(grammarAccess.getOutputRule());\n \t }\n \t\tset(\n \t\t\t$current, \n \t\t\t\"table\",\n- \t\tlv_table_42_0, \n+ \t\tlv_table_32_0, \n \t\t\"TriggerTable\");\n \t afterParserOrEnumRuleCall();\n \t }\n@@ -2027,208 +2108,257 @@ ruleInput returns [EObject current=null]\n grammarAccess.getInputAccess().getInputAction_0(),\n $current);\n }\n-)((\totherlv_1='range' \n- {\n- \tnewLeafNode(otherlv_1, grammarAccess.getInputAccess().getRangeKeyword_1_0_0());\n- }\n-\totherlv_2='{' \n+)(\totherlv_1='range' \n {\n- \tnewLeafNode(otherlv_2, grammarAccess.getInputAccess().getLeftCurlyBracketKeyword_1_0_1());\n+ \tnewLeafNode(otherlv_1, grammarAccess.getInputAccess().getRangeKeyword_1_0());\n }\n (\n (\n \t\t{ \n-\t newCompositeNode(grammarAccess.getInputAccess().getLowerBigDecimalTypeParserRuleCall_1_0_2_0()); \n+\t newCompositeNode(grammarAccess.getInputAccess().getRangeValueRangeParserRuleCall_1_1_0()); \n \t }\n-\t\tlv_lower_3_0=ruleBigDecimalType\t\t{\n+\t\tlv_range_2_0=ruleValueRange\t\t{\n \t if ($current==null) {\n \t $current = createModelElementForParent(grammarAccess.getInputRule());\n \t }\n \t\tset(\n \t\t\t$current, \n- \t\t\t\"lower\",\n- \t\tlv_lower_3_0, \n- \t\t\"BigDecimalType\");\n+ \t\t\t\"range\",\n+ \t\tlv_range_2_0, \n+ \t\t\"ValueRange\");\n \t afterParserOrEnumRuleCall();\n \t }\n \n )\n-)\totherlv_4='...' \n+))?(\totherlv_3='value-list' \n {\n- \tnewLeafNode(otherlv_4, grammarAccess.getInputAccess().getFullStopFullStopFullStopKeyword_1_0_3());\n+ \tnewLeafNode(otherlv_3, grammarAccess.getInputAccess().getValueListKeyword_2_0());\n }\n (\n (\n \t\t{ \n-\t newCompositeNode(grammarAccess.getInputAccess().getUpperBigDecimalTypeParserRuleCall_1_0_4_0()); \n+\t newCompositeNode(grammarAccess.getInputAccess().getValueListValueListParserRuleCall_2_1_0()); \n \t }\n-\t\tlv_upper_5_0=ruleBigDecimalType\t\t{\n+\t\tlv_valueList_4_0=ruleValueList\t\t{\n \t if ($current==null) {\n \t $current = createModelElementForParent(grammarAccess.getInputRule());\n \t }\n \t\tset(\n \t\t\t$current, \n- \t\t\t\"upper\",\n- \t\tlv_upper_5_0, \n- \t\t\"BigDecimalType\");\n+ \t\t\t\"valueList\",\n+ \t\tlv_valueList_4_0, \n+ \t\t\"ValueList\");\n \t afterParserOrEnumRuleCall();\n \t }\n \n )\n-)\totherlv_6='}' \n- {\n- \tnewLeafNode(otherlv_6, grammarAccess.getInputAccess().getRightCurlyBracketKeyword_1_0_5());\n- }\n-\totherlv_7='type' \n+))?(\totherlv_5='value-exception' \n {\n- \tnewLeafNode(otherlv_7, grammarAccess.getInputAccess().getTypeKeyword_1_0_6());\n+ \tnewLeafNode(otherlv_5, grammarAccess.getInputAccess().getValueExceptionKeyword_3_0());\n }\n (\n (\n-\t\tlv_rangeType_8_0=RULE_STRING\n+\t\tlv_valueHandling_6_0=RULE_STRING\n \t\t{\n-\t\t\tnewLeafNode(lv_rangeType_8_0, grammarAccess.getInputAccess().getRangeTypeSTRINGTerminalRuleCall_1_0_7_0()); \n+\t\t\tnewLeafNode(lv_valueHandling_6_0, grammarAccess.getInputAccess().getValueHandlingSTRINGTerminalRuleCall_3_1_0()); \n \t\t}\n \t\t{\n \t if ($current==null) {\n \t $current = createModelElement(grammarAccess.getInputRule());\n \t }\n \t\tsetWithLastConsumed(\n \t\t\t$current, \n- \t\t\t\"rangeType\",\n- \t\tlv_rangeType_8_0, \n+ \t\t\t\"valueHandling\",\n+ \t\tlv_valueHandling_6_0, \n \t\t\"STRING\");\n \t }\n \n )\n-)\totherlv_9='units' \n+))?(\totherlv_7='granularity' \n {\n- \tnewLeafNode(otherlv_9, grammarAccess.getInputAccess().getUnitsKeyword_1_0_8());\n+ \tnewLeafNode(otherlv_7, grammarAccess.getInputAccess().getGranularityKeyword_4_0());\n }\n (\n (\n-\t\tlv_rangeUnits_10_0=RULE_STRING\n-\t\t{\n-\t\t\tnewLeafNode(lv_rangeUnits_10_0, grammarAccess.getInputAccess().getRangeUnitsSTRINGTerminalRuleCall_1_0_9_0()); \n-\t\t}\n-\t\t{\n+\t\t{ \n+\t newCompositeNode(grammarAccess.getInputAccess().getGranularityBigUnitValueParserRuleCall_4_1_0()); \n+\t }\n+\t\tlv_granularity_8_0=ruleBigUnitValue\t\t{\n \t if ($current==null) {\n-\t $current = createModelElement(grammarAccess.getInputRule());\n+\t $current = createModelElementForParent(grammarAccess.getInputRule());\n \t }\n- \t\tsetWithLastConsumed(\n+ \t\tset(\n \t\t\t$current, \n- \t\t\t\"rangeUnits\",\n- \t\tlv_rangeUnits_10_0, \n- \t\t\"STRING\");\n+ \t\t\t\"granularity\",\n+ \t\tlv_granularity_8_0, \n+ \t\t\"BigUnitValue\");\n+\t afterParserOrEnumRuleCall();\n \t }\n \n )\n-))\n- |(\totherlv_11='values' \n+))?(\totherlv_9='arrival-rate-avg' \n {\n- \tnewLeafNode(otherlv_11, grammarAccess.getInputAccess().getValuesKeyword_1_1_0());\n+ \tnewLeafNode(otherlv_9, grammarAccess.getInputAccess().getArrivalRateAvgKeyword_5_0());\n }\n-\totherlv_12='{' \n+(\n+(\n+\t\t{ \n+\t newCompositeNode(grammarAccess.getInputAccess().getArrivalRateAvgBigUnitValueParserRuleCall_5_1_0()); \n+\t }\n+\t\tlv_arrivalRateAvg_10_0=ruleBigUnitValue\t\t{\n+\t if ($current==null) {\n+\t $current = createModelElementForParent(grammarAccess.getInputRule());\n+\t }\n+ \t\tset(\n+ \t\t\t$current, \n+ \t\t\t\"arrivalRateAvg\",\n+ \t\tlv_arrivalRateAvg_10_0, \n+ \t\t\"BigUnitValue\");\n+\t afterParserOrEnumRuleCall();\n+\t }\n+\n+)\n+))?(\totherlv_11='arrival-rate-minimum' \n {\n- \tnewLeafNode(otherlv_12, grammarAccess.getInputAccess().getLeftCurlyBracketKeyword_1_1_1());\n+ \tnewLeafNode(otherlv_11, grammarAccess.getInputAccess().getArrivalRateMinimumKeyword_6_0());\n }\n (\n (\n-\t\tlv_values_13_0=RULE_STRING\n-\t\t{\n-\t\t\tnewLeafNode(lv_values_13_0, grammarAccess.getInputAccess().getValuesSTRINGTerminalRuleCall_1_1_2_0()); \n-\t\t}\n-\t\t{\n+\t\t{ \n+\t newCompositeNode(grammarAccess.getInputAccess().getArrivalRateMinimumBigUnitValueParserRuleCall_6_1_0()); \n+\t }\n+\t\tlv_arrivalRateMinimum_12_0=ruleBigUnitValue\t\t{\n \t if ($current==null) {\n-\t $current = createModelElement(grammarAccess.getInputRule());\n+\t $current = createModelElementForParent(grammarAccess.getInputRule());\n \t }\n- \t\taddWithLastConsumed(\n+ \t\tset(\n \t\t\t$current, \n- \t\t\t\"values\",\n- \t\tlv_values_13_0, \n- \t\t\"STRING\");\n+ \t\t\t\"arrivalRateMinimum\",\n+ \t\tlv_arrivalRateMinimum_12_0, \n+ \t\t\"BigUnitValue\");\n+\t afterParserOrEnumRuleCall();\n \t }\n \n )\n-)*\totherlv_14='}' \n+))?(\totherlv_13='arrival-rate-maximum' \n {\n- \tnewLeafNode(otherlv_14, grammarAccess.getInputAccess().getRightCurlyBracketKeyword_1_1_3());\n+ \tnewLeafNode(otherlv_13, grammarAccess.getInputAccess().getArrivalRateMaximumKeyword_7_0());\n }\n-))(\totherlv_15='rate' \n+(\n+(\n+\t\t{ \n+\t newCompositeNode(grammarAccess.getInputAccess().getArrivalRateMaximumBigUnitValueParserRuleCall_7_1_0()); \n+\t }\n+\t\tlv_arrivalRateMaximum_14_0=ruleBigUnitValue\t\t{\n+\t if ($current==null) {\n+\t $current = createModelElementForParent(grammarAccess.getInputRule());\n+\t }\n+ \t\tset(\n+ \t\t\t$current, \n+ \t\t\t\"arrivalRateMaximum\",\n+ \t\tlv_arrivalRateMaximum_14_0, \n+ \t\t\"BigUnitValue\");\n+\t afterParserOrEnumRuleCall();\n+\t }\n+\n+)\n+))?(\totherlv_15='obsolescence' \n {\n- \tnewLeafNode(otherlv_15, grammarAccess.getInputAccess().getRateKeyword_2_0());\n+ \tnewLeafNode(otherlv_15, grammarAccess.getInputAccess().getObsolescenceKeyword_8_0());\n }\n (\n (\n \t\t{ \n-\t newCompositeNode(grammarAccess.getInputAccess().getRateBigUnitValueParserRuleCall_2_1_0()); \n+\t newCompositeNode(grammarAccess.getInputAccess().getObsolescenceBigUnitValueParserRuleCall_8_1_0()); \n \t }\n-\t\tlv_rate_16_0=ruleBigUnitValue\t\t{\n+\t\tlv_obsolescence_16_0=ruleBigUnitValue\t\t{\n \t if ($current==null) {\n \t $current = createModelElementForParent(grammarAccess.getInputRule());\n \t }\n \t\tset(\n \t\t\t$current, \n- \t\t\t\"rate\",\n- \t\tlv_rate_16_0, \n+ \t\t\t\"obsolescence\",\n+ \t\tlv_obsolescence_16_0, \n \t\t\"BigUnitValue\");\n \t afterParserOrEnumRuleCall();\n \t }\n \n )\n-))?(\totherlv_17='variables' \n+))?(\totherlv_17='references' \n {\n- \tnewLeafNode(otherlv_17, grammarAccess.getInputAccess().getVariablesKeyword_3_0());\n+ \tnewLeafNode(otherlv_17, grammarAccess.getInputAccess().getReferencesKeyword_9_0());\n }\n (\n (\n-\t\tlv_variables_18_0=RULE_STRING\n+\t\tlv_references_18_0=RULE_STRING\n \t\t{\n-\t\t\tnewLeafNode(lv_variables_18_0, grammarAccess.getInputAccess().getVariablesSTRINGTerminalRuleCall_3_1_0()); \n+\t\t\tnewLeafNode(lv_references_18_0, grammarAccess.getInputAccess().getReferencesSTRINGTerminalRuleCall_9_1_0()); \n \t\t}\n \t\t{\n \t if ($current==null) {\n \t $current = createModelElement(grammarAccess.getInputRule());\n \t }\n \t\tsetWithLastConsumed(\n \t\t\t$current, \n- \t\t\t\"variables\",\n- \t\tlv_variables_18_0, \n+ \t\t\t\"references\",\n+ \t\tlv_references_18_0, \n \t\t\"STRING\");\n \t }\n \n )\n-))?(\totherlv_19='references' \n+))?(\totherlv_19='appears-in' \n {\n- \tnewLeafNode(otherlv_19, grammarAccess.getInputAccess().getReferencesKeyword_4_0());\n+ \tnewLeafNode(otherlv_19, grammarAccess.getInputAccess().getAppearsInKeyword_10_0());\n }\n (\n (\n-\t\tlv_references_20_0=RULE_STRING\n+\t\tlv_appearsIn_20_0=RULE_STRING\n \t\t{\n-\t\t\tnewLeafNode(lv_references_20_0, grammarAccess.getInputAccess().getReferencesSTRINGTerminalRuleCall_4_1_0()); \n+\t\t\tnewLeafNode(lv_appearsIn_20_0, grammarAccess.getInputAccess().getAppearsInSTRINGTerminalRuleCall_10_1_0()); \n \t\t}\n \t\t{\n \t if ($current==null) {\n \t $current = createModelElement(grammarAccess.getInputRule());\n \t }\n \t\tsetWithLastConsumed(\n \t\t\t$current, \n- \t\t\t\"references\",\n- \t\tlv_references_20_0, \n+ \t\t\t\"appearsIn\",\n+ \t\tlv_appearsIn_20_0, \n+ \t\t\"STRING\");\n+\t }\n+\n+)\n+))?(\totherlv_21='description' \n+ {\n+ \tnewLeafNode(otherlv_21, grammarAccess.getInputAccess().getDescriptionKeyword_11_0());\n+ }\n+(\n+(\n+\t\tlv_description_22_0=RULE_STRING\n+\t\t{\n+\t\t\tnewLeafNode(lv_description_22_0, grammarAccess.getInputAccess().getDescriptionSTRINGTerminalRuleCall_11_1_0()); \n+\t\t}\n+\t\t{\n+\t if ($current==null) {\n+\t $current = createModelElement(grammarAccess.getInputRule());\n+\t }\n+ \t\tsetWithLastConsumed(\n+ \t\t\t$current, \n+ \t\t\t\"description\",\n+ \t\tlv_description_22_0, \n \t\t\"STRING\");\n \t }\n \n )\n-))?(\totherlv_21='comments' \n+))?(\totherlv_23='comments' \n {\n- \tnewLeafNode(otherlv_21, grammarAccess.getInputAccess().getCommentsKeyword_5_0());\n+ \tnewLeafNode(otherlv_23, grammarAccess.getInputAccess().getCommentsKeyword_12_0());\n }\n (\n (\n-\t\tlv_comments_22_0=RULE_STRING\n+\t\tlv_comments_24_0=RULE_STRING\n \t\t{\n-\t\t\tnewLeafNode(lv_comments_22_0, grammarAccess.getInputAccess().getCommentsSTRINGTerminalRuleCall_5_1_0()); \n+\t\t\tnewLeafNode(lv_comments_24_0, grammarAccess.getInputAccess().getCommentsSTRINGTerminalRuleCall_12_1_0()); \n \t\t}\n \t\t{\n \t if ($current==null) {\n@@ -2237,10 +2367,32 @@ ruleInput returns [EObject current=null]\n \t\tsetWithLastConsumed(\n \t\t\t$current, \n \t\t\t\"comments\",\n- \t\tlv_comments_22_0, \n+ \t\tlv_comments_24_0, \n \t\t\"STRING\");\n \t }\n \n+)\n+))?(\totherlv_25='triggering' \n+ {\n+ \tnewLeafNode(otherlv_25, grammarAccess.getInputAccess().getTriggeringKeyword_13_0());\n+ }\n+(\n+(\n+\t\t{ \n+\t newCompositeNode(grammarAccess.getInputAccess().getStructureTriggerTableParserRuleCall_13_1_0()); \n+\t }\n+\t\tlv_structure_26_0=ruleTriggerTable\t\t{\n+\t if ($current==null) {\n+\t $current = createModelElementForParent(grammarAccess.getInputRule());\n+\t }\n+ \t\tset(\n+ \t\t\t$current, \n+ \t\t\t\"structure\",\n+ \t\tlv_structure_26_0, \n+ \t\t\"TriggerTable\");\n+\t afterParserOrEnumRuleCall();\n+\t }\n+\n )\n ))?)\n ;", "raw_url": "https://github.com/nasa/CertWare/raw/110fa3222ae2931978d7921dc8e6af8c7f43abd3/net.certware.intent.state%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fstate%2Fparser%2Fantlr%2Finternal%2FInternalStateSpecification.g", "sha": "8150c2054ab24010568dd54b50457d89aeef5031", "status": "modified" }, { "additions": 20, "blob_url": "https://github.com/nasa/CertWare/blob/110fa3222ae2931978d7921dc8e6af8c7f43abd3/net.certware.intent.state%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fstate%2Fparser%2Fantlr%2Finternal%2FInternalStateSpecification.tokens", "changes": 24, "contents_url": "https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent.state%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fstate%2Fparser%2Fantlr%2Finternal%2FInternalStateSpecification.tokens?ref=110fa3222ae2931978d7921dc8e6af8c7f43abd3", "deletions": 4, "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.tokens", "new_code": "T__68=68\nT__66=66\nT__67=67\nT__64=64\nT__65=65\nT__62=62\nT__63=63\nT__61=61\n'value-exception'=61\n'type'=44\n'value-list'=46\n'...'=43\n'arrival-rate-maximum'=65\n'obsolescence'=66\n'appears-in'=67\n'granularity'=62\n'arrival-rate-minimum'=64\n'description'=68\n'range'=45\n'arrival-rate-avg'=63", "new_methods": [], "old_code": "'type'=45\n'...'=44\n'values'=46\n'range'=43", "old_methods": [], "patch": "@@ -1,7 +1,14 @@\n+T__68=68\n RULE_ID=4\n+T__66=66\n+T__67=67\n+T__64=64\n T__29=29\n+T__65=65\n T__28=28\n+T__62=62\n T__27=27\n+T__63=63\n T__26=26\n T__25=25\n T__24=24\n@@ -10,6 +17,7 @@ T__22=22\n RULE_ANY_OTHER=10\n T__21=21\n T__20=20\n+T__61=61\n T__60=60\n T__55=55\n T__56=56\n@@ -56,34 +64,39 @@ T__38=38\n T__39=39\n RULE_WS=9\n 'rate'=47\n+'value-exception'=61\n 'F'=40\n 'initiation-delay'=48\n-'type'=45\n+'type'=44\n+'value-list'=46\n ';'=26\n 'value'=34\n '.'=16\n 'inputs'=23\n 'comments'=58\n 'max-response-time'=54\n '{'=28\n-'...'=44\n+'...'=43\n 'triggering'=60\n 'completion-deadline'=49\n 'completion-exception'=50\n '?'=41\n 'outputs'=24\n+'arrival-rate-maximum'=65\n 'device'=32\n '-'=15\n 'variables'=51\n 'input'=33\n ']'=14\n 'other'=19\n-'values'=46\n+'obsolescence'=66\n 'mode'=31\n 'references'=57\n 'T'=39\n 'supervisory'=17\n 'inferred'=25\n+'appears-in'=67\n+'granularity'=62\n 'contents'=59\n 'output'=36\n 'relationship'=52\n@@ -94,14 +107,17 @@ RULE_WS=9\n 'initial'=30\n 'target'=37\n 'reversed-by'=56\n+'arrival-rate-minimum'=64\n 'specification'=11\n 'min-response-time'=53\n '}'=29\n 'states'=22\n 'units'=38\n-'range'=43\n+'description'=68\n+'range'=45\n 'feedback-exception'=55\n 'devices'=13\n 'state'=27\n '['=12\n+'arrival-rate-avg'=63\n 'component'=20", "raw_url": "https://github.com/nasa/CertWare/raw/110fa3222ae2931978d7921dc8e6af8c7f43abd3/net.certware.intent.state%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fstate%2Fparser%2Fantlr%2Finternal%2FInternalStateSpecification.tokens", "sha": "3acaf2e76c3f09a75d6f94b5ca8167c8b2c44783", "status": "modified" }, { "additions": 591, "blob_url": "https://github.com/nasa/CertWare/blob/110fa3222ae2931978d7921dc8e6af8c7f43abd3/net.certware.intent.state%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fstate%2Fparser%2Fantlr%2Finternal%2FInternalStateSpecificationLexer.java", "changes": 873, "contents_url": "https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent.state%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fstate%2Fparser%2Fantlr%2Finternal%2FInternalStateSpecificationLexer.java?ref=110fa3222ae2931978d7921dc8e6af8c7f43abd3", "deletions": 282, "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecificationLexer.java", "new_code": " public static final int T__68=68;\n public static final int T__66=66;\n public static final int T__67=67;\n public static final int T__64=64;\n public static final int T__65=65;\n public static final int T__62=62;\n public static final int T__63=63;\n public static final int T__21=21;\n public static final int T__61=61;\n public static final int T__60=60;\n public static final int T__19=19;\n // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:43:7: ( '...' )\n // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:43:9: '...'\n match(\"...\"); \n // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:44:7: ( 'type' )\n // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:44:9: 'type'\n match(\"type\"); \n // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:45:7: ( 'range' )\n // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:45:9: 'range'\n match(\"range\"); \n // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:46:7: ( 'value-list' )\n // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:46:9: 'value-list'\n match(\"value-list\"); \n // $ANTLR start \"T__61\"\n public final void mT__61() throws RecognitionException {\n try {\n int _type = T__61;\n int _channel = DEFAULT_TOKEN_CHANNEL;\n // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:61:7: ( 'value-exception' )\n // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:61:9: 'value-exception'\n {\n match(\"value-exception\"); \n\n\n }\n\n state.type = _type;\n state.channel = _channel;\n }\n finally {\n }\n }\n // $ANTLR end \"T__61\"\n\n // $ANTLR start \"T__62\"\n public final void mT__62() throws RecognitionException {\n try {\n int _type = T__62;\n int _channel = DEFAULT_TOKEN_CHANNEL;\n // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:62:7: ( 'granularity' )\n // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:62:9: 'granularity'\n {\n match(\"granularity\"); \n\n\n }\n\n state.type = _type;\n state.channel = _channel;\n }\n finally {\n }\n }\n // $ANTLR end \"T__62\"\n\n // $ANTLR start \"T__63\"\n public final void mT__63() throws RecognitionException {\n try {\n int _type = T__63;\n int _channel = DEFAULT_TOKEN_CHANNEL;\n // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:63:7: ( 'arrival-rate-avg' )\n // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:63:9: 'arrival-rate-avg'\n {\n match(\"arrival-rate-avg\"); \n\n\n }\n\n state.type = _type;\n state.channel = _channel;\n }\n finally {\n }\n }\n // $ANTLR end \"T__63\"\n\n // $ANTLR start \"T__64\"\n public final void mT__64() throws RecognitionException {\n try {\n int _type = T__64;\n int _channel = DEFAULT_TOKEN_CHANNEL;\n // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:64:7: ( 'arrival-rate-minimum' )\n // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:64:9: 'arrival-rate-minimum'\n {\n match(\"arrival-rate-minimum\"); \n\n\n }\n\n state.type = _type;\n state.channel = _channel;\n }\n finally {\n }\n }\n // $ANTLR end \"T__64\"\n\n // $ANTLR start \"T__65\"\n public final void mT__65() throws RecognitionException {\n try {\n int _type = T__65;\n int _channel = DEFAULT_TOKEN_CHANNEL;\n // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:65:7: ( 'arrival-rate-maximum' )\n // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:65:9: 'arrival-rate-maximum'\n {\n match(\"arrival-rate-maximum\"); \n\n\n }\n\n state.type = _type;\n state.channel = _channel;\n }\n finally {\n }\n }\n // $ANTLR end \"T__65\"\n\n // $ANTLR start \"T__66\"\n public final void mT__66() throws RecognitionException {\n try {\n int _type = T__66;\n int _channel = DEFAULT_TOKEN_CHANNEL;\n // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:66:7: ( 'obsolescence' )\n // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:66:9: 'obsolescence'\n {\n match(\"obsolescence\"); \n\n\n }\n\n state.type = _type;\n state.channel = _channel;\n }\n finally {\n }\n }\n // $ANTLR end \"T__66\"\n\n // $ANTLR start \"T__67\"\n public final void mT__67() throws RecognitionException {\n try {\n int _type = T__67;\n int _channel = DEFAULT_TOKEN_CHANNEL;\n // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:67:7: ( 'appears-in' )\n // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:67:9: 'appears-in'\n {\n match(\"appears-in\"); \n\n\n }\n\n state.type = _type;\n state.channel = _channel;\n }\n finally {\n }\n }\n // $ANTLR end \"T__67\"\n\n // $ANTLR start \"T__68\"\n public final void mT__68() throws RecognitionException {\n try {\n int _type = T__68;\n int _channel = DEFAULT_TOKEN_CHANNEL;\n // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:68:7: ( 'description' )\n // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:68:9: 'description'\n {\n match(\"description\"); \n\n\n }\n\n state.type = _type;\n state.channel = _channel;\n }\n finally {\n }\n }\n // $ANTLR end \"T__68\"\n\n // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2404:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )\n // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2404:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*\n // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2404:11: ( '^' )?\n // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2404:11: '^'\n // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2404:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*\n // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2406:10: ( ( '0' .. '9' )+ )\n // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2406:12: ( '0' .. '9' )+\n // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2406:12: ( '0' .. '9' )+\n \t // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2406:13: '0' .. '9'\n // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2408:13: ( ( '\\\"' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\"' ) ) )* '\\\"' | '\\\\'' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\\'' ) ) )* '\\\\'' ) )\n // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2408:15: ( '\\\"' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\"' ) ) )* '\\\"' | '\\\\'' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\\'' ) ) )* '\\\\'' )\n // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2408:15: ( '\\\"' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\"' ) ) )* '\\\"' | '\\\\'' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\\'' ) ) )* '\\\\'' )\n // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2408:16: '\\\"' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\"' ) ) )* '\\\"'\n // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2408:20: ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\"' ) ) )*\n \t // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2408:21: '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' )\n \t // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2408:66: ~ ( ( '\\\\\\\\' | '\\\"' ) )\n // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2408:86: '\\\\'' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\\'' ) ) )* '\\\\''\n // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2408:91: ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\\'' ) ) )*\n \t // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2408:92: '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' )\n \t // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2408:137: ~ ( ( '\\\\\\\\' | '\\\\'' ) )\n // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2410:17: ( '/*' ( options {greedy=false; } : . )* '*/' )\n // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2410:19: '/*' ( options {greedy=false; } : . )* '*/'\n // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2410:24: ( options {greedy=false; } : . )*\n \t // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2410:52: .\n // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2412:17: ( '//' (~ ( ( '\\\\n' | '\\\\r' ) ) )* ( ( '\\\\r' )? '\\\\n' )? )\n // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2412:19: '//' (~ ( ( '\\\\n' | '\\\\r' ) ) )* ( ( '\\\\r' )? '\\\\n' )?\n // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2412:24: (~ ( ( '\\\\n' | '\\\\r' ) ) )*\n \t // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2412:24: ~ ( ( '\\\\n' | '\\\\r' ) )\n // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2412:40: ( ( '\\\\r' )? '\\\\n' )?\n // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2412:41: ( '\\\\r' )? '\\\\n'\n // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2412:41: ( '\\\\r' )?\n // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2412:41: '\\\\r'\n // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2414:9: ( ( ' ' | '\\\\t' | '\\\\r' | '\\\\n' )+ )\n // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2414:11: ( ' ' | '\\\\t' | '\\\\r' | '\\\\n' )+\n // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2414:11: ( ' ' | '\\\\t' | '\\\\r' | '\\\\n' )+\n // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2416:16: ( . )\n // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2416:18: .\n // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:1:8: ( T__11 | T__12 | T__13 | T__14 | T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | T__38 | T__39 | T__40 | T__41 | T__42 | T__43 | T__44 | T__45 | T__46 | T__47 | T__48 | T__49 | T__50 | T__51 | T__52 | T__53 | T__54 | T__55 | T__56 | T__57 | T__58 | T__59 | T__60 | T__61 | T__62 | T__63 | T__64 | T__65 | T__66 | T__67 | T__68 | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )\n int alt12=65;\n // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:1:310: T__61\n mT__61(); \n // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:1:316: T__62\n mT__62(); \n // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:1:322: T__63\n mT__63(); \n // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:1:328: T__64\n mT__64(); \n // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:1:334: T__65\n mT__65(); \n // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:1:340: T__66\n mT__66(); \n // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:1:346: T__67\n {\n mT__67(); \n\n }\n break;\n case 58 :\n // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:1:352: T__68\n {\n mT__68(); \n\n }\n break;\n case 59 :\n // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:1:358: RULE_ID\n {\n mRULE_ID(); \n\n }\n break;\n case 60 :\n // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:1:366: RULE_INT\n {\n mRULE_INT(); \n\n }\n break;\n case 61 :\n // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:1:375: RULE_STRING\n {\n mRULE_STRING(); \n\n }\n break;\n case 62 :\n // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:1:387: RULE_ML_COMMENT\n {\n mRULE_ML_COMMENT(); \n\n }\n break;\n case 63 :\n // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:1:403: RULE_SL_COMMENT\n {\n mRULE_SL_COMMENT(); \n\n }\n break;\n case 64 :\n // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:1:419: RULE_WS\n {\n mRULE_WS(); \n\n }\n break;\n case 65 :\n // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:1:427: RULE_ANY_OTHER\n \"\\1\\uffff\\1\\44\\1\\uffff\\1\\44\\2\\uffff\\1\\52\\4\\44\\3\\uffff\\3\\44\\1\\74\\1\"+\n \"\\75\\1\\uffff\\4\\44\\1\\37\\2\\uffff\\3\\37\\2\\uffff\\4\\44\\2\\uffff\\1\\44\\4\\uffff\"+\n \"\\11\\44\\3\\uffff\\5\\44\\3\\uffff\\6\\44\\5\\uffff\\57\\44\\1\\u009e\\2\\uffff\\7\"+\n \"\\44\\1\\u00a6\\3\\44\\1\\u00aa\\11\\44\\1\\u00b5\\4\\44\\1\\u00ba\\6\\44\\1\\u00c1\"+\n \"\\1\\uffff\\1\\u00c3\\2\\44\\1\\u00c7\\2\\44\\1\\u00ca\\1\\uffff\\1\\44\\1\\u00cc\"+\n \"\\1\\u00cd\\1\\uffff\\11\\44\\1\\u00d7\\1\\uffff\\1\\u00d8\\1\\u00da\\2\\44\\1\\uffff\"+\n \"\\1\\u00de\\5\\44\\1\\uffff\\1\\u00e4\\1\\uffff\\2\\44\\2\\uffff\\1\\44\\1\\u00eb\"+\n \"\\1\\uffff\\1\\44\\2\\uffff\\11\\44\\2\\uffff\\1\\u00f6\\1\\uffff\\2\\44\\1\\u00f9\"+\n \"\\1\\uffff\\5\\44\\1\\uffff\\1\\44\\1\\u0100\\1\\44\\2\\uffff\\1\\44\\1\\uffff\\12\"+\n \"\\44\\1\\uffff\\2\\44\\1\\uffff\\3\\44\\1\\u0112\\1\\u0113\\1\\u0114\\1\\uffff\\10\"+\n \"\\44\\2\\uffff\\3\\44\\1\\u0121\\1\\44\\1\\u0123\\1\\44\\3\\uffff\\1\\44\\1\\u0126\"+\n \"\\2\\44\\1\\uffff\\1\\44\\1\\uffff\\1\\44\\1\\uffff\\3\\44\\1\\uffff\\1\\44\\1\\uffff\"+\n \"\\2\\44\\1\\uffff\\1\\u0132\\1\\44\\1\\u0134\\1\\44\\1\\uffff\\1\\44\\1\\u0138\\1\\u0139\"+\n \"\\1\\44\\3\\uffff\\1\\44\\1\\uffff\\1\\u013e\\1\\uffff\\1\\44\\2\\uffff\\1\\u0141\"+\n \"\\2\\uffff\\1\\u0142\\2\\uffff\\1\\u0144\\10\\uffff\";\n \"\\u0149\\uffff\";\n \"\\1\\0\\1\\157\\1\\uffff\\1\\145\\2\\uffff\\1\\56\\1\\142\\1\\157\\1\\141\\1\\156\\3\"+\n \"\\uffff\\2\\141\\1\\156\\2\\60\\1\\uffff\\1\\141\\1\\145\\1\\162\\1\\160\\1\\101\\2\"+\n \"\\uffff\\2\\0\\1\\52\\2\\uffff\\1\\145\\1\\160\\1\\141\\1\\165\\2\\uffff\\1\\163\\4\"+\n \"\\uffff\\1\\145\\1\\150\\1\\164\\1\\163\\1\\155\\1\\144\\1\\156\\1\\170\\1\\146\\3\\uffff\"+\n \"\\1\\154\\1\\142\\1\\160\\2\\151\\3\\uffff\\1\\156\\1\\146\\1\\145\\1\\141\\1\\162\\1\"+\n \"\\160\\5\\uffff\\1\\143\\1\\145\\1\\164\\1\\162\\1\\151\\1\\143\\1\\162\\1\\145\\1\\160\"+\n \"\\1\\157\\1\\155\\1\\164\\1\\145\\2\\55\\1\\165\\1\\145\\1\\164\\1\\165\\1\\151\\1\\147\"+\n \"\\1\\154\\1\\145\\1\\147\\1\\164\\1\\147\\1\\145\\1\\141\\2\\145\\1\\144\\1\\156\\1\\151\"+\n \"\\1\\145\\1\\151\\1\\162\\1\\145\\2\\143\\1\\162\\1\\141\\1\\162\\1\\165\\2\\154\\2\\145\"+\n \"\\1\\145\\1\\60\\1\\164\\2\\162\\1\\142\\1\\165\\1\\166\\1\\141\\1\\146\\1\\166\\1\\60\"+\n \"\\2\\145\\1\\151\\1\\164\\1\\60\\1\\164\\1\\145\\1\\156\\1\\145\\2\\156\\1\\60\\1\\uffff\"+\n \"\\1\\60\\1\\162\\1\\141\\1\\55\\1\\142\\1\\164\\1\\60\\1\\uffff\\1\\145\\2\\60\\1\\uffff\"+\n \"\\1\\151\\1\\163\\1\\145\\1\\141\\1\\154\\1\\141\\1\\162\\2\\151\\1\\60\\1\\uffff\\2\"+\n \"\\60\\1\\160\\1\\151\\1\\uffff\\1\\60\\1\\163\\1\\145\\3\\164\\1\\uffff\\1\\60\\1\\uffff\"+\n \"\\1\\145\\1\\154\\1\\145\\1\\uffff\\1\\154\\1\\60\\1\\uffff\\1\\162\\2\\uffff\\1\\157\"+\n \"\\1\\145\\1\\156\\1\\143\\1\\141\\1\\154\\1\\163\\1\\143\\1\\163\\2\\uffff\\1\\60\\1\"+\n \"\\uffff\\1\\164\\1\\156\\1\\60\\1\\uffff\\1\\143\\1\\156\\1\\151\\2\\163\\1\\uffff\"+\n \"\\1\\144\\1\\60\\1\\151\\2\\uffff\\1\\145\\1\\uffff\\1\\151\\1\\156\\1\\144\\1\\143\"+\n \"\\1\\153\\1\\162\\2\\55\\1\\141\\1\\157\\1\\uffff\\1\\151\\1\\147\\1\\uffff\\1\\145\"+\n \"\\1\\164\\1\\157\\3\\60\\1\\uffff\\1\\157\\1\\163\\1\\156\\1\\163\\1\\55\\1\\145\\1\\55\"+\n \"\\1\\151\\1\\162\\1\\uffff\\1\\164\\1\\162\\1\\157\\1\\60\\1\\156\\1\\60\\1\\156\\3\\uffff\"+\n \"\\1\\156\\1\\60\\1\\147\\1\\150\\1\\uffff\\1\\163\\1\\uffff\\1\\164\\1\\141\\1\\151\"+\n \"\\1\\171\\1\\156\\1\\uffff\\1\\143\\1\\uffff\\2\\55\\1\\uffff\\1\\60\\1\\151\\1\\60\"+\n \"\\1\\171\\1\\164\\1\\157\\2\\60\\1\\145\\1\\144\\2\\uffff\\1\\160\\1\\uffff\\1\\60\\1\"+\n \"\\145\\1\\156\\2\\uffff\\1\\60\\2\\uffff\\1\\60\\1\\uffff\\1\\55\\1\\60\\2\\uffff\\1\"+\n \"\\141\\2\\uffff\\1\\141\\2\\uffff\";\n \"\\1\\141\\1\\171\\1\\156\\2\\172\\1\\uffff\\2\\145\\2\\162\\1\\172\\2\\uffff\\2\\uffff\"+\n \"\\1\\57\\2\\uffff\\1\\145\\1\\160\\1\\141\\1\\165\\2\\uffff\\1\\166\\4\\uffff\\1\\145\"+\n \"\\1\\150\\1\\164\\1\\163\\1\\156\\1\\144\\1\\156\\1\\170\\1\\160\\3\\uffff\\2\\162\\1\"+\n \"\\160\\2\\151\\3\\uffff\\1\\164\\1\\166\\1\\145\\1\\141\\1\\162\\1\\160\\5\\uffff\\1\"+\n \"\\143\\1\\145\\1\\164\\1\\162\\1\\151\\1\\143\\1\\162\\1\\145\\1\\160\\1\\157\\1\\160\"+\n \"\\1\\164\\1\\145\\2\\55\\1\\165\\1\\145\\1\\164\\1\\165\\1\\151\\1\\147\\1\\154\\1\\145\"+\n \"\\1\\147\\1\\164\\1\\147\\1\\145\\1\\141\\2\\145\\1\\144\\1\\156\\1\\151\\1\\145\\1\\151\"+\n \"\\1\\162\\1\\145\\2\\143\\1\\162\\1\\141\\1\\162\\1\\165\\1\\154\\1\\157\\2\\145\\1\\172\"+\n \"\\2\\uffff\\1\\164\\1\\162\\1\\151\\1\\145\\1\\141\\2\\145\\1\\172\\1\\147\\1\\163\\1\"+\n \"\\145\\1\\172\\1\\164\\2\\162\\1\\142\\1\\165\\1\\166\\1\\141\\1\\146\\1\\166\\1\\172\"+\n \"\\2\\145\\1\\151\\1\\164\\1\\172\\1\\164\\1\\145\\1\\156\\1\\145\\2\\156\\1\\172\\1\\uffff\"+\n \"\\1\\172\\1\\162\\1\\141\\1\\172\\1\\142\\1\\164\\1\\172\\1\\uffff\\1\\145\\2\\172\\1\"+\n \"\\uffff\\1\\151\\1\\163\\1\\145\\1\\141\\1\\154\\1\\141\\1\\162\\2\\151\\1\\172\\1\\uffff\"+\n \"\\2\\172\\1\\160\\1\\151\\1\\uffff\\1\\172\\1\\163\\1\\145\\3\\164\\1\\uffff\\1\\172\"+\n \"\\1\\uffff\\1\\145\\1\\164\\1\\154\\1\\uffff\\1\\154\\1\\172\\1\\uffff\\1\\162\\2\\uffff\"+\n \"\\1\\157\\1\\145\\1\\156\\1\\143\\1\\141\\1\\154\\1\\163\\1\\143\\1\\163\\2\\uffff\\1\"+\n \"\\172\\1\\uffff\\1\\164\\1\\156\\1\\172\\1\\uffff\\1\\143\\1\\156\\1\\151\\2\\163\\1\"+\n \"\\uffff\\1\\144\\1\\172\\1\\151\\2\\uffff\\1\\145\\1\\uffff\\1\\151\\1\\156\\1\\144\"+\n \"\\1\\143\\1\\153\\1\\162\\2\\55\\1\\141\\1\\157\\1\\uffff\\1\\151\\1\\147\\1\\uffff\"+\n \"\\1\\145\\1\\164\\1\\157\\3\\172\\1\\uffff\\1\\157\\1\\163\\1\\156\\1\\163\\1\\55\\1\"+\n \"\\145\\1\\55\\1\\151\\1\\162\\1\\uffff\\1\\164\\1\\162\\1\\157\\1\\172\\1\\156\\1\\172\"+\n \"\\1\\156\\3\\uffff\\1\\156\\1\\172\\1\\147\\1\\150\\1\\uffff\\1\\163\\1\\uffff\\1\\164\"+\n \"\\1\\141\\1\\151\\1\\171\\1\\156\\1\\uffff\\1\\143\\1\\uffff\\2\\55\\1\\uffff\\1\\172\"+\n \"\\1\\151\\1\\172\\1\\171\\1\\164\\1\\157\\2\\172\\2\\145\\2\\uffff\\1\\160\\1\\uffff\"+\n \"\\1\\172\\1\\145\\1\\156\\2\\uffff\\1\\172\\2\\uffff\\1\\172\\1\\uffff\\1\\55\\1\\172\"+\n \"\\2\\uffff\\1\\155\\2\\uffff\\1\\151\\2\\uffff\";\n \"\\5\\uffff\\1\\73\\1\\74\\3\\uffff\\1\\100\\1\\101\\4\\uffff\\1\\73\\1\\2\\1\\uffff\"+\n \"\\1\\4\\1\\5\\1\\41\\1\\6\\11\\uffff\\1\\20\\1\\22\\1\\23\\5\\uffff\\1\\35\\1\\36\\1\\37\"+\n \"\\6\\uffff\\1\\74\\1\\75\\1\\76\\1\\77\\1\\100\\60\\uffff\\1\\53\\1\\54\\42\\uffff\\1\"+\n \"\\25\\7\\uffff\\1\\42\\3\\uffff\\1\\45\\12\\uffff\\1\\21\\4\\uffff\\1\\11\\6\\uffff\"+\n \"\\1\\13\\1\\uffff\\1\\27\\3\\uffff\\1\\30\\2\\uffff\\1\\40\\1\\uffff\\1\\34\\1\\43\\11\"+\n \"\\uffff\\1\\14\\1\\31\\1\\uffff\\1\\26\\3\\uffff\\1\\32\\5\\uffff\\1\\15\\3\\uffff\"+\n \"\\1\\44\\1\\63\\1\\uffff\\1\\33\\12\\uffff\\1\\3\\2\\uffff\\1\\16\\6\\uffff\\1\\24\\11\"+\n \"\\uffff\\1\\71\\7\\uffff\\1\\60\\1\\61\\1\\17\\4\\uffff\\1\\56\\1\\uffff\\1\\55\\5\\uffff\"+\n \"\\1\\10\\1\\uffff\\1\\12\\2\\uffff\\1\\51\\12\\uffff\\1\\46\\1\\62\\1\\uffff\\1\\57\"+\n \"\\3\\uffff\\1\\7\\1\\72\\1\\uffff\\1\\47\\1\\50\\1\\uffff\\1\\64\\2\\uffff\\1\\70\\1\"+\n \"\\52\\1\\uffff\\1\\1\\1\\65\\1\\uffff\\1\\66\\1\\67\";\n \"\\1\\2\\32\\uffff\\1\\0\\1\\1\\u012c\\uffff}>\";\n \"\\11\\37\\2\\36\\2\\37\\1\\36\\22\\37\\1\\36\\1\\37\\1\\33\\4\\37\\1\\34\\5\\37\\1\"+\n \"\\5\\1\\6\\1\\35\\12\\32\\1\\37\\1\\13\\3\\37\\1\\23\\1\\37\\5\\31\\1\\22\\15\\31\\1\"+\n \"\\21\\6\\31\\1\\2\\1\\37\\1\\4\\1\\30\\1\\31\\1\\37\\1\\27\\1\\31\\1\\10\\1\\3\\1\\31\"+\n \"\\1\\25\\1\\26\\1\\31\\1\\12\\3\\31\\1\\11\\1\\31\\1\\7\\2\\31\\1\\24\\1\\1\\1\\17\\1\"+\n \"\\20\\1\\16\\4\\31\\1\\14\\1\\37\\1\\15\\uff82\\37\",\n \"\\1\\43\\1\\40\\3\\uffff\\1\\42\\1\\41\",\n \"\\1\\46\",\n \"\\1\\51\",\n \"\\1\\56\\15\\uffff\\1\\53\\3\\uffff\\1\\54\\1\\55\",\n \"\\1\\57\",\n \"\\1\\62\\7\\uffff\\1\\61\\5\\uffff\\1\\60\",\n \"\\1\\63\",\n \"\\1\\67\",\n \"\\1\\70\\20\\uffff\\1\\72\\6\\uffff\\1\\71\",\n \"\\1\\73\",\n \"\\12\\44\\7\\uffff\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\32\\44\",\n \"\\12\\44\\7\\uffff\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\32\\44\",\n \"\\1\\77\\3\\uffff\\1\\100\",\n \"\\1\\101\",\n \"\\1\\102\",\n \"\\1\\104\\1\\uffff\\1\\103\",\n \"\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\32\\44\",\n \"\\0\\106\",\n \"\\0\\106\",\n \"\\1\\107\\4\\uffff\\1\\110\",\n \"\\1\\112\",\n \"\\1\\113\",\n \"\\1\\114\",\n \"\\1\\115\",\n \"\\1\\117\\2\\uffff\\1\\116\",\n \"\\1\\121\",\n \"\\1\\122\",\n \"\\1\\123\",\n \"\\1\\124\\1\\125\",\n \"\\1\\126\",\n \"\\1\\127\",\n \"\\1\\130\",\n \"\\1\\132\\2\\uffff\\1\\133\\6\\uffff\\1\\131\",\n \"\\1\\134\\5\\uffff\\1\\135\",\n \"\\1\\137\\17\\uffff\\1\\136\",\n \"\\1\\140\",\n \"\\1\\141\",\n \"\\1\\142\",\n \"\\1\\143\\5\\uffff\\1\\144\",\n \"\\1\\147\\5\\uffff\\1\\145\\11\\uffff\\1\\146\",\n \"\\1\\150\",\n \"\\1\\151\",\n \"\\1\\152\",\n \"\\1\\153\",\n \"\\1\\167\\2\\uffff\\1\\166\",\n \"\\1\\u0087\",\n \"\\1\\u0088\",\n \"\\1\\u008b\",\n \"\\1\\u008c\",\n \"\\1\\u0094\",\n \"\\1\\u0098\",\n \"\\1\\u009a\\2\\uffff\\1\\u0099\",\n \"\\12\\44\\7\\uffff\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\22\\44\\1\\u009d\\7\\44\",\n \"\",\n \"\",\n \"\\1\\u009f\",\n \"\\1\\u00a0\",\n \"\\1\\u00a4\",\n \"\\12\\44\\7\\uffff\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\32\\44\",\n \"\\12\\44\\7\\uffff\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\32\\44\",\n \"\\1\\u00ab\",\n \"\\1\\u00ac\",\n \"\\1\\u00af\",\n \"\\1\\u00b0\",\n \"\\1\\u00b3\",\n \"\\12\\44\\7\\uffff\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\22\\44\\1\\u00b4\\7\\44\",\n \"\\1\\u00b6\",\n \"\\12\\44\\7\\uffff\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\32\\44\",\n \"\\1\\u00bd\",\n \"\\1\\u00be\",\n \"\\1\\u00bf\",\n \"\\1\\u00c0\",\n \"\\12\\44\\7\\uffff\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\32\\44\",\n \"\\12\\44\\7\\uffff\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\22\\44\\1\\u00c2\\7\\44\",\n \"\\1\\u00c6\\2\\uffff\\12\\44\\7\\uffff\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\32\"+\n \"\\44\",\n \"\\1\\u00c8\",\n \"\\12\\44\\7\\uffff\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\32\\44\",\n \"\\1\\u00cb\",\n \"\\12\\44\\7\\uffff\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\32\\44\",\n \"\\12\\44\\7\\uffff\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\32\\44\",\n \"\\1\\u00ce\",\n \"\\1\\u00d6\",\n \"\\12\\44\\7\\uffff\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\32\\44\",\n \"\\12\\44\\7\\uffff\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\32\\44\",\n \"\\12\\44\\7\\uffff\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\22\\44\\1\\u00d9\\7\\44\",\n \"\\12\\44\\7\\uffff\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\22\\44\\1\\u00dd\\7\\44\",\n \"\\12\\44\\7\\uffff\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\32\\44\",\n \"\",\n \"\\1\\u00e5\",\n \"\\1\\u00e6\\7\\uffff\\1\\u00e7\",\n \"\\1\\u00e9\\6\\uffff\\1\\u00e8\",\n \"\\12\\44\\7\\uffff\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\32\\44\",\n \"\",\n \"\\1\\u00ec\",\n \"\",\n \"\\1\\u00ed\",\n \"\\12\\44\\7\\uffff\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\32\\44\",\n \"\",\n \"\\1\\u00f7\",\n \"\\1\\u00f8\",\n \"\\12\\44\\7\\uffff\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\32\\44\",\n \"\\1\\u00fb\",\n \"\\12\\44\\7\\uffff\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\32\\44\",\n \"\\1\\u0101\",\n \"\\1\\u0103\",\n \"\\1\\u0105\",\n \"\\1\\u0107\",\n \"\\1\\u0108\",\n \"\\1\\u0109\",\n \"\\1\\u010a\",\n \"\\1\\u010b\",\n \"\\1\\u010c\",\n \"\\1\\u010d\",\n \"\\1\\u010e\",\n \"\\1\\u010f\",\n \"\\1\\u0110\",\n \"\\1\\u0111\",\n \"\\12\\44\\7\\uffff\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\32\\44\",\n \"\\12\\44\\7\\uffff\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\32\\44\",\n \"\\12\\44\\7\\uffff\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\32\\44\",\n \"\\1\\u0115\",\n \"\\1\\u0116\",\n \"\\1\\u0117\",\n \"\\1\\u0118\",\n \"\\1\\u0119\",\n \"\\1\\u011a\",\n \"\\1\\u011b\",\n \"\\1\\u011c\",\n \"\\1\\u011d\",\n \"\",\n \"\\1\\u011e\",\n \"\\1\\u011f\",\n \"\\1\\u0120\",\n \"\\12\\44\\7\\uffff\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\32\\44\",\n \"\\1\\u0122\",\n \"\\12\\44\\7\\uffff\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\32\\44\",\n \"\\1\\u0124\",\n \"\",\n \"\",\n \"\",\n \"\\1\\u0125\",\n \"\\12\\44\\7\\uffff\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\32\\44\",\n \"\\1\\u0127\",\n \"\\1\\u0128\",\n \"\",\n \"\\1\\u0129\",\n \"\",\n \"\\1\\u012a\",\n \"\\1\\u012b\",\n \"\\1\\u012c\",\n \"\\1\\u012d\",\n \"\\1\\u012e\",\n \"\\1\\u012f\",\n \"\\1\\u0130\",\n \"\\1\\u0131\",\n \"\\12\\44\\7\\uffff\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\32\\44\",\n \"\\1\\u0133\",\n \"\\12\\44\\7\\uffff\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\32\\44\",\n \"\\1\\u0135\",\n \"\\1\\u0136\",\n \"\\1\\u0137\",\n \"\\12\\44\\7\\uffff\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\32\\44\",\n \"\\12\\44\\7\\uffff\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\32\\44\",\n \"\\1\\u013a\",\n \"\\1\\u013b\\1\\u013c\",\n \"\",\n \"\",\n \"\\1\\u013d\",\n \"\",\n \"\\12\\44\\7\\uffff\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\32\\44\",\n \"\\1\\u013f\",\n \"\\1\\u0140\",\n \"\",\n \"\",\n \"\\12\\44\\7\\uffff\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\32\\44\",\n \"\",\n \"\",\n \"\\12\\44\\7\\uffff\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\32\\44\",\n \"\",\n \"\\1\\u0143\",\n \"\\12\\44\\7\\uffff\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\32\\44\",\n \"\",\n \"\",\n \"\\1\\u0145\\13\\uffff\\1\\u0146\",\n \"\",\n \"\",\n \"\\1\\u0148\\7\\uffff\\1\\u0147\",\n return \"1:1: Tokens : ( T__11 | T__12 | T__13 | T__14 | T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | T__38 | T__39 | T__40 | T__41 | T__42 | T__43 | T__44 | T__45 | T__46 | T__47 | T__48 | T__49 | T__50 | T__51 | T__52 | T__53 | T__54 | T__55 | T__56 | T__57 | T__58 | T__59 | T__60 | T__61 | T__62 | T__63 | T__64 | T__65 | T__66 | T__67 | T__68 | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER );\";\n int LA12_27 = input.LA(1);\n if ( ((LA12_27>='\\u0000' && LA12_27<='\\uFFFF')) ) {s = 70;}\n else s = 31;\n int LA12_28 = input.LA(1);\n if ( ((LA12_28>='\\u0000' && LA12_28<='\\uFFFF')) ) {s = 70;}\n else s = 31;\n else if ( (LA12_0=='g') ) {s = 22;}\n\n else if ( (LA12_0=='a') ) {s = 23;}\n\n else if ( (LA12_0=='^') ) {s = 24;}\n else if ( ((LA12_0>='A' && LA12_0<='E')||(LA12_0>='G' && LA12_0<='S')||(LA12_0>='U' && LA12_0<='Z')||LA12_0=='_'||LA12_0=='b'||LA12_0=='e'||LA12_0=='h'||(LA12_0>='j' && LA12_0<='l')||LA12_0=='n'||(LA12_0>='p' && LA12_0<='q')||(LA12_0>='w' && LA12_0<='z')) ) {s = 25;}\n else if ( ((LA12_0>='0' && LA12_0<='9')) ) {s = 26;}\n else if ( (LA12_0=='\\\"') ) {s = 27;}\n else if ( (LA12_0=='\\'') ) {s = 28;}\n else if ( (LA12_0=='/') ) {s = 29;}\n else if ( ((LA12_0>='\\t' && LA12_0<='\\n')||LA12_0=='\\r'||LA12_0==' ') ) {s = 30;}\n else if ( ((LA12_0>='\\u0000' && LA12_0<='\\b')||(LA12_0>='\\u000B' && LA12_0<='\\f')||(LA12_0>='\\u000E' && LA12_0<='\\u001F')||LA12_0=='!'||(LA12_0>='#' && LA12_0<='&')||(LA12_0>='(' && LA12_0<=',')||LA12_0==':'||(LA12_0>='<' && LA12_0<='>')||LA12_0=='@'||LA12_0=='\\\\'||LA12_0=='`'||LA12_0=='|'||(LA12_0>='~' && LA12_0<='\\uFFFF')) ) {s = 31;}", "new_methods": [], "old_code": " public static final int T__21=21;\n public static final int T__60=60;\n public static final int T__19=19;\n // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:43:7: ( 'range' )\n // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:43:9: 'range'\n match(\"range\"); \n // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:44:7: ( '...' )\n // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:44:9: '...'\n match(\"...\"); \n // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:45:7: ( 'type' )\n // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:45:9: 'type'\n match(\"type\"); \n // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:46:7: ( 'values' )\n // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:46:9: 'values'\n match(\"values\"); \n // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2252:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )\n // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2252:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*\n // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2252:11: ( '^' )?\n // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2252:11: '^'\n // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2252:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*\n // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2254:10: ( ( '0' .. '9' )+ )\n // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2254:12: ( '0' .. '9' )+\n // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2254:12: ( '0' .. '9' )+\n \t // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2254:13: '0' .. '9'\n // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2256:13: ( ( '\\\"' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\"' ) ) )* '\\\"' | '\\\\'' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\\'' ) ) )* '\\\\'' ) )\n // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2256:15: ( '\\\"' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\"' ) ) )* '\\\"' | '\\\\'' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\\'' ) ) )* '\\\\'' )\n // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2256:15: ( '\\\"' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\"' ) ) )* '\\\"' | '\\\\'' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\\'' ) ) )* '\\\\'' )\n // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2256:16: '\\\"' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\"' ) ) )* '\\\"'\n // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2256:20: ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\"' ) ) )*\n \t // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2256:21: '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' )\n \t // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2256:66: ~ ( ( '\\\\\\\\' | '\\\"' ) )\n // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2256:86: '\\\\'' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\\'' ) ) )* '\\\\''\n // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2256:91: ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\\'' ) ) )*\n \t // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2256:92: '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' )\n \t // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2256:137: ~ ( ( '\\\\\\\\' | '\\\\'' ) )\n // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2258:17: ( '/*' ( options {greedy=false; } : . )* '*/' )\n // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2258:19: '/*' ( options {greedy=false; } : . )* '*/'\n // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2258:24: ( options {greedy=false; } : . )*\n \t // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2258:52: .\n // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2260:17: ( '//' (~ ( ( '\\\\n' | '\\\\r' ) ) )* ( ( '\\\\r' )? '\\\\n' )? )\n // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2260:19: '//' (~ ( ( '\\\\n' | '\\\\r' ) ) )* ( ( '\\\\r' )? '\\\\n' )?\n // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2260:24: (~ ( ( '\\\\n' | '\\\\r' ) ) )*\n \t // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2260:24: ~ ( ( '\\\\n' | '\\\\r' ) )\n // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2260:40: ( ( '\\\\r' )? '\\\\n' )?\n // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2260:41: ( '\\\\r' )? '\\\\n'\n // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2260:41: ( '\\\\r' )?\n // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2260:41: '\\\\r'\n // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2262:9: ( ( ' ' | '\\\\t' | '\\\\r' | '\\\\n' )+ )\n // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2262:11: ( ' ' | '\\\\t' | '\\\\r' | '\\\\n' )+\n // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2262:11: ( ' ' | '\\\\t' | '\\\\r' | '\\\\n' )+\n // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2264:16: ( . )\n // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2264:18: .\n // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:1:8: ( T__11 | T__12 | T__13 | T__14 | T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | T__38 | T__39 | T__40 | T__41 | T__42 | T__43 | T__44 | T__45 | T__46 | T__47 | T__48 | T__49 | T__50 | T__51 | T__52 | T__53 | T__54 | T__55 | T__56 | T__57 | T__58 | T__59 | T__60 | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )\n int alt12=57;\n // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:1:310: RULE_ID\n mRULE_ID(); \n // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:1:318: RULE_INT\n mRULE_INT(); \n // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:1:327: RULE_STRING\n mRULE_STRING(); \n // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:1:339: RULE_ML_COMMENT\n mRULE_ML_COMMENT(); \n // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:1:355: RULE_SL_COMMENT\n mRULE_SL_COMMENT(); \n // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:1:371: RULE_WS\n mRULE_WS(); \n // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:1:379: RULE_ANY_OTHER\n \"\\1\\uffff\\1\\42\\1\\uffff\\1\\42\\2\\uffff\\1\\50\\4\\42\\3\\uffff\\3\\42\\1\\71\\1\"+\n \"\\72\\1\\uffff\\2\\42\\1\\35\\2\\uffff\\3\\35\\2\\uffff\\4\\42\\2\\uffff\\1\\42\\4\\uffff\"+\n \"\\10\\42\\3\\uffff\\5\\42\\3\\uffff\\3\\42\\5\\uffff\\50\\42\\1\\u008c\\2\\uffff\\7\"+\n \"\\42\\1\\u0094\\3\\42\\1\\u0098\\6\\42\\1\\u00a0\\3\\42\\1\\u00a4\\5\\42\\1\\u00aa\"+\n \"\\1\\uffff\\1\\u00ac\\2\\42\\1\\u00b0\\2\\42\\1\\u00b3\\1\\uffff\\1\\42\\1\\u00b5\"+\n \"\\1\\u00b6\\1\\uffff\\6\\42\\1\\u00bd\\1\\uffff\\1\\u00be\\1\\u00c0\\1\\42\\1\\uffff\"+\n \"\\1\\u00c3\\4\\42\\1\\uffff\\1\\u00c8\\1\\uffff\\2\\42\\1\\u00cc\\1\\uffff\\1\\42\"+\n \"\\1\\u00ce\\1\\uffff\\1\\42\\2\\uffff\\6\\42\\2\\uffff\\1\\u00d6\\1\\uffff\\1\\42\"+\n \"\\1\\u00d8\\1\\uffff\\4\\42\\1\\uffff\\1\\42\\1\\u00de\\1\\42\\1\\uffff\\1\\42\\1\\uffff\"+\n \"\\7\\42\\1\\uffff\\1\\42\\1\\uffff\\2\\42\\1\\u00eb\\1\\u00ec\\1\\u00ed\\1\\uffff\"+\n \"\\11\\42\\1\\u00f7\\1\\u00f8\\1\\42\\3\\uffff\\1\\42\\1\\u00fb\\2\\42\\1\\uffff\\1\"+\n \"\\42\\1\\uffff\\2\\42\\2\\uffff\\2\\42\\1\\uffff\\1\\u0103\\1\\42\\1\\u0105\\1\\42\"+\n \"\\1\\u0107\\3\\uffff\\1\\42\\1\\uffff\\1\\42\\3\\uffff\\1\\u010c\\1\\u010d\\2\\uffff\";\n \"\\u010e\\uffff\";\n \"\\1\\0\\1\\157\\1\\uffff\\1\\145\\2\\uffff\\1\\56\\1\\160\\1\\157\\1\\141\\1\\156\\3\"+\n \"\\uffff\\2\\141\\1\\156\\2\\60\\1\\uffff\\1\\141\\1\\145\\1\\101\\2\\uffff\\2\\0\\1\"+\n \"\\52\\2\\uffff\\1\\145\\1\\160\\1\\141\\1\\165\\2\\uffff\\1\\166\\4\\uffff\\1\\145\"+\n \"\\1\\150\\1\\164\\1\\155\\1\\144\\1\\156\\1\\170\\1\\146\\3\\uffff\\1\\154\\1\\142\\1\"+\n \"\\160\\2\\151\\3\\uffff\\1\\156\\1\\146\\1\\145\\5\\uffff\\1\\143\\1\\145\\1\\164\\1\"+\n \"\\162\\1\\151\\1\\162\\1\\145\\1\\160\\1\\155\\1\\164\\1\\145\\2\\55\\1\\165\\1\\145\"+\n \"\\1\\164\\1\\165\\1\\151\\1\\147\\1\\154\\1\\145\\1\\147\\1\\164\\1\\147\\1\\145\\1\\141\"+\n \"\\2\\145\\1\\144\\1\\151\\1\\162\\1\\145\\2\\143\\1\\141\\1\\162\\1\\165\\1\\154\\2\\145\"+\n \"\\1\\145\\1\\60\\1\\164\\2\\162\\1\\142\\1\\146\\1\\166\\1\\60\\2\\145\\1\\164\\1\\60\"+\n \"\\1\\164\\1\\156\\1\\145\\2\\156\\1\\60\\1\\uffff\\1\\60\\1\\162\\1\\141\\1\\60\\1\\142\"+\n \"\\1\\164\\1\\60\\1\\uffff\\1\\145\\2\\60\\1\\uffff\\1\\151\\1\\163\\1\\145\\1\\141\\2\"+\n \"\\151\\1\\60\\1\\uffff\\2\\60\\1\\151\\1\\uffff\\1\\60\\1\\145\\3\\164\\1\\uffff\\1\"+\n \"\\60\\1\\uffff\\1\\145\\1\\154\\1\\60\\1\\uffff\\1\\154\\1\\60\\1\\uffff\\1\\162\\2\"+\n \"\\uffff\\1\\157\\1\\145\\1\\156\\2\\143\\1\\163\\2\\uffff\\1\\60\\1\\uffff\\1\\156\"+\n \"\\1\\60\\1\\uffff\\1\\156\\1\\151\\2\\163\\1\\uffff\\1\\144\\1\\60\\1\\151\\1\\uffff\"+\n \"\\1\\145\\1\\uffff\\1\\151\\1\\156\\1\\144\\1\\143\\1\\153\\1\\141\\1\\157\\1\\uffff\"+\n \"\\1\\147\\1\\uffff\\1\\164\\1\\157\\3\\60\\1\\uffff\\1\\157\\1\\163\\1\\156\\1\\163\"+\n \"\\1\\55\\1\\145\\1\\55\\1\\164\\1\\162\\2\\60\\1\\156\\3\\uffff\\1\\156\\1\\60\\1\\147\"+\n \"\\1\\150\\1\\uffff\\1\\163\\1\\uffff\\1\\151\\1\\171\\2\\uffff\\2\\55\\1\\uffff\\1\"+\n \"\\60\\1\\151\\1\\60\\1\\157\\1\\60\\1\\144\\2\\uffff\\1\\160\\1\\uffff\\1\\156\\3\\uffff\"+\n \"\\2\\60\\2\\uffff\";\n \"\\1\\141\\1\\171\\1\\156\\2\\172\\1\\uffff\\2\\145\\1\\172\\2\\uffff\\2\\uffff\\1\\57\"+\n \"\\2\\uffff\\1\\145\\1\\160\\1\\141\\1\\165\\2\\uffff\\1\\166\\4\\uffff\\1\\145\\1\\150\"+\n \"\\1\\164\\1\\156\\1\\144\\1\\156\\1\\170\\1\\160\\3\\uffff\\2\\162\\1\\160\\2\\151\\3\"+\n \"\\uffff\\1\\164\\1\\166\\1\\145\\5\\uffff\\1\\143\\1\\145\\1\\164\\1\\162\\1\\151\\1\"+\n \"\\162\\1\\145\\2\\160\\1\\164\\1\\145\\2\\55\\1\\165\\1\\145\\1\\164\\1\\165\\1\\151\"+\n \"\\1\\147\\1\\154\\1\\145\\1\\147\\1\\164\\1\\147\\1\\145\\1\\141\\2\\145\\1\\144\\1\\151\"+\n \"\\1\\162\\1\\145\\2\\143\\1\\141\\1\\162\\1\\165\\1\\157\\2\\145\\1\\172\\2\\uffff\\1\"+\n \"\\164\\1\\162\\1\\151\\1\\145\\1\\141\\2\\145\\1\\172\\1\\147\\1\\163\\1\\145\\1\\172\"+\n \"\\1\\164\\2\\162\\1\\142\\1\\146\\1\\166\\1\\172\\2\\145\\1\\164\\1\\172\\1\\164\\1\\156\"+\n \"\\1\\145\\2\\156\\1\\172\\1\\uffff\\1\\172\\1\\162\\1\\141\\1\\172\\1\\142\\1\\164\\1\"+\n \"\\172\\1\\uffff\\1\\145\\2\\172\\1\\uffff\\1\\151\\1\\163\\1\\145\\1\\141\\2\\151\\1\"+\n \"\\172\\1\\uffff\\2\\172\\1\\151\\1\\uffff\\1\\172\\1\\145\\3\\164\\1\\uffff\\1\\172\"+\n \"\\1\\uffff\\1\\145\\1\\164\\1\\172\\1\\uffff\\1\\154\\1\\172\\1\\uffff\\1\\162\\2\\uffff\"+\n \"\\1\\157\\1\\145\\1\\156\\2\\143\\1\\163\\2\\uffff\\1\\172\\1\\uffff\\1\\156\\1\\172\"+\n \"\\1\\uffff\\1\\156\\1\\151\\2\\163\\1\\uffff\\1\\144\\1\\172\\1\\151\\1\\uffff\\1\\145\"+\n \"\\1\\uffff\\1\\151\\1\\156\\1\\144\\1\\143\\1\\153\\1\\141\\1\\157\\1\\uffff\\1\\147\"+\n \"\\1\\uffff\\1\\164\\1\\157\\3\\172\\1\\uffff\\1\\157\\1\\163\\1\\156\\1\\163\\1\\55\"+\n \"\\1\\145\\1\\55\\1\\164\\1\\162\\2\\172\\1\\156\\3\\uffff\\1\\156\\1\\172\\1\\147\\1\"+\n \"\\150\\1\\uffff\\1\\163\\1\\uffff\\1\\151\\1\\171\\2\\uffff\\2\\55\\1\\uffff\\1\\172\"+\n \"\\1\\151\\1\\172\\1\\157\\1\\172\\1\\145\\2\\uffff\\1\\160\\1\\uffff\\1\\156\\3\\uffff\"+\n \"\\2\\172\\2\\uffff\";\n \"\\3\\uffff\\1\\63\\1\\64\\3\\uffff\\1\\70\\1\\71\\4\\uffff\\1\\63\\1\\2\\1\\uffff\\1\"+\n \"\\4\\1\\5\\1\\42\\1\\6\\10\\uffff\\1\\20\\1\\22\\1\\23\\5\\uffff\\1\\35\\1\\36\\1\\37\\3\"+\n \"\\uffff\\1\\64\\1\\65\\1\\66\\1\\67\\1\\70\\51\\uffff\\1\\53\\1\\54\\35\\uffff\\1\\25\"+\n \"\\7\\uffff\\1\\43\\3\\uffff\\1\\45\\7\\uffff\\1\\21\\3\\uffff\\1\\11\\5\\uffff\\1\\13\"+\n \"\\1\\uffff\\1\\27\\3\\uffff\\1\\30\\2\\uffff\\1\\40\\1\\uffff\\1\\34\\1\\41\\6\\uffff\"+\n \"\\1\\14\\1\\31\\1\\uffff\\1\\26\\2\\uffff\\1\\32\\4\\uffff\\1\\15\\3\\uffff\\1\\44\\1\"+\n \"\\uffff\\1\\33\\7\\uffff\\1\\3\\1\\uffff\\1\\16\\5\\uffff\\1\\24\\14\\uffff\\1\\60\"+\n \"\\1\\61\\1\\17\\4\\uffff\\1\\56\\1\\uffff\\1\\55\\2\\uffff\\1\\10\\1\\12\\2\\uffff\\1\"+\n \"\\51\\6\\uffff\\1\\46\\1\\62\\1\\uffff\\1\\57\\1\\uffff\\1\\7\\1\\47\\1\\50\\2\\uffff\"+\n \"\\1\\52\\1\\1\";\n \"\\1\\2\\30\\uffff\\1\\1\\1\\0\\u00f3\\uffff}>\";\n \"\\11\\35\\2\\34\\2\\35\\1\\34\\22\\35\\1\\34\\1\\35\\1\\31\\4\\35\\1\\32\\5\\35\\1\"+\n \"\\5\\1\\6\\1\\33\\12\\30\\1\\35\\1\\13\\3\\35\\1\\23\\1\\35\\5\\27\\1\\22\\15\\27\\1\"+\n \"\\21\\6\\27\\1\\2\\1\\35\\1\\4\\1\\26\\1\\27\\1\\35\\2\\27\\1\\10\\1\\3\\1\\27\\1\\25\"+\n \"\\2\\27\\1\\12\\3\\27\\1\\11\\1\\27\\1\\7\\2\\27\\1\\24\\1\\1\\1\\17\\1\\20\\1\\16\\4\"+\n \"\\27\\1\\14\\1\\35\\1\\15\\uff82\\35\",\n \"\\1\\41\\1\\36\\3\\uffff\\1\\40\\1\\37\",\n \"\\1\\44\",\n \"\\1\\47\",\n \"\\1\\51\\3\\uffff\\1\\52\\1\\53\",\n \"\\1\\54\",\n \"\\1\\57\\7\\uffff\\1\\56\\5\\uffff\\1\\55\",\n \"\\1\\60\",\n \"\\1\\64\",\n \"\\1\\65\\20\\uffff\\1\\67\\6\\uffff\\1\\66\",\n \"\\1\\70\",\n \"\\12\\42\\7\\uffff\\32\\42\\4\\uffff\\1\\42\\1\\uffff\\32\\42\",\n \"\\12\\42\\7\\uffff\\32\\42\\4\\uffff\\1\\42\\1\\uffff\\32\\42\",\n \"\\1\\74\\3\\uffff\\1\\75\",\n \"\\1\\76\",\n \"\\32\\42\\4\\uffff\\1\\42\\1\\uffff\\32\\42\",\n \"\\0\\100\",\n \"\\0\\100\",\n \"\\1\\101\\4\\uffff\\1\\102\",\n \"\\1\\104\",\n \"\\1\\105\",\n \"\\1\\106\",\n \"\\1\\107\",\n \"\\1\\110\",\n \"\\1\\111\",\n \"\\1\\112\",\n \"\\1\\113\",\n \"\\1\\114\\1\\115\",\n \"\\1\\116\",\n \"\\1\\117\",\n \"\\1\\122\\2\\uffff\\1\\123\\6\\uffff\\1\\121\",\n \"\\1\\124\\5\\uffff\\1\\125\",\n \"\\1\\127\\17\\uffff\\1\\126\",\n \"\\1\\130\",\n \"\\1\\131\",\n \"\\1\\132\",\n \"\\1\\133\\5\\uffff\\1\\134\",\n \"\\1\\137\\5\\uffff\\1\\135\\11\\uffff\\1\\136\",\n \"\\1\\140\",\n \"\\1\\141\",\n \"\\1\\142\",\n \"\\1\\143\",\n \"\\1\\144\",\n \"\\1\\145\",\n \"\\1\\146\",\n \"\\1\\147\",\n \"\\1\\150\",\n \"\\1\\152\\2\\uffff\\1\\151\",\n \"\\1\\153\",\n \"\\1\\166\",\n \"\\1\\167\",\n \"\\1\\u0088\\2\\uffff\\1\\u0087\",\n \"\\12\\42\\7\\uffff\\32\\42\\4\\uffff\\1\\42\\1\\uffff\\22\\42\\1\\u008b\\7\\42\",\n \"\",\n \"\",\n \"\\12\\42\\7\\uffff\\32\\42\\4\\uffff\\1\\42\\1\\uffff\\32\\42\",\n \"\\12\\42\\7\\uffff\\32\\42\\4\\uffff\\1\\42\\1\\uffff\\32\\42\",\n \"\\1\\u0099\",\n \"\\1\\u009a\",\n \"\\1\\u009d\",\n \"\\1\\u009e\",\n \"\\12\\42\\7\\uffff\\32\\42\\4\\uffff\\1\\42\\1\\uffff\\22\\42\\1\\u009f\\7\\42\",\n \"\\12\\42\\7\\uffff\\32\\42\\4\\uffff\\1\\42\\1\\uffff\\32\\42\",\n \"\\1\\u00a6\",\n \"\\12\\42\\7\\uffff\\32\\42\\4\\uffff\\1\\42\\1\\uffff\\32\\42\",\n \"\",\n \"\\12\\42\\7\\uffff\\32\\42\\4\\uffff\\1\\42\\1\\uffff\\22\\42\\1\\u00ab\\7\\42\",\n \"\\12\\42\\7\\uffff\\32\\42\\4\\uffff\\1\\42\\1\\uffff\\22\\42\\1\\u00af\\7\\42\",\n \"\\12\\42\\7\\uffff\\32\\42\\4\\uffff\\1\\42\\1\\uffff\\32\\42\",\n \"\",\n \"\\1\\u00b4\",\n \"\\12\\42\\7\\uffff\\32\\42\\4\\uffff\\1\\42\\1\\uffff\\32\\42\",\n \"\\12\\42\\7\\uffff\\32\\42\\4\\uffff\\1\\42\\1\\uffff\\32\\42\",\n \"\",\n \"\\1\\u00ba\",\n \"\\12\\42\\7\\uffff\\32\\42\\4\\uffff\\1\\42\\1\\uffff\\32\\42\",\n \"\\12\\42\\7\\uffff\\32\\42\\4\\uffff\\1\\42\\1\\uffff\\32\\42\",\n \"\\12\\42\\7\\uffff\\32\\42\\4\\uffff\\1\\42\\1\\uffff\\22\\42\\1\\u00bf\\7\\42\",\n \"\\1\\u00c1\",\n \"\",\n \"\\12\\42\\7\\uffff\\32\\42\\4\\uffff\\1\\42\\1\\uffff\\22\\42\\1\\u00c2\\7\\42\",\n \"\\1\\u00c6\",\n \"\\1\\u00c7\",\n \"\",\n \"\\12\\42\\7\\uffff\\32\\42\\4\\uffff\\1\\42\\1\\uffff\\32\\42\",\n \"\",\n \"\\1\\u00ca\\7\\uffff\\1\\u00cb\",\n \"\\12\\42\\7\\uffff\\32\\42\\4\\uffff\\1\\42\\1\\uffff\\32\\42\",\n \"\\1\\u00cd\",\n \"\\12\\42\\7\\uffff\\32\\42\\4\\uffff\\1\\42\\1\\uffff\\32\\42\",\n \"\",\n \"\",\n \"\",\n \"\\12\\42\\7\\uffff\\32\\42\\4\\uffff\\1\\42\\1\\uffff\\32\\42\",\n \"\",\n \"\\1\\u00d7\",\n \"\\12\\42\\7\\uffff\\32\\42\\4\\uffff\\1\\42\\1\\uffff\\32\\42\",\n \"\",\n \"\\1\\u00d9\",\n \"\\1\\u00da\",\n \"\\1\\u00dd\",\n \"\\12\\42\\7\\uffff\\32\\42\\4\\uffff\\1\\42\\1\\uffff\\32\\42\",\n \"\",\n \"\",\n \"\\1\\u00e4\",\n \"\\1\\u00e5\",\n \"\\1\\u00e6\",\n \"\\1\\u00e7\",\n \"\\1\\u00e8\",\n \"\\1\\u00e9\",\n \"\\12\\42\\7\\uffff\\32\\42\\4\\uffff\\1\\42\\1\\uffff\\32\\42\",\n \"\\12\\42\\7\\uffff\\32\\42\\4\\uffff\\1\\42\\1\\uffff\\32\\42\",\n \"\\12\\42\\7\\uffff\\32\\42\\4\\uffff\\1\\42\\1\\uffff\\32\\42\",\n \"\\1\\u00f6\",\n \"\\12\\42\\7\\uffff\\32\\42\\4\\uffff\\1\\42\\1\\uffff\\32\\42\",\n \"\\12\\42\\7\\uffff\\32\\42\\4\\uffff\\1\\42\\1\\uffff\\32\\42\",\n \"\\1\\u00f9\",\n \"\\12\\42\\7\\uffff\\32\\42\\4\\uffff\\1\\42\\1\\uffff\\32\\42\",\n \"\",\n \"\\1\\u0100\",\n \"\\1\\u0101\",\n \"\\12\\42\\7\\uffff\\32\\42\\4\\uffff\\1\\42\\1\\uffff\\32\\42\",\n \"\\12\\42\\7\\uffff\\32\\42\\4\\uffff\\1\\42\\1\\uffff\\32\\42\",\n \"\\12\\42\\7\\uffff\\32\\42\\4\\uffff\\1\\42\\1\\uffff\\32\\42\",\n \"\\1\\u0108\\1\\u0109\",\n \"\\1\\u010a\",\n \"\\1\\u010b\",\n \"\\12\\42\\7\\uffff\\32\\42\\4\\uffff\\1\\42\\1\\uffff\\32\\42\",\n \"\\12\\42\\7\\uffff\\32\\42\\4\\uffff\\1\\42\\1\\uffff\\32\\42\",\n return \"1:1: Tokens : ( T__11 | T__12 | T__13 | T__14 | T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | T__38 | T__39 | T__40 | T__41 | T__42 | T__43 | T__44 | T__45 | T__46 | T__47 | T__48 | T__49 | T__50 | T__51 | T__52 | T__53 | T__54 | T__55 | T__56 | T__57 | T__58 | T__59 | T__60 | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER );\";\n int LA12_26 = input.LA(1);\n if ( ((LA12_26>='\\u0000' && LA12_26<='\\uFFFF')) ) {s = 64;}\n else s = 29;\n int LA12_25 = input.LA(1);\n if ( ((LA12_25>='\\u0000' && LA12_25<='\\uFFFF')) ) {s = 64;}\n else s = 29;\n else if ( (LA12_0=='^') ) {s = 22;}\n else if ( ((LA12_0>='A' && LA12_0<='E')||(LA12_0>='G' && LA12_0<='S')||(LA12_0>='U' && LA12_0<='Z')||LA12_0=='_'||(LA12_0>='a' && LA12_0<='b')||LA12_0=='e'||(LA12_0>='g' && LA12_0<='h')||(LA12_0>='j' && LA12_0<='l')||LA12_0=='n'||(LA12_0>='p' && LA12_0<='q')||(LA12_0>='w' && LA12_0<='z')) ) {s = 23;}\n else if ( ((LA12_0>='0' && LA12_0<='9')) ) {s = 24;}\n else if ( (LA12_0=='\\\"') ) {s = 25;}\n else if ( (LA12_0=='\\'') ) {s = 26;}\n else if ( (LA12_0=='/') ) {s = 27;}\n else if ( ((LA12_0>='\\t' && LA12_0<='\\n')||LA12_0=='\\r'||LA12_0==' ') ) {s = 28;}\n else if ( ((LA12_0>='\\u0000' && LA12_0<='\\b')||(LA12_0>='\\u000B' && LA12_0<='\\f')||(LA12_0>='\\u000E' && LA12_0<='\\u001F')||LA12_0=='!'||(LA12_0>='#' && LA12_0<='&')||(LA12_0>='(' && LA12_0<=',')||LA12_0==':'||(LA12_0>='<' && LA12_0<='>')||LA12_0=='@'||LA12_0=='\\\\'||LA12_0=='`'||LA12_0=='|'||(LA12_0>='~' && LA12_0<='\\uFFFF')) ) {s = 29;}", "old_methods": [], "patch": "@@ -12,23 +12,31 @@\n \n @SuppressWarnings(\"all\")\n public class InternalStateSpecificationLexer extends Lexer {\n+ public static final int T__68=68;\n public static final int RULE_ID=4;\n+ public static final int T__66=66;\n+ public static final int T__67=67;\n public static final int T__29=29;\n+ public static final int T__64=64;\n public static final int T__28=28;\n+ public static final int T__65=65;\n public static final int T__27=27;\n+ public static final int T__62=62;\n public static final int T__26=26;\n+ public static final int T__63=63;\n public static final int T__25=25;\n public static final int T__24=24;\n public static final int T__23=23;\n public static final int T__22=22;\n- public static final int T__21=21;\n public static final int RULE_ANY_OTHER=10;\n+ public static final int T__21=21;\n public static final int T__20=20;\n- public static final int T__60=60;\n+ public static final int T__61=61;\n public static final int EOF=-1;\n+ public static final int T__60=60;\n public static final int T__55=55;\n- public static final int T__19=19;\n public static final int T__56=56;\n+ public static final int T__19=19;\n public static final int T__57=57;\n public static final int T__58=58;\n public static final int T__51=51;\n@@ -751,10 +759,10 @@ public final void mT__43() throws RecognitionException {\n try {\n int _type = T__43;\n int _channel = DEFAULT_TOKEN_CHANNEL;\n- // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:43:7: ( 'range' )\n- // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:43:9: 'range'\n+ // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:43:7: ( '...' )\n+ // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:43:9: '...'\n {\n- match(\"range\"); \n+ match(\"...\"); \n \n \n }\n@@ -772,10 +780,10 @@ public final void mT__44() throws RecognitionException {\n try {\n int _type = T__44;\n int _channel = DEFAULT_TOKEN_CHANNEL;\n- // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:44:7: ( '...' )\n- // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:44:9: '...'\n+ // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:44:7: ( 'type' )\n+ // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:44:9: 'type'\n {\n- match(\"...\"); \n+ match(\"type\"); \n \n \n }\n@@ -793,10 +801,10 @@ public final void mT__45() throws RecognitionException {\n try {\n int _type = T__45;\n int _channel = DEFAULT_TOKEN_CHANNEL;\n- // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:45:7: ( 'type' )\n- // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:45:9: 'type'\n+ // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:45:7: ( 'range' )\n+ // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:45:9: 'range'\n {\n- match(\"type\"); \n+ match(\"range\"); \n \n \n }\n@@ -814,10 +822,10 @@ public final void mT__46() throws RecognitionException {\n try {\n int _type = T__46;\n int _channel = DEFAULT_TOKEN_CHANNEL;\n- // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:46:7: ( 'values' )\n- // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:46:9: 'values'\n+ // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:46:7: ( 'value-list' )\n+ // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:46:9: 'value-list'\n {\n- match(\"values\"); \n+ match(\"value-list\"); \n \n \n }\n@@ -1124,15 +1132,183 @@ public final void mT__60() throws RecognitionException {\n }\n // $ANTLR end \"T__60\"\n \n+ // $ANTLR start \"T__61\"\n+ public final void mT__61() throws RecognitionException {\n+ try {\n+ int _type = T__61;\n+ int _channel = DEFAULT_TOKEN_CHANNEL;\n+ // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:61:7: ( 'value-exception' )\n+ // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:61:9: 'value-exception'\n+ {\n+ match(\"value-exception\"); \n+\n+\n+ }\n+\n+ state.type = _type;\n+ state.channel = _channel;\n+ }\n+ finally {\n+ }\n+ }\n+ // $ANTLR end \"T__61\"\n+\n+ // $ANTLR start \"T__62\"\n+ public final void mT__62() throws RecognitionException {\n+ try {\n+ int _type = T__62;\n+ int _channel = DEFAULT_TOKEN_CHANNEL;\n+ // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:62:7: ( 'granularity' )\n+ // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:62:9: 'granularity'\n+ {\n+ match(\"granularity\"); \n+\n+\n+ }\n+\n+ state.type = _type;\n+ state.channel = _channel;\n+ }\n+ finally {\n+ }\n+ }\n+ // $ANTLR end \"T__62\"\n+\n+ // $ANTLR start \"T__63\"\n+ public final void mT__63() throws RecognitionException {\n+ try {\n+ int _type = T__63;\n+ int _channel = DEFAULT_TOKEN_CHANNEL;\n+ // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:63:7: ( 'arrival-rate-avg' )\n+ // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:63:9: 'arrival-rate-avg'\n+ {\n+ match(\"arrival-rate-avg\"); \n+\n+\n+ }\n+\n+ state.type = _type;\n+ state.channel = _channel;\n+ }\n+ finally {\n+ }\n+ }\n+ // $ANTLR end \"T__63\"\n+\n+ // $ANTLR start \"T__64\"\n+ public final void mT__64() throws RecognitionException {\n+ try {\n+ int _type = T__64;\n+ int _channel = DEFAULT_TOKEN_CHANNEL;\n+ // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:64:7: ( 'arrival-rate-minimum' )\n+ // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:64:9: 'arrival-rate-minimum'\n+ {\n+ match(\"arrival-rate-minimum\"); \n+\n+\n+ }\n+\n+ state.type = _type;\n+ state.channel = _channel;\n+ }\n+ finally {\n+ }\n+ }\n+ // $ANTLR end \"T__64\"\n+\n+ // $ANTLR start \"T__65\"\n+ public final void mT__65() throws RecognitionException {\n+ try {\n+ int _type = T__65;\n+ int _channel = DEFAULT_TOKEN_CHANNEL;\n+ // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:65:7: ( 'arrival-rate-maximum' )\n+ // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:65:9: 'arrival-rate-maximum'\n+ {\n+ match(\"arrival-rate-maximum\"); \n+\n+\n+ }\n+\n+ state.type = _type;\n+ state.channel = _channel;\n+ }\n+ finally {\n+ }\n+ }\n+ // $ANTLR end \"T__65\"\n+\n+ // $ANTLR start \"T__66\"\n+ public final void mT__66() throws RecognitionException {\n+ try {\n+ int _type = T__66;\n+ int _channel = DEFAULT_TOKEN_CHANNEL;\n+ // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:66:7: ( 'obsolescence' )\n+ // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:66:9: 'obsolescence'\n+ {\n+ match(\"obsolescence\"); \n+\n+\n+ }\n+\n+ state.type = _type;\n+ state.channel = _channel;\n+ }\n+ finally {\n+ }\n+ }\n+ // $ANTLR end \"T__66\"\n+\n+ // $ANTLR start \"T__67\"\n+ public final void mT__67() throws RecognitionException {\n+ try {\n+ int _type = T__67;\n+ int _channel = DEFAULT_TOKEN_CHANNEL;\n+ // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:67:7: ( 'appears-in' )\n+ // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:67:9: 'appears-in'\n+ {\n+ match(\"appears-in\"); \n+\n+\n+ }\n+\n+ state.type = _type;\n+ state.channel = _channel;\n+ }\n+ finally {\n+ }\n+ }\n+ // $ANTLR end \"T__67\"\n+\n+ // $ANTLR start \"T__68\"\n+ public final void mT__68() throws RecognitionException {\n+ try {\n+ int _type = T__68;\n+ int _channel = DEFAULT_TOKEN_CHANNEL;\n+ // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:68:7: ( 'description' )\n+ // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:68:9: 'description'\n+ {\n+ match(\"description\"); \n+\n+\n+ }\n+\n+ state.type = _type;\n+ state.channel = _channel;\n+ }\n+ finally {\n+ }\n+ }\n+ // $ANTLR end \"T__68\"\n+\n // $ANTLR start \"RULE_ID\"\n public final void mRULE_ID() throws RecognitionException {\n try {\n int _type = RULE_ID;\n int _channel = DEFAULT_TOKEN_CHANNEL;\n- // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2252:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )\n- // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2252:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*\n+ // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2404:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )\n+ // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2404:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*\n {\n- // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2252:11: ( '^' )?\n+ // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2404:11: ( '^' )?\n int alt1=2;\n int LA1_0 = input.LA(1);\n \n@@ -1141,7 +1317,7 @@ public final void mRULE_ID() throws RecognitionException {\n }\n switch (alt1) {\n case 1 :\n- // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2252:11: '^'\n+ // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2404:11: '^'\n {\n match('^'); \n \n@@ -1159,7 +1335,7 @@ public final void mRULE_ID() throws RecognitionException {\n recover(mse);\n throw mse;}\n \n- // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2252:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*\n+ // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2404:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*\n loop2:\n do {\n int alt2=2;\n@@ -1208,10 +1384,10 @@ public final void mRULE_INT() throws RecognitionException {\n try {\n int _type = RULE_INT;\n int _channel = DEFAULT_TOKEN_CHANNEL;\n- // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2254:10: ( ( '0' .. '9' )+ )\n- // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2254:12: ( '0' .. '9' )+\n+ // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2406:10: ( ( '0' .. '9' )+ )\n+ // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2406:12: ( '0' .. '9' )+\n {\n- // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2254:12: ( '0' .. '9' )+\n+ // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2406:12: ( '0' .. '9' )+\n int cnt3=0;\n loop3:\n do {\n@@ -1225,7 +1401,7 @@ public final void mRULE_INT() throws RecognitionException {\n \n switch (alt3) {\n \tcase 1 :\n- \t // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2254:13: '0' .. '9'\n+ \t // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2406:13: '0' .. '9'\n \t {\n \t matchRange('0','9'); \n \n@@ -1257,10 +1433,10 @@ public final void mRULE_STRING() throws RecognitionException {\n try {\n int _type = RULE_STRING;\n int _channel = DEFAULT_TOKEN_CHANNEL;\n- // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2256:13: ( ( '\\\"' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\"' ) ) )* '\\\"' | '\\\\'' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\\'' ) ) )* '\\\\'' ) )\n- // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2256:15: ( '\\\"' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\"' ) ) )* '\\\"' | '\\\\'' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\\'' ) ) )* '\\\\'' )\n+ // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2408:13: ( ( '\\\"' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\"' ) ) )* '\\\"' | '\\\\'' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\\'' ) ) )* '\\\\'' ) )\n+ // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2408:15: ( '\\\"' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\"' ) ) )* '\\\"' | '\\\\'' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\\'' ) ) )* '\\\\'' )\n {\n- // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2256:15: ( '\\\"' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\"' ) ) )* '\\\"' | '\\\\'' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\\'' ) ) )* '\\\\'' )\n+ // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2408:15: ( '\\\"' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\"' ) ) )* '\\\"' | '\\\\'' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\\'' ) ) )* '\\\\'' )\n int alt6=2;\n int LA6_0 = input.LA(1);\n \n@@ -1278,10 +1454,10 @@ else if ( (LA6_0=='\\'') ) {\n }\n switch (alt6) {\n case 1 :\n- // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2256:16: '\\\"' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\"' ) ) )* '\\\"'\n+ // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2408:16: '\\\"' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\"' ) ) )* '\\\"'\n {\n match('\\\"'); \n- // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2256:20: ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\"' ) ) )*\n+ // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2408:20: ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\"' ) ) )*\n loop4:\n do {\n int alt4=3;\n@@ -1297,7 +1473,7 @@ else if ( ((LA4_0>='\\u0000' && LA4_0<='!')||(LA4_0>='#' && LA4_0<='[')||(LA4_0>=\n \n switch (alt4) {\n \tcase 1 :\n- \t // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2256:21: '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' )\n+ \t // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2408:21: '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' )\n \t {\n \t match('\\\\'); \n \t if ( input.LA(1)=='\\\"'||input.LA(1)=='\\''||input.LA(1)=='\\\\'||input.LA(1)=='b'||input.LA(1)=='f'||input.LA(1)=='n'||input.LA(1)=='r'||(input.LA(1)>='t' && input.LA(1)<='u') ) {\n@@ -1313,7 +1489,7 @@ else if ( ((LA4_0>='\\u0000' && LA4_0<='!')||(LA4_0>='#' && LA4_0<='[')||(LA4_0>=\n \t }\n \t break;\n \tcase 2 :\n- \t // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2256:66: ~ ( ( '\\\\\\\\' | '\\\"' ) )\n+ \t // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2408:66: ~ ( ( '\\\\\\\\' | '\\\"' ) )\n \t {\n \t if ( (input.LA(1)>='\\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\\uFFFF') ) {\n \t input.consume();\n@@ -1338,10 +1514,10 @@ else if ( ((LA4_0>='\\u0000' && LA4_0<='!')||(LA4_0>='#' && LA4_0<='[')||(LA4_0>=\n }\n break;\n case 2 :\n- // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2256:86: '\\\\'' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\\'' ) ) )* '\\\\''\n+ // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2408:86: '\\\\'' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\\'' ) ) )* '\\\\''\n {\n match('\\''); \n- // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2256:91: ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\\'' ) ) )*\n+ // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2408:91: ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\\'' ) ) )*\n loop5:\n do {\n int alt5=3;\n@@ -1357,7 +1533,7 @@ else if ( ((LA5_0>='\\u0000' && LA5_0<='&')||(LA5_0>='(' && LA5_0<='[')||(LA5_0>=\n \n switch (alt5) {\n \tcase 1 :\n- \t // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2256:92: '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' )\n+ \t // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2408:92: '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' )\n \t {\n \t match('\\\\'); \n \t if ( input.LA(1)=='\\\"'||input.LA(1)=='\\''||input.LA(1)=='\\\\'||input.LA(1)=='b'||input.LA(1)=='f'||input.LA(1)=='n'||input.LA(1)=='r'||(input.LA(1)>='t' && input.LA(1)<='u') ) {\n@@ -1373,7 +1549,7 @@ else if ( ((LA5_0>='\\u0000' && LA5_0<='&')||(LA5_0>='(' && LA5_0<='[')||(LA5_0>=\n \t }\n \t break;\n \tcase 2 :\n- \t // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2256:137: ~ ( ( '\\\\\\\\' | '\\\\'' ) )\n+ \t // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2408:137: ~ ( ( '\\\\\\\\' | '\\\\'' ) )\n \t {\n \t if ( (input.LA(1)>='\\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\\uFFFF') ) {\n \t input.consume();\n@@ -1416,12 +1592,12 @@ public final void mRULE_ML_COMMENT() throws RecognitionException {\n try {\n int _type = RULE_ML_COMMENT;\n int _channel = DEFAULT_TOKEN_CHANNEL;\n- // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2258:17: ( '/*' ( options {greedy=false; } : . )* '*/' )\n- // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2258:19: '/*' ( options {greedy=false; } : . )* '*/'\n+ // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2410:17: ( '/*' ( options {greedy=false; } : . )* '*/' )\n+ // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2410:19: '/*' ( options {greedy=false; } : . )* '*/'\n {\n match(\"/*\"); \n \n- // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2258:24: ( options {greedy=false; } : . )*\n+ // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2410:24: ( options {greedy=false; } : . )*\n loop7:\n do {\n int alt7=2;\n@@ -1446,7 +1622,7 @@ else if ( ((LA7_0>='\\u0000' && LA7_0<=')')||(LA7_0>='+' && LA7_0<='\\uFFFF')) ) {\n \n switch (alt7) {\n \tcase 1 :\n- \t // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2258:52: .\n+ \t // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2410:52: .\n \t {\n \t matchAny(); \n \n@@ -1476,12 +1652,12 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {\n try {\n int _type = RULE_SL_COMMENT;\n int _channel = DEFAULT_TOKEN_CHANNEL;\n- // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2260:17: ( '//' (~ ( ( '\\\\n' | '\\\\r' ) ) )* ( ( '\\\\r' )? '\\\\n' )? )\n- // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2260:19: '//' (~ ( ( '\\\\n' | '\\\\r' ) ) )* ( ( '\\\\r' )? '\\\\n' )?\n+ // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2412:17: ( '//' (~ ( ( '\\\\n' | '\\\\r' ) ) )* ( ( '\\\\r' )? '\\\\n' )? )\n+ // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2412:19: '//' (~ ( ( '\\\\n' | '\\\\r' ) ) )* ( ( '\\\\r' )? '\\\\n' )?\n {\n match(\"//\"); \n \n- // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2260:24: (~ ( ( '\\\\n' | '\\\\r' ) ) )*\n+ // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2412:24: (~ ( ( '\\\\n' | '\\\\r' ) ) )*\n loop8:\n do {\n int alt8=2;\n@@ -1494,7 +1670,7 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {\n \n switch (alt8) {\n \tcase 1 :\n- \t // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2260:24: ~ ( ( '\\\\n' | '\\\\r' ) )\n+ \t // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2412:24: ~ ( ( '\\\\n' | '\\\\r' ) )\n \t {\n \t if ( (input.LA(1)>='\\u0000' && input.LA(1)<='\\t')||(input.LA(1)>='\\u000B' && input.LA(1)<='\\f')||(input.LA(1)>='\\u000E' && input.LA(1)<='\\uFFFF') ) {\n \t input.consume();\n@@ -1514,7 +1690,7 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {\n }\n } while (true);\n \n- // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2260:40: ( ( '\\\\r' )? '\\\\n' )?\n+ // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2412:40: ( ( '\\\\r' )? '\\\\n' )?\n int alt10=2;\n int LA10_0 = input.LA(1);\n \n@@ -1523,9 +1699,9 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {\n }\n switch (alt10) {\n case 1 :\n- // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2260:41: ( '\\\\r' )? '\\\\n'\n+ // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2412:41: ( '\\\\r' )? '\\\\n'\n {\n- // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2260:41: ( '\\\\r' )?\n+ // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2412:41: ( '\\\\r' )?\n int alt9=2;\n int LA9_0 = input.LA(1);\n \n@@ -1534,7 +1710,7 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {\n }\n switch (alt9) {\n case 1 :\n- // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2260:41: '\\\\r'\n+ // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2412:41: '\\\\r'\n {\n match('\\r'); \n \n@@ -1566,10 +1742,10 @@ public final void mRULE_WS() throws RecognitionException {\n try {\n int _type = RULE_WS;\n int _channel = DEFAULT_TOKEN_CHANNEL;\n- // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2262:9: ( ( ' ' | '\\\\t' | '\\\\r' | '\\\\n' )+ )\n- // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2262:11: ( ' ' | '\\\\t' | '\\\\r' | '\\\\n' )+\n+ // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2414:9: ( ( ' ' | '\\\\t' | '\\\\r' | '\\\\n' )+ )\n+ // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2414:11: ( ' ' | '\\\\t' | '\\\\r' | '\\\\n' )+\n {\n- // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2262:11: ( ' ' | '\\\\t' | '\\\\r' | '\\\\n' )+\n+ // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2414:11: ( ' ' | '\\\\t' | '\\\\r' | '\\\\n' )+\n int cnt11=0;\n loop11:\n do {\n@@ -1623,8 +1799,8 @@ public final void mRULE_ANY_OTHER() throws RecognitionException {\n try {\n int _type = RULE_ANY_OTHER;\n int _channel = DEFAULT_TOKEN_CHANNEL;\n- // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2264:16: ( . )\n- // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2264:18: .\n+ // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2416:16: ( . )\n+ // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:2416:18: .\n {\n matchAny(); \n \n@@ -1639,8 +1815,8 @@ public final void mRULE_ANY_OTHER() throws RecognitionException {\n // $ANTLR end \"RULE_ANY_OTHER\"\n \n public void mTokens() throws RecognitionException {\n- // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:1:8: ( T__11 | T__12 | T__13 | T__14 | T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | T__38 | T__39 | T__40 | T__41 | T__42 | T__43 | T__44 | T__45 | T__46 | T__47 | T__48 | T__49 | T__50 | T__51 | T__52 | T__53 | T__54 | T__55 | T__56 | T__57 | T__58 | T__59 | T__60 | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )\n- int alt12=57;\n+ // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:1:8: ( T__11 | T__12 | T__13 | T__14 | T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | T__38 | T__39 | T__40 | T__41 | T__42 | T__43 | T__44 | T__45 | T__46 | T__47 | T__48 | T__49 | T__50 | T__51 | T__52 | T__53 | T__54 | T__55 | T__56 | T__57 | T__58 | T__59 | T__60 | T__61 | T__62 | T__63 | T__64 | T__65 | T__66 | T__67 | T__68 | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )\n+ int alt12=65;\n alt12 = dfa12.predict(input);\n switch (alt12) {\n case 1 :\n@@ -1994,49 +2170,105 @@ public void mTokens() throws RecognitionException {\n }\n break;\n case 51 :\n- // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:1:310: RULE_ID\n+ // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:1:310: T__61\n {\n- mRULE_ID(); \n+ mT__61(); \n \n }\n break;\n case 52 :\n- // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:1:318: RULE_INT\n+ // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:1:316: T__62\n {\n- mRULE_INT(); \n+ mT__62(); \n \n }\n break;\n case 53 :\n- // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:1:327: RULE_STRING\n+ // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:1:322: T__63\n {\n- mRULE_STRING(); \n+ mT__63(); \n \n }\n break;\n case 54 :\n- // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:1:339: RULE_ML_COMMENT\n+ // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:1:328: T__64\n {\n- mRULE_ML_COMMENT(); \n+ mT__64(); \n \n }\n break;\n case 55 :\n- // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:1:355: RULE_SL_COMMENT\n+ // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:1:334: T__65\n {\n- mRULE_SL_COMMENT(); \n+ mT__65(); \n \n }\n break;\n case 56 :\n- // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:1:371: RULE_WS\n+ // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:1:340: T__66\n {\n- mRULE_WS(); \n+ mT__66(); \n \n }\n break;\n case 57 :\n- // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:1:379: RULE_ANY_OTHER\n+ // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:1:346: T__67\n+ {\n+ mT__67(); \n+\n+ }\n+ break;\n+ case 58 :\n+ // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:1:352: T__68\n+ {\n+ mT__68(); \n+\n+ }\n+ break;\n+ case 59 :\n+ // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:1:358: RULE_ID\n+ {\n+ mRULE_ID(); \n+\n+ }\n+ break;\n+ case 60 :\n+ // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:1:366: RULE_INT\n+ {\n+ mRULE_INT(); \n+\n+ }\n+ break;\n+ case 61 :\n+ // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:1:375: RULE_STRING\n+ {\n+ mRULE_STRING(); \n+\n+ }\n+ break;\n+ case 62 :\n+ // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:1:387: RULE_ML_COMMENT\n+ {\n+ mRULE_ML_COMMENT(); \n+\n+ }\n+ break;\n+ case 63 :\n+ // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:1:403: RULE_SL_COMMENT\n+ {\n+ mRULE_SL_COMMENT(); \n+\n+ }\n+ break;\n+ case 64 :\n+ // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:1:419: RULE_WS\n+ {\n+ mRULE_WS(); \n+\n+ }\n+ break;\n+ case 65 :\n+ // ../net.certware.intent.state/src-gen/net/certware/intent/state/parser/antlr/internal/InternalStateSpecification.g:1:427: RULE_ANY_OTHER\n {\n mRULE_ANY_OTHER(); \n \n@@ -2050,164 +2282,173 @@ public void mTokens() throws RecognitionException {\n \n protected DFA12 dfa12 = new DFA12(this);\n static final String DFA12_eotS =\n- \"\\1\\uffff\\1\\42\\1\\uffff\\1\\42\\2\\uffff\\1\\50\\4\\42\\3\\uffff\\3\\42\\1\\71\\1\"+\n- \"\\72\\1\\uffff\\2\\42\\1\\35\\2\\uffff\\3\\35\\2\\uffff\\4\\42\\2\\uffff\\1\\42\\4\\uffff\"+\n- \"\\10\\42\\3\\uffff\\5\\42\\3\\uffff\\3\\42\\5\\uffff\\50\\42\\1\\u008c\\2\\uffff\\7\"+\n- \"\\42\\1\\u0094\\3\\42\\1\\u0098\\6\\42\\1\\u00a0\\3\\42\\1\\u00a4\\5\\42\\1\\u00aa\"+\n- \"\\1\\uffff\\1\\u00ac\\2\\42\\1\\u00b0\\2\\42\\1\\u00b3\\1\\uffff\\1\\42\\1\\u00b5\"+\n- \"\\1\\u00b6\\1\\uffff\\6\\42\\1\\u00bd\\1\\uffff\\1\\u00be\\1\\u00c0\\1\\42\\1\\uffff\"+\n- \"\\1\\u00c3\\4\\42\\1\\uffff\\1\\u00c8\\1\\uffff\\2\\42\\1\\u00cc\\1\\uffff\\1\\42\"+\n- \"\\1\\u00ce\\1\\uffff\\1\\42\\2\\uffff\\6\\42\\2\\uffff\\1\\u00d6\\1\\uffff\\1\\42\"+\n- \"\\1\\u00d8\\1\\uffff\\4\\42\\1\\uffff\\1\\42\\1\\u00de\\1\\42\\1\\uffff\\1\\42\\1\\uffff\"+\n- \"\\7\\42\\1\\uffff\\1\\42\\1\\uffff\\2\\42\\1\\u00eb\\1\\u00ec\\1\\u00ed\\1\\uffff\"+\n- \"\\11\\42\\1\\u00f7\\1\\u00f8\\1\\42\\3\\uffff\\1\\42\\1\\u00fb\\2\\42\\1\\uffff\\1\"+\n- \"\\42\\1\\uffff\\2\\42\\2\\uffff\\2\\42\\1\\uffff\\1\\u0103\\1\\42\\1\\u0105\\1\\42\"+\n- \"\\1\\u0107\\3\\uffff\\1\\42\\1\\uffff\\1\\42\\3\\uffff\\1\\u010c\\1\\u010d\\2\\uffff\";\n+ \"\\1\\uffff\\1\\44\\1\\uffff\\1\\44\\2\\uffff\\1\\52\\4\\44\\3\\uffff\\3\\44\\1\\74\\1\"+\n+ \"\\75\\1\\uffff\\4\\44\\1\\37\\2\\uffff\\3\\37\\2\\uffff\\4\\44\\2\\uffff\\1\\44\\4\\uffff\"+\n+ \"\\11\\44\\3\\uffff\\5\\44\\3\\uffff\\6\\44\\5\\uffff\\57\\44\\1\\u009e\\2\\uffff\\7\"+\n+ \"\\44\\1\\u00a6\\3\\44\\1\\u00aa\\11\\44\\1\\u00b5\\4\\44\\1\\u00ba\\6\\44\\1\\u00c1\"+\n+ \"\\1\\uffff\\1\\u00c3\\2\\44\\1\\u00c7\\2\\44\\1\\u00ca\\1\\uffff\\1\\44\\1\\u00cc\"+\n+ \"\\1\\u00cd\\1\\uffff\\11\\44\\1\\u00d7\\1\\uffff\\1\\u00d8\\1\\u00da\\2\\44\\1\\uffff\"+\n+ \"\\1\\u00de\\5\\44\\1\\uffff\\1\\u00e4\\1\\uffff\\2\\44\\2\\uffff\\1\\44\\1\\u00eb\"+\n+ \"\\1\\uffff\\1\\44\\2\\uffff\\11\\44\\2\\uffff\\1\\u00f6\\1\\uffff\\2\\44\\1\\u00f9\"+\n+ \"\\1\\uffff\\5\\44\\1\\uffff\\1\\44\\1\\u0100\\1\\44\\2\\uffff\\1\\44\\1\\uffff\\12\"+\n+ \"\\44\\1\\uffff\\2\\44\\1\\uffff\\3\\44\\1\\u0112\\1\\u0113\\1\\u0114\\1\\uffff\\10\"+\n+ \"\\44\\2\\uffff\\3\\44\\1\\u0121\\1\\44\\1\\u0123\\1\\44\\3\\uffff\\1\\44\\1\\u0126\"+\n+ \"\\2\\44\\1\\uffff\\1\\44\\1\\uffff\\1\\44\\1\\uffff\\3\\44\\1\\uffff\\1\\44\\1\\uffff\"+\n+ \"\\2\\44\\1\\uffff\\1\\u0132\\1\\44\\1\\u0134\\1\\44\\1\\uffff\\1\\44\\1\\u0138\\1\\u0139\"+\n+ \"\\1\\44\\3\\uffff\\1\\44\\1\\uffff\\1\\u013e\\1\\uffff\\1\\44\\2\\uffff\\1\\u0141\"+\n+ \"\\2\\uffff\\1\\u0142\\2\\uffff\\1\\u0144\\10\\uffff\";\n static final String DFA12_eofS =\n- \"\\u010e\\uffff\";\n+ \"\\u0149\\uffff\";\n static final String DFA12_minS =\n- \"\\1\\0\\1\\157\\1\\uffff\\1\\145\\2\\uffff\\1\\56\\1\\160\\1\\157\\1\\141\\1\\156\\3\"+\n- \"\\uffff\\2\\141\\1\\156\\2\\60\\1\\uffff\\1\\141\\1\\145\\1\\101\\2\\uffff\\2\\0\\1\"+\n- \"\\52\\2\\uffff\\1\\145\\1\\160\\1\\141\\1\\165\\2\\uffff\\1\\166\\4\\uffff\\1\\145\"+\n- \"\\1\\150\\1\\164\\1\\155\\1\\144\\1\\156\\1\\170\\1\\146\\3\\uffff\\1\\154\\1\\142\\1\"+\n- \"\\160\\2\\151\\3\\uffff\\1\\156\\1\\146\\1\\145\\5\\uffff\\1\\143\\1\\145\\1\\164\\1\"+\n- \"\\162\\1\\151\\1\\162\\1\\145\\1\\160\\1\\155\\1\\164\\1\\145\\2\\55\\1\\165\\1\\145\"+\n- \"\\1\\164\\1\\165\\1\\151\\1\\147\\1\\154\\1\\145\\1\\147\\1\\164\\1\\147\\1\\145\\1\\141\"+\n- \"\\2\\145\\1\\144\\1\\151\\1\\162\\1\\145\\2\\143\\1\\141\\1\\162\\1\\165\\1\\154\\2\\145\"+\n+ \"\\1\\0\\1\\157\\1\\uffff\\1\\145\\2\\uffff\\1\\56\\1\\142\\1\\157\\1\\141\\1\\156\\3\"+\n+ \"\\uffff\\2\\141\\1\\156\\2\\60\\1\\uffff\\1\\141\\1\\145\\1\\162\\1\\160\\1\\101\\2\"+\n+ \"\\uffff\\2\\0\\1\\52\\2\\uffff\\1\\145\\1\\160\\1\\141\\1\\165\\2\\uffff\\1\\163\\4\"+\n+ \"\\uffff\\1\\145\\1\\150\\1\\164\\1\\163\\1\\155\\1\\144\\1\\156\\1\\170\\1\\146\\3\\uffff\"+\n+ \"\\1\\154\\1\\142\\1\\160\\2\\151\\3\\uffff\\1\\156\\1\\146\\1\\145\\1\\141\\1\\162\\1\"+\n+ \"\\160\\5\\uffff\\1\\143\\1\\145\\1\\164\\1\\162\\1\\151\\1\\143\\1\\162\\1\\145\\1\\160\"+\n+ \"\\1\\157\\1\\155\\1\\164\\1\\145\\2\\55\\1\\165\\1\\145\\1\\164\\1\\165\\1\\151\\1\\147\"+\n+ \"\\1\\154\\1\\145\\1\\147\\1\\164\\1\\147\\1\\145\\1\\141\\2\\145\\1\\144\\1\\156\\1\\151\"+\n+ \"\\1\\145\\1\\151\\1\\162\\1\\145\\2\\143\\1\\162\\1\\141\\1\\162\\1\\165\\2\\154\\2\\145\"+\n \"\\1\\60\\2\\uffff\\1\\164\\1\\162\\1\\151\\1\\145\\1\\141\\2\\145\\1\\60\\1\\147\\1\\163\"+\n- \"\\1\\145\\1\\60\\1\\164\\2\\162\\1\\142\\1\\146\\1\\166\\1\\60\\2\\145\\1\\164\\1\\60\"+\n- \"\\1\\164\\1\\156\\1\\145\\2\\156\\1\\60\\1\\uffff\\1\\60\\1\\162\\1\\141\\1\\60\\1\\142\"+\n- \"\\1\\164\\1\\60\\1\\uffff\\1\\145\\2\\60\\1\\uffff\\1\\151\\1\\163\\1\\145\\1\\141\\2\"+\n- \"\\151\\1\\60\\1\\uffff\\2\\60\\1\\151\\1\\uffff\\1\\60\\1\\145\\3\\164\\1\\uffff\\1\"+\n- \"\\60\\1\\uffff\\1\\145\\1\\154\\1\\60\\1\\uffff\\1\\154\\1\\60\\1\\uffff\\1\\162\\2\"+\n- \"\\uffff\\1\\157\\1\\145\\1\\156\\2\\143\\1\\163\\2\\uffff\\1\\60\\1\\uffff\\1\\156\"+\n- \"\\1\\60\\1\\uffff\\1\\156\\1\\151\\2\\163\\1\\uffff\\1\\144\\1\\60\\1\\151\\1\\uffff\"+\n- \"\\1\\145\\1\\uffff\\1\\151\\1\\156\\1\\144\\1\\143\\1\\153\\1\\141\\1\\157\\1\\uffff\"+\n- \"\\1\\147\\1\\uffff\\1\\164\\1\\157\\3\\60\\1\\uffff\\1\\157\\1\\163\\1\\156\\1\\163\"+\n- \"\\1\\55\\1\\145\\1\\55\\1\\164\\1\\162\\2\\60\\1\\156\\3\\uffff\\1\\156\\1\\60\\1\\147\"+\n- \"\\1\\150\\1\\uffff\\1\\163\\1\\uffff\\1\\151\\1\\171\\2\\uffff\\2\\55\\1\\uffff\\1\"+\n- \"\\60\\1\\151\\1\\60\\1\\157\\1\\60\\1\\144\\2\\uffff\\1\\160\\1\\uffff\\1\\156\\3\\uffff\"+\n- \"\\2\\60\\2\\uffff\";\n+ \"\\1\\145\\1\\60\\1\\164\\2\\162\\1\\142\\1\\165\\1\\166\\1\\141\\1\\146\\1\\166\\1\\60\"+\n+ \"\\2\\145\\1\\151\\1\\164\\1\\60\\1\\164\\1\\145\\1\\156\\1\\145\\2\\156\\1\\60\\1\\uffff\"+\n+ \"\\1\\60\\1\\162\\1\\141\\1\\55\\1\\142\\1\\164\\1\\60\\1\\uffff\\1\\145\\2\\60\\1\\uffff\"+\n+ \"\\1\\151\\1\\163\\1\\145\\1\\141\\1\\154\\1\\141\\1\\162\\2\\151\\1\\60\\1\\uffff\\2\"+\n+ \"\\60\\1\\160\\1\\151\\1\\uffff\\1\\60\\1\\163\\1\\145\\3\\164\\1\\uffff\\1\\60\\1\\uffff\"+\n+ \"\\1\\145\\1\\154\\1\\145\\1\\uffff\\1\\154\\1\\60\\1\\uffff\\1\\162\\2\\uffff\\1\\157\"+\n+ \"\\1\\145\\1\\156\\1\\143\\1\\141\\1\\154\\1\\163\\1\\143\\1\\163\\2\\uffff\\1\\60\\1\"+\n+ \"\\uffff\\1\\164\\1\\156\\1\\60\\1\\uffff\\1\\143\\1\\156\\1\\151\\2\\163\\1\\uffff\"+\n+ \"\\1\\144\\1\\60\\1\\151\\2\\uffff\\1\\145\\1\\uffff\\1\\151\\1\\156\\1\\144\\1\\143\"+\n+ \"\\1\\153\\1\\162\\2\\55\\1\\141\\1\\157\\1\\uffff\\1\\151\\1\\147\\1\\uffff\\1\\145\"+\n+ \"\\1\\164\\1\\157\\3\\60\\1\\uffff\\1\\157\\1\\163\\1\\156\\1\\163\\1\\55\\1\\145\\1\\55\"+\n+ \"\\1\\151\\1\\162\\1\\uffff\\1\\164\\1\\162\\1\\157\\1\\60\\1\\156\\1\\60\\1\\156\\3\\uffff\"+\n+ \"\\1\\156\\1\\60\\1\\147\\1\\150\\1\\uffff\\1\\163\\1\\uffff\\1\\164\\1\\141\\1\\151\"+\n+ \"\\1\\171\\1\\156\\1\\uffff\\1\\143\\1\\uffff\\2\\55\\1\\uffff\\1\\60\\1\\151\\1\\60\"+\n+ \"\\1\\171\\1\\164\\1\\157\\2\\60\\1\\145\\1\\144\\2\\uffff\\1\\160\\1\\uffff\\1\\60\\1\"+\n+ \"\\145\\1\\156\\2\\uffff\\1\\60\\2\\uffff\\1\\60\\1\\uffff\\1\\55\\1\\60\\2\\uffff\\1\"+\n+ \"\\141\\2\\uffff\\1\\141\\2\\uffff\";\n static final String DFA12_maxS =\n \"\\1\\uffff\\1\\165\\1\\uffff\\1\\145\\2\\uffff\\1\\56\\1\\165\\2\\157\\1\\156\\3\\uffff\"+\n- \"\\1\\141\\1\\171\\1\\156\\2\\172\\1\\uffff\\2\\145\\1\\172\\2\\uffff\\2\\uffff\\1\\57\"+\n- \"\\2\\uffff\\1\\145\\1\\160\\1\\141\\1\\165\\2\\uffff\\1\\166\\4\\uffff\\1\\145\\1\\150\"+\n- \"\\1\\164\\1\\156\\1\\144\\1\\156\\1\\170\\1\\160\\3\\uffff\\2\\162\\1\\160\\2\\151\\3\"+\n- \"\\uffff\\1\\164\\1\\166\\1\\145\\5\\uffff\\1\\143\\1\\145\\1\\164\\1\\162\\1\\151\\1\"+\n- \"\\162\\1\\145\\2\\160\\1\\164\\1\\145\\2\\55\\1\\165\\1\\145\\1\\164\\1\\165\\1\\151\"+\n- \"\\1\\147\\1\\154\\1\\145\\1\\147\\1\\164\\1\\147\\1\\145\\1\\141\\2\\145\\1\\144\\1\\151\"+\n- \"\\1\\162\\1\\145\\2\\143\\1\\141\\1\\162\\1\\165\\1\\157\\2\\145\\1\\172\\2\\uffff\\1\"+\n- \"\\164\\1\\162\\1\\151\\1\\145\\1\\141\\2\\145\\1\\172\\1\\147\\1\\163\\1\\145\\1\\172\"+\n- \"\\1\\164\\2\\162\\1\\142\\1\\146\\1\\166\\1\\172\\2\\145\\1\\164\\1\\172\\1\\164\\1\\156\"+\n- \"\\1\\145\\2\\156\\1\\172\\1\\uffff\\1\\172\\1\\162\\1\\141\\1\\172\\1\\142\\1\\164\\1\"+\n- \"\\172\\1\\uffff\\1\\145\\2\\172\\1\\uffff\\1\\151\\1\\163\\1\\145\\1\\141\\2\\151\\1\"+\n- \"\\172\\1\\uffff\\2\\172\\1\\151\\1\\uffff\\1\\172\\1\\145\\3\\164\\1\\uffff\\1\\172\"+\n- \"\\1\\uffff\\1\\145\\1\\164\\1\\172\\1\\uffff\\1\\154\\1\\172\\1\\uffff\\1\\162\\2\\uffff\"+\n- \"\\1\\157\\1\\145\\1\\156\\2\\143\\1\\163\\2\\uffff\\1\\172\\1\\uffff\\1\\156\\1\\172\"+\n- \"\\1\\uffff\\1\\156\\1\\151\\2\\163\\1\\uffff\\1\\144\\1\\172\\1\\151\\1\\uffff\\1\\145\"+\n- \"\\1\\uffff\\1\\151\\1\\156\\1\\144\\1\\143\\1\\153\\1\\141\\1\\157\\1\\uffff\\1\\147\"+\n- \"\\1\\uffff\\1\\164\\1\\157\\3\\172\\1\\uffff\\1\\157\\1\\163\\1\\156\\1\\163\\1\\55\"+\n- \"\\1\\145\\1\\55\\1\\164\\1\\162\\2\\172\\1\\156\\3\\uffff\\1\\156\\1\\172\\1\\147\\1\"+\n- \"\\150\\1\\uffff\\1\\163\\1\\uffff\\1\\151\\1\\171\\2\\uffff\\2\\55\\1\\uffff\\1\\172\"+\n- \"\\1\\151\\1\\172\\1\\157\\1\\172\\1\\145\\2\\uffff\\1\\160\\1\\uffff\\1\\156\\3\\uffff\"+\n- \"\\2\\172\\2\\uffff\";\n+ \"\\1\\141\\1\\171\\1\\156\\2\\172\\1\\uffff\\2\\145\\2\\162\\1\\172\\2\\uffff\\2\\uffff\"+\n+ \"\\1\\57\\2\\uffff\\1\\145\\1\\160\\1\\141\\1\\165\\2\\uffff\\1\\166\\4\\uffff\\1\\145\"+\n+ \"\\1\\150\\1\\164\\1\\163\\1\\156\\1\\144\\1\\156\\1\\170\\1\\160\\3\\uffff\\2\\162\\1\"+\n+ \"\\160\\2\\151\\3\\uffff\\1\\164\\1\\166\\1\\145\\1\\141\\1\\162\\1\\160\\5\\uffff\\1\"+\n+ \"\\143\\1\\145\\1\\164\\1\\162\\1\\151\\1\\143\\1\\162\\1\\145\\1\\160\\1\\157\\1\\160\"+\n+ \"\\1\\164\\1\\145\\2\\55\\1\\165\\1\\145\\1\\164\\1\\165\\1\\151\\1\\147\\1\\154\\1\\145\"+\n+ \"\\1\\147\\1\\164\\1\\147\\1\\145\\1\\141\\2\\145\\1\\144\\1\\156\\1\\151\\1\\145\\1\\151\"+\n+ \"\\1\\162\\1\\145\\2\\143\\1\\162\\1\\141\\1\\162\\1\\165\\1\\154\\1\\157\\2\\145\\1\\172\"+\n+ \"\\2\\uffff\\1\\164\\1\\162\\1\\151\\1\\145\\1\\141\\2\\145\\1\\172\\1\\147\\1\\163\\1\"+\n+ \"\\145\\1\\172\\1\\164\\2\\162\\1\\142\\1\\165\\1\\166\\1\\141\\1\\146\\1\\166\\1\\172\"+\n+ \"\\2\\145\\1\\151\\1\\164\\1\\172\\1\\164\\1\\145\\1\\156\\1\\145\\2\\156\\1\\172\\1\\uffff\"+\n+ \"\\1\\172\\1\\162\\1\\141\\1\\172\\1\\142\\1\\164\\1\\172\\1\\uffff\\1\\145\\2\\172\\1\"+\n+ \"\\uffff\\1\\151\\1\\163\\1\\145\\1\\141\\1\\154\\1\\141\\1\\162\\2\\151\\1\\172\\1\\uffff\"+\n+ \"\\2\\172\\1\\160\\1\\151\\1\\uffff\\1\\172\\1\\163\\1\\145\\3\\164\\1\\uffff\\1\\172\"+\n+ \"\\1\\uffff\\1\\145\\1\\164\\1\\154\\1\\uffff\\1\\154\\1\\172\\1\\uffff\\1\\162\\2\\uffff\"+\n+ \"\\1\\157\\1\\145\\1\\156\\1\\143\\1\\141\\1\\154\\1\\163\\1\\143\\1\\163\\2\\uffff\\1\"+\n+ \"\\172\\1\\uffff\\1\\164\\1\\156\\1\\172\\1\\uffff\\1\\143\\1\\156\\1\\151\\2\\163\\1\"+\n+ \"\\uffff\\1\\144\\1\\172\\1\\151\\2\\uffff\\1\\145\\1\\uffff\\1\\151\\1\\156\\1\\144\"+\n+ \"\\1\\143\\1\\153\\1\\162\\2\\55\\1\\141\\1\\157\\1\\uffff\\1\\151\\1\\147\\1\\uffff\"+\n+ \"\\1\\145\\1\\164\\1\\157\\3\\172\\1\\uffff\\1\\157\\1\\163\\1\\156\\1\\163\\1\\55\\1\"+\n+ \"\\145\\1\\55\\1\\151\\1\\162\\1\\uffff\\1\\164\\1\\162\\1\\157\\1\\172\\1\\156\\1\\172\"+\n+ \"\\1\\156\\3\\uffff\\1\\156\\1\\172\\1\\147\\1\\150\\1\\uffff\\1\\163\\1\\uffff\\1\\164\"+\n+ \"\\1\\141\\1\\151\\1\\171\\1\\156\\1\\uffff\\1\\143\\1\\uffff\\2\\55\\1\\uffff\\1\\172\"+\n+ \"\\1\\151\\1\\172\\1\\171\\1\\164\\1\\157\\2\\172\\2\\145\\2\\uffff\\1\\160\\1\\uffff\"+\n+ \"\\1\\172\\1\\145\\1\\156\\2\\uffff\\1\\172\\2\\uffff\\1\\172\\1\\uffff\\1\\55\\1\\172\"+\n+ \"\\2\\uffff\\1\\155\\2\\uffff\\1\\151\\2\\uffff\";\n static final String DFA12_acceptS =\n \"\\2\\uffff\\1\\2\\1\\uffff\\1\\4\\1\\5\\5\\uffff\\1\\20\\1\\22\\1\\23\\5\\uffff\\1\\37\"+\n- \"\\3\\uffff\\1\\63\\1\\64\\3\\uffff\\1\\70\\1\\71\\4\\uffff\\1\\63\\1\\2\\1\\uffff\\1\"+\n- \"\\4\\1\\5\\1\\42\\1\\6\\10\\uffff\\1\\20\\1\\22\\1\\23\\5\\uffff\\1\\35\\1\\36\\1\\37\\3\"+\n- \"\\uffff\\1\\64\\1\\65\\1\\66\\1\\67\\1\\70\\51\\uffff\\1\\53\\1\\54\\35\\uffff\\1\\25\"+\n- \"\\7\\uffff\\1\\43\\3\\uffff\\1\\45\\7\\uffff\\1\\21\\3\\uffff\\1\\11\\5\\uffff\\1\\13\"+\n- \"\\1\\uffff\\1\\27\\3\\uffff\\1\\30\\2\\uffff\\1\\40\\1\\uffff\\1\\34\\1\\41\\6\\uffff\"+\n- \"\\1\\14\\1\\31\\1\\uffff\\1\\26\\2\\uffff\\1\\32\\4\\uffff\\1\\15\\3\\uffff\\1\\44\\1\"+\n- \"\\uffff\\1\\33\\7\\uffff\\1\\3\\1\\uffff\\1\\16\\5\\uffff\\1\\24\\14\\uffff\\1\\60\"+\n- \"\\1\\61\\1\\17\\4\\uffff\\1\\56\\1\\uffff\\1\\55\\2\\uffff\\1\\10\\1\\12\\2\\uffff\\1\"+\n- \"\\51\\6\\uffff\\1\\46\\1\\62\\1\\uffff\\1\\57\\1\\uffff\\1\\7\\1\\47\\1\\50\\2\\uffff\"+\n- \"\\1\\52\\1\\1\";\n+ \"\\5\\uffff\\1\\73\\1\\74\\3\\uffff\\1\\100\\1\\101\\4\\uffff\\1\\73\\1\\2\\1\\uffff\"+\n+ \"\\1\\4\\1\\5\\1\\41\\1\\6\\11\\uffff\\1\\20\\1\\22\\1\\23\\5\\uffff\\1\\35\\1\\36\\1\\37\"+\n+ \"\\6\\uffff\\1\\74\\1\\75\\1\\76\\1\\77\\1\\100\\60\\uffff\\1\\53\\1\\54\\42\\uffff\\1\"+\n+ \"\\25\\7\\uffff\\1\\42\\3\\uffff\\1\\45\\12\\uffff\\1\\21\\4\\uffff\\1\\11\\6\\uffff\"+\n+ \"\\1\\13\\1\\uffff\\1\\27\\3\\uffff\\1\\30\\2\\uffff\\1\\40\\1\\uffff\\1\\34\\1\\43\\11\"+\n+ \"\\uffff\\1\\14\\1\\31\\1\\uffff\\1\\26\\3\\uffff\\1\\32\\5\\uffff\\1\\15\\3\\uffff\"+\n+ \"\\1\\44\\1\\63\\1\\uffff\\1\\33\\12\\uffff\\1\\3\\2\\uffff\\1\\16\\6\\uffff\\1\\24\\11\"+\n+ \"\\uffff\\1\\71\\7\\uffff\\1\\60\\1\\61\\1\\17\\4\\uffff\\1\\56\\1\\uffff\\1\\55\\5\\uffff\"+\n+ \"\\1\\10\\1\\uffff\\1\\12\\2\\uffff\\1\\51\\12\\uffff\\1\\46\\1\\62\\1\\uffff\\1\\57\"+\n+ \"\\3\\uffff\\1\\7\\1\\72\\1\\uffff\\1\\47\\1\\50\\1\\uffff\\1\\64\\2\\uffff\\1\\70\\1\"+\n+ \"\\52\\1\\uffff\\1\\1\\1\\65\\1\\uffff\\1\\66\\1\\67\";\n static final String DFA12_specialS =\n- \"\\1\\2\\30\\uffff\\1\\1\\1\\0\\u00f3\\uffff}>\";\n+ \"\\1\\2\\32\\uffff\\1\\0\\1\\1\\u012c\\uffff}>\";\n static final String[] DFA12_transitionS = {\n- \"\\11\\35\\2\\34\\2\\35\\1\\34\\22\\35\\1\\34\\1\\35\\1\\31\\4\\35\\1\\32\\5\\35\\1\"+\n- \"\\5\\1\\6\\1\\33\\12\\30\\1\\35\\1\\13\\3\\35\\1\\23\\1\\35\\5\\27\\1\\22\\15\\27\\1\"+\n- \"\\21\\6\\27\\1\\2\\1\\35\\1\\4\\1\\26\\1\\27\\1\\35\\2\\27\\1\\10\\1\\3\\1\\27\\1\\25\"+\n- \"\\2\\27\\1\\12\\3\\27\\1\\11\\1\\27\\1\\7\\2\\27\\1\\24\\1\\1\\1\\17\\1\\20\\1\\16\\4\"+\n- \"\\27\\1\\14\\1\\35\\1\\15\\uff82\\35\",\n- \"\\1\\41\\1\\36\\3\\uffff\\1\\40\\1\\37\",\n+ \"\\11\\37\\2\\36\\2\\37\\1\\36\\22\\37\\1\\36\\1\\37\\1\\33\\4\\37\\1\\34\\5\\37\\1\"+\n+ \"\\5\\1\\6\\1\\35\\12\\32\\1\\37\\1\\13\\3\\37\\1\\23\\1\\37\\5\\31\\1\\22\\15\\31\\1\"+\n+ \"\\21\\6\\31\\1\\2\\1\\37\\1\\4\\1\\30\\1\\31\\1\\37\\1\\27\\1\\31\\1\\10\\1\\3\\1\\31\"+\n+ \"\\1\\25\\1\\26\\1\\31\\1\\12\\3\\31\\1\\11\\1\\31\\1\\7\\2\\31\\1\\24\\1\\1\\1\\17\\1\"+\n+ \"\\20\\1\\16\\4\\31\\1\\14\\1\\37\\1\\15\\uff82\\37\",\n+ \"\\1\\43\\1\\40\\3\\uffff\\1\\42\\1\\41\",\n \"\",\n- \"\\1\\44\",\n+ \"\\1\\46\",\n \"\",\n \"\",\n- \"\\1\\47\",\n- \"\\1\\51\\3\\uffff\\1\\52\\1\\53\",\n- \"\\1\\54\",\n- \"\\1\\57\\7\\uffff\\1\\56\\5\\uffff\\1\\55\",\n- \"\\1\\60\",\n+ \"\\1\\51\",\n+ \"\\1\\56\\15\\uffff\\1\\53\\3\\uffff\\1\\54\\1\\55\",\n+ \"\\1\\57\",\n+ \"\\1\\62\\7\\uffff\\1\\61\\5\\uffff\\1\\60\",\n+ \"\\1\\63\",\n \"\",\n \"\",\n \"\",\n- \"\\1\\64\",\n- \"\\1\\65\\20\\uffff\\1\\67\\6\\uffff\\1\\66\",\n- \"\\1\\70\",\n- \"\\12\\42\\7\\uffff\\32\\42\\4\\uffff\\1\\42\\1\\uffff\\32\\42\",\n- \"\\12\\42\\7\\uffff\\32\\42\\4\\uffff\\1\\42\\1\\uffff\\32\\42\",\n+ \"\\1\\67\",\n+ \"\\1\\70\\20\\uffff\\1\\72\\6\\uffff\\1\\71\",\n+ \"\\1\\73\",\n+ \"\\12\\44\\7\\uffff\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\32\\44\",\n+ \"\\12\\44\\7\\uffff\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\32\\44\",\n \"\",\n- \"\\1\\74\\3\\uffff\\1\\75\",\n- \"\\1\\76\",\n- \"\\32\\42\\4\\uffff\\1\\42\\1\\uffff\\32\\42\",\n+ \"\\1\\77\\3\\uffff\\1\\100\",\n+ \"\\1\\101\",\n+ \"\\1\\102\",\n+ \"\\1\\104\\1\\uffff\\1\\103\",\n+ \"\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\32\\44\",\n \"\",\n \"\",\n- \"\\0\\100\",\n- \"\\0\\100\",\n- \"\\1\\101\\4\\uffff\\1\\102\",\n+ \"\\0\\106\",\n+ \"\\0\\106\",\n+ \"\\1\\107\\4\\uffff\\1\\110\",\n \"\",\n \"\",\n- \"\\1\\104\",\n- \"\\1\\105\",\n- \"\\1\\106\",\n- \"\\1\\107\",\n+ \"\\1\\112\",\n+ \"\\1\\113\",\n+ \"\\1\\114\",\n+ \"\\1\\115\",\n \"\",\n \"\",\n- \"\\1\\110\",\n+ \"\\1\\117\\2\\uffff\\1\\116\",\n \"\",\n \"\",\n \"\",\n \"\",\n- \"\\1\\111\",\n- \"\\1\\112\",\n- \"\\1\\113\",\n- \"\\1\\114\\1\\115\",\n- \"\\1\\116\",\n- \"\\1\\117\",\n \"\\1\\120\",\n- \"\\1\\122\\2\\uffff\\1\\123\\6\\uffff\\1\\121\",\n+ \"\\1\\121\",\n+ \"\\1\\122\",\n+ \"\\1\\123\",\n+ \"\\1\\124\\1\\125\",\n+ \"\\1\\126\",\n+ \"\\1\\127\",\n+ \"\\1\\130\",\n+ \"\\1\\132\\2\\uffff\\1\\133\\6\\uffff\\1\\131\",\n \"\",\n \"\",\n \"\",\n- \"\\1\\124\\5\\uffff\\1\\125\",\n- \"\\1\\127\\17\\uffff\\1\\126\",\n- \"\\1\\130\",\n- \"\\1\\131\",\n- \"\\1\\132\",\n+ \"\\1\\134\\5\\uffff\\1\\135\",\n+ \"\\1\\137\\17\\uffff\\1\\136\",\n+ \"\\1\\140\",\n+ \"\\1\\141\",\n+ \"\\1\\142\",\n \"\",\n \"\",\n \"\",\n- \"\\1\\133\\5\\uffff\\1\\134\",\n- \"\\1\\137\\5\\uffff\\1\\135\\11\\uffff\\1\\136\",\n- \"\\1\\140\",\n+ \"\\1\\143\\5\\uffff\\1\\144\",\n+ \"\\1\\147\\5\\uffff\\1\\145\\11\\uffff\\1\\146\",\n+ \"\\1\\150\",\n+ \"\\1\\151\",\n+ \"\\1\\152\",\n+ \"\\1\\153\",\n \"\",\n \"\",\n \"\",\n \"\",\n \"\",\n- \"\\1\\141\",\n- \"\\1\\142\",\n- \"\\1\\143\",\n- \"\\1\\144\",\n- \"\\1\\145\",\n- \"\\1\\146\",\n- \"\\1\\147\",\n- \"\\1\\150\",\n- \"\\1\\152\\2\\uffff\\1\\151\",\n- \"\\1\\153\",\n \"\\1\\154\",\n \"\\1\\155\",\n \"\\1\\156\",\n@@ -2218,8 +2459,7 @@ public void mTokens() throws RecognitionException {\n \"\\1\\163\",\n \"\\1\\164\",\n \"\\1\\165\",\n- \"\\1\\166\",\n- \"\\1\\167\",\n+ \"\\1\\167\\2\\uffff\\1\\166\",\n \"\\1\\170\",\n \"\\1\\171\",\n \"\\1\\172\",\n@@ -2235,124 +2475,114 @@ public void mTokens() throws RecognitionException {\n \"\\1\\u0084\",\n \"\\1\\u0085\",\n \"\\1\\u0086\",\n- \"\\1\\u0088\\2\\uffff\\1\\u0087\",\n+ \"\\1\\u0087\",\n+ \"\\1\\u0088\",\n \"\\1\\u0089\",\n \"\\1\\u008a\",\n- \"\\12\\42\\7\\uffff\\32\\42\\4\\uffff\\1\\42\\1\\uffff\\22\\42\\1\\u008b\\7\\42\",\n- \"\",\n- \"\",\n+ \"\\1\\u008b\",\n+ \"\\1\\u008c\",\n \"\\1\\u008d\",\n \"\\1\\u008e\",\n \"\\1\\u008f\",\n \"\\1\\u0090\",\n \"\\1\\u0091\",\n \"\\1\\u0092\",\n \"\\1\\u0093\",\n- \"\\12\\42\\7\\uffff\\32\\42\\4\\uffff\\1\\42\\1\\uffff\\32\\42\",\n+ \"\\1\\u0094\",\n \"\\1\\u0095\",\n \"\\1\\u0096\",\n \"\\1\\u0097\",\n- \"\\12\\42\\7\\uffff\\32\\42\\4\\uffff\\1\\42\\1\\uffff\\32\\42\",\n- \"\\1\\u0099\",\n- \"\\1\\u009a\",\n+ \"\\1\\u0098\",\n+ \"\\1\\u009a\\2\\uffff\\1\\u0099\",\n \"\\1\\u009b\",\n \"\\1\\u009c\",\n- \"\\1\\u009d\",\n- \"\\1\\u009e\",\n- \"\\12\\42\\7\\uffff\\32\\42\\4\\uffff\\1\\42\\1\\uffff\\22\\42\\1\\u009f\\7\\42\",\n+ \"\\12\\44\\7\\uffff\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\22\\44\\1\\u009d\\7\\44\",\n+ \"\",\n+ \"\",\n+ \"\\1\\u009f\",\n+ \"\\1\\u00a0\",\n \"\\1\\u00a1\",\n \"\\1\\u00a2\",\n \"\\1\\u00a3\",\n- \"\\12\\42\\7\\uffff\\32\\42\\4\\uffff\\1\\42\\1\\uffff\\32\\42\",\n+ \"\\1\\u00a4\",\n \"\\1\\u00a5\",\n- \"\\1\\u00a6\",\n+ \"\\12\\44\\7\\uffff\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\32\\44\",\n \"\\1\\u00a7\",\n \"\\1\\u00a8\",\n \"\\1\\u00a9\",\n- \"\\12\\42\\7\\uffff\\32\\42\\4\\uffff\\1\\42\\1\\uffff\\32\\42\",\n- \"\",\n- \"\\12\\42\\7\\uffff\\32\\42\\4\\uffff\\1\\42\\1\\uffff\\22\\42\\1\\u00ab\\7\\42\",\n+ \"\\12\\44\\7\\uffff\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\32\\44\",\n+ \"\\1\\u00ab\",\n+ \"\\1\\u00ac\",\n \"\\1\\u00ad\",\n \"\\1\\u00ae\",\n- \"\\12\\42\\7\\uffff\\32\\42\\4\\uffff\\1\\42\\1\\uffff\\22\\42\\1\\u00af\\7\\42\",\n+ \"\\1\\u00af\",\n+ \"\\1\\u00b0\",\n \"\\1\\u00b1\",\n \"\\1\\u00b2\",\n- \"\\12\\42\\7\\uffff\\32\\42\\4\\uffff\\1\\42\\1\\uffff\\32\\42\",\n- \"\",\n- \"\\1\\u00b4\",\n- \"\\12\\42\\7\\uffff\\32\\42\\4\\uffff\\1\\42\\1\\uffff\\32\\42\",\n- \"\\12\\42\\7\\uffff\\32\\42\\4\\uffff\\1\\42\\1\\uffff\\32\\42\",\n- \"\",\n+ \"\\1\\u00b3\",\n+ \"\\12\\44\\7\\uffff\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\22\\44\\1\\u00b4\\7\\44\",\n+ \"\\1\\u00b6\",\n \"\\1\\u00b7\",\n \"\\1\\u00b8\",\n \"\\1\\u00b9\",\n- \"\\1\\u00ba\",\n+ \"\\12\\44\\7\\uffff\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\32\\44\",\n \"\\1\\u00bb\",\n \"\\1\\u00bc\",\n- \"\\12\\42\\7\\uffff\\32\\42\\4\\uffff\\1\\42\\1\\uffff\\32\\42\",\n+ \"\\1\\u00bd\",\n+ \"\\1\\u00be\",\n+ \"\\1\\u00bf\",\n+ \"\\1\\u00c0\",\n+ \"\\12\\44\\7\\uffff\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\32\\44\",\n \"\",\n- \"\\12\\42\\7\\uffff\\32\\42\\4\\uffff\\1\\42\\1\\uffff\\32\\42\",\n- \"\\12\\42\\7\\uffff\\32\\42\\4\\uffff\\1\\42\\1\\uffff\\22\\42\\1\\u00bf\\7\\42\",\n- \"\\1\\u00c1\",\n- \"\",\n- \"\\12\\42\\7\\uffff\\32\\42\\4\\uffff\\1\\42\\1\\uffff\\22\\42\\1\\u00c2\\7\\42\",\n+ \"\\12\\44\\7\\uffff\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\22\\44\\1\\u00c2\\7\\44\",\n \"\\1\\u00c4\",\n \"\\1\\u00c5\",\n- \"\\1\\u00c6\",\n- \"\\1\\u00c7\",\n- \"\",\n- \"\\12\\42\\7\\uffff\\32\\42\\4\\uffff\\1\\42\\1\\uffff\\32\\42\",\n- \"\",\n+ \"\\1\\u00c6\\2\\uffff\\12\\44\\7\\uffff\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\32\"+\n+ \"\\44\",\n+ \"\\1\\u00c8\",\n \"\\1\\u00c9\",\n- \"\\1\\u00ca\\7\\uffff\\1\\u00cb\",\n- \"\\12\\42\\7\\uffff\\32\\42\\4\\uffff\\1\\42\\1\\uffff\\32\\42\",\n+ \"\\12\\44\\7\\uffff\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\32\\44\",\n \"\",\n- \"\\1\\u00cd\",\n- \"\\12\\42\\7\\uffff\\32\\42\\4\\uffff\\1\\42\\1\\uffff\\32\\42\",\n+ \"\\1\\u00cb\",\n+ \"\\12\\44\\7\\uffff\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\32\\44\",\n+ \"\\12\\44\\7\\uffff\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\32\\44\",\n \"\",\n+ \"\\1\\u00ce\",\n \"\\1\\u00cf\",\n- \"\",\n- \"\",\n \"\\1\\u00d0\",\n \"\\1\\u00d1\",\n \"\\1\\u00d2\",\n \"\\1\\u00d3\",\n \"\\1\\u00d4\",\n \"\\1\\u00d5\",\n+ \"\\1\\u00d6\",\n+ \"\\12\\44\\7\\uffff\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\32\\44\",\n \"\",\n- \"\",\n- \"\\12\\42\\7\\uffff\\32\\42\\4\\uffff\\1\\42\\1\\uffff\\32\\42\",\n- \"\",\n- \"\\1\\u00d7\",\n- \"\\12\\42\\7\\uffff\\32\\42\\4\\uffff\\1\\42\\1\\uffff\\32\\42\",\n- \"\",\n- \"\\1\\u00d9\",\n- \"\\1\\u00da\",\n+ \"\\12\\44\\7\\uffff\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\32\\44\",\n+ \"\\12\\44\\7\\uffff\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\22\\44\\1\\u00d9\\7\\44\",\n \"\\1\\u00db\",\n \"\\1\\u00dc\",\n \"\",\n- \"\\1\\u00dd\",\n- \"\\12\\42\\7\\uffff\\32\\42\\4\\uffff\\1\\42\\1\\uffff\\32\\42\",\n+ \"\\12\\44\\7\\uffff\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\22\\44\\1\\u00dd\\7\\44\",\n \"\\1\\u00df\",\n- \"\",\n \"\\1\\u00e0\",\n- \"\",\n \"\\1\\u00e1\",\n \"\\1\\u00e2\",\n \"\\1\\u00e3\",\n- \"\\1\\u00e4\",\n- \"\\1\\u00e5\",\n- \"\\1\\u00e6\",\n- \"\\1\\u00e7\",\n \"\",\n- \"\\1\\u00e8\",\n+ \"\\12\\44\\7\\uffff\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\32\\44\",\n+ \"\",\n+ \"\\1\\u00e5\",\n+ \"\\1\\u00e6\\7\\uffff\\1\\u00e7\",\n+ \"\\1\\u00e9\\6\\uffff\\1\\u00e8\",\n \"\",\n- \"\\1\\u00e9\",\n \"\\1\\u00ea\",\n- \"\\12\\42\\7\\uffff\\32\\42\\4\\uffff\\1\\42\\1\\uffff\\32\\42\",\n- \"\\12\\42\\7\\uffff\\32\\42\\4\\uffff\\1\\42\\1\\uffff\\32\\42\",\n- \"\\12\\42\\7\\uffff\\32\\42\\4\\uffff\\1\\42\\1\\uffff\\32\\42\",\n+ \"\\12\\44\\7\\uffff\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\32\\44\",\n+ \"\",\n+ \"\\1\\u00ec\",\n \"\",\n+ \"\",\n+ \"\\1\\u00ed\",\n \"\\1\\u00ee\",\n \"\\1\\u00ef\",\n \"\\1\\u00f0\",\n@@ -2361,43 +2591,118 @@ public void mTokens() throws RecognitionException {\n \"\\1\\u00f3\",\n \"\\1\\u00f4\",\n \"\\1\\u00f5\",\n- \"\\1\\u00f6\",\n- \"\\12\\42\\7\\uffff\\32\\42\\4\\uffff\\1\\42\\1\\uffff\\32\\42\",\n- \"\\12\\42\\7\\uffff\\32\\42\\4\\uffff\\1\\42\\1\\uffff\\32\\42\",\n- \"\\1\\u00f9\",\n \"\",\n \"\",\n+ \"\\12\\44\\7\\uffff\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\32\\44\",\n+ \"\",\n+ \"\\1\\u00f7\",\n+ \"\\1\\u00f8\",\n+ \"\\12\\44\\7\\uffff\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\32\\44\",\n \"\",\n \"\\1\\u00fa\",\n- \"\\12\\42\\7\\uffff\\32\\42\\4\\uffff\\1\\42\\1\\uffff\\32\\42\",\n+ \"\\1\\u00fb\",\n \"\\1\\u00fc\",\n \"\\1\\u00fd\",\n- \"\",\n \"\\1\\u00fe\",\n \"\",\n \"\\1\\u00ff\",\n- \"\\1\\u0100\",\n+ \"\\12\\44\\7\\uffff\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\32\\44\",\n+ \"\\1\\u0101\",\n \"\",\n \"\",\n- \"\\1\\u0101\",\n \"\\1\\u0102\",\n \"\",\n- \"\\12\\42\\7\\uffff\\32\\42\\4\\uffff\\1\\42\\1\\uffff\\32\\42\",\n+ \"\\1\\u0103\",\n \"\\1\\u0104\",\n- \"\\12\\42\\7\\uffff\\32\\42\\4\\uffff\\1\\42\\1\\uffff\\32\\42\",\n+ \"\\1\\u0105\",\n \"\\1\\u0106\",\n- \"\\12\\42\\7\\uffff\\32\\42\\4\\uffff\\1\\42\\1\\uffff\\32\\42\",\n- \"\\1\\u0108\\1\\u0109\",\n+ \"\\1\\u0107\",\n+ \"\\1\\u0108\",\n+ \"\\1\\u0109\",\n+ \"\\1\\u010a\",\n+ \"\\1\\u010b\",\n+ \"\\1\\u010c\",\n \"\",\n+ \"\\1\\u010d\",\n+ \"\\1\\u010e\",\n \"\",\n- \"\\1\\u010a\",\n+ \"\\1\\u010f\",\n+ \"\\1\\u0110\",\n+ \"\\1\\u0111\",\n+ \"\\12\\44\\7\\uffff\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\32\\44\",\n+ \"\\12\\44\\7\\uffff\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\32\\44\",\n+ \"\\12\\44\\7\\uffff\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\32\\44\",\n \"\",\n- \"\\1\\u010b\",\n+ \"\\1\\u0115\",\n+ \"\\1\\u0116\",\n+ \"\\1\\u0117\",\n+ \"\\1\\u0118\",\n+ \"\\1\\u0119\",\n+ \"\\1\\u011a\",\n+ \"\\1\\u011b\",\n+ \"\\1\\u011c\",\n+ \"\\1\\u011d\",\n+ \"\",\n+ \"\\1\\u011e\",\n+ \"\\1\\u011f\",\n+ \"\\1\\u0120\",\n+ \"\\12\\44\\7\\uffff\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\32\\44\",\n+ \"\\1\\u0122\",\n+ \"\\12\\44\\7\\uffff\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\32\\44\",\n+ \"\\1\\u0124\",\n+ \"\",\n+ \"\",\n+ \"\",\n+ \"\\1\\u0125\",\n+ \"\\12\\44\\7\\uffff\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\32\\44\",\n+ \"\\1\\u0127\",\n+ \"\\1\\u0128\",\n+ \"\",\n+ \"\\1\\u0129\",\n+ \"\",\n+ \"\\1\\u012a\",\n+ \"\\1\\u012b\",\n+ \"\\1\\u012c\",\n+ \"\\1\\u012d\",\n+ \"\\1\\u012e\",\n \"\",\n+ \"\\1\\u012f\",\n \"\",\n+ \"\\1\\u0130\",\n+ \"\\1\\u0131\",\n \"\",\n- \"\\12\\42\\7\\uffff\\32\\42\\4\\uffff\\1\\42\\1\\uffff\\32\\42\",\n- \"\\12\\42\\7\\uffff\\32\\42\\4\\uffff\\1\\42\\1\\uffff\\32\\42\",\n+ \"\\12\\44\\7\\uffff\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\32\\44\",\n+ \"\\1\\u0133\",\n+ \"\\12\\44\\7\\uffff\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\32\\44\",\n+ \"\\1\\u0135\",\n+ \"\\1\\u0136\",\n+ \"\\1\\u0137\",\n+ \"\\12\\44\\7\\uffff\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\32\\44\",\n+ \"\\12\\44\\7\\uffff\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\32\\44\",\n+ \"\\1\\u013a\",\n+ \"\\1\\u013b\\1\\u013c\",\n+ \"\",\n+ \"\",\n+ \"\\1\\u013d\",\n+ \"\",\n+ \"\\12\\44\\7\\uffff\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\32\\44\",\n+ \"\\1\\u013f\",\n+ \"\\1\\u0140\",\n+ \"\",\n+ \"\",\n+ \"\\12\\44\\7\\uffff\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\32\\44\",\n+ \"\",\n+ \"\",\n+ \"\\12\\44\\7\\uffff\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\32\\44\",\n+ \"\",\n+ \"\\1\\u0143\",\n+ \"\\12\\44\\7\\uffff\\32\\44\\4\\uffff\\1\\44\\1\\uffff\\32\\44\",\n+ \"\",\n+ \"\",\n+ \"\\1\\u0145\\13\\uffff\\1\\u0146\",\n+ \"\",\n+ \"\",\n+ \"\\1\\u0148\\7\\uffff\\1\\u0147\",\n \"\",\n \"\"\n };\n@@ -2432,29 +2737,29 @@ public DFA12(BaseRecognizer recognizer) {\n this.transition = DFA12_transition;\n }\n public String getDescription() {\n- return \"1:1: Tokens : ( T__11 | T__12 | T__13 | T__14 | T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | T__38 | T__39 | T__40 | T__41 | T__42 | T__43 | T__44 | T__45 | T__46 | T__47 | T__48 | T__49 | T__50 | T__51 | T__52 | T__53 | T__54 | T__55 | T__56 | T__57 | T__58 | T__59 | T__60 | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER );\";\n+ return \"1:1: Tokens : ( T__11 | T__12 | T__13 | T__14 | T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | T__38 | T__39 | T__40 | T__41 | T__42 | T__43 | T__44 | T__45 | T__46 | T__47 | T__48 | T__49 | T__50 | T__51 | T__52 | T__53 | T__54 | T__55 | T__56 | T__57 | T__58 | T__59 | T__60 | T__61 | T__62 | T__63 | T__64 | T__65 | T__66 | T__67 | T__68 | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER );\";\n }\n public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {\n IntStream input = _input;\n \tint _s = s;\n switch ( s ) {\n case 0 : \n- int LA12_26 = input.LA(1);\n+ int LA12_27 = input.LA(1);\n \n s = -1;\n- if ( ((LA12_26>='\\u0000' && LA12_26<='\\uFFFF')) ) {s = 64;}\n+ if ( ((LA12_27>='\\u0000' && LA12_27<='\\uFFFF')) ) {s = 70;}\n \n- else s = 29;\n+ else s = 31;\n \n if ( s>=0 ) return s;\n break;\n case 1 : \n- int LA12_25 = input.LA(1);\n+ int LA12_28 = input.LA(1);\n \n s = -1;\n- if ( ((LA12_25>='\\u0000' && LA12_25<='\\uFFFF')) ) {s = 64;}\n+ if ( ((LA12_28>='\\u0000' && LA12_28<='\\uFFFF')) ) {s = 70;}\n \n- else s = 29;\n+ else s = 31;\n \n if ( s>=0 ) return s;\n break;\n@@ -2504,21 +2809,25 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc\n \n else if ( (LA12_0=='f') ) {s = 21;}\n \n- else if ( (LA12_0=='^') ) {s = 22;}\n+ else if ( (LA12_0=='g') ) {s = 22;}\n+\n+ else if ( (LA12_0=='a') ) {s = 23;}\n+\n+ else if ( (LA12_0=='^') ) {s = 24;}\n \n- else if ( ((LA12_0>='A' && LA12_0<='E')||(LA12_0>='G' && LA12_0<='S')||(LA12_0>='U' && LA12_0<='Z')||LA12_0=='_'||(LA12_0>='a' && LA12_0<='b')||LA12_0=='e'||(LA12_0>='g' && LA12_0<='h')||(LA12_0>='j' && LA12_0<='l')||LA12_0=='n'||(LA12_0>='p' && LA12_0<='q')||(LA12_0>='w' && LA12_0<='z')) ) {s = 23;}\n+ else if ( ((LA12_0>='A' && LA12_0<='E')||(LA12_0>='G' && LA12_0<='S')||(LA12_0>='U' && LA12_0<='Z')||LA12_0=='_'||LA12_0=='b'||LA12_0=='e'||LA12_0=='h'||(LA12_0>='j' && LA12_0<='l')||LA12_0=='n'||(LA12_0>='p' && LA12_0<='q')||(LA12_0>='w' && LA12_0<='z')) ) {s = 25;}\n \n- else if ( ((LA12_0>='0' && LA12_0<='9')) ) {s = 24;}\n+ else if ( ((LA12_0>='0' && LA12_0<='9')) ) {s = 26;}\n \n- else if ( (LA12_0=='\\\"') ) {s = 25;}\n+ else if ( (LA12_0=='\\\"') ) {s = 27;}\n \n- else if ( (LA12_0=='\\'') ) {s = 26;}\n+ else if ( (LA12_0=='\\'') ) {s = 28;}\n \n- else if ( (LA12_0=='/') ) {s = 27;}\n+ else if ( (LA12_0=='/') ) {s = 29;}\n \n- else if ( ((LA12_0>='\\t' && LA12_0<='\\n')||LA12_0=='\\r'||LA12_0==' ') ) {s = 28;}\n+ else if ( ((LA12_0>='\\t' && LA12_0<='\\n')||LA12_0=='\\r'||LA12_0==' ') ) {s = 30;}\n \n- else if ( ((LA12_0>='\\u0000' && LA12_0<='\\b')||(LA12_0>='\\u000B' && LA12_0<='\\f')||(LA12_0>='\\u000E' && LA12_0<='\\u001F')||LA12_0=='!'||(LA12_0>='#' && LA12_0<='&')||(LA12_0>='(' && LA12_0<=',')||LA12_0==':'||(LA12_0>='<' && LA12_0<='>')||LA12_0=='@'||LA12_0=='\\\\'||LA12_0=='`'||LA12_0=='|'||(LA12_0>='~' && LA12_0<='\\uFFFF')) ) {s = 29;}\n+ else if ( ((LA12_0>='\\u0000' && LA12_0<='\\b')||(LA12_0>='\\u000B' && LA12_0<='\\f')||(LA12_0>='\\u000E' && LA12_0<='\\u001F')||LA12_0=='!'||(LA12_0>='#' && LA12_0<='&')||(LA12_0>='(' && LA12_0<=',')||LA12_0==':'||(LA12_0>='<' && LA12_0<='>')||LA12_0=='@'||LA12_0=='\\\\'||LA12_0=='`'||LA12_0=='|'||(LA12_0>='~' && LA12_0<='\\uFFFF')) ) {s = 31;}\n \n if ( s>=0 ) return s;\n break;", "raw_url": "https://github.com/nasa/CertWare/raw/110fa3222ae2931978d7921dc8e6af8c7f43abd3/net.certware.intent.state%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fstate%2Fparser%2Fantlr%2Finternal%2FInternalStateSpecificationLexer.java", "sha": "fee035f09cd8d8920ffc70542d854a07cd3f2aba", "status": "modified" }, { "additions": 62, "blob_url": "https://github.com/nasa/CertWare/blob/110fa3222ae2931978d7921dc8e6af8c7f43abd3/net.certware.intent.state%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fstate%2Fserializer%2FStateSpecificationSemanticSequencer.java", "changes": 67, "contents_url": "https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent.state%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fstate%2Fserializer%2FStateSpecificationSemanticSequencer.java?ref=110fa3222ae2931978d7921dc8e6af8c7f43abd3", "deletions": 5, "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/serializer/StateSpecificationSemanticSequencer.java", "new_code": "import net.certware.intent.state.stateSpecification.ValueList;\nimport net.certware.intent.state.stateSpecification.ValueRange;\n\t\t\tcase StateSpecificationPackage.VALUE_LIST:\n\t\t\t\tif(context == grammarAccess.getValueListRule()) {\n\t\t\t\t\tsequence_ValueList(context, (ValueList) semanticObject); \n\t\t\t\t\treturn; \n\t\t\t\t}\n\t\t\t\telse break;\n\t\t\tcase StateSpecificationPackage.VALUE_RANGE:\n\t\t\t\tif(context == grammarAccess.getValueRangeRule()) {\n\t\t\t\t\tsequence_ValueRange(context, (ValueRange) semanticObject); \n\t\t\t\t\treturn; \n\t\t\t\t}\n\t\t\t\telse break;\n\t * range=ValueRange? \n\t * valueList=ValueList? \n\t * valueHandling=STRING? \n\t * granularity=BigUnitValue? \n\t * arrivalRateAvg=BigUnitValue? \n\t * arrivalRateMinimum=BigUnitValue? \n\t * arrivalRateMaximum=BigUnitValue? \n\t * obsolescence=BigUnitValue? \n\t * appearsIn=STRING? \n\t * description=STRING? \n\t * comments=STRING? \n\t * structure=TriggerTable?\n\t * range=ValueRange? \n\t * valueList=ValueList? \n\t\n\t\n\t/**\n\t * Constraint:\n\t * values+=STRING+\n\t */\n\tprotected void sequence_ValueList(EObject context, ValueList semanticObject) {\n\t\tgenericSequencer.createSequence(context, semanticObject);\n\t}\n\t\n\t\n\t/**\n\t * Constraint:\n\t * (lower=BigDecimalType upper=BigDecimalType rangeType=STRING rangeUnits=STRING)\n\t */\n\tprotected void sequence_ValueRange(EObject context, ValueRange semanticObject) {\n\t\tif(errorAcceptor != null) {\n\t\t\tif(transientValues.isValueTransient(semanticObject, StateSpecificationPackage.Literals.VALUE_RANGE__LOWER) == ValueTransient.YES)\n\t\t\t\terrorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, StateSpecificationPackage.Literals.VALUE_RANGE__LOWER));\n\t\t\tif(transientValues.isValueTransient(semanticObject, StateSpecificationPackage.Literals.VALUE_RANGE__UPPER) == ValueTransient.YES)\n\t\t\t\terrorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, StateSpecificationPackage.Literals.VALUE_RANGE__UPPER));\n\t\t\tif(transientValues.isValueTransient(semanticObject, StateSpecificationPackage.Literals.VALUE_RANGE__RANGE_TYPE) == ValueTransient.YES)\n\t\t\t\terrorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, StateSpecificationPackage.Literals.VALUE_RANGE__RANGE_TYPE));\n\t\t\tif(transientValues.isValueTransient(semanticObject, StateSpecificationPackage.Literals.VALUE_RANGE__RANGE_UNITS) == ValueTransient.YES)\n\t\t\t\terrorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, StateSpecificationPackage.Literals.VALUE_RANGE__RANGE_UNITS));\n\t\t}\n\t\tINodesForEObjectProvider nodes = createNodeProvider(semanticObject);\n\t\tSequenceFeeder feeder = createSequencerFeeder(semanticObject, nodes);\n\t\tfeeder.accept(grammarAccess.getValueRangeAccess().getLowerBigDecimalTypeParserRuleCall_1_0(), semanticObject.getLower());\n\t\tfeeder.accept(grammarAccess.getValueRangeAccess().getUpperBigDecimalTypeParserRuleCall_3_0(), semanticObject.getUpper());\n\t\tfeeder.accept(grammarAccess.getValueRangeAccess().getRangeTypeSTRINGTerminalRuleCall_6_0(), semanticObject.getRangeType());\n\t\tfeeder.accept(grammarAccess.getValueRangeAccess().getRangeUnitsSTRINGTerminalRuleCall_8_0(), semanticObject.getRangeUnits());\n\t\tfeeder.finish();\n\t}", "new_methods": [ { "arguments": [ "EObject context", " ValueList semanticObject" ], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/serializer/StateSpecificationSemanticSequencer.java", "implementation": "genericSequencer.createSequence(context, semanticObject);", "signature": "void sequence_ValueList(EObject context, ValueList semanticObject)" }, { "arguments": [ "EObject context", " ValueRange semanticObject" ], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/serializer/StateSpecificationSemanticSequencer.java", "implementation": "if(errorAcceptor != null) {\n\t\t\tif(transientValues.isValueTransient(semanticObject, StateSpecificationPackage.Literals.VALUE_RANGE__LOWER) == ValueTransient.YES)\n\t\t\t\terrorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, StateSpecificationPackage.Literals.VALUE_RANGE__LOWER));\n\t\t\tif(transientValues.isValueTransient(semanticObject, StateSpecificationPackage.Literals.VALUE_RANGE__UPPER) == ValueTransient.YES)\n\t\t\t\terrorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, StateSpecificationPackage.Literals.VALUE_RANGE__UPPER));\n\t\t\tif(transientValues.isValueTransient(semanticObject, StateSpecificationPackage.Literals.VALUE_RANGE__RANGE_TYPE) == ValueTransient.YES)\n\t\t\t\terrorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, StateSpecificationPackage.Literals.VALUE_RANGE__RANGE_TYPE));\n\t\t\tif(transientValues.isValueTransient(semanticObject, StateSpecificationPackage.Literals.VALUE_RANGE__RANGE_UNITS) == ValueTransient.YES)\n\t\t\t\terrorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, StateSpecificationPackage.Literals.VALUE_RANGE__RANGE_UNITS));", "signature": "void sequence_ValueRange(EObject context, ValueRange semanticObject)" } ], "old_code": "\t * ((lower=BigDecimalType upper=BigDecimalType rangeType=STRING rangeUnits=STRING) | values+=STRING*) \n\t * rate=BigUnitValue? \n\t * variables=STRING? \n\t * comments=STRING?\n\t * ((lower=BigDecimalType upper=BigDecimalType rangeType=STRING rangeUnits=STRING) | values+=STRING*) ", "old_methods": [], "patch": "@@ -25,6 +25,8 @@\n import net.certware.intent.state.stateSpecification.StateVariable;\n import net.certware.intent.state.stateSpecification.Trigger;\n import net.certware.intent.state.stateSpecification.TriggerTable;\n+import net.certware.intent.state.stateSpecification.ValueList;\n+import net.certware.intent.state.stateSpecification.ValueRange;\n import org.eclipse.emf.ecore.EObject;\n import org.eclipse.xtext.serializer.acceptor.ISemanticSequenceAcceptor;\n import org.eclipse.xtext.serializer.acceptor.SequenceFeeder;\n@@ -171,6 +173,18 @@ public void createSequence(EObject context, EObject semanticObject) {\n \t\t\t\t\treturn; \n \t\t\t\t}\n \t\t\t\telse break;\n+\t\t\tcase StateSpecificationPackage.VALUE_LIST:\n+\t\t\t\tif(context == grammarAccess.getValueListRule()) {\n+\t\t\t\t\tsequence_ValueList(context, (ValueList) semanticObject); \n+\t\t\t\t\treturn; \n+\t\t\t\t}\n+\t\t\t\telse break;\n+\t\t\tcase StateSpecificationPackage.VALUE_RANGE:\n+\t\t\t\tif(context == grammarAccess.getValueRangeRule()) {\n+\t\t\t\t\tsequence_ValueRange(context, (ValueRange) semanticObject); \n+\t\t\t\t\treturn; \n+\t\t\t\t}\n+\t\t\t\telse break;\n \t\t\t}\n \t\tif (errorAcceptor != null) errorAcceptor.accept(diagnosticProvider.createInvalidContextOrTypeDiagnostic(semanticObject, context));\n \t}\n@@ -251,11 +265,19 @@ protected void sequence_Device(EObject context, Device semanticObject) {\n \t/**\n \t * Constraint:\n \t * (\n-\t * ((lower=BigDecimalType upper=BigDecimalType rangeType=STRING rangeUnits=STRING) | values+=STRING*) \n-\t * rate=BigUnitValue? \n-\t * variables=STRING? \n+\t * range=ValueRange? \n+\t * valueList=ValueList? \n+\t * valueHandling=STRING? \n+\t * granularity=BigUnitValue? \n+\t * arrivalRateAvg=BigUnitValue? \n+\t * arrivalRateMinimum=BigUnitValue? \n+\t * arrivalRateMaximum=BigUnitValue? \n+\t * obsolescence=BigUnitValue? \n \t * references=STRING? \n-\t * comments=STRING?\n+\t * appearsIn=STRING? \n+\t * description=STRING? \n+\t * comments=STRING? \n+\t * structure=TriggerTable?\n \t * )\n \t */\n \tprotected void sequence_Input(EObject context, Input semanticObject) {\n@@ -302,7 +324,8 @@ protected void sequence_Mode(EObject context, Mode semanticObject) {\n \t/**\n \t * Constraint:\n \t * (\n-\t * ((lower=BigDecimalType upper=BigDecimalType rangeType=STRING rangeUnits=STRING) | values+=STRING*) \n+\t * range=ValueRange? \n+\t * valueList=ValueList? \n \t * rate=BigUnitValue? \n \t * delay=BigUnitValue? \n \t * deadline=BigUnitValue? \n@@ -394,4 +417,38 @@ protected void sequence_TriggerTable(EObject context, TriggerTable semanticObjec\n \tprotected void sequence_Trigger(EObject context, Trigger semanticObject) {\n \t\tgenericSequencer.createSequence(context, semanticObject);\n \t}\n+\t\n+\t\n+\t/**\n+\t * Constraint:\n+\t * values+=STRING+\n+\t */\n+\tprotected void sequence_ValueList(EObject context, ValueList semanticObject) {\n+\t\tgenericSequencer.createSequence(context, semanticObject);\n+\t}\n+\t\n+\t\n+\t/**\n+\t * Constraint:\n+\t * (lower=BigDecimalType upper=BigDecimalType rangeType=STRING rangeUnits=STRING)\n+\t */\n+\tprotected void sequence_ValueRange(EObject context, ValueRange semanticObject) {\n+\t\tif(errorAcceptor != null) {\n+\t\t\tif(transientValues.isValueTransient(semanticObject, StateSpecificationPackage.Literals.VALUE_RANGE__LOWER) == ValueTransient.YES)\n+\t\t\t\terrorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, StateSpecificationPackage.Literals.VALUE_RANGE__LOWER));\n+\t\t\tif(transientValues.isValueTransient(semanticObject, StateSpecificationPackage.Literals.VALUE_RANGE__UPPER) == ValueTransient.YES)\n+\t\t\t\terrorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, StateSpecificationPackage.Literals.VALUE_RANGE__UPPER));\n+\t\t\tif(transientValues.isValueTransient(semanticObject, StateSpecificationPackage.Literals.VALUE_RANGE__RANGE_TYPE) == ValueTransient.YES)\n+\t\t\t\terrorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, StateSpecificationPackage.Literals.VALUE_RANGE__RANGE_TYPE));\n+\t\t\tif(transientValues.isValueTransient(semanticObject, StateSpecificationPackage.Literals.VALUE_RANGE__RANGE_UNITS) == ValueTransient.YES)\n+\t\t\t\terrorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, StateSpecificationPackage.Literals.VALUE_RANGE__RANGE_UNITS));\n+\t\t}\n+\t\tINodesForEObjectProvider nodes = createNodeProvider(semanticObject);\n+\t\tSequenceFeeder feeder = createSequencerFeeder(semanticObject, nodes);\n+\t\tfeeder.accept(grammarAccess.getValueRangeAccess().getLowerBigDecimalTypeParserRuleCall_1_0(), semanticObject.getLower());\n+\t\tfeeder.accept(grammarAccess.getValueRangeAccess().getUpperBigDecimalTypeParserRuleCall_3_0(), semanticObject.getUpper());\n+\t\tfeeder.accept(grammarAccess.getValueRangeAccess().getRangeTypeSTRINGTerminalRuleCall_6_0(), semanticObject.getRangeType());\n+\t\tfeeder.accept(grammarAccess.getValueRangeAccess().getRangeUnitsSTRINGTerminalRuleCall_8_0(), semanticObject.getRangeUnits());\n+\t\tfeeder.finish();\n+\t}\n }", "raw_url": "https://github.com/nasa/CertWare/raw/110fa3222ae2931978d7921dc8e6af8c7f43abd3/net.certware.intent.state%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fstate%2Fserializer%2FStateSpecificationSemanticSequencer.java", "sha": "afb9712be0afe058ec6ef08f006a6debd2de0452", "status": "modified" }, { "additions": 415, "blob_url": "https://github.com/nasa/CertWare/blob/110fa3222ae2931978d7921dc8e6af8c7f43abd3/net.certware.intent.state%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fstate%2Fservices%2FStateSpecificationGrammarAccess.java", "changes": 711, "contents_url": "https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent.state%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fstate%2Fservices%2FStateSpecificationGrammarAccess.java?ref=110fa3222ae2931978d7921dc8e6af8c7f43abd3", "deletions": 296, "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "new_code": "\tpublic class ValueRangeElements extends AbstractParserRuleElementFinder {\n\t\tprivate final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), \"ValueRange\");\n\t\tprivate final Group cGroup = (Group)rule.eContents().get(1);\n\t\tprivate final Keyword cLeftCurlyBracketKeyword_0 = (Keyword)cGroup.eContents().get(0);\n\t\tprivate final Assignment cLowerAssignment_1 = (Assignment)cGroup.eContents().get(1);\n\t\tprivate final RuleCall cLowerBigDecimalTypeParserRuleCall_1_0 = (RuleCall)cLowerAssignment_1.eContents().get(0);\n\t\tprivate final Keyword cFullStopFullStopFullStopKeyword_2 = (Keyword)cGroup.eContents().get(2);\n\t\tprivate final Assignment cUpperAssignment_3 = (Assignment)cGroup.eContents().get(3);\n\t\tprivate final RuleCall cUpperBigDecimalTypeParserRuleCall_3_0 = (RuleCall)cUpperAssignment_3.eContents().get(0);\n\t\tprivate final Keyword cRightCurlyBracketKeyword_4 = (Keyword)cGroup.eContents().get(4);\n\t\tprivate final Keyword cTypeKeyword_5 = (Keyword)cGroup.eContents().get(5);\n\t\tprivate final Assignment cRangeTypeAssignment_6 = (Assignment)cGroup.eContents().get(6);\n\t\tprivate final RuleCall cRangeTypeSTRINGTerminalRuleCall_6_0 = (RuleCall)cRangeTypeAssignment_6.eContents().get(0);\n\t\tprivate final Keyword cUnitsKeyword_7 = (Keyword)cGroup.eContents().get(7);\n\t\tprivate final Assignment cRangeUnitsAssignment_8 = (Assignment)cGroup.eContents().get(8);\n\t\tprivate final RuleCall cRangeUnitsSTRINGTerminalRuleCall_8_0 = (RuleCall)cRangeUnitsAssignment_8.eContents().get(0);\n\t\tprivate final Keyword cRightCurlyBracketKeyword_9 = (Keyword)cGroup.eContents().get(9);\n\t\t\n\t\t//ValueRange:\n\t\t//\t\"{\" lower=BigDecimalType \"...\" upper=BigDecimalType \"}\" \"type\" rangeType=STRING \"units\" rangeUnits=STRING \"}\";\n\t\tpublic ParserRule getRule() { return rule; }\n\n\t\t//\"{\" lower=BigDecimalType \"...\" upper=BigDecimalType \"}\" \"type\" rangeType=STRING \"units\" rangeUnits=STRING \"}\"\n\t\tpublic Group getGroup() { return cGroup; }\n\n\t\t//\"{\"\n\t\tpublic Keyword getLeftCurlyBracketKeyword_0() { return cLeftCurlyBracketKeyword_0; }\n\n\t\t//lower=BigDecimalType\n\t\tpublic Assignment getLowerAssignment_1() { return cLowerAssignment_1; }\n\n\t\t//BigDecimalType\n\t\tpublic RuleCall getLowerBigDecimalTypeParserRuleCall_1_0() { return cLowerBigDecimalTypeParserRuleCall_1_0; }\n\n\t\t//\"...\"\n\t\tpublic Keyword getFullStopFullStopFullStopKeyword_2() { return cFullStopFullStopFullStopKeyword_2; }\n\n\t\t//upper=BigDecimalType\n\t\tpublic Assignment getUpperAssignment_3() { return cUpperAssignment_3; }\n\n\t\t//BigDecimalType\n\t\tpublic RuleCall getUpperBigDecimalTypeParserRuleCall_3_0() { return cUpperBigDecimalTypeParserRuleCall_3_0; }\n\n\t\t//\"}\"\n\t\tpublic Keyword getRightCurlyBracketKeyword_4() { return cRightCurlyBracketKeyword_4; }\n\n\t\t//\"type\"\n\t\tpublic Keyword getTypeKeyword_5() { return cTypeKeyword_5; }\n\n\t\t//rangeType=STRING\n\t\tpublic Assignment getRangeTypeAssignment_6() { return cRangeTypeAssignment_6; }\n\n\t\t//STRING\n\t\tpublic RuleCall getRangeTypeSTRINGTerminalRuleCall_6_0() { return cRangeTypeSTRINGTerminalRuleCall_6_0; }\n\n\t\t//\"units\"\n\t\tpublic Keyword getUnitsKeyword_7() { return cUnitsKeyword_7; }\n\n\t\t//rangeUnits=STRING\n\t\tpublic Assignment getRangeUnitsAssignment_8() { return cRangeUnitsAssignment_8; }\n\n\t\t//STRING\n\t\tpublic RuleCall getRangeUnitsSTRINGTerminalRuleCall_8_0() { return cRangeUnitsSTRINGTerminalRuleCall_8_0; }\n\n\t\t//\"}\"\n\t\tpublic Keyword getRightCurlyBracketKeyword_9() { return cRightCurlyBracketKeyword_9; }\n\t}\n\n\tpublic class ValueListElements extends AbstractParserRuleElementFinder {\n\t\tprivate final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), \"ValueList\");\n\t\tprivate final Group cGroup = (Group)rule.eContents().get(1);\n\t\tprivate final Keyword cLeftCurlyBracketKeyword_0 = (Keyword)cGroup.eContents().get(0);\n\t\tprivate final Assignment cValuesAssignment_1 = (Assignment)cGroup.eContents().get(1);\n\t\tprivate final RuleCall cValuesSTRINGTerminalRuleCall_1_0 = (RuleCall)cValuesAssignment_1.eContents().get(0);\n\t\tprivate final Keyword cRightCurlyBracketKeyword_2 = (Keyword)cGroup.eContents().get(2);\n\t\t\n\t\t//ValueList:\n\t\t//\t\"{\" values+=STRING+ \"}\";\n\t\tpublic ParserRule getRule() { return rule; }\n\n\t\t//\"{\" values+=STRING+ \"}\"\n\t\tpublic Group getGroup() { return cGroup; }\n\n\t\t//\"{\"\n\t\tpublic Keyword getLeftCurlyBracketKeyword_0() { return cLeftCurlyBracketKeyword_0; }\n\n\t\t//values+=STRING+\n\t\tpublic Assignment getValuesAssignment_1() { return cValuesAssignment_1; }\n\n\t\t//STRING\n\t\tpublic RuleCall getValuesSTRINGTerminalRuleCall_1_0() { return cValuesSTRINGTerminalRuleCall_1_0; }\n\n\t\t//\"}\"\n\t\tpublic Keyword getRightCurlyBracketKeyword_2() { return cRightCurlyBracketKeyword_2; }\n\t}\n\n\t\tprivate final Group cGroup_1 = (Group)cGroup.eContents().get(1);\n\t\tprivate final Keyword cRangeKeyword_1_0 = (Keyword)cGroup_1.eContents().get(0);\n\t\tprivate final Assignment cRangeAssignment_1_1 = (Assignment)cGroup_1.eContents().get(1);\n\t\tprivate final RuleCall cRangeValueRangeParserRuleCall_1_1_0 = (RuleCall)cRangeAssignment_1_1.eContents().get(0);\n\t\tprivate final Keyword cValueListKeyword_2_0 = (Keyword)cGroup_2.eContents().get(0);\n\t\tprivate final Assignment cValueListAssignment_2_1 = (Assignment)cGroup_2.eContents().get(1);\n\t\tprivate final RuleCall cValueListValueListParserRuleCall_2_1_0 = (RuleCall)cValueListAssignment_2_1.eContents().get(0);\n\t\tprivate final Keyword cRateKeyword_3_0 = (Keyword)cGroup_3.eContents().get(0);\n\t\tprivate final Assignment cRateAssignment_3_1 = (Assignment)cGroup_3.eContents().get(1);\n\t\tprivate final RuleCall cRateBigUnitValueParserRuleCall_3_1_0 = (RuleCall)cRateAssignment_3_1.eContents().get(0);\n\t\tprivate final Keyword cInitiationDelayKeyword_4_0 = (Keyword)cGroup_4.eContents().get(0);\n\t\tprivate final Assignment cDelayAssignment_4_1 = (Assignment)cGroup_4.eContents().get(1);\n\t\tprivate final RuleCall cDelayBigUnitValueParserRuleCall_4_1_0 = (RuleCall)cDelayAssignment_4_1.eContents().get(0);\n\t\tprivate final Keyword cCompletionDeadlineKeyword_5_0 = (Keyword)cGroup_5.eContents().get(0);\n\t\tprivate final Assignment cDeadlineAssignment_5_1 = (Assignment)cGroup_5.eContents().get(1);\n\t\tprivate final RuleCall cDeadlineBigUnitValueParserRuleCall_5_1_0 = (RuleCall)cDeadlineAssignment_5_1.eContents().get(0);\n\t\tprivate final Keyword cCompletionExceptionKeyword_6_0 = (Keyword)cGroup_6.eContents().get(0);\n\t\tprivate final Assignment cCompletionHandlingAssignment_6_1 = (Assignment)cGroup_6.eContents().get(1);\n\t\tprivate final RuleCall cCompletionHandlingSTRINGTerminalRuleCall_6_1_0 = (RuleCall)cCompletionHandlingAssignment_6_1.eContents().get(0);\n\t\tprivate final Keyword cVariablesKeyword_7_0 = (Keyword)cGroup_7.eContents().get(0);\n\t\tprivate final Assignment cVariablesAssignment_7_1 = (Assignment)cGroup_7.eContents().get(1);\n\t\tprivate final RuleCall cVariablesSTRINGTerminalRuleCall_7_1_0 = (RuleCall)cVariablesAssignment_7_1.eContents().get(0);\n\t\tprivate final Keyword cRelationshipKeyword_8_0 = (Keyword)cGroup_8.eContents().get(0);\n\t\tprivate final Assignment cRelationshipAssignment_8_1 = (Assignment)cGroup_8.eContents().get(1);\n\t\tprivate final RuleCall cRelationshipSTRINGTerminalRuleCall_8_1_0 = (RuleCall)cRelationshipAssignment_8_1.eContents().get(0);\n\t\tprivate final Keyword cMinResponseTimeKeyword_9_0 = (Keyword)cGroup_9.eContents().get(0);\n\t\tprivate final Assignment cMinResponseAssignment_9_1 = (Assignment)cGroup_9.eContents().get(1);\n\t\tprivate final RuleCall cMinResponseBigUnitValueParserRuleCall_9_1_0 = (RuleCall)cMinResponseAssignment_9_1.eContents().get(0);\n\t\tprivate final Keyword cMaxResponseTimeKeyword_10_0 = (Keyword)cGroup_10.eContents().get(0);\n\t\tprivate final Assignment cMaxResponseAssignment_10_1 = (Assignment)cGroup_10.eContents().get(1);\n\t\tprivate final RuleCall cMaxResponseBigUnitValueParserRuleCall_10_1_0 = (RuleCall)cMaxResponseAssignment_10_1.eContents().get(0);\n\t\tprivate final Keyword cFeedbackExceptionKeyword_11_0 = (Keyword)cGroup_11.eContents().get(0);\n\t\tprivate final Assignment cFeebackHandlingAssignment_11_1 = (Assignment)cGroup_11.eContents().get(1);\n\t\tprivate final RuleCall cFeebackHandlingSTRINGTerminalRuleCall_11_1_0 = (RuleCall)cFeebackHandlingAssignment_11_1.eContents().get(0);\n\t\tprivate final Keyword cReversedByKeyword_12_0 = (Keyword)cGroup_12.eContents().get(0);\n\t\tprivate final Assignment cReversedAssignment_12_1 = (Assignment)cGroup_12.eContents().get(1);\n\t\tprivate final RuleCall cReversedSTRINGTerminalRuleCall_12_1_0 = (RuleCall)cReversedAssignment_12_1.eContents().get(0);\n\t\tprivate final Keyword cReferencesKeyword_13_0 = (Keyword)cGroup_13.eContents().get(0);\n\t\tprivate final Assignment cReferencesAssignment_13_1 = (Assignment)cGroup_13.eContents().get(1);\n\t\tprivate final RuleCall cReferencesSTRINGTerminalRuleCall_13_1_0 = (RuleCall)cReferencesAssignment_13_1.eContents().get(0);\n\t\tprivate final Keyword cCommentsKeyword_14_0 = (Keyword)cGroup_14.eContents().get(0);\n\t\tprivate final Assignment cCommentsAssignment_14_1 = (Assignment)cGroup_14.eContents().get(1);\n\t\tprivate final RuleCall cCommentsSTRINGTerminalRuleCall_14_1_0 = (RuleCall)cCommentsAssignment_14_1.eContents().get(0);\n\t\tprivate final Keyword cContentsKeyword_15_0 = (Keyword)cGroup_15.eContents().get(0);\n\t\tprivate final Assignment cContentsAssignment_15_1 = (Assignment)cGroup_15.eContents().get(1);\n\t\tprivate final RuleCall cContentsSTRINGTerminalRuleCall_15_1_0 = (RuleCall)cContentsAssignment_15_1.eContents().get(0);\n\t\tprivate final Group cGroup_16 = (Group)cGroup.eContents().get(16);\n\t\tprivate final Keyword cTriggeringKeyword_16_0 = (Keyword)cGroup_16.eContents().get(0);\n\t\tprivate final Assignment cTableAssignment_16_1 = (Assignment)cGroup_16.eContents().get(1);\n\t\tprivate final RuleCall cTableTriggerTableParserRuleCall_16_1_0 = (RuleCall)cTableAssignment_16_1.eContents().get(0);\n\t\t//\t{Output} (\"range\" range=ValueRange)? (\"value-list\" valueList=ValueList)? (\"rate\" rate=BigUnitValue)?\n\t\t//\t(\"initiation-delay\" delay=BigUnitValue)? (\"completion-deadline\" deadline=BigUnitValue)? (\"completion-exception\"\n\t\t//{Output} (\"range\" range=ValueRange)? (\"value-list\" valueList=ValueList)? (\"rate\" rate=BigUnitValue)? (\"initiation-delay\"\n\t\t//(\"range\" range=ValueRange)?\n\t\tpublic Group getGroup_1() { return cGroup_1; }\n\t\tpublic Keyword getRangeKeyword_1_0() { return cRangeKeyword_1_0; }\n\t\t//range=ValueRange\n\t\tpublic Assignment getRangeAssignment_1_1() { return cRangeAssignment_1_1; }\n\t\t//ValueRange\n\t\tpublic RuleCall getRangeValueRangeParserRuleCall_1_1_0() { return cRangeValueRangeParserRuleCall_1_1_0; }\n\t\t//(\"value-list\" valueList=ValueList)?\n\t\tpublic Group getGroup_2() { return cGroup_2; }\n\t\t//\"value-list\"\n\t\tpublic Keyword getValueListKeyword_2_0() { return cValueListKeyword_2_0; }\n\t\t//valueList=ValueList\n\t\tpublic Assignment getValueListAssignment_2_1() { return cValueListAssignment_2_1; }\n\t\t//ValueList\n\t\tpublic RuleCall getValueListValueListParserRuleCall_2_1_0() { return cValueListValueListParserRuleCall_2_1_0; }\n\t\tpublic Group getGroup_3() { return cGroup_3; }\n\t\tpublic Keyword getRateKeyword_3_0() { return cRateKeyword_3_0; }\n\t\tpublic Assignment getRateAssignment_3_1() { return cRateAssignment_3_1; }\n\t\tpublic RuleCall getRateBigUnitValueParserRuleCall_3_1_0() { return cRateBigUnitValueParserRuleCall_3_1_0; }\n\t\tpublic Group getGroup_4() { return cGroup_4; }\n\t\tpublic Keyword getInitiationDelayKeyword_4_0() { return cInitiationDelayKeyword_4_0; }\n\t\tpublic Assignment getDelayAssignment_4_1() { return cDelayAssignment_4_1; }\n\t\tpublic RuleCall getDelayBigUnitValueParserRuleCall_4_1_0() { return cDelayBigUnitValueParserRuleCall_4_1_0; }\n\t\tpublic Group getGroup_5() { return cGroup_5; }\n\t\tpublic Keyword getCompletionDeadlineKeyword_5_0() { return cCompletionDeadlineKeyword_5_0; }\n\t\tpublic Assignment getDeadlineAssignment_5_1() { return cDeadlineAssignment_5_1; }\n\t\tpublic RuleCall getDeadlineBigUnitValueParserRuleCall_5_1_0() { return cDeadlineBigUnitValueParserRuleCall_5_1_0; }\n\t\tpublic Group getGroup_6() { return cGroup_6; }\n\t\tpublic Keyword getCompletionExceptionKeyword_6_0() { return cCompletionExceptionKeyword_6_0; }\n\t\tpublic Assignment getCompletionHandlingAssignment_6_1() { return cCompletionHandlingAssignment_6_1; }\n\t\tpublic RuleCall getCompletionHandlingSTRINGTerminalRuleCall_6_1_0() { return cCompletionHandlingSTRINGTerminalRuleCall_6_1_0; }\n\t\tpublic Group getGroup_7() { return cGroup_7; }\n\t\tpublic Keyword getVariablesKeyword_7_0() { return cVariablesKeyword_7_0; }\n\t\tpublic Assignment getVariablesAssignment_7_1() { return cVariablesAssignment_7_1; }\n\t\tpublic RuleCall getVariablesSTRINGTerminalRuleCall_7_1_0() { return cVariablesSTRINGTerminalRuleCall_7_1_0; }\n\t\tpublic Group getGroup_8() { return cGroup_8; }\n\t\tpublic Keyword getRelationshipKeyword_8_0() { return cRelationshipKeyword_8_0; }\n\t\tpublic Assignment getRelationshipAssignment_8_1() { return cRelationshipAssignment_8_1; }\n\t\tpublic RuleCall getRelationshipSTRINGTerminalRuleCall_8_1_0() { return cRelationshipSTRINGTerminalRuleCall_8_1_0; }\n\t\tpublic Group getGroup_9() { return cGroup_9; }\n\t\tpublic Keyword getMinResponseTimeKeyword_9_0() { return cMinResponseTimeKeyword_9_0; }\n\t\tpublic Assignment getMinResponseAssignment_9_1() { return cMinResponseAssignment_9_1; }\n\t\tpublic RuleCall getMinResponseBigUnitValueParserRuleCall_9_1_0() { return cMinResponseBigUnitValueParserRuleCall_9_1_0; }\n\t\tpublic Group getGroup_10() { return cGroup_10; }\n\t\tpublic Keyword getMaxResponseTimeKeyword_10_0() { return cMaxResponseTimeKeyword_10_0; }\n\t\tpublic Assignment getMaxResponseAssignment_10_1() { return cMaxResponseAssignment_10_1; }\n\t\tpublic RuleCall getMaxResponseBigUnitValueParserRuleCall_10_1_0() { return cMaxResponseBigUnitValueParserRuleCall_10_1_0; }\n\t\tpublic Group getGroup_11() { return cGroup_11; }\n\t\tpublic Keyword getFeedbackExceptionKeyword_11_0() { return cFeedbackExceptionKeyword_11_0; }\n\t\tpublic Assignment getFeebackHandlingAssignment_11_1() { return cFeebackHandlingAssignment_11_1; }\n\t\tpublic RuleCall getFeebackHandlingSTRINGTerminalRuleCall_11_1_0() { return cFeebackHandlingSTRINGTerminalRuleCall_11_1_0; }\n\t\tpublic Group getGroup_12() { return cGroup_12; }\n\t\tpublic Keyword getReversedByKeyword_12_0() { return cReversedByKeyword_12_0; }\n\t\tpublic Assignment getReversedAssignment_12_1() { return cReversedAssignment_12_1; }\n\t\tpublic RuleCall getReversedSTRINGTerminalRuleCall_12_1_0() { return cReversedSTRINGTerminalRuleCall_12_1_0; }\n\t\tpublic Group getGroup_13() { return cGroup_13; }\n\t\tpublic Keyword getReferencesKeyword_13_0() { return cReferencesKeyword_13_0; }\n\t\tpublic Assignment getReferencesAssignment_13_1() { return cReferencesAssignment_13_1; }\n\t\tpublic RuleCall getReferencesSTRINGTerminalRuleCall_13_1_0() { return cReferencesSTRINGTerminalRuleCall_13_1_0; }\n\t\tpublic Group getGroup_14() { return cGroup_14; }\n\t\tpublic Keyword getCommentsKeyword_14_0() { return cCommentsKeyword_14_0; }\n\t\tpublic Assignment getCommentsAssignment_14_1() { return cCommentsAssignment_14_1; }\n\t\tpublic RuleCall getCommentsSTRINGTerminalRuleCall_14_1_0() { return cCommentsSTRINGTerminalRuleCall_14_1_0; }\n\t\tpublic Group getGroup_15() { return cGroup_15; }\n\t\tpublic Keyword getContentsKeyword_15_0() { return cContentsKeyword_15_0; }\n\t\tpublic Assignment getContentsAssignment_15_1() { return cContentsAssignment_15_1; }\n\t\tpublic RuleCall getContentsSTRINGTerminalRuleCall_15_1_0() { return cContentsSTRINGTerminalRuleCall_15_1_0; }\n\t\tpublic Group getGroup_16() { return cGroup_16; }\n\t\tpublic Keyword getTriggeringKeyword_16_0() { return cTriggeringKeyword_16_0; }\n\t\tpublic Assignment getTableAssignment_16_1() { return cTableAssignment_16_1; }\n\t\tpublic RuleCall getTableTriggerTableParserRuleCall_16_1_0() { return cTableTriggerTableParserRuleCall_16_1_0; }\n\t\tprivate final Group cGroup_1 = (Group)cGroup.eContents().get(1);\n\t\tprivate final Keyword cRangeKeyword_1_0 = (Keyword)cGroup_1.eContents().get(0);\n\t\tprivate final Assignment cRangeAssignment_1_1 = (Assignment)cGroup_1.eContents().get(1);\n\t\tprivate final RuleCall cRangeValueRangeParserRuleCall_1_1_0 = (RuleCall)cRangeAssignment_1_1.eContents().get(0);\n\t\tprivate final Keyword cValueListKeyword_2_0 = (Keyword)cGroup_2.eContents().get(0);\n\t\tprivate final Assignment cValueListAssignment_2_1 = (Assignment)cGroup_2.eContents().get(1);\n\t\tprivate final RuleCall cValueListValueListParserRuleCall_2_1_0 = (RuleCall)cValueListAssignment_2_1.eContents().get(0);\n\t\tprivate final Keyword cValueExceptionKeyword_3_0 = (Keyword)cGroup_3.eContents().get(0);\n\t\tprivate final Assignment cValueHandlingAssignment_3_1 = (Assignment)cGroup_3.eContents().get(1);\n\t\tprivate final RuleCall cValueHandlingSTRINGTerminalRuleCall_3_1_0 = (RuleCall)cValueHandlingAssignment_3_1.eContents().get(0);\n\t\tprivate final Keyword cGranularityKeyword_4_0 = (Keyword)cGroup_4.eContents().get(0);\n\t\tprivate final Assignment cGranularityAssignment_4_1 = (Assignment)cGroup_4.eContents().get(1);\n\t\tprivate final RuleCall cGranularityBigUnitValueParserRuleCall_4_1_0 = (RuleCall)cGranularityAssignment_4_1.eContents().get(0);\n\t\tprivate final Keyword cArrivalRateAvgKeyword_5_0 = (Keyword)cGroup_5.eContents().get(0);\n\t\tprivate final Assignment cArrivalRateAvgAssignment_5_1 = (Assignment)cGroup_5.eContents().get(1);\n\t\tprivate final RuleCall cArrivalRateAvgBigUnitValueParserRuleCall_5_1_0 = (RuleCall)cArrivalRateAvgAssignment_5_1.eContents().get(0);\n\t\tprivate final Group cGroup_6 = (Group)cGroup.eContents().get(6);\n\t\tprivate final Keyword cArrivalRateMinimumKeyword_6_0 = (Keyword)cGroup_6.eContents().get(0);\n\t\tprivate final Assignment cArrivalRateMinimumAssignment_6_1 = (Assignment)cGroup_6.eContents().get(1);\n\t\tprivate final RuleCall cArrivalRateMinimumBigUnitValueParserRuleCall_6_1_0 = (RuleCall)cArrivalRateMinimumAssignment_6_1.eContents().get(0);\n\t\tprivate final Group cGroup_7 = (Group)cGroup.eContents().get(7);\n\t\tprivate final Keyword cArrivalRateMaximumKeyword_7_0 = (Keyword)cGroup_7.eContents().get(0);\n\t\tprivate final Assignment cArrivalRateMaximumAssignment_7_1 = (Assignment)cGroup_7.eContents().get(1);\n\t\tprivate final RuleCall cArrivalRateMaximumBigUnitValueParserRuleCall_7_1_0 = (RuleCall)cArrivalRateMaximumAssignment_7_1.eContents().get(0);\n\t\tprivate final Group cGroup_8 = (Group)cGroup.eContents().get(8);\n\t\tprivate final Keyword cObsolescenceKeyword_8_0 = (Keyword)cGroup_8.eContents().get(0);\n\t\tprivate final Assignment cObsolescenceAssignment_8_1 = (Assignment)cGroup_8.eContents().get(1);\n\t\tprivate final RuleCall cObsolescenceBigUnitValueParserRuleCall_8_1_0 = (RuleCall)cObsolescenceAssignment_8_1.eContents().get(0);\n\t\tprivate final Group cGroup_9 = (Group)cGroup.eContents().get(9);\n\t\tprivate final Keyword cReferencesKeyword_9_0 = (Keyword)cGroup_9.eContents().get(0);\n\t\tprivate final Assignment cReferencesAssignment_9_1 = (Assignment)cGroup_9.eContents().get(1);\n\t\tprivate final RuleCall cReferencesSTRINGTerminalRuleCall_9_1_0 = (RuleCall)cReferencesAssignment_9_1.eContents().get(0);\n\t\tprivate final Group cGroup_10 = (Group)cGroup.eContents().get(10);\n\t\tprivate final Keyword cAppearsInKeyword_10_0 = (Keyword)cGroup_10.eContents().get(0);\n\t\tprivate final Assignment cAppearsInAssignment_10_1 = (Assignment)cGroup_10.eContents().get(1);\n\t\tprivate final RuleCall cAppearsInSTRINGTerminalRuleCall_10_1_0 = (RuleCall)cAppearsInAssignment_10_1.eContents().get(0);\n\t\tprivate final Group cGroup_11 = (Group)cGroup.eContents().get(11);\n\t\tprivate final Keyword cDescriptionKeyword_11_0 = (Keyword)cGroup_11.eContents().get(0);\n\t\tprivate final Assignment cDescriptionAssignment_11_1 = (Assignment)cGroup_11.eContents().get(1);\n\t\tprivate final RuleCall cDescriptionSTRINGTerminalRuleCall_11_1_0 = (RuleCall)cDescriptionAssignment_11_1.eContents().get(0);\n\t\tprivate final Group cGroup_12 = (Group)cGroup.eContents().get(12);\n\t\tprivate final Keyword cCommentsKeyword_12_0 = (Keyword)cGroup_12.eContents().get(0);\n\t\tprivate final Assignment cCommentsAssignment_12_1 = (Assignment)cGroup_12.eContents().get(1);\n\t\tprivate final RuleCall cCommentsSTRINGTerminalRuleCall_12_1_0 = (RuleCall)cCommentsAssignment_12_1.eContents().get(0);\n\t\tprivate final Group cGroup_13 = (Group)cGroup.eContents().get(13);\n\t\tprivate final Keyword cTriggeringKeyword_13_0 = (Keyword)cGroup_13.eContents().get(0);\n\t\tprivate final Assignment cStructureAssignment_13_1 = (Assignment)cGroup_13.eContents().get(1);\n\t\tprivate final RuleCall cStructureTriggerTableParserRuleCall_13_1_0 = (RuleCall)cStructureAssignment_13_1.eContents().get(0);\n\t\t//\t{Input} (\"range\" range=ValueRange)? (\"value-list\" valueList=ValueList)? (\"value-exception\" valueHandling=STRING)?\n\t\t//\t(\"granularity\" granularity=BigUnitValue)? (\"arrival-rate-avg\" arrivalRateAvg=BigUnitValue)? (\"arrival-rate-minimum\"\n\t\t//\tarrivalRateMinimum=BigUnitValue)? (\"arrival-rate-maximum\" arrivalRateMaximum=BigUnitValue)? (\"obsolescence\"\n\t\t//\tobsolescence=BigUnitValue)? (\"references\" references=STRING)? (\"appears-in\" appearsIn=STRING)? (\"description\"\n\t\t//\tdescription=STRING)? (\"comments\" comments=STRING)? (\"triggering\" structure=TriggerTable)?;\n\t\t//{Input} (\"range\" range=ValueRange)? (\"value-list\" valueList=ValueList)? (\"value-exception\" valueHandling=STRING)?\n\t\t//(\"granularity\" granularity=BigUnitValue)? (\"arrival-rate-avg\" arrivalRateAvg=BigUnitValue)? (\"arrival-rate-minimum\"\n\t\t//arrivalRateMinimum=BigUnitValue)? (\"arrival-rate-maximum\" arrivalRateMaximum=BigUnitValue)? (\"obsolescence\"\n\t\t//obsolescence=BigUnitValue)? (\"references\" references=STRING)? (\"appears-in\" appearsIn=STRING)? (\"description\"\n\t\t//description=STRING)? (\"comments\" comments=STRING)? (\"triggering\" structure=TriggerTable)?\n\t\t//(\"range\" range=ValueRange)?\n\t\tpublic Group getGroup_1() { return cGroup_1; }\n\t\tpublic Keyword getRangeKeyword_1_0() { return cRangeKeyword_1_0; }\n\t\t//range=ValueRange\n\t\tpublic Assignment getRangeAssignment_1_1() { return cRangeAssignment_1_1; }\n\t\t//ValueRange\n\t\tpublic RuleCall getRangeValueRangeParserRuleCall_1_1_0() { return cRangeValueRangeParserRuleCall_1_1_0; }\n\t\t//(\"value-list\" valueList=ValueList)?\n\t\tpublic Group getGroup_2() { return cGroup_2; }\n\t\t//\"value-list\"\n\t\tpublic Keyword getValueListKeyword_2_0() { return cValueListKeyword_2_0; }\n\t\t//valueList=ValueList\n\t\tpublic Assignment getValueListAssignment_2_1() { return cValueListAssignment_2_1; }\n\t\t//ValueList\n\t\tpublic RuleCall getValueListValueListParserRuleCall_2_1_0() { return cValueListValueListParserRuleCall_2_1_0; }\n\t\t//(\"value-exception\" valueHandling=STRING)?\n\t\tpublic Group getGroup_3() { return cGroup_3; }\n\t\t//\"value-exception\"\n\t\tpublic Keyword getValueExceptionKeyword_3_0() { return cValueExceptionKeyword_3_0; }\n\t\t//valueHandling=STRING\n\t\tpublic Assignment getValueHandlingAssignment_3_1() { return cValueHandlingAssignment_3_1; }\n\t\tpublic RuleCall getValueHandlingSTRINGTerminalRuleCall_3_1_0() { return cValueHandlingSTRINGTerminalRuleCall_3_1_0; }\n\t\t//(\"granularity\" granularity=BigUnitValue)?\n\t\tpublic Group getGroup_4() { return cGroup_4; }\n\t\t//\"granularity\"\n\t\tpublic Keyword getGranularityKeyword_4_0() { return cGranularityKeyword_4_0; }\n\t\t//granularity=BigUnitValue\n\t\tpublic Assignment getGranularityAssignment_4_1() { return cGranularityAssignment_4_1; }\n\t\t//BigUnitValue\n\t\tpublic RuleCall getGranularityBigUnitValueParserRuleCall_4_1_0() { return cGranularityBigUnitValueParserRuleCall_4_1_0; }\n\t\t//(\"arrival-rate-avg\" arrivalRateAvg=BigUnitValue)?\n\t\tpublic Group getGroup_5() { return cGroup_5; }\n\t\t//\"arrival-rate-avg\"\n\t\tpublic Keyword getArrivalRateAvgKeyword_5_0() { return cArrivalRateAvgKeyword_5_0; }\n\t\t//arrivalRateAvg=BigUnitValue\n\t\tpublic Assignment getArrivalRateAvgAssignment_5_1() { return cArrivalRateAvgAssignment_5_1; }\n\t\t//BigUnitValue\n\t\tpublic RuleCall getArrivalRateAvgBigUnitValueParserRuleCall_5_1_0() { return cArrivalRateAvgBigUnitValueParserRuleCall_5_1_0; }\n\t\t//(\"arrival-rate-minimum\" arrivalRateMinimum=BigUnitValue)?\n\t\tpublic Group getGroup_6() { return cGroup_6; }\n\t\t//\"arrival-rate-minimum\"\n\t\tpublic Keyword getArrivalRateMinimumKeyword_6_0() { return cArrivalRateMinimumKeyword_6_0; }\n\t\t//arrivalRateMinimum=BigUnitValue\n\t\tpublic Assignment getArrivalRateMinimumAssignment_6_1() { return cArrivalRateMinimumAssignment_6_1; }\n\t\t//BigUnitValue\n\t\tpublic RuleCall getArrivalRateMinimumBigUnitValueParserRuleCall_6_1_0() { return cArrivalRateMinimumBigUnitValueParserRuleCall_6_1_0; }\n\n\t\t//(\"arrival-rate-maximum\" arrivalRateMaximum=BigUnitValue)?\n\t\tpublic Group getGroup_7() { return cGroup_7; }\n\n\t\t//\"arrival-rate-maximum\"\n\t\tpublic Keyword getArrivalRateMaximumKeyword_7_0() { return cArrivalRateMaximumKeyword_7_0; }\n\n\t\t//arrivalRateMaximum=BigUnitValue\n\t\tpublic Assignment getArrivalRateMaximumAssignment_7_1() { return cArrivalRateMaximumAssignment_7_1; }\n\t\tpublic RuleCall getArrivalRateMaximumBigUnitValueParserRuleCall_7_1_0() { return cArrivalRateMaximumBigUnitValueParserRuleCall_7_1_0; }\n\t\t//(\"obsolescence\" obsolescence=BigUnitValue)?\n\t\tpublic Group getGroup_8() { return cGroup_8; }\n\t\t//\"obsolescence\"\n\t\tpublic Keyword getObsolescenceKeyword_8_0() { return cObsolescenceKeyword_8_0; }\n\t\t//obsolescence=BigUnitValue\n\t\tpublic Assignment getObsolescenceAssignment_8_1() { return cObsolescenceAssignment_8_1; }\n\t\t//BigUnitValue\n\t\tpublic RuleCall getObsolescenceBigUnitValueParserRuleCall_8_1_0() { return cObsolescenceBigUnitValueParserRuleCall_8_1_0; }\n\t\tpublic Group getGroup_9() { return cGroup_9; }\n\t\tpublic Keyword getReferencesKeyword_9_0() { return cReferencesKeyword_9_0; }\n\t\tpublic Assignment getReferencesAssignment_9_1() { return cReferencesAssignment_9_1; }\n\n\t\t//STRING\n\t\tpublic RuleCall getReferencesSTRINGTerminalRuleCall_9_1_0() { return cReferencesSTRINGTerminalRuleCall_9_1_0; }\n\n\t\t//(\"appears-in\" appearsIn=STRING)?\n\t\tpublic Group getGroup_10() { return cGroup_10; }\n\n\t\t//\"appears-in\"\n\t\tpublic Keyword getAppearsInKeyword_10_0() { return cAppearsInKeyword_10_0; }\n\n\t\t//appearsIn=STRING\n\t\tpublic Assignment getAppearsInAssignment_10_1() { return cAppearsInAssignment_10_1; }\n\t\tpublic RuleCall getAppearsInSTRINGTerminalRuleCall_10_1_0() { return cAppearsInSTRINGTerminalRuleCall_10_1_0; }\n\n\t\t//(\"description\" description=STRING)?\n\t\tpublic Group getGroup_11() { return cGroup_11; }\n\n\t\t//\"description\"\n\t\tpublic Keyword getDescriptionKeyword_11_0() { return cDescriptionKeyword_11_0; }\n\n\t\t//description=STRING\n\t\tpublic Assignment getDescriptionAssignment_11_1() { return cDescriptionAssignment_11_1; }\n\n\t\t//STRING\n\t\tpublic RuleCall getDescriptionSTRINGTerminalRuleCall_11_1_0() { return cDescriptionSTRINGTerminalRuleCall_11_1_0; }\n\t\tpublic Group getGroup_12() { return cGroup_12; }\n\t\tpublic Keyword getCommentsKeyword_12_0() { return cCommentsKeyword_12_0; }\n\t\tpublic Assignment getCommentsAssignment_12_1() { return cCommentsAssignment_12_1; }\n\t\tpublic RuleCall getCommentsSTRINGTerminalRuleCall_12_1_0() { return cCommentsSTRINGTerminalRuleCall_12_1_0; }\n\n\t\t//(\"triggering\" structure=TriggerTable)?\n\t\tpublic Group getGroup_13() { return cGroup_13; }\n\n\t\t//\"triggering\"\n\t\tpublic Keyword getTriggeringKeyword_13_0() { return cTriggeringKeyword_13_0; }\n\n\t\t//structure=TriggerTable\n\t\tpublic Assignment getStructureAssignment_13_1() { return cStructureAssignment_13_1; }\n\n\t\t//TriggerTable\n\t\tpublic RuleCall getStructureTriggerTableParserRuleCall_13_1_0() { return cStructureTriggerTableParserRuleCall_13_1_0; }\n\tprivate ValueRangeElements pValueRange;\n\tprivate ValueListElements pValueList;\n\t//ValueRange:\n\t//\t\"{\" lower=BigDecimalType \"...\" upper=BigDecimalType \"}\" \"type\" rangeType=STRING \"units\" rangeUnits=STRING \"}\";\n\tpublic ValueRangeElements getValueRangeAccess() {\n\t\treturn (pValueRange != null) ? pValueRange : (pValueRange = new ValueRangeElements());\n\t}\n\t\n\tpublic ParserRule getValueRangeRule() {\n\t\treturn getValueRangeAccess().getRule();\n\t}\n\n\t//ValueList:\n\t//\t\"{\" values+=STRING+ \"}\";\n\tpublic ValueListElements getValueListAccess() {\n\t\treturn (pValueList != null) ? pValueList : (pValueList = new ValueListElements());\n\t}\n\t\n\tpublic ParserRule getValueListRule() {\n\t\treturn getValueListAccess().getRule();\n\t}\n\n\t//\t{Output} (\"range\" range=ValueRange)? (\"value-list\" valueList=ValueList)? (\"rate\" rate=BigUnitValue)?\n\t//\t(\"initiation-delay\" delay=BigUnitValue)? (\"completion-deadline\" deadline=BigUnitValue)? (\"completion-exception\"\n\t//\t{Input} (\"range\" range=ValueRange)? (\"value-list\" valueList=ValueList)? (\"value-exception\" valueHandling=STRING)?\n\t//\t(\"granularity\" granularity=BigUnitValue)? (\"arrival-rate-avg\" arrivalRateAvg=BigUnitValue)? (\"arrival-rate-minimum\"\n\t//\tarrivalRateMinimum=BigUnitValue)? (\"arrival-rate-maximum\" arrivalRateMaximum=BigUnitValue)? (\"obsolescence\"\n\t//\tobsolescence=BigUnitValue)? (\"references\" references=STRING)? (\"appears-in\" appearsIn=STRING)? (\"description\"\n\t//\tdescription=STRING)? (\"comments\" comments=STRING)? (\"triggering\" structure=TriggerTable)?;", "new_methods": [ { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return rule;", "signature": "ParserRule getRule()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cGroup;", "signature": "Group getGroup()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cLeftCurlyBracketKeyword_0;", "signature": "Keyword getLeftCurlyBracketKeyword_0()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cLowerAssignment_1;", "signature": "Assignment getLowerAssignment_1()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cLowerBigDecimalTypeParserRuleCall_1_0;", "signature": "RuleCall getLowerBigDecimalTypeParserRuleCall_1_0()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cFullStopFullStopFullStopKeyword_2;", "signature": "Keyword getFullStopFullStopFullStopKeyword_2()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cUpperAssignment_3;", "signature": "Assignment getUpperAssignment_3()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cUpperBigDecimalTypeParserRuleCall_3_0;", "signature": "RuleCall getUpperBigDecimalTypeParserRuleCall_3_0()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cRightCurlyBracketKeyword_4;", "signature": "Keyword getRightCurlyBracketKeyword_4()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cTypeKeyword_5;", "signature": "Keyword getTypeKeyword_5()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cRangeTypeAssignment_6;", "signature": "Assignment getRangeTypeAssignment_6()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cRangeTypeSTRINGTerminalRuleCall_6_0;", "signature": "RuleCall getRangeTypeSTRINGTerminalRuleCall_6_0()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cUnitsKeyword_7;", "signature": "Keyword getUnitsKeyword_7()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cRangeUnitsAssignment_8;", "signature": "Assignment getRangeUnitsAssignment_8()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cRangeUnitsSTRINGTerminalRuleCall_8_0;", "signature": "RuleCall getRangeUnitsSTRINGTerminalRuleCall_8_0()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cRightCurlyBracketKeyword_9;", "signature": "Keyword getRightCurlyBracketKeyword_9()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return rule;", "signature": "ParserRule getRule()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cGroup;", "signature": "Group getGroup()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cLeftCurlyBracketKeyword_0;", "signature": "Keyword getLeftCurlyBracketKeyword_0()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cValuesAssignment_1;", "signature": "Assignment getValuesAssignment_1()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cValuesSTRINGTerminalRuleCall_1_0;", "signature": "RuleCall getValuesSTRINGTerminalRuleCall_1_0()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cRightCurlyBracketKeyword_2;", "signature": "Keyword getRightCurlyBracketKeyword_2()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cGroup_1;", "signature": "Group getGroup_1()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cRangeKeyword_1_0;", "signature": "Keyword getRangeKeyword_1_0()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cRangeAssignment_1_1;", "signature": "Assignment getRangeAssignment_1_1()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cRangeValueRangeParserRuleCall_1_1_0;", "signature": "RuleCall getRangeValueRangeParserRuleCall_1_1_0()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cGroup_2;", "signature": "Group getGroup_2()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cValueListKeyword_2_0;", "signature": "Keyword getValueListKeyword_2_0()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cValueListAssignment_2_1;", "signature": "Assignment getValueListAssignment_2_1()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cValueListValueListParserRuleCall_2_1_0;", "signature": "RuleCall getValueListValueListParserRuleCall_2_1_0()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cGroup_3;", "signature": "Group getGroup_3()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cRateKeyword_3_0;", "signature": "Keyword getRateKeyword_3_0()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cRateAssignment_3_1;", "signature": "Assignment getRateAssignment_3_1()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cRateBigUnitValueParserRuleCall_3_1_0;", "signature": "RuleCall getRateBigUnitValueParserRuleCall_3_1_0()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cGroup_4;", "signature": "Group getGroup_4()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cInitiationDelayKeyword_4_0;", "signature": "Keyword getInitiationDelayKeyword_4_0()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cDelayAssignment_4_1;", "signature": "Assignment getDelayAssignment_4_1()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cDelayBigUnitValueParserRuleCall_4_1_0;", "signature": "RuleCall getDelayBigUnitValueParserRuleCall_4_1_0()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cGroup_5;", "signature": "Group getGroup_5()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cCompletionDeadlineKeyword_5_0;", "signature": "Keyword getCompletionDeadlineKeyword_5_0()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cDeadlineAssignment_5_1;", "signature": "Assignment getDeadlineAssignment_5_1()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cDeadlineBigUnitValueParserRuleCall_5_1_0;", "signature": "RuleCall getDeadlineBigUnitValueParserRuleCall_5_1_0()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cGroup_6;", "signature": "Group getGroup_6()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cCompletionExceptionKeyword_6_0;", "signature": "Keyword getCompletionExceptionKeyword_6_0()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cCompletionHandlingAssignment_6_1;", "signature": "Assignment getCompletionHandlingAssignment_6_1()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cCompletionHandlingSTRINGTerminalRuleCall_6_1_0;", "signature": "RuleCall getCompletionHandlingSTRINGTerminalRuleCall_6_1_0()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cGroup_7;", "signature": "Group getGroup_7()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cVariablesKeyword_7_0;", "signature": "Keyword getVariablesKeyword_7_0()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cVariablesAssignment_7_1;", "signature": "Assignment getVariablesAssignment_7_1()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cVariablesSTRINGTerminalRuleCall_7_1_0;", "signature": "RuleCall getVariablesSTRINGTerminalRuleCall_7_1_0()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cGroup_8;", "signature": "Group getGroup_8()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cRelationshipKeyword_8_0;", "signature": "Keyword getRelationshipKeyword_8_0()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cRelationshipAssignment_8_1;", "signature": "Assignment getRelationshipAssignment_8_1()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cRelationshipSTRINGTerminalRuleCall_8_1_0;", "signature": "RuleCall getRelationshipSTRINGTerminalRuleCall_8_1_0()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cGroup_9;", "signature": "Group getGroup_9()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cMinResponseTimeKeyword_9_0;", "signature": "Keyword getMinResponseTimeKeyword_9_0()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cMinResponseAssignment_9_1;", "signature": "Assignment getMinResponseAssignment_9_1()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cMinResponseBigUnitValueParserRuleCall_9_1_0;", "signature": "RuleCall getMinResponseBigUnitValueParserRuleCall_9_1_0()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cGroup_10;", "signature": "Group getGroup_10()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cMaxResponseTimeKeyword_10_0;", "signature": "Keyword getMaxResponseTimeKeyword_10_0()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cMaxResponseAssignment_10_1;", "signature": "Assignment getMaxResponseAssignment_10_1()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cMaxResponseBigUnitValueParserRuleCall_10_1_0;", "signature": "RuleCall getMaxResponseBigUnitValueParserRuleCall_10_1_0()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cGroup_11;", "signature": "Group getGroup_11()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cFeedbackExceptionKeyword_11_0;", "signature": "Keyword getFeedbackExceptionKeyword_11_0()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cFeebackHandlingAssignment_11_1;", "signature": "Assignment getFeebackHandlingAssignment_11_1()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cFeebackHandlingSTRINGTerminalRuleCall_11_1_0;", "signature": "RuleCall getFeebackHandlingSTRINGTerminalRuleCall_11_1_0()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cGroup_12;", "signature": "Group getGroup_12()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cReversedByKeyword_12_0;", "signature": "Keyword getReversedByKeyword_12_0()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cReversedAssignment_12_1;", "signature": "Assignment getReversedAssignment_12_1()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cReversedSTRINGTerminalRuleCall_12_1_0;", "signature": "RuleCall getReversedSTRINGTerminalRuleCall_12_1_0()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cGroup_13;", "signature": "Group getGroup_13()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cReferencesKeyword_13_0;", "signature": "Keyword getReferencesKeyword_13_0()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cReferencesAssignment_13_1;", "signature": "Assignment getReferencesAssignment_13_1()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cReferencesSTRINGTerminalRuleCall_13_1_0;", "signature": "RuleCall getReferencesSTRINGTerminalRuleCall_13_1_0()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cGroup_14;", "signature": "Group getGroup_14()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cCommentsKeyword_14_0;", "signature": "Keyword getCommentsKeyword_14_0()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cCommentsAssignment_14_1;", "signature": "Assignment getCommentsAssignment_14_1()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cCommentsSTRINGTerminalRuleCall_14_1_0;", "signature": "RuleCall getCommentsSTRINGTerminalRuleCall_14_1_0()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cGroup_15;", "signature": "Group getGroup_15()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cContentsKeyword_15_0;", "signature": "Keyword getContentsKeyword_15_0()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cContentsAssignment_15_1;", "signature": "Assignment getContentsAssignment_15_1()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cContentsSTRINGTerminalRuleCall_15_1_0;", "signature": "RuleCall getContentsSTRINGTerminalRuleCall_15_1_0()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cGroup_16;", "signature": "Group getGroup_16()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cTriggeringKeyword_16_0;", "signature": "Keyword getTriggeringKeyword_16_0()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cTableAssignment_16_1;", "signature": "Assignment getTableAssignment_16_1()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cTableTriggerTableParserRuleCall_16_1_0;", "signature": "RuleCall getTableTriggerTableParserRuleCall_16_1_0()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cGroup_1;", "signature": "Group getGroup_1()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cRangeKeyword_1_0;", "signature": "Keyword getRangeKeyword_1_0()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cRangeAssignment_1_1;", "signature": "Assignment getRangeAssignment_1_1()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cRangeValueRangeParserRuleCall_1_1_0;", "signature": "RuleCall getRangeValueRangeParserRuleCall_1_1_0()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cGroup_2;", "signature": "Group getGroup_2()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cValueListKeyword_2_0;", "signature": "Keyword getValueListKeyword_2_0()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cValueListAssignment_2_1;", "signature": "Assignment getValueListAssignment_2_1()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cValueListValueListParserRuleCall_2_1_0;", "signature": "RuleCall getValueListValueListParserRuleCall_2_1_0()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cGroup_3;", "signature": "Group getGroup_3()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cValueExceptionKeyword_3_0;", "signature": "Keyword getValueExceptionKeyword_3_0()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cValueHandlingAssignment_3_1;", "signature": "Assignment getValueHandlingAssignment_3_1()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cValueHandlingSTRINGTerminalRuleCall_3_1_0;", "signature": "RuleCall getValueHandlingSTRINGTerminalRuleCall_3_1_0()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cGroup_4;", "signature": "Group getGroup_4()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cGranularityKeyword_4_0;", "signature": "Keyword getGranularityKeyword_4_0()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cGranularityAssignment_4_1;", "signature": "Assignment getGranularityAssignment_4_1()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cGranularityBigUnitValueParserRuleCall_4_1_0;", "signature": "RuleCall getGranularityBigUnitValueParserRuleCall_4_1_0()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cGroup_5;", "signature": "Group getGroup_5()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cArrivalRateAvgKeyword_5_0;", "signature": "Keyword getArrivalRateAvgKeyword_5_0()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cArrivalRateAvgAssignment_5_1;", "signature": "Assignment getArrivalRateAvgAssignment_5_1()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cArrivalRateAvgBigUnitValueParserRuleCall_5_1_0;", "signature": "RuleCall getArrivalRateAvgBigUnitValueParserRuleCall_5_1_0()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cGroup_6;", "signature": "Group getGroup_6()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cArrivalRateMinimumKeyword_6_0;", "signature": "Keyword getArrivalRateMinimumKeyword_6_0()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cArrivalRateMinimumAssignment_6_1;", "signature": "Assignment getArrivalRateMinimumAssignment_6_1()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cArrivalRateMinimumBigUnitValueParserRuleCall_6_1_0;", "signature": "RuleCall getArrivalRateMinimumBigUnitValueParserRuleCall_6_1_0()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cGroup_7;", "signature": "Group getGroup_7()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cArrivalRateMaximumKeyword_7_0;", "signature": "Keyword getArrivalRateMaximumKeyword_7_0()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cArrivalRateMaximumAssignment_7_1;", "signature": "Assignment getArrivalRateMaximumAssignment_7_1()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cArrivalRateMaximumBigUnitValueParserRuleCall_7_1_0;", "signature": "RuleCall getArrivalRateMaximumBigUnitValueParserRuleCall_7_1_0()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cGroup_8;", "signature": "Group getGroup_8()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cObsolescenceKeyword_8_0;", "signature": "Keyword getObsolescenceKeyword_8_0()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cObsolescenceAssignment_8_1;", "signature": "Assignment getObsolescenceAssignment_8_1()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cObsolescenceBigUnitValueParserRuleCall_8_1_0;", "signature": "RuleCall getObsolescenceBigUnitValueParserRuleCall_8_1_0()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cGroup_9;", "signature": "Group getGroup_9()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cReferencesKeyword_9_0;", "signature": "Keyword getReferencesKeyword_9_0()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cReferencesAssignment_9_1;", "signature": "Assignment getReferencesAssignment_9_1()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cReferencesSTRINGTerminalRuleCall_9_1_0;", "signature": "RuleCall getReferencesSTRINGTerminalRuleCall_9_1_0()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cGroup_10;", "signature": "Group getGroup_10()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cAppearsInKeyword_10_0;", "signature": "Keyword getAppearsInKeyword_10_0()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cAppearsInAssignment_10_1;", "signature": "Assignment getAppearsInAssignment_10_1()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cAppearsInSTRINGTerminalRuleCall_10_1_0;", "signature": "RuleCall getAppearsInSTRINGTerminalRuleCall_10_1_0()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cGroup_11;", "signature": "Group getGroup_11()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cDescriptionKeyword_11_0;", "signature": "Keyword getDescriptionKeyword_11_0()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cDescriptionAssignment_11_1;", "signature": "Assignment getDescriptionAssignment_11_1()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cDescriptionSTRINGTerminalRuleCall_11_1_0;", "signature": "RuleCall getDescriptionSTRINGTerminalRuleCall_11_1_0()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cGroup_12;", "signature": "Group getGroup_12()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cCommentsKeyword_12_0;", "signature": "Keyword getCommentsKeyword_12_0()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cCommentsAssignment_12_1;", "signature": "Assignment getCommentsAssignment_12_1()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cCommentsSTRINGTerminalRuleCall_12_1_0;", "signature": "RuleCall getCommentsSTRINGTerminalRuleCall_12_1_0()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cGroup_13;", "signature": "Group getGroup_13()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cTriggeringKeyword_13_0;", "signature": "Keyword getTriggeringKeyword_13_0()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cStructureAssignment_13_1;", "signature": "Assignment getStructureAssignment_13_1()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cStructureTriggerTableParserRuleCall_13_1_0;", "signature": "RuleCall getStructureTriggerTableParserRuleCall_13_1_0()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return (pValueRange != null) ? pValueRange : (pValueRange = new ValueRangeElements());", "signature": "ValueRangeElements getValueRangeAccess()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return getValueRangeAccess().getRule();", "signature": "ParserRule getValueRangeRule()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return (pValueList != null) ? pValueList : (pValueList = new ValueListElements());", "signature": "ValueListElements getValueListAccess()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return getValueListAccess().getRule();", "signature": "ParserRule getValueListRule()" } ], "old_code": "\t\tprivate final Alternatives cAlternatives_1 = (Alternatives)cGroup.eContents().get(1);\n\t\tprivate final Group cGroup_1_0 = (Group)cAlternatives_1.eContents().get(0);\n\t\tprivate final Keyword cRangeKeyword_1_0_0 = (Keyword)cGroup_1_0.eContents().get(0);\n\t\tprivate final Keyword cLeftCurlyBracketKeyword_1_0_1 = (Keyword)cGroup_1_0.eContents().get(1);\n\t\tprivate final Assignment cLowerAssignment_1_0_2 = (Assignment)cGroup_1_0.eContents().get(2);\n\t\tprivate final RuleCall cLowerBigDecimalTypeParserRuleCall_1_0_2_0 = (RuleCall)cLowerAssignment_1_0_2.eContents().get(0);\n\t\tprivate final Keyword cFullStopFullStopFullStopKeyword_1_0_3 = (Keyword)cGroup_1_0.eContents().get(3);\n\t\tprivate final Assignment cUpperAssignment_1_0_4 = (Assignment)cGroup_1_0.eContents().get(4);\n\t\tprivate final RuleCall cUpperBigDecimalTypeParserRuleCall_1_0_4_0 = (RuleCall)cUpperAssignment_1_0_4.eContents().get(0);\n\t\tprivate final Keyword cRightCurlyBracketKeyword_1_0_5 = (Keyword)cGroup_1_0.eContents().get(5);\n\t\tprivate final Keyword cTypeKeyword_1_0_6 = (Keyword)cGroup_1_0.eContents().get(6);\n\t\tprivate final Assignment cRangeTypeAssignment_1_0_7 = (Assignment)cGroup_1_0.eContents().get(7);\n\t\tprivate final RuleCall cRangeTypeSTRINGTerminalRuleCall_1_0_7_0 = (RuleCall)cRangeTypeAssignment_1_0_7.eContents().get(0);\n\t\tprivate final Keyword cUnitsKeyword_1_0_8 = (Keyword)cGroup_1_0.eContents().get(8);\n\t\tprivate final Assignment cRangeUnitsAssignment_1_0_9 = (Assignment)cGroup_1_0.eContents().get(9);\n\t\tprivate final RuleCall cRangeUnitsSTRINGTerminalRuleCall_1_0_9_0 = (RuleCall)cRangeUnitsAssignment_1_0_9.eContents().get(0);\n\t\tprivate final Group cGroup_1_1 = (Group)cAlternatives_1.eContents().get(1);\n\t\tprivate final Keyword cValuesKeyword_1_1_0 = (Keyword)cGroup_1_1.eContents().get(0);\n\t\tprivate final Keyword cLeftCurlyBracketKeyword_1_1_1 = (Keyword)cGroup_1_1.eContents().get(1);\n\t\tprivate final Assignment cValuesAssignment_1_1_2 = (Assignment)cGroup_1_1.eContents().get(2);\n\t\tprivate final RuleCall cValuesSTRINGTerminalRuleCall_1_1_2_0 = (RuleCall)cValuesAssignment_1_1_2.eContents().get(0);\n\t\tprivate final Keyword cRightCurlyBracketKeyword_1_1_3 = (Keyword)cGroup_1_1.eContents().get(3);\n\t\tprivate final Keyword cRateKeyword_2_0 = (Keyword)cGroup_2.eContents().get(0);\n\t\tprivate final Assignment cRateAssignment_2_1 = (Assignment)cGroup_2.eContents().get(1);\n\t\tprivate final RuleCall cRateBigUnitValueParserRuleCall_2_1_0 = (RuleCall)cRateAssignment_2_1.eContents().get(0);\n\t\tprivate final Keyword cInitiationDelayKeyword_3_0 = (Keyword)cGroup_3.eContents().get(0);\n\t\tprivate final Assignment cDelayAssignment_3_1 = (Assignment)cGroup_3.eContents().get(1);\n\t\tprivate final RuleCall cDelayBigUnitValueParserRuleCall_3_1_0 = (RuleCall)cDelayAssignment_3_1.eContents().get(0);\n\t\tprivate final Keyword cCompletionDeadlineKeyword_4_0 = (Keyword)cGroup_4.eContents().get(0);\n\t\tprivate final Assignment cDeadlineAssignment_4_1 = (Assignment)cGroup_4.eContents().get(1);\n\t\tprivate final RuleCall cDeadlineBigUnitValueParserRuleCall_4_1_0 = (RuleCall)cDeadlineAssignment_4_1.eContents().get(0);\n\t\tprivate final Keyword cCompletionExceptionKeyword_5_0 = (Keyword)cGroup_5.eContents().get(0);\n\t\tprivate final Assignment cCompletionHandlingAssignment_5_1 = (Assignment)cGroup_5.eContents().get(1);\n\t\tprivate final RuleCall cCompletionHandlingSTRINGTerminalRuleCall_5_1_0 = (RuleCall)cCompletionHandlingAssignment_5_1.eContents().get(0);\n\t\tprivate final Keyword cVariablesKeyword_6_0 = (Keyword)cGroup_6.eContents().get(0);\n\t\tprivate final Assignment cVariablesAssignment_6_1 = (Assignment)cGroup_6.eContents().get(1);\n\t\tprivate final RuleCall cVariablesSTRINGTerminalRuleCall_6_1_0 = (RuleCall)cVariablesAssignment_6_1.eContents().get(0);\n\t\tprivate final Keyword cRelationshipKeyword_7_0 = (Keyword)cGroup_7.eContents().get(0);\n\t\tprivate final Assignment cRelationshipAssignment_7_1 = (Assignment)cGroup_7.eContents().get(1);\n\t\tprivate final RuleCall cRelationshipSTRINGTerminalRuleCall_7_1_0 = (RuleCall)cRelationshipAssignment_7_1.eContents().get(0);\n\t\tprivate final Keyword cMinResponseTimeKeyword_8_0 = (Keyword)cGroup_8.eContents().get(0);\n\t\tprivate final Assignment cMinResponseAssignment_8_1 = (Assignment)cGroup_8.eContents().get(1);\n\t\tprivate final RuleCall cMinResponseBigUnitValueParserRuleCall_8_1_0 = (RuleCall)cMinResponseAssignment_8_1.eContents().get(0);\n\t\tprivate final Keyword cMaxResponseTimeKeyword_9_0 = (Keyword)cGroup_9.eContents().get(0);\n\t\tprivate final Assignment cMaxResponseAssignment_9_1 = (Assignment)cGroup_9.eContents().get(1);\n\t\tprivate final RuleCall cMaxResponseBigUnitValueParserRuleCall_9_1_0 = (RuleCall)cMaxResponseAssignment_9_1.eContents().get(0);\n\t\tprivate final Keyword cFeedbackExceptionKeyword_10_0 = (Keyword)cGroup_10.eContents().get(0);\n\t\tprivate final Assignment cFeebackHandlingAssignment_10_1 = (Assignment)cGroup_10.eContents().get(1);\n\t\tprivate final RuleCall cFeebackHandlingSTRINGTerminalRuleCall_10_1_0 = (RuleCall)cFeebackHandlingAssignment_10_1.eContents().get(0);\n\t\tprivate final Keyword cReversedByKeyword_11_0 = (Keyword)cGroup_11.eContents().get(0);\n\t\tprivate final Assignment cReversedAssignment_11_1 = (Assignment)cGroup_11.eContents().get(1);\n\t\tprivate final RuleCall cReversedSTRINGTerminalRuleCall_11_1_0 = (RuleCall)cReversedAssignment_11_1.eContents().get(0);\n\t\tprivate final Keyword cReferencesKeyword_12_0 = (Keyword)cGroup_12.eContents().get(0);\n\t\tprivate final Assignment cReferencesAssignment_12_1 = (Assignment)cGroup_12.eContents().get(1);\n\t\tprivate final RuleCall cReferencesSTRINGTerminalRuleCall_12_1_0 = (RuleCall)cReferencesAssignment_12_1.eContents().get(0);\n\t\tprivate final Keyword cCommentsKeyword_13_0 = (Keyword)cGroup_13.eContents().get(0);\n\t\tprivate final Assignment cCommentsAssignment_13_1 = (Assignment)cGroup_13.eContents().get(1);\n\t\tprivate final RuleCall cCommentsSTRINGTerminalRuleCall_13_1_0 = (RuleCall)cCommentsAssignment_13_1.eContents().get(0);\n\t\tprivate final Keyword cContentsKeyword_14_0 = (Keyword)cGroup_14.eContents().get(0);\n\t\tprivate final Assignment cContentsAssignment_14_1 = (Assignment)cGroup_14.eContents().get(1);\n\t\tprivate final RuleCall cContentsSTRINGTerminalRuleCall_14_1_0 = (RuleCall)cContentsAssignment_14_1.eContents().get(0);\n\t\tprivate final Keyword cTriggeringKeyword_15_0 = (Keyword)cGroup_15.eContents().get(0);\n\t\tprivate final Assignment cTableAssignment_15_1 = (Assignment)cGroup_15.eContents().get(1);\n\t\tprivate final RuleCall cTableTriggerTableParserRuleCall_15_1_0 = (RuleCall)cTableAssignment_15_1.eContents().get(0);\n\t\t//\t{Output} (\"range\" \"{\" lower=BigDecimalType \"...\" upper=BigDecimalType \"}\" \"type\" rangeType=STRING \"units\"\n\t\t//\trangeUnits=STRING | \"values\" \"{\" values+=STRING* \"}\") (\"rate\" rate=BigUnitValue)? (\"initiation-delay\"\n\t\t//\tdelay=BigUnitValue)? (\"completion-deadline\" deadline=BigUnitValue)? (\"completion-exception\"\n\t\t//{Output} (\"range\" \"{\" lower=BigDecimalType \"...\" upper=BigDecimalType \"}\" \"type\" rangeType=STRING \"units\"\n\t\t//rangeUnits=STRING | \"values\" \"{\" values+=STRING* \"}\") (\"rate\" rate=BigUnitValue)? (\"initiation-delay\"\n\t\t//\"range\" \"{\" lower=BigDecimalType \"...\" upper=BigDecimalType \"}\" \"type\" rangeType=STRING \"units\" rangeUnits=STRING |\n\t\t//\"values\" \"{\" values+=STRING* \"}\"\n\t\tpublic Alternatives getAlternatives_1() { return cAlternatives_1; }\n\n\t\t//\"range\" \"{\" lower=BigDecimalType \"...\" upper=BigDecimalType \"}\" \"type\" rangeType=STRING \"units\" rangeUnits=STRING\n\t\tpublic Group getGroup_1_0() { return cGroup_1_0; }\n\t\tpublic Keyword getRangeKeyword_1_0_0() { return cRangeKeyword_1_0_0; }\n\n\t\t//\"{\"\n\t\tpublic Keyword getLeftCurlyBracketKeyword_1_0_1() { return cLeftCurlyBracketKeyword_1_0_1; }\n\n\t\t//lower=BigDecimalType\n\t\tpublic Assignment getLowerAssignment_1_0_2() { return cLowerAssignment_1_0_2; }\n\n\t\t//BigDecimalType\n\t\tpublic RuleCall getLowerBigDecimalTypeParserRuleCall_1_0_2_0() { return cLowerBigDecimalTypeParserRuleCall_1_0_2_0; }\n\n\t\t//\"...\"\n\t\tpublic Keyword getFullStopFullStopFullStopKeyword_1_0_3() { return cFullStopFullStopFullStopKeyword_1_0_3; }\n\n\t\t//upper=BigDecimalType\n\t\tpublic Assignment getUpperAssignment_1_0_4() { return cUpperAssignment_1_0_4; }\n\n\t\t//BigDecimalType\n\t\tpublic RuleCall getUpperBigDecimalTypeParserRuleCall_1_0_4_0() { return cUpperBigDecimalTypeParserRuleCall_1_0_4_0; }\n\n\t\t//\"}\"\n\t\tpublic Keyword getRightCurlyBracketKeyword_1_0_5() { return cRightCurlyBracketKeyword_1_0_5; }\n\n\t\t//\"type\"\n\t\tpublic Keyword getTypeKeyword_1_0_6() { return cTypeKeyword_1_0_6; }\n\t\t//rangeType=STRING\n\t\tpublic Assignment getRangeTypeAssignment_1_0_7() { return cRangeTypeAssignment_1_0_7; }\n\t\t//STRING\n\t\tpublic RuleCall getRangeTypeSTRINGTerminalRuleCall_1_0_7_0() { return cRangeTypeSTRINGTerminalRuleCall_1_0_7_0; }\n\t\t//\"units\"\n\t\tpublic Keyword getUnitsKeyword_1_0_8() { return cUnitsKeyword_1_0_8; }\n\n\t\t//rangeUnits=STRING\n\t\tpublic Assignment getRangeUnitsAssignment_1_0_9() { return cRangeUnitsAssignment_1_0_9; }\n\n\t\t//STRING\n\t\tpublic RuleCall getRangeUnitsSTRINGTerminalRuleCall_1_0_9_0() { return cRangeUnitsSTRINGTerminalRuleCall_1_0_9_0; }\n\n\t\t//\"values\" \"{\" values+=STRING* \"}\"\n\t\tpublic Group getGroup_1_1() { return cGroup_1_1; }\n\n\t\t//\"values\"\n\t\tpublic Keyword getValuesKeyword_1_1_0() { return cValuesKeyword_1_1_0; }\n\n\t\t//\"{\"\n\t\tpublic Keyword getLeftCurlyBracketKeyword_1_1_1() { return cLeftCurlyBracketKeyword_1_1_1; }\n\t\t//values+=STRING*\n\t\tpublic Assignment getValuesAssignment_1_1_2() { return cValuesAssignment_1_1_2; }\n\t\t//STRING\n\t\tpublic RuleCall getValuesSTRINGTerminalRuleCall_1_1_2_0() { return cValuesSTRINGTerminalRuleCall_1_1_2_0; }\n\t\t//\"}\"\n\t\tpublic Keyword getRightCurlyBracketKeyword_1_1_3() { return cRightCurlyBracketKeyword_1_1_3; }\n\t\tpublic Group getGroup_2() { return cGroup_2; }\n\t\tpublic Keyword getRateKeyword_2_0() { return cRateKeyword_2_0; }\n\t\tpublic Assignment getRateAssignment_2_1() { return cRateAssignment_2_1; }\n\t\tpublic RuleCall getRateBigUnitValueParserRuleCall_2_1_0() { return cRateBigUnitValueParserRuleCall_2_1_0; }\n\t\tpublic Group getGroup_3() { return cGroup_3; }\n\t\tpublic Keyword getInitiationDelayKeyword_3_0() { return cInitiationDelayKeyword_3_0; }\n\t\tpublic Assignment getDelayAssignment_3_1() { return cDelayAssignment_3_1; }\n\t\tpublic RuleCall getDelayBigUnitValueParserRuleCall_3_1_0() { return cDelayBigUnitValueParserRuleCall_3_1_0; }\n\t\tpublic Group getGroup_4() { return cGroup_4; }\n\t\tpublic Keyword getCompletionDeadlineKeyword_4_0() { return cCompletionDeadlineKeyword_4_0; }\n\t\tpublic Assignment getDeadlineAssignment_4_1() { return cDeadlineAssignment_4_1; }\n\t\tpublic RuleCall getDeadlineBigUnitValueParserRuleCall_4_1_0() { return cDeadlineBigUnitValueParserRuleCall_4_1_0; }\n\t\tpublic Group getGroup_5() { return cGroup_5; }\n\t\tpublic Keyword getCompletionExceptionKeyword_5_0() { return cCompletionExceptionKeyword_5_0; }\n\t\tpublic Assignment getCompletionHandlingAssignment_5_1() { return cCompletionHandlingAssignment_5_1; }\n\t\tpublic RuleCall getCompletionHandlingSTRINGTerminalRuleCall_5_1_0() { return cCompletionHandlingSTRINGTerminalRuleCall_5_1_0; }\n\t\tpublic Group getGroup_6() { return cGroup_6; }\n\t\tpublic Keyword getVariablesKeyword_6_0() { return cVariablesKeyword_6_0; }\n\t\tpublic Assignment getVariablesAssignment_6_1() { return cVariablesAssignment_6_1; }\n\t\tpublic RuleCall getVariablesSTRINGTerminalRuleCall_6_1_0() { return cVariablesSTRINGTerminalRuleCall_6_1_0; }\n\t\tpublic Group getGroup_7() { return cGroup_7; }\n\t\tpublic Keyword getRelationshipKeyword_7_0() { return cRelationshipKeyword_7_0; }\n\t\tpublic Assignment getRelationshipAssignment_7_1() { return cRelationshipAssignment_7_1; }\n\t\tpublic RuleCall getRelationshipSTRINGTerminalRuleCall_7_1_0() { return cRelationshipSTRINGTerminalRuleCall_7_1_0; }\n\t\tpublic Group getGroup_8() { return cGroup_8; }\n\t\tpublic Keyword getMinResponseTimeKeyword_8_0() { return cMinResponseTimeKeyword_8_0; }\n\t\tpublic Assignment getMinResponseAssignment_8_1() { return cMinResponseAssignment_8_1; }\n\t\tpublic RuleCall getMinResponseBigUnitValueParserRuleCall_8_1_0() { return cMinResponseBigUnitValueParserRuleCall_8_1_0; }\n\t\tpublic Group getGroup_9() { return cGroup_9; }\n\t\tpublic Keyword getMaxResponseTimeKeyword_9_0() { return cMaxResponseTimeKeyword_9_0; }\n\t\tpublic Assignment getMaxResponseAssignment_9_1() { return cMaxResponseAssignment_9_1; }\n\t\tpublic RuleCall getMaxResponseBigUnitValueParserRuleCall_9_1_0() { return cMaxResponseBigUnitValueParserRuleCall_9_1_0; }\n\t\tpublic Group getGroup_10() { return cGroup_10; }\n\t\tpublic Keyword getFeedbackExceptionKeyword_10_0() { return cFeedbackExceptionKeyword_10_0; }\n\t\tpublic Assignment getFeebackHandlingAssignment_10_1() { return cFeebackHandlingAssignment_10_1; }\n\t\tpublic RuleCall getFeebackHandlingSTRINGTerminalRuleCall_10_1_0() { return cFeebackHandlingSTRINGTerminalRuleCall_10_1_0; }\n\t\tpublic Group getGroup_11() { return cGroup_11; }\n\t\tpublic Keyword getReversedByKeyword_11_0() { return cReversedByKeyword_11_0; }\n\t\tpublic Assignment getReversedAssignment_11_1() { return cReversedAssignment_11_1; }\n\t\tpublic RuleCall getReversedSTRINGTerminalRuleCall_11_1_0() { return cReversedSTRINGTerminalRuleCall_11_1_0; }\n\t\tpublic Group getGroup_12() { return cGroup_12; }\n\t\tpublic Keyword getReferencesKeyword_12_0() { return cReferencesKeyword_12_0; }\n\t\tpublic Assignment getReferencesAssignment_12_1() { return cReferencesAssignment_12_1; }\n\t\tpublic RuleCall getReferencesSTRINGTerminalRuleCall_12_1_0() { return cReferencesSTRINGTerminalRuleCall_12_1_0; }\n\t\tpublic Group getGroup_13() { return cGroup_13; }\n\t\tpublic Keyword getCommentsKeyword_13_0() { return cCommentsKeyword_13_0; }\n\t\tpublic Assignment getCommentsAssignment_13_1() { return cCommentsAssignment_13_1; }\n\t\tpublic RuleCall getCommentsSTRINGTerminalRuleCall_13_1_0() { return cCommentsSTRINGTerminalRuleCall_13_1_0; }\n\t\tpublic Group getGroup_14() { return cGroup_14; }\n\t\tpublic Keyword getContentsKeyword_14_0() { return cContentsKeyword_14_0; }\n\t\tpublic Assignment getContentsAssignment_14_1() { return cContentsAssignment_14_1; }\n\t\tpublic RuleCall getContentsSTRINGTerminalRuleCall_14_1_0() { return cContentsSTRINGTerminalRuleCall_14_1_0; }\n\t\tpublic Group getGroup_15() { return cGroup_15; }\n\t\tpublic Keyword getTriggeringKeyword_15_0() { return cTriggeringKeyword_15_0; }\n\t\tpublic Assignment getTableAssignment_15_1() { return cTableAssignment_15_1; }\n\t\tpublic RuleCall getTableTriggerTableParserRuleCall_15_1_0() { return cTableTriggerTableParserRuleCall_15_1_0; }\n\t\tprivate final Alternatives cAlternatives_1 = (Alternatives)cGroup.eContents().get(1);\n\t\tprivate final Group cGroup_1_0 = (Group)cAlternatives_1.eContents().get(0);\n\t\tprivate final Keyword cRangeKeyword_1_0_0 = (Keyword)cGroup_1_0.eContents().get(0);\n\t\tprivate final Keyword cLeftCurlyBracketKeyword_1_0_1 = (Keyword)cGroup_1_0.eContents().get(1);\n\t\tprivate final Assignment cLowerAssignment_1_0_2 = (Assignment)cGroup_1_0.eContents().get(2);\n\t\tprivate final RuleCall cLowerBigDecimalTypeParserRuleCall_1_0_2_0 = (RuleCall)cLowerAssignment_1_0_2.eContents().get(0);\n\t\tprivate final Keyword cFullStopFullStopFullStopKeyword_1_0_3 = (Keyword)cGroup_1_0.eContents().get(3);\n\t\tprivate final Assignment cUpperAssignment_1_0_4 = (Assignment)cGroup_1_0.eContents().get(4);\n\t\tprivate final RuleCall cUpperBigDecimalTypeParserRuleCall_1_0_4_0 = (RuleCall)cUpperAssignment_1_0_4.eContents().get(0);\n\t\tprivate final Keyword cRightCurlyBracketKeyword_1_0_5 = (Keyword)cGroup_1_0.eContents().get(5);\n\t\tprivate final Keyword cTypeKeyword_1_0_6 = (Keyword)cGroup_1_0.eContents().get(6);\n\t\tprivate final Assignment cRangeTypeAssignment_1_0_7 = (Assignment)cGroup_1_0.eContents().get(7);\n\t\tprivate final RuleCall cRangeTypeSTRINGTerminalRuleCall_1_0_7_0 = (RuleCall)cRangeTypeAssignment_1_0_7.eContents().get(0);\n\t\tprivate final Keyword cUnitsKeyword_1_0_8 = (Keyword)cGroup_1_0.eContents().get(8);\n\t\tprivate final Assignment cRangeUnitsAssignment_1_0_9 = (Assignment)cGroup_1_0.eContents().get(9);\n\t\tprivate final RuleCall cRangeUnitsSTRINGTerminalRuleCall_1_0_9_0 = (RuleCall)cRangeUnitsAssignment_1_0_9.eContents().get(0);\n\t\tprivate final Group cGroup_1_1 = (Group)cAlternatives_1.eContents().get(1);\n\t\tprivate final Keyword cValuesKeyword_1_1_0 = (Keyword)cGroup_1_1.eContents().get(0);\n\t\tprivate final Keyword cLeftCurlyBracketKeyword_1_1_1 = (Keyword)cGroup_1_1.eContents().get(1);\n\t\tprivate final Assignment cValuesAssignment_1_1_2 = (Assignment)cGroup_1_1.eContents().get(2);\n\t\tprivate final RuleCall cValuesSTRINGTerminalRuleCall_1_1_2_0 = (RuleCall)cValuesAssignment_1_1_2.eContents().get(0);\n\t\tprivate final Keyword cRightCurlyBracketKeyword_1_1_3 = (Keyword)cGroup_1_1.eContents().get(3);\n\t\tprivate final Keyword cRateKeyword_2_0 = (Keyword)cGroup_2.eContents().get(0);\n\t\tprivate final Assignment cRateAssignment_2_1 = (Assignment)cGroup_2.eContents().get(1);\n\t\tprivate final RuleCall cRateBigUnitValueParserRuleCall_2_1_0 = (RuleCall)cRateAssignment_2_1.eContents().get(0);\n\t\tprivate final Keyword cVariablesKeyword_3_0 = (Keyword)cGroup_3.eContents().get(0);\n\t\tprivate final Assignment cVariablesAssignment_3_1 = (Assignment)cGroup_3.eContents().get(1);\n\t\tprivate final RuleCall cVariablesSTRINGTerminalRuleCall_3_1_0 = (RuleCall)cVariablesAssignment_3_1.eContents().get(0);\n\t\tprivate final Keyword cReferencesKeyword_4_0 = (Keyword)cGroup_4.eContents().get(0);\n\t\tprivate final Assignment cReferencesAssignment_4_1 = (Assignment)cGroup_4.eContents().get(1);\n\t\tprivate final RuleCall cReferencesSTRINGTerminalRuleCall_4_1_0 = (RuleCall)cReferencesAssignment_4_1.eContents().get(0);\n\t\tprivate final Keyword cCommentsKeyword_5_0 = (Keyword)cGroup_5.eContents().get(0);\n\t\tprivate final Assignment cCommentsAssignment_5_1 = (Assignment)cGroup_5.eContents().get(1);\n\t\tprivate final RuleCall cCommentsSTRINGTerminalRuleCall_5_1_0 = (RuleCall)cCommentsAssignment_5_1.eContents().get(0);\n\t\t//\t{Input} (\"range\" \"{\" lower=BigDecimalType \"...\" upper=BigDecimalType \"}\" \"type\" rangeType=STRING \"units\"\n\t\t//\trangeUnits=STRING | \"values\" \"{\" values+=STRING* \"}\") (\"rate\" rate=BigUnitValue)? (\"variables\" variables=STRING)?\n\t\t//\t(\"references\" references=STRING)? (\"comments\" comments=STRING)?;\n\t\t//{Input} (\"range\" \"{\" lower=BigDecimalType \"...\" upper=BigDecimalType \"}\" \"type\" rangeType=STRING \"units\"\n\t\t//rangeUnits=STRING | \"values\" \"{\" values+=STRING* \"}\") (\"rate\" rate=BigUnitValue)? (\"variables\" variables=STRING)?\n\t\t//(\"references\" references=STRING)? (\"comments\" comments=STRING)?\n\t\t//\"range\" \"{\" lower=BigDecimalType \"...\" upper=BigDecimalType \"}\" \"type\" rangeType=STRING \"units\" rangeUnits=STRING |\n\t\t//\"values\" \"{\" values+=STRING* \"}\"\n\t\tpublic Alternatives getAlternatives_1() { return cAlternatives_1; }\n\n\t\t//\"range\" \"{\" lower=BigDecimalType \"...\" upper=BigDecimalType \"}\" \"type\" rangeType=STRING \"units\" rangeUnits=STRING\n\t\tpublic Group getGroup_1_0() { return cGroup_1_0; }\n\t\tpublic Keyword getRangeKeyword_1_0_0() { return cRangeKeyword_1_0_0; }\n\t\t//\"{\"\n\t\tpublic Keyword getLeftCurlyBracketKeyword_1_0_1() { return cLeftCurlyBracketKeyword_1_0_1; }\n\t\t//lower=BigDecimalType\n\t\tpublic Assignment getLowerAssignment_1_0_2() { return cLowerAssignment_1_0_2; }\n\t\t//BigDecimalType\n\t\tpublic RuleCall getLowerBigDecimalTypeParserRuleCall_1_0_2_0() { return cLowerBigDecimalTypeParserRuleCall_1_0_2_0; }\n\t\t//\"...\"\n\t\tpublic Keyword getFullStopFullStopFullStopKeyword_1_0_3() { return cFullStopFullStopFullStopKeyword_1_0_3; }\n\t\t//upper=BigDecimalType\n\t\tpublic Assignment getUpperAssignment_1_0_4() { return cUpperAssignment_1_0_4; }\n\t\t//BigDecimalType\n\t\tpublic RuleCall getUpperBigDecimalTypeParserRuleCall_1_0_4_0() { return cUpperBigDecimalTypeParserRuleCall_1_0_4_0; }\n\t\t//\"}\"\n\t\tpublic Keyword getRightCurlyBracketKeyword_1_0_5() { return cRightCurlyBracketKeyword_1_0_5; }\n\t\t//\"type\"\n\t\tpublic Keyword getTypeKeyword_1_0_6() { return cTypeKeyword_1_0_6; }\n\t\t//rangeType=STRING\n\t\tpublic Assignment getRangeTypeAssignment_1_0_7() { return cRangeTypeAssignment_1_0_7; }\n\t\tpublic RuleCall getRangeTypeSTRINGTerminalRuleCall_1_0_7_0() { return cRangeTypeSTRINGTerminalRuleCall_1_0_7_0; }\n\t\t//\"units\"\n\t\tpublic Keyword getUnitsKeyword_1_0_8() { return cUnitsKeyword_1_0_8; }\n\t\t//rangeUnits=STRING\n\t\tpublic Assignment getRangeUnitsAssignment_1_0_9() { return cRangeUnitsAssignment_1_0_9; }\n\t\t//STRING\n\t\tpublic RuleCall getRangeUnitsSTRINGTerminalRuleCall_1_0_9_0() { return cRangeUnitsSTRINGTerminalRuleCall_1_0_9_0; }\n\t\t//\"values\" \"{\" values+=STRING* \"}\"\n\t\tpublic Group getGroup_1_1() { return cGroup_1_1; }\n\t\t//\"values\"\n\t\tpublic Keyword getValuesKeyword_1_1_0() { return cValuesKeyword_1_1_0; }\n\t\t//\"{\"\n\t\tpublic Keyword getLeftCurlyBracketKeyword_1_1_1() { return cLeftCurlyBracketKeyword_1_1_1; }\n\t\t//values+=STRING*\n\t\tpublic Assignment getValuesAssignment_1_1_2() { return cValuesAssignment_1_1_2; }\n\t\t//STRING\n\t\tpublic RuleCall getValuesSTRINGTerminalRuleCall_1_1_2_0() { return cValuesSTRINGTerminalRuleCall_1_1_2_0; }\n\t\t//\"}\"\n\t\tpublic Keyword getRightCurlyBracketKeyword_1_1_3() { return cRightCurlyBracketKeyword_1_1_3; }\n\t\t//(\"rate\" rate=BigUnitValue)?\n\t\tpublic Group getGroup_2() { return cGroup_2; }\n\t\t//\"rate\"\n\t\tpublic Keyword getRateKeyword_2_0() { return cRateKeyword_2_0; }\n\t\t//rate=BigUnitValue\n\t\tpublic Assignment getRateAssignment_2_1() { return cRateAssignment_2_1; }\n\t\tpublic RuleCall getRateBigUnitValueParserRuleCall_2_1_0() { return cRateBigUnitValueParserRuleCall_2_1_0; }\n\t\t//(\"variables\" variables=STRING)?\n\t\tpublic Group getGroup_3() { return cGroup_3; }\n\t\t//\"variables\"\n\t\tpublic Keyword getVariablesKeyword_3_0() { return cVariablesKeyword_3_0; }\n\t\t//variables=STRING\n\t\tpublic Assignment getVariablesAssignment_3_1() { return cVariablesAssignment_3_1; }\n\t\t//STRING\n\t\tpublic RuleCall getVariablesSTRINGTerminalRuleCall_3_1_0() { return cVariablesSTRINGTerminalRuleCall_3_1_0; }\n\t\tpublic Group getGroup_4() { return cGroup_4; }\n\t\tpublic Keyword getReferencesKeyword_4_0() { return cReferencesKeyword_4_0; }\n\t\tpublic Assignment getReferencesAssignment_4_1() { return cReferencesAssignment_4_1; }\n\t\tpublic RuleCall getReferencesSTRINGTerminalRuleCall_4_1_0() { return cReferencesSTRINGTerminalRuleCall_4_1_0; }\n\t\tpublic Group getGroup_5() { return cGroup_5; }\n\t\tpublic Keyword getCommentsKeyword_5_0() { return cCommentsKeyword_5_0; }\n\t\tpublic Assignment getCommentsAssignment_5_1() { return cCommentsAssignment_5_1; }\n\t\tpublic RuleCall getCommentsSTRINGTerminalRuleCall_5_1_0() { return cCommentsSTRINGTerminalRuleCall_5_1_0; }\n\t//\t{Output} (\"range\" \"{\" lower=BigDecimalType \"...\" upper=BigDecimalType \"}\" \"type\" rangeType=STRING \"units\"\n\t//\trangeUnits=STRING | \"values\" \"{\" values+=STRING* \"}\") (\"rate\" rate=BigUnitValue)? (\"initiation-delay\"\n\t//\tdelay=BigUnitValue)? (\"completion-deadline\" deadline=BigUnitValue)? (\"completion-exception\"\n\t//\t{Input} (\"range\" \"{\" lower=BigDecimalType \"...\" upper=BigDecimalType \"}\" \"type\" rangeType=STRING \"units\"\n\t//\trangeUnits=STRING | \"values\" \"{\" values+=STRING* \"}\") (\"rate\" rate=BigUnitValue)? (\"variables\" variables=STRING)?\n\t//\t(\"references\" references=STRING)? (\"comments\" comments=STRING)?;", "old_methods": [ { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cAlternatives_1;", "signature": "Alternatives getAlternatives_1()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cGroup_1_0;", "signature": "Group getGroup_1_0()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cRangeKeyword_1_0_0;", "signature": "Keyword getRangeKeyword_1_0_0()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cLeftCurlyBracketKeyword_1_0_1;", "signature": "Keyword getLeftCurlyBracketKeyword_1_0_1()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cLowerAssignment_1_0_2;", "signature": "Assignment getLowerAssignment_1_0_2()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cLowerBigDecimalTypeParserRuleCall_1_0_2_0;", "signature": "RuleCall getLowerBigDecimalTypeParserRuleCall_1_0_2_0()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cFullStopFullStopFullStopKeyword_1_0_3;", "signature": "Keyword getFullStopFullStopFullStopKeyword_1_0_3()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cUpperAssignment_1_0_4;", "signature": "Assignment getUpperAssignment_1_0_4()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cUpperBigDecimalTypeParserRuleCall_1_0_4_0;", "signature": "RuleCall getUpperBigDecimalTypeParserRuleCall_1_0_4_0()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cRightCurlyBracketKeyword_1_0_5;", "signature": "Keyword getRightCurlyBracketKeyword_1_0_5()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cTypeKeyword_1_0_6;", "signature": "Keyword getTypeKeyword_1_0_6()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cRangeTypeAssignment_1_0_7;", "signature": "Assignment getRangeTypeAssignment_1_0_7()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cRangeTypeSTRINGTerminalRuleCall_1_0_7_0;", "signature": "RuleCall getRangeTypeSTRINGTerminalRuleCall_1_0_7_0()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cUnitsKeyword_1_0_8;", "signature": "Keyword getUnitsKeyword_1_0_8()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cRangeUnitsAssignment_1_0_9;", "signature": "Assignment getRangeUnitsAssignment_1_0_9()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cRangeUnitsSTRINGTerminalRuleCall_1_0_9_0;", "signature": "RuleCall getRangeUnitsSTRINGTerminalRuleCall_1_0_9_0()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cGroup_1_1;", "signature": "Group getGroup_1_1()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cValuesKeyword_1_1_0;", "signature": "Keyword getValuesKeyword_1_1_0()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cLeftCurlyBracketKeyword_1_1_1;", "signature": "Keyword getLeftCurlyBracketKeyword_1_1_1()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cValuesAssignment_1_1_2;", "signature": "Assignment getValuesAssignment_1_1_2()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cValuesSTRINGTerminalRuleCall_1_1_2_0;", "signature": "RuleCall getValuesSTRINGTerminalRuleCall_1_1_2_0()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cRightCurlyBracketKeyword_1_1_3;", "signature": "Keyword getRightCurlyBracketKeyword_1_1_3()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cGroup_2;", "signature": "Group getGroup_2()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cRateKeyword_2_0;", "signature": "Keyword getRateKeyword_2_0()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cRateAssignment_2_1;", "signature": "Assignment getRateAssignment_2_1()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cRateBigUnitValueParserRuleCall_2_1_0;", "signature": "RuleCall getRateBigUnitValueParserRuleCall_2_1_0()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cGroup_3;", "signature": "Group getGroup_3()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cInitiationDelayKeyword_3_0;", "signature": "Keyword getInitiationDelayKeyword_3_0()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cDelayAssignment_3_1;", "signature": "Assignment getDelayAssignment_3_1()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cDelayBigUnitValueParserRuleCall_3_1_0;", "signature": "RuleCall getDelayBigUnitValueParserRuleCall_3_1_0()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cGroup_4;", "signature": "Group getGroup_4()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cCompletionDeadlineKeyword_4_0;", "signature": "Keyword getCompletionDeadlineKeyword_4_0()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cDeadlineAssignment_4_1;", "signature": "Assignment getDeadlineAssignment_4_1()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cDeadlineBigUnitValueParserRuleCall_4_1_0;", "signature": "RuleCall getDeadlineBigUnitValueParserRuleCall_4_1_0()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cGroup_5;", "signature": "Group getGroup_5()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cCompletionExceptionKeyword_5_0;", "signature": "Keyword getCompletionExceptionKeyword_5_0()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cCompletionHandlingAssignment_5_1;", "signature": "Assignment getCompletionHandlingAssignment_5_1()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cCompletionHandlingSTRINGTerminalRuleCall_5_1_0;", "signature": "RuleCall getCompletionHandlingSTRINGTerminalRuleCall_5_1_0()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cGroup_6;", "signature": "Group getGroup_6()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cVariablesKeyword_6_0;", "signature": "Keyword getVariablesKeyword_6_0()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cVariablesAssignment_6_1;", "signature": "Assignment getVariablesAssignment_6_1()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cVariablesSTRINGTerminalRuleCall_6_1_0;", "signature": "RuleCall getVariablesSTRINGTerminalRuleCall_6_1_0()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cGroup_7;", "signature": "Group getGroup_7()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cRelationshipKeyword_7_0;", "signature": "Keyword getRelationshipKeyword_7_0()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cRelationshipAssignment_7_1;", "signature": "Assignment getRelationshipAssignment_7_1()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cRelationshipSTRINGTerminalRuleCall_7_1_0;", "signature": "RuleCall getRelationshipSTRINGTerminalRuleCall_7_1_0()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cGroup_8;", "signature": "Group getGroup_8()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cMinResponseTimeKeyword_8_0;", "signature": "Keyword getMinResponseTimeKeyword_8_0()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cMinResponseAssignment_8_1;", "signature": "Assignment getMinResponseAssignment_8_1()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cMinResponseBigUnitValueParserRuleCall_8_1_0;", "signature": "RuleCall getMinResponseBigUnitValueParserRuleCall_8_1_0()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cGroup_9;", "signature": "Group getGroup_9()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cMaxResponseTimeKeyword_9_0;", "signature": "Keyword getMaxResponseTimeKeyword_9_0()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cMaxResponseAssignment_9_1;", "signature": "Assignment getMaxResponseAssignment_9_1()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cMaxResponseBigUnitValueParserRuleCall_9_1_0;", "signature": "RuleCall getMaxResponseBigUnitValueParserRuleCall_9_1_0()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cGroup_10;", "signature": "Group getGroup_10()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cFeedbackExceptionKeyword_10_0;", "signature": "Keyword getFeedbackExceptionKeyword_10_0()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cFeebackHandlingAssignment_10_1;", "signature": "Assignment getFeebackHandlingAssignment_10_1()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cFeebackHandlingSTRINGTerminalRuleCall_10_1_0;", "signature": "RuleCall getFeebackHandlingSTRINGTerminalRuleCall_10_1_0()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cGroup_11;", "signature": "Group getGroup_11()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cReversedByKeyword_11_0;", "signature": "Keyword getReversedByKeyword_11_0()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cReversedAssignment_11_1;", "signature": "Assignment getReversedAssignment_11_1()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cReversedSTRINGTerminalRuleCall_11_1_0;", "signature": "RuleCall getReversedSTRINGTerminalRuleCall_11_1_0()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cGroup_12;", "signature": "Group getGroup_12()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cReferencesKeyword_12_0;", "signature": "Keyword getReferencesKeyword_12_0()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cReferencesAssignment_12_1;", "signature": "Assignment getReferencesAssignment_12_1()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cReferencesSTRINGTerminalRuleCall_12_1_0;", "signature": "RuleCall getReferencesSTRINGTerminalRuleCall_12_1_0()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cGroup_13;", "signature": "Group getGroup_13()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cCommentsKeyword_13_0;", "signature": "Keyword getCommentsKeyword_13_0()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cCommentsAssignment_13_1;", "signature": "Assignment getCommentsAssignment_13_1()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cCommentsSTRINGTerminalRuleCall_13_1_0;", "signature": "RuleCall getCommentsSTRINGTerminalRuleCall_13_1_0()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cGroup_14;", "signature": "Group getGroup_14()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cContentsKeyword_14_0;", "signature": "Keyword getContentsKeyword_14_0()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cContentsAssignment_14_1;", "signature": "Assignment getContentsAssignment_14_1()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cContentsSTRINGTerminalRuleCall_14_1_0;", "signature": "RuleCall getContentsSTRINGTerminalRuleCall_14_1_0()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cGroup_15;", "signature": "Group getGroup_15()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cTriggeringKeyword_15_0;", "signature": "Keyword getTriggeringKeyword_15_0()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cTableAssignment_15_1;", "signature": "Assignment getTableAssignment_15_1()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cTableTriggerTableParserRuleCall_15_1_0;", "signature": "RuleCall getTableTriggerTableParserRuleCall_15_1_0()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cAlternatives_1;", "signature": "Alternatives getAlternatives_1()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cGroup_1_0;", "signature": "Group getGroup_1_0()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cRangeKeyword_1_0_0;", "signature": "Keyword getRangeKeyword_1_0_0()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cLeftCurlyBracketKeyword_1_0_1;", "signature": "Keyword getLeftCurlyBracketKeyword_1_0_1()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cLowerAssignment_1_0_2;", "signature": "Assignment getLowerAssignment_1_0_2()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cLowerBigDecimalTypeParserRuleCall_1_0_2_0;", "signature": "RuleCall getLowerBigDecimalTypeParserRuleCall_1_0_2_0()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cFullStopFullStopFullStopKeyword_1_0_3;", "signature": "Keyword getFullStopFullStopFullStopKeyword_1_0_3()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cUpperAssignment_1_0_4;", "signature": "Assignment getUpperAssignment_1_0_4()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cUpperBigDecimalTypeParserRuleCall_1_0_4_0;", "signature": "RuleCall getUpperBigDecimalTypeParserRuleCall_1_0_4_0()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cRightCurlyBracketKeyword_1_0_5;", "signature": "Keyword getRightCurlyBracketKeyword_1_0_5()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cTypeKeyword_1_0_6;", "signature": "Keyword getTypeKeyword_1_0_6()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cRangeTypeAssignment_1_0_7;", "signature": "Assignment getRangeTypeAssignment_1_0_7()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cRangeTypeSTRINGTerminalRuleCall_1_0_7_0;", "signature": "RuleCall getRangeTypeSTRINGTerminalRuleCall_1_0_7_0()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cUnitsKeyword_1_0_8;", "signature": "Keyword getUnitsKeyword_1_0_8()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cRangeUnitsAssignment_1_0_9;", "signature": "Assignment getRangeUnitsAssignment_1_0_9()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cRangeUnitsSTRINGTerminalRuleCall_1_0_9_0;", "signature": "RuleCall getRangeUnitsSTRINGTerminalRuleCall_1_0_9_0()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cGroup_1_1;", "signature": "Group getGroup_1_1()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cValuesKeyword_1_1_0;", "signature": "Keyword getValuesKeyword_1_1_0()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cLeftCurlyBracketKeyword_1_1_1;", "signature": "Keyword getLeftCurlyBracketKeyword_1_1_1()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cValuesAssignment_1_1_2;", "signature": "Assignment getValuesAssignment_1_1_2()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cValuesSTRINGTerminalRuleCall_1_1_2_0;", "signature": "RuleCall getValuesSTRINGTerminalRuleCall_1_1_2_0()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cRightCurlyBracketKeyword_1_1_3;", "signature": "Keyword getRightCurlyBracketKeyword_1_1_3()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cGroup_2;", "signature": "Group getGroup_2()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cRateKeyword_2_0;", "signature": "Keyword getRateKeyword_2_0()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cRateAssignment_2_1;", "signature": "Assignment getRateAssignment_2_1()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cRateBigUnitValueParserRuleCall_2_1_0;", "signature": "RuleCall getRateBigUnitValueParserRuleCall_2_1_0()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cGroup_3;", "signature": "Group getGroup_3()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cVariablesKeyword_3_0;", "signature": "Keyword getVariablesKeyword_3_0()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cVariablesAssignment_3_1;", "signature": "Assignment getVariablesAssignment_3_1()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cVariablesSTRINGTerminalRuleCall_3_1_0;", "signature": "RuleCall getVariablesSTRINGTerminalRuleCall_3_1_0()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cGroup_4;", "signature": "Group getGroup_4()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cReferencesKeyword_4_0;", "signature": "Keyword getReferencesKeyword_4_0()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cReferencesAssignment_4_1;", "signature": "Assignment getReferencesAssignment_4_1()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cReferencesSTRINGTerminalRuleCall_4_1_0;", "signature": "RuleCall getReferencesSTRINGTerminalRuleCall_4_1_0()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cGroup_5;", "signature": "Group getGroup_5()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cCommentsKeyword_5_0;", "signature": "Keyword getCommentsKeyword_5_0()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cCommentsAssignment_5_1;", "signature": "Assignment getCommentsAssignment_5_1()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/services/StateSpecificationGrammarAccess.java", "implementation": "return cCommentsSTRINGTerminalRuleCall_5_1_0;", "signature": "RuleCall getCommentsSTRINGTerminalRuleCall_5_1_0()" } ], "patch": "@@ -922,101 +922,181 @@ public class TriggerTableElements extends AbstractParserRuleElementFinder {\n \t\tpublic RuleCall getRowsTriggerParserRuleCall_2_0() { return cRowsTriggerParserRuleCall_2_0; }\n \t}\n \n+\tpublic class ValueRangeElements extends AbstractParserRuleElementFinder {\n+\t\tprivate final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), \"ValueRange\");\n+\t\tprivate final Group cGroup = (Group)rule.eContents().get(1);\n+\t\tprivate final Keyword cLeftCurlyBracketKeyword_0 = (Keyword)cGroup.eContents().get(0);\n+\t\tprivate final Assignment cLowerAssignment_1 = (Assignment)cGroup.eContents().get(1);\n+\t\tprivate final RuleCall cLowerBigDecimalTypeParserRuleCall_1_0 = (RuleCall)cLowerAssignment_1.eContents().get(0);\n+\t\tprivate final Keyword cFullStopFullStopFullStopKeyword_2 = (Keyword)cGroup.eContents().get(2);\n+\t\tprivate final Assignment cUpperAssignment_3 = (Assignment)cGroup.eContents().get(3);\n+\t\tprivate final RuleCall cUpperBigDecimalTypeParserRuleCall_3_0 = (RuleCall)cUpperAssignment_3.eContents().get(0);\n+\t\tprivate final Keyword cRightCurlyBracketKeyword_4 = (Keyword)cGroup.eContents().get(4);\n+\t\tprivate final Keyword cTypeKeyword_5 = (Keyword)cGroup.eContents().get(5);\n+\t\tprivate final Assignment cRangeTypeAssignment_6 = (Assignment)cGroup.eContents().get(6);\n+\t\tprivate final RuleCall cRangeTypeSTRINGTerminalRuleCall_6_0 = (RuleCall)cRangeTypeAssignment_6.eContents().get(0);\n+\t\tprivate final Keyword cUnitsKeyword_7 = (Keyword)cGroup.eContents().get(7);\n+\t\tprivate final Assignment cRangeUnitsAssignment_8 = (Assignment)cGroup.eContents().get(8);\n+\t\tprivate final RuleCall cRangeUnitsSTRINGTerminalRuleCall_8_0 = (RuleCall)cRangeUnitsAssignment_8.eContents().get(0);\n+\t\tprivate final Keyword cRightCurlyBracketKeyword_9 = (Keyword)cGroup.eContents().get(9);\n+\t\t\n+\t\t//ValueRange:\n+\t\t//\t\"{\" lower=BigDecimalType \"...\" upper=BigDecimalType \"}\" \"type\" rangeType=STRING \"units\" rangeUnits=STRING \"}\";\n+\t\tpublic ParserRule getRule() { return rule; }\n+\n+\t\t//\"{\" lower=BigDecimalType \"...\" upper=BigDecimalType \"}\" \"type\" rangeType=STRING \"units\" rangeUnits=STRING \"}\"\n+\t\tpublic Group getGroup() { return cGroup; }\n+\n+\t\t//\"{\"\n+\t\tpublic Keyword getLeftCurlyBracketKeyword_0() { return cLeftCurlyBracketKeyword_0; }\n+\n+\t\t//lower=BigDecimalType\n+\t\tpublic Assignment getLowerAssignment_1() { return cLowerAssignment_1; }\n+\n+\t\t//BigDecimalType\n+\t\tpublic RuleCall getLowerBigDecimalTypeParserRuleCall_1_0() { return cLowerBigDecimalTypeParserRuleCall_1_0; }\n+\n+\t\t//\"...\"\n+\t\tpublic Keyword getFullStopFullStopFullStopKeyword_2() { return cFullStopFullStopFullStopKeyword_2; }\n+\n+\t\t//upper=BigDecimalType\n+\t\tpublic Assignment getUpperAssignment_3() { return cUpperAssignment_3; }\n+\n+\t\t//BigDecimalType\n+\t\tpublic RuleCall getUpperBigDecimalTypeParserRuleCall_3_0() { return cUpperBigDecimalTypeParserRuleCall_3_0; }\n+\n+\t\t//\"}\"\n+\t\tpublic Keyword getRightCurlyBracketKeyword_4() { return cRightCurlyBracketKeyword_4; }\n+\n+\t\t//\"type\"\n+\t\tpublic Keyword getTypeKeyword_5() { return cTypeKeyword_5; }\n+\n+\t\t//rangeType=STRING\n+\t\tpublic Assignment getRangeTypeAssignment_6() { return cRangeTypeAssignment_6; }\n+\n+\t\t//STRING\n+\t\tpublic RuleCall getRangeTypeSTRINGTerminalRuleCall_6_0() { return cRangeTypeSTRINGTerminalRuleCall_6_0; }\n+\n+\t\t//\"units\"\n+\t\tpublic Keyword getUnitsKeyword_7() { return cUnitsKeyword_7; }\n+\n+\t\t//rangeUnits=STRING\n+\t\tpublic Assignment getRangeUnitsAssignment_8() { return cRangeUnitsAssignment_8; }\n+\n+\t\t//STRING\n+\t\tpublic RuleCall getRangeUnitsSTRINGTerminalRuleCall_8_0() { return cRangeUnitsSTRINGTerminalRuleCall_8_0; }\n+\n+\t\t//\"}\"\n+\t\tpublic Keyword getRightCurlyBracketKeyword_9() { return cRightCurlyBracketKeyword_9; }\n+\t}\n+\n+\tpublic class ValueListElements extends AbstractParserRuleElementFinder {\n+\t\tprivate final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), \"ValueList\");\n+\t\tprivate final Group cGroup = (Group)rule.eContents().get(1);\n+\t\tprivate final Keyword cLeftCurlyBracketKeyword_0 = (Keyword)cGroup.eContents().get(0);\n+\t\tprivate final Assignment cValuesAssignment_1 = (Assignment)cGroup.eContents().get(1);\n+\t\tprivate final RuleCall cValuesSTRINGTerminalRuleCall_1_0 = (RuleCall)cValuesAssignment_1.eContents().get(0);\n+\t\tprivate final Keyword cRightCurlyBracketKeyword_2 = (Keyword)cGroup.eContents().get(2);\n+\t\t\n+\t\t//ValueList:\n+\t\t//\t\"{\" values+=STRING+ \"}\";\n+\t\tpublic ParserRule getRule() { return rule; }\n+\n+\t\t//\"{\" values+=STRING+ \"}\"\n+\t\tpublic Group getGroup() { return cGroup; }\n+\n+\t\t//\"{\"\n+\t\tpublic Keyword getLeftCurlyBracketKeyword_0() { return cLeftCurlyBracketKeyword_0; }\n+\n+\t\t//values+=STRING+\n+\t\tpublic Assignment getValuesAssignment_1() { return cValuesAssignment_1; }\n+\n+\t\t//STRING\n+\t\tpublic RuleCall getValuesSTRINGTerminalRuleCall_1_0() { return cValuesSTRINGTerminalRuleCall_1_0; }\n+\n+\t\t//\"}\"\n+\t\tpublic Keyword getRightCurlyBracketKeyword_2() { return cRightCurlyBracketKeyword_2; }\n+\t}\n+\n \tpublic class OutputElements extends AbstractParserRuleElementFinder {\n \t\tprivate final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), \"Output\");\n \t\tprivate final Group cGroup = (Group)rule.eContents().get(1);\n \t\tprivate final Action cOutputAction_0 = (Action)cGroup.eContents().get(0);\n-\t\tprivate final Alternatives cAlternatives_1 = (Alternatives)cGroup.eContents().get(1);\n-\t\tprivate final Group cGroup_1_0 = (Group)cAlternatives_1.eContents().get(0);\n-\t\tprivate final Keyword cRangeKeyword_1_0_0 = (Keyword)cGroup_1_0.eContents().get(0);\n-\t\tprivate final Keyword cLeftCurlyBracketKeyword_1_0_1 = (Keyword)cGroup_1_0.eContents().get(1);\n-\t\tprivate final Assignment cLowerAssignment_1_0_2 = (Assignment)cGroup_1_0.eContents().get(2);\n-\t\tprivate final RuleCall cLowerBigDecimalTypeParserRuleCall_1_0_2_0 = (RuleCall)cLowerAssignment_1_0_2.eContents().get(0);\n-\t\tprivate final Keyword cFullStopFullStopFullStopKeyword_1_0_3 = (Keyword)cGroup_1_0.eContents().get(3);\n-\t\tprivate final Assignment cUpperAssignment_1_0_4 = (Assignment)cGroup_1_0.eContents().get(4);\n-\t\tprivate final RuleCall cUpperBigDecimalTypeParserRuleCall_1_0_4_0 = (RuleCall)cUpperAssignment_1_0_4.eContents().get(0);\n-\t\tprivate final Keyword cRightCurlyBracketKeyword_1_0_5 = (Keyword)cGroup_1_0.eContents().get(5);\n-\t\tprivate final Keyword cTypeKeyword_1_0_6 = (Keyword)cGroup_1_0.eContents().get(6);\n-\t\tprivate final Assignment cRangeTypeAssignment_1_0_7 = (Assignment)cGroup_1_0.eContents().get(7);\n-\t\tprivate final RuleCall cRangeTypeSTRINGTerminalRuleCall_1_0_7_0 = (RuleCall)cRangeTypeAssignment_1_0_7.eContents().get(0);\n-\t\tprivate final Keyword cUnitsKeyword_1_0_8 = (Keyword)cGroup_1_0.eContents().get(8);\n-\t\tprivate final Assignment cRangeUnitsAssignment_1_0_9 = (Assignment)cGroup_1_0.eContents().get(9);\n-\t\tprivate final RuleCall cRangeUnitsSTRINGTerminalRuleCall_1_0_9_0 = (RuleCall)cRangeUnitsAssignment_1_0_9.eContents().get(0);\n-\t\tprivate final Group cGroup_1_1 = (Group)cAlternatives_1.eContents().get(1);\n-\t\tprivate final Keyword cValuesKeyword_1_1_0 = (Keyword)cGroup_1_1.eContents().get(0);\n-\t\tprivate final Keyword cLeftCurlyBracketKeyword_1_1_1 = (Keyword)cGroup_1_1.eContents().get(1);\n-\t\tprivate final Assignment cValuesAssignment_1_1_2 = (Assignment)cGroup_1_1.eContents().get(2);\n-\t\tprivate final RuleCall cValuesSTRINGTerminalRuleCall_1_1_2_0 = (RuleCall)cValuesAssignment_1_1_2.eContents().get(0);\n-\t\tprivate final Keyword cRightCurlyBracketKeyword_1_1_3 = (Keyword)cGroup_1_1.eContents().get(3);\n+\t\tprivate final Group cGroup_1 = (Group)cGroup.eContents().get(1);\n+\t\tprivate final Keyword cRangeKeyword_1_0 = (Keyword)cGroup_1.eContents().get(0);\n+\t\tprivate final Assignment cRangeAssignment_1_1 = (Assignment)cGroup_1.eContents().get(1);\n+\t\tprivate final RuleCall cRangeValueRangeParserRuleCall_1_1_0 = (RuleCall)cRangeAssignment_1_1.eContents().get(0);\n \t\tprivate final Group cGroup_2 = (Group)cGroup.eContents().get(2);\n-\t\tprivate final Keyword cRateKeyword_2_0 = (Keyword)cGroup_2.eContents().get(0);\n-\t\tprivate final Assignment cRateAssignment_2_1 = (Assignment)cGroup_2.eContents().get(1);\n-\t\tprivate final RuleCall cRateBigUnitValueParserRuleCall_2_1_0 = (RuleCall)cRateAssignment_2_1.eContents().get(0);\n+\t\tprivate final Keyword cValueListKeyword_2_0 = (Keyword)cGroup_2.eContents().get(0);\n+\t\tprivate final Assignment cValueListAssignment_2_1 = (Assignment)cGroup_2.eContents().get(1);\n+\t\tprivate final RuleCall cValueListValueListParserRuleCall_2_1_0 = (RuleCall)cValueListAssignment_2_1.eContents().get(0);\n \t\tprivate final Group cGroup_3 = (Group)cGroup.eContents().get(3);\n-\t\tprivate final Keyword cInitiationDelayKeyword_3_0 = (Keyword)cGroup_3.eContents().get(0);\n-\t\tprivate final Assignment cDelayAssignment_3_1 = (Assignment)cGroup_3.eContents().get(1);\n-\t\tprivate final RuleCall cDelayBigUnitValueParserRuleCall_3_1_0 = (RuleCall)cDelayAssignment_3_1.eContents().get(0);\n+\t\tprivate final Keyword cRateKeyword_3_0 = (Keyword)cGroup_3.eContents().get(0);\n+\t\tprivate final Assignment cRateAssignment_3_1 = (Assignment)cGroup_3.eContents().get(1);\n+\t\tprivate final RuleCall cRateBigUnitValueParserRuleCall_3_1_0 = (RuleCall)cRateAssignment_3_1.eContents().get(0);\n \t\tprivate final Group cGroup_4 = (Group)cGroup.eContents().get(4);\n-\t\tprivate final Keyword cCompletionDeadlineKeyword_4_0 = (Keyword)cGroup_4.eContents().get(0);\n-\t\tprivate final Assignment cDeadlineAssignment_4_1 = (Assignment)cGroup_4.eContents().get(1);\n-\t\tprivate final RuleCall cDeadlineBigUnitValueParserRuleCall_4_1_0 = (RuleCall)cDeadlineAssignment_4_1.eContents().get(0);\n+\t\tprivate final Keyword cInitiationDelayKeyword_4_0 = (Keyword)cGroup_4.eContents().get(0);\n+\t\tprivate final Assignment cDelayAssignment_4_1 = (Assignment)cGroup_4.eContents().get(1);\n+\t\tprivate final RuleCall cDelayBigUnitValueParserRuleCall_4_1_0 = (RuleCall)cDelayAssignment_4_1.eContents().get(0);\n \t\tprivate final Group cGroup_5 = (Group)cGroup.eContents().get(5);\n-\t\tprivate final Keyword cCompletionExceptionKeyword_5_0 = (Keyword)cGroup_5.eContents().get(0);\n-\t\tprivate final Assignment cCompletionHandlingAssignment_5_1 = (Assignment)cGroup_5.eContents().get(1);\n-\t\tprivate final RuleCall cCompletionHandlingSTRINGTerminalRuleCall_5_1_0 = (RuleCall)cCompletionHandlingAssignment_5_1.eContents().get(0);\n+\t\tprivate final Keyword cCompletionDeadlineKeyword_5_0 = (Keyword)cGroup_5.eContents().get(0);\n+\t\tprivate final Assignment cDeadlineAssignment_5_1 = (Assignment)cGroup_5.eContents().get(1);\n+\t\tprivate final RuleCall cDeadlineBigUnitValueParserRuleCall_5_1_0 = (RuleCall)cDeadlineAssignment_5_1.eContents().get(0);\n \t\tprivate final Group cGroup_6 = (Group)cGroup.eContents().get(6);\n-\t\tprivate final Keyword cVariablesKeyword_6_0 = (Keyword)cGroup_6.eContents().get(0);\n-\t\tprivate final Assignment cVariablesAssignment_6_1 = (Assignment)cGroup_6.eContents().get(1);\n-\t\tprivate final RuleCall cVariablesSTRINGTerminalRuleCall_6_1_0 = (RuleCall)cVariablesAssignment_6_1.eContents().get(0);\n+\t\tprivate final Keyword cCompletionExceptionKeyword_6_0 = (Keyword)cGroup_6.eContents().get(0);\n+\t\tprivate final Assignment cCompletionHandlingAssignment_6_1 = (Assignment)cGroup_6.eContents().get(1);\n+\t\tprivate final RuleCall cCompletionHandlingSTRINGTerminalRuleCall_6_1_0 = (RuleCall)cCompletionHandlingAssignment_6_1.eContents().get(0);\n \t\tprivate final Group cGroup_7 = (Group)cGroup.eContents().get(7);\n-\t\tprivate final Keyword cRelationshipKeyword_7_0 = (Keyword)cGroup_7.eContents().get(0);\n-\t\tprivate final Assignment cRelationshipAssignment_7_1 = (Assignment)cGroup_7.eContents().get(1);\n-\t\tprivate final RuleCall cRelationshipSTRINGTerminalRuleCall_7_1_0 = (RuleCall)cRelationshipAssignment_7_1.eContents().get(0);\n+\t\tprivate final Keyword cVariablesKeyword_7_0 = (Keyword)cGroup_7.eContents().get(0);\n+\t\tprivate final Assignment cVariablesAssignment_7_1 = (Assignment)cGroup_7.eContents().get(1);\n+\t\tprivate final RuleCall cVariablesSTRINGTerminalRuleCall_7_1_0 = (RuleCall)cVariablesAssignment_7_1.eContents().get(0);\n \t\tprivate final Group cGroup_8 = (Group)cGroup.eContents().get(8);\n-\t\tprivate final Keyword cMinResponseTimeKeyword_8_0 = (Keyword)cGroup_8.eContents().get(0);\n-\t\tprivate final Assignment cMinResponseAssignment_8_1 = (Assignment)cGroup_8.eContents().get(1);\n-\t\tprivate final RuleCall cMinResponseBigUnitValueParserRuleCall_8_1_0 = (RuleCall)cMinResponseAssignment_8_1.eContents().get(0);\n+\t\tprivate final Keyword cRelationshipKeyword_8_0 = (Keyword)cGroup_8.eContents().get(0);\n+\t\tprivate final Assignment cRelationshipAssignment_8_1 = (Assignment)cGroup_8.eContents().get(1);\n+\t\tprivate final RuleCall cRelationshipSTRINGTerminalRuleCall_8_1_0 = (RuleCall)cRelationshipAssignment_8_1.eContents().get(0);\n \t\tprivate final Group cGroup_9 = (Group)cGroup.eContents().get(9);\n-\t\tprivate final Keyword cMaxResponseTimeKeyword_9_0 = (Keyword)cGroup_9.eContents().get(0);\n-\t\tprivate final Assignment cMaxResponseAssignment_9_1 = (Assignment)cGroup_9.eContents().get(1);\n-\t\tprivate final RuleCall cMaxResponseBigUnitValueParserRuleCall_9_1_0 = (RuleCall)cMaxResponseAssignment_9_1.eContents().get(0);\n+\t\tprivate final Keyword cMinResponseTimeKeyword_9_0 = (Keyword)cGroup_9.eContents().get(0);\n+\t\tprivate final Assignment cMinResponseAssignment_9_1 = (Assignment)cGroup_9.eContents().get(1);\n+\t\tprivate final RuleCall cMinResponseBigUnitValueParserRuleCall_9_1_0 = (RuleCall)cMinResponseAssignment_9_1.eContents().get(0);\n \t\tprivate final Group cGroup_10 = (Group)cGroup.eContents().get(10);\n-\t\tprivate final Keyword cFeedbackExceptionKeyword_10_0 = (Keyword)cGroup_10.eContents().get(0);\n-\t\tprivate final Assignment cFeebackHandlingAssignment_10_1 = (Assignment)cGroup_10.eContents().get(1);\n-\t\tprivate final RuleCall cFeebackHandlingSTRINGTerminalRuleCall_10_1_0 = (RuleCall)cFeebackHandlingAssignment_10_1.eContents().get(0);\n+\t\tprivate final Keyword cMaxResponseTimeKeyword_10_0 = (Keyword)cGroup_10.eContents().get(0);\n+\t\tprivate final Assignment cMaxResponseAssignment_10_1 = (Assignment)cGroup_10.eContents().get(1);\n+\t\tprivate final RuleCall cMaxResponseBigUnitValueParserRuleCall_10_1_0 = (RuleCall)cMaxResponseAssignment_10_1.eContents().get(0);\n \t\tprivate final Group cGroup_11 = (Group)cGroup.eContents().get(11);\n-\t\tprivate final Keyword cReversedByKeyword_11_0 = (Keyword)cGroup_11.eContents().get(0);\n-\t\tprivate final Assignment cReversedAssignment_11_1 = (Assignment)cGroup_11.eContents().get(1);\n-\t\tprivate final RuleCall cReversedSTRINGTerminalRuleCall_11_1_0 = (RuleCall)cReversedAssignment_11_1.eContents().get(0);\n+\t\tprivate final Keyword cFeedbackExceptionKeyword_11_0 = (Keyword)cGroup_11.eContents().get(0);\n+\t\tprivate final Assignment cFeebackHandlingAssignment_11_1 = (Assignment)cGroup_11.eContents().get(1);\n+\t\tprivate final RuleCall cFeebackHandlingSTRINGTerminalRuleCall_11_1_0 = (RuleCall)cFeebackHandlingAssignment_11_1.eContents().get(0);\n \t\tprivate final Group cGroup_12 = (Group)cGroup.eContents().get(12);\n-\t\tprivate final Keyword cReferencesKeyword_12_0 = (Keyword)cGroup_12.eContents().get(0);\n-\t\tprivate final Assignment cReferencesAssignment_12_1 = (Assignment)cGroup_12.eContents().get(1);\n-\t\tprivate final RuleCall cReferencesSTRINGTerminalRuleCall_12_1_0 = (RuleCall)cReferencesAssignment_12_1.eContents().get(0);\n+\t\tprivate final Keyword cReversedByKeyword_12_0 = (Keyword)cGroup_12.eContents().get(0);\n+\t\tprivate final Assignment cReversedAssignment_12_1 = (Assignment)cGroup_12.eContents().get(1);\n+\t\tprivate final RuleCall cReversedSTRINGTerminalRuleCall_12_1_0 = (RuleCall)cReversedAssignment_12_1.eContents().get(0);\n \t\tprivate final Group cGroup_13 = (Group)cGroup.eContents().get(13);\n-\t\tprivate final Keyword cCommentsKeyword_13_0 = (Keyword)cGroup_13.eContents().get(0);\n-\t\tprivate final Assignment cCommentsAssignment_13_1 = (Assignment)cGroup_13.eContents().get(1);\n-\t\tprivate final RuleCall cCommentsSTRINGTerminalRuleCall_13_1_0 = (RuleCall)cCommentsAssignment_13_1.eContents().get(0);\n+\t\tprivate final Keyword cReferencesKeyword_13_0 = (Keyword)cGroup_13.eContents().get(0);\n+\t\tprivate final Assignment cReferencesAssignment_13_1 = (Assignment)cGroup_13.eContents().get(1);\n+\t\tprivate final RuleCall cReferencesSTRINGTerminalRuleCall_13_1_0 = (RuleCall)cReferencesAssignment_13_1.eContents().get(0);\n \t\tprivate final Group cGroup_14 = (Group)cGroup.eContents().get(14);\n-\t\tprivate final Keyword cContentsKeyword_14_0 = (Keyword)cGroup_14.eContents().get(0);\n-\t\tprivate final Assignment cContentsAssignment_14_1 = (Assignment)cGroup_14.eContents().get(1);\n-\t\tprivate final RuleCall cContentsSTRINGTerminalRuleCall_14_1_0 = (RuleCall)cContentsAssignment_14_1.eContents().get(0);\n+\t\tprivate final Keyword cCommentsKeyword_14_0 = (Keyword)cGroup_14.eContents().get(0);\n+\t\tprivate final Assignment cCommentsAssignment_14_1 = (Assignment)cGroup_14.eContents().get(1);\n+\t\tprivate final RuleCall cCommentsSTRINGTerminalRuleCall_14_1_0 = (RuleCall)cCommentsAssignment_14_1.eContents().get(0);\n \t\tprivate final Group cGroup_15 = (Group)cGroup.eContents().get(15);\n-\t\tprivate final Keyword cTriggeringKeyword_15_0 = (Keyword)cGroup_15.eContents().get(0);\n-\t\tprivate final Assignment cTableAssignment_15_1 = (Assignment)cGroup_15.eContents().get(1);\n-\t\tprivate final RuleCall cTableTriggerTableParserRuleCall_15_1_0 = (RuleCall)cTableAssignment_15_1.eContents().get(0);\n+\t\tprivate final Keyword cContentsKeyword_15_0 = (Keyword)cGroup_15.eContents().get(0);\n+\t\tprivate final Assignment cContentsAssignment_15_1 = (Assignment)cGroup_15.eContents().get(1);\n+\t\tprivate final RuleCall cContentsSTRINGTerminalRuleCall_15_1_0 = (RuleCall)cContentsAssignment_15_1.eContents().get(0);\n+\t\tprivate final Group cGroup_16 = (Group)cGroup.eContents().get(16);\n+\t\tprivate final Keyword cTriggeringKeyword_16_0 = (Keyword)cGroup_16.eContents().get(0);\n+\t\tprivate final Assignment cTableAssignment_16_1 = (Assignment)cGroup_16.eContents().get(1);\n+\t\tprivate final RuleCall cTableTriggerTableParserRuleCall_16_1_0 = (RuleCall)cTableAssignment_16_1.eContents().get(0);\n \t\t\n \t\t//Output:\n-\t\t//\t{Output} (\"range\" \"{\" lower=BigDecimalType \"...\" upper=BigDecimalType \"}\" \"type\" rangeType=STRING \"units\"\n-\t\t//\trangeUnits=STRING | \"values\" \"{\" values+=STRING* \"}\") (\"rate\" rate=BigUnitValue)? (\"initiation-delay\"\n-\t\t//\tdelay=BigUnitValue)? (\"completion-deadline\" deadline=BigUnitValue)? (\"completion-exception\"\n+\t\t//\t{Output} (\"range\" range=ValueRange)? (\"value-list\" valueList=ValueList)? (\"rate\" rate=BigUnitValue)?\n+\t\t//\t(\"initiation-delay\" delay=BigUnitValue)? (\"completion-deadline\" deadline=BigUnitValue)? (\"completion-exception\"\n \t\t//\tcompletionHandling=STRING)? (\"variables\" variables=STRING)? (\"relationship\" relationship=STRING)? (\"min-response-time\"\n \t\t//\tminResponse=BigUnitValue)? (\"max-response-time\" maxResponse=BigUnitValue)? (\"feedback-exception\"\n \t\t//\tfeebackHandling=STRING)? (\"reversed-by\" reversed=STRING)? (\"references\" references=STRING)? (\"comments\"\n \t\t//\tcomments=STRING)? (\"contents\" contents=STRING)? (\"triggering\" table=TriggerTable)?;\n \t\tpublic ParserRule getRule() { return rule; }\n \n-\t\t//{Output} (\"range\" \"{\" lower=BigDecimalType \"...\" upper=BigDecimalType \"}\" \"type\" rangeType=STRING \"units\"\n-\t\t//rangeUnits=STRING | \"values\" \"{\" values+=STRING* \"}\") (\"rate\" rate=BigUnitValue)? (\"initiation-delay\"\n+\t\t//{Output} (\"range\" range=ValueRange)? (\"value-list\" valueList=ValueList)? (\"rate\" rate=BigUnitValue)? (\"initiation-delay\"\n \t\t//delay=BigUnitValue)? (\"completion-deadline\" deadline=BigUnitValue)? (\"completion-exception\" completionHandling=STRING)?\n \t\t//(\"variables\" variables=STRING)? (\"relationship\" relationship=STRING)? (\"min-response-time\" minResponse=BigUnitValue)?\n \t\t//(\"max-response-time\" maxResponse=BigUnitValue)? (\"feedback-exception\" feebackHandling=STRING)? (\"reversed-by\"\n@@ -1027,413 +1107,429 @@ public class OutputElements extends AbstractParserRuleElementFinder {\n \t\t//{Output}\n \t\tpublic Action getOutputAction_0() { return cOutputAction_0; }\n \n-\t\t//\"range\" \"{\" lower=BigDecimalType \"...\" upper=BigDecimalType \"}\" \"type\" rangeType=STRING \"units\" rangeUnits=STRING |\n-\t\t//\"values\" \"{\" values+=STRING* \"}\"\n-\t\tpublic Alternatives getAlternatives_1() { return cAlternatives_1; }\n-\n-\t\t//\"range\" \"{\" lower=BigDecimalType \"...\" upper=BigDecimalType \"}\" \"type\" rangeType=STRING \"units\" rangeUnits=STRING\n-\t\tpublic Group getGroup_1_0() { return cGroup_1_0; }\n+\t\t//(\"range\" range=ValueRange)?\n+\t\tpublic Group getGroup_1() { return cGroup_1; }\n \n \t\t//\"range\"\n-\t\tpublic Keyword getRangeKeyword_1_0_0() { return cRangeKeyword_1_0_0; }\n-\n-\t\t//\"{\"\n-\t\tpublic Keyword getLeftCurlyBracketKeyword_1_0_1() { return cLeftCurlyBracketKeyword_1_0_1; }\n-\n-\t\t//lower=BigDecimalType\n-\t\tpublic Assignment getLowerAssignment_1_0_2() { return cLowerAssignment_1_0_2; }\n-\n-\t\t//BigDecimalType\n-\t\tpublic RuleCall getLowerBigDecimalTypeParserRuleCall_1_0_2_0() { return cLowerBigDecimalTypeParserRuleCall_1_0_2_0; }\n-\n-\t\t//\"...\"\n-\t\tpublic Keyword getFullStopFullStopFullStopKeyword_1_0_3() { return cFullStopFullStopFullStopKeyword_1_0_3; }\n-\n-\t\t//upper=BigDecimalType\n-\t\tpublic Assignment getUpperAssignment_1_0_4() { return cUpperAssignment_1_0_4; }\n-\n-\t\t//BigDecimalType\n-\t\tpublic RuleCall getUpperBigDecimalTypeParserRuleCall_1_0_4_0() { return cUpperBigDecimalTypeParserRuleCall_1_0_4_0; }\n-\n-\t\t//\"}\"\n-\t\tpublic Keyword getRightCurlyBracketKeyword_1_0_5() { return cRightCurlyBracketKeyword_1_0_5; }\n-\n-\t\t//\"type\"\n-\t\tpublic Keyword getTypeKeyword_1_0_6() { return cTypeKeyword_1_0_6; }\n+\t\tpublic Keyword getRangeKeyword_1_0() { return cRangeKeyword_1_0; }\n \n-\t\t//rangeType=STRING\n-\t\tpublic Assignment getRangeTypeAssignment_1_0_7() { return cRangeTypeAssignment_1_0_7; }\n+\t\t//range=ValueRange\n+\t\tpublic Assignment getRangeAssignment_1_1() { return cRangeAssignment_1_1; }\n \n-\t\t//STRING\n-\t\tpublic RuleCall getRangeTypeSTRINGTerminalRuleCall_1_0_7_0() { return cRangeTypeSTRINGTerminalRuleCall_1_0_7_0; }\n+\t\t//ValueRange\n+\t\tpublic RuleCall getRangeValueRangeParserRuleCall_1_1_0() { return cRangeValueRangeParserRuleCall_1_1_0; }\n \n-\t\t//\"units\"\n-\t\tpublic Keyword getUnitsKeyword_1_0_8() { return cUnitsKeyword_1_0_8; }\n-\n-\t\t//rangeUnits=STRING\n-\t\tpublic Assignment getRangeUnitsAssignment_1_0_9() { return cRangeUnitsAssignment_1_0_9; }\n-\n-\t\t//STRING\n-\t\tpublic RuleCall getRangeUnitsSTRINGTerminalRuleCall_1_0_9_0() { return cRangeUnitsSTRINGTerminalRuleCall_1_0_9_0; }\n-\n-\t\t//\"values\" \"{\" values+=STRING* \"}\"\n-\t\tpublic Group getGroup_1_1() { return cGroup_1_1; }\n-\n-\t\t//\"values\"\n-\t\tpublic Keyword getValuesKeyword_1_1_0() { return cValuesKeyword_1_1_0; }\n-\n-\t\t//\"{\"\n-\t\tpublic Keyword getLeftCurlyBracketKeyword_1_1_1() { return cLeftCurlyBracketKeyword_1_1_1; }\n+\t\t//(\"value-list\" valueList=ValueList)?\n+\t\tpublic Group getGroup_2() { return cGroup_2; }\n \n-\t\t//values+=STRING*\n-\t\tpublic Assignment getValuesAssignment_1_1_2() { return cValuesAssignment_1_1_2; }\n+\t\t//\"value-list\"\n+\t\tpublic Keyword getValueListKeyword_2_0() { return cValueListKeyword_2_0; }\n \n-\t\t//STRING\n-\t\tpublic RuleCall getValuesSTRINGTerminalRuleCall_1_1_2_0() { return cValuesSTRINGTerminalRuleCall_1_1_2_0; }\n+\t\t//valueList=ValueList\n+\t\tpublic Assignment getValueListAssignment_2_1() { return cValueListAssignment_2_1; }\n \n-\t\t//\"}\"\n-\t\tpublic Keyword getRightCurlyBracketKeyword_1_1_3() { return cRightCurlyBracketKeyword_1_1_3; }\n+\t\t//ValueList\n+\t\tpublic RuleCall getValueListValueListParserRuleCall_2_1_0() { return cValueListValueListParserRuleCall_2_1_0; }\n \n \t\t//(\"rate\" rate=BigUnitValue)?\n-\t\tpublic Group getGroup_2() { return cGroup_2; }\n+\t\tpublic Group getGroup_3() { return cGroup_3; }\n \n \t\t//\"rate\"\n-\t\tpublic Keyword getRateKeyword_2_0() { return cRateKeyword_2_0; }\n+\t\tpublic Keyword getRateKeyword_3_0() { return cRateKeyword_3_0; }\n \n \t\t//rate=BigUnitValue\n-\t\tpublic Assignment getRateAssignment_2_1() { return cRateAssignment_2_1; }\n+\t\tpublic Assignment getRateAssignment_3_1() { return cRateAssignment_3_1; }\n \n \t\t//BigUnitValue\n-\t\tpublic RuleCall getRateBigUnitValueParserRuleCall_2_1_0() { return cRateBigUnitValueParserRuleCall_2_1_0; }\n+\t\tpublic RuleCall getRateBigUnitValueParserRuleCall_3_1_0() { return cRateBigUnitValueParserRuleCall_3_1_0; }\n \n \t\t//(\"initiation-delay\" delay=BigUnitValue)?\n-\t\tpublic Group getGroup_3() { return cGroup_3; }\n+\t\tpublic Group getGroup_4() { return cGroup_4; }\n \n \t\t//\"initiation-delay\"\n-\t\tpublic Keyword getInitiationDelayKeyword_3_0() { return cInitiationDelayKeyword_3_0; }\n+\t\tpublic Keyword getInitiationDelayKeyword_4_0() { return cInitiationDelayKeyword_4_0; }\n \n \t\t//delay=BigUnitValue\n-\t\tpublic Assignment getDelayAssignment_3_1() { return cDelayAssignment_3_1; }\n+\t\tpublic Assignment getDelayAssignment_4_1() { return cDelayAssignment_4_1; }\n \n \t\t//BigUnitValue\n-\t\tpublic RuleCall getDelayBigUnitValueParserRuleCall_3_1_0() { return cDelayBigUnitValueParserRuleCall_3_1_0; }\n+\t\tpublic RuleCall getDelayBigUnitValueParserRuleCall_4_1_0() { return cDelayBigUnitValueParserRuleCall_4_1_0; }\n \n \t\t//(\"completion-deadline\" deadline=BigUnitValue)?\n-\t\tpublic Group getGroup_4() { return cGroup_4; }\n+\t\tpublic Group getGroup_5() { return cGroup_5; }\n \n \t\t//\"completion-deadline\"\n-\t\tpublic Keyword getCompletionDeadlineKeyword_4_0() { return cCompletionDeadlineKeyword_4_0; }\n+\t\tpublic Keyword getCompletionDeadlineKeyword_5_0() { return cCompletionDeadlineKeyword_5_0; }\n \n \t\t//deadline=BigUnitValue\n-\t\tpublic Assignment getDeadlineAssignment_4_1() { return cDeadlineAssignment_4_1; }\n+\t\tpublic Assignment getDeadlineAssignment_5_1() { return cDeadlineAssignment_5_1; }\n \n \t\t//BigUnitValue\n-\t\tpublic RuleCall getDeadlineBigUnitValueParserRuleCall_4_1_0() { return cDeadlineBigUnitValueParserRuleCall_4_1_0; }\n+\t\tpublic RuleCall getDeadlineBigUnitValueParserRuleCall_5_1_0() { return cDeadlineBigUnitValueParserRuleCall_5_1_0; }\n \n \t\t//(\"completion-exception\" completionHandling=STRING)?\n-\t\tpublic Group getGroup_5() { return cGroup_5; }\n+\t\tpublic Group getGroup_6() { return cGroup_6; }\n \n \t\t//\"completion-exception\"\n-\t\tpublic Keyword getCompletionExceptionKeyword_5_0() { return cCompletionExceptionKeyword_5_0; }\n+\t\tpublic Keyword getCompletionExceptionKeyword_6_0() { return cCompletionExceptionKeyword_6_0; }\n \n \t\t//completionHandling=STRING\n-\t\tpublic Assignment getCompletionHandlingAssignment_5_1() { return cCompletionHandlingAssignment_5_1; }\n+\t\tpublic Assignment getCompletionHandlingAssignment_6_1() { return cCompletionHandlingAssignment_6_1; }\n \n \t\t//STRING\n-\t\tpublic RuleCall getCompletionHandlingSTRINGTerminalRuleCall_5_1_0() { return cCompletionHandlingSTRINGTerminalRuleCall_5_1_0; }\n+\t\tpublic RuleCall getCompletionHandlingSTRINGTerminalRuleCall_6_1_0() { return cCompletionHandlingSTRINGTerminalRuleCall_6_1_0; }\n \n \t\t//(\"variables\" variables=STRING)?\n-\t\tpublic Group getGroup_6() { return cGroup_6; }\n+\t\tpublic Group getGroup_7() { return cGroup_7; }\n \n \t\t//\"variables\"\n-\t\tpublic Keyword getVariablesKeyword_6_0() { return cVariablesKeyword_6_0; }\n+\t\tpublic Keyword getVariablesKeyword_7_0() { return cVariablesKeyword_7_0; }\n \n \t\t//variables=STRING\n-\t\tpublic Assignment getVariablesAssignment_6_1() { return cVariablesAssignment_6_1; }\n+\t\tpublic Assignment getVariablesAssignment_7_1() { return cVariablesAssignment_7_1; }\n \n \t\t//STRING\n-\t\tpublic RuleCall getVariablesSTRINGTerminalRuleCall_6_1_0() { return cVariablesSTRINGTerminalRuleCall_6_1_0; }\n+\t\tpublic RuleCall getVariablesSTRINGTerminalRuleCall_7_1_0() { return cVariablesSTRINGTerminalRuleCall_7_1_0; }\n \n \t\t//(\"relationship\" relationship=STRING)?\n-\t\tpublic Group getGroup_7() { return cGroup_7; }\n+\t\tpublic Group getGroup_8() { return cGroup_8; }\n \n \t\t//\"relationship\"\n-\t\tpublic Keyword getRelationshipKeyword_7_0() { return cRelationshipKeyword_7_0; }\n+\t\tpublic Keyword getRelationshipKeyword_8_0() { return cRelationshipKeyword_8_0; }\n \n \t\t//relationship=STRING\n-\t\tpublic Assignment getRelationshipAssignment_7_1() { return cRelationshipAssignment_7_1; }\n+\t\tpublic Assignment getRelationshipAssignment_8_1() { return cRelationshipAssignment_8_1; }\n \n \t\t//STRING\n-\t\tpublic RuleCall getRelationshipSTRINGTerminalRuleCall_7_1_0() { return cRelationshipSTRINGTerminalRuleCall_7_1_0; }\n+\t\tpublic RuleCall getRelationshipSTRINGTerminalRuleCall_8_1_0() { return cRelationshipSTRINGTerminalRuleCall_8_1_0; }\n \n \t\t//(\"min-response-time\" minResponse=BigUnitValue)?\n-\t\tpublic Group getGroup_8() { return cGroup_8; }\n+\t\tpublic Group getGroup_9() { return cGroup_9; }\n \n \t\t//\"min-response-time\"\n-\t\tpublic Keyword getMinResponseTimeKeyword_8_0() { return cMinResponseTimeKeyword_8_0; }\n+\t\tpublic Keyword getMinResponseTimeKeyword_9_0() { return cMinResponseTimeKeyword_9_0; }\n \n \t\t//minResponse=BigUnitValue\n-\t\tpublic Assignment getMinResponseAssignment_8_1() { return cMinResponseAssignment_8_1; }\n+\t\tpublic Assignment getMinResponseAssignment_9_1() { return cMinResponseAssignment_9_1; }\n \n \t\t//BigUnitValue\n-\t\tpublic RuleCall getMinResponseBigUnitValueParserRuleCall_8_1_0() { return cMinResponseBigUnitValueParserRuleCall_8_1_0; }\n+\t\tpublic RuleCall getMinResponseBigUnitValueParserRuleCall_9_1_0() { return cMinResponseBigUnitValueParserRuleCall_9_1_0; }\n \n \t\t//(\"max-response-time\" maxResponse=BigUnitValue)?\n-\t\tpublic Group getGroup_9() { return cGroup_9; }\n+\t\tpublic Group getGroup_10() { return cGroup_10; }\n \n \t\t//\"max-response-time\"\n-\t\tpublic Keyword getMaxResponseTimeKeyword_9_0() { return cMaxResponseTimeKeyword_9_0; }\n+\t\tpublic Keyword getMaxResponseTimeKeyword_10_0() { return cMaxResponseTimeKeyword_10_0; }\n \n \t\t//maxResponse=BigUnitValue\n-\t\tpublic Assignment getMaxResponseAssignment_9_1() { return cMaxResponseAssignment_9_1; }\n+\t\tpublic Assignment getMaxResponseAssignment_10_1() { return cMaxResponseAssignment_10_1; }\n \n \t\t//BigUnitValue\n-\t\tpublic RuleCall getMaxResponseBigUnitValueParserRuleCall_9_1_0() { return cMaxResponseBigUnitValueParserRuleCall_9_1_0; }\n+\t\tpublic RuleCall getMaxResponseBigUnitValueParserRuleCall_10_1_0() { return cMaxResponseBigUnitValueParserRuleCall_10_1_0; }\n \n \t\t//(\"feedback-exception\" feebackHandling=STRING)?\n-\t\tpublic Group getGroup_10() { return cGroup_10; }\n+\t\tpublic Group getGroup_11() { return cGroup_11; }\n \n \t\t//\"feedback-exception\"\n-\t\tpublic Keyword getFeedbackExceptionKeyword_10_0() { return cFeedbackExceptionKeyword_10_0; }\n+\t\tpublic Keyword getFeedbackExceptionKeyword_11_0() { return cFeedbackExceptionKeyword_11_0; }\n \n \t\t//feebackHandling=STRING\n-\t\tpublic Assignment getFeebackHandlingAssignment_10_1() { return cFeebackHandlingAssignment_10_1; }\n+\t\tpublic Assignment getFeebackHandlingAssignment_11_1() { return cFeebackHandlingAssignment_11_1; }\n \n \t\t//STRING\n-\t\tpublic RuleCall getFeebackHandlingSTRINGTerminalRuleCall_10_1_0() { return cFeebackHandlingSTRINGTerminalRuleCall_10_1_0; }\n+\t\tpublic RuleCall getFeebackHandlingSTRINGTerminalRuleCall_11_1_0() { return cFeebackHandlingSTRINGTerminalRuleCall_11_1_0; }\n \n \t\t//(\"reversed-by\" reversed=STRING)?\n-\t\tpublic Group getGroup_11() { return cGroup_11; }\n+\t\tpublic Group getGroup_12() { return cGroup_12; }\n \n \t\t//\"reversed-by\"\n-\t\tpublic Keyword getReversedByKeyword_11_0() { return cReversedByKeyword_11_0; }\n+\t\tpublic Keyword getReversedByKeyword_12_0() { return cReversedByKeyword_12_0; }\n \n \t\t//reversed=STRING\n-\t\tpublic Assignment getReversedAssignment_11_1() { return cReversedAssignment_11_1; }\n+\t\tpublic Assignment getReversedAssignment_12_1() { return cReversedAssignment_12_1; }\n \n \t\t//STRING\n-\t\tpublic RuleCall getReversedSTRINGTerminalRuleCall_11_1_0() { return cReversedSTRINGTerminalRuleCall_11_1_0; }\n+\t\tpublic RuleCall getReversedSTRINGTerminalRuleCall_12_1_0() { return cReversedSTRINGTerminalRuleCall_12_1_0; }\n \n \t\t//(\"references\" references=STRING)?\n-\t\tpublic Group getGroup_12() { return cGroup_12; }\n+\t\tpublic Group getGroup_13() { return cGroup_13; }\n \n \t\t//\"references\"\n-\t\tpublic Keyword getReferencesKeyword_12_0() { return cReferencesKeyword_12_0; }\n+\t\tpublic Keyword getReferencesKeyword_13_0() { return cReferencesKeyword_13_0; }\n \n \t\t//references=STRING\n-\t\tpublic Assignment getReferencesAssignment_12_1() { return cReferencesAssignment_12_1; }\n+\t\tpublic Assignment getReferencesAssignment_13_1() { return cReferencesAssignment_13_1; }\n \n \t\t//STRING\n-\t\tpublic RuleCall getReferencesSTRINGTerminalRuleCall_12_1_0() { return cReferencesSTRINGTerminalRuleCall_12_1_0; }\n+\t\tpublic RuleCall getReferencesSTRINGTerminalRuleCall_13_1_0() { return cReferencesSTRINGTerminalRuleCall_13_1_0; }\n \n \t\t//(\"comments\" comments=STRING)?\n-\t\tpublic Group getGroup_13() { return cGroup_13; }\n+\t\tpublic Group getGroup_14() { return cGroup_14; }\n \n \t\t//\"comments\"\n-\t\tpublic Keyword getCommentsKeyword_13_0() { return cCommentsKeyword_13_0; }\n+\t\tpublic Keyword getCommentsKeyword_14_0() { return cCommentsKeyword_14_0; }\n \n \t\t//comments=STRING\n-\t\tpublic Assignment getCommentsAssignment_13_1() { return cCommentsAssignment_13_1; }\n+\t\tpublic Assignment getCommentsAssignment_14_1() { return cCommentsAssignment_14_1; }\n \n \t\t//STRING\n-\t\tpublic RuleCall getCommentsSTRINGTerminalRuleCall_13_1_0() { return cCommentsSTRINGTerminalRuleCall_13_1_0; }\n+\t\tpublic RuleCall getCommentsSTRINGTerminalRuleCall_14_1_0() { return cCommentsSTRINGTerminalRuleCall_14_1_0; }\n \n \t\t//(\"contents\" contents=STRING)?\n-\t\tpublic Group getGroup_14() { return cGroup_14; }\n+\t\tpublic Group getGroup_15() { return cGroup_15; }\n \n \t\t//\"contents\"\n-\t\tpublic Keyword getContentsKeyword_14_0() { return cContentsKeyword_14_0; }\n+\t\tpublic Keyword getContentsKeyword_15_0() { return cContentsKeyword_15_0; }\n \n \t\t//contents=STRING\n-\t\tpublic Assignment getContentsAssignment_14_1() { return cContentsAssignment_14_1; }\n+\t\tpublic Assignment getContentsAssignment_15_1() { return cContentsAssignment_15_1; }\n \n \t\t//STRING\n-\t\tpublic RuleCall getContentsSTRINGTerminalRuleCall_14_1_0() { return cContentsSTRINGTerminalRuleCall_14_1_0; }\n+\t\tpublic RuleCall getContentsSTRINGTerminalRuleCall_15_1_0() { return cContentsSTRINGTerminalRuleCall_15_1_0; }\n \n \t\t//(\"triggering\" table=TriggerTable)?\n-\t\tpublic Group getGroup_15() { return cGroup_15; }\n+\t\tpublic Group getGroup_16() { return cGroup_16; }\n \n \t\t//\"triggering\"\n-\t\tpublic Keyword getTriggeringKeyword_15_0() { return cTriggeringKeyword_15_0; }\n+\t\tpublic Keyword getTriggeringKeyword_16_0() { return cTriggeringKeyword_16_0; }\n \n \t\t//table=TriggerTable\n-\t\tpublic Assignment getTableAssignment_15_1() { return cTableAssignment_15_1; }\n+\t\tpublic Assignment getTableAssignment_16_1() { return cTableAssignment_16_1; }\n \n \t\t//TriggerTable\n-\t\tpublic RuleCall getTableTriggerTableParserRuleCall_15_1_0() { return cTableTriggerTableParserRuleCall_15_1_0; }\n+\t\tpublic RuleCall getTableTriggerTableParserRuleCall_16_1_0() { return cTableTriggerTableParserRuleCall_16_1_0; }\n \t}\n \n \tpublic class InputElements extends AbstractParserRuleElementFinder {\n \t\tprivate final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), \"Input\");\n \t\tprivate final Group cGroup = (Group)rule.eContents().get(1);\n \t\tprivate final Action cInputAction_0 = (Action)cGroup.eContents().get(0);\n-\t\tprivate final Alternatives cAlternatives_1 = (Alternatives)cGroup.eContents().get(1);\n-\t\tprivate final Group cGroup_1_0 = (Group)cAlternatives_1.eContents().get(0);\n-\t\tprivate final Keyword cRangeKeyword_1_0_0 = (Keyword)cGroup_1_0.eContents().get(0);\n-\t\tprivate final Keyword cLeftCurlyBracketKeyword_1_0_1 = (Keyword)cGroup_1_0.eContents().get(1);\n-\t\tprivate final Assignment cLowerAssignment_1_0_2 = (Assignment)cGroup_1_0.eContents().get(2);\n-\t\tprivate final RuleCall cLowerBigDecimalTypeParserRuleCall_1_0_2_0 = (RuleCall)cLowerAssignment_1_0_2.eContents().get(0);\n-\t\tprivate final Keyword cFullStopFullStopFullStopKeyword_1_0_3 = (Keyword)cGroup_1_0.eContents().get(3);\n-\t\tprivate final Assignment cUpperAssignment_1_0_4 = (Assignment)cGroup_1_0.eContents().get(4);\n-\t\tprivate final RuleCall cUpperBigDecimalTypeParserRuleCall_1_0_4_0 = (RuleCall)cUpperAssignment_1_0_4.eContents().get(0);\n-\t\tprivate final Keyword cRightCurlyBracketKeyword_1_0_5 = (Keyword)cGroup_1_0.eContents().get(5);\n-\t\tprivate final Keyword cTypeKeyword_1_0_6 = (Keyword)cGroup_1_0.eContents().get(6);\n-\t\tprivate final Assignment cRangeTypeAssignment_1_0_7 = (Assignment)cGroup_1_0.eContents().get(7);\n-\t\tprivate final RuleCall cRangeTypeSTRINGTerminalRuleCall_1_0_7_0 = (RuleCall)cRangeTypeAssignment_1_0_7.eContents().get(0);\n-\t\tprivate final Keyword cUnitsKeyword_1_0_8 = (Keyword)cGroup_1_0.eContents().get(8);\n-\t\tprivate final Assignment cRangeUnitsAssignment_1_0_9 = (Assignment)cGroup_1_0.eContents().get(9);\n-\t\tprivate final RuleCall cRangeUnitsSTRINGTerminalRuleCall_1_0_9_0 = (RuleCall)cRangeUnitsAssignment_1_0_9.eContents().get(0);\n-\t\tprivate final Group cGroup_1_1 = (Group)cAlternatives_1.eContents().get(1);\n-\t\tprivate final Keyword cValuesKeyword_1_1_0 = (Keyword)cGroup_1_1.eContents().get(0);\n-\t\tprivate final Keyword cLeftCurlyBracketKeyword_1_1_1 = (Keyword)cGroup_1_1.eContents().get(1);\n-\t\tprivate final Assignment cValuesAssignment_1_1_2 = (Assignment)cGroup_1_1.eContents().get(2);\n-\t\tprivate final RuleCall cValuesSTRINGTerminalRuleCall_1_1_2_0 = (RuleCall)cValuesAssignment_1_1_2.eContents().get(0);\n-\t\tprivate final Keyword cRightCurlyBracketKeyword_1_1_3 = (Keyword)cGroup_1_1.eContents().get(3);\n+\t\tprivate final Group cGroup_1 = (Group)cGroup.eContents().get(1);\n+\t\tprivate final Keyword cRangeKeyword_1_0 = (Keyword)cGroup_1.eContents().get(0);\n+\t\tprivate final Assignment cRangeAssignment_1_1 = (Assignment)cGroup_1.eContents().get(1);\n+\t\tprivate final RuleCall cRangeValueRangeParserRuleCall_1_1_0 = (RuleCall)cRangeAssignment_1_1.eContents().get(0);\n \t\tprivate final Group cGroup_2 = (Group)cGroup.eContents().get(2);\n-\t\tprivate final Keyword cRateKeyword_2_0 = (Keyword)cGroup_2.eContents().get(0);\n-\t\tprivate final Assignment cRateAssignment_2_1 = (Assignment)cGroup_2.eContents().get(1);\n-\t\tprivate final RuleCall cRateBigUnitValueParserRuleCall_2_1_0 = (RuleCall)cRateAssignment_2_1.eContents().get(0);\n+\t\tprivate final Keyword cValueListKeyword_2_0 = (Keyword)cGroup_2.eContents().get(0);\n+\t\tprivate final Assignment cValueListAssignment_2_1 = (Assignment)cGroup_2.eContents().get(1);\n+\t\tprivate final RuleCall cValueListValueListParserRuleCall_2_1_0 = (RuleCall)cValueListAssignment_2_1.eContents().get(0);\n \t\tprivate final Group cGroup_3 = (Group)cGroup.eContents().get(3);\n-\t\tprivate final Keyword cVariablesKeyword_3_0 = (Keyword)cGroup_3.eContents().get(0);\n-\t\tprivate final Assignment cVariablesAssignment_3_1 = (Assignment)cGroup_3.eContents().get(1);\n-\t\tprivate final RuleCall cVariablesSTRINGTerminalRuleCall_3_1_0 = (RuleCall)cVariablesAssignment_3_1.eContents().get(0);\n+\t\tprivate final Keyword cValueExceptionKeyword_3_0 = (Keyword)cGroup_3.eContents().get(0);\n+\t\tprivate final Assignment cValueHandlingAssignment_3_1 = (Assignment)cGroup_3.eContents().get(1);\n+\t\tprivate final RuleCall cValueHandlingSTRINGTerminalRuleCall_3_1_0 = (RuleCall)cValueHandlingAssignment_3_1.eContents().get(0);\n \t\tprivate final Group cGroup_4 = (Group)cGroup.eContents().get(4);\n-\t\tprivate final Keyword cReferencesKeyword_4_0 = (Keyword)cGroup_4.eContents().get(0);\n-\t\tprivate final Assignment cReferencesAssignment_4_1 = (Assignment)cGroup_4.eContents().get(1);\n-\t\tprivate final RuleCall cReferencesSTRINGTerminalRuleCall_4_1_0 = (RuleCall)cReferencesAssignment_4_1.eContents().get(0);\n+\t\tprivate final Keyword cGranularityKeyword_4_0 = (Keyword)cGroup_4.eContents().get(0);\n+\t\tprivate final Assignment cGranularityAssignment_4_1 = (Assignment)cGroup_4.eContents().get(1);\n+\t\tprivate final RuleCall cGranularityBigUnitValueParserRuleCall_4_1_0 = (RuleCall)cGranularityAssignment_4_1.eContents().get(0);\n \t\tprivate final Group cGroup_5 = (Group)cGroup.eContents().get(5);\n-\t\tprivate final Keyword cCommentsKeyword_5_0 = (Keyword)cGroup_5.eContents().get(0);\n-\t\tprivate final Assignment cCommentsAssignment_5_1 = (Assignment)cGroup_5.eContents().get(1);\n-\t\tprivate final RuleCall cCommentsSTRINGTerminalRuleCall_5_1_0 = (RuleCall)cCommentsAssignment_5_1.eContents().get(0);\n+\t\tprivate final Keyword cArrivalRateAvgKeyword_5_0 = (Keyword)cGroup_5.eContents().get(0);\n+\t\tprivate final Assignment cArrivalRateAvgAssignment_5_1 = (Assignment)cGroup_5.eContents().get(1);\n+\t\tprivate final RuleCall cArrivalRateAvgBigUnitValueParserRuleCall_5_1_0 = (RuleCall)cArrivalRateAvgAssignment_5_1.eContents().get(0);\n+\t\tprivate final Group cGroup_6 = (Group)cGroup.eContents().get(6);\n+\t\tprivate final Keyword cArrivalRateMinimumKeyword_6_0 = (Keyword)cGroup_6.eContents().get(0);\n+\t\tprivate final Assignment cArrivalRateMinimumAssignment_6_1 = (Assignment)cGroup_6.eContents().get(1);\n+\t\tprivate final RuleCall cArrivalRateMinimumBigUnitValueParserRuleCall_6_1_0 = (RuleCall)cArrivalRateMinimumAssignment_6_1.eContents().get(0);\n+\t\tprivate final Group cGroup_7 = (Group)cGroup.eContents().get(7);\n+\t\tprivate final Keyword cArrivalRateMaximumKeyword_7_0 = (Keyword)cGroup_7.eContents().get(0);\n+\t\tprivate final Assignment cArrivalRateMaximumAssignment_7_1 = (Assignment)cGroup_7.eContents().get(1);\n+\t\tprivate final RuleCall cArrivalRateMaximumBigUnitValueParserRuleCall_7_1_0 = (RuleCall)cArrivalRateMaximumAssignment_7_1.eContents().get(0);\n+\t\tprivate final Group cGroup_8 = (Group)cGroup.eContents().get(8);\n+\t\tprivate final Keyword cObsolescenceKeyword_8_0 = (Keyword)cGroup_8.eContents().get(0);\n+\t\tprivate final Assignment cObsolescenceAssignment_8_1 = (Assignment)cGroup_8.eContents().get(1);\n+\t\tprivate final RuleCall cObsolescenceBigUnitValueParserRuleCall_8_1_0 = (RuleCall)cObsolescenceAssignment_8_1.eContents().get(0);\n+\t\tprivate final Group cGroup_9 = (Group)cGroup.eContents().get(9);\n+\t\tprivate final Keyword cReferencesKeyword_9_0 = (Keyword)cGroup_9.eContents().get(0);\n+\t\tprivate final Assignment cReferencesAssignment_9_1 = (Assignment)cGroup_9.eContents().get(1);\n+\t\tprivate final RuleCall cReferencesSTRINGTerminalRuleCall_9_1_0 = (RuleCall)cReferencesAssignment_9_1.eContents().get(0);\n+\t\tprivate final Group cGroup_10 = (Group)cGroup.eContents().get(10);\n+\t\tprivate final Keyword cAppearsInKeyword_10_0 = (Keyword)cGroup_10.eContents().get(0);\n+\t\tprivate final Assignment cAppearsInAssignment_10_1 = (Assignment)cGroup_10.eContents().get(1);\n+\t\tprivate final RuleCall cAppearsInSTRINGTerminalRuleCall_10_1_0 = (RuleCall)cAppearsInAssignment_10_1.eContents().get(0);\n+\t\tprivate final Group cGroup_11 = (Group)cGroup.eContents().get(11);\n+\t\tprivate final Keyword cDescriptionKeyword_11_0 = (Keyword)cGroup_11.eContents().get(0);\n+\t\tprivate final Assignment cDescriptionAssignment_11_1 = (Assignment)cGroup_11.eContents().get(1);\n+\t\tprivate final RuleCall cDescriptionSTRINGTerminalRuleCall_11_1_0 = (RuleCall)cDescriptionAssignment_11_1.eContents().get(0);\n+\t\tprivate final Group cGroup_12 = (Group)cGroup.eContents().get(12);\n+\t\tprivate final Keyword cCommentsKeyword_12_0 = (Keyword)cGroup_12.eContents().get(0);\n+\t\tprivate final Assignment cCommentsAssignment_12_1 = (Assignment)cGroup_12.eContents().get(1);\n+\t\tprivate final RuleCall cCommentsSTRINGTerminalRuleCall_12_1_0 = (RuleCall)cCommentsAssignment_12_1.eContents().get(0);\n+\t\tprivate final Group cGroup_13 = (Group)cGroup.eContents().get(13);\n+\t\tprivate final Keyword cTriggeringKeyword_13_0 = (Keyword)cGroup_13.eContents().get(0);\n+\t\tprivate final Assignment cStructureAssignment_13_1 = (Assignment)cGroup_13.eContents().get(1);\n+\t\tprivate final RuleCall cStructureTriggerTableParserRuleCall_13_1_0 = (RuleCall)cStructureAssignment_13_1.eContents().get(0);\n \t\t\n \t\t//Input:\n-\t\t//\t{Input} (\"range\" \"{\" lower=BigDecimalType \"...\" upper=BigDecimalType \"}\" \"type\" rangeType=STRING \"units\"\n-\t\t//\trangeUnits=STRING | \"values\" \"{\" values+=STRING* \"}\") (\"rate\" rate=BigUnitValue)? (\"variables\" variables=STRING)?\n-\t\t//\t(\"references\" references=STRING)? (\"comments\" comments=STRING)?;\n+\t\t//\t{Input} (\"range\" range=ValueRange)? (\"value-list\" valueList=ValueList)? (\"value-exception\" valueHandling=STRING)?\n+\t\t//\t(\"granularity\" granularity=BigUnitValue)? (\"arrival-rate-avg\" arrivalRateAvg=BigUnitValue)? (\"arrival-rate-minimum\"\n+\t\t//\tarrivalRateMinimum=BigUnitValue)? (\"arrival-rate-maximum\" arrivalRateMaximum=BigUnitValue)? (\"obsolescence\"\n+\t\t//\tobsolescence=BigUnitValue)? (\"references\" references=STRING)? (\"appears-in\" appearsIn=STRING)? (\"description\"\n+\t\t//\tdescription=STRING)? (\"comments\" comments=STRING)? (\"triggering\" structure=TriggerTable)?;\n \t\tpublic ParserRule getRule() { return rule; }\n \n-\t\t//{Input} (\"range\" \"{\" lower=BigDecimalType \"...\" upper=BigDecimalType \"}\" \"type\" rangeType=STRING \"units\"\n-\t\t//rangeUnits=STRING | \"values\" \"{\" values+=STRING* \"}\") (\"rate\" rate=BigUnitValue)? (\"variables\" variables=STRING)?\n-\t\t//(\"references\" references=STRING)? (\"comments\" comments=STRING)?\n+\t\t//{Input} (\"range\" range=ValueRange)? (\"value-list\" valueList=ValueList)? (\"value-exception\" valueHandling=STRING)?\n+\t\t//(\"granularity\" granularity=BigUnitValue)? (\"arrival-rate-avg\" arrivalRateAvg=BigUnitValue)? (\"arrival-rate-minimum\"\n+\t\t//arrivalRateMinimum=BigUnitValue)? (\"arrival-rate-maximum\" arrivalRateMaximum=BigUnitValue)? (\"obsolescence\"\n+\t\t//obsolescence=BigUnitValue)? (\"references\" references=STRING)? (\"appears-in\" appearsIn=STRING)? (\"description\"\n+\t\t//description=STRING)? (\"comments\" comments=STRING)? (\"triggering\" structure=TriggerTable)?\n \t\tpublic Group getGroup() { return cGroup; }\n \n \t\t//{Input}\n \t\tpublic Action getInputAction_0() { return cInputAction_0; }\n \n-\t\t//\"range\" \"{\" lower=BigDecimalType \"...\" upper=BigDecimalType \"}\" \"type\" rangeType=STRING \"units\" rangeUnits=STRING |\n-\t\t//\"values\" \"{\" values+=STRING* \"}\"\n-\t\tpublic Alternatives getAlternatives_1() { return cAlternatives_1; }\n-\n-\t\t//\"range\" \"{\" lower=BigDecimalType \"...\" upper=BigDecimalType \"}\" \"type\" rangeType=STRING \"units\" rangeUnits=STRING\n-\t\tpublic Group getGroup_1_0() { return cGroup_1_0; }\n+\t\t//(\"range\" range=ValueRange)?\n+\t\tpublic Group getGroup_1() { return cGroup_1; }\n \n \t\t//\"range\"\n-\t\tpublic Keyword getRangeKeyword_1_0_0() { return cRangeKeyword_1_0_0; }\n+\t\tpublic Keyword getRangeKeyword_1_0() { return cRangeKeyword_1_0; }\n \n-\t\t//\"{\"\n-\t\tpublic Keyword getLeftCurlyBracketKeyword_1_0_1() { return cLeftCurlyBracketKeyword_1_0_1; }\n+\t\t//range=ValueRange\n+\t\tpublic Assignment getRangeAssignment_1_1() { return cRangeAssignment_1_1; }\n \n-\t\t//lower=BigDecimalType\n-\t\tpublic Assignment getLowerAssignment_1_0_2() { return cLowerAssignment_1_0_2; }\n+\t\t//ValueRange\n+\t\tpublic RuleCall getRangeValueRangeParserRuleCall_1_1_0() { return cRangeValueRangeParserRuleCall_1_1_0; }\n \n-\t\t//BigDecimalType\n-\t\tpublic RuleCall getLowerBigDecimalTypeParserRuleCall_1_0_2_0() { return cLowerBigDecimalTypeParserRuleCall_1_0_2_0; }\n+\t\t//(\"value-list\" valueList=ValueList)?\n+\t\tpublic Group getGroup_2() { return cGroup_2; }\n \n-\t\t//\"...\"\n-\t\tpublic Keyword getFullStopFullStopFullStopKeyword_1_0_3() { return cFullStopFullStopFullStopKeyword_1_0_3; }\n+\t\t//\"value-list\"\n+\t\tpublic Keyword getValueListKeyword_2_0() { return cValueListKeyword_2_0; }\n \n-\t\t//upper=BigDecimalType\n-\t\tpublic Assignment getUpperAssignment_1_0_4() { return cUpperAssignment_1_0_4; }\n+\t\t//valueList=ValueList\n+\t\tpublic Assignment getValueListAssignment_2_1() { return cValueListAssignment_2_1; }\n \n-\t\t//BigDecimalType\n-\t\tpublic RuleCall getUpperBigDecimalTypeParserRuleCall_1_0_4_0() { return cUpperBigDecimalTypeParserRuleCall_1_0_4_0; }\n+\t\t//ValueList\n+\t\tpublic RuleCall getValueListValueListParserRuleCall_2_1_0() { return cValueListValueListParserRuleCall_2_1_0; }\n \n-\t\t//\"}\"\n-\t\tpublic Keyword getRightCurlyBracketKeyword_1_0_5() { return cRightCurlyBracketKeyword_1_0_5; }\n+\t\t//(\"value-exception\" valueHandling=STRING)?\n+\t\tpublic Group getGroup_3() { return cGroup_3; }\n \n-\t\t//\"type\"\n-\t\tpublic Keyword getTypeKeyword_1_0_6() { return cTypeKeyword_1_0_6; }\n+\t\t//\"value-exception\"\n+\t\tpublic Keyword getValueExceptionKeyword_3_0() { return cValueExceptionKeyword_3_0; }\n \n-\t\t//rangeType=STRING\n-\t\tpublic Assignment getRangeTypeAssignment_1_0_7() { return cRangeTypeAssignment_1_0_7; }\n+\t\t//valueHandling=STRING\n+\t\tpublic Assignment getValueHandlingAssignment_3_1() { return cValueHandlingAssignment_3_1; }\n \n \t\t//STRING\n-\t\tpublic RuleCall getRangeTypeSTRINGTerminalRuleCall_1_0_7_0() { return cRangeTypeSTRINGTerminalRuleCall_1_0_7_0; }\n+\t\tpublic RuleCall getValueHandlingSTRINGTerminalRuleCall_3_1_0() { return cValueHandlingSTRINGTerminalRuleCall_3_1_0; }\n \n-\t\t//\"units\"\n-\t\tpublic Keyword getUnitsKeyword_1_0_8() { return cUnitsKeyword_1_0_8; }\n+\t\t//(\"granularity\" granularity=BigUnitValue)?\n+\t\tpublic Group getGroup_4() { return cGroup_4; }\n \n-\t\t//rangeUnits=STRING\n-\t\tpublic Assignment getRangeUnitsAssignment_1_0_9() { return cRangeUnitsAssignment_1_0_9; }\n+\t\t//\"granularity\"\n+\t\tpublic Keyword getGranularityKeyword_4_0() { return cGranularityKeyword_4_0; }\n \n-\t\t//STRING\n-\t\tpublic RuleCall getRangeUnitsSTRINGTerminalRuleCall_1_0_9_0() { return cRangeUnitsSTRINGTerminalRuleCall_1_0_9_0; }\n+\t\t//granularity=BigUnitValue\n+\t\tpublic Assignment getGranularityAssignment_4_1() { return cGranularityAssignment_4_1; }\n \n-\t\t//\"values\" \"{\" values+=STRING* \"}\"\n-\t\tpublic Group getGroup_1_1() { return cGroup_1_1; }\n+\t\t//BigUnitValue\n+\t\tpublic RuleCall getGranularityBigUnitValueParserRuleCall_4_1_0() { return cGranularityBigUnitValueParserRuleCall_4_1_0; }\n \n-\t\t//\"values\"\n-\t\tpublic Keyword getValuesKeyword_1_1_0() { return cValuesKeyword_1_1_0; }\n+\t\t//(\"arrival-rate-avg\" arrivalRateAvg=BigUnitValue)?\n+\t\tpublic Group getGroup_5() { return cGroup_5; }\n \n-\t\t//\"{\"\n-\t\tpublic Keyword getLeftCurlyBracketKeyword_1_1_1() { return cLeftCurlyBracketKeyword_1_1_1; }\n+\t\t//\"arrival-rate-avg\"\n+\t\tpublic Keyword getArrivalRateAvgKeyword_5_0() { return cArrivalRateAvgKeyword_5_0; }\n \n-\t\t//values+=STRING*\n-\t\tpublic Assignment getValuesAssignment_1_1_2() { return cValuesAssignment_1_1_2; }\n+\t\t//arrivalRateAvg=BigUnitValue\n+\t\tpublic Assignment getArrivalRateAvgAssignment_5_1() { return cArrivalRateAvgAssignment_5_1; }\n \n-\t\t//STRING\n-\t\tpublic RuleCall getValuesSTRINGTerminalRuleCall_1_1_2_0() { return cValuesSTRINGTerminalRuleCall_1_1_2_0; }\n+\t\t//BigUnitValue\n+\t\tpublic RuleCall getArrivalRateAvgBigUnitValueParserRuleCall_5_1_0() { return cArrivalRateAvgBigUnitValueParserRuleCall_5_1_0; }\n \n-\t\t//\"}\"\n-\t\tpublic Keyword getRightCurlyBracketKeyword_1_1_3() { return cRightCurlyBracketKeyword_1_1_3; }\n+\t\t//(\"arrival-rate-minimum\" arrivalRateMinimum=BigUnitValue)?\n+\t\tpublic Group getGroup_6() { return cGroup_6; }\n \n-\t\t//(\"rate\" rate=BigUnitValue)?\n-\t\tpublic Group getGroup_2() { return cGroup_2; }\n+\t\t//\"arrival-rate-minimum\"\n+\t\tpublic Keyword getArrivalRateMinimumKeyword_6_0() { return cArrivalRateMinimumKeyword_6_0; }\n \n-\t\t//\"rate\"\n-\t\tpublic Keyword getRateKeyword_2_0() { return cRateKeyword_2_0; }\n+\t\t//arrivalRateMinimum=BigUnitValue\n+\t\tpublic Assignment getArrivalRateMinimumAssignment_6_1() { return cArrivalRateMinimumAssignment_6_1; }\n \n-\t\t//rate=BigUnitValue\n-\t\tpublic Assignment getRateAssignment_2_1() { return cRateAssignment_2_1; }\n+\t\t//BigUnitValue\n+\t\tpublic RuleCall getArrivalRateMinimumBigUnitValueParserRuleCall_6_1_0() { return cArrivalRateMinimumBigUnitValueParserRuleCall_6_1_0; }\n+\n+\t\t//(\"arrival-rate-maximum\" arrivalRateMaximum=BigUnitValue)?\n+\t\tpublic Group getGroup_7() { return cGroup_7; }\n+\n+\t\t//\"arrival-rate-maximum\"\n+\t\tpublic Keyword getArrivalRateMaximumKeyword_7_0() { return cArrivalRateMaximumKeyword_7_0; }\n+\n+\t\t//arrivalRateMaximum=BigUnitValue\n+\t\tpublic Assignment getArrivalRateMaximumAssignment_7_1() { return cArrivalRateMaximumAssignment_7_1; }\n \n \t\t//BigUnitValue\n-\t\tpublic RuleCall getRateBigUnitValueParserRuleCall_2_1_0() { return cRateBigUnitValueParserRuleCall_2_1_0; }\n+\t\tpublic RuleCall getArrivalRateMaximumBigUnitValueParserRuleCall_7_1_0() { return cArrivalRateMaximumBigUnitValueParserRuleCall_7_1_0; }\n \n-\t\t//(\"variables\" variables=STRING)?\n-\t\tpublic Group getGroup_3() { return cGroup_3; }\n+\t\t//(\"obsolescence\" obsolescence=BigUnitValue)?\n+\t\tpublic Group getGroup_8() { return cGroup_8; }\n \n-\t\t//\"variables\"\n-\t\tpublic Keyword getVariablesKeyword_3_0() { return cVariablesKeyword_3_0; }\n+\t\t//\"obsolescence\"\n+\t\tpublic Keyword getObsolescenceKeyword_8_0() { return cObsolescenceKeyword_8_0; }\n \n-\t\t//variables=STRING\n-\t\tpublic Assignment getVariablesAssignment_3_1() { return cVariablesAssignment_3_1; }\n+\t\t//obsolescence=BigUnitValue\n+\t\tpublic Assignment getObsolescenceAssignment_8_1() { return cObsolescenceAssignment_8_1; }\n \n-\t\t//STRING\n-\t\tpublic RuleCall getVariablesSTRINGTerminalRuleCall_3_1_0() { return cVariablesSTRINGTerminalRuleCall_3_1_0; }\n+\t\t//BigUnitValue\n+\t\tpublic RuleCall getObsolescenceBigUnitValueParserRuleCall_8_1_0() { return cObsolescenceBigUnitValueParserRuleCall_8_1_0; }\n \n \t\t//(\"references\" references=STRING)?\n-\t\tpublic Group getGroup_4() { return cGroup_4; }\n+\t\tpublic Group getGroup_9() { return cGroup_9; }\n \n \t\t//\"references\"\n-\t\tpublic Keyword getReferencesKeyword_4_0() { return cReferencesKeyword_4_0; }\n+\t\tpublic Keyword getReferencesKeyword_9_0() { return cReferencesKeyword_9_0; }\n \n \t\t//references=STRING\n-\t\tpublic Assignment getReferencesAssignment_4_1() { return cReferencesAssignment_4_1; }\n+\t\tpublic Assignment getReferencesAssignment_9_1() { return cReferencesAssignment_9_1; }\n+\n+\t\t//STRING\n+\t\tpublic RuleCall getReferencesSTRINGTerminalRuleCall_9_1_0() { return cReferencesSTRINGTerminalRuleCall_9_1_0; }\n+\n+\t\t//(\"appears-in\" appearsIn=STRING)?\n+\t\tpublic Group getGroup_10() { return cGroup_10; }\n+\n+\t\t//\"appears-in\"\n+\t\tpublic Keyword getAppearsInKeyword_10_0() { return cAppearsInKeyword_10_0; }\n+\n+\t\t//appearsIn=STRING\n+\t\tpublic Assignment getAppearsInAssignment_10_1() { return cAppearsInAssignment_10_1; }\n \n \t\t//STRING\n-\t\tpublic RuleCall getReferencesSTRINGTerminalRuleCall_4_1_0() { return cReferencesSTRINGTerminalRuleCall_4_1_0; }\n+\t\tpublic RuleCall getAppearsInSTRINGTerminalRuleCall_10_1_0() { return cAppearsInSTRINGTerminalRuleCall_10_1_0; }\n+\n+\t\t//(\"description\" description=STRING)?\n+\t\tpublic Group getGroup_11() { return cGroup_11; }\n+\n+\t\t//\"description\"\n+\t\tpublic Keyword getDescriptionKeyword_11_0() { return cDescriptionKeyword_11_0; }\n+\n+\t\t//description=STRING\n+\t\tpublic Assignment getDescriptionAssignment_11_1() { return cDescriptionAssignment_11_1; }\n+\n+\t\t//STRING\n+\t\tpublic RuleCall getDescriptionSTRINGTerminalRuleCall_11_1_0() { return cDescriptionSTRINGTerminalRuleCall_11_1_0; }\n \n \t\t//(\"comments\" comments=STRING)?\n-\t\tpublic Group getGroup_5() { return cGroup_5; }\n+\t\tpublic Group getGroup_12() { return cGroup_12; }\n \n \t\t//\"comments\"\n-\t\tpublic Keyword getCommentsKeyword_5_0() { return cCommentsKeyword_5_0; }\n+\t\tpublic Keyword getCommentsKeyword_12_0() { return cCommentsKeyword_12_0; }\n \n \t\t//comments=STRING\n-\t\tpublic Assignment getCommentsAssignment_5_1() { return cCommentsAssignment_5_1; }\n+\t\tpublic Assignment getCommentsAssignment_12_1() { return cCommentsAssignment_12_1; }\n \n \t\t//STRING\n-\t\tpublic RuleCall getCommentsSTRINGTerminalRuleCall_5_1_0() { return cCommentsSTRINGTerminalRuleCall_5_1_0; }\n+\t\tpublic RuleCall getCommentsSTRINGTerminalRuleCall_12_1_0() { return cCommentsSTRINGTerminalRuleCall_12_1_0; }\n+\n+\t\t//(\"triggering\" structure=TriggerTable)?\n+\t\tpublic Group getGroup_13() { return cGroup_13; }\n+\n+\t\t//\"triggering\"\n+\t\tpublic Keyword getTriggeringKeyword_13_0() { return cTriggeringKeyword_13_0; }\n+\n+\t\t//structure=TriggerTable\n+\t\tpublic Assignment getStructureAssignment_13_1() { return cStructureAssignment_13_1; }\n+\n+\t\t//TriggerTable\n+\t\tpublic RuleCall getStructureTriggerTableParserRuleCall_13_1_0() { return cStructureTriggerTableParserRuleCall_13_1_0; }\n \t}\n \t\n \t\n@@ -1457,6 +1553,8 @@ public class InputElements extends AbstractParserRuleElementFinder {\n \tprivate StateListElements pStateList;\n \tprivate TriggerElements pTrigger;\n \tprivate TriggerTableElements pTriggerTable;\n+\tprivate ValueRangeElements pValueRange;\n+\tprivate ValueListElements pValueList;\n \tprivate OutputElements pOutput;\n \tprivate InputElements pInput;\n \t\n@@ -1701,10 +1799,29 @@ public ParserRule getTriggerTableRule() {\n \t\treturn getTriggerTableAccess().getRule();\n \t}\n \n+\t//ValueRange:\n+\t//\t\"{\" lower=BigDecimalType \"...\" upper=BigDecimalType \"}\" \"type\" rangeType=STRING \"units\" rangeUnits=STRING \"}\";\n+\tpublic ValueRangeElements getValueRangeAccess() {\n+\t\treturn (pValueRange != null) ? pValueRange : (pValueRange = new ValueRangeElements());\n+\t}\n+\t\n+\tpublic ParserRule getValueRangeRule() {\n+\t\treturn getValueRangeAccess().getRule();\n+\t}\n+\n+\t//ValueList:\n+\t//\t\"{\" values+=STRING+ \"}\";\n+\tpublic ValueListElements getValueListAccess() {\n+\t\treturn (pValueList != null) ? pValueList : (pValueList = new ValueListElements());\n+\t}\n+\t\n+\tpublic ParserRule getValueListRule() {\n+\t\treturn getValueListAccess().getRule();\n+\t}\n+\n \t//Output:\n-\t//\t{Output} (\"range\" \"{\" lower=BigDecimalType \"...\" upper=BigDecimalType \"}\" \"type\" rangeType=STRING \"units\"\n-\t//\trangeUnits=STRING | \"values\" \"{\" values+=STRING* \"}\") (\"rate\" rate=BigUnitValue)? (\"initiation-delay\"\n-\t//\tdelay=BigUnitValue)? (\"completion-deadline\" deadline=BigUnitValue)? (\"completion-exception\"\n+\t//\t{Output} (\"range\" range=ValueRange)? (\"value-list\" valueList=ValueList)? (\"rate\" rate=BigUnitValue)?\n+\t//\t(\"initiation-delay\" delay=BigUnitValue)? (\"completion-deadline\" deadline=BigUnitValue)? (\"completion-exception\"\n \t//\tcompletionHandling=STRING)? (\"variables\" variables=STRING)? (\"relationship\" relationship=STRING)? (\"min-response-time\"\n \t//\tminResponse=BigUnitValue)? (\"max-response-time\" maxResponse=BigUnitValue)? (\"feedback-exception\"\n \t//\tfeebackHandling=STRING)? (\"reversed-by\" reversed=STRING)? (\"references\" references=STRING)? (\"comments\"\n@@ -1718,9 +1835,11 @@ public ParserRule getOutputRule() {\n \t}\n \n \t//Input:\n-\t//\t{Input} (\"range\" \"{\" lower=BigDecimalType \"...\" upper=BigDecimalType \"}\" \"type\" rangeType=STRING \"units\"\n-\t//\trangeUnits=STRING | \"values\" \"{\" values+=STRING* \"}\") (\"rate\" rate=BigUnitValue)? (\"variables\" variables=STRING)?\n-\t//\t(\"references\" references=STRING)? (\"comments\" comments=STRING)?;\n+\t//\t{Input} (\"range\" range=ValueRange)? (\"value-list\" valueList=ValueList)? (\"value-exception\" valueHandling=STRING)?\n+\t//\t(\"granularity\" granularity=BigUnitValue)? (\"arrival-rate-avg\" arrivalRateAvg=BigUnitValue)? (\"arrival-rate-minimum\"\n+\t//\tarrivalRateMinimum=BigUnitValue)? (\"arrival-rate-maximum\" arrivalRateMaximum=BigUnitValue)? (\"obsolescence\"\n+\t//\tobsolescence=BigUnitValue)? (\"references\" references=STRING)? (\"appears-in\" appearsIn=STRING)? (\"description\"\n+\t//\tdescription=STRING)? (\"comments\" comments=STRING)? (\"triggering\" structure=TriggerTable)?;\n \tpublic InputElements getInputAccess() {\n \t\treturn (pInput != null) ? pInput : (pInput = new InputElements());\n \t}", "raw_url": "https://github.com/nasa/CertWare/raw/110fa3222ae2931978d7921dc8e6af8c7f43abd3/net.certware.intent.state%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fstate%2Fservices%2FStateSpecificationGrammarAccess.java", "sha": "c3b532fdec2b7cd0630959a9e055db1042614091", "status": "modified" }, { "additions": 196, "blob_url": "https://github.com/nasa/CertWare/blob/110fa3222ae2931978d7921dc8e6af8c7f43abd3/net.certware.intent.state%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fstate%2FstateSpecification%2FInput.java", "changes": 278, "contents_url": "https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent.state%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fstate%2FstateSpecification%2FInput.java?ref=110fa3222ae2931978d7921dc8e6af8c7f43abd3", "deletions": 82, "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/stateSpecification/Input.java", "new_code": " * <li>{@link net.certware.intent.state.stateSpecification.Input#getRange <em>Range</em>}</li>\n * <li>{@link net.certware.intent.state.stateSpecification.Input#getValueList <em>Value List</em>}</li>\n * <li>{@link net.certware.intent.state.stateSpecification.Input#getValueHandling <em>Value Handling</em>}</li>\n * <li>{@link net.certware.intent.state.stateSpecification.Input#getGranularity <em>Granularity</em>}</li>\n * <li>{@link net.certware.intent.state.stateSpecification.Input#getArrivalRateAvg <em>Arrival Rate Avg</em>}</li>\n * <li>{@link net.certware.intent.state.stateSpecification.Input#getArrivalRateMinimum <em>Arrival Rate Minimum</em>}</li>\n * <li>{@link net.certware.intent.state.stateSpecification.Input#getArrivalRateMaximum <em>Arrival Rate Maximum</em>}</li>\n * <li>{@link net.certware.intent.state.stateSpecification.Input#getObsolescence <em>Obsolescence</em>}</li>\n * <li>{@link net.certware.intent.state.stateSpecification.Input#getAppearsIn <em>Appears In</em>}</li>\n * <li>{@link net.certware.intent.state.stateSpecification.Input#getDescription <em>Description</em>}</li>\n * <li>{@link net.certware.intent.state.stateSpecification.Input#getStructure <em>Structure</em>}</li>\n * Returns the value of the '<em><b>Range</b></em>' containment reference.\n * If the meaning of the '<em>Range</em>' containment reference isn't clear,\n * @return the value of the '<em>Range</em>' containment reference.\n * @see #setRange(ValueRange)\n * @see net.certware.intent.state.stateSpecification.StateSpecificationPackage#getInput_Range()\n * @model containment=\"true\"\n ValueRange getRange();\n * Sets the value of the '{@link net.certware.intent.state.stateSpecification.Input#getRange <em>Range</em>}' containment reference.\n * @param value the new value of the '<em>Range</em>' containment reference.\n * @see #getRange()\n void setRange(ValueRange value);\n * Returns the value of the '<em><b>Value List</b></em>' containment reference.\n * If the meaning of the '<em>Value List</em>' containment reference isn't clear,\n * @return the value of the '<em>Value List</em>' containment reference.\n * @see #setValueList(ValueList)\n * @see net.certware.intent.state.stateSpecification.StateSpecificationPackage#getInput_ValueList()\n * @model containment=\"true\"\n ValueList getValueList();\n * Sets the value of the '{@link net.certware.intent.state.stateSpecification.Input#getValueList <em>Value List</em>}' containment reference.\n * @param value the new value of the '<em>Value List</em>' containment reference.\n * @see #getValueList()\n void setValueList(ValueList value);\n * Returns the value of the '<em><b>Value Handling</b></em>' attribute.\n * If the meaning of the '<em>Value Handling</em>' attribute isn't clear,\n * @return the value of the '<em>Value Handling</em>' attribute.\n * @see #setValueHandling(String)\n * @see net.certware.intent.state.stateSpecification.StateSpecificationPackage#getInput_ValueHandling()\n String getValueHandling();\n * Sets the value of the '{@link net.certware.intent.state.stateSpecification.Input#getValueHandling <em>Value Handling</em>}' attribute.\n * @param value the new value of the '<em>Value Handling</em>' attribute.\n * @see #getValueHandling()\n void setValueHandling(String value);\n * Returns the value of the '<em><b>Granularity</b></em>' containment reference.\n * If the meaning of the '<em>Granularity</em>' containment reference isn't clear,\n * @return the value of the '<em>Granularity</em>' containment reference.\n * @see #setGranularity(BigUnitValue)\n * @see net.certware.intent.state.stateSpecification.StateSpecificationPackage#getInput_Granularity()\n * @model containment=\"true\"\n BigUnitValue getGranularity();\n * Sets the value of the '{@link net.certware.intent.state.stateSpecification.Input#getGranularity <em>Granularity</em>}' containment reference.\n * @param value the new value of the '<em>Granularity</em>' containment reference.\n * @see #getGranularity()\n void setGranularity(BigUnitValue value);\n * Returns the value of the '<em><b>Arrival Rate Avg</b></em>' containment reference.\n * If the meaning of the '<em>Arrival Rate Avg</em>' containment reference isn't clear,\n * @return the value of the '<em>Arrival Rate Avg</em>' containment reference.\n * @see #setArrivalRateAvg(BigUnitValue)\n * @see net.certware.intent.state.stateSpecification.StateSpecificationPackage#getInput_ArrivalRateAvg()\n * @model containment=\"true\"\n BigUnitValue getArrivalRateAvg();\n * Sets the value of the '{@link net.certware.intent.state.stateSpecification.Input#getArrivalRateAvg <em>Arrival Rate Avg</em>}' containment reference.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @param value the new value of the '<em>Arrival Rate Avg</em>' containment reference.\n * @see #getArrivalRateAvg()\n * @generated\n */\n void setArrivalRateAvg(BigUnitValue value);\n\n /**\n * Returns the value of the '<em><b>Arrival Rate Minimum</b></em>' containment reference.\n * If the meaning of the '<em>Arrival Rate Minimum</em>' containment reference isn't clear,\n * @return the value of the '<em>Arrival Rate Minimum</em>' containment reference.\n * @see #setArrivalRateMinimum(BigUnitValue)\n * @see net.certware.intent.state.stateSpecification.StateSpecificationPackage#getInput_ArrivalRateMinimum()\n BigUnitValue getArrivalRateMinimum();\n * Sets the value of the '{@link net.certware.intent.state.stateSpecification.Input#getArrivalRateMinimum <em>Arrival Rate Minimum</em>}' containment reference.\n * @param value the new value of the '<em>Arrival Rate Minimum</em>' containment reference.\n * @see #getArrivalRateMinimum()\n void setArrivalRateMinimum(BigUnitValue value);\n * Returns the value of the '<em><b>Arrival Rate Maximum</b></em>' containment reference.\n * If the meaning of the '<em>Arrival Rate Maximum</em>' containment reference isn't clear,\n * @return the value of the '<em>Arrival Rate Maximum</em>' containment reference.\n * @see #setArrivalRateMaximum(BigUnitValue)\n * @see net.certware.intent.state.stateSpecification.StateSpecificationPackage#getInput_ArrivalRateMaximum()\n * @model containment=\"true\"\n BigUnitValue getArrivalRateMaximum();\n * Sets the value of the '{@link net.certware.intent.state.stateSpecification.Input#getArrivalRateMaximum <em>Arrival Rate Maximum</em>}' containment reference.\n * @param value the new value of the '<em>Arrival Rate Maximum</em>' containment reference.\n * @see #getArrivalRateMaximum()\n void setArrivalRateMaximum(BigUnitValue value);\n\n /**\n * Returns the value of the '<em><b>Obsolescence</b></em>' containment reference.\n * <!-- begin-user-doc -->\n * <p>\n * If the meaning of the '<em>Obsolescence</em>' containment reference isn't clear,\n * there really should be more of a description here...\n * </p>\n * <!-- end-user-doc -->\n * @return the value of the '<em>Obsolescence</em>' containment reference.\n * @see #setObsolescence(BigUnitValue)\n * @see net.certware.intent.state.stateSpecification.StateSpecificationPackage#getInput_Obsolescence()\n * @model containment=\"true\"\n * @generated\n */\n BigUnitValue getObsolescence();\n\n /**\n * Sets the value of the '{@link net.certware.intent.state.stateSpecification.Input#getObsolescence <em>Obsolescence</em>}' containment reference.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @param value the new value of the '<em>Obsolescence</em>' containment reference.\n * @see #getObsolescence()\n * @generated\n */\n void setObsolescence(BigUnitValue value);\n /**\n * Returns the value of the '<em><b>Appears In</b></em>' attribute.\n * <!-- begin-user-doc -->\n * <p>\n * If the meaning of the '<em>Appears In</em>' attribute isn't clear,\n * there really should be more of a description here...\n * </p>\n * <!-- end-user-doc -->\n * @return the value of the '<em>Appears In</em>' attribute.\n * @see #setAppearsIn(String)\n * @see net.certware.intent.state.stateSpecification.StateSpecificationPackage#getInput_AppearsIn()\n * @model\n * @generated\n */\n String getAppearsIn();\n\n /**\n * Sets the value of the '{@link net.certware.intent.state.stateSpecification.Input#getAppearsIn <em>Appears In</em>}' attribute.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @param value the new value of the '<em>Appears In</em>' attribute.\n * @see #getAppearsIn()\n * @generated\n */\n void setAppearsIn(String value);\n\n /**\n * Returns the value of the '<em><b>Description</b></em>' attribute.\n * <!-- begin-user-doc -->\n * <p>\n * If the meaning of the '<em>Description</em>' attribute isn't clear,\n * there really should be more of a description here...\n * </p>\n * <!-- end-user-doc -->\n * @return the value of the '<em>Description</em>' attribute.\n * @see #setDescription(String)\n * @see net.certware.intent.state.stateSpecification.StateSpecificationPackage#getInput_Description()\n * @model\n * @generated\n */\n String getDescription();\n\n /**\n * Sets the value of the '{@link net.certware.intent.state.stateSpecification.Input#getDescription <em>Description</em>}' attribute.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @param value the new value of the '<em>Description</em>' attribute.\n * @see #getDescription()\n * @generated\n */\n void setDescription(String value);\n\n /**\n * Returns the value of the '<em><b>Structure</b></em>' containment reference.\n * <!-- begin-user-doc -->\n * <p>\n * If the meaning of the '<em>Structure</em>' containment reference isn't clear,\n * there really should be more of a description here...\n * </p>\n * <!-- end-user-doc -->\n * @return the value of the '<em>Structure</em>' containment reference.\n * @see #setStructure(TriggerTable)\n * @see net.certware.intent.state.stateSpecification.StateSpecificationPackage#getInput_Structure()\n * @model containment=\"true\"\n * @generated\n */\n TriggerTable getStructure();\n\n /**\n * Sets the value of the '{@link net.certware.intent.state.stateSpecification.Input#getStructure <em>Structure</em>}' containment reference.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @param value the new value of the '<em>Structure</em>' containment reference.\n * @see #getStructure()\n * @generated\n */\n void setStructure(TriggerTable value);\n", "new_methods": [], "old_code": "import java.math.BigDecimal;\n\nimport org.eclipse.emf.common.util.EList;\n\n * <li>{@link net.certware.intent.state.stateSpecification.Input#getLower <em>Lower</em>}</li>\n * <li>{@link net.certware.intent.state.stateSpecification.Input#getUpper <em>Upper</em>}</li>\n * <li>{@link net.certware.intent.state.stateSpecification.Input#getRangeType <em>Range Type</em>}</li>\n * <li>{@link net.certware.intent.state.stateSpecification.Input#getRangeUnits <em>Range Units</em>}</li>\n * <li>{@link net.certware.intent.state.stateSpecification.Input#getValues <em>Values</em>}</li>\n * <li>{@link net.certware.intent.state.stateSpecification.Input#getRate <em>Rate</em>}</li>\n * <li>{@link net.certware.intent.state.stateSpecification.Input#getVariables <em>Variables</em>}</li>\n * Returns the value of the '<em><b>Lower</b></em>' attribute.\n * If the meaning of the '<em>Lower</em>' attribute isn't clear,\n * @return the value of the '<em>Lower</em>' attribute.\n * @see #setLower(BigDecimal)\n * @see net.certware.intent.state.stateSpecification.StateSpecificationPackage#getInput_Lower()\n * @model\n BigDecimal getLower();\n * Sets the value of the '{@link net.certware.intent.state.stateSpecification.Input#getLower <em>Lower</em>}' attribute.\n * @param value the new value of the '<em>Lower</em>' attribute.\n * @see #getLower()\n void setLower(BigDecimal value);\n * Returns the value of the '<em><b>Upper</b></em>' attribute.\n * If the meaning of the '<em>Upper</em>' attribute isn't clear,\n * @return the value of the '<em>Upper</em>' attribute.\n * @see #setUpper(BigDecimal)\n * @see net.certware.intent.state.stateSpecification.StateSpecificationPackage#getInput_Upper()\n * @model\n BigDecimal getUpper();\n * Sets the value of the '{@link net.certware.intent.state.stateSpecification.Input#getUpper <em>Upper</em>}' attribute.\n * @param value the new value of the '<em>Upper</em>' attribute.\n * @see #getUpper()\n void setUpper(BigDecimal value);\n * Returns the value of the '<em><b>Range Type</b></em>' attribute.\n * If the meaning of the '<em>Range Type</em>' attribute isn't clear,\n * @return the value of the '<em>Range Type</em>' attribute.\n * @see #setRangeType(String)\n * @see net.certware.intent.state.stateSpecification.StateSpecificationPackage#getInput_RangeType()\n String getRangeType();\n * Sets the value of the '{@link net.certware.intent.state.stateSpecification.Input#getRangeType <em>Range Type</em>}' attribute.\n * @param value the new value of the '<em>Range Type</em>' attribute.\n * @see #getRangeType()\n void setRangeType(String value);\n * Returns the value of the '<em><b>Range Units</b></em>' attribute.\n * If the meaning of the '<em>Range Units</em>' attribute isn't clear,\n * @return the value of the '<em>Range Units</em>' attribute.\n * @see #setRangeUnits(String)\n * @see net.certware.intent.state.stateSpecification.StateSpecificationPackage#getInput_RangeUnits()\n * @model\n String getRangeUnits();\n * Sets the value of the '{@link net.certware.intent.state.stateSpecification.Input#getRangeUnits <em>Range Units</em>}' attribute.\n * @param value the new value of the '<em>Range Units</em>' attribute.\n * @see #getRangeUnits()\n void setRangeUnits(String value);\n * Returns the value of the '<em><b>Values</b></em>' attribute list.\n * The list contents are of type {@link java.lang.String}.\n * If the meaning of the '<em>Values</em>' attribute list isn't clear,\n * @return the value of the '<em>Values</em>' attribute list.\n * @see net.certware.intent.state.stateSpecification.StateSpecificationPackage#getInput_Values()\n * @model unique=\"false\"\n EList<String> getValues();\n * Returns the value of the '<em><b>Rate</b></em>' containment reference.\n * If the meaning of the '<em>Rate</em>' containment reference isn't clear,\n * @return the value of the '<em>Rate</em>' containment reference.\n * @see #setRate(BigUnitValue)\n * @see net.certware.intent.state.stateSpecification.StateSpecificationPackage#getInput_Rate()\n BigUnitValue getRate();\n * Sets the value of the '{@link net.certware.intent.state.stateSpecification.Input#getRate <em>Rate</em>}' containment reference.\n * @param value the new value of the '<em>Rate</em>' containment reference.\n * @see #getRate()\n void setRate(BigUnitValue value);\n * Returns the value of the '<em><b>Variables</b></em>' attribute.\n * If the meaning of the '<em>Variables</em>' attribute isn't clear,\n * @return the value of the '<em>Variables</em>' attribute.\n * @see #setVariables(String)\n * @see net.certware.intent.state.stateSpecification.StateSpecificationPackage#getInput_Variables()\n * @model\n String getVariables();\n * Sets the value of the '{@link net.certware.intent.state.stateSpecification.Input#getVariables <em>Variables</em>}' attribute.\n * @param value the new value of the '<em>Variables</em>' attribute.\n * @see #getVariables()\n void setVariables(String value);", "old_methods": [], "patch": "@@ -2,10 +2,6 @@\n */\n package net.certware.intent.state.stateSpecification;\n \n-import java.math.BigDecimal;\n-\n-import org.eclipse.emf.common.util.EList;\n-\n import org.eclipse.emf.ecore.EObject;\n \n /**\n@@ -16,15 +12,19 @@\n * <p>\n * The following features are supported:\n * <ul>\n- * <li>{@link net.certware.intent.state.stateSpecification.Input#getLower <em>Lower</em>}</li>\n- * <li>{@link net.certware.intent.state.stateSpecification.Input#getUpper <em>Upper</em>}</li>\n- * <li>{@link net.certware.intent.state.stateSpecification.Input#getRangeType <em>Range Type</em>}</li>\n- * <li>{@link net.certware.intent.state.stateSpecification.Input#getRangeUnits <em>Range Units</em>}</li>\n- * <li>{@link net.certware.intent.state.stateSpecification.Input#getValues <em>Values</em>}</li>\n- * <li>{@link net.certware.intent.state.stateSpecification.Input#getRate <em>Rate</em>}</li>\n- * <li>{@link net.certware.intent.state.stateSpecification.Input#getVariables <em>Variables</em>}</li>\n+ * <li>{@link net.certware.intent.state.stateSpecification.Input#getRange <em>Range</em>}</li>\n+ * <li>{@link net.certware.intent.state.stateSpecification.Input#getValueList <em>Value List</em>}</li>\n+ * <li>{@link net.certware.intent.state.stateSpecification.Input#getValueHandling <em>Value Handling</em>}</li>\n+ * <li>{@link net.certware.intent.state.stateSpecification.Input#getGranularity <em>Granularity</em>}</li>\n+ * <li>{@link net.certware.intent.state.stateSpecification.Input#getArrivalRateAvg <em>Arrival Rate Avg</em>}</li>\n+ * <li>{@link net.certware.intent.state.stateSpecification.Input#getArrivalRateMinimum <em>Arrival Rate Minimum</em>}</li>\n+ * <li>{@link net.certware.intent.state.stateSpecification.Input#getArrivalRateMaximum <em>Arrival Rate Maximum</em>}</li>\n+ * <li>{@link net.certware.intent.state.stateSpecification.Input#getObsolescence <em>Obsolescence</em>}</li>\n * <li>{@link net.certware.intent.state.stateSpecification.Input#getReferences <em>References</em>}</li>\n+ * <li>{@link net.certware.intent.state.stateSpecification.Input#getAppearsIn <em>Appears In</em>}</li>\n+ * <li>{@link net.certware.intent.state.stateSpecification.Input#getDescription <em>Description</em>}</li>\n * <li>{@link net.certware.intent.state.stateSpecification.Input#getComments <em>Comments</em>}</li>\n+ * <li>{@link net.certware.intent.state.stateSpecification.Input#getStructure <em>Structure</em>}</li>\n * </ul>\n * </p>\n *\n@@ -35,176 +35,212 @@\n public interface Input extends EObject\n {\n /**\n- * Returns the value of the '<em><b>Lower</b></em>' attribute.\n+ * Returns the value of the '<em><b>Range</b></em>' containment reference.\n * <!-- begin-user-doc -->\n * <p>\n- * If the meaning of the '<em>Lower</em>' attribute isn't clear,\n+ * If the meaning of the '<em>Range</em>' containment reference isn't clear,\n * there really should be more of a description here...\n * </p>\n * <!-- end-user-doc -->\n- * @return the value of the '<em>Lower</em>' attribute.\n- * @see #setLower(BigDecimal)\n- * @see net.certware.intent.state.stateSpecification.StateSpecificationPackage#getInput_Lower()\n- * @model\n+ * @return the value of the '<em>Range</em>' containment reference.\n+ * @see #setRange(ValueRange)\n+ * @see net.certware.intent.state.stateSpecification.StateSpecificationPackage#getInput_Range()\n+ * @model containment=\"true\"\n * @generated\n */\n- BigDecimal getLower();\n+ ValueRange getRange();\n \n /**\n- * Sets the value of the '{@link net.certware.intent.state.stateSpecification.Input#getLower <em>Lower</em>}' attribute.\n+ * Sets the value of the '{@link net.certware.intent.state.stateSpecification.Input#getRange <em>Range</em>}' containment reference.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n- * @param value the new value of the '<em>Lower</em>' attribute.\n- * @see #getLower()\n+ * @param value the new value of the '<em>Range</em>' containment reference.\n+ * @see #getRange()\n * @generated\n */\n- void setLower(BigDecimal value);\n+ void setRange(ValueRange value);\n \n /**\n- * Returns the value of the '<em><b>Upper</b></em>' attribute.\n+ * Returns the value of the '<em><b>Value List</b></em>' containment reference.\n * <!-- begin-user-doc -->\n * <p>\n- * If the meaning of the '<em>Upper</em>' attribute isn't clear,\n+ * If the meaning of the '<em>Value List</em>' containment reference isn't clear,\n * there really should be more of a description here...\n * </p>\n * <!-- end-user-doc -->\n- * @return the value of the '<em>Upper</em>' attribute.\n- * @see #setUpper(BigDecimal)\n- * @see net.certware.intent.state.stateSpecification.StateSpecificationPackage#getInput_Upper()\n- * @model\n+ * @return the value of the '<em>Value List</em>' containment reference.\n+ * @see #setValueList(ValueList)\n+ * @see net.certware.intent.state.stateSpecification.StateSpecificationPackage#getInput_ValueList()\n+ * @model containment=\"true\"\n * @generated\n */\n- BigDecimal getUpper();\n+ ValueList getValueList();\n \n /**\n- * Sets the value of the '{@link net.certware.intent.state.stateSpecification.Input#getUpper <em>Upper</em>}' attribute.\n+ * Sets the value of the '{@link net.certware.intent.state.stateSpecification.Input#getValueList <em>Value List</em>}' containment reference.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n- * @param value the new value of the '<em>Upper</em>' attribute.\n- * @see #getUpper()\n+ * @param value the new value of the '<em>Value List</em>' containment reference.\n+ * @see #getValueList()\n * @generated\n */\n- void setUpper(BigDecimal value);\n+ void setValueList(ValueList value);\n \n /**\n- * Returns the value of the '<em><b>Range Type</b></em>' attribute.\n+ * Returns the value of the '<em><b>Value Handling</b></em>' attribute.\n * <!-- begin-user-doc -->\n * <p>\n- * If the meaning of the '<em>Range Type</em>' attribute isn't clear,\n+ * If the meaning of the '<em>Value Handling</em>' attribute isn't clear,\n * there really should be more of a description here...\n * </p>\n * <!-- end-user-doc -->\n- * @return the value of the '<em>Range Type</em>' attribute.\n- * @see #setRangeType(String)\n- * @see net.certware.intent.state.stateSpecification.StateSpecificationPackage#getInput_RangeType()\n+ * @return the value of the '<em>Value Handling</em>' attribute.\n+ * @see #setValueHandling(String)\n+ * @see net.certware.intent.state.stateSpecification.StateSpecificationPackage#getInput_ValueHandling()\n * @model\n * @generated\n */\n- String getRangeType();\n+ String getValueHandling();\n \n /**\n- * Sets the value of the '{@link net.certware.intent.state.stateSpecification.Input#getRangeType <em>Range Type</em>}' attribute.\n+ * Sets the value of the '{@link net.certware.intent.state.stateSpecification.Input#getValueHandling <em>Value Handling</em>}' attribute.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n- * @param value the new value of the '<em>Range Type</em>' attribute.\n- * @see #getRangeType()\n+ * @param value the new value of the '<em>Value Handling</em>' attribute.\n+ * @see #getValueHandling()\n * @generated\n */\n- void setRangeType(String value);\n+ void setValueHandling(String value);\n \n /**\n- * Returns the value of the '<em><b>Range Units</b></em>' attribute.\n+ * Returns the value of the '<em><b>Granularity</b></em>' containment reference.\n * <!-- begin-user-doc -->\n * <p>\n- * If the meaning of the '<em>Range Units</em>' attribute isn't clear,\n+ * If the meaning of the '<em>Granularity</em>' containment reference isn't clear,\n * there really should be more of a description here...\n * </p>\n * <!-- end-user-doc -->\n- * @return the value of the '<em>Range Units</em>' attribute.\n- * @see #setRangeUnits(String)\n- * @see net.certware.intent.state.stateSpecification.StateSpecificationPackage#getInput_RangeUnits()\n- * @model\n+ * @return the value of the '<em>Granularity</em>' containment reference.\n+ * @see #setGranularity(BigUnitValue)\n+ * @see net.certware.intent.state.stateSpecification.StateSpecificationPackage#getInput_Granularity()\n+ * @model containment=\"true\"\n * @generated\n */\n- String getRangeUnits();\n+ BigUnitValue getGranularity();\n \n /**\n- * Sets the value of the '{@link net.certware.intent.state.stateSpecification.Input#getRangeUnits <em>Range Units</em>}' attribute.\n+ * Sets the value of the '{@link net.certware.intent.state.stateSpecification.Input#getGranularity <em>Granularity</em>}' containment reference.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n- * @param value the new value of the '<em>Range Units</em>' attribute.\n- * @see #getRangeUnits()\n+ * @param value the new value of the '<em>Granularity</em>' containment reference.\n+ * @see #getGranularity()\n * @generated\n */\n- void setRangeUnits(String value);\n+ void setGranularity(BigUnitValue value);\n \n /**\n- * Returns the value of the '<em><b>Values</b></em>' attribute list.\n- * The list contents are of type {@link java.lang.String}.\n+ * Returns the value of the '<em><b>Arrival Rate Avg</b></em>' containment reference.\n * <!-- begin-user-doc -->\n * <p>\n- * If the meaning of the '<em>Values</em>' attribute list isn't clear,\n+ * If the meaning of the '<em>Arrival Rate Avg</em>' containment reference isn't clear,\n * there really should be more of a description here...\n * </p>\n * <!-- end-user-doc -->\n- * @return the value of the '<em>Values</em>' attribute list.\n- * @see net.certware.intent.state.stateSpecification.StateSpecificationPackage#getInput_Values()\n- * @model unique=\"false\"\n+ * @return the value of the '<em>Arrival Rate Avg</em>' containment reference.\n+ * @see #setArrivalRateAvg(BigUnitValue)\n+ * @see net.certware.intent.state.stateSpecification.StateSpecificationPackage#getInput_ArrivalRateAvg()\n+ * @model containment=\"true\"\n * @generated\n */\n- EList<String> getValues();\n+ BigUnitValue getArrivalRateAvg();\n \n /**\n- * Returns the value of the '<em><b>Rate</b></em>' containment reference.\n+ * Sets the value of the '{@link net.certware.intent.state.stateSpecification.Input#getArrivalRateAvg <em>Arrival Rate Avg</em>}' containment reference.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @param value the new value of the '<em>Arrival Rate Avg</em>' containment reference.\n+ * @see #getArrivalRateAvg()\n+ * @generated\n+ */\n+ void setArrivalRateAvg(BigUnitValue value);\n+\n+ /**\n+ * Returns the value of the '<em><b>Arrival Rate Minimum</b></em>' containment reference.\n * <!-- begin-user-doc -->\n * <p>\n- * If the meaning of the '<em>Rate</em>' containment reference isn't clear,\n+ * If the meaning of the '<em>Arrival Rate Minimum</em>' containment reference isn't clear,\n * there really should be more of a description here...\n * </p>\n * <!-- end-user-doc -->\n- * @return the value of the '<em>Rate</em>' containment reference.\n- * @see #setRate(BigUnitValue)\n- * @see net.certware.intent.state.stateSpecification.StateSpecificationPackage#getInput_Rate()\n+ * @return the value of the '<em>Arrival Rate Minimum</em>' containment reference.\n+ * @see #setArrivalRateMinimum(BigUnitValue)\n+ * @see net.certware.intent.state.stateSpecification.StateSpecificationPackage#getInput_ArrivalRateMinimum()\n * @model containment=\"true\"\n * @generated\n */\n- BigUnitValue getRate();\n+ BigUnitValue getArrivalRateMinimum();\n \n /**\n- * Sets the value of the '{@link net.certware.intent.state.stateSpecification.Input#getRate <em>Rate</em>}' containment reference.\n+ * Sets the value of the '{@link net.certware.intent.state.stateSpecification.Input#getArrivalRateMinimum <em>Arrival Rate Minimum</em>}' containment reference.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n- * @param value the new value of the '<em>Rate</em>' containment reference.\n- * @see #getRate()\n+ * @param value the new value of the '<em>Arrival Rate Minimum</em>' containment reference.\n+ * @see #getArrivalRateMinimum()\n * @generated\n */\n- void setRate(BigUnitValue value);\n+ void setArrivalRateMinimum(BigUnitValue value);\n \n /**\n- * Returns the value of the '<em><b>Variables</b></em>' attribute.\n+ * Returns the value of the '<em><b>Arrival Rate Maximum</b></em>' containment reference.\n * <!-- begin-user-doc -->\n * <p>\n- * If the meaning of the '<em>Variables</em>' attribute isn't clear,\n+ * If the meaning of the '<em>Arrival Rate Maximum</em>' containment reference isn't clear,\n * there really should be more of a description here...\n * </p>\n * <!-- end-user-doc -->\n- * @return the value of the '<em>Variables</em>' attribute.\n- * @see #setVariables(String)\n- * @see net.certware.intent.state.stateSpecification.StateSpecificationPackage#getInput_Variables()\n- * @model\n+ * @return the value of the '<em>Arrival Rate Maximum</em>' containment reference.\n+ * @see #setArrivalRateMaximum(BigUnitValue)\n+ * @see net.certware.intent.state.stateSpecification.StateSpecificationPackage#getInput_ArrivalRateMaximum()\n+ * @model containment=\"true\"\n * @generated\n */\n- String getVariables();\n+ BigUnitValue getArrivalRateMaximum();\n \n /**\n- * Sets the value of the '{@link net.certware.intent.state.stateSpecification.Input#getVariables <em>Variables</em>}' attribute.\n+ * Sets the value of the '{@link net.certware.intent.state.stateSpecification.Input#getArrivalRateMaximum <em>Arrival Rate Maximum</em>}' containment reference.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n- * @param value the new value of the '<em>Variables</em>' attribute.\n- * @see #getVariables()\n+ * @param value the new value of the '<em>Arrival Rate Maximum</em>' containment reference.\n+ * @see #getArrivalRateMaximum()\n * @generated\n */\n- void setVariables(String value);\n+ void setArrivalRateMaximum(BigUnitValue value);\n+\n+ /**\n+ * Returns the value of the '<em><b>Obsolescence</b></em>' containment reference.\n+ * <!-- begin-user-doc -->\n+ * <p>\n+ * If the meaning of the '<em>Obsolescence</em>' containment reference isn't clear,\n+ * there really should be more of a description here...\n+ * </p>\n+ * <!-- end-user-doc -->\n+ * @return the value of the '<em>Obsolescence</em>' containment reference.\n+ * @see #setObsolescence(BigUnitValue)\n+ * @see net.certware.intent.state.stateSpecification.StateSpecificationPackage#getInput_Obsolescence()\n+ * @model containment=\"true\"\n+ * @generated\n+ */\n+ BigUnitValue getObsolescence();\n+\n+ /**\n+ * Sets the value of the '{@link net.certware.intent.state.stateSpecification.Input#getObsolescence <em>Obsolescence</em>}' containment reference.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @param value the new value of the '<em>Obsolescence</em>' containment reference.\n+ * @see #getObsolescence()\n+ * @generated\n+ */\n+ void setObsolescence(BigUnitValue value);\n \n /**\n * Returns the value of the '<em><b>References</b></em>' attribute.\n@@ -232,6 +268,58 @@ public interface Input extends EObject\n */\n void setReferences(String value);\n \n+ /**\n+ * Returns the value of the '<em><b>Appears In</b></em>' attribute.\n+ * <!-- begin-user-doc -->\n+ * <p>\n+ * If the meaning of the '<em>Appears In</em>' attribute isn't clear,\n+ * there really should be more of a description here...\n+ * </p>\n+ * <!-- end-user-doc -->\n+ * @return the value of the '<em>Appears In</em>' attribute.\n+ * @see #setAppearsIn(String)\n+ * @see net.certware.intent.state.stateSpecification.StateSpecificationPackage#getInput_AppearsIn()\n+ * @model\n+ * @generated\n+ */\n+ String getAppearsIn();\n+\n+ /**\n+ * Sets the value of the '{@link net.certware.intent.state.stateSpecification.Input#getAppearsIn <em>Appears In</em>}' attribute.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @param value the new value of the '<em>Appears In</em>' attribute.\n+ * @see #getAppearsIn()\n+ * @generated\n+ */\n+ void setAppearsIn(String value);\n+\n+ /**\n+ * Returns the value of the '<em><b>Description</b></em>' attribute.\n+ * <!-- begin-user-doc -->\n+ * <p>\n+ * If the meaning of the '<em>Description</em>' attribute isn't clear,\n+ * there really should be more of a description here...\n+ * </p>\n+ * <!-- end-user-doc -->\n+ * @return the value of the '<em>Description</em>' attribute.\n+ * @see #setDescription(String)\n+ * @see net.certware.intent.state.stateSpecification.StateSpecificationPackage#getInput_Description()\n+ * @model\n+ * @generated\n+ */\n+ String getDescription();\n+\n+ /**\n+ * Sets the value of the '{@link net.certware.intent.state.stateSpecification.Input#getDescription <em>Description</em>}' attribute.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @param value the new value of the '<em>Description</em>' attribute.\n+ * @see #getDescription()\n+ * @generated\n+ */\n+ void setDescription(String value);\n+\n /**\n * Returns the value of the '<em><b>Comments</b></em>' attribute.\n * <!-- begin-user-doc -->\n@@ -258,4 +346,30 @@ public interface Input extends EObject\n */\n void setComments(String value);\n \n+ /**\n+ * Returns the value of the '<em><b>Structure</b></em>' containment reference.\n+ * <!-- begin-user-doc -->\n+ * <p>\n+ * If the meaning of the '<em>Structure</em>' containment reference isn't clear,\n+ * there really should be more of a description here...\n+ * </p>\n+ * <!-- end-user-doc -->\n+ * @return the value of the '<em>Structure</em>' containment reference.\n+ * @see #setStructure(TriggerTable)\n+ * @see net.certware.intent.state.stateSpecification.StateSpecificationPackage#getInput_Structure()\n+ * @model containment=\"true\"\n+ * @generated\n+ */\n+ TriggerTable getStructure();\n+\n+ /**\n+ * Sets the value of the '{@link net.certware.intent.state.stateSpecification.Input#getStructure <em>Structure</em>}' containment reference.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @param value the new value of the '<em>Structure</em>' containment reference.\n+ * @see #getStructure()\n+ * @generated\n+ */\n+ void setStructure(TriggerTable value);\n+\n } // Input", "raw_url": "https://github.com/nasa/CertWare/raw/110fa3222ae2931978d7921dc8e6af8c7f43abd3/net.certware.intent.state%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fstate%2FstateSpecification%2FInput.java", "sha": "e0655e62eb5741a0d5efffb309444f3db46440af", "status": "modified" }, { "additions": 24, "blob_url": "https://github.com/nasa/CertWare/blob/110fa3222ae2931978d7921dc8e6af8c7f43abd3/net.certware.intent.state%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fstate%2FstateSpecification%2FOutput.java", "changes": 123, "contents_url": "https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent.state%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fstate%2FstateSpecification%2FOutput.java?ref=110fa3222ae2931978d7921dc8e6af8c7f43abd3", "deletions": 99, "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/stateSpecification/Output.java", "new_code": " * <li>{@link net.certware.intent.state.stateSpecification.Output#getRange <em>Range</em>}</li>\n * <li>{@link net.certware.intent.state.stateSpecification.Output#getValueList <em>Value List</em>}</li>\n * Returns the value of the '<em><b>Range</b></em>' containment reference.\n * If the meaning of the '<em>Range</em>' containment reference isn't clear,\n * @return the value of the '<em>Range</em>' containment reference.\n * @see #setRange(ValueRange)\n * @see net.certware.intent.state.stateSpecification.StateSpecificationPackage#getOutput_Range()\n * @model containment=\"true\"\n ValueRange getRange();\n * Sets the value of the '{@link net.certware.intent.state.stateSpecification.Output#getRange <em>Range</em>}' containment reference.\n * @param value the new value of the '<em>Range</em>' containment reference.\n * @see #getRange()\n void setRange(ValueRange value);\n * Returns the value of the '<em><b>Value List</b></em>' containment reference.\n * If the meaning of the '<em>Value List</em>' containment reference isn't clear,\n * @return the value of the '<em>Value List</em>' containment reference.\n * @see #setValueList(ValueList)\n * @see net.certware.intent.state.stateSpecification.StateSpecificationPackage#getOutput_ValueList()\n * @model containment=\"true\"\n ValueList getValueList();\n * Sets the value of the '{@link net.certware.intent.state.stateSpecification.Output#getValueList <em>Value List</em>}' containment reference.\n * @param value the new value of the '<em>Value List</em>' containment reference.\n * @see #getValueList()\n void setValueList(ValueList value);", "new_methods": [], "old_code": "import java.math.BigDecimal;\n\nimport org.eclipse.emf.common.util.EList;\n\n * <li>{@link net.certware.intent.state.stateSpecification.Output#getLower <em>Lower</em>}</li>\n * <li>{@link net.certware.intent.state.stateSpecification.Output#getUpper <em>Upper</em>}</li>\n * <li>{@link net.certware.intent.state.stateSpecification.Output#getRangeType <em>Range Type</em>}</li>\n * <li>{@link net.certware.intent.state.stateSpecification.Output#getRangeUnits <em>Range Units</em>}</li>\n * <li>{@link net.certware.intent.state.stateSpecification.Output#getValues <em>Values</em>}</li>\n * Returns the value of the '<em><b>Lower</b></em>' attribute.\n * <!-- begin-user-doc -->\n * <p>\n * If the meaning of the '<em>Lower</em>' attribute isn't clear,\n * there really should be more of a description here...\n * </p>\n * <!-- end-user-doc -->\n * @return the value of the '<em>Lower</em>' attribute.\n * @see #setLower(BigDecimal)\n * @see net.certware.intent.state.stateSpecification.StateSpecificationPackage#getOutput_Lower()\n * @model\n * @generated\n */\n BigDecimal getLower();\n\n /**\n * Sets the value of the '{@link net.certware.intent.state.stateSpecification.Output#getLower <em>Lower</em>}' attribute.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @param value the new value of the '<em>Lower</em>' attribute.\n * @see #getLower()\n * @generated\n */\n void setLower(BigDecimal value);\n\n /**\n * Returns the value of the '<em><b>Upper</b></em>' attribute.\n * If the meaning of the '<em>Upper</em>' attribute isn't clear,\n * @return the value of the '<em>Upper</em>' attribute.\n * @see #setUpper(BigDecimal)\n * @see net.certware.intent.state.stateSpecification.StateSpecificationPackage#getOutput_Upper()\n * @model\n * @generated\n */\n BigDecimal getUpper();\n\n /**\n * Sets the value of the '{@link net.certware.intent.state.stateSpecification.Output#getUpper <em>Upper</em>}' attribute.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @param value the new value of the '<em>Upper</em>' attribute.\n * @see #getUpper()\n * @generated\n */\n void setUpper(BigDecimal value);\n\n /**\n * Returns the value of the '<em><b>Range Type</b></em>' attribute.\n * <!-- begin-user-doc -->\n * <p>\n * If the meaning of the '<em>Range Type</em>' attribute isn't clear,\n * there really should be more of a description here...\n * </p>\n * <!-- end-user-doc -->\n * @return the value of the '<em>Range Type</em>' attribute.\n * @see #setRangeType(String)\n * @see net.certware.intent.state.stateSpecification.StateSpecificationPackage#getOutput_RangeType()\n * @model\n String getRangeType();\n * Sets the value of the '{@link net.certware.intent.state.stateSpecification.Output#getRangeType <em>Range Type</em>}' attribute.\n * @param value the new value of the '<em>Range Type</em>' attribute.\n * @see #getRangeType()\n void setRangeType(String value);\n * Returns the value of the '<em><b>Range Units</b></em>' attribute.\n * If the meaning of the '<em>Range Units</em>' attribute isn't clear,\n * @return the value of the '<em>Range Units</em>' attribute.\n * @see #setRangeUnits(String)\n * @see net.certware.intent.state.stateSpecification.StateSpecificationPackage#getOutput_RangeUnits()\n * @model\n * @generated\n */\n String getRangeUnits();\n\n /**\n * Sets the value of the '{@link net.certware.intent.state.stateSpecification.Output#getRangeUnits <em>Range Units</em>}' attribute.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @param value the new value of the '<em>Range Units</em>' attribute.\n * @see #getRangeUnits()\n void setRangeUnits(String value);\n * Returns the value of the '<em><b>Values</b></em>' attribute list.\n * The list contents are of type {@link java.lang.String}.\n * <p>\n * If the meaning of the '<em>Values</em>' attribute list isn't clear,\n * there really should be more of a description here...\n * </p>\n * @return the value of the '<em>Values</em>' attribute list.\n * @see net.certware.intent.state.stateSpecification.StateSpecificationPackage#getOutput_Values()\n * @model unique=\"false\"\n EList<String> getValues();", "old_methods": [], "patch": "@@ -2,10 +2,6 @@\n */\n package net.certware.intent.state.stateSpecification;\n \n-import java.math.BigDecimal;\n-\n-import org.eclipse.emf.common.util.EList;\n-\n import org.eclipse.emf.ecore.EObject;\n \n /**\n@@ -16,11 +12,8 @@\n * <p>\n * The following features are supported:\n * <ul>\n- * <li>{@link net.certware.intent.state.stateSpecification.Output#getLower <em>Lower</em>}</li>\n- * <li>{@link net.certware.intent.state.stateSpecification.Output#getUpper <em>Upper</em>}</li>\n- * <li>{@link net.certware.intent.state.stateSpecification.Output#getRangeType <em>Range Type</em>}</li>\n- * <li>{@link net.certware.intent.state.stateSpecification.Output#getRangeUnits <em>Range Units</em>}</li>\n- * <li>{@link net.certware.intent.state.stateSpecification.Output#getValues <em>Values</em>}</li>\n+ * <li>{@link net.certware.intent.state.stateSpecification.Output#getRange <em>Range</em>}</li>\n+ * <li>{@link net.certware.intent.state.stateSpecification.Output#getValueList <em>Value List</em>}</li>\n * <li>{@link net.certware.intent.state.stateSpecification.Output#getRate <em>Rate</em>}</li>\n * <li>{@link net.certware.intent.state.stateSpecification.Output#getDelay <em>Delay</em>}</li>\n * <li>{@link net.certware.intent.state.stateSpecification.Output#getDeadline <em>Deadline</em>}</li>\n@@ -45,124 +38,56 @@\n public interface Output extends EObject\n {\n /**\n- * Returns the value of the '<em><b>Lower</b></em>' attribute.\n- * <!-- begin-user-doc -->\n- * <p>\n- * If the meaning of the '<em>Lower</em>' attribute isn't clear,\n- * there really should be more of a description here...\n- * </p>\n- * <!-- end-user-doc -->\n- * @return the value of the '<em>Lower</em>' attribute.\n- * @see #setLower(BigDecimal)\n- * @see net.certware.intent.state.stateSpecification.StateSpecificationPackage#getOutput_Lower()\n- * @model\n- * @generated\n- */\n- BigDecimal getLower();\n-\n- /**\n- * Sets the value of the '{@link net.certware.intent.state.stateSpecification.Output#getLower <em>Lower</em>}' attribute.\n- * <!-- begin-user-doc -->\n- * <!-- end-user-doc -->\n- * @param value the new value of the '<em>Lower</em>' attribute.\n- * @see #getLower()\n- * @generated\n- */\n- void setLower(BigDecimal value);\n-\n- /**\n- * Returns the value of the '<em><b>Upper</b></em>' attribute.\n+ * Returns the value of the '<em><b>Range</b></em>' containment reference.\n * <!-- begin-user-doc -->\n * <p>\n- * If the meaning of the '<em>Upper</em>' attribute isn't clear,\n+ * If the meaning of the '<em>Range</em>' containment reference isn't clear,\n * there really should be more of a description here...\n * </p>\n * <!-- end-user-doc -->\n- * @return the value of the '<em>Upper</em>' attribute.\n- * @see #setUpper(BigDecimal)\n- * @see net.certware.intent.state.stateSpecification.StateSpecificationPackage#getOutput_Upper()\n- * @model\n- * @generated\n- */\n- BigDecimal getUpper();\n-\n- /**\n- * Sets the value of the '{@link net.certware.intent.state.stateSpecification.Output#getUpper <em>Upper</em>}' attribute.\n- * <!-- begin-user-doc -->\n- * <!-- end-user-doc -->\n- * @param value the new value of the '<em>Upper</em>' attribute.\n- * @see #getUpper()\n- * @generated\n- */\n- void setUpper(BigDecimal value);\n-\n- /**\n- * Returns the value of the '<em><b>Range Type</b></em>' attribute.\n- * <!-- begin-user-doc -->\n- * <p>\n- * If the meaning of the '<em>Range Type</em>' attribute isn't clear,\n- * there really should be more of a description here...\n- * </p>\n- * <!-- end-user-doc -->\n- * @return the value of the '<em>Range Type</em>' attribute.\n- * @see #setRangeType(String)\n- * @see net.certware.intent.state.stateSpecification.StateSpecificationPackage#getOutput_RangeType()\n- * @model\n+ * @return the value of the '<em>Range</em>' containment reference.\n+ * @see #setRange(ValueRange)\n+ * @see net.certware.intent.state.stateSpecification.StateSpecificationPackage#getOutput_Range()\n+ * @model containment=\"true\"\n * @generated\n */\n- String getRangeType();\n+ ValueRange getRange();\n \n /**\n- * Sets the value of the '{@link net.certware.intent.state.stateSpecification.Output#getRangeType <em>Range Type</em>}' attribute.\n+ * Sets the value of the '{@link net.certware.intent.state.stateSpecification.Output#getRange <em>Range</em>}' containment reference.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n- * @param value the new value of the '<em>Range Type</em>' attribute.\n- * @see #getRangeType()\n+ * @param value the new value of the '<em>Range</em>' containment reference.\n+ * @see #getRange()\n * @generated\n */\n- void setRangeType(String value);\n+ void setRange(ValueRange value);\n \n /**\n- * Returns the value of the '<em><b>Range Units</b></em>' attribute.\n+ * Returns the value of the '<em><b>Value List</b></em>' containment reference.\n * <!-- begin-user-doc -->\n * <p>\n- * If the meaning of the '<em>Range Units</em>' attribute isn't clear,\n+ * If the meaning of the '<em>Value List</em>' containment reference isn't clear,\n * there really should be more of a description here...\n * </p>\n * <!-- end-user-doc -->\n- * @return the value of the '<em>Range Units</em>' attribute.\n- * @see #setRangeUnits(String)\n- * @see net.certware.intent.state.stateSpecification.StateSpecificationPackage#getOutput_RangeUnits()\n- * @model\n- * @generated\n- */\n- String getRangeUnits();\n-\n- /**\n- * Sets the value of the '{@link net.certware.intent.state.stateSpecification.Output#getRangeUnits <em>Range Units</em>}' attribute.\n- * <!-- begin-user-doc -->\n- * <!-- end-user-doc -->\n- * @param value the new value of the '<em>Range Units</em>' attribute.\n- * @see #getRangeUnits()\n+ * @return the value of the '<em>Value List</em>' containment reference.\n+ * @see #setValueList(ValueList)\n+ * @see net.certware.intent.state.stateSpecification.StateSpecificationPackage#getOutput_ValueList()\n+ * @model containment=\"true\"\n * @generated\n */\n- void setRangeUnits(String value);\n+ ValueList getValueList();\n \n /**\n- * Returns the value of the '<em><b>Values</b></em>' attribute list.\n- * The list contents are of type {@link java.lang.String}.\n+ * Sets the value of the '{@link net.certware.intent.state.stateSpecification.Output#getValueList <em>Value List</em>}' containment reference.\n * <!-- begin-user-doc -->\n- * <p>\n- * If the meaning of the '<em>Values</em>' attribute list isn't clear,\n- * there really should be more of a description here...\n- * </p>\n * <!-- end-user-doc -->\n- * @return the value of the '<em>Values</em>' attribute list.\n- * @see net.certware.intent.state.stateSpecification.StateSpecificationPackage#getOutput_Values()\n- * @model unique=\"false\"\n+ * @param value the new value of the '<em>Value List</em>' containment reference.\n+ * @see #getValueList()\n * @generated\n */\n- EList<String> getValues();\n+ void setValueList(ValueList value);\n \n /**\n * Returns the value of the '<em><b>Rate</b></em>' containment reference.", "raw_url": "https://github.com/nasa/CertWare/raw/110fa3222ae2931978d7921dc8e6af8c7f43abd3/net.certware.intent.state%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fstate%2FstateSpecification%2FOutput.java", "sha": "19f61eef377e15acf2da9d5cb3f81dc5099bd3c7", "status": "modified" }, { "additions": 18, "blob_url": "https://github.com/nasa/CertWare/blob/110fa3222ae2931978d7921dc8e6af8c7f43abd3/net.certware.intent.state%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fstate%2FstateSpecification%2FStateSpecificationFactory.java", "changes": 18, "contents_url": "https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent.state%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fstate%2FstateSpecification%2FStateSpecificationFactory.java?ref=110fa3222ae2931978d7921dc8e6af8c7f43abd3", "deletions": 0, "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/stateSpecification/StateSpecificationFactory.java", "new_code": " /**\n * Returns a new object of class '<em>Value Range</em>'.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @return a new object of class '<em>Value Range</em>'.\n * @generated\n */\n ValueRange createValueRange();\n\n /**\n * Returns a new object of class '<em>Value List</em>'.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @return a new object of class '<em>Value List</em>'.\n * @generated\n */\n ValueList createValueList();\n", "new_methods": [], "old_code": "", "old_methods": [], "patch": "@@ -193,6 +193,24 @@ public interface StateSpecificationFactory extends EFactory\n */\n TriggerTable createTriggerTable();\n \n+ /**\n+ * Returns a new object of class '<em>Value Range</em>'.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @return a new object of class '<em>Value Range</em>'.\n+ * @generated\n+ */\n+ ValueRange createValueRange();\n+\n+ /**\n+ * Returns a new object of class '<em>Value List</em>'.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @return a new object of class '<em>Value List</em>'.\n+ * @generated\n+ */\n+ ValueList createValueList();\n+\n /**\n * Returns a new object of class '<em>Output</em>'.\n * <!-- begin-user-doc -->", "raw_url": "https://github.com/nasa/CertWare/raw/110fa3222ae2931978d7921dc8e6af8c7f43abd3/net.certware.intent.state%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fstate%2FstateSpecification%2FStateSpecificationFactory.java", "sha": "48832361f52cfc21fed1484cbf5515ba264dee2c", "status": "modified" }, { "additions": 362, "blob_url": "https://github.com/nasa/CertWare/blob/110fa3222ae2931978d7921dc8e6af8c7f43abd3/net.certware.intent.state%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fstate%2FstateSpecification%2FStateSpecificationPackage.java", "changes": 478, "contents_url": "https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent.state%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fstate%2FstateSpecification%2FStateSpecificationPackage.java?ref=110fa3222ae2931978d7921dc8e6af8c7f43abd3", "deletions": 116, "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/stateSpecification/StateSpecificationPackage.java", "new_code": " * The meta object id for the '{@link net.certware.intent.state.stateSpecification.impl.ValueRangeImpl <em>Value Range</em>}' class.\n * @see net.certware.intent.state.stateSpecification.impl.ValueRangeImpl\n * @see net.certware.intent.state.stateSpecification.impl.StateSpecificationPackageImpl#getValueRange()\n int VALUE_RANGE = 19;\n int VALUE_RANGE__LOWER = 0;\n int VALUE_RANGE__UPPER = 1;\n int VALUE_RANGE__RANGE_TYPE = 2;\n int VALUE_RANGE__RANGE_UNITS = 3;\n\n /**\n * The number of structural features of the '<em>Value Range</em>' class.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n * @ordered\n */\n int VALUE_RANGE_FEATURE_COUNT = 4;\n\n /**\n * The meta object id for the '{@link net.certware.intent.state.stateSpecification.impl.ValueListImpl <em>Value List</em>}' class.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @see net.certware.intent.state.stateSpecification.impl.ValueListImpl\n * @see net.certware.intent.state.stateSpecification.impl.StateSpecificationPackageImpl#getValueList()\n * @generated\n */\n int VALUE_LIST = 20;\n int VALUE_LIST__VALUES = 0;\n\n /**\n * The number of structural features of the '<em>Value List</em>' class.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n * @ordered\n */\n int VALUE_LIST_FEATURE_COUNT = 1;\n\n /**\n * The meta object id for the '{@link net.certware.intent.state.stateSpecification.impl.OutputImpl <em>Output</em>}' class.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @see net.certware.intent.state.stateSpecification.impl.OutputImpl\n * @see net.certware.intent.state.stateSpecification.impl.StateSpecificationPackageImpl#getOutput()\n * @generated\n */\n int OUTPUT = 21;\n\n /**\n * The feature id for the '<em><b>Range</b></em>' containment reference.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n * @ordered\n */\n int OUTPUT__RANGE = 0;\n\n /**\n * The feature id for the '<em><b>Value List</b></em>' containment reference.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n * @ordered\n */\n int OUTPUT__VALUE_LIST = 1;\n int OUTPUT__RATE = 2;\n int OUTPUT__DELAY = 3;\n int OUTPUT__DEADLINE = 4;\n int OUTPUT__COMPLETION_HANDLING = 5;\n int OUTPUT__VARIABLES = 6;\n int OUTPUT__RELATIONSHIP = 7;\n int OUTPUT__MIN_RESPONSE = 8;\n int OUTPUT__MAX_RESPONSE = 9;\n int OUTPUT__FEEBACK_HANDLING = 10;\n int OUTPUT__REVERSED = 11;\n int OUTPUT__REFERENCES = 12;\n int OUTPUT__COMMENTS = 13;\n int OUTPUT__CONTENTS = 14;\n int OUTPUT__TABLE = 15;\n int OUTPUT_FEATURE_COUNT = 16;\n int INPUT = 22;\n * The feature id for the '<em><b>Range</b></em>' containment reference.\n int INPUT__RANGE = 0;\n * The feature id for the '<em><b>Value List</b></em>' containment reference.\n int INPUT__VALUE_LIST = 1;\n * The feature id for the '<em><b>Value Handling</b></em>' attribute.\n int INPUT__VALUE_HANDLING = 2;\n * The feature id for the '<em><b>Granularity</b></em>' containment reference.\n int INPUT__GRANULARITY = 3;\n * The feature id for the '<em><b>Arrival Rate Avg</b></em>' containment reference.\n int INPUT__ARRIVAL_RATE_AVG = 4;\n * The feature id for the '<em><b>Arrival Rate Minimum</b></em>' containment reference.\n int INPUT__ARRIVAL_RATE_MINIMUM = 5;\n * The feature id for the '<em><b>Arrival Rate Maximum</b></em>' containment reference.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n * @ordered\n */\n int INPUT__ARRIVAL_RATE_MAXIMUM = 6;\n\n /**\n * The feature id for the '<em><b>Obsolescence</b></em>' containment reference.\n int INPUT__OBSOLESCENCE = 7;\n int INPUT__REFERENCES = 8;\n\n /**\n * The feature id for the '<em><b>Appears In</b></em>' attribute.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n * @ordered\n */\n int INPUT__APPEARS_IN = 9;\n\n /**\n * The feature id for the '<em><b>Description</b></em>' attribute.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n * @ordered\n */\n int INPUT__DESCRIPTION = 10;\n int INPUT__COMMENTS = 11;\n\n /**\n * The feature id for the '<em><b>Structure</b></em>' containment reference.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n * @ordered\n */\n int INPUT__STRUCTURE = 12;\n int INPUT_FEATURE_COUNT = 13;\n * Returns the meta object for class '{@link net.certware.intent.state.stateSpecification.ValueRange <em>Value Range</em>}'.\n * @return the meta object for class '<em>Value Range</em>'.\n * @see net.certware.intent.state.stateSpecification.ValueRange\n EClass getValueRange();\n * Returns the meta object for the attribute '{@link net.certware.intent.state.stateSpecification.ValueRange#getLower <em>Lower</em>}'.\n * @see net.certware.intent.state.stateSpecification.ValueRange#getLower()\n * @see #getValueRange()\n EAttribute getValueRange_Lower();\n * Returns the meta object for the attribute '{@link net.certware.intent.state.stateSpecification.ValueRange#getUpper <em>Upper</em>}'.\n * @see net.certware.intent.state.stateSpecification.ValueRange#getUpper()\n * @see #getValueRange()\n EAttribute getValueRange_Upper();\n * Returns the meta object for the attribute '{@link net.certware.intent.state.stateSpecification.ValueRange#getRangeType <em>Range Type</em>}'.\n * @see net.certware.intent.state.stateSpecification.ValueRange#getRangeType()\n * @see #getValueRange()\n EAttribute getValueRange_RangeType();\n * Returns the meta object for the attribute '{@link net.certware.intent.state.stateSpecification.ValueRange#getRangeUnits <em>Range Units</em>}'.\n * @see net.certware.intent.state.stateSpecification.ValueRange#getRangeUnits()\n * @see #getValueRange()\n * @generated\n */\n EAttribute getValueRange_RangeUnits();\n\n /**\n * Returns the meta object for class '{@link net.certware.intent.state.stateSpecification.ValueList <em>Value List</em>}'.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @return the meta object for class '<em>Value List</em>'.\n * @see net.certware.intent.state.stateSpecification.ValueList\n EClass getValueList();\n * Returns the meta object for the attribute list '{@link net.certware.intent.state.stateSpecification.ValueList#getValues <em>Values</em>}'.\n * @see net.certware.intent.state.stateSpecification.ValueList#getValues()\n * @see #getValueList()\n * @generated\n */\n EAttribute getValueList_Values();\n\n /**\n * Returns the meta object for class '{@link net.certware.intent.state.stateSpecification.Output <em>Output</em>}'.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @return the meta object for class '<em>Output</em>'.\n * @see net.certware.intent.state.stateSpecification.Output\n * @generated\n */\n EClass getOutput();\n\n /**\n * Returns the meta object for the containment reference '{@link net.certware.intent.state.stateSpecification.Output#getRange <em>Range</em>}'.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @return the meta object for the containment reference '<em>Range</em>'.\n * @see net.certware.intent.state.stateSpecification.Output#getRange()\n * @see #getOutput()\n * @generated\n */\n EReference getOutput_Range();\n\n /**\n * Returns the meta object for the containment reference '{@link net.certware.intent.state.stateSpecification.Output#getValueList <em>Value List</em>}'.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @return the meta object for the containment reference '<em>Value List</em>'.\n * @see net.certware.intent.state.stateSpecification.Output#getValueList()\n EReference getOutput_ValueList();\n * Returns the meta object for the containment reference '{@link net.certware.intent.state.stateSpecification.Input#getRange <em>Range</em>}'.\n * @return the meta object for the containment reference '<em>Range</em>'.\n * @see net.certware.intent.state.stateSpecification.Input#getRange()\n EReference getInput_Range();\n * Returns the meta object for the containment reference '{@link net.certware.intent.state.stateSpecification.Input#getValueList <em>Value List</em>}'.\n * @return the meta object for the containment reference '<em>Value List</em>'.\n * @see net.certware.intent.state.stateSpecification.Input#getValueList()\n EReference getInput_ValueList();\n * Returns the meta object for the attribute '{@link net.certware.intent.state.stateSpecification.Input#getValueHandling <em>Value Handling</em>}'.\n * @return the meta object for the attribute '<em>Value Handling</em>'.\n * @see net.certware.intent.state.stateSpecification.Input#getValueHandling()\n EAttribute getInput_ValueHandling();\n * Returns the meta object for the containment reference '{@link net.certware.intent.state.stateSpecification.Input#getGranularity <em>Granularity</em>}'.\n * @return the meta object for the containment reference '<em>Granularity</em>'.\n * @see net.certware.intent.state.stateSpecification.Input#getGranularity()\n EReference getInput_Granularity();\n * Returns the meta object for the containment reference '{@link net.certware.intent.state.stateSpecification.Input#getArrivalRateAvg <em>Arrival Rate Avg</em>}'.\n * @return the meta object for the containment reference '<em>Arrival Rate Avg</em>'.\n * @see net.certware.intent.state.stateSpecification.Input#getArrivalRateAvg()\n EReference getInput_ArrivalRateAvg();\n * Returns the meta object for the containment reference '{@link net.certware.intent.state.stateSpecification.Input#getArrivalRateMinimum <em>Arrival Rate Minimum</em>}'.\n * @return the meta object for the containment reference '<em>Arrival Rate Minimum</em>'.\n * @see net.certware.intent.state.stateSpecification.Input#getArrivalRateMinimum()\n EReference getInput_ArrivalRateMinimum();\n * Returns the meta object for the containment reference '{@link net.certware.intent.state.stateSpecification.Input#getArrivalRateMaximum <em>Arrival Rate Maximum</em>}'.\n * @return the meta object for the containment reference '<em>Arrival Rate Maximum</em>'.\n * @see net.certware.intent.state.stateSpecification.Input#getArrivalRateMaximum()\n EReference getInput_ArrivalRateMaximum();\n\n /**\n * Returns the meta object for the containment reference '{@link net.certware.intent.state.stateSpecification.Input#getObsolescence <em>Obsolescence</em>}'.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @return the meta object for the containment reference '<em>Obsolescence</em>'.\n * @see net.certware.intent.state.stateSpecification.Input#getObsolescence()\n * @see #getInput()\n * @generated\n */\n EReference getInput_Obsolescence();\n /**\n * Returns the meta object for the attribute '{@link net.certware.intent.state.stateSpecification.Input#getAppearsIn <em>Appears In</em>}'.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @return the meta object for the attribute '<em>Appears In</em>'.\n * @see net.certware.intent.state.stateSpecification.Input#getAppearsIn()\n * @see #getInput()\n * @generated\n */\n EAttribute getInput_AppearsIn();\n\n /**\n * Returns the meta object for the attribute '{@link net.certware.intent.state.stateSpecification.Input#getDescription <em>Description</em>}'.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @return the meta object for the attribute '<em>Description</em>'.\n * @see net.certware.intent.state.stateSpecification.Input#getDescription()\n * @see #getInput()\n * @generated\n */\n EAttribute getInput_Description();\n\n /**\n * Returns the meta object for the containment reference '{@link net.certware.intent.state.stateSpecification.Input#getStructure <em>Structure</em>}'.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @return the meta object for the containment reference '<em>Structure</em>'.\n * @see net.certware.intent.state.stateSpecification.Input#getStructure()\n * @see #getInput()\n * @generated\n */\n EReference getInput_Structure();\n\n * The meta object literal for the '{@link net.certware.intent.state.stateSpecification.impl.ValueRangeImpl <em>Value Range</em>}' class.\n * @see net.certware.intent.state.stateSpecification.impl.ValueRangeImpl\n * @see net.certware.intent.state.stateSpecification.impl.StateSpecificationPackageImpl#getValueRange()\n EClass VALUE_RANGE = eINSTANCE.getValueRange();\n EAttribute VALUE_RANGE__LOWER = eINSTANCE.getValueRange_Lower();\n EAttribute VALUE_RANGE__UPPER = eINSTANCE.getValueRange_Upper();\n EAttribute VALUE_RANGE__RANGE_TYPE = eINSTANCE.getValueRange_RangeType();\n EAttribute VALUE_RANGE__RANGE_UNITS = eINSTANCE.getValueRange_RangeUnits();\n\n /**\n * The meta object literal for the '{@link net.certware.intent.state.stateSpecification.impl.ValueListImpl <em>Value List</em>}' class.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @see net.certware.intent.state.stateSpecification.impl.ValueListImpl\n * @see net.certware.intent.state.stateSpecification.impl.StateSpecificationPackageImpl#getValueList()\n * @generated\n */\n EClass VALUE_LIST = eINSTANCE.getValueList();\n EAttribute VALUE_LIST__VALUES = eINSTANCE.getValueList_Values();\n\n /**\n * The meta object literal for the '{@link net.certware.intent.state.stateSpecification.impl.OutputImpl <em>Output</em>}' class.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @see net.certware.intent.state.stateSpecification.impl.OutputImpl\n * @see net.certware.intent.state.stateSpecification.impl.StateSpecificationPackageImpl#getOutput()\n * @generated\n */\n EClass OUTPUT = eINSTANCE.getOutput();\n\n /**\n * The meta object literal for the '<em><b>Range</b></em>' containment reference feature.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n EReference OUTPUT__RANGE = eINSTANCE.getOutput_Range();\n\n /**\n * The meta object literal for the '<em><b>Value List</b></em>' containment reference feature.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n EReference OUTPUT__VALUE_LIST = eINSTANCE.getOutput_ValueList();\n * The meta object literal for the '<em><b>Range</b></em>' containment reference feature.\n EReference INPUT__RANGE = eINSTANCE.getInput_Range();\n * The meta object literal for the '<em><b>Value List</b></em>' containment reference feature.\n EReference INPUT__VALUE_LIST = eINSTANCE.getInput_ValueList();\n * The meta object literal for the '<em><b>Value Handling</b></em>' attribute feature.\n EAttribute INPUT__VALUE_HANDLING = eINSTANCE.getInput_ValueHandling();\n * The meta object literal for the '<em><b>Granularity</b></em>' containment reference feature.\n EReference INPUT__GRANULARITY = eINSTANCE.getInput_Granularity();\n * The meta object literal for the '<em><b>Arrival Rate Avg</b></em>' containment reference feature.\n EReference INPUT__ARRIVAL_RATE_AVG = eINSTANCE.getInput_ArrivalRateAvg();\n * The meta object literal for the '<em><b>Arrival Rate Minimum</b></em>' containment reference feature.\n EReference INPUT__ARRIVAL_RATE_MINIMUM = eINSTANCE.getInput_ArrivalRateMinimum();\n * The meta object literal for the '<em><b>Arrival Rate Maximum</b></em>' containment reference feature.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n EReference INPUT__ARRIVAL_RATE_MAXIMUM = eINSTANCE.getInput_ArrivalRateMaximum();\n\n /**\n * The meta object literal for the '<em><b>Obsolescence</b></em>' containment reference feature.\n EReference INPUT__OBSOLESCENCE = eINSTANCE.getInput_Obsolescence();\n /**\n * The meta object literal for the '<em><b>Appears In</b></em>' attribute feature.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n EAttribute INPUT__APPEARS_IN = eINSTANCE.getInput_AppearsIn();\n\n /**\n * The meta object literal for the '<em><b>Description</b></em>' attribute feature.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n EAttribute INPUT__DESCRIPTION = eINSTANCE.getInput_Description();\n\n /**\n * The meta object literal for the '<em><b>Structure</b></em>' containment reference feature.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n EReference INPUT__STRUCTURE = eINSTANCE.getInput_Structure();\n", "new_methods": [], "old_code": " * The meta object id for the '{@link net.certware.intent.state.stateSpecification.impl.OutputImpl <em>Output</em>}' class.\n * @see net.certware.intent.state.stateSpecification.impl.OutputImpl\n * @see net.certware.intent.state.stateSpecification.impl.StateSpecificationPackageImpl#getOutput()\n int OUTPUT = 19;\n int OUTPUT__LOWER = 0;\n int OUTPUT__UPPER = 1;\n int OUTPUT__RANGE_TYPE = 2;\n int OUTPUT__RANGE_UNITS = 3;\n int OUTPUT__VALUES = 4;\n int OUTPUT__RATE = 5;\n int OUTPUT__DELAY = 6;\n int OUTPUT__DEADLINE = 7;\n int OUTPUT__COMPLETION_HANDLING = 8;\n int OUTPUT__VARIABLES = 9;\n int OUTPUT__RELATIONSHIP = 10;\n int OUTPUT__MIN_RESPONSE = 11;\n int OUTPUT__MAX_RESPONSE = 12;\n int OUTPUT__FEEBACK_HANDLING = 13;\n int OUTPUT__REVERSED = 14;\n int OUTPUT__REFERENCES = 15;\n int OUTPUT__COMMENTS = 16;\n int OUTPUT__CONTENTS = 17;\n int OUTPUT__TABLE = 18;\n int OUTPUT_FEATURE_COUNT = 19;\n int INPUT = 20;\n * The feature id for the '<em><b>Lower</b></em>' attribute.\n int INPUT__LOWER = 0;\n * The feature id for the '<em><b>Upper</b></em>' attribute.\n int INPUT__UPPER = 1;\n * The feature id for the '<em><b>Range Type</b></em>' attribute.\n int INPUT__RANGE_TYPE = 2;\n * The feature id for the '<em><b>Range Units</b></em>' attribute.\n int INPUT__RANGE_UNITS = 3;\n * The feature id for the '<em><b>Values</b></em>' attribute list.\n int INPUT__VALUES = 4;\n * The feature id for the '<em><b>Rate</b></em>' containment reference.\n int INPUT__RATE = 5;\n * The feature id for the '<em><b>Variables</b></em>' attribute.\n int INPUT__VARIABLES = 6;\n int INPUT__REFERENCES = 7;\n int INPUT__COMMENTS = 8;\n int INPUT_FEATURE_COUNT = 9;\n * Returns the meta object for class '{@link net.certware.intent.state.stateSpecification.Output <em>Output</em>}'.\n * @return the meta object for class '<em>Output</em>'.\n * @see net.certware.intent.state.stateSpecification.Output\n EClass getOutput();\n * Returns the meta object for the attribute '{@link net.certware.intent.state.stateSpecification.Output#getLower <em>Lower</em>}'.\n * @see net.certware.intent.state.stateSpecification.Output#getLower()\n * @see #getOutput()\n EAttribute getOutput_Lower();\n * Returns the meta object for the attribute '{@link net.certware.intent.state.stateSpecification.Output#getUpper <em>Upper</em>}'.\n * @see net.certware.intent.state.stateSpecification.Output#getUpper()\n * @see #getOutput()\n EAttribute getOutput_Upper();\n * Returns the meta object for the attribute '{@link net.certware.intent.state.stateSpecification.Output#getRangeType <em>Range Type</em>}'.\n * @see net.certware.intent.state.stateSpecification.Output#getRangeType()\n * @see #getOutput()\n EAttribute getOutput_RangeType();\n * Returns the meta object for the attribute '{@link net.certware.intent.state.stateSpecification.Output#getRangeUnits <em>Range Units</em>}'.\n * @see net.certware.intent.state.stateSpecification.Output#getRangeUnits()\n * @see #getOutput()\n EAttribute getOutput_RangeUnits();\n * Returns the meta object for the attribute list '{@link net.certware.intent.state.stateSpecification.Output#getValues <em>Values</em>}'.\n * @see net.certware.intent.state.stateSpecification.Output#getValues()\n EAttribute getOutput_Values();\n * Returns the meta object for the attribute '{@link net.certware.intent.state.stateSpecification.Input#getLower <em>Lower</em>}'.\n * @return the meta object for the attribute '<em>Lower</em>'.\n * @see net.certware.intent.state.stateSpecification.Input#getLower()\n EAttribute getInput_Lower();\n * Returns the meta object for the attribute '{@link net.certware.intent.state.stateSpecification.Input#getUpper <em>Upper</em>}'.\n * @return the meta object for the attribute '<em>Upper</em>'.\n * @see net.certware.intent.state.stateSpecification.Input#getUpper()\n EAttribute getInput_Upper();\n * Returns the meta object for the attribute '{@link net.certware.intent.state.stateSpecification.Input#getRangeType <em>Range Type</em>}'.\n * @return the meta object for the attribute '<em>Range Type</em>'.\n * @see net.certware.intent.state.stateSpecification.Input#getRangeType()\n EAttribute getInput_RangeType();\n * Returns the meta object for the attribute '{@link net.certware.intent.state.stateSpecification.Input#getRangeUnits <em>Range Units</em>}'.\n * @return the meta object for the attribute '<em>Range Units</em>'.\n * @see net.certware.intent.state.stateSpecification.Input#getRangeUnits()\n EAttribute getInput_RangeUnits();\n * Returns the meta object for the attribute list '{@link net.certware.intent.state.stateSpecification.Input#getValues <em>Values</em>}'.\n * @return the meta object for the attribute list '<em>Values</em>'.\n * @see net.certware.intent.state.stateSpecification.Input#getValues()\n EAttribute getInput_Values();\n * Returns the meta object for the containment reference '{@link net.certware.intent.state.stateSpecification.Input#getRate <em>Rate</em>}'.\n * @return the meta object for the containment reference '<em>Rate</em>'.\n * @see net.certware.intent.state.stateSpecification.Input#getRate()\n EReference getInput_Rate();\n * Returns the meta object for the attribute '{@link net.certware.intent.state.stateSpecification.Input#getVariables <em>Variables</em>}'.\n * @return the meta object for the attribute '<em>Variables</em>'.\n * @see net.certware.intent.state.stateSpecification.Input#getVariables()\n EAttribute getInput_Variables();\n * The meta object literal for the '{@link net.certware.intent.state.stateSpecification.impl.OutputImpl <em>Output</em>}' class.\n * @see net.certware.intent.state.stateSpecification.impl.OutputImpl\n * @see net.certware.intent.state.stateSpecification.impl.StateSpecificationPackageImpl#getOutput()\n EClass OUTPUT = eINSTANCE.getOutput();\n EAttribute OUTPUT__LOWER = eINSTANCE.getOutput_Lower();\n EAttribute OUTPUT__UPPER = eINSTANCE.getOutput_Upper();\n EAttribute OUTPUT__RANGE_TYPE = eINSTANCE.getOutput_RangeType();\n EAttribute OUTPUT__RANGE_UNITS = eINSTANCE.getOutput_RangeUnits();\n EAttribute OUTPUT__VALUES = eINSTANCE.getOutput_Values();\n * The meta object literal for the '<em><b>Lower</b></em>' attribute feature.\n EAttribute INPUT__LOWER = eINSTANCE.getInput_Lower();\n * The meta object literal for the '<em><b>Upper</b></em>' attribute feature.\n EAttribute INPUT__UPPER = eINSTANCE.getInput_Upper();\n * The meta object literal for the '<em><b>Range Type</b></em>' attribute feature.\n EAttribute INPUT__RANGE_TYPE = eINSTANCE.getInput_RangeType();\n * The meta object literal for the '<em><b>Range Units</b></em>' attribute feature.\n EAttribute INPUT__RANGE_UNITS = eINSTANCE.getInput_RangeUnits();\n * The meta object literal for the '<em><b>Values</b></em>' attribute list feature.\n EAttribute INPUT__VALUES = eINSTANCE.getInput_Values();\n * The meta object literal for the '<em><b>Rate</b></em>' containment reference feature.\n EReference INPUT__RATE = eINSTANCE.getInput_Rate();\n * The meta object literal for the '<em><b>Variables</b></em>' attribute feature.\n EAttribute INPUT__VARIABLES = eINSTANCE.getInput_Variables();", "old_methods": [], "patch": "@@ -841,14 +841,14 @@ public interface StateSpecificationPackage extends EPackage\n int TRIGGER_TABLE_FEATURE_COUNT = 1;\n \n /**\n- * The meta object id for the '{@link net.certware.intent.state.stateSpecification.impl.OutputImpl <em>Output</em>}' class.\n+ * The meta object id for the '{@link net.certware.intent.state.stateSpecification.impl.ValueRangeImpl <em>Value Range</em>}' class.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n- * @see net.certware.intent.state.stateSpecification.impl.OutputImpl\n- * @see net.certware.intent.state.stateSpecification.impl.StateSpecificationPackageImpl#getOutput()\n+ * @see net.certware.intent.state.stateSpecification.impl.ValueRangeImpl\n+ * @see net.certware.intent.state.stateSpecification.impl.StateSpecificationPackageImpl#getValueRange()\n * @generated\n */\n- int OUTPUT = 19;\n+ int VALUE_RANGE = 19;\n \n /**\n * The feature id for the '<em><b>Lower</b></em>' attribute.\n@@ -857,7 +857,7 @@ public interface StateSpecificationPackage extends EPackage\n * @generated\n * @ordered\n */\n- int OUTPUT__LOWER = 0;\n+ int VALUE_RANGE__LOWER = 0;\n \n /**\n * The feature id for the '<em><b>Upper</b></em>' attribute.\n@@ -866,7 +866,7 @@ public interface StateSpecificationPackage extends EPackage\n * @generated\n * @ordered\n */\n- int OUTPUT__UPPER = 1;\n+ int VALUE_RANGE__UPPER = 1;\n \n /**\n * The feature id for the '<em><b>Range Type</b></em>' attribute.\n@@ -875,7 +875,7 @@ public interface StateSpecificationPackage extends EPackage\n * @generated\n * @ordered\n */\n- int OUTPUT__RANGE_TYPE = 2;\n+ int VALUE_RANGE__RANGE_TYPE = 2;\n \n /**\n * The feature id for the '<em><b>Range Units</b></em>' attribute.\n@@ -884,7 +884,26 @@ public interface StateSpecificationPackage extends EPackage\n * @generated\n * @ordered\n */\n- int OUTPUT__RANGE_UNITS = 3;\n+ int VALUE_RANGE__RANGE_UNITS = 3;\n+\n+ /**\n+ * The number of structural features of the '<em>Value Range</em>' class.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ * @ordered\n+ */\n+ int VALUE_RANGE_FEATURE_COUNT = 4;\n+\n+ /**\n+ * The meta object id for the '{@link net.certware.intent.state.stateSpecification.impl.ValueListImpl <em>Value List</em>}' class.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @see net.certware.intent.state.stateSpecification.impl.ValueListImpl\n+ * @see net.certware.intent.state.stateSpecification.impl.StateSpecificationPackageImpl#getValueList()\n+ * @generated\n+ */\n+ int VALUE_LIST = 20;\n \n /**\n * The feature id for the '<em><b>Values</b></em>' attribute list.\n@@ -893,7 +912,44 @@ public interface StateSpecificationPackage extends EPackage\n * @generated\n * @ordered\n */\n- int OUTPUT__VALUES = 4;\n+ int VALUE_LIST__VALUES = 0;\n+\n+ /**\n+ * The number of structural features of the '<em>Value List</em>' class.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ * @ordered\n+ */\n+ int VALUE_LIST_FEATURE_COUNT = 1;\n+\n+ /**\n+ * The meta object id for the '{@link net.certware.intent.state.stateSpecification.impl.OutputImpl <em>Output</em>}' class.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @see net.certware.intent.state.stateSpecification.impl.OutputImpl\n+ * @see net.certware.intent.state.stateSpecification.impl.StateSpecificationPackageImpl#getOutput()\n+ * @generated\n+ */\n+ int OUTPUT = 21;\n+\n+ /**\n+ * The feature id for the '<em><b>Range</b></em>' containment reference.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ * @ordered\n+ */\n+ int OUTPUT__RANGE = 0;\n+\n+ /**\n+ * The feature id for the '<em><b>Value List</b></em>' containment reference.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ * @ordered\n+ */\n+ int OUTPUT__VALUE_LIST = 1;\n \n /**\n * The feature id for the '<em><b>Rate</b></em>' containment reference.\n@@ -902,7 +958,7 @@ public interface StateSpecificationPackage extends EPackage\n * @generated\n * @ordered\n */\n- int OUTPUT__RATE = 5;\n+ int OUTPUT__RATE = 2;\n \n /**\n * The feature id for the '<em><b>Delay</b></em>' containment reference.\n@@ -911,7 +967,7 @@ public interface StateSpecificationPackage extends EPackage\n * @generated\n * @ordered\n */\n- int OUTPUT__DELAY = 6;\n+ int OUTPUT__DELAY = 3;\n \n /**\n * The feature id for the '<em><b>Deadline</b></em>' containment reference.\n@@ -920,7 +976,7 @@ public interface StateSpecificationPackage extends EPackage\n * @generated\n * @ordered\n */\n- int OUTPUT__DEADLINE = 7;\n+ int OUTPUT__DEADLINE = 4;\n \n /**\n * The feature id for the '<em><b>Completion Handling</b></em>' attribute.\n@@ -929,7 +985,7 @@ public interface StateSpecificationPackage extends EPackage\n * @generated\n * @ordered\n */\n- int OUTPUT__COMPLETION_HANDLING = 8;\n+ int OUTPUT__COMPLETION_HANDLING = 5;\n \n /**\n * The feature id for the '<em><b>Variables</b></em>' attribute.\n@@ -938,7 +994,7 @@ public interface StateSpecificationPackage extends EPackage\n * @generated\n * @ordered\n */\n- int OUTPUT__VARIABLES = 9;\n+ int OUTPUT__VARIABLES = 6;\n \n /**\n * The feature id for the '<em><b>Relationship</b></em>' attribute.\n@@ -947,7 +1003,7 @@ public interface StateSpecificationPackage extends EPackage\n * @generated\n * @ordered\n */\n- int OUTPUT__RELATIONSHIP = 10;\n+ int OUTPUT__RELATIONSHIP = 7;\n \n /**\n * The feature id for the '<em><b>Min Response</b></em>' containment reference.\n@@ -956,7 +1012,7 @@ public interface StateSpecificationPackage extends EPackage\n * @generated\n * @ordered\n */\n- int OUTPUT__MIN_RESPONSE = 11;\n+ int OUTPUT__MIN_RESPONSE = 8;\n \n /**\n * The feature id for the '<em><b>Max Response</b></em>' containment reference.\n@@ -965,7 +1021,7 @@ public interface StateSpecificationPackage extends EPackage\n * @generated\n * @ordered\n */\n- int OUTPUT__MAX_RESPONSE = 12;\n+ int OUTPUT__MAX_RESPONSE = 9;\n \n /**\n * The feature id for the '<em><b>Feeback Handling</b></em>' attribute.\n@@ -974,7 +1030,7 @@ public interface StateSpecificationPackage extends EPackage\n * @generated\n * @ordered\n */\n- int OUTPUT__FEEBACK_HANDLING = 13;\n+ int OUTPUT__FEEBACK_HANDLING = 10;\n \n /**\n * The feature id for the '<em><b>Reversed</b></em>' attribute.\n@@ -983,7 +1039,7 @@ public interface StateSpecificationPackage extends EPackage\n * @generated\n * @ordered\n */\n- int OUTPUT__REVERSED = 14;\n+ int OUTPUT__REVERSED = 11;\n \n /**\n * The feature id for the '<em><b>References</b></em>' attribute.\n@@ -992,7 +1048,7 @@ public interface StateSpecificationPackage extends EPackage\n * @generated\n * @ordered\n */\n- int OUTPUT__REFERENCES = 15;\n+ int OUTPUT__REFERENCES = 12;\n \n /**\n * The feature id for the '<em><b>Comments</b></em>' attribute.\n@@ -1001,7 +1057,7 @@ public interface StateSpecificationPackage extends EPackage\n * @generated\n * @ordered\n */\n- int OUTPUT__COMMENTS = 16;\n+ int OUTPUT__COMMENTS = 13;\n \n /**\n * The feature id for the '<em><b>Contents</b></em>' attribute.\n@@ -1010,7 +1066,7 @@ public interface StateSpecificationPackage extends EPackage\n * @generated\n * @ordered\n */\n- int OUTPUT__CONTENTS = 17;\n+ int OUTPUT__CONTENTS = 14;\n \n /**\n * The feature id for the '<em><b>Table</b></em>' containment reference.\n@@ -1019,7 +1075,7 @@ public interface StateSpecificationPackage extends EPackage\n * @generated\n * @ordered\n */\n- int OUTPUT__TABLE = 18;\n+ int OUTPUT__TABLE = 15;\n \n /**\n * The number of structural features of the '<em>Output</em>' class.\n@@ -1028,7 +1084,7 @@ public interface StateSpecificationPackage extends EPackage\n * @generated\n * @ordered\n */\n- int OUTPUT_FEATURE_COUNT = 19;\n+ int OUTPUT_FEATURE_COUNT = 16;\n \n /**\n * The meta object id for the '{@link net.certware.intent.state.stateSpecification.impl.InputImpl <em>Input</em>}' class.\n@@ -1038,70 +1094,79 @@ public interface StateSpecificationPackage extends EPackage\n * @see net.certware.intent.state.stateSpecification.impl.StateSpecificationPackageImpl#getInput()\n * @generated\n */\n- int INPUT = 20;\n+ int INPUT = 22;\n \n /**\n- * The feature id for the '<em><b>Lower</b></em>' attribute.\n+ * The feature id for the '<em><b>Range</b></em>' containment reference.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n * @ordered\n */\n- int INPUT__LOWER = 0;\n+ int INPUT__RANGE = 0;\n \n /**\n- * The feature id for the '<em><b>Upper</b></em>' attribute.\n+ * The feature id for the '<em><b>Value List</b></em>' containment reference.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n * @ordered\n */\n- int INPUT__UPPER = 1;\n+ int INPUT__VALUE_LIST = 1;\n \n /**\n- * The feature id for the '<em><b>Range Type</b></em>' attribute.\n+ * The feature id for the '<em><b>Value Handling</b></em>' attribute.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n * @ordered\n */\n- int INPUT__RANGE_TYPE = 2;\n+ int INPUT__VALUE_HANDLING = 2;\n \n /**\n- * The feature id for the '<em><b>Range Units</b></em>' attribute.\n+ * The feature id for the '<em><b>Granularity</b></em>' containment reference.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n * @ordered\n */\n- int INPUT__RANGE_UNITS = 3;\n+ int INPUT__GRANULARITY = 3;\n \n /**\n- * The feature id for the '<em><b>Values</b></em>' attribute list.\n+ * The feature id for the '<em><b>Arrival Rate Avg</b></em>' containment reference.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n * @ordered\n */\n- int INPUT__VALUES = 4;\n+ int INPUT__ARRIVAL_RATE_AVG = 4;\n \n /**\n- * The feature id for the '<em><b>Rate</b></em>' containment reference.\n+ * The feature id for the '<em><b>Arrival Rate Minimum</b></em>' containment reference.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n * @ordered\n */\n- int INPUT__RATE = 5;\n+ int INPUT__ARRIVAL_RATE_MINIMUM = 5;\n \n /**\n- * The feature id for the '<em><b>Variables</b></em>' attribute.\n+ * The feature id for the '<em><b>Arrival Rate Maximum</b></em>' containment reference.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ * @ordered\n+ */\n+ int INPUT__ARRIVAL_RATE_MAXIMUM = 6;\n+\n+ /**\n+ * The feature id for the '<em><b>Obsolescence</b></em>' containment reference.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n * @ordered\n */\n- int INPUT__VARIABLES = 6;\n+ int INPUT__OBSOLESCENCE = 7;\n \n /**\n * The feature id for the '<em><b>References</b></em>' attribute.\n@@ -1110,7 +1175,25 @@ public interface StateSpecificationPackage extends EPackage\n * @generated\n * @ordered\n */\n- int INPUT__REFERENCES = 7;\n+ int INPUT__REFERENCES = 8;\n+\n+ /**\n+ * The feature id for the '<em><b>Appears In</b></em>' attribute.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ * @ordered\n+ */\n+ int INPUT__APPEARS_IN = 9;\n+\n+ /**\n+ * The feature id for the '<em><b>Description</b></em>' attribute.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ * @ordered\n+ */\n+ int INPUT__DESCRIPTION = 10;\n \n /**\n * The feature id for the '<em><b>Comments</b></em>' attribute.\n@@ -1119,7 +1202,16 @@ public interface StateSpecificationPackage extends EPackage\n * @generated\n * @ordered\n */\n- int INPUT__COMMENTS = 8;\n+ int INPUT__COMMENTS = 11;\n+\n+ /**\n+ * The feature id for the '<em><b>Structure</b></em>' containment reference.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ * @ordered\n+ */\n+ int INPUT__STRUCTURE = 12;\n \n /**\n * The number of structural features of the '<em>Input</em>' class.\n@@ -1128,7 +1220,7 @@ public interface StateSpecificationPackage extends EPackage\n * @generated\n * @ordered\n */\n- int INPUT_FEATURE_COUNT = 9;\n+ int INPUT_FEATURE_COUNT = 13;\n \n \n /**\n@@ -1839,69 +1931,111 @@ public interface StateSpecificationPackage extends EPackage\n EReference getTriggerTable_Rows();\n \n /**\n- * Returns the meta object for class '{@link net.certware.intent.state.stateSpecification.Output <em>Output</em>}'.\n+ * Returns the meta object for class '{@link net.certware.intent.state.stateSpecification.ValueRange <em>Value Range</em>}'.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n- * @return the meta object for class '<em>Output</em>'.\n- * @see net.certware.intent.state.stateSpecification.Output\n+ * @return the meta object for class '<em>Value Range</em>'.\n+ * @see net.certware.intent.state.stateSpecification.ValueRange\n * @generated\n */\n- EClass getOutput();\n+ EClass getValueRange();\n \n /**\n- * Returns the meta object for the attribute '{@link net.certware.intent.state.stateSpecification.Output#getLower <em>Lower</em>}'.\n+ * Returns the meta object for the attribute '{@link net.certware.intent.state.stateSpecification.ValueRange#getLower <em>Lower</em>}'.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @return the meta object for the attribute '<em>Lower</em>'.\n- * @see net.certware.intent.state.stateSpecification.Output#getLower()\n- * @see #getOutput()\n+ * @see net.certware.intent.state.stateSpecification.ValueRange#getLower()\n+ * @see #getValueRange()\n * @generated\n */\n- EAttribute getOutput_Lower();\n+ EAttribute getValueRange_Lower();\n \n /**\n- * Returns the meta object for the attribute '{@link net.certware.intent.state.stateSpecification.Output#getUpper <em>Upper</em>}'.\n+ * Returns the meta object for the attribute '{@link net.certware.intent.state.stateSpecification.ValueRange#getUpper <em>Upper</em>}'.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @return the meta object for the attribute '<em>Upper</em>'.\n- * @see net.certware.intent.state.stateSpecification.Output#getUpper()\n- * @see #getOutput()\n+ * @see net.certware.intent.state.stateSpecification.ValueRange#getUpper()\n+ * @see #getValueRange()\n * @generated\n */\n- EAttribute getOutput_Upper();\n+ EAttribute getValueRange_Upper();\n \n /**\n- * Returns the meta object for the attribute '{@link net.certware.intent.state.stateSpecification.Output#getRangeType <em>Range Type</em>}'.\n+ * Returns the meta object for the attribute '{@link net.certware.intent.state.stateSpecification.ValueRange#getRangeType <em>Range Type</em>}'.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @return the meta object for the attribute '<em>Range Type</em>'.\n- * @see net.certware.intent.state.stateSpecification.Output#getRangeType()\n- * @see #getOutput()\n+ * @see net.certware.intent.state.stateSpecification.ValueRange#getRangeType()\n+ * @see #getValueRange()\n * @generated\n */\n- EAttribute getOutput_RangeType();\n+ EAttribute getValueRange_RangeType();\n \n /**\n- * Returns the meta object for the attribute '{@link net.certware.intent.state.stateSpecification.Output#getRangeUnits <em>Range Units</em>}'.\n+ * Returns the meta object for the attribute '{@link net.certware.intent.state.stateSpecification.ValueRange#getRangeUnits <em>Range Units</em>}'.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @return the meta object for the attribute '<em>Range Units</em>'.\n- * @see net.certware.intent.state.stateSpecification.Output#getRangeUnits()\n- * @see #getOutput()\n+ * @see net.certware.intent.state.stateSpecification.ValueRange#getRangeUnits()\n+ * @see #getValueRange()\n+ * @generated\n+ */\n+ EAttribute getValueRange_RangeUnits();\n+\n+ /**\n+ * Returns the meta object for class '{@link net.certware.intent.state.stateSpecification.ValueList <em>Value List</em>}'.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @return the meta object for class '<em>Value List</em>'.\n+ * @see net.certware.intent.state.stateSpecification.ValueList\n * @generated\n */\n- EAttribute getOutput_RangeUnits();\n+ EClass getValueList();\n \n /**\n- * Returns the meta object for the attribute list '{@link net.certware.intent.state.stateSpecification.Output#getValues <em>Values</em>}'.\n+ * Returns the meta object for the attribute list '{@link net.certware.intent.state.stateSpecification.ValueList#getValues <em>Values</em>}'.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @return the meta object for the attribute list '<em>Values</em>'.\n- * @see net.certware.intent.state.stateSpecification.Output#getValues()\n+ * @see net.certware.intent.state.stateSpecification.ValueList#getValues()\n+ * @see #getValueList()\n+ * @generated\n+ */\n+ EAttribute getValueList_Values();\n+\n+ /**\n+ * Returns the meta object for class '{@link net.certware.intent.state.stateSpecification.Output <em>Output</em>}'.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @return the meta object for class '<em>Output</em>'.\n+ * @see net.certware.intent.state.stateSpecification.Output\n+ * @generated\n+ */\n+ EClass getOutput();\n+\n+ /**\n+ * Returns the meta object for the containment reference '{@link net.certware.intent.state.stateSpecification.Output#getRange <em>Range</em>}'.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @return the meta object for the containment reference '<em>Range</em>'.\n+ * @see net.certware.intent.state.stateSpecification.Output#getRange()\n+ * @see #getOutput()\n+ * @generated\n+ */\n+ EReference getOutput_Range();\n+\n+ /**\n+ * Returns the meta object for the containment reference '{@link net.certware.intent.state.stateSpecification.Output#getValueList <em>Value List</em>}'.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @return the meta object for the containment reference '<em>Value List</em>'.\n+ * @see net.certware.intent.state.stateSpecification.Output#getValueList()\n * @see #getOutput()\n * @generated\n */\n- EAttribute getOutput_Values();\n+ EReference getOutput_ValueList();\n \n /**\n * Returns the meta object for the containment reference '{@link net.certware.intent.state.stateSpecification.Output#getRate <em>Rate</em>}'.\n@@ -2068,81 +2202,92 @@ public interface StateSpecificationPackage extends EPackage\n EClass getInput();\n \n /**\n- * Returns the meta object for the attribute '{@link net.certware.intent.state.stateSpecification.Input#getLower <em>Lower</em>}'.\n+ * Returns the meta object for the containment reference '{@link net.certware.intent.state.stateSpecification.Input#getRange <em>Range</em>}'.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n- * @return the meta object for the attribute '<em>Lower</em>'.\n- * @see net.certware.intent.state.stateSpecification.Input#getLower()\n+ * @return the meta object for the containment reference '<em>Range</em>'.\n+ * @see net.certware.intent.state.stateSpecification.Input#getRange()\n * @see #getInput()\n * @generated\n */\n- EAttribute getInput_Lower();\n+ EReference getInput_Range();\n \n /**\n- * Returns the meta object for the attribute '{@link net.certware.intent.state.stateSpecification.Input#getUpper <em>Upper</em>}'.\n+ * Returns the meta object for the containment reference '{@link net.certware.intent.state.stateSpecification.Input#getValueList <em>Value List</em>}'.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n- * @return the meta object for the attribute '<em>Upper</em>'.\n- * @see net.certware.intent.state.stateSpecification.Input#getUpper()\n+ * @return the meta object for the containment reference '<em>Value List</em>'.\n+ * @see net.certware.intent.state.stateSpecification.Input#getValueList()\n * @see #getInput()\n * @generated\n */\n- EAttribute getInput_Upper();\n+ EReference getInput_ValueList();\n \n /**\n- * Returns the meta object for the attribute '{@link net.certware.intent.state.stateSpecification.Input#getRangeType <em>Range Type</em>}'.\n+ * Returns the meta object for the attribute '{@link net.certware.intent.state.stateSpecification.Input#getValueHandling <em>Value Handling</em>}'.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n- * @return the meta object for the attribute '<em>Range Type</em>'.\n- * @see net.certware.intent.state.stateSpecification.Input#getRangeType()\n+ * @return the meta object for the attribute '<em>Value Handling</em>'.\n+ * @see net.certware.intent.state.stateSpecification.Input#getValueHandling()\n * @see #getInput()\n * @generated\n */\n- EAttribute getInput_RangeType();\n+ EAttribute getInput_ValueHandling();\n \n /**\n- * Returns the meta object for the attribute '{@link net.certware.intent.state.stateSpecification.Input#getRangeUnits <em>Range Units</em>}'.\n+ * Returns the meta object for the containment reference '{@link net.certware.intent.state.stateSpecification.Input#getGranularity <em>Granularity</em>}'.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n- * @return the meta object for the attribute '<em>Range Units</em>'.\n- * @see net.certware.intent.state.stateSpecification.Input#getRangeUnits()\n+ * @return the meta object for the containment reference '<em>Granularity</em>'.\n+ * @see net.certware.intent.state.stateSpecification.Input#getGranularity()\n * @see #getInput()\n * @generated\n */\n- EAttribute getInput_RangeUnits();\n+ EReference getInput_Granularity();\n \n /**\n- * Returns the meta object for the attribute list '{@link net.certware.intent.state.stateSpecification.Input#getValues <em>Values</em>}'.\n+ * Returns the meta object for the containment reference '{@link net.certware.intent.state.stateSpecification.Input#getArrivalRateAvg <em>Arrival Rate Avg</em>}'.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n- * @return the meta object for the attribute list '<em>Values</em>'.\n- * @see net.certware.intent.state.stateSpecification.Input#getValues()\n+ * @return the meta object for the containment reference '<em>Arrival Rate Avg</em>'.\n+ * @see net.certware.intent.state.stateSpecification.Input#getArrivalRateAvg()\n * @see #getInput()\n * @generated\n */\n- EAttribute getInput_Values();\n+ EReference getInput_ArrivalRateAvg();\n \n /**\n- * Returns the meta object for the containment reference '{@link net.certware.intent.state.stateSpecification.Input#getRate <em>Rate</em>}'.\n+ * Returns the meta object for the containment reference '{@link net.certware.intent.state.stateSpecification.Input#getArrivalRateMinimum <em>Arrival Rate Minimum</em>}'.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n- * @return the meta object for the containment reference '<em>Rate</em>'.\n- * @see net.certware.intent.state.stateSpecification.Input#getRate()\n+ * @return the meta object for the containment reference '<em>Arrival Rate Minimum</em>'.\n+ * @see net.certware.intent.state.stateSpecification.Input#getArrivalRateMinimum()\n * @see #getInput()\n * @generated\n */\n- EReference getInput_Rate();\n+ EReference getInput_ArrivalRateMinimum();\n \n /**\n- * Returns the meta object for the attribute '{@link net.certware.intent.state.stateSpecification.Input#getVariables <em>Variables</em>}'.\n+ * Returns the meta object for the containment reference '{@link net.certware.intent.state.stateSpecification.Input#getArrivalRateMaximum <em>Arrival Rate Maximum</em>}'.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n- * @return the meta object for the attribute '<em>Variables</em>'.\n- * @see net.certware.intent.state.stateSpecification.Input#getVariables()\n+ * @return the meta object for the containment reference '<em>Arrival Rate Maximum</em>'.\n+ * @see net.certware.intent.state.stateSpecification.Input#getArrivalRateMaximum()\n * @see #getInput()\n * @generated\n */\n- EAttribute getInput_Variables();\n+ EReference getInput_ArrivalRateMaximum();\n+\n+ /**\n+ * Returns the meta object for the containment reference '{@link net.certware.intent.state.stateSpecification.Input#getObsolescence <em>Obsolescence</em>}'.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @return the meta object for the containment reference '<em>Obsolescence</em>'.\n+ * @see net.certware.intent.state.stateSpecification.Input#getObsolescence()\n+ * @see #getInput()\n+ * @generated\n+ */\n+ EReference getInput_Obsolescence();\n \n /**\n * Returns the meta object for the attribute '{@link net.certware.intent.state.stateSpecification.Input#getReferences <em>References</em>}'.\n@@ -2155,6 +2300,28 @@ public interface StateSpecificationPackage extends EPackage\n */\n EAttribute getInput_References();\n \n+ /**\n+ * Returns the meta object for the attribute '{@link net.certware.intent.state.stateSpecification.Input#getAppearsIn <em>Appears In</em>}'.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @return the meta object for the attribute '<em>Appears In</em>'.\n+ * @see net.certware.intent.state.stateSpecification.Input#getAppearsIn()\n+ * @see #getInput()\n+ * @generated\n+ */\n+ EAttribute getInput_AppearsIn();\n+\n+ /**\n+ * Returns the meta object for the attribute '{@link net.certware.intent.state.stateSpecification.Input#getDescription <em>Description</em>}'.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @return the meta object for the attribute '<em>Description</em>'.\n+ * @see net.certware.intent.state.stateSpecification.Input#getDescription()\n+ * @see #getInput()\n+ * @generated\n+ */\n+ EAttribute getInput_Description();\n+\n /**\n * Returns the meta object for the attribute '{@link net.certware.intent.state.stateSpecification.Input#getComments <em>Comments</em>}'.\n * <!-- begin-user-doc -->\n@@ -2166,6 +2333,17 @@ public interface StateSpecificationPackage extends EPackage\n */\n EAttribute getInput_Comments();\n \n+ /**\n+ * Returns the meta object for the containment reference '{@link net.certware.intent.state.stateSpecification.Input#getStructure <em>Structure</em>}'.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @return the meta object for the containment reference '<em>Structure</em>'.\n+ * @see net.certware.intent.state.stateSpecification.Input#getStructure()\n+ * @see #getInput()\n+ * @generated\n+ */\n+ EReference getInput_Structure();\n+\n /**\n * Returns the factory that creates the instances of the model.\n * <!-- begin-user-doc -->\n@@ -2756,54 +2934,90 @@ interface Literals\n EReference TRIGGER_TABLE__ROWS = eINSTANCE.getTriggerTable_Rows();\n \n /**\n- * The meta object literal for the '{@link net.certware.intent.state.stateSpecification.impl.OutputImpl <em>Output</em>}' class.\n+ * The meta object literal for the '{@link net.certware.intent.state.stateSpecification.impl.ValueRangeImpl <em>Value Range</em>}' class.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n- * @see net.certware.intent.state.stateSpecification.impl.OutputImpl\n- * @see net.certware.intent.state.stateSpecification.impl.StateSpecificationPackageImpl#getOutput()\n+ * @see net.certware.intent.state.stateSpecification.impl.ValueRangeImpl\n+ * @see net.certware.intent.state.stateSpecification.impl.StateSpecificationPackageImpl#getValueRange()\n * @generated\n */\n- EClass OUTPUT = eINSTANCE.getOutput();\n+ EClass VALUE_RANGE = eINSTANCE.getValueRange();\n \n /**\n * The meta object literal for the '<em><b>Lower</b></em>' attribute feature.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n- EAttribute OUTPUT__LOWER = eINSTANCE.getOutput_Lower();\n+ EAttribute VALUE_RANGE__LOWER = eINSTANCE.getValueRange_Lower();\n \n /**\n * The meta object literal for the '<em><b>Upper</b></em>' attribute feature.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n- EAttribute OUTPUT__UPPER = eINSTANCE.getOutput_Upper();\n+ EAttribute VALUE_RANGE__UPPER = eINSTANCE.getValueRange_Upper();\n \n /**\n * The meta object literal for the '<em><b>Range Type</b></em>' attribute feature.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n- EAttribute OUTPUT__RANGE_TYPE = eINSTANCE.getOutput_RangeType();\n+ EAttribute VALUE_RANGE__RANGE_TYPE = eINSTANCE.getValueRange_RangeType();\n \n /**\n * The meta object literal for the '<em><b>Range Units</b></em>' attribute feature.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n- EAttribute OUTPUT__RANGE_UNITS = eINSTANCE.getOutput_RangeUnits();\n+ EAttribute VALUE_RANGE__RANGE_UNITS = eINSTANCE.getValueRange_RangeUnits();\n+\n+ /**\n+ * The meta object literal for the '{@link net.certware.intent.state.stateSpecification.impl.ValueListImpl <em>Value List</em>}' class.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @see net.certware.intent.state.stateSpecification.impl.ValueListImpl\n+ * @see net.certware.intent.state.stateSpecification.impl.StateSpecificationPackageImpl#getValueList()\n+ * @generated\n+ */\n+ EClass VALUE_LIST = eINSTANCE.getValueList();\n \n /**\n * The meta object literal for the '<em><b>Values</b></em>' attribute list feature.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n- EAttribute OUTPUT__VALUES = eINSTANCE.getOutput_Values();\n+ EAttribute VALUE_LIST__VALUES = eINSTANCE.getValueList_Values();\n+\n+ /**\n+ * The meta object literal for the '{@link net.certware.intent.state.stateSpecification.impl.OutputImpl <em>Output</em>}' class.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @see net.certware.intent.state.stateSpecification.impl.OutputImpl\n+ * @see net.certware.intent.state.stateSpecification.impl.StateSpecificationPackageImpl#getOutput()\n+ * @generated\n+ */\n+ EClass OUTPUT = eINSTANCE.getOutput();\n+\n+ /**\n+ * The meta object literal for the '<em><b>Range</b></em>' containment reference feature.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ */\n+ EReference OUTPUT__RANGE = eINSTANCE.getOutput_Range();\n+\n+ /**\n+ * The meta object literal for the '<em><b>Value List</b></em>' containment reference feature.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ */\n+ EReference OUTPUT__VALUE_LIST = eINSTANCE.getOutput_ValueList();\n \n /**\n * The meta object literal for the '<em><b>Rate</b></em>' containment reference feature.\n@@ -2928,60 +3142,68 @@ interface Literals\n EClass INPUT = eINSTANCE.getInput();\n \n /**\n- * The meta object literal for the '<em><b>Lower</b></em>' attribute feature.\n+ * The meta object literal for the '<em><b>Range</b></em>' containment reference feature.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n- EAttribute INPUT__LOWER = eINSTANCE.getInput_Lower();\n+ EReference INPUT__RANGE = eINSTANCE.getInput_Range();\n \n /**\n- * The meta object literal for the '<em><b>Upper</b></em>' attribute feature.\n+ * The meta object literal for the '<em><b>Value List</b></em>' containment reference feature.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n- EAttribute INPUT__UPPER = eINSTANCE.getInput_Upper();\n+ EReference INPUT__VALUE_LIST = eINSTANCE.getInput_ValueList();\n \n /**\n- * The meta object literal for the '<em><b>Range Type</b></em>' attribute feature.\n+ * The meta object literal for the '<em><b>Value Handling</b></em>' attribute feature.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n- EAttribute INPUT__RANGE_TYPE = eINSTANCE.getInput_RangeType();\n+ EAttribute INPUT__VALUE_HANDLING = eINSTANCE.getInput_ValueHandling();\n \n /**\n- * The meta object literal for the '<em><b>Range Units</b></em>' attribute feature.\n+ * The meta object literal for the '<em><b>Granularity</b></em>' containment reference feature.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n- EAttribute INPUT__RANGE_UNITS = eINSTANCE.getInput_RangeUnits();\n+ EReference INPUT__GRANULARITY = eINSTANCE.getInput_Granularity();\n \n /**\n- * The meta object literal for the '<em><b>Values</b></em>' attribute list feature.\n+ * The meta object literal for the '<em><b>Arrival Rate Avg</b></em>' containment reference feature.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n- EAttribute INPUT__VALUES = eINSTANCE.getInput_Values();\n+ EReference INPUT__ARRIVAL_RATE_AVG = eINSTANCE.getInput_ArrivalRateAvg();\n \n /**\n- * The meta object literal for the '<em><b>Rate</b></em>' containment reference feature.\n+ * The meta object literal for the '<em><b>Arrival Rate Minimum</b></em>' containment reference feature.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n- EReference INPUT__RATE = eINSTANCE.getInput_Rate();\n+ EReference INPUT__ARRIVAL_RATE_MINIMUM = eINSTANCE.getInput_ArrivalRateMinimum();\n \n /**\n- * The meta object literal for the '<em><b>Variables</b></em>' attribute feature.\n+ * The meta object literal for the '<em><b>Arrival Rate Maximum</b></em>' containment reference feature.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ */\n+ EReference INPUT__ARRIVAL_RATE_MAXIMUM = eINSTANCE.getInput_ArrivalRateMaximum();\n+\n+ /**\n+ * The meta object literal for the '<em><b>Obsolescence</b></em>' containment reference feature.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n- EAttribute INPUT__VARIABLES = eINSTANCE.getInput_Variables();\n+ EReference INPUT__OBSOLESCENCE = eINSTANCE.getInput_Obsolescence();\n \n /**\n * The meta object literal for the '<em><b>References</b></em>' attribute feature.\n@@ -2991,6 +3213,22 @@ interface Literals\n */\n EAttribute INPUT__REFERENCES = eINSTANCE.getInput_References();\n \n+ /**\n+ * The meta object literal for the '<em><b>Appears In</b></em>' attribute feature.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ */\n+ EAttribute INPUT__APPEARS_IN = eINSTANCE.getInput_AppearsIn();\n+\n+ /**\n+ * The meta object literal for the '<em><b>Description</b></em>' attribute feature.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ */\n+ EAttribute INPUT__DESCRIPTION = eINSTANCE.getInput_Description();\n+\n /**\n * The meta object literal for the '<em><b>Comments</b></em>' attribute feature.\n * <!-- begin-user-doc -->\n@@ -2999,6 +3237,14 @@ interface Literals\n */\n EAttribute INPUT__COMMENTS = eINSTANCE.getInput_Comments();\n \n+ /**\n+ * The meta object literal for the '<em><b>Structure</b></em>' containment reference feature.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ */\n+ EReference INPUT__STRUCTURE = eINSTANCE.getInput_Structure();\n+\n }\n \n } //StateSpecificationPackage", "raw_url": "https://github.com/nasa/CertWare/raw/110fa3222ae2931978d7921dc8e6af8c7f43abd3/net.certware.intent.state%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fstate%2FstateSpecification%2FStateSpecificationPackage.java", "sha": "11ba0201c63d6a54b9aad6ceaac0b464e3cea048", "status": "modified" }, { "additions": 518, "blob_url": "https://github.com/nasa/CertWare/blob/110fa3222ae2931978d7921dc8e6af8c7f43abd3/net.certware.intent.state%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fstate%2FstateSpecification%2Fimpl%2FInputImpl.java", "changes": 695, "contents_url": "https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent.state%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fstate%2FstateSpecification%2Fimpl%2FInputImpl.java?ref=110fa3222ae2931978d7921dc8e6af8c7f43abd3", "deletions": 177, "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/stateSpecification/impl/InputImpl.java", "new_code": "import net.certware.intent.state.stateSpecification.TriggerTable;\nimport net.certware.intent.state.stateSpecification.ValueList;\nimport net.certware.intent.state.stateSpecification.ValueRange;\n * <li>{@link net.certware.intent.state.stateSpecification.impl.InputImpl#getRange <em>Range</em>}</li>\n * <li>{@link net.certware.intent.state.stateSpecification.impl.InputImpl#getValueList <em>Value List</em>}</li>\n * <li>{@link net.certware.intent.state.stateSpecification.impl.InputImpl#getValueHandling <em>Value Handling</em>}</li>\n * <li>{@link net.certware.intent.state.stateSpecification.impl.InputImpl#getGranularity <em>Granularity</em>}</li>\n * <li>{@link net.certware.intent.state.stateSpecification.impl.InputImpl#getArrivalRateAvg <em>Arrival Rate Avg</em>}</li>\n * <li>{@link net.certware.intent.state.stateSpecification.impl.InputImpl#getArrivalRateMinimum <em>Arrival Rate Minimum</em>}</li>\n * <li>{@link net.certware.intent.state.stateSpecification.impl.InputImpl#getArrivalRateMaximum <em>Arrival Rate Maximum</em>}</li>\n * <li>{@link net.certware.intent.state.stateSpecification.impl.InputImpl#getObsolescence <em>Obsolescence</em>}</li>\n * <li>{@link net.certware.intent.state.stateSpecification.impl.InputImpl#getAppearsIn <em>Appears In</em>}</li>\n * <li>{@link net.certware.intent.state.stateSpecification.impl.InputImpl#getDescription <em>Description</em>}</li>\n * <li>{@link net.certware.intent.state.stateSpecification.impl.InputImpl#getStructure <em>Structure</em>}</li>\n * The cached value of the '{@link #getRange() <em>Range</em>}' containment reference.\n * @see #getRange()\n protected ValueRange range;\n * The cached value of the '{@link #getValueList() <em>Value List</em>}' containment reference.\n * @see #getValueList()\n protected ValueList valueList;\n * The default value of the '{@link #getValueHandling() <em>Value Handling</em>}' attribute.\n * @see #getValueHandling()\n protected static final String VALUE_HANDLING_EDEFAULT = null;\n * The cached value of the '{@link #getValueHandling() <em>Value Handling</em>}' attribute.\n * @see #getValueHandling()\n protected String valueHandling = VALUE_HANDLING_EDEFAULT;\n * The cached value of the '{@link #getGranularity() <em>Granularity</em>}' containment reference.\n * @see #getGranularity()\n protected BigUnitValue granularity;\n * The cached value of the '{@link #getArrivalRateAvg() <em>Arrival Rate Avg</em>}' containment reference.\n * @see #getArrivalRateAvg()\n protected BigUnitValue arrivalRateAvg;\n * The cached value of the '{@link #getArrivalRateMinimum() <em>Arrival Rate Minimum</em>}' containment reference.\n * @see #getArrivalRateMinimum()\n protected BigUnitValue arrivalRateMinimum;\n * The cached value of the '{@link #getArrivalRateMaximum() <em>Arrival Rate Maximum</em>}' containment reference.\n * @see #getArrivalRateMaximum()\n protected BigUnitValue arrivalRateMaximum;\n * The cached value of the '{@link #getObsolescence() <em>Obsolescence</em>}' containment reference.\n * @see #getObsolescence()\n protected BigUnitValue obsolescence;\n * The default value of the '{@link #getReferences() <em>References</em>}' attribute.\n * @see #getReferences()\n protected static final String REFERENCES_EDEFAULT = null;\n * The cached value of the '{@link #getReferences() <em>References</em>}' attribute.\n * @see #getReferences()\n protected String references = REFERENCES_EDEFAULT;\n * The default value of the '{@link #getAppearsIn() <em>Appears In</em>}' attribute.\n * @see #getAppearsIn()\n protected static final String APPEARS_IN_EDEFAULT = null;\n * The cached value of the '{@link #getAppearsIn() <em>Appears In</em>}' attribute.\n * @see #getAppearsIn()\n protected String appearsIn = APPEARS_IN_EDEFAULT;\n * The default value of the '{@link #getDescription() <em>Description</em>}' attribute.\n * @see #getDescription()\n protected static final String DESCRIPTION_EDEFAULT = null;\n\n /**\n * The cached value of the '{@link #getDescription() <em>Description</em>}' attribute.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @see #getDescription()\n * @generated\n * @ordered\n */\n protected String description = DESCRIPTION_EDEFAULT;\n /**\n * The cached value of the '{@link #getStructure() <em>Structure</em>}' containment reference.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @see #getStructure()\n * @generated\n * @ordered\n */\n protected TriggerTable structure;\n\n public ValueRange getRange()\n {\n return range;\n }\n\n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n public NotificationChain basicSetRange(ValueRange newRange, NotificationChain msgs)\n {\n ValueRange oldRange = range;\n range = newRange;\n if (eNotificationRequired())\n {\n ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, StateSpecificationPackage.INPUT__RANGE, oldRange, newRange);\n if (msgs == null) msgs = notification; else msgs.add(notification);\n }\n return msgs;\n }\n\n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n public void setRange(ValueRange newRange)\n {\n if (newRange != range)\n {\n NotificationChain msgs = null;\n if (range != null)\n msgs = ((InternalEObject)range).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - StateSpecificationPackage.INPUT__RANGE, null, msgs);\n if (newRange != null)\n msgs = ((InternalEObject)newRange).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - StateSpecificationPackage.INPUT__RANGE, null, msgs);\n msgs = basicSetRange(newRange, msgs);\n if (msgs != null) msgs.dispatch();\n }\n else if (eNotificationRequired())\n eNotify(new ENotificationImpl(this, Notification.SET, StateSpecificationPackage.INPUT__RANGE, newRange, newRange));\n }\n\n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n public ValueList getValueList()\n {\n return valueList;\n }\n\n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n public NotificationChain basicSetValueList(ValueList newValueList, NotificationChain msgs)\n {\n ValueList oldValueList = valueList;\n valueList = newValueList;\n if (eNotificationRequired())\n {\n ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, StateSpecificationPackage.INPUT__VALUE_LIST, oldValueList, newValueList);\n if (msgs == null) msgs = notification; else msgs.add(notification);\n }\n return msgs;\n }\n\n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n public void setValueList(ValueList newValueList)\n {\n if (newValueList != valueList)\n {\n NotificationChain msgs = null;\n if (valueList != null)\n msgs = ((InternalEObject)valueList).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - StateSpecificationPackage.INPUT__VALUE_LIST, null, msgs);\n if (newValueList != null)\n msgs = ((InternalEObject)newValueList).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - StateSpecificationPackage.INPUT__VALUE_LIST, null, msgs);\n msgs = basicSetValueList(newValueList, msgs);\n if (msgs != null) msgs.dispatch();\n }\n else if (eNotificationRequired())\n eNotify(new ENotificationImpl(this, Notification.SET, StateSpecificationPackage.INPUT__VALUE_LIST, newValueList, newValueList));\n }\n\n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n public String getValueHandling()\n return valueHandling;\n public void setValueHandling(String newValueHandling)\n String oldValueHandling = valueHandling;\n valueHandling = newValueHandling;\n eNotify(new ENotificationImpl(this, Notification.SET, StateSpecificationPackage.INPUT__VALUE_HANDLING, oldValueHandling, valueHandling));\n public BigUnitValue getGranularity()\n return granularity;\n public NotificationChain basicSetGranularity(BigUnitValue newGranularity, NotificationChain msgs)\n BigUnitValue oldGranularity = granularity;\n granularity = newGranularity;\n {\n ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, StateSpecificationPackage.INPUT__GRANULARITY, oldGranularity, newGranularity);\n if (msgs == null) msgs = notification; else msgs.add(notification);\n }\n return msgs;\n public void setGranularity(BigUnitValue newGranularity)\n if (newGranularity != granularity)\n {\n NotificationChain msgs = null;\n if (granularity != null)\n msgs = ((InternalEObject)granularity).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - StateSpecificationPackage.INPUT__GRANULARITY, null, msgs);\n if (newGranularity != null)\n msgs = ((InternalEObject)newGranularity).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - StateSpecificationPackage.INPUT__GRANULARITY, null, msgs);\n msgs = basicSetGranularity(newGranularity, msgs);\n if (msgs != null) msgs.dispatch();\n }\n else if (eNotificationRequired())\n eNotify(new ENotificationImpl(this, Notification.SET, StateSpecificationPackage.INPUT__GRANULARITY, newGranularity, newGranularity));\n }\n\n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n public BigUnitValue getArrivalRateAvg()\n {\n return arrivalRateAvg;\n public NotificationChain basicSetArrivalRateAvg(BigUnitValue newArrivalRateAvg, NotificationChain msgs)\n BigUnitValue oldArrivalRateAvg = arrivalRateAvg;\n arrivalRateAvg = newArrivalRateAvg;\n {\n ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, StateSpecificationPackage.INPUT__ARRIVAL_RATE_AVG, oldArrivalRateAvg, newArrivalRateAvg);\n if (msgs == null) msgs = notification; else msgs.add(notification);\n }\n return msgs;\n public void setArrivalRateAvg(BigUnitValue newArrivalRateAvg)\n if (newArrivalRateAvg != arrivalRateAvg)\n {\n NotificationChain msgs = null;\n if (arrivalRateAvg != null)\n msgs = ((InternalEObject)arrivalRateAvg).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - StateSpecificationPackage.INPUT__ARRIVAL_RATE_AVG, null, msgs);\n if (newArrivalRateAvg != null)\n msgs = ((InternalEObject)newArrivalRateAvg).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - StateSpecificationPackage.INPUT__ARRIVAL_RATE_AVG, null, msgs);\n msgs = basicSetArrivalRateAvg(newArrivalRateAvg, msgs);\n if (msgs != null) msgs.dispatch();\n }\n else if (eNotificationRequired())\n eNotify(new ENotificationImpl(this, Notification.SET, StateSpecificationPackage.INPUT__ARRIVAL_RATE_AVG, newArrivalRateAvg, newArrivalRateAvg));\n public BigUnitValue getArrivalRateMinimum()\n return arrivalRateMinimum;\n }\n\n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n public NotificationChain basicSetArrivalRateMinimum(BigUnitValue newArrivalRateMinimum, NotificationChain msgs)\n {\n BigUnitValue oldArrivalRateMinimum = arrivalRateMinimum;\n arrivalRateMinimum = newArrivalRateMinimum;\n {\n ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, StateSpecificationPackage.INPUT__ARRIVAL_RATE_MINIMUM, oldArrivalRateMinimum, newArrivalRateMinimum);\n if (msgs == null) msgs = notification; else msgs.add(notification);\n }\n return msgs;\n public void setArrivalRateMinimum(BigUnitValue newArrivalRateMinimum)\n if (newArrivalRateMinimum != arrivalRateMinimum)\n NotificationChain msgs = null;\n if (arrivalRateMinimum != null)\n msgs = ((InternalEObject)arrivalRateMinimum).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - StateSpecificationPackage.INPUT__ARRIVAL_RATE_MINIMUM, null, msgs);\n if (newArrivalRateMinimum != null)\n msgs = ((InternalEObject)newArrivalRateMinimum).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - StateSpecificationPackage.INPUT__ARRIVAL_RATE_MINIMUM, null, msgs);\n msgs = basicSetArrivalRateMinimum(newArrivalRateMinimum, msgs);\n if (msgs != null) msgs.dispatch();\n else if (eNotificationRequired())\n eNotify(new ENotificationImpl(this, Notification.SET, StateSpecificationPackage.INPUT__ARRIVAL_RATE_MINIMUM, newArrivalRateMinimum, newArrivalRateMinimum));\n public BigUnitValue getArrivalRateMaximum()\n return arrivalRateMaximum;\n public NotificationChain basicSetArrivalRateMaximum(BigUnitValue newArrivalRateMaximum, NotificationChain msgs)\n BigUnitValue oldArrivalRateMaximum = arrivalRateMaximum;\n arrivalRateMaximum = newArrivalRateMaximum;\n ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, StateSpecificationPackage.INPUT__ARRIVAL_RATE_MAXIMUM, oldArrivalRateMaximum, newArrivalRateMaximum);\n public void setArrivalRateMaximum(BigUnitValue newArrivalRateMaximum)\n if (newArrivalRateMaximum != arrivalRateMaximum)\n if (arrivalRateMaximum != null)\n msgs = ((InternalEObject)arrivalRateMaximum).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - StateSpecificationPackage.INPUT__ARRIVAL_RATE_MAXIMUM, null, msgs);\n if (newArrivalRateMaximum != null)\n msgs = ((InternalEObject)newArrivalRateMaximum).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - StateSpecificationPackage.INPUT__ARRIVAL_RATE_MAXIMUM, null, msgs);\n msgs = basicSetArrivalRateMaximum(newArrivalRateMaximum, msgs);\n eNotify(new ENotificationImpl(this, Notification.SET, StateSpecificationPackage.INPUT__ARRIVAL_RATE_MAXIMUM, newArrivalRateMaximum, newArrivalRateMaximum));\n public BigUnitValue getObsolescence()\n return obsolescence;\n public NotificationChain basicSetObsolescence(BigUnitValue newObsolescence, NotificationChain msgs)\n BigUnitValue oldObsolescence = obsolescence;\n obsolescence = newObsolescence;\n {\n ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, StateSpecificationPackage.INPUT__OBSOLESCENCE, oldObsolescence, newObsolescence);\n if (msgs == null) msgs = notification; else msgs.add(notification);\n }\n return msgs;\n }\n\n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n public void setObsolescence(BigUnitValue newObsolescence)\n {\n if (newObsolescence != obsolescence)\n {\n NotificationChain msgs = null;\n if (obsolescence != null)\n msgs = ((InternalEObject)obsolescence).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - StateSpecificationPackage.INPUT__OBSOLESCENCE, null, msgs);\n if (newObsolescence != null)\n msgs = ((InternalEObject)newObsolescence).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - StateSpecificationPackage.INPUT__OBSOLESCENCE, null, msgs);\n msgs = basicSetObsolescence(newObsolescence, msgs);\n if (msgs != null) msgs.dispatch();\n }\n else if (eNotificationRequired())\n eNotify(new ENotificationImpl(this, Notification.SET, StateSpecificationPackage.INPUT__OBSOLESCENCE, newObsolescence, newObsolescence));\n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n public String getAppearsIn()\n {\n return appearsIn;\n }\n\n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n public void setAppearsIn(String newAppearsIn)\n {\n String oldAppearsIn = appearsIn;\n appearsIn = newAppearsIn;\n if (eNotificationRequired())\n eNotify(new ENotificationImpl(this, Notification.SET, StateSpecificationPackage.INPUT__APPEARS_IN, oldAppearsIn, appearsIn));\n }\n\n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n public String getDescription()\n {\n return description;\n }\n\n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n public void setDescription(String newDescription)\n {\n String oldDescription = description;\n description = newDescription;\n if (eNotificationRequired())\n eNotify(new ENotificationImpl(this, Notification.SET, StateSpecificationPackage.INPUT__DESCRIPTION, oldDescription, description));\n }\n\n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n public TriggerTable getStructure()\n {\n return structure;\n }\n\n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n public NotificationChain basicSetStructure(TriggerTable newStructure, NotificationChain msgs)\n {\n TriggerTable oldStructure = structure;\n structure = newStructure;\n if (eNotificationRequired())\n {\n ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, StateSpecificationPackage.INPUT__STRUCTURE, oldStructure, newStructure);\n if (msgs == null) msgs = notification; else msgs.add(notification);\n }\n return msgs;\n }\n\n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n public void setStructure(TriggerTable newStructure)\n {\n if (newStructure != structure)\n {\n NotificationChain msgs = null;\n if (structure != null)\n msgs = ((InternalEObject)structure).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - StateSpecificationPackage.INPUT__STRUCTURE, null, msgs);\n if (newStructure != null)\n msgs = ((InternalEObject)newStructure).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - StateSpecificationPackage.INPUT__STRUCTURE, null, msgs);\n msgs = basicSetStructure(newStructure, msgs);\n if (msgs != null) msgs.dispatch();\n }\n else if (eNotificationRequired())\n eNotify(new ENotificationImpl(this, Notification.SET, StateSpecificationPackage.INPUT__STRUCTURE, newStructure, newStructure));\n }\n\n case StateSpecificationPackage.INPUT__RANGE:\n return basicSetRange(null, msgs);\n case StateSpecificationPackage.INPUT__VALUE_LIST:\n return basicSetValueList(null, msgs);\n case StateSpecificationPackage.INPUT__GRANULARITY:\n return basicSetGranularity(null, msgs);\n case StateSpecificationPackage.INPUT__ARRIVAL_RATE_AVG:\n return basicSetArrivalRateAvg(null, msgs);\n case StateSpecificationPackage.INPUT__ARRIVAL_RATE_MINIMUM:\n return basicSetArrivalRateMinimum(null, msgs);\n case StateSpecificationPackage.INPUT__ARRIVAL_RATE_MAXIMUM:\n return basicSetArrivalRateMaximum(null, msgs);\n case StateSpecificationPackage.INPUT__OBSOLESCENCE:\n return basicSetObsolescence(null, msgs);\n case StateSpecificationPackage.INPUT__STRUCTURE:\n return basicSetStructure(null, msgs);\n case StateSpecificationPackage.INPUT__RANGE:\n return getRange();\n case StateSpecificationPackage.INPUT__VALUE_LIST:\n return getValueList();\n case StateSpecificationPackage.INPUT__VALUE_HANDLING:\n return getValueHandling();\n case StateSpecificationPackage.INPUT__GRANULARITY:\n return getGranularity();\n case StateSpecificationPackage.INPUT__ARRIVAL_RATE_AVG:\n return getArrivalRateAvg();\n case StateSpecificationPackage.INPUT__ARRIVAL_RATE_MINIMUM:\n return getArrivalRateMinimum();\n case StateSpecificationPackage.INPUT__ARRIVAL_RATE_MAXIMUM:\n return getArrivalRateMaximum();\n case StateSpecificationPackage.INPUT__OBSOLESCENCE:\n return getObsolescence();\n case StateSpecificationPackage.INPUT__APPEARS_IN:\n return getAppearsIn();\n case StateSpecificationPackage.INPUT__DESCRIPTION:\n return getDescription();\n case StateSpecificationPackage.INPUT__STRUCTURE:\n return getStructure();\n case StateSpecificationPackage.INPUT__RANGE:\n setRange((ValueRange)newValue);\n return;\n case StateSpecificationPackage.INPUT__VALUE_LIST:\n setValueList((ValueList)newValue);\n case StateSpecificationPackage.INPUT__VALUE_HANDLING:\n setValueHandling((String)newValue);\n case StateSpecificationPackage.INPUT__GRANULARITY:\n setGranularity((BigUnitValue)newValue);\n case StateSpecificationPackage.INPUT__ARRIVAL_RATE_AVG:\n setArrivalRateAvg((BigUnitValue)newValue);\n case StateSpecificationPackage.INPUT__ARRIVAL_RATE_MINIMUM:\n setArrivalRateMinimum((BigUnitValue)newValue);\n case StateSpecificationPackage.INPUT__ARRIVAL_RATE_MAXIMUM:\n setArrivalRateMaximum((BigUnitValue)newValue);\n case StateSpecificationPackage.INPUT__OBSOLESCENCE:\n setObsolescence((BigUnitValue)newValue);\n case StateSpecificationPackage.INPUT__APPEARS_IN:\n setAppearsIn((String)newValue);\n return;\n case StateSpecificationPackage.INPUT__DESCRIPTION:\n setDescription((String)newValue);\n return;\n case StateSpecificationPackage.INPUT__STRUCTURE:\n setStructure((TriggerTable)newValue);\n return;\n case StateSpecificationPackage.INPUT__RANGE:\n setRange((ValueRange)null);\n return;\n case StateSpecificationPackage.INPUT__VALUE_LIST:\n setValueList((ValueList)null);\n case StateSpecificationPackage.INPUT__VALUE_HANDLING:\n setValueHandling(VALUE_HANDLING_EDEFAULT);\n case StateSpecificationPackage.INPUT__GRANULARITY:\n setGranularity((BigUnitValue)null);\n case StateSpecificationPackage.INPUT__ARRIVAL_RATE_AVG:\n setArrivalRateAvg((BigUnitValue)null);\n case StateSpecificationPackage.INPUT__ARRIVAL_RATE_MINIMUM:\n setArrivalRateMinimum((BigUnitValue)null);\n case StateSpecificationPackage.INPUT__ARRIVAL_RATE_MAXIMUM:\n setArrivalRateMaximum((BigUnitValue)null);\n case StateSpecificationPackage.INPUT__OBSOLESCENCE:\n setObsolescence((BigUnitValue)null);\n case StateSpecificationPackage.INPUT__APPEARS_IN:\n setAppearsIn(APPEARS_IN_EDEFAULT);\n return;\n case StateSpecificationPackage.INPUT__DESCRIPTION:\n setDescription(DESCRIPTION_EDEFAULT);\n return;\n case StateSpecificationPackage.INPUT__STRUCTURE:\n setStructure((TriggerTable)null);\n return;\n case StateSpecificationPackage.INPUT__RANGE:\n return range != null;\n case StateSpecificationPackage.INPUT__VALUE_LIST:\n return valueList != null;\n case StateSpecificationPackage.INPUT__VALUE_HANDLING:\n return VALUE_HANDLING_EDEFAULT == null ? valueHandling != null : !VALUE_HANDLING_EDEFAULT.equals(valueHandling);\n case StateSpecificationPackage.INPUT__GRANULARITY:\n return granularity != null;\n case StateSpecificationPackage.INPUT__ARRIVAL_RATE_AVG:\n return arrivalRateAvg != null;\n case StateSpecificationPackage.INPUT__ARRIVAL_RATE_MINIMUM:\n return arrivalRateMinimum != null;\n case StateSpecificationPackage.INPUT__ARRIVAL_RATE_MAXIMUM:\n return arrivalRateMaximum != null;\n case StateSpecificationPackage.INPUT__OBSOLESCENCE:\n return obsolescence != null;\n case StateSpecificationPackage.INPUT__APPEARS_IN:\n return APPEARS_IN_EDEFAULT == null ? appearsIn != null : !APPEARS_IN_EDEFAULT.equals(appearsIn);\n case StateSpecificationPackage.INPUT__DESCRIPTION:\n return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);\n case StateSpecificationPackage.INPUT__STRUCTURE:\n return structure != null;\n result.append(\" (valueHandling: \");\n result.append(valueHandling);\n result.append(\", appearsIn: \");\n result.append(appearsIn);\n result.append(\", description: \");\n result.append(description);", "new_methods": [ { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/stateSpecification/impl/InputImpl.java", "implementation": "return range;", "signature": "ValueRange getRange()" }, { "arguments": [ "ValueRange newRange", " NotificationChain msgs" ], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/stateSpecification/impl/InputImpl.java", "implementation": "ValueRange oldRange = range;\n range = newRange;\n if (eNotificationRequired())\n {\n ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, StateSpecificationPackage.INPUT__RANGE, oldRange, newRange);\n if (msgs == null) msgs = notification; else msgs.add(notification);", "signature": "NotificationChain basicSetRange(ValueRange newRange, NotificationChain msgs)" }, { "arguments": [ "ValueRange newRange" ], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/stateSpecification/impl/InputImpl.java", "implementation": "if (newRange != range)\n {\n NotificationChain msgs = null;\n if (range != null)\n msgs = ((InternalEObject)range).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - StateSpecificationPackage.INPUT__RANGE, null, msgs);\n if (newRange != null)\n msgs = ((InternalEObject)newRange).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - StateSpecificationPackage.INPUT__RANGE, null, msgs);\n msgs = basicSetRange(newRange, msgs);\n if (msgs != null) msgs.dispatch();", "signature": "void setRange(ValueRange newRange)" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/stateSpecification/impl/InputImpl.java", "implementation": "return valueList;", "signature": "ValueList getValueList()" }, { "arguments": [ "ValueList newValueList", " NotificationChain msgs" ], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/stateSpecification/impl/InputImpl.java", "implementation": "ValueList oldValueList = valueList;\n valueList = newValueList;\n if (eNotificationRequired())\n {\n ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, StateSpecificationPackage.INPUT__VALUE_LIST, oldValueList, newValueList);\n if (msgs == null) msgs = notification; else msgs.add(notification);", "signature": "NotificationChain basicSetValueList(ValueList newValueList, NotificationChain msgs)" }, { "arguments": [ "ValueList newValueList" ], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/stateSpecification/impl/InputImpl.java", "implementation": "if (newValueList != valueList)\n {\n NotificationChain msgs = null;\n if (valueList != null)\n msgs = ((InternalEObject)valueList).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - StateSpecificationPackage.INPUT__VALUE_LIST, null, msgs);\n if (newValueList != null)\n msgs = ((InternalEObject)newValueList).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - StateSpecificationPackage.INPUT__VALUE_LIST, null, msgs);\n msgs = basicSetValueList(newValueList, msgs);\n if (msgs != null) msgs.dispatch();", "signature": "void setValueList(ValueList newValueList)" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/stateSpecification/impl/InputImpl.java", "implementation": "return arrivalRateAvg;\n public NotificationChain basicSetArrivalRateAvg(BigUnitValue newArrivalRateAvg, NotificationChain msgs)\n BigUnitValue oldArrivalRateAvg = arrivalRateAvg;\n arrivalRateAvg = newArrivalRateAvg;\n {\n ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, StateSpecificationPackage.INPUT__ARRIVAL_RATE_AVG, oldArrivalRateAvg, newArrivalRateAvg);\n if (msgs == null) msgs = notification; else msgs.add(notification);", "signature": "BigUnitValue getArrivalRateAvg()" }, { "arguments": [ "BigUnitValue newArrivalRateMinimum", " NotificationChain msgs" ], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/stateSpecification/impl/InputImpl.java", "implementation": "BigUnitValue oldArrivalRateMinimum = arrivalRateMinimum;\n arrivalRateMinimum = newArrivalRateMinimum;\n {\n ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, StateSpecificationPackage.INPUT__ARRIVAL_RATE_MINIMUM, oldArrivalRateMinimum, newArrivalRateMinimum);\n if (msgs == null) msgs = notification; else msgs.add(notification);", "signature": "NotificationChain basicSetArrivalRateMinimum(BigUnitValue newArrivalRateMinimum, NotificationChain msgs)" }, { "arguments": [ "BigUnitValue newObsolescence" ], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/stateSpecification/impl/InputImpl.java", "implementation": "if (newObsolescence != obsolescence)\n {\n NotificationChain msgs = null;\n if (obsolescence != null)\n msgs = ((InternalEObject)obsolescence).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - StateSpecificationPackage.INPUT__OBSOLESCENCE, null, msgs);\n if (newObsolescence != null)\n msgs = ((InternalEObject)newObsolescence).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - StateSpecificationPackage.INPUT__OBSOLESCENCE, null, msgs);\n msgs = basicSetObsolescence(newObsolescence, msgs);\n if (msgs != null) msgs.dispatch();", "signature": "void setObsolescence(BigUnitValue newObsolescence)" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/stateSpecification/impl/InputImpl.java", "implementation": "return appearsIn;", "signature": "String getAppearsIn()" }, { "arguments": [ "String newAppearsIn" ], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/stateSpecification/impl/InputImpl.java", "implementation": "String oldAppearsIn = appearsIn;\n appearsIn = newAppearsIn;\n if (eNotificationRequired())\n eNotify(new ENotificationImpl(this, Notification.SET, StateSpecificationPackage.INPUT__APPEARS_IN, oldAppearsIn, appearsIn));", "signature": "void setAppearsIn(String newAppearsIn)" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/stateSpecification/impl/InputImpl.java", "implementation": "return description;", "signature": "String getDescription()" }, { "arguments": [ "String newDescription" ], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/stateSpecification/impl/InputImpl.java", "implementation": "String oldDescription = description;\n description = newDescription;\n if (eNotificationRequired())\n eNotify(new ENotificationImpl(this, Notification.SET, StateSpecificationPackage.INPUT__DESCRIPTION, oldDescription, description));", "signature": "void setDescription(String newDescription)" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/stateSpecification/impl/InputImpl.java", "implementation": "return structure;", "signature": "TriggerTable getStructure()" }, { "arguments": [ "TriggerTable newStructure", " NotificationChain msgs" ], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/stateSpecification/impl/InputImpl.java", "implementation": "TriggerTable oldStructure = structure;\n structure = newStructure;\n if (eNotificationRequired())\n {\n ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, StateSpecificationPackage.INPUT__STRUCTURE, oldStructure, newStructure);\n if (msgs == null) msgs = notification; else msgs.add(notification);", "signature": "NotificationChain basicSetStructure(TriggerTable newStructure, NotificationChain msgs)" }, { "arguments": [ "TriggerTable newStructure" ], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/stateSpecification/impl/InputImpl.java", "implementation": "if (newStructure != structure)\n {\n NotificationChain msgs = null;\n if (structure != null)\n msgs = ((InternalEObject)structure).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - StateSpecificationPackage.INPUT__STRUCTURE, null, msgs);\n if (newStructure != null)\n msgs = ((InternalEObject)newStructure).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - StateSpecificationPackage.INPUT__STRUCTURE, null, msgs);\n msgs = basicSetStructure(newStructure, msgs);\n if (msgs != null) msgs.dispatch();", "signature": "void setStructure(TriggerTable newStructure)" } ], "old_code": "import java.math.BigDecimal;\n\nimport java.util.Collection;\n\nimport org.eclipse.emf.common.util.EList;\n\nimport org.eclipse.emf.ecore.util.EDataTypeEList;\n\n * <li>{@link net.certware.intent.state.stateSpecification.impl.InputImpl#getLower <em>Lower</em>}</li>\n * <li>{@link net.certware.intent.state.stateSpecification.impl.InputImpl#getUpper <em>Upper</em>}</li>\n * <li>{@link net.certware.intent.state.stateSpecification.impl.InputImpl#getRangeType <em>Range Type</em>}</li>\n * <li>{@link net.certware.intent.state.stateSpecification.impl.InputImpl#getRangeUnits <em>Range Units</em>}</li>\n * <li>{@link net.certware.intent.state.stateSpecification.impl.InputImpl#getValues <em>Values</em>}</li>\n * <li>{@link net.certware.intent.state.stateSpecification.impl.InputImpl#getRate <em>Rate</em>}</li>\n * <li>{@link net.certware.intent.state.stateSpecification.impl.InputImpl#getVariables <em>Variables</em>}</li>\n * The default value of the '{@link #getLower() <em>Lower</em>}' attribute.\n * @see #getLower()\n protected static final BigDecimal LOWER_EDEFAULT = null;\n * The cached value of the '{@link #getLower() <em>Lower</em>}' attribute.\n * @see #getLower()\n protected BigDecimal lower = LOWER_EDEFAULT;\n * The default value of the '{@link #getUpper() <em>Upper</em>}' attribute.\n * @see #getUpper()\n protected static final BigDecimal UPPER_EDEFAULT = null;\n * The cached value of the '{@link #getUpper() <em>Upper</em>}' attribute.\n * @see #getUpper()\n protected BigDecimal upper = UPPER_EDEFAULT;\n * The default value of the '{@link #getRangeType() <em>Range Type</em>}' attribute.\n * @see #getRangeType()\n protected static final String RANGE_TYPE_EDEFAULT = null;\n * The cached value of the '{@link #getRangeType() <em>Range Type</em>}' attribute.\n * @see #getRangeType()\n protected String rangeType = RANGE_TYPE_EDEFAULT;\n * The default value of the '{@link #getRangeUnits() <em>Range Units</em>}' attribute.\n * @see #getRangeUnits()\n protected static final String RANGE_UNITS_EDEFAULT = null;\n * The cached value of the '{@link #getRangeUnits() <em>Range Units</em>}' attribute.\n * @see #getRangeUnits()\n protected String rangeUnits = RANGE_UNITS_EDEFAULT;\n * The cached value of the '{@link #getValues() <em>Values</em>}' attribute list.\n * @see #getValues()\n protected EList<String> values;\n * The cached value of the '{@link #getRate() <em>Rate</em>}' containment reference.\n * @see #getRate()\n protected BigUnitValue rate;\n * The default value of the '{@link #getVariables() <em>Variables</em>}' attribute.\n * @see #getVariables()\n protected static final String VARIABLES_EDEFAULT = null;\n * The cached value of the '{@link #getVariables() <em>Variables</em>}' attribute.\n * @see #getVariables()\n protected String variables = VARIABLES_EDEFAULT;\n * The default value of the '{@link #getReferences() <em>References</em>}' attribute.\n * @see #getReferences()\n protected static final String REFERENCES_EDEFAULT = null;\n * The cached value of the '{@link #getReferences() <em>References</em>}' attribute.\n * @see #getReferences()\n protected String references = REFERENCES_EDEFAULT;\n public BigDecimal getLower()\n return lower;\n public void setLower(BigDecimal newLower)\n BigDecimal oldLower = lower;\n lower = newLower;\n eNotify(new ENotificationImpl(this, Notification.SET, StateSpecificationPackage.INPUT__LOWER, oldLower, lower));\n public BigDecimal getUpper()\n return upper;\n public void setUpper(BigDecimal newUpper)\n BigDecimal oldUpper = upper;\n upper = newUpper;\n eNotify(new ENotificationImpl(this, Notification.SET, StateSpecificationPackage.INPUT__UPPER, oldUpper, upper));\n public String getRangeType()\n return rangeType;\n public void setRangeType(String newRangeType)\n String oldRangeType = rangeType;\n rangeType = newRangeType;\n eNotify(new ENotificationImpl(this, Notification.SET, StateSpecificationPackage.INPUT__RANGE_TYPE, oldRangeType, rangeType));\n public String getRangeUnits()\n return rangeUnits;\n public void setRangeUnits(String newRangeUnits)\n String oldRangeUnits = rangeUnits;\n rangeUnits = newRangeUnits;\n eNotify(new ENotificationImpl(this, Notification.SET, StateSpecificationPackage.INPUT__RANGE_UNITS, oldRangeUnits, rangeUnits));\n public EList<String> getValues()\n if (values == null)\n values = new EDataTypeEList<String>(String.class, this, StateSpecificationPackage.INPUT__VALUES);\n return values;\n public BigUnitValue getRate()\n return rate;\n public NotificationChain basicSetRate(BigUnitValue newRate, NotificationChain msgs)\n BigUnitValue oldRate = rate;\n rate = newRate;\n ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, StateSpecificationPackage.INPUT__RATE, oldRate, newRate);\n public void setRate(BigUnitValue newRate)\n if (newRate != rate)\n if (rate != null)\n msgs = ((InternalEObject)rate).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - StateSpecificationPackage.INPUT__RATE, null, msgs);\n if (newRate != null)\n msgs = ((InternalEObject)newRate).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - StateSpecificationPackage.INPUT__RATE, null, msgs);\n msgs = basicSetRate(newRate, msgs);\n eNotify(new ENotificationImpl(this, Notification.SET, StateSpecificationPackage.INPUT__RATE, newRate, newRate));\n public String getVariables()\n return variables;\n public void setVariables(String newVariables)\n String oldVariables = variables;\n variables = newVariables;\n eNotify(new ENotificationImpl(this, Notification.SET, StateSpecificationPackage.INPUT__VARIABLES, oldVariables, variables));\n case StateSpecificationPackage.INPUT__RATE:\n return basicSetRate(null, msgs);\n case StateSpecificationPackage.INPUT__LOWER:\n return getLower();\n case StateSpecificationPackage.INPUT__UPPER:\n return getUpper();\n case StateSpecificationPackage.INPUT__RANGE_TYPE:\n return getRangeType();\n case StateSpecificationPackage.INPUT__RANGE_UNITS:\n return getRangeUnits();\n case StateSpecificationPackage.INPUT__VALUES:\n return getValues();\n case StateSpecificationPackage.INPUT__RATE:\n return getRate();\n case StateSpecificationPackage.INPUT__VARIABLES:\n return getVariables();\n @SuppressWarnings(\"unchecked\")\n case StateSpecificationPackage.INPUT__LOWER:\n setLower((BigDecimal)newValue);\n case StateSpecificationPackage.INPUT__UPPER:\n setUpper((BigDecimal)newValue);\n case StateSpecificationPackage.INPUT__RANGE_TYPE:\n setRangeType((String)newValue);\n case StateSpecificationPackage.INPUT__RANGE_UNITS:\n setRangeUnits((String)newValue);\n case StateSpecificationPackage.INPUT__VALUES:\n getValues().clear();\n getValues().addAll((Collection<? extends String>)newValue);\n case StateSpecificationPackage.INPUT__RATE:\n setRate((BigUnitValue)newValue);\n case StateSpecificationPackage.INPUT__VARIABLES:\n setVariables((String)newValue);\n case StateSpecificationPackage.INPUT__LOWER:\n setLower(LOWER_EDEFAULT);\n case StateSpecificationPackage.INPUT__UPPER:\n setUpper(UPPER_EDEFAULT);\n case StateSpecificationPackage.INPUT__RANGE_TYPE:\n setRangeType(RANGE_TYPE_EDEFAULT);\n case StateSpecificationPackage.INPUT__RANGE_UNITS:\n setRangeUnits(RANGE_UNITS_EDEFAULT);\n case StateSpecificationPackage.INPUT__VALUES:\n getValues().clear();\n case StateSpecificationPackage.INPUT__RATE:\n setRate((BigUnitValue)null);\n case StateSpecificationPackage.INPUT__VARIABLES:\n setVariables(VARIABLES_EDEFAULT);\n case StateSpecificationPackage.INPUT__LOWER:\n return LOWER_EDEFAULT == null ? lower != null : !LOWER_EDEFAULT.equals(lower);\n case StateSpecificationPackage.INPUT__UPPER:\n return UPPER_EDEFAULT == null ? upper != null : !UPPER_EDEFAULT.equals(upper);\n case StateSpecificationPackage.INPUT__RANGE_TYPE:\n return RANGE_TYPE_EDEFAULT == null ? rangeType != null : !RANGE_TYPE_EDEFAULT.equals(rangeType);\n case StateSpecificationPackage.INPUT__RANGE_UNITS:\n return RANGE_UNITS_EDEFAULT == null ? rangeUnits != null : !RANGE_UNITS_EDEFAULT.equals(rangeUnits);\n case StateSpecificationPackage.INPUT__VALUES:\n return values != null && !values.isEmpty();\n case StateSpecificationPackage.INPUT__RATE:\n return rate != null;\n case StateSpecificationPackage.INPUT__VARIABLES:\n return VARIABLES_EDEFAULT == null ? variables != null : !VARIABLES_EDEFAULT.equals(variables);\n result.append(\" (lower: \");\n result.append(lower);\n result.append(\", upper: \");\n result.append(upper);\n result.append(\", rangeType: \");\n result.append(rangeType);\n result.append(\", rangeUnits: \");\n result.append(rangeUnits);\n result.append(\", values: \");\n result.append(values);\n result.append(\", variables: \");\n result.append(variables);", "old_methods": [], "patch": "@@ -2,43 +2,42 @@\n */\n package net.certware.intent.state.stateSpecification.impl;\n \n-import java.math.BigDecimal;\n-\n-import java.util.Collection;\n-\n import net.certware.intent.state.stateSpecification.BigUnitValue;\n import net.certware.intent.state.stateSpecification.Input;\n import net.certware.intent.state.stateSpecification.StateSpecificationPackage;\n+import net.certware.intent.state.stateSpecification.TriggerTable;\n+import net.certware.intent.state.stateSpecification.ValueList;\n+import net.certware.intent.state.stateSpecification.ValueRange;\n \n import org.eclipse.emf.common.notify.Notification;\n import org.eclipse.emf.common.notify.NotificationChain;\n \n-import org.eclipse.emf.common.util.EList;\n-\n import org.eclipse.emf.ecore.EClass;\n import org.eclipse.emf.ecore.InternalEObject;\n \n import org.eclipse.emf.ecore.impl.ENotificationImpl;\n import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;\n \n-import org.eclipse.emf.ecore.util.EDataTypeEList;\n-\n /**\n * <!-- begin-user-doc -->\n * An implementation of the model object '<em><b>Input</b></em>'.\n * <!-- end-user-doc -->\n * <p>\n * The following features are implemented:\n * <ul>\n- * <li>{@link net.certware.intent.state.stateSpecification.impl.InputImpl#getLower <em>Lower</em>}</li>\n- * <li>{@link net.certware.intent.state.stateSpecification.impl.InputImpl#getUpper <em>Upper</em>}</li>\n- * <li>{@link net.certware.intent.state.stateSpecification.impl.InputImpl#getRangeType <em>Range Type</em>}</li>\n- * <li>{@link net.certware.intent.state.stateSpecification.impl.InputImpl#getRangeUnits <em>Range Units</em>}</li>\n- * <li>{@link net.certware.intent.state.stateSpecification.impl.InputImpl#getValues <em>Values</em>}</li>\n- * <li>{@link net.certware.intent.state.stateSpecification.impl.InputImpl#getRate <em>Rate</em>}</li>\n- * <li>{@link net.certware.intent.state.stateSpecification.impl.InputImpl#getVariables <em>Variables</em>}</li>\n+ * <li>{@link net.certware.intent.state.stateSpecification.impl.InputImpl#getRange <em>Range</em>}</li>\n+ * <li>{@link net.certware.intent.state.stateSpecification.impl.InputImpl#getValueList <em>Value List</em>}</li>\n+ * <li>{@link net.certware.intent.state.stateSpecification.impl.InputImpl#getValueHandling <em>Value Handling</em>}</li>\n+ * <li>{@link net.certware.intent.state.stateSpecification.impl.InputImpl#getGranularity <em>Granularity</em>}</li>\n+ * <li>{@link net.certware.intent.state.stateSpecification.impl.InputImpl#getArrivalRateAvg <em>Arrival Rate Avg</em>}</li>\n+ * <li>{@link net.certware.intent.state.stateSpecification.impl.InputImpl#getArrivalRateMinimum <em>Arrival Rate Minimum</em>}</li>\n+ * <li>{@link net.certware.intent.state.stateSpecification.impl.InputImpl#getArrivalRateMaximum <em>Arrival Rate Maximum</em>}</li>\n+ * <li>{@link net.certware.intent.state.stateSpecification.impl.InputImpl#getObsolescence <em>Obsolescence</em>}</li>\n * <li>{@link net.certware.intent.state.stateSpecification.impl.InputImpl#getReferences <em>References</em>}</li>\n+ * <li>{@link net.certware.intent.state.stateSpecification.impl.InputImpl#getAppearsIn <em>Appears In</em>}</li>\n+ * <li>{@link net.certware.intent.state.stateSpecification.impl.InputImpl#getDescription <em>Description</em>}</li>\n * <li>{@link net.certware.intent.state.stateSpecification.impl.InputImpl#getComments <em>Comments</em>}</li>\n+ * <li>{@link net.certware.intent.state.stateSpecification.impl.InputImpl#getStructure <em>Structure</em>}</li>\n * </ul>\n * </p>\n *\n@@ -47,144 +46,154 @@\n public class InputImpl extends MinimalEObjectImpl.Container implements Input\n {\n /**\n- * The default value of the '{@link #getLower() <em>Lower</em>}' attribute.\n+ * The cached value of the '{@link #getRange() <em>Range</em>}' containment reference.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n- * @see #getLower()\n+ * @see #getRange()\n * @generated\n * @ordered\n */\n- protected static final BigDecimal LOWER_EDEFAULT = null;\n+ protected ValueRange range;\n \n /**\n- * The cached value of the '{@link #getLower() <em>Lower</em>}' attribute.\n+ * The cached value of the '{@link #getValueList() <em>Value List</em>}' containment reference.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n- * @see #getLower()\n+ * @see #getValueList()\n * @generated\n * @ordered\n */\n- protected BigDecimal lower = LOWER_EDEFAULT;\n+ protected ValueList valueList;\n \n /**\n- * The default value of the '{@link #getUpper() <em>Upper</em>}' attribute.\n+ * The default value of the '{@link #getValueHandling() <em>Value Handling</em>}' attribute.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n- * @see #getUpper()\n+ * @see #getValueHandling()\n * @generated\n * @ordered\n */\n- protected static final BigDecimal UPPER_EDEFAULT = null;\n+ protected static final String VALUE_HANDLING_EDEFAULT = null;\n \n /**\n- * The cached value of the '{@link #getUpper() <em>Upper</em>}' attribute.\n+ * The cached value of the '{@link #getValueHandling() <em>Value Handling</em>}' attribute.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n- * @see #getUpper()\n+ * @see #getValueHandling()\n * @generated\n * @ordered\n */\n- protected BigDecimal upper = UPPER_EDEFAULT;\n+ protected String valueHandling = VALUE_HANDLING_EDEFAULT;\n \n /**\n- * The default value of the '{@link #getRangeType() <em>Range Type</em>}' attribute.\n+ * The cached value of the '{@link #getGranularity() <em>Granularity</em>}' containment reference.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n- * @see #getRangeType()\n+ * @see #getGranularity()\n * @generated\n * @ordered\n */\n- protected static final String RANGE_TYPE_EDEFAULT = null;\n+ protected BigUnitValue granularity;\n \n /**\n- * The cached value of the '{@link #getRangeType() <em>Range Type</em>}' attribute.\n+ * The cached value of the '{@link #getArrivalRateAvg() <em>Arrival Rate Avg</em>}' containment reference.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n- * @see #getRangeType()\n+ * @see #getArrivalRateAvg()\n * @generated\n * @ordered\n */\n- protected String rangeType = RANGE_TYPE_EDEFAULT;\n+ protected BigUnitValue arrivalRateAvg;\n \n /**\n- * The default value of the '{@link #getRangeUnits() <em>Range Units</em>}' attribute.\n+ * The cached value of the '{@link #getArrivalRateMinimum() <em>Arrival Rate Minimum</em>}' containment reference.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n- * @see #getRangeUnits()\n+ * @see #getArrivalRateMinimum()\n * @generated\n * @ordered\n */\n- protected static final String RANGE_UNITS_EDEFAULT = null;\n+ protected BigUnitValue arrivalRateMinimum;\n \n /**\n- * The cached value of the '{@link #getRangeUnits() <em>Range Units</em>}' attribute.\n+ * The cached value of the '{@link #getArrivalRateMaximum() <em>Arrival Rate Maximum</em>}' containment reference.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n- * @see #getRangeUnits()\n+ * @see #getArrivalRateMaximum()\n * @generated\n * @ordered\n */\n- protected String rangeUnits = RANGE_UNITS_EDEFAULT;\n+ protected BigUnitValue arrivalRateMaximum;\n \n /**\n- * The cached value of the '{@link #getValues() <em>Values</em>}' attribute list.\n+ * The cached value of the '{@link #getObsolescence() <em>Obsolescence</em>}' containment reference.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n- * @see #getValues()\n+ * @see #getObsolescence()\n * @generated\n * @ordered\n */\n- protected EList<String> values;\n+ protected BigUnitValue obsolescence;\n \n /**\n- * The cached value of the '{@link #getRate() <em>Rate</em>}' containment reference.\n+ * The default value of the '{@link #getReferences() <em>References</em>}' attribute.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n- * @see #getRate()\n+ * @see #getReferences()\n * @generated\n * @ordered\n */\n- protected BigUnitValue rate;\n+ protected static final String REFERENCES_EDEFAULT = null;\n \n /**\n- * The default value of the '{@link #getVariables() <em>Variables</em>}' attribute.\n+ * The cached value of the '{@link #getReferences() <em>References</em>}' attribute.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n- * @see #getVariables()\n+ * @see #getReferences()\n * @generated\n * @ordered\n */\n- protected static final String VARIABLES_EDEFAULT = null;\n+ protected String references = REFERENCES_EDEFAULT;\n \n /**\n- * The cached value of the '{@link #getVariables() <em>Variables</em>}' attribute.\n+ * The default value of the '{@link #getAppearsIn() <em>Appears In</em>}' attribute.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n- * @see #getVariables()\n+ * @see #getAppearsIn()\n * @generated\n * @ordered\n */\n- protected String variables = VARIABLES_EDEFAULT;\n+ protected static final String APPEARS_IN_EDEFAULT = null;\n \n /**\n- * The default value of the '{@link #getReferences() <em>References</em>}' attribute.\n+ * The cached value of the '{@link #getAppearsIn() <em>Appears In</em>}' attribute.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n- * @see #getReferences()\n+ * @see #getAppearsIn()\n * @generated\n * @ordered\n */\n- protected static final String REFERENCES_EDEFAULT = null;\n+ protected String appearsIn = APPEARS_IN_EDEFAULT;\n \n /**\n- * The cached value of the '{@link #getReferences() <em>References</em>}' attribute.\n+ * The default value of the '{@link #getDescription() <em>Description</em>}' attribute.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n- * @see #getReferences()\n+ * @see #getDescription()\n * @generated\n * @ordered\n */\n- protected String references = REFERENCES_EDEFAULT;\n+ protected static final String DESCRIPTION_EDEFAULT = null;\n+\n+ /**\n+ * The cached value of the '{@link #getDescription() <em>Description</em>}' attribute.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @see #getDescription()\n+ * @generated\n+ * @ordered\n+ */\n+ protected String description = DESCRIPTION_EDEFAULT;\n \n /**\n * The default value of the '{@link #getComments() <em>Comments</em>}' attribute.\n@@ -206,6 +215,16 @@ public class InputImpl extends MinimalEObjectImpl.Container implements Input\n */\n protected String comments = COMMENTS_EDEFAULT;\n \n+ /**\n+ * The cached value of the '{@link #getStructure() <em>Structure</em>}' containment reference.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @see #getStructure()\n+ * @generated\n+ * @ordered\n+ */\n+ protected TriggerTable structure;\n+\n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n@@ -232,129 +251,286 @@ protected EClass eStaticClass()\n * <!-- end-user-doc -->\n * @generated\n */\n- public BigDecimal getLower()\n+ public ValueRange getRange()\n+ {\n+ return range;\n+ }\n+\n+ /**\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ */\n+ public NotificationChain basicSetRange(ValueRange newRange, NotificationChain msgs)\n+ {\n+ ValueRange oldRange = range;\n+ range = newRange;\n+ if (eNotificationRequired())\n+ {\n+ ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, StateSpecificationPackage.INPUT__RANGE, oldRange, newRange);\n+ if (msgs == null) msgs = notification; else msgs.add(notification);\n+ }\n+ return msgs;\n+ }\n+\n+ /**\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ */\n+ public void setRange(ValueRange newRange)\n+ {\n+ if (newRange != range)\n+ {\n+ NotificationChain msgs = null;\n+ if (range != null)\n+ msgs = ((InternalEObject)range).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - StateSpecificationPackage.INPUT__RANGE, null, msgs);\n+ if (newRange != null)\n+ msgs = ((InternalEObject)newRange).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - StateSpecificationPackage.INPUT__RANGE, null, msgs);\n+ msgs = basicSetRange(newRange, msgs);\n+ if (msgs != null) msgs.dispatch();\n+ }\n+ else if (eNotificationRequired())\n+ eNotify(new ENotificationImpl(this, Notification.SET, StateSpecificationPackage.INPUT__RANGE, newRange, newRange));\n+ }\n+\n+ /**\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ */\n+ public ValueList getValueList()\n+ {\n+ return valueList;\n+ }\n+\n+ /**\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ */\n+ public NotificationChain basicSetValueList(ValueList newValueList, NotificationChain msgs)\n+ {\n+ ValueList oldValueList = valueList;\n+ valueList = newValueList;\n+ if (eNotificationRequired())\n+ {\n+ ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, StateSpecificationPackage.INPUT__VALUE_LIST, oldValueList, newValueList);\n+ if (msgs == null) msgs = notification; else msgs.add(notification);\n+ }\n+ return msgs;\n+ }\n+\n+ /**\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ */\n+ public void setValueList(ValueList newValueList)\n+ {\n+ if (newValueList != valueList)\n+ {\n+ NotificationChain msgs = null;\n+ if (valueList != null)\n+ msgs = ((InternalEObject)valueList).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - StateSpecificationPackage.INPUT__VALUE_LIST, null, msgs);\n+ if (newValueList != null)\n+ msgs = ((InternalEObject)newValueList).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - StateSpecificationPackage.INPUT__VALUE_LIST, null, msgs);\n+ msgs = basicSetValueList(newValueList, msgs);\n+ if (msgs != null) msgs.dispatch();\n+ }\n+ else if (eNotificationRequired())\n+ eNotify(new ENotificationImpl(this, Notification.SET, StateSpecificationPackage.INPUT__VALUE_LIST, newValueList, newValueList));\n+ }\n+\n+ /**\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ */\n+ public String getValueHandling()\n {\n- return lower;\n+ return valueHandling;\n }\n \n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n- public void setLower(BigDecimal newLower)\n+ public void setValueHandling(String newValueHandling)\n {\n- BigDecimal oldLower = lower;\n- lower = newLower;\n+ String oldValueHandling = valueHandling;\n+ valueHandling = newValueHandling;\n if (eNotificationRequired())\n- eNotify(new ENotificationImpl(this, Notification.SET, StateSpecificationPackage.INPUT__LOWER, oldLower, lower));\n+ eNotify(new ENotificationImpl(this, Notification.SET, StateSpecificationPackage.INPUT__VALUE_HANDLING, oldValueHandling, valueHandling));\n }\n \n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n- public BigDecimal getUpper()\n+ public BigUnitValue getGranularity()\n {\n- return upper;\n+ return granularity;\n }\n \n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n- public void setUpper(BigDecimal newUpper)\n+ public NotificationChain basicSetGranularity(BigUnitValue newGranularity, NotificationChain msgs)\n {\n- BigDecimal oldUpper = upper;\n- upper = newUpper;\n+ BigUnitValue oldGranularity = granularity;\n+ granularity = newGranularity;\n if (eNotificationRequired())\n- eNotify(new ENotificationImpl(this, Notification.SET, StateSpecificationPackage.INPUT__UPPER, oldUpper, upper));\n+ {\n+ ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, StateSpecificationPackage.INPUT__GRANULARITY, oldGranularity, newGranularity);\n+ if (msgs == null) msgs = notification; else msgs.add(notification);\n+ }\n+ return msgs;\n }\n \n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n- public String getRangeType()\n+ public void setGranularity(BigUnitValue newGranularity)\n {\n- return rangeType;\n+ if (newGranularity != granularity)\n+ {\n+ NotificationChain msgs = null;\n+ if (granularity != null)\n+ msgs = ((InternalEObject)granularity).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - StateSpecificationPackage.INPUT__GRANULARITY, null, msgs);\n+ if (newGranularity != null)\n+ msgs = ((InternalEObject)newGranularity).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - StateSpecificationPackage.INPUT__GRANULARITY, null, msgs);\n+ msgs = basicSetGranularity(newGranularity, msgs);\n+ if (msgs != null) msgs.dispatch();\n+ }\n+ else if (eNotificationRequired())\n+ eNotify(new ENotificationImpl(this, Notification.SET, StateSpecificationPackage.INPUT__GRANULARITY, newGranularity, newGranularity));\n+ }\n+\n+ /**\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ */\n+ public BigUnitValue getArrivalRateAvg()\n+ {\n+ return arrivalRateAvg;\n }\n \n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n- public void setRangeType(String newRangeType)\n+ public NotificationChain basicSetArrivalRateAvg(BigUnitValue newArrivalRateAvg, NotificationChain msgs)\n {\n- String oldRangeType = rangeType;\n- rangeType = newRangeType;\n+ BigUnitValue oldArrivalRateAvg = arrivalRateAvg;\n+ arrivalRateAvg = newArrivalRateAvg;\n if (eNotificationRequired())\n- eNotify(new ENotificationImpl(this, Notification.SET, StateSpecificationPackage.INPUT__RANGE_TYPE, oldRangeType, rangeType));\n+ {\n+ ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, StateSpecificationPackage.INPUT__ARRIVAL_RATE_AVG, oldArrivalRateAvg, newArrivalRateAvg);\n+ if (msgs == null) msgs = notification; else msgs.add(notification);\n+ }\n+ return msgs;\n }\n \n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n- public String getRangeUnits()\n+ public void setArrivalRateAvg(BigUnitValue newArrivalRateAvg)\n {\n- return rangeUnits;\n+ if (newArrivalRateAvg != arrivalRateAvg)\n+ {\n+ NotificationChain msgs = null;\n+ if (arrivalRateAvg != null)\n+ msgs = ((InternalEObject)arrivalRateAvg).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - StateSpecificationPackage.INPUT__ARRIVAL_RATE_AVG, null, msgs);\n+ if (newArrivalRateAvg != null)\n+ msgs = ((InternalEObject)newArrivalRateAvg).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - StateSpecificationPackage.INPUT__ARRIVAL_RATE_AVG, null, msgs);\n+ msgs = basicSetArrivalRateAvg(newArrivalRateAvg, msgs);\n+ if (msgs != null) msgs.dispatch();\n+ }\n+ else if (eNotificationRequired())\n+ eNotify(new ENotificationImpl(this, Notification.SET, StateSpecificationPackage.INPUT__ARRIVAL_RATE_AVG, newArrivalRateAvg, newArrivalRateAvg));\n }\n \n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n- public void setRangeUnits(String newRangeUnits)\n+ public BigUnitValue getArrivalRateMinimum()\n {\n- String oldRangeUnits = rangeUnits;\n- rangeUnits = newRangeUnits;\n+ return arrivalRateMinimum;\n+ }\n+\n+ /**\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ */\n+ public NotificationChain basicSetArrivalRateMinimum(BigUnitValue newArrivalRateMinimum, NotificationChain msgs)\n+ {\n+ BigUnitValue oldArrivalRateMinimum = arrivalRateMinimum;\n+ arrivalRateMinimum = newArrivalRateMinimum;\n if (eNotificationRequired())\n- eNotify(new ENotificationImpl(this, Notification.SET, StateSpecificationPackage.INPUT__RANGE_UNITS, oldRangeUnits, rangeUnits));\n+ {\n+ ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, StateSpecificationPackage.INPUT__ARRIVAL_RATE_MINIMUM, oldArrivalRateMinimum, newArrivalRateMinimum);\n+ if (msgs == null) msgs = notification; else msgs.add(notification);\n+ }\n+ return msgs;\n }\n \n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n- public EList<String> getValues()\n+ public void setArrivalRateMinimum(BigUnitValue newArrivalRateMinimum)\n {\n- if (values == null)\n+ if (newArrivalRateMinimum != arrivalRateMinimum)\n {\n- values = new EDataTypeEList<String>(String.class, this, StateSpecificationPackage.INPUT__VALUES);\n+ NotificationChain msgs = null;\n+ if (arrivalRateMinimum != null)\n+ msgs = ((InternalEObject)arrivalRateMinimum).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - StateSpecificationPackage.INPUT__ARRIVAL_RATE_MINIMUM, null, msgs);\n+ if (newArrivalRateMinimum != null)\n+ msgs = ((InternalEObject)newArrivalRateMinimum).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - StateSpecificationPackage.INPUT__ARRIVAL_RATE_MINIMUM, null, msgs);\n+ msgs = basicSetArrivalRateMinimum(newArrivalRateMinimum, msgs);\n+ if (msgs != null) msgs.dispatch();\n }\n- return values;\n+ else if (eNotificationRequired())\n+ eNotify(new ENotificationImpl(this, Notification.SET, StateSpecificationPackage.INPUT__ARRIVAL_RATE_MINIMUM, newArrivalRateMinimum, newArrivalRateMinimum));\n }\n \n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n- public BigUnitValue getRate()\n+ public BigUnitValue getArrivalRateMaximum()\n {\n- return rate;\n+ return arrivalRateMaximum;\n }\n \n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n- public NotificationChain basicSetRate(BigUnitValue newRate, NotificationChain msgs)\n+ public NotificationChain basicSetArrivalRateMaximum(BigUnitValue newArrivalRateMaximum, NotificationChain msgs)\n {\n- BigUnitValue oldRate = rate;\n- rate = newRate;\n+ BigUnitValue oldArrivalRateMaximum = arrivalRateMaximum;\n+ arrivalRateMaximum = newArrivalRateMaximum;\n if (eNotificationRequired())\n {\n- ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, StateSpecificationPackage.INPUT__RATE, oldRate, newRate);\n+ ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, StateSpecificationPackage.INPUT__ARRIVAL_RATE_MAXIMUM, oldArrivalRateMaximum, newArrivalRateMaximum);\n if (msgs == null) msgs = notification; else msgs.add(notification);\n }\n return msgs;\n@@ -365,43 +541,68 @@ public NotificationChain basicSetRate(BigUnitValue newRate, NotificationChain ms\n * <!-- end-user-doc -->\n * @generated\n */\n- public void setRate(BigUnitValue newRate)\n+ public void setArrivalRateMaximum(BigUnitValue newArrivalRateMaximum)\n {\n- if (newRate != rate)\n+ if (newArrivalRateMaximum != arrivalRateMaximum)\n {\n NotificationChain msgs = null;\n- if (rate != null)\n- msgs = ((InternalEObject)rate).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - StateSpecificationPackage.INPUT__RATE, null, msgs);\n- if (newRate != null)\n- msgs = ((InternalEObject)newRate).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - StateSpecificationPackage.INPUT__RATE, null, msgs);\n- msgs = basicSetRate(newRate, msgs);\n+ if (arrivalRateMaximum != null)\n+ msgs = ((InternalEObject)arrivalRateMaximum).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - StateSpecificationPackage.INPUT__ARRIVAL_RATE_MAXIMUM, null, msgs);\n+ if (newArrivalRateMaximum != null)\n+ msgs = ((InternalEObject)newArrivalRateMaximum).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - StateSpecificationPackage.INPUT__ARRIVAL_RATE_MAXIMUM, null, msgs);\n+ msgs = basicSetArrivalRateMaximum(newArrivalRateMaximum, msgs);\n if (msgs != null) msgs.dispatch();\n }\n else if (eNotificationRequired())\n- eNotify(new ENotificationImpl(this, Notification.SET, StateSpecificationPackage.INPUT__RATE, newRate, newRate));\n+ eNotify(new ENotificationImpl(this, Notification.SET, StateSpecificationPackage.INPUT__ARRIVAL_RATE_MAXIMUM, newArrivalRateMaximum, newArrivalRateMaximum));\n }\n \n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n- public String getVariables()\n+ public BigUnitValue getObsolescence()\n {\n- return variables;\n+ return obsolescence;\n }\n \n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n- public void setVariables(String newVariables)\n+ public NotificationChain basicSetObsolescence(BigUnitValue newObsolescence, NotificationChain msgs)\n {\n- String oldVariables = variables;\n- variables = newVariables;\n+ BigUnitValue oldObsolescence = obsolescence;\n+ obsolescence = newObsolescence;\n if (eNotificationRequired())\n- eNotify(new ENotificationImpl(this, Notification.SET, StateSpecificationPackage.INPUT__VARIABLES, oldVariables, variables));\n+ {\n+ ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, StateSpecificationPackage.INPUT__OBSOLESCENCE, oldObsolescence, newObsolescence);\n+ if (msgs == null) msgs = notification; else msgs.add(notification);\n+ }\n+ return msgs;\n+ }\n+\n+ /**\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ */\n+ public void setObsolescence(BigUnitValue newObsolescence)\n+ {\n+ if (newObsolescence != obsolescence)\n+ {\n+ NotificationChain msgs = null;\n+ if (obsolescence != null)\n+ msgs = ((InternalEObject)obsolescence).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - StateSpecificationPackage.INPUT__OBSOLESCENCE, null, msgs);\n+ if (newObsolescence != null)\n+ msgs = ((InternalEObject)newObsolescence).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - StateSpecificationPackage.INPUT__OBSOLESCENCE, null, msgs);\n+ msgs = basicSetObsolescence(newObsolescence, msgs);\n+ if (msgs != null) msgs.dispatch();\n+ }\n+ else if (eNotificationRequired())\n+ eNotify(new ENotificationImpl(this, Notification.SET, StateSpecificationPackage.INPUT__OBSOLESCENCE, newObsolescence, newObsolescence));\n }\n \n /**\n@@ -427,6 +628,52 @@ public void setReferences(String newReferences)\n eNotify(new ENotificationImpl(this, Notification.SET, StateSpecificationPackage.INPUT__REFERENCES, oldReferences, references));\n }\n \n+ /**\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ */\n+ public String getAppearsIn()\n+ {\n+ return appearsIn;\n+ }\n+\n+ /**\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ */\n+ public void setAppearsIn(String newAppearsIn)\n+ {\n+ String oldAppearsIn = appearsIn;\n+ appearsIn = newAppearsIn;\n+ if (eNotificationRequired())\n+ eNotify(new ENotificationImpl(this, Notification.SET, StateSpecificationPackage.INPUT__APPEARS_IN, oldAppearsIn, appearsIn));\n+ }\n+\n+ /**\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ */\n+ public String getDescription()\n+ {\n+ return description;\n+ }\n+\n+ /**\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ */\n+ public void setDescription(String newDescription)\n+ {\n+ String oldDescription = description;\n+ description = newDescription;\n+ if (eNotificationRequired())\n+ eNotify(new ENotificationImpl(this, Notification.SET, StateSpecificationPackage.INPUT__DESCRIPTION, oldDescription, description));\n+ }\n+\n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n@@ -450,6 +697,54 @@ public void setComments(String newComments)\n eNotify(new ENotificationImpl(this, Notification.SET, StateSpecificationPackage.INPUT__COMMENTS, oldComments, comments));\n }\n \n+ /**\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ */\n+ public TriggerTable getStructure()\n+ {\n+ return structure;\n+ }\n+\n+ /**\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ */\n+ public NotificationChain basicSetStructure(TriggerTable newStructure, NotificationChain msgs)\n+ {\n+ TriggerTable oldStructure = structure;\n+ structure = newStructure;\n+ if (eNotificationRequired())\n+ {\n+ ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, StateSpecificationPackage.INPUT__STRUCTURE, oldStructure, newStructure);\n+ if (msgs == null) msgs = notification; else msgs.add(notification);\n+ }\n+ return msgs;\n+ }\n+\n+ /**\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ */\n+ public void setStructure(TriggerTable newStructure)\n+ {\n+ if (newStructure != structure)\n+ {\n+ NotificationChain msgs = null;\n+ if (structure != null)\n+ msgs = ((InternalEObject)structure).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - StateSpecificationPackage.INPUT__STRUCTURE, null, msgs);\n+ if (newStructure != null)\n+ msgs = ((InternalEObject)newStructure).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - StateSpecificationPackage.INPUT__STRUCTURE, null, msgs);\n+ msgs = basicSetStructure(newStructure, msgs);\n+ if (msgs != null) msgs.dispatch();\n+ }\n+ else if (eNotificationRequired())\n+ eNotify(new ENotificationImpl(this, Notification.SET, StateSpecificationPackage.INPUT__STRUCTURE, newStructure, newStructure));\n+ }\n+\n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n@@ -460,8 +755,22 @@ public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID,\n {\n switch (featureID)\n {\n- case StateSpecificationPackage.INPUT__RATE:\n- return basicSetRate(null, msgs);\n+ case StateSpecificationPackage.INPUT__RANGE:\n+ return basicSetRange(null, msgs);\n+ case StateSpecificationPackage.INPUT__VALUE_LIST:\n+ return basicSetValueList(null, msgs);\n+ case StateSpecificationPackage.INPUT__GRANULARITY:\n+ return basicSetGranularity(null, msgs);\n+ case StateSpecificationPackage.INPUT__ARRIVAL_RATE_AVG:\n+ return basicSetArrivalRateAvg(null, msgs);\n+ case StateSpecificationPackage.INPUT__ARRIVAL_RATE_MINIMUM:\n+ return basicSetArrivalRateMinimum(null, msgs);\n+ case StateSpecificationPackage.INPUT__ARRIVAL_RATE_MAXIMUM:\n+ return basicSetArrivalRateMaximum(null, msgs);\n+ case StateSpecificationPackage.INPUT__OBSOLESCENCE:\n+ return basicSetObsolescence(null, msgs);\n+ case StateSpecificationPackage.INPUT__STRUCTURE:\n+ return basicSetStructure(null, msgs);\n }\n return super.eInverseRemove(otherEnd, featureID, msgs);\n }\n@@ -476,24 +785,32 @@ public Object eGet(int featureID, boolean resolve, boolean coreType)\n {\n switch (featureID)\n {\n- case StateSpecificationPackage.INPUT__LOWER:\n- return getLower();\n- case StateSpecificationPackage.INPUT__UPPER:\n- return getUpper();\n- case StateSpecificationPackage.INPUT__RANGE_TYPE:\n- return getRangeType();\n- case StateSpecificationPackage.INPUT__RANGE_UNITS:\n- return getRangeUnits();\n- case StateSpecificationPackage.INPUT__VALUES:\n- return getValues();\n- case StateSpecificationPackage.INPUT__RATE:\n- return getRate();\n- case StateSpecificationPackage.INPUT__VARIABLES:\n- return getVariables();\n+ case StateSpecificationPackage.INPUT__RANGE:\n+ return getRange();\n+ case StateSpecificationPackage.INPUT__VALUE_LIST:\n+ return getValueList();\n+ case StateSpecificationPackage.INPUT__VALUE_HANDLING:\n+ return getValueHandling();\n+ case StateSpecificationPackage.INPUT__GRANULARITY:\n+ return getGranularity();\n+ case StateSpecificationPackage.INPUT__ARRIVAL_RATE_AVG:\n+ return getArrivalRateAvg();\n+ case StateSpecificationPackage.INPUT__ARRIVAL_RATE_MINIMUM:\n+ return getArrivalRateMinimum();\n+ case StateSpecificationPackage.INPUT__ARRIVAL_RATE_MAXIMUM:\n+ return getArrivalRateMaximum();\n+ case StateSpecificationPackage.INPUT__OBSOLESCENCE:\n+ return getObsolescence();\n case StateSpecificationPackage.INPUT__REFERENCES:\n return getReferences();\n+ case StateSpecificationPackage.INPUT__APPEARS_IN:\n+ return getAppearsIn();\n+ case StateSpecificationPackage.INPUT__DESCRIPTION:\n+ return getDescription();\n case StateSpecificationPackage.INPUT__COMMENTS:\n return getComments();\n+ case StateSpecificationPackage.INPUT__STRUCTURE:\n+ return getStructure();\n }\n return super.eGet(featureID, resolve, coreType);\n }\n@@ -503,40 +820,50 @@ public Object eGet(int featureID, boolean resolve, boolean coreType)\n * <!-- end-user-doc -->\n * @generated\n */\n- @SuppressWarnings(\"unchecked\")\n @Override\n public void eSet(int featureID, Object newValue)\n {\n switch (featureID)\n {\n- case StateSpecificationPackage.INPUT__LOWER:\n- setLower((BigDecimal)newValue);\n+ case StateSpecificationPackage.INPUT__RANGE:\n+ setRange((ValueRange)newValue);\n+ return;\n+ case StateSpecificationPackage.INPUT__VALUE_LIST:\n+ setValueList((ValueList)newValue);\n return;\n- case StateSpecificationPackage.INPUT__UPPER:\n- setUpper((BigDecimal)newValue);\n+ case StateSpecificationPackage.INPUT__VALUE_HANDLING:\n+ setValueHandling((String)newValue);\n return;\n- case StateSpecificationPackage.INPUT__RANGE_TYPE:\n- setRangeType((String)newValue);\n+ case StateSpecificationPackage.INPUT__GRANULARITY:\n+ setGranularity((BigUnitValue)newValue);\n return;\n- case StateSpecificationPackage.INPUT__RANGE_UNITS:\n- setRangeUnits((String)newValue);\n+ case StateSpecificationPackage.INPUT__ARRIVAL_RATE_AVG:\n+ setArrivalRateAvg((BigUnitValue)newValue);\n return;\n- case StateSpecificationPackage.INPUT__VALUES:\n- getValues().clear();\n- getValues().addAll((Collection<? extends String>)newValue);\n+ case StateSpecificationPackage.INPUT__ARRIVAL_RATE_MINIMUM:\n+ setArrivalRateMinimum((BigUnitValue)newValue);\n return;\n- case StateSpecificationPackage.INPUT__RATE:\n- setRate((BigUnitValue)newValue);\n+ case StateSpecificationPackage.INPUT__ARRIVAL_RATE_MAXIMUM:\n+ setArrivalRateMaximum((BigUnitValue)newValue);\n return;\n- case StateSpecificationPackage.INPUT__VARIABLES:\n- setVariables((String)newValue);\n+ case StateSpecificationPackage.INPUT__OBSOLESCENCE:\n+ setObsolescence((BigUnitValue)newValue);\n return;\n case StateSpecificationPackage.INPUT__REFERENCES:\n setReferences((String)newValue);\n return;\n+ case StateSpecificationPackage.INPUT__APPEARS_IN:\n+ setAppearsIn((String)newValue);\n+ return;\n+ case StateSpecificationPackage.INPUT__DESCRIPTION:\n+ setDescription((String)newValue);\n+ return;\n case StateSpecificationPackage.INPUT__COMMENTS:\n setComments((String)newValue);\n return;\n+ case StateSpecificationPackage.INPUT__STRUCTURE:\n+ setStructure((TriggerTable)newValue);\n+ return;\n }\n super.eSet(featureID, newValue);\n }\n@@ -551,33 +878,45 @@ public void eUnset(int featureID)\n {\n switch (featureID)\n {\n- case StateSpecificationPackage.INPUT__LOWER:\n- setLower(LOWER_EDEFAULT);\n+ case StateSpecificationPackage.INPUT__RANGE:\n+ setRange((ValueRange)null);\n+ return;\n+ case StateSpecificationPackage.INPUT__VALUE_LIST:\n+ setValueList((ValueList)null);\n return;\n- case StateSpecificationPackage.INPUT__UPPER:\n- setUpper(UPPER_EDEFAULT);\n+ case StateSpecificationPackage.INPUT__VALUE_HANDLING:\n+ setValueHandling(VALUE_HANDLING_EDEFAULT);\n return;\n- case StateSpecificationPackage.INPUT__RANGE_TYPE:\n- setRangeType(RANGE_TYPE_EDEFAULT);\n+ case StateSpecificationPackage.INPUT__GRANULARITY:\n+ setGranularity((BigUnitValue)null);\n return;\n- case StateSpecificationPackage.INPUT__RANGE_UNITS:\n- setRangeUnits(RANGE_UNITS_EDEFAULT);\n+ case StateSpecificationPackage.INPUT__ARRIVAL_RATE_AVG:\n+ setArrivalRateAvg((BigUnitValue)null);\n return;\n- case StateSpecificationPackage.INPUT__VALUES:\n- getValues().clear();\n+ case StateSpecificationPackage.INPUT__ARRIVAL_RATE_MINIMUM:\n+ setArrivalRateMinimum((BigUnitValue)null);\n return;\n- case StateSpecificationPackage.INPUT__RATE:\n- setRate((BigUnitValue)null);\n+ case StateSpecificationPackage.INPUT__ARRIVAL_RATE_MAXIMUM:\n+ setArrivalRateMaximum((BigUnitValue)null);\n return;\n- case StateSpecificationPackage.INPUT__VARIABLES:\n- setVariables(VARIABLES_EDEFAULT);\n+ case StateSpecificationPackage.INPUT__OBSOLESCENCE:\n+ setObsolescence((BigUnitValue)null);\n return;\n case StateSpecificationPackage.INPUT__REFERENCES:\n setReferences(REFERENCES_EDEFAULT);\n return;\n+ case StateSpecificationPackage.INPUT__APPEARS_IN:\n+ setAppearsIn(APPEARS_IN_EDEFAULT);\n+ return;\n+ case StateSpecificationPackage.INPUT__DESCRIPTION:\n+ setDescription(DESCRIPTION_EDEFAULT);\n+ return;\n case StateSpecificationPackage.INPUT__COMMENTS:\n setComments(COMMENTS_EDEFAULT);\n return;\n+ case StateSpecificationPackage.INPUT__STRUCTURE:\n+ setStructure((TriggerTable)null);\n+ return;\n }\n super.eUnset(featureID);\n }\n@@ -592,24 +931,32 @@ public boolean eIsSet(int featureID)\n {\n switch (featureID)\n {\n- case StateSpecificationPackage.INPUT__LOWER:\n- return LOWER_EDEFAULT == null ? lower != null : !LOWER_EDEFAULT.equals(lower);\n- case StateSpecificationPackage.INPUT__UPPER:\n- return UPPER_EDEFAULT == null ? upper != null : !UPPER_EDEFAULT.equals(upper);\n- case StateSpecificationPackage.INPUT__RANGE_TYPE:\n- return RANGE_TYPE_EDEFAULT == null ? rangeType != null : !RANGE_TYPE_EDEFAULT.equals(rangeType);\n- case StateSpecificationPackage.INPUT__RANGE_UNITS:\n- return RANGE_UNITS_EDEFAULT == null ? rangeUnits != null : !RANGE_UNITS_EDEFAULT.equals(rangeUnits);\n- case StateSpecificationPackage.INPUT__VALUES:\n- return values != null && !values.isEmpty();\n- case StateSpecificationPackage.INPUT__RATE:\n- return rate != null;\n- case StateSpecificationPackage.INPUT__VARIABLES:\n- return VARIABLES_EDEFAULT == null ? variables != null : !VARIABLES_EDEFAULT.equals(variables);\n+ case StateSpecificationPackage.INPUT__RANGE:\n+ return range != null;\n+ case StateSpecificationPackage.INPUT__VALUE_LIST:\n+ return valueList != null;\n+ case StateSpecificationPackage.INPUT__VALUE_HANDLING:\n+ return VALUE_HANDLING_EDEFAULT == null ? valueHandling != null : !VALUE_HANDLING_EDEFAULT.equals(valueHandling);\n+ case StateSpecificationPackage.INPUT__GRANULARITY:\n+ return granularity != null;\n+ case StateSpecificationPackage.INPUT__ARRIVAL_RATE_AVG:\n+ return arrivalRateAvg != null;\n+ case StateSpecificationPackage.INPUT__ARRIVAL_RATE_MINIMUM:\n+ return arrivalRateMinimum != null;\n+ case StateSpecificationPackage.INPUT__ARRIVAL_RATE_MAXIMUM:\n+ return arrivalRateMaximum != null;\n+ case StateSpecificationPackage.INPUT__OBSOLESCENCE:\n+ return obsolescence != null;\n case StateSpecificationPackage.INPUT__REFERENCES:\n return REFERENCES_EDEFAULT == null ? references != null : !REFERENCES_EDEFAULT.equals(references);\n+ case StateSpecificationPackage.INPUT__APPEARS_IN:\n+ return APPEARS_IN_EDEFAULT == null ? appearsIn != null : !APPEARS_IN_EDEFAULT.equals(appearsIn);\n+ case StateSpecificationPackage.INPUT__DESCRIPTION:\n+ return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);\n case StateSpecificationPackage.INPUT__COMMENTS:\n return COMMENTS_EDEFAULT == null ? comments != null : !COMMENTS_EDEFAULT.equals(comments);\n+ case StateSpecificationPackage.INPUT__STRUCTURE:\n+ return structure != null;\n }\n return super.eIsSet(featureID);\n }\n@@ -625,20 +972,14 @@ public String toString()\n if (eIsProxy()) return super.toString();\n \n StringBuffer result = new StringBuffer(super.toString());\n- result.append(\" (lower: \");\n- result.append(lower);\n- result.append(\", upper: \");\n- result.append(upper);\n- result.append(\", rangeType: \");\n- result.append(rangeType);\n- result.append(\", rangeUnits: \");\n- result.append(rangeUnits);\n- result.append(\", values: \");\n- result.append(values);\n- result.append(\", variables: \");\n- result.append(variables);\n+ result.append(\" (valueHandling: \");\n+ result.append(valueHandling);\n result.append(\", references: \");\n result.append(references);\n+ result.append(\", appearsIn: \");\n+ result.append(appearsIn);\n+ result.append(\", description: \");\n+ result.append(description);\n result.append(\", comments: \");\n result.append(comments);\n result.append(')');", "raw_url": "https://github.com/nasa/CertWare/raw/110fa3222ae2931978d7921dc8e6af8c7f43abd3/net.certware.intent.state%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fstate%2FstateSpecification%2Fimpl%2FInputImpl.java", "sha": "9e2786b790946f34ee0d471076fdde9e2b10adc4", "status": "modified" }, { "additions": 75, "blob_url": "https://github.com/nasa/CertWare/blob/110fa3222ae2931978d7921dc8e6af8c7f43abd3/net.certware.intent.state%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fstate%2FstateSpecification%2Fimpl%2FOutputImpl.java", "changes": 277, "contents_url": "https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent.state%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fstate%2FstateSpecification%2Fimpl%2FOutputImpl.java?ref=110fa3222ae2931978d7921dc8e6af8c7f43abd3", "deletions": 202, "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/stateSpecification/impl/OutputImpl.java", "new_code": "import net.certware.intent.state.stateSpecification.ValueList;\nimport net.certware.intent.state.stateSpecification.ValueRange;\n * <li>{@link net.certware.intent.state.stateSpecification.impl.OutputImpl#getRange <em>Range</em>}</li>\n * <li>{@link net.certware.intent.state.stateSpecification.impl.OutputImpl#getValueList <em>Value List</em>}</li>\n * The cached value of the '{@link #getRange() <em>Range</em>}' containment reference.\n * @see #getRange()\n protected ValueRange range;\n * The cached value of the '{@link #getValueList() <em>Value List</em>}' containment reference.\n * @see #getValueList()\n protected ValueList valueList;\n public ValueRange getRange()\n return range;\n public NotificationChain basicSetRange(ValueRange newRange, NotificationChain msgs)\n ValueRange oldRange = range;\n range = newRange;\n {\n ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, StateSpecificationPackage.OUTPUT__RANGE, oldRange, newRange);\n if (msgs == null) msgs = notification; else msgs.add(notification);\n }\n return msgs;\n public void setRange(ValueRange newRange)\n if (newRange != range)\n {\n NotificationChain msgs = null;\n if (range != null)\n msgs = ((InternalEObject)range).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - StateSpecificationPackage.OUTPUT__RANGE, null, msgs);\n if (newRange != null)\n msgs = ((InternalEObject)newRange).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - StateSpecificationPackage.OUTPUT__RANGE, null, msgs);\n msgs = basicSetRange(newRange, msgs);\n if (msgs != null) msgs.dispatch();\n }\n else if (eNotificationRequired())\n eNotify(new ENotificationImpl(this, Notification.SET, StateSpecificationPackage.OUTPUT__RANGE, newRange, newRange));\n public ValueList getValueList()\n return valueList;\n public NotificationChain basicSetValueList(ValueList newValueList, NotificationChain msgs)\n ValueList oldValueList = valueList;\n valueList = newValueList;\n {\n ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, StateSpecificationPackage.OUTPUT__VALUE_LIST, oldValueList, newValueList);\n if (msgs == null) msgs = notification; else msgs.add(notification);\n }\n return msgs;\n public void setValueList(ValueList newValueList)\n if (newValueList != valueList)\n NotificationChain msgs = null;\n if (valueList != null)\n msgs = ((InternalEObject)valueList).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - StateSpecificationPackage.OUTPUT__VALUE_LIST, null, msgs);\n if (newValueList != null)\n msgs = ((InternalEObject)newValueList).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - StateSpecificationPackage.OUTPUT__VALUE_LIST, null, msgs);\n msgs = basicSetValueList(newValueList, msgs);\n if (msgs != null) msgs.dispatch();\n else if (eNotificationRequired())\n eNotify(new ENotificationImpl(this, Notification.SET, StateSpecificationPackage.OUTPUT__VALUE_LIST, newValueList, newValueList));\n case StateSpecificationPackage.OUTPUT__RANGE:\n return basicSetRange(null, msgs);\n case StateSpecificationPackage.OUTPUT__VALUE_LIST:\n return basicSetValueList(null, msgs);\n case StateSpecificationPackage.OUTPUT__RANGE:\n return getRange();\n case StateSpecificationPackage.OUTPUT__VALUE_LIST:\n return getValueList();\n case StateSpecificationPackage.OUTPUT__RANGE:\n setRange((ValueRange)newValue);\n case StateSpecificationPackage.OUTPUT__VALUE_LIST:\n setValueList((ValueList)newValue);\n case StateSpecificationPackage.OUTPUT__RANGE:\n setRange((ValueRange)null);\n case StateSpecificationPackage.OUTPUT__VALUE_LIST:\n setValueList((ValueList)null);\n case StateSpecificationPackage.OUTPUT__RANGE:\n return range != null;\n case StateSpecificationPackage.OUTPUT__VALUE_LIST:\n return valueList != null;\n result.append(\" (completionHandling: \");", "new_methods": [], "old_code": "import java.math.BigDecimal;\n\nimport java.util.Collection;\n\nimport org.eclipse.emf.common.util.EList;\n\nimport org.eclipse.emf.ecore.util.EDataTypeEList;\n\n * <li>{@link net.certware.intent.state.stateSpecification.impl.OutputImpl#getLower <em>Lower</em>}</li>\n * <li>{@link net.certware.intent.state.stateSpecification.impl.OutputImpl#getUpper <em>Upper</em>}</li>\n * <li>{@link net.certware.intent.state.stateSpecification.impl.OutputImpl#getRangeType <em>Range Type</em>}</li>\n * <li>{@link net.certware.intent.state.stateSpecification.impl.OutputImpl#getRangeUnits <em>Range Units</em>}</li>\n * <li>{@link net.certware.intent.state.stateSpecification.impl.OutputImpl#getValues <em>Values</em>}</li>\n * The default value of the '{@link #getLower() <em>Lower</em>}' attribute.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @see #getLower()\n * @generated\n * @ordered\n */\n protected static final BigDecimal LOWER_EDEFAULT = null;\n\n /**\n * The cached value of the '{@link #getLower() <em>Lower</em>}' attribute.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @see #getLower()\n * @generated\n * @ordered\n */\n protected BigDecimal lower = LOWER_EDEFAULT;\n\n /**\n * The default value of the '{@link #getUpper() <em>Upper</em>}' attribute.\n * @see #getUpper()\n protected static final BigDecimal UPPER_EDEFAULT = null;\n * The cached value of the '{@link #getUpper() <em>Upper</em>}' attribute.\n * @see #getUpper()\n protected BigDecimal upper = UPPER_EDEFAULT;\n\n /**\n * The default value of the '{@link #getRangeType() <em>Range Type</em>}' attribute.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @see #getRangeType()\n * @generated\n * @ordered\n */\n protected static final String RANGE_TYPE_EDEFAULT = null;\n\n /**\n * The cached value of the '{@link #getRangeType() <em>Range Type</em>}' attribute.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @see #getRangeType()\n * @generated\n * @ordered\n */\n protected String rangeType = RANGE_TYPE_EDEFAULT;\n\n /**\n * The default value of the '{@link #getRangeUnits() <em>Range Units</em>}' attribute.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @see #getRangeUnits()\n * @generated\n * @ordered\n */\n protected static final String RANGE_UNITS_EDEFAULT = null;\n\n /**\n * The cached value of the '{@link #getRangeUnits() <em>Range Units</em>}' attribute.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @see #getRangeUnits()\n * @generated\n * @ordered\n */\n protected String rangeUnits = RANGE_UNITS_EDEFAULT;\n\n /**\n * The cached value of the '{@link #getValues() <em>Values</em>}' attribute list.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @see #getValues()\n * @generated\n * @ordered\n */\n protected EList<String> values;\n public BigDecimal getLower()\n return lower;\n public void setLower(BigDecimal newLower)\n BigDecimal oldLower = lower;\n lower = newLower;\n eNotify(new ENotificationImpl(this, Notification.SET, StateSpecificationPackage.OUTPUT__LOWER, oldLower, lower));\n }\n\n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n public BigDecimal getUpper()\n {\n return upper;\n }\n\n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n public void setUpper(BigDecimal newUpper)\n {\n BigDecimal oldUpper = upper;\n upper = newUpper;\n if (eNotificationRequired())\n eNotify(new ENotificationImpl(this, Notification.SET, StateSpecificationPackage.OUTPUT__UPPER, oldUpper, upper));\n }\n\n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n public String getRangeType()\n {\n return rangeType;\n public void setRangeType(String newRangeType)\n String oldRangeType = rangeType;\n rangeType = newRangeType;\n if (eNotificationRequired())\n eNotify(new ENotificationImpl(this, Notification.SET, StateSpecificationPackage.OUTPUT__RANGE_TYPE, oldRangeType, rangeType));\n public String getRangeUnits()\n return rangeUnits;\n public void setRangeUnits(String newRangeUnits)\n String oldRangeUnits = rangeUnits;\n rangeUnits = newRangeUnits;\n eNotify(new ENotificationImpl(this, Notification.SET, StateSpecificationPackage.OUTPUT__RANGE_UNITS, oldRangeUnits, rangeUnits));\n public EList<String> getValues()\n if (values == null)\n values = new EDataTypeEList<String>(String.class, this, StateSpecificationPackage.OUTPUT__VALUES);\n return values;\n case StateSpecificationPackage.OUTPUT__LOWER:\n return getLower();\n case StateSpecificationPackage.OUTPUT__UPPER:\n return getUpper();\n case StateSpecificationPackage.OUTPUT__RANGE_TYPE:\n return getRangeType();\n case StateSpecificationPackage.OUTPUT__RANGE_UNITS:\n return getRangeUnits();\n case StateSpecificationPackage.OUTPUT__VALUES:\n return getValues();\n @SuppressWarnings(\"unchecked\")\n case StateSpecificationPackage.OUTPUT__LOWER:\n setLower((BigDecimal)newValue);\n case StateSpecificationPackage.OUTPUT__UPPER:\n setUpper((BigDecimal)newValue);\n return;\n case StateSpecificationPackage.OUTPUT__RANGE_TYPE:\n setRangeType((String)newValue);\n return;\n case StateSpecificationPackage.OUTPUT__RANGE_UNITS:\n setRangeUnits((String)newValue);\n return;\n case StateSpecificationPackage.OUTPUT__VALUES:\n getValues().clear();\n getValues().addAll((Collection<? extends String>)newValue);\n case StateSpecificationPackage.OUTPUT__LOWER:\n setLower(LOWER_EDEFAULT);\n return;\n case StateSpecificationPackage.OUTPUT__UPPER:\n setUpper(UPPER_EDEFAULT);\n return;\n case StateSpecificationPackage.OUTPUT__RANGE_TYPE:\n setRangeType(RANGE_TYPE_EDEFAULT);\n return;\n case StateSpecificationPackage.OUTPUT__RANGE_UNITS:\n setRangeUnits(RANGE_UNITS_EDEFAULT);\n case StateSpecificationPackage.OUTPUT__VALUES:\n getValues().clear();\n case StateSpecificationPackage.OUTPUT__LOWER:\n return LOWER_EDEFAULT == null ? lower != null : !LOWER_EDEFAULT.equals(lower);\n case StateSpecificationPackage.OUTPUT__UPPER:\n return UPPER_EDEFAULT == null ? upper != null : !UPPER_EDEFAULT.equals(upper);\n case StateSpecificationPackage.OUTPUT__RANGE_TYPE:\n return RANGE_TYPE_EDEFAULT == null ? rangeType != null : !RANGE_TYPE_EDEFAULT.equals(rangeType);\n case StateSpecificationPackage.OUTPUT__RANGE_UNITS:\n return RANGE_UNITS_EDEFAULT == null ? rangeUnits != null : !RANGE_UNITS_EDEFAULT.equals(rangeUnits);\n case StateSpecificationPackage.OUTPUT__VALUES:\n return values != null && !values.isEmpty();\n result.append(\" (lower: \");\n result.append(lower);\n result.append(\", upper: \");\n result.append(upper);\n result.append(\", rangeType: \");\n result.append(rangeType);\n result.append(\", rangeUnits: \");\n result.append(rangeUnits);\n result.append(\", values: \");\n result.append(values);\n result.append(\", completionHandling: \");", "old_methods": [ { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/stateSpecification/impl/OutputImpl.java", "implementation": "return upper;", "signature": "BigDecimal getUpper()" }, { "arguments": [ "BigDecimal newUpper" ], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/stateSpecification/impl/OutputImpl.java", "implementation": "BigDecimal oldUpper = upper;\n upper = newUpper;\n if (eNotificationRequired())\n eNotify(new ENotificationImpl(this, Notification.SET, StateSpecificationPackage.OUTPUT__UPPER, oldUpper, upper));", "signature": "void setUpper(BigDecimal newUpper)" } ], "patch": "@@ -2,40 +2,31 @@\n */\n package net.certware.intent.state.stateSpecification.impl;\n \n-import java.math.BigDecimal;\n-\n-import java.util.Collection;\n-\n import net.certware.intent.state.stateSpecification.BigUnitValue;\n import net.certware.intent.state.stateSpecification.Output;\n import net.certware.intent.state.stateSpecification.StateSpecificationPackage;\n import net.certware.intent.state.stateSpecification.TriggerTable;\n+import net.certware.intent.state.stateSpecification.ValueList;\n+import net.certware.intent.state.stateSpecification.ValueRange;\n \n import org.eclipse.emf.common.notify.Notification;\n import org.eclipse.emf.common.notify.NotificationChain;\n \n-import org.eclipse.emf.common.util.EList;\n-\n import org.eclipse.emf.ecore.EClass;\n import org.eclipse.emf.ecore.InternalEObject;\n \n import org.eclipse.emf.ecore.impl.ENotificationImpl;\n import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;\n \n-import org.eclipse.emf.ecore.util.EDataTypeEList;\n-\n /**\n * <!-- begin-user-doc -->\n * An implementation of the model object '<em><b>Output</b></em>'.\n * <!-- end-user-doc -->\n * <p>\n * The following features are implemented:\n * <ul>\n- * <li>{@link net.certware.intent.state.stateSpecification.impl.OutputImpl#getLower <em>Lower</em>}</li>\n- * <li>{@link net.certware.intent.state.stateSpecification.impl.OutputImpl#getUpper <em>Upper</em>}</li>\n- * <li>{@link net.certware.intent.state.stateSpecification.impl.OutputImpl#getRangeType <em>Range Type</em>}</li>\n- * <li>{@link net.certware.intent.state.stateSpecification.impl.OutputImpl#getRangeUnits <em>Range Units</em>}</li>\n- * <li>{@link net.certware.intent.state.stateSpecification.impl.OutputImpl#getValues <em>Values</em>}</li>\n+ * <li>{@link net.certware.intent.state.stateSpecification.impl.OutputImpl#getRange <em>Range</em>}</li>\n+ * <li>{@link net.certware.intent.state.stateSpecification.impl.OutputImpl#getValueList <em>Value List</em>}</li>\n * <li>{@link net.certware.intent.state.stateSpecification.impl.OutputImpl#getRate <em>Rate</em>}</li>\n * <li>{@link net.certware.intent.state.stateSpecification.impl.OutputImpl#getDelay <em>Delay</em>}</li>\n * <li>{@link net.certware.intent.state.stateSpecification.impl.OutputImpl#getDeadline <em>Deadline</em>}</li>\n@@ -58,94 +49,24 @@\n public class OutputImpl extends MinimalEObjectImpl.Container implements Output\n {\n /**\n- * The default value of the '{@link #getLower() <em>Lower</em>}' attribute.\n- * <!-- begin-user-doc -->\n- * <!-- end-user-doc -->\n- * @see #getLower()\n- * @generated\n- * @ordered\n- */\n- protected static final BigDecimal LOWER_EDEFAULT = null;\n-\n- /**\n- * The cached value of the '{@link #getLower() <em>Lower</em>}' attribute.\n- * <!-- begin-user-doc -->\n- * <!-- end-user-doc -->\n- * @see #getLower()\n- * @generated\n- * @ordered\n- */\n- protected BigDecimal lower = LOWER_EDEFAULT;\n-\n- /**\n- * The default value of the '{@link #getUpper() <em>Upper</em>}' attribute.\n+ * The cached value of the '{@link #getRange() <em>Range</em>}' containment reference.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n- * @see #getUpper()\n+ * @see #getRange()\n * @generated\n * @ordered\n */\n- protected static final BigDecimal UPPER_EDEFAULT = null;\n+ protected ValueRange range;\n \n /**\n- * The cached value of the '{@link #getUpper() <em>Upper</em>}' attribute.\n+ * The cached value of the '{@link #getValueList() <em>Value List</em>}' containment reference.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n- * @see #getUpper()\n+ * @see #getValueList()\n * @generated\n * @ordered\n */\n- protected BigDecimal upper = UPPER_EDEFAULT;\n-\n- /**\n- * The default value of the '{@link #getRangeType() <em>Range Type</em>}' attribute.\n- * <!-- begin-user-doc -->\n- * <!-- end-user-doc -->\n- * @see #getRangeType()\n- * @generated\n- * @ordered\n- */\n- protected static final String RANGE_TYPE_EDEFAULT = null;\n-\n- /**\n- * The cached value of the '{@link #getRangeType() <em>Range Type</em>}' attribute.\n- * <!-- begin-user-doc -->\n- * <!-- end-user-doc -->\n- * @see #getRangeType()\n- * @generated\n- * @ordered\n- */\n- protected String rangeType = RANGE_TYPE_EDEFAULT;\n-\n- /**\n- * The default value of the '{@link #getRangeUnits() <em>Range Units</em>}' attribute.\n- * <!-- begin-user-doc -->\n- * <!-- end-user-doc -->\n- * @see #getRangeUnits()\n- * @generated\n- * @ordered\n- */\n- protected static final String RANGE_UNITS_EDEFAULT = null;\n-\n- /**\n- * The cached value of the '{@link #getRangeUnits() <em>Range Units</em>}' attribute.\n- * <!-- begin-user-doc -->\n- * <!-- end-user-doc -->\n- * @see #getRangeUnits()\n- * @generated\n- * @ordered\n- */\n- protected String rangeUnits = RANGE_UNITS_EDEFAULT;\n-\n- /**\n- * The cached value of the '{@link #getValues() <em>Values</em>}' attribute list.\n- * <!-- begin-user-doc -->\n- * <!-- end-user-doc -->\n- * @see #getValues()\n- * @generated\n- * @ordered\n- */\n- protected EList<String> values;\n+ protected ValueList valueList;\n \n /**\n * The cached value of the '{@link #getRate() <em>Rate</em>}' containment reference.\n@@ -393,105 +314,95 @@ protected EClass eStaticClass()\n * <!-- end-user-doc -->\n * @generated\n */\n- public BigDecimal getLower()\n+ public ValueRange getRange()\n {\n- return lower;\n+ return range;\n }\n \n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n- public void setLower(BigDecimal newLower)\n+ public NotificationChain basicSetRange(ValueRange newRange, NotificationChain msgs)\n {\n- BigDecimal oldLower = lower;\n- lower = newLower;\n+ ValueRange oldRange = range;\n+ range = newRange;\n if (eNotificationRequired())\n- eNotify(new ENotificationImpl(this, Notification.SET, StateSpecificationPackage.OUTPUT__LOWER, oldLower, lower));\n- }\n-\n- /**\n- * <!-- begin-user-doc -->\n- * <!-- end-user-doc -->\n- * @generated\n- */\n- public BigDecimal getUpper()\n- {\n- return upper;\n- }\n-\n- /**\n- * <!-- begin-user-doc -->\n- * <!-- end-user-doc -->\n- * @generated\n- */\n- public void setUpper(BigDecimal newUpper)\n- {\n- BigDecimal oldUpper = upper;\n- upper = newUpper;\n- if (eNotificationRequired())\n- eNotify(new ENotificationImpl(this, Notification.SET, StateSpecificationPackage.OUTPUT__UPPER, oldUpper, upper));\n- }\n-\n- /**\n- * <!-- begin-user-doc -->\n- * <!-- end-user-doc -->\n- * @generated\n- */\n- public String getRangeType()\n- {\n- return rangeType;\n+ {\n+ ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, StateSpecificationPackage.OUTPUT__RANGE, oldRange, newRange);\n+ if (msgs == null) msgs = notification; else msgs.add(notification);\n+ }\n+ return msgs;\n }\n \n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n- public void setRangeType(String newRangeType)\n+ public void setRange(ValueRange newRange)\n {\n- String oldRangeType = rangeType;\n- rangeType = newRangeType;\n- if (eNotificationRequired())\n- eNotify(new ENotificationImpl(this, Notification.SET, StateSpecificationPackage.OUTPUT__RANGE_TYPE, oldRangeType, rangeType));\n+ if (newRange != range)\n+ {\n+ NotificationChain msgs = null;\n+ if (range != null)\n+ msgs = ((InternalEObject)range).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - StateSpecificationPackage.OUTPUT__RANGE, null, msgs);\n+ if (newRange != null)\n+ msgs = ((InternalEObject)newRange).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - StateSpecificationPackage.OUTPUT__RANGE, null, msgs);\n+ msgs = basicSetRange(newRange, msgs);\n+ if (msgs != null) msgs.dispatch();\n+ }\n+ else if (eNotificationRequired())\n+ eNotify(new ENotificationImpl(this, Notification.SET, StateSpecificationPackage.OUTPUT__RANGE, newRange, newRange));\n }\n \n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n- public String getRangeUnits()\n+ public ValueList getValueList()\n {\n- return rangeUnits;\n+ return valueList;\n }\n \n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n- public void setRangeUnits(String newRangeUnits)\n+ public NotificationChain basicSetValueList(ValueList newValueList, NotificationChain msgs)\n {\n- String oldRangeUnits = rangeUnits;\n- rangeUnits = newRangeUnits;\n+ ValueList oldValueList = valueList;\n+ valueList = newValueList;\n if (eNotificationRequired())\n- eNotify(new ENotificationImpl(this, Notification.SET, StateSpecificationPackage.OUTPUT__RANGE_UNITS, oldRangeUnits, rangeUnits));\n+ {\n+ ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, StateSpecificationPackage.OUTPUT__VALUE_LIST, oldValueList, newValueList);\n+ if (msgs == null) msgs = notification; else msgs.add(notification);\n+ }\n+ return msgs;\n }\n \n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n- public EList<String> getValues()\n+ public void setValueList(ValueList newValueList)\n {\n- if (values == null)\n+ if (newValueList != valueList)\n {\n- values = new EDataTypeEList<String>(String.class, this, StateSpecificationPackage.OUTPUT__VALUES);\n+ NotificationChain msgs = null;\n+ if (valueList != null)\n+ msgs = ((InternalEObject)valueList).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - StateSpecificationPackage.OUTPUT__VALUE_LIST, null, msgs);\n+ if (newValueList != null)\n+ msgs = ((InternalEObject)newValueList).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - StateSpecificationPackage.OUTPUT__VALUE_LIST, null, msgs);\n+ msgs = basicSetValueList(newValueList, msgs);\n+ if (msgs != null) msgs.dispatch();\n }\n- return values;\n+ else if (eNotificationRequired())\n+ eNotify(new ENotificationImpl(this, Notification.SET, StateSpecificationPackage.OUTPUT__VALUE_LIST, newValueList, newValueList));\n }\n \n /**\n@@ -976,6 +887,10 @@ public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID,\n {\n switch (featureID)\n {\n+ case StateSpecificationPackage.OUTPUT__RANGE:\n+ return basicSetRange(null, msgs);\n+ case StateSpecificationPackage.OUTPUT__VALUE_LIST:\n+ return basicSetValueList(null, msgs);\n case StateSpecificationPackage.OUTPUT__RATE:\n return basicSetRate(null, msgs);\n case StateSpecificationPackage.OUTPUT__DELAY:\n@@ -1002,16 +917,10 @@ public Object eGet(int featureID, boolean resolve, boolean coreType)\n {\n switch (featureID)\n {\n- case StateSpecificationPackage.OUTPUT__LOWER:\n- return getLower();\n- case StateSpecificationPackage.OUTPUT__UPPER:\n- return getUpper();\n- case StateSpecificationPackage.OUTPUT__RANGE_TYPE:\n- return getRangeType();\n- case StateSpecificationPackage.OUTPUT__RANGE_UNITS:\n- return getRangeUnits();\n- case StateSpecificationPackage.OUTPUT__VALUES:\n- return getValues();\n+ case StateSpecificationPackage.OUTPUT__RANGE:\n+ return getRange();\n+ case StateSpecificationPackage.OUTPUT__VALUE_LIST:\n+ return getValueList();\n case StateSpecificationPackage.OUTPUT__RATE:\n return getRate();\n case StateSpecificationPackage.OUTPUT__DELAY:\n@@ -1049,27 +958,16 @@ public Object eGet(int featureID, boolean resolve, boolean coreType)\n * <!-- end-user-doc -->\n * @generated\n */\n- @SuppressWarnings(\"unchecked\")\n @Override\n public void eSet(int featureID, Object newValue)\n {\n switch (featureID)\n {\n- case StateSpecificationPackage.OUTPUT__LOWER:\n- setLower((BigDecimal)newValue);\n+ case StateSpecificationPackage.OUTPUT__RANGE:\n+ setRange((ValueRange)newValue);\n return;\n- case StateSpecificationPackage.OUTPUT__UPPER:\n- setUpper((BigDecimal)newValue);\n- return;\n- case StateSpecificationPackage.OUTPUT__RANGE_TYPE:\n- setRangeType((String)newValue);\n- return;\n- case StateSpecificationPackage.OUTPUT__RANGE_UNITS:\n- setRangeUnits((String)newValue);\n- return;\n- case StateSpecificationPackage.OUTPUT__VALUES:\n- getValues().clear();\n- getValues().addAll((Collection<? extends String>)newValue);\n+ case StateSpecificationPackage.OUTPUT__VALUE_LIST:\n+ setValueList((ValueList)newValue);\n return;\n case StateSpecificationPackage.OUTPUT__RATE:\n setRate((BigUnitValue)newValue);\n@@ -1127,20 +1025,11 @@ public void eUnset(int featureID)\n {\n switch (featureID)\n {\n- case StateSpecificationPackage.OUTPUT__LOWER:\n- setLower(LOWER_EDEFAULT);\n- return;\n- case StateSpecificationPackage.OUTPUT__UPPER:\n- setUpper(UPPER_EDEFAULT);\n- return;\n- case StateSpecificationPackage.OUTPUT__RANGE_TYPE:\n- setRangeType(RANGE_TYPE_EDEFAULT);\n- return;\n- case StateSpecificationPackage.OUTPUT__RANGE_UNITS:\n- setRangeUnits(RANGE_UNITS_EDEFAULT);\n+ case StateSpecificationPackage.OUTPUT__RANGE:\n+ setRange((ValueRange)null);\n return;\n- case StateSpecificationPackage.OUTPUT__VALUES:\n- getValues().clear();\n+ case StateSpecificationPackage.OUTPUT__VALUE_LIST:\n+ setValueList((ValueList)null);\n return;\n case StateSpecificationPackage.OUTPUT__RATE:\n setRate((BigUnitValue)null);\n@@ -1198,16 +1087,10 @@ public boolean eIsSet(int featureID)\n {\n switch (featureID)\n {\n- case StateSpecificationPackage.OUTPUT__LOWER:\n- return LOWER_EDEFAULT == null ? lower != null : !LOWER_EDEFAULT.equals(lower);\n- case StateSpecificationPackage.OUTPUT__UPPER:\n- return UPPER_EDEFAULT == null ? upper != null : !UPPER_EDEFAULT.equals(upper);\n- case StateSpecificationPackage.OUTPUT__RANGE_TYPE:\n- return RANGE_TYPE_EDEFAULT == null ? rangeType != null : !RANGE_TYPE_EDEFAULT.equals(rangeType);\n- case StateSpecificationPackage.OUTPUT__RANGE_UNITS:\n- return RANGE_UNITS_EDEFAULT == null ? rangeUnits != null : !RANGE_UNITS_EDEFAULT.equals(rangeUnits);\n- case StateSpecificationPackage.OUTPUT__VALUES:\n- return values != null && !values.isEmpty();\n+ case StateSpecificationPackage.OUTPUT__RANGE:\n+ return range != null;\n+ case StateSpecificationPackage.OUTPUT__VALUE_LIST:\n+ return valueList != null;\n case StateSpecificationPackage.OUTPUT__RATE:\n return rate != null;\n case StateSpecificationPackage.OUTPUT__DELAY:\n@@ -1251,17 +1134,7 @@ public String toString()\n if (eIsProxy()) return super.toString();\n \n StringBuffer result = new StringBuffer(super.toString());\n- result.append(\" (lower: \");\n- result.append(lower);\n- result.append(\", upper: \");\n- result.append(upper);\n- result.append(\", rangeType: \");\n- result.append(rangeType);\n- result.append(\", rangeUnits: \");\n- result.append(rangeUnits);\n- result.append(\", values: \");\n- result.append(values);\n- result.append(\", completionHandling: \");\n+ result.append(\" (completionHandling: \");\n result.append(completionHandling);\n result.append(\", variables: \");\n result.append(variables);", "raw_url": "https://github.com/nasa/CertWare/raw/110fa3222ae2931978d7921dc8e6af8c7f43abd3/net.certware.intent.state%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fstate%2FstateSpecification%2Fimpl%2FOutputImpl.java", "sha": "9634aed7be27ecd9a3681a5abb320d78fec80711", "status": "modified" }, { "additions": 24, "blob_url": "https://github.com/nasa/CertWare/blob/110fa3222ae2931978d7921dc8e6af8c7f43abd3/net.certware.intent.state%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fstate%2FstateSpecification%2Fimpl%2FStateSpecificationFactoryImpl.java", "changes": 24, "contents_url": "https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent.state%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fstate%2FstateSpecification%2Fimpl%2FStateSpecificationFactoryImpl.java?ref=110fa3222ae2931978d7921dc8e6af8c7f43abd3", "deletions": 0, "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/stateSpecification/impl/StateSpecificationFactoryImpl.java", "new_code": " case StateSpecificationPackage.VALUE_RANGE: return createValueRange();\n case StateSpecificationPackage.VALUE_LIST: return createValueList();\n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n public ValueRange createValueRange()\n {\n ValueRangeImpl valueRange = new ValueRangeImpl();\n return valueRange;\n }\n\n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n public ValueList createValueList()\n {\n ValueListImpl valueList = new ValueListImpl();\n return valueList;\n }\n", "new_methods": [ { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/stateSpecification/impl/StateSpecificationFactoryImpl.java", "implementation": "ValueRangeImpl valueRange = new ValueRangeImpl();\n return valueRange;", "signature": "ValueRange createValueRange()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/stateSpecification/impl/StateSpecificationFactoryImpl.java", "implementation": "ValueListImpl valueList = new ValueListImpl();\n return valueList;", "signature": "ValueList createValueList()" } ], "old_code": "", "old_methods": [], "patch": "@@ -83,6 +83,8 @@ public EObject create(EClass eClass)\n case StateSpecificationPackage.STATE_LIST: return createStateList();\n case StateSpecificationPackage.TRIGGER: return createTrigger();\n case StateSpecificationPackage.TRIGGER_TABLE: return createTriggerTable();\n+ case StateSpecificationPackage.VALUE_RANGE: return createValueRange();\n+ case StateSpecificationPackage.VALUE_LIST: return createValueList();\n case StateSpecificationPackage.OUTPUT: return createOutput();\n case StateSpecificationPackage.INPUT: return createInput();\n default:\n@@ -299,6 +301,28 @@ public TriggerTable createTriggerTable()\n return triggerTable;\n }\n \n+ /**\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ */\n+ public ValueRange createValueRange()\n+ {\n+ ValueRangeImpl valueRange = new ValueRangeImpl();\n+ return valueRange;\n+ }\n+\n+ /**\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ */\n+ public ValueList createValueList()\n+ {\n+ ValueListImpl valueList = new ValueListImpl();\n+ return valueList;\n+ }\n+\n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->", "raw_url": "https://github.com/nasa/CertWare/raw/110fa3222ae2931978d7921dc8e6af8c7f43abd3/net.certware.intent.state%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fstate%2FstateSpecification%2Fimpl%2FStateSpecificationFactoryImpl.java", "sha": "308f543622203c708b8a0e712f6a20b1dd71552a", "status": "modified" }, { "additions": 180, "blob_url": "https://github.com/nasa/CertWare/blob/110fa3222ae2931978d7921dc8e6af8c7f43abd3/net.certware.intent.state%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fstate%2FstateSpecification%2Fimpl%2FStateSpecificationPackageImpl.java", "changes": 244, "contents_url": "https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent.state%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fstate%2FstateSpecification%2Fimpl%2FStateSpecificationPackageImpl.java?ref=110fa3222ae2931978d7921dc8e6af8c7f43abd3", "deletions": 64, "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/stateSpecification/impl/StateSpecificationPackageImpl.java", "new_code": "import net.certware.intent.state.stateSpecification.ValueList;\nimport net.certware.intent.state.stateSpecification.ValueRange;\n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n private EClass valueRangeEClass = null;\n\n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n private EClass valueListEClass = null;\n\n public EClass getValueRange()\n return valueRangeEClass;\n }\n\n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n public EAttribute getValueRange_Lower()\n {\n return (EAttribute)valueRangeEClass.getEStructuralFeatures().get(0);\n }\n\n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n public EAttribute getValueRange_Upper()\n {\n return (EAttribute)valueRangeEClass.getEStructuralFeatures().get(1);\n }\n\n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n public EAttribute getValueRange_RangeType()\n {\n return (EAttribute)valueRangeEClass.getEStructuralFeatures().get(2);\n }\n\n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n public EAttribute getValueRange_RangeUnits()\n {\n return (EAttribute)valueRangeEClass.getEStructuralFeatures().get(3);\n public EClass getValueList()\n return valueListEClass;\n public EAttribute getValueList_Values()\n return (EAttribute)valueListEClass.getEStructuralFeatures().get(0);\n public EClass getOutput()\n return outputEClass;\n public EReference getOutput_Range()\n return (EReference)outputEClass.getEStructuralFeatures().get(0);\n public EReference getOutput_ValueList()\n return (EReference)outputEClass.getEStructuralFeatures().get(1);\n return (EReference)outputEClass.getEStructuralFeatures().get(2);\n return (EReference)outputEClass.getEStructuralFeatures().get(3);\n return (EReference)outputEClass.getEStructuralFeatures().get(4);\n return (EAttribute)outputEClass.getEStructuralFeatures().get(5);\n return (EAttribute)outputEClass.getEStructuralFeatures().get(6);\n return (EAttribute)outputEClass.getEStructuralFeatures().get(7);\n return (EReference)outputEClass.getEStructuralFeatures().get(8);\n return (EReference)outputEClass.getEStructuralFeatures().get(9);\n return (EAttribute)outputEClass.getEStructuralFeatures().get(10);\n return (EAttribute)outputEClass.getEStructuralFeatures().get(11);\n return (EAttribute)outputEClass.getEStructuralFeatures().get(12);\n return (EAttribute)outputEClass.getEStructuralFeatures().get(13);\n return (EAttribute)outputEClass.getEStructuralFeatures().get(14);\n return (EReference)outputEClass.getEStructuralFeatures().get(15);\n public EReference getInput_Range()\n return (EReference)inputEClass.getEStructuralFeatures().get(0);\n public EReference getInput_ValueList()\n return (EReference)inputEClass.getEStructuralFeatures().get(1);\n public EAttribute getInput_ValueHandling()\n public EReference getInput_Granularity()\n return (EReference)inputEClass.getEStructuralFeatures().get(3);\n public EReference getInput_ArrivalRateAvg()\n return (EReference)inputEClass.getEStructuralFeatures().get(4);\n public EReference getInput_ArrivalRateMinimum()\n public EReference getInput_ArrivalRateMaximum()\n return (EReference)inputEClass.getEStructuralFeatures().get(6);\n }\n\n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n public EReference getInput_Obsolescence()\n {\n return (EReference)inputEClass.getEStructuralFeatures().get(7);\n return (EAttribute)inputEClass.getEStructuralFeatures().get(8);\n }\n\n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n public EAttribute getInput_AppearsIn()\n {\n return (EAttribute)inputEClass.getEStructuralFeatures().get(9);\n }\n\n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n public EAttribute getInput_Description()\n {\n return (EAttribute)inputEClass.getEStructuralFeatures().get(10);\n return (EAttribute)inputEClass.getEStructuralFeatures().get(11);\n }\n\n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n public EReference getInput_Structure()\n {\n return (EReference)inputEClass.getEStructuralFeatures().get(12);\n valueRangeEClass = createEClass(VALUE_RANGE);\n createEAttribute(valueRangeEClass, VALUE_RANGE__LOWER);\n createEAttribute(valueRangeEClass, VALUE_RANGE__UPPER);\n createEAttribute(valueRangeEClass, VALUE_RANGE__RANGE_TYPE);\n createEAttribute(valueRangeEClass, VALUE_RANGE__RANGE_UNITS);\n\n valueListEClass = createEClass(VALUE_LIST);\n createEAttribute(valueListEClass, VALUE_LIST__VALUES);\n\n createEReference(outputEClass, OUTPUT__RANGE);\n createEReference(outputEClass, OUTPUT__VALUE_LIST);\n createEReference(inputEClass, INPUT__RANGE);\n createEReference(inputEClass, INPUT__VALUE_LIST);\n createEAttribute(inputEClass, INPUT__VALUE_HANDLING);\n createEReference(inputEClass, INPUT__GRANULARITY);\n createEReference(inputEClass, INPUT__ARRIVAL_RATE_AVG);\n createEReference(inputEClass, INPUT__ARRIVAL_RATE_MINIMUM);\n createEReference(inputEClass, INPUT__ARRIVAL_RATE_MAXIMUM);\n createEReference(inputEClass, INPUT__OBSOLESCENCE);\n createEAttribute(inputEClass, INPUT__APPEARS_IN);\n createEAttribute(inputEClass, INPUT__DESCRIPTION);\n createEReference(inputEClass, INPUT__STRUCTURE);\n initEClass(valueRangeEClass, ValueRange.class, \"ValueRange\", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\n initEAttribute(getValueRange_Lower(), ecorePackage.getEBigDecimal(), \"lower\", null, 0, 1, ValueRange.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n initEAttribute(getValueRange_Upper(), ecorePackage.getEBigDecimal(), \"upper\", null, 0, 1, ValueRange.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n initEAttribute(getValueRange_RangeType(), ecorePackage.getEString(), \"rangeType\", null, 0, 1, ValueRange.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n initEAttribute(getValueRange_RangeUnits(), ecorePackage.getEString(), \"rangeUnits\", null, 0, 1, ValueRange.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n\n initEClass(valueListEClass, ValueList.class, \"ValueList\", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\n initEAttribute(getValueList_Values(), ecorePackage.getEString(), \"values\", null, 0, -1, ValueList.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n\n initEReference(getOutput_Range(), this.getValueRange(), null, \"range\", null, 0, 1, Output.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n initEReference(getOutput_ValueList(), this.getValueList(), null, \"valueList\", null, 0, 1, Output.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n initEReference(getInput_Range(), this.getValueRange(), null, \"range\", null, 0, 1, Input.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n initEReference(getInput_ValueList(), this.getValueList(), null, \"valueList\", null, 0, 1, Input.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n initEAttribute(getInput_ValueHandling(), ecorePackage.getEString(), \"valueHandling\", null, 0, 1, Input.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n initEReference(getInput_Granularity(), this.getBigUnitValue(), null, \"granularity\", null, 0, 1, Input.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n initEReference(getInput_ArrivalRateAvg(), this.getBigUnitValue(), null, \"arrivalRateAvg\", null, 0, 1, Input.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n initEReference(getInput_ArrivalRateMinimum(), this.getBigUnitValue(), null, \"arrivalRateMinimum\", null, 0, 1, Input.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n initEReference(getInput_ArrivalRateMaximum(), this.getBigUnitValue(), null, \"arrivalRateMaximum\", null, 0, 1, Input.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n initEReference(getInput_Obsolescence(), this.getBigUnitValue(), null, \"obsolescence\", null, 0, 1, Input.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n initEAttribute(getInput_AppearsIn(), ecorePackage.getEString(), \"appearsIn\", null, 0, 1, Input.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n initEAttribute(getInput_Description(), ecorePackage.getEString(), \"description\", null, 0, 1, Input.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n initEReference(getInput_Structure(), this.getTriggerTable(), null, \"structure\", null, 0, 1, Input.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);", "new_methods": [ { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/stateSpecification/impl/StateSpecificationPackageImpl.java", "implementation": "return (EAttribute)valueRangeEClass.getEStructuralFeatures().get(0);", "signature": "EAttribute getValueRange_Lower()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/stateSpecification/impl/StateSpecificationPackageImpl.java", "implementation": "return (EAttribute)valueRangeEClass.getEStructuralFeatures().get(1);", "signature": "EAttribute getValueRange_Upper()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/stateSpecification/impl/StateSpecificationPackageImpl.java", "implementation": "return (EAttribute)valueRangeEClass.getEStructuralFeatures().get(2);", "signature": "EAttribute getValueRange_RangeType()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/stateSpecification/impl/StateSpecificationPackageImpl.java", "implementation": "return (EAttribute)valueRangeEClass.getEStructuralFeatures().get(3);\n public EClass getValueList()\n return valueListEClass;\n public EAttribute getValueList_Values()\n return (EAttribute)valueListEClass.getEStructuralFeatures().get(0);\n public EClass getOutput()\n return outputEClass;\n public EReference getOutput_Range()\n return (EReference)outputEClass.getEStructuralFeatures().get(0);\n public EReference getOutput_ValueList()\n return (EReference)outputEClass.getEStructuralFeatures().get(1);\n return (EReference)outputEClass.getEStructuralFeatures().get(2);\n return (EReference)outputEClass.getEStructuralFeatures().get(3);\n return (EReference)outputEClass.getEStructuralFeatures().get(4);\n return (EAttribute)outputEClass.getEStructuralFeatures().get(5);\n return (EAttribute)outputEClass.getEStructuralFeatures().get(6);\n return (EAttribute)outputEClass.getEStructuralFeatures().get(7);\n return (EReference)outputEClass.getEStructuralFeatures().get(8);\n return (EReference)outputEClass.getEStructuralFeatures().get(9);\n return (EAttribute)outputEClass.getEStructuralFeatures().get(10);\n return (EAttribute)outputEClass.getEStructuralFeatures().get(11);\n return (EAttribute)outputEClass.getEStructuralFeatures().get(12);\n return (EAttribute)outputEClass.getEStructuralFeatures().get(13);\n return (EAttribute)outputEClass.getEStructuralFeatures().get(14);\n return (EReference)outputEClass.getEStructuralFeatures().get(15);\n public EReference getInput_Range()\n return (EReference)inputEClass.getEStructuralFeatures().get(0);\n public EReference getInput_ValueList()\n return (EReference)inputEClass.getEStructuralFeatures().get(1);\n public EAttribute getInput_ValueHandling()\n public EReference getInput_Granularity()\n return (EReference)inputEClass.getEStructuralFeatures().get(3);\n public EReference getInput_ArrivalRateAvg()\n return (EReference)inputEClass.getEStructuralFeatures().get(4);\n public EReference getInput_ArrivalRateMinimum()\n public EReference getInput_ArrivalRateMaximum()\n return (EReference)inputEClass.getEStructuralFeatures().get(6);", "signature": "EAttribute getValueRange_RangeUnits()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/stateSpecification/impl/StateSpecificationPackageImpl.java", "implementation": "return (EReference)inputEClass.getEStructuralFeatures().get(7);\n return (EAttribute)inputEClass.getEStructuralFeatures().get(8);", "signature": "EReference getInput_Obsolescence()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/stateSpecification/impl/StateSpecificationPackageImpl.java", "implementation": "return (EAttribute)inputEClass.getEStructuralFeatures().get(9);", "signature": "EAttribute getInput_AppearsIn()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/stateSpecification/impl/StateSpecificationPackageImpl.java", "implementation": "return (EAttribute)inputEClass.getEStructuralFeatures().get(10);\n return (EAttribute)inputEClass.getEStructuralFeatures().get(11);", "signature": "EAttribute getInput_Description()" } ], "old_code": " public EClass getOutput()\n return outputEClass;\n public EAttribute getOutput_Lower()\n return (EAttribute)outputEClass.getEStructuralFeatures().get(0);\n public EAttribute getOutput_Upper()\n return (EAttribute)outputEClass.getEStructuralFeatures().get(1);\n public EAttribute getOutput_RangeType()\n return (EAttribute)outputEClass.getEStructuralFeatures().get(2);\n public EAttribute getOutput_RangeUnits()\n return (EAttribute)outputEClass.getEStructuralFeatures().get(3);\n public EAttribute getOutput_Values()\n return (EAttribute)outputEClass.getEStructuralFeatures().get(4);\n return (EReference)outputEClass.getEStructuralFeatures().get(5);\n return (EReference)outputEClass.getEStructuralFeatures().get(6);\n return (EReference)outputEClass.getEStructuralFeatures().get(7);\n return (EAttribute)outputEClass.getEStructuralFeatures().get(8);\n return (EAttribute)outputEClass.getEStructuralFeatures().get(9);\n return (EAttribute)outputEClass.getEStructuralFeatures().get(10);\n return (EReference)outputEClass.getEStructuralFeatures().get(11);\n return (EReference)outputEClass.getEStructuralFeatures().get(12);\n return (EAttribute)outputEClass.getEStructuralFeatures().get(13);\n return (EAttribute)outputEClass.getEStructuralFeatures().get(14);\n return (EAttribute)outputEClass.getEStructuralFeatures().get(15);\n return (EAttribute)outputEClass.getEStructuralFeatures().get(16);\n return (EAttribute)outputEClass.getEStructuralFeatures().get(17);\n return (EReference)outputEClass.getEStructuralFeatures().get(18);\n public EAttribute getInput_Lower()\n return (EAttribute)inputEClass.getEStructuralFeatures().get(0);\n public EAttribute getInput_Upper()\n return (EAttribute)inputEClass.getEStructuralFeatures().get(1);\n public EAttribute getInput_RangeType()\n public EAttribute getInput_RangeUnits()\n return (EAttribute)inputEClass.getEStructuralFeatures().get(3);\n public EAttribute getInput_Values()\n return (EAttribute)inputEClass.getEStructuralFeatures().get(4);\n public EReference getInput_Rate()\n public EAttribute getInput_Variables()\n return (EAttribute)inputEClass.getEStructuralFeatures().get(6);\n return (EAttribute)inputEClass.getEStructuralFeatures().get(7);\n return (EAttribute)inputEClass.getEStructuralFeatures().get(8);\n createEAttribute(outputEClass, OUTPUT__LOWER);\n createEAttribute(outputEClass, OUTPUT__UPPER);\n createEAttribute(outputEClass, OUTPUT__RANGE_TYPE);\n createEAttribute(outputEClass, OUTPUT__RANGE_UNITS);\n createEAttribute(outputEClass, OUTPUT__VALUES);\n createEAttribute(inputEClass, INPUT__LOWER);\n createEAttribute(inputEClass, INPUT__UPPER);\n createEAttribute(inputEClass, INPUT__RANGE_TYPE);\n createEAttribute(inputEClass, INPUT__RANGE_UNITS);\n createEAttribute(inputEClass, INPUT__VALUES);\n createEReference(inputEClass, INPUT__RATE);\n createEAttribute(inputEClass, INPUT__VARIABLES);\n initEAttribute(getOutput_Lower(), ecorePackage.getEBigDecimal(), \"lower\", null, 0, 1, Output.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n initEAttribute(getOutput_Upper(), ecorePackage.getEBigDecimal(), \"upper\", null, 0, 1, Output.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n initEAttribute(getOutput_RangeType(), ecorePackage.getEString(), \"rangeType\", null, 0, 1, Output.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n initEAttribute(getOutput_RangeUnits(), ecorePackage.getEString(), \"rangeUnits\", null, 0, 1, Output.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n initEAttribute(getOutput_Values(), ecorePackage.getEString(), \"values\", null, 0, -1, Output.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n initEAttribute(getInput_Lower(), ecorePackage.getEBigDecimal(), \"lower\", null, 0, 1, Input.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n initEAttribute(getInput_Upper(), ecorePackage.getEBigDecimal(), \"upper\", null, 0, 1, Input.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n initEAttribute(getInput_RangeType(), ecorePackage.getEString(), \"rangeType\", null, 0, 1, Input.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n initEAttribute(getInput_RangeUnits(), ecorePackage.getEString(), \"rangeUnits\", null, 0, 1, Input.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n initEAttribute(getInput_Values(), ecorePackage.getEString(), \"values\", null, 0, -1, Input.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n initEReference(getInput_Rate(), this.getBigUnitValue(), null, \"rate\", null, 0, 1, Input.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n initEAttribute(getInput_Variables(), ecorePackage.getEString(), \"variables\", null, 0, 1, Input.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);", "old_methods": [], "patch": "@@ -25,6 +25,8 @@\n import net.certware.intent.state.stateSpecification.StateVariable;\n import net.certware.intent.state.stateSpecification.Trigger;\n import net.certware.intent.state.stateSpecification.TriggerTable;\n+import net.certware.intent.state.stateSpecification.ValueList;\n+import net.certware.intent.state.stateSpecification.ValueRange;\n \n import org.eclipse.emf.ecore.EAttribute;\n import org.eclipse.emf.ecore.EClass;\n@@ -174,6 +176,20 @@ public class StateSpecificationPackageImpl extends EPackageImpl implements State\n */\n private EClass triggerTableEClass = null;\n \n+ /**\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ */\n+ private EClass valueRangeEClass = null;\n+\n+ /**\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ */\n+ private EClass valueListEClass = null;\n+\n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n@@ -916,59 +932,99 @@ public EReference getTriggerTable_Rows()\n * <!-- end-user-doc -->\n * @generated\n */\n- public EClass getOutput()\n+ public EClass getValueRange()\n {\n- return outputEClass;\n+ return valueRangeEClass;\n+ }\n+\n+ /**\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ */\n+ public EAttribute getValueRange_Lower()\n+ {\n+ return (EAttribute)valueRangeEClass.getEStructuralFeatures().get(0);\n+ }\n+\n+ /**\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ */\n+ public EAttribute getValueRange_Upper()\n+ {\n+ return (EAttribute)valueRangeEClass.getEStructuralFeatures().get(1);\n+ }\n+\n+ /**\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ */\n+ public EAttribute getValueRange_RangeType()\n+ {\n+ return (EAttribute)valueRangeEClass.getEStructuralFeatures().get(2);\n+ }\n+\n+ /**\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ */\n+ public EAttribute getValueRange_RangeUnits()\n+ {\n+ return (EAttribute)valueRangeEClass.getEStructuralFeatures().get(3);\n }\n \n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n- public EAttribute getOutput_Lower()\n+ public EClass getValueList()\n {\n- return (EAttribute)outputEClass.getEStructuralFeatures().get(0);\n+ return valueListEClass;\n }\n \n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n- public EAttribute getOutput_Upper()\n+ public EAttribute getValueList_Values()\n {\n- return (EAttribute)outputEClass.getEStructuralFeatures().get(1);\n+ return (EAttribute)valueListEClass.getEStructuralFeatures().get(0);\n }\n \n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n- public EAttribute getOutput_RangeType()\n+ public EClass getOutput()\n {\n- return (EAttribute)outputEClass.getEStructuralFeatures().get(2);\n+ return outputEClass;\n }\n \n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n- public EAttribute getOutput_RangeUnits()\n+ public EReference getOutput_Range()\n {\n- return (EAttribute)outputEClass.getEStructuralFeatures().get(3);\n+ return (EReference)outputEClass.getEStructuralFeatures().get(0);\n }\n \n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n- public EAttribute getOutput_Values()\n+ public EReference getOutput_ValueList()\n {\n- return (EAttribute)outputEClass.getEStructuralFeatures().get(4);\n+ return (EReference)outputEClass.getEStructuralFeatures().get(1);\n }\n \n /**\n@@ -978,7 +1034,7 @@ public EAttribute getOutput_Values()\n */\n public EReference getOutput_Rate()\n {\n- return (EReference)outputEClass.getEStructuralFeatures().get(5);\n+ return (EReference)outputEClass.getEStructuralFeatures().get(2);\n }\n \n /**\n@@ -988,7 +1044,7 @@ public EReference getOutput_Rate()\n */\n public EReference getOutput_Delay()\n {\n- return (EReference)outputEClass.getEStructuralFeatures().get(6);\n+ return (EReference)outputEClass.getEStructuralFeatures().get(3);\n }\n \n /**\n@@ -998,7 +1054,7 @@ public EReference getOutput_Delay()\n */\n public EReference getOutput_Deadline()\n {\n- return (EReference)outputEClass.getEStructuralFeatures().get(7);\n+ return (EReference)outputEClass.getEStructuralFeatures().get(4);\n }\n \n /**\n@@ -1008,7 +1064,7 @@ public EReference getOutput_Deadline()\n */\n public EAttribute getOutput_CompletionHandling()\n {\n- return (EAttribute)outputEClass.getEStructuralFeatures().get(8);\n+ return (EAttribute)outputEClass.getEStructuralFeatures().get(5);\n }\n \n /**\n@@ -1018,7 +1074,7 @@ public EAttribute getOutput_CompletionHandling()\n */\n public EAttribute getOutput_Variables()\n {\n- return (EAttribute)outputEClass.getEStructuralFeatures().get(9);\n+ return (EAttribute)outputEClass.getEStructuralFeatures().get(6);\n }\n \n /**\n@@ -1028,7 +1084,7 @@ public EAttribute getOutput_Variables()\n */\n public EAttribute getOutput_Relationship()\n {\n- return (EAttribute)outputEClass.getEStructuralFeatures().get(10);\n+ return (EAttribute)outputEClass.getEStructuralFeatures().get(7);\n }\n \n /**\n@@ -1038,7 +1094,7 @@ public EAttribute getOutput_Relationship()\n */\n public EReference getOutput_MinResponse()\n {\n- return (EReference)outputEClass.getEStructuralFeatures().get(11);\n+ return (EReference)outputEClass.getEStructuralFeatures().get(8);\n }\n \n /**\n@@ -1048,7 +1104,7 @@ public EReference getOutput_MinResponse()\n */\n public EReference getOutput_MaxResponse()\n {\n- return (EReference)outputEClass.getEStructuralFeatures().get(12);\n+ return (EReference)outputEClass.getEStructuralFeatures().get(9);\n }\n \n /**\n@@ -1058,7 +1114,7 @@ public EReference getOutput_MaxResponse()\n */\n public EAttribute getOutput_FeebackHandling()\n {\n- return (EAttribute)outputEClass.getEStructuralFeatures().get(13);\n+ return (EAttribute)outputEClass.getEStructuralFeatures().get(10);\n }\n \n /**\n@@ -1068,7 +1124,7 @@ public EAttribute getOutput_FeebackHandling()\n */\n public EAttribute getOutput_Reversed()\n {\n- return (EAttribute)outputEClass.getEStructuralFeatures().get(14);\n+ return (EAttribute)outputEClass.getEStructuralFeatures().get(11);\n }\n \n /**\n@@ -1078,7 +1134,7 @@ public EAttribute getOutput_Reversed()\n */\n public EAttribute getOutput_References()\n {\n- return (EAttribute)outputEClass.getEStructuralFeatures().get(15);\n+ return (EAttribute)outputEClass.getEStructuralFeatures().get(12);\n }\n \n /**\n@@ -1088,7 +1144,7 @@ public EAttribute getOutput_References()\n */\n public EAttribute getOutput_Comments()\n {\n- return (EAttribute)outputEClass.getEStructuralFeatures().get(16);\n+ return (EAttribute)outputEClass.getEStructuralFeatures().get(13);\n }\n \n /**\n@@ -1098,7 +1154,7 @@ public EAttribute getOutput_Comments()\n */\n public EAttribute getOutput_Contents()\n {\n- return (EAttribute)outputEClass.getEStructuralFeatures().get(17);\n+ return (EAttribute)outputEClass.getEStructuralFeatures().get(14);\n }\n \n /**\n@@ -1108,7 +1164,7 @@ public EAttribute getOutput_Contents()\n */\n public EReference getOutput_Table()\n {\n- return (EReference)outputEClass.getEStructuralFeatures().get(18);\n+ return (EReference)outputEClass.getEStructuralFeatures().get(15);\n }\n \n /**\n@@ -1126,27 +1182,27 @@ public EClass getInput()\n * <!-- end-user-doc -->\n * @generated\n */\n- public EAttribute getInput_Lower()\n+ public EReference getInput_Range()\n {\n- return (EAttribute)inputEClass.getEStructuralFeatures().get(0);\n+ return (EReference)inputEClass.getEStructuralFeatures().get(0);\n }\n \n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n- public EAttribute getInput_Upper()\n+ public EReference getInput_ValueList()\n {\n- return (EAttribute)inputEClass.getEStructuralFeatures().get(1);\n+ return (EReference)inputEClass.getEStructuralFeatures().get(1);\n }\n \n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n- public EAttribute getInput_RangeType()\n+ public EAttribute getInput_ValueHandling()\n {\n return (EAttribute)inputEClass.getEStructuralFeatures().get(2);\n }\n@@ -1156,27 +1212,27 @@ public EAttribute getInput_RangeType()\n * <!-- end-user-doc -->\n * @generated\n */\n- public EAttribute getInput_RangeUnits()\n+ public EReference getInput_Granularity()\n {\n- return (EAttribute)inputEClass.getEStructuralFeatures().get(3);\n+ return (EReference)inputEClass.getEStructuralFeatures().get(3);\n }\n \n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n- public EAttribute getInput_Values()\n+ public EReference getInput_ArrivalRateAvg()\n {\n- return (EAttribute)inputEClass.getEStructuralFeatures().get(4);\n+ return (EReference)inputEClass.getEStructuralFeatures().get(4);\n }\n \n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n- public EReference getInput_Rate()\n+ public EReference getInput_ArrivalRateMinimum()\n {\n return (EReference)inputEClass.getEStructuralFeatures().get(5);\n }\n@@ -1186,9 +1242,19 @@ public EReference getInput_Rate()\n * <!-- end-user-doc -->\n * @generated\n */\n- public EAttribute getInput_Variables()\n+ public EReference getInput_ArrivalRateMaximum()\n {\n- return (EAttribute)inputEClass.getEStructuralFeatures().get(6);\n+ return (EReference)inputEClass.getEStructuralFeatures().get(6);\n+ }\n+\n+ /**\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ */\n+ public EReference getInput_Obsolescence()\n+ {\n+ return (EReference)inputEClass.getEStructuralFeatures().get(7);\n }\n \n /**\n@@ -1198,7 +1264,27 @@ public EAttribute getInput_Variables()\n */\n public EAttribute getInput_References()\n {\n- return (EAttribute)inputEClass.getEStructuralFeatures().get(7);\n+ return (EAttribute)inputEClass.getEStructuralFeatures().get(8);\n+ }\n+\n+ /**\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ */\n+ public EAttribute getInput_AppearsIn()\n+ {\n+ return (EAttribute)inputEClass.getEStructuralFeatures().get(9);\n+ }\n+\n+ /**\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ */\n+ public EAttribute getInput_Description()\n+ {\n+ return (EAttribute)inputEClass.getEStructuralFeatures().get(10);\n }\n \n /**\n@@ -1208,7 +1294,17 @@ public EAttribute getInput_References()\n */\n public EAttribute getInput_Comments()\n {\n- return (EAttribute)inputEClass.getEStructuralFeatures().get(8);\n+ return (EAttribute)inputEClass.getEStructuralFeatures().get(11);\n+ }\n+\n+ /**\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ */\n+ public EReference getInput_Structure()\n+ {\n+ return (EReference)inputEClass.getEStructuralFeatures().get(12);\n }\n \n /**\n@@ -1326,12 +1422,18 @@ public void createPackageContents()\n triggerTableEClass = createEClass(TRIGGER_TABLE);\n createEReference(triggerTableEClass, TRIGGER_TABLE__ROWS);\n \n+ valueRangeEClass = createEClass(VALUE_RANGE);\n+ createEAttribute(valueRangeEClass, VALUE_RANGE__LOWER);\n+ createEAttribute(valueRangeEClass, VALUE_RANGE__UPPER);\n+ createEAttribute(valueRangeEClass, VALUE_RANGE__RANGE_TYPE);\n+ createEAttribute(valueRangeEClass, VALUE_RANGE__RANGE_UNITS);\n+\n+ valueListEClass = createEClass(VALUE_LIST);\n+ createEAttribute(valueListEClass, VALUE_LIST__VALUES);\n+\n outputEClass = createEClass(OUTPUT);\n- createEAttribute(outputEClass, OUTPUT__LOWER);\n- createEAttribute(outputEClass, OUTPUT__UPPER);\n- createEAttribute(outputEClass, OUTPUT__RANGE_TYPE);\n- createEAttribute(outputEClass, OUTPUT__RANGE_UNITS);\n- createEAttribute(outputEClass, OUTPUT__VALUES);\n+ createEReference(outputEClass, OUTPUT__RANGE);\n+ createEReference(outputEClass, OUTPUT__VALUE_LIST);\n createEReference(outputEClass, OUTPUT__RATE);\n createEReference(outputEClass, OUTPUT__DELAY);\n createEReference(outputEClass, OUTPUT__DEADLINE);\n@@ -1348,15 +1450,19 @@ public void createPackageContents()\n createEReference(outputEClass, OUTPUT__TABLE);\n \n inputEClass = createEClass(INPUT);\n- createEAttribute(inputEClass, INPUT__LOWER);\n- createEAttribute(inputEClass, INPUT__UPPER);\n- createEAttribute(inputEClass, INPUT__RANGE_TYPE);\n- createEAttribute(inputEClass, INPUT__RANGE_UNITS);\n- createEAttribute(inputEClass, INPUT__VALUES);\n- createEReference(inputEClass, INPUT__RATE);\n- createEAttribute(inputEClass, INPUT__VARIABLES);\n+ createEReference(inputEClass, INPUT__RANGE);\n+ createEReference(inputEClass, INPUT__VALUE_LIST);\n+ createEAttribute(inputEClass, INPUT__VALUE_HANDLING);\n+ createEReference(inputEClass, INPUT__GRANULARITY);\n+ createEReference(inputEClass, INPUT__ARRIVAL_RATE_AVG);\n+ createEReference(inputEClass, INPUT__ARRIVAL_RATE_MINIMUM);\n+ createEReference(inputEClass, INPUT__ARRIVAL_RATE_MAXIMUM);\n+ createEReference(inputEClass, INPUT__OBSOLESCENCE);\n createEAttribute(inputEClass, INPUT__REFERENCES);\n+ createEAttribute(inputEClass, INPUT__APPEARS_IN);\n+ createEAttribute(inputEClass, INPUT__DESCRIPTION);\n createEAttribute(inputEClass, INPUT__COMMENTS);\n+ createEReference(inputEClass, INPUT__STRUCTURE);\n }\n \n /**\n@@ -1475,12 +1581,18 @@ public void initializePackageContents()\n initEClass(triggerTableEClass, TriggerTable.class, \"TriggerTable\", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\n initEReference(getTriggerTable_Rows(), this.getTrigger(), null, \"rows\", null, 0, -1, TriggerTable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n \n+ initEClass(valueRangeEClass, ValueRange.class, \"ValueRange\", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\n+ initEAttribute(getValueRange_Lower(), ecorePackage.getEBigDecimal(), \"lower\", null, 0, 1, ValueRange.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n+ initEAttribute(getValueRange_Upper(), ecorePackage.getEBigDecimal(), \"upper\", null, 0, 1, ValueRange.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n+ initEAttribute(getValueRange_RangeType(), ecorePackage.getEString(), \"rangeType\", null, 0, 1, ValueRange.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n+ initEAttribute(getValueRange_RangeUnits(), ecorePackage.getEString(), \"rangeUnits\", null, 0, 1, ValueRange.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n+\n+ initEClass(valueListEClass, ValueList.class, \"ValueList\", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\n+ initEAttribute(getValueList_Values(), ecorePackage.getEString(), \"values\", null, 0, -1, ValueList.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n+\n initEClass(outputEClass, Output.class, \"Output\", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\n- initEAttribute(getOutput_Lower(), ecorePackage.getEBigDecimal(), \"lower\", null, 0, 1, Output.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n- initEAttribute(getOutput_Upper(), ecorePackage.getEBigDecimal(), \"upper\", null, 0, 1, Output.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n- initEAttribute(getOutput_RangeType(), ecorePackage.getEString(), \"rangeType\", null, 0, 1, Output.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n- initEAttribute(getOutput_RangeUnits(), ecorePackage.getEString(), \"rangeUnits\", null, 0, 1, Output.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n- initEAttribute(getOutput_Values(), ecorePackage.getEString(), \"values\", null, 0, -1, Output.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n+ initEReference(getOutput_Range(), this.getValueRange(), null, \"range\", null, 0, 1, Output.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n+ initEReference(getOutput_ValueList(), this.getValueList(), null, \"valueList\", null, 0, 1, Output.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n initEReference(getOutput_Rate(), this.getBigUnitValue(), null, \"rate\", null, 0, 1, Output.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n initEReference(getOutput_Delay(), this.getBigUnitValue(), null, \"delay\", null, 0, 1, Output.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n initEReference(getOutput_Deadline(), this.getBigUnitValue(), null, \"deadline\", null, 0, 1, Output.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n@@ -1497,15 +1609,19 @@ public void initializePackageContents()\n initEReference(getOutput_Table(), this.getTriggerTable(), null, \"table\", null, 0, 1, Output.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n \n initEClass(inputEClass, Input.class, \"Input\", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\n- initEAttribute(getInput_Lower(), ecorePackage.getEBigDecimal(), \"lower\", null, 0, 1, Input.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n- initEAttribute(getInput_Upper(), ecorePackage.getEBigDecimal(), \"upper\", null, 0, 1, Input.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n- initEAttribute(getInput_RangeType(), ecorePackage.getEString(), \"rangeType\", null, 0, 1, Input.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n- initEAttribute(getInput_RangeUnits(), ecorePackage.getEString(), \"rangeUnits\", null, 0, 1, Input.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n- initEAttribute(getInput_Values(), ecorePackage.getEString(), \"values\", null, 0, -1, Input.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n- initEReference(getInput_Rate(), this.getBigUnitValue(), null, \"rate\", null, 0, 1, Input.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n- initEAttribute(getInput_Variables(), ecorePackage.getEString(), \"variables\", null, 0, 1, Input.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n+ initEReference(getInput_Range(), this.getValueRange(), null, \"range\", null, 0, 1, Input.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n+ initEReference(getInput_ValueList(), this.getValueList(), null, \"valueList\", null, 0, 1, Input.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n+ initEAttribute(getInput_ValueHandling(), ecorePackage.getEString(), \"valueHandling\", null, 0, 1, Input.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n+ initEReference(getInput_Granularity(), this.getBigUnitValue(), null, \"granularity\", null, 0, 1, Input.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n+ initEReference(getInput_ArrivalRateAvg(), this.getBigUnitValue(), null, \"arrivalRateAvg\", null, 0, 1, Input.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n+ initEReference(getInput_ArrivalRateMinimum(), this.getBigUnitValue(), null, \"arrivalRateMinimum\", null, 0, 1, Input.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n+ initEReference(getInput_ArrivalRateMaximum(), this.getBigUnitValue(), null, \"arrivalRateMaximum\", null, 0, 1, Input.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n+ initEReference(getInput_Obsolescence(), this.getBigUnitValue(), null, \"obsolescence\", null, 0, 1, Input.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n initEAttribute(getInput_References(), ecorePackage.getEString(), \"references\", null, 0, 1, Input.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n+ initEAttribute(getInput_AppearsIn(), ecorePackage.getEString(), \"appearsIn\", null, 0, 1, Input.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n+ initEAttribute(getInput_Description(), ecorePackage.getEString(), \"description\", null, 0, 1, Input.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n initEAttribute(getInput_Comments(), ecorePackage.getEString(), \"comments\", null, 0, 1, Input.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n+ initEReference(getInput_Structure(), this.getTriggerTable(), null, \"structure\", null, 0, 1, Input.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n \n // Create resource\n createResource(eNS_URI);", "raw_url": "https://github.com/nasa/CertWare/raw/110fa3222ae2931978d7921dc8e6af8c7f43abd3/net.certware.intent.state%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fstate%2FstateSpecification%2Fimpl%2FStateSpecificationPackageImpl.java", "sha": "8900568c257db08a2722d9f4c2016785c32e3a85", "status": "modified" }, { "additions": 40, "blob_url": "https://github.com/nasa/CertWare/blob/110fa3222ae2931978d7921dc8e6af8c7f43abd3/net.certware.intent.state%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fstate%2FstateSpecification%2Futil%2FStateSpecificationAdapterFactory.java", "changes": 40, "contents_url": "https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent.state%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fstate%2FstateSpecification%2Futil%2FStateSpecificationAdapterFactory.java?ref=110fa3222ae2931978d7921dc8e6af8c7f43abd3", "deletions": 0, "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/stateSpecification/util/StateSpecificationAdapterFactory.java", "new_code": " public Adapter caseValueRange(ValueRange object)\n {\n return createValueRangeAdapter();\n }\n @Override\n public Adapter caseValueList(ValueList object)\n {\n return createValueListAdapter();\n }\n @Override\n /**\n * Creates a new adapter for an object of class '{@link net.certware.intent.state.stateSpecification.ValueRange <em>Value Range</em>}'.\n * <!-- begin-user-doc -->\n * This default implementation returns null so that we can easily ignore cases;\n * it's useful to ignore a case when inheritance will catch all the cases anyway.\n * <!-- end-user-doc -->\n * @return the new adapter.\n * @see net.certware.intent.state.stateSpecification.ValueRange\n * @generated\n */\n public Adapter createValueRangeAdapter()\n {\n return null;\n }\n\n /**\n * Creates a new adapter for an object of class '{@link net.certware.intent.state.stateSpecification.ValueList <em>Value List</em>}'.\n * <!-- begin-user-doc -->\n * This default implementation returns null so that we can easily ignore cases;\n * it's useful to ignore a case when inheritance will catch all the cases anyway.\n * <!-- end-user-doc -->\n * @return the new adapter.\n * @see net.certware.intent.state.stateSpecification.ValueList\n * @generated\n */\n public Adapter createValueListAdapter()\n {\n return null;\n }\n", "new_methods": [ { "arguments": [ "ValueRange object" ], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/stateSpecification/util/StateSpecificationAdapterFactory.java", "implementation": "return createValueRangeAdapter();", "signature": "Adapter caseValueRange(ValueRange object)" }, { "arguments": [ "ValueList object" ], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/stateSpecification/util/StateSpecificationAdapterFactory.java", "implementation": "return createValueListAdapter();", "signature": "Adapter caseValueList(ValueList object)" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/stateSpecification/util/StateSpecificationAdapterFactory.java", "implementation": "return null;", "signature": "Adapter createValueRangeAdapter()" }, { "arguments": [], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/stateSpecification/util/StateSpecificationAdapterFactory.java", "implementation": "return null;", "signature": "Adapter createValueListAdapter()" } ], "old_code": "", "old_methods": [], "patch": "@@ -170,6 +170,16 @@ public Adapter caseTriggerTable(TriggerTable object)\n return createTriggerTableAdapter();\n }\n @Override\n+ public Adapter caseValueRange(ValueRange object)\n+ {\n+ return createValueRangeAdapter();\n+ }\n+ @Override\n+ public Adapter caseValueList(ValueList object)\n+ {\n+ return createValueListAdapter();\n+ }\n+ @Override\n public Adapter caseOutput(Output object)\n {\n return createOutputAdapter();\n@@ -486,6 +496,36 @@ public Adapter createTriggerTableAdapter()\n return null;\n }\n \n+ /**\n+ * Creates a new adapter for an object of class '{@link net.certware.intent.state.stateSpecification.ValueRange <em>Value Range</em>}'.\n+ * <!-- begin-user-doc -->\n+ * This default implementation returns null so that we can easily ignore cases;\n+ * it's useful to ignore a case when inheritance will catch all the cases anyway.\n+ * <!-- end-user-doc -->\n+ * @return the new adapter.\n+ * @see net.certware.intent.state.stateSpecification.ValueRange\n+ * @generated\n+ */\n+ public Adapter createValueRangeAdapter()\n+ {\n+ return null;\n+ }\n+\n+ /**\n+ * Creates a new adapter for an object of class '{@link net.certware.intent.state.stateSpecification.ValueList <em>Value List</em>}'.\n+ * <!-- begin-user-doc -->\n+ * This default implementation returns null so that we can easily ignore cases;\n+ * it's useful to ignore a case when inheritance will catch all the cases anyway.\n+ * <!-- end-user-doc -->\n+ * @return the new adapter.\n+ * @see net.certware.intent.state.stateSpecification.ValueList\n+ * @generated\n+ */\n+ public Adapter createValueListAdapter()\n+ {\n+ return null;\n+ }\n+\n /**\n * Creates a new adapter for an object of class '{@link net.certware.intent.state.stateSpecification.Output <em>Output</em>}'.\n * <!-- begin-user-doc -->", "raw_url": "https://github.com/nasa/CertWare/raw/110fa3222ae2931978d7921dc8e6af8c7f43abd3/net.certware.intent.state%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fstate%2FstateSpecification%2Futil%2FStateSpecificationAdapterFactory.java", "sha": "2c3ef5aa638cfb18f3dfeb9a6a7118e099c068eb", "status": "modified" }, { "additions": 46, "blob_url": "https://github.com/nasa/CertWare/blob/110fa3222ae2931978d7921dc8e6af8c7f43abd3/net.certware.intent.state%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fstate%2FstateSpecification%2Futil%2FStateSpecificationSwitch.java", "changes": 46, "contents_url": "https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent.state%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fstate%2FstateSpecification%2Futil%2FStateSpecificationSwitch.java?ref=110fa3222ae2931978d7921dc8e6af8c7f43abd3", "deletions": 0, "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/stateSpecification/util/StateSpecificationSwitch.java", "new_code": " case StateSpecificationPackage.VALUE_RANGE:\n {\n ValueRange valueRange = (ValueRange)theEObject;\n T result = caseValueRange(valueRange);\n if (result == null) result = defaultCase(theEObject);\n return result;\n }\n case StateSpecificationPackage.VALUE_LIST:\n {\n ValueList valueList = (ValueList)theEObject;\n T result = caseValueList(valueList);\n if (result == null) result = defaultCase(theEObject);\n return result;\n }\n /**\n * Returns the result of interpreting the object as an instance of '<em>Value Range</em>'.\n * <!-- begin-user-doc -->\n * This implementation returns null;\n * returning a non-null result will terminate the switch.\n * <!-- end-user-doc -->\n * @param object the target of the switch.\n * @return the result of interpreting the object as an instance of '<em>Value Range</em>'.\n * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)\n * @generated\n */\n public T caseValueRange(ValueRange object)\n {\n return null;\n }\n\n /**\n * Returns the result of interpreting the object as an instance of '<em>Value List</em>'.\n * <!-- begin-user-doc -->\n * This implementation returns null;\n * returning a non-null result will terminate the switch.\n * <!-- end-user-doc -->\n * @param object the target of the switch.\n * @return the result of interpreting the object as an instance of '<em>Value List</em>'.\n * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)\n * @generated\n */\n public T caseValueList(ValueList object)\n {\n return null;\n }\n", "new_methods": [ { "arguments": [ "ValueRange object" ], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/stateSpecification/util/StateSpecificationSwitch.java", "implementation": "return null;", "signature": "T caseValueRange(ValueRange object)" }, { "arguments": [ "ValueList object" ], "filename": "net.certware.intent.state/src-gen/net/certware/intent/state/stateSpecification/util/StateSpecificationSwitch.java", "implementation": "return null;", "signature": "T caseValueList(ValueList object)" } ], "old_code": "", "old_methods": [], "patch": "@@ -205,6 +205,20 @@ protected T doSwitch(int classifierID, EObject theEObject)\n if (result == null) result = defaultCase(theEObject);\n return result;\n }\n+ case StateSpecificationPackage.VALUE_RANGE:\n+ {\n+ ValueRange valueRange = (ValueRange)theEObject;\n+ T result = caseValueRange(valueRange);\n+ if (result == null) result = defaultCase(theEObject);\n+ return result;\n+ }\n+ case StateSpecificationPackage.VALUE_LIST:\n+ {\n+ ValueList valueList = (ValueList)theEObject;\n+ T result = caseValueList(valueList);\n+ if (result == null) result = defaultCase(theEObject);\n+ return result;\n+ }\n case StateSpecificationPackage.OUTPUT:\n {\n Output output = (Output)theEObject;\n@@ -527,6 +541,38 @@ public T caseTriggerTable(TriggerTable object)\n return null;\n }\n \n+ /**\n+ * Returns the result of interpreting the object as an instance of '<em>Value Range</em>'.\n+ * <!-- begin-user-doc -->\n+ * This implementation returns null;\n+ * returning a non-null result will terminate the switch.\n+ * <!-- end-user-doc -->\n+ * @param object the target of the switch.\n+ * @return the result of interpreting the object as an instance of '<em>Value Range</em>'.\n+ * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)\n+ * @generated\n+ */\n+ public T caseValueRange(ValueRange object)\n+ {\n+ return null;\n+ }\n+\n+ /**\n+ * Returns the result of interpreting the object as an instance of '<em>Value List</em>'.\n+ * <!-- begin-user-doc -->\n+ * This implementation returns null;\n+ * returning a non-null result will terminate the switch.\n+ * <!-- end-user-doc -->\n+ * @param object the target of the switch.\n+ * @return the result of interpreting the object as an instance of '<em>Value List</em>'.\n+ * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)\n+ * @generated\n+ */\n+ public T caseValueList(ValueList object)\n+ {\n+ return null;\n+ }\n+\n /**\n * Returns the result of interpreting the object as an instance of '<em>Output</em>'.\n * <!-- begin-user-doc -->", "raw_url": "https://github.com/nasa/CertWare/raw/110fa3222ae2931978d7921dc8e6af8c7f43abd3/net.certware.intent.state%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fstate%2FstateSpecification%2Futil%2FStateSpecificationSwitch.java", "sha": "6254690f4afb17db174a9578a333671a2c76a7e8", "status": "modified" }, { "additions": 22, "blob_url": "https://github.com/nasa/CertWare/blob/110fa3222ae2931978d7921dc8e6af8c7f43abd3/net.certware.intent.state%2Fsrc%2Fnet%2Fcertware%2Fintent%2Fstate%2FStateSpecification.xtext", "changes": 32, "contents_url": "https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent.state%2Fsrc%2Fnet%2Fcertware%2Fintent%2Fstate%2FStateSpecification.xtext?ref=110fa3222ae2931978d7921dc8e6af8c7f43abd3", "deletions": 10, "filename": "net.certware.intent.state/src/net/certware/intent/state/StateSpecification.xtext", "new_code": "ValueRange:\n\t'{' lower=BigDecimalType '...' upper=BigDecimalType '}' 'type' rangeType=STRING 'units' rangeUnits=STRING '}'\n;\n\n\nValueList:\n\t'{' values+=STRING+ '}'\n;\n\n\t('range' range=ValueRange)?\n\t('value-list' valueList=ValueList)?\n\t('range' range=ValueRange)?\n\t('value-list' valueList=ValueList)?\n\t('value-exception' valueHandling=STRING)?\n\t('granularity' granularity=BigUnitValue)?\n\t('arrival-rate-avg' arrivalRateAvg=BigUnitValue)?\n\t('arrival-rate-minimum' arrivalRateMinimum=BigUnitValue)?\n\t('arrival-rate-maximum' arrivalRateMaximum=BigUnitValue)?\n\t('obsolescence' obsolescence=BigUnitValue)?\n\t('appears-in' appearsIn=STRING)?\n\t('description' description=STRING)?\n\t('triggering' structure=TriggerTable)?", "new_methods": [], "old_code": "\t(\n\t\t('range' '{' lower=BigDecimalType '...' upper=BigDecimalType '}' 'type' rangeType=STRING 'units' rangeUnits=STRING) | \n\t\t('values' '{' values+=STRING* '}')\n\t)\n\t(\n\t\t('range' '{' lower=BigDecimalType '...' upper=BigDecimalType '}' 'type' rangeType=STRING 'units' rangeUnits=STRING) | \n\t\t('values' '{' values+=STRING* '}')\n\t)\n\t('rate' rate=BigUnitValue)?\n\t('variables' variables=STRING)?", "old_methods": [], "patch": "@@ -129,12 +129,19 @@ TriggerTable:\n \trows+=Trigger*\n ;\n \n+ValueRange:\n+\t'{' lower=BigDecimalType '...' upper=BigDecimalType '}' 'type' rangeType=STRING 'units' rangeUnits=STRING '}'\n+;\n+\n+\n+ValueList:\n+\t'{' values+=STRING+ '}'\n+;\n+\n Output:\n \t{Output}\n-\t(\n-\t\t('range' '{' lower=BigDecimalType '...' upper=BigDecimalType '}' 'type' rangeType=STRING 'units' rangeUnits=STRING) | \n-\t\t('values' '{' values+=STRING* '}')\n-\t)\n+\t('range' range=ValueRange)?\n+\t('value-list' valueList=ValueList)?\n \t('rate' rate=BigUnitValue)?\n \t('initiation-delay' delay=BigUnitValue)?\n \t('completion-deadline' deadline=BigUnitValue)?\n@@ -153,12 +160,17 @@ Output:\n \n Input:\n \t{Input}\n-\t(\n-\t\t('range' '{' lower=BigDecimalType '...' upper=BigDecimalType '}' 'type' rangeType=STRING 'units' rangeUnits=STRING) | \n-\t\t('values' '{' values+=STRING* '}')\n-\t)\n-\t('rate' rate=BigUnitValue)?\n-\t('variables' variables=STRING)?\n+\t('range' range=ValueRange)?\n+\t('value-list' valueList=ValueList)?\n+\t('value-exception' valueHandling=STRING)?\n+\t('granularity' granularity=BigUnitValue)?\n+\t('arrival-rate-avg' arrivalRateAvg=BigUnitValue)?\n+\t('arrival-rate-minimum' arrivalRateMinimum=BigUnitValue)?\n+\t('arrival-rate-maximum' arrivalRateMaximum=BigUnitValue)?\n+\t('obsolescence' obsolescence=BigUnitValue)?\n \t('references' references=STRING)?\n+\t('appears-in' appearsIn=STRING)?\n+\t('description' description=STRING)?\n \t('comments' comments=STRING)?\n+\t('triggering' structure=TriggerTable)?\n ;", "raw_url": "https://github.com/nasa/CertWare/raw/110fa3222ae2931978d7921dc8e6af8c7f43abd3/net.certware.intent.state%2Fsrc%2Fnet%2Fcertware%2Fintent%2Fstate%2FStateSpecification.xtext", "sha": "22c9de910cb56bd92896a9893600790659437348", "status": "modified" } ]
22
[ { "name": "nasa$certware", "new_args": "", "new_implementation": "return cReferencesAssignment_13_1;", "new_return_type": "Assignment", "new_signature": "Assignment getReferencesAssignment_13_1()", "old_args": "", "old_implementation": "return cCommentsAssignment_13_1;", "old_return_type": "Assignment", "old_signature": "Assignment getCommentsAssignment_13_1()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cDescriptionAssignment_11_1;", "new_return_type": "Assignment", "new_signature": "Assignment getDescriptionAssignment_11_1()", "old_args": "", "old_implementation": "return cCommentsAssignment_5_1;", "old_return_type": "Assignment", "old_signature": "Assignment getCommentsAssignment_5_1()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cCommentsKeyword_14_0;", "new_return_type": "Keyword", "new_signature": "Keyword getCommentsKeyword_14_0()", "old_args": "", "old_implementation": "return cCommentsKeyword_13_0;", "old_return_type": "Keyword", "old_signature": "Keyword getCommentsKeyword_13_0()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cArrivalRateMaximumKeyword_7_0;", "new_return_type": "Keyword", "new_signature": "Keyword getArrivalRateMaximumKeyword_7_0()", "old_args": "", "old_implementation": "return cCommentsKeyword_5_0;", "old_return_type": "Keyword", "old_signature": "Keyword getCommentsKeyword_5_0()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cCommentsSTRINGTerminalRuleCall_14_1_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getCommentsSTRINGTerminalRuleCall_14_1_0()", "old_args": "", "old_implementation": "return cCommentsSTRINGTerminalRuleCall_13_1_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getCommentsSTRINGTerminalRuleCall_13_1_0()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cStructureTriggerTableParserRuleCall_13_1_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getStructureTriggerTableParserRuleCall_13_1_0()", "old_args": "", "old_implementation": "return cCommentsSTRINGTerminalRuleCall_5_1_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getCommentsSTRINGTerminalRuleCall_5_1_0()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cCompletionDeadlineKeyword_5_0;", "new_return_type": "Keyword", "new_signature": "Keyword getCompletionDeadlineKeyword_5_0()", "old_args": "", "old_implementation": "return cCompletionDeadlineKeyword_4_0;", "old_return_type": "Keyword", "old_signature": "Keyword getCompletionDeadlineKeyword_4_0()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cCompletionExceptionKeyword_6_0;", "new_return_type": "Keyword", "new_signature": "Keyword getCompletionExceptionKeyword_6_0()", "old_args": "", "old_implementation": "return cCompletionExceptionKeyword_5_0;", "old_return_type": "Keyword", "old_signature": "Keyword getCompletionExceptionKeyword_5_0()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cCompletionHandlingAssignment_6_1;", "new_return_type": "Assignment", "new_signature": "Assignment getCompletionHandlingAssignment_6_1()", "old_args": "", "old_implementation": "return cCompletionHandlingAssignment_5_1;", "old_return_type": "Assignment", "old_signature": "Assignment getCompletionHandlingAssignment_5_1()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cCompletionHandlingSTRINGTerminalRuleCall_6_1_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getCompletionHandlingSTRINGTerminalRuleCall_6_1_0()", "old_args": "", "old_implementation": "return cCompletionHandlingSTRINGTerminalRuleCall_5_1_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getCompletionHandlingSTRINGTerminalRuleCall_5_1_0()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cCommentsAssignment_14_1;", "new_return_type": "Assignment", "new_signature": "Assignment getCommentsAssignment_14_1()", "old_args": "", "old_implementation": "return cContentsAssignment_14_1;", "old_return_type": "Assignment", "old_signature": "Assignment getContentsAssignment_14_1()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cContentsKeyword_15_0;", "new_return_type": "Keyword", "new_signature": "Keyword getContentsKeyword_15_0()", "old_args": "", "old_implementation": "return cContentsKeyword_14_0;", "old_return_type": "Keyword", "old_signature": "Keyword getContentsKeyword_14_0()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cContentsSTRINGTerminalRuleCall_15_1_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getContentsSTRINGTerminalRuleCall_15_1_0()", "old_args": "", "old_implementation": "return cContentsSTRINGTerminalRuleCall_14_1_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getContentsSTRINGTerminalRuleCall_14_1_0()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cDelayAssignment_4_1;", "new_return_type": "Assignment", "new_signature": "Assignment getDelayAssignment_4_1()", "old_args": "", "old_implementation": "return cDeadlineAssignment_4_1;", "old_return_type": "Assignment", "old_signature": "Assignment getDeadlineAssignment_4_1()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cRateBigUnitValueParserRuleCall_3_1_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getRateBigUnitValueParserRuleCall_3_1_0()", "old_args": "", "old_implementation": "return cDeadlineBigUnitValueParserRuleCall_4_1_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getDeadlineBigUnitValueParserRuleCall_4_1_0()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cRateAssignment_3_1;", "new_return_type": "Assignment", "new_signature": "Assignment getRateAssignment_3_1()", "old_args": "", "old_implementation": "return cDelayAssignment_3_1;", "old_return_type": "Assignment", "old_signature": "Assignment getDelayAssignment_3_1()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cValueListValueListParserRuleCall_2_1_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getValueListValueListParserRuleCall_2_1_0()", "old_args": "", "old_implementation": "return cDelayBigUnitValueParserRuleCall_3_1_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getDelayBigUnitValueParserRuleCall_3_1_0()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cFeebackHandlingAssignment_11_1;", "new_return_type": "Assignment", "new_signature": "Assignment getFeebackHandlingAssignment_11_1()", "old_args": "", "old_implementation": "return cFeebackHandlingAssignment_10_1;", "old_return_type": "Assignment", "old_signature": "Assignment getFeebackHandlingAssignment_10_1()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cFeebackHandlingSTRINGTerminalRuleCall_11_1_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getFeebackHandlingSTRINGTerminalRuleCall_11_1_0()", "old_args": "", "old_implementation": "return cFeebackHandlingSTRINGTerminalRuleCall_10_1_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getFeebackHandlingSTRINGTerminalRuleCall_10_1_0()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cFeedbackExceptionKeyword_11_0;", "new_return_type": "Keyword", "new_signature": "Keyword getFeedbackExceptionKeyword_11_0()", "old_args": "", "old_implementation": "return cFeedbackExceptionKeyword_10_0;", "old_return_type": "Keyword", "old_signature": "Keyword getFeedbackExceptionKeyword_10_0()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cValueExceptionKeyword_3_0;", "new_return_type": "Keyword", "new_signature": "Keyword getValueExceptionKeyword_3_0()", "old_args": "", "old_implementation": "return cFullStopFullStopFullStopKeyword_1_0_3;", "old_return_type": "Keyword", "old_signature": "Keyword getFullStopFullStopFullStopKeyword_1_0_3()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cGroup_1;", "new_return_type": "Group", "new_signature": "Group getGroup_1()", "old_args": "", "old_implementation": "return cGroup_1_0;", "old_return_type": "Group", "old_signature": "Group getGroup_1_0()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cGroup_10;", "new_return_type": "Group", "new_signature": "Group getGroup_10()", "old_args": "", "old_implementation": "return cGroup_1_0;", "old_return_type": "Group", "old_signature": "Group getGroup_1_0()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cGroup_11;", "new_return_type": "Group", "new_signature": "Group getGroup_11()", "old_args": "", "old_implementation": "return cGroup_1_1;", "old_return_type": "Group", "old_signature": "Group getGroup_1_1()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cInitiationDelayKeyword_4_0;", "new_return_type": "Keyword", "new_signature": "Keyword getInitiationDelayKeyword_4_0()", "old_args": "", "old_implementation": "return cInitiationDelayKeyword_3_0;", "old_return_type": "Keyword", "old_signature": "Keyword getInitiationDelayKeyword_3_0()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cReferencesKeyword_9_0;", "new_return_type": "Keyword", "new_signature": "Keyword getReferencesKeyword_9_0()", "old_args": "", "old_implementation": "return cLeftCurlyBracketKeyword_1_0_1;", "old_return_type": "Keyword", "old_signature": "Keyword getLeftCurlyBracketKeyword_1_0_1()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cDescriptionKeyword_11_0;", "new_return_type": "Keyword", "new_signature": "Keyword getDescriptionKeyword_11_0()", "old_args": "", "old_implementation": "return cLeftCurlyBracketKeyword_1_1_1;", "old_return_type": "Keyword", "old_signature": "Keyword getLeftCurlyBracketKeyword_1_1_1()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cRangeAssignment_1_1;", "new_return_type": "Assignment", "new_signature": "Assignment getRangeAssignment_1_1()", "old_args": "", "old_implementation": "return cLowerAssignment_1_0_2;", "old_return_type": "Assignment", "old_signature": "Assignment getLowerAssignment_1_0_2()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cMinResponseBigUnitValueParserRuleCall_9_1_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getMinResponseBigUnitValueParserRuleCall_9_1_0()", "old_args": "", "old_implementation": "return cLowerBigDecimalTypeParserRuleCall_1_0_2_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getLowerBigDecimalTypeParserRuleCall_1_0_2_0()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cRangeValueRangeParserRuleCall_1_1_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getRangeValueRangeParserRuleCall_1_1_0()", "old_args": "", "old_implementation": "return cLowerBigDecimalTypeParserRuleCall_1_0_2_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getLowerBigDecimalTypeParserRuleCall_1_0_2_0()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cMinResponseAssignment_9_1;", "new_return_type": "Assignment", "new_signature": "Assignment getMinResponseAssignment_9_1()", "old_args": "", "old_implementation": "return cMaxResponseAssignment_9_1;", "old_return_type": "Assignment", "old_signature": "Assignment getMaxResponseAssignment_9_1()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cDeadlineBigUnitValueParserRuleCall_5_1_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getDeadlineBigUnitValueParserRuleCall_5_1_0()", "old_args": "", "old_implementation": "return cMaxResponseBigUnitValueParserRuleCall_9_1_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getMaxResponseBigUnitValueParserRuleCall_9_1_0()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cMaxResponseTimeKeyword_10_0;", "new_return_type": "Keyword", "new_signature": "Keyword getMaxResponseTimeKeyword_10_0()", "old_args": "", "old_implementation": "return cMaxResponseTimeKeyword_9_0;", "old_return_type": "Keyword", "old_signature": "Keyword getMaxResponseTimeKeyword_9_0()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cRelationshipAssignment_8_1;", "new_return_type": "Assignment", "new_signature": "Assignment getRelationshipAssignment_8_1()", "old_args": "", "old_implementation": "return cMinResponseAssignment_8_1;", "old_return_type": "Assignment", "old_signature": "Assignment getMinResponseAssignment_8_1()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cDelayBigUnitValueParserRuleCall_4_1_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getDelayBigUnitValueParserRuleCall_4_1_0()", "old_args": "", "old_implementation": "return cMinResponseBigUnitValueParserRuleCall_8_1_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getMinResponseBigUnitValueParserRuleCall_8_1_0()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cMinResponseTimeKeyword_9_0;", "new_return_type": "Keyword", "new_signature": "Keyword getMinResponseTimeKeyword_9_0()", "old_args": "", "old_implementation": "return cMinResponseTimeKeyword_8_0;", "old_return_type": "Keyword", "old_signature": "Keyword getMinResponseTimeKeyword_8_0()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cRangeKeyword_1_0;", "new_return_type": "Keyword", "new_signature": "Keyword getRangeKeyword_1_0()", "old_args": "", "old_implementation": "return cRangeKeyword_1_0_0;", "old_return_type": "Keyword", "old_signature": "Keyword getRangeKeyword_1_0_0()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cRangeKeyword_1_0;", "new_return_type": "Keyword", "new_signature": "Keyword getRangeKeyword_1_0()", "old_args": "", "old_implementation": "return cRangeKeyword_1_0_0;", "old_return_type": "Keyword", "old_signature": "Keyword getRangeKeyword_1_0_0()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cValueListAssignment_2_1;", "new_return_type": "Assignment", "new_signature": "Assignment getValueListAssignment_2_1()", "old_args": "", "old_implementation": "return cRangeTypeAssignment_1_0_7;", "old_return_type": "Assignment", "old_signature": "Assignment getRangeTypeAssignment_1_0_7()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cAppearsInSTRINGTerminalRuleCall_10_1_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getAppearsInSTRINGTerminalRuleCall_10_1_0()", "old_args": "", "old_implementation": "return cRangeTypeSTRINGTerminalRuleCall_1_0_7_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getRangeTypeSTRINGTerminalRuleCall_1_0_7_0()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cCommentsAssignment_12_1;", "new_return_type": "Assignment", "new_signature": "Assignment getCommentsAssignment_12_1()", "old_args": "", "old_implementation": "return cRangeUnitsAssignment_1_0_9;", "old_return_type": "Assignment", "old_signature": "Assignment getRangeUnitsAssignment_1_0_9()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cCommentsSTRINGTerminalRuleCall_12_1_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getCommentsSTRINGTerminalRuleCall_12_1_0()", "old_args": "", "old_implementation": "return cRangeUnitsSTRINGTerminalRuleCall_1_0_9_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getRangeUnitsSTRINGTerminalRuleCall_1_0_9_0()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cRangeAssignment_1_1;", "new_return_type": "Assignment", "new_signature": "Assignment getRangeAssignment_1_1()", "old_args": "", "old_implementation": "return cRateAssignment_2_1;", "old_return_type": "Assignment", "old_signature": "Assignment getRateAssignment_2_1()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cReferencesAssignment_9_1;", "new_return_type": "Assignment", "new_signature": "Assignment getReferencesAssignment_9_1()", "old_args": "", "old_implementation": "return cRateAssignment_2_1;", "old_return_type": "Assignment", "old_signature": "Assignment getRateAssignment_2_1()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cGranularityBigUnitValueParserRuleCall_4_1_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getGranularityBigUnitValueParserRuleCall_4_1_0()", "old_args": "", "old_implementation": "return cRateBigUnitValueParserRuleCall_2_1_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getRateBigUnitValueParserRuleCall_2_1_0()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cRangeValueRangeParserRuleCall_1_1_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getRangeValueRangeParserRuleCall_1_1_0()", "old_args": "", "old_implementation": "return cRateBigUnitValueParserRuleCall_2_1_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getRateBigUnitValueParserRuleCall_2_1_0()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cArrivalRateAvgKeyword_5_0;", "new_return_type": "Keyword", "new_signature": "Keyword getArrivalRateAvgKeyword_5_0()", "old_args": "", "old_implementation": "return cRateKeyword_2_0;", "old_return_type": "Keyword", "old_signature": "Keyword getRateKeyword_2_0()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cRateKeyword_3_0;", "new_return_type": "Keyword", "new_signature": "Keyword getRateKeyword_3_0()", "old_args": "", "old_implementation": "return cRateKeyword_2_0;", "old_return_type": "Keyword", "old_signature": "Keyword getRateKeyword_2_0()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cReversedAssignment_12_1;", "new_return_type": "Assignment", "new_signature": "Assignment getReversedAssignment_12_1()", "old_args": "", "old_implementation": "return cReferencesAssignment_12_1;", "old_return_type": "Assignment", "old_signature": "Assignment getReferencesAssignment_12_1()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cObsolescenceAssignment_8_1;", "new_return_type": "Assignment", "new_signature": "Assignment getObsolescenceAssignment_8_1()", "old_args": "", "old_implementation": "return cReferencesAssignment_4_1;", "old_return_type": "Assignment", "old_signature": "Assignment getReferencesAssignment_4_1()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cReferencesKeyword_13_0;", "new_return_type": "Keyword", "new_signature": "Keyword getReferencesKeyword_13_0()", "old_args": "", "old_implementation": "return cReferencesKeyword_12_0;", "old_return_type": "Keyword", "old_signature": "Keyword getReferencesKeyword_12_0()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cArrivalRateMinimumKeyword_6_0;", "new_return_type": "Keyword", "new_signature": "Keyword getArrivalRateMinimumKeyword_6_0()", "old_args": "", "old_implementation": "return cReferencesKeyword_4_0;", "old_return_type": "Keyword", "old_signature": "Keyword getReferencesKeyword_4_0()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cReferencesSTRINGTerminalRuleCall_13_1_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getReferencesSTRINGTerminalRuleCall_13_1_0()", "old_args": "", "old_implementation": "return cReferencesSTRINGTerminalRuleCall_12_1_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getReferencesSTRINGTerminalRuleCall_12_1_0()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cDescriptionSTRINGTerminalRuleCall_11_1_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getDescriptionSTRINGTerminalRuleCall_11_1_0()", "old_args": "", "old_implementation": "return cReferencesSTRINGTerminalRuleCall_4_1_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getReferencesSTRINGTerminalRuleCall_4_1_0()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cVariablesAssignment_7_1;", "new_return_type": "Assignment", "new_signature": "Assignment getVariablesAssignment_7_1()", "old_args": "", "old_implementation": "return cRelationshipAssignment_7_1;", "old_return_type": "Assignment", "old_signature": "Assignment getRelationshipAssignment_7_1()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cRelationshipKeyword_8_0;", "new_return_type": "Keyword", "new_signature": "Keyword getRelationshipKeyword_8_0()", "old_args": "", "old_implementation": "return cRelationshipKeyword_7_0;", "old_return_type": "Keyword", "old_signature": "Keyword getRelationshipKeyword_7_0()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cRelationshipSTRINGTerminalRuleCall_8_1_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getRelationshipSTRINGTerminalRuleCall_8_1_0()", "old_args": "", "old_implementation": "return cRelationshipSTRINGTerminalRuleCall_7_1_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getRelationshipSTRINGTerminalRuleCall_7_1_0()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cMaxResponseAssignment_10_1;", "new_return_type": "Assignment", "new_signature": "Assignment getMaxResponseAssignment_10_1()", "old_args": "", "old_implementation": "return cReversedAssignment_11_1;", "old_return_type": "Assignment", "old_signature": "Assignment getReversedAssignment_11_1()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cReversedByKeyword_12_0;", "new_return_type": "Keyword", "new_signature": "Keyword getReversedByKeyword_12_0()", "old_args": "", "old_implementation": "return cReversedByKeyword_11_0;", "old_return_type": "Keyword", "old_signature": "Keyword getReversedByKeyword_11_0()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cReversedSTRINGTerminalRuleCall_12_1_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getReversedSTRINGTerminalRuleCall_12_1_0()", "old_args": "", "old_implementation": "return cReversedSTRINGTerminalRuleCall_11_1_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getReversedSTRINGTerminalRuleCall_11_1_0()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cGranularityKeyword_4_0;", "new_return_type": "Keyword", "new_signature": "Keyword getGranularityKeyword_4_0()", "old_args": "", "old_implementation": "return cRightCurlyBracketKeyword_1_0_5;", "old_return_type": "Keyword", "old_signature": "Keyword getRightCurlyBracketKeyword_1_0_5()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cTriggeringKeyword_13_0;", "new_return_type": "Keyword", "new_signature": "Keyword getTriggeringKeyword_13_0()", "old_args": "", "old_implementation": "return cRightCurlyBracketKeyword_1_1_3;", "old_return_type": "Keyword", "old_signature": "Keyword getRightCurlyBracketKeyword_1_1_3()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cContentsAssignment_15_1;", "new_return_type": "Assignment", "new_signature": "Assignment getContentsAssignment_15_1()", "old_args": "", "old_implementation": "return cTableAssignment_15_1;", "old_return_type": "Assignment", "old_signature": "Assignment getTableAssignment_15_1()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cTableTriggerTableParserRuleCall_16_1_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getTableTriggerTableParserRuleCall_16_1_0()", "old_args": "", "old_implementation": "return cTableTriggerTableParserRuleCall_15_1_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getTableTriggerTableParserRuleCall_15_1_0()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cTriggeringKeyword_16_0;", "new_return_type": "Keyword", "new_signature": "Keyword getTriggeringKeyword_16_0()", "old_args": "", "old_implementation": "return cTriggeringKeyword_15_0;", "old_return_type": "Keyword", "old_signature": "Keyword getTriggeringKeyword_15_0()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cAppearsInKeyword_10_0;", "new_return_type": "Keyword", "new_signature": "Keyword getAppearsInKeyword_10_0()", "old_args": "", "old_implementation": "return cTypeKeyword_1_0_6;", "old_return_type": "Keyword", "old_signature": "Keyword getTypeKeyword_1_0_6()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cCommentsKeyword_12_0;", "new_return_type": "Keyword", "new_signature": "Keyword getCommentsKeyword_12_0()", "old_args": "", "old_implementation": "return cUnitsKeyword_1_0_8;", "old_return_type": "Keyword", "old_signature": "Keyword getUnitsKeyword_1_0_8()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cAppearsInAssignment_10_1;", "new_return_type": "Assignment", "new_signature": "Assignment getAppearsInAssignment_10_1()", "old_args": "", "old_implementation": "return cUpperAssignment_1_0_4;", "old_return_type": "Assignment", "old_signature": "Assignment getUpperAssignment_1_0_4()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cMaxResponseBigUnitValueParserRuleCall_10_1_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getMaxResponseBigUnitValueParserRuleCall_10_1_0()", "old_args": "", "old_implementation": "return cUpperBigDecimalTypeParserRuleCall_1_0_4_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getUpperBigDecimalTypeParserRuleCall_1_0_4_0()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cValueListValueListParserRuleCall_2_1_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getValueListValueListParserRuleCall_2_1_0()", "old_args": "", "old_implementation": "return cUpperBigDecimalTypeParserRuleCall_1_0_4_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getUpperBigDecimalTypeParserRuleCall_1_0_4_0()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cValueHandlingAssignment_3_1;", "new_return_type": "Assignment", "new_signature": "Assignment getValueHandlingAssignment_3_1()", "old_args": "", "old_implementation": "return cValuesAssignment_1_1_2;", "old_return_type": "Assignment", "old_signature": "Assignment getValuesAssignment_1_1_2()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cValueListAssignment_2_1;", "new_return_type": "Assignment", "new_signature": "Assignment getValueListAssignment_2_1()", "old_args": "", "old_implementation": "return cValuesAssignment_1_1_2;", "old_return_type": "Assignment", "old_signature": "Assignment getValuesAssignment_1_1_2()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cValueListKeyword_2_0;", "new_return_type": "Keyword", "new_signature": "Keyword getValueListKeyword_2_0()", "old_args": "", "old_implementation": "return cValuesKeyword_1_1_0;", "old_return_type": "Keyword", "old_signature": "Keyword getValuesKeyword_1_1_0()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cValueListKeyword_2_0;", "new_return_type": "Keyword", "new_signature": "Keyword getValueListKeyword_2_0()", "old_args": "", "old_implementation": "return cValuesKeyword_1_1_0;", "old_return_type": "Keyword", "old_signature": "Keyword getValuesKeyword_1_1_0()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cValueHandlingSTRINGTerminalRuleCall_3_1_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getValueHandlingSTRINGTerminalRuleCall_3_1_0()", "old_args": "", "old_implementation": "return cValuesSTRINGTerminalRuleCall_1_1_2_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getValuesSTRINGTerminalRuleCall_1_1_2_0()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cStructureAssignment_13_1;", "new_return_type": "Assignment", "new_signature": "Assignment getStructureAssignment_13_1()", "old_args": "", "old_implementation": "return cVariablesAssignment_3_1;", "old_return_type": "Assignment", "old_signature": "Assignment getVariablesAssignment_3_1()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cDeadlineAssignment_5_1;", "new_return_type": "Assignment", "new_signature": "Assignment getDeadlineAssignment_5_1()", "old_args": "", "old_implementation": "return cVariablesAssignment_6_1;", "old_return_type": "Assignment", "old_signature": "Assignment getVariablesAssignment_6_1()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cObsolescenceKeyword_8_0;", "new_return_type": "Keyword", "new_signature": "Keyword getObsolescenceKeyword_8_0()", "old_args": "", "old_implementation": "return cVariablesKeyword_3_0;", "old_return_type": "Keyword", "old_signature": "Keyword getVariablesKeyword_3_0()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cVariablesKeyword_7_0;", "new_return_type": "Keyword", "new_signature": "Keyword getVariablesKeyword_7_0()", "old_args": "", "old_implementation": "return cVariablesKeyword_6_0;", "old_return_type": "Keyword", "old_signature": "Keyword getVariablesKeyword_6_0()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cReferencesSTRINGTerminalRuleCall_9_1_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getReferencesSTRINGTerminalRuleCall_9_1_0()", "old_args": "", "old_implementation": "return cVariablesSTRINGTerminalRuleCall_3_1_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getVariablesSTRINGTerminalRuleCall_3_1_0()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cVariablesSTRINGTerminalRuleCall_7_1_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getVariablesSTRINGTerminalRuleCall_7_1_0()", "old_args": "", "old_implementation": "return cVariablesSTRINGTerminalRuleCall_6_1_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getVariablesSTRINGTerminalRuleCall_6_1_0()" } ]
81
195
14da817cf7cc74de98af1649d9dde7da3b4b6c7d
[ { "name": "adangel$pmd", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void start()", "old_args": "Writer writer,Report report", "old_implementation": null, "old_return_type": "void", "old_signature": "void render(Writer writer,Report report)" }, { "name": "adangel$pmd", "new_args": "", "new_implementation": "Report report = new Report();\n ctx.setReport(report);\n\n report.addError(\n report.addError(\n report.addError(\n return report;\n public static void processFiles(int threadCount, RuleSetFactory ruleSetFactory, SourceType sourceType, List<DataSource> files, RuleContext ctx,\n Renderer renderer, String rulesets, boolean debugEnabled, final boolean shortNamesEnabled, final String inputPath,\n List<Future<Report>> tasks = new LinkedList<Future<Report>>();\n \n Collections.sort(files, new Comparator<DataSource>() {\n public int compare(DataSource d1,DataSource d2) {\n String s1 = d1.getNiceFileName(shortNamesEnabled, inputPath);\n String s2 = d2.getNiceFileName(shortNamesEnabled, inputPath);\n return s1.compareTo(s2);", "new_return_type": "Report", "new_signature": "Report call()", "old_args": "", "old_implementation": "ctx.getReport().addError(\n ctx.getReport().addError(\n ctx.getReport().addError(\n context.setReport(new Report());\n public static void processFiles(int threadCount, RuleSetFactory ruleSetFactory, SourceType sourceType, List<DataSource> files, RuleContext ctx, String rulesets,\n boolean debugEnabled, boolean shortNamesEnabled, String inputPath,\n Runnable r = new PmdRunnable(executor, dataSource, niceFileName, sourceType, debugEnabled,\n executor.execute(r);\n try {\n executor.awaitTermination(Long.MAX_VALUE, TimeUnit.NANOSECONDS);", "old_return_type": "void", "old_signature": "void run()" } ]
[ { "additions": 1, "blob_url": "https://github.com/adangel/pmd/blob/14da817cf7cc74de98af1649d9dde7da3b4b6c7d/pmd%2Fetc%2Fchangelog.txt", "changes": 1, "contents_url": "https://api.github.com/repos/adangel/pmd/contents/pmd%2Fetc%2Fchangelog.txt?ref=14da817cf7cc74de98af1649d9dde7da3b4b6c7d", "deletions": 0, "filename": "pmd/etc/changelog.txt", "new_code": "Memory footprint reduced: most renderers now use less memory by generating reports on the fly.", "new_methods": [], "old_code": "", "old_methods": [], "patch": "@@ -28,6 +28,7 @@ PMD now requires JDK 1.5 to be compiled. Java 1.4 support is provided using Retr\n - PMD will still analyze code from earlier JDKs\n - to run pmd with 1.4, use the files from the java14 directory (weaved pmd jar and support files)\n TypeResolution now looks at some ASTName nodes.\n+Memory footprint reduced: most renderers now use less memory by generating reports on the fly.\n \n December 19, 2006 - 3.9:\n New rules:", "raw_url": "https://github.com/adangel/pmd/raw/14da817cf7cc74de98af1649d9dde7da3b4b6c7d/pmd%2Fetc%2Fchangelog.txt", "sha": "d586695272f75bddde46ecfdc57e098666d20720", "status": "modified" }, { "additions": 0, "blob_url": "https://github.com/adangel/pmd/blob/14da817cf7cc74de98af1649d9dde7da3b4b6c7d/pmd%2Fregress%2Ftest%2Fnet%2Fsourceforge%2Fpmd%2Frenderers%2FSummaryHTMLRendererTest.java", "changes": 4, "contents_url": "https://api.github.com/repos/adangel/pmd/contents/pmd%2Fregress%2Ftest%2Fnet%2Fsourceforge%2Fpmd%2Frenderers%2FSummaryHTMLRendererTest.java?ref=14da817cf7cc74de98af1649d9dde7da3b4b6c7d", "deletions": 4, "filename": "pmd/regress/test/net/sourceforge/pmd/renderers/SummaryHTMLRendererTest.java", "new_code": "", "new_methods": [], "old_code": " \"<th>#</th><th>File</th><th>Line</th><th>Problem</th></tr>\" + PMD.EOL + \n \"<th>#</th><th>File</th><th>Line</th><th>Problem</th></tr>\" + PMD.EOL + \n \"<th>#</th><th>File</th><th>Line</th><th>Problem</th></tr>\" + PMD.EOL + \n \"<th>#</th><th>File</th><th>Line</th><th>Problem</th></tr>\" + PMD.EOL + ", "old_methods": [], "patch": "@@ -14,7 +14,6 @@ public AbstractRenderer getRenderer() {\n public String getExpected() {\n return \"<html><head><title>PMD</title></head><body>\" + PMD.EOL + \n \"<h2><center>Summary</h2></center><table align=\\\"center\\\" cellspacing=\\\"0\\\" cellpadding=\\\"3\\\"><th>Rule name</th><th>Number of violations</th><tr><td>Foo</td><td align=center>1</td></tr></table><h2><center>Detail</h2></center><table align=\\\"center\\\" cellspacing=\\\"0\\\" cellpadding=\\\"3\\\"><tr>\" + PMD.EOL + \n- \"<th>#</th><th>File</th><th>Line</th><th>Problem</th></tr>\" + PMD.EOL + \n \"<center><h3>PMD report</h3></center><center><h3>Problems found</h3></center><table align=\\\"center\\\" cellspacing=\\\"0\\\" cellpadding=\\\"3\\\"><tr>\" + PMD.EOL + \n \"<th>#</th><th>File</th><th>Line</th><th>Problem</th></tr>\" + PMD.EOL + \n \"<tr bgcolor=\\\"lightgrey\\\"> \" + PMD.EOL + \n@@ -30,7 +29,6 @@ public String getExpected() {\n public String getExpectedEmpty() {\n return \"<html><head><title>PMD</title></head><body>\" + PMD.EOL + \n \"<h2><center>Summary</h2></center><table align=\\\"center\\\" cellspacing=\\\"0\\\" cellpadding=\\\"3\\\"><th>Rule name</th><th>Number of violations</th></table><h2><center>Detail</h2></center><table align=\\\"center\\\" cellspacing=\\\"0\\\" cellpadding=\\\"3\\\"><tr>\" + PMD.EOL + \n- \"<th>#</th><th>File</th><th>Line</th><th>Problem</th></tr>\" + PMD.EOL + \n \"<center><h3>PMD report</h3></center><center><h3>Problems found</h3></center><table align=\\\"center\\\" cellspacing=\\\"0\\\" cellpadding=\\\"3\\\"><tr>\" + PMD.EOL + \n \"<th>#</th><th>File</th><th>Line</th><th>Problem</th></tr>\" + PMD.EOL + \n \"</table></table></body></html>\";\n@@ -39,7 +37,6 @@ public String getExpectedEmpty() {\n public String getExpectedMultiple() {\n return \"<html><head><title>PMD</title></head><body>\" + PMD.EOL + \n \"<h2><center>Summary</h2></center><table align=\\\"center\\\" cellspacing=\\\"0\\\" cellpadding=\\\"3\\\"><th>Rule name</th><th>Number of violations</th><tr><td>Foo</td><td align=center>2</td></tr></table><h2><center>Detail</h2></center><table align=\\\"center\\\" cellspacing=\\\"0\\\" cellpadding=\\\"3\\\"><tr>\" + PMD.EOL + \n- \"<th>#</th><th>File</th><th>Line</th><th>Problem</th></tr>\" + PMD.EOL + \n \"<center><h3>PMD report</h3></center><center><h3>Problems found</h3></center><table align=\\\"center\\\" cellspacing=\\\"0\\\" cellpadding=\\\"3\\\"><tr>\" + PMD.EOL + \n \"<th>#</th><th>File</th><th>Line</th><th>Problem</th></tr>\" + PMD.EOL + \n \"<tr bgcolor=\\\"lightgrey\\\"> \" + PMD.EOL + \n@@ -60,7 +57,6 @@ public String getExpectedMultiple() {\n public String getExpectedError(ProcessingError error) {\n return \"<html><head><title>PMD</title></head><body>\" + PMD.EOL + \n \"<h2><center>Summary</h2></center><table align=\\\"center\\\" cellspacing=\\\"0\\\" cellpadding=\\\"3\\\"><th>Rule name</th><th>Number of violations</th></table><h2><center>Detail</h2></center><table align=\\\"center\\\" cellspacing=\\\"0\\\" cellpadding=\\\"3\\\"><tr>\" + PMD.EOL + \n- \"<th>#</th><th>File</th><th>Line</th><th>Problem</th></tr>\" + PMD.EOL + \n \"<center><h3>PMD report</h3></center><center><h3>Problems found</h3></center><table align=\\\"center\\\" cellspacing=\\\"0\\\" cellpadding=\\\"3\\\"><tr>\" + PMD.EOL + \n \"<th>#</th><th>File</th><th>Line</th><th>Problem</th></tr>\" + PMD.EOL + \n \"</table><hr/><center><h3>Processing errors</h3></center><table align=\\\"center\\\" cellspacing=\\\"0\\\" cellpadding=\\\"3\\\"><tr>\" + PMD.EOL + ", "raw_url": "https://github.com/adangel/pmd/raw/14da817cf7cc74de98af1649d9dde7da3b4b6c7d/pmd%2Fregress%2Ftest%2Fnet%2Fsourceforge%2Fpmd%2Frenderers%2FSummaryHTMLRendererTest.java", "sha": "a0d375e826b6bc0d7efec9c26c2b98282b01f3e9", "status": "modified" }, { "additions": 8, "blob_url": "https://github.com/adangel/pmd/blob/14da817cf7cc74de98af1649d9dde7da3b4b6c7d/pmd%2Fregress%2Ftest%2Fnet%2Fsourceforge%2Fpmd%2Frenderers%2FVBHTMLRendererTest.java", "changes": 9, "contents_url": "https://api.github.com/repos/adangel/pmd/contents/pmd%2Fregress%2Ftest%2Fnet%2Fsourceforge%2Fpmd%2Frenderers%2FVBHTMLRendererTest.java?ref=14da817cf7cc74de98af1649d9dde7da3b4b6c7d", "deletions": 1, "filename": "pmd/regress/test/net/sourceforge/pmd/renderers/VBHTMLRendererTest.java", "new_code": " return \"<html><head><title>PMD</title></head><style type=\\\"text/css\\\"><!--\" + PMD.EOL + \n \"body { background-color: white; font-family:verdana, arial, helvetica, geneva; font-size: 16px; font-style: italic; color: black; }\" + PMD.EOL + \n \".title { font-family: verdana, arial, helvetica,geneva; font-size: 12px; font-weight:bold; color: white; }\" + PMD.EOL + \n \".body { font-family: verdana, arial, helvetica, geneva; font-size: 12px; font-weight:plain; color: black; }\" + PMD.EOL + \n \"#TableHeader { background-color: #003366; }\" + PMD.EOL + \n \"#RowColor1 { background-color: #eeeeee; }\" + PMD.EOL + \n \"#RowColor2 { background-color: white; }\" + PMD.EOL + \n \"--></style><body><center><br></center></body></html>\";", "new_methods": [], "old_code": " return \"\";", "old_methods": [], "patch": "@@ -25,7 +25,14 @@ public String getExpected() {\n }\n \n public String getExpectedEmpty() {\n- return \"\";\n+ return \"<html><head><title>PMD</title></head><style type=\\\"text/css\\\"><!--\" + PMD.EOL + \n+ \"body { background-color: white; font-family:verdana, arial, helvetica, geneva; font-size: 16px; font-style: italic; color: black; }\" + PMD.EOL + \n+ \".title { font-family: verdana, arial, helvetica,geneva; font-size: 12px; font-weight:bold; color: white; }\" + PMD.EOL + \n+ \".body { font-family: verdana, arial, helvetica, geneva; font-size: 12px; font-weight:plain; color: black; }\" + PMD.EOL + \n+ \"#TableHeader { background-color: #003366; }\" + PMD.EOL + \n+ \"#RowColor1 { background-color: #eeeeee; }\" + PMD.EOL + \n+ \"#RowColor2 { background-color: white; }\" + PMD.EOL + \n+ \"--></style><body><center><br></center></body></html>\";\n }\n \n public String getExpectedMultiple() {", "raw_url": "https://github.com/adangel/pmd/raw/14da817cf7cc74de98af1649d9dde7da3b4b6c7d/pmd%2Fregress%2Ftest%2Fnet%2Fsourceforge%2Fpmd%2Frenderers%2FVBHTMLRendererTest.java", "sha": "1976603b63d82b6f5eb834e6180e18937372e113", "status": "modified" }, { "additions": 86, "blob_url": "https://github.com/adangel/pmd/blob/14da817cf7cc74de98af1649d9dde7da3b4b6c7d/pmd%2Fsrc%2Fnet%2Fsourceforge%2Fpmd%2FPMD.java", "changes": 135, "contents_url": "https://api.github.com/repos/adangel/pmd/contents/pmd%2Fsrc%2Fnet%2Fsourceforge%2Fpmd%2FPMD.java?ref=14da817cf7cc74de98af1649d9dde7da3b4b6c7d", "deletions": 49, "filename": "pmd/src/net/sourceforge/pmd/PMD.java", "new_code": "import java.util.Comparator;\nimport java.util.concurrent.Callable;\nimport java.util.concurrent.ExecutionException;\nimport java.util.concurrent.Future;\n long reportStart, reportEnd;\n Renderer renderer;\n\n reportStart = System.nanoTime();\n renderer = opts.createRenderer();\n renderer.setWriter(w);\n renderer.start();\n\n reportEnd = System.nanoTime();\n Benchmark.mark(Benchmark.TYPE_REPORTING, reportEnd - reportStart, 0);\n \n RuleContext ctx = new RuleContext();\n\n try {\n long startLoadRules = System.nanoTime();\n RuleSetFactory ruleSetFactory = new RuleSetFactory();\n ruleSetFactory.setMinimumPriority(opts.getMinPriority());\n \n RuleSets rulesets = ruleSetFactory.createRuleSets(opts.getRulesets());\n printRuleNamesInDebug(opts.debugEnabled(), rulesets);\n long endLoadRules = System.nanoTime();\n Benchmark.mark(Benchmark.TYPE_LOAD_RULES, endLoadRules - startLoadRules, 0);\n \n processFiles(opts.getCpus(), ruleSetFactory, sourceType, files, ctx, renderer,\n opts.getRulesets(), opts.debugEnabled(), opts.shortNamesEnabled(),\n opts.getInputPath(), opts.getEncoding(), opts.getExcludeMarker());\n } catch (RuleSetNotFoundException rsnfe) {\n System.out.println(opts.usage());\n rsnfe.printStackTrace();\n }\n\n reportStart = System.nanoTime();\n renderer.end();\n reportEnd = System.nanoTime();\n private static class PmdRunnable extends PMD implements Callable<Report> {\n public Report call() {\n Report report = new Report();\n ctx.setReport(report);\n\n report.addError(\n report.addError(\n report.addError(\n return report;\n public static void processFiles(int threadCount, RuleSetFactory ruleSetFactory, SourceType sourceType, List<DataSource> files, RuleContext ctx,\n Renderer renderer, String rulesets, boolean debugEnabled, final boolean shortNamesEnabled, final String inputPath,\n List<Future<Report>> tasks = new LinkedList<Future<Report>>();\n \n Collections.sort(files, new Comparator<DataSource>() {\n public int compare(DataSource d1,DataSource d2) {\n String s1 = d1.getNiceFileName(shortNamesEnabled, inputPath);\n String s2 = d2.getNiceFileName(shortNamesEnabled, inputPath);\n return s1.compareTo(s2);\n }\n });\n PmdRunnable r = new PmdRunnable(executor, dataSource, niceFileName, sourceType, debugEnabled,\n Future<Report> future = executor.submit(r);\n tasks.add(future);\n while (!tasks.isEmpty()) {\n Future<Report> future = tasks.remove(0);\n Report report = null;\n try {\n report = future.get();\n } catch (InterruptedException ie) {\n Thread.currentThread().interrupt();\n future.cancel(true);\n } catch (ExecutionException ee) {\n Throwable t = ee.getCause();\n if (t instanceof RuntimeException) {\n throw (RuntimeException) t;\n } else if (t instanceof Error) {\n throw (Error) t;\n } else {\n throw new IllegalStateException(\"PmdRunnable exception\", t);\n }\n }\n try {\n long start = System.nanoTime();\n renderer.renderFileReport(report);\n long end = System.nanoTime();\n Benchmark.mark(Benchmark.TYPE_REPORTING, end - start, 1);\n } catch (IOException ioe) {\n }", "new_methods": [ { "arguments": [], "filename": "pmd/src/net/sourceforge/pmd/PMD.java", "implementation": "Report report = new Report();\n ctx.setReport(report);\n\n report.addError(\n report.addError(\n report.addError(\n return report;\n public static void processFiles(int threadCount, RuleSetFactory ruleSetFactory, SourceType sourceType, List<DataSource> files, RuleContext ctx,\n Renderer renderer, String rulesets, boolean debugEnabled, final boolean shortNamesEnabled, final String inputPath,\n List<Future<Report>> tasks = new LinkedList<Future<Report>>();\n \n Collections.sort(files, new Comparator<DataSource>() {\n public int compare(DataSource d1,DataSource d2) {\n String s1 = d1.getNiceFileName(shortNamesEnabled, inputPath);\n String s2 = d2.getNiceFileName(shortNamesEnabled, inputPath);\n return s1.compareTo(s2);", "signature": "Report call()" }, { "arguments": [ "t instanceof Error" ], "filename": "pmd/src/net/sourceforge/pmd/PMD.java", "implementation": "throw (Error) t;", "signature": "else if (t instanceof Error)" } ], "old_code": " RuleContext ctx = new RuleContext();\n Report report = new Report();\n ctx.setReport(report);\n report.start();\n\n try {\n long startLoadRules = System.nanoTime();\n RuleSetFactory ruleSetFactory = new RuleSetFactory();\n ruleSetFactory.setMinimumPriority(opts.getMinPriority());\n\n RuleSets rulesets = ruleSetFactory.createRuleSets(opts.getRulesets());\n printRuleNamesInDebug(opts.debugEnabled(), rulesets);\n long endLoadRules = System.nanoTime();\n Benchmark.mark(Benchmark.TYPE_LOAD_RULES, endLoadRules - startLoadRules, 0);\n\n processFiles(opts.getCpus(), ruleSetFactory, sourceType, files, ctx,\n opts.getRulesets(), opts.debugEnabled(), opts.shortNamesEnabled(),\n opts.getInputPath(), opts.getEncoding(), opts.getExcludeMarker());\n } catch (RuleSetNotFoundException rsnfe) {\n System.out.println(opts.usage());\n rsnfe.printStackTrace();\n }\n report.end();\n\n long reportStart = System.nanoTime();\n Renderer r = opts.createRenderer();\n r.render(w, ctx.getReport());\n long reportEnd = System.nanoTime();\n private static class PmdRunnable extends PMD implements Runnable {\n public void run() {\n ctx.getReport().addError(\n ctx.getReport().addError(\n ctx.getReport().addError(\n context.setReport(new Report());\n public static void processFiles(int threadCount, RuleSetFactory ruleSetFactory, SourceType sourceType, List<DataSource> files, RuleContext ctx, String rulesets,\n boolean debugEnabled, boolean shortNamesEnabled, String inputPath,\n Runnable r = new PmdRunnable(executor, dataSource, niceFileName, sourceType, debugEnabled,\n executor.execute(r);\n try {\n executor.awaitTermination(Long.MAX_VALUE, TimeUnit.NANOSECONDS);\n } catch (InterruptedException e) {\n }\n long start = System.nanoTime();\n Report mainReport = ctx.getReport();\n for (PmdThread thread: factory.threadList) {\n Report r = thread.context.getReport();\n mainReport.merge(r);\n long end = System.nanoTime();\n Benchmark.mark(Benchmark.TYPE_REPORTING, end - start, 1);", "old_methods": [ { "arguments": [], "filename": "pmd/src/net/sourceforge/pmd/PMD.java", "implementation": "ctx.getReport().addError(\n ctx.getReport().addError(\n ctx.getReport().addError(\n context.setReport(new Report());\n public static void processFiles(int threadCount, RuleSetFactory ruleSetFactory, SourceType sourceType, List<DataSource> files, RuleContext ctx, String rulesets,\n boolean debugEnabled, boolean shortNamesEnabled, String inputPath,\n Runnable r = new PmdRunnable(executor, dataSource, niceFileName, sourceType, debugEnabled,\n executor.execute(r);\n try {\n executor.awaitTermination(Long.MAX_VALUE, TimeUnit.NANOSECONDS);", "signature": "void run()" } ], "patch": "@@ -25,12 +25,16 @@\n import java.io.UnsupportedEncodingException;\n import java.io.Writer;\n import java.util.ArrayList;\n+import java.util.Comparator;\n import java.util.Enumeration;\n import java.util.LinkedList;\n import java.util.List;\n import java.util.StringTokenizer;\n+import java.util.concurrent.Callable;\n+import java.util.concurrent.ExecutionException;\n import java.util.concurrent.ExecutorService;\n import java.util.concurrent.Executors;\n+import java.util.concurrent.Future;\n import java.util.concurrent.ThreadFactory;\n import java.util.concurrent.TimeUnit;\n import java.util.concurrent.atomic.AtomicInteger;\n@@ -273,40 +277,46 @@ public static void main(String[] args) {\n sourceType = SourceType.JAVA_14;\n }\n \n- RuleContext ctx = new RuleContext();\n- Report report = new Report();\n- ctx.setReport(report);\n- report.start();\n-\n- try {\n- long startLoadRules = System.nanoTime();\n- RuleSetFactory ruleSetFactory = new RuleSetFactory();\n- ruleSetFactory.setMinimumPriority(opts.getMinPriority());\n-\n- RuleSets rulesets = ruleSetFactory.createRuleSets(opts.getRulesets());\n- printRuleNamesInDebug(opts.debugEnabled(), rulesets);\n- long endLoadRules = System.nanoTime();\n- Benchmark.mark(Benchmark.TYPE_LOAD_RULES, endLoadRules - startLoadRules, 0);\n-\n- processFiles(opts.getCpus(), ruleSetFactory, sourceType, files, ctx,\n- opts.getRulesets(), opts.debugEnabled(), opts.shortNamesEnabled(),\n- opts.getInputPath(), opts.getEncoding(), opts.getExcludeMarker());\n- } catch (RuleSetNotFoundException rsnfe) {\n- System.out.println(opts.usage());\n- rsnfe.printStackTrace();\n- }\n- report.end();\n-\n+ long reportStart, reportEnd;\n+ Renderer renderer;\n Writer w = null;\n- long reportStart = System.nanoTime();\n+\n+ reportStart = System.nanoTime();\n try {\n- Renderer r = opts.createRenderer();\n+ renderer = opts.createRenderer();\n if (opts.getReportFile() != null) {\n w = new BufferedWriter(new FileWriter(opts.getReportFile()));\n } else {\n w = new OutputStreamWriter(System.out);\n }\n- r.render(w, ctx.getReport());\n+ renderer.setWriter(w);\n+ renderer.start();\n+\n+ reportEnd = System.nanoTime();\n+ Benchmark.mark(Benchmark.TYPE_REPORTING, reportEnd - reportStart, 0);\n+ \n+ RuleContext ctx = new RuleContext();\n+\n+ try {\n+ long startLoadRules = System.nanoTime();\n+ RuleSetFactory ruleSetFactory = new RuleSetFactory();\n+ ruleSetFactory.setMinimumPriority(opts.getMinPriority());\n+ \n+ RuleSets rulesets = ruleSetFactory.createRuleSets(opts.getRulesets());\n+ printRuleNamesInDebug(opts.debugEnabled(), rulesets);\n+ long endLoadRules = System.nanoTime();\n+ Benchmark.mark(Benchmark.TYPE_LOAD_RULES, endLoadRules - startLoadRules, 0);\n+ \n+ processFiles(opts.getCpus(), ruleSetFactory, sourceType, files, ctx, renderer,\n+ opts.getRulesets(), opts.debugEnabled(), opts.shortNamesEnabled(),\n+ opts.getInputPath(), opts.getEncoding(), opts.getExcludeMarker());\n+ } catch (RuleSetNotFoundException rsnfe) {\n+ System.out.println(opts.usage());\n+ rsnfe.printStackTrace();\n+ }\n+\n+ reportStart = System.nanoTime();\n+ renderer.end();\n w.write(EOL);\n w.flush();\n if (opts.getReportFile() != null) {\n@@ -327,7 +337,7 @@ public static void main(String[] args) {\n System.out.println(e.getMessage());\n }\n }\n- long reportEnd = System.nanoTime();\n+ reportEnd = System.nanoTime();\n Benchmark.mark(Benchmark.TYPE_REPORTING, reportEnd - reportStart, 0);\n }\n \n@@ -338,7 +348,7 @@ public static void main(String[] args) {\n }\n }\n \n- private static class PmdRunnable extends PMD implements Runnable {\n+ private static class PmdRunnable extends PMD implements Callable<Report> {\n private final ExecutorService executor;\n private final DataSource dataSource;\n private final String fileName;\n@@ -359,12 +369,15 @@ public PmdRunnable(ExecutorService executor, DataSource dataSource, String fileN\n setExcludeMarker(excludeMarker);\n }\n \n- public void run() {\n+ public Report call() {\n PmdThread thread = (PmdThread) Thread.currentThread();\n \n RuleContext ctx = thread.getRuleContext();\n RuleSets rs = thread.getRuleSets(rulesets);\n \n+ Report report = new Report();\n+ ctx.setReport(report);\n+\n ctx.setSourceCodeFilename(fileName);\n if (debugEnabled) {\n System.out.println(\"Processing \" + ctx.getSourceCodeFilename());\n@@ -377,15 +390,15 @@ public void run() {\n if (debugEnabled) {\n pmde.getReason().printStackTrace();\n }\n- ctx.getReport().addError(\n+ report.addError(\n new Report.ProcessingError(pmde.getMessage(),\n fileName));\n } catch (IOException ioe) {\n // unexpected exception: log and stop executor service\n if (debugEnabled) {\n ioe.printStackTrace();\n }\n- ctx.getReport().addError(\n+ report.addError(\n new Report.ProcessingError(ioe.getMessage(),\n fileName));\n \n@@ -395,12 +408,13 @@ public void run() {\n if (debugEnabled) {\n re.printStackTrace();\n }\n- ctx.getReport().addError(\n+ report.addError(\n new Report.ProcessingError(re.getMessage(),\n fileName));\n \n executor.shutdownNow();\n }\n+ return report;\n }\n \n }\n@@ -430,7 +444,6 @@ public PmdThread(int id, Runnable r, RuleSetFactory ruleSetFactory) {\n super(r, \"PmdThread \" + id);\n this.id = id;\n context = new RuleContext();\n- context.setReport(new Report());\n this.ruleSetFactory = ruleSetFactory;\n }\n \n@@ -465,37 +478,61 @@ public String toString() {\n *\n * @throws IOException If one of the files could not be read\n */\n- public static void processFiles(int threadCount, RuleSetFactory ruleSetFactory, SourceType sourceType, List<DataSource> files, RuleContext ctx, String rulesets,\n- boolean debugEnabled, boolean shortNamesEnabled, String inputPath,\n+ public static void processFiles(int threadCount, RuleSetFactory ruleSetFactory, SourceType sourceType, List<DataSource> files, RuleContext ctx,\n+ Renderer renderer, String rulesets, boolean debugEnabled, final boolean shortNamesEnabled, final String inputPath,\n String encoding, String excludeMarker) {\n \n PmdThreadFactory factory = new PmdThreadFactory(ruleSetFactory);\n ExecutorService executor = Executors.newFixedThreadPool(threadCount, factory);\n+ List<Future<Report>> tasks = new LinkedList<Future<Report>>();\n+ \n+ Collections.sort(files, new Comparator<DataSource>() {\n+ public int compare(DataSource d1,DataSource d2) {\n+ String s1 = d1.getNiceFileName(shortNamesEnabled, inputPath);\n+ String s2 = d2.getNiceFileName(shortNamesEnabled, inputPath);\n+ return s1.compareTo(s2);\n+ }\n+ });\n \n for (DataSource dataSource:files) {\n String niceFileName = dataSource.getNiceFileName(shortNamesEnabled,\n inputPath);\n \n- Runnable r = new PmdRunnable(executor, dataSource, niceFileName, sourceType, debugEnabled,\n+ PmdRunnable r = new PmdRunnable(executor, dataSource, niceFileName, sourceType, debugEnabled,\n encoding, rulesets, excludeMarker);\n \n- executor.execute(r);\n+ Future<Report> future = executor.submit(r);\n+ tasks.add(future);\n }\n executor.shutdown();\n \n- try {\n- executor.awaitTermination(Long.MAX_VALUE, TimeUnit.NANOSECONDS);\n- } catch (InterruptedException e) {\n- }\n+ while (!tasks.isEmpty()) {\n+ Future<Report> future = tasks.remove(0);\n+ Report report = null;\n+ try {\n+ report = future.get();\n+ } catch (InterruptedException ie) {\n+ Thread.currentThread().interrupt();\n+ future.cancel(true);\n+ } catch (ExecutionException ee) {\n+ Throwable t = ee.getCause();\n+ if (t instanceof RuntimeException) {\n+ throw (RuntimeException) t;\n+ } else if (t instanceof Error) {\n+ throw (Error) t;\n+ } else {\n+ throw new IllegalStateException(\"PmdRunnable exception\", t);\n+ }\n+ }\n \n- long start = System.nanoTime();\n- Report mainReport = ctx.getReport();\n- for (PmdThread thread: factory.threadList) {\n- Report r = thread.context.getReport();\n- mainReport.merge(r);\n+ try {\n+ long start = System.nanoTime();\n+ renderer.renderFileReport(report);\n+ long end = System.nanoTime();\n+ Benchmark.mark(Benchmark.TYPE_REPORTING, end - start, 1);\n+ } catch (IOException ioe) {\n+ }\n }\n- long end = System.nanoTime();\n- Benchmark.mark(Benchmark.TYPE_REPORTING, end - start, 1);\n }\n \n /**", "raw_url": "https://github.com/adangel/pmd/raw/14da817cf7cc74de98af1649d9dde7da3b4b6c7d/pmd%2Fsrc%2Fnet%2Fsourceforge%2Fpmd%2FPMD.java", "sha": "02f745533b2f11ad0d059284a02ca056f38617e7", "status": "modified" }, { "additions": 11, "blob_url": "https://github.com/adangel/pmd/blob/14da817cf7cc74de98af1649d9dde7da3b4b6c7d/pmd%2Fsrc%2Fnet%2Fsourceforge%2Fpmd%2FReport.java", "changes": 22, "contents_url": "https://api.github.com/repos/adangel/pmd/contents/pmd%2Fsrc%2Fnet%2Fsourceforge%2Fpmd%2FReport.java?ref=14da817cf7cc74de98af1649d9dde7da3b4b6c7d", "deletions": 11, "filename": "pmd/src/net/sourceforge/pmd/Report.java", "new_code": " private final long duration;\n private final String msg;\n private final String file;\n private final IRuleViolation rv;\n private final boolean isNOPMD;\n private final String userMessage;\n private final ReportTree violationTree = new ReportTree();\n private final Set<IRuleViolation> violations = new TreeSet<IRuleViolation>(COMPARATOR);\n private final Set<Metric> metrics = new HashSet<Metric>();\n private final List<ReportListener> listeners = new ArrayList<ReportListener>();\n private final List<ProcessingError> errors = new ArrayList<ProcessingError>();", "new_methods": [], "old_code": " private long duration;\n private String msg;\n private String file;\n private IRuleViolation rv;\n private boolean isNOPMD;\n private String userMessage;\n private ReportTree violationTree = new ReportTree();\n private Set<IRuleViolation> violations = new TreeSet<IRuleViolation>(COMPARATOR);\n private Set<Metric> metrics = new HashSet<Metric>();\n private List<ReportListener> listeners = new ArrayList<ReportListener>();\n private List<ProcessingError> errors = new ArrayList<ProcessingError>();", "old_methods": [], "patch": "@@ -19,7 +19,7 @@\n public class Report {\n \n public static class ReadableDuration {\n- private long duration;\n+ private final long duration;\n \n public ReadableDuration(long duration) {\n this.duration = duration;\n@@ -57,8 +57,8 @@ public String getTime() {\n }\n \n public static class ProcessingError {\n- private String msg;\n- private String file;\n+ private final String msg;\n+ private final String file;\n \n public ProcessingError(String msg, String file) {\n this.msg = msg;\n@@ -75,9 +75,9 @@ public String getFile() {\n }\n \n public static class SuppressedViolation {\n- private IRuleViolation rv;\n- private boolean isNOPMD;\n- private String userMessage;\n+ private final IRuleViolation rv;\n+ private final boolean isNOPMD;\n+ private final String userMessage;\n \n public SuppressedViolation(IRuleViolation rv, boolean isNOPMD, String userMessage) {\n this.isNOPMD = isNOPMD;\n@@ -109,13 +109,13 @@ public String getUserMessage() {\n * better and faster sort and filter mechanism and to visualize the result\n * als tree. (ide plugins).\n * */\n- private ReportTree violationTree = new ReportTree();\n+ private final ReportTree violationTree = new ReportTree();\n \n // Note that this and the above data structure are both being maintained for a bit\n- private Set<IRuleViolation> violations = new TreeSet<IRuleViolation>(COMPARATOR);\n- private Set<Metric> metrics = new HashSet<Metric>();\n- private List<ReportListener> listeners = new ArrayList<ReportListener>();\n- private List<ProcessingError> errors = new ArrayList<ProcessingError>();\n+ private final Set<IRuleViolation> violations = new TreeSet<IRuleViolation>(COMPARATOR);\n+ private final Set<Metric> metrics = new HashSet<Metric>();\n+ private final List<ReportListener> listeners = new ArrayList<ReportListener>();\n+ private final List<ProcessingError> errors = new ArrayList<ProcessingError>();\n private Map<Integer, String> linesToExclude = new HashMap<Integer, String>();\n private long start;\n private long end;", "raw_url": "https://github.com/adangel/pmd/raw/14da817cf7cc74de98af1649d9dde7da3b4b6c7d/pmd%2Fsrc%2Fnet%2Fsourceforge%2Fpmd%2FReport.java", "sha": "52d7fc7f35da6ec0eb74816f7632e60615d2481e", "status": "modified" }, { "additions": 30, "blob_url": "https://github.com/adangel/pmd/blob/14da817cf7cc74de98af1649d9dde7da3b4b6c7d/pmd%2Fsrc%2Fnet%2Fsourceforge%2Fpmd%2Frenderers%2FAbstractRenderer.java", "changes": 30, "contents_url": "https://api.github.com/repos/adangel/pmd/contents/pmd%2Fsrc%2Fnet%2Fsourceforge%2Fpmd%2Frenderers%2FAbstractRenderer.java?ref=14da817cf7cc74de98af1649d9dde7da3b4b6c7d", "deletions": 0, "filename": "pmd/src/net/sourceforge/pmd/renderers/AbstractRenderer.java", "new_code": "import java.io.Writer;\n private Writer writer;\n\n private Report mainReport;\n\n public void setWriter(Writer writer) {\n this.writer = writer;\n }\n\n public Writer getWriter() {\n return writer;\n }\n\n public void start() throws IOException {\n // default (and backward compatible) behavior is to build a full report.\n // Optimized rendering is done in OnTheFlyRenderer and descendants\n mainReport = new Report();\n }\n\n public void renderFileReport(Report report) throws IOException {\n // default (and backward compatible) behavior is to build a full report.\n // Optimized rendering is done in OnTheFlyRenderer and descendants\n mainReport.merge(report);\n }\n\n public void end() throws IOException {\n // default (and backward compatible) behavior is to build a full report.\n // Optimized rendering is done in OnTheFlyRenderer and descendants\n render(writer, mainReport);\n }", "new_methods": [ { "arguments": [ "Writer writer" ], "filename": "pmd/src/net/sourceforge/pmd/renderers/AbstractRenderer.java", "implementation": "this.writer = writer;", "signature": "void setWriter(Writer writer)" }, { "arguments": [], "filename": "pmd/src/net/sourceforge/pmd/renderers/AbstractRenderer.java", "implementation": "return writer;", "signature": "Writer getWriter()" } ], "old_code": "", "old_methods": [], "patch": "@@ -2,6 +2,7 @@\n \n import java.io.IOException;\n import java.io.StringWriter;\n+import java.io.Writer;\n \n import net.sourceforge.pmd.Report;\n \n@@ -23,4 +24,33 @@ public String render(Report report) {\n return w.toString();\n }\n \n+ private Writer writer;\n+\n+ private Report mainReport;\n+\n+ public void setWriter(Writer writer) {\n+ this.writer = writer;\n+ }\n+\n+ public Writer getWriter() {\n+ return writer;\n+ }\n+\n+ public void start() throws IOException {\n+ // default (and backward compatible) behavior is to build a full report.\n+ // Optimized rendering is done in OnTheFlyRenderer and descendants\n+ mainReport = new Report();\n+ }\n+\n+ public void renderFileReport(Report report) throws IOException {\n+ // default (and backward compatible) behavior is to build a full report.\n+ // Optimized rendering is done in OnTheFlyRenderer and descendants\n+ mainReport.merge(report);\n+ }\n+\n+ public void end() throws IOException {\n+ // default (and backward compatible) behavior is to build a full report.\n+ // Optimized rendering is done in OnTheFlyRenderer and descendants\n+ render(writer, mainReport);\n+ }\n }", "raw_url": "https://github.com/adangel/pmd/raw/14da817cf7cc74de98af1649d9dde7da3b4b6c7d/pmd%2Fsrc%2Fnet%2Fsourceforge%2Fpmd%2Frenderers%2FAbstractRenderer.java", "sha": "072f1b752f5b9896c980ad3384bf167b32597d3c", "status": "modified" }, { "additions": 14, "blob_url": "https://github.com/adangel/pmd/blob/14da817cf7cc74de98af1649d9dde7da3b4b6c7d/pmd%2Fsrc%2Fnet%2Fsourceforge%2Fpmd%2Frenderers%2FCSVRenderer.java", "changes": 24, "contents_url": "https://api.github.com/repos/adangel/pmd/contents/pmd%2Fsrc%2Fnet%2Fsourceforge%2Fpmd%2Frenderers%2FCSVRenderer.java?ref=14da817cf7cc74de98af1649d9dde7da3b4b6c7d", "deletions": 10, "filename": "pmd/src/net/sourceforge/pmd/renderers/CSVRenderer.java", "new_code": "public class CSVRenderer extends OnTheFlyRenderer {\n private int violationCount = 1;\n\n public void start() throws IOException {\n getWriter().write(buf.toString());\n public void renderFileViolations(Iterator<IRuleViolation> violations) throws IOException {\n StringBuffer buf = new StringBuffer(300);\n Writer writer = getWriter();\n\n while (violations.hasNext()) {\n rv = violations.next();\n public void end() throws IOException {\n }\n", "new_methods": [], "old_code": "import net.sourceforge.pmd.Report;\npublic class CSVRenderer extends AbstractRenderer {\n public void render(Writer writer, Report report) throws IOException {\n writer.write(buf.toString());\n\n addViolations(writer, report, buf);\n\tprivate void addViolations(Writer writer, Report report, StringBuffer buf) throws IOException {\n\t\tint violationCount = 1;\n for (Iterator<IRuleViolation> i = report.iterator(); i.hasNext();) {\n rv = i.next();", "old_methods": [], "patch": "@@ -5,16 +5,17 @@\n \n import net.sourceforge.pmd.IRuleViolation;\n import net.sourceforge.pmd.PMD;\n-import net.sourceforge.pmd.Report;\n import net.sourceforge.pmd.util.StringUtil;\n \n import java.io.IOException;\n import java.io.Writer;\n import java.util.Iterator;\n \n-public class CSVRenderer extends AbstractRenderer {\n+public class CSVRenderer extends OnTheFlyRenderer {\n \n- public void render(Writer writer, Report report) throws IOException {\n+ private int violationCount = 1;\n+\n+ public void start() throws IOException {\n StringBuffer buf = new StringBuffer(300);\n quoteAndCommify(buf, \"Problem\");\n quoteAndCommify(buf, \"Package\");\n@@ -25,17 +26,17 @@ public void render(Writer writer, Report report) throws IOException {\n quoteAndCommify(buf, \"Rule set\");\n quote(buf, \"Rule\");\n buf.append(PMD.EOL);\n- writer.write(buf.toString());\n-\n- addViolations(writer, report, buf);\n+ getWriter().write(buf.toString());\n }\n \n-\tprivate void addViolations(Writer writer, Report report, StringBuffer buf) throws IOException {\n-\t\tint violationCount = 1;\n+ public void renderFileViolations(Iterator<IRuleViolation> violations) throws IOException {\n+ StringBuffer buf = new StringBuffer(300);\n+ Writer writer = getWriter();\n+\n \t\tIRuleViolation rv;\n- for (Iterator<IRuleViolation> i = report.iterator(); i.hasNext();) {\n+ while (violations.hasNext()) {\n buf.setLength(0);\n- rv = i.next();\n+ rv = violations.next();\n quoteAndCommify(buf, Integer.toString(violationCount));\n quoteAndCommify(buf, rv.getPackageName());\n quoteAndCommify(buf, rv.getFilename());\n@@ -50,6 +51,9 @@ private void addViolations(Writer writer, Report report, StringBuffer buf) throw\n }\n \t}\n \n+ public void end() throws IOException {\n+ }\n+\n private void quote(StringBuffer sb, String d) {\n sb.append('\"').append(d).append('\"');\n }", "raw_url": "https://github.com/adangel/pmd/raw/14da817cf7cc74de98af1649d9dde7da3b4b6c7d/pmd%2Fsrc%2Fnet%2Fsourceforge%2Fpmd%2Frenderers%2FCSVRenderer.java", "sha": "a4b444833df2b18dc24969a727588e9014b82d53", "status": "modified" }, { "additions": 9, "blob_url": "https://github.com/adangel/pmd/blob/14da817cf7cc74de98af1649d9dde7da3b4b6c7d/pmd%2Fsrc%2Fnet%2Fsourceforge%2Fpmd%2Frenderers%2FEmacsRenderer.java", "changes": 14, "contents_url": "https://api.github.com/repos/adangel/pmd/contents/pmd%2Fsrc%2Fnet%2Fsourceforge%2Fpmd%2Frenderers%2FEmacsRenderer.java?ref=14da817cf7cc74de98af1649d9dde7da3b4b6c7d", "deletions": 5, "filename": "pmd/src/net/sourceforge/pmd/renderers/EmacsRenderer.java", "new_code": "public class EmacsRenderer extends OnTheFlyRenderer {\n public void start() throws IOException {}\n\n public void renderFileViolations(Iterator<IRuleViolation> violations) throws IOException {\n Writer writer = getWriter();\n while (violations.hasNext()) {\n IRuleViolation rv = violations.next();\n\n public void end() throws IOException {}", "new_methods": [], "old_code": "import net.sourceforge.pmd.Report;\npublic class EmacsRenderer extends AbstractRenderer {\n public void render(Writer writer, Report report) throws IOException {\n for (Iterator<IRuleViolation> i = report.iterator(); i.hasNext();) {\n IRuleViolation rv = i.next();", "old_methods": [], "patch": "@@ -4,25 +4,29 @@\n package net.sourceforge.pmd.renderers;\n \n import net.sourceforge.pmd.IRuleViolation;\n-import net.sourceforge.pmd.Report;\n \n import java.io.IOException;\n import java.io.Writer;\n import java.util.Iterator;\n \n-public class EmacsRenderer extends AbstractRenderer {\n+public class EmacsRenderer extends OnTheFlyRenderer {\n \n protected static final String EOL = System.getProperty(\"line.separator\", \"\\n\");\n \n- public void render(Writer writer, Report report) throws IOException {\n+ public void start() throws IOException {}\n+\n+ public void renderFileViolations(Iterator<IRuleViolation> violations) throws IOException {\n+ Writer writer = getWriter();\n StringBuffer buf = new StringBuffer();\n- for (Iterator<IRuleViolation> i = report.iterator(); i.hasNext();) {\n- IRuleViolation rv = i.next();\n+ while (violations.hasNext()) {\n+ IRuleViolation rv = violations.next();\n buf.setLength(0);\n buf.append(EOL).append(rv.getFilename());\n buf.append(':').append(Integer.toString(rv.getBeginLine()));\n buf.append(\": \").append(rv.getDescription());\n writer.write(buf.toString());\n }\n }\n+\n+ public void end() throws IOException {}\n }", "raw_url": "https://github.com/adangel/pmd/raw/14da817cf7cc74de98af1649d9dde7da3b4b6c7d/pmd%2Fsrc%2Fnet%2Fsourceforge%2Fpmd%2Frenderers%2FEmacsRenderer.java", "sha": "aa6f77d5c8e14599c723d60aaaab14b53c87a3b9", "status": "modified" }, { "additions": 78, "blob_url": "https://github.com/adangel/pmd/blob/14da817cf7cc74de98af1649d9dde7da3b4b6c7d/pmd%2Fsrc%2Fnet%2Fsourceforge%2Fpmd%2Frenderers%2FHTMLRenderer.java", "changes": 145, "contents_url": "https://api.github.com/repos/adangel/pmd/contents/pmd%2Fsrc%2Fnet%2Fsourceforge%2Fpmd%2Frenderers%2FHTMLRenderer.java?ref=14da817cf7cc74de98af1649d9dde7da3b4b6c7d", "deletions": 67, "filename": "pmd/src/net/sourceforge/pmd/renderers/HTMLRenderer.java", "new_code": "import java.util.List;\npublic class HTMLRenderer extends OnTheFlyRenderer {\n private final String linkPrefix;\n private final String linePrefix;\n\n private int violationCount = 1;\n boolean colorize = true;\n writer.write(\"<center><h3>PMD report</h3></center>\");\n writer.write(\"<center><h3>Problems found</h3></center>\");\n writer.write(\"<table align=\\\"center\\\" cellspacing=\\\"0\\\" cellpadding=\\\"3\\\"><tr>\" + PMD.EOL + \"<th>#</th><th>File</th><th>Line</th><th>Problem</th></tr>\" + PMD.EOL);\n setWriter(writer);\n renderFileReport(report);\n writer.write(\"</table>\");\n glomProcessingErrors(writer, errors);\n glomSuppressions(writer, suppressed);\n\n public void start() throws IOException {\n Writer writer = getWriter();\n writer.write(\"<html><head><title>PMD</title></head><body>\" + PMD.EOL);\n }\n\n public void renderFileViolations(Iterator<IRuleViolation> violations) throws IOException {\n Writer writer = getWriter();\n glomIRuleViolations(writer, violations);\n }\n\n public void end() throws IOException {\n Writer writer = getWriter();\n writer.write(\"</table>\");\n glomProcessingErrors(writer, errors);\n if (showSuppressedViolations) {\n glomSuppressions(writer, suppressed);\n }\n writer.write(\"</body></html>\");\n }\n\n private void glomIRuleViolations(Writer writer, Iterator<IRuleViolation> violations) throws IOException {\n StringBuffer buf = new StringBuffer(500);\n while (violations.hasNext()) {\n IRuleViolation rv = violations.next();\n private void glomProcessingErrors(Writer writer, List<Report.ProcessingError> errors) throws IOException {\n if (!errors.isEmpty()) {\n \n StringBuffer buf = new StringBuffer(500);\n boolean colorize = true;\n for (Report.ProcessingError pe: errors) {\n buf.setLength(0);\n buf.append(\"<tr\");\n if (colorize) {\n buf.append(\" bgcolor=\\\"lightgrey\\\"\");\n }\n colorize = !colorize;\n buf.append(\"> \" + PMD.EOL);\n buf.append(\"<td>\" + pe.getFile() + \"</td>\" + PMD.EOL);\n buf.append(\"<td>\" + pe.getMsg() + \"</td>\" + PMD.EOL);\n buf.append(\"</tr>\" + PMD.EOL);\n writer.write(buf.toString());\n \n private void glomSuppressions(Writer writer, List<Report.SuppressedViolation> suppressed) throws IOException {\n if (!suppressed.isEmpty()) {\n\n StringBuffer buf = new StringBuffer(500);\n boolean colorize = true;\n for (Report.SuppressedViolation sv: suppressed) {\n buf.setLength(0);\n buf.append(\"<tr\");\n if (colorize) {\n buf.append(\" bgcolor=\\\"lightgrey\\\"\");\n }\n colorize = !colorize;\n buf.append(\"> \" + PMD.EOL);\n buf.append(\"<td align=\\\"left\\\">\" + sv.getRuleViolation().getFilename() + \"</td>\" + PMD.EOL);\n buf.append(\"<td align=\\\"center\\\">\" + sv.getRuleViolation().getBeginLine() + \"</td>\" + PMD.EOL);\n buf.append(\"<td align=\\\"center\\\">\" + sv.getRuleViolation().getRule().getName() + \"</td>\" + PMD.EOL);\n buf.append(\"<td align=\\\"center\\\">\" + (sv.suppressedByNOPMD() ? \"NOPMD\" : \"Annotation\") + \"</td>\" + PMD.EOL);\n buf.append(\"<td align=\\\"center\\\">\" + (sv.getUserMessage() == null ? \"\" : sv.getUserMessage()) + \"</td>\" + PMD.EOL);\n buf.append(\"</tr>\" + PMD.EOL);\n writer.write(buf.toString());", "new_methods": [], "old_code": "public class HTMLRenderer extends AbstractRenderer {\n private String linkPrefix;\n private String linePrefix;\n public void render(Writer writer, Report report) throws IOException {\n writer.write(\"<html><head><title>PMD</title></head><body>\" + PMD.EOL);\n renderBody(writer, report);\n writer.write(\"</body></html>\");\n }\n\n glomIRuleViolations(writer, report);\n glomProcessingErrors(writer, report);\n glomSuppressions(writer, report);\n \n private void glomIRuleViolations(Writer writer, Report report) throws IOException {\n boolean colorize = true;\n int violationCount = 1;\n StringBuffer buf = new StringBuffer(500);\n for (Iterator<IRuleViolation> i = report.iterator(); i.hasNext();) {\n IRuleViolation rv = i.next();\n if (violationCount > 0) {\n writer.write(\"</table>\");\n }\n private void glomProcessingErrors(Writer writer, Report report) throws IOException {\n boolean colorize = true;\n int violationCount;\n // errors\n if (report.errors().hasNext()) {\n }\n violationCount = 0;\n StringBuffer buf = new StringBuffer(500);\n for (Iterator<Report.ProcessingError> i = report.errors(); i.hasNext();) {\n Report.ProcessingError pe = i.next();\n buf.setLength(0);\n buf.append(\"<tr\");\n if (colorize) {\n buf.append(\" bgcolor=\\\"lightgrey\\\"\");\n colorize = !colorize;\n buf.append(\"> \" + PMD.EOL);\n buf.append(\"<td>\" + pe.getFile() + \"</td>\" + PMD.EOL);\n buf.append(\"<td>\" + pe.getMsg() + \"</td>\" + PMD.EOL);\n buf.append(\"</tr>\" + PMD.EOL);\n writer.write(buf.toString());\n violationCount++;\n }\n if (violationCount > 0) {\n private void glomSuppressions(Writer writer, Report report) throws IOException {\n boolean colorize = true;\n boolean hasSuppressedViolations = !report.getSuppressedRuleViolations().isEmpty();\n if (hasSuppressedViolations) {\n }\n StringBuffer buf = new StringBuffer(500);\n for (Report.SuppressedViolation sv: report.getSuppressedRuleViolations()) {\n buf.setLength(0);\n buf.append(\"<tr\");\n if (colorize) {\n buf.append(\" bgcolor=\\\"lightgrey\\\"\");\n colorize = !colorize;\n buf.append(\"> \" + PMD.EOL);\n buf.append(\"<td align=\\\"left\\\">\" + sv.getRuleViolation().getFilename() + \"</td>\" + PMD.EOL);\n buf.append(\"<td align=\\\"center\\\">\" + sv.getRuleViolation().getBeginLine() + \"</td>\" + PMD.EOL);\n buf.append(\"<td align=\\\"center\\\">\" + sv.getRuleViolation().getRule().getName() + \"</td>\" + PMD.EOL);\n buf.append(\"<td align=\\\"center\\\">\" + (sv.suppressedByNOPMD() ? \"NOPMD\" : \"Annotation\") + \"</td>\" + PMD.EOL);\n buf.append(\"<td align=\\\"center\\\">\" + (sv.getUserMessage() == null ? \"\" : sv.getUserMessage()) + \"</td>\" + PMD.EOL);\n buf.append(\"</tr>\" + PMD.EOL);\n writer.write(buf.toString());\n }\n if (hasSuppressedViolations) {", "old_methods": [], "patch": "@@ -11,11 +11,15 @@\n import java.io.IOException;\n import java.io.Writer;\n import java.util.Iterator;\n+import java.util.List;\n \n-public class HTMLRenderer extends AbstractRenderer {\n+public class HTMLRenderer extends OnTheFlyRenderer {\n \n- private String linkPrefix;\n- private String linePrefix;\n+ private final String linkPrefix;\n+ private final String linePrefix;\n+\n+ private int violationCount = 1;\n+ boolean colorize = true;\n \n public HTMLRenderer(String linkPrefix, String linePrefix) {\n this.linkPrefix = linkPrefix;\n@@ -27,29 +31,46 @@ public HTMLRenderer() {\n this(null, null);\n }\n \n- public void render(Writer writer, Report report) throws IOException {\n- writer.write(\"<html><head><title>PMD</title></head><body>\" + PMD.EOL);\n- renderBody(writer, report);\n- writer.write(\"</body></html>\");\n- }\n-\n public void renderBody(Writer writer, Report report) throws IOException {\n- glomIRuleViolations(writer, report);\n- glomProcessingErrors(writer, report);\n+ writer.write(\"<center><h3>PMD report</h3></center>\");\n+ writer.write(\"<center><h3>Problems found</h3></center>\");\n+ writer.write(\"<table align=\\\"center\\\" cellspacing=\\\"0\\\" cellpadding=\\\"3\\\"><tr>\" + PMD.EOL + \"<th>#</th><th>File</th><th>Line</th><th>Problem</th></tr>\" + PMD.EOL);\n+ setWriter(writer);\n+ renderFileReport(report);\n+ writer.write(\"</table>\");\n+ glomProcessingErrors(writer, errors);\n if (showSuppressedViolations) {\n- glomSuppressions(writer, report);\n+ glomSuppressions(writer, suppressed);\n }\n }\n- \n- private void glomIRuleViolations(Writer writer, Report report) throws IOException {\n- boolean colorize = true;\n- int violationCount = 1;\n- StringBuffer buf = new StringBuffer(500);\n+\n+ public void start() throws IOException {\n+ Writer writer = getWriter();\n+ writer.write(\"<html><head><title>PMD</title></head><body>\" + PMD.EOL);\n writer.write(\"<center><h3>PMD report</h3></center>\");\n writer.write(\"<center><h3>Problems found</h3></center>\");\n writer.write(\"<table align=\\\"center\\\" cellspacing=\\\"0\\\" cellpadding=\\\"3\\\"><tr>\" + PMD.EOL + \"<th>#</th><th>File</th><th>Line</th><th>Problem</th></tr>\" + PMD.EOL);\n- for (Iterator<IRuleViolation> i = report.iterator(); i.hasNext();) {\n- IRuleViolation rv = i.next();\n+ }\n+\n+ public void renderFileViolations(Iterator<IRuleViolation> violations) throws IOException {\n+ Writer writer = getWriter();\n+ glomIRuleViolations(writer, violations);\n+ }\n+\n+ public void end() throws IOException {\n+ Writer writer = getWriter();\n+ writer.write(\"</table>\");\n+ glomProcessingErrors(writer, errors);\n+ if (showSuppressedViolations) {\n+ glomSuppressions(writer, suppressed);\n+ }\n+ writer.write(\"</body></html>\");\n+ }\n+\n+ private void glomIRuleViolations(Writer writer, Iterator<IRuleViolation> violations) throws IOException {\n+ StringBuffer buf = new StringBuffer(500);\n+ while (violations.hasNext()) {\n+ IRuleViolation rv = violations.next();\n buf.setLength(0);\n buf.append(\"<tr\");\n if (colorize) {\n@@ -71,68 +92,58 @@ private void glomIRuleViolations(Writer writer, Report report) throws IOExceptio\n writer.write(buf.toString());\n violationCount++;\n }\n- if (violationCount > 0) {\n- writer.write(\"</table>\");\n- }\n }\n \n- private void glomProcessingErrors(Writer writer, Report report) throws IOException {\n- boolean colorize = true;\n- int violationCount;\n- // errors\n- if (report.errors().hasNext()) {\n+ private void glomProcessingErrors(Writer writer, List<Report.ProcessingError> errors) throws IOException {\n+ if (!errors.isEmpty()) {\n writer.write(\"<hr/>\");\n writer.write(\"<center><h3>Processing errors</h3></center>\");\n writer.write(\"<table align=\\\"center\\\" cellspacing=\\\"0\\\" cellpadding=\\\"3\\\"><tr>\" + PMD.EOL + \"<th>File</th><th>Problem</th></tr>\" + PMD.EOL);\n- }\n- violationCount = 0;\n- StringBuffer buf = new StringBuffer(500);\n- for (Iterator<Report.ProcessingError> i = report.errors(); i.hasNext();) {\n- Report.ProcessingError pe = i.next();\n- buf.setLength(0);\n- buf.append(\"<tr\");\n- if (colorize) {\n- buf.append(\" bgcolor=\\\"lightgrey\\\"\");\n+ \n+ StringBuffer buf = new StringBuffer(500);\n+ boolean colorize = true;\n+ for (Report.ProcessingError pe: errors) {\n+ buf.setLength(0);\n+ buf.append(\"<tr\");\n+ if (colorize) {\n+ buf.append(\" bgcolor=\\\"lightgrey\\\"\");\n+ }\n+ colorize = !colorize;\n+ buf.append(\"> \" + PMD.EOL);\n+ buf.append(\"<td>\" + pe.getFile() + \"</td>\" + PMD.EOL);\n+ buf.append(\"<td>\" + pe.getMsg() + \"</td>\" + PMD.EOL);\n+ buf.append(\"</tr>\" + PMD.EOL);\n+ writer.write(buf.toString());\n+ \n }\n- colorize = !colorize;\n- buf.append(\"> \" + PMD.EOL);\n- buf.append(\"<td>\" + pe.getFile() + \"</td>\" + PMD.EOL);\n- buf.append(\"<td>\" + pe.getMsg() + \"</td>\" + PMD.EOL);\n- buf.append(\"</tr>\" + PMD.EOL);\n- writer.write(buf.toString());\n- violationCount++;\n- }\n- if (violationCount > 0) {\n writer.write(\"</table>\");\n }\n }\n \n- private void glomSuppressions(Writer writer, Report report) throws IOException {\n- boolean colorize = true;\n- boolean hasSuppressedViolations = !report.getSuppressedRuleViolations().isEmpty();\n- if (hasSuppressedViolations) {\n+ private void glomSuppressions(Writer writer, List<Report.SuppressedViolation> suppressed) throws IOException {\n+ if (!suppressed.isEmpty()) {\n writer.write(\"<hr/>\");\n writer.write(\"<center><h3>Suppressed warnings</h3></center>\");\n writer.write(\"<table align=\\\"center\\\" cellspacing=\\\"0\\\" cellpadding=\\\"3\\\"><tr>\" + PMD.EOL + \"<th>File</th><th>Line</th><th>Rule</th><th>NOPMD or Annotation</th><th>Reason</th></tr>\" + PMD.EOL);\n- }\n- StringBuffer buf = new StringBuffer(500);\n- for (Report.SuppressedViolation sv: report.getSuppressedRuleViolations()) {\n- buf.setLength(0);\n- buf.append(\"<tr\");\n- if (colorize) {\n- buf.append(\" bgcolor=\\\"lightgrey\\\"\");\n+\n+ StringBuffer buf = new StringBuffer(500);\n+ boolean colorize = true;\n+ for (Report.SuppressedViolation sv: suppressed) {\n+ buf.setLength(0);\n+ buf.append(\"<tr\");\n+ if (colorize) {\n+ buf.append(\" bgcolor=\\\"lightgrey\\\"\");\n+ }\n+ colorize = !colorize;\n+ buf.append(\"> \" + PMD.EOL);\n+ buf.append(\"<td align=\\\"left\\\">\" + sv.getRuleViolation().getFilename() + \"</td>\" + PMD.EOL);\n+ buf.append(\"<td align=\\\"center\\\">\" + sv.getRuleViolation().getBeginLine() + \"</td>\" + PMD.EOL);\n+ buf.append(\"<td align=\\\"center\\\">\" + sv.getRuleViolation().getRule().getName() + \"</td>\" + PMD.EOL);\n+ buf.append(\"<td align=\\\"center\\\">\" + (sv.suppressedByNOPMD() ? \"NOPMD\" : \"Annotation\") + \"</td>\" + PMD.EOL);\n+ buf.append(\"<td align=\\\"center\\\">\" + (sv.getUserMessage() == null ? \"\" : sv.getUserMessage()) + \"</td>\" + PMD.EOL);\n+ buf.append(\"</tr>\" + PMD.EOL);\n+ writer.write(buf.toString());\n }\n- colorize = !colorize;\n- buf.append(\"> \" + PMD.EOL);\n- buf.append(\"<td align=\\\"left\\\">\" + sv.getRuleViolation().getFilename() + \"</td>\" + PMD.EOL);\n- buf.append(\"<td align=\\\"center\\\">\" + sv.getRuleViolation().getBeginLine() + \"</td>\" + PMD.EOL);\n- buf.append(\"<td align=\\\"center\\\">\" + sv.getRuleViolation().getRule().getName() + \"</td>\" + PMD.EOL);\n- buf.append(\"<td align=\\\"center\\\">\" + (sv.suppressedByNOPMD() ? \"NOPMD\" : \"Annotation\") + \"</td>\" + PMD.EOL);\n- buf.append(\"<td align=\\\"center\\\">\" + (sv.getUserMessage() == null ? \"\" : sv.getUserMessage()) + \"</td>\" + PMD.EOL);\n- buf.append(\"</tr>\" + PMD.EOL);\n- writer.write(buf.toString());\n- }\n- if (hasSuppressedViolations) {\n writer.write(\"</table>\");\n }\n }", "raw_url": "https://github.com/adangel/pmd/raw/14da817cf7cc74de98af1649d9dde7da3b4b6c7d/pmd%2Fsrc%2Fnet%2Fsourceforge%2Fpmd%2Frenderers%2FHTMLRenderer.java", "sha": "6c4f4aefe86e75851320a85bd4b57d4722282ae7", "status": "modified" }, { "additions": 15, "blob_url": "https://github.com/adangel/pmd/blob/14da817cf7cc74de98af1649d9dde7da3b4b6c7d/pmd%2Fsrc%2Fnet%2Fsourceforge%2Fpmd%2Frenderers%2FIDEAJRenderer.java", "changes": 26, "contents_url": "https://api.github.com/repos/adangel/pmd/contents/pmd%2Fsrc%2Fnet%2Fsourceforge%2Fpmd%2Frenderers%2FIDEAJRenderer.java?ref=14da817cf7cc74de98af1649d9dde7da3b4b6c7d", "deletions": 11, "filename": "pmd/src/net/sourceforge/pmd/renderers/IDEAJRenderer.java", "new_code": "public class IDEAJRenderer extends OnTheFlyRenderer {\n public void start() throws IOException {}\n\n public void renderFileViolations(Iterator<IRuleViolation> violations) throws IOException {\n Writer writer = getWriter();\n render(writer, violations, sourcePath);\n render(writer, violations, classAndMethodName, singleFileName);\n public void end() throws IOException {}\n\n private void render(Writer writer, Iterator<IRuleViolation> violations, String sourcePathString) throws IOException {\n while (violations.hasNext()) {\n IRuleViolation rv = violations.next();\n private void render(Writer writer, Iterator<IRuleViolation> violations, String classAndMethod, String file) throws IOException {\n while (violations.hasNext()) {\n IRuleViolation rv = violations.next();", "new_methods": [], "old_code": "import net.sourceforge.pmd.Report;\npublic class IDEAJRenderer extends AbstractRenderer {\n public void render(Writer writer, Report report) throws IOException {\n render(writer, report, sourcePath);\n render(writer, report, classAndMethodName, singleFileName);\n private void render(Writer writer, Report report, String sourcePathString) throws IOException {\n for (Iterator<IRuleViolation> i = report.iterator(); i.hasNext();) {\n IRuleViolation rv = i.next();\n private void render(Writer writer, Report report, String classAndMethod, String file) throws IOException {\n for (Iterator<IRuleViolation> i = report.iterator(); i.hasNext();) {\n IRuleViolation rv = i.next();", "old_methods": [], "patch": "@@ -5,7 +5,6 @@\n \n import net.sourceforge.pmd.IRuleViolation;\n import net.sourceforge.pmd.PMD;\n-import net.sourceforge.pmd.Report;\n \n import java.io.IOException;\n import java.io.Writer;\n@@ -14,7 +13,7 @@\n import java.util.Set;\n import java.util.StringTokenizer;\n \n-public class IDEAJRenderer extends AbstractRenderer {\n+public class IDEAJRenderer extends OnTheFlyRenderer {\n \n \tprivate static final String FILE_SEPARATOR = System.getProperty(\"file.separator\");\n \tprivate static final String PATH_SEPARATOR = System.getProperty(\"path.separator\");\n@@ -45,37 +44,42 @@ public IDEAJRenderer(String[] args) {\n this.args = args;\n }\n \n- public void render(Writer writer, Report report) throws IOException {\n+ public void start() throws IOException {}\n+\n+ public void renderFileViolations(Iterator<IRuleViolation> violations) throws IOException {\n+ Writer writer = getWriter();\n if (args[4].equals(\".method\")) {\n // working on a directory tree\n String sourcePath = args[3];\n- render(writer, report, sourcePath);\n+ render(writer, violations, sourcePath);\n return;\n }\n // working on one file\n String classAndMethodName = args[4];\n String singleFileName = args[5];\n- render(writer, report, classAndMethodName, singleFileName);\n+ render(writer, violations, classAndMethodName, singleFileName);\n }\n \n- private void render(Writer writer, Report report, String sourcePathString) throws IOException {\n+ public void end() throws IOException {}\n+\n+ private void render(Writer writer, Iterator<IRuleViolation> violations, String sourcePathString) throws IOException {\n SourcePath sourcePath = new SourcePath(sourcePathString);\n StringBuffer buf = new StringBuffer();\n- for (Iterator<IRuleViolation> i = report.iterator(); i.hasNext();) {\n+ while (violations.hasNext()) {\n buf.setLength(0);\n- IRuleViolation rv = i.next();\n+ IRuleViolation rv = violations.next();\n buf.append(rv.getDescription() + PMD.EOL);\n buf.append(\" at \").append(getFullyQualifiedClassName(rv.getFilename(), sourcePath)).append(\".method(\");\n buf.append(getSimpleFileName(rv.getFilename())).append(':').append(rv.getBeginLine()).append(')').append(PMD.EOL);\n writer.write(buf.toString());\n }\n }\n \n- private void render(Writer writer, Report report, String classAndMethod, String file) throws IOException {\n+ private void render(Writer writer, Iterator<IRuleViolation> violations, String classAndMethod, String file) throws IOException {\n StringBuffer buf = new StringBuffer();\n- for (Iterator<IRuleViolation> i = report.iterator(); i.hasNext();) {\n+ while (violations.hasNext()) {\n buf.setLength(0);\n- IRuleViolation rv = i.next();\n+ IRuleViolation rv = violations.next();\n buf.append(rv.getDescription()).append(PMD.EOL);\n buf.append(\" at \").append(classAndMethod).append('(').append(file).append(':').append(rv.getBeginLine()).append(')').append(PMD.EOL);\n writer.write(buf.toString());", "raw_url": "https://github.com/adangel/pmd/raw/14da817cf7cc74de98af1649d9dde7da3b4b6c7d/pmd%2Fsrc%2Fnet%2Fsourceforge%2Fpmd%2Frenderers%2FIDEAJRenderer.java", "sha": "229386f4d72cff2092188bf063e40edc24f7ca30", "status": "modified" }, { "additions": 16, "blob_url": "https://github.com/adangel/pmd/blob/14da817cf7cc74de98af1649d9dde7da3b4b6c7d/pmd%2Fsrc%2Fnet%2Fsourceforge%2Fpmd%2Frenderers%2FRenderer.java", "changes": 16, "contents_url": "https://api.github.com/repos/adangel/pmd/contents/pmd%2Fsrc%2Fnet%2Fsourceforge%2Fpmd%2Frenderers%2FRenderer.java?ref=14da817cf7cc74de98af1649d9dde7da3b4b6c7d", "deletions": 0, "filename": "pmd/src/net/sourceforge/pmd/renderers/Renderer.java", "new_code": " /**\n * \n * @deprecated This method consumes too much memory.\n * Use the start, renderFileReport and end methods instead.\n * \n */\n void setWriter(Writer writer);\n\n Writer getWriter();\n\n void start() throws IOException;\n\n void renderFileReport(Report report) throws IOException;\n\n void end() throws IOException;\n", "new_methods": [], "old_code": "", "old_methods": [], "patch": "@@ -20,6 +20,22 @@ public interface Renderer {\n */\n String render(Report report);\n \n+ /**\n+ * \n+ * @deprecated This method consumes too much memory.\n+ * Use the start, renderFileReport and end methods instead.\n+ * \n+ */\n void render(Writer writer, Report report) throws IOException;\n \n+ void setWriter(Writer writer);\n+\n+ Writer getWriter();\n+\n+ void start() throws IOException;\n+\n+ void renderFileReport(Report report) throws IOException;\n+\n+ void end() throws IOException;\n+\n }", "raw_url": "https://github.com/adangel/pmd/raw/14da817cf7cc74de98af1649d9dde7da3b4b6c7d/pmd%2Fsrc%2Fnet%2Fsourceforge%2Fpmd%2Frenderers%2FRenderer.java", "sha": "40f686536d15a5b5c7e6d1e68acb1975755763ff", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/adangel/pmd/blob/14da817cf7cc74de98af1649d9dde7da3b4b6c7d/pmd%2Fsrc%2Fnet%2Fsourceforge%2Fpmd%2Frenderers%2FSummaryHTMLRenderer.java", "changes": 2, "contents_url": "https://api.github.com/repos/adangel/pmd/contents/pmd%2Fsrc%2Fnet%2Fsourceforge%2Fpmd%2Frenderers%2FSummaryHTMLRenderer.java?ref=14da817cf7cc74de98af1649d9dde7da3b4b6c7d", "deletions": 1, "filename": "pmd/src/net/sourceforge/pmd/renderers/SummaryHTMLRenderer.java", "new_code": " writer.write(\"<table align=\\\"center\\\" cellspacing=\\\"0\\\" cellpadding=\\\"3\\\"><tr>\" + PMD.EOL);", "new_methods": [], "old_code": " writer.write(\"<table align=\\\"center\\\" cellspacing=\\\"0\\\" cellpadding=\\\"3\\\"><tr>\" + PMD.EOL + \"<th>#</th><th>File</th><th>Line</th><th>Problem</th></tr>\" + PMD.EOL);", "old_methods": [], "patch": "@@ -22,7 +22,7 @@ public void render(Writer writer, Report report) throws IOException {\n writer.write(\"<html><head><title>PMD</title></head><body>\" + PMD.EOL);\n renderSummary(writer, report);\n writer.write(\"<h2><center>Detail</h2></center>\");\n- writer.write(\"<table align=\\\"center\\\" cellspacing=\\\"0\\\" cellpadding=\\\"3\\\"><tr>\" + PMD.EOL + \"<th>#</th><th>File</th><th>Line</th><th>Problem</th></tr>\" + PMD.EOL);\n+ writer.write(\"<table align=\\\"center\\\" cellspacing=\\\"0\\\" cellpadding=\\\"3\\\"><tr>\" + PMD.EOL);\n new HTMLRenderer(linkPrefix,linePrefix).renderBody(writer, report);\n writer.write(\"</table></body></html>\");\n }", "raw_url": "https://github.com/adangel/pmd/raw/14da817cf7cc74de98af1649d9dde7da3b4b6c7d/pmd%2Fsrc%2Fnet%2Fsourceforge%2Fpmd%2Frenderers%2FSummaryHTMLRenderer.java", "sha": "64009639be56e542df6e5d07d31befa09f5537ff", "status": "modified" }, { "additions": 10, "blob_url": "https://github.com/adangel/pmd/blob/14da817cf7cc74de98af1649d9dde7da3b4b6c7d/pmd%2Fsrc%2Fnet%2Fsourceforge%2Fpmd%2Frenderers%2FTextPadRenderer.java", "changes": 21, "contents_url": "https://api.github.com/repos/adangel/pmd/contents/pmd%2Fsrc%2Fnet%2Fsourceforge%2Fpmd%2Frenderers%2FTextPadRenderer.java?ref=14da817cf7cc74de98af1649d9dde7da3b4b6c7d", "deletions": 11, "filename": "pmd/src/net/sourceforge/pmd/renderers/TextPadRenderer.java", "new_code": "public class TextPadRenderer extends OnTheFlyRenderer {\n\n public void start() throws IOException {}\n\n public void renderFileViolations(Iterator<IRuleViolation> violations) throws IOException {\n Writer writer = getWriter();\n while (violations.hasNext()) {\n IRuleViolation rv = violations.next();\n\n public void end() throws IOException {}", "new_methods": [], "old_code": "import net.sourceforge.pmd.Report;\npublic class TextPadRenderer extends AbstractRenderer {\n public void render(Writer writer, Report report) throws IOException {\n Iterator<IRuleViolation> i;\n try {\n i = report.iterator();\n } catch (NullPointerException npx) {\n throw new NullPointerException(\"ERROR in \" + this.getClass().getName() + \".render: Parameter report is null.\");\n }\n while (i.hasNext()) {\n IRuleViolation rv = i.next();", "old_methods": [], "patch": "@@ -5,7 +5,6 @@\n \n import net.sourceforge.pmd.IRuleViolation;\n import net.sourceforge.pmd.PMD;\n-import net.sourceforge.pmd.Report;\n \n import java.io.IOException;\n import java.io.Writer;\n@@ -26,17 +25,15 @@\n *\n * @author Jeff Epstein, based upon <a href=\"EmacsRenderer.html\">EmacsRenderer</a>, Tuesday, September 23, 2003\n */\n-public class TextPadRenderer extends AbstractRenderer {\n- public void render(Writer writer, Report report) throws IOException {\n+public class TextPadRenderer extends OnTheFlyRenderer {\n+\n+ public void start() throws IOException {}\n+\n+ public void renderFileViolations(Iterator<IRuleViolation> violations) throws IOException {\n+ Writer writer = getWriter();\n StringBuffer buf = new StringBuffer();\n- Iterator<IRuleViolation> i;\n- try {\n- i = report.iterator();\n- } catch (NullPointerException npx) {\n- throw new NullPointerException(\"ERROR in \" + this.getClass().getName() + \".render: Parameter report is null.\");\n- }\n- while (i.hasNext()) {\n- IRuleViolation rv = i.next();\n+ while (violations.hasNext()) {\n+ IRuleViolation rv = violations.next();\n buf.setLength(0);\n //Filename\n buf.append(PMD.EOL).append(rv.getFilename() + \"(\");\n@@ -49,4 +46,6 @@ public void render(Writer writer, Report report) throws IOException {\n writer.write(buf.toString());\n }\n }\n+\n+ public void end() throws IOException {}\n }", "raw_url": "https://github.com/adangel/pmd/raw/14da817cf7cc74de98af1649d9dde7da3b4b6c7d/pmd%2Fsrc%2Fnet%2Fsourceforge%2Fpmd%2Frenderers%2FTextPadRenderer.java", "sha": "bb93ec85206a84e6e799f836e0d21e132fc44c25", "status": "modified" }, { "additions": 32, "blob_url": "https://github.com/adangel/pmd/blob/14da817cf7cc74de98af1649d9dde7da3b4b6c7d/pmd%2Fsrc%2Fnet%2Fsourceforge%2Fpmd%2Frenderers%2FTextRenderer.java", "changes": 59, "contents_url": "https://api.github.com/repos/adangel/pmd/contents/pmd%2Fsrc%2Fnet%2Fsourceforge%2Fpmd%2Frenderers%2FTextRenderer.java?ref=14da817cf7cc74de98af1649d9dde7da3b4b6c7d", "deletions": 27, "filename": "pmd/src/net/sourceforge/pmd/renderers/TextRenderer.java", "new_code": "public class TextRenderer extends OnTheFlyRenderer {\n private boolean empty;\n\n public void start() throws IOException {\n empty = true;\n }\n\n public void renderFileViolations(Iterator<IRuleViolation> violations) throws IOException {\n Writer writer = getWriter();\n empty = !violations.hasNext();\n while (violations.hasNext()) {\n IRuleViolation rv = violations.next();\n }\n public void end() throws IOException {\n Writer writer = getWriter();\n StringBuffer buf = new StringBuffer();\n if (!errors.isEmpty()) {\n empty = false;\n for(Report.ProcessingError error: errors) {\n buf.setLength(0);\n buf.append(PMD.EOL).append(error.getFile());\n buf.append(\"\\t-\\t\").append(error.getMsg());\n writer.write(buf.toString());\n }\n for(Report.SuppressedViolation excluded: suppressed) {\n buf.setLength(0);\n writer.write(buf.toString());\n }\n\n if (empty) {\n getWriter().write(\"No problems found!\");\n", "new_methods": [], "old_code": "public class TextRenderer extends AbstractRenderer {\n public void render(Writer writer, Report report) throws IOException {\n if (report.isEmpty()) {\n buf.append(\"No problems found!\");\n if (showSuppressedViolations) {\n addSuppressed(report, buf);\n }\n writer.write(buf.toString());\n return;\n }\n \n for (Iterator<IRuleViolation> i = report.iterator(); i.hasNext();) {\n IRuleViolation rv = i.next();\n for (Iterator<Report.ProcessingError> i = report.errors(); i.hasNext();) {\n buf.setLength(0);\n Report.ProcessingError error = i.next();\n buf.append(PMD.EOL).append(error.getFile());\n buf.append(\"\\t-\\t\").append(error.getMsg());\n writer.write(buf.toString());\n }\n if (showSuppressedViolations) {\n buf.setLength(0);\n addSuppressed(report, buf);\n writer.write(buf.toString());\n }\n private void addSuppressed(Report report, StringBuffer buf) {\n for (Report.SuppressedViolation excluded: report.getSuppressedRuleViolations()) {", "old_methods": [], "patch": "@@ -11,51 +11,56 @@\n import java.io.Writer;\n import java.util.Iterator;\n \n-public class TextRenderer extends AbstractRenderer {\n+public class TextRenderer extends OnTheFlyRenderer {\n \n- public void render(Writer writer, Report report) throws IOException {\n+ private boolean empty;\n+\n+ public void start() throws IOException {\n+ empty = true;\n+ }\n+\n+ public void renderFileViolations(Iterator<IRuleViolation> violations) throws IOException {\n+ Writer writer = getWriter();\n StringBuffer buf = new StringBuffer();\n \n- if (report.isEmpty()) {\n- buf.append(\"No problems found!\");\n- if (showSuppressedViolations) {\n- addSuppressed(report, buf);\n- }\n- writer.write(buf.toString());\n- return;\n- }\n- \n- for (Iterator<IRuleViolation> i = report.iterator(); i.hasNext();) {\n+ empty = !violations.hasNext();\n+ while (violations.hasNext()) {\n buf.setLength(0);\n- IRuleViolation rv = i.next();\n+ IRuleViolation rv = violations.next();\n buf.append(PMD.EOL).append(rv.getFilename());\n buf.append(':').append(Integer.toString(rv.getBeginLine()));\n buf.append('\\t').append(rv.getDescription());\n writer.write(buf.toString());\n }\n+ }\n \n- for (Iterator<Report.ProcessingError> i = report.errors(); i.hasNext();) {\n- buf.setLength(0);\n- Report.ProcessingError error = i.next();\n- buf.append(PMD.EOL).append(error.getFile());\n- buf.append(\"\\t-\\t\").append(error.getMsg());\n- writer.write(buf.toString());\n- }\n+ public void end() throws IOException {\n+ Writer writer = getWriter();\n+ StringBuffer buf = new StringBuffer();\n+ if (!errors.isEmpty()) {\n+ empty = false;\n \n- if (showSuppressedViolations) {\n- buf.setLength(0);\n- addSuppressed(report, buf);\n- writer.write(buf.toString());\n+ for(Report.ProcessingError error: errors) {\n+ buf.setLength(0);\n+ buf.append(PMD.EOL).append(error.getFile());\n+ buf.append(\"\\t-\\t\").append(error.getMsg());\n+ writer.write(buf.toString());\n+ }\n }\n- }\n \n- private void addSuppressed(Report report, StringBuffer buf) {\n- for (Report.SuppressedViolation excluded: report.getSuppressedRuleViolations()) {\n+ for(Report.SuppressedViolation excluded: suppressed) {\n+ buf.setLength(0);\n buf.append(PMD.EOL);\n buf.append(excluded.getRuleViolation().getRule().getName());\n buf.append(\" rule violation suppressed by \");\n buf.append(excluded.suppressedByNOPMD() ? \"//NOPMD\" : \"Annotation\");\n buf.append(\" in \").append(excluded.getRuleViolation().getFilename());\n+ writer.write(buf.toString());\n+ }\n+\n+ if (empty) {\n+ getWriter().write(\"No problems found!\");\n }\n }\n+\n }", "raw_url": "https://github.com/adangel/pmd/raw/14da817cf7cc74de98af1649d9dde7da3b4b6c7d/pmd%2Fsrc%2Fnet%2Fsourceforge%2Fpmd%2Frenderers%2FTextRenderer.java", "sha": "83e7b1865889e1a37d297851059b8a7ab18c16aa", "status": "modified" }, { "additions": 21, "blob_url": "https://github.com/adangel/pmd/blob/14da817cf7cc74de98af1649d9dde7da3b4b6c7d/pmd%2Fsrc%2Fnet%2Fsourceforge%2Fpmd%2Frenderers%2FVBHTMLRenderer.java", "changes": 34, "contents_url": "https://api.github.com/repos/adangel/pmd/contents/pmd%2Fsrc%2Fnet%2Fsourceforge%2Fpmd%2Frenderers%2FVBHTMLRenderer.java?ref=14da817cf7cc74de98af1649d9dde7da3b4b6c7d", "deletions": 13, "filename": "pmd/src/net/sourceforge/pmd/renderers/VBHTMLRenderer.java", "new_code": "public class VBHTMLRenderer extends OnTheFlyRenderer {\n public void start() throws IOException {\n getWriter().write(header()); \n }\n\n public void renderFileViolations(Iterator<IRuleViolation> violations) throws IOException {\n if (!violations.hasNext()) {\n Writer writer = getWriter();\n while (violations.hasNext()) {\n IRuleViolation rv = violations.next();\n }\n\n public void end() throws IOException {\n Writer writer = getWriter();\n StringBuffer sb = new StringBuffer();\n \n if (!errors.isEmpty()) {\n boolean colorize = false;\n for (Report.ProcessingError error: errors) {\n sb.append(\"<td><font class=body>\").append(error).append(\"\\\"</font></td></tr>\");\n writer.write(footer()); ", "new_methods": [], "old_code": "public class VBHTMLRenderer extends AbstractRenderer {\n public void render(Writer writer, Report report) throws IOException {\n if (report.isEmpty()) {\n\n writer.write(header());\n for (Iterator<IRuleViolation> iter = report.iterator(); iter.hasNext();) {\n IRuleViolation rv = iter.next();\n Iterator iter = report.errors();\n if (iter.hasNext()) {\n colorize = false;\n while (iter.hasNext()) {\n sb.append(\"<td><font class=body>\").append(iter.next()).append(\"\\\"</font></td></tr>\");\n writer.write(footer());", "old_methods": [], "patch": "@@ -15,23 +15,26 @@\n * @author Vladimir\n * @version $Revision$ $Date$\n */\n-public class VBHTMLRenderer extends AbstractRenderer {\n+public class VBHTMLRenderer extends OnTheFlyRenderer {\n \n- public void render(Writer writer, Report report) throws IOException {\n- if (report.isEmpty()) {\n+ public void start() throws IOException {\n+ getWriter().write(header()); \n+ }\n+\n+ public void renderFileViolations(Iterator<IRuleViolation> violations) throws IOException {\n+ if (!violations.hasNext()) {\n return;\n }\n \n+ Writer writer = getWriter();\n StringBuffer sb = new StringBuffer();\n String filename = null;\n String lineSep = PMD.EOL;\n \n boolean colorize = false;\n-\n- writer.write(header());\n- for (Iterator<IRuleViolation> iter = report.iterator(); iter.hasNext();) {\n+ while (violations.hasNext()) {\n sb.setLength(0);\n- IRuleViolation rv = iter.next();\n+ IRuleViolation rv = violations.next();\n if (!rv.getFilename().equals(filename)) { // New File\n if (filename != null) {\n sb.append(\"</table></br>\");\n@@ -59,29 +62,34 @@ public void render(Writer writer, Report report) throws IOException {\n if (filename != null) {\n writer.write(\"</table>\");\n }\n+ }\n+\n+ public void end() throws IOException {\n+ Writer writer = getWriter();\n+ StringBuffer sb = new StringBuffer();\n+ \n writer.write(\"<br>\");\n \n // output the problems\n- Iterator iter = report.errors();\n- if (iter.hasNext()) {\n+ if (!errors.isEmpty()) {\n sb.setLength(0);\n sb.append(\"<table border=\\\"0\\\" width=\\\"80%\\\">\");\n sb.append(\"<tr id=TableHeader><td><font class=title>&nbsp;Problems found</font></td></tr>\");\n- colorize = false;\n- while (iter.hasNext()) {\n+ boolean colorize = false;\n+ for (Report.ProcessingError error: errors) {\n if (colorize) {\n sb.append(\"<tr id=RowColor1>\");\n } else {\n sb.append(\"<tr id=RowColor2>\");\n }\n colorize = !colorize;\n- sb.append(\"<td><font class=body>\").append(iter.next()).append(\"\\\"</font></td></tr>\");\n+ sb.append(\"<td><font class=body>\").append(error).append(\"\\\"</font></td></tr>\");\n }\n sb.append(\"</table>\");\n writer.write(sb.toString());\n }\n \n- writer.write(footer());\n+ writer.write(footer()); \n }\n \n private String header() {", "raw_url": "https://github.com/adangel/pmd/raw/14da817cf7cc74de98af1649d9dde7da3b4b6c7d/pmd%2Fsrc%2Fnet%2Fsourceforge%2Fpmd%2Frenderers%2FVBHTMLRenderer.java", "sha": "d933e75457782e5dfa59fd32d6a838606d69652e", "status": "modified" } ]
15
[ { "name": "adangel$pmd", "new_args": "", "new_implementation": "Report report = new Report();\n ctx.setReport(report);\n\n report.addError(\n report.addError(\n report.addError(\n return report;\n public static void processFiles(int threadCount, RuleSetFactory ruleSetFactory, SourceType sourceType, List<DataSource> files, RuleContext ctx,\n Renderer renderer, String rulesets, boolean debugEnabled, final boolean shortNamesEnabled, final String inputPath,\n List<Future<Report>> tasks = new LinkedList<Future<Report>>();\n \n Collections.sort(files, new Comparator<DataSource>() {\n public int compare(DataSource d1,DataSource d2) {\n String s1 = d1.getNiceFileName(shortNamesEnabled, inputPath);\n String s2 = d2.getNiceFileName(shortNamesEnabled, inputPath);\n return s1.compareTo(s2);", "new_return_type": "Report", "new_signature": "Report call()", "old_args": "", "old_implementation": "ctx.getReport().addError(\n ctx.getReport().addError(\n ctx.getReport().addError(\n context.setReport(new Report());\n public static void processFiles(int threadCount, RuleSetFactory ruleSetFactory, SourceType sourceType, List<DataSource> files, RuleContext ctx, String rulesets,\n boolean debugEnabled, boolean shortNamesEnabled, String inputPath,\n Runnable r = new PmdRunnable(executor, dataSource, niceFileName, sourceType, debugEnabled,\n executor.execute(r);\n try {\n executor.awaitTermination(Long.MAX_VALUE, TimeUnit.NANOSECONDS);", "old_return_type": "void", "old_signature": "void run()" } ]
1
2
19324b3ed89081bfa2cea984a4708aa3b8c658a8
[ { "name": "google$truth", "new_args": "", "new_implementation": "@Test public void testDeclaresField_public() {\n @Test public void testDeclaresField_nullSubject() {\n @Test public void testDeclaresField_private() {\n @Test public void testIsAssignableFrom_same() {", "new_return_type": "void", "new_signature": "void testDeclaresField_noSuchField()", "old_args": "", "old_implementation": "@Test public void testDeclaresField_Public() {\n @Test public void testDeclaresField_NullSubject() {\n @Test public void testDeclaresField_Private() {\n @Test public void testIsAssignableFromSame() {", "old_return_type": "void", "old_signature": "void testDeclaresField_NoSuchField()" }, { "name": "google$truth", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void testDeclaresField_nullSubject()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void testDeclaresField_NullSubject()" }, { "name": "google$truth", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void testDeclaresField_private()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void testDeclaresField_Private()" }, { "name": "google$truth", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void testDeclaresField_public()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void testDeclaresField_Public()" }, { "name": "google$truth", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void testIsAssignableFrom_parent()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void testIsAssignableFromParent()" } ]
[ { "additions": 12, "blob_url": "https://github.com/google/truth/blob/19324b3ed89081bfa2cea984a4708aa3b8c658a8/core%2Fsrc%2Fmain%2Fjava%2Fcom%2Fgoogle%2Fcommon%2Ftruth%2FClassSubject.java", "changes": 13, "contents_url": "https://api.github.com/repos/google/truth/contents/core%2Fsrc%2Fmain%2Fjava%2Fcom%2Fgoogle%2Fcommon%2Ftruth%2FClassSubject.java?ref=19324b3ed89081bfa2cea984a4708aa3b8c658a8", "deletions": 1, "filename": "core/src/main/java/com/google/common/truth/ClassSubject.java", "new_code": " * Asserts that this class or interface is either the same as, or is a superclass or\n /**\n * Asserts that this class or interface is either the same as, or is a subclass or subinterface\n * of, the given class or interface.\n */\n @GwtIncompatible(\"isAssignableFrom\")\n public void isAssignableTo(Class<?> clazz) {\n if (!clazz.isAssignableFrom(getSubject())) {\n fail(\"is assignable to\", clazz);\n }\n }\n", "new_methods": [ { "arguments": [ "Class<?> clazz" ], "filename": "core/src/main/java/com/google/common/truth/ClassSubject.java", "implementation": "if (!clazz.isAssignableFrom(getSubject())) {\n fail(\"is assignable to\", clazz);", "signature": "void isAssignableTo(Class<?> clazz)" } ], "old_code": " * Attests that this class or interface is either the same as, or is a superclass or", "old_methods": [], "patch": "@@ -23,7 +23,7 @@ public ClassSubject(FailureStrategy failureStrategy, Class<?> o) {\n }\n \n /**\n- * Attests that this class or interface is either the same as, or is a superclass or\n+ * Asserts that this class or interface is either the same as, or is a superclass or\n * superinterface of, the given class or interface.\n */\n @GwtIncompatible(\"isAssignableFrom\")\n@@ -33,6 +33,17 @@ public void isAssignableFrom(Class<?> clazz) {\n }\n }\n \n+ /**\n+ * Asserts that this class or interface is either the same as, or is a subclass or subinterface\n+ * of, the given class or interface.\n+ */\n+ @GwtIncompatible(\"isAssignableFrom\")\n+ public void isAssignableTo(Class<?> clazz) {\n+ if (!clazz.isAssignableFrom(getSubject())) {\n+ fail(\"is assignable to\", clazz);\n+ }\n+ }\n+\n // TODO(user): Create an alternative implementation using JSNI.\n @GwtIncompatible(\"Reflection\")\n public void declaresField(String fieldName) {", "raw_url": "https://github.com/google/truth/raw/19324b3ed89081bfa2cea984a4708aa3b8c658a8/core%2Fsrc%2Fmain%2Fjava%2Fcom%2Fgoogle%2Fcommon%2Ftruth%2FClassSubject.java", "sha": "573a769e4b37fc4a78d578810436c4816482e67b", "status": "modified" }, { "additions": 38, "blob_url": "https://github.com/google/truth/blob/19324b3ed89081bfa2cea984a4708aa3b8c658a8/core%2Fsrc%2Ftest%2Fjava%2Fcom%2Fgoogle%2Fcommon%2Ftruth%2FClassTest.java", "changes": 46, "contents_url": "https://api.github.com/repos/google/truth/contents/core%2Fsrc%2Ftest%2Fjava%2Fcom%2Fgoogle%2Fcommon%2Ftruth%2FClassTest.java?ref=19324b3ed89081bfa2cea984a4708aa3b8c658a8", "deletions": 8, "filename": "core/src/test/java/com/google/common/truth/ClassTest.java", "new_code": " @Test public void testDeclaresField_noSuchField() {\n @Test public void testDeclaresField_public() {\n @Test public void testDeclaresField_nullSubject() {\n @Test public void testDeclaresField_private() {\n @Test public void testIsAssignableFrom_same() {\n }\n @Test public void testIsAssignableFrom_parent() {\n @Test public void testIsAssignableTo_same() {\n assertThat(String.class).isAssignableTo(String.class);\n }\n\n @Test public void testIsAssignableTo_parent() {\n assertThat(String.class).isAssignableTo(Object.class);\n assertThat(NullPointerException.class).isAssignableTo(Exception.class);\n }\n\n @Test public void testIsAssignableTo_reversed() {\n try {\n assertThat(Object.class).isAssignableTo(String.class);\n assert_().fail(\"Should have thrown an assertion error.\");\n } catch (AssertionError expected) {\n assertThat(expected.getMessage())\n .isEqualTo(\"Not true that <class java.lang.Object> \"\n + \"is assignable to <class java.lang.String>\");\n }\n }\n\n @Test public void testIsAssignableTo_reversedDifferentTypes() {\n try {\n assertThat(String.class).isAssignableTo(Exception.class);\n assert_().fail(\"Should have thrown an assertion error.\");\n } catch (AssertionError expected) {\n assertThat(expected.getMessage())\n .isEqualTo(\"Not true that <class java.lang.String> \"\n + \"is assignable to <class java.lang.Exception>\");\n }\n }\n", "new_methods": [ { "arguments": [], "filename": "core/src/test/java/com/google/common/truth/ClassTest.java", "implementation": "@Test public void testDeclaresField_public() {\n @Test public void testDeclaresField_nullSubject() {\n @Test public void testDeclaresField_private() {\n @Test public void testIsAssignableFrom_same() {", "signature": "void testDeclaresField_noSuchField()" }, { "arguments": [], "filename": "core/src/test/java/com/google/common/truth/ClassTest.java", "implementation": "@Test public void testIsAssignableTo_same() {\n assertThat(String.class).isAssignableTo(String.class);", "signature": "void testIsAssignableFrom_parent()" }, { "arguments": [], "filename": "core/src/test/java/com/google/common/truth/ClassTest.java", "implementation": "assertThat(String.class).isAssignableTo(Object.class);\n assertThat(NullPointerException.class).isAssignableTo(Exception.class);", "signature": "void testIsAssignableTo_parent()" }, { "arguments": [], "filename": "core/src/test/java/com/google/common/truth/ClassTest.java", "implementation": "try {\n assertThat(Object.class).isAssignableTo(String.class);\n assert_().fail(\"Should have thrown an assertion error.\");", "signature": "void testIsAssignableTo_reversed()" }, { "arguments": [], "filename": "core/src/test/java/com/google/common/truth/ClassTest.java", "implementation": "try {\n assertThat(String.class).isAssignableTo(Exception.class);\n assert_().fail(\"Should have thrown an assertion error.\");", "signature": "void testIsAssignableTo_reversedDifferentTypes()" } ], "old_code": " @Test public void testDeclaresField_NoSuchField() {\n @Test public void testDeclaresField_Public() {\n @Test public void testDeclaresField_NullSubject() {\n @Test public void testDeclaresField_Private() {\n @Test public void testIsAssignableFromSame() {\n }\n\n @Test public void testIsAssignableFromParent() {", "old_methods": [ { "arguments": [], "filename": "core/src/test/java/com/google/common/truth/ClassTest.java", "implementation": "@Test public void testDeclaresField_Public() {\n @Test public void testDeclaresField_NullSubject() {\n @Test public void testDeclaresField_Private() {\n @Test public void testIsAssignableFromSame() {", "signature": "void testDeclaresField_NoSuchField()" } ], "patch": "@@ -30,7 +30,7 @@\n @RunWith(JUnit4.class)\n public class ClassTest {\n \n- @Test public void testDeclaresField_NoSuchField() {\n+ @Test public void testDeclaresField_noSuchField() {\n try {\n assertThat(A.class).declaresField(\"noField\");\n assert_().fail(\"Should have thrown an assertion error.\");\n@@ -40,11 +40,11 @@ public class ClassTest {\n }\n }\n \n- @Test public void testDeclaresField_Public() {\n+ @Test public void testDeclaresField_public() {\n assertThat(A.class).declaresField(\"publicField\");\n }\n \n- @Test public void testDeclaresField_NullSubject() {\n+ @Test public void testDeclaresField_nullSubject() {\n Class<?> nullClass = null;\n try {\n assertThat(nullClass).declaresField(\"publicField\");\n@@ -55,19 +55,18 @@ public class ClassTest {\n }\n }\n \n- @Test public void testDeclaresField_Private() {\n+ @Test public void testDeclaresField_private() {\n assertThat(A.class).declaresField(\"privateField\");\n }\n \n- @Test public void testIsAssignableFromSame() {\n+ @Test public void testIsAssignableFrom_same() {\n assertThat(String.class.isAssignableFrom(String.class)).isTrue();\n assertThat(String.class).isAssignableFrom(String.class);\n+ }\n \n+ @Test public void testIsAssignableFrom_parent() {\n assertThat(Object.class.isAssignableFrom(String.class)).isTrue();\n assertThat(Object.class).isAssignableFrom(String.class);\n- }\n-\n- @Test public void testIsAssignableFromParent() {\n assertThat(Exception.class.isAssignableFrom(NullPointerException.class)).isTrue();\n assertThat(Exception.class).isAssignableFrom(NullPointerException.class);\n }\n@@ -96,6 +95,37 @@ public class ClassTest {\n }\n }\n \n+ @Test public void testIsAssignableTo_same() {\n+ assertThat(String.class).isAssignableTo(String.class);\n+ }\n+\n+ @Test public void testIsAssignableTo_parent() {\n+ assertThat(String.class).isAssignableTo(Object.class);\n+ assertThat(NullPointerException.class).isAssignableTo(Exception.class);\n+ }\n+\n+ @Test public void testIsAssignableTo_reversed() {\n+ try {\n+ assertThat(Object.class).isAssignableTo(String.class);\n+ assert_().fail(\"Should have thrown an assertion error.\");\n+ } catch (AssertionError expected) {\n+ assertThat(expected.getMessage())\n+ .isEqualTo(\"Not true that <class java.lang.Object> \"\n+ + \"is assignable to <class java.lang.String>\");\n+ }\n+ }\n+\n+ @Test public void testIsAssignableTo_reversedDifferentTypes() {\n+ try {\n+ assertThat(String.class).isAssignableTo(Exception.class);\n+ assert_().fail(\"Should have thrown an assertion error.\");\n+ } catch (AssertionError expected) {\n+ assertThat(expected.getMessage())\n+ .isEqualTo(\"Not true that <class java.lang.String> \"\n+ + \"is assignable to <class java.lang.Exception>\");\n+ }\n+ }\n+\n public static class A {\n public String publicField = null;\n @SuppressWarnings(\"unused\")", "raw_url": "https://github.com/google/truth/raw/19324b3ed89081bfa2cea984a4708aa3b8c658a8/core%2Fsrc%2Ftest%2Fjava%2Fcom%2Fgoogle%2Fcommon%2Ftruth%2FClassTest.java", "sha": "227ace6ab6679f106b6c52656242bfb1615d2ac7", "status": "modified" } ]
2
[ { "name": "google$truth", "new_args": "", "new_implementation": "@Test public void testDeclaresField_public() {\n @Test public void testDeclaresField_nullSubject() {\n @Test public void testDeclaresField_private() {\n @Test public void testIsAssignableFrom_same() {", "new_return_type": "void", "new_signature": "void testDeclaresField_noSuchField()", "old_args": "", "old_implementation": "@Test public void testDeclaresField_Public() {\n @Test public void testDeclaresField_NullSubject() {\n @Test public void testDeclaresField_Private() {\n @Test public void testIsAssignableFromSame() {", "old_return_type": "void", "old_signature": "void testDeclaresField_NoSuchField()" } ]
1
5
26132fb65137f90d5223bf5bddc0c7a296577aec
[ { "name": "spring-projects$greenhouse", "new_args": "", "new_implementation": null, "new_return_type": "Date", "new_signature": "Date getEndDate()", "old_args": "", "old_implementation": null, "old_return_type": "Date", "old_signature": "Date getEndTime()" }, { "name": "spring-projects$greenhouse", "new_args": "", "new_implementation": null, "new_return_type": "Date", "new_signature": "Date getStartDate()", "old_args": "", "old_implementation": null, "old_return_type": "Date", "old_signature": "Date getStartTime()" }, { "name": "spring-projects$greenhouse", "new_args": "", "new_implementation": null, "new_return_type": "String", "new_signature": "String getDescription()", "old_args": "", "old_implementation": null, "old_return_type": "String", "old_signature": "String getSummary()" }, { "name": "spring-projects$greenhouse", "new_args": "Model model", "new_implementation": "model.addAttribute(eventRepository.findUpcomingEvents());\n\t\treturn \"events/list\";", "new_return_type": "String", "new_signature": "String upcomingEventsView(Model model)", "old_args": "Model model", "old_implementation": "model.addAttribute(eventsService.findEventsAfter(new Date()));\n\t\treturn \"events/list\";\n\t@RequestMapping(value=\"/{eventId", "old_return_type": "String", "old_signature": "String listEvents(Model model)" }, { "name": "spring-projects$greenhouse", "new_args": "Date endDate", "new_implementation": null, "new_return_type": "void", "new_signature": "void setEndDate(Date endDate)", "old_args": "Date endTime", "old_implementation": null, "old_return_type": "void", "old_signature": "void setEndTime(Date endTime)" }, { "name": "spring-projects$greenhouse", "new_args": "Date startDate", "new_implementation": null, "new_return_type": "void", "new_signature": "void setStartDate(Date startDate)", "old_args": "Date startTime", "old_implementation": null, "old_return_type": "void", "old_signature": "void setStartTime(Date startTime)" } ]
[ { "additions": 26, "blob_url": "https://github.com/spring-attic/greenhouse/blob/26132fb65137f90d5223bf5bddc0c7a296577aec/src%2Fmain%2Fjava%2Fcom%2Fspringsource%2Fgreenhouse%2Fevents%2FEvent.java", "changes": 71, "contents_url": "https://api.github.com/repos/spring-attic/greenhouse/contents/src%2Fmain%2Fjava%2Fcom%2Fspringsource%2Fgreenhouse%2Fevents%2FEvent.java?ref=26132fb65137f90d5223bf5bddc0c7a296577aec", "deletions": 45, "filename": "src/main/java/com/springsource/greenhouse/events/Event.java", "new_code": "\tprivate Long id;\n\tprivate Date startDate;\n\tprivate Date endDate;\n\tprivate String location;\n\tprivate String description;\n\t\n\tpublic Long getId() {\n\t\treturn id;\n\tpublic void setId(Long id) {\n\t\n\tpublic Date getStartDate() {\n\t\treturn startDate;\n\tpublic void setStartDate(Date startDate) {\n\t\tthis.startDate = startDate;\n\tpublic Date getEndDate() {\n\t\treturn endDate;\n\tpublic void setEndDate(Date endDate) {\n\t\tthis.endDate = endDate;\n\tpublic String getDescription() {\n\t\treturn this.description;\n\t}\n\n\tpublic void setDescription(String description) {\n\t\tthis.description = description;\n\t}\n}", "new_methods": [ { "arguments": [], "filename": "src/main/java/com/springsource/greenhouse/events/Event.java", "implementation": "return id;\n\tpublic void setId(Long id) {\n\t\n\tpublic Date getStartDate() {\n\t\treturn startDate;\n\tpublic void setStartDate(Date startDate) {\n\t\tthis.startDate = startDate;\n\tpublic Date getEndDate() {\n\t\treturn endDate;\n\tpublic void setEndDate(Date endDate) {\n\t\tthis.endDate = endDate;\n\tpublic String getDescription() {\n\t\treturn this.description;", "signature": "Long getId()" }, { "arguments": [ "String description" ], "filename": "src/main/java/com/springsource/greenhouse/events/Event.java", "implementation": "this.description = description;", "signature": "void setDescription(String description)" } ], "old_code": "\tprivate long id;\n\tprivate String friendlyId;\n\t\n\tprivate String location;\n\n\tprivate String description;\n\n\tprivate Date startTime;\n\tprivate Date endTime;\n\tprivate String hashtag;\n\tpublic long getId() {\n\t\treturn this.id;\n\tpublic void setId(long id) {\n\n\tpublic String getDescription() {\n\t\treturn this.description;\n\t}\n\n\tpublic void setDescription(String description) {\n\t\tthis.description = description;\n\t}\n\n\tpublic Date getStartTime() {\n\t\treturn this.startTime;\n\t}\n\n\tpublic void setStartTime(Date startTime) {\n\t\tthis.startTime = startTime;\n\t}\n\n\tpublic Date getEndTime() {\n\t\treturn this.endTime;\n\tpublic void setEndTime(Date endTime) {\n\t\tthis.endTime = endTime;\n\tpublic String getHashtag() {\n\t\treturn this.hashtag;\n\tpublic void setHashtag(String hashtag) {\n\t\tthis.hashtag = hashtag;\n\tpublic void setFriendlyId(String friendlyId) {\n\t this.friendlyId = friendlyId;\n }\n\tpublic String getFriendlyId() {\n\t return friendlyId;\n }\n}", "old_methods": [ { "arguments": [], "filename": "src/main/java/com/springsource/greenhouse/events/Event.java", "implementation": "return this.id;\n\tpublic void setId(long id) {\n\n\tpublic String getDescription() {\n\t\treturn this.description;", "signature": "long getId()" }, { "arguments": [ "String description" ], "filename": "src/main/java/com/springsource/greenhouse/events/Event.java", "implementation": "this.description = description;", "signature": "void setDescription(String description)" }, { "arguments": [], "filename": "src/main/java/com/springsource/greenhouse/events/Event.java", "implementation": "return this.startTime;", "signature": "Date getStartTime()" }, { "arguments": [ "Date startTime" ], "filename": "src/main/java/com/springsource/greenhouse/events/Event.java", "implementation": "this.startTime = startTime;", "signature": "void setStartTime(Date startTime)" }, { "arguments": [], "filename": "src/main/java/com/springsource/greenhouse/events/Event.java", "implementation": "return this.endTime;\n\tpublic void setEndTime(Date endTime) {\n\t\tthis.endTime = endTime;\n\tpublic String getHashtag() {\n\t\treturn this.hashtag;\n\tpublic void setHashtag(String hashtag) {\n\t\tthis.hashtag = hashtag;\n\tpublic void setFriendlyId(String friendlyId) {\n\t this.friendlyId = friendlyId;", "signature": "Date getEndTime()" }, { "arguments": [], "filename": "src/main/java/com/springsource/greenhouse/events/Event.java", "implementation": "return friendlyId;", "signature": "String getFriendlyId()" } ], "patch": "@@ -4,27 +4,23 @@\n \n public class Event {\n \n-\tprivate long id;\n+\tprivate Long id;\n \n-\tprivate String friendlyId;\n-\t\n \tprivate String title;\n \n-\tprivate String location;\n-\n-\tprivate String description;\n-\n-\tprivate Date startTime;\n+\tprivate Date startDate;\n \n-\tprivate Date endTime;\n+\tprivate Date endDate;\n \n-\tprivate String hashtag;\n+\tprivate String location;\n \n-\tpublic long getId() {\n-\t\treturn this.id;\n+\tprivate String description;\n+\t\n+\tpublic Long getId() {\n+\t\treturn id;\n \t}\n \n-\tpublic void setId(long id) {\n+\tpublic void setId(Long id) {\n \t\tthis.id = id;\n \t}\n \n@@ -35,37 +31,21 @@ public String getTitle() {\n \tpublic void setTitle(String title) {\n \t\tthis.title = title;\n \t}\n-\n-\tpublic String getDescription() {\n-\t\treturn this.description;\n-\t}\n-\n-\tpublic void setDescription(String description) {\n-\t\tthis.description = description;\n-\t}\n-\n-\tpublic Date getStartTime() {\n-\t\treturn this.startTime;\n-\t}\n-\n-\tpublic void setStartTime(Date startTime) {\n-\t\tthis.startTime = startTime;\n-\t}\n-\n-\tpublic Date getEndTime() {\n-\t\treturn this.endTime;\n+\t\n+\tpublic Date getStartDate() {\n+\t\treturn startDate;\n \t}\n \n-\tpublic void setEndTime(Date endTime) {\n-\t\tthis.endTime = endTime;\n+\tpublic void setStartDate(Date startDate) {\n+\t\tthis.startDate = startDate;\n \t}\n \n-\tpublic String getHashtag() {\n-\t\treturn this.hashtag;\n+\tpublic Date getEndDate() {\n+\t\treturn endDate;\n \t}\n \n-\tpublic void setHashtag(String hashtag) {\n-\t\tthis.hashtag = hashtag;\n+\tpublic void setEndDate(Date endDate) {\n+\t\tthis.endDate = endDate;\n \t}\n \n \tpublic void setLocation(String location) {\n@@ -76,11 +56,12 @@ public String getLocation() {\n \t\treturn location;\n \t}\n \n-\tpublic void setFriendlyId(String friendlyId) {\n-\t this.friendlyId = friendlyId;\n- }\n+\tpublic String getDescription() {\n+\t\treturn this.description;\n+\t}\n+\n+\tpublic void setDescription(String description) {\n+\t\tthis.description = description;\n+\t}\n \n-\tpublic String getFriendlyId() {\n-\t return friendlyId;\n- }\n-}\n+}\n\\ No newline at end of file", "raw_url": "https://github.com/spring-attic/greenhouse/raw/26132fb65137f90d5223bf5bddc0c7a296577aec/src%2Fmain%2Fjava%2Fcom%2Fspringsource%2Fgreenhouse%2Fevents%2FEvent.java", "sha": "a29c0c77856304cf6c4c74575018c7ca86677cd8", "status": "modified" }, { "additions": 23, "blob_url": "https://github.com/spring-attic/greenhouse/blob/26132fb65137f90d5223bf5bddc0c7a296577aec/src%2Fmain%2Fjava%2Fcom%2Fspringsource%2Fgreenhouse%2Fevents%2FEventSession.java", "changes": 56, "contents_url": "https://api.github.com/repos/spring-attic/greenhouse/contents/src%2Fmain%2Fjava%2Fcom%2Fspringsource%2Fgreenhouse%2Fevents%2FEventSession.java?ref=26132fb65137f90d5223bf5bddc0c7a296577aec", "deletions": 33, "filename": "src/main/java/com/springsource/greenhouse/events/EventSession.java", "new_code": "import java.util.Collections;\nimport java.util.Set;\n\tprivate Short code;\n\tprivate String title;\n\tprivate String description;\n\tprivate Set<EventSessionLeader> leaders;\n\tpublic EventSession(Short code, String title, Date startTime, Date endTime, String description, EventSessionLeader leader) {\n\t\tthis(code, title, startTime, endTime, description, Collections.singleton(leader));\n\t\t\n\tpublic EventSession(Short code, String title, Date startTime, Date endTime, String description, Set<EventSessionLeader> leaders) {\n\t\tthis.code = code;\n\t\tthis.description = description;\n\n\tpublic Short getCode() {\n\t\treturn code;\n\tpublic String getTitle() {\n\t\treturn title;\n\tpublic String getDescription() {\n\t\treturn description;\n\tpublic Set<EventSessionLeader> getLeaders() {\n\t\treturn leaders;\n\n}", "new_methods": [ { "arguments": [ "Short code", " String title", " Date startTime", " Date endTime", " String description", " EventSessionLeader leader" ], "filename": "src/main/java/com/springsource/greenhouse/events/EventSession.java", "implementation": "this(code, title, startTime, endTime, description, Collections.singleton(leader));\n\t\t\n\tpublic EventSession(Short code, String title, Date startTime, Date endTime, String description, Set<EventSessionLeader> leaders) {\n\t\tthis.code = code;\n\t\tthis.description = description;\n\n\tpublic Short getCode() {\n\t\treturn code;\n\tpublic String getTitle() {\n\t\treturn title;\n\tpublic String getDescription() {\n\t\treturn description;\n\tpublic Set<EventSessionLeader> getLeaders() {\n\t\treturn leaders;", "signature": "public EventSession(Short code, String title, Date startTime, Date endTime, String description, EventSessionLeader leader)" } ], "old_code": "import java.util.ArrayList;\nimport java.util.List;\n\tprivate String title;\n\tprivate String summary;\n\tprivate List<SessionLeader> leaders;\n\tprivate String hashtag;\n\tpublic EventSession(String title, String summary, Date startTime,\n\t\t\tDate endTime, SessionLeader leader, String hashtag) {\n\t\tsuper();\n\t\tthis.title = title;\n\t\tthis.summary = summary;\n\t\tthis.startTime = startTime;\n\t\tthis.endTime = endTime;\n\t\t\n\t\tthis.leaders = new ArrayList<SessionLeader>();\n\t\tthis.leaders.add(leader);\n\t\tthis.hashtag = hashtag;\n\n\tpublic EventSession(String title, String summary, Date startTime,\n\t\t\tDate endTime, List<SessionLeader> leaders, String hashtag) {\n\t\tsuper();\n\t\tthis.summary = summary;\n\t\tthis.hashtag = hashtag;\n\t\n\tpublic String getTitle() {\n\t\treturn title;\n\tpublic String getSummary() {\n\t\treturn summary;\n\tpublic List<SessionLeader> getLeaders() {\n\t\treturn leaders;\n\tpublic String getHashtag() {\n\t\treturn hashtag;\n}", "old_methods": [ { "arguments": [ "String title", " String summary", " Date startTime", "\n\t\t\tDate endTime", " SessionLeader leader", " String hashtag" ], "filename": "src/main/java/com/springsource/greenhouse/events/EventSession.java", "implementation": "super();\n\t\tthis.title = title;\n\t\tthis.summary = summary;\n\t\tthis.startTime = startTime;\n\t\tthis.endTime = endTime;\n\t\t\n\t\tthis.leaders = new ArrayList<SessionLeader>();\n\t\tthis.leaders.add(leader);\n\t\tthis.hashtag = hashtag;\n\n\tpublic EventSession(String title, String summary, Date startTime,\n\t\t\tDate endTime, List<SessionLeader> leaders, String hashtag) {\n\t\tsuper();\n\t\tthis.summary = summary;\n\t\tthis.hashtag = hashtag;\n\t\n\tpublic String getTitle() {\n\t\treturn title;\n\tpublic String getSummary() {\n\t\treturn summary;\n\tpublic List<SessionLeader> getLeaders() {\n\t\treturn leaders;\n\tpublic String getHashtag() {\n\t\treturn hashtag;", "signature": "public EventSession(String title, String summary, Date startTime,\n\t\t\tDate endTime, SessionLeader leader, String hashtag)" } ], "patch": "@@ -1,53 +1,42 @@\n package com.springsource.greenhouse.events;\n \n-import java.util.ArrayList;\n+import java.util.Collections;\n import java.util.Date;\n-import java.util.List;\n+import java.util.Set;\n \n public class EventSession {\n \t\n-\tprivate String title;\n+\tprivate Short code;\n \t\n-\tprivate String summary;\n+\tprivate String title;\n \t\n \tprivate Date startTime;\n \t\n \tprivate Date endTime;\n \n-\tprivate List<SessionLeader> leaders;\n+\tprivate String description;\n \t\n-\tprivate String hashtag;\n+\tprivate Set<EventSessionLeader> leaders;\n \n-\tpublic EventSession(String title, String summary, Date startTime,\n-\t\t\tDate endTime, SessionLeader leader, String hashtag) {\n-\t\tsuper();\n-\t\tthis.title = title;\n-\t\tthis.summary = summary;\n-\t\tthis.startTime = startTime;\n-\t\tthis.endTime = endTime;\n-\t\t\n-\t\tthis.leaders = new ArrayList<SessionLeader>();\n-\t\tthis.leaders.add(leader);\n-\t\tthis.hashtag = hashtag;\n+\tpublic EventSession(Short code, String title, Date startTime, Date endTime, String description, EventSessionLeader leader) {\n+\t\tthis(code, title, startTime, endTime, description, Collections.singleton(leader));\n \t}\n-\n-\tpublic EventSession(String title, String summary, Date startTime,\n-\t\t\tDate endTime, List<SessionLeader> leaders, String hashtag) {\n-\t\tsuper();\n+\t\t\n+\tpublic EventSession(Short code, String title, Date startTime, Date endTime, String description, Set<EventSessionLeader> leaders) {\n+\t\tthis.code = code;\n \t\tthis.title = title;\n-\t\tthis.summary = summary;\n \t\tthis.startTime = startTime;\n \t\tthis.endTime = endTime;\n+\t\tthis.description = description;\n \t\tthis.leaders = leaders;\n-\t\tthis.hashtag = hashtag;\n \t}\n-\t\n-\tpublic String getTitle() {\n-\t\treturn title;\n+\n+\tpublic Short getCode() {\n+\t\treturn code;\n \t}\n \n-\tpublic String getSummary() {\n-\t\treturn summary;\n+\tpublic String getTitle() {\n+\t\treturn title;\n \t}\n \n \tpublic Date getStartTime() {\n@@ -58,11 +47,12 @@ public Date getEndTime() {\n \t\treturn endTime;\n \t}\n \n-\tpublic List<SessionLeader> getLeaders() {\n-\t\treturn leaders;\n+\tpublic String getDescription() {\n+\t\treturn description;\n \t}\n \n-\tpublic String getHashtag() {\n-\t\treturn hashtag;\n+\tpublic Set<EventSessionLeader> getLeaders() {\n+\t\treturn leaders;\n \t}\n-}\n+\n+}\n\\ No newline at end of file", "raw_url": "https://github.com/spring-attic/greenhouse/raw/26132fb65137f90d5223bf5bddc0c7a296577aec/src%2Fmain%2Fjava%2Fcom%2Fspringsource%2Fgreenhouse%2Fevents%2FEventSession.java", "sha": "8ad75fa5655b873084ece0f8f8ccbde036849949", "status": "modified" }, { "additions": 36, "blob_url": "https://github.com/spring-attic/greenhouse/blob/26132fb65137f90d5223bf5bddc0c7a296577aec/src%2Fmain%2Fjava%2Fcom%2Fspringsource%2Fgreenhouse%2Fevents%2FEventsController.java", "changes": 143, "contents_url": "https://api.github.com/repos/spring-attic/greenhouse/contents/src%2Fmain%2Fjava%2Fcom%2Fspringsource%2Fgreenhouse%2Fevents%2FEventsController.java?ref=26132fb65137f90d5223bf5bddc0c7a296577aec", "deletions": 107, "filename": "src/main/java/com/springsource/greenhouse/events/EventsController.java", "new_code": "import org.springframework.security.oauth.extras.OAuthAccessToken;\n\tprivate EventRepository eventRepository;\n\tprivate TwitterOperations twitter;\n\t\t\n\tpublic EventsController(EventRepository eventRepository, TwitterOperations twitter) {\n\t\tthis.eventRepository = eventRepository;\n\t// for web service (JSON) clients\n\t@RequestMapping(method=RequestMethod.GET, headers=\"Accept=application/json\") \n\tpublic @ResponseBody List<Event> upcomingEvents() {\n\t\treturn eventRepository.findUpcomingEvents();\n\t@RequestMapping(value=\"/{id}/tweets\", method=RequestMethod.GET, headers=\"Accept=application/json\")\n\tpublic @ResponseBody SearchResults tweets(@PathVariable Long id, @RequestParam(defaultValue=\"1\") Integer page, @RequestParam(defaultValue=\"10\") Integer pageSize) {\n\t\treturn twitter.search(eventRepository.getEventSearchString(id), page, pageSize);\n\t@RequestMapping(value=\"/{id}/tweets\", method=RequestMethod.POST)\n\tpublic @ResponseBody void postTweet(Long eventId, @RequestParam String status, @OAuthAccessToken(\"twitter\") OAuthConsumerToken accessToken) {\n\t\ttwitter.updateStatus(accessToken, status);\n\t@RequestMapping(value=\"/{id}/sessions/today\", method=RequestMethod.GET, headers=\"Accept=application/json\")\n\tpublic @ResponseBody List<EventSession> sessionsToday(@PathVariable Long id) {\n\t\treturn eventRepository.findTodaysSessions(id);\n\t}\n\t@RequestMapping(value=\"/{id}/sessions/{code}/tweets\", method=RequestMethod.GET, headers=\"Accept=application/json\")\n\tpublic @ResponseBody SearchResults sessionTweets(@PathVariable Long id, Short code, @RequestParam(defaultValue=\"1\") Integer page, @RequestParam(defaultValue=\"10\") Integer pageSize) {\n\t\treturn twitter.search(eventRepository.getEventSessionSearchString(id, code), page, pageSize);\n\t}\n\t@RequestMapping(value=\"/{id}/sessions/{code}/tweets\", method=RequestMethod.POST)\n\tpublic @ResponseBody void postSessionTweet(Long id, Short code, @RequestParam String status, @OAuthAccessToken(\"twitter\") OAuthConsumerToken accessToken) {\n\t\ttwitter.updateStatus(accessToken, status);\n\t}\n\t// for web browser (HTML) clients\n\t\n\t@RequestMapping(method=RequestMethod.GET, headers=\"Accept=text/html\")\n\tpublic String upcomingEventsView(Model model) {\n\t\tmodel.addAttribute(eventRepository.findUpcomingEvents());\n\t\treturn \"events/list\";\n\t\n}", "new_methods": [ { "arguments": [ "EventRepository eventRepository", " TwitterOperations twitter" ], "filename": "src/main/java/com/springsource/greenhouse/events/EventsController.java", "implementation": "this.eventRepository = eventRepository;\n\t// for web service (JSON) clients\n\t@RequestMapping(method=RequestMethod.GET, headers=\"Accept=application/json\") \n\tpublic @ResponseBody List<Event> upcomingEvents() {\n\t\treturn eventRepository.findUpcomingEvents();\n\t@RequestMapping(value=\"/{id", "signature": "public EventsController(EventRepository eventRepository, TwitterOperations twitter)" }, { "arguments": [ "Model model" ], "filename": "src/main/java/com/springsource/greenhouse/events/EventsController.java", "implementation": "model.addAttribute(eventRepository.findUpcomingEvents());\n\t\treturn \"events/list\";", "signature": "String upcomingEventsView(Model model)" } ], "old_code": "import java.util.ArrayList;\nimport java.util.Date;\nimport org.joda.time.DateTime;\nimport org.slf4j.Logger;\nimport org.slf4j.LoggerFactory;\n\tprivate EventsService eventsService;\n\tprivate TwitterOperations twitter;\n\tprivate final Logger logger = LoggerFactory.getLogger(getClass());\n\tpublic EventsController(EventsService eventsService, TwitterOperations twitter) {\n\t\tthis.eventsService = eventsService;\n\t@RequestMapping(method=RequestMethod.GET, headers=\"Accept=application/json\") \n\tpublic @ResponseBody List<Event> eventsData() {\n\t\treturn eventsService.findEventsAfter(new Date());\n\t}\n\t@RequestMapping(method=RequestMethod.GET)\n\tpublic String listEvents(Model model) {\n\t\tmodel.addAttribute(eventsService.findEventsAfter(new Date()));\n\t\treturn \"events/list\";\n\t@RequestMapping(value=\"/{eventId}\", method=RequestMethod.GET, headers=\"Accept=application/json\")\n\tpublic @ResponseBody Event eventData(@PathVariable long eventId) {\n\t\treturn eventsService.findEventById(eventId);\n\t@RequestMapping(value=\"/{eventName}\", method=RequestMethod.GET)\n\tpublic String viewEvent(OAuthConsumerToken accessToken, @PathVariable String eventName, Model model) {\n\t\tEvent event = eventsService.findEventByPublicId(eventName);\n\t\tmodel.addAttribute(event);\n\t\tmodel.addAttribute(twitter.search(accessToken, event.getHashtag(), 1, 10));\n\t\treturn \"events/view\";\n\t\n\t@RequestMapping(value=\"/{eventId}/tweets\", method=RequestMethod.GET, headers=\"Accept=application/json\")\n\tpublic @ResponseBody SearchResults listEventTweets(OAuthConsumerToken accessToken, @PathVariable long eventId, \n\t\t\t@RequestParam(defaultValue=\"1\") int page, @RequestParam(defaultValue=\"10\") int perPage) {\n\t\tEvent event = eventsService.findEventById(eventId);\n\t\treturn twitter.search(accessToken, event.getHashtag(), page, perPage);\n\t}\n\t\n\t// This method is stubbed out to test posting a twitter status\n\t@RequestMapping(value=\"/tweet\", method=RequestMethod.POST)//, headers=\"Accept=application/json\")\n\tpublic @ResponseBody String postTweet(OAuthConsumerToken accessToken, @RequestParam String status) {\n\t\tlogger.info(\"twitter update: \" + status);\n\t\t\n\t\treturn \"hello\";\n\t}\n\t\t\n\t// This method should return all sessions for the current day\n\t@RequestMapping(value=\"/{eventId}/currentsessions\", method=RequestMethod.GET, headers=\"Accept=application/json\")\n\tpublic @ResponseBody List<EventSession> listCurrentSessions(@PathVariable long eventId) {\n\t\t\n\t\t// This is just a bunch of test session data that updates to the current date so \n\t\t// we can always see upcoming and happening now sessions.\n\t\t\n\t\tList<EventSession> sessions = new ArrayList<EventSession>();\n\t\t\n\t\tDate now = new Date();\n\t\tint year = now.getYear() + 1900;\n\t\tint month = now.getMonth() + 1;\n\t\tint date = now.getDate();\n\t\t\n\t\tDate startTime = new DateTime(year, month, date, 8, 30, 0, 0).toDate();\n\t\tDate endTime = new DateTime(year, month, date, 10, 0, 0, 0).toDate();\n\t\t\n\t\tfor (int i = 0; i < 9; i++)\n\t\t{\n\t\t\tsessions.add(new EventSession(\"Test Session A\" + i, \"Description for Test Session A\" + i, startTime, endTime, new SessionLeader(\"Johnny\", \"Speaker\"), \"#SpringOne2GX-A\" + i));\n\t\t}\n\n\t\tstartTime = new DateTime(year, month, date, 10, 15, 0, 0).toDate();\n\t\tendTime = new DateTime(year, month, date, 11, 45, 0, 0).toDate();\n\t\t\n\t\tfor (int i = 0; i < 9; i++)\n\t\t{\n\t\t\tList<SessionLeader> leaders = new ArrayList<SessionLeader>();\n\t\t\tleaders.add(new SessionLeader(\"Roy\", \"Clarkson\"));\n\t\t\tleaders.add(new SessionLeader(\"Jeremy\", \"Grelle\"));\n\t\t\tsessions.add(new EventSession(\"Test Session B\" + i, \"Description for Test Session B\" + i, startTime, endTime, leaders, \"#SpringOne2GX-B\" + i));\n\t\t}\n\n\t\tstartTime = new DateTime(year, month, date, 12, 45, 0, 0).toDate();\n\t\tendTime = new DateTime(year, month, date, 14, 15, 0, 0).toDate();\n\t\t\n\t\tfor (int i = 0; i < 9; i++)\n\t\t{\n\t\t\tsessions.add(new EventSession(\"Test Session C\" + i, \"Description for Test Session C\" + i, startTime, endTime, new SessionLeader(\"Johnny\", \"Speaker\"), \"#SpringOne2GX-C\" + i));\n\t\t}\n\t\tstartTime = new DateTime(year, month, date, 14, 45, 0, 0).toDate();\n\t\tendTime = new DateTime(year, month, date, 16, 15, 0, 0).toDate();\n\t\tfor (int i = 0; i < 9; i++)\n\t\t{\n\t\t\tsessions.add(new EventSession(\"Test Session D\" + i, \"Description for Test Session D\" + i, startTime, endTime, new SessionLeader(\"Johnny\", \"Speaker\"), \"#SpringOne2GX-D\" + i));\n\t\t}\n\t\tstartTime = new DateTime(year, month, date, 16, 30, 0, 0).toDate();\n\t\tendTime = new DateTime(year, month, date, 18, 0, 0, 0).toDate();\n\t\tfor (int i = 0; i < 9; i++)\n\t\t{\n\t\t\tsessions.add(new EventSession(\"Test Session E\" + i, \"Description for Test Session E\" + i, startTime, endTime, new SessionLeader(\"Johnny\", \"Speaker\"), \"#SpringOne2GX-E\" + i));\n\t\t}\n\t\t\t\t\n//\t\tsessions.add(new EventSession(\"What's new in Spring 3\", \"Come see the latest Spring Framework features!\", new DateTime(2010, 10, 20, 8, 0, 0, 0).toDate(), new DateTime(2010, 10, 20, 9, 0, 0, 0).toDate(), new SessionLeader(\"Juergen\", \"Hoeller\")));\n//\t\tsessions.add(new EventSession(\"What's new in Grails 2\", \"Come see the latest Grails features!\", new DateTime(2010, 10, 20, 8, 0, 0, 0).toDate(), new DateTime(2010, 10, 20, 9, 0, 0, 0).toDate(), new SessionLeader(\"Graeme\", \"Rocher\")));\n//\t\tsessions.add(new EventSession(\"Building Social Ready Webapps\", \"Come learn how to do the social stuff!\", new DateTime(2010, 10, 20, 9, 0, 0, 0).toDate(), new DateTime(2010, 10, 20, 10, 0, 0, 0).toDate(), new SessionLeader(\"Craig\", \"Walls\")));\n//\t\t\n//\t\tList<SessionLeader> mobileLeaders = new ArrayList<SessionLeader>();\n//\t\tmobileLeaders.add(new SessionLeader(\"Roy\", \"Clarkson\"));\n//\t\tmobileLeaders.add(new SessionLeader(\"Jeremy\", \"Clarkson\"));\n//\t\tsessions.add(new EventSession(\"Choices in Mobile Application Development\", \"Come learn how to do the mobile stuff!\", new DateTime(2010, 10, 20, 9, 0, 0, 0).toDate(), new DateTime(2010, 10, 20, 10, 0, 0, 0).toDate(), mobileLeaders));\n\t\t\n\t\treturn sessions;\n}", "old_methods": [ { "arguments": [ "EventsService eventsService", " TwitterOperations twitter" ], "filename": "src/main/java/com/springsource/greenhouse/events/EventsController.java", "implementation": "this.eventsService = eventsService;\n\t@RequestMapping(method=RequestMethod.GET, headers=\"Accept=application/json\") \n\tpublic @ResponseBody List<Event> eventsData() {\n\t\treturn eventsService.findEventsAfter(new Date());", "signature": "public EventsController(EventsService eventsService, TwitterOperations twitter)" }, { "arguments": [ "Model model" ], "filename": "src/main/java/com/springsource/greenhouse/events/EventsController.java", "implementation": "model.addAttribute(eventsService.findEventsAfter(new Date()));\n\t\treturn \"events/list\";\n\t@RequestMapping(value=\"/{eventId", "signature": "String listEvents(Model model)" }, { "arguments": [ "@PathVariable long eventId" ], "filename": "src/main/java/com/springsource/greenhouse/events/EventsController.java", "implementation": "return eventsService.findEventById(eventId);\n\t@RequestMapping(value=\"/{eventName", "signature": "Event eventData(@PathVariable long eventId)" }, { "arguments": [ "OAuthConsumerToken accessToken", " @PathVariable String eventName", " Model model" ], "filename": "src/main/java/com/springsource/greenhouse/events/EventsController.java", "implementation": "Event event = eventsService.findEventByPublicId(eventName);\n\t\tmodel.addAttribute(event);\n\t\tmodel.addAttribute(twitter.search(accessToken, event.getHashtag(), 1, 10));\n\t\treturn \"events/view\";\n\t\n\t@RequestMapping(value=\"/{eventId", "signature": "String viewEvent(OAuthConsumerToken accessToken, @PathVariable String eventName, Model model)" }, { "arguments": [ "OAuthConsumerToken accessToken", " @RequestParam String status" ], "filename": "src/main/java/com/springsource/greenhouse/events/EventsController.java", "implementation": "logger.info(\"twitter update: \" + status);\n\t\t\n\t\treturn \"hello\";", "signature": "String postTweet(OAuthConsumerToken accessToken, @RequestParam String status)" } ], "patch": "@@ -1,15 +1,11 @@\n package com.springsource.greenhouse.events;\n \n-import java.util.ArrayList;\n-import java.util.Date;\n import java.util.List;\n \n import javax.inject.Inject;\n \n-import org.joda.time.DateTime;\n-import org.slf4j.Logger;\n-import org.slf4j.LoggerFactory;\n import org.springframework.security.oauth.consumer.token.OAuthConsumerToken;\n+import org.springframework.security.oauth.extras.OAuthAccessToken;\n import org.springframework.social.twitter.SearchResults;\n import org.springframework.social.twitter.TwitterOperations;\n import org.springframework.stereotype.Controller;\n@@ -24,121 +20,54 @@\n @RequestMapping(\"/events\")\n public class EventsController {\n \t\n-\tprivate EventsService eventsService;\n-\tprivate TwitterOperations twitter;\n-\tprivate final Logger logger = LoggerFactory.getLogger(getClass());\n+\tprivate EventRepository eventRepository;\n \t\n+\tprivate TwitterOperations twitter;\n+\t\t\n \t@Inject\n-\tpublic EventsController(EventsService eventsService, TwitterOperations twitter) {\n-\t\tthis.eventsService = eventsService;\n+\tpublic EventsController(EventRepository eventRepository, TwitterOperations twitter) {\n+\t\tthis.eventRepository = eventRepository;\n \t\tthis.twitter = twitter;\n \t}\n \t\n-\t@RequestMapping(method=RequestMethod.GET, headers=\"Accept=application/json\") \n-\tpublic @ResponseBody List<Event> eventsData() {\n-\t\treturn eventsService.findEventsAfter(new Date());\n-\t}\n+\t// for web service (JSON) clients\n \t\n-\t@RequestMapping(method=RequestMethod.GET)\n-\tpublic String listEvents(Model model) {\n-\t\tmodel.addAttribute(eventsService.findEventsAfter(new Date()));\n-\t\treturn \"events/list\";\n+\t@RequestMapping(method=RequestMethod.GET, headers=\"Accept=application/json\") \n+\tpublic @ResponseBody List<Event> upcomingEvents() {\n+\t\treturn eventRepository.findUpcomingEvents();\n \t}\n \n-\t@RequestMapping(value=\"/{eventId}\", method=RequestMethod.GET, headers=\"Accept=application/json\")\n-\tpublic @ResponseBody Event eventData(@PathVariable long eventId) {\n-\t\treturn eventsService.findEventById(eventId);\n+\t@RequestMapping(value=\"/{id}/tweets\", method=RequestMethod.GET, headers=\"Accept=application/json\")\n+\tpublic @ResponseBody SearchResults tweets(@PathVariable Long id, @RequestParam(defaultValue=\"1\") Integer page, @RequestParam(defaultValue=\"10\") Integer pageSize) {\n+\t\treturn twitter.search(eventRepository.getEventSearchString(id), page, pageSize);\n \t}\n \n-\t@RequestMapping(value=\"/{eventName}\", method=RequestMethod.GET)\n-\tpublic String viewEvent(OAuthConsumerToken accessToken, @PathVariable String eventName, Model model) {\n-\t\tEvent event = eventsService.findEventByPublicId(eventName);\n-\t\tmodel.addAttribute(event);\n-\t\tmodel.addAttribute(twitter.search(accessToken, event.getHashtag(), 1, 10));\n-\t\treturn \"events/view\";\n+\t@RequestMapping(value=\"/{id}/tweets\", method=RequestMethod.POST)\n+\tpublic @ResponseBody void postTweet(Long eventId, @RequestParam String status, @OAuthAccessToken(\"twitter\") OAuthConsumerToken accessToken) {\n+\t\ttwitter.updateStatus(accessToken, status);\n \t}\n-\t\n-\t@RequestMapping(value=\"/{eventId}/tweets\", method=RequestMethod.GET, headers=\"Accept=application/json\")\n-\tpublic @ResponseBody SearchResults listEventTweets(OAuthConsumerToken accessToken, @PathVariable long eventId, \n-\t\t\t@RequestParam(defaultValue=\"1\") int page, @RequestParam(defaultValue=\"10\") int perPage) {\n-\t\tEvent event = eventsService.findEventById(eventId);\n-\t\treturn twitter.search(accessToken, event.getHashtag(), page, perPage);\n-\t}\n-\t\n-\t// This method is stubbed out to test posting a twitter status\n-\t@RequestMapping(value=\"/tweet\", method=RequestMethod.POST)//, headers=\"Accept=application/json\")\n-\tpublic @ResponseBody String postTweet(OAuthConsumerToken accessToken, @RequestParam String status) {\n-\t\tlogger.info(\"twitter update: \" + status);\n-\t\t\n-\t\treturn \"hello\";\n-\t}\n-\t\t\n-\t// This method should return all sessions for the current day\n-\t@RequestMapping(value=\"/{eventId}/currentsessions\", method=RequestMethod.GET, headers=\"Accept=application/json\")\n-\tpublic @ResponseBody List<EventSession> listCurrentSessions(@PathVariable long eventId) {\n-\t\t\n-\t\t// This is just a bunch of test session data that updates to the current date so \n-\t\t// we can always see upcoming and happening now sessions.\n-\t\t\n-\t\tList<EventSession> sessions = new ArrayList<EventSession>();\n-\t\t\n-\t\tDate now = new Date();\n-\t\tint year = now.getYear() + 1900;\n-\t\tint month = now.getMonth() + 1;\n-\t\tint date = now.getDate();\n-\t\t\n-\t\tDate startTime = new DateTime(year, month, date, 8, 30, 0, 0).toDate();\n-\t\tDate endTime = new DateTime(year, month, date, 10, 0, 0, 0).toDate();\n-\t\t\n-\t\tfor (int i = 0; i < 9; i++)\n-\t\t{\n-\t\t\tsessions.add(new EventSession(\"Test Session A\" + i, \"Description for Test Session A\" + i, startTime, endTime, new SessionLeader(\"Johnny\", \"Speaker\"), \"#SpringOne2GX-A\" + i));\n-\t\t}\n-\n-\t\tstartTime = new DateTime(year, month, date, 10, 15, 0, 0).toDate();\n-\t\tendTime = new DateTime(year, month, date, 11, 45, 0, 0).toDate();\n-\t\t\n-\t\tfor (int i = 0; i < 9; i++)\n-\t\t{\n-\t\t\tList<SessionLeader> leaders = new ArrayList<SessionLeader>();\n-\t\t\tleaders.add(new SessionLeader(\"Roy\", \"Clarkson\"));\n-\t\t\tleaders.add(new SessionLeader(\"Jeremy\", \"Grelle\"));\n-\t\t\tsessions.add(new EventSession(\"Test Session B\" + i, \"Description for Test Session B\" + i, startTime, endTime, leaders, \"#SpringOne2GX-B\" + i));\n-\t\t}\n-\n-\t\tstartTime = new DateTime(year, month, date, 12, 45, 0, 0).toDate();\n-\t\tendTime = new DateTime(year, month, date, 14, 15, 0, 0).toDate();\n-\t\t\n-\t\tfor (int i = 0; i < 9; i++)\n-\t\t{\n-\t\t\tsessions.add(new EventSession(\"Test Session C\" + i, \"Description for Test Session C\" + i, startTime, endTime, new SessionLeader(\"Johnny\", \"Speaker\"), \"#SpringOne2GX-C\" + i));\n-\t\t}\n \n-\t\tstartTime = new DateTime(year, month, date, 14, 45, 0, 0).toDate();\n-\t\tendTime = new DateTime(year, month, date, 16, 15, 0, 0).toDate();\n+\t@RequestMapping(value=\"/{id}/sessions/today\", method=RequestMethod.GET, headers=\"Accept=application/json\")\n+\tpublic @ResponseBody List<EventSession> sessionsToday(@PathVariable Long id) {\n+\t\treturn eventRepository.findTodaysSessions(id);\n+\t}\n \n-\t\tfor (int i = 0; i < 9; i++)\n-\t\t{\n-\t\t\tsessions.add(new EventSession(\"Test Session D\" + i, \"Description for Test Session D\" + i, startTime, endTime, new SessionLeader(\"Johnny\", \"Speaker\"), \"#SpringOne2GX-D\" + i));\n-\t\t}\n+\t@RequestMapping(value=\"/{id}/sessions/{code}/tweets\", method=RequestMethod.GET, headers=\"Accept=application/json\")\n+\tpublic @ResponseBody SearchResults sessionTweets(@PathVariable Long id, Short code, @RequestParam(defaultValue=\"1\") Integer page, @RequestParam(defaultValue=\"10\") Integer pageSize) {\n+\t\treturn twitter.search(eventRepository.getEventSessionSearchString(id, code), page, pageSize);\n+\t}\n \n-\t\tstartTime = new DateTime(year, month, date, 16, 30, 0, 0).toDate();\n-\t\tendTime = new DateTime(year, month, date, 18, 0, 0, 0).toDate();\n+\t@RequestMapping(value=\"/{id}/sessions/{code}/tweets\", method=RequestMethod.POST)\n+\tpublic @ResponseBody void postSessionTweet(Long id, Short code, @RequestParam String status, @OAuthAccessToken(\"twitter\") OAuthConsumerToken accessToken) {\n+\t\ttwitter.updateStatus(accessToken, status);\n+\t}\n \n-\t\tfor (int i = 0; i < 9; i++)\n-\t\t{\n-\t\t\tsessions.add(new EventSession(\"Test Session E\" + i, \"Description for Test Session E\" + i, startTime, endTime, new SessionLeader(\"Johnny\", \"Speaker\"), \"#SpringOne2GX-E\" + i));\n-\t\t}\n-\t\t\t\t\n-//\t\tsessions.add(new EventSession(\"What's new in Spring 3\", \"Come see the latest Spring Framework features!\", new DateTime(2010, 10, 20, 8, 0, 0, 0).toDate(), new DateTime(2010, 10, 20, 9, 0, 0, 0).toDate(), new SessionLeader(\"Juergen\", \"Hoeller\")));\n-//\t\tsessions.add(new EventSession(\"What's new in Grails 2\", \"Come see the latest Grails features!\", new DateTime(2010, 10, 20, 8, 0, 0, 0).toDate(), new DateTime(2010, 10, 20, 9, 0, 0, 0).toDate(), new SessionLeader(\"Graeme\", \"Rocher\")));\n-//\t\tsessions.add(new EventSession(\"Building Social Ready Webapps\", \"Come learn how to do the social stuff!\", new DateTime(2010, 10, 20, 9, 0, 0, 0).toDate(), new DateTime(2010, 10, 20, 10, 0, 0, 0).toDate(), new SessionLeader(\"Craig\", \"Walls\")));\n-//\t\t\n-//\t\tList<SessionLeader> mobileLeaders = new ArrayList<SessionLeader>();\n-//\t\tmobileLeaders.add(new SessionLeader(\"Roy\", \"Clarkson\"));\n-//\t\tmobileLeaders.add(new SessionLeader(\"Jeremy\", \"Clarkson\"));\n-//\t\tsessions.add(new EventSession(\"Choices in Mobile Application Development\", \"Come learn how to do the mobile stuff!\", new DateTime(2010, 10, 20, 9, 0, 0, 0).toDate(), new DateTime(2010, 10, 20, 10, 0, 0, 0).toDate(), mobileLeaders));\n-\t\t\n-\t\treturn sessions;\n+\t// for web browser (HTML) clients\n+\t\n+\t@RequestMapping(method=RequestMethod.GET, headers=\"Accept=text/html\")\n+\tpublic String upcomingEventsView(Model model) {\n+\t\tmodel.addAttribute(eventRepository.findUpcomingEvents());\n+\t\treturn \"events/list\";\n \t}\n-}\n+\t\n+}\n\\ No newline at end of file", "raw_url": "https://github.com/spring-attic/greenhouse/raw/26132fb65137f90d5223bf5bddc0c7a296577aec/src%2Fmain%2Fjava%2Fcom%2Fspringsource%2Fgreenhouse%2Fevents%2FEventsController.java", "sha": "91853c18f521554e3803f165de7c3cd6e37904b3", "status": "modified" }, { "additions": 2, "blob_url": "https://github.com/spring-attic/greenhouse/blob/26132fb65137f90d5223bf5bddc0c7a296577aec/src%2Fmain%2Fjava%2Fcom%2Fspringsource%2Fgreenhouse%2Fmembers%2FMembersController.java", "changes": 4, "contents_url": "https://api.github.com/repos/spring-attic/greenhouse/contents/src%2Fmain%2Fjava%2Fcom%2Fspringsource%2Fgreenhouse%2Fmembers%2FMembersController.java?ref=26132fb65137f90d5223bf5bddc0c7a296577aec", "deletions": 2, "filename": "src/main/java/com/springsource/greenhouse/members/MembersController.java", "new_code": "\tprivate MemberRepository membersService;\n\tpublic MembersController(MemberRepository membersService) {", "new_methods": [], "old_code": "\tprivate MembersService membersService;\n\tpublic MembersController(MembersService membersService) {", "old_methods": [], "patch": "@@ -14,10 +14,10 @@\n @RequestMapping(\"/members/*\")\n public class MembersController {\n \n-\tprivate MembersService membersService;\n+\tprivate MemberRepository membersService;\n \t\n \t@Inject\n-\tpublic MembersController(MembersService membersService) {\n+\tpublic MembersController(MemberRepository membersService) {\n \t\tthis.membersService = membersService;\n \t}\n ", "raw_url": "https://github.com/spring-attic/greenhouse/raw/26132fb65137f90d5223bf5bddc0c7a296577aec/src%2Fmain%2Fjava%2Fcom%2Fspringsource%2Fgreenhouse%2Fmembers%2FMembersController.java", "sha": "090a76e9c4bd34b588a1a02e20f57b5dad344a86", "status": "modified" }, { "additions": 7, "blob_url": "https://github.com/spring-attic/greenhouse/blob/26132fb65137f90d5223bf5bddc0c7a296577aec/src%2Fmain%2Fjava%2Forg%2Fspringframework%2Fsocial%2Ftwitter%2FTwitterOperations.java", "changes": 7, "contents_url": "https://api.github.com/repos/spring-attic/greenhouse/contents/src%2Fmain%2Fjava%2Forg%2Fspringframework%2Fsocial%2Ftwitter%2FTwitterOperations.java?ref=26132fb65137f90d5223bf5bddc0c7a296577aec", "deletions": 0, "filename": "src/main/java/org/springframework/social/twitter/TwitterOperations.java", "new_code": "\t\n\t\n\n\tSearchResults search(String query, int page, int pageSize);\n\n\t\n\t", "new_methods": [], "old_code": "", "old_methods": [], "patch": "@@ -7,9 +7,16 @@\n public interface TwitterOperations {\n \n \tString getScreenName(OAuthConsumerToken accessToken);\n+\t\n \tList<String> getFriends(OAuthConsumerToken accessToken, String screenName);\n+\t\n \tvoid updateStatus(OAuthConsumerToken accessToken, String message);\n+\n+\tSearchResults search(String query, int page, int pageSize);\n+\n \tSearchResults search(OAuthConsumerToken accessToken, String query);\n+\t\n \tSearchResults search(OAuthConsumerToken accessToken, String query, int page, int resultsPerPage);\n+\t\n \tSearchResults search(OAuthConsumerToken accessToken, String query, int page, int resultsPerPage, int sinceId, int maxId);\n }\n\\ No newline at end of file", "raw_url": "https://github.com/spring-attic/greenhouse/raw/26132fb65137f90d5223bf5bddc0c7a296577aec/src%2Fmain%2Fjava%2Forg%2Fspringframework%2Fsocial%2Ftwitter%2FTwitterOperations.java", "sha": "5f2d89b59bde98fd1e4e9db6e0372c1768738f07", "status": "modified" }, { "additions": 4, "blob_url": "https://github.com/spring-attic/greenhouse/blob/26132fb65137f90d5223bf5bddc0c7a296577aec/src%2Fmain%2Fjava%2Forg%2Fspringframework%2Fsocial%2Ftwitter%2FTwitterService.java", "changes": 4, "contents_url": "https://api.github.com/repos/spring-attic/greenhouse/contents/src%2Fmain%2Fjava%2Forg%2Fspringframework%2Fsocial%2Ftwitter%2FTwitterService.java?ref=26132fb65137f90d5223bf5bddc0c7a296577aec", "deletions": 0, "filename": "src/main/java/org/springframework/social/twitter/TwitterService.java", "new_code": "\tpublic SearchResults search(String query, int page, int resultsPerPage) {\n\t\treturn search(null, query, page, resultsPerPage, 0, 0);\n\t}\n\t", "new_methods": [ { "arguments": [ "String query", " int page", " int resultsPerPage" ], "filename": "src/main/java/org/springframework/social/twitter/TwitterService.java", "implementation": "return search(null, query, page, resultsPerPage, 0, 0);", "signature": "SearchResults search(String query, int page, int resultsPerPage)" } ], "old_code": "", "old_methods": [], "patch": "@@ -70,6 +70,10 @@ public SearchResults search(OAuthConsumerToken accessToken, String query) {\n \t\treturn search(accessToken, query, 1, DEFAULT_RESULTS_PER_PAGE, 0, 0);\n \t}\n \n+\tpublic SearchResults search(String query, int page, int resultsPerPage) {\n+\t\treturn search(null, query, page, resultsPerPage, 0, 0);\n+\t}\n+\t\n \tpublic SearchResults search(OAuthConsumerToken accessToken, String query, int page, int resultsPerPage) {\n \t\treturn search(accessToken, query, page, resultsPerPage, 0, 0);\n \t}", "raw_url": "https://github.com/spring-attic/greenhouse/raw/26132fb65137f90d5223bf5bddc0c7a296577aec/src%2Fmain%2Fjava%2Forg%2Fspringframework%2Fsocial%2Ftwitter%2FTwitterService.java", "sha": "160f20996255494d2a4b11398040e06c8736bf27", "status": "modified" }, { "additions": 27, "blob_url": "https://github.com/spring-attic/greenhouse/blob/26132fb65137f90d5223bf5bddc0c7a296577aec/src%2Fmain%2Fwebapp%2FWEB-INF%2Fdatabase%2Fdata.sql", "changes": 36, "contents_url": "https://api.github.com/repos/spring-attic/greenhouse/contents/src%2Fmain%2Fwebapp%2FWEB-INF%2Fdatabase%2Fdata.sql?ref=26132fb65137f90d5223bf5bddc0c7a296577aec", "deletions": 9, "filename": "src/main/webapp/WEB-INF/database/data.sql", "new_code": "insert into Member (firstName, lastName, email, password, username) values ('Jeremy', 'Grelle', 'jgrelle@vmware.com', 'churchkeys', 'jgrelle');\ninsert into MemberGroup (name, description, profileKey, searchString, leader) values ('SpringOne2gx', 'The premier event for Spring technologies', 'springone2gx', '#springone2gx', 1);\ninsert into Event (title, startDate, endDate, location, description, memberGroup) values ('SpringOne/2GX', '2010-10-19', '2010-10-22', 'SpringOne 2GX is a one-of-a-kind conference for application developers, solution architects, web operations and IT teams who develop, deploy and manage business applications.', 'Chicago, IL', 1);\ninsert into EventTrack (name, description, chair, event) values ('Essential Spring', 'Spring techniques and technologies applicable to most classes of applications', 2, 1);\ninsert into EventTrack (name, description, chair, event) values ('Web Application Development', 'What you need to know to build rich web applications', 1, 1);\ninsert into EventSession (code, title, startTime, endTime, description, event, track) values (201, \n\t'Mastering MVC 3', '2010-10-20 12:45:00', '2010-10-20 14:15:00',\n\t'A deep-dive into the latest capabilities of Spring MVC, Spring%27s REST-ful web application development platform.', 1, 2);\ninsert into EventSessionLeader (session, leader) values (201, 1);\n\ninsert into EventSession (code, title, startTime, endTime, description, event, track) values (202, \n\t'Inside Web Flow 3 Development', '2010-10-20 14:45:00', '2010-10-20 16:15:00',\n\t'A look inside the development of Spring Web Flow 3, the next-generation version of Spring%27s stateful controller framework for orchestrating multi-step user dialogs.', 1, 2);\ninsert into EventSessionLeader (session, leader) values (202, 1);\n\ninsert into EventSession (code, title, startTime, endTime, description, event, track) values (203, \n\t'Developing Social-Ready Web Applications', '2010-10-21 12:45:00', '2010-10-21 14:15:00',\n\t'Businesses are increasingly recognizing the value of connecting with their customers on a more personal level. Companies can utilize social networking to transition from \"Big Faceless Corporation\" to \"Friend\" by taking their wares to the online communities where their customers are. In this age of social media, those communities are found at social network sites such as Facebook, Twitter, and LinkedIn. In this session, you%27ll learn how to build Spring-based applications that interact with the various social networks. We%27ll talk about new features in the Spring portfolio to support integration with social networks as well as how to start building social features into your own applications.',\n\t1, 2);\ninsert into EventSessionLeader (session, leader) values (203, 2);\n\t\ninsert into EventSession (code, title, startTime, endTime, description, event, track) values (204, \n\t'Choices in Moble Application Development', '2010-10-21 14:45:00', '2010-10-21 16:15:00',\n\t'With the rising prevalence of advanced mobile platforms such as iPhone, Android, and Web OS, the desire for rich mobile clients as another means of accessing enterprise services is becoming something that can no longer be ignored. In this session, we will explore the current mobile development landscape and discuss what you as a Spring developer can do to support this increasingly important paradigm. We will examine the benefits and tradeoffs of native mobile client development vs. web-based mobile client development, and we will explore some of the emerging cross-platform options such as PhoneGap. We will look at the various strategies for utilizing a Spring back-end with these mobile platforms, such as consumption of RESTful services, authentication and authorization via OAuth, and server-push style messaging.',\n\t1, 2);\ninsert into EventSessionLeader (session, leader) values (204, 3);\ninsert into EventSessionLeader (session, leader) values (204, 4);", "new_methods": [], "old_code": "insert into MemberGroup (publicId, name, description, hashtag, leader) values ('SpringOne', 'SpringOne', 'The premier Spring Framework event.', '#springone', 1);\ninsert into Event (publicId, title, description, startTime, endTime, location, memberGroup, hashtag) values ('springone_2gx', 'SpringOne/2GX', \n 'SpringOne 2GX is a one-of-a-kind conference for application developers, solution architects, web operations and IT teams who develop, deploy and manage business applications.', \n '2010-10-19', '2010-10-22', 'Chicago, IL', 1, '#springone2gx');\ninsert into EventTrack (name, description, chair, event) values ('Core Spring', 'The low-down on the core Spring Framework', 1, 1);\ninsert into EventSession (code, title, description, startTime, endTime, speaker, event, track, hashtag) values ('CS1', \n\t'Developing Social-Ready Web Applications', \n\t'Businesses are increasingly recognizing the value of connecting with their customers on a more personal level. Companies can utilize social networking to transition from \"Big Faceless Corporation\" to \"Friend\" by taking their wares to the online communities where their customers are. In this age of social media, those communities are found at social network sites such as Facebook, Twitter, and LinkedIn. In this session, you%27ll learn how to build Spring-based applications that interact with the various social networks. We%27ll talk about new features in the Spring portfolio to support integration with social networks as well as how to start building social features into your own applications.', \n\t'2010-10-20', '2010-10-20', 2, 1, 1, '#s12gxcs1');", "old_methods": [], "patch": "@@ -1,22 +1,40 @@\n insert into Member (firstName, lastName, email, password, username) values ('Keith' , 'Donald', 'kdonald@vmware.com', 'melbourne', 'kdonald');\n insert into Member (firstName, lastName, email, password, username) values ('Craig' , 'Walls', 'craig@habuma.com', 'plano', 'habuma');\n insert into Member (firstName, lastName, email, password, username) values ('Roy', 'Clarkson', 'rclarkson@vmware.com', 'atlanta', 'rclarkson');\n+insert into Member (firstName, lastName, email, password, username) values ('Jeremy', 'Grelle', 'jgrelle@vmware.com', 'churchkeys', 'jgrelle');\n \n insert into App (consumerKey, name, description, website, callbackUrl, secret, owner) values ('a08318eb478a1ee31f69a55276f3af64', 'Greenhouse for the iPhone', 'Awesome', 'http://www.springsource.com', 'x-com-springsource-greenhouse://oauth-response', '80e7f8f7ba724aae9103f297e5fb9bdf', 2);\n \n insert into Update (text, updateTimestamp, member) values ('Keith Donald signed up', 1278019179970, 1);\n insert into Update (text, updateTimestamp, member) values ('Craig Walls signed up', 1278017173970, 2);\n insert into Update (text, updateTimestamp, member) values ('Roy Clarkson signed up', 1274015177470, 3);\n \n-insert into MemberGroup (publicId, name, description, hashtag, leader) values ('SpringOne', 'SpringOne', 'The premier Spring Framework event.', '#springone', 1);\n+insert into MemberGroup (name, description, profileKey, searchString, leader) values ('SpringOne2gx', 'The premier event for Spring technologies', 'springone2gx', '#springone2gx', 1);\n \n-insert into Event (publicId, title, description, startTime, endTime, location, memberGroup, hashtag) values ('springone_2gx', 'SpringOne/2GX', \n- 'SpringOne 2GX is a one-of-a-kind conference for application developers, solution architects, web operations and IT teams who develop, deploy and manage business applications.', \n- '2010-10-19', '2010-10-22', 'Chicago, IL', 1, '#springone2gx');\n+insert into Event (title, startDate, endDate, location, description, memberGroup) values ('SpringOne/2GX', '2010-10-19', '2010-10-22', 'SpringOne 2GX is a one-of-a-kind conference for application developers, solution architects, web operations and IT teams who develop, deploy and manage business applications.', 'Chicago, IL', 1);\n \n-insert into EventTrack (name, description, chair, event) values ('Core Spring', 'The low-down on the core Spring Framework', 1, 1);\n+insert into EventTrack (name, description, chair, event) values ('Essential Spring', 'Spring techniques and technologies applicable to most classes of applications', 2, 1);\n+insert into EventTrack (name, description, chair, event) values ('Web Application Development', 'What you need to know to build rich web applications', 1, 1);\n \n-insert into EventSession (code, title, description, startTime, endTime, speaker, event, track, hashtag) values ('CS1', \n-\t'Developing Social-Ready Web Applications', \n-\t'Businesses are increasingly recognizing the value of connecting with their customers on a more personal level. Companies can utilize social networking to transition from \"Big Faceless Corporation\" to \"Friend\" by taking their wares to the online communities where their customers are. In this age of social media, those communities are found at social network sites such as Facebook, Twitter, and LinkedIn. In this session, you%27ll learn how to build Spring-based applications that interact with the various social networks. We%27ll talk about new features in the Spring portfolio to support integration with social networks as well as how to start building social features into your own applications.', \n-\t'2010-10-20', '2010-10-20', 2, 1, 1, '#s12gxcs1');\n+insert into EventSession (code, title, startTime, endTime, description, event, track) values (201, \n+\t'Mastering MVC 3', '2010-10-20 12:45:00', '2010-10-20 14:15:00',\n+\t'A deep-dive into the latest capabilities of Spring MVC, Spring%27s REST-ful web application development platform.', 1, 2);\n+insert into EventSessionLeader (session, leader) values (201, 1);\n+\n+insert into EventSession (code, title, startTime, endTime, description, event, track) values (202, \n+\t'Inside Web Flow 3 Development', '2010-10-20 14:45:00', '2010-10-20 16:15:00',\n+\t'A look inside the development of Spring Web Flow 3, the next-generation version of Spring%27s stateful controller framework for orchestrating multi-step user dialogs.', 1, 2);\n+insert into EventSessionLeader (session, leader) values (202, 1);\n+\n+insert into EventSession (code, title, startTime, endTime, description, event, track) values (203, \n+\t'Developing Social-Ready Web Applications', '2010-10-21 12:45:00', '2010-10-21 14:15:00',\n+\t'Businesses are increasingly recognizing the value of connecting with their customers on a more personal level. Companies can utilize social networking to transition from \"Big Faceless Corporation\" to \"Friend\" by taking their wares to the online communities where their customers are. In this age of social media, those communities are found at social network sites such as Facebook, Twitter, and LinkedIn. In this session, you%27ll learn how to build Spring-based applications that interact with the various social networks. We%27ll talk about new features in the Spring portfolio to support integration with social networks as well as how to start building social features into your own applications.',\n+\t1, 2);\n+insert into EventSessionLeader (session, leader) values (203, 2);\n+\t\n+insert into EventSession (code, title, startTime, endTime, description, event, track) values (204, \n+\t'Choices in Moble Application Development', '2010-10-21 14:45:00', '2010-10-21 16:15:00',\n+\t'With the rising prevalence of advanced mobile platforms such as iPhone, Android, and Web OS, the desire for rich mobile clients as another means of accessing enterprise services is becoming something that can no longer be ignored. In this session, we will explore the current mobile development landscape and discuss what you as a Spring developer can do to support this increasingly important paradigm. We will examine the benefits and tradeoffs of native mobile client development vs. web-based mobile client development, and we will explore some of the emerging cross-platform options such as PhoneGap. We will look at the various strategies for utilizing a Spring back-end with these mobile platforms, such as consumption of RESTful services, authentication and authorization via OAuth, and server-push style messaging.',\n+\t1, 2);\n+insert into EventSessionLeader (session, leader) values (204, 3);\n+insert into EventSessionLeader (session, leader) values (204, 4);", "raw_url": "https://github.com/spring-attic/greenhouse/raw/26132fb65137f90d5223bf5bddc0c7a296577aec/src%2Fmain%2Fwebapp%2FWEB-INF%2Fdatabase%2Fdata.sql", "sha": "2cb87388858bee61bb303668d7c3531465aa47ed", "status": "modified" }, { "additions": 14, "blob_url": "https://github.com/spring-attic/greenhouse/blob/26132fb65137f90d5223bf5bddc0c7a296577aec/src%2Fmain%2Fwebapp%2FWEB-INF%2Fdatabase%2Fschema-event.sql", "changes": 27, "contents_url": "https://api.github.com/repos/spring-attic/greenhouse/contents/src%2Fmain%2Fwebapp%2FWEB-INF%2Fdatabase%2Fschema-event.sql?ref=26132fb65137f90d5223bf5bddc0c7a296577aec", "deletions": 13, "filename": "src/main/webapp/WEB-INF/database/schema-event.sql", "new_code": "\t\t\t\t\tprofileKey varchar unique,\t\t\t\t\t\n\t\t\t\t\tsearchString varchar,\n\t\t\t\t\tstartDate date,\n\t\t\t\t\tendDate date,\n\t\t\t\t\tdescription varchar,\ncreate table EventSession (code smallint,\n\t\t\t\t\tdescription varchar,\n\t\t\t\t\tforeign key (track) references EventTrack(id));\n\ncreate table EventSessionLeader (session smallint not null,\n\t\t\t\t\tleader bigint not null,\n\t\t\t\t\tprimary key (session, leader),\n\t\t\t\t\tforeign key (session) references EventSession(code),\n\t\t\t\t\tforeign key (leader) references Member(id));\t", "new_methods": [], "old_code": "\t\t\t\t\tpublicId varchar not null,\n\t\t\t\t\thashtag varchar,\n\t\t\t\t\tpublicId varchar not null,\n\t\t\t\t\tdescription varchar,\n\t\t\t\t\tstartTime timestamp,\n\t\t\t\t\tendTime timestamp,\n\t\t\t\t\thashtag varchar,\ncreate table EventSession (code varchar,\n\t\t\t\t\tdescription varchar,\n\t\t\t\t\tspeaker bigint not null,\n\t\t\t\t\thashtag varchar,\n\t\t\t\t\tforeign key (speaker) references Member(id),\n\t\t\t\t\tforeign key (track) references EventTrack(id));", "old_methods": [], "patch": "@@ -1,21 +1,19 @@\n create table MemberGroup (id identity,\n-\t\t\t\t\tpublicId varchar not null,\n \t\t\t\t\tname varchar not null,\n \t\t\t\t\tdescription varchar,\n-\t\t\t\t\thashtag varchar,\n+\t\t\t\t\tprofileKey varchar unique,\t\t\t\t\t\n+\t\t\t\t\tsearchString varchar,\n \t\t\t\t\tleader bigint not null,\n \t\t\t\t\tprimary key (id),\n \t\t\t\t\tforeign key (leader) references Member(id));\n \t\t\t\t\t\n create table Event (id identity,\n-\t\t\t\t\tpublicId varchar not null,\n \t\t\t\t\ttitle varchar not null,\n-\t\t\t\t\tdescription varchar,\n-\t\t\t\t\tstartTime timestamp,\n-\t\t\t\t\tendTime timestamp,\n+\t\t\t\t\tstartDate date,\n+\t\t\t\t\tendDate date,\n \t\t\t\t\tlocation varchar,\n+\t\t\t\t\tdescription varchar,\n \t\t\t\t\tmemberGroup bigint not null,\n-\t\t\t\t\thashtag varchar,\n \t\t\t\t\tprimary key (id),\n \t\t\t\t\tforeign key (memberGroup) references MemberGroup(id));\n \n@@ -28,16 +26,19 @@ create table EventTrack (id identity,\n \t\t\t\t\tforeign key (chair) references Member(id),\n \t\t\t\t\tforeign key (event) references Event(id));\n \n-create table EventSession (code varchar,\n+create table EventSession (code smallint,\n \t\t\t\t\ttitle varchar not null,\n-\t\t\t\t\tdescription varchar,\n \t\t\t\t\tstartTime timestamp,\n \t\t\t\t\tendTime timestamp,\n-\t\t\t\t\tspeaker bigint not null,\n+\t\t\t\t\tdescription varchar,\n \t\t\t\t\tevent bigint not null,\n \t\t\t\t\ttrack bigint,\n-\t\t\t\t\thashtag varchar,\n \t\t\t\t\tprimary key (code, event),\n-\t\t\t\t\tforeign key (speaker) references Member(id),\n \t\t\t\t\tforeign key (event) references Event(id),\n-\t\t\t\t\tforeign key (track) references EventTrack(id));\n\\ No newline at end of file\n+\t\t\t\t\tforeign key (track) references EventTrack(id));\n+\n+create table EventSessionLeader (session smallint not null,\n+\t\t\t\t\tleader bigint not null,\n+\t\t\t\t\tprimary key (session, leader),\n+\t\t\t\t\tforeign key (session) references EventSession(code),\n+\t\t\t\t\tforeign key (leader) references Member(id));\t\n\\ No newline at end of file", "raw_url": "https://github.com/spring-attic/greenhouse/raw/26132fb65137f90d5223bf5bddc0c7a296577aec/src%2Fmain%2Fwebapp%2FWEB-INF%2Fdatabase%2Fschema-event.sql", "sha": "db1f05bbf20aad6ceeae5bf29591f916d7c8b2ab", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/spring-attic/greenhouse/blob/26132fb65137f90d5223bf5bddc0c7a296577aec/src%2Ftest%2Fjava%2Fcom%2Fspringsource%2Fgreenhouse%2Fmembers%2FMembersControllerTest.java", "changes": 2, "contents_url": "https://api.github.com/repos/spring-attic/greenhouse/contents/src%2Ftest%2Fjava%2Fcom%2Fspringsource%2Fgreenhouse%2Fmembers%2FMembersControllerTest.java?ref=26132fb65137f90d5223bf5bddc0c7a296577aec", "deletions": 1, "filename": "src/test/java/com/springsource/greenhouse/members/MembersControllerTest.java", "new_code": " \tMemberRepository membersService = new JdbcMemberRepository(jdbcTemplate);", "new_methods": [], "old_code": " \tMembersService membersService = new DefaultMembersService(jdbcTemplate);", "old_methods": [], "patch": "@@ -27,7 +27,7 @@ public void setup() {\n \t\t\tnew FileSystemResource(\"src/main/webapp/WEB-INF/database/schema-member.sql\"),\n \t\t\tnew ClassPathResource(\"MembersControllerTest.sql\", getClass()));\n \tjdbcTemplate = new JdbcTemplate(db);\n- \tMembersService membersService = new DefaultMembersService(jdbcTemplate);\n+ \tMemberRepository membersService = new JdbcMemberRepository(jdbcTemplate);\n \tcontroller = new MembersController(membersService);\n }\n ", "raw_url": "https://github.com/spring-attic/greenhouse/raw/26132fb65137f90d5223bf5bddc0c7a296577aec/src%2Ftest%2Fjava%2Fcom%2Fspringsource%2Fgreenhouse%2Fmembers%2FMembersControllerTest.java", "sha": "3888305c5d402662e0d78753f131c08e90c46f83", "status": "modified" } ]
9
[ { "name": "spring-projects$greenhouse", "new_args": "Model model", "new_implementation": "model.addAttribute(eventRepository.findUpcomingEvents());\n\t\treturn \"events/list\";", "new_return_type": "String", "new_signature": "String upcomingEventsView(Model model)", "old_args": "Model model", "old_implementation": "model.addAttribute(eventsService.findEventsAfter(new Date()));\n\t\treturn \"events/list\";\n\t@RequestMapping(value=\"/{eventId", "old_return_type": "String", "old_signature": "String listEvents(Model model)" } ]
1
6
27802cfab9eabed1efb72ac10206fa1cc8dfd3e6
[ { "name": "obeonetwork$informationsystem", "new_args": "Object object", "new_implementation": null, "new_return_type": "void", "new_signature": "void addReferencedTypePropertyDescriptor(Object object)", "old_args": "Object object", "old_implementation": null, "old_return_type": "void", "old_signature": "void addTypePropertyDescriptor(Object object)" }, { "name": "obeonetwork$informationsystem", "new_args": "Object object", "new_implementation": null, "new_return_type": "void", "new_signature": "void addMultiplicityPropertyDescriptor(Object object)", "old_args": "Object object", "old_implementation": null, "old_return_type": "void", "old_signature": "void addUpperPropertyDescriptor(Object object)" }, { "name": "obeonetwork$informationsystem", "new_args": "Composite parent", "new_implementation": "createDescription(parent, EnvironmentViewsRepository.Reference.Properties.referencedType, EnvironmentMessages.ReferencePropertiesEditionPart_ReferencedTypeLabel);\n\t\treferencedType = new EObjectFlatComboViewer(parent, !propertiesEditionComponent.isRequired(EnvironmentViewsRepository.Reference.Properties.referencedType, EnvironmentViewsRepository.SWT_KIND));\n\t\treferencedType.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));\n\t\treferencedType.addSelectionChangedListener(new ISelectionChangedListener() {\n\t\t\t\tpropertiesEditionComponent.firePropertiesChanged(new PropertiesEditionEvent(ReferencePropertiesEditionPartImpl.this, EnvironmentViewsRepository.Reference.Properties.referencedType, PropertiesEditionEvent.CHANGE, PropertiesEditionEvent.SET, null, getReferencedType()));\n\t\tGridData referencedTypeData = new GridData(GridData.FILL_HORIZONTAL);\n\t\treferencedType.setLayoutData(referencedTypeData);\n\t\treferencedType.setID(EnvironmentViewsRepository.Reference.Properties.referencedType);\n\t\tSWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(EnvironmentViewsRepository.Reference.Properties.referencedType, EnvironmentViewsRepository.SWT_KIND), null); //$NON-NLS-1$\n\t\t// Start of user code for createReferencedTypeFlatComboViewer\n\tprotected Composite createIdentifierCheckbox(Composite parent) {\n\t\tidentifier = new Button(parent, SWT.CHECK);\n\t\tidentifier.setText(getDescription(EnvironmentViewsRepository.Reference.Properties.identifier, EnvironmentMessages.ReferencePropertiesEditionPart_IdentifierLabel));\n\t\tidentifier.addSelectionListener(new SelectionAdapter() {\n\n\t\t\t/**\n\t\t\t * {@inheritDoc", "new_return_type": "Composite", "new_signature": "Composite createReferencedTypeFlatComboViewer(Composite parent)", "old_args": "Composite parent", "old_implementation": "createDescription(parent, EnvironmentViewsRepository.Reference.Properties.type, EnvironmentMessages.ReferencePropertiesEditionPart_TypeLabel);\n\t\ttype = new EObjectFlatComboViewer(parent, !propertiesEditionComponent.isRequired(EnvironmentViewsRepository.Reference.Properties.type, EnvironmentViewsRepository.SWT_KIND));\n\t\ttype.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));\n\t\ttype.addSelectionChangedListener(new ISelectionChangedListener() {\n\t\t\t\tpropertiesEditionComponent.firePropertiesChanged(new PropertiesEditionEvent(ReferencePropertiesEditionPartImpl.this, EnvironmentViewsRepository.Reference.Properties.type, PropertiesEditionEvent.CHANGE, PropertiesEditionEvent.SET, null, getType()));\n\t\tGridData typeData = new GridData(GridData.FILL_HORIZONTAL);\n\t\ttype.setLayoutData(typeData);\n\t\ttype.setID(EnvironmentViewsRepository.Reference.Properties.type);\n\t\tSWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(EnvironmentViewsRepository.Reference.Properties.type, EnvironmentViewsRepository.SWT_KIND), null); //$NON-NLS-1$\n\t\t// Start of user code for createTypeFlatComboViewer\n\t * @see org.obeonetwork.dsl.environment.parts.ReferencePropertiesEditionPart#getType()\n\tpublic EObject getType() {\n\t\tif (type.getSelection() instanceof StructuredSelection) {\n\t\t\tObject firstElement = ((StructuredSelection) type.getSelection()).getFirstElement();\n\t * @see org.obeonetwork.dsl.environment.parts.ReferencePropertiesEditionPart#initType(EObjectFlatComboSettings)\n\tpublic void initType(EObjectFlatComboSettings settings) {\n\t\ttype.setInput(settings);\n\t\t\ttype.setSelection(new StructuredSelection(settings.getValue()));\n\t\tboolean eefElementEditorReadOnlyState = isReadOnly(EnvironmentViewsRepository.Reference.Properties.type);\n\t\tif (eefElementEditorReadOnlyState && type.isEnabled()) {\n\t\t\ttype.setEnabled(false);\n\t\t\ttype.setToolTipText(EnvironmentMessages.Reference_ReadOnly);", "old_return_type": "Composite", "old_signature": "Composite createTypeFlatComboViewer(Composite parent)" }, { "name": "obeonetwork$informationsystem", "new_args": "Composite parent,FormToolkit widgetFactory", "new_implementation": null, "new_return_type": "Composite", "new_signature": "Composite createReferencedTypeFlatComboViewer(Composite parent,FormToolkit widgetFactory)", "old_args": "Composite parent,FormToolkit widgetFactory", "old_implementation": null, "old_return_type": "Composite", "old_signature": "Composite createTypeFlatComboViewer(Composite parent,FormToolkit widgetFactory)" }, { "name": "obeonetwork$informationsystem", "new_args": "ViewerFilter filter", "new_implementation": null, "new_return_type": "void", "new_signature": "void addBusinessFilterToReferencedType(ViewerFilter filter)", "old_args": "ViewerFilter filter", "old_implementation": null, "old_return_type": "void", "old_signature": "void addBusinessFilterToType(ViewerFilter filter)" }, { "name": "obeonetwork$informationsystem", "new_args": "ViewerFilter filter", "new_implementation": null, "new_return_type": "void", "new_signature": "void addBusinessFilterToReferencedType(ViewerFilter filter)", "old_args": "ViewerFilter filter", "old_implementation": null, "old_return_type": "void", "old_signature": "void addBusinessFilterToType(ViewerFilter filter)" }, { "name": "obeonetwork$informationsystem", "new_args": "ViewerFilter filter", "new_implementation": null, "new_return_type": "void", "new_signature": "void addFilterToReferencedType(ViewerFilter filter)", "old_args": "ViewerFilter filter", "old_implementation": null, "old_return_type": "void", "old_signature": "void addFilterToType(ViewerFilter filter)" }, { "name": "obeonetwork$informationsystem", "new_args": "ViewerFilter filter", "new_implementation": null, "new_return_type": "void", "new_signature": "void addFilterToReferencedType(ViewerFilter filter)", "old_args": "ViewerFilter filter", "old_implementation": null, "old_return_type": "void", "old_signature": "void addFilterToType(ViewerFilter filter)" }, { "name": "obeonetwork$informationsystem", "new_args": "", "new_implementation": null, "new_return_type": "StructuredType", "new_signature": "StructuredType basicGetContainingType()", "old_args": "", "old_implementation": null, "old_return_type": "DTO", "old_signature": "DTO basicGetType()" }, { "name": "obeonetwork$informationsystem", "new_args": "StructuredType newContainingType,NotificationChain msgs", "new_implementation": null, "new_return_type": "NotificationChain", "new_signature": "NotificationChain basicSetContainingType(StructuredType newContainingType,NotificationChain msgs)", "old_args": "DTO newDto,NotificationChain msgs", "old_implementation": null, "old_return_type": "NotificationChain", "old_signature": "NotificationChain basicSetDto(DTO newDto,NotificationChain msgs)" }, { "name": "obeonetwork$informationsystem", "new_args": "StructuredType newContainingType,NotificationChain msgs", "new_implementation": null, "new_return_type": "NotificationChain", "new_signature": "NotificationChain basicSetContainingType(StructuredType newContainingType,NotificationChain msgs)", "old_args": "DTO newDto,NotificationChain msgs", "old_implementation": null, "old_return_type": "NotificationChain", "old_signature": "NotificationChain basicSetDto(DTO newDto,NotificationChain msgs)" }, { "name": "obeonetwork$informationsystem", "new_args": "TypesDefinition object", "new_implementation": null, "new_return_type": "T", "new_signature": "T caseTypesDefinition(TypesDefinition object)", "old_args": "Reference object", "old_implementation": null, "old_return_type": "T", "old_signature": "T caseReference(Reference object)" }, { "name": "obeonetwork$informationsystem", "new_args": "", "new_implementation": null, "new_return_type": "Adapter", "new_signature": "Adapter createTypesDefinitionAdapter()", "old_args": "", "old_implementation": null, "old_return_type": "Adapter", "old_signature": "Adapter createReferenceAdapter()" }, { "name": "obeonetwork$informationsystem", "new_args": "", "new_implementation": null, "new_return_type": "Adapter", "new_signature": "Adapter createTypesDefinitionAdapter()", "old_args": "", "old_implementation": null, "old_return_type": "Adapter", "old_signature": "Adapter createReferenceAdapter()" }, { "name": "obeonetwork$informationsystem", "new_args": "", "new_implementation": null, "new_return_type": "EReference", "new_signature": "EReference getAttribute_ContainingType()", "old_args": "", "old_implementation": null, "old_return_type": "EReference", "old_signature": "EReference getAttribute_Dto()" }, { "name": "obeonetwork$informationsystem", "new_args": "", "new_implementation": null, "new_return_type": "EReference", "new_signature": "EReference getRoot_Namespaces()", "old_args": "", "old_implementation": null, "old_return_type": "EReference", "old_signature": "EReference getBlock_Entities()" }, { "name": "obeonetwork$informationsystem", "new_args": "", "new_implementation": null, "new_return_type": "String", "new_signature": "String getName()", "old_args": "", "old_implementation": null, "old_return_type": "EList<Block>", "old_signature": "EList<Block> getBlocks()" }, { "name": "obeonetwork$informationsystem", "new_args": "", "new_implementation": null, "new_return_type": "EReference", "new_signature": "EReference getStructuredType_AssociatedTypes()", "old_args": "", "old_implementation": null, "old_return_type": "EReference", "old_signature": "EReference getDTO_AssociatedTypes()" }, { "name": "obeonetwork$informationsystem", "new_args": "", "new_implementation": null, "new_return_type": "EReference", "new_signature": "EReference getStructuredType_References()", "old_args": "", "old_implementation": null, "old_return_type": "EReference", "old_signature": "EReference getDTO_Attributes()" }, { "name": "obeonetwork$informationsystem", "new_args": "", "new_implementation": null, "new_return_type": "EReference", "new_signature": "EReference getStructuredType_Properties()", "old_args": "", "old_implementation": null, "old_return_type": "EReference", "old_signature": "EReference getDTO_OwnedAttributes()" }, { "name": "obeonetwork$informationsystem", "new_args": "", "new_implementation": null, "new_return_type": "EReference", "new_signature": "EReference getStructuredType_OwnedReferences()", "old_args": "", "old_implementation": null, "old_return_type": "EReference", "old_signature": "EReference getDTO_OwnedReferences()" }, { "name": "obeonetwork$informationsystem", "new_args": "", "new_implementation": null, "new_return_type": "EReference", "new_signature": "EReference getStructuredType_OwnedAttributes()", "old_args": "", "old_implementation": null, "old_return_type": "EReference", "old_signature": "EReference getDTO_Properties()" }, { "name": "obeonetwork$informationsystem", "new_args": "", "new_implementation": null, "new_return_type": "EReference", "new_signature": "EReference getStructuredType_Attributes()", "old_args": "", "old_implementation": null, "old_return_type": "EReference", "old_signature": "EReference getDTO_References()" }, { "name": "obeonetwork$informationsystem", "new_args": "", "new_implementation": null, "new_return_type": "MultiplicityKind", "new_signature": "MultiplicityKind getMultiplicity()", "old_args": "", "old_implementation": null, "old_return_type": "int", "old_signature": "int getLower()" }, { "name": "obeonetwork$informationsystem", "new_args": "", "new_implementation": null, "new_return_type": "EList<Namespace>", "new_signature": "EList<Namespace> getNamespaces()", "old_args": "", "old_implementation": null, "old_return_type": "DTORegistry", "old_signature": "DTORegistry getOwnedDtoRegistry()" }, { "name": "obeonetwork$informationsystem", "new_args": "", "new_implementation": null, "new_return_type": "EAttribute", "new_signature": "EAttribute getParameter_Multiplicity()", "old_args": "", "old_implementation": null, "old_return_type": "EAttribute", "old_signature": "EAttribute getParameter_Lower()" }, { "name": "obeonetwork$informationsystem", "new_args": "", "new_implementation": null, "new_return_type": "EReference", "new_signature": "EReference getReference_ReferencedType()", "old_args": "", "old_implementation": null, "old_return_type": "EReference", "old_signature": "EReference getReference_Dto()" }, { "name": "obeonetwork$informationsystem", "new_args": "", "new_implementation": null, "new_return_type": "EReference", "new_signature": "EReference getReference_ContainingType()", "old_args": "", "old_implementation": null, "old_return_type": "EReference", "old_signature": "EReference getReference_Type()" }, { "name": "obeonetwork$informationsystem", "new_args": "", "new_implementation": null, "new_return_type": "EAttribute", "new_signature": "EAttribute getRoot_Name()", "old_args": "", "old_implementation": null, "old_return_type": "EReference", "old_signature": "EReference getRoot_Blocks()" }, { "name": "obeonetwork$informationsystem", "new_args": "", "new_implementation": null, "new_return_type": "EReference", "new_signature": "EReference getSystem_Namespaces()", "old_args": "", "old_implementation": null, "old_return_type": "EReference", "old_signature": "EReference getSystem_OwnedDtoRegistry()" }, { "name": "obeonetwork$informationsystem", "new_args": "", "new_implementation": null, "new_return_type": "StructuredType", "new_signature": "StructuredType getContainingType()", "old_args": "", "old_implementation": null, "old_return_type": "DTO", "old_signature": "DTO getType()" }, { "name": "obeonetwork$informationsystem", "new_args": "", "new_implementation": null, "new_return_type": "EObject", "new_signature": "EObject getReferencedType()", "old_args": "", "old_implementation": null, "old_return_type": "EObject", "old_signature": "EObject getType()" }, { "name": "obeonetwork$informationsystem", "new_args": "", "new_implementation": null, "new_return_type": "EObject", "new_signature": "EObject getReferencedType()", "old_args": "", "old_implementation": null, "old_return_type": "EObject", "old_signature": "EObject getType()" }, { "name": "obeonetwork$informationsystem", "new_args": "EObjectFlatComboSettings settings", "new_implementation": null, "new_return_type": "void", "new_signature": "void initReferencedType(EObjectFlatComboSettings settings)", "old_args": "EObjectFlatComboSettings settings", "old_implementation": null, "old_return_type": "void", "old_signature": "void initType(EObjectFlatComboSettings settings)" }, { "name": "obeonetwork$informationsystem", "new_args": "EObjectFlatComboSettings settings", "new_implementation": null, "new_return_type": "void", "new_signature": "void initReferencedType(EObjectFlatComboSettings settings)", "old_args": "EObjectFlatComboSettings settings", "old_implementation": null, "old_return_type": "void", "old_signature": "void initType(EObjectFlatComboSettings settings)" }, { "name": "obeonetwork$informationsystem", "new_args": "StructuredType newType", "new_implementation": null, "new_return_type": "void", "new_signature": "void setReferencedType(StructuredType newType)", "old_args": "DTO newType", "old_implementation": null, "old_return_type": "void", "old_signature": "void setType(DTO newType)" }, { "name": "obeonetwork$informationsystem", "new_args": "EObject newValue", "new_implementation": "referencedType.setSelection(new StructuredSelection(newValue));\n\t\t\treferencedType.setSelection(new StructuredSelection()); //$NON-NLS-1$\n\t\tboolean eefElementEditorReadOnlyState = isReadOnly(EnvironmentViewsRepository.Reference.Properties.referencedType);\n\t\tif (eefElementEditorReadOnlyState && referencedType.isEnabled()) {\n\t\t\treferencedType.setEnabled(false);\n\t\t\treferencedType.setToolTipText(EnvironmentMessages.Reference_ReadOnly);", "new_return_type": "void", "new_signature": "void setReferencedType(EObject newValue)", "old_args": "EObject newValue", "old_implementation": "type.setSelection(new StructuredSelection(newValue));\n\t\t\ttype.setSelection(new StructuredSelection()); //$NON-NLS-1$\n\t\tboolean eefElementEditorReadOnlyState = isReadOnly(EnvironmentViewsRepository.Reference.Properties.type);\n\t\tif (eefElementEditorReadOnlyState && type.isEnabled()) {\n\t\t\ttype.setEnabled(false);\n\t\t\ttype.setToolTipText(EnvironmentMessages.Reference_ReadOnly);", "old_return_type": "void", "old_signature": "void setType(EObject newValue)" }, { "name": "obeonetwork$informationsystem", "new_args": "EObject newValue", "new_implementation": "referencedType.setSelection(new StructuredSelection(newValue));\n\t\t\treferencedType.setSelection(new StructuredSelection()); //$NON-NLS-1$\n\t\tboolean eefElementEditorReadOnlyState = isReadOnly(EnvironmentViewsRepository.Reference.Properties.referencedType);\n\t\tif (eefElementEditorReadOnlyState && referencedType.isEnabled()) {\n\t\t\treferencedType.setEnabled(false);\n\t\t\treferencedType.setToolTipText(EnvironmentMessages.Reference_ReadOnly);", "new_return_type": "void", "new_signature": "void setReferencedType(EObject newValue)", "old_args": "EObject newValue", "old_implementation": "type.setSelection(new StructuredSelection(newValue));\n\t\t\ttype.setSelection(new StructuredSelection()); //$NON-NLS-1$\n\t\tboolean eefElementEditorReadOnlyState = isReadOnly(EnvironmentViewsRepository.Reference.Properties.type);\n\t\tif (eefElementEditorReadOnlyState && type.isEnabled()) {\n\t\t\ttype.setEnabled(false);\n\t\t\ttype.setToolTipText(EnvironmentMessages.Reference_ReadOnly);", "old_return_type": "void", "old_signature": "void setType(EObject newValue)" }, { "name": "obeonetwork$informationsystem", "new_args": "ButtonsModeEnum newValue", "new_implementation": null, "new_return_type": "void", "new_signature": "void setReferencedTypeButtonMode(ButtonsModeEnum newValue)", "old_args": "ButtonsModeEnum newValue", "old_implementation": null, "old_return_type": "void", "old_signature": "void setTypeButtonMode(ButtonsModeEnum newValue)" }, { "name": "obeonetwork$informationsystem", "new_args": "ButtonsModeEnum newValue", "new_implementation": null, "new_return_type": "void", "new_signature": "void setReferencedTypeButtonMode(ButtonsModeEnum newValue)", "old_args": "ButtonsModeEnum newValue", "old_implementation": null, "old_return_type": "void", "old_signature": "void setTypeButtonMode(ButtonsModeEnum newValue)" }, { "name": "obeonetwork$informationsystem", "new_args": "Enumerator newValue", "new_implementation": null, "new_return_type": "void", "new_signature": "void setMultiplicity(Enumerator newValue)", "old_args": "String newValue", "old_implementation": null, "old_return_type": "void", "old_signature": "void setUpper(String newValue)" }, { "name": "obeonetwork$informationsystem", "new_args": "Enumerator newValue", "new_implementation": null, "new_return_type": "void", "new_signature": "void setMultiplicity(Enumerator newValue)", "old_args": "String newValue", "old_implementation": null, "old_return_type": "void", "old_signature": "void setUpper(String newValue)" } ]
[ { "additions": 2, "blob_url": "https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/designs%2Fcinematic%2Fplugins%2Forg.obeonetwork.dsl.cinematic.design%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fcinematic%2Fdesign%2Fservices%2FCinematicBindingServices.java", "changes": 4, "contents_url": "https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/designs%2Fcinematic%2Fplugins%2Forg.obeonetwork.dsl.cinematic.design%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fcinematic%2Fdesign%2Fservices%2FCinematicBindingServices.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6", "deletions": 2, "filename": "designs/cinematic/plugins/org.obeonetwork.dsl.cinematic.design/src/org/obeonetwork/dsl/cinematic/design/services/CinematicBindingServices.java", "new_code": "\t\t\treturn attribute.getContainingType().getName() + \".\" + attribute.getName() + \" (DTO Attribute)\";\n\t\t\treturn reference.getContainingType().getName() + \".\" + reference.getName() + \" (DTO Reference)\";", "new_methods": [], "old_code": "\t\t\treturn attribute.getDto().getName() + \".\" + attribute.getName() + \" (DTO Attribute)\";\n\t\t\treturn reference.getDto().getName() + \".\" + reference.getName() + \" (DTO Reference)\";", "old_methods": [], "patch": "@@ -46,10 +46,10 @@ public String getCinematicBindingInfoLabel(BindingInfo bindingInfo) {\n \t\t\treturn ((DTO) element).getName() + \" (DTO)\";\n \t\t} else if (element instanceof Attribute) {\n \t\t\tAttribute attribute = (Attribute) element;\n-\t\t\treturn attribute.getDto().getName() + \".\" + attribute.getName() + \" (DTO Attribute)\";\n+\t\t\treturn attribute.getContainingType().getName() + \".\" + attribute.getName() + \" (DTO Attribute)\";\n \t\t} else if (element instanceof Reference) {\n \t\t\tReference reference = (Reference) element;\n-\t\t\treturn reference.getDto().getName() + \".\" + reference.getName() + \" (DTO Reference)\";\n+\t\t\treturn reference.getContainingType().getName() + \".\" + reference.getName() + \" (DTO Reference)\";\n \t\t} else if (element.eClass().getEPackage().getNsURI().startsWith(\"http://www.obeonetwork.org/dsl/entity/\")) {\n \t\t\tif (\"Entity\".equals(element.eClass().getName())) {\n \t\t\t\treturn getNameByReflection(element) + \" (Entity)\";", "raw_url": "https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/designs%2Fcinematic%2Fplugins%2Forg.obeonetwork.dsl.cinematic.design%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fcinematic%2Fdesign%2Fservices%2FCinematicBindingServices.java", "sha": "ed51d06c83432305143753f751d3f8509bc621b4", "status": "modified" }, { "additions": 2, "blob_url": "https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.edit%2FMETA-INF%2FMANIFEST.MF", "changes": 3, "contents_url": "https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.edit%2FMETA-INF%2FMANIFEST.MF?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6", "deletions": 1, "filename": "models/entity/plugins/org.obeonetwork.dsl.entity.edit/META-INF/MANIFEST.MF", "new_code": "Bundle-SymbolicName: org.obeonetwork.dsl.entity.edit;singleton:=true\n org.obeonetwork.dsl.environment;visibility:=reexport,", "new_methods": [], "old_code": "Bundle-SymbolicName: org.obeonetwork.dsl.entity.edit; singleton:=true", "old_methods": [], "patch": "@@ -1,7 +1,7 @@\n Manifest-Version: 1.0\n Bundle-ManifestVersion: 2\n Bundle-Name: %pluginName\n-Bundle-SymbolicName: org.obeonetwork.dsl.entity.edit; singleton:=true\n+Bundle-SymbolicName: org.obeonetwork.dsl.entity.edit;singleton:=true\n Bundle-Version: 2.4.0.qualifier\n Bundle-ClassPath: .\n Bundle-Activator: org.obeonetwork.dsl.entity.provider.EntityEditPlugin$Implementation\n@@ -11,6 +11,7 @@ Export-Package: org.obeonetwork.dsl.entity.extensionUtilities.provider,\n org.obeonetwork.dsl.entity.provider\n Require-Bundle: org.eclipse.core.runtime,\n org.eclipse.emf.edit;visibility:=reexport,\n+ org.obeonetwork.dsl.environment;visibility:=reexport,\n org.obeonetwork.dsl.environment.edit,\n org.obeonetwork.dsl.entity;visibility:=reexport,\n org.eclipse.emf.eef.runtime", "raw_url": "https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.edit%2FMETA-INF%2FMANIFEST.MF", "sha": "429297f9e6afdc41c20a48bda9e3acc81483f593", "status": "modified" }, { "additions": 3, "blob_url": "https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.edit%2Fmodels%2Fentity.components", "changes": 129, "contents_url": "https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.edit%2Fmodels%2Fentity.components?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6", "deletions": 126, "filename": "models/entity/plugins/org.obeonetwork.dsl.entity.edit/models/entity.components", "new_code": " <model xsi:type=\"ecore:EAttribute\" href=\"platform:/resource/org.obeonetwork.dsl.entity/model/entity.ecore#//Root/name\"/>\n <model xsi:type=\"ecore:EReference\" href=\"platform:/resource/org.obeonetwork.dsl.environment/model/environment.ecore#//StructuredType/supertype\"/>\n <model xsi:type=\"ecore:EAttribute\" href=\"platform:/resource/org.obeonetwork.dsl.entity/model/entity.ecore#//Finder/multiplicity\"/>", "new_methods": [], "old_code": " <model xsi:type=\"ecore:EAttribute\" href=\"platform:/resource/org.obeonetwork.dsl.environment/model/environment.ecore#//Namespace/name\"/>\n <bindings xsi:type=\"eef-components:PropertiesEditionComponent\" xmi:id=\"_9GvkE1UREd6Yk7jCWR7r8A\" name=\"block\" views=\"_9GwLIFUREd6Yk7jCWR7r8A\">\n <properties xsi:type=\"eef-components:PropertiesEditionElement\" xmi:id=\"_9GvkFFUREd6Yk7jCWR7r8A\" name=\"name\" views=\"_9GwLIlUREd6Yk7jCWR7r8A\">\n <model xsi:type=\"ecore:EAttribute\" href=\"platform:/resource/org.obeonetwork.dsl.entity/model/entity.ecore#//Block/name\"/>\n </properties>\n <properties xsi:type=\"eef-components:PropertiesEditionElement\" xmi:id=\"_m3slUB8YEeC_porSarA8Jw\" name=\"description\" views=\"_ik4sUB8YEeC_porSarA8Jw\">\n <model xsi:type=\"ecore:EAttribute\" href=\"platform:/resource/org.obeonetwork.dsl.environment/model/environment.ecore#//ObeoDSMObject/description\"/>\n </properties>\n <referencedBinding xmi:id=\"_P62PEE_sEeCosP_fYaDlww\">\n <binding xsi:type=\"eef-components:PropertiesEditionComponent\" href=\"platform:/resource/org.obeonetwork.dsl.environment.edit/model/environment.components#_65K3QHC0EeCNPbrYssPTmA\"/>\n </referencedBinding>\n <model xsi:type=\"ecore:EClass\" href=\"platform:/resource/org.obeonetwork.dsl.entity/model/entity.ecore#//Block\"/>\n </bindings>\n <model xsi:type=\"ecore:EReference\" href=\"platform:/resource/org.obeonetwork.dsl.entity/model/entity.ecore#//Entity/supertype\"/>\n <bindings xsi:type=\"eef-components:PropertiesEditionComponent\" xmi:id=\"_9GvkG1UREd6Yk7jCWR7r8A\" name=\"attribute\" views=\"_9GwLKlUREd6Yk7jCWR7r8A\">\n <properties xsi:type=\"eef-components:PropertiesEditionElement\" xmi:id=\"_9GvkHFUREd6Yk7jCWR7r8A\" name=\"name\" views=\"_9GwLLFUREd6Yk7jCWR7r8A\">\n <model xsi:type=\"ecore:EAttribute\" href=\"platform:/resource/org.obeonetwork.dsl.entity/model/entity.ecore#//Property/name\"/>\n </properties>\n <properties xsi:type=\"eef-components:PropertiesEditionElement\" xmi:id=\"_LMBEQFaUEd6aBfNHgF_s6g\" name=\"type\" views=\"_B6q0sFaUEd6aBfNHgF_s6g\">\n <model xsi:type=\"ecore:EReference\" href=\"platform:/resource/org.obeonetwork.dsl.entity/model/entity.ecore#//Attribute/type\"/>\n </properties>\n <properties xsi:type=\"eef-components:PropertiesEditionElement\" xmi:id=\"_9GvkHVUREd6Yk7jCWR7r8A\" name=\"multiplicity\" views=\"_9GwLLVUREd6Yk7jCWR7r8A\">\n <model xsi:type=\"ecore:EAttribute\" href=\"platform:/resource/org.obeonetwork.dsl.entity/model/entity.ecore#//Property/multiplicity\"/>\n </properties>\n <properties xsi:type=\"eef-components:PropertiesEditionElement\" xmi:id=\"_9GvkHlUREd6Yk7jCWR7r8A\" name=\"isPrimaryKey\" views=\"_9GwLLlUREd6Yk7jCWR7r8A\">\n <model xsi:type=\"ecore:EAttribute\" href=\"platform:/resource/org.obeonetwork.dsl.entity/model/entity.ecore#//Property/isPrimaryKey\"/>\n </properties>\n <properties xsi:type=\"eef-components:PropertiesEditionElement\" xmi:id=\"_qNFMwB8YEeC_porSarA8Jw\" name=\"description\" views=\"_j2XiUB8YEeC_porSarA8Jw\">\n <model xsi:type=\"ecore:EAttribute\" href=\"platform:/resource/org.obeonetwork.dsl.environment/model/environment.ecore#//ObeoDSMObject/description\"/>\n </properties>\n <referencedBinding xmi:id=\"_rlBaoE_tEeCosP_fYaDlww\">\n <binding xsi:type=\"eef-components:PropertiesEditionComponent\" href=\"platform:/resource/org.obeonetwork.dsl.environment.edit/model/environment.components#_65K3QHC0EeCNPbrYssPTmA\"/>\n </referencedBinding>\n <model xsi:type=\"ecore:EClass\" href=\"platform:/resource/org.obeonetwork.dsl.entity/model/entity.ecore#//Attribute\"/>\n </bindings>\n <bindings xsi:type=\"eef-components:PropertiesEditionComponent\" xmi:id=\"_9GvkH1UREd6Yk7jCWR7r8A\" name=\"reference\" views=\"_9GwLL1UREd6Yk7jCWR7r8A\">\n <properties xsi:type=\"eef-components:PropertiesEditionElement\" xmi:id=\"_9GvkIFUREd6Yk7jCWR7r8A\" name=\"name\" views=\"_9GwLMVUREd6Yk7jCWR7r8A\">\n <model xsi:type=\"ecore:EAttribute\" href=\"platform:/resource/org.obeonetwork.dsl.entity/model/entity.ecore#//Property/name\"/>\n </properties>\n <properties xsi:type=\"eef-components:PropertiesEditionElement\" xmi:id=\"_NgUwUFcwEd6GSZXd5_Wzgg\" name=\"type\" views=\"_K0mw8VcwEd6GSZXd5_Wzgg\">\n <model xsi:type=\"ecore:EReference\" href=\"platform:/resource/org.obeonetwork.dsl.entity/model/entity.ecore#//Reference/type\"/>\n </properties>\n <properties xsi:type=\"eef-components:PropertiesEditionElement\" xmi:id=\"_9GvkIVUREd6Yk7jCWR7r8A\" name=\"multiplicity\" views=\"_9GwLMlUREd6Yk7jCWR7r8A\">\n <model xsi:type=\"ecore:EAttribute\" href=\"platform:/resource/org.obeonetwork.dsl.entity/model/entity.ecore#//Property/multiplicity\"/>\n </properties>\n <properties xsi:type=\"eef-components:PropertiesEditionElement\" xmi:id=\"_9GvkIlUREd6Yk7jCWR7r8A\" name=\"isPrimaryKey\" views=\"_9GwLM1UREd6Yk7jCWR7r8A\">\n <model xsi:type=\"ecore:EAttribute\" href=\"platform:/resource/org.obeonetwork.dsl.entity/model/entity.ecore#//Property/isPrimaryKey\"/>\n </properties>\n <properties xsi:type=\"eef-components:PropertiesEditionElement\" xmi:id=\"_9GvkI1UREd6Yk7jCWR7r8A\" name=\"isComposite\" views=\"_9GwLNFUREd6Yk7jCWR7r8A\">\n <model xsi:type=\"ecore:EAttribute\" href=\"platform:/resource/org.obeonetwork.dsl.entity/model/entity.ecore#//Reference/isComposite\"/>\n </properties>\n <properties xsi:type=\"eef-components:PropertiesEditionElement\" xmi:id=\"_9GvkJFUREd6Yk7jCWR7r8A\" name=\"navigable\" views=\"_9GwLNVUREd6Yk7jCWR7r8A\">\n <model xsi:type=\"ecore:EAttribute\" href=\"platform:/resource/org.obeonetwork.dsl.entity/model/entity.ecore#//Reference/navigable\"/>\n </properties>\n <properties xsi:type=\"eef-components:PropertiesEditionElement\" xmi:id=\"_qY-6wB8YEeC_porSarA8Jw\" name=\"description\" views=\"_gV33EB8YEeC_porSarA8Jw\">\n <model xsi:type=\"ecore:EAttribute\" href=\"platform:/resource/org.obeonetwork.dsl.environment/model/environment.ecore#//ObeoDSMObject/description\"/>\n </properties>\n <properties xsi:type=\"eef-components:PropertiesEditionElement\" xmi:id=\"_BvsHoCrvEeCjoN1mWj_CpQ\" name=\"oppositeOf\" views=\"_3dffECruEeCjoN1mWj_CpQ\">\n <model xsi:type=\"ecore:EReference\" href=\"platform:/resource/org.obeonetwork.dsl.entity/model/entity.ecore#//Reference/oppositeOf\"/>\n </properties>\n <referencedBinding xmi:id=\"_sDYKkE_tEeCosP_fYaDlww\">\n <binding xsi:type=\"eef-components:PropertiesEditionComponent\" href=\"platform:/resource/org.obeonetwork.dsl.environment.edit/model/environment.components#_65K3QHC0EeCNPbrYssPTmA\"/>\n </referencedBinding>\n <model xsi:type=\"ecore:EClass\" href=\"platform:/resource/org.obeonetwork.dsl.entity/model/entity.ecore#//Reference\"/>\n </bindings>\n <model xsi:type=\"ecore:EAttribute\" href=\"platform:/resource/org.obeonetwork.dsl.entity/model/entity.ecore#//Property/multiplicity\"/>\n <views xmi:id=\"_9GwLIFUREd6Yk7jCWR7r8A\" name=\"Block\">\n <elements xsi:type=\"eef-views:Container\" xmi:id=\"_9GwLIVUREd6Yk7jCWR7r8A\" name=\"properties\">\n <representation href=\"platform:/plugin/org.eclipse.emf.eef.views/std/SWT.toolkits#//@widgets.4\"/>\n <elements xsi:type=\"eef-views:ElementEditor\" xmi:id=\"_9GwLIlUREd6Yk7jCWR7r8A\" name=\"name\">\n <representation href=\"platform:/plugin/org.eclipse.emf.eef.views/std/SWT.toolkits#//@widgets.0\"/>\n </elements>\n <elements xsi:type=\"eef-views:ElementEditor\" xmi:id=\"_ik4sUB8YEeC_porSarA8Jw\" name=\"description\">\n <representation href=\"platform:/plugin/org.eclipse.emf.eef.views/std/SWT.toolkits#//@widgets.2\"/>\n </elements>\n </elements>\n </views>\n <views xmi:id=\"_9GwLKlUREd6Yk7jCWR7r8A\" name=\"Attribute\">\n <elements xsi:type=\"eef-views:Container\" xmi:id=\"_9GwLK1UREd6Yk7jCWR7r8A\" name=\"properties\">\n <representation href=\"platform:/plugin/org.eclipse.emf.eef.views/std/SWT.toolkits#//@widgets.4\"/>\n <elements xsi:type=\"eef-views:ElementEditor\" xmi:id=\"_9GwLLFUREd6Yk7jCWR7r8A\" name=\"name\">\n <representation href=\"platform:/plugin/org.eclipse.emf.eef.views/std/SWT.toolkits#//@widgets.0\"/>\n </elements>\n <elements xsi:type=\"eef-views:ElementEditor\" xmi:id=\"_B6q0sFaUEd6aBfNHgF_s6g\" name=\"type\">\n <representation href=\"platform:/plugin/org.eclipse.emf.eef.views/std/SWT.toolkits#//@widgets.6\"/>\n </elements>\n <elements xsi:type=\"eef-views:ElementEditor\" xmi:id=\"_9GwLLVUREd6Yk7jCWR7r8A\" name=\"multiplicity\">\n <representation href=\"platform:/plugin/org.eclipse.emf.eef.views/std/EMFProperties.toolkits#//@widgets.2\"/>\n </elements>\n <elements xsi:type=\"eef-views:ElementEditor\" xmi:id=\"_9GwLLlUREd6Yk7jCWR7r8A\" name=\"isPrimaryKey\">\n <representation href=\"platform:/plugin/org.eclipse.emf.eef.views/std/SWT.toolkits#//@widgets.1\"/>\n </elements>\n <elements xsi:type=\"eef-views:ElementEditor\" xmi:id=\"_j2XiUB8YEeC_porSarA8Jw\" name=\"description\">\n <representation href=\"platform:/plugin/org.eclipse.emf.eef.views/std/SWT.toolkits#//@widgets.2\"/>\n </elements>\n </elements>\n </views>\n <views xmi:id=\"_9GwLL1UREd6Yk7jCWR7r8A\" name=\"Reference\">\n <elements xsi:type=\"eef-views:Container\" xmi:id=\"_9GwLMFUREd6Yk7jCWR7r8A\" name=\"properties\">\n <representation href=\"platform:/plugin/org.eclipse.emf.eef.views/std/SWT.toolkits#//@widgets.4\"/>\n <elements xsi:type=\"eef-views:ElementEditor\" xmi:id=\"_9GwLMVUREd6Yk7jCWR7r8A\" name=\"name\">\n <representation href=\"platform:/plugin/org.eclipse.emf.eef.views/std/SWT.toolkits#//@widgets.0\"/>\n </elements>\n <elements xsi:type=\"eef-views:ElementEditor\" xmi:id=\"_K0mw8VcwEd6GSZXd5_Wzgg\" name=\"type\">\n <representation href=\"platform:/plugin/org.eclipse.emf.eef.views/std/EMFProperties.toolkits#//@widgets.9\"/>\n </elements>\n <elements xsi:type=\"eef-views:ElementEditor\" xmi:id=\"_9GwLMlUREd6Yk7jCWR7r8A\" name=\"multiplicity\">\n <representation href=\"platform:/plugin/org.eclipse.emf.eef.views/std/EMFProperties.toolkits#//@widgets.2\"/>\n </elements>\n <elements xsi:type=\"eef-views:ElementEditor\" xmi:id=\"_9GwLM1UREd6Yk7jCWR7r8A\" name=\"isPrimaryKey\">\n <representation href=\"platform:/plugin/org.eclipse.emf.eef.views/std/SWT.toolkits#//@widgets.1\"/>\n </elements>\n <elements xsi:type=\"eef-views:ElementEditor\" xmi:id=\"_9GwLNFUREd6Yk7jCWR7r8A\" name=\"isComposite\">\n <representation href=\"platform:/plugin/org.eclipse.emf.eef.views/std/SWT.toolkits#//@widgets.1\"/>\n </elements>\n <elements xsi:type=\"eef-views:ElementEditor\" xmi:id=\"_9GwLNVUREd6Yk7jCWR7r8A\" name=\"navigable\">\n <representation href=\"platform:/plugin/org.eclipse.emf.eef.views/std/SWT.toolkits#//@widgets.1\"/>\n </elements>\n <elements xsi:type=\"eef-views:ElementEditor\" xmi:id=\"_3dffECruEeCjoN1mWj_CpQ\" name=\"oppositeOf\">\n <representation href=\"platform:/plugin/org.eclipse.emf.eef.views/std/EMFProperties.toolkits#//@widgets.0\"/>\n </elements>\n <elements xsi:type=\"eef-views:ElementEditor\" xmi:id=\"_gV33EB8YEeC_porSarA8Jw\" name=\"description\">\n <representation href=\"platform:/plugin/org.eclipse.emf.eef.views/std/SWT.toolkits#//@widgets.2\"/>\n </elements>\n </elements>\n </views>", "old_methods": [], "patch": "@@ -4,7 +4,7 @@\n <categories xmi:id=\"_9GvkEVUREd6Yk7jCWR7r8A\" name=\"entity\">\n <bindings xsi:type=\"eef-components:PropertiesEditionComponent\" xmi:id=\"_9GvkElUREd6Yk7jCWR7r8A\" name=\"root\" views=\"_9GvkMFUREd6Yk7jCWR7r8A\">\n <properties xsi:type=\"eef-components:PropertiesEditionElement\" xmi:id=\"_Nt348J9cEeG2HK8o5hk6vA\" name=\"name\" views=\"_-vyJAZ9bEeG2HK8o5hk6vA\">\n- <model xsi:type=\"ecore:EAttribute\" href=\"platform:/resource/org.obeonetwork.dsl.environment/model/environment.ecore#//Namespace/name\"/>\n+ <model xsi:type=\"ecore:EAttribute\" href=\"platform:/resource/org.obeonetwork.dsl.entity/model/entity.ecore#//Root/name\"/>\n </properties>\n <properties xsi:type=\"eef-components:PropertiesEditionElement\" xmi:id=\"_Nt4gAJ9cEeG2HK8o5hk6vA\" name=\"description\" views=\"_-vyJAp9bEeG2HK8o5hk6vA\">\n <model xsi:type=\"ecore:EAttribute\" href=\"platform:/resource/org.obeonetwork.dsl.environment/model/environment.ecore#//ObeoDSMObject/description\"/>\n@@ -14,24 +14,12 @@\n </referencedBinding>\n <model xsi:type=\"ecore:EClass\" href=\"platform:/resource/org.obeonetwork.dsl.entity/model/entity.ecore#//Root\"/>\n </bindings>\n- <bindings xsi:type=\"eef-components:PropertiesEditionComponent\" xmi:id=\"_9GvkE1UREd6Yk7jCWR7r8A\" name=\"block\" views=\"_9GwLIFUREd6Yk7jCWR7r8A\">\n- <properties xsi:type=\"eef-components:PropertiesEditionElement\" xmi:id=\"_9GvkFFUREd6Yk7jCWR7r8A\" name=\"name\" views=\"_9GwLIlUREd6Yk7jCWR7r8A\">\n- <model xsi:type=\"ecore:EAttribute\" href=\"platform:/resource/org.obeonetwork.dsl.entity/model/entity.ecore#//Block/name\"/>\n- </properties>\n- <properties xsi:type=\"eef-components:PropertiesEditionElement\" xmi:id=\"_m3slUB8YEeC_porSarA8Jw\" name=\"description\" views=\"_ik4sUB8YEeC_porSarA8Jw\">\n- <model xsi:type=\"ecore:EAttribute\" href=\"platform:/resource/org.obeonetwork.dsl.environment/model/environment.ecore#//ObeoDSMObject/description\"/>\n- </properties>\n- <referencedBinding xmi:id=\"_P62PEE_sEeCosP_fYaDlww\">\n- <binding xsi:type=\"eef-components:PropertiesEditionComponent\" href=\"platform:/resource/org.obeonetwork.dsl.environment.edit/model/environment.components#_65K3QHC0EeCNPbrYssPTmA\"/>\n- </referencedBinding>\n- <model xsi:type=\"ecore:EClass\" href=\"platform:/resource/org.obeonetwork.dsl.entity/model/entity.ecore#//Block\"/>\n- </bindings>\n <bindings xsi:type=\"eef-components:PropertiesEditionComponent\" xmi:id=\"_9GvkFVUREd6Yk7jCWR7r8A\" name=\"entity\" views=\"_9GwLI1UREd6Yk7jCWR7r8A\">\n <properties xsi:type=\"eef-components:PropertiesEditionElement\" xmi:id=\"_9GvkFlUREd6Yk7jCWR7r8A\" name=\"name\" views=\"_9GwLJVUREd6Yk7jCWR7r8A\">\n <model xsi:type=\"ecore:EAttribute\" href=\"platform:/resource/org.obeonetwork.dsl.environment/model/environment.ecore#//Type/name\"/>\n </properties>\n <properties xsi:type=\"eef-components:PropertiesEditionElement\" xmi:id=\"_ZUxxoFc3Ed6HocRae_Ft8A\" name=\"superType\" views=\"_UeFvgFc3Ed6HocRae_Ft8A\">\n- <model xsi:type=\"ecore:EReference\" href=\"platform:/resource/org.obeonetwork.dsl.entity/model/entity.ecore#//Entity/supertype\"/>\n+ <model xsi:type=\"ecore:EReference\" href=\"platform:/resource/org.obeonetwork.dsl.environment/model/environment.ecore#//StructuredType/supertype\"/>\n </properties>\n <properties xsi:type=\"eef-components:PropertiesEditionElement\" xmi:id=\"_9GvkF1UREd6Yk7jCWR7r8A\" name=\"estimatedVolumetry\" views=\"_9GwLJlUREd6Yk7jCWR7r8A\">\n <model xsi:type=\"ecore:EAttribute\" href=\"platform:/resource/org.obeonetwork.dsl.entity/model/entity.ecore#//Entity/estimatedVolumetry\"/>\n@@ -53,63 +41,12 @@\n </referencedBinding>\n <model xsi:type=\"ecore:EClass\" href=\"platform:/resource/org.obeonetwork.dsl.entity/model/entity.ecore#//Entity\"/>\n </bindings>\n- <bindings xsi:type=\"eef-components:PropertiesEditionComponent\" xmi:id=\"_9GvkG1UREd6Yk7jCWR7r8A\" name=\"attribute\" views=\"_9GwLKlUREd6Yk7jCWR7r8A\">\n- <properties xsi:type=\"eef-components:PropertiesEditionElement\" xmi:id=\"_9GvkHFUREd6Yk7jCWR7r8A\" name=\"name\" views=\"_9GwLLFUREd6Yk7jCWR7r8A\">\n- <model xsi:type=\"ecore:EAttribute\" href=\"platform:/resource/org.obeonetwork.dsl.entity/model/entity.ecore#//Property/name\"/>\n- </properties>\n- <properties xsi:type=\"eef-components:PropertiesEditionElement\" xmi:id=\"_LMBEQFaUEd6aBfNHgF_s6g\" name=\"type\" views=\"_B6q0sFaUEd6aBfNHgF_s6g\">\n- <model xsi:type=\"ecore:EReference\" href=\"platform:/resource/org.obeonetwork.dsl.entity/model/entity.ecore#//Attribute/type\"/>\n- </properties>\n- <properties xsi:type=\"eef-components:PropertiesEditionElement\" xmi:id=\"_9GvkHVUREd6Yk7jCWR7r8A\" name=\"multiplicity\" views=\"_9GwLLVUREd6Yk7jCWR7r8A\">\n- <model xsi:type=\"ecore:EAttribute\" href=\"platform:/resource/org.obeonetwork.dsl.entity/model/entity.ecore#//Property/multiplicity\"/>\n- </properties>\n- <properties xsi:type=\"eef-components:PropertiesEditionElement\" xmi:id=\"_9GvkHlUREd6Yk7jCWR7r8A\" name=\"isPrimaryKey\" views=\"_9GwLLlUREd6Yk7jCWR7r8A\">\n- <model xsi:type=\"ecore:EAttribute\" href=\"platform:/resource/org.obeonetwork.dsl.entity/model/entity.ecore#//Property/isPrimaryKey\"/>\n- </properties>\n- <properties xsi:type=\"eef-components:PropertiesEditionElement\" xmi:id=\"_qNFMwB8YEeC_porSarA8Jw\" name=\"description\" views=\"_j2XiUB8YEeC_porSarA8Jw\">\n- <model xsi:type=\"ecore:EAttribute\" href=\"platform:/resource/org.obeonetwork.dsl.environment/model/environment.ecore#//ObeoDSMObject/description\"/>\n- </properties>\n- <referencedBinding xmi:id=\"_rlBaoE_tEeCosP_fYaDlww\">\n- <binding xsi:type=\"eef-components:PropertiesEditionComponent\" href=\"platform:/resource/org.obeonetwork.dsl.environment.edit/model/environment.components#_65K3QHC0EeCNPbrYssPTmA\"/>\n- </referencedBinding>\n- <model xsi:type=\"ecore:EClass\" href=\"platform:/resource/org.obeonetwork.dsl.entity/model/entity.ecore#//Attribute\"/>\n- </bindings>\n- <bindings xsi:type=\"eef-components:PropertiesEditionComponent\" xmi:id=\"_9GvkH1UREd6Yk7jCWR7r8A\" name=\"reference\" views=\"_9GwLL1UREd6Yk7jCWR7r8A\">\n- <properties xsi:type=\"eef-components:PropertiesEditionElement\" xmi:id=\"_9GvkIFUREd6Yk7jCWR7r8A\" name=\"name\" views=\"_9GwLMVUREd6Yk7jCWR7r8A\">\n- <model xsi:type=\"ecore:EAttribute\" href=\"platform:/resource/org.obeonetwork.dsl.entity/model/entity.ecore#//Property/name\"/>\n- </properties>\n- <properties xsi:type=\"eef-components:PropertiesEditionElement\" xmi:id=\"_NgUwUFcwEd6GSZXd5_Wzgg\" name=\"type\" views=\"_K0mw8VcwEd6GSZXd5_Wzgg\">\n- <model xsi:type=\"ecore:EReference\" href=\"platform:/resource/org.obeonetwork.dsl.entity/model/entity.ecore#//Reference/type\"/>\n- </properties>\n- <properties xsi:type=\"eef-components:PropertiesEditionElement\" xmi:id=\"_9GvkIVUREd6Yk7jCWR7r8A\" name=\"multiplicity\" views=\"_9GwLMlUREd6Yk7jCWR7r8A\">\n- <model xsi:type=\"ecore:EAttribute\" href=\"platform:/resource/org.obeonetwork.dsl.entity/model/entity.ecore#//Property/multiplicity\"/>\n- </properties>\n- <properties xsi:type=\"eef-components:PropertiesEditionElement\" xmi:id=\"_9GvkIlUREd6Yk7jCWR7r8A\" name=\"isPrimaryKey\" views=\"_9GwLM1UREd6Yk7jCWR7r8A\">\n- <model xsi:type=\"ecore:EAttribute\" href=\"platform:/resource/org.obeonetwork.dsl.entity/model/entity.ecore#//Property/isPrimaryKey\"/>\n- </properties>\n- <properties xsi:type=\"eef-components:PropertiesEditionElement\" xmi:id=\"_9GvkI1UREd6Yk7jCWR7r8A\" name=\"isComposite\" views=\"_9GwLNFUREd6Yk7jCWR7r8A\">\n- <model xsi:type=\"ecore:EAttribute\" href=\"platform:/resource/org.obeonetwork.dsl.entity/model/entity.ecore#//Reference/isComposite\"/>\n- </properties>\n- <properties xsi:type=\"eef-components:PropertiesEditionElement\" xmi:id=\"_9GvkJFUREd6Yk7jCWR7r8A\" name=\"navigable\" views=\"_9GwLNVUREd6Yk7jCWR7r8A\">\n- <model xsi:type=\"ecore:EAttribute\" href=\"platform:/resource/org.obeonetwork.dsl.entity/model/entity.ecore#//Reference/navigable\"/>\n- </properties>\n- <properties xsi:type=\"eef-components:PropertiesEditionElement\" xmi:id=\"_qY-6wB8YEeC_porSarA8Jw\" name=\"description\" views=\"_gV33EB8YEeC_porSarA8Jw\">\n- <model xsi:type=\"ecore:EAttribute\" href=\"platform:/resource/org.obeonetwork.dsl.environment/model/environment.ecore#//ObeoDSMObject/description\"/>\n- </properties>\n- <properties xsi:type=\"eef-components:PropertiesEditionElement\" xmi:id=\"_BvsHoCrvEeCjoN1mWj_CpQ\" name=\"oppositeOf\" views=\"_3dffECruEeCjoN1mWj_CpQ\">\n- <model xsi:type=\"ecore:EReference\" href=\"platform:/resource/org.obeonetwork.dsl.entity/model/entity.ecore#//Reference/oppositeOf\"/>\n- </properties>\n- <referencedBinding xmi:id=\"_sDYKkE_tEeCosP_fYaDlww\">\n- <binding xsi:type=\"eef-components:PropertiesEditionComponent\" href=\"platform:/resource/org.obeonetwork.dsl.environment.edit/model/environment.components#_65K3QHC0EeCNPbrYssPTmA\"/>\n- </referencedBinding>\n- <model xsi:type=\"ecore:EClass\" href=\"platform:/resource/org.obeonetwork.dsl.entity/model/entity.ecore#//Reference\"/>\n- </bindings>\n <bindings xsi:type=\"eef-components:PropertiesEditionComponent\" xmi:id=\"_9GvkJVUREd6Yk7jCWR7r8A\" name=\"finder\" views=\"_9GwLNlUREd6Yk7jCWR7r8A\">\n <properties xsi:type=\"eef-components:PropertiesEditionElement\" xmi:id=\"_9GvkJlUREd6Yk7jCWR7r8A\" name=\"customizedName\" views=\"_9GwLOFUREd6Yk7jCWR7r8A\">\n <model xsi:type=\"ecore:EAttribute\" href=\"platform:/resource/org.obeonetwork.dsl.entity/model/entity.ecore#//Finder/customizedName\"/>\n </properties>\n <properties xsi:type=\"eef-components:PropertiesEditionElement\" xmi:id=\"_Pfk9MeTIEd6q6KiIIVvIrw\" name=\"multiplicity\" views=\"_R9OrYOTIEd6q6KiIIVvIrw\">\n- <model xsi:type=\"ecore:EAttribute\" href=\"platform:/resource/org.obeonetwork.dsl.entity/model/entity.ecore#//Property/multiplicity\"/>\n+ <model xsi:type=\"ecore:EAttribute\" href=\"platform:/resource/org.obeonetwork.dsl.entity/model/entity.ecore#//Finder/multiplicity\"/>\n </properties>\n <properties xsi:type=\"eef-components:PropertiesEditionElement\" xmi:id=\"_qj-CwB8YEeC_porSarA8Jw\" name=\"description\" views=\"_kgZ90B8YEeC_porSarA8Jw\">\n <model xsi:type=\"ecore:EAttribute\" href=\"platform:/resource/org.obeonetwork.dsl.environment/model/environment.ecore#//ObeoDSMObject/description\"/>\n@@ -164,17 +101,6 @@\n </elements>\n </elements>\n </views>\n- <views xmi:id=\"_9GwLIFUREd6Yk7jCWR7r8A\" name=\"Block\">\n- <elements xsi:type=\"eef-views:Container\" xmi:id=\"_9GwLIVUREd6Yk7jCWR7r8A\" name=\"properties\">\n- <representation href=\"platform:/plugin/org.eclipse.emf.eef.views/std/SWT.toolkits#//@widgets.4\"/>\n- <elements xsi:type=\"eef-views:ElementEditor\" xmi:id=\"_9GwLIlUREd6Yk7jCWR7r8A\" name=\"name\">\n- <representation href=\"platform:/plugin/org.eclipse.emf.eef.views/std/SWT.toolkits#//@widgets.0\"/>\n- </elements>\n- <elements xsi:type=\"eef-views:ElementEditor\" xmi:id=\"_ik4sUB8YEeC_porSarA8Jw\" name=\"description\">\n- <representation href=\"platform:/plugin/org.eclipse.emf.eef.views/std/SWT.toolkits#//@widgets.2\"/>\n- </elements>\n- </elements>\n- </views>\n <views xmi:id=\"_9GwLI1UREd6Yk7jCWR7r8A\" name=\"Entity\">\n <elements xsi:type=\"eef-views:Container\" xmi:id=\"_9GwLJFUREd6Yk7jCWR7r8A\" name=\"properties\">\n <representation href=\"platform:/plugin/org.eclipse.emf.eef.views/std/SWT.toolkits#//@widgets.4\"/>\n@@ -201,55 +127,6 @@\n </elements>\n </elements>\n </views>\n- <views xmi:id=\"_9GwLKlUREd6Yk7jCWR7r8A\" name=\"Attribute\">\n- <elements xsi:type=\"eef-views:Container\" xmi:id=\"_9GwLK1UREd6Yk7jCWR7r8A\" name=\"properties\">\n- <representation href=\"platform:/plugin/org.eclipse.emf.eef.views/std/SWT.toolkits#//@widgets.4\"/>\n- <elements xsi:type=\"eef-views:ElementEditor\" xmi:id=\"_9GwLLFUREd6Yk7jCWR7r8A\" name=\"name\">\n- <representation href=\"platform:/plugin/org.eclipse.emf.eef.views/std/SWT.toolkits#//@widgets.0\"/>\n- </elements>\n- <elements xsi:type=\"eef-views:ElementEditor\" xmi:id=\"_B6q0sFaUEd6aBfNHgF_s6g\" name=\"type\">\n- <representation href=\"platform:/plugin/org.eclipse.emf.eef.views/std/SWT.toolkits#//@widgets.6\"/>\n- </elements>\n- <elements xsi:type=\"eef-views:ElementEditor\" xmi:id=\"_9GwLLVUREd6Yk7jCWR7r8A\" name=\"multiplicity\">\n- <representation href=\"platform:/plugin/org.eclipse.emf.eef.views/std/EMFProperties.toolkits#//@widgets.2\"/>\n- </elements>\n- <elements xsi:type=\"eef-views:ElementEditor\" xmi:id=\"_9GwLLlUREd6Yk7jCWR7r8A\" name=\"isPrimaryKey\">\n- <representation href=\"platform:/plugin/org.eclipse.emf.eef.views/std/SWT.toolkits#//@widgets.1\"/>\n- </elements>\n- <elements xsi:type=\"eef-views:ElementEditor\" xmi:id=\"_j2XiUB8YEeC_porSarA8Jw\" name=\"description\">\n- <representation href=\"platform:/plugin/org.eclipse.emf.eef.views/std/SWT.toolkits#//@widgets.2\"/>\n- </elements>\n- </elements>\n- </views>\n- <views xmi:id=\"_9GwLL1UREd6Yk7jCWR7r8A\" name=\"Reference\">\n- <elements xsi:type=\"eef-views:Container\" xmi:id=\"_9GwLMFUREd6Yk7jCWR7r8A\" name=\"properties\">\n- <representation href=\"platform:/plugin/org.eclipse.emf.eef.views/std/SWT.toolkits#//@widgets.4\"/>\n- <elements xsi:type=\"eef-views:ElementEditor\" xmi:id=\"_9GwLMVUREd6Yk7jCWR7r8A\" name=\"name\">\n- <representation href=\"platform:/plugin/org.eclipse.emf.eef.views/std/SWT.toolkits#//@widgets.0\"/>\n- </elements>\n- <elements xsi:type=\"eef-views:ElementEditor\" xmi:id=\"_K0mw8VcwEd6GSZXd5_Wzgg\" name=\"type\">\n- <representation href=\"platform:/plugin/org.eclipse.emf.eef.views/std/EMFProperties.toolkits#//@widgets.9\"/>\n- </elements>\n- <elements xsi:type=\"eef-views:ElementEditor\" xmi:id=\"_9GwLMlUREd6Yk7jCWR7r8A\" name=\"multiplicity\">\n- <representation href=\"platform:/plugin/org.eclipse.emf.eef.views/std/EMFProperties.toolkits#//@widgets.2\"/>\n- </elements>\n- <elements xsi:type=\"eef-views:ElementEditor\" xmi:id=\"_9GwLM1UREd6Yk7jCWR7r8A\" name=\"isPrimaryKey\">\n- <representation href=\"platform:/plugin/org.eclipse.emf.eef.views/std/SWT.toolkits#//@widgets.1\"/>\n- </elements>\n- <elements xsi:type=\"eef-views:ElementEditor\" xmi:id=\"_9GwLNFUREd6Yk7jCWR7r8A\" name=\"isComposite\">\n- <representation href=\"platform:/plugin/org.eclipse.emf.eef.views/std/SWT.toolkits#//@widgets.1\"/>\n- </elements>\n- <elements xsi:type=\"eef-views:ElementEditor\" xmi:id=\"_9GwLNVUREd6Yk7jCWR7r8A\" name=\"navigable\">\n- <representation href=\"platform:/plugin/org.eclipse.emf.eef.views/std/SWT.toolkits#//@widgets.1\"/>\n- </elements>\n- <elements xsi:type=\"eef-views:ElementEditor\" xmi:id=\"_3dffECruEeCjoN1mWj_CpQ\" name=\"oppositeOf\">\n- <representation href=\"platform:/plugin/org.eclipse.emf.eef.views/std/EMFProperties.toolkits#//@widgets.0\"/>\n- </elements>\n- <elements xsi:type=\"eef-views:ElementEditor\" xmi:id=\"_gV33EB8YEeC_porSarA8Jw\" name=\"description\">\n- <representation href=\"platform:/plugin/org.eclipse.emf.eef.views/std/SWT.toolkits#//@widgets.2\"/>\n- </elements>\n- </elements>\n- </views>\n <views xmi:id=\"_9GwLNlUREd6Yk7jCWR7r8A\" name=\"Finder\">\n <elements xsi:type=\"eef-views:Container\" xmi:id=\"_9GwLN1UREd6Yk7jCWR7r8A\" name=\"properties\">\n <representation href=\"platform:/plugin/org.eclipse.emf.eef.views/std/SWT.toolkits#//@widgets.4\"/>", "raw_url": "https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.edit%2Fmodels%2Fentity.components", "sha": "273abc205279c952d528547cdda9f37623565d15", "status": "modified" }, { "additions": 2, "blob_url": "https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.edit%2Fplugin.properties", "changes": 2, "contents_url": "https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.edit%2Fplugin.properties?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6", "deletions": 0, "filename": "models/entity/plugins/org.obeonetwork.dsl.entity.edit/plugin.properties", "new_code": "_UI_Root_namespaces_feature = Namespaces\n_UI_Root_name_feature = Name", "new_methods": [], "old_code": "", "old_methods": [], "patch": "@@ -112,3 +112,5 @@ _UI_InheritanceKind_TABLE_PER_SUBCLASS_literal = TABLE_PER_SUBCLASS\n _UI_InheritanceKind_TABLE_PER_CLASS_HIERARCHY_literal = TABLE_PER_CLASS_HIERARCHY\n _UI_Property_isPrimaryKey_feature = Is Primary Key\n _UI_Finder_multiplicity_feature = Multiplicity\n+_UI_Root_namespaces_feature = Namespaces\n+_UI_Root_name_feature = Name", "raw_url": "https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.edit%2Fplugin.properties", "sha": "1ddac1ae70392d80687f0bc5cdd81b69b1850462", "status": "modified" }, { "additions": 13, "blob_url": "https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.edit%2Fplugin.xml", "changes": 13, "contents_url": "https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.edit%2Fplugin.xml?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6", "deletions": 0, "filename": "models/entity/plugins/org.obeonetwork.dsl.entity.edit/plugin.xml", "new_code": "\n <extension point=\"org.eclipse.emf.edit.itemProviderAdapterFactories\">\n <!-- @generated entity -->\n <factory\n uri=\"http://www.obeonetwork.org/dsl/entity/2.0.0/utilities\"\n class=\"org.obeonetwork.dsl.entity.extensionUtilities.provider.ExtensionUtilitiesItemProviderAdapterFactory\"\n supportedTypes=\n \"org.eclipse.emf.edit.provider.IEditingDomainItemProvider\n org.eclipse.emf.edit.provider.IStructuredItemContentProvider\n org.eclipse.emf.edit.provider.ITreeItemContentProvider\n org.eclipse.emf.edit.provider.IItemLabelProvider\n org.eclipse.emf.edit.provider.IItemPropertySource\"/>\n </extension>", "new_methods": [], "old_code": "", "old_methods": [], "patch": "@@ -21,6 +21,19 @@\n org.eclipse.emf.edit.provider.IItemLabelProvider\n org.eclipse.emf.edit.provider.IItemPropertySource\" />\n </extension>\n+\n+ <extension point=\"org.eclipse.emf.edit.itemProviderAdapterFactories\">\n+ <!-- @generated entity -->\n+ <factory\n+ uri=\"http://www.obeonetwork.org/dsl/entity/2.0.0/utilities\"\n+ class=\"org.obeonetwork.dsl.entity.extensionUtilities.provider.ExtensionUtilitiesItemProviderAdapterFactory\"\n+ supportedTypes=\n+ \"org.eclipse.emf.edit.provider.IEditingDomainItemProvider\n+ org.eclipse.emf.edit.provider.IStructuredItemContentProvider\n+ org.eclipse.emf.edit.provider.ITreeItemContentProvider\n+ org.eclipse.emf.edit.provider.IItemLabelProvider\n+ org.eclipse.emf.edit.provider.IItemPropertySource\"/>\n+ </extension>\n <extension\n point=\"org.eclipse.emf.edit.itemProviderAdapterFactories\">\n <factory", "raw_url": "https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.edit%2Fplugin.xml", "sha": "10645fc0f272b2f6b7bd35fe73b10d459894109e", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.edit%2Fsrc-gen%2Fentity_properties.plugin.xml", "changes": 56, "contents_url": "https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.edit%2Fsrc-gen%2Fentity_properties.plugin.xml?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6", "deletions": 55, "filename": "models/entity/plugins/org.obeonetwork.dsl.entity.edit/src-gen/entity_properties.plugin.xml", "new_code": " uri=\"http://www.obeonetwork.org/dsl/entity/3.0.0\"", "new_methods": [], "old_code": " uri=\"http://www.obeonetwork.org/dsl/entity/2.0.0\"\n <propertyTab\n id=\"Block\"\n label=\"Block\"\n category=\"default\">\n </propertyTab>\n\n <propertyTab\n id=\"Attribute\"\n label=\"Attribute\"\n category=\"default\">\n </propertyTab>\n\n <propertyTab\n id=\"Reference\"\n label=\"Reference\"\n category=\"default\">\n </propertyTab>\n\n <propertySection\n class=\"org.obeonetwork.dsl.entity.parts.forms.BlockPropertiesEditionPartForm\"\n filter=\"org.obeonetwork.dsl.entity.providers.BlockPropertiesEditionProvider$EditionFilter\"\n id=\"org.obeonetwork.dsl.entity.section.Block\"\n tab=\"Block\">\n </propertySection>\n <propertySection\n class=\"org.obeonetwork.dsl.environment.parts.forms.MetadatasPropertiesEditionPartForm\"\n filter=\"org.obeonetwork.dsl.entity.providers.BlockPropertiesEditionProvider$EditionFilter\"\n id=\"org.obeonetwork.dsl.entity.section.Block\"\n tab=\"Metadatas\">\n </propertySection>\n <propertySection\n class=\"org.obeonetwork.dsl.entity.parts.forms.AttributePropertiesEditionPartForm\"\n filter=\"org.obeonetwork.dsl.entity.providers.AttributePropertiesEditionProvider$EditionFilter\"\n id=\"org.obeonetwork.dsl.entity.section.Attribute\"\n tab=\"Attribute\">\n </propertySection>\n <propertySection\n class=\"org.obeonetwork.dsl.environment.parts.forms.MetadatasPropertiesEditionPartForm\"\n filter=\"org.obeonetwork.dsl.entity.providers.AttributePropertiesEditionProvider$EditionFilter\"\n id=\"org.obeonetwork.dsl.entity.section.Attribute\"\n tab=\"Metadatas\">\n </propertySection>\n <propertySection\n class=\"org.obeonetwork.dsl.entity.parts.forms.ReferencePropertiesEditionPartForm\"\n filter=\"org.obeonetwork.dsl.entity.providers.ReferencePropertiesEditionProvider$EditionFilter\"\n id=\"org.obeonetwork.dsl.entity.section.Reference\"\n tab=\"Reference\">\n </propertySection>\n <propertySection\n class=\"org.obeonetwork.dsl.environment.parts.forms.MetadatasPropertiesEditionPartForm\"\n filter=\"org.obeonetwork.dsl.entity.providers.ReferencePropertiesEditionProvider$EditionFilter\"\n id=\"org.obeonetwork.dsl.entity.section.Reference\"\n tab=\"Metadatas\">\n </propertySection>", "old_methods": [], "patch": "@@ -6,7 +6,7 @@\n <!-- EEF extensions -->\n <extension point=\"org.eclipse.emf.edit.itemProviderAdapterFactories\">\n <factory\n- uri=\"http://www.obeonetwork.org/dsl/entity/2.0.0\"\n+ uri=\"http://www.obeonetwork.org/dsl/entity/3.0.0\"\n class=\"org.obeonetwork.dsl.entity.providers.EntityEEFAdapterFactory\"\n supportedTypes=\"org.eclipse.emf.eef.runtime.providers.PropertiesEditingProvider\"/>\n </extension>\n@@ -51,30 +51,12 @@\n afterTab=\"Root\">\n </propertyTab>\n \n- <propertyTab\n- id=\"Block\"\n- label=\"Block\"\n- category=\"default\">\n- </propertyTab>\n-\n <propertyTab\n id=\"Entity\"\n label=\"Entity\"\n category=\"default\">\n </propertyTab>\n \n- <propertyTab\n- id=\"Attribute\"\n- label=\"Attribute\"\n- category=\"default\">\n- </propertyTab>\n-\n- <propertyTab\n- id=\"Reference\"\n- label=\"Reference\"\n- category=\"default\">\n- </propertyTab>\n-\n <propertyTab\n id=\"Finder\"\n label=\"Finder\"\n@@ -111,18 +93,6 @@\n id=\"org.obeonetwork.dsl.entity.section.Root\"\n tab=\"Metadatas\">\n </propertySection>\n- <propertySection\n- class=\"org.obeonetwork.dsl.entity.parts.forms.BlockPropertiesEditionPartForm\"\n- filter=\"org.obeonetwork.dsl.entity.providers.BlockPropertiesEditionProvider$EditionFilter\"\n- id=\"org.obeonetwork.dsl.entity.section.Block\"\n- tab=\"Block\">\n- </propertySection>\n- <propertySection\n- class=\"org.obeonetwork.dsl.environment.parts.forms.MetadatasPropertiesEditionPartForm\"\n- filter=\"org.obeonetwork.dsl.entity.providers.BlockPropertiesEditionProvider$EditionFilter\"\n- id=\"org.obeonetwork.dsl.entity.section.Block\"\n- tab=\"Metadatas\">\n- </propertySection>\n <propertySection\n class=\"org.obeonetwork.dsl.entity.parts.forms.EntityPropertiesEditionPartForm\"\n filter=\"org.obeonetwork.dsl.entity.providers.EntityPropertiesEditionProvider$EditionFilter\"\n@@ -135,30 +105,6 @@\n id=\"org.obeonetwork.dsl.entity.section.Entity\"\n tab=\"Metadatas\">\n </propertySection>\n- <propertySection\n- class=\"org.obeonetwork.dsl.entity.parts.forms.AttributePropertiesEditionPartForm\"\n- filter=\"org.obeonetwork.dsl.entity.providers.AttributePropertiesEditionProvider$EditionFilter\"\n- id=\"org.obeonetwork.dsl.entity.section.Attribute\"\n- tab=\"Attribute\">\n- </propertySection>\n- <propertySection\n- class=\"org.obeonetwork.dsl.environment.parts.forms.MetadatasPropertiesEditionPartForm\"\n- filter=\"org.obeonetwork.dsl.entity.providers.AttributePropertiesEditionProvider$EditionFilter\"\n- id=\"org.obeonetwork.dsl.entity.section.Attribute\"\n- tab=\"Metadatas\">\n- </propertySection>\n- <propertySection\n- class=\"org.obeonetwork.dsl.entity.parts.forms.ReferencePropertiesEditionPartForm\"\n- filter=\"org.obeonetwork.dsl.entity.providers.ReferencePropertiesEditionProvider$EditionFilter\"\n- id=\"org.obeonetwork.dsl.entity.section.Reference\"\n- tab=\"Reference\">\n- </propertySection>\n- <propertySection\n- class=\"org.obeonetwork.dsl.environment.parts.forms.MetadatasPropertiesEditionPartForm\"\n- filter=\"org.obeonetwork.dsl.entity.providers.ReferencePropertiesEditionProvider$EditionFilter\"\n- id=\"org.obeonetwork.dsl.entity.section.Reference\"\n- tab=\"Metadatas\">\n- </propertySection>\n <propertySection\n class=\"org.obeonetwork.dsl.entity.parts.forms.FinderPropertiesEditionPartForm\"\n filter=\"org.obeonetwork.dsl.entity.providers.FinderPropertiesEditionProvider$EditionFilter\"", "raw_url": "https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.edit%2Fsrc-gen%2Fentity_properties.plugin.xml", "sha": "82fff1dbcfab07a249bc2791b28f1029a24a4af3", "status": "modified" }, { "additions": 11, "blob_url": "https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.edit%2Fsrc-gen%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fcomponents%2FEntityEntityPropertiesEditionComponent.java", "changes": 23, "contents_url": "https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.edit%2Fsrc-gen%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fcomponents%2FEntityEntityPropertiesEditionComponent.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6", "deletions": 12, "filename": "models/entity/plugins/org.obeonetwork.dsl.entity.edit/src-gen/org/obeonetwork/dsl/entity/components/EntityEntityPropertiesEditionComponent.java", "new_code": "import org.eclipse.emf.eef.runtime.context.impl.EReferencePropertiesEditionContext;\nimport org.eclipse.emf.eef.runtime.policies.impl.CreateEditingPolicy;\nimport org.obeonetwork.dsl.environment.StructuredType;\n\t\t\t\tsuperTypeSettings = new EObjectFlatComboSettings(entity, EnvironmentPackage.eINSTANCE.getStructuredType_Supertype());\n\t\t\treturn EnvironmentPackage.eINSTANCE.getStructuredType_Supertype();\n\t\t\t\tsuperTypeSettings.setToReference((StructuredType)event.getNewValue());\n\t\t\t\tEReferencePropertiesEditionContext context = new EReferencePropertiesEditionContext(editingContext, this, superTypeSettings, editingContext.getAdapterFactory());\n\t\t\t\tPropertiesEditingProvider provider = (PropertiesEditingProvider)editingContext.getAdapterFactory().adapt(semanticObject, PropertiesEditingProvider.class);\n\t\t\t\t\tif (policy instanceof CreateEditingPolicy) {\n\t\t\tif (EnvironmentPackage.eINSTANCE.getStructuredType_Supertype().equals(msg.getFeature()) && entityPart != null && isAccessible(EntityViewsRepository.Entity_.Properties.superType))\n\t\t\tEnvironmentPackage.eINSTANCE.getStructuredType_Supertype(),", "new_methods": [], "old_code": "import org.eclipse.emf.eef.runtime.context.impl.EObjectPropertiesEditionContext;\nimport org.obeonetwork.dsl.entity.EntityFactory;\n\t\t\t\tsuperTypeSettings = new EObjectFlatComboSettings(entity, EntityPackage.eINSTANCE.getEntity_Supertype());\n\t\t\treturn EntityPackage.eINSTANCE.getEntity_Supertype();\n\t\t\t\tsuperTypeSettings.setToReference((Entity)event.getNewValue());\n\t\t\t\tEntity eObject = EntityFactory.eINSTANCE.createEntity();\n\t\t\t\tEObjectPropertiesEditionContext context = new EObjectPropertiesEditionContext(editingContext, this, eObject, editingContext.getAdapterFactory());\n\t\t\t\tPropertiesEditingProvider provider = (PropertiesEditingProvider)editingContext.getAdapterFactory().adapt(eObject, PropertiesEditingProvider.class);\n\t\t\t\t\tif (policy != null) {\n\t\t\t\tsuperTypeSettings.setToReference(eObject);\n\t\t\tif (EntityPackage.eINSTANCE.getEntity_Supertype().equals(msg.getFeature()) && entityPart != null && isAccessible(EntityViewsRepository.Entity_.Properties.superType))\n\t\t\tEntityPackage.eINSTANCE.getEntity_Supertype(),", "old_methods": [], "patch": "@@ -25,22 +25,23 @@\n import org.eclipse.emf.eef.runtime.api.notify.IPropertiesEditionEvent;\n import org.eclipse.emf.eef.runtime.api.notify.NotificationFilter;\n import org.eclipse.emf.eef.runtime.context.PropertiesEditingContext;\n-import org.eclipse.emf.eef.runtime.context.impl.EObjectPropertiesEditionContext;\n+import org.eclipse.emf.eef.runtime.context.impl.EReferencePropertiesEditionContext;\n import org.eclipse.emf.eef.runtime.impl.components.SinglePartPropertiesEditingComponent;\n import org.eclipse.emf.eef.runtime.impl.notify.PropertiesEditionEvent;\n import org.eclipse.emf.eef.runtime.impl.utils.EEFConverterUtil;\n import org.eclipse.emf.eef.runtime.impl.utils.EEFUtils;\n import org.eclipse.emf.eef.runtime.policies.PropertiesEditingPolicy;\n+import org.eclipse.emf.eef.runtime.policies.impl.CreateEditingPolicy;\n import org.eclipse.emf.eef.runtime.providers.PropertiesEditingProvider;\n import org.eclipse.emf.eef.runtime.ui.widgets.ButtonsModeEnum;\n import org.eclipse.emf.eef.runtime.ui.widgets.eobjflatcombo.EObjectFlatComboSettings;\n import org.obeonetwork.dsl.entity.Entity;\n-import org.obeonetwork.dsl.entity.EntityFactory;\n import org.obeonetwork.dsl.entity.EntityPackage;\n import org.obeonetwork.dsl.entity.InheritanceKind;\n import org.obeonetwork.dsl.entity.parts.EntityPropertiesEditionPart;\n import org.obeonetwork.dsl.entity.parts.EntityViewsRepository;\n import org.obeonetwork.dsl.environment.EnvironmentPackage;\n+import org.obeonetwork.dsl.environment.StructuredType;\n \n \n // End of user code\n@@ -92,7 +93,7 @@ public void initPart(Object key, int kind, EObject elt, ResourceSet allResource)\n \t\t\t\n \t\t\tif (isAccessible(EntityViewsRepository.Entity_.Properties.superType)) {\n \t\t\t\t// init part\n-\t\t\t\tsuperTypeSettings = new EObjectFlatComboSettings(entity, EntityPackage.eINSTANCE.getEntity_Supertype());\n+\t\t\t\tsuperTypeSettings = new EObjectFlatComboSettings(entity, EnvironmentPackage.eINSTANCE.getStructuredType_Supertype());\n \t\t\t\tentityPart.initSuperType(superTypeSettings);\n \t\t\t\t// set the button mode\n \t\t\t\tentityPart.setSuperTypeButtonMode(ButtonsModeEnum.BROWSE);\n@@ -147,7 +148,7 @@ public EStructuralFeature associatedFeature(Object editorKey) {\n \t\t\treturn EnvironmentPackage.eINSTANCE.getType_Name();\n \t\t}\n \t\tif (editorKey == EntityViewsRepository.Entity_.Properties.superType) {\n-\t\t\treturn EntityPackage.eINSTANCE.getEntity_Supertype();\n+\t\t\treturn EnvironmentPackage.eINSTANCE.getStructuredType_Supertype();\n \t\t}\n \t\tif (editorKey == EntityViewsRepository.Entity_.Properties.estimatedVolumetry) {\n \t\t\treturn EntityPackage.eINSTANCE.getEntity_EstimatedVolumetry();\n@@ -179,18 +180,16 @@ public void updateSemanticModel(final IPropertiesEditionEvent event) {\n \t\t}\n \t\tif (EntityViewsRepository.Entity_.Properties.superType == event.getAffectedEditor()) {\n \t\t\tif (event.getKind() == PropertiesEditionEvent.SET) {\n-\t\t\t\tsuperTypeSettings.setToReference((Entity)event.getNewValue());\n+\t\t\t\tsuperTypeSettings.setToReference((StructuredType)event.getNewValue());\n \t\t\t} else if (event.getKind() == PropertiesEditionEvent.ADD) {\n-\t\t\t\tEntity eObject = EntityFactory.eINSTANCE.createEntity();\n-\t\t\t\tEObjectPropertiesEditionContext context = new EObjectPropertiesEditionContext(editingContext, this, eObject, editingContext.getAdapterFactory());\n-\t\t\t\tPropertiesEditingProvider provider = (PropertiesEditingProvider)editingContext.getAdapterFactory().adapt(eObject, PropertiesEditingProvider.class);\n+\t\t\t\tEReferencePropertiesEditionContext context = new EReferencePropertiesEditionContext(editingContext, this, superTypeSettings, editingContext.getAdapterFactory());\n+\t\t\t\tPropertiesEditingProvider provider = (PropertiesEditingProvider)editingContext.getAdapterFactory().adapt(semanticObject, PropertiesEditingProvider.class);\n \t\t\t\tif (provider != null) {\n \t\t\t\t\tPropertiesEditingPolicy policy = provider.getPolicy(context);\n-\t\t\t\t\tif (policy != null) {\n+\t\t\t\t\tif (policy instanceof CreateEditingPolicy) {\n \t\t\t\t\t\tpolicy.execute();\n \t\t\t\t\t}\n \t\t\t\t}\n-\t\t\t\tsuperTypeSettings.setToReference(eObject);\n \t\t\t}\n \t\t}\n \t\tif (EntityViewsRepository.Entity_.Properties.estimatedVolumetry == event.getAffectedEditor()) {\n@@ -225,7 +224,7 @@ public void updatePart(Notification msg) {\n \t\t\t\t\tentityPart.setName(\"\");\n \t\t\t\t}\n \t\t\t}\n-\t\t\tif (EntityPackage.eINSTANCE.getEntity_Supertype().equals(msg.getFeature()) && entityPart != null && isAccessible(EntityViewsRepository.Entity_.Properties.superType))\n+\t\t\tif (EnvironmentPackage.eINSTANCE.getStructuredType_Supertype().equals(msg.getFeature()) && entityPart != null && isAccessible(EntityViewsRepository.Entity_.Properties.superType))\n \t\t\t\tentityPart.setSuperType((EObject)msg.getNewValue());\n \t\t\tif (EntityPackage.eINSTANCE.getEntity_EstimatedVolumetry().equals(msg.getFeature()) && msg.getNotifier().equals(semanticObject) && entityPart != null && isAccessible(EntityViewsRepository.Entity_.Properties.estimatedVolumetry)) {\n \t\t\t\tif (msg.getNewValue() != null) {\n@@ -267,7 +266,7 @@ public void updatePart(Notification msg) {\n \tprotected NotificationFilter[] getNotificationFilters() {\n \t\tNotificationFilter filter = new EStructuralFeatureNotificationFilter(\n \t\t\tEnvironmentPackage.eINSTANCE.getType_Name(),\n-\t\t\tEntityPackage.eINSTANCE.getEntity_Supertype(),\n+\t\t\tEnvironmentPackage.eINSTANCE.getStructuredType_Supertype(),\n \t\t\tEntityPackage.eINSTANCE.getEntity_EstimatedVolumetry(),\n \t\t\tEntityPackage.eINSTANCE.getEntity_EstimatedAccess(),\n \t\t\tEntityPackage.eINSTANCE.getEntity_Historized(),", "raw_url": "https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.edit%2Fsrc-gen%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fcomponents%2FEntityEntityPropertiesEditionComponent.java", "sha": "c4d77ad0c0cacdfa8a9f862156e32c6acf1e597a", "status": "modified" }, { "additions": 6, "blob_url": "https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.edit%2Fsrc-gen%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fcomponents%2FFinderFinderPropertiesEditionComponent.java", "changes": 12, "contents_url": "https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.edit%2Fsrc-gen%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fcomponents%2FFinderFinderPropertiesEditionComponent.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6", "deletions": 6, "filename": "models/entity/plugins/org.obeonetwork.dsl.entity.edit/src-gen/org/obeonetwork/dsl/entity/components/FinderFinderPropertiesEditionComponent.java", "new_code": "\t\t\t\tfinderPart.initMultiplicity(EEFUtils.choiceOfValues(finder, EntityPackage.eINSTANCE.getFinder_Multiplicity()), finder.getMultiplicity());\n\t\t\treturn EntityPackage.eINSTANCE.getFinder_Multiplicity();\n\t\t\tif (EntityPackage.eINSTANCE.getFinder_Multiplicity().equals(msg.getFeature()) && msg.getNotifier().equals(semanticObject) && isAccessible(EntityViewsRepository.Finder.Properties.multiplicity))\n\t\t\tEntityPackage.eINSTANCE.getFinder_Multiplicity(),\n\t\t\t\t\t\tnewValue = EEFConverterUtil.createFromString(EntityPackage.eINSTANCE.getFinder_Multiplicity().getEAttributeType(), (String)newValue);\n\t\t\t\t\tret = Diagnostician.INSTANCE.validate(EntityPackage.eINSTANCE.getFinder_Multiplicity().getEAttributeType(), newValue);", "new_methods": [], "old_code": "\t\t\t\tfinderPart.initMultiplicity(EEFUtils.choiceOfValues(finder, EntityPackage.eINSTANCE.getProperty_Multiplicity()), finder.getMultiplicity());\n\t\t\treturn EntityPackage.eINSTANCE.getProperty_Multiplicity();\n\t\t\tif (EntityPackage.eINSTANCE.getProperty_Multiplicity().equals(msg.getFeature()) && msg.getNotifier().equals(semanticObject) && isAccessible(EntityViewsRepository.Finder.Properties.multiplicity))\n\t\t\tEntityPackage.eINSTANCE.getProperty_Multiplicity(),\n\t\t\t\t\t\tnewValue = EEFConverterUtil.createFromString(EntityPackage.eINSTANCE.getProperty_Multiplicity().getEAttributeType(), (String)newValue);\n\t\t\t\t\tret = Diagnostician.INSTANCE.validate(EntityPackage.eINSTANCE.getProperty_Multiplicity().getEAttributeType(), newValue);", "old_methods": [], "patch": "@@ -79,7 +79,7 @@ public void initPart(Object key, int kind, EObject elt, ResourceSet allResource)\n \t\t\t\tfinderPart.setCustomizedName(EEFConverterUtil.convertToString(EcorePackage.Literals.ESTRING, finder.getCustomizedName()));\n \t\t\t\n \t\t\tif (isAccessible(EntityViewsRepository.Finder.Properties.multiplicity)) {\n-\t\t\t\tfinderPart.initMultiplicity(EEFUtils.choiceOfValues(finder, EntityPackage.eINSTANCE.getProperty_Multiplicity()), finder.getMultiplicity());\n+\t\t\t\tfinderPart.initMultiplicity(EEFUtils.choiceOfValues(finder, EntityPackage.eINSTANCE.getFinder_Multiplicity()), finder.getMultiplicity());\n \t\t\t}\n \t\t\tif (isAccessible(EntityViewsRepository.Finder.Properties.description))\n \t\t\t\tfinderPart.setDescription(EcoreUtil.convertToString(EcorePackage.Literals.ESTRING, finder.getDescription()));\n@@ -109,7 +109,7 @@ public EStructuralFeature associatedFeature(Object editorKey) {\n \t\t\treturn EntityPackage.eINSTANCE.getFinder_CustomizedName();\n \t\t}\n \t\tif (editorKey == EntityViewsRepository.Finder.Properties.multiplicity) {\n-\t\t\treturn EntityPackage.eINSTANCE.getProperty_Multiplicity();\n+\t\t\treturn EntityPackage.eINSTANCE.getFinder_Multiplicity();\n \t\t}\n \t\tif (editorKey == EntityViewsRepository.Finder.Properties.description) {\n \t\t\treturn EnvironmentPackage.eINSTANCE.getObeoDSMObject_Description();\n@@ -150,7 +150,7 @@ public void updatePart(Notification msg) {\n \t\t\t\t\tfinderPart.setCustomizedName(\"\");\n \t\t\t\t}\n \t\t\t}\n-\t\t\tif (EntityPackage.eINSTANCE.getProperty_Multiplicity().equals(msg.getFeature()) && msg.getNotifier().equals(semanticObject) && isAccessible(EntityViewsRepository.Finder.Properties.multiplicity))\n+\t\t\tif (EntityPackage.eINSTANCE.getFinder_Multiplicity().equals(msg.getFeature()) && msg.getNotifier().equals(semanticObject) && isAccessible(EntityViewsRepository.Finder.Properties.multiplicity))\n \t\t\t\tfinderPart.setMultiplicity((MultiplicityKind)msg.getNewValue());\n \t\t\t\n \t\t\tif (EnvironmentPackage.eINSTANCE.getObeoDSMObject_Description().equals(msg.getFeature()) && msg.getNotifier().equals(semanticObject) && finderPart != null && isAccessible(EntityViewsRepository.Finder.Properties.description)){\n@@ -173,7 +173,7 @@ public void updatePart(Notification msg) {\n \tprotected NotificationFilter[] getNotificationFilters() {\n \t\tNotificationFilter filter = new EStructuralFeatureNotificationFilter(\n \t\t\tEntityPackage.eINSTANCE.getFinder_CustomizedName(),\n-\t\t\tEntityPackage.eINSTANCE.getProperty_Multiplicity(),\n+\t\t\tEntityPackage.eINSTANCE.getFinder_Multiplicity(),\n \t\t\tEnvironmentPackage.eINSTANCE.getObeoDSMObject_Description()\t\t);\n \t\treturn new NotificationFilter[] {filter,};\n \t}\n@@ -209,9 +209,9 @@ public Diagnostic validateValue(IPropertiesEditionEvent event) {\n \t\t\t\tif (EntityViewsRepository.Finder.Properties.multiplicity == event.getAffectedEditor()) {\n \t\t\t\t\tObject newValue = event.getNewValue();\n \t\t\t\t\tif (newValue instanceof String) {\n-\t\t\t\t\t\tnewValue = EEFConverterUtil.createFromString(EntityPackage.eINSTANCE.getProperty_Multiplicity().getEAttributeType(), (String)newValue);\n+\t\t\t\t\t\tnewValue = EEFConverterUtil.createFromString(EntityPackage.eINSTANCE.getFinder_Multiplicity().getEAttributeType(), (String)newValue);\n \t\t\t\t\t}\n-\t\t\t\t\tret = Diagnostician.INSTANCE.validate(EntityPackage.eINSTANCE.getProperty_Multiplicity().getEAttributeType(), newValue);\n+\t\t\t\t\tret = Diagnostician.INSTANCE.validate(EntityPackage.eINSTANCE.getFinder_Multiplicity().getEAttributeType(), newValue);\n \t\t\t\t}\n \t\t\t\tif (EntityViewsRepository.Finder.Properties.description == event.getAffectedEditor()) {\n \t\t\t\t\tObject newValue = event.getNewValue();", "raw_url": "https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.edit%2Fsrc-gen%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fcomponents%2FFinderFinderPropertiesEditionComponent.java", "sha": "937112f77afa1ceb36be3537ec66403bd925be97", "status": "modified" }, { "additions": 3, "blob_url": "https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.edit%2Fsrc-gen%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fcomponents%2FInternalCriterionInternalCriterionPropertiesEditionComponent.java", "changes": 6, "contents_url": "https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.edit%2Fsrc-gen%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fcomponents%2FInternalCriterionInternalCriterionPropertiesEditionComponent.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6", "deletions": 3, "filename": "models/entity/plugins/org.obeonetwork.dsl.entity.edit/src-gen/org/obeonetwork/dsl/entity/components/InternalCriterionInternalCriterionPropertiesEditionComponent.java", "new_code": "import org.obeonetwork.dsl.environment.Attribute;\nimport org.obeonetwork.dsl.environment.EnvironmentFactory;\n\t\t\t\tAttribute eObject = EnvironmentFactory.eINSTANCE.createAttribute();", "new_methods": [], "old_code": "import org.obeonetwork.dsl.entity.Attribute;\nimport org.obeonetwork.dsl.entity.EntityFactory;\n\t\t\t\tAttribute eObject = EntityFactory.eINSTANCE.createAttribute();", "old_methods": [], "patch": "@@ -33,12 +33,12 @@\n import org.eclipse.emf.eef.runtime.providers.PropertiesEditingProvider;\n import org.eclipse.emf.eef.runtime.ui.widgets.ButtonsModeEnum;\n import org.eclipse.emf.eef.runtime.ui.widgets.eobjflatcombo.EObjectFlatComboSettings;\n-import org.obeonetwork.dsl.entity.Attribute;\n-import org.obeonetwork.dsl.entity.EntityFactory;\n import org.obeonetwork.dsl.entity.EntityPackage;\n import org.obeonetwork.dsl.entity.InternalCriterion;\n import org.obeonetwork.dsl.entity.parts.EntityViewsRepository;\n import org.obeonetwork.dsl.entity.parts.InternalCriterionPropertiesEditionPart;\n+import org.obeonetwork.dsl.environment.Attribute;\n+import org.obeonetwork.dsl.environment.EnvironmentFactory;\n import org.obeonetwork.dsl.environment.EnvironmentPackage;\n \n \n@@ -135,7 +135,7 @@ public void updateSemanticModel(final IPropertiesEditionEvent event) {\n \t\t\tif (event.getKind() == PropertiesEditionEvent.SET) {\n \t\t\t\ttargetSettings.setToReference((Attribute)event.getNewValue());\n \t\t\t} else if (event.getKind() == PropertiesEditionEvent.ADD) {\n-\t\t\t\tAttribute eObject = EntityFactory.eINSTANCE.createAttribute();\n+\t\t\t\tAttribute eObject = EnvironmentFactory.eINSTANCE.createAttribute();\n \t\t\t\tEObjectPropertiesEditionContext context = new EObjectPropertiesEditionContext(editingContext, this, eObject, editingContext.getAdapterFactory());\n \t\t\t\tPropertiesEditingProvider provider = (PropertiesEditingProvider)editingContext.getAdapterFactory().adapt(eObject, PropertiesEditingProvider.class);\n \t\t\t\tif (provider != null) {", "raw_url": "https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.edit%2Fsrc-gen%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fcomponents%2FInternalCriterionInternalCriterionPropertiesEditionComponent.java", "sha": "5611b02b67ad4982718c6da4cc12384651b02d65", "status": "modified" }, { "additions": 7, "blob_url": "https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.edit%2Fsrc-gen%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fcomponents%2FRootRootPropertiesEditionComponent.java", "changes": 13, "contents_url": "https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.edit%2Fsrc-gen%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fcomponents%2FRootRootPropertiesEditionComponent.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6", "deletions": 6, "filename": "models/entity/plugins/org.obeonetwork.dsl.entity.edit/src-gen/org/obeonetwork/dsl/entity/components/RootRootPropertiesEditionComponent.java", "new_code": "import org.obeonetwork.dsl.entity.EntityPackage;\n * @author <a href=\"mailto:jerome.benois@obeo.fr>J�r�me Benois</a>\n\t\t\treturn EntityPackage.eINSTANCE.getRoot_Name();\n\t\t\tif (EntityPackage.eINSTANCE.getRoot_Name().equals(msg.getFeature()) && msg.getNotifier().equals(semanticObject) && rootPart != null && isAccessible(EntityViewsRepository.Root.Properties.name)) {\n\t\t\tEntityPackage.eINSTANCE.getRoot_Name(),\n\t\t\t\t\t\tnewValue = EEFConverterUtil.createFromString(EntityPackage.eINSTANCE.getRoot_Name().getEAttributeType(), (String)newValue);\n\t\t\t\t\tret = Diagnostician.INSTANCE.validate(EntityPackage.eINSTANCE.getRoot_Name().getEAttributeType(), newValue);", "new_methods": [], "old_code": " * @author <a href=\"mailto:jerome.benois@obeo.fr>J�r�me Benois</a>\n\t\t\treturn EnvironmentPackage.eINSTANCE.getNamespace_Name();\n\t\t\tif (EnvironmentPackage.eINSTANCE.getNamespace_Name().equals(msg.getFeature()) && msg.getNotifier().equals(semanticObject) && rootPart != null && isAccessible(EntityViewsRepository.Root.Properties.name)) {\n\t\t\tEnvironmentPackage.eINSTANCE.getNamespace_Name(),\n\t\t\t\t\t\tnewValue = EEFConverterUtil.createFromString(EnvironmentPackage.eINSTANCE.getNamespace_Name().getEAttributeType(), (String)newValue);\n\t\t\t\t\tret = Diagnostician.INSTANCE.validate(EnvironmentPackage.eINSTANCE.getNamespace_Name().getEAttributeType(), newValue);", "old_methods": [], "patch": "@@ -27,6 +27,7 @@\n import org.eclipse.emf.eef.runtime.context.PropertiesEditingContext;\n import org.eclipse.emf.eef.runtime.impl.components.SinglePartPropertiesEditingComponent;\n import org.eclipse.emf.eef.runtime.impl.utils.EEFConverterUtil;\n+import org.obeonetwork.dsl.entity.EntityPackage;\n import org.obeonetwork.dsl.entity.Root;\n import org.obeonetwork.dsl.entity.parts.EntityViewsRepository;\n import org.obeonetwork.dsl.entity.parts.RootPropertiesEditionPart;\n@@ -36,7 +37,7 @@\n // End of user code\n \n /**\n- * @author <a href=\"mailto:jerome.benois@obeo.fr>J�r�me Benois</a>\n+ * @author <a href=\"mailto:jerome.benois@obeo.fr>J�r�me Benois</a>\n * \n */\n public class RootRootPropertiesEditionComponent extends SinglePartPropertiesEditingComponent {\n@@ -98,7 +99,7 @@ public void initPart(Object key, int kind, EObject elt, ResourceSet allResource)\n \t */\n \tpublic EStructuralFeature associatedFeature(Object editorKey) {\n \t\tif (editorKey == EntityViewsRepository.Root.Properties.name) {\n-\t\t\treturn EnvironmentPackage.eINSTANCE.getNamespace_Name();\n+\t\t\treturn EntityPackage.eINSTANCE.getRoot_Name();\n \t\t}\n \t\tif (editorKey == EntityViewsRepository.Root.Properties.description) {\n \t\t\treturn EnvironmentPackage.eINSTANCE.getObeoDSMObject_Description();\n@@ -129,7 +130,7 @@ public void updatePart(Notification msg) {\n \t\tsuper.updatePart(msg);\n \t\tif (editingPart.isVisible()) {\n \t\t\tRootPropertiesEditionPart rootPart = (RootPropertiesEditionPart)editingPart;\n-\t\t\tif (EnvironmentPackage.eINSTANCE.getNamespace_Name().equals(msg.getFeature()) && msg.getNotifier().equals(semanticObject) && rootPart != null && isAccessible(EntityViewsRepository.Root.Properties.name)) {\n+\t\t\tif (EntityPackage.eINSTANCE.getRoot_Name().equals(msg.getFeature()) && msg.getNotifier().equals(semanticObject) && rootPart != null && isAccessible(EntityViewsRepository.Root.Properties.name)) {\n \t\t\t\tif (msg.getNewValue() != null) {\n \t\t\t\t\trootPart.setName(EcoreUtil.convertToString(EcorePackage.Literals.ESTRING, msg.getNewValue()));\n \t\t\t\t} else {\n@@ -155,7 +156,7 @@ public void updatePart(Notification msg) {\n \t@Override\n \tprotected NotificationFilter[] getNotificationFilters() {\n \t\tNotificationFilter filter = new EStructuralFeatureNotificationFilter(\n-\t\t\tEnvironmentPackage.eINSTANCE.getNamespace_Name(),\n+\t\t\tEntityPackage.eINSTANCE.getRoot_Name(),\n \t\t\tEnvironmentPackage.eINSTANCE.getObeoDSMObject_Description()\t\t);\n \t\treturn new NotificationFilter[] {filter,};\n \t}\n@@ -174,9 +175,9 @@ public Diagnostic validateValue(IPropertiesEditionEvent event) {\n \t\t\t\tif (EntityViewsRepository.Root.Properties.name == event.getAffectedEditor()) {\n \t\t\t\t\tObject newValue = event.getNewValue();\n \t\t\t\t\tif (newValue instanceof String) {\n-\t\t\t\t\t\tnewValue = EEFConverterUtil.createFromString(EnvironmentPackage.eINSTANCE.getNamespace_Name().getEAttributeType(), (String)newValue);\n+\t\t\t\t\t\tnewValue = EEFConverterUtil.createFromString(EntityPackage.eINSTANCE.getRoot_Name().getEAttributeType(), (String)newValue);\n \t\t\t\t\t}\n-\t\t\t\t\tret = Diagnostician.INSTANCE.validate(EnvironmentPackage.eINSTANCE.getNamespace_Name().getEAttributeType(), newValue);\n+\t\t\t\t\tret = Diagnostician.INSTANCE.validate(EntityPackage.eINSTANCE.getRoot_Name().getEAttributeType(), newValue);\n \t\t\t\t}\n \t\t\t\tif (EntityViewsRepository.Root.Properties.description == event.getAffectedEditor()) {\n \t\t\t\t\tObject newValue = event.getNewValue();", "raw_url": "https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.edit%2Fsrc-gen%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fcomponents%2FRootRootPropertiesEditionComponent.java", "sha": "a7291f6c66f42aa01c29370a88881fabeaeb2d9f", "status": "modified" }, { "additions": 0, "blob_url": "https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.edit%2Fsrc-gen%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fparts%2FEntityViewsRepository.java", "changes": 81, "contents_url": "https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.edit%2Fsrc-gen%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fparts%2FEntityViewsRepository.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6", "deletions": 81, "filename": "models/entity/plugins/org.obeonetwork.dsl.entity.edit/src-gen/org/obeonetwork/dsl/entity/parts/EntityViewsRepository.java", "new_code": "", "new_methods": [], "old_code": "\t/**\n\t * Block view descriptor\n\t * \n\t */\n\tpublic static class Block {\n\t\tpublic static class Properties {\n\t\n\t\t\t\n\t\t\tpublic static String name = \"entity::Block::properties::name\";\n\t\t\t\n\t\t\t\n\t\t\tpublic static String description = \"entity::Block::properties::description\";\n\t\t\t\n\t\n\t\t}\n\t\n\t}\n\n\t/**\n\t * Attribute view descriptor\n\t * \n\t */\n\tpublic static class Attribute {\n\t\tpublic static class Properties {\n\t\n\t\t\t\n\t\t\tpublic static String name = \"entity::Attribute::properties::name\";\n\t\t\t\n\t\t\t\n\t\t\tpublic static String type = \"entity::Attribute::properties::type\";\n\t\t\t\n\t\t\t\n\t\t\tpublic static String multiplicity = \"entity::Attribute::properties::multiplicity\";\n\t\t\t\n\t\t\t\n\t\t\tpublic static String isPrimaryKey = \"entity::Attribute::properties::isPrimaryKey\";\n\t\t\t\n\t\t\t\n\t\t\tpublic static String description = \"entity::Attribute::properties::description\";\n\t\t\t\n\t\n\t\t}\n\t\n\t}\n\n\t/**\n\t * Reference view descriptor\n\t * \n\t */\n\tpublic static class Reference {\n\t\tpublic static class Properties {\n\t\n\t\t\t\n\t\t\tpublic static String name = \"entity::Reference::properties::name\";\n\t\t\t\n\t\t\t\n\t\t\tpublic static String type = \"entity::Reference::properties::type\";\n\t\t\t\n\t\t\t\n\t\t\tpublic static String multiplicity = \"entity::Reference::properties::multiplicity\";\n\t\t\t\n\t\t\t\n\t\t\tpublic static String isPrimaryKey = \"entity::Reference::properties::isPrimaryKey\";\n\t\t\t\n\t\t\t\n\t\t\tpublic static String isComposite = \"entity::Reference::properties::isComposite\";\n\t\t\t\n\t\t\t\n\t\t\tpublic static String navigable = \"entity::Reference::properties::navigable\";\n\t\t\t\n\t\t\t\n\t\t\tpublic static String oppositeOf = \"entity::Reference::properties::oppositeOf\";\n\t\t\t\n\t\t\t\n\t\t\tpublic static String description = \"entity::Reference::properties::description\";\n\t\t\t\n\t\n\t\t}\n\t\n\t}\n", "old_methods": [], "patch": "@@ -39,24 +39,6 @@ public static class Properties {\n \t\n \t}\n \n-\t/**\n-\t * Block view descriptor\n-\t * \n-\t */\n-\tpublic static class Block {\n-\t\tpublic static class Properties {\n-\t\n-\t\t\t\n-\t\t\tpublic static String name = \"entity::Block::properties::name\";\n-\t\t\t\n-\t\t\t\n-\t\t\tpublic static String description = \"entity::Block::properties::description\";\n-\t\t\t\n-\t\n-\t\t}\n-\t\n-\t}\n-\n \t/**\n \t * Entity view descriptor\n \t * \n@@ -90,69 +72,6 @@ public static class Properties {\n \t\n \t}\n \n-\t/**\n-\t * Attribute view descriptor\n-\t * \n-\t */\n-\tpublic static class Attribute {\n-\t\tpublic static class Properties {\n-\t\n-\t\t\t\n-\t\t\tpublic static String name = \"entity::Attribute::properties::name\";\n-\t\t\t\n-\t\t\t\n-\t\t\tpublic static String type = \"entity::Attribute::properties::type\";\n-\t\t\t\n-\t\t\t\n-\t\t\tpublic static String multiplicity = \"entity::Attribute::properties::multiplicity\";\n-\t\t\t\n-\t\t\t\n-\t\t\tpublic static String isPrimaryKey = \"entity::Attribute::properties::isPrimaryKey\";\n-\t\t\t\n-\t\t\t\n-\t\t\tpublic static String description = \"entity::Attribute::properties::description\";\n-\t\t\t\n-\t\n-\t\t}\n-\t\n-\t}\n-\n-\t/**\n-\t * Reference view descriptor\n-\t * \n-\t */\n-\tpublic static class Reference {\n-\t\tpublic static class Properties {\n-\t\n-\t\t\t\n-\t\t\tpublic static String name = \"entity::Reference::properties::name\";\n-\t\t\t\n-\t\t\t\n-\t\t\tpublic static String type = \"entity::Reference::properties::type\";\n-\t\t\t\n-\t\t\t\n-\t\t\tpublic static String multiplicity = \"entity::Reference::properties::multiplicity\";\n-\t\t\t\n-\t\t\t\n-\t\t\tpublic static String isPrimaryKey = \"entity::Reference::properties::isPrimaryKey\";\n-\t\t\t\n-\t\t\t\n-\t\t\tpublic static String isComposite = \"entity::Reference::properties::isComposite\";\n-\t\t\t\n-\t\t\t\n-\t\t\tpublic static String navigable = \"entity::Reference::properties::navigable\";\n-\t\t\t\n-\t\t\t\n-\t\t\tpublic static String oppositeOf = \"entity::Reference::properties::oppositeOf\";\n-\t\t\t\n-\t\t\t\n-\t\t\tpublic static String description = \"entity::Reference::properties::description\";\n-\t\t\t\n-\t\n-\t\t}\n-\t\n-\t}\n-\n \t/**\n \t * Finder view descriptor\n \t * ", "raw_url": "https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.edit%2Fsrc-gen%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fparts%2FEntityViewsRepository.java", "sha": "c8221c3ac9d2796b1e3ea938864e4713003e5ed2", "status": "modified" }, { "additions": 4, "blob_url": "https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.edit%2Fsrc-gen%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fproviders%2FEntityEEFAdapterFactory.java", "changes": 38, "contents_url": "https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.edit%2Fsrc-gen%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fproviders%2FEntityEEFAdapterFactory.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6", "deletions": 34, "filename": "models/entity/plugins/org.obeonetwork.dsl.entity.edit/src-gen/org/obeonetwork/dsl/entity/providers/EntityEEFAdapterFactory.java", "new_code": "import org.obeonetwork.dsl.environment.providers.TypesDefinitionPropertiesEditionProvider;\n\t * @see org.obeonetwork.dsl.entity.util.EntityAdapterFactory#createTypesDefinitionAdapter()\n\tpublic Adapter createTypesDefinitionAdapter() {\n\t\treturn new TypesDefinitionPropertiesEditionProvider(providers);", "new_methods": [], "old_code": "import org.obeonetwork.dsl.environment.providers.NamespacePropertiesEditionProvider;\n\t * @see org.obeonetwork.dsl.entity.util.EntityAdapterFactory#createNamespaceAdapter()\n\tpublic Adapter createNamespaceAdapter() {\n\t\treturn new NamespacePropertiesEditionProvider(providers);\n\t/**\n\t * {@inheritDoc}\n\t * @see org.obeonetwork.dsl.entity.util.EntityAdapterFactory#createBlockAdapter()\n\t * \n\t */\n\tpublic Adapter createBlockAdapter() {\n\t\tList<PropertiesEditingProvider> providers = new ArrayList<PropertiesEditingProvider>(1);\n\t\tproviders.add((PropertiesEditingProvider)createObeoDSMObjectAdapter());\n\t\treturn new BlockPropertiesEditionProvider(providers);\n\t}\n\t/**\n\t * {@inheritDoc}\n\t * @see org.obeonetwork.dsl.entity.util.EntityAdapterFactory#createAttributeAdapter()\n\t * \n\t */\n\tpublic Adapter createAttributeAdapter() {\n\t\tList<PropertiesEditingProvider> providers = new ArrayList<PropertiesEditingProvider>(1);\n\t\tproviders.add((PropertiesEditingProvider)createObeoDSMObjectAdapter());\n\t\treturn new AttributePropertiesEditionProvider(providers);\n\t}\n\t/**\n\t * {@inheritDoc}\n\t * @see org.obeonetwork.dsl.entity.util.EntityAdapterFactory#createReferenceAdapter()\n\t * \n\t */\n\tpublic Adapter createReferenceAdapter() {\n\t\tList<PropertiesEditingProvider> providers = new ArrayList<PropertiesEditingProvider>(1);\n\t\tproviders.add((PropertiesEditingProvider)createObeoDSMObjectAdapter());\n\t\treturn new ReferencePropertiesEditionProvider(providers);\n\t}", "old_methods": [ { "arguments": [], "filename": "models/entity/plugins/org.obeonetwork.dsl.entity.edit/src-gen/org/obeonetwork/dsl/entity/providers/EntityEEFAdapterFactory.java", "implementation": "return new NamespacePropertiesEditionProvider(providers);\n\t/**\n\t * {@inheritDoc", "signature": "Adapter createNamespaceAdapter()" }, { "arguments": [], "filename": "models/entity/plugins/org.obeonetwork.dsl.entity.edit/src-gen/org/obeonetwork/dsl/entity/providers/EntityEEFAdapterFactory.java", "implementation": "List<PropertiesEditingProvider> providers = new ArrayList<PropertiesEditingProvider>(1);\n\t\tproviders.add((PropertiesEditingProvider)createObeoDSMObjectAdapter());\n\t\treturn new BlockPropertiesEditionProvider(providers);", "signature": "Adapter createBlockAdapter()" }, { "arguments": [], "filename": "models/entity/plugins/org.obeonetwork.dsl.entity.edit/src-gen/org/obeonetwork/dsl/entity/providers/EntityEEFAdapterFactory.java", "implementation": "List<PropertiesEditingProvider> providers = new ArrayList<PropertiesEditingProvider>(1);\n\t\tproviders.add((PropertiesEditingProvider)createObeoDSMObjectAdapter());\n\t\treturn new AttributePropertiesEditionProvider(providers);", "signature": "Adapter createAttributeAdapter()" }, { "arguments": [], "filename": "models/entity/plugins/org.obeonetwork.dsl.entity.edit/src-gen/org/obeonetwork/dsl/entity/providers/EntityEEFAdapterFactory.java", "implementation": "List<PropertiesEditingProvider> providers = new ArrayList<PropertiesEditingProvider>(1);\n\t\tproviders.add((PropertiesEditingProvider)createObeoDSMObjectAdapter());\n\t\treturn new ReferencePropertiesEditionProvider(providers);", "signature": "Adapter createReferenceAdapter()" } ], "patch": "@@ -20,7 +20,7 @@\n import org.obeonetwork.dsl.entity.util.EntityAdapterFactory;\n \n import org.obeonetwork.dsl.environment.providers.MetadataCptPropertiesEditionProvider;\n-import org.obeonetwork.dsl.environment.providers.NamespacePropertiesEditionProvider;\n+import org.obeonetwork.dsl.environment.providers.TypesDefinitionPropertiesEditionProvider;\n \n /**\n * @author <a href=\"mailto:jerome.benois@obeo.fr>J�r�me Benois</a>\n@@ -38,13 +38,13 @@ public Adapter createObeoDSMObjectAdapter() {\n \t}\n \t/**\n \t * {@inheritDoc}\n-\t * @see org.obeonetwork.dsl.entity.util.EntityAdapterFactory#createNamespaceAdapter()\n+\t * @see org.obeonetwork.dsl.entity.util.EntityAdapterFactory#createTypesDefinitionAdapter()\n \t * \n \t */\n-\tpublic Adapter createNamespaceAdapter() {\n+\tpublic Adapter createTypesDefinitionAdapter() {\n \t\tList<PropertiesEditingProvider> providers = new ArrayList<PropertiesEditingProvider>(1);\n \t\tproviders.add((PropertiesEditingProvider)createObeoDSMObjectAdapter());\n-\t\treturn new NamespacePropertiesEditionProvider(providers);\n+\t\treturn new TypesDefinitionPropertiesEditionProvider(providers);\n \t}\n \t/**\n \t * {@inheritDoc}\n@@ -56,16 +56,6 @@ public Adapter createRootAdapter() {\n \t\tproviders.add((PropertiesEditingProvider)createObeoDSMObjectAdapter());\n \t\treturn new RootPropertiesEditionProvider(providers);\n \t}\n-\t/**\n-\t * {@inheritDoc}\n-\t * @see org.obeonetwork.dsl.entity.util.EntityAdapterFactory#createBlockAdapter()\n-\t * \n-\t */\n-\tpublic Adapter createBlockAdapter() {\n-\t\tList<PropertiesEditingProvider> providers = new ArrayList<PropertiesEditingProvider>(1);\n-\t\tproviders.add((PropertiesEditingProvider)createObeoDSMObjectAdapter());\n-\t\treturn new BlockPropertiesEditionProvider(providers);\n-\t}\n \t/**\n \t * {@inheritDoc}\n \t * @see org.obeonetwork.dsl.entity.util.EntityAdapterFactory#createEntityAdapter()\n@@ -76,26 +66,6 @@ public Adapter createEntityAdapter() {\n \t\tproviders.add((PropertiesEditingProvider)createObeoDSMObjectAdapter());\n \t\treturn new EntityPropertiesEditionProvider(providers);\n \t}\n-\t/**\n-\t * {@inheritDoc}\n-\t * @see org.obeonetwork.dsl.entity.util.EntityAdapterFactory#createAttributeAdapter()\n-\t * \n-\t */\n-\tpublic Adapter createAttributeAdapter() {\n-\t\tList<PropertiesEditingProvider> providers = new ArrayList<PropertiesEditingProvider>(1);\n-\t\tproviders.add((PropertiesEditingProvider)createObeoDSMObjectAdapter());\n-\t\treturn new AttributePropertiesEditionProvider(providers);\n-\t}\n-\t/**\n-\t * {@inheritDoc}\n-\t * @see org.obeonetwork.dsl.entity.util.EntityAdapterFactory#createReferenceAdapter()\n-\t * \n-\t */\n-\tpublic Adapter createReferenceAdapter() {\n-\t\tList<PropertiesEditingProvider> providers = new ArrayList<PropertiesEditingProvider>(1);\n-\t\tproviders.add((PropertiesEditingProvider)createObeoDSMObjectAdapter());\n-\t\treturn new ReferencePropertiesEditionProvider(providers);\n-\t}\n \t/**\n \t * {@inheritDoc}\n \t * @see org.obeonetwork.dsl.entity.util.EntityAdapterFactory#createFinderAdapter()", "raw_url": "https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.edit%2Fsrc-gen%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fproviders%2FEntityEEFAdapterFactory.java", "sha": "d416f42f72465ced8bd8f084166ece0fa9246bab", "status": "modified" }, { "additions": 0, "blob_url": "https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.edit%2Fsrc-gen%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fproviders%2FEntityMessages.java", "changes": 72, "contents_url": "https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.edit%2Fsrc-gen%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fproviders%2FEntityMessages.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6", "deletions": 72, "filename": "models/entity/plugins/org.obeonetwork.dsl.entity.edit/src-gen/org/obeonetwork/dsl/entity/providers/EntityMessages.java", "new_code": "", "new_methods": [], "old_code": "\tpublic static String BlockPropertiesEditionPart_PropertiesGroupLabel;\n\n\t\n\tpublic static String AttributePropertiesEditionPart_PropertiesGroupLabel;\n\n\t\n\tpublic static String ReferencePropertiesEditionPart_PropertiesGroupLabel;\n\n\t\n\tpublic static String Block_ReadOnly;\n\n\t\n\tpublic static String Block_Part_Title;\n\n\t\n\tpublic static String Attribute_ReadOnly;\n\n\t\n\tpublic static String Attribute_Part_Title;\n\n\t\n\tpublic static String Reference_ReadOnly;\n\n\t\n\tpublic static String Reference_Part_Title;\n\n\t\n\tpublic static String BlockPropertiesEditionPart_NameLabel;\n\n\t\n\tpublic static String BlockPropertiesEditionPart_DescriptionLabel;\n\n\t\n\tpublic static String AttributePropertiesEditionPart_NameLabel;\n\n\t\n\tpublic static String AttributePropertiesEditionPart_TypeLabel;\n\n\t\n\tpublic static String AttributePropertiesEditionPart_MultiplicityLabel;\n\n\t\n\tpublic static String AttributePropertiesEditionPart_IsPrimaryKeyLabel;\n\n\t\n\tpublic static String AttributePropertiesEditionPart_DescriptionLabel;\n\n\t\n\tpublic static String ReferencePropertiesEditionPart_NameLabel;\n\n\t\n\tpublic static String ReferencePropertiesEditionPart_TypeLabel;\n\n\t\n\tpublic static String ReferencePropertiesEditionPart_MultiplicityLabel;\n\n\t\n\tpublic static String ReferencePropertiesEditionPart_IsPrimaryKeyLabel;\n\n\t\n\tpublic static String ReferencePropertiesEditionPart_IsCompositeLabel;\n\n\t\n\tpublic static String ReferencePropertiesEditionPart_NavigableLabel;\n\n\t\n\tpublic static String ReferencePropertiesEditionPart_OppositeOfLabel;\n\n\t\n\tpublic static String ReferencePropertiesEditionPart_DescriptionLabel;\n\n\t", "old_methods": [], "patch": "@@ -24,18 +24,9 @@ public class EntityMessages extends NLS {\n \tpublic static String RootPropertiesEditionPart_PropertiesGroupLabel;\n \n \t\n-\tpublic static String BlockPropertiesEditionPart_PropertiesGroupLabel;\n-\n-\t\n \tpublic static String EntityPropertiesEditionPart_PropertiesGroupLabel;\n \n \t\n-\tpublic static String AttributePropertiesEditionPart_PropertiesGroupLabel;\n-\n-\t\n-\tpublic static String ReferencePropertiesEditionPart_PropertiesGroupLabel;\n-\n-\t\n \tpublic static String FinderPropertiesEditionPart_PropertiesGroupLabel;\n \n \t\n@@ -52,30 +43,12 @@ public class EntityMessages extends NLS {\n \tpublic static String Root_Part_Title;\n \n \t\n-\tpublic static String Block_ReadOnly;\n-\n-\t\n-\tpublic static String Block_Part_Title;\n-\n-\t\n \tpublic static String Entity_ReadOnly;\n \n \t\n \tpublic static String Entity_Part_Title;\n \n \t\n-\tpublic static String Attribute_ReadOnly;\n-\n-\t\n-\tpublic static String Attribute_Part_Title;\n-\n-\t\n-\tpublic static String Reference_ReadOnly;\n-\n-\t\n-\tpublic static String Reference_Part_Title;\n-\n-\t\n \tpublic static String Finder_ReadOnly;\n \n \t\n@@ -101,12 +74,6 @@ public class EntityMessages extends NLS {\n \tpublic static String RootPropertiesEditionPart_DescriptionLabel;\n \n \t\n-\tpublic static String BlockPropertiesEditionPart_NameLabel;\n-\n-\t\n-\tpublic static String BlockPropertiesEditionPart_DescriptionLabel;\n-\n-\t\n \tpublic static String EntityPropertiesEditionPart_NameLabel;\n \n \t\n@@ -128,45 +95,6 @@ public class EntityMessages extends NLS {\n \tpublic static String EntityPropertiesEditionPart_DescriptionLabel;\n \n \t\n-\tpublic static String AttributePropertiesEditionPart_NameLabel;\n-\n-\t\n-\tpublic static String AttributePropertiesEditionPart_TypeLabel;\n-\n-\t\n-\tpublic static String AttributePropertiesEditionPart_MultiplicityLabel;\n-\n-\t\n-\tpublic static String AttributePropertiesEditionPart_IsPrimaryKeyLabel;\n-\n-\t\n-\tpublic static String AttributePropertiesEditionPart_DescriptionLabel;\n-\n-\t\n-\tpublic static String ReferencePropertiesEditionPart_NameLabel;\n-\n-\t\n-\tpublic static String ReferencePropertiesEditionPart_TypeLabel;\n-\n-\t\n-\tpublic static String ReferencePropertiesEditionPart_MultiplicityLabel;\n-\n-\t\n-\tpublic static String ReferencePropertiesEditionPart_IsPrimaryKeyLabel;\n-\n-\t\n-\tpublic static String ReferencePropertiesEditionPart_IsCompositeLabel;\n-\n-\t\n-\tpublic static String ReferencePropertiesEditionPart_NavigableLabel;\n-\n-\t\n-\tpublic static String ReferencePropertiesEditionPart_OppositeOfLabel;\n-\n-\t\n-\tpublic static String ReferencePropertiesEditionPart_DescriptionLabel;\n-\n-\t\n \tpublic static String FinderPropertiesEditionPart_CustomizedNameLabel;\n \n \t", "raw_url": "https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.edit%2Fsrc-gen%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fproviders%2FEntityMessages.java", "sha": "c32f38c4747367108f3fc7967b3a8ebd9ea22b09", "status": "modified" }, { "additions": 0, "blob_url": "https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.edit%2Fsrc-gen%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fproviders%2FEntityPropertiesEditionPartProvider.java", "changes": 24, "contents_url": "https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.edit%2Fsrc-gen%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fproviders%2FEntityPropertiesEditionPartProvider.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6", "deletions": 24, "filename": "models/entity/plugins/org.obeonetwork.dsl.entity.edit/src-gen/org/obeonetwork/dsl/entity/providers/EntityPropertiesEditionPartProvider.java", "new_code": "", "new_methods": [], "old_code": "import org.obeonetwork.dsl.entity.parts.forms.AttributePropertiesEditionPartForm;\nimport org.obeonetwork.dsl.entity.parts.forms.BlockPropertiesEditionPartForm;\nimport org.obeonetwork.dsl.entity.parts.forms.ReferencePropertiesEditionPartForm;\nimport org.obeonetwork.dsl.entity.parts.impl.AttributePropertiesEditionPartImpl;\nimport org.obeonetwork.dsl.entity.parts.impl.BlockPropertiesEditionPartImpl;\nimport org.obeonetwork.dsl.entity.parts.impl.ReferencePropertiesEditionPartImpl;\n\t\tif (key == EntityViewsRepository.Block.class) {\n\t\t\tif (kind == EntityViewsRepository.SWT_KIND)\n\t\t\t\treturn new BlockPropertiesEditionPartImpl(component);\n\t\t\tif (kind == EntityViewsRepository.FORM_KIND)\n\t\t\t\treturn new BlockPropertiesEditionPartForm(component);\n\t\t}\n\t\tif (key == EntityViewsRepository.Attribute.class) {\n\t\t\tif (kind == EntityViewsRepository.SWT_KIND)\n\t\t\t\treturn new AttributePropertiesEditionPartImpl(component);\n\t\t\tif (kind == EntityViewsRepository.FORM_KIND)\n\t\t\t\treturn new AttributePropertiesEditionPartForm(component);\n\t\t}\n\t\tif (key == EntityViewsRepository.Reference.class) {\n\t\t\tif (kind == EntityViewsRepository.SWT_KIND)\n\t\t\t\treturn new ReferencePropertiesEditionPartImpl(component);\n\t\t\tif (kind == EntityViewsRepository.FORM_KIND)\n\t\t\t\treturn new ReferencePropertiesEditionPartForm(component);\n\t\t}", "old_methods": [], "patch": "@@ -18,22 +18,16 @@\n \n import org.obeonetwork.dsl.entity.parts.EntityViewsRepository;\n \n-import org.obeonetwork.dsl.entity.parts.forms.AttributePropertiesEditionPartForm;\n-import org.obeonetwork.dsl.entity.parts.forms.BlockPropertiesEditionPartForm;\n import org.obeonetwork.dsl.entity.parts.forms.EntityPropertiesEditionPartForm;\n import org.obeonetwork.dsl.entity.parts.forms.ExternalCriterionPropertiesEditionPartForm;\n import org.obeonetwork.dsl.entity.parts.forms.FinderPropertiesEditionPartForm;\n import org.obeonetwork.dsl.entity.parts.forms.InternalCriterionPropertiesEditionPartForm;\n-import org.obeonetwork.dsl.entity.parts.forms.ReferencePropertiesEditionPartForm;\n import org.obeonetwork.dsl.entity.parts.forms.RootPropertiesEditionPartForm;\n \n-import org.obeonetwork.dsl.entity.parts.impl.AttributePropertiesEditionPartImpl;\n-import org.obeonetwork.dsl.entity.parts.impl.BlockPropertiesEditionPartImpl;\n import org.obeonetwork.dsl.entity.parts.impl.EntityPropertiesEditionPartImpl;\n import org.obeonetwork.dsl.entity.parts.impl.ExternalCriterionPropertiesEditionPartImpl;\n import org.obeonetwork.dsl.entity.parts.impl.FinderPropertiesEditionPartImpl;\n import org.obeonetwork.dsl.entity.parts.impl.InternalCriterionPropertiesEditionPartImpl;\n-import org.obeonetwork.dsl.entity.parts.impl.ReferencePropertiesEditionPartImpl;\n import org.obeonetwork.dsl.entity.parts.impl.RootPropertiesEditionPartImpl;\n \n /**\n@@ -63,30 +57,12 @@ public IPropertiesEditionPart getPropertiesEditionPart(Object key, int kind, IPr\n \t\t\tif (kind == EntityViewsRepository.FORM_KIND)\n \t\t\t\treturn new RootPropertiesEditionPartForm(component);\n \t\t}\n-\t\tif (key == EntityViewsRepository.Block.class) {\n-\t\t\tif (kind == EntityViewsRepository.SWT_KIND)\n-\t\t\t\treturn new BlockPropertiesEditionPartImpl(component);\n-\t\t\tif (kind == EntityViewsRepository.FORM_KIND)\n-\t\t\t\treturn new BlockPropertiesEditionPartForm(component);\n-\t\t}\n \t\tif (key == EntityViewsRepository.Entity_.class) {\n \t\t\tif (kind == EntityViewsRepository.SWT_KIND)\n \t\t\t\treturn new EntityPropertiesEditionPartImpl(component);\n \t\t\tif (kind == EntityViewsRepository.FORM_KIND)\n \t\t\t\treturn new EntityPropertiesEditionPartForm(component);\n \t\t}\n-\t\tif (key == EntityViewsRepository.Attribute.class) {\n-\t\t\tif (kind == EntityViewsRepository.SWT_KIND)\n-\t\t\t\treturn new AttributePropertiesEditionPartImpl(component);\n-\t\t\tif (kind == EntityViewsRepository.FORM_KIND)\n-\t\t\t\treturn new AttributePropertiesEditionPartForm(component);\n-\t\t}\n-\t\tif (key == EntityViewsRepository.Reference.class) {\n-\t\t\tif (kind == EntityViewsRepository.SWT_KIND)\n-\t\t\t\treturn new ReferencePropertiesEditionPartImpl(component);\n-\t\t\tif (kind == EntityViewsRepository.FORM_KIND)\n-\t\t\t\treturn new ReferencePropertiesEditionPartForm(component);\n-\t\t}\n \t\tif (key == EntityViewsRepository.Finder.class) {\n \t\t\tif (kind == EntityViewsRepository.SWT_KIND)\n \t\t\t\treturn new FinderPropertiesEditionPartImpl(component);", "raw_url": "https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.edit%2Fsrc-gen%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fproviders%2FEntityPropertiesEditionPartProvider.java", "sha": "6d0f7dddd0d63e8f22cc2e57f0aafc277fc74f12", "status": "modified" }, { "additions": 0, "blob_url": "https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.edit%2Fsrc-gen%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fproviders%2FentityMessages.properties", "changes": 24, "contents_url": "https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.edit%2Fsrc-gen%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fproviders%2FentityMessages.properties?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6", "deletions": 24, "filename": "models/entity/plugins/org.obeonetwork.dsl.entity.edit/src-gen/org/obeonetwork/dsl/entity/providers/entityMessages.properties", "new_code": "", "new_methods": [], "old_code": "BlockPropertiesEditionPart_PropertiesGroupLabel=Properties\nAttributePropertiesEditionPart_PropertiesGroupLabel=Properties\nReferencePropertiesEditionPart_PropertiesGroupLabel=Properties\nBlock_ReadOnly=This property is read only\nBlock_Part_Title=Block\nAttribute_ReadOnly=This property is read only\nAttribute_Part_Title=Attribute\nReference_ReadOnly=This property is read only\nReference_Part_Title=Reference\nBlockPropertiesEditionPart_NameLabel=Name : \nBlockPropertiesEditionPart_DescriptionLabel=Description : \nAttributePropertiesEditionPart_NameLabel=Name : \nAttributePropertiesEditionPart_TypeLabel=Type : \nAttributePropertiesEditionPart_MultiplicityLabel=Multiplicity : \nAttributePropertiesEditionPart_IsPrimaryKeyLabel=IsPrimaryKey\nAttributePropertiesEditionPart_DescriptionLabel=Description : \nReferencePropertiesEditionPart_NameLabel=Name : \nReferencePropertiesEditionPart_TypeLabel=Type : \nReferencePropertiesEditionPart_MultiplicityLabel=Multiplicity : \nReferencePropertiesEditionPart_IsPrimaryKeyLabel=IsPrimaryKey\nReferencePropertiesEditionPart_IsCompositeLabel=IsComposite\nReferencePropertiesEditionPart_NavigableLabel=Navigable\nReferencePropertiesEditionPart_OppositeOfLabel=OppositeOf : \nReferencePropertiesEditionPart_DescriptionLabel=Description : ", "old_methods": [], "patch": "@@ -15,23 +15,14 @@\n \n # default values ...\n RootPropertiesEditionPart_PropertiesGroupLabel=Properties\n-BlockPropertiesEditionPart_PropertiesGroupLabel=Properties\n EntityPropertiesEditionPart_PropertiesGroupLabel=Properties\n-AttributePropertiesEditionPart_PropertiesGroupLabel=Properties\n-ReferencePropertiesEditionPart_PropertiesGroupLabel=Properties\n FinderPropertiesEditionPart_PropertiesGroupLabel=Properties\n InternalCriterionPropertiesEditionPart_PropertiesGroupLabel=Properties\n ExternalCriterionPropertiesEditionPart_PropertiesGroupLabel=Properties\n Root_ReadOnly=This property is read only\n Root_Part_Title=Root\n-Block_ReadOnly=This property is read only\n-Block_Part_Title=Block\n Entity_ReadOnly=This property is read only\n Entity_Part_Title=Entity\n-Attribute_ReadOnly=This property is read only\n-Attribute_Part_Title=Attribute\n-Reference_ReadOnly=This property is read only\n-Reference_Part_Title=Reference\n Finder_ReadOnly=This property is read only\n Finder_Part_Title=Finder\n InternalCriterion_ReadOnly=This property is read only\n@@ -40,28 +31,13 @@ ExternalCriterion_ReadOnly=This property is read only\n ExternalCriterion_Part_Title=ExternalCriterion\n RootPropertiesEditionPart_NameLabel=Name : \n RootPropertiesEditionPart_DescriptionLabel=Description : \n-BlockPropertiesEditionPart_NameLabel=Name : \n-BlockPropertiesEditionPart_DescriptionLabel=Description : \n EntityPropertiesEditionPart_NameLabel=Name : \n EntityPropertiesEditionPart_SuperTypeLabel=SuperType : \n EntityPropertiesEditionPart_EstimatedVolumetryLabel=EstimatedVolumetry : \n EntityPropertiesEditionPart_EstimatedAccessLabel=EstimatedAccess : \n EntityPropertiesEditionPart_HistorizedLabel=Historized\n EntityPropertiesEditionPart_InheritanceKindLabel=InheritanceKind : \n EntityPropertiesEditionPart_DescriptionLabel=Description : \n-AttributePropertiesEditionPart_NameLabel=Name : \n-AttributePropertiesEditionPart_TypeLabel=Type : \n-AttributePropertiesEditionPart_MultiplicityLabel=Multiplicity : \n-AttributePropertiesEditionPart_IsPrimaryKeyLabel=IsPrimaryKey\n-AttributePropertiesEditionPart_DescriptionLabel=Description : \n-ReferencePropertiesEditionPart_NameLabel=Name : \n-ReferencePropertiesEditionPart_TypeLabel=Type : \n-ReferencePropertiesEditionPart_MultiplicityLabel=Multiplicity : \n-ReferencePropertiesEditionPart_IsPrimaryKeyLabel=IsPrimaryKey\n-ReferencePropertiesEditionPart_IsCompositeLabel=IsComposite\n-ReferencePropertiesEditionPart_NavigableLabel=Navigable\n-ReferencePropertiesEditionPart_OppositeOfLabel=OppositeOf : \n-ReferencePropertiesEditionPart_DescriptionLabel=Description : \n FinderPropertiesEditionPart_CustomizedNameLabel=CustomizedName : \n FinderPropertiesEditionPart_MultiplicityLabel=Multiplicity : \n FinderPropertiesEditionPart_DescriptionLabel=Description : ", "raw_url": "https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.edit%2Fsrc-gen%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fproviders%2FentityMessages.properties", "sha": "e551490d3772a5bcf82734c6159364943ef6b8c0", "status": "modified" }, { "additions": 0, "blob_url": "https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.edit%2Fsrc-gen%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fproviders%2FentityMessages_fr.properties", "changes": 24, "contents_url": "https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.edit%2Fsrc-gen%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fproviders%2FentityMessages_fr.properties?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6", "deletions": 24, "filename": "models/entity/plugins/org.obeonetwork.dsl.entity.edit/src-gen/org/obeonetwork/dsl/entity/providers/entityMessages_fr.properties", "new_code": "", "new_methods": [], "old_code": "BlockPropertiesEditionPart_PropertiesGroupLabel=Properties\nAttributePropertiesEditionPart_PropertiesGroupLabel=Properties\nReferencePropertiesEditionPart_PropertiesGroupLabel=Properties\nBlock_ReadOnly=Cette propri\\u00E9t\\u00E9 est en lecture seule\nBlock_Part_Title=Block\nAttribute_ReadOnly=Cette propri\\u00E9t\\u00E9 est en lecture seule\nAttribute_Part_Title=Attribute\nReference_ReadOnly=Cette propri\\u00E9t\\u00E9 est en lecture seule\nReference_Part_Title=Reference\nBlockPropertiesEditionPart_NameLabel=Name : \nBlockPropertiesEditionPart_DescriptionLabel=Description : \nAttributePropertiesEditionPart_NameLabel=Name : \nAttributePropertiesEditionPart_TypeLabel=Type : \nAttributePropertiesEditionPart_MultiplicityLabel=Multiplicity : \nAttributePropertiesEditionPart_IsPrimaryKeyLabel=IsPrimaryKey\nAttributePropertiesEditionPart_DescriptionLabel=Description : \nReferencePropertiesEditionPart_NameLabel=Name : \nReferencePropertiesEditionPart_TypeLabel=Type : \nReferencePropertiesEditionPart_MultiplicityLabel=Multiplicity : \nReferencePropertiesEditionPart_IsPrimaryKeyLabel=IsPrimaryKey\nReferencePropertiesEditionPart_IsCompositeLabel=IsComposite\nReferencePropertiesEditionPart_NavigableLabel=Navigable\nReferencePropertiesEditionPart_OppositeOfLabel=OppositeOf : \nReferencePropertiesEditionPart_DescriptionLabel=Description : ", "old_methods": [], "patch": "@@ -15,23 +15,14 @@\n \n # default values ...\n RootPropertiesEditionPart_PropertiesGroupLabel=Properties\n-BlockPropertiesEditionPart_PropertiesGroupLabel=Properties\n EntityPropertiesEditionPart_PropertiesGroupLabel=Properties\n-AttributePropertiesEditionPart_PropertiesGroupLabel=Properties\n-ReferencePropertiesEditionPart_PropertiesGroupLabel=Properties\n FinderPropertiesEditionPart_PropertiesGroupLabel=Properties\n InternalCriterionPropertiesEditionPart_PropertiesGroupLabel=Properties\n ExternalCriterionPropertiesEditionPart_PropertiesGroupLabel=Properties\n Root_ReadOnly=Cette propri\\u00E9t\\u00E9 est en lecture seule\n Root_Part_Title=Root\n-Block_ReadOnly=Cette propri\\u00E9t\\u00E9 est en lecture seule\n-Block_Part_Title=Block\n Entity_ReadOnly=Cette propri\\u00E9t\\u00E9 est en lecture seule\n Entity_Part_Title=Entity\n-Attribute_ReadOnly=Cette propri\\u00E9t\\u00E9 est en lecture seule\n-Attribute_Part_Title=Attribute\n-Reference_ReadOnly=Cette propri\\u00E9t\\u00E9 est en lecture seule\n-Reference_Part_Title=Reference\n Finder_ReadOnly=Cette propri\\u00E9t\\u00E9 est en lecture seule\n Finder_Part_Title=Finder\n InternalCriterion_ReadOnly=Cette propri\\u00E9t\\u00E9 est en lecture seule\n@@ -40,28 +31,13 @@ ExternalCriterion_ReadOnly=Cette propri\\u00E9t\\u00E9 est en lecture seule\n ExternalCriterion_Part_Title=ExternalCriterion\n RootPropertiesEditionPart_NameLabel=Name : \n RootPropertiesEditionPart_DescriptionLabel=Description : \n-BlockPropertiesEditionPart_NameLabel=Name : \n-BlockPropertiesEditionPart_DescriptionLabel=Description : \n EntityPropertiesEditionPart_NameLabel=Name : \n EntityPropertiesEditionPart_SuperTypeLabel=SuperType : \n EntityPropertiesEditionPart_EstimatedVolumetryLabel=EstimatedVolumetry : \n EntityPropertiesEditionPart_EstimatedAccessLabel=EstimatedAccess : \n EntityPropertiesEditionPart_HistorizedLabel=Historized\n EntityPropertiesEditionPart_InheritanceKindLabel=InheritanceKind : \n EntityPropertiesEditionPart_DescriptionLabel=Description : \n-AttributePropertiesEditionPart_NameLabel=Name : \n-AttributePropertiesEditionPart_TypeLabel=Type : \n-AttributePropertiesEditionPart_MultiplicityLabel=Multiplicity : \n-AttributePropertiesEditionPart_IsPrimaryKeyLabel=IsPrimaryKey\n-AttributePropertiesEditionPart_DescriptionLabel=Description : \n-ReferencePropertiesEditionPart_NameLabel=Name : \n-ReferencePropertiesEditionPart_TypeLabel=Type : \n-ReferencePropertiesEditionPart_MultiplicityLabel=Multiplicity : \n-ReferencePropertiesEditionPart_IsPrimaryKeyLabel=IsPrimaryKey\n-ReferencePropertiesEditionPart_IsCompositeLabel=IsComposite\n-ReferencePropertiesEditionPart_NavigableLabel=Navigable\n-ReferencePropertiesEditionPart_OppositeOfLabel=OppositeOf : \n-ReferencePropertiesEditionPart_DescriptionLabel=Description : \n FinderPropertiesEditionPart_CustomizedNameLabel=CustomizedName : \n FinderPropertiesEditionPart_MultiplicityLabel=Multiplicity : \n FinderPropertiesEditionPart_DescriptionLabel=Description : ", "raw_url": "https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.edit%2Fsrc-gen%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fproviders%2FentityMessages_fr.properties", "sha": "309a89bb42c5deb41a6a477e221bedff09378680", "status": "modified" }, { "additions": 0, "blob_url": "https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.edit%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fprovider%2FEntityItemProvider.java", "changes": 37, "contents_url": "https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.edit%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fprovider%2FEntityItemProvider.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6", "deletions": 37, "filename": "models/entity/plugins/org.obeonetwork.dsl.entity.edit/src/org/obeonetwork/dsl/entity/provider/EntityItemProvider.java", "new_code": "", "new_methods": [], "old_code": "\t\t\taddSupertypePropertyDescriptor(object);\n\t/**\n\t * This adds a property descriptor for the Supertype feature.\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @generated\n\t */\n\tprotected void addSupertypePropertyDescriptor(Object object) {\n\t\titemPropertyDescriptors.add\n\t\t\t(createItemPropertyDescriptor\n\t\t\t\t(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),\n\t\t\t\t getResourceLocator(),\n\t\t\t\t getString(\"_UI_Entity_supertype_feature\"),\n\t\t\t\t getString(\"_UI_PropertyDescriptor_description\", \"_UI_Entity_supertype_feature\", \"_UI_Entity_type\"),\n\t\t\t\t EntityPackage.Literals.ENTITY__SUPERTYPE,\n\t\t\t\t true,\n\t\t\t\t false,\n\t\t\t\t true,\n\t\t\t\t null,\n\t\t\t\t null,\n\t\t\t\t null));\n\t}\n\n\t\t\tchildrenFeatures.add(EntityPackage.Literals.ENTITY__OWNED_ATTRIBUTES);\n\t\t\tchildrenFeatures.add(EntityPackage.Literals.ENTITY__OWNED_REFERENCES);\n\t\t\tcase EntityPackage.ENTITY__OWNED_ATTRIBUTES:\n\t\t\tcase EntityPackage.ENTITY__OWNED_REFERENCES:\n\t\tnewChildDescriptors.add\n\t\t\t(createChildParameter\n\t\t\t\t(EntityPackage.Literals.ENTITY__OWNED_ATTRIBUTES,\n\t\t\t\t EntityFactory.eINSTANCE.createAttribute()));\n\n\t\tnewChildDescriptors.add\n\t\t\t(createChildParameter\n\t\t\t\t(EntityPackage.Literals.ENTITY__OWNED_REFERENCES,\n\t\t\t\t EntityFactory.eINSTANCE.createReference()));\n", "old_methods": [ { "arguments": [ "Object object" ], "filename": "models/entity/plugins/org.obeonetwork.dsl.entity.edit/src/org/obeonetwork/dsl/entity/provider/EntityItemProvider.java", "implementation": "itemPropertyDescriptors.add\n\t\t\t(createItemPropertyDescriptor\n\t\t\t\t(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),\n\t\t\t\t getResourceLocator(),\n\t\t\t\t getString(\"_UI_Entity_supertype_feature\"),\n\t\t\t\t getString(\"_UI_PropertyDescriptor_description\", \"_UI_Entity_supertype_feature\", \"_UI_Entity_type\"),\n\t\t\t\t EntityPackage.Literals.ENTITY__SUPERTYPE,\n\t\t\t\t true,\n\t\t\t\t false,\n\t\t\t\t true,\n\t\t\t\t null,\n\t\t\t\t null,\n\t\t\t\t null));", "signature": "void addSupertypePropertyDescriptor(Object object)" } ], "patch": "@@ -76,7 +76,6 @@ public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {\n \t\tif (itemPropertyDescriptors == null) {\n \t\t\tsuper.getPropertyDescriptors(object);\n \n-\t\t\taddSupertypePropertyDescriptor(object);\n \t\t\taddEstimatedVolumetryPropertyDescriptor(object);\n \t\t\taddEstimatedAccessPropertyDescriptor(object);\n \t\t\taddHistorizedPropertyDescriptor(object);\n@@ -85,28 +84,6 @@ public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {\n \t\treturn itemPropertyDescriptors;\n \t}\n \n-\t/**\n-\t * This adds a property descriptor for the Supertype feature.\n-\t * <!-- begin-user-doc -->\n-\t * <!-- end-user-doc -->\n-\t * @generated\n-\t */\n-\tprotected void addSupertypePropertyDescriptor(Object object) {\n-\t\titemPropertyDescriptors.add\n-\t\t\t(createItemPropertyDescriptor\n-\t\t\t\t(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),\n-\t\t\t\t getResourceLocator(),\n-\t\t\t\t getString(\"_UI_Entity_supertype_feature\"),\n-\t\t\t\t getString(\"_UI_PropertyDescriptor_description\", \"_UI_Entity_supertype_feature\", \"_UI_Entity_type\"),\n-\t\t\t\t EntityPackage.Literals.ENTITY__SUPERTYPE,\n-\t\t\t\t true,\n-\t\t\t\t false,\n-\t\t\t\t true,\n-\t\t\t\t null,\n-\t\t\t\t null,\n-\t\t\t\t null));\n-\t}\n-\n \t/**\n \t * This adds a property descriptor for the Estimated Volumetry feature.\n \t * <!-- begin-user-doc -->\n@@ -207,8 +184,6 @@ protected void addInheritanceKindPropertyDescriptor(Object object) {\n \tpublic Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {\n \t\tif (childrenFeatures == null) {\n \t\t\tsuper.getChildrenFeatures(object);\n-\t\t\tchildrenFeatures.add(EntityPackage.Literals.ENTITY__OWNED_ATTRIBUTES);\n-\t\t\tchildrenFeatures.add(EntityPackage.Literals.ENTITY__OWNED_REFERENCES);\n \t\t\tchildrenFeatures.add(EntityPackage.Literals.ENTITY__OWNED_FINDERS);\n \t\t}\n \t\treturn childrenFeatures;\n@@ -280,8 +255,6 @@ public void notifyChanged(Notification notification) {\n \t\t\tcase EntityPackage.ENTITY__INHERITANCE_KIND:\n \t\t\t\tfireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));\n \t\t\t\treturn;\n-\t\t\tcase EntityPackage.ENTITY__OWNED_ATTRIBUTES:\n-\t\t\tcase EntityPackage.ENTITY__OWNED_REFERENCES:\n \t\t\tcase EntityPackage.ENTITY__OWNED_FINDERS:\n \t\t\t\tfireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));\n \t\t\t\treturn;\n@@ -300,16 +273,6 @@ public void notifyChanged(Notification notification) {\n \tprotected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {\n \t\tsuper.collectNewChildDescriptors(newChildDescriptors, object);\n \n-\t\tnewChildDescriptors.add\n-\t\t\t(createChildParameter\n-\t\t\t\t(EntityPackage.Literals.ENTITY__OWNED_ATTRIBUTES,\n-\t\t\t\t EntityFactory.eINSTANCE.createAttribute()));\n-\n-\t\tnewChildDescriptors.add\n-\t\t\t(createChildParameter\n-\t\t\t\t(EntityPackage.Literals.ENTITY__OWNED_REFERENCES,\n-\t\t\t\t EntityFactory.eINSTANCE.createReference()));\n-\n \t\tnewChildDescriptors.add\n \t\t\t(createChildParameter\n \t\t\t\t(EntityPackage.Literals.ENTITY__OWNED_FINDERS,", "raw_url": "https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.edit%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fprovider%2FEntityItemProvider.java", "sha": "f30aa0a7834b87444800447803f17309525950c7", "status": "modified" }, { "additions": 0, "blob_url": "https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.edit%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fprovider%2FEntityItemProviderAdapterFactory.java", "changes": 72, "contents_url": "https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.edit%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fprovider%2FEntityItemProviderAdapterFactory.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6", "deletions": 72, "filename": "models/entity/plugins/org.obeonetwork.dsl.entity.edit/src/org/obeonetwork/dsl/entity/provider/EntityItemProviderAdapterFactory.java", "new_code": "", "new_methods": [], "old_code": "\t/**\n\t * This keeps track of the one adapter used for all {@link org.obeonetwork.dsl.entity.Block} instances.\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @generated\n\t */\n\tprotected BlockItemProvider blockItemProvider;\n\n\t/**\n\t * This creates an adapter for a {@link org.obeonetwork.dsl.entity.Block}.\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @generated\n\t */\n\t@Override\n\tpublic Adapter createBlockAdapter() {\n\t\tif (blockItemProvider == null) {\n\t\t\tblockItemProvider = new BlockItemProvider(this);\n\t\t}\n\n\t\treturn blockItemProvider;\n\t}\n\n\t/**\n\t * This keeps track of the one adapter used for all {@link org.obeonetwork.dsl.entity.Attribute} instances.\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @generated\n\t */\n\tprotected AttributeItemProvider attributeItemProvider;\n\n\t/**\n\t * This creates an adapter for a {@link org.obeonetwork.dsl.entity.Attribute}.\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @generated\n\t */\n\t@Override\n\tpublic Adapter createAttributeAdapter() {\n\t\tif (attributeItemProvider == null) {\n\t\t\tattributeItemProvider = new AttributeItemProvider(this);\n\t\t}\n\n\t\treturn attributeItemProvider;\n\t}\n\n\t/**\n\t * This keeps track of the one adapter used for all {@link org.obeonetwork.dsl.entity.Reference} instances.\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @generated\n\t */\n\tprotected ReferenceItemProvider referenceItemProvider;\n\n\t/**\n\t * This creates an adapter for a {@link org.obeonetwork.dsl.entity.Reference}.\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @generated\n\t */\n\t@Override\n\tpublic Adapter createReferenceAdapter() {\n\t\tif (referenceItemProvider == null) {\n\t\t\treferenceItemProvider = new ReferenceItemProvider(this);\n\t\t}\n\n\t\treturn referenceItemProvider;\n\t}\n\n\t\tif (blockItemProvider != null) blockItemProvider.dispose();\n\t\tif (attributeItemProvider != null) attributeItemProvider.dispose();\n\t\tif (referenceItemProvider != null) referenceItemProvider.dispose();", "old_methods": [ { "arguments": [], "filename": "models/entity/plugins/org.obeonetwork.dsl.entity.edit/src/org/obeonetwork/dsl/entity/provider/EntityItemProviderAdapterFactory.java", "implementation": "if (blockItemProvider == null) {\n\t\t\tblockItemProvider = new BlockItemProvider(this);", "signature": "Adapter createBlockAdapter()" }, { "arguments": [], "filename": "models/entity/plugins/org.obeonetwork.dsl.entity.edit/src/org/obeonetwork/dsl/entity/provider/EntityItemProviderAdapterFactory.java", "implementation": "if (attributeItemProvider == null) {\n\t\t\tattributeItemProvider = new AttributeItemProvider(this);", "signature": "Adapter createAttributeAdapter()" }, { "arguments": [], "filename": "models/entity/plugins/org.obeonetwork.dsl.entity.edit/src/org/obeonetwork/dsl/entity/provider/EntityItemProviderAdapterFactory.java", "implementation": "if (referenceItemProvider == null) {\n\t\t\treferenceItemProvider = new ReferenceItemProvider(this);", "signature": "Adapter createReferenceAdapter()" } ], "patch": "@@ -109,29 +109,6 @@ public Adapter createRootAdapter() {\n \t\treturn rootItemProvider;\n \t}\n \n-\t/**\n-\t * This keeps track of the one adapter used for all {@link org.obeonetwork.dsl.entity.Block} instances.\n-\t * <!-- begin-user-doc -->\n-\t * <!-- end-user-doc -->\n-\t * @generated\n-\t */\n-\tprotected BlockItemProvider blockItemProvider;\n-\n-\t/**\n-\t * This creates an adapter for a {@link org.obeonetwork.dsl.entity.Block}.\n-\t * <!-- begin-user-doc -->\n-\t * <!-- end-user-doc -->\n-\t * @generated\n-\t */\n-\t@Override\n-\tpublic Adapter createBlockAdapter() {\n-\t\tif (blockItemProvider == null) {\n-\t\t\tblockItemProvider = new BlockItemProvider(this);\n-\t\t}\n-\n-\t\treturn blockItemProvider;\n-\t}\n-\n \t/**\n \t * This keeps track of the one adapter used for all {@link org.obeonetwork.dsl.entity.Entity} instances.\n \t * <!-- begin-user-doc -->\n@@ -155,52 +132,6 @@ public Adapter createEntityAdapter() {\n \t\treturn entityItemProvider;\n \t}\n \n-\t/**\n-\t * This keeps track of the one adapter used for all {@link org.obeonetwork.dsl.entity.Attribute} instances.\n-\t * <!-- begin-user-doc -->\n-\t * <!-- end-user-doc -->\n-\t * @generated\n-\t */\n-\tprotected AttributeItemProvider attributeItemProvider;\n-\n-\t/**\n-\t * This creates an adapter for a {@link org.obeonetwork.dsl.entity.Attribute}.\n-\t * <!-- begin-user-doc -->\n-\t * <!-- end-user-doc -->\n-\t * @generated\n-\t */\n-\t@Override\n-\tpublic Adapter createAttributeAdapter() {\n-\t\tif (attributeItemProvider == null) {\n-\t\t\tattributeItemProvider = new AttributeItemProvider(this);\n-\t\t}\n-\n-\t\treturn attributeItemProvider;\n-\t}\n-\n-\t/**\n-\t * This keeps track of the one adapter used for all {@link org.obeonetwork.dsl.entity.Reference} instances.\n-\t * <!-- begin-user-doc -->\n-\t * <!-- end-user-doc -->\n-\t * @generated\n-\t */\n-\tprotected ReferenceItemProvider referenceItemProvider;\n-\n-\t/**\n-\t * This creates an adapter for a {@link org.obeonetwork.dsl.entity.Reference}.\n-\t * <!-- begin-user-doc -->\n-\t * <!-- end-user-doc -->\n-\t * @generated\n-\t */\n-\t@Override\n-\tpublic Adapter createReferenceAdapter() {\n-\t\tif (referenceItemProvider == null) {\n-\t\t\treferenceItemProvider = new ReferenceItemProvider(this);\n-\t\t}\n-\n-\t\treturn referenceItemProvider;\n-\t}\n-\n \t/**\n \t * This keeps track of the one adapter used for all {@link org.obeonetwork.dsl.entity.Finder} instances.\n \t * <!-- begin-user-doc -->\n@@ -370,10 +301,7 @@ public void fireNotifyChanged(Notification notification) {\n \t */\n \tpublic void dispose() {\n \t\tif (rootItemProvider != null) rootItemProvider.dispose();\n-\t\tif (blockItemProvider != null) blockItemProvider.dispose();\n \t\tif (entityItemProvider != null) entityItemProvider.dispose();\n-\t\tif (attributeItemProvider != null) attributeItemProvider.dispose();\n-\t\tif (referenceItemProvider != null) referenceItemProvider.dispose();\n \t\tif (finderItemProvider != null) finderItemProvider.dispose();\n \t\tif (internalCriterionItemProvider != null) internalCriterionItemProvider.dispose();\n \t\tif (externalCriterionItemProvider != null) externalCriterionItemProvider.dispose();", "raw_url": "https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.edit%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fprovider%2FEntityItemProviderAdapterFactory.java", "sha": "badda280b3ed642ab47843aa7b92a10dfdfddf53", "status": "modified" }, { "additions": 42, "blob_url": "https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.edit%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fprovider%2FRootItemProvider.java", "changes": 50, "contents_url": "https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.edit%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fprovider%2FRootItemProvider.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6", "deletions": 8, "filename": "models/entity/plugins/org.obeonetwork.dsl.entity.edit/src/org/obeonetwork/dsl/entity/provider/RootItemProvider.java", "new_code": "import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;\nimport org.eclipse.emf.edit.provider.ItemPropertyDescriptor;\nimport org.obeonetwork.dsl.environment.EnvironmentFactory;\nimport org.obeonetwork.dsl.environment.provider.TypesDefinitionItemProvider;\n\textends TypesDefinitionItemProvider\n\t\t\taddNamePropertyDescriptor(object);\n\t/**\n\t * This adds a property descriptor for the Name feature.\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @generated\n\t */\n\tprotected void addNamePropertyDescriptor(Object object) {\n\t\titemPropertyDescriptors.add\n\t\t\t(createItemPropertyDescriptor\n\t\t\t\t(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),\n\t\t\t\t getResourceLocator(),\n\t\t\t\t getString(\"_UI_Root_name_feature\"),\n\t\t\t\t getString(\"_UI_PropertyDescriptor_description\", \"_UI_Root_name_feature\", \"_UI_Root_type\"),\n\t\t\t\t EntityPackage.Literals.ROOT__NAME,\n\t\t\t\t true,\n\t\t\t\t false,\n\t\t\t\t false,\n\t\t\t\t ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,\n\t\t\t\t null,\n\t\t\t\t null));\n\t}\n\n\t\t\tchildrenFeatures.add(EntityPackage.Literals.ROOT__NAMESPACES);\n\t\tString label = ((Root)object).getName();\n\t\tif (label != null) {\n\t\t\treturn label;\n\t\t}\n\t\treturn \"Entities\";\n\t\t\tcase EntityPackage.ROOT__NAME:\n\t\t\t\tfireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));\n\t\t\t\treturn;\n\t\t\tcase EntityPackage.ROOT__NAMESPACES:\n\t\t\t\t(EnvironmentPackage.Literals.TYPES_DEFINITION__TYPES,\n\t\t\t\t EntityFactory.eINSTANCE.createEntity()));\n\t\t\t\t(EntityPackage.Literals.ROOT__NAMESPACES,\n\t\t\t\t EnvironmentFactory.eINSTANCE.createNamespace()));", "new_methods": [ { "arguments": [ "Object object" ], "filename": "models/entity/plugins/org.obeonetwork.dsl.entity.edit/src/org/obeonetwork/dsl/entity/provider/RootItemProvider.java", "implementation": "itemPropertyDescriptors.add\n\t\t\t(createItemPropertyDescriptor\n\t\t\t\t(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),\n\t\t\t\t getResourceLocator(),\n\t\t\t\t getString(\"_UI_Root_name_feature\"),\n\t\t\t\t getString(\"_UI_PropertyDescriptor_description\", \"_UI_Root_name_feature\", \"_UI_Root_type\"),\n\t\t\t\t EntityPackage.Literals.ROOT__NAME,\n\t\t\t\t true,\n\t\t\t\t false,\n\t\t\t\t false,\n\t\t\t\t ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,\n\t\t\t\t null,\n\t\t\t\t null));", "signature": "void addNamePropertyDescriptor(Object object)" } ], "old_code": "\textends NamespaceItemProvider\n\t\t\tchildrenFeatures.add(EntityPackage.Literals.ROOT__BLOCKS);\n\t\treturn \"Blocks\";\n\t\t\tcase EntityPackage.ROOT__BLOCKS:\n\t\t\t\t(EnvironmentPackage.Literals.NAMESPACE__OWNED_NAMESPACES,\n\t\t\t\t EntityFactory.eINSTANCE.createRoot()));\n\t\t\t\t(EntityPackage.Literals.ROOT__BLOCKS,\n\t\t\t\t EntityFactory.eINSTANCE.createBlock()));", "old_methods": [], "patch": "@@ -20,18 +20,22 @@\n import org.eclipse.emf.common.notify.Notification;\n import org.eclipse.emf.common.util.ResourceLocator;\n import org.eclipse.emf.ecore.EStructuralFeature;\n+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;\n import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;\n import org.eclipse.emf.edit.provider.IItemLabelProvider;\n import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;\n import org.eclipse.emf.edit.provider.IItemPropertySource;\n import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;\n import org.eclipse.emf.edit.provider.ITreeItemContentProvider;\n+import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;\n import org.eclipse.emf.edit.provider.ViewerNotification;\n import org.obeonetwork.dsl.entity.EntityFactory;\n import org.obeonetwork.dsl.entity.EntityPackage;\n import org.obeonetwork.dsl.entity.Root;\n+import org.obeonetwork.dsl.environment.EnvironmentFactory;\n import org.obeonetwork.dsl.environment.EnvironmentPackage;\n import org.obeonetwork.dsl.environment.provider.NamespaceItemProvider;\n+import org.obeonetwork.dsl.environment.provider.TypesDefinitionItemProvider;\n \n /**\n * This is the item provider adapter for a {@link org.obeonetwork.dsl.entity.Root} object.\n@@ -40,7 +44,7 @@\n * @generated\n */\n public class RootItemProvider\n-\textends NamespaceItemProvider\n+\textends TypesDefinitionItemProvider\n \timplements\t\n \t\tIEditingDomainItemProvider,\t\n \t\tIStructuredItemContentProvider,\t\n@@ -75,10 +79,33 @@ public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {\n \t\tif (itemPropertyDescriptors == null) {\n \t\t\tsuper.getPropertyDescriptors(object);\n \n+\t\t\taddNamePropertyDescriptor(object);\n \t\t}\n \t\treturn itemPropertyDescriptors;\n \t}\n \n+\t/**\n+\t * This adds a property descriptor for the Name feature.\n+\t * <!-- begin-user-doc -->\n+\t * <!-- end-user-doc -->\n+\t * @generated\n+\t */\n+\tprotected void addNamePropertyDescriptor(Object object) {\n+\t\titemPropertyDescriptors.add\n+\t\t\t(createItemPropertyDescriptor\n+\t\t\t\t(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),\n+\t\t\t\t getResourceLocator(),\n+\t\t\t\t getString(\"_UI_Root_name_feature\"),\n+\t\t\t\t getString(\"_UI_PropertyDescriptor_description\", \"_UI_Root_name_feature\", \"_UI_Root_type\"),\n+\t\t\t\t EntityPackage.Literals.ROOT__NAME,\n+\t\t\t\t true,\n+\t\t\t\t false,\n+\t\t\t\t false,\n+\t\t\t\t ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,\n+\t\t\t\t null,\n+\t\t\t\t null));\n+\t}\n+\n \t/**\n \t * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an\n \t * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or\n@@ -91,7 +118,7 @@ public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {\n \tpublic Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {\n \t\tif (childrenFeatures == null) {\n \t\t\tsuper.getChildrenFeatures(object);\n-\t\t\tchildrenFeatures.add(EntityPackage.Literals.ROOT__BLOCKS);\n+\t\t\tchildrenFeatures.add(EntityPackage.Literals.ROOT__NAMESPACES);\n \t\t}\n \t\treturn childrenFeatures;\n \t}\n@@ -138,7 +165,11 @@ protected boolean shouldComposeCreationImage() {\n \t */\n \t@Override\n \tpublic String getText(Object object) {\n-\t\treturn \"Blocks\";\n+\t\tString label = ((Root)object).getName();\n+\t\tif (label != null) {\n+\t\t\treturn label;\n+\t\t}\n+\t\treturn \"Entities\";\n \t}\n \n \t/**\n@@ -153,7 +184,10 @@ public void notifyChanged(Notification notification) {\n \t\tupdateChildren(notification);\n \n \t\tswitch (notification.getFeatureID(Root.class)) {\n-\t\t\tcase EntityPackage.ROOT__BLOCKS:\n+\t\t\tcase EntityPackage.ROOT__NAME:\n+\t\t\t\tfireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));\n+\t\t\t\treturn;\n+\t\t\tcase EntityPackage.ROOT__NAMESPACES:\n \t\t\t\tfireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));\n \t\t\t\treturn;\n \t\t}\n@@ -173,13 +207,13 @@ protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors\n \n \t\tnewChildDescriptors.add\n \t\t\t(createChildParameter\n-\t\t\t\t(EnvironmentPackage.Literals.NAMESPACE__OWNED_NAMESPACES,\n-\t\t\t\t EntityFactory.eINSTANCE.createRoot()));\n+\t\t\t\t(EnvironmentPackage.Literals.TYPES_DEFINITION__TYPES,\n+\t\t\t\t EntityFactory.eINSTANCE.createEntity()));\n \n \t\tnewChildDescriptors.add\n \t\t\t(createChildParameter\n-\t\t\t\t(EntityPackage.Literals.ROOT__BLOCKS,\n-\t\t\t\t EntityFactory.eINSTANCE.createBlock()));\n+\t\t\t\t(EntityPackage.Literals.ROOT__NAMESPACES,\n+\t\t\t\t EnvironmentFactory.eINSTANCE.createNamespace()));\n \t}\n \n \t/**", "raw_url": "https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.edit%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fprovider%2FRootItemProvider.java", "sha": "3fecd259c422a24d95ee0d0169890c68118b678f", "status": "modified" }, { "additions": 4, "blob_url": "https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.editor%2FMETA-INF%2FMANIFEST.MF", "changes": 6, "contents_url": "https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.editor%2FMETA-INF%2FMANIFEST.MF?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6", "deletions": 2, "filename": "models/entity/plugins/org.obeonetwork.dsl.entity.editor/META-INF/MANIFEST.MF", "new_code": "Bundle-SymbolicName: org.obeonetwork.dsl.entity.editor;singleton:=true\nExport-Package: org.obeonetwork.dsl.entity.extensionUtilities.presentation,\n org.obeonetwork.dsl.entity.presentation\n org.obeonetwork.dsl.environment.edit;visibility:=reexport,", "new_methods": [], "old_code": "Bundle-SymbolicName: org.obeonetwork.dsl.entity.editor; singleton:=true\nExport-Package: org.obeonetwork.dsl.entity.presentation", "old_methods": [], "patch": "@@ -1,19 +1,21 @@\n Manifest-Version: 1.0\n Bundle-ManifestVersion: 2\n Bundle-Name: %pluginName\n-Bundle-SymbolicName: org.obeonetwork.dsl.entity.editor; singleton:=true\n+Bundle-SymbolicName: org.obeonetwork.dsl.entity.editor;singleton:=true\n Bundle-Version: 2.4.0.qualifier\n Bundle-ClassPath: .\n Bundle-Activator: org.obeonetwork.dsl.entity.presentation.EntityEditorPlugin$Implementation\n Bundle-Vendor: %providerName\n Bundle-Localization: plugin\n-Export-Package: org.obeonetwork.dsl.entity.presentation\n+Export-Package: org.obeonetwork.dsl.entity.extensionUtilities.presentation,\n+ org.obeonetwork.dsl.entity.presentation\n Require-Bundle: org.eclipse.core.runtime,\n org.eclipse.core.resources;visibility:=reexport,\n org.obeonetwork.dsl.entity.edit;visibility:=reexport,\n org.eclipse.emf.ecore.xmi;visibility:=reexport,\n org.eclipse.emf.edit.ui;visibility:=reexport,\n org.eclipse.ui.ide;visibility:=reexport,\n+ org.obeonetwork.dsl.environment.edit;visibility:=reexport,\n org.obeonetwork.dsl.environment.editor,\n org.eclipse.emf.eef.runtime\n Bundle-ActivationPolicy: lazy", "raw_url": "https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.editor%2FMETA-INF%2FMANIFEST.MF", "sha": "226851ae9f7bd49dc7760eeee731203ed48c8415", "status": "modified" }, { "additions": 56, "blob_url": "https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.editor%2Fplugin.xml", "changes": 57, "contents_url": "https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.editor%2Fplugin.xml?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6", "deletions": 1, "filename": "models/entity/plugins/org.obeonetwork.dsl.entity.editor/plugin.xml", "new_code": " <extension point=\"org.eclipse.ui.newWizards\">\n <!-- @generated entity -->\n <category\n id=\"org.eclipse.emf.ecore.Wizard.category.ID\"\n name=\"%_UI_Wizard_category\"/>\n <wizard\n id=\"org.obeonetwork.dsl.entity.presentation.EntityModelWizardID\"\n name=\"%_UI_EntityModelWizard_label\"\n class=\"org.obeonetwork.dsl.entity.presentation.EntityModelWizard\"\n category=\"org.eclipse.emf.ecore.Wizard.category.ID\"\n icon=\"icons/full/obj16/EntityModelFile.gif\">\n <description>%_UI_EntityModelWizard_description</description>\n <selection class=\"org.eclipse.core.resources.IResource\"/>\n </wizard>\n </extension>\n\n <extension point=\"org.eclipse.ui.editors\">\n <!-- @generated entity -->\n <editor\n id=\"org.obeonetwork.dsl.entity.extensionUtilities.presentation.ExtensionUtilitiesEditorID\"\n name=\"%_UI_ExtensionUtilitiesEditor_label\"\n icon=\"icons/full/obj16/ExtensionUtilitiesModelFile.gif\"\n extensions=\"extensionutilities\"\n class=\"org.obeonetwork.dsl.entity.extensionUtilities.presentation.ExtensionUtilitiesEditor\"\n contributorClass=\"org.obeonetwork.dsl.entity.extensionUtilities.presentation.ExtensionUtilitiesActionBarContributor\">\n </editor>\n </extension>\n <extension point=\"org.eclipse.ui.editors\">\n <!-- @generated entity -->\n <editor\n id=\"org.obeonetwork.dsl.entity.presentation.EntityEditorID\"\n name=\"%_UI_EntityEditor_label\"\n icon=\"icons/full/obj16/EntityModelFile.gif\"\n extensions=\"entity\"\n class=\"org.obeonetwork.dsl.entity.presentation.EntityEditor\"\n contributorClass=\"org.obeonetwork.dsl.entity.presentation.EntityActionBarContributor\">\n </editor>\n </extension>\n\n <extension point=\"org.eclipse.ui.newWizards\">\n <!-- @generated entity -->\n <category\n id=\"org.eclipse.emf.ecore.Wizard.category.ID\"\n name=\"%_UI_Wizard_category\"/>\n <wizard\n id=\"org.obeonetwork.dsl.entity.extensionUtilities.presentation.ExtensionUtilitiesModelWizardID\"\n name=\"%_UI_ExtensionUtilitiesModelWizard_label\"\n class=\"org.obeonetwork.dsl.entity.extensionUtilities.presentation.ExtensionUtilitiesModelWizard\"\n category=\"org.eclipse.emf.ecore.Wizard.category.ID\"\n icon=\"icons/full/obj16/ExtensionUtilitiesModelFile.gif\">\n <description>%_UI_ExtensionUtilitiesModelWizard_description</description>\n <selection class=\"org.eclipse.core.resources.IResource\"/>\n </wizard>\n </extension>\n\nnull</plugin>", "new_methods": [], "old_code": "</plugin>", "old_methods": [], "patch": "@@ -40,4 +40,59 @@\n contributorClass=\"org.obeonetwork.dsl.entity.presentation.EntityActionBarContributor\" >\n </editor>\n </extension>\n-</plugin>\n+ <extension point=\"org.eclipse.ui.newWizards\">\n+ <!-- @generated entity -->\n+ <category\n+ id=\"org.eclipse.emf.ecore.Wizard.category.ID\"\n+ name=\"%_UI_Wizard_category\"/>\n+ <wizard\n+ id=\"org.obeonetwork.dsl.entity.presentation.EntityModelWizardID\"\n+ name=\"%_UI_EntityModelWizard_label\"\n+ class=\"org.obeonetwork.dsl.entity.presentation.EntityModelWizard\"\n+ category=\"org.eclipse.emf.ecore.Wizard.category.ID\"\n+ icon=\"icons/full/obj16/EntityModelFile.gif\">\n+ <description>%_UI_EntityModelWizard_description</description>\n+ <selection class=\"org.eclipse.core.resources.IResource\"/>\n+ </wizard>\n+ </extension>\n+\n+ <extension point=\"org.eclipse.ui.editors\">\n+ <!-- @generated entity -->\n+ <editor\n+ id=\"org.obeonetwork.dsl.entity.extensionUtilities.presentation.ExtensionUtilitiesEditorID\"\n+ name=\"%_UI_ExtensionUtilitiesEditor_label\"\n+ icon=\"icons/full/obj16/ExtensionUtilitiesModelFile.gif\"\n+ extensions=\"extensionutilities\"\n+ class=\"org.obeonetwork.dsl.entity.extensionUtilities.presentation.ExtensionUtilitiesEditor\"\n+ contributorClass=\"org.obeonetwork.dsl.entity.extensionUtilities.presentation.ExtensionUtilitiesActionBarContributor\">\n+ </editor>\n+ </extension>\n+ <extension point=\"org.eclipse.ui.editors\">\n+ <!-- @generated entity -->\n+ <editor\n+ id=\"org.obeonetwork.dsl.entity.presentation.EntityEditorID\"\n+ name=\"%_UI_EntityEditor_label\"\n+ icon=\"icons/full/obj16/EntityModelFile.gif\"\n+ extensions=\"entity\"\n+ class=\"org.obeonetwork.dsl.entity.presentation.EntityEditor\"\n+ contributorClass=\"org.obeonetwork.dsl.entity.presentation.EntityActionBarContributor\">\n+ </editor>\n+ </extension>\n+\n+ <extension point=\"org.eclipse.ui.newWizards\">\n+ <!-- @generated entity -->\n+ <category\n+ id=\"org.eclipse.emf.ecore.Wizard.category.ID\"\n+ name=\"%_UI_Wizard_category\"/>\n+ <wizard\n+ id=\"org.obeonetwork.dsl.entity.extensionUtilities.presentation.ExtensionUtilitiesModelWizardID\"\n+ name=\"%_UI_ExtensionUtilitiesModelWizard_label\"\n+ class=\"org.obeonetwork.dsl.entity.extensionUtilities.presentation.ExtensionUtilitiesModelWizard\"\n+ category=\"org.eclipse.emf.ecore.Wizard.category.ID\"\n+ icon=\"icons/full/obj16/ExtensionUtilitiesModelFile.gif\">\n+ <description>%_UI_ExtensionUtilitiesModelWizard_description</description>\n+ <selection class=\"org.eclipse.core.resources.IResource\"/>\n+ </wizard>\n+ </extension>\n+\n+null</plugin>", "raw_url": "https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.editor%2Fplugin.xml", "sha": "cbf5ef13dc1987b81aea2befdee5b03786a9cf77", "status": "modified" }, { "additions": 40, "blob_url": "https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.editor%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2FextensionUtilities%2Fpresentation%2FExtensionUtilitiesEditor.java", "changes": 76, "contents_url": "https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.editor%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2FextensionUtilities%2Fpresentation%2FExtensionUtilitiesEditor.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6", "deletions": 36, "filename": "models/entity/plugins/org.obeonetwork.dsl.entity.editor/src/org/obeonetwork/dsl/entity/extensionUtilities/presentation/ExtensionUtilitiesEditor.java", "new_code": "\tprotected List<PropertySheetPage> propertySheetPages = new ArrayList<PropertySheetPage>();\n\t\t\t\t\tif (propertySheetPages.contains(((PropertySheet)p).getCurrentPage())) {\n\t\t\t\tresourceToDiagnosticMap.remove(target);\n\t\t\t\tif (updateProblemIndication) {\n\t\t\t\t\tgetSite().getShell().getDisplay().asyncExec\n\t\t\t\t\t\t(new Runnable() {\n\t\t\t\t\t\t\t public void run() {\n\t\t\t\t\t\t\t\t updateProblemIndication();\n\t\t\t\t\t\t\t }\n\t\t\t\t\t\t });\n\t\t\t\t}\n\t\t\t\t\t\t\t\treturn false;\n\t\t\t\t\t\t\t\t for (Iterator<PropertySheetPage> i = propertySheetPages.iterator(); i.hasNext(); ) {\n\t\t\t\t\t\t\t\t\t PropertySheetPage propertySheetPage = i.next();\n\t\t\t\t\t\t\t\t\t if (propertySheetPage.getControl().isDisposed()) {\n\t\t\t\t\t\t\t\t\t\t i.remove();\n\t\t\t\t\t\t\t\t\t }\n\t\t\t\t\t\t\t\t\t else {\n\t\t\t\t\t\t\t\t\t\t propertySheetPage.refresh();\n\t\t\t\t\t\t\t\t\t }\n\t\tPropertySheetPage propertySheetPage =\n\t\t\tnew ExtendedPropertySheetPage(editingDomain) {\n\t\t\t\t@Override\n\t\t\t\tpublic void setSelectionToViewer(List<?> selection) {\n\t\t\t\t\tExtensionUtilitiesEditor.this.setSelectionToViewer(selection);\n\t\t\t\t\tExtensionUtilitiesEditor.this.setFocus();\n\t\t\t\t}\n\t\t\t\t@Override\n\t\t\t\tpublic void setActionBars(IActionBars actionBars) {\n\t\t\t\t\tsuper.setActionBars(actionBars);\n\t\t\t\t\tgetActionBarContributor().shareGlobalActions(this, actionBars);\n\t\t\t\t}\n\t\t\t};\n\t\tpropertySheetPage.setPropertySourceProvider(new AdapterFactoryContentProvider(adapterFactory));\n\t\tpropertySheetPages.add(propertySheetPage);\n\t * The implementation uses the URI converter from the editor's resource set to try to open an input stream.\n\t\tList<?> targetObjects = markerHelper.getTargetObjects(editingDomain, marker);\n\t\tif (!targetObjects.isEmpty()) {\n\t\t\tsetSelectionToViewer(targetObjects);\n\t\tfor (PropertySheetPage propertySheetPage : propertySheetPages) {", "new_methods": [ { "arguments": [], "filename": "models/entity/plugins/org.obeonetwork.dsl.entity.editor/src/org/obeonetwork/dsl/entity/extensionUtilities/presentation/ExtensionUtilitiesEditor.java", "implementation": "public void run() {\n\t\t\t\t\t\t\t\t updateProblemIndication();", "signature": "new Runnable()" }, { "arguments": [ "editingDomain" ], "filename": "models/entity/plugins/org.obeonetwork.dsl.entity.editor/src/org/obeonetwork/dsl/entity/extensionUtilities/presentation/ExtensionUtilitiesEditor.java", "implementation": "@Override\n\t\t\t\tpublic void setSelectionToViewer(List<?> selection) {\n\t\t\t\t\tExtensionUtilitiesEditor.this.setSelectionToViewer(selection);\n\t\t\t\t\tExtensionUtilitiesEditor.this.setFocus();", "signature": "new ExtendedPropertySheetPage(editingDomain)" }, { "arguments": [ "IActionBars actionBars" ], "filename": "models/entity/plugins/org.obeonetwork.dsl.entity.editor/src/org/obeonetwork/dsl/entity/extensionUtilities/presentation/ExtensionUtilitiesEditor.java", "implementation": "super.setActionBars(actionBars);\n\t\t\t\t\tgetActionBarContributor().shareGlobalActions(this, actionBars);", "signature": "void setActionBars(IActionBars actionBars)" } ], "old_code": "\tprotected PropertySheetPage propertySheetPage;\n\t\t\t\t\tif (((PropertySheet)p).getCurrentPage() == propertySheetPage) {\n\t\t\t\t\t\t\t\t if (propertySheetPage != null && !propertySheetPage.getControl().isDisposed()) {\n\t\t\t\t\t\t\t\t\t propertySheetPage.refresh();\n\t\tif (propertySheetPage == null) {\n\t\t\tpropertySheetPage =\n\t\t\t\tnew ExtendedPropertySheetPage(editingDomain) {\n\t\t\t\t\t@Override\n\t\t\t\t\tpublic void setSelectionToViewer(List<?> selection) {\n\t\t\t\t\t\tExtensionUtilitiesEditor.this.setSelectionToViewer(selection);\n\t\t\t\t\t\tExtensionUtilitiesEditor.this.setFocus();\n\t\t\t\t\t}\n\t\t\t\t\t@Override\n\t\t\t\t\tpublic void setActionBars(IActionBars actionBars) {\n\t\t\t\t\t\tsuper.setActionBars(actionBars);\n\t\t\t\t\t\tgetActionBarContributor().shareGlobalActions(this, actionBars);\n\t\t\t\t\t}\n\t\t\t\t};\n\t\t\tpropertySheetPage.setPropertySourceProvider(new AdapterFactoryContentProvider(adapterFactory));\n\t\t}\n\t * The implementation uses the URI converter from the editor's resource set to try to open an input stream. \n\t\ttry {\n\t\t\tif (marker.getType().equals(EValidator.MARKER)) {\n\t\t\t\tString uriAttribute = marker.getAttribute(EValidator.URI_ATTRIBUTE, null);\n\t\t\t\tif (uriAttribute != null) {\n\t\t\t\t\tURI uri = URI.createURI(uriAttribute);\n\t\t\t\t\tEObject eObject = editingDomain.getResourceSet().getEObject(uri, true);\n\t\t\t\t\tif (eObject != null) {\n\t\t\t\t\t setSelectionToViewer(Collections.singleton(editingDomain.getWrapper(eObject)));\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\t\tcatch (CoreException exception) {\n\t\t\tEntityEditorPlugin.INSTANCE.log(exception);\n\t\tif (propertySheetPage != null) {", "old_methods": [ { "arguments": [ "editingDomain" ], "filename": "models/entity/plugins/org.obeonetwork.dsl.entity.editor/src/org/obeonetwork/dsl/entity/extensionUtilities/presentation/ExtensionUtilitiesEditor.java", "implementation": "@Override\n\t\t\t\t\tpublic void setSelectionToViewer(List<?> selection) {\n\t\t\t\t\t\tExtensionUtilitiesEditor.this.setSelectionToViewer(selection);\n\t\t\t\t\t\tExtensionUtilitiesEditor.this.setFocus();", "signature": "new ExtendedPropertySheetPage(editingDomain)" }, { "arguments": [ "IActionBars actionBars" ], "filename": "models/entity/plugins/org.obeonetwork.dsl.entity.editor/src/org/obeonetwork/dsl/entity/extensionUtilities/presentation/ExtensionUtilitiesEditor.java", "implementation": "super.setActionBars(actionBars);\n\t\t\t\t\t\tgetActionBarContributor().shareGlobalActions(this, actionBars);", "signature": "void setActionBars(IActionBars actionBars)" } ], "patch": "@@ -195,7 +195,7 @@ public class ExtensionUtilitiesEditor\n \t * <!-- end-user-doc -->\n \t * @generated\n \t */\n-\tprotected PropertySheetPage propertySheetPage;\n+\tprotected List<PropertySheetPage> propertySheetPages = new ArrayList<PropertySheetPage>();\n \n \t/**\n \t * This is the viewer that shadows the selection in the content outline.\n@@ -314,7 +314,7 @@ public void partActivated(IWorkbenchPart p) {\n \t\t\t\t\t}\n \t\t\t\t}\n \t\t\t\telse if (p instanceof PropertySheet) {\n-\t\t\t\t\tif (((PropertySheet)p).getCurrentPage() == propertySheetPage) {\n+\t\t\t\t\tif (propertySheetPages.contains(((PropertySheet)p).getCurrentPage())) {\n \t\t\t\t\t\tgetActionBarContributor().setActiveEditor(ExtensionUtilitiesEditor.this);\n \t\t\t\t\t\thandleActivate();\n \t\t\t\t\t}\n@@ -426,6 +426,15 @@ protected void setTarget(Resource target) {\n \t\t\t@Override\n \t\t\tprotected void unsetTarget(Resource target) {\n \t\t\t\tbasicUnsetTarget(target);\n+\t\t\t\tresourceToDiagnosticMap.remove(target);\n+\t\t\t\tif (updateProblemIndication) {\n+\t\t\t\t\tgetSite().getShell().getDisplay().asyncExec\n+\t\t\t\t\t\t(new Runnable() {\n+\t\t\t\t\t\t\t public void run() {\n+\t\t\t\t\t\t\t\t updateProblemIndication();\n+\t\t\t\t\t\t\t }\n+\t\t\t\t\t\t });\n+\t\t\t\t}\n \t\t\t}\n \t\t};\n \n@@ -459,6 +468,7 @@ else if (!savedResources.remove(resource)) {\n \t\t\t\t\t\t\t\t\t\t}\n \t\t\t\t\t\t\t\t\t}\n \t\t\t\t\t\t\t\t}\n+\t\t\t\t\t\t\t\treturn false;\n \t\t\t\t\t\t\t}\n \n \t\t\t\t\t\t\treturn true;\n@@ -697,8 +707,14 @@ public void run() {\n \t\t\t\t\t\t\t\t if (mostRecentCommand != null) {\n \t\t\t\t\t\t\t\t\t setSelectionToViewer(mostRecentCommand.getAffectedObjects());\n \t\t\t\t\t\t\t\t }\n-\t\t\t\t\t\t\t\t if (propertySheetPage != null && !propertySheetPage.getControl().isDisposed()) {\n-\t\t\t\t\t\t\t\t\t propertySheetPage.refresh();\n+\t\t\t\t\t\t\t\t for (Iterator<PropertySheetPage> i = propertySheetPages.iterator(); i.hasNext(); ) {\n+\t\t\t\t\t\t\t\t\t PropertySheetPage propertySheetPage = i.next();\n+\t\t\t\t\t\t\t\t\t if (propertySheetPage.getControl().isDisposed()) {\n+\t\t\t\t\t\t\t\t\t\t i.remove();\n+\t\t\t\t\t\t\t\t\t }\n+\t\t\t\t\t\t\t\t\t else {\n+\t\t\t\t\t\t\t\t\t\t propertySheetPage.refresh();\n+\t\t\t\t\t\t\t\t\t }\n \t\t\t\t\t\t\t\t }\n \t\t\t\t\t\t\t }\n \t\t\t\t\t\t });\n@@ -1333,23 +1349,22 @@ public void selectionChanged(SelectionChangedEvent event) {\n \t * @generated\n \t */\n \tpublic IPropertySheetPage getPropertySheetPage() {\n-\t\tif (propertySheetPage == null) {\n-\t\t\tpropertySheetPage =\n-\t\t\t\tnew ExtendedPropertySheetPage(editingDomain) {\n-\t\t\t\t\t@Override\n-\t\t\t\t\tpublic void setSelectionToViewer(List<?> selection) {\n-\t\t\t\t\t\tExtensionUtilitiesEditor.this.setSelectionToViewer(selection);\n-\t\t\t\t\t\tExtensionUtilitiesEditor.this.setFocus();\n-\t\t\t\t\t}\n+\t\tPropertySheetPage propertySheetPage =\n+\t\t\tnew ExtendedPropertySheetPage(editingDomain) {\n+\t\t\t\t@Override\n+\t\t\t\tpublic void setSelectionToViewer(List<?> selection) {\n+\t\t\t\t\tExtensionUtilitiesEditor.this.setSelectionToViewer(selection);\n+\t\t\t\t\tExtensionUtilitiesEditor.this.setFocus();\n+\t\t\t\t}\n \n-\t\t\t\t\t@Override\n-\t\t\t\t\tpublic void setActionBars(IActionBars actionBars) {\n-\t\t\t\t\t\tsuper.setActionBars(actionBars);\n-\t\t\t\t\t\tgetActionBarContributor().shareGlobalActions(this, actionBars);\n-\t\t\t\t\t}\n-\t\t\t\t};\n-\t\t\tpropertySheetPage.setPropertySourceProvider(new AdapterFactoryContentProvider(adapterFactory));\n-\t\t}\n+\t\t\t\t@Override\n+\t\t\t\tpublic void setActionBars(IActionBars actionBars) {\n+\t\t\t\t\tsuper.setActionBars(actionBars);\n+\t\t\t\t\tgetActionBarContributor().shareGlobalActions(this, actionBars);\n+\t\t\t\t}\n+\t\t\t};\n+\t\tpropertySheetPage.setPropertySourceProvider(new AdapterFactoryContentProvider(adapterFactory));\n+\t\tpropertySheetPages.add(propertySheetPage);\n \n \t\treturn propertySheetPage;\n \t}\n@@ -1468,7 +1483,7 @@ public void execute(IProgressMonitor monitor) {\n \n \t/**\n \t * This returns whether something has been persisted to the URI of the specified resource.\n-\t * The implementation uses the URI converter from the editor's resource set to try to open an input stream. \n+\t * The implementation uses the URI converter from the editor's resource set to try to open an input stream.\n \t * <!-- begin-user-doc -->\n \t * <!-- end-user-doc -->\n \t * @generated\n@@ -1540,20 +1555,9 @@ protected void doSaveAs(URI uri, IEditorInput editorInput) {\n \t * @generated\n \t */\n \tpublic void gotoMarker(IMarker marker) {\n-\t\ttry {\n-\t\t\tif (marker.getType().equals(EValidator.MARKER)) {\n-\t\t\t\tString uriAttribute = marker.getAttribute(EValidator.URI_ATTRIBUTE, null);\n-\t\t\t\tif (uriAttribute != null) {\n-\t\t\t\t\tURI uri = URI.createURI(uriAttribute);\n-\t\t\t\t\tEObject eObject = editingDomain.getResourceSet().getEObject(uri, true);\n-\t\t\t\t\tif (eObject != null) {\n-\t\t\t\t\t setSelectionToViewer(Collections.singleton(editingDomain.getWrapper(eObject)));\n-\t\t\t\t\t}\n-\t\t\t\t}\n-\t\t\t}\n-\t\t}\n-\t\tcatch (CoreException exception) {\n-\t\t\tEntityEditorPlugin.INSTANCE.log(exception);\n+\t\tList<?> targetObjects = markerHelper.getTargetObjects(editingDomain, marker);\n+\t\tif (!targetObjects.isEmpty()) {\n+\t\t\tsetSelectionToViewer(targetObjects);\n \t\t}\n \t}\n \n@@ -1744,7 +1748,7 @@ public void dispose() {\n \t\t\tgetActionBarContributor().setActiveEditor(null);\n \t\t}\n \n-\t\tif (propertySheetPage != null) {\n+\t\tfor (PropertySheetPage propertySheetPage : propertySheetPages) {\n \t\t\tpropertySheetPage.dispose();\n \t\t}\n ", "raw_url": "https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.editor%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2FextensionUtilities%2Fpresentation%2FExtensionUtilitiesEditor.java", "sha": "4b71ce963c48df0e446b6edc73fa5be0f40d66b2", "status": "modified" }, { "additions": 27, "blob_url": "https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.editor%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fpresentation%2FEntityEditor.java", "changes": 44, "contents_url": "https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.editor%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fpresentation%2FEntityEditor.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6", "deletions": 17, "filename": "models/entity/plugins/org.obeonetwork.dsl.entity.editor/src/org/obeonetwork/dsl/entity/presentation/EntityEditor.java", "new_code": "import java.util.List;\nimport org.eclipse.emf.edit.ui.view.ExtendedPropertySheetPage;\nimport org.eclipse.ui.views.properties.PropertySheetPage;\n\t/**\n\t * This is the property sheet page.\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @generated\n\t */\n\tprotected List<PropertySheetPage> propertySheetPages = new ArrayList<PropertySheetPage>();\n\n\t\t\t\t\tif (propertySheetPages.contains(((PropertySheet)p).getCurrentPage())) {\n\t\t\t\tresourceToDiagnosticMap.remove(target);\n\t\t\t\tif (updateProblemIndication) {\n\t\t\t\t\tgetSite().getShell().getDisplay().asyncExec\n\t\t\t\t\t\t(new Runnable() {\n\t\t\t\t\t\t\t public void run() {\n\t\t\t\t\t\t\t\t updateProblemIndication();\n\t\t\t\t\t\t\t }\n\t\t\t\t\t\t });\n\t\t\t\t}\n\t\t\t\t\t\t\t\treturn false;\n\t * The implementation uses the URI converter from the editor's resource set to try to open an input stream.\n\t\tList<?> targetObjects = markerHelper.getTargetObjects(editingDomain, marker);\n\t\tif (!targetObjects.isEmpty()) {\n\t\t\tsetSelectionToViewer(targetObjects);\n\t\tfor (PropertySheetPage propertySheetPage : propertySheetPages) {", "new_methods": [ { "arguments": [], "filename": "models/entity/plugins/org.obeonetwork.dsl.entity.editor/src/org/obeonetwork/dsl/entity/presentation/EntityEditor.java", "implementation": "public void run() {\n\t\t\t\t\t\t\t\t updateProblemIndication();", "signature": "new Runnable()" } ], "old_code": "\t\t\t\t\tif (((PropertySheet)p).getCurrentPage() == propertySheetPage) {\n\t * The implementation uses the URI converter from the editor's resource set to try to open an input stream. \n\t\ttry {\n\t\t\tif (marker.getType().equals(EValidator.MARKER)) {\n\t\t\t\tString uriAttribute = marker.getAttribute(EValidator.URI_ATTRIBUTE, null);\n\t\t\t\tif (uriAttribute != null) {\n\t\t\t\t\tURI uri = URI.createURI(uriAttribute);\n\t\t\t\t\tEObject eObject = editingDomain.getResourceSet().getEObject(uri, true);\n\t\t\t\t\tif (eObject != null) {\n\t\t\t\t\t setSelectionToViewer(Collections.singleton(editingDomain.getWrapper(eObject)));\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\t\tcatch (CoreException exception) {\n\t\t\tEntityEditorPlugin.INSTANCE.log(exception);\n\t\tif (propertySheetPage != null) {", "old_methods": [], "patch": "@@ -21,6 +21,7 @@\n import java.util.HashMap;\n import java.util.Iterator;\n import java.util.LinkedHashMap;\n+import java.util.List;\n import java.util.Map;\n \n import org.eclipse.core.resources.IFile;\n@@ -71,6 +72,7 @@\n import org.eclipse.emf.edit.ui.provider.UnwrappingSelectionProvider;\n import org.eclipse.emf.edit.ui.util.EditUIMarkerHelper;\n import org.eclipse.emf.edit.ui.util.EditUIUtil;\n+import org.eclipse.emf.edit.ui.view.ExtendedPropertySheetPage;\n import org.eclipse.emf.eef.runtime.ui.notify.OpenWizardOnDoubleClick;\n import org.eclipse.jface.action.IMenuListener;\n import org.eclipse.jface.action.IMenuManager;\n@@ -124,6 +126,7 @@\n import org.eclipse.ui.views.contentoutline.IContentOutlinePage;\n import org.eclipse.ui.views.properties.IPropertySheetPage;\n import org.eclipse.ui.views.properties.PropertySheet;\n+import org.eclipse.ui.views.properties.PropertySheetPage;\n import org.eclipse.ui.views.properties.tabbed.ITabbedPropertySheetPageContributor;\n import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;\n import org.obeonetwork.dsl.entity.extensionUtilities.provider.ExtensionUtilitiesItemProviderAdapterFactory;\n@@ -188,6 +191,14 @@ public class EntityEditor extends MultiPageEditorPart implements\n \t */\n \tprotected TreeViewer contentOutlineViewer;\n \n+\t/**\n+\t * This is the property sheet page.\n+\t * <!-- begin-user-doc -->\n+\t * <!-- end-user-doc -->\n+\t * @generated\n+\t */\n+\tprotected List<PropertySheetPage> propertySheetPages = new ArrayList<PropertySheetPage>();\n+\n \t/**\n \t * This is the property sheet page. <!-- begin-user-doc --> <!--\n \t * end-user-doc -->\n@@ -309,7 +320,7 @@ public void partActivated(IWorkbenchPart p) {\n \t\t\t\t\t}\n \t\t\t\t}\n \t\t\t\telse if (p instanceof PropertySheet) {\n-\t\t\t\t\tif (((PropertySheet)p).getCurrentPage() == propertySheetPage) {\n+\t\t\t\t\tif (propertySheetPages.contains(((PropertySheet)p).getCurrentPage())) {\n \t\t\t\t\t\tgetActionBarContributor().setActiveEditor(EntityEditor.this);\n \t\t\t\t\t\thandleActivate();\n \t\t\t\t\t}\n@@ -419,6 +430,15 @@ protected void setTarget(Resource target) {\n \t\t\t@Override\n \t\t\tprotected void unsetTarget(Resource target) {\n \t\t\t\tbasicUnsetTarget(target);\n+\t\t\t\tresourceToDiagnosticMap.remove(target);\n+\t\t\t\tif (updateProblemIndication) {\n+\t\t\t\t\tgetSite().getShell().getDisplay().asyncExec\n+\t\t\t\t\t\t(new Runnable() {\n+\t\t\t\t\t\t\t public void run() {\n+\t\t\t\t\t\t\t\t updateProblemIndication();\n+\t\t\t\t\t\t\t }\n+\t\t\t\t\t\t });\n+\t\t\t\t}\n \t\t\t}\n \t\t};\n \n@@ -451,6 +471,7 @@ else if (!savedResources.remove(resource)) {\n \t\t\t\t\t\t\t\t\t\t}\n \t\t\t\t\t\t\t\t\t}\n \t\t\t\t\t\t\t\t}\n+\t\t\t\t\t\t\t\treturn false;\n \t\t\t\t\t\t\t}\n \n \t\t\t\t\t\t\treturn true;\n@@ -1449,7 +1470,7 @@ public void execute(IProgressMonitor monitor) {\n \n \t/**\n \t * This returns whether something has been persisted to the URI of the specified resource.\n-\t * The implementation uses the URI converter from the editor's resource set to try to open an input stream. \n+\t * The implementation uses the URI converter from the editor's resource set to try to open an input stream.\n \t * <!-- begin-user-doc\n \t * --> <!-- end-user-doc -->\n \t * @generated\n@@ -1519,20 +1540,9 @@ protected void doSaveAs(URI uri, IEditorInput editorInput) {\n \t * @generated\n \t */\n \tpublic void gotoMarker(IMarker marker) {\n-\t\ttry {\n-\t\t\tif (marker.getType().equals(EValidator.MARKER)) {\n-\t\t\t\tString uriAttribute = marker.getAttribute(EValidator.URI_ATTRIBUTE, null);\n-\t\t\t\tif (uriAttribute != null) {\n-\t\t\t\t\tURI uri = URI.createURI(uriAttribute);\n-\t\t\t\t\tEObject eObject = editingDomain.getResourceSet().getEObject(uri, true);\n-\t\t\t\t\tif (eObject != null) {\n-\t\t\t\t\t setSelectionToViewer(Collections.singleton(editingDomain.getWrapper(eObject)));\n-\t\t\t\t\t}\n-\t\t\t\t}\n-\t\t\t}\n-\t\t}\n-\t\tcatch (CoreException exception) {\n-\t\t\tEntityEditorPlugin.INSTANCE.log(exception);\n+\t\tList<?> targetObjects = markerHelper.getTargetObjects(editingDomain, marker);\n+\t\tif (!targetObjects.isEmpty()) {\n+\t\t\tsetSelectionToViewer(targetObjects);\n \t\t}\n \t}\n \n@@ -1721,7 +1731,7 @@ public void dispose() {\n \t\t\tgetActionBarContributor().setActiveEditor(null);\n \t\t}\n \n-\t\tif (propertySheetPage != null) {\n+\t\tfor (PropertySheetPage propertySheetPage : propertySheetPages) {\n \t\t\tpropertySheetPage.dispose();\n \t\t}\n ", "raw_url": "https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.editor%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fpresentation%2FEntityEditor.java", "sha": "3cabf29196558b7f86423c465af74e1fd09af3d9", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2FMETA-INF%2FMANIFEST.MF", "changes": 1, "contents_url": "https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2FMETA-INF%2FMANIFEST.MF?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6", "deletions": 0, "filename": "models/entity/plugins/org.obeonetwork.dsl.entity/META-INF/MANIFEST.MF", "new_code": " org.eclipse.emf.cdo;visibility:=reexport,", "new_methods": [], "old_code": "", "old_methods": [], "patch": "@@ -15,6 +15,7 @@ Export-Package: org.obeonetwork.dsl.entity,\n org.obeonetwork.dsl.entity.util\n Require-Bundle: org.eclipse.core.runtime,\n org.eclipse.emf.ecore;visibility:=reexport,\n+ org.eclipse.emf.cdo;visibility:=reexport,\n org.eclipse.emf.ecore.xmi;visibility:=reexport,\n org.obeonetwork.dsl.environment;visibility:=reexport\n Bundle-ActivationPolicy: lazy", "raw_url": "https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2FMETA-INF%2FMANIFEST.MF", "sha": "b6669f5cc9f2cbcbf62f971931614879dd45d41b", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fmodel%2Fentity.ecore", "changes": 1, "contents_url": "https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fmodel%2Fentity.ecore?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6", "deletions": 0, "filename": "models/entity/plugins/org.obeonetwork.dsl.entity/model/entity.ecore", "new_code": " <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"name\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString\"/>", "new_methods": [], "old_code": "", "old_methods": [], "patch": "@@ -3,6 +3,7 @@\n xmlns:ecore=\"http://www.eclipse.org/emf/2002/Ecore\" name=\"entity\" nsURI=\"http://www.obeonetwork.org/dsl/entity/3.0.0\"\n nsPrefix=\"oent\">\n <eClassifiers xsi:type=\"ecore:EClass\" name=\"Root\" eSuperTypes=\"../../org.obeonetwork.dsl.environment/model/environment.ecore#//TypesDefinition\">\n+ <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"name\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString\"/>\n <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"namespaces\" upperBound=\"-1\"\n eType=\"ecore:EClass ../../org.obeonetwork.dsl.environment/model/environment.ecore#//Namespace\"\n containment=\"true\"/>", "raw_url": "https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fmodel%2Fentity.ecore", "sha": "09e13314f4c0a117418d7ab00f164b84812d9d99", "status": "modified" }, { "additions": 3, "blob_url": "https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fmodel%2Fentity.genmodel", "changes": 39, "contents_url": "https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fmodel%2Fentity.genmodel?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6", "deletions": 36, "filename": "models/entity/plugins/org.obeonetwork.dsl.entity/model/entity.genmodel", "new_code": " importerID=\"org.eclipse.emf.importer.cdo\" featureDelegation=\"Dynamic\" containmentProxies=\"true\"\n <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute entity.ecore#//Root/name\"/>\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference entity.ecore#//Root/namespaces\"/>", "new_methods": [], "old_code": " importerID=\"org.eclipse.importer.cdo\" featureDelegation=\"Dynamic\" containmentProxies=\"true\"\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference entity.ecore#//Root/blocks\"/>\n </genClasses>\n <genClasses ecoreClass=\"entity.ecore#//Block\">\n <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute entity.ecore#//Block/name\"/>\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference entity.ecore#//Block/entities\"/>\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference entity.ecore#//Block/subblocks\"/>\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference entity.ecore#//Entity/ownedAttributes\"/>\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference entity.ecore#//Entity/ownedReferences\"/>\n <genFeatures notify=\"false\" createChild=\"false\" propertySortChoices=\"true\" ecoreFeature=\"ecore:EReference entity.ecore#//Entity/supertype\"/>\n <genFeatures property=\"None\" notify=\"false\" createChild=\"false\" ecoreFeature=\"ecore:EReference entity.ecore#//Entity/attributes\"/>\n <genFeatures property=\"None\" notify=\"false\" createChild=\"false\" ecoreFeature=\"ecore:EReference entity.ecore#//Entity/references\"/>\n <genFeatures property=\"None\" notify=\"false\" createChild=\"false\" ecoreFeature=\"ecore:EReference entity.ecore#//Entity/properties\"/>\n <genFeatures property=\"None\" notify=\"false\" createChild=\"false\" ecoreFeature=\"ecore:EReference entity.ecore#//Entity/block\"/>\n <genOperations ecoreOperation=\"entity.ecore#//Entity/isSubtypeOf\">\n <genParameters ecoreParameter=\"entity.ecore#//Entity/isSubtypeOf/entity\"/>\n </genOperations>\n </genClasses>\n <genClasses image=\"false\" ecoreClass=\"entity.ecore#//Property\">\n <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute entity.ecore#//Property/name\"/>\n <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute entity.ecore#//Property/multiplicity\"/>\n <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute entity.ecore#//Property/isPrimaryKey\"/>\n </genClasses>\n <genClasses ecoreClass=\"entity.ecore#//Attribute\">\n <genFeatures property=\"None\" notify=\"false\" createChild=\"false\" ecoreFeature=\"ecore:EReference entity.ecore#//Attribute/entity\"/>\n <genFeatures notify=\"false\" createChild=\"false\" propertySortChoices=\"true\" ecoreFeature=\"ecore:EReference entity.ecore#//Attribute/type\"/>\n </genClasses>\n <genClasses ecoreClass=\"entity.ecore#//Reference\">\n <genFeatures property=\"None\" notify=\"false\" createChild=\"false\" ecoreFeature=\"ecore:EReference entity.ecore#//Reference/entity\"/>\n <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute entity.ecore#//Reference/isComposite\"/>\n <genFeatures notify=\"false\" createChild=\"false\" propertySortChoices=\"true\" ecoreFeature=\"ecore:EReference entity.ecore#//Reference/oppositeOf\"/>\n <genFeatures notify=\"false\" createChild=\"false\" propertySortChoices=\"true\" ecoreFeature=\"ecore:EReference entity.ecore#//Reference/type\"/>\n <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute entity.ecore#//Reference/navigable\"/>\n <genOperations ecoreOperation=\"entity.ecore#//Reference/canBeOppositeOf\">\n <genParameters ecoreParameter=\"entity.ecore#//Reference/canBeOppositeOf/opposite\"/>\n </genOperations>", "old_methods": [], "patch": "@@ -3,7 +3,7 @@\n xmlns:genmodel=\"http://www.eclipse.org/emf/2002/GenModel\" copyrightText=\"Copyright (c) 2008-2009 Obeo.&#xA;All rights reserved. This program and the accompanying materials&#xA;are made available under the terms of the Eclipse Public License v1.0&#xA;which accompanies this distribution, and is available at&#xA;http://www.eclipse.org/legal/epl-v10.html&#xA;&#xA;Contributors:&#xA; Obeo - initial API and implementation\"\n modelDirectory=\"/org.obeonetwork.dsl.entity/src\" creationIcons=\"false\" modelPluginID=\"org.obeonetwork.dsl.entity\"\n modelName=\"Entity\" rootExtendsInterface=\"org.eclipse.emf.cdo.CDOObject\" rootExtendsClass=\"org.eclipse.emf.internal.cdo.CDOObjectImpl\"\n- importerID=\"org.eclipse.importer.cdo\" featureDelegation=\"Dynamic\" containmentProxies=\"true\"\n+ importerID=\"org.eclipse.emf.importer.cdo\" featureDelegation=\"Dynamic\" containmentProxies=\"true\"\n complianceLevel=\"5.0\" runtimeVersion=\"2.6\" usedGenPackages=\"../../org.obeonetwork.dsl.environment/model/environment.genmodel#//environment\">\n <foreignModel>entity.ecore</foreignModel>\n <modelPluginVariables>CDO=org.eclipse.emf.cdo</modelPluginVariables>\n@@ -14,48 +14,15 @@\n <genEnumLiterals ecoreEnumLiteral=\"entity.ecore#//InheritanceKind/TABLE_PER_CLASS_HIERARCHY\"/>\n </genEnums>\n <genClasses ecoreClass=\"entity.ecore#//Root\">\n- <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference entity.ecore#//Root/blocks\"/>\n- </genClasses>\n- <genClasses ecoreClass=\"entity.ecore#//Block\">\n- <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute entity.ecore#//Block/name\"/>\n- <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference entity.ecore#//Block/entities\"/>\n- <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference entity.ecore#//Block/subblocks\"/>\n+ <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute entity.ecore#//Root/name\"/>\n+ <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference entity.ecore#//Root/namespaces\"/>\n </genClasses>\n <genClasses ecoreClass=\"entity.ecore#//Entity\">\n- <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference entity.ecore#//Entity/ownedAttributes\"/>\n- <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference entity.ecore#//Entity/ownedReferences\"/>\n- <genFeatures notify=\"false\" createChild=\"false\" propertySortChoices=\"true\" ecoreFeature=\"ecore:EReference entity.ecore#//Entity/supertype\"/>\n- <genFeatures property=\"None\" notify=\"false\" createChild=\"false\" ecoreFeature=\"ecore:EReference entity.ecore#//Entity/attributes\"/>\n- <genFeatures property=\"None\" notify=\"false\" createChild=\"false\" ecoreFeature=\"ecore:EReference entity.ecore#//Entity/references\"/>\n- <genFeatures property=\"None\" notify=\"false\" createChild=\"false\" ecoreFeature=\"ecore:EReference entity.ecore#//Entity/properties\"/>\n <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute entity.ecore#//Entity/estimatedVolumetry\"/>\n <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute entity.ecore#//Entity/estimatedAccess\"/>\n <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute entity.ecore#//Entity/historized\"/>\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference entity.ecore#//Entity/ownedFinders\"/>\n- <genFeatures property=\"None\" notify=\"false\" createChild=\"false\" ecoreFeature=\"ecore:EReference entity.ecore#//Entity/block\"/>\n <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute entity.ecore#//Entity/inheritanceKind\"/>\n- <genOperations ecoreOperation=\"entity.ecore#//Entity/isSubtypeOf\">\n- <genParameters ecoreParameter=\"entity.ecore#//Entity/isSubtypeOf/entity\"/>\n- </genOperations>\n- </genClasses>\n- <genClasses image=\"false\" ecoreClass=\"entity.ecore#//Property\">\n- <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute entity.ecore#//Property/name\"/>\n- <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute entity.ecore#//Property/multiplicity\"/>\n- <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute entity.ecore#//Property/isPrimaryKey\"/>\n- </genClasses>\n- <genClasses ecoreClass=\"entity.ecore#//Attribute\">\n- <genFeatures property=\"None\" notify=\"false\" createChild=\"false\" ecoreFeature=\"ecore:EReference entity.ecore#//Attribute/entity\"/>\n- <genFeatures notify=\"false\" createChild=\"false\" propertySortChoices=\"true\" ecoreFeature=\"ecore:EReference entity.ecore#//Attribute/type\"/>\n- </genClasses>\n- <genClasses ecoreClass=\"entity.ecore#//Reference\">\n- <genFeatures property=\"None\" notify=\"false\" createChild=\"false\" ecoreFeature=\"ecore:EReference entity.ecore#//Reference/entity\"/>\n- <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute entity.ecore#//Reference/isComposite\"/>\n- <genFeatures notify=\"false\" createChild=\"false\" propertySortChoices=\"true\" ecoreFeature=\"ecore:EReference entity.ecore#//Reference/oppositeOf\"/>\n- <genFeatures notify=\"false\" createChild=\"false\" propertySortChoices=\"true\" ecoreFeature=\"ecore:EReference entity.ecore#//Reference/type\"/>\n- <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute entity.ecore#//Reference/navigable\"/>\n- <genOperations ecoreOperation=\"entity.ecore#//Reference/canBeOppositeOf\">\n- <genParameters ecoreParameter=\"entity.ecore#//Reference/canBeOppositeOf/opposite\"/>\n- </genOperations>\n </genClasses>\n <genClasses ecoreClass=\"entity.ecore#//Finder\">\n <genFeatures property=\"Readonly\" createChild=\"false\" ecoreFeature=\"ecore:EAttribute entity.ecore#//Finder/name\"/>", "raw_url": "https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fmodel%2Fentity.genmodel", "sha": "3e2b2ac3b0be4be6b7dd0f11c783104d8caf3cb9", "status": "modified" }, { "additions": 0, "blob_url": "https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2FEntity.java", "changes": 154, "contents_url": "https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2FEntity.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6", "deletions": 154, "filename": "models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/Entity.java", "new_code": "", "new_methods": [], "old_code": " * <li>{@link org.obeonetwork.dsl.entity.Entity#getOwnedAttributes <em>Owned Attributes</em>}</li>\n * <li>{@link org.obeonetwork.dsl.entity.Entity#getOwnedReferences <em>Owned References</em>}</li>\n * <li>{@link org.obeonetwork.dsl.entity.Entity#getSupertype <em>Supertype</em>}</li>\n * <li>{@link org.obeonetwork.dsl.entity.Entity#getAttributes <em>Attributes</em>}</li>\n * <li>{@link org.obeonetwork.dsl.entity.Entity#getReferences <em>References</em>}</li>\n * <li>{@link org.obeonetwork.dsl.entity.Entity#getProperties <em>Properties</em>}</li>\n * <li>{@link org.obeonetwork.dsl.entity.Entity#getBlock <em>Block</em>}</li>\n\t/**\n\t * Returns the value of the '<em><b>Owned Attributes</b></em>' containment reference list.\n\t * The list contents are of type {@link org.obeonetwork.dsl.entity.Attribute}.\n\t * It is bidirectional and its opposite is '{@link org.obeonetwork.dsl.entity.Attribute#getEntity <em>Entity</em>}'.\n\t * <!-- begin-user-doc -->\n\t * <p>\n\t * If the meaning of the '<em>Owned Attributes</em>' containment\n\t * reference list isn't clear, there really should be more of a description\n\t * here...\n\t * </p>\n\t * <!-- end-user-doc -->\n\t * @return the value of the '<em>Owned Attributes</em>' containment reference list.\n\t * @see org.obeonetwork.dsl.entity.EntityPackage#getEntity_OwnedAttributes()\n\t * @see org.obeonetwork.dsl.entity.Attribute#getEntity\n\t * @model opposite=\"entity\" containment=\"true\" resolveProxies=\"true\"\n\t * @generated\n\t */\n\tEList<Attribute> getOwnedAttributes();\n\n\t/**\n\t * Returns the value of the '<em><b>Owned References</b></em>' containment reference list.\n\t * The list contents are of type {@link org.obeonetwork.dsl.entity.Reference}.\n\t * It is bidirectional and its opposite is '{@link org.obeonetwork.dsl.entity.Reference#getEntity <em>Entity</em>}'.\n\t * <!-- begin-user-doc -->\n\t * <p>\n\t * If the meaning of the '<em>Owned References</em>' containment\n\t * reference list isn't clear, there really should be more of a description\n\t * here...\n\t * </p>\n\t * <!-- end-user-doc -->\n\t * @return the value of the '<em>Owned References</em>' containment reference list.\n\t * @see org.obeonetwork.dsl.entity.EntityPackage#getEntity_OwnedReferences()\n\t * @see org.obeonetwork.dsl.entity.Reference#getEntity\n\t * @model opposite=\"entity\" containment=\"true\" resolveProxies=\"true\"\n\t * @generated\n\t */\n\tEList<Reference> getOwnedReferences();\n\n\t/**\n\t * Returns the value of the '<em><b>Supertype</b></em>' reference. <!--\n\t * begin-user-doc -->\n\t * <p>\n\t * If the meaning of the '<em>Supertype</em>' reference isn't clear,\n\t * there really should be more of a description here...\n\t * </p>\n\t * <!-- end-user-doc -->\n\t * \n\t * @return the value of the '<em>Supertype</em>' reference.\n\t * @see #setSupertype(Entity)\n\t * @see org.obeonetwork.dsl.entity.EntityPackage#getEntity_Supertype()\n\t * @model\n\t * @generated\n\t */\n\tEntity getSupertype();\n\n\t/**\n\t * Sets the value of the '{@link org.obeonetwork.dsl.entity.Entity#getSupertype <em>Supertype</em>}' reference.\n\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n\t * @param value the new value of the '<em>Supertype</em>' reference.\n\t * @see #getSupertype()\n\t * @generated\n\t */\n\tvoid setSupertype(Entity value);\n\n\t/**\n\t * Returns the value of the '<em><b>Attributes</b></em>' reference list.\n\t * The list contents are of type {@link org.obeonetwork.dsl.entity.Attribute}.\n\t * <!-- begin-user-doc -->\n\t * <p>\n\t * If the meaning of the '<em>Attributes</em>' reference list isn't\n\t * clear, there really should be more of a description here...\n\t * </p>\n\t * <!-- end-user-doc -->\n\t * @return the value of the '<em>Attributes</em>' reference list.\n\t * @see org.obeonetwork.dsl.entity.EntityPackage#getEntity_Attributes()\n\t * @model transient=\"true\" changeable=\"false\" volatile=\"true\" derived=\"true\"\n\t * @generated\n\t */\n\tEList<Attribute> getAttributes();\n\n\t/**\n\t * Returns the value of the '<em><b>References</b></em>' reference list.\n\t * The list contents are of type {@link org.obeonetwork.dsl.entity.Reference}.\n\t * <!-- begin-user-doc -->\n\t * <p>\n\t * If the meaning of the '<em>References</em>' reference list isn't\n\t * clear, there really should be more of a description here...\n\t * </p>\n\t * <!-- end-user-doc -->\n\t * @return the value of the '<em>References</em>' reference list.\n\t * @see org.obeonetwork.dsl.entity.EntityPackage#getEntity_References()\n\t * @model transient=\"true\" changeable=\"false\" volatile=\"true\" derived=\"true\"\n\t * @generated\n\t */\n\tEList<Reference> getReferences();\n\n\t/**\n\t * Returns the value of the '<em><b>Properties</b></em>' reference list.\n\t * The list contents are of type {@link org.obeonetwork.dsl.entity.Property}.\n\t * <!-- begin-user-doc -->\n\t * <p>\n\t * If the meaning of the '<em>Properties</em>' reference list isn't\n\t * clear, there really should be more of a description here...\n\t * </p>\n\t * <!-- end-user-doc -->\n\t * @return the value of the '<em>Properties</em>' reference list.\n\t * @see org.obeonetwork.dsl.entity.EntityPackage#getEntity_Properties()\n\t * @model transient=\"true\" changeable=\"false\" volatile=\"true\" derived=\"true\"\n\t * @generated\n\t */\n\tEList<Property> getProperties();\n\n\t/**\n\t * Returns the value of the '<em><b>Block</b></em>' container reference.\n\t * It is bidirectional and its opposite is '{@link org.obeonetwork.dsl.entity.Block#getEntities <em>Entities</em>}'.\n\t * <!-- begin-user-doc -->\n\t * <p>\n\t * If the meaning of the '<em>Block</em>' container reference isn't\n\t * clear, there really should be more of a description here...\n\t * </p>\n\t * <!-- end-user-doc -->\n\t * @return the value of the '<em>Block</em>' container reference.\n\t * @see #setBlock(Block)\n\t * @see org.obeonetwork.dsl.entity.EntityPackage#getEntity_Block()\n\t * @see org.obeonetwork.dsl.entity.Block#getEntities\n\t * @model opposite=\"entities\" required=\"true\" transient=\"false\"\n\t * @generated\n\t */\n\tBlock getBlock();\n\n\t/**\n\t * Sets the value of the '{@link org.obeonetwork.dsl.entity.Entity#getBlock <em>Block</em>}' container reference.\n\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n\t * @param value the new value of the '<em>Block</em>' container reference.\n\t * @see #getBlock()\n\t * @generated\n\t */\n\tvoid setBlock(Block value);\n\n\t/**\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @model\n\t * @generated\n\t */\n\tboolean isSubtypeOf(Entity entity);\n", "old_methods": [], "patch": "@@ -22,17 +22,10 @@\n * <p>\n * The following features are supported:\n * <ul>\n- * <li>{@link org.obeonetwork.dsl.entity.Entity#getOwnedAttributes <em>Owned Attributes</em>}</li>\n- * <li>{@link org.obeonetwork.dsl.entity.Entity#getOwnedReferences <em>Owned References</em>}</li>\n- * <li>{@link org.obeonetwork.dsl.entity.Entity#getSupertype <em>Supertype</em>}</li>\n- * <li>{@link org.obeonetwork.dsl.entity.Entity#getAttributes <em>Attributes</em>}</li>\n- * <li>{@link org.obeonetwork.dsl.entity.Entity#getReferences <em>References</em>}</li>\n- * <li>{@link org.obeonetwork.dsl.entity.Entity#getProperties <em>Properties</em>}</li>\n * <li>{@link org.obeonetwork.dsl.entity.Entity#getEstimatedVolumetry <em>Estimated Volumetry</em>}</li>\n * <li>{@link org.obeonetwork.dsl.entity.Entity#getEstimatedAccess <em>Estimated Access</em>}</li>\n * <li>{@link org.obeonetwork.dsl.entity.Entity#isHistorized <em>Historized</em>}</li>\n * <li>{@link org.obeonetwork.dsl.entity.Entity#getOwnedFinders <em>Owned Finders</em>}</li>\n- * <li>{@link org.obeonetwork.dsl.entity.Entity#getBlock <em>Block</em>}</li>\n * <li>{@link org.obeonetwork.dsl.entity.Entity#getInheritanceKind <em>Inheritance Kind</em>}</li>\n * </ul>\n * </p>\n@@ -49,118 +42,6 @@ public interface Entity extends StructuredType {\n \t */\n \tString copyright = \"Copyright (c) 2008-2009 Obeo.\\nAll rights reserved. This program and the accompanying materials\\nare made available under the terms of the Eclipse Public License v1.0\\nwhich accompanies this distribution, and is available at\\nhttp://www.eclipse.org/legal/epl-v10.html\\n\\nContributors:\\n Obeo - initial API and implementation\";\n \n-\t/**\n-\t * Returns the value of the '<em><b>Owned Attributes</b></em>' containment reference list.\n-\t * The list contents are of type {@link org.obeonetwork.dsl.entity.Attribute}.\n-\t * It is bidirectional and its opposite is '{@link org.obeonetwork.dsl.entity.Attribute#getEntity <em>Entity</em>}'.\n-\t * <!-- begin-user-doc -->\n-\t * <p>\n-\t * If the meaning of the '<em>Owned Attributes</em>' containment\n-\t * reference list isn't clear, there really should be more of a description\n-\t * here...\n-\t * </p>\n-\t * <!-- end-user-doc -->\n-\t * @return the value of the '<em>Owned Attributes</em>' containment reference list.\n-\t * @see org.obeonetwork.dsl.entity.EntityPackage#getEntity_OwnedAttributes()\n-\t * @see org.obeonetwork.dsl.entity.Attribute#getEntity\n-\t * @model opposite=\"entity\" containment=\"true\" resolveProxies=\"true\"\n-\t * @generated\n-\t */\n-\tEList<Attribute> getOwnedAttributes();\n-\n-\t/**\n-\t * Returns the value of the '<em><b>Owned References</b></em>' containment reference list.\n-\t * The list contents are of type {@link org.obeonetwork.dsl.entity.Reference}.\n-\t * It is bidirectional and its opposite is '{@link org.obeonetwork.dsl.entity.Reference#getEntity <em>Entity</em>}'.\n-\t * <!-- begin-user-doc -->\n-\t * <p>\n-\t * If the meaning of the '<em>Owned References</em>' containment\n-\t * reference list isn't clear, there really should be more of a description\n-\t * here...\n-\t * </p>\n-\t * <!-- end-user-doc -->\n-\t * @return the value of the '<em>Owned References</em>' containment reference list.\n-\t * @see org.obeonetwork.dsl.entity.EntityPackage#getEntity_OwnedReferences()\n-\t * @see org.obeonetwork.dsl.entity.Reference#getEntity\n-\t * @model opposite=\"entity\" containment=\"true\" resolveProxies=\"true\"\n-\t * @generated\n-\t */\n-\tEList<Reference> getOwnedReferences();\n-\n-\t/**\n-\t * Returns the value of the '<em><b>Supertype</b></em>' reference. <!--\n-\t * begin-user-doc -->\n-\t * <p>\n-\t * If the meaning of the '<em>Supertype</em>' reference isn't clear,\n-\t * there really should be more of a description here...\n-\t * </p>\n-\t * <!-- end-user-doc -->\n-\t * \n-\t * @return the value of the '<em>Supertype</em>' reference.\n-\t * @see #setSupertype(Entity)\n-\t * @see org.obeonetwork.dsl.entity.EntityPackage#getEntity_Supertype()\n-\t * @model\n-\t * @generated\n-\t */\n-\tEntity getSupertype();\n-\n-\t/**\n-\t * Sets the value of the '{@link org.obeonetwork.dsl.entity.Entity#getSupertype <em>Supertype</em>}' reference.\n-\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n-\t * @param value the new value of the '<em>Supertype</em>' reference.\n-\t * @see #getSupertype()\n-\t * @generated\n-\t */\n-\tvoid setSupertype(Entity value);\n-\n-\t/**\n-\t * Returns the value of the '<em><b>Attributes</b></em>' reference list.\n-\t * The list contents are of type {@link org.obeonetwork.dsl.entity.Attribute}.\n-\t * <!-- begin-user-doc -->\n-\t * <p>\n-\t * If the meaning of the '<em>Attributes</em>' reference list isn't\n-\t * clear, there really should be more of a description here...\n-\t * </p>\n-\t * <!-- end-user-doc -->\n-\t * @return the value of the '<em>Attributes</em>' reference list.\n-\t * @see org.obeonetwork.dsl.entity.EntityPackage#getEntity_Attributes()\n-\t * @model transient=\"true\" changeable=\"false\" volatile=\"true\" derived=\"true\"\n-\t * @generated\n-\t */\n-\tEList<Attribute> getAttributes();\n-\n-\t/**\n-\t * Returns the value of the '<em><b>References</b></em>' reference list.\n-\t * The list contents are of type {@link org.obeonetwork.dsl.entity.Reference}.\n-\t * <!-- begin-user-doc -->\n-\t * <p>\n-\t * If the meaning of the '<em>References</em>' reference list isn't\n-\t * clear, there really should be more of a description here...\n-\t * </p>\n-\t * <!-- end-user-doc -->\n-\t * @return the value of the '<em>References</em>' reference list.\n-\t * @see org.obeonetwork.dsl.entity.EntityPackage#getEntity_References()\n-\t * @model transient=\"true\" changeable=\"false\" volatile=\"true\" derived=\"true\"\n-\t * @generated\n-\t */\n-\tEList<Reference> getReferences();\n-\n-\t/**\n-\t * Returns the value of the '<em><b>Properties</b></em>' reference list.\n-\t * The list contents are of type {@link org.obeonetwork.dsl.entity.Property}.\n-\t * <!-- begin-user-doc -->\n-\t * <p>\n-\t * If the meaning of the '<em>Properties</em>' reference list isn't\n-\t * clear, there really should be more of a description here...\n-\t * </p>\n-\t * <!-- end-user-doc -->\n-\t * @return the value of the '<em>Properties</em>' reference list.\n-\t * @see org.obeonetwork.dsl.entity.EntityPackage#getEntity_Properties()\n-\t * @model transient=\"true\" changeable=\"false\" volatile=\"true\" derived=\"true\"\n-\t * @generated\n-\t */\n-\tEList<Property> getProperties();\n-\n \t/**\n \t * Returns the value of the '<em><b>Estimated Volumetry</b></em>' attribute.\n \t * <!-- begin-user-doc -->\n@@ -258,33 +139,6 @@ public interface Entity extends StructuredType {\n \t */\n \tEList<Finder> getOwnedFinders();\n \n-\t/**\n-\t * Returns the value of the '<em><b>Block</b></em>' container reference.\n-\t * It is bidirectional and its opposite is '{@link org.obeonetwork.dsl.entity.Block#getEntities <em>Entities</em>}'.\n-\t * <!-- begin-user-doc -->\n-\t * <p>\n-\t * If the meaning of the '<em>Block</em>' container reference isn't\n-\t * clear, there really should be more of a description here...\n-\t * </p>\n-\t * <!-- end-user-doc -->\n-\t * @return the value of the '<em>Block</em>' container reference.\n-\t * @see #setBlock(Block)\n-\t * @see org.obeonetwork.dsl.entity.EntityPackage#getEntity_Block()\n-\t * @see org.obeonetwork.dsl.entity.Block#getEntities\n-\t * @model opposite=\"entities\" required=\"true\" transient=\"false\"\n-\t * @generated\n-\t */\n-\tBlock getBlock();\n-\n-\t/**\n-\t * Sets the value of the '{@link org.obeonetwork.dsl.entity.Entity#getBlock <em>Block</em>}' container reference.\n-\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n-\t * @param value the new value of the '<em>Block</em>' container reference.\n-\t * @see #getBlock()\n-\t * @generated\n-\t */\n-\tvoid setBlock(Block value);\n-\n \t/**\n \t * Returns the value of the '<em><b>Inheritance Kind</b></em>' attribute.\n \t * The literals are from the enumeration {@link org.obeonetwork.dsl.entity.InheritanceKind}.\n@@ -313,12 +167,4 @@ public interface Entity extends StructuredType {\n \t */\n \tvoid setInheritanceKind(InheritanceKind value);\n \n-\t/**\n-\t * <!-- begin-user-doc -->\n-\t * <!-- end-user-doc -->\n-\t * @model\n-\t * @generated\n-\t */\n-\tboolean isSubtypeOf(Entity entity);\n-\n } // Entity", "raw_url": "https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2FEntity.java", "sha": "d437e6c7d4bafe48f759fae41f1ed0d2a1879f0e", "status": "modified" }, { "additions": 0, "blob_url": "https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2FEntityFactory.java", "changes": 27, "contents_url": "https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2FEntityFactory.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6", "deletions": 27, "filename": "models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/EntityFactory.java", "new_code": "", "new_methods": [], "old_code": "\t/**\n\t * Returns a new object of class '<em>Block</em>'.\n\t * <!-- begin-user-doc\n\t * --> <!-- end-user-doc -->\n\t * @return a new object of class '<em>Block</em>'.\n\t * @generated\n\t */\n\tBlock createBlock();\n\n\t/**\n\t * Returns a new object of class '<em>Attribute</em>'. <!--\n\t * begin-user-doc --> <!-- end-user-doc -->\n\t * \n\t * @return a new object of class '<em>Attribute</em>'.\n\t * @generated\n\t */\n\tAttribute createAttribute();\n\n\t/**\n\t * Returns a new object of class '<em>Reference</em>'. <!--\n\t * begin-user-doc --> <!-- end-user-doc -->\n\t * \n\t * @return a new object of class '<em>Reference</em>'.\n\t * @generated\n\t */\n\tReference createReference();\n", "old_methods": [], "patch": "@@ -44,15 +44,6 @@ public interface EntityFactory extends EFactory {\n \t */\n \tRoot createRoot();\n \n-\t/**\n-\t * Returns a new object of class '<em>Block</em>'.\n-\t * <!-- begin-user-doc\n-\t * --> <!-- end-user-doc -->\n-\t * @return a new object of class '<em>Block</em>'.\n-\t * @generated\n-\t */\n-\tBlock createBlock();\n-\n \t/**\n \t * Returns a new object of class '<em>Entity</em>'.\n \t * <!-- begin-user-doc\n@@ -62,24 +53,6 @@ public interface EntityFactory extends EFactory {\n \t */\n \tEntity createEntity();\n \n-\t/**\n-\t * Returns a new object of class '<em>Attribute</em>'. <!--\n-\t * begin-user-doc --> <!-- end-user-doc -->\n-\t * \n-\t * @return a new object of class '<em>Attribute</em>'.\n-\t * @generated\n-\t */\n-\tAttribute createAttribute();\n-\n-\t/**\n-\t * Returns a new object of class '<em>Reference</em>'. <!--\n-\t * begin-user-doc --> <!-- end-user-doc -->\n-\t * \n-\t * @return a new object of class '<em>Reference</em>'.\n-\t * @generated\n-\t */\n-\tReference createReference();\n-\n \t/**\n \t * Returns a new object of class '<em>Finder</em>'.\n \t * <!-- begin-user-doc", "raw_url": "https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2FEntityFactory.java", "sha": "49f703ef5fe9ca539a7d102490f0e43792a01be8", "status": "modified" }, { "additions": 215, "blob_url": "https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2FEntityPackage.java", "changes": 1349, "contents_url": "https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2FEntityPackage.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6", "deletions": 1134, "filename": "models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/EntityPackage.java", "new_code": "\tString eNS_URI = \"http://www.obeonetwork.org/dsl/entity/3.0.0\";\n\tint ROOT__METADATAS = EnvironmentPackage.TYPES_DEFINITION__METADATAS;\n\tint ROOT__DESCRIPTION = EnvironmentPackage.TYPES_DEFINITION__DESCRIPTION;\n\tint ROOT__KEYWORDS = EnvironmentPackage.TYPES_DEFINITION__KEYWORDS;\n\tint ROOT__BEHAVIOURS = EnvironmentPackage.TYPES_DEFINITION__BEHAVIOURS;\n\tint ROOT__BINDING_REGISTRIES = EnvironmentPackage.TYPES_DEFINITION__BINDING_REGISTRIES;\n\tint ROOT__VERSION = EnvironmentPackage.TYPES_DEFINITION__VERSION;\n\tint ROOT__CREATED_ON = EnvironmentPackage.TYPES_DEFINITION__CREATED_ON;\n\tint ROOT__MODIFIED_ON = EnvironmentPackage.TYPES_DEFINITION__MODIFIED_ON;\n\t * The feature id for the '<em><b>Types</b></em>' containment reference list.\n\tint ROOT__TYPES = EnvironmentPackage.TYPES_DEFINITION__TYPES;\n\t * The feature id for the '<em><b>Name</b></em>' attribute.\n\tint ROOT__NAME = EnvironmentPackage.TYPES_DEFINITION_FEATURE_COUNT + 0;\n\t * The feature id for the '<em><b>Namespaces</b></em>' containment reference list.\n\tint ROOT__NAMESPACES = EnvironmentPackage.TYPES_DEFINITION_FEATURE_COUNT + 1;\n\tint ROOT_FEATURE_COUNT = EnvironmentPackage.TYPES_DEFINITION_FEATURE_COUNT + 2;\n\t * The meta object id for the '{@link org.obeonetwork.dsl.entity.impl.EntityImpl <em>Entity</em>}' class.\n\t * @see org.obeonetwork.dsl.entity.impl.EntityImpl\n\t * @see org.obeonetwork.dsl.entity.impl.EntityPackageImpl#getEntity()\n\tint ENTITY = 1;\n\tint ENTITY__METADATAS = EnvironmentPackage.STRUCTURED_TYPE__METADATAS;\n\tint ENTITY__DESCRIPTION = EnvironmentPackage.STRUCTURED_TYPE__DESCRIPTION;\n\tint ENTITY__KEYWORDS = EnvironmentPackage.STRUCTURED_TYPE__KEYWORDS;\n\tint ENTITY__BEHAVIOURS = EnvironmentPackage.STRUCTURED_TYPE__BEHAVIOURS;\n\tint ENTITY__BINDING_REGISTRIES = EnvironmentPackage.STRUCTURED_TYPE__BINDING_REGISTRIES;\n\tint ENTITY__VERSION = EnvironmentPackage.STRUCTURED_TYPE__VERSION;\n\tint ENTITY__CREATED_ON = EnvironmentPackage.STRUCTURED_TYPE__CREATED_ON;\n\tint ENTITY__MODIFIED_ON = EnvironmentPackage.STRUCTURED_TYPE__MODIFIED_ON;\n\tint ENTITY__NAME = EnvironmentPackage.STRUCTURED_TYPE__NAME;\n\t * The feature id for the '<em><b>Type Definition</b></em>' container reference.\n\tint ENTITY__TYPE_DEFINITION = EnvironmentPackage.STRUCTURED_TYPE__TYPE_DEFINITION;\n\t * The feature id for the '<em><b>Supertype</b></em>' reference. <!--\n\t * begin-user-doc --> <!-- end-user-doc -->\n\t * \n\tint ENTITY__SUPERTYPE = EnvironmentPackage.STRUCTURED_TYPE__SUPERTYPE;\n\t * The feature id for the '<em><b>Associated Types</b></em>' reference list.\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\tint ENTITY__ASSOCIATED_TYPES = EnvironmentPackage.STRUCTURED_TYPE__ASSOCIATED_TYPES;\n\t * The feature id for the '<em><b>Owned Attributes</b></em>' containment reference list.\n\t * @ordered\n\tint ENTITY__OWNED_ATTRIBUTES = EnvironmentPackage.STRUCTURED_TYPE__OWNED_ATTRIBUTES;\n\t * The feature id for the '<em><b>Attributes</b></em>' reference list.\n\tint ENTITY__ATTRIBUTES = EnvironmentPackage.STRUCTURED_TYPE__ATTRIBUTES;\n\t * The feature id for the '<em><b>Owned References</b></em>' containment reference list.\n\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n\tint ENTITY__OWNED_REFERENCES = EnvironmentPackage.STRUCTURED_TYPE__OWNED_REFERENCES;\n\t * The feature id for the '<em><b>References</b></em>' reference list.\n\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n\tint ENTITY__REFERENCES = EnvironmentPackage.STRUCTURED_TYPE__REFERENCES;\n\t * The feature id for the '<em><b>Properties</b></em>' reference list.\n\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n\tint ENTITY__PROPERTIES = EnvironmentPackage.STRUCTURED_TYPE__PROPERTIES;\n\t * The feature id for the '<em><b>Estimated Volumetry</b></em>' attribute.\n\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n\tint ENTITY__ESTIMATED_VOLUMETRY = EnvironmentPackage.STRUCTURED_TYPE_FEATURE_COUNT + 0;\n\t * The feature id for the '<em><b>Estimated Access</b></em>' attribute.\n\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n\tint ENTITY__ESTIMATED_ACCESS = EnvironmentPackage.STRUCTURED_TYPE_FEATURE_COUNT + 1;\n\t * The feature id for the '<em><b>Historized</b></em>' attribute. <!--\n\t * begin-user-doc --> <!-- end-user-doc -->\n\t * \n\tint ENTITY__HISTORIZED = EnvironmentPackage.STRUCTURED_TYPE_FEATURE_COUNT + 2;\n\t * The feature id for the '<em><b>Owned Finders</b></em>' containment reference list.\n\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n\tint ENTITY__OWNED_FINDERS = EnvironmentPackage.STRUCTURED_TYPE_FEATURE_COUNT + 3;\n\t * The feature id for the '<em><b>Inheritance Kind</b></em>' attribute.\n\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n\tint ENTITY__INHERITANCE_KIND = EnvironmentPackage.STRUCTURED_TYPE_FEATURE_COUNT + 4;\n\t * The number of structural features of the '<em>Entity</em>' class.\n\tint ENTITY_FEATURE_COUNT = EnvironmentPackage.STRUCTURED_TYPE_FEATURE_COUNT + 5;\n\t * The meta object id for the '{@link org.obeonetwork.dsl.entity.impl.FinderImpl <em>Finder</em>}' class.\n\t * @see org.obeonetwork.dsl.entity.impl.FinderImpl\n\t * @see org.obeonetwork.dsl.entity.impl.EntityPackageImpl#getFinder()\n\tint FINDER = 2;\n\t * The feature id for the '<em><b>Metadatas</b></em>' containment reference.\n\tint FINDER__METADATAS = EnvironmentPackage.OBEO_DSM_OBJECT__METADATAS;\n\t * The feature id for the '<em><b>Description</b></em>' attribute.\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\tint FINDER__DESCRIPTION = EnvironmentPackage.OBEO_DSM_OBJECT__DESCRIPTION;\n\t * The feature id for the '<em><b>Keywords</b></em>' attribute list.\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\tint FINDER__KEYWORDS = EnvironmentPackage.OBEO_DSM_OBJECT__KEYWORDS;\n\t * The feature id for the '<em><b>Behaviours</b></em>' containment reference list.\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\tint FINDER__BEHAVIOURS = EnvironmentPackage.OBEO_DSM_OBJECT__BEHAVIOURS;\n\t * The feature id for the '<em><b>Binding Registries</b></em>' reference list.\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\tint FINDER__BINDING_REGISTRIES = EnvironmentPackage.OBEO_DSM_OBJECT__BINDING_REGISTRIES;\n\t * The feature id for the '<em><b>Version</b></em>' attribute.\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\tint FINDER__VERSION = EnvironmentPackage.OBEO_DSM_OBJECT__VERSION;\n\t * The feature id for the '<em><b>Created On</b></em>' attribute.\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\tint FINDER__CREATED_ON = EnvironmentPackage.OBEO_DSM_OBJECT__CREATED_ON;\n\t * The feature id for the '<em><b>Modified On</b></em>' attribute.\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @generated\n\t * @ordered\n\t */\n\tint FINDER__MODIFIED_ON = EnvironmentPackage.OBEO_DSM_OBJECT__MODIFIED_ON;\n\n\t/**\n\t * The feature id for the '<em><b>Name</b></em>' attribute. <!--\n\tint FINDER__NAME = EnvironmentPackage.OBEO_DSM_OBJECT_FEATURE_COUNT + 0;\n\t * The feature id for the '<em><b>Entity</b></em>' container reference.\n\tint FINDER__ENTITY = EnvironmentPackage.OBEO_DSM_OBJECT_FEATURE_COUNT + 1;\n\t * The feature id for the '<em><b>Customized Name</b></em>' attribute.\n\tint FINDER__CUSTOMIZED_NAME = EnvironmentPackage.OBEO_DSM_OBJECT_FEATURE_COUNT + 2;\n\t * The feature id for the '<em><b>Criterions</b></em>' containment reference list.\n\tint FINDER__CRITERIONS = EnvironmentPackage.OBEO_DSM_OBJECT_FEATURE_COUNT + 3;\n\t * The feature id for the '<em><b>Multiplicity</b></em>' attribute.\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @generated\n\t * @ordered\n\t */\n\tint FINDER__MULTIPLICITY = EnvironmentPackage.OBEO_DSM_OBJECT_FEATURE_COUNT + 4;\n\n\t/**\n\t * The number of structural features of the '<em>Finder</em>' class.\n\tint FINDER_FEATURE_COUNT = EnvironmentPackage.OBEO_DSM_OBJECT_FEATURE_COUNT + 5;\n\t * The meta object id for the '{@link org.obeonetwork.dsl.entity.impl.CriterionImpl <em>Criterion</em>}' class.\n\t * @see org.obeonetwork.dsl.entity.impl.CriterionImpl\n\t * @see org.obeonetwork.dsl.entity.impl.EntityPackageImpl#getCriterion()\n\tint CRITERION = 4;\n\tint CRITERION__METADATAS = EnvironmentPackage.OBEO_DSM_OBJECT__METADATAS;\n\tint CRITERION__DESCRIPTION = EnvironmentPackage.OBEO_DSM_OBJECT__DESCRIPTION;\n\tint CRITERION__KEYWORDS = EnvironmentPackage.OBEO_DSM_OBJECT__KEYWORDS;\n\tint CRITERION__BEHAVIOURS = EnvironmentPackage.OBEO_DSM_OBJECT__BEHAVIOURS;\n\tint CRITERION__BINDING_REGISTRIES = EnvironmentPackage.OBEO_DSM_OBJECT__BINDING_REGISTRIES;\n\tint CRITERION__VERSION = EnvironmentPackage.OBEO_DSM_OBJECT__VERSION;\n\tint CRITERION__CREATED_ON = EnvironmentPackage.OBEO_DSM_OBJECT__CREATED_ON;\n\tint CRITERION__MODIFIED_ON = EnvironmentPackage.OBEO_DSM_OBJECT__MODIFIED_ON;\n\t * The number of structural features of the '<em>Criterion</em>' class.\n\tint CRITERION_FEATURE_COUNT = EnvironmentPackage.OBEO_DSM_OBJECT_FEATURE_COUNT + 0;\n\t * The meta object id for the '{@link org.obeonetwork.dsl.entity.impl.InternalCriterionImpl <em>Internal Criterion</em>}' class.\n\t * @see org.obeonetwork.dsl.entity.impl.InternalCriterionImpl\n\t * @see org.obeonetwork.dsl.entity.impl.EntityPackageImpl#getInternalCriterion()\n\tint INTERNAL_CRITERION = 3;\n\tint INTERNAL_CRITERION__METADATAS = CRITERION__METADATAS;\n\tint INTERNAL_CRITERION__DESCRIPTION = CRITERION__DESCRIPTION;\n\tint INTERNAL_CRITERION__KEYWORDS = CRITERION__KEYWORDS;\n\tint INTERNAL_CRITERION__BEHAVIOURS = CRITERION__BEHAVIOURS;\n\tint INTERNAL_CRITERION__BINDING_REGISTRIES = CRITERION__BINDING_REGISTRIES;\n\tint INTERNAL_CRITERION__VERSION = CRITERION__VERSION;\n\tint INTERNAL_CRITERION__CREATED_ON = CRITERION__CREATED_ON;\n\tint INTERNAL_CRITERION__MODIFIED_ON = CRITERION__MODIFIED_ON;\n\t * The feature id for the '<em><b>Target</b></em>' reference. <!--\n\tint INTERNAL_CRITERION__TARGET = CRITERION_FEATURE_COUNT + 0;\n\t * The feature id for the '<em><b>Name</b></em>' attribute. <!--\n\tint INTERNAL_CRITERION__NAME = CRITERION_FEATURE_COUNT + 1;\n\t * The number of structural features of the '<em>Internal Criterion</em>' class.\n\tint INTERNAL_CRITERION_FEATURE_COUNT = CRITERION_FEATURE_COUNT + 2;\n\t * The meta object id for the '{@link org.obeonetwork.dsl.entity.impl.ExternalCriterionImpl <em>External Criterion</em>}' class.\n\t * @see org.obeonetwork.dsl.entity.impl.ExternalCriterionImpl\n\t * @see org.obeonetwork.dsl.entity.impl.EntityPackageImpl#getExternalCriterion()\n\tint EXTERNAL_CRITERION = 5;\n\tint EXTERNAL_CRITERION__METADATAS = CRITERION__METADATAS;\n\tint EXTERNAL_CRITERION__DESCRIPTION = CRITERION__DESCRIPTION;\n\tint EXTERNAL_CRITERION__KEYWORDS = CRITERION__KEYWORDS;\n\tint EXTERNAL_CRITERION__BEHAVIOURS = CRITERION__BEHAVIOURS;\n\tint EXTERNAL_CRITERION__BINDING_REGISTRIES = CRITERION__BINDING_REGISTRIES;\n\tint EXTERNAL_CRITERION__VERSION = CRITERION__VERSION;\n\tint EXTERNAL_CRITERION__CREATED_ON = CRITERION__CREATED_ON;\n\tint EXTERNAL_CRITERION__MODIFIED_ON = CRITERION__MODIFIED_ON;\n\tint EXTERNAL_CRITERION__NAME = CRITERION_FEATURE_COUNT + 0;\n\t * The feature id for the '<em><b>Type</b></em>' reference. <!--\n\t * begin-user-doc --> <!-- end-user-doc -->\n\t * \n\t * @ordered\n\tint EXTERNAL_CRITERION__TYPE = CRITERION_FEATURE_COUNT + 1;\n\t * The number of structural features of the '<em>External Criterion</em>' class.\n\t * @ordered\n\tint EXTERNAL_CRITERION_FEATURE_COUNT = CRITERION_FEATURE_COUNT + 2;\n\t * The meta object id for the '{@link org.obeonetwork.dsl.entity.InheritanceKind <em>Inheritance Kind</em>}' enum.\n\t * @see org.obeonetwork.dsl.entity.InheritanceKind\n\t * @see org.obeonetwork.dsl.entity.impl.EntityPackageImpl#getInheritanceKind()\n\tint INHERITANCE_KIND = 6;\n\t * Returns the meta object for class '{@link org.obeonetwork.dsl.entity.Root <em>Root</em>}'.\n\t * @return the meta object for class '<em>Root</em>'.\n\t * @see org.obeonetwork.dsl.entity.Root\n\tEClass getRoot();\n\t * Returns the meta object for the attribute '{@link org.obeonetwork.dsl.entity.Root#getName <em>Name</em>}'.\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @return the meta object for the attribute '<em>Name</em>'.\n\t * @see org.obeonetwork.dsl.entity.Root#getName()\n\t * @see #getRoot()\n\tEAttribute getRoot_Name();\n\t * Returns the meta object for the containment reference list '{@link org.obeonetwork.dsl.entity.Root#getNamespaces <em>Namespaces</em>}'.\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @return the meta object for the containment reference list '<em>Namespaces</em>'.\n\t * @see org.obeonetwork.dsl.entity.Root#getNamespaces()\n\t * @see #getRoot()\n\tEReference getRoot_Namespaces();\n\t * Returns the meta object for class '{@link org.obeonetwork.dsl.entity.Entity <em>Entity</em>}'.\n\t * @return the meta object for class '<em>Entity</em>'.\n\t * @see org.obeonetwork.dsl.entity.Entity\n\tEClass getEntity();\n\t\t * <!-- begin-user-doc -->\n\t\t * <!-- end-user-doc -->\n\t\tEAttribute ROOT__NAME = eINSTANCE.getRoot_Name();\n\t\t * The meta object literal for the '<em><b>Namespaces</b></em>' containment reference list feature.\n\t\t * <!-- begin-user-doc -->\n\t\t * <!-- end-user-doc -->\n\t\tEReference ROOT__NAMESPACES = eINSTANCE.getRoot_Namespaces();", "new_methods": [], "old_code": "\tString eNS_URI = \"http://www.obeonetwork.org/dsl/entity/2.0.0\";\n\tint ROOT__METADATAS = EnvironmentPackage.NAMESPACE__METADATAS;\n\tint ROOT__DESCRIPTION = EnvironmentPackage.NAMESPACE__DESCRIPTION;\n\tint ROOT__KEYWORDS = EnvironmentPackage.NAMESPACE__KEYWORDS;\n\tint ROOT__BEHAVIOURS = EnvironmentPackage.NAMESPACE__BEHAVIOURS;\n\tint ROOT__BINDING_REGISTRIES = EnvironmentPackage.NAMESPACE__BINDING_REGISTRIES;\n\tint ROOT__VERSION = EnvironmentPackage.NAMESPACE__VERSION;\n\tint ROOT__CREATED_ON = EnvironmentPackage.NAMESPACE__CREATED_ON;\n\tint ROOT__MODIFIED_ON = EnvironmentPackage.NAMESPACE__MODIFIED_ON;\n\t * The feature id for the '<em><b>Owned Namespaces</b></em>' containment reference list.\n\tint ROOT__OWNED_NAMESPACES = EnvironmentPackage.NAMESPACE__OWNED_NAMESPACES;\n\t * The feature id for the '<em><b>Owner</b></em>' container reference.\n\tint ROOT__OWNER = EnvironmentPackage.NAMESPACE__OWNER;\n\t * The feature id for the '<em><b>Name</b></em>' attribute.\n\tint ROOT__NAME = EnvironmentPackage.NAMESPACE__NAME;\n\n\t/**\n\t * The feature id for the '<em><b>Blocks</b></em>' containment reference list.\n\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n\t * @generated\n\t * @ordered\n\t */\n\tint ROOT__BLOCKS = EnvironmentPackage.NAMESPACE_FEATURE_COUNT + 0;\n\tint ROOT_FEATURE_COUNT = EnvironmentPackage.NAMESPACE_FEATURE_COUNT + 1;\n\t * The meta object id for the '{@link org.obeonetwork.dsl.entity.impl.BlockImpl <em>Block</em>}' class.\n\t * @see org.obeonetwork.dsl.entity.impl.BlockImpl\n\t * @see org.obeonetwork.dsl.entity.impl.EntityPackageImpl#getBlock()\n\tint BLOCK = 1;\n\tint BLOCK__METADATAS = EnvironmentPackage.OBEO_DSM_OBJECT__METADATAS;\n\tint BLOCK__DESCRIPTION = EnvironmentPackage.OBEO_DSM_OBJECT__DESCRIPTION;\n\tint BLOCK__KEYWORDS = EnvironmentPackage.OBEO_DSM_OBJECT__KEYWORDS;\n\tint BLOCK__BEHAVIOURS = EnvironmentPackage.OBEO_DSM_OBJECT__BEHAVIOURS;\n\tint BLOCK__BINDING_REGISTRIES = EnvironmentPackage.OBEO_DSM_OBJECT__BINDING_REGISTRIES;\n\tint BLOCK__VERSION = EnvironmentPackage.OBEO_DSM_OBJECT__VERSION;\n\tint BLOCK__CREATED_ON = EnvironmentPackage.OBEO_DSM_OBJECT__CREATED_ON;\n\tint BLOCK__MODIFIED_ON = EnvironmentPackage.OBEO_DSM_OBJECT__MODIFIED_ON;\n\tint BLOCK__NAME = EnvironmentPackage.OBEO_DSM_OBJECT_FEATURE_COUNT + 0;\n\t * The feature id for the '<em><b>Entities</b></em>' containment reference list.\n\tint BLOCK__ENTITIES = EnvironmentPackage.OBEO_DSM_OBJECT_FEATURE_COUNT + 1;\n\t * The feature id for the '<em><b>Subblocks</b></em>' containment reference list.\n\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n\tint BLOCK__SUBBLOCKS = EnvironmentPackage.OBEO_DSM_OBJECT_FEATURE_COUNT + 2;\n\t * The number of structural features of the '<em>Block</em>' class. <!--\n\t * begin-user-doc --> <!-- end-user-doc -->\n\t * \n\tint BLOCK_FEATURE_COUNT = EnvironmentPackage.OBEO_DSM_OBJECT_FEATURE_COUNT + 3;\n\t * The meta object id for the '{@link org.obeonetwork.dsl.entity.impl.EntityImpl <em>Entity</em>}' class.\n\t * @see org.obeonetwork.dsl.entity.impl.EntityImpl\n\t * @see org.obeonetwork.dsl.entity.impl.EntityPackageImpl#getEntity()\n\tint ENTITY = 2;\n\t * The feature id for the '<em><b>Metadatas</b></em>' containment reference.\n\tint ENTITY__METADATAS = EnvironmentPackage.STRUCTURED_TYPE__METADATAS;\n\t * The feature id for the '<em><b>Description</b></em>' attribute.\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\tint ENTITY__DESCRIPTION = EnvironmentPackage.STRUCTURED_TYPE__DESCRIPTION;\n\t * The feature id for the '<em><b>Keywords</b></em>' attribute list.\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\tint ENTITY__KEYWORDS = EnvironmentPackage.STRUCTURED_TYPE__KEYWORDS;\n\t * The feature id for the '<em><b>Behaviours</b></em>' containment reference list.\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\tint ENTITY__BEHAVIOURS = EnvironmentPackage.STRUCTURED_TYPE__BEHAVIOURS;\n\t * The feature id for the '<em><b>Binding Registries</b></em>' reference list.\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\tint ENTITY__BINDING_REGISTRIES = EnvironmentPackage.STRUCTURED_TYPE__BINDING_REGISTRIES;\n\t * The feature id for the '<em><b>Version</b></em>' attribute.\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\tint ENTITY__VERSION = EnvironmentPackage.STRUCTURED_TYPE__VERSION;\n\t * The feature id for the '<em><b>Created On</b></em>' attribute.\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\tint ENTITY__CREATED_ON = EnvironmentPackage.STRUCTURED_TYPE__CREATED_ON;\n\t * The feature id for the '<em><b>Modified On</b></em>' attribute.\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\tint ENTITY__MODIFIED_ON = EnvironmentPackage.STRUCTURED_TYPE__MODIFIED_ON;\n\t * The feature id for the '<em><b>Name</b></em>' attribute. <!--\n\t * begin-user-doc --> <!-- end-user-doc -->\n\t * \n\tint ENTITY__NAME = EnvironmentPackage.STRUCTURED_TYPE__NAME;\n\t * The feature id for the '<em><b>Type Definition</b></em>' container reference.\n\tint ENTITY__TYPE_DEFINITION = EnvironmentPackage.STRUCTURED_TYPE__TYPE_DEFINITION;\n\t * The feature id for the '<em><b>Owned Attributes</b></em>' containment reference list.\n\t * @ordered\n\tint ENTITY__OWNED_ATTRIBUTES = EnvironmentPackage.STRUCTURED_TYPE_FEATURE_COUNT + 0;\n\t * The feature id for the '<em><b>Owned References</b></em>' containment reference list.\n\tint ENTITY__OWNED_REFERENCES = EnvironmentPackage.STRUCTURED_TYPE_FEATURE_COUNT + 1;\n\t * The feature id for the '<em><b>Supertype</b></em>' reference. <!--\n\t * begin-user-doc --> <!-- end-user-doc -->\n\t * \n\tint ENTITY__SUPERTYPE = EnvironmentPackage.STRUCTURED_TYPE_FEATURE_COUNT + 2;\n\t * The feature id for the '<em><b>Attributes</b></em>' reference list.\n\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n\tint ENTITY__ATTRIBUTES = EnvironmentPackage.STRUCTURED_TYPE_FEATURE_COUNT + 3;\n\t * The feature id for the '<em><b>References</b></em>' reference list.\n\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n\tint ENTITY__REFERENCES = EnvironmentPackage.STRUCTURED_TYPE_FEATURE_COUNT + 4;\n\t * The feature id for the '<em><b>Properties</b></em>' reference list.\n\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n\tint ENTITY__PROPERTIES = EnvironmentPackage.STRUCTURED_TYPE_FEATURE_COUNT + 5;\n\t * The feature id for the '<em><b>Estimated Volumetry</b></em>' attribute.\n\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n\tint ENTITY__ESTIMATED_VOLUMETRY = EnvironmentPackage.STRUCTURED_TYPE_FEATURE_COUNT + 6;\n\t * The feature id for the '<em><b>Estimated Access</b></em>' attribute.\n\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n\tint ENTITY__ESTIMATED_ACCESS = EnvironmentPackage.STRUCTURED_TYPE_FEATURE_COUNT + 7;\n\t * The feature id for the '<em><b>Historized</b></em>' attribute. <!--\n\tint ENTITY__HISTORIZED = EnvironmentPackage.STRUCTURED_TYPE_FEATURE_COUNT + 8;\n\t * The feature id for the '<em><b>Owned Finders</b></em>' containment reference list.\n\tint ENTITY__OWNED_FINDERS = EnvironmentPackage.STRUCTURED_TYPE_FEATURE_COUNT + 9;\n\t * The feature id for the '<em><b>Block</b></em>' container reference.\n\tint ENTITY__BLOCK = EnvironmentPackage.STRUCTURED_TYPE_FEATURE_COUNT + 10;\n\t * The feature id for the '<em><b>Inheritance Kind</b></em>' attribute.\n\tint ENTITY__INHERITANCE_KIND = EnvironmentPackage.STRUCTURED_TYPE_FEATURE_COUNT + 11;\n\t * The number of structural features of the '<em>Entity</em>' class.\n\tint ENTITY_FEATURE_COUNT = EnvironmentPackage.STRUCTURED_TYPE_FEATURE_COUNT + 12;\n\t * The meta object id for the '{@link org.obeonetwork.dsl.entity.impl.PropertyImpl <em>Property</em>}' class.\n\t * @see org.obeonetwork.dsl.entity.impl.PropertyImpl\n\t * @see org.obeonetwork.dsl.entity.impl.EntityPackageImpl#getProperty()\n\tint PROPERTY = 3;\n\tint PROPERTY__METADATAS = EnvironmentPackage.OBEO_DSM_OBJECT__METADATAS;\n\tint PROPERTY__DESCRIPTION = EnvironmentPackage.OBEO_DSM_OBJECT__DESCRIPTION;\n\tint PROPERTY__KEYWORDS = EnvironmentPackage.OBEO_DSM_OBJECT__KEYWORDS;\n\tint PROPERTY__BEHAVIOURS = EnvironmentPackage.OBEO_DSM_OBJECT__BEHAVIOURS;\n\tint PROPERTY__BINDING_REGISTRIES = EnvironmentPackage.OBEO_DSM_OBJECT__BINDING_REGISTRIES;\n\tint PROPERTY__VERSION = EnvironmentPackage.OBEO_DSM_OBJECT__VERSION;\n\tint PROPERTY__CREATED_ON = EnvironmentPackage.OBEO_DSM_OBJECT__CREATED_ON;\n\tint PROPERTY__MODIFIED_ON = EnvironmentPackage.OBEO_DSM_OBJECT__MODIFIED_ON;\n\n\t/**\n\t * The feature id for the '<em><b>Name</b></em>' attribute. <!--\n\t * begin-user-doc --> <!-- end-user-doc -->\n\t * \n\t * @generated\n\t * @ordered\n\t */\n\tint PROPERTY__NAME = EnvironmentPackage.OBEO_DSM_OBJECT_FEATURE_COUNT + 0;\n\n\t/**\n\t * The feature id for the '<em><b>Multiplicity</b></em>' attribute.\n\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n\t * @generated\n\t * @ordered\n\t */\n\tint PROPERTY__MULTIPLICITY = EnvironmentPackage.OBEO_DSM_OBJECT_FEATURE_COUNT + 1;\n\n\t/**\n\t * The feature id for the '<em><b>Is Primary Key</b></em>' attribute.\n\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n\t * @generated\n\t * @ordered\n\t */\n\tint PROPERTY__IS_PRIMARY_KEY = EnvironmentPackage.OBEO_DSM_OBJECT_FEATURE_COUNT + 2;\n\t * The number of structural features of the '<em>Property</em>' class.\n\tint PROPERTY_FEATURE_COUNT = EnvironmentPackage.OBEO_DSM_OBJECT_FEATURE_COUNT + 3;\n\t * The meta object id for the '{@link org.obeonetwork.dsl.entity.impl.AttributeImpl <em>Attribute</em>}' class.\n\t * @see org.obeonetwork.dsl.entity.impl.AttributeImpl\n\t * @see org.obeonetwork.dsl.entity.impl.EntityPackageImpl#getAttribute()\n\tint ATTRIBUTE = 4;\n\tint ATTRIBUTE__METADATAS = PROPERTY__METADATAS;\n\tint ATTRIBUTE__DESCRIPTION = PROPERTY__DESCRIPTION;\n\tint ATTRIBUTE__KEYWORDS = PROPERTY__KEYWORDS;\n\tint ATTRIBUTE__BEHAVIOURS = PROPERTY__BEHAVIOURS;\n\tint ATTRIBUTE__BINDING_REGISTRIES = PROPERTY__BINDING_REGISTRIES;\n\tint ATTRIBUTE__VERSION = PROPERTY__VERSION;\n\tint ATTRIBUTE__CREATED_ON = PROPERTY__CREATED_ON;\n\tint ATTRIBUTE__MODIFIED_ON = PROPERTY__MODIFIED_ON;\n\t * The feature id for the '<em><b>Name</b></em>' attribute. <!--\n\tint ATTRIBUTE__NAME = PROPERTY__NAME;\n\n\t/**\n\t * The feature id for the '<em><b>Multiplicity</b></em>' attribute.\n\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n\t * @generated\n\t * @ordered\n\t */\n\tint ATTRIBUTE__MULTIPLICITY = PROPERTY__MULTIPLICITY;\n\n\t/**\n\t * The feature id for the '<em><b>Is Primary Key</b></em>' attribute.\n\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n\t * @generated\n\t * @ordered\n\t */\n\tint ATTRIBUTE__IS_PRIMARY_KEY = PROPERTY__IS_PRIMARY_KEY;\n\n\t/**\n\t * The feature id for the '<em><b>Entity</b></em>' container reference.\n\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n\t * @generated\n\t * @ordered\n\t */\n\tint ATTRIBUTE__ENTITY = PROPERTY_FEATURE_COUNT + 0;\n\t * The feature id for the '<em><b>Type</b></em>' reference. <!--\n\tint ATTRIBUTE__TYPE = PROPERTY_FEATURE_COUNT + 1;\n\t * The number of structural features of the '<em>Attribute</em>' class.\n\tint ATTRIBUTE_FEATURE_COUNT = PROPERTY_FEATURE_COUNT + 2;\n\t * The meta object id for the '{@link org.obeonetwork.dsl.entity.impl.ReferenceImpl <em>Reference</em>}' class.\n\t * @see org.obeonetwork.dsl.entity.impl.ReferenceImpl\n\t * @see org.obeonetwork.dsl.entity.impl.EntityPackageImpl#getReference()\n\tint REFERENCE = 5;\n\tint REFERENCE__METADATAS = PROPERTY__METADATAS;\n\tint REFERENCE__DESCRIPTION = PROPERTY__DESCRIPTION;\n\tint REFERENCE__KEYWORDS = PROPERTY__KEYWORDS;\n\tint REFERENCE__BEHAVIOURS = PROPERTY__BEHAVIOURS;\n\tint REFERENCE__BINDING_REGISTRIES = PROPERTY__BINDING_REGISTRIES;\n\tint REFERENCE__VERSION = PROPERTY__VERSION;\n\tint REFERENCE__CREATED_ON = PROPERTY__CREATED_ON;\n\tint REFERENCE__MODIFIED_ON = PROPERTY__MODIFIED_ON;\n\tint REFERENCE__NAME = PROPERTY__NAME;\n\t * The feature id for the '<em><b>Multiplicity</b></em>' attribute.\n\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n\t * @generated\n\t * @ordered\n\t */\n\tint REFERENCE__MULTIPLICITY = PROPERTY__MULTIPLICITY;\n\n\t/**\n\t * The feature id for the '<em><b>Is Primary Key</b></em>' attribute.\n\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n\t * @generated\n\t * @ordered\n\t */\n\tint REFERENCE__IS_PRIMARY_KEY = PROPERTY__IS_PRIMARY_KEY;\n\n\t/**\n\t * The feature id for the '<em><b>Entity</b></em>' container reference.\n\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n\t * @generated\n\t * @ordered\n\t */\n\tint REFERENCE__ENTITY = PROPERTY_FEATURE_COUNT + 0;\n\n\t/**\n\t * The feature id for the '<em><b>Is Composite</b></em>' attribute.\n\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n\t * @generated\n\t * @ordered\n\t */\n\tint REFERENCE__IS_COMPOSITE = PROPERTY_FEATURE_COUNT + 1;\n\n\t/**\n\t * The feature id for the '<em><b>Opposite Of</b></em>' reference. <!--\n\t * begin-user-doc --> <!-- end-user-doc -->\n\t * \n\t * @generated\n\t * @ordered\n\t */\n\tint REFERENCE__OPPOSITE_OF = PROPERTY_FEATURE_COUNT + 2;\n\n\t/**\n\t * The feature id for the '<em><b>Type</b></em>' reference. <!--\n\t * begin-user-doc --> <!-- end-user-doc -->\n\t * \n\t * @generated\n\t * @ordered\n\t */\n\tint REFERENCE__TYPE = PROPERTY_FEATURE_COUNT + 3;\n\n\t/**\n\t * The feature id for the '<em><b>Navigable</b></em>' attribute. <!--\n\t * begin-user-doc --> <!-- end-user-doc -->\n\t * \n\t * @generated\n\t * @ordered\n\t */\n\tint REFERENCE__NAVIGABLE = PROPERTY_FEATURE_COUNT + 4;\n\n\t/**\n\t * The number of structural features of the '<em>Reference</em>' class.\n\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n\t * @generated\n\t * @ordered\n\t */\n\tint REFERENCE_FEATURE_COUNT = PROPERTY_FEATURE_COUNT + 5;\n\n\t/**\n\t * The meta object id for the '{@link org.obeonetwork.dsl.entity.impl.FinderImpl <em>Finder</em>}' class.\n\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n\t * @see org.obeonetwork.dsl.entity.impl.FinderImpl\n\t * @see org.obeonetwork.dsl.entity.impl.EntityPackageImpl#getFinder()\n\t * @generated\n\t */\n\tint FINDER = 6;\n\n\t/**\n\t * The feature id for the '<em><b>Metadatas</b></em>' containment reference.\n\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n\t * @generated\n\t * @ordered\n\t */\n\tint FINDER__METADATAS = EnvironmentPackage.OBEO_DSM_OBJECT__METADATAS;\n\n\t/**\n\t * The feature id for the '<em><b>Description</b></em>' attribute.\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @generated\n\t * @ordered\n\t */\n\tint FINDER__DESCRIPTION = EnvironmentPackage.OBEO_DSM_OBJECT__DESCRIPTION;\n\n\t/**\n\t * The feature id for the '<em><b>Keywords</b></em>' attribute list.\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @generated\n\t * @ordered\n\t */\n\tint FINDER__KEYWORDS = EnvironmentPackage.OBEO_DSM_OBJECT__KEYWORDS;\n\n\t/**\n\t * The feature id for the '<em><b>Behaviours</b></em>' containment reference list.\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @generated\n\t * @ordered\n\t */\n\tint FINDER__BEHAVIOURS = EnvironmentPackage.OBEO_DSM_OBJECT__BEHAVIOURS;\n\n\t/**\n\t * The feature id for the '<em><b>Binding Registries</b></em>' reference list.\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @generated\n\t * @ordered\n\t */\n\tint FINDER__BINDING_REGISTRIES = EnvironmentPackage.OBEO_DSM_OBJECT__BINDING_REGISTRIES;\n\n\t/**\n\t * The feature id for the '<em><b>Version</b></em>' attribute.\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @generated\n\t * @ordered\n\t */\n\tint FINDER__VERSION = EnvironmentPackage.OBEO_DSM_OBJECT__VERSION;\n\n\t/**\n\t * The feature id for the '<em><b>Created On</b></em>' attribute.\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @generated\n\t * @ordered\n\t */\n\tint FINDER__CREATED_ON = EnvironmentPackage.OBEO_DSM_OBJECT__CREATED_ON;\n\n\t/**\n\t * The feature id for the '<em><b>Modified On</b></em>' attribute.\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @generated\n\t * @ordered\n\t */\n\tint FINDER__MODIFIED_ON = EnvironmentPackage.OBEO_DSM_OBJECT__MODIFIED_ON;\n\n\t/**\n\t * The feature id for the '<em><b>Name</b></em>' attribute. <!--\n\t * begin-user-doc --> <!-- end-user-doc -->\n\t * \n\t * @generated\n\t * @ordered\n\t */\n\tint FINDER__NAME = EnvironmentPackage.OBEO_DSM_OBJECT_FEATURE_COUNT + 0;\n\n\t/**\n\t * The feature id for the '<em><b>Entity</b></em>' container reference.\n\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n\t * @generated\n\t * @ordered\n\t */\n\tint FINDER__ENTITY = EnvironmentPackage.OBEO_DSM_OBJECT_FEATURE_COUNT + 1;\n\n\t/**\n\t * The feature id for the '<em><b>Customized Name</b></em>' attribute.\n\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n\t * @generated\n\t * @ordered\n\t */\n\tint FINDER__CUSTOMIZED_NAME = EnvironmentPackage.OBEO_DSM_OBJECT_FEATURE_COUNT + 2;\n\n\t/**\n\t * The feature id for the '<em><b>Criterions</b></em>' containment reference list.\n\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n\t * @generated\n\t * @ordered\n\t */\n\tint FINDER__CRITERIONS = EnvironmentPackage.OBEO_DSM_OBJECT_FEATURE_COUNT + 3;\n\n\t/**\n\t * The feature id for the '<em><b>Multiplicity</b></em>' attribute.\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @generated\n\t * @ordered\n\t */\n\tint FINDER__MULTIPLICITY = EnvironmentPackage.OBEO_DSM_OBJECT_FEATURE_COUNT + 4;\n\n\t/**\n\t * The number of structural features of the '<em>Finder</em>' class.\n\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n\t * @generated\n\t * @ordered\n\t */\n\tint FINDER_FEATURE_COUNT = EnvironmentPackage.OBEO_DSM_OBJECT_FEATURE_COUNT + 5;\n\n\t/**\n\t * The meta object id for the '{@link org.obeonetwork.dsl.entity.impl.CriterionImpl <em>Criterion</em>}' class.\n\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n\t * @see org.obeonetwork.dsl.entity.impl.CriterionImpl\n\t * @see org.obeonetwork.dsl.entity.impl.EntityPackageImpl#getCriterion()\n\t * @generated\n\t */\n\tint CRITERION = 8;\n\n\t/**\n\t * The feature id for the '<em><b>Metadatas</b></em>' containment reference.\n\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n\t * @generated\n\t * @ordered\n\t */\n\tint CRITERION__METADATAS = EnvironmentPackage.OBEO_DSM_OBJECT__METADATAS;\n\n\t/**\n\t * The feature id for the '<em><b>Description</b></em>' attribute.\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @generated\n\t * @ordered\n\t */\n\tint CRITERION__DESCRIPTION = EnvironmentPackage.OBEO_DSM_OBJECT__DESCRIPTION;\n\n\t/**\n\t * The feature id for the '<em><b>Keywords</b></em>' attribute list.\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @generated\n\t * @ordered\n\t */\n\tint CRITERION__KEYWORDS = EnvironmentPackage.OBEO_DSM_OBJECT__KEYWORDS;\n\n\t/**\n\t * The feature id for the '<em><b>Behaviours</b></em>' containment reference list.\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @generated\n\t * @ordered\n\t */\n\tint CRITERION__BEHAVIOURS = EnvironmentPackage.OBEO_DSM_OBJECT__BEHAVIOURS;\n\n\t/**\n\t * The feature id for the '<em><b>Binding Registries</b></em>' reference list.\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @generated\n\t * @ordered\n\t */\n\tint CRITERION__BINDING_REGISTRIES = EnvironmentPackage.OBEO_DSM_OBJECT__BINDING_REGISTRIES;\n\n\t/**\n\t * The feature id for the '<em><b>Version</b></em>' attribute.\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @generated\n\t * @ordered\n\t */\n\tint CRITERION__VERSION = EnvironmentPackage.OBEO_DSM_OBJECT__VERSION;\n\n\t/**\n\t * The feature id for the '<em><b>Created On</b></em>' attribute.\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @generated\n\t * @ordered\n\t */\n\tint CRITERION__CREATED_ON = EnvironmentPackage.OBEO_DSM_OBJECT__CREATED_ON;\n\n\t/**\n\t * The feature id for the '<em><b>Modified On</b></em>' attribute.\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @generated\n\t * @ordered\n\t */\n\tint CRITERION__MODIFIED_ON = EnvironmentPackage.OBEO_DSM_OBJECT__MODIFIED_ON;\n\n\t/**\n\t * The number of structural features of the '<em>Criterion</em>' class.\n\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n\t * @generated\n\t * @ordered\n\t */\n\tint CRITERION_FEATURE_COUNT = EnvironmentPackage.OBEO_DSM_OBJECT_FEATURE_COUNT + 0;\n\n\t/**\n\t * The meta object id for the '{@link org.obeonetwork.dsl.entity.impl.InternalCriterionImpl <em>Internal Criterion</em>}' class.\n\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n\t * @see org.obeonetwork.dsl.entity.impl.InternalCriterionImpl\n\t * @see org.obeonetwork.dsl.entity.impl.EntityPackageImpl#getInternalCriterion()\n\t * @generated\n\t */\n\tint INTERNAL_CRITERION = 7;\n\n\t/**\n\t * The feature id for the '<em><b>Metadatas</b></em>' containment reference.\n\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n\t * @generated\n\t * @ordered\n\t */\n\tint INTERNAL_CRITERION__METADATAS = CRITERION__METADATAS;\n\n\t/**\n\t * The feature id for the '<em><b>Description</b></em>' attribute.\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @generated\n\t * @ordered\n\t */\n\tint INTERNAL_CRITERION__DESCRIPTION = CRITERION__DESCRIPTION;\n\n\t/**\n\t * The feature id for the '<em><b>Keywords</b></em>' attribute list.\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @generated\n\t * @ordered\n\t */\n\tint INTERNAL_CRITERION__KEYWORDS = CRITERION__KEYWORDS;\n\n\t/**\n\t * The feature id for the '<em><b>Behaviours</b></em>' containment reference list.\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @generated\n\t * @ordered\n\t */\n\tint INTERNAL_CRITERION__BEHAVIOURS = CRITERION__BEHAVIOURS;\n\n\t/**\n\t * The feature id for the '<em><b>Binding Registries</b></em>' reference list.\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @generated\n\t * @ordered\n\t */\n\tint INTERNAL_CRITERION__BINDING_REGISTRIES = CRITERION__BINDING_REGISTRIES;\n\n\t/**\n\t * The feature id for the '<em><b>Version</b></em>' attribute.\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @generated\n\t * @ordered\n\t */\n\tint INTERNAL_CRITERION__VERSION = CRITERION__VERSION;\n\n\t/**\n\t * The feature id for the '<em><b>Created On</b></em>' attribute.\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @generated\n\t * @ordered\n\t */\n\tint INTERNAL_CRITERION__CREATED_ON = CRITERION__CREATED_ON;\n\n\t/**\n\t * The feature id for the '<em><b>Modified On</b></em>' attribute.\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @generated\n\t * @ordered\n\t */\n\tint INTERNAL_CRITERION__MODIFIED_ON = CRITERION__MODIFIED_ON;\n\n\t/**\n\t * The feature id for the '<em><b>Target</b></em>' reference. <!--\n\t * begin-user-doc --> <!-- end-user-doc -->\n\t * \n\t * @generated\n\t * @ordered\n\t */\n\tint INTERNAL_CRITERION__TARGET = CRITERION_FEATURE_COUNT + 0;\n\n\t/**\n\t * The feature id for the '<em><b>Name</b></em>' attribute. <!--\n\t * begin-user-doc --> <!-- end-user-doc -->\n\t * \n\t * @generated\n\t * @ordered\n\t */\n\tint INTERNAL_CRITERION__NAME = CRITERION_FEATURE_COUNT + 1;\n\n\t/**\n\t * The number of structural features of the '<em>Internal Criterion</em>' class.\n\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n\t * @generated\n\t * @ordered\n\t */\n\tint INTERNAL_CRITERION_FEATURE_COUNT = CRITERION_FEATURE_COUNT + 2;\n\n\t/**\n\t * The meta object id for the '{@link org.obeonetwork.dsl.entity.impl.ExternalCriterionImpl <em>External Criterion</em>}' class.\n\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n\t * @see org.obeonetwork.dsl.entity.impl.ExternalCriterionImpl\n\t * @see org.obeonetwork.dsl.entity.impl.EntityPackageImpl#getExternalCriterion()\n\t * @generated\n\t */\n\tint EXTERNAL_CRITERION = 9;\n\n\t/**\n\t * The feature id for the '<em><b>Metadatas</b></em>' containment reference.\n\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n\t * @generated\n\t * @ordered\n\t */\n\tint EXTERNAL_CRITERION__METADATAS = CRITERION__METADATAS;\n\n\t/**\n\t * The feature id for the '<em><b>Description</b></em>' attribute.\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @generated\n\t * @ordered\n\t */\n\tint EXTERNAL_CRITERION__DESCRIPTION = CRITERION__DESCRIPTION;\n\n\t/**\n\t * The feature id for the '<em><b>Keywords</b></em>' attribute list.\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @generated\n\t * @ordered\n\t */\n\tint EXTERNAL_CRITERION__KEYWORDS = CRITERION__KEYWORDS;\n\n\t/**\n\t * The feature id for the '<em><b>Behaviours</b></em>' containment reference list.\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @generated\n\t * @ordered\n\t */\n\tint EXTERNAL_CRITERION__BEHAVIOURS = CRITERION__BEHAVIOURS;\n\n\t/**\n\t * The feature id for the '<em><b>Binding Registries</b></em>' reference list.\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @generated\n\t * @ordered\n\t */\n\tint EXTERNAL_CRITERION__BINDING_REGISTRIES = CRITERION__BINDING_REGISTRIES;\n\n\t/**\n\t * The feature id for the '<em><b>Version</b></em>' attribute.\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @generated\n\t * @ordered\n\t */\n\tint EXTERNAL_CRITERION__VERSION = CRITERION__VERSION;\n\n\t/**\n\t * The feature id for the '<em><b>Created On</b></em>' attribute.\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @generated\n\t * @ordered\n\t */\n\tint EXTERNAL_CRITERION__CREATED_ON = CRITERION__CREATED_ON;\n\n\t/**\n\t * The feature id for the '<em><b>Modified On</b></em>' attribute.\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @generated\n\t * @ordered\n\t */\n\tint EXTERNAL_CRITERION__MODIFIED_ON = CRITERION__MODIFIED_ON;\n\n\t/**\n\t * The feature id for the '<em><b>Name</b></em>' attribute. <!--\n\t * begin-user-doc --> <!-- end-user-doc -->\n\t * \n\t * @generated\n\t * @ordered\n\t */\n\tint EXTERNAL_CRITERION__NAME = CRITERION_FEATURE_COUNT + 0;\n\n\t/**\n\t * The feature id for the '<em><b>Type</b></em>' reference. <!--\n\t * begin-user-doc --> <!-- end-user-doc -->\n\t * \n\t * @generated\n\t * @ordered\n\t */\n\tint EXTERNAL_CRITERION__TYPE = CRITERION_FEATURE_COUNT + 1;\n\n\t/**\n\t * The number of structural features of the '<em>External Criterion</em>' class.\n\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n\t * @generated\n\t * @ordered\n\t */\n\tint EXTERNAL_CRITERION_FEATURE_COUNT = CRITERION_FEATURE_COUNT + 2;\n\n\t/**\n\t * The meta object id for the '{@link org.obeonetwork.dsl.entity.InheritanceKind <em>Inheritance Kind</em>}' enum.\n\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n\t * @see org.obeonetwork.dsl.entity.InheritanceKind\n\t * @see org.obeonetwork.dsl.entity.impl.EntityPackageImpl#getInheritanceKind()\n\t * @generated\n\t */\n\tint INHERITANCE_KIND = 10;\n\n\t/**\n\t * Returns the meta object for class '{@link org.obeonetwork.dsl.entity.Root <em>Root</em>}'.\n\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n\t * @return the meta object for class '<em>Root</em>'.\n\t * @see org.obeonetwork.dsl.entity.Root\n\t * @generated\n\t */\n\tEClass getRoot();\n\n\t/**\n\t * Returns the meta object for the containment reference list '{@link org.obeonetwork.dsl.entity.Root#getBlocks <em>Blocks</em>}'.\n\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n\t * @return the meta object for the containment reference list '<em>Blocks</em>'.\n\t * @see org.obeonetwork.dsl.entity.Root#getBlocks()\n\t * @see #getRoot()\n\t * @generated\n\t */\n\tEReference getRoot_Blocks();\n\n\t/**\n\t * Returns the meta object for class '{@link org.obeonetwork.dsl.entity.Block <em>Block</em>}'.\n\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n\t * @return the meta object for class '<em>Block</em>'.\n\t * @see org.obeonetwork.dsl.entity.Block\n\t * @generated\n\t */\n\tEClass getBlock();\n\n\t/**\n\t * Returns the meta object for the attribute '{@link org.obeonetwork.dsl.entity.Block#getName <em>Name</em>}'.\n\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n\t * @return the meta object for the attribute '<em>Name</em>'.\n\t * @see org.obeonetwork.dsl.entity.Block#getName()\n\t * @see #getBlock()\n\t * @generated\n\t */\n\tEAttribute getBlock_Name();\n\n\t/**\n\t * Returns the meta object for the containment reference list '{@link org.obeonetwork.dsl.entity.Block#getEntities <em>Entities</em>}'.\n\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n\t * @return the meta object for the containment reference list '<em>Entities</em>'.\n\t * @see org.obeonetwork.dsl.entity.Block#getEntities()\n\t * @see #getBlock()\n\t * @generated\n\t */\n\tEReference getBlock_Entities();\n\n\t/**\n\t * Returns the meta object for the containment reference list '{@link org.obeonetwork.dsl.entity.Block#getSubblocks <em>Subblocks</em>}'.\n\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n\t * @return the meta object for the containment reference list '<em>Subblocks</em>'.\n\t * @see org.obeonetwork.dsl.entity.Block#getSubblocks()\n\t * @see #getBlock()\n\t * @generated\n\t */\n\tEReference getBlock_Subblocks();\n\n\t/**\n\t * Returns the meta object for class '{@link org.obeonetwork.dsl.entity.Entity <em>Entity</em>}'.\n\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n\t * @return the meta object for class '<em>Entity</em>'.\n\t * @see org.obeonetwork.dsl.entity.Entity\n\tEClass getEntity();\n\t * Returns the meta object for the containment reference list '{@link org.obeonetwork.dsl.entity.Entity#getOwnedAttributes <em>Owned Attributes</em>}'.\n\t * @return the meta object for the containment reference list '<em>Owned Attributes</em>'.\n\t * @see org.obeonetwork.dsl.entity.Entity#getOwnedAttributes()\n\t * @see #getEntity()\n\tEReference getEntity_OwnedAttributes();\n\t * Returns the meta object for the containment reference list '{@link org.obeonetwork.dsl.entity.Entity#getOwnedReferences <em>Owned References</em>}'.\n\t * @return the meta object for the containment reference list '<em>Owned References</em>'.\n\t * @see org.obeonetwork.dsl.entity.Entity#getOwnedReferences()\n\t * @see #getEntity()\n\tEReference getEntity_OwnedReferences();\n\t * Returns the meta object for the reference '{@link org.obeonetwork.dsl.entity.Entity#getSupertype <em>Supertype</em>}'.\n\t * @return the meta object for the reference '<em>Supertype</em>'.\n\t * @see org.obeonetwork.dsl.entity.Entity#getSupertype()\n\t * @see #getEntity()\n\tEReference getEntity_Supertype();\n\t * Returns the meta object for the reference list '{@link org.obeonetwork.dsl.entity.Entity#getAttributes <em>Attributes</em>}'.\n\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n\t * @return the meta object for the reference list '<em>Attributes</em>'.\n\t * @see org.obeonetwork.dsl.entity.Entity#getAttributes()\n\t * @see #getEntity()\n\tEReference getEntity_Attributes();\n\t * Returns the meta object for the reference list '{@link org.obeonetwork.dsl.entity.Entity#getReferences <em>References</em>}'.\n\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n\t * @return the meta object for the reference list '<em>References</em>'.\n\t * @see org.obeonetwork.dsl.entity.Entity#getReferences()\n\t * @see #getEntity()\n\tEReference getEntity_References();\n\t * Returns the meta object for the reference list '{@link org.obeonetwork.dsl.entity.Entity#getProperties <em>Properties</em>}'.\n\t * @return the meta object for the reference list '<em>Properties</em>'.\n\t * @see org.obeonetwork.dsl.entity.Entity#getProperties()\n\t * @see #getEntity()\n\tEReference getEntity_Properties();\n\t/**\n\t * Returns the meta object for the container reference '{@link org.obeonetwork.dsl.entity.Entity#getBlock <em>Block</em>}'.\n\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n\t * @return the meta object for the container reference '<em>Block</em>'.\n\t * @see org.obeonetwork.dsl.entity.Entity#getBlock()\n\t * @see #getEntity()\n\t * @generated\n\t */\n\tEReference getEntity_Block();\n\n\t/**\n\t * Returns the meta object for class '{@link org.obeonetwork.dsl.entity.Property <em>Property</em>}'.\n\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n\t * @return the meta object for class '<em>Property</em>'.\n\t * @see org.obeonetwork.dsl.entity.Property\n\t * @generated\n\t */\n\tEClass getProperty();\n\n\t/**\n\t * Returns the meta object for the attribute '{@link org.obeonetwork.dsl.entity.Property#getName <em>Name</em>}'.\n\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n\t * @return the meta object for the attribute '<em>Name</em>'.\n\t * @see org.obeonetwork.dsl.entity.Property#getName()\n\t * @see #getProperty()\n\t * @generated\n\t */\n\tEAttribute getProperty_Name();\n\n\t/**\n\t * Returns the meta object for the attribute '{@link org.obeonetwork.dsl.entity.Property#getMultiplicity <em>Multiplicity</em>}'.\n\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n\t * @return the meta object for the attribute '<em>Multiplicity</em>'.\n\t * @see org.obeonetwork.dsl.entity.Property#getMultiplicity()\n\t * @see #getProperty()\n\t * @generated\n\t */\n\tEAttribute getProperty_Multiplicity();\n\n\t/**\n\t * Returns the meta object for the attribute '{@link org.obeonetwork.dsl.entity.Property#isIsPrimaryKey <em>Is Primary Key</em>}'.\n\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n\t * @return the meta object for the attribute '<em>Is Primary Key</em>'.\n\t * @see org.obeonetwork.dsl.entity.Property#isIsPrimaryKey()\n\t * @see #getProperty()\n\t * @generated\n\t */\n\tEAttribute getProperty_IsPrimaryKey();\n\n\t/**\n\t * Returns the meta object for class '{@link org.obeonetwork.dsl.entity.Attribute <em>Attribute</em>}'.\n\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n\t * @return the meta object for class '<em>Attribute</em>'.\n\t * @see org.obeonetwork.dsl.entity.Attribute\n\t * @generated\n\t */\n\tEClass getAttribute();\n\n\t/**\n\t * Returns the meta object for the container reference '{@link org.obeonetwork.dsl.entity.Attribute#getEntity <em>Entity</em>}'.\n\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n\t * @return the meta object for the container reference '<em>Entity</em>'.\n\t * @see org.obeonetwork.dsl.entity.Attribute#getEntity()\n\t * @see #getAttribute()\n\t * @generated\n\t */\n\tEReference getAttribute_Entity();\n\n\t/**\n\t * Returns the meta object for the reference '{@link org.obeonetwork.dsl.entity.Attribute#getType <em>Type</em>}'.\n\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n\t * @return the meta object for the reference '<em>Type</em>'.\n\t * @see org.obeonetwork.dsl.entity.Attribute#getType()\n\t * @see #getAttribute()\n\t * @generated\n\t */\n\tEReference getAttribute_Type();\n\n\t/**\n\t * Returns the meta object for class '{@link org.obeonetwork.dsl.entity.Reference <em>Reference</em>}'.\n\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n\t * @return the meta object for class '<em>Reference</em>'.\n\t * @see org.obeonetwork.dsl.entity.Reference\n\t * @generated\n\t */\n\tEClass getReference();\n\n\t/**\n\t * Returns the meta object for the container reference '{@link org.obeonetwork.dsl.entity.Reference#getEntity <em>Entity</em>}'.\n\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n\t * @return the meta object for the container reference '<em>Entity</em>'.\n\t * @see org.obeonetwork.dsl.entity.Reference#getEntity()\n\t * @see #getReference()\n\t * @generated\n\t */\n\tEReference getReference_Entity();\n\n\t/**\n\t * Returns the meta object for the attribute '{@link org.obeonetwork.dsl.entity.Reference#isIsComposite <em>Is Composite</em>}'.\n\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n\t * @return the meta object for the attribute '<em>Is Composite</em>'.\n\t * @see org.obeonetwork.dsl.entity.Reference#isIsComposite()\n\t * @see #getReference()\n\t * @generated\n\t */\n\tEAttribute getReference_IsComposite();\n\n\t/**\n\t * Returns the meta object for the reference '{@link org.obeonetwork.dsl.entity.Reference#getOppositeOf <em>Opposite Of</em>}'.\n\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n\t * @return the meta object for the reference '<em>Opposite Of</em>'.\n\t * @see org.obeonetwork.dsl.entity.Reference#getOppositeOf()\n\t * @see #getReference()\n\t * @generated\n\t */\n\tEReference getReference_OppositeOf();\n\n\t/**\n\t * Returns the meta object for the reference '{@link org.obeonetwork.dsl.entity.Reference#getType <em>Type</em>}'.\n\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n\t * @return the meta object for the reference '<em>Type</em>'.\n\t * @see org.obeonetwork.dsl.entity.Reference#getType()\n\t * @see #getReference()\n\t * @generated\n\t */\n\tEReference getReference_Type();\n\n\t/**\n\t * Returns the meta object for the attribute '{@link org.obeonetwork.dsl.entity.Reference#isNavigable <em>Navigable</em>}'.\n\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n\t * @return the meta object for the attribute '<em>Navigable</em>'.\n\t * @see org.obeonetwork.dsl.entity.Reference#isNavigable()\n\t * @see #getReference()\n\t * @generated\n\t */\n\tEAttribute getReference_Navigable();\n\n\t\t/**\n\t\t * The meta object literal for the '<em><b>Blocks</b></em>' containment reference list feature.\n\t\t * <!-- begin-user-doc --> <!--\n\t\t * end-user-doc -->\n\t\t * @generated\n\t\t */\n\t\tEReference ROOT__BLOCKS = eINSTANCE.getRoot_Blocks();\n\n\t\t/**\n\t\t * The meta object literal for the '{@link org.obeonetwork.dsl.entity.impl.BlockImpl <em>Block</em>}' class.\n\t\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n\t\t * @see org.obeonetwork.dsl.entity.impl.BlockImpl\n\t\t * @see org.obeonetwork.dsl.entity.impl.EntityPackageImpl#getBlock()\n\t\t * @generated\n\t\t */\n\t\tEClass BLOCK = eINSTANCE.getBlock();\n\n\t\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n\t\t * @generated\n\t\t */\n\t\tEAttribute BLOCK__NAME = eINSTANCE.getBlock_Name();\n\n\t\t/**\n\t\t * The meta object literal for the '<em><b>Entities</b></em>' containment reference list feature.\n\t\t * <!-- begin-user-doc --> <!--\n\t\t * end-user-doc -->\n\t\tEReference BLOCK__ENTITIES = eINSTANCE.getBlock_Entities();\n\t\t * The meta object literal for the '<em><b>Subblocks</b></em>' containment reference list feature.\n\t\t * <!-- begin-user-doc --> <!--\n\t\t * end-user-doc -->\n\t\tEReference BLOCK__SUBBLOCKS = eINSTANCE.getBlock_Subblocks();\n\t\t/**\n\t\t * The meta object literal for the '<em><b>Owned Attributes</b></em>' containment reference list feature.\n\t\t * <!-- begin-user-doc --> <!--\n\t\t * end-user-doc -->\n\t\t * @generated\n\t\t */\n\t\tEReference ENTITY__OWNED_ATTRIBUTES = eINSTANCE.getEntity_OwnedAttributes();\n\n\t\t/**\n\t\t * The meta object literal for the '<em><b>Owned References</b></em>' containment reference list feature.\n\t\t * <!-- begin-user-doc --> <!--\n\t\t * end-user-doc -->\n\t\t * @generated\n\t\t */\n\t\tEReference ENTITY__OWNED_REFERENCES = eINSTANCE.getEntity_OwnedReferences();\n\n\t\t/**\n\t\t * The meta object literal for the '<em><b>Supertype</b></em>' reference feature.\n\t\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n\t\t * @generated\n\t\t */\n\t\tEReference ENTITY__SUPERTYPE = eINSTANCE.getEntity_Supertype();\n\n\t\t/**\n\t\t * The meta object literal for the '<em><b>Attributes</b></em>' reference list feature.\n\t\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n\t\t * @generated\n\t\t */\n\t\tEReference ENTITY__ATTRIBUTES = eINSTANCE.getEntity_Attributes();\n\n\t\t/**\n\t\t * The meta object literal for the '<em><b>References</b></em>' reference list feature.\n\t\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n\t\t * @generated\n\t\t */\n\t\tEReference ENTITY__REFERENCES = eINSTANCE.getEntity_References();\n\n\t\t/**\n\t\t * The meta object literal for the '<em><b>Properties</b></em>' reference list feature.\n\t\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n\t\t * @generated\n\t\t */\n\t\tEReference ENTITY__PROPERTIES = eINSTANCE.getEntity_Properties();\n\n\t\t/**\n\t\t * The meta object literal for the '<em><b>Block</b></em>' container reference feature.\n\t\t * <!-- begin-user-doc --> <!--\n\t\t * end-user-doc -->\n\t\t * @generated\n\t\t */\n\t\tEReference ENTITY__BLOCK = eINSTANCE.getEntity_Block();\n\n\t\t/**\n\t\t * The meta object literal for the '{@link org.obeonetwork.dsl.entity.impl.PropertyImpl <em>Property</em>}' class.\n\t\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n\t\t * @see org.obeonetwork.dsl.entity.impl.PropertyImpl\n\t\t * @see org.obeonetwork.dsl.entity.impl.EntityPackageImpl#getProperty()\n\t\t * @generated\n\t\t */\n\t\tEClass PROPERTY = eINSTANCE.getProperty();\n\n\t\t/**\n\t\t * The meta object literal for the '<em><b>Name</b></em>' attribute feature.\n\t\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n\t\t * @generated\n\t\t */\n\t\tEAttribute PROPERTY__NAME = eINSTANCE.getProperty_Name();\n\n\t\t/**\n\t\t * The meta object literal for the '<em><b>Multiplicity</b></em>' attribute feature.\n\t\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n\t\t * @generated\n\t\t */\n\t\tEAttribute PROPERTY__MULTIPLICITY = eINSTANCE.getProperty_Multiplicity();\n\n\t\t/**\n\t\t * The meta object literal for the '<em><b>Is Primary Key</b></em>' attribute feature.\n\t\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n\t\t * @generated\n\t\t */\n\t\tEAttribute PROPERTY__IS_PRIMARY_KEY = eINSTANCE.getProperty_IsPrimaryKey();\n\n\t\t/**\n\t\t * The meta object literal for the '{@link org.obeonetwork.dsl.entity.impl.AttributeImpl <em>Attribute</em>}' class.\n\t\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n\t\t * @see org.obeonetwork.dsl.entity.impl.AttributeImpl\n\t\t * @see org.obeonetwork.dsl.entity.impl.EntityPackageImpl#getAttribute()\n\t\t * @generated\n\t\t */\n\t\tEClass ATTRIBUTE = eINSTANCE.getAttribute();\n\n\t\t/**\n\t\t * The meta object literal for the '<em><b>Entity</b></em>' container reference feature.\n\t\t * <!-- begin-user-doc --> <!--\n\t\t * end-user-doc -->\n\t\t * @generated\n\t\t */\n\t\tEReference ATTRIBUTE__ENTITY = eINSTANCE.getAttribute_Entity();\n\n\t\t/**\n\t\t * The meta object literal for the '<em><b>Type</b></em>' reference feature.\n\t\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n\t\t * @generated\n\t\t */\n\t\tEReference ATTRIBUTE__TYPE = eINSTANCE.getAttribute_Type();\n\n\t\t/**\n\t\t * The meta object literal for the '{@link org.obeonetwork.dsl.entity.impl.ReferenceImpl <em>Reference</em>}' class.\n\t\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n\t\t * @see org.obeonetwork.dsl.entity.impl.ReferenceImpl\n\t\t * @see org.obeonetwork.dsl.entity.impl.EntityPackageImpl#getReference()\n\t\t * @generated\n\t\t */\n\t\tEClass REFERENCE = eINSTANCE.getReference();\n\n\t\t/**\n\t\t * The meta object literal for the '<em><b>Entity</b></em>' container reference feature.\n\t\t * <!-- begin-user-doc --> <!--\n\t\t * end-user-doc -->\n\t\t * @generated\n\t\t */\n\t\tEReference REFERENCE__ENTITY = eINSTANCE.getReference_Entity();\n\n\t\t/**\n\t\t * The meta object literal for the '<em><b>Is Composite</b></em>' attribute feature.\n\t\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n\t\t * @generated\n\t\t */\n\t\tEAttribute REFERENCE__IS_COMPOSITE = eINSTANCE.getReference_IsComposite();\n\n\t\t/**\n\t\t * The meta object literal for the '<em><b>Opposite Of</b></em>' reference feature.\n\t\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n\t\t * @generated\n\t\t */\n\t\tEReference REFERENCE__OPPOSITE_OF = eINSTANCE.getReference_OppositeOf();\n\n\t\t/**\n\t\t * The meta object literal for the '<em><b>Type</b></em>' reference feature.\n\t\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n\t\t * @generated\n\t\t */\n\t\tEReference REFERENCE__TYPE = eINSTANCE.getReference_Type();\n\n\t\t/**\n\t\t * The meta object literal for the '<em><b>Navigable</b></em>' attribute feature.\n\t\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n\t\t * @generated\n\t\t */\n\t\tEAttribute REFERENCE__NAVIGABLE = eINSTANCE.getReference_Navigable();\n", "old_methods": [], "patch": "@@ -53,7 +53,7 @@ public interface EntityPackage extends EPackage {\n \t * <!-- begin-user-doc --> <!-- end-user-doc -->\n \t * @generated\n \t */\n-\tString eNS_URI = \"http://www.obeonetwork.org/dsl/entity/2.0.0\";\n+\tString eNS_URI = \"http://www.obeonetwork.org/dsl/entity/3.0.0\";\n \n \t/**\n \t * The package namespace name.\n@@ -85,7 +85,7 @@ public interface EntityPackage extends EPackage {\n \t * @generated\n \t * @ordered\n \t */\n-\tint ROOT__METADATAS = EnvironmentPackage.NAMESPACE__METADATAS;\n+\tint ROOT__METADATAS = EnvironmentPackage.TYPES_DEFINITION__METADATAS;\n \n \t/**\n \t * The feature id for the '<em><b>Description</b></em>' attribute.\n@@ -94,7 +94,7 @@ public interface EntityPackage extends EPackage {\n \t * @generated\n \t * @ordered\n \t */\n-\tint ROOT__DESCRIPTION = EnvironmentPackage.NAMESPACE__DESCRIPTION;\n+\tint ROOT__DESCRIPTION = EnvironmentPackage.TYPES_DEFINITION__DESCRIPTION;\n \n \t/**\n \t * The feature id for the '<em><b>Keywords</b></em>' attribute list.\n@@ -103,7 +103,7 @@ public interface EntityPackage extends EPackage {\n \t * @generated\n \t * @ordered\n \t */\n-\tint ROOT__KEYWORDS = EnvironmentPackage.NAMESPACE__KEYWORDS;\n+\tint ROOT__KEYWORDS = EnvironmentPackage.TYPES_DEFINITION__KEYWORDS;\n \n \t/**\n \t * The feature id for the '<em><b>Behaviours</b></em>' containment reference list.\n@@ -112,7 +112,7 @@ public interface EntityPackage extends EPackage {\n \t * @generated\n \t * @ordered\n \t */\n-\tint ROOT__BEHAVIOURS = EnvironmentPackage.NAMESPACE__BEHAVIOURS;\n+\tint ROOT__BEHAVIOURS = EnvironmentPackage.TYPES_DEFINITION__BEHAVIOURS;\n \n \t/**\n \t * The feature id for the '<em><b>Binding Registries</b></em>' reference list.\n@@ -121,7 +121,7 @@ public interface EntityPackage extends EPackage {\n \t * @generated\n \t * @ordered\n \t */\n-\tint ROOT__BINDING_REGISTRIES = EnvironmentPackage.NAMESPACE__BINDING_REGISTRIES;\n+\tint ROOT__BINDING_REGISTRIES = EnvironmentPackage.TYPES_DEFINITION__BINDING_REGISTRIES;\n \n \t/**\n \t * The feature id for the '<em><b>Version</b></em>' attribute.\n@@ -130,7 +130,7 @@ public interface EntityPackage extends EPackage {\n \t * @generated\n \t * @ordered\n \t */\n-\tint ROOT__VERSION = EnvironmentPackage.NAMESPACE__VERSION;\n+\tint ROOT__VERSION = EnvironmentPackage.TYPES_DEFINITION__VERSION;\n \n \t/**\n \t * The feature id for the '<em><b>Created On</b></em>' attribute.\n@@ -139,7 +139,7 @@ public interface EntityPackage extends EPackage {\n \t * @generated\n \t * @ordered\n \t */\n-\tint ROOT__CREATED_ON = EnvironmentPackage.NAMESPACE__CREATED_ON;\n+\tint ROOT__CREATED_ON = EnvironmentPackage.TYPES_DEFINITION__CREATED_ON;\n \n \t/**\n \t * The feature id for the '<em><b>Modified On</b></em>' attribute.\n@@ -148,42 +148,34 @@ public interface EntityPackage extends EPackage {\n \t * @generated\n \t * @ordered\n \t */\n-\tint ROOT__MODIFIED_ON = EnvironmentPackage.NAMESPACE__MODIFIED_ON;\n+\tint ROOT__MODIFIED_ON = EnvironmentPackage.TYPES_DEFINITION__MODIFIED_ON;\n \n \t/**\n-\t * The feature id for the '<em><b>Owned Namespaces</b></em>' containment reference list.\n+\t * The feature id for the '<em><b>Types</b></em>' containment reference list.\n \t * <!-- begin-user-doc -->\n \t * <!-- end-user-doc -->\n \t * @generated\n \t * @ordered\n \t */\n-\tint ROOT__OWNED_NAMESPACES = EnvironmentPackage.NAMESPACE__OWNED_NAMESPACES;\n+\tint ROOT__TYPES = EnvironmentPackage.TYPES_DEFINITION__TYPES;\n \n \t/**\n-\t * The feature id for the '<em><b>Owner</b></em>' container reference.\n+\t * The feature id for the '<em><b>Name</b></em>' attribute.\n \t * <!-- begin-user-doc -->\n \t * <!-- end-user-doc -->\n \t * @generated\n \t * @ordered\n \t */\n-\tint ROOT__OWNER = EnvironmentPackage.NAMESPACE__OWNER;\n+\tint ROOT__NAME = EnvironmentPackage.TYPES_DEFINITION_FEATURE_COUNT + 0;\n \n \t/**\n-\t * The feature id for the '<em><b>Name</b></em>' attribute.\n+\t * The feature id for the '<em><b>Namespaces</b></em>' containment reference list.\n \t * <!-- begin-user-doc -->\n \t * <!-- end-user-doc -->\n \t * @generated\n \t * @ordered\n \t */\n-\tint ROOT__NAME = EnvironmentPackage.NAMESPACE__NAME;\n-\n-\t/**\n-\t * The feature id for the '<em><b>Blocks</b></em>' containment reference list.\n-\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n-\t * @generated\n-\t * @ordered\n-\t */\n-\tint ROOT__BLOCKS = EnvironmentPackage.NAMESPACE_FEATURE_COUNT + 0;\n+\tint ROOT__NAMESPACES = EnvironmentPackage.TYPES_DEFINITION_FEATURE_COUNT + 1;\n \n \t/**\n \t * The number of structural features of the '<em>Root</em>' class. <!--\n@@ -192,24 +184,24 @@ public interface EntityPackage extends EPackage {\n \t * @generated\n \t * @ordered\n \t */\n-\tint ROOT_FEATURE_COUNT = EnvironmentPackage.NAMESPACE_FEATURE_COUNT + 1;\n+\tint ROOT_FEATURE_COUNT = EnvironmentPackage.TYPES_DEFINITION_FEATURE_COUNT + 2;\n \n \t/**\n-\t * The meta object id for the '{@link org.obeonetwork.dsl.entity.impl.BlockImpl <em>Block</em>}' class.\n+\t * The meta object id for the '{@link org.obeonetwork.dsl.entity.impl.EntityImpl <em>Entity</em>}' class.\n \t * <!-- begin-user-doc --> <!-- end-user-doc -->\n-\t * @see org.obeonetwork.dsl.entity.impl.BlockImpl\n-\t * @see org.obeonetwork.dsl.entity.impl.EntityPackageImpl#getBlock()\n+\t * @see org.obeonetwork.dsl.entity.impl.EntityImpl\n+\t * @see org.obeonetwork.dsl.entity.impl.EntityPackageImpl#getEntity()\n \t * @generated\n \t */\n-\tint BLOCK = 1;\n+\tint ENTITY = 1;\n \n \t/**\n \t * The feature id for the '<em><b>Metadatas</b></em>' containment reference.\n \t * <!-- begin-user-doc --> <!-- end-user-doc -->\n \t * @generated\n \t * @ordered\n \t */\n-\tint BLOCK__METADATAS = EnvironmentPackage.OBEO_DSM_OBJECT__METADATAS;\n+\tint ENTITY__METADATAS = EnvironmentPackage.STRUCTURED_TYPE__METADATAS;\n \n \t/**\n \t * The feature id for the '<em><b>Description</b></em>' attribute.\n@@ -218,7 +210,7 @@ public interface EntityPackage extends EPackage {\n \t * @generated\n \t * @ordered\n \t */\n-\tint BLOCK__DESCRIPTION = EnvironmentPackage.OBEO_DSM_OBJECT__DESCRIPTION;\n+\tint ENTITY__DESCRIPTION = EnvironmentPackage.STRUCTURED_TYPE__DESCRIPTION;\n \n \t/**\n \t * The feature id for the '<em><b>Keywords</b></em>' attribute list.\n@@ -227,7 +219,7 @@ public interface EntityPackage extends EPackage {\n \t * @generated\n \t * @ordered\n \t */\n-\tint BLOCK__KEYWORDS = EnvironmentPackage.OBEO_DSM_OBJECT__KEYWORDS;\n+\tint ENTITY__KEYWORDS = EnvironmentPackage.STRUCTURED_TYPE__KEYWORDS;\n \n \t/**\n \t * The feature id for the '<em><b>Behaviours</b></em>' containment reference list.\n@@ -236,7 +228,7 @@ public interface EntityPackage extends EPackage {\n \t * @generated\n \t * @ordered\n \t */\n-\tint BLOCK__BEHAVIOURS = EnvironmentPackage.OBEO_DSM_OBJECT__BEHAVIOURS;\n+\tint ENTITY__BEHAVIOURS = EnvironmentPackage.STRUCTURED_TYPE__BEHAVIOURS;\n \n \t/**\n \t * The feature id for the '<em><b>Binding Registries</b></em>' reference list.\n@@ -245,7 +237,7 @@ public interface EntityPackage extends EPackage {\n \t * @generated\n \t * @ordered\n \t */\n-\tint BLOCK__BINDING_REGISTRIES = EnvironmentPackage.OBEO_DSM_OBJECT__BINDING_REGISTRIES;\n+\tint ENTITY__BINDING_REGISTRIES = EnvironmentPackage.STRUCTURED_TYPE__BINDING_REGISTRIES;\n \n \t/**\n \t * The feature id for the '<em><b>Version</b></em>' attribute.\n@@ -254,7 +246,7 @@ public interface EntityPackage extends EPackage {\n \t * @generated\n \t * @ordered\n \t */\n-\tint BLOCK__VERSION = EnvironmentPackage.OBEO_DSM_OBJECT__VERSION;\n+\tint ENTITY__VERSION = EnvironmentPackage.STRUCTURED_TYPE__VERSION;\n \n \t/**\n \t * The feature id for the '<em><b>Created On</b></em>' attribute.\n@@ -263,7 +255,7 @@ public interface EntityPackage extends EPackage {\n \t * @generated\n \t * @ordered\n \t */\n-\tint BLOCK__CREATED_ON = EnvironmentPackage.OBEO_DSM_OBJECT__CREATED_ON;\n+\tint ENTITY__CREATED_ON = EnvironmentPackage.STRUCTURED_TYPE__CREATED_ON;\n \n \t/**\n \t * The feature id for the '<em><b>Modified On</b></em>' attribute.\n@@ -272,7 +264,7 @@ public interface EntityPackage extends EPackage {\n \t * @generated\n \t * @ordered\n \t */\n-\tint BLOCK__MODIFIED_ON = EnvironmentPackage.OBEO_DSM_OBJECT__MODIFIED_ON;\n+\tint ENTITY__MODIFIED_ON = EnvironmentPackage.STRUCTURED_TYPE__MODIFIED_ON;\n \n \t/**\n \t * The feature id for the '<em><b>Name</b></em>' attribute. <!--\n@@ -281,252 +273,269 @@ public interface EntityPackage extends EPackage {\n \t * @generated\n \t * @ordered\n \t */\n-\tint BLOCK__NAME = EnvironmentPackage.OBEO_DSM_OBJECT_FEATURE_COUNT + 0;\n+\tint ENTITY__NAME = EnvironmentPackage.STRUCTURED_TYPE__NAME;\n \n \t/**\n-\t * The feature id for the '<em><b>Entities</b></em>' containment reference list.\n+\t * The feature id for the '<em><b>Type Definition</b></em>' container reference.\n \t * <!-- begin-user-doc --> <!-- end-user-doc -->\n \t * @generated\n \t * @ordered\n \t */\n-\tint BLOCK__ENTITIES = EnvironmentPackage.OBEO_DSM_OBJECT_FEATURE_COUNT + 1;\n+\tint ENTITY__TYPE_DEFINITION = EnvironmentPackage.STRUCTURED_TYPE__TYPE_DEFINITION;\n \n \t/**\n-\t * The feature id for the '<em><b>Subblocks</b></em>' containment reference list.\n-\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n+\t * The feature id for the '<em><b>Supertype</b></em>' reference. <!--\n+\t * begin-user-doc --> <!-- end-user-doc -->\n+\t * \n \t * @generated\n \t * @ordered\n \t */\n-\tint BLOCK__SUBBLOCKS = EnvironmentPackage.OBEO_DSM_OBJECT_FEATURE_COUNT + 2;\n+\tint ENTITY__SUPERTYPE = EnvironmentPackage.STRUCTURED_TYPE__SUPERTYPE;\n \n \t/**\n-\t * The number of structural features of the '<em>Block</em>' class. <!--\n-\t * begin-user-doc --> <!-- end-user-doc -->\n-\t * \n+\t * The feature id for the '<em><b>Associated Types</b></em>' reference list.\n+\t * <!-- begin-user-doc -->\n+\t * <!-- end-user-doc -->\n \t * @generated\n \t * @ordered\n \t */\n-\tint BLOCK_FEATURE_COUNT = EnvironmentPackage.OBEO_DSM_OBJECT_FEATURE_COUNT + 3;\n+\tint ENTITY__ASSOCIATED_TYPES = EnvironmentPackage.STRUCTURED_TYPE__ASSOCIATED_TYPES;\n \n \t/**\n-\t * The meta object id for the '{@link org.obeonetwork.dsl.entity.impl.EntityImpl <em>Entity</em>}' class.\n+\t * The feature id for the '<em><b>Owned Attributes</b></em>' containment reference list.\n \t * <!-- begin-user-doc --> <!-- end-user-doc -->\n-\t * @see org.obeonetwork.dsl.entity.impl.EntityImpl\n-\t * @see org.obeonetwork.dsl.entity.impl.EntityPackageImpl#getEntity()\n \t * @generated\n+\t * @ordered\n \t */\n-\tint ENTITY = 2;\n+\tint ENTITY__OWNED_ATTRIBUTES = EnvironmentPackage.STRUCTURED_TYPE__OWNED_ATTRIBUTES;\n \n \t/**\n-\t * The feature id for the '<em><b>Metadatas</b></em>' containment reference.\n+\t * The feature id for the '<em><b>Attributes</b></em>' reference list.\n \t * <!-- begin-user-doc --> <!-- end-user-doc -->\n \t * @generated\n \t * @ordered\n \t */\n-\tint ENTITY__METADATAS = EnvironmentPackage.STRUCTURED_TYPE__METADATAS;\n+\tint ENTITY__ATTRIBUTES = EnvironmentPackage.STRUCTURED_TYPE__ATTRIBUTES;\n \n \t/**\n-\t * The feature id for the '<em><b>Description</b></em>' attribute.\n-\t * <!-- begin-user-doc -->\n-\t * <!-- end-user-doc -->\n+\t * The feature id for the '<em><b>Owned References</b></em>' containment reference list.\n+\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n \t * @generated\n \t * @ordered\n \t */\n-\tint ENTITY__DESCRIPTION = EnvironmentPackage.STRUCTURED_TYPE__DESCRIPTION;\n+\tint ENTITY__OWNED_REFERENCES = EnvironmentPackage.STRUCTURED_TYPE__OWNED_REFERENCES;\n \n \t/**\n-\t * The feature id for the '<em><b>Keywords</b></em>' attribute list.\n-\t * <!-- begin-user-doc -->\n-\t * <!-- end-user-doc -->\n+\t * The feature id for the '<em><b>References</b></em>' reference list.\n+\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n \t * @generated\n \t * @ordered\n \t */\n-\tint ENTITY__KEYWORDS = EnvironmentPackage.STRUCTURED_TYPE__KEYWORDS;\n+\tint ENTITY__REFERENCES = EnvironmentPackage.STRUCTURED_TYPE__REFERENCES;\n \n \t/**\n-\t * The feature id for the '<em><b>Behaviours</b></em>' containment reference list.\n-\t * <!-- begin-user-doc -->\n-\t * <!-- end-user-doc -->\n+\t * The feature id for the '<em><b>Properties</b></em>' reference list.\n+\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n \t * @generated\n \t * @ordered\n \t */\n-\tint ENTITY__BEHAVIOURS = EnvironmentPackage.STRUCTURED_TYPE__BEHAVIOURS;\n+\tint ENTITY__PROPERTIES = EnvironmentPackage.STRUCTURED_TYPE__PROPERTIES;\n \n \t/**\n-\t * The feature id for the '<em><b>Binding Registries</b></em>' reference list.\n-\t * <!-- begin-user-doc -->\n-\t * <!-- end-user-doc -->\n+\t * The feature id for the '<em><b>Estimated Volumetry</b></em>' attribute.\n+\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n \t * @generated\n \t * @ordered\n \t */\n-\tint ENTITY__BINDING_REGISTRIES = EnvironmentPackage.STRUCTURED_TYPE__BINDING_REGISTRIES;\n+\tint ENTITY__ESTIMATED_VOLUMETRY = EnvironmentPackage.STRUCTURED_TYPE_FEATURE_COUNT + 0;\n \n \t/**\n-\t * The feature id for the '<em><b>Version</b></em>' attribute.\n-\t * <!-- begin-user-doc -->\n-\t * <!-- end-user-doc -->\n+\t * The feature id for the '<em><b>Estimated Access</b></em>' attribute.\n+\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n \t * @generated\n \t * @ordered\n \t */\n-\tint ENTITY__VERSION = EnvironmentPackage.STRUCTURED_TYPE__VERSION;\n+\tint ENTITY__ESTIMATED_ACCESS = EnvironmentPackage.STRUCTURED_TYPE_FEATURE_COUNT + 1;\n \n \t/**\n-\t * The feature id for the '<em><b>Created On</b></em>' attribute.\n-\t * <!-- begin-user-doc -->\n-\t * <!-- end-user-doc -->\n+\t * The feature id for the '<em><b>Historized</b></em>' attribute. <!--\n+\t * begin-user-doc --> <!-- end-user-doc -->\n+\t * \n \t * @generated\n \t * @ordered\n \t */\n-\tint ENTITY__CREATED_ON = EnvironmentPackage.STRUCTURED_TYPE__CREATED_ON;\n+\tint ENTITY__HISTORIZED = EnvironmentPackage.STRUCTURED_TYPE_FEATURE_COUNT + 2;\n \n \t/**\n-\t * The feature id for the '<em><b>Modified On</b></em>' attribute.\n-\t * <!-- begin-user-doc -->\n-\t * <!-- end-user-doc -->\n+\t * The feature id for the '<em><b>Owned Finders</b></em>' containment reference list.\n+\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n \t * @generated\n \t * @ordered\n \t */\n-\tint ENTITY__MODIFIED_ON = EnvironmentPackage.STRUCTURED_TYPE__MODIFIED_ON;\n+\tint ENTITY__OWNED_FINDERS = EnvironmentPackage.STRUCTURED_TYPE_FEATURE_COUNT + 3;\n \n \t/**\n-\t * The feature id for the '<em><b>Name</b></em>' attribute. <!--\n-\t * begin-user-doc --> <!-- end-user-doc -->\n-\t * \n+\t * The feature id for the '<em><b>Inheritance Kind</b></em>' attribute.\n+\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n \t * @generated\n \t * @ordered\n \t */\n-\tint ENTITY__NAME = EnvironmentPackage.STRUCTURED_TYPE__NAME;\n+\tint ENTITY__INHERITANCE_KIND = EnvironmentPackage.STRUCTURED_TYPE_FEATURE_COUNT + 4;\n \n \t/**\n-\t * The feature id for the '<em><b>Type Definition</b></em>' container reference.\n+\t * The number of structural features of the '<em>Entity</em>' class.\n \t * <!-- begin-user-doc --> <!-- end-user-doc -->\n \t * @generated\n \t * @ordered\n \t */\n-\tint ENTITY__TYPE_DEFINITION = EnvironmentPackage.STRUCTURED_TYPE__TYPE_DEFINITION;\n+\tint ENTITY_FEATURE_COUNT = EnvironmentPackage.STRUCTURED_TYPE_FEATURE_COUNT + 5;\n \n \t/**\n-\t * The feature id for the '<em><b>Owned Attributes</b></em>' containment reference list.\n+\t * The meta object id for the '{@link org.obeonetwork.dsl.entity.impl.FinderImpl <em>Finder</em>}' class.\n \t * <!-- begin-user-doc --> <!-- end-user-doc -->\n+\t * @see org.obeonetwork.dsl.entity.impl.FinderImpl\n+\t * @see org.obeonetwork.dsl.entity.impl.EntityPackageImpl#getFinder()\n \t * @generated\n-\t * @ordered\n \t */\n-\tint ENTITY__OWNED_ATTRIBUTES = EnvironmentPackage.STRUCTURED_TYPE_FEATURE_COUNT + 0;\n+\tint FINDER = 2;\n \n \t/**\n-\t * The feature id for the '<em><b>Owned References</b></em>' containment reference list.\n+\t * The feature id for the '<em><b>Metadatas</b></em>' containment reference.\n \t * <!-- begin-user-doc --> <!-- end-user-doc -->\n \t * @generated\n \t * @ordered\n \t */\n-\tint ENTITY__OWNED_REFERENCES = EnvironmentPackage.STRUCTURED_TYPE_FEATURE_COUNT + 1;\n+\tint FINDER__METADATAS = EnvironmentPackage.OBEO_DSM_OBJECT__METADATAS;\n \n \t/**\n-\t * The feature id for the '<em><b>Supertype</b></em>' reference. <!--\n-\t * begin-user-doc --> <!-- end-user-doc -->\n-\t * \n+\t * The feature id for the '<em><b>Description</b></em>' attribute.\n+\t * <!-- begin-user-doc -->\n+\t * <!-- end-user-doc -->\n \t * @generated\n \t * @ordered\n \t */\n-\tint ENTITY__SUPERTYPE = EnvironmentPackage.STRUCTURED_TYPE_FEATURE_COUNT + 2;\n+\tint FINDER__DESCRIPTION = EnvironmentPackage.OBEO_DSM_OBJECT__DESCRIPTION;\n \n \t/**\n-\t * The feature id for the '<em><b>Attributes</b></em>' reference list.\n-\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n+\t * The feature id for the '<em><b>Keywords</b></em>' attribute list.\n+\t * <!-- begin-user-doc -->\n+\t * <!-- end-user-doc -->\n \t * @generated\n \t * @ordered\n \t */\n-\tint ENTITY__ATTRIBUTES = EnvironmentPackage.STRUCTURED_TYPE_FEATURE_COUNT + 3;\n+\tint FINDER__KEYWORDS = EnvironmentPackage.OBEO_DSM_OBJECT__KEYWORDS;\n \n \t/**\n-\t * The feature id for the '<em><b>References</b></em>' reference list.\n-\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n+\t * The feature id for the '<em><b>Behaviours</b></em>' containment reference list.\n+\t * <!-- begin-user-doc -->\n+\t * <!-- end-user-doc -->\n \t * @generated\n \t * @ordered\n \t */\n-\tint ENTITY__REFERENCES = EnvironmentPackage.STRUCTURED_TYPE_FEATURE_COUNT + 4;\n+\tint FINDER__BEHAVIOURS = EnvironmentPackage.OBEO_DSM_OBJECT__BEHAVIOURS;\n \n \t/**\n-\t * The feature id for the '<em><b>Properties</b></em>' reference list.\n-\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n+\t * The feature id for the '<em><b>Binding Registries</b></em>' reference list.\n+\t * <!-- begin-user-doc -->\n+\t * <!-- end-user-doc -->\n \t * @generated\n \t * @ordered\n \t */\n-\tint ENTITY__PROPERTIES = EnvironmentPackage.STRUCTURED_TYPE_FEATURE_COUNT + 5;\n+\tint FINDER__BINDING_REGISTRIES = EnvironmentPackage.OBEO_DSM_OBJECT__BINDING_REGISTRIES;\n \n \t/**\n-\t * The feature id for the '<em><b>Estimated Volumetry</b></em>' attribute.\n-\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n+\t * The feature id for the '<em><b>Version</b></em>' attribute.\n+\t * <!-- begin-user-doc -->\n+\t * <!-- end-user-doc -->\n \t * @generated\n \t * @ordered\n \t */\n-\tint ENTITY__ESTIMATED_VOLUMETRY = EnvironmentPackage.STRUCTURED_TYPE_FEATURE_COUNT + 6;\n+\tint FINDER__VERSION = EnvironmentPackage.OBEO_DSM_OBJECT__VERSION;\n \n \t/**\n-\t * The feature id for the '<em><b>Estimated Access</b></em>' attribute.\n-\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n+\t * The feature id for the '<em><b>Created On</b></em>' attribute.\n+\t * <!-- begin-user-doc -->\n+\t * <!-- end-user-doc -->\n \t * @generated\n \t * @ordered\n \t */\n-\tint ENTITY__ESTIMATED_ACCESS = EnvironmentPackage.STRUCTURED_TYPE_FEATURE_COUNT + 7;\n+\tint FINDER__CREATED_ON = EnvironmentPackage.OBEO_DSM_OBJECT__CREATED_ON;\n \n \t/**\n-\t * The feature id for the '<em><b>Historized</b></em>' attribute. <!--\n+\t * The feature id for the '<em><b>Modified On</b></em>' attribute.\n+\t * <!-- begin-user-doc -->\n+\t * <!-- end-user-doc -->\n+\t * @generated\n+\t * @ordered\n+\t */\n+\tint FINDER__MODIFIED_ON = EnvironmentPackage.OBEO_DSM_OBJECT__MODIFIED_ON;\n+\n+\t/**\n+\t * The feature id for the '<em><b>Name</b></em>' attribute. <!--\n \t * begin-user-doc --> <!-- end-user-doc -->\n \t * \n \t * @generated\n \t * @ordered\n \t */\n-\tint ENTITY__HISTORIZED = EnvironmentPackage.STRUCTURED_TYPE_FEATURE_COUNT + 8;\n+\tint FINDER__NAME = EnvironmentPackage.OBEO_DSM_OBJECT_FEATURE_COUNT + 0;\n \n \t/**\n-\t * The feature id for the '<em><b>Owned Finders</b></em>' containment reference list.\n+\t * The feature id for the '<em><b>Entity</b></em>' container reference.\n \t * <!-- begin-user-doc --> <!-- end-user-doc -->\n \t * @generated\n \t * @ordered\n \t */\n-\tint ENTITY__OWNED_FINDERS = EnvironmentPackage.STRUCTURED_TYPE_FEATURE_COUNT + 9;\n+\tint FINDER__ENTITY = EnvironmentPackage.OBEO_DSM_OBJECT_FEATURE_COUNT + 1;\n \n \t/**\n-\t * The feature id for the '<em><b>Block</b></em>' container reference.\n+\t * The feature id for the '<em><b>Customized Name</b></em>' attribute.\n \t * <!-- begin-user-doc --> <!-- end-user-doc -->\n \t * @generated\n \t * @ordered\n \t */\n-\tint ENTITY__BLOCK = EnvironmentPackage.STRUCTURED_TYPE_FEATURE_COUNT + 10;\n+\tint FINDER__CUSTOMIZED_NAME = EnvironmentPackage.OBEO_DSM_OBJECT_FEATURE_COUNT + 2;\n \n \t/**\n-\t * The feature id for the '<em><b>Inheritance Kind</b></em>' attribute.\n+\t * The feature id for the '<em><b>Criterions</b></em>' containment reference list.\n \t * <!-- begin-user-doc --> <!-- end-user-doc -->\n \t * @generated\n \t * @ordered\n \t */\n-\tint ENTITY__INHERITANCE_KIND = EnvironmentPackage.STRUCTURED_TYPE_FEATURE_COUNT + 11;\n+\tint FINDER__CRITERIONS = EnvironmentPackage.OBEO_DSM_OBJECT_FEATURE_COUNT + 3;\n \n \t/**\n-\t * The number of structural features of the '<em>Entity</em>' class.\n+\t * The feature id for the '<em><b>Multiplicity</b></em>' attribute.\n+\t * <!-- begin-user-doc -->\n+\t * <!-- end-user-doc -->\n+\t * @generated\n+\t * @ordered\n+\t */\n+\tint FINDER__MULTIPLICITY = EnvironmentPackage.OBEO_DSM_OBJECT_FEATURE_COUNT + 4;\n+\n+\t/**\n+\t * The number of structural features of the '<em>Finder</em>' class.\n \t * <!-- begin-user-doc --> <!-- end-user-doc -->\n \t * @generated\n \t * @ordered\n \t */\n-\tint ENTITY_FEATURE_COUNT = EnvironmentPackage.STRUCTURED_TYPE_FEATURE_COUNT + 12;\n+\tint FINDER_FEATURE_COUNT = EnvironmentPackage.OBEO_DSM_OBJECT_FEATURE_COUNT + 5;\n \n \t/**\n-\t * The meta object id for the '{@link org.obeonetwork.dsl.entity.impl.PropertyImpl <em>Property</em>}' class.\n+\t * The meta object id for the '{@link org.obeonetwork.dsl.entity.impl.CriterionImpl <em>Criterion</em>}' class.\n \t * <!-- begin-user-doc --> <!-- end-user-doc -->\n-\t * @see org.obeonetwork.dsl.entity.impl.PropertyImpl\n-\t * @see org.obeonetwork.dsl.entity.impl.EntityPackageImpl#getProperty()\n+\t * @see org.obeonetwork.dsl.entity.impl.CriterionImpl\n+\t * @see org.obeonetwork.dsl.entity.impl.EntityPackageImpl#getCriterion()\n \t * @generated\n \t */\n-\tint PROPERTY = 3;\n+\tint CRITERION = 4;\n \n \t/**\n \t * The feature id for the '<em><b>Metadatas</b></em>' containment reference.\n \t * <!-- begin-user-doc --> <!-- end-user-doc -->\n \t * @generated\n \t * @ordered\n \t */\n-\tint PROPERTY__METADATAS = EnvironmentPackage.OBEO_DSM_OBJECT__METADATAS;\n+\tint CRITERION__METADATAS = EnvironmentPackage.OBEO_DSM_OBJECT__METADATAS;\n \n \t/**\n \t * The feature id for the '<em><b>Description</b></em>' attribute.\n@@ -535,7 +544,7 @@ public interface EntityPackage extends EPackage {\n \t * @generated\n \t * @ordered\n \t */\n-\tint PROPERTY__DESCRIPTION = EnvironmentPackage.OBEO_DSM_OBJECT__DESCRIPTION;\n+\tint CRITERION__DESCRIPTION = EnvironmentPackage.OBEO_DSM_OBJECT__DESCRIPTION;\n \n \t/**\n \t * The feature id for the '<em><b>Keywords</b></em>' attribute list.\n@@ -544,7 +553,7 @@ public interface EntityPackage extends EPackage {\n \t * @generated\n \t * @ordered\n \t */\n-\tint PROPERTY__KEYWORDS = EnvironmentPackage.OBEO_DSM_OBJECT__KEYWORDS;\n+\tint CRITERION__KEYWORDS = EnvironmentPackage.OBEO_DSM_OBJECT__KEYWORDS;\n \n \t/**\n \t * The feature id for the '<em><b>Behaviours</b></em>' containment reference list.\n@@ -553,7 +562,7 @@ public interface EntityPackage extends EPackage {\n \t * @generated\n \t * @ordered\n \t */\n-\tint PROPERTY__BEHAVIOURS = EnvironmentPackage.OBEO_DSM_OBJECT__BEHAVIOURS;\n+\tint CRITERION__BEHAVIOURS = EnvironmentPackage.OBEO_DSM_OBJECT__BEHAVIOURS;\n \n \t/**\n \t * The feature id for the '<em><b>Binding Registries</b></em>' reference list.\n@@ -562,7 +571,7 @@ public interface EntityPackage extends EPackage {\n \t * @generated\n \t * @ordered\n \t */\n-\tint PROPERTY__BINDING_REGISTRIES = EnvironmentPackage.OBEO_DSM_OBJECT__BINDING_REGISTRIES;\n+\tint CRITERION__BINDING_REGISTRIES = EnvironmentPackage.OBEO_DSM_OBJECT__BINDING_REGISTRIES;\n \n \t/**\n \t * The feature id for the '<em><b>Version</b></em>' attribute.\n@@ -571,7 +580,7 @@ public interface EntityPackage extends EPackage {\n \t * @generated\n \t * @ordered\n \t */\n-\tint PROPERTY__VERSION = EnvironmentPackage.OBEO_DSM_OBJECT__VERSION;\n+\tint CRITERION__VERSION = EnvironmentPackage.OBEO_DSM_OBJECT__VERSION;\n \n \t/**\n \t * The feature id for the '<em><b>Created On</b></em>' attribute.\n@@ -580,7 +589,7 @@ public interface EntityPackage extends EPackage {\n \t * @generated\n \t * @ordered\n \t */\n-\tint PROPERTY__CREATED_ON = EnvironmentPackage.OBEO_DSM_OBJECT__CREATED_ON;\n+\tint CRITERION__CREATED_ON = EnvironmentPackage.OBEO_DSM_OBJECT__CREATED_ON;\n \n \t/**\n \t * The feature id for the '<em><b>Modified On</b></em>' attribute.\n@@ -589,57 +598,32 @@ public interface EntityPackage extends EPackage {\n \t * @generated\n \t * @ordered\n \t */\n-\tint PROPERTY__MODIFIED_ON = EnvironmentPackage.OBEO_DSM_OBJECT__MODIFIED_ON;\n-\n-\t/**\n-\t * The feature id for the '<em><b>Name</b></em>' attribute. <!--\n-\t * begin-user-doc --> <!-- end-user-doc -->\n-\t * \n-\t * @generated\n-\t * @ordered\n-\t */\n-\tint PROPERTY__NAME = EnvironmentPackage.OBEO_DSM_OBJECT_FEATURE_COUNT + 0;\n-\n-\t/**\n-\t * The feature id for the '<em><b>Multiplicity</b></em>' attribute.\n-\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n-\t * @generated\n-\t * @ordered\n-\t */\n-\tint PROPERTY__MULTIPLICITY = EnvironmentPackage.OBEO_DSM_OBJECT_FEATURE_COUNT + 1;\n-\n-\t/**\n-\t * The feature id for the '<em><b>Is Primary Key</b></em>' attribute.\n-\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n-\t * @generated\n-\t * @ordered\n-\t */\n-\tint PROPERTY__IS_PRIMARY_KEY = EnvironmentPackage.OBEO_DSM_OBJECT_FEATURE_COUNT + 2;\n+\tint CRITERION__MODIFIED_ON = EnvironmentPackage.OBEO_DSM_OBJECT__MODIFIED_ON;\n \n \t/**\n-\t * The number of structural features of the '<em>Property</em>' class.\n+\t * The number of structural features of the '<em>Criterion</em>' class.\n \t * <!-- begin-user-doc --> <!-- end-user-doc -->\n \t * @generated\n \t * @ordered\n \t */\n-\tint PROPERTY_FEATURE_COUNT = EnvironmentPackage.OBEO_DSM_OBJECT_FEATURE_COUNT + 3;\n+\tint CRITERION_FEATURE_COUNT = EnvironmentPackage.OBEO_DSM_OBJECT_FEATURE_COUNT + 0;\n \n \t/**\n-\t * The meta object id for the '{@link org.obeonetwork.dsl.entity.impl.AttributeImpl <em>Attribute</em>}' class.\n+\t * The meta object id for the '{@link org.obeonetwork.dsl.entity.impl.InternalCriterionImpl <em>Internal Criterion</em>}' class.\n \t * <!-- begin-user-doc --> <!-- end-user-doc -->\n-\t * @see org.obeonetwork.dsl.entity.impl.AttributeImpl\n-\t * @see org.obeonetwork.dsl.entity.impl.EntityPackageImpl#getAttribute()\n+\t * @see org.obeonetwork.dsl.entity.impl.InternalCriterionImpl\n+\t * @see org.obeonetwork.dsl.entity.impl.EntityPackageImpl#getInternalCriterion()\n \t * @generated\n \t */\n-\tint ATTRIBUTE = 4;\n+\tint INTERNAL_CRITERION = 3;\n \n \t/**\n \t * The feature id for the '<em><b>Metadatas</b></em>' containment reference.\n \t * <!-- begin-user-doc --> <!-- end-user-doc -->\n \t * @generated\n \t * @ordered\n \t */\n-\tint ATTRIBUTE__METADATAS = PROPERTY__METADATAS;\n+\tint INTERNAL_CRITERION__METADATAS = CRITERION__METADATAS;\n \n \t/**\n \t * The feature id for the '<em><b>Description</b></em>' attribute.\n@@ -648,7 +632,7 @@ public interface EntityPackage extends EPackage {\n \t * @generated\n \t * @ordered\n \t */\n-\tint ATTRIBUTE__DESCRIPTION = PROPERTY__DESCRIPTION;\n+\tint INTERNAL_CRITERION__DESCRIPTION = CRITERION__DESCRIPTION;\n \n \t/**\n \t * The feature id for the '<em><b>Keywords</b></em>' attribute list.\n@@ -657,7 +641,7 @@ public interface EntityPackage extends EPackage {\n \t * @generated\n \t * @ordered\n \t */\n-\tint ATTRIBUTE__KEYWORDS = PROPERTY__KEYWORDS;\n+\tint INTERNAL_CRITERION__KEYWORDS = CRITERION__KEYWORDS;\n \n \t/**\n \t * The feature id for the '<em><b>Behaviours</b></em>' containment reference list.\n@@ -666,7 +650,7 @@ public interface EntityPackage extends EPackage {\n \t * @generated\n \t * @ordered\n \t */\n-\tint ATTRIBUTE__BEHAVIOURS = PROPERTY__BEHAVIOURS;\n+\tint INTERNAL_CRITERION__BEHAVIOURS = CRITERION__BEHAVIOURS;\n \n \t/**\n \t * The feature id for the '<em><b>Binding Registries</b></em>' reference list.\n@@ -675,7 +659,7 @@ public interface EntityPackage extends EPackage {\n \t * @generated\n \t * @ordered\n \t */\n-\tint ATTRIBUTE__BINDING_REGISTRIES = PROPERTY__BINDING_REGISTRIES;\n+\tint INTERNAL_CRITERION__BINDING_REGISTRIES = CRITERION__BINDING_REGISTRIES;\n \n \t/**\n \t * The feature id for the '<em><b>Version</b></em>' attribute.\n@@ -684,7 +668,7 @@ public interface EntityPackage extends EPackage {\n \t * @generated\n \t * @ordered\n \t */\n-\tint ATTRIBUTE__VERSION = PROPERTY__VERSION;\n+\tint INTERNAL_CRITERION__VERSION = CRITERION__VERSION;\n \n \t/**\n \t * The feature id for the '<em><b>Created On</b></em>' attribute.\n@@ -693,7 +677,7 @@ public interface EntityPackage extends EPackage {\n \t * @generated\n \t * @ordered\n \t */\n-\tint ATTRIBUTE__CREATED_ON = PROPERTY__CREATED_ON;\n+\tint INTERNAL_CRITERION__CREATED_ON = CRITERION__CREATED_ON;\n \n \t/**\n \t * The feature id for the '<em><b>Modified On</b></em>' attribute.\n@@ -702,74 +686,50 @@ public interface EntityPackage extends EPackage {\n \t * @generated\n \t * @ordered\n \t */\n-\tint ATTRIBUTE__MODIFIED_ON = PROPERTY__MODIFIED_ON;\n+\tint INTERNAL_CRITERION__MODIFIED_ON = CRITERION__MODIFIED_ON;\n \n \t/**\n-\t * The feature id for the '<em><b>Name</b></em>' attribute. <!--\n+\t * The feature id for the '<em><b>Target</b></em>' reference. <!--\n \t * begin-user-doc --> <!-- end-user-doc -->\n \t * \n \t * @generated\n \t * @ordered\n \t */\n-\tint ATTRIBUTE__NAME = PROPERTY__NAME;\n-\n-\t/**\n-\t * The feature id for the '<em><b>Multiplicity</b></em>' attribute.\n-\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n-\t * @generated\n-\t * @ordered\n-\t */\n-\tint ATTRIBUTE__MULTIPLICITY = PROPERTY__MULTIPLICITY;\n-\n-\t/**\n-\t * The feature id for the '<em><b>Is Primary Key</b></em>' attribute.\n-\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n-\t * @generated\n-\t * @ordered\n-\t */\n-\tint ATTRIBUTE__IS_PRIMARY_KEY = PROPERTY__IS_PRIMARY_KEY;\n-\n-\t/**\n-\t * The feature id for the '<em><b>Entity</b></em>' container reference.\n-\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n-\t * @generated\n-\t * @ordered\n-\t */\n-\tint ATTRIBUTE__ENTITY = PROPERTY_FEATURE_COUNT + 0;\n+\tint INTERNAL_CRITERION__TARGET = CRITERION_FEATURE_COUNT + 0;\n \n \t/**\n-\t * The feature id for the '<em><b>Type</b></em>' reference. <!--\n+\t * The feature id for the '<em><b>Name</b></em>' attribute. <!--\n \t * begin-user-doc --> <!-- end-user-doc -->\n \t * \n \t * @generated\n \t * @ordered\n \t */\n-\tint ATTRIBUTE__TYPE = PROPERTY_FEATURE_COUNT + 1;\n+\tint INTERNAL_CRITERION__NAME = CRITERION_FEATURE_COUNT + 1;\n \n \t/**\n-\t * The number of structural features of the '<em>Attribute</em>' class.\n+\t * The number of structural features of the '<em>Internal Criterion</em>' class.\n \t * <!-- begin-user-doc --> <!-- end-user-doc -->\n \t * @generated\n \t * @ordered\n \t */\n-\tint ATTRIBUTE_FEATURE_COUNT = PROPERTY_FEATURE_COUNT + 2;\n+\tint INTERNAL_CRITERION_FEATURE_COUNT = CRITERION_FEATURE_COUNT + 2;\n \n \t/**\n-\t * The meta object id for the '{@link org.obeonetwork.dsl.entity.impl.ReferenceImpl <em>Reference</em>}' class.\n+\t * The meta object id for the '{@link org.obeonetwork.dsl.entity.impl.ExternalCriterionImpl <em>External Criterion</em>}' class.\n \t * <!-- begin-user-doc --> <!-- end-user-doc -->\n-\t * @see org.obeonetwork.dsl.entity.impl.ReferenceImpl\n-\t * @see org.obeonetwork.dsl.entity.impl.EntityPackageImpl#getReference()\n+\t * @see org.obeonetwork.dsl.entity.impl.ExternalCriterionImpl\n+\t * @see org.obeonetwork.dsl.entity.impl.EntityPackageImpl#getExternalCriterion()\n \t * @generated\n \t */\n-\tint REFERENCE = 5;\n+\tint EXTERNAL_CRITERION = 5;\n \n \t/**\n \t * The feature id for the '<em><b>Metadatas</b></em>' containment reference.\n \t * <!-- begin-user-doc --> <!-- end-user-doc -->\n \t * @generated\n \t * @ordered\n \t */\n-\tint REFERENCE__METADATAS = PROPERTY__METADATAS;\n+\tint EXTERNAL_CRITERION__METADATAS = CRITERION__METADATAS;\n \n \t/**\n \t * The feature id for the '<em><b>Description</b></em>' attribute.\n@@ -778,7 +738,7 @@ public interface EntityPackage extends EPackage {\n \t * @generated\n \t * @ordered\n \t */\n-\tint REFERENCE__DESCRIPTION = PROPERTY__DESCRIPTION;\n+\tint EXTERNAL_CRITERION__DESCRIPTION = CRITERION__DESCRIPTION;\n \n \t/**\n \t * The feature id for the '<em><b>Keywords</b></em>' attribute list.\n@@ -787,7 +747,7 @@ public interface EntityPackage extends EPackage {\n \t * @generated\n \t * @ordered\n \t */\n-\tint REFERENCE__KEYWORDS = PROPERTY__KEYWORDS;\n+\tint EXTERNAL_CRITERION__KEYWORDS = CRITERION__KEYWORDS;\n \n \t/**\n \t * The feature id for the '<em><b>Behaviours</b></em>' containment reference list.\n@@ -796,7 +756,7 @@ public interface EntityPackage extends EPackage {\n \t * @generated\n \t * @ordered\n \t */\n-\tint REFERENCE__BEHAVIOURS = PROPERTY__BEHAVIOURS;\n+\tint EXTERNAL_CRITERION__BEHAVIOURS = CRITERION__BEHAVIOURS;\n \n \t/**\n \t * The feature id for the '<em><b>Binding Registries</b></em>' reference list.\n@@ -805,7 +765,7 @@ public interface EntityPackage extends EPackage {\n \t * @generated\n \t * @ordered\n \t */\n-\tint REFERENCE__BINDING_REGISTRIES = PROPERTY__BINDING_REGISTRIES;\n+\tint EXTERNAL_CRITERION__BINDING_REGISTRIES = CRITERION__BINDING_REGISTRIES;\n \n \t/**\n \t * The feature id for the '<em><b>Version</b></em>' attribute.\n@@ -814,7 +774,7 @@ public interface EntityPackage extends EPackage {\n \t * @generated\n \t * @ordered\n \t */\n-\tint REFERENCE__VERSION = PROPERTY__VERSION;\n+\tint EXTERNAL_CRITERION__VERSION = CRITERION__VERSION;\n \n \t/**\n \t * The feature id for the '<em><b>Created On</b></em>' attribute.\n@@ -823,7 +783,7 @@ public interface EntityPackage extends EPackage {\n \t * @generated\n \t * @ordered\n \t */\n-\tint REFERENCE__CREATED_ON = PROPERTY__CREATED_ON;\n+\tint EXTERNAL_CRITERION__CREATED_ON = CRITERION__CREATED_ON;\n \n \t/**\n \t * The feature id for the '<em><b>Modified On</b></em>' attribute.\n@@ -832,7 +792,7 @@ public interface EntityPackage extends EPackage {\n \t * @generated\n \t * @ordered\n \t */\n-\tint REFERENCE__MODIFIED_ON = PROPERTY__MODIFIED_ON;\n+\tint EXTERNAL_CRITERION__MODIFIED_ON = CRITERION__MODIFIED_ON;\n \n \t/**\n \t * The feature id for the '<em><b>Name</b></em>' attribute. <!--\n@@ -841,640 +801,73 @@ public interface EntityPackage extends EPackage {\n \t * @generated\n \t * @ordered\n \t */\n-\tint REFERENCE__NAME = PROPERTY__NAME;\n+\tint EXTERNAL_CRITERION__NAME = CRITERION_FEATURE_COUNT + 0;\n \n \t/**\n-\t * The feature id for the '<em><b>Multiplicity</b></em>' attribute.\n-\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n-\t * @generated\n-\t * @ordered\n-\t */\n-\tint REFERENCE__MULTIPLICITY = PROPERTY__MULTIPLICITY;\n-\n-\t/**\n-\t * The feature id for the '<em><b>Is Primary Key</b></em>' attribute.\n-\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n-\t * @generated\n-\t * @ordered\n-\t */\n-\tint REFERENCE__IS_PRIMARY_KEY = PROPERTY__IS_PRIMARY_KEY;\n-\n-\t/**\n-\t * The feature id for the '<em><b>Entity</b></em>' container reference.\n-\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n-\t * @generated\n-\t * @ordered\n-\t */\n-\tint REFERENCE__ENTITY = PROPERTY_FEATURE_COUNT + 0;\n-\n-\t/**\n-\t * The feature id for the '<em><b>Is Composite</b></em>' attribute.\n-\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n-\t * @generated\n-\t * @ordered\n-\t */\n-\tint REFERENCE__IS_COMPOSITE = PROPERTY_FEATURE_COUNT + 1;\n-\n-\t/**\n-\t * The feature id for the '<em><b>Opposite Of</b></em>' reference. <!--\n-\t * begin-user-doc --> <!-- end-user-doc -->\n-\t * \n-\t * @generated\n-\t * @ordered\n-\t */\n-\tint REFERENCE__OPPOSITE_OF = PROPERTY_FEATURE_COUNT + 2;\n-\n-\t/**\n-\t * The feature id for the '<em><b>Type</b></em>' reference. <!--\n-\t * begin-user-doc --> <!-- end-user-doc -->\n-\t * \n-\t * @generated\n-\t * @ordered\n-\t */\n-\tint REFERENCE__TYPE = PROPERTY_FEATURE_COUNT + 3;\n-\n-\t/**\n-\t * The feature id for the '<em><b>Navigable</b></em>' attribute. <!--\n-\t * begin-user-doc --> <!-- end-user-doc -->\n-\t * \n-\t * @generated\n-\t * @ordered\n-\t */\n-\tint REFERENCE__NAVIGABLE = PROPERTY_FEATURE_COUNT + 4;\n-\n-\t/**\n-\t * The number of structural features of the '<em>Reference</em>' class.\n-\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n-\t * @generated\n-\t * @ordered\n-\t */\n-\tint REFERENCE_FEATURE_COUNT = PROPERTY_FEATURE_COUNT + 5;\n-\n-\t/**\n-\t * The meta object id for the '{@link org.obeonetwork.dsl.entity.impl.FinderImpl <em>Finder</em>}' class.\n-\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n-\t * @see org.obeonetwork.dsl.entity.impl.FinderImpl\n-\t * @see org.obeonetwork.dsl.entity.impl.EntityPackageImpl#getFinder()\n-\t * @generated\n-\t */\n-\tint FINDER = 6;\n-\n-\t/**\n-\t * The feature id for the '<em><b>Metadatas</b></em>' containment reference.\n-\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n-\t * @generated\n-\t * @ordered\n-\t */\n-\tint FINDER__METADATAS = EnvironmentPackage.OBEO_DSM_OBJECT__METADATAS;\n-\n-\t/**\n-\t * The feature id for the '<em><b>Description</b></em>' attribute.\n-\t * <!-- begin-user-doc -->\n-\t * <!-- end-user-doc -->\n-\t * @generated\n-\t * @ordered\n-\t */\n-\tint FINDER__DESCRIPTION = EnvironmentPackage.OBEO_DSM_OBJECT__DESCRIPTION;\n-\n-\t/**\n-\t * The feature id for the '<em><b>Keywords</b></em>' attribute list.\n-\t * <!-- begin-user-doc -->\n-\t * <!-- end-user-doc -->\n-\t * @generated\n-\t * @ordered\n-\t */\n-\tint FINDER__KEYWORDS = EnvironmentPackage.OBEO_DSM_OBJECT__KEYWORDS;\n-\n-\t/**\n-\t * The feature id for the '<em><b>Behaviours</b></em>' containment reference list.\n-\t * <!-- begin-user-doc -->\n-\t * <!-- end-user-doc -->\n-\t * @generated\n-\t * @ordered\n-\t */\n-\tint FINDER__BEHAVIOURS = EnvironmentPackage.OBEO_DSM_OBJECT__BEHAVIOURS;\n-\n-\t/**\n-\t * The feature id for the '<em><b>Binding Registries</b></em>' reference list.\n-\t * <!-- begin-user-doc -->\n-\t * <!-- end-user-doc -->\n-\t * @generated\n-\t * @ordered\n-\t */\n-\tint FINDER__BINDING_REGISTRIES = EnvironmentPackage.OBEO_DSM_OBJECT__BINDING_REGISTRIES;\n-\n-\t/**\n-\t * The feature id for the '<em><b>Version</b></em>' attribute.\n-\t * <!-- begin-user-doc -->\n-\t * <!-- end-user-doc -->\n-\t * @generated\n-\t * @ordered\n-\t */\n-\tint FINDER__VERSION = EnvironmentPackage.OBEO_DSM_OBJECT__VERSION;\n-\n-\t/**\n-\t * The feature id for the '<em><b>Created On</b></em>' attribute.\n-\t * <!-- begin-user-doc -->\n-\t * <!-- end-user-doc -->\n-\t * @generated\n-\t * @ordered\n-\t */\n-\tint FINDER__CREATED_ON = EnvironmentPackage.OBEO_DSM_OBJECT__CREATED_ON;\n-\n-\t/**\n-\t * The feature id for the '<em><b>Modified On</b></em>' attribute.\n-\t * <!-- begin-user-doc -->\n-\t * <!-- end-user-doc -->\n-\t * @generated\n-\t * @ordered\n-\t */\n-\tint FINDER__MODIFIED_ON = EnvironmentPackage.OBEO_DSM_OBJECT__MODIFIED_ON;\n-\n-\t/**\n-\t * The feature id for the '<em><b>Name</b></em>' attribute. <!--\n-\t * begin-user-doc --> <!-- end-user-doc -->\n-\t * \n-\t * @generated\n-\t * @ordered\n-\t */\n-\tint FINDER__NAME = EnvironmentPackage.OBEO_DSM_OBJECT_FEATURE_COUNT + 0;\n-\n-\t/**\n-\t * The feature id for the '<em><b>Entity</b></em>' container reference.\n-\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n-\t * @generated\n-\t * @ordered\n-\t */\n-\tint FINDER__ENTITY = EnvironmentPackage.OBEO_DSM_OBJECT_FEATURE_COUNT + 1;\n-\n-\t/**\n-\t * The feature id for the '<em><b>Customized Name</b></em>' attribute.\n-\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n-\t * @generated\n-\t * @ordered\n-\t */\n-\tint FINDER__CUSTOMIZED_NAME = EnvironmentPackage.OBEO_DSM_OBJECT_FEATURE_COUNT + 2;\n-\n-\t/**\n-\t * The feature id for the '<em><b>Criterions</b></em>' containment reference list.\n-\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n-\t * @generated\n-\t * @ordered\n-\t */\n-\tint FINDER__CRITERIONS = EnvironmentPackage.OBEO_DSM_OBJECT_FEATURE_COUNT + 3;\n-\n-\t/**\n-\t * The feature id for the '<em><b>Multiplicity</b></em>' attribute.\n-\t * <!-- begin-user-doc -->\n-\t * <!-- end-user-doc -->\n-\t * @generated\n-\t * @ordered\n-\t */\n-\tint FINDER__MULTIPLICITY = EnvironmentPackage.OBEO_DSM_OBJECT_FEATURE_COUNT + 4;\n-\n-\t/**\n-\t * The number of structural features of the '<em>Finder</em>' class.\n-\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n-\t * @generated\n-\t * @ordered\n-\t */\n-\tint FINDER_FEATURE_COUNT = EnvironmentPackage.OBEO_DSM_OBJECT_FEATURE_COUNT + 5;\n-\n-\t/**\n-\t * The meta object id for the '{@link org.obeonetwork.dsl.entity.impl.CriterionImpl <em>Criterion</em>}' class.\n-\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n-\t * @see org.obeonetwork.dsl.entity.impl.CriterionImpl\n-\t * @see org.obeonetwork.dsl.entity.impl.EntityPackageImpl#getCriterion()\n-\t * @generated\n-\t */\n-\tint CRITERION = 8;\n-\n-\t/**\n-\t * The feature id for the '<em><b>Metadatas</b></em>' containment reference.\n-\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n-\t * @generated\n-\t * @ordered\n-\t */\n-\tint CRITERION__METADATAS = EnvironmentPackage.OBEO_DSM_OBJECT__METADATAS;\n-\n-\t/**\n-\t * The feature id for the '<em><b>Description</b></em>' attribute.\n-\t * <!-- begin-user-doc -->\n-\t * <!-- end-user-doc -->\n-\t * @generated\n-\t * @ordered\n-\t */\n-\tint CRITERION__DESCRIPTION = EnvironmentPackage.OBEO_DSM_OBJECT__DESCRIPTION;\n-\n-\t/**\n-\t * The feature id for the '<em><b>Keywords</b></em>' attribute list.\n-\t * <!-- begin-user-doc -->\n-\t * <!-- end-user-doc -->\n-\t * @generated\n-\t * @ordered\n-\t */\n-\tint CRITERION__KEYWORDS = EnvironmentPackage.OBEO_DSM_OBJECT__KEYWORDS;\n-\n-\t/**\n-\t * The feature id for the '<em><b>Behaviours</b></em>' containment reference list.\n-\t * <!-- begin-user-doc -->\n-\t * <!-- end-user-doc -->\n-\t * @generated\n-\t * @ordered\n-\t */\n-\tint CRITERION__BEHAVIOURS = EnvironmentPackage.OBEO_DSM_OBJECT__BEHAVIOURS;\n-\n-\t/**\n-\t * The feature id for the '<em><b>Binding Registries</b></em>' reference list.\n-\t * <!-- begin-user-doc -->\n-\t * <!-- end-user-doc -->\n-\t * @generated\n-\t * @ordered\n-\t */\n-\tint CRITERION__BINDING_REGISTRIES = EnvironmentPackage.OBEO_DSM_OBJECT__BINDING_REGISTRIES;\n-\n-\t/**\n-\t * The feature id for the '<em><b>Version</b></em>' attribute.\n-\t * <!-- begin-user-doc -->\n-\t * <!-- end-user-doc -->\n-\t * @generated\n-\t * @ordered\n-\t */\n-\tint CRITERION__VERSION = EnvironmentPackage.OBEO_DSM_OBJECT__VERSION;\n-\n-\t/**\n-\t * The feature id for the '<em><b>Created On</b></em>' attribute.\n-\t * <!-- begin-user-doc -->\n-\t * <!-- end-user-doc -->\n-\t * @generated\n-\t * @ordered\n-\t */\n-\tint CRITERION__CREATED_ON = EnvironmentPackage.OBEO_DSM_OBJECT__CREATED_ON;\n-\n-\t/**\n-\t * The feature id for the '<em><b>Modified On</b></em>' attribute.\n-\t * <!-- begin-user-doc -->\n-\t * <!-- end-user-doc -->\n-\t * @generated\n-\t * @ordered\n-\t */\n-\tint CRITERION__MODIFIED_ON = EnvironmentPackage.OBEO_DSM_OBJECT__MODIFIED_ON;\n-\n-\t/**\n-\t * The number of structural features of the '<em>Criterion</em>' class.\n-\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n-\t * @generated\n-\t * @ordered\n-\t */\n-\tint CRITERION_FEATURE_COUNT = EnvironmentPackage.OBEO_DSM_OBJECT_FEATURE_COUNT + 0;\n-\n-\t/**\n-\t * The meta object id for the '{@link org.obeonetwork.dsl.entity.impl.InternalCriterionImpl <em>Internal Criterion</em>}' class.\n-\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n-\t * @see org.obeonetwork.dsl.entity.impl.InternalCriterionImpl\n-\t * @see org.obeonetwork.dsl.entity.impl.EntityPackageImpl#getInternalCriterion()\n-\t * @generated\n-\t */\n-\tint INTERNAL_CRITERION = 7;\n-\n-\t/**\n-\t * The feature id for the '<em><b>Metadatas</b></em>' containment reference.\n-\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n-\t * @generated\n-\t * @ordered\n-\t */\n-\tint INTERNAL_CRITERION__METADATAS = CRITERION__METADATAS;\n-\n-\t/**\n-\t * The feature id for the '<em><b>Description</b></em>' attribute.\n-\t * <!-- begin-user-doc -->\n-\t * <!-- end-user-doc -->\n-\t * @generated\n-\t * @ordered\n-\t */\n-\tint INTERNAL_CRITERION__DESCRIPTION = CRITERION__DESCRIPTION;\n-\n-\t/**\n-\t * The feature id for the '<em><b>Keywords</b></em>' attribute list.\n-\t * <!-- begin-user-doc -->\n-\t * <!-- end-user-doc -->\n-\t * @generated\n-\t * @ordered\n-\t */\n-\tint INTERNAL_CRITERION__KEYWORDS = CRITERION__KEYWORDS;\n-\n-\t/**\n-\t * The feature id for the '<em><b>Behaviours</b></em>' containment reference list.\n-\t * <!-- begin-user-doc -->\n-\t * <!-- end-user-doc -->\n-\t * @generated\n-\t * @ordered\n-\t */\n-\tint INTERNAL_CRITERION__BEHAVIOURS = CRITERION__BEHAVIOURS;\n-\n-\t/**\n-\t * The feature id for the '<em><b>Binding Registries</b></em>' reference list.\n-\t * <!-- begin-user-doc -->\n-\t * <!-- end-user-doc -->\n-\t * @generated\n-\t * @ordered\n-\t */\n-\tint INTERNAL_CRITERION__BINDING_REGISTRIES = CRITERION__BINDING_REGISTRIES;\n-\n-\t/**\n-\t * The feature id for the '<em><b>Version</b></em>' attribute.\n-\t * <!-- begin-user-doc -->\n-\t * <!-- end-user-doc -->\n-\t * @generated\n-\t * @ordered\n-\t */\n-\tint INTERNAL_CRITERION__VERSION = CRITERION__VERSION;\n-\n-\t/**\n-\t * The feature id for the '<em><b>Created On</b></em>' attribute.\n-\t * <!-- begin-user-doc -->\n-\t * <!-- end-user-doc -->\n-\t * @generated\n-\t * @ordered\n-\t */\n-\tint INTERNAL_CRITERION__CREATED_ON = CRITERION__CREATED_ON;\n-\n-\t/**\n-\t * The feature id for the '<em><b>Modified On</b></em>' attribute.\n-\t * <!-- begin-user-doc -->\n-\t * <!-- end-user-doc -->\n-\t * @generated\n-\t * @ordered\n-\t */\n-\tint INTERNAL_CRITERION__MODIFIED_ON = CRITERION__MODIFIED_ON;\n-\n-\t/**\n-\t * The feature id for the '<em><b>Target</b></em>' reference. <!--\n-\t * begin-user-doc --> <!-- end-user-doc -->\n-\t * \n-\t * @generated\n-\t * @ordered\n-\t */\n-\tint INTERNAL_CRITERION__TARGET = CRITERION_FEATURE_COUNT + 0;\n-\n-\t/**\n-\t * The feature id for the '<em><b>Name</b></em>' attribute. <!--\n-\t * begin-user-doc --> <!-- end-user-doc -->\n-\t * \n-\t * @generated\n-\t * @ordered\n-\t */\n-\tint INTERNAL_CRITERION__NAME = CRITERION_FEATURE_COUNT + 1;\n-\n-\t/**\n-\t * The number of structural features of the '<em>Internal Criterion</em>' class.\n-\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n-\t * @generated\n-\t * @ordered\n-\t */\n-\tint INTERNAL_CRITERION_FEATURE_COUNT = CRITERION_FEATURE_COUNT + 2;\n-\n-\t/**\n-\t * The meta object id for the '{@link org.obeonetwork.dsl.entity.impl.ExternalCriterionImpl <em>External Criterion</em>}' class.\n-\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n-\t * @see org.obeonetwork.dsl.entity.impl.ExternalCriterionImpl\n-\t * @see org.obeonetwork.dsl.entity.impl.EntityPackageImpl#getExternalCriterion()\n-\t * @generated\n-\t */\n-\tint EXTERNAL_CRITERION = 9;\n-\n-\t/**\n-\t * The feature id for the '<em><b>Metadatas</b></em>' containment reference.\n-\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n-\t * @generated\n-\t * @ordered\n-\t */\n-\tint EXTERNAL_CRITERION__METADATAS = CRITERION__METADATAS;\n-\n-\t/**\n-\t * The feature id for the '<em><b>Description</b></em>' attribute.\n-\t * <!-- begin-user-doc -->\n-\t * <!-- end-user-doc -->\n-\t * @generated\n-\t * @ordered\n-\t */\n-\tint EXTERNAL_CRITERION__DESCRIPTION = CRITERION__DESCRIPTION;\n-\n-\t/**\n-\t * The feature id for the '<em><b>Keywords</b></em>' attribute list.\n-\t * <!-- begin-user-doc -->\n-\t * <!-- end-user-doc -->\n-\t * @generated\n-\t * @ordered\n-\t */\n-\tint EXTERNAL_CRITERION__KEYWORDS = CRITERION__KEYWORDS;\n-\n-\t/**\n-\t * The feature id for the '<em><b>Behaviours</b></em>' containment reference list.\n-\t * <!-- begin-user-doc -->\n-\t * <!-- end-user-doc -->\n-\t * @generated\n-\t * @ordered\n-\t */\n-\tint EXTERNAL_CRITERION__BEHAVIOURS = CRITERION__BEHAVIOURS;\n-\n-\t/**\n-\t * The feature id for the '<em><b>Binding Registries</b></em>' reference list.\n-\t * <!-- begin-user-doc -->\n-\t * <!-- end-user-doc -->\n-\t * @generated\n-\t * @ordered\n-\t */\n-\tint EXTERNAL_CRITERION__BINDING_REGISTRIES = CRITERION__BINDING_REGISTRIES;\n-\n-\t/**\n-\t * The feature id for the '<em><b>Version</b></em>' attribute.\n-\t * <!-- begin-user-doc -->\n-\t * <!-- end-user-doc -->\n-\t * @generated\n-\t * @ordered\n-\t */\n-\tint EXTERNAL_CRITERION__VERSION = CRITERION__VERSION;\n-\n-\t/**\n-\t * The feature id for the '<em><b>Created On</b></em>' attribute.\n-\t * <!-- begin-user-doc -->\n-\t * <!-- end-user-doc -->\n-\t * @generated\n-\t * @ordered\n-\t */\n-\tint EXTERNAL_CRITERION__CREATED_ON = CRITERION__CREATED_ON;\n-\n-\t/**\n-\t * The feature id for the '<em><b>Modified On</b></em>' attribute.\n-\t * <!-- begin-user-doc -->\n-\t * <!-- end-user-doc -->\n-\t * @generated\n-\t * @ordered\n-\t */\n-\tint EXTERNAL_CRITERION__MODIFIED_ON = CRITERION__MODIFIED_ON;\n-\n-\t/**\n-\t * The feature id for the '<em><b>Name</b></em>' attribute. <!--\n-\t * begin-user-doc --> <!-- end-user-doc -->\n-\t * \n-\t * @generated\n-\t * @ordered\n-\t */\n-\tint EXTERNAL_CRITERION__NAME = CRITERION_FEATURE_COUNT + 0;\n-\n-\t/**\n-\t * The feature id for the '<em><b>Type</b></em>' reference. <!--\n-\t * begin-user-doc --> <!-- end-user-doc -->\n-\t * \n-\t * @generated\n-\t * @ordered\n-\t */\n-\tint EXTERNAL_CRITERION__TYPE = CRITERION_FEATURE_COUNT + 1;\n-\n-\t/**\n-\t * The number of structural features of the '<em>External Criterion</em>' class.\n-\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n-\t * @generated\n-\t * @ordered\n-\t */\n-\tint EXTERNAL_CRITERION_FEATURE_COUNT = CRITERION_FEATURE_COUNT + 2;\n-\n-\t/**\n-\t * The meta object id for the '{@link org.obeonetwork.dsl.entity.InheritanceKind <em>Inheritance Kind</em>}' enum.\n-\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n-\t * @see org.obeonetwork.dsl.entity.InheritanceKind\n-\t * @see org.obeonetwork.dsl.entity.impl.EntityPackageImpl#getInheritanceKind()\n-\t * @generated\n-\t */\n-\tint INHERITANCE_KIND = 10;\n-\n-\t/**\n-\t * Returns the meta object for class '{@link org.obeonetwork.dsl.entity.Root <em>Root</em>}'.\n-\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n-\t * @return the meta object for class '<em>Root</em>'.\n-\t * @see org.obeonetwork.dsl.entity.Root\n-\t * @generated\n-\t */\n-\tEClass getRoot();\n-\n-\t/**\n-\t * Returns the meta object for the containment reference list '{@link org.obeonetwork.dsl.entity.Root#getBlocks <em>Blocks</em>}'.\n-\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n-\t * @return the meta object for the containment reference list '<em>Blocks</em>'.\n-\t * @see org.obeonetwork.dsl.entity.Root#getBlocks()\n-\t * @see #getRoot()\n-\t * @generated\n-\t */\n-\tEReference getRoot_Blocks();\n-\n-\t/**\n-\t * Returns the meta object for class '{@link org.obeonetwork.dsl.entity.Block <em>Block</em>}'.\n-\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n-\t * @return the meta object for class '<em>Block</em>'.\n-\t * @see org.obeonetwork.dsl.entity.Block\n-\t * @generated\n-\t */\n-\tEClass getBlock();\n-\n-\t/**\n-\t * Returns the meta object for the attribute '{@link org.obeonetwork.dsl.entity.Block#getName <em>Name</em>}'.\n-\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n-\t * @return the meta object for the attribute '<em>Name</em>'.\n-\t * @see org.obeonetwork.dsl.entity.Block#getName()\n-\t * @see #getBlock()\n-\t * @generated\n-\t */\n-\tEAttribute getBlock_Name();\n-\n-\t/**\n-\t * Returns the meta object for the containment reference list '{@link org.obeonetwork.dsl.entity.Block#getEntities <em>Entities</em>}'.\n-\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n-\t * @return the meta object for the containment reference list '<em>Entities</em>'.\n-\t * @see org.obeonetwork.dsl.entity.Block#getEntities()\n-\t * @see #getBlock()\n-\t * @generated\n-\t */\n-\tEReference getBlock_Entities();\n-\n-\t/**\n-\t * Returns the meta object for the containment reference list '{@link org.obeonetwork.dsl.entity.Block#getSubblocks <em>Subblocks</em>}'.\n-\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n-\t * @return the meta object for the containment reference list '<em>Subblocks</em>'.\n-\t * @see org.obeonetwork.dsl.entity.Block#getSubblocks()\n-\t * @see #getBlock()\n-\t * @generated\n-\t */\n-\tEReference getBlock_Subblocks();\n-\n-\t/**\n-\t * Returns the meta object for class '{@link org.obeonetwork.dsl.entity.Entity <em>Entity</em>}'.\n-\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n-\t * @return the meta object for class '<em>Entity</em>'.\n-\t * @see org.obeonetwork.dsl.entity.Entity\n+\t * The feature id for the '<em><b>Type</b></em>' reference. <!--\n+\t * begin-user-doc --> <!-- end-user-doc -->\n+\t * \n \t * @generated\n+\t * @ordered\n \t */\n-\tEClass getEntity();\n+\tint EXTERNAL_CRITERION__TYPE = CRITERION_FEATURE_COUNT + 1;\n \n \t/**\n-\t * Returns the meta object for the containment reference list '{@link org.obeonetwork.dsl.entity.Entity#getOwnedAttributes <em>Owned Attributes</em>}'.\n+\t * The number of structural features of the '<em>External Criterion</em>' class.\n \t * <!-- begin-user-doc --> <!-- end-user-doc -->\n-\t * @return the meta object for the containment reference list '<em>Owned Attributes</em>'.\n-\t * @see org.obeonetwork.dsl.entity.Entity#getOwnedAttributes()\n-\t * @see #getEntity()\n \t * @generated\n+\t * @ordered\n \t */\n-\tEReference getEntity_OwnedAttributes();\n+\tint EXTERNAL_CRITERION_FEATURE_COUNT = CRITERION_FEATURE_COUNT + 2;\n \n \t/**\n-\t * Returns the meta object for the containment reference list '{@link org.obeonetwork.dsl.entity.Entity#getOwnedReferences <em>Owned References</em>}'.\n+\t * The meta object id for the '{@link org.obeonetwork.dsl.entity.InheritanceKind <em>Inheritance Kind</em>}' enum.\n \t * <!-- begin-user-doc --> <!-- end-user-doc -->\n-\t * @return the meta object for the containment reference list '<em>Owned References</em>'.\n-\t * @see org.obeonetwork.dsl.entity.Entity#getOwnedReferences()\n-\t * @see #getEntity()\n+\t * @see org.obeonetwork.dsl.entity.InheritanceKind\n+\t * @see org.obeonetwork.dsl.entity.impl.EntityPackageImpl#getInheritanceKind()\n \t * @generated\n \t */\n-\tEReference getEntity_OwnedReferences();\n+\tint INHERITANCE_KIND = 6;\n \n \t/**\n-\t * Returns the meta object for the reference '{@link org.obeonetwork.dsl.entity.Entity#getSupertype <em>Supertype</em>}'.\n+\t * Returns the meta object for class '{@link org.obeonetwork.dsl.entity.Root <em>Root</em>}'.\n \t * <!-- begin-user-doc --> <!-- end-user-doc -->\n-\t * @return the meta object for the reference '<em>Supertype</em>'.\n-\t * @see org.obeonetwork.dsl.entity.Entity#getSupertype()\n-\t * @see #getEntity()\n+\t * @return the meta object for class '<em>Root</em>'.\n+\t * @see org.obeonetwork.dsl.entity.Root\n \t * @generated\n \t */\n-\tEReference getEntity_Supertype();\n+\tEClass getRoot();\n \n \t/**\n-\t * Returns the meta object for the reference list '{@link org.obeonetwork.dsl.entity.Entity#getAttributes <em>Attributes</em>}'.\n-\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n-\t * @return the meta object for the reference list '<em>Attributes</em>'.\n-\t * @see org.obeonetwork.dsl.entity.Entity#getAttributes()\n-\t * @see #getEntity()\n+\t * Returns the meta object for the attribute '{@link org.obeonetwork.dsl.entity.Root#getName <em>Name</em>}'.\n+\t * <!-- begin-user-doc -->\n+\t * <!-- end-user-doc -->\n+\t * @return the meta object for the attribute '<em>Name</em>'.\n+\t * @see org.obeonetwork.dsl.entity.Root#getName()\n+\t * @see #getRoot()\n \t * @generated\n \t */\n-\tEReference getEntity_Attributes();\n+\tEAttribute getRoot_Name();\n \n \t/**\n-\t * Returns the meta object for the reference list '{@link org.obeonetwork.dsl.entity.Entity#getReferences <em>References</em>}'.\n-\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n-\t * @return the meta object for the reference list '<em>References</em>'.\n-\t * @see org.obeonetwork.dsl.entity.Entity#getReferences()\n-\t * @see #getEntity()\n+\t * Returns the meta object for the containment reference list '{@link org.obeonetwork.dsl.entity.Root#getNamespaces <em>Namespaces</em>}'.\n+\t * <!-- begin-user-doc -->\n+\t * <!-- end-user-doc -->\n+\t * @return the meta object for the containment reference list '<em>Namespaces</em>'.\n+\t * @see org.obeonetwork.dsl.entity.Root#getNamespaces()\n+\t * @see #getRoot()\n \t * @generated\n \t */\n-\tEReference getEntity_References();\n+\tEReference getRoot_Namespaces();\n \n \t/**\n-\t * Returns the meta object for the reference list '{@link org.obeonetwork.dsl.entity.Entity#getProperties <em>Properties</em>}'.\n+\t * Returns the meta object for class '{@link org.obeonetwork.dsl.entity.Entity <em>Entity</em>}'.\n \t * <!-- begin-user-doc --> <!-- end-user-doc -->\n-\t * @return the meta object for the reference list '<em>Properties</em>'.\n-\t * @see org.obeonetwork.dsl.entity.Entity#getProperties()\n-\t * @see #getEntity()\n+\t * @return the meta object for class '<em>Entity</em>'.\n+\t * @see org.obeonetwork.dsl.entity.Entity\n \t * @generated\n \t */\n-\tEReference getEntity_Properties();\n+\tEClass getEntity();\n \n \t/**\n \t * Returns the meta object for the attribute '{@link org.obeonetwork.dsl.entity.Entity#getEstimatedVolumetry <em>Estimated Volumetry</em>}'.\n@@ -1516,16 +909,6 @@ public interface EntityPackage extends EPackage {\n \t */\n \tEReference getEntity_OwnedFinders();\n \n-\t/**\n-\t * Returns the meta object for the container reference '{@link org.obeonetwork.dsl.entity.Entity#getBlock <em>Block</em>}'.\n-\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n-\t * @return the meta object for the container reference '<em>Block</em>'.\n-\t * @see org.obeonetwork.dsl.entity.Entity#getBlock()\n-\t * @see #getEntity()\n-\t * @generated\n-\t */\n-\tEReference getEntity_Block();\n-\n \t/**\n \t * Returns the meta object for the attribute '{@link org.obeonetwork.dsl.entity.Entity#getInheritanceKind <em>Inheritance Kind</em>}'.\n \t * <!-- begin-user-doc --> <!-- end-user-doc -->\n@@ -1536,133 +919,6 @@ public interface EntityPackage extends EPackage {\n \t */\n \tEAttribute getEntity_InheritanceKind();\n \n-\t/**\n-\t * Returns the meta object for class '{@link org.obeonetwork.dsl.entity.Property <em>Property</em>}'.\n-\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n-\t * @return the meta object for class '<em>Property</em>'.\n-\t * @see org.obeonetwork.dsl.entity.Property\n-\t * @generated\n-\t */\n-\tEClass getProperty();\n-\n-\t/**\n-\t * Returns the meta object for the attribute '{@link org.obeonetwork.dsl.entity.Property#getName <em>Name</em>}'.\n-\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n-\t * @return the meta object for the attribute '<em>Name</em>'.\n-\t * @see org.obeonetwork.dsl.entity.Property#getName()\n-\t * @see #getProperty()\n-\t * @generated\n-\t */\n-\tEAttribute getProperty_Name();\n-\n-\t/**\n-\t * Returns the meta object for the attribute '{@link org.obeonetwork.dsl.entity.Property#getMultiplicity <em>Multiplicity</em>}'.\n-\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n-\t * @return the meta object for the attribute '<em>Multiplicity</em>'.\n-\t * @see org.obeonetwork.dsl.entity.Property#getMultiplicity()\n-\t * @see #getProperty()\n-\t * @generated\n-\t */\n-\tEAttribute getProperty_Multiplicity();\n-\n-\t/**\n-\t * Returns the meta object for the attribute '{@link org.obeonetwork.dsl.entity.Property#isIsPrimaryKey <em>Is Primary Key</em>}'.\n-\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n-\t * @return the meta object for the attribute '<em>Is Primary Key</em>'.\n-\t * @see org.obeonetwork.dsl.entity.Property#isIsPrimaryKey()\n-\t * @see #getProperty()\n-\t * @generated\n-\t */\n-\tEAttribute getProperty_IsPrimaryKey();\n-\n-\t/**\n-\t * Returns the meta object for class '{@link org.obeonetwork.dsl.entity.Attribute <em>Attribute</em>}'.\n-\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n-\t * @return the meta object for class '<em>Attribute</em>'.\n-\t * @see org.obeonetwork.dsl.entity.Attribute\n-\t * @generated\n-\t */\n-\tEClass getAttribute();\n-\n-\t/**\n-\t * Returns the meta object for the container reference '{@link org.obeonetwork.dsl.entity.Attribute#getEntity <em>Entity</em>}'.\n-\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n-\t * @return the meta object for the container reference '<em>Entity</em>'.\n-\t * @see org.obeonetwork.dsl.entity.Attribute#getEntity()\n-\t * @see #getAttribute()\n-\t * @generated\n-\t */\n-\tEReference getAttribute_Entity();\n-\n-\t/**\n-\t * Returns the meta object for the reference '{@link org.obeonetwork.dsl.entity.Attribute#getType <em>Type</em>}'.\n-\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n-\t * @return the meta object for the reference '<em>Type</em>'.\n-\t * @see org.obeonetwork.dsl.entity.Attribute#getType()\n-\t * @see #getAttribute()\n-\t * @generated\n-\t */\n-\tEReference getAttribute_Type();\n-\n-\t/**\n-\t * Returns the meta object for class '{@link org.obeonetwork.dsl.entity.Reference <em>Reference</em>}'.\n-\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n-\t * @return the meta object for class '<em>Reference</em>'.\n-\t * @see org.obeonetwork.dsl.entity.Reference\n-\t * @generated\n-\t */\n-\tEClass getReference();\n-\n-\t/**\n-\t * Returns the meta object for the container reference '{@link org.obeonetwork.dsl.entity.Reference#getEntity <em>Entity</em>}'.\n-\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n-\t * @return the meta object for the container reference '<em>Entity</em>'.\n-\t * @see org.obeonetwork.dsl.entity.Reference#getEntity()\n-\t * @see #getReference()\n-\t * @generated\n-\t */\n-\tEReference getReference_Entity();\n-\n-\t/**\n-\t * Returns the meta object for the attribute '{@link org.obeonetwork.dsl.entity.Reference#isIsComposite <em>Is Composite</em>}'.\n-\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n-\t * @return the meta object for the attribute '<em>Is Composite</em>'.\n-\t * @see org.obeonetwork.dsl.entity.Reference#isIsComposite()\n-\t * @see #getReference()\n-\t * @generated\n-\t */\n-\tEAttribute getReference_IsComposite();\n-\n-\t/**\n-\t * Returns the meta object for the reference '{@link org.obeonetwork.dsl.entity.Reference#getOppositeOf <em>Opposite Of</em>}'.\n-\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n-\t * @return the meta object for the reference '<em>Opposite Of</em>'.\n-\t * @see org.obeonetwork.dsl.entity.Reference#getOppositeOf()\n-\t * @see #getReference()\n-\t * @generated\n-\t */\n-\tEReference getReference_OppositeOf();\n-\n-\t/**\n-\t * Returns the meta object for the reference '{@link org.obeonetwork.dsl.entity.Reference#getType <em>Type</em>}'.\n-\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n-\t * @return the meta object for the reference '<em>Type</em>'.\n-\t * @see org.obeonetwork.dsl.entity.Reference#getType()\n-\t * @see #getReference()\n-\t * @generated\n-\t */\n-\tEReference getReference_Type();\n-\n-\t/**\n-\t * Returns the meta object for the attribute '{@link org.obeonetwork.dsl.entity.Reference#isNavigable <em>Navigable</em>}'.\n-\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n-\t * @return the meta object for the attribute '<em>Navigable</em>'.\n-\t * @see org.obeonetwork.dsl.entity.Reference#isNavigable()\n-\t * @see #getReference()\n-\t * @generated\n-\t */\n-\tEAttribute getReference_Navigable();\n-\n \t/**\n \t * Returns the meta object for class '{@link org.obeonetwork.dsl.entity.Finder <em>Finder</em>}'.\n \t * <!-- begin-user-doc --> <!-- end-user-doc -->\n@@ -1830,45 +1086,21 @@ interface Literals {\n \t\t */\n \t\tEClass ROOT = eINSTANCE.getRoot();\n \n-\t\t/**\n-\t\t * The meta object literal for the '<em><b>Blocks</b></em>' containment reference list feature.\n-\t\t * <!-- begin-user-doc --> <!--\n-\t\t * end-user-doc -->\n-\t\t * @generated\n-\t\t */\n-\t\tEReference ROOT__BLOCKS = eINSTANCE.getRoot_Blocks();\n-\n-\t\t/**\n-\t\t * The meta object literal for the '{@link org.obeonetwork.dsl.entity.impl.BlockImpl <em>Block</em>}' class.\n-\t\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n-\t\t * @see org.obeonetwork.dsl.entity.impl.BlockImpl\n-\t\t * @see org.obeonetwork.dsl.entity.impl.EntityPackageImpl#getBlock()\n-\t\t * @generated\n-\t\t */\n-\t\tEClass BLOCK = eINSTANCE.getBlock();\n-\n \t\t/**\n \t\t * The meta object literal for the '<em><b>Name</b></em>' attribute feature.\n-\t\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n-\t\t * @generated\n-\t\t */\n-\t\tEAttribute BLOCK__NAME = eINSTANCE.getBlock_Name();\n-\n-\t\t/**\n-\t\t * The meta object literal for the '<em><b>Entities</b></em>' containment reference list feature.\n-\t\t * <!-- begin-user-doc --> <!--\n-\t\t * end-user-doc -->\n+\t\t * <!-- begin-user-doc -->\n+\t\t * <!-- end-user-doc -->\n \t\t * @generated\n \t\t */\n-\t\tEReference BLOCK__ENTITIES = eINSTANCE.getBlock_Entities();\n+\t\tEAttribute ROOT__NAME = eINSTANCE.getRoot_Name();\n \n \t\t/**\n-\t\t * The meta object literal for the '<em><b>Subblocks</b></em>' containment reference list feature.\n-\t\t * <!-- begin-user-doc --> <!--\n-\t\t * end-user-doc -->\n+\t\t * The meta object literal for the '<em><b>Namespaces</b></em>' containment reference list feature.\n+\t\t * <!-- begin-user-doc -->\n+\t\t * <!-- end-user-doc -->\n \t\t * @generated\n \t\t */\n-\t\tEReference BLOCK__SUBBLOCKS = eINSTANCE.getBlock_Subblocks();\n+\t\tEReference ROOT__NAMESPACES = eINSTANCE.getRoot_Namespaces();\n \n \t\t/**\n \t\t * The meta object literal for the '{@link org.obeonetwork.dsl.entity.impl.EntityImpl <em>Entity</em>}' class.\n@@ -1879,50 +1111,6 @@ interface Literals {\n \t\t */\n \t\tEClass ENTITY = eINSTANCE.getEntity();\n \n-\t\t/**\n-\t\t * The meta object literal for the '<em><b>Owned Attributes</b></em>' containment reference list feature.\n-\t\t * <!-- begin-user-doc --> <!--\n-\t\t * end-user-doc -->\n-\t\t * @generated\n-\t\t */\n-\t\tEReference ENTITY__OWNED_ATTRIBUTES = eINSTANCE.getEntity_OwnedAttributes();\n-\n-\t\t/**\n-\t\t * The meta object literal for the '<em><b>Owned References</b></em>' containment reference list feature.\n-\t\t * <!-- begin-user-doc --> <!--\n-\t\t * end-user-doc -->\n-\t\t * @generated\n-\t\t */\n-\t\tEReference ENTITY__OWNED_REFERENCES = eINSTANCE.getEntity_OwnedReferences();\n-\n-\t\t/**\n-\t\t * The meta object literal for the '<em><b>Supertype</b></em>' reference feature.\n-\t\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n-\t\t * @generated\n-\t\t */\n-\t\tEReference ENTITY__SUPERTYPE = eINSTANCE.getEntity_Supertype();\n-\n-\t\t/**\n-\t\t * The meta object literal for the '<em><b>Attributes</b></em>' reference list feature.\n-\t\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n-\t\t * @generated\n-\t\t */\n-\t\tEReference ENTITY__ATTRIBUTES = eINSTANCE.getEntity_Attributes();\n-\n-\t\t/**\n-\t\t * The meta object literal for the '<em><b>References</b></em>' reference list feature.\n-\t\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n-\t\t * @generated\n-\t\t */\n-\t\tEReference ENTITY__REFERENCES = eINSTANCE.getEntity_References();\n-\n-\t\t/**\n-\t\t * The meta object literal for the '<em><b>Properties</b></em>' reference list feature.\n-\t\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n-\t\t * @generated\n-\t\t */\n-\t\tEReference ENTITY__PROPERTIES = eINSTANCE.getEntity_Properties();\n-\n \t\t/**\n \t\t * The meta object literal for the '<em><b>Estimated Volumetry</b></em>' attribute feature.\n \t\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n@@ -1952,120 +1140,13 @@ interface Literals {\n \t\t */\n \t\tEReference ENTITY__OWNED_FINDERS = eINSTANCE.getEntity_OwnedFinders();\n \n-\t\t/**\n-\t\t * The meta object literal for the '<em><b>Block</b></em>' container reference feature.\n-\t\t * <!-- begin-user-doc --> <!--\n-\t\t * end-user-doc -->\n-\t\t * @generated\n-\t\t */\n-\t\tEReference ENTITY__BLOCK = eINSTANCE.getEntity_Block();\n-\n \t\t/**\n \t\t * The meta object literal for the '<em><b>Inheritance Kind</b></em>' attribute feature.\n \t\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n \t\t * @generated\n \t\t */\n \t\tEAttribute ENTITY__INHERITANCE_KIND = eINSTANCE.getEntity_InheritanceKind();\n \n-\t\t/**\n-\t\t * The meta object literal for the '{@link org.obeonetwork.dsl.entity.impl.PropertyImpl <em>Property</em>}' class.\n-\t\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n-\t\t * @see org.obeonetwork.dsl.entity.impl.PropertyImpl\n-\t\t * @see org.obeonetwork.dsl.entity.impl.EntityPackageImpl#getProperty()\n-\t\t * @generated\n-\t\t */\n-\t\tEClass PROPERTY = eINSTANCE.getProperty();\n-\n-\t\t/**\n-\t\t * The meta object literal for the '<em><b>Name</b></em>' attribute feature.\n-\t\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n-\t\t * @generated\n-\t\t */\n-\t\tEAttribute PROPERTY__NAME = eINSTANCE.getProperty_Name();\n-\n-\t\t/**\n-\t\t * The meta object literal for the '<em><b>Multiplicity</b></em>' attribute feature.\n-\t\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n-\t\t * @generated\n-\t\t */\n-\t\tEAttribute PROPERTY__MULTIPLICITY = eINSTANCE.getProperty_Multiplicity();\n-\n-\t\t/**\n-\t\t * The meta object literal for the '<em><b>Is Primary Key</b></em>' attribute feature.\n-\t\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n-\t\t * @generated\n-\t\t */\n-\t\tEAttribute PROPERTY__IS_PRIMARY_KEY = eINSTANCE.getProperty_IsPrimaryKey();\n-\n-\t\t/**\n-\t\t * The meta object literal for the '{@link org.obeonetwork.dsl.entity.impl.AttributeImpl <em>Attribute</em>}' class.\n-\t\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n-\t\t * @see org.obeonetwork.dsl.entity.impl.AttributeImpl\n-\t\t * @see org.obeonetwork.dsl.entity.impl.EntityPackageImpl#getAttribute()\n-\t\t * @generated\n-\t\t */\n-\t\tEClass ATTRIBUTE = eINSTANCE.getAttribute();\n-\n-\t\t/**\n-\t\t * The meta object literal for the '<em><b>Entity</b></em>' container reference feature.\n-\t\t * <!-- begin-user-doc --> <!--\n-\t\t * end-user-doc -->\n-\t\t * @generated\n-\t\t */\n-\t\tEReference ATTRIBUTE__ENTITY = eINSTANCE.getAttribute_Entity();\n-\n-\t\t/**\n-\t\t * The meta object literal for the '<em><b>Type</b></em>' reference feature.\n-\t\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n-\t\t * @generated\n-\t\t */\n-\t\tEReference ATTRIBUTE__TYPE = eINSTANCE.getAttribute_Type();\n-\n-\t\t/**\n-\t\t * The meta object literal for the '{@link org.obeonetwork.dsl.entity.impl.ReferenceImpl <em>Reference</em>}' class.\n-\t\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n-\t\t * @see org.obeonetwork.dsl.entity.impl.ReferenceImpl\n-\t\t * @see org.obeonetwork.dsl.entity.impl.EntityPackageImpl#getReference()\n-\t\t * @generated\n-\t\t */\n-\t\tEClass REFERENCE = eINSTANCE.getReference();\n-\n-\t\t/**\n-\t\t * The meta object literal for the '<em><b>Entity</b></em>' container reference feature.\n-\t\t * <!-- begin-user-doc --> <!--\n-\t\t * end-user-doc -->\n-\t\t * @generated\n-\t\t */\n-\t\tEReference REFERENCE__ENTITY = eINSTANCE.getReference_Entity();\n-\n-\t\t/**\n-\t\t * The meta object literal for the '<em><b>Is Composite</b></em>' attribute feature.\n-\t\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n-\t\t * @generated\n-\t\t */\n-\t\tEAttribute REFERENCE__IS_COMPOSITE = eINSTANCE.getReference_IsComposite();\n-\n-\t\t/**\n-\t\t * The meta object literal for the '<em><b>Opposite Of</b></em>' reference feature.\n-\t\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n-\t\t * @generated\n-\t\t */\n-\t\tEReference REFERENCE__OPPOSITE_OF = eINSTANCE.getReference_OppositeOf();\n-\n-\t\t/**\n-\t\t * The meta object literal for the '<em><b>Type</b></em>' reference feature.\n-\t\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n-\t\t * @generated\n-\t\t */\n-\t\tEReference REFERENCE__TYPE = eINSTANCE.getReference_Type();\n-\n-\t\t/**\n-\t\t * The meta object literal for the '<em><b>Navigable</b></em>' attribute feature.\n-\t\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n-\t\t * @generated\n-\t\t */\n-\t\tEAttribute REFERENCE__NAVIGABLE = eINSTANCE.getReference_Navigable();\n-\n \t\t/**\n \t\t * The meta object literal for the '{@link org.obeonetwork.dsl.entity.impl.FinderImpl <em>Finder</em>}' class.\n \t\t * <!-- begin-user-doc --> <!-- end-user-doc -->", "raw_url": "https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2FEntityPackage.java", "sha": "14c3d4bb8c77170a81ed8f65adda6b569fd79b2f", "status": "modified" }, { "additions": 2, "blob_url": "https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2FInternalCriterion.java", "changes": 2, "contents_url": "https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2FInternalCriterion.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6", "deletions": 0, "filename": "models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/InternalCriterion.java", "new_code": "import org.obeonetwork.dsl.environment.Attribute;\n", "new_methods": [], "old_code": "", "old_methods": [], "patch": "@@ -12,6 +12,8 @@\n */\n package org.obeonetwork.dsl.entity;\n \n+import org.obeonetwork.dsl.environment.Attribute;\n+\n /**\n * <!-- begin-user-doc --> A representation of the model object '<em><b>Internal Criterion</b></em>'.\n * <!-- end-user-doc -->", "raw_url": "https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2FInternalCriterion.java", "sha": "900d7d53d0d169f943e7592ec0265e42f7f99a26", "status": "modified" }, { "additions": 37, "blob_url": "https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2FRoot.java", "changes": 46, "contents_url": "https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2FRoot.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6", "deletions": 9, "filename": "models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/Root.java", "new_code": "import org.obeonetwork.dsl.environment.TypesDefinition;\n * <li>{@link org.obeonetwork.dsl.entity.Root#getName <em>Name</em>}</li>\n * <li>{@link org.obeonetwork.dsl.entity.Root#getNamespaces <em>Namespaces</em>}</li>\npublic interface Root extends TypesDefinition {\n\t * Returns the value of the '<em><b>Name</b></em>' attribute.\n\t * If the meaning of the '<em>Name</em>' attribute isn't clear,\n\t * there really should be more of a description here...\n\t * @return the value of the '<em>Name</em>' attribute.\n\t * @see #setName(String)\n\t * @see org.obeonetwork.dsl.entity.EntityPackage#getRoot_Name()\n\t * @model\n\t * @generated\n\t */\n\tString getName();\n\n\t/**\n\t * Sets the value of the '{@link org.obeonetwork.dsl.entity.Root#getName <em>Name</em>}' attribute.\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @param value the new value of the '<em>Name</em>' attribute.\n\t * @see #getName()\n\t * @generated\n\t */\n\tvoid setName(String value);\n\n\t/**\n\t * Returns the value of the '<em><b>Namespaces</b></em>' containment reference list.\n\t * The list contents are of type {@link org.obeonetwork.dsl.environment.Namespace}.\n\t * <!-- begin-user-doc -->\n\t * <p>\n\t * If the meaning of the '<em>Namespaces</em>' containment reference list isn't clear,\n\t * there really should be more of a description here...\n\t * </p>\n\t * <!-- end-user-doc -->\n\t * @return the value of the '<em>Namespaces</em>' containment reference list.\n\t * @see org.obeonetwork.dsl.entity.EntityPackage#getRoot_Namespaces()\n\tEList<Namespace> getNamespaces();", "new_methods": [], "old_code": " * <li>{@link org.obeonetwork.dsl.entity.Root#getBlocks <em>Blocks</em>}</li>\npublic interface Root extends Namespace {\n\t * Returns the value of the '<em><b>Blocks</b></em>' containment reference list.\n\t * The list contents are of type {@link org.obeonetwork.dsl.entity.Block}.\n\t * If the meaning of the '<em>Blocks</em>' containment reference list\n\t * isn't clear, there really should be more of a description here...\n\t * @return the value of the '<em>Blocks</em>' containment reference list.\n\t * @see org.obeonetwork.dsl.entity.EntityPackage#getRoot_Blocks()\n\tEList<Block> getBlocks();", "old_methods": [], "patch": "@@ -14,6 +14,7 @@\n \n import org.eclipse.emf.common.util.EList;\n import org.obeonetwork.dsl.environment.Namespace;\n+import org.obeonetwork.dsl.environment.TypesDefinition;\n \n /**\n * <!-- begin-user-doc --> A representation of the model object '<em><b>Root</b></em>'.\n@@ -22,15 +23,16 @@\n * <p>\n * The following features are supported:\n * <ul>\n- * <li>{@link org.obeonetwork.dsl.entity.Root#getBlocks <em>Blocks</em>}</li>\n+ * <li>{@link org.obeonetwork.dsl.entity.Root#getName <em>Name</em>}</li>\n+ * <li>{@link org.obeonetwork.dsl.entity.Root#getNamespaces <em>Namespaces</em>}</li>\n * </ul>\n * </p>\n *\n * @see org.obeonetwork.dsl.entity.EntityPackage#getRoot()\n * @model\n * @generated\n */\n-public interface Root extends Namespace {\n+public interface Root extends TypesDefinition {\n \t/**\n \t * <!-- begin-user-doc -->\n \t * <!-- end-user-doc -->\n@@ -39,19 +41,45 @@ public interface Root extends Namespace {\n \tString copyright = \"Copyright (c) 2008-2009 Obeo.\\nAll rights reserved. This program and the accompanying materials\\nare made available under the terms of the Eclipse Public License v1.0\\nwhich accompanies this distribution, and is available at\\nhttp://www.eclipse.org/legal/epl-v10.html\\n\\nContributors:\\n Obeo - initial API and implementation\";\n \n \t/**\n-\t * Returns the value of the '<em><b>Blocks</b></em>' containment reference list.\n-\t * The list contents are of type {@link org.obeonetwork.dsl.entity.Block}.\n+\t * Returns the value of the '<em><b>Name</b></em>' attribute.\n \t * <!-- begin-user-doc -->\n \t * <p>\n-\t * If the meaning of the '<em>Blocks</em>' containment reference list\n-\t * isn't clear, there really should be more of a description here...\n+\t * If the meaning of the '<em>Name</em>' attribute isn't clear,\n+\t * there really should be more of a description here...\n \t * </p>\n \t * <!-- end-user-doc -->\n-\t * @return the value of the '<em>Blocks</em>' containment reference list.\n-\t * @see org.obeonetwork.dsl.entity.EntityPackage#getRoot_Blocks()\n+\t * @return the value of the '<em>Name</em>' attribute.\n+\t * @see #setName(String)\n+\t * @see org.obeonetwork.dsl.entity.EntityPackage#getRoot_Name()\n+\t * @model\n+\t * @generated\n+\t */\n+\tString getName();\n+\n+\t/**\n+\t * Sets the value of the '{@link org.obeonetwork.dsl.entity.Root#getName <em>Name</em>}' attribute.\n+\t * <!-- begin-user-doc -->\n+\t * <!-- end-user-doc -->\n+\t * @param value the new value of the '<em>Name</em>' attribute.\n+\t * @see #getName()\n+\t * @generated\n+\t */\n+\tvoid setName(String value);\n+\n+\t/**\n+\t * Returns the value of the '<em><b>Namespaces</b></em>' containment reference list.\n+\t * The list contents are of type {@link org.obeonetwork.dsl.environment.Namespace}.\n+\t * <!-- begin-user-doc -->\n+\t * <p>\n+\t * If the meaning of the '<em>Namespaces</em>' containment reference list isn't clear,\n+\t * there really should be more of a description here...\n+\t * </p>\n+\t * <!-- end-user-doc -->\n+\t * @return the value of the '<em>Namespaces</em>' containment reference list.\n+\t * @see org.obeonetwork.dsl.entity.EntityPackage#getRoot_Namespaces()\n \t * @model containment=\"true\" resolveProxies=\"true\"\n \t * @generated\n \t */\n-\tEList<Block> getBlocks();\n+\tEList<Namespace> getNamespaces();\n \n } // Root", "raw_url": "https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2FRoot.java", "sha": "c63c83ff05c50157b57c9bea3628643643870180", "status": "modified" }, { "additions": 6, "blob_url": "https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2FextensionUtilities%2FEntityFilter.java", "changes": 12, "contents_url": "https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2FextensionUtilities%2FEntityFilter.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6", "deletions": 6, "filename": "models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/extensionUtilities/EntityFilter.java", "new_code": "import org.obeonetwork.dsl.environment.Attribute;\nimport org.obeonetwork.dsl.environment.Property;\nimport org.obeonetwork.dsl.environment.Reference;\n\t * The list contents are of type {@link org.obeonetwork.dsl.environment.Attribute}.\n\t * The list contents are of type {@link org.obeonetwork.dsl.environment.Reference}.\n\t * The list contents are of type {@link org.obeonetwork.dsl.environment.Property}.", "new_methods": [], "old_code": "import org.obeonetwork.dsl.entity.Attribute;\nimport org.obeonetwork.dsl.entity.Property;\nimport org.obeonetwork.dsl.entity.Reference;\n\t * The list contents are of type {@link org.obeonetwork.dsl.entity.Attribute}.\n\t * The list contents are of type {@link org.obeonetwork.dsl.entity.Reference}.\n\t * The list contents are of type {@link org.obeonetwork.dsl.entity.Property}.", "old_methods": [], "patch": "@@ -13,11 +13,11 @@\n package org.obeonetwork.dsl.entity.extensionUtilities;\n \n import org.eclipse.emf.common.util.EList;\n-import org.obeonetwork.dsl.entity.Attribute;\n import org.obeonetwork.dsl.entity.Entity;\n-import org.obeonetwork.dsl.entity.Property;\n-import org.obeonetwork.dsl.entity.Reference;\n+import org.obeonetwork.dsl.environment.Attribute;\n import org.obeonetwork.dsl.environment.Filter;\n+import org.obeonetwork.dsl.environment.Property;\n+import org.obeonetwork.dsl.environment.Reference;\n \n /**\n * <!-- begin-user-doc --> A representation of the model object '<em><b>Entity Filter</b></em>'.\n@@ -47,7 +47,7 @@ public interface EntityFilter extends Filter {\n \n \t/**\n \t * Returns the value of the '<em><b>Attribute References</b></em>' reference list.\n-\t * The list contents are of type {@link org.obeonetwork.dsl.entity.Attribute}.\n+\t * The list contents are of type {@link org.obeonetwork.dsl.environment.Attribute}.\n \t * <!-- begin-user-doc -->\n \t * <p>\n \t * If the meaning of the '<em>Attribute References</em>' reference list\n@@ -63,7 +63,7 @@ public interface EntityFilter extends Filter {\n \n \t/**\n \t * Returns the value of the '<em><b>Reference References</b></em>' reference list.\n-\t * The list contents are of type {@link org.obeonetwork.dsl.entity.Reference}.\n+\t * The list contents are of type {@link org.obeonetwork.dsl.environment.Reference}.\n \t * <!-- begin-user-doc -->\n \t * <p>\n \t * If the meaning of the '<em>Reference References</em>' reference list\n@@ -79,7 +79,7 @@ public interface EntityFilter extends Filter {\n \n \t/**\n \t * Returns the value of the '<em><b>Owned Property References</b></em>' reference list.\n-\t * The list contents are of type {@link org.obeonetwork.dsl.entity.Property}.\n+\t * The list contents are of type {@link org.obeonetwork.dsl.environment.Property}.\n \t * <!-- begin-user-doc -->\n \t * <p>\n \t * If the meaning of the '<em>Owned Property References</em>' reference", "raw_url": "https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2FextensionUtilities%2FEntityFilter.java", "sha": "c1a8de5ec12c4a7f45120d7daf3af06680d2fe87", "status": "modified" }, { "additions": 24, "blob_url": "https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2FextensionUtilities%2Fimpl%2FEntityFilterImpl.java", "changes": 48, "contents_url": "https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2FextensionUtilities%2Fimpl%2FEntityFilterImpl.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6", "deletions": 24, "filename": "models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/extensionUtilities/impl/EntityFilterImpl.java", "new_code": "import org.obeonetwork.dsl.environment.Attribute;\nimport org.obeonetwork.dsl.environment.Property;\nimport org.obeonetwork.dsl.environment.Reference;\n\n\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\tpublic EList<Attribute> getAttributeReferences() {\n\t\tBasicEList<Attribute> result = new UniqueEList<Attribute>() {\n\t\t\tprivate static final long serialVersionUID = 971586213550724954L;\n\n\t\tfor (Property property : getOwnedPropertyReferences()) {\n\t\t\t\tresult.add((Attribute)property);\n\t\tEList<Attribute> unmodifiableResult = new EcoreEList.UnmodifiableEList.FastCompare<Attribute>(\n\t\t\t\tthis, ExtensionUtilitiesPackage.Literals.ENTITY_FILTER__ATTRIBUTE_REFERENCES, result.size(),\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\tpublic EList<Reference> getReferenceReferences() {\n\t\tBasicEList<Reference> result = new UniqueEList<Reference>() {\n\t\t\tprivate static final long serialVersionUID = 5391913769894408421L;\n\n\t\tfor (Property property : getOwnedPropertyReferences()) {\n\t\t\t\tresult.add((Reference)property);\n\t\tEList<Reference> unmodifiableResult = new EcoreEList.UnmodifiableEList.FastCompare<Reference>(", "new_methods": [], "old_code": "import java.util.Iterator;\nimport org.obeonetwork.dsl.entity.Attribute;\nimport org.obeonetwork.dsl.entity.Property;\nimport org.obeonetwork.dsl.entity.Reference;\n\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n\t * \n\tpublic EList getAttributeReferences() {\n\t\tBasicEList result = new UniqueEList() {\n\t\tCollection properties = getOwnedPropertyReferences();\n\t\tfor (Iterator iter = properties.iterator(); iter.hasNext();) {\n\t\t\tProperty property = (Property) iter.next();\n\t\t\t\tresult.add(property);\n\t\tEList unmodifiableResult = new EcoreEList.UnmodifiableEList.FastCompare(\n\t\t\t\tthis, ExtensionUtilitiesPackage.eINSTANCE\n\t\t\t\t\t\t.getEntityFilter_AttributeReferences(), result.size(),\n\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n\t * \n\tpublic EList getReferenceReferences() {\n\t\tBasicEList result = new UniqueEList() {\n\t\tCollection properties = getOwnedPropertyReferences();\n\t\tfor (Iterator iter = properties.iterator(); iter.hasNext();) {\n\t\t\tProperty property = (Property) iter.next();\n\t\t\t\tresult.add(property);\n\t\tEList unmodifiableResult = new EcoreEList.UnmodifiableEList.FastCompare(", "old_methods": [], "patch": "@@ -13,19 +13,18 @@\n package org.obeonetwork.dsl.entity.extensionUtilities.impl;\n \n import java.util.Collection;\n-import java.util.Iterator;\n \n import org.eclipse.emf.common.util.BasicEList;\n import org.eclipse.emf.common.util.EList;\n import org.eclipse.emf.common.util.UniqueEList;\n import org.eclipse.emf.ecore.EClass;\n import org.eclipse.emf.ecore.util.EcoreEList;\n-import org.obeonetwork.dsl.entity.Attribute;\n import org.obeonetwork.dsl.entity.Entity;\n-import org.obeonetwork.dsl.entity.Property;\n-import org.obeonetwork.dsl.entity.Reference;\n import org.obeonetwork.dsl.entity.extensionUtilities.EntityFilter;\n import org.obeonetwork.dsl.entity.extensionUtilities.ExtensionUtilitiesPackage;\n+import org.obeonetwork.dsl.environment.Attribute;\n+import org.obeonetwork.dsl.environment.Property;\n+import org.obeonetwork.dsl.environment.Reference;\n import org.obeonetwork.dsl.environment.impl.FilterImpl;\n \n /**\n@@ -68,13 +67,17 @@ protected EClass eStaticClass() {\n \t\treturn ExtensionUtilitiesPackage.Literals.ENTITY_FILTER;\n \t}\n \n+\n+\n \t/**\n-\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n-\t * \n+\t * <!-- begin-user-doc -->\n+\t * <!-- end-user-doc -->\n \t * @generated NOT\n \t */\n-\tpublic EList getAttributeReferences() {\n-\t\tBasicEList result = new UniqueEList() {\n+\tpublic EList<Attribute> getAttributeReferences() {\n+\t\tBasicEList<Attribute> result = new UniqueEList<Attribute>() {\n+\t\t\tprivate static final long serialVersionUID = 971586213550724954L;\n+\n \t\t\tprotected Object[] newData(int capacity) {\n \t\t\t\treturn new Attribute[capacity];\n \t\t\t}\n@@ -83,28 +86,27 @@ protected boolean useEquals() {\n \t\t\t\treturn false;\n \t\t\t}\n \t\t};\n-\t\tCollection properties = getOwnedPropertyReferences();\n-\t\tfor (Iterator iter = properties.iterator(); iter.hasNext();) {\n-\t\t\tProperty property = (Property) iter.next();\n+\t\tfor (Property property : getOwnedPropertyReferences()) {\n \t\t\tif (property instanceof Attribute) {\n-\t\t\t\tresult.add(property);\n+\t\t\t\tresult.add((Attribute)property);\n \t\t\t}\n \t\t}\n \t\tresult.shrink();\n-\t\tEList unmodifiableResult = new EcoreEList.UnmodifiableEList.FastCompare(\n-\t\t\t\tthis, ExtensionUtilitiesPackage.eINSTANCE\n-\t\t\t\t\t\t.getEntityFilter_AttributeReferences(), result.size(),\n+\t\tEList<Attribute> unmodifiableResult = new EcoreEList.UnmodifiableEList.FastCompare<Attribute>(\n+\t\t\t\tthis, ExtensionUtilitiesPackage.Literals.ENTITY_FILTER__ATTRIBUTE_REFERENCES, result.size(),\n \t\t\t\tresult.data());\n \t\treturn unmodifiableResult;\n \t}\n \n \t/**\n-\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n-\t * \n+\t * <!-- begin-user-doc -->\n+\t * <!-- end-user-doc -->\n \t * @generated NOT\n \t */\n-\tpublic EList getReferenceReferences() {\n-\t\tBasicEList result = new UniqueEList() {\n+\tpublic EList<Reference> getReferenceReferences() {\n+\t\tBasicEList<Reference> result = new UniqueEList<Reference>() {\n+\t\t\tprivate static final long serialVersionUID = 5391913769894408421L;\n+\n \t\t\tprotected Object[] newData(int capacity) {\n \t\t\t\treturn new Reference[capacity];\n \t\t\t}\n@@ -113,15 +115,13 @@ protected boolean useEquals() {\n \t\t\t\treturn false;\n \t\t\t}\n \t\t};\n-\t\tCollection properties = getOwnedPropertyReferences();\n-\t\tfor (Iterator iter = properties.iterator(); iter.hasNext();) {\n-\t\t\tProperty property = (Property) iter.next();\n+\t\tfor (Property property : getOwnedPropertyReferences()) {\n \t\t\tif (property instanceof Reference) {\n-\t\t\t\tresult.add(property);\n+\t\t\t\tresult.add((Reference)property);\n \t\t\t}\n \t\t}\n \t\tresult.shrink();\n-\t\tEList unmodifiableResult = new EcoreEList.UnmodifiableEList.FastCompare(\n+\t\tEList<Reference> unmodifiableResult = new EcoreEList.UnmodifiableEList.FastCompare<Reference>(\n \t\t\t\tthis, ExtensionUtilitiesPackage.eINSTANCE\n \t\t\t\t\t\t.getEntityFilter_ReferenceReferences(), result.size(),\n \t\t\t\tresult.data());", "raw_url": "https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2FextensionUtilities%2Fimpl%2FEntityFilterImpl.java", "sha": "3175c5e3cd8c17cbd66b3193b033119fceb5f195", "status": "modified" }, { "additions": 2, "blob_url": "https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2FextensionUtilities%2Fimpl%2FExtensionUtilitiesFactoryImpl.java", "changes": 3, "contents_url": "https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2FextensionUtilities%2Fimpl%2FExtensionUtilitiesFactoryImpl.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6", "deletions": 1, "filename": "models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/extensionUtilities/impl/ExtensionUtilitiesFactoryImpl.java", "new_code": "import org.obeonetwork.dsl.entity.extensionUtilities.*;\n\t\t\tExtensionUtilitiesFactory theExtensionUtilitiesFactory = (ExtensionUtilitiesFactory)EPackage.Registry.INSTANCE.getEFactory(ExtensionUtilitiesPackage.eNS_URI);", "new_methods": [], "old_code": "\t\t\tExtensionUtilitiesFactory theExtensionUtilitiesFactory = (ExtensionUtilitiesFactory)EPackage.Registry.INSTANCE.getEFactory(\"http://www.obeonetwork.org/dsl/entity/2.0.0/utilities\"); ", "old_methods": [], "patch": "@@ -17,6 +17,7 @@\n import org.eclipse.emf.ecore.EPackage;\n import org.eclipse.emf.ecore.impl.EFactoryImpl;\n import org.eclipse.emf.ecore.plugin.EcorePlugin;\n+import org.obeonetwork.dsl.entity.extensionUtilities.*;\n import org.obeonetwork.dsl.entity.extensionUtilities.EntityFilter;\n import org.obeonetwork.dsl.entity.extensionUtilities.ExtensionUtilitiesFactory;\n import org.obeonetwork.dsl.entity.extensionUtilities.ExtensionUtilitiesPackage;\n@@ -43,7 +44,7 @@ public class ExtensionUtilitiesFactoryImpl extends EFactoryImpl implements\n \t */\n \tpublic static ExtensionUtilitiesFactory init() {\n \t\ttry {\n-\t\t\tExtensionUtilitiesFactory theExtensionUtilitiesFactory = (ExtensionUtilitiesFactory)EPackage.Registry.INSTANCE.getEFactory(\"http://www.obeonetwork.org/dsl/entity/2.0.0/utilities\"); \n+\t\t\tExtensionUtilitiesFactory theExtensionUtilitiesFactory = (ExtensionUtilitiesFactory)EPackage.Registry.INSTANCE.getEFactory(ExtensionUtilitiesPackage.eNS_URI);\n \t\t\tif (theExtensionUtilitiesFactory != null) {\n \t\t\t\treturn theExtensionUtilitiesFactory;\n \t\t\t}", "raw_url": "https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2FextensionUtilities%2Fimpl%2FExtensionUtilitiesFactoryImpl.java", "sha": "98c6a05bfb87fa174bb2d96f093d870c452e917f", "status": "modified" }, { "additions": 3, "blob_url": "https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2FextensionUtilities%2Fimpl%2FExtensionUtilitiesPackageImpl.java", "changes": 6, "contents_url": "https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2FextensionUtilities%2Fimpl%2FExtensionUtilitiesPackageImpl.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6", "deletions": 3, "filename": "models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/extensionUtilities/impl/ExtensionUtilitiesPackageImpl.java", "new_code": "\t\tinitEReference(getEntityFilter_AttributeReferences(), theEnvironmentPackage.getAttribute(), null, \"attributeReferences\", null, 0, -1, EntityFilter.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);\n\t\tinitEReference(getEntityFilter_ReferenceReferences(), theEnvironmentPackage.getReference(), null, \"referenceReferences\", null, 0, -1, EntityFilter.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);\n\t\tinitEReference(getEntityFilter_OwnedPropertyReferences(), theEnvironmentPackage.getProperty(), null, \"ownedPropertyReferences\", null, 0, -1, EntityFilter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);", "new_methods": [], "old_code": "\t\tinitEReference(getEntityFilter_AttributeReferences(), theEntityPackage.getAttribute(), null, \"attributeReferences\", null, 0, -1, EntityFilter.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);\n\t\tinitEReference(getEntityFilter_ReferenceReferences(), theEntityPackage.getReference(), null, \"referenceReferences\", null, 0, -1, EntityFilter.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);\n\t\tinitEReference(getEntityFilter_OwnedPropertyReferences(), theEntityPackage.getProperty(), null, \"ownedPropertyReferences\", null, 0, -1, EntityFilter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);", "old_methods": [], "patch": "@@ -217,9 +217,9 @@ public void initializePackageContents() {\n \n \t\t// Initialize classes and features; add operations and parameters\n \t\tinitEClass(entityFilterEClass, EntityFilter.class, \"EntityFilter\", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\n-\t\tinitEReference(getEntityFilter_AttributeReferences(), theEntityPackage.getAttribute(), null, \"attributeReferences\", null, 0, -1, EntityFilter.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);\n-\t\tinitEReference(getEntityFilter_ReferenceReferences(), theEntityPackage.getReference(), null, \"referenceReferences\", null, 0, -1, EntityFilter.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);\n-\t\tinitEReference(getEntityFilter_OwnedPropertyReferences(), theEntityPackage.getProperty(), null, \"ownedPropertyReferences\", null, 0, -1, EntityFilter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n+\t\tinitEReference(getEntityFilter_AttributeReferences(), theEnvironmentPackage.getAttribute(), null, \"attributeReferences\", null, 0, -1, EntityFilter.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);\n+\t\tinitEReference(getEntityFilter_ReferenceReferences(), theEnvironmentPackage.getReference(), null, \"referenceReferences\", null, 0, -1, EntityFilter.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);\n+\t\tinitEReference(getEntityFilter_OwnedPropertyReferences(), theEnvironmentPackage.getProperty(), null, \"ownedPropertyReferences\", null, 0, -1, EntityFilter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n \t\tinitEReference(getEntityFilter_Entity(), theEntityPackage.getEntity(), null, \"entity\", null, 1, 1, EntityFilter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n \t}\n ", "raw_url": "https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2FextensionUtilities%2Fimpl%2FExtensionUtilitiesPackageImpl.java", "sha": "e9d6b7d5daecb5c2895ea1b7da848560dd0fc78e", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2FextensionUtilities%2Futil%2FExtensionUtilitiesAdapterFactory.java", "changes": 1, "contents_url": "https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2FextensionUtilities%2Futil%2FExtensionUtilitiesAdapterFactory.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6", "deletions": 0, "filename": "models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/extensionUtilities/util/ExtensionUtilitiesAdapterFactory.java", "new_code": "import org.obeonetwork.dsl.entity.extensionUtilities.*;", "new_methods": [], "old_code": "", "old_methods": [], "patch": "@@ -16,6 +16,7 @@\n import org.eclipse.emf.common.notify.Notifier;\n import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;\n import org.eclipse.emf.ecore.EObject;\n+import org.obeonetwork.dsl.entity.extensionUtilities.*;\n import org.obeonetwork.dsl.entity.extensionUtilities.EntityFilter;\n import org.obeonetwork.dsl.entity.extensionUtilities.ExtensionUtilitiesPackage;\n import org.obeonetwork.dsl.environment.Filter;", "raw_url": "https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2FextensionUtilities%2Futil%2FExtensionUtilitiesAdapterFactory.java", "sha": "ce3d029830d89793d3504cad4bfc4e8ccaa01586", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2FextensionUtilities%2Futil%2FExtensionUtilitiesSwitch.java", "changes": 1, "contents_url": "https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2FextensionUtilities%2Futil%2FExtensionUtilitiesSwitch.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6", "deletions": 0, "filename": "models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/extensionUtilities/util/ExtensionUtilitiesSwitch.java", "new_code": "import org.obeonetwork.dsl.entity.extensionUtilities.*;", "new_methods": [], "old_code": "", "old_methods": [], "patch": "@@ -16,6 +16,7 @@\n \n import org.eclipse.emf.ecore.EClass;\n import org.eclipse.emf.ecore.EObject;\n+import org.obeonetwork.dsl.entity.extensionUtilities.*;\n import org.obeonetwork.dsl.entity.extensionUtilities.EntityFilter;\n import org.obeonetwork.dsl.entity.extensionUtilities.ExtensionUtilitiesPackage;\n import org.obeonetwork.dsl.environment.Filter;", "raw_url": "https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2FextensionUtilities%2Futil%2FExtensionUtilitiesSwitch.java", "sha": "7c50391393d39bd6e2ff1e6c29e7056b8057015d", "status": "modified" }, { "additions": 2, "blob_url": "https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fimpl%2FEntityFactoryImpl.java", "changes": 37, "contents_url": "https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fimpl%2FEntityFactoryImpl.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6", "deletions": 35, "filename": "models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/impl/EntityFactoryImpl.java", "new_code": "import org.obeonetwork.dsl.entity.*;\n\t\t\tEntityFactory theEntityFactory = (EntityFactory)EPackage.Registry.INSTANCE.getEFactory(EntityPackage.eNS_URI);", "new_methods": [], "old_code": "import org.obeonetwork.dsl.entity.Attribute;\nimport org.obeonetwork.dsl.entity.Block;\nimport org.obeonetwork.dsl.entity.Reference;\nimport org.obeonetwork.dsl.entity.spec.ReferenceSpec;\n\t\t\tEntityFactory theEntityFactory = (EntityFactory)EPackage.Registry.INSTANCE.getEFactory(\"http://www.obeonetwork.org/dsl/entity/2.0.0\"); \n\t\t\tcase EntityPackage.BLOCK: return (EObject)createBlock();\n\t\t\tcase EntityPackage.ATTRIBUTE: return (EObject)createAttribute();\n\t\t\tcase EntityPackage.REFERENCE: return (EObject)createReference();\n\t/**\n\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n\t * @generated\n\t */\n\tpublic Block createBlock() {\n\t\tBlockImpl block = new BlockImpl();\n\t\treturn block;\n\t}\n\n\t/**\n\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n\t * @generated\n\t */\n\tpublic Attribute createAttribute() {\n\t\tAttributeImpl attribute = new AttributeImpl();\n\t\treturn attribute;\n\t}\n\n\t/**\n\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n\t * @generated Not\n\t */\n\tpublic Reference createReference() {\n\t\tReferenceImpl reference = new ReferenceSpec();\n\t\treturn reference;\n\t}\n", "old_methods": [ { "arguments": [], "filename": "models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/impl/EntityFactoryImpl.java", "implementation": "BlockImpl block = new BlockImpl();\n\t\treturn block;", "signature": "Block createBlock()" }, { "arguments": [], "filename": "models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/impl/EntityFactoryImpl.java", "implementation": "AttributeImpl attribute = new AttributeImpl();\n\t\treturn attribute;", "signature": "Attribute createAttribute()" }, { "arguments": [], "filename": "models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/impl/EntityFactoryImpl.java", "implementation": "ReferenceImpl reference = new ReferenceSpec();\n\t\treturn reference;", "signature": "Reference createReference()" } ], "patch": "@@ -18,18 +18,15 @@\n import org.eclipse.emf.ecore.EPackage;\n import org.eclipse.emf.ecore.impl.EFactoryImpl;\n import org.eclipse.emf.ecore.plugin.EcorePlugin;\n-import org.obeonetwork.dsl.entity.Attribute;\n-import org.obeonetwork.dsl.entity.Block;\n+import org.obeonetwork.dsl.entity.*;\n import org.obeonetwork.dsl.entity.Entity;\n import org.obeonetwork.dsl.entity.EntityFactory;\n import org.obeonetwork.dsl.entity.EntityPackage;\n import org.obeonetwork.dsl.entity.ExternalCriterion;\n import org.obeonetwork.dsl.entity.Finder;\n import org.obeonetwork.dsl.entity.InheritanceKind;\n import org.obeonetwork.dsl.entity.InternalCriterion;\n-import org.obeonetwork.dsl.entity.Reference;\n import org.obeonetwork.dsl.entity.Root;\n-import org.obeonetwork.dsl.entity.spec.ReferenceSpec;\n \n /**\n * <!-- begin-user-doc --> An implementation of the model <b>Factory</b>. <!--\n@@ -52,7 +49,7 @@ public class EntityFactoryImpl extends EFactoryImpl implements EntityFactory {\n \t */\n \tpublic static EntityFactory init() {\n \t\ttry {\n-\t\t\tEntityFactory theEntityFactory = (EntityFactory)EPackage.Registry.INSTANCE.getEFactory(\"http://www.obeonetwork.org/dsl/entity/2.0.0\"); \n+\t\t\tEntityFactory theEntityFactory = (EntityFactory)EPackage.Registry.INSTANCE.getEFactory(EntityPackage.eNS_URI);\n \t\t\tif (theEntityFactory != null) {\n \t\t\t\treturn theEntityFactory;\n \t\t\t}\n@@ -81,10 +78,7 @@ public EntityFactoryImpl() {\n \tpublic EObject create(EClass eClass) {\n \t\tswitch (eClass.getClassifierID()) {\n \t\t\tcase EntityPackage.ROOT: return (EObject)createRoot();\n-\t\t\tcase EntityPackage.BLOCK: return (EObject)createBlock();\n \t\t\tcase EntityPackage.ENTITY: return (EObject)createEntity();\n-\t\t\tcase EntityPackage.ATTRIBUTE: return (EObject)createAttribute();\n-\t\t\tcase EntityPackage.REFERENCE: return (EObject)createReference();\n \t\t\tcase EntityPackage.FINDER: return (EObject)createFinder();\n \t\t\tcase EntityPackage.INTERNAL_CRITERION: return (EObject)createInternalCriterion();\n \t\t\tcase EntityPackage.EXTERNAL_CRITERION: return (EObject)createExternalCriterion();\n@@ -130,15 +124,6 @@ public Root createRoot() {\n \t\treturn root;\n \t}\n \n-\t/**\n-\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n-\t * @generated\n-\t */\n-\tpublic Block createBlock() {\n-\t\tBlockImpl block = new BlockImpl();\n-\t\treturn block;\n-\t}\n-\n \t/**\n \t * <!-- begin-user-doc --> <!-- end-user-doc -->\n \t * @generated\n@@ -148,24 +133,6 @@ public Entity createEntity() {\n \t\treturn entity;\n \t}\n \n-\t/**\n-\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n-\t * @generated\n-\t */\n-\tpublic Attribute createAttribute() {\n-\t\tAttributeImpl attribute = new AttributeImpl();\n-\t\treturn attribute;\n-\t}\n-\n-\t/**\n-\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n-\t * @generated Not\n-\t */\n-\tpublic Reference createReference() {\n-\t\tReferenceImpl reference = new ReferenceSpec();\n-\t\treturn reference;\n-\t}\n-\n \t/**\n \t * <!-- begin-user-doc --> <!-- end-user-doc -->\n \t * @generated", "raw_url": "https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fimpl%2FEntityFactoryImpl.java", "sha": "abadb34c5276f1a33ec1734109c04af0f9632128", "status": "modified" }, { "additions": 0, "blob_url": "https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fimpl%2FEntityImpl.java", "changes": 266, "contents_url": "https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fimpl%2FEntityImpl.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6", "deletions": 266, "filename": "models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/impl/EntityImpl.java", "new_code": "", "new_methods": [], "old_code": "import org.eclipse.emf.common.util.BasicEList;\nimport org.eclipse.emf.common.util.UniqueEList;\nimport org.eclipse.emf.ecore.util.EcoreEList;\nimport org.eclipse.emf.ecore.util.EcoreUtil;\nimport org.obeonetwork.dsl.entity.Attribute;\nimport org.obeonetwork.dsl.entity.Block;\nimport org.obeonetwork.dsl.entity.Property;\nimport org.obeonetwork.dsl.entity.Reference;\n * <li>{@link org.obeonetwork.dsl.entity.impl.EntityImpl#getOwnedAttributes <em>Owned Attributes</em>}</li>\n * <li>{@link org.obeonetwork.dsl.entity.impl.EntityImpl#getOwnedReferences <em>Owned References</em>}</li>\n * <li>{@link org.obeonetwork.dsl.entity.impl.EntityImpl#getSupertype <em>Supertype</em>}</li>\n * <li>{@link org.obeonetwork.dsl.entity.impl.EntityImpl#getAttributes <em>Attributes</em>}</li>\n * <li>{@link org.obeonetwork.dsl.entity.impl.EntityImpl#getReferences <em>References</em>}</li>\n * <li>{@link org.obeonetwork.dsl.entity.impl.EntityImpl#getProperties <em>Properties</em>}</li>\n * <li>{@link org.obeonetwork.dsl.entity.impl.EntityImpl#getBlock <em>Block</em>}</li>\n\t/**\n\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n\t * @generated\n\t */\n\t@SuppressWarnings(\"unchecked\")\n\tpublic EList<Attribute> getOwnedAttributes() {\n\t\treturn (EList<Attribute>)eDynamicGet(EntityPackage.ENTITY__OWNED_ATTRIBUTES, EntityPackage.Literals.ENTITY__OWNED_ATTRIBUTES, true, true);\n\t}\n\n\t/**\n\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n\t * @generated\n\t */\n\t@SuppressWarnings(\"unchecked\")\n\tpublic EList<Reference> getOwnedReferences() {\n\t\treturn (EList<Reference>)eDynamicGet(EntityPackage.ENTITY__OWNED_REFERENCES, EntityPackage.Literals.ENTITY__OWNED_REFERENCES, true, true);\n\t}\n\n\t/**\n\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n\t * @generated\n\t */\n\tpublic Entity getSupertype() {\n\t\treturn (Entity)eDynamicGet(EntityPackage.ENTITY__SUPERTYPE, EntityPackage.Literals.ENTITY__SUPERTYPE, true, true);\n\t}\n\n\t/**\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @generated\n\t */\n\tpublic Entity basicGetSupertype() {\n\t\treturn (Entity)eDynamicGet(EntityPackage.ENTITY__SUPERTYPE, EntityPackage.Literals.ENTITY__SUPERTYPE, false, true);\n\t}\n\n\t/**\n\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n\t * @generated\n\t */\n\tpublic void setSupertype(Entity newSupertype) {\n\t\teDynamicSet(EntityPackage.ENTITY__SUPERTYPE, EntityPackage.Literals.ENTITY__SUPERTYPE, newSupertype);\n\t}\n\n\t/**\n\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n\t * \n\t * @generated NOT\n\t */\n\tpublic EList getAttributes() {\n\t\tBasicEList result = new UniqueEList() {\n\t\t\tprotected Object[] newData(int capacity) {\n\t\t\t\treturn new Attribute[capacity];\n\t\t\t}\n\n\t\t\tprotected boolean useEquals() {\n\t\t\t\treturn false;\n\t\t\t}\n\t\t};\n\t\tresult.addAll(getOwnedAttributes());\n\t\tif (getSupertype() != null)\n\t\t\tresult.addAll(getSupertype().getAttributes());\n\t\tresult.shrink();\n\t\tEList unmodifiableResult = new EcoreEList.UnmodifiableEList.FastCompare(\n\t\t\t\tthis, EntityPackage.eINSTANCE.getEntity_Attributes(), result\n\t\t\t\t\t\t.size(), result.data());\n\t\treturn unmodifiableResult;\n\t}\n\n\t/**\n\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n\t * \n\t * @generated NOT\n\t */\n\tpublic EList getReferences() {\n\t\tBasicEList result = new UniqueEList() {\n\t\t\tprotected Object[] newData(int capacity) {\n\t\t\t\treturn new Reference[capacity];\n\t\t\t}\n\n\t\t\tprotected boolean useEquals() {\n\t\t\t\treturn false;\n\t\t\t}\n\t\t};\n\t\tresult.addAll(getOwnedReferences());\n\t\tif (getSupertype() != null)\n\t\t\tresult.addAll(getSupertype().getReferences());\n\t\tresult.shrink();\n\t\tEList unmodifiableResult = new EcoreEList.UnmodifiableEList.FastCompare(\n\t\t\t\tthis, EntityPackage.eINSTANCE.getEntity_References(), result\n\t\t\t\t\t\t.size(), result.data());\n\t\treturn unmodifiableResult;\n\t}\n\n\t/**\n\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n\t * \n\t * @generated NOT\n\t */\n\tpublic EList getProperties() {\n\t\tBasicEList result = new UniqueEList() {\n\t\t\tprotected Object[] newData(int capacity) {\n\t\t\t\treturn new Property[capacity];\n\t\t\t}\n\n\t\t\tprotected boolean useEquals() {\n\t\t\t\treturn false;\n\t\t\t}\n\t\t};\n\t\tresult.addAll(getAttributes());\n\t\tresult.addAll(getReferences());\n\t\tresult.shrink();\n\t\tEList unmodifiableResult = new EcoreEList.UnmodifiableEList.FastCompare(\n\t\t\t\tthis, EntityPackage.eINSTANCE.getEntity_Attributes(), result\n\t\t\t\t\t\t.size(), result.data());\n\t\treturn unmodifiableResult;\n\t}\n\n\t/**\n\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n\t * @generated\n\t */\n\tpublic Block getBlock() {\n\t\treturn (Block)eDynamicGet(EntityPackage.ENTITY__BLOCK, EntityPackage.Literals.ENTITY__BLOCK, true, true);\n\t}\n\n\t/**\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @generated\n\t */\n\tpublic Block basicGetBlock() {\n\t\treturn (Block)eDynamicGet(EntityPackage.ENTITY__BLOCK, EntityPackage.Literals.ENTITY__BLOCK, false, true);\n\t}\n\n\t/**\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @generated\n\t */\n\tpublic NotificationChain basicSetBlock(Block newBlock, NotificationChain msgs) {\n\t\tmsgs = eBasicSetContainer((InternalEObject)newBlock, EntityPackage.ENTITY__BLOCK, msgs);\n\t\treturn msgs;\n\t}\n\n\t/**\n\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n\t * @generated\n\t */\n\tpublic void setBlock(Block newBlock) {\n\t\teDynamicSet(EntityPackage.ENTITY__BLOCK, EntityPackage.Literals.ENTITY__BLOCK, newBlock);\n\t}\n\n\t/**\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @generated NOT\n\t */\n\tpublic boolean isSubtypeOf(Entity entity) {\n\t\t// An entity A is a subtype of an entity B\n\t\t// - A and B are both the same entity\n\t\t// - the supertype of A is B\n\t\t// - the supertype of A is a subtype of B\n\t\treturn (EcoreUtil.equals(this, entity)\n\t\t\t\t|| (getSupertype() != null\n\t\t\t\t\t\t&& (EcoreUtil.equals(getSupertype(), entity) || getSupertype().isSubtypeOf(entity))));\n\t}\n\n\t\t\tcase EntityPackage.ENTITY__OWNED_ATTRIBUTES:\n\t\t\t\treturn ((InternalEList<InternalEObject>)(InternalEList<?>)getOwnedAttributes()).basicAdd(otherEnd, msgs);\n\t\t\tcase EntityPackage.ENTITY__OWNED_REFERENCES:\n\t\t\t\treturn ((InternalEList<InternalEObject>)(InternalEList<?>)getOwnedReferences()).basicAdd(otherEnd, msgs);\n\t\t\tcase EntityPackage.ENTITY__BLOCK:\n\t\t\t\tif (eInternalContainer() != null)\n\t\t\t\t\tmsgs = eBasicRemoveFromContainer(msgs);\n\t\t\t\treturn basicSetBlock((Block)otherEnd, msgs);\n\t\t\tcase EntityPackage.ENTITY__OWNED_ATTRIBUTES:\n\t\t\t\treturn ((InternalEList<?>)getOwnedAttributes()).basicRemove(otherEnd, msgs);\n\t\t\tcase EntityPackage.ENTITY__OWNED_REFERENCES:\n\t\t\t\treturn ((InternalEList<?>)getOwnedReferences()).basicRemove(otherEnd, msgs);\n\t\t\tcase EntityPackage.ENTITY__BLOCK:\n\t\t\t\treturn basicSetBlock(null, msgs);\n\t/**\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @generated\n\t */\n\t@Override\n\tpublic NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {\n\t\tswitch (eContainerFeatureID()) {\n\t\t\tcase EntityPackage.ENTITY__BLOCK:\n\t\t\t\treturn eInternalContainer().eInverseRemove(this, EntityPackage.BLOCK__ENTITIES, Block.class, msgs);\n\t\t}\n\t\treturn super.eBasicRemoveFromContainerFeature(msgs);\n\t}\n\n\t\t\tcase EntityPackage.ENTITY__OWNED_ATTRIBUTES:\n\t\t\t\treturn getOwnedAttributes();\n\t\t\tcase EntityPackage.ENTITY__OWNED_REFERENCES:\n\t\t\t\treturn getOwnedReferences();\n\t\t\tcase EntityPackage.ENTITY__SUPERTYPE:\n\t\t\t\tif (resolve) return getSupertype();\n\t\t\t\treturn basicGetSupertype();\n\t\t\tcase EntityPackage.ENTITY__ATTRIBUTES:\n\t\t\t\treturn getAttributes();\n\t\t\tcase EntityPackage.ENTITY__REFERENCES:\n\t\t\t\treturn getReferences();\n\t\t\tcase EntityPackage.ENTITY__PROPERTIES:\n\t\t\t\treturn getProperties();\n\t\t\tcase EntityPackage.ENTITY__BLOCK:\n\t\t\t\tif (resolve) return getBlock();\n\t\t\t\treturn basicGetBlock();\n\t\t\tcase EntityPackage.ENTITY__OWNED_ATTRIBUTES:\n\t\t\t\tgetOwnedAttributes().clear();\n\t\t\t\tgetOwnedAttributes().addAll((Collection<? extends Attribute>)newValue);\n\t\t\t\treturn;\n\t\t\tcase EntityPackage.ENTITY__OWNED_REFERENCES:\n\t\t\t\tgetOwnedReferences().clear();\n\t\t\t\tgetOwnedReferences().addAll((Collection<? extends Reference>)newValue);\n\t\t\t\treturn;\n\t\t\tcase EntityPackage.ENTITY__SUPERTYPE:\n\t\t\t\tsetSupertype((Entity)newValue);\n\t\t\t\treturn;\n\t\t\tcase EntityPackage.ENTITY__BLOCK:\n\t\t\t\tsetBlock((Block)newValue);\n\t\t\t\treturn;\n\t\t\tcase EntityPackage.ENTITY__OWNED_ATTRIBUTES:\n\t\t\t\tgetOwnedAttributes().clear();\n\t\t\t\treturn;\n\t\t\tcase EntityPackage.ENTITY__OWNED_REFERENCES:\n\t\t\t\tgetOwnedReferences().clear();\n\t\t\t\treturn;\n\t\t\tcase EntityPackage.ENTITY__SUPERTYPE:\n\t\t\t\tsetSupertype((Entity)null);\n\t\t\t\treturn;\n\t\t\tcase EntityPackage.ENTITY__BLOCK:\n\t\t\t\tsetBlock((Block)null);\n\t\t\t\treturn;\n\t\t\tcase EntityPackage.ENTITY__OWNED_ATTRIBUTES:\n\t\t\t\treturn !getOwnedAttributes().isEmpty();\n\t\t\tcase EntityPackage.ENTITY__OWNED_REFERENCES:\n\t\t\t\treturn !getOwnedReferences().isEmpty();\n\t\t\tcase EntityPackage.ENTITY__SUPERTYPE:\n\t\t\t\treturn basicGetSupertype() != null;\n\t\t\tcase EntityPackage.ENTITY__ATTRIBUTES:\n\t\t\t\treturn !getAttributes().isEmpty();\n\t\t\tcase EntityPackage.ENTITY__REFERENCES:\n\t\t\t\treturn !getReferences().isEmpty();\n\t\t\tcase EntityPackage.ENTITY__PROPERTIES:\n\t\t\t\treturn !getProperties().isEmpty();\n\t\t\tcase EntityPackage.ENTITY__BLOCK:\n\t\t\t\treturn basicGetBlock() != null;", "old_methods": [ { "arguments": [], "filename": "models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/impl/EntityImpl.java", "implementation": "return (Entity)eDynamicGet(EntityPackage.ENTITY__SUPERTYPE, EntityPackage.Literals.ENTITY__SUPERTYPE, true, true);", "signature": "Entity getSupertype()" }, { "arguments": [], "filename": "models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/impl/EntityImpl.java", "implementation": "return (Entity)eDynamicGet(EntityPackage.ENTITY__SUPERTYPE, EntityPackage.Literals.ENTITY__SUPERTYPE, false, true);", "signature": "Entity basicGetSupertype()" }, { "arguments": [ "Entity newSupertype" ], "filename": "models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/impl/EntityImpl.java", "implementation": "eDynamicSet(EntityPackage.ENTITY__SUPERTYPE, EntityPackage.Literals.ENTITY__SUPERTYPE, newSupertype);", "signature": "void setSupertype(Entity newSupertype)" }, { "arguments": [], "filename": "models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/impl/EntityImpl.java", "implementation": "BasicEList result = new UniqueEList() {\n\t\t\tprotected Object[] newData(int capacity) {\n\t\t\t\treturn new Attribute[capacity];", "signature": "EList getAttributes()" }, { "arguments": [], "filename": "models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/impl/EntityImpl.java", "implementation": "return false;", "signature": "boolean useEquals()" }, { "arguments": [], "filename": "models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/impl/EntityImpl.java", "implementation": "BasicEList result = new UniqueEList() {\n\t\t\tprotected Object[] newData(int capacity) {\n\t\t\t\treturn new Reference[capacity];", "signature": "EList getReferences()" }, { "arguments": [], "filename": "models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/impl/EntityImpl.java", "implementation": "return false;", "signature": "boolean useEquals()" }, { "arguments": [], "filename": "models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/impl/EntityImpl.java", "implementation": "BasicEList result = new UniqueEList() {\n\t\t\tprotected Object[] newData(int capacity) {\n\t\t\t\treturn new Property[capacity];", "signature": "EList getProperties()" }, { "arguments": [], "filename": "models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/impl/EntityImpl.java", "implementation": "return false;", "signature": "boolean useEquals()" }, { "arguments": [], "filename": "models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/impl/EntityImpl.java", "implementation": "return (Block)eDynamicGet(EntityPackage.ENTITY__BLOCK, EntityPackage.Literals.ENTITY__BLOCK, true, true);", "signature": "Block getBlock()" }, { "arguments": [], "filename": "models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/impl/EntityImpl.java", "implementation": "return (Block)eDynamicGet(EntityPackage.ENTITY__BLOCK, EntityPackage.Literals.ENTITY__BLOCK, false, true);", "signature": "Block basicGetBlock()" }, { "arguments": [ "Block newBlock", " NotificationChain msgs" ], "filename": "models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/impl/EntityImpl.java", "implementation": "msgs = eBasicSetContainer((InternalEObject)newBlock, EntityPackage.ENTITY__BLOCK, msgs);\n\t\treturn msgs;", "signature": "NotificationChain basicSetBlock(Block newBlock, NotificationChain msgs)" }, { "arguments": [ "Block newBlock" ], "filename": "models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/impl/EntityImpl.java", "implementation": "eDynamicSet(EntityPackage.ENTITY__BLOCK, EntityPackage.Literals.ENTITY__BLOCK, newBlock);", "signature": "void setBlock(Block newBlock)" }, { "arguments": [ "Entity entity" ], "filename": "models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/impl/EntityImpl.java", "implementation": "// An entity A is a subtype of an entity B\n\t\t// - A and B are both the same entity\n\t\t// - the supertype of A is B\n\t\t// - the supertype of A is a subtype of B\n\t\treturn (EcoreUtil.equals(this, entity)\n\t\t\t\t|| (getSupertype() != null\n\t\t\t\t\t\t&& (EcoreUtil.equals(getSupertype(), entity) || getSupertype().isSubtypeOf(entity))));", "signature": "boolean isSubtypeOf(Entity entity)" }, { "arguments": [ "NotificationChain msgs" ], "filename": "models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/impl/EntityImpl.java", "implementation": "switch (eContainerFeatureID()) {\n\t\t\tcase EntityPackage.ENTITY__BLOCK:\n\t\t\t\treturn eInternalContainer().eInverseRemove(this, EntityPackage.BLOCK__ENTITIES, Block.class, msgs);", "signature": "NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs)" } ], "patch": "@@ -15,22 +15,14 @@\n import java.util.Collection;\n \n import org.eclipse.emf.common.notify.NotificationChain;\n-import org.eclipse.emf.common.util.BasicEList;\n import org.eclipse.emf.common.util.EList;\n-import org.eclipse.emf.common.util.UniqueEList;\n import org.eclipse.emf.ecore.EClass;\n import org.eclipse.emf.ecore.InternalEObject;\n-import org.eclipse.emf.ecore.util.EcoreEList;\n-import org.eclipse.emf.ecore.util.EcoreUtil;\n import org.eclipse.emf.ecore.util.InternalEList;\n-import org.obeonetwork.dsl.entity.Attribute;\n-import org.obeonetwork.dsl.entity.Block;\n import org.obeonetwork.dsl.entity.Entity;\n import org.obeonetwork.dsl.entity.EntityPackage;\n import org.obeonetwork.dsl.entity.Finder;\n import org.obeonetwork.dsl.entity.InheritanceKind;\n-import org.obeonetwork.dsl.entity.Property;\n-import org.obeonetwork.dsl.entity.Reference;\n import org.obeonetwork.dsl.environment.impl.StructuredTypeImpl;\n \n /**\n@@ -39,17 +31,10 @@\n * <p>\n * The following features are implemented:\n * <ul>\n- * <li>{@link org.obeonetwork.dsl.entity.impl.EntityImpl#getOwnedAttributes <em>Owned Attributes</em>}</li>\n- * <li>{@link org.obeonetwork.dsl.entity.impl.EntityImpl#getOwnedReferences <em>Owned References</em>}</li>\n- * <li>{@link org.obeonetwork.dsl.entity.impl.EntityImpl#getSupertype <em>Supertype</em>}</li>\n- * <li>{@link org.obeonetwork.dsl.entity.impl.EntityImpl#getAttributes <em>Attributes</em>}</li>\n- * <li>{@link org.obeonetwork.dsl.entity.impl.EntityImpl#getReferences <em>References</em>}</li>\n- * <li>{@link org.obeonetwork.dsl.entity.impl.EntityImpl#getProperties <em>Properties</em>}</li>\n * <li>{@link org.obeonetwork.dsl.entity.impl.EntityImpl#getEstimatedVolumetry <em>Estimated Volumetry</em>}</li>\n * <li>{@link org.obeonetwork.dsl.entity.impl.EntityImpl#getEstimatedAccess <em>Estimated Access</em>}</li>\n * <li>{@link org.obeonetwork.dsl.entity.impl.EntityImpl#isHistorized <em>Historized</em>}</li>\n * <li>{@link org.obeonetwork.dsl.entity.impl.EntityImpl#getOwnedFinders <em>Owned Finders</em>}</li>\n- * <li>{@link org.obeonetwork.dsl.entity.impl.EntityImpl#getBlock <em>Block</em>}</li>\n * <li>{@link org.obeonetwork.dsl.entity.impl.EntityImpl#getInheritanceKind <em>Inheritance Kind</em>}</li>\n * </ul>\n * </p>\n@@ -118,123 +103,6 @@ protected EClass eStaticClass() {\n \t\treturn EntityPackage.Literals.ENTITY;\n \t}\n \n-\t/**\n-\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n-\t * @generated\n-\t */\n-\t@SuppressWarnings(\"unchecked\")\n-\tpublic EList<Attribute> getOwnedAttributes() {\n-\t\treturn (EList<Attribute>)eDynamicGet(EntityPackage.ENTITY__OWNED_ATTRIBUTES, EntityPackage.Literals.ENTITY__OWNED_ATTRIBUTES, true, true);\n-\t}\n-\n-\t/**\n-\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n-\t * @generated\n-\t */\n-\t@SuppressWarnings(\"unchecked\")\n-\tpublic EList<Reference> getOwnedReferences() {\n-\t\treturn (EList<Reference>)eDynamicGet(EntityPackage.ENTITY__OWNED_REFERENCES, EntityPackage.Literals.ENTITY__OWNED_REFERENCES, true, true);\n-\t}\n-\n-\t/**\n-\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n-\t * @generated\n-\t */\n-\tpublic Entity getSupertype() {\n-\t\treturn (Entity)eDynamicGet(EntityPackage.ENTITY__SUPERTYPE, EntityPackage.Literals.ENTITY__SUPERTYPE, true, true);\n-\t}\n-\n-\t/**\n-\t * <!-- begin-user-doc -->\n-\t * <!-- end-user-doc -->\n-\t * @generated\n-\t */\n-\tpublic Entity basicGetSupertype() {\n-\t\treturn (Entity)eDynamicGet(EntityPackage.ENTITY__SUPERTYPE, EntityPackage.Literals.ENTITY__SUPERTYPE, false, true);\n-\t}\n-\n-\t/**\n-\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n-\t * @generated\n-\t */\n-\tpublic void setSupertype(Entity newSupertype) {\n-\t\teDynamicSet(EntityPackage.ENTITY__SUPERTYPE, EntityPackage.Literals.ENTITY__SUPERTYPE, newSupertype);\n-\t}\n-\n-\t/**\n-\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n-\t * \n-\t * @generated NOT\n-\t */\n-\tpublic EList getAttributes() {\n-\t\tBasicEList result = new UniqueEList() {\n-\t\t\tprotected Object[] newData(int capacity) {\n-\t\t\t\treturn new Attribute[capacity];\n-\t\t\t}\n-\n-\t\t\tprotected boolean useEquals() {\n-\t\t\t\treturn false;\n-\t\t\t}\n-\t\t};\n-\t\tresult.addAll(getOwnedAttributes());\n-\t\tif (getSupertype() != null)\n-\t\t\tresult.addAll(getSupertype().getAttributes());\n-\t\tresult.shrink();\n-\t\tEList unmodifiableResult = new EcoreEList.UnmodifiableEList.FastCompare(\n-\t\t\t\tthis, EntityPackage.eINSTANCE.getEntity_Attributes(), result\n-\t\t\t\t\t\t.size(), result.data());\n-\t\treturn unmodifiableResult;\n-\t}\n-\n-\t/**\n-\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n-\t * \n-\t * @generated NOT\n-\t */\n-\tpublic EList getReferences() {\n-\t\tBasicEList result = new UniqueEList() {\n-\t\t\tprotected Object[] newData(int capacity) {\n-\t\t\t\treturn new Reference[capacity];\n-\t\t\t}\n-\n-\t\t\tprotected boolean useEquals() {\n-\t\t\t\treturn false;\n-\t\t\t}\n-\t\t};\n-\t\tresult.addAll(getOwnedReferences());\n-\t\tif (getSupertype() != null)\n-\t\t\tresult.addAll(getSupertype().getReferences());\n-\t\tresult.shrink();\n-\t\tEList unmodifiableResult = new EcoreEList.UnmodifiableEList.FastCompare(\n-\t\t\t\tthis, EntityPackage.eINSTANCE.getEntity_References(), result\n-\t\t\t\t\t\t.size(), result.data());\n-\t\treturn unmodifiableResult;\n-\t}\n-\n-\t/**\n-\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n-\t * \n-\t * @generated NOT\n-\t */\n-\tpublic EList getProperties() {\n-\t\tBasicEList result = new UniqueEList() {\n-\t\t\tprotected Object[] newData(int capacity) {\n-\t\t\t\treturn new Property[capacity];\n-\t\t\t}\n-\n-\t\t\tprotected boolean useEquals() {\n-\t\t\t\treturn false;\n-\t\t\t}\n-\t\t};\n-\t\tresult.addAll(getAttributes());\n-\t\tresult.addAll(getReferences());\n-\t\tresult.shrink();\n-\t\tEList unmodifiableResult = new EcoreEList.UnmodifiableEList.FastCompare(\n-\t\t\t\tthis, EntityPackage.eINSTANCE.getEntity_Attributes(), result\n-\t\t\t\t\t\t.size(), result.data());\n-\t\treturn unmodifiableResult;\n-\t}\n-\n \t/**\n \t * <!-- begin-user-doc --> <!-- end-user-doc -->\n \t * @generated\n@@ -292,41 +160,6 @@ public EList<Finder> getOwnedFinders() {\n \t\treturn (EList<Finder>)eDynamicGet(EntityPackage.ENTITY__OWNED_FINDERS, EntityPackage.Literals.ENTITY__OWNED_FINDERS, true, true);\n \t}\n \n-\t/**\n-\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n-\t * @generated\n-\t */\n-\tpublic Block getBlock() {\n-\t\treturn (Block)eDynamicGet(EntityPackage.ENTITY__BLOCK, EntityPackage.Literals.ENTITY__BLOCK, true, true);\n-\t}\n-\n-\t/**\n-\t * <!-- begin-user-doc -->\n-\t * <!-- end-user-doc -->\n-\t * @generated\n-\t */\n-\tpublic Block basicGetBlock() {\n-\t\treturn (Block)eDynamicGet(EntityPackage.ENTITY__BLOCK, EntityPackage.Literals.ENTITY__BLOCK, false, true);\n-\t}\n-\n-\t/**\n-\t * <!-- begin-user-doc -->\n-\t * <!-- end-user-doc -->\n-\t * @generated\n-\t */\n-\tpublic NotificationChain basicSetBlock(Block newBlock, NotificationChain msgs) {\n-\t\tmsgs = eBasicSetContainer((InternalEObject)newBlock, EntityPackage.ENTITY__BLOCK, msgs);\n-\t\treturn msgs;\n-\t}\n-\n-\t/**\n-\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n-\t * @generated\n-\t */\n-\tpublic void setBlock(Block newBlock) {\n-\t\teDynamicSet(EntityPackage.ENTITY__BLOCK, EntityPackage.Literals.ENTITY__BLOCK, newBlock);\n-\t}\n-\n \t/**\n \t * <!-- begin-user-doc --> <!-- end-user-doc -->\n \t * @generated\n@@ -343,21 +176,6 @@ public void setInheritanceKind(InheritanceKind newInheritanceKind) {\n \t\teDynamicSet(EntityPackage.ENTITY__INHERITANCE_KIND, EntityPackage.Literals.ENTITY__INHERITANCE_KIND, newInheritanceKind);\n \t}\n \n-\t/**\n-\t * <!-- begin-user-doc -->\n-\t * <!-- end-user-doc -->\n-\t * @generated NOT\n-\t */\n-\tpublic boolean isSubtypeOf(Entity entity) {\n-\t\t// An entity A is a subtype of an entity B\n-\t\t// - A and B are both the same entity\n-\t\t// - the supertype of A is B\n-\t\t// - the supertype of A is a subtype of B\n-\t\treturn (EcoreUtil.equals(this, entity)\n-\t\t\t\t|| (getSupertype() != null\n-\t\t\t\t\t\t&& (EcoreUtil.equals(getSupertype(), entity) || getSupertype().isSubtypeOf(entity))));\n-\t}\n-\n \t/**\n \t * <!-- begin-user-doc -->\n \t * <!-- end-user-doc -->\n@@ -367,16 +185,8 @@ public boolean isSubtypeOf(Entity entity) {\n \t@Override\n \tpublic NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {\n \t\tswitch (featureID) {\n-\t\t\tcase EntityPackage.ENTITY__OWNED_ATTRIBUTES:\n-\t\t\t\treturn ((InternalEList<InternalEObject>)(InternalEList<?>)getOwnedAttributes()).basicAdd(otherEnd, msgs);\n-\t\t\tcase EntityPackage.ENTITY__OWNED_REFERENCES:\n-\t\t\t\treturn ((InternalEList<InternalEObject>)(InternalEList<?>)getOwnedReferences()).basicAdd(otherEnd, msgs);\n \t\t\tcase EntityPackage.ENTITY__OWNED_FINDERS:\n \t\t\t\treturn ((InternalEList<InternalEObject>)(InternalEList<?>)getOwnedFinders()).basicAdd(otherEnd, msgs);\n-\t\t\tcase EntityPackage.ENTITY__BLOCK:\n-\t\t\t\tif (eInternalContainer() != null)\n-\t\t\t\t\tmsgs = eBasicRemoveFromContainer(msgs);\n-\t\t\t\treturn basicSetBlock((Block)otherEnd, msgs);\n \t\t}\n \t\treturn super.eInverseAdd(otherEnd, featureID, msgs);\n \t}\n@@ -389,32 +199,12 @@ public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, No\n \t@Override\n \tpublic NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {\n \t\tswitch (featureID) {\n-\t\t\tcase EntityPackage.ENTITY__OWNED_ATTRIBUTES:\n-\t\t\t\treturn ((InternalEList<?>)getOwnedAttributes()).basicRemove(otherEnd, msgs);\n-\t\t\tcase EntityPackage.ENTITY__OWNED_REFERENCES:\n-\t\t\t\treturn ((InternalEList<?>)getOwnedReferences()).basicRemove(otherEnd, msgs);\n \t\t\tcase EntityPackage.ENTITY__OWNED_FINDERS:\n \t\t\t\treturn ((InternalEList<?>)getOwnedFinders()).basicRemove(otherEnd, msgs);\n-\t\t\tcase EntityPackage.ENTITY__BLOCK:\n-\t\t\t\treturn basicSetBlock(null, msgs);\n \t\t}\n \t\treturn super.eInverseRemove(otherEnd, featureID, msgs);\n \t}\n \n-\t/**\n-\t * <!-- begin-user-doc -->\n-\t * <!-- end-user-doc -->\n-\t * @generated\n-\t */\n-\t@Override\n-\tpublic NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {\n-\t\tswitch (eContainerFeatureID()) {\n-\t\t\tcase EntityPackage.ENTITY__BLOCK:\n-\t\t\t\treturn eInternalContainer().eInverseRemove(this, EntityPackage.BLOCK__ENTITIES, Block.class, msgs);\n-\t\t}\n-\t\treturn super.eBasicRemoveFromContainerFeature(msgs);\n-\t}\n-\n \t/**\n \t * <!-- begin-user-doc -->\n \t * <!-- end-user-doc -->\n@@ -423,19 +213,6 @@ public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs\n \t@Override\n \tpublic Object eGet(int featureID, boolean resolve, boolean coreType) {\n \t\tswitch (featureID) {\n-\t\t\tcase EntityPackage.ENTITY__OWNED_ATTRIBUTES:\n-\t\t\t\treturn getOwnedAttributes();\n-\t\t\tcase EntityPackage.ENTITY__OWNED_REFERENCES:\n-\t\t\t\treturn getOwnedReferences();\n-\t\t\tcase EntityPackage.ENTITY__SUPERTYPE:\n-\t\t\t\tif (resolve) return getSupertype();\n-\t\t\t\treturn basicGetSupertype();\n-\t\t\tcase EntityPackage.ENTITY__ATTRIBUTES:\n-\t\t\t\treturn getAttributes();\n-\t\t\tcase EntityPackage.ENTITY__REFERENCES:\n-\t\t\t\treturn getReferences();\n-\t\t\tcase EntityPackage.ENTITY__PROPERTIES:\n-\t\t\t\treturn getProperties();\n \t\t\tcase EntityPackage.ENTITY__ESTIMATED_VOLUMETRY:\n \t\t\t\treturn getEstimatedVolumetry();\n \t\t\tcase EntityPackage.ENTITY__ESTIMATED_ACCESS:\n@@ -444,9 +221,6 @@ public Object eGet(int featureID, boolean resolve, boolean coreType) {\n \t\t\t\treturn isHistorized();\n \t\t\tcase EntityPackage.ENTITY__OWNED_FINDERS:\n \t\t\t\treturn getOwnedFinders();\n-\t\t\tcase EntityPackage.ENTITY__BLOCK:\n-\t\t\t\tif (resolve) return getBlock();\n-\t\t\t\treturn basicGetBlock();\n \t\t\tcase EntityPackage.ENTITY__INHERITANCE_KIND:\n \t\t\t\treturn getInheritanceKind();\n \t\t}\n@@ -462,17 +236,6 @@ public Object eGet(int featureID, boolean resolve, boolean coreType) {\n \t@Override\n \tpublic void eSet(int featureID, Object newValue) {\n \t\tswitch (featureID) {\n-\t\t\tcase EntityPackage.ENTITY__OWNED_ATTRIBUTES:\n-\t\t\t\tgetOwnedAttributes().clear();\n-\t\t\t\tgetOwnedAttributes().addAll((Collection<? extends Attribute>)newValue);\n-\t\t\t\treturn;\n-\t\t\tcase EntityPackage.ENTITY__OWNED_REFERENCES:\n-\t\t\t\tgetOwnedReferences().clear();\n-\t\t\t\tgetOwnedReferences().addAll((Collection<? extends Reference>)newValue);\n-\t\t\t\treturn;\n-\t\t\tcase EntityPackage.ENTITY__SUPERTYPE:\n-\t\t\t\tsetSupertype((Entity)newValue);\n-\t\t\t\treturn;\n \t\t\tcase EntityPackage.ENTITY__ESTIMATED_VOLUMETRY:\n \t\t\t\tsetEstimatedVolumetry((Integer)newValue);\n \t\t\t\treturn;\n@@ -486,9 +249,6 @@ public void eSet(int featureID, Object newValue) {\n \t\t\t\tgetOwnedFinders().clear();\n \t\t\t\tgetOwnedFinders().addAll((Collection<? extends Finder>)newValue);\n \t\t\t\treturn;\n-\t\t\tcase EntityPackage.ENTITY__BLOCK:\n-\t\t\t\tsetBlock((Block)newValue);\n-\t\t\t\treturn;\n \t\t\tcase EntityPackage.ENTITY__INHERITANCE_KIND:\n \t\t\t\tsetInheritanceKind((InheritanceKind)newValue);\n \t\t\t\treturn;\n@@ -504,15 +264,6 @@ public void eSet(int featureID, Object newValue) {\n \t@Override\n \tpublic void eUnset(int featureID) {\n \t\tswitch (featureID) {\n-\t\t\tcase EntityPackage.ENTITY__OWNED_ATTRIBUTES:\n-\t\t\t\tgetOwnedAttributes().clear();\n-\t\t\t\treturn;\n-\t\t\tcase EntityPackage.ENTITY__OWNED_REFERENCES:\n-\t\t\t\tgetOwnedReferences().clear();\n-\t\t\t\treturn;\n-\t\t\tcase EntityPackage.ENTITY__SUPERTYPE:\n-\t\t\t\tsetSupertype((Entity)null);\n-\t\t\t\treturn;\n \t\t\tcase EntityPackage.ENTITY__ESTIMATED_VOLUMETRY:\n \t\t\t\tsetEstimatedVolumetry(ESTIMATED_VOLUMETRY_EDEFAULT);\n \t\t\t\treturn;\n@@ -525,9 +276,6 @@ public void eUnset(int featureID) {\n \t\t\tcase EntityPackage.ENTITY__OWNED_FINDERS:\n \t\t\t\tgetOwnedFinders().clear();\n \t\t\t\treturn;\n-\t\t\tcase EntityPackage.ENTITY__BLOCK:\n-\t\t\t\tsetBlock((Block)null);\n-\t\t\t\treturn;\n \t\t\tcase EntityPackage.ENTITY__INHERITANCE_KIND:\n \t\t\t\tsetInheritanceKind(INHERITANCE_KIND_EDEFAULT);\n \t\t\t\treturn;\n@@ -543,18 +291,6 @@ public void eUnset(int featureID) {\n \t@Override\n \tpublic boolean eIsSet(int featureID) {\n \t\tswitch (featureID) {\n-\t\t\tcase EntityPackage.ENTITY__OWNED_ATTRIBUTES:\n-\t\t\t\treturn !getOwnedAttributes().isEmpty();\n-\t\t\tcase EntityPackage.ENTITY__OWNED_REFERENCES:\n-\t\t\t\treturn !getOwnedReferences().isEmpty();\n-\t\t\tcase EntityPackage.ENTITY__SUPERTYPE:\n-\t\t\t\treturn basicGetSupertype() != null;\n-\t\t\tcase EntityPackage.ENTITY__ATTRIBUTES:\n-\t\t\t\treturn !getAttributes().isEmpty();\n-\t\t\tcase EntityPackage.ENTITY__REFERENCES:\n-\t\t\t\treturn !getReferences().isEmpty();\n-\t\t\tcase EntityPackage.ENTITY__PROPERTIES:\n-\t\t\t\treturn !getProperties().isEmpty();\n \t\t\tcase EntityPackage.ENTITY__ESTIMATED_VOLUMETRY:\n \t\t\t\treturn getEstimatedVolumetry() != ESTIMATED_VOLUMETRY_EDEFAULT;\n \t\t\tcase EntityPackage.ENTITY__ESTIMATED_ACCESS:\n@@ -563,8 +299,6 @@ public boolean eIsSet(int featureID) {\n \t\t\t\treturn isHistorized() != HISTORIZED_EDEFAULT;\n \t\t\tcase EntityPackage.ENTITY__OWNED_FINDERS:\n \t\t\t\treturn !getOwnedFinders().isEmpty();\n-\t\t\tcase EntityPackage.ENTITY__BLOCK:\n-\t\t\t\treturn basicGetBlock() != null;\n \t\t\tcase EntityPackage.ENTITY__INHERITANCE_KIND:\n \t\t\t\treturn getInheritanceKind() != INHERITANCE_KIND_EDEFAULT;\n \t\t}", "raw_url": "https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fimpl%2FEntityImpl.java", "sha": "442e18967f0f9cf412423c25bf61fd10bed95b34", "status": "modified" }, { "additions": 19, "blob_url": "https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fimpl%2FEntityPackageImpl.java", "changes": 314, "contents_url": "https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fimpl%2FEntityPackageImpl.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6", "deletions": 295, "filename": "models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/impl/EntityPackageImpl.java", "new_code": "\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\tpublic EAttribute getRoot_Name() {\n\t\treturn (EAttribute)rootEClass.getEStructuralFeatures().get(0);\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\tpublic EReference getRoot_Namespaces() {\n\t\treturn (EReference)rootEClass.getEStructuralFeatures().get(1);\n\t\treturn (EAttribute)entityEClass.getEStructuralFeatures().get(0);\n\t\treturn (EAttribute)entityEClass.getEStructuralFeatures().get(1);\n\t\treturn (EAttribute)entityEClass.getEStructuralFeatures().get(2);\n\t\treturn (EReference)entityEClass.getEStructuralFeatures().get(3);\n\t\treturn (EAttribute)entityEClass.getEStructuralFeatures().get(4);\n\t\tcreateEAttribute(rootEClass, ROOT__NAME);\n\t\tcreateEReference(rootEClass, ROOT__NAMESPACES);\n\t\trootEClass.getESuperTypes().add(theEnvironmentPackage.getTypesDefinition());\n\t\tinitEAttribute(getRoot_Name(), ecorePackage.getEString(), \"name\", null, 0, 1, Root.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n\t\tinitEReference(getRoot_Namespaces(), theEnvironmentPackage.getNamespace(), null, \"namespaces\", null, 0, -1, Root.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n\t\tinitEReference(getInternalCriterion_Target(), theEnvironmentPackage.getAttribute(), null, \"target\", null, 1, 1, InternalCriterion.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);", "new_methods": [], "old_code": "import org.eclipse.emf.ecore.EOperation;\nimport org.obeonetwork.dsl.entity.Attribute;\nimport org.obeonetwork.dsl.entity.Block;\nimport org.obeonetwork.dsl.entity.Property;\nimport org.obeonetwork.dsl.entity.Reference;\n\t/**\n\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n\t * @generated\n\t */\n\tprivate EClass blockEClass = null;\n\n\t/**\n\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n\t * @generated\n\t */\n\tprivate EClass propertyEClass = null;\n\n\t/**\n\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n\t * @generated\n\t */\n\tprivate EClass attributeEClass = null;\n\n\t/**\n\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n\t * @generated\n\t */\n\tprivate EClass referenceEClass = null;\n\n\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n\t * @generated\n\t */\n\tpublic EReference getRoot_Blocks() {\n\t\treturn (EReference)rootEClass.getEStructuralFeatures().get(0);\n\t}\n\n\t/**\n\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n\t * @generated\n\t */\n\tpublic EClass getBlock() {\n\t\treturn blockEClass;\n\t}\n\n\t/**\n\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n\t * @generated\n\t */\n\tpublic EAttribute getBlock_Name() {\n\t\treturn (EAttribute)blockEClass.getEStructuralFeatures().get(0);\n\t}\n\n\t/**\n\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n\tpublic EReference getBlock_Entities() {\n\t\treturn (EReference)blockEClass.getEStructuralFeatures().get(1);\n\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n\tpublic EReference getBlock_Subblocks() {\n\t\treturn (EReference)blockEClass.getEStructuralFeatures().get(2);\n\t/**\n\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n\t * @generated\n\t */\n\tpublic EReference getEntity_OwnedAttributes() {\n\t\treturn (EReference)entityEClass.getEStructuralFeatures().get(0);\n\t}\n\n\t/**\n\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n\t * @generated\n\t */\n\tpublic EReference getEntity_OwnedReferences() {\n\t\treturn (EReference)entityEClass.getEStructuralFeatures().get(1);\n\t}\n\n\t/**\n\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n\t * @generated\n\t */\n\tpublic EReference getEntity_Supertype() {\n\t\treturn (EReference)entityEClass.getEStructuralFeatures().get(2);\n\t}\n\n\t/**\n\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n\t * @generated\n\t */\n\tpublic EReference getEntity_Attributes() {\n\t\treturn (EReference)entityEClass.getEStructuralFeatures().get(3);\n\t}\n\n\t/**\n\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n\t * @generated\n\t */\n\tpublic EReference getEntity_References() {\n\t\treturn (EReference)entityEClass.getEStructuralFeatures().get(4);\n\t}\n\n\t/**\n\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n\t * @generated\n\t */\n\tpublic EReference getEntity_Properties() {\n\t\treturn (EReference)entityEClass.getEStructuralFeatures().get(5);\n\t}\n\n\t\treturn (EAttribute)entityEClass.getEStructuralFeatures().get(6);\n\t\treturn (EAttribute)entityEClass.getEStructuralFeatures().get(7);\n\t\treturn (EAttribute)entityEClass.getEStructuralFeatures().get(8);\n\t\treturn (EReference)entityEClass.getEStructuralFeatures().get(9);\n\t}\n\n\t/**\n\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n\t * @generated\n\t */\n\tpublic EReference getEntity_Block() {\n\t\treturn (EReference)entityEClass.getEStructuralFeatures().get(10);\n\t\treturn (EAttribute)entityEClass.getEStructuralFeatures().get(11);\n\t}\n\n\t/**\n\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n\t * @generated\n\t */\n\tpublic EClass getProperty() {\n\t\treturn propertyEClass;\n\t}\n\n\t/**\n\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n\t * @generated\n\t */\n\tpublic EAttribute getProperty_Name() {\n\t\treturn (EAttribute)propertyEClass.getEStructuralFeatures().get(0);\n\t}\n\n\t/**\n\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n\t * @generated\n\t */\n\tpublic EAttribute getProperty_Multiplicity() {\n\t\treturn (EAttribute)propertyEClass.getEStructuralFeatures().get(1);\n\t}\n\n\t/**\n\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n\t * @generated\n\t */\n\tpublic EAttribute getProperty_IsPrimaryKey() {\n\t\treturn (EAttribute)propertyEClass.getEStructuralFeatures().get(2);\n\t}\n\n\t/**\n\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n\t * @generated\n\t */\n\tpublic EClass getAttribute() {\n\t\treturn attributeEClass;\n\t}\n\n\t/**\n\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n\t * @generated\n\t */\n\tpublic EReference getAttribute_Entity() {\n\t\treturn (EReference)attributeEClass.getEStructuralFeatures().get(0);\n\t}\n\n\t/**\n\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n\t * @generated\n\t */\n\tpublic EReference getAttribute_Type() {\n\t\treturn (EReference)attributeEClass.getEStructuralFeatures().get(1);\n\t}\n\n\t/**\n\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n\t * @generated\n\t */\n\tpublic EClass getReference() {\n\t\treturn referenceEClass;\n\t}\n\n\t/**\n\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n\t * @generated\n\t */\n\tpublic EReference getReference_Entity() {\n\t\treturn (EReference)referenceEClass.getEStructuralFeatures().get(0);\n\t}\n\n\t/**\n\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n\t * @generated\n\t */\n\tpublic EAttribute getReference_IsComposite() {\n\t\treturn (EAttribute)referenceEClass.getEStructuralFeatures().get(1);\n\t}\n\n\t/**\n\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n\t * @generated\n\t */\n\tpublic EReference getReference_OppositeOf() {\n\t\treturn (EReference)referenceEClass.getEStructuralFeatures().get(2);\n\t}\n\n\t/**\n\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n\t * @generated\n\t */\n\tpublic EReference getReference_Type() {\n\t\treturn (EReference)referenceEClass.getEStructuralFeatures().get(3);\n\t}\n\n\t/**\n\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n\t * @generated\n\t */\n\tpublic EAttribute getReference_Navigable() {\n\t\treturn (EAttribute)referenceEClass.getEStructuralFeatures().get(4);\n\t\tcreateEReference(rootEClass, ROOT__BLOCKS);\n\n\t\tblockEClass = createEClass(BLOCK);\n\t\tcreateEAttribute(blockEClass, BLOCK__NAME);\n\t\tcreateEReference(blockEClass, BLOCK__ENTITIES);\n\t\tcreateEReference(blockEClass, BLOCK__SUBBLOCKS);\n\t\tcreateEReference(entityEClass, ENTITY__OWNED_ATTRIBUTES);\n\t\tcreateEReference(entityEClass, ENTITY__OWNED_REFERENCES);\n\t\tcreateEReference(entityEClass, ENTITY__SUPERTYPE);\n\t\tcreateEReference(entityEClass, ENTITY__ATTRIBUTES);\n\t\tcreateEReference(entityEClass, ENTITY__REFERENCES);\n\t\tcreateEReference(entityEClass, ENTITY__PROPERTIES);\n\t\tcreateEReference(entityEClass, ENTITY__BLOCK);\n\t\tpropertyEClass = createEClass(PROPERTY);\n\t\tcreateEAttribute(propertyEClass, PROPERTY__NAME);\n\t\tcreateEAttribute(propertyEClass, PROPERTY__MULTIPLICITY);\n\t\tcreateEAttribute(propertyEClass, PROPERTY__IS_PRIMARY_KEY);\n\n\t\tattributeEClass = createEClass(ATTRIBUTE);\n\t\tcreateEReference(attributeEClass, ATTRIBUTE__ENTITY);\n\t\tcreateEReference(attributeEClass, ATTRIBUTE__TYPE);\n\n\t\treferenceEClass = createEClass(REFERENCE);\n\t\tcreateEReference(referenceEClass, REFERENCE__ENTITY);\n\t\tcreateEAttribute(referenceEClass, REFERENCE__IS_COMPOSITE);\n\t\tcreateEReference(referenceEClass, REFERENCE__OPPOSITE_OF);\n\t\tcreateEReference(referenceEClass, REFERENCE__TYPE);\n\t\tcreateEAttribute(referenceEClass, REFERENCE__NAVIGABLE);\n\n\t\trootEClass.getESuperTypes().add(theEnvironmentPackage.getNamespace());\n\t\tblockEClass.getESuperTypes().add(theEnvironmentPackage.getObeoDSMObject());\n\t\tpropertyEClass.getESuperTypes().add(theEnvironmentPackage.getObeoDSMObject());\n\t\tpropertyEClass.getESuperTypes().add(theEnvironmentPackage.getBoundableElement());\n\t\tattributeEClass.getESuperTypes().add(this.getProperty());\n\t\treferenceEClass.getESuperTypes().add(this.getProperty());\n\t\tinitEReference(getRoot_Blocks(), this.getBlock(), null, \"blocks\", null, 0, -1, Root.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n\n\t\tinitEClass(blockEClass, Block.class, \"Block\", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\n\t\tinitEAttribute(getBlock_Name(), ecorePackage.getEString(), \"name\", null, 1, 1, Block.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n\t\tinitEReference(getBlock_Entities(), this.getEntity(), this.getEntity_Block(), \"entities\", null, 0, -1, Block.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n\t\tinitEReference(getBlock_Subblocks(), this.getBlock(), null, \"subblocks\", null, 0, -1, Block.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n\t\tinitEReference(getEntity_OwnedAttributes(), this.getAttribute(), this.getAttribute_Entity(), \"ownedAttributes\", null, 0, -1, Entity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n\t\tinitEReference(getEntity_OwnedReferences(), this.getReference(), this.getReference_Entity(), \"ownedReferences\", null, 0, -1, Entity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n\t\tinitEReference(getEntity_Supertype(), this.getEntity(), null, \"supertype\", null, 0, 1, Entity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n\t\tinitEReference(getEntity_Attributes(), this.getAttribute(), null, \"attributes\", null, 0, -1, Entity.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);\n\t\tinitEReference(getEntity_References(), this.getReference(), null, \"references\", null, 0, -1, Entity.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);\n\t\tinitEReference(getEntity_Properties(), this.getProperty(), null, \"properties\", null, 0, -1, Entity.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);\n\t\tinitEReference(getEntity_Block(), this.getBlock(), this.getBlock_Entities(), \"block\", null, 1, 1, Entity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n\t\tEOperation op = addEOperation(entityEClass, ecorePackage.getEBoolean(), \"isSubtypeOf\", 0, 1, IS_UNIQUE, IS_ORDERED);\n\t\taddEParameter(op, this.getEntity(), \"entity\", 0, 1, IS_UNIQUE, IS_ORDERED);\n\n\t\tinitEClass(propertyEClass, Property.class, \"Property\", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\n\t\tinitEAttribute(getProperty_Name(), ecorePackage.getEString(), \"name\", null, 1, 1, Property.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n\t\tinitEAttribute(getProperty_Multiplicity(), theEnvironmentPackage.getMultiplicityKind(), \"multiplicity\", null, 1, 1, Property.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n\t\tinitEAttribute(getProperty_IsPrimaryKey(), ecorePackage.getEBoolean(), \"isPrimaryKey\", \"false\", 1, 1, Property.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n\n\t\tinitEClass(attributeEClass, Attribute.class, \"Attribute\", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\n\t\tinitEReference(getAttribute_Entity(), this.getEntity(), this.getEntity_OwnedAttributes(), \"entity\", null, 1, 1, Attribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n\t\tinitEReference(getAttribute_Type(), theEnvironmentPackage.getPrimitiveType(), null, \"type\", null, 1, 1, Attribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n\n\t\tinitEClass(referenceEClass, Reference.class, \"Reference\", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\n\t\tinitEReference(getReference_Entity(), this.getEntity(), this.getEntity_OwnedReferences(), \"entity\", null, 1, 1, Reference.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n\t\tinitEAttribute(getReference_IsComposite(), ecorePackage.getEBoolean(), \"isComposite\", \"false\", 1, 1, Reference.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n\t\tinitEReference(getReference_OppositeOf(), this.getReference(), null, \"oppositeOf\", null, 0, 1, Reference.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n\t\tinitEReference(getReference_Type(), this.getEntity(), null, \"type\", null, 1, 1, Reference.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n\t\tinitEAttribute(getReference_Navigable(), ecorePackage.getEBoolean(), \"navigable\", \"true\", 0, 1, Reference.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n\n\t\top = addEOperation(referenceEClass, ecorePackage.getEBoolean(), \"canBeOppositeOf\", 1, 1, IS_UNIQUE, IS_ORDERED);\n\t\taddEParameter(op, this.getReference(), \"opposite\", 0, 1, IS_UNIQUE, IS_ORDERED);\n\n\t\tinitEReference(getInternalCriterion_Target(), this.getAttribute(), null, \"target\", null, 1, 1, InternalCriterion.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);", "old_methods": [ { "arguments": [], "filename": "models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/impl/EntityPackageImpl.java", "implementation": "return (EReference)rootEClass.getEStructuralFeatures().get(0);", "signature": "EReference getRoot_Blocks()" }, { "arguments": [], "filename": "models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/impl/EntityPackageImpl.java", "implementation": "return blockEClass;", "signature": "EClass getBlock()" }, { "arguments": [], "filename": "models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/impl/EntityPackageImpl.java", "implementation": "return (EAttribute)blockEClass.getEStructuralFeatures().get(0);", "signature": "EAttribute getBlock_Name()" }, { "arguments": [], "filename": "models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/impl/EntityPackageImpl.java", "implementation": "return (EReference)blockEClass.getEStructuralFeatures().get(1);\n\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n\tpublic EReference getBlock_Subblocks() {\n\t\treturn (EReference)blockEClass.getEStructuralFeatures().get(2);\n\t/**\n\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n\t * @generated\n\t */\n\tpublic EReference getEntity_OwnedAttributes() {\n\t\treturn (EReference)entityEClass.getEStructuralFeatures().get(0);", "signature": "EReference getBlock_Entities()" }, { "arguments": [], "filename": "models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/impl/EntityPackageImpl.java", "implementation": "return (EReference)entityEClass.getEStructuralFeatures().get(1);", "signature": "EReference getEntity_OwnedReferences()" }, { "arguments": [], "filename": "models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/impl/EntityPackageImpl.java", "implementation": "return (EReference)entityEClass.getEStructuralFeatures().get(2);", "signature": "EReference getEntity_Supertype()" }, { "arguments": [], "filename": "models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/impl/EntityPackageImpl.java", "implementation": "return (EReference)entityEClass.getEStructuralFeatures().get(3);", "signature": "EReference getEntity_Attributes()" }, { "arguments": [], "filename": "models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/impl/EntityPackageImpl.java", "implementation": "return (EReference)entityEClass.getEStructuralFeatures().get(4);", "signature": "EReference getEntity_References()" }, { "arguments": [], "filename": "models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/impl/EntityPackageImpl.java", "implementation": "return (EReference)entityEClass.getEStructuralFeatures().get(5);", "signature": "EReference getEntity_Properties()" }, { "arguments": [], "filename": "models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/impl/EntityPackageImpl.java", "implementation": "return (EReference)entityEClass.getEStructuralFeatures().get(10);\n\t\treturn (EAttribute)entityEClass.getEStructuralFeatures().get(11);", "signature": "EReference getEntity_Block()" }, { "arguments": [], "filename": "models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/impl/EntityPackageImpl.java", "implementation": "return propertyEClass;", "signature": "EClass getProperty()" }, { "arguments": [], "filename": "models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/impl/EntityPackageImpl.java", "implementation": "return (EAttribute)propertyEClass.getEStructuralFeatures().get(0);", "signature": "EAttribute getProperty_Name()" }, { "arguments": [], "filename": "models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/impl/EntityPackageImpl.java", "implementation": "return (EAttribute)propertyEClass.getEStructuralFeatures().get(1);", "signature": "EAttribute getProperty_Multiplicity()" }, { "arguments": [], "filename": "models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/impl/EntityPackageImpl.java", "implementation": "return (EAttribute)propertyEClass.getEStructuralFeatures().get(2);", "signature": "EAttribute getProperty_IsPrimaryKey()" }, { "arguments": [], "filename": "models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/impl/EntityPackageImpl.java", "implementation": "return attributeEClass;", "signature": "EClass getAttribute()" }, { "arguments": [], "filename": "models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/impl/EntityPackageImpl.java", "implementation": "return (EReference)attributeEClass.getEStructuralFeatures().get(0);", "signature": "EReference getAttribute_Entity()" }, { "arguments": [], "filename": "models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/impl/EntityPackageImpl.java", "implementation": "return (EReference)attributeEClass.getEStructuralFeatures().get(1);", "signature": "EReference getAttribute_Type()" }, { "arguments": [], "filename": "models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/impl/EntityPackageImpl.java", "implementation": "return referenceEClass;", "signature": "EClass getReference()" }, { "arguments": [], "filename": "models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/impl/EntityPackageImpl.java", "implementation": "return (EReference)referenceEClass.getEStructuralFeatures().get(0);", "signature": "EReference getReference_Entity()" }, { "arguments": [], "filename": "models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/impl/EntityPackageImpl.java", "implementation": "return (EAttribute)referenceEClass.getEStructuralFeatures().get(1);", "signature": "EAttribute getReference_IsComposite()" }, { "arguments": [], "filename": "models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/impl/EntityPackageImpl.java", "implementation": "return (EReference)referenceEClass.getEStructuralFeatures().get(2);", "signature": "EReference getReference_OppositeOf()" }, { "arguments": [], "filename": "models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/impl/EntityPackageImpl.java", "implementation": "return (EReference)referenceEClass.getEStructuralFeatures().get(3);", "signature": "EReference getReference_Type()" } ], "patch": "@@ -15,12 +15,9 @@\n import org.eclipse.emf.ecore.EAttribute;\n import org.eclipse.emf.ecore.EClass;\n import org.eclipse.emf.ecore.EEnum;\n-import org.eclipse.emf.ecore.EOperation;\n import org.eclipse.emf.ecore.EPackage;\n import org.eclipse.emf.ecore.EReference;\n import org.eclipse.emf.ecore.impl.EPackageImpl;\n-import org.obeonetwork.dsl.entity.Attribute;\n-import org.obeonetwork.dsl.entity.Block;\n import org.obeonetwork.dsl.entity.Criterion;\n import org.obeonetwork.dsl.entity.Entity;\n import org.obeonetwork.dsl.entity.EntityFactory;\n@@ -29,8 +26,6 @@\n import org.obeonetwork.dsl.entity.Finder;\n import org.obeonetwork.dsl.entity.InheritanceKind;\n import org.obeonetwork.dsl.entity.InternalCriterion;\n-import org.obeonetwork.dsl.entity.Property;\n-import org.obeonetwork.dsl.entity.Reference;\n import org.obeonetwork.dsl.entity.Root;\n import org.obeonetwork.dsl.entity.extensionUtilities.ExtensionUtilitiesPackage;\n import org.obeonetwork.dsl.entity.extensionUtilities.impl.ExtensionUtilitiesPackageImpl;\n@@ -55,36 +50,12 @@ public class EntityPackageImpl extends EPackageImpl implements EntityPackage {\n \t */\n \tprivate EClass rootEClass = null;\n \n-\t/**\n-\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n-\t * @generated\n-\t */\n-\tprivate EClass blockEClass = null;\n-\n \t/**\n \t * <!-- begin-user-doc --> <!-- end-user-doc -->\n \t * @generated\n \t */\n \tprivate EClass entityEClass = null;\n \n-\t/**\n-\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n-\t * @generated\n-\t */\n-\tprivate EClass propertyEClass = null;\n-\n-\t/**\n-\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n-\t * @generated\n-\t */\n-\tprivate EClass attributeEClass = null;\n-\n-\t/**\n-\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n-\t * @generated\n-\t */\n-\tprivate EClass referenceEClass = null;\n-\n \t/**\n \t * <!-- begin-user-doc --> <!-- end-user-doc -->\n \t * @generated\n@@ -191,43 +162,21 @@ public EClass getRoot() {\n \t}\n \n \t/**\n-\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n-\t * @generated\n-\t */\n-\tpublic EReference getRoot_Blocks() {\n-\t\treturn (EReference)rootEClass.getEStructuralFeatures().get(0);\n-\t}\n-\n-\t/**\n-\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n-\t * @generated\n-\t */\n-\tpublic EClass getBlock() {\n-\t\treturn blockEClass;\n-\t}\n-\n-\t/**\n-\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n-\t * @generated\n-\t */\n-\tpublic EAttribute getBlock_Name() {\n-\t\treturn (EAttribute)blockEClass.getEStructuralFeatures().get(0);\n-\t}\n-\n-\t/**\n-\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n+\t * <!-- begin-user-doc -->\n+\t * <!-- end-user-doc -->\n \t * @generated\n \t */\n-\tpublic EReference getBlock_Entities() {\n-\t\treturn (EReference)blockEClass.getEStructuralFeatures().get(1);\n+\tpublic EAttribute getRoot_Name() {\n+\t\treturn (EAttribute)rootEClass.getEStructuralFeatures().get(0);\n \t}\n \n \t/**\n-\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n+\t * <!-- begin-user-doc -->\n+\t * <!-- end-user-doc -->\n \t * @generated\n \t */\n-\tpublic EReference getBlock_Subblocks() {\n-\t\treturn (EReference)blockEClass.getEStructuralFeatures().get(2);\n+\tpublic EReference getRoot_Namespaces() {\n+\t\treturn (EReference)rootEClass.getEStructuralFeatures().get(1);\n \t}\n \n \t/**\n@@ -238,204 +187,44 @@ public EClass getEntity() {\n \t\treturn entityEClass;\n \t}\n \n-\t/**\n-\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n-\t * @generated\n-\t */\n-\tpublic EReference getEntity_OwnedAttributes() {\n-\t\treturn (EReference)entityEClass.getEStructuralFeatures().get(0);\n-\t}\n-\n-\t/**\n-\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n-\t * @generated\n-\t */\n-\tpublic EReference getEntity_OwnedReferences() {\n-\t\treturn (EReference)entityEClass.getEStructuralFeatures().get(1);\n-\t}\n-\n-\t/**\n-\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n-\t * @generated\n-\t */\n-\tpublic EReference getEntity_Supertype() {\n-\t\treturn (EReference)entityEClass.getEStructuralFeatures().get(2);\n-\t}\n-\n-\t/**\n-\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n-\t * @generated\n-\t */\n-\tpublic EReference getEntity_Attributes() {\n-\t\treturn (EReference)entityEClass.getEStructuralFeatures().get(3);\n-\t}\n-\n-\t/**\n-\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n-\t * @generated\n-\t */\n-\tpublic EReference getEntity_References() {\n-\t\treturn (EReference)entityEClass.getEStructuralFeatures().get(4);\n-\t}\n-\n-\t/**\n-\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n-\t * @generated\n-\t */\n-\tpublic EReference getEntity_Properties() {\n-\t\treturn (EReference)entityEClass.getEStructuralFeatures().get(5);\n-\t}\n-\n \t/**\n \t * <!-- begin-user-doc --> <!-- end-user-doc -->\n \t * @generated\n \t */\n \tpublic EAttribute getEntity_EstimatedVolumetry() {\n-\t\treturn (EAttribute)entityEClass.getEStructuralFeatures().get(6);\n+\t\treturn (EAttribute)entityEClass.getEStructuralFeatures().get(0);\n \t}\n \n \t/**\n \t * <!-- begin-user-doc --> <!-- end-user-doc -->\n \t * @generated\n \t */\n \tpublic EAttribute getEntity_EstimatedAccess() {\n-\t\treturn (EAttribute)entityEClass.getEStructuralFeatures().get(7);\n+\t\treturn (EAttribute)entityEClass.getEStructuralFeatures().get(1);\n \t}\n \n \t/**\n \t * <!-- begin-user-doc --> <!-- end-user-doc -->\n \t * @generated\n \t */\n \tpublic EAttribute getEntity_Historized() {\n-\t\treturn (EAttribute)entityEClass.getEStructuralFeatures().get(8);\n+\t\treturn (EAttribute)entityEClass.getEStructuralFeatures().get(2);\n \t}\n \n \t/**\n \t * <!-- begin-user-doc --> <!-- end-user-doc -->\n \t * @generated\n \t */\n \tpublic EReference getEntity_OwnedFinders() {\n-\t\treturn (EReference)entityEClass.getEStructuralFeatures().get(9);\n-\t}\n-\n-\t/**\n-\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n-\t * @generated\n-\t */\n-\tpublic EReference getEntity_Block() {\n-\t\treturn (EReference)entityEClass.getEStructuralFeatures().get(10);\n+\t\treturn (EReference)entityEClass.getEStructuralFeatures().get(3);\n \t}\n \n \t/**\n \t * <!-- begin-user-doc --> <!-- end-user-doc -->\n \t * @generated\n \t */\n \tpublic EAttribute getEntity_InheritanceKind() {\n-\t\treturn (EAttribute)entityEClass.getEStructuralFeatures().get(11);\n-\t}\n-\n-\t/**\n-\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n-\t * @generated\n-\t */\n-\tpublic EClass getProperty() {\n-\t\treturn propertyEClass;\n-\t}\n-\n-\t/**\n-\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n-\t * @generated\n-\t */\n-\tpublic EAttribute getProperty_Name() {\n-\t\treturn (EAttribute)propertyEClass.getEStructuralFeatures().get(0);\n-\t}\n-\n-\t/**\n-\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n-\t * @generated\n-\t */\n-\tpublic EAttribute getProperty_Multiplicity() {\n-\t\treturn (EAttribute)propertyEClass.getEStructuralFeatures().get(1);\n-\t}\n-\n-\t/**\n-\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n-\t * @generated\n-\t */\n-\tpublic EAttribute getProperty_IsPrimaryKey() {\n-\t\treturn (EAttribute)propertyEClass.getEStructuralFeatures().get(2);\n-\t}\n-\n-\t/**\n-\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n-\t * @generated\n-\t */\n-\tpublic EClass getAttribute() {\n-\t\treturn attributeEClass;\n-\t}\n-\n-\t/**\n-\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n-\t * @generated\n-\t */\n-\tpublic EReference getAttribute_Entity() {\n-\t\treturn (EReference)attributeEClass.getEStructuralFeatures().get(0);\n-\t}\n-\n-\t/**\n-\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n-\t * @generated\n-\t */\n-\tpublic EReference getAttribute_Type() {\n-\t\treturn (EReference)attributeEClass.getEStructuralFeatures().get(1);\n-\t}\n-\n-\t/**\n-\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n-\t * @generated\n-\t */\n-\tpublic EClass getReference() {\n-\t\treturn referenceEClass;\n-\t}\n-\n-\t/**\n-\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n-\t * @generated\n-\t */\n-\tpublic EReference getReference_Entity() {\n-\t\treturn (EReference)referenceEClass.getEStructuralFeatures().get(0);\n-\t}\n-\n-\t/**\n-\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n-\t * @generated\n-\t */\n-\tpublic EAttribute getReference_IsComposite() {\n-\t\treturn (EAttribute)referenceEClass.getEStructuralFeatures().get(1);\n-\t}\n-\n-\t/**\n-\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n-\t * @generated\n-\t */\n-\tpublic EReference getReference_OppositeOf() {\n-\t\treturn (EReference)referenceEClass.getEStructuralFeatures().get(2);\n-\t}\n-\n-\t/**\n-\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n-\t * @generated\n-\t */\n-\tpublic EReference getReference_Type() {\n-\t\treturn (EReference)referenceEClass.getEStructuralFeatures().get(3);\n-\t}\n-\n-\t/**\n-\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n-\t * @generated\n-\t */\n-\tpublic EAttribute getReference_Navigable() {\n-\t\treturn (EAttribute)referenceEClass.getEStructuralFeatures().get(4);\n+\t\treturn (EAttribute)entityEClass.getEStructuralFeatures().get(4);\n \t}\n \n \t/**\n@@ -578,43 +367,16 @@ public void createPackageContents() {\n \n \t\t// Create classes and their features\n \t\trootEClass = createEClass(ROOT);\n-\t\tcreateEReference(rootEClass, ROOT__BLOCKS);\n-\n-\t\tblockEClass = createEClass(BLOCK);\n-\t\tcreateEAttribute(blockEClass, BLOCK__NAME);\n-\t\tcreateEReference(blockEClass, BLOCK__ENTITIES);\n-\t\tcreateEReference(blockEClass, BLOCK__SUBBLOCKS);\n+\t\tcreateEAttribute(rootEClass, ROOT__NAME);\n+\t\tcreateEReference(rootEClass, ROOT__NAMESPACES);\n \n \t\tentityEClass = createEClass(ENTITY);\n-\t\tcreateEReference(entityEClass, ENTITY__OWNED_ATTRIBUTES);\n-\t\tcreateEReference(entityEClass, ENTITY__OWNED_REFERENCES);\n-\t\tcreateEReference(entityEClass, ENTITY__SUPERTYPE);\n-\t\tcreateEReference(entityEClass, ENTITY__ATTRIBUTES);\n-\t\tcreateEReference(entityEClass, ENTITY__REFERENCES);\n-\t\tcreateEReference(entityEClass, ENTITY__PROPERTIES);\n \t\tcreateEAttribute(entityEClass, ENTITY__ESTIMATED_VOLUMETRY);\n \t\tcreateEAttribute(entityEClass, ENTITY__ESTIMATED_ACCESS);\n \t\tcreateEAttribute(entityEClass, ENTITY__HISTORIZED);\n \t\tcreateEReference(entityEClass, ENTITY__OWNED_FINDERS);\n-\t\tcreateEReference(entityEClass, ENTITY__BLOCK);\n \t\tcreateEAttribute(entityEClass, ENTITY__INHERITANCE_KIND);\n \n-\t\tpropertyEClass = createEClass(PROPERTY);\n-\t\tcreateEAttribute(propertyEClass, PROPERTY__NAME);\n-\t\tcreateEAttribute(propertyEClass, PROPERTY__MULTIPLICITY);\n-\t\tcreateEAttribute(propertyEClass, PROPERTY__IS_PRIMARY_KEY);\n-\n-\t\tattributeEClass = createEClass(ATTRIBUTE);\n-\t\tcreateEReference(attributeEClass, ATTRIBUTE__ENTITY);\n-\t\tcreateEReference(attributeEClass, ATTRIBUTE__TYPE);\n-\n-\t\treferenceEClass = createEClass(REFERENCE);\n-\t\tcreateEReference(referenceEClass, REFERENCE__ENTITY);\n-\t\tcreateEAttribute(referenceEClass, REFERENCE__IS_COMPOSITE);\n-\t\tcreateEReference(referenceEClass, REFERENCE__OPPOSITE_OF);\n-\t\tcreateEReference(referenceEClass, REFERENCE__TYPE);\n-\t\tcreateEAttribute(referenceEClass, REFERENCE__NAVIGABLE);\n-\n \t\tfinderEClass = createEClass(FINDER);\n \t\tcreateEAttribute(finderEClass, FINDER__NAME);\n \t\tcreateEReference(finderEClass, FINDER__ENTITY);\n@@ -670,63 +432,25 @@ public void initializePackageContents() {\n \t\t// Set bounds for type parameters\n \n \t\t// Add supertypes to classes\n-\t\trootEClass.getESuperTypes().add(theEnvironmentPackage.getNamespace());\n-\t\tblockEClass.getESuperTypes().add(theEnvironmentPackage.getObeoDSMObject());\n+\t\trootEClass.getESuperTypes().add(theEnvironmentPackage.getTypesDefinition());\n \t\tentityEClass.getESuperTypes().add(theEnvironmentPackage.getStructuredType());\n-\t\tpropertyEClass.getESuperTypes().add(theEnvironmentPackage.getObeoDSMObject());\n-\t\tpropertyEClass.getESuperTypes().add(theEnvironmentPackage.getBoundableElement());\n-\t\tattributeEClass.getESuperTypes().add(this.getProperty());\n-\t\treferenceEClass.getESuperTypes().add(this.getProperty());\n \t\tfinderEClass.getESuperTypes().add(theEnvironmentPackage.getObeoDSMObject());\n \t\tinternalCriterionEClass.getESuperTypes().add(this.getCriterion());\n \t\tcriterionEClass.getESuperTypes().add(theEnvironmentPackage.getObeoDSMObject());\n \t\texternalCriterionEClass.getESuperTypes().add(this.getCriterion());\n \n \t\t// Initialize classes and features; add operations and parameters\n \t\tinitEClass(rootEClass, Root.class, \"Root\", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\n-\t\tinitEReference(getRoot_Blocks(), this.getBlock(), null, \"blocks\", null, 0, -1, Root.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n-\n-\t\tinitEClass(blockEClass, Block.class, \"Block\", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\n-\t\tinitEAttribute(getBlock_Name(), ecorePackage.getEString(), \"name\", null, 1, 1, Block.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n-\t\tinitEReference(getBlock_Entities(), this.getEntity(), this.getEntity_Block(), \"entities\", null, 0, -1, Block.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n-\t\tinitEReference(getBlock_Subblocks(), this.getBlock(), null, \"subblocks\", null, 0, -1, Block.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n+\t\tinitEAttribute(getRoot_Name(), ecorePackage.getEString(), \"name\", null, 0, 1, Root.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n+\t\tinitEReference(getRoot_Namespaces(), theEnvironmentPackage.getNamespace(), null, \"namespaces\", null, 0, -1, Root.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n \n \t\tinitEClass(entityEClass, Entity.class, \"Entity\", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\n-\t\tinitEReference(getEntity_OwnedAttributes(), this.getAttribute(), this.getAttribute_Entity(), \"ownedAttributes\", null, 0, -1, Entity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n-\t\tinitEReference(getEntity_OwnedReferences(), this.getReference(), this.getReference_Entity(), \"ownedReferences\", null, 0, -1, Entity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n-\t\tinitEReference(getEntity_Supertype(), this.getEntity(), null, \"supertype\", null, 0, 1, Entity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n-\t\tinitEReference(getEntity_Attributes(), this.getAttribute(), null, \"attributes\", null, 0, -1, Entity.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);\n-\t\tinitEReference(getEntity_References(), this.getReference(), null, \"references\", null, 0, -1, Entity.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);\n-\t\tinitEReference(getEntity_Properties(), this.getProperty(), null, \"properties\", null, 0, -1, Entity.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);\n \t\tinitEAttribute(getEntity_EstimatedVolumetry(), ecorePackage.getEInt(), \"estimatedVolumetry\", null, 0, 1, Entity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n \t\tinitEAttribute(getEntity_EstimatedAccess(), ecorePackage.getEInt(), \"estimatedAccess\", null, 0, 1, Entity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n \t\tinitEAttribute(getEntity_Historized(), ecorePackage.getEBoolean(), \"historized\", null, 1, 1, Entity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n \t\tinitEReference(getEntity_OwnedFinders(), this.getFinder(), this.getFinder_Entity(), \"ownedFinders\", null, 0, -1, Entity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n-\t\tinitEReference(getEntity_Block(), this.getBlock(), this.getBlock_Entities(), \"block\", null, 1, 1, Entity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n \t\tinitEAttribute(getEntity_InheritanceKind(), this.getInheritanceKind(), \"inheritanceKind\", null, 0, 1, Entity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n \n-\t\tEOperation op = addEOperation(entityEClass, ecorePackage.getEBoolean(), \"isSubtypeOf\", 0, 1, IS_UNIQUE, IS_ORDERED);\n-\t\taddEParameter(op, this.getEntity(), \"entity\", 0, 1, IS_UNIQUE, IS_ORDERED);\n-\n-\t\tinitEClass(propertyEClass, Property.class, \"Property\", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\n-\t\tinitEAttribute(getProperty_Name(), ecorePackage.getEString(), \"name\", null, 1, 1, Property.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n-\t\tinitEAttribute(getProperty_Multiplicity(), theEnvironmentPackage.getMultiplicityKind(), \"multiplicity\", null, 1, 1, Property.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n-\t\tinitEAttribute(getProperty_IsPrimaryKey(), ecorePackage.getEBoolean(), \"isPrimaryKey\", \"false\", 1, 1, Property.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n-\n-\t\tinitEClass(attributeEClass, Attribute.class, \"Attribute\", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\n-\t\tinitEReference(getAttribute_Entity(), this.getEntity(), this.getEntity_OwnedAttributes(), \"entity\", null, 1, 1, Attribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n-\t\tinitEReference(getAttribute_Type(), theEnvironmentPackage.getPrimitiveType(), null, \"type\", null, 1, 1, Attribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n-\n-\t\tinitEClass(referenceEClass, Reference.class, \"Reference\", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\n-\t\tinitEReference(getReference_Entity(), this.getEntity(), this.getEntity_OwnedReferences(), \"entity\", null, 1, 1, Reference.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n-\t\tinitEAttribute(getReference_IsComposite(), ecorePackage.getEBoolean(), \"isComposite\", \"false\", 1, 1, Reference.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n-\t\tinitEReference(getReference_OppositeOf(), this.getReference(), null, \"oppositeOf\", null, 0, 1, Reference.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n-\t\tinitEReference(getReference_Type(), this.getEntity(), null, \"type\", null, 1, 1, Reference.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n-\t\tinitEAttribute(getReference_Navigable(), ecorePackage.getEBoolean(), \"navigable\", \"true\", 0, 1, Reference.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n-\n-\t\top = addEOperation(referenceEClass, ecorePackage.getEBoolean(), \"canBeOppositeOf\", 1, 1, IS_UNIQUE, IS_ORDERED);\n-\t\taddEParameter(op, this.getReference(), \"opposite\", 0, 1, IS_UNIQUE, IS_ORDERED);\n-\n \t\tinitEClass(finderEClass, Finder.class, \"Finder\", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\n \t\tinitEAttribute(getFinder_Name(), ecorePackage.getEString(), \"name\", null, 1, 1, Finder.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED);\n \t\tinitEReference(getFinder_Entity(), this.getEntity(), this.getEntity_OwnedFinders(), \"entity\", null, 1, 1, Finder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n@@ -735,7 +459,7 @@ public void initializePackageContents() {\n \t\tinitEAttribute(getFinder_Multiplicity(), theEnvironmentPackage.getMultiplicityKind(), \"multiplicity\", null, 1, 1, Finder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n \n \t\tinitEClass(internalCriterionEClass, InternalCriterion.class, \"InternalCriterion\", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\n-\t\tinitEReference(getInternalCriterion_Target(), this.getAttribute(), null, \"target\", null, 1, 1, InternalCriterion.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n+\t\tinitEReference(getInternalCriterion_Target(), theEnvironmentPackage.getAttribute(), null, \"target\", null, 1, 1, InternalCriterion.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n \t\tinitEAttribute(getInternalCriterion_Name(), ecorePackage.getEString(), \"name\", null, 1, 1, InternalCriterion.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED);\n \n \t\tinitEClass(criterionEClass, Criterion.class, \"Criterion\", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);", "raw_url": "https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fimpl%2FEntityPackageImpl.java", "sha": "d7e575abcdcee65011558eedb6ba479f73153d6a", "status": "modified" }, { "additions": 2, "blob_url": "https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fimpl%2FFinderImpl.java", "changes": 4, "contents_url": "https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fimpl%2FFinderImpl.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6", "deletions": 2, "filename": "models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/impl/FinderImpl.java", "new_code": "\t\t\tEList<Criterion> listCriterions = getCriterions();\n\t\t\t\tfor (Iterator<Criterion> iter = listCriterions.iterator(); iter.hasNext();) {", "new_methods": [], "old_code": "\t\t\tEList listCriterions = getCriterions();\n\t\t\t\tfor (Iterator iter = listCriterions.iterator(); iter.hasNext();) {", "old_methods": [], "patch": "@@ -110,9 +110,9 @@ public String getName() {\n \t\t\tresult = customizedName;\n \t\t} else {\n \t\t\tresult = \"finder : \";\n-\t\t\tEList listCriterions = getCriterions();\n+\t\t\tEList<Criterion> listCriterions = getCriterions();\n \t\t\tif (listCriterions != null) {\n-\t\t\t\tfor (Iterator iter = listCriterions.iterator(); iter.hasNext();) {\n+\t\t\t\tfor (Iterator<Criterion> iter = listCriterions.iterator(); iter.hasNext();) {\n \t\t\t\t\tCriterion criterion = (Criterion) iter.next();\n \t\t\t\t\tif (criterion instanceof InternalCriterion) {\n \t\t\t\t\t\tInternalCriterion internalCriterion = (InternalCriterion) criterion;", "raw_url": "https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fimpl%2FFinderImpl.java", "sha": "bacbbf45ce7bdee39b4667997638164633522610", "status": "modified" }, { "additions": 5, "blob_url": "https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fimpl%2FInternalCriterionImpl.java", "changes": 8, "contents_url": "https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fimpl%2FInternalCriterionImpl.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6", "deletions": 3, "filename": "models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/impl/InternalCriterionImpl.java", "new_code": "import org.obeonetwork.dsl.environment.Attribute;\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t\tif (getTarget() != null) {\n\t\t}", "new_methods": [], "old_code": "import org.obeonetwork.dsl.entity.Attribute;\n\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n\t\tif (getTarget() != null)", "old_methods": [], "patch": "@@ -13,9 +13,9 @@\n package org.obeonetwork.dsl.entity.impl;\n \n import org.eclipse.emf.ecore.EClass;\n-import org.obeonetwork.dsl.entity.Attribute;\n import org.obeonetwork.dsl.entity.EntityPackage;\n import org.obeonetwork.dsl.entity.InternalCriterion;\n+import org.obeonetwork.dsl.environment.Attribute;\n \n /**\n * <!-- begin-user-doc --> An implementation of the model object '<em><b>Internal Criterion</b></em>'.\n@@ -84,7 +84,8 @@ public Attribute basicGetTarget() {\n \t}\n \n \t/**\n-\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n+\t * <!-- begin-user-doc -->\n+\t * <!-- end-user-doc -->\n \t * @generated\n \t */\n \tpublic void setTarget(Attribute newTarget) {\n@@ -98,8 +99,9 @@ public void setTarget(Attribute newTarget) {\n \t */\n \tpublic String getName() {\n \t\tString result = \"\";\n-\t\tif (getTarget() != null)\n+\t\tif (getTarget() != null) {\n \t\t\tresult = getTarget().getName();\n+\t\t}\n \t\treturn result;\n \t}\n ", "raw_url": "https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fimpl%2FInternalCriterionImpl.java", "sha": "7bdfcf9563b821b85d0dbda0f59b871ea6353cd8", "status": "modified" }, { "additions": 57, "blob_url": "https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fimpl%2FRootImpl.java", "changes": 75, "contents_url": "https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fimpl%2FRootImpl.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6", "deletions": 18, "filename": "models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/impl/RootImpl.java", "new_code": "import org.obeonetwork.dsl.environment.Namespace;\nimport org.obeonetwork.dsl.environment.impl.TypesDefinitionImpl;\n * <li>{@link org.obeonetwork.dsl.entity.impl.RootImpl#getName <em>Name</em>}</li>\n * <li>{@link org.obeonetwork.dsl.entity.impl.RootImpl#getNamespaces <em>Namespaces</em>}</li>\npublic class RootImpl extends TypesDefinitionImpl implements Root {\n\t/**\n\t * The default value of the '{@link #getName() <em>Name</em>}' attribute.\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @see #getName()\n\t * @generated\n\t * @ordered\n\t */\n\tprotected static final String NAME_EDEFAULT = null;\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @generated\n\t */\n\tpublic String getName() {\n\t\treturn (String)eDynamicGet(EntityPackage.ROOT__NAME, EntityPackage.Literals.ROOT__NAME, true, true);\n\t}\n\n\t/**\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @generated\n\t */\n\tpublic void setName(String newName) {\n\t\teDynamicSet(EntityPackage.ROOT__NAME, EntityPackage.Literals.ROOT__NAME, newName);\n\t}\n\n\t/**\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\tpublic EList<Namespace> getNamespaces() {\n\t\treturn (EList<Namespace>)eDynamicGet(EntityPackage.ROOT__NAMESPACES, EntityPackage.Literals.ROOT__NAMESPACES, true, true);\n\t\t\tcase EntityPackage.ROOT__NAMESPACES:\n\t\t\t\treturn ((InternalEList<?>)getNamespaces()).basicRemove(otherEnd, msgs);\n\t\t\tcase EntityPackage.ROOT__NAME:\n\t\t\t\treturn getName();\n\t\t\tcase EntityPackage.ROOT__NAMESPACES:\n\t\t\t\treturn getNamespaces();\n\t\t\tcase EntityPackage.ROOT__NAME:\n\t\t\t\tsetName((String)newValue);\n\t\t\t\treturn;\n\t\t\tcase EntityPackage.ROOT__NAMESPACES:\n\t\t\t\tgetNamespaces().clear();\n\t\t\t\tgetNamespaces().addAll((Collection<? extends Namespace>)newValue);\n\t\t\tcase EntityPackage.ROOT__NAME:\n\t\t\t\tsetName(NAME_EDEFAULT);\n\t\t\t\treturn;\n\t\t\tcase EntityPackage.ROOT__NAMESPACES:\n\t\t\t\tgetNamespaces().clear();\n\t\t\tcase EntityPackage.ROOT__NAME:\n\t\t\t\treturn NAME_EDEFAULT == null ? getName() != null : !NAME_EDEFAULT.equals(getName());\n\t\t\tcase EntityPackage.ROOT__NAMESPACES:\n\t\t\t\treturn !getNamespaces().isEmpty();", "new_methods": [ { "arguments": [], "filename": "models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/impl/RootImpl.java", "implementation": "return (String)eDynamicGet(EntityPackage.ROOT__NAME, EntityPackage.Literals.ROOT__NAME, true, true);", "signature": "String getName()" }, { "arguments": [ "String newName" ], "filename": "models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/impl/RootImpl.java", "implementation": "eDynamicSet(EntityPackage.ROOT__NAME, EntityPackage.Literals.ROOT__NAME, newName);", "signature": "void setName(String newName)" } ], "old_code": "import org.obeonetwork.dsl.entity.Block;\nimport org.obeonetwork.dsl.environment.impl.NamespaceImpl;\n * <li>{@link org.obeonetwork.dsl.entity.impl.RootImpl#getBlocks <em>Blocks</em>}</li>\npublic class RootImpl extends NamespaceImpl implements Root {\n\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n\tpublic EList<Block> getBlocks() {\n\t\treturn (EList<Block>)eDynamicGet(EntityPackage.ROOT__BLOCKS, EntityPackage.Literals.ROOT__BLOCKS, true, true);\n\t\t\tcase EntityPackage.ROOT__BLOCKS:\n\t\t\t\treturn ((InternalEList<?>)getBlocks()).basicRemove(otherEnd, msgs);\n\t\t\tcase EntityPackage.ROOT__BLOCKS:\n\t\t\t\treturn getBlocks();\n\t\t\tcase EntityPackage.ROOT__BLOCKS:\n\t\t\t\tgetBlocks().clear();\n\t\t\t\tgetBlocks().addAll((Collection<? extends Block>)newValue);\n\t\t\tcase EntityPackage.ROOT__BLOCKS:\n\t\t\t\tgetBlocks().clear();\n\t\t\tcase EntityPackage.ROOT__BLOCKS:\n\t\t\t\treturn !getBlocks().isEmpty();", "old_methods": [], "patch": "@@ -19,30 +19,40 @@\n import org.eclipse.emf.ecore.EClass;\n import org.eclipse.emf.ecore.InternalEObject;\n import org.eclipse.emf.ecore.util.InternalEList;\n-import org.obeonetwork.dsl.entity.Block;\n import org.obeonetwork.dsl.entity.EntityPackage;\n import org.obeonetwork.dsl.entity.Root;\n-import org.obeonetwork.dsl.environment.impl.NamespaceImpl;\n+import org.obeonetwork.dsl.environment.Namespace;\n+import org.obeonetwork.dsl.environment.impl.TypesDefinitionImpl;\n \n /**\n * <!-- begin-user-doc --> An implementation of the model object '<em><b>Root</b></em>'.\n * <!-- end-user-doc -->\n * <p>\n * The following features are implemented:\n * <ul>\n- * <li>{@link org.obeonetwork.dsl.entity.impl.RootImpl#getBlocks <em>Blocks</em>}</li>\n+ * <li>{@link org.obeonetwork.dsl.entity.impl.RootImpl#getName <em>Name</em>}</li>\n+ * <li>{@link org.obeonetwork.dsl.entity.impl.RootImpl#getNamespaces <em>Namespaces</em>}</li>\n * </ul>\n * </p>\n *\n * @generated\n */\n-public class RootImpl extends NamespaceImpl implements Root {\n+public class RootImpl extends TypesDefinitionImpl implements Root {\n \t/**\n \t * <!-- begin-user-doc -->\n \t * <!-- end-user-doc -->\n \t * @generated\n \t */\n \tpublic static final String copyright = \"Copyright (c) 2008-2009 Obeo.\\nAll rights reserved. This program and the accompanying materials\\nare made available under the terms of the Eclipse Public License v1.0\\nwhich accompanies this distribution, and is available at\\nhttp://www.eclipse.org/legal/epl-v10.html\\n\\nContributors:\\n Obeo - initial API and implementation\";\n+\t/**\n+\t * The default value of the '{@link #getName() <em>Name</em>}' attribute.\n+\t * <!-- begin-user-doc -->\n+\t * <!-- end-user-doc -->\n+\t * @see #getName()\n+\t * @generated\n+\t * @ordered\n+\t */\n+\tprotected static final String NAME_EDEFAULT = null;\n \t/**\n \t * <!-- begin-user-doc --> <!-- end-user-doc -->\n \t * @generated\n@@ -61,12 +71,31 @@ protected EClass eStaticClass() {\n \t}\n \n \t/**\n-\t * <!-- begin-user-doc --> <!-- end-user-doc -->\n+\t * <!-- begin-user-doc -->\n+\t * <!-- end-user-doc -->\n+\t * @generated\n+\t */\n+\tpublic String getName() {\n+\t\treturn (String)eDynamicGet(EntityPackage.ROOT__NAME, EntityPackage.Literals.ROOT__NAME, true, true);\n+\t}\n+\n+\t/**\n+\t * <!-- begin-user-doc -->\n+\t * <!-- end-user-doc -->\n+\t * @generated\n+\t */\n+\tpublic void setName(String newName) {\n+\t\teDynamicSet(EntityPackage.ROOT__NAME, EntityPackage.Literals.ROOT__NAME, newName);\n+\t}\n+\n+\t/**\n+\t * <!-- begin-user-doc -->\n+\t * <!-- end-user-doc -->\n \t * @generated\n \t */\n \t@SuppressWarnings(\"unchecked\")\n-\tpublic EList<Block> getBlocks() {\n-\t\treturn (EList<Block>)eDynamicGet(EntityPackage.ROOT__BLOCKS, EntityPackage.Literals.ROOT__BLOCKS, true, true);\n+\tpublic EList<Namespace> getNamespaces() {\n+\t\treturn (EList<Namespace>)eDynamicGet(EntityPackage.ROOT__NAMESPACES, EntityPackage.Literals.ROOT__NAMESPACES, true, true);\n \t}\n \n \t/**\n@@ -77,8 +106,8 @@ public EList<Block> getBlocks() {\n \t@Override\n \tpublic NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {\n \t\tswitch (featureID) {\n-\t\t\tcase EntityPackage.ROOT__BLOCKS:\n-\t\t\t\treturn ((InternalEList<?>)getBlocks()).basicRemove(otherEnd, msgs);\n+\t\t\tcase EntityPackage.ROOT__NAMESPACES:\n+\t\t\t\treturn ((InternalEList<?>)getNamespaces()).basicRemove(otherEnd, msgs);\n \t\t}\n \t\treturn super.eInverseRemove(otherEnd, featureID, msgs);\n \t}\n@@ -91,8 +120,10 @@ public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID,\n \t@Override\n \tpublic Object eGet(int featureID, boolean resolve, boolean coreType) {\n \t\tswitch (featureID) {\n-\t\t\tcase EntityPackage.ROOT__BLOCKS:\n-\t\t\t\treturn getBlocks();\n+\t\t\tcase EntityPackage.ROOT__NAME:\n+\t\t\t\treturn getName();\n+\t\t\tcase EntityPackage.ROOT__NAMESPACES:\n+\t\t\t\treturn getNamespaces();\n \t\t}\n \t\treturn super.eGet(featureID, resolve, coreType);\n \t}\n@@ -106,9 +137,12 @@ public Object eGet(int featureID, boolean resolve, boolean coreType) {\n \t@Override\n \tpublic void eSet(int featureID, Object newValue) {\n \t\tswitch (featureID) {\n-\t\t\tcase EntityPackage.ROOT__BLOCKS:\n-\t\t\t\tgetBlocks().clear();\n-\t\t\t\tgetBlocks().addAll((Collection<? extends Block>)newValue);\n+\t\t\tcase EntityPackage.ROOT__NAME:\n+\t\t\t\tsetName((String)newValue);\n+\t\t\t\treturn;\n+\t\t\tcase EntityPackage.ROOT__NAMESPACES:\n+\t\t\t\tgetNamespaces().clear();\n+\t\t\t\tgetNamespaces().addAll((Collection<? extends Namespace>)newValue);\n \t\t\t\treturn;\n \t\t}\n \t\tsuper.eSet(featureID, newValue);\n@@ -122,8 +156,11 @@ public void eSet(int featureID, Object newValue) {\n \t@Override\n \tpublic void eUnset(int featureID) {\n \t\tswitch (featureID) {\n-\t\t\tcase EntityPackage.ROOT__BLOCKS:\n-\t\t\t\tgetBlocks().clear();\n+\t\t\tcase EntityPackage.ROOT__NAME:\n+\t\t\t\tsetName(NAME_EDEFAULT);\n+\t\t\t\treturn;\n+\t\t\tcase EntityPackage.ROOT__NAMESPACES:\n+\t\t\t\tgetNamespaces().clear();\n \t\t\t\treturn;\n \t\t}\n \t\tsuper.eUnset(featureID);\n@@ -137,8 +174,10 @@ public void eUnset(int featureID) {\n \t@Override\n \tpublic boolean eIsSet(int featureID) {\n \t\tswitch (featureID) {\n-\t\t\tcase EntityPackage.ROOT__BLOCKS:\n-\t\t\t\treturn !getBlocks().isEmpty();\n+\t\t\tcase EntityPackage.ROOT__NAME:\n+\t\t\t\treturn NAME_EDEFAULT == null ? getName() != null : !NAME_EDEFAULT.equals(getName());\n+\t\t\tcase EntityPackage.ROOT__NAMESPACES:\n+\t\t\t\treturn !getNamespaces().isEmpty();\n \t\t}\n \t\treturn super.eIsSet(featureID);\n \t}", "raw_url": "https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fimpl%2FRootImpl.java", "sha": "cbb596c6dd5bc0876d83505b8be3f7f9db4a3b85", "status": "modified" }, { "additions": 7, "blob_url": "https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Futil%2FEntityAdapterFactory.java", "changes": 85, "contents_url": "https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Futil%2FEntityAdapterFactory.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6", "deletions": 78, "filename": "models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/util/EntityAdapterFactory.java", "new_code": "import org.obeonetwork.dsl.entity.*;\nimport org.obeonetwork.dsl.environment.TypesDefinition;\n\t\t\tpublic Adapter caseTypesDefinition(TypesDefinition object) {\n\t\t\t\treturn createTypesDefinitionAdapter();\n\t * Creates a new adapter for an object of class '{@link org.obeonetwork.dsl.environment.TypesDefinition <em>Types Definition</em>}'.\n\t * @see org.obeonetwork.dsl.environment.TypesDefinition\n\tpublic Adapter createTypesDefinitionAdapter() {", "new_methods": [ { "arguments": [ "TypesDefinition object" ], "filename": "models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/util/EntityAdapterFactory.java", "implementation": "return createTypesDefinitionAdapter();\n\t * Creates a new adapter for an object of class '{@link org.obeonetwork.dsl.environment.TypesDefinition <em>Types Definition</em>", "signature": "Adapter caseTypesDefinition(TypesDefinition object)" } ], "old_code": "import org.obeonetwork.dsl.entity.Attribute;\nimport org.obeonetwork.dsl.entity.Block;\nimport org.obeonetwork.dsl.entity.Property;\nimport org.obeonetwork.dsl.entity.Reference;\nimport org.obeonetwork.dsl.environment.Namespace;\n\t\t\tpublic Adapter caseBlock(Block object) {\n\t\t\t\treturn createBlockAdapter();\n\t\t\t}\n\t\t\t@Override\n\t\t\tpublic Adapter caseProperty(Property object) {\n\t\t\t\treturn createPropertyAdapter();\n\t\t\t}\n\t\t\t@Override\n\t\t\tpublic Adapter caseAttribute(Attribute object) {\n\t\t\t\treturn createAttributeAdapter();\n\t\t\t}\n\t\t\t@Override\n\t\t\tpublic Adapter caseReference(Reference object) {\n\t\t\t\treturn createReferenceAdapter();\n\t\t\t}\n\t\t\t@Override\n\t\t\tpublic Adapter caseNamespace(Namespace object) {\n\t\t\t\treturn createNamespaceAdapter();\n\t/**\n\t * Creates a new adapter for an object of class '{@link org.obeonetwork.dsl.entity.Block <em>Block</em>}'.\n\t * <!-- begin-user-doc --> This default implementation returns null so that\n\t * we can easily ignore cases; it's useful to ignore a case when inheritance\n\t * will catch all the cases anyway. <!-- end-user-doc -->\n\t * @return the new adapter.\n\t * @see org.obeonetwork.dsl.entity.Block\n\t * @generated\n\t */\n\tpublic Adapter createBlockAdapter() {\n\t\treturn null;\n\t}\n\n\t/**\n\t * Creates a new adapter for an object of class '{@link org.obeonetwork.dsl.entity.Property <em>Property</em>}'.\n\t * <!-- begin-user-doc --> This default implementation returns null so that\n\t * we can easily ignore cases; it's useful to ignore a case when inheritance\n\t * will catch all the cases anyway. <!-- end-user-doc -->\n\t * @return the new adapter.\n\t * @see org.obeonetwork.dsl.entity.Property\n\t * @generated\n\t */\n\tpublic Adapter createPropertyAdapter() {\n\t\treturn null;\n\t}\n\n\t/**\n\t * Creates a new adapter for an object of class '{@link org.obeonetwork.dsl.entity.Attribute <em>Attribute</em>}'.\n\t * <!-- begin-user-doc --> This default implementation returns null so that\n\t * we can easily ignore cases; it's useful to ignore a case when inheritance\n\t * will catch all the cases anyway. <!-- end-user-doc -->\n\t * @return the new adapter.\n\t * @see org.obeonetwork.dsl.entity.Attribute\n\t * @generated\n\t */\n\tpublic Adapter createAttributeAdapter() {\n\t\treturn null;\n\t}\n\n\t/**\n\t * Creates a new adapter for an object of class '{@link org.obeonetwork.dsl.entity.Reference <em>Reference</em>}'.\n\t * <!-- begin-user-doc --> This default implementation returns null so that\n\t * we can easily ignore cases; it's useful to ignore a case when inheritance\n\t * will catch all the cases anyway. <!-- end-user-doc -->\n\t * @return the new adapter.\n\t * @see org.obeonetwork.dsl.entity.Reference\n\t * @generated\n\t */\n\tpublic Adapter createReferenceAdapter() {\n\t\treturn null;\n\t}\n\n\t * Creates a new adapter for an object of class '{@link org.obeonetwork.dsl.environment.Namespace <em>Namespace</em>}'.\n\t * @see org.obeonetwork.dsl.environment.Namespace\n\tpublic Adapter createNamespaceAdapter() {", "old_methods": [ { "arguments": [ "Block object" ], "filename": "models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/util/EntityAdapterFactory.java", "implementation": "return createBlockAdapter();", "signature": "Adapter caseBlock(Block object)" }, { "arguments": [ "Property object" ], "filename": "models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/util/EntityAdapterFactory.java", "implementation": "return createPropertyAdapter();", "signature": "Adapter caseProperty(Property object)" }, { "arguments": [ "Attribute object" ], "filename": "models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/util/EntityAdapterFactory.java", "implementation": "return createAttributeAdapter();", "signature": "Adapter caseAttribute(Attribute object)" }, { "arguments": [ "Reference object" ], "filename": "models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/util/EntityAdapterFactory.java", "implementation": "return createReferenceAdapter();", "signature": "Adapter caseReference(Reference object)" }, { "arguments": [ "Namespace object" ], "filename": "models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/util/EntityAdapterFactory.java", "implementation": "return createNamespaceAdapter();\n\t/**\n\t * Creates a new adapter for an object of class '{@link org.obeonetwork.dsl.entity.Block <em>Block</em>", "signature": "Adapter caseNamespace(Namespace object)" }, { "arguments": [], "filename": "models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/util/EntityAdapterFactory.java", "implementation": "return null;", "signature": "Adapter createBlockAdapter()" }, { "arguments": [], "filename": "models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/util/EntityAdapterFactory.java", "implementation": "return null;", "signature": "Adapter createPropertyAdapter()" }, { "arguments": [], "filename": "models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/util/EntityAdapterFactory.java", "implementation": "return null;", "signature": "Adapter createAttributeAdapter()" }, { "arguments": [], "filename": "models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/util/EntityAdapterFactory.java", "implementation": "return null;", "signature": "Adapter createReferenceAdapter()" } ], "patch": "@@ -16,22 +16,19 @@\n import org.eclipse.emf.common.notify.Notifier;\n import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;\n import org.eclipse.emf.ecore.EObject;\n-import org.obeonetwork.dsl.entity.Attribute;\n-import org.obeonetwork.dsl.entity.Block;\n+import org.obeonetwork.dsl.entity.*;\n import org.obeonetwork.dsl.entity.Criterion;\n import org.obeonetwork.dsl.entity.Entity;\n import org.obeonetwork.dsl.entity.EntityPackage;\n import org.obeonetwork.dsl.entity.ExternalCriterion;\n import org.obeonetwork.dsl.entity.Finder;\n import org.obeonetwork.dsl.entity.InternalCriterion;\n-import org.obeonetwork.dsl.entity.Property;\n-import org.obeonetwork.dsl.entity.Reference;\n import org.obeonetwork.dsl.entity.Root;\n import org.obeonetwork.dsl.environment.BoundableElement;\n-import org.obeonetwork.dsl.environment.Namespace;\n import org.obeonetwork.dsl.environment.ObeoDSMObject;\n import org.obeonetwork.dsl.environment.StructuredType;\n import org.obeonetwork.dsl.environment.Type;\n+import org.obeonetwork.dsl.environment.TypesDefinition;\n \n /**\n * <!-- begin-user-doc --> The <b>Adapter Factory</b> for the model. It\n@@ -98,26 +95,10 @@ public Adapter caseRoot(Root object) {\n \t\t\t\treturn createRootAdapter();\n \t\t\t}\n \t\t\t@Override\n-\t\t\tpublic Adapter caseBlock(Block object) {\n-\t\t\t\treturn createBlockAdapter();\n-\t\t\t}\n-\t\t\t@Override\n \t\t\tpublic Adapter caseEntity(Entity object) {\n \t\t\t\treturn createEntityAdapter();\n \t\t\t}\n \t\t\t@Override\n-\t\t\tpublic Adapter caseProperty(Property object) {\n-\t\t\t\treturn createPropertyAdapter();\n-\t\t\t}\n-\t\t\t@Override\n-\t\t\tpublic Adapter caseAttribute(Attribute object) {\n-\t\t\t\treturn createAttributeAdapter();\n-\t\t\t}\n-\t\t\t@Override\n-\t\t\tpublic Adapter caseReference(Reference object) {\n-\t\t\t\treturn createReferenceAdapter();\n-\t\t\t}\n-\t\t\t@Override\n \t\t\tpublic Adapter caseFinder(Finder object) {\n \t\t\t\treturn createFinderAdapter();\n \t\t\t}\n@@ -138,8 +119,8 @@ public Adapter caseObeoDSMObject(ObeoDSMObject object) {\n \t\t\t\treturn createObeoDSMObjectAdapter();\n \t\t\t}\n \t\t\t@Override\n-\t\t\tpublic Adapter caseNamespace(Namespace object) {\n-\t\t\t\treturn createNamespaceAdapter();\n+\t\t\tpublic Adapter caseTypesDefinition(TypesDefinition object) {\n+\t\t\t\treturn createTypesDefinitionAdapter();\n \t\t\t}\n \t\t\t@Override\n \t\t\tpublic Adapter caseBoundableElement(BoundableElement object) {\n@@ -186,19 +167,6 @@ public Adapter createRootAdapter() {\n \t\treturn null;\n \t}\n \n-\t/**\n-\t * Creates a new adapter for an object of class '{@link org.obeonetwork.dsl.entity.Block <em>Block</em>}'.\n-\t * <!-- begin-user-doc --> This default implementation returns null so that\n-\t * we can easily ignore cases; it's useful to ignore a case when inheritance\n-\t * will catch all the cases anyway. <!-- end-user-doc -->\n-\t * @return the new adapter.\n-\t * @see org.obeonetwork.dsl.entity.Block\n-\t * @generated\n-\t */\n-\tpublic Adapter createBlockAdapter() {\n-\t\treturn null;\n-\t}\n-\n \t/**\n \t * Creates a new adapter for an object of class '{@link org.obeonetwork.dsl.entity.Entity <em>Entity</em>}'.\n \t * <!-- begin-user-doc --> This default implementation returns null so that\n@@ -212,45 +180,6 @@ public Adapter createEntityAdapter() {\n \t\treturn null;\n \t}\n \n-\t/**\n-\t * Creates a new adapter for an object of class '{@link org.obeonetwork.dsl.entity.Property <em>Property</em>}'.\n-\t * <!-- begin-user-doc --> This default implementation returns null so that\n-\t * we can easily ignore cases; it's useful to ignore a case when inheritance\n-\t * will catch all the cases anyway. <!-- end-user-doc -->\n-\t * @return the new adapter.\n-\t * @see org.obeonetwork.dsl.entity.Property\n-\t * @generated\n-\t */\n-\tpublic Adapter createPropertyAdapter() {\n-\t\treturn null;\n-\t}\n-\n-\t/**\n-\t * Creates a new adapter for an object of class '{@link org.obeonetwork.dsl.entity.Attribute <em>Attribute</em>}'.\n-\t * <!-- begin-user-doc --> This default implementation returns null so that\n-\t * we can easily ignore cases; it's useful to ignore a case when inheritance\n-\t * will catch all the cases anyway. <!-- end-user-doc -->\n-\t * @return the new adapter.\n-\t * @see org.obeonetwork.dsl.entity.Attribute\n-\t * @generated\n-\t */\n-\tpublic Adapter createAttributeAdapter() {\n-\t\treturn null;\n-\t}\n-\n-\t/**\n-\t * Creates a new adapter for an object of class '{@link org.obeonetwork.dsl.entity.Reference <em>Reference</em>}'.\n-\t * <!-- begin-user-doc --> This default implementation returns null so that\n-\t * we can easily ignore cases; it's useful to ignore a case when inheritance\n-\t * will catch all the cases anyway. <!-- end-user-doc -->\n-\t * @return the new adapter.\n-\t * @see org.obeonetwork.dsl.entity.Reference\n-\t * @generated\n-\t */\n-\tpublic Adapter createReferenceAdapter() {\n-\t\treturn null;\n-\t}\n-\n \t/**\n \t * Creates a new adapter for an object of class '{@link org.obeonetwork.dsl.entity.Finder <em>Finder</em>}'.\n \t * <!-- begin-user-doc --> This default implementation returns null so that\n@@ -317,16 +246,16 @@ public Adapter createObeoDSMObjectAdapter() {\n \t}\n \n \t/**\n-\t * Creates a new adapter for an object of class '{@link org.obeonetwork.dsl.environment.Namespace <em>Namespace</em>}'.\n+\t * Creates a new adapter for an object of class '{@link org.obeonetwork.dsl.environment.TypesDefinition <em>Types Definition</em>}'.\n \t * <!-- begin-user-doc -->\n \t * This default implementation returns null so that we can easily ignore cases;\n \t * it's useful to ignore a case when inheritance will catch all the cases anyway.\n \t * <!-- end-user-doc -->\n \t * @return the new adapter.\n-\t * @see org.obeonetwork.dsl.environment.Namespace\n+\t * @see org.obeonetwork.dsl.environment.TypesDefinition\n \t * @generated\n \t */\n-\tpublic Adapter createNamespaceAdapter() {\n+\tpublic Adapter createTypesDefinitionAdapter() {\n \t\treturn null;\n \t}\n ", "raw_url": "https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Futil%2FEntityAdapterFactory.java", "sha": "ac05074845bf6ca61ece6632e41fed8c61dc46f0", "status": "modified" }, { "additions": 6, "blob_url": "https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Futil%2FEntitySwitch.java", "changes": 100, "contents_url": "https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Futil%2FEntitySwitch.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6", "deletions": 94, "filename": "models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/util/EntitySwitch.java", "new_code": "import org.obeonetwork.dsl.entity.*;\nimport org.obeonetwork.dsl.environment.TypesDefinition;\n\t\t\t\tif (result == null) result = caseTypesDefinition(root);\n\t * Returns the result of interpreting the object as an instance of '<em>Types Definition</em>'.\n\t * @return the result of interpreting the object as an instance of '<em>Types Definition</em>'.\n\tpublic T caseTypesDefinition(TypesDefinition object) {", "new_methods": [], "old_code": "import org.obeonetwork.dsl.entity.Attribute;\nimport org.obeonetwork.dsl.entity.Block;\nimport org.obeonetwork.dsl.entity.Property;\nimport org.obeonetwork.dsl.entity.Reference;\nimport org.obeonetwork.dsl.environment.Namespace;\n\t\t\t\tif (result == null) result = caseNamespace(root);\n\t\t\tcase EntityPackage.BLOCK: {\n\t\t\t\tBlock block = (Block)theEObject;\n\t\t\t\tT result = caseBlock(block);\n\t\t\t\tif (result == null) result = caseObeoDSMObject(block);\n\t\t\t\tif (result == null) result = defaultCase(theEObject);\n\t\t\t\treturn result;\n\t\t\t}\n\t\t\tcase EntityPackage.PROPERTY: {\n\t\t\t\tProperty property = (Property)theEObject;\n\t\t\t\tT result = caseProperty(property);\n\t\t\t\tif (result == null) result = caseObeoDSMObject(property);\n\t\t\t\tif (result == null) result = caseBoundableElement(property);\n\t\t\t\tif (result == null) result = defaultCase(theEObject);\n\t\t\t\treturn result;\n\t\t\t}\n\t\t\tcase EntityPackage.ATTRIBUTE: {\n\t\t\t\tAttribute attribute = (Attribute)theEObject;\n\t\t\t\tT result = caseAttribute(attribute);\n\t\t\t\tif (result == null) result = caseProperty(attribute);\n\t\t\t\tif (result == null) result = caseObeoDSMObject(attribute);\n\t\t\t\tif (result == null) result = caseBoundableElement(attribute);\n\t\t\t\tif (result == null) result = defaultCase(theEObject);\n\t\t\t\treturn result;\n\t\t\t}\n\t\t\tcase EntityPackage.REFERENCE: {\n\t\t\t\tReference reference = (Reference)theEObject;\n\t\t\t\tT result = caseReference(reference);\n\t\t\t\tif (result == null) result = caseProperty(reference);\n\t\t\t\tif (result == null) result = caseObeoDSMObject(reference);\n\t\t\t\tif (result == null) result = caseBoundableElement(reference);\n\t\t\t\tif (result == null) result = defaultCase(theEObject);\n\t\t\t\treturn result;\n\t\t\t}\n\t/**\n\t * Returns the result of interpreting the object as an instance of '<em>Block</em>'.\n\t * <!-- begin-user-doc --> This implementation returns null; returning a\n\t * non-null result will terminate the switch. <!-- end-user-doc -->\n\t * @param object the target of the switch.\n\t * @return the result of interpreting the object as an instance of '<em>Block</em>'.\n\t * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)\n\t * @generated\n\t */\n\tpublic T caseBlock(Block object) {\n\t\treturn null;\n\t}\n\n\t/**\n\t * Returns the result of interpreting the object as an instance of '<em>Property</em>'.\n\t * <!-- begin-user-doc --> This implementation returns null; returning a\n\t * non-null result will terminate the switch. <!-- end-user-doc -->\n\t * @param object the target of the switch.\n\t * @return the result of interpreting the object as an instance of '<em>Property</em>'.\n\t * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)\n\t * @generated\n\t */\n\tpublic T caseProperty(Property object) {\n\t\treturn null;\n\t}\n\n\t/**\n\t * Returns the result of interpreting the object as an instance of '<em>Attribute</em>'.\n\t * <!-- begin-user-doc --> This implementation returns null; returning a\n\t * non-null result will terminate the switch. <!-- end-user-doc -->\n\t * @param object the target of the switch.\n\t * @return the result of interpreting the object as an instance of '<em>Attribute</em>'.\n\t * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)\n\t * @generated\n\t */\n\tpublic T caseAttribute(Attribute object) {\n\t\treturn null;\n\t}\n\n\t/**\n\t * Returns the result of interpreting the object as an instance of '<em>Reference</em>'.\n\t * <!-- begin-user-doc --> This implementation returns null; returning a\n\t * non-null result will terminate the switch. <!-- end-user-doc -->\n\t * @param object the target of the switch.\n\t * @return the result of interpreting the object as an instance of '<em>Reference</em>'.\n\t * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)\n\t * @generated\n\t */\n\tpublic T caseReference(Reference object) {\n\t\treturn null;\n\t}\n\n\t * Returns the result of interpreting the object as an instance of '<em>Namespace</em>'.\n\t * @return the result of interpreting the object as an instance of '<em>Namespace</em>'.\n\tpublic T caseNamespace(Namespace object) {", "old_methods": [ { "arguments": [ "Block object" ], "filename": "models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/util/EntitySwitch.java", "implementation": "return null;", "signature": "T caseBlock(Block object)" }, { "arguments": [ "Property object" ], "filename": "models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/util/EntitySwitch.java", "implementation": "return null;", "signature": "T caseProperty(Property object)" }, { "arguments": [ "Attribute object" ], "filename": "models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/util/EntitySwitch.java", "implementation": "return null;", "signature": "T caseAttribute(Attribute object)" }, { "arguments": [ "Reference object" ], "filename": "models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/util/EntitySwitch.java", "implementation": "return null;", "signature": "T caseReference(Reference object)" } ], "patch": "@@ -16,22 +16,19 @@\n \n import org.eclipse.emf.ecore.EClass;\n import org.eclipse.emf.ecore.EObject;\n-import org.obeonetwork.dsl.entity.Attribute;\n-import org.obeonetwork.dsl.entity.Block;\n+import org.obeonetwork.dsl.entity.*;\n import org.obeonetwork.dsl.entity.Criterion;\n import org.obeonetwork.dsl.entity.Entity;\n import org.obeonetwork.dsl.entity.EntityPackage;\n import org.obeonetwork.dsl.entity.ExternalCriterion;\n import org.obeonetwork.dsl.entity.Finder;\n import org.obeonetwork.dsl.entity.InternalCriterion;\n-import org.obeonetwork.dsl.entity.Property;\n-import org.obeonetwork.dsl.entity.Reference;\n import org.obeonetwork.dsl.entity.Root;\n import org.obeonetwork.dsl.environment.BoundableElement;\n-import org.obeonetwork.dsl.environment.Namespace;\n import org.obeonetwork.dsl.environment.ObeoDSMObject;\n import org.obeonetwork.dsl.environment.StructuredType;\n import org.obeonetwork.dsl.environment.Type;\n+import org.obeonetwork.dsl.environment.TypesDefinition;\n \n /**\n * <!-- begin-user-doc --> The <b>Switch</b> for the model's inheritance\n@@ -112,18 +109,11 @@ protected T doSwitch(int classifierID, EObject theEObject) {\n \t\t\tcase EntityPackage.ROOT: {\n \t\t\t\tRoot root = (Root)theEObject;\n \t\t\t\tT result = caseRoot(root);\n-\t\t\t\tif (result == null) result = caseNamespace(root);\n+\t\t\t\tif (result == null) result = caseTypesDefinition(root);\n \t\t\t\tif (result == null) result = caseObeoDSMObject(root);\n \t\t\t\tif (result == null) result = defaultCase(theEObject);\n \t\t\t\treturn result;\n \t\t\t}\n-\t\t\tcase EntityPackage.BLOCK: {\n-\t\t\t\tBlock block = (Block)theEObject;\n-\t\t\t\tT result = caseBlock(block);\n-\t\t\t\tif (result == null) result = caseObeoDSMObject(block);\n-\t\t\t\tif (result == null) result = defaultCase(theEObject);\n-\t\t\t\treturn result;\n-\t\t\t}\n \t\t\tcase EntityPackage.ENTITY: {\n \t\t\t\tEntity entity = (Entity)theEObject;\n \t\t\t\tT result = caseEntity(entity);\n@@ -134,32 +124,6 @@ protected T doSwitch(int classifierID, EObject theEObject) {\n \t\t\t\tif (result == null) result = defaultCase(theEObject);\n \t\t\t\treturn result;\n \t\t\t}\n-\t\t\tcase EntityPackage.PROPERTY: {\n-\t\t\t\tProperty property = (Property)theEObject;\n-\t\t\t\tT result = caseProperty(property);\n-\t\t\t\tif (result == null) result = caseObeoDSMObject(property);\n-\t\t\t\tif (result == null) result = caseBoundableElement(property);\n-\t\t\t\tif (result == null) result = defaultCase(theEObject);\n-\t\t\t\treturn result;\n-\t\t\t}\n-\t\t\tcase EntityPackage.ATTRIBUTE: {\n-\t\t\t\tAttribute attribute = (Attribute)theEObject;\n-\t\t\t\tT result = caseAttribute(attribute);\n-\t\t\t\tif (result == null) result = caseProperty(attribute);\n-\t\t\t\tif (result == null) result = caseObeoDSMObject(attribute);\n-\t\t\t\tif (result == null) result = caseBoundableElement(attribute);\n-\t\t\t\tif (result == null) result = defaultCase(theEObject);\n-\t\t\t\treturn result;\n-\t\t\t}\n-\t\t\tcase EntityPackage.REFERENCE: {\n-\t\t\t\tReference reference = (Reference)theEObject;\n-\t\t\t\tT result = caseReference(reference);\n-\t\t\t\tif (result == null) result = caseProperty(reference);\n-\t\t\t\tif (result == null) result = caseObeoDSMObject(reference);\n-\t\t\t\tif (result == null) result = caseBoundableElement(reference);\n-\t\t\t\tif (result == null) result = defaultCase(theEObject);\n-\t\t\t\treturn result;\n-\t\t\t}\n \t\t\tcase EntityPackage.FINDER: {\n \t\t\t\tFinder finder = (Finder)theEObject;\n \t\t\t\tT result = caseFinder(finder);\n@@ -207,19 +171,6 @@ public T caseRoot(Root object) {\n \t\treturn null;\n \t}\n \n-\t/**\n-\t * Returns the result of interpreting the object as an instance of '<em>Block</em>'.\n-\t * <!-- begin-user-doc --> This implementation returns null; returning a\n-\t * non-null result will terminate the switch. <!-- end-user-doc -->\n-\t * @param object the target of the switch.\n-\t * @return the result of interpreting the object as an instance of '<em>Block</em>'.\n-\t * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)\n-\t * @generated\n-\t */\n-\tpublic T caseBlock(Block object) {\n-\t\treturn null;\n-\t}\n-\n \t/**\n \t * Returns the result of interpreting the object as an instance of '<em>Entity</em>'.\n \t * <!-- begin-user-doc --> This implementation returns null; returning a\n@@ -233,45 +184,6 @@ public T caseEntity(Entity object) {\n \t\treturn null;\n \t}\n \n-\t/**\n-\t * Returns the result of interpreting the object as an instance of '<em>Property</em>'.\n-\t * <!-- begin-user-doc --> This implementation returns null; returning a\n-\t * non-null result will terminate the switch. <!-- end-user-doc -->\n-\t * @param object the target of the switch.\n-\t * @return the result of interpreting the object as an instance of '<em>Property</em>'.\n-\t * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)\n-\t * @generated\n-\t */\n-\tpublic T caseProperty(Property object) {\n-\t\treturn null;\n-\t}\n-\n-\t/**\n-\t * Returns the result of interpreting the object as an instance of '<em>Attribute</em>'.\n-\t * <!-- begin-user-doc --> This implementation returns null; returning a\n-\t * non-null result will terminate the switch. <!-- end-user-doc -->\n-\t * @param object the target of the switch.\n-\t * @return the result of interpreting the object as an instance of '<em>Attribute</em>'.\n-\t * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)\n-\t * @generated\n-\t */\n-\tpublic T caseAttribute(Attribute object) {\n-\t\treturn null;\n-\t}\n-\n-\t/**\n-\t * Returns the result of interpreting the object as an instance of '<em>Reference</em>'.\n-\t * <!-- begin-user-doc --> This implementation returns null; returning a\n-\t * non-null result will terminate the switch. <!-- end-user-doc -->\n-\t * @param object the target of the switch.\n-\t * @return the result of interpreting the object as an instance of '<em>Reference</em>'.\n-\t * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)\n-\t * @generated\n-\t */\n-\tpublic T caseReference(Reference object) {\n-\t\treturn null;\n-\t}\n-\n \t/**\n \t * Returns the result of interpreting the object as an instance of '<em>Finder</em>'.\n \t * <!-- begin-user-doc --> This implementation returns null; returning a\n@@ -338,17 +250,17 @@ public T caseObeoDSMObject(ObeoDSMObject object) {\n \t}\n \n \t/**\n-\t * Returns the result of interpreting the object as an instance of '<em>Namespace</em>'.\n+\t * Returns the result of interpreting the object as an instance of '<em>Types Definition</em>'.\n \t * <!-- begin-user-doc -->\n \t * This implementation returns null;\n \t * returning a non-null result will terminate the switch.\n \t * <!-- end-user-doc -->\n \t * @param object the target of the switch.\n-\t * @return the result of interpreting the object as an instance of '<em>Namespace</em>'.\n+\t * @return the result of interpreting the object as an instance of '<em>Types Definition</em>'.\n \t * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)\n \t * @generated\n \t */\n-\tpublic T caseNamespace(Namespace object) {\n+\tpublic T caseTypesDefinition(TypesDefinition object) {\n \t\treturn null;\n \t}\n ", "raw_url": "https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Futil%2FEntitySwitch.java", "sha": "0cf7a11337417ea5adc5bd6fbf14004c9fb76e4a", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2FMETA-INF%2FMANIFEST.MF", "changes": 2, "contents_url": "https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2FMETA-INF%2FMANIFEST.MF?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6", "deletions": 1, "filename": "models/environment/plugins/org.obeonetwork.dsl.environment.edit/META-INF/MANIFEST.MF", "new_code": "Bundle-SymbolicName: org.obeonetwork.dsl.environment.edit;singleton:=true", "new_methods": [], "old_code": "Bundle-SymbolicName: org.obeonetwork.dsl.environment.edit; singleton:=true", "old_methods": [], "patch": "@@ -1,7 +1,7 @@\n Manifest-Version: 1.0\n Bundle-ManifestVersion: 2\n Bundle-Name: %pluginName\n-Bundle-SymbolicName: org.obeonetwork.dsl.environment.edit; singleton:=true\n+Bundle-SymbolicName: org.obeonetwork.dsl.environment.edit;singleton:=true\n Bundle-Version: 2.4.0.qualifier\n Bundle-ClassPath: .\n Bundle-Activator: org.obeonetwork.dsl.environment.provider.EnvironmentEditPlugin$Implementation", "raw_url": "https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2FMETA-INF%2FMANIFEST.MF", "sha": "694a9532100ddfb15b88a1cc5f89f6598a66a953", "status": "modified" }, { "additions": 48, "blob_url": "https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fmodel%2Fenvironment.components", "changes": 51, "contents_url": "https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fmodel%2Fenvironment.components?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6", "deletions": 3, "filename": "models/environment/plugins/org.obeonetwork.dsl.environment.edit/model/environment.components", "new_code": " <properties xsi:type=\"eef-components:PropertiesEditionElement\" xmi:id=\"_mffkgFrDEeSp8I2rNbfleQ\" name=\"identifier\" views=\"_WEd8gFrDEeSp8I2rNbfleQ\">\n <model xsi:type=\"ecore:EAttribute\" href=\"platform:/resource/org.obeonetwork.dsl.environment/model/environment.ecore#//Property/isIdentifier\"/>\n </properties>\n <properties xsi:type=\"eef-components:PropertiesEditionElement\" xmi:id=\"_Z4_3sHCzEeCNPbrYssPTmA\" name=\"referencedType\" views=\"_Z4_4EHCzEeCNPbrYssPTmA\">\n <model xsi:type=\"ecore:EReference\" href=\"platform:/resource/org.obeonetwork.dsl.environment/model/environment.ecore#//Reference/referencedType\"/>\n <properties xsi:type=\"eef-components:PropertiesEditionElement\" xmi:id=\"_qBAjcFrDEeSp8I2rNbfleQ\" name=\"identifier\" views=\"_agQLUFrDEeSp8I2rNbfleQ\">\n <model xsi:type=\"ecore:EAttribute\" href=\"platform:/resource/org.obeonetwork.dsl.environment/model/environment.ecore#//Property/isIdentifier\"/>\n </properties>\n <bindings xsi:type=\"eef-components:PropertiesEditionComponent\" xmi:id=\"_A2efUFrEEeSp8I2rNbfleQ\" name=\"DTO\" views=\"_1_txIFrDEeSp8I2rNbfleQ\">\n <properties xsi:type=\"eef-components:PropertiesEditionElement\" xmi:id=\"_FlDuUFrEEeSp8I2rNbfleQ\" name=\"name\" views=\"_6t-QAFrDEeSp8I2rNbfleQ\">\n <model xsi:type=\"ecore:EAttribute\" href=\"platform:/resource/org.obeonetwork.dsl.environment/model/environment.ecore#//Environment/name\"/>\n </properties>\n <properties xsi:type=\"eef-components:PropertiesEditionElement\" xmi:id=\"_MZIqMFrEEeSp8I2rNbfleQ\" name=\"supertype\" views=\"_6t-QAVrDEeSp8I2rNbfleQ\">\n <model xsi:type=\"ecore:EReference\" href=\"platform:/resource/org.obeonetwork.dsl.environment/model/environment.ecore#//StructuredType/supertype\"/>\n </properties>\n <properties xsi:type=\"eef-components:PropertiesEditionElement\" xmi:id=\"_TJe8oFrEEeSp8I2rNbfleQ\" name=\"description\" views=\"_6t-QA1rDEeSp8I2rNbfleQ\">\n <model xsi:type=\"ecore:EAttribute\" href=\"platform:/resource/org.obeonetwork.dsl.environment/model/environment.ecore#//ObeoDSMObject/description\"/>\n </properties>\n <properties xsi:type=\"eef-components:PropertiesEditionElement\" xmi:id=\"_QH5a8FrEEeSp8I2rNbfleQ\" name=\"associatedTypes\" views=\"_6t-QAlrDEeSp8I2rNbfleQ\">\n <model xsi:type=\"ecore:EReference\" href=\"platform:/resource/org.obeonetwork.dsl.environment/model/environment.ecore#//StructuredType/associatedTypes\"/>\n </properties>\n <referencedBinding xmi:id=\"_Dwn8QFrEEeSp8I2rNbfleQ\" binding=\"_65K3QHC0EeCNPbrYssPTmA\"/>\n <model xsi:type=\"ecore:EClass\" href=\"platform:/resource/org.obeonetwork.dsl.environment/model/environment.ecore#//DTO\"/>\n </bindings>\n <elements xsi:type=\"eef-views:ElementEditor\" xmi:id=\"_WEd8gFrDEeSp8I2rNbfleQ\" name=\"identifier\">\n <representation href=\"platform:/plugin/org.eclipse.emf.eef.views/std/SWT.toolkits#//@widgets.1\"/>\n </elements>\n <elements xsi:type=\"eef-views:ElementEditor\" xmi:id=\"_Z4_4EHCzEeCNPbrYssPTmA\" name=\"referencedType\">\n <elements xsi:type=\"eef-views:ElementEditor\" xmi:id=\"_agQLUFrDEeSp8I2rNbfleQ\" name=\"identifier\">\n <representation href=\"platform:/plugin/org.eclipse.emf.eef.views/std/SWT.toolkits#//@widgets.1\"/>\n </elements>\n <views xmi:id=\"_1_txIFrDEeSp8I2rNbfleQ\" name=\"DTO\">\n <elements xsi:type=\"eef-views:Container\" xmi:id=\"_3lZ8kFrDEeSp8I2rNbfleQ\" name=\"properties\">\n <representation href=\"platform:/plugin/org.eclipse.emf.eef.views/std/SWT.toolkits#//@widgets.4\"/>\n <elements xsi:type=\"eef-views:ElementEditor\" xmi:id=\"_6t-QAFrDEeSp8I2rNbfleQ\" name=\"name\">\n <representation href=\"platform:/plugin/org.eclipse.emf.eef.views/std/SWT.toolkits#//@widgets.0\"/>\n </elements>\n <elements xsi:type=\"eef-views:ElementEditor\" xmi:id=\"_6t-QAVrDEeSp8I2rNbfleQ\" name=\"supertype\">\n <representation href=\"platform:/plugin/org.eclipse.emf.eef.views/std/EMFProperties.toolkits#//@widgets.0\"/>\n </elements>\n <elements xsi:type=\"eef-views:ElementEditor\" xmi:id=\"_6t-QAlrDEeSp8I2rNbfleQ\" name=\"associatedTypes\">\n <representation href=\"platform:/plugin/org.eclipse.emf.eef.views/std/EMFProperties.toolkits#//@widgets.8\"/>\n </elements>\n <elements xsi:type=\"eef-views:ElementEditor\" xmi:id=\"_6t-QA1rDEeSp8I2rNbfleQ\" name=\"description\">\n <representation href=\"platform:/plugin/org.eclipse.emf.eef.views/std/SWT.toolkits#//@widgets.2\"/>\n </elements>\n </elements>\n </views>", "new_methods": [], "old_code": " <properties xsi:type=\"eef-components:PropertiesEditionElement\" xmi:id=\"_Z4_3sHCzEeCNPbrYssPTmA\" name=\"type\" views=\"_Z4_4EHCzEeCNPbrYssPTmA\">\n <model xsi:type=\"ecore:EReference\" href=\"platform:/resource/org.obeonetwork.dsl.environment/model/environment.ecore#//Reference/type\"/>\n <elements xsi:type=\"eef-views:ElementEditor\" xmi:id=\"_Z4_4EHCzEeCNPbrYssPTmA\" name=\"type\">", "old_methods": [], "patch": "@@ -132,6 +132,9 @@\n <properties xsi:type=\"eef-components:PropertiesEditionElement\" xmi:id=\"_Z4_3pHCzEeCNPbrYssPTmA\" name=\"multiplicity\" views=\"_Z4_4A3CzEeCNPbrYssPTmA\">\n <model xsi:type=\"ecore:EAttribute\" href=\"platform:/resource/org.obeonetwork.dsl.environment/model/environment.ecore#//Property/multiplicity\"/>\n </properties>\n+ <properties xsi:type=\"eef-components:PropertiesEditionElement\" xmi:id=\"_mffkgFrDEeSp8I2rNbfleQ\" name=\"identifier\" views=\"_WEd8gFrDEeSp8I2rNbfleQ\">\n+ <model xsi:type=\"ecore:EAttribute\" href=\"platform:/resource/org.obeonetwork.dsl.environment/model/environment.ecore#//Property/isIdentifier\"/>\n+ </properties>\n <properties xsi:type=\"eef-components:PropertiesEditionElement\" xmi:id=\"_Z4_3oHCzEeCNPbrYssPTmA\" name=\"description\" views=\"_Z4_3_3CzEeCNPbrYssPTmA\">\n <model xsi:type=\"ecore:EAttribute\" href=\"platform:/resource/org.obeonetwork.dsl.environment/model/environment.ecore#//ObeoDSMObject/description\"/>\n </properties>\n@@ -142,8 +145,8 @@\n <properties xsi:type=\"eef-components:PropertiesEditionElement\" xmi:id=\"_Z4_3q3CzEeCNPbrYssPTmA\" name=\"name\" views=\"_Z4_4C3CzEeCNPbrYssPTmA\">\n <model xsi:type=\"ecore:EAttribute\" href=\"platform:/resource/org.obeonetwork.dsl.environment/model/environment.ecore#//Property/name\"/>\n </properties>\n- <properties xsi:type=\"eef-components:PropertiesEditionElement\" xmi:id=\"_Z4_3sHCzEeCNPbrYssPTmA\" name=\"type\" views=\"_Z4_4EHCzEeCNPbrYssPTmA\">\n- <model xsi:type=\"ecore:EReference\" href=\"platform:/resource/org.obeonetwork.dsl.environment/model/environment.ecore#//Reference/type\"/>\n+ <properties xsi:type=\"eef-components:PropertiesEditionElement\" xmi:id=\"_Z4_3sHCzEeCNPbrYssPTmA\" name=\"referencedType\" views=\"_Z4_4EHCzEeCNPbrYssPTmA\">\n+ <model xsi:type=\"ecore:EReference\" href=\"platform:/resource/org.obeonetwork.dsl.environment/model/environment.ecore#//Reference/referencedType\"/>\n </properties>\n <properties xsi:type=\"eef-components:PropertiesEditionElement\" xmi:id=\"_Z4_3rHCzEeCNPbrYssPTmA\" name=\"multiplicity\" views=\"_Z4_4DHCzEeCNPbrYssPTmA\">\n <model xsi:type=\"ecore:EAttribute\" href=\"platform:/resource/org.obeonetwork.dsl.environment/model/environment.ecore#//Property/multiplicity\"/>\n@@ -157,6 +160,9 @@\n <properties xsi:type=\"eef-components:PropertiesEditionElement\" xmi:id=\"_Z4_3r3CzEeCNPbrYssPTmA\" name=\"oppositeOf\" views=\"_Z4_4D3CzEeCNPbrYssPTmA\">\n <model xsi:type=\"ecore:EReference\" href=\"platform:/resource/org.obeonetwork.dsl.environment/model/environment.ecore#//Reference/oppositeOf\"/>\n </properties>\n+ <properties xsi:type=\"eef-components:PropertiesEditionElement\" xmi:id=\"_qBAjcFrDEeSp8I2rNbfleQ\" name=\"identifier\" views=\"_agQLUFrDEeSp8I2rNbfleQ\">\n+ <model xsi:type=\"ecore:EAttribute\" href=\"platform:/resource/org.obeonetwork.dsl.environment/model/environment.ecore#//Property/isIdentifier\"/>\n+ </properties>\n <properties xsi:type=\"eef-components:PropertiesEditionElement\" xmi:id=\"_Z4_3qHCzEeCNPbrYssPTmA\" name=\"description\" views=\"_Z4_4CHCzEeCNPbrYssPTmA\">\n <model xsi:type=\"ecore:EAttribute\" href=\"platform:/resource/org.obeonetwork.dsl.environment/model/environment.ecore#//ObeoDSMObject/description\"/>\n </properties>\n@@ -202,6 +208,22 @@\n <referencedBinding xmi:id=\"_91fLZP_jEeCQir_iIC_y4Q\" binding=\"_65K3QHC0EeCNPbrYssPTmA\"/>\n <model xsi:type=\"ecore:EClass\" href=\"platform:/resource/org.obeonetwork.dsl.environment/model/environment.ecore#//BindingElement\"/>\n </bindings>\n+ <bindings xsi:type=\"eef-components:PropertiesEditionComponent\" xmi:id=\"_A2efUFrEEeSp8I2rNbfleQ\" name=\"DTO\" views=\"_1_txIFrDEeSp8I2rNbfleQ\">\n+ <properties xsi:type=\"eef-components:PropertiesEditionElement\" xmi:id=\"_FlDuUFrEEeSp8I2rNbfleQ\" name=\"name\" views=\"_6t-QAFrDEeSp8I2rNbfleQ\">\n+ <model xsi:type=\"ecore:EAttribute\" href=\"platform:/resource/org.obeonetwork.dsl.environment/model/environment.ecore#//Environment/name\"/>\n+ </properties>\n+ <properties xsi:type=\"eef-components:PropertiesEditionElement\" xmi:id=\"_MZIqMFrEEeSp8I2rNbfleQ\" name=\"supertype\" views=\"_6t-QAVrDEeSp8I2rNbfleQ\">\n+ <model xsi:type=\"ecore:EReference\" href=\"platform:/resource/org.obeonetwork.dsl.environment/model/environment.ecore#//StructuredType/supertype\"/>\n+ </properties>\n+ <properties xsi:type=\"eef-components:PropertiesEditionElement\" xmi:id=\"_TJe8oFrEEeSp8I2rNbfleQ\" name=\"description\" views=\"_6t-QA1rDEeSp8I2rNbfleQ\">\n+ <model xsi:type=\"ecore:EAttribute\" href=\"platform:/resource/org.obeonetwork.dsl.environment/model/environment.ecore#//ObeoDSMObject/description\"/>\n+ </properties>\n+ <properties xsi:type=\"eef-components:PropertiesEditionElement\" xmi:id=\"_QH5a8FrEEeSp8I2rNbfleQ\" name=\"associatedTypes\" views=\"_6t-QAlrDEeSp8I2rNbfleQ\">\n+ <model xsi:type=\"ecore:EReference\" href=\"platform:/resource/org.obeonetwork.dsl.environment/model/environment.ecore#//StructuredType/associatedTypes\"/>\n+ </properties>\n+ <referencedBinding xmi:id=\"_Dwn8QFrEEeSp8I2rNbfleQ\" binding=\"_65K3QHC0EeCNPbrYssPTmA\"/>\n+ <model xsi:type=\"ecore:EClass\" href=\"platform:/resource/org.obeonetwork.dsl.environment/model/environment.ecore#//DTO\"/>\n+ </bindings>\n </categories>\n <model href=\"platform:/resource/org.obeonetwork.dsl.environment/model/environment.genmodel#//environment\"/>\n </eef-components:PropertiesEditionContext>\n@@ -339,6 +361,9 @@\n <elements xsi:type=\"eef-views:ElementEditor\" xmi:id=\"_Z4_4A3CzEeCNPbrYssPTmA\" name=\"multiplicity\">\n <representation href=\"platform:/plugin/org.eclipse.emf.eef.views/std/EMFProperties.toolkits#//@widgets.2\"/>\n </elements>\n+ <elements xsi:type=\"eef-views:ElementEditor\" xmi:id=\"_WEd8gFrDEeSp8I2rNbfleQ\" name=\"identifier\">\n+ <representation href=\"platform:/plugin/org.eclipse.emf.eef.views/std/SWT.toolkits#//@widgets.1\"/>\n+ </elements>\n <elements xsi:type=\"eef-views:ElementEditor\" xmi:id=\"_Z4_3_3CzEeCNPbrYssPTmA\" name=\"description\">\n <representation href=\"platform:/plugin/org.eclipse.emf.eef.views/std/SWT.toolkits#//@widgets.0\"/>\n </elements>\n@@ -350,7 +375,7 @@\n <elements xsi:type=\"eef-views:ElementEditor\" xmi:id=\"_Z4_4C3CzEeCNPbrYssPTmA\" name=\"name\">\n <representation href=\"platform:/plugin/org.eclipse.emf.eef.views/std/SWT.toolkits#//@widgets.0\"/>\n </elements>\n- <elements xsi:type=\"eef-views:ElementEditor\" xmi:id=\"_Z4_4EHCzEeCNPbrYssPTmA\" name=\"type\">\n+ <elements xsi:type=\"eef-views:ElementEditor\" xmi:id=\"_Z4_4EHCzEeCNPbrYssPTmA\" name=\"referencedType\">\n <representation href=\"platform:/plugin/org.eclipse.emf.eef.views/std/EMFProperties.toolkits#//@widgets.0\"/>\n </elements>\n <elements xsi:type=\"eef-views:ElementEditor\" xmi:id=\"_Z4_4DHCzEeCNPbrYssPTmA\" name=\"multiplicity\">\n@@ -365,6 +390,9 @@\n <elements xsi:type=\"eef-views:ElementEditor\" xmi:id=\"_Z4_4D3CzEeCNPbrYssPTmA\" name=\"oppositeOf\">\n <representation href=\"platform:/plugin/org.eclipse.emf.eef.views/std/EMFProperties.toolkits#//@widgets.0\"/>\n </elements>\n+ <elements xsi:type=\"eef-views:ElementEditor\" xmi:id=\"_agQLUFrDEeSp8I2rNbfleQ\" name=\"identifier\">\n+ <representation href=\"platform:/plugin/org.eclipse.emf.eef.views/std/SWT.toolkits#//@widgets.1\"/>\n+ </elements>\n <elements xsi:type=\"eef-views:ElementEditor\" xmi:id=\"_Z4_4CHCzEeCNPbrYssPTmA\" name=\"description\">\n <representation href=\"platform:/plugin/org.eclipse.emf.eef.views/std/SWT.toolkits#//@widgets.0\"/>\n </elements>\n@@ -420,6 +448,23 @@\n </elements>\n </elements>\n </views>\n+ <views xmi:id=\"_1_txIFrDEeSp8I2rNbfleQ\" name=\"DTO\">\n+ <elements xsi:type=\"eef-views:Container\" xmi:id=\"_3lZ8kFrDEeSp8I2rNbfleQ\" name=\"properties\">\n+ <representation href=\"platform:/plugin/org.eclipse.emf.eef.views/std/SWT.toolkits#//@widgets.4\"/>\n+ <elements xsi:type=\"eef-views:ElementEditor\" xmi:id=\"_6t-QAFrDEeSp8I2rNbfleQ\" name=\"name\">\n+ <representation href=\"platform:/plugin/org.eclipse.emf.eef.views/std/SWT.toolkits#//@widgets.0\"/>\n+ </elements>\n+ <elements xsi:type=\"eef-views:ElementEditor\" xmi:id=\"_6t-QAVrDEeSp8I2rNbfleQ\" name=\"supertype\">\n+ <representation href=\"platform:/plugin/org.eclipse.emf.eef.views/std/EMFProperties.toolkits#//@widgets.0\"/>\n+ </elements>\n+ <elements xsi:type=\"eef-views:ElementEditor\" xmi:id=\"_6t-QAlrDEeSp8I2rNbfleQ\" name=\"associatedTypes\">\n+ <representation href=\"platform:/plugin/org.eclipse.emf.eef.views/std/EMFProperties.toolkits#//@widgets.8\"/>\n+ </elements>\n+ <elements xsi:type=\"eef-views:ElementEditor\" xmi:id=\"_6t-QA1rDEeSp8I2rNbfleQ\" name=\"description\">\n+ <representation href=\"platform:/plugin/org.eclipse.emf.eef.views/std/SWT.toolkits#//@widgets.2\"/>\n+ </elements>\n+ </elements>\n+ </views>\n </categories>\n </eef-views:ViewsRepository>\n </xmi:XMI>", "raw_url": "https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fmodel%2Fenvironment.components", "sha": "595e8f47e4ad473d574db6b52ed63452855710fe", "status": "modified" }, { "additions": 60, "blob_url": "https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fplugin.properties", "changes": 145, "contents_url": "https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fplugin.properties?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6", "deletions": 85, "filename": "models/environment/plugins/org.obeonetwork.dsl.environment.edit/plugin.properties", "new_code": "# Copyright (c) 2008-2009 Obeo.\n# All rights reserved. This program and the accompanying materials\n# are made available under the terms of the Eclipse Public License v1.0\n# which accompanies this distribution, and is available at\n# http://www.eclipse.org/legal/epl-v10.html\n# \n# Contributors:\n# Obeo - initial API and implementation\nproviderName = www.example.org\n_UI_PriorityDefinition_type = Priority Definition\n_UI_Priority_type = Priority\n_UI_MetaData_type = Meta Data\n_UI_TypesDefinition_type = Types Definition\n_UI_Behaviour_type = Behaviour\n_UI_StructuredType_type = Structured Type\n_UI_DTO_type = DTO\n_UI_FilterContainer_type = Filter Container\n_UI_Filter_type = Filter\n_UI_Namespace_type = Namespace\n_UI_Attribute_type = Attribute\n_UI_Reference_type = Reference\n_UI_Property_type = Property\n_UI_BindingInfo_type = Binding Info\n_UI_BindingReference_type = Binding Reference\n_UI_BindingElement_type = Binding Element\n_UI_BindingRegistry_type = Binding Registry\n_UI_BoundableElement_type = Boundable Element\n_UI_Environment_priorityDefinitions_feature = Priority Definitions\n_UI_Environment_typesDefinition_feature = Types Definition\n_UI_Environment_namespaces_feature = Namespaces\n_UI_Type_typeDefinition_feature = Type Definition\n_UI_ObeoDSMObject_description_feature = Description\n_UI_ObeoDSMObject_keywords_feature = Keywords\n_UI_ObeoDSMObject_behaviours_feature = Behaviours\n_UI_ObeoDSMObject_bindingRegistries_feature = Binding Registries\n_UI_ObeoDSMObject_version_feature = Version\n_UI_ObeoDSMObject_createdOn_feature = Created On\n_UI_ObeoDSMObject_modifiedOn_feature = Modified On\n_UI_MetaDataContainer_metadatas_feature = Metadatas\n_UI_StructuredType_supertype_feature = Supertype\n_UI_StructuredType_associatedTypes_feature = Associated Types\n_UI_StructuredType_ownedAttributes_feature = Owned Attributes\n_UI_StructuredType_attributes_feature = Attributes\n_UI_StructuredType_ownedReferences_feature = Owned References\n_UI_StructuredType_references_feature = References\n_UI_StructuredType_properties_feature = Properties\n_UI_Attribute_containingType_feature = Containing Type\n_UI_Reference_containingType_feature = Containing Type\n_UI_Reference_referencedType_feature = Referenced Type\n_UI_Property_isIdentifier_feature = Is Identifier\n_UI_BindingInfo_references_feature = References\n_UI_BindingElement_boundElement_feature = Bound Element\n_UI_BindingElement_bindingExpression_feature = Binding Expression\n_UI_BindingRegistry_bindingInfos_feature = Binding Infos\n_UI_Unknown_feature = Unspecified\n\n_UI_MultiplicityKind_ZERO_ONE_literal = 0..1\n_UI_MultiplicityKind_ONE_literal = 1\n_UI_MultiplicityKind_ZERO_STAR_literal = 0..*\n_UI_MultiplicityKind_ONE_STAR_literal = 1..*", "new_methods": [], "old_code": "# <copyright>\n# </copyright>\n#\n# $Id$\n\n# ====================================================================\n# To code developer:\n# Do NOT change the properties between this line and the\n# \"%%% END OF TRANSLATED PROPERTIES %%%\" line.\n# Make a new property name, append to the end of the file and change\n# the code to use the new property.\n# ====================================================================\n\n# ====================================================================\n# %%% END OF TRANSLATED PROPERTIES %%%\n# ====================================================================\nproviderName = Obeo.fr\n_UI_Environment_types_feature = Types\n_UI_MetaDataContainer_annotations_feature = Annotations\n_UI_Unknown_feature = Unspecified\n\n_UI_PriorityDefinition_type = Priority Definition\n_UI_PriorityKind_type = Priority Kind\n_UI_Environment_priorityDefinitions_feature = Priority Definitions\n_UI_PriorityKind_name_feature = Name\n_UI_MetaData_type = Meta Data\n_UI_ObeoDSMObject_metadataContainer_feature = Metadata Container\n_UI_MetaDataContainer_metadatas_feature = Metadatas\n_UI_Priority_type = Priority\n_UI_TypesDefinition_type = Types Definition\n_UI_Environment_typesDefinition_feature = Types Definition\n_UI_Type_typeDefinition_feature = Type Definition\n_UI_TypesDefinition_name_feature = Name\n_UI_Behaviour_type = Behaviour\n_UI_Environment_behaviours_feature = Behaviours\n_UI_StructuredType_type = Structured Type\n_UI_DTO_type = DTO\n_UI_FilterContainer_type = Filter Container\n_UI_Filter_type = Filter\n_UI_MultiplicityKind_ZERO_ONE_literal = 0..1\n_UI_MultiplicityKind_ONE_literal = 1\n_UI_MultiplicityKind_ZERO_STAR_literal = 0..*\n_UI_MultiplicityKind_ONE_STAR_literal = 1..*\n_UI_DTO_references_feature = References\n_UI_Container_type = Container\n_UI_Namespace_type = Namespace\n_UI_ObeoDSMObject_description_feature = Description\n_UI_ObeoDSMObject_keywords_feature = Keywords\n_UI_Attribute_type = Attribute\n_UI_Reference_type = Reference\n_UI_Property_type = Property\n_UI_DTO_properties_feature = Properties\n_UI_DTO_ownedReferences_feature = Owned References\n_UI_DTO_attributes_feature = Attributes\n_UI_DTO_ownedAttributes_feature = Owned Attributes\n_UI_Attribute_dto_feature = Dto\n_UI_Reference_type_feature = Type\n_UI_Reference_dto_feature = Dto\n_UI_DTO_supertype_feature = Supertype\n_UI_DTO_associatedTypes_feature = Associated Types\n_UI_ObeoDSMObject_behaviours_feature = Behaviours\n_UI_Binding_type = Binding\n_UI_BindingCluster_type = Binding Cluster\n_UI_BindingElement_type = Binding Element\n_UI_ObeoDSMObject_bindings_feature = Bindings\n_UI_Binding_clusters_feature = Clusters\n_UI_Binding_left_feature = Left\n_UI_Binding_right_feature = Right\n_UI_BindingCluster_left_feature = Left\n_UI_BindingCluster_right_feature = Right\n_UI_BindingElement_boundElement_feature = Bound Element\n_UI_BindingElement_bindingExpression_feature = Binding Expression\n_UI_BindingInfo_type = Binding Info\n_UI_BindingInfo_clusters_feature = Clusters\n_UI_ObeoDSMObject_bindingInfos_feature = Binding Infos\n_UI_BindingRegistry_type = Binding Registry\n_UI_ObeoDSMObject_bindingRegistries_feature = Binding Registries\n_UI_BindingRegistry_bindingInfos_feature = Binding Infos\n_UI_BindingElement_internalPath_feature = Internal Path\n_UI_BindingReference_type = Binding Reference\n_UI_BindingInfo_references_feature = References\n_UI_BoundableElement_type = Boundable Element\n_UI_ObeoDSMObject_version_feature = Version\n_UI_ObeoDSMObject_createdOn_feature = Created On\n_UI_ObeoDSMObject_modifiedOn_feature = Modified On", "old_methods": [], "patch": "@@ -1,22 +1,14 @@\n-# <copyright>\n-# </copyright>\n-#\n-# $Id$\n-\n-# ====================================================================\n-# To code developer:\n-# Do NOT change the properties between this line and the\n-# \"%%% END OF TRANSLATED PROPERTIES %%%\" line.\n-# Make a new property name, append to the end of the file and change\n-# the code to use the new property.\n-# ====================================================================\n-\n-# ====================================================================\n-# %%% END OF TRANSLATED PROPERTIES %%%\n-# ====================================================================\n+# Copyright (c) 2008-2009 Obeo.\n+# All rights reserved. This program and the accompanying materials\n+# are made available under the terms of the Eclipse Public License v1.0\n+# which accompanies this distribution, and is available at\n+# http://www.eclipse.org/legal/epl-v10.html\n+# \n+# Contributors:\n+# Obeo - initial API and implementation\n \n pluginName = Environment Edit Support\n-providerName = Obeo.fr\n+providerName = www.example.org\n \n _UI_CreateChild_text = {0}\n _UI_CreateChild_text2 = {1} {0}\n@@ -37,112 +29,95 @@ _UI_InterDSMLink_type = Inter DSM Link\n _UI_ObeoDSMObject_type = Obeo DSM Object\n _UI_MetaDataContainer_type = Meta Data Container\n _UI_Annotation_type = Annotation\n+_UI_PriorityDefinition_type = Priority Definition\n+_UI_Priority_type = Priority\n+_UI_MetaData_type = Meta Data\n+_UI_TypesDefinition_type = Types Definition\n+_UI_Behaviour_type = Behaviour\n+_UI_StructuredType_type = Structured Type\n+_UI_DTO_type = DTO\n+_UI_FilterContainer_type = Filter Container\n+_UI_Filter_type = Filter\n+_UI_Namespace_type = Namespace\n+_UI_Attribute_type = Attribute\n+_UI_Reference_type = Reference\n+_UI_Property_type = Property\n+_UI_BindingInfo_type = Binding Info\n+_UI_BindingReference_type = Binding Reference\n+_UI_BindingElement_type = Binding Element\n+_UI_BindingRegistry_type = Binding Registry\n+_UI_BoundableElement_type = Boundable Element\n _UI_Unknown_type = Object\n \n _UI_Unknown_datatype= Value\n \n _UI_Environment_name_feature = Name\n-_UI_Environment_types_feature = Types\n _UI_Environment_actions_feature = Actions\n _UI_Environment_links_feature = Links\n+_UI_Environment_priorityDefinitions_feature = Priority Definitions\n+_UI_Environment_typesDefinition_feature = Types Definition\n+_UI_Environment_namespaces_feature = Namespaces\n _UI_Type_name_feature = Name\n+_UI_Type_typeDefinition_feature = Type Definition\n _UI_Enumeration_fields_feature = Fields\n _UI_Field_name_feature = Name\n _UI_Action_name_feature = Name\n _UI_InterDSMLink_name_feature = Name\n _UI_InterDSMLink_target_feature = Target\n _UI_ObeoDSMObject_metadatas_feature = Metadatas\n-_UI_MetaDataContainer_annotations_feature = Annotations\n+_UI_ObeoDSMObject_description_feature = Description\n+_UI_ObeoDSMObject_keywords_feature = Keywords\n+_UI_ObeoDSMObject_behaviours_feature = Behaviours\n+_UI_ObeoDSMObject_bindingRegistries_feature = Binding Registries\n+_UI_ObeoDSMObject_version_feature = Version\n+_UI_ObeoDSMObject_createdOn_feature = Created On\n+_UI_ObeoDSMObject_modifiedOn_feature = Modified On\n+_UI_MetaDataContainer_metadatas_feature = Metadatas\n _UI_Annotation_title_feature = Title\n _UI_Annotation_body_feature = Body\n-_UI_Unknown_feature = Unspecified\n-\n-_UI_PriorityDefinition_type = Priority Definition\n-_UI_PriorityKind_type = Priority Kind\n-_UI_Environment_priorityDefinitions_feature = Priority Definitions\n _UI_PriorityDefinition_priorities_feature = Priorities\n-_UI_PriorityKind_name_feature = Name\n-_UI_MetaData_type = Meta Data\n-_UI_ObeoDSMObject_metadataContainer_feature = Metadata Container\n-_UI_MetaDataContainer_metadatas_feature = Metadatas\n-_UI_Priority_type = Priority\n-_UI_TypesDefinition_type = Types Definition\n-_UI_Environment_typesDefinition_feature = Types Definition\n _UI_Priority_name_feature = Name\n _UI_TypesDefinition_types_feature = Types\n-_UI_Type_typeDefinition_feature = Type Definition\n-_UI_TypesDefinition_name_feature = Name\n-_UI_Behaviour_type = Behaviour\n-_UI_Environment_behaviours_feature = Behaviours\n-_UI_StructuredType_type = Structured Type\n-_UI_DTO_type = DTO\n-_UI_FilterContainer_type = Filter Container\n-_UI_Filter_type = Filter\n+_UI_StructuredType_supertype_feature = Supertype\n+_UI_StructuredType_associatedTypes_feature = Associated Types\n+_UI_StructuredType_ownedAttributes_feature = Owned Attributes\n+_UI_StructuredType_attributes_feature = Attributes\n+_UI_StructuredType_ownedReferences_feature = Owned References\n+_UI_StructuredType_references_feature = References\n+_UI_StructuredType_properties_feature = Properties\n _UI_DTO_ownedContainer_feature = Owned Container\n _UI_FilterContainer_ownedFilters_feature = Owned Filters\n-_UI_MultiplicityKind_ZERO_ONE_literal = 0..1\n-_UI_MultiplicityKind_ONE_literal = 1\n-_UI_MultiplicityKind_ZERO_STAR_literal = 0..*\n-_UI_MultiplicityKind_ONE_STAR_literal = 1..*\n-_UI_DTO_references_feature = References\n-_UI_Container_type = Container\n-_UI_Namespace_type = Namespace\n _UI_Namespace_ownedNamespaces_feature = Owned Namespaces\n _UI_Namespace_owner_feature = Owner\n _UI_Namespace_name_feature = Name\n-_UI_ObeoDSMObject_description_feature = Description\n-_UI_ObeoDSMObject_keywords_feature = Keywords\n-_UI_Attribute_type = Attribute\n-_UI_Reference_type = Reference\n-_UI_Property_type = Property\n-_UI_DTO_properties_feature = Properties\n-_UI_DTO_ownedReferences_feature = Owned References\n-_UI_DTO_attributes_feature = Attributes\n-_UI_DTO_ownedAttributes_feature = Owned Attributes\n _UI_Attribute_type_feature = Type\n-_UI_Attribute_dto_feature = Dto\n+_UI_Attribute_containingType_feature = Containing Type\n _UI_Reference_isComposite_feature = Is Composite\n _UI_Reference_navigable_feature = Navigable\n _UI_Reference_oppositeOf_feature = Opposite Of\n-_UI_Reference_type_feature = Type\n-_UI_Reference_dto_feature = Dto\n+_UI_Reference_containingType_feature = Containing Type\n+_UI_Reference_referencedType_feature = Referenced Type\n _UI_Property_name_feature = Name\n _UI_Property_multiplicity_feature = Multiplicity\n-_UI_DTO_supertype_feature = Supertype\n-_UI_DTO_associatedTypes_feature = Associated Types\n-_UI_ObeoDSMObject_behaviours_feature = Behaviours\n-_UI_Binding_type = Binding\n-_UI_BindingCluster_type = Binding Cluster\n-_UI_BindingElement_type = Binding Element\n-_UI_ObeoDSMObject_bindings_feature = Bindings\n-_UI_Binding_clusters_feature = Clusters\n-_UI_Binding_left_feature = Left\n-_UI_Binding_right_feature = Right\n-_UI_BindingCluster_left_feature = Left\n-_UI_BindingCluster_right_feature = Right\n-_UI_BindingElement_boundElement_feature = Bound Element\n-_UI_BindingElement_bindingExpression_feature = Binding Expression\n-_UI_BindingInfo_type = Binding Info\n-_UI_BindingInfo_clusters_feature = Clusters\n+_UI_Property_isIdentifier_feature = Is Identifier\n+_UI_BindingInfo_references_feature = References\n _UI_BindingInfo_left_feature = Left\n _UI_BindingInfo_right_feature = Right\n-_UI_ObeoDSMObject_bindingInfos_feature = Binding Infos\n-_UI_BindingRegistry_type = Binding Registry\n-_UI_ObeoDSMObject_bindingRegistries_feature = Binding Registries\n _UI_BindingInfo_subBindingInfos_feature = Sub Binding Infos\n-_UI_BindingRegistry_bindingInfos_feature = Binding Infos\n _UI_BindingInfo_targets_feature = Targets\n-_UI_BindingElement_internalPath_feature = Internal Path\n-_UI_BindingReference_type = Binding Reference\n-_UI_BindingInfo_references_feature = References\n _UI_BindingInfo_elements_feature = Elements\n _UI_BindingReference_left_feature = Left\n _UI_BindingReference_right_feature = Right\n+_UI_BindingElement_boundElement_feature = Bound Element\n+_UI_BindingElement_bindingExpression_feature = Binding Expression\n _UI_BindingElement_referencedByAsLeft_feature = Referenced By As Left\n _UI_BindingElement_referencedByAsRight_feature = Referenced By As Right\n _UI_BindingElement_referencedBy_feature = Referenced By\n-_UI_BoundableElement_type = Boundable Element\n _UI_BindingElement_pathReferences_feature = Path References\n-_UI_ObeoDSMObject_version_feature = Version\n-_UI_ObeoDSMObject_createdOn_feature = Created On\n-_UI_ObeoDSMObject_modifiedOn_feature = Modified On\n+_UI_BindingRegistry_bindingInfos_feature = Binding Infos\n+_UI_Unknown_feature = Unspecified\n+\n+_UI_MultiplicityKind_ZERO_ONE_literal = 0..1\n+_UI_MultiplicityKind_ONE_literal = 1\n+_UI_MultiplicityKind_ZERO_STAR_literal = 0..*\n+_UI_MultiplicityKind_ONE_STAR_literal = 1..*", "raw_url": "https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fplugin.properties", "sha": "eab5e4eef17685c805787420281e8966ceb09a8d", "status": "modified" }, { "additions": 7, "blob_url": "https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fsrc-gen%2Fenvironment_properties.plugin.xml", "changes": 8, "contents_url": "https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fsrc-gen%2Fenvironment_properties.plugin.xml?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6", "deletions": 1, "filename": "models/environment/plugins/org.obeonetwork.dsl.environment.edit/src-gen/environment_properties.plugin.xml", "new_code": " uri=\"http://www.obeonetwork.org/dsl/environment/3.0.0\"\n <propertyTab\n id=\"Base\"\n label=\"Base\"\n category=\"default\">\n </propertyTab>\n", "new_methods": [], "old_code": " uri=\"http://www.obeonetwork.org/dsl/environment/2.0.0\"", "old_methods": [], "patch": "@@ -6,7 +6,7 @@\n <!-- EEF extensions -->\n <extension point=\"org.eclipse.emf.edit.itemProviderAdapterFactories\">\n <factory\n- uri=\"http://www.obeonetwork.org/dsl/environment/2.0.0\"\n+ uri=\"http://www.obeonetwork.org/dsl/environment/3.0.0\"\n class=\"org.obeonetwork.dsl.environment.providers.EnvironmentEEFAdapterFactory\"\n supportedTypes=\"org.eclipse.emf.eef.runtime.providers.PropertiesEditingProvider\"/>\n </extension>\n@@ -140,6 +140,12 @@\n category=\"default\">\n </propertyTab>\n \n+ <propertyTab\n+ id=\"Base\"\n+ label=\"Base\"\n+ category=\"default\">\n+ </propertyTab>\n+\n </propertyTabs>\n </extension>\n <extension", "raw_url": "https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fsrc-gen%2Fenvironment_properties.plugin.xml", "sha": "d0718a6951d6289fa95cc67d851e6247fe4710b8", "status": "modified" }, { "additions": 22, "blob_url": "https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fsrc-gen%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2Fcomponents%2FAttributeAttributePropertiesEditionComponent.java", "changes": 22, "contents_url": "https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fsrc-gen%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2Fcomponents%2FAttributeAttributePropertiesEditionComponent.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6", "deletions": 0, "filename": "models/environment/plugins/org.obeonetwork.dsl.environment.edit/src-gen/org/obeonetwork/dsl/environment/components/AttributeAttributePropertiesEditionComponent.java", "new_code": "\t\t\tif (isAccessible(EnvironmentViewsRepository.Attribute.Properties.identifier)) {\n\t\t\t\tattributePart.setIdentifier(attribute.isIsIdentifier());\n\t\t\t}\n\t\t\t\n\n\t\tif (editorKey == EnvironmentViewsRepository.Attribute.Properties.identifier) {\n\t\t\treturn EnvironmentPackage.eINSTANCE.getProperty_IsIdentifier();\n\t\t}\n\t\tif (EnvironmentViewsRepository.Attribute.Properties.identifier == event.getAffectedEditor()) {\n\t\t\tattribute.setIsIdentifier((Boolean)event.getNewValue());\n\t\t}\n\t\t\tif (EnvironmentPackage.eINSTANCE.getProperty_IsIdentifier().equals(msg.getFeature()) && msg.getNotifier().equals(semanticObject) && attributePart != null && isAccessible(EnvironmentViewsRepository.Attribute.Properties.identifier))\n\t\t\t\tattributePart.setIdentifier((Boolean)msg.getNewValue());\n\t\t\t\n\t\t\tEnvironmentPackage.eINSTANCE.getProperty_IsIdentifier(),\n\t\t\t\tif (EnvironmentViewsRepository.Attribute.Properties.identifier == event.getAffectedEditor()) {\n\t\t\t\t\tObject newValue = event.getNewValue();\n\t\t\t\t\tif (newValue instanceof String) {\n\t\t\t\t\t\tnewValue = EEFConverterUtil.createFromString(EnvironmentPackage.eINSTANCE.getProperty_IsIdentifier().getEAttributeType(), (String)newValue);\n\t\t\t\t\t}\n\t\t\t\t\tret = Diagnostician.INSTANCE.validate(EnvironmentPackage.eINSTANCE.getProperty_IsIdentifier().getEAttributeType(), newValue);\n\t\t\t\t}", "new_methods": [], "old_code": "", "old_methods": [], "patch": "@@ -77,6 +77,9 @@ public void initPart(Object key, int kind, EObject elt, ResourceSet allResource)\n \t\t\tif (isAccessible(EnvironmentViewsRepository.Attribute.Properties.multiplicity)) {\n \t\t\t\tattributePart.initMultiplicity(EEFUtils.choiceOfValues(attribute, EnvironmentPackage.eINSTANCE.getProperty_Multiplicity()), attribute.getMultiplicity());\n \t\t\t}\n+\t\t\tif (isAccessible(EnvironmentViewsRepository.Attribute.Properties.identifier)) {\n+\t\t\t\tattributePart.setIdentifier(attribute.isIsIdentifier());\n+\t\t\t}\n \t\t\tif (isAccessible(EnvironmentViewsRepository.Attribute.Properties.description))\n \t\t\t\tattributePart.setDescription(EEFConverterUtil.convertToString(EcorePackage.Literals.ESTRING, attribute.getDescription()));\n \t\t\t\n@@ -87,6 +90,7 @@ public void initPart(Object key, int kind, EObject elt, ResourceSet allResource)\n \t\t\t\n \t\t\t\n \t\t\t\n+\t\t\t\n \t\t\t// init values for referenced views\n \t\t\t\n \t\t\t// init filters for referenced views\n@@ -101,6 +105,7 @@ public void initPart(Object key, int kind, EObject elt, ResourceSet allResource)\n \n \n \n+\n \t/**\n \t * {@inheritDoc}\n \t * @see org.eclipse.emf.eef.runtime.impl.components.StandardPropertiesEditionComponent#associatedFeature(java.lang.Object)\n@@ -115,6 +120,9 @@ public EStructuralFeature associatedFeature(Object editorKey) {\n \t\tif (editorKey == EnvironmentViewsRepository.Attribute.Properties.multiplicity) {\n \t\t\treturn EnvironmentPackage.eINSTANCE.getProperty_Multiplicity();\n \t\t}\n+\t\tif (editorKey == EnvironmentViewsRepository.Attribute.Properties.identifier) {\n+\t\t\treturn EnvironmentPackage.eINSTANCE.getProperty_IsIdentifier();\n+\t\t}\n \t\tif (editorKey == EnvironmentViewsRepository.Attribute.Properties.description) {\n \t\t\treturn EnvironmentPackage.eINSTANCE.getObeoDSMObject_Description();\n \t\t}\n@@ -137,6 +145,9 @@ public void updateSemanticModel(final IPropertiesEditionEvent event) {\n \t\tif (EnvironmentViewsRepository.Attribute.Properties.multiplicity == event.getAffectedEditor()) {\n \t\t\tattribute.setMultiplicity((MultiplicityKind)event.getNewValue());\n \t\t}\n+\t\tif (EnvironmentViewsRepository.Attribute.Properties.identifier == event.getAffectedEditor()) {\n+\t\t\tattribute.setIsIdentifier((Boolean)event.getNewValue());\n+\t\t}\n \t\tif (EnvironmentViewsRepository.Attribute.Properties.description == event.getAffectedEditor()) {\n \t\t\tattribute.setDescription((java.lang.String)EEFConverterUtil.createFromString(EcorePackage.Literals.ESTRING, (String)event.getNewValue()));\n \t\t}\n@@ -162,6 +173,9 @@ public void updatePart(Notification msg) {\n \t\t\tif (EnvironmentPackage.eINSTANCE.getProperty_Multiplicity().equals(msg.getFeature()) && msg.getNotifier().equals(semanticObject) && isAccessible(EnvironmentViewsRepository.Attribute.Properties.multiplicity))\n \t\t\t\tattributePart.setMultiplicity((MultiplicityKind)msg.getNewValue());\n \t\t\t\n+\t\t\tif (EnvironmentPackage.eINSTANCE.getProperty_IsIdentifier().equals(msg.getFeature()) && msg.getNotifier().equals(semanticObject) && attributePart != null && isAccessible(EnvironmentViewsRepository.Attribute.Properties.identifier))\n+\t\t\t\tattributePart.setIdentifier((Boolean)msg.getNewValue());\n+\t\t\t\n \t\t\tif (EnvironmentPackage.eINSTANCE.getObeoDSMObject_Description().equals(msg.getFeature()) && msg.getNotifier().equals(semanticObject) && attributePart != null && isAccessible(EnvironmentViewsRepository.Attribute.Properties.description)) {\n \t\t\t\tif (msg.getNewValue() != null) {\n \t\t\t\t\tattributePart.setDescription(EcoreUtil.convertToString(EcorePackage.Literals.ESTRING, msg.getNewValue()));\n@@ -184,6 +198,7 @@ protected NotificationFilter[] getNotificationFilters() {\n \t\t\tEnvironmentPackage.eINSTANCE.getProperty_Name(),\n \t\t\tEnvironmentPackage.eINSTANCE.getAttribute_Type(),\n \t\t\tEnvironmentPackage.eINSTANCE.getProperty_Multiplicity(),\n+\t\t\tEnvironmentPackage.eINSTANCE.getProperty_IsIdentifier(),\n \t\t\tEnvironmentPackage.eINSTANCE.getObeoDSMObject_Description()\t\t);\n \t\treturn new NotificationFilter[] {filter,};\n \t}\n@@ -223,6 +238,13 @@ public Diagnostic validateValue(IPropertiesEditionEvent event) {\n \t\t\t\t\t}\n \t\t\t\t\tret = Diagnostician.INSTANCE.validate(EnvironmentPackage.eINSTANCE.getProperty_Multiplicity().getEAttributeType(), newValue);\n \t\t\t\t}\n+\t\t\t\tif (EnvironmentViewsRepository.Attribute.Properties.identifier == event.getAffectedEditor()) {\n+\t\t\t\t\tObject newValue = event.getNewValue();\n+\t\t\t\t\tif (newValue instanceof String) {\n+\t\t\t\t\t\tnewValue = EEFConverterUtil.createFromString(EnvironmentPackage.eINSTANCE.getProperty_IsIdentifier().getEAttributeType(), (String)newValue);\n+\t\t\t\t\t}\n+\t\t\t\t\tret = Diagnostician.INSTANCE.validate(EnvironmentPackage.eINSTANCE.getProperty_IsIdentifier().getEAttributeType(), newValue);\n+\t\t\t\t}\n \t\t\t\tif (EnvironmentViewsRepository.Attribute.Properties.description == event.getAffectedEditor()) {\n \t\t\t\t\tObject newValue = event.getNewValue();\n \t\t\t\t\tif (newValue instanceof String) {", "raw_url": "https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fsrc-gen%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2Fcomponents%2FAttributeAttributePropertiesEditionComponent.java", "sha": "e6d002283982bdb714859019aa04aa284e66c892", "status": "modified" }, { "additions": 8, "blob_url": "https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fsrc-gen%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2Fcomponents%2FMetadataCptPropertiesEditionComponent.java", "changes": 10, "contents_url": "https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fsrc-gen%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2Fcomponents%2FMetadataCptPropertiesEditionComponent.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6", "deletions": 2, "filename": "models/environment/plugins/org.obeonetwork.dsl.environment.edit/src-gen/org/obeonetwork/dsl/environment/components/MetadataCptPropertiesEditionComponent.java", "new_code": "import org.eclipse.emf.ecore.EClass;\nimport org.eclipse.emf.eef.runtime.context.impl.EReferencePropertiesEditionContext.InstanciableTypeFilter;\n\t\t\t\tEReferencePropertiesEditionContext context = new EReferencePropertiesEditionContext(editingContext, this, metadataSettings, editingContext.getAdapterFactory());\n\t\t\t\tcontext.addInstanciableTypeFilter(new InstanciableTypeFilter() {\n\t\t\t\t\tpublic boolean select(EClass instanciableType) {\n\t\t\t\t\t\treturn EnvironmentPackage.Literals.ANNOTATION == instanciableType;\n\t\t\t\t\t}\n\t\t\t\t});", "new_methods": [ { "arguments": [], "filename": "models/environment/plugins/org.obeonetwork.dsl.environment.edit/src-gen/org/obeonetwork/dsl/environment/components/MetadataCptPropertiesEditionComponent.java", "implementation": "public boolean select(EClass instanciableType) {\n\t\t\t\t\t\treturn EnvironmentPackage.Literals.ANNOTATION == instanciableType;", "signature": "new InstanciableTypeFilter()" } ], "old_code": "import org.eclipse.emf.eef.runtime.context.impl.TypedEReferencePropertiesEditingContext;\n\t\t\t\tEReferencePropertiesEditionContext context = new TypedEReferencePropertiesEditingContext(editingContext, this, metadataSettings, EnvironmentPackage.Literals.ANNOTATION, editingContext.getAdapterFactory());", "old_methods": [], "patch": "@@ -8,6 +8,7 @@\n import org.eclipse.emf.common.util.BasicDiagnostic;\n import org.eclipse.emf.common.util.Diagnostic;\n import org.eclipse.emf.common.util.WrappedException;\n+import org.eclipse.emf.ecore.EClass;\n import org.eclipse.emf.ecore.EObject;\n import org.eclipse.emf.ecore.EStructuralFeature;\n import org.eclipse.emf.ecore.resource.Resource;\n@@ -18,7 +19,7 @@\n import org.eclipse.emf.eef.runtime.context.PropertiesEditingContext;\n import org.eclipse.emf.eef.runtime.context.impl.EObjectPropertiesEditionContext;\n import org.eclipse.emf.eef.runtime.context.impl.EReferencePropertiesEditionContext;\n-import org.eclipse.emf.eef.runtime.context.impl.TypedEReferencePropertiesEditingContext;\n+import org.eclipse.emf.eef.runtime.context.impl.EReferencePropertiesEditionContext.InstanciableTypeFilter;\n import org.eclipse.emf.eef.runtime.impl.components.SinglePartPropertiesEditingComponent;\n import org.eclipse.emf.eef.runtime.impl.notify.PropertiesEditionEvent;\n import org.eclipse.emf.eef.runtime.impl.parts.CompositePropertiesEditionPart;\n@@ -146,7 +147,12 @@ public void updateSemanticModel(final IPropertiesEditionEvent event) {\n \t\tObeoDSMObject obeoDSMObject = (ObeoDSMObject)semanticObject;\n \t\tif (EnvironmentViewsRepository.Metadatas.Properties.metadata == event.getAffectedEditor()) {\n \t\t\tif (event.getKind() == PropertiesEditionEvent.ADD) {\n-\t\t\t\tEReferencePropertiesEditionContext context = new TypedEReferencePropertiesEditingContext(editingContext, this, metadataSettings, EnvironmentPackage.Literals.ANNOTATION, editingContext.getAdapterFactory());\n+\t\t\t\tEReferencePropertiesEditionContext context = new EReferencePropertiesEditionContext(editingContext, this, metadataSettings, editingContext.getAdapterFactory());\n+\t\t\t\tcontext.addInstanciableTypeFilter(new InstanciableTypeFilter() {\n+\t\t\t\t\tpublic boolean select(EClass instanciableType) {\n+\t\t\t\t\t\treturn EnvironmentPackage.Literals.ANNOTATION == instanciableType;\n+\t\t\t\t\t}\n+\t\t\t\t});\n \t\t\t\tPropertiesEditingProvider provider = (PropertiesEditingProvider)editingContext.getAdapterFactory().adapt(semanticObject, PropertiesEditingProvider.class);\n \t\t\t\tif (provider != null) {\n \t\t\t\t\tPropertiesEditingPolicy policy = provider.getPolicy(context);", "raw_url": "https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fsrc-gen%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2Fcomponents%2FMetadataCptPropertiesEditionComponent.java", "sha": "2686aaa1e7fb2e2a8f5a98927ee5df800cef50c7", "status": "modified" }, { "additions": 42, "blob_url": "https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fsrc-gen%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2Fcomponents%2FReferenceReferencePropertiesEditionComponent.java", "changes": 62, "contents_url": "https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fsrc-gen%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2Fcomponents%2FReferenceReferencePropertiesEditionComponent.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6", "deletions": 20, "filename": "models/environment/plugins/org.obeonetwork.dsl.environment.edit/src-gen/org/obeonetwork/dsl/environment/components/ReferenceReferencePropertiesEditionComponent.java", "new_code": "import org.obeonetwork.dsl.environment.StructuredType;\n\t * Settings for referencedType EObjectFlatComboViewer\n\tprivate EObjectFlatComboSettings referencedTypeSettings;\n\t\t\tif (isAccessible(EnvironmentViewsRepository.Reference.Properties.referencedType)) {\n\t\t\t\treferencedTypeSettings = new EObjectFlatComboSettings(reference, EnvironmentPackage.eINSTANCE.getReference_ReferencedType());\n\t\t\t\treferencePart.initReferencedType(referencedTypeSettings);\n\t\t\t\treferencePart.setReferencedTypeButtonMode(ButtonsModeEnum.BROWSE);\n\t\t\tif (isAccessible(EnvironmentViewsRepository.Reference.Properties.identifier)) {\n\t\t\t\treferencePart.setIdentifier(reference.isIsIdentifier());\n\t\t\t}\n\t\t\tif (isAccessible(EnvironmentViewsRepository.Reference.Properties.referencedType)) {\n\t\t\t\treferencePart.addFilterToReferencedType(new ViewerFilter() {\n\t\t\t\t\t\treturn (element instanceof StructuredType);\n\t\t\t\t// Start of user code for additional businessfilters for referencedType\n\t\t\t\n\n\t\tif (editorKey == EnvironmentViewsRepository.Reference.Properties.referencedType) {\n\t\t\treturn EnvironmentPackage.eINSTANCE.getReference_ReferencedType();\n\t\tif (editorKey == EnvironmentViewsRepository.Reference.Properties.identifier) {\n\t\t\treturn EnvironmentPackage.eINSTANCE.getProperty_IsIdentifier();\n\t\t}\n\t\tif (EnvironmentViewsRepository.Reference.Properties.referencedType == event.getAffectedEditor()) {\n\t\t\t\treferencedTypeSettings.setToReference((StructuredType)event.getNewValue());\n\t\t\t\tEReferencePropertiesEditionContext context = new EReferencePropertiesEditionContext(editingContext, this, referencedTypeSettings, editingContext.getAdapterFactory());\n\t\tif (EnvironmentViewsRepository.Reference.Properties.identifier == event.getAffectedEditor()) {\n\t\t\treference.setIsIdentifier((Boolean)event.getNewValue());\n\t\t}\n\t\t\tif (EnvironmentPackage.eINSTANCE.getReference_ReferencedType().equals(msg.getFeature()) && referencePart != null && isAccessible(EnvironmentViewsRepository.Reference.Properties.referencedType))\n\t\t\t\treferencePart.setReferencedType((EObject)msg.getNewValue());\n\t\t\tif (EnvironmentPackage.eINSTANCE.getProperty_IsIdentifier().equals(msg.getFeature()) && msg.getNotifier().equals(semanticObject) && referencePart != null && isAccessible(EnvironmentViewsRepository.Reference.Properties.identifier))\n\t\t\t\treferencePart.setIdentifier((Boolean)msg.getNewValue());\n\t\t\t\n\t\t\tEnvironmentPackage.eINSTANCE.getReference_ReferencedType(),\n\t\t\tEnvironmentPackage.eINSTANCE.getProperty_IsIdentifier(),\n\t\treturn key == EnvironmentViewsRepository.Reference.Properties.referencedType || key == EnvironmentViewsRepository.Reference.Properties.isComposite || key == EnvironmentViewsRepository.Reference.Properties.navigable;\n\t\t\t\tif (EnvironmentViewsRepository.Reference.Properties.identifier == event.getAffectedEditor()) {\n\t\t\t\t\tObject newValue = event.getNewValue();\n\t\t\t\t\tif (newValue instanceof String) {\n\t\t\t\t\t\tnewValue = EEFConverterUtil.createFromString(EnvironmentPackage.eINSTANCE.getProperty_IsIdentifier().getEAttributeType(), (String)newValue);\n\t\t\t\t\t}\n\t\t\t\t\tret = Diagnostician.INSTANCE.validate(EnvironmentPackage.eINSTANCE.getProperty_IsIdentifier().getEAttributeType(), newValue);\n\t\t\t\t}", "new_methods": [ { "arguments": [], "filename": "models/environment/plugins/org.obeonetwork.dsl.environment.edit/src-gen/org/obeonetwork/dsl/environment/components/ReferenceReferencePropertiesEditionComponent.java", "implementation": "return (element instanceof StructuredType);\n\t\t\t\t// Start of user code for additional businessfilters for referencedType\n\t\t\t\n\n\t\tif (editorKey == EnvironmentViewsRepository.Reference.Properties.referencedType) {\n\t\t\treturn EnvironmentPackage.eINSTANCE.getReference_ReferencedType();\n\t\tif (editorKey == EnvironmentViewsRepository.Reference.Properties.identifier) {\n\t\t\treturn EnvironmentPackage.eINSTANCE.getProperty_IsIdentifier();", "signature": "new ViewerFilter()" } ], "old_code": "import org.obeonetwork.dsl.environment.DTO;\n\t * Settings for type EObjectFlatComboViewer\n\tprivate EObjectFlatComboSettings typeSettings;\n\t\t\tif (isAccessible(EnvironmentViewsRepository.Reference.Properties.type)) {\n\t\t\t\ttypeSettings = new EObjectFlatComboSettings(reference, EnvironmentPackage.eINSTANCE.getReference_Type());\n\t\t\t\treferencePart.initType(typeSettings);\n\t\t\t\treferencePart.setTypeButtonMode(ButtonsModeEnum.BROWSE);\n\t\t\tif (isAccessible(EnvironmentViewsRepository.Reference.Properties.type)) {\n\t\t\t\treferencePart.addFilterToType(new ViewerFilter() {\n\t\t\t\t\t\treturn (element instanceof DTO);\n\t\t\t\t// Start of user code for additional businessfilters for type\n\t\tif (editorKey == EnvironmentViewsRepository.Reference.Properties.type) {\n\t\t\treturn EnvironmentPackage.eINSTANCE.getReference_Type();\n\t\tif (EnvironmentViewsRepository.Reference.Properties.type == event.getAffectedEditor()) {\n\t\t\t\ttypeSettings.setToReference((DTO)event.getNewValue());\n\t\t\t\tEReferencePropertiesEditionContext context = new EReferencePropertiesEditionContext(editingContext, this, typeSettings, editingContext.getAdapterFactory());\n\t\t\tif (EnvironmentPackage.eINSTANCE.getReference_Type().equals(msg.getFeature()) && referencePart != null && isAccessible(EnvironmentViewsRepository.Reference.Properties.type))\n\t\t\t\treferencePart.setType((EObject)msg.getNewValue());\n\t\t\tEnvironmentPackage.eINSTANCE.getReference_Type(),\n\t\treturn key == EnvironmentViewsRepository.Reference.Properties.type || key == EnvironmentViewsRepository.Reference.Properties.isComposite || key == EnvironmentViewsRepository.Reference.Properties.navigable;", "old_methods": [], "patch": "@@ -31,11 +31,11 @@\n import org.eclipse.emf.eef.runtime.ui.widgets.eobjflatcombo.EObjectFlatComboSettings;\n import org.eclipse.jface.viewers.Viewer;\n import org.eclipse.jface.viewers.ViewerFilter;\n-import org.obeonetwork.dsl.environment.DTO;\n import org.obeonetwork.dsl.environment.EnvironmentFactory;\n import org.obeonetwork.dsl.environment.EnvironmentPackage;\n import org.obeonetwork.dsl.environment.MultiplicityKind;\n import org.obeonetwork.dsl.environment.Reference;\n+import org.obeonetwork.dsl.environment.StructuredType;\n import org.obeonetwork.dsl.environment.parts.EnvironmentViewsRepository;\n import org.obeonetwork.dsl.environment.parts.ReferencePropertiesEditionPart;\n \n@@ -53,9 +53,9 @@ public class ReferenceReferencePropertiesEditionComponent extends SinglePartProp\n \n \t\n \t/**\n-\t * Settings for type EObjectFlatComboViewer\n+\t * Settings for referencedType EObjectFlatComboViewer\n \t */\n-\tprivate EObjectFlatComboSettings typeSettings;\n+\tprivate EObjectFlatComboSettings referencedTypeSettings;\n \t\n \t/**\n \t * Settings for oppositeOf EObjectFlatComboViewer\n@@ -92,12 +92,12 @@ public void initPart(Object key, int kind, EObject elt, ResourceSet allResource)\n \t\t\tif (isAccessible(EnvironmentViewsRepository.Reference.Properties.name))\n \t\t\t\treferencePart.setName(EEFConverterUtil.convertToString(EcorePackage.Literals.ESTRING, reference.getName()));\n \t\t\t\n-\t\t\tif (isAccessible(EnvironmentViewsRepository.Reference.Properties.type)) {\n+\t\t\tif (isAccessible(EnvironmentViewsRepository.Reference.Properties.referencedType)) {\n \t\t\t\t// init part\n-\t\t\t\ttypeSettings = new EObjectFlatComboSettings(reference, EnvironmentPackage.eINSTANCE.getReference_Type());\n-\t\t\t\treferencePart.initType(typeSettings);\n+\t\t\t\treferencedTypeSettings = new EObjectFlatComboSettings(reference, EnvironmentPackage.eINSTANCE.getReference_ReferencedType());\n+\t\t\t\treferencePart.initReferencedType(referencedTypeSettings);\n \t\t\t\t// set the button mode\n-\t\t\t\treferencePart.setTypeButtonMode(ButtonsModeEnum.BROWSE);\n+\t\t\t\treferencePart.setReferencedTypeButtonMode(ButtonsModeEnum.BROWSE);\n \t\t\t}\n \t\t\tif (isAccessible(EnvironmentViewsRepository.Reference.Properties.multiplicity)) {\n \t\t\t\treferencePart.initMultiplicity(EEFUtils.choiceOfValues(reference, EnvironmentPackage.eINSTANCE.getProperty_Multiplicity()), reference.getMultiplicity());\n@@ -115,25 +115,28 @@ public void initPart(Object key, int kind, EObject elt, ResourceSet allResource)\n \t\t\t\t// set the button mode\n \t\t\t\treferencePart.setOppositeOfButtonMode(ButtonsModeEnum.BROWSE);\n \t\t\t}\n+\t\t\tif (isAccessible(EnvironmentViewsRepository.Reference.Properties.identifier)) {\n+\t\t\t\treferencePart.setIdentifier(reference.isIsIdentifier());\n+\t\t\t}\n \t\t\tif (isAccessible(EnvironmentViewsRepository.Reference.Properties.description))\n \t\t\t\treferencePart.setDescription(EEFConverterUtil.convertToString(EcorePackage.Literals.ESTRING, reference.getDescription()));\n \t\t\t\n \t\t\t// init filters\n \t\t\t\n-\t\t\tif (isAccessible(EnvironmentViewsRepository.Reference.Properties.type)) {\n-\t\t\t\treferencePart.addFilterToType(new ViewerFilter() {\n+\t\t\tif (isAccessible(EnvironmentViewsRepository.Reference.Properties.referencedType)) {\n+\t\t\t\treferencePart.addFilterToReferencedType(new ViewerFilter() {\n \t\t\t\t\n \t\t\t\t\t/**\n \t\t\t\t\t * {@inheritDoc}\n \t\t\t\t\t * \n \t\t\t\t\t * @see org.eclipse.jface.viewers.ViewerFilter#select(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)\n \t\t\t\t\t */\n \t\t\t\t\tpublic boolean select(Viewer viewer, Object parentElement, Object element) {\n-\t\t\t\t\t\treturn (element instanceof DTO);\n+\t\t\t\t\t\treturn (element instanceof StructuredType);\n \t\t\t\t\t}\n \t\t\t\t\t\n \t\t\t\t});\n-\t\t\t\t// Start of user code for additional businessfilters for type\n+\t\t\t\t// Start of user code for additional businessfilters for referencedType\n \t\t\t\t// End of user code\n \t\t\t}\n \t\t\t\n@@ -156,6 +159,7 @@ public boolean select(Viewer viewer, Object parentElement, Object element) {\n \t\t\t\t// End of user code\n \t\t\t}\n \t\t\t\n+\t\t\t\n \t\t\t// init values for referenced views\n \t\t\t\n \t\t\t// init filters for referenced views\n@@ -173,6 +177,7 @@ public boolean select(Viewer viewer, Object parentElement, Object element) {\n \n \n \n+\n \t/**\n \t * {@inheritDoc}\n \t * @see org.eclipse.emf.eef.runtime.impl.components.StandardPropertiesEditionComponent#associatedFeature(java.lang.Object)\n@@ -181,8 +186,8 @@ public EStructuralFeature associatedFeature(Object editorKey) {\n \t\tif (editorKey == EnvironmentViewsRepository.Reference.Properties.name) {\n \t\t\treturn EnvironmentPackage.eINSTANCE.getProperty_Name();\n \t\t}\n-\t\tif (editorKey == EnvironmentViewsRepository.Reference.Properties.type) {\n-\t\t\treturn EnvironmentPackage.eINSTANCE.getReference_Type();\n+\t\tif (editorKey == EnvironmentViewsRepository.Reference.Properties.referencedType) {\n+\t\t\treturn EnvironmentPackage.eINSTANCE.getReference_ReferencedType();\n \t\t}\n \t\tif (editorKey == EnvironmentViewsRepository.Reference.Properties.multiplicity) {\n \t\t\treturn EnvironmentPackage.eINSTANCE.getProperty_Multiplicity();\n@@ -196,6 +201,9 @@ public EStructuralFeature associatedFeature(Object editorKey) {\n \t\tif (editorKey == EnvironmentViewsRepository.Reference.Properties.oppositeOf) {\n \t\t\treturn EnvironmentPackage.eINSTANCE.getReference_OppositeOf();\n \t\t}\n+\t\tif (editorKey == EnvironmentViewsRepository.Reference.Properties.identifier) {\n+\t\t\treturn EnvironmentPackage.eINSTANCE.getProperty_IsIdentifier();\n+\t\t}\n \t\tif (editorKey == EnvironmentViewsRepository.Reference.Properties.description) {\n \t\t\treturn EnvironmentPackage.eINSTANCE.getObeoDSMObject_Description();\n \t\t}\n@@ -212,11 +220,11 @@ public void updateSemanticModel(final IPropertiesEditionEvent event) {\n \t\tif (EnvironmentViewsRepository.Reference.Properties.name == event.getAffectedEditor()) {\n \t\t\treference.setName((java.lang.String)EEFConverterUtil.createFromString(EcorePackage.Literals.ESTRING, (String)event.getNewValue()));\n \t\t}\n-\t\tif (EnvironmentViewsRepository.Reference.Properties.type == event.getAffectedEditor()) {\n+\t\tif (EnvironmentViewsRepository.Reference.Properties.referencedType == event.getAffectedEditor()) {\n \t\t\tif (event.getKind() == PropertiesEditionEvent.SET) {\n-\t\t\t\ttypeSettings.setToReference((DTO)event.getNewValue());\n+\t\t\t\treferencedTypeSettings.setToReference((StructuredType)event.getNewValue());\n \t\t\t} else if (event.getKind() == PropertiesEditionEvent.ADD) {\n-\t\t\t\tEReferencePropertiesEditionContext context = new EReferencePropertiesEditionContext(editingContext, this, typeSettings, editingContext.getAdapterFactory());\n+\t\t\t\tEReferencePropertiesEditionContext context = new EReferencePropertiesEditionContext(editingContext, this, referencedTypeSettings, editingContext.getAdapterFactory());\n \t\t\t\tPropertiesEditingProvider provider = (PropertiesEditingProvider)editingContext.getAdapterFactory().adapt(semanticObject, PropertiesEditingProvider.class);\n \t\t\t\tif (provider != null) {\n \t\t\t\t\tPropertiesEditingPolicy policy = provider.getPolicy(context);\n@@ -251,6 +259,9 @@ public void updateSemanticModel(final IPropertiesEditionEvent event) {\n \t\t\t\toppositeOfSettings.setToReference(eObject);\n \t\t\t}\n \t\t}\n+\t\tif (EnvironmentViewsRepository.Reference.Properties.identifier == event.getAffectedEditor()) {\n+\t\t\treference.setIsIdentifier((Boolean)event.getNewValue());\n+\t\t}\n \t\tif (EnvironmentViewsRepository.Reference.Properties.description == event.getAffectedEditor()) {\n \t\t\treference.setDescription((java.lang.String)EEFConverterUtil.createFromString(EcorePackage.Literals.ESTRING, (String)event.getNewValue()));\n \t\t}\n@@ -271,8 +282,8 @@ public void updatePart(Notification msg) {\n \t\t\t\t\treferencePart.setName(\"\");\n \t\t\t\t}\n \t\t\t}\n-\t\t\tif (EnvironmentPackage.eINSTANCE.getReference_Type().equals(msg.getFeature()) && referencePart != null && isAccessible(EnvironmentViewsRepository.Reference.Properties.type))\n-\t\t\t\treferencePart.setType((EObject)msg.getNewValue());\n+\t\t\tif (EnvironmentPackage.eINSTANCE.getReference_ReferencedType().equals(msg.getFeature()) && referencePart != null && isAccessible(EnvironmentViewsRepository.Reference.Properties.referencedType))\n+\t\t\t\treferencePart.setReferencedType((EObject)msg.getNewValue());\n \t\t\tif (EnvironmentPackage.eINSTANCE.getProperty_Multiplicity().equals(msg.getFeature()) && msg.getNotifier().equals(semanticObject) && isAccessible(EnvironmentViewsRepository.Reference.Properties.multiplicity))\n \t\t\t\treferencePart.setMultiplicity((MultiplicityKind)msg.getNewValue());\n \t\t\t\n@@ -284,6 +295,9 @@ public void updatePart(Notification msg) {\n \t\t\t\n \t\t\tif (EnvironmentPackage.eINSTANCE.getReference_OppositeOf().equals(msg.getFeature()) && referencePart != null && isAccessible(EnvironmentViewsRepository.Reference.Properties.oppositeOf))\n \t\t\t\treferencePart.setOppositeOf((EObject)msg.getNewValue());\n+\t\t\tif (EnvironmentPackage.eINSTANCE.getProperty_IsIdentifier().equals(msg.getFeature()) && msg.getNotifier().equals(semanticObject) && referencePart != null && isAccessible(EnvironmentViewsRepository.Reference.Properties.identifier))\n+\t\t\t\treferencePart.setIdentifier((Boolean)msg.getNewValue());\n+\t\t\t\n \t\t\tif (EnvironmentPackage.eINSTANCE.getObeoDSMObject_Description().equals(msg.getFeature()) && msg.getNotifier().equals(semanticObject) && referencePart != null && isAccessible(EnvironmentViewsRepository.Reference.Properties.description)) {\n \t\t\t\tif (msg.getNewValue() != null) {\n \t\t\t\t\treferencePart.setDescription(EcoreUtil.convertToString(EcorePackage.Literals.ESTRING, msg.getNewValue()));\n@@ -304,11 +318,12 @@ public void updatePart(Notification msg) {\n \tprotected NotificationFilter[] getNotificationFilters() {\n \t\tNotificationFilter filter = new EStructuralFeatureNotificationFilter(\n \t\t\tEnvironmentPackage.eINSTANCE.getProperty_Name(),\n-\t\t\tEnvironmentPackage.eINSTANCE.getReference_Type(),\n+\t\t\tEnvironmentPackage.eINSTANCE.getReference_ReferencedType(),\n \t\t\tEnvironmentPackage.eINSTANCE.getProperty_Multiplicity(),\n \t\t\tEnvironmentPackage.eINSTANCE.getReference_IsComposite(),\n \t\t\tEnvironmentPackage.eINSTANCE.getReference_Navigable(),\n \t\t\tEnvironmentPackage.eINSTANCE.getReference_OppositeOf(),\n+\t\t\tEnvironmentPackage.eINSTANCE.getProperty_IsIdentifier(),\n \t\t\tEnvironmentPackage.eINSTANCE.getObeoDSMObject_Description()\t\t);\n \t\treturn new NotificationFilter[] {filter,};\n \t}\n@@ -321,7 +336,7 @@ protected NotificationFilter[] getNotificationFilters() {\n \t * \n \t */\n \tpublic boolean isRequired(Object key, int kind) {\n-\t\treturn key == EnvironmentViewsRepository.Reference.Properties.type || key == EnvironmentViewsRepository.Reference.Properties.isComposite || key == EnvironmentViewsRepository.Reference.Properties.navigable;\n+\t\treturn key == EnvironmentViewsRepository.Reference.Properties.referencedType || key == EnvironmentViewsRepository.Reference.Properties.isComposite || key == EnvironmentViewsRepository.Reference.Properties.navigable;\n \t}\n \n \t/**\n@@ -362,6 +377,13 @@ public Diagnostic validateValue(IPropertiesEditionEvent event) {\n \t\t\t\t\t}\n \t\t\t\t\tret = Diagnostician.INSTANCE.validate(EnvironmentPackage.eINSTANCE.getReference_Navigable().getEAttributeType(), newValue);\n \t\t\t\t}\n+\t\t\t\tif (EnvironmentViewsRepository.Reference.Properties.identifier == event.getAffectedEditor()) {\n+\t\t\t\t\tObject newValue = event.getNewValue();\n+\t\t\t\t\tif (newValue instanceof String) {\n+\t\t\t\t\t\tnewValue = EEFConverterUtil.createFromString(EnvironmentPackage.eINSTANCE.getProperty_IsIdentifier().getEAttributeType(), (String)newValue);\n+\t\t\t\t\t}\n+\t\t\t\t\tret = Diagnostician.INSTANCE.validate(EnvironmentPackage.eINSTANCE.getProperty_IsIdentifier().getEAttributeType(), newValue);\n+\t\t\t\t}\n \t\t\t\tif (EnvironmentViewsRepository.Reference.Properties.description == event.getAffectedEditor()) {\n \t\t\t\t\tObject newValue = event.getNewValue();\n \t\t\t\t\tif (newValue instanceof String) {", "raw_url": "https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fsrc-gen%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2Fcomponents%2FReferenceReferencePropertiesEditionComponent.java", "sha": "53debbc851e7baaf299ff983355f1ce382af932d", "status": "modified" }, { "additions": 14, "blob_url": "https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fsrc-gen%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2Fparts%2FAttributePropertiesEditionPart.java", "changes": 14, "contents_url": "https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fsrc-gen%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2Fparts%2FAttributePropertiesEditionPart.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6", "deletions": 0, "filename": "models/environment/plugins/org.obeonetwork.dsl.environment.edit/src-gen/org/obeonetwork/dsl/environment/parts/AttributePropertiesEditionPart.java", "new_code": "\t/**\n\t * @return the identifier\n\t * \n\t */\n\tpublic Boolean getIdentifier();\n\n\t/**\n\t * Defines a new identifier\n\t * @param newValue the new identifier to set\n\t * \n\t */\n\tpublic void setIdentifier(Boolean newValue);\n\n", "new_methods": [], "old_code": "", "old_methods": [], "patch": "@@ -82,6 +82,20 @@ public interface AttributePropertiesEditionPart {\n \tpublic void setMultiplicity(Enumerator newValue);\n \n \n+\t/**\n+\t * @return the identifier\n+\t * \n+\t */\n+\tpublic Boolean getIdentifier();\n+\n+\t/**\n+\t * Defines a new identifier\n+\t * @param newValue the new identifier to set\n+\t * \n+\t */\n+\tpublic void setIdentifier(Boolean newValue);\n+\n+\n \t/**\n \t * @return the description\n \t * ", "raw_url": "https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fsrc-gen%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2Fparts%2FAttributePropertiesEditionPart.java", "sha": "7d2e56d0cb81dce6d3f3b6b7f70baa0528fd9732", "status": "modified" }, { "additions": 31, "blob_url": "https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fsrc-gen%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2Fparts%2FEnvironmentViewsRepository.java", "changes": 32, "contents_url": "https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fsrc-gen%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2Fparts%2FEnvironmentViewsRepository.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6", "deletions": 1, "filename": "models/environment/plugins/org.obeonetwork.dsl.environment.edit/src-gen/org/obeonetwork/dsl/environment/parts/EnvironmentViewsRepository.java", "new_code": "\t\t\tpublic static String identifier = \"environment::Attribute::properties::identifier\";\n\t\t\t\n\t\t\t\n\t\t\tpublic static String referencedType = \"environment::Reference::properties::referencedType\";\n\t\t\tpublic static String identifier = \"environment::Reference::properties::identifier\";\n\t\t\t\n\t\t\t\n\t/**\n\t * DTO view descriptor\n\t * \n\t */\n\tpublic static class DTO {\n\t\tpublic static class Properties {\n\t\n\t\t\t\n\t\t\tpublic static String name = \"environment::DTO::properties::name\";\n\t\t\t\n\t\t\t\n\t\t\tpublic static String supertype = \"environment::DTO::properties::supertype\";\n\t\t\t\n\t\t\t\n\t\t\tpublic static String associatedTypes = \"environment::DTO::properties::associatedTypes\";\n\t\t\t\n\t\t\t\n\t\t\tpublic static String description = \"environment::DTO::properties::description\";\n\t\t\t\n\t\n\t\t}\n\t\n\t}\n", "new_methods": [], "old_code": "\t\t\tpublic static String type = \"environment::Reference::properties::type\";", "old_methods": [], "patch": "@@ -226,6 +226,9 @@ public static class Properties {\n \t\t\tpublic static String multiplicity = \"environment::Attribute::properties::multiplicity\";\n \t\t\t\n \t\t\t\n+\t\t\tpublic static String identifier = \"environment::Attribute::properties::identifier\";\n+\t\t\t\n+\t\t\t\n \t\t\tpublic static String description = \"environment::Attribute::properties::description\";\n \t\t\t\n \t\n@@ -244,7 +247,7 @@ public static class Properties {\n \t\t\tpublic static String name = \"environment::Reference::properties::name\";\n \t\t\t\n \t\t\t\n-\t\t\tpublic static String type = \"environment::Reference::properties::type\";\n+\t\t\tpublic static String referencedType = \"environment::Reference::properties::referencedType\";\n \t\t\t\n \t\t\t\n \t\t\tpublic static String multiplicity = \"environment::Reference::properties::multiplicity\";\n@@ -259,6 +262,9 @@ public static class Properties {\n \t\t\tpublic static String oppositeOf = \"environment::Reference::properties::oppositeOf\";\n \t\t\t\n \t\t\t\n+\t\t\tpublic static String identifier = \"environment::Reference::properties::identifier\";\n+\t\t\t\n+\t\t\t\n \t\t\tpublic static String description = \"environment::Reference::properties::description\";\n \t\t\t\n \t\n@@ -344,4 +350,28 @@ public static class Properties {\n \t\n \t}\n \n+\t/**\n+\t * DTO view descriptor\n+\t * \n+\t */\n+\tpublic static class DTO {\n+\t\tpublic static class Properties {\n+\t\n+\t\t\t\n+\t\t\tpublic static String name = \"environment::DTO::properties::name\";\n+\t\t\t\n+\t\t\t\n+\t\t\tpublic static String supertype = \"environment::DTO::properties::supertype\";\n+\t\t\t\n+\t\t\t\n+\t\t\tpublic static String associatedTypes = \"environment::DTO::properties::associatedTypes\";\n+\t\t\t\n+\t\t\t\n+\t\t\tpublic static String description = \"environment::DTO::properties::description\";\n+\t\t\t\n+\t\n+\t\t}\n+\t\n+\t}\n+\n }", "raw_url": "https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fsrc-gen%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2Fparts%2FEnvironmentViewsRepository.java", "sha": "2cfc0f756188100ea55d71a7c686ce530fe95e7c", "status": "modified" }, { "additions": 26, "blob_url": "https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fsrc-gen%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2Fparts%2FReferencePropertiesEditionPart.java", "changes": 38, "contents_url": "https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fsrc-gen%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2Fparts%2FReferencePropertiesEditionPart.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6", "deletions": 12, "filename": "models/environment/plugins/org.obeonetwork.dsl.environment.edit/src-gen/org/obeonetwork/dsl/environment/parts/ReferencePropertiesEditionPart.java", "new_code": "\t * @return the referencedType\n\tpublic EObject getReferencedType();\n\t * Init the referencedType\n\tpublic void initReferencedType(EObjectFlatComboSettings settings);\n\t * Defines a new referencedType\n\t * @param newValue the new referencedType to set\n\tpublic void setReferencedType(EObject newValue);\n\tpublic void setReferencedTypeButtonMode(ButtonsModeEnum newValue);\n\t * Adds the given filter to the referencedType edition editor.\n\tpublic void addFilterToReferencedType(ViewerFilter filter);\n\t * Adds the given filter to the referencedType edition editor.\n\tpublic void addBusinessFilterToReferencedType(ViewerFilter filter);\n\t/**\n\t * @return the identifier\n\t * \n\t */\n\tpublic Boolean getIdentifier();\n\n\t/**\n\t * Defines a new identifier\n\t * @param newValue the new identifier to set\n\t * \n\t */\n\tpublic void setIdentifier(Boolean newValue);\n\n", "new_methods": [], "old_code": "\t * @return the type\n\tpublic EObject getType();\n\t * Init the type\n\tpublic void initType(EObjectFlatComboSettings settings);\n\t * Defines a new type\n\t * @param newValue the new type to set\n\tpublic void setType(EObject newValue);\n\tpublic void setTypeButtonMode(ButtonsModeEnum newValue);\n\t * Adds the given filter to the type edition editor.\n\tpublic void addFilterToType(ViewerFilter filter);\n\t * Adds the given filter to the type edition editor.\n\tpublic void addBusinessFilterToType(ViewerFilter filter);", "old_methods": [], "patch": "@@ -34,50 +34,50 @@ public interface ReferencePropertiesEditionPart {\n \n \n \t/**\n-\t * @return the type\n+\t * @return the referencedType\n \t * \n \t */\n-\tpublic EObject getType();\n+\tpublic EObject getReferencedType();\n \n \t/**\n-\t * Init the type\n+\t * Init the referencedType\n \t * @param settings the combo setting\n \t */\n-\tpublic void initType(EObjectFlatComboSettings settings);\n+\tpublic void initReferencedType(EObjectFlatComboSettings settings);\n \n \t/**\n-\t * Defines a new type\n-\t * @param newValue the new type to set\n+\t * Defines a new referencedType\n+\t * @param newValue the new referencedType to set\n \t * \n \t */\n-\tpublic void setType(EObject newValue);\n+\tpublic void setReferencedType(EObject newValue);\n \n \t/**\n \t * Defines the button mode\n \t * @param newValue the new mode to set\n \t * \n \t */\n-\tpublic void setTypeButtonMode(ButtonsModeEnum newValue);\n+\tpublic void setReferencedTypeButtonMode(ButtonsModeEnum newValue);\n \n \t/**\n-\t * Adds the given filter to the type edition editor.\n+\t * Adds the given filter to the referencedType edition editor.\n \t * \n \t * @param filter\n \t * a viewer filter\n \t * @see org.eclipse.jface.viewers.StructuredViewer#addFilter(ViewerFilter)\n \t * \n \t */\n-\tpublic void addFilterToType(ViewerFilter filter);\n+\tpublic void addFilterToReferencedType(ViewerFilter filter);\n \n \t/**\n-\t * Adds the given filter to the type edition editor.\n+\t * Adds the given filter to the referencedType edition editor.\n \t * \n \t * @param filter\n \t * a viewer filter\n \t * @see org.eclipse.jface.viewers.StructuredViewer#addFilter(ViewerFilter)\n \t * \n \t */\n-\tpublic void addBusinessFilterToType(ViewerFilter filter);\n+\tpublic void addBusinessFilterToReferencedType(ViewerFilter filter);\n \n \n \t/**\n@@ -176,6 +176,20 @@ public interface ReferencePropertiesEditionPart {\n \tpublic void addBusinessFilterToOppositeOf(ViewerFilter filter);\n \n \n+\t/**\n+\t * @return the identifier\n+\t * \n+\t */\n+\tpublic Boolean getIdentifier();\n+\n+\t/**\n+\t * Defines a new identifier\n+\t * @param newValue the new identifier to set\n+\t * \n+\t */\n+\tpublic void setIdentifier(Boolean newValue);\n+\n+\n \t/**\n \t * @return the description\n \t * ", "raw_url": "https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fsrc-gen%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2Fparts%2FReferencePropertiesEditionPart.java", "sha": "902ce166bc51c72a95611168730ad135719fb618", "status": "modified" }, { "additions": 69, "blob_url": "https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fsrc-gen%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2Fparts%2Fforms%2FAttributePropertiesEditionPartForm.java", "changes": 69, "contents_url": "https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fsrc-gen%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2Fparts%2Fforms%2FAttributePropertiesEditionPartForm.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6", "deletions": 0, "filename": "models/environment/plugins/org.obeonetwork.dsl.environment.edit/src-gen/org/obeonetwork/dsl/environment/parts/forms/AttributePropertiesEditionPartForm.java", "new_code": "import org.eclipse.swt.events.SelectionAdapter;\nimport org.eclipse.swt.events.SelectionEvent;\nimport org.eclipse.swt.widgets.Button;\n\tprotected Button identifier;\n\t\tpropertiesStep.addStep(EnvironmentViewsRepository.Attribute.Properties.identifier);\n\t\t\t\tif (key == EnvironmentViewsRepository.Attribute.Properties.identifier) {\n\t\t\t\t\treturn createIdentifierCheckbox(widgetFactory, parent);\n\t\t\t\t}\n\tprotected Composite createIdentifierCheckbox(FormToolkit widgetFactory, Composite parent) {\n\t\tidentifier = widgetFactory.createButton(parent, getDescription(EnvironmentViewsRepository.Attribute.Properties.identifier, EnvironmentMessages.AttributePropertiesEditionPart_IdentifierLabel), SWT.CHECK);\n\t\tidentifier.addSelectionListener(new SelectionAdapter() {\n\n\t\t\t/**\n\t\t\t * {@inheritDoc}\n\t\t\t *\n\t\t\t * @see org.eclipse.swt.events.SelectionAdapter#widgetSelected(org.eclipse.swt.events.SelectionEvent)\n\t\t\t * \t\n\t\t\t */\n\t\t\tpublic void widgetSelected(SelectionEvent e) {\n\t\t\t\tif (propertiesEditionComponent != null)\n\t\t\t\t\tpropertiesEditionComponent.firePropertiesChanged(new PropertiesEditionEvent(AttributePropertiesEditionPartForm.this, EnvironmentViewsRepository.Attribute.Properties.identifier, PropertiesEditionEvent.COMMIT, PropertiesEditionEvent.SET, null, new Boolean(identifier.getSelection())));\n\t\t\t}\n\n\t\t});\n\t\tGridData identifierData = new GridData(GridData.FILL_HORIZONTAL);\n\t\tidentifierData.horizontalSpan = 2;\n\t\tidentifier.setLayoutData(identifierData);\n\t\tEditingUtils.setID(identifier, EnvironmentViewsRepository.Attribute.Properties.identifier);\n\t\tEditingUtils.setEEFtype(identifier, \"eef::Checkbox\"); //$NON-NLS-1$\n\t\tFormUtils.createHelpButton(widgetFactory, parent, propertiesEditionComponent.getHelpContent(EnvironmentViewsRepository.Attribute.Properties.identifier, EnvironmentViewsRepository.FORM_KIND), null); //$NON-NLS-1$\n\t\t// Start of user code for createIdentifierCheckbox\n\n\t\t// End of user code\n\t\treturn parent;\n\t}\n\n\t\n\t/**\n\t * {@inheritDoc}\n\t * \n\t * @see org.obeonetwork.dsl.environment.parts.AttributePropertiesEditionPart#getIdentifier()\n\t * \n\t */\n\tpublic Boolean getIdentifier() {\n\t\treturn Boolean.valueOf(identifier.getSelection());\n\t}\n\n\t/**\n\t * {@inheritDoc}\n\t * \n\t * @see org.obeonetwork.dsl.environment.parts.AttributePropertiesEditionPart#setIdentifier(Boolean newValue)\n\t * \n\t */\n\tpublic void setIdentifier(Boolean newValue) {\n\t\tif (newValue != null) {\n\t\t\tidentifier.setSelection(newValue.booleanValue());\n\t\t} else {\n\t\t\tidentifier.setSelection(false);\n\t\t}\n\t\tboolean eefElementEditorReadOnlyState = isReadOnly(EnvironmentViewsRepository.Attribute.Properties.identifier);\n\t\tif (eefElementEditorReadOnlyState && identifier.isEnabled()) {\n\t\t\tidentifier.setEnabled(false);\n\t\t\tidentifier.setToolTipText(EnvironmentMessages.Attribute_ReadOnly);\n\t\t} else if (!eefElementEditorReadOnlyState && !identifier.isEnabled()) {\n\t\t\tidentifier.setEnabled(true);\n\t\t}\t\n\t\t\n\t}\n", "new_methods": [ { "arguments": [ "FormToolkit widgetFactory", " Composite parent" ], "filename": "models/environment/plugins/org.obeonetwork.dsl.environment.edit/src-gen/org/obeonetwork/dsl/environment/parts/forms/AttributePropertiesEditionPartForm.java", "implementation": "identifier = widgetFactory.createButton(parent, getDescription(EnvironmentViewsRepository.Attribute.Properties.identifier, EnvironmentMessages.AttributePropertiesEditionPart_IdentifierLabel), SWT.CHECK);\n\t\tidentifier.addSelectionListener(new SelectionAdapter() {\n\n\t\t\t/**\n\t\t\t * {@inheritDoc", "signature": "Composite createIdentifierCheckbox(FormToolkit widgetFactory, Composite parent)" }, { "arguments": [ "SelectionEvent e" ], "filename": "models/environment/plugins/org.obeonetwork.dsl.environment.edit/src-gen/org/obeonetwork/dsl/environment/parts/forms/AttributePropertiesEditionPartForm.java", "implementation": "if (propertiesEditionComponent != null)\n\t\t\t\t\tpropertiesEditionComponent.firePropertiesChanged(new PropertiesEditionEvent(AttributePropertiesEditionPartForm.this, EnvironmentViewsRepository.Attribute.Properties.identifier, PropertiesEditionEvent.COMMIT, PropertiesEditionEvent.SET, null, new Boolean(identifier.getSelection())));", "signature": "void widgetSelected(SelectionEvent e)" }, { "arguments": [], "filename": "models/environment/plugins/org.obeonetwork.dsl.environment.edit/src-gen/org/obeonetwork/dsl/environment/parts/forms/AttributePropertiesEditionPartForm.java", "implementation": "return Boolean.valueOf(identifier.getSelection());", "signature": "Boolean getIdentifier()" }, { "arguments": [ "Boolean newValue" ], "filename": "models/environment/plugins/org.obeonetwork.dsl.environment.edit/src-gen/org/obeonetwork/dsl/environment/parts/forms/AttributePropertiesEditionPartForm.java", "implementation": "if (newValue != null) {\n\t\t\tidentifier.setSelection(newValue.booleanValue());", "signature": "void setIdentifier(Boolean newValue)" } ], "old_code": "", "old_methods": [], "patch": "@@ -30,8 +30,11 @@\n import org.eclipse.swt.events.FocusEvent;\n import org.eclipse.swt.events.KeyAdapter;\n import org.eclipse.swt.events.KeyEvent;\n+import org.eclipse.swt.events.SelectionAdapter;\n+import org.eclipse.swt.events.SelectionEvent;\n import org.eclipse.swt.layout.GridData;\n import org.eclipse.swt.layout.GridLayout;\n+import org.eclipse.swt.widgets.Button;\n import org.eclipse.swt.widgets.Composite;\n import org.eclipse.swt.widgets.Text;\n import org.eclipse.ui.forms.widgets.Form;\n@@ -54,6 +57,7 @@ public class AttributePropertiesEditionPartForm extends SectionPropertiesEditing\n \tprotected Text name;\n \tprotected EMFComboViewer type;\n \tprotected EMFComboViewer multiplicity;\n+\tprotected Button identifier;\n \tprotected Text description;\n \n \n@@ -103,6 +107,7 @@ public void createControls(final FormToolkit widgetFactory, Composite view) {\n \t\tpropertiesStep.addStep(EnvironmentViewsRepository.Attribute.Properties.name);\n \t\tpropertiesStep.addStep(EnvironmentViewsRepository.Attribute.Properties.type);\n \t\tpropertiesStep.addStep(EnvironmentViewsRepository.Attribute.Properties.multiplicity);\n+\t\tpropertiesStep.addStep(EnvironmentViewsRepository.Attribute.Properties.identifier);\n \t\tpropertiesStep.addStep(EnvironmentViewsRepository.Attribute.Properties.description);\n \t\t\n \t\t\n@@ -122,6 +127,9 @@ public Composite addToPart(Composite parent, Object key) {\n \t\t\t\tif (key == EnvironmentViewsRepository.Attribute.Properties.multiplicity) {\n \t\t\t\t\treturn createMultiplicityEMFComboViewer(widgetFactory, parent);\n \t\t\t\t}\n+\t\t\t\tif (key == EnvironmentViewsRepository.Attribute.Properties.identifier) {\n+\t\t\t\t\treturn createIdentifierCheckbox(widgetFactory, parent);\n+\t\t\t\t}\n \t\t\t\tif (key == EnvironmentViewsRepository.Attribute.Properties.description) {\n \t\t\t\t\treturn createDescriptionText(widgetFactory, parent);\n \t\t\t\t}\n@@ -276,6 +284,35 @@ public void selectionChanged(SelectionChangedEvent event) {\n \t}\n \n \t\n+\tprotected Composite createIdentifierCheckbox(FormToolkit widgetFactory, Composite parent) {\n+\t\tidentifier = widgetFactory.createButton(parent, getDescription(EnvironmentViewsRepository.Attribute.Properties.identifier, EnvironmentMessages.AttributePropertiesEditionPart_IdentifierLabel), SWT.CHECK);\n+\t\tidentifier.addSelectionListener(new SelectionAdapter() {\n+\n+\t\t\t/**\n+\t\t\t * {@inheritDoc}\n+\t\t\t *\n+\t\t\t * @see org.eclipse.swt.events.SelectionAdapter#widgetSelected(org.eclipse.swt.events.SelectionEvent)\n+\t\t\t * \t\n+\t\t\t */\n+\t\t\tpublic void widgetSelected(SelectionEvent e) {\n+\t\t\t\tif (propertiesEditionComponent != null)\n+\t\t\t\t\tpropertiesEditionComponent.firePropertiesChanged(new PropertiesEditionEvent(AttributePropertiesEditionPartForm.this, EnvironmentViewsRepository.Attribute.Properties.identifier, PropertiesEditionEvent.COMMIT, PropertiesEditionEvent.SET, null, new Boolean(identifier.getSelection())));\n+\t\t\t}\n+\n+\t\t});\n+\t\tGridData identifierData = new GridData(GridData.FILL_HORIZONTAL);\n+\t\tidentifierData.horizontalSpan = 2;\n+\t\tidentifier.setLayoutData(identifierData);\n+\t\tEditingUtils.setID(identifier, EnvironmentViewsRepository.Attribute.Properties.identifier);\n+\t\tEditingUtils.setEEFtype(identifier, \"eef::Checkbox\"); //$NON-NLS-1$\n+\t\tFormUtils.createHelpButton(widgetFactory, parent, propertiesEditionComponent.getHelpContent(EnvironmentViewsRepository.Attribute.Properties.identifier, EnvironmentViewsRepository.FORM_KIND), null); //$NON-NLS-1$\n+\t\t// Start of user code for createIdentifierCheckbox\n+\n+\t\t// End of user code\n+\t\treturn parent;\n+\t}\n+\n+\t\n \tprotected Composite createDescriptionText(FormToolkit widgetFactory, Composite parent) {\n \t\tcreateDescription(parent, EnvironmentViewsRepository.Attribute.Properties.description, EnvironmentMessages.AttributePropertiesEditionPart_DescriptionLabel);\n \t\tdescription = widgetFactory.createText(parent, \"\"); //$NON-NLS-1$\n@@ -492,6 +529,38 @@ public void setMultiplicity(Enumerator newValue) {\n \t\t\n \t}\n \n+\t/**\n+\t * {@inheritDoc}\n+\t * \n+\t * @see org.obeonetwork.dsl.environment.parts.AttributePropertiesEditionPart#getIdentifier()\n+\t * \n+\t */\n+\tpublic Boolean getIdentifier() {\n+\t\treturn Boolean.valueOf(identifier.getSelection());\n+\t}\n+\n+\t/**\n+\t * {@inheritDoc}\n+\t * \n+\t * @see org.obeonetwork.dsl.environment.parts.AttributePropertiesEditionPart#setIdentifier(Boolean newValue)\n+\t * \n+\t */\n+\tpublic void setIdentifier(Boolean newValue) {\n+\t\tif (newValue != null) {\n+\t\t\tidentifier.setSelection(newValue.booleanValue());\n+\t\t} else {\n+\t\t\tidentifier.setSelection(false);\n+\t\t}\n+\t\tboolean eefElementEditorReadOnlyState = isReadOnly(EnvironmentViewsRepository.Attribute.Properties.identifier);\n+\t\tif (eefElementEditorReadOnlyState && identifier.isEnabled()) {\n+\t\t\tidentifier.setEnabled(false);\n+\t\t\tidentifier.setToolTipText(EnvironmentMessages.Attribute_ReadOnly);\n+\t\t} else if (!eefElementEditorReadOnlyState && !identifier.isEnabled()) {\n+\t\t\tidentifier.setEnabled(true);\n+\t\t}\t\n+\t\t\n+\t}\n+\n \t/**\n \t * {@inheritDoc}\n \t * ", "raw_url": "https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fsrc-gen%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2Fparts%2Fforms%2FAttributePropertiesEditionPartForm.java", "sha": "ad25def4b9c35ae1e2d644ef28ee60154cd18f76", "status": "modified" }, { "additions": 115, "blob_url": "https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fsrc-gen%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2Fparts%2Fforms%2FReferencePropertiesEditionPartForm.java", "changes": 164, "contents_url": "https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fsrc-gen%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2Fparts%2Fforms%2FReferencePropertiesEditionPartForm.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6", "deletions": 49, "filename": "models/environment/plugins/org.obeonetwork.dsl.environment.edit/src-gen/org/obeonetwork/dsl/environment/parts/forms/ReferencePropertiesEditionPartForm.java", "new_code": "\tprotected EObjectFlatComboViewer referencedType;\n\tprotected Button identifier;\n\t\tpropertiesStep.addStep(EnvironmentViewsRepository.Reference.Properties.referencedType);\n\t\tpropertiesStep.addStep(EnvironmentViewsRepository.Reference.Properties.identifier);\n\t\t\t\tif (key == EnvironmentViewsRepository.Reference.Properties.referencedType) {\n\t\t\t\t\treturn createReferencedTypeFlatComboViewer(parent, widgetFactory);\n\t\t\t\tif (key == EnvironmentViewsRepository.Reference.Properties.identifier) {\n\t\t\t\t\treturn createIdentifierCheckbox(widgetFactory, parent);\n\t\t\t\t}\n\tprotected Composite createReferencedTypeFlatComboViewer(Composite parent, FormToolkit widgetFactory) {\n\t\tcreateDescription(parent, EnvironmentViewsRepository.Reference.Properties.referencedType, EnvironmentMessages.ReferencePropertiesEditionPart_ReferencedTypeLabel);\n\t\treferencedType = new EObjectFlatComboViewer(parent, !propertiesEditionComponent.isRequired(EnvironmentViewsRepository.Reference.Properties.referencedType, EnvironmentViewsRepository.FORM_KIND));\n\t\twidgetFactory.adapt(referencedType);\n\t\treferencedType.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));\n\t\tGridData referencedTypeData = new GridData(GridData.FILL_HORIZONTAL);\n\t\treferencedType.setLayoutData(referencedTypeData);\n\t\treferencedType.addSelectionChangedListener(new ISelectionChangedListener() {\n\t\t\t\t\tpropertiesEditionComponent.firePropertiesChanged(new PropertiesEditionEvent(ReferencePropertiesEditionPartForm.this, EnvironmentViewsRepository.Reference.Properties.referencedType, PropertiesEditionEvent.COMMIT, PropertiesEditionEvent.SET, null, getReferencedType()));\n\t\treferencedType.setID(EnvironmentViewsRepository.Reference.Properties.referencedType);\n\t\tFormUtils.createHelpButton(widgetFactory, parent, propertiesEditionComponent.getHelpContent(EnvironmentViewsRepository.Reference.Properties.referencedType, EnvironmentViewsRepository.FORM_KIND), null); //$NON-NLS-1$\n\t\t// Start of user code for createReferencedTypeFlatComboViewer\n\tprotected Composite createIdentifierCheckbox(FormToolkit widgetFactory, Composite parent) {\n\t\tidentifier = widgetFactory.createButton(parent, getDescription(EnvironmentViewsRepository.Reference.Properties.identifier, EnvironmentMessages.ReferencePropertiesEditionPart_IdentifierLabel), SWT.CHECK);\n\t\tidentifier.addSelectionListener(new SelectionAdapter() {\n\n\t\t\t/**\n\t\t\t * {@inheritDoc}\n\t\t\t *\n\t\t\t * @see org.eclipse.swt.events.SelectionAdapter#widgetSelected(org.eclipse.swt.events.SelectionEvent)\n\t\t\t * \t\n\t\t\t */\n\t\t\tpublic void widgetSelected(SelectionEvent e) {\n\t\t\t\tif (propertiesEditionComponent != null)\n\t\t\t\t\tpropertiesEditionComponent.firePropertiesChanged(new PropertiesEditionEvent(ReferencePropertiesEditionPartForm.this, EnvironmentViewsRepository.Reference.Properties.identifier, PropertiesEditionEvent.COMMIT, PropertiesEditionEvent.SET, null, new Boolean(identifier.getSelection())));\n\t\t\t}\n\n\t\t});\n\t\tGridData identifierData = new GridData(GridData.FILL_HORIZONTAL);\n\t\tidentifierData.horizontalSpan = 2;\n\t\tidentifier.setLayoutData(identifierData);\n\t\tEditingUtils.setID(identifier, EnvironmentViewsRepository.Reference.Properties.identifier);\n\t\tEditingUtils.setEEFtype(identifier, \"eef::Checkbox\"); //$NON-NLS-1$\n\t\tFormUtils.createHelpButton(widgetFactory, parent, propertiesEditionComponent.getHelpContent(EnvironmentViewsRepository.Reference.Properties.identifier, EnvironmentViewsRepository.FORM_KIND), null); //$NON-NLS-1$\n\t\t// Start of user code for createIdentifierCheckbox\n\n\t\t// End of user code\n\t\treturn parent;\n\t}\n\n\t\n\t * @see org.obeonetwork.dsl.environment.parts.ReferencePropertiesEditionPart#getReferencedType()\n\tpublic EObject getReferencedType() {\n\t\tif (referencedType.getSelection() instanceof StructuredSelection) {\n\t\t\tObject firstElement = ((StructuredSelection) referencedType.getSelection()).getFirstElement();\n\t * @see org.obeonetwork.dsl.environment.parts.ReferencePropertiesEditionPart#initReferencedType(EObjectFlatComboSettings)\n\tpublic void initReferencedType(EObjectFlatComboSettings settings) {\n\t\treferencedType.setInput(settings);\n\t\t\treferencedType.setSelection(new StructuredSelection(settings.getValue()));\n\t\tboolean eefElementEditorReadOnlyState = isReadOnly(EnvironmentViewsRepository.Reference.Properties.referencedType);\n\t\tif (eefElementEditorReadOnlyState && referencedType.isEnabled()) {\n\t\t\treferencedType.setEnabled(false);\n\t\t\treferencedType.setToolTipText(EnvironmentMessages.Reference_ReadOnly);\n\t\t} else if (!eefElementEditorReadOnlyState && !referencedType.isEnabled()) {\n\t\t\treferencedType.setEnabled(true);\n\t * @see org.obeonetwork.dsl.environment.parts.ReferencePropertiesEditionPart#setReferencedType(EObject newValue)\n\tpublic void setReferencedType(EObject newValue) {\n\t\t\treferencedType.setSelection(new StructuredSelection(newValue));\n\t\t\treferencedType.setSelection(new StructuredSelection()); //$NON-NLS-1$\n\t\tboolean eefElementEditorReadOnlyState = isReadOnly(EnvironmentViewsRepository.Reference.Properties.referencedType);\n\t\tif (eefElementEditorReadOnlyState && referencedType.isEnabled()) {\n\t\t\treferencedType.setEnabled(false);\n\t\t\treferencedType.setToolTipText(EnvironmentMessages.Reference_ReadOnly);\n\t\t} else if (!eefElementEditorReadOnlyState && !referencedType.isEnabled()) {\n\t\t\treferencedType.setEnabled(true);\n\t * @see org.obeonetwork.dsl.environment.parts.ReferencePropertiesEditionPart#setReferencedTypeButtonMode(ButtonsModeEnum newValue)\n\tpublic void setReferencedTypeButtonMode(ButtonsModeEnum newValue) {\n\t\treferencedType.setButtonMode(newValue);\n\t * @see org.obeonetwork.dsl.environment.parts.ReferencePropertiesEditionPart#addFilterReferencedType(ViewerFilter filter)\n\tpublic void addFilterToReferencedType(ViewerFilter filter) {\n\t\treferencedType.addFilter(filter);\n\t * @see org.obeonetwork.dsl.environment.parts.ReferencePropertiesEditionPart#addBusinessFilterReferencedType(ViewerFilter filter)\n\tpublic void addBusinessFilterToReferencedType(ViewerFilter filter) {\n\t\treferencedType.addBusinessRuleFilter(filter);\n\t/**\n\t * {@inheritDoc}\n\t * \n\t * @see org.obeonetwork.dsl.environment.parts.ReferencePropertiesEditionPart#getIdentifier()\n\t * \n\t */\n\tpublic Boolean getIdentifier() {\n\t\treturn Boolean.valueOf(identifier.getSelection());\n\t}\n\n\t/**\n\t * {@inheritDoc}\n\t * \n\t * @see org.obeonetwork.dsl.environment.parts.ReferencePropertiesEditionPart#setIdentifier(Boolean newValue)\n\t * \n\t */\n\tpublic void setIdentifier(Boolean newValue) {\n\t\tif (newValue != null) {\n\t\t\tidentifier.setSelection(newValue.booleanValue());\n\t\t} else {\n\t\t\tidentifier.setSelection(false);\n\t\t}\n\t\tboolean eefElementEditorReadOnlyState = isReadOnly(EnvironmentViewsRepository.Reference.Properties.identifier);\n\t\tif (eefElementEditorReadOnlyState && identifier.isEnabled()) {\n\t\t\tidentifier.setEnabled(false);\n\t\t\tidentifier.setToolTipText(EnvironmentMessages.Reference_ReadOnly);\n\t\t} else if (!eefElementEditorReadOnlyState && !identifier.isEnabled()) {\n\t\t\tidentifier.setEnabled(true);\n\t\t}\t\n\t\t\n\t}\n", "new_methods": [ { "arguments": [ "Composite parent", " FormToolkit widgetFactory" ], "filename": "models/environment/plugins/org.obeonetwork.dsl.environment.edit/src-gen/org/obeonetwork/dsl/environment/parts/forms/ReferencePropertiesEditionPartForm.java", "implementation": "createDescription(parent, EnvironmentViewsRepository.Reference.Properties.referencedType, EnvironmentMessages.ReferencePropertiesEditionPart_ReferencedTypeLabel);\n\t\treferencedType = new EObjectFlatComboViewer(parent, !propertiesEditionComponent.isRequired(EnvironmentViewsRepository.Reference.Properties.referencedType, EnvironmentViewsRepository.FORM_KIND));\n\t\twidgetFactory.adapt(referencedType);\n\t\treferencedType.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));\n\t\tGridData referencedTypeData = new GridData(GridData.FILL_HORIZONTAL);\n\t\treferencedType.setLayoutData(referencedTypeData);\n\t\treferencedType.addSelectionChangedListener(new ISelectionChangedListener() {\n\t\t\t\t\tpropertiesEditionComponent.firePropertiesChanged(new PropertiesEditionEvent(ReferencePropertiesEditionPartForm.this, EnvironmentViewsRepository.Reference.Properties.referencedType, PropertiesEditionEvent.COMMIT, PropertiesEditionEvent.SET, null, getReferencedType()));\n\t\treferencedType.setID(EnvironmentViewsRepository.Reference.Properties.referencedType);\n\t\tFormUtils.createHelpButton(widgetFactory, parent, propertiesEditionComponent.getHelpContent(EnvironmentViewsRepository.Reference.Properties.referencedType, EnvironmentViewsRepository.FORM_KIND), null); //$NON-NLS-1$\n\t\t// Start of user code for createReferencedTypeFlatComboViewer\n\tprotected Composite createIdentifierCheckbox(FormToolkit widgetFactory, Composite parent) {\n\t\tidentifier = widgetFactory.createButton(parent, getDescription(EnvironmentViewsRepository.Reference.Properties.identifier, EnvironmentMessages.ReferencePropertiesEditionPart_IdentifierLabel), SWT.CHECK);\n\t\tidentifier.addSelectionListener(new SelectionAdapter() {\n\n\t\t\t/**\n\t\t\t * {@inheritDoc", "signature": "Composite createReferencedTypeFlatComboViewer(Composite parent, FormToolkit widgetFactory)" }, { "arguments": [ "SelectionEvent e" ], "filename": "models/environment/plugins/org.obeonetwork.dsl.environment.edit/src-gen/org/obeonetwork/dsl/environment/parts/forms/ReferencePropertiesEditionPartForm.java", "implementation": "if (propertiesEditionComponent != null)\n\t\t\t\t\tpropertiesEditionComponent.firePropertiesChanged(new PropertiesEditionEvent(ReferencePropertiesEditionPartForm.this, EnvironmentViewsRepository.Reference.Properties.identifier, PropertiesEditionEvent.COMMIT, PropertiesEditionEvent.SET, null, new Boolean(identifier.getSelection())));", "signature": "void widgetSelected(SelectionEvent e)" }, { "arguments": [], "filename": "models/environment/plugins/org.obeonetwork.dsl.environment.edit/src-gen/org/obeonetwork/dsl/environment/parts/forms/ReferencePropertiesEditionPartForm.java", "implementation": "if (referencedType.getSelection() instanceof StructuredSelection) {\n\t\t\tObject firstElement = ((StructuredSelection) referencedType.getSelection()).getFirstElement();\n\t * @see org.obeonetwork.dsl.environment.parts.ReferencePropertiesEditionPart#initReferencedType(EObjectFlatComboSettings)\n\tpublic void initReferencedType(EObjectFlatComboSettings settings) {\n\t\treferencedType.setInput(settings);\n\t\t\treferencedType.setSelection(new StructuredSelection(settings.getValue()));\n\t\tboolean eefElementEditorReadOnlyState = isReadOnly(EnvironmentViewsRepository.Reference.Properties.referencedType);\n\t\tif (eefElementEditorReadOnlyState && referencedType.isEnabled()) {\n\t\t\treferencedType.setEnabled(false);\n\t\t\treferencedType.setToolTipText(EnvironmentMessages.Reference_ReadOnly);", "signature": "EObject getReferencedType()" }, { "arguments": [ "EObject newValue" ], "filename": "models/environment/plugins/org.obeonetwork.dsl.environment.edit/src-gen/org/obeonetwork/dsl/environment/parts/forms/ReferencePropertiesEditionPartForm.java", "implementation": "referencedType.setSelection(new StructuredSelection(newValue));\n\t\t\treferencedType.setSelection(new StructuredSelection()); //$NON-NLS-1$\n\t\tboolean eefElementEditorReadOnlyState = isReadOnly(EnvironmentViewsRepository.Reference.Properties.referencedType);\n\t\tif (eefElementEditorReadOnlyState && referencedType.isEnabled()) {\n\t\t\treferencedType.setEnabled(false);\n\t\t\treferencedType.setToolTipText(EnvironmentMessages.Reference_ReadOnly);", "signature": "void setReferencedType(EObject newValue)" }, { "arguments": [ "ButtonsModeEnum newValue" ], "filename": "models/environment/plugins/org.obeonetwork.dsl.environment.edit/src-gen/org/obeonetwork/dsl/environment/parts/forms/ReferencePropertiesEditionPartForm.java", "implementation": "referencedType.setButtonMode(newValue);\n\t * @see org.obeonetwork.dsl.environment.parts.ReferencePropertiesEditionPart#addFilterReferencedType(ViewerFilter filter)\n\tpublic void addFilterToReferencedType(ViewerFilter filter) {\n\t\treferencedType.addFilter(filter);\n\t * @see org.obeonetwork.dsl.environment.parts.ReferencePropertiesEditionPart#addBusinessFilterReferencedType(ViewerFilter filter)\n\tpublic void addBusinessFilterToReferencedType(ViewerFilter filter) {\n\t\treferencedType.addBusinessRuleFilter(filter);\n\t/**\n\t * {@inheritDoc", "signature": "void setReferencedTypeButtonMode(ButtonsModeEnum newValue)" }, { "arguments": [], "filename": "models/environment/plugins/org.obeonetwork.dsl.environment.edit/src-gen/org/obeonetwork/dsl/environment/parts/forms/ReferencePropertiesEditionPartForm.java", "implementation": "return Boolean.valueOf(identifier.getSelection());", "signature": "Boolean getIdentifier()" }, { "arguments": [ "Boolean newValue" ], "filename": "models/environment/plugins/org.obeonetwork.dsl.environment.edit/src-gen/org/obeonetwork/dsl/environment/parts/forms/ReferencePropertiesEditionPartForm.java", "implementation": "if (newValue != null) {\n\t\t\tidentifier.setSelection(newValue.booleanValue());", "signature": "void setIdentifier(Boolean newValue)" } ], "old_code": "\tprotected EObjectFlatComboViewer type;\n\t\tpropertiesStep.addStep(EnvironmentViewsRepository.Reference.Properties.type);\n\t\t\t\tif (key == EnvironmentViewsRepository.Reference.Properties.type) {\n\t\t\t\t\treturn createTypeFlatComboViewer(parent, widgetFactory);\n\tprotected Composite createTypeFlatComboViewer(Composite parent, FormToolkit widgetFactory) {\n\t\tcreateDescription(parent, EnvironmentViewsRepository.Reference.Properties.type, EnvironmentMessages.ReferencePropertiesEditionPart_TypeLabel);\n\t\ttype = new EObjectFlatComboViewer(parent, !propertiesEditionComponent.isRequired(EnvironmentViewsRepository.Reference.Properties.type, EnvironmentViewsRepository.FORM_KIND));\n\t\twidgetFactory.adapt(type);\n\t\ttype.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));\n\t\tGridData typeData = new GridData(GridData.FILL_HORIZONTAL);\n\t\ttype.setLayoutData(typeData);\n\t\ttype.addSelectionChangedListener(new ISelectionChangedListener() {\n\t\t\t\t\tpropertiesEditionComponent.firePropertiesChanged(new PropertiesEditionEvent(ReferencePropertiesEditionPartForm.this, EnvironmentViewsRepository.Reference.Properties.type, PropertiesEditionEvent.COMMIT, PropertiesEditionEvent.SET, null, getType()));\n\t\ttype.setID(EnvironmentViewsRepository.Reference.Properties.type);\n\t\tFormUtils.createHelpButton(widgetFactory, parent, propertiesEditionComponent.getHelpContent(EnvironmentViewsRepository.Reference.Properties.type, EnvironmentViewsRepository.FORM_KIND), null); //$NON-NLS-1$\n\t\t// Start of user code for createTypeFlatComboViewer\n\t * @see org.obeonetwork.dsl.environment.parts.ReferencePropertiesEditionPart#getType()\n\tpublic EObject getType() {\n\t\tif (type.getSelection() instanceof StructuredSelection) {\n\t\t\tObject firstElement = ((StructuredSelection) type.getSelection()).getFirstElement();\n\t * @see org.obeonetwork.dsl.environment.parts.ReferencePropertiesEditionPart#initType(EObjectFlatComboSettings)\n\tpublic void initType(EObjectFlatComboSettings settings) {\n\t\ttype.setInput(settings);\n\t\t\ttype.setSelection(new StructuredSelection(settings.getValue()));\n\t\tboolean eefElementEditorReadOnlyState = isReadOnly(EnvironmentViewsRepository.Reference.Properties.type);\n\t\tif (eefElementEditorReadOnlyState && type.isEnabled()) {\n\t\t\ttype.setEnabled(false);\n\t\t\ttype.setToolTipText(EnvironmentMessages.Reference_ReadOnly);\n\t\t} else if (!eefElementEditorReadOnlyState && !type.isEnabled()) {\n\t\t\ttype.setEnabled(true);\n\t * @see org.obeonetwork.dsl.environment.parts.ReferencePropertiesEditionPart#setType(EObject newValue)\n\tpublic void setType(EObject newValue) {\n\t\t\ttype.setSelection(new StructuredSelection(newValue));\n\t\t\ttype.setSelection(new StructuredSelection()); //$NON-NLS-1$\n\t\tboolean eefElementEditorReadOnlyState = isReadOnly(EnvironmentViewsRepository.Reference.Properties.type);\n\t\tif (eefElementEditorReadOnlyState && type.isEnabled()) {\n\t\t\ttype.setEnabled(false);\n\t\t\ttype.setToolTipText(EnvironmentMessages.Reference_ReadOnly);\n\t\t} else if (!eefElementEditorReadOnlyState && !type.isEnabled()) {\n\t\t\ttype.setEnabled(true);\n\t * @see org.obeonetwork.dsl.environment.parts.ReferencePropertiesEditionPart#setTypeButtonMode(ButtonsModeEnum newValue)\n\tpublic void setTypeButtonMode(ButtonsModeEnum newValue) {\n\t\ttype.setButtonMode(newValue);\n\t * @see org.obeonetwork.dsl.environment.parts.ReferencePropertiesEditionPart#addFilterType(ViewerFilter filter)\n\tpublic void addFilterToType(ViewerFilter filter) {\n\t\ttype.addFilter(filter);\n\t * @see org.obeonetwork.dsl.environment.parts.ReferencePropertiesEditionPart#addBusinessFilterType(ViewerFilter filter)\n\tpublic void addBusinessFilterToType(ViewerFilter filter) {\n\t\ttype.addBusinessRuleFilter(filter);", "old_methods": [ { "arguments": [ "Composite parent", " FormToolkit widgetFactory" ], "filename": "models/environment/plugins/org.obeonetwork.dsl.environment.edit/src-gen/org/obeonetwork/dsl/environment/parts/forms/ReferencePropertiesEditionPartForm.java", "implementation": "createDescription(parent, EnvironmentViewsRepository.Reference.Properties.type, EnvironmentMessages.ReferencePropertiesEditionPart_TypeLabel);\n\t\ttype = new EObjectFlatComboViewer(parent, !propertiesEditionComponent.isRequired(EnvironmentViewsRepository.Reference.Properties.type, EnvironmentViewsRepository.FORM_KIND));\n\t\twidgetFactory.adapt(type);\n\t\ttype.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));\n\t\tGridData typeData = new GridData(GridData.FILL_HORIZONTAL);\n\t\ttype.setLayoutData(typeData);\n\t\ttype.addSelectionChangedListener(new ISelectionChangedListener() {\n\t\t\t\t\tpropertiesEditionComponent.firePropertiesChanged(new PropertiesEditionEvent(ReferencePropertiesEditionPartForm.this, EnvironmentViewsRepository.Reference.Properties.type, PropertiesEditionEvent.COMMIT, PropertiesEditionEvent.SET, null, getType()));\n\t\ttype.setID(EnvironmentViewsRepository.Reference.Properties.type);\n\t\tFormUtils.createHelpButton(widgetFactory, parent, propertiesEditionComponent.getHelpContent(EnvironmentViewsRepository.Reference.Properties.type, EnvironmentViewsRepository.FORM_KIND), null); //$NON-NLS-1$\n\t\t// Start of user code for createTypeFlatComboViewer\n\t * @see org.obeonetwork.dsl.environment.parts.ReferencePropertiesEditionPart#getType()\n\tpublic EObject getType() {\n\t\tif (type.getSelection() instanceof StructuredSelection) {\n\t\t\tObject firstElement = ((StructuredSelection) type.getSelection()).getFirstElement();\n\t * @see org.obeonetwork.dsl.environment.parts.ReferencePropertiesEditionPart#initType(EObjectFlatComboSettings)\n\tpublic void initType(EObjectFlatComboSettings settings) {\n\t\ttype.setInput(settings);\n\t\t\ttype.setSelection(new StructuredSelection(settings.getValue()));\n\t\tboolean eefElementEditorReadOnlyState = isReadOnly(EnvironmentViewsRepository.Reference.Properties.type);\n\t\tif (eefElementEditorReadOnlyState && type.isEnabled()) {\n\t\t\ttype.setEnabled(false);\n\t\t\ttype.setToolTipText(EnvironmentMessages.Reference_ReadOnly);", "signature": "Composite createTypeFlatComboViewer(Composite parent, FormToolkit widgetFactory)" }, { "arguments": [ "EObject newValue" ], "filename": "models/environment/plugins/org.obeonetwork.dsl.environment.edit/src-gen/org/obeonetwork/dsl/environment/parts/forms/ReferencePropertiesEditionPartForm.java", "implementation": "type.setSelection(new StructuredSelection(newValue));\n\t\t\ttype.setSelection(new StructuredSelection()); //$NON-NLS-1$\n\t\tboolean eefElementEditorReadOnlyState = isReadOnly(EnvironmentViewsRepository.Reference.Properties.type);\n\t\tif (eefElementEditorReadOnlyState && type.isEnabled()) {\n\t\t\ttype.setEnabled(false);\n\t\t\ttype.setToolTipText(EnvironmentMessages.Reference_ReadOnly);", "signature": "void setType(EObject newValue)" } ], "patch": "@@ -58,11 +58,12 @@\n public class ReferencePropertiesEditionPartForm extends SectionPropertiesEditingPart implements IFormPropertiesEditionPart, ReferencePropertiesEditionPart {\n \n \tprotected Text name;\n-\tprotected EObjectFlatComboViewer type;\n+\tprotected EObjectFlatComboViewer referencedType;\n \tprotected EMFComboViewer multiplicity;\n \tprotected Button isComposite;\n \tprotected Button navigable;\n \tprotected EObjectFlatComboViewer oppositeOf;\n+\tprotected Button identifier;\n \tprotected Text description;\n \n \n@@ -110,11 +111,12 @@ public void createControls(final FormToolkit widgetFactory, Composite view) {\n \t\tCompositionSequence referenceStep = new BindingCompositionSequence(propertiesEditionComponent);\n \t\tCompositionStep propertiesStep = referenceStep.addStep(EnvironmentViewsRepository.Reference.Properties.class);\n \t\tpropertiesStep.addStep(EnvironmentViewsRepository.Reference.Properties.name);\n-\t\tpropertiesStep.addStep(EnvironmentViewsRepository.Reference.Properties.type);\n+\t\tpropertiesStep.addStep(EnvironmentViewsRepository.Reference.Properties.referencedType);\n \t\tpropertiesStep.addStep(EnvironmentViewsRepository.Reference.Properties.multiplicity);\n \t\tpropertiesStep.addStep(EnvironmentViewsRepository.Reference.Properties.isComposite);\n \t\tpropertiesStep.addStep(EnvironmentViewsRepository.Reference.Properties.navigable);\n \t\tpropertiesStep.addStep(EnvironmentViewsRepository.Reference.Properties.oppositeOf);\n+\t\tpropertiesStep.addStep(EnvironmentViewsRepository.Reference.Properties.identifier);\n \t\tpropertiesStep.addStep(EnvironmentViewsRepository.Reference.Properties.description);\n \t\t\n \t\t\n@@ -128,8 +130,8 @@ public Composite addToPart(Composite parent, Object key) {\n \t\t\t\tif (key == EnvironmentViewsRepository.Reference.Properties.name) {\n \t\t\t\t\treturn createNameText(widgetFactory, parent);\n \t\t\t\t}\n-\t\t\t\tif (key == EnvironmentViewsRepository.Reference.Properties.type) {\n-\t\t\t\t\treturn createTypeFlatComboViewer(parent, widgetFactory);\n+\t\t\t\tif (key == EnvironmentViewsRepository.Reference.Properties.referencedType) {\n+\t\t\t\t\treturn createReferencedTypeFlatComboViewer(parent, widgetFactory);\n \t\t\t\t}\n \t\t\t\tif (key == EnvironmentViewsRepository.Reference.Properties.multiplicity) {\n \t\t\t\t\treturn createMultiplicityEMFComboViewer(widgetFactory, parent);\n@@ -143,6 +145,9 @@ public Composite addToPart(Composite parent, Object key) {\n \t\t\t\tif (key == EnvironmentViewsRepository.Reference.Properties.oppositeOf) {\n \t\t\t\t\treturn createOppositeOfFlatComboViewer(parent, widgetFactory);\n \t\t\t\t}\n+\t\t\t\tif (key == EnvironmentViewsRepository.Reference.Properties.identifier) {\n+\t\t\t\t\treturn createIdentifierCheckbox(widgetFactory, parent);\n+\t\t\t\t}\n \t\t\t\tif (key == EnvironmentViewsRepository.Reference.Properties.description) {\n \t\t\t\t\treturn createDescriptionText(widgetFactory, parent);\n \t\t\t\t}\n@@ -241,14 +246,14 @@ public void keyPressed(KeyEvent e) {\n \t * @param widgetFactory factory to use to instanciante widget of the form\n \t * \n \t */\n-\tprotected Composite createTypeFlatComboViewer(Composite parent, FormToolkit widgetFactory) {\n-\t\tcreateDescription(parent, EnvironmentViewsRepository.Reference.Properties.type, EnvironmentMessages.ReferencePropertiesEditionPart_TypeLabel);\n-\t\ttype = new EObjectFlatComboViewer(parent, !propertiesEditionComponent.isRequired(EnvironmentViewsRepository.Reference.Properties.type, EnvironmentViewsRepository.FORM_KIND));\n-\t\twidgetFactory.adapt(type);\n-\t\ttype.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));\n-\t\tGridData typeData = new GridData(GridData.FILL_HORIZONTAL);\n-\t\ttype.setLayoutData(typeData);\n-\t\ttype.addSelectionChangedListener(new ISelectionChangedListener() {\n+\tprotected Composite createReferencedTypeFlatComboViewer(Composite parent, FormToolkit widgetFactory) {\n+\t\tcreateDescription(parent, EnvironmentViewsRepository.Reference.Properties.referencedType, EnvironmentMessages.ReferencePropertiesEditionPart_ReferencedTypeLabel);\n+\t\treferencedType = new EObjectFlatComboViewer(parent, !propertiesEditionComponent.isRequired(EnvironmentViewsRepository.Reference.Properties.referencedType, EnvironmentViewsRepository.FORM_KIND));\n+\t\twidgetFactory.adapt(referencedType);\n+\t\treferencedType.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));\n+\t\tGridData referencedTypeData = new GridData(GridData.FILL_HORIZONTAL);\n+\t\treferencedType.setLayoutData(referencedTypeData);\n+\t\treferencedType.addSelectionChangedListener(new ISelectionChangedListener() {\n \n \t\t\t/**\n \t\t\t * {@inheritDoc}\n@@ -257,13 +262,13 @@ protected Composite createTypeFlatComboViewer(Composite parent, FormToolkit widg\n \t\t\t */\n \t\t\tpublic void selectionChanged(SelectionChangedEvent event) {\n \t\t\t\tif (propertiesEditionComponent != null)\n-\t\t\t\t\tpropertiesEditionComponent.firePropertiesChanged(new PropertiesEditionEvent(ReferencePropertiesEditionPartForm.this, EnvironmentViewsRepository.Reference.Properties.type, PropertiesEditionEvent.COMMIT, PropertiesEditionEvent.SET, null, getType()));\n+\t\t\t\t\tpropertiesEditionComponent.firePropertiesChanged(new PropertiesEditionEvent(ReferencePropertiesEditionPartForm.this, EnvironmentViewsRepository.Reference.Properties.referencedType, PropertiesEditionEvent.COMMIT, PropertiesEditionEvent.SET, null, getReferencedType()));\n \t\t\t}\n \n \t\t});\n-\t\ttype.setID(EnvironmentViewsRepository.Reference.Properties.type);\n-\t\tFormUtils.createHelpButton(widgetFactory, parent, propertiesEditionComponent.getHelpContent(EnvironmentViewsRepository.Reference.Properties.type, EnvironmentViewsRepository.FORM_KIND), null); //$NON-NLS-1$\n-\t\t// Start of user code for createTypeFlatComboViewer\n+\t\treferencedType.setID(EnvironmentViewsRepository.Reference.Properties.referencedType);\n+\t\tFormUtils.createHelpButton(widgetFactory, parent, propertiesEditionComponent.getHelpContent(EnvironmentViewsRepository.Reference.Properties.referencedType, EnvironmentViewsRepository.FORM_KIND), null); //$NON-NLS-1$\n+\t\t// Start of user code for createReferencedTypeFlatComboViewer\n \n \t\t// End of user code\n \t\treturn parent;\n@@ -391,6 +396,35 @@ public void selectionChanged(SelectionChangedEvent event) {\n \t}\n \n \t\n+\tprotected Composite createIdentifierCheckbox(FormToolkit widgetFactory, Composite parent) {\n+\t\tidentifier = widgetFactory.createButton(parent, getDescription(EnvironmentViewsRepository.Reference.Properties.identifier, EnvironmentMessages.ReferencePropertiesEditionPart_IdentifierLabel), SWT.CHECK);\n+\t\tidentifier.addSelectionListener(new SelectionAdapter() {\n+\n+\t\t\t/**\n+\t\t\t * {@inheritDoc}\n+\t\t\t *\n+\t\t\t * @see org.eclipse.swt.events.SelectionAdapter#widgetSelected(org.eclipse.swt.events.SelectionEvent)\n+\t\t\t * \t\n+\t\t\t */\n+\t\t\tpublic void widgetSelected(SelectionEvent e) {\n+\t\t\t\tif (propertiesEditionComponent != null)\n+\t\t\t\t\tpropertiesEditionComponent.firePropertiesChanged(new PropertiesEditionEvent(ReferencePropertiesEditionPartForm.this, EnvironmentViewsRepository.Reference.Properties.identifier, PropertiesEditionEvent.COMMIT, PropertiesEditionEvent.SET, null, new Boolean(identifier.getSelection())));\n+\t\t\t}\n+\n+\t\t});\n+\t\tGridData identifierData = new GridData(GridData.FILL_HORIZONTAL);\n+\t\tidentifierData.horizontalSpan = 2;\n+\t\tidentifier.setLayoutData(identifierData);\n+\t\tEditingUtils.setID(identifier, EnvironmentViewsRepository.Reference.Properties.identifier);\n+\t\tEditingUtils.setEEFtype(identifier, \"eef::Checkbox\"); //$NON-NLS-1$\n+\t\tFormUtils.createHelpButton(widgetFactory, parent, propertiesEditionComponent.getHelpContent(EnvironmentViewsRepository.Reference.Properties.identifier, EnvironmentViewsRepository.FORM_KIND), null); //$NON-NLS-1$\n+\t\t// Start of user code for createIdentifierCheckbox\n+\n+\t\t// End of user code\n+\t\treturn parent;\n+\t}\n+\n+\t\n \tprotected Composite createDescriptionText(FormToolkit widgetFactory, Composite parent) {\n \t\tcreateDescription(parent, EnvironmentViewsRepository.Reference.Properties.description, EnvironmentMessages.ReferencePropertiesEditionPart_DescriptionLabel);\n \t\tdescription = widgetFactory.createText(parent, \"\"); //$NON-NLS-1$\n@@ -506,12 +540,12 @@ public void setName(String newValue) {\n \t/**\n \t * {@inheritDoc}\n \t * \n-\t * @see org.obeonetwork.dsl.environment.parts.ReferencePropertiesEditionPart#getType()\n+\t * @see org.obeonetwork.dsl.environment.parts.ReferencePropertiesEditionPart#getReferencedType()\n \t * \n \t */\n-\tpublic EObject getType() {\n-\t\tif (type.getSelection() instanceof StructuredSelection) {\n-\t\t\tObject firstElement = ((StructuredSelection) type.getSelection()).getFirstElement();\n+\tpublic EObject getReferencedType() {\n+\t\tif (referencedType.getSelection() instanceof StructuredSelection) {\n+\t\t\tObject firstElement = ((StructuredSelection) referencedType.getSelection()).getFirstElement();\n \t\t\tif (firstElement instanceof EObject)\n \t\t\t\treturn (EObject) firstElement;\n \t\t}\n@@ -521,72 +555,72 @@ public EObject getType() {\n \t/**\n \t * {@inheritDoc}\n \t * \n-\t * @see org.obeonetwork.dsl.environment.parts.ReferencePropertiesEditionPart#initType(EObjectFlatComboSettings)\n+\t * @see org.obeonetwork.dsl.environment.parts.ReferencePropertiesEditionPart#initReferencedType(EObjectFlatComboSettings)\n \t */\n-\tpublic void initType(EObjectFlatComboSettings settings) {\n-\t\ttype.setInput(settings);\n+\tpublic void initReferencedType(EObjectFlatComboSettings settings) {\n+\t\treferencedType.setInput(settings);\n \t\tif (current != null) {\n-\t\t\ttype.setSelection(new StructuredSelection(settings.getValue()));\n+\t\t\treferencedType.setSelection(new StructuredSelection(settings.getValue()));\n \t\t}\n-\t\tboolean eefElementEditorReadOnlyState = isReadOnly(EnvironmentViewsRepository.Reference.Properties.type);\n-\t\tif (eefElementEditorReadOnlyState && type.isEnabled()) {\n-\t\t\ttype.setEnabled(false);\n-\t\t\ttype.setToolTipText(EnvironmentMessages.Reference_ReadOnly);\n-\t\t} else if (!eefElementEditorReadOnlyState && !type.isEnabled()) {\n-\t\t\ttype.setEnabled(true);\n+\t\tboolean eefElementEditorReadOnlyState = isReadOnly(EnvironmentViewsRepository.Reference.Properties.referencedType);\n+\t\tif (eefElementEditorReadOnlyState && referencedType.isEnabled()) {\n+\t\t\treferencedType.setEnabled(false);\n+\t\t\treferencedType.setToolTipText(EnvironmentMessages.Reference_ReadOnly);\n+\t\t} else if (!eefElementEditorReadOnlyState && !referencedType.isEnabled()) {\n+\t\t\treferencedType.setEnabled(true);\n \t\t}\t\n \t\t\n \t}\n \n \t/**\n \t * {@inheritDoc}\n \t * \n-\t * @see org.obeonetwork.dsl.environment.parts.ReferencePropertiesEditionPart#setType(EObject newValue)\n+\t * @see org.obeonetwork.dsl.environment.parts.ReferencePropertiesEditionPart#setReferencedType(EObject newValue)\n \t * \n \t */\n-\tpublic void setType(EObject newValue) {\n+\tpublic void setReferencedType(EObject newValue) {\n \t\tif (newValue != null) {\n-\t\t\ttype.setSelection(new StructuredSelection(newValue));\n+\t\t\treferencedType.setSelection(new StructuredSelection(newValue));\n \t\t} else {\n-\t\t\ttype.setSelection(new StructuredSelection()); //$NON-NLS-1$\n+\t\t\treferencedType.setSelection(new StructuredSelection()); //$NON-NLS-1$\n \t\t}\n-\t\tboolean eefElementEditorReadOnlyState = isReadOnly(EnvironmentViewsRepository.Reference.Properties.type);\n-\t\tif (eefElementEditorReadOnlyState && type.isEnabled()) {\n-\t\t\ttype.setEnabled(false);\n-\t\t\ttype.setToolTipText(EnvironmentMessages.Reference_ReadOnly);\n-\t\t} else if (!eefElementEditorReadOnlyState && !type.isEnabled()) {\n-\t\t\ttype.setEnabled(true);\n+\t\tboolean eefElementEditorReadOnlyState = isReadOnly(EnvironmentViewsRepository.Reference.Properties.referencedType);\n+\t\tif (eefElementEditorReadOnlyState && referencedType.isEnabled()) {\n+\t\t\treferencedType.setEnabled(false);\n+\t\t\treferencedType.setToolTipText(EnvironmentMessages.Reference_ReadOnly);\n+\t\t} else if (!eefElementEditorReadOnlyState && !referencedType.isEnabled()) {\n+\t\t\treferencedType.setEnabled(true);\n \t\t}\t\n \t\t\n \t}\n \n \t/**\n \t * {@inheritDoc}\n \t * \n-\t * @see org.obeonetwork.dsl.environment.parts.ReferencePropertiesEditionPart#setTypeButtonMode(ButtonsModeEnum newValue)\n+\t * @see org.obeonetwork.dsl.environment.parts.ReferencePropertiesEditionPart#setReferencedTypeButtonMode(ButtonsModeEnum newValue)\n \t */\n-\tpublic void setTypeButtonMode(ButtonsModeEnum newValue) {\n-\t\ttype.setButtonMode(newValue);\n+\tpublic void setReferencedTypeButtonMode(ButtonsModeEnum newValue) {\n+\t\treferencedType.setButtonMode(newValue);\n \t}\n \n \t/**\n \t * {@inheritDoc}\n \t * \n-\t * @see org.obeonetwork.dsl.environment.parts.ReferencePropertiesEditionPart#addFilterType(ViewerFilter filter)\n+\t * @see org.obeonetwork.dsl.environment.parts.ReferencePropertiesEditionPart#addFilterReferencedType(ViewerFilter filter)\n \t * \n \t */\n-\tpublic void addFilterToType(ViewerFilter filter) {\n-\t\ttype.addFilter(filter);\n+\tpublic void addFilterToReferencedType(ViewerFilter filter) {\n+\t\treferencedType.addFilter(filter);\n \t}\n \n \t/**\n \t * {@inheritDoc}\n \t * \n-\t * @see org.obeonetwork.dsl.environment.parts.ReferencePropertiesEditionPart#addBusinessFilterType(ViewerFilter filter)\n+\t * @see org.obeonetwork.dsl.environment.parts.ReferencePropertiesEditionPart#addBusinessFilterReferencedType(ViewerFilter filter)\n \t * \n \t */\n-\tpublic void addBusinessFilterToType(ViewerFilter filter) {\n-\t\ttype.addBusinessRuleFilter(filter);\n+\tpublic void addBusinessFilterToReferencedType(ViewerFilter filter) {\n+\t\treferencedType.addBusinessRuleFilter(filter);\n \t}\n \n \t/**\n@@ -786,6 +820,38 @@ public void addBusinessFilterToOppositeOf(ViewerFilter filter) {\n \t\toppositeOf.addBusinessRuleFilter(filter);\n \t}\n \n+\t/**\n+\t * {@inheritDoc}\n+\t * \n+\t * @see org.obeonetwork.dsl.environment.parts.ReferencePropertiesEditionPart#getIdentifier()\n+\t * \n+\t */\n+\tpublic Boolean getIdentifier() {\n+\t\treturn Boolean.valueOf(identifier.getSelection());\n+\t}\n+\n+\t/**\n+\t * {@inheritDoc}\n+\t * \n+\t * @see org.obeonetwork.dsl.environment.parts.ReferencePropertiesEditionPart#setIdentifier(Boolean newValue)\n+\t * \n+\t */\n+\tpublic void setIdentifier(Boolean newValue) {\n+\t\tif (newValue != null) {\n+\t\t\tidentifier.setSelection(newValue.booleanValue());\n+\t\t} else {\n+\t\t\tidentifier.setSelection(false);\n+\t\t}\n+\t\tboolean eefElementEditorReadOnlyState = isReadOnly(EnvironmentViewsRepository.Reference.Properties.identifier);\n+\t\tif (eefElementEditorReadOnlyState && identifier.isEnabled()) {\n+\t\t\tidentifier.setEnabled(false);\n+\t\t\tidentifier.setToolTipText(EnvironmentMessages.Reference_ReadOnly);\n+\t\t} else if (!eefElementEditorReadOnlyState && !identifier.isEnabled()) {\n+\t\t\tidentifier.setEnabled(true);\n+\t\t}\t\n+\t\t\n+\t}\n+\n \t/**\n \t * {@inheritDoc}\n \t * ", "raw_url": "https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fsrc-gen%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2Fparts%2Fforms%2FReferencePropertiesEditionPartForm.java", "sha": "b81ab56104019d04b38b803f90c177e566c1353c", "status": "modified" }, { "additions": 70, "blob_url": "https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fsrc-gen%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2Fparts%2Fimpl%2FAttributePropertiesEditionPartImpl.java", "changes": 70, "contents_url": "https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fsrc-gen%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2Fparts%2Fimpl%2FAttributePropertiesEditionPartImpl.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6", "deletions": 0, "filename": "models/environment/plugins/org.obeonetwork.dsl.environment.edit/src-gen/org/obeonetwork/dsl/environment/parts/impl/AttributePropertiesEditionPartImpl.java", "new_code": "import org.eclipse.swt.events.SelectionAdapter;\nimport org.eclipse.swt.events.SelectionEvent;\nimport org.eclipse.swt.widgets.Button;\n\tprotected Button identifier;\n\t\tpropertiesStep.addStep(EnvironmentViewsRepository.Attribute.Properties.identifier);\n\t\t\t\tif (key == EnvironmentViewsRepository.Attribute.Properties.identifier) {\n\t\t\t\t\treturn createIdentifierCheckbox(parent);\n\t\t\t\t}\n\tprotected Composite createIdentifierCheckbox(Composite parent) {\n\t\tidentifier = new Button(parent, SWT.CHECK);\n\t\tidentifier.setText(getDescription(EnvironmentViewsRepository.Attribute.Properties.identifier, EnvironmentMessages.AttributePropertiesEditionPart_IdentifierLabel));\n\t\tidentifier.addSelectionListener(new SelectionAdapter() {\n\n\t\t\t/**\n\t\t\t * {@inheritDoc}\n\t\t\t *\n\t\t\t * @see org.eclipse.swt.events.SelectionAdapter#widgetSelected(org.eclipse.swt.events.SelectionEvent)\n\t\t\t * \t\n\t\t\t */\n\t\t\tpublic void widgetSelected(SelectionEvent e) {\n\t\t\t\tif (propertiesEditionComponent != null)\n\t\t\t\t\tpropertiesEditionComponent.firePropertiesChanged(new PropertiesEditionEvent(AttributePropertiesEditionPartImpl.this, EnvironmentViewsRepository.Attribute.Properties.identifier, PropertiesEditionEvent.COMMIT, PropertiesEditionEvent.SET, null, new Boolean(identifier.getSelection())));\n\t\t\t}\n\n\t\t});\n\t\tGridData identifierData = new GridData(GridData.FILL_HORIZONTAL);\n\t\tidentifierData.horizontalSpan = 2;\n\t\tidentifier.setLayoutData(identifierData);\n\t\tEditingUtils.setID(identifier, EnvironmentViewsRepository.Attribute.Properties.identifier);\n\t\tEditingUtils.setEEFtype(identifier, \"eef::Checkbox\"); //$NON-NLS-1$\n\t\tSWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(EnvironmentViewsRepository.Attribute.Properties.identifier, EnvironmentViewsRepository.SWT_KIND), null); //$NON-NLS-1$\n\t\t// Start of user code for createIdentifierCheckbox\n\n\t\t// End of user code\n\t\treturn parent;\n\t}\n\n\t\n\t/**\n\t * {@inheritDoc}\n\t * \n\t * @see org.obeonetwork.dsl.environment.parts.AttributePropertiesEditionPart#getIdentifier()\n\t * \n\t */\n\tpublic Boolean getIdentifier() {\n\t\treturn Boolean.valueOf(identifier.getSelection());\n\t}\n\n\t/**\n\t * {@inheritDoc}\n\t * \n\t * @see org.obeonetwork.dsl.environment.parts.AttributePropertiesEditionPart#setIdentifier(Boolean newValue)\n\t * \n\t */\n\tpublic void setIdentifier(Boolean newValue) {\n\t\tif (newValue != null) {\n\t\t\tidentifier.setSelection(newValue.booleanValue());\n\t\t} else {\n\t\t\tidentifier.setSelection(false);\n\t\t}\n\t\tboolean eefElementEditorReadOnlyState = isReadOnly(EnvironmentViewsRepository.Attribute.Properties.identifier);\n\t\tif (eefElementEditorReadOnlyState && identifier.isEnabled()) {\n\t\t\tidentifier.setEnabled(false);\n\t\t\tidentifier.setToolTipText(EnvironmentMessages.Attribute_ReadOnly);\n\t\t} else if (!eefElementEditorReadOnlyState && !identifier.isEnabled()) {\n\t\t\tidentifier.setEnabled(true);\n\t\t}\t\n\t\t\n\t}\n", "new_methods": [ { "arguments": [ "Composite parent" ], "filename": "models/environment/plugins/org.obeonetwork.dsl.environment.edit/src-gen/org/obeonetwork/dsl/environment/parts/impl/AttributePropertiesEditionPartImpl.java", "implementation": "identifier = new Button(parent, SWT.CHECK);\n\t\tidentifier.setText(getDescription(EnvironmentViewsRepository.Attribute.Properties.identifier, EnvironmentMessages.AttributePropertiesEditionPart_IdentifierLabel));\n\t\tidentifier.addSelectionListener(new SelectionAdapter() {\n\n\t\t\t/**\n\t\t\t * {@inheritDoc", "signature": "Composite createIdentifierCheckbox(Composite parent)" }, { "arguments": [ "SelectionEvent e" ], "filename": "models/environment/plugins/org.obeonetwork.dsl.environment.edit/src-gen/org/obeonetwork/dsl/environment/parts/impl/AttributePropertiesEditionPartImpl.java", "implementation": "if (propertiesEditionComponent != null)\n\t\t\t\t\tpropertiesEditionComponent.firePropertiesChanged(new PropertiesEditionEvent(AttributePropertiesEditionPartImpl.this, EnvironmentViewsRepository.Attribute.Properties.identifier, PropertiesEditionEvent.COMMIT, PropertiesEditionEvent.SET, null, new Boolean(identifier.getSelection())));", "signature": "void widgetSelected(SelectionEvent e)" }, { "arguments": [], "filename": "models/environment/plugins/org.obeonetwork.dsl.environment.edit/src-gen/org/obeonetwork/dsl/environment/parts/impl/AttributePropertiesEditionPartImpl.java", "implementation": "return Boolean.valueOf(identifier.getSelection());", "signature": "Boolean getIdentifier()" }, { "arguments": [ "Boolean newValue" ], "filename": "models/environment/plugins/org.obeonetwork.dsl.environment.edit/src-gen/org/obeonetwork/dsl/environment/parts/impl/AttributePropertiesEditionPartImpl.java", "implementation": "if (newValue != null) {\n\t\t\tidentifier.setSelection(newValue.booleanValue());", "signature": "void setIdentifier(Boolean newValue)" } ], "old_code": "", "old_methods": [], "patch": "@@ -30,8 +30,11 @@\n import org.eclipse.swt.events.FocusEvent;\n import org.eclipse.swt.events.KeyAdapter;\n import org.eclipse.swt.events.KeyEvent;\n+import org.eclipse.swt.events.SelectionAdapter;\n+import org.eclipse.swt.events.SelectionEvent;\n import org.eclipse.swt.layout.GridData;\n import org.eclipse.swt.layout.GridLayout;\n+import org.eclipse.swt.widgets.Button;\n import org.eclipse.swt.widgets.Composite;\n import org.eclipse.swt.widgets.Group;\n import org.eclipse.swt.widgets.Text;\n@@ -50,6 +53,7 @@ public class AttributePropertiesEditionPartImpl extends CompositePropertiesEditi\n \tprotected Text name;\n \tprotected EMFComboViewer type;\n \tprotected EMFComboViewer multiplicity;\n+\tprotected Button identifier;\n \tprotected Text description;\n \n \n@@ -92,6 +96,7 @@ public void createControls(Composite view) {\n \t\tpropertiesStep.addStep(EnvironmentViewsRepository.Attribute.Properties.name);\n \t\tpropertiesStep.addStep(EnvironmentViewsRepository.Attribute.Properties.type);\n \t\tpropertiesStep.addStep(EnvironmentViewsRepository.Attribute.Properties.multiplicity);\n+\t\tpropertiesStep.addStep(EnvironmentViewsRepository.Attribute.Properties.identifier);\n \t\tpropertiesStep.addStep(EnvironmentViewsRepository.Attribute.Properties.description);\n \t\t\n \t\t\n@@ -111,6 +116,9 @@ public Composite addToPart(Composite parent, Object key) {\n \t\t\t\tif (key == EnvironmentViewsRepository.Attribute.Properties.multiplicity) {\n \t\t\t\t\treturn createMultiplicityEMFComboViewer(parent);\n \t\t\t\t}\n+\t\t\t\tif (key == EnvironmentViewsRepository.Attribute.Properties.identifier) {\n+\t\t\t\t\treturn createIdentifierCheckbox(parent);\n+\t\t\t\t}\n \t\t\t\tif (key == EnvironmentViewsRepository.Attribute.Properties.description) {\n \t\t\t\t\treturn createDescriptionText(parent);\n \t\t\t\t}\n@@ -245,6 +253,36 @@ public void selectionChanged(SelectionChangedEvent event) {\n \t}\n \n \t\n+\tprotected Composite createIdentifierCheckbox(Composite parent) {\n+\t\tidentifier = new Button(parent, SWT.CHECK);\n+\t\tidentifier.setText(getDescription(EnvironmentViewsRepository.Attribute.Properties.identifier, EnvironmentMessages.AttributePropertiesEditionPart_IdentifierLabel));\n+\t\tidentifier.addSelectionListener(new SelectionAdapter() {\n+\n+\t\t\t/**\n+\t\t\t * {@inheritDoc}\n+\t\t\t *\n+\t\t\t * @see org.eclipse.swt.events.SelectionAdapter#widgetSelected(org.eclipse.swt.events.SelectionEvent)\n+\t\t\t * \t\n+\t\t\t */\n+\t\t\tpublic void widgetSelected(SelectionEvent e) {\n+\t\t\t\tif (propertiesEditionComponent != null)\n+\t\t\t\t\tpropertiesEditionComponent.firePropertiesChanged(new PropertiesEditionEvent(AttributePropertiesEditionPartImpl.this, EnvironmentViewsRepository.Attribute.Properties.identifier, PropertiesEditionEvent.COMMIT, PropertiesEditionEvent.SET, null, new Boolean(identifier.getSelection())));\n+\t\t\t}\n+\n+\t\t});\n+\t\tGridData identifierData = new GridData(GridData.FILL_HORIZONTAL);\n+\t\tidentifierData.horizontalSpan = 2;\n+\t\tidentifier.setLayoutData(identifierData);\n+\t\tEditingUtils.setID(identifier, EnvironmentViewsRepository.Attribute.Properties.identifier);\n+\t\tEditingUtils.setEEFtype(identifier, \"eef::Checkbox\"); //$NON-NLS-1$\n+\t\tSWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(EnvironmentViewsRepository.Attribute.Properties.identifier, EnvironmentViewsRepository.SWT_KIND), null); //$NON-NLS-1$\n+\t\t// Start of user code for createIdentifierCheckbox\n+\n+\t\t// End of user code\n+\t\treturn parent;\n+\t}\n+\n+\t\n \tprotected Composite createDescriptionText(Composite parent) {\n \t\tcreateDescription(parent, EnvironmentViewsRepository.Attribute.Properties.description, EnvironmentMessages.AttributePropertiesEditionPart_DescriptionLabel);\n \t\tdescription = SWTUtils.createScrollableText(parent, SWT.BORDER);\n@@ -442,6 +480,38 @@ public void setMultiplicity(Enumerator newValue) {\n \t\t\n \t}\n \n+\t/**\n+\t * {@inheritDoc}\n+\t * \n+\t * @see org.obeonetwork.dsl.environment.parts.AttributePropertiesEditionPart#getIdentifier()\n+\t * \n+\t */\n+\tpublic Boolean getIdentifier() {\n+\t\treturn Boolean.valueOf(identifier.getSelection());\n+\t}\n+\n+\t/**\n+\t * {@inheritDoc}\n+\t * \n+\t * @see org.obeonetwork.dsl.environment.parts.AttributePropertiesEditionPart#setIdentifier(Boolean newValue)\n+\t * \n+\t */\n+\tpublic void setIdentifier(Boolean newValue) {\n+\t\tif (newValue != null) {\n+\t\t\tidentifier.setSelection(newValue.booleanValue());\n+\t\t} else {\n+\t\t\tidentifier.setSelection(false);\n+\t\t}\n+\t\tboolean eefElementEditorReadOnlyState = isReadOnly(EnvironmentViewsRepository.Attribute.Properties.identifier);\n+\t\tif (eefElementEditorReadOnlyState && identifier.isEnabled()) {\n+\t\t\tidentifier.setEnabled(false);\n+\t\t\tidentifier.setToolTipText(EnvironmentMessages.Attribute_ReadOnly);\n+\t\t} else if (!eefElementEditorReadOnlyState && !identifier.isEnabled()) {\n+\t\t\tidentifier.setEnabled(true);\n+\t\t}\t\n+\t\t\n+\t}\n+\n \t/**\n \t * {@inheritDoc}\n \t * ", "raw_url": "https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fsrc-gen%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2Fparts%2Fimpl%2FAttributePropertiesEditionPartImpl.java", "sha": "cffb3305e5a9feaf7ff17b8b9d2cfc3f39775525", "status": "modified" }, { "additions": 115, "blob_url": "https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fsrc-gen%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2Fparts%2Fimpl%2FReferencePropertiesEditionPartImpl.java", "changes": 163, "contents_url": "https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fsrc-gen%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2Fparts%2Fimpl%2FReferencePropertiesEditionPartImpl.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6", "deletions": 48, "filename": "models/environment/plugins/org.obeonetwork.dsl.environment.edit/src-gen/org/obeonetwork/dsl/environment/parts/impl/ReferencePropertiesEditionPartImpl.java", "new_code": "\tprotected EObjectFlatComboViewer referencedType;\n\tprotected Button identifier;\n\t\tpropertiesStep.addStep(EnvironmentViewsRepository.Reference.Properties.referencedType);\n\t\tpropertiesStep.addStep(EnvironmentViewsRepository.Reference.Properties.identifier);\n\t\t\t\tif (key == EnvironmentViewsRepository.Reference.Properties.referencedType) {\n\t\t\t\t\treturn createReferencedTypeFlatComboViewer(parent);\n\t\t\t\tif (key == EnvironmentViewsRepository.Reference.Properties.identifier) {\n\t\t\t\t\treturn createIdentifierCheckbox(parent);\n\t\t\t\t}\n\tprotected Composite createReferencedTypeFlatComboViewer(Composite parent) {\n\t\tcreateDescription(parent, EnvironmentViewsRepository.Reference.Properties.referencedType, EnvironmentMessages.ReferencePropertiesEditionPart_ReferencedTypeLabel);\n\t\treferencedType = new EObjectFlatComboViewer(parent, !propertiesEditionComponent.isRequired(EnvironmentViewsRepository.Reference.Properties.referencedType, EnvironmentViewsRepository.SWT_KIND));\n\t\treferencedType.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));\n\t\treferencedType.addSelectionChangedListener(new ISelectionChangedListener() {\n\t\t\t\tpropertiesEditionComponent.firePropertiesChanged(new PropertiesEditionEvent(ReferencePropertiesEditionPartImpl.this, EnvironmentViewsRepository.Reference.Properties.referencedType, PropertiesEditionEvent.CHANGE, PropertiesEditionEvent.SET, null, getReferencedType()));\n\t\tGridData referencedTypeData = new GridData(GridData.FILL_HORIZONTAL);\n\t\treferencedType.setLayoutData(referencedTypeData);\n\t\treferencedType.setID(EnvironmentViewsRepository.Reference.Properties.referencedType);\n\t\tSWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(EnvironmentViewsRepository.Reference.Properties.referencedType, EnvironmentViewsRepository.SWT_KIND), null); //$NON-NLS-1$\n\t\t// Start of user code for createReferencedTypeFlatComboViewer\n\tprotected Composite createIdentifierCheckbox(Composite parent) {\n\t\tidentifier = new Button(parent, SWT.CHECK);\n\t\tidentifier.setText(getDescription(EnvironmentViewsRepository.Reference.Properties.identifier, EnvironmentMessages.ReferencePropertiesEditionPart_IdentifierLabel));\n\t\tidentifier.addSelectionListener(new SelectionAdapter() {\n\n\t\t\t/**\n\t\t\t * {@inheritDoc}\n\t\t\t *\n\t\t\t * @see org.eclipse.swt.events.SelectionAdapter#widgetSelected(org.eclipse.swt.events.SelectionEvent)\n\t\t\t * \t\n\t\t\t */\n\t\t\tpublic void widgetSelected(SelectionEvent e) {\n\t\t\t\tif (propertiesEditionComponent != null)\n\t\t\t\t\tpropertiesEditionComponent.firePropertiesChanged(new PropertiesEditionEvent(ReferencePropertiesEditionPartImpl.this, EnvironmentViewsRepository.Reference.Properties.identifier, PropertiesEditionEvent.COMMIT, PropertiesEditionEvent.SET, null, new Boolean(identifier.getSelection())));\n\t\t\t}\n\n\t\t});\n\t\tGridData identifierData = new GridData(GridData.FILL_HORIZONTAL);\n\t\tidentifierData.horizontalSpan = 2;\n\t\tidentifier.setLayoutData(identifierData);\n\t\tEditingUtils.setID(identifier, EnvironmentViewsRepository.Reference.Properties.identifier);\n\t\tEditingUtils.setEEFtype(identifier, \"eef::Checkbox\"); //$NON-NLS-1$\n\t\tSWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(EnvironmentViewsRepository.Reference.Properties.identifier, EnvironmentViewsRepository.SWT_KIND), null); //$NON-NLS-1$\n\t\t// Start of user code for createIdentifierCheckbox\n\n\t\t// End of user code\n\t\treturn parent;\n\t}\n\n\t\n\t * @see org.obeonetwork.dsl.environment.parts.ReferencePropertiesEditionPart#getReferencedType()\n\tpublic EObject getReferencedType() {\n\t\tif (referencedType.getSelection() instanceof StructuredSelection) {\n\t\t\tObject firstElement = ((StructuredSelection) referencedType.getSelection()).getFirstElement();\n\t * @see org.obeonetwork.dsl.environment.parts.ReferencePropertiesEditionPart#initReferencedType(EObjectFlatComboSettings)\n\tpublic void initReferencedType(EObjectFlatComboSettings settings) {\n\t\treferencedType.setInput(settings);\n\t\t\treferencedType.setSelection(new StructuredSelection(settings.getValue()));\n\t\tboolean eefElementEditorReadOnlyState = isReadOnly(EnvironmentViewsRepository.Reference.Properties.referencedType);\n\t\tif (eefElementEditorReadOnlyState && referencedType.isEnabled()) {\n\t\t\treferencedType.setEnabled(false);\n\t\t\treferencedType.setToolTipText(EnvironmentMessages.Reference_ReadOnly);\n\t\t} else if (!eefElementEditorReadOnlyState && !referencedType.isEnabled()) {\n\t\t\treferencedType.setEnabled(true);\n\t * @see org.obeonetwork.dsl.environment.parts.ReferencePropertiesEditionPart#setReferencedType(EObject newValue)\n\tpublic void setReferencedType(EObject newValue) {\n\t\t\treferencedType.setSelection(new StructuredSelection(newValue));\n\t\t\treferencedType.setSelection(new StructuredSelection()); //$NON-NLS-1$\n\t\tboolean eefElementEditorReadOnlyState = isReadOnly(EnvironmentViewsRepository.Reference.Properties.referencedType);\n\t\tif (eefElementEditorReadOnlyState && referencedType.isEnabled()) {\n\t\t\treferencedType.setEnabled(false);\n\t\t\treferencedType.setToolTipText(EnvironmentMessages.Reference_ReadOnly);\n\t\t} else if (!eefElementEditorReadOnlyState && !referencedType.isEnabled()) {\n\t\t\treferencedType.setEnabled(true);\n\t * @see org.obeonetwork.dsl.environment.parts.ReferencePropertiesEditionPart#setReferencedTypeButtonMode(ButtonsModeEnum newValue)\n\tpublic void setReferencedTypeButtonMode(ButtonsModeEnum newValue) {\n\t\treferencedType.setButtonMode(newValue);\n\t * @see org.obeonetwork.dsl.environment.parts.ReferencePropertiesEditionPart#addFilterReferencedType(ViewerFilter filter)\n\tpublic void addFilterToReferencedType(ViewerFilter filter) {\n\t\treferencedType.addFilter(filter);\n\t * @see org.obeonetwork.dsl.environment.parts.ReferencePropertiesEditionPart#addBusinessFilterReferencedType(ViewerFilter filter)\n\tpublic void addBusinessFilterToReferencedType(ViewerFilter filter) {\n\t\treferencedType.addBusinessRuleFilter(filter);\n\t/**\n\t * {@inheritDoc}\n\t * \n\t * @see org.obeonetwork.dsl.environment.parts.ReferencePropertiesEditionPart#getIdentifier()\n\t * \n\t */\n\tpublic Boolean getIdentifier() {\n\t\treturn Boolean.valueOf(identifier.getSelection());\n\t}\n\n\t/**\n\t * {@inheritDoc}\n\t * \n\t * @see org.obeonetwork.dsl.environment.parts.ReferencePropertiesEditionPart#setIdentifier(Boolean newValue)\n\t * \n\t */\n\tpublic void setIdentifier(Boolean newValue) {\n\t\tif (newValue != null) {\n\t\t\tidentifier.setSelection(newValue.booleanValue());\n\t\t} else {\n\t\t\tidentifier.setSelection(false);\n\t\t}\n\t\tboolean eefElementEditorReadOnlyState = isReadOnly(EnvironmentViewsRepository.Reference.Properties.identifier);\n\t\tif (eefElementEditorReadOnlyState && identifier.isEnabled()) {\n\t\t\tidentifier.setEnabled(false);\n\t\t\tidentifier.setToolTipText(EnvironmentMessages.Reference_ReadOnly);\n\t\t} else if (!eefElementEditorReadOnlyState && !identifier.isEnabled()) {\n\t\t\tidentifier.setEnabled(true);\n\t\t}\t\n\t\t\n\t}\n", "new_methods": [ { "arguments": [ "Composite parent" ], "filename": "models/environment/plugins/org.obeonetwork.dsl.environment.edit/src-gen/org/obeonetwork/dsl/environment/parts/impl/ReferencePropertiesEditionPartImpl.java", "implementation": "createDescription(parent, EnvironmentViewsRepository.Reference.Properties.referencedType, EnvironmentMessages.ReferencePropertiesEditionPart_ReferencedTypeLabel);\n\t\treferencedType = new EObjectFlatComboViewer(parent, !propertiesEditionComponent.isRequired(EnvironmentViewsRepository.Reference.Properties.referencedType, EnvironmentViewsRepository.SWT_KIND));\n\t\treferencedType.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));\n\t\treferencedType.addSelectionChangedListener(new ISelectionChangedListener() {\n\t\t\t\tpropertiesEditionComponent.firePropertiesChanged(new PropertiesEditionEvent(ReferencePropertiesEditionPartImpl.this, EnvironmentViewsRepository.Reference.Properties.referencedType, PropertiesEditionEvent.CHANGE, PropertiesEditionEvent.SET, null, getReferencedType()));\n\t\tGridData referencedTypeData = new GridData(GridData.FILL_HORIZONTAL);\n\t\treferencedType.setLayoutData(referencedTypeData);\n\t\treferencedType.setID(EnvironmentViewsRepository.Reference.Properties.referencedType);\n\t\tSWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(EnvironmentViewsRepository.Reference.Properties.referencedType, EnvironmentViewsRepository.SWT_KIND), null); //$NON-NLS-1$\n\t\t// Start of user code for createReferencedTypeFlatComboViewer\n\tprotected Composite createIdentifierCheckbox(Composite parent) {\n\t\tidentifier = new Button(parent, SWT.CHECK);\n\t\tidentifier.setText(getDescription(EnvironmentViewsRepository.Reference.Properties.identifier, EnvironmentMessages.ReferencePropertiesEditionPart_IdentifierLabel));\n\t\tidentifier.addSelectionListener(new SelectionAdapter() {\n\n\t\t\t/**\n\t\t\t * {@inheritDoc", "signature": "Composite createReferencedTypeFlatComboViewer(Composite parent)" }, { "arguments": [ "SelectionEvent e" ], "filename": "models/environment/plugins/org.obeonetwork.dsl.environment.edit/src-gen/org/obeonetwork/dsl/environment/parts/impl/ReferencePropertiesEditionPartImpl.java", "implementation": "if (propertiesEditionComponent != null)\n\t\t\t\t\tpropertiesEditionComponent.firePropertiesChanged(new PropertiesEditionEvent(ReferencePropertiesEditionPartImpl.this, EnvironmentViewsRepository.Reference.Properties.identifier, PropertiesEditionEvent.COMMIT, PropertiesEditionEvent.SET, null, new Boolean(identifier.getSelection())));", "signature": "void widgetSelected(SelectionEvent e)" }, { "arguments": [], "filename": "models/environment/plugins/org.obeonetwork.dsl.environment.edit/src-gen/org/obeonetwork/dsl/environment/parts/impl/ReferencePropertiesEditionPartImpl.java", "implementation": "if (referencedType.getSelection() instanceof StructuredSelection) {\n\t\t\tObject firstElement = ((StructuredSelection) referencedType.getSelection()).getFirstElement();\n\t * @see org.obeonetwork.dsl.environment.parts.ReferencePropertiesEditionPart#initReferencedType(EObjectFlatComboSettings)\n\tpublic void initReferencedType(EObjectFlatComboSettings settings) {\n\t\treferencedType.setInput(settings);\n\t\t\treferencedType.setSelection(new StructuredSelection(settings.getValue()));\n\t\tboolean eefElementEditorReadOnlyState = isReadOnly(EnvironmentViewsRepository.Reference.Properties.referencedType);\n\t\tif (eefElementEditorReadOnlyState && referencedType.isEnabled()) {\n\t\t\treferencedType.setEnabled(false);\n\t\t\treferencedType.setToolTipText(EnvironmentMessages.Reference_ReadOnly);", "signature": "EObject getReferencedType()" }, { "arguments": [ "EObject newValue" ], "filename": "models/environment/plugins/org.obeonetwork.dsl.environment.edit/src-gen/org/obeonetwork/dsl/environment/parts/impl/ReferencePropertiesEditionPartImpl.java", "implementation": "referencedType.setSelection(new StructuredSelection(newValue));\n\t\t\treferencedType.setSelection(new StructuredSelection()); //$NON-NLS-1$\n\t\tboolean eefElementEditorReadOnlyState = isReadOnly(EnvironmentViewsRepository.Reference.Properties.referencedType);\n\t\tif (eefElementEditorReadOnlyState && referencedType.isEnabled()) {\n\t\t\treferencedType.setEnabled(false);\n\t\t\treferencedType.setToolTipText(EnvironmentMessages.Reference_ReadOnly);", "signature": "void setReferencedType(EObject newValue)" }, { "arguments": [ "ButtonsModeEnum newValue" ], "filename": "models/environment/plugins/org.obeonetwork.dsl.environment.edit/src-gen/org/obeonetwork/dsl/environment/parts/impl/ReferencePropertiesEditionPartImpl.java", "implementation": "referencedType.setButtonMode(newValue);\n\t * @see org.obeonetwork.dsl.environment.parts.ReferencePropertiesEditionPart#addFilterReferencedType(ViewerFilter filter)\n\tpublic void addFilterToReferencedType(ViewerFilter filter) {\n\t\treferencedType.addFilter(filter);\n\t * @see org.obeonetwork.dsl.environment.parts.ReferencePropertiesEditionPart#addBusinessFilterReferencedType(ViewerFilter filter)\n\tpublic void addBusinessFilterToReferencedType(ViewerFilter filter) {\n\t\treferencedType.addBusinessRuleFilter(filter);\n\t/**\n\t * {@inheritDoc", "signature": "void setReferencedTypeButtonMode(ButtonsModeEnum newValue)" }, { "arguments": [], "filename": "models/environment/plugins/org.obeonetwork.dsl.environment.edit/src-gen/org/obeonetwork/dsl/environment/parts/impl/ReferencePropertiesEditionPartImpl.java", "implementation": "return Boolean.valueOf(identifier.getSelection());", "signature": "Boolean getIdentifier()" }, { "arguments": [ "Boolean newValue" ], "filename": "models/environment/plugins/org.obeonetwork.dsl.environment.edit/src-gen/org/obeonetwork/dsl/environment/parts/impl/ReferencePropertiesEditionPartImpl.java", "implementation": "if (newValue != null) {\n\t\t\tidentifier.setSelection(newValue.booleanValue());", "signature": "void setIdentifier(Boolean newValue)" } ], "old_code": "\tprotected EObjectFlatComboViewer type;\n\t\tpropertiesStep.addStep(EnvironmentViewsRepository.Reference.Properties.type);\n\t\t\t\tif (key == EnvironmentViewsRepository.Reference.Properties.type) {\n\t\t\t\t\treturn createTypeFlatComboViewer(parent);\n\tprotected Composite createTypeFlatComboViewer(Composite parent) {\n\t\tcreateDescription(parent, EnvironmentViewsRepository.Reference.Properties.type, EnvironmentMessages.ReferencePropertiesEditionPart_TypeLabel);\n\t\ttype = new EObjectFlatComboViewer(parent, !propertiesEditionComponent.isRequired(EnvironmentViewsRepository.Reference.Properties.type, EnvironmentViewsRepository.SWT_KIND));\n\t\ttype.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));\n\t\ttype.addSelectionChangedListener(new ISelectionChangedListener() {\n\t\t\t\tpropertiesEditionComponent.firePropertiesChanged(new PropertiesEditionEvent(ReferencePropertiesEditionPartImpl.this, EnvironmentViewsRepository.Reference.Properties.type, PropertiesEditionEvent.CHANGE, PropertiesEditionEvent.SET, null, getType()));\n\t\tGridData typeData = new GridData(GridData.FILL_HORIZONTAL);\n\t\ttype.setLayoutData(typeData);\n\t\ttype.setID(EnvironmentViewsRepository.Reference.Properties.type);\n\t\tSWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(EnvironmentViewsRepository.Reference.Properties.type, EnvironmentViewsRepository.SWT_KIND), null); //$NON-NLS-1$\n\t\t// Start of user code for createTypeFlatComboViewer\n\t * @see org.obeonetwork.dsl.environment.parts.ReferencePropertiesEditionPart#getType()\n\tpublic EObject getType() {\n\t\tif (type.getSelection() instanceof StructuredSelection) {\n\t\t\tObject firstElement = ((StructuredSelection) type.getSelection()).getFirstElement();\n\t * @see org.obeonetwork.dsl.environment.parts.ReferencePropertiesEditionPart#initType(EObjectFlatComboSettings)\n\tpublic void initType(EObjectFlatComboSettings settings) {\n\t\ttype.setInput(settings);\n\t\t\ttype.setSelection(new StructuredSelection(settings.getValue()));\n\t\tboolean eefElementEditorReadOnlyState = isReadOnly(EnvironmentViewsRepository.Reference.Properties.type);\n\t\tif (eefElementEditorReadOnlyState && type.isEnabled()) {\n\t\t\ttype.setEnabled(false);\n\t\t\ttype.setToolTipText(EnvironmentMessages.Reference_ReadOnly);\n\t\t} else if (!eefElementEditorReadOnlyState && !type.isEnabled()) {\n\t\t\ttype.setEnabled(true);\n\t * @see org.obeonetwork.dsl.environment.parts.ReferencePropertiesEditionPart#setType(EObject newValue)\n\tpublic void setType(EObject newValue) {\n\t\t\ttype.setSelection(new StructuredSelection(newValue));\n\t\t\ttype.setSelection(new StructuredSelection()); //$NON-NLS-1$\n\t\tboolean eefElementEditorReadOnlyState = isReadOnly(EnvironmentViewsRepository.Reference.Properties.type);\n\t\tif (eefElementEditorReadOnlyState && type.isEnabled()) {\n\t\t\ttype.setEnabled(false);\n\t\t\ttype.setToolTipText(EnvironmentMessages.Reference_ReadOnly);\n\t\t} else if (!eefElementEditorReadOnlyState && !type.isEnabled()) {\n\t\t\ttype.setEnabled(true);\n\t * @see org.obeonetwork.dsl.environment.parts.ReferencePropertiesEditionPart#setTypeButtonMode(ButtonsModeEnum newValue)\n\tpublic void setTypeButtonMode(ButtonsModeEnum newValue) {\n\t\ttype.setButtonMode(newValue);\n\t * @see org.obeonetwork.dsl.environment.parts.ReferencePropertiesEditionPart#addFilterType(ViewerFilter filter)\n\tpublic void addFilterToType(ViewerFilter filter) {\n\t\ttype.addFilter(filter);\n\t * @see org.obeonetwork.dsl.environment.parts.ReferencePropertiesEditionPart#addBusinessFilterType(ViewerFilter filter)\n\tpublic void addBusinessFilterToType(ViewerFilter filter) {\n\t\ttype.addBusinessRuleFilter(filter);", "old_methods": [ { "arguments": [ "Composite parent" ], "filename": "models/environment/plugins/org.obeonetwork.dsl.environment.edit/src-gen/org/obeonetwork/dsl/environment/parts/impl/ReferencePropertiesEditionPartImpl.java", "implementation": "createDescription(parent, EnvironmentViewsRepository.Reference.Properties.type, EnvironmentMessages.ReferencePropertiesEditionPart_TypeLabel);\n\t\ttype = new EObjectFlatComboViewer(parent, !propertiesEditionComponent.isRequired(EnvironmentViewsRepository.Reference.Properties.type, EnvironmentViewsRepository.SWT_KIND));\n\t\ttype.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));\n\t\ttype.addSelectionChangedListener(new ISelectionChangedListener() {\n\t\t\t\tpropertiesEditionComponent.firePropertiesChanged(new PropertiesEditionEvent(ReferencePropertiesEditionPartImpl.this, EnvironmentViewsRepository.Reference.Properties.type, PropertiesEditionEvent.CHANGE, PropertiesEditionEvent.SET, null, getType()));\n\t\tGridData typeData = new GridData(GridData.FILL_HORIZONTAL);\n\t\ttype.setLayoutData(typeData);\n\t\ttype.setID(EnvironmentViewsRepository.Reference.Properties.type);\n\t\tSWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(EnvironmentViewsRepository.Reference.Properties.type, EnvironmentViewsRepository.SWT_KIND), null); //$NON-NLS-1$\n\t\t// Start of user code for createTypeFlatComboViewer\n\t * @see org.obeonetwork.dsl.environment.parts.ReferencePropertiesEditionPart#getType()\n\tpublic EObject getType() {\n\t\tif (type.getSelection() instanceof StructuredSelection) {\n\t\t\tObject firstElement = ((StructuredSelection) type.getSelection()).getFirstElement();\n\t * @see org.obeonetwork.dsl.environment.parts.ReferencePropertiesEditionPart#initType(EObjectFlatComboSettings)\n\tpublic void initType(EObjectFlatComboSettings settings) {\n\t\ttype.setInput(settings);\n\t\t\ttype.setSelection(new StructuredSelection(settings.getValue()));\n\t\tboolean eefElementEditorReadOnlyState = isReadOnly(EnvironmentViewsRepository.Reference.Properties.type);\n\t\tif (eefElementEditorReadOnlyState && type.isEnabled()) {\n\t\t\ttype.setEnabled(false);\n\t\t\ttype.setToolTipText(EnvironmentMessages.Reference_ReadOnly);", "signature": "Composite createTypeFlatComboViewer(Composite parent)" }, { "arguments": [ "EObject newValue" ], "filename": "models/environment/plugins/org.obeonetwork.dsl.environment.edit/src-gen/org/obeonetwork/dsl/environment/parts/impl/ReferencePropertiesEditionPartImpl.java", "implementation": "type.setSelection(new StructuredSelection(newValue));\n\t\t\ttype.setSelection(new StructuredSelection()); //$NON-NLS-1$\n\t\tboolean eefElementEditorReadOnlyState = isReadOnly(EnvironmentViewsRepository.Reference.Properties.type);\n\t\tif (eefElementEditorReadOnlyState && type.isEnabled()) {\n\t\t\ttype.setEnabled(false);\n\t\t\ttype.setToolTipText(EnvironmentMessages.Reference_ReadOnly);", "signature": "void setType(EObject newValue)" } ], "patch": "@@ -54,11 +54,12 @@\n public class ReferencePropertiesEditionPartImpl extends CompositePropertiesEditionPart implements ISWTPropertiesEditionPart, ReferencePropertiesEditionPart {\n \n \tprotected Text name;\n-\tprotected EObjectFlatComboViewer type;\n+\tprotected EObjectFlatComboViewer referencedType;\n \tprotected EMFComboViewer multiplicity;\n \tprotected Button isComposite;\n \tprotected Button navigable;\n \tprotected EObjectFlatComboViewer oppositeOf;\n+\tprotected Button identifier;\n \tprotected Text description;\n \n \n@@ -99,11 +100,12 @@ public void createControls(Composite view) {\n \t\tCompositionSequence referenceStep = new BindingCompositionSequence(propertiesEditionComponent);\n \t\tCompositionStep propertiesStep = referenceStep.addStep(EnvironmentViewsRepository.Reference.Properties.class);\n \t\tpropertiesStep.addStep(EnvironmentViewsRepository.Reference.Properties.name);\n-\t\tpropertiesStep.addStep(EnvironmentViewsRepository.Reference.Properties.type);\n+\t\tpropertiesStep.addStep(EnvironmentViewsRepository.Reference.Properties.referencedType);\n \t\tpropertiesStep.addStep(EnvironmentViewsRepository.Reference.Properties.multiplicity);\n \t\tpropertiesStep.addStep(EnvironmentViewsRepository.Reference.Properties.isComposite);\n \t\tpropertiesStep.addStep(EnvironmentViewsRepository.Reference.Properties.navigable);\n \t\tpropertiesStep.addStep(EnvironmentViewsRepository.Reference.Properties.oppositeOf);\n+\t\tpropertiesStep.addStep(EnvironmentViewsRepository.Reference.Properties.identifier);\n \t\tpropertiesStep.addStep(EnvironmentViewsRepository.Reference.Properties.description);\n \t\t\n \t\t\n@@ -117,8 +119,8 @@ public Composite addToPart(Composite parent, Object key) {\n \t\t\t\tif (key == EnvironmentViewsRepository.Reference.Properties.name) {\n \t\t\t\t\treturn createNameText(parent);\n \t\t\t\t}\n-\t\t\t\tif (key == EnvironmentViewsRepository.Reference.Properties.type) {\n-\t\t\t\t\treturn createTypeFlatComboViewer(parent);\n+\t\t\t\tif (key == EnvironmentViewsRepository.Reference.Properties.referencedType) {\n+\t\t\t\t\treturn createReferencedTypeFlatComboViewer(parent);\n \t\t\t\t}\n \t\t\t\tif (key == EnvironmentViewsRepository.Reference.Properties.multiplicity) {\n \t\t\t\t\treturn createMultiplicityEMFComboViewer(parent);\n@@ -132,6 +134,9 @@ public Composite addToPart(Composite parent, Object key) {\n \t\t\t\tif (key == EnvironmentViewsRepository.Reference.Properties.oppositeOf) {\n \t\t\t\t\treturn createOppositeOfFlatComboViewer(parent);\n \t\t\t\t}\n+\t\t\t\tif (key == EnvironmentViewsRepository.Reference.Properties.identifier) {\n+\t\t\t\t\treturn createIdentifierCheckbox(parent);\n+\t\t\t\t}\n \t\t\t\tif (key == EnvironmentViewsRepository.Reference.Properties.description) {\n \t\t\t\t\treturn createDescriptionText(parent);\n \t\t\t\t}\n@@ -209,23 +214,23 @@ public void keyPressed(KeyEvent e) {\n \t * @param parent the parent composite\n \t * \n \t */\n-\tprotected Composite createTypeFlatComboViewer(Composite parent) {\n-\t\tcreateDescription(parent, EnvironmentViewsRepository.Reference.Properties.type, EnvironmentMessages.ReferencePropertiesEditionPart_TypeLabel);\n-\t\ttype = new EObjectFlatComboViewer(parent, !propertiesEditionComponent.isRequired(EnvironmentViewsRepository.Reference.Properties.type, EnvironmentViewsRepository.SWT_KIND));\n-\t\ttype.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));\n+\tprotected Composite createReferencedTypeFlatComboViewer(Composite parent) {\n+\t\tcreateDescription(parent, EnvironmentViewsRepository.Reference.Properties.referencedType, EnvironmentMessages.ReferencePropertiesEditionPart_ReferencedTypeLabel);\n+\t\treferencedType = new EObjectFlatComboViewer(parent, !propertiesEditionComponent.isRequired(EnvironmentViewsRepository.Reference.Properties.referencedType, EnvironmentViewsRepository.SWT_KIND));\n+\t\treferencedType.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));\n \n-\t\ttype.addSelectionChangedListener(new ISelectionChangedListener() {\n+\t\treferencedType.addSelectionChangedListener(new ISelectionChangedListener() {\n \n \t\t\tpublic void selectionChanged(SelectionChangedEvent event) {\n-\t\t\t\tpropertiesEditionComponent.firePropertiesChanged(new PropertiesEditionEvent(ReferencePropertiesEditionPartImpl.this, EnvironmentViewsRepository.Reference.Properties.type, PropertiesEditionEvent.CHANGE, PropertiesEditionEvent.SET, null, getType()));\n+\t\t\t\tpropertiesEditionComponent.firePropertiesChanged(new PropertiesEditionEvent(ReferencePropertiesEditionPartImpl.this, EnvironmentViewsRepository.Reference.Properties.referencedType, PropertiesEditionEvent.CHANGE, PropertiesEditionEvent.SET, null, getReferencedType()));\n \t\t\t}\n \n \t\t});\n-\t\tGridData typeData = new GridData(GridData.FILL_HORIZONTAL);\n-\t\ttype.setLayoutData(typeData);\n-\t\ttype.setID(EnvironmentViewsRepository.Reference.Properties.type);\n-\t\tSWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(EnvironmentViewsRepository.Reference.Properties.type, EnvironmentViewsRepository.SWT_KIND), null); //$NON-NLS-1$\n-\t\t// Start of user code for createTypeFlatComboViewer\n+\t\tGridData referencedTypeData = new GridData(GridData.FILL_HORIZONTAL);\n+\t\treferencedType.setLayoutData(referencedTypeData);\n+\t\treferencedType.setID(EnvironmentViewsRepository.Reference.Properties.referencedType);\n+\t\tSWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(EnvironmentViewsRepository.Reference.Properties.referencedType, EnvironmentViewsRepository.SWT_KIND), null); //$NON-NLS-1$\n+\t\t// Start of user code for createReferencedTypeFlatComboViewer\n \n \t\t// End of user code\n \t\treturn parent;\n@@ -348,6 +353,36 @@ public void selectionChanged(SelectionChangedEvent event) {\n \t}\n \n \t\n+\tprotected Composite createIdentifierCheckbox(Composite parent) {\n+\t\tidentifier = new Button(parent, SWT.CHECK);\n+\t\tidentifier.setText(getDescription(EnvironmentViewsRepository.Reference.Properties.identifier, EnvironmentMessages.ReferencePropertiesEditionPart_IdentifierLabel));\n+\t\tidentifier.addSelectionListener(new SelectionAdapter() {\n+\n+\t\t\t/**\n+\t\t\t * {@inheritDoc}\n+\t\t\t *\n+\t\t\t * @see org.eclipse.swt.events.SelectionAdapter#widgetSelected(org.eclipse.swt.events.SelectionEvent)\n+\t\t\t * \t\n+\t\t\t */\n+\t\t\tpublic void widgetSelected(SelectionEvent e) {\n+\t\t\t\tif (propertiesEditionComponent != null)\n+\t\t\t\t\tpropertiesEditionComponent.firePropertiesChanged(new PropertiesEditionEvent(ReferencePropertiesEditionPartImpl.this, EnvironmentViewsRepository.Reference.Properties.identifier, PropertiesEditionEvent.COMMIT, PropertiesEditionEvent.SET, null, new Boolean(identifier.getSelection())));\n+\t\t\t}\n+\n+\t\t});\n+\t\tGridData identifierData = new GridData(GridData.FILL_HORIZONTAL);\n+\t\tidentifierData.horizontalSpan = 2;\n+\t\tidentifier.setLayoutData(identifierData);\n+\t\tEditingUtils.setID(identifier, EnvironmentViewsRepository.Reference.Properties.identifier);\n+\t\tEditingUtils.setEEFtype(identifier, \"eef::Checkbox\"); //$NON-NLS-1$\n+\t\tSWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(EnvironmentViewsRepository.Reference.Properties.identifier, EnvironmentViewsRepository.SWT_KIND), null); //$NON-NLS-1$\n+\t\t// Start of user code for createIdentifierCheckbox\n+\n+\t\t// End of user code\n+\t\treturn parent;\n+\t}\n+\n+\t\n \tprotected Composite createDescriptionText(Composite parent) {\n \t\tcreateDescription(parent, EnvironmentViewsRepository.Reference.Properties.description, EnvironmentMessages.ReferencePropertiesEditionPart_DescriptionLabel);\n \t\tdescription = SWTUtils.createScrollableText(parent, SWT.BORDER);\n@@ -444,12 +479,12 @@ public void setName(String newValue) {\n \t/**\n \t * {@inheritDoc}\n \t * \n-\t * @see org.obeonetwork.dsl.environment.parts.ReferencePropertiesEditionPart#getType()\n+\t * @see org.obeonetwork.dsl.environment.parts.ReferencePropertiesEditionPart#getReferencedType()\n \t * \n \t */\n-\tpublic EObject getType() {\n-\t\tif (type.getSelection() instanceof StructuredSelection) {\n-\t\t\tObject firstElement = ((StructuredSelection) type.getSelection()).getFirstElement();\n+\tpublic EObject getReferencedType() {\n+\t\tif (referencedType.getSelection() instanceof StructuredSelection) {\n+\t\t\tObject firstElement = ((StructuredSelection) referencedType.getSelection()).getFirstElement();\n \t\t\tif (firstElement instanceof EObject)\n \t\t\t\treturn (EObject) firstElement;\n \t\t}\n@@ -459,72 +494,72 @@ public EObject getType() {\n \t/**\n \t * {@inheritDoc}\n \t * \n-\t * @see org.obeonetwork.dsl.environment.parts.ReferencePropertiesEditionPart#initType(EObjectFlatComboSettings)\n+\t * @see org.obeonetwork.dsl.environment.parts.ReferencePropertiesEditionPart#initReferencedType(EObjectFlatComboSettings)\n \t */\n-\tpublic void initType(EObjectFlatComboSettings settings) {\n-\t\ttype.setInput(settings);\n+\tpublic void initReferencedType(EObjectFlatComboSettings settings) {\n+\t\treferencedType.setInput(settings);\n \t\tif (current != null) {\n-\t\t\ttype.setSelection(new StructuredSelection(settings.getValue()));\n+\t\t\treferencedType.setSelection(new StructuredSelection(settings.getValue()));\n \t\t}\n-\t\tboolean eefElementEditorReadOnlyState = isReadOnly(EnvironmentViewsRepository.Reference.Properties.type);\n-\t\tif (eefElementEditorReadOnlyState && type.isEnabled()) {\n-\t\t\ttype.setEnabled(false);\n-\t\t\ttype.setToolTipText(EnvironmentMessages.Reference_ReadOnly);\n-\t\t} else if (!eefElementEditorReadOnlyState && !type.isEnabled()) {\n-\t\t\ttype.setEnabled(true);\n+\t\tboolean eefElementEditorReadOnlyState = isReadOnly(EnvironmentViewsRepository.Reference.Properties.referencedType);\n+\t\tif (eefElementEditorReadOnlyState && referencedType.isEnabled()) {\n+\t\t\treferencedType.setEnabled(false);\n+\t\t\treferencedType.setToolTipText(EnvironmentMessages.Reference_ReadOnly);\n+\t\t} else if (!eefElementEditorReadOnlyState && !referencedType.isEnabled()) {\n+\t\t\treferencedType.setEnabled(true);\n \t\t}\t\n \t\t\n \t}\n \n \t/**\n \t * {@inheritDoc}\n \t * \n-\t * @see org.obeonetwork.dsl.environment.parts.ReferencePropertiesEditionPart#setType(EObject newValue)\n+\t * @see org.obeonetwork.dsl.environment.parts.ReferencePropertiesEditionPart#setReferencedType(EObject newValue)\n \t * \n \t */\n-\tpublic void setType(EObject newValue) {\n+\tpublic void setReferencedType(EObject newValue) {\n \t\tif (newValue != null) {\n-\t\t\ttype.setSelection(new StructuredSelection(newValue));\n+\t\t\treferencedType.setSelection(new StructuredSelection(newValue));\n \t\t} else {\n-\t\t\ttype.setSelection(new StructuredSelection()); //$NON-NLS-1$\n+\t\t\treferencedType.setSelection(new StructuredSelection()); //$NON-NLS-1$\n \t\t}\n-\t\tboolean eefElementEditorReadOnlyState = isReadOnly(EnvironmentViewsRepository.Reference.Properties.type);\n-\t\tif (eefElementEditorReadOnlyState && type.isEnabled()) {\n-\t\t\ttype.setEnabled(false);\n-\t\t\ttype.setToolTipText(EnvironmentMessages.Reference_ReadOnly);\n-\t\t} else if (!eefElementEditorReadOnlyState && !type.isEnabled()) {\n-\t\t\ttype.setEnabled(true);\n+\t\tboolean eefElementEditorReadOnlyState = isReadOnly(EnvironmentViewsRepository.Reference.Properties.referencedType);\n+\t\tif (eefElementEditorReadOnlyState && referencedType.isEnabled()) {\n+\t\t\treferencedType.setEnabled(false);\n+\t\t\treferencedType.setToolTipText(EnvironmentMessages.Reference_ReadOnly);\n+\t\t} else if (!eefElementEditorReadOnlyState && !referencedType.isEnabled()) {\n+\t\t\treferencedType.setEnabled(true);\n \t\t}\t\n \t\t\n \t}\n \n \t/**\n \t * {@inheritDoc}\n \t * \n-\t * @see org.obeonetwork.dsl.environment.parts.ReferencePropertiesEditionPart#setTypeButtonMode(ButtonsModeEnum newValue)\n+\t * @see org.obeonetwork.dsl.environment.parts.ReferencePropertiesEditionPart#setReferencedTypeButtonMode(ButtonsModeEnum newValue)\n \t */\n-\tpublic void setTypeButtonMode(ButtonsModeEnum newValue) {\n-\t\ttype.setButtonMode(newValue);\n+\tpublic void setReferencedTypeButtonMode(ButtonsModeEnum newValue) {\n+\t\treferencedType.setButtonMode(newValue);\n \t}\n \n \t/**\n \t * {@inheritDoc}\n \t * \n-\t * @see org.obeonetwork.dsl.environment.parts.ReferencePropertiesEditionPart#addFilterType(ViewerFilter filter)\n+\t * @see org.obeonetwork.dsl.environment.parts.ReferencePropertiesEditionPart#addFilterReferencedType(ViewerFilter filter)\n \t * \n \t */\n-\tpublic void addFilterToType(ViewerFilter filter) {\n-\t\ttype.addFilter(filter);\n+\tpublic void addFilterToReferencedType(ViewerFilter filter) {\n+\t\treferencedType.addFilter(filter);\n \t}\n \n \t/**\n \t * {@inheritDoc}\n \t * \n-\t * @see org.obeonetwork.dsl.environment.parts.ReferencePropertiesEditionPart#addBusinessFilterType(ViewerFilter filter)\n+\t * @see org.obeonetwork.dsl.environment.parts.ReferencePropertiesEditionPart#addBusinessFilterReferencedType(ViewerFilter filter)\n \t * \n \t */\n-\tpublic void addBusinessFilterToType(ViewerFilter filter) {\n-\t\ttype.addBusinessRuleFilter(filter);\n+\tpublic void addBusinessFilterToReferencedType(ViewerFilter filter) {\n+\t\treferencedType.addBusinessRuleFilter(filter);\n \t}\n \n \t/**\n@@ -724,6 +759,38 @@ public void addBusinessFilterToOppositeOf(ViewerFilter filter) {\n \t\toppositeOf.addBusinessRuleFilter(filter);\n \t}\n \n+\t/**\n+\t * {@inheritDoc}\n+\t * \n+\t * @see org.obeonetwork.dsl.environment.parts.ReferencePropertiesEditionPart#getIdentifier()\n+\t * \n+\t */\n+\tpublic Boolean getIdentifier() {\n+\t\treturn Boolean.valueOf(identifier.getSelection());\n+\t}\n+\n+\t/**\n+\t * {@inheritDoc}\n+\t * \n+\t * @see org.obeonetwork.dsl.environment.parts.ReferencePropertiesEditionPart#setIdentifier(Boolean newValue)\n+\t * \n+\t */\n+\tpublic void setIdentifier(Boolean newValue) {\n+\t\tif (newValue != null) {\n+\t\t\tidentifier.setSelection(newValue.booleanValue());\n+\t\t} else {\n+\t\t\tidentifier.setSelection(false);\n+\t\t}\n+\t\tboolean eefElementEditorReadOnlyState = isReadOnly(EnvironmentViewsRepository.Reference.Properties.identifier);\n+\t\tif (eefElementEditorReadOnlyState && identifier.isEnabled()) {\n+\t\t\tidentifier.setEnabled(false);\n+\t\t\tidentifier.setToolTipText(EnvironmentMessages.Reference_ReadOnly);\n+\t\t} else if (!eefElementEditorReadOnlyState && !identifier.isEnabled()) {\n+\t\t\tidentifier.setEnabled(true);\n+\t\t}\t\n+\t\t\n+\t}\n+\n \t/**\n \t * {@inheritDoc}\n \t * ", "raw_url": "https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fsrc-gen%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2Fparts%2Fimpl%2FReferencePropertiesEditionPartImpl.java", "sha": "37b0eadf92480642ece3654a5fbdb9a770a9b13c", "status": "modified" }, { "additions": 10, "blob_url": "https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fsrc-gen%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2Fproviders%2FEnvironmentEEFAdapterFactory.java", "changes": 10, "contents_url": "https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fsrc-gen%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2Fproviders%2FEnvironmentEEFAdapterFactory.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6", "deletions": 0, "filename": "models/environment/plugins/org.obeonetwork.dsl.environment.edit/src-gen/org/obeonetwork/dsl/environment/providers/EnvironmentEEFAdapterFactory.java", "new_code": "\t/**\n\t * {@inheritDoc}\n\t * @see org.obeonetwork.dsl.environment.util.EnvironmentAdapterFactory#createDTOAdapter()\n\t * \n\t */\n\tpublic Adapter createDTOAdapter() {\n\t\tList<PropertiesEditingProvider> providers = new ArrayList<PropertiesEditingProvider>(1);\n\t\tproviders.add((PropertiesEditingProvider)createObeoDSMObjectAdapter());\n\t\treturn new DTOPropertiesEditionProvider(providers);\n\t}", "new_methods": [ { "arguments": [], "filename": "models/environment/plugins/org.obeonetwork.dsl.environment.edit/src-gen/org/obeonetwork/dsl/environment/providers/EnvironmentEEFAdapterFactory.java", "implementation": "List<PropertiesEditingProvider> providers = new ArrayList<PropertiesEditingProvider>(1);\n\t\tproviders.add((PropertiesEditingProvider)createObeoDSMObjectAdapter());\n\t\treturn new DTOPropertiesEditionProvider(providers);", "signature": "Adapter createDTOAdapter()" } ], "old_code": "", "old_methods": [], "patch": "@@ -114,6 +114,16 @@ public Adapter createTypesDefinitionAdapter() {\n \t\tproviders.add((PropertiesEditingProvider)createObeoDSMObjectAdapter());\n \t\treturn new TypesDefinitionPropertiesEditionProvider(providers);\n \t}\n+\t/**\n+\t * {@inheritDoc}\n+\t * @see org.obeonetwork.dsl.environment.util.EnvironmentAdapterFactory#createDTOAdapter()\n+\t * \n+\t */\n+\tpublic Adapter createDTOAdapter() {\n+\t\tList<PropertiesEditingProvider> providers = new ArrayList<PropertiesEditingProvider>(1);\n+\t\tproviders.add((PropertiesEditingProvider)createObeoDSMObjectAdapter());\n+\t\treturn new DTOPropertiesEditionProvider(providers);\n+\t}\n \t/**\n \t * {@inheritDoc}\n \t * @see org.obeonetwork.dsl.environment.util.EnvironmentAdapterFactory#createFilterContainerAdapter()", "raw_url": "https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fsrc-gen%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2Fproviders%2FEnvironmentEEFAdapterFactory.java", "sha": "a64e1e1ebdbb344c4d30bba12e22b2d4dacc3b5e", "status": "modified" }, { "additions": 28, "blob_url": "https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fsrc-gen%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2Fproviders%2FEnvironmentMessages.java", "changes": 29, "contents_url": "https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fsrc-gen%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2Fproviders%2FEnvironmentMessages.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6", "deletions": 1, "filename": "models/environment/plugins/org.obeonetwork.dsl.environment.edit/src-gen/org/obeonetwork/dsl/environment/providers/EnvironmentMessages.java", "new_code": "\t\n\tpublic static String DTOPropertiesEditionPart_PropertiesGroupLabel;\n\n\t\n\tpublic static String DTO_ReadOnly;\n\n\t\n\tpublic static String DTO_Part_Title;\n\n\tpublic static String AttributePropertiesEditionPart_IdentifierLabel;\n\n\t\n\tpublic static String ReferencePropertiesEditionPart_ReferencedTypeLabel;\n\tpublic static String ReferencePropertiesEditionPart_IdentifierLabel;\n\n\t\n\t\n\tpublic static String DTOPropertiesEditionPart_NameLabel;\n\n\t\n\tpublic static String DTOPropertiesEditionPart_SupertypeLabel;\n\n\t\n\tpublic static String DTOPropertiesEditionPart_AssociatedTypesLabel;\n\n\t\n\tpublic static String DTOPropertiesEditionPart_DescriptionLabel;\n", "new_methods": [], "old_code": "\tpublic static String ReferencePropertiesEditionPart_TypeLabel;", "old_methods": [], "patch": "@@ -64,6 +64,9 @@ public class EnvironmentMessages extends NLS {\n \t\n \tpublic static String BindingElementPropertiesEditionPart_PropertiesGroupLabel;\n \n+\t\n+\tpublic static String DTOPropertiesEditionPart_PropertiesGroupLabel;\n+\n \n \t\n \tpublic static String Environment_ReadOnly;\n@@ -167,6 +170,12 @@ public class EnvironmentMessages extends NLS {\n \t\n \tpublic static String BindingElement_Part_Title;\n \n+\t\n+\tpublic static String DTO_ReadOnly;\n+\n+\t\n+\tpublic static String DTO_Part_Title;\n+\n \n \t\n \tpublic static String EnvironmentPropertiesEditionPart_NameLabel;\n@@ -241,13 +250,16 @@ public class EnvironmentMessages extends NLS {\n \tpublic static String AttributePropertiesEditionPart_MultiplicityLabel;\n \n \t\n+\tpublic static String AttributePropertiesEditionPart_IdentifierLabel;\n+\n+\t\n \tpublic static String AttributePropertiesEditionPart_DescriptionLabel;\n \n \t\n \tpublic static String ReferencePropertiesEditionPart_NameLabel;\n \n \t\n-\tpublic static String ReferencePropertiesEditionPart_TypeLabel;\n+\tpublic static String ReferencePropertiesEditionPart_ReferencedTypeLabel;\n \n \t\n \tpublic static String ReferencePropertiesEditionPart_MultiplicityLabel;\n@@ -262,6 +274,9 @@ public class EnvironmentMessages extends NLS {\n \tpublic static String ReferencePropertiesEditionPart_OppositeOfLabel;\n \n \t\n+\tpublic static String ReferencePropertiesEditionPart_IdentifierLabel;\n+\n+\t\n \tpublic static String ReferencePropertiesEditionPart_DescriptionLabel;\n \n \t\n@@ -294,6 +309,18 @@ public class EnvironmentMessages extends NLS {\n \t\n \tpublic static String BindingElementPropertiesEditionPart_DescriptionLabel;\n \n+\t\n+\tpublic static String DTOPropertiesEditionPart_NameLabel;\n+\n+\t\n+\tpublic static String DTOPropertiesEditionPart_SupertypeLabel;\n+\n+\t\n+\tpublic static String DTOPropertiesEditionPart_AssociatedTypesLabel;\n+\n+\t\n+\tpublic static String DTOPropertiesEditionPart_DescriptionLabel;\n+\n \n \t\n \tpublic static String PropertiesEditionPart_DocumentationLabel;", "raw_url": "https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fsrc-gen%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2Fproviders%2FEnvironmentMessages.java", "sha": "b1321030c678e24fd8ab99a53421e0f0bc0739e3", "status": "modified" }, { "additions": 8, "blob_url": "https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fsrc-gen%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2Fproviders%2FEnvironmentPropertiesEditionPartProvider.java", "changes": 8, "contents_url": "https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fsrc-gen%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2Fproviders%2FEnvironmentPropertiesEditionPartProvider.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6", "deletions": 0, "filename": "models/environment/plugins/org.obeonetwork.dsl.environment.edit/src-gen/org/obeonetwork/dsl/environment/providers/EnvironmentPropertiesEditionPartProvider.java", "new_code": "import org.obeonetwork.dsl.environment.parts.forms.DTOPropertiesEditionPartForm;\nimport org.obeonetwork.dsl.environment.parts.impl.DTOPropertiesEditionPartImpl;\n\t\tif (key == EnvironmentViewsRepository.DTO.class) {\n\t\t\tif (kind == EnvironmentViewsRepository.SWT_KIND)\n\t\t\t\treturn new DTOPropertiesEditionPartImpl(component);\n\t\t\tif (kind == EnvironmentViewsRepository.FORM_KIND)\n\t\t\t\treturn new DTOPropertiesEditionPartForm(component);\n\t\t}", "new_methods": [], "old_code": "", "old_methods": [], "patch": "@@ -16,6 +16,7 @@\n import org.obeonetwork.dsl.environment.parts.forms.BindingElementPropertiesEditionPartForm;\n import org.obeonetwork.dsl.environment.parts.forms.BindingInfoPropertiesEditionPartForm;\n import org.obeonetwork.dsl.environment.parts.forms.BindingReferencePropertiesEditionPartForm;\n+import org.obeonetwork.dsl.environment.parts.forms.DTOPropertiesEditionPartForm;\n import org.obeonetwork.dsl.environment.parts.forms.EnumerationPropertiesEditionPartForm;\n import org.obeonetwork.dsl.environment.parts.forms.EnvironmentPropertiesEditionPartForm;\n import org.obeonetwork.dsl.environment.parts.forms.FieldPropertiesEditionPartForm;\n@@ -34,6 +35,7 @@\n import org.obeonetwork.dsl.environment.parts.impl.BindingElementPropertiesEditionPartImpl;\n import org.obeonetwork.dsl.environment.parts.impl.BindingInfoPropertiesEditionPartImpl;\n import org.obeonetwork.dsl.environment.parts.impl.BindingReferencePropertiesEditionPartImpl;\n+import org.obeonetwork.dsl.environment.parts.impl.DTOPropertiesEditionPartImpl;\n import org.obeonetwork.dsl.environment.parts.impl.EnumerationPropertiesEditionPartImpl;\n import org.obeonetwork.dsl.environment.parts.impl.EnvironmentPropertiesEditionPartImpl;\n import org.obeonetwork.dsl.environment.parts.impl.FieldPropertiesEditionPartImpl;\n@@ -170,6 +172,12 @@ public IPropertiesEditionPart getPropertiesEditionPart(Object key, int kind, IPr\n \t\t\tif (kind == EnvironmentViewsRepository.FORM_KIND)\n \t\t\t\treturn new BindingElementPropertiesEditionPartForm(component);\n \t\t}\n+\t\tif (key == EnvironmentViewsRepository.DTO.class) {\n+\t\t\tif (kind == EnvironmentViewsRepository.SWT_KIND)\n+\t\t\t\treturn new DTOPropertiesEditionPartImpl(component);\n+\t\t\tif (kind == EnvironmentViewsRepository.FORM_KIND)\n+\t\t\t\treturn new DTOPropertiesEditionPartForm(component);\n+\t\t}\n \t\treturn null;\n \t}\n ", "raw_url": "https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fsrc-gen%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2Fproviders%2FEnvironmentPropertiesEditionPartProvider.java", "sha": "1385a20260f0557f20ef3d8edd1ca2917a23e3da", "status": "modified" }, { "additions": 10, "blob_url": "https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fsrc-gen%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2Fproviders%2FenvironmentMessages.properties", "changes": 11, "contents_url": "https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fsrc-gen%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2Fproviders%2FenvironmentMessages.properties?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6", "deletions": 1, "filename": "models/environment/plugins/org.obeonetwork.dsl.environment.edit/src-gen/org/obeonetwork/dsl/environment/providers/environmentMessages.properties", "new_code": "DTOPropertiesEditionPart_PropertiesGroupLabel=Properties\nDTO_ReadOnly=This property is read only\nDTO_Part_Title=Base\nAttributePropertiesEditionPart_IdentifierLabel=Identifier\nReferencePropertiesEditionPart_ReferencedTypeLabel=ReferencedType : \nReferencePropertiesEditionPart_IdentifierLabel=Identifier\nDTOPropertiesEditionPart_NameLabel=Name : \nDTOPropertiesEditionPart_SupertypeLabel=Supertype : \nDTOPropertiesEditionPart_AssociatedTypesLabel=AssociatedTypes : \nDTOPropertiesEditionPart_DescriptionLabel=Description : ", "new_methods": [], "old_code": "ReferencePropertiesEditionPart_TypeLabel=Type : ", "old_methods": [], "patch": "@@ -24,6 +24,7 @@ MetadatasPropertiesEditionPart_PropertiesGroupLabel=Properties\n BindingInfoPropertiesEditionPart_PropertiesGroupLabel=Properties\n BindingReferencePropertiesEditionPart_PropertiesGroupLabel=Properties\n BindingElementPropertiesEditionPart_PropertiesGroupLabel=Properties\n+DTOPropertiesEditionPart_PropertiesGroupLabel=Properties\n Environment_ReadOnly=This property is read only\n Environment_Part_Title=Environment\n PrimitiveType_ReadOnly=This property is read only\n@@ -58,6 +59,8 @@ BindingReference_ReadOnly=This property is read only\n BindingReference_Part_Title=BindingReference\n BindingElement_ReadOnly=This property is read only\n BindingElement_Part_Title=BindingElement\n+DTO_ReadOnly=This property is read only\n+DTO_Part_Title=Base\n EnvironmentPropertiesEditionPart_NameLabel=Name : \n EnvironmentPropertiesEditionPart_DescriptionLabel=Description : \n PrimitiveTypePropertiesEditionPart_NameLabel=Name : \n@@ -82,13 +85,15 @@ NamespacePropertiesEditionPart_DescriptionLabel=Description :\n AttributePropertiesEditionPart_NameLabel=Name : \n AttributePropertiesEditionPart_TypeLabel=Type : \n AttributePropertiesEditionPart_MultiplicityLabel=Multiplicity : \n+AttributePropertiesEditionPart_IdentifierLabel=Identifier\n AttributePropertiesEditionPart_DescriptionLabel=Description : \n ReferencePropertiesEditionPart_NameLabel=Name : \n-ReferencePropertiesEditionPart_TypeLabel=Type : \n+ReferencePropertiesEditionPart_ReferencedTypeLabel=ReferencedType : \n ReferencePropertiesEditionPart_MultiplicityLabel=Multiplicity : \n ReferencePropertiesEditionPart_IsCompositeLabel=IsComposite\n ReferencePropertiesEditionPart_NavigableLabel=Navigable\n ReferencePropertiesEditionPart_OppositeOfLabel=OppositeOf : \n+ReferencePropertiesEditionPart_IdentifierLabel=Identifier\n ReferencePropertiesEditionPart_DescriptionLabel=Description : \n MetadatasPropertiesEditionPart_MetadataLabel=Metadata : \n BindingInfoPropertiesEditionPart_LeftLabel=Left : \n@@ -100,6 +105,10 @@ BindingReferencePropertiesEditionPart_DescriptionLabel=Description :\n BindingElementPropertiesEditionPart_BoundElementLabel=BoundElement : \n BindingElementPropertiesEditionPart_BindingExpressionLabel=BindingExpression : \n BindingElementPropertiesEditionPart_DescriptionLabel=Description : \n+DTOPropertiesEditionPart_NameLabel=Name : \n+DTOPropertiesEditionPart_SupertypeLabel=Supertype : \n+DTOPropertiesEditionPart_AssociatedTypesLabel=AssociatedTypes : \n+DTOPropertiesEditionPart_DescriptionLabel=Description : \n PropertiesEditionPart_PropertiesGroupLabel=Properties\n PropertiesEditionPart_EditTableViewerLabel=Edit\n PropertiesEditionPart_DocumentationLabel=Documentation", "raw_url": "https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fsrc-gen%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2Fproviders%2FenvironmentMessages.properties", "sha": "28dab2df2a7081dc6267d84b3ea828f8f61b586d", "status": "modified" }, { "additions": 10, "blob_url": "https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fsrc-gen%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2Fproviders%2FenvironmentMessages_fr.properties", "changes": 11, "contents_url": "https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fsrc-gen%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2Fproviders%2FenvironmentMessages_fr.properties?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6", "deletions": 1, "filename": "models/environment/plugins/org.obeonetwork.dsl.environment.edit/src-gen/org/obeonetwork/dsl/environment/providers/environmentMessages_fr.properties", "new_code": "DTOPropertiesEditionPart_PropertiesGroupLabel=Properties\nDTO_ReadOnly=Cette propri\\u00E9t\\u00E9 est en lecture seule\nDTO_Part_Title=Base\nAttributePropertiesEditionPart_IdentifierLabel=Identifier\nReferencePropertiesEditionPart_ReferencedTypeLabel=ReferencedType : \nReferencePropertiesEditionPart_IdentifierLabel=Identifier\nDTOPropertiesEditionPart_NameLabel=Name : \nDTOPropertiesEditionPart_SupertypeLabel=Supertype : \nDTOPropertiesEditionPart_AssociatedTypesLabel=AssociatedTypes : \nDTOPropertiesEditionPart_DescriptionLabel=Description : ", "new_methods": [], "old_code": "ReferencePropertiesEditionPart_TypeLabel=Type : ", "old_methods": [], "patch": "@@ -24,6 +24,7 @@ MetadatasPropertiesEditionPart_PropertiesGroupLabel=Properties\n BindingInfoPropertiesEditionPart_PropertiesGroupLabel=Properties\n BindingReferencePropertiesEditionPart_PropertiesGroupLabel=Properties\n BindingElementPropertiesEditionPart_PropertiesGroupLabel=Properties\n+DTOPropertiesEditionPart_PropertiesGroupLabel=Properties\n Environment_ReadOnly=Cette propri\\u00E9t\\u00E9 est en lecture seule\n Environment_Part_Title=Environment\n PrimitiveType_ReadOnly=Cette propri\\u00E9t\\u00E9 est en lecture seule\n@@ -58,6 +59,8 @@ BindingReference_ReadOnly=Cette propri\\u00E9t\\u00E9 est en lecture seule\n BindingReference_Part_Title=BindingReference\n BindingElement_ReadOnly=Cette propri\\u00E9t\\u00E9 est en lecture seule\n BindingElement_Part_Title=BindingElement\n+DTO_ReadOnly=Cette propri\\u00E9t\\u00E9 est en lecture seule\n+DTO_Part_Title=Base\n EnvironmentPropertiesEditionPart_NameLabel=Name : \n EnvironmentPropertiesEditionPart_DescriptionLabel=Description : \n PrimitiveTypePropertiesEditionPart_NameLabel=Name : \n@@ -82,13 +85,15 @@ NamespacePropertiesEditionPart_DescriptionLabel=Description :\n AttributePropertiesEditionPart_NameLabel=Name : \n AttributePropertiesEditionPart_TypeLabel=Type : \n AttributePropertiesEditionPart_MultiplicityLabel=Multiplicity : \n+AttributePropertiesEditionPart_IdentifierLabel=Identifier\n AttributePropertiesEditionPart_DescriptionLabel=Description : \n ReferencePropertiesEditionPart_NameLabel=Name : \n-ReferencePropertiesEditionPart_TypeLabel=Type : \n+ReferencePropertiesEditionPart_ReferencedTypeLabel=ReferencedType : \n ReferencePropertiesEditionPart_MultiplicityLabel=Multiplicity : \n ReferencePropertiesEditionPart_IsCompositeLabel=IsComposite\n ReferencePropertiesEditionPart_NavigableLabel=Navigable\n ReferencePropertiesEditionPart_OppositeOfLabel=OppositeOf : \n+ReferencePropertiesEditionPart_IdentifierLabel=Identifier\n ReferencePropertiesEditionPart_DescriptionLabel=Description : \n MetadatasPropertiesEditionPart_MetadataLabel=Metadata : \n BindingInfoPropertiesEditionPart_LeftLabel=Left : \n@@ -100,6 +105,10 @@ BindingReferencePropertiesEditionPart_DescriptionLabel=Description :\n BindingElementPropertiesEditionPart_BoundElementLabel=BoundElement : \n BindingElementPropertiesEditionPart_BindingExpressionLabel=BindingExpression : \n BindingElementPropertiesEditionPart_DescriptionLabel=Description : \n+DTOPropertiesEditionPart_NameLabel=Name : \n+DTOPropertiesEditionPart_SupertypeLabel=Supertype : \n+DTOPropertiesEditionPart_AssociatedTypesLabel=AssociatedTypes : \n+DTOPropertiesEditionPart_DescriptionLabel=Description : \n PropertiesEditionPart_PropertiesGroupLabel=Propri\\u00E9t\\u00E9s\n PropertiesEditionPart_EditTableViewerLabel=Editer\n PropertiesEditionPart_DocumentationLabel=Documentation", "raw_url": "https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fsrc-gen%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2Fproviders%2FenvironmentMessages_fr.properties", "sha": "65ce5974b7b7110052e93f10f6a652c31f2354f5", "status": "modified" }, { "additions": 0, "blob_url": "https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2Fprovider%2FDTOItemProvider.java", "changes": 109, "contents_url": "https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2Fprovider%2FDTOItemProvider.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6", "deletions": 109, "filename": "models/environment/plugins/org.obeonetwork.dsl.environment.edit/src/org/obeonetwork/dsl/environment/provider/DTOItemProvider.java", "new_code": "", "new_methods": [], "old_code": "\t\t\taddAssociatedTypesPropertyDescriptor(object);\n\t\t\taddPropertiesPropertyDescriptor(object);\n\t\t\taddReferencesPropertyDescriptor(object);\n\t\t\taddAttributesPropertyDescriptor(object);\n\t\t\taddSupertypePropertyDescriptor(object);\n\t/**\n\t * This adds a property descriptor for the Associated Types feature.\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @generated\n\t */\n\tprotected void addAssociatedTypesPropertyDescriptor(Object object) {\n\t\titemPropertyDescriptors.add(createItemPropertyDescriptor(\n\t\t\t\t((ComposeableAdapterFactory) adapterFactory)\n\t\t\t\t\t\t.getRootAdapterFactory(),\n\t\t\t\tgetResourceLocator(),\n\t\t\t\tgetString(\"_UI_DTO_associatedTypes_feature\"),\n\t\t\t\tgetString(\"_UI_PropertyDescriptor_description\",\n\t\t\t\t\t\t\"_UI_DTO_associatedTypes_feature\", \"_UI_DTO_type\"),\n\t\t\t\tEnvironmentPackage.Literals.DTO__ASSOCIATED_TYPES, true, false,\n\t\t\t\ttrue, null, null, null));\n\t}\n\n\t/**\n\t * This adds a property descriptor for the Properties feature.\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @generated\n\t */\n\tprotected void addPropertiesPropertyDescriptor(Object object) {\n\t\titemPropertyDescriptors.add(createItemPropertyDescriptor(\n\t\t\t\t((ComposeableAdapterFactory) adapterFactory)\n\t\t\t\t\t\t.getRootAdapterFactory(),\n\t\t\t\tgetResourceLocator(),\n\t\t\t\tgetString(\"_UI_DTO_properties_feature\"),\n\t\t\t\tgetString(\"_UI_PropertyDescriptor_description\",\n\t\t\t\t\t\t\"_UI_DTO_properties_feature\", \"_UI_DTO_type\"),\n\t\t\t\tEnvironmentPackage.Literals.DTO__PROPERTIES, false, false,\n\t\t\t\tfalse, null, null, null));\n\t}\n\n\t/**\n\t * This adds a property descriptor for the References feature.\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @generated\n\t */\n\tprotected void addReferencesPropertyDescriptor(Object object) {\n\t\titemPropertyDescriptors.add(createItemPropertyDescriptor(\n\t\t\t\t((ComposeableAdapterFactory) adapterFactory)\n\t\t\t\t\t\t.getRootAdapterFactory(),\n\t\t\t\tgetResourceLocator(),\n\t\t\t\tgetString(\"_UI_DTO_references_feature\"),\n\t\t\t\tgetString(\"_UI_PropertyDescriptor_description\",\n\t\t\t\t\t\t\"_UI_DTO_references_feature\", \"_UI_DTO_type\"),\n\t\t\t\tEnvironmentPackage.Literals.DTO__REFERENCES, false, false,\n\t\t\t\tfalse, null, null, null));\n\t}\n\n\t/**\n\t * This adds a property descriptor for the Attributes feature.\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @generated\n\t */\n\tprotected void addAttributesPropertyDescriptor(Object object) {\n\t\titemPropertyDescriptors.add(createItemPropertyDescriptor(\n\t\t\t\t((ComposeableAdapterFactory) adapterFactory)\n\t\t\t\t\t\t.getRootAdapterFactory(),\n\t\t\t\tgetResourceLocator(),\n\t\t\t\tgetString(\"_UI_DTO_attributes_feature\"),\n\t\t\t\tgetString(\"_UI_PropertyDescriptor_description\",\n\t\t\t\t\t\t\"_UI_DTO_attributes_feature\", \"_UI_DTO_type\"),\n\t\t\t\tEnvironmentPackage.Literals.DTO__ATTRIBUTES, false, false,\n\t\t\t\tfalse, null, null, null));\n\t}\n\n\t/**\n\t * This adds a property descriptor for the Supertype feature.\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @generated\n\t */\n\tprotected void addSupertypePropertyDescriptor(Object object) {\n\t\titemPropertyDescriptors.add(createItemPropertyDescriptor(\n\t\t\t\t((ComposeableAdapterFactory) adapterFactory)\n\t\t\t\t\t\t.getRootAdapterFactory(),\n\t\t\t\tgetResourceLocator(),\n\t\t\t\tgetString(\"_UI_DTO_supertype_feature\"),\n\t\t\t\tgetString(\"_UI_PropertyDescriptor_description\",\n\t\t\t\t\t\t\"_UI_DTO_supertype_feature\", \"_UI_DTO_type\"),\n\t\t\t\tEnvironmentPackage.Literals.DTO__SUPERTYPE, true, false, true,\n\t\t\t\tnull, null, null));\n\t}\n\n\t\t\tchildrenFeatures\n\t\t\t\t\t.add(EnvironmentPackage.Literals.DTO__OWNED_REFERENCES);\n\t\t\tchildrenFeatures\n\t\t\t\t\t.add(EnvironmentPackage.Literals.DTO__OWNED_ATTRIBUTES);\n\t\tcase EnvironmentPackage.DTO__OWNED_REFERENCES:\n\t\tcase EnvironmentPackage.DTO__OWNED_ATTRIBUTES:\n\n\t\tnewChildDescriptors.add(createChildParameter(\n\t\t\t\tEnvironmentPackage.Literals.DTO__OWNED_REFERENCES,\n\t\t\t\tEnvironmentFactory.eINSTANCE.createReference()));\n\n\t\tnewChildDescriptors.add(createChildParameter(\n\t\t\t\tEnvironmentPackage.Literals.DTO__OWNED_ATTRIBUTES,\n\t\t\t\tEnvironmentFactory.eINSTANCE.createAttribute()));", "old_methods": [ { "arguments": [ "Object object" ], "filename": "models/environment/plugins/org.obeonetwork.dsl.environment.edit/src/org/obeonetwork/dsl/environment/provider/DTOItemProvider.java", "implementation": "itemPropertyDescriptors.add(createItemPropertyDescriptor(\n\t\t\t\t((ComposeableAdapterFactory) adapterFactory)\n\t\t\t\t\t\t.getRootAdapterFactory(),\n\t\t\t\tgetResourceLocator(),\n\t\t\t\tgetString(\"_UI_DTO_associatedTypes_feature\"),\n\t\t\t\tgetString(\"_UI_PropertyDescriptor_description\",\n\t\t\t\t\t\t\"_UI_DTO_associatedTypes_feature\", \"_UI_DTO_type\"),\n\t\t\t\tEnvironmentPackage.Literals.DTO__ASSOCIATED_TYPES, true, false,\n\t\t\t\ttrue, null, null, null));", "signature": "void addAssociatedTypesPropertyDescriptor(Object object)" }, { "arguments": [ "Object object" ], "filename": "models/environment/plugins/org.obeonetwork.dsl.environment.edit/src/org/obeonetwork/dsl/environment/provider/DTOItemProvider.java", "implementation": "itemPropertyDescriptors.add(createItemPropertyDescriptor(\n\t\t\t\t((ComposeableAdapterFactory) adapterFactory)\n\t\t\t\t\t\t.getRootAdapterFactory(),\n\t\t\t\tgetResourceLocator(),\n\t\t\t\tgetString(\"_UI_DTO_properties_feature\"),\n\t\t\t\tgetString(\"_UI_PropertyDescriptor_description\",\n\t\t\t\t\t\t\"_UI_DTO_properties_feature\", \"_UI_DTO_type\"),\n\t\t\t\tEnvironmentPackage.Literals.DTO__PROPERTIES, false, false,\n\t\t\t\tfalse, null, null, null));", "signature": "void addPropertiesPropertyDescriptor(Object object)" }, { "arguments": [ "Object object" ], "filename": "models/environment/plugins/org.obeonetwork.dsl.environment.edit/src/org/obeonetwork/dsl/environment/provider/DTOItemProvider.java", "implementation": "itemPropertyDescriptors.add(createItemPropertyDescriptor(\n\t\t\t\t((ComposeableAdapterFactory) adapterFactory)\n\t\t\t\t\t\t.getRootAdapterFactory(),\n\t\t\t\tgetResourceLocator(),\n\t\t\t\tgetString(\"_UI_DTO_references_feature\"),\n\t\t\t\tgetString(\"_UI_PropertyDescriptor_description\",\n\t\t\t\t\t\t\"_UI_DTO_references_feature\", \"_UI_DTO_type\"),\n\t\t\t\tEnvironmentPackage.Literals.DTO__REFERENCES, false, false,\n\t\t\t\tfalse, null, null, null));", "signature": "void addReferencesPropertyDescriptor(Object object)" }, { "arguments": [ "Object object" ], "filename": "models/environment/plugins/org.obeonetwork.dsl.environment.edit/src/org/obeonetwork/dsl/environment/provider/DTOItemProvider.java", "implementation": "itemPropertyDescriptors.add(createItemPropertyDescriptor(\n\t\t\t\t((ComposeableAdapterFactory) adapterFactory)\n\t\t\t\t\t\t.getRootAdapterFactory(),\n\t\t\t\tgetResourceLocator(),\n\t\t\t\tgetString(\"_UI_DTO_attributes_feature\"),\n\t\t\t\tgetString(\"_UI_PropertyDescriptor_description\",\n\t\t\t\t\t\t\"_UI_DTO_attributes_feature\", \"_UI_DTO_type\"),\n\t\t\t\tEnvironmentPackage.Literals.DTO__ATTRIBUTES, false, false,\n\t\t\t\tfalse, null, null, null));", "signature": "void addAttributesPropertyDescriptor(Object object)" }, { "arguments": [ "Object object" ], "filename": "models/environment/plugins/org.obeonetwork.dsl.environment.edit/src/org/obeonetwork/dsl/environment/provider/DTOItemProvider.java", "implementation": "itemPropertyDescriptors.add(createItemPropertyDescriptor(\n\t\t\t\t((ComposeableAdapterFactory) adapterFactory)\n\t\t\t\t\t\t.getRootAdapterFactory(),\n\t\t\t\tgetResourceLocator(),\n\t\t\t\tgetString(\"_UI_DTO_supertype_feature\"),\n\t\t\t\tgetString(\"_UI_PropertyDescriptor_description\",\n\t\t\t\t\t\t\"_UI_DTO_supertype_feature\", \"_UI_DTO_type\"),\n\t\t\t\tEnvironmentPackage.Literals.DTO__SUPERTYPE, true, false, true,\n\t\t\t\tnull, null, null));", "signature": "void addSupertypePropertyDescriptor(Object object)" } ], "patch": "@@ -67,105 +67,10 @@ public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {\n \t\tif (itemPropertyDescriptors == null) {\n \t\t\tsuper.getPropertyDescriptors(object);\n \n-\t\t\taddAssociatedTypesPropertyDescriptor(object);\n-\t\t\taddPropertiesPropertyDescriptor(object);\n-\t\t\taddReferencesPropertyDescriptor(object);\n-\t\t\taddAttributesPropertyDescriptor(object);\n-\t\t\taddSupertypePropertyDescriptor(object);\n \t\t}\n \t\treturn itemPropertyDescriptors;\n \t}\n \n-\t/**\n-\t * This adds a property descriptor for the Associated Types feature.\n-\t * <!-- begin-user-doc -->\n-\t * <!-- end-user-doc -->\n-\t * @generated\n-\t */\n-\tprotected void addAssociatedTypesPropertyDescriptor(Object object) {\n-\t\titemPropertyDescriptors.add(createItemPropertyDescriptor(\n-\t\t\t\t((ComposeableAdapterFactory) adapterFactory)\n-\t\t\t\t\t\t.getRootAdapterFactory(),\n-\t\t\t\tgetResourceLocator(),\n-\t\t\t\tgetString(\"_UI_DTO_associatedTypes_feature\"),\n-\t\t\t\tgetString(\"_UI_PropertyDescriptor_description\",\n-\t\t\t\t\t\t\"_UI_DTO_associatedTypes_feature\", \"_UI_DTO_type\"),\n-\t\t\t\tEnvironmentPackage.Literals.DTO__ASSOCIATED_TYPES, true, false,\n-\t\t\t\ttrue, null, null, null));\n-\t}\n-\n-\t/**\n-\t * This adds a property descriptor for the Properties feature.\n-\t * <!-- begin-user-doc -->\n-\t * <!-- end-user-doc -->\n-\t * @generated\n-\t */\n-\tprotected void addPropertiesPropertyDescriptor(Object object) {\n-\t\titemPropertyDescriptors.add(createItemPropertyDescriptor(\n-\t\t\t\t((ComposeableAdapterFactory) adapterFactory)\n-\t\t\t\t\t\t.getRootAdapterFactory(),\n-\t\t\t\tgetResourceLocator(),\n-\t\t\t\tgetString(\"_UI_DTO_properties_feature\"),\n-\t\t\t\tgetString(\"_UI_PropertyDescriptor_description\",\n-\t\t\t\t\t\t\"_UI_DTO_properties_feature\", \"_UI_DTO_type\"),\n-\t\t\t\tEnvironmentPackage.Literals.DTO__PROPERTIES, false, false,\n-\t\t\t\tfalse, null, null, null));\n-\t}\n-\n-\t/**\n-\t * This adds a property descriptor for the References feature.\n-\t * <!-- begin-user-doc -->\n-\t * <!-- end-user-doc -->\n-\t * @generated\n-\t */\n-\tprotected void addReferencesPropertyDescriptor(Object object) {\n-\t\titemPropertyDescriptors.add(createItemPropertyDescriptor(\n-\t\t\t\t((ComposeableAdapterFactory) adapterFactory)\n-\t\t\t\t\t\t.getRootAdapterFactory(),\n-\t\t\t\tgetResourceLocator(),\n-\t\t\t\tgetString(\"_UI_DTO_references_feature\"),\n-\t\t\t\tgetString(\"_UI_PropertyDescriptor_description\",\n-\t\t\t\t\t\t\"_UI_DTO_references_feature\", \"_UI_DTO_type\"),\n-\t\t\t\tEnvironmentPackage.Literals.DTO__REFERENCES, false, false,\n-\t\t\t\tfalse, null, null, null));\n-\t}\n-\n-\t/**\n-\t * This adds a property descriptor for the Attributes feature.\n-\t * <!-- begin-user-doc -->\n-\t * <!-- end-user-doc -->\n-\t * @generated\n-\t */\n-\tprotected void addAttributesPropertyDescriptor(Object object) {\n-\t\titemPropertyDescriptors.add(createItemPropertyDescriptor(\n-\t\t\t\t((ComposeableAdapterFactory) adapterFactory)\n-\t\t\t\t\t\t.getRootAdapterFactory(),\n-\t\t\t\tgetResourceLocator(),\n-\t\t\t\tgetString(\"_UI_DTO_attributes_feature\"),\n-\t\t\t\tgetString(\"_UI_PropertyDescriptor_description\",\n-\t\t\t\t\t\t\"_UI_DTO_attributes_feature\", \"_UI_DTO_type\"),\n-\t\t\t\tEnvironmentPackage.Literals.DTO__ATTRIBUTES, false, false,\n-\t\t\t\tfalse, null, null, null));\n-\t}\n-\n-\t/**\n-\t * This adds a property descriptor for the Supertype feature.\n-\t * <!-- begin-user-doc -->\n-\t * <!-- end-user-doc -->\n-\t * @generated\n-\t */\n-\tprotected void addSupertypePropertyDescriptor(Object object) {\n-\t\titemPropertyDescriptors.add(createItemPropertyDescriptor(\n-\t\t\t\t((ComposeableAdapterFactory) adapterFactory)\n-\t\t\t\t\t\t.getRootAdapterFactory(),\n-\t\t\t\tgetResourceLocator(),\n-\t\t\t\tgetString(\"_UI_DTO_supertype_feature\"),\n-\t\t\t\tgetString(\"_UI_PropertyDescriptor_description\",\n-\t\t\t\t\t\t\"_UI_DTO_supertype_feature\", \"_UI_DTO_type\"),\n-\t\t\t\tEnvironmentPackage.Literals.DTO__SUPERTYPE, true, false, true,\n-\t\t\t\tnull, null, null));\n-\t}\n-\n \t/**\n \t * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an\n \t * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or\n@@ -181,10 +86,6 @@ public Collection<? extends EStructuralFeature> getChildrenFeatures(\n \t\t\tsuper.getChildrenFeatures(object);\n \t\t\tchildrenFeatures\n \t\t\t\t\t.add(EnvironmentPackage.Literals.DTO__OWNED_CONTAINER);\n-\t\t\tchildrenFeatures\n-\t\t\t\t\t.add(EnvironmentPackage.Literals.DTO__OWNED_REFERENCES);\n-\t\t\tchildrenFeatures\n-\t\t\t\t\t.add(EnvironmentPackage.Literals.DTO__OWNED_ATTRIBUTES);\n \t\t}\n \t\treturn childrenFeatures;\n \t}\n@@ -250,8 +151,6 @@ public void notifyChanged(Notification notification) {\n \n \t\tswitch (notification.getFeatureID(DTO.class)) {\n \t\tcase EnvironmentPackage.DTO__OWNED_CONTAINER:\n-\t\tcase EnvironmentPackage.DTO__OWNED_REFERENCES:\n-\t\tcase EnvironmentPackage.DTO__OWNED_ATTRIBUTES:\n \t\t\tfireNotifyChanged(new ViewerNotification(notification,\n \t\t\t\t\tnotification.getNotifier(), true, false));\n \t\t\treturn;\n@@ -274,14 +173,6 @@ protected void collectNewChildDescriptors(\n \t\tnewChildDescriptors.add(createChildParameter(\n \t\t\t\tEnvironmentPackage.Literals.DTO__OWNED_CONTAINER,\n \t\t\t\tEnvironmentFactory.eINSTANCE.createFilterContainer()));\n-\n-\t\tnewChildDescriptors.add(createChildParameter(\n-\t\t\t\tEnvironmentPackage.Literals.DTO__OWNED_REFERENCES,\n-\t\t\t\tEnvironmentFactory.eINSTANCE.createReference()));\n-\n-\t\tnewChildDescriptors.add(createChildParameter(\n-\t\t\t\tEnvironmentPackage.Literals.DTO__OWNED_ATTRIBUTES,\n-\t\t\t\tEnvironmentFactory.eINSTANCE.createAttribute()));\n \t}\n \n }", "raw_url": "https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2Fprovider%2FDTOItemProvider.java", "sha": "0194d6e73db3792fe3e091265b8aeb5baaa58ee7", "status": "modified" }, { "additions": 34, "blob_url": "https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2Fprovider%2FEnvironmentItemProvider.java", "changes": 34, "contents_url": "https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2Fprovider%2FEnvironmentItemProvider.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6", "deletions": 0, "filename": "models/environment/plugins/org.obeonetwork.dsl.environment.edit/src/org/obeonetwork/dsl/environment/provider/EnvironmentItemProvider.java", "new_code": "\t\t\tchildrenFeatures\n\t\t\t\t\t.add(EnvironmentPackage.Literals.ENVIRONMENT__NAMESPACES);\n\t\tcase EnvironmentPackage.ENVIRONMENT__NAMESPACES:\n\n\t\tnewChildDescriptors.add(createChildParameter(\n\t\t\t\tEnvironmentPackage.Literals.ENVIRONMENT__TYPES_DEFINITION,\n\t\t\t\tEnvironmentFactory.eINSTANCE.createNamespace()));\n\n\t\tnewChildDescriptors.add(createChildParameter(\n\t\t\t\tEnvironmentPackage.Literals.ENVIRONMENT__NAMESPACES,\n\t\t\t\tEnvironmentFactory.eINSTANCE.createNamespace()));\n\t}\n\n\t/**\n\t * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @generated\n\t */\n\t@Override\n\tpublic String getCreateChildText(Object owner, Object feature,\n\t\t\tObject child, Collection<?> selection) {\n\t\tObject childFeature = feature;\n\t\tObject childObject = child;\n\n\t\tboolean qualify = childFeature == EnvironmentPackage.Literals.ENVIRONMENT__TYPES_DEFINITION\n\t\t\t\t|| childFeature == EnvironmentPackage.Literals.ENVIRONMENT__NAMESPACES;\n\n\t\tif (qualify) {\n\t\t\treturn getString(\"_UI_CreateChild_text2\", new Object[] {\n\t\t\t\t\tgetTypeText(childObject), getFeatureText(childFeature),\n\t\t\t\t\tgetTypeText(owner) });\n\t\t}\n\t\treturn super.getCreateChildText(owner, feature, child, selection);", "new_methods": [ { "arguments": [ "Object owner", " Object feature", "\n\t\t\tObject child", " Collection<?> selection" ], "filename": "models/environment/plugins/org.obeonetwork.dsl.environment.edit/src/org/obeonetwork/dsl/environment/provider/EnvironmentItemProvider.java", "implementation": "Object childFeature = feature;\n\t\tObject childObject = child;\n\n\t\tboolean qualify = childFeature == EnvironmentPackage.Literals.ENVIRONMENT__TYPES_DEFINITION\n\t\t\t\t|| childFeature == EnvironmentPackage.Literals.ENVIRONMENT__NAMESPACES;\n\n\t\tif (qualify) {\n\t\t\treturn getString(\"_UI_CreateChild_text2\", new Object[] {\n\t\t\t\t\tgetTypeText(childObject), getFeatureText(childFeature),\n\t\t\t\t\tgetTypeText(owner)", "signature": "String getCreateChildText(Object owner, Object feature,\n\t\t\tObject child, Collection<?> selection)" } ], "old_code": "", "old_methods": [], "patch": "@@ -115,6 +115,8 @@ public Collection<? extends EStructuralFeature> getChildrenFeatures(\n \t\t\t\t\t.add(EnvironmentPackage.Literals.ENVIRONMENT__PRIORITY_DEFINITIONS);\n \t\t\tchildrenFeatures\n \t\t\t\t\t.add(EnvironmentPackage.Literals.ENVIRONMENT__TYPES_DEFINITION);\n+\t\t\tchildrenFeatures\n+\t\t\t\t\t.add(EnvironmentPackage.Literals.ENVIRONMENT__NAMESPACES);\n \t\t}\n \t\treturn childrenFeatures;\n \t}\n@@ -187,6 +189,7 @@ public void notifyChanged(Notification notification) {\n \t\tcase EnvironmentPackage.ENVIRONMENT__LINKS:\n \t\tcase EnvironmentPackage.ENVIRONMENT__PRIORITY_DEFINITIONS:\n \t\tcase EnvironmentPackage.ENVIRONMENT__TYPES_DEFINITION:\n+\t\tcase EnvironmentPackage.ENVIRONMENT__NAMESPACES:\n \t\t\tfireNotifyChanged(new ViewerNotification(notification,\n \t\t\t\t\tnotification.getNotifier(), true, false));\n \t\t\treturn;\n@@ -217,6 +220,37 @@ protected void collectNewChildDescriptors(\n \t\tnewChildDescriptors.add(createChildParameter(\n \t\t\t\tEnvironmentPackage.Literals.ENVIRONMENT__TYPES_DEFINITION,\n \t\t\t\tEnvironmentFactory.eINSTANCE.createTypesDefinition()));\n+\n+\t\tnewChildDescriptors.add(createChildParameter(\n+\t\t\t\tEnvironmentPackage.Literals.ENVIRONMENT__TYPES_DEFINITION,\n+\t\t\t\tEnvironmentFactory.eINSTANCE.createNamespace()));\n+\n+\t\tnewChildDescriptors.add(createChildParameter(\n+\t\t\t\tEnvironmentPackage.Literals.ENVIRONMENT__NAMESPACES,\n+\t\t\t\tEnvironmentFactory.eINSTANCE.createNamespace()));\n+\t}\n+\n+\t/**\n+\t * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.\n+\t * <!-- begin-user-doc -->\n+\t * <!-- end-user-doc -->\n+\t * @generated\n+\t */\n+\t@Override\n+\tpublic String getCreateChildText(Object owner, Object feature,\n+\t\t\tObject child, Collection<?> selection) {\n+\t\tObject childFeature = feature;\n+\t\tObject childObject = child;\n+\n+\t\tboolean qualify = childFeature == EnvironmentPackage.Literals.ENVIRONMENT__TYPES_DEFINITION\n+\t\t\t\t|| childFeature == EnvironmentPackage.Literals.ENVIRONMENT__NAMESPACES;\n+\n+\t\tif (qualify) {\n+\t\t\treturn getString(\"_UI_CreateChild_text2\", new Object[] {\n+\t\t\t\t\tgetTypeText(childObject), getFeatureText(childFeature),\n+\t\t\t\t\tgetTypeText(owner) });\n+\t\t}\n+\t\treturn super.getCreateChildText(owner, feature, child, selection);\n \t}\n \n }", "raw_url": "https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2Fprovider%2FEnvironmentItemProvider.java", "sha": "151eb2014526605c87883bc9e12e8c5fd89232f8", "status": "modified" }, { "additions": 3, "blob_url": "https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2Fprovider%2FNamespaceItemProvider.java", "changes": 6, "contents_url": "https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2Fprovider%2FNamespaceItemProvider.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6", "deletions": 3, "filename": "models/environment/plugins/org.obeonetwork.dsl.environment.edit/src/org/obeonetwork/dsl/environment/provider/NamespaceItemProvider.java", "new_code": "public class NamespaceItemProvider extends TypesDefinitionItemProvider\n\t\timplements IEditingDomainItemProvider, IStructuredItemContentProvider,\n\t\t\tif (ns.getOwnedNamespaces().isEmpty() && ns.getTypes().isEmpty()) {", "new_methods": [], "old_code": "public class NamespaceItemProvider extends ObeoDSMObjectItemProvider implements\n\t\tIEditingDomainItemProvider, IStructuredItemContentProvider,\n\t\t\tif (ns.getOwnedNamespaces().size() == 0) {", "old_methods": [], "patch": "@@ -37,8 +37,8 @@\n * <!-- end-user-doc -->\n * @generated\n */\n-public class NamespaceItemProvider extends ObeoDSMObjectItemProvider implements\n-\t\tIEditingDomainItemProvider, IStructuredItemContentProvider,\n+public class NamespaceItemProvider extends TypesDefinitionItemProvider\n+\t\timplements IEditingDomainItemProvider, IStructuredItemContentProvider,\n \t\tITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {\n \t/**\n \t * <!-- begin-user-doc -->\n@@ -133,7 +133,7 @@ protected EStructuralFeature getChildFeature(Object object, Object child) {\n \tpublic Object getImage(Object object) {\n \t\tif (object instanceof Namespace) {\n \t\t\tNamespace ns = (Namespace) object;\n-\t\t\tif (ns.getOwnedNamespaces().size() == 0) {\n+\t\t\tif (ns.getOwnedNamespaces().isEmpty() && ns.getTypes().isEmpty()) {\n \t\t\t\treturn overlayImage(\n \t\t\t\t\t\tobject,\n \t\t\t\t\t\tgetResourceLocator().getImage(", "raw_url": "https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2Fprovider%2FNamespaceItemProvider.java", "sha": "9b0dd19622538e630caefefe0417fb4388831c3d", "status": "modified" }, { "additions": 22, "blob_url": "https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2Fprovider%2FPropertyItemProvider.java", "changes": 22, "contents_url": "https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2Fprovider%2FPropertyItemProvider.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6", "deletions": 0, "filename": "models/environment/plugins/org.obeonetwork.dsl.environment.edit/src/org/obeonetwork/dsl/environment/provider/PropertyItemProvider.java", "new_code": "\t\t\taddIsIdentifierPropertyDescriptor(object);\n\t/**\n\t * This adds a property descriptor for the Is Identifier feature.\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @generated\n\t */\n\tprotected void addIsIdentifierPropertyDescriptor(Object object) {\n\t\titemPropertyDescriptors.add(createItemPropertyDescriptor(\n\t\t\t\t((ComposeableAdapterFactory) adapterFactory)\n\t\t\t\t\t\t.getRootAdapterFactory(),\n\t\t\t\tgetResourceLocator(),\n\t\t\t\tgetString(\"_UI_Property_isIdentifier_feature\"),\n\t\t\t\tgetString(\"_UI_PropertyDescriptor_description\",\n\t\t\t\t\t\t\"_UI_Property_isIdentifier_feature\",\n\t\t\t\t\t\t\"_UI_Property_type\"),\n\t\t\t\tEnvironmentPackage.Literals.PROPERTY__IS_IDENTIFIER, true,\n\t\t\t\tfalse, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null,\n\t\t\t\tnull));\n\t}\n\n\t\tcase EnvironmentPackage.PROPERTY__IS_IDENTIFIER:", "new_methods": [ { "arguments": [ "Object object" ], "filename": "models/environment/plugins/org.obeonetwork.dsl.environment.edit/src/org/obeonetwork/dsl/environment/provider/PropertyItemProvider.java", "implementation": "itemPropertyDescriptors.add(createItemPropertyDescriptor(\n\t\t\t\t((ComposeableAdapterFactory) adapterFactory)\n\t\t\t\t\t\t.getRootAdapterFactory(),\n\t\t\t\tgetResourceLocator(),\n\t\t\t\tgetString(\"_UI_Property_isIdentifier_feature\"),\n\t\t\t\tgetString(\"_UI_PropertyDescriptor_description\",\n\t\t\t\t\t\t\"_UI_Property_isIdentifier_feature\",\n\t\t\t\t\t\t\"_UI_Property_type\"),\n\t\t\t\tEnvironmentPackage.Literals.PROPERTY__IS_IDENTIFIER, true,\n\t\t\t\tfalse, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null,\n\t\t\t\tnull));", "signature": "void addIsIdentifierPropertyDescriptor(Object object)" } ], "old_code": "", "old_methods": [], "patch": "@@ -68,6 +68,7 @@ public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {\n \n \t\t\taddNamePropertyDescriptor(object);\n \t\t\taddMultiplicityPropertyDescriptor(object);\n+\t\t\taddIsIdentifierPropertyDescriptor(object);\n \t\t}\n \t\treturn itemPropertyDescriptors;\n \t}\n@@ -110,6 +111,26 @@ protected void addMultiplicityPropertyDescriptor(Object object) {\n \t\t\t\tnull));\n \t}\n \n+\t/**\n+\t * This adds a property descriptor for the Is Identifier feature.\n+\t * <!-- begin-user-doc -->\n+\t * <!-- end-user-doc -->\n+\t * @generated\n+\t */\n+\tprotected void addIsIdentifierPropertyDescriptor(Object object) {\n+\t\titemPropertyDescriptors.add(createItemPropertyDescriptor(\n+\t\t\t\t((ComposeableAdapterFactory) adapterFactory)\n+\t\t\t\t\t\t.getRootAdapterFactory(),\n+\t\t\t\tgetResourceLocator(),\n+\t\t\t\tgetString(\"_UI_Property_isIdentifier_feature\"),\n+\t\t\t\tgetString(\"_UI_PropertyDescriptor_description\",\n+\t\t\t\t\t\t\"_UI_Property_isIdentifier_feature\",\n+\t\t\t\t\t\t\"_UI_Property_type\"),\n+\t\t\t\tEnvironmentPackage.Literals.PROPERTY__IS_IDENTIFIER, true,\n+\t\t\t\tfalse, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null,\n+\t\t\t\tnull));\n+\t}\n+\n \t/**\n \t * <!-- begin-user-doc -->\n \t * <!-- end-user-doc -->\n@@ -147,6 +168,7 @@ public void notifyChanged(Notification notification) {\n \t\tswitch (notification.getFeatureID(Property.class)) {\n \t\tcase EnvironmentPackage.PROPERTY__NAME:\n \t\tcase EnvironmentPackage.PROPERTY__MULTIPLICITY:\n+\t\tcase EnvironmentPackage.PROPERTY__IS_IDENTIFIER:\n \t\t\tfireNotifyChanged(new ViewerNotification(notification,\n \t\t\t\t\tnotification.getNotifier(), false, true));\n \t\t\treturn;", "raw_url": "https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2Fprovider%2FPropertyItemProvider.java", "sha": "a61e66ba718b9fbf660e3c431e3bc595f7733831", "status": "modified" }, { "additions": 15, "blob_url": "https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2Fprovider%2FReferenceItemProvider.java", "changes": 32, "contents_url": "https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2Fprovider%2FReferenceItemProvider.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6", "deletions": 17, "filename": "models/environment/plugins/org.obeonetwork.dsl.environment.edit/src/org/obeonetwork/dsl/environment/provider/ReferenceItemProvider.java", "new_code": "\t\t\taddReferencedTypePropertyDescriptor(object);\n\t\t\tprotected Collection<Reference> getComboBoxObjects(Object object) {\n\t\t\t\tCollection<Reference> result = new ArrayList<Reference>();\n\t\t\t\t\tCollection<?> collection = super.getComboBoxObjects(object);\n\t\t\t\t\tfor (Object object2 : collection) {\n\t\t\t\t\t\tEObject elem = (EObject)object2;\n\t\t\t\t\t\tif (elem != null && elem instanceof Reference && ((Reference) elem).canBeOppositeOf((Reference) object)) {\n\t\t\t\t\t\t\tresult.add((Reference)elem);\n\t * This adds a property descriptor for the Referenced Type feature.\n\tprotected void addReferencedTypePropertyDescriptor(Object object) {\n\t\t\t\tgetString(\"_UI_Reference_referencedType_feature\"),\n\t\t\t\t\t\t\"_UI_Reference_referencedType_feature\",\n\t\t\t\t\t\t\"_UI_Reference_type\"),\n\t\t\t\tEnvironmentPackage.Literals.REFERENCE__REFERENCED_TYPE, true,\n\t\t\t\tfalse, true, null, null, null));", "new_methods": [], "old_code": "\t\t\taddTypePropertyDescriptor(object);\n\t\t\tprotected Collection getComboBoxObjects(Object object) {\n\t\t\t\tCollection result = new ArrayList();\n\t\t\t\t\tCollection collection = super.getComboBoxObjects(object);\n\t\t\t\t\tfor (Iterator iter = collection.iterator(); iter.hasNext();) {\n\t\t\t\t\t\tEObject elem = (EObject) iter.next();\n\t\t\t\t\t\tif (elem != null\n\t\t\t\t\t\t\t\t&& elem instanceof Reference\n\t\t\t\t\t\t\t\t&& ((Reference) elem)\n\t\t\t\t\t\t\t\t\t\t.canBeOppositeOf((Reference) object)) {\n\t\t\t\t\t\t\tresult.add(elem);\n\t * This adds a property descriptor for the Type feature.\n\tprotected void addTypePropertyDescriptor(Object object) {\n\t\t\t\tgetString(\"_UI_Reference_type_feature\"),\n\t\t\t\t\t\t\"_UI_Reference_type_feature\", \"_UI_Reference_type\"),\n\t\t\t\tEnvironmentPackage.Literals.REFERENCE__TYPE, true, false, true,\n\t\t\t\tnull, null, null));", "old_methods": [], "patch": "@@ -72,7 +72,7 @@ public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {\n \t\t\taddIsCompositePropertyDescriptor(object);\n \t\t\taddNavigablePropertyDescriptor(object);\n \t\t\taddOppositeOfPropertyDescriptor(object);\n-\t\t\taddTypePropertyDescriptor(object);\n+\t\t\taddReferencedTypePropertyDescriptor(object);\n \t\t}\n \t\treturn itemPropertyDescriptors;\n \t}\n@@ -135,20 +135,17 @@ protected void addOppositeOfPropertyDescriptor(Object object) {\n \t\t\t\tEnvironmentPackage.Literals.REFERENCE__OPPOSITE_OF, true,\n \t\t\t\tfalse, true, null, null, null) {\n \n-\t\t\tprotected Collection getComboBoxObjects(Object object) {\n+\t\t\tprotected Collection<Reference> getComboBoxObjects(Object object) {\n \n-\t\t\t\tCollection result = new ArrayList();\n+\t\t\t\tCollection<Reference> result = new ArrayList<Reference>();\n \t\t\t\t// We always offer an empty choice\n \t\t\t\tresult.add(null);\n \t\t\t\tif (object instanceof Reference) {\n-\t\t\t\t\tCollection collection = super.getComboBoxObjects(object);\n-\t\t\t\t\tfor (Iterator iter = collection.iterator(); iter.hasNext();) {\n-\t\t\t\t\t\tEObject elem = (EObject) iter.next();\n-\t\t\t\t\t\tif (elem != null\n-\t\t\t\t\t\t\t\t&& elem instanceof Reference\n-\t\t\t\t\t\t\t\t&& ((Reference) elem)\n-\t\t\t\t\t\t\t\t\t\t.canBeOppositeOf((Reference) object)) {\n-\t\t\t\t\t\t\tresult.add(elem);\n+\t\t\t\t\tCollection<?> collection = super.getComboBoxObjects(object);\n+\t\t\t\t\tfor (Object object2 : collection) {\n+\t\t\t\t\t\tEObject elem = (EObject)object2;\n+\t\t\t\t\t\tif (elem != null && elem instanceof Reference && ((Reference) elem).canBeOppositeOf((Reference) object)) {\n+\t\t\t\t\t\t\tresult.add((Reference)elem);\n \t\t\t\t\t\t}\n \t\t\t\t\t}\n \t\t\t\t}\n@@ -159,21 +156,22 @@ protected Collection getComboBoxObjects(Object object) {\n \t}\n \n \t/**\n-\t * This adds a property descriptor for the Type feature.\n+\t * This adds a property descriptor for the Referenced Type feature.\n \t * <!-- begin-user-doc -->\n \t * <!-- end-user-doc -->\n \t * @generated\n \t */\n-\tprotected void addTypePropertyDescriptor(Object object) {\n+\tprotected void addReferencedTypePropertyDescriptor(Object object) {\n \t\titemPropertyDescriptors.add(createItemPropertyDescriptor(\n \t\t\t\t((ComposeableAdapterFactory) adapterFactory)\n \t\t\t\t\t\t.getRootAdapterFactory(),\n \t\t\t\tgetResourceLocator(),\n-\t\t\t\tgetString(\"_UI_Reference_type_feature\"),\n+\t\t\t\tgetString(\"_UI_Reference_referencedType_feature\"),\n \t\t\t\tgetString(\"_UI_PropertyDescriptor_description\",\n-\t\t\t\t\t\t\"_UI_Reference_type_feature\", \"_UI_Reference_type\"),\n-\t\t\t\tEnvironmentPackage.Literals.REFERENCE__TYPE, true, false, true,\n-\t\t\t\tnull, null, null));\n+\t\t\t\t\t\t\"_UI_Reference_referencedType_feature\",\n+\t\t\t\t\t\t\"_UI_Reference_type\"),\n+\t\t\t\tEnvironmentPackage.Literals.REFERENCE__REFERENCED_TYPE, true,\n+\t\t\t\tfalse, true, null, null, null));\n \t}\n \n \t/**", "raw_url": "https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2Fprovider%2FReferenceItemProvider.java", "sha": "8590de77ed3d19187bac61f0dc23e52f9e8283e7", "status": "modified" }, { "additions": 155, "blob_url": "https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2Fprovider%2FStructuredTypeItemProvider.java", "changes": 155, "contents_url": "https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2Fprovider%2FStructuredTypeItemProvider.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6", "deletions": 0, "filename": "models/environment/plugins/org.obeonetwork.dsl.environment.edit/src/org/obeonetwork/dsl/environment/provider/StructuredTypeItemProvider.java", "new_code": "import org.eclipse.emf.ecore.EStructuralFeature;\nimport org.eclipse.emf.edit.provider.ComposeableAdapterFactory;\nimport org.eclipse.emf.edit.provider.ViewerNotification;\nimport org.obeonetwork.dsl.environment.EnvironmentFactory;\nimport org.obeonetwork.dsl.environment.EnvironmentPackage;\n\t\t\taddSupertypePropertyDescriptor(object);\n\t\t\taddAssociatedTypesPropertyDescriptor(object);\n\t\t\taddAttributesPropertyDescriptor(object);\n\t\t\taddReferencesPropertyDescriptor(object);\n\t\t\taddPropertiesPropertyDescriptor(object);\n\t/**\n\t * This adds a property descriptor for the Supertype feature.\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @generated\n\t */\n\tprotected void addSupertypePropertyDescriptor(Object object) {\n\t\titemPropertyDescriptors.add(createItemPropertyDescriptor(\n\t\t\t\t((ComposeableAdapterFactory) adapterFactory)\n\t\t\t\t\t\t.getRootAdapterFactory(),\n\t\t\t\tgetResourceLocator(),\n\t\t\t\tgetString(\"_UI_StructuredType_supertype_feature\"),\n\t\t\t\tgetString(\"_UI_PropertyDescriptor_description\",\n\t\t\t\t\t\t\"_UI_StructuredType_supertype_feature\",\n\t\t\t\t\t\t\"_UI_StructuredType_type\"),\n\t\t\t\tEnvironmentPackage.Literals.STRUCTURED_TYPE__SUPERTYPE, true,\n\t\t\t\tfalse, true, null, null, null));\n\t}\n\n\t/**\n\t * This adds a property descriptor for the Associated Types feature.\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @generated\n\t */\n\tprotected void addAssociatedTypesPropertyDescriptor(Object object) {\n\t\titemPropertyDescriptors.add(createItemPropertyDescriptor(\n\t\t\t\t((ComposeableAdapterFactory) adapterFactory)\n\t\t\t\t\t\t.getRootAdapterFactory(),\n\t\t\t\tgetResourceLocator(),\n\t\t\t\tgetString(\"_UI_StructuredType_associatedTypes_feature\"),\n\t\t\t\tgetString(\"_UI_PropertyDescriptor_description\",\n\t\t\t\t\t\t\"_UI_StructuredType_associatedTypes_feature\",\n\t\t\t\t\t\t\"_UI_StructuredType_type\"),\n\t\t\t\tEnvironmentPackage.Literals.STRUCTURED_TYPE__ASSOCIATED_TYPES,\n\t\t\t\ttrue, false, true, null, null, null));\n\t}\n\n\t/**\n\t * This adds a property descriptor for the Attributes feature.\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @generated\n\t */\n\tprotected void addAttributesPropertyDescriptor(Object object) {\n\t\titemPropertyDescriptors.add(createItemPropertyDescriptor(\n\t\t\t\t((ComposeableAdapterFactory) adapterFactory)\n\t\t\t\t\t\t.getRootAdapterFactory(),\n\t\t\t\tgetResourceLocator(),\n\t\t\t\tgetString(\"_UI_StructuredType_attributes_feature\"),\n\t\t\t\tgetString(\"_UI_PropertyDescriptor_description\",\n\t\t\t\t\t\t\"_UI_StructuredType_attributes_feature\",\n\t\t\t\t\t\t\"_UI_StructuredType_type\"),\n\t\t\t\tEnvironmentPackage.Literals.STRUCTURED_TYPE__ATTRIBUTES, false,\n\t\t\t\tfalse, false, null, null, null));\n\t}\n\n\t/**\n\t * This adds a property descriptor for the References feature.\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @generated\n\t */\n\tprotected void addReferencesPropertyDescriptor(Object object) {\n\t\titemPropertyDescriptors.add(createItemPropertyDescriptor(\n\t\t\t\t((ComposeableAdapterFactory) adapterFactory)\n\t\t\t\t\t\t.getRootAdapterFactory(),\n\t\t\t\tgetResourceLocator(),\n\t\t\t\tgetString(\"_UI_StructuredType_references_feature\"),\n\t\t\t\tgetString(\"_UI_PropertyDescriptor_description\",\n\t\t\t\t\t\t\"_UI_StructuredType_references_feature\",\n\t\t\t\t\t\t\"_UI_StructuredType_type\"),\n\t\t\t\tEnvironmentPackage.Literals.STRUCTURED_TYPE__REFERENCES, false,\n\t\t\t\tfalse, false, null, null, null));\n\t}\n\n\t/**\n\t * This adds a property descriptor for the Properties feature.\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @generated\n\t */\n\tprotected void addPropertiesPropertyDescriptor(Object object) {\n\t\titemPropertyDescriptors.add(createItemPropertyDescriptor(\n\t\t\t\t((ComposeableAdapterFactory) adapterFactory)\n\t\t\t\t\t\t.getRootAdapterFactory(),\n\t\t\t\tgetResourceLocator(),\n\t\t\t\tgetString(\"_UI_StructuredType_properties_feature\"),\n\t\t\t\tgetString(\"_UI_PropertyDescriptor_description\",\n\t\t\t\t\t\t\"_UI_StructuredType_properties_feature\",\n\t\t\t\t\t\t\"_UI_StructuredType_type\"),\n\t\t\t\tEnvironmentPackage.Literals.STRUCTURED_TYPE__PROPERTIES, false,\n\t\t\t\tfalse, false, null, null, null));\n\t}\n\n\t/**\n\t * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an\n\t * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or\n\t * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @generated\n\t */\n\t@Override\n\tpublic Collection<? extends EStructuralFeature> getChildrenFeatures(\n\t\t\tObject object) {\n\t\tif (childrenFeatures == null) {\n\t\t\tsuper.getChildrenFeatures(object);\n\t\t\tchildrenFeatures\n\t\t\t\t\t.add(EnvironmentPackage.Literals.STRUCTURED_TYPE__OWNED_ATTRIBUTES);\n\t\t\tchildrenFeatures\n\t\t\t\t\t.add(EnvironmentPackage.Literals.STRUCTURED_TYPE__OWNED_REFERENCES);\n\t\t}\n\t\treturn childrenFeatures;\n\t}\n\n\t/**\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @generated\n\t */\n\t@Override\n\tprotected EStructuralFeature getChildFeature(Object object, Object child) {\n\t\t// Check the type of the specified child object and return the proper feature to use for\n\t\t// adding (see {@link AddCommand}) it as a child.\n\n\t\treturn super.getChildFeature(object, child);\n\t}\n\n\n\t\tswitch (notification.getFeatureID(StructuredType.class)) {\n\t\tcase EnvironmentPackage.STRUCTURED_TYPE__OWNED_ATTRIBUTES:\n\t\tcase EnvironmentPackage.STRUCTURED_TYPE__OWNED_REFERENCES:\n\t\t\tfireNotifyChanged(new ViewerNotification(notification,\n\t\t\t\t\tnotification.getNotifier(), true, false));\n\t\t\treturn;\n\t\t}\n\n\t\tnewChildDescriptors.add(createChildParameter(\n\t\t\t\tEnvironmentPackage.Literals.STRUCTURED_TYPE__OWNED_ATTRIBUTES,\n\t\t\t\tEnvironmentFactory.eINSTANCE.createAttribute()));\n\n\t\tnewChildDescriptors.add(createChildParameter(\n\t\t\t\tEnvironmentPackage.Literals.STRUCTURED_TYPE__OWNED_REFERENCES,\n\t\t\t\tEnvironmentFactory.eINSTANCE.createReference()));", "new_methods": [ { "arguments": [ "Object object" ], "filename": "models/environment/plugins/org.obeonetwork.dsl.environment.edit/src/org/obeonetwork/dsl/environment/provider/StructuredTypeItemProvider.java", "implementation": "itemPropertyDescriptors.add(createItemPropertyDescriptor(\n\t\t\t\t((ComposeableAdapterFactory) adapterFactory)\n\t\t\t\t\t\t.getRootAdapterFactory(),\n\t\t\t\tgetResourceLocator(),\n\t\t\t\tgetString(\"_UI_StructuredType_supertype_feature\"),\n\t\t\t\tgetString(\"_UI_PropertyDescriptor_description\",\n\t\t\t\t\t\t\"_UI_StructuredType_supertype_feature\",\n\t\t\t\t\t\t\"_UI_StructuredType_type\"),\n\t\t\t\tEnvironmentPackage.Literals.STRUCTURED_TYPE__SUPERTYPE, true,\n\t\t\t\tfalse, true, null, null, null));", "signature": "void addSupertypePropertyDescriptor(Object object)" }, { "arguments": [ "Object object" ], "filename": "models/environment/plugins/org.obeonetwork.dsl.environment.edit/src/org/obeonetwork/dsl/environment/provider/StructuredTypeItemProvider.java", "implementation": "itemPropertyDescriptors.add(createItemPropertyDescriptor(\n\t\t\t\t((ComposeableAdapterFactory) adapterFactory)\n\t\t\t\t\t\t.getRootAdapterFactory(),\n\t\t\t\tgetResourceLocator(),\n\t\t\t\tgetString(\"_UI_StructuredType_associatedTypes_feature\"),\n\t\t\t\tgetString(\"_UI_PropertyDescriptor_description\",\n\t\t\t\t\t\t\"_UI_StructuredType_associatedTypes_feature\",\n\t\t\t\t\t\t\"_UI_StructuredType_type\"),\n\t\t\t\tEnvironmentPackage.Literals.STRUCTURED_TYPE__ASSOCIATED_TYPES,\n\t\t\t\ttrue, false, true, null, null, null));", "signature": "void addAssociatedTypesPropertyDescriptor(Object object)" }, { "arguments": [ "Object object" ], "filename": "models/environment/plugins/org.obeonetwork.dsl.environment.edit/src/org/obeonetwork/dsl/environment/provider/StructuredTypeItemProvider.java", "implementation": "itemPropertyDescriptors.add(createItemPropertyDescriptor(\n\t\t\t\t((ComposeableAdapterFactory) adapterFactory)\n\t\t\t\t\t\t.getRootAdapterFactory(),\n\t\t\t\tgetResourceLocator(),\n\t\t\t\tgetString(\"_UI_StructuredType_attributes_feature\"),\n\t\t\t\tgetString(\"_UI_PropertyDescriptor_description\",\n\t\t\t\t\t\t\"_UI_StructuredType_attributes_feature\",\n\t\t\t\t\t\t\"_UI_StructuredType_type\"),\n\t\t\t\tEnvironmentPackage.Literals.STRUCTURED_TYPE__ATTRIBUTES, false,\n\t\t\t\tfalse, false, null, null, null));", "signature": "void addAttributesPropertyDescriptor(Object object)" }, { "arguments": [ "Object object" ], "filename": "models/environment/plugins/org.obeonetwork.dsl.environment.edit/src/org/obeonetwork/dsl/environment/provider/StructuredTypeItemProvider.java", "implementation": "itemPropertyDescriptors.add(createItemPropertyDescriptor(\n\t\t\t\t((ComposeableAdapterFactory) adapterFactory)\n\t\t\t\t\t\t.getRootAdapterFactory(),\n\t\t\t\tgetResourceLocator(),\n\t\t\t\tgetString(\"_UI_StructuredType_references_feature\"),\n\t\t\t\tgetString(\"_UI_PropertyDescriptor_description\",\n\t\t\t\t\t\t\"_UI_StructuredType_references_feature\",\n\t\t\t\t\t\t\"_UI_StructuredType_type\"),\n\t\t\t\tEnvironmentPackage.Literals.STRUCTURED_TYPE__REFERENCES, false,\n\t\t\t\tfalse, false, null, null, null));", "signature": "void addReferencesPropertyDescriptor(Object object)" }, { "arguments": [ "Object object" ], "filename": "models/environment/plugins/org.obeonetwork.dsl.environment.edit/src/org/obeonetwork/dsl/environment/provider/StructuredTypeItemProvider.java", "implementation": "itemPropertyDescriptors.add(createItemPropertyDescriptor(\n\t\t\t\t((ComposeableAdapterFactory) adapterFactory)\n\t\t\t\t\t\t.getRootAdapterFactory(),\n\t\t\t\tgetResourceLocator(),\n\t\t\t\tgetString(\"_UI_StructuredType_properties_feature\"),\n\t\t\t\tgetString(\"_UI_PropertyDescriptor_description\",\n\t\t\t\t\t\t\"_UI_StructuredType_properties_feature\",\n\t\t\t\t\t\t\"_UI_StructuredType_type\"),\n\t\t\t\tEnvironmentPackage.Literals.STRUCTURED_TYPE__PROPERTIES, false,\n\t\t\t\tfalse, false, null, null, null));", "signature": "void addPropertiesPropertyDescriptor(Object object)" }, { "arguments": [ "Object object", " Object child" ], "filename": "models/environment/plugins/org.obeonetwork.dsl.environment.edit/src/org/obeonetwork/dsl/environment/provider/StructuredTypeItemProvider.java", "implementation": "// Check the type of the specified child object and return the proper feature to use for\n\t\t// adding (see {@link AddCommand", "signature": "EStructuralFeature getChildFeature(Object object, Object child)" } ], "old_code": "", "old_methods": [], "patch": "@@ -17,12 +17,17 @@\n \n import org.eclipse.emf.common.notify.AdapterFactory;\n import org.eclipse.emf.common.notify.Notification;\n+import org.eclipse.emf.ecore.EStructuralFeature;\n+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;\n import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;\n import org.eclipse.emf.edit.provider.IItemLabelProvider;\n import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;\n import org.eclipse.emf.edit.provider.IItemPropertySource;\n import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;\n import org.eclipse.emf.edit.provider.ITreeItemContentProvider;\n+import org.eclipse.emf.edit.provider.ViewerNotification;\n+import org.obeonetwork.dsl.environment.EnvironmentFactory;\n+import org.obeonetwork.dsl.environment.EnvironmentPackage;\n import org.obeonetwork.dsl.environment.StructuredType;\n \n /**\n@@ -62,10 +67,144 @@ public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {\n \t\tif (itemPropertyDescriptors == null) {\n \t\t\tsuper.getPropertyDescriptors(object);\n \n+\t\t\taddSupertypePropertyDescriptor(object);\n+\t\t\taddAssociatedTypesPropertyDescriptor(object);\n+\t\t\taddAttributesPropertyDescriptor(object);\n+\t\t\taddReferencesPropertyDescriptor(object);\n+\t\t\taddPropertiesPropertyDescriptor(object);\n \t\t}\n \t\treturn itemPropertyDescriptors;\n \t}\n \n+\t/**\n+\t * This adds a property descriptor for the Supertype feature.\n+\t * <!-- begin-user-doc -->\n+\t * <!-- end-user-doc -->\n+\t * @generated\n+\t */\n+\tprotected void addSupertypePropertyDescriptor(Object object) {\n+\t\titemPropertyDescriptors.add(createItemPropertyDescriptor(\n+\t\t\t\t((ComposeableAdapterFactory) adapterFactory)\n+\t\t\t\t\t\t.getRootAdapterFactory(),\n+\t\t\t\tgetResourceLocator(),\n+\t\t\t\tgetString(\"_UI_StructuredType_supertype_feature\"),\n+\t\t\t\tgetString(\"_UI_PropertyDescriptor_description\",\n+\t\t\t\t\t\t\"_UI_StructuredType_supertype_feature\",\n+\t\t\t\t\t\t\"_UI_StructuredType_type\"),\n+\t\t\t\tEnvironmentPackage.Literals.STRUCTURED_TYPE__SUPERTYPE, true,\n+\t\t\t\tfalse, true, null, null, null));\n+\t}\n+\n+\t/**\n+\t * This adds a property descriptor for the Associated Types feature.\n+\t * <!-- begin-user-doc -->\n+\t * <!-- end-user-doc -->\n+\t * @generated\n+\t */\n+\tprotected void addAssociatedTypesPropertyDescriptor(Object object) {\n+\t\titemPropertyDescriptors.add(createItemPropertyDescriptor(\n+\t\t\t\t((ComposeableAdapterFactory) adapterFactory)\n+\t\t\t\t\t\t.getRootAdapterFactory(),\n+\t\t\t\tgetResourceLocator(),\n+\t\t\t\tgetString(\"_UI_StructuredType_associatedTypes_feature\"),\n+\t\t\t\tgetString(\"_UI_PropertyDescriptor_description\",\n+\t\t\t\t\t\t\"_UI_StructuredType_associatedTypes_feature\",\n+\t\t\t\t\t\t\"_UI_StructuredType_type\"),\n+\t\t\t\tEnvironmentPackage.Literals.STRUCTURED_TYPE__ASSOCIATED_TYPES,\n+\t\t\t\ttrue, false, true, null, null, null));\n+\t}\n+\n+\t/**\n+\t * This adds a property descriptor for the Attributes feature.\n+\t * <!-- begin-user-doc -->\n+\t * <!-- end-user-doc -->\n+\t * @generated\n+\t */\n+\tprotected void addAttributesPropertyDescriptor(Object object) {\n+\t\titemPropertyDescriptors.add(createItemPropertyDescriptor(\n+\t\t\t\t((ComposeableAdapterFactory) adapterFactory)\n+\t\t\t\t\t\t.getRootAdapterFactory(),\n+\t\t\t\tgetResourceLocator(),\n+\t\t\t\tgetString(\"_UI_StructuredType_attributes_feature\"),\n+\t\t\t\tgetString(\"_UI_PropertyDescriptor_description\",\n+\t\t\t\t\t\t\"_UI_StructuredType_attributes_feature\",\n+\t\t\t\t\t\t\"_UI_StructuredType_type\"),\n+\t\t\t\tEnvironmentPackage.Literals.STRUCTURED_TYPE__ATTRIBUTES, false,\n+\t\t\t\tfalse, false, null, null, null));\n+\t}\n+\n+\t/**\n+\t * This adds a property descriptor for the References feature.\n+\t * <!-- begin-user-doc -->\n+\t * <!-- end-user-doc -->\n+\t * @generated\n+\t */\n+\tprotected void addReferencesPropertyDescriptor(Object object) {\n+\t\titemPropertyDescriptors.add(createItemPropertyDescriptor(\n+\t\t\t\t((ComposeableAdapterFactory) adapterFactory)\n+\t\t\t\t\t\t.getRootAdapterFactory(),\n+\t\t\t\tgetResourceLocator(),\n+\t\t\t\tgetString(\"_UI_StructuredType_references_feature\"),\n+\t\t\t\tgetString(\"_UI_PropertyDescriptor_description\",\n+\t\t\t\t\t\t\"_UI_StructuredType_references_feature\",\n+\t\t\t\t\t\t\"_UI_StructuredType_type\"),\n+\t\t\t\tEnvironmentPackage.Literals.STRUCTURED_TYPE__REFERENCES, false,\n+\t\t\t\tfalse, false, null, null, null));\n+\t}\n+\n+\t/**\n+\t * This adds a property descriptor for the Properties feature.\n+\t * <!-- begin-user-doc -->\n+\t * <!-- end-user-doc -->\n+\t * @generated\n+\t */\n+\tprotected void addPropertiesPropertyDescriptor(Object object) {\n+\t\titemPropertyDescriptors.add(createItemPropertyDescriptor(\n+\t\t\t\t((ComposeableAdapterFactory) adapterFactory)\n+\t\t\t\t\t\t.getRootAdapterFactory(),\n+\t\t\t\tgetResourceLocator(),\n+\t\t\t\tgetString(\"_UI_StructuredType_properties_feature\"),\n+\t\t\t\tgetString(\"_UI_PropertyDescriptor_description\",\n+\t\t\t\t\t\t\"_UI_StructuredType_properties_feature\",\n+\t\t\t\t\t\t\"_UI_StructuredType_type\"),\n+\t\t\t\tEnvironmentPackage.Literals.STRUCTURED_TYPE__PROPERTIES, false,\n+\t\t\t\tfalse, false, null, null, null));\n+\t}\n+\n+\t/**\n+\t * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an\n+\t * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or\n+\t * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.\n+\t * <!-- begin-user-doc -->\n+\t * <!-- end-user-doc -->\n+\t * @generated\n+\t */\n+\t@Override\n+\tpublic Collection<? extends EStructuralFeature> getChildrenFeatures(\n+\t\t\tObject object) {\n+\t\tif (childrenFeatures == null) {\n+\t\t\tsuper.getChildrenFeatures(object);\n+\t\t\tchildrenFeatures\n+\t\t\t\t\t.add(EnvironmentPackage.Literals.STRUCTURED_TYPE__OWNED_ATTRIBUTES);\n+\t\t\tchildrenFeatures\n+\t\t\t\t\t.add(EnvironmentPackage.Literals.STRUCTURED_TYPE__OWNED_REFERENCES);\n+\t\t}\n+\t\treturn childrenFeatures;\n+\t}\n+\n+\t/**\n+\t * <!-- begin-user-doc -->\n+\t * <!-- end-user-doc -->\n+\t * @generated\n+\t */\n+\t@Override\n+\tprotected EStructuralFeature getChildFeature(Object object, Object child) {\n+\t\t// Check the type of the specified child object and return the proper feature to use for\n+\t\t// adding (see {@link AddCommand}) it as a child.\n+\n+\t\treturn super.getChildFeature(object, child);\n+\t}\n+\n \t/**\n \t * <!-- begin-user-doc -->\n \t * <!-- end-user-doc -->\n@@ -99,6 +238,14 @@ public String getText(Object object) {\n \t@Override\n \tpublic void notifyChanged(Notification notification) {\n \t\tupdateChildren(notification);\n+\n+\t\tswitch (notification.getFeatureID(StructuredType.class)) {\n+\t\tcase EnvironmentPackage.STRUCTURED_TYPE__OWNED_ATTRIBUTES:\n+\t\tcase EnvironmentPackage.STRUCTURED_TYPE__OWNED_REFERENCES:\n+\t\t\tfireNotifyChanged(new ViewerNotification(notification,\n+\t\t\t\t\tnotification.getNotifier(), true, false));\n+\t\t\treturn;\n+\t\t}\n \t\tsuper.notifyChanged(notification);\n \t}\n \n@@ -113,6 +260,14 @@ public void notifyChanged(Notification notification) {\n \tprotected void collectNewChildDescriptors(\n \t\t\tCollection<Object> newChildDescriptors, Object object) {\n \t\tsuper.collectNewChildDescriptors(newChildDescriptors, object);\n+\n+\t\tnewChildDescriptors.add(createChildParameter(\n+\t\t\t\tEnvironmentPackage.Literals.STRUCTURED_TYPE__OWNED_ATTRIBUTES,\n+\t\t\t\tEnvironmentFactory.eINSTANCE.createAttribute()));\n+\n+\t\tnewChildDescriptors.add(createChildParameter(\n+\t\t\t\tEnvironmentPackage.Literals.STRUCTURED_TYPE__OWNED_REFERENCES,\n+\t\t\t\tEnvironmentFactory.eINSTANCE.createReference()));\n \t}\n \n }", "raw_url": "https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2Fprovider%2FStructuredTypeItemProvider.java", "sha": "bc9f903f86fcda28325fb3e1c84f9899fbc7eb02", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.editor%2FMETA-INF%2FMANIFEST.MF", "changes": 2, "contents_url": "https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.editor%2FMETA-INF%2FMANIFEST.MF?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6", "deletions": 1, "filename": "models/environment/plugins/org.obeonetwork.dsl.environment.editor/META-INF/MANIFEST.MF", "new_code": "Bundle-SymbolicName: org.obeonetwork.dsl.environment.editor;singleton:=true", "new_methods": [], "old_code": "Bundle-SymbolicName: org.obeonetwork.dsl.environment.editor; singleton:=true", "old_methods": [], "patch": "@@ -1,7 +1,7 @@\n Manifest-Version: 1.0\n Bundle-ManifestVersion: 2\n Bundle-Name: %pluginName\n-Bundle-SymbolicName: org.obeonetwork.dsl.environment.editor; singleton:=true\n+Bundle-SymbolicName: org.obeonetwork.dsl.environment.editor;singleton:=true\n Bundle-Version: 2.4.0.qualifier\n Bundle-ClassPath: .\n Bundle-Activator: org.obeonetwork.dsl.environment.presentation.EnvironmentEditorPlugin$Implementation", "raw_url": "https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.editor%2FMETA-INF%2FMANIFEST.MF", "sha": "4ba287555cb7d3a0fad0fcb8b4b097a7e1727879", "status": "modified" }, { "additions": 27, "blob_url": "https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.editor%2Fplugin.xml", "changes": 27, "contents_url": "https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.editor%2Fplugin.xml?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6", "deletions": 0, "filename": "models/environment/plugins/org.obeonetwork.dsl.environment.editor/plugin.xml", "new_code": " <extension point=\"org.eclipse.ui.newWizards\">\n <!-- @generated environment -->\n <category\n id=\"org.eclipse.emf.ecore.Wizard.category.ID\"\n name=\"%_UI_Wizard_category\"/>\n <wizard\n id=\"org.obeonetwork.dsl.environment.presentation.EnvironmentModelWizardID\"\n name=\"%_UI_EnvironmentModelWizard_label\"\n class=\"org.obeonetwork.dsl.environment.presentation.EnvironmentModelWizard\"\n category=\"org.eclipse.emf.ecore.Wizard.category.ID\"\n icon=\"icons/full/obj16/EnvironmentModelFile.gif\">\n <description>%_UI_EnvironmentModelWizard_description</description>\n <selection class=\"org.eclipse.core.resources.IResource\"/>\n </wizard>\n </extension>\n\n <extension point=\"org.eclipse.ui.editors\">\n <!-- @generated environment -->\n <editor\n id=\"org.obeonetwork.dsl.environment.presentation.EnvironmentEditorID\"\n name=\"%_UI_EnvironmentEditor_label\"\n icon=\"icons/full/obj16/EnvironmentModelFile.gif\"\n extensions=\"environment\"\n class=\"org.obeonetwork.dsl.environment.presentation.EnvironmentEditor\"\n contributorClass=\"org.obeonetwork.dsl.environment.presentation.EnvironmentActionBarContributor\">\n </editor>\n </extension>", "new_methods": [], "old_code": "", "old_methods": [], "patch": "@@ -40,4 +40,31 @@\n contributorClass=\"org.obeonetwork.dsl.environment.presentation.EnvironmentActionBarContributor\" >\n </editor>\n </extension> \n+ <extension point=\"org.eclipse.ui.newWizards\">\n+ <!-- @generated environment -->\n+ <category\n+ id=\"org.eclipse.emf.ecore.Wizard.category.ID\"\n+ name=\"%_UI_Wizard_category\"/>\n+ <wizard\n+ id=\"org.obeonetwork.dsl.environment.presentation.EnvironmentModelWizardID\"\n+ name=\"%_UI_EnvironmentModelWizard_label\"\n+ class=\"org.obeonetwork.dsl.environment.presentation.EnvironmentModelWizard\"\n+ category=\"org.eclipse.emf.ecore.Wizard.category.ID\"\n+ icon=\"icons/full/obj16/EnvironmentModelFile.gif\">\n+ <description>%_UI_EnvironmentModelWizard_description</description>\n+ <selection class=\"org.eclipse.core.resources.IResource\"/>\n+ </wizard>\n+ </extension>\n+\n+ <extension point=\"org.eclipse.ui.editors\">\n+ <!-- @generated environment -->\n+ <editor\n+ id=\"org.obeonetwork.dsl.environment.presentation.EnvironmentEditorID\"\n+ name=\"%_UI_EnvironmentEditor_label\"\n+ icon=\"icons/full/obj16/EnvironmentModelFile.gif\"\n+ extensions=\"environment\"\n+ class=\"org.obeonetwork.dsl.environment.presentation.EnvironmentEditor\"\n+ contributorClass=\"org.obeonetwork.dsl.environment.presentation.EnvironmentActionBarContributor\">\n+ </editor>\n+ </extension>\n </plugin>", "raw_url": "https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.editor%2Fplugin.xml", "sha": "118aa00d067d98a3d366b70513e85176369623a4", "status": "modified" }, { "additions": 43, "blob_url": "https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.editor%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2Fpresentation%2FEnvironmentEditor.java", "changes": 84, "contents_url": "https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.editor%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2Fpresentation%2FEnvironmentEditor.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6", "deletions": 41, "filename": "models/environment/plugins/org.obeonetwork.dsl.environment.editor/src/org/obeonetwork/dsl/environment/presentation/EnvironmentEditor.java", "new_code": "\tprotected List<PropertySheetPage> propertySheetPages = new ArrayList<PropertySheetPage>();\n\t\t\t\tif (propertySheetPages.contains(((PropertySheet) p)\n\t\t\t\t\t\t.getCurrentPage())) {\n\t\t\tresourceToDiagnosticMap.remove(target);\n\t\t\tif (updateProblemIndication) {\n\t\t\t\tgetSite().getShell().getDisplay().asyncExec(new Runnable() {\n\t\t\t\t\tpublic void run() {\n\t\t\t\t\t\tupdateProblemIndication();\n\t\t\t\t\t}\n\t\t\t\t});\n\t\t\t}\n\t\t\t\t\t\t\treturn false;\n\t\t\t\t\t\tfor (Iterator<PropertySheetPage> i = propertySheetPages\n\t\t\t\t\t\t\t\t.iterator(); i.hasNext();) {\n\t\t\t\t\t\t\tPropertySheetPage propertySheetPage = i.next();\n\t\t\t\t\t\t\tif (propertySheetPage.getControl().isDisposed()) {\n\t\t\t\t\t\t\t\ti.remove();\n\t\t\t\t\t\t\t} else {\n\t\t\t\t\t\t\t\tpropertySheetPage.refresh();\n\t\t\t\t\t\t\t}\n\t\tPropertySheetPage propertySheetPage = new ExtendedPropertySheetPage(\n\t\t\t\teditingDomain) {\n\t\t\t@Override\n\t\t\tpublic void setSelectionToViewer(List<?> selection) {\n\t\t\t\tEnvironmentEditor.this.setSelectionToViewer(selection);\n\t\t\t\tEnvironmentEditor.this.setFocus();\n\t\t\t}\n\t\t\t@Override\n\t\t\tpublic void setActionBars(IActionBars actionBars) {\n\t\t\t\tsuper.setActionBars(actionBars);\n\t\t\t\tgetActionBarContributor().shareGlobalActions(this, actionBars);\n\t\t\t}\n\t\t};\n\t\tpropertySheetPage\n\t\t\t\t.setPropertySourceProvider(new AdapterFactoryContentProvider(\n\t\t\t\t\t\tadapterFactory));\n\t\tpropertySheetPages.add(propertySheetPage);\n\t * The implementation uses the URI converter from the editor's resource set to try to open an input stream.\n\t\tList<?> targetObjects = markerHelper.getTargetObjects(editingDomain,\n\t\t\t\tmarker);\n\t\tif (!targetObjects.isEmpty()) {\n\t\t\tsetSelectionToViewer(targetObjects);\n\t\tfor (PropertySheetPage propertySheetPage : propertySheetPages) {", "new_methods": [ { "arguments": [], "filename": "models/environment/plugins/org.obeonetwork.dsl.environment.editor/src/org/obeonetwork/dsl/environment/presentation/EnvironmentEditor.java", "implementation": "public void run() {\n\t\t\t\t\t\tupdateProblemIndication();", "signature": "new Runnable()" }, { "arguments": [ "\n\t\t\t\teditingDomain" ], "filename": "models/environment/plugins/org.obeonetwork.dsl.environment.editor/src/org/obeonetwork/dsl/environment/presentation/EnvironmentEditor.java", "implementation": "@Override\n\t\t\tpublic void setSelectionToViewer(List<?> selection) {\n\t\t\t\tEnvironmentEditor.this.setSelectionToViewer(selection);\n\t\t\t\tEnvironmentEditor.this.setFocus();", "signature": "new ExtendedPropertySheetPage(\n\t\t\t\teditingDomain)" }, { "arguments": [ "IActionBars actionBars" ], "filename": "models/environment/plugins/org.obeonetwork.dsl.environment.editor/src/org/obeonetwork/dsl/environment/presentation/EnvironmentEditor.java", "implementation": "super.setActionBars(actionBars);\n\t\t\t\tgetActionBarContributor().shareGlobalActions(this, actionBars);", "signature": "void setActionBars(IActionBars actionBars)" } ], "old_code": "\tprotected PropertySheetPage propertySheetPage;\n\t\t\t\tif (((PropertySheet) p).getCurrentPage() == propertySheetPage) {\n\t\t\t\t\t\tif (propertySheetPage != null\n\t\t\t\t\t\t\t\t&& !propertySheetPage.getControl().isDisposed()) {\n\t\t\t\t\t\t\tpropertySheetPage.refresh();\n\t\tif (propertySheetPage == null) {\n\t\t\tpropertySheetPage = new ExtendedPropertySheetPage(editingDomain) {\n\t\t\t\t@Override\n\t\t\t\tpublic void setSelectionToViewer(List<?> selection) {\n\t\t\t\t\tEnvironmentEditor.this.setSelectionToViewer(selection);\n\t\t\t\t\tEnvironmentEditor.this.setFocus();\n\t\t\t\t}\n\t\t\t\t@Override\n\t\t\t\tpublic void setActionBars(IActionBars actionBars) {\n\t\t\t\t\tsuper.setActionBars(actionBars);\n\t\t\t\t\tgetActionBarContributor().shareGlobalActions(this,\n\t\t\t\t\t\t\tactionBars);\n\t\t\t\t}\n\t\t\t};\n\t\t\tpropertySheetPage\n\t\t\t\t\t.setPropertySourceProvider(new AdapterFactoryContentProvider(\n\t\t\t\t\t\t\tadapterFactory));\n\t\t}\n\t * The implementation uses the URI converter from the editor's resource set to try to open an input stream. \n\t\ttry {\n\t\t\tif (marker.getType().equals(EValidator.MARKER)) {\n\t\t\t\tString uriAttribute = marker.getAttribute(\n\t\t\t\t\t\tEValidator.URI_ATTRIBUTE, null);\n\t\t\t\tif (uriAttribute != null) {\n\t\t\t\t\tURI uri = URI.createURI(uriAttribute);\n\t\t\t\t\tEObject eObject = editingDomain.getResourceSet()\n\t\t\t\t\t\t\t.getEObject(uri, true);\n\t\t\t\t\tif (eObject != null) {\n\t\t\t\t\t\tsetSelectionToViewer(Collections\n\t\t\t\t\t\t\t\t.singleton(editingDomain.getWrapper(eObject)));\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t}\n\t\t} catch (CoreException exception) {\n\t\t\tEnvironmentEditorPlugin.INSTANCE.log(exception);\n\t\tif (propertySheetPage != null) {", "old_methods": [ { "arguments": [ "editingDomain" ], "filename": "models/environment/plugins/org.obeonetwork.dsl.environment.editor/src/org/obeonetwork/dsl/environment/presentation/EnvironmentEditor.java", "implementation": "@Override\n\t\t\t\tpublic void setSelectionToViewer(List<?> selection) {\n\t\t\t\t\tEnvironmentEditor.this.setSelectionToViewer(selection);\n\t\t\t\t\tEnvironmentEditor.this.setFocus();", "signature": "new ExtendedPropertySheetPage(editingDomain)" }, { "arguments": [ "IActionBars actionBars" ], "filename": "models/environment/plugins/org.obeonetwork.dsl.environment.editor/src/org/obeonetwork/dsl/environment/presentation/EnvironmentEditor.java", "implementation": "super.setActionBars(actionBars);\n\t\t\t\t\tgetActionBarContributor().shareGlobalActions(this,\n\t\t\t\t\t\t\tactionBars);", "signature": "void setActionBars(IActionBars actionBars)" } ], "patch": "@@ -190,7 +190,7 @@ public class EnvironmentEditor extends MultiPageEditorPart implements\n \t * <!-- end-user-doc -->\n \t * @generated\n \t */\n-\tprotected PropertySheetPage propertySheetPage;\n+\tprotected List<PropertySheetPage> propertySheetPages = new ArrayList<PropertySheetPage>();\n \n \t/**\n \t * This is the viewer that shadows the selection in the content outline.\n@@ -308,7 +308,8 @@ public void partActivated(IWorkbenchPart p) {\n \t\t\t\t\tsetCurrentViewer(contentOutlineViewer);\n \t\t\t\t}\n \t\t\t} else if (p instanceof PropertySheet) {\n-\t\t\t\tif (((PropertySheet) p).getCurrentPage() == propertySheetPage) {\n+\t\t\t\tif (propertySheetPages.contains(((PropertySheet) p)\n+\t\t\t\t\t\t.getCurrentPage())) {\n \t\t\t\t\tgetActionBarContributor().setActiveEditor(\n \t\t\t\t\t\t\tEnvironmentEditor.this);\n \t\t\t\t\thandleActivate();\n@@ -422,6 +423,14 @@ protected void setTarget(Resource target) {\n \t\t@Override\n \t\tprotected void unsetTarget(Resource target) {\n \t\t\tbasicUnsetTarget(target);\n+\t\t\tresourceToDiagnosticMap.remove(target);\n+\t\t\tif (updateProblemIndication) {\n+\t\t\t\tgetSite().getShell().getDisplay().asyncExec(new Runnable() {\n+\t\t\t\t\tpublic void run() {\n+\t\t\t\t\t\tupdateProblemIndication();\n+\t\t\t\t\t}\n+\t\t\t\t});\n+\t\t\t}\n \t\t}\n \t};\n \n@@ -460,6 +469,7 @@ public boolean visit(IResourceDelta delta) {\n \t\t\t\t\t\t\t\t\t}\n \t\t\t\t\t\t\t\t}\n \t\t\t\t\t\t\t}\n+\t\t\t\t\t\t\treturn false;\n \t\t\t\t\t\t}\n \n \t\t\t\t\t\treturn true;\n@@ -696,9 +706,14 @@ public void run() {\n \t\t\t\t\t\t\tsetSelectionToViewer(mostRecentCommand\n \t\t\t\t\t\t\t\t\t.getAffectedObjects());\n \t\t\t\t\t\t}\n-\t\t\t\t\t\tif (propertySheetPage != null\n-\t\t\t\t\t\t\t\t&& !propertySheetPage.getControl().isDisposed()) {\n-\t\t\t\t\t\t\tpropertySheetPage.refresh();\n+\t\t\t\t\t\tfor (Iterator<PropertySheetPage> i = propertySheetPages\n+\t\t\t\t\t\t\t\t.iterator(); i.hasNext();) {\n+\t\t\t\t\t\t\tPropertySheetPage propertySheetPage = i.next();\n+\t\t\t\t\t\t\tif (propertySheetPage.getControl().isDisposed()) {\n+\t\t\t\t\t\t\t\ti.remove();\n+\t\t\t\t\t\t\t} else {\n+\t\t\t\t\t\t\t\tpropertySheetPage.refresh();\n+\t\t\t\t\t\t\t}\n \t\t\t\t\t\t}\n \t\t\t\t\t}\n \t\t\t\t});\n@@ -1382,25 +1397,24 @@ public void selectionChanged(SelectionChangedEvent event) {\n \t * @generated\n \t */\n \tpublic IPropertySheetPage getPropertySheetPage() {\n-\t\tif (propertySheetPage == null) {\n-\t\t\tpropertySheetPage = new ExtendedPropertySheetPage(editingDomain) {\n-\t\t\t\t@Override\n-\t\t\t\tpublic void setSelectionToViewer(List<?> selection) {\n-\t\t\t\t\tEnvironmentEditor.this.setSelectionToViewer(selection);\n-\t\t\t\t\tEnvironmentEditor.this.setFocus();\n-\t\t\t\t}\n+\t\tPropertySheetPage propertySheetPage = new ExtendedPropertySheetPage(\n+\t\t\t\teditingDomain) {\n+\t\t\t@Override\n+\t\t\tpublic void setSelectionToViewer(List<?> selection) {\n+\t\t\t\tEnvironmentEditor.this.setSelectionToViewer(selection);\n+\t\t\t\tEnvironmentEditor.this.setFocus();\n+\t\t\t}\n \n-\t\t\t\t@Override\n-\t\t\t\tpublic void setActionBars(IActionBars actionBars) {\n-\t\t\t\t\tsuper.setActionBars(actionBars);\n-\t\t\t\t\tgetActionBarContributor().shareGlobalActions(this,\n-\t\t\t\t\t\t\tactionBars);\n-\t\t\t\t}\n-\t\t\t};\n-\t\t\tpropertySheetPage\n-\t\t\t\t\t.setPropertySourceProvider(new AdapterFactoryContentProvider(\n-\t\t\t\t\t\t\tadapterFactory));\n-\t\t}\n+\t\t\t@Override\n+\t\t\tpublic void setActionBars(IActionBars actionBars) {\n+\t\t\t\tsuper.setActionBars(actionBars);\n+\t\t\t\tgetActionBarContributor().shareGlobalActions(this, actionBars);\n+\t\t\t}\n+\t\t};\n+\t\tpropertySheetPage\n+\t\t\t\t.setPropertySourceProvider(new AdapterFactoryContentProvider(\n+\t\t\t\t\t\tadapterFactory));\n+\t\tpropertySheetPages.add(propertySheetPage);\n \n \t\treturn propertySheetPage;\n \t}\n@@ -1526,7 +1540,7 @@ public void execute(IProgressMonitor monitor) {\n \n \t/**\n \t * This returns whether something has been persisted to the URI of the specified resource.\n-\t * The implementation uses the URI converter from the editor's resource set to try to open an input stream. \n+\t * The implementation uses the URI converter from the editor's resource set to try to open an input stream.\n \t * <!-- begin-user-doc -->\n \t * <!-- end-user-doc -->\n \t * @generated\n@@ -1599,22 +1613,10 @@ protected void doSaveAs(URI uri, IEditorInput editorInput) {\n \t * @generated\n \t */\n \tpublic void gotoMarker(IMarker marker) {\n-\t\ttry {\n-\t\t\tif (marker.getType().equals(EValidator.MARKER)) {\n-\t\t\t\tString uriAttribute = marker.getAttribute(\n-\t\t\t\t\t\tEValidator.URI_ATTRIBUTE, null);\n-\t\t\t\tif (uriAttribute != null) {\n-\t\t\t\t\tURI uri = URI.createURI(uriAttribute);\n-\t\t\t\t\tEObject eObject = editingDomain.getResourceSet()\n-\t\t\t\t\t\t\t.getEObject(uri, true);\n-\t\t\t\t\tif (eObject != null) {\n-\t\t\t\t\t\tsetSelectionToViewer(Collections\n-\t\t\t\t\t\t\t\t.singleton(editingDomain.getWrapper(eObject)));\n-\t\t\t\t\t}\n-\t\t\t\t}\n-\t\t\t}\n-\t\t} catch (CoreException exception) {\n-\t\t\tEnvironmentEditorPlugin.INSTANCE.log(exception);\n+\t\tList<?> targetObjects = markerHelper.getTargetObjects(editingDomain,\n+\t\t\t\tmarker);\n+\t\tif (!targetObjects.isEmpty()) {\n+\t\t\tsetSelectionToViewer(targetObjects);\n \t\t}\n \t}\n \n@@ -1817,7 +1819,7 @@ public void dispose() {\n \t\t\tgetActionBarContributor().setActiveEditor(null);\n \t\t}\n \n-\t\tif (propertySheetPage != null) {\n+\t\tfor (PropertySheetPage propertySheetPage : propertySheetPages) {\n \t\t\tpropertySheetPage.dispose();\n \t\t}\n ", "raw_url": "https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.editor%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2Fpresentation%2FEnvironmentEditor.java", "sha": "7d1af48e7b8bef10e75163f30933183c5ba25098", "status": "modified" }, { "additions": 11, "blob_url": "https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment%2Fmodel%2Fenvironment.ecore", "changes": 20, "contents_url": "https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment%2Fmodel%2Fenvironment.ecore?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6", "deletions": 9, "filename": "models/environment/plugins/org.obeonetwork.dsl.environment/model/environment.ecore", "new_code": " <eOperations name=\"isSubtypeOf\" lowerBound=\"1\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean\">\n <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"ownedAttributes\" upperBound=\"-1\"\n eType=\"#//Attribute\" containment=\"true\" eOpposite=\"#//Attribute/containingType\"/>\n <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"ownedReferences\" upperBound=\"-1\"\n eType=\"#//Reference\" containment=\"true\" eOpposite=\"#//Reference/containingType\"/>\n <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"containingType\" lowerBound=\"1\"\n eType=\"#//StructuredType\" eOpposite=\"#//StructuredType/ownedAttributes\"/>\n <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"containingType\" lowerBound=\"1\"\n eType=\"#//StructuredType\" eOpposite=\"#//StructuredType/ownedReferences\"/>\n <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"referencedType\" lowerBound=\"1\"\n eType=\"#//StructuredType\"/>", "new_methods": [], "old_code": " <eOperations name=\"isSubtypeOf\" lowerBound=\"1\" eType=\"ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EBoolean\">\n <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"ownedAttributes\" eType=\"#//Attribute\"\n eOpposite=\"#//Attribute/dto\"/>\n <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"ownedReferences\" eType=\"#//Reference\"\n eOpposite=\"#//Reference/type\"/>\n <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"dto\" lowerBound=\"1\" eType=\"#//StructuredType\"\n eOpposite=\"#//StructuredType/ownedAttributes\"/>\n <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"type\" lowerBound=\"1\" eType=\"#//StructuredType\"\n eOpposite=\"#//StructuredType/ownedReferences\"/>", "old_methods": [], "patch": "@@ -73,18 +73,18 @@\n </eClassifiers>\n <eClassifiers xsi:type=\"ecore:EClass\" name=\"Behaviour\" abstract=\"true\" eSuperTypes=\"#//ObeoDSMObject\"/>\n <eClassifiers xsi:type=\"ecore:EClass\" name=\"StructuredType\" abstract=\"true\" eSuperTypes=\"#//Type\">\n- <eOperations name=\"isSubtypeOf\" lowerBound=\"1\" eType=\"ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EBoolean\">\n+ <eOperations name=\"isSubtypeOf\" lowerBound=\"1\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean\">\n <eParameters name=\"type\" eType=\"#//StructuredType\"/>\n </eOperations>\n <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"supertype\" eType=\"#//StructuredType\"/>\n <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"associatedTypes\" upperBound=\"-1\"\n eType=\"#//StructuredType\"/>\n- <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"ownedAttributes\" eType=\"#//Attribute\"\n- eOpposite=\"#//Attribute/dto\"/>\n+ <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"ownedAttributes\" upperBound=\"-1\"\n+ eType=\"#//Attribute\" containment=\"true\" eOpposite=\"#//Attribute/containingType\"/>\n <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"attributes\" upperBound=\"-1\"\n eType=\"#//Attribute\" changeable=\"false\" volatile=\"true\" transient=\"true\" derived=\"true\"/>\n- <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"ownedReferences\" eType=\"#//Reference\"\n- eOpposite=\"#//Reference/type\"/>\n+ <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"ownedReferences\" upperBound=\"-1\"\n+ eType=\"#//Reference\" containment=\"true\" eOpposite=\"#//Reference/containingType\"/>\n <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"references\" upperBound=\"-1\"\n eType=\"#//Reference\" changeable=\"false\" volatile=\"true\" transient=\"true\" derived=\"true\"/>\n <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"properties\" upperBound=\"-1\"\n@@ -114,8 +114,8 @@\n </eClassifiers>\n <eClassifiers xsi:type=\"ecore:EClass\" name=\"Attribute\" eSuperTypes=\"#//Property\">\n <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"type\" lowerBound=\"1\" eType=\"#//PrimitiveType\"/>\n- <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"dto\" lowerBound=\"1\" eType=\"#//StructuredType\"\n- eOpposite=\"#//StructuredType/ownedAttributes\"/>\n+ <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"containingType\" lowerBound=\"1\"\n+ eType=\"#//StructuredType\" eOpposite=\"#//StructuredType/ownedAttributes\"/>\n </eClassifiers>\n <eClassifiers xsi:type=\"ecore:EClass\" name=\"Reference\" eSuperTypes=\"#//Property\">\n <eOperations name=\"canBeOppositeOf\" lowerBound=\"1\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean\">\n@@ -126,8 +126,10 @@\n <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"navigable\" lowerBound=\"1\"\n eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean\" defaultValueLiteral=\"true\"/>\n <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"oppositeOf\" eType=\"#//Reference\"/>\n- <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"type\" lowerBound=\"1\" eType=\"#//StructuredType\"\n- eOpposite=\"#//StructuredType/ownedReferences\"/>\n+ <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"containingType\" lowerBound=\"1\"\n+ eType=\"#//StructuredType\" eOpposite=\"#//StructuredType/ownedReferences\"/>\n+ <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"referencedType\" lowerBound=\"1\"\n+ eType=\"#//StructuredType\"/>\n </eClassifiers>\n <eClassifiers xsi:type=\"ecore:EClass\" name=\"Property\" abstract=\"true\" eSuperTypes=\"#//ObeoDSMObject #//BoundableElement\">\n <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"name\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString\"/>", "raw_url": "https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment%2Fmodel%2Fenvironment.ecore", "sha": "4d057bfbe3d1320d48245aa0b482b7b6183fecf2", "status": "modified" }, { "additions": 17, "blob_url": "https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment%2Fmodel%2Fenvironment.genmodel", "changes": 31, "contents_url": "https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment%2Fmodel%2Fenvironment.genmodel?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6", "deletions": 14, "filename": "models/environment/plugins/org.obeonetwork.dsl.environment/model/environment.genmodel", "new_code": " <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference environment.ecore#//Environment/namespaces\"/>\n <genClasses image=\"false\" ecoreClass=\"environment.ecore#//StructuredType\">\n <genFeatures notify=\"false\" createChild=\"false\" propertySortChoices=\"true\" ecoreFeature=\"ecore:EReference environment.ecore#//StructuredType/supertype\"/>\n <genFeatures notify=\"false\" createChild=\"false\" propertySortChoices=\"true\" ecoreFeature=\"ecore:EReference environment.ecore#//StructuredType/associatedTypes\"/>\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference environment.ecore#//StructuredType/ownedAttributes\"/>\n <genFeatures property=\"Readonly\" notify=\"false\" createChild=\"false\" ecoreFeature=\"ecore:EReference environment.ecore#//StructuredType/attributes\"/>\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference environment.ecore#//StructuredType/ownedReferences\"/>\n <genFeatures property=\"Readonly\" notify=\"false\" createChild=\"false\" ecoreFeature=\"ecore:EReference environment.ecore#//StructuredType/references\"/>\n <genFeatures property=\"Readonly\" notify=\"false\" createChild=\"false\" ecoreFeature=\"ecore:EReference environment.ecore#//StructuredType/properties\"/>\n <genOperations ecoreOperation=\"environment.ecore#//StructuredType/isSubtypeOf\">\n <genParameters ecoreParameter=\"environment.ecore#//StructuredType/isSubtypeOf/type\"/>\n </genOperations>\n </genClasses>\n <genFeatures property=\"None\" notify=\"false\" createChild=\"false\" ecoreFeature=\"ecore:EReference environment.ecore#//Attribute/containingType\"/>\n <genFeatures property=\"None\" notify=\"false\" createChild=\"false\" ecoreFeature=\"ecore:EReference environment.ecore#//Reference/containingType\"/>\n <genFeatures notify=\"false\" createChild=\"false\" propertySortChoices=\"true\" ecoreFeature=\"ecore:EReference environment.ecore#//Reference/referencedType\"/>\n <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute environment.ecore#//Property/isIdentifier\"/>", "new_methods": [], "old_code": " <genClasses image=\"false\" ecoreClass=\"environment.ecore#//StructuredType\"/>\n <genFeatures notify=\"false\" createChild=\"false\" propertySortChoices=\"true\" ecoreFeature=\"ecore:EReference environment.ecore#//DTO/associatedTypes\"/>\n <genFeatures property=\"Readonly\" notify=\"false\" createChild=\"false\" ecoreFeature=\"ecore:EReference environment.ecore#//DTO/properties\"/>\n <genFeatures property=\"Readonly\" notify=\"false\" createChild=\"false\" ecoreFeature=\"ecore:EReference environment.ecore#//DTO/references\"/>\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference environment.ecore#//DTO/ownedReferences\"/>\n <genFeatures property=\"Readonly\" notify=\"false\" createChild=\"false\" ecoreFeature=\"ecore:EReference environment.ecore#//DTO/attributes\"/>\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference environment.ecore#//DTO/ownedAttributes\"/>\n <genFeatures notify=\"false\" createChild=\"false\" propertySortChoices=\"true\" ecoreFeature=\"ecore:EReference environment.ecore#//DTO/supertype\"/>\n <genOperations ecoreOperation=\"environment.ecore#//DTO/isSubtypeOf\">\n <genParameters ecoreParameter=\"environment.ecore#//DTO/isSubtypeOf/dto\"/>\n </genOperations>\n <genFeatures property=\"None\" notify=\"false\" createChild=\"false\" ecoreFeature=\"ecore:EReference environment.ecore#//Attribute/dto\"/>\n <genFeatures notify=\"false\" createChild=\"false\" propertySortChoices=\"true\" ecoreFeature=\"ecore:EReference environment.ecore#//Reference/type\"/>\n <genFeatures property=\"None\" notify=\"false\" createChild=\"false\" ecoreFeature=\"ecore:EReference environment.ecore#//Reference/dto\"/>", "old_methods": [], "patch": "@@ -25,6 +25,7 @@\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference environment.ecore#//Environment/links\"/>\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference environment.ecore#//Environment/priorityDefinitions\"/>\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference environment.ecore#//Environment/typesDefinition\"/>\n+ <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference environment.ecore#//Environment/namespaces\"/>\n </genClasses>\n <genClasses image=\"false\" ecoreClass=\"environment.ecore#//Type\">\n <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute environment.ecore#//Type/name\"/>\n@@ -72,19 +73,20 @@\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference environment.ecore#//TypesDefinition/types\"/>\n </genClasses>\n <genClasses image=\"false\" ecoreClass=\"environment.ecore#//Behaviour\"/>\n- <genClasses image=\"false\" ecoreClass=\"environment.ecore#//StructuredType\"/>\n+ <genClasses image=\"false\" ecoreClass=\"environment.ecore#//StructuredType\">\n+ <genFeatures notify=\"false\" createChild=\"false\" propertySortChoices=\"true\" ecoreFeature=\"ecore:EReference environment.ecore#//StructuredType/supertype\"/>\n+ <genFeatures notify=\"false\" createChild=\"false\" propertySortChoices=\"true\" ecoreFeature=\"ecore:EReference environment.ecore#//StructuredType/associatedTypes\"/>\n+ <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference environment.ecore#//StructuredType/ownedAttributes\"/>\n+ <genFeatures property=\"Readonly\" notify=\"false\" createChild=\"false\" ecoreFeature=\"ecore:EReference environment.ecore#//StructuredType/attributes\"/>\n+ <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference environment.ecore#//StructuredType/ownedReferences\"/>\n+ <genFeatures property=\"Readonly\" notify=\"false\" createChild=\"false\" ecoreFeature=\"ecore:EReference environment.ecore#//StructuredType/references\"/>\n+ <genFeatures property=\"Readonly\" notify=\"false\" createChild=\"false\" ecoreFeature=\"ecore:EReference environment.ecore#//StructuredType/properties\"/>\n+ <genOperations ecoreOperation=\"environment.ecore#//StructuredType/isSubtypeOf\">\n+ <genParameters ecoreParameter=\"environment.ecore#//StructuredType/isSubtypeOf/type\"/>\n+ </genOperations>\n+ </genClasses>\n <genClasses ecoreClass=\"environment.ecore#//DTO\">\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference environment.ecore#//DTO/ownedContainer\"/>\n- <genFeatures notify=\"false\" createChild=\"false\" propertySortChoices=\"true\" ecoreFeature=\"ecore:EReference environment.ecore#//DTO/associatedTypes\"/>\n- <genFeatures property=\"Readonly\" notify=\"false\" createChild=\"false\" ecoreFeature=\"ecore:EReference environment.ecore#//DTO/properties\"/>\n- <genFeatures property=\"Readonly\" notify=\"false\" createChild=\"false\" ecoreFeature=\"ecore:EReference environment.ecore#//DTO/references\"/>\n- <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference environment.ecore#//DTO/ownedReferences\"/>\n- <genFeatures property=\"Readonly\" notify=\"false\" createChild=\"false\" ecoreFeature=\"ecore:EReference environment.ecore#//DTO/attributes\"/>\n- <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference environment.ecore#//DTO/ownedAttributes\"/>\n- <genFeatures notify=\"false\" createChild=\"false\" propertySortChoices=\"true\" ecoreFeature=\"ecore:EReference environment.ecore#//DTO/supertype\"/>\n- <genOperations ecoreOperation=\"environment.ecore#//DTO/isSubtypeOf\">\n- <genParameters ecoreParameter=\"environment.ecore#//DTO/isSubtypeOf/dto\"/>\n- </genOperations>\n </genClasses>\n <genClasses ecoreClass=\"environment.ecore#//FilterContainer\">\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference environment.ecore#//FilterContainer/ownedFilters\"/>\n@@ -97,21 +99,22 @@\n </genClasses>\n <genClasses ecoreClass=\"environment.ecore#//Attribute\">\n <genFeatures notify=\"false\" createChild=\"false\" propertySortChoices=\"true\" ecoreFeature=\"ecore:EReference environment.ecore#//Attribute/type\"/>\n- <genFeatures property=\"None\" notify=\"false\" createChild=\"false\" ecoreFeature=\"ecore:EReference environment.ecore#//Attribute/dto\"/>\n+ <genFeatures property=\"None\" notify=\"false\" createChild=\"false\" ecoreFeature=\"ecore:EReference environment.ecore#//Attribute/containingType\"/>\n </genClasses>\n <genClasses ecoreClass=\"environment.ecore#//Reference\">\n <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute environment.ecore#//Reference/isComposite\"/>\n <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute environment.ecore#//Reference/navigable\"/>\n <genFeatures notify=\"false\" createChild=\"false\" propertySortChoices=\"true\" ecoreFeature=\"ecore:EReference environment.ecore#//Reference/oppositeOf\"/>\n- <genFeatures notify=\"false\" createChild=\"false\" propertySortChoices=\"true\" ecoreFeature=\"ecore:EReference environment.ecore#//Reference/type\"/>\n- <genFeatures property=\"None\" notify=\"false\" createChild=\"false\" ecoreFeature=\"ecore:EReference environment.ecore#//Reference/dto\"/>\n+ <genFeatures property=\"None\" notify=\"false\" createChild=\"false\" ecoreFeature=\"ecore:EReference environment.ecore#//Reference/containingType\"/>\n+ <genFeatures notify=\"false\" createChild=\"false\" propertySortChoices=\"true\" ecoreFeature=\"ecore:EReference environment.ecore#//Reference/referencedType\"/>\n <genOperations ecoreOperation=\"environment.ecore#//Reference/canBeOppositeOf\">\n <genParameters ecoreParameter=\"environment.ecore#//Reference/canBeOppositeOf/opposite\"/>\n </genOperations>\n </genClasses>\n <genClasses image=\"false\" ecoreClass=\"environment.ecore#//Property\">\n <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute environment.ecore#//Property/name\"/>\n <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute environment.ecore#//Property/multiplicity\"/>\n+ <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute environment.ecore#//Property/isIdentifier\"/>\n </genClasses>\n <genClasses ecoreClass=\"environment.ecore#//BindingInfo\">\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference environment.ecore#//BindingInfo/references\"/>", "raw_url": "https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment%2Fmodel%2Fenvironment.genmodel", "sha": "21ccc37ace974b8cc0106e761e2045f8cae15448", "status": "modified" }, { "additions": 13, "blob_url": "https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2FAttribute.java", "changes": 26, "contents_url": "https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2FAttribute.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6", "deletions": 13, "filename": "models/environment/plugins/org.obeonetwork.dsl.environment/src/org/obeonetwork/dsl/environment/Attribute.java", "new_code": " * <li>{@link org.obeonetwork.dsl.environment.Attribute#getContainingType <em>Containing Type</em>}</li>\n\t * Returns the value of the '<em><b>Containing Type</b></em>' container reference.\n\t * It is bidirectional and its opposite is '{@link org.obeonetwork.dsl.environment.StructuredType#getOwnedAttributes <em>Owned Attributes</em>}'.\n\t * If the meaning of the '<em>Containing Type</em>' container reference isn't clear,\n\t * @return the value of the '<em>Containing Type</em>' container reference.\n\t * @see #setContainingType(StructuredType)\n\t * @see org.obeonetwork.dsl.environment.EnvironmentPackage#getAttribute_ContainingType()\n\t * @see org.obeonetwork.dsl.environment.StructuredType#getOwnedAttributes\n\tStructuredType getContainingType();\n\t * Sets the value of the '{@link org.obeonetwork.dsl.environment.Attribute#getContainingType <em>Containing Type</em>}' container reference.\n\t * @param value the new value of the '<em>Containing Type</em>' container reference.\n\t * @see #getContainingType()\n\tvoid setContainingType(StructuredType value);", "new_methods": [], "old_code": " * <li>{@link org.obeonetwork.dsl.environment.Attribute#getDto <em>Dto</em>}</li>\n\t * Returns the value of the '<em><b>Dto</b></em>' container reference.\n\t * It is bidirectional and its opposite is '{@link org.obeonetwork.dsl.environment.DTO#getOwnedAttributes <em>Owned Attributes</em>}'.\n\t * If the meaning of the '<em>Dto</em>' container reference isn't clear,\n\t * @return the value of the '<em>Dto</em>' container reference.\n\t * @see #setDto(DTO)\n\t * @see org.obeonetwork.dsl.environment.EnvironmentPackage#getAttribute_Dto()\n\t * @see org.obeonetwork.dsl.environment.DTO#getOwnedAttributes\n\tDTO getDto();\n\t * Sets the value of the '{@link org.obeonetwork.dsl.environment.Attribute#getDto <em>Dto</em>}' container reference.\n\t * @param value the new value of the '<em>Dto</em>' container reference.\n\t * @see #getDto()\n\tvoid setDto(DTO value);", "old_methods": [], "patch": "@@ -21,7 +21,7 @@\n * The following features are supported:\n * <ul>\n * <li>{@link org.obeonetwork.dsl.environment.Attribute#getType <em>Type</em>}</li>\n- * <li>{@link org.obeonetwork.dsl.environment.Attribute#getDto <em>Dto</em>}</li>\n+ * <li>{@link org.obeonetwork.dsl.environment.Attribute#getContainingType <em>Containing Type</em>}</li>\n * </ul>\n * </p>\n *\n@@ -64,31 +64,31 @@ public interface Attribute extends Property {\n \tvoid setType(PrimitiveType value);\n \n \t/**\n-\t * Returns the value of the '<em><b>Dto</b></em>' container reference.\n-\t * It is bidirectional and its opposite is '{@link org.obeonetwork.dsl.environment.DTO#getOwnedAttributes <em>Owned Attributes</em>}'.\n+\t * Returns the value of the '<em><b>Containing Type</b></em>' container reference.\n+\t * It is bidirectional and its opposite is '{@link org.obeonetwork.dsl.environment.StructuredType#getOwnedAttributes <em>Owned Attributes</em>}'.\n \t * <!-- begin-user-doc -->\n \t * <p>\n-\t * If the meaning of the '<em>Dto</em>' container reference isn't clear,\n+\t * If the meaning of the '<em>Containing Type</em>' container reference isn't clear,\n \t * there really should be more of a description here...\n \t * </p>\n \t * <!-- end-user-doc -->\n-\t * @return the value of the '<em>Dto</em>' container reference.\n-\t * @see #setDto(DTO)\n-\t * @see org.obeonetwork.dsl.environment.EnvironmentPackage#getAttribute_Dto()\n-\t * @see org.obeonetwork.dsl.environment.DTO#getOwnedAttributes\n+\t * @return the value of the '<em>Containing Type</em>' container reference.\n+\t * @see #setContainingType(StructuredType)\n+\t * @see org.obeonetwork.dsl.environment.EnvironmentPackage#getAttribute_ContainingType()\n+\t * @see org.obeonetwork.dsl.environment.StructuredType#getOwnedAttributes\n \t * @model opposite=\"ownedAttributes\" required=\"true\" transient=\"false\"\n \t * @generated\n \t */\n-\tDTO getDto();\n+\tStructuredType getContainingType();\n \n \t/**\n-\t * Sets the value of the '{@link org.obeonetwork.dsl.environment.Attribute#getDto <em>Dto</em>}' container reference.\n+\t * Sets the value of the '{@link org.obeonetwork.dsl.environment.Attribute#getContainingType <em>Containing Type</em>}' container reference.\n \t * <!-- begin-user-doc -->\n \t * <!-- end-user-doc -->\n-\t * @param value the new value of the '<em>Dto</em>' container reference.\n-\t * @see #getDto()\n+\t * @param value the new value of the '<em>Containing Type</em>' container reference.\n+\t * @see #getContainingType()\n \t * @generated\n \t */\n-\tvoid setDto(DTO value);\n+\tvoid setContainingType(StructuredType value);\n \n } // Attribute", "raw_url": "https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2FAttribute.java", "sha": "55797de58d7d8ca444325cb71f9d9b884bd62bb7", "status": "modified" }, { "additions": 0, "blob_url": "https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2FDTO.java", "changes": 143, "contents_url": "https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2FDTO.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6", "deletions": 143, "filename": "models/environment/plugins/org.obeonetwork.dsl.environment/src/org/obeonetwork/dsl/environment/DTO.java", "new_code": "", "new_methods": [], "old_code": "import org.eclipse.emf.common.util.EList;\n\n * <li>{@link org.obeonetwork.dsl.environment.DTO#getAssociatedTypes <em>Associated Types</em>}</li>\n * <li>{@link org.obeonetwork.dsl.environment.DTO#getProperties <em>Properties</em>}</li>\n * <li>{@link org.obeonetwork.dsl.environment.DTO#getReferences <em>References</em>}</li>\n * <li>{@link org.obeonetwork.dsl.environment.DTO#getOwnedReferences <em>Owned References</em>}</li>\n * <li>{@link org.obeonetwork.dsl.environment.DTO#getAttributes <em>Attributes</em>}</li>\n * <li>{@link org.obeonetwork.dsl.environment.DTO#getOwnedAttributes <em>Owned Attributes</em>}</li>\n * <li>{@link org.obeonetwork.dsl.environment.DTO#getSupertype <em>Supertype</em>}</li>\n\t/**\n\t * Returns the value of the '<em><b>Associated Types</b></em>' reference list.\n\t * The list contents are of type {@link org.obeonetwork.dsl.environment.StructuredType}.\n\t * <!-- begin-user-doc -->\n\t * <p>\n\t * If the meaning of the '<em>Associated Types</em>' reference list isn't clear,\n\t * there really should be more of a description here...\n\t * </p>\n\t * <!-- end-user-doc -->\n\t * @return the value of the '<em>Associated Types</em>' reference list.\n\t * @see org.obeonetwork.dsl.environment.EnvironmentPackage#getDTO_AssociatedTypes()\n\t * @model\n\t * @generated\n\t */\n\tEList<StructuredType> getAssociatedTypes();\n\n\t/**\n\t * Returns the value of the '<em><b>Properties</b></em>' reference list.\n\t * The list contents are of type {@link org.obeonetwork.dsl.environment.Property}.\n\t * <!-- begin-user-doc -->\n\t * <p>\n\t * If the meaning of the '<em>Properties</em>' reference list isn't clear,\n\t * there really should be more of a description here...\n\t * </p>\n\t * <!-- end-user-doc -->\n\t * @return the value of the '<em>Properties</em>' reference list.\n\t * @see org.obeonetwork.dsl.environment.EnvironmentPackage#getDTO_Properties()\n\t * @model transient=\"true\" changeable=\"false\" volatile=\"true\" derived=\"true\"\n\t * @generated\n\t */\n\tEList<Property> getProperties();\n\n\t/**\n\t * Returns the value of the '<em><b>References</b></em>' reference list.\n\t * The list contents are of type {@link org.obeonetwork.dsl.environment.Reference}.\n\t * <!-- begin-user-doc -->\n\t * <p>\n\t * If the meaning of the '<em>References</em>' reference list isn't clear,\n\t * there really should be more of a description here...\n\t * </p>\n\t * <!-- end-user-doc -->\n\t * @return the value of the '<em>References</em>' reference list.\n\t * @see org.obeonetwork.dsl.environment.EnvironmentPackage#getDTO_References()\n\t * @model transient=\"true\" changeable=\"false\" volatile=\"true\" derived=\"true\"\n\t * @generated\n\t */\n\tEList<Reference> getReferences();\n\n\t/**\n\t * Returns the value of the '<em><b>Owned References</b></em>' containment reference list.\n\t * The list contents are of type {@link org.obeonetwork.dsl.environment.Reference}.\n\t * It is bidirectional and its opposite is '{@link org.obeonetwork.dsl.environment.Reference#getDto <em>Dto</em>}'.\n\t * <!-- begin-user-doc -->\n\t * <p>\n\t * If the meaning of the '<em>Owned References</em>' containment reference list isn't clear,\n\t * there really should be more of a description here...\n\t * </p>\n\t * <!-- end-user-doc -->\n\t * @return the value of the '<em>Owned References</em>' containment reference list.\n\t * @see org.obeonetwork.dsl.environment.EnvironmentPackage#getDTO_OwnedReferences()\n\t * @see org.obeonetwork.dsl.environment.Reference#getDto\n\t * @model opposite=\"dto\" containment=\"true\" resolveProxies=\"true\"\n\t * @generated\n\t */\n\tEList<Reference> getOwnedReferences();\n\n\t/**\n\t * Returns the value of the '<em><b>Attributes</b></em>' reference list.\n\t * The list contents are of type {@link org.obeonetwork.dsl.environment.Attribute}.\n\t * <!-- begin-user-doc -->\n\t * <p>\n\t * If the meaning of the '<em>Attributes</em>' reference list isn't clear,\n\t * there really should be more of a description here...\n\t * </p>\n\t * <!-- end-user-doc -->\n\t * @return the value of the '<em>Attributes</em>' reference list.\n\t * @see org.obeonetwork.dsl.environment.EnvironmentPackage#getDTO_Attributes()\n\t * @model transient=\"true\" changeable=\"false\" volatile=\"true\" derived=\"true\"\n\t * @generated\n\t */\n\tEList<Attribute> getAttributes();\n\n\t/**\n\t * Returns the value of the '<em><b>Owned Attributes</b></em>' containment reference list.\n\t * The list contents are of type {@link org.obeonetwork.dsl.environment.Attribute}.\n\t * It is bidirectional and its opposite is '{@link org.obeonetwork.dsl.environment.Attribute#getDto <em>Dto</em>}'.\n\t * <!-- begin-user-doc -->\n\t * <p>\n\t * If the meaning of the '<em>Owned Attributes</em>' containment reference list isn't clear,\n\t * there really should be more of a description here...\n\t * </p>\n\t * <!-- end-user-doc -->\n\t * @return the value of the '<em>Owned Attributes</em>' containment reference list.\n\t * @see org.obeonetwork.dsl.environment.EnvironmentPackage#getDTO_OwnedAttributes()\n\t * @see org.obeonetwork.dsl.environment.Attribute#getDto\n\t * @model opposite=\"dto\" containment=\"true\" resolveProxies=\"true\"\n\t * @generated\n\t */\n\tEList<Attribute> getOwnedAttributes();\n\n\t/**\n\t * Returns the value of the '<em><b>Supertype</b></em>' reference.\n\t * <!-- begin-user-doc -->\n\t * <p>\n\t * If the meaning of the '<em>Supertype</em>' reference isn't clear,\n\t * there really should be more of a description here...\n\t * </p>\n\t * <!-- end-user-doc -->\n\t * @return the value of the '<em>Supertype</em>' reference.\n\t * @see #setSupertype(DTO)\n\t * @see org.obeonetwork.dsl.environment.EnvironmentPackage#getDTO_Supertype()\n\t * @model\n\t * @generated\n\t */\n\tDTO getSupertype();\n\n\t/**\n\t * Sets the value of the '{@link org.obeonetwork.dsl.environment.DTO#getSupertype <em>Supertype</em>}' reference.\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @param value the new value of the '<em>Supertype</em>' reference.\n\t * @see #getSupertype()\n\t * @generated\n\t */\n\tvoid setSupertype(DTO value);\n\n\t/**\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @model required=\"true\"\n\t * @generated\n\t */\n\tboolean isSubtypeOf(DTO dto);\n", "old_methods": [], "patch": "@@ -12,8 +12,6 @@\n */\n package org.obeonetwork.dsl.environment;\n \n-import org.eclipse.emf.common.util.EList;\n-\n /**\n * <!-- begin-user-doc -->\n * A representation of the model object '<em><b>DTO</b></em>'.\n@@ -23,13 +21,6 @@\n * The following features are supported:\n * <ul>\n * <li>{@link org.obeonetwork.dsl.environment.DTO#getOwnedContainer <em>Owned Container</em>}</li>\n- * <li>{@link org.obeonetwork.dsl.environment.DTO#getAssociatedTypes <em>Associated Types</em>}</li>\n- * <li>{@link org.obeonetwork.dsl.environment.DTO#getProperties <em>Properties</em>}</li>\n- * <li>{@link org.obeonetwork.dsl.environment.DTO#getReferences <em>References</em>}</li>\n- * <li>{@link org.obeonetwork.dsl.environment.DTO#getOwnedReferences <em>Owned References</em>}</li>\n- * <li>{@link org.obeonetwork.dsl.environment.DTO#getAttributes <em>Attributes</em>}</li>\n- * <li>{@link org.obeonetwork.dsl.environment.DTO#getOwnedAttributes <em>Owned Attributes</em>}</li>\n- * <li>{@link org.obeonetwork.dsl.environment.DTO#getSupertype <em>Supertype</em>}</li>\n * </ul>\n * </p>\n *\n@@ -71,138 +62,4 @@ public interface DTO extends StructuredType {\n \t */\n \tvoid setOwnedContainer(FilterContainer value);\n \n-\t/**\n-\t * Returns the value of the '<em><b>Associated Types</b></em>' reference list.\n-\t * The list contents are of type {@link org.obeonetwork.dsl.environment.StructuredType}.\n-\t * <!-- begin-user-doc -->\n-\t * <p>\n-\t * If the meaning of the '<em>Associated Types</em>' reference list isn't clear,\n-\t * there really should be more of a description here...\n-\t * </p>\n-\t * <!-- end-user-doc -->\n-\t * @return the value of the '<em>Associated Types</em>' reference list.\n-\t * @see org.obeonetwork.dsl.environment.EnvironmentPackage#getDTO_AssociatedTypes()\n-\t * @model\n-\t * @generated\n-\t */\n-\tEList<StructuredType> getAssociatedTypes();\n-\n-\t/**\n-\t * Returns the value of the '<em><b>Properties</b></em>' reference list.\n-\t * The list contents are of type {@link org.obeonetwork.dsl.environment.Property}.\n-\t * <!-- begin-user-doc -->\n-\t * <p>\n-\t * If the meaning of the '<em>Properties</em>' reference list isn't clear,\n-\t * there really should be more of a description here...\n-\t * </p>\n-\t * <!-- end-user-doc -->\n-\t * @return the value of the '<em>Properties</em>' reference list.\n-\t * @see org.obeonetwork.dsl.environment.EnvironmentPackage#getDTO_Properties()\n-\t * @model transient=\"true\" changeable=\"false\" volatile=\"true\" derived=\"true\"\n-\t * @generated\n-\t */\n-\tEList<Property> getProperties();\n-\n-\t/**\n-\t * Returns the value of the '<em><b>References</b></em>' reference list.\n-\t * The list contents are of type {@link org.obeonetwork.dsl.environment.Reference}.\n-\t * <!-- begin-user-doc -->\n-\t * <p>\n-\t * If the meaning of the '<em>References</em>' reference list isn't clear,\n-\t * there really should be more of a description here...\n-\t * </p>\n-\t * <!-- end-user-doc -->\n-\t * @return the value of the '<em>References</em>' reference list.\n-\t * @see org.obeonetwork.dsl.environment.EnvironmentPackage#getDTO_References()\n-\t * @model transient=\"true\" changeable=\"false\" volatile=\"true\" derived=\"true\"\n-\t * @generated\n-\t */\n-\tEList<Reference> getReferences();\n-\n-\t/**\n-\t * Returns the value of the '<em><b>Owned References</b></em>' containment reference list.\n-\t * The list contents are of type {@link org.obeonetwork.dsl.environment.Reference}.\n-\t * It is bidirectional and its opposite is '{@link org.obeonetwork.dsl.environment.Reference#getDto <em>Dto</em>}'.\n-\t * <!-- begin-user-doc -->\n-\t * <p>\n-\t * If the meaning of the '<em>Owned References</em>' containment reference list isn't clear,\n-\t * there really should be more of a description here...\n-\t * </p>\n-\t * <!-- end-user-doc -->\n-\t * @return the value of the '<em>Owned References</em>' containment reference list.\n-\t * @see org.obeonetwork.dsl.environment.EnvironmentPackage#getDTO_OwnedReferences()\n-\t * @see org.obeonetwork.dsl.environment.Reference#getDto\n-\t * @model opposite=\"dto\" containment=\"true\" resolveProxies=\"true\"\n-\t * @generated\n-\t */\n-\tEList<Reference> getOwnedReferences();\n-\n-\t/**\n-\t * Returns the value of the '<em><b>Attributes</b></em>' reference list.\n-\t * The list contents are of type {@link org.obeonetwork.dsl.environment.Attribute}.\n-\t * <!-- begin-user-doc -->\n-\t * <p>\n-\t * If the meaning of the '<em>Attributes</em>' reference list isn't clear,\n-\t * there really should be more of a description here...\n-\t * </p>\n-\t * <!-- end-user-doc -->\n-\t * @return the value of the '<em>Attributes</em>' reference list.\n-\t * @see org.obeonetwork.dsl.environment.EnvironmentPackage#getDTO_Attributes()\n-\t * @model transient=\"true\" changeable=\"false\" volatile=\"true\" derived=\"true\"\n-\t * @generated\n-\t */\n-\tEList<Attribute> getAttributes();\n-\n-\t/**\n-\t * Returns the value of the '<em><b>Owned Attributes</b></em>' containment reference list.\n-\t * The list contents are of type {@link org.obeonetwork.dsl.environment.Attribute}.\n-\t * It is bidirectional and its opposite is '{@link org.obeonetwork.dsl.environment.Attribute#getDto <em>Dto</em>}'.\n-\t * <!-- begin-user-doc -->\n-\t * <p>\n-\t * If the meaning of the '<em>Owned Attributes</em>' containment reference list isn't clear,\n-\t * there really should be more of a description here...\n-\t * </p>\n-\t * <!-- end-user-doc -->\n-\t * @return the value of the '<em>Owned Attributes</em>' containment reference list.\n-\t * @see org.obeonetwork.dsl.environment.EnvironmentPackage#getDTO_OwnedAttributes()\n-\t * @see org.obeonetwork.dsl.environment.Attribute#getDto\n-\t * @model opposite=\"dto\" containment=\"true\" resolveProxies=\"true\"\n-\t * @generated\n-\t */\n-\tEList<Attribute> getOwnedAttributes();\n-\n-\t/**\n-\t * Returns the value of the '<em><b>Supertype</b></em>' reference.\n-\t * <!-- begin-user-doc -->\n-\t * <p>\n-\t * If the meaning of the '<em>Supertype</em>' reference isn't clear,\n-\t * there really should be more of a description here...\n-\t * </p>\n-\t * <!-- end-user-doc -->\n-\t * @return the value of the '<em>Supertype</em>' reference.\n-\t * @see #setSupertype(DTO)\n-\t * @see org.obeonetwork.dsl.environment.EnvironmentPackage#getDTO_Supertype()\n-\t * @model\n-\t * @generated\n-\t */\n-\tDTO getSupertype();\n-\n-\t/**\n-\t * Sets the value of the '{@link org.obeonetwork.dsl.environment.DTO#getSupertype <em>Supertype</em>}' reference.\n-\t * <!-- begin-user-doc -->\n-\t * <!-- end-user-doc -->\n-\t * @param value the new value of the '<em>Supertype</em>' reference.\n-\t * @see #getSupertype()\n-\t * @generated\n-\t */\n-\tvoid setSupertype(DTO value);\n-\n-\t/**\n-\t * <!-- begin-user-doc -->\n-\t * <!-- end-user-doc -->\n-\t * @model required=\"true\"\n-\t * @generated\n-\t */\n-\tboolean isSubtypeOf(DTO dto);\n-\n } // DTO\n\\ No newline at end of file", "raw_url": "https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2FDTO.java", "sha": "3116b2339c707b49f0b287a50e851e129e93873c", "status": "modified" }, { "additions": 17, "blob_url": "https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2FEnvironment.java", "changes": 17, "contents_url": "https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2FEnvironment.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6", "deletions": 0, "filename": "models/environment/plugins/org.obeonetwork.dsl.environment/src/org/obeonetwork/dsl/environment/Environment.java", "new_code": " * <li>{@link org.obeonetwork.dsl.environment.Environment#getNamespaces <em>Namespaces</em>}</li>\n\t/**\n\t * Returns the value of the '<em><b>Namespaces</b></em>' containment reference list.\n\t * The list contents are of type {@link org.obeonetwork.dsl.environment.Namespace}.\n\t * <!-- begin-user-doc -->\n\t * <p>\n\t * If the meaning of the '<em>Namespaces</em>' containment reference list isn't clear,\n\t * there really should be more of a description here...\n\t * </p>\n\t * <!-- end-user-doc -->\n\t * @return the value of the '<em>Namespaces</em>' containment reference list.\n\t * @see org.obeonetwork.dsl.environment.EnvironmentPackage#getEnvironment_Namespaces()\n\t * @model containment=\"true\" resolveProxies=\"true\"\n\t * @generated\n\t */\n\tEList<Namespace> getNamespaces();\n", "new_methods": [], "old_code": "", "old_methods": [], "patch": "@@ -27,6 +27,7 @@\n * <li>{@link org.obeonetwork.dsl.environment.Environment#getLinks <em>Links</em>}</li>\n * <li>{@link org.obeonetwork.dsl.environment.Environment#getPriorityDefinitions <em>Priority Definitions</em>}</li>\n * <li>{@link org.obeonetwork.dsl.environment.Environment#getTypesDefinition <em>Types Definition</em>}</li>\n+ * <li>{@link org.obeonetwork.dsl.environment.Environment#getNamespaces <em>Namespaces</em>}</li>\n * </ul>\n * </p>\n *\n@@ -152,4 +153,20 @@ public interface Environment extends ObeoDSMObject {\n \t */\n \tvoid setTypesDefinition(TypesDefinition value);\n \n+\t/**\n+\t * Returns the value of the '<em><b>Namespaces</b></em>' containment reference list.\n+\t * The list contents are of type {@link org.obeonetwork.dsl.environment.Namespace}.\n+\t * <!-- begin-user-doc -->\n+\t * <p>\n+\t * If the meaning of the '<em>Namespaces</em>' containment reference list isn't clear,\n+\t * there really should be more of a description here...\n+\t * </p>\n+\t * <!-- end-user-doc -->\n+\t * @return the value of the '<em>Namespaces</em>' containment reference list.\n+\t * @see org.obeonetwork.dsl.environment.EnvironmentPackage#getEnvironment_Namespaces()\n+\t * @model containment=\"true\" resolveProxies=\"true\"\n+\t * @generated\n+\t */\n+\tEList<Namespace> getNamespaces();\n+\n } // Environment\n\\ No newline at end of file", "raw_url": "https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2FEnvironment.java", "sha": "d12b9d6b00192c815cdaa2a7d68c3eedad619761", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2FEnvironmentFactory.java", "changes": 3, "contents_url": "https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2FEnvironmentFactory.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6", "deletions": 2, "filename": "models/environment/plugins/org.obeonetwork.dsl.environment/src/org/obeonetwork/dsl/environment/EnvironmentFactory.java", "new_code": "", "new_methods": [], "old_code": " *\n * $Id$", "old_methods": [], "patch": "@@ -7,8 +7,6 @@\n * \n * Contributors:\n * Obeo - initial API and implementation\n- *\n- * $Id$\n */\n package org.obeonetwork.dsl.environment;\n \n@@ -29,6 +27,7 @@ public interface EnvironmentFactory extends EFactory {\n \t * @generated\n \t */\n \tString copyright = \"Copyright (c) 2008-2009 Obeo.\\nAll rights reserved. This program and the accompanying materials\\nare made available under the terms of the Eclipse Public License v1.0\\nwhich accompanies this distribution, and is available at\\nhttp://www.eclipse.org/legal/epl-v10.html\\n\\nContributors:\\n Obeo - initial API and implementation\";\n+\n \t/**\n \t * The singleton instance of the factory.\n \t * <!-- begin-user-doc -->", "raw_url": "https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2FEnvironmentFactory.java", "sha": "14106c175d69af813b603e9f164035dbac591a3f", "status": "modified" }, { "additions": 346, "blob_url": "https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2FEnvironmentPackage.java", "changes": 536, "contents_url": "https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2FEnvironmentPackage.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6", "deletions": 190, "filename": "models/environment/plugins/org.obeonetwork.dsl.environment/src/org/obeonetwork/dsl/environment/EnvironmentPackage.java", "new_code": "\tString eNS_URI = \"http://www.obeonetwork.org/dsl/environment/3.0.0\";\n\t/**\n\t * The meta object id for the '{@link org.obeonetwork.dsl.environment.impl.EnvironmentImpl <em>Environment</em>}' class.\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @see org.obeonetwork.dsl.environment.impl.EnvironmentImpl\n\t * @see org.obeonetwork.dsl.environment.impl.EnvironmentPackageImpl#getEnvironment()\n\t * @generated\n\t */\n\tint ENVIRONMENT = 0;\n\n\t/**\n\t * The feature id for the '<em><b>Namespaces</b></em>' containment reference list.\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @generated\n\t * @ordered\n\t */\n\tint ENVIRONMENT__NAMESPACES = OBEO_DSM_OBJECT_FEATURE_COUNT + 5;\n\n\tint ENVIRONMENT_FEATURE_COUNT = OBEO_DSM_OBJECT_FEATURE_COUNT + 6;\n\n\t/**\n\t * The meta object id for the '{@link org.obeonetwork.dsl.environment.impl.TypeImpl <em>Type</em>}' class.\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @see org.obeonetwork.dsl.environment.impl.TypeImpl\n\t * @see org.obeonetwork.dsl.environment.impl.EnvironmentPackageImpl#getType()\n\t * @generated\n\t */\n\tint TYPE = 1;\n\t/**\n\t * The meta object id for the '{@link org.obeonetwork.dsl.environment.impl.PrimitiveTypeImpl <em>Primitive Type</em>}' class.\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @see org.obeonetwork.dsl.environment.impl.PrimitiveTypeImpl\n\t * @see org.obeonetwork.dsl.environment.impl.EnvironmentPackageImpl#getPrimitiveType()\n\t * @generated\n\t */\n\tint PRIMITIVE_TYPE = 2;\n\n\t/**\n\t * The meta object id for the '{@link org.obeonetwork.dsl.environment.impl.EnumerationImpl <em>Enumeration</em>}' class.\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @see org.obeonetwork.dsl.environment.impl.EnumerationImpl\n\t * @see org.obeonetwork.dsl.environment.impl.EnvironmentPackageImpl#getEnumeration()\n\t * @generated\n\t */\n\tint ENUMERATION = 3;\n\n\t/**\n\t * The meta object id for the '{@link org.obeonetwork.dsl.environment.impl.FieldImpl <em>Field</em>}' class.\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @see org.obeonetwork.dsl.environment.impl.FieldImpl\n\t * @see org.obeonetwork.dsl.environment.impl.EnvironmentPackageImpl#getField()\n\t * @generated\n\t */\n\tint FIELD = 4;\n\n\t/**\n\t * The meta object id for the '{@link org.obeonetwork.dsl.environment.impl.ActionImpl <em>Action</em>}' class.\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @see org.obeonetwork.dsl.environment.impl.ActionImpl\n\t * @see org.obeonetwork.dsl.environment.impl.EnvironmentPackageImpl#getAction()\n\t * @generated\n\t */\n\tint ACTION = 5;\n\n\t/**\n\t * The meta object id for the '{@link org.obeonetwork.dsl.environment.impl.InterDSMLinkImpl <em>Inter DSM Link</em>}' class.\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @see org.obeonetwork.dsl.environment.impl.InterDSMLinkImpl\n\t * @see org.obeonetwork.dsl.environment.impl.EnvironmentPackageImpl#getInterDSMLink()\n\t * @generated\n\t */\n\tint INTER_DSM_LINK = 6;\n\n\t/**\n\t * The feature id for the '<em><b>Supertype</b></em>' reference.\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @generated\n\t * @ordered\n\t */\n\tint STRUCTURED_TYPE__SUPERTYPE = TYPE_FEATURE_COUNT + 0;\n\n\t/**\n\t * The feature id for the '<em><b>Associated Types</b></em>' reference list.\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @generated\n\t * @ordered\n\t */\n\tint STRUCTURED_TYPE__ASSOCIATED_TYPES = TYPE_FEATURE_COUNT + 1;\n\n\t/**\n\t * The feature id for the '<em><b>Owned Attributes</b></em>' containment reference list.\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @generated\n\t * @ordered\n\t */\n\tint STRUCTURED_TYPE__OWNED_ATTRIBUTES = TYPE_FEATURE_COUNT + 2;\n\n\t/**\n\t * The feature id for the '<em><b>Attributes</b></em>' reference list.\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @generated\n\t * @ordered\n\t */\n\tint STRUCTURED_TYPE__ATTRIBUTES = TYPE_FEATURE_COUNT + 3;\n\n\t/**\n\t * The feature id for the '<em><b>Owned References</b></em>' containment reference list.\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @generated\n\t * @ordered\n\t */\n\tint STRUCTURED_TYPE__OWNED_REFERENCES = TYPE_FEATURE_COUNT + 4;\n\n\t/**\n\t * The feature id for the '<em><b>References</b></em>' reference list.\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @generated\n\t * @ordered\n\t */\n\tint STRUCTURED_TYPE__REFERENCES = TYPE_FEATURE_COUNT + 5;\n\n\t/**\n\t * The feature id for the '<em><b>Properties</b></em>' reference list.\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @generated\n\t * @ordered\n\t */\n\tint STRUCTURED_TYPE__PROPERTIES = TYPE_FEATURE_COUNT + 6;\n\n\tint STRUCTURED_TYPE_FEATURE_COUNT = TYPE_FEATURE_COUNT + 7;\n\t * The feature id for the '<em><b>Supertype</b></em>' reference.\n\tint DTO__SUPERTYPE = STRUCTURED_TYPE__SUPERTYPE;\n\tint DTO__ASSOCIATED_TYPES = STRUCTURED_TYPE__ASSOCIATED_TYPES;\n\t * The feature id for the '<em><b>Owned Attributes</b></em>' containment reference list.\n\tint DTO__OWNED_ATTRIBUTES = STRUCTURED_TYPE__OWNED_ATTRIBUTES;\n\t * The feature id for the '<em><b>Attributes</b></em>' reference list.\n\tint DTO__ATTRIBUTES = STRUCTURED_TYPE__ATTRIBUTES;\n\tint DTO__OWNED_REFERENCES = STRUCTURED_TYPE__OWNED_REFERENCES;\n\t * The feature id for the '<em><b>References</b></em>' reference list.\n\tint DTO__REFERENCES = STRUCTURED_TYPE__REFERENCES;\n\t * The feature id for the '<em><b>Properties</b></em>' reference list.\n\tint DTO__PROPERTIES = STRUCTURED_TYPE__PROPERTIES;\n\t * The feature id for the '<em><b>Owned Container</b></em>' containment reference.\n\tint DTO__OWNED_CONTAINER = STRUCTURED_TYPE_FEATURE_COUNT + 0;\n\tint DTO_FEATURE_COUNT = STRUCTURED_TYPE_FEATURE_COUNT + 1;\n\tint NAMESPACE__METADATAS = TYPES_DEFINITION__METADATAS;\n\tint NAMESPACE__DESCRIPTION = TYPES_DEFINITION__DESCRIPTION;\n\tint NAMESPACE__KEYWORDS = TYPES_DEFINITION__KEYWORDS;\n\tint NAMESPACE__BEHAVIOURS = TYPES_DEFINITION__BEHAVIOURS;\n\tint NAMESPACE__BINDING_REGISTRIES = TYPES_DEFINITION__BINDING_REGISTRIES;\n\tint NAMESPACE__VERSION = TYPES_DEFINITION__VERSION;\n\tint NAMESPACE__CREATED_ON = TYPES_DEFINITION__CREATED_ON;\n\tint NAMESPACE__MODIFIED_ON = TYPES_DEFINITION__MODIFIED_ON;\n\n\t/**\n\t * The feature id for the '<em><b>Types</b></em>' containment reference list.\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @generated\n\t * @ordered\n\t */\n\tint NAMESPACE__TYPES = TYPES_DEFINITION__TYPES;\n\tint NAMESPACE__OWNED_NAMESPACES = TYPES_DEFINITION_FEATURE_COUNT + 0;\n\tint NAMESPACE__OWNER = TYPES_DEFINITION_FEATURE_COUNT + 1;\n\tint NAMESPACE__NAME = TYPES_DEFINITION_FEATURE_COUNT + 2;\n\tint NAMESPACE_FEATURE_COUNT = TYPES_DEFINITION_FEATURE_COUNT + 3;\n\t/**\n\t * The feature id for the '<em><b>Is Identifier</b></em>' attribute.\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @generated\n\t * @ordered\n\t */\n\tint PROPERTY__IS_IDENTIFIER = OBEO_DSM_OBJECT_FEATURE_COUNT + 2;\n\n\tint PROPERTY_FEATURE_COUNT = OBEO_DSM_OBJECT_FEATURE_COUNT + 3;\n\t/**\n\t * The feature id for the '<em><b>Is Identifier</b></em>' attribute.\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @generated\n\t * @ordered\n\t */\n\tint ATTRIBUTE__IS_IDENTIFIER = PROPERTY__IS_IDENTIFIER;\n\n\t * The feature id for the '<em><b>Containing Type</b></em>' container reference.\n\tint ATTRIBUTE__CONTAINING_TYPE = PROPERTY_FEATURE_COUNT + 1;\n\t/**\n\t * The feature id for the '<em><b>Is Identifier</b></em>' attribute.\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @generated\n\t * @ordered\n\t */\n\tint REFERENCE__IS_IDENTIFIER = PROPERTY__IS_IDENTIFIER;\n\n\t * The feature id for the '<em><b>Containing Type</b></em>' container reference.\n\tint REFERENCE__CONTAINING_TYPE = PROPERTY_FEATURE_COUNT + 3;\n\t * The feature id for the '<em><b>Referenced Type</b></em>' reference.\n\tint REFERENCE__REFERENCED_TYPE = PROPERTY_FEATURE_COUNT + 4;\n\t/**\n\t * Returns the meta object for the containment reference list '{@link org.obeonetwork.dsl.environment.Environment#getNamespaces <em>Namespaces</em>}'.\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @return the meta object for the containment reference list '<em>Namespaces</em>'.\n\t * @see org.obeonetwork.dsl.environment.Environment#getNamespaces()\n\t * @see #getEnvironment()\n\t * @generated\n\t */\n\tEReference getEnvironment_Namespaces();\n\n\t * Returns the meta object for the reference '{@link org.obeonetwork.dsl.environment.StructuredType#getSupertype <em>Supertype</em>}'.\n\t * @return the meta object for the reference '<em>Supertype</em>'.\n\t * @see org.obeonetwork.dsl.environment.StructuredType#getSupertype()\n\t * @see #getStructuredType()\n\tEReference getStructuredType_Supertype();\n\t * Returns the meta object for the reference list '{@link org.obeonetwork.dsl.environment.StructuredType#getAssociatedTypes <em>Associated Types</em>}'.\n\t * @return the meta object for the reference list '<em>Associated Types</em>'.\n\t * @see org.obeonetwork.dsl.environment.StructuredType#getAssociatedTypes()\n\t * @see #getStructuredType()\n\tEReference getStructuredType_AssociatedTypes();\n\t * Returns the meta object for the containment reference list '{@link org.obeonetwork.dsl.environment.StructuredType#getOwnedAttributes <em>Owned Attributes</em>}'.\n\t * @return the meta object for the containment reference list '<em>Owned Attributes</em>'.\n\t * @see org.obeonetwork.dsl.environment.StructuredType#getOwnedAttributes()\n\t * @see #getStructuredType()\n\tEReference getStructuredType_OwnedAttributes();\n\t * Returns the meta object for the reference list '{@link org.obeonetwork.dsl.environment.StructuredType#getAttributes <em>Attributes</em>}'.\n\t * @return the meta object for the reference list '<em>Attributes</em>'.\n\t * @see org.obeonetwork.dsl.environment.StructuredType#getAttributes()\n\t * @see #getStructuredType()\n\tEReference getStructuredType_Attributes();\n\t * Returns the meta object for the containment reference list '{@link org.obeonetwork.dsl.environment.StructuredType#getOwnedReferences <em>Owned References</em>}'.\n\t * @return the meta object for the containment reference list '<em>Owned References</em>'.\n\t * @see org.obeonetwork.dsl.environment.StructuredType#getOwnedReferences()\n\t * @see #getStructuredType()\n\tEReference getStructuredType_OwnedReferences();\n\t * Returns the meta object for the reference list '{@link org.obeonetwork.dsl.environment.StructuredType#getReferences <em>References</em>}'.\n\t * @return the meta object for the reference list '<em>References</em>'.\n\t * @see org.obeonetwork.dsl.environment.StructuredType#getReferences()\n\t * @see #getStructuredType()\n\tEReference getStructuredType_References();\n\t * Returns the meta object for the reference list '{@link org.obeonetwork.dsl.environment.StructuredType#getProperties <em>Properties</em>}'.\n\t * @return the meta object for the reference list '<em>Properties</em>'.\n\t * @see org.obeonetwork.dsl.environment.StructuredType#getProperties()\n\t * @see #getStructuredType()\n\tEReference getStructuredType_Properties();\n\t * Returns the meta object for class '{@link org.obeonetwork.dsl.environment.DTO <em>DTO</em>}'.\n\t * @return the meta object for class '<em>DTO</em>'.\n\t * @see org.obeonetwork.dsl.environment.DTO\n\tEClass getDTO();\n\t * Returns the meta object for the containment reference '{@link org.obeonetwork.dsl.environment.DTO#getOwnedContainer <em>Owned Container</em>}'.\n\t * @return the meta object for the containment reference '<em>Owned Container</em>'.\n\t * @see org.obeonetwork.dsl.environment.DTO#getOwnedContainer()\n\tEReference getDTO_OwnedContainer();\n\t * Returns the meta object for the container reference '{@link org.obeonetwork.dsl.environment.Attribute#getContainingType <em>Containing Type</em>}'.\n\t * @return the meta object for the container reference '<em>Containing Type</em>'.\n\t * @see org.obeonetwork.dsl.environment.Attribute#getContainingType()\n\tEReference getAttribute_ContainingType();\n\t * Returns the meta object for the container reference '{@link org.obeonetwork.dsl.environment.Reference#getContainingType <em>Containing Type</em>}'.\n\t * @return the meta object for the container reference '<em>Containing Type</em>'.\n\t * @see org.obeonetwork.dsl.environment.Reference#getContainingType()\n\tEReference getReference_ContainingType();\n\t * Returns the meta object for the reference '{@link org.obeonetwork.dsl.environment.Reference#getReferencedType <em>Referenced Type</em>}'.\n\t * @return the meta object for the reference '<em>Referenced Type</em>'.\n\t * @see org.obeonetwork.dsl.environment.Reference#getReferencedType()\n\tEReference getReference_ReferencedType();\n\t/**\n\t * Returns the meta object for the attribute '{@link org.obeonetwork.dsl.environment.Property#isIsIdentifier <em>Is Identifier</em>}'.\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @return the meta object for the attribute '<em>Is Identifier</em>'.\n\t * @see org.obeonetwork.dsl.environment.Property#isIsIdentifier()\n\t * @see #getProperty()\n\t * @generated\n\t */\n\tEAttribute getProperty_IsIdentifier();\n\n\t\t/**\n\t\t * The meta object literal for the '<em><b>Namespaces</b></em>' containment reference list feature.\n\t\t * <!-- begin-user-doc -->\n\t\t * <!-- end-user-doc -->\n\t\t * @generated\n\t\t */\n\t\tEReference ENVIRONMENT__NAMESPACES = eINSTANCE\n\t\t\t\t.getEnvironment_Namespaces();\n\n\t\t * The meta object literal for the '<em><b>Supertype</b></em>' reference feature.\n\t\tEReference STRUCTURED_TYPE__SUPERTYPE = eINSTANCE\n\t\t\t\t.getStructuredType_Supertype();\n\t\t * The meta object literal for the '<em><b>Associated Types</b></em>' reference list feature.\n\t\tEReference STRUCTURED_TYPE__ASSOCIATED_TYPES = eINSTANCE\n\t\t\t\t.getStructuredType_AssociatedTypes();\n\t\t * The meta object literal for the '<em><b>Owned Attributes</b></em>' containment reference list feature.\n\t\tEReference STRUCTURED_TYPE__OWNED_ATTRIBUTES = eINSTANCE\n\t\t\t\t.getStructuredType_OwnedAttributes();\n\t\t * The meta object literal for the '<em><b>Attributes</b></em>' reference list feature.\n\t\tEReference STRUCTURED_TYPE__ATTRIBUTES = eINSTANCE\n\t\t\t\t.getStructuredType_Attributes();\n\t\t * The meta object literal for the '<em><b>Owned References</b></em>' containment reference list feature.\n\t\tEReference STRUCTURED_TYPE__OWNED_REFERENCES = eINSTANCE\n\t\t\t\t.getStructuredType_OwnedReferences();\n\t\t * The meta object literal for the '<em><b>References</b></em>' reference list feature.\n\t\tEReference STRUCTURED_TYPE__REFERENCES = eINSTANCE\n\t\t\t\t.getStructuredType_References();\n\t\t * The meta object literal for the '<em><b>Properties</b></em>' reference list feature.\n\t\tEReference STRUCTURED_TYPE__PROPERTIES = eINSTANCE\n\t\t\t\t.getStructuredType_Properties();\n\t\t * The meta object literal for the '{@link org.obeonetwork.dsl.environment.impl.DTOImpl <em>DTO</em>}' class.\n\t\t * @see org.obeonetwork.dsl.environment.impl.DTOImpl\n\t\t * @see org.obeonetwork.dsl.environment.impl.EnvironmentPackageImpl#getDTO()\n\t\tEClass DTO = eINSTANCE.getDTO();\n\t\t * The meta object literal for the '<em><b>Owned Container</b></em>' containment reference feature.\n\t\tEReference DTO__OWNED_CONTAINER = eINSTANCE.getDTO_OwnedContainer();\n\t\t * The meta object literal for the '<em><b>Containing Type</b></em>' container reference feature.\n\t\tEReference ATTRIBUTE__CONTAINING_TYPE = eINSTANCE\n\t\t\t\t.getAttribute_ContainingType();\n\t\t * The meta object literal for the '<em><b>Containing Type</b></em>' container reference feature.\n\t\tEReference REFERENCE__CONTAINING_TYPE = eINSTANCE\n\t\t\t\t.getReference_ContainingType();\n\t\t * The meta object literal for the '<em><b>Referenced Type</b></em>' reference feature.\n\t\tEReference REFERENCE__REFERENCED_TYPE = eINSTANCE\n\t\t\t\t.getReference_ReferencedType();\n\t\t/**\n\t\t * The meta object literal for the '<em><b>Is Identifier</b></em>' attribute feature.\n\t\t * <!-- begin-user-doc -->\n\t\t * <!-- end-user-doc -->\n\t\t * @generated\n\t\t */\n\t\tEAttribute PROPERTY__IS_IDENTIFIER = eINSTANCE\n\t\t\t\t.getProperty_IsIdentifier();\n", "new_methods": [], "old_code": " *\n * $Id$\n\tString eNS_URI = \"http://www.obeonetwork.org/dsl/environment/2.0.0\";\n\t/**\n\t * The meta object id for the '{@link org.obeonetwork.dsl.environment.impl.EnvironmentImpl <em>Environment</em>}' class.\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @see org.obeonetwork.dsl.environment.impl.EnvironmentImpl\n\t * @see org.obeonetwork.dsl.environment.impl.EnvironmentPackageImpl#getEnvironment()\n\t * @generated\n\t */\n\tint ENVIRONMENT = 0;\n\n\t/**\n\t * The meta object id for the '{@link org.obeonetwork.dsl.environment.impl.TypeImpl <em>Type</em>}' class.\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @see org.obeonetwork.dsl.environment.impl.TypeImpl\n\t * @see org.obeonetwork.dsl.environment.impl.EnvironmentPackageImpl#getType()\n\t * @generated\n\t */\n\tint TYPE = 1;\n\n\t/**\n\t * The meta object id for the '{@link org.obeonetwork.dsl.environment.impl.PrimitiveTypeImpl <em>Primitive Type</em>}' class.\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @see org.obeonetwork.dsl.environment.impl.PrimitiveTypeImpl\n\t * @see org.obeonetwork.dsl.environment.impl.EnvironmentPackageImpl#getPrimitiveType()\n\t * @generated\n\t */\n\tint PRIMITIVE_TYPE = 2;\n\n\t/**\n\t * The meta object id for the '{@link org.obeonetwork.dsl.environment.impl.EnumerationImpl <em>Enumeration</em>}' class.\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @see org.obeonetwork.dsl.environment.impl.EnumerationImpl\n\t * @see org.obeonetwork.dsl.environment.impl.EnvironmentPackageImpl#getEnumeration()\n\t * @generated\n\t */\n\tint ENUMERATION = 3;\n\n\t/**\n\t * The meta object id for the '{@link org.obeonetwork.dsl.environment.impl.FieldImpl <em>Field</em>}' class.\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @see org.obeonetwork.dsl.environment.impl.FieldImpl\n\t * @see org.obeonetwork.dsl.environment.impl.EnvironmentPackageImpl#getField()\n\t * @generated\n\t */\n\tint FIELD = 4;\n\n\t/**\n\t * The meta object id for the '{@link org.obeonetwork.dsl.environment.impl.ActionImpl <em>Action</em>}' class.\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @see org.obeonetwork.dsl.environment.impl.ActionImpl\n\t * @see org.obeonetwork.dsl.environment.impl.EnvironmentPackageImpl#getAction()\n\t * @generated\n\t */\n\tint ACTION = 5;\n\n\t/**\n\t * The meta object id for the '{@link org.obeonetwork.dsl.environment.impl.InterDSMLinkImpl <em>Inter DSM Link</em>}' class.\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @see org.obeonetwork.dsl.environment.impl.InterDSMLinkImpl\n\t * @see org.obeonetwork.dsl.environment.impl.EnvironmentPackageImpl#getInterDSMLink()\n\t * @generated\n\t */\n\tint INTER_DSM_LINK = 6;\n\n\tint ENVIRONMENT_FEATURE_COUNT = OBEO_DSM_OBJECT_FEATURE_COUNT + 5;\n\tint STRUCTURED_TYPE_FEATURE_COUNT = TYPE_FEATURE_COUNT + 0;\n\t * The feature id for the '<em><b>Owned Container</b></em>' containment reference.\n\tint DTO__OWNED_CONTAINER = STRUCTURED_TYPE_FEATURE_COUNT + 0;\n\tint DTO__ASSOCIATED_TYPES = STRUCTURED_TYPE_FEATURE_COUNT + 1;\n\t * The feature id for the '<em><b>Properties</b></em>' reference list.\n\tint DTO__PROPERTIES = STRUCTURED_TYPE_FEATURE_COUNT + 2;\n\t * The feature id for the '<em><b>References</b></em>' reference list.\n\tint DTO__REFERENCES = STRUCTURED_TYPE_FEATURE_COUNT + 3;\n\tint DTO__OWNED_REFERENCES = STRUCTURED_TYPE_FEATURE_COUNT + 4;\n\t * The feature id for the '<em><b>Attributes</b></em>' reference list.\n\tint DTO__ATTRIBUTES = STRUCTURED_TYPE_FEATURE_COUNT + 5;\n\t * The feature id for the '<em><b>Owned Attributes</b></em>' containment reference list.\n\tint DTO__OWNED_ATTRIBUTES = STRUCTURED_TYPE_FEATURE_COUNT + 6;\n\t * The feature id for the '<em><b>Supertype</b></em>' reference.\n\tint DTO__SUPERTYPE = STRUCTURED_TYPE_FEATURE_COUNT + 7;\n\tint DTO_FEATURE_COUNT = STRUCTURED_TYPE_FEATURE_COUNT + 8;\n\tint NAMESPACE__METADATAS = OBEO_DSM_OBJECT__METADATAS;\n\tint NAMESPACE__DESCRIPTION = OBEO_DSM_OBJECT__DESCRIPTION;\n\tint NAMESPACE__KEYWORDS = OBEO_DSM_OBJECT__KEYWORDS;\n\tint NAMESPACE__BEHAVIOURS = OBEO_DSM_OBJECT__BEHAVIOURS;\n\tint NAMESPACE__BINDING_REGISTRIES = OBEO_DSM_OBJECT__BINDING_REGISTRIES;\n\tint NAMESPACE__VERSION = OBEO_DSM_OBJECT__VERSION;\n\tint NAMESPACE__CREATED_ON = OBEO_DSM_OBJECT__CREATED_ON;\n\tint NAMESPACE__MODIFIED_ON = OBEO_DSM_OBJECT__MODIFIED_ON;\n\tint NAMESPACE__OWNED_NAMESPACES = OBEO_DSM_OBJECT_FEATURE_COUNT + 0;\n\tint NAMESPACE__OWNER = OBEO_DSM_OBJECT_FEATURE_COUNT + 1;\n\tint NAMESPACE__NAME = OBEO_DSM_OBJECT_FEATURE_COUNT + 2;\n\tint NAMESPACE_FEATURE_COUNT = OBEO_DSM_OBJECT_FEATURE_COUNT + 3;\n\tint PROPERTY_FEATURE_COUNT = OBEO_DSM_OBJECT_FEATURE_COUNT + 2;\n\t * The feature id for the '<em><b>Dto</b></em>' container reference.\n\tint ATTRIBUTE__DTO = PROPERTY_FEATURE_COUNT + 1;\n\t * The feature id for the '<em><b>Type</b></em>' reference.\n\tint REFERENCE__TYPE = PROPERTY_FEATURE_COUNT + 3;\n\t * The feature id for the '<em><b>Dto</b></em>' container reference.\n\tint REFERENCE__DTO = PROPERTY_FEATURE_COUNT + 4;\n\t * Returns the meta object for class '{@link org.obeonetwork.dsl.environment.DTO <em>DTO</em>}'.\n\t * @return the meta object for class '<em>DTO</em>'.\n\t * @see org.obeonetwork.dsl.environment.DTO\n\tEClass getDTO();\n\t * Returns the meta object for the containment reference '{@link org.obeonetwork.dsl.environment.DTO#getOwnedContainer <em>Owned Container</em>}'.\n\t * @return the meta object for the containment reference '<em>Owned Container</em>'.\n\t * @see org.obeonetwork.dsl.environment.DTO#getOwnedContainer()\n\t * @see #getDTO()\n\tEReference getDTO_OwnedContainer();\n\t * Returns the meta object for the reference list '{@link org.obeonetwork.dsl.environment.DTO#getAssociatedTypes <em>Associated Types</em>}'.\n\t * @return the meta object for the reference list '<em>Associated Types</em>'.\n\t * @see org.obeonetwork.dsl.environment.DTO#getAssociatedTypes()\n\t * @see #getDTO()\n\tEReference getDTO_AssociatedTypes();\n\t * Returns the meta object for the reference list '{@link org.obeonetwork.dsl.environment.DTO#getProperties <em>Properties</em>}'.\n\t * @return the meta object for the reference list '<em>Properties</em>'.\n\t * @see org.obeonetwork.dsl.environment.DTO#getProperties()\n\t * @see #getDTO()\n\tEReference getDTO_Properties();\n\t * Returns the meta object for the reference list '{@link org.obeonetwork.dsl.environment.DTO#getReferences <em>References</em>}'.\n\t * @return the meta object for the reference list '<em>References</em>'.\n\t * @see org.obeonetwork.dsl.environment.DTO#getReferences()\n\t * @see #getDTO()\n\tEReference getDTO_References();\n\t * Returns the meta object for the containment reference list '{@link org.obeonetwork.dsl.environment.DTO#getOwnedReferences <em>Owned References</em>}'.\n\t * @return the meta object for the containment reference list '<em>Owned References</em>'.\n\t * @see org.obeonetwork.dsl.environment.DTO#getOwnedReferences()\n\t * @see #getDTO()\n\tEReference getDTO_OwnedReferences();\n\t * Returns the meta object for the reference list '{@link org.obeonetwork.dsl.environment.DTO#getAttributes <em>Attributes</em>}'.\n\t * @return the meta object for the reference list '<em>Attributes</em>'.\n\t * @see org.obeonetwork.dsl.environment.DTO#getAttributes()\n\t * @see #getDTO()\n\tEReference getDTO_Attributes();\n\t * Returns the meta object for the containment reference list '{@link org.obeonetwork.dsl.environment.DTO#getOwnedAttributes <em>Owned Attributes</em>}'.\n\t * @return the meta object for the containment reference list '<em>Owned Attributes</em>'.\n\t * @see org.obeonetwork.dsl.environment.DTO#getOwnedAttributes()\n\t * @see #getDTO()\n\tEReference getDTO_OwnedAttributes();\n\t * Returns the meta object for the reference '{@link org.obeonetwork.dsl.environment.DTO#getSupertype <em>Supertype</em>}'.\n\t * @return the meta object for the reference '<em>Supertype</em>'.\n\t * @see org.obeonetwork.dsl.environment.DTO#getSupertype()\n\tEReference getDTO_Supertype();\n\t * Returns the meta object for the container reference '{@link org.obeonetwork.dsl.environment.Attribute#getDto <em>Dto</em>}'.\n\t * @return the meta object for the container reference '<em>Dto</em>'.\n\t * @see org.obeonetwork.dsl.environment.Attribute#getDto()\n\tEReference getAttribute_Dto();\n\t * Returns the meta object for the reference '{@link org.obeonetwork.dsl.environment.Reference#getType <em>Type</em>}'.\n\t * @return the meta object for the reference '<em>Type</em>'.\n\t * @see org.obeonetwork.dsl.environment.Reference#getType()\n\tEReference getReference_Type();\n\t * Returns the meta object for the container reference '{@link org.obeonetwork.dsl.environment.Reference#getDto <em>Dto</em>}'.\n\t * @return the meta object for the container reference '<em>Dto</em>'.\n\t * @see org.obeonetwork.dsl.environment.Reference#getDto()\n\tEReference getReference_Dto();\n\t\t * The meta object literal for the '{@link org.obeonetwork.dsl.environment.impl.DTOImpl <em>DTO</em>}' class.\n\t\t * @see org.obeonetwork.dsl.environment.impl.DTOImpl\n\t\t * @see org.obeonetwork.dsl.environment.impl.EnvironmentPackageImpl#getDTO()\n\t\tEClass DTO = eINSTANCE.getDTO();\n\t\t * The meta object literal for the '<em><b>Owned Container</b></em>' containment reference feature.\n\t\tEReference DTO__OWNED_CONTAINER = eINSTANCE.getDTO_OwnedContainer();\n\t\t * The meta object literal for the '<em><b>Associated Types</b></em>' reference list feature.\n\t\tEReference DTO__ASSOCIATED_TYPES = eINSTANCE.getDTO_AssociatedTypes();\n\t\t * The meta object literal for the '<em><b>Properties</b></em>' reference list feature.\n\t\tEReference DTO__PROPERTIES = eINSTANCE.getDTO_Properties();\n\t\t * The meta object literal for the '<em><b>References</b></em>' reference list feature.\n\t\tEReference DTO__REFERENCES = eINSTANCE.getDTO_References();\n\t\t * The meta object literal for the '<em><b>Owned References</b></em>' containment reference list feature.\n\t\tEReference DTO__OWNED_REFERENCES = eINSTANCE.getDTO_OwnedReferences();\n\t\t * The meta object literal for the '<em><b>Attributes</b></em>' reference list feature.\n\t\tEReference DTO__ATTRIBUTES = eINSTANCE.getDTO_Attributes();\n\t\t * The meta object literal for the '<em><b>Owned Attributes</b></em>' containment reference list feature.\n\t\tEReference DTO__OWNED_ATTRIBUTES = eINSTANCE.getDTO_OwnedAttributes();\n\t\t * The meta object literal for the '<em><b>Supertype</b></em>' reference feature.\n\t\tEReference DTO__SUPERTYPE = eINSTANCE.getDTO_Supertype();\n\t\t * The meta object literal for the '<em><b>Dto</b></em>' container reference feature.\n\t\tEReference ATTRIBUTE__DTO = eINSTANCE.getAttribute_Dto();\n\t\t * The meta object literal for the '<em><b>Type</b></em>' reference feature.\n\t\tEReference REFERENCE__TYPE = eINSTANCE.getReference_Type();\n\t\t * The meta object literal for the '<em><b>Dto</b></em>' container reference feature.\n\t\tEReference REFERENCE__DTO = eINSTANCE.getReference_Dto();", "old_methods": [], "patch": "@@ -7,8 +7,6 @@\n * \n * Contributors:\n * Obeo - initial API and implementation\n- *\n- * $Id$\n */\n package org.obeonetwork.dsl.environment;\n \n@@ -55,7 +53,7 @@ public interface EnvironmentPackage extends EPackage {\n \t * <!-- end-user-doc -->\n \t * @generated\n \t */\n-\tString eNS_URI = \"http://www.obeonetwork.org/dsl/environment/2.0.0\";\n+\tString eNS_URI = \"http://www.obeonetwork.org/dsl/environment/3.0.0\";\n \n \t/**\n \t * The package namespace name.\n@@ -74,76 +72,6 @@ public interface EnvironmentPackage extends EPackage {\n \tEnvironmentPackage eINSTANCE = org.obeonetwork.dsl.environment.impl.EnvironmentPackageImpl\n \t\t\t.init();\n \n-\t/**\n-\t * The meta object id for the '{@link org.obeonetwork.dsl.environment.impl.EnvironmentImpl <em>Environment</em>}' class.\n-\t * <!-- begin-user-doc -->\n-\t * <!-- end-user-doc -->\n-\t * @see org.obeonetwork.dsl.environment.impl.EnvironmentImpl\n-\t * @see org.obeonetwork.dsl.environment.impl.EnvironmentPackageImpl#getEnvironment()\n-\t * @generated\n-\t */\n-\tint ENVIRONMENT = 0;\n-\n-\t/**\n-\t * The meta object id for the '{@link org.obeonetwork.dsl.environment.impl.TypeImpl <em>Type</em>}' class.\n-\t * <!-- begin-user-doc -->\n-\t * <!-- end-user-doc -->\n-\t * @see org.obeonetwork.dsl.environment.impl.TypeImpl\n-\t * @see org.obeonetwork.dsl.environment.impl.EnvironmentPackageImpl#getType()\n-\t * @generated\n-\t */\n-\tint TYPE = 1;\n-\n-\t/**\n-\t * The meta object id for the '{@link org.obeonetwork.dsl.environment.impl.PrimitiveTypeImpl <em>Primitive Type</em>}' class.\n-\t * <!-- begin-user-doc -->\n-\t * <!-- end-user-doc -->\n-\t * @see org.obeonetwork.dsl.environment.impl.PrimitiveTypeImpl\n-\t * @see org.obeonetwork.dsl.environment.impl.EnvironmentPackageImpl#getPrimitiveType()\n-\t * @generated\n-\t */\n-\tint PRIMITIVE_TYPE = 2;\n-\n-\t/**\n-\t * The meta object id for the '{@link org.obeonetwork.dsl.environment.impl.EnumerationImpl <em>Enumeration</em>}' class.\n-\t * <!-- begin-user-doc -->\n-\t * <!-- end-user-doc -->\n-\t * @see org.obeonetwork.dsl.environment.impl.EnumerationImpl\n-\t * @see org.obeonetwork.dsl.environment.impl.EnvironmentPackageImpl#getEnumeration()\n-\t * @generated\n-\t */\n-\tint ENUMERATION = 3;\n-\n-\t/**\n-\t * The meta object id for the '{@link org.obeonetwork.dsl.environment.impl.FieldImpl <em>Field</em>}' class.\n-\t * <!-- begin-user-doc -->\n-\t * <!-- end-user-doc -->\n-\t * @see org.obeonetwork.dsl.environment.impl.FieldImpl\n-\t * @see org.obeonetwork.dsl.environment.impl.EnvironmentPackageImpl#getField()\n-\t * @generated\n-\t */\n-\tint FIELD = 4;\n-\n-\t/**\n-\t * The meta object id for the '{@link org.obeonetwork.dsl.environment.impl.ActionImpl <em>Action</em>}' class.\n-\t * <!-- begin-user-doc -->\n-\t * <!-- end-user-doc -->\n-\t * @see org.obeonetwork.dsl.environment.impl.ActionImpl\n-\t * @see org.obeonetwork.dsl.environment.impl.EnvironmentPackageImpl#getAction()\n-\t * @generated\n-\t */\n-\tint ACTION = 5;\n-\n-\t/**\n-\t * The meta object id for the '{@link org.obeonetwork.dsl.environment.impl.InterDSMLinkImpl <em>Inter DSM Link</em>}' class.\n-\t * <!-- begin-user-doc -->\n-\t * <!-- end-user-doc -->\n-\t * @see org.obeonetwork.dsl.environment.impl.InterDSMLinkImpl\n-\t * @see org.obeonetwork.dsl.environment.impl.EnvironmentPackageImpl#getInterDSMLink()\n-\t * @generated\n-\t */\n-\tint INTER_DSM_LINK = 6;\n-\n \t/**\n \t * The meta object id for the '{@link org.obeonetwork.dsl.environment.impl.ObeoDSMObjectImpl <em>Obeo DSM Object</em>}' class.\n \t * <!-- begin-user-doc -->\n@@ -235,6 +163,16 @@ public interface EnvironmentPackage extends EPackage {\n \t */\n \tint OBEO_DSM_OBJECT_FEATURE_COUNT = 8;\n \n+\t/**\n+\t * The meta object id for the '{@link org.obeonetwork.dsl.environment.impl.EnvironmentImpl <em>Environment</em>}' class.\n+\t * <!-- begin-user-doc -->\n+\t * <!-- end-user-doc -->\n+\t * @see org.obeonetwork.dsl.environment.impl.EnvironmentImpl\n+\t * @see org.obeonetwork.dsl.environment.impl.EnvironmentPackageImpl#getEnvironment()\n+\t * @generated\n+\t */\n+\tint ENVIRONMENT = 0;\n+\n \t/**\n \t * The feature id for the '<em><b>Metadatas</b></em>' containment reference.\n \t * <!-- begin-user-doc -->\n@@ -352,14 +290,33 @@ public interface EnvironmentPackage extends EPackage {\n \t */\n \tint ENVIRONMENT__TYPES_DEFINITION = OBEO_DSM_OBJECT_FEATURE_COUNT + 4;\n \n+\t/**\n+\t * The feature id for the '<em><b>Namespaces</b></em>' containment reference list.\n+\t * <!-- begin-user-doc -->\n+\t * <!-- end-user-doc -->\n+\t * @generated\n+\t * @ordered\n+\t */\n+\tint ENVIRONMENT__NAMESPACES = OBEO_DSM_OBJECT_FEATURE_COUNT + 5;\n+\n \t/**\n \t * The number of structural features of the '<em>Environment</em>' class.\n \t * <!-- begin-user-doc -->\n \t * <!-- end-user-doc -->\n \t * @generated\n \t * @ordered\n \t */\n-\tint ENVIRONMENT_FEATURE_COUNT = OBEO_DSM_OBJECT_FEATURE_COUNT + 5;\n+\tint ENVIRONMENT_FEATURE_COUNT = OBEO_DSM_OBJECT_FEATURE_COUNT + 6;\n+\n+\t/**\n+\t * The meta object id for the '{@link org.obeonetwork.dsl.environment.impl.TypeImpl <em>Type</em>}' class.\n+\t * <!-- begin-user-doc -->\n+\t * <!-- end-user-doc -->\n+\t * @see org.obeonetwork.dsl.environment.impl.TypeImpl\n+\t * @see org.obeonetwork.dsl.environment.impl.EnvironmentPackageImpl#getType()\n+\t * @generated\n+\t */\n+\tint TYPE = 1;\n \n \t/**\n \t * The feature id for the '<em><b>Metadatas</b></em>' containment reference.\n@@ -460,6 +417,16 @@ public interface EnvironmentPackage extends EPackage {\n \t */\n \tint TYPE_FEATURE_COUNT = OBEO_DSM_OBJECT_FEATURE_COUNT + 2;\n \n+\t/**\n+\t * The meta object id for the '{@link org.obeonetwork.dsl.environment.impl.PrimitiveTypeImpl <em>Primitive Type</em>}' class.\n+\t * <!-- begin-user-doc -->\n+\t * <!-- end-user-doc -->\n+\t * @see org.obeonetwork.dsl.environment.impl.PrimitiveTypeImpl\n+\t * @see org.obeonetwork.dsl.environment.impl.EnvironmentPackageImpl#getPrimitiveType()\n+\t * @generated\n+\t */\n+\tint PRIMITIVE_TYPE = 2;\n+\n \t/**\n \t * The feature id for the '<em><b>Metadatas</b></em>' containment reference.\n \t * <!-- begin-user-doc -->\n@@ -559,6 +526,16 @@ public interface EnvironmentPackage extends EPackage {\n \t */\n \tint PRIMITIVE_TYPE_FEATURE_COUNT = TYPE_FEATURE_COUNT + 0;\n \n+\t/**\n+\t * The meta object id for the '{@link org.obeonetwork.dsl.environment.impl.EnumerationImpl <em>Enumeration</em>}' class.\n+\t * <!-- begin-user-doc -->\n+\t * <!-- end-user-doc -->\n+\t * @see org.obeonetwork.dsl.environment.impl.EnumerationImpl\n+\t * @see org.obeonetwork.dsl.environment.impl.EnvironmentPackageImpl#getEnumeration()\n+\t * @generated\n+\t */\n+\tint ENUMERATION = 3;\n+\n \t/**\n \t * The feature id for the '<em><b>Metadatas</b></em>' containment reference.\n \t * <!-- begin-user-doc -->\n@@ -667,6 +644,16 @@ public interface EnvironmentPackage extends EPackage {\n \t */\n \tint ENUMERATION_FEATURE_COUNT = TYPE_FEATURE_COUNT + 1;\n \n+\t/**\n+\t * The meta object id for the '{@link org.obeonetwork.dsl.environment.impl.FieldImpl <em>Field</em>}' class.\n+\t * <!-- begin-user-doc -->\n+\t * <!-- end-user-doc -->\n+\t * @see org.obeonetwork.dsl.environment.impl.FieldImpl\n+\t * @see org.obeonetwork.dsl.environment.impl.EnvironmentPackageImpl#getField()\n+\t * @generated\n+\t */\n+\tint FIELD = 4;\n+\n \t/**\n \t * The feature id for the '<em><b>Metadatas</b></em>' containment reference.\n \t * <!-- begin-user-doc -->\n@@ -757,6 +744,16 @@ public interface EnvironmentPackage extends EPackage {\n \t */\n \tint FIELD_FEATURE_COUNT = OBEO_DSM_OBJECT_FEATURE_COUNT + 1;\n \n+\t/**\n+\t * The meta object id for the '{@link org.obeonetwork.dsl.environment.impl.ActionImpl <em>Action</em>}' class.\n+\t * <!-- begin-user-doc -->\n+\t * <!-- end-user-doc -->\n+\t * @see org.obeonetwork.dsl.environment.impl.ActionImpl\n+\t * @see org.obeonetwork.dsl.environment.impl.EnvironmentPackageImpl#getAction()\n+\t * @generated\n+\t */\n+\tint ACTION = 5;\n+\n \t/**\n \t * The feature id for the '<em><b>Metadatas</b></em>' containment reference.\n \t * <!-- begin-user-doc -->\n@@ -847,6 +844,16 @@ public interface EnvironmentPackage extends EPackage {\n \t */\n \tint ACTION_FEATURE_COUNT = OBEO_DSM_OBJECT_FEATURE_COUNT + 1;\n \n+\t/**\n+\t * The meta object id for the '{@link org.obeonetwork.dsl.environment.impl.InterDSMLinkImpl <em>Inter DSM Link</em>}' class.\n+\t * <!-- begin-user-doc -->\n+\t * <!-- end-user-doc -->\n+\t * @see org.obeonetwork.dsl.environment.impl.InterDSMLinkImpl\n+\t * @see org.obeonetwork.dsl.environment.impl.EnvironmentPackageImpl#getInterDSMLink()\n+\t * @generated\n+\t */\n+\tint INTER_DSM_LINK = 6;\n+\n \t/**\n \t * The feature id for the '<em><b>Metadatas</b></em>' containment reference.\n \t * <!-- begin-user-doc -->\n@@ -1521,14 +1528,77 @@ public interface EnvironmentPackage extends EPackage {\n \t */\n \tint STRUCTURED_TYPE__TYPE_DEFINITION = TYPE__TYPE_DEFINITION;\n \n+\t/**\n+\t * The feature id for the '<em><b>Supertype</b></em>' reference.\n+\t * <!-- begin-user-doc -->\n+\t * <!-- end-user-doc -->\n+\t * @generated\n+\t * @ordered\n+\t */\n+\tint STRUCTURED_TYPE__SUPERTYPE = TYPE_FEATURE_COUNT + 0;\n+\n+\t/**\n+\t * The feature id for the '<em><b>Associated Types</b></em>' reference list.\n+\t * <!-- begin-user-doc -->\n+\t * <!-- end-user-doc -->\n+\t * @generated\n+\t * @ordered\n+\t */\n+\tint STRUCTURED_TYPE__ASSOCIATED_TYPES = TYPE_FEATURE_COUNT + 1;\n+\n+\t/**\n+\t * The feature id for the '<em><b>Owned Attributes</b></em>' containment reference list.\n+\t * <!-- begin-user-doc -->\n+\t * <!-- end-user-doc -->\n+\t * @generated\n+\t * @ordered\n+\t */\n+\tint STRUCTURED_TYPE__OWNED_ATTRIBUTES = TYPE_FEATURE_COUNT + 2;\n+\n+\t/**\n+\t * The feature id for the '<em><b>Attributes</b></em>' reference list.\n+\t * <!-- begin-user-doc -->\n+\t * <!-- end-user-doc -->\n+\t * @generated\n+\t * @ordered\n+\t */\n+\tint STRUCTURED_TYPE__ATTRIBUTES = TYPE_FEATURE_COUNT + 3;\n+\n+\t/**\n+\t * The feature id for the '<em><b>Owned References</b></em>' containment reference list.\n+\t * <!-- begin-user-doc -->\n+\t * <!-- end-user-doc -->\n+\t * @generated\n+\t * @ordered\n+\t */\n+\tint STRUCTURED_TYPE__OWNED_REFERENCES = TYPE_FEATURE_COUNT + 4;\n+\n+\t/**\n+\t * The feature id for the '<em><b>References</b></em>' reference list.\n+\t * <!-- begin-user-doc -->\n+\t * <!-- end-user-doc -->\n+\t * @generated\n+\t * @ordered\n+\t */\n+\tint STRUCTURED_TYPE__REFERENCES = TYPE_FEATURE_COUNT + 5;\n+\n+\t/**\n+\t * The feature id for the '<em><b>Properties</b></em>' reference list.\n+\t * <!-- begin-user-doc -->\n+\t * <!-- end-user-doc -->\n+\t * @generated\n+\t * @ordered\n+\t */\n+\tint STRUCTURED_TYPE__PROPERTIES = TYPE_FEATURE_COUNT + 6;\n+\n \t/**\n \t * The number of structural features of the '<em>Structured Type</em>' class.\n \t * <!-- begin-user-doc -->\n \t * <!-- end-user-doc -->\n \t * @generated\n \t * @ordered\n \t */\n-\tint STRUCTURED_TYPE_FEATURE_COUNT = TYPE_FEATURE_COUNT + 0;\n+\tint STRUCTURED_TYPE_FEATURE_COUNT = TYPE_FEATURE_COUNT + 7;\n \n \t/**\n \t * The meta object id for the '{@link org.obeonetwork.dsl.environment.impl.DTOImpl <em>DTO</em>}' class.\n@@ -1631,13 +1701,13 @@ public interface EnvironmentPackage extends EPackage {\n \tint DTO__TYPE_DEFINITION = STRUCTURED_TYPE__TYPE_DEFINITION;\n \n \t/**\n-\t * The feature id for the '<em><b>Owned Container</b></em>' containment reference.\n+\t * The feature id for the '<em><b>Supertype</b></em>' reference.\n \t * <!-- begin-user-doc -->\n \t * <!-- end-user-doc -->\n \t * @generated\n \t * @ordered\n \t */\n-\tint DTO__OWNED_CONTAINER = STRUCTURED_TYPE_FEATURE_COUNT + 0;\n+\tint DTO__SUPERTYPE = STRUCTURED_TYPE__SUPERTYPE;\n \n \t/**\n \t * The feature id for the '<em><b>Associated Types</b></em>' reference list.\n@@ -1646,25 +1716,25 @@ public interface EnvironmentPackage extends EPackage {\n \t * @generated\n \t * @ordered\n \t */\n-\tint DTO__ASSOCIATED_TYPES = STRUCTURED_TYPE_FEATURE_COUNT + 1;\n+\tint DTO__ASSOCIATED_TYPES = STRUCTURED_TYPE__ASSOCIATED_TYPES;\n \n \t/**\n-\t * The feature id for the '<em><b>Properties</b></em>' reference list.\n+\t * The feature id for the '<em><b>Owned Attributes</b></em>' containment reference list.\n \t * <!-- begin-user-doc -->\n \t * <!-- end-user-doc -->\n \t * @generated\n \t * @ordered\n \t */\n-\tint DTO__PROPERTIES = STRUCTURED_TYPE_FEATURE_COUNT + 2;\n+\tint DTO__OWNED_ATTRIBUTES = STRUCTURED_TYPE__OWNED_ATTRIBUTES;\n \n \t/**\n-\t * The feature id for the '<em><b>References</b></em>' reference list.\n+\t * The feature id for the '<em><b>Attributes</b></em>' reference list.\n \t * <!-- begin-user-doc -->\n \t * <!-- end-user-doc -->\n \t * @generated\n \t * @ordered\n \t */\n-\tint DTO__REFERENCES = STRUCTURED_TYPE_FEATURE_COUNT + 3;\n+\tint DTO__ATTRIBUTES = STRUCTURED_TYPE__ATTRIBUTES;\n \n \t/**\n \t * The feature id for the '<em><b>Owned References</b></em>' containment reference list.\n@@ -1673,34 +1743,34 @@ public interface EnvironmentPackage extends EPackage {\n \t * @generated\n \t * @ordered\n \t */\n-\tint DTO__OWNED_REFERENCES = STRUCTURED_TYPE_FEATURE_COUNT + 4;\n+\tint DTO__OWNED_REFERENCES = STRUCTURED_TYPE__OWNED_REFERENCES;\n \n \t/**\n-\t * The feature id for the '<em><b>Attributes</b></em>' reference list.\n+\t * The feature id for the '<em><b>References</b></em>' reference list.\n \t * <!-- begin-user-doc -->\n \t * <!-- end-user-doc -->\n \t * @generated\n \t * @ordered\n \t */\n-\tint DTO__ATTRIBUTES = STRUCTURED_TYPE_FEATURE_COUNT + 5;\n+\tint DTO__REFERENCES = STRUCTURED_TYPE__REFERENCES;\n \n \t/**\n-\t * The feature id for the '<em><b>Owned Attributes</b></em>' containment reference list.\n+\t * The feature id for the '<em><b>Properties</b></em>' reference list.\n \t * <!-- begin-user-doc -->\n \t * <!-- end-user-doc -->\n \t * @generated\n \t * @ordered\n \t */\n-\tint DTO__OWNED_ATTRIBUTES = STRUCTURED_TYPE_FEATURE_COUNT + 6;\n+\tint DTO__PROPERTIES = STRUCTURED_TYPE__PROPERTIES;\n \n \t/**\n-\t * The feature id for the '<em><b>Supertype</b></em>' reference.\n+\t * The feature id for the '<em><b>Owned Container</b></em>' containment reference.\n \t * <!-- begin-user-doc -->\n \t * <!-- end-user-doc -->\n \t * @generated\n \t * @ordered\n \t */\n-\tint DTO__SUPERTYPE = STRUCTURED_TYPE_FEATURE_COUNT + 7;\n+\tint DTO__OWNED_CONTAINER = STRUCTURED_TYPE_FEATURE_COUNT + 0;\n \n \t/**\n \t * The number of structural features of the '<em>DTO</em>' class.\n@@ -1709,7 +1779,7 @@ public interface EnvironmentPackage extends EPackage {\n \t * @generated\n \t * @ordered\n \t */\n-\tint DTO_FEATURE_COUNT = STRUCTURED_TYPE_FEATURE_COUNT + 8;\n+\tint DTO_FEATURE_COUNT = STRUCTURED_TYPE_FEATURE_COUNT + 1;\n \n \t/**\n \t * The meta object id for the '{@link org.obeonetwork.dsl.environment.impl.FilterContainerImpl <em>Filter Container</em>}' class.\n@@ -1919,7 +1989,7 @@ public interface EnvironmentPackage extends EPackage {\n \t * @generated\n \t * @ordered\n \t */\n-\tint NAMESPACE__METADATAS = OBEO_DSM_OBJECT__METADATAS;\n+\tint NAMESPACE__METADATAS = TYPES_DEFINITION__METADATAS;\n \n \t/**\n \t * The feature id for the '<em><b>Description</b></em>' attribute.\n@@ -1928,7 +1998,7 @@ public interface EnvironmentPackage extends EPackage {\n \t * @generated\n \t * @ordered\n \t */\n-\tint NAMESPACE__DESCRIPTION = OBEO_DSM_OBJECT__DESCRIPTION;\n+\tint NAMESPACE__DESCRIPTION = TYPES_DEFINITION__DESCRIPTION;\n \n \t/**\n \t * The feature id for the '<em><b>Keywords</b></em>' attribute list.\n@@ -1937,7 +2007,7 @@ public interface EnvironmentPackage extends EPackage {\n \t * @generated\n \t * @ordered\n \t */\n-\tint NAMESPACE__KEYWORDS = OBEO_DSM_OBJECT__KEYWORDS;\n+\tint NAMESPACE__KEYWORDS = TYPES_DEFINITION__KEYWORDS;\n \n \t/**\n \t * The feature id for the '<em><b>Behaviours</b></em>' containment reference list.\n@@ -1946,7 +2016,7 @@ public interface EnvironmentPackage extends EPackage {\n \t * @generated\n \t * @ordered\n \t */\n-\tint NAMESPACE__BEHAVIOURS = OBEO_DSM_OBJECT__BEHAVIOURS;\n+\tint NAMESPACE__BEHAVIOURS = TYPES_DEFINITION__BEHAVIOURS;\n \n \t/**\n \t * The feature id for the '<em><b>Binding Registries</b></em>' reference list.\n@@ -1955,7 +2025,7 @@ public interface EnvironmentPackage extends EPackage {\n \t * @generated\n \t * @ordered\n \t */\n-\tint NAMESPACE__BINDING_REGISTRIES = OBEO_DSM_OBJECT__BINDING_REGISTRIES;\n+\tint NAMESPACE__BINDING_REGISTRIES = TYPES_DEFINITION__BINDING_REGISTRIES;\n \n \t/**\n \t * The feature id for the '<em><b>Version</b></em>' attribute.\n@@ -1964,7 +2034,7 @@ public interface EnvironmentPackage extends EPackage {\n \t * @generated\n \t * @ordered\n \t */\n-\tint NAMESPACE__VERSION = OBEO_DSM_OBJECT__VERSION;\n+\tint NAMESPACE__VERSION = TYPES_DEFINITION__VERSION;\n \n \t/**\n \t * The feature id for the '<em><b>Created On</b></em>' attribute.\n@@ -1973,7 +2043,7 @@ public interface EnvironmentPackage extends EPackage {\n \t * @generated\n \t * @ordered\n \t */\n-\tint NAMESPACE__CREATED_ON = OBEO_DSM_OBJECT__CREATED_ON;\n+\tint NAMESPACE__CREATED_ON = TYPES_DEFINITION__CREATED_ON;\n \n \t/**\n \t * The feature id for the '<em><b>Modified On</b></em>' attribute.\n@@ -1982,7 +2052,16 @@ public interface EnvironmentPackage extends EPackage {\n \t * @generated\n \t * @ordered\n \t */\n-\tint NAMESPACE__MODIFIED_ON = OBEO_DSM_OBJECT__MODIFIED_ON;\n+\tint NAMESPACE__MODIFIED_ON = TYPES_DEFINITION__MODIFIED_ON;\n+\n+\t/**\n+\t * The feature id for the '<em><b>Types</b></em>' containment reference list.\n+\t * <!-- begin-user-doc -->\n+\t * <!-- end-user-doc -->\n+\t * @generated\n+\t * @ordered\n+\t */\n+\tint NAMESPACE__TYPES = TYPES_DEFINITION__TYPES;\n \n \t/**\n \t * The feature id for the '<em><b>Owned Namespaces</b></em>' containment reference list.\n@@ -1991,7 +2070,7 @@ public interface EnvironmentPackage extends EPackage {\n \t * @generated\n \t * @ordered\n \t */\n-\tint NAMESPACE__OWNED_NAMESPACES = OBEO_DSM_OBJECT_FEATURE_COUNT + 0;\n+\tint NAMESPACE__OWNED_NAMESPACES = TYPES_DEFINITION_FEATURE_COUNT + 0;\n \n \t/**\n \t * The feature id for the '<em><b>Owner</b></em>' container reference.\n@@ -2000,7 +2079,7 @@ public interface EnvironmentPackage extends EPackage {\n \t * @generated\n \t * @ordered\n \t */\n-\tint NAMESPACE__OWNER = OBEO_DSM_OBJECT_FEATURE_COUNT + 1;\n+\tint NAMESPACE__OWNER = TYPES_DEFINITION_FEATURE_COUNT + 1;\n \n \t/**\n \t * The feature id for the '<em><b>Name</b></em>' attribute.\n@@ -2009,7 +2088,7 @@ public interface EnvironmentPackage extends EPackage {\n \t * @generated\n \t * @ordered\n \t */\n-\tint NAMESPACE__NAME = OBEO_DSM_OBJECT_FEATURE_COUNT + 2;\n+\tint NAMESPACE__NAME = TYPES_DEFINITION_FEATURE_COUNT + 2;\n \n \t/**\n \t * The number of structural features of the '<em>Namespace</em>' class.\n@@ -2018,7 +2097,7 @@ public interface EnvironmentPackage extends EPackage {\n \t * @generated\n \t * @ordered\n \t */\n-\tint NAMESPACE_FEATURE_COUNT = OBEO_DSM_OBJECT_FEATURE_COUNT + 3;\n+\tint NAMESPACE_FEATURE_COUNT = TYPES_DEFINITION_FEATURE_COUNT + 3;\n \n \t/**\n \t * The meta object id for the '{@link org.obeonetwork.dsl.environment.impl.PropertyImpl <em>Property</em>}' class.\n@@ -2120,14 +2199,23 @@ public interface EnvironmentPackage extends EPackage {\n \t */\n \tint PROPERTY__MULTIPLICITY = OBEO_DSM_OBJECT_FEATURE_COUNT + 1;\n \n+\t/**\n+\t * The feature id for the '<em><b>Is Identifier</b></em>' attribute.\n+\t * <!-- begin-user-doc -->\n+\t * <!-- end-user-doc -->\n+\t * @generated\n+\t * @ordered\n+\t */\n+\tint PROPERTY__IS_IDENTIFIER = OBEO_DSM_OBJECT_FEATURE_COUNT + 2;\n+\n \t/**\n \t * The number of structural features of the '<em>Property</em>' class.\n \t * <!-- begin-user-doc -->\n \t * <!-- end-user-doc -->\n \t * @generated\n \t * @ordered\n \t */\n-\tint PROPERTY_FEATURE_COUNT = OBEO_DSM_OBJECT_FEATURE_COUNT + 2;\n+\tint PROPERTY_FEATURE_COUNT = OBEO_DSM_OBJECT_FEATURE_COUNT + 3;\n \n \t/**\n \t * The meta object id for the '{@link org.obeonetwork.dsl.environment.impl.AttributeImpl <em>Attribute</em>}' class.\n@@ -2229,6 +2317,15 @@ public interface EnvironmentPackage extends EPackage {\n \t */\n \tint ATTRIBUTE__MULTIPLICITY = PROPERTY__MULTIPLICITY;\n \n+\t/**\n+\t * The feature id for the '<em><b>Is Identifier</b></em>' attribute.\n+\t * <!-- begin-user-doc -->\n+\t * <!-- end-user-doc -->\n+\t * @generated\n+\t * @ordered\n+\t */\n+\tint ATTRIBUTE__IS_IDENTIFIER = PROPERTY__IS_IDENTIFIER;\n+\n \t/**\n \t * The feature id for the '<em><b>Type</b></em>' reference.\n \t * <!-- begin-user-doc -->\n@@ -2239,13 +2336,13 @@ public interface EnvironmentPackage extends EPackage {\n \tint ATTRIBUTE__TYPE = PROPERTY_FEATURE_COUNT + 0;\n \n \t/**\n-\t * The feature id for the '<em><b>Dto</b></em>' container reference.\n+\t * The feature id for the '<em><b>Containing Type</b></em>' container reference.\n \t * <!-- begin-user-doc -->\n \t * <!-- end-user-doc -->\n \t * @generated\n \t * @ordered\n \t */\n-\tint ATTRIBUTE__DTO = PROPERTY_FEATURE_COUNT + 1;\n+\tint ATTRIBUTE__CONTAINING_TYPE = PROPERTY_FEATURE_COUNT + 1;\n \n \t/**\n \t * The number of structural features of the '<em>Attribute</em>' class.\n@@ -2356,6 +2453,15 @@ public interface EnvironmentPackage extends EPackage {\n \t */\n \tint REFERENCE__MULTIPLICITY = PROPERTY__MULTIPLICITY;\n \n+\t/**\n+\t * The feature id for the '<em><b>Is Identifier</b></em>' attribute.\n+\t * <!-- begin-user-doc -->\n+\t * <!-- end-user-doc -->\n+\t * @generated\n+\t * @ordered\n+\t */\n+\tint REFERENCE__IS_IDENTIFIER = PROPERTY__IS_IDENTIFIER;\n+\n \t/**\n \t * The feature id for the '<em><b>Is Composite</b></em>' attribute.\n \t * <!-- begin-user-doc -->\n@@ -2384,22 +2490,22 @@ public interface EnvironmentPackage extends EPackage {\n \tint REFERENCE__OPPOSITE_OF = PROPERTY_FEATURE_COUNT + 2;\n \n \t/**\n-\t * The feature id for the '<em><b>Type</b></em>' reference.\n+\t * The feature id for the '<em><b>Containing Type</b></em>' container reference.\n \t * <!-- begin-user-doc -->\n \t * <!-- end-user-doc -->\n \t * @generated\n \t * @ordered\n \t */\n-\tint REFERENCE__TYPE = PROPERTY_FEATURE_COUNT + 3;\n+\tint REFERENCE__CONTAINING_TYPE = PROPERTY_FEATURE_COUNT + 3;\n \n \t/**\n-\t * The feature id for the '<em><b>Dto</b></em>' container reference.\n+\t * The feature id for the '<em><b>Referenced Type</b></em>' reference.\n \t * <!-- begin-user-doc -->\n \t * <!-- end-user-doc -->\n \t * @generated\n \t * @ordered\n \t */\n-\tint REFERENCE__DTO = PROPERTY_FEATURE_COUNT + 4;\n+\tint REFERENCE__REFERENCED_TYPE = PROPERTY_FEATURE_COUNT + 4;\n \n \t/**\n \t * The number of structural features of the '<em>Reference</em>' class.\n@@ -3003,6 +3109,17 @@ public interface EnvironmentPackage extends EPackage {\n \t */\n \tEReference getEnvironment_TypesDefinition();\n \n+\t/**\n+\t * Returns the meta object for the containment reference list '{@link org.obeonetwork.dsl.environment.Environment#getNamespaces <em>Namespaces</em>}'.\n+\t * <!-- begin-user-doc -->\n+\t * <!-- end-user-doc -->\n+\t * @return the meta object for the containment reference list '<em>Namespaces</em>'.\n+\t * @see org.obeonetwork.dsl.environment.Environment#getNamespaces()\n+\t * @see #getEnvironment()\n+\t * @generated\n+\t */\n+\tEReference getEnvironment_Namespaces();\n+\n \t/**\n \t * Returns the meta object for class '{@link org.obeonetwork.dsl.environment.Type <em>Type</em>}'.\n \t * <!-- begin-user-doc -->\n@@ -3385,102 +3502,102 @@ public interface EnvironmentPackage extends EPackage {\n \tEClass getStructuredType();\n \n \t/**\n-\t * Returns the meta object for class '{@link org.obeonetwork.dsl.environment.DTO <em>DTO</em>}'.\n+\t * Returns the meta object for the reference '{@link org.obeonetwork.dsl.environment.StructuredType#getSupertype <em>Supertype</em>}'.\n \t * <!-- begin-user-doc -->\n \t * <!-- end-user-doc -->\n-\t * @return the meta object for class '<em>DTO</em>'.\n-\t * @see org.obeonetwork.dsl.environment.DTO\n+\t * @return the meta object for the reference '<em>Supertype</em>'.\n+\t * @see org.obeonetwork.dsl.environment.StructuredType#getSupertype()\n+\t * @see #getStructuredType()\n \t * @generated\n \t */\n-\tEClass getDTO();\n+\tEReference getStructuredType_Supertype();\n \n \t/**\n-\t * Returns the meta object for the containment reference '{@link org.obeonetwork.dsl.environment.DTO#getOwnedContainer <em>Owned Container</em>}'.\n+\t * Returns the meta object for the reference list '{@link org.obeonetwork.dsl.environment.StructuredType#getAssociatedTypes <em>Associated Types</em>}'.\n \t * <!-- begin-user-doc -->\n \t * <!-- end-user-doc -->\n-\t * @return the meta object for the containment reference '<em>Owned Container</em>'.\n-\t * @see org.obeonetwork.dsl.environment.DTO#getOwnedContainer()\n-\t * @see #getDTO()\n+\t * @return the meta object for the reference list '<em>Associated Types</em>'.\n+\t * @see org.obeonetwork.dsl.environment.StructuredType#getAssociatedTypes()\n+\t * @see #getStructuredType()\n \t * @generated\n \t */\n-\tEReference getDTO_OwnedContainer();\n+\tEReference getStructuredType_AssociatedTypes();\n \n \t/**\n-\t * Returns the meta object for the reference list '{@link org.obeonetwork.dsl.environment.DTO#getAssociatedTypes <em>Associated Types</em>}'.\n+\t * Returns the meta object for the containment reference list '{@link org.obeonetwork.dsl.environment.StructuredType#getOwnedAttributes <em>Owned Attributes</em>}'.\n \t * <!-- begin-user-doc -->\n \t * <!-- end-user-doc -->\n-\t * @return the meta object for the reference list '<em>Associated Types</em>'.\n-\t * @see org.obeonetwork.dsl.environment.DTO#getAssociatedTypes()\n-\t * @see #getDTO()\n+\t * @return the meta object for the containment reference list '<em>Owned Attributes</em>'.\n+\t * @see org.obeonetwork.dsl.environment.StructuredType#getOwnedAttributes()\n+\t * @see #getStructuredType()\n \t * @generated\n \t */\n-\tEReference getDTO_AssociatedTypes();\n+\tEReference getStructuredType_OwnedAttributes();\n \n \t/**\n-\t * Returns the meta object for the reference list '{@link org.obeonetwork.dsl.environment.DTO#getProperties <em>Properties</em>}'.\n+\t * Returns the meta object for the reference list '{@link org.obeonetwork.dsl.environment.StructuredType#getAttributes <em>Attributes</em>}'.\n \t * <!-- begin-user-doc -->\n \t * <!-- end-user-doc -->\n-\t * @return the meta object for the reference list '<em>Properties</em>'.\n-\t * @see org.obeonetwork.dsl.environment.DTO#getProperties()\n-\t * @see #getDTO()\n+\t * @return the meta object for the reference list '<em>Attributes</em>'.\n+\t * @see org.obeonetwork.dsl.environment.StructuredType#getAttributes()\n+\t * @see #getStructuredType()\n \t * @generated\n \t */\n-\tEReference getDTO_Properties();\n+\tEReference getStructuredType_Attributes();\n \n \t/**\n-\t * Returns the meta object for the reference list '{@link org.obeonetwork.dsl.environment.DTO#getReferences <em>References</em>}'.\n+\t * Returns the meta object for the containment reference list '{@link org.obeonetwork.dsl.environment.StructuredType#getOwnedReferences <em>Owned References</em>}'.\n \t * <!-- begin-user-doc -->\n \t * <!-- end-user-doc -->\n-\t * @return the meta object for the reference list '<em>References</em>'.\n-\t * @see org.obeonetwork.dsl.environment.DTO#getReferences()\n-\t * @see #getDTO()\n+\t * @return the meta object for the containment reference list '<em>Owned References</em>'.\n+\t * @see org.obeonetwork.dsl.environment.StructuredType#getOwnedReferences()\n+\t * @see #getStructuredType()\n \t * @generated\n \t */\n-\tEReference getDTO_References();\n+\tEReference getStructuredType_OwnedReferences();\n \n \t/**\n-\t * Returns the meta object for the containment reference list '{@link org.obeonetwork.dsl.environment.DTO#getOwnedReferences <em>Owned References</em>}'.\n+\t * Returns the meta object for the reference list '{@link org.obeonetwork.dsl.environment.StructuredType#getReferences <em>References</em>}'.\n \t * <!-- begin-user-doc -->\n \t * <!-- end-user-doc -->\n-\t * @return the meta object for the containment reference list '<em>Owned References</em>'.\n-\t * @see org.obeonetwork.dsl.environment.DTO#getOwnedReferences()\n-\t * @see #getDTO()\n+\t * @return the meta object for the reference list '<em>References</em>'.\n+\t * @see org.obeonetwork.dsl.environment.StructuredType#getReferences()\n+\t * @see #getStructuredType()\n \t * @generated\n \t */\n-\tEReference getDTO_OwnedReferences();\n+\tEReference getStructuredType_References();\n \n \t/**\n-\t * Returns the meta object for the reference list '{@link org.obeonetwork.dsl.environment.DTO#getAttributes <em>Attributes</em>}'.\n+\t * Returns the meta object for the reference list '{@link org.obeonetwork.dsl.environment.StructuredType#getProperties <em>Properties</em>}'.\n \t * <!-- begin-user-doc -->\n \t * <!-- end-user-doc -->\n-\t * @return the meta object for the reference list '<em>Attributes</em>'.\n-\t * @see org.obeonetwork.dsl.environment.DTO#getAttributes()\n-\t * @see #getDTO()\n+\t * @return the meta object for the reference list '<em>Properties</em>'.\n+\t * @see org.obeonetwork.dsl.environment.StructuredType#getProperties()\n+\t * @see #getStructuredType()\n \t * @generated\n \t */\n-\tEReference getDTO_Attributes();\n+\tEReference getStructuredType_Properties();\n \n \t/**\n-\t * Returns the meta object for the containment reference list '{@link org.obeonetwork.dsl.environment.DTO#getOwnedAttributes <em>Owned Attributes</em>}'.\n+\t * Returns the meta object for class '{@link org.obeonetwork.dsl.environment.DTO <em>DTO</em>}'.\n \t * <!-- begin-user-doc -->\n \t * <!-- end-user-doc -->\n-\t * @return the meta object for the containment reference list '<em>Owned Attributes</em>'.\n-\t * @see org.obeonetwork.dsl.environment.DTO#getOwnedAttributes()\n-\t * @see #getDTO()\n+\t * @return the meta object for class '<em>DTO</em>'.\n+\t * @see org.obeonetwork.dsl.environment.DTO\n \t * @generated\n \t */\n-\tEReference getDTO_OwnedAttributes();\n+\tEClass getDTO();\n \n \t/**\n-\t * Returns the meta object for the reference '{@link org.obeonetwork.dsl.environment.DTO#getSupertype <em>Supertype</em>}'.\n+\t * Returns the meta object for the containment reference '{@link org.obeonetwork.dsl.environment.DTO#getOwnedContainer <em>Owned Container</em>}'.\n \t * <!-- begin-user-doc -->\n \t * <!-- end-user-doc -->\n-\t * @return the meta object for the reference '<em>Supertype</em>'.\n-\t * @see org.obeonetwork.dsl.environment.DTO#getSupertype()\n+\t * @return the meta object for the containment reference '<em>Owned Container</em>'.\n+\t * @see org.obeonetwork.dsl.environment.DTO#getOwnedContainer()\n \t * @see #getDTO()\n \t * @generated\n \t */\n-\tEReference getDTO_Supertype();\n+\tEReference getDTO_OwnedContainer();\n \n \t/**\n \t * Returns the meta object for class '{@link org.obeonetwork.dsl.environment.FilterContainer <em>Filter Container</em>}'.\n@@ -3578,15 +3695,15 @@ public interface EnvironmentPackage extends EPackage {\n \tEReference getAttribute_Type();\n \n \t/**\n-\t * Returns the meta object for the container reference '{@link org.obeonetwork.dsl.environment.Attribute#getDto <em>Dto</em>}'.\n+\t * Returns the meta object for the container reference '{@link org.obeonetwork.dsl.environment.Attribute#getContainingType <em>Containing Type</em>}'.\n \t * <!-- begin-user-doc -->\n \t * <!-- end-user-doc -->\n-\t * @return the meta object for the container reference '<em>Dto</em>'.\n-\t * @see org.obeonetwork.dsl.environment.Attribute#getDto()\n+\t * @return the meta object for the container reference '<em>Containing Type</em>'.\n+\t * @see org.obeonetwork.dsl.environment.Attribute#getContainingType()\n \t * @see #getAttribute()\n \t * @generated\n \t */\n-\tEReference getAttribute_Dto();\n+\tEReference getAttribute_ContainingType();\n \n \t/**\n \t * Returns the meta object for class '{@link org.obeonetwork.dsl.environment.Reference <em>Reference</em>}'.\n@@ -3632,26 +3749,26 @@ public interface EnvironmentPackage extends EPackage {\n \tEReference getReference_OppositeOf();\n \n \t/**\n-\t * Returns the meta object for the reference '{@link org.obeonetwork.dsl.environment.Reference#getType <em>Type</em>}'.\n+\t * Returns the meta object for the container reference '{@link org.obeonetwork.dsl.environment.Reference#getContainingType <em>Containing Type</em>}'.\n \t * <!-- begin-user-doc -->\n \t * <!-- end-user-doc -->\n-\t * @return the meta object for the reference '<em>Type</em>'.\n-\t * @see org.obeonetwork.dsl.environment.Reference#getType()\n+\t * @return the meta object for the container reference '<em>Containing Type</em>'.\n+\t * @see org.obeonetwork.dsl.environment.Reference#getContainingType()\n \t * @see #getReference()\n \t * @generated\n \t */\n-\tEReference getReference_Type();\n+\tEReference getReference_ContainingType();\n \n \t/**\n-\t * Returns the meta object for the container reference '{@link org.obeonetwork.dsl.environment.Reference#getDto <em>Dto</em>}'.\n+\t * Returns the meta object for the reference '{@link org.obeonetwork.dsl.environment.Reference#getReferencedType <em>Referenced Type</em>}'.\n \t * <!-- begin-user-doc -->\n \t * <!-- end-user-doc -->\n-\t * @return the meta object for the container reference '<em>Dto</em>'.\n-\t * @see org.obeonetwork.dsl.environment.Reference#getDto()\n+\t * @return the meta object for the reference '<em>Referenced Type</em>'.\n+\t * @see org.obeonetwork.dsl.environment.Reference#getReferencedType()\n \t * @see #getReference()\n \t * @generated\n \t */\n-\tEReference getReference_Dto();\n+\tEReference getReference_ReferencedType();\n \n \t/**\n \t * Returns the meta object for class '{@link org.obeonetwork.dsl.environment.Property <em>Property</em>}'.\n@@ -3685,6 +3802,17 @@ public interface EnvironmentPackage extends EPackage {\n \t */\n \tEAttribute getProperty_Multiplicity();\n \n+\t/**\n+\t * Returns the meta object for the attribute '{@link org.obeonetwork.dsl.environment.Property#isIsIdentifier <em>Is Identifier</em>}'.\n+\t * <!-- begin-user-doc -->\n+\t * <!-- end-user-doc -->\n+\t * @return the meta object for the attribute '<em>Is Identifier</em>'.\n+\t * @see org.obeonetwork.dsl.environment.Property#isIsIdentifier()\n+\t * @see #getProperty()\n+\t * @generated\n+\t */\n+\tEAttribute getProperty_IsIdentifier();\n+\n \t/**\n \t * Returns the meta object for class '{@link org.obeonetwork.dsl.environment.BindingInfo <em>Binding Info</em>}'.\n \t * <!-- begin-user-doc -->\n@@ -3984,6 +4112,15 @@ interface Literals {\n \t\tEReference ENVIRONMENT__TYPES_DEFINITION = eINSTANCE\n \t\t\t\t.getEnvironment_TypesDefinition();\n \n+\t\t/**\n+\t\t * The meta object literal for the '<em><b>Namespaces</b></em>' containment reference list feature.\n+\t\t * <!-- begin-user-doc -->\n+\t\t * <!-- end-user-doc -->\n+\t\t * @generated\n+\t\t */\n+\t\tEReference ENVIRONMENT__NAMESPACES = eINSTANCE\n+\t\t\t\t.getEnvironment_Namespaces();\n+\n \t\t/**\n \t\t * The meta object literal for the '{@link org.obeonetwork.dsl.environment.impl.TypeImpl <em>Type</em>}' class.\n \t\t * <!-- begin-user-doc -->\n@@ -4314,78 +4451,85 @@ interface Literals {\n \t\tEClass STRUCTURED_TYPE = eINSTANCE.getStructuredType();\n \n \t\t/**\n-\t\t * The meta object literal for the '{@link org.obeonetwork.dsl.environment.impl.DTOImpl <em>DTO</em>}' class.\n+\t\t * The meta object literal for the '<em><b>Supertype</b></em>' reference feature.\n \t\t * <!-- begin-user-doc -->\n \t\t * <!-- end-user-doc -->\n-\t\t * @see org.obeonetwork.dsl.environment.impl.DTOImpl\n-\t\t * @see org.obeonetwork.dsl.environment.impl.EnvironmentPackageImpl#getDTO()\n \t\t * @generated\n \t\t */\n-\t\tEClass DTO = eINSTANCE.getDTO();\n+\t\tEReference STRUCTURED_TYPE__SUPERTYPE = eINSTANCE\n+\t\t\t\t.getStructuredType_Supertype();\n \n \t\t/**\n-\t\t * The meta object literal for the '<em><b>Owned Container</b></em>' containment reference feature.\n+\t\t * The meta object literal for the '<em><b>Associated Types</b></em>' reference list feature.\n \t\t * <!-- begin-user-doc -->\n \t\t * <!-- end-user-doc -->\n \t\t * @generated\n \t\t */\n-\t\tEReference DTO__OWNED_CONTAINER = eINSTANCE.getDTO_OwnedContainer();\n+\t\tEReference STRUCTURED_TYPE__ASSOCIATED_TYPES = eINSTANCE\n+\t\t\t\t.getStructuredType_AssociatedTypes();\n \n \t\t/**\n-\t\t * The meta object literal for the '<em><b>Associated Types</b></em>' reference list feature.\n+\t\t * The meta object literal for the '<em><b>Owned Attributes</b></em>' containment reference list feature.\n \t\t * <!-- begin-user-doc -->\n \t\t * <!-- end-user-doc -->\n \t\t * @generated\n \t\t */\n-\t\tEReference DTO__ASSOCIATED_TYPES = eINSTANCE.getDTO_AssociatedTypes();\n+\t\tEReference STRUCTURED_TYPE__OWNED_ATTRIBUTES = eINSTANCE\n+\t\t\t\t.getStructuredType_OwnedAttributes();\n \n \t\t/**\n-\t\t * The meta object literal for the '<em><b>Properties</b></em>' reference list feature.\n+\t\t * The meta object literal for the '<em><b>Attributes</b></em>' reference list feature.\n \t\t * <!-- begin-user-doc -->\n \t\t * <!-- end-user-doc -->\n \t\t * @generated\n \t\t */\n-\t\tEReference DTO__PROPERTIES = eINSTANCE.getDTO_Properties();\n+\t\tEReference STRUCTURED_TYPE__ATTRIBUTES = eINSTANCE\n+\t\t\t\t.getStructuredType_Attributes();\n \n \t\t/**\n-\t\t * The meta object literal for the '<em><b>References</b></em>' reference list feature.\n+\t\t * The meta object literal for the '<em><b>Owned References</b></em>' containment reference list feature.\n \t\t * <!-- begin-user-doc -->\n \t\t * <!-- end-user-doc -->\n \t\t * @generated\n \t\t */\n-\t\tEReference DTO__REFERENCES = eINSTANCE.getDTO_References();\n+\t\tEReference STRUCTURED_TYPE__OWNED_REFERENCES = eINSTANCE\n+\t\t\t\t.getStructuredType_OwnedReferences();\n \n \t\t/**\n-\t\t * The meta object literal for the '<em><b>Owned References</b></em>' containment reference list feature.\n+\t\t * The meta object literal for the '<em><b>References</b></em>' reference list feature.\n \t\t * <!-- begin-user-doc -->\n \t\t * <!-- end-user-doc -->\n \t\t * @generated\n \t\t */\n-\t\tEReference DTO__OWNED_REFERENCES = eINSTANCE.getDTO_OwnedReferences();\n+\t\tEReference STRUCTURED_TYPE__REFERENCES = eINSTANCE\n+\t\t\t\t.getStructuredType_References();\n \n \t\t/**\n-\t\t * The meta object literal for the '<em><b>Attributes</b></em>' reference list feature.\n+\t\t * The meta object literal for the '<em><b>Properties</b></em>' reference list feature.\n \t\t * <!-- begin-user-doc -->\n \t\t * <!-- end-user-doc -->\n \t\t * @generated\n \t\t */\n-\t\tEReference DTO__ATTRIBUTES = eINSTANCE.getDTO_Attributes();\n+\t\tEReference STRUCTURED_TYPE__PROPERTIES = eINSTANCE\n+\t\t\t\t.getStructuredType_Properties();\n \n \t\t/**\n-\t\t * The meta object literal for the '<em><b>Owned Attributes</b></em>' containment reference list feature.\n+\t\t * The meta object literal for the '{@link org.obeonetwork.dsl.environment.impl.DTOImpl <em>DTO</em>}' class.\n \t\t * <!-- begin-user-doc -->\n \t\t * <!-- end-user-doc -->\n+\t\t * @see org.obeonetwork.dsl.environment.impl.DTOImpl\n+\t\t * @see org.obeonetwork.dsl.environment.impl.EnvironmentPackageImpl#getDTO()\n \t\t * @generated\n \t\t */\n-\t\tEReference DTO__OWNED_ATTRIBUTES = eINSTANCE.getDTO_OwnedAttributes();\n+\t\tEClass DTO = eINSTANCE.getDTO();\n \n \t\t/**\n-\t\t * The meta object literal for the '<em><b>Supertype</b></em>' reference feature.\n+\t\t * The meta object literal for the '<em><b>Owned Container</b></em>' containment reference feature.\n \t\t * <!-- begin-user-doc -->\n \t\t * <!-- end-user-doc -->\n \t\t * @generated\n \t\t */\n-\t\tEReference DTO__SUPERTYPE = eINSTANCE.getDTO_Supertype();\n+\t\tEReference DTO__OWNED_CONTAINER = eINSTANCE.getDTO_OwnedContainer();\n \n \t\t/**\n \t\t * The meta object literal for the '{@link org.obeonetwork.dsl.environment.impl.FilterContainerImpl <em>Filter Container</em>}' class.\n@@ -4470,12 +4614,13 @@ interface Literals {\n \t\tEReference ATTRIBUTE__TYPE = eINSTANCE.getAttribute_Type();\n \n \t\t/**\n-\t\t * The meta object literal for the '<em><b>Dto</b></em>' container reference feature.\n+\t\t * The meta object literal for the '<em><b>Containing Type</b></em>' container reference feature.\n \t\t * <!-- begin-user-doc -->\n \t\t * <!-- end-user-doc -->\n \t\t * @generated\n \t\t */\n-\t\tEReference ATTRIBUTE__DTO = eINSTANCE.getAttribute_Dto();\n+\t\tEReference ATTRIBUTE__CONTAINING_TYPE = eINSTANCE\n+\t\t\t\t.getAttribute_ContainingType();\n \n \t\t/**\n \t\t * The meta object literal for the '{@link org.obeonetwork.dsl.environment.impl.ReferenceImpl <em>Reference</em>}' class.\n@@ -4513,20 +4658,22 @@ interface Literals {\n \t\tEReference REFERENCE__OPPOSITE_OF = eINSTANCE.getReference_OppositeOf();\n \n \t\t/**\n-\t\t * The meta object literal for the '<em><b>Type</b></em>' reference feature.\n+\t\t * The meta object literal for the '<em><b>Containing Type</b></em>' container reference feature.\n \t\t * <!-- begin-user-doc -->\n \t\t * <!-- end-user-doc -->\n \t\t * @generated\n \t\t */\n-\t\tEReference REFERENCE__TYPE = eINSTANCE.getReference_Type();\n+\t\tEReference REFERENCE__CONTAINING_TYPE = eINSTANCE\n+\t\t\t\t.getReference_ContainingType();\n \n \t\t/**\n-\t\t * The meta object literal for the '<em><b>Dto</b></em>' container reference feature.\n+\t\t * The meta object literal for the '<em><b>Referenced Type</b></em>' reference feature.\n \t\t * <!-- begin-user-doc -->\n \t\t * <!-- end-user-doc -->\n \t\t * @generated\n \t\t */\n-\t\tEReference REFERENCE__DTO = eINSTANCE.getReference_Dto();\n+\t\tEReference REFERENCE__REFERENCED_TYPE = eINSTANCE\n+\t\t\t\t.getReference_ReferencedType();\n \n \t\t/**\n \t\t * The meta object literal for the '{@link org.obeonetwork.dsl.environment.impl.PropertyImpl <em>Property</em>}' class.\n@@ -4555,6 +4702,15 @@ interface Literals {\n \t\tEAttribute PROPERTY__MULTIPLICITY = eINSTANCE\n \t\t\t\t.getProperty_Multiplicity();\n \n+\t\t/**\n+\t\t * The meta object literal for the '<em><b>Is Identifier</b></em>' attribute feature.\n+\t\t * <!-- begin-user-doc -->\n+\t\t * <!-- end-user-doc -->\n+\t\t * @generated\n+\t\t */\n+\t\tEAttribute PROPERTY__IS_IDENTIFIER = eINSTANCE\n+\t\t\t\t.getProperty_IsIdentifier();\n+\n \t\t/**\n \t\t * The meta object literal for the '{@link org.obeonetwork.dsl.environment.impl.BindingInfoImpl <em>Binding Info</em>}' class.\n \t\t * <!-- begin-user-doc -->", "raw_url": "https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2FEnvironmentPackage.java", "sha": "0ad0495209f0622687e7f0ccf75ce699a21a2c88", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2FNamespace.java", "changes": 2, "contents_url": "https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2FNamespace.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6", "deletions": 1, "filename": "models/environment/plugins/org.obeonetwork.dsl.environment/src/org/obeonetwork/dsl/environment/Namespace.java", "new_code": "public interface Namespace extends TypesDefinition {", "new_methods": [], "old_code": "public interface Namespace extends ObeoDSMObject {", "old_methods": [], "patch": "@@ -32,7 +32,7 @@\n * @model\n * @generated\n */\n-public interface Namespace extends ObeoDSMObject {\n+public interface Namespace extends TypesDefinition {\n \t/**\n \t * <!-- begin-user-doc -->\n \t * <!-- end-user-doc -->", "raw_url": "https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2FNamespace.java", "sha": "ed1b5d40d21b98228772c5487820ead8c60e6cc1", "status": "modified" }, { "additions": 27, "blob_url": "https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2FProperty.java", "changes": 27, "contents_url": "https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2FProperty.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6", "deletions": 0, "filename": "models/environment/plugins/org.obeonetwork.dsl.environment/src/org/obeonetwork/dsl/environment/Property.java", "new_code": " * <li>{@link org.obeonetwork.dsl.environment.Property#isIsIdentifier <em>Is Identifier</em>}</li>\n\t/**\n\t * Returns the value of the '<em><b>Is Identifier</b></em>' attribute.\n\t * <!-- begin-user-doc -->\n\t * <p>\n\t * If the meaning of the '<em>Is Identifier</em>' attribute isn't clear,\n\t * there really should be more of a description here...\n\t * </p>\n\t * <!-- end-user-doc -->\n\t * @return the value of the '<em>Is Identifier</em>' attribute.\n\t * @see #setIsIdentifier(boolean)\n\t * @see org.obeonetwork.dsl.environment.EnvironmentPackage#getProperty_IsIdentifier()\n\t * @model\n\t * @generated\n\t */\n\tboolean isIsIdentifier();\n\n\t/**\n\t * Sets the value of the '{@link org.obeonetwork.dsl.environment.Property#isIsIdentifier <em>Is Identifier</em>}' attribute.\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @param value the new value of the '<em>Is Identifier</em>' attribute.\n\t * @see #isIsIdentifier()\n\t * @generated\n\t */\n\tvoid setIsIdentifier(boolean value);\n", "new_methods": [], "old_code": "", "old_methods": [], "patch": "@@ -22,6 +22,7 @@\n * <ul>\n * <li>{@link org.obeonetwork.dsl.environment.Property#getName <em>Name</em>}</li>\n * <li>{@link org.obeonetwork.dsl.environment.Property#getMultiplicity <em>Multiplicity</em>}</li>\n+ * <li>{@link org.obeonetwork.dsl.environment.Property#isIsIdentifier <em>Is Identifier</em>}</li>\n * </ul>\n * </p>\n *\n@@ -92,4 +93,30 @@ public interface Property extends ObeoDSMObject, BoundableElement {\n \t */\n \tvoid setMultiplicity(MultiplicityKind value);\n \n+\t/**\n+\t * Returns the value of the '<em><b>Is Identifier</b></em>' attribute.\n+\t * <!-- begin-user-doc -->\n+\t * <p>\n+\t * If the meaning of the '<em>Is Identifier</em>' attribute isn't clear,\n+\t * there really should be more of a description here...\n+\t * </p>\n+\t * <!-- end-user-doc -->\n+\t * @return the value of the '<em>Is Identifier</em>' attribute.\n+\t * @see #setIsIdentifier(boolean)\n+\t * @see org.obeonetwork.dsl.environment.EnvironmentPackage#getProperty_IsIdentifier()\n+\t * @model\n+\t * @generated\n+\t */\n+\tboolean isIsIdentifier();\n+\n+\t/**\n+\t * Sets the value of the '{@link org.obeonetwork.dsl.environment.Property#isIsIdentifier <em>Is Identifier</em>}' attribute.\n+\t * <!-- begin-user-doc -->\n+\t * <!-- end-user-doc -->\n+\t * @param value the new value of the '<em>Is Identifier</em>' attribute.\n+\t * @see #isIsIdentifier()\n+\t * @generated\n+\t */\n+\tvoid setIsIdentifier(boolean value);\n+\n } // Property", "raw_url": "https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2FProperty.java", "sha": "f0699efb354f2ec72eb48548dd5134eb2498687d", "status": "modified" }, { "additions": 28, "blob_url": "https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2FReference.java", "changes": 55, "contents_url": "https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2FReference.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6", "deletions": 27, "filename": "models/environment/plugins/org.obeonetwork.dsl.environment/src/org/obeonetwork/dsl/environment/Reference.java", "new_code": " * <li>{@link org.obeonetwork.dsl.environment.Reference#getContainingType <em>Containing Type</em>}</li>\n * <li>{@link org.obeonetwork.dsl.environment.Reference#getReferencedType <em>Referenced Type</em>}</li>\n\t * The default value is <code>\"true\"</code>.\n\t * @model default=\"true\" required=\"true\"\n\t * Returns the value of the '<em><b>Containing Type</b></em>' container reference.\n\t * It is bidirectional and its opposite is '{@link org.obeonetwork.dsl.environment.StructuredType#getOwnedReferences <em>Owned References</em>}'.\n\t * If the meaning of the '<em>Containing Type</em>' container reference isn't clear,\n\t * @return the value of the '<em>Containing Type</em>' container reference.\n\t * @see #setContainingType(StructuredType)\n\t * @see org.obeonetwork.dsl.environment.EnvironmentPackage#getReference_ContainingType()\n\t * @see org.obeonetwork.dsl.environment.StructuredType#getOwnedReferences\n\t * @model opposite=\"ownedReferences\" required=\"true\" transient=\"false\"\n\tStructuredType getContainingType();\n\t * Sets the value of the '{@link org.obeonetwork.dsl.environment.Reference#getContainingType <em>Containing Type</em>}' container reference.\n\t * @param value the new value of the '<em>Containing Type</em>' container reference.\n\t * @see #getContainingType()\n\tvoid setContainingType(StructuredType value);\n\t * Returns the value of the '<em><b>Referenced Type</b></em>' reference.\n\t * If the meaning of the '<em>Referenced Type</em>' reference list isn't clear,\n\t * @return the value of the '<em>Referenced Type</em>' reference.\n\t * @see #setReferencedType(StructuredType)\n\t * @see org.obeonetwork.dsl.environment.EnvironmentPackage#getReference_ReferencedType()\n\t * @model required=\"true\"\n\tStructuredType getReferencedType();\n\t * Sets the value of the '{@link org.obeonetwork.dsl.environment.Reference#getReferencedType <em>Referenced Type</em>}' reference.\n\t * @param value the new value of the '<em>Referenced Type</em>' reference.\n\t * @see #getReferencedType()\n\tvoid setReferencedType(StructuredType value);", "new_methods": [], "old_code": " * <li>{@link org.obeonetwork.dsl.environment.Reference#getType <em>Type</em>}</li>\n * <li>{@link org.obeonetwork.dsl.environment.Reference#getDto <em>Dto</em>}</li>\n\t * @model required=\"true\"\n\t * Returns the value of the '<em><b>Type</b></em>' reference.\n\t * If the meaning of the '<em>Type</em>' reference isn't clear,\n\t * @return the value of the '<em>Type</em>' reference.\n\t * @see #setType(DTO)\n\t * @see org.obeonetwork.dsl.environment.EnvironmentPackage#getReference_Type()\n\t * @model required=\"true\"\n\tDTO getType();\n\t * Sets the value of the '{@link org.obeonetwork.dsl.environment.Reference#getType <em>Type</em>}' reference.\n\t * @param value the new value of the '<em>Type</em>' reference.\n\t * @see #getType()\n\tvoid setType(DTO value);\n\t * Returns the value of the '<em><b>Dto</b></em>' container reference.\n\t * It is bidirectional and its opposite is '{@link org.obeonetwork.dsl.environment.DTO#getOwnedReferences <em>Owned References</em>}'.\n\t * If the meaning of the '<em>Dto</em>' container reference isn't clear,\n\t * @return the value of the '<em>Dto</em>' container reference.\n\t * @see #setDto(DTO)\n\t * @see org.obeonetwork.dsl.environment.EnvironmentPackage#getReference_Dto()\n\t * @see org.obeonetwork.dsl.environment.DTO#getOwnedReferences\n\t * @model opposite=\"ownedReferences\" required=\"true\" transient=\"false\"\n\tDTO getDto();\n\t * Sets the value of the '{@link org.obeonetwork.dsl.environment.Reference#getDto <em>Dto</em>}' container reference.\n\t * @param value the new value of the '<em>Dto</em>' container reference.\n\t * @see #getDto()\n\tvoid setDto(DTO value);", "old_methods": [], "patch": "@@ -23,8 +23,8 @@\n * <li>{@link org.obeonetwork.dsl.environment.Reference#isIsComposite <em>Is Composite</em>}</li>\n * <li>{@link org.obeonetwork.dsl.environment.Reference#isNavigable <em>Navigable</em>}</li>\n * <li>{@link org.obeonetwork.dsl.environment.Reference#getOppositeOf <em>Opposite Of</em>}</li>\n- * <li>{@link org.obeonetwork.dsl.environment.Reference#getType <em>Type</em>}</li>\n- * <li>{@link org.obeonetwork.dsl.environment.Reference#getDto <em>Dto</em>}</li>\n+ * <li>{@link org.obeonetwork.dsl.environment.Reference#getContainingType <em>Containing Type</em>}</li>\n+ * <li>{@link org.obeonetwork.dsl.environment.Reference#getReferencedType <em>Referenced Type</em>}</li>\n * </ul>\n * </p>\n *\n@@ -68,6 +68,7 @@ public interface Reference extends Property {\n \n \t/**\n \t * Returns the value of the '<em><b>Navigable</b></em>' attribute.\n+\t * The default value is <code>\"true\"</code>.\n \t * <!-- begin-user-doc -->\n \t * <p>\n \t * If the meaning of the '<em>Navigable</em>' attribute isn't clear,\n@@ -77,7 +78,7 @@ public interface Reference extends Property {\n \t * @return the value of the '<em>Navigable</em>' attribute.\n \t * @see #setNavigable(boolean)\n \t * @see org.obeonetwork.dsl.environment.EnvironmentPackage#getReference_Navigable()\n-\t * @model required=\"true\"\n+\t * @model default=\"true\" required=\"true\"\n \t * @generated\n \t */\n \tboolean isNavigable();\n@@ -119,58 +120,58 @@ public interface Reference extends Property {\n \tvoid setOppositeOf(Reference value);\n \n \t/**\n-\t * Returns the value of the '<em><b>Type</b></em>' reference.\n+\t * Returns the value of the '<em><b>Containing Type</b></em>' container reference.\n+\t * It is bidirectional and its opposite is '{@link org.obeonetwork.dsl.environment.StructuredType#getOwnedReferences <em>Owned References</em>}'.\n \t * <!-- begin-user-doc -->\n \t * <p>\n-\t * If the meaning of the '<em>Type</em>' reference isn't clear,\n+\t * If the meaning of the '<em>Containing Type</em>' container reference isn't clear,\n \t * there really should be more of a description here...\n \t * </p>\n \t * <!-- end-user-doc -->\n-\t * @return the value of the '<em>Type</em>' reference.\n-\t * @see #setType(DTO)\n-\t * @see org.obeonetwork.dsl.environment.EnvironmentPackage#getReference_Type()\n-\t * @model required=\"true\"\n+\t * @return the value of the '<em>Containing Type</em>' container reference.\n+\t * @see #setContainingType(StructuredType)\n+\t * @see org.obeonetwork.dsl.environment.EnvironmentPackage#getReference_ContainingType()\n+\t * @see org.obeonetwork.dsl.environment.StructuredType#getOwnedReferences\n+\t * @model opposite=\"ownedReferences\" required=\"true\" transient=\"false\"\n \t * @generated\n \t */\n-\tDTO getType();\n+\tStructuredType getContainingType();\n \n \t/**\n-\t * Sets the value of the '{@link org.obeonetwork.dsl.environment.Reference#getType <em>Type</em>}' reference.\n+\t * Sets the value of the '{@link org.obeonetwork.dsl.environment.Reference#getContainingType <em>Containing Type</em>}' container reference.\n \t * <!-- begin-user-doc -->\n \t * <!-- end-user-doc -->\n-\t * @param value the new value of the '<em>Type</em>' reference.\n-\t * @see #getType()\n+\t * @param value the new value of the '<em>Containing Type</em>' container reference.\n+\t * @see #getContainingType()\n \t * @generated\n \t */\n-\tvoid setType(DTO value);\n+\tvoid setContainingType(StructuredType value);\n \n \t/**\n-\t * Returns the value of the '<em><b>Dto</b></em>' container reference.\n-\t * It is bidirectional and its opposite is '{@link org.obeonetwork.dsl.environment.DTO#getOwnedReferences <em>Owned References</em>}'.\n+\t * Returns the value of the '<em><b>Referenced Type</b></em>' reference.\n \t * <!-- begin-user-doc -->\n \t * <p>\n-\t * If the meaning of the '<em>Dto</em>' container reference isn't clear,\n+\t * If the meaning of the '<em>Referenced Type</em>' reference list isn't clear,\n \t * there really should be more of a description here...\n \t * </p>\n \t * <!-- end-user-doc -->\n-\t * @return the value of the '<em>Dto</em>' container reference.\n-\t * @see #setDto(DTO)\n-\t * @see org.obeonetwork.dsl.environment.EnvironmentPackage#getReference_Dto()\n-\t * @see org.obeonetwork.dsl.environment.DTO#getOwnedReferences\n-\t * @model opposite=\"ownedReferences\" required=\"true\" transient=\"false\"\n+\t * @return the value of the '<em>Referenced Type</em>' reference.\n+\t * @see #setReferencedType(StructuredType)\n+\t * @see org.obeonetwork.dsl.environment.EnvironmentPackage#getReference_ReferencedType()\n+\t * @model required=\"true\"\n \t * @generated\n \t */\n-\tDTO getDto();\n+\tStructuredType getReferencedType();\n \n \t/**\n-\t * Sets the value of the '{@link org.obeonetwork.dsl.environment.Reference#getDto <em>Dto</em>}' container reference.\n+\t * Sets the value of the '{@link org.obeonetwork.dsl.environment.Reference#getReferencedType <em>Referenced Type</em>}' reference.\n \t * <!-- begin-user-doc -->\n \t * <!-- end-user-doc -->\n-\t * @param value the new value of the '<em>Dto</em>' container reference.\n-\t * @see #getDto()\n+\t * @param value the new value of the '<em>Referenced Type</em>' reference.\n+\t * @see #getReferencedType()\n \t * @generated\n \t */\n-\tvoid setDto(DTO value);\n+\tvoid setReferencedType(StructuredType value);\n \n \t/**\n \t * <!-- begin-user-doc -->", "raw_url": "https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2FReference.java", "sha": "c8513179df2266c1d74faf28c38c8766f8dc7ce8", "status": "modified" }, { "additions": 148, "blob_url": "https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2FStructuredType.java", "changes": 148, "contents_url": "https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2FStructuredType.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6", "deletions": 0, "filename": "models/environment/plugins/org.obeonetwork.dsl.environment/src/org/obeonetwork/dsl/environment/StructuredType.java", "new_code": "import org.eclipse.emf.common.util.EList;\n\n * <p>\n * The following features are supported:\n * <ul>\n * <li>{@link org.obeonetwork.dsl.environment.StructuredType#getSupertype <em>Supertype</em>}</li>\n * <li>{@link org.obeonetwork.dsl.environment.StructuredType#getAssociatedTypes <em>Associated Types</em>}</li>\n * <li>{@link org.obeonetwork.dsl.environment.StructuredType#getOwnedAttributes <em>Owned Attributes</em>}</li>\n * <li>{@link org.obeonetwork.dsl.environment.StructuredType#getAttributes <em>Attributes</em>}</li>\n * <li>{@link org.obeonetwork.dsl.environment.StructuredType#getOwnedReferences <em>Owned References</em>}</li>\n * <li>{@link org.obeonetwork.dsl.environment.StructuredType#getReferences <em>References</em>}</li>\n * <li>{@link org.obeonetwork.dsl.environment.StructuredType#getProperties <em>Properties</em>}</li>\n * </ul>\n * </p>\n\n\t/**\n\t * Returns the value of the '<em><b>Supertype</b></em>' reference.\n\t * <!-- begin-user-doc -->\n\t * <p>\n\t * If the meaning of the '<em>Supertype</em>' reference isn't clear,\n\t * there really should be more of a description here...\n\t * </p>\n\t * <!-- end-user-doc -->\n\t * @return the value of the '<em>Supertype</em>' reference.\n\t * @see #setSupertype(StructuredType)\n\t * @see org.obeonetwork.dsl.environment.EnvironmentPackage#getStructuredType_Supertype()\n\t * @model\n\t * @generated\n\t */\n\tStructuredType getSupertype();\n\n\t/**\n\t * Sets the value of the '{@link org.obeonetwork.dsl.environment.StructuredType#getSupertype <em>Supertype</em>}' reference.\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @param value the new value of the '<em>Supertype</em>' reference.\n\t * @see #getSupertype()\n\t * @generated\n\t */\n\tvoid setSupertype(StructuredType value);\n\n\t/**\n\t * Returns the value of the '<em><b>Associated Types</b></em>' reference list.\n\t * The list contents are of type {@link org.obeonetwork.dsl.environment.StructuredType}.\n\t * <!-- begin-user-doc -->\n\t * <p>\n\t * If the meaning of the '<em>Associated Types</em>' reference list isn't clear,\n\t * there really should be more of a description here...\n\t * </p>\n\t * <!-- end-user-doc -->\n\t * @return the value of the '<em>Associated Types</em>' reference list.\n\t * @see org.obeonetwork.dsl.environment.EnvironmentPackage#getStructuredType_AssociatedTypes()\n\t * @model\n\t * @generated\n\t */\n\tEList<StructuredType> getAssociatedTypes();\n\n\t/**\n\t * Returns the value of the '<em><b>Owned Attributes</b></em>' containment reference list.\n\t * The list contents are of type {@link org.obeonetwork.dsl.environment.Attribute}.\n\t * It is bidirectional and its opposite is '{@link org.obeonetwork.dsl.environment.Attribute#getContainingType <em>Containing Type</em>}'.\n\t * <!-- begin-user-doc -->\n\t * <p>\n\t * If the meaning of the '<em>Owned Attributes</em>' reference isn't clear,\n\t * there really should be more of a description here...\n\t * </p>\n\t * <!-- end-user-doc -->\n\t * @return the value of the '<em>Owned Attributes</em>' containment reference list.\n\t * @see org.obeonetwork.dsl.environment.EnvironmentPackage#getStructuredType_OwnedAttributes()\n\t * @see org.obeonetwork.dsl.environment.Attribute#getContainingType\n\t * @model opposite=\"containingType\" containment=\"true\" resolveProxies=\"true\"\n\t * @generated\n\t */\n\tEList<Attribute> getOwnedAttributes();\n\n\t/**\n\t * Returns the value of the '<em><b>Attributes</b></em>' reference list.\n\t * The list contents are of type {@link org.obeonetwork.dsl.environment.Attribute}.\n\t * <!-- begin-user-doc -->\n\t * <p>\n\t * If the meaning of the '<em>Attributes</em>' reference list isn't clear,\n\t * there really should be more of a description here...\n\t * </p>\n\t * <!-- end-user-doc -->\n\t * @return the value of the '<em>Attributes</em>' reference list.\n\t * @see org.obeonetwork.dsl.environment.EnvironmentPackage#getStructuredType_Attributes()\n\t * @model transient=\"true\" changeable=\"false\" volatile=\"true\" derived=\"true\"\n\t * @generated\n\t */\n\tEList<Attribute> getAttributes();\n\n\t/**\n\t * Returns the value of the '<em><b>Owned References</b></em>' containment reference list.\n\t * The list contents are of type {@link org.obeonetwork.dsl.environment.Reference}.\n\t * It is bidirectional and its opposite is '{@link org.obeonetwork.dsl.environment.Reference#getContainingType <em>Containing Type</em>}'.\n\t * <!-- begin-user-doc -->\n\t * <p>\n\t * If the meaning of the '<em>Owned References</em>' reference isn't clear,\n\t * there really should be more of a description here...\n\t * </p>\n\t * <!-- end-user-doc -->\n\t * @return the value of the '<em>Owned References</em>' containment reference list.\n\t * @see org.obeonetwork.dsl.environment.EnvironmentPackage#getStructuredType_OwnedReferences()\n\t * @see org.obeonetwork.dsl.environment.Reference#getContainingType\n\t * @model opposite=\"containingType\" containment=\"true\" resolveProxies=\"true\"\n\t * @generated\n\t */\n\tEList<Reference> getOwnedReferences();\n\n\t/**\n\t * Returns the value of the '<em><b>References</b></em>' reference list.\n\t * The list contents are of type {@link org.obeonetwork.dsl.environment.Reference}.\n\t * <!-- begin-user-doc -->\n\t * <p>\n\t * If the meaning of the '<em>References</em>' reference list isn't clear,\n\t * there really should be more of a description here...\n\t * </p>\n\t * <!-- end-user-doc -->\n\t * @return the value of the '<em>References</em>' reference list.\n\t * @see org.obeonetwork.dsl.environment.EnvironmentPackage#getStructuredType_References()\n\t * @model transient=\"true\" changeable=\"false\" volatile=\"true\" derived=\"true\"\n\t * @generated\n\t */\n\tEList<Reference> getReferences();\n\n\t/**\n\t * Returns the value of the '<em><b>Properties</b></em>' reference list.\n\t * The list contents are of type {@link org.obeonetwork.dsl.environment.Property}.\n\t * <!-- begin-user-doc -->\n\t * <p>\n\t * If the meaning of the '<em>Properties</em>' reference list isn't clear,\n\t * there really should be more of a description here...\n\t * </p>\n\t * <!-- end-user-doc -->\n\t * @return the value of the '<em>Properties</em>' reference list.\n\t * @see org.obeonetwork.dsl.environment.EnvironmentPackage#getStructuredType_Properties()\n\t * @model transient=\"true\" changeable=\"false\" volatile=\"true\" derived=\"true\"\n\t * @generated\n\t */\n\tEList<Property> getProperties();\n\n\t/**\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @model required=\"true\"\n\t * @generated\n\t */\n\tboolean isSubtypeOf(StructuredType type);", "new_methods": [], "old_code": "", "old_methods": [], "patch": "@@ -12,11 +12,25 @@\n */\n package org.obeonetwork.dsl.environment;\n \n+import org.eclipse.emf.common.util.EList;\n+\n /**\n * <!-- begin-user-doc -->\n * A representation of the model object '<em><b>Structured Type</b></em>'.\n * <!-- end-user-doc -->\n *\n+ * <p>\n+ * The following features are supported:\n+ * <ul>\n+ * <li>{@link org.obeonetwork.dsl.environment.StructuredType#getSupertype <em>Supertype</em>}</li>\n+ * <li>{@link org.obeonetwork.dsl.environment.StructuredType#getAssociatedTypes <em>Associated Types</em>}</li>\n+ * <li>{@link org.obeonetwork.dsl.environment.StructuredType#getOwnedAttributes <em>Owned Attributes</em>}</li>\n+ * <li>{@link org.obeonetwork.dsl.environment.StructuredType#getAttributes <em>Attributes</em>}</li>\n+ * <li>{@link org.obeonetwork.dsl.environment.StructuredType#getOwnedReferences <em>Owned References</em>}</li>\n+ * <li>{@link org.obeonetwork.dsl.environment.StructuredType#getReferences <em>References</em>}</li>\n+ * <li>{@link org.obeonetwork.dsl.environment.StructuredType#getProperties <em>Properties</em>}</li>\n+ * </ul>\n+ * </p>\n *\n * @see org.obeonetwork.dsl.environment.EnvironmentPackage#getStructuredType()\n * @model abstract=\"true\"\n@@ -30,4 +44,138 @@ public interface StructuredType extends Type {\n \t * @generated\n \t */\n \tString copyright = \"Copyright (c) 2008-2009 Obeo.\\nAll rights reserved. This program and the accompanying materials\\nare made available under the terms of the Eclipse Public License v1.0\\nwhich accompanies this distribution, and is available at\\nhttp://www.eclipse.org/legal/epl-v10.html\\n\\nContributors:\\n Obeo - initial API and implementation\";\n+\n+\t/**\n+\t * Returns the value of the '<em><b>Supertype</b></em>' reference.\n+\t * <!-- begin-user-doc -->\n+\t * <p>\n+\t * If the meaning of the '<em>Supertype</em>' reference isn't clear,\n+\t * there really should be more of a description here...\n+\t * </p>\n+\t * <!-- end-user-doc -->\n+\t * @return the value of the '<em>Supertype</em>' reference.\n+\t * @see #setSupertype(StructuredType)\n+\t * @see org.obeonetwork.dsl.environment.EnvironmentPackage#getStructuredType_Supertype()\n+\t * @model\n+\t * @generated\n+\t */\n+\tStructuredType getSupertype();\n+\n+\t/**\n+\t * Sets the value of the '{@link org.obeonetwork.dsl.environment.StructuredType#getSupertype <em>Supertype</em>}' reference.\n+\t * <!-- begin-user-doc -->\n+\t * <!-- end-user-doc -->\n+\t * @param value the new value of the '<em>Supertype</em>' reference.\n+\t * @see #getSupertype()\n+\t * @generated\n+\t */\n+\tvoid setSupertype(StructuredType value);\n+\n+\t/**\n+\t * Returns the value of the '<em><b>Associated Types</b></em>' reference list.\n+\t * The list contents are of type {@link org.obeonetwork.dsl.environment.StructuredType}.\n+\t * <!-- begin-user-doc -->\n+\t * <p>\n+\t * If the meaning of the '<em>Associated Types</em>' reference list isn't clear,\n+\t * there really should be more of a description here...\n+\t * </p>\n+\t * <!-- end-user-doc -->\n+\t * @return the value of the '<em>Associated Types</em>' reference list.\n+\t * @see org.obeonetwork.dsl.environment.EnvironmentPackage#getStructuredType_AssociatedTypes()\n+\t * @model\n+\t * @generated\n+\t */\n+\tEList<StructuredType> getAssociatedTypes();\n+\n+\t/**\n+\t * Returns the value of the '<em><b>Owned Attributes</b></em>' containment reference list.\n+\t * The list contents are of type {@link org.obeonetwork.dsl.environment.Attribute}.\n+\t * It is bidirectional and its opposite is '{@link org.obeonetwork.dsl.environment.Attribute#getContainingType <em>Containing Type</em>}'.\n+\t * <!-- begin-user-doc -->\n+\t * <p>\n+\t * If the meaning of the '<em>Owned Attributes</em>' reference isn't clear,\n+\t * there really should be more of a description here...\n+\t * </p>\n+\t * <!-- end-user-doc -->\n+\t * @return the value of the '<em>Owned Attributes</em>' containment reference list.\n+\t * @see org.obeonetwork.dsl.environment.EnvironmentPackage#getStructuredType_OwnedAttributes()\n+\t * @see org.obeonetwork.dsl.environment.Attribute#getContainingType\n+\t * @model opposite=\"containingType\" containment=\"true\" resolveProxies=\"true\"\n+\t * @generated\n+\t */\n+\tEList<Attribute> getOwnedAttributes();\n+\n+\t/**\n+\t * Returns the value of the '<em><b>Attributes</b></em>' reference list.\n+\t * The list contents are of type {@link org.obeonetwork.dsl.environment.Attribute}.\n+\t * <!-- begin-user-doc -->\n+\t * <p>\n+\t * If the meaning of the '<em>Attributes</em>' reference list isn't clear,\n+\t * there really should be more of a description here...\n+\t * </p>\n+\t * <!-- end-user-doc -->\n+\t * @return the value of the '<em>Attributes</em>' reference list.\n+\t * @see org.obeonetwork.dsl.environment.EnvironmentPackage#getStructuredType_Attributes()\n+\t * @model transient=\"true\" changeable=\"false\" volatile=\"true\" derived=\"true\"\n+\t * @generated\n+\t */\n+\tEList<Attribute> getAttributes();\n+\n+\t/**\n+\t * Returns the value of the '<em><b>Owned References</b></em>' containment reference list.\n+\t * The list contents are of type {@link org.obeonetwork.dsl.environment.Reference}.\n+\t * It is bidirectional and its opposite is '{@link org.obeonetwork.dsl.environment.Reference#getContainingType <em>Containing Type</em>}'.\n+\t * <!-- begin-user-doc -->\n+\t * <p>\n+\t * If the meaning of the '<em>Owned References</em>' reference isn't clear,\n+\t * there really should be more of a description here...\n+\t * </p>\n+\t * <!-- end-user-doc -->\n+\t * @return the value of the '<em>Owned References</em>' containment reference list.\n+\t * @see org.obeonetwork.dsl.environment.EnvironmentPackage#getStructuredType_OwnedReferences()\n+\t * @see org.obeonetwork.dsl.environment.Reference#getContainingType\n+\t * @model opposite=\"containingType\" containment=\"true\" resolveProxies=\"true\"\n+\t * @generated\n+\t */\n+\tEList<Reference> getOwnedReferences();\n+\n+\t/**\n+\t * Returns the value of the '<em><b>References</b></em>' reference list.\n+\t * The list contents are of type {@link org.obeonetwork.dsl.environment.Reference}.\n+\t * <!-- begin-user-doc -->\n+\t * <p>\n+\t * If the meaning of the '<em>References</em>' reference list isn't clear,\n+\t * there really should be more of a description here...\n+\t * </p>\n+\t * <!-- end-user-doc -->\n+\t * @return the value of the '<em>References</em>' reference list.\n+\t * @see org.obeonetwork.dsl.environment.EnvironmentPackage#getStructuredType_References()\n+\t * @model transient=\"true\" changeable=\"false\" volatile=\"true\" derived=\"true\"\n+\t * @generated\n+\t */\n+\tEList<Reference> getReferences();\n+\n+\t/**\n+\t * Returns the value of the '<em><b>Properties</b></em>' reference list.\n+\t * The list contents are of type {@link org.obeonetwork.dsl.environment.Property}.\n+\t * <!-- begin-user-doc -->\n+\t * <p>\n+\t * If the meaning of the '<em>Properties</em>' reference list isn't clear,\n+\t * there really should be more of a description here...\n+\t * </p>\n+\t * <!-- end-user-doc -->\n+\t * @return the value of the '<em>Properties</em>' reference list.\n+\t * @see org.obeonetwork.dsl.environment.EnvironmentPackage#getStructuredType_Properties()\n+\t * @model transient=\"true\" changeable=\"false\" volatile=\"true\" derived=\"true\"\n+\t * @generated\n+\t */\n+\tEList<Property> getProperties();\n+\n+\t/**\n+\t * <!-- begin-user-doc -->\n+\t * <!-- end-user-doc -->\n+\t * @model required=\"true\"\n+\t * @generated\n+\t */\n+\tboolean isSubtypeOf(StructuredType type);\n } // StructuredType\n\\ No newline at end of file", "raw_url": "https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2FStructuredType.java", "sha": "8d0cfe4477a8d131b8cb5b8e972021088fa106d0", "status": "modified" }, { "additions": 36, "blob_url": "https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2Fimpl%2FAttributeImpl.java", "changes": 64, "contents_url": "https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2Fimpl%2FAttributeImpl.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6", "deletions": 28, "filename": "models/environment/plugins/org.obeonetwork.dsl.environment/src/org/obeonetwork/dsl/environment/impl/AttributeImpl.java", "new_code": "import org.obeonetwork.dsl.environment.StructuredType;\n * <li>{@link org.obeonetwork.dsl.environment.impl.AttributeImpl#getContainingType <em>Containing Type</em>}</li>\n\tpublic StructuredType getContainingType() {\n\t\treturn (StructuredType) eDynamicGet(\n\t\t\t\tEnvironmentPackage.ATTRIBUTE__CONTAINING_TYPE,\n\t\t\t\tEnvironmentPackage.Literals.ATTRIBUTE__CONTAINING_TYPE, true,\n\t\t\t\ttrue);\n\tpublic StructuredType basicGetContainingType() {\n\t\treturn (StructuredType) eDynamicGet(\n\t\t\t\tEnvironmentPackage.ATTRIBUTE__CONTAINING_TYPE,\n\t\t\t\tEnvironmentPackage.Literals.ATTRIBUTE__CONTAINING_TYPE, false,\n\t\t\t\ttrue);\n\tpublic NotificationChain basicSetContainingType(\n\t\t\tStructuredType newContainingType, NotificationChain msgs) {\n\t\tmsgs = eBasicSetContainer((InternalEObject) newContainingType,\n\t\t\t\tEnvironmentPackage.ATTRIBUTE__CONTAINING_TYPE, msgs);\n\tpublic void setContainingType(StructuredType newContainingType) {\n\t\teDynamicSet(EnvironmentPackage.ATTRIBUTE__CONTAINING_TYPE,\n\t\t\t\tEnvironmentPackage.Literals.ATTRIBUTE__CONTAINING_TYPE,\n\t\t\t\tnewContainingType);\n\t\tcase EnvironmentPackage.ATTRIBUTE__CONTAINING_TYPE:\n\t\t\treturn basicSetContainingType((StructuredType) otherEnd, msgs);\n\t\tcase EnvironmentPackage.ATTRIBUTE__CONTAINING_TYPE:\n\t\t\treturn basicSetContainingType(null, msgs);\n\t\tcase EnvironmentPackage.ATTRIBUTE__CONTAINING_TYPE:\n\t\t\t\t\tEnvironmentPackage.STRUCTURED_TYPE__OWNED_ATTRIBUTES,\n\t\t\t\t\tStructuredType.class, msgs);\n\t\tcase EnvironmentPackage.ATTRIBUTE__CONTAINING_TYPE:\n\t\t\t\treturn getContainingType();\n\t\t\treturn basicGetContainingType();\n\t\tcase EnvironmentPackage.ATTRIBUTE__CONTAINING_TYPE:\n\t\t\tsetContainingType((StructuredType) newValue);\n\t\tcase EnvironmentPackage.ATTRIBUTE__CONTAINING_TYPE:\n\t\t\tsetContainingType((StructuredType) null);\n\t\tcase EnvironmentPackage.ATTRIBUTE__CONTAINING_TYPE:\n\t\t\treturn basicGetContainingType() != null;", "new_methods": [], "old_code": " * <li>{@link org.obeonetwork.dsl.environment.impl.AttributeImpl#getDto <em>Dto</em>}</li>\n\tpublic DTO getDto() {\n\t\treturn (DTO) eDynamicGet(EnvironmentPackage.ATTRIBUTE__DTO,\n\t\t\t\tEnvironmentPackage.Literals.ATTRIBUTE__DTO, true, true);\n\tpublic DTO basicGetDto() {\n\t\treturn (DTO) eDynamicGet(EnvironmentPackage.ATTRIBUTE__DTO,\n\t\t\t\tEnvironmentPackage.Literals.ATTRIBUTE__DTO, false, true);\n\tpublic NotificationChain basicSetDto(DTO newDto, NotificationChain msgs) {\n\t\tmsgs = eBasicSetContainer((InternalEObject) newDto,\n\t\t\t\tEnvironmentPackage.ATTRIBUTE__DTO, msgs);\n\tpublic void setDto(DTO newDto) {\n\t\teDynamicSet(EnvironmentPackage.ATTRIBUTE__DTO,\n\t\t\t\tEnvironmentPackage.Literals.ATTRIBUTE__DTO, newDto);\n\t\tcase EnvironmentPackage.ATTRIBUTE__DTO:\n\t\t\treturn basicSetDto((DTO) otherEnd, msgs);\n\t\tcase EnvironmentPackage.ATTRIBUTE__DTO:\n\t\t\treturn basicSetDto(null, msgs);\n\t\tcase EnvironmentPackage.ATTRIBUTE__DTO:\n\t\t\t\t\tEnvironmentPackage.DTO__OWNED_ATTRIBUTES, DTO.class, msgs);\n\t\tcase EnvironmentPackage.ATTRIBUTE__DTO:\n\t\t\t\treturn getDto();\n\t\t\treturn basicGetDto();\n\t\tcase EnvironmentPackage.ATTRIBUTE__DTO:\n\t\t\tsetDto((DTO) newValue);\n\t\tcase EnvironmentPackage.ATTRIBUTE__DTO:\n\t\t\tsetDto((DTO) null);\n\t\tcase EnvironmentPackage.ATTRIBUTE__DTO:\n\t\t\treturn basicGetDto() != null;", "old_methods": [], "patch": "@@ -19,6 +19,7 @@\n import org.obeonetwork.dsl.environment.DTO;\n import org.obeonetwork.dsl.environment.EnvironmentPackage;\n import org.obeonetwork.dsl.environment.PrimitiveType;\n+import org.obeonetwork.dsl.environment.StructuredType;\n \n /**\n * <!-- begin-user-doc -->\n@@ -28,7 +29,7 @@\n * The following features are implemented:\n * <ul>\n * <li>{@link org.obeonetwork.dsl.environment.impl.AttributeImpl#getType <em>Type</em>}</li>\n- * <li>{@link org.obeonetwork.dsl.environment.impl.AttributeImpl#getDto <em>Dto</em>}</li>\n+ * <li>{@link org.obeonetwork.dsl.environment.impl.AttributeImpl#getContainingType <em>Containing Type</em>}</li>\n * </ul>\n * </p>\n *\n@@ -96,29 +97,34 @@ public void setType(PrimitiveType newType) {\n \t * <!-- end-user-doc -->\n \t * @generated\n \t */\n-\tpublic DTO getDto() {\n-\t\treturn (DTO) eDynamicGet(EnvironmentPackage.ATTRIBUTE__DTO,\n-\t\t\t\tEnvironmentPackage.Literals.ATTRIBUTE__DTO, true, true);\n+\tpublic StructuredType getContainingType() {\n+\t\treturn (StructuredType) eDynamicGet(\n+\t\t\t\tEnvironmentPackage.ATTRIBUTE__CONTAINING_TYPE,\n+\t\t\t\tEnvironmentPackage.Literals.ATTRIBUTE__CONTAINING_TYPE, true,\n+\t\t\t\ttrue);\n \t}\n \n \t/**\n \t * <!-- begin-user-doc -->\n \t * <!-- end-user-doc -->\n \t * @generated\n \t */\n-\tpublic DTO basicGetDto() {\n-\t\treturn (DTO) eDynamicGet(EnvironmentPackage.ATTRIBUTE__DTO,\n-\t\t\t\tEnvironmentPackage.Literals.ATTRIBUTE__DTO, false, true);\n+\tpublic StructuredType basicGetContainingType() {\n+\t\treturn (StructuredType) eDynamicGet(\n+\t\t\t\tEnvironmentPackage.ATTRIBUTE__CONTAINING_TYPE,\n+\t\t\t\tEnvironmentPackage.Literals.ATTRIBUTE__CONTAINING_TYPE, false,\n+\t\t\t\ttrue);\n \t}\n \n \t/**\n \t * <!-- begin-user-doc -->\n \t * <!-- end-user-doc -->\n \t * @generated\n \t */\n-\tpublic NotificationChain basicSetDto(DTO newDto, NotificationChain msgs) {\n-\t\tmsgs = eBasicSetContainer((InternalEObject) newDto,\n-\t\t\t\tEnvironmentPackage.ATTRIBUTE__DTO, msgs);\n+\tpublic NotificationChain basicSetContainingType(\n+\t\t\tStructuredType newContainingType, NotificationChain msgs) {\n+\t\tmsgs = eBasicSetContainer((InternalEObject) newContainingType,\n+\t\t\t\tEnvironmentPackage.ATTRIBUTE__CONTAINING_TYPE, msgs);\n \t\treturn msgs;\n \t}\n \n@@ -127,9 +133,10 @@ public NotificationChain basicSetDto(DTO newDto, NotificationChain msgs) {\n \t * <!-- end-user-doc -->\n \t * @generated\n \t */\n-\tpublic void setDto(DTO newDto) {\n-\t\teDynamicSet(EnvironmentPackage.ATTRIBUTE__DTO,\n-\t\t\t\tEnvironmentPackage.Literals.ATTRIBUTE__DTO, newDto);\n+\tpublic void setContainingType(StructuredType newContainingType) {\n+\t\teDynamicSet(EnvironmentPackage.ATTRIBUTE__CONTAINING_TYPE,\n+\t\t\t\tEnvironmentPackage.Literals.ATTRIBUTE__CONTAINING_TYPE,\n+\t\t\t\tnewContainingType);\n \t}\n \n \t/**\n@@ -141,10 +148,10 @@ public void setDto(DTO newDto) {\n \tpublic NotificationChain eInverseAdd(InternalEObject otherEnd,\n \t\t\tint featureID, NotificationChain msgs) {\n \t\tswitch (featureID) {\n-\t\tcase EnvironmentPackage.ATTRIBUTE__DTO:\n+\t\tcase EnvironmentPackage.ATTRIBUTE__CONTAINING_TYPE:\n \t\t\tif (eInternalContainer() != null)\n \t\t\t\tmsgs = eBasicRemoveFromContainer(msgs);\n-\t\t\treturn basicSetDto((DTO) otherEnd, msgs);\n+\t\t\treturn basicSetContainingType((StructuredType) otherEnd, msgs);\n \t\t}\n \t\treturn super.eInverseAdd(otherEnd, featureID, msgs);\n \t}\n@@ -158,8 +165,8 @@ public NotificationChain eInverseAdd(InternalEObject otherEnd,\n \tpublic NotificationChain eInverseRemove(InternalEObject otherEnd,\n \t\t\tint featureID, NotificationChain msgs) {\n \t\tswitch (featureID) {\n-\t\tcase EnvironmentPackage.ATTRIBUTE__DTO:\n-\t\t\treturn basicSetDto(null, msgs);\n+\t\tcase EnvironmentPackage.ATTRIBUTE__CONTAINING_TYPE:\n+\t\t\treturn basicSetContainingType(null, msgs);\n \t\t}\n \t\treturn super.eInverseRemove(otherEnd, featureID, msgs);\n \t}\n@@ -173,9 +180,10 @@ public NotificationChain eInverseRemove(InternalEObject otherEnd,\n \tpublic NotificationChain eBasicRemoveFromContainerFeature(\n \t\t\tNotificationChain msgs) {\n \t\tswitch (eContainerFeatureID()) {\n-\t\tcase EnvironmentPackage.ATTRIBUTE__DTO:\n+\t\tcase EnvironmentPackage.ATTRIBUTE__CONTAINING_TYPE:\n \t\t\treturn eInternalContainer().eInverseRemove(this,\n-\t\t\t\t\tEnvironmentPackage.DTO__OWNED_ATTRIBUTES, DTO.class, msgs);\n+\t\t\t\t\tEnvironmentPackage.STRUCTURED_TYPE__OWNED_ATTRIBUTES,\n+\t\t\t\t\tStructuredType.class, msgs);\n \t\t}\n \t\treturn super.eBasicRemoveFromContainerFeature(msgs);\n \t}\n@@ -192,10 +200,10 @@ public Object eGet(int featureID, boolean resolve, boolean coreType) {\n \t\t\tif (resolve)\n \t\t\t\treturn getType();\n \t\t\treturn basicGetType();\n-\t\tcase EnvironmentPackage.ATTRIBUTE__DTO:\n+\t\tcase EnvironmentPackage.ATTRIBUTE__CONTAINING_TYPE:\n \t\t\tif (resolve)\n-\t\t\t\treturn getDto();\n-\t\t\treturn basicGetDto();\n+\t\t\t\treturn getContainingType();\n+\t\t\treturn basicGetContainingType();\n \t\t}\n \t\treturn super.eGet(featureID, resolve, coreType);\n \t}\n@@ -211,8 +219,8 @@ public void eSet(int featureID, Object newValue) {\n \t\tcase EnvironmentPackage.ATTRIBUTE__TYPE:\n \t\t\tsetType((PrimitiveType) newValue);\n \t\t\treturn;\n-\t\tcase EnvironmentPackage.ATTRIBUTE__DTO:\n-\t\t\tsetDto((DTO) newValue);\n+\t\tcase EnvironmentPackage.ATTRIBUTE__CONTAINING_TYPE:\n+\t\t\tsetContainingType((StructuredType) newValue);\n \t\t\treturn;\n \t\t}\n \t\tsuper.eSet(featureID, newValue);\n@@ -229,8 +237,8 @@ public void eUnset(int featureID) {\n \t\tcase EnvironmentPackage.ATTRIBUTE__TYPE:\n \t\t\tsetType((PrimitiveType) null);\n \t\t\treturn;\n-\t\tcase EnvironmentPackage.ATTRIBUTE__DTO:\n-\t\t\tsetDto((DTO) null);\n+\t\tcase EnvironmentPackage.ATTRIBUTE__CONTAINING_TYPE:\n+\t\t\tsetContainingType((StructuredType) null);\n \t\t\treturn;\n \t\t}\n \t\tsuper.eUnset(featureID);\n@@ -246,8 +254,8 @@ public boolean eIsSet(int featureID) {\n \t\tswitch (featureID) {\n \t\tcase EnvironmentPackage.ATTRIBUTE__TYPE:\n \t\t\treturn basicGetType() != null;\n-\t\tcase EnvironmentPackage.ATTRIBUTE__DTO:\n-\t\t\treturn basicGetDto() != null;\n+\t\tcase EnvironmentPackage.ATTRIBUTE__CONTAINING_TYPE:\n+\t\t\treturn basicGetContainingType() != null;\n \t\t}\n \t\treturn super.eIsSet(featureID);\n \t}", "raw_url": "https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2Fimpl%2FAttributeImpl.java", "sha": "48804ec0c80437ac9c0169be060d86062c8820c6", "status": "modified" } ]
85
[ { "name": "obeonetwork$informationsystem", "new_args": "EObject newValue", "new_implementation": "referencedType.setSelection(new StructuredSelection(newValue));\n\t\t\treferencedType.setSelection(new StructuredSelection()); //$NON-NLS-1$\n\t\tboolean eefElementEditorReadOnlyState = isReadOnly(EnvironmentViewsRepository.Reference.Properties.referencedType);\n\t\tif (eefElementEditorReadOnlyState && referencedType.isEnabled()) {\n\t\t\treferencedType.setEnabled(false);\n\t\t\treferencedType.setToolTipText(EnvironmentMessages.Reference_ReadOnly);", "new_return_type": "void", "new_signature": "void setReferencedType(EObject newValue)", "old_args": "EObject newValue", "old_implementation": "type.setSelection(new StructuredSelection(newValue));\n\t\t\ttype.setSelection(new StructuredSelection()); //$NON-NLS-1$\n\t\tboolean eefElementEditorReadOnlyState = isReadOnly(EnvironmentViewsRepository.Reference.Properties.type);\n\t\tif (eefElementEditorReadOnlyState && type.isEnabled()) {\n\t\t\ttype.setEnabled(false);\n\t\t\ttype.setToolTipText(EnvironmentMessages.Reference_ReadOnly);", "old_return_type": "void", "old_signature": "void setType(EObject newValue)" }, { "name": "obeonetwork$informationsystem", "new_args": "EObject newValue", "new_implementation": "referencedType.setSelection(new StructuredSelection(newValue));\n\t\t\treferencedType.setSelection(new StructuredSelection()); //$NON-NLS-1$\n\t\tboolean eefElementEditorReadOnlyState = isReadOnly(EnvironmentViewsRepository.Reference.Properties.referencedType);\n\t\tif (eefElementEditorReadOnlyState && referencedType.isEnabled()) {\n\t\t\treferencedType.setEnabled(false);\n\t\t\treferencedType.setToolTipText(EnvironmentMessages.Reference_ReadOnly);", "new_return_type": "void", "new_signature": "void setReferencedType(EObject newValue)", "old_args": "EObject newValue", "old_implementation": "type.setSelection(new StructuredSelection(newValue));\n\t\t\ttype.setSelection(new StructuredSelection()); //$NON-NLS-1$\n\t\tboolean eefElementEditorReadOnlyState = isReadOnly(EnvironmentViewsRepository.Reference.Properties.type);\n\t\tif (eefElementEditorReadOnlyState && type.isEnabled()) {\n\t\t\ttype.setEnabled(false);\n\t\t\ttype.setToolTipText(EnvironmentMessages.Reference_ReadOnly);", "old_return_type": "void", "old_signature": "void setType(EObject newValue)" }, { "name": "obeonetwork$informationsystem", "new_args": "Composite parent", "new_implementation": "createDescription(parent, EnvironmentViewsRepository.Reference.Properties.referencedType, EnvironmentMessages.ReferencePropertiesEditionPart_ReferencedTypeLabel);\n\t\treferencedType = new EObjectFlatComboViewer(parent, !propertiesEditionComponent.isRequired(EnvironmentViewsRepository.Reference.Properties.referencedType, EnvironmentViewsRepository.SWT_KIND));\n\t\treferencedType.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));\n\t\treferencedType.addSelectionChangedListener(new ISelectionChangedListener() {\n\t\t\t\tpropertiesEditionComponent.firePropertiesChanged(new PropertiesEditionEvent(ReferencePropertiesEditionPartImpl.this, EnvironmentViewsRepository.Reference.Properties.referencedType, PropertiesEditionEvent.CHANGE, PropertiesEditionEvent.SET, null, getReferencedType()));\n\t\tGridData referencedTypeData = new GridData(GridData.FILL_HORIZONTAL);\n\t\treferencedType.setLayoutData(referencedTypeData);\n\t\treferencedType.setID(EnvironmentViewsRepository.Reference.Properties.referencedType);\n\t\tSWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(EnvironmentViewsRepository.Reference.Properties.referencedType, EnvironmentViewsRepository.SWT_KIND), null); //$NON-NLS-1$\n\t\t// Start of user code for createReferencedTypeFlatComboViewer\n\tprotected Composite createIdentifierCheckbox(Composite parent) {\n\t\tidentifier = new Button(parent, SWT.CHECK);\n\t\tidentifier.setText(getDescription(EnvironmentViewsRepository.Reference.Properties.identifier, EnvironmentMessages.ReferencePropertiesEditionPart_IdentifierLabel));\n\t\tidentifier.addSelectionListener(new SelectionAdapter() {\n\n\t\t\t/**\n\t\t\t * {@inheritDoc", "new_return_type": "Composite", "new_signature": "Composite createReferencedTypeFlatComboViewer(Composite parent)", "old_args": "Composite parent", "old_implementation": "createDescription(parent, EnvironmentViewsRepository.Reference.Properties.type, EnvironmentMessages.ReferencePropertiesEditionPart_TypeLabel);\n\t\ttype = new EObjectFlatComboViewer(parent, !propertiesEditionComponent.isRequired(EnvironmentViewsRepository.Reference.Properties.type, EnvironmentViewsRepository.SWT_KIND));\n\t\ttype.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));\n\t\ttype.addSelectionChangedListener(new ISelectionChangedListener() {\n\t\t\t\tpropertiesEditionComponent.firePropertiesChanged(new PropertiesEditionEvent(ReferencePropertiesEditionPartImpl.this, EnvironmentViewsRepository.Reference.Properties.type, PropertiesEditionEvent.CHANGE, PropertiesEditionEvent.SET, null, getType()));\n\t\tGridData typeData = new GridData(GridData.FILL_HORIZONTAL);\n\t\ttype.setLayoutData(typeData);\n\t\ttype.setID(EnvironmentViewsRepository.Reference.Properties.type);\n\t\tSWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(EnvironmentViewsRepository.Reference.Properties.type, EnvironmentViewsRepository.SWT_KIND), null); //$NON-NLS-1$\n\t\t// Start of user code for createTypeFlatComboViewer\n\t * @see org.obeonetwork.dsl.environment.parts.ReferencePropertiesEditionPart#getType()\n\tpublic EObject getType() {\n\t\tif (type.getSelection() instanceof StructuredSelection) {\n\t\t\tObject firstElement = ((StructuredSelection) type.getSelection()).getFirstElement();\n\t * @see org.obeonetwork.dsl.environment.parts.ReferencePropertiesEditionPart#initType(EObjectFlatComboSettings)\n\tpublic void initType(EObjectFlatComboSettings settings) {\n\t\ttype.setInput(settings);\n\t\t\ttype.setSelection(new StructuredSelection(settings.getValue()));\n\t\tboolean eefElementEditorReadOnlyState = isReadOnly(EnvironmentViewsRepository.Reference.Properties.type);\n\t\tif (eefElementEditorReadOnlyState && type.isEnabled()) {\n\t\t\ttype.setEnabled(false);\n\t\t\ttype.setToolTipText(EnvironmentMessages.Reference_ReadOnly);", "old_return_type": "Composite", "old_signature": "Composite createTypeFlatComboViewer(Composite parent)" }, { "name": "obeonetwork$informationsystem", "new_args": "EObject newValue", "new_implementation": "referencedType.setSelection(new StructuredSelection(newValue));\n\t\t\treferencedType.setSelection(new StructuredSelection()); //$NON-NLS-1$\n\t\tboolean eefElementEditorReadOnlyState = isReadOnly(EnvironmentViewsRepository.Reference.Properties.referencedType);\n\t\tif (eefElementEditorReadOnlyState && referencedType.isEnabled()) {\n\t\t\treferencedType.setEnabled(false);\n\t\t\treferencedType.setToolTipText(EnvironmentMessages.Reference_ReadOnly);", "new_return_type": "void", "new_signature": "void setReferencedType(EObject newValue)", "old_args": "EObject newValue", "old_implementation": "type.setSelection(new StructuredSelection(newValue));\n\t\t\ttype.setSelection(new StructuredSelection()); //$NON-NLS-1$\n\t\tboolean eefElementEditorReadOnlyState = isReadOnly(EnvironmentViewsRepository.Reference.Properties.type);\n\t\tif (eefElementEditorReadOnlyState && type.isEnabled()) {\n\t\t\ttype.setEnabled(false);\n\t\t\ttype.setToolTipText(EnvironmentMessages.Reference_ReadOnly);", "old_return_type": "void", "old_signature": "void setType(EObject newValue)" }, { "name": "obeonetwork$informationsystem", "new_args": "EObject newValue", "new_implementation": "referencedType.setSelection(new StructuredSelection(newValue));\n\t\t\treferencedType.setSelection(new StructuredSelection()); //$NON-NLS-1$\n\t\tboolean eefElementEditorReadOnlyState = isReadOnly(EnvironmentViewsRepository.Reference.Properties.referencedType);\n\t\tif (eefElementEditorReadOnlyState && referencedType.isEnabled()) {\n\t\t\treferencedType.setEnabled(false);\n\t\t\treferencedType.setToolTipText(EnvironmentMessages.Reference_ReadOnly);", "new_return_type": "void", "new_signature": "void setReferencedType(EObject newValue)", "old_args": "EObject newValue", "old_implementation": "type.setSelection(new StructuredSelection(newValue));\n\t\t\ttype.setSelection(new StructuredSelection()); //$NON-NLS-1$\n\t\tboolean eefElementEditorReadOnlyState = isReadOnly(EnvironmentViewsRepository.Reference.Properties.type);\n\t\tif (eefElementEditorReadOnlyState && type.isEnabled()) {\n\t\t\ttype.setEnabled(false);\n\t\t\ttype.setToolTipText(EnvironmentMessages.Reference_ReadOnly);", "old_return_type": "void", "old_signature": "void setType(EObject newValue)" } ]
5
42
27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9
[ { "name": "nasa$certware", "new_args": "EObject model,Assignment assignment,ContentAssistContext context,ICompletionProposalAcceptor acceptor", "new_implementation": null, "new_return_type": "void", "new_signature": "void completeDecomposition_Name(EObject model,Assignment assignment,ContentAssistContext context,ICompletionProposalAcceptor acceptor)", "old_args": "EObject model,Assignment assignment,ContentAssistContext context,ICompletionProposalAcceptor acceptor", "old_implementation": null, "old_return_type": "void", "old_signature": "void completeDecomposition_Id(EObject model,Assignment assignment,ContentAssistContext context,ICompletionProposalAcceptor acceptor)" }, { "name": "nasa$certware", "new_args": "EObject model,Assignment assignment,ContentAssistContext context,ICompletionProposalAcceptor acceptor", "new_implementation": null, "new_return_type": "void", "new_signature": "void completeDocItem_Name(EObject model,Assignment assignment,ContentAssistContext context,ICompletionProposalAcceptor acceptor)", "old_args": "EObject model,Assignment assignment,ContentAssistContext context,ICompletionProposalAcceptor acceptor", "old_implementation": null, "old_return_type": "void", "old_signature": "void completeDocItem_Id(EObject model,Assignment assignment,ContentAssistContext context,ICompletionProposalAcceptor acceptor)" }, { "name": "nasa$certware", "new_args": "EObject model,Assignment assignment,ContentAssistContext context,ICompletionProposalAcceptor acceptor", "new_implementation": null, "new_return_type": "void", "new_signature": "void completeIntent_Name(EObject model,Assignment assignment,ContentAssistContext context,ICompletionProposalAcceptor acceptor)", "old_args": "EObject model,Assignment assignment,ContentAssistContext context,ICompletionProposalAcceptor acceptor", "old_implementation": null, "old_return_type": "void", "old_signature": "void completeIntent_Id(EObject model,Assignment assignment,ContentAssistContext context,ICompletionProposalAcceptor acceptor)" }, { "name": "nasa$certware", "new_args": "EObject model,Assignment assignment,ContentAssistContext context,ICompletionProposalAcceptor acceptor", "new_implementation": null, "new_return_type": "void", "new_signature": "void completeListItem_Name(EObject model,Assignment assignment,ContentAssistContext context,ICompletionProposalAcceptor acceptor)", "old_args": "EObject model,Assignment assignment,ContentAssistContext context,ICompletionProposalAcceptor acceptor", "old_implementation": null, "old_return_type": "void", "old_signature": "void completeListItem_Id(EObject model,Assignment assignment,ContentAssistContext context,ICompletionProposalAcceptor acceptor)" }, { "name": "nasa$certware", "new_args": "EObject model,Assignment assignment,ContentAssistContext context,ICompletionProposalAcceptor acceptor", "new_implementation": null, "new_return_type": "void", "new_signature": "void completeModelItem_Name(EObject model,Assignment assignment,ContentAssistContext context,ICompletionProposalAcceptor acceptor)", "old_args": "EObject model,Assignment assignment,ContentAssistContext context,ICompletionProposalAcceptor acceptor", "old_implementation": null, "old_return_type": "void", "old_signature": "void completeModelItem_Id(EObject model,Assignment assignment,ContentAssistContext context,ICompletionProposalAcceptor acceptor)" }, { "name": "nasa$certware", "new_args": "EObject model,Assignment assignment,ContentAssistContext context,ICompletionProposalAcceptor acceptor", "new_implementation": null, "new_return_type": "void", "new_signature": "void completeRefinement_Name(EObject model,Assignment assignment,ContentAssistContext context,ICompletionProposalAcceptor acceptor)", "old_args": "EObject model,Assignment assignment,ContentAssistContext context,ICompletionProposalAcceptor acceptor", "old_implementation": null, "old_return_type": "void", "old_signature": "void completeRefinement_Id(EObject model,Assignment assignment,ContentAssistContext context,ICompletionProposalAcceptor acceptor)" }, { "name": "nasa$certware", "new_args": "EObject model,Assignment assignment,ContentAssistContext context,ICompletionProposalAcceptor acceptor", "new_implementation": null, "new_return_type": "void", "new_signature": "void completeSpecification_Name(EObject model,Assignment assignment,ContentAssistContext context,ICompletionProposalAcceptor acceptor)", "old_args": "EObject model,Assignment assignment,ContentAssistContext context,ICompletionProposalAcceptor acceptor", "old_implementation": null, "old_return_type": "void", "old_signature": "void completeSpecification_Id(EObject model,Assignment assignment,ContentAssistContext context,ICompletionProposalAcceptor acceptor)" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cTypeNameAlternatives_0;", "new_return_type": "Alternatives", "new_signature": "Alternatives getTypeNameAlternatives_0()", "old_args": "", "old_implementation": "return cAlternatives;", "old_return_type": "Alternatives", "old_signature": "Alternatives getAlternatives()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cTypeNameAlternatives_0;", "new_return_type": "Alternatives", "new_signature": "Alternatives getTypeNameAlternatives_0()", "old_args": "", "old_implementation": "return cAlternatives;", "old_return_type": "Alternatives", "old_signature": "Alternatives getAlternatives()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cTypeNameAlternatives_0;", "new_return_type": "Alternatives", "new_signature": "Alternatives getTypeNameAlternatives_0()", "old_args": "", "old_implementation": "return cAlternatives;", "old_return_type": "Alternatives", "old_signature": "Alternatives getAlternatives()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cTypeNameAlternatives_0;", "new_return_type": "Alternatives", "new_signature": "Alternatives getTypeNameAlternatives_0()", "old_args": "", "old_implementation": "return cAlternatives;", "old_return_type": "Alternatives", "old_signature": "Alternatives getAlternatives()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cTypeNameAlternatives_0;", "new_return_type": "Alternatives", "new_signature": "Alternatives getTypeNameAlternatives_0()", "old_args": "", "old_implementation": "return cAlternatives;", "old_return_type": "Alternatives", "old_signature": "Alternatives getAlternatives()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cTypeNameBasicKeyword_0_0;", "new_return_type": "Keyword", "new_signature": "Keyword getTypeNameBasicKeyword_0_0()", "old_args": "", "old_implementation": "return cBasicKeyword_0;", "old_return_type": "Keyword", "old_signature": "Keyword getBasicKeyword_0()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cTypeNameBreakKeyword_0_2;", "new_return_type": "Keyword", "new_signature": "Keyword getTypeNameBreakKeyword_0_2()", "old_args": "", "old_implementation": "return cBreakKeyword_2;", "old_return_type": "Keyword", "old_signature": "Keyword getBreakKeyword_2()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cTypeNameConditionKeyword_0_0;", "new_return_type": "Keyword", "new_signature": "Keyword getTypeNameConditionKeyword_0_0()", "old_args": "", "old_implementation": "return cConditionKeyword_0;", "old_return_type": "Keyword", "old_signature": "Keyword getConditionKeyword_0()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cTypeNameConstraintKeyword_0_3;", "new_return_type": "Keyword", "new_signature": "Keyword getTypeNameConstraintKeyword_0_3()", "old_args": "", "old_implementation": "return cConstraintKeyword_3;", "old_return_type": "Keyword", "old_signature": "Keyword getConstraintKeyword_3()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": null, "new_return_type": "EAttribute", "new_signature": "EAttribute getDecomposition_Name()", "old_args": "", "old_implementation": null, "old_return_type": "EAttribute", "old_signature": "EAttribute getDecomposition_Id()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cTypeNameDesignKeyword_0_4;", "new_return_type": "Keyword", "new_signature": "Keyword getTypeNameDesignKeyword_0_4()", "old_args": "", "old_implementation": "return cDesignKeyword_4;", "old_return_type": "Keyword", "old_signature": "Keyword getDesignKeyword_4()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": null, "new_return_type": "EAttribute", "new_signature": "EAttribute getDocItem_Name()", "old_args": "", "old_implementation": null, "old_return_type": "EAttribute", "old_signature": "EAttribute getDocItem_Id()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cTypeNameEnvironmentKeyword_0_0;", "new_return_type": "Keyword", "new_signature": "Keyword getTypeNameEnvironmentKeyword_0_0()", "old_args": "", "old_implementation": "return cEnvironmentKeyword_0;", "old_return_type": "Keyword", "old_signature": "Keyword getEnvironmentKeyword_0()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cTypeNameFigureKeyword_0_1;", "new_return_type": "Keyword", "new_signature": "Keyword getTypeNameFigureKeyword_0_1()", "old_args": "", "old_implementation": "return cFigureKeyword_1;", "old_return_type": "Keyword", "old_signature": "Keyword getFigureKeyword_1()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cTypeNameFunctionKeyword_0_4;", "new_return_type": "Keyword", "new_signature": "Keyword getTypeNameFunctionKeyword_0_4()", "old_args": "", "old_implementation": "return cFunctionKeyword_4;", "old_return_type": "Keyword", "old_signature": "Keyword getFunctionKeyword_4()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cTypeNameGoalKeyword_0_1;", "new_return_type": "Keyword", "new_signature": "Keyword getTypeNameGoalKeyword_0_1()", "old_args": "", "old_implementation": "return cGoalKeyword_1;", "old_return_type": "Keyword", "old_signature": "Keyword getGoalKeyword_1()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cTypeNameHazardKeyword_0_2;", "new_return_type": "Keyword", "new_signature": "Keyword getTypeNameHazardKeyword_0_2()", "old_args": "", "old_implementation": "return cHazardKeyword_2;", "old_return_type": "Keyword", "old_signature": "Keyword getHazardKeyword_2()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": null, "new_return_type": "String", "new_signature": "String getName()", "old_args": "", "old_implementation": null, "old_return_type": "String", "old_signature": "String getId()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": null, "new_return_type": "String", "new_signature": "String getName()", "old_args": "", "old_implementation": null, "old_return_type": "String", "old_signature": "String getId()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": null, "new_return_type": "String", "new_signature": "String getName()", "old_args": "", "old_implementation": null, "old_return_type": "String", "old_signature": "String getId()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": null, "new_return_type": "String", "new_signature": "String getName()", "old_args": "", "old_implementation": null, "old_return_type": "String", "old_signature": "String getId()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": null, "new_return_type": "String", "new_signature": "String getName()", "old_args": "", "old_implementation": null, "old_return_type": "String", "old_signature": "String getId()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": null, "new_return_type": "String", "new_signature": "String getName()", "old_args": "", "old_implementation": null, "old_return_type": "String", "old_signature": "String getId()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": null, "new_return_type": "String", "new_signature": "String getName()", "old_args": "", "old_implementation": null, "old_return_type": "String", "old_signature": "String getId()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cNameAssignment_1;", "new_return_type": "Assignment", "new_signature": "Assignment getNameAssignment_1()", "old_args": "", "old_implementation": "return cIdAssignment_1;", "old_return_type": "Assignment", "old_signature": "Assignment getIdAssignment_1()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cNameAssignment_1;", "new_return_type": "Assignment", "new_signature": "Assignment getNameAssignment_1()", "old_args": "", "old_implementation": "return cIdAssignment_1;", "old_return_type": "Assignment", "old_signature": "Assignment getIdAssignment_1()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cNameAssignment_1;", "new_return_type": "Assignment", "new_signature": "Assignment getNameAssignment_1()", "old_args": "", "old_implementation": "return cIdAssignment_1;", "old_return_type": "Assignment", "old_signature": "Assignment getIdAssignment_1()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cNameAssignment_1;", "new_return_type": "Assignment", "new_signature": "Assignment getNameAssignment_1()", "old_args": "", "old_implementation": "return cIdAssignment_1;", "old_return_type": "Assignment", "old_signature": "Assignment getIdAssignment_1()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cNameAssignment_1;", "new_return_type": "Assignment", "new_signature": "Assignment getNameAssignment_1()", "old_args": "", "old_implementation": "return cIdAssignment_1;", "old_return_type": "Assignment", "old_signature": "Assignment getIdAssignment_1()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cNameAssignment_1;", "new_return_type": "Assignment", "new_signature": "Assignment getNameAssignment_1()", "old_args": "", "old_implementation": "return cIdAssignment_1;", "old_return_type": "Assignment", "old_signature": "Assignment getIdAssignment_1()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cNameAssignment_1;", "new_return_type": "Assignment", "new_signature": "Assignment getNameAssignment_1()", "old_args": "", "old_implementation": "return cIdAssignment_1;", "old_return_type": "Assignment", "old_signature": "Assignment getIdAssignment_1()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cNameIDTerminalRuleCall_1_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getNameIDTerminalRuleCall_1_0()", "old_args": "", "old_implementation": "return cIdIDTerminalRuleCall_1_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getIdIDTerminalRuleCall_1_0()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cNameIDTerminalRuleCall_1_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getNameIDTerminalRuleCall_1_0()", "old_args": "", "old_implementation": "return cIdIDTerminalRuleCall_1_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getIdIDTerminalRuleCall_1_0()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cNameIDTerminalRuleCall_1_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getNameIDTerminalRuleCall_1_0()", "old_args": "", "old_implementation": "return cIdIDTerminalRuleCall_1_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getIdIDTerminalRuleCall_1_0()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cNameIDTerminalRuleCall_1_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getNameIDTerminalRuleCall_1_0()", "old_args": "", "old_implementation": "return cIdIDTerminalRuleCall_1_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getIdIDTerminalRuleCall_1_0()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cNameIDTerminalRuleCall_1_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getNameIDTerminalRuleCall_1_0()", "old_args": "", "old_implementation": "return cIdIDTerminalRuleCall_1_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getIdIDTerminalRuleCall_1_0()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cNameIDTerminalRuleCall_1_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getNameIDTerminalRuleCall_1_0()", "old_args": "", "old_implementation": "return cIdIDTerminalRuleCall_1_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getIdIDTerminalRuleCall_1_0()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cNameIDTerminalRuleCall_1_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getNameIDTerminalRuleCall_1_0()", "old_args": "", "old_implementation": "return cIdIDTerminalRuleCall_1_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getIdIDTerminalRuleCall_1_0()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cTypeNameImplementationKeyword_0_5;", "new_return_type": "Keyword", "new_signature": "Keyword getTypeNameImplementationKeyword_0_5()", "old_args": "", "old_implementation": "return cImplementationKeyword_5;", "old_return_type": "Keyword", "old_signature": "Keyword getImplementationKeyword_5()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cTypeNameInputKeyword_0_5;", "new_return_type": "Keyword", "new_signature": "Keyword getTypeNameInputKeyword_0_5()", "old_args": "", "old_implementation": "return cInputKeyword_5;", "old_return_type": "Keyword", "old_signature": "Keyword getInputKeyword_5()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": null, "new_return_type": "EAttribute", "new_signature": "EAttribute getIntent_Name()", "old_args": "", "old_implementation": null, "old_return_type": "EAttribute", "old_signature": "EAttribute getIntent_Id()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": null, "new_return_type": "EAttribute", "new_signature": "EAttribute getListItem_Name()", "old_args": "", "old_implementation": null, "old_return_type": "EAttribute", "old_signature": "EAttribute getListItem_Id()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cTypeNameMacroKeyword_0_3;", "new_return_type": "Keyword", "new_signature": "Keyword getTypeNameMacroKeyword_0_3()", "old_args": "", "old_implementation": "return cMacroKeyword_3;", "old_return_type": "Keyword", "old_signature": "Keyword getMacroKeyword_3()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cTypeNameModeKeyword_0_1;", "new_return_type": "Keyword", "new_signature": "Keyword getTypeNameModeKeyword_0_1()", "old_args": "", "old_implementation": "return cModeKeyword_1;", "old_return_type": "Keyword", "old_signature": "Keyword getModeKeyword_1()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": null, "new_return_type": "EAttribute", "new_signature": "EAttribute getModelItem_Name()", "old_args": "", "old_implementation": null, "old_return_type": "EAttribute", "old_signature": "EAttribute getModelItem_Id()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cTypeNameModelKeyword_0_3;", "new_return_type": "Keyword", "new_signature": "Keyword getTypeNameModelKeyword_0_3()", "old_args": "", "old_implementation": "return cModelKeyword_3;", "old_return_type": "Keyword", "old_signature": "Keyword getModelKeyword_3()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cTypeNameModelsKeyword_0_3;", "new_return_type": "Keyword", "new_signature": "Keyword getTypeNameModelsKeyword_0_3()", "old_args": "", "old_implementation": "return cModelsKeyword_3;", "old_return_type": "Keyword", "old_signature": "Keyword getModelsKeyword_3()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cTypeNameOperationKeyword_0_6;", "new_return_type": "Keyword", "new_signature": "Keyword getTypeNameOperationKeyword_0_6()", "old_args": "", "old_implementation": "return cOperationKeyword_6;", "old_return_type": "Keyword", "old_signature": "Keyword getOperationKeyword_6()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cTypeNameOperatorKeyword_0_1;", "new_return_type": "Keyword", "new_signature": "Keyword getTypeNameOperatorKeyword_0_1()", "old_args": "", "old_implementation": "return cOperatorKeyword_1;", "old_return_type": "Keyword", "old_signature": "Keyword getOperatorKeyword_1()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cTypeNameOutputKeyword_0_0;", "new_return_type": "Keyword", "new_signature": "Keyword getTypeNameOutputKeyword_0_0()", "old_args": "", "old_implementation": "return cOutputKeyword_0;", "old_return_type": "Keyword", "old_signature": "Keyword getOutputKeyword_0()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cTypeNameParagraphKeyword_0_4;", "new_return_type": "Keyword", "new_signature": "Keyword getTypeNameParagraphKeyword_0_4()", "old_args": "", "old_implementation": "return cParagraphKeyword_4;", "old_return_type": "Keyword", "old_signature": "Keyword getParagraphKeyword_4()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cTypeNamePrinciplesKeyword_0_2;", "new_return_type": "Keyword", "new_signature": "Keyword getTypeNamePrinciplesKeyword_0_2()", "old_args": "", "old_implementation": "return cPrinciplesKeyword_2;", "old_return_type": "Keyword", "old_signature": "Keyword getPrinciplesKeyword_2()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cTypeNamePurposeKeyword_0_1;", "new_return_type": "Keyword", "new_signature": "Keyword getTypeNamePurposeKeyword_0_1()", "old_args": "", "old_implementation": "return cPurposeKeyword_1;", "old_return_type": "Keyword", "old_signature": "Keyword getPurposeKeyword_1()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": null, "new_return_type": "EAttribute", "new_signature": "EAttribute getRefinement_Name()", "old_args": "", "old_implementation": null, "old_return_type": "EAttribute", "old_signature": "EAttribute getRefinement_Id()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cTypeNameRequirementKeyword_0_0;", "new_return_type": "Keyword", "new_signature": "Keyword getTypeNameRequirementKeyword_0_0()", "old_args": "", "old_implementation": "return cRequirementKeyword_0;", "old_return_type": "Keyword", "old_signature": "Keyword getRequirementKeyword_0()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cTypeNameSectionKeyword_0_5;", "new_return_type": "Keyword", "new_signature": "Keyword getTypeNameSectionKeyword_0_5()", "old_args": "", "old_implementation": "return cSectionKeyword_5;", "old_return_type": "Keyword", "old_signature": "Keyword getSectionKeyword_5()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": null, "new_return_type": "EAttribute", "new_signature": "EAttribute getSpecification_Name()", "old_args": "", "old_implementation": null, "old_return_type": "EAttribute", "old_signature": "EAttribute getSpecification_Id()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cTypeNameStateKeyword_0_2;", "new_return_type": "Keyword", "new_signature": "Keyword getTypeNameStateKeyword_0_2()", "old_args": "", "old_implementation": "return cStateKeyword_2;", "old_return_type": "Keyword", "old_signature": "Keyword getStateKeyword_2()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cTypeNameSystemKeyword_0_2;", "new_return_type": "Keyword", "new_signature": "Keyword getTypeNameSystemKeyword_0_2()", "old_args": "", "old_implementation": "return cSystemKeyword_2;", "old_return_type": "Keyword", "old_signature": "Keyword getSystemKeyword_2()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cTypeNameTableKeyword_0_6;", "new_return_type": "Keyword", "new_signature": "Keyword getTypeNameTableKeyword_0_6()", "old_args": "", "old_implementation": "return cTableKeyword_6;", "old_return_type": "Keyword", "old_signature": "Keyword getTableKeyword_6()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cTypeNameVerificationKeyword_0_3;", "new_return_type": "Keyword", "new_signature": "Keyword getTypeNameVerificationKeyword_0_3()", "old_args": "", "old_implementation": "return cVerificationKeyword_3;", "old_return_type": "Keyword", "old_signature": "Keyword getVerificationKeyword_3()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Decomposition__NameAssignment_1()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Decomposition__IdAssignment_1()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__DocItem__NameAssignment_1()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__DocItem__IdAssignment_1()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Intent__NameAssignment_1()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Intent__IdAssignment_1()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__ListItem__NameAssignment_1()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__ListItem__IdAssignment_1()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__ModelItem__NameAssignment_1()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__ModelItem__IdAssignment_1()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Refinement__NameAssignment_1()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Refinement__IdAssignment_1()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Specification__NameAssignment_1()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Specification__IdAssignment_1()" }, { "name": "nasa$certware", "new_args": "String newName", "new_implementation": null, "new_return_type": "void", "new_signature": "void setName(String newName)", "old_args": "String newId", "old_implementation": null, "old_return_type": "void", "old_signature": "void setId(String newId)" }, { "name": "nasa$certware", "new_args": "String newName", "new_implementation": null, "new_return_type": "void", "new_signature": "void setName(String newName)", "old_args": "String newId", "old_implementation": null, "old_return_type": "void", "old_signature": "void setId(String newId)" }, { "name": "nasa$certware", "new_args": "String newName", "new_implementation": null, "new_return_type": "void", "new_signature": "void setName(String newName)", "old_args": "String newType", "old_implementation": null, "old_return_type": "void", "old_signature": "void setType(String newType)" }, { "name": "nasa$certware", "new_args": "String newName", "new_implementation": null, "new_return_type": "void", "new_signature": "void setName(String newName)", "old_args": "String newType", "old_implementation": null, "old_return_type": "void", "old_signature": "void setType(String newType)" }, { "name": "nasa$certware", "new_args": "String newName", "new_implementation": null, "new_return_type": "void", "new_signature": "void setName(String newName)", "old_args": "String newType", "old_implementation": null, "old_return_type": "void", "old_signature": "void setType(String newType)" }, { "name": "nasa$certware", "new_args": "String newName", "new_implementation": null, "new_return_type": "void", "new_signature": "void setName(String newName)", "old_args": "String newType", "old_implementation": null, "old_return_type": "void", "old_signature": "void setType(String newType)" }, { "name": "nasa$certware", "new_args": "String newName", "new_implementation": null, "new_return_type": "void", "new_signature": "void setName(String newName)", "old_args": "String newType", "old_implementation": null, "old_return_type": "void", "old_signature": "void setType(String newType)" } ]
[ { "additions": 8, "blob_url": "https://github.com/nasa/CertWare/blob/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent.ui%2Fplugin.xml", "changes": 16, "contents_url": "https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent.ui%2Fplugin.xml?ref=27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9", "deletions": 8, "filename": "net.certware.intent.ui/plugin.xml", "new_code": " name=\"Intent Specification Editor\">\n name=\"Intent Specification\">\n name=\"Intent Specification\">\n label=\"Intent Specification\"/>\n\t name=\"Intent Specification Problem\"\n\t name=\"Intent Specification Problem\"\n\t name=\"Intent Specification Problem\"\n extensions=\"intent\" label=\"Intent Specification Compare\">", "new_methods": [], "old_code": " name=\"IntentSpecification Editor\">\n name=\"IntentSpecification\">\n name=\"IntentSpecification\">\n label=\"IntentSpecification\"/>\n\t name=\"IntentSpecification Problem\"\n\t name=\"IntentSpecification Problem\"\n\t name=\"IntentSpecification Problem\"\n extensions=\"intent\" label=\"IntentSpecification Compare\">", "old_methods": [], "patch": "@@ -12,7 +12,7 @@\n extensions=\"intent\"\n icon=\"icons/obj16/intent.gif\"\n id=\"net.certware.intent.IntentSpecification\"\n- name=\"IntentSpecification Editor\">\n+ name=\"Intent Specification Editor\">\n </editor>\n </extension>\n <extension\n@@ -84,7 +84,7 @@\n category=\"certware\"\n class=\"net.certware.intent.ui.IntentSpecificationExecutableExtensionFactory:org.eclipse.xtext.ui.editor.preferences.LanguageRootPreferencePage\"\n id=\"net.certware.intent.IntentSpecification\"\n- name=\"IntentSpecification\">\n+ name=\"Intent Specification\">\n <keywordReference id=\"net.certware.intent.ui.keyword_IntentSpecification\"/>\n </page>\n <page\n@@ -108,7 +108,7 @@\n class=\"net.certware.intent.ui.IntentSpecificationExecutableExtensionFactory:org.eclipse.xtext.ui.editor.preferences.LanguageRootPreferencePage\"\n icon=\"icons/obj16/intent.gif\"\n id=\"net.certware.intent.IntentSpecification\"\n- name=\"IntentSpecification\">\n+ name=\"Intent Specification\">\n <keywordReference id=\"net.certware.intent.ui.keyword_IntentSpecification\"/>\n <enabledWhen>\n \t <adapt type=\"org.eclipse.core.resources.IProject\"/>\n@@ -120,7 +120,7 @@\n point=\"org.eclipse.ui.keywords\">\n <keyword\n id=\"net.certware.intent.ui.keyword_IntentSpecification\"\n- label=\"IntentSpecification\"/>\n+ label=\"Intent Specification\"/>\n </extension>\n <extension\n point=\"org.eclipse.ui.commands\">\n@@ -235,21 +235,21 @@\n \t<!-- marker definitions for net.certware.intent.IntentSpecification -->\n \t<extension\n \t id=\"intentspecification.check.fast\"\n-\t name=\"IntentSpecification Problem\"\n+\t name=\"Intent Specification Problem\"\n \t point=\"org.eclipse.core.resources.markers\">\n \t <super type=\"org.eclipse.xtext.ui.check.fast\"/>\n \t <persistent value=\"true\"/>\n \t</extension>\n \t<extension\n \t id=\"intentspecification.check.normal\"\n-\t name=\"IntentSpecification Problem\"\n+\t name=\"Intent Specification Problem\"\n \t point=\"org.eclipse.core.resources.markers\">\n \t <super type=\"org.eclipse.xtext.ui.check.normal\"/>\n \t <persistent value=\"true\"/>\n \t</extension>\n \t<extension\n \t id=\"intentspecification.check.expensive\"\n-\t name=\"IntentSpecification Problem\"\n+\t name=\"Intent Specification Problem\"\n \t point=\"org.eclipse.core.resources.markers\">\n \t <super type=\"org.eclipse.xtext.ui.check.expensive\"/>\n \t <persistent value=\"true\"/>\n@@ -406,7 +406,7 @@\n <extension point=\"org.eclipse.compare.contentMergeViewers\">\n <viewer id=\"net.certware.intent.IntentSpecification.compare.contentMergeViewers\"\n class=\"net.certware.intent.ui.IntentSpecificationExecutableExtensionFactory:org.eclipse.xtext.ui.compare.InjectableViewerCreator\"\n- extensions=\"intent\" label=\"IntentSpecification Compare\">\n+ extensions=\"intent\" label=\"Intent Specification Compare\">\n </viewer>\n </extension>\n <extension point=\"org.eclipse.ui.editors.documentProviders\">", "raw_url": "https://github.com/nasa/CertWare/raw/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent.ui%2Fplugin.xml", "sha": "52d4008c146ac7ae28f9ac61d210b6334ac321db", "status": "modified" }, { "additions": 45, "blob_url": "https://github.com/nasa/CertWare/blob/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent.ui%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fui%2Fcontentassist%2FAbstractIntentSpecificationProposalProvider.java", "changes": 52, "contents_url": "https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent.ui%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fui%2Fcontentassist%2FAbstractIntentSpecificationProposalProvider.java?ref=27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9", "deletions": 7, "filename": "net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/AbstractIntentSpecificationProposalProvider.java", "new_code": "\tpublic void completeSpecification_Name(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n\tpublic void completeRefinement_Name(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n\tpublic void completeIntent_Name(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n\tpublic void completeIntentType_TypeName(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n\t\t// subclasses may override\n\t\t// subclasses may override\n\t\t// subclasses may override\n\t\t// subclasses may override\n\t\t// subclasses may override\n\t\t// subclasses may override\n\t\t// subclasses may override\n\t}\n\tpublic void completeDecomposition_Name(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n\tpublic void completeDecompositionType_TypeName(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n\t\t// subclasses may override\n\t\t// subclasses may override\n\t\t// subclasses may override\n\t\t// subclasses may override\n\t}\n\tpublic void completeDocItemType_TypeName(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n\t\t// subclasses may override\n\t\t// subclasses may override\n\t\t// subclasses may override\n\t\t// subclasses may override\n\t\t// subclasses may override\n\t\t// subclasses may override\n\t\t// subclasses may override\n\t}\n\tpublic void completeDocItem_Name(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n\tpublic void completeModelType_TypeName(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n\t\t// subclasses may override\n\t\t// subclasses may override\n\t\t// subclasses may override\n\t\t// subclasses may override\n\t\t// subclasses may override\n\t\t// subclasses may override\n\t}\n\tpublic void completeModelItem_Name(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n\tpublic void completeListItemType_TypeName(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n\t\t// subclasses may override\n\t\t// subclasses may override\n\t\t// subclasses may override\n\t\t// subclasses may override\n\t}\n\tpublic void completeListItem_Name(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {", "new_methods": [ { "arguments": [ "EObject model", " Assignment assignment", " ContentAssistContext context", " ICompletionProposalAcceptor acceptor" ], "filename": "net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/AbstractIntentSpecificationProposalProvider.java", "implementation": "public void completeRefinement_Name(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n\tpublic void completeIntent_Name(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n\tpublic void completeIntentType_TypeName(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n\t\t// subclasses may override\n\t\t// subclasses may override\n\t\t// subclasses may override\n\t\t// subclasses may override\n\t\t// subclasses may override\n\t\t// subclasses may override\n\t\t// subclasses may override", "signature": "void completeSpecification_Name(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor)" }, { "arguments": [ "EObject model", " Assignment assignment", " ContentAssistContext context", " ICompletionProposalAcceptor acceptor" ], "filename": "net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/AbstractIntentSpecificationProposalProvider.java", "implementation": "public void completeDecompositionType_TypeName(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n\t\t// subclasses may override\n\t\t// subclasses may override\n\t\t// subclasses may override\n\t\t// subclasses may override", "signature": "void completeDecomposition_Name(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor)" }, { "arguments": [ "EObject model", " Assignment assignment", " ContentAssistContext context", " ICompletionProposalAcceptor acceptor" ], "filename": "net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/AbstractIntentSpecificationProposalProvider.java", "implementation": "// subclasses may override\n\t\t// subclasses may override\n\t\t// subclasses may override\n\t\t// subclasses may override\n\t\t// subclasses may override\n\t\t// subclasses may override\n\t\t// subclasses may override", "signature": "void completeDocItemType_TypeName(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor)" }, { "arguments": [ "EObject model", " Assignment assignment", " ContentAssistContext context", " ICompletionProposalAcceptor acceptor" ], "filename": "net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/AbstractIntentSpecificationProposalProvider.java", "implementation": "public void completeModelType_TypeName(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n\t\t// subclasses may override\n\t\t// subclasses may override\n\t\t// subclasses may override\n\t\t// subclasses may override\n\t\t// subclasses may override\n\t\t// subclasses may override", "signature": "void completeDocItem_Name(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor)" }, { "arguments": [ "EObject model", " Assignment assignment", " ContentAssistContext context", " ICompletionProposalAcceptor acceptor" ], "filename": "net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/AbstractIntentSpecificationProposalProvider.java", "implementation": "public void completeListItemType_TypeName(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n\t\t// subclasses may override\n\t\t// subclasses may override\n\t\t// subclasses may override\n\t\t// subclasses may override", "signature": "void completeModelItem_Name(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor)" } ], "old_code": "\tpublic void completeSpecification_Id(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n\tpublic void completeRefinement_Id(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n\tpublic void completeIntent_Id(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n\tpublic void completeDecomposition_Id(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n\tpublic void completeDocItem_Id(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n\tpublic void completeModelItem_Id(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n\tpublic void completeListItem_Id(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {", "old_methods": [], "patch": "@@ -16,13 +16,13 @@\n @SuppressWarnings(\"all\")\n public class AbstractIntentSpecificationProposalProvider extends org.eclipse.xtext.common.ui.contentassist.TerminalsProposalProvider {\n \t\t\n-\tpublic void completeSpecification_Id(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n+\tpublic void completeSpecification_Name(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n \t\tcompleteRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);\n \t}\n \tpublic void completeSpecification_Refinements(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n \t\tcompleteRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);\n \t}\n-\tpublic void completeRefinement_Id(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n+\tpublic void completeRefinement_Name(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n \t\tcompleteRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);\n \t}\n \tpublic void completeRefinement_Desc(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n@@ -34,7 +34,7 @@ public void completeRefinement_Intents(EObject model, Assignment assignment, Con\n \tpublic void completeIntent_Type(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n \t\tcompleteRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);\n \t}\n-\tpublic void completeIntent_Id(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n+\tpublic void completeIntent_Name(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n \t\tcompleteRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);\n \t}\n \tpublic void completeIntent_Desc(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n@@ -43,10 +43,19 @@ public void completeIntent_Desc(EObject model, Assignment assignment, ContentAss\n \tpublic void completeIntent_Decompositions(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n \t\tcompleteRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);\n \t}\n+\tpublic void completeIntentType_TypeName(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n+\t\t// subclasses may override\n+\t\t// subclasses may override\n+\t\t// subclasses may override\n+\t\t// subclasses may override\n+\t\t// subclasses may override\n+\t\t// subclasses may override\n+\t\t// subclasses may override\n+\t}\n \tpublic void completeDecomposition_Type(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n \t\tcompleteRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);\n \t}\n-\tpublic void completeDecomposition_Id(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n+\tpublic void completeDecomposition_Name(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n \t\tcompleteRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);\n \t}\n \tpublic void completeDecomposition_Desc(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n@@ -61,31 +70,60 @@ public void completeDecomposition_Models(EObject model, Assignment assignment, C\n \tpublic void completeDecomposition_Items(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n \t\tcompleteRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);\n \t}\n+\tpublic void completeDecompositionType_TypeName(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n+\t\t// subclasses may override\n+\t\t// subclasses may override\n+\t\t// subclasses may override\n+\t\t// subclasses may override\n+\t}\n \tpublic void completeDocument_Entries(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n \t\tcompleteRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);\n \t}\n+\tpublic void completeDocItemType_TypeName(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n+\t\t// subclasses may override\n+\t\t// subclasses may override\n+\t\t// subclasses may override\n+\t\t// subclasses may override\n+\t\t// subclasses may override\n+\t\t// subclasses may override\n+\t\t// subclasses may override\n+\t}\n \tpublic void completeDocItem_Type(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n \t\tcompleteRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);\n \t}\n-\tpublic void completeDocItem_Id(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n+\tpublic void completeDocItem_Name(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n \t\tcompleteRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);\n \t}\n \tpublic void completeDocItem_Ref(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n \t\tcompleteRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);\n \t}\n+\tpublic void completeModelType_TypeName(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n+\t\t// subclasses may override\n+\t\t// subclasses may override\n+\t\t// subclasses may override\n+\t\t// subclasses may override\n+\t\t// subclasses may override\n+\t\t// subclasses may override\n+\t}\n \tpublic void completeModelItem_Type(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n \t\tcompleteRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);\n \t}\n-\tpublic void completeModelItem_Id(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n+\tpublic void completeModelItem_Name(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n \t\tcompleteRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);\n \t}\n \tpublic void completeModelItem_Desc(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n \t\tcompleteRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);\n \t}\n+\tpublic void completeListItemType_TypeName(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n+\t\t// subclasses may override\n+\t\t// subclasses may override\n+\t\t// subclasses may override\n+\t\t// subclasses may override\n+\t}\n \tpublic void completeListItem_Type(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n \t\tcompleteRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);\n \t}\n-\tpublic void completeListItem_Id(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n+\tpublic void completeListItem_Name(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n \t\tcompleteRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);\n \t}\n \tpublic void completeListItem_Desc(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {", "raw_url": "https://github.com/nasa/CertWare/raw/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent.ui%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fui%2Fcontentassist%2FAbstractIntentSpecificationProposalProvider.java", "sha": "945949ad08b9388eee93eff0ed125c80b438cf72", "status": "modified" }, { "additions": 17, "blob_url": "https://github.com/nasa/CertWare/blob/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent.ui%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fui%2Fcontentassist%2Fantlr%2FIntentSpecificationParser.java", "changes": 29, "contents_url": "https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent.ui%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fui%2Fcontentassist%2Fantlr%2FIntentSpecificationParser.java?ref=27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9", "deletions": 12, "filename": "net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/IntentSpecificationParser.java", "new_code": "\t\t\t\t\tput(grammarAccess.getIntentTypeAccess().getTypeNameAlternatives_0(), \"rule__IntentType__TypeNameAlternatives_0\");\n\t\t\t\t\tput(grammarAccess.getDecompositionTypeAccess().getTypeNameAlternatives_0(), \"rule__DecompositionType__TypeNameAlternatives_0\");\n\t\t\t\t\tput(grammarAccess.getDocItemTypeAccess().getTypeNameAlternatives_0(), \"rule__DocItemType__TypeNameAlternatives_0\");\n\t\t\t\t\tput(grammarAccess.getModelTypeAccess().getTypeNameAlternatives_0(), \"rule__ModelType__TypeNameAlternatives_0\");\n\t\t\t\t\tput(grammarAccess.getListItemTypeAccess().getTypeNameAlternatives_0(), \"rule__ListItemType__TypeNameAlternatives_0\");\n\t\t\t\t\tput(grammarAccess.getSpecificationAccess().getNameAssignment_1(), \"rule__Specification__NameAssignment_1\");\n\t\t\t\t\tput(grammarAccess.getRefinementAccess().getNameAssignment_1(), \"rule__Refinement__NameAssignment_1\");\n\t\t\t\t\tput(grammarAccess.getIntentAccess().getNameAssignment_1(), \"rule__Intent__NameAssignment_1\");\n\t\t\t\t\tput(grammarAccess.getIntentTypeAccess().getTypeNameAssignment(), \"rule__IntentType__TypeNameAssignment\");\n\t\t\t\t\tput(grammarAccess.getDecompositionAccess().getNameAssignment_1(), \"rule__Decomposition__NameAssignment_1\");\n\t\t\t\t\tput(grammarAccess.getDecompositionTypeAccess().getTypeNameAssignment(), \"rule__DecompositionType__TypeNameAssignment\");\n\t\t\t\t\tput(grammarAccess.getDocItemTypeAccess().getTypeNameAssignment(), \"rule__DocItemType__TypeNameAssignment\");\n\t\t\t\t\tput(grammarAccess.getDocItemAccess().getNameAssignment_1(), \"rule__DocItem__NameAssignment_1\");\n\t\t\t\t\tput(grammarAccess.getModelTypeAccess().getTypeNameAssignment(), \"rule__ModelType__TypeNameAssignment\");\n\t\t\t\t\tput(grammarAccess.getModelItemAccess().getNameAssignment_1(), \"rule__ModelItem__NameAssignment_1\");\n\t\t\t\t\tput(grammarAccess.getListItemTypeAccess().getTypeNameAssignment(), \"rule__ListItemType__TypeNameAssignment\");\n\t\t\t\t\tput(grammarAccess.getListItemAccess().getNameAssignment_1(), \"rule__ListItem__NameAssignment_1\");", "new_methods": [], "old_code": "\t\t\t\t\tput(grammarAccess.getIntentTypeAccess().getAlternatives(), \"rule__IntentType__Alternatives\");\n\t\t\t\t\tput(grammarAccess.getDecompositionTypeAccess().getAlternatives(), \"rule__DecompositionType__Alternatives\");\n\t\t\t\t\tput(grammarAccess.getDocItemTypeAccess().getAlternatives(), \"rule__DocItemType__Alternatives\");\n\t\t\t\t\tput(grammarAccess.getModelTypeAccess().getAlternatives(), \"rule__ModelType__Alternatives\");\n\t\t\t\t\tput(grammarAccess.getListItemTypeAccess().getAlternatives(), \"rule__ListItemType__Alternatives\");\n\t\t\t\t\tput(grammarAccess.getSpecificationAccess().getIdAssignment_1(), \"rule__Specification__IdAssignment_1\");\n\t\t\t\t\tput(grammarAccess.getRefinementAccess().getIdAssignment_1(), \"rule__Refinement__IdAssignment_1\");\n\t\t\t\t\tput(grammarAccess.getIntentAccess().getIdAssignment_1(), \"rule__Intent__IdAssignment_1\");\n\t\t\t\t\tput(grammarAccess.getDecompositionAccess().getIdAssignment_1(), \"rule__Decomposition__IdAssignment_1\");\n\t\t\t\t\tput(grammarAccess.getDocItemAccess().getIdAssignment_1(), \"rule__DocItem__IdAssignment_1\");\n\t\t\t\t\tput(grammarAccess.getModelItemAccess().getIdAssignment_1(), \"rule__ModelItem__IdAssignment_1\");\n\t\t\t\t\tput(grammarAccess.getListItemAccess().getIdAssignment_1(), \"rule__ListItem__IdAssignment_1\");", "old_methods": [], "patch": "@@ -37,11 +37,11 @@ protected String getRuleName(AbstractElement element) {\n \t\t\tnameMappings = new HashMap<AbstractElement, String>() {\n \t\t\t\tprivate static final long serialVersionUID = 1L;\n \t\t\t\t{\n-\t\t\t\t\tput(grammarAccess.getIntentTypeAccess().getAlternatives(), \"rule__IntentType__Alternatives\");\n-\t\t\t\t\tput(grammarAccess.getDecompositionTypeAccess().getAlternatives(), \"rule__DecompositionType__Alternatives\");\n-\t\t\t\t\tput(grammarAccess.getDocItemTypeAccess().getAlternatives(), \"rule__DocItemType__Alternatives\");\n-\t\t\t\t\tput(grammarAccess.getModelTypeAccess().getAlternatives(), \"rule__ModelType__Alternatives\");\n-\t\t\t\t\tput(grammarAccess.getListItemTypeAccess().getAlternatives(), \"rule__ListItemType__Alternatives\");\n+\t\t\t\t\tput(grammarAccess.getIntentTypeAccess().getTypeNameAlternatives_0(), \"rule__IntentType__TypeNameAlternatives_0\");\n+\t\t\t\t\tput(grammarAccess.getDecompositionTypeAccess().getTypeNameAlternatives_0(), \"rule__DecompositionType__TypeNameAlternatives_0\");\n+\t\t\t\t\tput(grammarAccess.getDocItemTypeAccess().getTypeNameAlternatives_0(), \"rule__DocItemType__TypeNameAlternatives_0\");\n+\t\t\t\t\tput(grammarAccess.getModelTypeAccess().getTypeNameAlternatives_0(), \"rule__ModelType__TypeNameAlternatives_0\");\n+\t\t\t\t\tput(grammarAccess.getListItemTypeAccess().getTypeNameAlternatives_0(), \"rule__ListItemType__TypeNameAlternatives_0\");\n \t\t\t\t\tput(grammarAccess.getSpecificationAccess().getGroup(), \"rule__Specification__Group__0\");\n \t\t\t\t\tput(grammarAccess.getRefinementAccess().getGroup(), \"rule__Refinement__Group__0\");\n \t\t\t\t\tput(grammarAccess.getIntentAccess().getGroup(), \"rule__Intent__Group__0\");\n@@ -56,30 +56,35 @@ protected String getRuleName(AbstractElement element) {\n \t\t\t\t\tput(grammarAccess.getListItemAccess().getGroup_3(), \"rule__ListItem__Group_3__0\");\n \t\t\t\t\tput(grammarAccess.getListItemAccess().getGroup_4(), \"rule__ListItem__Group_4__0\");\n \t\t\t\t\tput(grammarAccess.getListItemAccess().getGroup_5(), \"rule__ListItem__Group_5__0\");\n-\t\t\t\t\tput(grammarAccess.getSpecificationAccess().getIdAssignment_1(), \"rule__Specification__IdAssignment_1\");\n+\t\t\t\t\tput(grammarAccess.getSpecificationAccess().getNameAssignment_1(), \"rule__Specification__NameAssignment_1\");\n \t\t\t\t\tput(grammarAccess.getSpecificationAccess().getRefinementsAssignment_2(), \"rule__Specification__RefinementsAssignment_2\");\n-\t\t\t\t\tput(grammarAccess.getRefinementAccess().getIdAssignment_1(), \"rule__Refinement__IdAssignment_1\");\n+\t\t\t\t\tput(grammarAccess.getRefinementAccess().getNameAssignment_1(), \"rule__Refinement__NameAssignment_1\");\n \t\t\t\t\tput(grammarAccess.getRefinementAccess().getDescAssignment_2(), \"rule__Refinement__DescAssignment_2\");\n \t\t\t\t\tput(grammarAccess.getRefinementAccess().getIntentsAssignment_3(), \"rule__Refinement__IntentsAssignment_3\");\n \t\t\t\t\tput(grammarAccess.getIntentAccess().getTypeAssignment_0(), \"rule__Intent__TypeAssignment_0\");\n-\t\t\t\t\tput(grammarAccess.getIntentAccess().getIdAssignment_1(), \"rule__Intent__IdAssignment_1\");\n+\t\t\t\t\tput(grammarAccess.getIntentAccess().getNameAssignment_1(), \"rule__Intent__NameAssignment_1\");\n \t\t\t\t\tput(grammarAccess.getIntentAccess().getDescAssignment_2(), \"rule__Intent__DescAssignment_2\");\n \t\t\t\t\tput(grammarAccess.getIntentAccess().getDecompositionsAssignment_3(), \"rule__Intent__DecompositionsAssignment_3\");\n+\t\t\t\t\tput(grammarAccess.getIntentTypeAccess().getTypeNameAssignment(), \"rule__IntentType__TypeNameAssignment\");\n \t\t\t\t\tput(grammarAccess.getDecompositionAccess().getTypeAssignment_0(), \"rule__Decomposition__TypeAssignment_0\");\n-\t\t\t\t\tput(grammarAccess.getDecompositionAccess().getIdAssignment_1(), \"rule__Decomposition__IdAssignment_1\");\n+\t\t\t\t\tput(grammarAccess.getDecompositionAccess().getNameAssignment_1(), \"rule__Decomposition__NameAssignment_1\");\n \t\t\t\t\tput(grammarAccess.getDecompositionAccess().getDescAssignment_2(), \"rule__Decomposition__DescAssignment_2\");\n \t\t\t\t\tput(grammarAccess.getDecompositionAccess().getDocumentsAssignment_3_1(), \"rule__Decomposition__DocumentsAssignment_3_1\");\n \t\t\t\t\tput(grammarAccess.getDecompositionAccess().getModelsAssignment_4_1(), \"rule__Decomposition__ModelsAssignment_4_1\");\n \t\t\t\t\tput(grammarAccess.getDecompositionAccess().getItemsAssignment_5_1(), \"rule__Decomposition__ItemsAssignment_5_1\");\n+\t\t\t\t\tput(grammarAccess.getDecompositionTypeAccess().getTypeNameAssignment(), \"rule__DecompositionType__TypeNameAssignment\");\n \t\t\t\t\tput(grammarAccess.getDocumentAccess().getEntriesAssignment_1(), \"rule__Document__EntriesAssignment_1\");\n+\t\t\t\t\tput(grammarAccess.getDocItemTypeAccess().getTypeNameAssignment(), \"rule__DocItemType__TypeNameAssignment\");\n \t\t\t\t\tput(grammarAccess.getDocItemAccess().getTypeAssignment_0(), \"rule__DocItem__TypeAssignment_0\");\n-\t\t\t\t\tput(grammarAccess.getDocItemAccess().getIdAssignment_1(), \"rule__DocItem__IdAssignment_1\");\n+\t\t\t\t\tput(grammarAccess.getDocItemAccess().getNameAssignment_1(), \"rule__DocItem__NameAssignment_1\");\n \t\t\t\t\tput(grammarAccess.getDocItemAccess().getRefAssignment_2(), \"rule__DocItem__RefAssignment_2\");\n+\t\t\t\t\tput(grammarAccess.getModelTypeAccess().getTypeNameAssignment(), \"rule__ModelType__TypeNameAssignment\");\n \t\t\t\t\tput(grammarAccess.getModelItemAccess().getTypeAssignment_0(), \"rule__ModelItem__TypeAssignment_0\");\n-\t\t\t\t\tput(grammarAccess.getModelItemAccess().getIdAssignment_1(), \"rule__ModelItem__IdAssignment_1\");\n+\t\t\t\t\tput(grammarAccess.getModelItemAccess().getNameAssignment_1(), \"rule__ModelItem__NameAssignment_1\");\n \t\t\t\t\tput(grammarAccess.getModelItemAccess().getDescAssignment_2(), \"rule__ModelItem__DescAssignment_2\");\n+\t\t\t\t\tput(grammarAccess.getListItemTypeAccess().getTypeNameAssignment(), \"rule__ListItemType__TypeNameAssignment\");\n \t\t\t\t\tput(grammarAccess.getListItemAccess().getTypeAssignment_0(), \"rule__ListItem__TypeAssignment_0\");\n-\t\t\t\t\tput(grammarAccess.getListItemAccess().getIdAssignment_1(), \"rule__ListItem__IdAssignment_1\");\n+\t\t\t\t\tput(grammarAccess.getListItemAccess().getNameAssignment_1(), \"rule__ListItem__NameAssignment_1\");\n \t\t\t\t\tput(grammarAccess.getListItemAccess().getDescAssignment_2(), \"rule__ListItem__DescAssignment_2\");\n \t\t\t\t\tput(grammarAccess.getListItemAccess().getDocReferencesAssignment_3_1(), \"rule__ListItem__DocReferencesAssignment_3_1\");\n \t\t\t\t\tput(grammarAccess.getListItemAccess().getItemReferencesAssignment_4_1(), \"rule__ListItem__ItemReferencesAssignment_4_1\");", "raw_url": "https://github.com/nasa/CertWare/raw/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent.ui%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fui%2Fcontentassist%2Fantlr%2FIntentSpecificationParser.java", "sha": "5c5686f85064519494d96b38b242142fa1059954", "status": "modified" }, { "additions": 219, "blob_url": "https://github.com/nasa/CertWare/blob/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent.ui%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fui%2Fcontentassist%2Fantlr%2Finternal%2FInternalIntentSpecification.g", "changes": 337, "contents_url": "https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent.ui%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fui%2Fcontentassist%2Fantlr%2Finternal%2FInternalIntentSpecification.g?ref=27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9", "deletions": 118, "filename": "net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g", "new_code": "{ before(grammarAccess.getIntentTypeAccess().getTypeNameAssignment()); }\n(rule__IntentType__TypeNameAssignment)\n{ after(grammarAccess.getIntentTypeAccess().getTypeNameAssignment()); }\n{ before(grammarAccess.getDecompositionTypeAccess().getTypeNameAssignment()); }\n(rule__DecompositionType__TypeNameAssignment)\n{ after(grammarAccess.getDecompositionTypeAccess().getTypeNameAssignment()); }\n{ before(grammarAccess.getDocItemTypeAccess().getTypeNameAssignment()); }\n(rule__DocItemType__TypeNameAssignment)\n{ after(grammarAccess.getDocItemTypeAccess().getTypeNameAssignment()); }\n{ before(grammarAccess.getModelTypeAccess().getTypeNameAssignment()); }\n(rule__ModelType__TypeNameAssignment)\n{ after(grammarAccess.getModelTypeAccess().getTypeNameAssignment()); }\n{ before(grammarAccess.getListItemTypeAccess().getTypeNameAssignment()); }\n(rule__ListItemType__TypeNameAssignment)\n{ after(grammarAccess.getListItemTypeAccess().getTypeNameAssignment()); }\nrule__IntentType__TypeNameAlternatives_0\n{ before(grammarAccess.getIntentTypeAccess().getTypeNameBasicKeyword_0_0()); }\n{ after(grammarAccess.getIntentTypeAccess().getTypeNameBasicKeyword_0_0()); }\n{ before(grammarAccess.getIntentTypeAccess().getTypeNamePurposeKeyword_0_1()); }\n{ after(grammarAccess.getIntentTypeAccess().getTypeNamePurposeKeyword_0_1()); }\n{ before(grammarAccess.getIntentTypeAccess().getTypeNamePrinciplesKeyword_0_2()); }\n{ after(grammarAccess.getIntentTypeAccess().getTypeNamePrinciplesKeyword_0_2()); }\n{ before(grammarAccess.getIntentTypeAccess().getTypeNameModelsKeyword_0_3()); }\n{ after(grammarAccess.getIntentTypeAccess().getTypeNameModelsKeyword_0_3()); }\n{ before(grammarAccess.getIntentTypeAccess().getTypeNameDesignKeyword_0_4()); }\n{ after(grammarAccess.getIntentTypeAccess().getTypeNameDesignKeyword_0_4()); }\n{ before(grammarAccess.getIntentTypeAccess().getTypeNameImplementationKeyword_0_5()); }\n{ after(grammarAccess.getIntentTypeAccess().getTypeNameImplementationKeyword_0_5()); }\n{ before(grammarAccess.getIntentTypeAccess().getTypeNameOperationKeyword_0_6()); }\n{ after(grammarAccess.getIntentTypeAccess().getTypeNameOperationKeyword_0_6()); }\nrule__DecompositionType__TypeNameAlternatives_0\n{ before(grammarAccess.getDecompositionTypeAccess().getTypeNameEnvironmentKeyword_0_0()); }\n{ after(grammarAccess.getDecompositionTypeAccess().getTypeNameEnvironmentKeyword_0_0()); }\n{ before(grammarAccess.getDecompositionTypeAccess().getTypeNameOperatorKeyword_0_1()); }\n{ after(grammarAccess.getDecompositionTypeAccess().getTypeNameOperatorKeyword_0_1()); }\n{ before(grammarAccess.getDecompositionTypeAccess().getTypeNameSystemKeyword_0_2()); }\n{ after(grammarAccess.getDecompositionTypeAccess().getTypeNameSystemKeyword_0_2()); }\n{ before(grammarAccess.getDecompositionTypeAccess().getTypeNameVerificationKeyword_0_3()); }\n{ after(grammarAccess.getDecompositionTypeAccess().getTypeNameVerificationKeyword_0_3()); }\nrule__DocItemType__TypeNameAlternatives_0\n{ before(grammarAccess.getDocItemTypeAccess().getTypeNameConditionKeyword_0_0()); }\n{ after(grammarAccess.getDocItemTypeAccess().getTypeNameConditionKeyword_0_0()); }\n{ before(grammarAccess.getDocItemTypeAccess().getTypeNameFigureKeyword_0_1()); }\n{ after(grammarAccess.getDocItemTypeAccess().getTypeNameFigureKeyword_0_1()); }\n{ before(grammarAccess.getDocItemTypeAccess().getTypeNameBreakKeyword_0_2()); }\n{ after(grammarAccess.getDocItemTypeAccess().getTypeNameBreakKeyword_0_2()); }\n{ before(grammarAccess.getDocItemTypeAccess().getTypeNameModelKeyword_0_3()); }\n{ after(grammarAccess.getDocItemTypeAccess().getTypeNameModelKeyword_0_3()); }\n{ before(grammarAccess.getDocItemTypeAccess().getTypeNameParagraphKeyword_0_4()); }\n{ after(grammarAccess.getDocItemTypeAccess().getTypeNameParagraphKeyword_0_4()); }\n{ before(grammarAccess.getDocItemTypeAccess().getTypeNameSectionKeyword_0_5()); }\n{ after(grammarAccess.getDocItemTypeAccess().getTypeNameSectionKeyword_0_5()); }\n{ before(grammarAccess.getDocItemTypeAccess().getTypeNameTableKeyword_0_6()); }\n{ after(grammarAccess.getDocItemTypeAccess().getTypeNameTableKeyword_0_6()); }\nrule__ModelType__TypeNameAlternatives_0\n{ before(grammarAccess.getModelTypeAccess().getTypeNameOutputKeyword_0_0()); }\n{ after(grammarAccess.getModelTypeAccess().getTypeNameOutputKeyword_0_0()); }\n{ before(grammarAccess.getModelTypeAccess().getTypeNameModeKeyword_0_1()); }\n{ after(grammarAccess.getModelTypeAccess().getTypeNameModeKeyword_0_1()); }\n{ before(grammarAccess.getModelTypeAccess().getTypeNameStateKeyword_0_2()); }\n{ after(grammarAccess.getModelTypeAccess().getTypeNameStateKeyword_0_2()); }\n{ before(grammarAccess.getModelTypeAccess().getTypeNameMacroKeyword_0_3()); }\n{ after(grammarAccess.getModelTypeAccess().getTypeNameMacroKeyword_0_3()); }\n{ before(grammarAccess.getModelTypeAccess().getTypeNameFunctionKeyword_0_4()); }\n{ after(grammarAccess.getModelTypeAccess().getTypeNameFunctionKeyword_0_4()); }\n{ before(grammarAccess.getModelTypeAccess().getTypeNameInputKeyword_0_5()); }\n{ after(grammarAccess.getModelTypeAccess().getTypeNameInputKeyword_0_5()); }\nrule__ListItemType__TypeNameAlternatives_0\n{ before(grammarAccess.getListItemTypeAccess().getTypeNameRequirementKeyword_0_0()); }\n{ after(grammarAccess.getListItemTypeAccess().getTypeNameRequirementKeyword_0_0()); }\n{ before(grammarAccess.getListItemTypeAccess().getTypeNameGoalKeyword_0_1()); }\n{ after(grammarAccess.getListItemTypeAccess().getTypeNameGoalKeyword_0_1()); }\n{ before(grammarAccess.getListItemTypeAccess().getTypeNameHazardKeyword_0_2()); }\n{ after(grammarAccess.getListItemTypeAccess().getTypeNameHazardKeyword_0_2()); }\n{ before(grammarAccess.getListItemTypeAccess().getTypeNameConstraintKeyword_0_3()); }\n{ after(grammarAccess.getListItemTypeAccess().getTypeNameConstraintKeyword_0_3()); }\n{ before(grammarAccess.getSpecificationAccess().getNameAssignment_1()); }\n(rule__Specification__NameAssignment_1)\n{ after(grammarAccess.getSpecificationAccess().getNameAssignment_1()); }\n{ before(grammarAccess.getRefinementAccess().getNameAssignment_1()); }\n(rule__Refinement__NameAssignment_1)\n{ after(grammarAccess.getRefinementAccess().getNameAssignment_1()); }\n{ before(grammarAccess.getIntentAccess().getNameAssignment_1()); }\n(rule__Intent__NameAssignment_1)\n{ after(grammarAccess.getIntentAccess().getNameAssignment_1()); }\n{ before(grammarAccess.getDecompositionAccess().getNameAssignment_1()); }\n(rule__Decomposition__NameAssignment_1)\n{ after(grammarAccess.getDecompositionAccess().getNameAssignment_1()); }\n{ before(grammarAccess.getDocItemAccess().getNameAssignment_1()); }\n(rule__DocItem__NameAssignment_1)\n{ after(grammarAccess.getDocItemAccess().getNameAssignment_1()); }\n{ before(grammarAccess.getModelItemAccess().getNameAssignment_1()); }\n(rule__ModelItem__NameAssignment_1)\n{ after(grammarAccess.getModelItemAccess().getNameAssignment_1()); }\n{ before(grammarAccess.getListItemAccess().getNameAssignment_1()); }\n(rule__ListItem__NameAssignment_1)\n{ after(grammarAccess.getListItemAccess().getNameAssignment_1()); }\n(\n{ before(grammarAccess.getListItemAccess().getDocReferencesAssignment_3_1()); }\n(rule__ListItem__DocReferencesAssignment_3_1)\n{ after(grammarAccess.getListItemAccess().getDocReferencesAssignment_3_1()); }\n)\n(\n)\n(\n{ before(grammarAccess.getListItemAccess().getItemReferencesAssignment_4_1()); }\n(rule__ListItem__ItemReferencesAssignment_4_1)\n{ after(grammarAccess.getListItemAccess().getItemReferencesAssignment_4_1()); }\n)\n(\n)\n(\n{ before(grammarAccess.getListItemAccess().getModelReferencesAssignment_5_1()); }\n(rule__ListItem__ModelReferencesAssignment_5_1)\n{ after(grammarAccess.getListItemAccess().getModelReferencesAssignment_5_1()); }\n)\n(\n)\nrule__Specification__NameAssignment_1\n{ before(grammarAccess.getSpecificationAccess().getNameIDTerminalRuleCall_1_0()); }\n\tRULE_ID{ after(grammarAccess.getSpecificationAccess().getNameIDTerminalRuleCall_1_0()); }\nrule__Refinement__NameAssignment_1\n{ before(grammarAccess.getRefinementAccess().getNameIDTerminalRuleCall_1_0()); }\n\tRULE_ID{ after(grammarAccess.getRefinementAccess().getNameIDTerminalRuleCall_1_0()); }\nrule__Intent__NameAssignment_1\n{ before(grammarAccess.getIntentAccess().getNameIDTerminalRuleCall_1_0()); }\n\tRULE_ID{ after(grammarAccess.getIntentAccess().getNameIDTerminalRuleCall_1_0()); }\nrule__IntentType__TypeNameAssignment\n @init {\n\t\tint stackSize = keepStackSize();\n }\n:\n(\n{ before(grammarAccess.getIntentTypeAccess().getTypeNameAlternatives_0()); }\n(rule__IntentType__TypeNameAlternatives_0)\n{ after(grammarAccess.getIntentTypeAccess().getTypeNameAlternatives_0()); }\n)\n\n;\nfinally {\n\trestoreStackSize(stackSize);\n}\n\nrule__Decomposition__NameAssignment_1\n{ before(grammarAccess.getDecompositionAccess().getNameIDTerminalRuleCall_1_0()); }\n\tRULE_ID{ after(grammarAccess.getDecompositionAccess().getNameIDTerminalRuleCall_1_0()); }\nrule__DecompositionType__TypeNameAssignment\n @init {\n\t\tint stackSize = keepStackSize();\n }\n:\n(\n{ before(grammarAccess.getDecompositionTypeAccess().getTypeNameAlternatives_0()); }\n(rule__DecompositionType__TypeNameAlternatives_0)\n{ after(grammarAccess.getDecompositionTypeAccess().getTypeNameAlternatives_0()); }\n)\n\n;\nfinally {\n\trestoreStackSize(stackSize);\n}\n\nrule__DocItemType__TypeNameAssignment\n @init {\n\t\tint stackSize = keepStackSize();\n }\n:\n(\n{ before(grammarAccess.getDocItemTypeAccess().getTypeNameAlternatives_0()); }\n(rule__DocItemType__TypeNameAlternatives_0)\n{ after(grammarAccess.getDocItemTypeAccess().getTypeNameAlternatives_0()); }\n)\n\n;\nfinally {\n\trestoreStackSize(stackSize);\n}\n\nrule__DocItem__NameAssignment_1\n{ before(grammarAccess.getDocItemAccess().getNameIDTerminalRuleCall_1_0()); }\n\tRULE_ID{ after(grammarAccess.getDocItemAccess().getNameIDTerminalRuleCall_1_0()); }\nrule__ModelType__TypeNameAssignment\n @init {\n\t\tint stackSize = keepStackSize();\n }\n:\n(\n{ before(grammarAccess.getModelTypeAccess().getTypeNameAlternatives_0()); }\n(rule__ModelType__TypeNameAlternatives_0)\n{ after(grammarAccess.getModelTypeAccess().getTypeNameAlternatives_0()); }\n)\n\n;\nfinally {\n\trestoreStackSize(stackSize);\n}\n\nrule__ModelItem__NameAssignment_1\n{ before(grammarAccess.getModelItemAccess().getNameIDTerminalRuleCall_1_0()); }\n\tRULE_ID{ after(grammarAccess.getModelItemAccess().getNameIDTerminalRuleCall_1_0()); }\nrule__ListItemType__TypeNameAssignment\n @init {\n\t\tint stackSize = keepStackSize();\n }\n:\n(\n{ before(grammarAccess.getListItemTypeAccess().getTypeNameAlternatives_0()); }\n(rule__ListItemType__TypeNameAlternatives_0)\n{ after(grammarAccess.getListItemTypeAccess().getTypeNameAlternatives_0()); }\n)\n\n;\nfinally {\n\trestoreStackSize(stackSize);\n}\n\nrule__ListItem__NameAssignment_1\n{ before(grammarAccess.getListItemAccess().getNameIDTerminalRuleCall_1_0()); }\n\tRULE_ID{ after(grammarAccess.getListItemAccess().getNameIDTerminalRuleCall_1_0()); }", "new_methods": [], "old_code": "{ before(grammarAccess.getIntentTypeAccess().getAlternatives()); }\n(rule__IntentType__Alternatives)\n{ after(grammarAccess.getIntentTypeAccess().getAlternatives()); }\n{ before(grammarAccess.getDecompositionTypeAccess().getAlternatives()); }\n(rule__DecompositionType__Alternatives)\n{ after(grammarAccess.getDecompositionTypeAccess().getAlternatives()); }\n{ before(grammarAccess.getDocItemTypeAccess().getAlternatives()); }\n(rule__DocItemType__Alternatives)\n{ after(grammarAccess.getDocItemTypeAccess().getAlternatives()); }\n{ before(grammarAccess.getModelTypeAccess().getAlternatives()); }\n(rule__ModelType__Alternatives)\n{ after(grammarAccess.getModelTypeAccess().getAlternatives()); }\n{ before(grammarAccess.getListItemTypeAccess().getAlternatives()); }\n(rule__ListItemType__Alternatives)\n{ after(grammarAccess.getListItemTypeAccess().getAlternatives()); }\nrule__IntentType__Alternatives\n{ before(grammarAccess.getIntentTypeAccess().getBasicKeyword_0()); }\n{ after(grammarAccess.getIntentTypeAccess().getBasicKeyword_0()); }\n{ before(grammarAccess.getIntentTypeAccess().getPurposeKeyword_1()); }\n{ after(grammarAccess.getIntentTypeAccess().getPurposeKeyword_1()); }\n{ before(grammarAccess.getIntentTypeAccess().getPrinciplesKeyword_2()); }\n{ after(grammarAccess.getIntentTypeAccess().getPrinciplesKeyword_2()); }\n{ before(grammarAccess.getIntentTypeAccess().getModelsKeyword_3()); }\n{ after(grammarAccess.getIntentTypeAccess().getModelsKeyword_3()); }\n{ before(grammarAccess.getIntentTypeAccess().getDesignKeyword_4()); }\n{ after(grammarAccess.getIntentTypeAccess().getDesignKeyword_4()); }\n{ before(grammarAccess.getIntentTypeAccess().getImplementationKeyword_5()); }\n{ after(grammarAccess.getIntentTypeAccess().getImplementationKeyword_5()); }\n{ before(grammarAccess.getIntentTypeAccess().getOperationKeyword_6()); }\n{ after(grammarAccess.getIntentTypeAccess().getOperationKeyword_6()); }\nrule__DecompositionType__Alternatives\n{ before(grammarAccess.getDecompositionTypeAccess().getEnvironmentKeyword_0()); }\n{ after(grammarAccess.getDecompositionTypeAccess().getEnvironmentKeyword_0()); }\n{ before(grammarAccess.getDecompositionTypeAccess().getOperatorKeyword_1()); }\n{ after(grammarAccess.getDecompositionTypeAccess().getOperatorKeyword_1()); }\n{ before(grammarAccess.getDecompositionTypeAccess().getSystemKeyword_2()); }\n{ after(grammarAccess.getDecompositionTypeAccess().getSystemKeyword_2()); }\n{ before(grammarAccess.getDecompositionTypeAccess().getVerificationKeyword_3()); }\n{ after(grammarAccess.getDecompositionTypeAccess().getVerificationKeyword_3()); }\nrule__DocItemType__Alternatives\n{ before(grammarAccess.getDocItemTypeAccess().getConditionKeyword_0()); }\n{ after(grammarAccess.getDocItemTypeAccess().getConditionKeyword_0()); }\n{ before(grammarAccess.getDocItemTypeAccess().getFigureKeyword_1()); }\n{ after(grammarAccess.getDocItemTypeAccess().getFigureKeyword_1()); }\n{ before(grammarAccess.getDocItemTypeAccess().getBreakKeyword_2()); }\n{ after(grammarAccess.getDocItemTypeAccess().getBreakKeyword_2()); }\n{ before(grammarAccess.getDocItemTypeAccess().getModelKeyword_3()); }\n{ after(grammarAccess.getDocItemTypeAccess().getModelKeyword_3()); }\n{ before(grammarAccess.getDocItemTypeAccess().getParagraphKeyword_4()); }\n{ after(grammarAccess.getDocItemTypeAccess().getParagraphKeyword_4()); }\n{ before(grammarAccess.getDocItemTypeAccess().getSectionKeyword_5()); }\n{ after(grammarAccess.getDocItemTypeAccess().getSectionKeyword_5()); }\n{ before(grammarAccess.getDocItemTypeAccess().getTableKeyword_6()); }\n{ after(grammarAccess.getDocItemTypeAccess().getTableKeyword_6()); }\nrule__ModelType__Alternatives\n{ before(grammarAccess.getModelTypeAccess().getOutputKeyword_0()); }\n{ after(grammarAccess.getModelTypeAccess().getOutputKeyword_0()); }\n{ before(grammarAccess.getModelTypeAccess().getModeKeyword_1()); }\n{ after(grammarAccess.getModelTypeAccess().getModeKeyword_1()); }\n{ before(grammarAccess.getModelTypeAccess().getStateKeyword_2()); }\n{ after(grammarAccess.getModelTypeAccess().getStateKeyword_2()); }\n{ before(grammarAccess.getModelTypeAccess().getMacroKeyword_3()); }\n{ after(grammarAccess.getModelTypeAccess().getMacroKeyword_3()); }\n{ before(grammarAccess.getModelTypeAccess().getFunctionKeyword_4()); }\n{ after(grammarAccess.getModelTypeAccess().getFunctionKeyword_4()); }\n{ before(grammarAccess.getModelTypeAccess().getInputKeyword_5()); }\n{ after(grammarAccess.getModelTypeAccess().getInputKeyword_5()); }\nrule__ListItemType__Alternatives\n{ before(grammarAccess.getListItemTypeAccess().getRequirementKeyword_0()); }\n{ after(grammarAccess.getListItemTypeAccess().getRequirementKeyword_0()); }\n{ before(grammarAccess.getListItemTypeAccess().getGoalKeyword_1()); }\n{ after(grammarAccess.getListItemTypeAccess().getGoalKeyword_1()); }\n{ before(grammarAccess.getListItemTypeAccess().getHazardKeyword_2()); }\n{ after(grammarAccess.getListItemTypeAccess().getHazardKeyword_2()); }\n{ before(grammarAccess.getListItemTypeAccess().getConstraintKeyword_3()); }\n{ after(grammarAccess.getListItemTypeAccess().getConstraintKeyword_3()); }\n{ before(grammarAccess.getSpecificationAccess().getIdAssignment_1()); }\n(rule__Specification__IdAssignment_1)\n{ after(grammarAccess.getSpecificationAccess().getIdAssignment_1()); }\n{ before(grammarAccess.getRefinementAccess().getIdAssignment_1()); }\n(rule__Refinement__IdAssignment_1)\n{ after(grammarAccess.getRefinementAccess().getIdAssignment_1()); }\n{ before(grammarAccess.getIntentAccess().getIdAssignment_1()); }\n(rule__Intent__IdAssignment_1)\n{ after(grammarAccess.getIntentAccess().getIdAssignment_1()); }\n{ before(grammarAccess.getDecompositionAccess().getIdAssignment_1()); }\n(rule__Decomposition__IdAssignment_1)\n{ after(grammarAccess.getDecompositionAccess().getIdAssignment_1()); }\n{ before(grammarAccess.getDocItemAccess().getIdAssignment_1()); }\n(rule__DocItem__IdAssignment_1)\n{ after(grammarAccess.getDocItemAccess().getIdAssignment_1()); }\n{ before(grammarAccess.getModelItemAccess().getIdAssignment_1()); }\n(rule__ModelItem__IdAssignment_1)\n{ after(grammarAccess.getModelItemAccess().getIdAssignment_1()); }\n{ before(grammarAccess.getListItemAccess().getIdAssignment_1()); }\n(rule__ListItem__IdAssignment_1)\n{ after(grammarAccess.getListItemAccess().getIdAssignment_1()); }\nrule__Specification__IdAssignment_1\n{ before(grammarAccess.getSpecificationAccess().getIdIDTerminalRuleCall_1_0()); }\n\tRULE_ID{ after(grammarAccess.getSpecificationAccess().getIdIDTerminalRuleCall_1_0()); }\nrule__Refinement__IdAssignment_1\n{ before(grammarAccess.getRefinementAccess().getIdIDTerminalRuleCall_1_0()); }\n\tRULE_ID{ after(grammarAccess.getRefinementAccess().getIdIDTerminalRuleCall_1_0()); }\nrule__Intent__IdAssignment_1\n{ before(grammarAccess.getIntentAccess().getIdIDTerminalRuleCall_1_0()); }\n\tRULE_ID{ after(grammarAccess.getIntentAccess().getIdIDTerminalRuleCall_1_0()); }\nrule__Decomposition__IdAssignment_1\n{ before(grammarAccess.getDecompositionAccess().getIdIDTerminalRuleCall_1_0()); }\n\tRULE_ID{ after(grammarAccess.getDecompositionAccess().getIdIDTerminalRuleCall_1_0()); }\nrule__DocItem__IdAssignment_1\n{ before(grammarAccess.getDocItemAccess().getIdIDTerminalRuleCall_1_0()); }\n\tRULE_ID{ after(grammarAccess.getDocItemAccess().getIdIDTerminalRuleCall_1_0()); }\nrule__ModelItem__IdAssignment_1\n{ before(grammarAccess.getModelItemAccess().getIdIDTerminalRuleCall_1_0()); }\n\tRULE_ID{ after(grammarAccess.getModelItemAccess().getIdIDTerminalRuleCall_1_0()); }\nrule__ListItem__IdAssignment_1\n{ before(grammarAccess.getListItemAccess().getIdIDTerminalRuleCall_1_0()); }\n\tRULE_ID{ after(grammarAccess.getListItemAccess().getIdIDTerminalRuleCall_1_0()); }", "old_methods": [], "patch": "@@ -156,9 +156,9 @@ ruleIntentType\n }\n \t:\n (\n-{ before(grammarAccess.getIntentTypeAccess().getAlternatives()); }\n-(rule__IntentType__Alternatives)\n-{ after(grammarAccess.getIntentTypeAccess().getAlternatives()); }\n+{ before(grammarAccess.getIntentTypeAccess().getTypeNameAssignment()); }\n+(rule__IntentType__TypeNameAssignment)\n+{ after(grammarAccess.getIntentTypeAccess().getTypeNameAssignment()); }\n )\n \n ;\n@@ -212,9 +212,9 @@ ruleDecompositionType\n }\n \t:\n (\n-{ before(grammarAccess.getDecompositionTypeAccess().getAlternatives()); }\n-(rule__DecompositionType__Alternatives)\n-{ after(grammarAccess.getDecompositionTypeAccess().getAlternatives()); }\n+{ before(grammarAccess.getDecompositionTypeAccess().getTypeNameAssignment()); }\n+(rule__DecompositionType__TypeNameAssignment)\n+{ after(grammarAccess.getDecompositionTypeAccess().getTypeNameAssignment()); }\n )\n \n ;\n@@ -268,9 +268,9 @@ ruleDocItemType\n }\n \t:\n (\n-{ before(grammarAccess.getDocItemTypeAccess().getAlternatives()); }\n-(rule__DocItemType__Alternatives)\n-{ after(grammarAccess.getDocItemTypeAccess().getAlternatives()); }\n+{ before(grammarAccess.getDocItemTypeAccess().getTypeNameAssignment()); }\n+(rule__DocItemType__TypeNameAssignment)\n+{ after(grammarAccess.getDocItemTypeAccess().getTypeNameAssignment()); }\n )\n \n ;\n@@ -324,9 +324,9 @@ ruleModelType\n }\n \t:\n (\n-{ before(grammarAccess.getModelTypeAccess().getAlternatives()); }\n-(rule__ModelType__Alternatives)\n-{ after(grammarAccess.getModelTypeAccess().getAlternatives()); }\n+{ before(grammarAccess.getModelTypeAccess().getTypeNameAssignment()); }\n+(rule__ModelType__TypeNameAssignment)\n+{ after(grammarAccess.getModelTypeAccess().getTypeNameAssignment()); }\n )\n \n ;\n@@ -380,9 +380,9 @@ ruleListItemType\n }\n \t:\n (\n-{ before(grammarAccess.getListItemTypeAccess().getAlternatives()); }\n-(rule__ListItemType__Alternatives)\n-{ after(grammarAccess.getListItemTypeAccess().getAlternatives()); }\n+{ before(grammarAccess.getListItemTypeAccess().getTypeNameAssignment()); }\n+(rule__ListItemType__TypeNameAssignment)\n+{ after(grammarAccess.getListItemTypeAccess().getTypeNameAssignment()); }\n )\n \n ;\n@@ -421,273 +421,273 @@ finally {\n \n \n \n-rule__IntentType__Alternatives\n+rule__IntentType__TypeNameAlternatives_0\n @init {\n \t\tint stackSize = keepStackSize();\n }\n :\n (\n-{ before(grammarAccess.getIntentTypeAccess().getBasicKeyword_0()); }\n+{ before(grammarAccess.getIntentTypeAccess().getTypeNameBasicKeyword_0_0()); }\n \n \t'basic' \n \n-{ after(grammarAccess.getIntentTypeAccess().getBasicKeyword_0()); }\n+{ after(grammarAccess.getIntentTypeAccess().getTypeNameBasicKeyword_0_0()); }\n )\n \n |(\n-{ before(grammarAccess.getIntentTypeAccess().getPurposeKeyword_1()); }\n+{ before(grammarAccess.getIntentTypeAccess().getTypeNamePurposeKeyword_0_1()); }\n \n \t'purpose' \n \n-{ after(grammarAccess.getIntentTypeAccess().getPurposeKeyword_1()); }\n+{ after(grammarAccess.getIntentTypeAccess().getTypeNamePurposeKeyword_0_1()); }\n )\n \n |(\n-{ before(grammarAccess.getIntentTypeAccess().getPrinciplesKeyword_2()); }\n+{ before(grammarAccess.getIntentTypeAccess().getTypeNamePrinciplesKeyword_0_2()); }\n \n \t'principles' \n \n-{ after(grammarAccess.getIntentTypeAccess().getPrinciplesKeyword_2()); }\n+{ after(grammarAccess.getIntentTypeAccess().getTypeNamePrinciplesKeyword_0_2()); }\n )\n \n |(\n-{ before(grammarAccess.getIntentTypeAccess().getModelsKeyword_3()); }\n+{ before(grammarAccess.getIntentTypeAccess().getTypeNameModelsKeyword_0_3()); }\n \n \t'models' \n \n-{ after(grammarAccess.getIntentTypeAccess().getModelsKeyword_3()); }\n+{ after(grammarAccess.getIntentTypeAccess().getTypeNameModelsKeyword_0_3()); }\n )\n \n |(\n-{ before(grammarAccess.getIntentTypeAccess().getDesignKeyword_4()); }\n+{ before(grammarAccess.getIntentTypeAccess().getTypeNameDesignKeyword_0_4()); }\n \n \t'design' \n \n-{ after(grammarAccess.getIntentTypeAccess().getDesignKeyword_4()); }\n+{ after(grammarAccess.getIntentTypeAccess().getTypeNameDesignKeyword_0_4()); }\n )\n \n |(\n-{ before(grammarAccess.getIntentTypeAccess().getImplementationKeyword_5()); }\n+{ before(grammarAccess.getIntentTypeAccess().getTypeNameImplementationKeyword_0_5()); }\n \n \t'implementation' \n \n-{ after(grammarAccess.getIntentTypeAccess().getImplementationKeyword_5()); }\n+{ after(grammarAccess.getIntentTypeAccess().getTypeNameImplementationKeyword_0_5()); }\n )\n \n |(\n-{ before(grammarAccess.getIntentTypeAccess().getOperationKeyword_6()); }\n+{ before(grammarAccess.getIntentTypeAccess().getTypeNameOperationKeyword_0_6()); }\n \n \t'operation' \n \n-{ after(grammarAccess.getIntentTypeAccess().getOperationKeyword_6()); }\n+{ after(grammarAccess.getIntentTypeAccess().getTypeNameOperationKeyword_0_6()); }\n )\n \n ;\n finally {\n \trestoreStackSize(stackSize);\n }\n \n-rule__DecompositionType__Alternatives\n+rule__DecompositionType__TypeNameAlternatives_0\n @init {\n \t\tint stackSize = keepStackSize();\n }\n :\n (\n-{ before(grammarAccess.getDecompositionTypeAccess().getEnvironmentKeyword_0()); }\n+{ before(grammarAccess.getDecompositionTypeAccess().getTypeNameEnvironmentKeyword_0_0()); }\n \n \t'environment' \n \n-{ after(grammarAccess.getDecompositionTypeAccess().getEnvironmentKeyword_0()); }\n+{ after(grammarAccess.getDecompositionTypeAccess().getTypeNameEnvironmentKeyword_0_0()); }\n )\n \n |(\n-{ before(grammarAccess.getDecompositionTypeAccess().getOperatorKeyword_1()); }\n+{ before(grammarAccess.getDecompositionTypeAccess().getTypeNameOperatorKeyword_0_1()); }\n \n \t'operator' \n \n-{ after(grammarAccess.getDecompositionTypeAccess().getOperatorKeyword_1()); }\n+{ after(grammarAccess.getDecompositionTypeAccess().getTypeNameOperatorKeyword_0_1()); }\n )\n \n |(\n-{ before(grammarAccess.getDecompositionTypeAccess().getSystemKeyword_2()); }\n+{ before(grammarAccess.getDecompositionTypeAccess().getTypeNameSystemKeyword_0_2()); }\n \n \t'system' \n \n-{ after(grammarAccess.getDecompositionTypeAccess().getSystemKeyword_2()); }\n+{ after(grammarAccess.getDecompositionTypeAccess().getTypeNameSystemKeyword_0_2()); }\n )\n \n |(\n-{ before(grammarAccess.getDecompositionTypeAccess().getVerificationKeyword_3()); }\n+{ before(grammarAccess.getDecompositionTypeAccess().getTypeNameVerificationKeyword_0_3()); }\n \n \t'verification' \n \n-{ after(grammarAccess.getDecompositionTypeAccess().getVerificationKeyword_3()); }\n+{ after(grammarAccess.getDecompositionTypeAccess().getTypeNameVerificationKeyword_0_3()); }\n )\n \n ;\n finally {\n \trestoreStackSize(stackSize);\n }\n \n-rule__DocItemType__Alternatives\n+rule__DocItemType__TypeNameAlternatives_0\n @init {\n \t\tint stackSize = keepStackSize();\n }\n :\n (\n-{ before(grammarAccess.getDocItemTypeAccess().getConditionKeyword_0()); }\n+{ before(grammarAccess.getDocItemTypeAccess().getTypeNameConditionKeyword_0_0()); }\n \n \t'condition' \n \n-{ after(grammarAccess.getDocItemTypeAccess().getConditionKeyword_0()); }\n+{ after(grammarAccess.getDocItemTypeAccess().getTypeNameConditionKeyword_0_0()); }\n )\n \n |(\n-{ before(grammarAccess.getDocItemTypeAccess().getFigureKeyword_1()); }\n+{ before(grammarAccess.getDocItemTypeAccess().getTypeNameFigureKeyword_0_1()); }\n \n \t'figure' \n \n-{ after(grammarAccess.getDocItemTypeAccess().getFigureKeyword_1()); }\n+{ after(grammarAccess.getDocItemTypeAccess().getTypeNameFigureKeyword_0_1()); }\n )\n \n |(\n-{ before(grammarAccess.getDocItemTypeAccess().getBreakKeyword_2()); }\n+{ before(grammarAccess.getDocItemTypeAccess().getTypeNameBreakKeyword_0_2()); }\n \n \t'break' \n \n-{ after(grammarAccess.getDocItemTypeAccess().getBreakKeyword_2()); }\n+{ after(grammarAccess.getDocItemTypeAccess().getTypeNameBreakKeyword_0_2()); }\n )\n \n |(\n-{ before(grammarAccess.getDocItemTypeAccess().getModelKeyword_3()); }\n+{ before(grammarAccess.getDocItemTypeAccess().getTypeNameModelKeyword_0_3()); }\n \n \t'model' \n \n-{ after(grammarAccess.getDocItemTypeAccess().getModelKeyword_3()); }\n+{ after(grammarAccess.getDocItemTypeAccess().getTypeNameModelKeyword_0_3()); }\n )\n \n |(\n-{ before(grammarAccess.getDocItemTypeAccess().getParagraphKeyword_4()); }\n+{ before(grammarAccess.getDocItemTypeAccess().getTypeNameParagraphKeyword_0_4()); }\n \n \t'paragraph' \n \n-{ after(grammarAccess.getDocItemTypeAccess().getParagraphKeyword_4()); }\n+{ after(grammarAccess.getDocItemTypeAccess().getTypeNameParagraphKeyword_0_4()); }\n )\n \n |(\n-{ before(grammarAccess.getDocItemTypeAccess().getSectionKeyword_5()); }\n+{ before(grammarAccess.getDocItemTypeAccess().getTypeNameSectionKeyword_0_5()); }\n \n \t'section' \n \n-{ after(grammarAccess.getDocItemTypeAccess().getSectionKeyword_5()); }\n+{ after(grammarAccess.getDocItemTypeAccess().getTypeNameSectionKeyword_0_5()); }\n )\n \n |(\n-{ before(grammarAccess.getDocItemTypeAccess().getTableKeyword_6()); }\n+{ before(grammarAccess.getDocItemTypeAccess().getTypeNameTableKeyword_0_6()); }\n \n \t'table' \n \n-{ after(grammarAccess.getDocItemTypeAccess().getTableKeyword_6()); }\n+{ after(grammarAccess.getDocItemTypeAccess().getTypeNameTableKeyword_0_6()); }\n )\n \n ;\n finally {\n \trestoreStackSize(stackSize);\n }\n \n-rule__ModelType__Alternatives\n+rule__ModelType__TypeNameAlternatives_0\n @init {\n \t\tint stackSize = keepStackSize();\n }\n :\n (\n-{ before(grammarAccess.getModelTypeAccess().getOutputKeyword_0()); }\n+{ before(grammarAccess.getModelTypeAccess().getTypeNameOutputKeyword_0_0()); }\n \n \t'output' \n \n-{ after(grammarAccess.getModelTypeAccess().getOutputKeyword_0()); }\n+{ after(grammarAccess.getModelTypeAccess().getTypeNameOutputKeyword_0_0()); }\n )\n \n |(\n-{ before(grammarAccess.getModelTypeAccess().getModeKeyword_1()); }\n+{ before(grammarAccess.getModelTypeAccess().getTypeNameModeKeyword_0_1()); }\n \n \t'mode' \n \n-{ after(grammarAccess.getModelTypeAccess().getModeKeyword_1()); }\n+{ after(grammarAccess.getModelTypeAccess().getTypeNameModeKeyword_0_1()); }\n )\n \n |(\n-{ before(grammarAccess.getModelTypeAccess().getStateKeyword_2()); }\n+{ before(grammarAccess.getModelTypeAccess().getTypeNameStateKeyword_0_2()); }\n \n \t'state' \n \n-{ after(grammarAccess.getModelTypeAccess().getStateKeyword_2()); }\n+{ after(grammarAccess.getModelTypeAccess().getTypeNameStateKeyword_0_2()); }\n )\n \n |(\n-{ before(grammarAccess.getModelTypeAccess().getMacroKeyword_3()); }\n+{ before(grammarAccess.getModelTypeAccess().getTypeNameMacroKeyword_0_3()); }\n \n \t'macro' \n \n-{ after(grammarAccess.getModelTypeAccess().getMacroKeyword_3()); }\n+{ after(grammarAccess.getModelTypeAccess().getTypeNameMacroKeyword_0_3()); }\n )\n \n |(\n-{ before(grammarAccess.getModelTypeAccess().getFunctionKeyword_4()); }\n+{ before(grammarAccess.getModelTypeAccess().getTypeNameFunctionKeyword_0_4()); }\n \n \t'function' \n \n-{ after(grammarAccess.getModelTypeAccess().getFunctionKeyword_4()); }\n+{ after(grammarAccess.getModelTypeAccess().getTypeNameFunctionKeyword_0_4()); }\n )\n \n |(\n-{ before(grammarAccess.getModelTypeAccess().getInputKeyword_5()); }\n+{ before(grammarAccess.getModelTypeAccess().getTypeNameInputKeyword_0_5()); }\n \n \t'input' \n \n-{ after(grammarAccess.getModelTypeAccess().getInputKeyword_5()); }\n+{ after(grammarAccess.getModelTypeAccess().getTypeNameInputKeyword_0_5()); }\n )\n \n ;\n finally {\n \trestoreStackSize(stackSize);\n }\n \n-rule__ListItemType__Alternatives\n+rule__ListItemType__TypeNameAlternatives_0\n @init {\n \t\tint stackSize = keepStackSize();\n }\n :\n (\n-{ before(grammarAccess.getListItemTypeAccess().getRequirementKeyword_0()); }\n+{ before(grammarAccess.getListItemTypeAccess().getTypeNameRequirementKeyword_0_0()); }\n \n \t'requirement' \n \n-{ after(grammarAccess.getListItemTypeAccess().getRequirementKeyword_0()); }\n+{ after(grammarAccess.getListItemTypeAccess().getTypeNameRequirementKeyword_0_0()); }\n )\n \n |(\n-{ before(grammarAccess.getListItemTypeAccess().getGoalKeyword_1()); }\n+{ before(grammarAccess.getListItemTypeAccess().getTypeNameGoalKeyword_0_1()); }\n \n \t'goal' \n \n-{ after(grammarAccess.getListItemTypeAccess().getGoalKeyword_1()); }\n+{ after(grammarAccess.getListItemTypeAccess().getTypeNameGoalKeyword_0_1()); }\n )\n \n |(\n-{ before(grammarAccess.getListItemTypeAccess().getHazardKeyword_2()); }\n+{ before(grammarAccess.getListItemTypeAccess().getTypeNameHazardKeyword_0_2()); }\n \n \t'hazard' \n \n-{ after(grammarAccess.getListItemTypeAccess().getHazardKeyword_2()); }\n+{ after(grammarAccess.getListItemTypeAccess().getTypeNameHazardKeyword_0_2()); }\n )\n \n |(\n-{ before(grammarAccess.getListItemTypeAccess().getConstraintKeyword_3()); }\n+{ before(grammarAccess.getListItemTypeAccess().getTypeNameConstraintKeyword_0_3()); }\n \n \t'constraint' \n \n-{ after(grammarAccess.getListItemTypeAccess().getConstraintKeyword_3()); }\n+{ after(grammarAccess.getListItemTypeAccess().getTypeNameConstraintKeyword_0_3()); }\n )\n \n ;\n@@ -746,9 +746,9 @@ rule__Specification__Group__1__Impl\n }\n :\n (\n-{ before(grammarAccess.getSpecificationAccess().getIdAssignment_1()); }\n-(rule__Specification__IdAssignment_1)\n-{ after(grammarAccess.getSpecificationAccess().getIdAssignment_1()); }\n+{ before(grammarAccess.getSpecificationAccess().getNameAssignment_1()); }\n+(rule__Specification__NameAssignment_1)\n+{ after(grammarAccess.getSpecificationAccess().getNameAssignment_1()); }\n )\n \n ;\n@@ -847,9 +847,9 @@ rule__Refinement__Group__1__Impl\n }\n :\n (\n-{ before(grammarAccess.getRefinementAccess().getIdAssignment_1()); }\n-(rule__Refinement__IdAssignment_1)\n-{ after(grammarAccess.getRefinementAccess().getIdAssignment_1()); }\n+{ before(grammarAccess.getRefinementAccess().getNameAssignment_1()); }\n+(rule__Refinement__NameAssignment_1)\n+{ after(grammarAccess.getRefinementAccess().getNameAssignment_1()); }\n )\n \n ;\n@@ -977,9 +977,9 @@ rule__Intent__Group__1__Impl\n }\n :\n (\n-{ before(grammarAccess.getIntentAccess().getIdAssignment_1()); }\n-(rule__Intent__IdAssignment_1)\n-{ after(grammarAccess.getIntentAccess().getIdAssignment_1()); }\n+{ before(grammarAccess.getIntentAccess().getNameAssignment_1()); }\n+(rule__Intent__NameAssignment_1)\n+{ after(grammarAccess.getIntentAccess().getNameAssignment_1()); }\n )\n \n ;\n@@ -1107,9 +1107,9 @@ rule__Decomposition__Group__1__Impl\n }\n :\n (\n-{ before(grammarAccess.getDecompositionAccess().getIdAssignment_1()); }\n-(rule__Decomposition__IdAssignment_1)\n-{ after(grammarAccess.getDecompositionAccess().getIdAssignment_1()); }\n+{ before(grammarAccess.getDecompositionAccess().getNameAssignment_1()); }\n+(rule__Decomposition__NameAssignment_1)\n+{ after(grammarAccess.getDecompositionAccess().getNameAssignment_1()); }\n )\n \n ;\n@@ -1683,9 +1683,9 @@ rule__DocItem__Group__1__Impl\n }\n :\n (\n-{ before(grammarAccess.getDocItemAccess().getIdAssignment_1()); }\n-(rule__DocItem__IdAssignment_1)\n-{ after(grammarAccess.getDocItemAccess().getIdAssignment_1()); }\n+{ before(grammarAccess.getDocItemAccess().getNameAssignment_1()); }\n+(rule__DocItem__NameAssignment_1)\n+{ after(grammarAccess.getDocItemAccess().getNameAssignment_1()); }\n )\n \n ;\n@@ -1808,9 +1808,9 @@ rule__ModelItem__Group__1__Impl\n }\n :\n (\n-{ before(grammarAccess.getModelItemAccess().getIdAssignment_1()); }\n-(rule__ModelItem__IdAssignment_1)\n-{ after(grammarAccess.getModelItemAccess().getIdAssignment_1()); }\n+{ before(grammarAccess.getModelItemAccess().getNameAssignment_1()); }\n+(rule__ModelItem__NameAssignment_1)\n+{ after(grammarAccess.getModelItemAccess().getNameAssignment_1()); }\n )\n \n ;\n@@ -1933,9 +1933,9 @@ rule__ListItem__Group__1__Impl\n }\n :\n (\n-{ before(grammarAccess.getListItemAccess().getIdAssignment_1()); }\n-(rule__ListItem__IdAssignment_1)\n-{ after(grammarAccess.getListItemAccess().getIdAssignment_1()); }\n+{ before(grammarAccess.getListItemAccess().getNameAssignment_1()); }\n+(rule__ListItem__NameAssignment_1)\n+{ after(grammarAccess.getListItemAccess().getNameAssignment_1()); }\n )\n \n ;\n@@ -2153,10 +2153,17 @@ rule__ListItem__Group_3__1__Impl\n }\n :\n (\n+(\n+{ before(grammarAccess.getListItemAccess().getDocReferencesAssignment_3_1()); }\n+(rule__ListItem__DocReferencesAssignment_3_1)\n+{ after(grammarAccess.getListItemAccess().getDocReferencesAssignment_3_1()); }\n+)\n+(\n { before(grammarAccess.getListItemAccess().getDocReferencesAssignment_3_1()); }\n (rule__ListItem__DocReferencesAssignment_3_1)*\n { after(grammarAccess.getListItemAccess().getDocReferencesAssignment_3_1()); }\n )\n+)\n \n ;\n finally {\n@@ -2249,10 +2256,17 @@ rule__ListItem__Group_4__1__Impl\n }\n :\n (\n+(\n+{ before(grammarAccess.getListItemAccess().getItemReferencesAssignment_4_1()); }\n+(rule__ListItem__ItemReferencesAssignment_4_1)\n+{ after(grammarAccess.getListItemAccess().getItemReferencesAssignment_4_1()); }\n+)\n+(\n { before(grammarAccess.getListItemAccess().getItemReferencesAssignment_4_1()); }\n (rule__ListItem__ItemReferencesAssignment_4_1)*\n { after(grammarAccess.getListItemAccess().getItemReferencesAssignment_4_1()); }\n )\n+)\n \n ;\n finally {\n@@ -2345,10 +2359,17 @@ rule__ListItem__Group_5__1__Impl\n }\n :\n (\n+(\n+{ before(grammarAccess.getListItemAccess().getModelReferencesAssignment_5_1()); }\n+(rule__ListItem__ModelReferencesAssignment_5_1)\n+{ after(grammarAccess.getListItemAccess().getModelReferencesAssignment_5_1()); }\n+)\n+(\n { before(grammarAccess.getListItemAccess().getModelReferencesAssignment_5_1()); }\n (rule__ListItem__ModelReferencesAssignment_5_1)*\n { after(grammarAccess.getListItemAccess().getModelReferencesAssignment_5_1()); }\n )\n+)\n \n ;\n finally {\n@@ -2393,14 +2414,14 @@ finally {\n \n \n \n-rule__Specification__IdAssignment_1\n+rule__Specification__NameAssignment_1\n @init {\n \t\tint stackSize = keepStackSize();\n }\n :\n (\n-{ before(grammarAccess.getSpecificationAccess().getIdIDTerminalRuleCall_1_0()); }\n-\tRULE_ID{ after(grammarAccess.getSpecificationAccess().getIdIDTerminalRuleCall_1_0()); }\n+{ before(grammarAccess.getSpecificationAccess().getNameIDTerminalRuleCall_1_0()); }\n+\tRULE_ID{ after(grammarAccess.getSpecificationAccess().getNameIDTerminalRuleCall_1_0()); }\n )\n \n ;\n@@ -2423,14 +2444,14 @@ finally {\n \trestoreStackSize(stackSize);\n }\n \n-rule__Refinement__IdAssignment_1\n+rule__Refinement__NameAssignment_1\n @init {\n \t\tint stackSize = keepStackSize();\n }\n :\n (\n-{ before(grammarAccess.getRefinementAccess().getIdIDTerminalRuleCall_1_0()); }\n-\tRULE_ID{ after(grammarAccess.getRefinementAccess().getIdIDTerminalRuleCall_1_0()); }\n+{ before(grammarAccess.getRefinementAccess().getNameIDTerminalRuleCall_1_0()); }\n+\tRULE_ID{ after(grammarAccess.getRefinementAccess().getNameIDTerminalRuleCall_1_0()); }\n )\n \n ;\n@@ -2483,14 +2504,14 @@ finally {\n \trestoreStackSize(stackSize);\n }\n \n-rule__Intent__IdAssignment_1\n+rule__Intent__NameAssignment_1\n @init {\n \t\tint stackSize = keepStackSize();\n }\n :\n (\n-{ before(grammarAccess.getIntentAccess().getIdIDTerminalRuleCall_1_0()); }\n-\tRULE_ID{ after(grammarAccess.getIntentAccess().getIdIDTerminalRuleCall_1_0()); }\n+{ before(grammarAccess.getIntentAccess().getNameIDTerminalRuleCall_1_0()); }\n+\tRULE_ID{ after(grammarAccess.getIntentAccess().getNameIDTerminalRuleCall_1_0()); }\n )\n \n ;\n@@ -2528,6 +2549,22 @@ finally {\n \trestoreStackSize(stackSize);\n }\n \n+rule__IntentType__TypeNameAssignment\n+ @init {\n+\t\tint stackSize = keepStackSize();\n+ }\n+:\n+(\n+{ before(grammarAccess.getIntentTypeAccess().getTypeNameAlternatives_0()); }\n+(rule__IntentType__TypeNameAlternatives_0)\n+{ after(grammarAccess.getIntentTypeAccess().getTypeNameAlternatives_0()); }\n+)\n+\n+;\n+finally {\n+\trestoreStackSize(stackSize);\n+}\n+\n rule__Decomposition__TypeAssignment_0\n @init {\n \t\tint stackSize = keepStackSize();\n@@ -2543,14 +2580,14 @@ finally {\n \trestoreStackSize(stackSize);\n }\n \n-rule__Decomposition__IdAssignment_1\n+rule__Decomposition__NameAssignment_1\n @init {\n \t\tint stackSize = keepStackSize();\n }\n :\n (\n-{ before(grammarAccess.getDecompositionAccess().getIdIDTerminalRuleCall_1_0()); }\n-\tRULE_ID{ after(grammarAccess.getDecompositionAccess().getIdIDTerminalRuleCall_1_0()); }\n+{ before(grammarAccess.getDecompositionAccess().getNameIDTerminalRuleCall_1_0()); }\n+\tRULE_ID{ after(grammarAccess.getDecompositionAccess().getNameIDTerminalRuleCall_1_0()); }\n )\n \n ;\n@@ -2618,6 +2655,22 @@ finally {\n \trestoreStackSize(stackSize);\n }\n \n+rule__DecompositionType__TypeNameAssignment\n+ @init {\n+\t\tint stackSize = keepStackSize();\n+ }\n+:\n+(\n+{ before(grammarAccess.getDecompositionTypeAccess().getTypeNameAlternatives_0()); }\n+(rule__DecompositionType__TypeNameAlternatives_0)\n+{ after(grammarAccess.getDecompositionTypeAccess().getTypeNameAlternatives_0()); }\n+)\n+\n+;\n+finally {\n+\trestoreStackSize(stackSize);\n+}\n+\n rule__Document__EntriesAssignment_1\n @init {\n \t\tint stackSize = keepStackSize();\n@@ -2633,6 +2686,22 @@ finally {\n \trestoreStackSize(stackSize);\n }\n \n+rule__DocItemType__TypeNameAssignment\n+ @init {\n+\t\tint stackSize = keepStackSize();\n+ }\n+:\n+(\n+{ before(grammarAccess.getDocItemTypeAccess().getTypeNameAlternatives_0()); }\n+(rule__DocItemType__TypeNameAlternatives_0)\n+{ after(grammarAccess.getDocItemTypeAccess().getTypeNameAlternatives_0()); }\n+)\n+\n+;\n+finally {\n+\trestoreStackSize(stackSize);\n+}\n+\n rule__DocItem__TypeAssignment_0\n @init {\n \t\tint stackSize = keepStackSize();\n@@ -2648,14 +2717,14 @@ finally {\n \trestoreStackSize(stackSize);\n }\n \n-rule__DocItem__IdAssignment_1\n+rule__DocItem__NameAssignment_1\n @init {\n \t\tint stackSize = keepStackSize();\n }\n :\n (\n-{ before(grammarAccess.getDocItemAccess().getIdIDTerminalRuleCall_1_0()); }\n-\tRULE_ID{ after(grammarAccess.getDocItemAccess().getIdIDTerminalRuleCall_1_0()); }\n+{ before(grammarAccess.getDocItemAccess().getNameIDTerminalRuleCall_1_0()); }\n+\tRULE_ID{ after(grammarAccess.getDocItemAccess().getNameIDTerminalRuleCall_1_0()); }\n )\n \n ;\n@@ -2678,6 +2747,22 @@ finally {\n \trestoreStackSize(stackSize);\n }\n \n+rule__ModelType__TypeNameAssignment\n+ @init {\n+\t\tint stackSize = keepStackSize();\n+ }\n+:\n+(\n+{ before(grammarAccess.getModelTypeAccess().getTypeNameAlternatives_0()); }\n+(rule__ModelType__TypeNameAlternatives_0)\n+{ after(grammarAccess.getModelTypeAccess().getTypeNameAlternatives_0()); }\n+)\n+\n+;\n+finally {\n+\trestoreStackSize(stackSize);\n+}\n+\n rule__ModelItem__TypeAssignment_0\n @init {\n \t\tint stackSize = keepStackSize();\n@@ -2693,14 +2778,14 @@ finally {\n \trestoreStackSize(stackSize);\n }\n \n-rule__ModelItem__IdAssignment_1\n+rule__ModelItem__NameAssignment_1\n @init {\n \t\tint stackSize = keepStackSize();\n }\n :\n (\n-{ before(grammarAccess.getModelItemAccess().getIdIDTerminalRuleCall_1_0()); }\n-\tRULE_ID{ after(grammarAccess.getModelItemAccess().getIdIDTerminalRuleCall_1_0()); }\n+{ before(grammarAccess.getModelItemAccess().getNameIDTerminalRuleCall_1_0()); }\n+\tRULE_ID{ after(grammarAccess.getModelItemAccess().getNameIDTerminalRuleCall_1_0()); }\n )\n \n ;\n@@ -2723,6 +2808,22 @@ finally {\n \trestoreStackSize(stackSize);\n }\n \n+rule__ListItemType__TypeNameAssignment\n+ @init {\n+\t\tint stackSize = keepStackSize();\n+ }\n+:\n+(\n+{ before(grammarAccess.getListItemTypeAccess().getTypeNameAlternatives_0()); }\n+(rule__ListItemType__TypeNameAlternatives_0)\n+{ after(grammarAccess.getListItemTypeAccess().getTypeNameAlternatives_0()); }\n+)\n+\n+;\n+finally {\n+\trestoreStackSize(stackSize);\n+}\n+\n rule__ListItem__TypeAssignment_0\n @init {\n \t\tint stackSize = keepStackSize();\n@@ -2738,14 +2839,14 @@ finally {\n \trestoreStackSize(stackSize);\n }\n \n-rule__ListItem__IdAssignment_1\n+rule__ListItem__NameAssignment_1\n @init {\n \t\tint stackSize = keepStackSize();\n }\n :\n (\n-{ before(grammarAccess.getListItemAccess().getIdIDTerminalRuleCall_1_0()); }\n-\tRULE_ID{ after(grammarAccess.getListItemAccess().getIdIDTerminalRuleCall_1_0()); }\n+{ before(grammarAccess.getListItemAccess().getNameIDTerminalRuleCall_1_0()); }\n+\tRULE_ID{ after(grammarAccess.getListItemAccess().getNameIDTerminalRuleCall_1_0()); }\n )\n \n ;", "raw_url": "https://github.com/nasa/CertWare/raw/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent.ui%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fui%2Fcontentassist%2Fantlr%2Finternal%2FInternalIntentSpecification.g", "sha": "2f0f83febe026383eed03a5f02b7967fd5fc4101", "status": "modified" }, { "additions": 37, "blob_url": "https://github.com/nasa/CertWare/blob/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent.ui%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fui%2Fcontentassist%2Fantlr%2Finternal%2FInternalIntentSpecificationLexer.java", "changes": 74, "contents_url": "https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent.ui%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fui%2Fcontentassist%2Fantlr%2Finternal%2FInternalIntentSpecificationLexer.java?ref=27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9", "deletions": 37, "filename": "net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecificationLexer.java", "new_code": " // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2930:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2930:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2930:11: ( '^' )?\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2930:11: '^'\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2930:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2932:10: ( ( '0' .. '9' )+ )\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2932:12: ( '0' .. '9' )+\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2932:12: ( '0' .. '9' )+\n \t // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2932:13: '0' .. '9'\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2934:13: ( ( '\\\"' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\"' ) ) )* '\\\"' | '\\\\'' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\\'' ) ) )* '\\\\'' ) )\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2934:15: ( '\\\"' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\"' ) ) )* '\\\"' | '\\\\'' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\\'' ) ) )* '\\\\'' )\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2934:15: ( '\\\"' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\"' ) ) )* '\\\"' | '\\\\'' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\\'' ) ) )* '\\\\'' )\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2934:16: '\\\"' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\"' ) ) )* '\\\"'\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2934:20: ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\"' ) ) )*\n \t // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2934:21: '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' )\n \t // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2934:66: ~ ( ( '\\\\\\\\' | '\\\"' ) )\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2934:86: '\\\\'' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\\'' ) ) )* '\\\\''\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2934:91: ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\\'' ) ) )*\n \t // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2934:92: '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' )\n \t // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2934:137: ~ ( ( '\\\\\\\\' | '\\\\'' ) )\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2936:17: ( '/*' ( options {greedy=false; } : . )* '*/' )\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2936:19: '/*' ( options {greedy=false; } : . )* '*/'\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2936:24: ( options {greedy=false; } : . )*\n \t // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2936:52: .\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2938:17: ( '//' (~ ( ( '\\\\n' | '\\\\r' ) ) )* ( ( '\\\\r' )? '\\\\n' )? )\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2938:19: '//' (~ ( ( '\\\\n' | '\\\\r' ) ) )* ( ( '\\\\r' )? '\\\\n' )?\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2938:24: (~ ( ( '\\\\n' | '\\\\r' ) ) )*\n \t // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2938:24: ~ ( ( '\\\\n' | '\\\\r' ) )\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2938:40: ( ( '\\\\r' )? '\\\\n' )?\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2938:41: ( '\\\\r' )? '\\\\n'\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2938:41: ( '\\\\r' )?\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2938:41: '\\\\r'\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2940:9: ( ( ' ' | '\\\\t' | '\\\\r' | '\\\\n' )+ )\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2940:11: ( ' ' | '\\\\t' | '\\\\r' | '\\\\n' )+\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2940:11: ( ' ' | '\\\\t' | '\\\\r' | '\\\\n' )+\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2942:16: ( . )\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2942:18: .", "new_methods": [], "old_code": " // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2829:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2829:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2829:11: ( '^' )?\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2829:11: '^'\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2829:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2831:10: ( ( '0' .. '9' )+ )\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2831:12: ( '0' .. '9' )+\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2831:12: ( '0' .. '9' )+\n \t // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2831:13: '0' .. '9'\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2833:13: ( ( '\\\"' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\"' ) ) )* '\\\"' | '\\\\'' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\\'' ) ) )* '\\\\'' ) )\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2833:15: ( '\\\"' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\"' ) ) )* '\\\"' | '\\\\'' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\\'' ) ) )* '\\\\'' )\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2833:15: ( '\\\"' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\"' ) ) )* '\\\"' | '\\\\'' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\\'' ) ) )* '\\\\'' )\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2833:16: '\\\"' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\"' ) ) )* '\\\"'\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2833:20: ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\"' ) ) )*\n \t // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2833:21: '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' )\n \t // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2833:66: ~ ( ( '\\\\\\\\' | '\\\"' ) )\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2833:86: '\\\\'' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\\'' ) ) )* '\\\\''\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2833:91: ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\\'' ) ) )*\n \t // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2833:92: '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' )\n \t // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2833:137: ~ ( ( '\\\\\\\\' | '\\\\'' ) )\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2835:17: ( '/*' ( options {greedy=false; } : . )* '*/' )\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2835:19: '/*' ( options {greedy=false; } : . )* '*/'\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2835:24: ( options {greedy=false; } : . )*\n \t // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2835:52: .\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2837:17: ( '//' (~ ( ( '\\\\n' | '\\\\r' ) ) )* ( ( '\\\\r' )? '\\\\n' )? )\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2837:19: '//' (~ ( ( '\\\\n' | '\\\\r' ) ) )* ( ( '\\\\r' )? '\\\\n' )?\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2837:24: (~ ( ( '\\\\n' | '\\\\r' ) ) )*\n \t // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2837:24: ~ ( ( '\\\\n' | '\\\\r' ) )\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2837:40: ( ( '\\\\r' )? '\\\\n' )?\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2837:41: ( '\\\\r' )? '\\\\n'\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2837:41: ( '\\\\r' )?\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2837:41: '\\\\r'\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2839:9: ( ( ' ' | '\\\\t' | '\\\\r' | '\\\\n' )+ )\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2839:11: ( ' ' | '\\\\t' | '\\\\r' | '\\\\n' )+\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2839:11: ( ' ' | '\\\\t' | '\\\\r' | '\\\\n' )+\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2841:16: ( . )\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2841:18: .", "old_methods": [], "patch": "@@ -846,10 +846,10 @@ public final void mRULE_ID() throws RecognitionException {\n try {\n int _type = RULE_ID;\n int _channel = DEFAULT_TOKEN_CHANNEL;\n- // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2829:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )\n- // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2829:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*\n+ // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2930:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )\n+ // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2930:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*\n {\n- // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2829:11: ( '^' )?\n+ // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2930:11: ( '^' )?\n int alt1=2;\n int LA1_0 = input.LA(1);\n \n@@ -858,7 +858,7 @@ public final void mRULE_ID() throws RecognitionException {\n }\n switch (alt1) {\n case 1 :\n- // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2829:11: '^'\n+ // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2930:11: '^'\n {\n match('^'); \n \n@@ -876,7 +876,7 @@ public final void mRULE_ID() throws RecognitionException {\n recover(mse);\n throw mse;}\n \n- // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2829:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*\n+ // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2930:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*\n loop2:\n do {\n int alt2=2;\n@@ -925,10 +925,10 @@ public final void mRULE_INT() throws RecognitionException {\n try {\n int _type = RULE_INT;\n int _channel = DEFAULT_TOKEN_CHANNEL;\n- // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2831:10: ( ( '0' .. '9' )+ )\n- // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2831:12: ( '0' .. '9' )+\n+ // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2932:10: ( ( '0' .. '9' )+ )\n+ // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2932:12: ( '0' .. '9' )+\n {\n- // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2831:12: ( '0' .. '9' )+\n+ // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2932:12: ( '0' .. '9' )+\n int cnt3=0;\n loop3:\n do {\n@@ -942,7 +942,7 @@ public final void mRULE_INT() throws RecognitionException {\n \n switch (alt3) {\n \tcase 1 :\n- \t // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2831:13: '0' .. '9'\n+ \t // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2932:13: '0' .. '9'\n \t {\n \t matchRange('0','9'); \n \n@@ -974,10 +974,10 @@ public final void mRULE_STRING() throws RecognitionException {\n try {\n int _type = RULE_STRING;\n int _channel = DEFAULT_TOKEN_CHANNEL;\n- // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2833:13: ( ( '\\\"' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\"' ) ) )* '\\\"' | '\\\\'' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\\'' ) ) )* '\\\\'' ) )\n- // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2833:15: ( '\\\"' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\"' ) ) )* '\\\"' | '\\\\'' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\\'' ) ) )* '\\\\'' )\n+ // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2934:13: ( ( '\\\"' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\"' ) ) )* '\\\"' | '\\\\'' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\\'' ) ) )* '\\\\'' ) )\n+ // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2934:15: ( '\\\"' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\"' ) ) )* '\\\"' | '\\\\'' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\\'' ) ) )* '\\\\'' )\n {\n- // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2833:15: ( '\\\"' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\"' ) ) )* '\\\"' | '\\\\'' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\\'' ) ) )* '\\\\'' )\n+ // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2934:15: ( '\\\"' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\"' ) ) )* '\\\"' | '\\\\'' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\\'' ) ) )* '\\\\'' )\n int alt6=2;\n int LA6_0 = input.LA(1);\n \n@@ -995,10 +995,10 @@ else if ( (LA6_0=='\\'') ) {\n }\n switch (alt6) {\n case 1 :\n- // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2833:16: '\\\"' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\"' ) ) )* '\\\"'\n+ // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2934:16: '\\\"' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\"' ) ) )* '\\\"'\n {\n match('\\\"'); \n- // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2833:20: ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\"' ) ) )*\n+ // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2934:20: ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\"' ) ) )*\n loop4:\n do {\n int alt4=3;\n@@ -1014,7 +1014,7 @@ else if ( ((LA4_0>='\\u0000' && LA4_0<='!')||(LA4_0>='#' && LA4_0<='[')||(LA4_0>=\n \n switch (alt4) {\n \tcase 1 :\n- \t // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2833:21: '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' )\n+ \t // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2934:21: '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' )\n \t {\n \t match('\\\\'); \n \t if ( input.LA(1)=='\\\"'||input.LA(1)=='\\''||input.LA(1)=='\\\\'||input.LA(1)=='b'||input.LA(1)=='f'||input.LA(1)=='n'||input.LA(1)=='r'||(input.LA(1)>='t' && input.LA(1)<='u') ) {\n@@ -1030,7 +1030,7 @@ else if ( ((LA4_0>='\\u0000' && LA4_0<='!')||(LA4_0>='#' && LA4_0<='[')||(LA4_0>=\n \t }\n \t break;\n \tcase 2 :\n- \t // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2833:66: ~ ( ( '\\\\\\\\' | '\\\"' ) )\n+ \t // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2934:66: ~ ( ( '\\\\\\\\' | '\\\"' ) )\n \t {\n \t if ( (input.LA(1)>='\\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\\uFFFF') ) {\n \t input.consume();\n@@ -1055,10 +1055,10 @@ else if ( ((LA4_0>='\\u0000' && LA4_0<='!')||(LA4_0>='#' && LA4_0<='[')||(LA4_0>=\n }\n break;\n case 2 :\n- // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2833:86: '\\\\'' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\\'' ) ) )* '\\\\''\n+ // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2934:86: '\\\\'' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\\'' ) ) )* '\\\\''\n {\n match('\\''); \n- // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2833:91: ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\\'' ) ) )*\n+ // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2934:91: ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\\'' ) ) )*\n loop5:\n do {\n int alt5=3;\n@@ -1074,7 +1074,7 @@ else if ( ((LA5_0>='\\u0000' && LA5_0<='&')||(LA5_0>='(' && LA5_0<='[')||(LA5_0>=\n \n switch (alt5) {\n \tcase 1 :\n- \t // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2833:92: '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' )\n+ \t // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2934:92: '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' )\n \t {\n \t match('\\\\'); \n \t if ( input.LA(1)=='\\\"'||input.LA(1)=='\\''||input.LA(1)=='\\\\'||input.LA(1)=='b'||input.LA(1)=='f'||input.LA(1)=='n'||input.LA(1)=='r'||(input.LA(1)>='t' && input.LA(1)<='u') ) {\n@@ -1090,7 +1090,7 @@ else if ( ((LA5_0>='\\u0000' && LA5_0<='&')||(LA5_0>='(' && LA5_0<='[')||(LA5_0>=\n \t }\n \t break;\n \tcase 2 :\n- \t // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2833:137: ~ ( ( '\\\\\\\\' | '\\\\'' ) )\n+ \t // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2934:137: ~ ( ( '\\\\\\\\' | '\\\\'' ) )\n \t {\n \t if ( (input.LA(1)>='\\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\\uFFFF') ) {\n \t input.consume();\n@@ -1133,12 +1133,12 @@ public final void mRULE_ML_COMMENT() throws RecognitionException {\n try {\n int _type = RULE_ML_COMMENT;\n int _channel = DEFAULT_TOKEN_CHANNEL;\n- // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2835:17: ( '/*' ( options {greedy=false; } : . )* '*/' )\n- // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2835:19: '/*' ( options {greedy=false; } : . )* '*/'\n+ // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2936:17: ( '/*' ( options {greedy=false; } : . )* '*/' )\n+ // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2936:19: '/*' ( options {greedy=false; } : . )* '*/'\n {\n match(\"/*\"); \n \n- // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2835:24: ( options {greedy=false; } : . )*\n+ // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2936:24: ( options {greedy=false; } : . )*\n loop7:\n do {\n int alt7=2;\n@@ -1163,7 +1163,7 @@ else if ( ((LA7_0>='\\u0000' && LA7_0<=')')||(LA7_0>='+' && LA7_0<='\\uFFFF')) ) {\n \n switch (alt7) {\n \tcase 1 :\n- \t // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2835:52: .\n+ \t // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2936:52: .\n \t {\n \t matchAny(); \n \n@@ -1193,12 +1193,12 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {\n try {\n int _type = RULE_SL_COMMENT;\n int _channel = DEFAULT_TOKEN_CHANNEL;\n- // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2837:17: ( '//' (~ ( ( '\\\\n' | '\\\\r' ) ) )* ( ( '\\\\r' )? '\\\\n' )? )\n- // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2837:19: '//' (~ ( ( '\\\\n' | '\\\\r' ) ) )* ( ( '\\\\r' )? '\\\\n' )?\n+ // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2938:17: ( '//' (~ ( ( '\\\\n' | '\\\\r' ) ) )* ( ( '\\\\r' )? '\\\\n' )? )\n+ // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2938:19: '//' (~ ( ( '\\\\n' | '\\\\r' ) ) )* ( ( '\\\\r' )? '\\\\n' )?\n {\n match(\"//\"); \n \n- // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2837:24: (~ ( ( '\\\\n' | '\\\\r' ) ) )*\n+ // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2938:24: (~ ( ( '\\\\n' | '\\\\r' ) ) )*\n loop8:\n do {\n int alt8=2;\n@@ -1211,7 +1211,7 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {\n \n switch (alt8) {\n \tcase 1 :\n- \t // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2837:24: ~ ( ( '\\\\n' | '\\\\r' ) )\n+ \t // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2938:24: ~ ( ( '\\\\n' | '\\\\r' ) )\n \t {\n \t if ( (input.LA(1)>='\\u0000' && input.LA(1)<='\\t')||(input.LA(1)>='\\u000B' && input.LA(1)<='\\f')||(input.LA(1)>='\\u000E' && input.LA(1)<='\\uFFFF') ) {\n \t input.consume();\n@@ -1231,7 +1231,7 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {\n }\n } while (true);\n \n- // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2837:40: ( ( '\\\\r' )? '\\\\n' )?\n+ // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2938:40: ( ( '\\\\r' )? '\\\\n' )?\n int alt10=2;\n int LA10_0 = input.LA(1);\n \n@@ -1240,9 +1240,9 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {\n }\n switch (alt10) {\n case 1 :\n- // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2837:41: ( '\\\\r' )? '\\\\n'\n+ // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2938:41: ( '\\\\r' )? '\\\\n'\n {\n- // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2837:41: ( '\\\\r' )?\n+ // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2938:41: ( '\\\\r' )?\n int alt9=2;\n int LA9_0 = input.LA(1);\n \n@@ -1251,7 +1251,7 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {\n }\n switch (alt9) {\n case 1 :\n- // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2837:41: '\\\\r'\n+ // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2938:41: '\\\\r'\n {\n match('\\r'); \n \n@@ -1283,10 +1283,10 @@ public final void mRULE_WS() throws RecognitionException {\n try {\n int _type = RULE_WS;\n int _channel = DEFAULT_TOKEN_CHANNEL;\n- // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2839:9: ( ( ' ' | '\\\\t' | '\\\\r' | '\\\\n' )+ )\n- // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2839:11: ( ' ' | '\\\\t' | '\\\\r' | '\\\\n' )+\n+ // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2940:9: ( ( ' ' | '\\\\t' | '\\\\r' | '\\\\n' )+ )\n+ // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2940:11: ( ' ' | '\\\\t' | '\\\\r' | '\\\\n' )+\n {\n- // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2839:11: ( ' ' | '\\\\t' | '\\\\r' | '\\\\n' )+\n+ // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2940:11: ( ' ' | '\\\\t' | '\\\\r' | '\\\\n' )+\n int cnt11=0;\n loop11:\n do {\n@@ -1340,8 +1340,8 @@ public final void mRULE_ANY_OTHER() throws RecognitionException {\n try {\n int _type = RULE_ANY_OTHER;\n int _channel = DEFAULT_TOKEN_CHANNEL;\n- // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2841:16: ( . )\n- // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2841:18: .\n+ // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2942:16: ( . )\n+ // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2942:18: .\n {\n matchAny(); \n ", "raw_url": "https://github.com/nasa/CertWare/raw/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent.ui%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fui%2Fcontentassist%2Fantlr%2Finternal%2FInternalIntentSpecificationLexer.java", "sha": "1ea410586be287ba859369930d85590f6df88798", "status": "modified" }, { "additions": 169, "blob_url": "https://github.com/nasa/CertWare/blob/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent.ui%2Fsrc%2Fnet%2Fcertware%2Fintent%2Fui%2Flabeling%2FIntentSpecificationLabelProvider.xtend", "changes": 181, "contents_url": "https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent.ui%2Fsrc%2Fnet%2Fcertware%2Fintent%2Fui%2Flabeling%2FIntentSpecificationLabelProvider.xtend?ref=27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9", "deletions": 12, "filename": "net.certware.intent.ui/src/net/certware/intent/ui/labeling/IntentSpecificationLabelProvider.xtend", "new_code": "* NOT generated by Xtext\nimport net.certware.intent.intentSpecification.Decomposition\nimport net.certware.intent.intentSpecification.DocItem\nimport net.certware.intent.intentSpecification.Document\nimport net.certware.intent.intentSpecification.Intent\nimport net.certware.intent.intentSpecification.ListItem\nimport net.certware.intent.intentSpecification.ModelItem\nimport net.certware.intent.intentSpecification.Refinement\nimport net.certware.intent.intentSpecification.Specification\nimport org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider\nimport org.eclipse.xtext.ui.label.DefaultEObjectLabelProvider\nclass IntentSpecificationLabelProvider extends DefaultEObjectLabelProvider {\n\tnew(AdapterFactoryLabelProvider delegate) {\n\tdef image(Refinement e) {\n\t\t'obj16/refinement.gif'\n\t}\n\t\n\tdef image(Intent e) {\n\t\t'obj16/intent.gif'\n\t}\n\t\n\tdef image(Specification e) {\n\t\t'obj16/specification.gif'\n\t}\n\t\n\tdef image(Decomposition e) {\n\t\t'obj16/decomposition.gif'\n\t}\n\t\n\tdef image(Document e) {\n\t\t'obj16/document.gif'\n\t}\n\t\n\tdef image(ModelItem e) {\n\t\t'obj16/modelitem.gif'\n\t}\n\t\n\tdef image(ListItem e) {\n\t\t'obj16/listitem.gif'\n\t}\n\t\n\t/*\n\t * text responses\n\t */\n\tdef text(Intent e) {\n\t\tvar type = e.type\n\t\tvar typeName = type.typeName\n\t\t// \ttypeName=('basic' | 'purpose' | 'principles' | 'models' | 'design' | 'implementation' | 'operation')\n\t\tif ('basic'.equals(typeName)) {\n\t\t\treturn 'Basic' + ' ' + e.name\n\t\t}\n\t\tif ('purpose'.equals(typeName)) {\n\t\t\treturn 'Purpose' + ' ' + e.name\n\t\t}\n\t\tif ('principles'.equals(typeName)) {\n\t\t\treturn 'Principles' + ' ' + e.name\n\t\t}\n\t\tif ('models'.equals(typeName)) {\n\t\t\treturn 'Models' + ' ' + e.name\n\t\t}\n\t\tif ('design'.equals(typeName)) {\n\t\t\treturn 'Design' + ' ' + e.name\n\t\t}\n\t\tif ('implementation'.equals(typeName)) {\n\t\t\treturn 'Implementation' + ' ' + e.name\n\t\t}\n\t\tif ('operation'.equals(typeName)) {\n\t\t\treturn 'Operation' + ' ' + e.name\n\t\t}\n\t\t'Intent' + ' ' + e.name\n\t}\n\t\n\tdef text(Refinement e) {\n\t\t'Refinement' + ' ' + e.name\n\t}\n\t\n\tdef text(Decomposition e) {\n\t\tvar type = e.type\n\t\tvar typeName = type.typeName\n\t\tif ( 'environment'.equals(typeName)) {\n\t\t\treturn 'Environment' + ' ' + e.name\n\t\t}\n\t\tif ('operator'.equals(typeName)) {\n\t\t\treturn 'Operator' + ' ' + e.name\n\t\t}\n\t\tif ('system'.equals(typeName)) {\n\t\t\treturn 'System' + ' ' + e.name\n\t\t}\n\t\tif ('verification'.equals(typeName)) {\n\t\t\treturn 'V&V' + ' ' + e.name\n\t\t}\n\t\t'Decomposition' + ' ' + e.name\n\t}\n\n\tdef text(Document e) {\n\t\t'Document' // has no name or ID\n\t}\n\t\n\tdef text(DocItem e) {\n\t\tvar type = e.type\n\t\tvar typeName = type.typeName\n\t\tif ('condition'.equals(typeName)) {\n\t\t\treturn 'Condition' + ' ' + e.name\n\t\t}\n\t\tif ('figure'.equals(typeName)) {\n\t\t\treturn 'Figure' + ' ' + e.name\n\t\t}\n\t\tif ('break'.equals(typeName)) {\n\t\t\treturn 'Break'\n\t\t}\n\t\tif ('model'.equals(typeName)) {\n\t\t\treturn 'Model' + ' ' + e.name\n\t\t}\n\t\tif ('paragraph'.equals(typeName)) {\n\t\t\treturn 'Paragraph' + ' ' + e.name\n\t\t}\n\t\tif ('section'.equals(typeName)) {\n\t\t\treturn 'Section' + ' ' + e.name\n\t\t}\n\t\tif ('table'.equals(typeName)) {\n\t\t\treturn 'Table' + ' ' + e.name\n\t\t}\n\n\t\t'Item' + ' ' + e.name\t\t\n\t}\n\t\n\t\n\tdef text(ModelItem e) {\n\t\tvar type = e.type\n\t\tvar typeName = type.typeName\n\t\t\n\t\tif ('output'.equals(typeName)){\n\t\t\treturn 'Output' + ' ' + e.name\n\t\t}\n\t\tif ('mode'.equals(typeName)){\n\t\t\treturn 'Mode' + ' ' + e.name\n\t\t}\n\t\tif ('state'.equals(typeName)) {\n\t\t\treturn 'State' + ' ' + e.name\n\t\t}\n\t\tif ('macro'.equals(typeName)) {\n\t\t\treturn 'Macro' + ' ' + e.name\n\t\t}\n\t\tif ('function'.equals(typeName)) {\n\t\t\treturn 'Function' + ' ' + e.name\n\t\t}\n\t\tif ('input'.equals(typeName)) {\n\t\t\treturn 'Input' + ' ' + e.name\n\t\t}\n\t\t'Model' + ' ' + e.name\n\t}\n\t\n\tdef text(ListItem e) {\n\t\tvar type = e.type\n\t\t\n\t\tif ('hazard'.equals(type.typeName)) {\n\t\t\treturn 'Hazard' + ' ' + e.name\n\t\t}\n\t\tif ('requirement'.equals(type.typeName)) {\n\t\t\treturn 'Requirement' + ' ' + e.name\n\t\t}\n\t\tif ('goal'.equals(type.typeName)) {\n\t\t\treturn 'Goal' + ' ' + e.name\n\t\t} \n\t\tif ('constraint'.equals(type.typeName)) {\n\t\t\treturn 'Constraint' + ' ' + e.name\t\t\t\n\t\t}\n\t\t'List' + ' ' + e.name\n\t}", "new_methods": [ { "arguments": [ "Refinement e" ], "filename": "net.certware.intent.ui/src/net/certware/intent/ui/labeling/IntentSpecificationLabelProvider.xtend", "implementation": "'obj16/refinement.gif'", "signature": "def image(Refinement e)" }, { "arguments": [ "Intent e" ], "filename": "net.certware.intent.ui/src/net/certware/intent/ui/labeling/IntentSpecificationLabelProvider.xtend", "implementation": "'obj16/intent.gif'", "signature": "def image(Intent e)" }, { "arguments": [ "Specification e" ], "filename": "net.certware.intent.ui/src/net/certware/intent/ui/labeling/IntentSpecificationLabelProvider.xtend", "implementation": "'obj16/specification.gif'", "signature": "def image(Specification e)" }, { "arguments": [ "Decomposition e" ], "filename": "net.certware.intent.ui/src/net/certware/intent/ui/labeling/IntentSpecificationLabelProvider.xtend", "implementation": "'obj16/decomposition.gif'", "signature": "def image(Decomposition e)" }, { "arguments": [ "Document e" ], "filename": "net.certware.intent.ui/src/net/certware/intent/ui/labeling/IntentSpecificationLabelProvider.xtend", "implementation": "'obj16/document.gif'", "signature": "def image(Document e)" }, { "arguments": [ "ModelItem e" ], "filename": "net.certware.intent.ui/src/net/certware/intent/ui/labeling/IntentSpecificationLabelProvider.xtend", "implementation": "'obj16/modelitem.gif'", "signature": "def image(ModelItem e)" }, { "arguments": [ "ListItem e" ], "filename": "net.certware.intent.ui/src/net/certware/intent/ui/labeling/IntentSpecificationLabelProvider.xtend", "implementation": "'obj16/listitem.gif'", "signature": "def image(ListItem e)" }, { "arguments": [ "Intent e" ], "filename": "net.certware.intent.ui/src/net/certware/intent/ui/labeling/IntentSpecificationLabelProvider.xtend", "implementation": "var type = e.type\n\t\tvar typeName = type.typeName\n\t\t// \ttypeName=('basic' | 'purpose' | 'principles' | 'models' | 'design' | 'implementation' | 'operation')\n\t\tif ('basic'.equals(typeName)) {\n\t\t\treturn 'Basic' + ' ' + e.name", "signature": "def text(Intent e)" }, { "arguments": [ "Refinement e" ], "filename": "net.certware.intent.ui/src/net/certware/intent/ui/labeling/IntentSpecificationLabelProvider.xtend", "implementation": "'Refinement' + ' ' + e.name", "signature": "def text(Refinement e)" }, { "arguments": [ "Decomposition e" ], "filename": "net.certware.intent.ui/src/net/certware/intent/ui/labeling/IntentSpecificationLabelProvider.xtend", "implementation": "var type = e.type\n\t\tvar typeName = type.typeName\n\t\tif ( 'environment'.equals(typeName)) {\n\t\t\treturn 'Environment' + ' ' + e.name", "signature": "def text(Decomposition e)" }, { "arguments": [ "Document e" ], "filename": "net.certware.intent.ui/src/net/certware/intent/ui/labeling/IntentSpecificationLabelProvider.xtend", "implementation": "'Document' // has no name or ID", "signature": "def text(Document e)" }, { "arguments": [ "DocItem e" ], "filename": "net.certware.intent.ui/src/net/certware/intent/ui/labeling/IntentSpecificationLabelProvider.xtend", "implementation": "var type = e.type\n\t\tvar typeName = type.typeName\n\t\tif ('condition'.equals(typeName)) {\n\t\t\treturn 'Condition' + ' ' + e.name", "signature": "def text(DocItem e)" }, { "arguments": [ "ModelItem e" ], "filename": "net.certware.intent.ui/src/net/certware/intent/ui/labeling/IntentSpecificationLabelProvider.xtend", "implementation": "var type = e.type\n\t\tvar typeName = type.typeName\n\t\t\n\t\tif ('output'.equals(typeName)){\n\t\t\treturn 'Output' + ' ' + e.name", "signature": "def text(ModelItem e)" }, { "arguments": [ "ListItem e" ], "filename": "net.certware.intent.ui/src/net/certware/intent/ui/labeling/IntentSpecificationLabelProvider.xtend", "implementation": "var type = e.type\n\t\t\n\t\tif ('hazard'.equals(type.typeName)) {\n\t\t\treturn 'Hazard' + ' ' + e.name", "signature": "def text(ListItem e)" } ], "old_code": "* generated by Xtext\nclass IntentSpecificationLabelProvider extends org.eclipse.xtext.ui.label.DefaultEObjectLabelProvider {\n\tnew(org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider delegate) {\n\t// Labels and icons can be computed like this:\n\t\n//\tdef text(Greeting ele) {\n//\t\t'A greeting to ' + ele.name\n//\t}\n//\n//\tdef image(Greeting ele) {\n//\t\t'Greeting.gif'\n//\t}", "old_methods": [ { "arguments": [ "Greeting ele" ], "filename": "net.certware.intent.ui/src/net/certware/intent/ui/labeling/IntentSpecificationLabelProvider.xtend", "implementation": "//\t\t'A greeting to ' + ele.name\n//", "signature": "def text(Greeting ele)" }, { "arguments": [ "Greeting ele" ], "filename": "net.certware.intent.ui/src/net/certware/intent/ui/labeling/IntentSpecificationLabelProvider.xtend", "implementation": "//\t\t'Greeting.gif'\n//", "signature": "def image(Greeting ele)" } ], "patch": "@@ -1,29 +1,186 @@\n /*\n-* generated by Xtext\n+* NOT generated by Xtext\n */\n package net.certware.intent.ui.labeling\n \n import com.google.inject.Inject\n+import net.certware.intent.intentSpecification.Decomposition\n+import net.certware.intent.intentSpecification.DocItem\n+import net.certware.intent.intentSpecification.Document\n+import net.certware.intent.intentSpecification.Intent\n+import net.certware.intent.intentSpecification.ListItem\n+import net.certware.intent.intentSpecification.ModelItem\n+import net.certware.intent.intentSpecification.Refinement\n+import net.certware.intent.intentSpecification.Specification\n+import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider\n+import org.eclipse.xtext.ui.label.DefaultEObjectLabelProvider\n \n /**\n * Provides labels for a EObjects.\n * \n * see http://www.eclipse.org/Xtext/documentation.html#labelProvider\n */\n-class IntentSpecificationLabelProvider extends org.eclipse.xtext.ui.label.DefaultEObjectLabelProvider {\n+class IntentSpecificationLabelProvider extends DefaultEObjectLabelProvider {\n \n \t@Inject\n-\tnew(org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider delegate) {\n+\tnew(AdapterFactoryLabelProvider delegate) {\n \t\tsuper(delegate);\n \t}\n \n-\t// Labels and icons can be computed like this:\n-\t\n-//\tdef text(Greeting ele) {\n-//\t\t'A greeting to ' + ele.name\n-//\t}\n-//\n-//\tdef image(Greeting ele) {\n-//\t\t'Greeting.gif'\n-//\t}\n+\tdef image(Refinement e) {\n+\t\t'obj16/refinement.gif'\n+\t}\n+\t\n+\tdef image(Intent e) {\n+\t\t'obj16/intent.gif'\n+\t}\n+\t\n+\tdef image(Specification e) {\n+\t\t'obj16/specification.gif'\n+\t}\n+\t\n+\tdef image(Decomposition e) {\n+\t\t'obj16/decomposition.gif'\n+\t}\n+\t\n+\tdef image(Document e) {\n+\t\t'obj16/document.gif'\n+\t}\n+\t\n+\tdef image(ModelItem e) {\n+\t\t'obj16/modelitem.gif'\n+\t}\n+\t\n+\tdef image(ListItem e) {\n+\t\t'obj16/listitem.gif'\n+\t}\n+\t\n+\t/*\n+\t * text responses\n+\t */\n+\tdef text(Intent e) {\n+\t\tvar type = e.type\n+\t\tvar typeName = type.typeName\n+\t\t// \ttypeName=('basic' | 'purpose' | 'principles' | 'models' | 'design' | 'implementation' | 'operation')\n+\t\tif ('basic'.equals(typeName)) {\n+\t\t\treturn 'Basic' + ' ' + e.name\n+\t\t}\n+\t\tif ('purpose'.equals(typeName)) {\n+\t\t\treturn 'Purpose' + ' ' + e.name\n+\t\t}\n+\t\tif ('principles'.equals(typeName)) {\n+\t\t\treturn 'Principles' + ' ' + e.name\n+\t\t}\n+\t\tif ('models'.equals(typeName)) {\n+\t\t\treturn 'Models' + ' ' + e.name\n+\t\t}\n+\t\tif ('design'.equals(typeName)) {\n+\t\t\treturn 'Design' + ' ' + e.name\n+\t\t}\n+\t\tif ('implementation'.equals(typeName)) {\n+\t\t\treturn 'Implementation' + ' ' + e.name\n+\t\t}\n+\t\tif ('operation'.equals(typeName)) {\n+\t\t\treturn 'Operation' + ' ' + e.name\n+\t\t}\n+\t\t'Intent' + ' ' + e.name\n+\t}\n+\t\n+\tdef text(Refinement e) {\n+\t\t'Refinement' + ' ' + e.name\n+\t}\n+\t\n+\tdef text(Decomposition e) {\n+\t\tvar type = e.type\n+\t\tvar typeName = type.typeName\n+\t\tif ( 'environment'.equals(typeName)) {\n+\t\t\treturn 'Environment' + ' ' + e.name\n+\t\t}\n+\t\tif ('operator'.equals(typeName)) {\n+\t\t\treturn 'Operator' + ' ' + e.name\n+\t\t}\n+\t\tif ('system'.equals(typeName)) {\n+\t\t\treturn 'System' + ' ' + e.name\n+\t\t}\n+\t\tif ('verification'.equals(typeName)) {\n+\t\t\treturn 'V&V' + ' ' + e.name\n+\t\t}\n+\t\t'Decomposition' + ' ' + e.name\n+\t}\n+\n+\tdef text(Document e) {\n+\t\t'Document' // has no name or ID\n+\t}\n+\t\n+\tdef text(DocItem e) {\n+\t\tvar type = e.type\n+\t\tvar typeName = type.typeName\n+\t\tif ('condition'.equals(typeName)) {\n+\t\t\treturn 'Condition' + ' ' + e.name\n+\t\t}\n+\t\tif ('figure'.equals(typeName)) {\n+\t\t\treturn 'Figure' + ' ' + e.name\n+\t\t}\n+\t\tif ('break'.equals(typeName)) {\n+\t\t\treturn 'Break'\n+\t\t}\n+\t\tif ('model'.equals(typeName)) {\n+\t\t\treturn 'Model' + ' ' + e.name\n+\t\t}\n+\t\tif ('paragraph'.equals(typeName)) {\n+\t\t\treturn 'Paragraph' + ' ' + e.name\n+\t\t}\n+\t\tif ('section'.equals(typeName)) {\n+\t\t\treturn 'Section' + ' ' + e.name\n+\t\t}\n+\t\tif ('table'.equals(typeName)) {\n+\t\t\treturn 'Table' + ' ' + e.name\n+\t\t}\n+\n+\t\t'Item' + ' ' + e.name\t\t\n+\t}\n+\t\n+\t\n+\tdef text(ModelItem e) {\n+\t\tvar type = e.type\n+\t\tvar typeName = type.typeName\n+\t\t\n+\t\tif ('output'.equals(typeName)){\n+\t\t\treturn 'Output' + ' ' + e.name\n+\t\t}\n+\t\tif ('mode'.equals(typeName)){\n+\t\t\treturn 'Mode' + ' ' + e.name\n+\t\t}\n+\t\tif ('state'.equals(typeName)) {\n+\t\t\treturn 'State' + ' ' + e.name\n+\t\t}\n+\t\tif ('macro'.equals(typeName)) {\n+\t\t\treturn 'Macro' + ' ' + e.name\n+\t\t}\n+\t\tif ('function'.equals(typeName)) {\n+\t\t\treturn 'Function' + ' ' + e.name\n+\t\t}\n+\t\tif ('input'.equals(typeName)) {\n+\t\t\treturn 'Input' + ' ' + e.name\n+\t\t}\n+\t\t'Model' + ' ' + e.name\n+\t}\n+\t\n+\tdef text(ListItem e) {\n+\t\tvar type = e.type\n+\t\t\n+\t\tif ('hazard'.equals(type.typeName)) {\n+\t\t\treturn 'Hazard' + ' ' + e.name\n+\t\t}\n+\t\tif ('requirement'.equals(type.typeName)) {\n+\t\t\treturn 'Requirement' + ' ' + e.name\n+\t\t}\n+\t\tif ('goal'.equals(type.typeName)) {\n+\t\t\treturn 'Goal' + ' ' + e.name\n+\t\t} \n+\t\tif ('constraint'.equals(type.typeName)) {\n+\t\t\treturn 'Constraint' + ' ' + e.name\t\t\t\n+\t\t}\n+\t\t'List' + ' ' + e.name\n+\t}\n }", "raw_url": "https://github.com/nasa/CertWare/raw/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent.ui%2Fsrc%2Fnet%2Fcertware%2Fintent%2Fui%2Flabeling%2FIntentSpecificationLabelProvider.xtend", "sha": "db5092061520be3b76f11f66af4d236ba42900e9", "status": "modified" }, { "additions": 131, "blob_url": "https://github.com/nasa/CertWare/blob/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent.ui%2Fsrc%2Fnet%2Fcertware%2Fintent%2Fui%2Fquickfix%2FIntentSpecificationQuickfixProvider.xtend", "changes": 139, "contents_url": "https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent.ui%2Fsrc%2Fnet%2Fcertware%2Fintent%2Fui%2Fquickfix%2FIntentSpecificationQuickfixProvider.xtend?ref=27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9", "deletions": 8, "filename": "net.certware.intent.ui/src/net/certware/intent/ui/quickfix/IntentSpecificationQuickfixProvider.xtend", "new_code": " * NOT generated by Xtext\n */\nimport net.certware.intent.intentSpecification.Decomposition\nimport net.certware.intent.intentSpecification.Intent\nimport net.certware.intent.intentSpecification.ListItem\nimport net.certware.intent.intentSpecification.ModelItem\nimport net.certware.intent.intentSpecification.Refinement\nimport net.certware.intent.validation.IntentSpecificationValidator\nimport org.eclipse.xtext.ui.editor.quickfix.DefaultQuickfixProvider\nimport org.eclipse.xtext.ui.editor.quickfix.Fix\nimport org.eclipse.xtext.ui.editor.quickfix.IssueResolutionAcceptor\nimport org.eclipse.xtext.validation.Issue\n * @see http://www.eclipse.org/Xtext/documentation.html#quickfixes\n * @author mrb@certware.net\nclass IntentSpecificationQuickfixProvider extends DefaultQuickfixProvider {\n\t\n\t/*\n\t * Fix duplicated intent entries by removing one.\n\t */\n\t@Fix(IntentSpecificationValidator::UNIQUE_INTENTS_REFINEMENT)\n\tdef removeIntent(Issue issue, IssueResolutionAcceptor acceptor) {\n\t\tacceptor.accept(issue,\n\t\t\t\"Remove duplicated entry\", // label\n\t\t\t\"Remove intent named\" + ' ' + issue.data.get(0), // description\n\t\t\t\"obj16/intent.gif\", // icon\n\t\t\t[\n\t\t\t\telement, context |\n\t\t\t\tvar container = element as Refinement\n\t\t\t\tvar itemName = issue.data.get(0) as String\n\t\t\t\tvar list = container.intents\n\t\t\t\tvar iter = list.iterator\n\t\t\t\tvar lastItem = null as Intent\n\t\t\t\twhile(iter.hasNext) {\n\t\t\t\t\tvar item = iter.next()\n\t\t\t\t\tif ( item.name.equals(itemName)) {\n\t\t\t\t\t\tlastItem = item\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t\t\n\t\t\t\tif (lastItem != null ) {\n\t\t\t\t\tlist.remove(lastItem)\n\t\t\t\t}\n\t\t\t]\n\t\t);\n\t}\n\n\t/*\n\t * Fix duplicated intent entries by removing one.\n\t */\n\t@Fix(IntentSpecificationValidator::UNIQUE_DECOMPOSITION_INTENT)\n\tdef removeDecomposition(Issue issue, IssueResolutionAcceptor acceptor) {\n\t\tacceptor.accept(issue,\n\t\t\t\"Remove duplicated decomposition\", // label\n\t\t\t\"Remove decomposition named\" + ' ' + issue.data.get(0), // description\n\t\t\t\"obj16/decomposition.gif\", // icon\n\t\t\t[\n\t\t\t\telement, context |\n\t\t\t\tvar container = element as Intent\n\t\t\t\tvar itemName = issue.data.get(0) as String\n\t\t\t\tvar list = container.decompositions\n\t\t\t\tvar iter = list.iterator\n\t\t\t\tvar lastItem = null as Decomposition\n\t\t\t\twhile(iter.hasNext) {\n\t\t\t\t\tvar item = iter.next() as Decomposition\n\t\t\t\t\tif ( item.name.equals(itemName)) {\n\t\t\t\t\t\tlastItem = item\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t\t\n\t\t\t\tif (lastItem != null ) {\n\t\t\t\t\tlist.remove(lastItem)\n\t\t\t\t}\n\t\t\t]\n\t\t);\n\t}\n\t/*\n\t * Fix duplicated list entries by removing one.\n\t */\n\t@Fix(IntentSpecificationValidator::UNIQUE_LIST_ITEM_LIST_ITEM)\n\tdef removeListItem(Issue issue, IssueResolutionAcceptor acceptor) {\n\t\tacceptor.accept(issue,\n\t\t\t\"Remove duplicated list item\", // label\n\t\t\t\"Remove list item named\" + ' ' + issue.data.get(0), // description\n\t\t\t\"obj16/listitem.gif\", // icon\n\t\t\t[\n\t\t\t\telement, context |\n\t\t\t\tvar outerList = element as ListItem\n\t\t\t\tvar itemName = issue.data.get(0) as String\n\t\t\t\tvar list = outerList.itemReferences\n\t\t\t\tvar iter = list.iterator\n\t\t\t\tvar lastItem = null as ListItem\n\t\t\t\twhile(iter.hasNext) {\n\t\t\t\t\tvar item = iter.next()\n\t\t\t\t\tif ( item.name.equals(itemName)) {\n\t\t\t\t\t\tlastItem = item\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t\t\n\t\t\t\tif (lastItem != null ) {\n\t\t\t\t\tlist.remove(lastItem)\n\t\t\t\t}\n\t\t\t]\n\t\t);\n\t}\n\t\n\t@Fix(IntentSpecificationValidator::UNIQUE_MODEL_ITEM_LIST_ITEM)\n\tdef removeModelItem(Issue issue, IssueResolutionAcceptor acceptor) {\n\t\tacceptor.accept(issue,\n\t\t\t\"Remove duplicated entry\", // label\n\t\t\t\"Remove model item named\" + ' ' + issue.data.get(0), // description\n\t\t\t\"obj16/modelitem.gif\", // icon\n\t\t\t[\n\t\t\t\telement, context |\n\t\t\t\tvar outerList = element as ListItem\n\t\t\t\tvar itemName = issue.data.get(0) as String\n\t\t\t\tvar list = outerList.modelReferences\n\t\t\t\tvar iter = list.iterator\n\t\t\t\tvar lastItem = null as ModelItem\n\t\t\t\twhile(iter.hasNext) {\n\t\t\t\t\tvar item = iter.next()\n\t\t\t\t\tif ( item.name.equals(itemName)) {\n\t\t\t\t\t\tlastItem = item\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t\t\n\t\t\t\tif (lastItem != null ) {\n\t\t\t\t\tlist.remove(lastItem)\n\t\t\t\t}\n\t\t\t]\n\t\t);\n\t}", "new_methods": [ { "arguments": [ "Issue issue", " IssueResolutionAcceptor acceptor" ], "filename": "net.certware.intent.ui/src/net/certware/intent/ui/quickfix/IntentSpecificationQuickfixProvider.xtend", "implementation": "acceptor.accept(issue,\n\t\t\t\"Remove duplicated entry\", // label\n\t\t\t\"Remove intent named\" + ' ' + issue.data.get(0), // description\n\t\t\t\"obj16/intent.gif\", // icon\n\t\t\t[\n\t\t\t\telement, context |\n\t\t\t\tvar container = element as Refinement\n\t\t\t\tvar itemName = issue.data.get(0) as String\n\t\t\t\tvar list = container.intents\n\t\t\t\tvar iter = list.iterator\n\t\t\t\tvar lastItem = null as Intent\n\t\t\t\twhile(iter.hasNext) {\n\t\t\t\t\tvar item = iter.next()\n\t\t\t\t\tif ( item.name.equals(itemName)) {\n\t\t\t\t\t\tlastItem = item", "signature": "def removeIntent(Issue issue, IssueResolutionAcceptor acceptor)" }, { "arguments": [ "Issue issue", " IssueResolutionAcceptor acceptor" ], "filename": "net.certware.intent.ui/src/net/certware/intent/ui/quickfix/IntentSpecificationQuickfixProvider.xtend", "implementation": "acceptor.accept(issue,\n\t\t\t\"Remove duplicated decomposition\", // label\n\t\t\t\"Remove decomposition named\" + ' ' + issue.data.get(0), // description\n\t\t\t\"obj16/decomposition.gif\", // icon\n\t\t\t[\n\t\t\t\telement, context |\n\t\t\t\tvar container = element as Intent\n\t\t\t\tvar itemName = issue.data.get(0) as String\n\t\t\t\tvar list = container.decompositions\n\t\t\t\tvar iter = list.iterator\n\t\t\t\tvar lastItem = null as Decomposition\n\t\t\t\twhile(iter.hasNext) {\n\t\t\t\t\tvar item = iter.next() as Decomposition\n\t\t\t\t\tif ( item.name.equals(itemName)) {\n\t\t\t\t\t\tlastItem = item", "signature": "def removeDecomposition(Issue issue, IssueResolutionAcceptor acceptor)" }, { "arguments": [ "Issue issue", " IssueResolutionAcceptor acceptor" ], "filename": "net.certware.intent.ui/src/net/certware/intent/ui/quickfix/IntentSpecificationQuickfixProvider.xtend", "implementation": "acceptor.accept(issue,\n\t\t\t\"Remove duplicated list item\", // label\n\t\t\t\"Remove list item named\" + ' ' + issue.data.get(0), // description\n\t\t\t\"obj16/listitem.gif\", // icon\n\t\t\t[\n\t\t\t\telement, context |\n\t\t\t\tvar outerList = element as ListItem\n\t\t\t\tvar itemName = issue.data.get(0) as String\n\t\t\t\tvar list = outerList.itemReferences\n\t\t\t\tvar iter = list.iterator\n\t\t\t\tvar lastItem = null as ListItem\n\t\t\t\twhile(iter.hasNext) {\n\t\t\t\t\tvar item = iter.next()\n\t\t\t\t\tif ( item.name.equals(itemName)) {\n\t\t\t\t\t\tlastItem = item", "signature": "def removeListItem(Issue issue, IssueResolutionAcceptor acceptor)" }, { "arguments": [ "Issue issue", " IssueResolutionAcceptor acceptor" ], "filename": "net.certware.intent.ui/src/net/certware/intent/ui/quickfix/IntentSpecificationQuickfixProvider.xtend", "implementation": "acceptor.accept(issue,\n\t\t\t\"Remove duplicated entry\", // label\n\t\t\t\"Remove model item named\" + ' ' + issue.data.get(0), // description\n\t\t\t\"obj16/modelitem.gif\", // icon\n\t\t\t[\n\t\t\t\telement, context |\n\t\t\t\tvar outerList = element as ListItem\n\t\t\t\tvar itemName = issue.data.get(0) as String\n\t\t\t\tvar list = outerList.modelReferences\n\t\t\t\tvar iter = list.iterator\n\t\t\t\tvar lastItem = null as ModelItem\n\t\t\t\twhile(iter.hasNext) {\n\t\t\t\t\tvar item = iter.next()\n\t\t\t\t\tif ( item.name.equals(itemName)) {\n\t\t\t\t\t\tlastItem = item", "signature": "def removeModelItem(Issue issue, IssueResolutionAcceptor acceptor)" } ], "old_code": "* generated by Xtext\n*/\n//import org.eclipse.xtext.ui.editor.quickfix.Fix\n//import org.eclipse.xtext.ui.editor.quickfix.IssueResolutionAcceptor\n//import org.eclipse.xtext.validation.Issue\n *\n * see http://www.eclipse.org/Xtext/documentation.html#quickfixes\nclass IntentSpecificationQuickfixProvider extends org.eclipse.xtext.ui.editor.quickfix.DefaultQuickfixProvider {", "old_methods": [], "patch": "@@ -1,18 +1,141 @@\n /*\n-* generated by Xtext\n-*/\n+ * NOT generated by Xtext\n+ */\n package net.certware.intent.ui.quickfix\n \n-//import org.eclipse.xtext.ui.editor.quickfix.Fix\n-//import org.eclipse.xtext.ui.editor.quickfix.IssueResolutionAcceptor\n-//import org.eclipse.xtext.validation.Issue\n+import net.certware.intent.intentSpecification.Decomposition\n+import net.certware.intent.intentSpecification.Intent\n+import net.certware.intent.intentSpecification.ListItem\n+import net.certware.intent.intentSpecification.ModelItem\n+import net.certware.intent.intentSpecification.Refinement\n+import net.certware.intent.validation.IntentSpecificationValidator\n+import org.eclipse.xtext.ui.editor.quickfix.DefaultQuickfixProvider\n+import org.eclipse.xtext.ui.editor.quickfix.Fix\n+import org.eclipse.xtext.ui.editor.quickfix.IssueResolutionAcceptor\n+import org.eclipse.xtext.validation.Issue\n \n /**\n * Custom quickfixes.\n- *\n- * see http://www.eclipse.org/Xtext/documentation.html#quickfixes\n+ * @see http://www.eclipse.org/Xtext/documentation.html#quickfixes\n+ * @author mrb@certware.net\n */\n-class IntentSpecificationQuickfixProvider extends org.eclipse.xtext.ui.editor.quickfix.DefaultQuickfixProvider {\n+class IntentSpecificationQuickfixProvider extends DefaultQuickfixProvider {\n+\t\n+\t/*\n+\t * Fix duplicated intent entries by removing one.\n+\t */\n+\t@Fix(IntentSpecificationValidator::UNIQUE_INTENTS_REFINEMENT)\n+\tdef removeIntent(Issue issue, IssueResolutionAcceptor acceptor) {\n+\t\tacceptor.accept(issue,\n+\t\t\t\"Remove duplicated entry\", // label\n+\t\t\t\"Remove intent named\" + ' ' + issue.data.get(0), // description\n+\t\t\t\"obj16/intent.gif\", // icon\n+\t\t\t[\n+\t\t\t\telement, context |\n+\t\t\t\tvar container = element as Refinement\n+\t\t\t\tvar itemName = issue.data.get(0) as String\n+\t\t\t\tvar list = container.intents\n+\t\t\t\tvar iter = list.iterator\n+\t\t\t\tvar lastItem = null as Intent\n+\t\t\t\twhile(iter.hasNext) {\n+\t\t\t\t\tvar item = iter.next()\n+\t\t\t\t\tif ( item.name.equals(itemName)) {\n+\t\t\t\t\t\tlastItem = item\n+\t\t\t\t\t}\n+\t\t\t\t}\n+\t\t\t\t\n+\t\t\t\tif (lastItem != null ) {\n+\t\t\t\t\tlist.remove(lastItem)\n+\t\t\t\t}\n+\t\t\t]\n+\t\t);\n+\t}\n+\n+\t/*\n+\t * Fix duplicated intent entries by removing one.\n+\t */\n+\t@Fix(IntentSpecificationValidator::UNIQUE_DECOMPOSITION_INTENT)\n+\tdef removeDecomposition(Issue issue, IssueResolutionAcceptor acceptor) {\n+\t\tacceptor.accept(issue,\n+\t\t\t\"Remove duplicated decomposition\", // label\n+\t\t\t\"Remove decomposition named\" + ' ' + issue.data.get(0), // description\n+\t\t\t\"obj16/decomposition.gif\", // icon\n+\t\t\t[\n+\t\t\t\telement, context |\n+\t\t\t\tvar container = element as Intent\n+\t\t\t\tvar itemName = issue.data.get(0) as String\n+\t\t\t\tvar list = container.decompositions\n+\t\t\t\tvar iter = list.iterator\n+\t\t\t\tvar lastItem = null as Decomposition\n+\t\t\t\twhile(iter.hasNext) {\n+\t\t\t\t\tvar item = iter.next() as Decomposition\n+\t\t\t\t\tif ( item.name.equals(itemName)) {\n+\t\t\t\t\t\tlastItem = item\n+\t\t\t\t\t}\n+\t\t\t\t}\n+\t\t\t\t\n+\t\t\t\tif (lastItem != null ) {\n+\t\t\t\t\tlist.remove(lastItem)\n+\t\t\t\t}\n+\t\t\t]\n+\t\t);\n+\t}\n+\t/*\n+\t * Fix duplicated list entries by removing one.\n+\t */\n+\t@Fix(IntentSpecificationValidator::UNIQUE_LIST_ITEM_LIST_ITEM)\n+\tdef removeListItem(Issue issue, IssueResolutionAcceptor acceptor) {\n+\t\tacceptor.accept(issue,\n+\t\t\t\"Remove duplicated list item\", // label\n+\t\t\t\"Remove list item named\" + ' ' + issue.data.get(0), // description\n+\t\t\t\"obj16/listitem.gif\", // icon\n+\t\t\t[\n+\t\t\t\telement, context |\n+\t\t\t\tvar outerList = element as ListItem\n+\t\t\t\tvar itemName = issue.data.get(0) as String\n+\t\t\t\tvar list = outerList.itemReferences\n+\t\t\t\tvar iter = list.iterator\n+\t\t\t\tvar lastItem = null as ListItem\n+\t\t\t\twhile(iter.hasNext) {\n+\t\t\t\t\tvar item = iter.next()\n+\t\t\t\t\tif ( item.name.equals(itemName)) {\n+\t\t\t\t\t\tlastItem = item\n+\t\t\t\t\t}\n+\t\t\t\t}\n+\t\t\t\t\n+\t\t\t\tif (lastItem != null ) {\n+\t\t\t\t\tlist.remove(lastItem)\n+\t\t\t\t}\n+\t\t\t]\n+\t\t);\n+\t}\n+\t\n+\t@Fix(IntentSpecificationValidator::UNIQUE_MODEL_ITEM_LIST_ITEM)\n+\tdef removeModelItem(Issue issue, IssueResolutionAcceptor acceptor) {\n+\t\tacceptor.accept(issue,\n+\t\t\t\"Remove duplicated entry\", // label\n+\t\t\t\"Remove model item named\" + ' ' + issue.data.get(0), // description\n+\t\t\t\"obj16/modelitem.gif\", // icon\n+\t\t\t[\n+\t\t\t\telement, context |\n+\t\t\t\tvar outerList = element as ListItem\n+\t\t\t\tvar itemName = issue.data.get(0) as String\n+\t\t\t\tvar list = outerList.modelReferences\n+\t\t\t\tvar iter = list.iterator\n+\t\t\t\tvar lastItem = null as ModelItem\n+\t\t\t\twhile(iter.hasNext) {\n+\t\t\t\t\tvar item = iter.next()\n+\t\t\t\t\tif ( item.name.equals(itemName)) {\n+\t\t\t\t\t\tlastItem = item\n+\t\t\t\t\t}\n+\t\t\t\t}\n+\t\t\t\t\n+\t\t\t\tif (lastItem != null ) {\n+\t\t\t\t\tlist.remove(lastItem)\n+\t\t\t\t}\n+\t\t\t]\n+\t\t);\n+\t}\n \n //\t@Fix(MyDslValidator::INVALID_NAME)\n //\tdef capitalizeName(Issue issue, IssueResolutionAcceptor acceptor) {", "raw_url": "https://github.com/nasa/CertWare/raw/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent.ui%2Fsrc%2Fnet%2Fcertware%2Fintent%2Fui%2Fquickfix%2FIntentSpecificationQuickfixProvider.xtend", "sha": "44be548a658b3731af7b97c3654097721a89d19f", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/nasa/CertWare/blob/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent.ui%2Fsrc%2Fnet%2Fcertware%2Fintent%2Fui%2Fwizard%2FIntentSpecificationNewProject.xpt", "changes": 2, "contents_url": "https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent.ui%2Fsrc%2Fnet%2Fcertware%2Fintent%2Fui%2Fwizard%2FIntentSpecificationNewProject.xpt?ref=27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9", "deletions": 1, "filename": "net.certware.intent.ui/src/net/certware/intent/ui/wizard/IntentSpecificationNewProject.xpt", "new_code": "«FILE \"src/model/Model.intent\"-»", "new_methods": [], "old_code": "«FILE \"src/model/Model.intentspecification\"-»", "old_methods": [], "patch": "@@ -6,7 +6,7 @@\n «ENDDEFINE»\n \n «DEFINE model FOR IntentSpecificationProjectInfo»\n-«FILE \"src/model/Model.intentspecification\"-»\n+«FILE \"src/model/Model.intent\"-»\n /*\n * This is an example model\n */", "raw_url": "https://github.com/nasa/CertWare/raw/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent.ui%2Fsrc%2Fnet%2Fcertware%2Fintent%2Fui%2Fwizard%2FIntentSpecificationNewProject.xpt", "sha": "564de2e356a15c25618cd9ebb9667822f7ef6c19", "status": "modified" }, { "additions": 290, "blob_url": "https://github.com/nasa/CertWare/blob/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent.ui%2Fxtend-gen%2Fnet%2Fcertware%2Fintent%2Fui%2Flabeling%2FIntentSpecificationLabelProvider.java", "changes": 291, "contents_url": "https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent.ui%2Fxtend-gen%2Fnet%2Fcertware%2Fintent%2Fui%2Flabeling%2FIntentSpecificationLabelProvider.java?ref=27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9", "deletions": 1, "filename": "net.certware.intent.ui/xtend-gen/net/certware/intent/ui/labeling/IntentSpecificationLabelProvider.java", "new_code": " * NOT generated by Xtext\nimport net.certware.intent.intentSpecification.Decomposition;\nimport net.certware.intent.intentSpecification.DecompositionType;\nimport net.certware.intent.intentSpecification.DocItem;\nimport net.certware.intent.intentSpecification.DocItemType;\nimport net.certware.intent.intentSpecification.Document;\nimport net.certware.intent.intentSpecification.Intent;\nimport net.certware.intent.intentSpecification.IntentType;\nimport net.certware.intent.intentSpecification.ListItem;\nimport net.certware.intent.intentSpecification.ListItemType;\nimport net.certware.intent.intentSpecification.ModelItem;\nimport net.certware.intent.intentSpecification.ModelType;\nimport net.certware.intent.intentSpecification.Refinement;\nimport net.certware.intent.intentSpecification.Specification;\n \n public String image(final Refinement e) {\n return \"obj16/refinement.gif\";\n }\n \n public String image(final Intent e) {\n return \"obj16/intent.gif\";\n }\n \n public String image(final Specification e) {\n return \"obj16/specification.gif\";\n }\n \n public String image(final Decomposition e) {\n return \"obj16/decomposition.gif\";\n }\n \n public String image(final Document e) {\n return \"obj16/document.gif\";\n }\n \n public String image(final ModelItem e) {\n return \"obj16/modelitem.gif\";\n }\n \n public String image(final ListItem e) {\n return \"obj16/listitem.gif\";\n }\n \n /**\n * text responses\n */\n public String text(final Intent e) {\n String _xblockexpression = null;\n {\n IntentType type = e.getType();\n String typeName = type.getTypeName();\n boolean _equals = \"basic\".equals(typeName);\n if (_equals) {\n String _plus = (\"Basic\" + \" \");\n String _name = e.getName();\n return (_plus + _name);\n }\n boolean _equals_1 = \"purpose\".equals(typeName);\n if (_equals_1) {\n String _plus_1 = (\"Purpose\" + \" \");\n String _name_1 = e.getName();\n return (_plus_1 + _name_1);\n }\n boolean _equals_2 = \"principles\".equals(typeName);\n if (_equals_2) {\n String _plus_2 = (\"Principles\" + \" \");\n String _name_2 = e.getName();\n return (_plus_2 + _name_2);\n }\n boolean _equals_3 = \"models\".equals(typeName);\n if (_equals_3) {\n String _plus_3 = (\"Models\" + \" \");\n String _name_3 = e.getName();\n return (_plus_3 + _name_3);\n }\n boolean _equals_4 = \"design\".equals(typeName);\n if (_equals_4) {\n String _plus_4 = (\"Design\" + \" \");\n String _name_4 = e.getName();\n return (_plus_4 + _name_4);\n }\n boolean _equals_5 = \"implementation\".equals(typeName);\n if (_equals_5) {\n String _plus_5 = (\"Implementation\" + \" \");\n String _name_5 = e.getName();\n return (_plus_5 + _name_5);\n }\n boolean _equals_6 = \"operation\".equals(typeName);\n if (_equals_6) {\n String _plus_6 = (\"Operation\" + \" \");\n String _name_6 = e.getName();\n return (_plus_6 + _name_6);\n }\n String _plus_7 = (\"Intent\" + \" \");\n String _name_7 = e.getName();\n String _plus_8 = (_plus_7 + _name_7);\n _xblockexpression = (_plus_8);\n }\n return _xblockexpression;\n }\n \n public String text(final Refinement e) {\n String _plus = (\"Refinement\" + \" \");\n String _name = e.getName();\n String _plus_1 = (_plus + _name);\n return _plus_1;\n }\n \n public String text(final Decomposition e) {\n String _xblockexpression = null;\n {\n DecompositionType type = e.getType();\n String typeName = type.getTypeName();\n boolean _equals = \"environment\".equals(typeName);\n if (_equals) {\n String _plus = (\"Environment\" + \" \");\n String _name = e.getName();\n return (_plus + _name);\n }\n boolean _equals_1 = \"operator\".equals(typeName);\n if (_equals_1) {\n String _plus_1 = (\"Operator\" + \" \");\n String _name_1 = e.getName();\n return (_plus_1 + _name_1);\n }\n boolean _equals_2 = \"system\".equals(typeName);\n if (_equals_2) {\n String _plus_2 = (\"System\" + \" \");\n String _name_2 = e.getName();\n return (_plus_2 + _name_2);\n }\n boolean _equals_3 = \"verification\".equals(typeName);\n if (_equals_3) {\n String _plus_3 = (\"V&V\" + \" \");\n String _name_3 = e.getName();\n return (_plus_3 + _name_3);\n }\n String _plus_4 = (\"Decomposition\" + \" \");\n String _name_4 = e.getName();\n String _plus_5 = (_plus_4 + _name_4);\n _xblockexpression = (_plus_5);\n }\n return _xblockexpression;\n }\n \n public String text(final Document e) {\n return \"Document\";\n }\n \n public String text(final DocItem e) {\n String _xblockexpression = null;\n {\n DocItemType type = e.getType();\n String typeName = type.getTypeName();\n boolean _equals = \"condition\".equals(typeName);\n if (_equals) {\n String _plus = (\"Condition\" + \" \");\n String _name = e.getName();\n return (_plus + _name);\n }\n boolean _equals_1 = \"figure\".equals(typeName);\n if (_equals_1) {\n String _plus_1 = (\"Figure\" + \" \");\n String _name_1 = e.getName();\n return (_plus_1 + _name_1);\n }\n boolean _equals_2 = \"break\".equals(typeName);\n if (_equals_2) {\n return \"Break\";\n }\n boolean _equals_3 = \"model\".equals(typeName);\n if (_equals_3) {\n String _plus_2 = (\"Model\" + \" \");\n String _name_2 = e.getName();\n return (_plus_2 + _name_2);\n }\n boolean _equals_4 = \"paragraph\".equals(typeName);\n if (_equals_4) {\n String _plus_3 = (\"Paragraph\" + \" \");\n String _name_3 = e.getName();\n return (_plus_3 + _name_3);\n }\n boolean _equals_5 = \"section\".equals(typeName);\n if (_equals_5) {\n String _plus_4 = (\"Section\" + \" \");\n String _name_4 = e.getName();\n return (_plus_4 + _name_4);\n }\n boolean _equals_6 = \"table\".equals(typeName);\n if (_equals_6) {\n String _plus_5 = (\"Table\" + \" \");\n String _name_5 = e.getName();\n return (_plus_5 + _name_5);\n }\n String _plus_6 = (\"Item\" + \" \");\n String _name_6 = e.getName();\n String _plus_7 = (_plus_6 + _name_6);\n _xblockexpression = (_plus_7);\n }\n return _xblockexpression;\n }\n \n public String text(final ModelItem e) {\n String _xblockexpression = null;\n {\n ModelType type = e.getType();\n String typeName = type.getTypeName();\n boolean _equals = \"output\".equals(typeName);\n if (_equals) {\n String _plus = (\"Output\" + \" \");\n String _name = e.getName();\n return (_plus + _name);\n }\n boolean _equals_1 = \"mode\".equals(typeName);\n if (_equals_1) {\n String _plus_1 = (\"Mode\" + \" \");\n String _name_1 = e.getName();\n return (_plus_1 + _name_1);\n }\n boolean _equals_2 = \"state\".equals(typeName);\n if (_equals_2) {\n String _plus_2 = (\"State\" + \" \");\n String _name_2 = e.getName();\n return (_plus_2 + _name_2);\n }\n boolean _equals_3 = \"macro\".equals(typeName);\n if (_equals_3) {\n String _plus_3 = (\"Macro\" + \" \");\n String _name_3 = e.getName();\n return (_plus_3 + _name_3);\n }\n boolean _equals_4 = \"function\".equals(typeName);\n if (_equals_4) {\n String _plus_4 = (\"Function\" + \" \");\n String _name_4 = e.getName();\n return (_plus_4 + _name_4);\n }\n boolean _equals_5 = \"input\".equals(typeName);\n if (_equals_5) {\n String _plus_5 = (\"Input\" + \" \");\n String _name_5 = e.getName();\n return (_plus_5 + _name_5);\n }\n String _plus_6 = (\"Model\" + \" \");\n String _name_6 = e.getName();\n String _plus_7 = (_plus_6 + _name_6);\n _xblockexpression = (_plus_7);\n }\n return _xblockexpression;\n }\n \n public String text(final ListItem e) {\n String _xblockexpression = null;\n {\n ListItemType type = e.getType();\n String _typeName = type.getTypeName();\n boolean _equals = \"hazard\".equals(_typeName);\n if (_equals) {\n String _plus = (\"Hazard\" + \" \");\n String _name = e.getName();\n return (_plus + _name);\n }\n String _typeName_1 = type.getTypeName();\n boolean _equals_1 = \"requirement\".equals(_typeName_1);\n if (_equals_1) {\n String _plus_1 = (\"Requirement\" + \" \");\n String _name_1 = e.getName();\n return (_plus_1 + _name_1);\n }\n String _typeName_2 = type.getTypeName();\n boolean _equals_2 = \"goal\".equals(_typeName_2);\n if (_equals_2) {\n String _plus_2 = (\"Goal\" + \" \");\n String _name_2 = e.getName();\n return (_plus_2 + _name_2);\n }\n String _typeName_3 = type.getTypeName();\n boolean _equals_3 = \"constraint\".equals(_typeName_3);\n if (_equals_3) {\n String _plus_3 = (\"Constraint\" + \" \");\n String _name_3 = e.getName();\n return (_plus_3 + _name_3);\n }\n String _plus_4 = (\"List\" + \" \");\n String _name_4 = e.getName();\n String _plus_5 = (_plus_4 + _name_4);\n _xblockexpression = (_plus_5);\n }\n return _xblockexpression;\n }", "new_methods": [ { "arguments": [ "final Refinement e" ], "filename": "net.certware.intent.ui/xtend-gen/net/certware/intent/ui/labeling/IntentSpecificationLabelProvider.java", "implementation": "return \"obj16/refinement.gif\";", "signature": "String image(final Refinement e)" }, { "arguments": [ "final Intent e" ], "filename": "net.certware.intent.ui/xtend-gen/net/certware/intent/ui/labeling/IntentSpecificationLabelProvider.java", "implementation": "return \"obj16/intent.gif\";", "signature": "String image(final Intent e)" }, { "arguments": [ "final Specification e" ], "filename": "net.certware.intent.ui/xtend-gen/net/certware/intent/ui/labeling/IntentSpecificationLabelProvider.java", "implementation": "return \"obj16/specification.gif\";", "signature": "String image(final Specification e)" }, { "arguments": [ "final Decomposition e" ], "filename": "net.certware.intent.ui/xtend-gen/net/certware/intent/ui/labeling/IntentSpecificationLabelProvider.java", "implementation": "return \"obj16/decomposition.gif\";", "signature": "String image(final Decomposition e)" }, { "arguments": [ "final Document e" ], "filename": "net.certware.intent.ui/xtend-gen/net/certware/intent/ui/labeling/IntentSpecificationLabelProvider.java", "implementation": "return \"obj16/document.gif\";", "signature": "String image(final Document e)" }, { "arguments": [ "final ModelItem e" ], "filename": "net.certware.intent.ui/xtend-gen/net/certware/intent/ui/labeling/IntentSpecificationLabelProvider.java", "implementation": "return \"obj16/modelitem.gif\";", "signature": "String image(final ModelItem e)" }, { "arguments": [ "final ListItem e" ], "filename": "net.certware.intent.ui/xtend-gen/net/certware/intent/ui/labeling/IntentSpecificationLabelProvider.java", "implementation": "return \"obj16/listitem.gif\";", "signature": "String image(final ListItem e)" }, { "arguments": [ "final Intent e" ], "filename": "net.certware.intent.ui/xtend-gen/net/certware/intent/ui/labeling/IntentSpecificationLabelProvider.java", "implementation": "String _xblockexpression = null;\n {\n IntentType type = e.getType();\n String typeName = type.getTypeName();\n boolean _equals = \"basic\".equals(typeName);\n if (_equals) {\n String _plus = (\"Basic\" + \" \");\n String _name = e.getName();\n return (_plus + _name);", "signature": "String text(final Intent e)" }, { "arguments": [ "final Refinement e" ], "filename": "net.certware.intent.ui/xtend-gen/net/certware/intent/ui/labeling/IntentSpecificationLabelProvider.java", "implementation": "String _plus = (\"Refinement\" + \" \");\n String _name = e.getName();\n String _plus_1 = (_plus + _name);\n return _plus_1;", "signature": "String text(final Refinement e)" }, { "arguments": [ "final Decomposition e" ], "filename": "net.certware.intent.ui/xtend-gen/net/certware/intent/ui/labeling/IntentSpecificationLabelProvider.java", "implementation": "String _xblockexpression = null;\n {\n DecompositionType type = e.getType();\n String typeName = type.getTypeName();\n boolean _equals = \"environment\".equals(typeName);\n if (_equals) {\n String _plus = (\"Environment\" + \" \");\n String _name = e.getName();\n return (_plus + _name);", "signature": "String text(final Decomposition e)" }, { "arguments": [ "final Document e" ], "filename": "net.certware.intent.ui/xtend-gen/net/certware/intent/ui/labeling/IntentSpecificationLabelProvider.java", "implementation": "return \"Document\";", "signature": "String text(final Document e)" }, { "arguments": [ "final DocItem e" ], "filename": "net.certware.intent.ui/xtend-gen/net/certware/intent/ui/labeling/IntentSpecificationLabelProvider.java", "implementation": "String _xblockexpression = null;\n {\n DocItemType type = e.getType();\n String typeName = type.getTypeName();\n boolean _equals = \"condition\".equals(typeName);\n if (_equals) {\n String _plus = (\"Condition\" + \" \");\n String _name = e.getName();\n return (_plus + _name);", "signature": "String text(final DocItem e)" }, { "arguments": [ "final ModelItem e" ], "filename": "net.certware.intent.ui/xtend-gen/net/certware/intent/ui/labeling/IntentSpecificationLabelProvider.java", "implementation": "String _xblockexpression = null;\n {\n ModelType type = e.getType();\n String typeName = type.getTypeName();\n boolean _equals = \"output\".equals(typeName);\n if (_equals) {\n String _plus = (\"Output\" + \" \");\n String _name = e.getName();\n return (_plus + _name);", "signature": "String text(final ModelItem e)" }, { "arguments": [ "final ListItem e" ], "filename": "net.certware.intent.ui/xtend-gen/net/certware/intent/ui/labeling/IntentSpecificationLabelProvider.java", "implementation": "String _xblockexpression = null;\n {\n ListItemType type = e.getType();\n String _typeName = type.getTypeName();\n boolean _equals = \"hazard\".equals(_typeName);\n if (_equals) {\n String _plus = (\"Hazard\" + \" \");\n String _name = e.getName();\n return (_plus + _name);", "signature": "String text(final ListItem e)" } ], "old_code": " * generated by Xtext", "old_methods": [], "patch": "@@ -1,9 +1,22 @@\n /**\n- * generated by Xtext\n+ * NOT generated by Xtext\n */\n package net.certware.intent.ui.labeling;\n \n import com.google.inject.Inject;\n+import net.certware.intent.intentSpecification.Decomposition;\n+import net.certware.intent.intentSpecification.DecompositionType;\n+import net.certware.intent.intentSpecification.DocItem;\n+import net.certware.intent.intentSpecification.DocItemType;\n+import net.certware.intent.intentSpecification.Document;\n+import net.certware.intent.intentSpecification.Intent;\n+import net.certware.intent.intentSpecification.IntentType;\n+import net.certware.intent.intentSpecification.ListItem;\n+import net.certware.intent.intentSpecification.ListItemType;\n+import net.certware.intent.intentSpecification.ModelItem;\n+import net.certware.intent.intentSpecification.ModelType;\n+import net.certware.intent.intentSpecification.Refinement;\n+import net.certware.intent.intentSpecification.Specification;\n import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;\n import org.eclipse.xtext.ui.label.DefaultEObjectLabelProvider;\n \n@@ -18,4 +31,280 @@ public class IntentSpecificationLabelProvider extends DefaultEObjectLabelProvide\n public IntentSpecificationLabelProvider(final AdapterFactoryLabelProvider delegate) {\n super(delegate);\n }\n+ \n+ public String image(final Refinement e) {\n+ return \"obj16/refinement.gif\";\n+ }\n+ \n+ public String image(final Intent e) {\n+ return \"obj16/intent.gif\";\n+ }\n+ \n+ public String image(final Specification e) {\n+ return \"obj16/specification.gif\";\n+ }\n+ \n+ public String image(final Decomposition e) {\n+ return \"obj16/decomposition.gif\";\n+ }\n+ \n+ public String image(final Document e) {\n+ return \"obj16/document.gif\";\n+ }\n+ \n+ public String image(final ModelItem e) {\n+ return \"obj16/modelitem.gif\";\n+ }\n+ \n+ public String image(final ListItem e) {\n+ return \"obj16/listitem.gif\";\n+ }\n+ \n+ /**\n+ * text responses\n+ */\n+ public String text(final Intent e) {\n+ String _xblockexpression = null;\n+ {\n+ IntentType type = e.getType();\n+ String typeName = type.getTypeName();\n+ boolean _equals = \"basic\".equals(typeName);\n+ if (_equals) {\n+ String _plus = (\"Basic\" + \" \");\n+ String _name = e.getName();\n+ return (_plus + _name);\n+ }\n+ boolean _equals_1 = \"purpose\".equals(typeName);\n+ if (_equals_1) {\n+ String _plus_1 = (\"Purpose\" + \" \");\n+ String _name_1 = e.getName();\n+ return (_plus_1 + _name_1);\n+ }\n+ boolean _equals_2 = \"principles\".equals(typeName);\n+ if (_equals_2) {\n+ String _plus_2 = (\"Principles\" + \" \");\n+ String _name_2 = e.getName();\n+ return (_plus_2 + _name_2);\n+ }\n+ boolean _equals_3 = \"models\".equals(typeName);\n+ if (_equals_3) {\n+ String _plus_3 = (\"Models\" + \" \");\n+ String _name_3 = e.getName();\n+ return (_plus_3 + _name_3);\n+ }\n+ boolean _equals_4 = \"design\".equals(typeName);\n+ if (_equals_4) {\n+ String _plus_4 = (\"Design\" + \" \");\n+ String _name_4 = e.getName();\n+ return (_plus_4 + _name_4);\n+ }\n+ boolean _equals_5 = \"implementation\".equals(typeName);\n+ if (_equals_5) {\n+ String _plus_5 = (\"Implementation\" + \" \");\n+ String _name_5 = e.getName();\n+ return (_plus_5 + _name_5);\n+ }\n+ boolean _equals_6 = \"operation\".equals(typeName);\n+ if (_equals_6) {\n+ String _plus_6 = (\"Operation\" + \" \");\n+ String _name_6 = e.getName();\n+ return (_plus_6 + _name_6);\n+ }\n+ String _plus_7 = (\"Intent\" + \" \");\n+ String _name_7 = e.getName();\n+ String _plus_8 = (_plus_7 + _name_7);\n+ _xblockexpression = (_plus_8);\n+ }\n+ return _xblockexpression;\n+ }\n+ \n+ public String text(final Refinement e) {\n+ String _plus = (\"Refinement\" + \" \");\n+ String _name = e.getName();\n+ String _plus_1 = (_plus + _name);\n+ return _plus_1;\n+ }\n+ \n+ public String text(final Decomposition e) {\n+ String _xblockexpression = null;\n+ {\n+ DecompositionType type = e.getType();\n+ String typeName = type.getTypeName();\n+ boolean _equals = \"environment\".equals(typeName);\n+ if (_equals) {\n+ String _plus = (\"Environment\" + \" \");\n+ String _name = e.getName();\n+ return (_plus + _name);\n+ }\n+ boolean _equals_1 = \"operator\".equals(typeName);\n+ if (_equals_1) {\n+ String _plus_1 = (\"Operator\" + \" \");\n+ String _name_1 = e.getName();\n+ return (_plus_1 + _name_1);\n+ }\n+ boolean _equals_2 = \"system\".equals(typeName);\n+ if (_equals_2) {\n+ String _plus_2 = (\"System\" + \" \");\n+ String _name_2 = e.getName();\n+ return (_plus_2 + _name_2);\n+ }\n+ boolean _equals_3 = \"verification\".equals(typeName);\n+ if (_equals_3) {\n+ String _plus_3 = (\"V&V\" + \" \");\n+ String _name_3 = e.getName();\n+ return (_plus_3 + _name_3);\n+ }\n+ String _plus_4 = (\"Decomposition\" + \" \");\n+ String _name_4 = e.getName();\n+ String _plus_5 = (_plus_4 + _name_4);\n+ _xblockexpression = (_plus_5);\n+ }\n+ return _xblockexpression;\n+ }\n+ \n+ public String text(final Document e) {\n+ return \"Document\";\n+ }\n+ \n+ public String text(final DocItem e) {\n+ String _xblockexpression = null;\n+ {\n+ DocItemType type = e.getType();\n+ String typeName = type.getTypeName();\n+ boolean _equals = \"condition\".equals(typeName);\n+ if (_equals) {\n+ String _plus = (\"Condition\" + \" \");\n+ String _name = e.getName();\n+ return (_plus + _name);\n+ }\n+ boolean _equals_1 = \"figure\".equals(typeName);\n+ if (_equals_1) {\n+ String _plus_1 = (\"Figure\" + \" \");\n+ String _name_1 = e.getName();\n+ return (_plus_1 + _name_1);\n+ }\n+ boolean _equals_2 = \"break\".equals(typeName);\n+ if (_equals_2) {\n+ return \"Break\";\n+ }\n+ boolean _equals_3 = \"model\".equals(typeName);\n+ if (_equals_3) {\n+ String _plus_2 = (\"Model\" + \" \");\n+ String _name_2 = e.getName();\n+ return (_plus_2 + _name_2);\n+ }\n+ boolean _equals_4 = \"paragraph\".equals(typeName);\n+ if (_equals_4) {\n+ String _plus_3 = (\"Paragraph\" + \" \");\n+ String _name_3 = e.getName();\n+ return (_plus_3 + _name_3);\n+ }\n+ boolean _equals_5 = \"section\".equals(typeName);\n+ if (_equals_5) {\n+ String _plus_4 = (\"Section\" + \" \");\n+ String _name_4 = e.getName();\n+ return (_plus_4 + _name_4);\n+ }\n+ boolean _equals_6 = \"table\".equals(typeName);\n+ if (_equals_6) {\n+ String _plus_5 = (\"Table\" + \" \");\n+ String _name_5 = e.getName();\n+ return (_plus_5 + _name_5);\n+ }\n+ String _plus_6 = (\"Item\" + \" \");\n+ String _name_6 = e.getName();\n+ String _plus_7 = (_plus_6 + _name_6);\n+ _xblockexpression = (_plus_7);\n+ }\n+ return _xblockexpression;\n+ }\n+ \n+ public String text(final ModelItem e) {\n+ String _xblockexpression = null;\n+ {\n+ ModelType type = e.getType();\n+ String typeName = type.getTypeName();\n+ boolean _equals = \"output\".equals(typeName);\n+ if (_equals) {\n+ String _plus = (\"Output\" + \" \");\n+ String _name = e.getName();\n+ return (_plus + _name);\n+ }\n+ boolean _equals_1 = \"mode\".equals(typeName);\n+ if (_equals_1) {\n+ String _plus_1 = (\"Mode\" + \" \");\n+ String _name_1 = e.getName();\n+ return (_plus_1 + _name_1);\n+ }\n+ boolean _equals_2 = \"state\".equals(typeName);\n+ if (_equals_2) {\n+ String _plus_2 = (\"State\" + \" \");\n+ String _name_2 = e.getName();\n+ return (_plus_2 + _name_2);\n+ }\n+ boolean _equals_3 = \"macro\".equals(typeName);\n+ if (_equals_3) {\n+ String _plus_3 = (\"Macro\" + \" \");\n+ String _name_3 = e.getName();\n+ return (_plus_3 + _name_3);\n+ }\n+ boolean _equals_4 = \"function\".equals(typeName);\n+ if (_equals_4) {\n+ String _plus_4 = (\"Function\" + \" \");\n+ String _name_4 = e.getName();\n+ return (_plus_4 + _name_4);\n+ }\n+ boolean _equals_5 = \"input\".equals(typeName);\n+ if (_equals_5) {\n+ String _plus_5 = (\"Input\" + \" \");\n+ String _name_5 = e.getName();\n+ return (_plus_5 + _name_5);\n+ }\n+ String _plus_6 = (\"Model\" + \" \");\n+ String _name_6 = e.getName();\n+ String _plus_7 = (_plus_6 + _name_6);\n+ _xblockexpression = (_plus_7);\n+ }\n+ return _xblockexpression;\n+ }\n+ \n+ public String text(final ListItem e) {\n+ String _xblockexpression = null;\n+ {\n+ ListItemType type = e.getType();\n+ String _typeName = type.getTypeName();\n+ boolean _equals = \"hazard\".equals(_typeName);\n+ if (_equals) {\n+ String _plus = (\"Hazard\" + \" \");\n+ String _name = e.getName();\n+ return (_plus + _name);\n+ }\n+ String _typeName_1 = type.getTypeName();\n+ boolean _equals_1 = \"requirement\".equals(_typeName_1);\n+ if (_equals_1) {\n+ String _plus_1 = (\"Requirement\" + \" \");\n+ String _name_1 = e.getName();\n+ return (_plus_1 + _name_1);\n+ }\n+ String _typeName_2 = type.getTypeName();\n+ boolean _equals_2 = \"goal\".equals(_typeName_2);\n+ if (_equals_2) {\n+ String _plus_2 = (\"Goal\" + \" \");\n+ String _name_2 = e.getName();\n+ return (_plus_2 + _name_2);\n+ }\n+ String _typeName_3 = type.getTypeName();\n+ boolean _equals_3 = \"constraint\".equals(_typeName_3);\n+ if (_equals_3) {\n+ String _plus_3 = (\"Constraint\" + \" \");\n+ String _name_3 = e.getName();\n+ return (_plus_3 + _name_3);\n+ }\n+ String _plus_4 = (\"List\" + \" \");\n+ String _name_4 = e.getName();\n+ String _plus_5 = (_plus_4 + _name_4);\n+ _xblockexpression = (_plus_5);\n+ }\n+ return _xblockexpression;\n+ }\n }", "raw_url": "https://github.com/nasa/CertWare/raw/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent.ui%2Fxtend-gen%2Fnet%2Fcertware%2Fintent%2Fui%2Flabeling%2FIntentSpecificationLabelProvider.java", "sha": "0c00b035e5b9e5a25b1e829f8abb31b37914673b", "status": "modified" }, { "additions": 187, "blob_url": "https://github.com/nasa/CertWare/blob/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent.ui%2Fxtend-gen%2Fnet%2Fcertware%2Fintent%2Fui%2Fquickfix%2FIntentSpecificationQuickfixProvider.java", "changes": 190, "contents_url": "https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent.ui%2Fxtend-gen%2Fnet%2Fcertware%2Fintent%2Fui%2Fquickfix%2FIntentSpecificationQuickfixProvider.java?ref=27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9", "deletions": 3, "filename": "net.certware.intent.ui/xtend-gen/net/certware/intent/ui/quickfix/IntentSpecificationQuickfixProvider.java", "new_code": " * NOT generated by Xtext\nimport com.google.common.base.Objects;\nimport java.util.Iterator;\nimport net.certware.intent.intentSpecification.Decomposition;\nimport net.certware.intent.intentSpecification.Intent;\nimport net.certware.intent.intentSpecification.ListItem;\nimport net.certware.intent.intentSpecification.ModelItem;\nimport net.certware.intent.intentSpecification.Refinement;\nimport net.certware.intent.validation.IntentSpecificationValidator;\nimport org.eclipse.emf.common.util.EList;\nimport org.eclipse.emf.ecore.EObject;\nimport org.eclipse.xtext.ui.editor.model.edit.IModificationContext;\nimport org.eclipse.xtext.ui.editor.model.edit.ISemanticModification;\nimport org.eclipse.xtext.ui.editor.quickfix.Fix;\nimport org.eclipse.xtext.ui.editor.quickfix.IssueResolutionAcceptor;\nimport org.eclipse.xtext.validation.Issue;\n * @see http://www.eclipse.org/Xtext/documentation.html#quickfixes\n * @author mrb@certware.net\n /**\n * Fix duplicated intent entries by removing one.\n */\n @Fix(IntentSpecificationValidator.UNIQUE_INTENTS_REFINEMENT)\n public void removeIntent(final Issue issue, final IssueResolutionAcceptor acceptor) {\n String _plus = (\"Remove intent named\" + \" \");\n String[] _data = issue.getData();\n String _get = _data[0];\n String _plus_1 = (_plus + _get);\n final ISemanticModification _function = new ISemanticModification() {\n public void apply(final EObject element, final IModificationContext context) throws Exception {\n Refinement container = ((Refinement) element);\n String[] _data = issue.getData();\n String _get = _data[0];\n String itemName = ((String) _get);\n EList<Intent> list = container.getIntents();\n Iterator<Intent> iter = list.iterator();\n Intent lastItem = ((Intent) null);\n boolean _hasNext = iter.hasNext();\n boolean _while = _hasNext;\n while (_while) {\n {\n Intent item = iter.next();\n String _name = item.getName();\n boolean _equals = _name.equals(itemName);\n if (_equals) {\n lastItem = item;\n }\n }\n boolean _hasNext_1 = iter.hasNext();\n _while = _hasNext_1;\n }\n boolean _notEquals = (!Objects.equal(lastItem, null));\n if (_notEquals) {\n list.remove(lastItem);\n }\n }\n };\n acceptor.accept(issue, \n \"Remove duplicated entry\", _plus_1, \n \"obj16/intent.gif\", _function);\n }\n \n /**\n * Fix duplicated intent entries by removing one.\n */\n @Fix(IntentSpecificationValidator.UNIQUE_DECOMPOSITION_INTENT)\n public void removeDecomposition(final Issue issue, final IssueResolutionAcceptor acceptor) {\n String _plus = (\"Remove decomposition named\" + \" \");\n String[] _data = issue.getData();\n String _get = _data[0];\n String _plus_1 = (_plus + _get);\n final ISemanticModification _function = new ISemanticModification() {\n public void apply(final EObject element, final IModificationContext context) throws Exception {\n Intent container = ((Intent) element);\n String[] _data = issue.getData();\n String _get = _data[0];\n String itemName = ((String) _get);\n EList<Decomposition> list = container.getDecompositions();\n Iterator<Decomposition> iter = list.iterator();\n Decomposition lastItem = ((Decomposition) null);\n boolean _hasNext = iter.hasNext();\n boolean _while = _hasNext;\n while (_while) {\n {\n Decomposition _next = iter.next();\n Decomposition item = ((Decomposition) _next);\n String _name = item.getName();\n boolean _equals = _name.equals(itemName);\n if (_equals) {\n lastItem = item;\n }\n }\n boolean _hasNext_1 = iter.hasNext();\n _while = _hasNext_1;\n }\n boolean _notEquals = (!Objects.equal(lastItem, null));\n if (_notEquals) {\n list.remove(lastItem);\n }\n }\n };\n acceptor.accept(issue, \n \"Remove duplicated decomposition\", _plus_1, \n \"obj16/decomposition.gif\", _function);\n }\n \n /**\n * Fix duplicated list entries by removing one.\n */\n @Fix(IntentSpecificationValidator.UNIQUE_LIST_ITEM_LIST_ITEM)\n public void removeListItem(final Issue issue, final IssueResolutionAcceptor acceptor) {\n String _plus = (\"Remove list item named\" + \" \");\n String[] _data = issue.getData();\n String _get = _data[0];\n String _plus_1 = (_plus + _get);\n final ISemanticModification _function = new ISemanticModification() {\n public void apply(final EObject element, final IModificationContext context) throws Exception {\n ListItem outerList = ((ListItem) element);\n String[] _data = issue.getData();\n String _get = _data[0];\n String itemName = ((String) _get);\n EList<ListItem> list = outerList.getItemReferences();\n Iterator<ListItem> iter = list.iterator();\n ListItem lastItem = ((ListItem) null);\n boolean _hasNext = iter.hasNext();\n boolean _while = _hasNext;\n while (_while) {\n {\n ListItem item = iter.next();\n String _name = item.getName();\n boolean _equals = _name.equals(itemName);\n if (_equals) {\n lastItem = item;\n }\n }\n boolean _hasNext_1 = iter.hasNext();\n _while = _hasNext_1;\n }\n boolean _notEquals = (!Objects.equal(lastItem, null));\n if (_notEquals) {\n list.remove(lastItem);\n }\n }\n };\n acceptor.accept(issue, \n \"Remove duplicated list item\", _plus_1, \n \"obj16/listitem.gif\", _function);\n }\n \n @Fix(IntentSpecificationValidator.UNIQUE_MODEL_ITEM_LIST_ITEM)\n public void removeModelItem(final Issue issue, final IssueResolutionAcceptor acceptor) {\n String _plus = (\"Remove model item named\" + \" \");\n String[] _data = issue.getData();\n String _get = _data[0];\n String _plus_1 = (_plus + _get);\n final ISemanticModification _function = new ISemanticModification() {\n public void apply(final EObject element, final IModificationContext context) throws Exception {\n ListItem outerList = ((ListItem) element);\n String[] _data = issue.getData();\n String _get = _data[0];\n String itemName = ((String) _get);\n EList<ModelItem> list = outerList.getModelReferences();\n Iterator<ModelItem> iter = list.iterator();\n ModelItem lastItem = ((ModelItem) null);\n boolean _hasNext = iter.hasNext();\n boolean _while = _hasNext;\n while (_while) {\n {\n ModelItem item = iter.next();\n String _name = item.getName();\n boolean _equals = _name.equals(itemName);\n if (_equals) {\n lastItem = item;\n }\n }\n boolean _hasNext_1 = iter.hasNext();\n _while = _hasNext_1;\n }\n boolean _notEquals = (!Objects.equal(lastItem, null));\n if (_notEquals) {\n list.remove(lastItem);\n }\n }\n };\n acceptor.accept(issue, \n \"Remove duplicated entry\", _plus_1, \n \"obj16/modelitem.gif\", _function);\n }", "new_methods": [ { "arguments": [ "final Issue issue", " final IssueResolutionAcceptor acceptor" ], "filename": "net.certware.intent.ui/xtend-gen/net/certware/intent/ui/quickfix/IntentSpecificationQuickfixProvider.java", "implementation": "String _plus = (\"Remove intent named\" + \" \");\n String[] _data = issue.getData();\n String _get = _data[0];\n String _plus_1 = (_plus + _get);\n final ISemanticModification _function = new ISemanticModification() {\n public void apply(final EObject element, final IModificationContext context) throws Exception {\n Refinement container = ((Refinement) element);\n String[] _data = issue.getData();\n String _get = _data[0];\n String itemName = ((String) _get);\n EList<Intent> list = container.getIntents();\n Iterator<Intent> iter = list.iterator();\n Intent lastItem = ((Intent) null);\n boolean _hasNext = iter.hasNext();\n boolean _while = _hasNext;\n while (_while) {\n {\n Intent item = iter.next();\n String _name = item.getName();\n boolean _equals = _name.equals(itemName);\n if (_equals) {\n lastItem = item;", "signature": "void removeIntent(final Issue issue, final IssueResolutionAcceptor acceptor)" }, { "arguments": [ "final Issue issue", " final IssueResolutionAcceptor acceptor" ], "filename": "net.certware.intent.ui/xtend-gen/net/certware/intent/ui/quickfix/IntentSpecificationQuickfixProvider.java", "implementation": "String _plus = (\"Remove decomposition named\" + \" \");\n String[] _data = issue.getData();\n String _get = _data[0];\n String _plus_1 = (_plus + _get);\n final ISemanticModification _function = new ISemanticModification() {\n public void apply(final EObject element, final IModificationContext context) throws Exception {\n Intent container = ((Intent) element);\n String[] _data = issue.getData();\n String _get = _data[0];\n String itemName = ((String) _get);\n EList<Decomposition> list = container.getDecompositions();\n Iterator<Decomposition> iter = list.iterator();\n Decomposition lastItem = ((Decomposition) null);\n boolean _hasNext = iter.hasNext();\n boolean _while = _hasNext;\n while (_while) {\n {\n Decomposition _next = iter.next();\n Decomposition item = ((Decomposition) _next);\n String _name = item.getName();\n boolean _equals = _name.equals(itemName);\n if (_equals) {\n lastItem = item;", "signature": "void removeDecomposition(final Issue issue, final IssueResolutionAcceptor acceptor)" }, { "arguments": [ "final Issue issue", " final IssueResolutionAcceptor acceptor" ], "filename": "net.certware.intent.ui/xtend-gen/net/certware/intent/ui/quickfix/IntentSpecificationQuickfixProvider.java", "implementation": "String _plus = (\"Remove list item named\" + \" \");\n String[] _data = issue.getData();\n String _get = _data[0];\n String _plus_1 = (_plus + _get);\n final ISemanticModification _function = new ISemanticModification() {\n public void apply(final EObject element, final IModificationContext context) throws Exception {\n ListItem outerList = ((ListItem) element);\n String[] _data = issue.getData();\n String _get = _data[0];\n String itemName = ((String) _get);\n EList<ListItem> list = outerList.getItemReferences();\n Iterator<ListItem> iter = list.iterator();\n ListItem lastItem = ((ListItem) null);\n boolean _hasNext = iter.hasNext();\n boolean _while = _hasNext;\n while (_while) {\n {\n ListItem item = iter.next();\n String _name = item.getName();\n boolean _equals = _name.equals(itemName);\n if (_equals) {\n lastItem = item;", "signature": "void removeListItem(final Issue issue, final IssueResolutionAcceptor acceptor)" }, { "arguments": [ "final Issue issue", " final IssueResolutionAcceptor acceptor" ], "filename": "net.certware.intent.ui/xtend-gen/net/certware/intent/ui/quickfix/IntentSpecificationQuickfixProvider.java", "implementation": "String _plus = (\"Remove model item named\" + \" \");\n String[] _data = issue.getData();\n String _get = _data[0];\n String _plus_1 = (_plus + _get);\n final ISemanticModification _function = new ISemanticModification() {\n public void apply(final EObject element, final IModificationContext context) throws Exception {\n ListItem outerList = ((ListItem) element);\n String[] _data = issue.getData();\n String _get = _data[0];\n String itemName = ((String) _get);\n EList<ModelItem> list = outerList.getModelReferences();\n Iterator<ModelItem> iter = list.iterator();\n ModelItem lastItem = ((ModelItem) null);\n boolean _hasNext = iter.hasNext();\n boolean _while = _hasNext;\n while (_while) {\n {\n ModelItem item = iter.next();\n String _name = item.getName();\n boolean _equals = _name.equals(itemName);\n if (_equals) {\n lastItem = item;", "signature": "void removeModelItem(final Issue issue, final IssueResolutionAcceptor acceptor)" } ], "old_code": " * generated by Xtext\n * \n * see http://www.eclipse.org/Xtext/documentation.html#quickfixes", "old_methods": [], "patch": "@@ -1,15 +1,199 @@\n /**\n- * generated by Xtext\n+ * NOT generated by Xtext\n */\n package net.certware.intent.ui.quickfix;\n \n+import com.google.common.base.Objects;\n+import java.util.Iterator;\n+import net.certware.intent.intentSpecification.Decomposition;\n+import net.certware.intent.intentSpecification.Intent;\n+import net.certware.intent.intentSpecification.ListItem;\n+import net.certware.intent.intentSpecification.ModelItem;\n+import net.certware.intent.intentSpecification.Refinement;\n+import net.certware.intent.validation.IntentSpecificationValidator;\n+import org.eclipse.emf.common.util.EList;\n+import org.eclipse.emf.ecore.EObject;\n+import org.eclipse.xtext.ui.editor.model.edit.IModificationContext;\n+import org.eclipse.xtext.ui.editor.model.edit.ISemanticModification;\n import org.eclipse.xtext.ui.editor.quickfix.DefaultQuickfixProvider;\n+import org.eclipse.xtext.ui.editor.quickfix.Fix;\n+import org.eclipse.xtext.ui.editor.quickfix.IssueResolutionAcceptor;\n+import org.eclipse.xtext.validation.Issue;\n \n /**\n * Custom quickfixes.\n- * \n- * see http://www.eclipse.org/Xtext/documentation.html#quickfixes\n+ * @see http://www.eclipse.org/Xtext/documentation.html#quickfixes\n+ * @author mrb@certware.net\n */\n @SuppressWarnings(\"all\")\n public class IntentSpecificationQuickfixProvider extends DefaultQuickfixProvider {\n+ /**\n+ * Fix duplicated intent entries by removing one.\n+ */\n+ @Fix(IntentSpecificationValidator.UNIQUE_INTENTS_REFINEMENT)\n+ public void removeIntent(final Issue issue, final IssueResolutionAcceptor acceptor) {\n+ String _plus = (\"Remove intent named\" + \" \");\n+ String[] _data = issue.getData();\n+ String _get = _data[0];\n+ String _plus_1 = (_plus + _get);\n+ final ISemanticModification _function = new ISemanticModification() {\n+ public void apply(final EObject element, final IModificationContext context) throws Exception {\n+ Refinement container = ((Refinement) element);\n+ String[] _data = issue.getData();\n+ String _get = _data[0];\n+ String itemName = ((String) _get);\n+ EList<Intent> list = container.getIntents();\n+ Iterator<Intent> iter = list.iterator();\n+ Intent lastItem = ((Intent) null);\n+ boolean _hasNext = iter.hasNext();\n+ boolean _while = _hasNext;\n+ while (_while) {\n+ {\n+ Intent item = iter.next();\n+ String _name = item.getName();\n+ boolean _equals = _name.equals(itemName);\n+ if (_equals) {\n+ lastItem = item;\n+ }\n+ }\n+ boolean _hasNext_1 = iter.hasNext();\n+ _while = _hasNext_1;\n+ }\n+ boolean _notEquals = (!Objects.equal(lastItem, null));\n+ if (_notEquals) {\n+ list.remove(lastItem);\n+ }\n+ }\n+ };\n+ acceptor.accept(issue, \n+ \"Remove duplicated entry\", _plus_1, \n+ \"obj16/intent.gif\", _function);\n+ }\n+ \n+ /**\n+ * Fix duplicated intent entries by removing one.\n+ */\n+ @Fix(IntentSpecificationValidator.UNIQUE_DECOMPOSITION_INTENT)\n+ public void removeDecomposition(final Issue issue, final IssueResolutionAcceptor acceptor) {\n+ String _plus = (\"Remove decomposition named\" + \" \");\n+ String[] _data = issue.getData();\n+ String _get = _data[0];\n+ String _plus_1 = (_plus + _get);\n+ final ISemanticModification _function = new ISemanticModification() {\n+ public void apply(final EObject element, final IModificationContext context) throws Exception {\n+ Intent container = ((Intent) element);\n+ String[] _data = issue.getData();\n+ String _get = _data[0];\n+ String itemName = ((String) _get);\n+ EList<Decomposition> list = container.getDecompositions();\n+ Iterator<Decomposition> iter = list.iterator();\n+ Decomposition lastItem = ((Decomposition) null);\n+ boolean _hasNext = iter.hasNext();\n+ boolean _while = _hasNext;\n+ while (_while) {\n+ {\n+ Decomposition _next = iter.next();\n+ Decomposition item = ((Decomposition) _next);\n+ String _name = item.getName();\n+ boolean _equals = _name.equals(itemName);\n+ if (_equals) {\n+ lastItem = item;\n+ }\n+ }\n+ boolean _hasNext_1 = iter.hasNext();\n+ _while = _hasNext_1;\n+ }\n+ boolean _notEquals = (!Objects.equal(lastItem, null));\n+ if (_notEquals) {\n+ list.remove(lastItem);\n+ }\n+ }\n+ };\n+ acceptor.accept(issue, \n+ \"Remove duplicated decomposition\", _plus_1, \n+ \"obj16/decomposition.gif\", _function);\n+ }\n+ \n+ /**\n+ * Fix duplicated list entries by removing one.\n+ */\n+ @Fix(IntentSpecificationValidator.UNIQUE_LIST_ITEM_LIST_ITEM)\n+ public void removeListItem(final Issue issue, final IssueResolutionAcceptor acceptor) {\n+ String _plus = (\"Remove list item named\" + \" \");\n+ String[] _data = issue.getData();\n+ String _get = _data[0];\n+ String _plus_1 = (_plus + _get);\n+ final ISemanticModification _function = new ISemanticModification() {\n+ public void apply(final EObject element, final IModificationContext context) throws Exception {\n+ ListItem outerList = ((ListItem) element);\n+ String[] _data = issue.getData();\n+ String _get = _data[0];\n+ String itemName = ((String) _get);\n+ EList<ListItem> list = outerList.getItemReferences();\n+ Iterator<ListItem> iter = list.iterator();\n+ ListItem lastItem = ((ListItem) null);\n+ boolean _hasNext = iter.hasNext();\n+ boolean _while = _hasNext;\n+ while (_while) {\n+ {\n+ ListItem item = iter.next();\n+ String _name = item.getName();\n+ boolean _equals = _name.equals(itemName);\n+ if (_equals) {\n+ lastItem = item;\n+ }\n+ }\n+ boolean _hasNext_1 = iter.hasNext();\n+ _while = _hasNext_1;\n+ }\n+ boolean _notEquals = (!Objects.equal(lastItem, null));\n+ if (_notEquals) {\n+ list.remove(lastItem);\n+ }\n+ }\n+ };\n+ acceptor.accept(issue, \n+ \"Remove duplicated list item\", _plus_1, \n+ \"obj16/listitem.gif\", _function);\n+ }\n+ \n+ @Fix(IntentSpecificationValidator.UNIQUE_MODEL_ITEM_LIST_ITEM)\n+ public void removeModelItem(final Issue issue, final IssueResolutionAcceptor acceptor) {\n+ String _plus = (\"Remove model item named\" + \" \");\n+ String[] _data = issue.getData();\n+ String _get = _data[0];\n+ String _plus_1 = (_plus + _get);\n+ final ISemanticModification _function = new ISemanticModification() {\n+ public void apply(final EObject element, final IModificationContext context) throws Exception {\n+ ListItem outerList = ((ListItem) element);\n+ String[] _data = issue.getData();\n+ String _get = _data[0];\n+ String itemName = ((String) _get);\n+ EList<ModelItem> list = outerList.getModelReferences();\n+ Iterator<ModelItem> iter = list.iterator();\n+ ModelItem lastItem = ((ModelItem) null);\n+ boolean _hasNext = iter.hasNext();\n+ boolean _while = _hasNext;\n+ while (_while) {\n+ {\n+ ModelItem item = iter.next();\n+ String _name = item.getName();\n+ boolean _equals = _name.equals(itemName);\n+ if (_equals) {\n+ lastItem = item;\n+ }\n+ }\n+ boolean _hasNext_1 = iter.hasNext();\n+ _while = _hasNext_1;\n+ }\n+ boolean _notEquals = (!Objects.equal(lastItem, null));\n+ if (_notEquals) {\n+ list.remove(lastItem);\n+ }\n+ }\n+ };\n+ acceptor.accept(issue, \n+ \"Remove duplicated entry\", _plus_1, \n+ \"obj16/modelitem.gif\", _function);\n+ }\n }", "raw_url": "https://github.com/nasa/CertWare/raw/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent.ui%2Fxtend-gen%2Fnet%2Fcertware%2Fintent%2Fui%2Fquickfix%2FIntentSpecificationQuickfixProvider.java", "sha": "b4d28f50087b281d599cf0e2ac7dcde57b03c15c", "status": "modified" }, { "additions": 32, "blob_url": "https://github.com/nasa/CertWare/blob/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FIntentSpecification.ecore", "changes": 44, "contents_url": "https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FIntentSpecification.ecore?ref=27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9", "deletions": 12, "filename": "net.certware.intent/src-gen/net/certware/intent/IntentSpecification.ecore", "new_code": " <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"name\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString\"/>\n <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"name\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString\"/>\n <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"type\" eType=\"#//IntentType\"\n containment=\"true\"/>\n <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"name\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString\"/>\n <eClassifiers xsi:type=\"ecore:EClass\" name=\"IntentType\">\n <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"typeName\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString\"/>\n </eClassifiers>\n <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"type\" eType=\"#//DecompositionType\"\n containment=\"true\"/>\n <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"name\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString\"/>\n <eClassifiers xsi:type=\"ecore:EClass\" name=\"DecompositionType\">\n <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"typeName\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString\"/>\n </eClassifiers>\n <eClassifiers xsi:type=\"ecore:EClass\" name=\"DocItemType\">\n <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"typeName\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString\"/>\n </eClassifiers>\n <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"type\" eType=\"#//DocItemType\"\n containment=\"true\"/>\n <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"name\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString\"/>\n <eClassifiers xsi:type=\"ecore:EClass\" name=\"ModelType\">\n <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"typeName\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString\"/>\n </eClassifiers>\n <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"type\" eType=\"#//ModelType\"\n containment=\"true\"/>\n <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"name\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString\"/>\n <eClassifiers xsi:type=\"ecore:EClass\" name=\"ListItemType\">\n <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"typeName\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString\"/>\n </eClassifiers>\n <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"type\" eType=\"#//ListItemType\"\n containment=\"true\"/>\n <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"name\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString\"/>", "new_methods": [], "old_code": " <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"id\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString\"/>\n <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"id\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString\"/>\n <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"type\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString\"/>\n <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"id\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString\"/>\n <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"type\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString\"/>\n <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"id\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString\"/>\n <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"type\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString\"/>\n <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"id\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString\"/>\n <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"type\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString\"/>\n <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"id\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString\"/>\n <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"type\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString\"/>\n <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"id\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString\"/>", "old_methods": [], "patch": "@@ -3,26 +3,31 @@\n xmlns:ecore=\"http://www.eclipse.org/emf/2002/Ecore\" name=\"intentSpecification\" nsURI=\"http://www.certware.net/intent/IntentSpecification\"\n nsPrefix=\"intentSpecification\">\n <eClassifiers xsi:type=\"ecore:EClass\" name=\"Specification\">\n- <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"id\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString\"/>\n+ <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"name\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString\"/>\n <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"refinements\" upperBound=\"-1\"\n eType=\"#//Refinement\" containment=\"true\"/>\n </eClassifiers>\n <eClassifiers xsi:type=\"ecore:EClass\" name=\"Refinement\">\n- <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"id\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString\"/>\n+ <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"name\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString\"/>\n <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"desc\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString\"/>\n <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"intents\" upperBound=\"-1\"\n eType=\"#//Intent\" containment=\"true\"/>\n </eClassifiers>\n <eClassifiers xsi:type=\"ecore:EClass\" name=\"Intent\">\n- <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"type\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString\"/>\n- <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"id\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString\"/>\n+ <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"type\" eType=\"#//IntentType\"\n+ containment=\"true\"/>\n+ <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"name\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString\"/>\n <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"desc\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString\"/>\n <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"decompositions\" upperBound=\"-1\"\n eType=\"#//Decomposition\" containment=\"true\"/>\n </eClassifiers>\n+ <eClassifiers xsi:type=\"ecore:EClass\" name=\"IntentType\">\n+ <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"typeName\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString\"/>\n+ </eClassifiers>\n <eClassifiers xsi:type=\"ecore:EClass\" name=\"Decomposition\">\n- <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"type\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString\"/>\n- <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"id\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString\"/>\n+ <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"type\" eType=\"#//DecompositionType\"\n+ containment=\"true\"/>\n+ <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"name\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString\"/>\n <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"desc\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString\"/>\n <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"documents\" upperBound=\"-1\"\n eType=\"#//Document\" containment=\"true\"/>\n@@ -31,23 +36,38 @@\n <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"items\" upperBound=\"-1\"\n eType=\"#//ListItem\" containment=\"true\"/>\n </eClassifiers>\n+ <eClassifiers xsi:type=\"ecore:EClass\" name=\"DecompositionType\">\n+ <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"typeName\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString\"/>\n+ </eClassifiers>\n <eClassifiers xsi:type=\"ecore:EClass\" name=\"Document\">\n <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"entries\" upperBound=\"-1\"\n eType=\"#//DocItem\" containment=\"true\"/>\n </eClassifiers>\n+ <eClassifiers xsi:type=\"ecore:EClass\" name=\"DocItemType\">\n+ <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"typeName\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString\"/>\n+ </eClassifiers>\n <eClassifiers xsi:type=\"ecore:EClass\" name=\"DocItem\">\n- <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"type\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString\"/>\n- <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"id\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString\"/>\n+ <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"type\" eType=\"#//DocItemType\"\n+ containment=\"true\"/>\n+ <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"name\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString\"/>\n <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"ref\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString\"/>\n </eClassifiers>\n+ <eClassifiers xsi:type=\"ecore:EClass\" name=\"ModelType\">\n+ <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"typeName\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString\"/>\n+ </eClassifiers>\n <eClassifiers xsi:type=\"ecore:EClass\" name=\"ModelItem\">\n- <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"type\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString\"/>\n- <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"id\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString\"/>\n+ <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"type\" eType=\"#//ModelType\"\n+ containment=\"true\"/>\n+ <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"name\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString\"/>\n <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"desc\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString\"/>\n </eClassifiers>\n+ <eClassifiers xsi:type=\"ecore:EClass\" name=\"ListItemType\">\n+ <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"typeName\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString\"/>\n+ </eClassifiers>\n <eClassifiers xsi:type=\"ecore:EClass\" name=\"ListItem\">\n- <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"type\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString\"/>\n- <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"id\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString\"/>\n+ <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"type\" eType=\"#//ListItemType\"\n+ containment=\"true\"/>\n+ <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"name\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString\"/>\n <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"desc\" eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString\"/>\n <eStructuralFeatures xsi:type=\"ecore:EReference\" name=\"docReferences\" unique=\"false\"\n upperBound=\"-1\" eType=\"#//DocItem\"/>", "raw_url": "https://github.com/nasa/CertWare/raw/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FIntentSpecification.ecore", "sha": "cddff653591222ff87c6f4aa003c852e2657f69d", "status": "modified" }, { "additions": 27, "blob_url": "https://github.com/nasa/CertWare/blob/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FIntentSpecification.genmodel", "changes": 39, "contents_url": "https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FIntentSpecification.genmodel?ref=27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9", "deletions": 12, "filename": "net.certware.intent/src-gen/net/certware/intent/IntentSpecification.genmodel", "new_code": " <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute IntentSpecification.ecore#//Specification/name\"/>\n <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute IntentSpecification.ecore#//Refinement/name\"/>\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference IntentSpecification.ecore#//Intent/type\"/>\n <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute IntentSpecification.ecore#//Intent/name\"/>\n <genClasses ecoreClass=\"IntentSpecification.ecore#//IntentType\">\n <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute IntentSpecification.ecore#//IntentType/typeName\"/>\n </genClasses>\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference IntentSpecification.ecore#//Decomposition/type\"/>\n <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute IntentSpecification.ecore#//Decomposition/name\"/>\n <genClasses ecoreClass=\"IntentSpecification.ecore#//DecompositionType\">\n <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute IntentSpecification.ecore#//DecompositionType/typeName\"/>\n </genClasses>\n <genClasses ecoreClass=\"IntentSpecification.ecore#//DocItemType\">\n <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute IntentSpecification.ecore#//DocItemType/typeName\"/>\n </genClasses>\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference IntentSpecification.ecore#//DocItem/type\"/>\n <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute IntentSpecification.ecore#//DocItem/name\"/>\n <genClasses ecoreClass=\"IntentSpecification.ecore#//ModelType\">\n <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute IntentSpecification.ecore#//ModelType/typeName\"/>\n </genClasses>\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference IntentSpecification.ecore#//ModelItem/type\"/>\n <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute IntentSpecification.ecore#//ModelItem/name\"/>\n <genClasses ecoreClass=\"IntentSpecification.ecore#//ListItemType\">\n <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute IntentSpecification.ecore#//ListItemType/typeName\"/>\n </genClasses>\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference IntentSpecification.ecore#//ListItem/type\"/>\n <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute IntentSpecification.ecore#//ListItem/name\"/>", "new_methods": [], "old_code": " <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute IntentSpecification.ecore#//Specification/id\"/>\n <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute IntentSpecification.ecore#//Refinement/id\"/>\n <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute IntentSpecification.ecore#//Intent/type\"/>\n <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute IntentSpecification.ecore#//Intent/id\"/>\n <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute IntentSpecification.ecore#//Decomposition/type\"/>\n <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute IntentSpecification.ecore#//Decomposition/id\"/>\n <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute IntentSpecification.ecore#//DocItem/type\"/>\n <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute IntentSpecification.ecore#//DocItem/id\"/>\n <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute IntentSpecification.ecore#//ModelItem/type\"/>\n <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute IntentSpecification.ecore#//ModelItem/id\"/>\n <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute IntentSpecification.ecore#//ListItem/type\"/>\n <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute IntentSpecification.ecore#//ListItem/id\"/>", "old_methods": [], "patch": "@@ -9,44 +9,59 @@\n <genPackages prefix=\"IntentSpecification\" basePackage=\"net.certware.intent\" disposableProviderFactory=\"true\"\n fileExtensions=\"intent\" ecorePackage=\"IntentSpecification.ecore#/\">\n <genClasses ecoreClass=\"IntentSpecification.ecore#//Specification\">\n- <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute IntentSpecification.ecore#//Specification/id\"/>\n+ <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute IntentSpecification.ecore#//Specification/name\"/>\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference IntentSpecification.ecore#//Specification/refinements\"/>\n </genClasses>\n <genClasses ecoreClass=\"IntentSpecification.ecore#//Refinement\">\n- <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute IntentSpecification.ecore#//Refinement/id\"/>\n+ <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute IntentSpecification.ecore#//Refinement/name\"/>\n <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute IntentSpecification.ecore#//Refinement/desc\"/>\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference IntentSpecification.ecore#//Refinement/intents\"/>\n </genClasses>\n <genClasses ecoreClass=\"IntentSpecification.ecore#//Intent\">\n- <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute IntentSpecification.ecore#//Intent/type\"/>\n- <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute IntentSpecification.ecore#//Intent/id\"/>\n+ <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference IntentSpecification.ecore#//Intent/type\"/>\n+ <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute IntentSpecification.ecore#//Intent/name\"/>\n <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute IntentSpecification.ecore#//Intent/desc\"/>\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference IntentSpecification.ecore#//Intent/decompositions\"/>\n </genClasses>\n+ <genClasses ecoreClass=\"IntentSpecification.ecore#//IntentType\">\n+ <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute IntentSpecification.ecore#//IntentType/typeName\"/>\n+ </genClasses>\n <genClasses ecoreClass=\"IntentSpecification.ecore#//Decomposition\">\n- <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute IntentSpecification.ecore#//Decomposition/type\"/>\n- <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute IntentSpecification.ecore#//Decomposition/id\"/>\n+ <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference IntentSpecification.ecore#//Decomposition/type\"/>\n+ <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute IntentSpecification.ecore#//Decomposition/name\"/>\n <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute IntentSpecification.ecore#//Decomposition/desc\"/>\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference IntentSpecification.ecore#//Decomposition/documents\"/>\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference IntentSpecification.ecore#//Decomposition/models\"/>\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference IntentSpecification.ecore#//Decomposition/items\"/>\n </genClasses>\n+ <genClasses ecoreClass=\"IntentSpecification.ecore#//DecompositionType\">\n+ <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute IntentSpecification.ecore#//DecompositionType/typeName\"/>\n+ </genClasses>\n <genClasses ecoreClass=\"IntentSpecification.ecore#//Document\">\n <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference IntentSpecification.ecore#//Document/entries\"/>\n </genClasses>\n+ <genClasses ecoreClass=\"IntentSpecification.ecore#//DocItemType\">\n+ <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute IntentSpecification.ecore#//DocItemType/typeName\"/>\n+ </genClasses>\n <genClasses ecoreClass=\"IntentSpecification.ecore#//DocItem\">\n- <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute IntentSpecification.ecore#//DocItem/type\"/>\n- <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute IntentSpecification.ecore#//DocItem/id\"/>\n+ <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference IntentSpecification.ecore#//DocItem/type\"/>\n+ <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute IntentSpecification.ecore#//DocItem/name\"/>\n <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute IntentSpecification.ecore#//DocItem/ref\"/>\n </genClasses>\n+ <genClasses ecoreClass=\"IntentSpecification.ecore#//ModelType\">\n+ <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute IntentSpecification.ecore#//ModelType/typeName\"/>\n+ </genClasses>\n <genClasses ecoreClass=\"IntentSpecification.ecore#//ModelItem\">\n- <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute IntentSpecification.ecore#//ModelItem/type\"/>\n- <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute IntentSpecification.ecore#//ModelItem/id\"/>\n+ <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference IntentSpecification.ecore#//ModelItem/type\"/>\n+ <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute IntentSpecification.ecore#//ModelItem/name\"/>\n <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute IntentSpecification.ecore#//ModelItem/desc\"/>\n </genClasses>\n+ <genClasses ecoreClass=\"IntentSpecification.ecore#//ListItemType\">\n+ <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute IntentSpecification.ecore#//ListItemType/typeName\"/>\n+ </genClasses>\n <genClasses ecoreClass=\"IntentSpecification.ecore#//ListItem\">\n- <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute IntentSpecification.ecore#//ListItem/type\"/>\n- <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute IntentSpecification.ecore#//ListItem/id\"/>\n+ <genFeatures property=\"None\" children=\"true\" createChild=\"true\" ecoreFeature=\"ecore:EReference IntentSpecification.ecore#//ListItem/type\"/>\n+ <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute IntentSpecification.ecore#//ListItem/name\"/>\n <genFeatures createChild=\"false\" ecoreFeature=\"ecore:EAttribute IntentSpecification.ecore#//ListItem/desc\"/>\n <genFeatures notify=\"false\" createChild=\"false\" propertySortChoices=\"true\" ecoreFeature=\"ecore:EReference IntentSpecification.ecore#//ListItem/docReferences\"/>\n <genFeatures notify=\"false\" createChild=\"false\" propertySortChoices=\"true\" ecoreFeature=\"ecore:EReference IntentSpecification.ecore#//ListItem/itemReferences\"/>", "raw_url": "https://github.com/nasa/CertWare/raw/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FIntentSpecification.genmodel", "sha": "9e5c3914e6ea6b49dca859fc23f99c66ff79e11e", "status": "modified" }, { "additions": 20, "blob_url": "https://github.com/nasa/CertWare/blob/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2FDecomposition.java", "changes": 40, "contents_url": "https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2FDecomposition.java?ref=27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9", "deletions": 20, "filename": "net.certware.intent/src-gen/net/certware/intent/intentSpecification/Decomposition.java", "new_code": " * <li>{@link net.certware.intent.intentSpecification.Decomposition#getName <em>Name</em>}</li>\n * Returns the value of the '<em><b>Type</b></em>' containment reference.\n * If the meaning of the '<em>Type</em>' containment reference isn't clear,\n * @return the value of the '<em>Type</em>' containment reference.\n * @see #setType(DecompositionType)\n * @model containment=\"true\"\n DecompositionType getType();\n * Sets the value of the '{@link net.certware.intent.intentSpecification.Decomposition#getType <em>Type</em>}' containment reference.\n * @param value the new value of the '<em>Type</em>' containment reference.\n void setType(DecompositionType value);\n * Returns the value of the '<em><b>Name</b></em>' attribute.\n * If the meaning of the '<em>Name</em>' attribute isn't clear,\n * @return the value of the '<em>Name</em>' attribute.\n * @see #setName(String)\n * @see net.certware.intent.intentSpecification.IntentSpecificationPackage#getDecomposition_Name()\n String getName();\n * Sets the value of the '{@link net.certware.intent.intentSpecification.Decomposition#getName <em>Name</em>}' attribute.\n * @param value the new value of the '<em>Name</em>' attribute.\n * @see #getName()\n void setName(String value);", "new_methods": [], "old_code": " * <li>{@link net.certware.intent.intentSpecification.Decomposition#getId <em>Id</em>}</li>\n * Returns the value of the '<em><b>Type</b></em>' attribute.\n * If the meaning of the '<em>Type</em>' attribute isn't clear,\n * @return the value of the '<em>Type</em>' attribute.\n * @see #setType(String)\n * @model\n String getType();\n * Sets the value of the '{@link net.certware.intent.intentSpecification.Decomposition#getType <em>Type</em>}' attribute.\n * @param value the new value of the '<em>Type</em>' attribute.\n void setType(String value);\n * Returns the value of the '<em><b>Id</b></em>' attribute.\n * If the meaning of the '<em>Id</em>' attribute isn't clear,\n * @return the value of the '<em>Id</em>' attribute.\n * @see #setId(String)\n * @see net.certware.intent.intentSpecification.IntentSpecificationPackage#getDecomposition_Id()\n String getId();\n * Sets the value of the '{@link net.certware.intent.intentSpecification.Decomposition#getId <em>Id</em>}' attribute.\n * @param value the new value of the '<em>Id</em>' attribute.\n * @see #getId()\n void setId(String value);", "old_methods": [], "patch": "@@ -15,7 +15,7 @@\n * The following features are supported:\n * <ul>\n * <li>{@link net.certware.intent.intentSpecification.Decomposition#getType <em>Type</em>}</li>\n- * <li>{@link net.certware.intent.intentSpecification.Decomposition#getId <em>Id</em>}</li>\n+ * <li>{@link net.certware.intent.intentSpecification.Decomposition#getName <em>Name</em>}</li>\n * <li>{@link net.certware.intent.intentSpecification.Decomposition#getDesc <em>Desc</em>}</li>\n * <li>{@link net.certware.intent.intentSpecification.Decomposition#getDocuments <em>Documents</em>}</li>\n * <li>{@link net.certware.intent.intentSpecification.Decomposition#getModels <em>Models</em>}</li>\n@@ -30,56 +30,56 @@\n public interface Decomposition extends EObject\n {\n /**\n- * Returns the value of the '<em><b>Type</b></em>' attribute.\n+ * Returns the value of the '<em><b>Type</b></em>' containment reference.\n * <!-- begin-user-doc -->\n * <p>\n- * If the meaning of the '<em>Type</em>' attribute isn't clear,\n+ * If the meaning of the '<em>Type</em>' containment reference isn't clear,\n * there really should be more of a description here...\n * </p>\n * <!-- end-user-doc -->\n- * @return the value of the '<em>Type</em>' attribute.\n- * @see #setType(String)\n+ * @return the value of the '<em>Type</em>' containment reference.\n+ * @see #setType(DecompositionType)\n * @see net.certware.intent.intentSpecification.IntentSpecificationPackage#getDecomposition_Type()\n- * @model\n+ * @model containment=\"true\"\n * @generated\n */\n- String getType();\n+ DecompositionType getType();\n \n /**\n- * Sets the value of the '{@link net.certware.intent.intentSpecification.Decomposition#getType <em>Type</em>}' attribute.\n+ * Sets the value of the '{@link net.certware.intent.intentSpecification.Decomposition#getType <em>Type</em>}' containment reference.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n- * @param value the new value of the '<em>Type</em>' attribute.\n+ * @param value the new value of the '<em>Type</em>' containment reference.\n * @see #getType()\n * @generated\n */\n- void setType(String value);\n+ void setType(DecompositionType value);\n \n /**\n- * Returns the value of the '<em><b>Id</b></em>' attribute.\n+ * Returns the value of the '<em><b>Name</b></em>' attribute.\n * <!-- begin-user-doc -->\n * <p>\n- * If the meaning of the '<em>Id</em>' attribute isn't clear,\n+ * If the meaning of the '<em>Name</em>' attribute isn't clear,\n * there really should be more of a description here...\n * </p>\n * <!-- end-user-doc -->\n- * @return the value of the '<em>Id</em>' attribute.\n- * @see #setId(String)\n- * @see net.certware.intent.intentSpecification.IntentSpecificationPackage#getDecomposition_Id()\n+ * @return the value of the '<em>Name</em>' attribute.\n+ * @see #setName(String)\n+ * @see net.certware.intent.intentSpecification.IntentSpecificationPackage#getDecomposition_Name()\n * @model\n * @generated\n */\n- String getId();\n+ String getName();\n \n /**\n- * Sets the value of the '{@link net.certware.intent.intentSpecification.Decomposition#getId <em>Id</em>}' attribute.\n+ * Sets the value of the '{@link net.certware.intent.intentSpecification.Decomposition#getName <em>Name</em>}' attribute.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n- * @param value the new value of the '<em>Id</em>' attribute.\n- * @see #getId()\n+ * @param value the new value of the '<em>Name</em>' attribute.\n+ * @see #getName()\n * @generated\n */\n- void setId(String value);\n+ void setName(String value);\n \n /**\n * Returns the value of the '<em><b>Desc</b></em>' attribute.", "raw_url": "https://github.com/nasa/CertWare/raw/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2FDecomposition.java", "sha": "98f71982458d95d10e32701be8e35af734635926", "status": "modified" }, { "additions": 20, "blob_url": "https://github.com/nasa/CertWare/blob/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2FDocItem.java", "changes": 40, "contents_url": "https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2FDocItem.java?ref=27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9", "deletions": 20, "filename": "net.certware.intent/src-gen/net/certware/intent/intentSpecification/DocItem.java", "new_code": " * <li>{@link net.certware.intent.intentSpecification.DocItem#getName <em>Name</em>}</li>\n * Returns the value of the '<em><b>Type</b></em>' containment reference.\n * If the meaning of the '<em>Type</em>' containment reference isn't clear,\n * @return the value of the '<em>Type</em>' containment reference.\n * @see #setType(DocItemType)\n * @model containment=\"true\"\n DocItemType getType();\n * Sets the value of the '{@link net.certware.intent.intentSpecification.DocItem#getType <em>Type</em>}' containment reference.\n * @param value the new value of the '<em>Type</em>' containment reference.\n void setType(DocItemType value);\n * Returns the value of the '<em><b>Name</b></em>' attribute.\n * If the meaning of the '<em>Name</em>' attribute isn't clear,\n * @return the value of the '<em>Name</em>' attribute.\n * @see #setName(String)\n * @see net.certware.intent.intentSpecification.IntentSpecificationPackage#getDocItem_Name()\n String getName();\n * Sets the value of the '{@link net.certware.intent.intentSpecification.DocItem#getName <em>Name</em>}' attribute.\n * @param value the new value of the '<em>Name</em>' attribute.\n * @see #getName()\n void setName(String value);", "new_methods": [], "old_code": " * <li>{@link net.certware.intent.intentSpecification.DocItem#getId <em>Id</em>}</li>\n * Returns the value of the '<em><b>Type</b></em>' attribute.\n * If the meaning of the '<em>Type</em>' attribute isn't clear,\n * @return the value of the '<em>Type</em>' attribute.\n * @see #setType(String)\n * @model\n String getType();\n * Sets the value of the '{@link net.certware.intent.intentSpecification.DocItem#getType <em>Type</em>}' attribute.\n * @param value the new value of the '<em>Type</em>' attribute.\n void setType(String value);\n * Returns the value of the '<em><b>Id</b></em>' attribute.\n * If the meaning of the '<em>Id</em>' attribute isn't clear,\n * @return the value of the '<em>Id</em>' attribute.\n * @see #setId(String)\n * @see net.certware.intent.intentSpecification.IntentSpecificationPackage#getDocItem_Id()\n String getId();\n * Sets the value of the '{@link net.certware.intent.intentSpecification.DocItem#getId <em>Id</em>}' attribute.\n * @param value the new value of the '<em>Id</em>' attribute.\n * @see #getId()\n void setId(String value);", "old_methods": [], "patch": "@@ -13,7 +13,7 @@\n * The following features are supported:\n * <ul>\n * <li>{@link net.certware.intent.intentSpecification.DocItem#getType <em>Type</em>}</li>\n- * <li>{@link net.certware.intent.intentSpecification.DocItem#getId <em>Id</em>}</li>\n+ * <li>{@link net.certware.intent.intentSpecification.DocItem#getName <em>Name</em>}</li>\n * <li>{@link net.certware.intent.intentSpecification.DocItem#getRef <em>Ref</em>}</li>\n * </ul>\n * </p>\n@@ -25,56 +25,56 @@\n public interface DocItem extends EObject\n {\n /**\n- * Returns the value of the '<em><b>Type</b></em>' attribute.\n+ * Returns the value of the '<em><b>Type</b></em>' containment reference.\n * <!-- begin-user-doc -->\n * <p>\n- * If the meaning of the '<em>Type</em>' attribute isn't clear,\n+ * If the meaning of the '<em>Type</em>' containment reference isn't clear,\n * there really should be more of a description here...\n * </p>\n * <!-- end-user-doc -->\n- * @return the value of the '<em>Type</em>' attribute.\n- * @see #setType(String)\n+ * @return the value of the '<em>Type</em>' containment reference.\n+ * @see #setType(DocItemType)\n * @see net.certware.intent.intentSpecification.IntentSpecificationPackage#getDocItem_Type()\n- * @model\n+ * @model containment=\"true\"\n * @generated\n */\n- String getType();\n+ DocItemType getType();\n \n /**\n- * Sets the value of the '{@link net.certware.intent.intentSpecification.DocItem#getType <em>Type</em>}' attribute.\n+ * Sets the value of the '{@link net.certware.intent.intentSpecification.DocItem#getType <em>Type</em>}' containment reference.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n- * @param value the new value of the '<em>Type</em>' attribute.\n+ * @param value the new value of the '<em>Type</em>' containment reference.\n * @see #getType()\n * @generated\n */\n- void setType(String value);\n+ void setType(DocItemType value);\n \n /**\n- * Returns the value of the '<em><b>Id</b></em>' attribute.\n+ * Returns the value of the '<em><b>Name</b></em>' attribute.\n * <!-- begin-user-doc -->\n * <p>\n- * If the meaning of the '<em>Id</em>' attribute isn't clear,\n+ * If the meaning of the '<em>Name</em>' attribute isn't clear,\n * there really should be more of a description here...\n * </p>\n * <!-- end-user-doc -->\n- * @return the value of the '<em>Id</em>' attribute.\n- * @see #setId(String)\n- * @see net.certware.intent.intentSpecification.IntentSpecificationPackage#getDocItem_Id()\n+ * @return the value of the '<em>Name</em>' attribute.\n+ * @see #setName(String)\n+ * @see net.certware.intent.intentSpecification.IntentSpecificationPackage#getDocItem_Name()\n * @model\n * @generated\n */\n- String getId();\n+ String getName();\n \n /**\n- * Sets the value of the '{@link net.certware.intent.intentSpecification.DocItem#getId <em>Id</em>}' attribute.\n+ * Sets the value of the '{@link net.certware.intent.intentSpecification.DocItem#getName <em>Name</em>}' attribute.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n- * @param value the new value of the '<em>Id</em>' attribute.\n- * @see #getId()\n+ * @param value the new value of the '<em>Name</em>' attribute.\n+ * @see #getName()\n * @generated\n */\n- void setId(String value);\n+ void setName(String value);\n \n /**\n * Returns the value of the '<em><b>Ref</b></em>' attribute.", "raw_url": "https://github.com/nasa/CertWare/raw/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2FDocItem.java", "sha": "4575af3ab69ca85d66d4190c97f0825bcf08246c", "status": "modified" }, { "additions": 20, "blob_url": "https://github.com/nasa/CertWare/blob/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2FIntent.java", "changes": 40, "contents_url": "https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2FIntent.java?ref=27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9", "deletions": 20, "filename": "net.certware.intent/src-gen/net/certware/intent/intentSpecification/Intent.java", "new_code": " * <li>{@link net.certware.intent.intentSpecification.Intent#getName <em>Name</em>}</li>\n * Returns the value of the '<em><b>Type</b></em>' containment reference.\n * If the meaning of the '<em>Type</em>' containment reference isn't clear,\n * @return the value of the '<em>Type</em>' containment reference.\n * @see #setType(IntentType)\n * @model containment=\"true\"\n IntentType getType();\n * Sets the value of the '{@link net.certware.intent.intentSpecification.Intent#getType <em>Type</em>}' containment reference.\n * @param value the new value of the '<em>Type</em>' containment reference.\n void setType(IntentType value);\n * Returns the value of the '<em><b>Name</b></em>' attribute.\n * If the meaning of the '<em>Name</em>' attribute isn't clear,\n * @return the value of the '<em>Name</em>' attribute.\n * @see #setName(String)\n * @see net.certware.intent.intentSpecification.IntentSpecificationPackage#getIntent_Name()\n String getName();\n * Sets the value of the '{@link net.certware.intent.intentSpecification.Intent#getName <em>Name</em>}' attribute.\n * @param value the new value of the '<em>Name</em>' attribute.\n * @see #getName()\n void setName(String value);", "new_methods": [], "old_code": " * <li>{@link net.certware.intent.intentSpecification.Intent#getId <em>Id</em>}</li>\n * Returns the value of the '<em><b>Type</b></em>' attribute.\n * If the meaning of the '<em>Type</em>' attribute isn't clear,\n * @return the value of the '<em>Type</em>' attribute.\n * @see #setType(String)\n * @model\n String getType();\n * Sets the value of the '{@link net.certware.intent.intentSpecification.Intent#getType <em>Type</em>}' attribute.\n * @param value the new value of the '<em>Type</em>' attribute.\n void setType(String value);\n * Returns the value of the '<em><b>Id</b></em>' attribute.\n * If the meaning of the '<em>Id</em>' attribute isn't clear,\n * @return the value of the '<em>Id</em>' attribute.\n * @see #setId(String)\n * @see net.certware.intent.intentSpecification.IntentSpecificationPackage#getIntent_Id()\n String getId();\n * Sets the value of the '{@link net.certware.intent.intentSpecification.Intent#getId <em>Id</em>}' attribute.\n * @param value the new value of the '<em>Id</em>' attribute.\n * @see #getId()\n void setId(String value);", "old_methods": [], "patch": "@@ -15,7 +15,7 @@\n * The following features are supported:\n * <ul>\n * <li>{@link net.certware.intent.intentSpecification.Intent#getType <em>Type</em>}</li>\n- * <li>{@link net.certware.intent.intentSpecification.Intent#getId <em>Id</em>}</li>\n+ * <li>{@link net.certware.intent.intentSpecification.Intent#getName <em>Name</em>}</li>\n * <li>{@link net.certware.intent.intentSpecification.Intent#getDesc <em>Desc</em>}</li>\n * <li>{@link net.certware.intent.intentSpecification.Intent#getDecompositions <em>Decompositions</em>}</li>\n * </ul>\n@@ -28,56 +28,56 @@\n public interface Intent extends EObject\n {\n /**\n- * Returns the value of the '<em><b>Type</b></em>' attribute.\n+ * Returns the value of the '<em><b>Type</b></em>' containment reference.\n * <!-- begin-user-doc -->\n * <p>\n- * If the meaning of the '<em>Type</em>' attribute isn't clear,\n+ * If the meaning of the '<em>Type</em>' containment reference isn't clear,\n * there really should be more of a description here...\n * </p>\n * <!-- end-user-doc -->\n- * @return the value of the '<em>Type</em>' attribute.\n- * @see #setType(String)\n+ * @return the value of the '<em>Type</em>' containment reference.\n+ * @see #setType(IntentType)\n * @see net.certware.intent.intentSpecification.IntentSpecificationPackage#getIntent_Type()\n- * @model\n+ * @model containment=\"true\"\n * @generated\n */\n- String getType();\n+ IntentType getType();\n \n /**\n- * Sets the value of the '{@link net.certware.intent.intentSpecification.Intent#getType <em>Type</em>}' attribute.\n+ * Sets the value of the '{@link net.certware.intent.intentSpecification.Intent#getType <em>Type</em>}' containment reference.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n- * @param value the new value of the '<em>Type</em>' attribute.\n+ * @param value the new value of the '<em>Type</em>' containment reference.\n * @see #getType()\n * @generated\n */\n- void setType(String value);\n+ void setType(IntentType value);\n \n /**\n- * Returns the value of the '<em><b>Id</b></em>' attribute.\n+ * Returns the value of the '<em><b>Name</b></em>' attribute.\n * <!-- begin-user-doc -->\n * <p>\n- * If the meaning of the '<em>Id</em>' attribute isn't clear,\n+ * If the meaning of the '<em>Name</em>' attribute isn't clear,\n * there really should be more of a description here...\n * </p>\n * <!-- end-user-doc -->\n- * @return the value of the '<em>Id</em>' attribute.\n- * @see #setId(String)\n- * @see net.certware.intent.intentSpecification.IntentSpecificationPackage#getIntent_Id()\n+ * @return the value of the '<em>Name</em>' attribute.\n+ * @see #setName(String)\n+ * @see net.certware.intent.intentSpecification.IntentSpecificationPackage#getIntent_Name()\n * @model\n * @generated\n */\n- String getId();\n+ String getName();\n \n /**\n- * Sets the value of the '{@link net.certware.intent.intentSpecification.Intent#getId <em>Id</em>}' attribute.\n+ * Sets the value of the '{@link net.certware.intent.intentSpecification.Intent#getName <em>Name</em>}' attribute.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n- * @param value the new value of the '<em>Id</em>' attribute.\n- * @see #getId()\n+ * @param value the new value of the '<em>Name</em>' attribute.\n+ * @see #getName()\n * @generated\n */\n- void setId(String value);\n+ void setName(String value);\n \n /**\n * Returns the value of the '<em><b>Desc</b></em>' attribute.", "raw_url": "https://github.com/nasa/CertWare/raw/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2FIntent.java", "sha": "183b90ab1821495c327905917801b010015ecfb6", "status": "modified" }, { "additions": 45, "blob_url": "https://github.com/nasa/CertWare/blob/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2FIntentSpecificationFactory.java", "changes": 45, "contents_url": "https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2FIntentSpecificationFactory.java?ref=27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9", "deletions": 0, "filename": "net.certware.intent/src-gen/net/certware/intent/intentSpecification/IntentSpecificationFactory.java", "new_code": " /**\n * Returns a new object of class '<em>Intent Type</em>'.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @return a new object of class '<em>Intent Type</em>'.\n * @generated\n */\n IntentType createIntentType();\n\n /**\n * Returns a new object of class '<em>Decomposition Type</em>'.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @return a new object of class '<em>Decomposition Type</em>'.\n * @generated\n */\n DecompositionType createDecompositionType();\n\n /**\n * Returns a new object of class '<em>Doc Item Type</em>'.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @return a new object of class '<em>Doc Item Type</em>'.\n * @generated\n */\n DocItemType createDocItemType();\n\n /**\n * Returns a new object of class '<em>Model Type</em>'.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @return a new object of class '<em>Model Type</em>'.\n * @generated\n */\n ModelType createModelType();\n\n /**\n * Returns a new object of class '<em>List Item Type</em>'.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @return a new object of class '<em>List Item Type</em>'.\n * @generated\n */\n ListItemType createListItemType();\n", "new_methods": [], "old_code": "", "old_methods": [], "patch": "@@ -49,6 +49,15 @@ public interface IntentSpecificationFactory extends EFactory\n */\n Intent createIntent();\n \n+ /**\n+ * Returns a new object of class '<em>Intent Type</em>'.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @return a new object of class '<em>Intent Type</em>'.\n+ * @generated\n+ */\n+ IntentType createIntentType();\n+\n /**\n * Returns a new object of class '<em>Decomposition</em>'.\n * <!-- begin-user-doc -->\n@@ -58,6 +67,15 @@ public interface IntentSpecificationFactory extends EFactory\n */\n Decomposition createDecomposition();\n \n+ /**\n+ * Returns a new object of class '<em>Decomposition Type</em>'.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @return a new object of class '<em>Decomposition Type</em>'.\n+ * @generated\n+ */\n+ DecompositionType createDecompositionType();\n+\n /**\n * Returns a new object of class '<em>Document</em>'.\n * <!-- begin-user-doc -->\n@@ -67,6 +85,15 @@ public interface IntentSpecificationFactory extends EFactory\n */\n Document createDocument();\n \n+ /**\n+ * Returns a new object of class '<em>Doc Item Type</em>'.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @return a new object of class '<em>Doc Item Type</em>'.\n+ * @generated\n+ */\n+ DocItemType createDocItemType();\n+\n /**\n * Returns a new object of class '<em>Doc Item</em>'.\n * <!-- begin-user-doc -->\n@@ -76,6 +103,15 @@ public interface IntentSpecificationFactory extends EFactory\n */\n DocItem createDocItem();\n \n+ /**\n+ * Returns a new object of class '<em>Model Type</em>'.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @return a new object of class '<em>Model Type</em>'.\n+ * @generated\n+ */\n+ ModelType createModelType();\n+\n /**\n * Returns a new object of class '<em>Model Item</em>'.\n * <!-- begin-user-doc -->\n@@ -85,6 +121,15 @@ public interface IntentSpecificationFactory extends EFactory\n */\n ModelItem createModelItem();\n \n+ /**\n+ * Returns a new object of class '<em>List Item Type</em>'.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @return a new object of class '<em>List Item Type</em>'.\n+ * @generated\n+ */\n+ ListItemType createListItemType();\n+\n /**\n * Returns a new object of class '<em>List Item</em>'.\n * <!-- begin-user-doc -->", "raw_url": "https://github.com/nasa/CertWare/raw/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2FIntentSpecificationFactory.java", "sha": "3ec7f532719ab204c89e50c25ce52cdfecf21e4b", "status": "modified" }, { "additions": 426, "blob_url": "https://github.com/nasa/CertWare/blob/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2FIntentSpecificationPackage.java", "changes": 517, "contents_url": "https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2FIntentSpecificationPackage.java?ref=27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9", "deletions": 91, "filename": "net.certware.intent/src-gen/net/certware/intent/intentSpecification/IntentSpecificationPackage.java", "new_code": " * The feature id for the '<em><b>Name</b></em>' attribute.\n int SPECIFICATION__NAME = 0;\n * The feature id for the '<em><b>Name</b></em>' attribute.\n int REFINEMENT__NAME = 0;\n * The feature id for the '<em><b>Type</b></em>' containment reference.\n * The feature id for the '<em><b>Name</b></em>' attribute.\n int INTENT__NAME = 1;\n /**\n * The meta object id for the '{@link net.certware.intent.intentSpecification.impl.IntentTypeImpl <em>Intent Type</em>}' class.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @see net.certware.intent.intentSpecification.impl.IntentTypeImpl\n * @see net.certware.intent.intentSpecification.impl.IntentSpecificationPackageImpl#getIntentType()\n * @generated\n */\n int INTENT_TYPE = 3;\n\n /**\n * The feature id for the '<em><b>Type Name</b></em>' attribute.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n * @ordered\n */\n int INTENT_TYPE__TYPE_NAME = 0;\n\n /**\n * The number of structural features of the '<em>Intent Type</em>' class.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n * @ordered\n */\n int INTENT_TYPE_FEATURE_COUNT = 1;\n\n int DECOMPOSITION = 4;\n * The feature id for the '<em><b>Type</b></em>' containment reference.\n * The feature id for the '<em><b>Name</b></em>' attribute.\n int DECOMPOSITION__NAME = 1;\n /**\n * The meta object id for the '{@link net.certware.intent.intentSpecification.impl.DecompositionTypeImpl <em>Decomposition Type</em>}' class.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @see net.certware.intent.intentSpecification.impl.DecompositionTypeImpl\n * @see net.certware.intent.intentSpecification.impl.IntentSpecificationPackageImpl#getDecompositionType()\n * @generated\n */\n int DECOMPOSITION_TYPE = 5;\n\n /**\n * The feature id for the '<em><b>Type Name</b></em>' attribute.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n * @ordered\n */\n int DECOMPOSITION_TYPE__TYPE_NAME = 0;\n\n /**\n * The number of structural features of the '<em>Decomposition Type</em>' class.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n * @ordered\n */\n int DECOMPOSITION_TYPE_FEATURE_COUNT = 1;\n\n int DOCUMENT = 6;\n /**\n * The meta object id for the '{@link net.certware.intent.intentSpecification.impl.DocItemTypeImpl <em>Doc Item Type</em>}' class.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @see net.certware.intent.intentSpecification.impl.DocItemTypeImpl\n * @see net.certware.intent.intentSpecification.impl.IntentSpecificationPackageImpl#getDocItemType()\n * @generated\n */\n int DOC_ITEM_TYPE = 7;\n\n /**\n * The feature id for the '<em><b>Type Name</b></em>' attribute.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n * @ordered\n */\n int DOC_ITEM_TYPE__TYPE_NAME = 0;\n\n /**\n * The number of structural features of the '<em>Doc Item Type</em>' class.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n * @ordered\n */\n int DOC_ITEM_TYPE_FEATURE_COUNT = 1;\n\n int DOC_ITEM = 8;\n * The feature id for the '<em><b>Type</b></em>' containment reference.\n * The feature id for the '<em><b>Name</b></em>' attribute.\n int DOC_ITEM__NAME = 1;\n /**\n * The meta object id for the '{@link net.certware.intent.intentSpecification.impl.ModelTypeImpl <em>Model Type</em>}' class.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @see net.certware.intent.intentSpecification.impl.ModelTypeImpl\n * @see net.certware.intent.intentSpecification.impl.IntentSpecificationPackageImpl#getModelType()\n * @generated\n */\n int MODEL_TYPE = 9;\n\n /**\n * The feature id for the '<em><b>Type Name</b></em>' attribute.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n * @ordered\n */\n int MODEL_TYPE__TYPE_NAME = 0;\n\n /**\n * The number of structural features of the '<em>Model Type</em>' class.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n * @ordered\n */\n int MODEL_TYPE_FEATURE_COUNT = 1;\n\n int MODEL_ITEM = 10;\n * The feature id for the '<em><b>Type</b></em>' containment reference.\n * The feature id for the '<em><b>Name</b></em>' attribute.\n int MODEL_ITEM__NAME = 1;\n /**\n * The meta object id for the '{@link net.certware.intent.intentSpecification.impl.ListItemTypeImpl <em>List Item Type</em>}' class.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @see net.certware.intent.intentSpecification.impl.ListItemTypeImpl\n * @see net.certware.intent.intentSpecification.impl.IntentSpecificationPackageImpl#getListItemType()\n * @generated\n */\n int LIST_ITEM_TYPE = 11;\n\n /**\n * The feature id for the '<em><b>Type Name</b></em>' attribute.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n * @ordered\n */\n int LIST_ITEM_TYPE__TYPE_NAME = 0;\n\n /**\n * The number of structural features of the '<em>List Item Type</em>' class.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n * @ordered\n */\n int LIST_ITEM_TYPE_FEATURE_COUNT = 1;\n\n int LIST_ITEM = 12;\n * The feature id for the '<em><b>Type</b></em>' containment reference.\n * The feature id for the '<em><b>Name</b></em>' attribute.\n int LIST_ITEM__NAME = 1;\n * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.Specification#getName <em>Name</em>}'.\n * @return the meta object for the attribute '<em>Name</em>'.\n * @see net.certware.intent.intentSpecification.Specification#getName()\n EAttribute getSpecification_Name();\n * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.Refinement#getName <em>Name</em>}'.\n * @return the meta object for the attribute '<em>Name</em>'.\n * @see net.certware.intent.intentSpecification.Refinement#getName()\n EAttribute getRefinement_Name();\n * Returns the meta object for the containment reference '{@link net.certware.intent.intentSpecification.Intent#getType <em>Type</em>}'.\n * @return the meta object for the containment reference '<em>Type</em>'.\n EReference getIntent_Type();\n * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.Intent#getName <em>Name</em>}'.\n * @return the meta object for the attribute '<em>Name</em>'.\n * @see net.certware.intent.intentSpecification.Intent#getName()\n EAttribute getIntent_Name();\n /**\n * Returns the meta object for class '{@link net.certware.intent.intentSpecification.IntentType <em>Intent Type</em>}'.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @return the meta object for class '<em>Intent Type</em>'.\n * @see net.certware.intent.intentSpecification.IntentType\n * @generated\n */\n EClass getIntentType();\n\n /**\n * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.IntentType#getTypeName <em>Type Name</em>}'.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @return the meta object for the attribute '<em>Type Name</em>'.\n * @see net.certware.intent.intentSpecification.IntentType#getTypeName()\n * @see #getIntentType()\n * @generated\n */\n EAttribute getIntentType_TypeName();\n\n * Returns the meta object for the containment reference '{@link net.certware.intent.intentSpecification.Decomposition#getType <em>Type</em>}'.\n * @return the meta object for the containment reference '<em>Type</em>'.\n EReference getDecomposition_Type();\n * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.Decomposition#getName <em>Name</em>}'.\n * @return the meta object for the attribute '<em>Name</em>'.\n * @see net.certware.intent.intentSpecification.Decomposition#getName()\n EAttribute getDecomposition_Name();\n /**\n * Returns the meta object for class '{@link net.certware.intent.intentSpecification.DecompositionType <em>Decomposition Type</em>}'.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @return the meta object for class '<em>Decomposition Type</em>'.\n * @see net.certware.intent.intentSpecification.DecompositionType\n * @generated\n */\n EClass getDecompositionType();\n\n /**\n * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.DecompositionType#getTypeName <em>Type Name</em>}'.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @return the meta object for the attribute '<em>Type Name</em>'.\n * @see net.certware.intent.intentSpecification.DecompositionType#getTypeName()\n * @see #getDecompositionType()\n * @generated\n */\n EAttribute getDecompositionType_TypeName();\n\n /**\n * Returns the meta object for class '{@link net.certware.intent.intentSpecification.DocItemType <em>Doc Item Type</em>}'.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @return the meta object for class '<em>Doc Item Type</em>'.\n * @see net.certware.intent.intentSpecification.DocItemType\n * @generated\n */\n EClass getDocItemType();\n\n /**\n * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.DocItemType#getTypeName <em>Type Name</em>}'.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @return the meta object for the attribute '<em>Type Name</em>'.\n * @see net.certware.intent.intentSpecification.DocItemType#getTypeName()\n * @see #getDocItemType()\n * @generated\n */\n EAttribute getDocItemType_TypeName();\n\n * Returns the meta object for the containment reference '{@link net.certware.intent.intentSpecification.DocItem#getType <em>Type</em>}'.\n * @return the meta object for the containment reference '<em>Type</em>'.\n EReference getDocItem_Type();\n * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.DocItem#getName <em>Name</em>}'.\n * @return the meta object for the attribute '<em>Name</em>'.\n * @see net.certware.intent.intentSpecification.DocItem#getName()\n EAttribute getDocItem_Name();\n /**\n * Returns the meta object for class '{@link net.certware.intent.intentSpecification.ModelType <em>Model Type</em>}'.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @return the meta object for class '<em>Model Type</em>'.\n * @see net.certware.intent.intentSpecification.ModelType\n * @generated\n */\n EClass getModelType();\n\n /**\n * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.ModelType#getTypeName <em>Type Name</em>}'.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @return the meta object for the attribute '<em>Type Name</em>'.\n * @see net.certware.intent.intentSpecification.ModelType#getTypeName()\n * @see #getModelType()\n * @generated\n */\n EAttribute getModelType_TypeName();\n\n * Returns the meta object for the containment reference '{@link net.certware.intent.intentSpecification.ModelItem#getType <em>Type</em>}'.\n * @return the meta object for the containment reference '<em>Type</em>'.\n EReference getModelItem_Type();\n * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.ModelItem#getName <em>Name</em>}'.\n * @return the meta object for the attribute '<em>Name</em>'.\n * @see net.certware.intent.intentSpecification.ModelItem#getName()\n EAttribute getModelItem_Name();\n /**\n * Returns the meta object for class '{@link net.certware.intent.intentSpecification.ListItemType <em>List Item Type</em>}'.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @return the meta object for class '<em>List Item Type</em>'.\n * @see net.certware.intent.intentSpecification.ListItemType\n * @generated\n */\n EClass getListItemType();\n\n /**\n * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.ListItemType#getTypeName <em>Type Name</em>}'.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @return the meta object for the attribute '<em>Type Name</em>'.\n * @see net.certware.intent.intentSpecification.ListItemType#getTypeName()\n * @see #getListItemType()\n * @generated\n */\n EAttribute getListItemType_TypeName();\n\n * Returns the meta object for the containment reference '{@link net.certware.intent.intentSpecification.ListItem#getType <em>Type</em>}'.\n * @return the meta object for the containment reference '<em>Type</em>'.\n EReference getListItem_Type();\n * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.ListItem#getName <em>Name</em>}'.\n * @return the meta object for the attribute '<em>Name</em>'.\n * @see net.certware.intent.intentSpecification.ListItem#getName()\n EAttribute getListItem_Name();\n * The meta object literal for the '<em><b>Name</b></em>' attribute feature.\n EAttribute SPECIFICATION__NAME = eINSTANCE.getSpecification_Name();\n * The meta object literal for the '<em><b>Name</b></em>' attribute feature.\n EAttribute REFINEMENT__NAME = eINSTANCE.getRefinement_Name();\n * The meta object literal for the '<em><b>Type</b></em>' containment reference feature.\n EReference INTENT__TYPE = eINSTANCE.getIntent_Type();\n * The meta object literal for the '<em><b>Name</b></em>' attribute feature.\n EAttribute INTENT__NAME = eINSTANCE.getIntent_Name();\n /**\n * The meta object literal for the '{@link net.certware.intent.intentSpecification.impl.IntentTypeImpl <em>Intent Type</em>}' class.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @see net.certware.intent.intentSpecification.impl.IntentTypeImpl\n * @see net.certware.intent.intentSpecification.impl.IntentSpecificationPackageImpl#getIntentType()\n * @generated\n */\n EClass INTENT_TYPE = eINSTANCE.getIntentType();\n\n /**\n * The meta object literal for the '<em><b>Type Name</b></em>' attribute feature.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n EAttribute INTENT_TYPE__TYPE_NAME = eINSTANCE.getIntentType_TypeName();\n\n * The meta object literal for the '<em><b>Type</b></em>' containment reference feature.\n EReference DECOMPOSITION__TYPE = eINSTANCE.getDecomposition_Type();\n * The meta object literal for the '<em><b>Name</b></em>' attribute feature.\n EAttribute DECOMPOSITION__NAME = eINSTANCE.getDecomposition_Name();\n /**\n * The meta object literal for the '{@link net.certware.intent.intentSpecification.impl.DecompositionTypeImpl <em>Decomposition Type</em>}' class.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @see net.certware.intent.intentSpecification.impl.DecompositionTypeImpl\n * @see net.certware.intent.intentSpecification.impl.IntentSpecificationPackageImpl#getDecompositionType()\n * @generated\n */\n EClass DECOMPOSITION_TYPE = eINSTANCE.getDecompositionType();\n\n /**\n * The meta object literal for the '<em><b>Type Name</b></em>' attribute feature.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n EAttribute DECOMPOSITION_TYPE__TYPE_NAME = eINSTANCE.getDecompositionType_TypeName();\n\n /**\n * The meta object literal for the '{@link net.certware.intent.intentSpecification.impl.DocItemTypeImpl <em>Doc Item Type</em>}' class.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @see net.certware.intent.intentSpecification.impl.DocItemTypeImpl\n * @see net.certware.intent.intentSpecification.impl.IntentSpecificationPackageImpl#getDocItemType()\n * @generated\n */\n EClass DOC_ITEM_TYPE = eINSTANCE.getDocItemType();\n\n /**\n * The meta object literal for the '<em><b>Type Name</b></em>' attribute feature.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n EAttribute DOC_ITEM_TYPE__TYPE_NAME = eINSTANCE.getDocItemType_TypeName();\n\n * The meta object literal for the '<em><b>Type</b></em>' containment reference feature.\n EReference DOC_ITEM__TYPE = eINSTANCE.getDocItem_Type();\n * The meta object literal for the '<em><b>Name</b></em>' attribute feature.\n EAttribute DOC_ITEM__NAME = eINSTANCE.getDocItem_Name();\n /**\n * The meta object literal for the '{@link net.certware.intent.intentSpecification.impl.ModelTypeImpl <em>Model Type</em>}' class.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @see net.certware.intent.intentSpecification.impl.ModelTypeImpl\n * @see net.certware.intent.intentSpecification.impl.IntentSpecificationPackageImpl#getModelType()\n * @generated\n */\n EClass MODEL_TYPE = eINSTANCE.getModelType();\n\n /**\n * The meta object literal for the '<em><b>Type Name</b></em>' attribute feature.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n EAttribute MODEL_TYPE__TYPE_NAME = eINSTANCE.getModelType_TypeName();\n\n * The meta object literal for the '<em><b>Type</b></em>' containment reference feature.\n EReference MODEL_ITEM__TYPE = eINSTANCE.getModelItem_Type();\n * The meta object literal for the '<em><b>Name</b></em>' attribute feature.\n EAttribute MODEL_ITEM__NAME = eINSTANCE.getModelItem_Name();\n /**\n * The meta object literal for the '{@link net.certware.intent.intentSpecification.impl.ListItemTypeImpl <em>List Item Type</em>}' class.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @see net.certware.intent.intentSpecification.impl.ListItemTypeImpl\n * @see net.certware.intent.intentSpecification.impl.IntentSpecificationPackageImpl#getListItemType()\n * @generated\n */\n EClass LIST_ITEM_TYPE = eINSTANCE.getListItemType();\n\n /**\n * The meta object literal for the '<em><b>Type Name</b></em>' attribute feature.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n EAttribute LIST_ITEM_TYPE__TYPE_NAME = eINSTANCE.getListItemType_TypeName();\n\n * The meta object literal for the '<em><b>Type</b></em>' containment reference feature.\n EReference LIST_ITEM__TYPE = eINSTANCE.getListItem_Type();\n * The meta object literal for the '<em><b>Name</b></em>' attribute feature.\n EAttribute LIST_ITEM__NAME = eINSTANCE.getListItem_Name();", "new_methods": [], "old_code": " * The feature id for the '<em><b>Id</b></em>' attribute.\n int SPECIFICATION__ID = 0;\n * The feature id for the '<em><b>Id</b></em>' attribute.\n int REFINEMENT__ID = 0;\n * The feature id for the '<em><b>Type</b></em>' attribute.\n * The feature id for the '<em><b>Id</b></em>' attribute.\n int INTENT__ID = 1;\n int DECOMPOSITION = 3;\n * The feature id for the '<em><b>Type</b></em>' attribute.\n * The feature id for the '<em><b>Id</b></em>' attribute.\n int DECOMPOSITION__ID = 1;\n int DOCUMENT = 4;\n int DOC_ITEM = 5;\n * The feature id for the '<em><b>Type</b></em>' attribute.\n * The feature id for the '<em><b>Id</b></em>' attribute.\n int DOC_ITEM__ID = 1;\n int MODEL_ITEM = 6;\n * The feature id for the '<em><b>Type</b></em>' attribute.\n * The feature id for the '<em><b>Id</b></em>' attribute.\n int MODEL_ITEM__ID = 1;\n int LIST_ITEM = 7;\n * The feature id for the '<em><b>Type</b></em>' attribute.\n * The feature id for the '<em><b>Id</b></em>' attribute.\n int LIST_ITEM__ID = 1;\n * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.Specification#getId <em>Id</em>}'.\n * @return the meta object for the attribute '<em>Id</em>'.\n * @see net.certware.intent.intentSpecification.Specification#getId()\n EAttribute getSpecification_Id();\n * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.Refinement#getId <em>Id</em>}'.\n * @return the meta object for the attribute '<em>Id</em>'.\n * @see net.certware.intent.intentSpecification.Refinement#getId()\n EAttribute getRefinement_Id();\n * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.Intent#getType <em>Type</em>}'.\n * @return the meta object for the attribute '<em>Type</em>'.\n EAttribute getIntent_Type();\n * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.Intent#getId <em>Id</em>}'.\n * @return the meta object for the attribute '<em>Id</em>'.\n * @see net.certware.intent.intentSpecification.Intent#getId()\n EAttribute getIntent_Id();\n * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.Decomposition#getType <em>Type</em>}'.\n * @return the meta object for the attribute '<em>Type</em>'.\n EAttribute getDecomposition_Type();\n * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.Decomposition#getId <em>Id</em>}'.\n * @return the meta object for the attribute '<em>Id</em>'.\n * @see net.certware.intent.intentSpecification.Decomposition#getId()\n EAttribute getDecomposition_Id();\n * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.DocItem#getType <em>Type</em>}'.\n * @return the meta object for the attribute '<em>Type</em>'.\n EAttribute getDocItem_Type();\n * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.DocItem#getId <em>Id</em>}'.\n * @return the meta object for the attribute '<em>Id</em>'.\n * @see net.certware.intent.intentSpecification.DocItem#getId()\n EAttribute getDocItem_Id();\n * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.ModelItem#getType <em>Type</em>}'.\n * @return the meta object for the attribute '<em>Type</em>'.\n EAttribute getModelItem_Type();\n * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.ModelItem#getId <em>Id</em>}'.\n * @return the meta object for the attribute '<em>Id</em>'.\n * @see net.certware.intent.intentSpecification.ModelItem#getId()\n EAttribute getModelItem_Id();\n * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.ListItem#getType <em>Type</em>}'.\n * @return the meta object for the attribute '<em>Type</em>'.\n EAttribute getListItem_Type();\n * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.ListItem#getId <em>Id</em>}'.\n * @return the meta object for the attribute '<em>Id</em>'.\n * @see net.certware.intent.intentSpecification.ListItem#getId()\n EAttribute getListItem_Id();\n * The meta object literal for the '<em><b>Id</b></em>' attribute feature.\n EAttribute SPECIFICATION__ID = eINSTANCE.getSpecification_Id();\n * The meta object literal for the '<em><b>Id</b></em>' attribute feature.\n EAttribute REFINEMENT__ID = eINSTANCE.getRefinement_Id();\n * The meta object literal for the '<em><b>Type</b></em>' attribute feature.\n EAttribute INTENT__TYPE = eINSTANCE.getIntent_Type();\n * The meta object literal for the '<em><b>Id</b></em>' attribute feature.\n EAttribute INTENT__ID = eINSTANCE.getIntent_Id();\n * The meta object literal for the '<em><b>Type</b></em>' attribute feature.\n EAttribute DECOMPOSITION__TYPE = eINSTANCE.getDecomposition_Type();\n * The meta object literal for the '<em><b>Id</b></em>' attribute feature.\n EAttribute DECOMPOSITION__ID = eINSTANCE.getDecomposition_Id();\n * The meta object literal for the '<em><b>Type</b></em>' attribute feature.\n EAttribute DOC_ITEM__TYPE = eINSTANCE.getDocItem_Type();\n * The meta object literal for the '<em><b>Id</b></em>' attribute feature.\n EAttribute DOC_ITEM__ID = eINSTANCE.getDocItem_Id();\n * The meta object literal for the '<em><b>Type</b></em>' attribute feature.\n EAttribute MODEL_ITEM__TYPE = eINSTANCE.getModelItem_Type();\n * The meta object literal for the '<em><b>Id</b></em>' attribute feature.\n EAttribute MODEL_ITEM__ID = eINSTANCE.getModelItem_Id();\n * The meta object literal for the '<em><b>Type</b></em>' attribute feature.\n EAttribute LIST_ITEM__TYPE = eINSTANCE.getListItem_Type();\n * The meta object literal for the '<em><b>Id</b></em>' attribute feature.\n EAttribute LIST_ITEM__ID = eINSTANCE.getListItem_Id();", "old_methods": [], "patch": "@@ -67,13 +67,13 @@ public interface IntentSpecificationPackage extends EPackage\n int SPECIFICATION = 0;\n \n /**\n- * The feature id for the '<em><b>Id</b></em>' attribute.\n+ * The feature id for the '<em><b>Name</b></em>' attribute.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n * @ordered\n */\n- int SPECIFICATION__ID = 0;\n+ int SPECIFICATION__NAME = 0;\n \n /**\n * The feature id for the '<em><b>Refinements</b></em>' containment reference list.\n@@ -104,13 +104,13 @@ public interface IntentSpecificationPackage extends EPackage\n int REFINEMENT = 1;\n \n /**\n- * The feature id for the '<em><b>Id</b></em>' attribute.\n+ * The feature id for the '<em><b>Name</b></em>' attribute.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n * @ordered\n */\n- int REFINEMENT__ID = 0;\n+ int REFINEMENT__NAME = 0;\n \n /**\n * The feature id for the '<em><b>Desc</b></em>' attribute.\n@@ -150,7 +150,7 @@ public interface IntentSpecificationPackage extends EPackage\n int INTENT = 2;\n \n /**\n- * The feature id for the '<em><b>Type</b></em>' attribute.\n+ * The feature id for the '<em><b>Type</b></em>' containment reference.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n@@ -159,13 +159,13 @@ public interface IntentSpecificationPackage extends EPackage\n int INTENT__TYPE = 0;\n \n /**\n- * The feature id for the '<em><b>Id</b></em>' attribute.\n+ * The feature id for the '<em><b>Name</b></em>' attribute.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n * @ordered\n */\n- int INTENT__ID = 1;\n+ int INTENT__NAME = 1;\n \n /**\n * The feature id for the '<em><b>Desc</b></em>' attribute.\n@@ -194,6 +194,34 @@ public interface IntentSpecificationPackage extends EPackage\n */\n int INTENT_FEATURE_COUNT = 4;\n \n+ /**\n+ * The meta object id for the '{@link net.certware.intent.intentSpecification.impl.IntentTypeImpl <em>Intent Type</em>}' class.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @see net.certware.intent.intentSpecification.impl.IntentTypeImpl\n+ * @see net.certware.intent.intentSpecification.impl.IntentSpecificationPackageImpl#getIntentType()\n+ * @generated\n+ */\n+ int INTENT_TYPE = 3;\n+\n+ /**\n+ * The feature id for the '<em><b>Type Name</b></em>' attribute.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ * @ordered\n+ */\n+ int INTENT_TYPE__TYPE_NAME = 0;\n+\n+ /**\n+ * The number of structural features of the '<em>Intent Type</em>' class.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ * @ordered\n+ */\n+ int INTENT_TYPE_FEATURE_COUNT = 1;\n+\n /**\n * The meta object id for the '{@link net.certware.intent.intentSpecification.impl.DecompositionImpl <em>Decomposition</em>}' class.\n * <!-- begin-user-doc -->\n@@ -202,10 +230,10 @@ public interface IntentSpecificationPackage extends EPackage\n * @see net.certware.intent.intentSpecification.impl.IntentSpecificationPackageImpl#getDecomposition()\n * @generated\n */\n- int DECOMPOSITION = 3;\n+ int DECOMPOSITION = 4;\n \n /**\n- * The feature id for the '<em><b>Type</b></em>' attribute.\n+ * The feature id for the '<em><b>Type</b></em>' containment reference.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n@@ -214,13 +242,13 @@ public interface IntentSpecificationPackage extends EPackage\n int DECOMPOSITION__TYPE = 0;\n \n /**\n- * The feature id for the '<em><b>Id</b></em>' attribute.\n+ * The feature id for the '<em><b>Name</b></em>' attribute.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n * @ordered\n */\n- int DECOMPOSITION__ID = 1;\n+ int DECOMPOSITION__NAME = 1;\n \n /**\n * The feature id for the '<em><b>Desc</b></em>' attribute.\n@@ -267,6 +295,34 @@ public interface IntentSpecificationPackage extends EPackage\n */\n int DECOMPOSITION_FEATURE_COUNT = 6;\n \n+ /**\n+ * The meta object id for the '{@link net.certware.intent.intentSpecification.impl.DecompositionTypeImpl <em>Decomposition Type</em>}' class.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @see net.certware.intent.intentSpecification.impl.DecompositionTypeImpl\n+ * @see net.certware.intent.intentSpecification.impl.IntentSpecificationPackageImpl#getDecompositionType()\n+ * @generated\n+ */\n+ int DECOMPOSITION_TYPE = 5;\n+\n+ /**\n+ * The feature id for the '<em><b>Type Name</b></em>' attribute.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ * @ordered\n+ */\n+ int DECOMPOSITION_TYPE__TYPE_NAME = 0;\n+\n+ /**\n+ * The number of structural features of the '<em>Decomposition Type</em>' class.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ * @ordered\n+ */\n+ int DECOMPOSITION_TYPE_FEATURE_COUNT = 1;\n+\n /**\n * The meta object id for the '{@link net.certware.intent.intentSpecification.impl.DocumentImpl <em>Document</em>}' class.\n * <!-- begin-user-doc -->\n@@ -275,7 +331,7 @@ public interface IntentSpecificationPackage extends EPackage\n * @see net.certware.intent.intentSpecification.impl.IntentSpecificationPackageImpl#getDocument()\n * @generated\n */\n- int DOCUMENT = 4;\n+ int DOCUMENT = 6;\n \n /**\n * The feature id for the '<em><b>Entries</b></em>' containment reference list.\n@@ -295,6 +351,34 @@ public interface IntentSpecificationPackage extends EPackage\n */\n int DOCUMENT_FEATURE_COUNT = 1;\n \n+ /**\n+ * The meta object id for the '{@link net.certware.intent.intentSpecification.impl.DocItemTypeImpl <em>Doc Item Type</em>}' class.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @see net.certware.intent.intentSpecification.impl.DocItemTypeImpl\n+ * @see net.certware.intent.intentSpecification.impl.IntentSpecificationPackageImpl#getDocItemType()\n+ * @generated\n+ */\n+ int DOC_ITEM_TYPE = 7;\n+\n+ /**\n+ * The feature id for the '<em><b>Type Name</b></em>' attribute.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ * @ordered\n+ */\n+ int DOC_ITEM_TYPE__TYPE_NAME = 0;\n+\n+ /**\n+ * The number of structural features of the '<em>Doc Item Type</em>' class.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ * @ordered\n+ */\n+ int DOC_ITEM_TYPE_FEATURE_COUNT = 1;\n+\n /**\n * The meta object id for the '{@link net.certware.intent.intentSpecification.impl.DocItemImpl <em>Doc Item</em>}' class.\n * <!-- begin-user-doc -->\n@@ -303,10 +387,10 @@ public interface IntentSpecificationPackage extends EPackage\n * @see net.certware.intent.intentSpecification.impl.IntentSpecificationPackageImpl#getDocItem()\n * @generated\n */\n- int DOC_ITEM = 5;\n+ int DOC_ITEM = 8;\n \n /**\n- * The feature id for the '<em><b>Type</b></em>' attribute.\n+ * The feature id for the '<em><b>Type</b></em>' containment reference.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n@@ -315,13 +399,13 @@ public interface IntentSpecificationPackage extends EPackage\n int DOC_ITEM__TYPE = 0;\n \n /**\n- * The feature id for the '<em><b>Id</b></em>' attribute.\n+ * The feature id for the '<em><b>Name</b></em>' attribute.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n * @ordered\n */\n- int DOC_ITEM__ID = 1;\n+ int DOC_ITEM__NAME = 1;\n \n /**\n * The feature id for the '<em><b>Ref</b></em>' attribute.\n@@ -341,6 +425,34 @@ public interface IntentSpecificationPackage extends EPackage\n */\n int DOC_ITEM_FEATURE_COUNT = 3;\n \n+ /**\n+ * The meta object id for the '{@link net.certware.intent.intentSpecification.impl.ModelTypeImpl <em>Model Type</em>}' class.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @see net.certware.intent.intentSpecification.impl.ModelTypeImpl\n+ * @see net.certware.intent.intentSpecification.impl.IntentSpecificationPackageImpl#getModelType()\n+ * @generated\n+ */\n+ int MODEL_TYPE = 9;\n+\n+ /**\n+ * The feature id for the '<em><b>Type Name</b></em>' attribute.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ * @ordered\n+ */\n+ int MODEL_TYPE__TYPE_NAME = 0;\n+\n+ /**\n+ * The number of structural features of the '<em>Model Type</em>' class.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ * @ordered\n+ */\n+ int MODEL_TYPE_FEATURE_COUNT = 1;\n+\n /**\n * The meta object id for the '{@link net.certware.intent.intentSpecification.impl.ModelItemImpl <em>Model Item</em>}' class.\n * <!-- begin-user-doc -->\n@@ -349,10 +461,10 @@ public interface IntentSpecificationPackage extends EPackage\n * @see net.certware.intent.intentSpecification.impl.IntentSpecificationPackageImpl#getModelItem()\n * @generated\n */\n- int MODEL_ITEM = 6;\n+ int MODEL_ITEM = 10;\n \n /**\n- * The feature id for the '<em><b>Type</b></em>' attribute.\n+ * The feature id for the '<em><b>Type</b></em>' containment reference.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n@@ -361,13 +473,13 @@ public interface IntentSpecificationPackage extends EPackage\n int MODEL_ITEM__TYPE = 0;\n \n /**\n- * The feature id for the '<em><b>Id</b></em>' attribute.\n+ * The feature id for the '<em><b>Name</b></em>' attribute.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n * @ordered\n */\n- int MODEL_ITEM__ID = 1;\n+ int MODEL_ITEM__NAME = 1;\n \n /**\n * The feature id for the '<em><b>Desc</b></em>' attribute.\n@@ -387,6 +499,34 @@ public interface IntentSpecificationPackage extends EPackage\n */\n int MODEL_ITEM_FEATURE_COUNT = 3;\n \n+ /**\n+ * The meta object id for the '{@link net.certware.intent.intentSpecification.impl.ListItemTypeImpl <em>List Item Type</em>}' class.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @see net.certware.intent.intentSpecification.impl.ListItemTypeImpl\n+ * @see net.certware.intent.intentSpecification.impl.IntentSpecificationPackageImpl#getListItemType()\n+ * @generated\n+ */\n+ int LIST_ITEM_TYPE = 11;\n+\n+ /**\n+ * The feature id for the '<em><b>Type Name</b></em>' attribute.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ * @ordered\n+ */\n+ int LIST_ITEM_TYPE__TYPE_NAME = 0;\n+\n+ /**\n+ * The number of structural features of the '<em>List Item Type</em>' class.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ * @ordered\n+ */\n+ int LIST_ITEM_TYPE_FEATURE_COUNT = 1;\n+\n /**\n * The meta object id for the '{@link net.certware.intent.intentSpecification.impl.ListItemImpl <em>List Item</em>}' class.\n * <!-- begin-user-doc -->\n@@ -395,10 +535,10 @@ public interface IntentSpecificationPackage extends EPackage\n * @see net.certware.intent.intentSpecification.impl.IntentSpecificationPackageImpl#getListItem()\n * @generated\n */\n- int LIST_ITEM = 7;\n+ int LIST_ITEM = 12;\n \n /**\n- * The feature id for the '<em><b>Type</b></em>' attribute.\n+ * The feature id for the '<em><b>Type</b></em>' containment reference.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n@@ -407,13 +547,13 @@ public interface IntentSpecificationPackage extends EPackage\n int LIST_ITEM__TYPE = 0;\n \n /**\n- * The feature id for the '<em><b>Id</b></em>' attribute.\n+ * The feature id for the '<em><b>Name</b></em>' attribute.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n * @ordered\n */\n- int LIST_ITEM__ID = 1;\n+ int LIST_ITEM__NAME = 1;\n \n /**\n * The feature id for the '<em><b>Desc</b></em>' attribute.\n@@ -472,15 +612,15 @@ public interface IntentSpecificationPackage extends EPackage\n EClass getSpecification();\n \n /**\n- * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.Specification#getId <em>Id</em>}'.\n+ * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.Specification#getName <em>Name</em>}'.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n- * @return the meta object for the attribute '<em>Id</em>'.\n- * @see net.certware.intent.intentSpecification.Specification#getId()\n+ * @return the meta object for the attribute '<em>Name</em>'.\n+ * @see net.certware.intent.intentSpecification.Specification#getName()\n * @see #getSpecification()\n * @generated\n */\n- EAttribute getSpecification_Id();\n+ EAttribute getSpecification_Name();\n \n /**\n * Returns the meta object for the containment reference list '{@link net.certware.intent.intentSpecification.Specification#getRefinements <em>Refinements</em>}'.\n@@ -504,15 +644,15 @@ public interface IntentSpecificationPackage extends EPackage\n EClass getRefinement();\n \n /**\n- * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.Refinement#getId <em>Id</em>}'.\n+ * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.Refinement#getName <em>Name</em>}'.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n- * @return the meta object for the attribute '<em>Id</em>'.\n- * @see net.certware.intent.intentSpecification.Refinement#getId()\n+ * @return the meta object for the attribute '<em>Name</em>'.\n+ * @see net.certware.intent.intentSpecification.Refinement#getName()\n * @see #getRefinement()\n * @generated\n */\n- EAttribute getRefinement_Id();\n+ EAttribute getRefinement_Name();\n \n /**\n * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.Refinement#getDesc <em>Desc</em>}'.\n@@ -547,26 +687,26 @@ public interface IntentSpecificationPackage extends EPackage\n EClass getIntent();\n \n /**\n- * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.Intent#getType <em>Type</em>}'.\n+ * Returns the meta object for the containment reference '{@link net.certware.intent.intentSpecification.Intent#getType <em>Type</em>}'.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n- * @return the meta object for the attribute '<em>Type</em>'.\n+ * @return the meta object for the containment reference '<em>Type</em>'.\n * @see net.certware.intent.intentSpecification.Intent#getType()\n * @see #getIntent()\n * @generated\n */\n- EAttribute getIntent_Type();\n+ EReference getIntent_Type();\n \n /**\n- * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.Intent#getId <em>Id</em>}'.\n+ * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.Intent#getName <em>Name</em>}'.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n- * @return the meta object for the attribute '<em>Id</em>'.\n- * @see net.certware.intent.intentSpecification.Intent#getId()\n+ * @return the meta object for the attribute '<em>Name</em>'.\n+ * @see net.certware.intent.intentSpecification.Intent#getName()\n * @see #getIntent()\n * @generated\n */\n- EAttribute getIntent_Id();\n+ EAttribute getIntent_Name();\n \n /**\n * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.Intent#getDesc <em>Desc</em>}'.\n@@ -590,6 +730,27 @@ public interface IntentSpecificationPackage extends EPackage\n */\n EReference getIntent_Decompositions();\n \n+ /**\n+ * Returns the meta object for class '{@link net.certware.intent.intentSpecification.IntentType <em>Intent Type</em>}'.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @return the meta object for class '<em>Intent Type</em>'.\n+ * @see net.certware.intent.intentSpecification.IntentType\n+ * @generated\n+ */\n+ EClass getIntentType();\n+\n+ /**\n+ * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.IntentType#getTypeName <em>Type Name</em>}'.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @return the meta object for the attribute '<em>Type Name</em>'.\n+ * @see net.certware.intent.intentSpecification.IntentType#getTypeName()\n+ * @see #getIntentType()\n+ * @generated\n+ */\n+ EAttribute getIntentType_TypeName();\n+\n /**\n * Returns the meta object for class '{@link net.certware.intent.intentSpecification.Decomposition <em>Decomposition</em>}'.\n * <!-- begin-user-doc -->\n@@ -601,26 +762,26 @@ public interface IntentSpecificationPackage extends EPackage\n EClass getDecomposition();\n \n /**\n- * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.Decomposition#getType <em>Type</em>}'.\n+ * Returns the meta object for the containment reference '{@link net.certware.intent.intentSpecification.Decomposition#getType <em>Type</em>}'.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n- * @return the meta object for the attribute '<em>Type</em>'.\n+ * @return the meta object for the containment reference '<em>Type</em>'.\n * @see net.certware.intent.intentSpecification.Decomposition#getType()\n * @see #getDecomposition()\n * @generated\n */\n- EAttribute getDecomposition_Type();\n+ EReference getDecomposition_Type();\n \n /**\n- * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.Decomposition#getId <em>Id</em>}'.\n+ * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.Decomposition#getName <em>Name</em>}'.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n- * @return the meta object for the attribute '<em>Id</em>'.\n- * @see net.certware.intent.intentSpecification.Decomposition#getId()\n+ * @return the meta object for the attribute '<em>Name</em>'.\n+ * @see net.certware.intent.intentSpecification.Decomposition#getName()\n * @see #getDecomposition()\n * @generated\n */\n- EAttribute getDecomposition_Id();\n+ EAttribute getDecomposition_Name();\n \n /**\n * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.Decomposition#getDesc <em>Desc</em>}'.\n@@ -666,6 +827,27 @@ public interface IntentSpecificationPackage extends EPackage\n */\n EReference getDecomposition_Items();\n \n+ /**\n+ * Returns the meta object for class '{@link net.certware.intent.intentSpecification.DecompositionType <em>Decomposition Type</em>}'.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @return the meta object for class '<em>Decomposition Type</em>'.\n+ * @see net.certware.intent.intentSpecification.DecompositionType\n+ * @generated\n+ */\n+ EClass getDecompositionType();\n+\n+ /**\n+ * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.DecompositionType#getTypeName <em>Type Name</em>}'.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @return the meta object for the attribute '<em>Type Name</em>'.\n+ * @see net.certware.intent.intentSpecification.DecompositionType#getTypeName()\n+ * @see #getDecompositionType()\n+ * @generated\n+ */\n+ EAttribute getDecompositionType_TypeName();\n+\n /**\n * Returns the meta object for class '{@link net.certware.intent.intentSpecification.Document <em>Document</em>}'.\n * <!-- begin-user-doc -->\n@@ -687,6 +869,27 @@ public interface IntentSpecificationPackage extends EPackage\n */\n EReference getDocument_Entries();\n \n+ /**\n+ * Returns the meta object for class '{@link net.certware.intent.intentSpecification.DocItemType <em>Doc Item Type</em>}'.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @return the meta object for class '<em>Doc Item Type</em>'.\n+ * @see net.certware.intent.intentSpecification.DocItemType\n+ * @generated\n+ */\n+ EClass getDocItemType();\n+\n+ /**\n+ * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.DocItemType#getTypeName <em>Type Name</em>}'.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @return the meta object for the attribute '<em>Type Name</em>'.\n+ * @see net.certware.intent.intentSpecification.DocItemType#getTypeName()\n+ * @see #getDocItemType()\n+ * @generated\n+ */\n+ EAttribute getDocItemType_TypeName();\n+\n /**\n * Returns the meta object for class '{@link net.certware.intent.intentSpecification.DocItem <em>Doc Item</em>}'.\n * <!-- begin-user-doc -->\n@@ -698,26 +901,26 @@ public interface IntentSpecificationPackage extends EPackage\n EClass getDocItem();\n \n /**\n- * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.DocItem#getType <em>Type</em>}'.\n+ * Returns the meta object for the containment reference '{@link net.certware.intent.intentSpecification.DocItem#getType <em>Type</em>}'.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n- * @return the meta object for the attribute '<em>Type</em>'.\n+ * @return the meta object for the containment reference '<em>Type</em>'.\n * @see net.certware.intent.intentSpecification.DocItem#getType()\n * @see #getDocItem()\n * @generated\n */\n- EAttribute getDocItem_Type();\n+ EReference getDocItem_Type();\n \n /**\n- * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.DocItem#getId <em>Id</em>}'.\n+ * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.DocItem#getName <em>Name</em>}'.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n- * @return the meta object for the attribute '<em>Id</em>'.\n- * @see net.certware.intent.intentSpecification.DocItem#getId()\n+ * @return the meta object for the attribute '<em>Name</em>'.\n+ * @see net.certware.intent.intentSpecification.DocItem#getName()\n * @see #getDocItem()\n * @generated\n */\n- EAttribute getDocItem_Id();\n+ EAttribute getDocItem_Name();\n \n /**\n * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.DocItem#getRef <em>Ref</em>}'.\n@@ -730,6 +933,27 @@ public interface IntentSpecificationPackage extends EPackage\n */\n EAttribute getDocItem_Ref();\n \n+ /**\n+ * Returns the meta object for class '{@link net.certware.intent.intentSpecification.ModelType <em>Model Type</em>}'.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @return the meta object for class '<em>Model Type</em>'.\n+ * @see net.certware.intent.intentSpecification.ModelType\n+ * @generated\n+ */\n+ EClass getModelType();\n+\n+ /**\n+ * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.ModelType#getTypeName <em>Type Name</em>}'.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @return the meta object for the attribute '<em>Type Name</em>'.\n+ * @see net.certware.intent.intentSpecification.ModelType#getTypeName()\n+ * @see #getModelType()\n+ * @generated\n+ */\n+ EAttribute getModelType_TypeName();\n+\n /**\n * Returns the meta object for class '{@link net.certware.intent.intentSpecification.ModelItem <em>Model Item</em>}'.\n * <!-- begin-user-doc -->\n@@ -741,26 +965,26 @@ public interface IntentSpecificationPackage extends EPackage\n EClass getModelItem();\n \n /**\n- * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.ModelItem#getType <em>Type</em>}'.\n+ * Returns the meta object for the containment reference '{@link net.certware.intent.intentSpecification.ModelItem#getType <em>Type</em>}'.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n- * @return the meta object for the attribute '<em>Type</em>'.\n+ * @return the meta object for the containment reference '<em>Type</em>'.\n * @see net.certware.intent.intentSpecification.ModelItem#getType()\n * @see #getModelItem()\n * @generated\n */\n- EAttribute getModelItem_Type();\n+ EReference getModelItem_Type();\n \n /**\n- * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.ModelItem#getId <em>Id</em>}'.\n+ * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.ModelItem#getName <em>Name</em>}'.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n- * @return the meta object for the attribute '<em>Id</em>'.\n- * @see net.certware.intent.intentSpecification.ModelItem#getId()\n+ * @return the meta object for the attribute '<em>Name</em>'.\n+ * @see net.certware.intent.intentSpecification.ModelItem#getName()\n * @see #getModelItem()\n * @generated\n */\n- EAttribute getModelItem_Id();\n+ EAttribute getModelItem_Name();\n \n /**\n * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.ModelItem#getDesc <em>Desc</em>}'.\n@@ -773,6 +997,27 @@ public interface IntentSpecificationPackage extends EPackage\n */\n EAttribute getModelItem_Desc();\n \n+ /**\n+ * Returns the meta object for class '{@link net.certware.intent.intentSpecification.ListItemType <em>List Item Type</em>}'.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @return the meta object for class '<em>List Item Type</em>'.\n+ * @see net.certware.intent.intentSpecification.ListItemType\n+ * @generated\n+ */\n+ EClass getListItemType();\n+\n+ /**\n+ * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.ListItemType#getTypeName <em>Type Name</em>}'.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @return the meta object for the attribute '<em>Type Name</em>'.\n+ * @see net.certware.intent.intentSpecification.ListItemType#getTypeName()\n+ * @see #getListItemType()\n+ * @generated\n+ */\n+ EAttribute getListItemType_TypeName();\n+\n /**\n * Returns the meta object for class '{@link net.certware.intent.intentSpecification.ListItem <em>List Item</em>}'.\n * <!-- begin-user-doc -->\n@@ -784,26 +1029,26 @@ public interface IntentSpecificationPackage extends EPackage\n EClass getListItem();\n \n /**\n- * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.ListItem#getType <em>Type</em>}'.\n+ * Returns the meta object for the containment reference '{@link net.certware.intent.intentSpecification.ListItem#getType <em>Type</em>}'.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n- * @return the meta object for the attribute '<em>Type</em>'.\n+ * @return the meta object for the containment reference '<em>Type</em>'.\n * @see net.certware.intent.intentSpecification.ListItem#getType()\n * @see #getListItem()\n * @generated\n */\n- EAttribute getListItem_Type();\n+ EReference getListItem_Type();\n \n /**\n- * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.ListItem#getId <em>Id</em>}'.\n+ * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.ListItem#getName <em>Name</em>}'.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n- * @return the meta object for the attribute '<em>Id</em>'.\n- * @see net.certware.intent.intentSpecification.ListItem#getId()\n+ * @return the meta object for the attribute '<em>Name</em>'.\n+ * @see net.certware.intent.intentSpecification.ListItem#getName()\n * @see #getListItem()\n * @generated\n */\n- EAttribute getListItem_Id();\n+ EAttribute getListItem_Name();\n \n /**\n * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.ListItem#getDesc <em>Desc</em>}'.\n@@ -883,12 +1128,12 @@ interface Literals\n EClass SPECIFICATION = eINSTANCE.getSpecification();\n \n /**\n- * The meta object literal for the '<em><b>Id</b></em>' attribute feature.\n+ * The meta object literal for the '<em><b>Name</b></em>' attribute feature.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n- EAttribute SPECIFICATION__ID = eINSTANCE.getSpecification_Id();\n+ EAttribute SPECIFICATION__NAME = eINSTANCE.getSpecification_Name();\n \n /**\n * The meta object literal for the '<em><b>Refinements</b></em>' containment reference list feature.\n@@ -909,12 +1154,12 @@ interface Literals\n EClass REFINEMENT = eINSTANCE.getRefinement();\n \n /**\n- * The meta object literal for the '<em><b>Id</b></em>' attribute feature.\n+ * The meta object literal for the '<em><b>Name</b></em>' attribute feature.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n- EAttribute REFINEMENT__ID = eINSTANCE.getRefinement_Id();\n+ EAttribute REFINEMENT__NAME = eINSTANCE.getRefinement_Name();\n \n /**\n * The meta object literal for the '<em><b>Desc</b></em>' attribute feature.\n@@ -943,20 +1188,20 @@ interface Literals\n EClass INTENT = eINSTANCE.getIntent();\n \n /**\n- * The meta object literal for the '<em><b>Type</b></em>' attribute feature.\n+ * The meta object literal for the '<em><b>Type</b></em>' containment reference feature.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n- EAttribute INTENT__TYPE = eINSTANCE.getIntent_Type();\n+ EReference INTENT__TYPE = eINSTANCE.getIntent_Type();\n \n /**\n- * The meta object literal for the '<em><b>Id</b></em>' attribute feature.\n+ * The meta object literal for the '<em><b>Name</b></em>' attribute feature.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n- EAttribute INTENT__ID = eINSTANCE.getIntent_Id();\n+ EAttribute INTENT__NAME = eINSTANCE.getIntent_Name();\n \n /**\n * The meta object literal for the '<em><b>Desc</b></em>' attribute feature.\n@@ -974,6 +1219,24 @@ interface Literals\n */\n EReference INTENT__DECOMPOSITIONS = eINSTANCE.getIntent_Decompositions();\n \n+ /**\n+ * The meta object literal for the '{@link net.certware.intent.intentSpecification.impl.IntentTypeImpl <em>Intent Type</em>}' class.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @see net.certware.intent.intentSpecification.impl.IntentTypeImpl\n+ * @see net.certware.intent.intentSpecification.impl.IntentSpecificationPackageImpl#getIntentType()\n+ * @generated\n+ */\n+ EClass INTENT_TYPE = eINSTANCE.getIntentType();\n+\n+ /**\n+ * The meta object literal for the '<em><b>Type Name</b></em>' attribute feature.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ */\n+ EAttribute INTENT_TYPE__TYPE_NAME = eINSTANCE.getIntentType_TypeName();\n+\n /**\n * The meta object literal for the '{@link net.certware.intent.intentSpecification.impl.DecompositionImpl <em>Decomposition</em>}' class.\n * <!-- begin-user-doc -->\n@@ -985,20 +1248,20 @@ interface Literals\n EClass DECOMPOSITION = eINSTANCE.getDecomposition();\n \n /**\n- * The meta object literal for the '<em><b>Type</b></em>' attribute feature.\n+ * The meta object literal for the '<em><b>Type</b></em>' containment reference feature.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n- EAttribute DECOMPOSITION__TYPE = eINSTANCE.getDecomposition_Type();\n+ EReference DECOMPOSITION__TYPE = eINSTANCE.getDecomposition_Type();\n \n /**\n- * The meta object literal for the '<em><b>Id</b></em>' attribute feature.\n+ * The meta object literal for the '<em><b>Name</b></em>' attribute feature.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n- EAttribute DECOMPOSITION__ID = eINSTANCE.getDecomposition_Id();\n+ EAttribute DECOMPOSITION__NAME = eINSTANCE.getDecomposition_Name();\n \n /**\n * The meta object literal for the '<em><b>Desc</b></em>' attribute feature.\n@@ -1032,6 +1295,24 @@ interface Literals\n */\n EReference DECOMPOSITION__ITEMS = eINSTANCE.getDecomposition_Items();\n \n+ /**\n+ * The meta object literal for the '{@link net.certware.intent.intentSpecification.impl.DecompositionTypeImpl <em>Decomposition Type</em>}' class.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @see net.certware.intent.intentSpecification.impl.DecompositionTypeImpl\n+ * @see net.certware.intent.intentSpecification.impl.IntentSpecificationPackageImpl#getDecompositionType()\n+ * @generated\n+ */\n+ EClass DECOMPOSITION_TYPE = eINSTANCE.getDecompositionType();\n+\n+ /**\n+ * The meta object literal for the '<em><b>Type Name</b></em>' attribute feature.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ */\n+ EAttribute DECOMPOSITION_TYPE__TYPE_NAME = eINSTANCE.getDecompositionType_TypeName();\n+\n /**\n * The meta object literal for the '{@link net.certware.intent.intentSpecification.impl.DocumentImpl <em>Document</em>}' class.\n * <!-- begin-user-doc -->\n@@ -1050,6 +1331,24 @@ interface Literals\n */\n EReference DOCUMENT__ENTRIES = eINSTANCE.getDocument_Entries();\n \n+ /**\n+ * The meta object literal for the '{@link net.certware.intent.intentSpecification.impl.DocItemTypeImpl <em>Doc Item Type</em>}' class.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @see net.certware.intent.intentSpecification.impl.DocItemTypeImpl\n+ * @see net.certware.intent.intentSpecification.impl.IntentSpecificationPackageImpl#getDocItemType()\n+ * @generated\n+ */\n+ EClass DOC_ITEM_TYPE = eINSTANCE.getDocItemType();\n+\n+ /**\n+ * The meta object literal for the '<em><b>Type Name</b></em>' attribute feature.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ */\n+ EAttribute DOC_ITEM_TYPE__TYPE_NAME = eINSTANCE.getDocItemType_TypeName();\n+\n /**\n * The meta object literal for the '{@link net.certware.intent.intentSpecification.impl.DocItemImpl <em>Doc Item</em>}' class.\n * <!-- begin-user-doc -->\n@@ -1061,20 +1360,20 @@ interface Literals\n EClass DOC_ITEM = eINSTANCE.getDocItem();\n \n /**\n- * The meta object literal for the '<em><b>Type</b></em>' attribute feature.\n+ * The meta object literal for the '<em><b>Type</b></em>' containment reference feature.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n- EAttribute DOC_ITEM__TYPE = eINSTANCE.getDocItem_Type();\n+ EReference DOC_ITEM__TYPE = eINSTANCE.getDocItem_Type();\n \n /**\n- * The meta object literal for the '<em><b>Id</b></em>' attribute feature.\n+ * The meta object literal for the '<em><b>Name</b></em>' attribute feature.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n- EAttribute DOC_ITEM__ID = eINSTANCE.getDocItem_Id();\n+ EAttribute DOC_ITEM__NAME = eINSTANCE.getDocItem_Name();\n \n /**\n * The meta object literal for the '<em><b>Ref</b></em>' attribute feature.\n@@ -1084,6 +1383,24 @@ interface Literals\n */\n EAttribute DOC_ITEM__REF = eINSTANCE.getDocItem_Ref();\n \n+ /**\n+ * The meta object literal for the '{@link net.certware.intent.intentSpecification.impl.ModelTypeImpl <em>Model Type</em>}' class.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @see net.certware.intent.intentSpecification.impl.ModelTypeImpl\n+ * @see net.certware.intent.intentSpecification.impl.IntentSpecificationPackageImpl#getModelType()\n+ * @generated\n+ */\n+ EClass MODEL_TYPE = eINSTANCE.getModelType();\n+\n+ /**\n+ * The meta object literal for the '<em><b>Type Name</b></em>' attribute feature.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ */\n+ EAttribute MODEL_TYPE__TYPE_NAME = eINSTANCE.getModelType_TypeName();\n+\n /**\n * The meta object literal for the '{@link net.certware.intent.intentSpecification.impl.ModelItemImpl <em>Model Item</em>}' class.\n * <!-- begin-user-doc -->\n@@ -1095,20 +1412,20 @@ interface Literals\n EClass MODEL_ITEM = eINSTANCE.getModelItem();\n \n /**\n- * The meta object literal for the '<em><b>Type</b></em>' attribute feature.\n+ * The meta object literal for the '<em><b>Type</b></em>' containment reference feature.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n- EAttribute MODEL_ITEM__TYPE = eINSTANCE.getModelItem_Type();\n+ EReference MODEL_ITEM__TYPE = eINSTANCE.getModelItem_Type();\n \n /**\n- * The meta object literal for the '<em><b>Id</b></em>' attribute feature.\n+ * The meta object literal for the '<em><b>Name</b></em>' attribute feature.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n- EAttribute MODEL_ITEM__ID = eINSTANCE.getModelItem_Id();\n+ EAttribute MODEL_ITEM__NAME = eINSTANCE.getModelItem_Name();\n \n /**\n * The meta object literal for the '<em><b>Desc</b></em>' attribute feature.\n@@ -1118,6 +1435,24 @@ interface Literals\n */\n EAttribute MODEL_ITEM__DESC = eINSTANCE.getModelItem_Desc();\n \n+ /**\n+ * The meta object literal for the '{@link net.certware.intent.intentSpecification.impl.ListItemTypeImpl <em>List Item Type</em>}' class.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @see net.certware.intent.intentSpecification.impl.ListItemTypeImpl\n+ * @see net.certware.intent.intentSpecification.impl.IntentSpecificationPackageImpl#getListItemType()\n+ * @generated\n+ */\n+ EClass LIST_ITEM_TYPE = eINSTANCE.getListItemType();\n+\n+ /**\n+ * The meta object literal for the '<em><b>Type Name</b></em>' attribute feature.\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ */\n+ EAttribute LIST_ITEM_TYPE__TYPE_NAME = eINSTANCE.getListItemType_TypeName();\n+\n /**\n * The meta object literal for the '{@link net.certware.intent.intentSpecification.impl.ListItemImpl <em>List Item</em>}' class.\n * <!-- begin-user-doc -->\n@@ -1129,20 +1464,20 @@ interface Literals\n EClass LIST_ITEM = eINSTANCE.getListItem();\n \n /**\n- * The meta object literal for the '<em><b>Type</b></em>' attribute feature.\n+ * The meta object literal for the '<em><b>Type</b></em>' containment reference feature.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n- EAttribute LIST_ITEM__TYPE = eINSTANCE.getListItem_Type();\n+ EReference LIST_ITEM__TYPE = eINSTANCE.getListItem_Type();\n \n /**\n- * The meta object literal for the '<em><b>Id</b></em>' attribute feature.\n+ * The meta object literal for the '<em><b>Name</b></em>' attribute feature.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n- EAttribute LIST_ITEM__ID = eINSTANCE.getListItem_Id();\n+ EAttribute LIST_ITEM__NAME = eINSTANCE.getListItem_Name();\n \n /**\n * The meta object literal for the '<em><b>Desc</b></em>' attribute feature.", "raw_url": "https://github.com/nasa/CertWare/raw/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2FIntentSpecificationPackage.java", "sha": "fa6f0420fb0406fd2ff002cc9dae4f7f37d79ce5", "status": "modified" }, { "additions": 20, "blob_url": "https://github.com/nasa/CertWare/blob/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2FListItem.java", "changes": 40, "contents_url": "https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2FListItem.java?ref=27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9", "deletions": 20, "filename": "net.certware.intent/src-gen/net/certware/intent/intentSpecification/ListItem.java", "new_code": " * <li>{@link net.certware.intent.intentSpecification.ListItem#getName <em>Name</em>}</li>\n * Returns the value of the '<em><b>Type</b></em>' containment reference.\n * If the meaning of the '<em>Type</em>' containment reference isn't clear,\n * @return the value of the '<em>Type</em>' containment reference.\n * @see #setType(ListItemType)\n * @model containment=\"true\"\n ListItemType getType();\n * Sets the value of the '{@link net.certware.intent.intentSpecification.ListItem#getType <em>Type</em>}' containment reference.\n * @param value the new value of the '<em>Type</em>' containment reference.\n void setType(ListItemType value);\n * Returns the value of the '<em><b>Name</b></em>' attribute.\n * If the meaning of the '<em>Name</em>' attribute isn't clear,\n * @return the value of the '<em>Name</em>' attribute.\n * @see #setName(String)\n * @see net.certware.intent.intentSpecification.IntentSpecificationPackage#getListItem_Name()\n String getName();\n * Sets the value of the '{@link net.certware.intent.intentSpecification.ListItem#getName <em>Name</em>}' attribute.\n * @param value the new value of the '<em>Name</em>' attribute.\n * @see #getName()\n void setName(String value);", "new_methods": [], "old_code": " * <li>{@link net.certware.intent.intentSpecification.ListItem#getId <em>Id</em>}</li>\n * Returns the value of the '<em><b>Type</b></em>' attribute.\n * If the meaning of the '<em>Type</em>' attribute isn't clear,\n * @return the value of the '<em>Type</em>' attribute.\n * @see #setType(String)\n * @model\n String getType();\n * Sets the value of the '{@link net.certware.intent.intentSpecification.ListItem#getType <em>Type</em>}' attribute.\n * @param value the new value of the '<em>Type</em>' attribute.\n void setType(String value);\n * Returns the value of the '<em><b>Id</b></em>' attribute.\n * If the meaning of the '<em>Id</em>' attribute isn't clear,\n * @return the value of the '<em>Id</em>' attribute.\n * @see #setId(String)\n * @see net.certware.intent.intentSpecification.IntentSpecificationPackage#getListItem_Id()\n String getId();\n * Sets the value of the '{@link net.certware.intent.intentSpecification.ListItem#getId <em>Id</em>}' attribute.\n * @param value the new value of the '<em>Id</em>' attribute.\n * @see #getId()\n void setId(String value);", "old_methods": [], "patch": "@@ -15,7 +15,7 @@\n * The following features are supported:\n * <ul>\n * <li>{@link net.certware.intent.intentSpecification.ListItem#getType <em>Type</em>}</li>\n- * <li>{@link net.certware.intent.intentSpecification.ListItem#getId <em>Id</em>}</li>\n+ * <li>{@link net.certware.intent.intentSpecification.ListItem#getName <em>Name</em>}</li>\n * <li>{@link net.certware.intent.intentSpecification.ListItem#getDesc <em>Desc</em>}</li>\n * <li>{@link net.certware.intent.intentSpecification.ListItem#getDocReferences <em>Doc References</em>}</li>\n * <li>{@link net.certware.intent.intentSpecification.ListItem#getItemReferences <em>Item References</em>}</li>\n@@ -30,56 +30,56 @@\n public interface ListItem extends EObject\n {\n /**\n- * Returns the value of the '<em><b>Type</b></em>' attribute.\n+ * Returns the value of the '<em><b>Type</b></em>' containment reference.\n * <!-- begin-user-doc -->\n * <p>\n- * If the meaning of the '<em>Type</em>' attribute isn't clear,\n+ * If the meaning of the '<em>Type</em>' containment reference isn't clear,\n * there really should be more of a description here...\n * </p>\n * <!-- end-user-doc -->\n- * @return the value of the '<em>Type</em>' attribute.\n- * @see #setType(String)\n+ * @return the value of the '<em>Type</em>' containment reference.\n+ * @see #setType(ListItemType)\n * @see net.certware.intent.intentSpecification.IntentSpecificationPackage#getListItem_Type()\n- * @model\n+ * @model containment=\"true\"\n * @generated\n */\n- String getType();\n+ ListItemType getType();\n \n /**\n- * Sets the value of the '{@link net.certware.intent.intentSpecification.ListItem#getType <em>Type</em>}' attribute.\n+ * Sets the value of the '{@link net.certware.intent.intentSpecification.ListItem#getType <em>Type</em>}' containment reference.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n- * @param value the new value of the '<em>Type</em>' attribute.\n+ * @param value the new value of the '<em>Type</em>' containment reference.\n * @see #getType()\n * @generated\n */\n- void setType(String value);\n+ void setType(ListItemType value);\n \n /**\n- * Returns the value of the '<em><b>Id</b></em>' attribute.\n+ * Returns the value of the '<em><b>Name</b></em>' attribute.\n * <!-- begin-user-doc -->\n * <p>\n- * If the meaning of the '<em>Id</em>' attribute isn't clear,\n+ * If the meaning of the '<em>Name</em>' attribute isn't clear,\n * there really should be more of a description here...\n * </p>\n * <!-- end-user-doc -->\n- * @return the value of the '<em>Id</em>' attribute.\n- * @see #setId(String)\n- * @see net.certware.intent.intentSpecification.IntentSpecificationPackage#getListItem_Id()\n+ * @return the value of the '<em>Name</em>' attribute.\n+ * @see #setName(String)\n+ * @see net.certware.intent.intentSpecification.IntentSpecificationPackage#getListItem_Name()\n * @model\n * @generated\n */\n- String getId();\n+ String getName();\n \n /**\n- * Sets the value of the '{@link net.certware.intent.intentSpecification.ListItem#getId <em>Id</em>}' attribute.\n+ * Sets the value of the '{@link net.certware.intent.intentSpecification.ListItem#getName <em>Name</em>}' attribute.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n- * @param value the new value of the '<em>Id</em>' attribute.\n- * @see #getId()\n+ * @param value the new value of the '<em>Name</em>' attribute.\n+ * @see #getName()\n * @generated\n */\n- void setId(String value);\n+ void setName(String value);\n \n /**\n * Returns the value of the '<em><b>Desc</b></em>' attribute.", "raw_url": "https://github.com/nasa/CertWare/raw/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2FListItem.java", "sha": "1e59d53484b55c601b11970d6803d0cc0e0f9204", "status": "modified" }, { "additions": 20, "blob_url": "https://github.com/nasa/CertWare/blob/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2FModelItem.java", "changes": 40, "contents_url": "https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2FModelItem.java?ref=27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9", "deletions": 20, "filename": "net.certware.intent/src-gen/net/certware/intent/intentSpecification/ModelItem.java", "new_code": " * <li>{@link net.certware.intent.intentSpecification.ModelItem#getName <em>Name</em>}</li>\n * Returns the value of the '<em><b>Type</b></em>' containment reference.\n * If the meaning of the '<em>Type</em>' containment reference isn't clear,\n * @return the value of the '<em>Type</em>' containment reference.\n * @see #setType(ModelType)\n * @model containment=\"true\"\n ModelType getType();\n * Sets the value of the '{@link net.certware.intent.intentSpecification.ModelItem#getType <em>Type</em>}' containment reference.\n * @param value the new value of the '<em>Type</em>' containment reference.\n void setType(ModelType value);\n * Returns the value of the '<em><b>Name</b></em>' attribute.\n * If the meaning of the '<em>Name</em>' attribute isn't clear,\n * @return the value of the '<em>Name</em>' attribute.\n * @see #setName(String)\n * @see net.certware.intent.intentSpecification.IntentSpecificationPackage#getModelItem_Name()\n String getName();\n * Sets the value of the '{@link net.certware.intent.intentSpecification.ModelItem#getName <em>Name</em>}' attribute.\n * @param value the new value of the '<em>Name</em>' attribute.\n * @see #getName()\n void setName(String value);", "new_methods": [], "old_code": " * <li>{@link net.certware.intent.intentSpecification.ModelItem#getId <em>Id</em>}</li>\n * Returns the value of the '<em><b>Type</b></em>' attribute.\n * If the meaning of the '<em>Type</em>' attribute isn't clear,\n * @return the value of the '<em>Type</em>' attribute.\n * @see #setType(String)\n * @model\n String getType();\n * Sets the value of the '{@link net.certware.intent.intentSpecification.ModelItem#getType <em>Type</em>}' attribute.\n * @param value the new value of the '<em>Type</em>' attribute.\n void setType(String value);\n * Returns the value of the '<em><b>Id</b></em>' attribute.\n * If the meaning of the '<em>Id</em>' attribute isn't clear,\n * @return the value of the '<em>Id</em>' attribute.\n * @see #setId(String)\n * @see net.certware.intent.intentSpecification.IntentSpecificationPackage#getModelItem_Id()\n String getId();\n * Sets the value of the '{@link net.certware.intent.intentSpecification.ModelItem#getId <em>Id</em>}' attribute.\n * @param value the new value of the '<em>Id</em>' attribute.\n * @see #getId()\n void setId(String value);", "old_methods": [], "patch": "@@ -13,7 +13,7 @@\n * The following features are supported:\n * <ul>\n * <li>{@link net.certware.intent.intentSpecification.ModelItem#getType <em>Type</em>}</li>\n- * <li>{@link net.certware.intent.intentSpecification.ModelItem#getId <em>Id</em>}</li>\n+ * <li>{@link net.certware.intent.intentSpecification.ModelItem#getName <em>Name</em>}</li>\n * <li>{@link net.certware.intent.intentSpecification.ModelItem#getDesc <em>Desc</em>}</li>\n * </ul>\n * </p>\n@@ -25,56 +25,56 @@\n public interface ModelItem extends EObject\n {\n /**\n- * Returns the value of the '<em><b>Type</b></em>' attribute.\n+ * Returns the value of the '<em><b>Type</b></em>' containment reference.\n * <!-- begin-user-doc -->\n * <p>\n- * If the meaning of the '<em>Type</em>' attribute isn't clear,\n+ * If the meaning of the '<em>Type</em>' containment reference isn't clear,\n * there really should be more of a description here...\n * </p>\n * <!-- end-user-doc -->\n- * @return the value of the '<em>Type</em>' attribute.\n- * @see #setType(String)\n+ * @return the value of the '<em>Type</em>' containment reference.\n+ * @see #setType(ModelType)\n * @see net.certware.intent.intentSpecification.IntentSpecificationPackage#getModelItem_Type()\n- * @model\n+ * @model containment=\"true\"\n * @generated\n */\n- String getType();\n+ ModelType getType();\n \n /**\n- * Sets the value of the '{@link net.certware.intent.intentSpecification.ModelItem#getType <em>Type</em>}' attribute.\n+ * Sets the value of the '{@link net.certware.intent.intentSpecification.ModelItem#getType <em>Type</em>}' containment reference.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n- * @param value the new value of the '<em>Type</em>' attribute.\n+ * @param value the new value of the '<em>Type</em>' containment reference.\n * @see #getType()\n * @generated\n */\n- void setType(String value);\n+ void setType(ModelType value);\n \n /**\n- * Returns the value of the '<em><b>Id</b></em>' attribute.\n+ * Returns the value of the '<em><b>Name</b></em>' attribute.\n * <!-- begin-user-doc -->\n * <p>\n- * If the meaning of the '<em>Id</em>' attribute isn't clear,\n+ * If the meaning of the '<em>Name</em>' attribute isn't clear,\n * there really should be more of a description here...\n * </p>\n * <!-- end-user-doc -->\n- * @return the value of the '<em>Id</em>' attribute.\n- * @see #setId(String)\n- * @see net.certware.intent.intentSpecification.IntentSpecificationPackage#getModelItem_Id()\n+ * @return the value of the '<em>Name</em>' attribute.\n+ * @see #setName(String)\n+ * @see net.certware.intent.intentSpecification.IntentSpecificationPackage#getModelItem_Name()\n * @model\n * @generated\n */\n- String getId();\n+ String getName();\n \n /**\n- * Sets the value of the '{@link net.certware.intent.intentSpecification.ModelItem#getId <em>Id</em>}' attribute.\n+ * Sets the value of the '{@link net.certware.intent.intentSpecification.ModelItem#getName <em>Name</em>}' attribute.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n- * @param value the new value of the '<em>Id</em>' attribute.\n- * @see #getId()\n+ * @param value the new value of the '<em>Name</em>' attribute.\n+ * @see #getName()\n * @generated\n */\n- void setId(String value);\n+ void setName(String value);\n \n /**\n * Returns the value of the '<em><b>Desc</b></em>' attribute.", "raw_url": "https://github.com/nasa/CertWare/raw/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2FModelItem.java", "sha": "6515c20f33eaa74279f6ee4750ff83d794b16a3e", "status": "modified" }, { "additions": 11, "blob_url": "https://github.com/nasa/CertWare/blob/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2FRefinement.java", "changes": 22, "contents_url": "https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2FRefinement.java?ref=27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9", "deletions": 11, "filename": "net.certware.intent/src-gen/net/certware/intent/intentSpecification/Refinement.java", "new_code": " * <li>{@link net.certware.intent.intentSpecification.Refinement#getName <em>Name</em>}</li>\n * Returns the value of the '<em><b>Name</b></em>' attribute.\n * If the meaning of the '<em>Name</em>' attribute isn't clear,\n * @return the value of the '<em>Name</em>' attribute.\n * @see #setName(String)\n * @see net.certware.intent.intentSpecification.IntentSpecificationPackage#getRefinement_Name()\n String getName();\n * Sets the value of the '{@link net.certware.intent.intentSpecification.Refinement#getName <em>Name</em>}' attribute.\n * @param value the new value of the '<em>Name</em>' attribute.\n * @see #getName()\n void setName(String value);", "new_methods": [], "old_code": " * <li>{@link net.certware.intent.intentSpecification.Refinement#getId <em>Id</em>}</li>\n * Returns the value of the '<em><b>Id</b></em>' attribute.\n * If the meaning of the '<em>Id</em>' attribute isn't clear,\n * @return the value of the '<em>Id</em>' attribute.\n * @see #setId(String)\n * @see net.certware.intent.intentSpecification.IntentSpecificationPackage#getRefinement_Id()\n String getId();\n * Sets the value of the '{@link net.certware.intent.intentSpecification.Refinement#getId <em>Id</em>}' attribute.\n * @param value the new value of the '<em>Id</em>' attribute.\n * @see #getId()\n void setId(String value);", "old_methods": [], "patch": "@@ -14,7 +14,7 @@\n * <p>\n * The following features are supported:\n * <ul>\n- * <li>{@link net.certware.intent.intentSpecification.Refinement#getId <em>Id</em>}</li>\n+ * <li>{@link net.certware.intent.intentSpecification.Refinement#getName <em>Name</em>}</li>\n * <li>{@link net.certware.intent.intentSpecification.Refinement#getDesc <em>Desc</em>}</li>\n * <li>{@link net.certware.intent.intentSpecification.Refinement#getIntents <em>Intents</em>}</li>\n * </ul>\n@@ -27,30 +27,30 @@\n public interface Refinement extends EObject\n {\n /**\n- * Returns the value of the '<em><b>Id</b></em>' attribute.\n+ * Returns the value of the '<em><b>Name</b></em>' attribute.\n * <!-- begin-user-doc -->\n * <p>\n- * If the meaning of the '<em>Id</em>' attribute isn't clear,\n+ * If the meaning of the '<em>Name</em>' attribute isn't clear,\n * there really should be more of a description here...\n * </p>\n * <!-- end-user-doc -->\n- * @return the value of the '<em>Id</em>' attribute.\n- * @see #setId(String)\n- * @see net.certware.intent.intentSpecification.IntentSpecificationPackage#getRefinement_Id()\n+ * @return the value of the '<em>Name</em>' attribute.\n+ * @see #setName(String)\n+ * @see net.certware.intent.intentSpecification.IntentSpecificationPackage#getRefinement_Name()\n * @model\n * @generated\n */\n- String getId();\n+ String getName();\n \n /**\n- * Sets the value of the '{@link net.certware.intent.intentSpecification.Refinement#getId <em>Id</em>}' attribute.\n+ * Sets the value of the '{@link net.certware.intent.intentSpecification.Refinement#getName <em>Name</em>}' attribute.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n- * @param value the new value of the '<em>Id</em>' attribute.\n- * @see #getId()\n+ * @param value the new value of the '<em>Name</em>' attribute.\n+ * @see #getName()\n * @generated\n */\n- void setId(String value);\n+ void setName(String value);\n \n /**\n * Returns the value of the '<em><b>Desc</b></em>' attribute.", "raw_url": "https://github.com/nasa/CertWare/raw/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2FRefinement.java", "sha": "1d9d3af033b6e5d4df49bc08cac78021b388aa7b", "status": "modified" }, { "additions": 11, "blob_url": "https://github.com/nasa/CertWare/blob/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2FSpecification.java", "changes": 22, "contents_url": "https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2FSpecification.java?ref=27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9", "deletions": 11, "filename": "net.certware.intent/src-gen/net/certware/intent/intentSpecification/Specification.java", "new_code": " * <li>{@link net.certware.intent.intentSpecification.Specification#getName <em>Name</em>}</li>\n * Returns the value of the '<em><b>Name</b></em>' attribute.\n * If the meaning of the '<em>Name</em>' attribute isn't clear,\n * @return the value of the '<em>Name</em>' attribute.\n * @see #setName(String)\n * @see net.certware.intent.intentSpecification.IntentSpecificationPackage#getSpecification_Name()\n String getName();\n * Sets the value of the '{@link net.certware.intent.intentSpecification.Specification#getName <em>Name</em>}' attribute.\n * @param value the new value of the '<em>Name</em>' attribute.\n * @see #getName()\n void setName(String value);", "new_methods": [], "old_code": " * <li>{@link net.certware.intent.intentSpecification.Specification#getId <em>Id</em>}</li>\n * Returns the value of the '<em><b>Id</b></em>' attribute.\n * If the meaning of the '<em>Id</em>' attribute isn't clear,\n * @return the value of the '<em>Id</em>' attribute.\n * @see #setId(String)\n * @see net.certware.intent.intentSpecification.IntentSpecificationPackage#getSpecification_Id()\n String getId();\n * Sets the value of the '{@link net.certware.intent.intentSpecification.Specification#getId <em>Id</em>}' attribute.\n * @param value the new value of the '<em>Id</em>' attribute.\n * @see #getId()\n void setId(String value);", "old_methods": [], "patch": "@@ -14,7 +14,7 @@\n * <p>\n * The following features are supported:\n * <ul>\n- * <li>{@link net.certware.intent.intentSpecification.Specification#getId <em>Id</em>}</li>\n+ * <li>{@link net.certware.intent.intentSpecification.Specification#getName <em>Name</em>}</li>\n * <li>{@link net.certware.intent.intentSpecification.Specification#getRefinements <em>Refinements</em>}</li>\n * </ul>\n * </p>\n@@ -26,30 +26,30 @@\n public interface Specification extends EObject\n {\n /**\n- * Returns the value of the '<em><b>Id</b></em>' attribute.\n+ * Returns the value of the '<em><b>Name</b></em>' attribute.\n * <!-- begin-user-doc -->\n * <p>\n- * If the meaning of the '<em>Id</em>' attribute isn't clear,\n+ * If the meaning of the '<em>Name</em>' attribute isn't clear,\n * there really should be more of a description here...\n * </p>\n * <!-- end-user-doc -->\n- * @return the value of the '<em>Id</em>' attribute.\n- * @see #setId(String)\n- * @see net.certware.intent.intentSpecification.IntentSpecificationPackage#getSpecification_Id()\n+ * @return the value of the '<em>Name</em>' attribute.\n+ * @see #setName(String)\n+ * @see net.certware.intent.intentSpecification.IntentSpecificationPackage#getSpecification_Name()\n * @model\n * @generated\n */\n- String getId();\n+ String getName();\n \n /**\n- * Sets the value of the '{@link net.certware.intent.intentSpecification.Specification#getId <em>Id</em>}' attribute.\n+ * Sets the value of the '{@link net.certware.intent.intentSpecification.Specification#getName <em>Name</em>}' attribute.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n- * @param value the new value of the '<em>Id</em>' attribute.\n- * @see #getId()\n+ * @param value the new value of the '<em>Name</em>' attribute.\n+ * @see #getName()\n * @generated\n */\n- void setId(String value);\n+ void setName(String value);\n \n /**\n * Returns the value of the '<em><b>Refinements</b></em>' containment reference list.", "raw_url": "https://github.com/nasa/CertWare/raw/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2FSpecification.java", "sha": "71f6a8f6d515198d0585dd974691752bbbc83c76", "status": "modified" }, { "additions": 60, "blob_url": "https://github.com/nasa/CertWare/blob/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2Fimpl%2FDecompositionImpl.java", "changes": 104, "contents_url": "https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2Fimpl%2FDecompositionImpl.java?ref=27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9", "deletions": 44, "filename": "net.certware.intent/src-gen/net/certware/intent/intentSpecification/impl/DecompositionImpl.java", "new_code": "import net.certware.intent.intentSpecification.DecompositionType;\n * <li>{@link net.certware.intent.intentSpecification.impl.DecompositionImpl#getName <em>Name</em>}</li>\n * The cached value of the '{@link #getType() <em>Type</em>}' containment reference.\n protected DecompositionType type;\n * The default value of the '{@link #getName() <em>Name</em>}' attribute.\n * @see #getName()\n protected static final String NAME_EDEFAULT = null;\n * The cached value of the '{@link #getName() <em>Name</em>}' attribute.\n * @see #getName()\n protected String name = NAME_EDEFAULT;\n public DecompositionType getType()\n public NotificationChain basicSetType(DecompositionType newType, NotificationChain msgs)\n DecompositionType oldType = type;\n {\n ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.DECOMPOSITION__TYPE, oldType, newType);\n if (msgs == null) msgs = notification; else msgs.add(notification);\n }\n return msgs;\n public void setType(DecompositionType newType)\n if (newType != type)\n {\n NotificationChain msgs = null;\n if (type != null)\n msgs = ((InternalEObject)type).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - IntentSpecificationPackage.DECOMPOSITION__TYPE, null, msgs);\n if (newType != null)\n msgs = ((InternalEObject)newType).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - IntentSpecificationPackage.DECOMPOSITION__TYPE, null, msgs);\n msgs = basicSetType(newType, msgs);\n if (msgs != null) msgs.dispatch();\n }\n else if (eNotificationRequired())\n eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.DECOMPOSITION__TYPE, newType, newType));\n }\n\n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n public String getName()\n {\n return name;\n public void setName(String newName)\n String oldName = name;\n name = newName;\n eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.DECOMPOSITION__NAME, oldName, name));\n case IntentSpecificationPackage.DECOMPOSITION__TYPE:\n return basicSetType(null, msgs);\n case IntentSpecificationPackage.DECOMPOSITION__NAME:\n return getName();\n setType((DecompositionType)newValue);\n case IntentSpecificationPackage.DECOMPOSITION__NAME:\n setName((String)newValue);\n setType((DecompositionType)null);\n case IntentSpecificationPackage.DECOMPOSITION__NAME:\n setName(NAME_EDEFAULT);\n return type != null;\n case IntentSpecificationPackage.DECOMPOSITION__NAME:\n return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);\n result.append(\" (name: \");\n result.append(name);", "new_methods": [], "old_code": " * <li>{@link net.certware.intent.intentSpecification.impl.DecompositionImpl#getId <em>Id</em>}</li>\n * The default value of the '{@link #getType() <em>Type</em>}' attribute.\n protected static final String TYPE_EDEFAULT = null;\n * The cached value of the '{@link #getType() <em>Type</em>}' attribute.\n * @see #getType()\n protected String type = TYPE_EDEFAULT;\n * The default value of the '{@link #getId() <em>Id</em>}' attribute.\n * @see #getId()\n protected static final String ID_EDEFAULT = null;\n\n /**\n * The cached value of the '{@link #getId() <em>Id</em>}' attribute.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @see #getId()\n * @generated\n * @ordered\n */\n protected String id = ID_EDEFAULT;\n public String getType()\n public void setType(String newType)\n String oldType = type;\n eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.DECOMPOSITION__TYPE, oldType, type));\n public String getId()\n return id;\n public void setId(String newId)\n String oldId = id;\n id = newId;\n eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.DECOMPOSITION__ID, oldId, id));\n case IntentSpecificationPackage.DECOMPOSITION__ID:\n return getId();\n setType((String)newValue);\n case IntentSpecificationPackage.DECOMPOSITION__ID:\n setId((String)newValue);\n setType(TYPE_EDEFAULT);\n case IntentSpecificationPackage.DECOMPOSITION__ID:\n setId(ID_EDEFAULT);\n return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type);\n case IntentSpecificationPackage.DECOMPOSITION__ID:\n return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);\n result.append(\" (type: \");\n result.append(type);\n result.append(\", id: \");\n result.append(id);", "old_methods": [], "patch": "@@ -5,6 +5,7 @@\n import java.util.Collection;\n \n import net.certware.intent.intentSpecification.Decomposition;\n+import net.certware.intent.intentSpecification.DecompositionType;\n import net.certware.intent.intentSpecification.Document;\n import net.certware.intent.intentSpecification.IntentSpecificationPackage;\n import net.certware.intent.intentSpecification.ListItem;\n@@ -32,7 +33,7 @@\n * The following features are implemented:\n * <ul>\n * <li>{@link net.certware.intent.intentSpecification.impl.DecompositionImpl#getType <em>Type</em>}</li>\n- * <li>{@link net.certware.intent.intentSpecification.impl.DecompositionImpl#getId <em>Id</em>}</li>\n+ * <li>{@link net.certware.intent.intentSpecification.impl.DecompositionImpl#getName <em>Name</em>}</li>\n * <li>{@link net.certware.intent.intentSpecification.impl.DecompositionImpl#getDesc <em>Desc</em>}</li>\n * <li>{@link net.certware.intent.intentSpecification.impl.DecompositionImpl#getDocuments <em>Documents</em>}</li>\n * <li>{@link net.certware.intent.intentSpecification.impl.DecompositionImpl#getModels <em>Models</em>}</li>\n@@ -45,44 +46,34 @@\n public class DecompositionImpl extends MinimalEObjectImpl.Container implements Decomposition\n {\n /**\n- * The default value of the '{@link #getType() <em>Type</em>}' attribute.\n+ * The cached value of the '{@link #getType() <em>Type</em>}' containment reference.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @see #getType()\n * @generated\n * @ordered\n */\n- protected static final String TYPE_EDEFAULT = null;\n+ protected DecompositionType type;\n \n /**\n- * The cached value of the '{@link #getType() <em>Type</em>}' attribute.\n+ * The default value of the '{@link #getName() <em>Name</em>}' attribute.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n- * @see #getType()\n+ * @see #getName()\n * @generated\n * @ordered\n */\n- protected String type = TYPE_EDEFAULT;\n+ protected static final String NAME_EDEFAULT = null;\n \n /**\n- * The default value of the '{@link #getId() <em>Id</em>}' attribute.\n+ * The cached value of the '{@link #getName() <em>Name</em>}' attribute.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n- * @see #getId()\n+ * @see #getName()\n * @generated\n * @ordered\n */\n- protected static final String ID_EDEFAULT = null;\n-\n- /**\n- * The cached value of the '{@link #getId() <em>Id</em>}' attribute.\n- * <!-- begin-user-doc -->\n- * <!-- end-user-doc -->\n- * @see #getId()\n- * @generated\n- * @ordered\n- */\n- protected String id = ID_EDEFAULT;\n+ protected String name = NAME_EDEFAULT;\n \n /**\n * The default value of the '{@link #getDesc() <em>Desc</em>}' attribute.\n@@ -160,7 +151,7 @@ protected EClass eStaticClass()\n * <!-- end-user-doc -->\n * @generated\n */\n- public String getType()\n+ public DecompositionType getType()\n {\n return type;\n }\n@@ -170,35 +161,60 @@ public String getType()\n * <!-- end-user-doc -->\n * @generated\n */\n- public void setType(String newType)\n+ public NotificationChain basicSetType(DecompositionType newType, NotificationChain msgs)\n {\n- String oldType = type;\n+ DecompositionType oldType = type;\n type = newType;\n if (eNotificationRequired())\n- eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.DECOMPOSITION__TYPE, oldType, type));\n+ {\n+ ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.DECOMPOSITION__TYPE, oldType, newType);\n+ if (msgs == null) msgs = notification; else msgs.add(notification);\n+ }\n+ return msgs;\n }\n \n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n- public String getId()\n+ public void setType(DecompositionType newType)\n {\n- return id;\n+ if (newType != type)\n+ {\n+ NotificationChain msgs = null;\n+ if (type != null)\n+ msgs = ((InternalEObject)type).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - IntentSpecificationPackage.DECOMPOSITION__TYPE, null, msgs);\n+ if (newType != null)\n+ msgs = ((InternalEObject)newType).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - IntentSpecificationPackage.DECOMPOSITION__TYPE, null, msgs);\n+ msgs = basicSetType(newType, msgs);\n+ if (msgs != null) msgs.dispatch();\n+ }\n+ else if (eNotificationRequired())\n+ eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.DECOMPOSITION__TYPE, newType, newType));\n+ }\n+\n+ /**\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ */\n+ public String getName()\n+ {\n+ return name;\n }\n \n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n- public void setId(String newId)\n+ public void setName(String newName)\n {\n- String oldId = id;\n- id = newId;\n+ String oldName = name;\n+ name = newName;\n if (eNotificationRequired())\n- eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.DECOMPOSITION__ID, oldId, id));\n+ eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.DECOMPOSITION__NAME, oldName, name));\n }\n \n /**\n@@ -276,6 +292,8 @@ public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID,\n {\n switch (featureID)\n {\n+ case IntentSpecificationPackage.DECOMPOSITION__TYPE:\n+ return basicSetType(null, msgs);\n case IntentSpecificationPackage.DECOMPOSITION__DOCUMENTS:\n return ((InternalEList<?>)getDocuments()).basicRemove(otherEnd, msgs);\n case IntentSpecificationPackage.DECOMPOSITION__MODELS:\n@@ -298,8 +316,8 @@ public Object eGet(int featureID, boolean resolve, boolean coreType)\n {\n case IntentSpecificationPackage.DECOMPOSITION__TYPE:\n return getType();\n- case IntentSpecificationPackage.DECOMPOSITION__ID:\n- return getId();\n+ case IntentSpecificationPackage.DECOMPOSITION__NAME:\n+ return getName();\n case IntentSpecificationPackage.DECOMPOSITION__DESC:\n return getDesc();\n case IntentSpecificationPackage.DECOMPOSITION__DOCUMENTS:\n@@ -324,10 +342,10 @@ public void eSet(int featureID, Object newValue)\n switch (featureID)\n {\n case IntentSpecificationPackage.DECOMPOSITION__TYPE:\n- setType((String)newValue);\n+ setType((DecompositionType)newValue);\n return;\n- case IntentSpecificationPackage.DECOMPOSITION__ID:\n- setId((String)newValue);\n+ case IntentSpecificationPackage.DECOMPOSITION__NAME:\n+ setName((String)newValue);\n return;\n case IntentSpecificationPackage.DECOMPOSITION__DESC:\n setDesc((String)newValue);\n@@ -359,10 +377,10 @@ public void eUnset(int featureID)\n switch (featureID)\n {\n case IntentSpecificationPackage.DECOMPOSITION__TYPE:\n- setType(TYPE_EDEFAULT);\n+ setType((DecompositionType)null);\n return;\n- case IntentSpecificationPackage.DECOMPOSITION__ID:\n- setId(ID_EDEFAULT);\n+ case IntentSpecificationPackage.DECOMPOSITION__NAME:\n+ setName(NAME_EDEFAULT);\n return;\n case IntentSpecificationPackage.DECOMPOSITION__DESC:\n setDesc(DESC_EDEFAULT);\n@@ -391,9 +409,9 @@ public boolean eIsSet(int featureID)\n switch (featureID)\n {\n case IntentSpecificationPackage.DECOMPOSITION__TYPE:\n- return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type);\n- case IntentSpecificationPackage.DECOMPOSITION__ID:\n- return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);\n+ return type != null;\n+ case IntentSpecificationPackage.DECOMPOSITION__NAME:\n+ return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);\n case IntentSpecificationPackage.DECOMPOSITION__DESC:\n return DESC_EDEFAULT == null ? desc != null : !DESC_EDEFAULT.equals(desc);\n case IntentSpecificationPackage.DECOMPOSITION__DOCUMENTS:\n@@ -417,10 +435,8 @@ public String toString()\n if (eIsProxy()) return super.toString();\n \n StringBuffer result = new StringBuffer(super.toString());\n- result.append(\" (type: \");\n- result.append(type);\n- result.append(\", id: \");\n- result.append(id);\n+ result.append(\" (name: \");\n+ result.append(name);\n result.append(\", desc: \");\n result.append(desc);\n result.append(')');", "raw_url": "https://github.com/nasa/CertWare/raw/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2Fimpl%2FDecompositionImpl.java", "sha": "cc51c09add295af4f04cd7806970f3b2cde2d214", "status": "modified" }, { "additions": 76, "blob_url": "https://github.com/nasa/CertWare/blob/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2Fimpl%2FDocItemImpl.java", "changes": 120, "contents_url": "https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2Fimpl%2FDocItemImpl.java?ref=27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9", "deletions": 44, "filename": "net.certware.intent/src-gen/net/certware/intent/intentSpecification/impl/DocItemImpl.java", "new_code": "import net.certware.intent.intentSpecification.DocItemType;\nimport org.eclipse.emf.common.notify.NotificationChain;\nimport org.eclipse.emf.ecore.InternalEObject;\n * <li>{@link net.certware.intent.intentSpecification.impl.DocItemImpl#getName <em>Name</em>}</li>\n * The cached value of the '{@link #getType() <em>Type</em>}' containment reference.\n protected DocItemType type;\n * The default value of the '{@link #getName() <em>Name</em>}' attribute.\n * @see #getName()\n protected static final String NAME_EDEFAULT = null;\n * The cached value of the '{@link #getName() <em>Name</em>}' attribute.\n * @see #getName()\n protected String name = NAME_EDEFAULT;\n public DocItemType getType()\n public NotificationChain basicSetType(DocItemType newType, NotificationChain msgs)\n DocItemType oldType = type;\n {\n ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.DOC_ITEM__TYPE, oldType, newType);\n if (msgs == null) msgs = notification; else msgs.add(notification);\n }\n return msgs;\n public void setType(DocItemType newType)\n if (newType != type)\n {\n NotificationChain msgs = null;\n if (type != null)\n msgs = ((InternalEObject)type).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - IntentSpecificationPackage.DOC_ITEM__TYPE, null, msgs);\n if (newType != null)\n msgs = ((InternalEObject)newType).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - IntentSpecificationPackage.DOC_ITEM__TYPE, null, msgs);\n msgs = basicSetType(newType, msgs);\n if (msgs != null) msgs.dispatch();\n }\n else if (eNotificationRequired())\n eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.DOC_ITEM__TYPE, newType, newType));\n public String getName()\n return name;\n }\n\n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n public void setName(String newName)\n {\n String oldName = name;\n name = newName;\n eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.DOC_ITEM__NAME, oldName, name));\n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n @Override\n public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)\n {\n switch (featureID)\n {\n case IntentSpecificationPackage.DOC_ITEM__TYPE:\n return basicSetType(null, msgs);\n }\n return super.eInverseRemove(otherEnd, featureID, msgs);\n }\n\n case IntentSpecificationPackage.DOC_ITEM__NAME:\n return getName();\n setType((DocItemType)newValue);\n case IntentSpecificationPackage.DOC_ITEM__NAME:\n setName((String)newValue);\n setType((DocItemType)null);\n case IntentSpecificationPackage.DOC_ITEM__NAME:\n setName(NAME_EDEFAULT);\n return type != null;\n case IntentSpecificationPackage.DOC_ITEM__NAME:\n return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);\n result.append(\" (name: \");\n result.append(name);", "new_methods": [ { "arguments": [ "String newName" ], "filename": "net.certware.intent/src-gen/net/certware/intent/intentSpecification/impl/DocItemImpl.java", "implementation": "String oldName = name;\n name = newName;\n eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.DOC_ITEM__NAME, oldName, name));\n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n @Override\n public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)\n {\n switch (featureID)\n {\n case IntentSpecificationPackage.DOC_ITEM__TYPE:\n return basicSetType(null, msgs);", "signature": "void setName(String newName)" } ], "old_code": " * <li>{@link net.certware.intent.intentSpecification.impl.DocItemImpl#getId <em>Id</em>}</li>\n * The default value of the '{@link #getType() <em>Type</em>}' attribute.\n protected static final String TYPE_EDEFAULT = null;\n * The cached value of the '{@link #getType() <em>Type</em>}' attribute.\n * @see #getType()\n protected String type = TYPE_EDEFAULT;\n * The default value of the '{@link #getId() <em>Id</em>}' attribute.\n * @see #getId()\n protected static final String ID_EDEFAULT = null;\n\n /**\n * The cached value of the '{@link #getId() <em>Id</em>}' attribute.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @see #getId()\n * @generated\n * @ordered\n */\n protected String id = ID_EDEFAULT;\n public String getType()\n public void setType(String newType)\n String oldType = type;\n eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.DOC_ITEM__TYPE, oldType, type));\n public String getId()\n return id;\n public void setId(String newId)\n String oldId = id;\n id = newId;\n eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.DOC_ITEM__ID, oldId, id));\n case IntentSpecificationPackage.DOC_ITEM__ID:\n return getId();\n setType((String)newValue);\n case IntentSpecificationPackage.DOC_ITEM__ID:\n setId((String)newValue);\n setType(TYPE_EDEFAULT);\n case IntentSpecificationPackage.DOC_ITEM__ID:\n setId(ID_EDEFAULT);\n return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type);\n case IntentSpecificationPackage.DOC_ITEM__ID:\n return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);\n result.append(\" (type: \");\n result.append(type);\n result.append(\", id: \");\n result.append(id);", "old_methods": [], "patch": "@@ -3,11 +3,14 @@\n package net.certware.intent.intentSpecification.impl;\n \n import net.certware.intent.intentSpecification.DocItem;\n+import net.certware.intent.intentSpecification.DocItemType;\n import net.certware.intent.intentSpecification.IntentSpecificationPackage;\n \n import org.eclipse.emf.common.notify.Notification;\n+import org.eclipse.emf.common.notify.NotificationChain;\n \n import org.eclipse.emf.ecore.EClass;\n+import org.eclipse.emf.ecore.InternalEObject;\n \n import org.eclipse.emf.ecore.impl.ENotificationImpl;\n import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;\n@@ -20,7 +23,7 @@\n * The following features are implemented:\n * <ul>\n * <li>{@link net.certware.intent.intentSpecification.impl.DocItemImpl#getType <em>Type</em>}</li>\n- * <li>{@link net.certware.intent.intentSpecification.impl.DocItemImpl#getId <em>Id</em>}</li>\n+ * <li>{@link net.certware.intent.intentSpecification.impl.DocItemImpl#getName <em>Name</em>}</li>\n * <li>{@link net.certware.intent.intentSpecification.impl.DocItemImpl#getRef <em>Ref</em>}</li>\n * </ul>\n * </p>\n@@ -30,44 +33,34 @@\n public class DocItemImpl extends MinimalEObjectImpl.Container implements DocItem\n {\n /**\n- * The default value of the '{@link #getType() <em>Type</em>}' attribute.\n+ * The cached value of the '{@link #getType() <em>Type</em>}' containment reference.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @see #getType()\n * @generated\n * @ordered\n */\n- protected static final String TYPE_EDEFAULT = null;\n+ protected DocItemType type;\n \n /**\n- * The cached value of the '{@link #getType() <em>Type</em>}' attribute.\n+ * The default value of the '{@link #getName() <em>Name</em>}' attribute.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n- * @see #getType()\n+ * @see #getName()\n * @generated\n * @ordered\n */\n- protected String type = TYPE_EDEFAULT;\n+ protected static final String NAME_EDEFAULT = null;\n \n /**\n- * The default value of the '{@link #getId() <em>Id</em>}' attribute.\n+ * The cached value of the '{@link #getName() <em>Name</em>}' attribute.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n- * @see #getId()\n+ * @see #getName()\n * @generated\n * @ordered\n */\n- protected static final String ID_EDEFAULT = null;\n-\n- /**\n- * The cached value of the '{@link #getId() <em>Id</em>}' attribute.\n- * <!-- begin-user-doc -->\n- * <!-- end-user-doc -->\n- * @see #getId()\n- * @generated\n- * @ordered\n- */\n- protected String id = ID_EDEFAULT;\n+ protected String name = NAME_EDEFAULT;\n \n /**\n * The default value of the '{@link #getRef() <em>Ref</em>}' attribute.\n@@ -115,7 +108,7 @@ protected EClass eStaticClass()\n * <!-- end-user-doc -->\n * @generated\n */\n- public String getType()\n+ public DocItemType getType()\n {\n return type;\n }\n@@ -125,35 +118,60 @@ public String getType()\n * <!-- end-user-doc -->\n * @generated\n */\n- public void setType(String newType)\n+ public NotificationChain basicSetType(DocItemType newType, NotificationChain msgs)\n {\n- String oldType = type;\n+ DocItemType oldType = type;\n type = newType;\n if (eNotificationRequired())\n- eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.DOC_ITEM__TYPE, oldType, type));\n+ {\n+ ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.DOC_ITEM__TYPE, oldType, newType);\n+ if (msgs == null) msgs = notification; else msgs.add(notification);\n+ }\n+ return msgs;\n }\n \n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n- public String getId()\n+ public void setType(DocItemType newType)\n {\n- return id;\n+ if (newType != type)\n+ {\n+ NotificationChain msgs = null;\n+ if (type != null)\n+ msgs = ((InternalEObject)type).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - IntentSpecificationPackage.DOC_ITEM__TYPE, null, msgs);\n+ if (newType != null)\n+ msgs = ((InternalEObject)newType).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - IntentSpecificationPackage.DOC_ITEM__TYPE, null, msgs);\n+ msgs = basicSetType(newType, msgs);\n+ if (msgs != null) msgs.dispatch();\n+ }\n+ else if (eNotificationRequired())\n+ eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.DOC_ITEM__TYPE, newType, newType));\n }\n \n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n- public void setId(String newId)\n+ public String getName()\n {\n- String oldId = id;\n- id = newId;\n+ return name;\n+ }\n+\n+ /**\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ */\n+ public void setName(String newName)\n+ {\n+ String oldName = name;\n+ name = newName;\n if (eNotificationRequired())\n- eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.DOC_ITEM__ID, oldId, id));\n+ eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.DOC_ITEM__NAME, oldName, name));\n }\n \n /**\n@@ -179,6 +197,22 @@ public void setRef(String newRef)\n eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.DOC_ITEM__REF, oldRef, ref));\n }\n \n+ /**\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ */\n+ @Override\n+ public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)\n+ {\n+ switch (featureID)\n+ {\n+ case IntentSpecificationPackage.DOC_ITEM__TYPE:\n+ return basicSetType(null, msgs);\n+ }\n+ return super.eInverseRemove(otherEnd, featureID, msgs);\n+ }\n+\n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n@@ -191,8 +225,8 @@ public Object eGet(int featureID, boolean resolve, boolean coreType)\n {\n case IntentSpecificationPackage.DOC_ITEM__TYPE:\n return getType();\n- case IntentSpecificationPackage.DOC_ITEM__ID:\n- return getId();\n+ case IntentSpecificationPackage.DOC_ITEM__NAME:\n+ return getName();\n case IntentSpecificationPackage.DOC_ITEM__REF:\n return getRef();\n }\n@@ -210,10 +244,10 @@ public void eSet(int featureID, Object newValue)\n switch (featureID)\n {\n case IntentSpecificationPackage.DOC_ITEM__TYPE:\n- setType((String)newValue);\n+ setType((DocItemType)newValue);\n return;\n- case IntentSpecificationPackage.DOC_ITEM__ID:\n- setId((String)newValue);\n+ case IntentSpecificationPackage.DOC_ITEM__NAME:\n+ setName((String)newValue);\n return;\n case IntentSpecificationPackage.DOC_ITEM__REF:\n setRef((String)newValue);\n@@ -233,10 +267,10 @@ public void eUnset(int featureID)\n switch (featureID)\n {\n case IntentSpecificationPackage.DOC_ITEM__TYPE:\n- setType(TYPE_EDEFAULT);\n+ setType((DocItemType)null);\n return;\n- case IntentSpecificationPackage.DOC_ITEM__ID:\n- setId(ID_EDEFAULT);\n+ case IntentSpecificationPackage.DOC_ITEM__NAME:\n+ setName(NAME_EDEFAULT);\n return;\n case IntentSpecificationPackage.DOC_ITEM__REF:\n setRef(REF_EDEFAULT);\n@@ -256,9 +290,9 @@ public boolean eIsSet(int featureID)\n switch (featureID)\n {\n case IntentSpecificationPackage.DOC_ITEM__TYPE:\n- return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type);\n- case IntentSpecificationPackage.DOC_ITEM__ID:\n- return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);\n+ return type != null;\n+ case IntentSpecificationPackage.DOC_ITEM__NAME:\n+ return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);\n case IntentSpecificationPackage.DOC_ITEM__REF:\n return REF_EDEFAULT == null ? ref != null : !REF_EDEFAULT.equals(ref);\n }\n@@ -276,10 +310,8 @@ public String toString()\n if (eIsProxy()) return super.toString();\n \n StringBuffer result = new StringBuffer(super.toString());\n- result.append(\" (type: \");\n- result.append(type);\n- result.append(\", id: \");\n- result.append(id);\n+ result.append(\" (name: \");\n+ result.append(name);\n result.append(\", ref: \");\n result.append(ref);\n result.append(')');", "raw_url": "https://github.com/nasa/CertWare/raw/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2Fimpl%2FDocItemImpl.java", "sha": "20e203b0e66bd479ef9ea74aea32e9acae72df48", "status": "modified" }, { "additions": 60, "blob_url": "https://github.com/nasa/CertWare/blob/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2Fimpl%2FIntentImpl.java", "changes": 104, "contents_url": "https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2Fimpl%2FIntentImpl.java?ref=27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9", "deletions": 44, "filename": "net.certware.intent/src-gen/net/certware/intent/intentSpecification/impl/IntentImpl.java", "new_code": "import net.certware.intent.intentSpecification.IntentType;\n * <li>{@link net.certware.intent.intentSpecification.impl.IntentImpl#getName <em>Name</em>}</li>\n * The cached value of the '{@link #getType() <em>Type</em>}' containment reference.\n protected IntentType type;\n * The default value of the '{@link #getName() <em>Name</em>}' attribute.\n * @see #getName()\n protected static final String NAME_EDEFAULT = null;\n * The cached value of the '{@link #getName() <em>Name</em>}' attribute.\n * @see #getName()\n protected String name = NAME_EDEFAULT;\n public IntentType getType()\n public NotificationChain basicSetType(IntentType newType, NotificationChain msgs)\n IntentType oldType = type;\n {\n ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.INTENT__TYPE, oldType, newType);\n if (msgs == null) msgs = notification; else msgs.add(notification);\n }\n return msgs;\n public void setType(IntentType newType)\n if (newType != type)\n {\n NotificationChain msgs = null;\n if (type != null)\n msgs = ((InternalEObject)type).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - IntentSpecificationPackage.INTENT__TYPE, null, msgs);\n if (newType != null)\n msgs = ((InternalEObject)newType).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - IntentSpecificationPackage.INTENT__TYPE, null, msgs);\n msgs = basicSetType(newType, msgs);\n if (msgs != null) msgs.dispatch();\n }\n else if (eNotificationRequired())\n eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.INTENT__TYPE, newType, newType));\n }\n\n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n public String getName()\n {\n return name;\n public void setName(String newName)\n String oldName = name;\n name = newName;\n eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.INTENT__NAME, oldName, name));\n case IntentSpecificationPackage.INTENT__TYPE:\n return basicSetType(null, msgs);\n case IntentSpecificationPackage.INTENT__NAME:\n return getName();\n setType((IntentType)newValue);\n case IntentSpecificationPackage.INTENT__NAME:\n setName((String)newValue);\n setType((IntentType)null);\n case IntentSpecificationPackage.INTENT__NAME:\n setName(NAME_EDEFAULT);\n return type != null;\n case IntentSpecificationPackage.INTENT__NAME:\n return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);\n result.append(\" (name: \");\n result.append(name);", "new_methods": [], "old_code": " * <li>{@link net.certware.intent.intentSpecification.impl.IntentImpl#getId <em>Id</em>}</li>\n * The default value of the '{@link #getType() <em>Type</em>}' attribute.\n protected static final String TYPE_EDEFAULT = null;\n * The cached value of the '{@link #getType() <em>Type</em>}' attribute.\n * @see #getType()\n protected String type = TYPE_EDEFAULT;\n * The default value of the '{@link #getId() <em>Id</em>}' attribute.\n * @see #getId()\n protected static final String ID_EDEFAULT = null;\n\n /**\n * The cached value of the '{@link #getId() <em>Id</em>}' attribute.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @see #getId()\n * @generated\n * @ordered\n */\n protected String id = ID_EDEFAULT;\n public String getType()\n public void setType(String newType)\n String oldType = type;\n eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.INTENT__TYPE, oldType, type));\n public String getId()\n return id;\n public void setId(String newId)\n String oldId = id;\n id = newId;\n eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.INTENT__ID, oldId, id));\n case IntentSpecificationPackage.INTENT__ID:\n return getId();\n setType((String)newValue);\n case IntentSpecificationPackage.INTENT__ID:\n setId((String)newValue);\n setType(TYPE_EDEFAULT);\n case IntentSpecificationPackage.INTENT__ID:\n setId(ID_EDEFAULT);\n return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type);\n case IntentSpecificationPackage.INTENT__ID:\n return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);\n result.append(\" (type: \");\n result.append(type);\n result.append(\", id: \");\n result.append(id);", "old_methods": [], "patch": "@@ -7,6 +7,7 @@\n import net.certware.intent.intentSpecification.Decomposition;\n import net.certware.intent.intentSpecification.Intent;\n import net.certware.intent.intentSpecification.IntentSpecificationPackage;\n+import net.certware.intent.intentSpecification.IntentType;\n \n import org.eclipse.emf.common.notify.Notification;\n import org.eclipse.emf.common.notify.NotificationChain;\n@@ -30,7 +31,7 @@\n * The following features are implemented:\n * <ul>\n * <li>{@link net.certware.intent.intentSpecification.impl.IntentImpl#getType <em>Type</em>}</li>\n- * <li>{@link net.certware.intent.intentSpecification.impl.IntentImpl#getId <em>Id</em>}</li>\n+ * <li>{@link net.certware.intent.intentSpecification.impl.IntentImpl#getName <em>Name</em>}</li>\n * <li>{@link net.certware.intent.intentSpecification.impl.IntentImpl#getDesc <em>Desc</em>}</li>\n * <li>{@link net.certware.intent.intentSpecification.impl.IntentImpl#getDecompositions <em>Decompositions</em>}</li>\n * </ul>\n@@ -41,44 +42,34 @@\n public class IntentImpl extends MinimalEObjectImpl.Container implements Intent\n {\n /**\n- * The default value of the '{@link #getType() <em>Type</em>}' attribute.\n+ * The cached value of the '{@link #getType() <em>Type</em>}' containment reference.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @see #getType()\n * @generated\n * @ordered\n */\n- protected static final String TYPE_EDEFAULT = null;\n+ protected IntentType type;\n \n /**\n- * The cached value of the '{@link #getType() <em>Type</em>}' attribute.\n+ * The default value of the '{@link #getName() <em>Name</em>}' attribute.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n- * @see #getType()\n+ * @see #getName()\n * @generated\n * @ordered\n */\n- protected String type = TYPE_EDEFAULT;\n+ protected static final String NAME_EDEFAULT = null;\n \n /**\n- * The default value of the '{@link #getId() <em>Id</em>}' attribute.\n+ * The cached value of the '{@link #getName() <em>Name</em>}' attribute.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n- * @see #getId()\n+ * @see #getName()\n * @generated\n * @ordered\n */\n- protected static final String ID_EDEFAULT = null;\n-\n- /**\n- * The cached value of the '{@link #getId() <em>Id</em>}' attribute.\n- * <!-- begin-user-doc -->\n- * <!-- end-user-doc -->\n- * @see #getId()\n- * @generated\n- * @ordered\n- */\n- protected String id = ID_EDEFAULT;\n+ protected String name = NAME_EDEFAULT;\n \n /**\n * The default value of the '{@link #getDesc() <em>Desc</em>}' attribute.\n@@ -136,7 +127,7 @@ protected EClass eStaticClass()\n * <!-- end-user-doc -->\n * @generated\n */\n- public String getType()\n+ public IntentType getType()\n {\n return type;\n }\n@@ -146,35 +137,60 @@ public String getType()\n * <!-- end-user-doc -->\n * @generated\n */\n- public void setType(String newType)\n+ public NotificationChain basicSetType(IntentType newType, NotificationChain msgs)\n {\n- String oldType = type;\n+ IntentType oldType = type;\n type = newType;\n if (eNotificationRequired())\n- eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.INTENT__TYPE, oldType, type));\n+ {\n+ ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.INTENT__TYPE, oldType, newType);\n+ if (msgs == null) msgs = notification; else msgs.add(notification);\n+ }\n+ return msgs;\n }\n \n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n- public String getId()\n+ public void setType(IntentType newType)\n {\n- return id;\n+ if (newType != type)\n+ {\n+ NotificationChain msgs = null;\n+ if (type != null)\n+ msgs = ((InternalEObject)type).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - IntentSpecificationPackage.INTENT__TYPE, null, msgs);\n+ if (newType != null)\n+ msgs = ((InternalEObject)newType).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - IntentSpecificationPackage.INTENT__TYPE, null, msgs);\n+ msgs = basicSetType(newType, msgs);\n+ if (msgs != null) msgs.dispatch();\n+ }\n+ else if (eNotificationRequired())\n+ eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.INTENT__TYPE, newType, newType));\n+ }\n+\n+ /**\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ */\n+ public String getName()\n+ {\n+ return name;\n }\n \n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n- public void setId(String newId)\n+ public void setName(String newName)\n {\n- String oldId = id;\n- id = newId;\n+ String oldName = name;\n+ name = newName;\n if (eNotificationRequired())\n- eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.INTENT__ID, oldId, id));\n+ eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.INTENT__NAME, oldName, name));\n }\n \n /**\n@@ -224,6 +240,8 @@ public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID,\n {\n switch (featureID)\n {\n+ case IntentSpecificationPackage.INTENT__TYPE:\n+ return basicSetType(null, msgs);\n case IntentSpecificationPackage.INTENT__DECOMPOSITIONS:\n return ((InternalEList<?>)getDecompositions()).basicRemove(otherEnd, msgs);\n }\n@@ -242,8 +260,8 @@ public Object eGet(int featureID, boolean resolve, boolean coreType)\n {\n case IntentSpecificationPackage.INTENT__TYPE:\n return getType();\n- case IntentSpecificationPackage.INTENT__ID:\n- return getId();\n+ case IntentSpecificationPackage.INTENT__NAME:\n+ return getName();\n case IntentSpecificationPackage.INTENT__DESC:\n return getDesc();\n case IntentSpecificationPackage.INTENT__DECOMPOSITIONS:\n@@ -264,10 +282,10 @@ public void eSet(int featureID, Object newValue)\n switch (featureID)\n {\n case IntentSpecificationPackage.INTENT__TYPE:\n- setType((String)newValue);\n+ setType((IntentType)newValue);\n return;\n- case IntentSpecificationPackage.INTENT__ID:\n- setId((String)newValue);\n+ case IntentSpecificationPackage.INTENT__NAME:\n+ setName((String)newValue);\n return;\n case IntentSpecificationPackage.INTENT__DESC:\n setDesc((String)newValue);\n@@ -291,10 +309,10 @@ public void eUnset(int featureID)\n switch (featureID)\n {\n case IntentSpecificationPackage.INTENT__TYPE:\n- setType(TYPE_EDEFAULT);\n+ setType((IntentType)null);\n return;\n- case IntentSpecificationPackage.INTENT__ID:\n- setId(ID_EDEFAULT);\n+ case IntentSpecificationPackage.INTENT__NAME:\n+ setName(NAME_EDEFAULT);\n return;\n case IntentSpecificationPackage.INTENT__DESC:\n setDesc(DESC_EDEFAULT);\n@@ -317,9 +335,9 @@ public boolean eIsSet(int featureID)\n switch (featureID)\n {\n case IntentSpecificationPackage.INTENT__TYPE:\n- return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type);\n- case IntentSpecificationPackage.INTENT__ID:\n- return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);\n+ return type != null;\n+ case IntentSpecificationPackage.INTENT__NAME:\n+ return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);\n case IntentSpecificationPackage.INTENT__DESC:\n return DESC_EDEFAULT == null ? desc != null : !DESC_EDEFAULT.equals(desc);\n case IntentSpecificationPackage.INTENT__DECOMPOSITIONS:\n@@ -339,10 +357,8 @@ public String toString()\n if (eIsProxy()) return super.toString();\n \n StringBuffer result = new StringBuffer(super.toString());\n- result.append(\" (type: \");\n- result.append(type);\n- result.append(\", id: \");\n- result.append(id);\n+ result.append(\" (name: \");\n+ result.append(name);\n result.append(\", desc: \");\n result.append(desc);\n result.append(')');", "raw_url": "https://github.com/nasa/CertWare/raw/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2Fimpl%2FIntentImpl.java", "sha": "813aa2e46c32953c6e4544ed666b1e9a1ab2d54a", "status": "modified" }, { "additions": 60, "blob_url": "https://github.com/nasa/CertWare/blob/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2Fimpl%2FIntentSpecificationFactoryImpl.java", "changes": 60, "contents_url": "https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2Fimpl%2FIntentSpecificationFactoryImpl.java?ref=27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9", "deletions": 0, "filename": "net.certware.intent/src-gen/net/certware/intent/intentSpecification/impl/IntentSpecificationFactoryImpl.java", "new_code": " case IntentSpecificationPackage.INTENT_TYPE: return createIntentType();\n case IntentSpecificationPackage.DECOMPOSITION_TYPE: return createDecompositionType();\n case IntentSpecificationPackage.DOC_ITEM_TYPE: return createDocItemType();\n case IntentSpecificationPackage.MODEL_TYPE: return createModelType();\n case IntentSpecificationPackage.LIST_ITEM_TYPE: return createListItemType();\n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n public IntentType createIntentType()\n {\n IntentTypeImpl intentType = new IntentTypeImpl();\n return intentType;\n }\n\n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n public DecompositionType createDecompositionType()\n {\n DecompositionTypeImpl decompositionType = new DecompositionTypeImpl();\n return decompositionType;\n }\n\n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n public DocItemType createDocItemType()\n {\n DocItemTypeImpl docItemType = new DocItemTypeImpl();\n return docItemType;\n }\n\n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n public ModelType createModelType()\n {\n ModelTypeImpl modelType = new ModelTypeImpl();\n return modelType;\n }\n\n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n public ListItemType createListItemType()\n {\n ListItemTypeImpl listItemType = new ListItemTypeImpl();\n return listItemType;\n }\n", "new_methods": [ { "arguments": [], "filename": "net.certware.intent/src-gen/net/certware/intent/intentSpecification/impl/IntentSpecificationFactoryImpl.java", "implementation": "IntentTypeImpl intentType = new IntentTypeImpl();\n return intentType;", "signature": "IntentType createIntentType()" }, { "arguments": [], "filename": "net.certware.intent/src-gen/net/certware/intent/intentSpecification/impl/IntentSpecificationFactoryImpl.java", "implementation": "DecompositionTypeImpl decompositionType = new DecompositionTypeImpl();\n return decompositionType;", "signature": "DecompositionType createDecompositionType()" }, { "arguments": [], "filename": "net.certware.intent/src-gen/net/certware/intent/intentSpecification/impl/IntentSpecificationFactoryImpl.java", "implementation": "DocItemTypeImpl docItemType = new DocItemTypeImpl();\n return docItemType;", "signature": "DocItemType createDocItemType()" }, { "arguments": [], "filename": "net.certware.intent/src-gen/net/certware/intent/intentSpecification/impl/IntentSpecificationFactoryImpl.java", "implementation": "ModelTypeImpl modelType = new ModelTypeImpl();\n return modelType;", "signature": "ModelType createModelType()" }, { "arguments": [], "filename": "net.certware.intent/src-gen/net/certware/intent/intentSpecification/impl/IntentSpecificationFactoryImpl.java", "implementation": "ListItemTypeImpl listItemType = new ListItemTypeImpl();\n return listItemType;", "signature": "ListItemType createListItemType()" } ], "old_code": "", "old_methods": [], "patch": "@@ -67,10 +67,15 @@ public EObject create(EClass eClass)\n case IntentSpecificationPackage.SPECIFICATION: return createSpecification();\n case IntentSpecificationPackage.REFINEMENT: return createRefinement();\n case IntentSpecificationPackage.INTENT: return createIntent();\n+ case IntentSpecificationPackage.INTENT_TYPE: return createIntentType();\n case IntentSpecificationPackage.DECOMPOSITION: return createDecomposition();\n+ case IntentSpecificationPackage.DECOMPOSITION_TYPE: return createDecompositionType();\n case IntentSpecificationPackage.DOCUMENT: return createDocument();\n+ case IntentSpecificationPackage.DOC_ITEM_TYPE: return createDocItemType();\n case IntentSpecificationPackage.DOC_ITEM: return createDocItem();\n+ case IntentSpecificationPackage.MODEL_TYPE: return createModelType();\n case IntentSpecificationPackage.MODEL_ITEM: return createModelItem();\n+ case IntentSpecificationPackage.LIST_ITEM_TYPE: return createListItemType();\n case IntentSpecificationPackage.LIST_ITEM: return createListItem();\n default:\n throw new IllegalArgumentException(\"The class '\" + eClass.getName() + \"' is not a valid classifier\");\n@@ -110,6 +115,17 @@ public Intent createIntent()\n return intent;\n }\n \n+ /**\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ */\n+ public IntentType createIntentType()\n+ {\n+ IntentTypeImpl intentType = new IntentTypeImpl();\n+ return intentType;\n+ }\n+\n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n@@ -121,6 +137,17 @@ public Decomposition createDecomposition()\n return decomposition;\n }\n \n+ /**\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ */\n+ public DecompositionType createDecompositionType()\n+ {\n+ DecompositionTypeImpl decompositionType = new DecompositionTypeImpl();\n+ return decompositionType;\n+ }\n+\n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n@@ -132,6 +159,17 @@ public Document createDocument()\n return document;\n }\n \n+ /**\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ */\n+ public DocItemType createDocItemType()\n+ {\n+ DocItemTypeImpl docItemType = new DocItemTypeImpl();\n+ return docItemType;\n+ }\n+\n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n@@ -143,6 +181,17 @@ public DocItem createDocItem()\n return docItem;\n }\n \n+ /**\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ */\n+ public ModelType createModelType()\n+ {\n+ ModelTypeImpl modelType = new ModelTypeImpl();\n+ return modelType;\n+ }\n+\n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n@@ -154,6 +203,17 @@ public ModelItem createModelItem()\n return modelItem;\n }\n \n+ /**\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ */\n+ public ListItemType createListItemType()\n+ {\n+ ListItemTypeImpl listItemType = new ListItemTypeImpl();\n+ return listItemType;\n+ }\n+\n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->", "raw_url": "https://github.com/nasa/CertWare/raw/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2Fimpl%2FIntentSpecificationFactoryImpl.java", "sha": "24275f91258f97f53208287f491554c5ac732981", "status": "modified" }, { "additions": 211, "blob_url": "https://github.com/nasa/CertWare/blob/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2Fimpl%2FIntentSpecificationPackageImpl.java", "changes": 252, "contents_url": "https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2Fimpl%2FIntentSpecificationPackageImpl.java?ref=27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9", "deletions": 41, "filename": "net.certware.intent/src-gen/net/certware/intent/intentSpecification/impl/IntentSpecificationPackageImpl.java", "new_code": "import net.certware.intent.intentSpecification.DecompositionType;\nimport net.certware.intent.intentSpecification.DocItemType;\nimport net.certware.intent.intentSpecification.IntentType;\nimport net.certware.intent.intentSpecification.ListItemType;\nimport net.certware.intent.intentSpecification.ModelType;\n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n private EClass intentTypeEClass = null;\n\n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n private EClass decompositionTypeEClass = null;\n\n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n private EClass docItemTypeEClass = null;\n\n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n private EClass modelTypeEClass = null;\n\n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n private EClass listItemTypeEClass = null;\n\n public EAttribute getSpecification_Name()\n public EAttribute getRefinement_Name()\n public EReference getIntent_Type()\n return (EReference)intentEClass.getEStructuralFeatures().get(0);\n public EAttribute getIntent_Name()\n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n public EClass getIntentType()\n {\n return intentTypeEClass;\n }\n\n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n public EAttribute getIntentType_TypeName()\n {\n return (EAttribute)intentTypeEClass.getEStructuralFeatures().get(0);\n }\n\n public EReference getDecomposition_Type()\n return (EReference)decompositionEClass.getEStructuralFeatures().get(0);\n public EAttribute getDecomposition_Name()\n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n public EClass getDecompositionType()\n {\n return decompositionTypeEClass;\n }\n\n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n public EAttribute getDecompositionType_TypeName()\n {\n return (EAttribute)decompositionTypeEClass.getEStructuralFeatures().get(0);\n }\n\n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n public EClass getDocItemType()\n {\n return docItemTypeEClass;\n }\n\n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n public EAttribute getDocItemType_TypeName()\n {\n return (EAttribute)docItemTypeEClass.getEStructuralFeatures().get(0);\n }\n\n public EReference getDocItem_Type()\n return (EReference)docItemEClass.getEStructuralFeatures().get(0);\n public EAttribute getDocItem_Name()\n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n public EClass getModelType()\n {\n return modelTypeEClass;\n }\n\n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n public EAttribute getModelType_TypeName()\n {\n return (EAttribute)modelTypeEClass.getEStructuralFeatures().get(0);\n }\n\n public EReference getModelItem_Type()\n return (EReference)modelItemEClass.getEStructuralFeatures().get(0);\n public EAttribute getModelItem_Name()\n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n public EClass getListItemType()\n {\n return listItemTypeEClass;\n }\n\n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n public EAttribute getListItemType_TypeName()\n {\n return (EAttribute)listItemTypeEClass.getEStructuralFeatures().get(0);\n }\n\n public EReference getListItem_Type()\n return (EReference)listItemEClass.getEStructuralFeatures().get(0);\n public EAttribute getListItem_Name()\n createEAttribute(specificationEClass, SPECIFICATION__NAME);\n createEAttribute(refinementEClass, REFINEMENT__NAME);\n createEReference(intentEClass, INTENT__TYPE);\n createEAttribute(intentEClass, INTENT__NAME);\n intentTypeEClass = createEClass(INTENT_TYPE);\n createEAttribute(intentTypeEClass, INTENT_TYPE__TYPE_NAME);\n\n createEReference(decompositionEClass, DECOMPOSITION__TYPE);\n createEAttribute(decompositionEClass, DECOMPOSITION__NAME);\n decompositionTypeEClass = createEClass(DECOMPOSITION_TYPE);\n createEAttribute(decompositionTypeEClass, DECOMPOSITION_TYPE__TYPE_NAME);\n\n docItemTypeEClass = createEClass(DOC_ITEM_TYPE);\n createEAttribute(docItemTypeEClass, DOC_ITEM_TYPE__TYPE_NAME);\n\n createEReference(docItemEClass, DOC_ITEM__TYPE);\n createEAttribute(docItemEClass, DOC_ITEM__NAME);\n modelTypeEClass = createEClass(MODEL_TYPE);\n createEAttribute(modelTypeEClass, MODEL_TYPE__TYPE_NAME);\n\n createEReference(modelItemEClass, MODEL_ITEM__TYPE);\n createEAttribute(modelItemEClass, MODEL_ITEM__NAME);\n listItemTypeEClass = createEClass(LIST_ITEM_TYPE);\n createEAttribute(listItemTypeEClass, LIST_ITEM_TYPE__TYPE_NAME);\n\n createEReference(listItemEClass, LIST_ITEM__TYPE);\n createEAttribute(listItemEClass, LIST_ITEM__NAME);\n initEAttribute(getSpecification_Name(), ecorePackage.getEString(), \"name\", null, 0, 1, Specification.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n initEAttribute(getRefinement_Name(), ecorePackage.getEString(), \"name\", null, 0, 1, Refinement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n initEReference(getIntent_Type(), this.getIntentType(), null, \"type\", null, 0, 1, Intent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n initEAttribute(getIntent_Name(), ecorePackage.getEString(), \"name\", null, 0, 1, Intent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n initEClass(intentTypeEClass, IntentType.class, \"IntentType\", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\n initEAttribute(getIntentType_TypeName(), ecorePackage.getEString(), \"typeName\", null, 0, 1, IntentType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n\n initEReference(getDecomposition_Type(), this.getDecompositionType(), null, \"type\", null, 0, 1, Decomposition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n initEAttribute(getDecomposition_Name(), ecorePackage.getEString(), \"name\", null, 0, 1, Decomposition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n initEClass(decompositionTypeEClass, DecompositionType.class, \"DecompositionType\", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\n initEAttribute(getDecompositionType_TypeName(), ecorePackage.getEString(), \"typeName\", null, 0, 1, DecompositionType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n\n initEClass(docItemTypeEClass, DocItemType.class, \"DocItemType\", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\n initEAttribute(getDocItemType_TypeName(), ecorePackage.getEString(), \"typeName\", null, 0, 1, DocItemType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n\n initEReference(getDocItem_Type(), this.getDocItemType(), null, \"type\", null, 0, 1, DocItem.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n initEAttribute(getDocItem_Name(), ecorePackage.getEString(), \"name\", null, 0, 1, DocItem.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n initEClass(modelTypeEClass, ModelType.class, \"ModelType\", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\n initEAttribute(getModelType_TypeName(), ecorePackage.getEString(), \"typeName\", null, 0, 1, ModelType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n\n initEReference(getModelItem_Type(), this.getModelType(), null, \"type\", null, 0, 1, ModelItem.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n initEAttribute(getModelItem_Name(), ecorePackage.getEString(), \"name\", null, 0, 1, ModelItem.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n initEClass(listItemTypeEClass, ListItemType.class, \"ListItemType\", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\n initEAttribute(getListItemType_TypeName(), ecorePackage.getEString(), \"typeName\", null, 0, 1, ListItemType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n\n initEReference(getListItem_Type(), this.getListItemType(), null, \"type\", null, 0, 1, ListItem.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n initEAttribute(getListItem_Name(), ecorePackage.getEString(), \"name\", null, 0, 1, ListItem.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);", "new_methods": [ { "arguments": [], "filename": "net.certware.intent/src-gen/net/certware/intent/intentSpecification/impl/IntentSpecificationPackageImpl.java", "implementation": "return intentTypeEClass;", "signature": "EClass getIntentType()" }, { "arguments": [], "filename": "net.certware.intent/src-gen/net/certware/intent/intentSpecification/impl/IntentSpecificationPackageImpl.java", "implementation": "return (EAttribute)intentTypeEClass.getEStructuralFeatures().get(0);", "signature": "EAttribute getIntentType_TypeName()" }, { "arguments": [], "filename": "net.certware.intent/src-gen/net/certware/intent/intentSpecification/impl/IntentSpecificationPackageImpl.java", "implementation": "return decompositionTypeEClass;", "signature": "EClass getDecompositionType()" }, { "arguments": [], "filename": "net.certware.intent/src-gen/net/certware/intent/intentSpecification/impl/IntentSpecificationPackageImpl.java", "implementation": "return (EAttribute)decompositionTypeEClass.getEStructuralFeatures().get(0);", "signature": "EAttribute getDecompositionType_TypeName()" }, { "arguments": [], "filename": "net.certware.intent/src-gen/net/certware/intent/intentSpecification/impl/IntentSpecificationPackageImpl.java", "implementation": "return docItemTypeEClass;", "signature": "EClass getDocItemType()" }, { "arguments": [], "filename": "net.certware.intent/src-gen/net/certware/intent/intentSpecification/impl/IntentSpecificationPackageImpl.java", "implementation": "return (EAttribute)docItemTypeEClass.getEStructuralFeatures().get(0);", "signature": "EAttribute getDocItemType_TypeName()" }, { "arguments": [], "filename": "net.certware.intent/src-gen/net/certware/intent/intentSpecification/impl/IntentSpecificationPackageImpl.java", "implementation": "return modelTypeEClass;", "signature": "EClass getModelType()" }, { "arguments": [], "filename": "net.certware.intent/src-gen/net/certware/intent/intentSpecification/impl/IntentSpecificationPackageImpl.java", "implementation": "return (EAttribute)modelTypeEClass.getEStructuralFeatures().get(0);", "signature": "EAttribute getModelType_TypeName()" }, { "arguments": [], "filename": "net.certware.intent/src-gen/net/certware/intent/intentSpecification/impl/IntentSpecificationPackageImpl.java", "implementation": "return listItemTypeEClass;", "signature": "EClass getListItemType()" }, { "arguments": [], "filename": "net.certware.intent/src-gen/net/certware/intent/intentSpecification/impl/IntentSpecificationPackageImpl.java", "implementation": "return (EAttribute)listItemTypeEClass.getEStructuralFeatures().get(0);", "signature": "EAttribute getListItemType_TypeName()" } ], "old_code": " public EAttribute getSpecification_Id()\n public EAttribute getRefinement_Id()\n public EAttribute getIntent_Type()\n return (EAttribute)intentEClass.getEStructuralFeatures().get(0);\n public EAttribute getIntent_Id()\n public EAttribute getDecomposition_Type()\n return (EAttribute)decompositionEClass.getEStructuralFeatures().get(0);\n public EAttribute getDecomposition_Id()\n public EAttribute getDocItem_Type()\n return (EAttribute)docItemEClass.getEStructuralFeatures().get(0);\n public EAttribute getDocItem_Id()\n public EAttribute getModelItem_Type()\n return (EAttribute)modelItemEClass.getEStructuralFeatures().get(0);\n public EAttribute getModelItem_Id()\n public EAttribute getListItem_Type()\n return (EAttribute)listItemEClass.getEStructuralFeatures().get(0);\n public EAttribute getListItem_Id()\n createEAttribute(specificationEClass, SPECIFICATION__ID);\n createEAttribute(refinementEClass, REFINEMENT__ID);\n createEAttribute(intentEClass, INTENT__TYPE);\n createEAttribute(intentEClass, INTENT__ID);\n createEAttribute(decompositionEClass, DECOMPOSITION__TYPE);\n createEAttribute(decompositionEClass, DECOMPOSITION__ID);\n createEAttribute(docItemEClass, DOC_ITEM__TYPE);\n createEAttribute(docItemEClass, DOC_ITEM__ID);\n createEAttribute(modelItemEClass, MODEL_ITEM__TYPE);\n createEAttribute(modelItemEClass, MODEL_ITEM__ID);\n createEAttribute(listItemEClass, LIST_ITEM__TYPE);\n createEAttribute(listItemEClass, LIST_ITEM__ID);\n initEAttribute(getSpecification_Id(), ecorePackage.getEString(), \"id\", null, 0, 1, Specification.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n initEAttribute(getRefinement_Id(), ecorePackage.getEString(), \"id\", null, 0, 1, Refinement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n initEAttribute(getIntent_Type(), ecorePackage.getEString(), \"type\", null, 0, 1, Intent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n initEAttribute(getIntent_Id(), ecorePackage.getEString(), \"id\", null, 0, 1, Intent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n initEAttribute(getDecomposition_Type(), ecorePackage.getEString(), \"type\", null, 0, 1, Decomposition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n initEAttribute(getDecomposition_Id(), ecorePackage.getEString(), \"id\", null, 0, 1, Decomposition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n initEAttribute(getDocItem_Type(), ecorePackage.getEString(), \"type\", null, 0, 1, DocItem.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n initEAttribute(getDocItem_Id(), ecorePackage.getEString(), \"id\", null, 0, 1, DocItem.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n initEAttribute(getModelItem_Type(), ecorePackage.getEString(), \"type\", null, 0, 1, ModelItem.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n initEAttribute(getModelItem_Id(), ecorePackage.getEString(), \"id\", null, 0, 1, ModelItem.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n initEAttribute(getListItem_Type(), ecorePackage.getEString(), \"type\", null, 0, 1, ListItem.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n initEAttribute(getListItem_Id(), ecorePackage.getEString(), \"id\", null, 0, 1, ListItem.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);", "old_methods": [], "patch": "@@ -3,13 +3,18 @@\n package net.certware.intent.intentSpecification.impl;\n \n import net.certware.intent.intentSpecification.Decomposition;\n+import net.certware.intent.intentSpecification.DecompositionType;\n import net.certware.intent.intentSpecification.DocItem;\n+import net.certware.intent.intentSpecification.DocItemType;\n import net.certware.intent.intentSpecification.Document;\n import net.certware.intent.intentSpecification.Intent;\n import net.certware.intent.intentSpecification.IntentSpecificationFactory;\n import net.certware.intent.intentSpecification.IntentSpecificationPackage;\n+import net.certware.intent.intentSpecification.IntentType;\n import net.certware.intent.intentSpecification.ListItem;\n+import net.certware.intent.intentSpecification.ListItemType;\n import net.certware.intent.intentSpecification.ModelItem;\n+import net.certware.intent.intentSpecification.ModelType;\n import net.certware.intent.intentSpecification.Refinement;\n import net.certware.intent.intentSpecification.Specification;\n \n@@ -49,34 +54,69 @@ public class IntentSpecificationPackageImpl extends EPackageImpl implements Inte\n */\n private EClass intentEClass = null;\n \n+ /**\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ */\n+ private EClass intentTypeEClass = null;\n+\n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n private EClass decompositionEClass = null;\n \n+ /**\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ */\n+ private EClass decompositionTypeEClass = null;\n+\n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n private EClass documentEClass = null;\n \n+ /**\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ */\n+ private EClass docItemTypeEClass = null;\n+\n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n private EClass docItemEClass = null;\n \n+ /**\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ */\n+ private EClass modelTypeEClass = null;\n+\n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n private EClass modelItemEClass = null;\n \n+ /**\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ */\n+ private EClass listItemTypeEClass = null;\n+\n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n@@ -162,7 +202,7 @@ public EClass getSpecification()\n * <!-- end-user-doc -->\n * @generated\n */\n- public EAttribute getSpecification_Id()\n+ public EAttribute getSpecification_Name()\n {\n return (EAttribute)specificationEClass.getEStructuralFeatures().get(0);\n }\n@@ -192,7 +232,7 @@ public EClass getRefinement()\n * <!-- end-user-doc -->\n * @generated\n */\n- public EAttribute getRefinement_Id()\n+ public EAttribute getRefinement_Name()\n {\n return (EAttribute)refinementEClass.getEStructuralFeatures().get(0);\n }\n@@ -232,17 +272,17 @@ public EClass getIntent()\n * <!-- end-user-doc -->\n * @generated\n */\n- public EAttribute getIntent_Type()\n+ public EReference getIntent_Type()\n {\n- return (EAttribute)intentEClass.getEStructuralFeatures().get(0);\n+ return (EReference)intentEClass.getEStructuralFeatures().get(0);\n }\n \n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n- public EAttribute getIntent_Id()\n+ public EAttribute getIntent_Name()\n {\n return (EAttribute)intentEClass.getEStructuralFeatures().get(1);\n }\n@@ -267,6 +307,26 @@ public EReference getIntent_Decompositions()\n return (EReference)intentEClass.getEStructuralFeatures().get(3);\n }\n \n+ /**\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ */\n+ public EClass getIntentType()\n+ {\n+ return intentTypeEClass;\n+ }\n+\n+ /**\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ */\n+ public EAttribute getIntentType_TypeName()\n+ {\n+ return (EAttribute)intentTypeEClass.getEStructuralFeatures().get(0);\n+ }\n+\n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n@@ -282,17 +342,17 @@ public EClass getDecomposition()\n * <!-- end-user-doc -->\n * @generated\n */\n- public EAttribute getDecomposition_Type()\n+ public EReference getDecomposition_Type()\n {\n- return (EAttribute)decompositionEClass.getEStructuralFeatures().get(0);\n+ return (EReference)decompositionEClass.getEStructuralFeatures().get(0);\n }\n \n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n- public EAttribute getDecomposition_Id()\n+ public EAttribute getDecomposition_Name()\n {\n return (EAttribute)decompositionEClass.getEStructuralFeatures().get(1);\n }\n@@ -337,6 +397,26 @@ public EReference getDecomposition_Items()\n return (EReference)decompositionEClass.getEStructuralFeatures().get(5);\n }\n \n+ /**\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ */\n+ public EClass getDecompositionType()\n+ {\n+ return decompositionTypeEClass;\n+ }\n+\n+ /**\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ */\n+ public EAttribute getDecompositionType_TypeName()\n+ {\n+ return (EAttribute)decompositionTypeEClass.getEStructuralFeatures().get(0);\n+ }\n+\n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n@@ -357,6 +437,26 @@ public EReference getDocument_Entries()\n return (EReference)documentEClass.getEStructuralFeatures().get(0);\n }\n \n+ /**\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ */\n+ public EClass getDocItemType()\n+ {\n+ return docItemTypeEClass;\n+ }\n+\n+ /**\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ */\n+ public EAttribute getDocItemType_TypeName()\n+ {\n+ return (EAttribute)docItemTypeEClass.getEStructuralFeatures().get(0);\n+ }\n+\n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n@@ -372,17 +472,17 @@ public EClass getDocItem()\n * <!-- end-user-doc -->\n * @generated\n */\n- public EAttribute getDocItem_Type()\n+ public EReference getDocItem_Type()\n {\n- return (EAttribute)docItemEClass.getEStructuralFeatures().get(0);\n+ return (EReference)docItemEClass.getEStructuralFeatures().get(0);\n }\n \n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n- public EAttribute getDocItem_Id()\n+ public EAttribute getDocItem_Name()\n {\n return (EAttribute)docItemEClass.getEStructuralFeatures().get(1);\n }\n@@ -397,6 +497,26 @@ public EAttribute getDocItem_Ref()\n return (EAttribute)docItemEClass.getEStructuralFeatures().get(2);\n }\n \n+ /**\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ */\n+ public EClass getModelType()\n+ {\n+ return modelTypeEClass;\n+ }\n+\n+ /**\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ */\n+ public EAttribute getModelType_TypeName()\n+ {\n+ return (EAttribute)modelTypeEClass.getEStructuralFeatures().get(0);\n+ }\n+\n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n@@ -412,17 +532,17 @@ public EClass getModelItem()\n * <!-- end-user-doc -->\n * @generated\n */\n- public EAttribute getModelItem_Type()\n+ public EReference getModelItem_Type()\n {\n- return (EAttribute)modelItemEClass.getEStructuralFeatures().get(0);\n+ return (EReference)modelItemEClass.getEStructuralFeatures().get(0);\n }\n \n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n- public EAttribute getModelItem_Id()\n+ public EAttribute getModelItem_Name()\n {\n return (EAttribute)modelItemEClass.getEStructuralFeatures().get(1);\n }\n@@ -437,6 +557,26 @@ public EAttribute getModelItem_Desc()\n return (EAttribute)modelItemEClass.getEStructuralFeatures().get(2);\n }\n \n+ /**\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ */\n+ public EClass getListItemType()\n+ {\n+ return listItemTypeEClass;\n+ }\n+\n+ /**\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ */\n+ public EAttribute getListItemType_TypeName()\n+ {\n+ return (EAttribute)listItemTypeEClass.getEStructuralFeatures().get(0);\n+ }\n+\n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n@@ -452,17 +592,17 @@ public EClass getListItem()\n * <!-- end-user-doc -->\n * @generated\n */\n- public EAttribute getListItem_Type()\n+ public EReference getListItem_Type()\n {\n- return (EAttribute)listItemEClass.getEStructuralFeatures().get(0);\n+ return (EReference)listItemEClass.getEStructuralFeatures().get(0);\n }\n \n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n- public EAttribute getListItem_Id()\n+ public EAttribute getListItem_Name()\n {\n return (EAttribute)listItemEClass.getEStructuralFeatures().get(1);\n }\n@@ -538,44 +678,59 @@ public void createPackageContents()\n \n // Create classes and their features\n specificationEClass = createEClass(SPECIFICATION);\n- createEAttribute(specificationEClass, SPECIFICATION__ID);\n+ createEAttribute(specificationEClass, SPECIFICATION__NAME);\n createEReference(specificationEClass, SPECIFICATION__REFINEMENTS);\n \n refinementEClass = createEClass(REFINEMENT);\n- createEAttribute(refinementEClass, REFINEMENT__ID);\n+ createEAttribute(refinementEClass, REFINEMENT__NAME);\n createEAttribute(refinementEClass, REFINEMENT__DESC);\n createEReference(refinementEClass, REFINEMENT__INTENTS);\n \n intentEClass = createEClass(INTENT);\n- createEAttribute(intentEClass, INTENT__TYPE);\n- createEAttribute(intentEClass, INTENT__ID);\n+ createEReference(intentEClass, INTENT__TYPE);\n+ createEAttribute(intentEClass, INTENT__NAME);\n createEAttribute(intentEClass, INTENT__DESC);\n createEReference(intentEClass, INTENT__DECOMPOSITIONS);\n \n+ intentTypeEClass = createEClass(INTENT_TYPE);\n+ createEAttribute(intentTypeEClass, INTENT_TYPE__TYPE_NAME);\n+\n decompositionEClass = createEClass(DECOMPOSITION);\n- createEAttribute(decompositionEClass, DECOMPOSITION__TYPE);\n- createEAttribute(decompositionEClass, DECOMPOSITION__ID);\n+ createEReference(decompositionEClass, DECOMPOSITION__TYPE);\n+ createEAttribute(decompositionEClass, DECOMPOSITION__NAME);\n createEAttribute(decompositionEClass, DECOMPOSITION__DESC);\n createEReference(decompositionEClass, DECOMPOSITION__DOCUMENTS);\n createEReference(decompositionEClass, DECOMPOSITION__MODELS);\n createEReference(decompositionEClass, DECOMPOSITION__ITEMS);\n \n+ decompositionTypeEClass = createEClass(DECOMPOSITION_TYPE);\n+ createEAttribute(decompositionTypeEClass, DECOMPOSITION_TYPE__TYPE_NAME);\n+\n documentEClass = createEClass(DOCUMENT);\n createEReference(documentEClass, DOCUMENT__ENTRIES);\n \n+ docItemTypeEClass = createEClass(DOC_ITEM_TYPE);\n+ createEAttribute(docItemTypeEClass, DOC_ITEM_TYPE__TYPE_NAME);\n+\n docItemEClass = createEClass(DOC_ITEM);\n- createEAttribute(docItemEClass, DOC_ITEM__TYPE);\n- createEAttribute(docItemEClass, DOC_ITEM__ID);\n+ createEReference(docItemEClass, DOC_ITEM__TYPE);\n+ createEAttribute(docItemEClass, DOC_ITEM__NAME);\n createEAttribute(docItemEClass, DOC_ITEM__REF);\n \n+ modelTypeEClass = createEClass(MODEL_TYPE);\n+ createEAttribute(modelTypeEClass, MODEL_TYPE__TYPE_NAME);\n+\n modelItemEClass = createEClass(MODEL_ITEM);\n- createEAttribute(modelItemEClass, MODEL_ITEM__TYPE);\n- createEAttribute(modelItemEClass, MODEL_ITEM__ID);\n+ createEReference(modelItemEClass, MODEL_ITEM__TYPE);\n+ createEAttribute(modelItemEClass, MODEL_ITEM__NAME);\n createEAttribute(modelItemEClass, MODEL_ITEM__DESC);\n \n+ listItemTypeEClass = createEClass(LIST_ITEM_TYPE);\n+ createEAttribute(listItemTypeEClass, LIST_ITEM_TYPE__TYPE_NAME);\n+\n listItemEClass = createEClass(LIST_ITEM);\n- createEAttribute(listItemEClass, LIST_ITEM__TYPE);\n- createEAttribute(listItemEClass, LIST_ITEM__ID);\n+ createEReference(listItemEClass, LIST_ITEM__TYPE);\n+ createEAttribute(listItemEClass, LIST_ITEM__NAME);\n createEAttribute(listItemEClass, LIST_ITEM__DESC);\n createEReference(listItemEClass, LIST_ITEM__DOC_REFERENCES);\n createEReference(listItemEClass, LIST_ITEM__ITEM_REFERENCES);\n@@ -614,44 +769,59 @@ public void initializePackageContents()\n \n // Initialize classes and features; add operations and parameters\n initEClass(specificationEClass, Specification.class, \"Specification\", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\n- initEAttribute(getSpecification_Id(), ecorePackage.getEString(), \"id\", null, 0, 1, Specification.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n+ initEAttribute(getSpecification_Name(), ecorePackage.getEString(), \"name\", null, 0, 1, Specification.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n initEReference(getSpecification_Refinements(), this.getRefinement(), null, \"refinements\", null, 0, -1, Specification.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n \n initEClass(refinementEClass, Refinement.class, \"Refinement\", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\n- initEAttribute(getRefinement_Id(), ecorePackage.getEString(), \"id\", null, 0, 1, Refinement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n+ initEAttribute(getRefinement_Name(), ecorePackage.getEString(), \"name\", null, 0, 1, Refinement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n initEAttribute(getRefinement_Desc(), ecorePackage.getEString(), \"desc\", null, 0, 1, Refinement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n initEReference(getRefinement_Intents(), this.getIntent(), null, \"intents\", null, 0, -1, Refinement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n \n initEClass(intentEClass, Intent.class, \"Intent\", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\n- initEAttribute(getIntent_Type(), ecorePackage.getEString(), \"type\", null, 0, 1, Intent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n- initEAttribute(getIntent_Id(), ecorePackage.getEString(), \"id\", null, 0, 1, Intent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n+ initEReference(getIntent_Type(), this.getIntentType(), null, \"type\", null, 0, 1, Intent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n+ initEAttribute(getIntent_Name(), ecorePackage.getEString(), \"name\", null, 0, 1, Intent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n initEAttribute(getIntent_Desc(), ecorePackage.getEString(), \"desc\", null, 0, 1, Intent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n initEReference(getIntent_Decompositions(), this.getDecomposition(), null, \"decompositions\", null, 0, -1, Intent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n \n+ initEClass(intentTypeEClass, IntentType.class, \"IntentType\", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\n+ initEAttribute(getIntentType_TypeName(), ecorePackage.getEString(), \"typeName\", null, 0, 1, IntentType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n+\n initEClass(decompositionEClass, Decomposition.class, \"Decomposition\", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\n- initEAttribute(getDecomposition_Type(), ecorePackage.getEString(), \"type\", null, 0, 1, Decomposition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n- initEAttribute(getDecomposition_Id(), ecorePackage.getEString(), \"id\", null, 0, 1, Decomposition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n+ initEReference(getDecomposition_Type(), this.getDecompositionType(), null, \"type\", null, 0, 1, Decomposition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n+ initEAttribute(getDecomposition_Name(), ecorePackage.getEString(), \"name\", null, 0, 1, Decomposition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n initEAttribute(getDecomposition_Desc(), ecorePackage.getEString(), \"desc\", null, 0, 1, Decomposition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n initEReference(getDecomposition_Documents(), this.getDocument(), null, \"documents\", null, 0, -1, Decomposition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n initEReference(getDecomposition_Models(), this.getModelItem(), null, \"models\", null, 0, -1, Decomposition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n initEReference(getDecomposition_Items(), this.getListItem(), null, \"items\", null, 0, -1, Decomposition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n \n+ initEClass(decompositionTypeEClass, DecompositionType.class, \"DecompositionType\", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\n+ initEAttribute(getDecompositionType_TypeName(), ecorePackage.getEString(), \"typeName\", null, 0, 1, DecompositionType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n+\n initEClass(documentEClass, Document.class, \"Document\", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\n initEReference(getDocument_Entries(), this.getDocItem(), null, \"entries\", null, 0, -1, Document.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n \n+ initEClass(docItemTypeEClass, DocItemType.class, \"DocItemType\", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\n+ initEAttribute(getDocItemType_TypeName(), ecorePackage.getEString(), \"typeName\", null, 0, 1, DocItemType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n+\n initEClass(docItemEClass, DocItem.class, \"DocItem\", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\n- initEAttribute(getDocItem_Type(), ecorePackage.getEString(), \"type\", null, 0, 1, DocItem.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n- initEAttribute(getDocItem_Id(), ecorePackage.getEString(), \"id\", null, 0, 1, DocItem.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n+ initEReference(getDocItem_Type(), this.getDocItemType(), null, \"type\", null, 0, 1, DocItem.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n+ initEAttribute(getDocItem_Name(), ecorePackage.getEString(), \"name\", null, 0, 1, DocItem.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n initEAttribute(getDocItem_Ref(), ecorePackage.getEString(), \"ref\", null, 0, 1, DocItem.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n \n+ initEClass(modelTypeEClass, ModelType.class, \"ModelType\", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\n+ initEAttribute(getModelType_TypeName(), ecorePackage.getEString(), \"typeName\", null, 0, 1, ModelType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n+\n initEClass(modelItemEClass, ModelItem.class, \"ModelItem\", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\n- initEAttribute(getModelItem_Type(), ecorePackage.getEString(), \"type\", null, 0, 1, ModelItem.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n- initEAttribute(getModelItem_Id(), ecorePackage.getEString(), \"id\", null, 0, 1, ModelItem.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n+ initEReference(getModelItem_Type(), this.getModelType(), null, \"type\", null, 0, 1, ModelItem.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n+ initEAttribute(getModelItem_Name(), ecorePackage.getEString(), \"name\", null, 0, 1, ModelItem.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n initEAttribute(getModelItem_Desc(), ecorePackage.getEString(), \"desc\", null, 0, 1, ModelItem.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n \n+ initEClass(listItemTypeEClass, ListItemType.class, \"ListItemType\", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\n+ initEAttribute(getListItemType_TypeName(), ecorePackage.getEString(), \"typeName\", null, 0, 1, ListItemType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n+\n initEClass(listItemEClass, ListItem.class, \"ListItem\", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\n- initEAttribute(getListItem_Type(), ecorePackage.getEString(), \"type\", null, 0, 1, ListItem.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n- initEAttribute(getListItem_Id(), ecorePackage.getEString(), \"id\", null, 0, 1, ListItem.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n+ initEReference(getListItem_Type(), this.getListItemType(), null, \"type\", null, 0, 1, ListItem.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n+ initEAttribute(getListItem_Name(), ecorePackage.getEString(), \"name\", null, 0, 1, ListItem.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n initEAttribute(getListItem_Desc(), ecorePackage.getEString(), \"desc\", null, 0, 1, ListItem.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n initEReference(getListItem_DocReferences(), this.getDocItem(), null, \"docReferences\", null, 0, -1, ListItem.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n initEReference(getListItem_ItemReferences(), this.getListItem(), null, \"itemReferences\", null, 0, -1, ListItem.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);", "raw_url": "https://github.com/nasa/CertWare/raw/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2Fimpl%2FIntentSpecificationPackageImpl.java", "sha": "455a952bd8cbfc8bbcdcc1466c675c7e4a0a33c8", "status": "modified" }, { "additions": 76, "blob_url": "https://github.com/nasa/CertWare/blob/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2Fimpl%2FListItemImpl.java", "changes": 120, "contents_url": "https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2Fimpl%2FListItemImpl.java?ref=27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9", "deletions": 44, "filename": "net.certware.intent/src-gen/net/certware/intent/intentSpecification/impl/ListItemImpl.java", "new_code": "import net.certware.intent.intentSpecification.ListItemType;\nimport org.eclipse.emf.common.notify.NotificationChain;\nimport org.eclipse.emf.ecore.InternalEObject;\n * <li>{@link net.certware.intent.intentSpecification.impl.ListItemImpl#getName <em>Name</em>}</li>\n * The cached value of the '{@link #getType() <em>Type</em>}' containment reference.\n protected ListItemType type;\n * The default value of the '{@link #getName() <em>Name</em>}' attribute.\n * @see #getName()\n protected static final String NAME_EDEFAULT = null;\n * The cached value of the '{@link #getName() <em>Name</em>}' attribute.\n * @see #getName()\n protected String name = NAME_EDEFAULT;\n public ListItemType getType()\n public NotificationChain basicSetType(ListItemType newType, NotificationChain msgs)\n ListItemType oldType = type;\n {\n ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.LIST_ITEM__TYPE, oldType, newType);\n if (msgs == null) msgs = notification; else msgs.add(notification);\n }\n return msgs;\n public void setType(ListItemType newType)\n if (newType != type)\n {\n NotificationChain msgs = null;\n if (type != null)\n msgs = ((InternalEObject)type).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - IntentSpecificationPackage.LIST_ITEM__TYPE, null, msgs);\n if (newType != null)\n msgs = ((InternalEObject)newType).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - IntentSpecificationPackage.LIST_ITEM__TYPE, null, msgs);\n msgs = basicSetType(newType, msgs);\n if (msgs != null) msgs.dispatch();\n }\n else if (eNotificationRequired())\n eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.LIST_ITEM__TYPE, newType, newType));\n public String getName()\n return name;\n }\n\n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n public void setName(String newName)\n {\n String oldName = name;\n name = newName;\n eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.LIST_ITEM__NAME, oldName, name));\n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n @Override\n public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)\n {\n switch (featureID)\n {\n case IntentSpecificationPackage.LIST_ITEM__TYPE:\n return basicSetType(null, msgs);\n }\n return super.eInverseRemove(otherEnd, featureID, msgs);\n }\n\n case IntentSpecificationPackage.LIST_ITEM__NAME:\n return getName();\n setType((ListItemType)newValue);\n case IntentSpecificationPackage.LIST_ITEM__NAME:\n setName((String)newValue);\n setType((ListItemType)null);\n case IntentSpecificationPackage.LIST_ITEM__NAME:\n setName(NAME_EDEFAULT);\n return type != null;\n case IntentSpecificationPackage.LIST_ITEM__NAME:\n return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);\n result.append(\" (name: \");\n result.append(name);", "new_methods": [ { "arguments": [ "String newName" ], "filename": "net.certware.intent/src-gen/net/certware/intent/intentSpecification/impl/ListItemImpl.java", "implementation": "String oldName = name;\n name = newName;\n eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.LIST_ITEM__NAME, oldName, name));\n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n @Override\n public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)\n {\n switch (featureID)\n {\n case IntentSpecificationPackage.LIST_ITEM__TYPE:\n return basicSetType(null, msgs);", "signature": "void setName(String newName)" } ], "old_code": " * <li>{@link net.certware.intent.intentSpecification.impl.ListItemImpl#getId <em>Id</em>}</li>\n * The default value of the '{@link #getType() <em>Type</em>}' attribute.\n protected static final String TYPE_EDEFAULT = null;\n * The cached value of the '{@link #getType() <em>Type</em>}' attribute.\n * @see #getType()\n protected String type = TYPE_EDEFAULT;\n * The default value of the '{@link #getId() <em>Id</em>}' attribute.\n * @see #getId()\n protected static final String ID_EDEFAULT = null;\n\n /**\n * The cached value of the '{@link #getId() <em>Id</em>}' attribute.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @see #getId()\n * @generated\n * @ordered\n */\n protected String id = ID_EDEFAULT;\n public String getType()\n public void setType(String newType)\n String oldType = type;\n eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.LIST_ITEM__TYPE, oldType, type));\n public String getId()\n return id;\n public void setId(String newId)\n String oldId = id;\n id = newId;\n eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.LIST_ITEM__ID, oldId, id));\n case IntentSpecificationPackage.LIST_ITEM__ID:\n return getId();\n setType((String)newValue);\n case IntentSpecificationPackage.LIST_ITEM__ID:\n setId((String)newValue);\n setType(TYPE_EDEFAULT);\n case IntentSpecificationPackage.LIST_ITEM__ID:\n setId(ID_EDEFAULT);\n return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type);\n case IntentSpecificationPackage.LIST_ITEM__ID:\n return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);\n result.append(\" (type: \");\n result.append(type);\n result.append(\", id: \");\n result.append(id);", "old_methods": [], "patch": "@@ -7,13 +7,16 @@\n import net.certware.intent.intentSpecification.DocItem;\n import net.certware.intent.intentSpecification.IntentSpecificationPackage;\n import net.certware.intent.intentSpecification.ListItem;\n+import net.certware.intent.intentSpecification.ListItemType;\n import net.certware.intent.intentSpecification.ModelItem;\n \n import org.eclipse.emf.common.notify.Notification;\n+import org.eclipse.emf.common.notify.NotificationChain;\n \n import org.eclipse.emf.common.util.EList;\n \n import org.eclipse.emf.ecore.EClass;\n+import org.eclipse.emf.ecore.InternalEObject;\n \n import org.eclipse.emf.ecore.impl.ENotificationImpl;\n import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;\n@@ -28,7 +31,7 @@\n * The following features are implemented:\n * <ul>\n * <li>{@link net.certware.intent.intentSpecification.impl.ListItemImpl#getType <em>Type</em>}</li>\n- * <li>{@link net.certware.intent.intentSpecification.impl.ListItemImpl#getId <em>Id</em>}</li>\n+ * <li>{@link net.certware.intent.intentSpecification.impl.ListItemImpl#getName <em>Name</em>}</li>\n * <li>{@link net.certware.intent.intentSpecification.impl.ListItemImpl#getDesc <em>Desc</em>}</li>\n * <li>{@link net.certware.intent.intentSpecification.impl.ListItemImpl#getDocReferences <em>Doc References</em>}</li>\n * <li>{@link net.certware.intent.intentSpecification.impl.ListItemImpl#getItemReferences <em>Item References</em>}</li>\n@@ -41,44 +44,34 @@\n public class ListItemImpl extends MinimalEObjectImpl.Container implements ListItem\n {\n /**\n- * The default value of the '{@link #getType() <em>Type</em>}' attribute.\n+ * The cached value of the '{@link #getType() <em>Type</em>}' containment reference.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @see #getType()\n * @generated\n * @ordered\n */\n- protected static final String TYPE_EDEFAULT = null;\n+ protected ListItemType type;\n \n /**\n- * The cached value of the '{@link #getType() <em>Type</em>}' attribute.\n+ * The default value of the '{@link #getName() <em>Name</em>}' attribute.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n- * @see #getType()\n+ * @see #getName()\n * @generated\n * @ordered\n */\n- protected String type = TYPE_EDEFAULT;\n+ protected static final String NAME_EDEFAULT = null;\n \n /**\n- * The default value of the '{@link #getId() <em>Id</em>}' attribute.\n+ * The cached value of the '{@link #getName() <em>Name</em>}' attribute.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n- * @see #getId()\n+ * @see #getName()\n * @generated\n * @ordered\n */\n- protected static final String ID_EDEFAULT = null;\n-\n- /**\n- * The cached value of the '{@link #getId() <em>Id</em>}' attribute.\n- * <!-- begin-user-doc -->\n- * <!-- end-user-doc -->\n- * @see #getId()\n- * @generated\n- * @ordered\n- */\n- protected String id = ID_EDEFAULT;\n+ protected String name = NAME_EDEFAULT;\n \n /**\n * The default value of the '{@link #getDesc() <em>Desc</em>}' attribute.\n@@ -156,7 +149,7 @@ protected EClass eStaticClass()\n * <!-- end-user-doc -->\n * @generated\n */\n- public String getType()\n+ public ListItemType getType()\n {\n return type;\n }\n@@ -166,35 +159,60 @@ public String getType()\n * <!-- end-user-doc -->\n * @generated\n */\n- public void setType(String newType)\n+ public NotificationChain basicSetType(ListItemType newType, NotificationChain msgs)\n {\n- String oldType = type;\n+ ListItemType oldType = type;\n type = newType;\n if (eNotificationRequired())\n- eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.LIST_ITEM__TYPE, oldType, type));\n+ {\n+ ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.LIST_ITEM__TYPE, oldType, newType);\n+ if (msgs == null) msgs = notification; else msgs.add(notification);\n+ }\n+ return msgs;\n }\n \n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n- public String getId()\n+ public void setType(ListItemType newType)\n {\n- return id;\n+ if (newType != type)\n+ {\n+ NotificationChain msgs = null;\n+ if (type != null)\n+ msgs = ((InternalEObject)type).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - IntentSpecificationPackage.LIST_ITEM__TYPE, null, msgs);\n+ if (newType != null)\n+ msgs = ((InternalEObject)newType).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - IntentSpecificationPackage.LIST_ITEM__TYPE, null, msgs);\n+ msgs = basicSetType(newType, msgs);\n+ if (msgs != null) msgs.dispatch();\n+ }\n+ else if (eNotificationRequired())\n+ eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.LIST_ITEM__TYPE, newType, newType));\n }\n \n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n- public void setId(String newId)\n+ public String getName()\n {\n- String oldId = id;\n- id = newId;\n+ return name;\n+ }\n+\n+ /**\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ */\n+ public void setName(String newName)\n+ {\n+ String oldName = name;\n+ name = newName;\n if (eNotificationRequired())\n- eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.LIST_ITEM__ID, oldId, id));\n+ eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.LIST_ITEM__NAME, oldName, name));\n }\n \n /**\n@@ -262,6 +280,22 @@ public EList<ModelItem> getModelReferences()\n return modelReferences;\n }\n \n+ /**\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ */\n+ @Override\n+ public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)\n+ {\n+ switch (featureID)\n+ {\n+ case IntentSpecificationPackage.LIST_ITEM__TYPE:\n+ return basicSetType(null, msgs);\n+ }\n+ return super.eInverseRemove(otherEnd, featureID, msgs);\n+ }\n+\n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n@@ -274,8 +308,8 @@ public Object eGet(int featureID, boolean resolve, boolean coreType)\n {\n case IntentSpecificationPackage.LIST_ITEM__TYPE:\n return getType();\n- case IntentSpecificationPackage.LIST_ITEM__ID:\n- return getId();\n+ case IntentSpecificationPackage.LIST_ITEM__NAME:\n+ return getName();\n case IntentSpecificationPackage.LIST_ITEM__DESC:\n return getDesc();\n case IntentSpecificationPackage.LIST_ITEM__DOC_REFERENCES:\n@@ -300,10 +334,10 @@ public void eSet(int featureID, Object newValue)\n switch (featureID)\n {\n case IntentSpecificationPackage.LIST_ITEM__TYPE:\n- setType((String)newValue);\n+ setType((ListItemType)newValue);\n return;\n- case IntentSpecificationPackage.LIST_ITEM__ID:\n- setId((String)newValue);\n+ case IntentSpecificationPackage.LIST_ITEM__NAME:\n+ setName((String)newValue);\n return;\n case IntentSpecificationPackage.LIST_ITEM__DESC:\n setDesc((String)newValue);\n@@ -335,10 +369,10 @@ public void eUnset(int featureID)\n switch (featureID)\n {\n case IntentSpecificationPackage.LIST_ITEM__TYPE:\n- setType(TYPE_EDEFAULT);\n+ setType((ListItemType)null);\n return;\n- case IntentSpecificationPackage.LIST_ITEM__ID:\n- setId(ID_EDEFAULT);\n+ case IntentSpecificationPackage.LIST_ITEM__NAME:\n+ setName(NAME_EDEFAULT);\n return;\n case IntentSpecificationPackage.LIST_ITEM__DESC:\n setDesc(DESC_EDEFAULT);\n@@ -367,9 +401,9 @@ public boolean eIsSet(int featureID)\n switch (featureID)\n {\n case IntentSpecificationPackage.LIST_ITEM__TYPE:\n- return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type);\n- case IntentSpecificationPackage.LIST_ITEM__ID:\n- return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);\n+ return type != null;\n+ case IntentSpecificationPackage.LIST_ITEM__NAME:\n+ return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);\n case IntentSpecificationPackage.LIST_ITEM__DESC:\n return DESC_EDEFAULT == null ? desc != null : !DESC_EDEFAULT.equals(desc);\n case IntentSpecificationPackage.LIST_ITEM__DOC_REFERENCES:\n@@ -393,10 +427,8 @@ public String toString()\n if (eIsProxy()) return super.toString();\n \n StringBuffer result = new StringBuffer(super.toString());\n- result.append(\" (type: \");\n- result.append(type);\n- result.append(\", id: \");\n- result.append(id);\n+ result.append(\" (name: \");\n+ result.append(name);\n result.append(\", desc: \");\n result.append(desc);\n result.append(')');", "raw_url": "https://github.com/nasa/CertWare/raw/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2Fimpl%2FListItemImpl.java", "sha": "b011062cede0f011e0295663d0bfd8364accc9ce", "status": "modified" }, { "additions": 76, "blob_url": "https://github.com/nasa/CertWare/blob/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2Fimpl%2FModelItemImpl.java", "changes": 120, "contents_url": "https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2Fimpl%2FModelItemImpl.java?ref=27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9", "deletions": 44, "filename": "net.certware.intent/src-gen/net/certware/intent/intentSpecification/impl/ModelItemImpl.java", "new_code": "import net.certware.intent.intentSpecification.ModelType;\nimport org.eclipse.emf.common.notify.NotificationChain;\nimport org.eclipse.emf.ecore.InternalEObject;\n * <li>{@link net.certware.intent.intentSpecification.impl.ModelItemImpl#getName <em>Name</em>}</li>\n * The cached value of the '{@link #getType() <em>Type</em>}' containment reference.\n protected ModelType type;\n * The default value of the '{@link #getName() <em>Name</em>}' attribute.\n * @see #getName()\n protected static final String NAME_EDEFAULT = null;\n * The cached value of the '{@link #getName() <em>Name</em>}' attribute.\n * @see #getName()\n protected String name = NAME_EDEFAULT;\n public ModelType getType()\n public NotificationChain basicSetType(ModelType newType, NotificationChain msgs)\n ModelType oldType = type;\n {\n ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.MODEL_ITEM__TYPE, oldType, newType);\n if (msgs == null) msgs = notification; else msgs.add(notification);\n }\n return msgs;\n public void setType(ModelType newType)\n if (newType != type)\n {\n NotificationChain msgs = null;\n if (type != null)\n msgs = ((InternalEObject)type).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - IntentSpecificationPackage.MODEL_ITEM__TYPE, null, msgs);\n if (newType != null)\n msgs = ((InternalEObject)newType).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - IntentSpecificationPackage.MODEL_ITEM__TYPE, null, msgs);\n msgs = basicSetType(newType, msgs);\n if (msgs != null) msgs.dispatch();\n }\n else if (eNotificationRequired())\n eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.MODEL_ITEM__TYPE, newType, newType));\n public String getName()\n return name;\n }\n\n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n public void setName(String newName)\n {\n String oldName = name;\n name = newName;\n eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.MODEL_ITEM__NAME, oldName, name));\n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n @Override\n public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)\n {\n switch (featureID)\n {\n case IntentSpecificationPackage.MODEL_ITEM__TYPE:\n return basicSetType(null, msgs);\n }\n return super.eInverseRemove(otherEnd, featureID, msgs);\n }\n\n case IntentSpecificationPackage.MODEL_ITEM__NAME:\n return getName();\n setType((ModelType)newValue);\n case IntentSpecificationPackage.MODEL_ITEM__NAME:\n setName((String)newValue);\n setType((ModelType)null);\n case IntentSpecificationPackage.MODEL_ITEM__NAME:\n setName(NAME_EDEFAULT);\n return type != null;\n case IntentSpecificationPackage.MODEL_ITEM__NAME:\n return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);\n result.append(\" (name: \");\n result.append(name);", "new_methods": [ { "arguments": [ "String newName" ], "filename": "net.certware.intent/src-gen/net/certware/intent/intentSpecification/impl/ModelItemImpl.java", "implementation": "String oldName = name;\n name = newName;\n eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.MODEL_ITEM__NAME, oldName, name));\n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n @Override\n public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)\n {\n switch (featureID)\n {\n case IntentSpecificationPackage.MODEL_ITEM__TYPE:\n return basicSetType(null, msgs);", "signature": "void setName(String newName)" } ], "old_code": " * <li>{@link net.certware.intent.intentSpecification.impl.ModelItemImpl#getId <em>Id</em>}</li>\n * The default value of the '{@link #getType() <em>Type</em>}' attribute.\n protected static final String TYPE_EDEFAULT = null;\n * The cached value of the '{@link #getType() <em>Type</em>}' attribute.\n * @see #getType()\n protected String type = TYPE_EDEFAULT;\n * The default value of the '{@link #getId() <em>Id</em>}' attribute.\n * @see #getId()\n protected static final String ID_EDEFAULT = null;\n\n /**\n * The cached value of the '{@link #getId() <em>Id</em>}' attribute.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @see #getId()\n * @generated\n * @ordered\n */\n protected String id = ID_EDEFAULT;\n public String getType()\n public void setType(String newType)\n String oldType = type;\n eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.MODEL_ITEM__TYPE, oldType, type));\n public String getId()\n return id;\n public void setId(String newId)\n String oldId = id;\n id = newId;\n eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.MODEL_ITEM__ID, oldId, id));\n case IntentSpecificationPackage.MODEL_ITEM__ID:\n return getId();\n setType((String)newValue);\n case IntentSpecificationPackage.MODEL_ITEM__ID:\n setId((String)newValue);\n setType(TYPE_EDEFAULT);\n case IntentSpecificationPackage.MODEL_ITEM__ID:\n setId(ID_EDEFAULT);\n return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type);\n case IntentSpecificationPackage.MODEL_ITEM__ID:\n return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);\n result.append(\" (type: \");\n result.append(type);\n result.append(\", id: \");\n result.append(id);", "old_methods": [], "patch": "@@ -4,10 +4,13 @@\n \n import net.certware.intent.intentSpecification.IntentSpecificationPackage;\n import net.certware.intent.intentSpecification.ModelItem;\n+import net.certware.intent.intentSpecification.ModelType;\n \n import org.eclipse.emf.common.notify.Notification;\n+import org.eclipse.emf.common.notify.NotificationChain;\n \n import org.eclipse.emf.ecore.EClass;\n+import org.eclipse.emf.ecore.InternalEObject;\n \n import org.eclipse.emf.ecore.impl.ENotificationImpl;\n import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;\n@@ -20,7 +23,7 @@\n * The following features are implemented:\n * <ul>\n * <li>{@link net.certware.intent.intentSpecification.impl.ModelItemImpl#getType <em>Type</em>}</li>\n- * <li>{@link net.certware.intent.intentSpecification.impl.ModelItemImpl#getId <em>Id</em>}</li>\n+ * <li>{@link net.certware.intent.intentSpecification.impl.ModelItemImpl#getName <em>Name</em>}</li>\n * <li>{@link net.certware.intent.intentSpecification.impl.ModelItemImpl#getDesc <em>Desc</em>}</li>\n * </ul>\n * </p>\n@@ -30,44 +33,34 @@\n public class ModelItemImpl extends MinimalEObjectImpl.Container implements ModelItem\n {\n /**\n- * The default value of the '{@link #getType() <em>Type</em>}' attribute.\n+ * The cached value of the '{@link #getType() <em>Type</em>}' containment reference.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @see #getType()\n * @generated\n * @ordered\n */\n- protected static final String TYPE_EDEFAULT = null;\n+ protected ModelType type;\n \n /**\n- * The cached value of the '{@link #getType() <em>Type</em>}' attribute.\n+ * The default value of the '{@link #getName() <em>Name</em>}' attribute.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n- * @see #getType()\n+ * @see #getName()\n * @generated\n * @ordered\n */\n- protected String type = TYPE_EDEFAULT;\n+ protected static final String NAME_EDEFAULT = null;\n \n /**\n- * The default value of the '{@link #getId() <em>Id</em>}' attribute.\n+ * The cached value of the '{@link #getName() <em>Name</em>}' attribute.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n- * @see #getId()\n+ * @see #getName()\n * @generated\n * @ordered\n */\n- protected static final String ID_EDEFAULT = null;\n-\n- /**\n- * The cached value of the '{@link #getId() <em>Id</em>}' attribute.\n- * <!-- begin-user-doc -->\n- * <!-- end-user-doc -->\n- * @see #getId()\n- * @generated\n- * @ordered\n- */\n- protected String id = ID_EDEFAULT;\n+ protected String name = NAME_EDEFAULT;\n \n /**\n * The default value of the '{@link #getDesc() <em>Desc</em>}' attribute.\n@@ -115,7 +108,7 @@ protected EClass eStaticClass()\n * <!-- end-user-doc -->\n * @generated\n */\n- public String getType()\n+ public ModelType getType()\n {\n return type;\n }\n@@ -125,35 +118,60 @@ public String getType()\n * <!-- end-user-doc -->\n * @generated\n */\n- public void setType(String newType)\n+ public NotificationChain basicSetType(ModelType newType, NotificationChain msgs)\n {\n- String oldType = type;\n+ ModelType oldType = type;\n type = newType;\n if (eNotificationRequired())\n- eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.MODEL_ITEM__TYPE, oldType, type));\n+ {\n+ ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.MODEL_ITEM__TYPE, oldType, newType);\n+ if (msgs == null) msgs = notification; else msgs.add(notification);\n+ }\n+ return msgs;\n }\n \n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n- public String getId()\n+ public void setType(ModelType newType)\n {\n- return id;\n+ if (newType != type)\n+ {\n+ NotificationChain msgs = null;\n+ if (type != null)\n+ msgs = ((InternalEObject)type).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - IntentSpecificationPackage.MODEL_ITEM__TYPE, null, msgs);\n+ if (newType != null)\n+ msgs = ((InternalEObject)newType).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - IntentSpecificationPackage.MODEL_ITEM__TYPE, null, msgs);\n+ msgs = basicSetType(newType, msgs);\n+ if (msgs != null) msgs.dispatch();\n+ }\n+ else if (eNotificationRequired())\n+ eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.MODEL_ITEM__TYPE, newType, newType));\n }\n \n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n- public void setId(String newId)\n+ public String getName()\n {\n- String oldId = id;\n- id = newId;\n+ return name;\n+ }\n+\n+ /**\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ */\n+ public void setName(String newName)\n+ {\n+ String oldName = name;\n+ name = newName;\n if (eNotificationRequired())\n- eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.MODEL_ITEM__ID, oldId, id));\n+ eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.MODEL_ITEM__NAME, oldName, name));\n }\n \n /**\n@@ -179,6 +197,22 @@ public void setDesc(String newDesc)\n eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.MODEL_ITEM__DESC, oldDesc, desc));\n }\n \n+ /**\n+ * <!-- begin-user-doc -->\n+ * <!-- end-user-doc -->\n+ * @generated\n+ */\n+ @Override\n+ public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)\n+ {\n+ switch (featureID)\n+ {\n+ case IntentSpecificationPackage.MODEL_ITEM__TYPE:\n+ return basicSetType(null, msgs);\n+ }\n+ return super.eInverseRemove(otherEnd, featureID, msgs);\n+ }\n+\n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n@@ -191,8 +225,8 @@ public Object eGet(int featureID, boolean resolve, boolean coreType)\n {\n case IntentSpecificationPackage.MODEL_ITEM__TYPE:\n return getType();\n- case IntentSpecificationPackage.MODEL_ITEM__ID:\n- return getId();\n+ case IntentSpecificationPackage.MODEL_ITEM__NAME:\n+ return getName();\n case IntentSpecificationPackage.MODEL_ITEM__DESC:\n return getDesc();\n }\n@@ -210,10 +244,10 @@ public void eSet(int featureID, Object newValue)\n switch (featureID)\n {\n case IntentSpecificationPackage.MODEL_ITEM__TYPE:\n- setType((String)newValue);\n+ setType((ModelType)newValue);\n return;\n- case IntentSpecificationPackage.MODEL_ITEM__ID:\n- setId((String)newValue);\n+ case IntentSpecificationPackage.MODEL_ITEM__NAME:\n+ setName((String)newValue);\n return;\n case IntentSpecificationPackage.MODEL_ITEM__DESC:\n setDesc((String)newValue);\n@@ -233,10 +267,10 @@ public void eUnset(int featureID)\n switch (featureID)\n {\n case IntentSpecificationPackage.MODEL_ITEM__TYPE:\n- setType(TYPE_EDEFAULT);\n+ setType((ModelType)null);\n return;\n- case IntentSpecificationPackage.MODEL_ITEM__ID:\n- setId(ID_EDEFAULT);\n+ case IntentSpecificationPackage.MODEL_ITEM__NAME:\n+ setName(NAME_EDEFAULT);\n return;\n case IntentSpecificationPackage.MODEL_ITEM__DESC:\n setDesc(DESC_EDEFAULT);\n@@ -256,9 +290,9 @@ public boolean eIsSet(int featureID)\n switch (featureID)\n {\n case IntentSpecificationPackage.MODEL_ITEM__TYPE:\n- return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type);\n- case IntentSpecificationPackage.MODEL_ITEM__ID:\n- return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);\n+ return type != null;\n+ case IntentSpecificationPackage.MODEL_ITEM__NAME:\n+ return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);\n case IntentSpecificationPackage.MODEL_ITEM__DESC:\n return DESC_EDEFAULT == null ? desc != null : !DESC_EDEFAULT.equals(desc);\n }\n@@ -276,10 +310,8 @@ public String toString()\n if (eIsProxy()) return super.toString();\n \n StringBuffer result = new StringBuffer(super.toString());\n- result.append(\" (type: \");\n- result.append(type);\n- result.append(\", id: \");\n- result.append(id);\n+ result.append(\" (name: \");\n+ result.append(name);\n result.append(\", desc: \");\n result.append(desc);\n result.append(')');", "raw_url": "https://github.com/nasa/CertWare/raw/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2Fimpl%2FModelItemImpl.java", "sha": "c0633e50b5bed3611fcaa98d14cba868062e886c", "status": "modified" }, { "additions": 23, "blob_url": "https://github.com/nasa/CertWare/blob/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2Fimpl%2FRefinementImpl.java", "changes": 46, "contents_url": "https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2Fimpl%2FRefinementImpl.java?ref=27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9", "deletions": 23, "filename": "net.certware.intent/src-gen/net/certware/intent/intentSpecification/impl/RefinementImpl.java", "new_code": " * <li>{@link net.certware.intent.intentSpecification.impl.RefinementImpl#getName <em>Name</em>}</li>\n * The default value of the '{@link #getName() <em>Name</em>}' attribute.\n * @see #getName()\n protected static final String NAME_EDEFAULT = null;\n * The cached value of the '{@link #getName() <em>Name</em>}' attribute.\n * @see #getName()\n protected String name = NAME_EDEFAULT;\n public String getName()\n return name;\n public void setName(String newName)\n String oldName = name;\n name = newName;\n eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.REFINEMENT__NAME, oldName, name));\n case IntentSpecificationPackage.REFINEMENT__NAME:\n return getName();\n case IntentSpecificationPackage.REFINEMENT__NAME:\n setName((String)newValue);\n case IntentSpecificationPackage.REFINEMENT__NAME:\n setName(NAME_EDEFAULT);\n case IntentSpecificationPackage.REFINEMENT__NAME:\n return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);\n result.append(\" (name: \");\n result.append(name);", "new_methods": [], "old_code": " * <li>{@link net.certware.intent.intentSpecification.impl.RefinementImpl#getId <em>Id</em>}</li>\n * The default value of the '{@link #getId() <em>Id</em>}' attribute.\n * @see #getId()\n protected static final String ID_EDEFAULT = null;\n * The cached value of the '{@link #getId() <em>Id</em>}' attribute.\n * @see #getId()\n protected String id = ID_EDEFAULT;\n public String getId()\n return id;\n public void setId(String newId)\n String oldId = id;\n id = newId;\n eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.REFINEMENT__ID, oldId, id));\n case IntentSpecificationPackage.REFINEMENT__ID:\n return getId();\n case IntentSpecificationPackage.REFINEMENT__ID:\n setId((String)newValue);\n case IntentSpecificationPackage.REFINEMENT__ID:\n setId(ID_EDEFAULT);\n case IntentSpecificationPackage.REFINEMENT__ID:\n return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);\n result.append(\" (id: \");\n result.append(id);", "old_methods": [], "patch": "@@ -29,7 +29,7 @@\n * <p>\n * The following features are implemented:\n * <ul>\n- * <li>{@link net.certware.intent.intentSpecification.impl.RefinementImpl#getId <em>Id</em>}</li>\n+ * <li>{@link net.certware.intent.intentSpecification.impl.RefinementImpl#getName <em>Name</em>}</li>\n * <li>{@link net.certware.intent.intentSpecification.impl.RefinementImpl#getDesc <em>Desc</em>}</li>\n * <li>{@link net.certware.intent.intentSpecification.impl.RefinementImpl#getIntents <em>Intents</em>}</li>\n * </ul>\n@@ -40,24 +40,24 @@\n public class RefinementImpl extends MinimalEObjectImpl.Container implements Refinement\n {\n /**\n- * The default value of the '{@link #getId() <em>Id</em>}' attribute.\n+ * The default value of the '{@link #getName() <em>Name</em>}' attribute.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n- * @see #getId()\n+ * @see #getName()\n * @generated\n * @ordered\n */\n- protected static final String ID_EDEFAULT = null;\n+ protected static final String NAME_EDEFAULT = null;\n \n /**\n- * The cached value of the '{@link #getId() <em>Id</em>}' attribute.\n+ * The cached value of the '{@link #getName() <em>Name</em>}' attribute.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n- * @see #getId()\n+ * @see #getName()\n * @generated\n * @ordered\n */\n- protected String id = ID_EDEFAULT;\n+ protected String name = NAME_EDEFAULT;\n \n /**\n * The default value of the '{@link #getDesc() <em>Desc</em>}' attribute.\n@@ -115,22 +115,22 @@ protected EClass eStaticClass()\n * <!-- end-user-doc -->\n * @generated\n */\n- public String getId()\n+ public String getName()\n {\n- return id;\n+ return name;\n }\n \n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n- public void setId(String newId)\n+ public void setName(String newName)\n {\n- String oldId = id;\n- id = newId;\n+ String oldName = name;\n+ name = newName;\n if (eNotificationRequired())\n- eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.REFINEMENT__ID, oldId, id));\n+ eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.REFINEMENT__NAME, oldName, name));\n }\n \n /**\n@@ -196,8 +196,8 @@ public Object eGet(int featureID, boolean resolve, boolean coreType)\n {\n switch (featureID)\n {\n- case IntentSpecificationPackage.REFINEMENT__ID:\n- return getId();\n+ case IntentSpecificationPackage.REFINEMENT__NAME:\n+ return getName();\n case IntentSpecificationPackage.REFINEMENT__DESC:\n return getDesc();\n case IntentSpecificationPackage.REFINEMENT__INTENTS:\n@@ -217,8 +217,8 @@ public void eSet(int featureID, Object newValue)\n {\n switch (featureID)\n {\n- case IntentSpecificationPackage.REFINEMENT__ID:\n- setId((String)newValue);\n+ case IntentSpecificationPackage.REFINEMENT__NAME:\n+ setName((String)newValue);\n return;\n case IntentSpecificationPackage.REFINEMENT__DESC:\n setDesc((String)newValue);\n@@ -241,8 +241,8 @@ public void eUnset(int featureID)\n {\n switch (featureID)\n {\n- case IntentSpecificationPackage.REFINEMENT__ID:\n- setId(ID_EDEFAULT);\n+ case IntentSpecificationPackage.REFINEMENT__NAME:\n+ setName(NAME_EDEFAULT);\n return;\n case IntentSpecificationPackage.REFINEMENT__DESC:\n setDesc(DESC_EDEFAULT);\n@@ -264,8 +264,8 @@ public boolean eIsSet(int featureID)\n {\n switch (featureID)\n {\n- case IntentSpecificationPackage.REFINEMENT__ID:\n- return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);\n+ case IntentSpecificationPackage.REFINEMENT__NAME:\n+ return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);\n case IntentSpecificationPackage.REFINEMENT__DESC:\n return DESC_EDEFAULT == null ? desc != null : !DESC_EDEFAULT.equals(desc);\n case IntentSpecificationPackage.REFINEMENT__INTENTS:\n@@ -285,8 +285,8 @@ public String toString()\n if (eIsProxy()) return super.toString();\n \n StringBuffer result = new StringBuffer(super.toString());\n- result.append(\" (id: \");\n- result.append(id);\n+ result.append(\" (name: \");\n+ result.append(name);\n result.append(\", desc: \");\n result.append(desc);\n result.append(')');", "raw_url": "https://github.com/nasa/CertWare/raw/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2Fimpl%2FRefinementImpl.java", "sha": "5107d573c7e32b4b2e475b9928f8d96a17a7036b", "status": "modified" }, { "additions": 23, "blob_url": "https://github.com/nasa/CertWare/blob/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2Fimpl%2FSpecificationImpl.java", "changes": 46, "contents_url": "https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2Fimpl%2FSpecificationImpl.java?ref=27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9", "deletions": 23, "filename": "net.certware.intent/src-gen/net/certware/intent/intentSpecification/impl/SpecificationImpl.java", "new_code": " * <li>{@link net.certware.intent.intentSpecification.impl.SpecificationImpl#getName <em>Name</em>}</li>\n * The default value of the '{@link #getName() <em>Name</em>}' attribute.\n * @see #getName()\n protected static final String NAME_EDEFAULT = null;\n * The cached value of the '{@link #getName() <em>Name</em>}' attribute.\n * @see #getName()\n protected String name = NAME_EDEFAULT;\n public String getName()\n return name;\n public void setName(String newName)\n String oldName = name;\n name = newName;\n eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.SPECIFICATION__NAME, oldName, name));\n case IntentSpecificationPackage.SPECIFICATION__NAME:\n return getName();\n case IntentSpecificationPackage.SPECIFICATION__NAME:\n setName((String)newValue);\n case IntentSpecificationPackage.SPECIFICATION__NAME:\n setName(NAME_EDEFAULT);\n case IntentSpecificationPackage.SPECIFICATION__NAME:\n return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);\n result.append(\" (name: \");\n result.append(name);", "new_methods": [], "old_code": " * <li>{@link net.certware.intent.intentSpecification.impl.SpecificationImpl#getId <em>Id</em>}</li>\n * The default value of the '{@link #getId() <em>Id</em>}' attribute.\n * @see #getId()\n protected static final String ID_EDEFAULT = null;\n * The cached value of the '{@link #getId() <em>Id</em>}' attribute.\n * @see #getId()\n protected String id = ID_EDEFAULT;\n public String getId()\n return id;\n public void setId(String newId)\n String oldId = id;\n id = newId;\n eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.SPECIFICATION__ID, oldId, id));\n case IntentSpecificationPackage.SPECIFICATION__ID:\n return getId();\n case IntentSpecificationPackage.SPECIFICATION__ID:\n setId((String)newValue);\n case IntentSpecificationPackage.SPECIFICATION__ID:\n setId(ID_EDEFAULT);\n case IntentSpecificationPackage.SPECIFICATION__ID:\n return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);\n result.append(\" (id: \");\n result.append(id);", "old_methods": [], "patch": "@@ -29,7 +29,7 @@\n * <p>\n * The following features are implemented:\n * <ul>\n- * <li>{@link net.certware.intent.intentSpecification.impl.SpecificationImpl#getId <em>Id</em>}</li>\n+ * <li>{@link net.certware.intent.intentSpecification.impl.SpecificationImpl#getName <em>Name</em>}</li>\n * <li>{@link net.certware.intent.intentSpecification.impl.SpecificationImpl#getRefinements <em>Refinements</em>}</li>\n * </ul>\n * </p>\n@@ -39,24 +39,24 @@\n public class SpecificationImpl extends MinimalEObjectImpl.Container implements Specification\n {\n /**\n- * The default value of the '{@link #getId() <em>Id</em>}' attribute.\n+ * The default value of the '{@link #getName() <em>Name</em>}' attribute.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n- * @see #getId()\n+ * @see #getName()\n * @generated\n * @ordered\n */\n- protected static final String ID_EDEFAULT = null;\n+ protected static final String NAME_EDEFAULT = null;\n \n /**\n- * The cached value of the '{@link #getId() <em>Id</em>}' attribute.\n+ * The cached value of the '{@link #getName() <em>Name</em>}' attribute.\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n- * @see #getId()\n+ * @see #getName()\n * @generated\n * @ordered\n */\n- protected String id = ID_EDEFAULT;\n+ protected String name = NAME_EDEFAULT;\n \n /**\n * The cached value of the '{@link #getRefinements() <em>Refinements</em>}' containment reference list.\n@@ -94,22 +94,22 @@ protected EClass eStaticClass()\n * <!-- end-user-doc -->\n * @generated\n */\n- public String getId()\n+ public String getName()\n {\n- return id;\n+ return name;\n }\n \n /**\n * <!-- begin-user-doc -->\n * <!-- end-user-doc -->\n * @generated\n */\n- public void setId(String newId)\n+ public void setName(String newName)\n {\n- String oldId = id;\n- id = newId;\n+ String oldName = name;\n+ name = newName;\n if (eNotificationRequired())\n- eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.SPECIFICATION__ID, oldId, id));\n+ eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.SPECIFICATION__NAME, oldName, name));\n }\n \n /**\n@@ -152,8 +152,8 @@ public Object eGet(int featureID, boolean resolve, boolean coreType)\n {\n switch (featureID)\n {\n- case IntentSpecificationPackage.SPECIFICATION__ID:\n- return getId();\n+ case IntentSpecificationPackage.SPECIFICATION__NAME:\n+ return getName();\n case IntentSpecificationPackage.SPECIFICATION__REFINEMENTS:\n return getRefinements();\n }\n@@ -171,8 +171,8 @@ public void eSet(int featureID, Object newValue)\n {\n switch (featureID)\n {\n- case IntentSpecificationPackage.SPECIFICATION__ID:\n- setId((String)newValue);\n+ case IntentSpecificationPackage.SPECIFICATION__NAME:\n+ setName((String)newValue);\n return;\n case IntentSpecificationPackage.SPECIFICATION__REFINEMENTS:\n getRefinements().clear();\n@@ -192,8 +192,8 @@ public void eUnset(int featureID)\n {\n switch (featureID)\n {\n- case IntentSpecificationPackage.SPECIFICATION__ID:\n- setId(ID_EDEFAULT);\n+ case IntentSpecificationPackage.SPECIFICATION__NAME:\n+ setName(NAME_EDEFAULT);\n return;\n case IntentSpecificationPackage.SPECIFICATION__REFINEMENTS:\n getRefinements().clear();\n@@ -212,8 +212,8 @@ public boolean eIsSet(int featureID)\n {\n switch (featureID)\n {\n- case IntentSpecificationPackage.SPECIFICATION__ID:\n- return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);\n+ case IntentSpecificationPackage.SPECIFICATION__NAME:\n+ return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);\n case IntentSpecificationPackage.SPECIFICATION__REFINEMENTS:\n return refinements != null && !refinements.isEmpty();\n }\n@@ -231,8 +231,8 @@ public String toString()\n if (eIsProxy()) return super.toString();\n \n StringBuffer result = new StringBuffer(super.toString());\n- result.append(\" (id: \");\n- result.append(id);\n+ result.append(\" (name: \");\n+ result.append(name);\n result.append(')');\n return result.toString();\n }", "raw_url": "https://github.com/nasa/CertWare/raw/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2Fimpl%2FSpecificationImpl.java", "sha": "c19705d70f6549194180c1051334d1903555d07f", "status": "modified" }, { "additions": 100, "blob_url": "https://github.com/nasa/CertWare/blob/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2Futil%2FIntentSpecificationAdapterFactory.java", "changes": 100, "contents_url": "https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2Futil%2FIntentSpecificationAdapterFactory.java?ref=27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9", "deletions": 0, "filename": "net.certware.intent/src-gen/net/certware/intent/intentSpecification/util/IntentSpecificationAdapterFactory.java", "new_code": " public Adapter caseIntentType(IntentType object)\n {\n return createIntentTypeAdapter();\n }\n @Override\n public Adapter caseDecompositionType(DecompositionType object)\n {\n return createDecompositionTypeAdapter();\n }\n @Override\n public Adapter caseDocItemType(DocItemType object)\n {\n return createDocItemTypeAdapter();\n }\n @Override\n public Adapter caseModelType(ModelType object)\n {\n return createModelTypeAdapter();\n }\n @Override\n public Adapter caseListItemType(ListItemType object)\n {\n return createListItemTypeAdapter();\n }\n @Override\n /**\n * Creates a new adapter for an object of class '{@link net.certware.intent.intentSpecification.IntentType <em>Intent Type</em>}'.\n * <!-- begin-user-doc -->\n * This default implementation returns null so that we can easily ignore cases;\n * it's useful to ignore a case when inheritance will catch all the cases anyway.\n * <!-- end-user-doc -->\n * @return the new adapter.\n * @see net.certware.intent.intentSpecification.IntentType\n * @generated\n */\n public Adapter createIntentTypeAdapter()\n {\n return null;\n }\n\n /**\n * Creates a new adapter for an object of class '{@link net.certware.intent.intentSpecification.DecompositionType <em>Decomposition Type</em>}'.\n * <!-- begin-user-doc -->\n * This default implementation returns null so that we can easily ignore cases;\n * it's useful to ignore a case when inheritance will catch all the cases anyway.\n * <!-- end-user-doc -->\n * @return the new adapter.\n * @see net.certware.intent.intentSpecification.DecompositionType\n * @generated\n */\n public Adapter createDecompositionTypeAdapter()\n {\n return null;\n }\n\n /**\n * Creates a new adapter for an object of class '{@link net.certware.intent.intentSpecification.DocItemType <em>Doc Item Type</em>}'.\n * <!-- begin-user-doc -->\n * This default implementation returns null so that we can easily ignore cases;\n * it's useful to ignore a case when inheritance will catch all the cases anyway.\n * <!-- end-user-doc -->\n * @return the new adapter.\n * @see net.certware.intent.intentSpecification.DocItemType\n * @generated\n */\n public Adapter createDocItemTypeAdapter()\n {\n return null;\n }\n\n /**\n * Creates a new adapter for an object of class '{@link net.certware.intent.intentSpecification.ModelType <em>Model Type</em>}'.\n * <!-- begin-user-doc -->\n * This default implementation returns null so that we can easily ignore cases;\n * it's useful to ignore a case when inheritance will catch all the cases anyway.\n * <!-- end-user-doc -->\n * @return the new adapter.\n * @see net.certware.intent.intentSpecification.ModelType\n * @generated\n */\n public Adapter createModelTypeAdapter()\n {\n return null;\n }\n\n /**\n * Creates a new adapter for an object of class '{@link net.certware.intent.intentSpecification.ListItemType <em>List Item Type</em>}'.\n * <!-- begin-user-doc -->\n * This default implementation returns null so that we can easily ignore cases;\n * it's useful to ignore a case when inheritance will catch all the cases anyway.\n * <!-- end-user-doc -->\n * @return the new adapter.\n * @see net.certware.intent.intentSpecification.ListItemType\n * @generated\n */\n public Adapter createListItemTypeAdapter()\n {\n return null;\n }\n", "new_methods": [ { "arguments": [ "IntentType object" ], "filename": "net.certware.intent/src-gen/net/certware/intent/intentSpecification/util/IntentSpecificationAdapterFactory.java", "implementation": "return createIntentTypeAdapter();", "signature": "Adapter caseIntentType(IntentType object)" }, { "arguments": [ "DecompositionType object" ], "filename": "net.certware.intent/src-gen/net/certware/intent/intentSpecification/util/IntentSpecificationAdapterFactory.java", "implementation": "return createDecompositionTypeAdapter();", "signature": "Adapter caseDecompositionType(DecompositionType object)" }, { "arguments": [ "DocItemType object" ], "filename": "net.certware.intent/src-gen/net/certware/intent/intentSpecification/util/IntentSpecificationAdapterFactory.java", "implementation": "return createDocItemTypeAdapter();", "signature": "Adapter caseDocItemType(DocItemType object)" }, { "arguments": [ "ModelType object" ], "filename": "net.certware.intent/src-gen/net/certware/intent/intentSpecification/util/IntentSpecificationAdapterFactory.java", "implementation": "return createModelTypeAdapter();", "signature": "Adapter caseModelType(ModelType object)" }, { "arguments": [ "ListItemType object" ], "filename": "net.certware.intent/src-gen/net/certware/intent/intentSpecification/util/IntentSpecificationAdapterFactory.java", "implementation": "return createListItemTypeAdapter();", "signature": "Adapter caseListItemType(ListItemType object)" }, { "arguments": [], "filename": "net.certware.intent/src-gen/net/certware/intent/intentSpecification/util/IntentSpecificationAdapterFactory.java", "implementation": "return null;", "signature": "Adapter createIntentTypeAdapter()" }, { "arguments": [], "filename": "net.certware.intent/src-gen/net/certware/intent/intentSpecification/util/IntentSpecificationAdapterFactory.java", "implementation": "return null;", "signature": "Adapter createDecompositionTypeAdapter()" }, { "arguments": [], "filename": "net.certware.intent/src-gen/net/certware/intent/intentSpecification/util/IntentSpecificationAdapterFactory.java", "implementation": "return null;", "signature": "Adapter createDocItemTypeAdapter()" }, { "arguments": [], "filename": "net.certware.intent/src-gen/net/certware/intent/intentSpecification/util/IntentSpecificationAdapterFactory.java", "implementation": "return null;", "signature": "Adapter createModelTypeAdapter()" }, { "arguments": [], "filename": "net.certware.intent/src-gen/net/certware/intent/intentSpecification/util/IntentSpecificationAdapterFactory.java", "implementation": "return null;", "signature": "Adapter createListItemTypeAdapter()" } ], "old_code": "", "old_methods": [], "patch": "@@ -90,26 +90,51 @@ public Adapter caseIntent(Intent object)\n return createIntentAdapter();\n }\n @Override\n+ public Adapter caseIntentType(IntentType object)\n+ {\n+ return createIntentTypeAdapter();\n+ }\n+ @Override\n public Adapter caseDecomposition(Decomposition object)\n {\n return createDecompositionAdapter();\n }\n @Override\n+ public Adapter caseDecompositionType(DecompositionType object)\n+ {\n+ return createDecompositionTypeAdapter();\n+ }\n+ @Override\n public Adapter caseDocument(Document object)\n {\n return createDocumentAdapter();\n }\n @Override\n+ public Adapter caseDocItemType(DocItemType object)\n+ {\n+ return createDocItemTypeAdapter();\n+ }\n+ @Override\n public Adapter caseDocItem(DocItem object)\n {\n return createDocItemAdapter();\n }\n @Override\n+ public Adapter caseModelType(ModelType object)\n+ {\n+ return createModelTypeAdapter();\n+ }\n+ @Override\n public Adapter caseModelItem(ModelItem object)\n {\n return createModelItemAdapter();\n }\n @Override\n+ public Adapter caseListItemType(ListItemType object)\n+ {\n+ return createListItemTypeAdapter();\n+ }\n+ @Override\n public Adapter caseListItem(ListItem object)\n {\n return createListItemAdapter();\n@@ -181,6 +206,21 @@ public Adapter createIntentAdapter()\n return null;\n }\n \n+ /**\n+ * Creates a new adapter for an object of class '{@link net.certware.intent.intentSpecification.IntentType <em>Intent Type</em>}'.\n+ * <!-- begin-user-doc -->\n+ * This default implementation returns null so that we can easily ignore cases;\n+ * it's useful to ignore a case when inheritance will catch all the cases anyway.\n+ * <!-- end-user-doc -->\n+ * @return the new adapter.\n+ * @see net.certware.intent.intentSpecification.IntentType\n+ * @generated\n+ */\n+ public Adapter createIntentTypeAdapter()\n+ {\n+ return null;\n+ }\n+\n /**\n * Creates a new adapter for an object of class '{@link net.certware.intent.intentSpecification.Decomposition <em>Decomposition</em>}'.\n * <!-- begin-user-doc -->\n@@ -196,6 +236,21 @@ public Adapter createDecompositionAdapter()\n return null;\n }\n \n+ /**\n+ * Creates a new adapter for an object of class '{@link net.certware.intent.intentSpecification.DecompositionType <em>Decomposition Type</em>}'.\n+ * <!-- begin-user-doc -->\n+ * This default implementation returns null so that we can easily ignore cases;\n+ * it's useful to ignore a case when inheritance will catch all the cases anyway.\n+ * <!-- end-user-doc -->\n+ * @return the new adapter.\n+ * @see net.certware.intent.intentSpecification.DecompositionType\n+ * @generated\n+ */\n+ public Adapter createDecompositionTypeAdapter()\n+ {\n+ return null;\n+ }\n+\n /**\n * Creates a new adapter for an object of class '{@link net.certware.intent.intentSpecification.Document <em>Document</em>}'.\n * <!-- begin-user-doc -->\n@@ -211,6 +266,21 @@ public Adapter createDocumentAdapter()\n return null;\n }\n \n+ /**\n+ * Creates a new adapter for an object of class '{@link net.certware.intent.intentSpecification.DocItemType <em>Doc Item Type</em>}'.\n+ * <!-- begin-user-doc -->\n+ * This default implementation returns null so that we can easily ignore cases;\n+ * it's useful to ignore a case when inheritance will catch all the cases anyway.\n+ * <!-- end-user-doc -->\n+ * @return the new adapter.\n+ * @see net.certware.intent.intentSpecification.DocItemType\n+ * @generated\n+ */\n+ public Adapter createDocItemTypeAdapter()\n+ {\n+ return null;\n+ }\n+\n /**\n * Creates a new adapter for an object of class '{@link net.certware.intent.intentSpecification.DocItem <em>Doc Item</em>}'.\n * <!-- begin-user-doc -->\n@@ -226,6 +296,21 @@ public Adapter createDocItemAdapter()\n return null;\n }\n \n+ /**\n+ * Creates a new adapter for an object of class '{@link net.certware.intent.intentSpecification.ModelType <em>Model Type</em>}'.\n+ * <!-- begin-user-doc -->\n+ * This default implementation returns null so that we can easily ignore cases;\n+ * it's useful to ignore a case when inheritance will catch all the cases anyway.\n+ * <!-- end-user-doc -->\n+ * @return the new adapter.\n+ * @see net.certware.intent.intentSpecification.ModelType\n+ * @generated\n+ */\n+ public Adapter createModelTypeAdapter()\n+ {\n+ return null;\n+ }\n+\n /**\n * Creates a new adapter for an object of class '{@link net.certware.intent.intentSpecification.ModelItem <em>Model Item</em>}'.\n * <!-- begin-user-doc -->\n@@ -241,6 +326,21 @@ public Adapter createModelItemAdapter()\n return null;\n }\n \n+ /**\n+ * Creates a new adapter for an object of class '{@link net.certware.intent.intentSpecification.ListItemType <em>List Item Type</em>}'.\n+ * <!-- begin-user-doc -->\n+ * This default implementation returns null so that we can easily ignore cases;\n+ * it's useful to ignore a case when inheritance will catch all the cases anyway.\n+ * <!-- end-user-doc -->\n+ * @return the new adapter.\n+ * @see net.certware.intent.intentSpecification.ListItemType\n+ * @generated\n+ */\n+ public Adapter createListItemTypeAdapter()\n+ {\n+ return null;\n+ }\n+\n /**\n * Creates a new adapter for an object of class '{@link net.certware.intent.intentSpecification.ListItem <em>List Item</em>}'.\n * <!-- begin-user-doc -->", "raw_url": "https://github.com/nasa/CertWare/raw/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2Futil%2FIntentSpecificationAdapterFactory.java", "sha": "51a62ac8fcdbac12985c2b6e26940aac8eab1f9c", "status": "modified" }, { "additions": 115, "blob_url": "https://github.com/nasa/CertWare/blob/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2Futil%2FIntentSpecificationSwitch.java", "changes": 115, "contents_url": "https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2Futil%2FIntentSpecificationSwitch.java?ref=27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9", "deletions": 0, "filename": "net.certware.intent/src-gen/net/certware/intent/intentSpecification/util/IntentSpecificationSwitch.java", "new_code": " case IntentSpecificationPackage.INTENT_TYPE:\n {\n IntentType intentType = (IntentType)theEObject;\n T result = caseIntentType(intentType);\n if (result == null) result = defaultCase(theEObject);\n return result;\n }\n case IntentSpecificationPackage.DECOMPOSITION_TYPE:\n {\n DecompositionType decompositionType = (DecompositionType)theEObject;\n T result = caseDecompositionType(decompositionType);\n if (result == null) result = defaultCase(theEObject);\n return result;\n }\n case IntentSpecificationPackage.DOC_ITEM_TYPE:\n {\n DocItemType docItemType = (DocItemType)theEObject;\n T result = caseDocItemType(docItemType);\n if (result == null) result = defaultCase(theEObject);\n return result;\n }\n case IntentSpecificationPackage.MODEL_TYPE:\n {\n ModelType modelType = (ModelType)theEObject;\n T result = caseModelType(modelType);\n if (result == null) result = defaultCase(theEObject);\n return result;\n }\n case IntentSpecificationPackage.LIST_ITEM_TYPE:\n {\n ListItemType listItemType = (ListItemType)theEObject;\n T result = caseListItemType(listItemType);\n if (result == null) result = defaultCase(theEObject);\n return result;\n }\n /**\n * Returns the result of interpreting the object as an instance of '<em>Intent Type</em>'.\n * <!-- begin-user-doc -->\n * This implementation returns null;\n * returning a non-null result will terminate the switch.\n * <!-- end-user-doc -->\n * @param object the target of the switch.\n * @return the result of interpreting the object as an instance of '<em>Intent Type</em>'.\n * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)\n * @generated\n */\n public T caseIntentType(IntentType object)\n {\n return null;\n }\n\n /**\n * Returns the result of interpreting the object as an instance of '<em>Decomposition Type</em>'.\n * <!-- begin-user-doc -->\n * This implementation returns null;\n * returning a non-null result will terminate the switch.\n * <!-- end-user-doc -->\n * @param object the target of the switch.\n * @return the result of interpreting the object as an instance of '<em>Decomposition Type</em>'.\n * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)\n * @generated\n */\n public T caseDecompositionType(DecompositionType object)\n {\n return null;\n }\n\n /**\n * Returns the result of interpreting the object as an instance of '<em>Doc Item Type</em>'.\n * <!-- begin-user-doc -->\n * This implementation returns null;\n * returning a non-null result will terminate the switch.\n * <!-- end-user-doc -->\n * @param object the target of the switch.\n * @return the result of interpreting the object as an instance of '<em>Doc Item Type</em>'.\n * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)\n * @generated\n */\n public T caseDocItemType(DocItemType object)\n {\n return null;\n }\n\n /**\n * Returns the result of interpreting the object as an instance of '<em>Model Type</em>'.\n * <!-- begin-user-doc -->\n * This implementation returns null;\n * returning a non-null result will terminate the switch.\n * <!-- end-user-doc -->\n * @param object the target of the switch.\n * @return the result of interpreting the object as an instance of '<em>Model Type</em>'.\n * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)\n * @generated\n */\n public T caseModelType(ModelType object)\n {\n return null;\n }\n\n /**\n * Returns the result of interpreting the object as an instance of '<em>List Item Type</em>'.\n * <!-- begin-user-doc -->\n * This implementation returns null;\n * returning a non-null result will terminate the switch.\n * <!-- end-user-doc -->\n * @param object the target of the switch.\n * @return the result of interpreting the object as an instance of '<em>List Item Type</em>'.\n * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)\n * @generated\n */\n public T caseListItemType(ListItemType object)\n {\n return null;\n }\n", "new_methods": [ { "arguments": [ "IntentType object" ], "filename": "net.certware.intent/src-gen/net/certware/intent/intentSpecification/util/IntentSpecificationSwitch.java", "implementation": "return null;", "signature": "T caseIntentType(IntentType object)" }, { "arguments": [ "DecompositionType object" ], "filename": "net.certware.intent/src-gen/net/certware/intent/intentSpecification/util/IntentSpecificationSwitch.java", "implementation": "return null;", "signature": "T caseDecompositionType(DecompositionType object)" }, { "arguments": [ "DocItemType object" ], "filename": "net.certware.intent/src-gen/net/certware/intent/intentSpecification/util/IntentSpecificationSwitch.java", "implementation": "return null;", "signature": "T caseDocItemType(DocItemType object)" }, { "arguments": [ "ModelType object" ], "filename": "net.certware.intent/src-gen/net/certware/intent/intentSpecification/util/IntentSpecificationSwitch.java", "implementation": "return null;", "signature": "T caseModelType(ModelType object)" }, { "arguments": [ "ListItemType object" ], "filename": "net.certware.intent/src-gen/net/certware/intent/intentSpecification/util/IntentSpecificationSwitch.java", "implementation": "return null;", "signature": "T caseListItemType(ListItemType object)" } ], "old_code": "", "old_methods": [], "patch": "@@ -93,34 +93,69 @@ protected T doSwitch(int classifierID, EObject theEObject)\n if (result == null) result = defaultCase(theEObject);\n return result;\n }\n+ case IntentSpecificationPackage.INTENT_TYPE:\n+ {\n+ IntentType intentType = (IntentType)theEObject;\n+ T result = caseIntentType(intentType);\n+ if (result == null) result = defaultCase(theEObject);\n+ return result;\n+ }\n case IntentSpecificationPackage.DECOMPOSITION:\n {\n Decomposition decomposition = (Decomposition)theEObject;\n T result = caseDecomposition(decomposition);\n if (result == null) result = defaultCase(theEObject);\n return result;\n }\n+ case IntentSpecificationPackage.DECOMPOSITION_TYPE:\n+ {\n+ DecompositionType decompositionType = (DecompositionType)theEObject;\n+ T result = caseDecompositionType(decompositionType);\n+ if (result == null) result = defaultCase(theEObject);\n+ return result;\n+ }\n case IntentSpecificationPackage.DOCUMENT:\n {\n Document document = (Document)theEObject;\n T result = caseDocument(document);\n if (result == null) result = defaultCase(theEObject);\n return result;\n }\n+ case IntentSpecificationPackage.DOC_ITEM_TYPE:\n+ {\n+ DocItemType docItemType = (DocItemType)theEObject;\n+ T result = caseDocItemType(docItemType);\n+ if (result == null) result = defaultCase(theEObject);\n+ return result;\n+ }\n case IntentSpecificationPackage.DOC_ITEM:\n {\n DocItem docItem = (DocItem)theEObject;\n T result = caseDocItem(docItem);\n if (result == null) result = defaultCase(theEObject);\n return result;\n }\n+ case IntentSpecificationPackage.MODEL_TYPE:\n+ {\n+ ModelType modelType = (ModelType)theEObject;\n+ T result = caseModelType(modelType);\n+ if (result == null) result = defaultCase(theEObject);\n+ return result;\n+ }\n case IntentSpecificationPackage.MODEL_ITEM:\n {\n ModelItem modelItem = (ModelItem)theEObject;\n T result = caseModelItem(modelItem);\n if (result == null) result = defaultCase(theEObject);\n return result;\n }\n+ case IntentSpecificationPackage.LIST_ITEM_TYPE:\n+ {\n+ ListItemType listItemType = (ListItemType)theEObject;\n+ T result = caseListItemType(listItemType);\n+ if (result == null) result = defaultCase(theEObject);\n+ return result;\n+ }\n case IntentSpecificationPackage.LIST_ITEM:\n {\n ListItem listItem = (ListItem)theEObject;\n@@ -180,6 +215,22 @@ public T caseIntent(Intent object)\n return null;\n }\n \n+ /**\n+ * Returns the result of interpreting the object as an instance of '<em>Intent Type</em>'.\n+ * <!-- begin-user-doc -->\n+ * This implementation returns null;\n+ * returning a non-null result will terminate the switch.\n+ * <!-- end-user-doc -->\n+ * @param object the target of the switch.\n+ * @return the result of interpreting the object as an instance of '<em>Intent Type</em>'.\n+ * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)\n+ * @generated\n+ */\n+ public T caseIntentType(IntentType object)\n+ {\n+ return null;\n+ }\n+\n /**\n * Returns the result of interpreting the object as an instance of '<em>Decomposition</em>'.\n * <!-- begin-user-doc -->\n@@ -196,6 +247,22 @@ public T caseDecomposition(Decomposition object)\n return null;\n }\n \n+ /**\n+ * Returns the result of interpreting the object as an instance of '<em>Decomposition Type</em>'.\n+ * <!-- begin-user-doc -->\n+ * This implementation returns null;\n+ * returning a non-null result will terminate the switch.\n+ * <!-- end-user-doc -->\n+ * @param object the target of the switch.\n+ * @return the result of interpreting the object as an instance of '<em>Decomposition Type</em>'.\n+ * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)\n+ * @generated\n+ */\n+ public T caseDecompositionType(DecompositionType object)\n+ {\n+ return null;\n+ }\n+\n /**\n * Returns the result of interpreting the object as an instance of '<em>Document</em>'.\n * <!-- begin-user-doc -->\n@@ -212,6 +279,22 @@ public T caseDocument(Document object)\n return null;\n }\n \n+ /**\n+ * Returns the result of interpreting the object as an instance of '<em>Doc Item Type</em>'.\n+ * <!-- begin-user-doc -->\n+ * This implementation returns null;\n+ * returning a non-null result will terminate the switch.\n+ * <!-- end-user-doc -->\n+ * @param object the target of the switch.\n+ * @return the result of interpreting the object as an instance of '<em>Doc Item Type</em>'.\n+ * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)\n+ * @generated\n+ */\n+ public T caseDocItemType(DocItemType object)\n+ {\n+ return null;\n+ }\n+\n /**\n * Returns the result of interpreting the object as an instance of '<em>Doc Item</em>'.\n * <!-- begin-user-doc -->\n@@ -228,6 +311,22 @@ public T caseDocItem(DocItem object)\n return null;\n }\n \n+ /**\n+ * Returns the result of interpreting the object as an instance of '<em>Model Type</em>'.\n+ * <!-- begin-user-doc -->\n+ * This implementation returns null;\n+ * returning a non-null result will terminate the switch.\n+ * <!-- end-user-doc -->\n+ * @param object the target of the switch.\n+ * @return the result of interpreting the object as an instance of '<em>Model Type</em>'.\n+ * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)\n+ * @generated\n+ */\n+ public T caseModelType(ModelType object)\n+ {\n+ return null;\n+ }\n+\n /**\n * Returns the result of interpreting the object as an instance of '<em>Model Item</em>'.\n * <!-- begin-user-doc -->\n@@ -244,6 +343,22 @@ public T caseModelItem(ModelItem object)\n return null;\n }\n \n+ /**\n+ * Returns the result of interpreting the object as an instance of '<em>List Item Type</em>'.\n+ * <!-- begin-user-doc -->\n+ * This implementation returns null;\n+ * returning a non-null result will terminate the switch.\n+ * <!-- end-user-doc -->\n+ * @param object the target of the switch.\n+ * @return the result of interpreting the object as an instance of '<em>List Item Type</em>'.\n+ * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)\n+ * @generated\n+ */\n+ public T caseListItemType(ListItemType object)\n+ {\n+ return null;\n+ }\n+\n /**\n * Returns the result of interpreting the object as an instance of '<em>List Item</em>'.\n * <!-- begin-user-doc -->", "raw_url": "https://github.com/nasa/CertWare/raw/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2Futil%2FIntentSpecificationSwitch.java", "sha": "737b7f8b8e698aeb8ad2c8c40d2f06654663c646", "status": "modified" }, { "additions": 338, "blob_url": "https://github.com/nasa/CertWare/blob/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fparser%2Fantlr%2Finternal%2FInternalIntentSpecification.g", "changes": 501, "contents_url": "https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fparser%2Fantlr%2Finternal%2FInternalIntentSpecification.g?ref=27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9", "deletions": 163, "filename": "net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g", "new_code": "\t\tlv_name_1_0=RULE_ID\n\t\t\tnewLeafNode(lv_name_1_0, grammarAccess.getSpecificationAccess().getNameIDTerminalRuleCall_1_0()); \n \t\t\t\"name\",\n \t\tlv_name_1_0, \n\t\tlv_name_1_0=RULE_ID\n\t\t\tnewLeafNode(lv_name_1_0, grammarAccess.getRefinementAccess().getNameIDTerminalRuleCall_1_0()); \n \t\t\t\"name\",\n \t\tlv_name_1_0, \n\t\tlv_name_1_0=RULE_ID\n\t\t\tnewLeafNode(lv_name_1_0, grammarAccess.getIntentAccess().getNameIDTerminalRuleCall_1_0()); \n \t\t\t\"name\",\n \t\tlv_name_1_0, \nentryRuleIntentType returns [EObject current=null] \n\t{ newCompositeNode(grammarAccess.getIntentTypeRule()); }\n\t { $current=$iv_ruleIntentType.current; } \nruleIntentType returns [EObject current=null] \n(\n(\n\t\tlv_typeName_0_1=\t'basic' \n newLeafNode(lv_typeName_0_1, grammarAccess.getIntentTypeAccess().getTypeNameBasicKeyword_0_0());\n \n\t {\n\t if ($current==null) {\n\t $current = createModelElement(grammarAccess.getIntentTypeRule());\n\t }\n \t\tsetWithLastConsumed($current, \"typeName\", lv_typeName_0_1, null);\n\t }\n |\t\tlv_typeName_0_2=\t'purpose' \n newLeafNode(lv_typeName_0_2, grammarAccess.getIntentTypeAccess().getTypeNamePurposeKeyword_0_1());\n \n\t {\n\t if ($current==null) {\n\t $current = createModelElement(grammarAccess.getIntentTypeRule());\n\t }\n \t\tsetWithLastConsumed($current, \"typeName\", lv_typeName_0_2, null);\n\t }\n |\t\tlv_typeName_0_3=\t'principles' \n newLeafNode(lv_typeName_0_3, grammarAccess.getIntentTypeAccess().getTypeNamePrinciplesKeyword_0_2());\n \n\t {\n\t if ($current==null) {\n\t $current = createModelElement(grammarAccess.getIntentTypeRule());\n\t }\n \t\tsetWithLastConsumed($current, \"typeName\", lv_typeName_0_3, null);\n\t }\n |\t\tlv_typeName_0_4=\t'models' \n newLeafNode(lv_typeName_0_4, grammarAccess.getIntentTypeAccess().getTypeNameModelsKeyword_0_3());\n \n\t {\n\t if ($current==null) {\n\t $current = createModelElement(grammarAccess.getIntentTypeRule());\n\t }\n \t\tsetWithLastConsumed($current, \"typeName\", lv_typeName_0_4, null);\n\t }\n |\t\tlv_typeName_0_5=\t'design' \n newLeafNode(lv_typeName_0_5, grammarAccess.getIntentTypeAccess().getTypeNameDesignKeyword_0_4());\n \n\t {\n\t if ($current==null) {\n\t $current = createModelElement(grammarAccess.getIntentTypeRule());\n\t }\n \t\tsetWithLastConsumed($current, \"typeName\", lv_typeName_0_5, null);\n\t }\n |\t\tlv_typeName_0_6=\t'implementation' \n newLeafNode(lv_typeName_0_6, grammarAccess.getIntentTypeAccess().getTypeNameImplementationKeyword_0_5());\n \n\t {\n\t if ($current==null) {\n\t $current = createModelElement(grammarAccess.getIntentTypeRule());\n\t }\n \t\tsetWithLastConsumed($current, \"typeName\", lv_typeName_0_6, null);\n\t }\n |\t\tlv_typeName_0_7=\t'operation' \n newLeafNode(lv_typeName_0_7, grammarAccess.getIntentTypeAccess().getTypeNameOperationKeyword_0_6());\n \n\t {\n\t if ($current==null) {\n\t $current = createModelElement(grammarAccess.getIntentTypeRule());\n\t }\n \t\tsetWithLastConsumed($current, \"typeName\", lv_typeName_0_7, null);\n\t }\n\n\n)\n)\n;\n\t\tlv_name_1_0=RULE_ID\n\t\t\tnewLeafNode(lv_name_1_0, grammarAccess.getDecompositionAccess().getNameIDTerminalRuleCall_1_0()); \n \t\t\t\"name\",\n \t\tlv_name_1_0, \nentryRuleDecompositionType returns [EObject current=null] \n\t{ newCompositeNode(grammarAccess.getDecompositionTypeRule()); }\n\t { $current=$iv_ruleDecompositionType.current; } \nruleDecompositionType returns [EObject current=null] \n(\n(\n\t\tlv_typeName_0_1=\t'environment' \n newLeafNode(lv_typeName_0_1, grammarAccess.getDecompositionTypeAccess().getTypeNameEnvironmentKeyword_0_0());\n \n\t {\n\t if ($current==null) {\n\t $current = createModelElement(grammarAccess.getDecompositionTypeRule());\n\t }\n \t\tsetWithLastConsumed($current, \"typeName\", lv_typeName_0_1, null);\n\t }\n |\t\tlv_typeName_0_2=\t'operator' \n newLeafNode(lv_typeName_0_2, grammarAccess.getDecompositionTypeAccess().getTypeNameOperatorKeyword_0_1());\n \n\t {\n\t if ($current==null) {\n\t $current = createModelElement(grammarAccess.getDecompositionTypeRule());\n\t }\n \t\tsetWithLastConsumed($current, \"typeName\", lv_typeName_0_2, null);\n\t }\n |\t\tlv_typeName_0_3=\t'system' \n newLeafNode(lv_typeName_0_3, grammarAccess.getDecompositionTypeAccess().getTypeNameSystemKeyword_0_2());\n \n\t {\n\t if ($current==null) {\n\t $current = createModelElement(grammarAccess.getDecompositionTypeRule());\n\t }\n \t\tsetWithLastConsumed($current, \"typeName\", lv_typeName_0_3, null);\n\t }\n |\t\tlv_typeName_0_4=\t'verification' \n newLeafNode(lv_typeName_0_4, grammarAccess.getDecompositionTypeAccess().getTypeNameVerificationKeyword_0_3());\n \n\t {\n\t if ($current==null) {\n\t $current = createModelElement(grammarAccess.getDecompositionTypeRule());\n\t }\n \t\tsetWithLastConsumed($current, \"typeName\", lv_typeName_0_4, null);\n\t }\n\n)\n\n)\n;\nentryRuleDocItemType returns [EObject current=null] \n\t{ newCompositeNode(grammarAccess.getDocItemTypeRule()); }\n\t { $current=$iv_ruleDocItemType.current; } \nruleDocItemType returns [EObject current=null] \n(\n(\n\t\tlv_typeName_0_1=\t'condition' \n newLeafNode(lv_typeName_0_1, grammarAccess.getDocItemTypeAccess().getTypeNameConditionKeyword_0_0());\n \n\t {\n\t if ($current==null) {\n\t $current = createModelElement(grammarAccess.getDocItemTypeRule());\n\t }\n \t\tsetWithLastConsumed($current, \"typeName\", lv_typeName_0_1, null);\n\t }\n |\t\tlv_typeName_0_2=\t'figure' \n newLeafNode(lv_typeName_0_2, grammarAccess.getDocItemTypeAccess().getTypeNameFigureKeyword_0_1());\n \n\t {\n\t if ($current==null) {\n\t $current = createModelElement(grammarAccess.getDocItemTypeRule());\n\t }\n \t\tsetWithLastConsumed($current, \"typeName\", lv_typeName_0_2, null);\n\t }\n |\t\tlv_typeName_0_3=\t'break' \n newLeafNode(lv_typeName_0_3, grammarAccess.getDocItemTypeAccess().getTypeNameBreakKeyword_0_2());\n \n\t {\n\t if ($current==null) {\n\t $current = createModelElement(grammarAccess.getDocItemTypeRule());\n\t }\n \t\tsetWithLastConsumed($current, \"typeName\", lv_typeName_0_3, null);\n\t }\n |\t\tlv_typeName_0_4=\t'model' \n newLeafNode(lv_typeName_0_4, grammarAccess.getDocItemTypeAccess().getTypeNameModelKeyword_0_3());\n \n\t {\n\t if ($current==null) {\n\t $current = createModelElement(grammarAccess.getDocItemTypeRule());\n\t }\n \t\tsetWithLastConsumed($current, \"typeName\", lv_typeName_0_4, null);\n\t }\n |\t\tlv_typeName_0_5=\t'paragraph' \n newLeafNode(lv_typeName_0_5, grammarAccess.getDocItemTypeAccess().getTypeNameParagraphKeyword_0_4());\n \n\t {\n\t if ($current==null) {\n\t $current = createModelElement(grammarAccess.getDocItemTypeRule());\n\t }\n \t\tsetWithLastConsumed($current, \"typeName\", lv_typeName_0_5, null);\n\t }\n |\t\tlv_typeName_0_6=\t'section' \n newLeafNode(lv_typeName_0_6, grammarAccess.getDocItemTypeAccess().getTypeNameSectionKeyword_0_5());\n \n\t {\n\t if ($current==null) {\n\t $current = createModelElement(grammarAccess.getDocItemTypeRule());\n\t }\n \t\tsetWithLastConsumed($current, \"typeName\", lv_typeName_0_6, null);\n\t }\n |\t\tlv_typeName_0_7=\t'table' \n newLeafNode(lv_typeName_0_7, grammarAccess.getDocItemTypeAccess().getTypeNameTableKeyword_0_6());\n \n\t {\n\t if ($current==null) {\n\t $current = createModelElement(grammarAccess.getDocItemTypeRule());\n\t }\n \t\tsetWithLastConsumed($current, \"typeName\", lv_typeName_0_7, null);\n\t }\n\n\n)\n)\n;\n\t\tlv_name_1_0=RULE_ID\n\t\t\tnewLeafNode(lv_name_1_0, grammarAccess.getDocItemAccess().getNameIDTerminalRuleCall_1_0()); \n \t\t\t\"name\",\n \t\tlv_name_1_0, \nentryRuleModelType returns [EObject current=null] \n\t{ newCompositeNode(grammarAccess.getModelTypeRule()); }\n\t { $current=$iv_ruleModelType.current; } \nruleModelType returns [EObject current=null] \n(\n(\n\t\tlv_typeName_0_1=\t'output' \n newLeafNode(lv_typeName_0_1, grammarAccess.getModelTypeAccess().getTypeNameOutputKeyword_0_0());\n \n\t {\n\t if ($current==null) {\n\t $current = createModelElement(grammarAccess.getModelTypeRule());\n\t }\n \t\tsetWithLastConsumed($current, \"typeName\", lv_typeName_0_1, null);\n\t }\n |\t\tlv_typeName_0_2=\t'mode' \n newLeafNode(lv_typeName_0_2, grammarAccess.getModelTypeAccess().getTypeNameModeKeyword_0_1());\n \n\t {\n\t if ($current==null) {\n\t $current = createModelElement(grammarAccess.getModelTypeRule());\n\t }\n \t\tsetWithLastConsumed($current, \"typeName\", lv_typeName_0_2, null);\n\t }\n |\t\tlv_typeName_0_3=\t'state' \n newLeafNode(lv_typeName_0_3, grammarAccess.getModelTypeAccess().getTypeNameStateKeyword_0_2());\n \n\t {\n\t if ($current==null) {\n\t $current = createModelElement(grammarAccess.getModelTypeRule());\n\t }\n \t\tsetWithLastConsumed($current, \"typeName\", lv_typeName_0_3, null);\n\t }\n |\t\tlv_typeName_0_4=\t'macro' \n newLeafNode(lv_typeName_0_4, grammarAccess.getModelTypeAccess().getTypeNameMacroKeyword_0_3());\n \n\t {\n\t if ($current==null) {\n\t $current = createModelElement(grammarAccess.getModelTypeRule());\n\t }\n \t\tsetWithLastConsumed($current, \"typeName\", lv_typeName_0_4, null);\n\t }\n |\t\tlv_typeName_0_5=\t'function' \n newLeafNode(lv_typeName_0_5, grammarAccess.getModelTypeAccess().getTypeNameFunctionKeyword_0_4());\n \n\t {\n\t if ($current==null) {\n\t $current = createModelElement(grammarAccess.getModelTypeRule());\n\t }\n \t\tsetWithLastConsumed($current, \"typeName\", lv_typeName_0_5, null);\n\t }\n |\t\tlv_typeName_0_6=\t'input' \n newLeafNode(lv_typeName_0_6, grammarAccess.getModelTypeAccess().getTypeNameInputKeyword_0_5());\n \n\t {\n\t if ($current==null) {\n\t $current = createModelElement(grammarAccess.getModelTypeRule());\n\t }\n \t\tsetWithLastConsumed($current, \"typeName\", lv_typeName_0_6, null);\n\t }\n\n\n)\n)\n;\n\t\tlv_name_1_0=RULE_ID\n\t\t\tnewLeafNode(lv_name_1_0, grammarAccess.getModelItemAccess().getNameIDTerminalRuleCall_1_0()); \n \t\t\t\"name\",\n \t\tlv_name_1_0, \nentryRuleListItemType returns [EObject current=null] \n\t{ newCompositeNode(grammarAccess.getListItemTypeRule()); }\n\t { $current=$iv_ruleListItemType.current; } \nruleListItemType returns [EObject current=null] \n(\n(\n\t\tlv_typeName_0_1=\t'requirement' \n newLeafNode(lv_typeName_0_1, grammarAccess.getListItemTypeAccess().getTypeNameRequirementKeyword_0_0());\n \n\t {\n\t if ($current==null) {\n\t $current = createModelElement(grammarAccess.getListItemTypeRule());\n\t }\n \t\tsetWithLastConsumed($current, \"typeName\", lv_typeName_0_1, null);\n\t }\n |\t\tlv_typeName_0_2=\t'goal' \n newLeafNode(lv_typeName_0_2, grammarAccess.getListItemTypeAccess().getTypeNameGoalKeyword_0_1());\n \n\t {\n\t if ($current==null) {\n\t $current = createModelElement(grammarAccess.getListItemTypeRule());\n\t }\n \t\tsetWithLastConsumed($current, \"typeName\", lv_typeName_0_2, null);\n\t }\n |\t\tlv_typeName_0_3=\t'hazard' \n newLeafNode(lv_typeName_0_3, grammarAccess.getListItemTypeAccess().getTypeNameHazardKeyword_0_2());\n \n\t {\n\t if ($current==null) {\n\t $current = createModelElement(grammarAccess.getListItemTypeRule());\n\t }\n \t\tsetWithLastConsumed($current, \"typeName\", lv_typeName_0_3, null);\n\t }\n |\t\tlv_typeName_0_4=\t'constraint' \n newLeafNode(lv_typeName_0_4, grammarAccess.getListItemTypeAccess().getTypeNameConstraintKeyword_0_3());\n \n\t {\n\t if ($current==null) {\n\t $current = createModelElement(grammarAccess.getListItemTypeRule());\n\t }\n \t\tsetWithLastConsumed($current, \"typeName\", lv_typeName_0_4, null);\n\t }\n\n\n)\n)\n;\n\t\tlv_name_1_0=RULE_ID\n\t\t\tnewLeafNode(lv_name_1_0, grammarAccess.getListItemAccess().getNameIDTerminalRuleCall_1_0()); \n \t\t\t\"name\",\n \t\tlv_name_1_0, \n)+\totherlv_5='}' \n)+\totherlv_8=')' \n)+\totherlv_11=']' ", "new_methods": [], "old_code": "\t\tlv_id_1_0=RULE_ID\n\t\t\tnewLeafNode(lv_id_1_0, grammarAccess.getSpecificationAccess().getIdIDTerminalRuleCall_1_0()); \n \t\t\t\"id\",\n \t\tlv_id_1_0, \n\t\tlv_id_1_0=RULE_ID\n\t\t\tnewLeafNode(lv_id_1_0, grammarAccess.getRefinementAccess().getIdIDTerminalRuleCall_1_0()); \n \t\t\t\"id\",\n \t\tlv_id_1_0, \n\t\tlv_id_1_0=RULE_ID\n\t\t\tnewLeafNode(lv_id_1_0, grammarAccess.getIntentAccess().getIdIDTerminalRuleCall_1_0()); \n \t\t\t\"id\",\n \t\tlv_id_1_0, \nentryRuleIntentType returns [String current=null] \n\t{ newCompositeNode(grammarAccess.getIntentTypeRule()); } \n\t { $current=$iv_ruleIntentType.current.getText(); } \nruleIntentType returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] \n\tkw='basic' \n $current.merge(kw);\n newLeafNode(kw, grammarAccess.getIntentTypeAccess().getBasicKeyword_0()); \n |\n\tkw='purpose' \n $current.merge(kw);\n newLeafNode(kw, grammarAccess.getIntentTypeAccess().getPurposeKeyword_1()); \n |\n\tkw='principles' \n $current.merge(kw);\n newLeafNode(kw, grammarAccess.getIntentTypeAccess().getPrinciplesKeyword_2()); \n |\n\tkw='models' \n $current.merge(kw);\n newLeafNode(kw, grammarAccess.getIntentTypeAccess().getModelsKeyword_3()); \n |\n\tkw='design' \n $current.merge(kw);\n newLeafNode(kw, grammarAccess.getIntentTypeAccess().getDesignKeyword_4()); \n |\n\tkw='implementation' \n $current.merge(kw);\n newLeafNode(kw, grammarAccess.getIntentTypeAccess().getImplementationKeyword_5()); \n |\n\tkw='operation' \n $current.merge(kw);\n newLeafNode(kw, grammarAccess.getIntentTypeAccess().getOperationKeyword_6()); \n ;\n\t\tlv_id_1_0=RULE_ID\n\t\t\tnewLeafNode(lv_id_1_0, grammarAccess.getDecompositionAccess().getIdIDTerminalRuleCall_1_0()); \n \t\t\t\"id\",\n \t\tlv_id_1_0, \nentryRuleDecompositionType returns [String current=null] \n\t{ newCompositeNode(grammarAccess.getDecompositionTypeRule()); } \n\t { $current=$iv_ruleDecompositionType.current.getText(); } \nruleDecompositionType returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] \n\tkw='environment' \n $current.merge(kw);\n newLeafNode(kw, grammarAccess.getDecompositionTypeAccess().getEnvironmentKeyword_0()); \n |\n\tkw='operator' \n $current.merge(kw);\n newLeafNode(kw, grammarAccess.getDecompositionTypeAccess().getOperatorKeyword_1()); \n |\n\tkw='system' \n $current.merge(kw);\n newLeafNode(kw, grammarAccess.getDecompositionTypeAccess().getSystemKeyword_2()); \n |\n\tkw='verification' \n $current.merge(kw);\n newLeafNode(kw, grammarAccess.getDecompositionTypeAccess().getVerificationKeyword_3()); \n ;\nentryRuleDocItemType returns [String current=null] \n\t{ newCompositeNode(grammarAccess.getDocItemTypeRule()); } \n\t { $current=$iv_ruleDocItemType.current.getText(); } \nruleDocItemType returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] \n\tkw='condition' \n $current.merge(kw);\n newLeafNode(kw, grammarAccess.getDocItemTypeAccess().getConditionKeyword_0()); \n |\n\tkw='figure' \n $current.merge(kw);\n newLeafNode(kw, grammarAccess.getDocItemTypeAccess().getFigureKeyword_1()); \n |\n\tkw='break' \n $current.merge(kw);\n newLeafNode(kw, grammarAccess.getDocItemTypeAccess().getBreakKeyword_2()); \n |\n\tkw='model' \n $current.merge(kw);\n newLeafNode(kw, grammarAccess.getDocItemTypeAccess().getModelKeyword_3()); \n |\n\tkw='paragraph' \n $current.merge(kw);\n newLeafNode(kw, grammarAccess.getDocItemTypeAccess().getParagraphKeyword_4()); \n |\n\tkw='section' \n $current.merge(kw);\n newLeafNode(kw, grammarAccess.getDocItemTypeAccess().getSectionKeyword_5()); \n |\n\tkw='table' \n $current.merge(kw);\n newLeafNode(kw, grammarAccess.getDocItemTypeAccess().getTableKeyword_6()); \n ;\n\t\tlv_id_1_0=RULE_ID\n\t\t\tnewLeafNode(lv_id_1_0, grammarAccess.getDocItemAccess().getIdIDTerminalRuleCall_1_0()); \n \t\t\t\"id\",\n \t\tlv_id_1_0, \nentryRuleModelType returns [String current=null] \n\t{ newCompositeNode(grammarAccess.getModelTypeRule()); } \n\t { $current=$iv_ruleModelType.current.getText(); } \nruleModelType returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] \n\tkw='output' \n $current.merge(kw);\n newLeafNode(kw, grammarAccess.getModelTypeAccess().getOutputKeyword_0()); \n |\n\tkw='mode' \n $current.merge(kw);\n newLeafNode(kw, grammarAccess.getModelTypeAccess().getModeKeyword_1()); \n |\n\tkw='state' \n $current.merge(kw);\n newLeafNode(kw, grammarAccess.getModelTypeAccess().getStateKeyword_2()); \n |\n\tkw='macro' \n $current.merge(kw);\n newLeafNode(kw, grammarAccess.getModelTypeAccess().getMacroKeyword_3()); \n |\n\tkw='function' \n $current.merge(kw);\n newLeafNode(kw, grammarAccess.getModelTypeAccess().getFunctionKeyword_4()); \n |\n\tkw='input' \n $current.merge(kw);\n newLeafNode(kw, grammarAccess.getModelTypeAccess().getInputKeyword_5()); \n ;\n\t\tlv_id_1_0=RULE_ID\n\t\t\tnewLeafNode(lv_id_1_0, grammarAccess.getModelItemAccess().getIdIDTerminalRuleCall_1_0()); \n \t\t\t\"id\",\n \t\tlv_id_1_0, \nentryRuleListItemType returns [String current=null] \n\t{ newCompositeNode(grammarAccess.getListItemTypeRule()); } \n\t { $current=$iv_ruleListItemType.current.getText(); } \nruleListItemType returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] \n\tkw='requirement' \n $current.merge(kw);\n newLeafNode(kw, grammarAccess.getListItemTypeAccess().getRequirementKeyword_0()); \n |\n\tkw='goal' \n $current.merge(kw);\n newLeafNode(kw, grammarAccess.getListItemTypeAccess().getGoalKeyword_1()); \n |\n\tkw='hazard' \n $current.merge(kw);\n newLeafNode(kw, grammarAccess.getListItemTypeAccess().getHazardKeyword_2()); \n |\n\tkw='constraint' \n $current.merge(kw);\n newLeafNode(kw, grammarAccess.getListItemTypeAccess().getConstraintKeyword_3()); \n ;\n\t\tlv_id_1_0=RULE_ID\n\t\t\tnewLeafNode(lv_id_1_0, grammarAccess.getListItemAccess().getIdIDTerminalRuleCall_1_0()); \n \t\t\t\"id\",\n \t\tlv_id_1_0, \n)*\totherlv_5='}' \n)*\totherlv_8=')' \n)*\totherlv_11=']' ", "old_methods": [], "patch": "@@ -83,18 +83,18 @@ ruleSpecification returns [EObject current=null]\n }\n (\n (\n-\t\tlv_id_1_0=RULE_ID\n+\t\tlv_name_1_0=RULE_ID\n \t\t{\n-\t\t\tnewLeafNode(lv_id_1_0, grammarAccess.getSpecificationAccess().getIdIDTerminalRuleCall_1_0()); \n+\t\t\tnewLeafNode(lv_name_1_0, grammarAccess.getSpecificationAccess().getNameIDTerminalRuleCall_1_0()); \n \t\t}\n \t\t{\n \t if ($current==null) {\n \t $current = createModelElement(grammarAccess.getSpecificationRule());\n \t }\n \t\tsetWithLastConsumed(\n \t\t\t$current, \n- \t\t\t\"id\",\n- \t\tlv_id_1_0, \n+ \t\t\t\"name\",\n+ \t\tlv_name_1_0, \n \t\t\"ID\");\n \t }\n \n@@ -144,18 +144,18 @@ ruleRefinement returns [EObject current=null]\n }\n (\n (\n-\t\tlv_id_1_0=RULE_ID\n+\t\tlv_name_1_0=RULE_ID\n \t\t{\n-\t\t\tnewLeafNode(lv_id_1_0, grammarAccess.getRefinementAccess().getIdIDTerminalRuleCall_1_0()); \n+\t\t\tnewLeafNode(lv_name_1_0, grammarAccess.getRefinementAccess().getNameIDTerminalRuleCall_1_0()); \n \t\t}\n \t\t{\n \t if ($current==null) {\n \t $current = createModelElement(grammarAccess.getRefinementRule());\n \t }\n \t\tsetWithLastConsumed(\n \t\t\t$current, \n- \t\t\t\"id\",\n- \t\tlv_id_1_0, \n+ \t\t\t\"name\",\n+ \t\tlv_name_1_0, \n \t\t\"ID\");\n \t }\n \n@@ -237,18 +237,18 @@ ruleIntent returns [EObject current=null]\n )\n )(\n (\n-\t\tlv_id_1_0=RULE_ID\n+\t\tlv_name_1_0=RULE_ID\n \t\t{\n-\t\t\tnewLeafNode(lv_id_1_0, grammarAccess.getIntentAccess().getIdIDTerminalRuleCall_1_0()); \n+\t\t\tnewLeafNode(lv_name_1_0, grammarAccess.getIntentAccess().getNameIDTerminalRuleCall_1_0()); \n \t\t}\n \t\t{\n \t if ($current==null) {\n \t $current = createModelElement(grammarAccess.getIntentRule());\n \t }\n \t\tsetWithLastConsumed(\n \t\t\t$current, \n- \t\t\t\"id\",\n- \t\tlv_id_1_0, \n+ \t\t\t\"name\",\n+ \t\tlv_name_1_0, \n \t\t\"ID\");\n \t }\n \n@@ -297,69 +297,111 @@ ruleIntent returns [EObject current=null]\n \n \n // Entry rule entryRuleIntentType\n-entryRuleIntentType returns [String current=null] \n+entryRuleIntentType returns [EObject current=null] \n \t:\n-\t{ newCompositeNode(grammarAccess.getIntentTypeRule()); } \n+\t{ newCompositeNode(grammarAccess.getIntentTypeRule()); }\n \t iv_ruleIntentType=ruleIntentType \n-\t { $current=$iv_ruleIntentType.current.getText(); } \n+\t { $current=$iv_ruleIntentType.current; } \n \t EOF \n ;\n \n // Rule IntentType\n-ruleIntentType returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] \n+ruleIntentType returns [EObject current=null] \n @init { enterRule(); \n }\n @after { leaveRule(); }:\n (\n-\tkw='basic' \n+(\n+(\n+\t\tlv_typeName_0_1=\t'basic' \n {\n- $current.merge(kw);\n- newLeafNode(kw, grammarAccess.getIntentTypeAccess().getBasicKeyword_0()); \n+ newLeafNode(lv_typeName_0_1, grammarAccess.getIntentTypeAccess().getTypeNameBasicKeyword_0_0());\n }\n+ \n+\t {\n+\t if ($current==null) {\n+\t $current = createModelElement(grammarAccess.getIntentTypeRule());\n+\t }\n+ \t\tsetWithLastConsumed($current, \"typeName\", lv_typeName_0_1, null);\n+\t }\n \n- |\n-\tkw='purpose' \n+ |\t\tlv_typeName_0_2=\t'purpose' \n {\n- $current.merge(kw);\n- newLeafNode(kw, grammarAccess.getIntentTypeAccess().getPurposeKeyword_1()); \n+ newLeafNode(lv_typeName_0_2, grammarAccess.getIntentTypeAccess().getTypeNamePurposeKeyword_0_1());\n }\n+ \n+\t {\n+\t if ($current==null) {\n+\t $current = createModelElement(grammarAccess.getIntentTypeRule());\n+\t }\n+ \t\tsetWithLastConsumed($current, \"typeName\", lv_typeName_0_2, null);\n+\t }\n \n- |\n-\tkw='principles' \n+ |\t\tlv_typeName_0_3=\t'principles' \n {\n- $current.merge(kw);\n- newLeafNode(kw, grammarAccess.getIntentTypeAccess().getPrinciplesKeyword_2()); \n+ newLeafNode(lv_typeName_0_3, grammarAccess.getIntentTypeAccess().getTypeNamePrinciplesKeyword_0_2());\n }\n+ \n+\t {\n+\t if ($current==null) {\n+\t $current = createModelElement(grammarAccess.getIntentTypeRule());\n+\t }\n+ \t\tsetWithLastConsumed($current, \"typeName\", lv_typeName_0_3, null);\n+\t }\n \n- |\n-\tkw='models' \n+ |\t\tlv_typeName_0_4=\t'models' \n {\n- $current.merge(kw);\n- newLeafNode(kw, grammarAccess.getIntentTypeAccess().getModelsKeyword_3()); \n+ newLeafNode(lv_typeName_0_4, grammarAccess.getIntentTypeAccess().getTypeNameModelsKeyword_0_3());\n }\n+ \n+\t {\n+\t if ($current==null) {\n+\t $current = createModelElement(grammarAccess.getIntentTypeRule());\n+\t }\n+ \t\tsetWithLastConsumed($current, \"typeName\", lv_typeName_0_4, null);\n+\t }\n \n- |\n-\tkw='design' \n+ |\t\tlv_typeName_0_5=\t'design' \n {\n- $current.merge(kw);\n- newLeafNode(kw, grammarAccess.getIntentTypeAccess().getDesignKeyword_4()); \n+ newLeafNode(lv_typeName_0_5, grammarAccess.getIntentTypeAccess().getTypeNameDesignKeyword_0_4());\n }\n+ \n+\t {\n+\t if ($current==null) {\n+\t $current = createModelElement(grammarAccess.getIntentTypeRule());\n+\t }\n+ \t\tsetWithLastConsumed($current, \"typeName\", lv_typeName_0_5, null);\n+\t }\n \n- |\n-\tkw='implementation' \n+ |\t\tlv_typeName_0_6=\t'implementation' \n {\n- $current.merge(kw);\n- newLeafNode(kw, grammarAccess.getIntentTypeAccess().getImplementationKeyword_5()); \n+ newLeafNode(lv_typeName_0_6, grammarAccess.getIntentTypeAccess().getTypeNameImplementationKeyword_0_5());\n }\n+ \n+\t {\n+\t if ($current==null) {\n+\t $current = createModelElement(grammarAccess.getIntentTypeRule());\n+\t }\n+ \t\tsetWithLastConsumed($current, \"typeName\", lv_typeName_0_6, null);\n+\t }\n \n- |\n-\tkw='operation' \n+ |\t\tlv_typeName_0_7=\t'operation' \n {\n- $current.merge(kw);\n- newLeafNode(kw, grammarAccess.getIntentTypeAccess().getOperationKeyword_6()); \n+ newLeafNode(lv_typeName_0_7, grammarAccess.getIntentTypeAccess().getTypeNameOperationKeyword_0_6());\n }\n+ \n+\t {\n+\t if ($current==null) {\n+\t $current = createModelElement(grammarAccess.getIntentTypeRule());\n+\t }\n+ \t\tsetWithLastConsumed($current, \"typeName\", lv_typeName_0_7, null);\n+\t }\n+\n )\n- ;\n+\n+)\n+)\n+;\n \n \n \n@@ -399,18 +441,18 @@ ruleDecomposition returns [EObject current=null]\n )\n )(\n (\n-\t\tlv_id_1_0=RULE_ID\n+\t\tlv_name_1_0=RULE_ID\n \t\t{\n-\t\t\tnewLeafNode(lv_id_1_0, grammarAccess.getDecompositionAccess().getIdIDTerminalRuleCall_1_0()); \n+\t\t\tnewLeafNode(lv_name_1_0, grammarAccess.getDecompositionAccess().getNameIDTerminalRuleCall_1_0()); \n \t\t}\n \t\t{\n \t if ($current==null) {\n \t $current = createModelElement(grammarAccess.getDecompositionRule());\n \t }\n \t\tsetWithLastConsumed(\n \t\t\t$current, \n- \t\t\t\"id\",\n- \t\tlv_id_1_0, \n+ \t\t\t\"name\",\n+ \t\tlv_name_1_0, \n \t\t\"ID\");\n \t }\n \n@@ -519,48 +561,75 @@ ruleDecomposition returns [EObject current=null]\n \n \n // Entry rule entryRuleDecompositionType\n-entryRuleDecompositionType returns [String current=null] \n+entryRuleDecompositionType returns [EObject current=null] \n \t:\n-\t{ newCompositeNode(grammarAccess.getDecompositionTypeRule()); } \n+\t{ newCompositeNode(grammarAccess.getDecompositionTypeRule()); }\n \t iv_ruleDecompositionType=ruleDecompositionType \n-\t { $current=$iv_ruleDecompositionType.current.getText(); } \n+\t { $current=$iv_ruleDecompositionType.current; } \n \t EOF \n ;\n \n // Rule DecompositionType\n-ruleDecompositionType returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] \n+ruleDecompositionType returns [EObject current=null] \n @init { enterRule(); \n }\n @after { leaveRule(); }:\n (\n-\tkw='environment' \n+(\n+(\n+\t\tlv_typeName_0_1=\t'environment' \n {\n- $current.merge(kw);\n- newLeafNode(kw, grammarAccess.getDecompositionTypeAccess().getEnvironmentKeyword_0()); \n+ newLeafNode(lv_typeName_0_1, grammarAccess.getDecompositionTypeAccess().getTypeNameEnvironmentKeyword_0_0());\n }\n+ \n+\t {\n+\t if ($current==null) {\n+\t $current = createModelElement(grammarAccess.getDecompositionTypeRule());\n+\t }\n+ \t\tsetWithLastConsumed($current, \"typeName\", lv_typeName_0_1, null);\n+\t }\n \n- |\n-\tkw='operator' \n+ |\t\tlv_typeName_0_2=\t'operator' \n {\n- $current.merge(kw);\n- newLeafNode(kw, grammarAccess.getDecompositionTypeAccess().getOperatorKeyword_1()); \n+ newLeafNode(lv_typeName_0_2, grammarAccess.getDecompositionTypeAccess().getTypeNameOperatorKeyword_0_1());\n }\n+ \n+\t {\n+\t if ($current==null) {\n+\t $current = createModelElement(grammarAccess.getDecompositionTypeRule());\n+\t }\n+ \t\tsetWithLastConsumed($current, \"typeName\", lv_typeName_0_2, null);\n+\t }\n \n- |\n-\tkw='system' \n+ |\t\tlv_typeName_0_3=\t'system' \n {\n- $current.merge(kw);\n- newLeafNode(kw, grammarAccess.getDecompositionTypeAccess().getSystemKeyword_2()); \n+ newLeafNode(lv_typeName_0_3, grammarAccess.getDecompositionTypeAccess().getTypeNameSystemKeyword_0_2());\n }\n+ \n+\t {\n+\t if ($current==null) {\n+\t $current = createModelElement(grammarAccess.getDecompositionTypeRule());\n+\t }\n+ \t\tsetWithLastConsumed($current, \"typeName\", lv_typeName_0_3, null);\n+\t }\n \n- |\n-\tkw='verification' \n+ |\t\tlv_typeName_0_4=\t'verification' \n {\n- $current.merge(kw);\n- newLeafNode(kw, grammarAccess.getDecompositionTypeAccess().getVerificationKeyword_3()); \n+ newLeafNode(lv_typeName_0_4, grammarAccess.getDecompositionTypeAccess().getTypeNameVerificationKeyword_0_3());\n }\n+ \n+\t {\n+\t if ($current==null) {\n+\t $current = createModelElement(grammarAccess.getDecompositionTypeRule());\n+\t }\n+ \t\tsetWithLastConsumed($current, \"typeName\", lv_typeName_0_4, null);\n+\t }\n+\n+)\n+\n )\n- ;\n+)\n+;\n \n \n \n@@ -614,69 +683,111 @@ ruleDocument returns [EObject current=null]\n \n \n // Entry rule entryRuleDocItemType\n-entryRuleDocItemType returns [String current=null] \n+entryRuleDocItemType returns [EObject current=null] \n \t:\n-\t{ newCompositeNode(grammarAccess.getDocItemTypeRule()); } \n+\t{ newCompositeNode(grammarAccess.getDocItemTypeRule()); }\n \t iv_ruleDocItemType=ruleDocItemType \n-\t { $current=$iv_ruleDocItemType.current.getText(); } \n+\t { $current=$iv_ruleDocItemType.current; } \n \t EOF \n ;\n \n // Rule DocItemType\n-ruleDocItemType returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] \n+ruleDocItemType returns [EObject current=null] \n @init { enterRule(); \n }\n @after { leaveRule(); }:\n (\n-\tkw='condition' \n+(\n+(\n+\t\tlv_typeName_0_1=\t'condition' \n {\n- $current.merge(kw);\n- newLeafNode(kw, grammarAccess.getDocItemTypeAccess().getConditionKeyword_0()); \n+ newLeafNode(lv_typeName_0_1, grammarAccess.getDocItemTypeAccess().getTypeNameConditionKeyword_0_0());\n }\n+ \n+\t {\n+\t if ($current==null) {\n+\t $current = createModelElement(grammarAccess.getDocItemTypeRule());\n+\t }\n+ \t\tsetWithLastConsumed($current, \"typeName\", lv_typeName_0_1, null);\n+\t }\n \n- |\n-\tkw='figure' \n+ |\t\tlv_typeName_0_2=\t'figure' \n {\n- $current.merge(kw);\n- newLeafNode(kw, grammarAccess.getDocItemTypeAccess().getFigureKeyword_1()); \n+ newLeafNode(lv_typeName_0_2, grammarAccess.getDocItemTypeAccess().getTypeNameFigureKeyword_0_1());\n }\n+ \n+\t {\n+\t if ($current==null) {\n+\t $current = createModelElement(grammarAccess.getDocItemTypeRule());\n+\t }\n+ \t\tsetWithLastConsumed($current, \"typeName\", lv_typeName_0_2, null);\n+\t }\n \n- |\n-\tkw='break' \n+ |\t\tlv_typeName_0_3=\t'break' \n {\n- $current.merge(kw);\n- newLeafNode(kw, grammarAccess.getDocItemTypeAccess().getBreakKeyword_2()); \n+ newLeafNode(lv_typeName_0_3, grammarAccess.getDocItemTypeAccess().getTypeNameBreakKeyword_0_2());\n }\n+ \n+\t {\n+\t if ($current==null) {\n+\t $current = createModelElement(grammarAccess.getDocItemTypeRule());\n+\t }\n+ \t\tsetWithLastConsumed($current, \"typeName\", lv_typeName_0_3, null);\n+\t }\n \n- |\n-\tkw='model' \n+ |\t\tlv_typeName_0_4=\t'model' \n {\n- $current.merge(kw);\n- newLeafNode(kw, grammarAccess.getDocItemTypeAccess().getModelKeyword_3()); \n+ newLeafNode(lv_typeName_0_4, grammarAccess.getDocItemTypeAccess().getTypeNameModelKeyword_0_3());\n }\n+ \n+\t {\n+\t if ($current==null) {\n+\t $current = createModelElement(grammarAccess.getDocItemTypeRule());\n+\t }\n+ \t\tsetWithLastConsumed($current, \"typeName\", lv_typeName_0_4, null);\n+\t }\n \n- |\n-\tkw='paragraph' \n+ |\t\tlv_typeName_0_5=\t'paragraph' \n {\n- $current.merge(kw);\n- newLeafNode(kw, grammarAccess.getDocItemTypeAccess().getParagraphKeyword_4()); \n+ newLeafNode(lv_typeName_0_5, grammarAccess.getDocItemTypeAccess().getTypeNameParagraphKeyword_0_4());\n }\n+ \n+\t {\n+\t if ($current==null) {\n+\t $current = createModelElement(grammarAccess.getDocItemTypeRule());\n+\t }\n+ \t\tsetWithLastConsumed($current, \"typeName\", lv_typeName_0_5, null);\n+\t }\n \n- |\n-\tkw='section' \n+ |\t\tlv_typeName_0_6=\t'section' \n {\n- $current.merge(kw);\n- newLeafNode(kw, grammarAccess.getDocItemTypeAccess().getSectionKeyword_5()); \n+ newLeafNode(lv_typeName_0_6, grammarAccess.getDocItemTypeAccess().getTypeNameSectionKeyword_0_5());\n }\n+ \n+\t {\n+\t if ($current==null) {\n+\t $current = createModelElement(grammarAccess.getDocItemTypeRule());\n+\t }\n+ \t\tsetWithLastConsumed($current, \"typeName\", lv_typeName_0_6, null);\n+\t }\n \n- |\n-\tkw='table' \n+ |\t\tlv_typeName_0_7=\t'table' \n {\n- $current.merge(kw);\n- newLeafNode(kw, grammarAccess.getDocItemTypeAccess().getTableKeyword_6()); \n+ newLeafNode(lv_typeName_0_7, grammarAccess.getDocItemTypeAccess().getTypeNameTableKeyword_0_6());\n }\n+ \n+\t {\n+\t if ($current==null) {\n+\t $current = createModelElement(grammarAccess.getDocItemTypeRule());\n+\t }\n+ \t\tsetWithLastConsumed($current, \"typeName\", lv_typeName_0_7, null);\n+\t }\n+\n )\n- ;\n+\n+)\n+)\n+;\n \n \n \n@@ -716,18 +827,18 @@ ruleDocItem returns [EObject current=null]\n )\n )(\n (\n-\t\tlv_id_1_0=RULE_ID\n+\t\tlv_name_1_0=RULE_ID\n \t\t{\n-\t\t\tnewLeafNode(lv_id_1_0, grammarAccess.getDocItemAccess().getIdIDTerminalRuleCall_1_0()); \n+\t\t\tnewLeafNode(lv_name_1_0, grammarAccess.getDocItemAccess().getNameIDTerminalRuleCall_1_0()); \n \t\t}\n \t\t{\n \t if ($current==null) {\n \t $current = createModelElement(grammarAccess.getDocItemRule());\n \t }\n \t\tsetWithLastConsumed(\n \t\t\t$current, \n- \t\t\t\"id\",\n- \t\tlv_id_1_0, \n+ \t\t\t\"name\",\n+ \t\tlv_name_1_0, \n \t\t\"ID\");\n \t }\n \n@@ -762,62 +873,99 @@ ruleDocItem returns [EObject current=null]\n \n \n // Entry rule entryRuleModelType\n-entryRuleModelType returns [String current=null] \n+entryRuleModelType returns [EObject current=null] \n \t:\n-\t{ newCompositeNode(grammarAccess.getModelTypeRule()); } \n+\t{ newCompositeNode(grammarAccess.getModelTypeRule()); }\n \t iv_ruleModelType=ruleModelType \n-\t { $current=$iv_ruleModelType.current.getText(); } \n+\t { $current=$iv_ruleModelType.current; } \n \t EOF \n ;\n \n // Rule ModelType\n-ruleModelType returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] \n+ruleModelType returns [EObject current=null] \n @init { enterRule(); \n }\n @after { leaveRule(); }:\n (\n-\tkw='output' \n+(\n+(\n+\t\tlv_typeName_0_1=\t'output' \n {\n- $current.merge(kw);\n- newLeafNode(kw, grammarAccess.getModelTypeAccess().getOutputKeyword_0()); \n+ newLeafNode(lv_typeName_0_1, grammarAccess.getModelTypeAccess().getTypeNameOutputKeyword_0_0());\n }\n+ \n+\t {\n+\t if ($current==null) {\n+\t $current = createModelElement(grammarAccess.getModelTypeRule());\n+\t }\n+ \t\tsetWithLastConsumed($current, \"typeName\", lv_typeName_0_1, null);\n+\t }\n \n- |\n-\tkw='mode' \n+ |\t\tlv_typeName_0_2=\t'mode' \n {\n- $current.merge(kw);\n- newLeafNode(kw, grammarAccess.getModelTypeAccess().getModeKeyword_1()); \n+ newLeafNode(lv_typeName_0_2, grammarAccess.getModelTypeAccess().getTypeNameModeKeyword_0_1());\n }\n+ \n+\t {\n+\t if ($current==null) {\n+\t $current = createModelElement(grammarAccess.getModelTypeRule());\n+\t }\n+ \t\tsetWithLastConsumed($current, \"typeName\", lv_typeName_0_2, null);\n+\t }\n \n- |\n-\tkw='state' \n+ |\t\tlv_typeName_0_3=\t'state' \n {\n- $current.merge(kw);\n- newLeafNode(kw, grammarAccess.getModelTypeAccess().getStateKeyword_2()); \n+ newLeafNode(lv_typeName_0_3, grammarAccess.getModelTypeAccess().getTypeNameStateKeyword_0_2());\n }\n+ \n+\t {\n+\t if ($current==null) {\n+\t $current = createModelElement(grammarAccess.getModelTypeRule());\n+\t }\n+ \t\tsetWithLastConsumed($current, \"typeName\", lv_typeName_0_3, null);\n+\t }\n \n- |\n-\tkw='macro' \n+ |\t\tlv_typeName_0_4=\t'macro' \n {\n- $current.merge(kw);\n- newLeafNode(kw, grammarAccess.getModelTypeAccess().getMacroKeyword_3()); \n+ newLeafNode(lv_typeName_0_4, grammarAccess.getModelTypeAccess().getTypeNameMacroKeyword_0_3());\n }\n+ \n+\t {\n+\t if ($current==null) {\n+\t $current = createModelElement(grammarAccess.getModelTypeRule());\n+\t }\n+ \t\tsetWithLastConsumed($current, \"typeName\", lv_typeName_0_4, null);\n+\t }\n \n- |\n-\tkw='function' \n+ |\t\tlv_typeName_0_5=\t'function' \n {\n- $current.merge(kw);\n- newLeafNode(kw, grammarAccess.getModelTypeAccess().getFunctionKeyword_4()); \n+ newLeafNode(lv_typeName_0_5, grammarAccess.getModelTypeAccess().getTypeNameFunctionKeyword_0_4());\n }\n+ \n+\t {\n+\t if ($current==null) {\n+\t $current = createModelElement(grammarAccess.getModelTypeRule());\n+\t }\n+ \t\tsetWithLastConsumed($current, \"typeName\", lv_typeName_0_5, null);\n+\t }\n \n- |\n-\tkw='input' \n+ |\t\tlv_typeName_0_6=\t'input' \n {\n- $current.merge(kw);\n- newLeafNode(kw, grammarAccess.getModelTypeAccess().getInputKeyword_5()); \n+ newLeafNode(lv_typeName_0_6, grammarAccess.getModelTypeAccess().getTypeNameInputKeyword_0_5());\n }\n+ \n+\t {\n+\t if ($current==null) {\n+\t $current = createModelElement(grammarAccess.getModelTypeRule());\n+\t }\n+ \t\tsetWithLastConsumed($current, \"typeName\", lv_typeName_0_6, null);\n+\t }\n+\n )\n- ;\n+\n+)\n+)\n+;\n \n \n \n@@ -857,18 +1005,18 @@ ruleModelItem returns [EObject current=null]\n )\n )(\n (\n-\t\tlv_id_1_0=RULE_ID\n+\t\tlv_name_1_0=RULE_ID\n \t\t{\n-\t\t\tnewLeafNode(lv_id_1_0, grammarAccess.getModelItemAccess().getIdIDTerminalRuleCall_1_0()); \n+\t\t\tnewLeafNode(lv_name_1_0, grammarAccess.getModelItemAccess().getNameIDTerminalRuleCall_1_0()); \n \t\t}\n \t\t{\n \t if ($current==null) {\n \t $current = createModelElement(grammarAccess.getModelItemRule());\n \t }\n \t\tsetWithLastConsumed(\n \t\t\t$current, \n- \t\t\t\"id\",\n- \t\tlv_id_1_0, \n+ \t\t\t\"name\",\n+ \t\tlv_name_1_0, \n \t\t\"ID\");\n \t }\n \n@@ -903,48 +1051,75 @@ ruleModelItem returns [EObject current=null]\n \n \n // Entry rule entryRuleListItemType\n-entryRuleListItemType returns [String current=null] \n+entryRuleListItemType returns [EObject current=null] \n \t:\n-\t{ newCompositeNode(grammarAccess.getListItemTypeRule()); } \n+\t{ newCompositeNode(grammarAccess.getListItemTypeRule()); }\n \t iv_ruleListItemType=ruleListItemType \n-\t { $current=$iv_ruleListItemType.current.getText(); } \n+\t { $current=$iv_ruleListItemType.current; } \n \t EOF \n ;\n \n // Rule ListItemType\n-ruleListItemType returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] \n+ruleListItemType returns [EObject current=null] \n @init { enterRule(); \n }\n @after { leaveRule(); }:\n (\n-\tkw='requirement' \n+(\n+(\n+\t\tlv_typeName_0_1=\t'requirement' \n {\n- $current.merge(kw);\n- newLeafNode(kw, grammarAccess.getListItemTypeAccess().getRequirementKeyword_0()); \n+ newLeafNode(lv_typeName_0_1, grammarAccess.getListItemTypeAccess().getTypeNameRequirementKeyword_0_0());\n }\n+ \n+\t {\n+\t if ($current==null) {\n+\t $current = createModelElement(grammarAccess.getListItemTypeRule());\n+\t }\n+ \t\tsetWithLastConsumed($current, \"typeName\", lv_typeName_0_1, null);\n+\t }\n \n- |\n-\tkw='goal' \n+ |\t\tlv_typeName_0_2=\t'goal' \n {\n- $current.merge(kw);\n- newLeafNode(kw, grammarAccess.getListItemTypeAccess().getGoalKeyword_1()); \n+ newLeafNode(lv_typeName_0_2, grammarAccess.getListItemTypeAccess().getTypeNameGoalKeyword_0_1());\n }\n+ \n+\t {\n+\t if ($current==null) {\n+\t $current = createModelElement(grammarAccess.getListItemTypeRule());\n+\t }\n+ \t\tsetWithLastConsumed($current, \"typeName\", lv_typeName_0_2, null);\n+\t }\n \n- |\n-\tkw='hazard' \n+ |\t\tlv_typeName_0_3=\t'hazard' \n {\n- $current.merge(kw);\n- newLeafNode(kw, grammarAccess.getListItemTypeAccess().getHazardKeyword_2()); \n+ newLeafNode(lv_typeName_0_3, grammarAccess.getListItemTypeAccess().getTypeNameHazardKeyword_0_2());\n }\n+ \n+\t {\n+\t if ($current==null) {\n+\t $current = createModelElement(grammarAccess.getListItemTypeRule());\n+\t }\n+ \t\tsetWithLastConsumed($current, \"typeName\", lv_typeName_0_3, null);\n+\t }\n \n- |\n-\tkw='constraint' \n+ |\t\tlv_typeName_0_4=\t'constraint' \n {\n- $current.merge(kw);\n- newLeafNode(kw, grammarAccess.getListItemTypeAccess().getConstraintKeyword_3()); \n+ newLeafNode(lv_typeName_0_4, grammarAccess.getListItemTypeAccess().getTypeNameConstraintKeyword_0_3());\n }\n+ \n+\t {\n+\t if ($current==null) {\n+\t $current = createModelElement(grammarAccess.getListItemTypeRule());\n+\t }\n+ \t\tsetWithLastConsumed($current, \"typeName\", lv_typeName_0_4, null);\n+\t }\n+\n )\n- ;\n+\n+)\n+)\n+;\n \n \n \n@@ -984,18 +1159,18 @@ ruleListItem returns [EObject current=null]\n )\n )(\n (\n-\t\tlv_id_1_0=RULE_ID\n+\t\tlv_name_1_0=RULE_ID\n \t\t{\n-\t\t\tnewLeafNode(lv_id_1_0, grammarAccess.getListItemAccess().getIdIDTerminalRuleCall_1_0()); \n+\t\t\tnewLeafNode(lv_name_1_0, grammarAccess.getListItemAccess().getNameIDTerminalRuleCall_1_0()); \n \t\t}\n \t\t{\n \t if ($current==null) {\n \t $current = createModelElement(grammarAccess.getListItemRule());\n \t }\n \t\tsetWithLastConsumed(\n \t\t\t$current, \n- \t\t\t\"id\",\n- \t\tlv_id_1_0, \n+ \t\t\t\"name\",\n+ \t\tlv_name_1_0, \n \t\t\"ID\");\n \t }\n \n@@ -1035,7 +1210,7 @@ ruleListItem returns [EObject current=null]\n \t}\n \n )\n-)*\totherlv_5='}' \n+)+\totherlv_5='}' \n {\n \tnewLeafNode(otherlv_5, grammarAccess.getListItemAccess().getRightCurlyBracketKeyword_3_2());\n }\n@@ -1056,7 +1231,7 @@ ruleListItem returns [EObject current=null]\n \t}\n \n )\n-)*\totherlv_8=')' \n+)+\totherlv_8=')' \n {\n \tnewLeafNode(otherlv_8, grammarAccess.getListItemAccess().getRightParenthesisKeyword_4_2());\n }\n@@ -1077,7 +1252,7 @@ ruleListItem returns [EObject current=null]\n \t}\n \n )\n-)*\totherlv_11=']' \n+)+\totherlv_11=']' \n {\n \tnewLeafNode(otherlv_11, grammarAccess.getListItemAccess().getRightSquareBracketKeyword_5_2());\n }", "raw_url": "https://github.com/nasa/CertWare/raw/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fparser%2Fantlr%2Finternal%2FInternalIntentSpecification.g", "sha": "4fc8eaa413792493d9f6a86fe2901598cd519e9d", "status": "modified" }, { "additions": 37, "blob_url": "https://github.com/nasa/CertWare/blob/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fparser%2Fantlr%2Finternal%2FInternalIntentSpecificationLexer.java", "changes": 74, "contents_url": "https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fparser%2Fantlr%2Finternal%2FInternalIntentSpecificationLexer.java?ref=27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9", "deletions": 37, "filename": "net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecificationLexer.java", "new_code": " // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1270:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1270:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1270:11: ( '^' )?\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1270:11: '^'\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1270:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1272:10: ( ( '0' .. '9' )+ )\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1272:12: ( '0' .. '9' )+\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1272:12: ( '0' .. '9' )+\n \t // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1272:13: '0' .. '9'\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1274:13: ( ( '\\\"' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\"' ) ) )* '\\\"' | '\\\\'' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\\'' ) ) )* '\\\\'' ) )\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1274:15: ( '\\\"' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\"' ) ) )* '\\\"' | '\\\\'' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\\'' ) ) )* '\\\\'' )\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1274:15: ( '\\\"' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\"' ) ) )* '\\\"' | '\\\\'' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\\'' ) ) )* '\\\\'' )\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1274:16: '\\\"' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\"' ) ) )* '\\\"'\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1274:20: ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\"' ) ) )*\n \t // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1274:21: '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' )\n \t // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1274:66: ~ ( ( '\\\\\\\\' | '\\\"' ) )\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1274:86: '\\\\'' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\\'' ) ) )* '\\\\''\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1274:91: ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\\'' ) ) )*\n \t // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1274:92: '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' )\n \t // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1274:137: ~ ( ( '\\\\\\\\' | '\\\\'' ) )\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1276:17: ( '/*' ( options {greedy=false; } : . )* '*/' )\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1276:19: '/*' ( options {greedy=false; } : . )* '*/'\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1276:24: ( options {greedy=false; } : . )*\n \t // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1276:52: .\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1278:17: ( '//' (~ ( ( '\\\\n' | '\\\\r' ) ) )* ( ( '\\\\r' )? '\\\\n' )? )\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1278:19: '//' (~ ( ( '\\\\n' | '\\\\r' ) ) )* ( ( '\\\\r' )? '\\\\n' )?\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1278:24: (~ ( ( '\\\\n' | '\\\\r' ) ) )*\n \t // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1278:24: ~ ( ( '\\\\n' | '\\\\r' ) )\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1278:40: ( ( '\\\\r' )? '\\\\n' )?\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1278:41: ( '\\\\r' )? '\\\\n'\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1278:41: ( '\\\\r' )?\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1278:41: '\\\\r'\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1280:9: ( ( ' ' | '\\\\t' | '\\\\r' | '\\\\n' )+ )\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1280:11: ( ' ' | '\\\\t' | '\\\\r' | '\\\\n' )+\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1280:11: ( ' ' | '\\\\t' | '\\\\r' | '\\\\n' )+\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1282:16: ( . )\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1282:18: .", "new_methods": [], "old_code": " // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1095:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1095:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1095:11: ( '^' )?\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1095:11: '^'\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1095:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1097:10: ( ( '0' .. '9' )+ )\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1097:12: ( '0' .. '9' )+\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1097:12: ( '0' .. '9' )+\n \t // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1097:13: '0' .. '9'\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1099:13: ( ( '\\\"' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\"' ) ) )* '\\\"' | '\\\\'' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\\'' ) ) )* '\\\\'' ) )\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1099:15: ( '\\\"' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\"' ) ) )* '\\\"' | '\\\\'' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\\'' ) ) )* '\\\\'' )\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1099:15: ( '\\\"' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\"' ) ) )* '\\\"' | '\\\\'' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\\'' ) ) )* '\\\\'' )\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1099:16: '\\\"' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\"' ) ) )* '\\\"'\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1099:20: ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\"' ) ) )*\n \t // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1099:21: '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' )\n \t // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1099:66: ~ ( ( '\\\\\\\\' | '\\\"' ) )\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1099:86: '\\\\'' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\\'' ) ) )* '\\\\''\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1099:91: ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\\'' ) ) )*\n \t // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1099:92: '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' )\n \t // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1099:137: ~ ( ( '\\\\\\\\' | '\\\\'' ) )\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1101:17: ( '/*' ( options {greedy=false; } : . )* '*/' )\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1101:19: '/*' ( options {greedy=false; } : . )* '*/'\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1101:24: ( options {greedy=false; } : . )*\n \t // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1101:52: .\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1103:17: ( '//' (~ ( ( '\\\\n' | '\\\\r' ) ) )* ( ( '\\\\r' )? '\\\\n' )? )\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1103:19: '//' (~ ( ( '\\\\n' | '\\\\r' ) ) )* ( ( '\\\\r' )? '\\\\n' )?\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1103:24: (~ ( ( '\\\\n' | '\\\\r' ) ) )*\n \t // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1103:24: ~ ( ( '\\\\n' | '\\\\r' ) )\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1103:40: ( ( '\\\\r' )? '\\\\n' )?\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1103:41: ( '\\\\r' )? '\\\\n'\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1103:41: ( '\\\\r' )?\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1103:41: '\\\\r'\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1105:9: ( ( ' ' | '\\\\t' | '\\\\r' | '\\\\n' )+ )\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1105:11: ( ' ' | '\\\\t' | '\\\\r' | '\\\\n' )+\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1105:11: ( ' ' | '\\\\t' | '\\\\r' | '\\\\n' )+\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1107:16: ( . )\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1107:18: .", "old_methods": [], "patch": "@@ -846,10 +846,10 @@ public final void mRULE_ID() throws RecognitionException {\n try {\n int _type = RULE_ID;\n int _channel = DEFAULT_TOKEN_CHANNEL;\n- // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1095:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )\n- // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1095:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*\n+ // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1270:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )\n+ // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1270:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*\n {\n- // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1095:11: ( '^' )?\n+ // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1270:11: ( '^' )?\n int alt1=2;\n int LA1_0 = input.LA(1);\n \n@@ -858,7 +858,7 @@ public final void mRULE_ID() throws RecognitionException {\n }\n switch (alt1) {\n case 1 :\n- // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1095:11: '^'\n+ // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1270:11: '^'\n {\n match('^'); \n \n@@ -876,7 +876,7 @@ public final void mRULE_ID() throws RecognitionException {\n recover(mse);\n throw mse;}\n \n- // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1095:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*\n+ // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1270:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*\n loop2:\n do {\n int alt2=2;\n@@ -925,10 +925,10 @@ public final void mRULE_INT() throws RecognitionException {\n try {\n int _type = RULE_INT;\n int _channel = DEFAULT_TOKEN_CHANNEL;\n- // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1097:10: ( ( '0' .. '9' )+ )\n- // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1097:12: ( '0' .. '9' )+\n+ // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1272:10: ( ( '0' .. '9' )+ )\n+ // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1272:12: ( '0' .. '9' )+\n {\n- // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1097:12: ( '0' .. '9' )+\n+ // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1272:12: ( '0' .. '9' )+\n int cnt3=0;\n loop3:\n do {\n@@ -942,7 +942,7 @@ public final void mRULE_INT() throws RecognitionException {\n \n switch (alt3) {\n \tcase 1 :\n- \t // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1097:13: '0' .. '9'\n+ \t // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1272:13: '0' .. '9'\n \t {\n \t matchRange('0','9'); \n \n@@ -974,10 +974,10 @@ public final void mRULE_STRING() throws RecognitionException {\n try {\n int _type = RULE_STRING;\n int _channel = DEFAULT_TOKEN_CHANNEL;\n- // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1099:13: ( ( '\\\"' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\"' ) ) )* '\\\"' | '\\\\'' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\\'' ) ) )* '\\\\'' ) )\n- // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1099:15: ( '\\\"' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\"' ) ) )* '\\\"' | '\\\\'' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\\'' ) ) )* '\\\\'' )\n+ // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1274:13: ( ( '\\\"' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\"' ) ) )* '\\\"' | '\\\\'' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\\'' ) ) )* '\\\\'' ) )\n+ // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1274:15: ( '\\\"' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\"' ) ) )* '\\\"' | '\\\\'' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\\'' ) ) )* '\\\\'' )\n {\n- // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1099:15: ( '\\\"' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\"' ) ) )* '\\\"' | '\\\\'' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\\'' ) ) )* '\\\\'' )\n+ // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1274:15: ( '\\\"' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\"' ) ) )* '\\\"' | '\\\\'' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\\'' ) ) )* '\\\\'' )\n int alt6=2;\n int LA6_0 = input.LA(1);\n \n@@ -995,10 +995,10 @@ else if ( (LA6_0=='\\'') ) {\n }\n switch (alt6) {\n case 1 :\n- // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1099:16: '\\\"' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\"' ) ) )* '\\\"'\n+ // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1274:16: '\\\"' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\"' ) ) )* '\\\"'\n {\n match('\\\"'); \n- // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1099:20: ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\"' ) ) )*\n+ // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1274:20: ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\"' ) ) )*\n loop4:\n do {\n int alt4=3;\n@@ -1014,7 +1014,7 @@ else if ( ((LA4_0>='\\u0000' && LA4_0<='!')||(LA4_0>='#' && LA4_0<='[')||(LA4_0>=\n \n switch (alt4) {\n \tcase 1 :\n- \t // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1099:21: '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' )\n+ \t // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1274:21: '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' )\n \t {\n \t match('\\\\'); \n \t if ( input.LA(1)=='\\\"'||input.LA(1)=='\\''||input.LA(1)=='\\\\'||input.LA(1)=='b'||input.LA(1)=='f'||input.LA(1)=='n'||input.LA(1)=='r'||(input.LA(1)>='t' && input.LA(1)<='u') ) {\n@@ -1030,7 +1030,7 @@ else if ( ((LA4_0>='\\u0000' && LA4_0<='!')||(LA4_0>='#' && LA4_0<='[')||(LA4_0>=\n \t }\n \t break;\n \tcase 2 :\n- \t // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1099:66: ~ ( ( '\\\\\\\\' | '\\\"' ) )\n+ \t // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1274:66: ~ ( ( '\\\\\\\\' | '\\\"' ) )\n \t {\n \t if ( (input.LA(1)>='\\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\\uFFFF') ) {\n \t input.consume();\n@@ -1055,10 +1055,10 @@ else if ( ((LA4_0>='\\u0000' && LA4_0<='!')||(LA4_0>='#' && LA4_0<='[')||(LA4_0>=\n }\n break;\n case 2 :\n- // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1099:86: '\\\\'' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\\'' ) ) )* '\\\\''\n+ // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1274:86: '\\\\'' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\\'' ) ) )* '\\\\''\n {\n match('\\''); \n- // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1099:91: ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\\'' ) ) )*\n+ // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1274:91: ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\\'' ) ) )*\n loop5:\n do {\n int alt5=3;\n@@ -1074,7 +1074,7 @@ else if ( ((LA5_0>='\\u0000' && LA5_0<='&')||(LA5_0>='(' && LA5_0<='[')||(LA5_0>=\n \n switch (alt5) {\n \tcase 1 :\n- \t // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1099:92: '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' )\n+ \t // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1274:92: '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' )\n \t {\n \t match('\\\\'); \n \t if ( input.LA(1)=='\\\"'||input.LA(1)=='\\''||input.LA(1)=='\\\\'||input.LA(1)=='b'||input.LA(1)=='f'||input.LA(1)=='n'||input.LA(1)=='r'||(input.LA(1)>='t' && input.LA(1)<='u') ) {\n@@ -1090,7 +1090,7 @@ else if ( ((LA5_0>='\\u0000' && LA5_0<='&')||(LA5_0>='(' && LA5_0<='[')||(LA5_0>=\n \t }\n \t break;\n \tcase 2 :\n- \t // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1099:137: ~ ( ( '\\\\\\\\' | '\\\\'' ) )\n+ \t // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1274:137: ~ ( ( '\\\\\\\\' | '\\\\'' ) )\n \t {\n \t if ( (input.LA(1)>='\\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\\uFFFF') ) {\n \t input.consume();\n@@ -1133,12 +1133,12 @@ public final void mRULE_ML_COMMENT() throws RecognitionException {\n try {\n int _type = RULE_ML_COMMENT;\n int _channel = DEFAULT_TOKEN_CHANNEL;\n- // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1101:17: ( '/*' ( options {greedy=false; } : . )* '*/' )\n- // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1101:19: '/*' ( options {greedy=false; } : . )* '*/'\n+ // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1276:17: ( '/*' ( options {greedy=false; } : . )* '*/' )\n+ // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1276:19: '/*' ( options {greedy=false; } : . )* '*/'\n {\n match(\"/*\"); \n \n- // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1101:24: ( options {greedy=false; } : . )*\n+ // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1276:24: ( options {greedy=false; } : . )*\n loop7:\n do {\n int alt7=2;\n@@ -1163,7 +1163,7 @@ else if ( ((LA7_0>='\\u0000' && LA7_0<=')')||(LA7_0>='+' && LA7_0<='\\uFFFF')) ) {\n \n switch (alt7) {\n \tcase 1 :\n- \t // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1101:52: .\n+ \t // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1276:52: .\n \t {\n \t matchAny(); \n \n@@ -1193,12 +1193,12 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {\n try {\n int _type = RULE_SL_COMMENT;\n int _channel = DEFAULT_TOKEN_CHANNEL;\n- // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1103:17: ( '//' (~ ( ( '\\\\n' | '\\\\r' ) ) )* ( ( '\\\\r' )? '\\\\n' )? )\n- // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1103:19: '//' (~ ( ( '\\\\n' | '\\\\r' ) ) )* ( ( '\\\\r' )? '\\\\n' )?\n+ // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1278:17: ( '//' (~ ( ( '\\\\n' | '\\\\r' ) ) )* ( ( '\\\\r' )? '\\\\n' )? )\n+ // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1278:19: '//' (~ ( ( '\\\\n' | '\\\\r' ) ) )* ( ( '\\\\r' )? '\\\\n' )?\n {\n match(\"//\"); \n \n- // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1103:24: (~ ( ( '\\\\n' | '\\\\r' ) ) )*\n+ // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1278:24: (~ ( ( '\\\\n' | '\\\\r' ) ) )*\n loop8:\n do {\n int alt8=2;\n@@ -1211,7 +1211,7 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {\n \n switch (alt8) {\n \tcase 1 :\n- \t // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1103:24: ~ ( ( '\\\\n' | '\\\\r' ) )\n+ \t // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1278:24: ~ ( ( '\\\\n' | '\\\\r' ) )\n \t {\n \t if ( (input.LA(1)>='\\u0000' && input.LA(1)<='\\t')||(input.LA(1)>='\\u000B' && input.LA(1)<='\\f')||(input.LA(1)>='\\u000E' && input.LA(1)<='\\uFFFF') ) {\n \t input.consume();\n@@ -1231,7 +1231,7 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {\n }\n } while (true);\n \n- // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1103:40: ( ( '\\\\r' )? '\\\\n' )?\n+ // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1278:40: ( ( '\\\\r' )? '\\\\n' )?\n int alt10=2;\n int LA10_0 = input.LA(1);\n \n@@ -1240,9 +1240,9 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {\n }\n switch (alt10) {\n case 1 :\n- // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1103:41: ( '\\\\r' )? '\\\\n'\n+ // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1278:41: ( '\\\\r' )? '\\\\n'\n {\n- // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1103:41: ( '\\\\r' )?\n+ // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1278:41: ( '\\\\r' )?\n int alt9=2;\n int LA9_0 = input.LA(1);\n \n@@ -1251,7 +1251,7 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {\n }\n switch (alt9) {\n case 1 :\n- // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1103:41: '\\\\r'\n+ // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1278:41: '\\\\r'\n {\n match('\\r'); \n \n@@ -1283,10 +1283,10 @@ public final void mRULE_WS() throws RecognitionException {\n try {\n int _type = RULE_WS;\n int _channel = DEFAULT_TOKEN_CHANNEL;\n- // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1105:9: ( ( ' ' | '\\\\t' | '\\\\r' | '\\\\n' )+ )\n- // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1105:11: ( ' ' | '\\\\t' | '\\\\r' | '\\\\n' )+\n+ // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1280:9: ( ( ' ' | '\\\\t' | '\\\\r' | '\\\\n' )+ )\n+ // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1280:11: ( ' ' | '\\\\t' | '\\\\r' | '\\\\n' )+\n {\n- // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1105:11: ( ' ' | '\\\\t' | '\\\\r' | '\\\\n' )+\n+ // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1280:11: ( ' ' | '\\\\t' | '\\\\r' | '\\\\n' )+\n int cnt11=0;\n loop11:\n do {\n@@ -1340,8 +1340,8 @@ public final void mRULE_ANY_OTHER() throws RecognitionException {\n try {\n int _type = RULE_ANY_OTHER;\n int _channel = DEFAULT_TOKEN_CHANNEL;\n- // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1107:16: ( . )\n- // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1107:18: .\n+ // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1282:16: ( . )\n+ // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1282:18: .\n {\n matchAny(); \n ", "raw_url": "https://github.com/nasa/CertWare/raw/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fparser%2Fantlr%2Finternal%2FInternalIntentSpecificationLexer.java", "sha": "18f7294e0031576cfeb922c0d98957cc758ceb78", "status": "modified" }, { "additions": 116, "blob_url": "https://github.com/nasa/CertWare/blob/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fserializer%2FIntentSpecificationSemanticSequencer.java", "changes": 129, "contents_url": "https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fserializer%2FIntentSpecificationSemanticSequencer.java?ref=27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9", "deletions": 13, "filename": "net.certware.intent/src-gen/net/certware/intent/serializer/IntentSpecificationSemanticSequencer.java", "new_code": "import net.certware.intent.intentSpecification.DecompositionType;\nimport net.certware.intent.intentSpecification.DocItemType;\nimport net.certware.intent.intentSpecification.IntentType;\nimport net.certware.intent.intentSpecification.ListItemType;\nimport net.certware.intent.intentSpecification.ModelType;\n\t\t\tcase IntentSpecificationPackage.DECOMPOSITION_TYPE:\n\t\t\t\tif(context == grammarAccess.getDecompositionTypeRule()) {\n\t\t\t\t\tsequence_DecompositionType(context, (DecompositionType) semanticObject); \n\t\t\t\t\treturn; \n\t\t\t\t}\n\t\t\t\telse break;\n\t\t\tcase IntentSpecificationPackage.DOC_ITEM_TYPE:\n\t\t\t\tif(context == grammarAccess.getDocItemTypeRule()) {\n\t\t\t\t\tsequence_DocItemType(context, (DocItemType) semanticObject); \n\t\t\t\t\treturn; \n\t\t\t\t}\n\t\t\t\telse break;\n\t\t\tcase IntentSpecificationPackage.INTENT_TYPE:\n\t\t\t\tif(context == grammarAccess.getIntentTypeRule()) {\n\t\t\t\t\tsequence_IntentType(context, (IntentType) semanticObject); \n\t\t\t\t\treturn; \n\t\t\t\t}\n\t\t\t\telse break;\n\t\t\tcase IntentSpecificationPackage.LIST_ITEM_TYPE:\n\t\t\t\tif(context == grammarAccess.getListItemTypeRule()) {\n\t\t\t\t\tsequence_ListItemType(context, (ListItemType) semanticObject); \n\t\t\t\t\treturn; \n\t\t\t\t}\n\t\t\t\telse break;\n\t\t\tcase IntentSpecificationPackage.MODEL_TYPE:\n\t\t\t\tif(context == grammarAccess.getModelTypeRule()) {\n\t\t\t\t\tsequence_ModelType(context, (ModelType) semanticObject); \n\t\t\t\t\treturn; \n\t\t\t\t}\n\t\t\t\telse break;\n\t/**\n\t * Constraint:\n\t * (typeName='environment' | typeName='operator' | typeName='system' | typeName='verification')\n\t */\n\tprotected void sequence_DecompositionType(EObject context, DecompositionType semanticObject) {\n\t\tgenericSequencer.createSequence(context, semanticObject);\n\t}\n\t\n\t\n\t * name=ID \n\t * (\n\t * typeName='condition' | \n\t * typeName='figure' | \n\t * typeName='break' | \n\t * typeName='model' | \n\t * typeName='paragraph' | \n\t * typeName='section' | \n\t * typeName='table'\n\t * )\n\t */\n\tprotected void sequence_DocItemType(EObject context, DocItemType semanticObject) {\n\t\tgenericSequencer.createSequence(context, semanticObject);\n\t}\n\t\n\t\n\t/**\n\t * Constraint:\n\t * (type=DocItemType name=ID ref=STRING)\n\t\t\tif(transientValues.isValueTransient(semanticObject, IntentSpecificationPackage.Literals.DOC_ITEM__NAME) == ValueTransient.YES)\n\t\t\t\terrorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, IntentSpecificationPackage.Literals.DOC_ITEM__NAME));\n\t\tfeeder.accept(grammarAccess.getDocItemAccess().getNameIDTerminalRuleCall_1_0(), semanticObject.getName());\n\t * (\n\t * typeName='basic' | \n\t * typeName='purpose' | \n\t * typeName='principles' | \n\t * typeName='models' | \n\t * typeName='design' | \n\t * typeName='implementation' | \n\t * typeName='operation'\n\t * )\n\t */\n\tprotected void sequence_IntentType(EObject context, IntentType semanticObject) {\n\t\tgenericSequencer.createSequence(context, semanticObject);\n\t}\n\t\n\t\n\t/**\n\t * Constraint:\n\t * (type=IntentType name=ID desc=STRING decompositions+=Decomposition+)\n\t/**\n\t * Constraint:\n\t * (typeName='requirement' | typeName='goal' | typeName='hazard' | typeName='constraint')\n\t */\n\tprotected void sequence_ListItemType(EObject context, ListItemType semanticObject) {\n\t\tgenericSequencer.createSequence(context, semanticObject);\n\t}\n\t\n\t\n\t * name=ID \n\t * (type=ModelType name=ID desc=STRING)\n\t\t\tif(transientValues.isValueTransient(semanticObject, IntentSpecificationPackage.Literals.MODEL_ITEM__NAME) == ValueTransient.YES)\n\t\t\t\terrorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, IntentSpecificationPackage.Literals.MODEL_ITEM__NAME));\n\t\tfeeder.accept(grammarAccess.getModelItemAccess().getNameIDTerminalRuleCall_1_0(), semanticObject.getName());\n\t * (\n\t * typeName='output' | \n\t * typeName='mode' | \n\t * typeName='state' | \n\t * typeName='macro' | \n\t * typeName='function' | \n\t * typeName='input'\n\t * )\n\t */\n\tprotected void sequence_ModelType(EObject context, ModelType semanticObject) {\n\t\tgenericSequencer.createSequence(context, semanticObject);\n\t}\n\t\n\t\n\t/**\n\t * Constraint:\n\t * (name=ID desc=STRING intents+=Intent+)\n\t * (name=ID refinements+=Refinement+)", "new_methods": [ { "arguments": [ "EObject context", " DecompositionType semanticObject" ], "filename": "net.certware.intent/src-gen/net/certware/intent/serializer/IntentSpecificationSemanticSequencer.java", "implementation": "genericSequencer.createSequence(context, semanticObject);", "signature": "void sequence_DecompositionType(EObject context, DecompositionType semanticObject)" }, { "arguments": [ "EObject context", " DocItemType semanticObject" ], "filename": "net.certware.intent/src-gen/net/certware/intent/serializer/IntentSpecificationSemanticSequencer.java", "implementation": "genericSequencer.createSequence(context, semanticObject);", "signature": "void sequence_DocItemType(EObject context, DocItemType semanticObject)" }, { "arguments": [ "EObject context", " IntentType semanticObject" ], "filename": "net.certware.intent/src-gen/net/certware/intent/serializer/IntentSpecificationSemanticSequencer.java", "implementation": "genericSequencer.createSequence(context, semanticObject);", "signature": "void sequence_IntentType(EObject context, IntentType semanticObject)" }, { "arguments": [ "EObject context", " ListItemType semanticObject" ], "filename": "net.certware.intent/src-gen/net/certware/intent/serializer/IntentSpecificationSemanticSequencer.java", "implementation": "genericSequencer.createSequence(context, semanticObject);", "signature": "void sequence_ListItemType(EObject context, ListItemType semanticObject)" }, { "arguments": [ "EObject context", " ModelType semanticObject" ], "filename": "net.certware.intent/src-gen/net/certware/intent/serializer/IntentSpecificationSemanticSequencer.java", "implementation": "genericSequencer.createSequence(context, semanticObject);", "signature": "void sequence_ModelType(EObject context, ModelType semanticObject)" } ], "old_code": "\t * id=ID \n\t * (type=DocItemType id=ID ref=STRING)\n\t\t\tif(transientValues.isValueTransient(semanticObject, IntentSpecificationPackage.Literals.DOC_ITEM__ID) == ValueTransient.YES)\n\t\t\t\terrorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, IntentSpecificationPackage.Literals.DOC_ITEM__ID));\n\t\tfeeder.accept(grammarAccess.getDocItemAccess().getIdIDTerminalRuleCall_1_0(), semanticObject.getId());\n\t * (type=IntentType id=ID desc=STRING decompositions+=Decomposition+)\n\t * id=ID \n\t * (type=ModelType id=ID desc=STRING)\n\t\t\tif(transientValues.isValueTransient(semanticObject, IntentSpecificationPackage.Literals.MODEL_ITEM__ID) == ValueTransient.YES)\n\t\t\t\terrorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, IntentSpecificationPackage.Literals.MODEL_ITEM__ID));\n\t\tfeeder.accept(grammarAccess.getModelItemAccess().getIdIDTerminalRuleCall_1_0(), semanticObject.getId());\n\t * (id=ID desc=STRING intents+=Intent+)\n\t * (id=ID refinements+=Refinement+)", "old_methods": [], "patch": "@@ -3,12 +3,17 @@\n import com.google.inject.Inject;\n import com.google.inject.Provider;\n import net.certware.intent.intentSpecification.Decomposition;\n+import net.certware.intent.intentSpecification.DecompositionType;\n import net.certware.intent.intentSpecification.DocItem;\n+import net.certware.intent.intentSpecification.DocItemType;\n import net.certware.intent.intentSpecification.Document;\n import net.certware.intent.intentSpecification.Intent;\n import net.certware.intent.intentSpecification.IntentSpecificationPackage;\n+import net.certware.intent.intentSpecification.IntentType;\n import net.certware.intent.intentSpecification.ListItem;\n+import net.certware.intent.intentSpecification.ListItemType;\n import net.certware.intent.intentSpecification.ModelItem;\n+import net.certware.intent.intentSpecification.ModelType;\n import net.certware.intent.intentSpecification.Refinement;\n import net.certware.intent.intentSpecification.Specification;\n import net.certware.intent.services.IntentSpecificationGrammarAccess;\n@@ -38,12 +43,24 @@ public void createSequence(EObject context, EObject semanticObject) {\n \t\t\t\t\treturn; \n \t\t\t\t}\n \t\t\t\telse break;\n+\t\t\tcase IntentSpecificationPackage.DECOMPOSITION_TYPE:\n+\t\t\t\tif(context == grammarAccess.getDecompositionTypeRule()) {\n+\t\t\t\t\tsequence_DecompositionType(context, (DecompositionType) semanticObject); \n+\t\t\t\t\treturn; \n+\t\t\t\t}\n+\t\t\t\telse break;\n \t\t\tcase IntentSpecificationPackage.DOC_ITEM:\n \t\t\t\tif(context == grammarAccess.getDocItemRule()) {\n \t\t\t\t\tsequence_DocItem(context, (DocItem) semanticObject); \n \t\t\t\t\treturn; \n \t\t\t\t}\n \t\t\t\telse break;\n+\t\t\tcase IntentSpecificationPackage.DOC_ITEM_TYPE:\n+\t\t\t\tif(context == grammarAccess.getDocItemTypeRule()) {\n+\t\t\t\t\tsequence_DocItemType(context, (DocItemType) semanticObject); \n+\t\t\t\t\treturn; \n+\t\t\t\t}\n+\t\t\t\telse break;\n \t\t\tcase IntentSpecificationPackage.DOCUMENT:\n \t\t\t\tif(context == grammarAccess.getDocumentRule()) {\n \t\t\t\t\tsequence_Document(context, (Document) semanticObject); \n@@ -56,18 +73,36 @@ public void createSequence(EObject context, EObject semanticObject) {\n \t\t\t\t\treturn; \n \t\t\t\t}\n \t\t\t\telse break;\n+\t\t\tcase IntentSpecificationPackage.INTENT_TYPE:\n+\t\t\t\tif(context == grammarAccess.getIntentTypeRule()) {\n+\t\t\t\t\tsequence_IntentType(context, (IntentType) semanticObject); \n+\t\t\t\t\treturn; \n+\t\t\t\t}\n+\t\t\t\telse break;\n \t\t\tcase IntentSpecificationPackage.LIST_ITEM:\n \t\t\t\tif(context == grammarAccess.getListItemRule()) {\n \t\t\t\t\tsequence_ListItem(context, (ListItem) semanticObject); \n \t\t\t\t\treturn; \n \t\t\t\t}\n \t\t\t\telse break;\n+\t\t\tcase IntentSpecificationPackage.LIST_ITEM_TYPE:\n+\t\t\t\tif(context == grammarAccess.getListItemTypeRule()) {\n+\t\t\t\t\tsequence_ListItemType(context, (ListItemType) semanticObject); \n+\t\t\t\t\treturn; \n+\t\t\t\t}\n+\t\t\t\telse break;\n \t\t\tcase IntentSpecificationPackage.MODEL_ITEM:\n \t\t\t\tif(context == grammarAccess.getModelItemRule()) {\n \t\t\t\t\tsequence_ModelItem(context, (ModelItem) semanticObject); \n \t\t\t\t\treturn; \n \t\t\t\t}\n \t\t\t\telse break;\n+\t\t\tcase IntentSpecificationPackage.MODEL_TYPE:\n+\t\t\t\tif(context == grammarAccess.getModelTypeRule()) {\n+\t\t\t\t\tsequence_ModelType(context, (ModelType) semanticObject); \n+\t\t\t\t\treturn; \n+\t\t\t\t}\n+\t\t\t\telse break;\n \t\t\tcase IntentSpecificationPackage.REFINEMENT:\n \t\t\t\tif(context == grammarAccess.getRefinementRule()) {\n \t\t\t\t\tsequence_Refinement(context, (Refinement) semanticObject); \n@@ -84,11 +119,20 @@ public void createSequence(EObject context, EObject semanticObject) {\n \t\tif (errorAcceptor != null) errorAcceptor.accept(diagnosticProvider.createInvalidContextOrTypeDiagnostic(semanticObject, context));\n \t}\n \t\n+\t/**\n+\t * Constraint:\n+\t * (typeName='environment' | typeName='operator' | typeName='system' | typeName='verification')\n+\t */\n+\tprotected void sequence_DecompositionType(EObject context, DecompositionType semanticObject) {\n+\t\tgenericSequencer.createSequence(context, semanticObject);\n+\t}\n+\t\n+\t\n \t/**\n \t * Constraint:\n \t * (\n \t * type=DecompositionType \n-\t * id=ID \n+\t * name=ID \n \t * desc=STRING \n \t * documents+=Document* \n \t * models+=ModelItem* \n@@ -102,21 +146,38 @@ protected void sequence_Decomposition(EObject context, Decomposition semanticObj\n \t\n \t/**\n \t * Constraint:\n-\t * (type=DocItemType id=ID ref=STRING)\n+\t * (\n+\t * typeName='condition' | \n+\t * typeName='figure' | \n+\t * typeName='break' | \n+\t * typeName='model' | \n+\t * typeName='paragraph' | \n+\t * typeName='section' | \n+\t * typeName='table'\n+\t * )\n+\t */\n+\tprotected void sequence_DocItemType(EObject context, DocItemType semanticObject) {\n+\t\tgenericSequencer.createSequence(context, semanticObject);\n+\t}\n+\t\n+\t\n+\t/**\n+\t * Constraint:\n+\t * (type=DocItemType name=ID ref=STRING)\n \t */\n \tprotected void sequence_DocItem(EObject context, DocItem semanticObject) {\n \t\tif(errorAcceptor != null) {\n \t\t\tif(transientValues.isValueTransient(semanticObject, IntentSpecificationPackage.Literals.DOC_ITEM__TYPE) == ValueTransient.YES)\n \t\t\t\terrorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, IntentSpecificationPackage.Literals.DOC_ITEM__TYPE));\n-\t\t\tif(transientValues.isValueTransient(semanticObject, IntentSpecificationPackage.Literals.DOC_ITEM__ID) == ValueTransient.YES)\n-\t\t\t\terrorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, IntentSpecificationPackage.Literals.DOC_ITEM__ID));\n+\t\t\tif(transientValues.isValueTransient(semanticObject, IntentSpecificationPackage.Literals.DOC_ITEM__NAME) == ValueTransient.YES)\n+\t\t\t\terrorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, IntentSpecificationPackage.Literals.DOC_ITEM__NAME));\n \t\t\tif(transientValues.isValueTransient(semanticObject, IntentSpecificationPackage.Literals.DOC_ITEM__REF) == ValueTransient.YES)\n \t\t\t\terrorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, IntentSpecificationPackage.Literals.DOC_ITEM__REF));\n \t\t}\n \t\tINodesForEObjectProvider nodes = createNodeProvider(semanticObject);\n \t\tSequenceFeeder feeder = createSequencerFeeder(semanticObject, nodes);\n \t\tfeeder.accept(grammarAccess.getDocItemAccess().getTypeDocItemTypeParserRuleCall_0_0(), semanticObject.getType());\n-\t\tfeeder.accept(grammarAccess.getDocItemAccess().getIdIDTerminalRuleCall_1_0(), semanticObject.getId());\n+\t\tfeeder.accept(grammarAccess.getDocItemAccess().getNameIDTerminalRuleCall_1_0(), semanticObject.getName());\n \t\tfeeder.accept(grammarAccess.getDocItemAccess().getRefSTRINGTerminalRuleCall_2_0(), semanticObject.getRef());\n \t\tfeeder.finish();\n \t}\n@@ -133,18 +194,44 @@ protected void sequence_Document(EObject context, Document semanticObject) {\n \t\n \t/**\n \t * Constraint:\n-\t * (type=IntentType id=ID desc=STRING decompositions+=Decomposition+)\n+\t * (\n+\t * typeName='basic' | \n+\t * typeName='purpose' | \n+\t * typeName='principles' | \n+\t * typeName='models' | \n+\t * typeName='design' | \n+\t * typeName='implementation' | \n+\t * typeName='operation'\n+\t * )\n+\t */\n+\tprotected void sequence_IntentType(EObject context, IntentType semanticObject) {\n+\t\tgenericSequencer.createSequence(context, semanticObject);\n+\t}\n+\t\n+\t\n+\t/**\n+\t * Constraint:\n+\t * (type=IntentType name=ID desc=STRING decompositions+=Decomposition+)\n \t */\n \tprotected void sequence_Intent(EObject context, Intent semanticObject) {\n \t\tgenericSequencer.createSequence(context, semanticObject);\n \t}\n \t\n \t\n+\t/**\n+\t * Constraint:\n+\t * (typeName='requirement' | typeName='goal' | typeName='hazard' | typeName='constraint')\n+\t */\n+\tprotected void sequence_ListItemType(EObject context, ListItemType semanticObject) {\n+\t\tgenericSequencer.createSequence(context, semanticObject);\n+\t}\n+\t\n+\t\n \t/**\n \t * Constraint:\n \t * (\n \t * type=ListItemType \n-\t * id=ID \n+\t * name=ID \n \t * desc=STRING \n \t * docReferences+=[DocItem|ID]* \n \t * itemReferences+=[ListItem|ID]* \n@@ -158,29 +245,45 @@ protected void sequence_ListItem(EObject context, ListItem semanticObject) {\n \t\n \t/**\n \t * Constraint:\n-\t * (type=ModelType id=ID desc=STRING)\n+\t * (type=ModelType name=ID desc=STRING)\n \t */\n \tprotected void sequence_ModelItem(EObject context, ModelItem semanticObject) {\n \t\tif(errorAcceptor != null) {\n \t\t\tif(transientValues.isValueTransient(semanticObject, IntentSpecificationPackage.Literals.MODEL_ITEM__TYPE) == ValueTransient.YES)\n \t\t\t\terrorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, IntentSpecificationPackage.Literals.MODEL_ITEM__TYPE));\n-\t\t\tif(transientValues.isValueTransient(semanticObject, IntentSpecificationPackage.Literals.MODEL_ITEM__ID) == ValueTransient.YES)\n-\t\t\t\terrorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, IntentSpecificationPackage.Literals.MODEL_ITEM__ID));\n+\t\t\tif(transientValues.isValueTransient(semanticObject, IntentSpecificationPackage.Literals.MODEL_ITEM__NAME) == ValueTransient.YES)\n+\t\t\t\terrorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, IntentSpecificationPackage.Literals.MODEL_ITEM__NAME));\n \t\t\tif(transientValues.isValueTransient(semanticObject, IntentSpecificationPackage.Literals.MODEL_ITEM__DESC) == ValueTransient.YES)\n \t\t\t\terrorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, IntentSpecificationPackage.Literals.MODEL_ITEM__DESC));\n \t\t}\n \t\tINodesForEObjectProvider nodes = createNodeProvider(semanticObject);\n \t\tSequenceFeeder feeder = createSequencerFeeder(semanticObject, nodes);\n \t\tfeeder.accept(grammarAccess.getModelItemAccess().getTypeModelTypeParserRuleCall_0_0(), semanticObject.getType());\n-\t\tfeeder.accept(grammarAccess.getModelItemAccess().getIdIDTerminalRuleCall_1_0(), semanticObject.getId());\n+\t\tfeeder.accept(grammarAccess.getModelItemAccess().getNameIDTerminalRuleCall_1_0(), semanticObject.getName());\n \t\tfeeder.accept(grammarAccess.getModelItemAccess().getDescSTRINGTerminalRuleCall_2_0(), semanticObject.getDesc());\n \t\tfeeder.finish();\n \t}\n \t\n \t\n \t/**\n \t * Constraint:\n-\t * (id=ID desc=STRING intents+=Intent+)\n+\t * (\n+\t * typeName='output' | \n+\t * typeName='mode' | \n+\t * typeName='state' | \n+\t * typeName='macro' | \n+\t * typeName='function' | \n+\t * typeName='input'\n+\t * )\n+\t */\n+\tprotected void sequence_ModelType(EObject context, ModelType semanticObject) {\n+\t\tgenericSequencer.createSequence(context, semanticObject);\n+\t}\n+\t\n+\t\n+\t/**\n+\t * Constraint:\n+\t * (name=ID desc=STRING intents+=Intent+)\n \t */\n \tprotected void sequence_Refinement(EObject context, Refinement semanticObject) {\n \t\tgenericSequencer.createSequence(context, semanticObject);\n@@ -189,7 +292,7 @@ protected void sequence_Refinement(EObject context, Refinement semanticObject) {\n \t\n \t/**\n \t * Constraint:\n-\t * (id=ID refinements+=Refinement+)\n+\t * (name=ID refinements+=Refinement+)\n \t */\n \tprotected void sequence_Specification(EObject context, Specification semanticObject) {\n \t\tgenericSequencer.createSequence(context, semanticObject);", "raw_url": "https://github.com/nasa/CertWare/raw/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fserializer%2FIntentSpecificationSemanticSequencer.java", "sha": "2abf9431b52e9a2bef30a8ef084b854fb99c6af9", "status": "modified" }, { "additions": 0, "blob_url": "https://github.com/nasa/CertWare/blob/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fserializer%2FIntentSpecificationSyntacticSequencer.java", "changes": 36, "contents_url": "https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fserializer%2FIntentSpecificationSyntacticSequencer.java?ref=27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9", "deletions": 36, "filename": "net.certware.intent/src-gen/net/certware/intent/serializer/IntentSpecificationSyntacticSequencer.java", "new_code": "", "new_methods": [], "old_code": "\tprotected AbstractElementAlias match_ListItem___LeftCurlyBracketKeyword_3_0_RightCurlyBracketKeyword_3_2__q;\n\tprotected AbstractElementAlias match_ListItem___LeftParenthesisKeyword_4_0_RightParenthesisKeyword_4_2__q;\n\tprotected AbstractElementAlias match_ListItem___LeftSquareBracketKeyword_5_0_RightSquareBracketKeyword_5_2__q;\n\t\tmatch_ListItem___LeftCurlyBracketKeyword_3_0_RightCurlyBracketKeyword_3_2__q = new GroupAlias(false, true, new TokenAlias(false, false, grammarAccess.getListItemAccess().getLeftCurlyBracketKeyword_3_0()), new TokenAlias(false, false, grammarAccess.getListItemAccess().getRightCurlyBracketKeyword_3_2()));\n\t\tmatch_ListItem___LeftParenthesisKeyword_4_0_RightParenthesisKeyword_4_2__q = new GroupAlias(false, true, new TokenAlias(false, false, grammarAccess.getListItemAccess().getLeftParenthesisKeyword_4_0()), new TokenAlias(false, false, grammarAccess.getListItemAccess().getRightParenthesisKeyword_4_2()));\n\t\tmatch_ListItem___LeftSquareBracketKeyword_5_0_RightSquareBracketKeyword_5_2__q = new GroupAlias(false, true, new TokenAlias(false, false, grammarAccess.getListItemAccess().getLeftSquareBracketKeyword_5_0()), new TokenAlias(false, false, grammarAccess.getListItemAccess().getRightSquareBracketKeyword_5_2()));\n\t\t\telse if(match_ListItem___LeftCurlyBracketKeyword_3_0_RightCurlyBracketKeyword_3_2__q.equals(syntax))\n\t\t\t\temit_ListItem___LeftCurlyBracketKeyword_3_0_RightCurlyBracketKeyword_3_2__q(semanticObject, getLastNavigableState(), syntaxNodes);\n\t\t\telse if(match_ListItem___LeftParenthesisKeyword_4_0_RightParenthesisKeyword_4_2__q.equals(syntax))\n\t\t\t\temit_ListItem___LeftParenthesisKeyword_4_0_RightParenthesisKeyword_4_2__q(semanticObject, getLastNavigableState(), syntaxNodes);\n\t\t\telse if(match_ListItem___LeftSquareBracketKeyword_5_0_RightSquareBracketKeyword_5_2__q.equals(syntax))\n\t\t\t\temit_ListItem___LeftSquareBracketKeyword_5_0_RightSquareBracketKeyword_5_2__q(semanticObject, getLastNavigableState(), syntaxNodes);\n\t/**\n\t * Syntax:\n\t * ('{' '}')?\n\t */\n\tprotected void emit_ListItem___LeftCurlyBracketKeyword_3_0_RightCurlyBracketKeyword_3_2__q(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {\n\t\tacceptNodes(transition, nodes);\n\t}\n\t\n\t/**\n\t * Syntax:\n\t * ('(' ')')?\n\t */\n\tprotected void emit_ListItem___LeftParenthesisKeyword_4_0_RightParenthesisKeyword_4_2__q(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {\n\t\tacceptNodes(transition, nodes);\n\t}\n\t\n\t/**\n\t * Syntax:\n\t * ('[' ']')?\n\t */\n\tprotected void emit_ListItem___LeftSquareBracketKeyword_5_0_RightSquareBracketKeyword_5_2__q(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {\n\t\tacceptNodes(transition, nodes);\n\t}\n\t", "old_methods": [ { "arguments": [ "EObject semanticObject", " ISynNavigable transition", " List<INode> nodes" ], "filename": "net.certware.intent/src-gen/net/certware/intent/serializer/IntentSpecificationSyntacticSequencer.java", "implementation": "acceptNodes(transition, nodes);", "signature": "void emit_ListItem___LeftCurlyBracketKeyword_3_0_RightCurlyBracketKeyword_3_2__q(EObject semanticObject, ISynNavigable transition, List<INode> nodes)" }, { "arguments": [ "EObject semanticObject", " ISynNavigable transition", " List<INode> nodes" ], "filename": "net.certware.intent/src-gen/net/certware/intent/serializer/IntentSpecificationSyntacticSequencer.java", "implementation": "acceptNodes(transition, nodes);", "signature": "void emit_ListItem___LeftParenthesisKeyword_4_0_RightParenthesisKeyword_4_2__q(EObject semanticObject, ISynNavigable transition, List<INode> nodes)" }, { "arguments": [ "EObject semanticObject", " ISynNavigable transition", " List<INode> nodes" ], "filename": "net.certware.intent/src-gen/net/certware/intent/serializer/IntentSpecificationSyntacticSequencer.java", "implementation": "acceptNodes(transition, nodes);", "signature": "void emit_ListItem___LeftSquareBracketKeyword_5_0_RightSquareBracketKeyword_5_2__q(EObject semanticObject, ISynNavigable transition, List<INode> nodes)" } ], "patch": "@@ -21,19 +21,13 @@ public class IntentSpecificationSyntacticSequencer extends AbstractSyntacticSequ\n \tprotected AbstractElementAlias match_Decomposition___LeftCurlyBracketKeyword_3_0_RightCurlyBracketKeyword_3_2__q;\n \tprotected AbstractElementAlias match_Decomposition___LeftParenthesisKeyword_5_0_RightParenthesisKeyword_5_2__q;\n \tprotected AbstractElementAlias match_Decomposition___LeftSquareBracketKeyword_4_0_RightSquareBracketKeyword_4_2__q;\n-\tprotected AbstractElementAlias match_ListItem___LeftCurlyBracketKeyword_3_0_RightCurlyBracketKeyword_3_2__q;\n-\tprotected AbstractElementAlias match_ListItem___LeftParenthesisKeyword_4_0_RightParenthesisKeyword_4_2__q;\n-\tprotected AbstractElementAlias match_ListItem___LeftSquareBracketKeyword_5_0_RightSquareBracketKeyword_5_2__q;\n \t\n \t@Inject\n \tprotected void init(IGrammarAccess access) {\n \t\tgrammarAccess = (IntentSpecificationGrammarAccess) access;\n \t\tmatch_Decomposition___LeftCurlyBracketKeyword_3_0_RightCurlyBracketKeyword_3_2__q = new GroupAlias(false, true, new TokenAlias(false, false, grammarAccess.getDecompositionAccess().getLeftCurlyBracketKeyword_3_0()), new TokenAlias(false, false, grammarAccess.getDecompositionAccess().getRightCurlyBracketKeyword_3_2()));\n \t\tmatch_Decomposition___LeftParenthesisKeyword_5_0_RightParenthesisKeyword_5_2__q = new GroupAlias(false, true, new TokenAlias(false, false, grammarAccess.getDecompositionAccess().getLeftParenthesisKeyword_5_0()), new TokenAlias(false, false, grammarAccess.getDecompositionAccess().getRightParenthesisKeyword_5_2()));\n \t\tmatch_Decomposition___LeftSquareBracketKeyword_4_0_RightSquareBracketKeyword_4_2__q = new GroupAlias(false, true, new TokenAlias(false, false, grammarAccess.getDecompositionAccess().getLeftSquareBracketKeyword_4_0()), new TokenAlias(false, false, grammarAccess.getDecompositionAccess().getRightSquareBracketKeyword_4_2()));\n-\t\tmatch_ListItem___LeftCurlyBracketKeyword_3_0_RightCurlyBracketKeyword_3_2__q = new GroupAlias(false, true, new TokenAlias(false, false, grammarAccess.getListItemAccess().getLeftCurlyBracketKeyword_3_0()), new TokenAlias(false, false, grammarAccess.getListItemAccess().getRightCurlyBracketKeyword_3_2()));\n-\t\tmatch_ListItem___LeftParenthesisKeyword_4_0_RightParenthesisKeyword_4_2__q = new GroupAlias(false, true, new TokenAlias(false, false, grammarAccess.getListItemAccess().getLeftParenthesisKeyword_4_0()), new TokenAlias(false, false, grammarAccess.getListItemAccess().getRightParenthesisKeyword_4_2()));\n-\t\tmatch_ListItem___LeftSquareBracketKeyword_5_0_RightSquareBracketKeyword_5_2__q = new GroupAlias(false, true, new TokenAlias(false, false, grammarAccess.getListItemAccess().getLeftSquareBracketKeyword_5_0()), new TokenAlias(false, false, grammarAccess.getListItemAccess().getRightSquareBracketKeyword_5_2()));\n \t}\n \t\n \t@Override\n@@ -54,12 +48,6 @@ else if(match_Decomposition___LeftParenthesisKeyword_5_0_RightParenthesisKeyword\n \t\t\t\temit_Decomposition___LeftParenthesisKeyword_5_0_RightParenthesisKeyword_5_2__q(semanticObject, getLastNavigableState(), syntaxNodes);\n \t\t\telse if(match_Decomposition___LeftSquareBracketKeyword_4_0_RightSquareBracketKeyword_4_2__q.equals(syntax))\n \t\t\t\temit_Decomposition___LeftSquareBracketKeyword_4_0_RightSquareBracketKeyword_4_2__q(semanticObject, getLastNavigableState(), syntaxNodes);\n-\t\t\telse if(match_ListItem___LeftCurlyBracketKeyword_3_0_RightCurlyBracketKeyword_3_2__q.equals(syntax))\n-\t\t\t\temit_ListItem___LeftCurlyBracketKeyword_3_0_RightCurlyBracketKeyword_3_2__q(semanticObject, getLastNavigableState(), syntaxNodes);\n-\t\t\telse if(match_ListItem___LeftParenthesisKeyword_4_0_RightParenthesisKeyword_4_2__q.equals(syntax))\n-\t\t\t\temit_ListItem___LeftParenthesisKeyword_4_0_RightParenthesisKeyword_4_2__q(semanticObject, getLastNavigableState(), syntaxNodes);\n-\t\t\telse if(match_ListItem___LeftSquareBracketKeyword_5_0_RightSquareBracketKeyword_5_2__q.equals(syntax))\n-\t\t\t\temit_ListItem___LeftSquareBracketKeyword_5_0_RightSquareBracketKeyword_5_2__q(semanticObject, getLastNavigableState(), syntaxNodes);\n \t\t\telse acceptNodes(getLastNavigableState(), syntaxNodes);\n \t\t}\n \t}\n@@ -88,28 +76,4 @@ protected void emit_Decomposition___LeftSquareBracketKeyword_4_0_RightSquareBrac\n \t\tacceptNodes(transition, nodes);\n \t}\n \t\n-\t/**\n-\t * Syntax:\n-\t * ('{' '}')?\n-\t */\n-\tprotected void emit_ListItem___LeftCurlyBracketKeyword_3_0_RightCurlyBracketKeyword_3_2__q(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {\n-\t\tacceptNodes(transition, nodes);\n-\t}\n-\t\n-\t/**\n-\t * Syntax:\n-\t * ('(' ')')?\n-\t */\n-\tprotected void emit_ListItem___LeftParenthesisKeyword_4_0_RightParenthesisKeyword_4_2__q(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {\n-\t\tacceptNodes(transition, nodes);\n-\t}\n-\t\n-\t/**\n-\t * Syntax:\n-\t * ('[' ']')?\n-\t */\n-\tprotected void emit_ListItem___LeftSquareBracketKeyword_5_0_RightSquareBracketKeyword_5_2__q(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {\n-\t\tacceptNodes(transition, nodes);\n-\t}\n-\t\n }", "raw_url": "https://github.com/nasa/CertWare/raw/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fserializer%2FIntentSpecificationSyntacticSequencer.java", "sha": "796b54e95838c36cdf8372e691e7e66f9d7748a9", "status": "modified" }, { "additions": 161, "blob_url": "https://github.com/nasa/CertWare/blob/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fservices%2FIntentSpecificationGrammarAccess.java", "changes": 392, "contents_url": "https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fservices%2FIntentSpecificationGrammarAccess.java?ref=27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9", "deletions": 231, "filename": "net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java", "new_code": "\t\tprivate final Assignment cNameAssignment_1 = (Assignment)cGroup.eContents().get(1);\n\t\tprivate final RuleCall cNameIDTerminalRuleCall_1_0 = (RuleCall)cNameAssignment_1.eContents().get(0);\n\t\t//\t\"specification\" name=ID refinements+=Refinement+;\n\t\t//\"specification\" name=ID refinements+=Refinement+\n\t\t//name=ID\n\t\tpublic Assignment getNameAssignment_1() { return cNameAssignment_1; }\n\t\tpublic RuleCall getNameIDTerminalRuleCall_1_0() { return cNameIDTerminalRuleCall_1_0; }\n\t\tprivate final Assignment cNameAssignment_1 = (Assignment)cGroup.eContents().get(1);\n\t\tprivate final RuleCall cNameIDTerminalRuleCall_1_0 = (RuleCall)cNameAssignment_1.eContents().get(0);\n\t\t//\t\"refinement\" name=ID desc=STRING intents+=Intent+;\n\t\t//\"refinement\" name=ID desc=STRING intents+=Intent+\n\t\t//name=ID\n\t\tpublic Assignment getNameAssignment_1() { return cNameAssignment_1; }\n\t\tpublic RuleCall getNameIDTerminalRuleCall_1_0() { return cNameIDTerminalRuleCall_1_0; }\n\t\tprivate final Assignment cNameAssignment_1 = (Assignment)cGroup.eContents().get(1);\n\t\tprivate final RuleCall cNameIDTerminalRuleCall_1_0 = (RuleCall)cNameAssignment_1.eContents().get(0);\n\t\t//\ttype=IntentType name=ID desc=STRING decompositions+=Decomposition+;\n\t\t//type=IntentType name=ID desc=STRING decompositions+=Decomposition+\n\t\t//name=ID\n\t\tpublic Assignment getNameAssignment_1() { return cNameAssignment_1; }\n\t\tpublic RuleCall getNameIDTerminalRuleCall_1_0() { return cNameIDTerminalRuleCall_1_0; }\n\t\tprivate final Assignment cTypeNameAssignment = (Assignment)rule.eContents().get(1);\n\t\tprivate final Alternatives cTypeNameAlternatives_0 = (Alternatives)cTypeNameAssignment.eContents().get(0);\n\t\tprivate final Keyword cTypeNameBasicKeyword_0_0 = (Keyword)cTypeNameAlternatives_0.eContents().get(0);\n\t\tprivate final Keyword cTypeNamePurposeKeyword_0_1 = (Keyword)cTypeNameAlternatives_0.eContents().get(1);\n\t\tprivate final Keyword cTypeNamePrinciplesKeyword_0_2 = (Keyword)cTypeNameAlternatives_0.eContents().get(2);\n\t\tprivate final Keyword cTypeNameModelsKeyword_0_3 = (Keyword)cTypeNameAlternatives_0.eContents().get(3);\n\t\tprivate final Keyword cTypeNameDesignKeyword_0_4 = (Keyword)cTypeNameAlternatives_0.eContents().get(4);\n\t\tprivate final Keyword cTypeNameImplementationKeyword_0_5 = (Keyword)cTypeNameAlternatives_0.eContents().get(5);\n\t\tprivate final Keyword cTypeNameOperationKeyword_0_6 = (Keyword)cTypeNameAlternatives_0.eContents().get(6);\n\t\t//\ttypeName=(\"basic\" | \"purpose\" | \"principles\" | \"models\" | \"design\" | \"implementation\" | \"operation\");\n\t\t//typeName=(\"basic\" | \"purpose\" | \"principles\" | \"models\" | \"design\" | \"implementation\" | \"operation\")\n\t\tpublic Assignment getTypeNameAssignment() { return cTypeNameAssignment; }\n\n\t\tpublic Alternatives getTypeNameAlternatives_0() { return cTypeNameAlternatives_0; }\n\t\tpublic Keyword getTypeNameBasicKeyword_0_0() { return cTypeNameBasicKeyword_0_0; }\n\t\tpublic Keyword getTypeNamePurposeKeyword_0_1() { return cTypeNamePurposeKeyword_0_1; }\n\t\tpublic Keyword getTypeNamePrinciplesKeyword_0_2() { return cTypeNamePrinciplesKeyword_0_2; }\n\t\tpublic Keyword getTypeNameModelsKeyword_0_3() { return cTypeNameModelsKeyword_0_3; }\n\t\tpublic Keyword getTypeNameDesignKeyword_0_4() { return cTypeNameDesignKeyword_0_4; }\n\t\tpublic Keyword getTypeNameImplementationKeyword_0_5() { return cTypeNameImplementationKeyword_0_5; }\n\t\tpublic Keyword getTypeNameOperationKeyword_0_6() { return cTypeNameOperationKeyword_0_6; }\n\t\tprivate final Assignment cNameAssignment_1 = (Assignment)cGroup.eContents().get(1);\n\t\tprivate final RuleCall cNameIDTerminalRuleCall_1_0 = (RuleCall)cNameAssignment_1.eContents().get(0);\n\t\t//\ttype=DecompositionType name=ID desc=STRING (\"{\" documents+=Document* \"}\")? (\"[\" models+=ModelItem* \"]\")? (\"(\"\n\t\t//type=DecompositionType name=ID desc=STRING (\"{\" documents+=Document* \"}\")? (\"[\" models+=ModelItem* \"]\")? (\"(\"\n\t\t//name=ID\n\t\tpublic Assignment getNameAssignment_1() { return cNameAssignment_1; }\n\t\tpublic RuleCall getNameIDTerminalRuleCall_1_0() { return cNameIDTerminalRuleCall_1_0; }\n\t\tprivate final Assignment cTypeNameAssignment = (Assignment)rule.eContents().get(1);\n\t\tprivate final Alternatives cTypeNameAlternatives_0 = (Alternatives)cTypeNameAssignment.eContents().get(0);\n\t\tprivate final Keyword cTypeNameEnvironmentKeyword_0_0 = (Keyword)cTypeNameAlternatives_0.eContents().get(0);\n\t\tprivate final Keyword cTypeNameOperatorKeyword_0_1 = (Keyword)cTypeNameAlternatives_0.eContents().get(1);\n\t\tprivate final Keyword cTypeNameSystemKeyword_0_2 = (Keyword)cTypeNameAlternatives_0.eContents().get(2);\n\t\tprivate final Keyword cTypeNameVerificationKeyword_0_3 = (Keyword)cTypeNameAlternatives_0.eContents().get(3);\n\t\t//\ttypeName=(\"environment\" | \"operator\" | \"system\" | \"verification\");\n\t\t//typeName=(\"environment\" | \"operator\" | \"system\" | \"verification\")\n\t\tpublic Assignment getTypeNameAssignment() { return cTypeNameAssignment; }\n\n\t\tpublic Alternatives getTypeNameAlternatives_0() { return cTypeNameAlternatives_0; }\n\t\tpublic Keyword getTypeNameEnvironmentKeyword_0_0() { return cTypeNameEnvironmentKeyword_0_0; }\n\t\tpublic Keyword getTypeNameOperatorKeyword_0_1() { return cTypeNameOperatorKeyword_0_1; }\n\t\tpublic Keyword getTypeNameSystemKeyword_0_2() { return cTypeNameSystemKeyword_0_2; }\n\t\tpublic Keyword getTypeNameVerificationKeyword_0_3() { return cTypeNameVerificationKeyword_0_3; }\n\t\tprivate final Assignment cTypeNameAssignment = (Assignment)rule.eContents().get(1);\n\t\tprivate final Alternatives cTypeNameAlternatives_0 = (Alternatives)cTypeNameAssignment.eContents().get(0);\n\t\tprivate final Keyword cTypeNameConditionKeyword_0_0 = (Keyword)cTypeNameAlternatives_0.eContents().get(0);\n\t\tprivate final Keyword cTypeNameFigureKeyword_0_1 = (Keyword)cTypeNameAlternatives_0.eContents().get(1);\n\t\tprivate final Keyword cTypeNameBreakKeyword_0_2 = (Keyword)cTypeNameAlternatives_0.eContents().get(2);\n\t\tprivate final Keyword cTypeNameModelKeyword_0_3 = (Keyword)cTypeNameAlternatives_0.eContents().get(3);\n\t\tprivate final Keyword cTypeNameParagraphKeyword_0_4 = (Keyword)cTypeNameAlternatives_0.eContents().get(4);\n\t\tprivate final Keyword cTypeNameSectionKeyword_0_5 = (Keyword)cTypeNameAlternatives_0.eContents().get(5);\n\t\tprivate final Keyword cTypeNameTableKeyword_0_6 = (Keyword)cTypeNameAlternatives_0.eContents().get(6);\n\t\t//\ttypeName=(\"condition\" | \"figure\" | \"break\" | \"model\" | \"paragraph\" | \"section\" | \"table\");\n\t\t//typeName=(\"condition\" | \"figure\" | \"break\" | \"model\" | \"paragraph\" | \"section\" | \"table\")\n\t\tpublic Assignment getTypeNameAssignment() { return cTypeNameAssignment; }\n\n\t\tpublic Alternatives getTypeNameAlternatives_0() { return cTypeNameAlternatives_0; }\n\t\tpublic Keyword getTypeNameConditionKeyword_0_0() { return cTypeNameConditionKeyword_0_0; }\n\t\tpublic Keyword getTypeNameFigureKeyword_0_1() { return cTypeNameFigureKeyword_0_1; }\n\t\tpublic Keyword getTypeNameBreakKeyword_0_2() { return cTypeNameBreakKeyword_0_2; }\n\t\tpublic Keyword getTypeNameModelKeyword_0_3() { return cTypeNameModelKeyword_0_3; }\n\t\tpublic Keyword getTypeNameParagraphKeyword_0_4() { return cTypeNameParagraphKeyword_0_4; }\n\t\tpublic Keyword getTypeNameSectionKeyword_0_5() { return cTypeNameSectionKeyword_0_5; }\n\t\tpublic Keyword getTypeNameTableKeyword_0_6() { return cTypeNameTableKeyword_0_6; }\n\t\tprivate final Assignment cNameAssignment_1 = (Assignment)cGroup.eContents().get(1);\n\t\tprivate final RuleCall cNameIDTerminalRuleCall_1_0 = (RuleCall)cNameAssignment_1.eContents().get(0);\n\t\t//\ttype=DocItemType name=ID ref=STRING \";\";\n\t\t//type=DocItemType name=ID ref=STRING \";\"\n\t\t//name=ID\n\t\tpublic Assignment getNameAssignment_1() { return cNameAssignment_1; }\n\t\tpublic RuleCall getNameIDTerminalRuleCall_1_0() { return cNameIDTerminalRuleCall_1_0; }\n\t\tprivate final Assignment cTypeNameAssignment = (Assignment)rule.eContents().get(1);\n\t\tprivate final Alternatives cTypeNameAlternatives_0 = (Alternatives)cTypeNameAssignment.eContents().get(0);\n\t\tprivate final Keyword cTypeNameOutputKeyword_0_0 = (Keyword)cTypeNameAlternatives_0.eContents().get(0);\n\t\tprivate final Keyword cTypeNameModeKeyword_0_1 = (Keyword)cTypeNameAlternatives_0.eContents().get(1);\n\t\tprivate final Keyword cTypeNameStateKeyword_0_2 = (Keyword)cTypeNameAlternatives_0.eContents().get(2);\n\t\tprivate final Keyword cTypeNameMacroKeyword_0_3 = (Keyword)cTypeNameAlternatives_0.eContents().get(3);\n\t\tprivate final Keyword cTypeNameFunctionKeyword_0_4 = (Keyword)cTypeNameAlternatives_0.eContents().get(4);\n\t\tprivate final Keyword cTypeNameInputKeyword_0_5 = (Keyword)cTypeNameAlternatives_0.eContents().get(5);\n\t\t//\ttypeName=(\"output\" | \"mode\" | \"state\" | \"macro\" | \"function\" | \"input\");\n\t\t//typeName=(\"output\" | \"mode\" | \"state\" | \"macro\" | \"function\" | \"input\")\n\t\tpublic Assignment getTypeNameAssignment() { return cTypeNameAssignment; }\n\n\t\tpublic Alternatives getTypeNameAlternatives_0() { return cTypeNameAlternatives_0; }\n\t\tpublic Keyword getTypeNameOutputKeyword_0_0() { return cTypeNameOutputKeyword_0_0; }\n\t\tpublic Keyword getTypeNameModeKeyword_0_1() { return cTypeNameModeKeyword_0_1; }\n\t\tpublic Keyword getTypeNameStateKeyword_0_2() { return cTypeNameStateKeyword_0_2; }\n\t\tpublic Keyword getTypeNameMacroKeyword_0_3() { return cTypeNameMacroKeyword_0_3; }\n\t\tpublic Keyword getTypeNameFunctionKeyword_0_4() { return cTypeNameFunctionKeyword_0_4; }\n\t\tpublic Keyword getTypeNameInputKeyword_0_5() { return cTypeNameInputKeyword_0_5; }\n\t\tprivate final Assignment cNameAssignment_1 = (Assignment)cGroup.eContents().get(1);\n\t\tprivate final RuleCall cNameIDTerminalRuleCall_1_0 = (RuleCall)cNameAssignment_1.eContents().get(0);\n\t\t//\ttype=ModelType name=ID desc=STRING \";\";\n\t\t//type=ModelType name=ID desc=STRING \";\"\n\t\t//name=ID\n\t\tpublic Assignment getNameAssignment_1() { return cNameAssignment_1; }\n\t\tpublic RuleCall getNameIDTerminalRuleCall_1_0() { return cNameIDTerminalRuleCall_1_0; }\n\t\tprivate final Assignment cTypeNameAssignment = (Assignment)rule.eContents().get(1);\n\t\tprivate final Alternatives cTypeNameAlternatives_0 = (Alternatives)cTypeNameAssignment.eContents().get(0);\n\t\tprivate final Keyword cTypeNameRequirementKeyword_0_0 = (Keyword)cTypeNameAlternatives_0.eContents().get(0);\n\t\tprivate final Keyword cTypeNameGoalKeyword_0_1 = (Keyword)cTypeNameAlternatives_0.eContents().get(1);\n\t\tprivate final Keyword cTypeNameHazardKeyword_0_2 = (Keyword)cTypeNameAlternatives_0.eContents().get(2);\n\t\tprivate final Keyword cTypeNameConstraintKeyword_0_3 = (Keyword)cTypeNameAlternatives_0.eContents().get(3);\n\t\t//\ttypeName=(\"requirement\" | \"goal\" | \"hazard\" | \"constraint\");\n\t\t//typeName=(\"requirement\" | \"goal\" | \"hazard\" | \"constraint\")\n\t\tpublic Assignment getTypeNameAssignment() { return cTypeNameAssignment; }\n\n\t\tpublic Alternatives getTypeNameAlternatives_0() { return cTypeNameAlternatives_0; }\n\t\tpublic Keyword getTypeNameRequirementKeyword_0_0() { return cTypeNameRequirementKeyword_0_0; }\n\t\tpublic Keyword getTypeNameGoalKeyword_0_1() { return cTypeNameGoalKeyword_0_1; }\n\t\tpublic Keyword getTypeNameHazardKeyword_0_2() { return cTypeNameHazardKeyword_0_2; }\n\t\tpublic Keyword getTypeNameConstraintKeyword_0_3() { return cTypeNameConstraintKeyword_0_3; }\n\t\tprivate final Assignment cNameAssignment_1 = (Assignment)cGroup.eContents().get(1);\n\t\tprivate final RuleCall cNameIDTerminalRuleCall_1_0 = (RuleCall)cNameAssignment_1.eContents().get(0);\n\t\t//\ttype=ListItemType name=ID desc=STRING (\"{\" docReferences+=[DocItem]+ \"}\")? (\"(\" itemReferences+=[ListItem]+ \")\")? (\"[\"\n\t\t//\tmodelReferences+=[ModelItem]+ \"]\")? \";\";\n\t\t//type=ListItemType name=ID desc=STRING (\"{\" docReferences+=[DocItem]+ \"}\")? (\"(\" itemReferences+=[ListItem]+ \")\")? (\"[\"\n\t\t//modelReferences+=[ModelItem]+ \"]\")? \";\"\n\t\t//name=ID\n\t\tpublic Assignment getNameAssignment_1() { return cNameAssignment_1; }\n\t\tpublic RuleCall getNameIDTerminalRuleCall_1_0() { return cNameIDTerminalRuleCall_1_0; }\n\t\t//(\"{\" docReferences+=[DocItem]+ \"}\")?\n\t\t//docReferences+=[DocItem]+\n\t\t//(\"(\" itemReferences+=[ListItem]+ \")\")?\n\t\t//itemReferences+=[ListItem]+\n\t\t//(\"[\" modelReferences+=[ModelItem]+ \"]\")?\n\t\t//modelReferences+=[ModelItem]+\n\t//\t\"specification\" name=ID refinements+=Refinement+;\n\t//\t\"refinement\" name=ID desc=STRING intents+=Intent+;\n\t//\ttype=IntentType name=ID desc=STRING decompositions+=Decomposition+;\n\t//\ttypeName=(\"basic\" | \"purpose\" | \"principles\" | \"models\" | \"design\" | \"implementation\" | \"operation\");\n\t//\ttype=DecompositionType name=ID desc=STRING (\"{\" documents+=Document* \"}\")? (\"[\" models+=ModelItem* \"]\")? (\"(\"\n\t//\ttypeName=(\"environment\" | \"operator\" | \"system\" | \"verification\");\n\t//\ttypeName=(\"condition\" | \"figure\" | \"break\" | \"model\" | \"paragraph\" | \"section\" | \"table\");\n\t//\ttype=DocItemType name=ID ref=STRING \";\";\n\t//\ttypeName=(\"output\" | \"mode\" | \"state\" | \"macro\" | \"function\" | \"input\");\n\t//\ttype=ModelType name=ID desc=STRING \";\";\n\t//\ttypeName=(\"requirement\" | \"goal\" | \"hazard\" | \"constraint\");\n\t//\ttype=ListItemType name=ID desc=STRING (\"{\" docReferences+=[DocItem]+ \"}\")? (\"(\" itemReferences+=[ListItem]+ \")\")? (\"[\"\n\t//\tmodelReferences+=[ModelItem]+ \"]\")? \";\";", "new_methods": [ { "arguments": [], "filename": "net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java", "implementation": "return cNameAssignment_1;", "signature": "Assignment getNameAssignment_1()" }, { "arguments": [], "filename": "net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java", "implementation": "return cNameIDTerminalRuleCall_1_0;", "signature": "RuleCall getNameIDTerminalRuleCall_1_0()" }, { "arguments": [], "filename": "net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java", "implementation": "return cNameAssignment_1;", "signature": "Assignment getNameAssignment_1()" }, { "arguments": [], "filename": "net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java", "implementation": "return cNameIDTerminalRuleCall_1_0;", "signature": "RuleCall getNameIDTerminalRuleCall_1_0()" }, { "arguments": [], "filename": "net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java", "implementation": "return cNameAssignment_1;", "signature": "Assignment getNameAssignment_1()" }, { "arguments": [], "filename": "net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java", "implementation": "return cNameIDTerminalRuleCall_1_0;", "signature": "RuleCall getNameIDTerminalRuleCall_1_0()" }, { "arguments": [], "filename": "net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java", "implementation": "return cTypeNameAssignment;", "signature": "Assignment getTypeNameAssignment()" }, { "arguments": [], "filename": "net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java", "implementation": "return cTypeNameAlternatives_0;", "signature": "Alternatives getTypeNameAlternatives_0()" }, { "arguments": [], "filename": "net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java", "implementation": "return cTypeNameBasicKeyword_0_0;", "signature": "Keyword getTypeNameBasicKeyword_0_0()" }, { "arguments": [], "filename": "net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java", "implementation": "return cTypeNamePurposeKeyword_0_1;", "signature": "Keyword getTypeNamePurposeKeyword_0_1()" }, { "arguments": [], "filename": "net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java", "implementation": "return cTypeNamePrinciplesKeyword_0_2;", "signature": "Keyword getTypeNamePrinciplesKeyword_0_2()" }, { "arguments": [], "filename": "net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java", "implementation": "return cTypeNameModelsKeyword_0_3;", "signature": "Keyword getTypeNameModelsKeyword_0_3()" }, { "arguments": [], "filename": "net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java", "implementation": "return cTypeNameDesignKeyword_0_4;", "signature": "Keyword getTypeNameDesignKeyword_0_4()" }, { "arguments": [], "filename": "net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java", "implementation": "return cTypeNameImplementationKeyword_0_5;", "signature": "Keyword getTypeNameImplementationKeyword_0_5()" }, { "arguments": [], "filename": "net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java", "implementation": "return cTypeNameOperationKeyword_0_6;", "signature": "Keyword getTypeNameOperationKeyword_0_6()" }, { "arguments": [], "filename": "net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java", "implementation": "return cNameAssignment_1;", "signature": "Assignment getNameAssignment_1()" }, { "arguments": [], "filename": "net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java", "implementation": "return cNameIDTerminalRuleCall_1_0;", "signature": "RuleCall getNameIDTerminalRuleCall_1_0()" }, { "arguments": [], "filename": "net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java", "implementation": "return cTypeNameAssignment;", "signature": "Assignment getTypeNameAssignment()" }, { "arguments": [], "filename": "net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java", "implementation": "return cTypeNameAlternatives_0;", "signature": "Alternatives getTypeNameAlternatives_0()" }, { "arguments": [], "filename": "net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java", "implementation": "return cTypeNameEnvironmentKeyword_0_0;", "signature": "Keyword getTypeNameEnvironmentKeyword_0_0()" }, { "arguments": [], "filename": "net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java", "implementation": "return cTypeNameOperatorKeyword_0_1;", "signature": "Keyword getTypeNameOperatorKeyword_0_1()" }, { "arguments": [], "filename": "net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java", "implementation": "return cTypeNameSystemKeyword_0_2;", "signature": "Keyword getTypeNameSystemKeyword_0_2()" }, { "arguments": [], "filename": "net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java", "implementation": "return cTypeNameVerificationKeyword_0_3;", "signature": "Keyword getTypeNameVerificationKeyword_0_3()" }, { "arguments": [], "filename": "net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java", "implementation": "return cTypeNameAssignment;", "signature": "Assignment getTypeNameAssignment()" }, { "arguments": [], "filename": "net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java", "implementation": "return cTypeNameAlternatives_0;", "signature": "Alternatives getTypeNameAlternatives_0()" }, { "arguments": [], "filename": "net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java", "implementation": "return cTypeNameConditionKeyword_0_0;", "signature": "Keyword getTypeNameConditionKeyword_0_0()" }, { "arguments": [], "filename": "net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java", "implementation": "return cTypeNameFigureKeyword_0_1;", "signature": "Keyword getTypeNameFigureKeyword_0_1()" }, { "arguments": [], "filename": "net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java", "implementation": "return cTypeNameBreakKeyword_0_2;", "signature": "Keyword getTypeNameBreakKeyword_0_2()" }, { "arguments": [], "filename": "net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java", "implementation": "return cTypeNameModelKeyword_0_3;", "signature": "Keyword getTypeNameModelKeyword_0_3()" }, { "arguments": [], "filename": "net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java", "implementation": "return cTypeNameParagraphKeyword_0_4;", "signature": "Keyword getTypeNameParagraphKeyword_0_4()" }, { "arguments": [], "filename": "net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java", "implementation": "return cTypeNameSectionKeyword_0_5;", "signature": "Keyword getTypeNameSectionKeyword_0_5()" }, { "arguments": [], "filename": "net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java", "implementation": "return cTypeNameTableKeyword_0_6;", "signature": "Keyword getTypeNameTableKeyword_0_6()" }, { "arguments": [], "filename": "net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java", "implementation": "return cNameAssignment_1;", "signature": "Assignment getNameAssignment_1()" }, { "arguments": [], "filename": "net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java", "implementation": "return cNameIDTerminalRuleCall_1_0;", "signature": "RuleCall getNameIDTerminalRuleCall_1_0()" }, { "arguments": [], "filename": "net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java", "implementation": "return cTypeNameAssignment;", "signature": "Assignment getTypeNameAssignment()" }, { "arguments": [], "filename": "net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java", "implementation": "return cTypeNameAlternatives_0;", "signature": "Alternatives getTypeNameAlternatives_0()" }, { "arguments": [], "filename": "net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java", "implementation": "return cTypeNameOutputKeyword_0_0;", "signature": "Keyword getTypeNameOutputKeyword_0_0()" }, { "arguments": [], "filename": "net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java", "implementation": "return cTypeNameModeKeyword_0_1;", "signature": "Keyword getTypeNameModeKeyword_0_1()" }, { "arguments": [], "filename": "net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java", "implementation": "return cTypeNameStateKeyword_0_2;", "signature": "Keyword getTypeNameStateKeyword_0_2()" }, { "arguments": [], "filename": "net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java", "implementation": "return cTypeNameMacroKeyword_0_3;", "signature": "Keyword getTypeNameMacroKeyword_0_3()" }, { "arguments": [], "filename": "net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java", "implementation": "return cTypeNameFunctionKeyword_0_4;", "signature": "Keyword getTypeNameFunctionKeyword_0_4()" }, { "arguments": [], "filename": "net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java", "implementation": "return cTypeNameInputKeyword_0_5;", "signature": "Keyword getTypeNameInputKeyword_0_5()" }, { "arguments": [], "filename": "net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java", "implementation": "return cNameAssignment_1;", "signature": "Assignment getNameAssignment_1()" }, { "arguments": [], "filename": "net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java", "implementation": "return cNameIDTerminalRuleCall_1_0;", "signature": "RuleCall getNameIDTerminalRuleCall_1_0()" }, { "arguments": [], "filename": "net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java", "implementation": "return cTypeNameAssignment;", "signature": "Assignment getTypeNameAssignment()" }, { "arguments": [], "filename": "net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java", "implementation": "return cTypeNameAlternatives_0;", "signature": "Alternatives getTypeNameAlternatives_0()" }, { "arguments": [], "filename": "net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java", "implementation": "return cTypeNameRequirementKeyword_0_0;", "signature": "Keyword getTypeNameRequirementKeyword_0_0()" }, { "arguments": [], "filename": "net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java", "implementation": "return cTypeNameGoalKeyword_0_1;", "signature": "Keyword getTypeNameGoalKeyword_0_1()" }, { "arguments": [], "filename": "net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java", "implementation": "return cTypeNameHazardKeyword_0_2;", "signature": "Keyword getTypeNameHazardKeyword_0_2()" }, { "arguments": [], "filename": "net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java", "implementation": "return cTypeNameConstraintKeyword_0_3;", "signature": "Keyword getTypeNameConstraintKeyword_0_3()" }, { "arguments": [], "filename": "net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java", "implementation": "return cNameAssignment_1;", "signature": "Assignment getNameAssignment_1()" }, { "arguments": [], "filename": "net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java", "implementation": "return cNameIDTerminalRuleCall_1_0;", "signature": "RuleCall getNameIDTerminalRuleCall_1_0()" } ], "old_code": "\t\tprivate final Assignment cIdAssignment_1 = (Assignment)cGroup.eContents().get(1);\n\t\tprivate final RuleCall cIdIDTerminalRuleCall_1_0 = (RuleCall)cIdAssignment_1.eContents().get(0);\n\t\t//\t\"specification\" id=ID refinements+=Refinement+;\n\t\t//\"specification\" id=ID refinements+=Refinement+\n\t\t//id=ID\n\t\tpublic Assignment getIdAssignment_1() { return cIdAssignment_1; }\n\t\tpublic RuleCall getIdIDTerminalRuleCall_1_0() { return cIdIDTerminalRuleCall_1_0; }\n\t\tprivate final Assignment cIdAssignment_1 = (Assignment)cGroup.eContents().get(1);\n\t\tprivate final RuleCall cIdIDTerminalRuleCall_1_0 = (RuleCall)cIdAssignment_1.eContents().get(0);\n\t\t//\t\"refinement\" id=ID desc=STRING intents+=Intent+;\n\t\t//\"refinement\" id=ID desc=STRING intents+=Intent+\n\t\t//id=ID\n\t\tpublic Assignment getIdAssignment_1() { return cIdAssignment_1; }\n\t\tpublic RuleCall getIdIDTerminalRuleCall_1_0() { return cIdIDTerminalRuleCall_1_0; }\n\t\tprivate final Assignment cIdAssignment_1 = (Assignment)cGroup.eContents().get(1);\n\t\tprivate final RuleCall cIdIDTerminalRuleCall_1_0 = (RuleCall)cIdAssignment_1.eContents().get(0);\n\t\t//\ttype=IntentType id=ID desc=STRING decompositions+=Decomposition+;\n\t\t//type=IntentType id=ID desc=STRING decompositions+=Decomposition+\n\t\t//id=ID\n\t\tpublic Assignment getIdAssignment_1() { return cIdAssignment_1; }\n\t\tpublic RuleCall getIdIDTerminalRuleCall_1_0() { return cIdIDTerminalRuleCall_1_0; }\n\t\tprivate final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);\n\t\tprivate final Keyword cBasicKeyword_0 = (Keyword)cAlternatives.eContents().get(0);\n\t\tprivate final Keyword cPurposeKeyword_1 = (Keyword)cAlternatives.eContents().get(1);\n\t\tprivate final Keyword cPrinciplesKeyword_2 = (Keyword)cAlternatives.eContents().get(2);\n\t\tprivate final Keyword cModelsKeyword_3 = (Keyword)cAlternatives.eContents().get(3);\n\t\tprivate final Keyword cDesignKeyword_4 = (Keyword)cAlternatives.eContents().get(4);\n\t\tprivate final Keyword cImplementationKeyword_5 = (Keyword)cAlternatives.eContents().get(5);\n\t\tprivate final Keyword cOperationKeyword_6 = (Keyword)cAlternatives.eContents().get(6);\n\t\t//\t\"basic\" | \"purpose\" | \"principles\" | \"models\" | \"design\" | \"implementation\" | \"operation\";\n\t\tpublic Alternatives getAlternatives() { return cAlternatives; }\n\t\tpublic Keyword getBasicKeyword_0() { return cBasicKeyword_0; }\n\t\tpublic Keyword getPurposeKeyword_1() { return cPurposeKeyword_1; }\n\t\tpublic Keyword getPrinciplesKeyword_2() { return cPrinciplesKeyword_2; }\n\t\tpublic Keyword getModelsKeyword_3() { return cModelsKeyword_3; }\n\t\tpublic Keyword getDesignKeyword_4() { return cDesignKeyword_4; }\n\t\tpublic Keyword getImplementationKeyword_5() { return cImplementationKeyword_5; }\n\t\tpublic Keyword getOperationKeyword_6() { return cOperationKeyword_6; }\n\t\tprivate final Assignment cIdAssignment_1 = (Assignment)cGroup.eContents().get(1);\n\t\tprivate final RuleCall cIdIDTerminalRuleCall_1_0 = (RuleCall)cIdAssignment_1.eContents().get(0);\n\t\t//\ttype=DecompositionType id=ID desc=STRING (\"{\" documents+=Document* \"}\")? (\"[\" models+=ModelItem* \"]\")? (\"(\"\n\t\t//type=DecompositionType id=ID desc=STRING (\"{\" documents+=Document* \"}\")? (\"[\" models+=ModelItem* \"]\")? (\"(\"\n\t\t//id=ID\n\t\tpublic Assignment getIdAssignment_1() { return cIdAssignment_1; }\n\t\tpublic RuleCall getIdIDTerminalRuleCall_1_0() { return cIdIDTerminalRuleCall_1_0; }\n\t\tprivate final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);\n\t\tprivate final Keyword cEnvironmentKeyword_0 = (Keyword)cAlternatives.eContents().get(0);\n\t\tprivate final Keyword cOperatorKeyword_1 = (Keyword)cAlternatives.eContents().get(1);\n\t\tprivate final Keyword cSystemKeyword_2 = (Keyword)cAlternatives.eContents().get(2);\n\t\tprivate final Keyword cVerificationKeyword_3 = (Keyword)cAlternatives.eContents().get(3);\n\t\t//\t\"environment\" | \"operator\" | \"system\" | \"verification\";\n\t\tpublic Alternatives getAlternatives() { return cAlternatives; }\n\t\tpublic Keyword getEnvironmentKeyword_0() { return cEnvironmentKeyword_0; }\n\t\tpublic Keyword getOperatorKeyword_1() { return cOperatorKeyword_1; }\n\t\tpublic Keyword getSystemKeyword_2() { return cSystemKeyword_2; }\n\t\tpublic Keyword getVerificationKeyword_3() { return cVerificationKeyword_3; }\n\t\tprivate final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);\n\t\tprivate final Keyword cConditionKeyword_0 = (Keyword)cAlternatives.eContents().get(0);\n\t\tprivate final Keyword cFigureKeyword_1 = (Keyword)cAlternatives.eContents().get(1);\n\t\tprivate final Keyword cBreakKeyword_2 = (Keyword)cAlternatives.eContents().get(2);\n\t\tprivate final Keyword cModelKeyword_3 = (Keyword)cAlternatives.eContents().get(3);\n\t\tprivate final Keyword cParagraphKeyword_4 = (Keyword)cAlternatives.eContents().get(4);\n\t\tprivate final Keyword cSectionKeyword_5 = (Keyword)cAlternatives.eContents().get(5);\n\t\tprivate final Keyword cTableKeyword_6 = (Keyword)cAlternatives.eContents().get(6);\n\t\t//\t\"condition\" | \"figure\" | \"break\" | \"model\" | \"paragraph\" | \"section\" | \"table\";\n\t\tpublic Alternatives getAlternatives() { return cAlternatives; }\n\t\tpublic Keyword getConditionKeyword_0() { return cConditionKeyword_0; }\n\t\tpublic Keyword getFigureKeyword_1() { return cFigureKeyword_1; }\n\t\tpublic Keyword getBreakKeyword_2() { return cBreakKeyword_2; }\n\t\tpublic Keyword getModelKeyword_3() { return cModelKeyword_3; }\n\t\tpublic Keyword getParagraphKeyword_4() { return cParagraphKeyword_4; }\n\t\tpublic Keyword getSectionKeyword_5() { return cSectionKeyword_5; }\n\t\tpublic Keyword getTableKeyword_6() { return cTableKeyword_6; }\n\t\tprivate final Assignment cIdAssignment_1 = (Assignment)cGroup.eContents().get(1);\n\t\tprivate final RuleCall cIdIDTerminalRuleCall_1_0 = (RuleCall)cIdAssignment_1.eContents().get(0);\n\t\t//\ttype=DocItemType id=ID ref=STRING \";\";\n\t\t//type=DocItemType id=ID ref=STRING \";\"\n\t\t//id=ID\n\t\tpublic Assignment getIdAssignment_1() { return cIdAssignment_1; }\n\t\tpublic RuleCall getIdIDTerminalRuleCall_1_0() { return cIdIDTerminalRuleCall_1_0; }\n\t\tprivate final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);\n\t\tprivate final Keyword cOutputKeyword_0 = (Keyword)cAlternatives.eContents().get(0);\n\t\tprivate final Keyword cModeKeyword_1 = (Keyword)cAlternatives.eContents().get(1);\n\t\tprivate final Keyword cStateKeyword_2 = (Keyword)cAlternatives.eContents().get(2);\n\t\tprivate final Keyword cMacroKeyword_3 = (Keyword)cAlternatives.eContents().get(3);\n\t\tprivate final Keyword cFunctionKeyword_4 = (Keyword)cAlternatives.eContents().get(4);\n\t\tprivate final Keyword cInputKeyword_5 = (Keyword)cAlternatives.eContents().get(5);\n\t\t//\t\"output\" | \"mode\" | \"state\" | \"macro\" | \"function\" | \"input\";\n\t\tpublic Alternatives getAlternatives() { return cAlternatives; }\n\t\tpublic Keyword getOutputKeyword_0() { return cOutputKeyword_0; }\n\t\tpublic Keyword getModeKeyword_1() { return cModeKeyword_1; }\n\t\tpublic Keyword getStateKeyword_2() { return cStateKeyword_2; }\n\t\tpublic Keyword getMacroKeyword_3() { return cMacroKeyword_3; }\n\t\tpublic Keyword getFunctionKeyword_4() { return cFunctionKeyword_4; }\n\t\tpublic Keyword getInputKeyword_5() { return cInputKeyword_5; }\n\t\tprivate final Assignment cIdAssignment_1 = (Assignment)cGroup.eContents().get(1);\n\t\tprivate final RuleCall cIdIDTerminalRuleCall_1_0 = (RuleCall)cIdAssignment_1.eContents().get(0);\n\t\t//\ttype=ModelType id=ID desc=STRING \";\";\n\t\t//type=ModelType id=ID desc=STRING \";\"\n\t\t//id=ID\n\t\tpublic Assignment getIdAssignment_1() { return cIdAssignment_1; }\n\t\tpublic RuleCall getIdIDTerminalRuleCall_1_0() { return cIdIDTerminalRuleCall_1_0; }\n\t\tprivate final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);\n\t\tprivate final Keyword cRequirementKeyword_0 = (Keyword)cAlternatives.eContents().get(0);\n\t\tprivate final Keyword cGoalKeyword_1 = (Keyword)cAlternatives.eContents().get(1);\n\t\tprivate final Keyword cHazardKeyword_2 = (Keyword)cAlternatives.eContents().get(2);\n\t\tprivate final Keyword cConstraintKeyword_3 = (Keyword)cAlternatives.eContents().get(3);\n\t\t//\t\"requirement\" | \"goal\" | \"hazard\" | \"constraint\";\n\t\tpublic Alternatives getAlternatives() { return cAlternatives; }\n\t\tpublic Keyword getRequirementKeyword_0() { return cRequirementKeyword_0; }\n\t\tpublic Keyword getGoalKeyword_1() { return cGoalKeyword_1; }\n\t\tpublic Keyword getHazardKeyword_2() { return cHazardKeyword_2; }\n\t\tpublic Keyword getConstraintKeyword_3() { return cConstraintKeyword_3; }\n\t\tprivate final Assignment cIdAssignment_1 = (Assignment)cGroup.eContents().get(1);\n\t\tprivate final RuleCall cIdIDTerminalRuleCall_1_0 = (RuleCall)cIdAssignment_1.eContents().get(0);\n\t\t// * / / * \n\t\t//Level0:\n\t\t//\t{Level0}\n\t\t//\t'{'\n\t\t//\t\t('Program Plan' pmp=Document)?\n\t\t//\t\t('Safety Plan' safetyPlan=Document)?\n\t\t//\t\t('Accident Definition' accidentDefinition=Document)?\n\t\t//\t\t('Safety Policy' safetyPolicy=Document)?\n\t\t//\t'}'\n\t\t//;\n\t\t//\n\t\t//Level1:\n\t\t//\t{Level1}\n\t\t//\t'{'\n\t\t//\t\t('Introduction' introduction=Document)?\n\t\t//\t\t('Historical' historical=Document)?\n\t\t//\t\t('Environment' environment=Document)?\n\t\t//\t\t('Goals' '(' goals+=GoalItem* ')' )?\n\t\t//\t\t('High-Level Requirements' '(' highLevelReqs+=RequirementItem* ')' )?\n\t\t//\t\t('System Limitations' limitations=Document)?\n\t\t//\t\t('Operator Requirements' '(' opReq+=RequirementItem* ')' )?\n\t\t//\t\t('Hazard Analysis' hazardAnalysis=Document)?\n\t\t//\t\t('Hazard List' '(' hazardList+=HazardItem* ')')?\n\t\t//\t\t('Design Constraints' '(' constraints+=ConstraintItem* ')' )?\n\t\t//\t\t('Verification and Validation' verification=Document)?\n\t\t//\t'}'\n\t\t//;\n\t\t//\n\t\t//\n\t\t//Level2:\n\t\t//\tdesc=STRING\n\t\t//\t'{'\n\t\t//\t'}'\t\n\t\t//;\n\t\t//\n\t\t//Level3:\n\t\t//\tdesc=STRING\n\t\t//\t'{'\n\t\t//\t\t('System Blackbox Behavior' '(' behaviors+=ModelItem* ')' )?\n\t\t//\t\t('User Model' '(' userModels+=ModelItem* ')' )?\n\t\t//\t\t('Verification and Validation' verification=Document )?\n\t\t//\t'}'\n\t\t//;\n\t\t//\n\t\t//\n\t\t//\ttype=ListItemType id=ID desc=STRING (\"{\" docReferences+=[DocItem]* \"}\")? (\"(\" itemReferences+=[ListItem]* \")\")? (\"[\"\n\t\t//\tmodelReferences+=[ModelItem]* \"]\")? \";\";\n\t\t//type=ListItemType id=ID desc=STRING (\"{\" docReferences+=[DocItem]* \"}\")? (\"(\" itemReferences+=[ListItem]* \")\")? (\"[\"\n\t\t//modelReferences+=[ModelItem]* \"]\")? \";\"\n\t\t//id=ID\n\t\tpublic Assignment getIdAssignment_1() { return cIdAssignment_1; }\n\t\tpublic RuleCall getIdIDTerminalRuleCall_1_0() { return cIdIDTerminalRuleCall_1_0; }\n\t\t//(\"{\" docReferences+=[DocItem]* \"}\")?\n\t\t//docReferences+=[DocItem]*\n\t\t//(\"(\" itemReferences+=[ListItem]* \")\")?\n\t\t//itemReferences+=[ListItem]*\n\t\t//(\"[\" modelReferences+=[ModelItem]* \"]\")?\n\t\t//modelReferences+=[ModelItem]*\n\t//\t\"specification\" id=ID refinements+=Refinement+;\n\t//\t\"refinement\" id=ID desc=STRING intents+=Intent+;\n\t//\ttype=IntentType id=ID desc=STRING decompositions+=Decomposition+;\n\t//\t\"basic\" | \"purpose\" | \"principles\" | \"models\" | \"design\" | \"implementation\" | \"operation\";\n\t//\ttype=DecompositionType id=ID desc=STRING (\"{\" documents+=Document* \"}\")? (\"[\" models+=ModelItem* \"]\")? (\"(\"\n\t//\t\"environment\" | \"operator\" | \"system\" | \"verification\";\n\t//\t\"condition\" | \"figure\" | \"break\" | \"model\" | \"paragraph\" | \"section\" | \"table\";\n\t//\ttype=DocItemType id=ID ref=STRING \";\";\n\t//\t\"output\" | \"mode\" | \"state\" | \"macro\" | \"function\" | \"input\";\n\t//\ttype=ModelType id=ID desc=STRING \";\";\n\t//\t\"requirement\" | \"goal\" | \"hazard\" | \"constraint\";\n\t// * / / * \n\t//Level0:\n\t//\t{Level0}\n\t//\t'{'\n\t//\t\t('Program Plan' pmp=Document)?\n\t//\t\t('Safety Plan' safetyPlan=Document)?\n\t//\t\t('Accident Definition' accidentDefinition=Document)?\n\t//\t\t('Safety Policy' safetyPolicy=Document)?\n\t//\t'}'\n\t//;\n\t//\n\t//Level1:\n\t//\t{Level1}\n\t//\t'{'\n\t//\t\t('Introduction' introduction=Document)?\n\t//\t\t('Historical' historical=Document)?\n\t//\t\t('Environment' environment=Document)?\n\t//\t\t('Goals' '(' goals+=GoalItem* ')' )?\n\t//\t\t('High-Level Requirements' '(' highLevelReqs+=RequirementItem* ')' )?\n\t//\t\t('System Limitations' limitations=Document)?\n\t//\t\t('Operator Requirements' '(' opReq+=RequirementItem* ')' )?\n\t//\t\t('Hazard Analysis' hazardAnalysis=Document)?\n\t//\t\t('Hazard List' '(' hazardList+=HazardItem* ')')?\n\t//\t\t('Design Constraints' '(' constraints+=ConstraintItem* ')' )?\n\t//\t\t('Verification and Validation' verification=Document)?\n\t//\t'}'\n\t//;\n\t//\n\t//\n\t//Level2:\n\t//\tdesc=STRING\n\t//\t'{'\n\t//\t'}'\t\n\t//;\n\t//\n\t//Level3:\n\t//\tdesc=STRING\n\t//\t'{'\n\t//\t\t('System Blackbox Behavior' '(' behaviors+=ModelItem* ')' )?\n\t//\t\t('User Model' '(' userModels+=ModelItem* ')' )?\n\t//\t\t('Verification and Validation' verification=Document )?\n\t//\t'}'\n\t//;\n\t//\n\t//\n\t//\ttype=ListItemType id=ID desc=STRING (\"{\" docReferences+=[DocItem]* \"}\")? (\"(\" itemReferences+=[ListItem]* \")\")? (\"[\"\n\t//\tmodelReferences+=[ModelItem]* \"]\")? \";\";", "old_methods": [ { "arguments": [], "filename": "net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java", "implementation": "return cIdAssignment_1;", "signature": "Assignment getIdAssignment_1()" }, { "arguments": [], "filename": "net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java", "implementation": "return cIdIDTerminalRuleCall_1_0;", "signature": "RuleCall getIdIDTerminalRuleCall_1_0()" }, { "arguments": [], "filename": "net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java", "implementation": "return cIdAssignment_1;", "signature": "Assignment getIdAssignment_1()" }, { "arguments": [], "filename": "net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java", "implementation": "return cIdIDTerminalRuleCall_1_0;", "signature": "RuleCall getIdIDTerminalRuleCall_1_0()" }, { "arguments": [], "filename": "net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java", "implementation": "return cIdAssignment_1;", "signature": "Assignment getIdAssignment_1()" }, { "arguments": [], "filename": "net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java", "implementation": "return cIdIDTerminalRuleCall_1_0;", "signature": "RuleCall getIdIDTerminalRuleCall_1_0()" }, { "arguments": [], "filename": "net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java", "implementation": "return cAlternatives;", "signature": "Alternatives getAlternatives()" }, { "arguments": [], "filename": "net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java", "implementation": "return cBasicKeyword_0;", "signature": "Keyword getBasicKeyword_0()" }, { "arguments": [], "filename": "net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java", "implementation": "return cPurposeKeyword_1;", "signature": "Keyword getPurposeKeyword_1()" }, { "arguments": [], "filename": "net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java", "implementation": "return cPrinciplesKeyword_2;", "signature": "Keyword getPrinciplesKeyword_2()" }, { "arguments": [], "filename": "net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java", "implementation": "return cModelsKeyword_3;", "signature": "Keyword getModelsKeyword_3()" }, { "arguments": [], "filename": "net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java", "implementation": "return cDesignKeyword_4;", "signature": "Keyword getDesignKeyword_4()" }, { "arguments": [], "filename": "net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java", "implementation": "return cImplementationKeyword_5;", "signature": "Keyword getImplementationKeyword_5()" }, { "arguments": [], "filename": "net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java", "implementation": "return cOperationKeyword_6;", "signature": "Keyword getOperationKeyword_6()" }, { "arguments": [], "filename": "net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java", "implementation": "return cIdAssignment_1;", "signature": "Assignment getIdAssignment_1()" }, { "arguments": [], "filename": "net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java", "implementation": "return cIdIDTerminalRuleCall_1_0;", "signature": "RuleCall getIdIDTerminalRuleCall_1_0()" }, { "arguments": [], "filename": "net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java", "implementation": "return cAlternatives;", "signature": "Alternatives getAlternatives()" }, { "arguments": [], "filename": "net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java", "implementation": "return cEnvironmentKeyword_0;", "signature": "Keyword getEnvironmentKeyword_0()" }, { "arguments": [], "filename": "net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java", "implementation": "return cOperatorKeyword_1;", "signature": "Keyword getOperatorKeyword_1()" }, { "arguments": [], "filename": "net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java", "implementation": "return cSystemKeyword_2;", "signature": "Keyword getSystemKeyword_2()" }, { "arguments": [], "filename": "net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java", "implementation": "return cVerificationKeyword_3;", "signature": "Keyword getVerificationKeyword_3()" }, { "arguments": [], "filename": "net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java", "implementation": "return cAlternatives;", "signature": "Alternatives getAlternatives()" }, { "arguments": [], "filename": "net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java", "implementation": "return cConditionKeyword_0;", "signature": "Keyword getConditionKeyword_0()" }, { "arguments": [], "filename": "net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java", "implementation": "return cFigureKeyword_1;", "signature": "Keyword getFigureKeyword_1()" }, { "arguments": [], "filename": "net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java", "implementation": "return cBreakKeyword_2;", "signature": "Keyword getBreakKeyword_2()" }, { "arguments": [], "filename": "net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java", "implementation": "return cModelKeyword_3;", "signature": "Keyword getModelKeyword_3()" }, { "arguments": [], "filename": "net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java", "implementation": "return cParagraphKeyword_4;", "signature": "Keyword getParagraphKeyword_4()" }, { "arguments": [], "filename": "net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java", "implementation": "return cSectionKeyword_5;", "signature": "Keyword getSectionKeyword_5()" }, { "arguments": [], "filename": "net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java", "implementation": "return cTableKeyword_6;", "signature": "Keyword getTableKeyword_6()" }, { "arguments": [], "filename": "net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java", "implementation": "return cIdAssignment_1;", "signature": "Assignment getIdAssignment_1()" }, { "arguments": [], "filename": "net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java", "implementation": "return cIdIDTerminalRuleCall_1_0;", "signature": "RuleCall getIdIDTerminalRuleCall_1_0()" }, { "arguments": [], "filename": "net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java", "implementation": "return cAlternatives;", "signature": "Alternatives getAlternatives()" }, { "arguments": [], "filename": "net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java", "implementation": "return cOutputKeyword_0;", "signature": "Keyword getOutputKeyword_0()" }, { "arguments": [], "filename": "net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java", "implementation": "return cModeKeyword_1;", "signature": "Keyword getModeKeyword_1()" }, { "arguments": [], "filename": "net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java", "implementation": "return cStateKeyword_2;", "signature": "Keyword getStateKeyword_2()" }, { "arguments": [], "filename": "net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java", "implementation": "return cMacroKeyword_3;", "signature": "Keyword getMacroKeyword_3()" }, { "arguments": [], "filename": "net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java", "implementation": "return cFunctionKeyword_4;", "signature": "Keyword getFunctionKeyword_4()" }, { "arguments": [], "filename": "net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java", "implementation": "return cInputKeyword_5;", "signature": "Keyword getInputKeyword_5()" }, { "arguments": [], "filename": "net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java", "implementation": "return cIdAssignment_1;", "signature": "Assignment getIdAssignment_1()" }, { "arguments": [], "filename": "net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java", "implementation": "return cIdIDTerminalRuleCall_1_0;", "signature": "RuleCall getIdIDTerminalRuleCall_1_0()" }, { "arguments": [], "filename": "net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java", "implementation": "return cAlternatives;", "signature": "Alternatives getAlternatives()" }, { "arguments": [], "filename": "net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java", "implementation": "return cRequirementKeyword_0;", "signature": "Keyword getRequirementKeyword_0()" }, { "arguments": [], "filename": "net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java", "implementation": "return cGoalKeyword_1;", "signature": "Keyword getGoalKeyword_1()" }, { "arguments": [], "filename": "net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java", "implementation": "return cHazardKeyword_2;", "signature": "Keyword getHazardKeyword_2()" }, { "arguments": [], "filename": "net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java", "implementation": "return cConstraintKeyword_3;", "signature": "Keyword getConstraintKeyword_3()" }, { "arguments": [], "filename": "net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java", "implementation": "return cIdAssignment_1;", "signature": "Assignment getIdAssignment_1()" }, { "arguments": [], "filename": "net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java", "implementation": "return cIdIDTerminalRuleCall_1_0;", "signature": "RuleCall getIdIDTerminalRuleCall_1_0()" } ], "patch": "@@ -22,28 +22,28 @@ public class SpecificationElements extends AbstractParserRuleElementFinder {\n \t\tprivate final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), \"Specification\");\n \t\tprivate final Group cGroup = (Group)rule.eContents().get(1);\n \t\tprivate final Keyword cSpecificationKeyword_0 = (Keyword)cGroup.eContents().get(0);\n-\t\tprivate final Assignment cIdAssignment_1 = (Assignment)cGroup.eContents().get(1);\n-\t\tprivate final RuleCall cIdIDTerminalRuleCall_1_0 = (RuleCall)cIdAssignment_1.eContents().get(0);\n+\t\tprivate final Assignment cNameAssignment_1 = (Assignment)cGroup.eContents().get(1);\n+\t\tprivate final RuleCall cNameIDTerminalRuleCall_1_0 = (RuleCall)cNameAssignment_1.eContents().get(0);\n \t\tprivate final Assignment cRefinementsAssignment_2 = (Assignment)cGroup.eContents().get(2);\n \t\tprivate final RuleCall cRefinementsRefinementParserRuleCall_2_0 = (RuleCall)cRefinementsAssignment_2.eContents().get(0);\n \t\t\n \t\t/// *\n \t\t// * An intent specification consists of one or more refinements.\n \t\t// * / Specification:\n-\t\t//\t\"specification\" id=ID refinements+=Refinement+;\n+\t\t//\t\"specification\" name=ID refinements+=Refinement+;\n \t\tpublic ParserRule getRule() { return rule; }\n \n-\t\t//\"specification\" id=ID refinements+=Refinement+\n+\t\t//\"specification\" name=ID refinements+=Refinement+\n \t\tpublic Group getGroup() { return cGroup; }\n \n \t\t//\"specification\"\n \t\tpublic Keyword getSpecificationKeyword_0() { return cSpecificationKeyword_0; }\n \n-\t\t//id=ID\n-\t\tpublic Assignment getIdAssignment_1() { return cIdAssignment_1; }\n+\t\t//name=ID\n+\t\tpublic Assignment getNameAssignment_1() { return cNameAssignment_1; }\n \n \t\t//ID\n-\t\tpublic RuleCall getIdIDTerminalRuleCall_1_0() { return cIdIDTerminalRuleCall_1_0; }\n+\t\tpublic RuleCall getNameIDTerminalRuleCall_1_0() { return cNameIDTerminalRuleCall_1_0; }\n \n \t\t//refinements+=Refinement+\n \t\tpublic Assignment getRefinementsAssignment_2() { return cRefinementsAssignment_2; }\n@@ -56,8 +56,8 @@ public class RefinementElements extends AbstractParserRuleElementFinder {\n \t\tprivate final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), \"Refinement\");\n \t\tprivate final Group cGroup = (Group)rule.eContents().get(1);\n \t\tprivate final Keyword cRefinementKeyword_0 = (Keyword)cGroup.eContents().get(0);\n-\t\tprivate final Assignment cIdAssignment_1 = (Assignment)cGroup.eContents().get(1);\n-\t\tprivate final RuleCall cIdIDTerminalRuleCall_1_0 = (RuleCall)cIdAssignment_1.eContents().get(0);\n+\t\tprivate final Assignment cNameAssignment_1 = (Assignment)cGroup.eContents().get(1);\n+\t\tprivate final RuleCall cNameIDTerminalRuleCall_1_0 = (RuleCall)cNameAssignment_1.eContents().get(0);\n \t\tprivate final Assignment cDescAssignment_2 = (Assignment)cGroup.eContents().get(2);\n \t\tprivate final RuleCall cDescSTRINGTerminalRuleCall_2_0 = (RuleCall)cDescAssignment_2.eContents().get(0);\n \t\tprivate final Assignment cIntentsAssignment_3 = (Assignment)cGroup.eContents().get(3);\n@@ -66,20 +66,20 @@ public class RefinementElements extends AbstractParserRuleElementFinder {\n \t\t/// *\n \t\t// * A refinement has no type and consists of one or more intents.\n \t\t// * / Refinement:\n-\t\t//\t\"refinement\" id=ID desc=STRING intents+=Intent+;\n+\t\t//\t\"refinement\" name=ID desc=STRING intents+=Intent+;\n \t\tpublic ParserRule getRule() { return rule; }\n \n-\t\t//\"refinement\" id=ID desc=STRING intents+=Intent+\n+\t\t//\"refinement\" name=ID desc=STRING intents+=Intent+\n \t\tpublic Group getGroup() { return cGroup; }\n \n \t\t//\"refinement\"\n \t\tpublic Keyword getRefinementKeyword_0() { return cRefinementKeyword_0; }\n \n-\t\t//id=ID\n-\t\tpublic Assignment getIdAssignment_1() { return cIdAssignment_1; }\n+\t\t//name=ID\n+\t\tpublic Assignment getNameAssignment_1() { return cNameAssignment_1; }\n \n \t\t//ID\n-\t\tpublic RuleCall getIdIDTerminalRuleCall_1_0() { return cIdIDTerminalRuleCall_1_0; }\n+\t\tpublic RuleCall getNameIDTerminalRuleCall_1_0() { return cNameIDTerminalRuleCall_1_0; }\n \n \t\t//desc=STRING\n \t\tpublic Assignment getDescAssignment_2() { return cDescAssignment_2; }\n@@ -99,8 +99,8 @@ public class IntentElements extends AbstractParserRuleElementFinder {\n \t\tprivate final Group cGroup = (Group)rule.eContents().get(1);\n \t\tprivate final Assignment cTypeAssignment_0 = (Assignment)cGroup.eContents().get(0);\n \t\tprivate final RuleCall cTypeIntentTypeParserRuleCall_0_0 = (RuleCall)cTypeAssignment_0.eContents().get(0);\n-\t\tprivate final Assignment cIdAssignment_1 = (Assignment)cGroup.eContents().get(1);\n-\t\tprivate final RuleCall cIdIDTerminalRuleCall_1_0 = (RuleCall)cIdAssignment_1.eContents().get(0);\n+\t\tprivate final Assignment cNameAssignment_1 = (Assignment)cGroup.eContents().get(1);\n+\t\tprivate final RuleCall cNameIDTerminalRuleCall_1_0 = (RuleCall)cNameAssignment_1.eContents().get(0);\n \t\tprivate final Assignment cDescAssignment_2 = (Assignment)cGroup.eContents().get(2);\n \t\tprivate final RuleCall cDescSTRINGTerminalRuleCall_2_0 = (RuleCall)cDescAssignment_2.eContents().get(0);\n \t\tprivate final Assignment cDecompositionsAssignment_3 = (Assignment)cGroup.eContents().get(3);\n@@ -109,10 +109,10 @@ public class IntentElements extends AbstractParserRuleElementFinder {\n \t\t/// *\n \t\t// * An intent has a type and consists of one or more decompositions. \n \t\t// * / Intent:\n-\t\t//\ttype=IntentType id=ID desc=STRING decompositions+=Decomposition+;\n+\t\t//\ttype=IntentType name=ID desc=STRING decompositions+=Decomposition+;\n \t\tpublic ParserRule getRule() { return rule; }\n \n-\t\t//type=IntentType id=ID desc=STRING decompositions+=Decomposition+\n+\t\t//type=IntentType name=ID desc=STRING decompositions+=Decomposition+\n \t\tpublic Group getGroup() { return cGroup; }\n \n \t\t//type=IntentType\n@@ -121,11 +121,11 @@ public class IntentElements extends AbstractParserRuleElementFinder {\n \t\t//IntentType\n \t\tpublic RuleCall getTypeIntentTypeParserRuleCall_0_0() { return cTypeIntentTypeParserRuleCall_0_0; }\n \n-\t\t//id=ID\n-\t\tpublic Assignment getIdAssignment_1() { return cIdAssignment_1; }\n+\t\t//name=ID\n+\t\tpublic Assignment getNameAssignment_1() { return cNameAssignment_1; }\n \n \t\t//ID\n-\t\tpublic RuleCall getIdIDTerminalRuleCall_1_0() { return cIdIDTerminalRuleCall_1_0; }\n+\t\tpublic RuleCall getNameIDTerminalRuleCall_1_0() { return cNameIDTerminalRuleCall_1_0; }\n \n \t\t//desc=STRING\n \t\tpublic Assignment getDescAssignment_2() { return cDescAssignment_2; }\n@@ -142,55 +142,59 @@ public class IntentElements extends AbstractParserRuleElementFinder {\n \n \tpublic class IntentTypeElements extends AbstractParserRuleElementFinder {\n \t\tprivate final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), \"IntentType\");\n-\t\tprivate final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);\n-\t\tprivate final Keyword cBasicKeyword_0 = (Keyword)cAlternatives.eContents().get(0);\n-\t\tprivate final Keyword cPurposeKeyword_1 = (Keyword)cAlternatives.eContents().get(1);\n-\t\tprivate final Keyword cPrinciplesKeyword_2 = (Keyword)cAlternatives.eContents().get(2);\n-\t\tprivate final Keyword cModelsKeyword_3 = (Keyword)cAlternatives.eContents().get(3);\n-\t\tprivate final Keyword cDesignKeyword_4 = (Keyword)cAlternatives.eContents().get(4);\n-\t\tprivate final Keyword cImplementationKeyword_5 = (Keyword)cAlternatives.eContents().get(5);\n-\t\tprivate final Keyword cOperationKeyword_6 = (Keyword)cAlternatives.eContents().get(6);\n+\t\tprivate final Assignment cTypeNameAssignment = (Assignment)rule.eContents().get(1);\n+\t\tprivate final Alternatives cTypeNameAlternatives_0 = (Alternatives)cTypeNameAssignment.eContents().get(0);\n+\t\tprivate final Keyword cTypeNameBasicKeyword_0_0 = (Keyword)cTypeNameAlternatives_0.eContents().get(0);\n+\t\tprivate final Keyword cTypeNamePurposeKeyword_0_1 = (Keyword)cTypeNameAlternatives_0.eContents().get(1);\n+\t\tprivate final Keyword cTypeNamePrinciplesKeyword_0_2 = (Keyword)cTypeNameAlternatives_0.eContents().get(2);\n+\t\tprivate final Keyword cTypeNameModelsKeyword_0_3 = (Keyword)cTypeNameAlternatives_0.eContents().get(3);\n+\t\tprivate final Keyword cTypeNameDesignKeyword_0_4 = (Keyword)cTypeNameAlternatives_0.eContents().get(4);\n+\t\tprivate final Keyword cTypeNameImplementationKeyword_0_5 = (Keyword)cTypeNameAlternatives_0.eContents().get(5);\n+\t\tprivate final Keyword cTypeNameOperationKeyword_0_6 = (Keyword)cTypeNameAlternatives_0.eContents().get(6);\n \t\t\n \t\t/// *\n \t\t// * Intent types refer to the different levels of the canonical model.\n \t\t// * The grammar does not enforce their universal containment in a specification.\n \t\t// * A proper intention specification should contain an intent of each type in each refinement.\n \t\t// * / IntentType:\n-\t\t//\t\"basic\" | \"purpose\" | \"principles\" | \"models\" | \"design\" | \"implementation\" | \"operation\";\n+\t\t//\ttypeName=(\"basic\" | \"purpose\" | \"principles\" | \"models\" | \"design\" | \"implementation\" | \"operation\");\n \t\tpublic ParserRule getRule() { return rule; }\n \n+\t\t//typeName=(\"basic\" | \"purpose\" | \"principles\" | \"models\" | \"design\" | \"implementation\" | \"operation\")\n+\t\tpublic Assignment getTypeNameAssignment() { return cTypeNameAssignment; }\n+\n \t\t//\"basic\" | \"purpose\" | \"principles\" | \"models\" | \"design\" | \"implementation\" | \"operation\"\n-\t\tpublic Alternatives getAlternatives() { return cAlternatives; }\n+\t\tpublic Alternatives getTypeNameAlternatives_0() { return cTypeNameAlternatives_0; }\n \n \t\t//\"basic\"\n-\t\tpublic Keyword getBasicKeyword_0() { return cBasicKeyword_0; }\n+\t\tpublic Keyword getTypeNameBasicKeyword_0_0() { return cTypeNameBasicKeyword_0_0; }\n \n \t\t//\"purpose\"\n-\t\tpublic Keyword getPurposeKeyword_1() { return cPurposeKeyword_1; }\n+\t\tpublic Keyword getTypeNamePurposeKeyword_0_1() { return cTypeNamePurposeKeyword_0_1; }\n \n \t\t//\"principles\"\n-\t\tpublic Keyword getPrinciplesKeyword_2() { return cPrinciplesKeyword_2; }\n+\t\tpublic Keyword getTypeNamePrinciplesKeyword_0_2() { return cTypeNamePrinciplesKeyword_0_2; }\n \n \t\t//\"models\"\n-\t\tpublic Keyword getModelsKeyword_3() { return cModelsKeyword_3; }\n+\t\tpublic Keyword getTypeNameModelsKeyword_0_3() { return cTypeNameModelsKeyword_0_3; }\n \n \t\t//\"design\"\n-\t\tpublic Keyword getDesignKeyword_4() { return cDesignKeyword_4; }\n+\t\tpublic Keyword getTypeNameDesignKeyword_0_4() { return cTypeNameDesignKeyword_0_4; }\n \n \t\t//\"implementation\"\n-\t\tpublic Keyword getImplementationKeyword_5() { return cImplementationKeyword_5; }\n+\t\tpublic Keyword getTypeNameImplementationKeyword_0_5() { return cTypeNameImplementationKeyword_0_5; }\n \n \t\t//\"operation\"\n-\t\tpublic Keyword getOperationKeyword_6() { return cOperationKeyword_6; }\n+\t\tpublic Keyword getTypeNameOperationKeyword_0_6() { return cTypeNameOperationKeyword_0_6; }\n \t}\n \n \tpublic class DecompositionElements extends AbstractParserRuleElementFinder {\n \t\tprivate final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), \"Decomposition\");\n \t\tprivate final Group cGroup = (Group)rule.eContents().get(1);\n \t\tprivate final Assignment cTypeAssignment_0 = (Assignment)cGroup.eContents().get(0);\n \t\tprivate final RuleCall cTypeDecompositionTypeParserRuleCall_0_0 = (RuleCall)cTypeAssignment_0.eContents().get(0);\n-\t\tprivate final Assignment cIdAssignment_1 = (Assignment)cGroup.eContents().get(1);\n-\t\tprivate final RuleCall cIdIDTerminalRuleCall_1_0 = (RuleCall)cIdAssignment_1.eContents().get(0);\n+\t\tprivate final Assignment cNameAssignment_1 = (Assignment)cGroup.eContents().get(1);\n+\t\tprivate final RuleCall cNameIDTerminalRuleCall_1_0 = (RuleCall)cNameAssignment_1.eContents().get(0);\n \t\tprivate final Assignment cDescAssignment_2 = (Assignment)cGroup.eContents().get(2);\n \t\tprivate final RuleCall cDescSTRINGTerminalRuleCall_2_0 = (RuleCall)cDescAssignment_2.eContents().get(0);\n \t\tprivate final Group cGroup_3 = (Group)cGroup.eContents().get(3);\n@@ -212,11 +216,11 @@ public class DecompositionElements extends AbstractParserRuleElementFinder {\n \t\t/// *\n \t\t// * A decomposition has a type and consists of one or more models, documents, or items.\n \t\t// * / Decomposition:\n-\t\t//\ttype=DecompositionType id=ID desc=STRING (\"{\" documents+=Document* \"}\")? (\"[\" models+=ModelItem* \"]\")? (\"(\"\n+\t\t//\ttype=DecompositionType name=ID desc=STRING (\"{\" documents+=Document* \"}\")? (\"[\" models+=ModelItem* \"]\")? (\"(\"\n \t\t//\titems+=ListItem* \")\")?;\n \t\tpublic ParserRule getRule() { return rule; }\n \n-\t\t//type=DecompositionType id=ID desc=STRING (\"{\" documents+=Document* \"}\")? (\"[\" models+=ModelItem* \"]\")? (\"(\"\n+\t\t//type=DecompositionType name=ID desc=STRING (\"{\" documents+=Document* \"}\")? (\"[\" models+=ModelItem* \"]\")? (\"(\"\n \t\t//items+=ListItem* \")\")?\n \t\tpublic Group getGroup() { return cGroup; }\n \n@@ -226,11 +230,11 @@ public class DecompositionElements extends AbstractParserRuleElementFinder {\n \t\t//DecompositionType\n \t\tpublic RuleCall getTypeDecompositionTypeParserRuleCall_0_0() { return cTypeDecompositionTypeParserRuleCall_0_0; }\n \n-\t\t//id=ID\n-\t\tpublic Assignment getIdAssignment_1() { return cIdAssignment_1; }\n+\t\t//name=ID\n+\t\tpublic Assignment getNameAssignment_1() { return cNameAssignment_1; }\n \n \t\t//ID\n-\t\tpublic RuleCall getIdIDTerminalRuleCall_1_0() { return cIdIDTerminalRuleCall_1_0; }\n+\t\tpublic RuleCall getNameIDTerminalRuleCall_1_0() { return cNameIDTerminalRuleCall_1_0; }\n \n \t\t//desc=STRING\n \t\tpublic Assignment getDescAssignment_2() { return cDescAssignment_2; }\n@@ -286,30 +290,34 @@ public class DecompositionElements extends AbstractParserRuleElementFinder {\n \n \tpublic class DecompositionTypeElements extends AbstractParserRuleElementFinder {\n \t\tprivate final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), \"DecompositionType\");\n-\t\tprivate final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);\n-\t\tprivate final Keyword cEnvironmentKeyword_0 = (Keyword)cAlternatives.eContents().get(0);\n-\t\tprivate final Keyword cOperatorKeyword_1 = (Keyword)cAlternatives.eContents().get(1);\n-\t\tprivate final Keyword cSystemKeyword_2 = (Keyword)cAlternatives.eContents().get(2);\n-\t\tprivate final Keyword cVerificationKeyword_3 = (Keyword)cAlternatives.eContents().get(3);\n+\t\tprivate final Assignment cTypeNameAssignment = (Assignment)rule.eContents().get(1);\n+\t\tprivate final Alternatives cTypeNameAlternatives_0 = (Alternatives)cTypeNameAssignment.eContents().get(0);\n+\t\tprivate final Keyword cTypeNameEnvironmentKeyword_0_0 = (Keyword)cTypeNameAlternatives_0.eContents().get(0);\n+\t\tprivate final Keyword cTypeNameOperatorKeyword_0_1 = (Keyword)cTypeNameAlternatives_0.eContents().get(1);\n+\t\tprivate final Keyword cTypeNameSystemKeyword_0_2 = (Keyword)cTypeNameAlternatives_0.eContents().get(2);\n+\t\tprivate final Keyword cTypeNameVerificationKeyword_0_3 = (Keyword)cTypeNameAlternatives_0.eContents().get(3);\n \t\t\n \t\t//DecompositionType:\n-\t\t//\t\"environment\" | \"operator\" | \"system\" | \"verification\";\n+\t\t//\ttypeName=(\"environment\" | \"operator\" | \"system\" | \"verification\");\n \t\tpublic ParserRule getRule() { return rule; }\n \n+\t\t//typeName=(\"environment\" | \"operator\" | \"system\" | \"verification\")\n+\t\tpublic Assignment getTypeNameAssignment() { return cTypeNameAssignment; }\n+\n \t\t//\"environment\" | \"operator\" | \"system\" | \"verification\"\n-\t\tpublic Alternatives getAlternatives() { return cAlternatives; }\n+\t\tpublic Alternatives getTypeNameAlternatives_0() { return cTypeNameAlternatives_0; }\n \n \t\t//\"environment\"\n-\t\tpublic Keyword getEnvironmentKeyword_0() { return cEnvironmentKeyword_0; }\n+\t\tpublic Keyword getTypeNameEnvironmentKeyword_0_0() { return cTypeNameEnvironmentKeyword_0_0; }\n \n \t\t//\"operator\"\n-\t\tpublic Keyword getOperatorKeyword_1() { return cOperatorKeyword_1; }\n+\t\tpublic Keyword getTypeNameOperatorKeyword_0_1() { return cTypeNameOperatorKeyword_0_1; }\n \n \t\t//\"system\"\n-\t\tpublic Keyword getSystemKeyword_2() { return cSystemKeyword_2; }\n+\t\tpublic Keyword getTypeNameSystemKeyword_0_2() { return cTypeNameSystemKeyword_0_2; }\n \n \t\t//\"verification\"\n-\t\tpublic Keyword getVerificationKeyword_3() { return cVerificationKeyword_3; }\n+\t\tpublic Keyword getTypeNameVerificationKeyword_0_3() { return cTypeNameVerificationKeyword_0_3; }\n \t}\n \n \tpublic class DocumentElements extends AbstractParserRuleElementFinder {\n@@ -342,60 +350,64 @@ public class DocumentElements extends AbstractParserRuleElementFinder {\n \n \tpublic class DocItemTypeElements extends AbstractParserRuleElementFinder {\n \t\tprivate final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), \"DocItemType\");\n-\t\tprivate final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);\n-\t\tprivate final Keyword cConditionKeyword_0 = (Keyword)cAlternatives.eContents().get(0);\n-\t\tprivate final Keyword cFigureKeyword_1 = (Keyword)cAlternatives.eContents().get(1);\n-\t\tprivate final Keyword cBreakKeyword_2 = (Keyword)cAlternatives.eContents().get(2);\n-\t\tprivate final Keyword cModelKeyword_3 = (Keyword)cAlternatives.eContents().get(3);\n-\t\tprivate final Keyword cParagraphKeyword_4 = (Keyword)cAlternatives.eContents().get(4);\n-\t\tprivate final Keyword cSectionKeyword_5 = (Keyword)cAlternatives.eContents().get(5);\n-\t\tprivate final Keyword cTableKeyword_6 = (Keyword)cAlternatives.eContents().get(6);\n+\t\tprivate final Assignment cTypeNameAssignment = (Assignment)rule.eContents().get(1);\n+\t\tprivate final Alternatives cTypeNameAlternatives_0 = (Alternatives)cTypeNameAssignment.eContents().get(0);\n+\t\tprivate final Keyword cTypeNameConditionKeyword_0_0 = (Keyword)cTypeNameAlternatives_0.eContents().get(0);\n+\t\tprivate final Keyword cTypeNameFigureKeyword_0_1 = (Keyword)cTypeNameAlternatives_0.eContents().get(1);\n+\t\tprivate final Keyword cTypeNameBreakKeyword_0_2 = (Keyword)cTypeNameAlternatives_0.eContents().get(2);\n+\t\tprivate final Keyword cTypeNameModelKeyword_0_3 = (Keyword)cTypeNameAlternatives_0.eContents().get(3);\n+\t\tprivate final Keyword cTypeNameParagraphKeyword_0_4 = (Keyword)cTypeNameAlternatives_0.eContents().get(4);\n+\t\tprivate final Keyword cTypeNameSectionKeyword_0_5 = (Keyword)cTypeNameAlternatives_0.eContents().get(5);\n+\t\tprivate final Keyword cTypeNameTableKeyword_0_6 = (Keyword)cTypeNameAlternatives_0.eContents().get(6);\n \t\t\n \t\t//DocItemType:\n-\t\t//\t\"condition\" | \"figure\" | \"break\" | \"model\" | \"paragraph\" | \"section\" | \"table\";\n+\t\t//\ttypeName=(\"condition\" | \"figure\" | \"break\" | \"model\" | \"paragraph\" | \"section\" | \"table\");\n \t\tpublic ParserRule getRule() { return rule; }\n \n+\t\t//typeName=(\"condition\" | \"figure\" | \"break\" | \"model\" | \"paragraph\" | \"section\" | \"table\")\n+\t\tpublic Assignment getTypeNameAssignment() { return cTypeNameAssignment; }\n+\n \t\t//\"condition\" | \"figure\" | \"break\" | \"model\" | \"paragraph\" | \"section\" | \"table\"\n-\t\tpublic Alternatives getAlternatives() { return cAlternatives; }\n+\t\tpublic Alternatives getTypeNameAlternatives_0() { return cTypeNameAlternatives_0; }\n \n \t\t//\"condition\"\n-\t\tpublic Keyword getConditionKeyword_0() { return cConditionKeyword_0; }\n+\t\tpublic Keyword getTypeNameConditionKeyword_0_0() { return cTypeNameConditionKeyword_0_0; }\n \n \t\t//\"figure\"\n-\t\tpublic Keyword getFigureKeyword_1() { return cFigureKeyword_1; }\n+\t\tpublic Keyword getTypeNameFigureKeyword_0_1() { return cTypeNameFigureKeyword_0_1; }\n \n \t\t//\"break\"\n-\t\tpublic Keyword getBreakKeyword_2() { return cBreakKeyword_2; }\n+\t\tpublic Keyword getTypeNameBreakKeyword_0_2() { return cTypeNameBreakKeyword_0_2; }\n \n \t\t//\"model\"\n-\t\tpublic Keyword getModelKeyword_3() { return cModelKeyword_3; }\n+\t\tpublic Keyword getTypeNameModelKeyword_0_3() { return cTypeNameModelKeyword_0_3; }\n \n \t\t//\"paragraph\"\n-\t\tpublic Keyword getParagraphKeyword_4() { return cParagraphKeyword_4; }\n+\t\tpublic Keyword getTypeNameParagraphKeyword_0_4() { return cTypeNameParagraphKeyword_0_4; }\n \n \t\t//\"section\"\n-\t\tpublic Keyword getSectionKeyword_5() { return cSectionKeyword_5; }\n+\t\tpublic Keyword getTypeNameSectionKeyword_0_5() { return cTypeNameSectionKeyword_0_5; }\n \n \t\t//\"table\"\n-\t\tpublic Keyword getTableKeyword_6() { return cTableKeyword_6; }\n+\t\tpublic Keyword getTypeNameTableKeyword_0_6() { return cTypeNameTableKeyword_0_6; }\n \t}\n \n \tpublic class DocItemElements extends AbstractParserRuleElementFinder {\n \t\tprivate final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), \"DocItem\");\n \t\tprivate final Group cGroup = (Group)rule.eContents().get(1);\n \t\tprivate final Assignment cTypeAssignment_0 = (Assignment)cGroup.eContents().get(0);\n \t\tprivate final RuleCall cTypeDocItemTypeParserRuleCall_0_0 = (RuleCall)cTypeAssignment_0.eContents().get(0);\n-\t\tprivate final Assignment cIdAssignment_1 = (Assignment)cGroup.eContents().get(1);\n-\t\tprivate final RuleCall cIdIDTerminalRuleCall_1_0 = (RuleCall)cIdAssignment_1.eContents().get(0);\n+\t\tprivate final Assignment cNameAssignment_1 = (Assignment)cGroup.eContents().get(1);\n+\t\tprivate final RuleCall cNameIDTerminalRuleCall_1_0 = (RuleCall)cNameAssignment_1.eContents().get(0);\n \t\tprivate final Assignment cRefAssignment_2 = (Assignment)cGroup.eContents().get(2);\n \t\tprivate final RuleCall cRefSTRINGTerminalRuleCall_2_0 = (RuleCall)cRefAssignment_2.eContents().get(0);\n \t\tprivate final Keyword cSemicolonKeyword_3 = (Keyword)cGroup.eContents().get(3);\n \t\t\n \t\t//DocItem:\n-\t\t//\ttype=DocItemType id=ID ref=STRING \";\";\n+\t\t//\ttype=DocItemType name=ID ref=STRING \";\";\n \t\tpublic ParserRule getRule() { return rule; }\n \n-\t\t//type=DocItemType id=ID ref=STRING \";\"\n+\t\t//type=DocItemType name=ID ref=STRING \";\"\n \t\tpublic Group getGroup() { return cGroup; }\n \n \t\t//type=DocItemType\n@@ -404,11 +416,11 @@ public class DocItemElements extends AbstractParserRuleElementFinder {\n \t\t//DocItemType\n \t\tpublic RuleCall getTypeDocItemTypeParserRuleCall_0_0() { return cTypeDocItemTypeParserRuleCall_0_0; }\n \n-\t\t//id=ID\n-\t\tpublic Assignment getIdAssignment_1() { return cIdAssignment_1; }\n+\t\t//name=ID\n+\t\tpublic Assignment getNameAssignment_1() { return cNameAssignment_1; }\n \n \t\t//ID\n-\t\tpublic RuleCall getIdIDTerminalRuleCall_1_0() { return cIdIDTerminalRuleCall_1_0; }\n+\t\tpublic RuleCall getNameIDTerminalRuleCall_1_0() { return cNameIDTerminalRuleCall_1_0; }\n \n \t\t//ref=STRING\n \t\tpublic Assignment getRefAssignment_2() { return cRefAssignment_2; }\n@@ -422,56 +434,60 @@ public class DocItemElements extends AbstractParserRuleElementFinder {\n \n \tpublic class ModelTypeElements extends AbstractParserRuleElementFinder {\n \t\tprivate final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), \"ModelType\");\n-\t\tprivate final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);\n-\t\tprivate final Keyword cOutputKeyword_0 = (Keyword)cAlternatives.eContents().get(0);\n-\t\tprivate final Keyword cModeKeyword_1 = (Keyword)cAlternatives.eContents().get(1);\n-\t\tprivate final Keyword cStateKeyword_2 = (Keyword)cAlternatives.eContents().get(2);\n-\t\tprivate final Keyword cMacroKeyword_3 = (Keyword)cAlternatives.eContents().get(3);\n-\t\tprivate final Keyword cFunctionKeyword_4 = (Keyword)cAlternatives.eContents().get(4);\n-\t\tprivate final Keyword cInputKeyword_5 = (Keyword)cAlternatives.eContents().get(5);\n+\t\tprivate final Assignment cTypeNameAssignment = (Assignment)rule.eContents().get(1);\n+\t\tprivate final Alternatives cTypeNameAlternatives_0 = (Alternatives)cTypeNameAssignment.eContents().get(0);\n+\t\tprivate final Keyword cTypeNameOutputKeyword_0_0 = (Keyword)cTypeNameAlternatives_0.eContents().get(0);\n+\t\tprivate final Keyword cTypeNameModeKeyword_0_1 = (Keyword)cTypeNameAlternatives_0.eContents().get(1);\n+\t\tprivate final Keyword cTypeNameStateKeyword_0_2 = (Keyword)cTypeNameAlternatives_0.eContents().get(2);\n+\t\tprivate final Keyword cTypeNameMacroKeyword_0_3 = (Keyword)cTypeNameAlternatives_0.eContents().get(3);\n+\t\tprivate final Keyword cTypeNameFunctionKeyword_0_4 = (Keyword)cTypeNameAlternatives_0.eContents().get(4);\n+\t\tprivate final Keyword cTypeNameInputKeyword_0_5 = (Keyword)cTypeNameAlternatives_0.eContents().get(5);\n \t\t\n \t\t//ModelType:\n-\t\t//\t\"output\" | \"mode\" | \"state\" | \"macro\" | \"function\" | \"input\";\n+\t\t//\ttypeName=(\"output\" | \"mode\" | \"state\" | \"macro\" | \"function\" | \"input\");\n \t\tpublic ParserRule getRule() { return rule; }\n \n+\t\t//typeName=(\"output\" | \"mode\" | \"state\" | \"macro\" | \"function\" | \"input\")\n+\t\tpublic Assignment getTypeNameAssignment() { return cTypeNameAssignment; }\n+\n \t\t//\"output\" | \"mode\" | \"state\" | \"macro\" | \"function\" | \"input\"\n-\t\tpublic Alternatives getAlternatives() { return cAlternatives; }\n+\t\tpublic Alternatives getTypeNameAlternatives_0() { return cTypeNameAlternatives_0; }\n \n \t\t//\"output\"\n-\t\tpublic Keyword getOutputKeyword_0() { return cOutputKeyword_0; }\n+\t\tpublic Keyword getTypeNameOutputKeyword_0_0() { return cTypeNameOutputKeyword_0_0; }\n \n \t\t//\"mode\"\n-\t\tpublic Keyword getModeKeyword_1() { return cModeKeyword_1; }\n+\t\tpublic Keyword getTypeNameModeKeyword_0_1() { return cTypeNameModeKeyword_0_1; }\n \n \t\t//\"state\"\n-\t\tpublic Keyword getStateKeyword_2() { return cStateKeyword_2; }\n+\t\tpublic Keyword getTypeNameStateKeyword_0_2() { return cTypeNameStateKeyword_0_2; }\n \n \t\t//\"macro\"\n-\t\tpublic Keyword getMacroKeyword_3() { return cMacroKeyword_3; }\n+\t\tpublic Keyword getTypeNameMacroKeyword_0_3() { return cTypeNameMacroKeyword_0_3; }\n \n \t\t//\"function\"\n-\t\tpublic Keyword getFunctionKeyword_4() { return cFunctionKeyword_4; }\n+\t\tpublic Keyword getTypeNameFunctionKeyword_0_4() { return cTypeNameFunctionKeyword_0_4; }\n \n \t\t//\"input\"\n-\t\tpublic Keyword getInputKeyword_5() { return cInputKeyword_5; }\n+\t\tpublic Keyword getTypeNameInputKeyword_0_5() { return cTypeNameInputKeyword_0_5; }\n \t}\n \n \tpublic class ModelItemElements extends AbstractParserRuleElementFinder {\n \t\tprivate final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), \"ModelItem\");\n \t\tprivate final Group cGroup = (Group)rule.eContents().get(1);\n \t\tprivate final Assignment cTypeAssignment_0 = (Assignment)cGroup.eContents().get(0);\n \t\tprivate final RuleCall cTypeModelTypeParserRuleCall_0_0 = (RuleCall)cTypeAssignment_0.eContents().get(0);\n-\t\tprivate final Assignment cIdAssignment_1 = (Assignment)cGroup.eContents().get(1);\n-\t\tprivate final RuleCall cIdIDTerminalRuleCall_1_0 = (RuleCall)cIdAssignment_1.eContents().get(0);\n+\t\tprivate final Assignment cNameAssignment_1 = (Assignment)cGroup.eContents().get(1);\n+\t\tprivate final RuleCall cNameIDTerminalRuleCall_1_0 = (RuleCall)cNameAssignment_1.eContents().get(0);\n \t\tprivate final Assignment cDescAssignment_2 = (Assignment)cGroup.eContents().get(2);\n \t\tprivate final RuleCall cDescSTRINGTerminalRuleCall_2_0 = (RuleCall)cDescAssignment_2.eContents().get(0);\n \t\tprivate final Keyword cSemicolonKeyword_3 = (Keyword)cGroup.eContents().get(3);\n \t\t\n \t\t//ModelItem:\n-\t\t//\ttype=ModelType id=ID desc=STRING \";\";\n+\t\t//\ttype=ModelType name=ID desc=STRING \";\";\n \t\tpublic ParserRule getRule() { return rule; }\n \n-\t\t//type=ModelType id=ID desc=STRING \";\"\n+\t\t//type=ModelType name=ID desc=STRING \";\"\n \t\tpublic Group getGroup() { return cGroup; }\n \n \t\t//type=ModelType\n@@ -480,11 +496,11 @@ public class ModelItemElements extends AbstractParserRuleElementFinder {\n \t\t//ModelType\n \t\tpublic RuleCall getTypeModelTypeParserRuleCall_0_0() { return cTypeModelTypeParserRuleCall_0_0; }\n \n-\t\t//id=ID\n-\t\tpublic Assignment getIdAssignment_1() { return cIdAssignment_1; }\n+\t\t//name=ID\n+\t\tpublic Assignment getNameAssignment_1() { return cNameAssignment_1; }\n \n \t\t//ID\n-\t\tpublic RuleCall getIdIDTerminalRuleCall_1_0() { return cIdIDTerminalRuleCall_1_0; }\n+\t\tpublic RuleCall getNameIDTerminalRuleCall_1_0() { return cNameIDTerminalRuleCall_1_0; }\n \n \t\t//desc=STRING\n \t\tpublic Assignment getDescAssignment_2() { return cDescAssignment_2; }\n@@ -498,39 +514,43 @@ public class ModelItemElements extends AbstractParserRuleElementFinder {\n \n \tpublic class ListItemTypeElements extends AbstractParserRuleElementFinder {\n \t\tprivate final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), \"ListItemType\");\n-\t\tprivate final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);\n-\t\tprivate final Keyword cRequirementKeyword_0 = (Keyword)cAlternatives.eContents().get(0);\n-\t\tprivate final Keyword cGoalKeyword_1 = (Keyword)cAlternatives.eContents().get(1);\n-\t\tprivate final Keyword cHazardKeyword_2 = (Keyword)cAlternatives.eContents().get(2);\n-\t\tprivate final Keyword cConstraintKeyword_3 = (Keyword)cAlternatives.eContents().get(3);\n+\t\tprivate final Assignment cTypeNameAssignment = (Assignment)rule.eContents().get(1);\n+\t\tprivate final Alternatives cTypeNameAlternatives_0 = (Alternatives)cTypeNameAssignment.eContents().get(0);\n+\t\tprivate final Keyword cTypeNameRequirementKeyword_0_0 = (Keyword)cTypeNameAlternatives_0.eContents().get(0);\n+\t\tprivate final Keyword cTypeNameGoalKeyword_0_1 = (Keyword)cTypeNameAlternatives_0.eContents().get(1);\n+\t\tprivate final Keyword cTypeNameHazardKeyword_0_2 = (Keyword)cTypeNameAlternatives_0.eContents().get(2);\n+\t\tprivate final Keyword cTypeNameConstraintKeyword_0_3 = (Keyword)cTypeNameAlternatives_0.eContents().get(3);\n \t\t\n \t\t//ListItemType:\n-\t\t//\t\"requirement\" | \"goal\" | \"hazard\" | \"constraint\";\n+\t\t//\ttypeName=(\"requirement\" | \"goal\" | \"hazard\" | \"constraint\");\n \t\tpublic ParserRule getRule() { return rule; }\n \n+\t\t//typeName=(\"requirement\" | \"goal\" | \"hazard\" | \"constraint\")\n+\t\tpublic Assignment getTypeNameAssignment() { return cTypeNameAssignment; }\n+\n \t\t//\"requirement\" | \"goal\" | \"hazard\" | \"constraint\"\n-\t\tpublic Alternatives getAlternatives() { return cAlternatives; }\n+\t\tpublic Alternatives getTypeNameAlternatives_0() { return cTypeNameAlternatives_0; }\n \n \t\t//\"requirement\"\n-\t\tpublic Keyword getRequirementKeyword_0() { return cRequirementKeyword_0; }\n+\t\tpublic Keyword getTypeNameRequirementKeyword_0_0() { return cTypeNameRequirementKeyword_0_0; }\n \n \t\t//\"goal\"\n-\t\tpublic Keyword getGoalKeyword_1() { return cGoalKeyword_1; }\n+\t\tpublic Keyword getTypeNameGoalKeyword_0_1() { return cTypeNameGoalKeyword_0_1; }\n \n \t\t//\"hazard\"\n-\t\tpublic Keyword getHazardKeyword_2() { return cHazardKeyword_2; }\n+\t\tpublic Keyword getTypeNameHazardKeyword_0_2() { return cTypeNameHazardKeyword_0_2; }\n \n \t\t//\"constraint\"\n-\t\tpublic Keyword getConstraintKeyword_3() { return cConstraintKeyword_3; }\n+\t\tpublic Keyword getTypeNameConstraintKeyword_0_3() { return cTypeNameConstraintKeyword_0_3; }\n \t}\n \n \tpublic class ListItemElements extends AbstractParserRuleElementFinder {\n \t\tprivate final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), \"ListItem\");\n \t\tprivate final Group cGroup = (Group)rule.eContents().get(1);\n \t\tprivate final Assignment cTypeAssignment_0 = (Assignment)cGroup.eContents().get(0);\n \t\tprivate final RuleCall cTypeListItemTypeParserRuleCall_0_0 = (RuleCall)cTypeAssignment_0.eContents().get(0);\n-\t\tprivate final Assignment cIdAssignment_1 = (Assignment)cGroup.eContents().get(1);\n-\t\tprivate final RuleCall cIdIDTerminalRuleCall_1_0 = (RuleCall)cIdAssignment_1.eContents().get(0);\n+\t\tprivate final Assignment cNameAssignment_1 = (Assignment)cGroup.eContents().get(1);\n+\t\tprivate final RuleCall cNameIDTerminalRuleCall_1_0 = (RuleCall)cNameAssignment_1.eContents().get(0);\n \t\tprivate final Assignment cDescAssignment_2 = (Assignment)cGroup.eContents().get(2);\n \t\tprivate final RuleCall cDescSTRINGTerminalRuleCall_2_0 = (RuleCall)cDescAssignment_2.eContents().get(0);\n \t\tprivate final Group cGroup_3 = (Group)cGroup.eContents().get(3);\n@@ -555,58 +575,13 @@ public class ListItemElements extends AbstractParserRuleElementFinder {\n \t\t\n \t\t/// *\n \t\t// * A list item has a type, description and lists of references.\n-\t\t// * / / * \n-\t\t//Level0:\n-\t\t//\t{Level0}\n-\t\t//\t'{'\n-\t\t//\t\t('Program Plan' pmp=Document)?\n-\t\t//\t\t('Safety Plan' safetyPlan=Document)?\n-\t\t//\t\t('Accident Definition' accidentDefinition=Document)?\n-\t\t//\t\t('Safety Policy' safetyPolicy=Document)?\n-\t\t//\t'}'\n-\t\t//;\n-\t\t//\n-\t\t//Level1:\n-\t\t//\t{Level1}\n-\t\t//\t'{'\n-\t\t//\t\t('Introduction' introduction=Document)?\n-\t\t//\t\t('Historical' historical=Document)?\n-\t\t//\t\t('Environment' environment=Document)?\n-\t\t//\t\t('Goals' '(' goals+=GoalItem* ')' )?\n-\t\t//\t\t('High-Level Requirements' '(' highLevelReqs+=RequirementItem* ')' )?\n-\t\t//\t\t('System Limitations' limitations=Document)?\n-\t\t//\t\t('Operator Requirements' '(' opReq+=RequirementItem* ')' )?\n-\t\t//\t\t('Hazard Analysis' hazardAnalysis=Document)?\n-\t\t//\t\t('Hazard List' '(' hazardList+=HazardItem* ')')?\n-\t\t//\t\t('Design Constraints' '(' constraints+=ConstraintItem* ')' )?\n-\t\t//\t\t('Verification and Validation' verification=Document)?\n-\t\t//\t'}'\n-\t\t//;\n-\t\t//\n-\t\t//\n-\t\t//Level2:\n-\t\t//\tdesc=STRING\n-\t\t//\t'{'\n-\t\t//\t'}'\t\n-\t\t//;\n-\t\t//\n-\t\t//Level3:\n-\t\t//\tdesc=STRING\n-\t\t//\t'{'\n-\t\t//\t\t('System Blackbox Behavior' '(' behaviors+=ModelItem* ')' )?\n-\t\t//\t\t('User Model' '(' userModels+=ModelItem* ')' )?\n-\t\t//\t\t('Verification and Validation' verification=Document )?\n-\t\t//\t'}'\n-\t\t//;\n-\t\t//\n-\t\t//\n \t\t// * / ListItem:\n-\t\t//\ttype=ListItemType id=ID desc=STRING (\"{\" docReferences+=[DocItem]* \"}\")? (\"(\" itemReferences+=[ListItem]* \")\")? (\"[\"\n-\t\t//\tmodelReferences+=[ModelItem]* \"]\")? \";\";\n+\t\t//\ttype=ListItemType name=ID desc=STRING (\"{\" docReferences+=[DocItem]+ \"}\")? (\"(\" itemReferences+=[ListItem]+ \")\")? (\"[\"\n+\t\t//\tmodelReferences+=[ModelItem]+ \"]\")? \";\";\n \t\tpublic ParserRule getRule() { return rule; }\n \n-\t\t//type=ListItemType id=ID desc=STRING (\"{\" docReferences+=[DocItem]* \"}\")? (\"(\" itemReferences+=[ListItem]* \")\")? (\"[\"\n-\t\t//modelReferences+=[ModelItem]* \"]\")? \";\"\n+\t\t//type=ListItemType name=ID desc=STRING (\"{\" docReferences+=[DocItem]+ \"}\")? (\"(\" itemReferences+=[ListItem]+ \")\")? (\"[\"\n+\t\t//modelReferences+=[ModelItem]+ \"]\")? \";\"\n \t\tpublic Group getGroup() { return cGroup; }\n \n \t\t//type=ListItemType\n@@ -615,25 +590,25 @@ public class ListItemElements extends AbstractParserRuleElementFinder {\n \t\t//ListItemType\n \t\tpublic RuleCall getTypeListItemTypeParserRuleCall_0_0() { return cTypeListItemTypeParserRuleCall_0_0; }\n \n-\t\t//id=ID\n-\t\tpublic Assignment getIdAssignment_1() { return cIdAssignment_1; }\n+\t\t//name=ID\n+\t\tpublic Assignment getNameAssignment_1() { return cNameAssignment_1; }\n \n \t\t//ID\n-\t\tpublic RuleCall getIdIDTerminalRuleCall_1_0() { return cIdIDTerminalRuleCall_1_0; }\n+\t\tpublic RuleCall getNameIDTerminalRuleCall_1_0() { return cNameIDTerminalRuleCall_1_0; }\n \n \t\t//desc=STRING\n \t\tpublic Assignment getDescAssignment_2() { return cDescAssignment_2; }\n \n \t\t//STRING\n \t\tpublic RuleCall getDescSTRINGTerminalRuleCall_2_0() { return cDescSTRINGTerminalRuleCall_2_0; }\n \n-\t\t//(\"{\" docReferences+=[DocItem]* \"}\")?\n+\t\t//(\"{\" docReferences+=[DocItem]+ \"}\")?\n \t\tpublic Group getGroup_3() { return cGroup_3; }\n \n \t\t//\"{\"\n \t\tpublic Keyword getLeftCurlyBracketKeyword_3_0() { return cLeftCurlyBracketKeyword_3_0; }\n \n-\t\t//docReferences+=[DocItem]*\n+\t\t//docReferences+=[DocItem]+\n \t\tpublic Assignment getDocReferencesAssignment_3_1() { return cDocReferencesAssignment_3_1; }\n \n \t\t//[DocItem]\n@@ -645,13 +620,13 @@ public class ListItemElements extends AbstractParserRuleElementFinder {\n \t\t//\"}\"\n \t\tpublic Keyword getRightCurlyBracketKeyword_3_2() { return cRightCurlyBracketKeyword_3_2; }\n \n-\t\t//(\"(\" itemReferences+=[ListItem]* \")\")?\n+\t\t//(\"(\" itemReferences+=[ListItem]+ \")\")?\n \t\tpublic Group getGroup_4() { return cGroup_4; }\n \n \t\t//\"(\"\n \t\tpublic Keyword getLeftParenthesisKeyword_4_0() { return cLeftParenthesisKeyword_4_0; }\n \n-\t\t//itemReferences+=[ListItem]*\n+\t\t//itemReferences+=[ListItem]+\n \t\tpublic Assignment getItemReferencesAssignment_4_1() { return cItemReferencesAssignment_4_1; }\n \n \t\t//[ListItem]\n@@ -663,13 +638,13 @@ public class ListItemElements extends AbstractParserRuleElementFinder {\n \t\t//\")\"\n \t\tpublic Keyword getRightParenthesisKeyword_4_2() { return cRightParenthesisKeyword_4_2; }\n \n-\t\t//(\"[\" modelReferences+=[ModelItem]* \"]\")?\n+\t\t//(\"[\" modelReferences+=[ModelItem]+ \"]\")?\n \t\tpublic Group getGroup_5() { return cGroup_5; }\n \n \t\t//\"[\"\n \t\tpublic Keyword getLeftSquareBracketKeyword_5_0() { return cLeftSquareBracketKeyword_5_0; }\n \n-\t\t//modelReferences+=[ModelItem]*\n+\t\t//modelReferences+=[ModelItem]+\n \t\tpublic Assignment getModelReferencesAssignment_5_1() { return cModelReferencesAssignment_5_1; }\n \n \t\t//[ModelItem]\n@@ -741,7 +716,7 @@ public TerminalsGrammarAccess getTerminalsGrammarAccess() {\n \t/// *\n \t// * An intent specification consists of one or more refinements.\n \t// * / Specification:\n-\t//\t\"specification\" id=ID refinements+=Refinement+;\n+\t//\t\"specification\" name=ID refinements+=Refinement+;\n \tpublic SpecificationElements getSpecificationAccess() {\n \t\treturn (pSpecification != null) ? pSpecification : (pSpecification = new SpecificationElements());\n \t}\n@@ -753,7 +728,7 @@ public ParserRule getSpecificationRule() {\n \t/// *\n \t// * A refinement has no type and consists of one or more intents.\n \t// * / Refinement:\n-\t//\t\"refinement\" id=ID desc=STRING intents+=Intent+;\n+\t//\t\"refinement\" name=ID desc=STRING intents+=Intent+;\n \tpublic RefinementElements getRefinementAccess() {\n \t\treturn (pRefinement != null) ? pRefinement : (pRefinement = new RefinementElements());\n \t}\n@@ -765,7 +740,7 @@ public ParserRule getRefinementRule() {\n \t/// *\n \t// * An intent has a type and consists of one or more decompositions. \n \t// * / Intent:\n-\t//\ttype=IntentType id=ID desc=STRING decompositions+=Decomposition+;\n+\t//\ttype=IntentType name=ID desc=STRING decompositions+=Decomposition+;\n \tpublic IntentElements getIntentAccess() {\n \t\treturn (pIntent != null) ? pIntent : (pIntent = new IntentElements());\n \t}\n@@ -779,7 +754,7 @@ public ParserRule getIntentRule() {\n \t// * The grammar does not enforce their universal containment in a specification.\n \t// * A proper intention specification should contain an intent of each type in each refinement.\n \t// * / IntentType:\n-\t//\t\"basic\" | \"purpose\" | \"principles\" | \"models\" | \"design\" | \"implementation\" | \"operation\";\n+\t//\ttypeName=(\"basic\" | \"purpose\" | \"principles\" | \"models\" | \"design\" | \"implementation\" | \"operation\");\n \tpublic IntentTypeElements getIntentTypeAccess() {\n \t\treturn (pIntentType != null) ? pIntentType : (pIntentType = new IntentTypeElements());\n \t}\n@@ -791,7 +766,7 @@ public ParserRule getIntentTypeRule() {\n \t/// *\n \t// * A decomposition has a type and consists of one or more models, documents, or items.\n \t// * / Decomposition:\n-\t//\ttype=DecompositionType id=ID desc=STRING (\"{\" documents+=Document* \"}\")? (\"[\" models+=ModelItem* \"]\")? (\"(\"\n+\t//\ttype=DecompositionType name=ID desc=STRING (\"{\" documents+=Document* \"}\")? (\"[\" models+=ModelItem* \"]\")? (\"(\"\n \t//\titems+=ListItem* \")\")?;\n \tpublic DecompositionElements getDecompositionAccess() {\n \t\treturn (pDecomposition != null) ? pDecomposition : (pDecomposition = new DecompositionElements());\n@@ -802,7 +777,7 @@ public ParserRule getDecompositionRule() {\n \t}\n \n \t//DecompositionType:\n-\t//\t\"environment\" | \"operator\" | \"system\" | \"verification\";\n+\t//\ttypeName=(\"environment\" | \"operator\" | \"system\" | \"verification\");\n \tpublic DecompositionTypeElements getDecompositionTypeAccess() {\n \t\treturn (pDecompositionType != null) ? pDecompositionType : (pDecompositionType = new DecompositionTypeElements());\n \t}\n@@ -822,7 +797,7 @@ public ParserRule getDocumentRule() {\n \t}\n \n \t//DocItemType:\n-\t//\t\"condition\" | \"figure\" | \"break\" | \"model\" | \"paragraph\" | \"section\" | \"table\";\n+\t//\ttypeName=(\"condition\" | \"figure\" | \"break\" | \"model\" | \"paragraph\" | \"section\" | \"table\");\n \tpublic DocItemTypeElements getDocItemTypeAccess() {\n \t\treturn (pDocItemType != null) ? pDocItemType : (pDocItemType = new DocItemTypeElements());\n \t}\n@@ -832,7 +807,7 @@ public ParserRule getDocItemTypeRule() {\n \t}\n \n \t//DocItem:\n-\t//\ttype=DocItemType id=ID ref=STRING \";\";\n+\t//\ttype=DocItemType name=ID ref=STRING \";\";\n \tpublic DocItemElements getDocItemAccess() {\n \t\treturn (pDocItem != null) ? pDocItem : (pDocItem = new DocItemElements());\n \t}\n@@ -842,7 +817,7 @@ public ParserRule getDocItemRule() {\n \t}\n \n \t//ModelType:\n-\t//\t\"output\" | \"mode\" | \"state\" | \"macro\" | \"function\" | \"input\";\n+\t//\ttypeName=(\"output\" | \"mode\" | \"state\" | \"macro\" | \"function\" | \"input\");\n \tpublic ModelTypeElements getModelTypeAccess() {\n \t\treturn (pModelType != null) ? pModelType : (pModelType = new ModelTypeElements());\n \t}\n@@ -852,7 +827,7 @@ public ParserRule getModelTypeRule() {\n \t}\n \n \t//ModelItem:\n-\t//\ttype=ModelType id=ID desc=STRING \";\";\n+\t//\ttype=ModelType name=ID desc=STRING \";\";\n \tpublic ModelItemElements getModelItemAccess() {\n \t\treturn (pModelItem != null) ? pModelItem : (pModelItem = new ModelItemElements());\n \t}\n@@ -862,7 +837,7 @@ public ParserRule getModelItemRule() {\n \t}\n \n \t//ListItemType:\n-\t//\t\"requirement\" | \"goal\" | \"hazard\" | \"constraint\";\n+\t//\ttypeName=(\"requirement\" | \"goal\" | \"hazard\" | \"constraint\");\n \tpublic ListItemTypeElements getListItemTypeAccess() {\n \t\treturn (pListItemType != null) ? pListItemType : (pListItemType = new ListItemTypeElements());\n \t}\n@@ -873,54 +848,9 @@ public ParserRule getListItemTypeRule() {\n \n \t/// *\n \t// * A list item has a type, description and lists of references.\n-\t// * / / * \n-\t//Level0:\n-\t//\t{Level0}\n-\t//\t'{'\n-\t//\t\t('Program Plan' pmp=Document)?\n-\t//\t\t('Safety Plan' safetyPlan=Document)?\n-\t//\t\t('Accident Definition' accidentDefinition=Document)?\n-\t//\t\t('Safety Policy' safetyPolicy=Document)?\n-\t//\t'}'\n-\t//;\n-\t//\n-\t//Level1:\n-\t//\t{Level1}\n-\t//\t'{'\n-\t//\t\t('Introduction' introduction=Document)?\n-\t//\t\t('Historical' historical=Document)?\n-\t//\t\t('Environment' environment=Document)?\n-\t//\t\t('Goals' '(' goals+=GoalItem* ')' )?\n-\t//\t\t('High-Level Requirements' '(' highLevelReqs+=RequirementItem* ')' )?\n-\t//\t\t('System Limitations' limitations=Document)?\n-\t//\t\t('Operator Requirements' '(' opReq+=RequirementItem* ')' )?\n-\t//\t\t('Hazard Analysis' hazardAnalysis=Document)?\n-\t//\t\t('Hazard List' '(' hazardList+=HazardItem* ')')?\n-\t//\t\t('Design Constraints' '(' constraints+=ConstraintItem* ')' )?\n-\t//\t\t('Verification and Validation' verification=Document)?\n-\t//\t'}'\n-\t//;\n-\t//\n-\t//\n-\t//Level2:\n-\t//\tdesc=STRING\n-\t//\t'{'\n-\t//\t'}'\t\n-\t//;\n-\t//\n-\t//Level3:\n-\t//\tdesc=STRING\n-\t//\t'{'\n-\t//\t\t('System Blackbox Behavior' '(' behaviors+=ModelItem* ')' )?\n-\t//\t\t('User Model' '(' userModels+=ModelItem* ')' )?\n-\t//\t\t('Verification and Validation' verification=Document )?\n-\t//\t'}'\n-\t//;\n-\t//\n-\t//\n \t// * / ListItem:\n-\t//\ttype=ListItemType id=ID desc=STRING (\"{\" docReferences+=[DocItem]* \"}\")? (\"(\" itemReferences+=[ListItem]* \")\")? (\"[\"\n-\t//\tmodelReferences+=[ModelItem]* \"]\")? \";\";\n+\t//\ttype=ListItemType name=ID desc=STRING (\"{\" docReferences+=[DocItem]+ \"}\")? (\"(\" itemReferences+=[ListItem]+ \")\")? (\"[\"\n+\t//\tmodelReferences+=[ModelItem]+ \"]\")? \";\";\n \tpublic ListItemElements getListItemAccess() {\n \t\treturn (pListItem != null) ? pListItem : (pListItem = new ListItemElements());\n \t}", "raw_url": "https://github.com/nasa/CertWare/raw/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fservices%2FIntentSpecificationGrammarAccess.java", "sha": "492d3f0c6e243a4a171562251d67918938a267e8", "status": "modified" }, { "additions": 2, "blob_url": "https://github.com/nasa/CertWare/blob/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fvalidation%2FAbstractIntentSpecificationValidator.java", "changes": 2, "contents_url": "https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fvalidation%2FAbstractIntentSpecificationValidator.java?ref=27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9", "deletions": 0, "filename": "net.certware.intent/src-gen/net/certware/intent/validation/AbstractIntentSpecificationValidator.java", "new_code": "import org.eclipse.xtext.validation.ComposedChecks;\n@ComposedChecks(validators= {org.eclipse.xtext.validation.NamesAreUniqueValidator.class})", "new_methods": [], "old_code": "", "old_methods": [], "patch": "@@ -6,7 +6,9 @@\n import java.util.ArrayList;\n import java.util.List;\n import org.eclipse.emf.ecore.EPackage;\n+import org.eclipse.xtext.validation.ComposedChecks;\n \n+@ComposedChecks(validators= {org.eclipse.xtext.validation.NamesAreUniqueValidator.class})\n public class AbstractIntentSpecificationValidator extends org.eclipse.xtext.validation.AbstractDeclarativeValidator {\n \n \t@Override", "raw_url": "https://github.com/nasa/CertWare/raw/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fvalidation%2FAbstractIntentSpecificationValidator.java", "sha": "a9fbf6bc5f88b6795db0461bab75320ce7150d8a", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/nasa/CertWare/blob/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc%2Fnet%2Fcertware%2Fintent%2FGenerateIntentSpecification.mwe2", "changes": 2, "contents_url": "https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent%2Fsrc%2Fnet%2Fcertware%2Fintent%2FGenerateIntentSpecification.mwe2?ref=27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9", "deletions": 1, "filename": "net.certware.intent/src/net/certware/intent/GenerateIntentSpecification.mwe2", "new_code": "\t\t\t\tcomposedCheck = \"org.eclipse.xtext.validation.NamesAreUniqueValidator\"", "new_methods": [], "old_code": " \t\t// composedCheck = \"org.eclipse.xtext.validation.NamesAreUniqueValidator\"", "old_methods": [], "patch": "@@ -72,7 +72,7 @@ Workflow {\n \t\t// Xtend-based API for validation\n \t\tfragment = validation.ValidatorFragment auto-inject {\n \t\t// composedCheck = \"org.eclipse.xtext.validation.ImportUriValidator\"\n- \t\t// composedCheck = \"org.eclipse.xtext.validation.NamesAreUniqueValidator\"\n+\t\t\t\tcomposedCheck = \"org.eclipse.xtext.validation.NamesAreUniqueValidator\"\n \t\t}\n \n \t\t// old scoping and exporting API", "raw_url": "https://github.com/nasa/CertWare/raw/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc%2Fnet%2Fcertware%2Fintent%2FGenerateIntentSpecification.mwe2", "sha": "4f8023b917cb702ee5648856888b6b276f59f3a9", "status": "modified" }, { "additions": 12, "blob_url": "https://github.com/nasa/CertWare/blob/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc%2Fnet%2Fcertware%2Fintent%2FIntentSpecification.xtext", "changes": 72, "contents_url": "https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent%2Fsrc%2Fnet%2Fcertware%2Fintent%2FIntentSpecification.xtext?ref=27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9", "deletions": 60, "filename": "net.certware.intent/src/net/certware/intent/IntentSpecification.xtext", "new_code": "\tname=ID\n\tname=ID\n\tname=ID\n\ttypeName=('basic' | 'purpose' | 'principles' | 'models' | 'design' | 'implementation' | 'operation')\n\tname=ID\n\ttypeName=('environment' | 'operator' | 'system' | 'verification')\n\ttypeName=('condition' | 'figure' | 'break' | 'model' | 'paragraph' | 'section' | 'table')\n\tname=ID\n\ttypeName=('output' | 'mode' | 'state' | 'macro' | 'function' | 'input')\t\n\tname=ID\n\ttypeName=('requirement' | 'goal' | 'hazard' | 'constraint')\t\n\tname=ID", "new_methods": [], "old_code": "\tid=ID\n\tid=ID\n\tid=ID\n\t'basic' | 'purpose' | 'principles' | 'models' | 'design' | 'implementation' | 'operation'\n\tid=ID\n\t'environment' | 'operator' | 'system' | 'verification'\n\t'condition' | 'figure' | 'break' | 'model' | 'paragraph' | 'section' | 'table'\n\tid=ID\n\t'output' | 'mode' | 'state' | 'macro' | 'function' | 'input'\t\n\tid=ID\n\t'requirement' | 'goal' | 'hazard' | 'constraint'\t\n\tid=ID\n\n\n/* \nLevel0:\n\t{Level0}\n\t'{'\n\t\t('Program Plan' pmp=Document)?\n\t\t('Safety Plan' safetyPlan=Document)?\n\t\t('Accident Definition' accidentDefinition=Document)?\n\t\t('Safety Policy' safetyPolicy=Document)?\n\t'}'\n;\n\nLevel1:\n\t{Level1}\n\t'{'\n\t\t('Introduction' introduction=Document)?\n\t\t('Historical' historical=Document)?\n\t\t('Environment' environment=Document)?\n\t\t('Goals' '(' goals+=GoalItem* ')' )?\n\t\t('High-Level Requirements' '(' highLevelReqs+=RequirementItem* ')' )?\n\t\t('System Limitations' limitations=Document)?\n\t\t('Operator Requirements' '(' opReq+=RequirementItem* ')' )?\n\t\t('Hazard Analysis' hazardAnalysis=Document)?\n\t\t('Hazard List' '(' hazardList+=HazardItem* ')')?\n\t\t('Design Constraints' '(' constraints+=ConstraintItem* ')' )?\n\t\t('Verification and Validation' verification=Document)?\n\t'}'\n;\n\n\nLevel2:\n\tdesc=STRING\n\t'{'\n\t'}'\t\n;\n\nLevel3:\n\tdesc=STRING\n\t'{'\n\t\t('System Blackbox Behavior' '(' behaviors+=ModelItem* ')' )?\n\t\t('User Model' '(' userModels+=ModelItem* ')' )?\n\t\t('Verification and Validation' verification=Document )?\n\t'}'\n;\n\n\n*/", "old_methods": [], "patch": "@@ -12,7 +12,7 @@ generate intentSpecification \"http://www.certware.net/intent/IntentSpecification\n */\n Specification:\n \t'specification'\n-\tid=ID\n+\tname=ID\n \trefinements+=Refinement+\n ;\n \n@@ -21,7 +21,7 @@ Specification:\n */\n Refinement:\n \t'refinement'\n-\tid=ID\n+\tname=ID\n \tdesc=STRING\n \tintents+=Intent+\t\n ;\t\n@@ -31,7 +31,7 @@ Refinement:\n */\n Intent:\n \ttype=IntentType\n-\tid=ID\n+\tname=ID\n \tdesc=STRING\n \tdecompositions+=Decomposition+\t\n ;\n@@ -42,113 +42,65 @@ Intent:\n * A proper intention specification should contain an intent of each type in each refinement.\n */\n IntentType:\n-\t'basic' | 'purpose' | 'principles' | 'models' | 'design' | 'implementation' | 'operation'\n+\ttypeName=('basic' | 'purpose' | 'principles' | 'models' | 'design' | 'implementation' | 'operation')\n ;\n \n /*\n * A decomposition has a type and consists of one or more models, documents, or items.\n */\n Decomposition:\n \ttype=DecompositionType\n-\tid=ID\n+\tname=ID\n \tdesc=STRING\n \t('{' documents+=Document* '}')?\n \t('[' models+=ModelItem* ']')?\n \t('(' items+=ListItem* ')')?\n ;\n \n DecompositionType:\n-\t'environment' | 'operator' | 'system' | 'verification'\n+\ttypeName=('environment' | 'operator' | 'system' | 'verification')\n ;\n \n Document:\n \t'{' entries += DocItem+ '}'\n ;\n \n DocItemType:\n-\t'condition' | 'figure' | 'break' | 'model' | 'paragraph' | 'section' | 'table'\n+\ttypeName=('condition' | 'figure' | 'break' | 'model' | 'paragraph' | 'section' | 'table')\n ;\n \n DocItem :\n \ttype=DocItemType\n-\tid=ID\n+\tname=ID\n \tref=STRING\n \t';'\n ;\n \n ModelType:\n-\t'output' | 'mode' | 'state' | 'macro' | 'function' | 'input'\t\n+\ttypeName=('output' | 'mode' | 'state' | 'macro' | 'function' | 'input')\t\n ;\n \n ModelItem:\n \ttype=ModelType\n-\tid=ID\n+\tname=ID\n \tdesc=STRING\n \t';'\n ;\n \n ListItemType:\n-\t'requirement' | 'goal' | 'hazard' | 'constraint'\t\n+\ttypeName=('requirement' | 'goal' | 'hazard' | 'constraint')\t\n ;\n \n /*\n * A list item has a type, description and lists of references.\n */\n ListItem:\n \ttype=ListItemType\n-\tid=ID\n+\tname=ID\n \tdesc=STRING\n \t('{' docReferences+=[DocItem]+ '}' )?\n \t('(' itemReferences+=[ListItem]+ ')' )?\n \t('[' modelReferences+=[ModelItem]+ ']' )?\n \t';'\n ;\n \n-\n-\n-/* \n-Level0:\n-\t{Level0}\n-\t'{'\n-\t\t('Program Plan' pmp=Document)?\n-\t\t('Safety Plan' safetyPlan=Document)?\n-\t\t('Accident Definition' accidentDefinition=Document)?\n-\t\t('Safety Policy' safetyPolicy=Document)?\n-\t'}'\n-;\n-\n-Level1:\n-\t{Level1}\n-\t'{'\n-\t\t('Introduction' introduction=Document)?\n-\t\t('Historical' historical=Document)?\n-\t\t('Environment' environment=Document)?\n-\t\t('Goals' '(' goals+=GoalItem* ')' )?\n-\t\t('High-Level Requirements' '(' highLevelReqs+=RequirementItem* ')' )?\n-\t\t('System Limitations' limitations=Document)?\n-\t\t('Operator Requirements' '(' opReq+=RequirementItem* ')' )?\n-\t\t('Hazard Analysis' hazardAnalysis=Document)?\n-\t\t('Hazard List' '(' hazardList+=HazardItem* ')')?\n-\t\t('Design Constraints' '(' constraints+=ConstraintItem* ')' )?\n-\t\t('Verification and Validation' verification=Document)?\n-\t'}'\n-;\n-\n-\n-Level2:\n-\tdesc=STRING\n-\t'{'\n-\t'}'\t\n-;\n-\n-Level3:\n-\tdesc=STRING\n-\t'{'\n-\t\t('System Blackbox Behavior' '(' behaviors+=ModelItem* ')' )?\n-\t\t('User Model' '(' userModels+=ModelItem* ')' )?\n-\t\t('Verification and Validation' verification=Document )?\n-\t'}'\n-;\n-\n-\n-*/\n\\ No newline at end of file", "raw_url": "https://github.com/nasa/CertWare/raw/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc%2Fnet%2Fcertware%2Fintent%2FIntentSpecification.xtext", "sha": "328aadf18fab8c0509bd3935eeef66ac75dcf46f", "status": "modified" }, { "additions": 137, "blob_url": "https://github.com/nasa/CertWare/blob/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc%2Fnet%2Fcertware%2Fintent%2Fvalidation%2FIntentSpecificationValidator.xtend", "changes": 148, "contents_url": "https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent%2Fsrc%2Fnet%2Fcertware%2Fintent%2Fvalidation%2FIntentSpecificationValidator.xtend?ref=27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9", "deletions": 11, "filename": "net.certware.intent/src/net/certware/intent/validation/IntentSpecificationValidator.xtend", "new_code": "\nimport net.certware.intent.intentSpecification.Intent\nimport net.certware.intent.intentSpecification.IntentSpecificationPackage\nimport net.certware.intent.intentSpecification.Refinement\nimport org.eclipse.xtext.validation.Check\nimport net.certware.intent.intentSpecification.Decomposition\nimport net.certware.intent.intentSpecification.ListItem\nimport net.certware.intent.intentSpecification.ModelItem\n\tpublic static val UNIQUE_INTENTS_REFINEMENT = \"net.certware.intent.UniqueIntentsRefinement\";\n\tpublic static val UNIQUE_DECOMPOSITION_INTENT = \"net.certware.intent.UniqueDecompositionIntent\";\n\tpublic static val UNIQUE_LIST_ITEM_DECOMPOSITION = \"net.certware.intent.UniqueListItemDecomposition\";\n\tpublic static val UNIQUE_MODEL_ITEM_DECOMPOSITION = \"net.certware.intent.UniqueModelItemDecomposition\";\n\tpublic static val UNIQUE_LIST_ITEM_LIST_ITEM = \"net.certware.intent.UniqueListItemListItem\";\n\tpublic static val UNIQUE_MODEL_ITEM_LIST_ITEM = \"net.certware.intent.UniqueModelItemListItem\";\n\t\n @Check\n def checkUniqueIntentsInRefinement(Refinement refinement) {\n \t// for each intent type ensure it appears only once in a refinement\n \tval visitedIntentTypeNames = <String>newHashSet()\n \t\n \tvar intents = refinement.intents\n \tvar i = intents.listIterator\n \twhile ( i.hasNext ) {\n \t\tvar d = i.next as Intent\n \t\tvar typeName = d.getType().getTypeName()\n \t\tif ( visitedIntentTypeNames.contains(typeName)) {\n \t\t\twarning(\"duplicate intent type '\"+typeName+\"' in refinement\",\n \t\t\t\tIntentSpecificationPackage::eINSTANCE.refinement_Intents,\n \t\t\t\tUNIQUE_INTENTS_REFINEMENT,\n \t\t\t\td.name\n \t\t\t)\n \t\t}\n\t\t\tvisitedIntentTypeNames.add(typeName)\n \t}\n }\n \n @Check\n def checkUniqueDecompositionInIntent(Intent intent) {\n \t// for each decomposition type ensure it appears only once in an intent\n \tval visitedDecompositionTypeNames = <String>newHashSet()\n \t\n \tvar decompositions = intent.getDecompositions()\n \tvar i = decompositions.listIterator\n \twhile ( i.hasNext ) {\n \t\tvar d = i.next as Decomposition\n \t\tvar typeName = d.getType().getTypeName()\n \t\tif ( visitedDecompositionTypeNames.contains(typeName)) {\n \t\t\twarning(\"duplicate decomposition type '\"+typeName+\"' in intent\",\n \t\t\t\tIntentSpecificationPackage::eINSTANCE.intent_Decompositions,\n \t\t\t\tUNIQUE_DECOMPOSITION_INTENT,\n \t\t\t\td.name\n \t\t\t)\n \t\t}\n\t\t\tvisitedDecompositionTypeNames.add(typeName)\n \t}\n }\n \n @Check\n def checkUniqueListItemInDecomposition(Decomposition decomposition) {\n \t// for each list item it appears only once in a decomposition list\n \tval visitedListItems = <ListItem>newHashSet()\n \t\n \tvar items = decomposition.items\n \tvar i = items.listIterator\n \twhile ( i.hasNext ) {\n \t\tvar d = i.next\n \t\tif ( visitedListItems.contains(d)) {\n \t\t\twarning(\"duplicate item reference '\"+d.name+\"' in list\",\n \t\t\t\tIntentSpecificationPackage::eINSTANCE.decomposition_Items,\n \t\t\t\tUNIQUE_LIST_ITEM_DECOMPOSITION,\n \t\t\t\td.name\n \t\t\t)\n \t\t}\n\t\t\tvisitedListItems.add(d)\n \t}\n }\n \n @Check\n def checkUniqueModelItemInDecomposition(Decomposition decomposition) {\n \t// for each model item it appears only once in a decomposition list\n \tval visitedModelItems = <ModelItem>newHashSet()\n \t\n \tvar items = decomposition.models\n \tvar i = items.listIterator\n \twhile ( i.hasNext ) {\n \t\tvar d = i.next as ModelItem\n \t\tif ( visitedModelItems.contains(d)) {\n \t\t\twarning(\"duplicate item reference '\"+d.name+\"' in models\",\n \t\t\t\tIntentSpecificationPackage::eINSTANCE.decomposition_Models,\n \t\t\t\tUNIQUE_MODEL_ITEM_DECOMPOSITION,\n \t\t\t\td.name\n \t\t\t)\n \t\t}\n\t\t\tvisitedModelItems.add(d)\n \t}\n }\n \n @Check\n def checkUniqueListItemInListItem(ListItem item) {\n \t// for each list item it appears only once in an item list\n \tval visitedListItems = <ListItem>newHashSet()\n \tvisitedListItems.add(item) // add self, preclude from referencing in item list\n \t\n \tvar items = item.itemReferences\n \tvar i = items.listIterator\n \twhile ( i.hasNext ) {\n \t\tvar d = i.next as ListItem\n \t\tif ( visitedListItems.contains(d)) {\n \t\t\twarning(\"duplicate item reference '\"+d.name+\"' in items\",\n \t\t\t\tIntentSpecificationPackage::eINSTANCE.listItem_ItemReferences,\n \t\t\t\tUNIQUE_LIST_ITEM_LIST_ITEM,\n\t\t\t\t\td.name \t\t\t\t \n \t\t\t)\n \t\t}\n\t\t\tvisitedListItems.add(d)\n \t}\n }\n \n @Check\n def checkUniqueModelItemInListItem(ListItem item) {\n \t// for each model item it appears only once in an model list\n \tval visitedModelItems = <ModelItem>newHashSet()\n \t\n \tvar items = item.modelReferences\n \tvar i = items.listIterator\n \twhile ( i.hasNext ) {\n \t\tvar d = i.next as ModelItem\n \t\tif ( visitedModelItems.contains(d)) {\n \t\t\twarning(\"duplicate model reference '\"+d.name+\"' in models\",\n \t\t\t\tIntentSpecificationPackage::eINSTANCE.listItem_ModelReferences,\n \t\t\t\tUNIQUE_MODEL_ITEM_LIST_ITEM,\n \t\t\t\td.name\n \t\t\t)\n \t\t}\n\t\t\tvisitedModelItems.add(d)\n \t}\n }", "new_methods": [ { "arguments": [ "Refinement refinement" ], "filename": "net.certware.intent/src/net/certware/intent/validation/IntentSpecificationValidator.xtend", "implementation": "// for each intent type ensure it appears only once in a refinement\n \tval visitedIntentTypeNames = <String>newHashSet()\n \t\n \tvar intents = refinement.intents\n \tvar i = intents.listIterator\n \twhile ( i.hasNext ) {\n \t\tvar d = i.next as Intent\n \t\tvar typeName = d.getType().getTypeName()\n \t\tif ( visitedIntentTypeNames.contains(typeName)) {\n \t\t\twarning(\"duplicate intent type '\"+typeName+\"' in refinement\",\n \t\t\t\tIntentSpecificationPackage::eINSTANCE.refinement_Intents,\n \t\t\t\tUNIQUE_INTENTS_REFINEMENT,\n \t\t\t\td.name\n \t\t\t)", "signature": "def checkUniqueIntentsInRefinement(Refinement refinement)" }, { "arguments": [ "Intent intent" ], "filename": "net.certware.intent/src/net/certware/intent/validation/IntentSpecificationValidator.xtend", "implementation": "// for each decomposition type ensure it appears only once in an intent\n \tval visitedDecompositionTypeNames = <String>newHashSet()\n \t\n \tvar decompositions = intent.getDecompositions()\n \tvar i = decompositions.listIterator\n \twhile ( i.hasNext ) {\n \t\tvar d = i.next as Decomposition\n \t\tvar typeName = d.getType().getTypeName()\n \t\tif ( visitedDecompositionTypeNames.contains(typeName)) {\n \t\t\twarning(\"duplicate decomposition type '\"+typeName+\"' in intent\",\n \t\t\t\tIntentSpecificationPackage::eINSTANCE.intent_Decompositions,\n \t\t\t\tUNIQUE_DECOMPOSITION_INTENT,\n \t\t\t\td.name\n \t\t\t)", "signature": "def checkUniqueDecompositionInIntent(Intent intent)" }, { "arguments": [ "Decomposition decomposition" ], "filename": "net.certware.intent/src/net/certware/intent/validation/IntentSpecificationValidator.xtend", "implementation": "// for each list item it appears only once in a decomposition list\n \tval visitedListItems = <ListItem>newHashSet()\n \t\n \tvar items = decomposition.items\n \tvar i = items.listIterator\n \twhile ( i.hasNext ) {\n \t\tvar d = i.next\n \t\tif ( visitedListItems.contains(d)) {\n \t\t\twarning(\"duplicate item reference '\"+d.name+\"' in list\",\n \t\t\t\tIntentSpecificationPackage::eINSTANCE.decomposition_Items,\n \t\t\t\tUNIQUE_LIST_ITEM_DECOMPOSITION,\n \t\t\t\td.name\n \t\t\t)", "signature": "def checkUniqueListItemInDecomposition(Decomposition decomposition)" }, { "arguments": [ "Decomposition decomposition" ], "filename": "net.certware.intent/src/net/certware/intent/validation/IntentSpecificationValidator.xtend", "implementation": "// for each model item it appears only once in a decomposition list\n \tval visitedModelItems = <ModelItem>newHashSet()\n \t\n \tvar items = decomposition.models\n \tvar i = items.listIterator\n \twhile ( i.hasNext ) {\n \t\tvar d = i.next as ModelItem\n \t\tif ( visitedModelItems.contains(d)) {\n \t\t\twarning(\"duplicate item reference '\"+d.name+\"' in models\",\n \t\t\t\tIntentSpecificationPackage::eINSTANCE.decomposition_Models,\n \t\t\t\tUNIQUE_MODEL_ITEM_DECOMPOSITION,\n \t\t\t\td.name\n \t\t\t)", "signature": "def checkUniqueModelItemInDecomposition(Decomposition decomposition)" }, { "arguments": [ "ListItem item" ], "filename": "net.certware.intent/src/net/certware/intent/validation/IntentSpecificationValidator.xtend", "implementation": "// for each list item it appears only once in an item list\n \tval visitedListItems = <ListItem>newHashSet()\n \tvisitedListItems.add(item) // add self, preclude from referencing in item list\n \t\n \tvar items = item.itemReferences\n \tvar i = items.listIterator\n \twhile ( i.hasNext ) {\n \t\tvar d = i.next as ListItem\n \t\tif ( visitedListItems.contains(d)) {\n \t\t\twarning(\"duplicate item reference '\"+d.name+\"' in items\",\n \t\t\t\tIntentSpecificationPackage::eINSTANCE.listItem_ItemReferences,\n \t\t\t\tUNIQUE_LIST_ITEM_LIST_ITEM,\n\t\t\t\t\td.name \t\t\t\t \n \t\t\t)", "signature": "def checkUniqueListItemInListItem(ListItem item)" }, { "arguments": [ "ListItem item" ], "filename": "net.certware.intent/src/net/certware/intent/validation/IntentSpecificationValidator.xtend", "implementation": "// for each model item it appears only once in an model list\n \tval visitedModelItems = <ModelItem>newHashSet()\n \t\n \tvar items = item.modelReferences\n \tvar i = items.listIterator\n \twhile ( i.hasNext ) {\n \t\tvar d = i.next as ModelItem\n \t\tif ( visitedModelItems.contains(d)) {\n \t\t\twarning(\"duplicate model reference '\"+d.name+\"' in models\",\n \t\t\t\tIntentSpecificationPackage::eINSTANCE.listItem_ModelReferences,\n \t\t\t\tUNIQUE_MODEL_ITEM_LIST_ITEM,\n \t\t\t\td.name\n \t\t\t)", "signature": "def checkUniqueModelItemInListItem(ListItem item)" } ], "old_code": "//import org.eclipse.xtext.validation.Check\n// public static val INVALID_NAME = 'invalidName'\n//\n//\t@Check\n//\tdef checkGreetingStartsWithCapital(Greeting greeting) {\n//\t\tif (!Character.isUpperCase(greeting.name.charAt(0))) {\n//\t\t\twarning('Name should start with a capital', \n//\t\t\t\t\tMyDslPackage.Literals.GREETING__NAME,\n//\t\t\t\t\tINVALID_NAME)\n//\t\t}\n//\t}", "old_methods": [ { "arguments": [ "Greeting greeting" ], "filename": "net.certware.intent/src/net/certware/intent/validation/IntentSpecificationValidator.xtend", "implementation": "//\t\tif (!Character.isUpperCase(greeting.name.charAt(0))) {\n//\t\t\twarning('Name should start with a capital', \n//\t\t\t\t\tMyDslPackage.Literals.GREETING__NAME,\n//\t\t\t\t\tINVALID_NAME)\n//", "signature": "def checkGreetingStartsWithCapital(Greeting greeting)" } ], "patch": "@@ -2,7 +2,14 @@\n * generated by Xtext\n */\n package net.certware.intent.validation\n-//import org.eclipse.xtext.validation.Check\n+\n+import net.certware.intent.intentSpecification.Intent\n+import net.certware.intent.intentSpecification.IntentSpecificationPackage\n+import net.certware.intent.intentSpecification.Refinement\n+import org.eclipse.xtext.validation.Check\n+import net.certware.intent.intentSpecification.Decomposition\n+import net.certware.intent.intentSpecification.ListItem\n+import net.certware.intent.intentSpecification.ModelItem\n \n /**\n * Custom validation rules. \n@@ -11,14 +18,133 @@ package net.certware.intent.validation\n */\n class IntentSpecificationValidator extends AbstractIntentSpecificationValidator {\n \n-// public static val INVALID_NAME = 'invalidName'\n-//\n-//\t@Check\n-//\tdef checkGreetingStartsWithCapital(Greeting greeting) {\n-//\t\tif (!Character.isUpperCase(greeting.name.charAt(0))) {\n-//\t\t\twarning('Name should start with a capital', \n-//\t\t\t\t\tMyDslPackage.Literals.GREETING__NAME,\n-//\t\t\t\t\tINVALID_NAME)\n-//\t\t}\n-//\t}\n+\tpublic static val UNIQUE_INTENTS_REFINEMENT = \"net.certware.intent.UniqueIntentsRefinement\";\n+\tpublic static val UNIQUE_DECOMPOSITION_INTENT = \"net.certware.intent.UniqueDecompositionIntent\";\n+\tpublic static val UNIQUE_LIST_ITEM_DECOMPOSITION = \"net.certware.intent.UniqueListItemDecomposition\";\n+\tpublic static val UNIQUE_MODEL_ITEM_DECOMPOSITION = \"net.certware.intent.UniqueModelItemDecomposition\";\n+\tpublic static val UNIQUE_LIST_ITEM_LIST_ITEM = \"net.certware.intent.UniqueListItemListItem\";\n+\tpublic static val UNIQUE_MODEL_ITEM_LIST_ITEM = \"net.certware.intent.UniqueModelItemListItem\";\n+\t\n+ @Check\n+ def checkUniqueIntentsInRefinement(Refinement refinement) {\n+ \t// for each intent type ensure it appears only once in a refinement\n+ \tval visitedIntentTypeNames = <String>newHashSet()\n+ \t\n+ \tvar intents = refinement.intents\n+ \tvar i = intents.listIterator\n+ \twhile ( i.hasNext ) {\n+ \t\tvar d = i.next as Intent\n+ \t\tvar typeName = d.getType().getTypeName()\n+ \t\tif ( visitedIntentTypeNames.contains(typeName)) {\n+ \t\t\twarning(\"duplicate intent type '\"+typeName+\"' in refinement\",\n+ \t\t\t\tIntentSpecificationPackage::eINSTANCE.refinement_Intents,\n+ \t\t\t\tUNIQUE_INTENTS_REFINEMENT,\n+ \t\t\t\td.name\n+ \t\t\t)\n+ \t\t}\n+\t\t\tvisitedIntentTypeNames.add(typeName)\n+ \t}\n+ }\n+ \n+ @Check\n+ def checkUniqueDecompositionInIntent(Intent intent) {\n+ \t// for each decomposition type ensure it appears only once in an intent\n+ \tval visitedDecompositionTypeNames = <String>newHashSet()\n+ \t\n+ \tvar decompositions = intent.getDecompositions()\n+ \tvar i = decompositions.listIterator\n+ \twhile ( i.hasNext ) {\n+ \t\tvar d = i.next as Decomposition\n+ \t\tvar typeName = d.getType().getTypeName()\n+ \t\tif ( visitedDecompositionTypeNames.contains(typeName)) {\n+ \t\t\twarning(\"duplicate decomposition type '\"+typeName+\"' in intent\",\n+ \t\t\t\tIntentSpecificationPackage::eINSTANCE.intent_Decompositions,\n+ \t\t\t\tUNIQUE_DECOMPOSITION_INTENT,\n+ \t\t\t\td.name\n+ \t\t\t)\n+ \t\t}\n+\t\t\tvisitedDecompositionTypeNames.add(typeName)\n+ \t}\n+ }\n+ \n+ @Check\n+ def checkUniqueListItemInDecomposition(Decomposition decomposition) {\n+ \t// for each list item it appears only once in a decomposition list\n+ \tval visitedListItems = <ListItem>newHashSet()\n+ \t\n+ \tvar items = decomposition.items\n+ \tvar i = items.listIterator\n+ \twhile ( i.hasNext ) {\n+ \t\tvar d = i.next\n+ \t\tif ( visitedListItems.contains(d)) {\n+ \t\t\twarning(\"duplicate item reference '\"+d.name+\"' in list\",\n+ \t\t\t\tIntentSpecificationPackage::eINSTANCE.decomposition_Items,\n+ \t\t\t\tUNIQUE_LIST_ITEM_DECOMPOSITION,\n+ \t\t\t\td.name\n+ \t\t\t)\n+ \t\t}\n+\t\t\tvisitedListItems.add(d)\n+ \t}\n+ }\n+ \n+ @Check\n+ def checkUniqueModelItemInDecomposition(Decomposition decomposition) {\n+ \t// for each model item it appears only once in a decomposition list\n+ \tval visitedModelItems = <ModelItem>newHashSet()\n+ \t\n+ \tvar items = decomposition.models\n+ \tvar i = items.listIterator\n+ \twhile ( i.hasNext ) {\n+ \t\tvar d = i.next as ModelItem\n+ \t\tif ( visitedModelItems.contains(d)) {\n+ \t\t\twarning(\"duplicate item reference '\"+d.name+\"' in models\",\n+ \t\t\t\tIntentSpecificationPackage::eINSTANCE.decomposition_Models,\n+ \t\t\t\tUNIQUE_MODEL_ITEM_DECOMPOSITION,\n+ \t\t\t\td.name\n+ \t\t\t)\n+ \t\t}\n+\t\t\tvisitedModelItems.add(d)\n+ \t}\n+ }\n+ \n+ @Check\n+ def checkUniqueListItemInListItem(ListItem item) {\n+ \t// for each list item it appears only once in an item list\n+ \tval visitedListItems = <ListItem>newHashSet()\n+ \tvisitedListItems.add(item) // add self, preclude from referencing in item list\n+ \t\n+ \tvar items = item.itemReferences\n+ \tvar i = items.listIterator\n+ \twhile ( i.hasNext ) {\n+ \t\tvar d = i.next as ListItem\n+ \t\tif ( visitedListItems.contains(d)) {\n+ \t\t\twarning(\"duplicate item reference '\"+d.name+\"' in items\",\n+ \t\t\t\tIntentSpecificationPackage::eINSTANCE.listItem_ItemReferences,\n+ \t\t\t\tUNIQUE_LIST_ITEM_LIST_ITEM,\n+\t\t\t\t\td.name \t\t\t\t \n+ \t\t\t)\n+ \t\t}\n+\t\t\tvisitedListItems.add(d)\n+ \t}\n+ }\n+ \n+ @Check\n+ def checkUniqueModelItemInListItem(ListItem item) {\n+ \t// for each model item it appears only once in an model list\n+ \tval visitedModelItems = <ModelItem>newHashSet()\n+ \t\n+ \tvar items = item.modelReferences\n+ \tvar i = items.listIterator\n+ \twhile ( i.hasNext ) {\n+ \t\tvar d = i.next as ModelItem\n+ \t\tif ( visitedModelItems.contains(d)) {\n+ \t\t\twarning(\"duplicate model reference '\"+d.name+\"' in models\",\n+ \t\t\t\tIntentSpecificationPackage::eINSTANCE.listItem_ModelReferences,\n+ \t\t\t\tUNIQUE_MODEL_ITEM_LIST_ITEM,\n+ \t\t\t\td.name\n+ \t\t\t)\n+ \t\t}\n+\t\t\tvisitedModelItems.add(d)\n+ \t}\n+ }\n }", "raw_url": "https://github.com/nasa/CertWare/raw/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc%2Fnet%2Fcertware%2Fintent%2Fvalidation%2FIntentSpecificationValidator.xtend", "sha": "2948f9fdbdfa797be196d1a50778131fbdd19d07", "status": "modified" }, { "additions": 195, "blob_url": "https://github.com/nasa/CertWare/blob/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fxtend-gen%2Fnet%2Fcertware%2Fintent%2Fvalidation%2FIntentSpecificationValidator.java", "changes": 195, "contents_url": "https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent%2Fxtend-gen%2Fnet%2Fcertware%2Fintent%2Fvalidation%2FIntentSpecificationValidator.java?ref=27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9", "deletions": 0, "filename": "net.certware.intent/xtend-gen/net/certware/intent/validation/IntentSpecificationValidator.java", "new_code": "import java.util.HashSet;\nimport java.util.ListIterator;\nimport net.certware.intent.intentSpecification.Decomposition;\nimport net.certware.intent.intentSpecification.DecompositionType;\nimport net.certware.intent.intentSpecification.Intent;\nimport net.certware.intent.intentSpecification.IntentSpecificationPackage;\nimport net.certware.intent.intentSpecification.IntentType;\nimport net.certware.intent.intentSpecification.ListItem;\nimport net.certware.intent.intentSpecification.ModelItem;\nimport net.certware.intent.intentSpecification.Refinement;\nimport org.eclipse.emf.common.util.EList;\nimport org.eclipse.emf.ecore.EReference;\nimport org.eclipse.xtext.validation.Check;\nimport org.eclipse.xtext.xbase.lib.CollectionLiterals;\n public final static String UNIQUE_INTENTS_REFINEMENT = \"net.certware.intent.UniqueIntentsRefinement\";\n \n public final static String UNIQUE_DECOMPOSITION_INTENT = \"net.certware.intent.UniqueDecompositionIntent\";\n \n public final static String UNIQUE_LIST_ITEM_DECOMPOSITION = \"net.certware.intent.UniqueListItemDecomposition\";\n \n public final static String UNIQUE_MODEL_ITEM_DECOMPOSITION = \"net.certware.intent.UniqueModelItemDecomposition\";\n \n public final static String UNIQUE_LIST_ITEM_LIST_ITEM = \"net.certware.intent.UniqueListItemListItem\";\n \n public final static String UNIQUE_MODEL_ITEM_LIST_ITEM = \"net.certware.intent.UniqueModelItemListItem\";\n \n @Check\n public void checkUniqueIntentsInRefinement(final Refinement refinement) {\n final HashSet<String> visitedIntentTypeNames = CollectionLiterals.<String>newHashSet();\n EList<Intent> intents = refinement.getIntents();\n ListIterator<Intent> i = intents.listIterator();\n boolean _hasNext = i.hasNext();\n boolean _while = _hasNext;\n while (_while) {\n {\n Intent _next = i.next();\n Intent d = ((Intent) _next);\n IntentType _type = d.getType();\n String typeName = _type.getTypeName();\n boolean _contains = visitedIntentTypeNames.contains(typeName);\n if (_contains) {\n String _plus = (\"duplicate intent type \\'\" + typeName);\n String _plus_1 = (_plus + \"\\' in refinement\");\n EReference _refinement_Intents = IntentSpecificationPackage.eINSTANCE.getRefinement_Intents();\n String _name = d.getName();\n this.warning(_plus_1, _refinement_Intents, \n IntentSpecificationValidator.UNIQUE_INTENTS_REFINEMENT, _name);\n }\n visitedIntentTypeNames.add(typeName);\n }\n boolean _hasNext_1 = i.hasNext();\n _while = _hasNext_1;\n }\n }\n \n @Check\n public void checkUniqueDecompositionInIntent(final Intent intent) {\n final HashSet<String> visitedDecompositionTypeNames = CollectionLiterals.<String>newHashSet();\n EList<Decomposition> decompositions = intent.getDecompositions();\n ListIterator<Decomposition> i = decompositions.listIterator();\n boolean _hasNext = i.hasNext();\n boolean _while = _hasNext;\n while (_while) {\n {\n Decomposition _next = i.next();\n Decomposition d = ((Decomposition) _next);\n DecompositionType _type = d.getType();\n String typeName = _type.getTypeName();\n boolean _contains = visitedDecompositionTypeNames.contains(typeName);\n if (_contains) {\n String _plus = (\"duplicate decomposition type \\'\" + typeName);\n String _plus_1 = (_plus + \"\\' in intent\");\n EReference _intent_Decompositions = IntentSpecificationPackage.eINSTANCE.getIntent_Decompositions();\n String _name = d.getName();\n this.warning(_plus_1, _intent_Decompositions, \n IntentSpecificationValidator.UNIQUE_DECOMPOSITION_INTENT, _name);\n }\n visitedDecompositionTypeNames.add(typeName);\n }\n boolean _hasNext_1 = i.hasNext();\n _while = _hasNext_1;\n }\n }\n \n @Check\n public void checkUniqueListItemInDecomposition(final Decomposition decomposition) {\n final HashSet<ListItem> visitedListItems = CollectionLiterals.<ListItem>newHashSet();\n EList<ListItem> items = decomposition.getItems();\n ListIterator<ListItem> i = items.listIterator();\n boolean _hasNext = i.hasNext();\n boolean _while = _hasNext;\n while (_while) {\n {\n ListItem d = i.next();\n boolean _contains = visitedListItems.contains(d);\n if (_contains) {\n String _name = d.getName();\n String _plus = (\"duplicate item reference \\'\" + _name);\n String _plus_1 = (_plus + \"\\' in list\");\n EReference _decomposition_Items = IntentSpecificationPackage.eINSTANCE.getDecomposition_Items();\n String _name_1 = d.getName();\n this.warning(_plus_1, _decomposition_Items, \n IntentSpecificationValidator.UNIQUE_LIST_ITEM_DECOMPOSITION, _name_1);\n }\n visitedListItems.add(d);\n }\n boolean _hasNext_1 = i.hasNext();\n _while = _hasNext_1;\n }\n }\n \n @Check\n public void checkUniqueModelItemInDecomposition(final Decomposition decomposition) {\n final HashSet<ModelItem> visitedModelItems = CollectionLiterals.<ModelItem>newHashSet();\n EList<ModelItem> items = decomposition.getModels();\n ListIterator<ModelItem> i = items.listIterator();\n boolean _hasNext = i.hasNext();\n boolean _while = _hasNext;\n while (_while) {\n {\n ModelItem _next = i.next();\n ModelItem d = ((ModelItem) _next);\n boolean _contains = visitedModelItems.contains(d);\n if (_contains) {\n String _name = d.getName();\n String _plus = (\"duplicate item reference \\'\" + _name);\n String _plus_1 = (_plus + \"\\' in models\");\n EReference _decomposition_Models = IntentSpecificationPackage.eINSTANCE.getDecomposition_Models();\n String _name_1 = d.getName();\n this.warning(_plus_1, _decomposition_Models, \n IntentSpecificationValidator.UNIQUE_MODEL_ITEM_DECOMPOSITION, _name_1);\n }\n visitedModelItems.add(d);\n }\n boolean _hasNext_1 = i.hasNext();\n _while = _hasNext_1;\n }\n }\n \n @Check\n public void checkUniqueListItemInListItem(final ListItem item) {\n final HashSet<ListItem> visitedListItems = CollectionLiterals.<ListItem>newHashSet();\n visitedListItems.add(item);\n EList<ListItem> items = item.getItemReferences();\n ListIterator<ListItem> i = items.listIterator();\n boolean _hasNext = i.hasNext();\n boolean _while = _hasNext;\n while (_while) {\n {\n ListItem _next = i.next();\n ListItem d = ((ListItem) _next);\n boolean _contains = visitedListItems.contains(d);\n if (_contains) {\n String _name = d.getName();\n String _plus = (\"duplicate item reference \\'\" + _name);\n String _plus_1 = (_plus + \"\\' in items\");\n EReference _listItem_ItemReferences = IntentSpecificationPackage.eINSTANCE.getListItem_ItemReferences();\n String _name_1 = d.getName();\n this.warning(_plus_1, _listItem_ItemReferences, \n IntentSpecificationValidator.UNIQUE_LIST_ITEM_LIST_ITEM, _name_1);\n }\n visitedListItems.add(d);\n }\n boolean _hasNext_1 = i.hasNext();\n _while = _hasNext_1;\n }\n }\n \n @Check\n public void checkUniqueModelItemInListItem(final ListItem item) {\n final HashSet<ModelItem> visitedModelItems = CollectionLiterals.<ModelItem>newHashSet();\n EList<ModelItem> items = item.getModelReferences();\n ListIterator<ModelItem> i = items.listIterator();\n boolean _hasNext = i.hasNext();\n boolean _while = _hasNext;\n while (_while) {\n {\n ModelItem _next = i.next();\n ModelItem d = ((ModelItem) _next);\n boolean _contains = visitedModelItems.contains(d);\n if (_contains) {\n String _name = d.getName();\n String _plus = (\"duplicate model reference \\'\" + _name);\n String _plus_1 = (_plus + \"\\' in models\");\n EReference _listItem_ModelReferences = IntentSpecificationPackage.eINSTANCE.getListItem_ModelReferences();\n String _name_1 = d.getName();\n this.warning(_plus_1, _listItem_ModelReferences, \n IntentSpecificationValidator.UNIQUE_MODEL_ITEM_LIST_ITEM, _name_1);\n }\n visitedModelItems.add(d);\n }\n boolean _hasNext_1 = i.hasNext();\n _while = _hasNext_1;\n }\n }", "new_methods": [ { "arguments": [ "final Refinement refinement" ], "filename": "net.certware.intent/xtend-gen/net/certware/intent/validation/IntentSpecificationValidator.java", "implementation": "final HashSet<String> visitedIntentTypeNames = CollectionLiterals.<String>newHashSet();\n EList<Intent> intents = refinement.getIntents();\n ListIterator<Intent> i = intents.listIterator();\n boolean _hasNext = i.hasNext();\n boolean _while = _hasNext;\n while (_while) {\n {\n Intent _next = i.next();\n Intent d = ((Intent) _next);\n IntentType _type = d.getType();\n String typeName = _type.getTypeName();\n boolean _contains = visitedIntentTypeNames.contains(typeName);\n if (_contains) {\n String _plus = (\"duplicate intent type \\'\" + typeName);\n String _plus_1 = (_plus + \"\\' in refinement\");\n EReference _refinement_Intents = IntentSpecificationPackage.eINSTANCE.getRefinement_Intents();\n String _name = d.getName();\n this.warning(_plus_1, _refinement_Intents, \n IntentSpecificationValidator.UNIQUE_INTENTS_REFINEMENT, _name);", "signature": "void checkUniqueIntentsInRefinement(final Refinement refinement)" }, { "arguments": [ "final Intent intent" ], "filename": "net.certware.intent/xtend-gen/net/certware/intent/validation/IntentSpecificationValidator.java", "implementation": "final HashSet<String> visitedDecompositionTypeNames = CollectionLiterals.<String>newHashSet();\n EList<Decomposition> decompositions = intent.getDecompositions();\n ListIterator<Decomposition> i = decompositions.listIterator();\n boolean _hasNext = i.hasNext();\n boolean _while = _hasNext;\n while (_while) {\n {\n Decomposition _next = i.next();\n Decomposition d = ((Decomposition) _next);\n DecompositionType _type = d.getType();\n String typeName = _type.getTypeName();\n boolean _contains = visitedDecompositionTypeNames.contains(typeName);\n if (_contains) {\n String _plus = (\"duplicate decomposition type \\'\" + typeName);\n String _plus_1 = (_plus + \"\\' in intent\");\n EReference _intent_Decompositions = IntentSpecificationPackage.eINSTANCE.getIntent_Decompositions();\n String _name = d.getName();\n this.warning(_plus_1, _intent_Decompositions, \n IntentSpecificationValidator.UNIQUE_DECOMPOSITION_INTENT, _name);", "signature": "void checkUniqueDecompositionInIntent(final Intent intent)" }, { "arguments": [ "final Decomposition decomposition" ], "filename": "net.certware.intent/xtend-gen/net/certware/intent/validation/IntentSpecificationValidator.java", "implementation": "final HashSet<ListItem> visitedListItems = CollectionLiterals.<ListItem>newHashSet();\n EList<ListItem> items = decomposition.getItems();\n ListIterator<ListItem> i = items.listIterator();\n boolean _hasNext = i.hasNext();\n boolean _while = _hasNext;\n while (_while) {\n {\n ListItem d = i.next();\n boolean _contains = visitedListItems.contains(d);\n if (_contains) {\n String _name = d.getName();\n String _plus = (\"duplicate item reference \\'\" + _name);\n String _plus_1 = (_plus + \"\\' in list\");\n EReference _decomposition_Items = IntentSpecificationPackage.eINSTANCE.getDecomposition_Items();\n String _name_1 = d.getName();\n this.warning(_plus_1, _decomposition_Items, \n IntentSpecificationValidator.UNIQUE_LIST_ITEM_DECOMPOSITION, _name_1);", "signature": "void checkUniqueListItemInDecomposition(final Decomposition decomposition)" }, { "arguments": [ "final Decomposition decomposition" ], "filename": "net.certware.intent/xtend-gen/net/certware/intent/validation/IntentSpecificationValidator.java", "implementation": "final HashSet<ModelItem> visitedModelItems = CollectionLiterals.<ModelItem>newHashSet();\n EList<ModelItem> items = decomposition.getModels();\n ListIterator<ModelItem> i = items.listIterator();\n boolean _hasNext = i.hasNext();\n boolean _while = _hasNext;\n while (_while) {\n {\n ModelItem _next = i.next();\n ModelItem d = ((ModelItem) _next);\n boolean _contains = visitedModelItems.contains(d);\n if (_contains) {\n String _name = d.getName();\n String _plus = (\"duplicate item reference \\'\" + _name);\n String _plus_1 = (_plus + \"\\' in models\");\n EReference _decomposition_Models = IntentSpecificationPackage.eINSTANCE.getDecomposition_Models();\n String _name_1 = d.getName();\n this.warning(_plus_1, _decomposition_Models, \n IntentSpecificationValidator.UNIQUE_MODEL_ITEM_DECOMPOSITION, _name_1);", "signature": "void checkUniqueModelItemInDecomposition(final Decomposition decomposition)" }, { "arguments": [ "final ListItem item" ], "filename": "net.certware.intent/xtend-gen/net/certware/intent/validation/IntentSpecificationValidator.java", "implementation": "final HashSet<ListItem> visitedListItems = CollectionLiterals.<ListItem>newHashSet();\n visitedListItems.add(item);\n EList<ListItem> items = item.getItemReferences();\n ListIterator<ListItem> i = items.listIterator();\n boolean _hasNext = i.hasNext();\n boolean _while = _hasNext;\n while (_while) {\n {\n ListItem _next = i.next();\n ListItem d = ((ListItem) _next);\n boolean _contains = visitedListItems.contains(d);\n if (_contains) {\n String _name = d.getName();\n String _plus = (\"duplicate item reference \\'\" + _name);\n String _plus_1 = (_plus + \"\\' in items\");\n EReference _listItem_ItemReferences = IntentSpecificationPackage.eINSTANCE.getListItem_ItemReferences();\n String _name_1 = d.getName();\n this.warning(_plus_1, _listItem_ItemReferences, \n IntentSpecificationValidator.UNIQUE_LIST_ITEM_LIST_ITEM, _name_1);", "signature": "void checkUniqueListItemInListItem(final ListItem item)" }, { "arguments": [ "final ListItem item" ], "filename": "net.certware.intent/xtend-gen/net/certware/intent/validation/IntentSpecificationValidator.java", "implementation": "final HashSet<ModelItem> visitedModelItems = CollectionLiterals.<ModelItem>newHashSet();\n EList<ModelItem> items = item.getModelReferences();\n ListIterator<ModelItem> i = items.listIterator();\n boolean _hasNext = i.hasNext();\n boolean _while = _hasNext;\n while (_while) {\n {\n ModelItem _next = i.next();\n ModelItem d = ((ModelItem) _next);\n boolean _contains = visitedModelItems.contains(d);\n if (_contains) {\n String _name = d.getName();\n String _plus = (\"duplicate model reference \\'\" + _name);\n String _plus_1 = (_plus + \"\\' in models\");\n EReference _listItem_ModelReferences = IntentSpecificationPackage.eINSTANCE.getListItem_ModelReferences();\n String _name_1 = d.getName();\n this.warning(_plus_1, _listItem_ModelReferences, \n IntentSpecificationValidator.UNIQUE_MODEL_ITEM_LIST_ITEM, _name_1);", "signature": "void checkUniqueModelItemInListItem(final ListItem item)" } ], "old_code": "", "old_methods": [], "patch": "@@ -3,7 +3,21 @@\n */\n package net.certware.intent.validation;\n \n+import java.util.HashSet;\n+import java.util.ListIterator;\n+import net.certware.intent.intentSpecification.Decomposition;\n+import net.certware.intent.intentSpecification.DecompositionType;\n+import net.certware.intent.intentSpecification.Intent;\n+import net.certware.intent.intentSpecification.IntentSpecificationPackage;\n+import net.certware.intent.intentSpecification.IntentType;\n+import net.certware.intent.intentSpecification.ListItem;\n+import net.certware.intent.intentSpecification.ModelItem;\n+import net.certware.intent.intentSpecification.Refinement;\n import net.certware.intent.validation.AbstractIntentSpecificationValidator;\n+import org.eclipse.emf.common.util.EList;\n+import org.eclipse.emf.ecore.EReference;\n+import org.eclipse.xtext.validation.Check;\n+import org.eclipse.xtext.xbase.lib.CollectionLiterals;\n \n /**\n * Custom validation rules.\n@@ -12,4 +26,185 @@\n */\n @SuppressWarnings(\"all\")\n public class IntentSpecificationValidator extends AbstractIntentSpecificationValidator {\n+ public final static String UNIQUE_INTENTS_REFINEMENT = \"net.certware.intent.UniqueIntentsRefinement\";\n+ \n+ public final static String UNIQUE_DECOMPOSITION_INTENT = \"net.certware.intent.UniqueDecompositionIntent\";\n+ \n+ public final static String UNIQUE_LIST_ITEM_DECOMPOSITION = \"net.certware.intent.UniqueListItemDecomposition\";\n+ \n+ public final static String UNIQUE_MODEL_ITEM_DECOMPOSITION = \"net.certware.intent.UniqueModelItemDecomposition\";\n+ \n+ public final static String UNIQUE_LIST_ITEM_LIST_ITEM = \"net.certware.intent.UniqueListItemListItem\";\n+ \n+ public final static String UNIQUE_MODEL_ITEM_LIST_ITEM = \"net.certware.intent.UniqueModelItemListItem\";\n+ \n+ @Check\n+ public void checkUniqueIntentsInRefinement(final Refinement refinement) {\n+ final HashSet<String> visitedIntentTypeNames = CollectionLiterals.<String>newHashSet();\n+ EList<Intent> intents = refinement.getIntents();\n+ ListIterator<Intent> i = intents.listIterator();\n+ boolean _hasNext = i.hasNext();\n+ boolean _while = _hasNext;\n+ while (_while) {\n+ {\n+ Intent _next = i.next();\n+ Intent d = ((Intent) _next);\n+ IntentType _type = d.getType();\n+ String typeName = _type.getTypeName();\n+ boolean _contains = visitedIntentTypeNames.contains(typeName);\n+ if (_contains) {\n+ String _plus = (\"duplicate intent type \\'\" + typeName);\n+ String _plus_1 = (_plus + \"\\' in refinement\");\n+ EReference _refinement_Intents = IntentSpecificationPackage.eINSTANCE.getRefinement_Intents();\n+ String _name = d.getName();\n+ this.warning(_plus_1, _refinement_Intents, \n+ IntentSpecificationValidator.UNIQUE_INTENTS_REFINEMENT, _name);\n+ }\n+ visitedIntentTypeNames.add(typeName);\n+ }\n+ boolean _hasNext_1 = i.hasNext();\n+ _while = _hasNext_1;\n+ }\n+ }\n+ \n+ @Check\n+ public void checkUniqueDecompositionInIntent(final Intent intent) {\n+ final HashSet<String> visitedDecompositionTypeNames = CollectionLiterals.<String>newHashSet();\n+ EList<Decomposition> decompositions = intent.getDecompositions();\n+ ListIterator<Decomposition> i = decompositions.listIterator();\n+ boolean _hasNext = i.hasNext();\n+ boolean _while = _hasNext;\n+ while (_while) {\n+ {\n+ Decomposition _next = i.next();\n+ Decomposition d = ((Decomposition) _next);\n+ DecompositionType _type = d.getType();\n+ String typeName = _type.getTypeName();\n+ boolean _contains = visitedDecompositionTypeNames.contains(typeName);\n+ if (_contains) {\n+ String _plus = (\"duplicate decomposition type \\'\" + typeName);\n+ String _plus_1 = (_plus + \"\\' in intent\");\n+ EReference _intent_Decompositions = IntentSpecificationPackage.eINSTANCE.getIntent_Decompositions();\n+ String _name = d.getName();\n+ this.warning(_plus_1, _intent_Decompositions, \n+ IntentSpecificationValidator.UNIQUE_DECOMPOSITION_INTENT, _name);\n+ }\n+ visitedDecompositionTypeNames.add(typeName);\n+ }\n+ boolean _hasNext_1 = i.hasNext();\n+ _while = _hasNext_1;\n+ }\n+ }\n+ \n+ @Check\n+ public void checkUniqueListItemInDecomposition(final Decomposition decomposition) {\n+ final HashSet<ListItem> visitedListItems = CollectionLiterals.<ListItem>newHashSet();\n+ EList<ListItem> items = decomposition.getItems();\n+ ListIterator<ListItem> i = items.listIterator();\n+ boolean _hasNext = i.hasNext();\n+ boolean _while = _hasNext;\n+ while (_while) {\n+ {\n+ ListItem d = i.next();\n+ boolean _contains = visitedListItems.contains(d);\n+ if (_contains) {\n+ String _name = d.getName();\n+ String _plus = (\"duplicate item reference \\'\" + _name);\n+ String _plus_1 = (_plus + \"\\' in list\");\n+ EReference _decomposition_Items = IntentSpecificationPackage.eINSTANCE.getDecomposition_Items();\n+ String _name_1 = d.getName();\n+ this.warning(_plus_1, _decomposition_Items, \n+ IntentSpecificationValidator.UNIQUE_LIST_ITEM_DECOMPOSITION, _name_1);\n+ }\n+ visitedListItems.add(d);\n+ }\n+ boolean _hasNext_1 = i.hasNext();\n+ _while = _hasNext_1;\n+ }\n+ }\n+ \n+ @Check\n+ public void checkUniqueModelItemInDecomposition(final Decomposition decomposition) {\n+ final HashSet<ModelItem> visitedModelItems = CollectionLiterals.<ModelItem>newHashSet();\n+ EList<ModelItem> items = decomposition.getModels();\n+ ListIterator<ModelItem> i = items.listIterator();\n+ boolean _hasNext = i.hasNext();\n+ boolean _while = _hasNext;\n+ while (_while) {\n+ {\n+ ModelItem _next = i.next();\n+ ModelItem d = ((ModelItem) _next);\n+ boolean _contains = visitedModelItems.contains(d);\n+ if (_contains) {\n+ String _name = d.getName();\n+ String _plus = (\"duplicate item reference \\'\" + _name);\n+ String _plus_1 = (_plus + \"\\' in models\");\n+ EReference _decomposition_Models = IntentSpecificationPackage.eINSTANCE.getDecomposition_Models();\n+ String _name_1 = d.getName();\n+ this.warning(_plus_1, _decomposition_Models, \n+ IntentSpecificationValidator.UNIQUE_MODEL_ITEM_DECOMPOSITION, _name_1);\n+ }\n+ visitedModelItems.add(d);\n+ }\n+ boolean _hasNext_1 = i.hasNext();\n+ _while = _hasNext_1;\n+ }\n+ }\n+ \n+ @Check\n+ public void checkUniqueListItemInListItem(final ListItem item) {\n+ final HashSet<ListItem> visitedListItems = CollectionLiterals.<ListItem>newHashSet();\n+ visitedListItems.add(item);\n+ EList<ListItem> items = item.getItemReferences();\n+ ListIterator<ListItem> i = items.listIterator();\n+ boolean _hasNext = i.hasNext();\n+ boolean _while = _hasNext;\n+ while (_while) {\n+ {\n+ ListItem _next = i.next();\n+ ListItem d = ((ListItem) _next);\n+ boolean _contains = visitedListItems.contains(d);\n+ if (_contains) {\n+ String _name = d.getName();\n+ String _plus = (\"duplicate item reference \\'\" + _name);\n+ String _plus_1 = (_plus + \"\\' in items\");\n+ EReference _listItem_ItemReferences = IntentSpecificationPackage.eINSTANCE.getListItem_ItemReferences();\n+ String _name_1 = d.getName();\n+ this.warning(_plus_1, _listItem_ItemReferences, \n+ IntentSpecificationValidator.UNIQUE_LIST_ITEM_LIST_ITEM, _name_1);\n+ }\n+ visitedListItems.add(d);\n+ }\n+ boolean _hasNext_1 = i.hasNext();\n+ _while = _hasNext_1;\n+ }\n+ }\n+ \n+ @Check\n+ public void checkUniqueModelItemInListItem(final ListItem item) {\n+ final HashSet<ModelItem> visitedModelItems = CollectionLiterals.<ModelItem>newHashSet();\n+ EList<ModelItem> items = item.getModelReferences();\n+ ListIterator<ModelItem> i = items.listIterator();\n+ boolean _hasNext = i.hasNext();\n+ boolean _while = _hasNext;\n+ while (_while) {\n+ {\n+ ModelItem _next = i.next();\n+ ModelItem d = ((ModelItem) _next);\n+ boolean _contains = visitedModelItems.contains(d);\n+ if (_contains) {\n+ String _name = d.getName();\n+ String _plus = (\"duplicate model reference \\'\" + _name);\n+ String _plus_1 = (_plus + \"\\' in models\");\n+ EReference _listItem_ModelReferences = IntentSpecificationPackage.eINSTANCE.getListItem_ModelReferences();\n+ String _name_1 = d.getName();\n+ this.warning(_plus_1, _listItem_ModelReferences, \n+ IntentSpecificationValidator.UNIQUE_MODEL_ITEM_LIST_ITEM, _name_1);\n+ }\n+ visitedModelItems.add(d);\n+ }\n+ boolean _hasNext_1 = i.hasNext();\n+ _while = _hasNext_1;\n+ }\n+ }\n }", "raw_url": "https://github.com/nasa/CertWare/raw/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fxtend-gen%2Fnet%2Fcertware%2Fintent%2Fvalidation%2FIntentSpecificationValidator.java", "sha": "7af1db4fbd8a74caeb5142984fb685a77b01a4fa", "status": "modified" } ]
42
[ { "name": "nasa$certware", "new_args": "", "new_implementation": "return cTypeNameAlternatives_0;", "new_return_type": "Alternatives", "new_signature": "Alternatives getTypeNameAlternatives_0()", "old_args": "", "old_implementation": "return cAlternatives;", "old_return_type": "Alternatives", "old_signature": "Alternatives getAlternatives()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cTypeNameAlternatives_0;", "new_return_type": "Alternatives", "new_signature": "Alternatives getTypeNameAlternatives_0()", "old_args": "", "old_implementation": "return cAlternatives;", "old_return_type": "Alternatives", "old_signature": "Alternatives getAlternatives()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cTypeNameAlternatives_0;", "new_return_type": "Alternatives", "new_signature": "Alternatives getTypeNameAlternatives_0()", "old_args": "", "old_implementation": "return cAlternatives;", "old_return_type": "Alternatives", "old_signature": "Alternatives getAlternatives()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cTypeNameAlternatives_0;", "new_return_type": "Alternatives", "new_signature": "Alternatives getTypeNameAlternatives_0()", "old_args": "", "old_implementation": "return cAlternatives;", "old_return_type": "Alternatives", "old_signature": "Alternatives getAlternatives()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cTypeNameAlternatives_0;", "new_return_type": "Alternatives", "new_signature": "Alternatives getTypeNameAlternatives_0()", "old_args": "", "old_implementation": "return cAlternatives;", "old_return_type": "Alternatives", "old_signature": "Alternatives getAlternatives()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cTypeNameBasicKeyword_0_0;", "new_return_type": "Keyword", "new_signature": "Keyword getTypeNameBasicKeyword_0_0()", "old_args": "", "old_implementation": "return cBasicKeyword_0;", "old_return_type": "Keyword", "old_signature": "Keyword getBasicKeyword_0()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cTypeNameBreakKeyword_0_2;", "new_return_type": "Keyword", "new_signature": "Keyword getTypeNameBreakKeyword_0_2()", "old_args": "", "old_implementation": "return cBreakKeyword_2;", "old_return_type": "Keyword", "old_signature": "Keyword getBreakKeyword_2()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cTypeNameConditionKeyword_0_0;", "new_return_type": "Keyword", "new_signature": "Keyword getTypeNameConditionKeyword_0_0()", "old_args": "", "old_implementation": "return cConditionKeyword_0;", "old_return_type": "Keyword", "old_signature": "Keyword getConditionKeyword_0()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cTypeNameConstraintKeyword_0_3;", "new_return_type": "Keyword", "new_signature": "Keyword getTypeNameConstraintKeyword_0_3()", "old_args": "", "old_implementation": "return cConstraintKeyword_3;", "old_return_type": "Keyword", "old_signature": "Keyword getConstraintKeyword_3()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cTypeNameDesignKeyword_0_4;", "new_return_type": "Keyword", "new_signature": "Keyword getTypeNameDesignKeyword_0_4()", "old_args": "", "old_implementation": "return cDesignKeyword_4;", "old_return_type": "Keyword", "old_signature": "Keyword getDesignKeyword_4()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cTypeNameEnvironmentKeyword_0_0;", "new_return_type": "Keyword", "new_signature": "Keyword getTypeNameEnvironmentKeyword_0_0()", "old_args": "", "old_implementation": "return cEnvironmentKeyword_0;", "old_return_type": "Keyword", "old_signature": "Keyword getEnvironmentKeyword_0()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cTypeNameFigureKeyword_0_1;", "new_return_type": "Keyword", "new_signature": "Keyword getTypeNameFigureKeyword_0_1()", "old_args": "", "old_implementation": "return cFigureKeyword_1;", "old_return_type": "Keyword", "old_signature": "Keyword getFigureKeyword_1()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cTypeNameFunctionKeyword_0_4;", "new_return_type": "Keyword", "new_signature": "Keyword getTypeNameFunctionKeyword_0_4()", "old_args": "", "old_implementation": "return cFunctionKeyword_4;", "old_return_type": "Keyword", "old_signature": "Keyword getFunctionKeyword_4()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cTypeNameGoalKeyword_0_1;", "new_return_type": "Keyword", "new_signature": "Keyword getTypeNameGoalKeyword_0_1()", "old_args": "", "old_implementation": "return cGoalKeyword_1;", "old_return_type": "Keyword", "old_signature": "Keyword getGoalKeyword_1()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cTypeNameHazardKeyword_0_2;", "new_return_type": "Keyword", "new_signature": "Keyword getTypeNameHazardKeyword_0_2()", "old_args": "", "old_implementation": "return cHazardKeyword_2;", "old_return_type": "Keyword", "old_signature": "Keyword getHazardKeyword_2()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cNameAssignment_1;", "new_return_type": "Assignment", "new_signature": "Assignment getNameAssignment_1()", "old_args": "", "old_implementation": "return cIdAssignment_1;", "old_return_type": "Assignment", "old_signature": "Assignment getIdAssignment_1()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cNameAssignment_1;", "new_return_type": "Assignment", "new_signature": "Assignment getNameAssignment_1()", "old_args": "", "old_implementation": "return cIdAssignment_1;", "old_return_type": "Assignment", "old_signature": "Assignment getIdAssignment_1()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cNameAssignment_1;", "new_return_type": "Assignment", "new_signature": "Assignment getNameAssignment_1()", "old_args": "", "old_implementation": "return cIdAssignment_1;", "old_return_type": "Assignment", "old_signature": "Assignment getIdAssignment_1()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cNameAssignment_1;", "new_return_type": "Assignment", "new_signature": "Assignment getNameAssignment_1()", "old_args": "", "old_implementation": "return cIdAssignment_1;", "old_return_type": "Assignment", "old_signature": "Assignment getIdAssignment_1()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cNameAssignment_1;", "new_return_type": "Assignment", "new_signature": "Assignment getNameAssignment_1()", "old_args": "", "old_implementation": "return cIdAssignment_1;", "old_return_type": "Assignment", "old_signature": "Assignment getIdAssignment_1()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cNameAssignment_1;", "new_return_type": "Assignment", "new_signature": "Assignment getNameAssignment_1()", "old_args": "", "old_implementation": "return cIdAssignment_1;", "old_return_type": "Assignment", "old_signature": "Assignment getIdAssignment_1()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cNameAssignment_1;", "new_return_type": "Assignment", "new_signature": "Assignment getNameAssignment_1()", "old_args": "", "old_implementation": "return cIdAssignment_1;", "old_return_type": "Assignment", "old_signature": "Assignment getIdAssignment_1()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cNameIDTerminalRuleCall_1_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getNameIDTerminalRuleCall_1_0()", "old_args": "", "old_implementation": "return cIdIDTerminalRuleCall_1_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getIdIDTerminalRuleCall_1_0()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cNameIDTerminalRuleCall_1_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getNameIDTerminalRuleCall_1_0()", "old_args": "", "old_implementation": "return cIdIDTerminalRuleCall_1_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getIdIDTerminalRuleCall_1_0()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cNameIDTerminalRuleCall_1_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getNameIDTerminalRuleCall_1_0()", "old_args": "", "old_implementation": "return cIdIDTerminalRuleCall_1_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getIdIDTerminalRuleCall_1_0()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cNameIDTerminalRuleCall_1_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getNameIDTerminalRuleCall_1_0()", "old_args": "", "old_implementation": "return cIdIDTerminalRuleCall_1_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getIdIDTerminalRuleCall_1_0()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cNameIDTerminalRuleCall_1_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getNameIDTerminalRuleCall_1_0()", "old_args": "", "old_implementation": "return cIdIDTerminalRuleCall_1_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getIdIDTerminalRuleCall_1_0()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cNameIDTerminalRuleCall_1_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getNameIDTerminalRuleCall_1_0()", "old_args": "", "old_implementation": "return cIdIDTerminalRuleCall_1_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getIdIDTerminalRuleCall_1_0()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cNameIDTerminalRuleCall_1_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getNameIDTerminalRuleCall_1_0()", "old_args": "", "old_implementation": "return cIdIDTerminalRuleCall_1_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getIdIDTerminalRuleCall_1_0()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cTypeNameImplementationKeyword_0_5;", "new_return_type": "Keyword", "new_signature": "Keyword getTypeNameImplementationKeyword_0_5()", "old_args": "", "old_implementation": "return cImplementationKeyword_5;", "old_return_type": "Keyword", "old_signature": "Keyword getImplementationKeyword_5()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cTypeNameInputKeyword_0_5;", "new_return_type": "Keyword", "new_signature": "Keyword getTypeNameInputKeyword_0_5()", "old_args": "", "old_implementation": "return cInputKeyword_5;", "old_return_type": "Keyword", "old_signature": "Keyword getInputKeyword_5()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cTypeNameMacroKeyword_0_3;", "new_return_type": "Keyword", "new_signature": "Keyword getTypeNameMacroKeyword_0_3()", "old_args": "", "old_implementation": "return cMacroKeyword_3;", "old_return_type": "Keyword", "old_signature": "Keyword getMacroKeyword_3()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cTypeNameModeKeyword_0_1;", "new_return_type": "Keyword", "new_signature": "Keyword getTypeNameModeKeyword_0_1()", "old_args": "", "old_implementation": "return cModeKeyword_1;", "old_return_type": "Keyword", "old_signature": "Keyword getModeKeyword_1()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cTypeNameModelKeyword_0_3;", "new_return_type": "Keyword", "new_signature": "Keyword getTypeNameModelKeyword_0_3()", "old_args": "", "old_implementation": "return cModelKeyword_3;", "old_return_type": "Keyword", "old_signature": "Keyword getModelKeyword_3()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cTypeNameModelsKeyword_0_3;", "new_return_type": "Keyword", "new_signature": "Keyword getTypeNameModelsKeyword_0_3()", "old_args": "", "old_implementation": "return cModelsKeyword_3;", "old_return_type": "Keyword", "old_signature": "Keyword getModelsKeyword_3()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cTypeNameOperationKeyword_0_6;", "new_return_type": "Keyword", "new_signature": "Keyword getTypeNameOperationKeyword_0_6()", "old_args": "", "old_implementation": "return cOperationKeyword_6;", "old_return_type": "Keyword", "old_signature": "Keyword getOperationKeyword_6()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cTypeNameOperatorKeyword_0_1;", "new_return_type": "Keyword", "new_signature": "Keyword getTypeNameOperatorKeyword_0_1()", "old_args": "", "old_implementation": "return cOperatorKeyword_1;", "old_return_type": "Keyword", "old_signature": "Keyword getOperatorKeyword_1()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cTypeNameOutputKeyword_0_0;", "new_return_type": "Keyword", "new_signature": "Keyword getTypeNameOutputKeyword_0_0()", "old_args": "", "old_implementation": "return cOutputKeyword_0;", "old_return_type": "Keyword", "old_signature": "Keyword getOutputKeyword_0()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cTypeNameParagraphKeyword_0_4;", "new_return_type": "Keyword", "new_signature": "Keyword getTypeNameParagraphKeyword_0_4()", "old_args": "", "old_implementation": "return cParagraphKeyword_4;", "old_return_type": "Keyword", "old_signature": "Keyword getParagraphKeyword_4()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cTypeNamePrinciplesKeyword_0_2;", "new_return_type": "Keyword", "new_signature": "Keyword getTypeNamePrinciplesKeyword_0_2()", "old_args": "", "old_implementation": "return cPrinciplesKeyword_2;", "old_return_type": "Keyword", "old_signature": "Keyword getPrinciplesKeyword_2()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cTypeNamePurposeKeyword_0_1;", "new_return_type": "Keyword", "new_signature": "Keyword getTypeNamePurposeKeyword_0_1()", "old_args": "", "old_implementation": "return cPurposeKeyword_1;", "old_return_type": "Keyword", "old_signature": "Keyword getPurposeKeyword_1()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cTypeNameRequirementKeyword_0_0;", "new_return_type": "Keyword", "new_signature": "Keyword getTypeNameRequirementKeyword_0_0()", "old_args": "", "old_implementation": "return cRequirementKeyword_0;", "old_return_type": "Keyword", "old_signature": "Keyword getRequirementKeyword_0()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cTypeNameSectionKeyword_0_5;", "new_return_type": "Keyword", "new_signature": "Keyword getTypeNameSectionKeyword_0_5()", "old_args": "", "old_implementation": "return cSectionKeyword_5;", "old_return_type": "Keyword", "old_signature": "Keyword getSectionKeyword_5()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cTypeNameStateKeyword_0_2;", "new_return_type": "Keyword", "new_signature": "Keyword getTypeNameStateKeyword_0_2()", "old_args": "", "old_implementation": "return cStateKeyword_2;", "old_return_type": "Keyword", "old_signature": "Keyword getStateKeyword_2()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cTypeNameSystemKeyword_0_2;", "new_return_type": "Keyword", "new_signature": "Keyword getTypeNameSystemKeyword_0_2()", "old_args": "", "old_implementation": "return cSystemKeyword_2;", "old_return_type": "Keyword", "old_signature": "Keyword getSystemKeyword_2()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cTypeNameTableKeyword_0_6;", "new_return_type": "Keyword", "new_signature": "Keyword getTypeNameTableKeyword_0_6()", "old_args": "", "old_implementation": "return cTableKeyword_6;", "old_return_type": "Keyword", "old_signature": "Keyword getTableKeyword_6()" }, { "name": "nasa$certware", "new_args": "", "new_implementation": "return cTypeNameVerificationKeyword_0_3;", "new_return_type": "Keyword", "new_signature": "Keyword getTypeNameVerificationKeyword_0_3()", "old_args": "", "old_implementation": "return cVerificationKeyword_3;", "old_return_type": "Keyword", "old_signature": "Keyword getVerificationKeyword_3()" } ]
47
82
4249b9b8e406cfef551c36071a4c42528d0fe8a5
[ { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void bJ()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void bF()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "protected void aA() {\n protected void bo() {", "new_return_type": "void", "new_signature": "void bK()", "old_args": "", "old_implementation": "protected void az() {\n protected void bk() {", "old_return_type": "void", "old_signature": "void bG()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void bM()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void bJ()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "int", "new_signature": "int cG()", "old_args": "", "old_implementation": null, "old_return_type": "int", "old_signature": "int cC()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void cO()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void cK()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "float f0", "new_implementation": null, "new_return_type": "float", "new_signature": "float p(float f0)", "old_args": "float f0", "old_implementation": null, "old_return_type": "float", "old_signature": "float o(float f0)" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "boolean", "new_signature": "boolean aB()", "old_args": "", "old_implementation": null, "old_return_type": "boolean", "old_signature": "boolean aA()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void aI()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void aF()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {", "new_return_type": "String", "new_signature": "String aN()", "old_args": "", "old_implementation": "protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {", "old_return_type": "String", "old_signature": "String aK()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {", "new_return_type": "String", "new_signature": "String aN()", "old_args": "", "old_implementation": "protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {", "old_return_type": "String", "old_signature": "String aK()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {", "new_return_type": "String", "new_signature": "String aN()", "old_args": "", "old_implementation": "protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {", "old_return_type": "String", "old_signature": "String aK()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {", "new_return_type": "String", "new_signature": "String aN()", "old_args": "", "old_implementation": "protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {", "old_return_type": "String", "old_signature": "String aK()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {", "new_return_type": "String", "new_signature": "String aN()", "old_args": "", "old_implementation": "protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {", "old_return_type": "String", "old_signature": "String aK()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {", "new_return_type": "String", "new_signature": "String aN()", "old_args": "", "old_implementation": "protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {", "old_return_type": "String", "old_signature": "String aK()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {", "new_return_type": "String", "new_signature": "String aN()", "old_args": "", "old_implementation": "protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {", "old_return_type": "String", "old_signature": "String aK()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {", "new_return_type": "String", "new_signature": "String aN()", "old_args": "", "old_implementation": "protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {", "old_return_type": "String", "old_signature": "String aK()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {", "new_return_type": "String", "new_signature": "String aN()", "old_args": "", "old_implementation": "protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {", "old_return_type": "String", "old_signature": "String aK()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {", "new_return_type": "String", "new_signature": "String aN()", "old_args": "", "old_implementation": "protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {", "old_return_type": "String", "old_signature": "String aK()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {", "new_return_type": "String", "new_signature": "String aN()", "old_args": "", "old_implementation": "protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {", "old_return_type": "String", "old_signature": "String aK()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {", "new_return_type": "String", "new_signature": "String aN()", "old_args": "", "old_implementation": "protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {", "old_return_type": "String", "old_signature": "String aK()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {", "new_return_type": "String", "new_signature": "String aN()", "old_args": "", "old_implementation": "protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {", "old_return_type": "String", "old_signature": "String aK()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {", "new_return_type": "String", "new_signature": "String aN()", "old_args": "", "old_implementation": "protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {", "old_return_type": "String", "old_signature": "String aK()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {", "new_return_type": "String", "new_signature": "String aN()", "old_args": "", "old_implementation": "protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {", "old_return_type": "String", "old_signature": "String aK()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {", "new_return_type": "String", "new_signature": "String aN()", "old_args": "", "old_implementation": "protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {", "old_return_type": "String", "old_signature": "String aK()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {", "new_return_type": "String", "new_signature": "String aN()", "old_args": "", "old_implementation": "protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {", "old_return_type": "String", "old_signature": "String aK()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {", "new_return_type": "String", "new_signature": "String aN()", "old_args": "", "old_implementation": "protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {", "old_return_type": "String", "old_signature": "String aK()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {", "new_return_type": "String", "new_signature": "String aN()", "old_args": "", "old_implementation": "protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {", "old_return_type": "String", "old_signature": "String aK()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {", "new_return_type": "String", "new_signature": "String aN()", "old_args": "", "old_implementation": "protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {", "old_return_type": "String", "old_signature": "String aK()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {", "new_return_type": "String", "new_signature": "String aN()", "old_args": "", "old_implementation": "protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {", "old_return_type": "String", "old_signature": "String aK()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {", "new_return_type": "String", "new_signature": "String aN()", "old_args": "", "old_implementation": "protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {", "old_return_type": "String", "old_signature": "String aK()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {", "new_return_type": "String", "new_signature": "String aN()", "old_args": "", "old_implementation": "protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {", "old_return_type": "String", "old_signature": "String aK()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {", "new_return_type": "String", "new_signature": "String aN()", "old_args": "", "old_implementation": "protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {", "old_return_type": "String", "old_signature": "String aK()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {", "new_return_type": "String", "new_signature": "String aN()", "old_args": "", "old_implementation": "protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {", "old_return_type": "String", "old_signature": "String aK()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {", "new_return_type": "String", "new_signature": "String aN()", "old_args": "", "old_implementation": "protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {", "old_return_type": "String", "old_signature": "String aK()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "String", "new_signature": "String aO()", "old_args": "", "old_implementation": null, "old_return_type": "String", "old_signature": "String aL()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "String", "new_signature": "String aO()", "old_args": "", "old_implementation": null, "old_return_type": "String", "old_signature": "String aL()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "String", "new_signature": "String aO()", "old_args": "", "old_implementation": null, "old_return_type": "String", "old_signature": "String aL()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "String", "new_signature": "String aO()", "old_args": "", "old_implementation": null, "old_return_type": "String", "old_signature": "String aL()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "String", "new_signature": "String aO()", "old_args": "", "old_implementation": null, "old_return_type": "String", "old_signature": "String aL()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "String", "new_signature": "String aO()", "old_args": "", "old_implementation": null, "old_return_type": "String", "old_signature": "String aL()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "String", "new_signature": "String aO()", "old_args": "", "old_implementation": null, "old_return_type": "String", "old_signature": "String aL()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "String", "new_signature": "String aO()", "old_args": "", "old_implementation": null, "old_return_type": "String", "old_signature": "String aL()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "String", "new_signature": "String aO()", "old_args": "", "old_implementation": null, "old_return_type": "String", "old_signature": "String aL()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "String", "new_signature": "String aO()", "old_args": "", "old_implementation": null, "old_return_type": "String", "old_signature": "String aL()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "String", "new_signature": "String aO()", "old_args": "", "old_implementation": null, "old_return_type": "String", "old_signature": "String aL()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "String", "new_signature": "String aO()", "old_args": "", "old_implementation": null, "old_return_type": "String", "old_signature": "String aL()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "String", "new_signature": "String aO()", "old_args": "", "old_implementation": null, "old_return_type": "String", "old_signature": "String aL()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "String", "new_signature": "String aO()", "old_args": "", "old_implementation": null, "old_return_type": "String", "old_signature": "String aL()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "String", "new_signature": "String aO()", "old_args": "", "old_implementation": null, "old_return_type": "String", "old_signature": "String aL()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "String", "new_signature": "String aO()", "old_args": "", "old_implementation": null, "old_return_type": "String", "old_signature": "String aL()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "String", "new_signature": "String aO()", "old_args": "", "old_implementation": null, "old_return_type": "String", "old_signature": "String aL()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "String", "new_signature": "String aO()", "old_args": "", "old_implementation": null, "old_return_type": "String", "old_signature": "String aL()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "String", "new_signature": "String aO()", "old_args": "", "old_implementation": null, "old_return_type": "String", "old_signature": "String aL()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "String", "new_signature": "String aO()", "old_args": "", "old_implementation": null, "old_return_type": "String", "old_signature": "String aL()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "String", "new_signature": "String aO()", "old_args": "", "old_implementation": null, "old_return_type": "String", "old_signature": "String aL()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "String", "new_signature": "String aO()", "old_args": "", "old_implementation": null, "old_return_type": "String", "old_signature": "String aL()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "String", "new_signature": "String aO()", "old_args": "", "old_implementation": null, "old_return_type": "String", "old_signature": "String aL()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "String", "new_signature": "String aO()", "old_args": "", "old_implementation": null, "old_return_type": "String", "old_signature": "String aL()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "String", "new_signature": "String aO()", "old_args": "", "old_implementation": null, "old_return_type": "String", "old_signature": "String aL()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void aV()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void aS()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "protected float ba() {\n protected boolean bb() {\n return this.aM() <= 0.0F;\n protected void bd() {\n if (this.ah()) {\n this.a(f0, f1, this.be() ? 0.04F : 0.02F);\n f4 = this.bf() * f3;\n boolean flag0 = this.ag() && this instanceof EntityPlayer;\n protected boolean be() {\n public float bf() {\n return this.be() ? this.bp : 0.1F;\n this.bp = f0;\n public boolean bg() {\n int i0 = this.aT();\n if (this.bq > 0) {\n --this.bq;", "new_return_type": "float", "new_signature": "float aZ()", "old_args": "", "old_implementation": "protected float aX() {\n protected boolean aY() {\n return this.aJ() <= 0.0F;\n protected void ba() {\n if (this.ag()) {\n this.a(f0, f1, this.bb() ? 0.04F : 0.02F);\n f4 = this.bc() * f3;\n boolean flag0 = this.af() && this instanceof EntityPlayer;\n protected boolean bb() {\n public float bc() {\n return this.bb() ? this.bo : 0.1F;\n this.bo = f0;\n public boolean bd() {\n int i0 = this.aQ();\n if (this.bp > 0) {\n --this.bp;", "old_return_type": "float", "old_signature": "float aW()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "protected float ba() {\n protected boolean bb() {\n return this.aM() <= 0.0F;\n protected void bd() {\n if (this.ah()) {\n this.a(f0, f1, this.be() ? 0.04F : 0.02F);\n f4 = this.bf() * f3;\n boolean flag0 = this.ag() && this instanceof EntityPlayer;\n protected boolean be() {\n public float bf() {\n return this.be() ? this.bp : 0.1F;\n this.bp = f0;\n public boolean bg() {\n int i0 = this.aT();\n if (this.bq > 0) {\n --this.bq;", "new_return_type": "float", "new_signature": "float aZ()", "old_args": "", "old_implementation": "protected float aX() {\n protected boolean aY() {\n return this.aJ() <= 0.0F;\n protected void ba() {\n if (this.ag()) {\n this.a(f0, f1, this.bb() ? 0.04F : 0.02F);\n f4 = this.bc() * f3;\n boolean flag0 = this.af() && this instanceof EntityPlayer;\n protected boolean bb() {\n public float bc() {\n return this.bb() ? this.bo : 0.1F;\n this.bo = f0;\n public boolean bd() {\n int i0 = this.aQ();\n if (this.bp > 0) {\n --this.bp;", "old_return_type": "float", "old_signature": "float aW()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "protected float ba() {\n protected boolean bb() {\n return this.aM() <= 0.0F;\n protected void bd() {\n if (this.ah()) {\n this.a(f0, f1, this.be() ? 0.04F : 0.02F);\n f4 = this.bf() * f3;\n boolean flag0 = this.ag() && this instanceof EntityPlayer;\n protected boolean be() {\n public float bf() {\n return this.be() ? this.bp : 0.1F;\n this.bp = f0;\n public boolean bg() {\n int i0 = this.aT();\n if (this.bq > 0) {\n --this.bq;", "new_return_type": "float", "new_signature": "float aZ()", "old_args": "", "old_implementation": "protected float aX() {\n protected boolean aY() {\n return this.aJ() <= 0.0F;\n protected void ba() {\n if (this.ag()) {\n this.a(f0, f1, this.bb() ? 0.04F : 0.02F);\n f4 = this.bc() * f3;\n boolean flag0 = this.af() && this instanceof EntityPlayer;\n protected boolean bb() {\n public float bc() {\n return this.bb() ? this.bo : 0.1F;\n this.bo = f0;\n public boolean bd() {\n int i0 = this.aQ();\n if (this.bp > 0) {\n --this.bp;", "old_return_type": "float", "old_signature": "float aW()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "protected float ba() {\n protected boolean bb() {\n return this.aM() <= 0.0F;\n protected void bd() {\n if (this.ah()) {\n this.a(f0, f1, this.be() ? 0.04F : 0.02F);\n f4 = this.bf() * f3;\n boolean flag0 = this.ag() && this instanceof EntityPlayer;\n protected boolean be() {\n public float bf() {\n return this.be() ? this.bp : 0.1F;\n this.bp = f0;\n public boolean bg() {\n int i0 = this.aT();\n if (this.bq > 0) {\n --this.bq;", "new_return_type": "float", "new_signature": "float aZ()", "old_args": "", "old_implementation": "protected float aX() {\n protected boolean aY() {\n return this.aJ() <= 0.0F;\n protected void ba() {\n if (this.ag()) {\n this.a(f0, f1, this.bb() ? 0.04F : 0.02F);\n f4 = this.bc() * f3;\n boolean flag0 = this.af() && this instanceof EntityPlayer;\n protected boolean bb() {\n public float bc() {\n return this.bb() ? this.bo : 0.1F;\n this.bo = f0;\n public boolean bd() {\n int i0 = this.aQ();\n if (this.bp > 0) {\n --this.bp;", "old_return_type": "float", "old_signature": "float aW()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "protected float ba() {\n protected boolean bb() {\n return this.aM() <= 0.0F;\n protected void bd() {\n if (this.ah()) {\n this.a(f0, f1, this.be() ? 0.04F : 0.02F);\n f4 = this.bf() * f3;\n boolean flag0 = this.ag() && this instanceof EntityPlayer;\n protected boolean be() {\n public float bf() {\n return this.be() ? this.bp : 0.1F;\n this.bp = f0;\n public boolean bg() {\n int i0 = this.aT();\n if (this.bq > 0) {\n --this.bq;", "new_return_type": "float", "new_signature": "float aZ()", "old_args": "", "old_implementation": "protected float aX() {\n protected boolean aY() {\n return this.aJ() <= 0.0F;\n protected void ba() {\n if (this.ag()) {\n this.a(f0, f1, this.bb() ? 0.04F : 0.02F);\n f4 = this.bc() * f3;\n boolean flag0 = this.af() && this instanceof EntityPlayer;\n protected boolean bb() {\n public float bc() {\n return this.bb() ? this.bo : 0.1F;\n this.bo = f0;\n public boolean bd() {\n int i0 = this.aQ();\n if (this.bp > 0) {\n --this.bp;", "old_return_type": "float", "old_signature": "float aW()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "protected float ba() {\n protected boolean bb() {\n return this.aM() <= 0.0F;\n protected void bd() {\n if (this.ah()) {\n this.a(f0, f1, this.be() ? 0.04F : 0.02F);\n f4 = this.bf() * f3;\n boolean flag0 = this.ag() && this instanceof EntityPlayer;\n protected boolean be() {\n public float bf() {\n return this.be() ? this.bp : 0.1F;\n this.bp = f0;\n public boolean bg() {\n int i0 = this.aT();\n if (this.bq > 0) {\n --this.bq;", "new_return_type": "float", "new_signature": "float aZ()", "old_args": "", "old_implementation": "protected float aX() {\n protected boolean aY() {\n return this.aJ() <= 0.0F;\n protected void ba() {\n if (this.ag()) {\n this.a(f0, f1, this.bb() ? 0.04F : 0.02F);\n f4 = this.bc() * f3;\n boolean flag0 = this.af() && this instanceof EntityPlayer;\n protected boolean bb() {\n public float bc() {\n return this.bb() ? this.bo : 0.1F;\n this.bo = f0;\n public boolean bd() {\n int i0 = this.aQ();\n if (this.bp > 0) {\n --this.bp;", "old_return_type": "float", "old_signature": "float aW()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "protected float ba() {\n protected boolean bb() {\n return this.aM() <= 0.0F;\n protected void bd() {\n if (this.ah()) {\n this.a(f0, f1, this.be() ? 0.04F : 0.02F);\n f4 = this.bf() * f3;\n boolean flag0 = this.ag() && this instanceof EntityPlayer;\n protected boolean be() {\n public float bf() {\n return this.be() ? this.bp : 0.1F;\n this.bp = f0;\n public boolean bg() {\n int i0 = this.aT();\n if (this.bq > 0) {\n --this.bq;", "new_return_type": "float", "new_signature": "float aZ()", "old_args": "", "old_implementation": "protected float aX() {\n protected boolean aY() {\n return this.aJ() <= 0.0F;\n protected void ba() {\n if (this.ag()) {\n this.a(f0, f1, this.bb() ? 0.04F : 0.02F);\n f4 = this.bc() * f3;\n boolean flag0 = this.af() && this instanceof EntityPlayer;\n protected boolean bb() {\n public float bc() {\n return this.bb() ? this.bo : 0.1F;\n this.bo = f0;\n public boolean bd() {\n int i0 = this.aQ();\n if (this.bp > 0) {\n --this.bp;", "old_return_type": "float", "old_signature": "float aW()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "protected float ba() {\n protected boolean bb() {\n return this.aM() <= 0.0F;\n protected void bd() {\n if (this.ah()) {\n this.a(f0, f1, this.be() ? 0.04F : 0.02F);\n f4 = this.bf() * f3;\n boolean flag0 = this.ag() && this instanceof EntityPlayer;\n protected boolean be() {\n public float bf() {\n return this.be() ? this.bp : 0.1F;\n this.bp = f0;\n public boolean bg() {\n int i0 = this.aT();\n if (this.bq > 0) {\n --this.bq;", "new_return_type": "float", "new_signature": "float aZ()", "old_args": "", "old_implementation": "protected float aX() {\n protected boolean aY() {\n return this.aJ() <= 0.0F;\n protected void ba() {\n if (this.ag()) {\n this.a(f0, f1, this.bb() ? 0.04F : 0.02F);\n f4 = this.bc() * f3;\n boolean flag0 = this.af() && this instanceof EntityPlayer;\n protected boolean bb() {\n public float bc() {\n return this.bb() ? this.bo : 0.1F;\n this.bo = f0;\n public boolean bd() {\n int i0 = this.aQ();\n if (this.bp > 0) {\n --this.bp;", "old_return_type": "float", "old_signature": "float aW()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "protected float ba() {\n protected boolean bb() {\n return this.aM() <= 0.0F;\n protected void bd() {\n if (this.ah()) {\n this.a(f0, f1, this.be() ? 0.04F : 0.02F);\n f4 = this.bf() * f3;\n boolean flag0 = this.ag() && this instanceof EntityPlayer;\n protected boolean be() {\n public float bf() {\n return this.be() ? this.bp : 0.1F;\n this.bp = f0;\n public boolean bg() {\n int i0 = this.aT();\n if (this.bq > 0) {\n --this.bq;", "new_return_type": "float", "new_signature": "float aZ()", "old_args": "", "old_implementation": "protected float aX() {\n protected boolean aY() {\n return this.aJ() <= 0.0F;\n protected void ba() {\n if (this.ag()) {\n this.a(f0, f1, this.bb() ? 0.04F : 0.02F);\n f4 = this.bc() * f3;\n boolean flag0 = this.af() && this instanceof EntityPlayer;\n protected boolean bb() {\n public float bc() {\n return this.bb() ? this.bo : 0.1F;\n this.bo = f0;\n public boolean bd() {\n int i0 = this.aQ();\n if (this.bp > 0) {\n --this.bp;", "old_return_type": "float", "old_signature": "float aW()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "protected float ba() {\n protected boolean bb() {\n return this.aM() <= 0.0F;\n protected void bd() {\n if (this.ah()) {\n this.a(f0, f1, this.be() ? 0.04F : 0.02F);\n f4 = this.bf() * f3;\n boolean flag0 = this.ag() && this instanceof EntityPlayer;\n protected boolean be() {\n public float bf() {\n return this.be() ? this.bp : 0.1F;\n this.bp = f0;\n public boolean bg() {\n int i0 = this.aT();\n if (this.bq > 0) {\n --this.bq;", "new_return_type": "float", "new_signature": "float aZ()", "old_args": "", "old_implementation": "protected float aX() {\n protected boolean aY() {\n return this.aJ() <= 0.0F;\n protected void ba() {\n if (this.ag()) {\n this.a(f0, f1, this.bb() ? 0.04F : 0.02F);\n f4 = this.bc() * f3;\n boolean flag0 = this.af() && this instanceof EntityPlayer;\n protected boolean bb() {\n public float bc() {\n return this.bb() ? this.bo : 0.1F;\n this.bo = f0;\n public boolean bd() {\n int i0 = this.aQ();\n if (this.bp > 0) {\n --this.bp;", "old_return_type": "float", "old_signature": "float aW()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "float", "new_signature": "float ba()", "old_args": "", "old_implementation": null, "old_return_type": "float", "old_signature": "float aX()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "boolean", "new_signature": "boolean bb()", "old_args": "", "old_implementation": null, "old_return_type": "boolean", "old_signature": "boolean aY()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void aA()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void az()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "protected void aA() {\n protected void bo() {", "new_return_type": "void", "new_signature": "void bK()", "old_args": "", "old_implementation": "protected void az() {\n protected void bk() {", "old_return_type": "void", "old_signature": "void bG()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "Entity", "new_signature": "Entity bL()", "old_args": "", "old_implementation": null, "old_return_type": "Entity", "old_signature": "Entity bH()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "Entity", "new_signature": "Entity bL()", "old_args": "", "old_implementation": null, "old_return_type": "Entity", "old_signature": "Entity bH()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "Entity", "new_signature": "Entity bL()", "old_args": "", "old_implementation": null, "old_return_type": "Entity", "old_signature": "Entity bH()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "Entity", "new_signature": "Entity bL()", "old_args": "", "old_implementation": null, "old_return_type": "Entity", "old_signature": "Entity bH()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "Entity", "new_signature": "Entity bL()", "old_args": "", "old_implementation": null, "old_return_type": "Entity", "old_signature": "Entity bH()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "Entity", "new_signature": "Entity bL()", "old_args": "", "old_implementation": null, "old_return_type": "Entity", "old_signature": "Entity bH()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "int", "new_signature": "int bX()", "old_args": "", "old_implementation": null, "old_return_type": "int", "old_signature": "int bT()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void bd()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void ba()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void bd()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void ba()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "protected void ay() {\n super.ay();\n protected void bh() {\n super.bh();\n public boolean by() {\n ItemStack itemstack = ((EntityPlayer) this.n).aY();\n nbttagcompound.a(\"Saddle\", this.bT());\n this.i(nbttagcompound.n(\"Saddle\"));\n protected String aN() {\n protected String aO() {", "new_return_type": "boolean", "new_signature": "boolean be()", "old_args": "", "old_implementation": "protected void ax() {\n super.ax();\n protected void be() {\n super.be();\n public boolean bu() {\n ItemStack itemstack = ((EntityPlayer) this.n).aV();\n nbttagcompound.a(\"Saddle\", this.bP());\n this.j(nbttagcompound.n(\"Saddle\"));\n protected String aK() {\n protected String aL() {", "old_return_type": "boolean", "old_signature": "boolean bb()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "protected void ay() {\n super.ay();\n protected void bh() {\n super.bh();\n public boolean by() {\n ItemStack itemstack = ((EntityPlayer) this.n).aY();\n nbttagcompound.a(\"Saddle\", this.bT());\n this.i(nbttagcompound.n(\"Saddle\"));\n protected String aN() {\n protected String aO() {", "new_return_type": "boolean", "new_signature": "boolean be()", "old_args": "", "old_implementation": "protected void ax() {\n super.ax();\n protected void be() {\n super.be();\n public boolean bu() {\n ItemStack itemstack = ((EntityPlayer) this.n).aV();\n nbttagcompound.a(\"Saddle\", this.bP());\n this.j(nbttagcompound.n(\"Saddle\"));\n protected String aK() {\n protected String aL() {", "old_return_type": "boolean", "old_signature": "boolean bb()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "boolean", "new_signature": "boolean at()", "old_args": "", "old_implementation": null, "old_return_type": "boolean", "old_signature": "boolean bb()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "", "new_return_type": "void", "new_signature": "void bh()", "old_args": "", "old_implementation": "", "old_return_type": "void", "old_signature": "void be()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "", "new_return_type": "void", "new_signature": "void bh()", "old_args": "", "old_implementation": "", "old_return_type": "void", "old_signature": "void be()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "public void U() {\n super.U();\n protected void bj() {", "new_return_type": "void", "new_signature": "void bi()", "old_args": "", "old_implementation": "public void T() {\n super.T();\n protected void bg() {", "old_return_type": "void", "old_signature": "void bf()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "this.ah.b(18, Float.valueOf(this.aM()));\n this.ah.a(18, new Float(this.aM()));\n nbttagcompound.a(\"Angry\", this.cc());\n nbttagcompound.a(\"CollarColor\", (byte) this.cd());\n this.l(nbttagcompound.n(\"Angry\"));\n return this.cc() ? \"mob.wolf.growl\" : (this.ab.nextInt(3) == 0 ? (this.bT() && this.ah.d(18) < 10.0F ? \"mob.wolf.whine\" : \"mob.wolf.panting\") : \"mob.wolf.bark\");\n protected String aN() {\n protected String aO() {\n protected float aZ() {\n if (!this.q.I && this.bs && !this.bt && !this.bM() && this.F) {\n if (this.ce()) {\n if (this.ce()) {\n this.a(\"mob.wolf.shake\", this.aZ(), (this.ab.nextFloat() - this.ab.nextFloat()) * 0.2F + 1.0F);\n public int bp() {\n return this.bU() ? 20 : super.bp();\n if (this.aq()) {\n int i0 = this.bT() ? 4 : 2;\n public void j(boolean flag0) {\n super.j(flag0);\n if (this.bT()) {\n if (i0 != this.cd()) {\n this.bp.a(!this.bU());\n this.b((Entity) null);\n this.d((EntityLivingBase) null);", "new_return_type": "void", "new_signature": "void bj()", "old_args": "", "old_implementation": "this.ah.b(18, Float.valueOf(this.aJ()));\n this.ah.a(18, new Float(this.aJ()));\n nbttagcompound.a(\"Angry\", this.bY());\n nbttagcompound.a(\"CollarColor\", (byte) this.bZ());\n this.m(nbttagcompound.n(\"Angry\"));\n return this.bY() ? \"mob.wolf.growl\" : (this.ab.nextInt(3) == 0 ? (this.bP() && this.ah.d(18) < 10.0F ? \"mob.wolf.whine\" : \"mob.wolf.panting\") : \"mob.wolf.bark\");\n protected String aK() {\n protected String aL() {\n protected float aW() {\n if (!this.q.I && this.bs && !this.bt && !this.bI() && this.F) {\n if (this.ca()) {\n if (this.ca()) {\n this.a(\"mob.wolf.shake\", this.aW(), (this.ab.nextFloat() - this.ab.nextFloat()) * 0.2F + 1.0F);\n public int bl() {\n return this.bQ() ? 20 : super.bl();\n if (this.ap()) {\n int i0 = this.bP() ? 4 : 2;\n public void k(boolean flag0) {\n super.k(flag0);\n if (this.bP()) {\n if (i0 != this.bZ()) {\n this.bp.a(!this.bQ());", "old_return_type": "void", "old_signature": "void bg()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "this.ah.b(18, Float.valueOf(this.aM()));\n this.ah.a(18, new Float(this.aM()));\n nbttagcompound.a(\"Angry\", this.cc());\n nbttagcompound.a(\"CollarColor\", (byte) this.cd());\n this.l(nbttagcompound.n(\"Angry\"));\n return this.cc() ? \"mob.wolf.growl\" : (this.ab.nextInt(3) == 0 ? (this.bT() && this.ah.d(18) < 10.0F ? \"mob.wolf.whine\" : \"mob.wolf.panting\") : \"mob.wolf.bark\");\n protected String aN() {\n protected String aO() {\n protected float aZ() {\n if (!this.q.I && this.bs && !this.bt && !this.bM() && this.F) {\n if (this.ce()) {\n if (this.ce()) {\n this.a(\"mob.wolf.shake\", this.aZ(), (this.ab.nextFloat() - this.ab.nextFloat()) * 0.2F + 1.0F);\n public int bp() {\n return this.bU() ? 20 : super.bp();\n if (this.aq()) {\n int i0 = this.bT() ? 4 : 2;\n public void j(boolean flag0) {\n super.j(flag0);\n if (this.bT()) {\n if (i0 != this.cd()) {\n this.bp.a(!this.bU());\n this.b((Entity) null);\n this.d((EntityLivingBase) null);", "new_return_type": "void", "new_signature": "void bj()", "old_args": "", "old_implementation": "this.ah.b(18, Float.valueOf(this.aJ()));\n this.ah.a(18, new Float(this.aJ()));\n nbttagcompound.a(\"Angry\", this.bY());\n nbttagcompound.a(\"CollarColor\", (byte) this.bZ());\n this.m(nbttagcompound.n(\"Angry\"));\n return this.bY() ? \"mob.wolf.growl\" : (this.ab.nextInt(3) == 0 ? (this.bP() && this.ah.d(18) < 10.0F ? \"mob.wolf.whine\" : \"mob.wolf.panting\") : \"mob.wolf.bark\");\n protected String aK() {\n protected String aL() {\n protected float aW() {\n if (!this.q.I && this.bs && !this.bt && !this.bI() && this.F) {\n if (this.ca()) {\n if (this.ca()) {\n this.a(\"mob.wolf.shake\", this.aW(), (this.ab.nextFloat() - this.ab.nextFloat()) * 0.2F + 1.0F);\n public int bl() {\n return this.bQ() ? 20 : super.bl();\n if (this.ap()) {\n int i0 = this.bP() ? 4 : 2;\n public void k(boolean flag0) {\n super.k(flag0);\n if (this.bP()) {\n if (i0 != this.bZ()) {\n this.bp.a(!this.bQ());", "old_return_type": "void", "old_signature": "void bg()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "this.ah.b(18, Float.valueOf(this.aM()));\n this.ah.a(18, new Float(this.aM()));\n nbttagcompound.a(\"Angry\", this.cc());\n nbttagcompound.a(\"CollarColor\", (byte) this.cd());\n this.l(nbttagcompound.n(\"Angry\"));\n return this.cc() ? \"mob.wolf.growl\" : (this.ab.nextInt(3) == 0 ? (this.bT() && this.ah.d(18) < 10.0F ? \"mob.wolf.whine\" : \"mob.wolf.panting\") : \"mob.wolf.bark\");\n protected String aN() {\n protected String aO() {\n protected float aZ() {\n if (!this.q.I && this.bs && !this.bt && !this.bM() && this.F) {\n if (this.ce()) {\n if (this.ce()) {\n this.a(\"mob.wolf.shake\", this.aZ(), (this.ab.nextFloat() - this.ab.nextFloat()) * 0.2F + 1.0F);\n public int bp() {\n return this.bU() ? 20 : super.bp();\n if (this.aq()) {\n int i0 = this.bT() ? 4 : 2;\n public void j(boolean flag0) {\n super.j(flag0);\n if (this.bT()) {\n if (i0 != this.cd()) {\n this.bp.a(!this.bU());\n this.b((Entity) null);\n this.d((EntityLivingBase) null);", "new_return_type": "void", "new_signature": "void bj()", "old_args": "", "old_implementation": "this.ah.b(18, Float.valueOf(this.aJ()));\n this.ah.a(18, new Float(this.aJ()));\n nbttagcompound.a(\"Angry\", this.bY());\n nbttagcompound.a(\"CollarColor\", (byte) this.bZ());\n this.m(nbttagcompound.n(\"Angry\"));\n return this.bY() ? \"mob.wolf.growl\" : (this.ab.nextInt(3) == 0 ? (this.bP() && this.ah.d(18) < 10.0F ? \"mob.wolf.whine\" : \"mob.wolf.panting\") : \"mob.wolf.bark\");\n protected String aK() {\n protected String aL() {\n protected float aW() {\n if (!this.q.I && this.bs && !this.bt && !this.bI() && this.F) {\n if (this.ca()) {\n if (this.ca()) {\n this.a(\"mob.wolf.shake\", this.aW(), (this.ab.nextFloat() - this.ab.nextFloat()) * 0.2F + 1.0F);\n public int bl() {\n return this.bQ() ? 20 : super.bl();\n if (this.ap()) {\n int i0 = this.bP() ? 4 : 2;\n public void k(boolean flag0) {\n super.k(flag0);\n if (this.bP()) {\n if (i0 != this.bZ()) {\n this.bp.a(!this.bQ());", "old_return_type": "void", "old_signature": "void bg()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void bk()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void bh()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void bk()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void bh()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void bk()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void bh()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void bk()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void bh()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void bk()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void bh()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void bk()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void bh()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void bk()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void bh()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "public void c(PotionEffect potioneffect) {", "new_return_type": "void", "new_signature": "void bo()", "old_args": "", "old_implementation": "public void d(PotionEffect potioneffect) {", "old_return_type": "void", "old_signature": "void bk()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void bw()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void bs()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void bw()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void bs()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void bw()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void bs()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void bw()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void bs()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void bx()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void bt()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "String", "new_signature": "String cp()", "old_args": "", "old_implementation": null, "old_return_type": "String", "old_signature": "String cl()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "public boolean T() {\n public void U() {\n this.o.V();\n public void V() {\n this.n.b(this.u, this.v + this.X() + this.n.W(), this.w);\n public double W() {\n public double X() {\n public float Y() {\n public Vec3 Z() {\n public void aa() {\n this.ao = this.ab();\n public int ab() {\n public ItemStack[] ad() {\n public boolean ae() {\n public boolean af() {\n public boolean ag() {\n public boolean ah() {\n public boolean ai() {\n public int ak() {\n public void al() {\n public String am() {\n public Entity[] an() {\n public float ao() {\n public boolean ap() {\n return String.format(\"%s[\\'%s\\'/%d, l=\\'%s\\', x=%.2f, y=%.2f, z=%.2f]\", new Object[]{ this.getClass().getSimpleName(), this.am(), Integer.valueOf(this.k), this.q == null ? \"~NULL~\" : this.q.N().k(), Double.valueOf(this.u), Double.valueOf(this.v), Double.valueOf(this.w)", "new_return_type": "boolean", "new_signature": "boolean S()", "old_args": "", "old_implementation": "public boolean S() {\n public void T() {\n this.o.U();\n this.A = (float) ((double) this.A + d0);\n this.B = (float) ((double) this.B + d1);\n public void U() {\n this.n.b(this.u, this.v + this.W() + this.n.V(), this.w);\n public double V() {\n public double W() {\n public float X() {\n public Vec3 Y() {\n public void Z() {\n this.ao = this.aa();\n public int aa() {\n public ItemStack[] ac() {\n public boolean ad() {\n public boolean ae() {\n public boolean af() {\n public boolean ag() {\n public boolean ah() {\n public int aj() {\n public void ak() {\n public String al() {\n public Entity[] am() {\n public float an() {\n public boolean ao() {\n return String.format(\"%s[\\'%s\\'/%d, l=\\'%s\\', x=%.2f, y=%.2f, z=%.2f]\", new Object[]{ this.getClass().getSimpleName(), this.al(), Integer.valueOf(this.k), this.q == null ? \"~NULL~\" : this.q.N().k(), Double.valueOf(this.u), Double.valueOf(this.v), Double.valueOf(this.w)", "old_return_type": "boolean", "old_signature": "boolean R()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void U()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void T()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void U()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void T()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void V()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void U()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void V()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void U()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "double", "new_signature": "double W()", "old_args": "", "old_implementation": null, "old_return_type": "double", "old_signature": "double V()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "double", "new_signature": "double W()", "old_args": "", "old_implementation": null, "old_return_type": "double", "old_signature": "double V()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "double", "new_signature": "double X()", "old_args": "", "old_implementation": null, "old_return_type": "double", "old_signature": "double W()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "double", "new_signature": "double X()", "old_args": "", "old_implementation": null, "old_return_type": "double", "old_signature": "double W()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "float", "new_signature": "float Y()", "old_args": "", "old_implementation": null, "old_return_type": "float", "old_signature": "float X()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "Vec3", "new_signature": "Vec3 Z()", "old_args": "", "old_implementation": null, "old_return_type": "Vec3", "old_signature": "Vec3 Y()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "boolean", "new_signature": "boolean aL()", "old_args": "", "old_implementation": null, "old_return_type": "boolean", "old_signature": "boolean aI()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "if (this.aq()) {", "new_return_type": "int", "new_signature": "int aP()", "old_args": "", "old_implementation": "if (this.ap()) {", "old_return_type": "int", "old_signature": "int aM()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "if (this.aq()) {", "new_return_type": "int", "new_signature": "int aP()", "old_args": "", "old_implementation": "if (this.ap()) {", "old_return_type": "int", "old_signature": "int aM()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "if (this.aq()) {", "new_return_type": "int", "new_signature": "int aP()", "old_args": "", "old_implementation": "if (this.ap()) {", "old_return_type": "int", "old_signature": "int aM()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "if (this.aq()) {", "new_return_type": "int", "new_signature": "int aP()", "old_args": "", "old_implementation": "if (this.ap()) {", "old_return_type": "int", "old_signature": "int aM()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "if (this.aq()) {", "new_return_type": "int", "new_signature": "int aP()", "old_args": "", "old_implementation": "if (this.ap()) {", "old_return_type": "int", "old_signature": "int aM()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "EnumCreatureAttribute", "new_signature": "EnumCreatureAttribute aX()", "old_args": "", "old_implementation": null, "old_return_type": "EnumCreatureAttribute", "old_signature": "EnumCreatureAttribute aU()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "EnumCreatureAttribute", "new_signature": "EnumCreatureAttribute aX()", "old_args": "", "old_implementation": null, "old_return_type": "EnumCreatureAttribute", "old_signature": "EnumCreatureAttribute aU()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "EnumCreatureAttribute", "new_signature": "EnumCreatureAttribute aX()", "old_args": "", "old_implementation": null, "old_return_type": "EnumCreatureAttribute", "old_signature": "EnumCreatureAttribute aU()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "EnumCreatureAttribute", "new_signature": "EnumCreatureAttribute aX()", "old_args": "", "old_implementation": null, "old_return_type": "EnumCreatureAttribute", "old_signature": "EnumCreatureAttribute aU()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "EnumCreatureAttribute", "new_signature": "EnumCreatureAttribute aX()", "old_args": "", "old_implementation": null, "old_return_type": "EnumCreatureAttribute", "old_signature": "EnumCreatureAttribute aU()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "ItemStack", "new_signature": "ItemStack aY()", "old_args": "", "old_implementation": null, "old_return_type": "ItemStack", "old_signature": "ItemStack aV()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "ItemStack", "new_signature": "ItemStack aY()", "old_args": "", "old_implementation": null, "old_return_type": "ItemStack", "old_signature": "ItemStack aV()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "int", "new_signature": "int ab()", "old_args": "", "old_implementation": null, "old_return_type": "int", "old_signature": "int aa()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "ItemStack[]", "new_signature": "ItemStack[] abstract()", "old_args": "", "old_implementation": null, "old_return_type": "ItemStack[]", "old_signature": "ItemStack[] abstract()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "ItemStack[]", "new_signature": "ItemStack[] ad()", "old_args": "", "old_implementation": null, "old_return_type": "ItemStack[]", "old_signature": "ItemStack[] ac()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "ItemStack[]", "new_signature": "ItemStack[] ad()", "old_args": "", "old_implementation": null, "old_return_type": "ItemStack[]", "old_signature": "ItemStack[] ac()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "boolean", "new_signature": "boolean ae()", "old_args": "", "old_implementation": null, "old_return_type": "boolean", "old_signature": "boolean ad()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "boolean", "new_signature": "boolean ae()", "old_args": "", "old_implementation": null, "old_return_type": "boolean", "old_signature": "boolean ad()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "boolean", "new_signature": "boolean ae()", "old_args": "", "old_implementation": null, "old_return_type": "boolean", "old_signature": "boolean ad()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "String", "new_signature": "String am()", "old_args": "", "old_implementation": null, "old_return_type": "String", "old_signature": "String al()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "String", "new_signature": "String am()", "old_args": "", "old_implementation": null, "old_return_type": "String", "old_signature": "String al()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "String", "new_signature": "String am()", "old_args": "", "old_implementation": null, "old_return_type": "String", "old_signature": "String al()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "String", "new_signature": "String am()", "old_args": "", "old_implementation": null, "old_return_type": "String", "old_signature": "String al()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "String", "new_signature": "String am()", "old_args": "", "old_implementation": null, "old_return_type": "String", "old_signature": "String al()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "Entity[]", "new_signature": "Entity[] an()", "old_args": "", "old_implementation": null, "old_return_type": "Entity[]", "old_signature": "Entity[] am()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "float", "new_signature": "float ao()", "old_args": "", "old_implementation": null, "old_return_type": "float", "old_signature": "float an()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "boolean", "new_signature": "boolean ap()", "old_args": "", "old_implementation": null, "old_return_type": "boolean", "old_signature": "boolean ao()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "boolean", "new_signature": "boolean ap()", "old_args": "", "old_implementation": null, "old_return_type": "boolean", "old_signature": "boolean ao()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "boolean", "new_signature": "boolean ap()", "old_args": "", "old_implementation": null, "old_return_type": "boolean", "old_signature": "boolean ao()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "boolean", "new_signature": "boolean ap()", "old_args": "", "old_implementation": null, "old_return_type": "boolean", "old_signature": "boolean ao()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "boolean", "new_signature": "boolean ap()", "old_args": "", "old_implementation": null, "old_return_type": "boolean", "old_signature": "boolean ao()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "int", "new_signature": "int ar()", "old_args": "", "old_implementation": null, "old_return_type": "int", "old_signature": "int aq()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "int", "new_signature": "int ar()", "old_args": "", "old_implementation": null, "old_return_type": "int", "old_signature": "int aq()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "boolean", "new_signature": "boolean ay()", "old_args": "", "old_implementation": null, "old_return_type": "boolean", "old_signature": "boolean ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "World", "new_signature": "World az()", "old_args": "", "old_implementation": null, "old_return_type": "World", "old_signature": "World ay()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "boolean", "new_signature": "boolean az()", "old_args": "", "old_implementation": null, "old_return_type": "boolean", "old_signature": "boolean ay()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "boolean", "new_signature": "boolean bG()", "old_args": "", "old_implementation": null, "old_return_type": "boolean", "old_signature": "boolean bC()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "protected void bk() {\n this.bn = this.bJ();\n Entity entity = this.bL();", "new_return_type": "boolean", "new_signature": "boolean bJ()", "old_args": "", "old_implementation": "protected void bh() {\n this.bn = this.bF();\n Entity entity = this.bH();", "old_return_type": "boolean", "old_signature": "boolean bF()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "ChunkCoordinates", "new_signature": "ChunkCoordinates bP()", "old_args": "", "old_implementation": null, "old_return_type": "ChunkCoordinates", "old_signature": "ChunkCoordinates bL()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "int", "new_signature": "int bR()", "old_args": "", "old_implementation": null, "old_return_type": "int", "old_signature": "int bN()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "Village", "new_signature": "Village bT()", "old_args": "", "old_implementation": null, "old_return_type": "Village", "old_signature": "Village bP()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "boolean", "new_signature": "boolean bT()", "old_args": "", "old_implementation": null, "old_return_type": "boolean", "old_signature": "boolean bP()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "boolean", "new_signature": "boolean bT()", "old_args": "", "old_implementation": null, "old_return_type": "boolean", "old_signature": "boolean bP()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "boolean", "new_signature": "boolean bT()", "old_args": "", "old_implementation": null, "old_return_type": "boolean", "old_signature": "boolean bP()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "boolean", "new_signature": "boolean bT()", "old_args": "", "old_implementation": null, "old_return_type": "boolean", "old_signature": "boolean bP()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "boolean", "new_signature": "boolean bT()", "old_args": "", "old_implementation": null, "old_return_type": "boolean", "old_signature": "boolean bP()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "boolean", "new_signature": "boolean bT()", "old_args": "", "old_implementation": null, "old_return_type": "boolean", "old_signature": "boolean bP()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "this.cJ();\n public int bU() {\n public String am() {\n if (this.bB()) {\n return this.bA();\n int i0 = this.bT();\n public boolean bV() {\n public boolean bW() {\n public boolean ca() {\n return this.bV();", "new_return_type": "int", "new_signature": "int bT()", "old_args": "", "old_implementation": "this.cF();\n public int bQ() {\n public String al() {\n if (this.bx()) {\n return this.bw();\n int i0 = this.bP();\n public boolean bR() {\n public boolean bS() {\n public boolean bW() {\n return this.bR();\n public float bY() {\n this.a(this.bY());\n public boolean bZ() {\n public void j(boolean flag0) {\n public void k(boolean flag0) {\n public boolean bC() {\n return !this.cu() && super.bC();\n public boolean ca() {\n public int cb() {\n public boolean cc() {\n public boolean cd() {\n public boolean ce() {\n public boolean cf() {\n this.cF();\n public void l(boolean flag0) {\n public void m(boolean flag0) {\n public void n(boolean flag0) {\n public void o(boolean flag0) {\n public int cg() {\n int i1 = MathHelper.a(this.cg() + i0, 0, this.cm());\n if (this.n != null && this.n.equals(entity)) {\n return false;", "old_return_type": "int", "old_signature": "int bP()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "this.cJ();\n public int bU() {\n public String am() {\n if (this.bB()) {\n return this.bA();\n int i0 = this.bT();\n public boolean bV() {\n public boolean bW() {\n public boolean ca() {\n return this.bV();", "new_return_type": "int", "new_signature": "int bT()", "old_args": "", "old_implementation": "this.cF();\n public int bQ() {\n public String al() {\n if (this.bx()) {\n return this.bw();\n int i0 = this.bP();\n public boolean bR() {\n public boolean bS() {\n public boolean bW() {\n return this.bR();\n public float bY() {\n this.a(this.bY());\n public boolean bZ() {\n public void j(boolean flag0) {\n public void k(boolean flag0) {\n public boolean bC() {\n return !this.cu() && super.bC();\n public boolean ca() {\n public int cb() {\n public boolean cc() {\n public boolean cd() {\n public boolean ce() {\n public boolean cf() {\n this.cF();\n public void l(boolean flag0) {\n public void m(boolean flag0) {\n public void n(boolean flag0) {\n public void o(boolean flag0) {\n public int cg() {\n int i1 = MathHelper.a(this.cg() + i0, 0, this.cm());\n if (this.n != null && this.n.equals(entity)) {\n return false;", "old_return_type": "int", "old_signature": "int bP()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void bT()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void bP()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void bT()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void bP()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "EntityAIControlledByPlayer", "new_signature": "EntityAIControlledByPlayer bU()", "old_args": "", "old_implementation": null, "old_return_type": "EntityAIControlledByPlayer", "old_signature": "EntityAIControlledByPlayer bQ()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "boolean", "new_signature": "boolean bU()", "old_args": "", "old_implementation": null, "old_return_type": "boolean", "old_signature": "boolean bQ()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "boolean", "new_signature": "boolean bU()", "old_args": "", "old_implementation": null, "old_return_type": "boolean", "old_signature": "boolean bQ()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "int", "new_signature": "int bU()", "old_args": "", "old_implementation": null, "old_return_type": "int", "old_signature": "int bQ()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "int", "new_signature": "int bU()", "old_args": "", "old_implementation": null, "old_return_type": "int", "old_signature": "int bQ()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "boolean", "new_signature": "boolean bV()", "old_args": "", "old_implementation": null, "old_return_type": "boolean", "old_signature": "boolean bR()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "boolean", "new_signature": "boolean bV()", "old_args": "", "old_implementation": null, "old_return_type": "boolean", "old_signature": "boolean bR()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "boolean", "new_signature": "boolean bV()", "old_args": "", "old_implementation": null, "old_return_type": "boolean", "old_signature": "boolean bR()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "boolean", "new_signature": "boolean bV()", "old_args": "", "old_implementation": null, "old_return_type": "boolean", "old_signature": "boolean bR()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "int", "new_signature": "int bV()", "old_args": "", "old_implementation": null, "old_return_type": "int", "old_signature": "int bR()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "int", "new_signature": "int bV()", "old_args": "", "old_implementation": null, "old_return_type": "int", "old_signature": "int bR()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "int", "new_signature": "int bV()", "old_args": "", "old_implementation": null, "old_return_type": "int", "old_signature": "int bR()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "int", "new_signature": "int bV()", "old_args": "", "old_implementation": null, "old_return_type": "int", "old_signature": "int bR()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "boolean", "new_signature": "boolean bW()", "old_args": "", "old_implementation": null, "old_return_type": "boolean", "old_signature": "boolean bS()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "boolean", "new_signature": "boolean bW()", "old_args": "", "old_implementation": null, "old_return_type": "boolean", "old_signature": "boolean bS()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "int", "new_signature": "int bW()", "old_args": "", "old_implementation": null, "old_return_type": "int", "old_signature": "int bS()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void bW()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void bS()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "int", "new_signature": "int ca()", "old_args": "", "old_implementation": null, "old_return_type": "int", "old_signature": "int bW()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "boolean", "new_signature": "boolean cc()", "old_args": "", "old_implementation": null, "old_return_type": "boolean", "old_signature": "boolean bY()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "boolean", "new_signature": "boolean bG()", "old_args": "", "old_implementation": null, "old_return_type": "boolean", "old_signature": "boolean bZ()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "int", "new_signature": "int cd()", "old_args": "", "old_implementation": null, "old_return_type": "int", "old_signature": "int bZ()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "protected void ay() {\n super.ay();\n protected void bh() {\n super.bh();\n public boolean by() {\n ItemStack itemstack = ((EntityPlayer) this.n).aY();\n nbttagcompound.a(\"Saddle\", this.bT());\n this.i(nbttagcompound.n(\"Saddle\"));\n protected String aN() {\n protected String aO() {", "new_return_type": "boolean", "new_signature": "boolean be()", "old_args": "", "old_implementation": "protected void ax() {\n super.ax();\n protected void be() {\n super.be();\n public boolean bu() {\n ItemStack itemstack = ((EntityPlayer) this.n).aV();\n nbttagcompound.a(\"Saddle\", this.bP());\n this.j(nbttagcompound.n(\"Saddle\"));\n protected String aK() {\n protected String aL() {", "old_return_type": "boolean", "old_signature": "boolean bb()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "protected void ay() {\n super.ay();\n protected void bh() {\n super.bh();\n public boolean by() {\n ItemStack itemstack = ((EntityPlayer) this.n).aY();\n nbttagcompound.a(\"Saddle\", this.bT());\n this.i(nbttagcompound.n(\"Saddle\"));\n protected String aN() {\n protected String aO() {", "new_return_type": "boolean", "new_signature": "boolean be()", "old_args": "", "old_implementation": "protected void ax() {\n super.ax();\n protected void be() {\n super.be();\n public boolean bu() {\n ItemStack itemstack = ((EntityPlayer) this.n).aV();\n nbttagcompound.a(\"Saddle\", this.bP());\n this.j(nbttagcompound.n(\"Saddle\"));\n protected String aK() {\n protected String aL() {", "old_return_type": "boolean", "old_signature": "boolean bb()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "protected void ay() {\n super.ay();\n protected void bh() {\n super.bh();\n public boolean by() {\n ItemStack itemstack = ((EntityPlayer) this.n).aY();\n nbttagcompound.a(\"Saddle\", this.bT());\n this.i(nbttagcompound.n(\"Saddle\"));\n protected String aN() {\n protected String aO() {", "new_return_type": "boolean", "new_signature": "boolean be()", "old_args": "", "old_implementation": "protected void ax() {\n super.ax();\n protected void be() {\n super.be();\n public boolean bu() {\n ItemStack itemstack = ((EntityPlayer) this.n).aV();\n nbttagcompound.a(\"Saddle\", this.bP());\n this.j(nbttagcompound.n(\"Saddle\"));\n protected String aK() {\n protected String aL() {", "old_return_type": "boolean", "old_signature": "boolean bb()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "protected void ay() {\n super.ay();\n protected void bh() {\n super.bh();\n public boolean by() {\n ItemStack itemstack = ((EntityPlayer) this.n).aY();\n nbttagcompound.a(\"Saddle\", this.bT());\n this.i(nbttagcompound.n(\"Saddle\"));\n protected String aN() {\n protected String aO() {", "new_return_type": "boolean", "new_signature": "boolean be()", "old_args": "", "old_implementation": "protected void ax() {\n super.ax();\n protected void be() {\n super.be();\n public boolean bu() {\n ItemStack itemstack = ((EntityPlayer) this.n).aV();\n nbttagcompound.a(\"Saddle\", this.bP());\n this.j(nbttagcompound.n(\"Saddle\"));\n protected String aK() {\n protected String aL() {", "old_return_type": "boolean", "old_signature": "boolean bb()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "protected void ay() {\n super.ay();\n protected void bh() {\n super.bh();\n public boolean by() {\n ItemStack itemstack = ((EntityPlayer) this.n).aY();\n nbttagcompound.a(\"Saddle\", this.bT());\n this.i(nbttagcompound.n(\"Saddle\"));\n protected String aN() {\n protected String aO() {", "new_return_type": "boolean", "new_signature": "boolean be()", "old_args": "", "old_implementation": "protected void ax() {\n super.ax();\n protected void be() {\n super.be();\n public boolean bu() {\n ItemStack itemstack = ((EntityPlayer) this.n).aV();\n nbttagcompound.a(\"Saddle\", this.bP());\n this.j(nbttagcompound.n(\"Saddle\"));\n protected String aK() {\n protected String aL() {", "old_return_type": "boolean", "old_signature": "boolean bb()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "protected void ay() {\n super.ay();\n protected void bh() {\n super.bh();\n public boolean by() {\n ItemStack itemstack = ((EntityPlayer) this.n).aY();\n nbttagcompound.a(\"Saddle\", this.bT());\n this.i(nbttagcompound.n(\"Saddle\"));\n protected String aN() {\n protected String aO() {", "new_return_type": "boolean", "new_signature": "boolean be()", "old_args": "", "old_implementation": "protected void ax() {\n super.ax();\n protected void be() {\n super.be();\n public boolean bu() {\n ItemStack itemstack = ((EntityPlayer) this.n).aV();\n nbttagcompound.a(\"Saddle\", this.bP());\n this.j(nbttagcompound.n(\"Saddle\"));\n protected String aK() {\n protected String aL() {", "old_return_type": "boolean", "old_signature": "boolean bb()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "protected void ay() {\n super.ay();\n protected void bh() {\n super.bh();\n public boolean by() {\n ItemStack itemstack = ((EntityPlayer) this.n).aY();\n nbttagcompound.a(\"Saddle\", this.bT());\n this.i(nbttagcompound.n(\"Saddle\"));\n protected String aN() {\n protected String aO() {", "new_return_type": "boolean", "new_signature": "boolean be()", "old_args": "", "old_implementation": "protected void ax() {\n super.ax();\n protected void be() {\n super.be();\n public boolean bu() {\n ItemStack itemstack = ((EntityPlayer) this.n).aV();\n nbttagcompound.a(\"Saddle\", this.bP());\n this.j(nbttagcompound.n(\"Saddle\"));\n protected String aK() {\n protected String aL() {", "old_return_type": "boolean", "old_signature": "boolean bb()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "protected void ay() {\n super.ay();\n protected void bh() {\n super.bh();\n public boolean by() {\n ItemStack itemstack = ((EntityPlayer) this.n).aY();\n nbttagcompound.a(\"Saddle\", this.bT());\n this.i(nbttagcompound.n(\"Saddle\"));\n protected String aN() {\n protected String aO() {", "new_return_type": "boolean", "new_signature": "boolean be()", "old_args": "", "old_implementation": "protected void ax() {\n super.ax();\n protected void be() {\n super.be();\n public boolean bu() {\n ItemStack itemstack = ((EntityPlayer) this.n).aV();\n nbttagcompound.a(\"Saddle\", this.bP());\n this.j(nbttagcompound.n(\"Saddle\"));\n protected String aK() {\n protected String aL() {", "old_return_type": "boolean", "old_signature": "boolean bb()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "protected void ay() {\n super.ay();\n protected void bh() {\n super.bh();\n public boolean by() {\n ItemStack itemstack = ((EntityPlayer) this.n).aY();\n nbttagcompound.a(\"Saddle\", this.bT());\n this.i(nbttagcompound.n(\"Saddle\"));\n protected String aN() {\n protected String aO() {", "new_return_type": "boolean", "new_signature": "boolean be()", "old_args": "", "old_implementation": "protected void ax() {\n super.ax();\n protected void be() {\n super.be();\n public boolean bu() {\n ItemStack itemstack = ((EntityPlayer) this.n).aV();\n nbttagcompound.a(\"Saddle\", this.bP());\n this.j(nbttagcompound.n(\"Saddle\"));\n protected String aK() {\n protected String aL() {", "old_return_type": "boolean", "old_signature": "boolean bb()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "protected void ay() {\n super.ay();\n protected void bh() {\n super.bh();\n public boolean by() {\n ItemStack itemstack = ((EntityPlayer) this.n).aY();\n nbttagcompound.a(\"Saddle\", this.bT());\n this.i(nbttagcompound.n(\"Saddle\"));\n protected String aN() {\n protected String aO() {", "new_return_type": "boolean", "new_signature": "boolean be()", "old_args": "", "old_implementation": "protected void ax() {\n super.ax();\n protected void be() {\n super.be();\n public boolean bu() {\n ItemStack itemstack = ((EntityPlayer) this.n).aV();\n nbttagcompound.a(\"Saddle\", this.bP());\n this.j(nbttagcompound.n(\"Saddle\"));\n protected String aK() {\n protected String aL() {", "old_return_type": "boolean", "old_signature": "boolean bb()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "protected void ay() {\n super.ay();\n protected void bh() {\n super.bh();\n public boolean by() {\n ItemStack itemstack = ((EntityPlayer) this.n).aY();\n nbttagcompound.a(\"Saddle\", this.bT());\n this.i(nbttagcompound.n(\"Saddle\"));\n protected String aN() {\n protected String aO() {", "new_return_type": "boolean", "new_signature": "boolean be()", "old_args": "", "old_implementation": "protected void ax() {\n super.ax();\n protected void be() {\n super.be();\n public boolean bu() {\n ItemStack itemstack = ((EntityPlayer) this.n).aV();\n nbttagcompound.a(\"Saddle\", this.bP());\n this.j(nbttagcompound.n(\"Saddle\"));\n protected String aK() {\n protected String aL() {", "old_return_type": "boolean", "old_signature": "boolean bb()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "float", "new_signature": "float bf()", "old_args": "", "old_implementation": null, "old_return_type": "float", "old_signature": "float bc()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "float", "new_signature": "float bf()", "old_args": "", "old_implementation": null, "old_return_type": "float", "old_signature": "float bc()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "boolean", "new_signature": "boolean be()", "old_args": "", "old_implementation": null, "old_return_type": "boolean", "old_signature": "boolean bd()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "boolean", "new_signature": "boolean bg()", "old_args": "", "old_implementation": null, "old_return_type": "boolean", "old_signature": "boolean bd()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "this.ah.b(18, Float.valueOf(this.aM()));\n this.ah.a(18, new Float(this.aM()));\n nbttagcompound.a(\"Angry\", this.cc());\n nbttagcompound.a(\"CollarColor\", (byte) this.cd());\n this.l(nbttagcompound.n(\"Angry\"));\n return this.cc() ? \"mob.wolf.growl\" : (this.ab.nextInt(3) == 0 ? (this.bT() && this.ah.d(18) < 10.0F ? \"mob.wolf.whine\" : \"mob.wolf.panting\") : \"mob.wolf.bark\");\n protected String aN() {\n protected String aO() {\n protected float aZ() {\n if (!this.q.I && this.bs && !this.bt && !this.bM() && this.F) {\n if (this.ce()) {\n if (this.ce()) {\n this.a(\"mob.wolf.shake\", this.aZ(), (this.ab.nextFloat() - this.ab.nextFloat()) * 0.2F + 1.0F);\n public int bp() {\n return this.bU() ? 20 : super.bp();\n if (this.aq()) {\n int i0 = this.bT() ? 4 : 2;\n public void j(boolean flag0) {\n super.j(flag0);\n if (this.bT()) {\n if (i0 != this.cd()) {\n this.bp.a(!this.bU());\n this.b((Entity) null);\n this.d((EntityLivingBase) null);", "new_return_type": "void", "new_signature": "void bj()", "old_args": "", "old_implementation": "this.ah.b(18, Float.valueOf(this.aJ()));\n this.ah.a(18, new Float(this.aJ()));\n nbttagcompound.a(\"Angry\", this.bY());\n nbttagcompound.a(\"CollarColor\", (byte) this.bZ());\n this.m(nbttagcompound.n(\"Angry\"));\n return this.bY() ? \"mob.wolf.growl\" : (this.ab.nextInt(3) == 0 ? (this.bP() && this.ah.d(18) < 10.0F ? \"mob.wolf.whine\" : \"mob.wolf.panting\") : \"mob.wolf.bark\");\n protected String aK() {\n protected String aL() {\n protected float aW() {\n if (!this.q.I && this.bs && !this.bt && !this.bI() && this.F) {\n if (this.ca()) {\n if (this.ca()) {\n this.a(\"mob.wolf.shake\", this.aW(), (this.ab.nextFloat() - this.ab.nextFloat()) * 0.2F + 1.0F);\n public int bl() {\n return this.bQ() ? 20 : super.bl();\n if (this.ap()) {\n int i0 = this.bP() ? 4 : 2;\n public void k(boolean flag0) {\n super.k(flag0);\n if (this.bP()) {\n if (i0 != this.bZ()) {\n this.bp.a(!this.bQ());", "old_return_type": "void", "old_signature": "void bg()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "boolean", "new_signature": "boolean bl()", "old_args": "", "old_implementation": null, "old_return_type": "boolean", "old_signature": "boolean bi()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "float", "new_signature": "float bm()", "old_args": "", "old_implementation": null, "old_return_type": "float", "old_signature": "float bj()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "int", "new_signature": "int bp()", "old_args": "", "old_implementation": null, "old_return_type": "int", "old_signature": "int bl()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "int", "new_signature": "int bp()", "old_args": "", "old_implementation": null, "old_return_type": "int", "old_signature": "int bl()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "int", "new_signature": "int bp()", "old_args": "", "old_implementation": null, "old_return_type": "int", "old_signature": "int bl()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "boolean", "new_signature": "boolean bs()", "old_args": "", "old_implementation": null, "old_return_type": "boolean", "old_signature": "boolean bo()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "boolean", "new_signature": "boolean bs()", "old_args": "", "old_implementation": null, "old_return_type": "boolean", "old_signature": "boolean bo()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "boolean", "new_signature": "boolean bs()", "old_args": "", "old_implementation": null, "old_return_type": "boolean", "old_signature": "boolean bo()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "boolean", "new_signature": "boolean bs()", "old_args": "", "old_implementation": null, "old_return_type": "boolean", "old_signature": "boolean bo()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "boolean", "new_signature": "boolean bs()", "old_args": "", "old_implementation": null, "old_return_type": "boolean", "old_signature": "boolean bo()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "boolean", "new_signature": "boolean bs()", "old_args": "", "old_implementation": null, "old_return_type": "boolean", "old_signature": "boolean bo()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "boolean", "new_signature": "boolean bs()", "old_args": "", "old_implementation": null, "old_return_type": "boolean", "old_signature": "boolean bo()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "boolean", "new_signature": "boolean bs()", "old_args": "", "old_implementation": null, "old_return_type": "boolean", "old_signature": "boolean bo()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "boolean", "new_signature": "boolean bs()", "old_args": "", "old_implementation": null, "old_return_type": "boolean", "old_signature": "boolean bo()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "boolean", "new_signature": "boolean bs()", "old_args": "", "old_implementation": null, "old_return_type": "boolean", "old_signature": "boolean bo()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "boolean", "new_signature": "boolean bs()", "old_args": "", "old_implementation": null, "old_return_type": "boolean", "old_signature": "boolean bo()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "boolean", "new_signature": "boolean bs()", "old_args": "", "old_implementation": null, "old_return_type": "boolean", "old_signature": "boolean bo()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "public boolean cc() {\n public void l(boolean flag0) {\n public int cd() {\n entitywolf.j(true);\n public void m(boolean flag0) {", "new_return_type": "int", "new_signature": "int bv()", "old_args": "", "old_implementation": "public boolean bY() {\n public void m(boolean flag0) {\n public int bZ() {\n entitywolf.k(true);\n public void n(boolean flag0) {", "old_return_type": "int", "old_signature": "int br()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "public boolean cc() {\n public void l(boolean flag0) {\n public int cd() {\n entitywolf.j(true);\n public void m(boolean flag0) {", "new_return_type": "int", "new_signature": "int bv()", "old_args": "", "old_implementation": "public boolean bY() {\n public void m(boolean flag0) {\n public int bZ() {\n entitywolf.k(true);\n public void n(boolean flag0) {", "old_return_type": "int", "old_signature": "int br()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "public boolean cc() {\n public void l(boolean flag0) {\n public int cd() {\n entitywolf.j(true);\n public void m(boolean flag0) {", "new_return_type": "int", "new_signature": "int bv()", "old_args": "", "old_implementation": "public boolean bY() {\n public void m(boolean flag0) {\n public int bZ() {\n entitywolf.k(true);\n public void n(boolean flag0) {", "old_return_type": "int", "old_signature": "int br()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "public boolean cc() {\n public void l(boolean flag0) {\n public int cd() {\n entitywolf.j(true);\n public void m(boolean flag0) {", "new_return_type": "int", "new_signature": "int bv()", "old_args": "", "old_implementation": "public boolean bY() {\n public void m(boolean flag0) {\n public int bZ() {\n entitywolf.k(true);\n public void n(boolean flag0) {", "old_return_type": "int", "old_signature": "int br()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "boolean", "new_signature": "boolean by()", "old_args": "", "old_implementation": null, "old_return_type": "boolean", "old_signature": "boolean bu()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "boolean", "new_signature": "boolean bB()", "old_args": "", "old_implementation": null, "old_return_type": "boolean", "old_signature": "boolean bx()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "EntityLivingBase entitylivingbase", "new_implementation": null, "new_return_type": "void", "new_signature": "void d(EntityLivingBase entitylivingbase)", "old_args": "EntityLivingBase entitylivingbase", "old_implementation": null, "old_return_type": "void", "old_signature": "void c(EntityLivingBase entitylivingbase)" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "boolean", "new_signature": "boolean ce()", "old_args": "", "old_implementation": null, "old_return_type": "boolean", "old_signature": "boolean ca()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "boolean", "new_signature": "boolean cw()", "old_args": "", "old_implementation": null, "old_return_type": "boolean", "old_signature": "boolean cs()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": null, "new_return_type": "boolean", "new_signature": "boolean cy()", "old_args": "", "old_implementation": null, "old_return_type": "boolean", "old_signature": "boolean cu()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "PotionEffect potioneffect", "new_implementation": null, "new_return_type": "boolean", "new_signature": "boolean d(PotionEffect potioneffect)", "old_args": "PotionEffect potioneffect", "old_implementation": null, "old_return_type": "boolean", "old_signature": "boolean e(PotionEffect potioneffect)" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "boolean flag0,boolean flag1", "new_implementation": null, "new_return_type": "void", "new_signature": "void a(boolean flag0,boolean flag1)", "old_args": "boolean flag0", "old_implementation": null, "old_return_type": "void", "old_signature": "void i(boolean flag0)" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "boolean flag0", "new_implementation": null, "new_return_type": "void", "new_signature": "void i(boolean flag0)", "old_args": "boolean flag0", "old_implementation": null, "old_return_type": "void", "old_signature": "void j(boolean flag0)" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "boolean flag0", "new_implementation": null, "new_return_type": "void", "new_signature": "void i(boolean flag0)", "old_args": "boolean flag0", "old_implementation": null, "old_return_type": "void", "old_signature": "void j(boolean flag0)" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "boolean flag0", "new_implementation": null, "new_return_type": "void", "new_signature": "void i(boolean flag0)", "old_args": "boolean flag0", "old_implementation": null, "old_return_type": "void", "old_signature": "void j(boolean flag0)" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "boolean flag0", "new_implementation": null, "new_return_type": "void", "new_signature": "void i(boolean flag0)", "old_args": "boolean flag0", "old_implementation": null, "old_return_type": "void", "old_signature": "void j(boolean flag0)" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "boolean flag0", "new_implementation": null, "new_return_type": "void", "new_signature": "void i(boolean flag0)", "old_args": "boolean flag0", "old_implementation": null, "old_return_type": "void", "old_signature": "void k(boolean flag0)" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "boolean flag0", "new_implementation": null, "new_return_type": "void", "new_signature": "void j(boolean flag0)", "old_args": "boolean flag0", "old_implementation": null, "old_return_type": "void", "old_signature": "void k(boolean flag0)" } ]
[ { "additions": 2, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/pom.xml", "changes": 4, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/pom.xml?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 2, "filename": "pom.xml", "new_code": " <minecraft.server.version>1.6.2</minecraft.server.version>\n <version>${minecraft.server.version}</version>", "new_methods": [], "old_code": " <minecraft.server.version>1.6.1</minecraft.server.version>\n <version>${minecraft.server.version}_1</version>", "old_methods": [], "patch": "@@ -14,7 +14,7 @@\n <inceptionYear>2012</inceptionYear>\n <properties>\n <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>\n- <minecraft.server.version>1.6.1</minecraft.server.version>\n+ <minecraft.server.version>1.6.2</minecraft.server.version>\n <api.version>0.9</api.version>\n </properties>\n <licenses>\n@@ -75,7 +75,7 @@\n <dependency>\n <groupId>net.minecraft</groupId>\n <artifactId>server</artifactId>\n- <version>${minecraft.server.version}_1</version>\n+ <version>${minecraft.server.version}</version>\n </dependency>\n <dependency>\n <groupId>junit</groupId>", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/pom.xml", "sha": "9e4e17aa873ee96c5ab2c4a3d19a8af145fda798", "status": "modified" }, { "additions": 3, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2FCanaryEntity.java", "changes": 6, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2FCanaryEntity.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 3, "filename": "src/main/java/net/canarymod/api/entity/CanaryEntity.java", "new_code": " return entity.am();\n return entity.av();\n return ((net.minecraft.server.EntityLiving) entity).bs();", "new_methods": [], "old_code": " return entity.al();\n return entity.au();\n return ((net.minecraft.server.EntityLiving) entity).bo();", "old_methods": [], "patch": "@@ -259,7 +259,7 @@ public void setInvisible(boolean invisible) {\n \n @Override\n public String getName() {\n- return entity.al();\n+ return entity.am();\n }\n \n @Override\n@@ -279,7 +279,7 @@ public int getID() {\n \n @Override\n public UUID getUUID() {\n- return entity.au();\n+ return entity.av();\n }\n \n @Override\n@@ -302,7 +302,7 @@ public void translate(Vector3D factor) {\n @Override\n public boolean canSpawn() {\n if (this.isLiving()) {\n- return ((net.minecraft.server.EntityLiving) entity).bo();\n+ return ((net.minecraft.server.EntityLiving) entity).bs();\n }\n return true;\n }", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2FCanaryEntity.java", "sha": "961d85d064afbbf58e8acab4c51542d6c4695676", "status": "modified" }, { "additions": 6, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2FCanaryEntityLiving.java", "changes": 12, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2FCanaryEntityLiving.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 6, "filename": "src/main/java/net/canarymod/api/entity/living/CanaryEntityLiving.java", "new_code": " return getHandle().aY().getCanaryItem();\n return CanaryItem.stackArrayToItemArray(getHandle().ad());\n return getHandle().bD();\n return getHandle().bE();\n return getHandle().bB();\n return getHandle().bA();", "new_methods": [], "old_code": " return getHandle().aV().getCanaryItem();\n return CanaryItem.stackArrayToItemArray(getHandle().ac());\n return getHandle().bz();\n return getHandle().bA();\n return getHandle().bx();\n return getHandle().bw();", "old_methods": [], "patch": "@@ -92,15 +92,15 @@ public void setAttackTarget(LivingBase livingbase) {\n */\n @Override\n public Item getItemInHand() {\n- return getHandle().aV().getCanaryItem();\n+ return getHandle().aY().getCanaryItem();\n }\n \n /**\n * {@inheritDoc}\n */\n @Override\n public Item[] getEquipment() {\n- return CanaryItem.stackArrayToItemArray(getHandle().ac());\n+ return CanaryItem.stackArrayToItemArray(getHandle().ad());\n }\n \n /**\n@@ -166,7 +166,7 @@ public void setDropChance(int slot, float chance) {\n */\n @Override\n public boolean canPickUpLoot() {\n- return getHandle().bz();\n+ return getHandle().bD();\n }\n \n /**\n@@ -182,7 +182,7 @@ public void setCanPickUpLoot(boolean loot) {\n */\n @Override\n public boolean isPersistenceRequired() {\n- return getHandle().bA();\n+ return getHandle().bE();\n }\n \n /**\n@@ -206,15 +206,15 @@ public AIManager getAITaskManager() {\n */\n @Override\n public boolean hasDisplayName() {\n- return getHandle().bx();\n+ return getHandle().bB();\n }\n \n /**\n * {@inheritDoc}\n */\n @Override\n public String getDisplayName() {\n- return getHandle().bw();\n+ return getHandle().bA();\n }\n \n /**", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2FCanaryEntityLiving.java", "sha": "8cec8599022a99ea59050d801b34f992b56d63a0", "status": "modified" }, { "additions": 5, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2FCanaryIronGolem.java", "changes": 10, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2FCanaryIronGolem.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 5, "filename": "src/main/java/net/canarymod/api/entity/living/CanaryIronGolem.java", "new_code": " return getHandle().bT().getCanaryVillage();\n return getHandle().bW();\n getHandle().i(created);\n return getHandle().bV() > 0;\n return getHandle().bV();", "new_methods": [], "old_code": " return getHandle().bP().getCanaryVillage();\n return getHandle().bS();\n getHandle().j(created);\n return getHandle().bR() > 0;\n return getHandle().bR();", "old_methods": [], "patch": "@@ -40,7 +40,7 @@ public String getFqName() {\n */\n @Override\n public Village getVillage() {\n- return getHandle().bP().getCanaryVillage();\n+ return getHandle().bT().getCanaryVillage();\n }\n \n /**\n@@ -56,23 +56,23 @@ public void setVillage(Village village) {\n */\n @Override\n public boolean isPlayerCreated() {\n- return getHandle().bS();\n+ return getHandle().bW();\n }\n \n /**\n * {@inheritDoc}\n */\n @Override\n public void setPlayerCreated(boolean created) {\n- getHandle().j(created);\n+ getHandle().i(created);\n }\n \n /**\n * {@inheritDoc}\n */\n @Override\n public boolean isHoldingRose() {\n- return getHandle().bR() > 0;\n+ return getHandle().bV() > 0;\n }\n \n /**\n@@ -88,7 +88,7 @@ public void setHoldingRose(boolean holding) {\n */\n @Override\n public int getHoldRoseTicks() {\n- return getHandle().bR();\n+ return getHandle().bV();\n }\n \n /**", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2FCanaryIronGolem.java", "sha": "af206393a2afb24cc28853dcfd7c1acdaae1e894", "status": "modified" }, { "additions": 4, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2FCanaryLivingBase.java", "changes": 8, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2FCanaryLivingBase.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 4, "filename": "src/main/java/net/canarymod/api/entity/living/CanaryLivingBase.java", "new_code": " return getHandle().aM();\n Collection<net.minecraft.server.PotionEffect> effect_collection = ((net.minecraft.server.EntityLivingBase) entity).aK();\n net.minecraft.server.EntityLivingBase target = getHandle().aD();\n return getHandle().aT();", "new_methods": [], "old_code": " return getHandle().aJ();\n Collection<net.minecraft.server.PotionEffect> effect_collection = ((net.minecraft.server.EntityLivingBase) entity).aH();\n net.minecraft.server.EntityLivingBase target = getHandle().aC();\n return getHandle().aQ();", "old_methods": [], "patch": "@@ -32,7 +32,7 @@ public CanaryLivingBase(EntityLivingBase entity) {\n */\n @Override\n public float getHealth() {\n- return getHandle().aJ();\n+ return getHandle().aM();\n }\n \n /**\n@@ -182,7 +182,7 @@ public PotionEffect getActivePotionEffect(Potion potion) {\n @SuppressWarnings(\"unchecked\")\n @Override\n public List<PotionEffect> getAllActivePotionEffects() {\n- Collection<net.minecraft.server.PotionEffect> effect_collection = ((net.minecraft.server.EntityLivingBase) entity).aH();\n+ Collection<net.minecraft.server.PotionEffect> effect_collection = ((net.minecraft.server.EntityLivingBase) entity).aK();\n List<PotionEffect> list = new ArrayList<PotionEffect>();\n \n for (net.minecraft.server.PotionEffect nms_effect : effect_collection) {\n@@ -196,7 +196,7 @@ public List<PotionEffect> getAllActivePotionEffects() {\n */\n @Override\n public LivingBase getRevengeTarget() {\n- net.minecraft.server.EntityLivingBase target = getHandle().aC();\n+ net.minecraft.server.EntityLivingBase target = getHandle().aD();\n if (target != null) {\n return (LivingBase) target.getCanaryEntity();\n }\n@@ -298,7 +298,7 @@ public void lookAt(Entity entity) {\n */\n @Override\n public int getArrowCountInEntity() {\n- return getHandle().aQ();\n+ return getHandle().aT();\n }\n \n /**", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2FCanaryLivingBase.java", "sha": "c16c0da2439db7e63042edf40c8daa38abce41f1", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fanimal%2FCanaryBat.java", "changes": 2, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fanimal%2FCanaryBat.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 1, "filename": "src/main/java/net/canarymod/api/entity/living/animal/CanaryBat.java", "new_code": " return getHandle().bG();", "new_methods": [], "old_code": " return getHandle().bF();", "old_methods": [], "patch": "@@ -38,7 +38,7 @@ public String getFqName() {\n */\n @Override\n public boolean isHanging() {\n- return getHandle().bF();\n+ return getHandle().bG();\n }\n \n /**", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fanimal%2FCanaryBat.java", "sha": "47bb1aee2b860ddc751238cae3b89bc427bdf6bb", "status": "modified" }, { "additions": 12, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fanimal%2FCanaryHorse.java", "changes": 24, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fanimal%2FCanaryHorse.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 12, "filename": "src/main/java/net/canarymod/api/entity/living/animal/CanaryHorse.java", "new_code": " return getHandle().cg();\n return getHandle().ci();\n getHandle().k(bred);\n return getHandle().ce();\n getHandle().l(chested);\n return getHandle().cj();\n getHandle().m(reproduced);\n return getHandle().bT();\n return getHandle().bU();\n return getHandle().ck();\n return getHandle().bW();\n getHandle().i(tame);", "new_methods": [], "old_code": " return getHandle().cc();\n return getHandle().ce();\n getHandle().l(bred);\n return getHandle().ca();\n getHandle().m(chested);\n return getHandle().cf();\n getHandle().n(reproduced);\n return getHandle().bP();\n return getHandle().bQ();\n return getHandle().cg();\n return getHandle().bS();\n getHandle().j(tame);", "old_methods": [], "patch": "@@ -47,55 +47,55 @@ public String getFqName() {\n */\n @Override\n public boolean isEatingHay() {\n- return getHandle().cc();\n+ return getHandle().cg();\n }\n \n /**\n * {@inheritDoc}\n */\n @Override\n public boolean isBred() {\n- return getHandle().ce();\n+ return getHandle().ci();\n }\n \n /**\n * {@inheritDoc}\n */\n @Override\n public void setIsBred(boolean bred) {\n- getHandle().l(bred);\n+ getHandle().k(bred);\n }\n \n /**\n * {@inheritDoc}\n */\n @Override\n public boolean isChested() {\n- return getHandle().ca();\n+ return getHandle().ce();\n }\n \n /**\n * {@inheritDoc}\n */\n @Override\n public void setIsChested(boolean chested) {\n- getHandle().m(chested);\n+ getHandle().l(chested);\n }\n \n /**\n * {@inheritDoc}\n */\n @Override\n public boolean hasReproduced() {\n- return getHandle().cf();\n+ return getHandle().cj();\n }\n \n /**\n * {@inheritDoc}\n */\n @Override\n public void setHasReproduced(boolean reproduced) {\n- getHandle().n(reproduced);\n+ getHandle().m(reproduced);\n }\n \n /**\n@@ -111,7 +111,7 @@ public HorseType getType() {\n */\n @Override\n public int getRawType() {\n- return getHandle().bP();\n+ return getHandle().bT();\n }\n \n /**\n@@ -135,7 +135,7 @@ public void setType(int type) {\n */\n @Override\n public int getVariant() {\n- return getHandle().bQ();\n+ return getHandle().bU();\n }\n \n /**\n@@ -151,7 +151,7 @@ public void setVariant(int variant) {\n */\n @Override\n public int getTemper() {\n- return getHandle().cg();\n+ return getHandle().ck();\n }\n \n /**\n@@ -167,15 +167,15 @@ public void setTemper(int temper) {\n */\n @Override\n public boolean isTame() {\n- return getHandle().bS();\n+ return getHandle().bW();\n }\n \n /**\n * {@inheritDoc}\n */\n @Override\n public void setTame(boolean tame) {\n- getHandle().j(tame);\n+ getHandle().i(tame);\n }\n \n /**", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fanimal%2FCanaryHorse.java", "sha": "6cdb2b79f6d32e35f6181f6d269d0fa6fad4b561", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fanimal%2FCanaryOcelot.java", "changes": 2, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fanimal%2FCanaryOcelot.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 1, "filename": "src/main/java/net/canarymod/api/entity/living/animal/CanaryOcelot.java", "new_code": " return SkinType.values()[getHandle().ca()];", "new_methods": [], "old_code": " return SkinType.values()[getHandle().bW()];", "old_methods": [], "patch": "@@ -38,7 +38,7 @@ public String getFqName() {\n */\n @Override\n public SkinType getSkinType() {\n- return SkinType.values()[getHandle().bW()];\n+ return SkinType.values()[getHandle().ca()];\n }\n \n /**", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fanimal%2FCanaryOcelot.java", "sha": "2a1a82fd408aa307c835c407a3da83fecb33ab28", "status": "modified" }, { "additions": 2, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fanimal%2FCanaryPig.java", "changes": 4, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fanimal%2FCanaryPig.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 2, "filename": "src/main/java/net/canarymod/api/entity/living/animal/CanaryPig.java", "new_code": " return ((EntityPig) entity).bT();\n ((EntityPig) entity).i(saddled);", "new_methods": [], "old_code": " return ((EntityPig) entity).bP();\n ((EntityPig) entity).j(saddled);", "old_methods": [], "patch": "@@ -38,15 +38,15 @@ public String getFqName() {\n */\n @Override\n public boolean isSaddled() {\n- return ((EntityPig) entity).bP();\n+ return ((EntityPig) entity).bT();\n }\n \n /**\n * {@inheritDoc}\n */\n @Override\n public void setSaddled(boolean saddled) {\n- ((EntityPig) entity).j(saddled);\n+ ((EntityPig) entity).i(saddled);\n }\n \n /**", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fanimal%2FCanaryPig.java", "sha": "fb939b7946db09dc212b153ea9f4450a0b36ffb3", "status": "modified" }, { "additions": 3, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fanimal%2FCanarySheep.java", "changes": 6, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fanimal%2FCanarySheep.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 3, "filename": "src/main/java/net/canarymod/api/entity/living/animal/CanarySheep.java", "new_code": " return DyeColor.values()[getHandle().bT()];\n return getHandle().bU();\n getHandle().i(sheared);", "new_methods": [], "old_code": " return DyeColor.values()[getHandle().bP()];\n return getHandle().bQ();\n getHandle().j(sheared);", "old_methods": [], "patch": "@@ -47,7 +47,7 @@ public void eatGrass() {\n */\n @Override\n public DyeColor getColor() {\n- return DyeColor.values()[getHandle().bP()];\n+ return DyeColor.values()[getHandle().bT()];\n }\n \n /**\n@@ -63,15 +63,15 @@ public void setColor(DyeColor color) {\n */\n @Override\n public boolean isSheared() {\n- return getHandle().bQ();\n+ return getHandle().bU();\n }\n \n /**\n * {@inheritDoc}\n */\n @Override\n public void setSheared(boolean sheared) {\n- getHandle().j(sheared);\n+ getHandle().i(sheared);\n }\n \n /**", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fanimal%2FCanarySheep.java", "sha": "5b098e19e867b6c2ad9e854784c80982dab29b68", "status": "modified" }, { "additions": 6, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fanimal%2FCanaryTameable.java", "changes": 12, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fanimal%2FCanaryTameable.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 6, "filename": "src/main/java/net/canarymod/api/entity/living/animal/CanaryTameable.java", "new_code": " return (LivingBase) getHandle().bV().getCanaryEntity();\n getHandle().b(name);\n return getHandle().bT();\n getHandle().j(tamed);\n return getHandle().bU();\n ((EntityTameable) entity).k(sitting);", "new_methods": [], "old_code": " return (LivingBase) getHandle().bR().getCanaryEntity();\n ((EntityTameable) entity).b(name);\n return ((EntityTameable) entity).bP();\n ((EntityTameable) entity).k(tamed);\n return ((EntityTameable) entity).bQ();\n ((EntityTameable) entity).l(sitting);", "old_methods": [], "patch": "@@ -25,7 +25,7 @@ public CanaryTameable(EntityTameable entity) {\n */\n @Override\n public LivingBase getOwner() {\n- return (LivingBase) getHandle().bR().getCanaryEntity();\n+ return (LivingBase) getHandle().bV().getCanaryEntity();\n }\n \n /**\n@@ -49,39 +49,39 @@ public void setOwner(LivingBase entity) {\n */\n @Override\n public void setOwner(String name) {\n- ((EntityTameable) entity).b(name);\n+ getHandle().b(name);\n }\n \n /**\n * {@inheritDoc}\n */\n @Override\n public boolean isTamed() {\n- return ((EntityTameable) entity).bP();\n+ return getHandle().bT();\n }\n \n /**\n * {@inheritDoc}\n */\n @Override\n public void setTamed(boolean tamed) {\n- ((EntityTameable) entity).k(tamed);\n+ getHandle().j(tamed);\n }\n \n /**\n * {@inheritDoc}\n */\n @Override\n public boolean isSitting() {\n- return ((EntityTameable) entity).bQ();\n+ return getHandle().bU();\n }\n \n /**\n * {@inheritDoc}\n */\n @Override\n public void setSitting(boolean sitting) {\n- ((EntityTameable) entity).l(sitting);\n+ ((EntityTameable) entity).k(sitting);\n }\n \n /**", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fanimal%2FCanaryTameable.java", "sha": "b6df508cfa9cf3db9d161a6c458fd225afa5189c", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fanimal%2FCanaryWolf.java", "changes": 2, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fanimal%2FCanaryWolf.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 1, "filename": "src/main/java/net/canarymod/api/entity/living/animal/CanaryWolf.java", "new_code": " return DyeColor.values()[getHandle().cd()];", "new_methods": [], "old_code": " return DyeColor.values()[getHandle().bZ()];", "old_methods": [], "patch": "@@ -63,7 +63,7 @@ public void setCollarColor(DyeColor color) {\n */\n @Override\n public DyeColor getCollarColor() {\n- return DyeColor.values()[getHandle().bZ()];\n+ return DyeColor.values()[getHandle().cd()];\n }\n \n /**", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fanimal%2FCanaryWolf.java", "sha": "4f26598264d2631b271fbc992bc2e271c571148d", "status": "modified" }, { "additions": 8, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fhumanoid%2FCanaryPlayer.java", "changes": 16, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fhumanoid%2FCanaryPlayer.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 8, "filename": "src/main/java/net/canarymod/api/entity/living/humanoid/CanaryPlayer.java", "new_code": " ChunkCoordinates loc = ((EntityPlayerMP) entity).bE();\n getHandle().bH().a(exhaustion);\n getHandle().bH().setExhaustionLevel(exhaustion);\n return getHandle().bH().getExhaustionLevel();\n getHandle().bH().setFoodLevel(hunger);\n return getHandle().bH().a();\n return getHandle().bg();\n return getHandle().bC();", "new_methods": [], "old_code": " ChunkCoordinates loc = ((EntityPlayerMP) entity).bA();\n getHandle().bD().a(exhaustion);\n getHandle().bD().setExhaustionLevel(exhaustion);\n return getHandle().bD().getExhaustionLevel();\n getHandle().bD().setFoodLevel(hunger);\n return getHandle().bD().a();\n return getHandle().bd();\n return getHandle().by();", "old_methods": [], "patch": "@@ -116,7 +116,7 @@ public void notice(String message) {\n @Override\n public Location getSpawnPosition() {\n Location spawn = Canary.getServer().getDefaultWorld().getSpawnLocation();\n- ChunkCoordinates loc = ((EntityPlayerMP) entity).bA();\n+ ChunkCoordinates loc = ((EntityPlayerMP) entity).bE();\n \n if (loc != null) {\n spawn = new Location(Canary.getServer().getDefaultWorld(), loc.a, loc.b, loc.c, 0.0F, 0.0F);\n@@ -469,27 +469,27 @@ public void sendPlayerListEntry(PlayerListEntry plentry) {\n \n @Override\n public void addExhaustion(float exhaustion) {\n- getHandle().bD().a(exhaustion);\n+ getHandle().bH().a(exhaustion);\n }\n \n @Override\n public void setExhaustion(float exhaustion) {\n- getHandle().bD().setExhaustionLevel(exhaustion);\n+ getHandle().bH().setExhaustionLevel(exhaustion);\n }\n \n @Override\n public float getExhaustionLevel() {\n- return getHandle().bD().getExhaustionLevel();\n+ return getHandle().bH().getExhaustionLevel();\n }\n \n @Override\n public void setHunger(int hunger) {\n- getHandle().bD().setFoodLevel(hunger);\n+ getHandle().bH().setFoodLevel(hunger);\n }\n \n @Override\n public int getHunger() {\n- return getHandle().bD().a();\n+ return getHandle().bH().a();\n }\n \n @Override\n@@ -522,12 +522,12 @@ public int getLevel() {\n \n @Override\n public boolean isSleeping() {\n- return getHandle().bd();\n+ return getHandle().bg();\n }\n \n @Override\n public boolean isDeeplySleeping() {\n- return getHandle().by();\n+ return getHandle().bC();\n }\n \n @Override", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fhumanoid%2FCanaryPlayer.java", "sha": "c2107a350390921dbde1e9ae596eab49b9fdd165", "status": "modified" }, { "additions": 5, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fhumanoid%2FCanaryVillager.java", "changes": 10, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fhumanoid%2FCanaryVillager.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 5, "filename": "src/main/java/net/canarymod/api/entity/living/humanoid/CanaryVillager.java", "new_code": " return Profession.fromId(getHandle().bT());\n return getHandle().bU();\n getHandle().j(isMating);\n return getHandle().bS();\n getHandle().i(playing);", "new_methods": [], "old_code": " return Profession.fromId(getHandle().bP());\n return getHandle().bQ();\n getHandle().i(isMating);\n return getHandle().bR();\n getHandle().j(playing);", "old_methods": [], "patch": "@@ -44,7 +44,7 @@ public String getFqName() {\n */\n @Override\n public Profession getProfession() {\n- return Profession.fromId(getHandle().bP());\n+ return Profession.fromId(getHandle().bT());\n }\n \n /**\n@@ -60,31 +60,31 @@ public void setProfession(Profession profession) {\n */\n @Override\n public boolean isMating() {\n- return getHandle().bQ();\n+ return getHandle().bU();\n }\n \n /**\n * {@inheritDoc}\n */\n @Override\n public void setMating(boolean isMating) {\n- getHandle().i(isMating);\n+ getHandle().j(isMating);\n }\n \n /**\n * {@inheritDoc}\n */\n @Override\n public boolean isPlaying() {\n- return getHandle().bR();\n+ return getHandle().bS();\n }\n \n /**\n * {@inheritDoc}\n */\n @Override\n public void setPlaying(boolean playing) {\n- getHandle().j(playing);\n+ getHandle().i(playing);\n }\n \n /**", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fhumanoid%2FCanaryVillager.java", "sha": "f4dad2939c03e3bb25f87f5eb62e9f451f7f6823", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fhumanoid%2FEntityNonPlayableCharacter.java", "changes": 2, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fhumanoid%2FEntityNonPlayableCharacter.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 1, "filename": "src/main/java/net/canarymod/api/entity/living/humanoid/EntityNonPlayableCharacter.java", "new_code": " protected void bh() {", "new_methods": [], "old_code": " protected void be() {", "old_methods": [], "patch": "@@ -97,7 +97,7 @@ public void w() {\n getNPC().destroyed();\n }\n \n- protected void be() {\n+ protected void bh() {\n this.move_helper.c();\n }\n ", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fhumanoid%2FEntityNonPlayableCharacter.java", "sha": "6c61324142c515a8dec5234840315bbd2bdffefe", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fmonster%2FCanaryBlaze.java", "changes": 2, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fmonster%2FCanaryBlaze.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 1, "filename": "src/main/java/net/canarymod/api/entity/living/monster/CanaryBlaze.java", "new_code": " return getHandle().bT();", "new_methods": [], "old_code": " return getHandle().bP();", "old_methods": [], "patch": "@@ -38,7 +38,7 @@ public String getFqName() {\n */\n @Override\n public boolean isBurning() {\n- return getHandle().bP();\n+ return getHandle().bT();\n }\n \n /**", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fmonster%2FCanaryBlaze.java", "sha": "cd3c32bb14a12d4dbb09d709c5d6693981a49345", "status": "modified" }, { "additions": 2, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fmonster%2FCanaryCreeper.java", "changes": 4, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fmonster%2FCanaryCreeper.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 2, "filename": "src/main/java/net/canarymod/api/entity/living/monster/CanaryCreeper.java", "new_code": " return getHandle().bT();\n return getHandle().bV() == 1;", "new_methods": [], "old_code": " return getHandle().bP();\n return getHandle().bR() == 1;", "old_methods": [], "patch": "@@ -73,7 +73,7 @@ public boolean canDamageEntities() {\n */\n @Override\n public boolean isCharged() {\n- return getHandle().bP();\n+ return getHandle().bT();\n }\n \n /**\n@@ -145,7 +145,7 @@ public void decreaseFuse(int decrease) {\n */\n @Override\n public boolean isAgro() {\n- return getHandle().bR() == 1;\n+ return getHandle().bV() == 1;\n }\n \n /**", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fmonster%2FCanaryCreeper.java", "sha": "f858ec789f8aae374818bb8aaf3672009e34b2aa", "status": "modified" }, { "additions": 4, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fmonster%2FCanaryEnderman.java", "changes": 8, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fmonster%2FCanaryEnderman.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 4, "filename": "src/main/java/net/canarymod/api/entity/living/monster/CanaryEnderman.java", "new_code": " return (short) getHandle().bW();\n return (short) getHandle().bV();\n return getHandle().bT();\n return getHandle().bX();", "new_methods": [], "old_code": " return (short) getHandle().bR();\n return (short) getHandle().bS();\n return getHandle().bP();\n return getHandle().bT();", "old_methods": [], "patch": "@@ -38,7 +38,7 @@ public String getFqName() {\n */\n @Override\n public short getCarriedBlockID() {\n- return (short) getHandle().bR();\n+ return (short) getHandle().bW();\n }\n \n /**\n@@ -54,7 +54,7 @@ public void setCarriedBlockID(short blockId) {\n */\n @Override\n public short getCarriedBlockMetaData() {\n- return (short) getHandle().bS();\n+ return (short) getHandle().bV();\n }\n \n /**\n@@ -70,15 +70,15 @@ public void setCarriedBlockMetaData(short metadata) {\n */\n @Override\n public boolean randomTeleport() {\n- return getHandle().bP();\n+ return getHandle().bT();\n }\n \n /**\n * {@inheritDoc}\n */\n @Override\n public boolean isScreaming() {\n- return getHandle().bT();\n+ return getHandle().bX();\n }\n \n /**", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fmonster%2FCanaryEnderman.java", "sha": "5a0332f4853ae1da7ba5961ecc584726e4dc060a", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fmonster%2FCanarySkeleton.java", "changes": 2, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fmonster%2FCanarySkeleton.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 1, "filename": "src/main/java/net/canarymod/api/entity/living/monster/CanarySkeleton.java", "new_code": " return getHandle().bV() == 1;", "new_methods": [], "old_code": " return getHandle().bR() == 1;", "old_methods": [], "patch": "@@ -38,7 +38,7 @@ public String getFqName() {\n */\n @Override\n public boolean isWitherSkeleton() {\n- return getHandle().bR() == 1;\n+ return getHandle().bV() == 1;\n }\n \n /**", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fmonster%2FCanarySkeleton.java", "sha": "92f6aae3d73ad00dbca0a265271c9bf3de72628d", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fmonster%2FCanarySlime.java", "changes": 2, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fmonster%2FCanarySlime.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 1, "filename": "src/main/java/net/canarymod/api/entity/living/monster/CanarySlime.java", "new_code": " return Size.fromByte((byte) getHandle().bR());", "new_methods": [], "old_code": " return Size.fromByte((byte) getHandle().bN());", "old_methods": [], "patch": "@@ -39,7 +39,7 @@ public String getFqName() {\n */\n @Override\n public Size getSize() {\n- return Size.fromByte((byte) getHandle().bN());\n+ return Size.fromByte((byte) getHandle().bR());\n }\n \n /**", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fmonster%2FCanarySlime.java", "sha": "b2d70c199e66bf5b22f7046426c5476fbb82d08c", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fmonster%2FCanaryWitch.java", "changes": 2, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fmonster%2FCanaryWitch.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 1, "filename": "src/main/java/net/canarymod/api/entity/living/monster/CanaryWitch.java", "new_code": " return getHandle().bT();", "new_methods": [], "old_code": " return getHandle().bP();", "old_methods": [], "patch": "@@ -38,7 +38,7 @@ public String getFqName() {\n */\n @Override\n public boolean isAgressive() {\n- return getHandle().bP();\n+ return getHandle().bT();\n }\n \n /**", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fmonster%2FCanaryWitch.java", "sha": "ecd83f37c24ce10338e97db9541b66ba91165fee", "status": "modified" }, { "additions": 9, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fmonster%2FCanaryZombie.java", "changes": 18, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fmonster%2FCanaryZombie.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 9, "filename": "src/main/java/net/canarymod/api/entity/living/monster/CanaryZombie.java", "new_code": " return getHandle().bT();\n getHandle().i(villager);\n return getHandle().g_();\n getHandle().a(child);\n return getHandle().getConvertTicks();\n getHandle().b(ticks);\n return getHandle().bV();\n getHandle().stopConversion();\n getHandle().bS();", "new_methods": [], "old_code": " return ((EntityZombie) entity).bP();\n ((EntityZombie) entity).j(villager);\n return ((EntityZombie) entity).g_();\n ((EntityZombie) entity).a(child);\n return ((EntityZombie) entity).getConvertTicks();\n ((EntityZombie) entity).a(ticks);\n return ((EntityZombie) entity).bR();\n ((EntityZombie) entity).stopConversion();\n ((EntityZombie) entity).bS();", "old_methods": [], "patch": "@@ -38,71 +38,71 @@ public String getFqName() {\n */\n @Override\n public boolean isVillager() {\n- return ((EntityZombie) entity).bP();\n+ return getHandle().bT();\n }\n \n /**\n * {@inheritDoc}\n */\n @Override\n public void setVillager(boolean villager) {\n- ((EntityZombie) entity).j(villager);\n+ getHandle().i(villager);\n }\n \n /**\n * {@inheritDoc}\n */\n @Override\n public boolean isChild() {\n- return ((EntityZombie) entity).g_();\n+ return getHandle().g_();\n }\n \n /**\n * {@inheritDoc}\n */\n @Override\n public void setChild(boolean child) {\n- ((EntityZombie) entity).a(child);\n+ getHandle().a(child);\n }\n \n /**\n * {@inheritDoc}\n */\n @Override\n public int getConversionTime() {\n- return ((EntityZombie) entity).getConvertTicks();\n+ return getHandle().getConvertTicks();\n }\n \n /**\n * {@inheritDoc}\n */\n @Override\n public void setConversionTime(int ticks) {\n- ((EntityZombie) entity).a(ticks);\n+ getHandle().b(ticks);\n }\n \n /**\n * {@inheritDoc}\n */\n @Override\n public boolean isConverting() {\n- return ((EntityZombie) entity).bR();\n+ return getHandle().bV();\n }\n \n /**\n * {@inheritDoc}\n */\n @Override\n public void stopConverting() {\n- ((EntityZombie) entity).stopConversion();\n+ getHandle().stopConversion();\n }\n \n /**\n * {@inheritDoc}\n */\n @Override\n public void convertToVillager() {\n- ((EntityZombie) entity).bS();\n+ getHandle().bS();\n }\n \n /**", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fmonster%2FCanaryZombie.java", "sha": "5ff93b49f5d7951cafaca6880ec9ec1c9b5d24a4", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fvehicle%2FCanaryHopperMinecart.java", "changes": 2, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fvehicle%2FCanaryHopperMinecart.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 1, "filename": "src/main/java/net/canarymod/api/entity/vehicle/CanaryHopperMinecart.java", "new_code": " return getHandle().ay();", "new_methods": [], "old_code": " return getHandle().ax();", "old_methods": [], "patch": "@@ -67,7 +67,7 @@ public void setTransferCooldown(int cooldown) {\n */\n @Override\n public boolean isBlocked() {\n- return getHandle().ax();\n+ return getHandle().ay();\n }\n \n /**", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fvehicle%2FCanaryHopperMinecart.java", "sha": "2209cc177dbfb819f2006182452e0bf31a241fcc", "status": "modified" }, { "additions": 2, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fworld%2Fblocks%2FCanaryComplexBlock.java", "changes": 4, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fworld%2Fblocks%2FCanaryComplexBlock.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 2, "filename": "src/main/java/net/canarymod/api/world/blocks/CanaryComplexBlock.java", "new_code": " return tileentity.az().getCanaryWorld();\n tileentity.az().j(getX(), getY(), getZ());", "new_methods": [], "old_code": " return tileentity.ay().getCanaryWorld();\n tileentity.ay().j(getX(), getY(), getZ());", "old_methods": [], "patch": "@@ -78,15 +78,15 @@ public int getZ() {\n */\n @Override\n public World getWorld() {\n- return tileentity.ay().getCanaryWorld();\n+ return tileentity.az().getCanaryWorld();\n }\n \n /**\n * {@inheritDoc}\n */\n @Override\n public void update() {\n- tileentity.ay().j(getX(), getY(), getZ());\n+ tileentity.az().j(getX(), getY(), getZ());\n }\n \n /**", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fworld%2Fblocks%2FCanaryComplexBlock.java", "sha": "1eaf3233e48838b5bd54da7b948bde0e12216a52", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fworld%2Fblocks%2FCanaryHopperBlock.java", "changes": 2, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fworld%2Fblocks%2FCanaryHopperBlock.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 1, "filename": "src/main/java/net/canarymod/api/world/blocks/CanaryHopperBlock.java", "new_code": " return this.getTileEntity().az().getCanaryWorld();", "new_methods": [], "old_code": " return this.getTileEntity().ay().getCanaryWorld();", "old_methods": [], "patch": "@@ -82,7 +82,7 @@ public boolean isOutputConnected() {\n */\n @Override\n public World getWorld() {\n- return this.getTileEntity().ay().getCanaryWorld();\n+ return this.getTileEntity().az().getCanaryWorld();\n }\n \n /**", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fworld%2Fblocks%2FCanaryHopperBlock.java", "sha": "8b90e9bdd26706f75bafd342a6cfc6430a3da2b3", "status": "modified" }, { "additions": 2, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fworld%2Fblocks%2FCanaryNoteBlock.java", "changes": 4, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fworld%2Fblocks%2FCanaryNoteBlock.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 2, "filename": "src/main/java/net/canarymod/api/world/blocks/CanaryNoteBlock.java", "new_code": " Material material = tileentity.az().g(getX(), getY() - 1, getZ());\n getTileEntity().a(tileentity.az(), getX(), getY(), getZ());", "new_methods": [], "old_code": " Material material = tileentity.ay().g(getX(), getY() - 1, getZ());\n getTileEntity().a(tileentity.ay(), getX(), getY(), getZ());", "old_methods": [], "patch": "@@ -25,7 +25,7 @@ public CanaryNoteBlock(TileEntityNote tileentity) {\n */\n @Override\n public byte getInstrument() {\n- Material material = tileentity.ay().g(getX(), getY() - 1, getZ());\n+ Material material = tileentity.az().g(getX(), getY() - 1, getZ());\n byte instrument = 0;\n \n if (material == Material.e) {\n@@ -60,7 +60,7 @@ public byte getNote() {\n */\n @Override\n public void play() {\n- getTileEntity().a(tileentity.ay(), getX(), getY(), getZ());\n+ getTileEntity().a(tileentity.az(), getX(), getY(), getZ());\n }\n \n /**", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fworld%2Fblocks%2FCanaryNoteBlock.java", "sha": "ba03a53585304ba9babbca81a86e99bd0ba75d75", "status": "modified" }, { "additions": 0, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FAchievement.java", "changes": 1, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FAchievement.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 1, "filename": "src/main/java/net/minecraft/server/Achievement.java", "new_code": "", "new_methods": [], "old_code": "", "old_methods": [], "patch": "@@ -1,6 +1,5 @@\n package net.minecraft.server;\n \n-\n public class Achievement extends StatBase {\n \n public final int a;", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FAchievement.java", "sha": "98d39ca093b920b83a7a8769f0434841841d03e6", "status": "modified" }, { "additions": 0, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FAnvilSaveConverter.java", "changes": 3, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FAnvilSaveConverter.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 3, "filename": "src/main/java/net/minecraft/server/AnvilSaveConverter.java", "new_code": "", "new_methods": [], "old_code": "\n\n", "old_methods": [], "patch": "@@ -1,6 +1,5 @@\n package net.minecraft.server;\n \n-\n import java.io.DataInput;\n import java.io.DataInputStream;\n import java.io.DataOutput;\n@@ -11,10 +10,8 @@\n import java.util.Collection;\n import java.util.Collections;\n import java.util.Iterator;\n-\n import net.canarymod.Canary;\n \n-\n public class AnvilSaveConverter extends SaveFormatOld {\n \n public AnvilSaveConverter(File file1, net.canarymod.api.world.DimensionType type) {", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FAnvilSaveConverter.java", "sha": "f288c413533d66a877ff8d1602fc7d89511a8f1e", "status": "modified" }, { "additions": 0, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FAnvilSaveHandler.java", "changes": 3, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FAnvilSaveHandler.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 3, "filename": "src/main/java/net/minecraft/server/AnvilSaveHandler.java", "new_code": "", "new_methods": [], "old_code": "\n\n", "old_methods": [], "patch": "@@ -1,11 +1,8 @@\n package net.minecraft.server;\n \n-\n import java.io.File;\n-\n import net.canarymod.api.world.DimensionType;\n \n-\n public class AnvilSaveHandler extends SaveHandler {\n \n public AnvilSaveHandler(File file1, String s0, boolean flag0, DimensionType type) {", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FAnvilSaveHandler.java", "sha": "afa45f028bb470a52c92f4b5ca9761bc0c3ead83", "status": "modified" }, { "additions": 0, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FBehaviorDispenseMinecart.java", "changes": 1, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FBehaviorDispenseMinecart.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 1, "filename": "src/main/java/net/minecraft/server/BehaviorDispenseMinecart.java", "new_code": "", "new_methods": [], "old_code": " // MERGE: This seems to be new - Chris", "old_methods": [], "patch": "@@ -31,7 +31,6 @@ public ItemStack b(IBlockSource iblocksource, ItemStack itemstack) {\n }\n \n EntityMinecart entityminecart = EntityMinecart.a(world, d0, d1 + d3, d2, ((ItemMinecart) itemstack.b()).a);\n- // MERGE: This seems to be new - Chris\n if (itemstack.u()) {\n entityminecart.a(itemstack.s());\n }", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FBehaviorDispenseMinecart.java", "sha": "b03753db03d2e3374d4df0878c3b5c36b3ca7a37", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FBlock.java", "changes": 3, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FBlock.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 2, "filename": "src/main/java/net/minecraft/server/Block.java", "new_code": " protected final void a(float f0, float f1, float f2, float f3, float f4, float f5) {", "new_methods": [], "old_code": " protected final void a(float f0, float f1, float f2, float f3, float f4,\n float f5) {", "old_methods": [], "patch": "@@ -296,8 +296,7 @@ public boolean t() {\n return this.cL;\n }\n \n- protected final void a(float f0, float f1, float f2, float f3, float f4,\n- float f5) {\n+ protected final void a(float f0, float f1, float f2, float f3, float f4, float f5) {\n this.cM = (double) f0;\n this.cN = (double) f1;\n this.cO = (double) f2;", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FBlock.java", "sha": "ad5dbacac3903fe3043c3670251fc9ba1af76536", "status": "modified" }, { "additions": 0, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FBlockDoor.java", "changes": 2, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FBlockDoor.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 2, "filename": "src/main/java/net/minecraft/server/BlockDoor.java", "new_code": "", "new_methods": [], "old_code": "\n", "old_methods": [], "patch": "@@ -1,9 +1,7 @@\n package net.minecraft.server;\n \n-\n import java.util.Random;\n \n-\n public class BlockDoor extends Block {\n \n protected BlockDoor(int i0, Material material) {", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FBlockDoor.java", "sha": "32355c83cbb9391f6b71648065bf0a269e11e668", "status": "modified" }, { "additions": 0, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FBlockFluid.java", "changes": 2, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FBlockFluid.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 2, "filename": "src/main/java/net/minecraft/server/BlockFluid.java", "new_code": "", "new_methods": [], "old_code": "\n", "old_methods": [], "patch": "@@ -1,9 +1,7 @@\n package net.minecraft.server;\n \n-\n import java.util.Random;\n \n-\n public abstract class BlockFluid extends Block {\n \n protected BlockFluid(int i0, Material material) {", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FBlockFluid.java", "sha": "d5dd852f73c295ca5ad22e213f3e799117861994", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FBlockHalfSlab.java", "changes": 2, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FBlockHalfSlab.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 1, "filename": "src/main/java/net/minecraft/server/BlockHalfSlab.java", "new_code": " this.a((IBlockAccess) world, i0, i1, i2); // CanaryMod cast to IBlockAccess", "new_methods": [], "old_code": " this.a((IBlockAccess)world, i0, i1, i2); //CanaryMod cast to IBlockAccess", "old_methods": [], "patch": "@@ -42,7 +42,7 @@ public void g() {\n }\n \n public void a(World world, int i0, int i1, int i2, AxisAlignedBB axisalignedbb, List list, Entity entity) {\n- this.a((IBlockAccess)world, i0, i1, i2); //CanaryMod cast to IBlockAccess\n+ this.a((IBlockAccess) world, i0, i1, i2); // CanaryMod cast to IBlockAccess\n super.a(world, i0, i1, i2, axisalignedbb, list, entity);\n }\n ", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FBlockHalfSlab.java", "sha": "43da760086f787302eb3f1ab84ee2adb85998bf0", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FBlockLadder.java", "changes": 2, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FBlockLadder.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 1, "filename": "src/main/java/net/minecraft/server/BlockLadder.java", "new_code": " this.a((IBlockAccess) world, i0, i1, i2); // CanaryMod: cast to IBlockAccess", "new_methods": [], "old_code": " this.a((IBlockAccess) world, i0, i1, i2); //CanaryMod: cast to IBlockAccess", "old_methods": [], "patch": "@@ -10,7 +10,7 @@ protected BlockLadder(int i0) {\n }\n \n public AxisAlignedBB b(World world, int i0, int i1, int i2) {\n- this.a((IBlockAccess) world, i0, i1, i2); //CanaryMod: cast to IBlockAccess\n+ this.a((IBlockAccess) world, i0, i1, i2); // CanaryMod: cast to IBlockAccess\n return super.b(world, i0, i1, i2);\n }\n ", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FBlockLadder.java", "sha": "607dcebe225336b8082c1a5a272529ef5d35ebcf", "status": "modified" }, { "additions": 3, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FBlockLeaves.java", "changes": 10, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FBlockLeaves.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 7, "filename": "src/main/java/net/minecraft/server/BlockLeaves.java", "new_code": " public static final String[] a = new String[]{ \"oak\", \"spruce\", \"birch\", \"jungle\" };\n public static final String[][] b = new String[][]{ { \"leaves_oak\", \"leaves_spruce\", \"leaves_birch\", \"leaves_jungle\" }, { \"leaves_oak_opaque\", \"leaves_spruce_opaque\", \"leaves_birch_opaque\", \"leaves_jungle_opaque\" } };\n if (!world.I && entityplayer.bx() != null && entityplayer.bx().d == Item.bg.cv) {", "new_methods": [], "old_code": " public static final String[] a = new String[]{ \"oak\", \"spruce\", \"birch\",\n \"jungle\" };\n public static final String[][] b = new String[][]{\n { \"leaves_oak\", \"leaves_spruce\", \"leaves_birch\", \"leaves_jungle\" },\n { \"leaves_oak_opaque\", \"leaves_spruce_opaque\",\n \"leaves_birch_opaque\", \"leaves_jungle_opaque\" } };\n if (!world.I && entityplayer.bt() != null && entityplayer.bt().d == Item.bg.cv) {", "old_methods": [], "patch": "@@ -6,12 +6,8 @@\n \n public class BlockLeaves extends BlockLeavesBase {\n \n- public static final String[] a = new String[]{ \"oak\", \"spruce\", \"birch\",\n- \"jungle\" };\n- public static final String[][] b = new String[][]{\n- { \"leaves_oak\", \"leaves_spruce\", \"leaves_birch\", \"leaves_jungle\" },\n- { \"leaves_oak_opaque\", \"leaves_spruce_opaque\",\n- \"leaves_birch_opaque\", \"leaves_jungle_opaque\" } };\n+ public static final String[] a = new String[]{ \"oak\", \"spruce\", \"birch\", \"jungle\" };\n+ public static final String[][] b = new String[][]{ { \"leaves_oak\", \"leaves_spruce\", \"leaves_birch\", \"leaves_jungle\" }, { \"leaves_oak_opaque\", \"leaves_spruce_opaque\", \"leaves_birch_opaque\", \"leaves_jungle_opaque\" } };\n private Icon[][] cX = new Icon[2][];\n int[] c;\n \n@@ -179,7 +175,7 @@ public void a(World world, int i0, int i1, int i2, int i3, float f0, int i4) {\n }\n \n public void a(World world, EntityPlayer entityplayer, int i0, int i1, int i2, int i3) {\n- if (!world.I && entityplayer.bt() != null && entityplayer.bt().d == Item.bg.cv) {\n+ if (!world.I && entityplayer.bx() != null && entityplayer.bx().d == Item.bg.cv) {\n entityplayer.a(StatList.C[this.cF], 1);\n this.b(world, i0, i1, i2, new ItemStack(Block.P.cF, 1, i3 & 3));\n } else {", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FBlockLeaves.java", "sha": "88bb9e39274470f021972b4d76ce37c31ace7f30", "status": "modified" }, { "additions": 2, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FBlockLever.java", "changes": 10, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FBlockLever.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 8, "filename": "src/main/java/net/minecraft/server/BlockLever.java", "new_code": " return i3 == 0 && world.u(i0, i1 + 1, i2) ? true : (i3 == 1 && world.w(i0, i1 - 1, i2) ? true : (i3 == 2 && world.u(i0, i1, i2 + 1) ? true : (i3 == 3 && world.u(i0, i1, i2 - 1) ? true : (i3 == 4 && world.u(i0 + 1, i1, i2) ? true : i3 == 5 && world.u(i0 - 1, i1, i2)))));\n world.a((double) i0 + 0.5D, (double) i1 + 0.5D, (double) i2 + 0.5D, \"random.click\", 0.3F, i6 > 0 ? 0.6F : 0.5F);", "new_methods": [], "old_code": " return i3 == 0 && world.u(i0, i1 + 1, i2) ? true : (i3 == 1\n && world.w(i0, i1 - 1, i2) ? true : (i3 == 2\n && world.u(i0, i1, i2 + 1) ? true : (i3 == 3\n && world.u(i0, i1, i2 - 1) ? true : (i3 == 4\n && world.u(i0 + 1, i1, i2) ? true : i3 == 5\n && world.u(i0 - 1, i1, i2)))));\n world.a((double) i0 + 0.5D, (double) i1 + 0.5D, (double) i2 + 0.5D,\n \"random.click\", 0.3F, i6 > 0 ? 0.6F : 0.5F);", "old_methods": [], "patch": "@@ -26,12 +26,7 @@ public int d() {\n }\n \n public boolean c(World world, int i0, int i1, int i2, int i3) {\n- return i3 == 0 && world.u(i0, i1 + 1, i2) ? true : (i3 == 1\n- && world.w(i0, i1 - 1, i2) ? true : (i3 == 2\n- && world.u(i0, i1, i2 + 1) ? true : (i3 == 3\n- && world.u(i0, i1, i2 - 1) ? true : (i3 == 4\n- && world.u(i0 + 1, i1, i2) ? true : i3 == 5\n- && world.u(i0 - 1, i1, i2)))));\n+ return i3 == 0 && world.u(i0, i1 + 1, i2) ? true : (i3 == 1 && world.w(i0, i1 - 1, i2) ? true : (i3 == 2 && world.u(i0, i1, i2 + 1) ? true : (i3 == 3 && world.u(i0, i1, i2 - 1) ? true : (i3 == 4 && world.u(i0 + 1, i1, i2) ? true : i3 == 5 && world.u(i0 - 1, i1, i2)))));\n }\n \n public boolean c(World world, int i0, int i1, int i2) {\n@@ -210,8 +205,7 @@ public boolean a(World world, int i0, int i1, int i2, EntityPlayer entityplayer,\n } // CanaryMod: end\n \n world.b(i0, i1, i2, i5 + i6, 3);\n- world.a((double) i0 + 0.5D, (double) i1 + 0.5D, (double) i2 + 0.5D,\n- \"random.click\", 0.3F, i6 > 0 ? 0.6F : 0.5F);\n+ world.a((double) i0 + 0.5D, (double) i1 + 0.5D, (double) i2 + 0.5D, \"random.click\", 0.3F, i6 > 0 ? 0.6F : 0.5F);\n world.f(i0, i1, i2, this.cF);\n if (i5 == 1) {\n world.f(i0 - 1, i1, i2, this.cF);", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FBlockLever.java", "sha": "e95a5c3cb77536f945e07978a73fb704cbb5959f", "status": "modified" }, { "additions": 2, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FBlockPistonBase.java", "changes": 14, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FBlockPistonBase.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 12, "filename": "src/main/java/net/minecraft/server/BlockPistonBase.java", "new_code": " return i3 != 0 && world.k(i0, i1 - 1, i2, 0) ? true : (i3 != 1 && world.k(i0, i1 + 1, i2, 1) ? true : (i3 != 2 && world.k(i0, i1, i2 - 1, 2) ? true : (i3 != 3 && world.k(i0, i1, i2 + 1, 3) ? true : (i3 != 5 && world.k(i0 + 1, i1, i2, 5) ? true : (i3 != 4 && world.k(i0 - 1, i1, i2, 4) ? true : (world.k(i0, i1, i2, 0) ? true : (world.k(i0, i1 + 2, i2,\n 1) ? true : (world.k(i0, i1 + 1, i2 - 1, 2) ? true : (world.k(i0, i1 + 1, i2 + 1, 3) ? true : (world.k(i0 - 1, i1 + 1, i2, 4) ? true : world.k(i0 + 1, i1 + 1, i2, 5)))))))))));", "new_methods": [], "old_code": " return i3 != 0 && world.k(i0, i1 - 1, i2, 0) ? true : (i3 != 1\n && world.k(i0, i1 + 1, i2, 1) ? true : (i3 != 2\n && world.k(i0, i1, i2 - 1, 2) ? true : (i3 != 3\n && world.k(i0, i1, i2 + 1, 3) ? true : (i3 != 5\n && world.k(i0 + 1, i1, i2, 5) ? true : (i3 != 4\n && world.k(i0 - 1, i1, i2, 4) ? true\n : (world.k(i0, i1, i2, 0) ? true\n : (world.k(i0, i1 + 2, i2, 1) ? true : (world.k(i0,\n i1 + 1, i2 - 1, 2) ? true : (world.k(i0,\n i1 + 1, i2 + 1, 3) ? true : (world.k(i0 - 1,\n i1 + 1, i2, 4) ? true : world.k(i0 + 1, i1 + 1,\n i2, 5)))))))))));", "old_methods": [], "patch": "@@ -87,18 +87,8 @@ private void k(World world, int i0, int i1, int i2) {\n }\n \n private boolean d(World world, int i0, int i1, int i2, int i3) {\n- return i3 != 0 && world.k(i0, i1 - 1, i2, 0) ? true : (i3 != 1\n- && world.k(i0, i1 + 1, i2, 1) ? true : (i3 != 2\n- && world.k(i0, i1, i2 - 1, 2) ? true : (i3 != 3\n- && world.k(i0, i1, i2 + 1, 3) ? true : (i3 != 5\n- && world.k(i0 + 1, i1, i2, 5) ? true : (i3 != 4\n- && world.k(i0 - 1, i1, i2, 4) ? true\n- : (world.k(i0, i1, i2, 0) ? true\n- : (world.k(i0, i1 + 2, i2, 1) ? true : (world.k(i0,\n- i1 + 1, i2 - 1, 2) ? true : (world.k(i0,\n- i1 + 1, i2 + 1, 3) ? true : (world.k(i0 - 1,\n- i1 + 1, i2, 4) ? true : world.k(i0 + 1, i1 + 1,\n- i2, 5)))))))))));\n+ return i3 != 0 && world.k(i0, i1 - 1, i2, 0) ? true : (i3 != 1 && world.k(i0, i1 + 1, i2, 1) ? true : (i3 != 2 && world.k(i0, i1, i2 - 1, 2) ? true : (i3 != 3 && world.k(i0, i1, i2 + 1, 3) ? true : (i3 != 5 && world.k(i0 + 1, i1, i2, 5) ? true : (i3 != 4 && world.k(i0 - 1, i1, i2, 4) ? true : (world.k(i0, i1, i2, 0) ? true : (world.k(i0, i1 + 2, i2,\n+ 1) ? true : (world.k(i0, i1 + 1, i2 - 1, 2) ? true : (world.k(i0, i1 + 1, i2 + 1, 3) ? true : (world.k(i0 - 1, i1 + 1, i2, 4) ? true : world.k(i0 + 1, i1 + 1, i2, 5)))))))))));\n }\n \n public boolean b(World world, int i0, int i1, int i2, int i3, int i4) {", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FBlockPistonBase.java", "sha": "121e2fec9a9f21b1c274eb80e2c6aeee8e6fcedd", "status": "modified" }, { "additions": 2, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FBlockPortal.java", "changes": 4, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FBlockPortal.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 2, "filename": "src/main/java/net/minecraft/server/BlockPortal.java", "new_code": " entity.ao = entity.ab();\n entity.aa();", "new_methods": [], "old_code": " entity.ao = entity.aa();\n entity.Z();", "old_methods": [], "patch": "@@ -24,7 +24,7 @@ public void a(World world, int i0, int i1, int i2, Random random) {\n Entity entity = ItemMonsterPlacer.a(world, 57, (double) i0 + 0.5D, (double) i3 + 1.1D, (double) i2 + 0.5D);\n \n if (entity != null) {\n- entity.ao = entity.aa();\n+ entity.ao = entity.ab();\n }\n }\n }\n@@ -167,7 +167,7 @@ public int a(Random random) {\n \n public void a(World world, int i0, int i1, int i2, Entity entity) {\n if (entity.o == null && entity.n == null) {\n- entity.Z();\n+ entity.aa();\n }\n }\n }", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FBlockPortal.java", "sha": "82f2ea0f912a91db791ded28df23ce51ed9e7518", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FBlockRedstoneTorch.java", "changes": 7, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FBlockRedstoneTorch.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 6, "filename": "src/main/java/net/minecraft/server/BlockRedstoneTorch.java", "new_code": " world.a((double) ((float) i0 + 0.5F), (double) ((float) i1 + 0.5F), (double) ((float) i2 + 0.5F), \"random.fizz\", 0.5F, 2.6F + (world.s.nextFloat() - world.s.nextFloat()) * 0.8F);", "new_methods": [], "old_code": " world.a((double) ((float) i0 + 0.5F),\n (double) ((float) i1 + 0.5F),\n (double) ((float) i2 + 0.5F),\n \"random.fizz\",\n 0.5F,\n 2.6F + (world.s.nextFloat() - world.s.nextFloat()) * 0.8F);", "old_methods": [], "patch": "@@ -122,12 +122,7 @@ public void a(World world, int i0, int i1, int i2, Random random) {\n //\n world.f(i0, i1, i2, Block.aU.cF, world.h(i0, i1, i2), 3);\n if (this.a(world, i0, i1, i2, true)) {\n- world.a((double) ((float) i0 + 0.5F),\n- (double) ((float) i1 + 0.5F),\n- (double) ((float) i2 + 0.5F),\n- \"random.fizz\",\n- 0.5F,\n- 2.6F + (world.s.nextFloat() - world.s.nextFloat()) * 0.8F);\n+ world.a((double) ((float) i0 + 0.5F), (double) ((float) i1 + 0.5F), (double) ((float) i2 + 0.5F), \"random.fizz\", 0.5F, 2.6F + (world.s.nextFloat() - world.s.nextFloat()) * 0.8F);\n \n for (int i3 = 0; i3 < 5; ++i3) {\n double d0 = (double) i0 + random.nextDouble() * 0.6D + 0.2D;", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FBlockRedstoneTorch.java", "sha": "3011fa0bff599685656a910e830e411df42a1b8c", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FBlockStairs.java", "changes": 4, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FBlockStairs.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 3, "filename": "src/main/java/net/minecraft/server/BlockStairs.java", "new_code": " private static final int[][] a = new int[][]{ { 2, 6 }, { 3, 7 }, { 2, 3 }, { 6, 7 }, { 0, 4 }, { 1, 5 }, { 0, 1 }, { 4, 5 } };", "new_methods": [], "old_code": "\n\n private static final int[][] a = new int[][] { { 2, 6}, { 3, 7}, { 2, 3}, { 6, 7}, { 0, 4}, { 1, 5}, { 0, 1}, { 4, 5}};", "old_methods": [], "patch": "@@ -1,13 +1,11 @@\n package net.minecraft.server;\n \n-\n import java.util.List;\n import java.util.Random;\n \n-\n public class BlockStairs extends Block {\n \n- private static final int[][] a = new int[][] { { 2, 6}, { 3, 7}, { 2, 3}, { 6, 7}, { 0, 4}, { 1, 5}, { 0, 1}, { 4, 5}};\n+ private static final int[][] a = new int[][]{ { 2, 6 }, { 3, 7 }, { 2, 3 }, { 6, 7 }, { 0, 4 }, { 1, 5 }, { 0, 1 }, { 4, 5 } };\n private final Block b;\n private final int c;\n private boolean d;", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FBlockStairs.java", "sha": "88fcaf1eb81f769f4a40d2964a8a625ce715b142", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FBlockTrapDoor.java", "changes": 2, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FBlockTrapDoor.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 1, "filename": "src/main/java/net/minecraft/server/BlockTrapDoor.java", "new_code": " this.a((IBlockAccess) world, i0, i1, i2); // CanaryMod Cast to IBlockAccess", "new_methods": [], "old_code": " this.a((IBlockAccess)world, i0, i1, i2); //CanaryMod Cast to IBlockAccess", "old_methods": [], "patch": "@@ -28,7 +28,7 @@ public int d() {\n }\n \n public AxisAlignedBB b(World world, int i0, int i1, int i2) {\n- this.a((IBlockAccess)world, i0, i1, i2); //CanaryMod Cast to IBlockAccess\n+ this.a((IBlockAccess) world, i0, i1, i2); // CanaryMod Cast to IBlockAccess\n return super.b(world, i0, i1, i2);\n }\n ", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FBlockTrapDoor.java", "sha": "ae0023eccc9a2ca834b3d009b4d99a224e5c37d2", "status": "modified" }, { "additions": 2, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FBlockWall.java", "changes": 4, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FBlockWall.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 2, "filename": "src/main/java/net/minecraft/server/BlockWall.java", "new_code": " public static final String[] a = new String[]{ \"normal\", \"mossy\" };\n this.a((IBlockAccess) world, i0, i1, i2); // CanaryMod Cast to IBlockAccess", "new_methods": [], "old_code": " public static final String[] a = new String[] { \"normal\", \"mossy\"};\n this.a((IBlockAccess) world, i0, i1, i2); //CanaryMod Cast to IBlockAccess", "old_methods": [], "patch": "@@ -2,7 +2,7 @@\n \n public class BlockWall extends Block {\n \n- public static final String[] a = new String[] { \"normal\", \"mossy\"};\n+ public static final String[] a = new String[]{ \"normal\", \"mossy\" };\n \n public BlockWall(int i0, Block block) {\n super(i0, block.cU);\n@@ -69,7 +69,7 @@ public void a(IBlockAccess iblockaccess, int i0, int i1, int i2) {\n }\n \n public AxisAlignedBB b(World world, int i0, int i1, int i2) {\n- this.a((IBlockAccess) world, i0, i1, i2); //CanaryMod Cast to IBlockAccess\n+ this.a((IBlockAccess) world, i0, i1, i2); // CanaryMod Cast to IBlockAccess\n this.cQ = 1.5D;\n return super.b(world, i0, i1, i2);\n }", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FBlockWall.java", "sha": "1095fdd7b4fecdbe0e9f72f862eb53dba68bf9fb", "status": "modified" }, { "additions": 9, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FCallableSuspiciousClasses.java", "changes": 29, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FCallableSuspiciousClasses.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 20, "filename": "src/main/java/net/minecraft/server/CallableSuspiciousClasses.java", "new_code": " public String a() throws SecurityException, NoSuchFieldException, IllegalAccessException, IllegalArgumentException {\n if (s1 != null && !s1.startsWith(\"org.lwjgl.\") && !s1.startsWith(\"paulscode.\") && !s1.startsWith(\"org.bouncycastle.\") && !s1.startsWith(\"argo.\") && !s1.startsWith(\"com.jcraft.\") && !s1.startsWith(\"com.fasterxml.\") && !s1.startsWith(\"com.google.\") && !s1.startsWith(\"joptsimple.\") && !s1.startsWith(\"org.apache.\") && !s1.equals(\"util.GLX\")) {\n if (s1.length() <= 3 || s1.equals(\"net.minecraft.client.main.Main\") || s1.equals(\"net.minecraft.client.Minecraft\") || s1.equals(\"net.minecraft.client.ClientBrandRetriever\") || s1.equals(\"net.minecraft.server.MinecraftServer\")) {\n public Object call() {\n try {\n return this.a();\n } catch (Exception ex) {\n return null;\n }", "new_methods": [ { "arguments": [], "filename": "src/main/java/net/minecraft/server/CallableSuspiciousClasses.java", "implementation": "try {\n return this.a();", "signature": "Object call()" } ], "old_code": "\n\n public String a() throws SecurityException, NoSuchFieldException, IllegalArgumentException, IllegalAccessException { // CanaryMod: Throws Added\n if (s1 != null && !s1.startsWith(\"org.lwjgl.\")\n && !s1.startsWith(\"paulscode.\")\n && !s1.startsWith(\"org.bouncycastle.\")\n && !s1.startsWith(\"argo.\")\n && !s1.startsWith(\"com.jcraft.\")\n && !s1.startsWith(\"com.fasterxml.\")\n && !s1.startsWith(\"com.google.\")\n && !s1.startsWith(\"joptsimple.\")\n && !s1.startsWith(\"org.apache.\")\n && !s1.equals(\"util.GLX\")) {\n if (s1.length() <= 3\n || s1.equals(\"net.minecraft.client.main.Main\")\n || s1.equals(\"net.minecraft.client.Minecraft\")\n || s1.equals(\"net.minecraft.client.ClientBrandRetriever\")\n || s1.equals(\"net.minecraft.server.MinecraftServer\")) {\n public Object call() throws SecurityException, IllegalArgumentException, NoSuchFieldException, IllegalAccessException { // CanaryMod: Throws added\n return this.a();", "old_methods": [], "patch": "@@ -1,6 +1,5 @@\n package net.minecraft.server;\n \n-\n import java.lang.reflect.Field;\n import java.util.ArrayList;\n import java.util.Collections;\n@@ -9,7 +8,6 @@\n import java.util.Vector;\n import java.util.concurrent.Callable;\n \n-\n class CallableSuspiciousClasses implements Callable {\n \n final CrashReport a;\n@@ -18,7 +16,7 @@ class CallableSuspiciousClasses implements Callable {\n this.a = crashreport;\n }\n \n- public String a() throws SecurityException, NoSuchFieldException, IllegalArgumentException, IllegalAccessException { // CanaryMod: Throws Added\n+ public String a() throws SecurityException, NoSuchFieldException, IllegalAccessException, IllegalArgumentException {\n StringBuilder stringbuilder = new StringBuilder();\n Field field = ClassLoader.class.getDeclaredField(\"classes\");\n \n@@ -38,22 +36,9 @@ public String a() throws SecurityException, NoSuchFieldException, IllegalArgumen\n if (oclass0 != null) {\n String s1 = oclass0.getCanonicalName();\n \n- if (s1 != null && !s1.startsWith(\"org.lwjgl.\")\n- && !s1.startsWith(\"paulscode.\")\n- && !s1.startsWith(\"org.bouncycastle.\")\n- && !s1.startsWith(\"argo.\")\n- && !s1.startsWith(\"com.jcraft.\")\n- && !s1.startsWith(\"com.fasterxml.\")\n- && !s1.startsWith(\"com.google.\")\n- && !s1.startsWith(\"joptsimple.\")\n- && !s1.startsWith(\"org.apache.\")\n- && !s1.equals(\"util.GLX\")) {\n+ if (s1 != null && !s1.startsWith(\"org.lwjgl.\") && !s1.startsWith(\"paulscode.\") && !s1.startsWith(\"org.bouncycastle.\") && !s1.startsWith(\"argo.\") && !s1.startsWith(\"com.jcraft.\") && !s1.startsWith(\"com.fasterxml.\") && !s1.startsWith(\"com.google.\") && !s1.startsWith(\"joptsimple.\") && !s1.startsWith(\"org.apache.\") && !s1.equals(\"util.GLX\")) {\n if (flag1) {\n- if (s1.length() <= 3\n- || s1.equals(\"net.minecraft.client.main.Main\")\n- || s1.equals(\"net.minecraft.client.Minecraft\")\n- || s1.equals(\"net.minecraft.client.ClientBrandRetriever\")\n- || s1.equals(\"net.minecraft.server.MinecraftServer\")) {\n+ if (s1.length() <= 3 || s1.equals(\"net.minecraft.client.main.Main\") || s1.equals(\"net.minecraft.client.Minecraft\") || s1.equals(\"net.minecraft.client.ClientBrandRetriever\") || s1.equals(\"net.minecraft.server.MinecraftServer\")) {\n continue;\n }\n } else if (s1.startsWith(\"net.minecraft\")) {\n@@ -117,7 +102,11 @@ public String a() throws SecurityException, NoSuchFieldException, IllegalArgumen\n return stringbuilder.toString();\n }\n \n- public Object call() throws SecurityException, IllegalArgumentException, NoSuchFieldException, IllegalAccessException { // CanaryMod: Throws added\n- return this.a();\n+ public Object call() {\n+ try {\n+ return this.a();\n+ } catch (Exception ex) {\n+ return null;\n+ }\n }\n }", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FCallableSuspiciousClasses.java", "sha": "4a6297a1955fb2eee3260fdd81e09a1ee0bd7b8e", "status": "modified" }, { "additions": 10, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FChunk.java", "changes": 40, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FChunk.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 30, "filename": "src/main/java/net/minecraft/server/Chunk.java", "new_code": " entity.Q();\n if (entity1 != entity && entity1.E.b(axisalignedbb) && (ientityselector == null || ientityselector.a(entity1))) {\n Entity[] aentity = entity1.an();\n if (entity1 != entity && entity1.E.b(axisalignedbb) && (ientityselector == null || ientityselector.a(entity1))) {\n if (oclass0.isAssignableFrom(entity.getClass()) && entity.E.b(axisalignedbb) && (ientityselector == null || ientityselector.a(entity))) {\n return new Random(this.e.H() + (long) (this.g * this.g * 4987142) + (long) (this.g * 5947611) + (long) (this.h * this.h) * 4392871L + (long) (this.h * 389711) ^ i0);\n if (ichunkprovider.a(i0 - 1, i1) && !ichunkprovider.d(i0 - 1, i1).k && ichunkprovider.a(i0 - 1, i1 + 1) && ichunkprovider.a(i0, i1 + 1) && ichunkprovider.a(i0 - 1, i1 + 1)) {\n if (ichunkprovider.a(i0, i1 - 1) && !ichunkprovider.d(i0, i1 - 1).k && ichunkprovider.a(i0 + 1, i1 - 1) && ichunkprovider.a(i0 + 1, i1 - 1) && ichunkprovider.a(i0 + 1, i1)) {\n if (ichunkprovider.a(i0 - 1, i1 - 1) && !ichunkprovider.d(i0 - 1, i1 - 1).k && ichunkprovider.a(i0, i1 - 1) && ichunkprovider.a(i0 - 1, i1)) {\n if (this.r[i1] == null && (i6 == 0 || i6 == 15 || i2 == 0 || i2 == 15 || i3 == 0 || i3 == 15) || this.r[i1] != null && this.r[i1].a(i2, i6, i3) == 0) {", "new_methods": [], "old_code": " // MERGE: entity.w() is probably not kill() anymore! - Chris\n entity.P();\n if (entity1 != entity\n && entity1.E.b(axisalignedbb)\n && (ientityselector == null || ientityselector\n .a(entity1))) {\n Entity[] aentity = entity1.am();\n if (entity1 != entity\n && entity1.E.b(axisalignedbb)\n && (ientityselector == null || ientityselector.a(entity1))) {\n if (oclass0.isAssignableFrom(entity.getClass())\n && entity.E.b(axisalignedbb)\n && (ientityselector == null || ientityselector.a(entity))) {\n return new Random(this.e.H() + (long) (this.g * this.g * 4987142)\n + (long) (this.g * 5947611) + (long) (this.h * this.h)\n * 4392871L + (long) (this.h * 389711) ^ i0);\n if (ichunkprovider.a(i0 - 1, i1) && !ichunkprovider.d(i0 - 1, i1).k\n && ichunkprovider.a(i0 - 1, i1 + 1)\n && ichunkprovider.a(i0, i1 + 1)\n && ichunkprovider.a(i0 - 1, i1 + 1)) {\n if (ichunkprovider.a(i0, i1 - 1) && !ichunkprovider.d(i0, i1 - 1).k\n && ichunkprovider.a(i0 + 1, i1 - 1)\n && ichunkprovider.a(i0 + 1, i1 - 1)\n && ichunkprovider.a(i0 + 1, i1)) {\n if (ichunkprovider.a(i0 - 1, i1 - 1)\n && !ichunkprovider.d(i0 - 1, i1 - 1).k\n && ichunkprovider.a(i0, i1 - 1) && ichunkprovider.a(i0 - 1, i1)) {\n if (this.r[i1] == null\n && (i6 == 0 || i6 == 15 || i2 == 0 || i2 == 15 || i3 == 0 || i3 == 15) || this.r[i1] != null\n && this.r[i1].a(i2, i6, i3) == 0) {", "old_methods": [], "patch": "@@ -595,7 +595,6 @@ public void a(Entity entity) {\n if (i0 != this.g || i1 != this.h) {\n this.e.Y().c(\"Wrong location! \" + entity);\n // Thread.dumpStack();\n- // MERGE: entity.w() is probably not kill() anymore! - Chris\n entity.w();\n return;\n }\n@@ -714,7 +713,7 @@ public void c() {\n while (iterator.hasNext()) {\n Entity entity = (Entity) iterator.next();\n \n- entity.P();\n+ entity.Q();\n }\n \n this.e.a(this.j[i0]);\n@@ -760,19 +759,14 @@ public void a(Entity entity, AxisAlignedBB axisalignedbb, List list, IEntitySele\n for (int i3 = 0; i3 < list1.size(); ++i3) {\n Entity entity1 = (Entity) list1.get(i3);\n \n- if (entity1 != entity\n- && entity1.E.b(axisalignedbb)\n- && (ientityselector == null || ientityselector\n- .a(entity1))) {\n+ if (entity1 != entity && entity1.E.b(axisalignedbb) && (ientityselector == null || ientityselector.a(entity1))) {\n list.add(entity1);\n- Entity[] aentity = entity1.am();\n+ Entity[] aentity = entity1.an();\n \n if (aentity != null) {\n for (int i4 = 0; i4 < aentity.length; ++i4) {\n entity1 = aentity[i4];\n- if (entity1 != entity\n- && entity1.E.b(axisalignedbb)\n- && (ientityselector == null || ientityselector.a(entity1))) {\n+ if (entity1 != entity && entity1.E.b(axisalignedbb) && (ientityselector == null || ientityselector.a(entity1))) {\n list.add(entity1);\n }\n }\n@@ -804,9 +798,7 @@ public void a(Class oclass0, AxisAlignedBB axisalignedbb, List list, IEntitySele\n for (int i3 = 0; i3 < list1.size(); ++i3) {\n Entity entity = (Entity) list1.get(i3);\n \n- if (oclass0.isAssignableFrom(entity.getClass())\n- && entity.E.b(axisalignedbb)\n- && (ientityselector == null || ientityselector.a(entity))) {\n+ if (oclass0.isAssignableFrom(entity.getClass()) && entity.E.b(axisalignedbb) && (ientityselector == null || ientityselector.a(entity))) {\n list.add(entity);\n }\n }\n@@ -826,9 +818,7 @@ public boolean a(boolean flag0) {\n }\n \n public Random a(long i0) {\n- return new Random(this.e.H() + (long) (this.g * this.g * 4987142)\n- + (long) (this.g * 5947611) + (long) (this.h * this.h)\n- * 4392871L + (long) (this.h * 389711) ^ i0);\n+ return new Random(this.e.H() + (long) (this.g * this.g * 4987142) + (long) (this.g * 5947611) + (long) (this.h * this.h) * 4392871L + (long) (this.h * 389711) ^ i0);\n }\n \n public boolean g() {\n@@ -840,23 +830,15 @@ public void a(IChunkProvider ichunkprovider, IChunkProvider ichunkprovider1, int\n ichunkprovider.a(ichunkprovider1, i0, i1);\n }\n \n- if (ichunkprovider.a(i0 - 1, i1) && !ichunkprovider.d(i0 - 1, i1).k\n- && ichunkprovider.a(i0 - 1, i1 + 1)\n- && ichunkprovider.a(i0, i1 + 1)\n- && ichunkprovider.a(i0 - 1, i1 + 1)) {\n+ if (ichunkprovider.a(i0 - 1, i1) && !ichunkprovider.d(i0 - 1, i1).k && ichunkprovider.a(i0 - 1, i1 + 1) && ichunkprovider.a(i0, i1 + 1) && ichunkprovider.a(i0 - 1, i1 + 1)) {\n ichunkprovider.a(ichunkprovider1, i0 - 1, i1);\n }\n \n- if (ichunkprovider.a(i0, i1 - 1) && !ichunkprovider.d(i0, i1 - 1).k\n- && ichunkprovider.a(i0 + 1, i1 - 1)\n- && ichunkprovider.a(i0 + 1, i1 - 1)\n- && ichunkprovider.a(i0 + 1, i1)) {\n+ if (ichunkprovider.a(i0, i1 - 1) && !ichunkprovider.d(i0, i1 - 1).k && ichunkprovider.a(i0 + 1, i1 - 1) && ichunkprovider.a(i0 + 1, i1 - 1) && ichunkprovider.a(i0 + 1, i1)) {\n ichunkprovider.a(ichunkprovider1, i0, i1 - 1);\n }\n \n- if (ichunkprovider.a(i0 - 1, i1 - 1)\n- && !ichunkprovider.d(i0 - 1, i1 - 1).k\n- && ichunkprovider.a(i0, i1 - 1) && ichunkprovider.a(i0 - 1, i1)) {\n+ if (ichunkprovider.a(i0 - 1, i1 - 1) && !ichunkprovider.d(i0 - 1, i1 - 1).k && ichunkprovider.a(i0, i1 - 1) && ichunkprovider.a(i0 - 1, i1)) {\n ichunkprovider.a(ichunkprovider1, i0 - 1, i1 - 1);\n }\n }\n@@ -963,9 +945,7 @@ public void o() {\n for (int i6 = 0; i6 < 16; ++i6) {\n int i7 = (i1 << 4) + i6;\n \n- if (this.r[i1] == null\n- && (i6 == 0 || i6 == 15 || i2 == 0 || i2 == 15 || i3 == 0 || i3 == 15) || this.r[i1] != null\n- && this.r[i1].a(i2, i6, i3) == 0) {\n+ if (this.r[i1] == null && (i6 == 0 || i6 == 15 || i2 == 0 || i2 == 15 || i3 == 0 || i3 == 15) || this.r[i1] != null && this.r[i1].a(i2, i6, i3) == 0) {\n if (Block.w[this.e.a(i4, i7 - 1, i5)] > 0) {\n this.e.A(i4, i7 - 1, i5);\n }", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FChunk.java", "sha": "774c136c03b9e65c9054e0ee83f0d49800dacdf4", "status": "modified" }, { "additions": 11, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FCommandBase.java", "changes": 40, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FCommandBase.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 29, "filename": "src/main/java/net/minecraft/server/CommandBase.java", "new_code": " throw new NumberInvalidException(\"commands.generic.double.invalid\", new Object[]{ s0 });\n public static double a(ICommandSender icommandsender, String s0, double d0, double d1) {\n throw new NumberInvalidException(\"commands.generic.double.tooSmall\", new Object[]{ Double.valueOf(d2), Double.valueOf(d0) });\n throw new NumberInvalidException(\"commands.generic.double.tooBig\", new Object[]{ Double.valueOf(d2), Double.valueOf(d1) });\n throw new CommandException(\"commands.generic.boolean.invalid\", new Object[]{ s0 });\n return entityplayermp.am();\n public static double a(ICommandSender icommandsender, double d0, String s0, int i0, int i1) {\n throw new NumberInvalidException(\"commands.generic.num.invalid\", new Object[]{ Double.valueOf(d0) });\n throw new NumberInvalidException(\"commands.generic.double.tooSmall\", new Object[]{ Double.valueOf(d1), Integer.valueOf(i0) });\n throw new NumberInvalidException(\"commands.generic.double.tooBig\", new Object[]{ Double.valueOf(d1), Integer.valueOf(i1) });\n for (Iterator iterator = collection.iterator(); iterator.hasNext(); astring[i0++] = entitylivingbase.ax()) {", "new_methods": [ { "arguments": [ "ICommandSender icommandsender", " String s0", " double d0", " double d1" ], "filename": "src/main/java/net/minecraft/server/CommandBase.java", "implementation": "throw new NumberInvalidException(\"commands.generic.double.tooSmall\", new Object[]{ Double.valueOf(d2), Double.valueOf(d0)", "signature": "double a(ICommandSender icommandsender, String s0, double d0, double d1)" }, { "arguments": [ "ICommandSender icommandsender", " double d0", " String s0", " int i0", " int i1" ], "filename": "src/main/java/net/minecraft/server/CommandBase.java", "implementation": "throw new NumberInvalidException(\"commands.generic.num.invalid\", new Object[]{ Double.valueOf(d0)", "signature": "double a(ICommandSender icommandsender, double d0, String s0, int i0, int i1)" } ], "old_code": " // MERGE Is this deprecated now? - Chris\n // public String a(ICommandSender icommandsender) {\n // return \"/\" + this.c();\n // }\n\n throw new NumberInvalidException(\n \"commands.generic.double.invalid\", new Object[]{ s0 });\n public static double a(ICommandSender icommandsender, String s0, double d0,\n double d1) {\n throw new NumberInvalidException(\n \"commands.generic.double.tooSmall\", new Object[]{\n Double.valueOf(d2), Double.valueOf(d0) });\n throw new NumberInvalidException(\"commands.generic.double.tooBig\",\n new Object[]{ Double.valueOf(d2), Double.valueOf(d1) });\n throw new CommandException(\"commands.generic.boolean.invalid\",\n new Object[]{ s0 });\n return entityplayermp.al();\n public static double a(ICommandSender icommandsender, double d0, String s0,\n int i0, int i1) {\n throw new NumberInvalidException(\"commands.generic.num.invalid\",\n new Object[]{ Double.valueOf(d0) });\n throw new NumberInvalidException(\n \"commands.generic.double.tooSmall\", new Object[]{\n Double.valueOf(d1), Integer.valueOf(i0) });\n throw new NumberInvalidException(\n \"commands.generic.double.tooBig\", new Object[]{\n Double.valueOf(d1), Integer.valueOf(i1) });\n for (Iterator iterator = collection.iterator(); iterator.hasNext(); astring[i0++] = entitylivingbase\n .aw()) {", "old_methods": [ { "arguments": [ "ICommandSender icommandsender" ], "filename": "src/main/java/net/minecraft/server/CommandBase.java", "implementation": "// return \"/\" + this.c();\n //", "signature": "String a(ICommandSender icommandsender)" }, { "arguments": [ "ICommandSender icommandsender", " String s0", " double d0", "\n double d1" ], "filename": "src/main/java/net/minecraft/server/CommandBase.java", "implementation": "throw new NumberInvalidException(\n \"commands.generic.double.tooSmall\", new Object[]{\n Double.valueOf(d2), Double.valueOf(d0)", "signature": "double a(ICommandSender icommandsender, String s0, double d0,\n double d1)" }, { "arguments": [ "ICommandSender icommandsender", " double d0", " String s0", "\n int i0", " int i1" ], "filename": "src/main/java/net/minecraft/server/CommandBase.java", "implementation": "throw new NumberInvalidException(\"commands.generic.num.invalid\",\n new Object[]{ Double.valueOf(d0)", "signature": "double a(ICommandSender icommandsender, double d0, String s0,\n int i0, int i1)" } ], "patch": "@@ -16,11 +16,6 @@ public int a() {\n return 4;\n }\n \n- // MERGE Is this deprecated now? - Chris\n- // public String a(ICommandSender icommandsender) {\n- // return \"/\" + this.c();\n- // }\n-\n public List b() {\n return null;\n }\n@@ -62,8 +57,7 @@ public static double b(ICommandSender icommandsender, String s0) {\n double d0 = Double.parseDouble(s0);\n \n if (!Doubles.isFinite(d0)) {\n- throw new NumberInvalidException(\n- \"commands.generic.double.invalid\", new Object[]{ s0 });\n+ throw new NumberInvalidException(\"commands.generic.double.invalid\", new Object[]{ s0 });\n } else {\n return d0;\n }\n@@ -76,17 +70,13 @@ public static double a(ICommandSender icommandsender, String s0, double d0) {\n return a(icommandsender, s0, d0, Double.MAX_VALUE);\n }\n \n- public static double a(ICommandSender icommandsender, String s0, double d0,\n- double d1) {\n+ public static double a(ICommandSender icommandsender, String s0, double d0, double d1) {\n double d2 = b(icommandsender, s0);\n \n if (d2 < d0) {\n- throw new NumberInvalidException(\n- \"commands.generic.double.tooSmall\", new Object[]{\n- Double.valueOf(d2), Double.valueOf(d0) });\n+ throw new NumberInvalidException(\"commands.generic.double.tooSmall\", new Object[]{ Double.valueOf(d2), Double.valueOf(d0) });\n } else if (d2 > d1) {\n- throw new NumberInvalidException(\"commands.generic.double.tooBig\",\n- new Object[]{ Double.valueOf(d2), Double.valueOf(d1) });\n+ throw new NumberInvalidException(\"commands.generic.double.tooBig\", new Object[]{ Double.valueOf(d2), Double.valueOf(d1) });\n } else {\n return d2;\n }\n@@ -95,8 +85,7 @@ public static double a(ICommandSender icommandsender, String s0, double d0,\n public static boolean c(ICommandSender icommandsender, String s0) {\n if (!s0.equals(\"true\") && !s0.equals(\"1\")) {\n if (!s0.equals(\"false\") && !s0.equals(\"0\")) {\n- throw new CommandException(\"commands.generic.boolean.invalid\",\n- new Object[]{ s0 });\n+ throw new CommandException(\"commands.generic.boolean.invalid\", new Object[]{ s0 });\n } else {\n return false;\n }\n@@ -132,7 +121,7 @@ public static String e(ICommandSender icommandsender, String s0) {\n EntityPlayerMP entityplayermp = PlayerSelector.a(icommandsender, s0);\n \n if (entityplayermp != null) {\n- return entityplayermp.al();\n+ return entityplayermp.am();\n } else if (PlayerSelector.b(s0)) {\n throw new PlayerNotFoundException();\n } else {\n@@ -174,13 +163,11 @@ public static double a(ICommandSender icommandsender, double d0, String s0) {\n return a(icommandsender, d0, s0, -30000000, 30000000);\n }\n \n- public static double a(ICommandSender icommandsender, double d0, String s0,\n- int i0, int i1) {\n+ public static double a(ICommandSender icommandsender, double d0, String s0, int i0, int i1) {\n boolean flag0 = s0.startsWith(\"~\");\n \n if (flag0 && Double.isNaN(d0)) {\n- throw new NumberInvalidException(\"commands.generic.num.invalid\",\n- new Object[]{ Double.valueOf(d0) });\n+ throw new NumberInvalidException(\"commands.generic.num.invalid\", new Object[]{ Double.valueOf(d0) });\n } else {\n double d1 = flag0 ? d0 : 0.0D;\n \n@@ -199,15 +186,11 @@ public static double a(ICommandSender icommandsender, double d0, String s0,\n \n if (i0 != 0 || i1 != 0) {\n if (d1 < (double) i0) {\n- throw new NumberInvalidException(\n- \"commands.generic.double.tooSmall\", new Object[]{\n- Double.valueOf(d1), Integer.valueOf(i0) });\n+ throw new NumberInvalidException(\"commands.generic.double.tooSmall\", new Object[]{ Double.valueOf(d1), Integer.valueOf(i0) });\n }\n \n if (d1 > (double) i1) {\n- throw new NumberInvalidException(\n- \"commands.generic.double.tooBig\", new Object[]{\n- Double.valueOf(d1), Integer.valueOf(i1) });\n+ throw new NumberInvalidException(\"commands.generic.double.tooBig\", new Object[]{ Double.valueOf(d1), Integer.valueOf(i1) });\n }\n }\n \n@@ -245,8 +228,7 @@ public static String b(Collection collection) {\n \n EntityLivingBase entitylivingbase;\n \n- for (Iterator iterator = collection.iterator(); iterator.hasNext(); astring[i0++] = entitylivingbase\n- .aw()) {\n+ for (Iterator iterator = collection.iterator(); iterator.hasNext(); astring[i0++] = entitylivingbase.ax()) {\n entitylivingbase = (EntityLivingBase) iterator.next();\n }\n ", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FCommandBase.java", "sha": "9f9936d97627194a0408b1409aa337f8a5d28e10", "status": "modified" }, { "additions": 0, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FCommandServerSaveAll.java", "changes": 2, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FCommandServerSaveAll.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 2, "filename": "src/main/java/net/minecraft/server/CommandServerSaveAll.java", "new_code": "", "new_methods": [], "old_code": "\n", "old_methods": [], "patch": "@@ -1,9 +1,7 @@\n package net.minecraft.server;\n \n-\n import net.canarymod.api.world.CanaryWorld;\n \n-\n public class CommandServerSaveAll extends CommandBase {\n \n public CommandServerSaveAll() {}", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FCommandServerSaveAll.java", "sha": "8e96a26759fe068ce5acefbefa6dc9e3539c148c", "status": "modified" }, { "additions": 0, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FCommandServerSaveOff.java", "changes": 2, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FCommandServerSaveOff.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 2, "filename": "src/main/java/net/minecraft/server/CommandServerSaveOff.java", "new_code": "", "new_methods": [], "old_code": "\n", "old_methods": [], "patch": "@@ -1,9 +1,7 @@\n package net.minecraft.server;\n \n-\n import net.canarymod.api.world.CanaryWorld;\n \n-\n public class CommandServerSaveOff extends CommandBase {\n \n public CommandServerSaveOff() {}", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FCommandServerSaveOff.java", "sha": "e57fef4f657e36a3ea4c93acb7237ba828e4fa36", "status": "modified" }, { "additions": 0, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FCommandServerSaveOn.java", "changes": 2, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FCommandServerSaveOn.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 2, "filename": "src/main/java/net/minecraft/server/CommandServerSaveOn.java", "new_code": "", "new_methods": [], "old_code": "\n", "old_methods": [], "patch": "@@ -1,9 +1,7 @@\n package net.minecraft.server;\n \n-\n import net.canarymod.api.world.CanaryWorld;\n \n-\n public class CommandServerSaveOn extends CommandBase {\n \n public CommandServerSaveOn() {}", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FCommandServerSaveOn.java", "sha": "9ffc776da59b74e84ad5607d3c2647c32661f239", "status": "modified" }, { "additions": 2, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FCommandServerTp.java", "changes": 4, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FCommandServerTp.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 2, "filename": "src/main/java/net/minecraft/server/CommandServerTp.java", "new_code": " a(icommandsender, \"commands.tp.success\", new Object[]{ entityplayermp.am(), entityplayermp1.am() });\n a(icommandsender, \"commands.tp.success.coordinates\", new Object[]{ entityplayermp.am(), Double.valueOf(d0), Double.valueOf(d1), Double.valueOf(d2) });", "new_methods": [], "old_code": " a(icommandsender, \"commands.tp.success\", new Object[]{ entityplayermp.al(), entityplayermp1.al() });\n a(icommandsender, \"commands.tp.success.coordinates\", new Object[]{ entityplayermp.al(), Double.valueOf(d0), Double.valueOf(d1), Double.valueOf(d2) });", "old_methods": [], "patch": "@@ -50,7 +50,7 @@ public void b(ICommandSender icommandsender, String[] astring) {\n entityplayermp.a((Entity) null);\n // CanaryMod: DERP (MultiWorld fix)\n entityplayermp.a.a(entityplayermp1.u, entityplayermp1.v, entityplayermp1.w, entityplayermp1.A, entityplayermp1.B, entityplayermp1.getCanaryWorld().getType().getId(), entityplayermp1.getCanaryWorld().getName(), TeleportHook.TeleportCause.COMMAND);\n- a(icommandsender, \"commands.tp.success\", new Object[]{ entityplayermp.al(), entityplayermp1.al() });\n+ a(icommandsender, \"commands.tp.success\", new Object[]{ entityplayermp.am(), entityplayermp1.am() });\n }\n } else if (entityplayermp.q != null) {\n int i0 = astring.length - 3;\n@@ -60,7 +60,7 @@ public void b(ICommandSender icommandsender, String[] astring) {\n \n entityplayermp.a((Entity) null);\n entityplayermp.a(d0, d1, d2);\n- a(icommandsender, \"commands.tp.success.coordinates\", new Object[]{ entityplayermp.al(), Double.valueOf(d0), Double.valueOf(d1), Double.valueOf(d2) });\n+ a(icommandsender, \"commands.tp.success.coordinates\", new Object[]{ entityplayermp.am(), Double.valueOf(d0), Double.valueOf(d1), Double.valueOf(d2) });\n }\n }\n }", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FCommandServerTp.java", "sha": "0b344e36078072b60c087464c2137bad43e53607", "status": "modified" }, { "additions": 0, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FCommandToggleDownfall.java", "changes": 2, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FCommandToggleDownfall.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 2, "filename": "src/main/java/net/minecraft/server/CommandToggleDownfall.java", "new_code": "", "new_methods": [], "old_code": "\n", "old_methods": [], "patch": "@@ -1,10 +1,8 @@\n package net.minecraft.server;\n \n-\n import net.canarymod.api.world.CanaryWorld;\n import net.canarymod.api.world.DimensionType;\n \n-\n public class CommandToggleDownfall extends CommandBase {\n \n public CommandToggleDownfall() {}", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FCommandToggleDownfall.java", "sha": "a250aeb65266368410411a3285fbe502415f5744", "status": "modified" }, { "additions": 0, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FCommandWeather.java", "changes": 2, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FCommandWeather.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 2, "filename": "src/main/java/net/minecraft/server/CommandWeather.java", "new_code": "", "new_methods": [], "old_code": "\n", "old_methods": [], "patch": "@@ -1,12 +1,10 @@\n package net.minecraft.server;\n \n-\n import java.util.List;\n import java.util.Random;\n import net.canarymod.api.world.CanaryWorld;\n import net.canarymod.api.world.DimensionType;\n \n-\n public class CommandWeather extends CommandBase {\n \n public CommandWeather() {}", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FCommandWeather.java", "sha": "b4d656a8c84c1c53344837cf985094c8945b2ec3", "status": "modified" }, { "additions": 0, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FComponentStrongholdRightTurn.java", "changes": 2, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FComponentStrongholdRightTurn.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 2, "filename": "src/main/java/net/minecraft/server/ComponentStrongholdRightTurn.java", "new_code": "", "new_methods": [], "old_code": "\n", "old_methods": [], "patch": "@@ -1,10 +1,8 @@\n package net.minecraft.server;\n \n-\n import java.util.List;\n import java.util.Random;\n \n-\n public class ComponentStrongholdRightTurn extends ComponentStrongholdLeftTurn {\n \n public ComponentStrongholdRightTurn(int i0, Random random,", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FComponentStrongholdRightTurn.java", "sha": "79a045c93b327870571017d6d72e479327d9ab80", "status": "modified" }, { "additions": 0, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FContainerChest.java", "changes": 1, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FContainerChest.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 1, "filename": "src/main/java/net/minecraft/server/ContainerChest.java", "new_code": "", "new_methods": [], "old_code": "", "old_methods": [], "patch": "@@ -2,7 +2,6 @@\n \n import net.canarymod.api.inventory.Inventory;\n \n-\n public class ContainerChest extends Container {\n \n private IInventory a;", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FContainerChest.java", "sha": "92064b418ec56aba62126f7f0faa2f9cd4cb88e3", "status": "modified" }, { "additions": 0, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FContainerEnchantment.java", "changes": 2, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FContainerEnchantment.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 2, "filename": "src/main/java/net/minecraft/server/ContainerEnchantment.java", "new_code": "", "new_methods": [], "old_code": "\n", "old_methods": [], "patch": "@@ -1,6 +1,5 @@\n package net.minecraft.server;\n \n-\n import java.util.ArrayList;\n import java.util.List;\n import java.util.Random;\n@@ -9,7 +8,6 @@\n import net.canarymod.api.world.blocks.EnchantmentTable;\n import net.canarymod.hook.player.EnchantHook;\n \n-\n public class ContainerEnchantment extends Container {\n \n public IInventory a = new SlotEnchantmentTable(this, \"Enchant\", true, 1);", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FContainerEnchantment.java", "sha": "071c3e00d24930786d520416bea58178fc105527", "status": "modified" }, { "additions": 3, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FContainerHorseInventory.java", "changes": 6, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FContainerHorseInventory.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 3, "filename": "src/main/java/net/minecraft/server/ContainerHorseInventory.java", "new_code": " if (entityhorse.ce()) {\n return this.a.a(entityplayer) && this.f.S() && this.f.d((Entity) entityplayer) < 8.0F;\n } else if (this.a(1).a(itemstack1) && !this.a(1).e()) {", "new_methods": [], "old_code": " if (entityhorse.ca()) {\n return this.a.a(entityplayer) && this.f.d(entityplayer) < 8.0F;\n } else if (this.a(1).a(itemstack1)) {", "old_methods": [], "patch": "@@ -20,7 +20,7 @@ public ContainerHorseInventory(IInventory iinventory, IInventory iinventory1, En\n int i1;\n int i2;\n \n- if (entityhorse.ca()) {\n+ if (entityhorse.ce()) {\n for (i1 = 0; i1 < b0; ++i1) {\n for (i2 = 0; i2 < 5; ++i2) {\n this.a(new Slot(iinventory1, 2 + i2 + i1 * 5, 80 + i2 * 18, 18 + i1 * 18));\n@@ -40,7 +40,7 @@ public ContainerHorseInventory(IInventory iinventory, IInventory iinventory1, En\n }\n \n public boolean a(EntityPlayer entityplayer) {\n- return this.a.a(entityplayer) && this.f.d(entityplayer) < 8.0F;\n+ return this.a.a(entityplayer) && this.f.S() && this.f.d((Entity) entityplayer) < 8.0F;\n }\n \n public ItemStack b(EntityPlayer entityplayer, int i0) {\n@@ -55,7 +55,7 @@ public ItemStack b(EntityPlayer entityplayer, int i0) {\n if (!this.a(itemstack1, this.a.j_(), this.c.size(), true)) {\n return null;\n }\n- } else if (this.a(1).a(itemstack1)) {\n+ } else if (this.a(1).a(itemstack1) && !this.a(1).e()) {\n if (!this.a(itemstack1, 1, 2, false)) {\n return null;\n }", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FContainerHorseInventory.java", "sha": "e9ee4a038908ec4316ed7e906d980ca944338ee1", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FContainerHorseInventorySlotArmor.java", "changes": 2, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FContainerHorseInventorySlotArmor.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 1, "filename": "src/main/java/net/minecraft/server/ContainerHorseInventorySlotArmor.java", "new_code": " return super.a(itemstack) && this.a.cv() && EntityHorse.v(itemstack.d);", "new_methods": [], "old_code": " return super.a(itemstack) && this.a.cr() && EntityHorse.v(itemstack.d) && !this.e();", "old_methods": [], "patch": "@@ -13,6 +13,6 @@ public class ContainerHorseInventorySlotArmor extends Slot { // CanaryMod: packa\n }\n \n public boolean a(ItemStack itemstack) {\n- return super.a(itemstack) && this.a.cr() && EntityHorse.v(itemstack.d) && !this.e();\n+ return super.a(itemstack) && this.a.cv() && EntityHorse.v(itemstack.d);\n }\n }", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FContainerHorseInventorySlotArmor.java", "sha": "aa33a84977ccb68d0740b6a3d57ff07cecf90e91", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FContainerMerchant.java", "changes": 2, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FContainerMerchant.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 1, "filename": "src/main/java/net/minecraft/server/ContainerMerchant.java", "new_code": " entityplayer.b(itemstack);", "new_methods": [], "old_code": " entityplayer.c(itemstack);", "old_methods": [], "patch": "@@ -107,7 +107,7 @@ public void b(EntityPlayer entityplayer) {\n \n itemstack = this.f.a_(1);\n if (itemstack != null) {\n- entityplayer.c(itemstack);\n+ entityplayer.b(itemstack);\n }\n }\n }", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FContainerMerchant.java", "sha": "250db67406c90e89a23ade29921663944450ced5", "status": "modified" }, { "additions": 0, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FContainerPlayer.java", "changes": 1, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FContainerPlayer.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 1, "filename": "src/main/java/net/minecraft/server/ContainerPlayer.java", "new_code": "", "new_methods": [], "old_code": " // MERGE: This might contain wrong calls! - Chris", "old_methods": [], "patch": "@@ -46,7 +46,6 @@ public ContainerPlayer(InventoryPlayer inventoryplayer, boolean flag0, EntityPla\n }\n \n public void a(IInventory iinventory) {\n- // MERGE: This might contain wrong calls! - Chris\n ItemStack result = CraftingManager.a().a(this.a, this.h.q);\n \n // CanaryMod: Send custom recipe results to client", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FContainerPlayer.java", "sha": "2c66131b115532aa54f8a6356d3399d0edc07ee5", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FContainerRepairINNER2.java", "changes": 2, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FContainerRepairINNER2.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 1, "filename": "src/main/java/net/minecraft/server/ContainerRepairINNER2.java", "new_code": " if (!entityplayer.bG.d && !this.a.I && this.a.a(this.b, this.c, this.d) == Block.cm.cF && entityplayer.aC().nextFloat() < 0.12F) {", "new_methods": [], "old_code": " if (!entityplayer.bG.d && !this.a.I && this.a.a(this.b, this.c, this.d) == Block.cm.cF && entityplayer.aB().nextFloat() < 0.12F) {", "old_methods": [], "patch": "@@ -49,7 +49,7 @@ public void a(EntityPlayer entityplayer, ItemStack itemstack) {\n }\n \n this.e.a = 0;\n- if (!entityplayer.bG.d && !this.a.I && this.a.a(this.b, this.c, this.d) == Block.cm.cF && entityplayer.aB().nextFloat() < 0.12F) {\n+ if (!entityplayer.bG.d && !this.a.I && this.a.a(this.b, this.c, this.d) == Block.cm.cF && entityplayer.aC().nextFloat() < 0.12F) {\n int i0 = this.a.h(this.b, this.c, this.d);\n int i1 = i0 & 3;\n int i2 = i0 >> 2;", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FContainerRepairINNER2.java", "sha": "c05fd463053c08fe7dce86f56e2ec65dc06e0971", "status": "modified" }, { "additions": 0, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FContainerWorkbench.java", "changes": 2, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FContainerWorkbench.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 2, "filename": "src/main/java/net/minecraft/server/ContainerWorkbench.java", "new_code": "", "new_methods": [], "old_code": "\n", "old_methods": [], "patch": "@@ -1,11 +1,9 @@\n package net.minecraft.server;\n \n-\n import net.canarymod.api.inventory.CanaryItem;\n import net.canarymod.api.world.blocks.CanaryWorkbench;\n import net.canarymod.hook.player.CraftHook;\n \n-\n public class ContainerWorkbench extends Container {\n \n public InventoryCrafting a = new InventoryCrafting(this, 3, 3);", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FContainerWorkbench.java", "sha": "c537c5f988dfffb3f5f9ad5517e04ee6e00b6f30", "status": "modified" }, { "additions": 0, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FCraftingManager.java", "changes": 3, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FCraftingManager.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 3, "filename": "src/main/java/net/minecraft/server/CraftingManager.java", "new_code": "", "new_methods": [], "old_code": "\n\n this.a(new ItemStack(Block.cB, 1), new Object[]{ \"###\", \"###\", \"###\", Character.valueOf('#'), Item.V });", "old_methods": [], "patch": "@@ -1,12 +1,10 @@\n package net.minecraft.server;\n \n-\n import java.util.ArrayList;\n import java.util.Collections;\n import java.util.HashMap;\n import java.util.List;\n \n-\n public class CraftingManager {\n \n private static final CraftingManager a = new CraftingManager();\n@@ -38,7 +36,6 @@ private CraftingManager() {\n this.a(new ItemStack(Block.bA, 1), new Object[]{ \"#W#\", \"#W#\", Character.valueOf('#'), Item.F, Character.valueOf('W'), Block.C });\n this.a(new ItemStack(Block.bd, 1), new Object[]{ \"###\", \"#X#\", \"###\", Character.valueOf('#'), Block.C, Character.valueOf('X'), Item.p });\n this.a(new ItemStack(Item.ch, 2), new Object[]{ \"~~ \", \"~O \", \" ~\", Character.valueOf('~'), Item.M, Character.valueOf('O'), Item.aO });\n- this.a(new ItemStack(Block.cB, 1), new Object[]{ \"###\", \"###\", \"###\", Character.valueOf('#'), Item.V });\n this.a(new ItemStack(Block.W, 1), new Object[]{ \"###\", \"#X#\", \"###\", Character.valueOf('#'), Block.C, Character.valueOf('X'), Item.aE });\n this.a(new ItemStack(Block.as, 1), new Object[]{ \"###\", \"XXX\", \"###\", Character.valueOf('#'), Block.C, Character.valueOf('X'), Item.aN });\n this.a(new ItemStack(Block.aZ, 1), new Object[]{ \"##\", \"##\", Character.valueOf('#'), Item.aF });", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FCraftingManager.java", "sha": "6d870b89c8d00b729befca51f378f7f143a9ef8d", "status": "modified" }, { "additions": 6, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FDamageSource.java", "changes": 10, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FDamageSource.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 4, "filename": "src/main/java/net/minecraft/server/DamageSource.java", "new_code": "\n EntityLivingBase entitylivingbase1 = entitylivingbase.aR();\n return entitylivingbase1 != null && StatCollector.b(s1) ? ChatMessageComponent.b(s1, new Object[]{ entitylivingbase.ax(), entitylivingbase1.ax() }) : ChatMessageComponent.b(s0, new Object[]{ entitylivingbase.ax() });\n * \n * \n * ", "new_methods": [], "old_code": "\n\n EntityLivingBase entitylivingbase1 = entitylivingbase.aO();\n return entitylivingbase1 != null && StatCollector.b(s1) ? ChatMessageComponent.b(s1, new Object[]{ entitylivingbase.aw(), entitylivingbase1.aw() }) : ChatMessageComponent.b(s0, new Object[]{ entitylivingbase.aw() });", "old_methods": [], "patch": "@@ -1,9 +1,7 @@\n package net.minecraft.server;\n \n-\n import net.canarymod.api.CanaryDamageSource;\n \n-\n public class DamageSource {\n \n public static DamageSource a = (new DamageSource(\"inFire\")).l();\n@@ -32,6 +30,7 @@ public class DamageSource {\n \n // CanaryMod\n protected CanaryDamageSource damageSource;\n+\n public static DamageSource a(EntityLivingBase entitylivingbase) {\n return new EntityDamageSource(\"mob\", entitylivingbase);\n }\n@@ -124,11 +123,11 @@ protected DamageSource l() {\n }\n \n public ChatMessageComponent b(EntityLivingBase entitylivingbase) {\n- EntityLivingBase entitylivingbase1 = entitylivingbase.aO();\n+ EntityLivingBase entitylivingbase1 = entitylivingbase.aR();\n String s0 = \"death.attack.\" + this.o;\n String s1 = s0 + \".player\";\n \n- return entitylivingbase1 != null && StatCollector.b(s1) ? ChatMessageComponent.b(s1, new Object[]{ entitylivingbase.aw(), entitylivingbase1.aw() }) : ChatMessageComponent.b(s0, new Object[]{ entitylivingbase.aw() });\n+ return entitylivingbase1 != null && StatCollector.b(s1) ? ChatMessageComponent.b(s1, new Object[]{ entitylivingbase.ax(), entitylivingbase1.ax() }) : ChatMessageComponent.b(s0, new Object[]{ entitylivingbase.ax() });\n }\n \n public boolean m() {\n@@ -159,6 +158,7 @@ public DamageSource r() {\n \n /**\n * Gets the CanaryMod damagesource wrapper\n+ * \n * @return\n */\n public CanaryDamageSource getCanaryDamageSource() {\n@@ -167,6 +167,7 @@ public CanaryDamageSource getCanaryDamageSource() {\n \n /**\n * Set hunger damage\n+ * \n * @param f\n */\n public void setHungerDamage(float f) {\n@@ -175,6 +176,7 @@ public void setHungerDamage(float f) {\n \n /**\n * Set unblockable\n+ * \n * @param b\n */\n public void setUnblockable(boolean b) {", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FDamageSource.java", "sha": "f5895ba7f526da9b005699fd4ffa683b146b2f16", "status": "modified" }, { "additions": 31, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FDedicatedPlayerList.java", "changes": 62, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FDedicatedPlayerList.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 31, "filename": "src/main/java/net/minecraft/server/DedicatedPlayerList.java", "new_code": " // CanaryMod removed whitelist\n // CanaryMod re-route to our whitelist\n // Canary, re-route to our whitelist\n // Load whitelist\n // try {\n // this.h().clear();\n // BufferedReader bufferedreader = new BufferedReader(new FileReader(this.e));\n // String s0 = \"\";\n //\n // while ((s0 = bufferedreader.readLine()) != null) {\n // this.h().add(s0.trim().toLowerCase());\n // }\n //\n // bufferedreader.close();\n // } catch (Exception exception) {\n // this.s().an().b(\"Failed to load white-list: \" + exception);\n // }\n // try {\n // PrintWriter printwriter = new PrintWriter(new FileWriter(this.e, false));\n // Iterator iterator = this.h().iterator();\n //\n // while (iterator.hasNext()) {\n // String s0 = (String) iterator.next();\n //\n // printwriter.println(s0);\n // }\n //\n // printwriter.close();\n // } catch (Exception exception) {\n // this.s().an().b(\"Failed to save white-list: \" + exception);\n // }", "new_methods": [], "old_code": " // CanaryMod removed whitelist\n //CanaryMod re-route to our whitelist\n //Canary, re-route to our whitelist\n //Load whitelist\n// try {\n// this.h().clear();\n// BufferedReader bufferedreader = new BufferedReader(new FileReader(this.e));\n// String s0 = \"\";\n//\n// while ((s0 = bufferedreader.readLine()) != null) {\n// this.h().add(s0.trim().toLowerCase());\n// }\n//\n// bufferedreader.close();\n// } catch (Exception exception) {\n// this.s().an().b(\"Failed to load white-list: \" + exception);\n// }\n// try {\n// PrintWriter printwriter = new PrintWriter(new FileWriter(this.e, false));\n// Iterator iterator = this.h().iterator();\n//\n// while (iterator.hasNext()) {\n// String s0 = (String) iterator.next();\n//\n// printwriter.println(s0);\n// }\n//\n// printwriter.close();\n// } catch (Exception exception) {\n// this.s().an().b(\"Failed to save white-list: \" + exception);\n// }", "old_methods": [], "patch": "@@ -5,7 +5,7 @@\n \n public class DedicatedPlayerList extends ServerConfigurationManager {\n \n- // CanaryMod removed whitelist\n+ // CanaryMod removed whitelist\n // CanaryMod: removed ops\n \n public DedicatedPlayerList(DedicatedServer dedicatedserver) {\n@@ -31,17 +31,17 @@ public void c(String s0) {\n }\n \n public void h(String s0) {\n- //CanaryMod re-route to our whitelist\n+ // CanaryMod re-route to our whitelist\n Canary.whitelist().removePlayer(s0);\n }\n \n public void g(String s0) {\n- //Canary, re-route to our whitelist\n+ // Canary, re-route to our whitelist\n Canary.whitelist().addPlayer(s0);\n }\n \n public void j() {\n- //Load whitelist\n+ // Load whitelist\n throw new UnsupportedOperationException(\"Minecraft whitelist is disabled! Cannot load\");\n }\n \n@@ -79,36 +79,36 @@ private void u() {\n }\n \n private void v() {\n-// try {\n-// this.h().clear();\n-// BufferedReader bufferedreader = new BufferedReader(new FileReader(this.e));\n-// String s0 = \"\";\n-//\n-// while ((s0 = bufferedreader.readLine()) != null) {\n-// this.h().add(s0.trim().toLowerCase());\n-// }\n-//\n-// bufferedreader.close();\n-// } catch (Exception exception) {\n-// this.s().an().b(\"Failed to load white-list: \" + exception);\n-// }\n+ // try {\n+ // this.h().clear();\n+ // BufferedReader bufferedreader = new BufferedReader(new FileReader(this.e));\n+ // String s0 = \"\";\n+ //\n+ // while ((s0 = bufferedreader.readLine()) != null) {\n+ // this.h().add(s0.trim().toLowerCase());\n+ // }\n+ //\n+ // bufferedreader.close();\n+ // } catch (Exception exception) {\n+ // this.s().an().b(\"Failed to load white-list: \" + exception);\n+ // }\n }\n \n private void w() {\n-// try {\n-// PrintWriter printwriter = new PrintWriter(new FileWriter(this.e, false));\n-// Iterator iterator = this.h().iterator();\n-//\n-// while (iterator.hasNext()) {\n-// String s0 = (String) iterator.next();\n-//\n-// printwriter.println(s0);\n-// }\n-//\n-// printwriter.close();\n-// } catch (Exception exception) {\n-// this.s().an().b(\"Failed to save white-list: \" + exception);\n-// }\n+ // try {\n+ // PrintWriter printwriter = new PrintWriter(new FileWriter(this.e, false));\n+ // Iterator iterator = this.h().iterator();\n+ //\n+ // while (iterator.hasNext()) {\n+ // String s0 = (String) iterator.next();\n+ //\n+ // printwriter.println(s0);\n+ // }\n+ //\n+ // printwriter.close();\n+ // } catch (Exception exception) {\n+ // this.s().an().b(\"Failed to save white-list: \" + exception);\n+ // }\n }\n \n public boolean d(String s0) {", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FDedicatedPlayerList.java", "sha": "57ec1cddc128ce776ca4e4563bde1a24bbf15fab", "status": "modified" }, { "additions": 2, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FDedicatedServer.java", "changes": 4, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FDedicatedServer.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 2, "filename": "src/main/java/net/minecraft/server/DedicatedServer.java", "new_code": " this.an().a(\"Starting minecraft server version 1.6.2\");\n // } else if (this.as().i().isEmpty()) { // CanaryMod: Empty Ops list shouldn't break spawn protections...", "new_methods": [], "old_code": " this.an().a(\"Starting minecraft server version 1.6.1\");\n // } else if (this.ao().i().isEmpty()) { // CanaryMod: Empty Ops list shouldn't break spawn protections...", "old_methods": [], "patch": "@@ -38,7 +38,7 @@ protected boolean d() throws IOException {\n \n dedicatedservercommandthread.setDaemon(true);\n dedicatedservercommandthread.start();\n- this.an().a(\"Starting minecraft server version 1.6.1\");\n+ this.an().a(\"Starting minecraft server version 1.6.2\");\n if (Runtime.getRuntime().maxMemory() / 1024L / 1024L < 512L) {\n this.an().b(\"To start the server with more ram, launch it as \\\"java -Xmx1024M -Xms1024M -jar minecraft_server.jar\\\"\");\n }\n@@ -301,7 +301,7 @@ public boolean a(World world, int i0, int i1, int i2, EntityPlayer entityplayer)\n WorldConfiguration cfg = Configuration.getWorldConfig(world.getCanaryWorld().getFqName());\n if (world.t.i != 0) {\n return false;\n- // } else if (this.ao().i().isEmpty()) { // CanaryMod: Empty Ops list shouldn't break spawn protections...\n+ // } else if (this.as().i().isEmpty()) { // CanaryMod: Empty Ops list shouldn't break spawn protections...\n // return false;\n } else if (this.as().e(entityplayer.c_())) {\n return false;", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FDedicatedServer.java", "sha": "ec559f58ebdff77617b73c77918a4a6002b3bf22", "status": "modified" }, { "additions": 59, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntity.java", "changes": 108, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntity.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 49, "filename": "src/main/java/net/minecraft/server/Entity.java", "new_code": " float f2;\n\n f2 = this.O;\n if (this.O > f2 && !this.e && !this.q.I) {\n this.d((double) (f2 - this.O), 0.0D, (double) (f2 - this.O));\n }\n f2 = f0 % 2.0F;\n this.ao = this.ab();\n if (this.ah() && !this.G()) {\n DamageHook hook = (DamageHook) new DamageHook(null, entity, new CanaryDamageSource(DamageSource.b), 1.0F).call();\n DamageHook hook = (DamageHook) new DamageHook(null, entity, new CanaryDamageSource(DamageSource.c), 4.0F).call();\n boolean flag0 = this.F && this.ag() && this instanceof EntityPlayer;\n if (this.aq()) {\n String s0 = this.P();\n String s0 = this.P();\n nbttagcompound.a(\"Air\", (short) this.ak());\n if (this.O()) {\n this.b(this.u, this.v, this.w);\n }\n protected boolean O() {\n return true;\n }\n\n protected final String P() {\n public void Q() {}\n public boolean S() {\n public boolean T() {\n public void U() {\n this.o.V();\n public void V() {\n this.n.b(this.u, this.v + this.X() + this.n.W(), this.w);\n public double W() {\n public double X() {\n public float Y() {\n public Vec3 Z() {\n public void aa() {\n this.ao = this.ab();\n public int ab() {\n public ItemStack[] ad() {\n public boolean ae() {\n public boolean af() {\n public boolean ag() {\n public boolean ah() {\n public boolean ai() {\n public int ak() {\n public void al() {\n public String am() {\n public Entity[] an() {\n public float ao() {\n public boolean ap() {\n return String.format(\"%s[\\'%s\\'/%d, l=\\'%s\\', x=%.2f, y=%.2f, z=%.2f]\", new Object[]{ this.getClass().getSimpleName(), this.am(), Integer.valueOf(this.k), this.q == null ? \"~NULL~\" : this.q.N().k(), Double.valueOf(this.u), Double.valueOf(this.v), Double.valueOf(this.w) });\n public boolean aq() {\n public int ar() {\n public int as() {\n public boolean at() {\n public UUID av() {\n public boolean aw() {\n public String ax() {\n return this.am();", "new_methods": [ { "arguments": [], "filename": "src/main/java/net/minecraft/server/Entity.java", "implementation": "return true;", "signature": "boolean O()" }, { "arguments": [], "filename": "src/main/java/net/minecraft/server/Entity.java", "implementation": "public void Q() {", "signature": "String P()" }, { "arguments": [], "filename": "src/main/java/net/minecraft/server/Entity.java", "implementation": "public boolean T() {\n public void U() {\n this.o.V();\n public void V() {\n this.n.b(this.u, this.v + this.X() + this.n.W(), this.w);\n public double W() {\n public double X() {\n public float Y() {\n public Vec3 Z() {\n public void aa() {\n this.ao = this.ab();\n public int ab() {\n public ItemStack[] ad() {\n public boolean ae() {\n public boolean af() {\n public boolean ag() {\n public boolean ah() {\n public boolean ai() {\n public int ak() {\n public void al() {\n public String am() {\n public Entity[] an() {\n public float ao() {\n public boolean ap() {\n return String.format(\"%s[\\'%s\\'/%d, l=\\'%s\\', x=%.2f, y=%.2f, z=%.2f]\", new Object[]{ this.getClass().getSimpleName(), this.am(), Integer.valueOf(this.k), this.q == null ? \"~NULL~\" : this.q.N().k(), Double.valueOf(this.u), Double.valueOf(this.v), Double.valueOf(this.w)", "signature": "boolean S()" } ], "old_code": " float f2 = f0 % 2.0F;\n\n this.ao = this.aa();\n if (this.ag() && !this.G()) {\n DamageHook hook = (DamageHook) new DamageHook(null, entity, new CanaryDamageSource(DamageSource.b), 1).call();\n DamageHook hook = (DamageHook) new DamageHook(null, entity, new CanaryDamageSource(DamageSource.c), 4).call();\n boolean flag0 = this.F && this.af() && this instanceof EntityPlayer;\n if (this.ap()) {\n String s0 = this.O();\n String s0 = this.O();\n nbttagcompound.a(\"Air\", (short) this.aj());\n protected final String O() {\n public void P() {}\n public boolean R() {\n public boolean S() {\n public void T() {\n this.o.U();\n this.A = (float) ((double) this.A + d0);\n this.B = (float) ((double) this.B + d1);\n public void U() {\n this.n.b(this.u, this.v + this.W() + this.n.V(), this.w);\n public double V() {\n public double W() {\n public float X() {\n public Vec3 Y() {\n public void Z() {\n this.ao = this.aa();\n public int aa() {\n public ItemStack[] ac() {\n public boolean ad() {\n public boolean ae() {\n public boolean af() {\n public boolean ag() {\n public boolean ah() {\n public int aj() {\n public void ak() {\n public String al() {\n public Entity[] am() {\n public float an() {\n public boolean ao() {\n return String.format(\"%s[\\'%s\\'/%d, l=\\'%s\\', x=%.2f, y=%.2f, z=%.2f]\", new Object[]{ this.getClass().getSimpleName(), this.al(), Integer.valueOf(this.k), this.q == null ? \"~NULL~\" : this.q.N().k(), Double.valueOf(this.u), Double.valueOf(this.v), Double.valueOf(this.w) });\n public boolean ap() {\n public int aq() {\n public int ar() {\n public boolean as() {\n public UUID au() {\n public boolean av() {\n public String aw() {\n return this.al();", "old_methods": [ { "arguments": [], "filename": "src/main/java/net/minecraft/server/Entity.java", "implementation": "public void P() {", "signature": "String O()" }, { "arguments": [], "filename": "src/main/java/net/minecraft/server/Entity.java", "implementation": "public boolean S() {\n public void T() {\n this.o.U();\n this.A = (float) ((double) this.A + d0);\n this.B = (float) ((double) this.B + d1);\n public void U() {\n this.n.b(this.u, this.v + this.W() + this.n.V(), this.w);\n public double V() {\n public double W() {\n public float X() {\n public Vec3 Y() {\n public void Z() {\n this.ao = this.aa();\n public int aa() {\n public ItemStack[] ac() {\n public boolean ad() {\n public boolean ae() {\n public boolean af() {\n public boolean ag() {\n public boolean ah() {\n public int aj() {\n public void ak() {\n public String al() {\n public Entity[] am() {\n public float an() {\n public boolean ao() {\n return String.format(\"%s[\\'%s\\'/%d, l=\\'%s\\', x=%.2f, y=%.2f, z=%.2f]\", new Object[]{ this.getClass().getSimpleName(), this.al(), Integer.valueOf(this.k), this.q == null ? \"~NULL~\" : this.q.N().k(), Double.valueOf(this.u), Double.valueOf(this.v), Double.valueOf(this.w)", "signature": "boolean R()" } ], "patch": "@@ -157,16 +157,21 @@ public void w() {\n }\n \n protected void a(float f0, float f1) {\n+ float f2;\n+\n if (f0 != this.O || f1 != this.P) {\n+ f2 = this.O;\n this.O = f0;\n this.P = f1;\n this.E.d = this.E.a + (double) this.O;\n this.E.f = this.E.c + (double) this.O;\n this.E.e = this.E.b + (double) this.P;\n+ if (this.O > f2 && !this.e && !this.q.I) {\n+ this.d((double) (f2 - this.O), 0.0D, (double) (f2 - this.O));\n+ }\n }\n \n- float f2 = f0 % 2.0F;\n-\n+ f2 = f0 % 2.0F;\n if ((double) f2 < 0.375D) {\n this.at = EnumEntitySize.a;\n } else if ((double) f2 < 0.75D) {\n@@ -224,7 +229,7 @@ public void x() {\n if (Configuration.getWorldConfig(getCanaryWorld().getFqName()).isNetherAllowed()) {\n if (this.o == null && this.aq++ >= i0) {\n this.aq = i0;\n- this.ao = this.aa();\n+ this.ao = this.ab();\n byte b0;\n \n if (this.q.t.i == -1) {\n@@ -255,7 +260,7 @@ public void x() {\n this.q.C.b();\n }\n \n- if (this.ag() && !this.G()) {\n+ if (this.ah() && !this.G()) {\n int i1 = MathHelper.c(this.u);\n \n i0 = MathHelper.c(this.v - 0.20000000298023224D - (double) this.N);\n@@ -279,7 +284,7 @@ public void x() {\n } else {\n if (this.d % 20 == 0) {\n // CanaryMod: call DamageHook (FireTick)\n- DamageHook hook = (DamageHook) new DamageHook(null, entity, new CanaryDamageSource(DamageSource.b), 1).call();\n+ DamageHook hook = (DamageHook) new DamageHook(null, entity, new CanaryDamageSource(DamageSource.b), 1.0F).call();\n if (!hook.isCanceled()) {\n this.a((((CanaryDamageSource) hook.getDamageSource()).getHandle()), hook.getDamageDealt());\n }\n@@ -314,7 +319,7 @@ public int y() {\n protected void z() {\n if (!this.ag) {\n // CanaryMod: call DamageHook (Lava)\n- DamageHook hook = (DamageHook) new DamageHook(null, entity, new CanaryDamageSource(DamageSource.c), 4).call();\n+ DamageHook hook = (DamageHook) new DamageHook(null, entity, new CanaryDamageSource(DamageSource.c), 4.0F).call();\n if (!hook.isCanceled()) {\n this.a((((CanaryDamageSource) hook.getDamageSource()).getHandle()), hook.getDamageDealt());\n this.d(15);\n@@ -374,7 +379,7 @@ public void d(double d0, double d1, double d2) {\n double d7 = d1;\n double d8 = d2;\n AxisAlignedBB axisalignedbb = this.E.c();\n- boolean flag0 = this.F && this.af() && this instanceof EntityPlayer;\n+ boolean flag0 = this.F && this.ag() && this instanceof EntityPlayer;\n \n if (flag0) {\n double d9;\n@@ -928,7 +933,7 @@ protected void J() {\n }\n \n public boolean a(DamageSource damagesource, float f0) {\n- if (this.ap()) {\n+ if (this.aq()) {\n return false;\n } else {\n this.J();\n@@ -947,7 +952,7 @@ public boolean L() {\n public void b(Entity entity, int i0) {}\n \n public boolean c(NBTTagCompound nbttagcompound) {\n- String s0 = this.O();\n+ String s0 = this.P();\n \n if (!this.M && s0 != null) {\n nbttagcompound.a(\"id\", s0);\n@@ -959,7 +964,7 @@ public boolean c(NBTTagCompound nbttagcompound) {\n }\n \n public boolean d(NBTTagCompound nbttagcompound) {\n- String s0 = this.O();\n+ String s0 = this.P();\n \n if (!this.M && s0 != null && this.n == null) {\n nbttagcompound.a(\"id\", s0);\n@@ -977,7 +982,7 @@ public void e(NBTTagCompound nbttagcompound) {\n nbttagcompound.a(\"Rotation\", (NBTBase) this.a(new float[]{ this.A, this.B }));\n nbttagcompound.a(\"FallDistance\", this.T);\n nbttagcompound.a(\"Fire\", (short) this.d);\n- nbttagcompound.a(\"Air\", (short) this.aj());\n+ nbttagcompound.a(\"Air\", (short) this.ak());\n nbttagcompound.a(\"OnGround\", this.F);\n nbttagcompound.a(\"Dimension\", this.ar);\n nbttagcompound.a(\"Invulnerable\", this.h);\n@@ -1050,6 +1055,9 @@ public void f(NBTTagCompound nbttagcompound) {\n this.metadata = nbttagcompound.b(\"Canary\") ? new CanaryCompoundTag(nbttagcompound.l(\"Canary\")) : new CanaryCompoundTag(\"Canary\");\n // CanaryMod: END\n this.a(nbttagcompound);\n+ if (this.O()) {\n+ this.b(this.u, this.v, this.w);\n+ }\n } catch (Throwable throwable) {\n CrashReport crashreport = CrashReport.a(throwable, \"Loading entity NBT\");\n CrashReportCategory crashreportcategory = crashreport.a(\"Entity being loaded\");\n@@ -1059,15 +1067,19 @@ public void f(NBTTagCompound nbttagcompound) {\n }\n }\n \n- protected final String O() {\n+ protected boolean O() {\n+ return true;\n+ }\n+\n+ protected final String P() {\n return EntityList.b(this);\n }\n \n protected abstract void a(NBTTagCompound nbttagcompound);\n \n protected abstract void b(NBTTagCompound nbttagcompound);\n \n- public void P() {}\n+ public void Q() {}\n \n protected NBTTagList a(double... adouble) {\n NBTTagList nbttaglist = new NBTTagList();\n@@ -1117,11 +1129,11 @@ public EntityItem a(ItemStack itemstack, float f0) {\n }\n }\n \n- public boolean R() {\n+ public boolean S() {\n return !this.M;\n }\n \n- public boolean S() {\n+ public boolean T() {\n for (int i0 = 0; i0 < 8; ++i0) {\n float f0 = ((float) ((i0 >> 0) % 2) - 0.5F) * this.O * 0.8F;\n float f1 = ((float) ((i0 >> 1) % 2) - 0.5F) * 0.1F;\n@@ -1146,7 +1158,7 @@ public AxisAlignedBB g(Entity entity) {\n return null;\n }\n \n- public void T() {\n+ public void U() {\n if (this.o.M) {\n this.o = null;\n } else {\n@@ -1155,7 +1167,7 @@ public void T() {\n this.z = 0.0D;\n this.l_();\n if (this.o != null) {\n- this.o.U();\n+ this.o.V();\n this.g += (double) (this.o.A - this.o.C);\n \n for (this.f += (double) (this.o.B - this.o.D); this.g >= 180.0D; this.g -= 360.0D) {\n@@ -1196,23 +1208,21 @@ public void T() {\n \n this.g -= d0;\n this.f -= d1;\n- this.A = (float) ((double) this.A + d0);\n- this.B = (float) ((double) this.B + d1);\n }\n }\n }\n \n- public void U() {\n+ public void V() {\n if (this.n != null) {\n- this.n.b(this.u, this.v + this.W() + this.n.V(), this.w);\n+ this.n.b(this.u, this.v + this.X() + this.n.W(), this.w);\n }\n }\n \n- public double V() {\n+ public double W() {\n return (double) this.N;\n }\n \n- public double W() {\n+ public double X() {\n return (double) this.P * 0.75D;\n }\n \n@@ -1244,17 +1254,17 @@ public void a(Entity entity) {\n }\n }\n \n- public float X() {\n+ public float Y() {\n return 0.1F;\n }\n \n- public Vec3 Y() {\n+ public Vec3 Z() {\n return null;\n }\n \n- public void Z() {\n+ public void aa() {\n if (this.ao > 0) {\n- this.ao = this.aa();\n+ this.ao = this.ab();\n } else {\n double d0 = this.r - this.u;\n double d1 = this.t - this.w;\n@@ -1267,41 +1277,41 @@ public void Z() {\n }\n }\n \n- public int aa() {\n+ public int ab() {\n return 900;\n }\n \n- public ItemStack[] ac() {\n+ public ItemStack[] ad() {\n return null;\n }\n \n public void c(int i0, ItemStack itemstack) {}\n \n- public boolean ad() {\n+ public boolean ae() {\n return !this.ag && (this.d > 0 || this.f(0));\n }\n \n- public boolean ae() {\n+ public boolean af() {\n return this.o != null;\n }\n \n- public boolean af() {\n+ public boolean ag() {\n return this.f(1);\n }\n \n public void b(boolean flag0) {\n this.a(1, flag0);\n }\n \n- public boolean ag() {\n+ public boolean ah() {\n return this.f(3);\n }\n \n public void c(boolean flag0) {\n this.a(3, flag0);\n }\n \n- public boolean ah() {\n+ public boolean ai() {\n return this.f(5);\n }\n \n@@ -1327,7 +1337,7 @@ protected void a(int i0, boolean flag0) {\n }\n }\n \n- public int aj() {\n+ public int ak() {\n return this.ah.b(1);\n }\n \n@@ -1421,12 +1431,12 @@ protected boolean i(double d0, double d1, double d2) {\n }\n }\n \n- public void ak() {\n+ public void al() {\n this.K = true;\n this.T = 0.0F;\n }\n \n- public String al() {\n+ public String am() {\n String s0 = EntityList.b(this);\n \n if (s0 == null) {\n@@ -1436,19 +1446,19 @@ public String al() {\n return StatCollector.a(\"entity.\" + s0 + \".name\");\n }\n \n- public Entity[] am() {\n+ public Entity[] an() {\n return null;\n }\n \n public boolean h(Entity entity) {\n return this == entity;\n }\n \n- public float an() {\n+ public float ao() {\n return 0.0F;\n }\n \n- public boolean ao() {\n+ public boolean ap() {\n return true;\n }\n \n@@ -1457,10 +1467,10 @@ public boolean i(Entity entity) {\n }\n \n public String toString() {\n- return String.format(\"%s[\\'%s\\'/%d, l=\\'%s\\', x=%.2f, y=%.2f, z=%.2f]\", new Object[]{ this.getClass().getSimpleName(), this.al(), Integer.valueOf(this.k), this.q == null ? \"~NULL~\" : this.q.N().k(), Double.valueOf(this.u), Double.valueOf(this.v), Double.valueOf(this.w) });\n+ return String.format(\"%s[\\'%s\\'/%d, l=\\'%s\\', x=%.2f, y=%.2f, z=%.2f]\", new Object[]{ this.getClass().getSimpleName(), this.am(), Integer.valueOf(this.k), this.q == null ? \"~NULL~\" : this.q.N().k(), Double.valueOf(this.u), Double.valueOf(this.v), Double.valueOf(this.w) });\n }\n \n- public boolean ap() {\n+ public boolean aq() {\n return this.h;\n }\n \n@@ -1528,15 +1538,15 @@ public boolean a(Explosion explosion, World world, int i0, int i1, int i2, int i\n return true;\n }\n \n- public int aq() {\n+ public int ar() {\n return 3;\n }\n \n- public int ar() {\n+ public int as() {\n return this.as;\n }\n \n- public boolean as() {\n+ public boolean at() {\n return false;\n }\n \n@@ -1549,16 +1559,16 @@ public void a(CrashReportCategory crashreportcategory) {\n crashreportcategory.a(\"Entity\\'s Momentum\", String.format(\"%.2f, %.2f, %.2f\", new Object[]{ Double.valueOf(this.x), Double.valueOf(this.y), Double.valueOf(this.z) }));\n }\n \n- public UUID au() {\n+ public UUID av() {\n return this.i;\n }\n \n- public boolean av() {\n+ public boolean aw() {\n return true;\n }\n \n- public String aw() {\n- return this.al();\n+ public String ax() {\n+ return this.am();\n }\n \n /**", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntity.java", "sha": "7e8584c1fbdbbc17a378632855cc0c0f9d83309d", "status": "modified" }, { "additions": 3, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityArrow.java", "changes": 6, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityArrow.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 3, "filename": "src/main/java/net/minecraft/server/EntityArrow.java", "new_code": " if (this.ae() && !(movingobjectposition.g instanceof EntityEnderman)) {\n entitylivingbase.m(entitylivingbase.aT() + 1);\n public boolean ap() {", "new_methods": [], "old_code": " if (this.ad() && !(movingobjectposition.g instanceof EntityEnderman)) {\n entitylivingbase.m(entitylivingbase.aQ() + 1);\n public boolean ao() {", "old_methods": [], "patch": "@@ -226,7 +226,7 @@ public void l_() {\n damagesource = DamageSource.a(this, this.c);\n }\n \n- if (this.ad() && !(movingobjectposition.g instanceof EntityEnderman)) {\n+ if (this.ae() && !(movingobjectposition.g instanceof EntityEnderman)) {\n movingobjectposition.g.d(5);\n }\n \n@@ -235,7 +235,7 @@ public void l_() {\n EntityLivingBase entitylivingbase = (EntityLivingBase) movingobjectposition.g;\n \n if (!this.q.I) {\n- entitylivingbase.m(entitylivingbase.aQ() + 1);\n+ entitylivingbase.m(entitylivingbase.aT() + 1);\n }\n \n if (this.aw > 0) {\n@@ -404,7 +404,7 @@ public void a(int i0) {\n this.aw = i0;\n }\n \n- public boolean ao() {\n+ public boolean ap() {\n return false;\n }\n ", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityArrow.java", "sha": "d3a81e844d7176417e4082bebe49b73d989abd6a", "status": "modified" }, { "additions": 20, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityBat.java", "changes": 40, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityBat.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 20, "filename": "src/main/java/net/minecraft/server/EntityBat.java", "new_code": " protected float aZ() {\n protected float ba() {\n return super.ba() * 0.95F;\n return this.bJ() && this.ab.nextInt(4) != 0 ? null : \"mob.bat.idle\";\n protected String aN() {\n protected String aO() {\n protected void bi() {}\n protected void ay() {\n super.ay();\n public boolean bJ() {\n protected boolean be() {\n if (this.bJ()) {\n protected void bh() {\n super.bh();\n if (this.bJ()) {\n public boolean at() {\n if (this.aq()) {\n if (!this.q.I && this.bJ()) {\n public boolean bs() {\n return i3 > this.ab.nextInt(b0) ? false : super.bs();", "new_methods": [ { "arguments": [], "filename": "src/main/java/net/minecraft/server/EntityBat.java", "implementation": "protected float ba() {\n return super.ba() * 0.95F;\n return this.bJ() && this.ab.nextInt(4) != 0 ? null : \"mob.bat.idle\";\n protected String aN() {\n protected String aO() {\n protected void bi() {", "signature": "float aZ()" } ], "old_code": " protected float aW() {\n protected float aX() {\n return super.aX() * 0.95F;\n return this.bF() && this.ab.nextInt(4) != 0 ? null : \"mob.bat.idle\";\n protected String aK() {\n protected String aL() {\n protected void bf() {}\n protected void ax() {\n super.ax();\n public boolean bF() {\n protected boolean bb() {\n if (this.bF()) {\n protected void be() {\n super.be();\n if (this.bF()) {\n public boolean as() {\n if (this.ap()) {\n if (!this.q.I && this.bF()) {\n public boolean bo() {\n return i3 > this.ab.nextInt(b0) ? false : super.bo();", "old_methods": [ { "arguments": [], "filename": "src/main/java/net/minecraft/server/EntityBat.java", "implementation": "protected float aX() {\n return super.aX() * 0.95F;\n return this.bF() && this.ab.nextInt(4) != 0 ? null : \"mob.bat.idle\";\n protected String aK() {\n protected String aL() {\n protected void bf() {", "signature": "float aW()" } ], "patch": "@@ -19,23 +19,23 @@ protected void a() {\n this.ah.a(16, new Byte((byte) 0));\n }\n \n- protected float aW() {\n+ protected float aZ() {\n return 0.1F;\n }\n \n- protected float aX() {\n- return super.aX() * 0.95F;\n+ protected float ba() {\n+ return super.ba() * 0.95F;\n }\n \n protected String r() {\n- return this.bF() && this.ab.nextInt(4) != 0 ? null : \"mob.bat.idle\";\n+ return this.bJ() && this.ab.nextInt(4) != 0 ? null : \"mob.bat.idle\";\n }\n \n- protected String aK() {\n+ protected String aN() {\n return \"mob.bat.hurt\";\n }\n \n- protected String aL() {\n+ protected String aO() {\n return \"mob.bat.death\";\n }\n \n@@ -45,14 +45,14 @@ public boolean L() {\n \n protected void n(Entity entity) {}\n \n- protected void bf() {}\n+ protected void bi() {}\n \n- protected void ax() {\n- super.ax();\n+ protected void ay() {\n+ super.ay();\n this.a(SharedMonsterAttributes.a).a(6.0D);\n }\n \n- public boolean bF() {\n+ public boolean bJ() {\n return (this.ah.a(16) & 1) != 0;\n }\n \n@@ -66,23 +66,23 @@ public void a(boolean flag0) {\n }\n }\n \n- protected boolean bb() {\n+ protected boolean be() {\n return true;\n }\n \n public void l_() {\n super.l_();\n- if (this.bF()) {\n+ if (this.bJ()) {\n this.x = this.y = this.z = 0.0D;\n this.v = (double) MathHelper.c(this.v) + 1.0D - (double) this.P;\n } else {\n this.y *= 0.6000000238418579D;\n }\n }\n \n- protected void be() {\n- super.be();\n- if (this.bF()) {\n+ protected void bh() {\n+ super.bh();\n+ if (this.bJ()) {\n if (!this.q.u(MathHelper.c(this.u), (int) this.v + 1, MathHelper.c(this.w))) {\n this.a(false);\n this.q.a((EntityPlayer) null, 1015, (int) this.u, (int) this.v, (int) this.w, 0);\n@@ -131,15 +131,15 @@ protected void b(float f0) {}\n \n protected void a(double d0, boolean flag0) {}\n \n- public boolean as() {\n+ public boolean at() {\n return true;\n }\n \n public boolean a(DamageSource damagesource, float f0) {\n- if (this.ap()) {\n+ if (this.aq()) {\n return false;\n } else {\n- if (!this.q.I && this.bF()) {\n+ if (!this.q.I && this.bJ()) {\n this.a(false);\n }\n \n@@ -157,7 +157,7 @@ public void b(NBTTagCompound nbttagcompound) {\n nbttagcompound.a(\"BatFlags\", this.ah.a(16));\n }\n \n- public boolean bo() {\n+ public boolean bs() {\n int i0 = MathHelper.c(this.E.b);\n \n if (i0 >= 63) {\n@@ -177,7 +177,7 @@ public boolean bo() {\n b0 = 7;\n }\n \n- return i3 > this.ab.nextInt(b0) ? false : super.bo();\n+ return i3 > this.ab.nextInt(b0) ? false : super.bs();\n }\n }\n }", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityBat.java", "sha": "b6bda0ee223c3b9107ea1d48c9cf993c4858c150", "status": "modified" }, { "additions": 8, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityBlaze.java", "changes": 16, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityBlaze.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 8, "filename": "src/main/java/net/minecraft/server/EntityBlaze.java", "new_code": " protected void ay() {\n super.ay();\n protected String aN() {\n protected String aO() {\n if (this.bN() != null && this.bN().v + (double) this.bN().f() > this.v + (double) this.f() + (double) this.bp) {\n public boolean ae() {\n return this.bT();\n public boolean bT() {", "new_methods": [], "old_code": " protected void ax() {\n super.ax();\n protected String aK() {\n protected String aL() {\n if (this.bJ() != null && this.bJ().v + (double) this.bJ().f() > this.v + (double) this.f() + (double) this.bp) {\n public boolean ad() {\n return this.bP();\n public boolean bP() {", "old_methods": [], "patch": "@@ -15,8 +15,8 @@ public EntityBlaze(World world) {\n this.entity = new CanaryBlaze(this); // CanaryMod: Wrap Entity\n }\n \n- protected void ax() {\n- super.ax();\n+ protected void ay() {\n+ super.ay();\n this.a(SharedMonsterAttributes.e).a(6.0D);\n }\n \n@@ -29,11 +29,11 @@ protected String r() {\n return \"mob.blaze.breathe\";\n }\n \n- protected String aK() {\n+ protected String aN() {\n return \"mob.blaze.hit\";\n }\n \n- protected String aL() {\n+ protected String aO() {\n return \"mob.blaze.death\";\n }\n \n@@ -53,7 +53,7 @@ public void c() {\n this.bp = 0.5F + (float) this.ab.nextGaussian() * 3.0F;\n }\n \n- if (this.bJ() != null && this.bJ().v + (double) this.bJ().f() > this.v + (double) this.f() + (double) this.bp) {\n+ if (this.bN() != null && this.bN().v + (double) this.bN().f() > this.v + (double) this.f() + (double) this.bp) {\n this.y += (0.30000001192092896D - this.y) * 0.30000001192092896D;\n }\n }\n@@ -120,8 +120,8 @@ protected int s() {\n return Item.bq.cv;\n }\n \n- public boolean ad() {\n- return this.bP();\n+ public boolean ae() {\n+ return this.bT();\n }\n \n protected void b(boolean flag0, int i0) {\n@@ -134,7 +134,7 @@ protected void b(boolean flag0, int i0) {\n }\n }\n \n- public boolean bP() {\n+ public boolean bT() {\n return (this.ah.a(16) & 1) != 0;\n }\n ", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityBlaze.java", "sha": "b5c04c49945922fda6e8b42192ce97c80a9117e0", "status": "modified" }, { "additions": 4, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityBoat.java", "changes": 8, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityBoat.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 4, "filename": "src/main/java/net/minecraft/server/EntityBoat.java", "new_code": " public double X() {\n if (this.aq()) {\n public void V() {\n this.n.b(this.u + d0, this.v + this.X() + this.n.W(), this.w + d1);", "new_methods": [], "old_code": " public double W() {\n if (this.ap()) {\n public void U() {\n this.n.b(this.u + d0, this.v + this.W() + this.n.V(), this.w + d1);", "old_methods": [], "patch": "@@ -69,12 +69,12 @@ public EntityBoat(World world, double d0, double d1, double d2) {\n this.entity = new CanaryBoat(this); // CanaryMod: Wrap Entity\n }\n \n- public double W() {\n+ public double X() {\n return (double) this.P * 0.0D - 0.30000001192092896D;\n }\n \n public boolean a(DamageSource damagesource, float f0) {\n- if (this.ap()) {\n+ if (this.aq()) {\n return false;\n } else if (!this.q.I && !this.M) {\n // CanaryMod: VehicleDamage\n@@ -340,12 +340,12 @@ public void l_() {\n }\n }\n \n- public void U() {\n+ public void V() {\n if (this.n != null) {\n double d0 = Math.cos((double) this.A * 3.141592653589793D / 180.0D) * 0.4D;\n double d1 = Math.sin((double) this.A * 3.141592653589793D / 180.0D) * 0.4D;\n \n- this.n.b(this.u + d0, this.v + this.W() + this.n.V(), this.w + d1);\n+ this.n.b(this.u + d0, this.v + this.X() + this.n.W(), this.w + d1);\n }\n }\n ", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityBoat.java", "sha": "cdcfa94647c782b1bdc002f5c4c2eda8c7f8b655", "status": "modified" }, { "additions": 3, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityCaveSpider.java", "changes": 8, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityCaveSpider.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 5, "filename": "src/main/java/net/minecraft/server/EntityCaveSpider.java", "new_code": " protected void ay() {\n super.ay();\n ((EntityLivingBase) entity).c(new PotionEffect(Potion.u.H, b0 * 20, 0));", "new_methods": [], "old_code": "\n\n protected void ax() {\n super.ax();\n ((EntityLivingBase) entity).d(new PotionEffect(Potion.u.H, b0 * 20, 0));", "old_methods": [], "patch": "@@ -1,9 +1,7 @@\n package net.minecraft.server;\n \n-\n import net.canarymod.api.entity.living.monster.CanaryCaveSpider;\n \n-\n public class EntityCaveSpider extends EntitySpider {\n \n public EntityCaveSpider(World world) {\n@@ -12,8 +10,8 @@ public EntityCaveSpider(World world) {\n this.entity = new CanaryCaveSpider(this); // CanaryMod: Wrap Entity\n }\n \n- protected void ax() {\n- super.ax();\n+ protected void ay() {\n+ super.ay();\n this.a(SharedMonsterAttributes.a).a(12.0D);\n }\n \n@@ -31,7 +29,7 @@ public boolean m(Entity entity) {\n }\n \n if (b0 > 0) {\n- ((EntityLivingBase) entity).d(new PotionEffect(Potion.u.H, b0 * 20, 0));\n+ ((EntityLivingBase) entity).c(new PotionEffect(Potion.u.H, b0 * 20, 0));\n }\n }\n ", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityCaveSpider.java", "sha": "26ed27b82c39bc770035af57eaf494974f7af1ad", "status": "modified" }, { "additions": 6, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityChicken.java", "changes": 14, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityChicken.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 8, "filename": "src/main/java/net/minecraft/server/EntityChicken.java", "new_code": " public boolean be() {\n protected void ay() {\n super.ay();\n protected String aN() {\n protected String aO() {\n if (this.ae()) {", "new_methods": [], "old_code": "\n\n public boolean bb() {\n protected void ax() {\n super.ax();\n protected String aK() {\n protected String aL() {\n if (this.ad()) {", "old_methods": [], "patch": "@@ -1,9 +1,7 @@\n package net.minecraft.server;\n \n-\n import net.canarymod.api.entity.living.animal.CanaryChicken;\n \n-\n public class EntityChicken extends EntityAnimal {\n \n public float bp;\n@@ -28,12 +26,12 @@ public EntityChicken(World world) {\n this.entity = new CanaryChicken(this); // CanaryMod: Wrap Entity\n }\n \n- public boolean bb() {\n+ public boolean be() {\n return true;\n }\n \n- protected void ax() {\n- super.ax();\n+ protected void ay() {\n+ super.ay();\n this.a(SharedMonsterAttributes.a).a(4.0D);\n this.a(SharedMonsterAttributes.d).a(0.25D);\n }\n@@ -74,11 +72,11 @@ protected String r() {\n return \"mob.chicken.say\";\n }\n \n- protected String aK() {\n+ protected String aN() {\n return \"mob.chicken.hurt\";\n }\n \n- protected String aL() {\n+ protected String aO() {\n return \"mob.chicken.hurt\";\n }\n \n@@ -97,7 +95,7 @@ protected void b(boolean flag0, int i0) {\n this.b(Item.N.cv, 1);\n }\n \n- if (this.ad()) {\n+ if (this.ae()) {\n this.b(Item.bn.cv, 1);\n } else {\n this.b(Item.bm.cv, 1);", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityChicken.java", "sha": "07b756e1e9475f5d398aeeb5518f782b21e5b5bc", "status": "modified" }, { "additions": 7, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityCow.java", "changes": 14, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityCow.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 7, "filename": "src/main/java/net/minecraft/server/EntityCow.java", "new_code": " public boolean be() {\n protected void ay() {\n super.ay();\n protected String aN() {\n protected String aO() {\n protected float aZ() {\n if (this.ae()) {", "new_methods": [], "old_code": " public boolean bb() {\n protected void ax() {\n super.ax();\n protected String aK() {\n protected String aL() {\n protected float aW() {\n if (this.ad()) {", "old_methods": [], "patch": "@@ -19,12 +19,12 @@ public EntityCow(World world) {\n this.entity = new CanaryCow(this); // CanaryMod: Wrap Entity\n }\n \n- public boolean bb() {\n+ public boolean be() {\n return true;\n }\n \n- protected void ax() {\n- super.ax();\n+ protected void ay() {\n+ super.ay();\n this.a(SharedMonsterAttributes.a).a(10.0D);\n this.a(SharedMonsterAttributes.d).a(0.20000000298023224D);\n }\n@@ -33,19 +33,19 @@ protected String r() {\n return \"mob.cow.say\";\n }\n \n- protected String aK() {\n+ protected String aN() {\n return \"mob.cow.hurt\";\n }\n \n- protected String aL() {\n+ protected String aO() {\n return \"mob.cow.hurt\";\n }\n \n protected void a(int i0, int i1, int i2, int i3) {\n this.a(\"mob.cow.step\", 0.15F, 1.0F);\n }\n \n- protected float aW() {\n+ protected float aZ() {\n return 0.4F;\n }\n \n@@ -65,7 +65,7 @@ protected void b(boolean flag0, int i0) {\n i1 = this.ab.nextInt(3) + 1 + this.ab.nextInt(1 + i0);\n \n for (i2 = 0; i2 < i1; ++i2) {\n- if (this.ad()) {\n+ if (this.ae()) {\n this.b(Item.bl.cv, 1);\n } else {\n this.b(Item.bk.cv, 1);", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityCow.java", "sha": "1385bc08a35d537c9c780df1a1384775605444ae", "status": "modified" }, { "additions": 32, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityCreature.java", "changes": 61, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityCreature.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 29, "filename": "src/main/java/net/minecraft/server/EntityCreature.java", "new_code": " private EntityAIBase bs = new EntityAIMoveTowardsRestriction(this, 1.0D);\n protected boolean bJ() {\n protected void bk() {\n this.bn = this.bJ();\n Entity entity = this.bL();\n } else if (this.j.S()) {\n this.bK();\n if (this.G && !this.bM()) {\n super.bk();\n protected void bK() {\n protected Entity bL() {\n public boolean bs() {\n return super.bs() && this.a(i0, i1, i2) >= 0.0F;\n public boolean bM() {\n public Entity bN() {\n public boolean bO() {\n public ChunkCoordinates bP() {\n public float bQ() {\n public void bR() {\n public boolean bS() {\n protected void bF() {\n super.bF();\n if (this.bH() && this.bI() != null && this.bI().q == this.q) {\n Entity entity = this.bI();\n if (this instanceof EntityTameable && ((EntityTameable) this).bU()) {\n this.a(true, true);\n this.o(f0);\n this.a(true, true);\n } else if (!this.bH() && this.bt) {\n this.bR();\n\n protected void o(float f0) {}", "new_methods": [ { "arguments": [], "filename": "src/main/java/net/minecraft/server/EntityCreature.java", "implementation": "protected void bk() {\n this.bn = this.bJ();\n Entity entity = this.bL();", "signature": "boolean bJ()" }, { "arguments": [], "filename": "src/main/java/net/minecraft/server/EntityCreature.java", "implementation": "protected Entity bL() {\n public boolean bs() {\n return super.bs() && this.a(i0, i1, i2) >= 0.0F;\n public boolean bM() {\n public Entity bN() {\n public boolean bO() {\n public ChunkCoordinates bP() {\n public float bQ() {\n public void bR() {\n public boolean bS() {\n protected void bF() {\n super.bF();\n if (this.bH() && this.bI() != null && this.bI().q == this.q) {\n Entity entity = this.bI();\n if (this instanceof EntityTameable && ((EntityTameable) this).bU()) {\n this.a(true, true);\n this.o(f0);\n this.a(true, true);", "signature": "void bK()" }, { "arguments": [ "float f0" ], "filename": "src/main/java/net/minecraft/server/EntityCreature.java", "implementation": "", "signature": "void o(float f0)" } ], "old_code": " private EntityAIBase bs = new EntityAIMoveTwardsRestriction(this, 1.0D);\n protected boolean bF() {\n protected void bh() {\n this.bn = this.bF();\n Entity entity = this.bH();\n } else if (this.j.R()) {\n this.bG();\n if (this.G && !this.bI()) {\n super.bh();\n protected void bG() {\n protected Entity bH() {\n public boolean bo() {\n return super.bo() && this.a(i0, i1, i2) >= 0.0F;\n public boolean bI() {\n public Entity bJ() {\n public boolean bK() {\n public ChunkCoordinates bL() {\n public float bM() {\n public void bN() {\n public boolean bO() {\n protected void bB() {\n super.bB();\n if (this.bD() && this.bE() != null && this.bE().q == this.q) {\n Entity entity = this.bE();\n if (this instanceof EntityTameable && ((EntityTameable) this).bQ()) {\n this.i(true);\n this.i(true);\n } else if (!this.bD() && this.bt) {\n this.bN();", "old_methods": [ { "arguments": [], "filename": "src/main/java/net/minecraft/server/EntityCreature.java", "implementation": "protected void bh() {\n this.bn = this.bF();\n Entity entity = this.bH();", "signature": "boolean bF()" }, { "arguments": [], "filename": "src/main/java/net/minecraft/server/EntityCreature.java", "implementation": "protected Entity bH() {\n public boolean bo() {\n return super.bo() && this.a(i0, i1, i2) >= 0.0F;\n public boolean bI() {\n public Entity bJ() {\n public boolean bK() {\n public ChunkCoordinates bL() {\n public float bM() {\n public void bN() {\n public boolean bO() {\n protected void bB() {\n super.bB();\n if (this.bD() && this.bE() != null && this.bE().q == this.q) {\n Entity entity = this.bE();\n if (this instanceof EntityTameable && ((EntityTameable) this).bQ()) {\n this.i(true);\n this.i(true);", "signature": "void bG()" } ], "patch": "@@ -13,31 +13,31 @@ public abstract class EntityCreature extends EntityLiving {\n protected int bo;\n private ChunkCoordinates bq = new ChunkCoordinates(0, 0, 0);\n private float br = -1.0F;\n- private EntityAIBase bs = new EntityAIMoveTwardsRestriction(this, 1.0D);\n+ private EntityAIBase bs = new EntityAIMoveTowardsRestriction(this, 1.0D);\n private boolean bt;\n \n public EntityCreature(World world) {\n super(world);\n }\n \n- protected boolean bF() {\n+ protected boolean bJ() {\n return false;\n }\n \n- protected void bh() {\n+ protected void bk() {\n this.q.C.a(\"ai\");\n if (this.bo > 0 && --this.bo == 0) {\n AttributeInstance attributeinstance = this.a(SharedMonsterAttributes.d);\n \n attributeinstance.b(i);\n }\n \n- this.bn = this.bF();\n+ this.bn = this.bJ();\n float f11 = 16.0F;\n \n if (this.j == null) {\n // CanaryMod: MobTarget\n- Entity entity = this.bH();\n+ Entity entity = this.bL();\n if (entity != null && entity instanceof EntityLivingBase) {\n MobTargetHook hook = (MobTargetHook) new MobTargetHook((net.canarymod.api.entity.living.LivingBase) this.getCanaryEntity(), (net.canarymod.api.entity.living.LivingBase) entity.getCanaryEntity()).call();\n if (!hook.isCanceled()) {\n@@ -49,7 +49,7 @@ protected void bh() {\n if (this.j != null) {\n this.bp = this.q.a(this, this.j, f11, true, false, false, true);\n }\n- } else if (this.j.R()) {\n+ } else if (this.j.S()) {\n float f1 = this.j.d((Entity) this);\n \n if (this.o(this.j)) {\n@@ -63,7 +63,7 @@ protected void bh() {\n if (!this.bn && this.j != null && (this.bp == null || this.ab.nextInt(20) == 0)) {\n this.bp = this.q.a(this, this.j, f11, true, false, false, true);\n } else if (!this.bn && (this.bp == null && this.ab.nextInt(180) == 0 || this.ab.nextInt(120) == 0 || this.bo > 0) && this.aV < 100) {\n- this.bG();\n+ this.bK();\n }\n \n int i0 = MathHelper.c(this.E.b + 0.5D);\n@@ -124,7 +124,7 @@ protected void bh() {\n this.a(this.j, 30.0F, 30.0F);\n }\n \n- if (this.G && !this.bI()) {\n+ if (this.G && !this.bM()) {\n this.bd = true;\n }\n \n@@ -134,12 +134,12 @@ protected void bh() {\n \n this.q.C.b();\n } else {\n- super.bh();\n+ super.bk();\n this.bp = null;\n }\n }\n \n- protected void bG() {\n+ protected void bK() {\n this.q.C.a(\"stroll\");\n boolean flag0 = false;\n int i0 = -1;\n@@ -175,35 +175,35 @@ public float a(int i0, int i1, int i2) {\n return 0.0F;\n }\n \n- protected Entity bH() {\n+ protected Entity bL() {\n return null;\n }\n \n- public boolean bo() {\n+ public boolean bs() {\n int i0 = MathHelper.c(this.u);\n int i1 = MathHelper.c(this.E.b);\n int i2 = MathHelper.c(this.w);\n \n- return super.bo() && this.a(i0, i1, i2) >= 0.0F;\n+ return super.bs() && this.a(i0, i1, i2) >= 0.0F;\n }\n \n- public boolean bI() {\n+ public boolean bM() {\n return this.bp != null;\n }\n \n public void a(PathEntity pathentity) {\n this.bp = pathentity;\n }\n \n- public Entity bJ() {\n+ public Entity bN() {\n return this.j;\n }\n \n public void b(Entity entity) {\n this.j = entity;\n }\n \n- public boolean bK() {\n+ public boolean bO() {\n return this.b(MathHelper.c(this.u), MathHelper.c(this.v), MathHelper.c(this.w));\n }\n \n@@ -216,33 +216,33 @@ public void b(int i0, int i1, int i2, int i3) {\n this.br = (float) i3;\n }\n \n- public ChunkCoordinates bL() {\n+ public ChunkCoordinates bP() {\n return this.bq;\n }\n \n- public float bM() {\n+ public float bQ() {\n return this.br;\n }\n \n- public void bN() {\n+ public void bR() {\n this.br = -1.0F;\n }\n \n- public boolean bO() {\n+ public boolean bS() {\n return this.br != -1.0F;\n }\n \n- protected void bB() {\n- super.bB();\n- if (this.bD() && this.bE() != null && this.bE().q == this.q) {\n- Entity entity = this.bE();\n+ protected void bF() {\n+ super.bF();\n+ if (this.bH() && this.bI() != null && this.bI().q == this.q) {\n+ Entity entity = this.bI();\n \n this.b((int) entity.u, (int) entity.v, (int) entity.w, 5);\n float f0 = this.d(entity);\n \n- if (this instanceof EntityTameable && ((EntityTameable) this).bQ()) {\n+ if (this instanceof EntityTameable && ((EntityTameable) this).bU()) {\n if (f0 > 10.0F) {\n- this.i(true);\n+ this.a(true, true);\n }\n \n return;\n@@ -254,6 +254,7 @@ protected void bB() {\n this.bt = true;\n }\n \n+ this.o(f0);\n if (f0 > 4.0F) {\n this.k().a(entity, 1.0D);\n }\n@@ -269,13 +270,15 @@ protected void bB() {\n }\n \n if (f0 > 10.0F) {\n- this.i(true);\n+ this.a(true, true);\n }\n- } else if (!this.bD() && this.bt) {\n+ } else if (!this.bH() && this.bt) {\n this.bt = false;\n this.c.a(this.bs);\n this.k().a(true);\n- this.bN();\n+ this.bR();\n }\n }\n+\n+ protected void o(float f0) {}\n }", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityCreature.java", "sha": "67e482a46d55fde8833cbd96fe0c13d1c077961d", "status": "modified" }, { "additions": 12, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityCreeper.java", "changes": 24, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityCreeper.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 12, "filename": "src/main/java/net/minecraft/server/EntityCreeper.java", "new_code": " protected void ay() {\n super.ay();\n public boolean be() {\n public int ar() {\n return this.m() == null ? 3 : 3 + (int) (this.aM() - 1.0F);\n if (this.S()) {\n int i0 = this.bV();\n if (this.bT()) {\n protected String aN() {\n protected String aO() {\n public boolean bT() {\n public int bV() {", "new_methods": [], "old_code": " protected void ax() {\n super.ax();\n public boolean bb() {\n public int aq() {\n return this.m() == null ? 3 : 3 + (int) (this.aJ() - 1.0F);\n if (this.R()) {\n int i0 = this.bR();\n if (this.bP()) {\n protected String aK() {\n protected String aL() {\n public boolean bP() {\n public int bR() {", "old_methods": [], "patch": "@@ -23,17 +23,17 @@ public EntityCreeper(World world) {\n this.entity = new CanaryCreeper(this); // CanaryMod: Wrap Entity\n }\n \n- protected void ax() {\n- super.ax();\n+ protected void ay() {\n+ super.ay();\n this.a(SharedMonsterAttributes.d).a(0.25D);\n }\n \n- public boolean bb() {\n+ public boolean be() {\n return true;\n }\n \n- public int aq() {\n- return this.m() == null ? 3 : 3 + (int) (this.aJ() - 1.0F);\n+ public int ar() {\n+ return this.m() == null ? 3 : 3 + (int) (this.aM() - 1.0F);\n }\n \n protected void b(float f0) {\n@@ -73,9 +73,9 @@ public void a(NBTTagCompound nbttagcompound) {\n }\n \n public void l_() {\n- if (this.R()) {\n+ if (this.S()) {\n this.bp = this.bq;\n- int i0 = this.bR();\n+ int i0 = this.bV();\n \n if (i0 > 0 && this.bq == 0) {\n this.a(\"random.fuse\", 1.0F, 0.5F);\n@@ -91,7 +91,7 @@ public void l_() {\n if (!this.q.I) {\n boolean flag0 = this.q.O().b(\"mobGriefing\");\n \n- if (this.bP()) {\n+ if (this.bT()) {\n this.q.a(this, this.u, this.v, this.w, (float) (this.bs * 2), flag0);\n } else {\n this.q.a(this, this.u, this.v, this.w, (float) this.bs, flag0);\n@@ -105,11 +105,11 @@ public void l_() {\n super.l_();\n }\n \n- protected String aK() {\n+ protected String aN() {\n return \"mob.creeper.say\";\n }\n \n- protected String aL() {\n+ protected String aO() {\n return \"mob.creeper.death\";\n }\n \n@@ -126,15 +126,15 @@ public boolean m(Entity entity) {\n return true;\n }\n \n- public boolean bP() {\n+ public boolean bT() {\n return this.ah.a(17) == 1;\n }\n \n protected int s() {\n return Item.O.cv;\n }\n \n- public int bR() {\n+ public int bV() {\n return this.ah.a(16);\n }\n ", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityCreeper.java", "sha": "f031de7d46e9ab20484cae8ce47a4dc2be5ded7e", "status": "modified" }, { "additions": 16, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityDragon.java", "changes": 32, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityDragon.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 16, "filename": "src/main/java/net/minecraft/server/EntityDragon.java", "new_code": " this.g(this.aS());\n protected void ay() {\n super.ay();\n if (this.aM() <= 0.0F) {\n if (this.aM() <= 0.0F) {\n this.bJ();\n this.bK();\n private void bJ() {\n } else if (this.ac % 10 == 0 && this.aM() < this.aS()) {\n this.g(this.aM() + 1.0F);\n private void bK() {\n protected void aA() {\n protected void bo() {}\n public Entity[] an() {\n protected String aN() {\n protected float aZ() {", "new_methods": [ { "arguments": [], "filename": "src/main/java/net/minecraft/server/EntityDragon.java", "implementation": "super.ay();\n if (this.aM() <= 0.0F) {\n if (this.aM() <= 0.0F) {\n this.bJ();\n this.bK();\n private void bJ() {", "signature": "void ay()" }, { "arguments": [], "filename": "src/main/java/net/minecraft/server/EntityDragon.java", "implementation": "protected void aA() {\n protected void bo() {", "signature": "void bK()" } ], "old_code": " this.g(this.aP());\n protected void ax() {\n super.ax();\n if (this.aJ() <= 0.0F) {\n if (this.aJ() <= 0.0F) {\n this.bF();\n this.bG();\n private void bF() {\n } else if (this.ac % 10 == 0 && this.aJ() < this.aP()) {\n this.g(this.aJ() + 1.0F);\n private void bG() {\n protected void az() {\n protected void bk() {}\n public Entity[] am() {\n protected String aK() {\n protected float aW() {", "old_methods": [ { "arguments": [], "filename": "src/main/java/net/minecraft/server/EntityDragon.java", "implementation": "super.ax();\n if (this.aJ() <= 0.0F) {\n if (this.aJ() <= 0.0F) {\n this.bF();\n this.bG();\n private void bF() {", "signature": "void ax()" }, { "arguments": [], "filename": "src/main/java/net/minecraft/server/EntityDragon.java", "implementation": "protected void az() {\n protected void bk() {", "signature": "void bG()" } ], "patch": "@@ -31,7 +31,7 @@ public EntityDragon(World world) {\n super(world);\n this.bp = new EntityDragonPart[]{ this.bq = new EntityDragonPart(this, \"head\", 6.0F, 6.0F), this.br = new EntityDragonPart(this, \"body\", 8.0F, 8.0F), this.bs = new EntityDragonPart(this, \"tail\", 4.0F, 4.0F), this.bt = new EntityDragonPart(this, \"tail\", 4.0F, 4.0F), this.bu = new EntityDragonPart(this, \"tail\", 4.0F, 4.0F),\n this.bv = new EntityDragonPart(this, \"wing\", 4.0F, 4.0F), this.bw = new EntityDragonPart(this, \"wing\", 4.0F, 4.0F) };\n- this.g(this.aP());\n+ this.g(this.aS());\n this.a(16.0F, 8.0F);\n this.Z = true;\n this.ag = true;\n@@ -40,8 +40,8 @@ public EntityDragon(World world) {\n this.entity = new CanaryEnderDragon(this); // CanaryMod: Wrap Entity\n }\n \n- protected void ax() {\n- super.ax();\n+ protected void ay() {\n+ super.ay();\n this.a(SharedMonsterAttributes.a).a(200.0D);\n }\n \n@@ -50,7 +50,7 @@ protected void a() {\n }\n \n public double[] b(int i0, float f0) {\n- if (this.aJ() <= 0.0F) {\n+ if (this.aM() <= 0.0F) {\n f0 = 0.0F;\n }\n \n@@ -84,13 +84,13 @@ public void c() {\n this.bx = this.by;\n float f2;\n \n- if (this.aJ() <= 0.0F) {\n+ if (this.aM() <= 0.0F) {\n f0 = (this.ab.nextFloat() - 0.5F) * 8.0F;\n f1 = (this.ab.nextFloat() - 0.5F) * 4.0F;\n f2 = (this.ab.nextFloat() - 0.5F) * 8.0F;\n this.q.a(\"largeexplode\", this.u + (double) f0, this.v + 2.0D + (double) f1, this.w + (double) f2, 0.0D, 0.0D, 0.0D);\n } else {\n- this.bF();\n+ this.bJ();\n f0 = 0.2F / (MathHelper.a(this.x * this.x + this.z * this.z) * 10.0F + 1.0F);\n f0 *= (float) Math.pow(2.0D, this.y);\n if (this.bA) {\n@@ -155,7 +155,7 @@ public void c() {\n }\n \n if (this.bz || d3 < 100.0D || d3 > 22500.0D || this.G || this.H) {\n- this.bG();\n+ this.bK();\n }\n \n d1 /= (double) MathHelper.a(d0 * d0 + d2 * d2);\n@@ -289,16 +289,16 @@ public void c() {\n }\n }\n \n- private void bF() {\n+ private void bJ() {\n if (this.bC != null) {\n if (this.bC.M) {\n if (!this.q.I) {\n this.a(this.bq, DamageSource.a((Explosion) null), 10.0F);\n }\n \n this.bC = null;\n- } else if (this.ac % 10 == 0 && this.aJ() < this.aP()) {\n- this.g(this.aJ() + 1.0F);\n+ } else if (this.ac % 10 == 0 && this.aM() < this.aS()) {\n+ this.g(this.aM() + 1.0F);\n }\n }\n \n@@ -351,7 +351,7 @@ private void b(List list) {\n }\n }\n \n- private void bG() {\n+ private void bK() {\n this.bz = false;\n if (this.ab.nextInt(2) == 0 && !this.q.h.isEmpty()) {\n this.bD = (Entity) this.q.h.get(this.ab.nextInt(this.q.h.size()));\n@@ -445,7 +445,7 @@ protected boolean e(DamageSource damagesource, float f0) {\n return super.a(damagesource, f0);\n }\n \n- protected void az() {\n+ protected void aA() {\n ++this.bB;\n if (this.bB >= 180 && this.bB <= 200) {\n float f0 = (this.ab.nextFloat() - 0.5F) * 8.0F;\n@@ -532,9 +532,9 @@ private void c(int i0, int i1) {\n BlockEndPortal.a = false;\n }\n \n- protected void bk() {}\n+ protected void bo() {}\n \n- public Entity[] am() {\n+ public Entity[] an() {\n return this.bp;\n }\n \n@@ -550,11 +550,11 @@ protected String r() {\n return \"mob.enderdragon.growl\";\n }\n \n- protected String aK() {\n+ protected String aN() {\n return \"mob.enderdragon.hit\";\n }\n \n- protected float aW() {\n+ protected float aZ() {\n return 5.0F;\n }\n }", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityDragon.java", "sha": "a1cb601944b6465e80b07592b07f945598dfa7fa", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityEgg.java", "changes": 2, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityEgg.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 1, "filename": "src/main/java/net/minecraft/server/EntityEgg.java", "new_code": " movingobjectposition.g.a(DamageSource.a((Entity) this, this.h()), 0.0F);", "new_methods": [], "old_code": " movingobjectposition.g.a(DamageSource.a((Entity) this, this.h()), 0);", "old_methods": [], "patch": "@@ -25,7 +25,7 @@ protected void a(MovingObjectPosition movingobjectposition) {\n ProjectileHitHook hook = (ProjectileHitHook) new ProjectileHitHook(this.getCanaryEntity(), movingobjectposition == null || movingobjectposition.g == null ? null : movingobjectposition.g.getCanaryEntity()).call();\n if (!hook.isCanceled()) { //\n if (movingobjectposition.g != null) {\n- movingobjectposition.g.a(DamageSource.a((Entity) this, this.h()), 0);\n+ movingobjectposition.g.a(DamageSource.a((Entity) this, this.h()), 0.0F);\n }\n \n if (!this.q.I && this.ab.nextInt(8) == 0) {", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityEgg.java", "sha": "66b53dcb9d208db98879910b1c027e13891f38fc", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityEnderCrystal.java", "changes": 2, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityEnderCrystal.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 1, "filename": "src/main/java/net/minecraft/server/EntityEnderCrystal.java", "new_code": " if (this.aq()) {", "new_methods": [], "old_code": " if (this.ap()) {", "old_methods": [], "patch": "@@ -49,7 +49,7 @@ public boolean K() {\n }\n \n public boolean a(DamageSource damagesource, float f0) {\n- if (this.ap()) {\n+ if (this.aq()) {\n return false;\n } else {\n if (!this.M && !this.q.I) {", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityEnderCrystal.java", "sha": "a52ffbaf4c9de4734ba4ec9028d8bdadf683c595", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityEnderEye.java", "changes": 2, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityEnderEye.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 1, "filename": "src/main/java/net/minecraft/server/EntityEnderEye.java", "new_code": " public boolean ap() {", "new_methods": [], "old_code": " public boolean ao() {", "old_methods": [], "patch": "@@ -129,7 +129,7 @@ public float d(float f0) {\n return 1.0F;\n }\n \n- public boolean ao() {\n+ public boolean ap() {\n return false;\n }\n }", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityEnderEye.java", "sha": "ece94c136959733906d79ede93ce9615b00bba68", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityEnderPearl.java", "changes": 4, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityEnderPearl.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 3, "filename": "src/main/java/net/minecraft/server/EntityEnderPearl.java", "new_code": " if (this.h().af()) {", "new_methods": [], "old_code": "\n\n if (this.h().ae()) {", "old_methods": [], "patch": "@@ -1,9 +1,7 @@\n package net.minecraft.server;\n \n-\n import net.canarymod.api.entity.throwable.CanaryEnderPearl;\n \n-\n public class EntityEnderPearl extends EntityThrowable {\n \n public EntityEnderPearl(World world) {\n@@ -30,7 +28,7 @@ protected void a(MovingObjectPosition movingobjectposition) {\n EntityPlayerMP entityplayermp = (EntityPlayerMP) this.h();\n \n if (!entityplayermp.a.b && entityplayermp.q == this.q) {\n- if (this.h().ae()) {\n+ if (this.h().af()) {\n this.h().a((Entity) null);\n }\n ", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityEnderPearl.java", "sha": "35a896a334755ff7f2ebbd4ee97cd20f6a743963", "status": "modified" }, { "additions": 40, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityEnderman.java", "changes": 80, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityEnderman.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 40, "filename": "src/main/java/net/minecraft/server/EntityEnderman.java", "new_code": " // private static boolean[] br = new boolean[256]; //CanaryMod: disabled\n protected void ay() {\n super.ay();\n nbttagcompound.a(\"carried\", (short) this.bV());\n nbttagcompound.a(\"carriedData\", (short) this.bW());\n protected Entity bL() {\n if (this.bV() == 0) {\n this.q.f(i0, i1, i2, this.bV(), this.bW(), 3);\n this.bT();\n if (this.F() || this.ae()) {\n this.bT();\n if (this.bX() && !this.bv && this.ab.nextInt(100) == 0) {\n if (!this.q.I && this.S()) {\n this.bT();\n public boolean bT() { // CanaryMod: protected -> public\n return this.bX() ? \"mob.endermen.scream\" : \"mob.endermen.idle\";\n protected String aN() {\n protected String aO() {\n public int bV() {\n public int bW() {\n if (this.aq()) {\n if (this.bT()) {\n public boolean bX() {\n /* CanaryMod: Disable all default allowed pick ups\n static {\n // br[Block.z.cF] = true;\n // br[Block.A.cF] = true;\n // br[Block.J.cF] = true;\n // br[Block.K.cF] = true;\n // br[Block.ai.cF] = true;\n // br[Block.aj.cF] = true;\n // br[Block.ak.cF] = true;\n // br[Block.al.cF] = true;\n // br[Block.ar.cF] = true;\n // br[Block.ba.cF] = true;\n // br[Block.bb.cF] = true;\n // br[Block.bf.cF] = true;\n // br[Block.bw.cF] = true;\n // br[Block.bD.cF] = true;\n } */", "new_methods": [ { "arguments": [], "filename": "src/main/java/net/minecraft/server/EntityEnderman.java", "implementation": "super.ay();\n nbttagcompound.a(\"carried\", (short) this.bV());\n nbttagcompound.a(\"carriedData\", (short) this.bW());\n protected Entity bL() {\n if (this.bV() == 0) {\n this.q.f(i0, i1, i2, this.bV(), this.bW(), 3);\n this.bT();\n if (this.F() || this.ae()) {\n this.bT();\n if (this.bX() && !this.bv && this.ab.nextInt(100) == 0) {\n if (!this.q.I && this.S()) {\n this.bT();\n public boolean bT() { // CanaryMod: protected -> public\n return this.bX() ? \"mob.endermen.scream\" : \"mob.endermen.idle\";\n protected String aN() {\n protected String aO() {\n public int bV() {\n public int bW() {\n if (this.aq()) {\n if (this.bT()) {\n public boolean bX() {\n /* CanaryMod: Disable all default allowed pick ups\n static {\n // br[Block.z.cF] = true;\n // br[Block.A.cF] = true;\n // br[Block.J.cF] = true;\n // br[Block.K.cF] = true;\n // br[Block.ai.cF] = true;\n // br[Block.aj.cF] = true;\n // br[Block.ak.cF] = true;\n // br[Block.al.cF] = true;\n // br[Block.ar.cF] = true;\n // br[Block.ba.cF] = true;\n // br[Block.bb.cF] = true;\n // br[Block.bf.cF] = true;\n // br[Block.bw.cF] = true;\n // br[Block.bD.cF] = true;", "signature": "void ay()" } ], "old_code": " private static boolean[] br = new boolean[256];\n protected void ax() {\n super.ax();\n nbttagcompound.a(\"carried\", (short) this.bR());\n nbttagcompound.a(\"carriedData\", (short) this.bS());\n protected Entity bH() {\n if (this.bR() == 0) {\n this.q.f(i0, i1, i2, this.bR(), this.bS(), 3);\n this.bP();\n if (this.F() || this.ad()) {\n this.bP();\n if (this.bT() && !this.bv && this.ab.nextInt(100) == 0) {\n if (!this.q.I && this.R()) {\n this.bP();\n public boolean bP() { // CanaryMod: protected -> public\n return this.bT() ? \"mob.endermen.scream\" : \"mob.endermen.idle\";\n protected String aK() {\n protected String aL() {\n public int bR() {\n public int bS() {\n if (this.ap()) {\n if (this.bP()) {\n public boolean bT() {\n static {\n // CanaryMod: Disable all default allowed pick ups\n // br[Block.z.cF] = true;\n // br[Block.A.cF] = true;\n // br[Block.J.cF] = true;\n // br[Block.K.cF] = true;\n // br[Block.ai.cF] = true;\n // br[Block.aj.cF] = true;\n // br[Block.ak.cF] = true;\n // br[Block.al.cF] = true;\n // br[Block.ar.cF] = true;\n // br[Block.ba.cF] = true;\n // br[Block.bb.cF] = true;\n // br[Block.bf.cF] = true;\n // br[Block.bw.cF] = true;\n // br[Block.bD.cF] = true;\n }", "old_methods": [ { "arguments": [], "filename": "src/main/java/net/minecraft/server/EntityEnderman.java", "implementation": "super.ax();\n nbttagcompound.a(\"carried\", (short) this.bR());\n nbttagcompound.a(\"carriedData\", (short) this.bS());\n protected Entity bH() {\n if (this.bR() == 0) {\n this.q.f(i0, i1, i2, this.bR(), this.bS(), 3);\n this.bP();\n if (this.F() || this.ad()) {\n this.bP();\n if (this.bT() && !this.bv && this.ab.nextInt(100) == 0) {\n if (!this.q.I && this.R()) {\n this.bP();\n public boolean bP() { // CanaryMod: protected -> public\n return this.bT() ? \"mob.endermen.scream\" : \"mob.endermen.idle\";\n protected String aK() {\n protected String aL() {\n public int bR() {\n public int bS() {\n if (this.ap()) {\n if (this.bP()) {\n public boolean bT() {\n static {\n // CanaryMod: Disable all default allowed pick ups\n // br[Block.z.cF] = true;\n // br[Block.A.cF] = true;\n // br[Block.J.cF] = true;\n // br[Block.K.cF] = true;\n // br[Block.ai.cF] = true;\n // br[Block.aj.cF] = true;\n // br[Block.ak.cF] = true;\n // br[Block.al.cF] = true;\n // br[Block.ar.cF] = true;\n // br[Block.ba.cF] = true;\n // br[Block.bb.cF] = true;\n // br[Block.bf.cF] = true;\n // br[Block.bw.cF] = true;\n // br[Block.bD.cF] = true;", "signature": "void ax()" } ], "patch": "@@ -12,7 +12,7 @@ public class EntityEnderman extends EntityMob {\n \n private static final UUID bp = UUID.fromString(\"020E0DFB-87AE-4653-9556-831010E291A0\");\n private static final AttributeModifier bq = (new AttributeModifier(bp, \"Attacking speed boost\", 6.199999809265137D, 0)).a(false);\n- private static boolean[] br = new boolean[256];\n+ // private static boolean[] br = new boolean[256]; //CanaryMod: disabled\n private int bs;\n private int bt;\n private Entity bu;\n@@ -25,8 +25,8 @@ public EntityEnderman(World world) {\n this.entity = new CanaryEnderman(this); // CanaryMod: Wrap Entity\n }\n \n- protected void ax() {\n- super.ax();\n+ protected void ay() {\n+ super.ay();\n this.a(SharedMonsterAttributes.a).a(40.0D);\n this.a(SharedMonsterAttributes.d).a(0.30000001192092896D);\n this.a(SharedMonsterAttributes.e).a(7.0D);\n@@ -41,8 +41,8 @@ protected void a() {\n \n public void b(NBTTagCompound nbttagcompound) {\n super.b(nbttagcompound);\n- nbttagcompound.a(\"carried\", (short) this.bR());\n- nbttagcompound.a(\"carriedData\", (short) this.bS());\n+ nbttagcompound.a(\"carried\", (short) this.bV());\n+ nbttagcompound.a(\"carriedData\", (short) this.bW());\n }\n \n public void a(NBTTagCompound nbttagcompound) {\n@@ -51,7 +51,7 @@ public void a(NBTTagCompound nbttagcompound) {\n this.c(nbttagcompound.d(\"carriedData\"));\n }\n \n- protected Entity bH() {\n+ protected Entity bL() {\n EntityPlayer entityplayer = this.q.b(this, 64.0D);\n \n if (entityplayer != null) {\n@@ -113,7 +113,7 @@ public void c() {\n int i2;\n int i3;\n \n- if (this.bR() == 0) {\n+ if (this.bV() == 0) {\n if (this.ab.nextInt(20) == 0) {\n i0 = MathHelper.c(this.u - 2.0D + this.ab.nextDouble() * 4.0D);\n i1 = MathHelper.c(this.v + this.ab.nextDouble() * 3.0D);\n@@ -144,7 +144,7 @@ public void c() {\n \n Canary.hooks().callHook(hook);\n if (!hook.isCanceled()) {\n- this.q.f(i0, i1, i2, this.bR(), this.bS(), 3);\n+ this.q.f(i0, i1, i2, this.bV(), this.bW(), 3);\n this.a(0);\n }\n //\n@@ -163,18 +163,18 @@ public void c() {\n this.j = null;\n this.a(false);\n this.bv = false;\n- this.bP();\n+ this.bT();\n }\n }\n \n- if (this.F() || this.ad()) {\n+ if (this.F() || this.ae()) {\n this.j = null;\n this.a(false);\n this.bv = false;\n- this.bP();\n+ this.bT();\n }\n \n- if (this.bT() && !this.bv && this.ab.nextInt(100) == 0) {\n+ if (this.bX() && !this.bv && this.ab.nextInt(100) == 0) {\n this.a(false);\n }\n \n@@ -183,11 +183,11 @@ public void c() {\n this.a(this.j, 100.0F, 100.0F);\n }\n \n- if (!this.q.I && this.R()) {\n+ if (!this.q.I && this.S()) {\n if (this.j != null) {\n if (this.j instanceof EntityPlayer && this.f((EntityPlayer) this.j)) {\n if (this.j.e((Entity) this) < 16.0D) {\n- this.bP();\n+ this.bT();\n }\n \n this.bs = 0;\n@@ -203,7 +203,7 @@ public void c() {\n super.c();\n }\n \n- public boolean bP() { // CanaryMod: protected -> public\n+ public boolean bT() { // CanaryMod: protected -> public\n double d0 = this.u + (this.ab.nextDouble() - 0.5D) * 64.0D;\n double d1 = this.v + (double) (this.ab.nextInt(64) - 32);\n double d2 = this.w + (this.ab.nextDouble() - 0.5D) * 64.0D;\n@@ -283,14 +283,14 @@ protected boolean j(double d0, double d1, double d2) {\n }\n \n protected String r() {\n- return this.bT() ? \"mob.endermen.scream\" : \"mob.endermen.idle\";\n+ return this.bX() ? \"mob.endermen.scream\" : \"mob.endermen.idle\";\n }\n \n- protected String aK() {\n+ protected String aN() {\n return \"mob.endermen.hit\";\n }\n \n- protected String aL() {\n+ protected String aO() {\n return \"mob.endermen.death\";\n }\n \n@@ -314,20 +314,20 @@ public void a(int i0) {\n this.ah.b(16, Byte.valueOf((byte) (i0 & 255)));\n }\n \n- public int bR() {\n+ public int bV() {\n return this.ah.a(16);\n }\n \n public void c(int i0) {\n this.ah.b(17, Byte.valueOf((byte) (i0 & 255)));\n }\n \n- public int bS() {\n+ public int bW() {\n return this.ah.a(17);\n }\n \n public boolean a(DamageSource damagesource, float f0) {\n- if (this.ap()) {\n+ if (this.aq()) {\n return false;\n } else {\n this.a(true);\n@@ -339,7 +339,7 @@ public boolean a(DamageSource damagesource, float f0) {\n this.bv = false;\n \n for (int i0 = 0; i0 < 64; ++i0) {\n- if (this.bP()) {\n+ if (this.bT()) {\n return true;\n }\n }\n@@ -351,29 +351,29 @@ public boolean a(DamageSource damagesource, float f0) {\n }\n }\n \n- public boolean bT() {\n+ public boolean bX() {\n return this.ah.a(18) > 0;\n }\n \n public void a(boolean flag0) {\n this.ah.b(18, Byte.valueOf((byte) (flag0 ? 1 : 0)));\n }\n \n- static {\n- // CanaryMod: Disable all default allowed pick ups\n- // br[Block.z.cF] = true;\n- // br[Block.A.cF] = true;\n- // br[Block.J.cF] = true;\n- // br[Block.K.cF] = true;\n- // br[Block.ai.cF] = true;\n- // br[Block.aj.cF] = true;\n- // br[Block.ak.cF] = true;\n- // br[Block.al.cF] = true;\n- // br[Block.ar.cF] = true;\n- // br[Block.ba.cF] = true;\n- // br[Block.bb.cF] = true;\n- // br[Block.bf.cF] = true;\n- // br[Block.bw.cF] = true;\n- // br[Block.bD.cF] = true;\n- }\n+ /* CanaryMod: Disable all default allowed pick ups\n+ static {\n+ // br[Block.z.cF] = true;\n+ // br[Block.A.cF] = true;\n+ // br[Block.J.cF] = true;\n+ // br[Block.K.cF] = true;\n+ // br[Block.ai.cF] = true;\n+ // br[Block.aj.cF] = true;\n+ // br[Block.ak.cF] = true;\n+ // br[Block.al.cF] = true;\n+ // br[Block.ar.cF] = true;\n+ // br[Block.ba.cF] = true;\n+ // br[Block.bb.cF] = true;\n+ // br[Block.bf.cF] = true;\n+ // br[Block.bw.cF] = true;\n+ // br[Block.bD.cF] = true;\n+ } */\n }", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityEnderman.java", "sha": "f23e1b4e2a8c0278008a1d2afe8f65ad4be8cde3", "status": "modified" }, { "additions": 0, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityExpBottle.java", "changes": 2, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityExpBottle.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 2, "filename": "src/main/java/net/minecraft/server/EntityExpBottle.java", "new_code": "", "new_methods": [], "old_code": "\n", "old_methods": [], "patch": "@@ -1,9 +1,7 @@\n package net.minecraft.server;\n \n-\n import net.canarymod.api.entity.throwable.CanaryXPBottle;\n \n-\n public class EntityExpBottle extends EntityThrowable {\n \n public EntityExpBottle(World world) {", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityExpBottle.java", "sha": "688219fa05d9e6cd39cafb310786abe2a20591ad", "status": "modified" }, { "additions": 3, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityFireball.java", "changes": 6, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityFireball.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 3, "filename": "src/main/java/net/minecraft/server/EntityFireball.java", "new_code": " public float Y() {\n if (this.aq()) {\n Vec3 vec3 = damagesource.i().Z();", "new_methods": [], "old_code": " public float X() {\n if (this.ap()) {\n Vec3 vec3 = damagesource.i().Y();", "old_methods": [], "patch": "@@ -212,17 +212,17 @@ public boolean K() {\n return true;\n }\n \n- public float X() {\n+ public float Y() {\n return 1.0F;\n }\n \n public boolean a(DamageSource damagesource, float f0) {\n- if (this.ap()) {\n+ if (this.aq()) {\n return false;\n } else {\n this.J();\n if (damagesource.i() != null) {\n- Vec3 vec3 = damagesource.i().Y();\n+ Vec3 vec3 = damagesource.i().Z();\n \n if (vec3 != null) {\n this.x = vec3.c;", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityFireball.java", "sha": "3c08a0298fb65892713dcd09aeee6f3954223c2b", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityFireworkRocket.java", "changes": 2, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityFireworkRocket.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 1, "filename": "src/main/java/net/minecraft/server/EntityFireworkRocket.java", "new_code": " public boolean ap() {", "new_methods": [], "old_code": " public boolean ao() {", "old_methods": [], "patch": "@@ -126,7 +126,7 @@ public float d(float f0) {\n return super.d(f0);\n }\n \n- public boolean ao() {\n+ public boolean ap() {\n return false;\n }\n ", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityFireworkRocket.java", "sha": "2a3a160997b896343f748d3876a992a02d1ad862", "status": "modified" }, { "additions": 11, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityGhast.java", "changes": 22, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityGhast.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 11, "filename": "src/main/java/net/minecraft/server/EntityGhast.java", "new_code": " if (this.aq()) {\n protected void ay() {\n super.ay();\n protected void bk() {\n this.bo();\n protected String aN() {\n protected String aO() {\n protected float aZ() {\n public boolean bs() {\n return this.ab.nextInt(20) == 0 && super.bs() && this.q.r > 0;\n public int bv() {", "new_methods": [], "old_code": " if (this.ap()) {\n protected void ax() {\n super.ax();\n protected void bh() {\n this.bk();\n protected String aK() {\n protected String aL() {\n protected float aW() {\n public boolean bo() {\n return this.ab.nextInt(20) == 0 && super.bo() && this.q.r > 0;\n public int br() {", "old_methods": [], "patch": "@@ -24,7 +24,7 @@ public EntityGhast(World world) {\n }\n \n public boolean a(DamageSource damagesource, float f0) {\n- if (this.ap()) {\n+ if (this.aq()) {\n return false;\n } else if (\"fireball\".equals(damagesource.n()) && damagesource.i() instanceof EntityPlayer) {\n super.a(damagesource, 1000.0F);\n@@ -40,17 +40,17 @@ protected void a() {\n this.ah.a(16, Byte.valueOf((byte) 0));\n }\n \n- protected void ax() {\n- super.ax();\n+ protected void ay() {\n+ super.ay();\n this.a(SharedMonsterAttributes.a).a(10.0D);\n }\n \n- protected void bh() {\n+ protected void bk() {\n if (!this.q.I && this.q.r == 0) {\n this.w();\n }\n \n- this.bk();\n+ this.bo();\n this.bo = this.bp;\n double d0 = this.i - this.u;\n double d1 = this.j - this.v;\n@@ -165,11 +165,11 @@ protected String r() {\n return \"mob.ghast.moan\";\n }\n \n- protected String aK() {\n+ protected String aN() {\n return \"mob.ghast.scream\";\n }\n \n- protected String aL() {\n+ protected String aO() {\n return \"mob.ghast.death\";\n }\n \n@@ -193,15 +193,15 @@ protected void b(boolean flag0, int i0) {\n }\n }\n \n- protected float aW() {\n+ protected float aZ() {\n return 10.0F;\n }\n \n- public boolean bo() {\n- return this.ab.nextInt(20) == 0 && super.bo() && this.q.r > 0;\n+ public boolean bs() {\n+ return this.ab.nextInt(20) == 0 && super.bs() && this.q.r > 0;\n }\n \n- public int br() {\n+ public int bv() {\n return 1;\n }\n ", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityGhast.java", "sha": "8e3002036d4dc6890decc1f85721722f91e99a12", "status": "modified" }, { "additions": 2, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityGiantZombie.java", "changes": 4, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityGiantZombie.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 2, "filename": "src/main/java/net/minecraft/server/EntityGiantZombie.java", "new_code": " protected void ay() {\n super.ay();", "new_methods": [], "old_code": " protected void ax() {\n super.ax();", "old_methods": [], "patch": "@@ -11,8 +11,8 @@ public EntityGiantZombie(World world) {\n this.entity = new CanaryGiantZombie(this); // CanaryMod: Wrap Entity\n }\n \n- protected void ax() {\n- super.ax();\n+ protected void ay() {\n+ super.ay();\n this.a(SharedMonsterAttributes.a).a(100.0D);\n this.a(SharedMonsterAttributes.d).a(0.5D);\n this.a(SharedMonsterAttributes.e).a(50.0D);", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityGiantZombie.java", "sha": "b275cd88e27f1179a1a3134e516587ad1d1b68b1", "status": "modified" }, { "additions": 5, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityHanging.java", "changes": 8, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityHanging.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 3, "filename": "src/main/java/net/minecraft/server/EntityHanging.java", "new_code": " if (this.aq()) {\n protected boolean O() {\n return false;\n }\n", "new_methods": [ { "arguments": [], "filename": "src/main/java/net/minecraft/server/EntityHanging.java", "implementation": "return false;", "signature": "boolean O()" } ], "old_code": " this.e = 0;\n this.a = 0;\n if (this.ap()) {", "old_methods": [], "patch": "@@ -15,8 +15,6 @@ public abstract class EntityHanging extends Entity {\n \n public EntityHanging(World world) {\n super(world);\n- this.e = 0;\n- this.a = 0;\n this.N = 0.0F;\n this.a(0.5F, 0.5F);\n }\n@@ -179,7 +177,7 @@ public boolean i(Entity entity) {\n }\n \n public boolean a(DamageSource damagesource, float f0) {\n- if (this.ap()) {\n+ if (this.aq()) {\n return false;\n } else {\n if (!this.M && !this.q.I) {\n@@ -278,6 +276,10 @@ public void a(NBTTagCompound nbttagcompound) {\n \n public abstract void b(Entity entity);\n \n+ protected boolean O() {\n+ return false;\n+ }\n+\n // CanaryMod\n public int getTickCounter() {\n return this.e;", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityHanging.java", "sha": "0eea27efda191c4a0705307645326c9c58517b25", "status": "modified" }, { "additions": 224, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityHorse.java", "changes": 444, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityHorse.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 220, "filename": "src/main/java/net/minecraft/server/EntityHorse.java", "new_code": " this.l(false);\n this.cH();\n this.cJ();\n public int bT() {\n this.cJ();\n public int bU() {\n public String am() {\n if (this.bB()) {\n return this.bA();\n int i0 = this.bT();\n public boolean bV() {\n public boolean bW() {\n public boolean ca() {\n return this.bV();\n }\n\n public String cb() {\n return this.ah.e(21);\n public float cc() {\n this.a(this.cc());\n public boolean cd() {\n public void i(boolean flag0) {\n public void j(boolean flag0) {\n public boolean bG() {\n return !this.cy() && super.bG();\n protected void o(float f0) {\n if (f0 > 6.0F && this.cg()) {\n this.o(false);\n }\n }\n\n public boolean ce() {\n public int cf() {\n public boolean cg() {\n public boolean ch() {\n public boolean ci() {\n public boolean cj() {\n this.cJ();\n public void k(boolean flag0) {\n public void l(boolean flag0) {\n public void m(boolean flag0) {\n public void n(boolean flag0) {\n public int ck() {\n int i1 = MathHelper.a(this.ck() + i0, 0, this.cq());\n return this.n != null && this.n.equals(entity) ? false : super.a(damagesource, f0);\n public int aP() {\n return by[this.cf()];\n public boolean cl() {\n public void cm() {\n if (!this.q.I && this.ce()) {\n this.l(false);\n private void cF() {\n this.cM();\n private int cG() {\n int i0 = this.bT();\n return this.ce() && (i0 == 1 || i0 == 2) ? 17 : 2;\n private void cH() {\n this.bG = new AnimalChest(\"HorseChest\", this.cG());\n this.bG.a(this.am());\n this.cI();\n private void cI() {\n this.n(this.bG.a(0) != null);\n if (this.cv()) {\n int i0 = this.cf();\n boolean flag0 = this.co();\n this.cI();\n if (i0 == 0 && i0 != this.cf()) {\n if (!flag0 && this.co()) {\n public boolean bs() {\n this.cl();\n return super.bs();\n public double cn() {\n protected String aO() {\n this.cM();\n int i0 = this.bT();\n int i0 = this.bT();\n protected String aN() {\n this.cM();\n this.cO();\n int i0 = this.bT();\n public boolean co() {\n this.cM();\n if (this.ab.nextInt(10) == 0 && !this.bb()) {\n this.cO();\n int i0 = this.bT();\n protected String cp() {\n this.cM();\n this.cO();\n int i0 = this.bT();\n int i4 = this.bT();\n protected void ay() {\n super.ay();\n this.aW().b(bv);\n public int bv() {\n public int cq() {\n protected float aZ() {\n private void cJ() {\n if (!this.q.I && (this.n == null || this.n == entityplayer) && this.bW()) {\n this.bG.a(this.am());\n } else if (!this.bW() && this.cy()) {\n } else if (this.bW() && this.bV() && entityplayer.ag()) {\n } else if (this.ca() && this.n != null) {\n if (this.cv()) {\n if (!this.bW()) {\n this.cD();\n if (!flag0 && !this.cy()) {\n if (this.bW() && this.b() == 0) {\n this.bX();\n if (this.bW() && this.b() == 0) {\n this.bX();\n if (this.aM() < this.aS() && f0 > 0.0F) {\n if (!this.bV() && short1 > 0) {\n if (b1 > 0 && (flag0 || !this.bW()) && b1 < this.cq()) {\n this.cF();\n if (!this.bW() && !flag0) {\n this.cD();\n if (!flag0 && this.cw() && !this.ce() && itemstack.d == Block.az.cF) {\n this.l(true);\n this.cH();\n if (!flag0 && this.ca() && !this.co() && itemstack.d == Item.aC.cv) {\n if (this.ca() && this.n == null) {\n this.o(false);\n public boolean cv() {\n return this.bT() == 0;\n public boolean cw() {\n int i0 = this.bT();\n protected boolean bb() {\n return this.n != null && this.co() ? true : this.cg() || this.ch();\n public boolean cy() {\n int i0 = this.bT();\n public boolean cz() {\n return this.cy() || this.bT() == 2;\n private void cL() {\n this.cE();\n this.cL();\n if (!this.cg() && this.n == null && this.ab.nextInt(300) == 0 && this.q.a(MathHelper.c(this.u), MathHelper.c(this.v) - 1, MathHelper.c(this.w)) == Block.z.cF) {\n this.o(true);\n if (this.cg() && ++this.bD > 50) {\n this.o(false);\n if (this.ci() && !this.bV() && !this.cg()) {\n this.cJ();\n this.p(false);\n if (this.cg()) {\n if (this.ch()) {\n private void cM() {\n private boolean cN() {\n return this.n == null && this.o == null && this.bW() && this.bV() && !this.cz() && this.aM() >= this.aS();\n public void o(boolean flag0) {\n public void p(boolean flag0) {\n this.o(false);\n private void cO() {\n this.p(true);\n public void cD() {\n this.cO();\n String s0 = this.cp();\n this.a(s0, this.aZ(), this.ba());\n public void cE() {\n this.cm();\n this.i(true);\n if (this.n != null && this.co()) {\n if (this.F && this.bt == 0.0F && this.ch() && !this.bI) {\n if (this.bt > 0.0F && !this.cd() && this.F) {\n this.y = this.cn() * (double) this.bt;\n this.j(true);\n this.aR = this.bf() * 0.1F;\n this.j(false);\n nbttagcompound.a(\"EatingHaystack\", this.cg());\n nbttagcompound.a(\"ChestedHorse\", this.ce());\n nbttagcompound.a(\"HasReproduced\", this.cj());\n nbttagcompound.a(\"Bred\", this.ci());\n nbttagcompound.a(\"Type\", this.bT());\n nbttagcompound.a(\"Variant\", this.bU());\n nbttagcompound.a(\"Temper\", this.ck());\n nbttagcompound.a(\"Tame\", this.bW());\n nbttagcompound.a(\"OwnerName\", this.cb());\n if (this.ce()) {\n this.o(nbttagcompound.n(\"EatingHaystack\"));\n this.k(nbttagcompound.n(\"Bred\"));\n this.l(nbttagcompound.n(\"ChestedHorse\"));\n this.m(nbttagcompound.n(\"HasReproduced\"));\n this.i(nbttagcompound.n(\"Tame\"));\n if (nbttagcompound.b(\"OwnerName\")) {\n this.b(nbttagcompound.i(\"OwnerName\"));\n }\n\n AttributeInstance attributeinstance = this.aW().a(\"Speed\");\n if (this.ce()) {\n this.cH();\n this.cI();\n if (this.cN() && entityhorse.cN()) {\n int i0 = this.bT();\n int i1 = entityhorse.bT();\n int i0 = this.bT();\n int i1 = entityhorse.bT();\n i4 = this.bU() & 255;\n i4 = entityhorse.bU() & 255;\n i4 |= this.bU() & '\\uff00';\n i4 |= entityhorse.bU() & '\\uff00';\n double d0 = this.a(SharedMonsterAttributes.a).b() + entityageable.a(SharedMonsterAttributes.a).b() + (double) this.cP();\n double d1 = this.a(bv).b() + entityageable.a(bv).b() + this.cQ();\n double d2 = this.a(SharedMonsterAttributes.d).b() + entityageable.a(SharedMonsterAttributes.d).b() + this.cR();\n this.a(SharedMonsterAttributes.a).a((double) this.cP());\n this.a(SharedMonsterAttributes.d).a(this.cR());\n this.a(bv).a(this.cQ());\n this.g(this.aS());\n protected boolean be() {\n if (this.co()) {\n if (i0 < 0) {\n i0 = 0;\n } else {\n this.bI = true;\n this.cO();\n }\n if (i0 >= 90) {\n this.bt = 1.0F;\n } else {\n this.bt = 0.4F + 0.4F * (float) i0 / 90.0F;\n }\n public void V() {\n super.V();\n this.n.b(this.u + (double) (f2 * f0), this.v + this.X() + this.n.W() + (double) f3, this.w - (double) (f2 * f1));\n private float cP() {\n private double cQ() {\n private double cR() {", "new_methods": [ { "arguments": [], "filename": "src/main/java/net/minecraft/server/EntityHorse.java", "implementation": "this.cJ();\n public int bU() {\n public String am() {\n if (this.bB()) {\n return this.bA();\n int i0 = this.bT();\n public boolean bV() {\n public boolean bW() {\n public boolean ca() {\n return this.bV();", "signature": "int bT()" }, { "arguments": [], "filename": "src/main/java/net/minecraft/server/EntityHorse.java", "implementation": "return this.ah.e(21);\n public float cc() {\n this.a(this.cc());\n public boolean cd() {\n public void i(boolean flag0) {\n public void j(boolean flag0) {\n public boolean bG() {\n return !this.cy() && super.bG();\n protected void o(float f0) {\n if (f0 > 6.0F && this.cg()) {\n this.o(false);", "signature": "String cb()" }, { "arguments": [], "filename": "src/main/java/net/minecraft/server/EntityHorse.java", "implementation": "public int cf() {\n public boolean cg() {\n public boolean ch() {\n public boolean ci() {\n public boolean cj() {\n this.cJ();\n public void k(boolean flag0) {\n public void l(boolean flag0) {\n public void m(boolean flag0) {\n public void n(boolean flag0) {\n public int ck() {\n int i1 = MathHelper.a(this.ck() + i0, 0, this.cq());\n return this.n != null && this.n.equals(entity) ? false : super.a(damagesource, f0);\n public int aP() {\n return by[this.cf()];\n public boolean cl() {\n public void cm() {\n if (!this.q.I && this.ce()) {\n this.l(false);\n private void cF() {\n this.cM();\n private int cG() {\n int i0 = this.bT();\n return this.ce() && (i0 == 1 || i0 == 2) ? 17 : 2;\n private void cH() {\n this.bG = new AnimalChest(\"HorseChest\", this.cG());\n this.bG.a(this.am());\n this.cI();\n private void cI() {\n this.n(this.bG.a(0) != null);\n if (this.cv()) {\n int i0 = this.cf();\n boolean flag0 = this.co();\n this.cI();\n if (i0 == 0 && i0 != this.cf()) {\n if (!flag0 && this.co()) {\n public boolean bs() {\n this.cl();\n return super.bs();\n public double cn() {\n protected String aO() {\n this.cM();\n int i0 = this.bT();\n int i0 = this.bT();\n protected String aN() {\n this.cM();\n this.cO();\n int i0 = this.bT();\n public boolean co() {\n this.cM();\n if (this.ab.nextInt(10) == 0 && !this.bb()) {\n this.cO();\n int i0 = this.bT();\n protected String cp() {\n this.cM();\n this.cO();\n int i0 = this.bT();\n int i4 = this.bT();\n protected void ay() {\n super.ay();\n this.aW().b(bv);\n public int bv() {\n public int cq() {\n protected float aZ() {\n private void cJ() {\n if (!this.q.I && (this.n == null || this.n == entityplayer) && this.bW()) {\n this.bG.a(this.am());", "signature": "boolean ce()" }, { "arguments": [], "filename": "src/main/java/net/minecraft/server/EntityHorse.java", "implementation": "return this.bT() == 0;\n public boolean cw() {\n int i0 = this.bT();\n protected boolean bb() {\n return this.n != null && this.co() ? true : this.cg() || this.ch();\n public boolean cy() {\n int i0 = this.bT();\n public boolean cz() {\n return this.cy() || this.bT() == 2;\n private void cL() {\n this.cE();\n this.cL();\n if (!this.cg() && this.n == null && this.ab.nextInt(300) == 0 && this.q.a(MathHelper.c(this.u), MathHelper.c(this.v) - 1, MathHelper.c(this.w)) == Block.z.cF) {\n this.o(true);\n if (this.cg() && ++this.bD > 50) {\n this.o(false);\n if (this.ci() && !this.bV() && !this.cg()) {\n this.cJ();\n this.p(false);\n if (this.cg()) {\n if (this.ch()) {\n private void cM() {\n private boolean cN() {\n return this.n == null && this.o == null && this.bW() && this.bV() && !this.cz() && this.aM() >= this.aS();\n public void o(boolean flag0) {\n public void p(boolean flag0) {\n this.o(false);\n private void cO() {\n this.p(true);\n public void cD() {\n this.cO();\n String s0 = this.cp();\n this.a(s0, this.aZ(), this.ba());\n public void cE() {\n this.cm();\n this.i(true);\n if (this.n != null && this.co()) {\n if (this.F && this.bt == 0.0F && this.ch() && !this.bI) {\n if (this.bt > 0.0F && !this.cd() && this.F) {\n this.y = this.cn() * (double) this.bt;\n this.j(true);\n this.aR = this.bf() * 0.1F;\n this.j(false);\n nbttagcompound.a(\"EatingHaystack\", this.cg());\n nbttagcompound.a(\"ChestedHorse\", this.ce());\n nbttagcompound.a(\"HasReproduced\", this.cj());\n nbttagcompound.a(\"Bred\", this.ci());\n nbttagcompound.a(\"Type\", this.bT());\n nbttagcompound.a(\"Variant\", this.bU());\n nbttagcompound.a(\"Temper\", this.ck());\n nbttagcompound.a(\"Tame\", this.bW());\n nbttagcompound.a(\"OwnerName\", this.cb());\n if (this.ce()) {\n this.o(nbttagcompound.n(\"EatingHaystack\"));\n this.k(nbttagcompound.n(\"Bred\"));\n this.l(nbttagcompound.n(\"ChestedHorse\"));\n this.m(nbttagcompound.n(\"HasReproduced\"));\n this.i(nbttagcompound.n(\"Tame\"));\n if (nbttagcompound.b(\"OwnerName\")) {\n this.b(nbttagcompound.i(\"OwnerName\"));", "signature": "boolean cv()" }, { "arguments": [], "filename": "src/main/java/net/minecraft/server/EntityHorse.java", "implementation": "if (this.co()) {\n if (i0 < 0) {\n i0 = 0;", "signature": "boolean be()" } ], "old_code": " this.m(false);\n this.cD();\n this.cF();\n public int bP() {\n this.cF();\n public int bQ() {\n public String al() {\n if (this.bx()) {\n return this.bw();\n int i0 = this.bP();\n public boolean bR() {\n public boolean bS() {\n public boolean bW() {\n return this.bR();\n public float bY() {\n this.a(this.bY());\n public boolean bZ() {\n public void j(boolean flag0) {\n public void k(boolean flag0) {\n public boolean bC() {\n return !this.cu() && super.bC();\n public boolean ca() {\n public int cb() {\n public boolean cc() {\n public boolean cd() {\n public boolean ce() {\n public boolean cf() {\n this.cF();\n public void l(boolean flag0) {\n public void m(boolean flag0) {\n public void n(boolean flag0) {\n public void o(boolean flag0) {\n public int cg() {\n int i1 = MathHelper.a(this.cg() + i0, 0, this.cm());\n if (this.n != null && this.n.equals(entity)) {\n return false;\n } else if (entity instanceof EntityWolf) {\n ((EntityWolf) entity).b((Entity) null);\n return false;\n } else {\n return super.a(damagesource, f0);\n }\n public int aM() {\n return by[this.cb()];\n public boolean ch() {\n public void ci() {\n if (!this.q.I && this.ca()) {\n this.m(false);\n private void cB() {\n this.cI();\n private int cC() {\n int i0 = this.bP();\n return this.ca() && (i0 == 1 || i0 == 2) ? 17 : 2;\n private void cD() {\n this.bG = new AnimalChest(\"HorseChest\", this.cC());\n this.bG.a(this.al());\n this.cE();\n private void cE() {\n this.o(this.bG.a(0) != null);\n if (this.cr()) {\n int i0 = this.cb();\n boolean flag0 = this.ck();\n this.cE();\n if (i0 == 0 && i0 != this.cb()) {\n if (!flag0 && this.ck()) {\n public boolean bo() {\n this.ch();\n return super.bo();\n public double cj() {\n protected String aL() {\n this.cI();\n int i0 = this.bP();\n int i0 = this.bP();\n protected String aK() {\n this.cI();\n this.cK();\n int i0 = this.bP();\n public boolean ck() {\n this.cI();\n if (this.ab.nextInt(10) == 0 && !this.aY()) {\n this.cK();\n int i0 = this.bP();\n protected String cl() {\n this.cI();\n this.cK();\n int i0 = this.bP();\n int i4 = this.bP();\n protected void ax() {\n super.ax();\n this.aT().b(bv);\n public int br() {\n public int cm() {\n protected float aW() {\n private void cF() {\n if (!this.q.I && (this.n == null || this.n == entityplayer) && this.bS()) {\n this.bG.a(this.al());\n } else if (!this.bS() && this.cu()) {\n } else if (this.bS() && this.bR() && entityplayer.af()) {\n } else if (this.bW() && this.n != null) {\n if (this.cr()) {\n if (!this.bS()) {\n this.cz();\n if (!flag0 && !this.cu()) {\n if (this.bS() && this.b() == 0) {\n this.bT();\n if (this.bS() && this.b() == 0) {\n this.bT();\n if (this.aJ() < this.aP() && f0 > 0.0F) {\n if (!this.bR() && short1 > 0) {\n if (b1 > 0 && (flag0 || !this.bS()) && b1 < this.cm()) {\n this.cB();\n if (!this.bS() && !flag0) {\n this.cz();\n if (!flag0 && this.cs() && !this.ca() && itemstack.d == Block.az.cF) {\n this.m(true);\n this.cD();\n if (!flag0 && this.bW() && !this.ck() && itemstack.d == Item.aC.cv) {\n if (this.bW() && this.n == null) {\n this.q(false);\n public boolean cr() {\n return this.bP() == 0;\n public boolean cs() {\n int i0 = this.bP();\n protected boolean aY() {\n return this.n != null && this.ck() ? true : this.cc() || this.cd();\n public boolean cu() {\n int i0 = this.bP();\n public boolean cv() {\n return this.cu() || this.bP() == 2;\n private void cH() {\n this.cA();\n this.cH();\n if (!this.cc() && this.n == null && this.ab.nextInt(300) == 0 && this.q.a(MathHelper.c(this.u), MathHelper.c(this.v) - 1, MathHelper.c(this.w)) == Block.z.cF) {\n this.p(true);\n if (this.cc() && ++this.bD > 50) {\n this.p(false);\n if (this.ce() && !this.bR() && !this.cc()) {\n this.cF();\n this.q(false);\n if (this.cc()) {\n if (this.cd()) {\n private void cI() {\n private boolean cJ() {\n return this.n == null && this.o == null && this.bS() && this.bR() && !this.cv() && this.aJ() >= this.aP();\n }\n\n public void w() {\n if (this.q.I || !this.bS() && !this.ce() || this.aJ() <= 0.0F) {\n super.w();\n }\n public void p(boolean flag0) {\n public void q(boolean flag0) {\n this.p(false);\n private void cK() {\n this.q(true);\n public void cz() {\n this.cK();\n String s0 = this.cl();\n this.a(s0, this.aW(), this.aX());\n public void cA() {\n this.ci();\n this.j(true);\n if (this.n != null && this.ck()) {\n if (this.F && this.bt == 0.0F && this.cd() && !this.bI) {\n if (this.bt > 0.0F && !this.bZ() && this.F) {\n this.y = this.cj() * (double) this.bt;\n this.k(true);\n this.aR = this.bc() * 0.1F;\n this.k(false);\n nbttagcompound.a(\"EatingHaystack\", this.cc());\n nbttagcompound.a(\"ChestedHorse\", this.ca());\n nbttagcompound.a(\"HasReproduced\", this.cf());\n nbttagcompound.a(\"Bred\", this.ce());\n nbttagcompound.a(\"Type\", this.bP());\n nbttagcompound.a(\"Variant\", this.bQ());\n nbttagcompound.a(\"Temper\", this.cg());\n nbttagcompound.a(\"Tame\", this.bS());\n if (this.ca()) {\n this.p(nbttagcompound.n(\"EatingHaystack\"));\n this.l(nbttagcompound.n(\"Bred\"));\n this.m(nbttagcompound.n(\"ChestedHorse\"));\n this.n(nbttagcompound.n(\"HasReproduced\"));\n this.j(nbttagcompound.n(\"Tame\"));\n AttributeInstance attributeinstance = this.aT().a(\"Speed\");\n if (this.ca()) {\n this.cD();\n this.cE();\n if (this.cJ() && entityhorse.cJ()) {\n int i0 = this.bP();\n int i1 = entityhorse.bP();\n int i0 = this.bP();\n int i1 = entityhorse.bP();\n i4 = this.bQ() & 255;\n i4 = entityhorse.bQ() & 255;\n i4 |= this.bQ() & '\\uff00';\n i4 |= entityhorse.bQ() & '\\uff00';\n double d0 = this.a(SharedMonsterAttributes.a).b() + entityageable.a(SharedMonsterAttributes.a).b() + (double) this.cL();\n double d1 = this.a(bv).b() + entityageable.a(bv).b() + this.cM();\n double d2 = this.a(SharedMonsterAttributes.d).b() + entityageable.a(SharedMonsterAttributes.d).b() + this.cN();\n this.a(SharedMonsterAttributes.a).a((double) this.cL());\n this.a(SharedMonsterAttributes.d).a(this.cN());\n this.a(bv).a(this.cM());\n this.g(this.aP());\n protected boolean bb() {\n if (i0 < 0) {\n i0 = 0;\n } else {\n this.bI = true;\n this.cK();\n }\n if (i0 >= 90) {\n this.bt = 1.0F;\n } else {\n this.bt = 0.4F + 0.4F * (float) i0 / 90.0F;\n public void U() {\n super.U();\n this.n.b(this.u + (double) (f2 * f0), this.v + this.W() + this.n.V() + (double) f3, this.w - (double) (f2 * f1));\n private float cL() {\n private double cM() {\n private double cN() {", "old_methods": [ { "arguments": [], "filename": "src/main/java/net/minecraft/server/EntityHorse.java", "implementation": "this.cF();\n public int bQ() {\n public String al() {\n if (this.bx()) {\n return this.bw();\n int i0 = this.bP();\n public boolean bR() {\n public boolean bS() {\n public boolean bW() {\n return this.bR();\n public float bY() {\n this.a(this.bY());\n public boolean bZ() {\n public void j(boolean flag0) {\n public void k(boolean flag0) {\n public boolean bC() {\n return !this.cu() && super.bC();\n public boolean ca() {\n public int cb() {\n public boolean cc() {\n public boolean cd() {\n public boolean ce() {\n public boolean cf() {\n this.cF();\n public void l(boolean flag0) {\n public void m(boolean flag0) {\n public void n(boolean flag0) {\n public void o(boolean flag0) {\n public int cg() {\n int i1 = MathHelper.a(this.cg() + i0, 0, this.cm());\n if (this.n != null && this.n.equals(entity)) {\n return false;", "signature": "int bP()" }, { "arguments": [ "entity instanceof EntityWolf" ], "filename": "src/main/java/net/minecraft/server/EntityHorse.java", "implementation": "((EntityWolf) entity).b((Entity) null);\n return false;", "signature": "else if (entity instanceof EntityWolf)" }, { "arguments": [], "filename": "src/main/java/net/minecraft/server/EntityHorse.java", "implementation": "return by[this.cb()];\n public boolean ch() {\n public void ci() {\n if (!this.q.I && this.ca()) {\n this.m(false);\n private void cB() {\n this.cI();\n private int cC() {\n int i0 = this.bP();\n return this.ca() && (i0 == 1 || i0 == 2) ? 17 : 2;\n private void cD() {\n this.bG = new AnimalChest(\"HorseChest\", this.cC());\n this.bG.a(this.al());\n this.cE();\n private void cE() {\n this.o(this.bG.a(0) != null);\n if (this.cr()) {\n int i0 = this.cb();\n boolean flag0 = this.ck();\n this.cE();\n if (i0 == 0 && i0 != this.cb()) {\n if (!flag0 && this.ck()) {\n public boolean bo() {\n this.ch();\n return super.bo();\n public double cj() {\n protected String aL() {\n this.cI();\n int i0 = this.bP();\n int i0 = this.bP();\n protected String aK() {\n this.cI();\n this.cK();\n int i0 = this.bP();\n public boolean ck() {\n this.cI();\n if (this.ab.nextInt(10) == 0 && !this.aY()) {\n this.cK();\n int i0 = this.bP();\n protected String cl() {\n this.cI();\n this.cK();\n int i0 = this.bP();\n int i4 = this.bP();\n protected void ax() {\n super.ax();\n this.aT().b(bv);\n public int br() {\n public int cm() {\n protected float aW() {\n private void cF() {\n if (!this.q.I && (this.n == null || this.n == entityplayer) && this.bS()) {\n this.bG.a(this.al());", "signature": "int aM()" }, { "arguments": [], "filename": "src/main/java/net/minecraft/server/EntityHorse.java", "implementation": "return this.bP() == 0;\n public boolean cs() {\n int i0 = this.bP();\n protected boolean aY() {\n return this.n != null && this.ck() ? true : this.cc() || this.cd();\n public boolean cu() {\n int i0 = this.bP();\n public boolean cv() {\n return this.cu() || this.bP() == 2;\n private void cH() {\n this.cA();\n this.cH();\n if (!this.cc() && this.n == null && this.ab.nextInt(300) == 0 && this.q.a(MathHelper.c(this.u), MathHelper.c(this.v) - 1, MathHelper.c(this.w)) == Block.z.cF) {\n this.p(true);\n if (this.cc() && ++this.bD > 50) {\n this.p(false);\n if (this.ce() && !this.bR() && !this.cc()) {\n this.cF();\n this.q(false);\n if (this.cc()) {\n if (this.cd()) {\n private void cI() {\n private boolean cJ() {\n return this.n == null && this.o == null && this.bS() && this.bR() && !this.cv() && this.aJ() >= this.aP();", "signature": "boolean cr()" }, { "arguments": [], "filename": "src/main/java/net/minecraft/server/EntityHorse.java", "implementation": "if (this.q.I || !this.bS() && !this.ce() || this.aJ() <= 0.0F) {\n super.w();", "signature": "void w()" }, { "arguments": [ "boolean flag0" ], "filename": "src/main/java/net/minecraft/server/EntityHorse.java", "implementation": "public void q(boolean flag0) {\n this.p(false);\n private void cK() {\n this.q(true);\n public void cz() {\n this.cK();\n String s0 = this.cl();\n this.a(s0, this.aW(), this.aX());\n public void cA() {\n this.ci();\n this.j(true);\n if (this.n != null && this.ck()) {\n if (this.F && this.bt == 0.0F && this.cd() && !this.bI) {\n if (this.bt > 0.0F && !this.bZ() && this.F) {\n this.y = this.cj() * (double) this.bt;\n this.k(true);\n this.aR = this.bc() * 0.1F;\n this.k(false);\n nbttagcompound.a(\"EatingHaystack\", this.cc());\n nbttagcompound.a(\"ChestedHorse\", this.ca());\n nbttagcompound.a(\"HasReproduced\", this.cf());\n nbttagcompound.a(\"Bred\", this.ce());\n nbttagcompound.a(\"Type\", this.bP());\n nbttagcompound.a(\"Variant\", this.bQ());\n nbttagcompound.a(\"Temper\", this.cg());\n nbttagcompound.a(\"Tame\", this.bS());\n if (this.ca()) {\n this.p(nbttagcompound.n(\"EatingHaystack\"));\n this.l(nbttagcompound.n(\"Bred\"));\n this.m(nbttagcompound.n(\"ChestedHorse\"));\n this.n(nbttagcompound.n(\"HasReproduced\"));\n this.j(nbttagcompound.n(\"Tame\"));\n AttributeInstance attributeinstance = this.aT().a(\"Speed\");\n if (this.ca()) {\n this.cD();\n this.cE();\n if (this.cJ() && entityhorse.cJ()) {\n int i0 = this.bP();\n int i1 = entityhorse.bP();\n int i0 = this.bP();\n int i1 = entityhorse.bP();\n i4 = this.bQ() & 255;\n i4 = entityhorse.bQ() & 255;\n i4 |= this.bQ() & '\\uff00';\n i4 |= entityhorse.bQ() & '\\uff00';\n double d0 = this.a(SharedMonsterAttributes.a).b() + entityageable.a(SharedMonsterAttributes.a).b() + (double) this.cL();\n double d1 = this.a(bv).b() + entityageable.a(bv).b() + this.cM();\n double d2 = this.a(SharedMonsterAttributes.d).b() + entityageable.a(SharedMonsterAttributes.d).b() + this.cN();\n this.a(SharedMonsterAttributes.a).a((double) this.cL());\n this.a(SharedMonsterAttributes.d).a(this.cN());\n this.a(bv).a(this.cM());\n this.g(this.aP());\n protected boolean bb() {\n if (i0 < 0) {\n i0 = 0;", "signature": "void p(boolean flag0)" } ], "patch": "@@ -40,7 +40,7 @@ public EntityHorse(World world) {\n super(world);\n this.a(1.4F, 1.6F);\n this.ag = false;\n- this.m(false);\n+ this.l(false);\n this.k().a(true);\n this.c.a(0, new EntityAISwimming(this));\n this.c.a(1, new EntityAIPanic(this, 1.2D));\n@@ -50,7 +50,7 @@ public EntityHorse(World world) {\n this.c.a(6, new EntityAIWander(this, 0.7D));\n this.c.a(7, new EntityAIWatchClosest(this, EntityPlayer.class, 6.0F));\n this.c.a(8, new EntityAILookIdle(this));\n- this.cD();\n+ this.cH();\n this.entity = new CanaryHorse(this); // CanaryMod: wrap entity\n }\n \n@@ -65,27 +65,27 @@ protected void a() {\n \n public void p(int i0) {\n this.ah.b(19, Byte.valueOf((byte) i0));\n- this.cF();\n+ this.cJ();\n }\n \n- public int bP() {\n+ public int bT() {\n return this.ah.a(19);\n }\n \n public void q(int i0) {\n this.ah.b(20, Integer.valueOf(i0));\n- this.cF();\n+ this.cJ();\n }\n \n- public int bQ() {\n+ public int bU() {\n return this.ah.c(20);\n }\n \n- public String al() {\n- if (this.bx()) {\n- return this.bw();\n+ public String am() {\n+ if (this.bB()) {\n+ return this.bA();\n } else {\n- int i0 = this.bP();\n+ int i0 = this.bT();\n \n switch (i0) {\n case 0:\n@@ -121,102 +121,112 @@ private void b(int i0, boolean flag0) {\n }\n }\n \n- public boolean bR() {\n+ public boolean bV() {\n return !this.g_();\n }\n \n- public boolean bS() {\n+ public boolean bW() {\n return this.w(2);\n }\n \n- public boolean bW() {\n- return this.bR();\n+ public boolean ca() {\n+ return this.bV();\n+ }\n+\n+ public String cb() {\n+ return this.ah.e(21);\n }\n \n public void b(String s0) {\n this.ah.b(21, s0);\n }\n \n- public float bY() {\n+ public float cc() {\n int i0 = this.b();\n \n return i0 >= 0 ? 1.0F : 0.5F + (float) (-24000 - i0) / -24000.0F * 0.5F;\n }\n \n public void a(boolean flag0) {\n if (flag0) {\n- this.a(this.bY());\n+ this.a(this.cc());\n } else {\n this.a(1.0F);\n }\n }\n \n- public boolean bZ() {\n+ public boolean cd() {\n return this.br;\n }\n \n- public void j(boolean flag0) {\n+ public void i(boolean flag0) {\n this.b(2, flag0);\n }\n \n- public void k(boolean flag0) {\n+ public void j(boolean flag0) {\n this.br = flag0;\n }\n \n- public boolean bC() {\n- return !this.cu() && super.bC();\n+ public boolean bG() {\n+ return !this.cy() && super.bG();\n }\n \n- public boolean ca() {\n+ protected void o(float f0) {\n+ if (f0 > 6.0F && this.cg()) {\n+ this.o(false);\n+ }\n+ }\n+\n+ public boolean ce() {\n return this.w(8);\n }\n \n- public int cb() {\n+ public int cf() {\n return this.ah.c(22);\n }\n \n public int d(ItemStack itemstack) {\n return itemstack == null ? 0 : (itemstack.d == Item.ce.cv ? 1 : (itemstack.d == Item.cf.cv ? 2 : (itemstack.d == Item.cg.cv ? 3 : 0)));\n }\n \n- public boolean cc() {\n+ public boolean cg() {\n return this.w(32);\n }\n \n- public boolean cd() {\n+ public boolean ch() {\n return this.w(64);\n }\n \n- public boolean ce() {\n+ public boolean ci() {\n return this.w(16);\n }\n \n- public boolean cf() {\n+ public boolean cj() {\n return this.bH;\n }\n \n public void r(int i0) {\n this.ah.b(22, Integer.valueOf(i0));\n- this.cF();\n+ this.cJ();\n }\n \n- public void l(boolean flag0) {\n+ public void k(boolean flag0) {\n this.b(16, flag0);\n }\n \n- public void m(boolean flag0) {\n+ public void l(boolean flag0) {\n this.b(8, flag0);\n }\n \n- public void n(boolean flag0) {\n+ public void m(boolean flag0) {\n this.bH = flag0;\n }\n \n- public void o(boolean flag0) {\n+ public void n(boolean flag0) {\n this.b(4, flag0);\n }\n \n- public int cg() {\n+ public int ck() {\n return this.bs;\n }\n \n@@ -225,7 +235,7 @@ public void s(int i0) {\n }\n \n public int t(int i0) {\n- int i1 = MathHelper.a(this.cg() + i0, 0, this.cm());\n+ int i1 = MathHelper.a(this.ck() + i0, 0, this.cq());\n \n this.s(i1);\n return i1;\n@@ -234,41 +244,34 @@ public int t(int i0) {\n public boolean a(DamageSource damagesource, float f0) {\n Entity entity = damagesource.i();\n \n- if (this.n != null && this.n.equals(entity)) {\n- return false;\n- } else if (entity instanceof EntityWolf) {\n- ((EntityWolf) entity).b((Entity) null);\n- return false;\n- } else {\n- return super.a(damagesource, f0);\n- }\n+ return this.n != null && this.n.equals(entity) ? false : super.a(damagesource, f0);\n }\n \n- public int aM() {\n- return by[this.cb()];\n+ public int aP() {\n+ return by[this.cf()];\n }\n \n public boolean L() {\n return this.n == null;\n }\n \n- public boolean ch() {\n+ public boolean cl() {\n int i0 = MathHelper.c(this.u);\n int i1 = MathHelper.c(this.w);\n \n this.q.a(i0, i1);\n return true;\n }\n \n- public void ci() {\n- if (!this.q.I && this.ca()) {\n+ public void cm() {\n+ if (!this.q.I && this.ce()) {\n this.b(Block.az.cF, 1);\n- this.m(false);\n+ this.l(false);\n }\n }\n \n- private void cB() {\n- this.cI();\n+ private void cF() {\n+ this.cM();\n this.q.a((Entity) this, \"eating\", 1.0F, 1.0F + (this.ab.nextFloat() - this.ab.nextFloat()) * 0.2F);\n }\n \n@@ -295,17 +298,17 @@ protected void b(float f0) {\n }\n }\n \n- private int cC() {\n- int i0 = this.bP();\n+ private int cG() {\n+ int i0 = this.bT();\n \n- return this.ca() && (i0 == 1 || i0 == 2) ? 17 : 2;\n+ return this.ce() && (i0 == 1 || i0 == 2) ? 17 : 2;\n }\n \n- private void cD() {\n+ private void cH() {\n AnimalChest animalchest = this.bG;\n \n- this.bG = new AnimalChest(\"HorseChest\", this.cC());\n- this.bG.a(this.al());\n+ this.bG = new AnimalChest(\"HorseChest\", this.cG());\n+ this.bG.a(this.am());\n if (animalchest != null) {\n animalchest.b(this);\n int i0 = Math.min(animalchest.j_(), this.bG.j_());\n@@ -322,37 +325,37 @@ private void cD() {\n }\n \n this.bG.a(this);\n- this.cE();\n+ this.cI();\n }\n \n- private void cE() {\n+ private void cI() {\n if (!this.q.I) {\n- this.o(this.bG.a(0) != null);\n- if (this.cr()) {\n+ this.n(this.bG.a(0) != null);\n+ if (this.cv()) {\n this.r(this.d(this.bG.a(1)));\n }\n }\n }\n \n public void a(InventoryBasic inventorybasic) {\n- int i0 = this.cb();\n- boolean flag0 = this.ck();\n+ int i0 = this.cf();\n+ boolean flag0 = this.co();\n \n- this.cE();\n+ this.cI();\n if (this.ac > 20) {\n- if (i0 == 0 && i0 != this.cb()) {\n+ if (i0 == 0 && i0 != this.cf()) {\n this.a(\"mob.horse.armor\", 0.5F, 1.0F);\n }\n \n- if (!flag0 && this.ck()) {\n+ if (!flag0 && this.co()) {\n this.a(\"mob.horse.leather\", 0.5F, 1.0F);\n }\n }\n }\n \n- public boolean bo() {\n- this.ch();\n- return super.bo();\n+ public boolean bs() {\n+ this.cl();\n+ return super.bs();\n }\n \n protected EntityHorse a(Entity entity, double d0) {\n@@ -374,54 +377,54 @@ protected EntityHorse a(Entity entity, double d0) {\n return (EntityHorse) entity1;\n }\n \n- public double cj() {\n+ public double cn() {\n return this.a(bv).e();\n }\n \n- protected String aL() {\n- this.cI();\n- int i0 = this.bP();\n+ protected String aO() {\n+ this.cM();\n+ int i0 = this.bT();\n \n return i0 == 3 ? \"mob.horse.zombie.death\" : (i0 == 4 ? \"mob.horse.skeleton.death\" : (i0 != 1 && i0 != 2 ? \"mob.horse.death\" : \"mob.horse.donkey.death\"));\n }\n \n protected int s() {\n boolean flag0 = this.ab.nextInt(4) == 0;\n- int i0 = this.bP();\n+ int i0 = this.bT();\n \n return i0 == 4 ? Item.aZ.cv : (i0 == 3 ? (flag0 ? 0 : Item.bo.cv) : Item.aH.cv);\n }\n \n- protected String aK() {\n- this.cI();\n+ protected String aN() {\n+ this.cM();\n if (this.ab.nextInt(3) == 0) {\n- this.cK();\n+ this.cO();\n }\n \n- int i0 = this.bP();\n+ int i0 = this.bT();\n \n return i0 == 3 ? \"mob.horse.zombie.hit\" : (i0 == 4 ? \"mob.horse.skeleton.hit\" : (i0 != 1 && i0 != 2 ? \"mob.horse.hit\" : \"mob.horse.donkey.hit\"));\n }\n \n- public boolean ck() {\n+ public boolean co() {\n return this.w(4);\n }\n \n protected String r() {\n- this.cI();\n- if (this.ab.nextInt(10) == 0 && !this.aY()) {\n- this.cK();\n+ this.cM();\n+ if (this.ab.nextInt(10) == 0 && !this.bb()) {\n+ this.cO();\n }\n \n- int i0 = this.bP();\n+ int i0 = this.bT();\n \n return i0 == 3 ? \"mob.horse.zombie.idle\" : (i0 == 4 ? \"mob.horse.skeleton.idle\" : (i0 != 1 && i0 != 2 ? \"mob.horse.idle\" : \"mob.horse.donkey.idle\"));\n }\n \n- protected String cl() {\n- this.cI();\n- this.cK();\n- int i0 = this.bP();\n+ protected String cp() {\n+ this.cM();\n+ this.cO();\n+ int i0 = this.bT();\n \n return i0 != 3 && i0 != 4 ? (i0 != 1 && i0 != 2 ? \"mob.horse.angry\" : \"mob.horse.donkey.angry\") : null;\n }\n@@ -434,7 +437,7 @@ protected void a(int i0, int i1, int i2, int i3) {\n }\n \n if (!Block.s[i3].cU.d()) {\n- int i4 = this.bP();\n+ int i4 = this.bT();\n \n if (this.n != null && i4 != 1 && i4 != 2) {\n ++this.bP;\n@@ -454,36 +457,36 @@ protected void a(int i0, int i1, int i2, int i3) {\n }\n }\n \n- protected void ax() {\n- super.ax();\n- this.aT().b(bv);\n+ protected void ay() {\n+ super.ay();\n+ this.aW().b(bv);\n this.a(SharedMonsterAttributes.a).a(53.0D);\n this.a(SharedMonsterAttributes.d).a(0.22499999403953552D);\n }\n \n- public int br() {\n+ public int bv() {\n return 6;\n }\n \n- public int cm() {\n+ public int cq() {\n return 100;\n }\n \n- protected float aW() {\n+ protected float aZ() {\n return 0.8F;\n }\n \n public int o() {\n return 400;\n }\n \n- private void cF() {\n+ private void cJ() {\n this.bQ = null;\n }\n \n public void f(EntityPlayer entityplayer) {\n- if (!this.q.I && (this.n == null || this.n == entityplayer) && this.bS()) {\n- this.bG.a(this.al());\n+ if (!this.q.I && (this.n == null || this.n == entityplayer) && this.bW()) {\n+ this.bG.a(this.am());\n entityplayer.a(this, (IInventory) this.bG);\n }\n }\n@@ -493,18 +496,18 @@ public boolean a(EntityPlayer entityplayer) {\n \n if (itemstack != null && itemstack.d == Item.bE.cv) {\n return super.a(entityplayer);\n- } else if (!this.bS() && this.cu()) {\n+ } else if (!this.bW() && this.cy()) {\n return false;\n- } else if (this.bS() && this.bR() && entityplayer.af()) {\n+ } else if (this.bW() && this.bV() && entityplayer.ag()) {\n this.f(entityplayer);\n return true;\n- } else if (this.bW() && this.n != null) {\n+ } else if (this.ca() && this.n != null) {\n return super.a(entityplayer);\n } else {\n if (itemstack != null) {\n boolean flag0 = false;\n \n- if (this.cr()) {\n+ if (this.cv()) {\n byte b0 = -1;\n \n if (itemstack.d == Item.ce.cv) {\n@@ -516,8 +519,8 @@ public boolean a(EntityPlayer entityplayer) {\n }\n \n if (b0 >= 0) {\n- if (!this.bS()) {\n- this.cz();\n+ if (!this.bW()) {\n+ this.cD();\n return true;\n }\n \n@@ -526,7 +529,7 @@ public boolean a(EntityPlayer entityplayer) {\n }\n }\n \n- if (!flag0 && !this.cu()) {\n+ if (!flag0 && !this.cy()) {\n float f0 = 0.0F;\n short short1 = 0;\n byte b1 = 0;\n@@ -554,57 +557,57 @@ public boolean a(EntityPlayer entityplayer) {\n f0 = 4.0F;\n short1 = 60;\n b1 = 5;\n- if (this.bS() && this.b() == 0) {\n+ if (this.bW() && this.b() == 0) {\n flag0 = true;\n- this.bT();\n+ this.bX();\n }\n } else if (itemstack.d == Item.av.cv) {\n f0 = 10.0F;\n short1 = 240;\n b1 = 10;\n- if (this.bS() && this.b() == 0) {\n+ if (this.bW() && this.b() == 0) {\n flag0 = true;\n- this.bT();\n+ this.bX();\n }\n }\n \n- if (this.aJ() < this.aP() && f0 > 0.0F) {\n+ if (this.aM() < this.aS() && f0 > 0.0F) {\n this.f(f0);\n flag0 = true;\n }\n \n- if (!this.bR() && short1 > 0) {\n+ if (!this.bV() && short1 > 0) {\n this.a(short1);\n flag0 = true;\n }\n \n- if (b1 > 0 && (flag0 || !this.bS()) && b1 < this.cm()) {\n+ if (b1 > 0 && (flag0 || !this.bW()) && b1 < this.cq()) {\n flag0 = true;\n this.t(b1);\n }\n \n if (flag0) {\n- this.cB();\n+ this.cF();\n }\n }\n \n- if (!this.bS() && !flag0) {\n+ if (!this.bW() && !flag0) {\n if (itemstack != null && itemstack.a(entityplayer, (EntityLivingBase) this)) {\n return true;\n }\n \n- this.cz();\n+ this.cD();\n return true;\n }\n \n- if (!flag0 && this.cs() && !this.ca() && itemstack.d == Block.az.cF) {\n- this.m(true);\n+ if (!flag0 && this.cw() && !this.ce() && itemstack.d == Block.az.cF) {\n+ this.l(true);\n this.a(\"mob.chickenplop\", 1.0F, (this.ab.nextFloat() - this.ab.nextFloat()) * 0.2F + 1.0F);\n flag0 = true;\n- this.cD();\n+ this.cH();\n }\n \n- if (!flag0 && this.bW() && !this.ck() && itemstack.d == Item.aC.cv) {\n+ if (!flag0 && this.ca() && !this.co() && itemstack.d == Item.aC.cv) {\n this.f(entityplayer);\n return true;\n }\n@@ -618,7 +621,7 @@ public boolean a(EntityPlayer entityplayer) {\n }\n }\n \n- if (this.bW() && this.n == null) {\n+ if (this.ca() && this.n == null) {\n if (itemstack != null && itemstack.a(entityplayer, (EntityLivingBase) this)) {\n return true;\n } else {\n@@ -634,55 +637,55 @@ public boolean a(EntityPlayer entityplayer) {\n private void h(EntityPlayer entityplayer) {\n entityplayer.A = this.A;\n entityplayer.B = this.B;\n+ this.o(false);\n this.p(false);\n- this.q(false);\n if (!this.q.I) {\n entityplayer.a((Entity) this);\n }\n }\n \n- public boolean cr() {\n- return this.bP() == 0;\n+ public boolean cv() {\n+ return this.bT() == 0;\n }\n \n- public boolean cs() {\n- int i0 = this.bP();\n+ public boolean cw() {\n+ int i0 = this.bT();\n \n return i0 == 2 || i0 == 1;\n }\n \n- protected boolean aY() {\n- return this.n != null && this.ck() ? true : this.cc() || this.cd();\n+ protected boolean bb() {\n+ return this.n != null && this.co() ? true : this.cg() || this.ch();\n }\n \n- public boolean cu() {\n- int i0 = this.bP();\n+ public boolean cy() {\n+ int i0 = this.bT();\n \n return i0 == 3 || i0 == 4;\n }\n \n- public boolean cv() {\n- return this.cu() || this.bP() == 2;\n+ public boolean cz() {\n+ return this.cy() || this.bT() == 2;\n }\n \n public boolean c(ItemStack itemstack) {\n return false;\n }\n \n- private void cH() {\n+ private void cL() {\n this.bp = 1;\n }\n \n public void a(DamageSource damagesource) {\n super.a(damagesource);\n if (!this.q.I) {\n- this.cA();\n+ this.cE();\n }\n }\n \n public void c() {\n if (this.ab.nextInt(200) == 0) {\n- this.cH();\n+ this.cL();\n }\n \n super.c();\n@@ -691,16 +694,16 @@ public void c() {\n this.f(1.0F);\n }\n \n- if (!this.cc() && this.n == null && this.ab.nextInt(300) == 0 && this.q.a(MathHelper.c(this.u), MathHelper.c(this.v) - 1, MathHelper.c(this.w)) == Block.z.cF) {\n- this.p(true);\n+ if (!this.cg() && this.n == null && this.ab.nextInt(300) == 0 && this.q.a(MathHelper.c(this.u), MathHelper.c(this.v) - 1, MathHelper.c(this.w)) == Block.z.cF) {\n+ this.o(true);\n }\n \n- if (this.cc() && ++this.bD > 50) {\n+ if (this.cg() && ++this.bD > 50) {\n this.bD = 0;\n- this.p(false);\n+ this.o(false);\n }\n \n- if (this.ce() && !this.bR() && !this.cc()) {\n+ if (this.ci() && !this.bV() && !this.cg()) {\n EntityHorse entityhorse = this.a(this, 16.0D);\n \n if (entityhorse != null && this.e(entityhorse) > 4.0D) {\n@@ -716,7 +719,7 @@ public void l_() {\n super.l_();\n if (this.q.I && this.ah.a()) {\n this.ah.e();\n- this.cF();\n+ this.cJ();\n }\n \n if (this.bE > 0 && ++this.bE > 30) {\n@@ -726,7 +729,7 @@ public void l_() {\n \n if (!this.q.I && this.bF > 0 && ++this.bF > 20) {\n this.bF = 0;\n- this.q(false);\n+ this.p(false);\n }\n \n if (this.bp > 0 && ++this.bp > 8) {\n@@ -741,7 +744,7 @@ public void l_() {\n }\n \n this.bK = this.bJ;\n- if (this.cc()) {\n+ if (this.cg()) {\n this.bJ += (1.0F - this.bJ) * 0.4F + 0.05F;\n if (this.bJ > 1.0F) {\n this.bJ = 1.0F;\n@@ -754,7 +757,7 @@ public void l_() {\n }\n \n this.bM = this.bL;\n- if (this.cd()) {\n+ if (this.ch()) {\n this.bK = this.bJ = 0.0F;\n this.bL += (1.0F - this.bL) * 0.4F + 0.05F;\n if (this.bL > 1.0F) {\n@@ -782,58 +785,52 @@ public void l_() {\n }\n }\n \n- private void cI() {\n+ private void cM() {\n if (!this.q.I) {\n this.bE = 1;\n this.b(128, true);\n }\n }\n \n- private boolean cJ() {\n- return this.n == null && this.o == null && this.bS() && this.bR() && !this.cv() && this.aJ() >= this.aP();\n- }\n-\n- public void w() {\n- if (this.q.I || !this.bS() && !this.ce() || this.aJ() <= 0.0F) {\n- super.w();\n- }\n+ private boolean cN() {\n+ return this.n == null && this.o == null && this.bW() && this.bV() && !this.cz() && this.aM() >= this.aS();\n }\n \n public void e(boolean flag0) {\n this.b(32, flag0);\n }\n \n- public void p(boolean flag0) {\n+ public void o(boolean flag0) {\n this.e(flag0);\n }\n \n- public void q(boolean flag0) {\n+ public void p(boolean flag0) {\n if (flag0) {\n- this.p(false);\n+ this.o(false);\n }\n \n this.b(64, flag0);\n }\n \n- private void cK() {\n+ private void cO() {\n if (!this.q.I) {\n this.bF = 1;\n- this.q(true);\n+ this.p(true);\n }\n }\n \n- public void cz() {\n- this.cK();\n- String s0 = this.cl();\n+ public void cD() {\n+ this.cO();\n+ String s0 = this.cp();\n \n if (s0 != null) {\n- this.a(s0, this.aW(), this.aX());\n+ this.a(s0, this.aZ(), this.ba());\n }\n }\n \n- public void cA() {\n+ public void cE() {\n this.a(this, this.bG);\n- this.ci();\n+ this.cm();\n }\n \n private void a(Entity entity, AnimalChest animalchest) {\n@@ -850,12 +847,12 @@ private void a(Entity entity, AnimalChest animalchest) {\n \n public boolean g(EntityPlayer entityplayer) {\n this.b(entityplayer.c_());\n- this.j(true);\n+ this.i(true);\n return true;\n }\n \n public void e(float f0, float f1) {\n- if (this.n != null && this.ck()) {\n+ if (this.n != null && this.co()) {\n this.C = this.A = this.n.A;\n this.B = this.n.B * 0.5F;\n this.b(this.A, this.B);\n@@ -867,18 +864,18 @@ public void e(float f0, float f1) {\n this.bP = 0;\n }\n \n- if (this.F && this.bt == 0.0F && this.cd() && !this.bI) {\n+ if (this.F && this.bt == 0.0F && this.ch() && !this.bI) {\n f0 = 0.0F;\n f1 = 0.0F;\n }\n \n- if (this.bt > 0.0F && !this.bZ() && this.F) {\n- this.y = this.cj() * (double) this.bt;\n+ if (this.bt > 0.0F && !this.cd() && this.F) {\n+ this.y = this.cn() * (double) this.bt;\n if (this.a(Potion.j)) {\n this.y += (double) ((float) (this.b(Potion.j).c() + 1) * 0.1F);\n }\n \n- this.k(true);\n+ this.j(true);\n this.an = true;\n if (f1 > 0.0F) {\n float f2 = MathHelper.a(this.A * 3.1415927F / 180.0F);\n@@ -893,15 +890,15 @@ public void e(float f0, float f1) {\n }\n \n this.Y = 1.0F;\n- this.aR = this.bc() * 0.1F;\n+ this.aR = this.bf() * 0.1F;\n if (!this.q.I) {\n this.i((float) this.a(SharedMonsterAttributes.d).e());\n super.e(f0, f1);\n }\n \n if (this.F) {\n this.bt = 0.0F;\n- this.k(false);\n+ this.j(false);\n }\n \n this.aF = this.aG;\n@@ -924,15 +921,16 @@ public void e(float f0, float f1) {\n \n public void b(NBTTagCompound nbttagcompound) {\n super.b(nbttagcompound);\n- nbttagcompound.a(\"EatingHaystack\", this.cc());\n- nbttagcompound.a(\"ChestedHorse\", this.ca());\n- nbttagcompound.a(\"HasReproduced\", this.cf());\n- nbttagcompound.a(\"Bred\", this.ce());\n- nbttagcompound.a(\"Type\", this.bP());\n- nbttagcompound.a(\"Variant\", this.bQ());\n- nbttagcompound.a(\"Temper\", this.cg());\n- nbttagcompound.a(\"Tame\", this.bS());\n- if (this.ca()) {\n+ nbttagcompound.a(\"EatingHaystack\", this.cg());\n+ nbttagcompound.a(\"ChestedHorse\", this.ce());\n+ nbttagcompound.a(\"HasReproduced\", this.cj());\n+ nbttagcompound.a(\"Bred\", this.ci());\n+ nbttagcompound.a(\"Type\", this.bT());\n+ nbttagcompound.a(\"Variant\", this.bU());\n+ nbttagcompound.a(\"Temper\", this.ck());\n+ nbttagcompound.a(\"Tame\", this.bW());\n+ nbttagcompound.a(\"OwnerName\", this.cb());\n+ if (this.ce()) {\n NBTTagList nbttaglist = new NBTTagList();\n \n for (int i0 = 2; i0 < this.bG.j_(); ++i0) {\n@@ -961,24 +959,28 @@ public void b(NBTTagCompound nbttagcompound) {\n \n public void a(NBTTagCompound nbttagcompound) {\n super.a(nbttagcompound);\n- this.p(nbttagcompound.n(\"EatingHaystack\"));\n- this.l(nbttagcompound.n(\"Bred\"));\n- this.m(nbttagcompound.n(\"ChestedHorse\"));\n- this.n(nbttagcompound.n(\"HasReproduced\"));\n+ this.o(nbttagcompound.n(\"EatingHaystack\"));\n+ this.k(nbttagcompound.n(\"Bred\"));\n+ this.l(nbttagcompound.n(\"ChestedHorse\"));\n+ this.m(nbttagcompound.n(\"HasReproduced\"));\n this.p(nbttagcompound.e(\"Type\"));\n this.q(nbttagcompound.e(\"Variant\"));\n this.s(nbttagcompound.e(\"Temper\"));\n- this.j(nbttagcompound.n(\"Tame\"));\n- AttributeInstance attributeinstance = this.aT().a(\"Speed\");\n+ this.i(nbttagcompound.n(\"Tame\"));\n+ if (nbttagcompound.b(\"OwnerName\")) {\n+ this.b(nbttagcompound.i(\"OwnerName\"));\n+ }\n+\n+ AttributeInstance attributeinstance = this.aW().a(\"Speed\");\n \n if (attributeinstance != null) {\n this.a(SharedMonsterAttributes.d).a(attributeinstance.b() * 0.25D);\n }\n \n- if (this.ca()) {\n+ if (this.ce()) {\n NBTTagList nbttaglist = nbttagcompound.m(\"Items\");\n \n- this.cD();\n+ this.cH();\n \n for (int i0 = 0; i0 < nbttaglist.c(); ++i0) {\n NBTTagCompound nbttagcompound1 = (NBTTagCompound) nbttaglist.b(i0);\n@@ -1008,7 +1010,7 @@ public void a(NBTTagCompound nbttagcompound) {\n this.bG.a(0, new ItemStack(Item.aC));\n }\n \n- this.cE();\n+ this.cI();\n }\n \n public boolean a(EntityAnimal entityanimal) {\n@@ -1019,9 +1021,9 @@ public boolean a(EntityAnimal entityanimal) {\n } else {\n EntityHorse entityhorse = (EntityHorse) entityanimal;\n \n- if (this.cJ() && entityhorse.cJ()) {\n- int i0 = this.bP();\n- int i1 = entityhorse.bP();\n+ if (this.cN() && entityhorse.cN()) {\n+ int i0 = this.bT();\n+ int i1 = entityhorse.bT();\n \n return i0 == i1 || i0 == 0 && i1 == 1 || i0 == 1 && i1 == 0;\n } else {\n@@ -1033,8 +1035,8 @@ public boolean a(EntityAnimal entityanimal) {\n public EntityAgeable a(EntityAgeable entityageable) {\n EntityHorse entityhorse = (EntityHorse) entityageable;\n EntityHorse entityhorse1 = new EntityHorse(this.q);\n- int i0 = this.bP();\n- int i1 = entityhorse.bP();\n+ int i0 = this.bT();\n+ int i1 = entityhorse.bT();\n int i2 = 0;\n \n if (i0 == i1) {\n@@ -1048,19 +1050,19 @@ public EntityAgeable a(EntityAgeable entityageable) {\n int i4;\n \n if (i3 < 4) {\n- i4 = this.bQ() & 255;\n+ i4 = this.bU() & 255;\n } else if (i3 < 8) {\n- i4 = entityhorse.bQ() & 255;\n+ i4 = entityhorse.bU() & 255;\n } else {\n i4 = this.ab.nextInt(7);\n }\n \n int i5 = this.ab.nextInt(5);\n \n if (i5 < 4) {\n- i4 |= this.bQ() & '\\uff00';\n+ i4 |= this.bU() & '\\uff00';\n } else if (i5 < 8) {\n- i4 |= entityhorse.bQ() & '\\uff00';\n+ i4 |= entityhorse.bU() & '\\uff00';\n } else {\n i4 |= this.ab.nextInt(5) << 8 & '\\uff00';\n }\n@@ -1069,13 +1071,13 @@ public EntityAgeable a(EntityAgeable entityageable) {\n }\n \n entityhorse1.p(i2);\n- double d0 = this.a(SharedMonsterAttributes.a).b() + entityageable.a(SharedMonsterAttributes.a).b() + (double) this.cL();\n+ double d0 = this.a(SharedMonsterAttributes.a).b() + entityageable.a(SharedMonsterAttributes.a).b() + (double) this.cP();\n \n entityhorse1.a(SharedMonsterAttributes.a).a(d0 / 3.0D);\n- double d1 = this.a(bv).b() + entityageable.a(bv).b() + this.cM();\n+ double d1 = this.a(bv).b() + entityageable.a(bv).b() + this.cQ();\n \n entityhorse1.a(bv).a(d1 / 3.0D);\n- double d2 = this.a(SharedMonsterAttributes.d).b() + entityageable.a(SharedMonsterAttributes.d).b() + this.cN();\n+ double d2 = this.a(SharedMonsterAttributes.d).b() + entityageable.a(SharedMonsterAttributes.d).b() + this.cR();\n \n entityhorse1.a(SharedMonsterAttributes.d).a(d2 / 3.0D);\n return entityhorse1;\n@@ -1111,9 +1113,9 @@ public EntityLivingData a(EntityLivingData entitylivingdata) {\n }\n \n if (i1 != 4 && i1 != 3) {\n- this.a(SharedMonsterAttributes.a).a((double) this.cL());\n+ this.a(SharedMonsterAttributes.a).a((double) this.cP());\n if (i1 == 0) {\n- this.a(SharedMonsterAttributes.d).a(this.cN());\n+ this.a(SharedMonsterAttributes.d).a(this.cR());\n } else {\n this.a(SharedMonsterAttributes.d).a(0.17499999701976776D);\n }\n@@ -1123,58 +1125,60 @@ public EntityLivingData a(EntityLivingData entitylivingdata) {\n }\n \n if (i1 != 2 && i1 != 1) {\n- this.a(bv).a(this.cM());\n+ this.a(bv).a(this.cQ());\n } else {\n this.a(bv).a(0.5D);\n }\n \n- this.g(this.aP());\n+ this.g(this.aS());\n return (EntityLivingData) object;\n }\n \n- protected boolean bb() {\n+ protected boolean be() {\n return true;\n }\n \n public void u(int i0) {\n- if (i0 < 0) {\n- i0 = 0;\n- } else {\n- this.bI = true;\n- this.cK();\n- }\n+ if (this.co()) {\n+ if (i0 < 0) {\n+ i0 = 0;\n+ } else {\n+ this.bI = true;\n+ this.cO();\n+ }\n \n- if (i0 >= 90) {\n- this.bt = 1.0F;\n- } else {\n- this.bt = 0.4F + 0.4F * (float) i0 / 90.0F;\n+ if (i0 >= 90) {\n+ this.bt = 1.0F;\n+ } else {\n+ this.bt = 0.4F + 0.4F * (float) i0 / 90.0F;\n+ }\n }\n }\n \n- public void U() {\n- super.U();\n+ public void V() {\n+ super.V();\n if (this.bM > 0.0F) {\n float f0 = MathHelper.a(this.aN * 3.1415927F / 180.0F);\n float f1 = MathHelper.b(this.aN * 3.1415927F / 180.0F);\n float f2 = 0.7F * this.bM;\n float f3 = 0.15F * this.bM;\n \n- this.n.b(this.u + (double) (f2 * f0), this.v + this.W() + this.n.V() + (double) f3, this.w - (double) (f2 * f1));\n+ this.n.b(this.u + (double) (f2 * f0), this.v + this.X() + this.n.W() + (double) f3, this.w - (double) (f2 * f1));\n if (this.n instanceof EntityLivingBase) {\n ((EntityLivingBase) this.n).aN = this.aN;\n }\n }\n }\n \n- private float cL() {\n+ private float cP() {\n return 15.0F + (float) this.ab.nextInt(8) + (float) this.ab.nextInt(9);\n }\n \n- private double cM() {\n+ private double cQ() {\n return 0.4000000059604645D + this.ab.nextDouble() * 0.2D + this.ab.nextDouble() * 0.2D + this.ab.nextDouble() * 0.2D;\n }\n \n- private double cN() {\n+ private double cR() {\n return (0.44999998807907104D + this.ab.nextDouble() * 0.3D + this.ab.nextDouble() * 0.3D + this.ab.nextDouble() * 0.3D) * 0.25D;\n }\n ", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityHorse.java", "sha": "5572985b3444cac19e10bb5af9f1abd00ef77c89", "status": "modified" }, { "additions": 19, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityIronGolem.java", "changes": 38, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityIronGolem.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 19, "filename": "src/main/java/net/minecraft/server/EntityIronGolem.java", "new_code": " this.c.a(4, new EntityAIMoveTowardsRestriction(this, 1.0D));\n public boolean be() {\n protected void bj() {\n this.bR();\n super.bj();\n protected void ay() {\n super.ay();\n if (entity instanceof IMob && this.aC().nextInt(20) == 0) {\n this.d((EntityLivingBase) entity);\n return this.bW() && EntityPlayer.class.isAssignableFrom(oclass0) ? false : super.a(oclass0);\n nbttagcompound.a(\"PlayerCreated\", this.bW());\n this.i(nbttagcompound.n(\"PlayerCreated\"));\n public Village bT() {\n protected String aN() {\n protected String aO() {\n public int bV() {\n public boolean bW() {\n public void i(boolean flag0) {\n if (!this.bW() && this.aS != null && this.bp != null) {", "new_methods": [], "old_code": " this.c.a(4, new EntityAIMoveTwardsRestriction(this, 1.0D));\n public boolean bb() {\n protected void bg() {\n this.bN();\n super.bg();\n protected void ax() {\n super.ax();\n if (entity instanceof IMob && this.aB().nextInt(20) == 0) {\n this.c((EntityLivingBase) entity);\n return this.bS() && EntityPlayer.class.isAssignableFrom(oclass0) ? false : super.a(oclass0);\n nbttagcompound.a(\"PlayerCreated\", this.bS());\n this.j(nbttagcompound.n(\"PlayerCreated\"));\n public Village bP() {\n protected String aK() {\n protected String aL() {\n public int bR() {\n public boolean bS() {\n public void j(boolean flag0) {\n if (!this.bS() && this.aS != null && this.bp != null) {", "old_methods": [], "patch": "@@ -16,7 +16,7 @@ public EntityIronGolem(World world) {\n this.c.a(1, new EntityAIAttackOnCollide(this, 1.0D, true));\n this.c.a(2, new EntityAIMoveTowardsTarget(this, 0.9D, 32.0F));\n this.c.a(3, new EntityAIMoveThroughVillage(this, 0.6D, true));\n- this.c.a(4, new EntityAIMoveTwardsRestriction(this, 1.0D));\n+ this.c.a(4, new EntityAIMoveTowardsRestriction(this, 1.0D));\n this.c.a(5, new EntityAILookAtVillager(this));\n this.c.a(6, new EntityAIWander(this, 0.6D));\n this.c.a(7, new EntityAIWatchClosest(this, EntityPlayer.class, 6.0F));\n@@ -32,28 +32,28 @@ protected void a() {\n this.ah.a(16, Byte.valueOf((byte) 0));\n }\n \n- public boolean bb() {\n+ public boolean be() {\n return true;\n }\n \n- protected void bg() {\n+ protected void bj() {\n if (--this.bq <= 0) {\n this.bq = 70 + this.ab.nextInt(50);\n this.bp = this.q.A.a(MathHelper.c(this.u), MathHelper.c(this.v), MathHelper.c(this.w), 32);\n if (this.bp == null) {\n- this.bN();\n+ this.bR();\n } else {\n ChunkCoordinates chunkcoordinates = this.bp.a();\n \n this.b(chunkcoordinates.a, chunkcoordinates.b, chunkcoordinates.c, (int) ((float) this.bp.b() * 0.6F));\n }\n }\n \n- super.bg();\n+ super.bj();\n }\n \n- protected void ax() {\n- super.ax();\n+ protected void ay() {\n+ super.ay();\n this.a(SharedMonsterAttributes.a).a(100.0D);\n this.a(SharedMonsterAttributes.d).a(0.25D);\n }\n@@ -63,8 +63,8 @@ protected int h(int i0) {\n }\n \n protected void n(Entity entity) {\n- if (entity instanceof IMob && this.aB().nextInt(20) == 0) {\n- this.c((EntityLivingBase) entity);\n+ if (entity instanceof IMob && this.aC().nextInt(20) == 0) {\n+ this.d((EntityLivingBase) entity);\n }\n \n super.n(entity);\n@@ -93,17 +93,17 @@ public void c() {\n }\n \n public boolean a(Class oclass0) {\n- return this.bS() && EntityPlayer.class.isAssignableFrom(oclass0) ? false : super.a(oclass0);\n+ return this.bW() && EntityPlayer.class.isAssignableFrom(oclass0) ? false : super.a(oclass0);\n }\n \n public void b(NBTTagCompound nbttagcompound) {\n super.b(nbttagcompound);\n- nbttagcompound.a(\"PlayerCreated\", this.bS());\n+ nbttagcompound.a(\"PlayerCreated\", this.bW());\n }\n \n public void a(NBTTagCompound nbttagcompound) {\n super.a(nbttagcompound);\n- this.j(nbttagcompound.n(\"PlayerCreated\"));\n+ this.i(nbttagcompound.n(\"PlayerCreated\"));\n }\n \n public boolean m(Entity entity) {\n@@ -119,7 +119,7 @@ public boolean m(Entity entity) {\n return flag0;\n }\n \n- public Village bP() {\n+ public Village bT() {\n return this.bp;\n }\n \n@@ -132,11 +132,11 @@ protected String r() {\n return \"none\";\n }\n \n- protected String aK() {\n+ protected String aN() {\n return \"mob.irongolem.hit\";\n }\n \n- protected String aL() {\n+ protected String aO() {\n return \"mob.irongolem.death\";\n }\n \n@@ -160,15 +160,15 @@ protected void b(boolean flag0, int i0) {\n }\n }\n \n- public int bR() {\n+ public int bV() {\n return this.bs;\n }\n \n- public boolean bS() {\n+ public boolean bW() {\n return (this.ah.a(16) & 1) != 0;\n }\n \n- public void j(boolean flag0) {\n+ public void i(boolean flag0) {\n byte b0 = this.ah.a(16);\n \n if (flag0) {\n@@ -179,7 +179,7 @@ public void j(boolean flag0) {\n }\n \n public void a(DamageSource damagesource) {\n- if (!this.bS() && this.aS != null && this.bp != null) {\n+ if (!this.bW() && this.aS != null && this.bp != null) {\n this.bp.a(this.aS.c_(), -5);\n }\n ", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityIronGolem.java", "sha": "ef4b9719f9283a625d95180a3e5deacb190edd4f", "status": "modified" }, { "additions": 4, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityItem.java", "changes": 8, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityItem.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 4, "filename": "src/main/java/net/minecraft/server/EntityItem.java", "new_code": " } else if (entityitem.S() && this.S()) {\n if (this.aq()) {\n public String am() {\n public boolean ap() {", "new_methods": [], "old_code": " } else if (entityitem.R() && this.R()) {\n if (this.ap()) {\n public String al() {\n public boolean ao() {", "old_methods": [], "patch": "@@ -131,7 +131,7 @@ private void e() {\n public boolean a(EntityItem entityitem) {\n if (entityitem == this) {\n return false;\n- } else if (entityitem.R() && this.R()) {\n+ } else if (entityitem.S() && this.S()) {\n ItemStack itemstack = this.d();\n ItemStack itemstack1 = entityitem.d();\n \n@@ -173,7 +173,7 @@ protected void e(int i0) {\n }\n \n public boolean a(DamageSource damagesource, float f0) {\n- if (this.ap()) {\n+ if (this.aq()) {\n return false;\n } else if (this.d() != null && this.d().d == Item.bU.cv && damagesource.c()) {\n return false;\n@@ -240,11 +240,11 @@ public void b_(EntityPlayer entityplayer) {\n }\n }\n \n- public String al() {\n+ public String am() {\n return StatCollector.a(\"item.\" + this.d().a());\n }\n \n- public boolean ao() {\n+ public boolean ap() {\n return false;\n }\n ", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityItem.java", "sha": "0f4afee85fbfd5b698b071d75e69d9f3eb4e2fff", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityItemFrame.java", "changes": 4, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityItemFrame.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 3, "filename": "src/main/java/net/minecraft/server/EntityItemFrame.java", "new_code": " ItemStack itemstack = entityplayer.aY();", "new_methods": [], "old_code": "\n\n ItemStack itemstack = entityplayer.aV();", "old_methods": [], "patch": "@@ -1,9 +1,7 @@\n package net.minecraft.server;\n \n-\n import net.canarymod.api.entity.hanging.CanaryItemFrame;\n \n-\n public class EntityItemFrame extends EntityHanging {\n \n public float e = 1.0F; // CanaryMod: private -> public\n@@ -110,7 +108,7 @@ public void a(NBTTagCompound nbttagcompound) {\n \n public boolean c(EntityPlayer entityplayer) {\n if (this.h() == null) {\n- ItemStack itemstack = entityplayer.aV();\n+ ItemStack itemstack = entityplayer.aY();\n \n if (itemstack != null && !this.q.I) {\n this.a(itemstack);", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityItemFrame.java", "sha": "5b91f99631886ab5c2a2210d9ef2526f49488f31", "status": "modified" }, { "additions": 24, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityLeashKnot.java", "changes": 32, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityLeashKnot.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 8, "filename": "src/main/java/net/minecraft/server/EntityLeashKnot.java", "new_code": " ItemStack itemstack = entityplayer.aY();\n double d0;\n List list;\n Iterator iterator;\n EntityLiving entityliving;\n d0 = 7.0D;\n list = this.q.a(EntityLiving.class, AxisAlignedBB.a().a(this.u - d0, this.v - d0, this.w - d0, this.u + d0, this.v + d0, this.w + d0));\n iterator = list.iterator();\n entityliving = (EntityLiving) iterator.next();\n if (entityliving.bH() && entityliving.bI() == entityplayer) {\n if (entityplayer.bG.d) {\n d0 = 7.0D;\n list = this.q.a(EntityLiving.class, AxisAlignedBB.a().a(this.u - d0, this.v - d0, this.w - d0, this.u + d0, this.v + d0, this.w + d0));\n if (list != null) {\n iterator = list.iterator();\n\n while (iterator.hasNext()) {\n entityliving = (EntityLiving) iterator.next();\n if (entityliving.bH() && entityliving.bI() == this) {\n entityliving.a(true, false);\n }\n }\n }\n }", "new_methods": [], "old_code": " ItemStack itemstack = entityplayer.aV();\n double d0 = 7.0D;\n List list = this.q.a(EntityLiving.class, AxisAlignedBB.a().a(this.u - d0, this.v - d0, this.w - d0, this.u + d0, this.v + d0, this.w + d0));\n\n Iterator iterator = list.iterator();\n EntityLiving entityliving = (EntityLiving) iterator.next();\n\n if (entityliving.bD() && entityliving.bE() == entityplayer) {", "old_methods": [], "patch": "@@ -42,20 +42,22 @@ public void b(NBTTagCompound nbttagcompound) {}\n public void a(NBTTagCompound nbttagcompound) {}\n \n public boolean c(EntityPlayer entityplayer) {\n- ItemStack itemstack = entityplayer.aV();\n+ ItemStack itemstack = entityplayer.aY();\n boolean flag0 = false;\n+ double d0;\n+ List list;\n+ Iterator iterator;\n+ EntityLiving entityliving;\n \n if (itemstack != null && itemstack.d == Item.ch.cv && !this.q.I) {\n- double d0 = 7.0D;\n- List list = this.q.a(EntityLiving.class, AxisAlignedBB.a().a(this.u - d0, this.v - d0, this.w - d0, this.u + d0, this.v + d0, this.w + d0));\n-\n+ d0 = 7.0D;\n+ list = this.q.a(EntityLiving.class, AxisAlignedBB.a().a(this.u - d0, this.v - d0, this.w - d0, this.u + d0, this.v + d0, this.w + d0));\n if (list != null) {\n- Iterator iterator = list.iterator();\n+ iterator = list.iterator();\n \n while (iterator.hasNext()) {\n- EntityLiving entityliving = (EntityLiving) iterator.next();\n-\n- if (entityliving.bD() && entityliving.bE() == entityplayer) {\n+ entityliving = (EntityLiving) iterator.next();\n+ if (entityliving.bH() && entityliving.bI() == entityplayer) {\n entityliving.b(this, true);\n flag0 = true;\n }\n@@ -65,6 +67,20 @@ public boolean c(EntityPlayer entityplayer) {\n \n if (!this.q.I && !flag0) {\n this.w();\n+ if (entityplayer.bG.d) {\n+ d0 = 7.0D;\n+ list = this.q.a(EntityLiving.class, AxisAlignedBB.a().a(this.u - d0, this.v - d0, this.w - d0, this.u + d0, this.v + d0, this.w + d0));\n+ if (list != null) {\n+ iterator = list.iterator();\n+\n+ while (iterator.hasNext()) {\n+ entityliving = (EntityLiving) iterator.next();\n+ if (entityliving.bH() && entityliving.bI() == this) {\n+ entityliving.a(true, false);\n+ }\n+ }\n+ }\n+ }\n }\n \n return true;", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityLeashKnot.java", "sha": "5bbd664c045c40e792d703da696a4a3e2ece3726", "status": "modified" }, { "additions": 61, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityLiving.java", "changes": 122, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityLiving.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 61, "filename": "src/main/java/net/minecraft/server/EntityLiving.java", "new_code": " protected void ay() {\n super.ay();\n this.aW().b(SharedMonsterAttributes.b).a(16.0D);\n public void d(EntityLivingBase entitylivingbase) {\n this.a(s0, this.aZ(), this.ba());\n if (this.S() && this.ab.nextInt(1000) < this.a_++) {\n ItemStack[] aitemstack = this.ad();\n this.bF();\n if (this.be()) {\n nbttagcompound.a(\"CanPickUpLoot\", this.bD());\n nbttagcompound.a(\"CustomName\", this.bA());\n nbttagcompound.a(\"CustomNameVisible\", this.bC());\n nbttagcompound1.a(\"UUIDMost\", this.bw.av().getMostSignificantBits());\n nbttagcompound1.a(\"UUIDLeast\", this.bw.av().getLeastSignificantBits());\n if (!this.q.I && this.bD() && !this.aU && this.q.O().b(\"mobGriefing\")) {\n protected boolean be() {\n protected void bo() {\n protected void bh() {\n this.bo();\n this.bj();\n protected void bk() {\n super.bk();\n this.bo();\n this.a(this.bu, 10.0F, (float) this.bp());\n public int bp() {\n public boolean bs() {\n public int bv() {\n public int ar() {\n int i0 = (int) (this.aM() - this.aS() * 0.33F);\n public ItemStack aY() {\n public ItemStack[] ad() {\n for (int i1 = 0; i1 < this.ad().length; ++i1) {\n protected void bw() {\n protected void bx() {\n if (this.aY() != null && this.ab.nextFloat() < 0.25F * f0) {\n EnchantmentHelper.a(this.ab, this.aY(), (int) (5.0F + f0 * (float) this.ab.nextInt(18)));\n public boolean by() {\n public String am() {\n return this.bB() ? this.bA() : super.am();\n public void bz() {\n public String bA() {\n public boolean bB() {\n public boolean bC() {\n public boolean bD() {\n public boolean bE() {\n if (this.bH() && this.bI() == entityplayer) {\n this.a(true, !entityplayer.bG.d);\n if (itemstack != null && itemstack.d == Item.ch.cv && this.bG()) {\n if (!(this instanceof EntityTameable) || !((EntityTameable) this).bT()) {\n protected void bF() {\n this.bJ();\n this.a(true, true);\n public void a(boolean flag0, boolean flag1) {\n if (!this.q.I && flag1) {\n public boolean bG() {\n return !this.bH() && !(this instanceof IMob);\n public boolean bH() {\n public Entity bI() {\n private void bJ() {\n if (entitylivingbase.av().equals(uuid)) {\n this.a(false, true);", "new_methods": [], "old_code": " protected void ax() {\n super.ax();\n this.aT().b(SharedMonsterAttributes.b).a(16.0D);\n public void c(EntityLivingBase entitylivingbase) {\n this.a(s0, this.aW(), this.aX());\n if (this.R() && this.ab.nextInt(1000) < this.a_++) {\n ItemStack[] aitemstack = this.ac();\n this.bB();\n if (this.bb()) {\n nbttagcompound.a(\"CanPickUpLoot\", this.bz());\n nbttagcompound.a(\"CustomName\", this.bw());\n nbttagcompound.a(\"CustomNameVisible\", this.by());\n nbttagcompound1.a(\"UUIDMost\", this.bw.au().getMostSignificantBits());\n nbttagcompound1.a(\"UUIDLeast\", this.bw.au().getLeastSignificantBits());\n if (!this.q.I && this.bz() && !this.aU && this.q.O().b(\"mobGriefing\")) {\n protected boolean bb() {\n protected void bk() {\n protected void be() {\n this.bk();\n this.bg();\n protected void bh() {\n super.bh();\n this.bk();\n this.a(this.bu, 10.0F, (float) this.bl());\n public int bl() {\n public boolean bo() {\n public int br() {\n public int aq() {\n int i0 = (int) (this.aJ() - this.aP() * 0.33F);\n public ItemStack aV() {\n public ItemStack[] ac() {\n for (int i1 = 0; i1 < this.ac().length; ++i1) {\n protected void bs() {\n protected void bt() {\n if (this.aV() != null && this.ab.nextFloat() < 0.25F * f0) {\n EnchantmentHelper.a(this.ab, this.aV(), (int) (5.0F + f0 * (float) this.ab.nextInt(18)));\n public boolean bu() {\n public String al() {\n return this.bx() ? this.bw() : super.al();\n public void bv() {\n public String bw() {\n public boolean bx() {\n public boolean by() {\n public boolean bz() {\n public boolean bA() {\n if (this.bD() && this.bE() == entityplayer) {\n this.i(true);\n if (itemstack != null && itemstack.d == Item.ch.cv && this.bC()) {\n if (!(this instanceof EntityTameable) || !((EntityTameable) this).bP()) {\n protected void bB() {\n this.bF();\n this.i(true);\n public void i(boolean flag0) {\n if (!this.q.I) {\n public boolean bC() {\n return !this.bD() && !(this instanceof IMob);\n public boolean bD() {\n public Entity bE() {\n private void bF() {\n if (entitylivingbase.au().equals(uuid)) {\n this.i(false);", "old_methods": [], "patch": "@@ -44,9 +44,9 @@ public EntityLiving(World world) {\n }\n }\n \n- protected void ax() {\n- super.ax();\n- this.aT().b(SharedMonsterAttributes.b).a(16.0D);\n+ protected void ay() {\n+ super.ay();\n+ this.aW().b(SharedMonsterAttributes.b).a(16.0D);\n }\n \n public EntityLookHelper h() {\n@@ -73,7 +73,7 @@ public EntityLivingBase m() {\n return this.bp;\n }\n \n- public void c(EntityLivingBase entitylivingbase) {\n+ public void d(EntityLivingBase entitylivingbase) {\n this.bp = entitylivingbase;\n }\n \n@@ -97,14 +97,14 @@ public void p() {\n String s0 = this.r();\n \n if (s0 != null) {\n- this.a(s0, this.aW(), this.aX());\n+ this.a(s0, this.aZ(), this.ba());\n }\n }\n \n public void x() {\n super.x();\n this.q.C.a(\"mobBaseTick\");\n- if (this.R() && this.ab.nextInt(1000) < this.a_++) {\n+ if (this.S() && this.ab.nextInt(1000) < this.a_++) {\n this.a_ = -this.o();\n this.p();\n }\n@@ -115,7 +115,7 @@ public void x() {\n protected int e(EntityPlayer entityplayer) {\n if (this.b > 0) {\n int i0 = this.b;\n- ItemStack[] aitemstack = this.ac();\n+ ItemStack[] aitemstack = this.ad();\n \n for (int i1 = 0; i1 < aitemstack.length; ++i1) {\n if (aitemstack[i1] != null && this.e[i1] <= 1.0F) {\n@@ -143,12 +143,12 @@ public void q() {\n public void l_() {\n super.l_();\n if (!this.q.I) {\n- this.bB();\n+ this.bF();\n }\n }\n \n protected float f(float f0, float f1) {\n- if (this.bb()) {\n+ if (this.be()) {\n this.bn.a();\n return f1;\n } else {\n@@ -182,7 +182,7 @@ protected void b(boolean flag0, int i0) {\n \n public void b(NBTTagCompound nbttagcompound) {\n super.b(nbttagcompound);\n- nbttagcompound.a(\"CanPickUpLoot\", this.bz());\n+ nbttagcompound.a(\"CanPickUpLoot\", this.bD());\n nbttagcompound.a(\"PersistenceRequired\", this.bt);\n NBTTagList nbttaglist = new NBTTagList();\n \n@@ -205,14 +205,14 @@ public void b(NBTTagCompound nbttagcompound) {\n }\n \n nbttagcompound.a(\"DropChances\", (NBTBase) nbttaglist1);\n- nbttagcompound.a(\"CustomName\", this.bw());\n- nbttagcompound.a(\"CustomNameVisible\", this.by());\n+ nbttagcompound.a(\"CustomName\", this.bA());\n+ nbttagcompound.a(\"CustomNameVisible\", this.bC());\n nbttagcompound.a(\"Leashed\", this.bv);\n if (this.bw != null) {\n nbttagcompound1 = new NBTTagCompound(\"Leash\");\n if (this.bw instanceof EntityLivingBase) {\n- nbttagcompound1.a(\"UUIDMost\", this.bw.au().getMostSignificantBits());\n- nbttagcompound1.a(\"UUIDLeast\", this.bw.au().getLeastSignificantBits());\n+ nbttagcompound1.a(\"UUIDMost\", this.bw.av().getMostSignificantBits());\n+ nbttagcompound1.a(\"UUIDLeast\", this.bw.av().getLeastSignificantBits());\n } else if (this.bw instanceof EntityHanging) {\n EntityHanging entityhanging = (EntityHanging) this.bw;\n \n@@ -271,7 +271,7 @@ public void i(float f0) {\n public void c() {\n super.c();\n this.q.C.a(\"looting\");\n- if (!this.q.I && this.bz() && !this.aU && this.q.O().b(\"mobGriefing\")) {\n+ if (!this.q.I && this.bD() && !this.aU && this.q.O().b(\"mobGriefing\")) {\n List list = this.q.a(EntityItem.class, this.E.b(1.0D, 0.0D, 1.0D));\n Iterator iterator = list.iterator();\n \n@@ -337,15 +337,15 @@ public void c() {\n this.q.C.b();\n }\n \n- protected boolean bb() {\n+ protected boolean be() {\n return false;\n }\n \n protected boolean t() {\n return true;\n }\n \n- protected void bk() {\n+ protected void bo() {\n if (this.bt) {\n this.aV = 0;\n } else {\n@@ -370,10 +370,10 @@ protected void bk() {\n }\n }\n \n- protected void be() {\n+ protected void bh() {\n ++this.aV;\n this.q.C.a(\"checkDespawn\");\n- this.bk();\n+ this.bo();\n this.q.C.b();\n this.q.C.a(\"sensing\");\n this.bq.a();\n@@ -388,7 +388,7 @@ protected void be() {\n this.bo.f();\n this.q.C.b();\n this.q.C.a(\"mob tick\");\n- this.bg();\n+ this.bj();\n this.q.C.b();\n this.q.C.a(\"controls\");\n this.q.C.a(\"move\");\n@@ -401,11 +401,11 @@ protected void be() {\n this.q.C.b();\n }\n \n- protected void bh() {\n- super.bh();\n+ protected void bk() {\n+ super.bk();\n this.be = 0.0F;\n this.bf = 0.0F;\n- this.bk();\n+ this.bo();\n float f0 = 8.0F;\n \n if (this.ab.nextFloat() < 0.02F) {\n@@ -420,7 +420,7 @@ protected void bh() {\n }\n \n if (this.bu != null) {\n- this.a(this.bu, 10.0F, (float) this.bl());\n+ this.a(this.bu, 10.0F, (float) this.bp());\n if (this.g-- <= 0 || this.bu.M || this.bu.e((Entity) this) > (double) (f0 * f0)) {\n this.bu = null;\n }\n@@ -441,7 +441,7 @@ protected void bh() {\n }\n }\n \n- public int bl() {\n+ public int bp() {\n return 40;\n }\n \n@@ -480,19 +480,19 @@ private float b(float f0, float f1, float f2) {\n return f0 + f3;\n }\n \n- public boolean bo() {\n+ public boolean bs() {\n return this.q.b(this.E) && this.q.a((Entity) this, this.E).isEmpty() && !this.q.d(this.E);\n }\n \n- public int br() {\n+ public int bv() {\n return 4;\n }\n \n- public int aq() {\n+ public int ar() {\n if (this.m() == null) {\n return 3;\n } else {\n- int i0 = (int) (this.aJ() - this.aP() * 0.33F);\n+ int i0 = (int) (this.aM() - this.aS() * 0.33F);\n \n i0 -= (3 - this.q.r) * 4;\n if (i0 < 0) {\n@@ -503,7 +503,7 @@ public int aq() {\n }\n }\n \n- public ItemStack aV() {\n+ public ItemStack aY() {\n return this.br[0];\n }\n \n@@ -519,12 +519,12 @@ public void c(int i0, ItemStack itemstack) {\n this.br[i0] = itemstack;\n }\n \n- public ItemStack[] ac() {\n+ public ItemStack[] ad() {\n return this.br;\n }\n \n protected void a(boolean flag0, int i0) {\n- for (int i1 = 0; i1 < this.ac().length; ++i1) {\n+ for (int i1 = 0; i1 < this.ad().length; ++i1) {\n ItemStack itemstack = this.n(i1);\n boolean flag1 = this.e[i1] > 1.0F;\n \n@@ -549,7 +549,7 @@ protected void a(boolean flag0, int i0) {\n }\n }\n \n- protected void bs() {\n+ protected void bw() {\n if (this.ab.nextFloat() < 0.15F * this.q.b(this.u, this.v, this.w)) {\n int i0 = this.ab.nextInt(2);\n float f0 = this.q.r == 3 ? 0.1F : 0.25F;\n@@ -667,11 +667,11 @@ public static Item a(int i0, int i1) {\n }\n }\n \n- protected void bt() {\n+ protected void bx() {\n float f0 = this.q.b(this.u, this.v, this.w);\n \n- if (this.aV() != null && this.ab.nextFloat() < 0.25F * f0) {\n- EnchantmentHelper.a(this.ab, this.aV(), (int) (5.0F + f0 * (float) this.ab.nextInt(18)));\n+ if (this.aY() != null && this.ab.nextFloat() < 0.25F * f0) {\n+ EnchantmentHelper.a(this.ab, this.aY(), (int) (5.0F + f0 * (float) this.ab.nextInt(18)));\n }\n \n for (int i0 = 0; i0 < 4; ++i0) {\n@@ -688,63 +688,63 @@ public EntityLivingData a(EntityLivingData entitylivingdata) {\n return entitylivingdata;\n }\n \n- public boolean bu() {\n+ public boolean by() {\n return false;\n }\n \n- public String al() {\n- return this.bx() ? this.bw() : super.al();\n+ public String am() {\n+ return this.bB() ? this.bA() : super.am();\n }\n \n- public void bv() {\n+ public void bz() {\n this.bt = true;\n }\n \n public void a(String s0) {\n this.ah.b(10, s0);\n }\n \n- public String bw() {\n+ public String bA() {\n return this.ah.e(10);\n }\n \n- public boolean bx() {\n+ public boolean bB() {\n return this.ah.e(10).length() > 0;\n }\n \n public void g(boolean flag0) {\n this.ah.b(11, Byte.valueOf((byte) (flag0 ? 1 : 0)));\n }\n \n- public boolean by() {\n+ public boolean bC() {\n return this.ah.a(11) == 1;\n }\n \n public void a(int i0, float f0) {\n this.e[i0] = f0;\n }\n \n- public boolean bz() {\n+ public boolean bD() {\n return this.bs;\n }\n \n public void h(boolean flag0) {\n this.bs = flag0;\n }\n \n- public boolean bA() {\n+ public boolean bE() {\n return this.bt;\n }\n \n public final boolean c(EntityPlayer entityplayer) {\n- if (this.bD() && this.bE() == entityplayer) {\n- this.i(true);\n+ if (this.bH() && this.bI() == entityplayer) {\n+ this.a(true, !entityplayer.bG.d);\n return true;\n } else {\n ItemStack itemstack = entityplayer.bn.h();\n \n- if (itemstack != null && itemstack.d == Item.ch.cv && this.bC()) {\n- if (!(this instanceof EntityTameable) || !((EntityTameable) this).bP()) {\n+ if (itemstack != null && itemstack.d == Item.ch.cv && this.bG()) {\n+ if (!(this instanceof EntityTameable) || !((EntityTameable) this).bT()) {\n this.b(entityplayer, true);\n --itemstack.b;\n return true;\n@@ -765,23 +765,23 @@ protected boolean a(EntityPlayer entityplayer) {\n return false;\n }\n \n- protected void bB() {\n+ protected void bF() {\n if (this.bx != null) {\n- this.bF();\n+ this.bJ();\n }\n \n if (this.bv) {\n if (this.bw == null || this.bw.M) {\n- this.i(true);\n+ this.a(true, true);\n }\n }\n }\n \n- public void i(boolean flag0) {\n+ public void a(boolean flag0, boolean flag1) {\n if (this.bv) {\n this.bv = false;\n this.bw = null;\n- if (!this.q.I) {\n+ if (!this.q.I && flag1) {\n this.b(Item.ch.cv, 1);\n }\n \n@@ -791,15 +791,15 @@ public void i(boolean flag0) {\n }\n }\n \n- public boolean bC() {\n- return !this.bD() && !(this instanceof IMob);\n+ public boolean bG() {\n+ return !this.bH() && !(this instanceof IMob);\n }\n \n- public boolean bD() {\n+ public boolean bH() {\n return this.bv;\n }\n \n- public Entity bE() {\n+ public Entity bI() {\n return this.bw;\n }\n \n@@ -811,7 +811,7 @@ public void b(Entity entity, boolean flag0) {\n }\n }\n \n- private void bF() {\n+ private void bJ() {\n if (this.bv && this.bx != null) {\n if (this.bx.b(\"UUIDMost\") && this.bx.b(\"UUIDLeast\")) {\n UUID uuid = new UUID(this.bx.f(\"UUIDMost\"), this.bx.f(\"UUIDLeast\"));\n@@ -821,7 +821,7 @@ private void bF() {\n while (iterator.hasNext()) {\n EntityLivingBase entitylivingbase = (EntityLivingBase) iterator.next();\n \n- if (entitylivingbase.au().equals(uuid)) {\n+ if (entitylivingbase.av().equals(uuid)) {\n this.bw = entitylivingbase;\n break;\n }\n@@ -838,7 +838,7 @@ private void bF() {\n \n this.bw = entityleashknot;\n } else {\n- this.i(false);\n+ this.a(false, true);\n }\n }\n ", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityLiving.java", "sha": "9a5e444415b55ddba5384b1ef229c8106f0914e1", "status": "modified" }, { "additions": 173, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityLivingBase.java", "changes": 333, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityLivingBase.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 160, "filename": "src/main/java/net/minecraft/server/EntityLivingBase.java", "new_code": " private int bo;\n private float bp;\n private int bq;\n private float br;\n this.ay();\n this.g(this.aS());\n protected void ay() {\n this.aW().b(SharedMonsterAttributes.a);\n this.aW().b(SharedMonsterAttributes.c);\n this.aW().b(SharedMonsterAttributes.d);\n if (!this.be()) {\n public boolean az() {\n if (this.S() && this.T()) {\n DamageHook hook = (DamageHook) new DamageHook(null, entity, new CanaryDamageSource(DamageSource.d), 1.0F).call();\n if (this.S() && this.a(Material.h)) {\n if (!this.az() && !this.i(Potion.o.H) && !flag0) {\n this.g(this.h(this.ak()));\n if (this.ak() == -20) {\n DamageHook hook = (DamageHook) new DamageHook(null, entity, new CanaryDamageSource(DamageSource.e), 2.0F).call();\n if (!this.q.I && this.af() && this.o instanceof EntityLivingBase) {\n if (this.aM() <= 0.0F) {\n this.aA();\n if (this.bn != null && !this.bn.S()) {\n if (this.i != null && !this.i.S()) {\n this.b((EntityLivingBase) null);\n this.aI();\n protected void aA() {\n if (!this.q.I && (this.aT > 0 || this.aB()) && !this.g_() && this.q.O().b(\"doMobLoot\")) {\n protected boolean aB() {\n public Random aC() {\n public EntityLivingBase aD() {\n public int aE() {\n return this.j;\n }\n\n this.j = this.ac;\n public EntityLivingBase aF() {\n public int aG() {\n return this.bo;\n }\n\n } else {\n this.bn = null;\n\n this.bo = this.ac;\n public int aH() {\n nbttagcompound.a(\"HealF\", this.aM());\n nbttagcompound.a(\"Health\", (short) ((int) Math.ceil((double) this.aM())));\n nbttagcompound.a(\"AbsorptionAmount\", this.bm());\n ItemStack[] aitemstack = this.ad();\n nbttagcompound.a(\"Attributes\", (NBTBase) SharedMonsterAttributes.a(this.aW()));\n aitemstack = this.ad();\n SharedMonsterAttributes.a(this.aW(), nbttagcompound.m(\"Attributes\"), this.q == null ? null : this.q.Y());\n this.g(this.aS());\n protected void aI() {\n this.b(potioneffect);\n this.a(potioneffect, false);\n if (!this.ai()) {\n public void aJ() {\n this.b(potioneffect);\n public Collection aK() {\n public void c(PotionEffect potioneffect) {\n if (this.d(potioneffect)) {\n if (this.d(potioneffect)) {\n this.a((PotionEffect) this.f.get(Integer.valueOf(potioneffect.a())), true);\n public boolean d(PotionEffect potioneffect) {\n if (this.aX() == EnumCreatureAttribute.b) {\n public boolean aL() {\n return this.aX() == EnumCreatureAttribute.b;\n this.b(potioneffect);\n Potion.a[potioneffect.a()].b(this, this.aW(), potioneffect.c());\n protected void a(PotionEffect potioneffect, boolean flag0) {\n if (flag0 && !this.q.I) {\n Potion.a[potioneffect.a()].a(this, this.aW(), potioneffect.c());\n Potion.a[potioneffect.a()].b(this, this.aW(), potioneffect.c());\n protected void b(PotionEffect potioneffect) {\n Potion.a[potioneffect.a()].a(this, this.aW(), potioneffect.c());\n float f1 = this.aM();\n public final float aM() {\n this.ah.b(6, Float.valueOf(MathHelper.a(f0, 0.0F, this.aS())));\n if (this.aq()) {\n if (this.aM() <= 0.0F) {\n this.ax = this.aM();\n if (entitywolf.bT()) {\n if (this.aM() <= 0.0F) {\n this.a(this.aO(), this.aZ(), this.ba());\n this.a(this.aN(), this.aZ(), this.ba());\n EntityLivingBase entitylivingbase = this.aR();\n protected String aN() {\n protected String aO() {\n public boolean S() {\n return !this.M && this.aM() > 0.0F;\n public int aP() {\n ItemStack[] aitemstack = this.ad();\n int i0 = 25 - this.aP();\n i0 = EnchantmentHelper.a(this.ad(), damagesource);\n if (!this.aq()) {\n f0 = Math.max(f0 - this.bm(), 0.0F);\n this.m(this.bm() - (f1 - f0));\n float f2 = this.aM();\n this.aQ().a(damagesource, f2, f0);\n this.m(this.bm() - f0);\n public CombatTracker aQ() {\n public EntityLivingBase aR() {\n public final float aS() {\n public final int aT() {\n public void aU() {\n protected void aV() {\n return this.aW().a(attribute);\n public BaseAttributeMap aW() {\n this.d = new ServersideAttributeMap();\n public EnumCreatureAttribute aX() {\n public abstract ItemStack aY();\n AttributeInstance attributeinstance = this.a(SharedMonsterAttributes.d);\n if (attributeinstance.a(b) != null) {\n }\n\n if (flag0) {\n attributeinstance.a(c);\n public abstract ItemStack[] ad();\n protected float aZ() {\n protected float ba() {\n protected boolean bb() {\n return this.aM() <= 0.0F;\n protected void bd() {\n if (this.ah()) {\n this.a(f0, f1, this.be() ? 0.04F : 0.02F);\n f4 = this.bf() * f3;\n boolean flag0 = this.ag() && this instanceof EntityPlayer;\n protected boolean be() {\n public float bf() {\n return this.be() ? this.bp : 0.1F;\n this.bp = f0;\n public boolean bg() {\n int i0 = this.aT();\n if (this.bq > 0) {\n --this.bq;\n } else if (!this.bl()) {\n if (this.bb()) {\n } else if (this.bl()) {\n if (this.be()) {\n this.bh();\n this.bk();\n this.bh();\n if (this.F && this.bq == 0) {\n this.bd();\n this.bq = 10;\n this.bq = 0;\n this.bi();\n protected void bh() {}\n protected void bi() {\n public void U() {\n super.U();\n protected void bj() {}\n protected void bk() {\n public Vec3 Z() {\n public boolean bl() {\n public float ao() {\n public float bm() {\n return this.br;\n this.br = f0;\n }\n\n public Team bn() {\n return null;\n }\n\n public boolean c(EntityLivingBase entitylivingbase) {\n return this.a(entitylivingbase.bn());\n }\n\n public boolean a(Team team) {\n return this.bn() != null ? this.bn().a(team) : false;", "new_methods": [ { "arguments": [], "filename": "src/main/java/net/minecraft/server/EntityLivingBase.java", "implementation": "this.aW().b(SharedMonsterAttributes.a);\n this.aW().b(SharedMonsterAttributes.c);\n this.aW().b(SharedMonsterAttributes.d);\n if (!this.be()) {\n public boolean az() {\n if (this.S() && this.T()) {\n DamageHook hook = (DamageHook) new DamageHook(null, entity, new CanaryDamageSource(DamageSource.d), 1.0F).call();\n if (this.S() && this.a(Material.h)) {\n if (!this.az() && !this.i(Potion.o.H) && !flag0) {\n this.g(this.h(this.ak()));\n if (this.ak() == -20) {\n DamageHook hook = (DamageHook) new DamageHook(null, entity, new CanaryDamageSource(DamageSource.e), 2.0F).call();\n if (!this.q.I && this.af() && this.o instanceof EntityLivingBase) {\n if (this.aM() <= 0.0F) {\n this.aA();\n if (this.bn != null && !this.bn.S()) {\n if (this.i != null && !this.i.S()) {\n this.b((EntityLivingBase) null);\n this.aI();\n protected void aA() {\n if (!this.q.I && (this.aT > 0 || this.aB()) && !this.g_() && this.q.O().b(\"doMobLoot\")) {\n protected boolean aB() {\n public Random aC() {\n public EntityLivingBase aD() {\n public int aE() {\n return this.j;", "signature": "void ay()" }, { "arguments": [], "filename": "src/main/java/net/minecraft/server/EntityLivingBase.java", "implementation": "public int aG() {\n return this.bo;", "signature": "EntityLivingBase aF()" }, { "arguments": [], "filename": "src/main/java/net/minecraft/server/EntityLivingBase.java", "implementation": "nbttagcompound.a(\"HealF\", this.aM());\n nbttagcompound.a(\"Health\", (short) ((int) Math.ceil((double) this.aM())));\n nbttagcompound.a(\"AbsorptionAmount\", this.bm());\n ItemStack[] aitemstack = this.ad();\n nbttagcompound.a(\"Attributes\", (NBTBase) SharedMonsterAttributes.a(this.aW()));\n aitemstack = this.ad();\n SharedMonsterAttributes.a(this.aW(), nbttagcompound.m(\"Attributes\"), this.q == null ? null : this.q.Y());\n this.g(this.aS());\n protected void aI() {\n this.b(potioneffect);\n this.a(potioneffect, false);\n if (!this.ai()) {\n public void aJ() {\n this.b(potioneffect);\n public Collection aK() {\n public void c(PotionEffect potioneffect) {\n if (this.d(potioneffect)) {\n if (this.d(potioneffect)) {\n this.a((PotionEffect) this.f.get(Integer.valueOf(potioneffect.a())), true);\n public boolean d(PotionEffect potioneffect) {\n if (this.aX() == EnumCreatureAttribute.b) {\n public boolean aL() {\n return this.aX() == EnumCreatureAttribute.b;\n this.b(potioneffect);\n Potion.a[potioneffect.a()].b(this, this.aW(), potioneffect.c());\n protected void a(PotionEffect potioneffect, boolean flag0) {\n if (flag0 && !this.q.I) {\n Potion.a[potioneffect.a()].a(this, this.aW(), potioneffect.c());\n Potion.a[potioneffect.a()].b(this, this.aW(), potioneffect.c());\n protected void b(PotionEffect potioneffect) {\n Potion.a[potioneffect.a()].a(this, this.aW(), potioneffect.c());\n float f1 = this.aM();\n public final float aM() {\n this.ah.b(6, Float.valueOf(MathHelper.a(f0, 0.0F, this.aS())));\n if (this.aq()) {\n if (this.aM() <= 0.0F) {\n this.ax = this.aM();\n if (entitywolf.bT()) {\n if (this.aM() <= 0.0F) {\n this.a(this.aO(), this.aZ(), this.ba());\n this.a(this.aN(), this.aZ(), this.ba());\n EntityLivingBase entitylivingbase = this.aR();\n protected String aN() {\n protected String aO() {\n public boolean S() {\n return !this.M && this.aM() > 0.0F;\n public int aP() {\n ItemStack[] aitemstack = this.ad();\n int i0 = 25 - this.aP();\n i0 = EnchantmentHelper.a(this.ad(), damagesource);\n if (!this.aq()) {\n f0 = Math.max(f0 - this.bm(), 0.0F);\n this.m(this.bm() - (f1 - f0));\n float f2 = this.aM();\n this.aQ().a(damagesource, f2, f0);\n this.m(this.bm() - f0);\n public CombatTracker aQ() {\n public EntityLivingBase aR() {\n public final float aS() {\n public final int aT() {\n public void aU() {\n protected void aV() {\n return this.aW().a(attribute);\n public BaseAttributeMap aW() {\n this.d = new ServersideAttributeMap();\n public EnumCreatureAttribute aX() {\n public abstract ItemStack aY();\n AttributeInstance attributeinstance = this.a(SharedMonsterAttributes.d);\n if (attributeinstance.a(b) != null) {", "signature": "int aH()" }, { "arguments": [], "filename": "src/main/java/net/minecraft/server/EntityLivingBase.java", "implementation": "protected float ba() {\n protected boolean bb() {\n return this.aM() <= 0.0F;\n protected void bd() {\n if (this.ah()) {\n this.a(f0, f1, this.be() ? 0.04F : 0.02F);\n f4 = this.bf() * f3;\n boolean flag0 = this.ag() && this instanceof EntityPlayer;\n protected boolean be() {\n public float bf() {\n return this.be() ? this.bp : 0.1F;\n this.bp = f0;\n public boolean bg() {\n int i0 = this.aT();\n if (this.bq > 0) {\n --this.bq;", "signature": "float aZ()" }, { "arguments": [], "filename": "src/main/java/net/minecraft/server/EntityLivingBase.java", "implementation": "", "signature": "void bh()" }, { "arguments": [], "filename": "src/main/java/net/minecraft/server/EntityLivingBase.java", "implementation": "public void U() {\n super.U();\n protected void bj() {", "signature": "void bi()" }, { "arguments": [], "filename": "src/main/java/net/minecraft/server/EntityLivingBase.java", "implementation": "public Vec3 Z() {\n public boolean bl() {\n public float ao() {\n public float bm() {\n return this.br;\n this.br = f0;", "signature": "void bk()" }, { "arguments": [], "filename": "src/main/java/net/minecraft/server/EntityLivingBase.java", "implementation": "return null;", "signature": "Team bn()" }, { "arguments": [ "EntityLivingBase entitylivingbase" ], "filename": "src/main/java/net/minecraft/server/EntityLivingBase.java", "implementation": "return this.a(entitylivingbase.bn());", "signature": "boolean c(EntityLivingBase entitylivingbase)" } ], "old_code": " private float bo;\n private int bp;\n private float bq;\n this.ax();\n this.g(this.aP());\n protected void ax() {\n this.aT().b(SharedMonsterAttributes.a);\n this.aT().b(SharedMonsterAttributes.c);\n this.aT().b(SharedMonsterAttributes.d);\n if (!this.bb()) {\n public boolean ay() {\n if (this.R() && this.S()) {\n DamageHook hook = (DamageHook) new DamageHook(null, entity, new CanaryDamageSource(DamageSource.d), 1).call();\n if (this.R() && this.a(Material.h)) {\n if (!this.ay() && !this.i(Potion.o.H) && !flag0) {\n this.g(this.h(this.aj()));\n if (this.aj() == -20) {\n DamageHook hook = (DamageHook) new DamageHook(null, entity, new CanaryDamageSource(DamageSource.e), 2).call();\n if (!this.q.I && this.ae() && this.o instanceof EntityLivingBase) {\n if (this.aJ() <= 0.0F) {\n this.az();\n if (this.bn != null && !this.bn.R()) {\n if (this.i != null) {\n if (!this.i.R()) {\n this.b((EntityLivingBase) null);\n } else if (this.j > 0) {\n --this.j;\n } else {\n this.b((EntityLivingBase) null);\n }\n this.aF();\n protected void az() {\n if (!this.q.I && (this.aT > 0 || this.aA()) && !this.g_() && this.q.O().b(\"doMobLoot\")) {\n protected boolean aA() {\n public Random aB() {\n public EntityLivingBase aC() {\n this.j = this.i != null ? 100 : 0;\n public EntityLivingBase aD() {\n public int aE() {\n nbttagcompound.a(\"HealF\", this.aJ());\n nbttagcompound.a(\"Health\", (short) ((int) Math.ceil((double) this.aJ())));\n nbttagcompound.a(\"AbsorptionAmount\", this.bj());\n ItemStack[] aitemstack = this.ac();\n nbttagcompound.a(\"Attributes\", (NBTBase) SharedMonsterAttributes.a(this.aT()));\n aitemstack = this.ac();\n SharedMonsterAttributes.a(this.aT(), nbttagcompound.m(\"Attributes\"), this.q == null ? null : this.q.Y());\n this.g(this.aP());\n protected void aF() {\n this.c(potioneffect);\n this.b(potioneffect);\n if (!this.ah()) {\n public void aG() {\n this.c(potioneffect);\n public Collection aH() {\n public void d(PotionEffect potioneffect) {\n if (this.e(potioneffect)) {\n if (this.e(potioneffect)) {\n this.b((PotionEffect) this.f.get(Integer.valueOf(potioneffect.a())));\n public boolean e(PotionEffect potioneffect) {\n if (this.aU() == EnumCreatureAttribute.b) {\n public boolean aI() {\n return this.aU() == EnumCreatureAttribute.b;\n this.c(potioneffect);\n Potion.a[potioneffect.a()].b(this, this.aT(), potioneffect.c());\n protected void b(PotionEffect potioneffect) {\n if (!this.q.I) {\n Potion.a[potioneffect.a()].a(this, this.aT(), potioneffect.c());\n }\n\n if (!this.q.I) {\n Potion.a[potioneffect.a()].b(this, this.aT(), potioneffect.c());\n protected void c(PotionEffect potioneffect) {\n Potion.a[potioneffect.a()].a(this, this.aT(), potioneffect.c());\n float f1 = this.aJ();\n public final float aJ() {\n this.ah.b(6, Float.valueOf(MathHelper.a(f0, 0.0F, this.aP())));\n if (this.ap()) {\n if (this.aJ() <= 0.0F) {\n this.ax = this.aJ();\n if (entitywolf.bP()) {\n if (this.aJ() <= 0.0F) {\n this.a(this.aL(), this.aW(), this.aX());\n this.a(this.aK(), this.aW(), this.aX());\n EntityLivingBase entitylivingbase = this.aO();\n protected String aK() {\n protected String aL() {\n public boolean R() {\n return !this.M && this.aJ() > 0.0F;\n public int aM() {\n ItemStack[] aitemstack = this.ac();\n int i0 = 25 - this.aM();\n i0 = EnchantmentHelper.a(this.ac(), damagesource);\n if (!this.ap()) {\n f0 = Math.max(f0 - this.bj(), 0.0F);\n this.m(this.bj() - (f1 - f0));\n float f2 = this.aJ();\n this.aN().a(damagesource, f2, f0);\n this.m(this.bj() - f0);\n public CombatTracker aN() {\n public EntityLivingBase aO() {\n public final float aP() {\n public final int aQ() {\n public void aR() {\n protected void aS() {\n return this.aT().a(attribute);\n public BaseAttributeMap aT() {\n if (this.q != null && !this.q.I) {\n this.d = new ServersideAttributeMap();\n } else {\n this.d = new ClientsideAttributeMap();\n }\n public EnumCreatureAttribute aU() {\n public abstract ItemStack aV();\n if (!this.q.I) {\n AttributeInstance attributeinstance = this.a(SharedMonsterAttributes.d);\n if (flag0) {\n attributeinstance.a(c);\n }\n public abstract ItemStack[] ac();\n protected float aW() {\n protected float aX() {\n protected boolean aY() {\n return this.aJ() <= 0.0F;\n protected void ba() {\n if (this.ag()) {\n this.a(f0, f1, this.bb() ? 0.04F : 0.02F);\n f4 = this.bc() * f3;\n boolean flag0 = this.af() && this instanceof EntityPlayer;\n protected boolean bb() {\n public float bc() {\n return this.bb() ? this.bo : 0.1F;\n this.bo = f0;\n public boolean bd() {\n int i0 = this.aQ();\n if (this.bp > 0) {\n --this.bp;\n } else if (!this.bi()) {\n if (this.aY()) {\n } else if (this.bi()) {\n if (this.bb()) {\n this.be();\n this.bh();\n this.be();\n if (this.F && this.bp == 0) {\n this.ba();\n this.bp = 10;\n this.bp = 0;\n this.bf();\n protected void be() {}\n protected void bf() {\n public void T() {\n super.T();\n protected void bg() {}\n protected void bh() {\n public Vec3 Y() {\n public boolean bi() {\n public float an() {\n public float bj() {\n return this.bq;\n this.bq = f0;", "old_methods": [ { "arguments": [], "filename": "src/main/java/net/minecraft/server/EntityLivingBase.java", "implementation": "this.aT().b(SharedMonsterAttributes.a);\n this.aT().b(SharedMonsterAttributes.c);\n this.aT().b(SharedMonsterAttributes.d);\n if (!this.bb()) {\n public boolean ay() {\n if (this.R() && this.S()) {\n DamageHook hook = (DamageHook) new DamageHook(null, entity, new CanaryDamageSource(DamageSource.d), 1).call();\n if (this.R() && this.a(Material.h)) {\n if (!this.ay() && !this.i(Potion.o.H) && !flag0) {\n this.g(this.h(this.aj()));\n if (this.aj() == -20) {\n DamageHook hook = (DamageHook) new DamageHook(null, entity, new CanaryDamageSource(DamageSource.e), 2).call();\n if (!this.q.I && this.ae() && this.o instanceof EntityLivingBase) {\n if (this.aJ() <= 0.0F) {\n this.az();\n if (this.bn != null && !this.bn.R()) {\n if (this.i != null) {\n if (!this.i.R()) {\n this.b((EntityLivingBase) null);", "signature": "void ax()" }, { "arguments": [ "this.j > 0" ], "filename": "src/main/java/net/minecraft/server/EntityLivingBase.java", "implementation": "--this.j;", "signature": "else if (this.j > 0)" }, { "arguments": [], "filename": "src/main/java/net/minecraft/server/EntityLivingBase.java", "implementation": "if (!this.q.I && (this.aT > 0 || this.aA()) && !this.g_() && this.q.O().b(\"doMobLoot\")) {\n protected boolean aA() {\n public Random aB() {\n public EntityLivingBase aC() {\n this.j = this.i != null ? 100 : 0;\n public EntityLivingBase aD() {\n public int aE() {\n nbttagcompound.a(\"HealF\", this.aJ());\n nbttagcompound.a(\"Health\", (short) ((int) Math.ceil((double) this.aJ())));\n nbttagcompound.a(\"AbsorptionAmount\", this.bj());\n ItemStack[] aitemstack = this.ac();\n nbttagcompound.a(\"Attributes\", (NBTBase) SharedMonsterAttributes.a(this.aT()));\n aitemstack = this.ac();\n SharedMonsterAttributes.a(this.aT(), nbttagcompound.m(\"Attributes\"), this.q == null ? null : this.q.Y());\n this.g(this.aP());\n protected void aF() {\n this.c(potioneffect);\n this.b(potioneffect);\n if (!this.ah()) {\n public void aG() {\n this.c(potioneffect);\n public Collection aH() {\n public void d(PotionEffect potioneffect) {\n if (this.e(potioneffect)) {\n if (this.e(potioneffect)) {\n this.b((PotionEffect) this.f.get(Integer.valueOf(potioneffect.a())));\n public boolean e(PotionEffect potioneffect) {\n if (this.aU() == EnumCreatureAttribute.b) {\n public boolean aI() {\n return this.aU() == EnumCreatureAttribute.b;\n this.c(potioneffect);\n Potion.a[potioneffect.a()].b(this, this.aT(), potioneffect.c());\n protected void b(PotionEffect potioneffect) {\n if (!this.q.I) {\n Potion.a[potioneffect.a()].a(this, this.aT(), potioneffect.c());", "signature": "void az()" }, { "arguments": [ "PotionEffect potioneffect" ], "filename": "src/main/java/net/minecraft/server/EntityLivingBase.java", "implementation": "Potion.a[potioneffect.a()].a(this, this.aT(), potioneffect.c());\n float f1 = this.aJ();\n public final float aJ() {\n this.ah.b(6, Float.valueOf(MathHelper.a(f0, 0.0F, this.aP())));\n if (this.ap()) {\n if (this.aJ() <= 0.0F) {\n this.ax = this.aJ();\n if (entitywolf.bP()) {\n if (this.aJ() <= 0.0F) {\n this.a(this.aL(), this.aW(), this.aX());\n this.a(this.aK(), this.aW(), this.aX());\n EntityLivingBase entitylivingbase = this.aO();\n protected String aK() {\n protected String aL() {\n public boolean R() {\n return !this.M && this.aJ() > 0.0F;\n public int aM() {\n ItemStack[] aitemstack = this.ac();\n int i0 = 25 - this.aM();\n i0 = EnchantmentHelper.a(this.ac(), damagesource);\n if (!this.ap()) {\n f0 = Math.max(f0 - this.bj(), 0.0F);\n this.m(this.bj() - (f1 - f0));\n float f2 = this.aJ();\n this.aN().a(damagesource, f2, f0);\n this.m(this.bj() - f0);\n public CombatTracker aN() {\n public EntityLivingBase aO() {\n public final float aP() {\n public final int aQ() {\n public void aR() {\n protected void aS() {\n return this.aT().a(attribute);\n public BaseAttributeMap aT() {\n if (this.q != null && !this.q.I) {\n this.d = new ServersideAttributeMap();", "signature": "void c(PotionEffect potioneffect)" }, { "arguments": [], "filename": "src/main/java/net/minecraft/server/EntityLivingBase.java", "implementation": "public abstract ItemStack aV();\n if (!this.q.I) {\n AttributeInstance attributeinstance = this.a(SharedMonsterAttributes.d);\n if (flag0) {\n attributeinstance.a(c);", "signature": "EnumCreatureAttribute aU()" }, { "arguments": [], "filename": "src/main/java/net/minecraft/server/EntityLivingBase.java", "implementation": "protected float aX() {\n protected boolean aY() {\n return this.aJ() <= 0.0F;\n protected void ba() {\n if (this.ag()) {\n this.a(f0, f1, this.bb() ? 0.04F : 0.02F);\n f4 = this.bc() * f3;\n boolean flag0 = this.af() && this instanceof EntityPlayer;\n protected boolean bb() {\n public float bc() {\n return this.bb() ? this.bo : 0.1F;\n this.bo = f0;\n public boolean bd() {\n int i0 = this.aQ();\n if (this.bp > 0) {\n --this.bp;", "signature": "float aW()" }, { "arguments": [], "filename": "src/main/java/net/minecraft/server/EntityLivingBase.java", "implementation": "", "signature": "void be()" }, { "arguments": [], "filename": "src/main/java/net/minecraft/server/EntityLivingBase.java", "implementation": "public void T() {\n super.T();\n protected void bg() {", "signature": "void bf()" } ], "patch": "@@ -72,17 +72,18 @@ public abstract class EntityLivingBase extends Entity {\n private EntityLivingBase i;\n private int j;\n private EntityLivingBase bn;\n- private float bo;\n- private int bp;\n- private float bq;\n+ private int bo;\n+ private float bp;\n+ private int bq;\n+ private float br;\n \n // CanaryMod: Custom MaxHealth\n protected int maxHealth;\n \n public EntityLivingBase(World world) {\n super(world);\n- this.ax();\n- this.g(this.aP());\n+ this.ay();\n+ this.g(this.aS());\n this.m = true;\n this.aM = (float) (Math.random() + 1.0D) * 0.01F;\n this.b(this.u, this.v, this.w);\n@@ -99,11 +100,11 @@ protected void a() {\n this.ah.a(6, Float.valueOf(1.0F));\n }\n \n- protected void ax() {\n- this.aT().b(SharedMonsterAttributes.a);\n- this.aT().b(SharedMonsterAttributes.c);\n- this.aT().b(SharedMonsterAttributes.d);\n- if (!this.bb()) {\n+ protected void ay() {\n+ this.aW().b(SharedMonsterAttributes.a);\n+ this.aW().b(SharedMonsterAttributes.c);\n+ this.aW().b(SharedMonsterAttributes.d);\n+ if (!this.be()) {\n this.a(SharedMonsterAttributes.d).a(0.10000000149011612D);\n }\n }\n@@ -135,17 +136,17 @@ protected void a(double d0, boolean flag0) {\n super.a(d0, flag0);\n }\n \n- public boolean ay() {\n+ public boolean az() {\n return false;\n }\n \n public void x() {\n this.aD = this.aE;\n super.x();\n this.q.C.a(\"livingEntityBaseTick\");\n- if (this.R() && this.S()) {\n+ if (this.S() && this.T()) {\n // CanaryMod: call DamageHook (Suffocation)\n- DamageHook hook = (DamageHook) new DamageHook(null, entity, new CanaryDamageSource(DamageSource.d), 1).call();\n+ DamageHook hook = (DamageHook) new DamageHook(null, entity, new CanaryDamageSource(DamageSource.d), 1.0F).call();\n if (!hook.isCanceled()) {\n this.a((((CanaryDamageSource) hook.getDamageSource()).getHandle()), hook.getDamageDealt());\n }\n@@ -158,14 +159,14 @@ public void x() {\n \n boolean flag0 = this instanceof EntityPlayer && ((EntityPlayer) this).bG.a;\n \n- if (this.R() && this.a(Material.h)) {\n- if (!this.ay() && !this.i(Potion.o.H) && !flag0) {\n- this.g(this.h(this.aj()));\n- if (this.aj() == -20) {\n+ if (this.S() && this.a(Material.h)) {\n+ if (!this.az() && !this.i(Potion.o.H) && !flag0) {\n+ this.g(this.h(this.ak()));\n+ if (this.ak() == -20) {\n this.g(0);\n \n // CanaryMod - drowning damage.\n- DamageHook hook = (DamageHook) new DamageHook(null, entity, new CanaryDamageSource(DamageSource.e), 2).call();\n+ DamageHook hook = (DamageHook) new DamageHook(null, entity, new CanaryDamageSource(DamageSource.e), 2.0F).call();\n if (!hook.isCanceled()) {\n for (int i0 = 0; i0 < 8; ++i0) {\n float f0 = this.ab.nextFloat() - this.ab.nextFloat();\n@@ -182,7 +183,7 @@ public void x() {\n }\n \n this.A();\n- if (!this.q.I && this.ae() && this.o instanceof EntityLivingBase) {\n+ if (!this.q.I && this.af() && this.o instanceof EntityLivingBase) {\n this.a((Entity) null);\n }\n } else {\n@@ -202,8 +203,8 @@ public void x() {\n --this.af;\n }\n \n- if (this.aJ() <= 0.0F) {\n- this.az();\n+ if (this.aM() <= 0.0F) {\n+ this.aA();\n }\n \n if (this.aT > 0) {\n@@ -212,21 +213,15 @@ public void x() {\n this.aS = null;\n }\n \n- if (this.bn != null && !this.bn.R()) {\n+ if (this.bn != null && !this.bn.S()) {\n this.bn = null;\n }\n \n- if (this.i != null) {\n- if (!this.i.R()) {\n- this.b((EntityLivingBase) null);\n- } else if (this.j > 0) {\n- --this.j;\n- } else {\n- this.b((EntityLivingBase) null);\n- }\n+ if (this.i != null && !this.i.S()) {\n+ this.b((EntityLivingBase) null);\n }\n \n- this.aF();\n+ this.aI();\n this.aZ = this.aY;\n this.aO = this.aN;\n this.aQ = this.aP;\n@@ -239,12 +234,12 @@ public boolean g_() {\n return false;\n }\n \n- protected void az() {\n+ protected void aA() {\n ++this.aB;\n if (this.aB == 20) {\n int i0;\n \n- if (!this.q.I && (this.aT > 0 || this.aA()) && !this.g_() && this.q.O().b(\"doMobLoot\")) {\n+ if (!this.q.I && (this.aT > 0 || this.aB()) && !this.g_() && this.q.O().b(\"doMobLoot\")) {\n i0 = this.e(this.aS);\n \n while (i0 > 0) {\n@@ -277,45 +272,57 @@ protected int e(EntityPlayer entityplayer) {\n return 0;\n }\n \n- protected boolean aA() {\n+ protected boolean aB() {\n return false;\n }\n \n- public Random aB() {\n+ public Random aC() {\n return this.ab;\n }\n \n- public EntityLivingBase aC() {\n+ public EntityLivingBase aD() {\n return this.i;\n }\n \n+ public int aE() {\n+ return this.j;\n+ }\n+\n public void b(EntityLivingBase entitylivingbase) {\n this.i = entitylivingbase;\n- this.j = this.i != null ? 100 : 0;\n+ this.j = this.ac;\n }\n \n- public EntityLivingBase aD() {\n+ public EntityLivingBase aF() {\n return this.bn;\n }\n \n+ public int aG() {\n+ return this.bo;\n+ }\n+\n public void k(Entity entity) {\n if (entity instanceof EntityLivingBase) {\n this.bn = (EntityLivingBase) entity;\n+ } else {\n+ this.bn = null;\n }\n+\n+ this.bo = this.ac;\n }\n \n- public int aE() {\n+ public int aH() {\n return this.aV;\n }\n \n public void b(NBTTagCompound nbttagcompound) {\n- nbttagcompound.a(\"HealF\", this.aJ());\n- nbttagcompound.a(\"Health\", (short) ((int) Math.ceil((double) this.aJ())));\n+ nbttagcompound.a(\"HealF\", this.aM());\n+ nbttagcompound.a(\"Health\", (short) ((int) Math.ceil((double) this.aM())));\n nbttagcompound.a(\"HurtTime\", (short) this.ay);\n nbttagcompound.a(\"DeathTime\", (short) this.aB);\n nbttagcompound.a(\"AttackTime\", (short) this.aC);\n- nbttagcompound.a(\"AbsorptionAmount\", this.bj());\n- ItemStack[] aitemstack = this.ac();\n+ nbttagcompound.a(\"AbsorptionAmount\", this.bm());\n+ ItemStack[] aitemstack = this.ad();\n int i0 = aitemstack.length;\n \n int i1;\n@@ -328,8 +335,8 @@ public void b(NBTTagCompound nbttagcompound) {\n }\n }\n \n- nbttagcompound.a(\"Attributes\", (NBTBase) SharedMonsterAttributes.a(this.aT()));\n- aitemstack = this.ac();\n+ nbttagcompound.a(\"Attributes\", (NBTBase) SharedMonsterAttributes.a(this.aW()));\n+ aitemstack = this.ad();\n i0 = aitemstack.length;\n \n for (i1 = 0; i1 < i0; ++i1) {\n@@ -356,7 +363,7 @@ public void b(NBTTagCompound nbttagcompound) {\n public void a(NBTTagCompound nbttagcompound) {\n this.m(nbttagcompound.g(\"AbsorptionAmount\"));\n if (nbttagcompound.b(\"Attributes\") && this.q != null && !this.q.I) {\n- SharedMonsterAttributes.a(this.aT(), nbttagcompound.m(\"Attributes\"), this.q == null ? null : this.q.Y());\n+ SharedMonsterAttributes.a(this.aW(), nbttagcompound.m(\"Attributes\"), this.q == null ? null : this.q.Y());\n }\n \n if (nbttagcompound.b(\"ActiveEffects\")) {\n@@ -376,7 +383,7 @@ public void a(NBTTagCompound nbttagcompound) {\n NBTBase nbtbase = nbttagcompound.a(\"Health\");\n \n if (nbtbase == null) {\n- this.g(this.aP());\n+ this.g(this.aS());\n } else if (nbtbase.a() == 5) {\n this.g(((NBTTagFloat) nbtbase).a);\n } else if (nbtbase.a() == 2) {\n@@ -389,7 +396,7 @@ public void a(NBTTagCompound nbttagcompound) {\n this.aC = nbttagcompound.d(\"AttackTime\");\n }\n \n- protected void aF() {\n+ protected void aI() {\n Iterator iterator = this.f.keySet().iterator();\n \n while (iterator.hasNext()) {\n@@ -399,10 +406,10 @@ protected void aF() {\n if (!potioneffect.a(this)) {\n if (!this.q.I) {\n iterator.remove();\n- this.c(potioneffect);\n+ this.b(potioneffect);\n }\n } else if (potioneffect.b() % 600 == 0) {\n- this.b(potioneffect);\n+ this.a(potioneffect, false);\n }\n }\n \n@@ -431,7 +438,7 @@ protected void aF() {\n if (i0 > 0) {\n boolean flag1 = false;\n \n- if (!this.ah()) {\n+ if (!this.ai()) {\n flag1 = this.ab.nextBoolean();\n } else {\n flag1 = this.ab.nextInt(15) == 0;\n@@ -451,7 +458,7 @@ protected void aF() {\n }\n }\n \n- public void aG() {\n+ public void aJ() {\n Iterator iterator = this.f.keySet().iterator();\n \n while (iterator.hasNext()) {\n@@ -460,12 +467,12 @@ public void aG() {\n \n if (!this.q.I) {\n iterator.remove();\n- this.c(potioneffect);\n+ this.b(potioneffect);\n }\n }\n }\n \n- public Collection aH() {\n+ public Collection aK() {\n return this.f.values();\n }\n \n@@ -481,19 +488,19 @@ public PotionEffect b(Potion potion) {\n return (PotionEffect) this.f.get(Integer.valueOf(potion.H));\n }\n \n- public void d(PotionEffect potioneffect) {\n- if (this.e(potioneffect)) {\n+ public void c(PotionEffect potioneffect) {\n+ if (this.d(potioneffect)) {\n // CanaryMod: PotionEffectApplied\n PotionEffectAppliedHook hook = (PotionEffectAppliedHook) new PotionEffectAppliedHook((net.canarymod.api.entity.living.LivingBase) getCanaryEntity(), new CanaryPotionEffect(potioneffect)).call();\n if (hook.getPotionEffect() == null) {\n return;\n }\n potioneffect = ((CanaryPotionEffect) hook.getPotionEffect()).getHandle();\n //\n- if (this.e(potioneffect)) {\n+ if (this.d(potioneffect)) {\n if (this.f.containsKey(Integer.valueOf(potioneffect.a()))) {\n ((PotionEffect) this.f.get(Integer.valueOf(potioneffect.a()))).a(potioneffect);\n- this.b((PotionEffect) this.f.get(Integer.valueOf(potioneffect.a())));\n+ this.a((PotionEffect) this.f.get(Integer.valueOf(potioneffect.a())), true);\n } else {\n this.f.put(Integer.valueOf(potioneffect.a()), potioneffect);\n this.a(potioneffect);\n@@ -502,8 +509,8 @@ public void d(PotionEffect potioneffect) {\n }\n }\n \n- public boolean e(PotionEffect potioneffect) {\n- if (this.aU() == EnumCreatureAttribute.b) {\n+ public boolean d(PotionEffect potioneffect) {\n+ if (this.aX() == EnumCreatureAttribute.b) {\n int i0 = potioneffect.a();\n \n if (i0 == Potion.l.H || i0 == Potion.u.H) {\n@@ -514,70 +521,67 @@ public boolean e(PotionEffect potioneffect) {\n return true;\n }\n \n- public boolean aI() {\n- return this.aU() == EnumCreatureAttribute.b;\n+ public boolean aL() {\n+ return this.aX() == EnumCreatureAttribute.b;\n }\n \n public void k(int i0) {\n PotionEffect potioneffect = (PotionEffect) this.f.remove(Integer.valueOf(i0));\n \n if (potioneffect != null) {\n- this.c(potioneffect);\n+ this.b(potioneffect);\n }\n }\n \n protected void a(PotionEffect potioneffect) {\n this.h = true;\n if (!this.q.I) {\n- Potion.a[potioneffect.a()].b(this, this.aT(), potioneffect.c());\n+ Potion.a[potioneffect.a()].b(this, this.aW(), potioneffect.c());\n }\n }\n \n- protected void b(PotionEffect potioneffect) {\n+ protected void a(PotionEffect potioneffect, boolean flag0) {\n this.h = true;\n- if (!this.q.I) {\n- Potion.a[potioneffect.a()].a(this, this.aT(), potioneffect.c());\n- }\n-\n- if (!this.q.I) {\n- Potion.a[potioneffect.a()].b(this, this.aT(), potioneffect.c());\n+ if (flag0 && !this.q.I) {\n+ Potion.a[potioneffect.a()].a(this, this.aW(), potioneffect.c());\n+ Potion.a[potioneffect.a()].b(this, this.aW(), potioneffect.c());\n }\n }\n \n- protected void c(PotionEffect potioneffect) {\n+ protected void b(PotionEffect potioneffect) {\n // CanaryMod: PotionEffectFinish\n new PotionEffectFinishHook((net.canarymod.api.entity.living.LivingBase) getCanaryEntity(), new CanaryPotionEffect(potioneffect)).call();\n //\n this.h = true;\n if (!this.q.I) {\n- Potion.a[potioneffect.a()].a(this, this.aT(), potioneffect.c());\n+ Potion.a[potioneffect.a()].a(this, this.aW(), potioneffect.c());\n }\n }\n \n public void f(float f0) {\n- float f1 = this.aJ();\n+ float f1 = this.aM();\n \n if (f1 > 0.0F) {\n this.g(f1 + f0);\n }\n }\n \n- public final float aJ() {\n+ public final float aM() {\n return this.ah.d(6);\n }\n \n public void g(float f0) {\n- this.ah.b(6, Float.valueOf(MathHelper.a(f0, 0.0F, this.aP())));\n+ this.ah.b(6, Float.valueOf(MathHelper.a(f0, 0.0F, this.aS())));\n }\n \n public boolean a(DamageSource damagesource, float f0) {\n- if (this.ap()) {\n+ if (this.aq()) {\n return false;\n } else if (this.q.I) {\n return false;\n } else {\n this.aV = 0;\n- if (this.aJ() <= 0.0F) {\n+ if (this.aM() <= 0.0F) {\n return false;\n } else if (damagesource.m() && this.a(Potion.n)) {\n return false;\n@@ -629,7 +633,7 @@ public boolean a(DamageSource damagesource, float f0) {\n return false;\n }\n this.bc = f0;\n- this.ax = this.aJ();\n+ this.ax = this.aM();\n this.af = this.aI;\n this.d((((CanaryDamageSource) hook.getDamageSource()).getHandle()), hook.getDamageDealt());\n this.ay = this.az = 10;\n@@ -650,7 +654,7 @@ public boolean a(DamageSource damagesource, float f0) {\n } else if (entity instanceof EntityWolf) {\n EntityWolf entitywolf = (EntityWolf) entity;\n \n- if (entitywolf.bP()) {\n+ if (entitywolf.bT()) {\n this.aT = 100;\n this.aS = null;\n }\n@@ -679,14 +683,14 @@ public boolean a(DamageSource damagesource, float f0) {\n }\n }\n \n- if (this.aJ() <= 0.0F) {\n+ if (this.aM() <= 0.0F) {\n if (flag0) {\n- this.a(this.aL(), this.aW(), this.aX());\n+ this.a(this.aO(), this.aZ(), this.ba());\n }\n \n this.a(damagesource);\n } else if (flag0) {\n- this.a(this.aK(), this.aW(), this.aX());\n+ this.a(this.aN(), this.aZ(), this.ba());\n }\n \n return true;\n@@ -716,7 +720,7 @@ public void a(DamageSource damagesource) {\n new EntityDeathHook(this.getCanaryEntity(), damagesource.getCanaryDamageSource()).call();\n //\n Entity entity = damagesource.i();\n- EntityLivingBase entitylivingbase = this.aO();\n+ EntityLivingBase entitylivingbase = this.aR();\n \n if (this.bb >= 0 && entitylivingbase != null) {\n entitylivingbase.b(this, this.bb);\n@@ -770,11 +774,11 @@ public void a(Entity entity, float f0, double d0, double d1) {\n }\n }\n \n- protected String aK() {\n+ protected String aN() {\n return \"damage.hit\";\n }\n \n- protected String aL() {\n+ protected String aO() {\n return \"damage.hit\";\n }\n \n@@ -791,8 +795,8 @@ public boolean e() {\n return i3 == Block.aK.cF || i3 == Block.bz.cF;\n }\n \n- public boolean R() {\n- return !this.M && this.aJ() > 0.0F;\n+ public boolean S() {\n+ return !this.M && this.aM() > 0.0F;\n }\n \n protected void b(float f0) {\n@@ -825,9 +829,9 @@ protected void b(float f0) {\n }\n }\n \n- public int aM() {\n+ public int aP() {\n int i0 = 0;\n- ItemStack[] aitemstack = this.ac();\n+ ItemStack[] aitemstack = this.ad();\n int i1 = aitemstack.length;\n \n for (int i2 = 0; i2 < i1; ++i2) {\n@@ -847,7 +851,7 @@ protected void h(float f0) {}\n \n protected float b(DamageSource damagesource, float f0) {\n if (!damagesource.e()) {\n- int i0 = 25 - this.aM();\n+ int i0 = 25 - this.aP();\n float f1 = f0 * (float) i0;\n \n this.h(f0);\n@@ -876,7 +880,7 @@ protected float c(DamageSource damagesource, float f0) {\n if (f0 <= 0.0F) {\n return 0.0F;\n } else {\n- i0 = EnchantmentHelper.a(this.ac(), damagesource);\n+ i0 = EnchantmentHelper.a(this.ad(), damagesource);\n if (i0 > 20) {\n i0 = 20;\n }\n@@ -892,36 +896,36 @@ protected float c(DamageSource damagesource, float f0) {\n }\n \n protected void d(DamageSource damagesource, float f0) {\n- if (!this.ap()) {\n+ if (!this.aq()) {\n f0 = this.b(damagesource, f0);\n f0 = this.c(damagesource, f0);\n float f1 = f0;\n \n- f0 = Math.max(f0 - this.bj(), 0.0F);\n- this.m(this.bj() - (f1 - f0));\n+ f0 = Math.max(f0 - this.bm(), 0.0F);\n+ this.m(this.bm() - (f1 - f0));\n if (f0 != 0.0F) {\n- float f2 = this.aJ();\n+ float f2 = this.aM();\n \n this.g(f2 - f0);\n- this.aN().a(damagesource, f2, f0);\n- this.m(this.bj() - f0);\n+ this.aQ().a(damagesource, f2, f0);\n+ this.m(this.bm() - f0);\n }\n }\n }\n \n- public CombatTracker aN() {\n+ public CombatTracker aQ() {\n return this.e;\n }\n \n- public EntityLivingBase aO() {\n+ public EntityLivingBase aR() {\n return (EntityLivingBase) (this.e.c() != null ? this.e.c() : (this.aS != null ? this.aS : (this.i != null ? this.i : null)));\n }\n \n- public final float aP() {\n+ public final float aS() {\n return (float) this.a(SharedMonsterAttributes.a).e();\n }\n \n- public final int aQ() {\n+ public final int aT() {\n return this.ah.a(9);\n }\n \n@@ -933,7 +937,7 @@ private int h() {\n return this.a(Potion.e) ? 6 - (1 + this.b(Potion.e).c()) * 1 : (this.a(Potion.f) ? 6 + (1 + this.b(Potion.f).c()) * 2 : 6);\n }\n \n- public void aR() {\n+ public void aU() {\n if (!this.au || this.av >= this.h() / 2 || this.av < 0) {\n this.av = -1;\n this.au = true;\n@@ -947,7 +951,7 @@ protected void B() {\n this.a(DamageSource.i, 4.0F);\n }\n \n- protected void aS() {\n+ protected void aV() {\n int i0 = this.h();\n \n if (this.au) {\n@@ -964,55 +968,52 @@ protected void aS() {\n }\n \n public AttributeInstance a(Attribute attribute) {\n- return this.aT().a(attribute);\n+ return this.aW().a(attribute);\n }\n \n- public BaseAttributeMap aT() {\n+ public BaseAttributeMap aW() {\n if (this.d == null) {\n- if (this.q != null && !this.q.I) {\n- this.d = new ServersideAttributeMap();\n- } else {\n- this.d = new ClientsideAttributeMap();\n- }\n+ this.d = new ServersideAttributeMap();\n }\n \n return this.d;\n }\n \n- public EnumCreatureAttribute aU() {\n+ public EnumCreatureAttribute aX() {\n return EnumCreatureAttribute.a;\n }\n \n- public abstract ItemStack aV();\n+ public abstract ItemStack aY();\n \n public abstract ItemStack n(int i0);\n \n public abstract void c(int i0, ItemStack itemstack);\n \n public void c(boolean flag0) {\n super.c(flag0);\n- if (!this.q.I) {\n- AttributeInstance attributeinstance = this.a(SharedMonsterAttributes.d);\n+ AttributeInstance attributeinstance = this.a(SharedMonsterAttributes.d);\n \n+ if (attributeinstance.a(b) != null) {\n attributeinstance.b(c);\n- if (flag0) {\n- attributeinstance.a(c);\n- }\n+ }\n+\n+ if (flag0) {\n+ attributeinstance.a(c);\n }\n }\n \n- public abstract ItemStack[] ac();\n+ public abstract ItemStack[] ad();\n \n- protected float aW() {\n+ protected float aZ() {\n return 1.0F;\n }\n \n- protected float aX() {\n+ protected float ba() {\n return this.g_() ? (this.ab.nextFloat() - this.ab.nextFloat()) * 0.2F + 1.5F : (this.ab.nextFloat() - this.ab.nextFloat()) * 0.2F + 1.0F;\n }\n \n- protected boolean aY() {\n- return this.aJ() <= 0.0F;\n+ protected boolean bb() {\n+ return this.aM() <= 0.0F;\n }\n \n public void a(double d0, double d1, double d2) {\n@@ -1050,13 +1051,13 @@ public void l(Entity entity) {\n this.a(d0, d1, d2);\n }\n \n- protected void ba() {\n+ protected void bd() {\n this.y = 0.41999998688697815D;\n if (this.a(Potion.j)) {\n this.y += (double) ((float) (this.b(Potion.j).c() + 1) * 0.1F);\n }\n \n- if (this.ag()) {\n+ if (this.ah()) {\n float f0 = this.A * 0.017453292F;\n \n this.x -= (double) (MathHelper.a(f0) * 0.2F);\n@@ -1071,7 +1072,7 @@ public void e(float f0, float f1) {\n \n if (this.G() && (!(this instanceof EntityPlayer) || !((EntityPlayer) this).bG.b)) {\n d0 = this.v;\n- this.a(f0, f1, this.bb() ? 0.04F : 0.02F);\n+ this.a(f0, f1, this.be() ? 0.04F : 0.02F);\n this.d(this.x, this.y, this.z);\n this.x *= 0.800000011920929D;\n this.y *= 0.800000011920929D;\n@@ -1107,7 +1108,7 @@ public void e(float f0, float f1) {\n float f4;\n \n if (this.F) {\n- f4 = this.bc() * f3;\n+ f4 = this.bf() * f3;\n } else {\n f4 = this.aR;\n }\n@@ -1147,7 +1148,7 @@ public void e(float f0, float f1) {\n this.y = -0.15D;\n }\n \n- boolean flag0 = this.af() && this instanceof EntityPlayer;\n+ boolean flag0 = this.ag() && this instanceof EntityPlayer;\n \n if (flag0 && this.y < 0.0D) {\n this.y = 0.0D;\n@@ -1187,31 +1188,31 @@ public void e(float f0, float f1) {\n this.aH += this.aG;\n }\n \n- protected boolean bb() {\n+ protected boolean be() {\n return false;\n }\n \n- public float bc() {\n- return this.bb() ? this.bo : 0.1F;\n+ public float bf() {\n+ return this.be() ? this.bp : 0.1F;\n }\n \n public void i(float f0) {\n- this.bo = f0;\n+ this.bp = f0;\n }\n \n public boolean m(Entity entity) {\n this.k(entity);\n return false;\n }\n \n- public boolean bd() {\n+ public boolean bg() {\n return false;\n }\n \n public void l_() {\n super.l_();\n if (!this.q.I) {\n- int i0 = this.aQ();\n+ int i0 = this.aT();\n \n if (i0 > 0) {\n if (this.aw <= 0) {\n@@ -1337,8 +1338,8 @@ protected float f(float f0, float f1) {\n }\n \n public void c() {\n- if (this.bp > 0) {\n- --this.bp;\n+ if (this.bq > 0) {\n+ --this.bq;\n }\n \n if (this.bh > 0) {\n@@ -1352,7 +1353,7 @@ public void c() {\n --this.bh;\n this.b(d0, d1, d2);\n this.b(this.A, this.B);\n- } else if (!this.bi()) {\n+ } else if (!this.bl()) {\n this.x *= 0.98D;\n this.y *= 0.98D;\n this.z *= 0.98D;\n@@ -1371,41 +1372,41 @@ public void c() {\n }\n \n this.q.C.a(\"ai\");\n- if (this.aY()) {\n+ if (this.bb()) {\n this.bd = false;\n this.be = 0.0F;\n this.bf = 0.0F;\n this.bg = 0.0F;\n- } else if (this.bi()) {\n- if (this.bb()) {\n+ } else if (this.bl()) {\n+ if (this.be()) {\n this.q.C.a(\"newAi\");\n- this.be();\n+ this.bh();\n this.q.C.b();\n } else {\n this.q.C.a(\"oldAi\");\n- this.bh();\n+ this.bk();\n this.q.C.b();\n this.aP = this.A;\n }\n }\n // CanaryMod: NPC Addition, this is vital for pathfinding\n // Just call the \"newAi\" method up there ^^\n if (this instanceof EntityNonPlayableCharacter) {\n- this.be();\n+ this.bh();\n }// END\n this.q.C.b();\n this.q.C.a(\"jump\");\n if (this.bd) {\n if (!this.G() && !this.I()) {\n- if (this.F && this.bp == 0) {\n- this.ba();\n- this.bp = 10;\n+ if (this.F && this.bq == 0) {\n+ this.bd();\n+ this.bq = 10;\n }\n } else {\n this.y += 0.03999999910593033D;\n }\n } else {\n- this.bp = 0;\n+ this.bq = 0;\n }\n \n this.q.C.b();\n@@ -1417,15 +1418,15 @@ public void c() {\n this.q.C.b();\n this.q.C.a(\"push\");\n if (!this.q.I) {\n- this.bf();\n+ this.bi();\n }\n \n this.q.C.b();\n }\n \n- protected void be() {}\n+ protected void bh() {}\n \n- protected void bf() {\n+ protected void bi() {\n List list = this.q.b((Entity) this, this.E.b(0.20000000298023224D, 0.0D, 0.20000000298023224D));\n \n if (list != null && !list.isEmpty()) {\n@@ -1443,16 +1444,16 @@ protected void n(Entity entity) {\n entity.f((Entity) this);\n }\n \n- public void T() {\n- super.T();\n+ public void U() {\n+ super.U();\n this.aW = this.aX;\n this.aX = 0.0F;\n this.T = 0.0F;\n }\n \n- protected void bg() {}\n+ protected void bj() {}\n \n- protected void bh() {\n+ protected void bk() {\n ++this.aV;\n }\n \n@@ -1482,7 +1483,7 @@ public boolean o(Entity entity) {\n return this.q.a(this.q.V().a(this.u, this.v + (double) this.f(), this.w), this.q.V().a(entity.u, entity.v + (double) entity.f(), entity.w)) == null;\n }\n \n- public Vec3 Y() {\n+ public Vec3 Z() {\n return this.j(1.0F);\n }\n \n@@ -1510,7 +1511,7 @@ public Vec3 j(float f0) {\n }\n }\n \n- public boolean bi() {\n+ public boolean bl() {\n return !this.q.I;\n }\n \n@@ -1530,20 +1531,32 @@ protected void J() {\n this.J = this.ab.nextDouble() >= this.a(SharedMonsterAttributes.c).e();\n }\n \n- public float an() {\n+ public float ao() {\n return this.aP;\n }\n \n- public float bj() {\n- return this.bq;\n+ public float bm() {\n+ return this.br;\n }\n \n public void m(float f0) {\n if (f0 < 0.0F) {\n f0 = 0.0F;\n }\n \n- this.bq = f0;\n+ this.br = f0;\n+ }\n+\n+ public Team bn() {\n+ return null;\n+ }\n+\n+ public boolean c(EntityLivingBase entitylivingbase) {\n+ return this.a(entitylivingbase.bn());\n+ }\n+\n+ public boolean a(Team team) {\n+ return this.bn() != null ? this.bn().a(team) : false;\n }\n \n // CanaryMod", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityLivingBase.java", "sha": "2234a8a65e7277e6f158408b3dfc05f4dbe4b648", "status": "modified" }, { "additions": 24, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityMagmaCube.java", "changes": 50, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityMagmaCube.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 26, "filename": "src/main/java/net/minecraft/server/EntityMagmaCube.java", "new_code": " protected void ay() {\n super.ay();\n public boolean bs() {\n public int aP() {\n return this.bR() * 3;\n protected String bJ() {\n protected EntitySlime bK() {\n if (i1 > 0 && this.bR() > 1) {\n public boolean ae() {\n protected int bL() {\n return super.bL() * 4;\n protected void bM() {\n protected void bd() {\n this.y = (double) (0.42F + (float) this.bR() * 0.1F);\n protected boolean bN() {\n protected int bO() {\n return super.bO() + 2;\n protected String aN() {\n return \"mob.slime.\" + (this.bR() > 1 ? \"big\" : \"small\");\n protected String aO() {\n return \"mob.slime.\" + (this.bR() > 1 ? \"big\" : \"small\");\n protected String bP() {\n return this.bR() > 1 ? \"mob.magmacube.big\" : \"mob.magmacube.small\";\n protected boolean bQ() {", "new_methods": [], "old_code": "\n\n protected void ax() {\n super.ax();\n public boolean bo() {\n public int aM() {\n return this.bN() * 3;\n protected String bF() {\n protected EntitySlime bG() {\n if (i1 > 0 && this.bN() > 1) {\n public boolean ad() {\n protected int bH() {\n return super.bH() * 4;\n protected void bI() {\n protected void ba() {\n this.y = (double) (0.42F + (float) this.bN() * 0.1F);\n protected boolean bJ() {\n protected int bK() {\n return super.bK() + 2;\n protected String aK() {\n return \"mob.slime.\" + (this.bN() > 1 ? \"big\" : \"small\");\n protected String aL() {\n return \"mob.slime.\" + (this.bN() > 1 ? \"big\" : \"small\");\n protected String bL() {\n return this.bN() > 1 ? \"mob.magmacube.big\" : \"mob.magmacube.small\";\n protected boolean bM() {", "old_methods": [], "patch": "@@ -1,9 +1,7 @@\n package net.minecraft.server;\n \n-\n import net.canarymod.api.entity.living.monster.CanaryMagmaCube;\n \n-\n public class EntityMagmaCube extends EntitySlime {\n \n public EntityMagmaCube(World world) {\n@@ -13,28 +11,28 @@ public EntityMagmaCube(World world) {\n this.entity = new CanaryMagmaCube(this); // CanaryMod: Wrap Entity\n }\n \n- protected void ax() {\n- super.ax();\n+ protected void ay() {\n+ super.ay();\n this.a(SharedMonsterAttributes.d).a(0.20000000298023224D);\n }\n \n- public boolean bo() {\n+ public boolean bs() {\n return this.q.r > 0 && this.q.b(this.E) && this.q.a((Entity) this, this.E).isEmpty() && !this.q.d(this.E);\n }\n \n- public int aM() {\n- return this.bN() * 3;\n+ public int aP() {\n+ return this.bR() * 3;\n }\n \n public float d(float f0) {\n return 1.0F;\n }\n \n- protected String bF() {\n+ protected String bJ() {\n return \"flame\";\n }\n \n- protected EntitySlime bG() {\n+ protected EntitySlime bK() {\n return new EntityMagmaCube(this.q);\n }\n \n@@ -45,7 +43,7 @@ protected int s() {\n protected void b(boolean flag0, int i0) {\n int i1 = this.s();\n \n- if (i1 > 0 && this.bN() > 1) {\n+ if (i1 > 0 && this.bR() > 1) {\n int i2 = this.ab.nextInt(4) - 2;\n \n if (i0 > 0) {\n@@ -58,50 +56,50 @@ protected void b(boolean flag0, int i0) {\n }\n }\n \n- public boolean ad() {\n+ public boolean ae() {\n return false;\n }\n \n- protected int bH() {\n- return super.bH() * 4;\n+ protected int bL() {\n+ return super.bL() * 4;\n }\n \n- protected void bI() {\n+ protected void bM() {\n this.h *= 0.9F;\n }\n \n- protected void ba() {\n- this.y = (double) (0.42F + (float) this.bN() * 0.1F);\n+ protected void bd() {\n+ this.y = (double) (0.42F + (float) this.bR() * 0.1F);\n this.an = true;\n }\n \n protected void b(float f0) {}\n \n- protected boolean bJ() {\n+ protected boolean bN() {\n return true;\n }\n \n- protected int bK() {\n- return super.bK() + 2;\n+ protected int bO() {\n+ return super.bO() + 2;\n }\n \n- protected String aK() {\n- return \"mob.slime.\" + (this.bN() > 1 ? \"big\" : \"small\");\n+ protected String aN() {\n+ return \"mob.slime.\" + (this.bR() > 1 ? \"big\" : \"small\");\n }\n \n- protected String aL() {\n- return \"mob.slime.\" + (this.bN() > 1 ? \"big\" : \"small\");\n+ protected String aO() {\n+ return \"mob.slime.\" + (this.bR() > 1 ? \"big\" : \"small\");\n }\n \n- protected String bL() {\n- return this.bN() > 1 ? \"mob.magmacube.big\" : \"mob.magmacube.small\";\n+ protected String bP() {\n+ return this.bR() > 1 ? \"mob.magmacube.big\" : \"mob.magmacube.small\";\n }\n \n public boolean I() {\n return false;\n }\n \n- protected boolean bM() {\n+ protected boolean bQ() {\n return true;\n }\n }", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityMagmaCube.java", "sha": "2a5ccfa6a744831ea16d923985781d33ee7583ad", "status": "modified" }, { "additions": 5, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityMinecart.java", "changes": 10, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityMinecart.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 5, "filename": "src/main/java/net/minecraft/server/EntityMinecart.java", "new_code": " public double X() {\n if (this.aq()) {\n this.ao = this.ab();\n public String am() {\n return this.c != null ? this.c : super.am();", "new_methods": [], "old_code": " public double W() {\n if (this.ap()) {\n this.ao = this.aa();\n public String al() {\n return this.c != null ? this.c : super.al();", "old_methods": [], "patch": "@@ -95,13 +95,13 @@ public EntityMinecart(World world, double d0, double d1, double d2) {\n this.t = d2;\n }\n \n- public double W() {\n+ public double X() {\n return (double) this.P * 0.0D - 0.30000001192092896D;\n }\n \n public boolean a(DamageSource damagesource, float f0) {\n if (!this.q.I && !this.M) {\n- if (this.ap()) {\n+ if (this.aq()) {\n return false;\n } else {\n // CanaryMod: VehicleDamage\n@@ -195,7 +195,7 @@ public void l_() {\n if (Configuration.getWorldConfig(getCanaryWorld().getFqName()).isNetherAllowed()) {\n if (this.o == null && this.aq++ >= i0) {\n this.aq = i0;\n- this.ao = this.aa();\n+ this.ao = this.ab();\n byte b0;\n \n if (this.q.t.i == -1) {\n@@ -831,8 +831,8 @@ public void a(String s0) {\n this.c = s0;\n }\n \n- public String al() {\n- return this.c != null ? this.c : super.al();\n+ public String am() {\n+ return this.c != null ? this.c : super.am();\n }\n \n public boolean c() {", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityMinecart.java", "sha": "d273247f4f96a43016246e27ff5d7ab0bf16b94d", "status": "modified" }, { "additions": 0, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityMinecartChest.java", "changes": 2, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityMinecartChest.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 2, "filename": "src/main/java/net/minecraft/server/EntityMinecartChest.java", "new_code": "", "new_methods": [], "old_code": "\n", "old_methods": [], "patch": "@@ -1,9 +1,7 @@\n package net.minecraft.server;\n \n-\n import net.canarymod.api.entity.vehicle.CanaryChestMinecart;\n \n-\n public class EntityMinecartChest extends EntityMinecartContainer {\n \n public EntityMinecartChest(World world) {", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityMinecartChest.java", "sha": "b458c4cec2e73d916302b59cab0dcfa7cb6c1888", "status": "modified" }, { "additions": 0, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityMinecartContainer.java", "changes": 1, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityMinecartContainer.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 1, "filename": "src/main/java/net/minecraft/server/EntityMinecartContainer.java", "new_code": "", "new_methods": [], "old_code": "", "old_methods": [], "patch": "@@ -1,6 +1,5 @@\n package net.minecraft.server;\n \n-\n public abstract class EntityMinecartContainer extends EntityMinecart implements IInventory {\n \n public ItemStack[] a = new ItemStack[36]; // CanaryMod: private -> public", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityMinecartContainer.java", "sha": "ddb13b60263930ad796d2b452fceeb9e75a808aa", "status": "modified" }, { "additions": 0, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityMinecartFurnace.java", "changes": 2, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityMinecartFurnace.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 2, "filename": "src/main/java/net/minecraft/server/EntityMinecartFurnace.java", "new_code": "", "new_methods": [], "old_code": "\n", "old_methods": [], "patch": "@@ -1,9 +1,7 @@\n package net.minecraft.server;\n \n-\n import net.canarymod.api.entity.vehicle.CanaryFurnaceMinecart;\n \n-\n public class EntityMinecartFurnace extends EntityMinecart {\n \n public int c; // CanaryMod: private -> public", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityMinecartFurnace.java", "sha": "dba18f40493073652843ed7595416f133f3dac76", "status": "modified" }, { "additions": 11, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityMinecartHopper.java", "changes": 24, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityMinecartHopper.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 13, "filename": "src/main/java/net/minecraft/server/EntityMinecartHopper.java", "new_code": " if (flag1 != this.ay()) {\n public boolean ay() {\n public World az() {\n public double aA() {\n public double aB() {\n public double aC() {\n if (!this.q.I && this.S() && this.ay()) {\n if (!this.aE()) {\n if (this.aD()) {\n public boolean aD() {\n public boolean aE() {", "new_methods": [], "old_code": "\n\n if (flag1 != this.ax()) {\n public boolean ax() {\n public World ay() {\n public double az() {\n public double aA() {\n public double aB() {\n if (!this.q.I && this.R() && this.ax()) {\n if (!this.aD()) {\n if (this.aC()) {\n public boolean aC() {\n public boolean aD() {", "old_methods": [], "patch": "@@ -1,10 +1,8 @@\n package net.minecraft.server;\n \n-\n import java.util.List;\n import net.canarymod.api.entity.vehicle.CanaryHopperMinecart;\n \n-\n public class EntityMinecartHopper extends EntityMinecartContainer implements Hopper {\n \n private boolean a = true;\n@@ -47,50 +45,50 @@ public boolean c(EntityPlayer entityplayer) {\n public void a(int i0, int i1, int i2, boolean flag0) {\n boolean flag1 = !flag0;\n \n- if (flag1 != this.ax()) {\n+ if (flag1 != this.ay()) {\n this.f(flag1);\n }\n }\n \n- public boolean ax() {\n+ public boolean ay() {\n return this.a;\n }\n \n public void f(boolean flag0) {\n this.a = flag0;\n }\n \n- public World ay() {\n+ public World az() {\n return this.q;\n }\n \n- public double az() {\n+ public double aA() {\n return this.u;\n }\n \n- public double aA() {\n+ public double aB() {\n return this.v;\n }\n \n- public double aB() {\n+ public double aC() {\n return this.w;\n }\n \n public void l_() {\n super.l_();\n- if (!this.q.I && this.R() && this.ax()) {\n+ if (!this.q.I && this.S() && this.ay()) {\n --this.b;\n- if (!this.aD()) {\n+ if (!this.aE()) {\n this.l(0);\n- if (this.aC()) {\n+ if (this.aD()) {\n this.l(4);\n this.e();\n }\n }\n }\n }\n \n- public boolean aC() {\n+ public boolean aD() {\n if (TileEntityHopper.a((Hopper) this)) {\n return true;\n } else {\n@@ -123,7 +121,7 @@ public void l(int i0) {\n this.b = i0;\n }\n \n- public boolean aD() {\n+ public boolean aE() {\n return this.b > 0;\n }\n }", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityMinecartHopper.java", "sha": "6f30698a2deaf455bdc685a0ad50c3c28749d97d", "status": "modified" }, { "additions": 0, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityMinecartMobSpawner.java", "changes": 2, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityMinecartMobSpawner.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 2, "filename": "src/main/java/net/minecraft/server/EntityMinecartMobSpawner.java", "new_code": "", "new_methods": [], "old_code": "\n", "old_methods": [], "patch": "@@ -1,9 +1,7 @@\n package net.minecraft.server;\n \n-\n import net.canarymod.api.entity.vehicle.CanaryMobSpawnerMinecart;\n \n-\n public class EntityMinecartMobSpawner extends EntityMinecart {\n \n public final MobSpawnerBaseLogic a = new EntityMinecartMobSpawnerLogic(this); // CanaryMod: private -> public", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityMinecartMobSpawner.java", "sha": "944b93c38fe0ffcaea4dc047298c6bfa8c13ea88", "status": "modified" }, { "additions": 3, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityMinecartTNT.java", "changes": 8, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityMinecartTNT.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 5, "filename": "src/main/java/net/minecraft/server/EntityMinecartTNT.java", "new_code": " public boolean ay() {\n return this.ay() && (BlockRailBase.e_(block.cF) || BlockRailBase.d_(world, i0, i1 + 1, i2)) ? 0.0F : super.a(explosion, world, i0, i1, i2, block);\n return this.ay() && (BlockRailBase.e_(i3) || BlockRailBase.d_(world, i0, i1 + 1, i2)) ? false : super.a(explosion, world, i0, i1, i2, i3, f0);", "new_methods": [], "old_code": "\n\n public boolean ax() {\n return this.ax() && (BlockRailBase.e_(block.cF) || BlockRailBase.d_(world, i0, i1 + 1, i2)) ? 0.0F : super.a(explosion, world, i0, i1, i2, block);\n return this.ax() && (BlockRailBase.e_(i3) || BlockRailBase.d_(world, i0, i1 + 1, i2)) ? false : super.a(explosion, world, i0, i1, i2, i3, f0);", "old_methods": [], "patch": "@@ -1,9 +1,7 @@\n package net.minecraft.server;\n \n-\n import net.canarymod.api.entity.vehicle.CanaryTNTMinecart;\n \n-\n public class EntityMinecartTNT extends EntityMinecart {\n \n public int a = -1; // CanaryMod: private -> public\n@@ -94,16 +92,16 @@ public void d() {\n }\n }\n \n- public boolean ax() {\n+ public boolean ay() {\n return this.a > -1;\n }\n \n public float a(Explosion explosion, World world, int i0, int i1, int i2, Block block) {\n- return this.ax() && (BlockRailBase.e_(block.cF) || BlockRailBase.d_(world, i0, i1 + 1, i2)) ? 0.0F : super.a(explosion, world, i0, i1, i2, block);\n+ return this.ay() && (BlockRailBase.e_(block.cF) || BlockRailBase.d_(world, i0, i1 + 1, i2)) ? 0.0F : super.a(explosion, world, i0, i1, i2, block);\n }\n \n public boolean a(Explosion explosion, World world, int i0, int i1, int i2, int i3, float f0) {\n- return this.ax() && (BlockRailBase.e_(i3) || BlockRailBase.d_(world, i0, i1 + 1, i2)) ? false : super.a(explosion, world, i0, i1, i2, i3, f0);\n+ return this.ay() && (BlockRailBase.e_(i3) || BlockRailBase.d_(world, i0, i1 + 1, i2)) ? false : super.a(explosion, world, i0, i1, i2, i3, f0);\n }\n \n protected void a(NBTTagCompound nbttagcompound) {", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityMinecartTNT.java", "sha": "8915ff7be6981b7718f1c8bca413a6d5fce9ec74", "status": "modified" }, { "additions": 8, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityMob.java", "changes": 16, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityMob.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 8, "filename": "src/main/java/net/minecraft/server/EntityMob.java", "new_code": " this.aV();\n protected Entity bL() {\n if (this.aq()) {\n public boolean bs() {\n return this.q.r > 0 && this.i_() && super.bs();\n protected void ay() {\n super.ay();\n this.aW().b(SharedMonsterAttributes.e);", "new_methods": [], "old_code": " this.aS();\n protected Entity bH() {\n if (this.ap()) {\n public boolean bo() {\n return this.q.r > 0 && this.i_() && super.bo();\n protected void ax() {\n super.ax();\n this.aT().b(SharedMonsterAttributes.e);", "old_methods": [], "patch": "@@ -10,7 +10,7 @@ public EntityMob(World world) {\n }\n \n public void c() {\n- this.aS();\n+ this.aV();\n float f0 = this.d(1.0F);\n \n if (f0 > 0.5F) {\n@@ -27,14 +27,14 @@ public void l_() {\n }\n }\n \n- protected Entity bH() {\n+ protected Entity bL() {\n EntityPlayer entityplayer = this.q.b(this, 16.0D);\n \n return entityplayer != null && this.o(entityplayer) ? entityplayer : null;\n }\n \n public boolean a(DamageSource damagesource, float f0) {\n- if (this.ap()) {\n+ if (this.aq()) {\n return false;\n } else if (super.a(damagesource, f0)) {\n Entity entity = damagesource.i();\n@@ -128,12 +128,12 @@ protected boolean i_() {\n }\n }\n \n- public boolean bo() {\n- return this.q.r > 0 && this.i_() && super.bo();\n+ public boolean bs() {\n+ return this.q.r > 0 && this.i_() && super.bs();\n }\n \n- protected void ax() {\n- super.ax();\n- this.aT().b(SharedMonsterAttributes.e);\n+ protected void ay() {\n+ super.ay();\n+ this.aW().b(SharedMonsterAttributes.e);\n }\n }", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityMob.java", "sha": "881e6ba8a6205803a7d2352eb44be2cc851660fa", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityMooshroom.java", "changes": 4, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityMooshroom.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 3, "filename": "src/main/java/net/minecraft/server/EntityMooshroom.java", "new_code": " entitycow.g(this.aM());", "new_methods": [], "old_code": "\n\n entitycow.g(this.aJ());", "old_methods": [], "patch": "@@ -1,9 +1,7 @@\n package net.minecraft.server;\n \n-\n import net.canarymod.api.entity.living.animal.CanaryMooshroom;\n \n-\n public class EntityMooshroom extends EntityCow {\n \n public EntityMooshroom(World world) {\n@@ -34,7 +32,7 @@ public boolean a(EntityPlayer entityplayer) {\n EntityCow entitycow = new EntityCow(this.q);\n \n entitycow.b(this.u, this.v, this.w, this.A, this.B);\n- entitycow.g(this.aJ());\n+ entitycow.g(this.aM());\n entitycow.aN = this.aN;\n this.q.d((Entity) entitycow);\n ", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityMooshroom.java", "sha": "1fa8761b7d3333578984c8d3a846ac17166ed0f7", "status": "modified" }, { "additions": 25, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityOcelot.java", "changes": 50, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityOcelot.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 25, "filename": "src/main/java/net/minecraft/server/EntityOcelot.java", "new_code": " public void bj() {\n return !this.bT() && this.ac > 2400;\n public boolean be() {\n protected void ay() {\n super.ay();\n nbttagcompound.a(\"CatType\", this.ca());\n return this.bT() ? (this.bY() ? \"mob.cat.purr\" : (this.ab.nextInt(4) == 0 ? \"mob.cat.purreow\" : \"mob.cat.meow\")) : \"\";\n protected String aN() {\n protected String aO() {\n protected float aZ() {\n if (this.aq()) {\n if (this.bT()) {\n this.bp.a(!this.bU());\n this.j(true);\n this.i(true);\n this.i(false);\n if (this.bT()) {\n entityocelot.j(true);\n entityocelot.p(this.ca());\n } else if (!this.bT()) {\n return !entityocelot.bT() ? false : this.bY() && entityocelot.bY();\n public int ca() {\n public boolean bs() {\n public String am() {\n return this.bB() ? this.bA() : (this.bT() ? \"entity.Cat.name\" : super.am());", "new_methods": [ { "arguments": [], "filename": "src/main/java/net/minecraft/server/EntityOcelot.java", "implementation": "return !this.bT() && this.ac > 2400;\n public boolean be() {\n protected void ay() {\n super.ay();\n nbttagcompound.a(\"CatType\", this.ca());\n return this.bT() ? (this.bY() ? \"mob.cat.purr\" : (this.ab.nextInt(4) == 0 ? \"mob.cat.purreow\" : \"mob.cat.meow\")) : \"\";\n protected String aN() {\n protected String aO() {\n protected float aZ() {\n if (this.aq()) {\n if (this.bT()) {\n this.bp.a(!this.bU());\n this.j(true);\n this.i(true);\n this.i(false);\n if (this.bT()) {\n entityocelot.j(true);\n entityocelot.p(this.ca());", "signature": "void bj()" } ], "old_code": " public void bg() {\n return !this.bP() && this.ac > 2400;\n public boolean bb() {\n protected void ax() {\n super.ax();\n nbttagcompound.a(\"CatType\", this.bW());\n return this.bP() ? (this.bU() ? \"mob.cat.purr\" : (this.ab.nextInt(4) == 0 ? \"mob.cat.purreow\" : \"mob.cat.meow\")) : \"\";\n protected String aK() {\n protected String aL() {\n protected float aW() {\n if (this.ap()) {\n if (this.bP()) {\n this.bp.a(!this.bQ());\n this.k(true);\n this.j(true);\n this.j(false);\n if (this.bP()) {\n entityocelot.k(true);\n entityocelot.p(this.bW());\n } else if (!this.bP()) {\n return !entityocelot.bP() ? false : this.bU() && entityocelot.bU();\n public int bW() {\n public boolean bo() {\n public String al() {\n return this.bx() ? this.bw() : (this.bP() ? \"entity.Cat.name\" : super.al());", "old_methods": [ { "arguments": [], "filename": "src/main/java/net/minecraft/server/EntityOcelot.java", "implementation": "return !this.bP() && this.ac > 2400;\n public boolean bb() {\n protected void ax() {\n super.ax();\n nbttagcompound.a(\"CatType\", this.bW());\n return this.bP() ? (this.bU() ? \"mob.cat.purr\" : (this.ab.nextInt(4) == 0 ? \"mob.cat.purreow\" : \"mob.cat.meow\")) : \"\";\n protected String aK() {\n protected String aL() {\n protected float aW() {\n if (this.ap()) {\n if (this.bP()) {\n this.bp.a(!this.bQ());\n this.k(true);\n this.j(true);\n this.j(false);\n if (this.bP()) {\n entityocelot.k(true);\n entityocelot.p(this.bW());", "signature": "void bg()" } ], "patch": "@@ -31,7 +31,7 @@ protected void a() {\n this.ah.a(18, Byte.valueOf((byte) 0));\n }\n \n- public void bg() {\n+ public void bj() {\n if (this.i().a()) {\n double d0 = this.i().b();\n \n@@ -52,15 +52,15 @@ public void bg() {\n }\n \n protected boolean t() {\n- return !this.bP() && this.ac > 2400;\n+ return !this.bT() && this.ac > 2400;\n }\n \n- public boolean bb() {\n+ public boolean be() {\n return true;\n }\n \n- protected void ax() {\n- super.ax();\n+ protected void ay() {\n+ super.ay();\n this.a(SharedMonsterAttributes.a).a(10.0D);\n this.a(SharedMonsterAttributes.d).a(0.30000001192092896D);\n }\n@@ -69,7 +69,7 @@ protected void b(float f0) {}\n \n public void b(NBTTagCompound nbttagcompound) {\n super.b(nbttagcompound);\n- nbttagcompound.a(\"CatType\", this.bW());\n+ nbttagcompound.a(\"CatType\", this.ca());\n }\n \n public void a(NBTTagCompound nbttagcompound) {\n@@ -78,18 +78,18 @@ public void a(NBTTagCompound nbttagcompound) {\n }\n \n protected String r() {\n- return this.bP() ? (this.bU() ? \"mob.cat.purr\" : (this.ab.nextInt(4) == 0 ? \"mob.cat.purreow\" : \"mob.cat.meow\")) : \"\";\n+ return this.bT() ? (this.bY() ? \"mob.cat.purr\" : (this.ab.nextInt(4) == 0 ? \"mob.cat.purreow\" : \"mob.cat.meow\")) : \"\";\n }\n \n- protected String aK() {\n+ protected String aN() {\n return \"mob.cat.hitt\";\n }\n \n- protected String aL() {\n+ protected String aO() {\n return \"mob.cat.hitt\";\n }\n \n- protected float aW() {\n+ protected float aZ() {\n return 0.4F;\n }\n \n@@ -102,7 +102,7 @@ public boolean m(Entity entity) {\n }\n \n public boolean a(DamageSource damagesource, float f0) {\n- if (this.ap()) {\n+ if (this.aq()) {\n return false;\n } else {\n this.bp.a(false);\n@@ -115,9 +115,9 @@ protected void b(boolean flag0, int i0) {}\n public boolean a(EntityPlayer entityplayer) {\n ItemStack itemstack = entityplayer.bn.h();\n \n- if (this.bP()) {\n+ if (this.bT()) {\n if (entityplayer.c_().equalsIgnoreCase(this.h_()) && !this.q.I && !this.c(itemstack)) {\n- this.bp.a(!this.bQ());\n+ this.bp.a(!this.bU());\n }\n } else if (this.bq.f() && itemstack != null && itemstack.d == Item.aW.cv && entityplayer.e(this) < 9.0D) {\n if (!entityplayer.bG.d) {\n@@ -134,14 +134,14 @@ public boolean a(EntityPlayer entityplayer) {\n \n if (hook.isTamed() && !hook.isCanceled()) {\n //\n- this.k(true);\n+ this.j(true);\n this.p(1 + this.q.s.nextInt(3));\n this.b(entityplayer.c_());\n- this.j(true);\n+ this.i(true);\n this.bp.a(true);\n this.q.a((Entity) this, (byte) 7);\n } else {\n- this.j(false);\n+ this.i(false);\n this.q.a((Entity) this, (byte) 6);\n }\n }\n@@ -155,10 +155,10 @@ public boolean a(EntityPlayer entityplayer) {\n public EntityOcelot b(EntityAgeable entityageable) {\n EntityOcelot entityocelot = new EntityOcelot(this.q);\n \n- if (this.bP()) {\n+ if (this.bT()) {\n entityocelot.b(this.h_());\n- entityocelot.k(true);\n- entityocelot.p(this.bW());\n+ entityocelot.j(true);\n+ entityocelot.p(this.ca());\n }\n \n return entityocelot;\n@@ -171,26 +171,26 @@ public boolean c(ItemStack itemstack) {\n public boolean a(EntityAnimal entityanimal) {\n if (entityanimal == this) {\n return false;\n- } else if (!this.bP()) {\n+ } else if (!this.bT()) {\n return false;\n } else if (!(entityanimal instanceof EntityOcelot)) {\n return false;\n } else {\n EntityOcelot entityocelot = (EntityOcelot) entityanimal;\n \n- return !entityocelot.bP() ? false : this.bU() && entityocelot.bU();\n+ return !entityocelot.bT() ? false : this.bY() && entityocelot.bY();\n }\n }\n \n- public int bW() {\n+ public int ca() {\n return this.ah.a(18);\n }\n \n public void p(int i0) {\n this.ah.b(18, Byte.valueOf((byte) i0));\n }\n \n- public boolean bo() {\n+ public boolean bs() {\n if (this.q.s.nextInt(3) == 0) {\n return false;\n } else {\n@@ -214,8 +214,8 @@ public boolean bo() {\n }\n }\n \n- public String al() {\n- return this.bx() ? this.bw() : (this.bP() ? \"entity.Cat.name\" : super.al());\n+ public String am() {\n+ return this.bB() ? this.bA() : (this.bT() ? \"entity.Cat.name\" : super.am());\n }\n \n public EntityLivingData a(EntityLivingData entitylivingdata) {", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityOcelot.java", "sha": "23e021761c9a4c8d6df6dc4d5c70421a819a53e0", "status": "modified" }, { "additions": 0, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityPainting.java", "changes": 2, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityPainting.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 2, "filename": "src/main/java/net/minecraft/server/EntityPainting.java", "new_code": "", "new_methods": [], "old_code": "\n", "old_methods": [], "patch": "@@ -1,10 +1,8 @@\n package net.minecraft.server;\n \n-\n import java.util.ArrayList;\n import net.canarymod.api.entity.hanging.CanaryPainting;\n \n-\n public class EntityPainting extends EntityHanging {\n \n public EnumArt e;", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityPainting.java", "sha": "07a41626a01638a184f4209cc8178b89f43329ea", "status": "modified" }, { "additions": 18, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityPig.java", "changes": 36, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityPig.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 18, "filename": "src/main/java/net/minecraft/server/EntityPig.java", "new_code": " public boolean be() {\n protected void ay() {\n super.ay();\n protected void bh() {\n super.bh();\n public boolean by() {\n ItemStack itemstack = ((EntityPlayer) this.n).aY();\n nbttagcompound.a(\"Saddle\", this.bT());\n this.i(nbttagcompound.n(\"Saddle\"));\n protected String aN() {\n protected String aO() {\n } else if (this.bT() && !this.q.I && (this.n == null || this.n == entityplayer)) {\n return this.ae() ? Item.at.cv : Item.as.cv;\n if (this.ae()) {\n if (this.bT()) {\n public boolean bT() {\n public void i(boolean flag0) {\n public EntityAIControlledByPlayer bU() {", "new_methods": [ { "arguments": [], "filename": "src/main/java/net/minecraft/server/EntityPig.java", "implementation": "protected void ay() {\n super.ay();\n protected void bh() {\n super.bh();\n public boolean by() {\n ItemStack itemstack = ((EntityPlayer) this.n).aY();\n nbttagcompound.a(\"Saddle\", this.bT());\n this.i(nbttagcompound.n(\"Saddle\"));\n protected String aN() {\n protected String aO() {", "signature": "boolean be()" } ], "old_code": " public boolean bb() {\n protected void ax() {\n super.ax();\n protected void be() {\n super.be();\n public boolean bu() {\n ItemStack itemstack = ((EntityPlayer) this.n).aV();\n nbttagcompound.a(\"Saddle\", this.bP());\n this.j(nbttagcompound.n(\"Saddle\"));\n protected String aK() {\n protected String aL() {\n } else if (this.bP() && !this.q.I && (this.n == null || this.n == entityplayer)) {\n return this.ad() ? Item.at.cv : Item.as.cv;\n if (this.ad()) {\n if (this.bP()) {\n public boolean bP() {\n public void j(boolean flag0) {\n public EntityAIControlledByPlayer bQ() {", "old_methods": [ { "arguments": [], "filename": "src/main/java/net/minecraft/server/EntityPig.java", "implementation": "protected void ax() {\n super.ax();\n protected void be() {\n super.be();\n public boolean bu() {\n ItemStack itemstack = ((EntityPlayer) this.n).aV();\n nbttagcompound.a(\"Saddle\", this.bP());\n this.j(nbttagcompound.n(\"Saddle\"));\n protected String aK() {\n protected String aL() {", "signature": "boolean bb()" } ], "patch": "@@ -23,22 +23,22 @@ public EntityPig(World world) {\n this.entity = new CanaryPig(this); // CanaryMod: Wrap Entity\n }\n \n- public boolean bb() {\n+ public boolean be() {\n return true;\n }\n \n- protected void ax() {\n- super.ax();\n+ protected void ay() {\n+ super.ay();\n this.a(SharedMonsterAttributes.a).a(10.0D);\n this.a(SharedMonsterAttributes.d).a(0.25D);\n }\n \n- protected void be() {\n- super.be();\n+ protected void bh() {\n+ super.bh();\n }\n \n- public boolean bu() {\n- ItemStack itemstack = ((EntityPlayer) this.n).aV();\n+ public boolean by() {\n+ ItemStack itemstack = ((EntityPlayer) this.n).aY();\n \n return itemstack != null && itemstack.d == Item.bT.cv;\n }\n@@ -50,23 +50,23 @@ protected void a() {\n \n public void b(NBTTagCompound nbttagcompound) {\n super.b(nbttagcompound);\n- nbttagcompound.a(\"Saddle\", this.bP());\n+ nbttagcompound.a(\"Saddle\", this.bT());\n }\n \n public void a(NBTTagCompound nbttagcompound) {\n super.a(nbttagcompound);\n- this.j(nbttagcompound.n(\"Saddle\"));\n+ this.i(nbttagcompound.n(\"Saddle\"));\n }\n \n protected String r() {\n return \"mob.pig.say\";\n }\n \n- protected String aK() {\n+ protected String aN() {\n return \"mob.pig.say\";\n }\n \n- protected String aL() {\n+ protected String aO() {\n return \"mob.pig.death\";\n }\n \n@@ -77,7 +77,7 @@ protected void a(int i0, int i1, int i2, int i3) {\n public boolean a(EntityPlayer entityplayer) {\n if (super.a(entityplayer)) {\n return true;\n- } else if (this.bP() && !this.q.I && (this.n == null || this.n == entityplayer)) {\n+ } else if (this.bT() && !this.q.I && (this.n == null || this.n == entityplayer)) {\n entityplayer.a((Entity) this);\n return true;\n } else {\n@@ -86,30 +86,30 @@ public boolean a(EntityPlayer entityplayer) {\n }\n \n protected int s() {\n- return this.ad() ? Item.at.cv : Item.as.cv;\n+ return this.ae() ? Item.at.cv : Item.as.cv;\n }\n \n protected void b(boolean flag0, int i0) {\n int i1 = this.ab.nextInt(3) + 1 + this.ab.nextInt(1 + i0);\n \n for (int i2 = 0; i2 < i1; ++i2) {\n- if (this.ad()) {\n+ if (this.ae()) {\n this.b(Item.at.cv, 1);\n } else {\n this.b(Item.as.cv, 1);\n }\n }\n \n- if (this.bP()) {\n+ if (this.bT()) {\n this.b(Item.aC.cv, 1);\n }\n }\n \n- public boolean bP() {\n+ public boolean bT() {\n return (this.ah.a(16) & 1) != 0;\n }\n \n- public void j(boolean flag0) {\n+ public void i(boolean flag0) {\n if (flag0) {\n this.ah.b(16, Byte.valueOf((byte) 1));\n } else {\n@@ -142,7 +142,7 @@ public boolean c(ItemStack itemstack) {\n return itemstack != null && itemstack.d == Item.bM.cv;\n }\n \n- public EntityAIControlledByPlayer bQ() {\n+ public EntityAIControlledByPlayer bU() {\n return this.bp;\n }\n ", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityPig.java", "sha": "8b8ab00a24d171ee328530aac1de177b4f9b7117", "status": "modified" }, { "additions": 12, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityPigZombie.java", "changes": 24, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityPigZombie.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 12, "filename": "src/main/java/net/minecraft/server/EntityPigZombie.java", "new_code": " protected void ay() {\n super.ay();\n protected boolean be() {\n this.a(\"mob.zombiepig.zpigangry\", this.aZ() * 2.0F, ((this.ab.nextFloat() - this.ab.nextFloat()) * 0.2F + 1.0F) * 1.8F);\n public boolean bs() {\n protected Entity bL() {\n return this.bs == 0 ? null : super.bL();\n if (this.aq()) {\n protected String aN() {\n protected String aO() {\n protected void bw() {\n this.i(false);", "new_methods": [], "old_code": " protected void ax() {\n super.ax();\n protected boolean bb() {\n this.a(\"mob.zombiepig.zpigangry\", this.aW() * 2.0F, ((this.ab.nextFloat() - this.ab.nextFloat()) * 0.2F + 1.0F) * 1.8F);\n public boolean bo() {\n protected Entity bH() {\n return this.bs == 0 ? null : super.bH();\n if (this.ap()) {\n protected String aK() {\n protected String aL() {\n protected void bs() {\n this.j(false);", "old_methods": [], "patch": "@@ -19,14 +19,14 @@ public EntityPigZombie(World world) {\n this.entity = new CanaryPigZombie(this); // CanaryMod: Wrap Entity\n }\n \n- protected void ax() {\n- super.ax();\n+ protected void ay() {\n+ super.ay();\n this.a(bp).a(0.0D);\n this.a(SharedMonsterAttributes.d).a(0.5D);\n this.a(SharedMonsterAttributes.e).a(5.0D);\n }\n \n- protected boolean bb() {\n+ protected boolean be() {\n return false;\n }\n \n@@ -42,13 +42,13 @@ public void l_() {\n \n this.bu = this.j;\n if (this.bt > 0 && --this.bt == 0) {\n- this.a(\"mob.zombiepig.zpigangry\", this.aW() * 2.0F, ((this.ab.nextFloat() - this.ab.nextFloat()) * 0.2F + 1.0F) * 1.8F);\n+ this.a(\"mob.zombiepig.zpigangry\", this.aZ() * 2.0F, ((this.ab.nextFloat() - this.ab.nextFloat()) * 0.2F + 1.0F) * 1.8F);\n }\n \n super.l_();\n }\n \n- public boolean bo() {\n+ public boolean bs() {\n return this.q.r > 0 && this.q.b(this.E) && this.q.a((Entity) this, this.E).isEmpty() && !this.q.d(this.E);\n }\n \n@@ -62,12 +62,12 @@ public void a(NBTTagCompound nbttagcompound) {\n this.bs = nbttagcompound.d(\"Anger\");\n }\n \n- protected Entity bH() {\n- return this.bs == 0 ? null : super.bH();\n+ protected Entity bL() {\n+ return this.bs == 0 ? null : super.bL();\n }\n \n public boolean a(DamageSource damagesource, float f0) {\n- if (this.ap()) {\n+ if (this.aq()) {\n return false;\n } else {\n Entity entity = damagesource.i();\n@@ -106,11 +106,11 @@ protected String r() {\n return \"mob.zombiepig.zpig\";\n }\n \n- protected String aK() {\n+ protected String aN() {\n return \"mob.zombiepig.zpighurt\";\n }\n \n- protected String aL() {\n+ protected String aO() {\n return \"mob.zombiepig.zpigdeath\";\n }\n \n@@ -142,13 +142,13 @@ protected int s() {\n return Item.bo.cv;\n }\n \n- protected void bs() {\n+ protected void bw() {\n this.c(0, new ItemStack(Item.I));\n }\n \n public EntityLivingData a(EntityLivingData entitylivingdata) {\n super.a(entitylivingdata);\n- this.j(false);\n+ this.i(false);\n return entitylivingdata;\n }\n }", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityPigZombie.java", "sha": "dab36a27089fbaa81be8755d103edb6f44be0d2f", "status": "modified" }, { "additions": 105, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityPlayer.java", "changes": 246, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityPlayer.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 141, "filename": "src/main/java/net/minecraft/server/EntityPlayer.java", "new_code": " protected void ay() {\n super.ay();\n this.aW().b(SharedMonsterAttributes.e).a(1.0D);\n public boolean bq() {\n public void bs() {\n this.bt();\n public void bt() {\n public boolean bu() {\n return this.bq() && Item.g[this.f.d].c_(this.f) == EnumAction.d;\n this.bt();\n if (this.bg()) {\n if (this.ae() && this.bG.a) {\n public int ab() {\n this.bt();\n protected boolean bb() {\n return this.aM() <= 0.0F || this.bg();\n public void U() {\n if (!this.q.I && this.ag()) {\n super.U();\n protected void bk() {\n super.bk();\n this.aV();\n if (this.q.r == 0 && this.aM() < this.aS() && this.q.O().b(\"naturalRegeneration\") && this.ac % 20 * 12 == 0) {\n if (this.ah()) {\n if (!this.F || this.aM() <= 0.0F) {\n if (this.F || this.aM() <= 0.0F) {\n if (this.aM() > 0.0F) {\n public int bv() {\n int i1 = this.bv();\n Collection collection = this.bL().a(ScoreObjectiveCriteria.e);\n collection.addAll(this.bL().a(ScoreObjectiveCriteria.d));\n Score score = this.bL().a(this.am(), scoreobjective);\n nbttagcompound.a(\"Score\", this.bv());\n if (this.aq()) {\n if (this.aM() <= 0.0F) {\n if (this.bg() && !this.q.I) {\n Team team = this.bn();\n Team team1 = entityplayer.bn();\n return team == null ? true : (!team.a(team1) ? true : team.g());\n public int aP() {\n public float bw() {\n if (!this.aq()) {\n if (!damagesource.e() && this.bu() && f0 > 0.0F) {\n f0 = Math.max(f0 - this.bm(), 0.0F);\n this.m(this.bm() - (f1 - f0));\n float f2 = this.aM();\n this.g(this.aM() - f0);\n this.aQ().a(damagesource, f2, f0);\n ItemStack itemstack = this.bx();\n this.by();\n if (itemstack != null && itemstack == this.bx()) {\n this.by();\n public ItemStack bx() {\n public void by() {\n public double W() {\n if (entity.ap()) {\n if (this.ah()) {\n if (entity instanceof EntityLivingBase && i1 > 0 && !entity.ae()) {\n ItemStack itemstack = this.bx();\n this.by();\n public boolean T() {\n return !this.bC && super.T();\n if (this.bg() || !this.S()) {\n if (this.af()) {\n public boolean bg() {\n public boolean bC() {\n public ChunkCoordinates bE() {\n public boolean bF() {\n protected void bd() {\n super.bd();\n if (this.ah()) {\n public float bf() {\n if (this.ah()) {\n public void al() {\n super.al();\n this.bJ += (float) i0 / (float) this.bG();\n for (this.bI += i0; this.bJ >= 1.0F; this.bJ /= (float) this.bG()) {\n this.bJ = (this.bJ - 1.0F) * (float) this.bG();\n public int bG() {\n public FoodStats bH() {\n public boolean bI() {\n return this.aM() > 0.0F && this.aM() < this.aS();\n if (this.bx() != null) {\n ItemStack itemstack = this.bx();\n protected boolean aB() {\n public String am() {\n this.g(entityplayer.aM());\n this.c(entityplayer.bv());\n this.c(entityplayer.bv());\n public InventoryEnderChest bJ() {\n public ItemStack aY() {\n public ItemStack[] ad() {\n public boolean aw() {\n public Scoreboard bL() {\n public Team bn() {\n return this.bL().i(this.bu);\n public String ax() {\n return ScorePlayerTeam.a(this.bn(), this.bu);\n public float bm() {\n this.bI -= (float) i / (float) this.bG();\n for (this.bI -= i; this.bJ < 0.0F; this.bJ = this.bJ / this.bG() + 1.0F) {\n this.bJ *= this.bG();\n this.bJ = this.bI / (float) this.bG();\n this.bJ = (this.bJ - 1.0F) * this.bG();\n this.bJ /= this.bG();", "new_methods": [], "old_code": " protected void ax() {\n super.ax();\n this.aT().b(SharedMonsterAttributes.e).a(1.0D);\n public boolean bm() {\n public void bo() {\n this.bp();\n public void bp() {\n public boolean bq() {\n return this.bm() && Item.g[this.f.d].c_(this.f) == EnumAction.d;\n this.bp();\n if (this.bd()) {\n if (this.ad() && this.bG.a) {\n public int aa() {\n this.bp();\n protected boolean aY() {\n return this.aJ() <= 0.0F || this.bd();\n public void T() {\n if (!this.q.I && this.af()) {\n super.T();\n protected void bh() {\n super.bh();\n this.aS();\n if (this.q.r == 0 && this.aJ() < this.aP() && this.q.O().b(\"naturalRegeneration\") && this.ac % 20 * 12 == 0) {\n if (this.ag()) {\n if (!this.F || this.aJ() <= 0.0F) {\n if (this.F || this.aJ() <= 0.0F) {\n if (this.aJ() > 0.0F) {\n public int br() {\n int i1 = this.br();\n Collection collection = this.bH().a(ScoreObjectiveCriteria.e);\n collection.addAll(this.bH().a(ScoreObjectiveCriteria.d));\n Score score = this.bH().a(this.al(), scoreobjective);\n nbttagcompound.a(\"Score\", this.br());\n if (this.ap()) {\n if (this.aJ() <= 0.0F) {\n if (this.bd() && !this.q.I) {\n if (entity instanceof EntityLivingBase) {\n this.a((EntityLivingBase) entity, false);\n }\n\n ScorePlayerTeam scoreplayerteam = this.bI();\n ScorePlayerTeam scoreplayerteam1 = entityplayer.bI();\n\n return scoreplayerteam != scoreplayerteam1 ? true : (scoreplayerteam != null ? scoreplayerteam.g() : true);\n }\n\n protected void a(EntityLivingBase entitylivingbase, boolean flag0) {\n if (!(entitylivingbase instanceof EntityCreeper) && !(entitylivingbase instanceof EntityGhast)) {\n if (entitylivingbase instanceof EntityWolf) {\n EntityWolf entitywolf = (EntityWolf) entitylivingbase;\n\n if (entitywolf.bP() && this.bu.equals(entitywolf.h_())) {\n return;\n }\n }\n\n if (!(entitylivingbase instanceof EntityPlayer) || this.a((EntityPlayer) entitylivingbase)) {\n if (!(entitylivingbase instanceof EntityHorse) || !((EntityHorse) entitylivingbase).bS()) {\n List list = this.q.a(EntityWolf.class, AxisAlignedBB.a().a(this.u, this.v, this.w, this.u + 1.0D, this.v + 1.0D, this.w + 1.0D).b(16.0D, 4.0D, 16.0D));\n Iterator iterator = list.iterator();\n\n while (iterator.hasNext()) {\n EntityWolf entitywolf1 = (EntityWolf) iterator.next();\n if (entitywolf1.bP() && entitywolf1.bJ() == null && this.bu.equals(entitywolf1.h_()) && (!flag0 || !entitywolf1.bQ())) {\n entitywolf1.l(false);\n entitywolf1.b((Entity) entitylivingbase);\n }\n }\n }\n }\n }\n public int aM() {\n public float bs() {\n if (!this.ap()) {\n if (!damagesource.e() && this.bq() && f0 > 0.0F) {\n f0 = Math.max(f0 - this.bj(), 0.0F);\n this.m(this.bj() - (f1 - f0));\n float f2 = this.aJ();\n this.g(this.aJ() - f0);\n this.aN().a(damagesource, f2, f0);\n ItemStack itemstack = this.bt();\n this.bu();\n if (itemstack != null && itemstack == this.bt()) {\n this.bu();\n public ItemStack bt() {\n public void bu() {\n public double V() {\n if (entity.ao()) {\n if (this.ag()) {\n if (entity instanceof EntityLivingBase && i1 > 0 && !entity.ad()) {\n ItemStack itemstack = this.bt();\n this.bu();\n if (entity.R()) {\n this.a((EntityLivingBase) entity, true);\n }\n\n public boolean S() {\n return !this.bC && super.S();\n if (this.bd() || !this.R()) {\n if (this.ae()) {\n public boolean bd() {\n public boolean by() {\n public ChunkCoordinates bA() {\n public boolean bB() {\n protected void ba() {\n super.ba();\n if (this.ag()) {\n public float bc() {\n if (this.ag()) {\n public void ak() {\n super.ak();\n this.bJ += (float) i0 / (float) this.bC();\n for (this.bI += i0; this.bJ >= 1.0F; this.bJ /= (float) this.bC()) {\n this.bJ = (this.bJ - 1.0F) * (float) this.bC();\n public int bC() {\n public FoodStats bD() {\n public boolean bE() {\n return this.aJ() > 0.0F && this.aJ() < this.aP();\n if (this.bt() != null) {\n ItemStack itemstack = this.bt();\n protected boolean aA() {\n public String al() {\n this.g(entityplayer.aJ());\n this.c(entityplayer.br());\n this.c(entityplayer.br());\n public InventoryEnderChest bF() {\n public ItemStack aV() {\n public ItemStack[] ac() {\n public boolean av() {\n public Scoreboard bH() {\n public ScorePlayerTeam bI() {\n return this.bH().i(this.bu);\n public String aw() {\n return ScorePlayerTeam.a(this.bI(), this.bu);\n public float bj() {\n this.bI -= (float) i / (float) this.bC();\n for (this.bI -= i; this.bJ < 0.0F; this.bJ = this.bJ / this.bC() + 1.0F) {\n this.bJ *= this.bC();\n this.bJ = this.bI / (float) this.bC();\n this.bJ = (this.bJ - 1.0F) * this.bC();\n this.bJ /= this.bC();", "old_methods": [ { "arguments": [], "filename": "src/main/java/net/minecraft/server/EntityPlayer.java", "implementation": "super.ax();\n this.aT().b(SharedMonsterAttributes.e).a(1.0D);\n public boolean bm() {\n public void bo() {\n this.bp();\n public void bp() {\n public boolean bq() {\n return this.bm() && Item.g[this.f.d].c_(this.f) == EnumAction.d;\n this.bp();\n if (this.bd()) {\n if (this.ad() && this.bG.a) {\n public int aa() {\n this.bp();\n protected boolean aY() {\n return this.aJ() <= 0.0F || this.bd();\n public void T() {\n if (!this.q.I && this.af()) {\n super.T();\n protected void bh() {\n super.bh();\n this.aS();\n if (this.q.r == 0 && this.aJ() < this.aP() && this.q.O().b(\"naturalRegeneration\") && this.ac % 20 * 12 == 0) {\n if (this.ag()) {\n if (!this.F || this.aJ() <= 0.0F) {\n if (this.F || this.aJ() <= 0.0F) {\n if (this.aJ() > 0.0F) {\n public int br() {\n int i1 = this.br();\n Collection collection = this.bH().a(ScoreObjectiveCriteria.e);\n collection.addAll(this.bH().a(ScoreObjectiveCriteria.d));\n Score score = this.bH().a(this.al(), scoreobjective);\n nbttagcompound.a(\"Score\", this.br());\n if (this.ap()) {\n if (this.aJ() <= 0.0F) {\n if (this.bd() && !this.q.I) {\n if (entity instanceof EntityLivingBase) {\n this.a((EntityLivingBase) entity, false);", "signature": "void ax()" }, { "arguments": [ "EntityLivingBase entitylivingbase", " boolean flag0" ], "filename": "src/main/java/net/minecraft/server/EntityPlayer.java", "implementation": "if (!(entitylivingbase instanceof EntityCreeper) && !(entitylivingbase instanceof EntityGhast)) {\n if (entitylivingbase instanceof EntityWolf) {\n EntityWolf entitywolf = (EntityWolf) entitylivingbase;\n\n if (entitywolf.bP() && this.bu.equals(entitywolf.h_())) {\n return;", "signature": "void a(EntityLivingBase entitylivingbase, boolean flag0)" }, { "arguments": [], "filename": "src/main/java/net/minecraft/server/EntityPlayer.java", "implementation": "public float bs() {\n if (!this.ap()) {\n if (!damagesource.e() && this.bq() && f0 > 0.0F) {\n f0 = Math.max(f0 - this.bj(), 0.0F);\n this.m(this.bj() - (f1 - f0));\n float f2 = this.aJ();\n this.g(this.aJ() - f0);\n this.aN().a(damagesource, f2, f0);\n ItemStack itemstack = this.bt();\n this.bu();\n if (itemstack != null && itemstack == this.bt()) {\n this.bu();\n public ItemStack bt() {\n public void bu() {\n public double V() {\n if (entity.ao()) {\n if (this.ag()) {\n if (entity instanceof EntityLivingBase && i1 > 0 && !entity.ad()) {\n ItemStack itemstack = this.bt();\n this.bu();\n if (entity.R()) {\n this.a((EntityLivingBase) entity, true);", "signature": "int aM()" } ], "patch": "@@ -82,9 +82,9 @@ public EntityType getEntityType() {\n };\n }\n \n- protected void ax() {\n- super.ax();\n- this.aT().b(SharedMonsterAttributes.e).a(1.0D);\n+ protected void ay() {\n+ super.ay();\n+ this.aW().b(SharedMonsterAttributes.e).a(1.0D);\n }\n \n protected void a() {\n@@ -94,28 +94,28 @@ protected void a() {\n this.ah.a(18, Integer.valueOf(0));\n }\n \n- public boolean bm() {\n+ public boolean bq() {\n return this.f != null;\n }\n \n- public void bo() {\n+ public void bs() {\n if (this.f != null) {\n this.f.b(this.q, this, this.g);\n }\n \n- this.bp();\n+ this.bt();\n }\n \n- public void bp() {\n+ public void bt() {\n this.f = null;\n this.g = 0;\n if (!this.q.I) {\n this.e(false);\n }\n }\n \n- public boolean bq() {\n- return this.bm() && Item.g[this.f.d].c_(this.f) == EnumAction.d;\n+ public boolean bu() {\n+ return this.bq() && Item.g[this.f.d].c_(this.f) == EnumAction.d;\n }\n \n public void l_() {\n@@ -131,15 +131,15 @@ public void l_() {\n this.n();\n }\n } else {\n- this.bp();\n+ this.bt();\n }\n }\n \n if (this.bv > 0) {\n --this.bv;\n }\n \n- if (this.bd()) {\n+ if (this.bg()) {\n ++this.b;\n if (this.b > 100) {\n this.b = 100;\n@@ -165,7 +165,7 @@ public void l_() {\n this.bp = this.bo;\n }\n \n- if (this.ad() && this.bG.a) {\n+ if (this.ae() && this.bG.a) {\n this.A();\n }\n \n@@ -218,7 +218,7 @@ public int y() {\n return this.bG.a ? 0 : 80;\n }\n \n- public int aa() {\n+ public int ab() {\n return 10;\n }\n \n@@ -262,12 +262,12 @@ protected void n() {\n }\n }\n \n- this.bp();\n+ this.bt();\n }\n }\n \n- protected boolean aY() {\n- return this.aJ() <= 0.0F || this.bd();\n+ protected boolean bb() {\n+ return this.aM() <= 0.0F || this.bg();\n }\n \n protected void i() {\n@@ -290,8 +290,8 @@ public void a(Entity entity) {\n }\n }\n \n- public void T() {\n- if (!this.q.I && this.af()) {\n+ public void U() {\n+ if (!this.q.I && this.ag()) {\n this.a((Entity) null);\n this.b(false);\n } else {\n@@ -301,7 +301,7 @@ public void T() {\n float f0 = this.A;\n float f1 = this.B;\n \n- super.T();\n+ super.U();\n this.bs = this.bt;\n this.bt = 0.0F;\n this.k(this.u - d0, this.v - d1, this.w - d2);\n@@ -313,17 +313,17 @@ public void T() {\n }\n }\n \n- protected void bh() {\n- super.bh();\n- this.aS();\n+ protected void bk() {\n+ super.bk();\n+ this.aV();\n }\n \n public void c() {\n if (this.br > 0) {\n --this.br;\n }\n \n- if (this.q.r == 0 && this.aJ() < this.aP() && this.q.O().b(\"naturalRegeneration\") && this.ac % 20 * 12 == 0) {\n+ if (this.q.r == 0 && this.aM() < this.aS() && this.q.O().b(\"naturalRegeneration\") && this.ac % 20 * 12 == 0) {\n this.f(1.0F);\n }\n \n@@ -337,7 +337,7 @@ public void c() {\n }\n \n this.aR = this.bL;\n- if (this.ag()) {\n+ if (this.ah()) {\n this.aR = (float) ((double) this.aR + (double) this.bL * 0.3D);\n }\n \n@@ -349,17 +349,17 @@ public void c() {\n f0 = 0.1F;\n }\n \n- if (!this.F || this.aJ() <= 0.0F) {\n+ if (!this.F || this.aM() <= 0.0F) {\n f0 = 0.0F;\n }\n \n- if (this.F || this.aJ() <= 0.0F) {\n+ if (this.F || this.aM() <= 0.0F) {\n f1 = 0.0F;\n }\n \n this.bt += (f0 - this.bt) * 0.4F;\n this.aK += (f1 - this.aK) * 0.8F;\n- if (this.aJ() > 0.0F) {\n+ if (this.aM() > 0.0F) {\n AxisAlignedBB axisalignedbb = null;\n \n if (this.o != null && !this.o.M) {\n@@ -386,7 +386,7 @@ private void r(Entity entity) {\n entity.b_(this);\n }\n \n- public int br() {\n+ public int bv() {\n return this.ah.c(18);\n }\n \n@@ -395,7 +395,7 @@ public void c(int i0) {\n }\n \n public void p(int i0) {\n- int i1 = this.br();\n+ int i1 = this.bv();\n \n this.ah.b(18, Integer.valueOf(i1 + i0));\n }\n@@ -426,11 +426,11 @@ public void a(DamageSource damagesource) {\n \n public void b(Entity entity, int i0) {\n this.p(i0);\n- Collection collection = this.bH().a(ScoreObjectiveCriteria.e);\n+ Collection collection = this.bL().a(ScoreObjectiveCriteria.e);\n \n if (entity instanceof EntityPlayer) {\n this.a(StatList.A, 1);\n- collection.addAll(this.bH().a(ScoreObjectiveCriteria.d));\n+ collection.addAll(this.bL().a(ScoreObjectiveCriteria.d));\n } else {\n this.a(StatList.z, 1);\n }\n@@ -439,7 +439,7 @@ public void b(Entity entity, int i0) {\n \n while (iterator.hasNext()) {\n ScoreObjective scoreobjective = (ScoreObjective) iterator.next();\n- Score score = this.bH().a(this.al(), scoreobjective);\n+ Score score = this.bL().a(this.am(), scoreobjective);\n \n score.a();\n }\n@@ -594,7 +594,7 @@ public void b(NBTTagCompound nbttagcompound) {\n nbttagcompound.a(\"XpP\", this.bJ);\n nbttagcompound.a(\"XpLevel\", this.bH);\n nbttagcompound.a(\"XpTotal\", this.bI);\n- nbttagcompound.a(\"Score\", this.br());\n+ nbttagcompound.a(\"Score\", this.bv());\n if (this.c != null) {\n nbttagcompound.a(\"SpawnX\", this.c.a);\n nbttagcompound.a(\"SpawnY\", this.c.b);\n@@ -633,16 +633,16 @@ protected void d_() {\n }\n \n public boolean a(DamageSource damagesource, float f0) {\n- if (this.ap()) {\n+ if (this.aq()) {\n return false;\n } else if (this.bG.a && !damagesource.g()) {\n return false;\n } else {\n this.aV = 0;\n- if (this.aJ() <= 0.0F) {\n+ if (this.aM() <= 0.0F) {\n return false;\n } else {\n- if (this.bd() && !this.q.I) {\n+ if (this.bg() && !this.q.I) {\n this.a(true, true, false);\n }\n \n@@ -669,10 +669,6 @@ public boolean a(DamageSource damagesource, float f0) {\n entity = ((EntityArrow) entity).c;\n }\n \n- if (entity instanceof EntityLivingBase) {\n- this.a((EntityLivingBase) entity, false);\n- }\n-\n this.a(StatList.x, Math.round(f0 * 10.0F));\n return super.a(damagesource, f0);\n }\n@@ -681,49 +677,21 @@ public boolean a(DamageSource damagesource, float f0) {\n }\n \n public boolean a(EntityPlayer entityplayer) {\n- ScorePlayerTeam scoreplayerteam = this.bI();\n- ScorePlayerTeam scoreplayerteam1 = entityplayer.bI();\n-\n- return scoreplayerteam != scoreplayerteam1 ? true : (scoreplayerteam != null ? scoreplayerteam.g() : true);\n- }\n-\n- protected void a(EntityLivingBase entitylivingbase, boolean flag0) {\n- if (!(entitylivingbase instanceof EntityCreeper) && !(entitylivingbase instanceof EntityGhast)) {\n- if (entitylivingbase instanceof EntityWolf) {\n- EntityWolf entitywolf = (EntityWolf) entitylivingbase;\n-\n- if (entitywolf.bP() && this.bu.equals(entitywolf.h_())) {\n- return;\n- }\n- }\n-\n- if (!(entitylivingbase instanceof EntityPlayer) || this.a((EntityPlayer) entitylivingbase)) {\n- if (!(entitylivingbase instanceof EntityHorse) || !((EntityHorse) entitylivingbase).bS()) {\n- List list = this.q.a(EntityWolf.class, AxisAlignedBB.a().a(this.u, this.v, this.w, this.u + 1.0D, this.v + 1.0D, this.w + 1.0D).b(16.0D, 4.0D, 16.0D));\n- Iterator iterator = list.iterator();\n-\n- while (iterator.hasNext()) {\n- EntityWolf entitywolf1 = (EntityWolf) iterator.next();\n+ Team team = this.bn();\n+ Team team1 = entityplayer.bn();\n \n- if (entitywolf1.bP() && entitywolf1.bJ() == null && this.bu.equals(entitywolf1.h_()) && (!flag0 || !entitywolf1.bQ())) {\n- entitywolf1.l(false);\n- entitywolf1.b((Entity) entitylivingbase);\n- }\n- }\n- }\n- }\n- }\n+ return team == null ? true : (!team.a(team1) ? true : team.g());\n }\n \n protected void h(float f0) {\n this.bn.a(f0);\n }\n \n- public int aM() {\n+ public int aP() {\n return this.bn.l();\n }\n \n- public float bs() {\n+ public float bw() {\n int i0 = 0;\n ItemStack[] aitemstack = this.bn.b;\n int i1 = aitemstack.length;\n@@ -740,23 +708,23 @@ public float bs() {\n }\n \n protected void d(DamageSource damagesource, float f0) {\n- if (!this.ap()) {\n- if (!damagesource.e() && this.bq() && f0 > 0.0F) {\n+ if (!this.aq()) {\n+ if (!damagesource.e() && this.bu() && f0 > 0.0F) {\n f0 = (1.0F + f0) * 0.5F;\n }\n \n f0 = this.b(damagesource, f0);\n f0 = this.c(damagesource, f0);\n float f1 = f0;\n \n- f0 = Math.max(f0 - this.bj(), 0.0F);\n- this.m(this.bj() - (f1 - f0));\n+ f0 = Math.max(f0 - this.bm(), 0.0F);\n+ this.m(this.bm() - (f1 - f0));\n if (f0 != 0.0F) {\n this.a(damagesource.f());\n- float f2 = this.aJ();\n+ float f2 = this.aM();\n \n- this.g(this.aJ() - f0);\n- this.aN().a(damagesource, f2, f0);\n+ this.g(this.aM() - f0);\n+ this.aQ().a(damagesource, f2, f0);\n }\n }\n }\n@@ -776,7 +744,7 @@ public void a(IMerchant imerchant, String s0) {}\n public void c(ItemStack itemstack) {}\n \n public boolean p(Entity entity) {\n- ItemStack itemstack = this.bt();\n+ ItemStack itemstack = this.bx();\n ItemStack itemstack1 = itemstack != null ? itemstack.m() : null;\n if (entity.c(this)) {\n return true;\n@@ -794,15 +762,15 @@ public boolean p(Entity entity) {\n \n if (itemstack.a(this, (EntityLivingBase) entity)) {\n if (itemstack.b <= 0 && !this.bG.d) {\n- this.bu();\n+ this.by();\n }\n \n return true;\n }\n }\n- if (itemstack != null && itemstack == this.bt()) {\n+ if (itemstack != null && itemstack == this.bx()) {\n if (itemstack.b <= 0 && !this.bG.d) {\n- this.bu();\n+ this.by();\n } else if (itemstack.b < itemstack1.b && this.bG.d) {\n itemstack.b = itemstack1.b;\n }\n@@ -812,20 +780,20 @@ public boolean p(Entity entity) {\n }\n }\n \n- public ItemStack bt() {\n+ public ItemStack bx() {\n return this.bn.h();\n }\n \n- public void bu() {\n+ public void by() {\n this.bn.a(this.bn.c, (ItemStack) null);\n }\n \n- public double V() {\n+ public double W() {\n return (double) (this.N - 0.5F);\n }\n \n public void q(Entity entity) {\n- if (entity.ao()) {\n+ if (entity.ap()) {\n if (!entity.i(this)) {\n float f0 = (float) this.a(SharedMonsterAttributes.e).e();\n int i0 = 0;\n@@ -836,7 +804,7 @@ public void q(Entity entity) {\n i0 += EnchantmentHelper.b(this, (EntityLivingBase) entity);\n }\n \n- if (this.ag()) {\n+ if (this.ah()) {\n ++i0;\n }\n \n@@ -851,7 +819,7 @@ public void q(Entity entity) {\n boolean flag1 = false;\n int i1 = EnchantmentHelper.a((EntityLivingBase) this);\n \n- if (entity instanceof EntityLivingBase && i1 > 0 && !entity.ad()) {\n+ if (entity instanceof EntityLivingBase && i1 > 0 && !entity.ae()) {\n flag1 = true;\n entity.d(1);\n }\n@@ -884,7 +852,7 @@ public void q(Entity entity) {\n }\n }\n \n- ItemStack itemstack = this.bt();\n+ ItemStack itemstack = this.bx();\n Object object = entity;\n \n if (entity instanceof EntityDragonPart) {\n@@ -898,15 +866,11 @@ public void q(Entity entity) {\n if (itemstack != null && object instanceof EntityLivingBase) {\n itemstack.a((EntityLivingBase) object, this);\n if (itemstack.b <= 0) {\n- this.bu();\n+ this.by();\n }\n }\n \n if (entity instanceof EntityLivingBase) {\n- if (entity.R()) {\n- this.a((EntityLivingBase) entity, true);\n- }\n-\n this.a(StatList.w, Math.round(f0 * 10.0F));\n if (i1 > 0 && flag2) {\n entity.d(i1 * 4);\n@@ -933,13 +897,13 @@ public void w() {\n }\n }\n \n- public boolean S() {\n- return !this.bC && super.S();\n+ public boolean T() {\n+ return !this.bC && super.T();\n }\n \n public EnumStatus a(int i0, int i1, int i2) {\n if (!this.q.I) {\n- if (this.bd() || !this.R()) {\n+ if (this.bg() || !this.S()) {\n return EnumStatus.e;\n }\n \n@@ -964,7 +928,7 @@ public EnumStatus a(int i0, int i1, int i2) {\n }\n }\n \n- if (this.ae()) {\n+ if (this.af()) {\n this.a((Entity) null);\n }\n \n@@ -1088,11 +1052,11 @@ public static ChunkCoordinates a(World world, ChunkCoordinates chunkcoordinates,\n }\n }\n \n- public boolean bd() {\n+ public boolean bg() {\n return this.bC;\n }\n \n- public boolean by() {\n+ public boolean bC() {\n return this.bC && this.b >= 100;\n }\n \n@@ -1108,11 +1072,11 @@ protected void b(int i0, boolean flag0) {\n \n public void a(String s0) {}\n \n- public ChunkCoordinates bA() {\n+ public ChunkCoordinates bE() {\n return this.c;\n }\n \n- public boolean bB() {\n+ public boolean bF() {\n return this.d;\n }\n \n@@ -1132,10 +1096,10 @@ public void a(StatBase statbase) {\n \n public void a(StatBase statbase, int i0) {}\n \n- protected void ba() {\n- super.ba();\n+ protected void bd() {\n+ super.bd();\n this.a(StatList.u, 1);\n- if (this.ag()) {\n+ if (this.ah()) {\n this.a(0.8F);\n } else {\n this.a(0.2F);\n@@ -1162,7 +1126,7 @@ public void e(float f0, float f1) {\n this.j(this.u - d0, this.v - d1, this.w - d2);\n }\n \n- public float bc() {\n+ public float bf() {\n return (float) this.a(SharedMonsterAttributes.d).e();\n }\n \n@@ -1190,7 +1154,7 @@ public void j(double d0, double d1, double d2) {\n i0 = Math.round(MathHelper.a(d0 * d0 + d2 * d2) * 100.0F);\n if (i0 > 0) {\n this.a(StatList.l, i0);\n- if (this.ag()) {\n+ if (this.ah()) {\n this.a(0.099999994F * (float) i0 * 0.01F);\n } else {\n this.a(0.01F * (float) i0 * 0.01F);\n@@ -1242,9 +1206,9 @@ public void a(EntityLivingBase entitylivingbase) {\n }\n }\n \n- public void ak() {\n+ public void al() {\n if (!this.bG.b) {\n- super.ak();\n+ super.al();\n }\n }\n \n@@ -1260,10 +1224,10 @@ public void s(int i0) {\n i0 = i1;\n }\n \n- this.bJ += (float) i0 / (float) this.bC();\n+ this.bJ += (float) i0 / (float) this.bG();\n \n- for (this.bI += i0; this.bJ >= 1.0F; this.bJ /= (float) this.bC()) {\n- this.bJ = (this.bJ - 1.0F) * (float) this.bC();\n+ for (this.bI += i0; this.bJ >= 1.0F; this.bJ /= (float) this.bG()) {\n+ this.bJ = (this.bJ - 1.0F) * (float) this.bG();\n this.a(1);\n }\n }\n@@ -1287,7 +1251,7 @@ public void a(int i0) {\n }\n }\n \n- public int bC() {\n+ public int bG() {\n return this.bH >= 30 ? 62 + (this.bH - 30) * 7 : (this.bH >= 15 ? 17 + (this.bH - 15) * 3 : 17);\n }\n \n@@ -1299,16 +1263,16 @@ public void a(float f0) {\n }\n }\n \n- public FoodStats bD() {\n+ public FoodStats bH() {\n return this.bq;\n }\n \n public boolean g(boolean flag0) {\n return (flag0 || this.bq.c()) && !this.bG.a;\n }\n \n- public boolean bE() {\n- return this.aJ() > 0.0F && this.aJ() < this.aP();\n+ public boolean bI() {\n+ return this.aM() > 0.0F && this.aM() < this.aS();\n }\n \n public void a(ItemStack itemstack, int i0) {\n@@ -1334,8 +1298,8 @@ public boolean d(int i0, int i1, int i2) {\n return true;\n }\n \n- if (this.bt() != null) {\n- ItemStack itemstack = this.bt();\n+ if (this.bx() != null) {\n+ ItemStack itemstack = this.bx();\n \n if (itemstack.b(block) || itemstack.a(block) > 1.0F) {\n return true;\n@@ -1361,30 +1325,30 @@ protected int e(EntityPlayer entityplayer) {\n }\n }\n \n- protected boolean aA() {\n+ protected boolean aB() {\n return true;\n }\n \n- public String al() {\n+ public String am() {\n return this.bu;\n }\n \n public void a(EntityPlayer entityplayer, boolean flag0) {\n if (flag0) {\n this.bn.b(entityplayer.bn);\n- this.g(entityplayer.aJ());\n+ this.g(entityplayer.aM());\n this.bq = entityplayer.bq;\n this.bH = entityplayer.bH;\n this.bI = entityplayer.bI;\n this.bJ = entityplayer.bJ;\n- this.c(entityplayer.br());\n+ this.c(entityplayer.bv());\n this.as = entityplayer.as;\n } else if (this.q.O().b(\"keepInventory\")) {\n this.bn.b(entityplayer.bn);\n this.bH = entityplayer.bH;\n this.bI = entityplayer.bI;\n this.bJ = entityplayer.bJ;\n- this.c(entityplayer.br());\n+ this.c(entityplayer.bv());\n }\n \n this.a = entityplayer.a;\n@@ -1406,40 +1370,40 @@ public World f_() {\n return this.q;\n }\n \n- public InventoryEnderChest bF() {\n+ public InventoryEnderChest bJ() {\n return this.a;\n }\n \n public ItemStack n(int i0) {\n return i0 == 0 ? this.bn.h() : this.bn.b[i0 - 1];\n }\n \n- public ItemStack aV() {\n+ public ItemStack aY() {\n return this.bn.h();\n }\n \n public void c(int i0, ItemStack itemstack) {\n this.bn.b[i0] = itemstack;\n }\n \n- public ItemStack[] ac() {\n+ public ItemStack[] ad() {\n return this.bn.b;\n }\n \n- public boolean av() {\n+ public boolean aw() {\n return !this.bG.b;\n }\n \n- public Scoreboard bH() {\n+ public Scoreboard bL() {\n return this.q.X();\n }\n \n- public ScorePlayerTeam bI() {\n- return this.bH().i(this.bu);\n+ public Team bn() {\n+ return this.bL().i(this.bu);\n }\n \n- public String aw() {\n- return ScorePlayerTeam.a(this.bI(), this.bu);\n+ public String ax() {\n+ return ScorePlayerTeam.a(this.bn(), this.bu);\n }\n \n public void m(float f0) {\n@@ -1450,7 +1414,7 @@ public void m(float f0) {\n this.u().b(17, Float.valueOf(f0));\n }\n \n- public float bj() {\n+ public float bm() {\n return this.u().d(17);\n }\n \n@@ -1466,11 +1430,11 @@ public void removeXP(int i) {\n i = this.bI;\n }\n \n- this.bI -= (float) i / (float) this.bC();\n+ this.bI -= (float) i / (float) this.bG();\n \n // Inverse of for loop in this.t(int)\n- for (this.bI -= i; this.bJ < 0.0F; this.bJ = this.bJ / this.bC() + 1.0F) {\n- this.bJ *= this.bC();\n+ for (this.bI -= i; this.bJ < 0.0F; this.bJ = this.bJ / this.bG() + 1.0F) {\n+ this.bJ *= this.bG();\n this.a(-1);\n }\n updateXP();\n@@ -1486,13 +1450,13 @@ public void setXP(int i) {\n }\n \n public void recalculateXP() {\n- this.bJ = this.bI / (float) this.bC();\n+ this.bJ = this.bI / (float) this.bG();\n this.bH = 0;\n \n while (this.bJ >= 1.0F) {\n- this.bJ = (this.bJ - 1.0F) * this.bC();\n+ this.bJ = (this.bJ - 1.0F) * this.bG();\n this.bI++;\n- this.bJ /= this.bC();\n+ this.bJ /= this.bG();\n }\n \n if (this instanceof EntityPlayerMP) {", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityPlayer.java", "sha": "73797046af6371d67c7828ae34ee6724afb48a19", "status": "modified" }, { "additions": 43, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityPlayerMP.java", "changes": 79, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityPlayerMP.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 36, "filename": "src/main/java/net/minecraft/server/EntityPlayerMP.java", "new_code": " if (itemstack != null && Item.g[itemstack.d].f() && this.a.f() <= 5) {\n if (this.aM() != this.bP && bP != -99999999 && this.getPlayer() != null) {\n super.b(this.aY());\n HealthChangeHook hook = (HealthChangeHook) new HealthChangeHook(getPlayer(), bP, this.aM()).call();\n if (this.aM() != this.bP || this.bQ != this.bq.a() || this.bq.e() == 0.0F != this.bR) {\n int health = (int) (this.aM() / (this.bm() / 20));\n health = (this.aM() > 0 && health == 0) ? 1 : health;\n this.bP = this.aM();\n if (this.aM() + this.bm() != this.bO) {\n this.bO = this.aM() + this.bm();\n Collection collection = this.bL().a(ScoreObjectiveCriteria.f);\n this.bL().a(this.am(), scoreobjective).a(Arrays.asList(new EntityPlayer[]{ this }));\n } else {\n PlayerDeathHook hook = (PlayerDeathHook) new PlayerDeathHook(getPlayer(), damagesource.getCanaryDamageSource(), this.aQ().b().toString()).call();\n Score score = this.bL().a(this.am(), scoreobjective);\n EntityLivingBase entitylivingbase = this.aR();\n if (this.aq()) {\n if (this.bg()) {\n public void a(TileEntity tileentity) {\n if (tileentity instanceof TileEntitySign) {\n ((TileEntitySign) tileentity).a((EntityPlayer) this);\n this.a.b(new Packet133TileEditorOpen(0, tileentity.l, tileentity.m, tileentity.n));\n }\n }\n\n private void bM() {\n this.bM();\n this.bM();\n this.bM();\n this.bM();\n this.bM();\n this.bM();\n this.bM();\n this.bM();\n this.bM();\n this.bM();\n this.bM();\n this.bM();\n protected void a(PotionEffect potioneffect, boolean flag0) {\n super.a(potioneffect, flag0);\n protected void b(PotionEffect potioneffect) {\n super.b(potioneffect);\n // return \"seed\".equals(s0) && !this.b.V() ? true : (!\"tell\".equals(s0) && !\"help\".equals(s0) && !\"me\".equals(s0) ? this.b.af().e(this.bu) ? this.b.k() >= i0 : false) : true);", "new_methods": [ { "arguments": [ "TileEntity tileentity" ], "filename": "src/main/java/net/minecraft/server/EntityPlayerMP.java", "implementation": "if (tileentity instanceof TileEntitySign) {\n ((TileEntitySign) tileentity).a((EntityPlayer) this);\n this.a.b(new Packet133TileEditorOpen(0, tileentity.l, tileentity.m, tileentity.n));", "signature": "void a(TileEntity tileentity)" } ], "old_code": " if (itemstack != null && Item.g[itemstack.d].f() && this.a.e() <= 5) {\n if (this.aJ() != this.bP && bP != -99999999 && this.getPlayer() != null) {\n super.b(this.aW());\n HealthChangeHook hook = (HealthChangeHook) new HealthChangeHook(getPlayer(), bP, this.aJ()).call();\n if (this.aJ() != this.bP || this.bQ != this.bq.a() || this.bq.e() == 0.0F != this.bR) {\n int health = (int) (this.aJ() / (this.aW() / 20));\n health = (this.aX() > 0 && health == 0) ? 1 : health;\n this.bP = this.aJ();\n if (this.aJ() + this.bj() != this.bO) {\n this.bO = this.aJ() + this.bj();\n Collection collection = this.bH().a(ScoreObjectiveCriteria.f);\n this.bH().a(this.al(), scoreobjective).a(Arrays.asList(new EntityPlayer[]{ this }));\n } else if (getPlayer() != null) { // NPC?\n PlayerDeathHook hook = (PlayerDeathHook) new PlayerDeathHook(getPlayer(), damagesource.getCanaryDamageSource(), this.aN().b().toString()).call();\n Score score = this.bH().a(this.al(), scoreobjective);\n EntityLivingBase entitylivingbase = this.aO();\n if (this.ap()) {\n if (this.bd()) {\n private void bJ() {\n this.bJ();\n this.bJ();\n this.bJ();\n this.bJ();\n this.bJ();\n this.bJ();\n this.bJ();\n this.bJ();\n this.bJ();\n this.bJ();\n this.bJ();\n this.bJ();\n protected void b(PotionEffect potioneffect) {\n super.b(potioneffect);\n protected void c(PotionEffect potioneffect) {\n super.c(potioneffect);\n // return \"seed\".equals(s0) && !this.b.T() ? true : (!\"tell\".equals(s0) && !\"help\".equals(s0) && !\"me\".equals(s0) ? this.b.ad().e(this.bS) : true);", "old_methods": [], "patch": "@@ -192,7 +192,7 @@ public void h() {\n for (int i0 = 0; i0 < this.bn.j_(); ++i0) {\n ItemStack itemstack = this.bn.a(i0);\n \n- if (itemstack != null && Item.g[itemstack.d].f() && this.a.e() <= 5) {\n+ if (itemstack != null && Item.g[itemstack.d].f() && this.a.f() <= 5) {\n Packet packet = ((ItemMapBase) Item.g[itemstack.d]).c(itemstack, this.q, this);\n \n if (packet != null) {\n@@ -202,47 +202,47 @@ public void h() {\n }\n \n // CanaryMod: HealthChange / HealthEnabled\n- if (this.aJ() != this.bP && bP != -99999999 && this.getPlayer() != null) {\n+ if (this.aM() != this.bP && bP != -99999999 && this.getPlayer() != null) {\n // updates your health when it is changed.\n if (!Configuration.getWorldConfig(getCanaryWorld().getFqName()).isHealthEnabled()) {\n- super.b(this.aW());\n+ super.b(this.aY());\n this.M = false;\n } else {\n- HealthChangeHook hook = (HealthChangeHook) new HealthChangeHook(getPlayer(), bP, this.aJ()).call();\n+ HealthChangeHook hook = (HealthChangeHook) new HealthChangeHook(getPlayer(), bP, this.aM()).call();\n if (hook.isCanceled()) {\n super.b(this.bP);\n }\n }\n }\n //\n \n- if (this.aJ() != this.bP || this.bQ != this.bq.a() || this.bq.e() == 0.0F != this.bR) {\n+ if (this.aM() != this.bP || this.bQ != this.bq.a() || this.bq.e() == 0.0F != this.bR) {\n // CanaryMod: convert health for values above 20\n- int health = (int) (this.aJ() / (this.aW() / 20));\n+ int health = (int) (this.aM() / (this.bm() / 20));\n \n- health = (this.aX() > 0 && health == 0) ? 1 : health;\n+ health = (this.aM() > 0 && health == 0) ? 1 : health;\n this.a.b(new Packet8UpdateHealth(health, this.bq.a(), this.bq.e()));\n //\n- this.bP = this.aJ();\n+ this.bP = this.aM();\n this.bQ = this.bq.a();\n this.bR = this.bq.e() == 0.0F;\n }\n \n- if (this.aJ() + this.bj() != this.bO) {\n- this.bO = this.aJ() + this.bj();\n- Collection collection = this.bH().a(ScoreObjectiveCriteria.f);\n+ if (this.aM() + this.bm() != this.bO) {\n+ this.bO = this.aM() + this.bm();\n+ Collection collection = this.bL().a(ScoreObjectiveCriteria.f);\n Iterator iterator = collection.iterator();\n \n while (iterator.hasNext()) {\n ScoreObjective scoreobjective = (ScoreObjective) iterator.next();\n \n- this.bH().a(this.al(), scoreobjective).a(Arrays.asList(new EntityPlayer[]{ this }));\n+ this.bL().a(this.am(), scoreobjective).a(Arrays.asList(new EntityPlayer[]{ this }));\n }\n // CanaryMod: ExperienceHook / ExperienceEnabled\n if (!Configuration.getWorldConfig(getCanaryWorld().getFqName()).isExperienceEnabled()) {\n this.bI = 0;\n this.bH = 0;\n- } else if (getPlayer() != null) { // NPC?\n+ } else {\n ExperienceHook hook = new ExperienceHook(getPlayer(), this.bS, this.bI);\n \n if (!hook.isCanceled()) {\n@@ -263,7 +263,7 @@ public void h() {\n \n public void a(DamageSource damagesource) {\n // CanaryMod: PlayerDeathHook\n- PlayerDeathHook hook = (PlayerDeathHook) new PlayerDeathHook(getPlayer(), damagesource.getCanaryDamageSource(), this.aN().b().toString()).call();\n+ PlayerDeathHook hook = (PlayerDeathHook) new PlayerDeathHook(getPlayer(), damagesource.getCanaryDamageSource(), this.aQ().b().toString()).call();\n // Check Death Message enabled\n if (Configuration.getServerConfig().isDeathMessageEnabled()) {\n this.b.af().a(ChatMessageComponent.e(hook.getDeathMessage()));\n@@ -278,12 +278,12 @@ public void a(DamageSource damagesource) {\n \n while (iterator.hasNext()) {\n ScoreObjective scoreobjective = (ScoreObjective) iterator.next();\n- Score score = this.bH().a(this.al(), scoreobjective);\n+ Score score = this.bL().a(this.am(), scoreobjective);\n \n score.a();\n }\n \n- EntityLivingBase entitylivingbase = this.aO();\n+ EntityLivingBase entitylivingbase = this.aR();\n \n if (entitylivingbase != null) {\n entitylivingbase.b(this, this.bb);\n@@ -293,7 +293,7 @@ public void a(DamageSource damagesource) {\n }\n \n public boolean a(DamageSource damagesource, float f0) {\n- if (this.ap()) {\n+ if (this.aq()) {\n return false;\n } else {\n // CanaryMod moved pvp to per-world config\n@@ -403,7 +403,7 @@ public EnumStatus a(int i0, int i1, int i2) {\n }\n \n public void a(boolean flag0, boolean flag1, boolean flag2) {\n- if (this.bd()) {\n+ if (this.bg()) {\n this.p().q().b(this, new Packet18Animation(this, 3));\n }\n \n@@ -425,7 +425,14 @@ public void b(double d0, boolean flag0) {\n super.a(d0, flag0);\n }\n \n- private void bJ() {\n+ public void a(TileEntity tileentity) {\n+ if (tileentity instanceof TileEntitySign) {\n+ ((TileEntitySign) tileentity).a((EntityPlayer) this);\n+ this.a.b(new Packet133TileEditorOpen(0, tileentity.l, tileentity.m, tileentity.n));\n+ }\n+ }\n+\n+ private void bM() {\n this.bX = this.bX % 100 + 1;\n }\n \n@@ -438,7 +445,7 @@ public void b(int i0, int i1, int i2) {\n return;\n }\n //\n- this.bJ();\n+ this.bM();\n this.a.b(new Packet100OpenWindow(this.bX, 1, bench.getInventoryName(), 9, true));\n this.bp = container;\n this.bp.d = this.bX;\n@@ -454,7 +461,7 @@ public void a(int i0, int i1, int i2, String s0) {\n return;\n }\n //\n- this.bJ();\n+ this.bM();\n this.a.b(new Packet100OpenWindow(this.bX, 4, s0 == null ? \"\" : s0, 9, s0 != null));\n this.bp = new ContainerEnchantment(this.bn, this.q, i0, i1, i2);\n this.bp.d = this.bX;\n@@ -470,7 +477,7 @@ public void c(int i0, int i1, int i2) {\n return;\n }\n //\n- this.bJ();\n+ this.bM();\n this.a.b(new Packet100OpenWindow(this.bX, 8, \"Repairing\", 9, true));\n this.bp = container;\n this.bp.d = this.bX;\n@@ -506,7 +513,7 @@ public void a(IInventory iinventory) {\n }\n }\n //\n- this.bJ();\n+ this.bM();\n this.a.b(new Packet100OpenWindow(this.bX, 0, iinventory.b(), iinventory.j_(), iinventory.c()));\n this.bp = container;\n this.bp.d = this.bX;\n@@ -520,7 +527,7 @@ public void a(TileEntityHopper tileentityhopper) {\n return;\n }\n //\n- this.bJ();\n+ this.bM();\n this.a.b(new Packet100OpenWindow(this.bX, 9, tileentityhopper.b(), tileentityhopper.j_(), tileentityhopper.c()));\n this.bp = new ContainerHopper(this.bn, tileentityhopper);\n this.bp.d = this.bX;\n@@ -534,7 +541,7 @@ public void a(EntityMinecartHopper entityminecarthopper) {\n return;\n }\n //\n- this.bJ();\n+ this.bM();\n this.a.b(new Packet100OpenWindow(this.bX, 9, entityminecarthopper.b(), entityminecarthopper.j_(), entityminecarthopper.c()));\n this.bp = new ContainerHopper(this.bn, entityminecarthopper);\n this.bp.d = this.bX;\n@@ -548,7 +555,7 @@ public void a(TileEntityFurnace tileentityfurnace) {\n return;\n }\n //\n- this.bJ();\n+ this.bM();\n this.a.b(new Packet100OpenWindow(this.bX, 2, tileentityfurnace.b(), tileentityfurnace.j_(), tileentityfurnace.c()));\n this.bp = new ContainerFurnace(this.bn, tileentityfurnace);\n this.bp.d = this.bX;\n@@ -562,7 +569,7 @@ public void a(TileEntityDispenser tileentitydispenser) {\n return;\n }\n //\n- this.bJ();\n+ this.bM();\n this.a.b(new Packet100OpenWindow(this.bX, tileentitydispenser instanceof TileEntityDropper ? 10 : 3, tileentitydispenser.b(), tileentitydispenser.j_(), tileentitydispenser.c()));\n this.bp = new ContainerDispenser(this.bn, tileentitydispenser);\n this.bp.d = this.bX;\n@@ -576,7 +583,7 @@ public void a(TileEntityBrewingStand tileentitybrewingstand) {\n return;\n }\n //\n- this.bJ();\n+ this.bM();\n this.a.b(new Packet100OpenWindow(this.bX, 5, tileentitybrewingstand.b(), tileentitybrewingstand.j_(), tileentitybrewingstand.c()));\n this.bp = new ContainerBrewingStand(this.bn, tileentitybrewingstand);\n this.bp.d = this.bX;\n@@ -590,15 +597,15 @@ public void a(TileEntityBeacon tileentitybeacon) {\n return;\n }\n //\n- this.bJ();\n+ this.bM();\n this.a.b(new Packet100OpenWindow(this.bX, 7, tileentitybeacon.b(), tileentitybeacon.j_(), tileentitybeacon.c()));\n this.bp = new ContainerBeacon(this.bn, tileentitybeacon);\n this.bp.d = this.bX;\n this.bp.a((ICrafting) this);\n }\n \n public void a(IMerchant imerchant, String s0) {\n- this.bJ();\n+ this.bM();\n this.bp = new ContainerMerchant(this.bn, imerchant, this.q);\n this.bp.d = this.bX;\n this.bp.a((ICrafting) this);\n@@ -635,7 +642,7 @@ public void a(EntityHorse entityhorse, IInventory iinventory) {\n ContainerHorseInventory chi = new ContainerHorseInventory(this.bn, iinventory, entityhorse);\n chi.setInventory(inv);\n //\n- this.bJ();\n+ this.bM();\n this.a.b(new Packet100OpenWindow(this.bX, 11, iinventory.b(), iinventory.j_(), iinventory.c(), entityhorse.k));\n this.bp = chi;\n this.bp.d = this.bX;\n@@ -756,13 +763,13 @@ protected void a(PotionEffect potioneffect) {\n this.a.b(new Packet41EntityEffect(this.k, potioneffect));\n }\n \n- protected void b(PotionEffect potioneffect) {\n- super.b(potioneffect);\n+ protected void a(PotionEffect potioneffect, boolean flag0) {\n+ super.a(potioneffect, flag0);\n this.a.b(new Packet41EntityEffect(this.k, potioneffect));\n }\n \n- protected void c(PotionEffect potioneffect) {\n- super.c(potioneffect);\n+ protected void b(PotionEffect potioneffect) {\n+ super.b(potioneffect);\n this.a.b(new Packet42RemoveEntityEffect(this.k, potioneffect));\n }\n \n@@ -799,7 +806,7 @@ public void a(ChatMessageComponent chatmessagecomponent) {\n \n public boolean a(int i0, String s0) {\n // CanaryMod: replace permission checking with ours\n- // return \"seed\".equals(s0) && !this.b.T() ? true : (!\"tell\".equals(s0) && !\"help\".equals(s0) && !\"me\".equals(s0) ? this.b.ad().e(this.bS) : true);\n+ // return \"seed\".equals(s0) && !this.b.V() ? true : (!\"tell\".equals(s0) && !\"help\".equals(s0) && !\"me\".equals(s0) ? this.b.af().e(this.bu) ? this.b.k() >= i0 : false) : true);\n if (s0.trim().isEmpty()) { // Purely checking for permission level\n return getPlayer().hasPermission(\"canary.world.commandblock\");\n }", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityPlayerMP.java", "sha": "76c1b5d0fcdf5cb0bbe881864d4fd1b20dd4eafe", "status": "modified" }, { "additions": 2, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityPotion.java", "changes": 6, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityPotion.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 4, "filename": "src/main/java/net/minecraft/server/EntityPotion.java", "new_code": " // protected float e() {\n entitylivingbase.c(new PotionEffect(i0, i1, potioneffect.c()));", "new_methods": [], "old_code": "\n\n // protected float g() {\n entitylivingbase.d(new PotionEffect(i0, i1, potioneffect.c()));", "old_methods": [], "patch": "@@ -1,11 +1,9 @@\n package net.minecraft.server;\n \n-\n import java.util.Iterator;\n import java.util.List;\n import net.canarymod.api.entity.throwable.CanaryEntityPotion;\n \n-\n public class EntityPotion extends EntityThrowable {\n \n private ItemStack c;\n@@ -41,7 +39,7 @@ public EntityPotion(World world, double d0, double d1, double d2, ItemStack item\n }\n \n // CanaryMod: remove unneeded method override\n- // protected float g() {\n+ // protected float e() {\n // return 0.05F;\n // }\n //\n@@ -104,7 +102,7 @@ protected void a(MovingObjectPosition movingobjectposition) {\n int i1 = (int) (d1 * (double) potioneffect.b() + 0.5D);\n \n if (i1 > 20) {\n- entitylivingbase.d(new PotionEffect(i0, i1, potioneffect.c()));\n+ entitylivingbase.c(new PotionEffect(i0, i1, potioneffect.c()));\n }\n }\n }", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityPotion.java", "sha": "38fb67ef9948279f003df5374a3c58810f4c2599", "status": "modified" }, { "additions": 22, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntitySheep.java", "changes": 45, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntitySheep.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 23, "filename": "src/main/java/net/minecraft/server/EntitySheep.java", "new_code": " public static final float[][] bp = new float[][]{ { 1.0F, 1.0F, 1.0F }, { 0.85F, 0.5F, 0.2F }, { 0.7F, 0.3F, 0.85F }, { 0.4F, 0.6F, 0.85F }, { 0.9F, 0.9F, 0.2F }, { 0.5F, 0.8F, 0.1F }, { 0.95F, 0.5F, 0.65F }, { 0.3F, 0.3F, 0.3F }, { 0.6F, 0.6F, 0.6F }, { 0.3F, 0.5F, 0.6F }, { 0.5F, 0.25F, 0.7F }, { 0.2F, 0.3F, 0.7F }, { 0.4F, 0.3F, 0.2F },\n { 0.4F, 0.5F, 0.2F }, { 0.6F, 0.2F, 0.2F }, { 0.1F, 0.1F, 0.1F } };\n protected boolean be() {\n protected void bh() {\n super.bh();\n protected void ay() {\n super.ay();\n if (!this.bU()) {\n this.a(new ItemStack(Block.ag.cF, 1, this.bT()), 0.0F);\n if (itemstack != null && itemstack.d == Item.bg.cv && !this.bU() && !this.g_()) {\n this.i(true);\n EntityItem entityitem = this.a(new ItemStack(Block.ag.cF, 1, this.bT()), 1.0F);\n nbttagcompound.a(\"Sheared\", this.bU());\n nbttagcompound.a(\"Color\", (byte) this.bT());\n this.i(nbttagcompound.n(\"Sheared\"));\n protected String aN() {\n protected String aO() {\n public int bT() {\n public boolean bU() {\n public void i(boolean flag0) {\n this.i(false);\n return 15 - ((EntitySheep) entityanimal).bT();", "new_methods": [], "old_code": "\n\n public static final float[][] bp = new float[][]{ { 1.0F, 1.0F, 1.0F }, { 0.85F, 0.5F, 0.2F }, { 0.7F, 0.3F, 0.85F }, { 0.4F, 0.6F, 0.85F }, { 0.9F, 0.9F, 0.2F }, { 0.5F, 0.8F, 0.1F }, { 0.95F, 0.5F, 0.65F }, { 0.3F, 0.3F, 0.3F }, { 0.6F, 0.6F, 0.6F }, { 0.3F, 0.5F, 0.6F }, { 0.5F, 0.25F, 0.7F }, { 0.2F, 0.3F, 0.7F }, { 0.4F, 0.3F, 0.2F }, { 0.4F, 0.5F, 0.2F }, { 0.6F, 0.2F, 0.2F }, { 0.1F, 0.1F, 0.1F } };\n protected boolean bb() {\n protected void be() {\n super.be();\n protected void ax() {\n super.ax();\n if (!this.bQ()) {\n this.a(new ItemStack(Block.ag.cF, 1, this.bP()), 0.0F);\n if (itemstack != null && itemstack.d == Item.bg.cv && !this.bQ() && !this.g_()) {\n this.j(true);\n EntityItem entityitem = this.a(new ItemStack(Block.ag.cF, 1, this.bP()), 1.0F);\n nbttagcompound.a(\"Sheared\", this.bQ());\n nbttagcompound.a(\"Color\", (byte) this.bP());\n this.j(nbttagcompound.n(\"Sheared\"));\n protected String aK() {\n protected String aL() {\n public int bP() {\n public boolean bQ() {\n public void j(boolean flag0) {\n this.j(false);\n return 15 - ((EntitySheep) entityanimal).bP();", "old_methods": [], "patch": "@@ -1,14 +1,13 @@\n package net.minecraft.server;\n \n-\n import java.util.Random;\n import net.canarymod.api.entity.living.animal.CanarySheep;\n \n-\n public class EntitySheep extends EntityAnimal {\n \n private final InventoryCrafting bq = new InventoryCrafting(new ContainerSheep(this), 2, 1);\n- public static final float[][] bp = new float[][]{ { 1.0F, 1.0F, 1.0F }, { 0.85F, 0.5F, 0.2F }, { 0.7F, 0.3F, 0.85F }, { 0.4F, 0.6F, 0.85F }, { 0.9F, 0.9F, 0.2F }, { 0.5F, 0.8F, 0.1F }, { 0.95F, 0.5F, 0.65F }, { 0.3F, 0.3F, 0.3F }, { 0.6F, 0.6F, 0.6F }, { 0.3F, 0.5F, 0.6F }, { 0.5F, 0.25F, 0.7F }, { 0.2F, 0.3F, 0.7F }, { 0.4F, 0.3F, 0.2F }, { 0.4F, 0.5F, 0.2F }, { 0.6F, 0.2F, 0.2F }, { 0.1F, 0.1F, 0.1F } };\n+ public static final float[][] bp = new float[][]{ { 1.0F, 1.0F, 1.0F }, { 0.85F, 0.5F, 0.2F }, { 0.7F, 0.3F, 0.85F }, { 0.4F, 0.6F, 0.85F }, { 0.9F, 0.9F, 0.2F }, { 0.5F, 0.8F, 0.1F }, { 0.95F, 0.5F, 0.65F }, { 0.3F, 0.3F, 0.3F }, { 0.6F, 0.6F, 0.6F }, { 0.3F, 0.5F, 0.6F }, { 0.5F, 0.25F, 0.7F }, { 0.2F, 0.3F, 0.7F }, { 0.4F, 0.3F, 0.2F },\n+ { 0.4F, 0.5F, 0.2F }, { 0.6F, 0.2F, 0.2F }, { 0.1F, 0.1F, 0.1F } };\n private int br;\n private EntityAIEatGrass bs = new EntityAIEatGrass(this);\n \n@@ -30,13 +29,13 @@ public EntitySheep(World world) {\n this.entity = new CanarySheep(this); // CanaryMod: Wrap Entity\n }\n \n- protected boolean bb() {\n+ protected boolean be() {\n return true;\n }\n \n- protected void be() {\n+ protected void bh() {\n this.br = this.bs.f();\n- super.be();\n+ super.bh();\n }\n \n public void c() {\n@@ -47,8 +46,8 @@ public void c() {\n super.c();\n }\n \n- protected void ax() {\n- super.ax();\n+ protected void ay() {\n+ super.ay();\n this.a(SharedMonsterAttributes.a).a(8.0D);\n this.a(SharedMonsterAttributes.d).a(0.23000000417232513D);\n }\n@@ -59,8 +58,8 @@ protected void a() {\n }\n \n protected void b(boolean flag0, int i0) {\n- if (!this.bQ()) {\n- this.a(new ItemStack(Block.ag.cF, 1, this.bP()), 0.0F);\n+ if (!this.bU()) {\n+ this.a(new ItemStack(Block.ag.cF, 1, this.bT()), 0.0F);\n }\n }\n \n@@ -71,13 +70,13 @@ protected int s() {\n public boolean a(EntityPlayer entityplayer) {\n ItemStack itemstack = entityplayer.bn.h();\n \n- if (itemstack != null && itemstack.d == Item.bg.cv && !this.bQ() && !this.g_()) {\n+ if (itemstack != null && itemstack.d == Item.bg.cv && !this.bU() && !this.g_()) {\n if (!this.q.I) {\n- this.j(true);\n+ this.i(true);\n int i0 = 1 + this.ab.nextInt(3);\n \n for (int i1 = 0; i1 < i0; ++i1) {\n- EntityItem entityitem = this.a(new ItemStack(Block.ag.cF, 1, this.bP()), 1.0F);\n+ EntityItem entityitem = this.a(new ItemStack(Block.ag.cF, 1, this.bT()), 1.0F);\n \n entityitem.y += (double) (this.ab.nextFloat() * 0.05F);\n entityitem.x += (double) ((this.ab.nextFloat() - this.ab.nextFloat()) * 0.1F);\n@@ -94,33 +93,33 @@ public boolean a(EntityPlayer entityplayer) {\n \n public void b(NBTTagCompound nbttagcompound) {\n super.b(nbttagcompound);\n- nbttagcompound.a(\"Sheared\", this.bQ());\n- nbttagcompound.a(\"Color\", (byte) this.bP());\n+ nbttagcompound.a(\"Sheared\", this.bU());\n+ nbttagcompound.a(\"Color\", (byte) this.bT());\n }\n \n public void a(NBTTagCompound nbttagcompound) {\n super.a(nbttagcompound);\n- this.j(nbttagcompound.n(\"Sheared\"));\n+ this.i(nbttagcompound.n(\"Sheared\"));\n this.p(nbttagcompound.c(\"Color\"));\n }\n \n protected String r() {\n return \"mob.sheep.say\";\n }\n \n- protected String aK() {\n+ protected String aN() {\n return \"mob.sheep.say\";\n }\n \n- protected String aL() {\n+ protected String aO() {\n return \"mob.sheep.say\";\n }\n \n protected void a(int i0, int i1, int i2, int i3) {\n this.a(\"mob.sheep.step\", 0.15F, 1.0F);\n }\n \n- public int bP() {\n+ public int bT() {\n return this.ah.a(16) & 15;\n }\n \n@@ -130,11 +129,11 @@ public void p(int i0) {\n this.ah.b(16, Byte.valueOf((byte) (b0 & 240 | i0 & 15)));\n }\n \n- public boolean bQ() {\n+ public boolean bU() {\n return (this.ah.a(16) & 16) != 0;\n }\n \n- public void j(boolean flag0) {\n+ public void i(boolean flag0) {\n byte b0 = this.ah.a(16);\n \n if (flag0) {\n@@ -160,7 +159,7 @@ public EntitySheep b(EntityAgeable entityageable) {\n }\n \n public void n() {\n- this.j(false);\n+ this.i(false);\n if (this.g_()) {\n this.a(60);\n }\n@@ -191,7 +190,7 @@ private int a(EntityAnimal entityanimal, EntityAnimal entityanimal1) {\n }\n \n private int b(EntityAnimal entityanimal) {\n- return 15 - ((EntitySheep) entityanimal).bP();\n+ return 15 - ((EntitySheep) entityanimal).bT();\n }\n \n public EntityAgeable a(EntityAgeable entityageable) {", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntitySheep.java", "sha": "2da5deb4826aee7fe7a823ff77ca0c8df408929b", "status": "modified" }, { "additions": 14, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntitySilverfish.java", "changes": 28, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntitySilverfish.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 14, "filename": "src/main/java/net/minecraft/server/EntitySilverfish.java", "new_code": " protected void ay() {\n super.ay();\n protected Entity bL() {\n protected String aN() {\n protected String aO() {\n if (this.aq()) {\n protected void bk() {\n super.bk();\n if (this.j == null && !this.bM()) {\n this.bK();\n } else if (this.j != null && !this.bM()) {\n public boolean bs() {\n if (super.bs()) {\n public EnumCreatureAttribute aX() {", "new_methods": [ { "arguments": [], "filename": "src/main/java/net/minecraft/server/EntitySilverfish.java", "implementation": "super.ay();\n protected Entity bL() {\n protected String aN() {\n protected String aO() {\n if (this.aq()) {\n protected void bk() {\n super.bk();\n if (this.j == null && !this.bM()) {\n this.bK();", "signature": "void ay()" } ], "old_code": " protected void ax() {\n super.ax();\n protected Entity bH() {\n protected String aK() {\n protected String aL() {\n if (this.ap()) {\n protected void bh() {\n super.bh();\n if (this.j == null && !this.bI()) {\n this.bG();\n } else if (this.j != null && !this.bI()) {\n public boolean bo() {\n if (super.bo()) {\n public EnumCreatureAttribute aU() {", "old_methods": [ { "arguments": [], "filename": "src/main/java/net/minecraft/server/EntitySilverfish.java", "implementation": "super.ax();\n protected Entity bH() {\n protected String aK() {\n protected String aL() {\n if (this.ap()) {\n protected void bh() {\n super.bh();\n if (this.j == null && !this.bI()) {\n this.bG();", "signature": "void ax()" } ], "patch": "@@ -12,8 +12,8 @@ public EntitySilverfish(World world) {\n this.entity = new CanarySilverfish(this); // CanaryMod: Wrap Entity\n }\n \n- protected void ax() {\n- super.ax();\n+ protected void ay() {\n+ super.ay();\n this.a(SharedMonsterAttributes.a).a(8.0D);\n this.a(SharedMonsterAttributes.d).a(0.6000000238418579D);\n this.a(SharedMonsterAttributes.e).a(1.0D);\n@@ -23,7 +23,7 @@ protected boolean e_() {\n return false;\n }\n \n- protected Entity bH() {\n+ protected Entity bL() {\n double d0 = 8.0D;\n \n return this.q.b(this, d0);\n@@ -33,16 +33,16 @@ protected String r() {\n return \"mob.silverfish.say\";\n }\n \n- protected String aK() {\n+ protected String aN() {\n return \"mob.silverfish.hit\";\n }\n \n- protected String aL() {\n+ protected String aO() {\n return \"mob.silverfish.kill\";\n }\n \n public boolean a(DamageSource damagesource, float f0) {\n- if (this.ap()) {\n+ if (this.aq()) {\n return false;\n } else {\n if (this.bp <= 0 && (damagesource instanceof EntityDamageSource || damagesource == DamageSource.k)) {\n@@ -73,8 +73,8 @@ public void l_() {\n super.l_();\n }\n \n- protected void bh() {\n- super.bh();\n+ protected void bk() {\n+ super.bk();\n if (!this.q.I) {\n int i0;\n int i1;\n@@ -124,7 +124,7 @@ protected void bh() {\n }\n }\n \n- if (this.j == null && !this.bI()) {\n+ if (this.j == null && !this.bM()) {\n i0 = MathHelper.c(this.u);\n i1 = MathHelper.c(this.v + 0.5D);\n i2 = MathHelper.c(this.w);\n@@ -136,9 +136,9 @@ protected void bh() {\n this.q();\n this.w();\n } else {\n- this.bG();\n+ this.bK();\n }\n- } else if (this.j != null && !this.bI()) {\n+ } else if (this.j != null && !this.bM()) {\n this.j = null;\n }\n }\n@@ -152,8 +152,8 @@ protected boolean i_() {\n return true;\n }\n \n- public boolean bo() {\n- if (super.bo()) {\n+ public boolean bs() {\n+ if (super.bs()) {\n EntityPlayer entityplayer = this.q.a(this, 5.0D);\n \n return entityplayer == null;\n@@ -162,7 +162,7 @@ public boolean bo() {\n }\n }\n \n- public EnumCreatureAttribute aU() {\n+ public EnumCreatureAttribute aX() {\n return EnumCreatureAttribute.c;\n }\n }", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntitySilverfish.java", "sha": "1e4eef0584f2865d8aed045ec3bc44fe8fdd6041", "status": "modified" }, { "additions": 31, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntitySkeleton.java", "changes": 64, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntitySkeleton.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 33, "filename": "src/main/java/net/minecraft/server/EntitySkeleton.java", "new_code": " this.bT();\n protected void ay() {\n super.ay();\n public boolean be() {\n protected String aN() {\n protected String aO() {\n if (this.bV() == 1 && entity instanceof EntityLivingBase) {\n ((EntityLivingBase) entity).c(new PotionEffect(Potion.v.H, 200));\n public EnumCreatureAttribute aX() {\n if (this.q.I && this.bV() == 1) {\n public void U() {\n super.U();\n if (this.bV() == 1) {\n if (this.bV() == 1) {\n protected void bw() {\n super.bw();\n if (this.q.t instanceof WorldProviderHell && this.aC().nextInt(5) > 0) {\n this.bw();\n this.bx();\n public void bT() {\n ItemStack itemstack = this.aY();\n int i0 = EnchantmentHelper.a(Enchantment.v.z, this.aY());\n int i1 = EnchantmentHelper.a(Enchantment.w.z, this.aY());\n if (EnchantmentHelper.a(Enchantment.x.z, this.aY()) > 0 || this.bV() == 1) {\n this.a(\"random.bow\", 1.0F, 1.0F / (this.aC().nextFloat() * 0.4F + 0.8F));\n public int bV() {\n this.bT();\n nbttagcompound.a(\"SkeletonType\", (byte) this.bV());\n this.bT();\n public double W() {\n return super.W() - 0.5D;", "new_methods": [], "old_code": "\n\n this.bP();\n protected void ax() {\n super.ax();\n public boolean bb() {\n protected String aK() {\n protected String aL() {\n if (this.bR() == 1 && entity instanceof EntityLivingBase) {\n ((EntityLivingBase) entity).d(new PotionEffect(Potion.v.H, 200));\n public EnumCreatureAttribute aU() {\n if (this.q.I && this.bR() == 1) {\n public void T() {\n super.T();\n if (this.bR() == 1) {\n if (this.bR() == 1) {\n protected void bs() {\n super.bs();\n if (this.q.t instanceof WorldProviderHell && this.aB().nextInt(5) > 0) {\n this.bs();\n this.bt();\n public void bP() {\n ItemStack itemstack = this.aV();\n int i0 = EnchantmentHelper.a(Enchantment.v.z, this.aV());\n int i1 = EnchantmentHelper.a(Enchantment.w.z, this.aV());\n if (EnchantmentHelper.a(Enchantment.x.z, this.aV()) > 0 || this.bR() == 1) {\n this.a(\"random.bow\", 1.0F, 1.0F / (this.aB().nextFloat() * 0.4F + 0.8F));\n public int bR() {\n this.bP();\n nbttagcompound.a(\"SkeletonType\", (byte) this.bR());\n this.bP();\n public double V() {\n return super.V() - 0.5D;", "old_methods": [], "patch": "@@ -1,10 +1,8 @@\n package net.minecraft.server;\n \n-\n import java.util.Calendar;\n import net.canarymod.api.entity.living.monster.CanarySkeleton;\n \n-\n public class EntitySkeleton extends EntityMob implements IRangedAttackMob {\n \n private EntityAIArrowAttack bp = new EntityAIArrowAttack(this, 1.0D, 20, 60, 15.0F);\n@@ -21,13 +19,13 @@ public EntitySkeleton(World world) {\n this.d.a(1, new EntityAIHurtByTarget(this, false));\n this.d.a(2, new EntityAINearestAttackableTarget(this, EntityPlayer.class, 0, true));\n if (world != null && !world.I) {\n- this.bP();\n+ this.bT();\n }\n this.entity = new CanarySkeleton(this); // CanaryMod: Wrap Entity\n }\n \n- protected void ax() {\n- super.ax();\n+ protected void ay() {\n+ super.ay();\n this.a(SharedMonsterAttributes.d).a(0.25D);\n }\n \n@@ -36,19 +34,19 @@ protected void a() {\n this.ah.a(13, new Byte((byte) 0));\n }\n \n- public boolean bb() {\n+ public boolean be() {\n return true;\n }\n \n protected String r() {\n return \"mob.skeleton.say\";\n }\n \n- protected String aK() {\n+ protected String aN() {\n return \"mob.skeleton.hurt\";\n }\n \n- protected String aL() {\n+ protected String aO() {\n return \"mob.skeleton.death\";\n }\n \n@@ -58,8 +56,8 @@ protected void a(int i0, int i1, int i2, int i3) {\n \n public boolean m(Entity entity) {\n if (super.m(entity)) {\n- if (this.bR() == 1 && entity instanceof EntityLivingBase) {\n- ((EntityLivingBase) entity).d(new PotionEffect(Potion.v.H, 200));\n+ if (this.bV() == 1 && entity instanceof EntityLivingBase) {\n+ ((EntityLivingBase) entity).c(new PotionEffect(Potion.v.H, 200));\n }\n \n return true;\n@@ -68,7 +66,7 @@ public boolean m(Entity entity) {\n }\n }\n \n- public EnumCreatureAttribute aU() {\n+ public EnumCreatureAttribute aX() {\n return EnumCreatureAttribute.b;\n }\n \n@@ -98,15 +96,15 @@ public void c() {\n }\n }\n \n- if (this.q.I && this.bR() == 1) {\n+ if (this.q.I && this.bV() == 1) {\n this.a(0.72F, 2.34F);\n }\n \n super.c();\n }\n \n- public void T() {\n- super.T();\n+ public void U() {\n+ super.U();\n if (this.o instanceof EntityCreature) {\n EntityCreature entitycreature = (EntityCreature) this.o;\n \n@@ -135,7 +133,7 @@ protected void b(boolean flag0, int i0) {\n int i1;\n int i2;\n \n- if (this.bR() == 1) {\n+ if (this.bV() == 1) {\n i1 = this.ab.nextInt(3 + i0) - 1;\n \n for (i2 = 0; i2 < i1; ++i2) {\n@@ -157,27 +155,27 @@ protected void b(boolean flag0, int i0) {\n }\n \n protected void l(int i0) {\n- if (this.bR() == 1) {\n+ if (this.bV() == 1) {\n this.a(new ItemStack(Item.bS.cv, 1, 1), 0.0F);\n }\n }\n \n- protected void bs() {\n- super.bs();\n+ protected void bw() {\n+ super.bw();\n this.c(0, new ItemStack(Item.m));\n }\n \n public EntityLivingData a(EntityLivingData entitylivingdata) {\n entitylivingdata = super.a(entitylivingdata);\n- if (this.q.t instanceof WorldProviderHell && this.aB().nextInt(5) > 0) {\n+ if (this.q.t instanceof WorldProviderHell && this.aC().nextInt(5) > 0) {\n this.c.a(4, this.bq);\n this.a(1);\n this.c(0, new ItemStack(Item.x));\n this.a(SharedMonsterAttributes.e).a(4.0D);\n } else {\n this.c.a(4, this.bp);\n- this.bs();\n- this.bt();\n+ this.bw();\n+ this.bx();\n }\n \n this.h(this.ab.nextFloat() < 0.55F * this.q.b(this.u, this.v, this.w));\n@@ -193,10 +191,10 @@ public EntityLivingData a(EntityLivingData entitylivingdata) {\n return entitylivingdata;\n }\n \n- public void bP() {\n+ public void bT() {\n this.c.a((EntityAIBase) this.bq);\n this.c.a((EntityAIBase) this.bp);\n- ItemStack itemstack = this.aV();\n+ ItemStack itemstack = this.aY();\n \n if (itemstack != null && itemstack.d == Item.m.cv) {\n this.c.a(4, this.bp);\n@@ -207,8 +205,8 @@ public void bP() {\n \n public void a(EntityLivingBase entitylivingbase, float f0) {\n EntityArrow entityarrow = new EntityArrow(this.q, this, entitylivingbase, 1.6F, (float) (14 - this.q.r * 4));\n- int i0 = EnchantmentHelper.a(Enchantment.v.z, this.aV());\n- int i1 = EnchantmentHelper.a(Enchantment.w.z, this.aV());\n+ int i0 = EnchantmentHelper.a(Enchantment.v.z, this.aY());\n+ int i1 = EnchantmentHelper.a(Enchantment.w.z, this.aY());\n \n entityarrow.b((double) (f0 * 2.0F) + this.ab.nextGaussian() * 0.25D + (double) ((float) this.q.r * 0.11F));\n if (i0 > 0) {\n@@ -219,15 +217,15 @@ public void a(EntityLivingBase entitylivingbase, float f0) {\n entityarrow.a(i1);\n }\n \n- if (EnchantmentHelper.a(Enchantment.x.z, this.aV()) > 0 || this.bR() == 1) {\n+ if (EnchantmentHelper.a(Enchantment.x.z, this.aY()) > 0 || this.bV() == 1) {\n entityarrow.d(100);\n }\n \n- this.a(\"random.bow\", 1.0F, 1.0F / (this.aB().nextFloat() * 0.4F + 0.8F));\n+ this.a(\"random.bow\", 1.0F, 1.0F / (this.aC().nextFloat() * 0.4F + 0.8F));\n this.q.d((Entity) entityarrow);\n }\n \n- public int bR() {\n+ public int bV() {\n return this.ah.a(13);\n }\n \n@@ -249,22 +247,22 @@ public void a(NBTTagCompound nbttagcompound) {\n this.a(b0);\n }\n \n- this.bP();\n+ this.bT();\n }\n \n public void b(NBTTagCompound nbttagcompound) {\n super.b(nbttagcompound);\n- nbttagcompound.a(\"SkeletonType\", (byte) this.bR());\n+ nbttagcompound.a(\"SkeletonType\", (byte) this.bV());\n }\n \n public void c(int i0, ItemStack itemstack) {\n super.c(i0, itemstack);\n if (!this.q.I && i0 == 0) {\n- this.bP();\n+ this.bT();\n }\n }\n \n- public double V() {\n- return super.V() - 0.5D;\n+ public double W() {\n+ return super.W() - 0.5D;\n }\n }", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntitySkeleton.java", "sha": "01c964d4f4924f2136ac80065540bc165226c6fc", "status": "modified" }, { "additions": 48, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntitySlime.java", "changes": 96, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntitySlime.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 48, "filename": "src/main/java/net/minecraft/server/EntitySlime.java", "new_code": " this.g(this.aS());\n public int bR() {\n nbttagcompound.a(\"Size\", this.bR() - 1);\n protected String bJ() {\n protected String bP() {\n return \"mob.slime.\" + (this.bR() > 1 ? \"big\" : \"small\");\n if (!this.q.I && this.q.r == 0 && this.bR() > 0) {\n i0 = this.bR();\n this.q.a(this.bJ(), this.u + (double) f2, this.E.b, this.w + (double) f3, 0.0D, 0.0D, 0.0D);\n if (this.bQ()) {\n this.a(this.bP(), this.aZ(), ((this.ab.nextFloat() - this.ab.nextFloat()) * 0.2F + 1.0F) / 0.8F);\n this.bM();\n i0 = this.bR();\n protected void bk() {\n this.bo();\n this.bn = this.bL();\n if (this.bS()) {\n this.a(this.bP(), this.aZ(), ((this.ab.nextFloat() - this.ab.nextFloat()) * 0.2F + 1.0F) * 0.8F);\n this.bf = (float) (1 * this.bR());\n protected void bM() {\n protected int bL() {\n protected EntitySlime bK() {\n int i0 = this.bR();\n if (!this.q.I && i0 > 1 && this.aM() <= 0.0F) {\n EntitySlime entityslime = this.bK();\n if (this.bN()) {\n int i0 = this.bR();\n if (this.o(entityplayer) && this.e(entityplayer) < 0.6D * (double) i0 * 0.6D * (double) i0 && entityplayer.a(DamageSource.a((EntityLivingBase) this), (float) this.bO())) {\n protected boolean bN() {\n return this.bR() > 1;\n protected int bO() {\n return this.bR();\n protected String aN() {\n return \"mob.slime.\" + (this.bR() > 1 ? \"big\" : \"small\");\n protected String aO() {\n return \"mob.slime.\" + (this.bR() > 1 ? \"big\" : \"small\");\n return this.bR() == 1 ? Item.aO.cv : 0;\n public boolean bs() {\n if (this.bR() == 1 || this.q.r > 0) {\n return super.bs();\n return super.bs();\n protected float aZ() {\n return 0.4F * (float) this.bR();\n public int bp() {\n protected boolean bS() {\n return this.bR() > 0;\n protected boolean bQ() {\n return this.bR() > 2;", "new_methods": [], "old_code": " this.g(this.aP());\n public int bN() {\n nbttagcompound.a(\"Size\", this.bN() - 1);\n protected String bF() {\n protected String bL() {\n return \"mob.slime.\" + (this.bN() > 1 ? \"big\" : \"small\");\n if (!this.q.I && this.q.r == 0 && this.bN() > 0) {\n i0 = this.bN();\n this.q.a(this.bF(), this.u + (double) f2, this.E.b, this.w + (double) f3, 0.0D, 0.0D, 0.0D);\n if (this.bM()) {\n this.a(this.bL(), this.aW(), ((this.ab.nextFloat() - this.ab.nextFloat()) * 0.2F + 1.0F) / 0.8F);\n this.bI();\n i0 = this.bN();\n protected void bh() {\n this.bk();\n this.bn = this.bH();\n if (this.bO()) {\n this.a(this.bL(), this.aW(), ((this.ab.nextFloat() - this.ab.nextFloat()) * 0.2F + 1.0F) * 0.8F);\n this.bf = (float) (1 * this.bN());\n protected void bI() {\n protected int bH() {\n protected EntitySlime bG() {\n int i0 = this.bN();\n if (!this.q.I && i0 > 1 && this.aJ() <= 0.0F) {\n EntitySlime entityslime = this.bG();\n if (this.bJ()) {\n int i0 = this.bN();\n if (this.o(entityplayer) && this.e(entityplayer) < 0.6D * (double) i0 * 0.6D * (double) i0 && entityplayer.a(DamageSource.a((EntityLivingBase) this), (float) this.bK())) {\n protected boolean bJ() {\n return this.bN() > 1;\n protected int bK() {\n return this.bN();\n protected String aK() {\n return \"mob.slime.\" + (this.bN() > 1 ? \"big\" : \"small\");\n protected String aL() {\n return \"mob.slime.\" + (this.bN() > 1 ? \"big\" : \"small\");\n return this.bN() == 1 ? Item.aO.cv : 0;\n public boolean bo() {\n if (this.bN() == 1 || this.q.r > 0) {\n return super.bo();\n return super.bo();\n protected float aW() {\n return 0.4F * (float) this.bN();\n public int bl() {\n protected boolean bO() {\n return this.bN() > 0;\n protected boolean bM() {\n return this.bN() > 2;", "old_methods": [], "patch": "@@ -29,34 +29,34 @@ public void a(int i0) { // CanaryMod: protected => public\n this.a(0.6F * (float) i0, 0.6F * (float) i0);\n this.b(this.u, this.v, this.w);\n this.a(SharedMonsterAttributes.a).a((double) (i0 * i0));\n- this.g(this.aP());\n+ this.g(this.aS());\n this.b = i0;\n }\n \n- public int bN() {\n+ public int bR() {\n return this.ah.a(16);\n }\n \n public void b(NBTTagCompound nbttagcompound) {\n super.b(nbttagcompound);\n- nbttagcompound.a(\"Size\", this.bN() - 1);\n+ nbttagcompound.a(\"Size\", this.bR() - 1);\n }\n \n public void a(NBTTagCompound nbttagcompound) {\n super.a(nbttagcompound);\n this.a(nbttagcompound.e(\"Size\") + 1);\n }\n \n- protected String bF() {\n+ protected String bJ() {\n return \"slime\";\n }\n \n- protected String bL() {\n- return \"mob.slime.\" + (this.bN() > 1 ? \"big\" : \"small\");\n+ protected String bP() {\n+ return \"mob.slime.\" + (this.bR() > 1 ? \"big\" : \"small\");\n }\n \n public void l_() {\n- if (!this.q.I && this.q.r == 0 && this.bN() > 0) {\n+ if (!this.q.I && this.q.r == 0 && this.bR() > 0) {\n this.M = true;\n }\n \n@@ -68,54 +68,54 @@ public void l_() {\n int i0;\n \n if (this.F && !flag0) {\n- i0 = this.bN();\n+ i0 = this.bR();\n \n for (int i1 = 0; i1 < i0 * 8; ++i1) {\n float f0 = this.ab.nextFloat() * 3.1415927F * 2.0F;\n float f1 = this.ab.nextFloat() * 0.5F + 0.5F;\n float f2 = MathHelper.a(f0) * (float) i0 * 0.5F * f1;\n float f3 = MathHelper.b(f0) * (float) i0 * 0.5F * f1;\n \n- this.q.a(this.bF(), this.u + (double) f2, this.E.b, this.w + (double) f3, 0.0D, 0.0D, 0.0D);\n+ this.q.a(this.bJ(), this.u + (double) f2, this.E.b, this.w + (double) f3, 0.0D, 0.0D, 0.0D);\n }\n \n- if (this.bM()) {\n- this.a(this.bL(), this.aW(), ((this.ab.nextFloat() - this.ab.nextFloat()) * 0.2F + 1.0F) / 0.8F);\n+ if (this.bQ()) {\n+ this.a(this.bP(), this.aZ(), ((this.ab.nextFloat() - this.ab.nextFloat()) * 0.2F + 1.0F) / 0.8F);\n }\n \n this.h = -0.5F;\n } else if (!this.F && flag0) {\n this.h = 1.0F;\n }\n \n- this.bI();\n+ this.bM();\n if (this.q.I) {\n- i0 = this.bN();\n+ i0 = this.bR();\n this.a(0.6F * (float) i0, 0.6F * (float) i0);\n }\n }\n \n- protected void bh() {\n- this.bk();\n+ protected void bk() {\n+ this.bo();\n EntityPlayer entityplayer = this.q.b(this, 16.0D);\n \n if (entityplayer != null) {\n this.a(entityplayer, 10.0F, 20.0F);\n }\n \n if (this.F && this.bn-- <= 0) {\n- this.bn = this.bH();\n+ this.bn = this.bL();\n if (entityplayer != null) {\n this.bn /= 3;\n }\n \n this.bd = true;\n- if (this.bO()) {\n- this.a(this.bL(), this.aW(), ((this.ab.nextFloat() - this.ab.nextFloat()) * 0.2F + 1.0F) * 0.8F);\n+ if (this.bS()) {\n+ this.a(this.bP(), this.aZ(), ((this.ab.nextFloat() - this.ab.nextFloat()) * 0.2F + 1.0F) * 0.8F);\n }\n \n this.be = 1.0F - this.ab.nextFloat() * 2.0F;\n- this.bf = (float) (1 * this.bN());\n+ this.bf = (float) (1 * this.bR());\n } else {\n this.bd = false;\n if (this.F) {\n@@ -124,28 +124,28 @@ protected void bh() {\n }\n }\n \n- protected void bI() {\n+ protected void bM() {\n this.h *= 0.6F;\n }\n \n- protected int bH() {\n+ protected int bL() {\n return this.ab.nextInt(20) + 10;\n }\n \n- protected EntitySlime bG() {\n+ protected EntitySlime bK() {\n return new EntitySlime(this.q);\n }\n \n public void w() {\n- int i0 = this.bN();\n+ int i0 = this.bR();\n \n- if (!this.q.I && i0 > 1 && this.aJ() <= 0.0F) {\n+ if (!this.q.I && i0 > 1 && this.aM() <= 0.0F) {\n int i1 = 2 + this.ab.nextInt(3);\n \n for (int i2 = 0; i2 < i1; ++i2) {\n float f0 = ((float) (i2 % 2) - 0.5F) * (float) i0 / 4.0F;\n float f1 = ((float) (i2 / 2) - 0.5F) * (float) i0 / 4.0F;\n- EntitySlime entityslime = this.bG();\n+ EntitySlime entityslime = this.bK();\n \n entityslime.a(i0 / 2);\n entityslime.b(this.u + (double) f0, this.v + 0.5D, this.w + (double) f1, this.ab.nextFloat() * 360.0F, 0.0F);\n@@ -157,70 +157,70 @@ public void w() {\n }\n \n public void b_(EntityPlayer entityplayer) {\n- if (this.bJ()) {\n- int i0 = this.bN();\n+ if (this.bN()) {\n+ int i0 = this.bR();\n \n- if (this.o(entityplayer) && this.e(entityplayer) < 0.6D * (double) i0 * 0.6D * (double) i0 && entityplayer.a(DamageSource.a((EntityLivingBase) this), (float) this.bK())) {\n+ if (this.o(entityplayer) && this.e(entityplayer) < 0.6D * (double) i0 * 0.6D * (double) i0 && entityplayer.a(DamageSource.a((EntityLivingBase) this), (float) this.bO())) {\n this.a(\"mob.attack\", 1.0F, (this.ab.nextFloat() - this.ab.nextFloat()) * 0.2F + 1.0F);\n }\n }\n }\n \n- protected boolean bJ() {\n- return this.bN() > 1;\n+ protected boolean bN() {\n+ return this.bR() > 1;\n }\n \n- protected int bK() {\n- return this.bN();\n+ protected int bO() {\n+ return this.bR();\n }\n \n- protected String aK() {\n- return \"mob.slime.\" + (this.bN() > 1 ? \"big\" : \"small\");\n+ protected String aN() {\n+ return \"mob.slime.\" + (this.bR() > 1 ? \"big\" : \"small\");\n }\n \n- protected String aL() {\n- return \"mob.slime.\" + (this.bN() > 1 ? \"big\" : \"small\");\n+ protected String aO() {\n+ return \"mob.slime.\" + (this.bR() > 1 ? \"big\" : \"small\");\n }\n \n protected int s() {\n- return this.bN() == 1 ? Item.aO.cv : 0;\n+ return this.bR() == 1 ? Item.aO.cv : 0;\n }\n \n- public boolean bo() {\n+ public boolean bs() {\n Chunk chunk = this.q.d(MathHelper.c(this.u), MathHelper.c(this.w));\n \n if (this.q.N().u() == WorldType.c && this.ab.nextInt(4) != 1) {\n return false;\n } else {\n- if (this.bN() == 1 || this.q.r > 0) {\n+ if (this.bR() == 1 || this.q.r > 0) {\n BiomeGenBase biomegenbase = this.q.a(MathHelper.c(this.u), MathHelper.c(this.w));\n \n if (biomegenbase == BiomeGenBase.h && this.v > 50.0D && this.v < 70.0D && this.ab.nextFloat() < 0.5F && this.ab.nextFloat() < this.q.x() && this.q.n(MathHelper.c(this.u), MathHelper.c(this.v), MathHelper.c(this.w)) <= this.ab.nextInt(8)) {\n- return super.bo();\n+ return super.bs();\n }\n \n if (this.ab.nextInt(10) == 0 && chunk.a(987234911L).nextInt(10) == 0 && this.v < 40.0D) {\n- return super.bo();\n+ return super.bs();\n }\n }\n \n return false;\n }\n }\n \n- protected float aW() {\n- return 0.4F * (float) this.bN();\n+ protected float aZ() {\n+ return 0.4F * (float) this.bR();\n }\n \n- public int bl() {\n+ public int bp() {\n return 0;\n }\n \n- protected boolean bO() {\n- return this.bN() > 0;\n+ protected boolean bS() {\n+ return this.bR() > 0;\n }\n \n- protected boolean bM() {\n- return this.bN() > 2;\n+ protected boolean bQ() {\n+ return this.bR() > 2;\n }\n }", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntitySlime.java", "sha": "d553c4c5a9e2effd031d5c0b11c74491c5316ed6", "status": "modified" }, { "additions": 5, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntitySnowman.java", "changes": 12, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntitySnowman.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 7, "filename": "src/main/java/net/minecraft/server/EntitySnowman.java", "new_code": " }\n public boolean be() {\n protected void ay() {\n super.ay();\n this.a(\"random.bow\", 1.0F, 1.0F / (this.aC().nextFloat() * 0.4F + 0.8F));", "new_methods": [], "old_code": "\n\n}\n public boolean bb() {\n protected void ax() {\n super.ax();\n this.a(\"random.bow\", 1.0F, 1.0F / (this.aB().nextFloat() * 0.4F + 0.8F));", "old_methods": [], "patch": "@@ -1,9 +1,7 @@\n package net.minecraft.server;\n \n-\n import net.canarymod.api.entity.living.CanarySnowman;\n \n-\n public class EntitySnowman extends EntityGolem implements IRangedAttackMob {\n \n public EntitySnowman(World world) {\n@@ -16,14 +14,14 @@ public EntitySnowman(World world) {\n this.c.a(4, new EntityAILookIdle(this));\n this.d.a(1, new EntityAINearestAttackableTarget(this, EntityLiving.class, 0, true, false, IMob.a));\n this.entity = new CanarySnowman(this); // CanaryMod: Wrap Entity\n-}\n+ }\n \n- public boolean bb() {\n+ public boolean be() {\n return true;\n }\n \n- protected void ax() {\n- super.ax();\n+ protected void ay() {\n+ super.ay();\n this.a(SharedMonsterAttributes.a).a(4.0D);\n this.a(SharedMonsterAttributes.d).a(0.20000000298023224D);\n }\n@@ -72,7 +70,7 @@ public void a(EntityLivingBase entitylivingbase, float f0) {\n float f1 = MathHelper.a(d0 * d0 + d2 * d2) * 0.2F;\n \n entitysnowball.c(d0, d1 + (double) f1, d2, 1.6F, 12.0F);\n- this.a(\"random.bow\", 1.0F, 1.0F / (this.aB().nextFloat() * 0.4F + 0.8F));\n+ this.a(\"random.bow\", 1.0F, 1.0F / (this.aC().nextFloat() * 0.4F + 0.8F));\n this.q.d((Entity) entitysnowball);\n }\n }", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntitySnowman.java", "sha": "fb3be51dcf56fcf1dbf82e5062fcf55a5e531784", "status": "modified" }, { "additions": 12, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntitySpider.java", "changes": 26, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntitySpider.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 14, "filename": "src/main/java/net/minecraft/server/EntitySpider.java", "new_code": " protected void ay() {\n super.ay();\n protected Entity bL() {\n protected String aN() {\n protected String aO() {\n return this.bT();\n public void al() {}\n public EnumCreatureAttribute aX() {\n public boolean d(PotionEffect potioneffect) {\n return potioneffect.a() == Potion.u.H ? false : super.d(potioneffect);\n public boolean bT() {\n this.c(new PotionEffect(i0, Integer.MAX_VALUE));", "new_methods": [ { "arguments": [], "filename": "src/main/java/net/minecraft/server/EntitySpider.java", "implementation": "super.ay();\n protected Entity bL() {\n protected String aN() {\n protected String aO() {\n return this.bT();\n public void al() {", "signature": "void ay()" } ], "old_code": "\n\n protected void ax() {\n super.ax();\n protected Entity bH() {\n protected String aK() {\n protected String aL() {\n return this.bP();\n public void ak() {}\n public EnumCreatureAttribute aU() {\n public boolean e(PotionEffect potioneffect) {\n return potioneffect.a() == Potion.u.H ? false : super.e(potioneffect);\n public boolean bP() {\n this.d(new PotionEffect(i0, Integer.MAX_VALUE));", "old_methods": [ { "arguments": [], "filename": "src/main/java/net/minecraft/server/EntitySpider.java", "implementation": "super.ax();\n protected Entity bH() {\n protected String aK() {\n protected String aL() {\n return this.bP();\n public void ak() {", "signature": "void ax()" } ], "patch": "@@ -1,9 +1,7 @@\n package net.minecraft.server;\n \n-\n import net.canarymod.api.entity.living.monster.CanarySpider;\n \n-\n public class EntitySpider extends EntityMob {\n \n public EntitySpider(World world) {\n@@ -24,13 +22,13 @@ public void l_() {\n }\n }\n \n- protected void ax() {\n- super.ax();\n+ protected void ay() {\n+ super.ay();\n this.a(SharedMonsterAttributes.a).a(16.0D);\n this.a(SharedMonsterAttributes.d).a(0.800000011920929D);\n }\n \n- protected Entity bH() {\n+ protected Entity bL() {\n float f0 = this.d(1.0F);\n \n if (f0 < 0.5F) {\n@@ -46,11 +44,11 @@ protected String r() {\n return \"mob.spider.say\";\n }\n \n- protected String aK() {\n+ protected String aN() {\n return \"mob.spider.say\";\n }\n \n- protected String aL() {\n+ protected String aO() {\n return \"mob.spider.death\";\n }\n \n@@ -92,20 +90,20 @@ protected void b(boolean flag0, int i0) {\n }\n \n public boolean e() {\n- return this.bP();\n+ return this.bT();\n }\n \n- public void ak() {}\n+ public void al() {}\n \n- public EnumCreatureAttribute aU() {\n+ public EnumCreatureAttribute aX() {\n return EnumCreatureAttribute.c;\n }\n \n- public boolean e(PotionEffect potioneffect) {\n- return potioneffect.a() == Potion.u.H ? false : super.e(potioneffect);\n+ public boolean d(PotionEffect potioneffect) {\n+ return potioneffect.a() == Potion.u.H ? false : super.d(potioneffect);\n }\n \n- public boolean bP() {\n+ public boolean bT() {\n return (this.ah.a(16) & 1) != 0;\n }\n \n@@ -144,7 +142,7 @@ public EntityLivingData a(EntityLivingData entitylivingdata) {\n int i0 = ((SpiderEffectsGroupData) object).a;\n \n if (i0 > 0 && Potion.a[i0] != null) {\n- this.d(new PotionEffect(i0, Integer.MAX_VALUE));\n+ this.c(new PotionEffect(i0, Integer.MAX_VALUE));\n }\n }\n ", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntitySpider.java", "sha": "2f37a380b255d5a06ad162a2f8db7536674ff333", "status": "modified" }, { "additions": 9, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntitySquid.java", "changes": 20, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntitySquid.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 11, "filename": "src/main/java/net/minecraft/server/EntitySquid.java", "new_code": " protected void ay() {\n super.ay();\n protected String aN() {\n protected String aO() {\n protected float aZ() {\n protected void bk() {\n this.bo();\n public boolean bs() {\n return this.v > 45.0D && this.v < 63.0D && super.bs();", "new_methods": [], "old_code": "\n\n protected void ax() {\n super.ax();\n protected String aK() {\n protected String aL() {\n protected float aW() {\n protected void bh() {\n this.bk();\n public boolean bo() {\n return this.v > 45.0D && this.v < 63.0D && super.bo();", "old_methods": [], "patch": "@@ -1,9 +1,7 @@\n package net.minecraft.server;\n \n-\n import net.canarymod.api.entity.living.animal.CanarySquid;\n \n-\n public class EntitySquid extends EntityWaterMob {\n \n public float bp;\n@@ -28,24 +26,24 @@ public EntitySquid(World world) {\n this.entity = new CanarySquid(this); // CanaryMod: Wrap Entity\n }\n \n- protected void ax() {\n- super.ax();\n+ protected void ay() {\n+ super.ay();\n this.a(SharedMonsterAttributes.a).a(10.0D);\n }\n \n protected String r() {\n return null;\n }\n \n- protected String aK() {\n+ protected String aN() {\n return null;\n }\n \n- protected String aL() {\n+ protected String aO() {\n return null;\n }\n \n- protected float aW() {\n+ protected float aZ() {\n return 0.4F;\n }\n \n@@ -129,7 +127,7 @@ public void e(float f0, float f1) {\n this.d(this.x, this.y, this.z);\n }\n \n- protected void bh() {\n+ protected void bk() {\n ++this.aV;\n if (this.aV > 100) {\n this.bA = this.bB = this.bC = 0.0F;\n@@ -141,10 +139,10 @@ protected void bh() {\n this.bC = MathHelper.a(f0) * 0.2F;\n }\n \n- this.bk();\n+ this.bo();\n }\n \n- public boolean bo() {\n- return this.v > 45.0D && this.v < 63.0D && super.bo();\n+ public boolean bs() {\n+ return this.v > 45.0D && this.v < 63.0D && super.bs();\n }\n }", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntitySquid.java", "sha": "13680d0889dff5608c43535b0a65592dd5adbe1f", "status": "modified" }, { "additions": 2, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityThrowable.java", "changes": 6, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityThrowable.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 4, "filename": "src/main/java/net/minecraft/server/EntityThrowable.java", "new_code": " this.aa();\n this.h = this.g.am();", "new_methods": [], "old_code": "\n\n this.Z();\n this.h = this.g.al();", "old_methods": [], "patch": "@@ -1,9 +1,7 @@\n package net.minecraft.server;\n \n-\n import java.util.List;\n \n-\n public abstract class EntityThrowable extends Entity implements IProjectile {\n \n private int c = -1;\n@@ -155,7 +153,7 @@ public void l_() {\n \n if (movingobjectposition != null) {\n if (movingobjectposition.a == EnumMovingObjectType.a && this.q.a(movingobjectposition.b, movingobjectposition.c, movingobjectposition.d) == Block.bj.cF) {\n- this.Z();\n+ this.aa();\n } else {\n this.a(movingobjectposition);\n }\n@@ -220,7 +218,7 @@ public void b(NBTTagCompound nbttagcompound) {\n nbttagcompound.a(\"shake\", (byte) this.b);\n nbttagcompound.a(\"inGround\", (byte) (this.a ? 1 : 0));\n if ((this.h == null || this.h.length() == 0) && this.g != null && this.g instanceof EntityPlayer) {\n- this.h = this.g.al();\n+ this.h = this.g.am();\n }\n \n nbttagcompound.a(\"ownerName\", this.h == null ? \"\" : this.h);", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityThrowable.java", "sha": "197cc324be2ede2612e9db152eff89b7a77605f1", "status": "modified" }, { "additions": 10, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityTrackerEntry.java", "changes": 20, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityTrackerEntry.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 10, "filename": "src/main/java/net/minecraft/server/EntityTrackerEntry.java", "new_code": " this.i = MathHelper.d(entity.ao() * 256.0F / 360.0F);\n if (i09.a.f() <= 5) {\n i0 = MathHelper.d(this.a.ao() * 256.0F / 360.0F);\n ServersideAttributeMap serversideattributemap = (ServersideAttributeMap) ((EntityLivingBase) this.a).aW();\n ServersideAttributeMap serversideattributemap = (ServersideAttributeMap) ((EntityLivingBase) this.a).aW();\n if (this.a instanceof EntityLiving && ((EntityLiving) this.a).bI() != null) {\n entityplayermp.a.b(new Packet39AttachEntity(1, this.a, ((EntityLiving) this.a).bI()));\n if (entityplayer.bg()) {\n Iterator iterator = entitylivingbase.aK().iterator();\n this.i = MathHelper.d(this.a.ao() * 256.0F / 360.0F);", "new_methods": [], "old_code": " this.i = MathHelper.d(entity.an() * 256.0F / 360.0F);\n if (i09.a.e() <= 5) {\n i0 = MathHelper.d(this.a.an() * 256.0F / 360.0F);\n ServersideAttributeMap serversideattributemap = (ServersideAttributeMap) ((EntityLivingBase) this.a).aT();\n ServersideAttributeMap serversideattributemap = (ServersideAttributeMap) ((EntityLivingBase) this.a).aT();\n if (this.a instanceof EntityLiving && ((EntityLiving) this.a).bE() != null) {\n entityplayermp.a.b(new Packet39AttachEntity(1, this.a, ((EntityLiving) this.a).bE()));\n if (entityplayer.bd()) {\n Iterator iterator = entitylivingbase.aH().iterator();\n this.i = MathHelper.d(this.a.an() * 256.0F / 360.0F);", "old_methods": [], "patch": "@@ -46,7 +46,7 @@ public EntityTrackerEntry(Entity entity, int i0, int i1, boolean flag0) {\n this.f = MathHelper.c(entity.w * 32.0D);\n this.g = MathHelper.d(entity.A * 256.0F / 360.0F);\n this.h = MathHelper.d(entity.B * 256.0F / 360.0F);\n- this.i = MathHelper.d(entity.an() * 256.0F / 360.0F);\n+ this.i = MathHelper.d(entity.ao() * 256.0F / 360.0F);\n \n canaryEntry = new CanaryEntityTrackerEntry(this);\n }\n@@ -88,7 +88,7 @@ public void a(List list) {\n EntityPlayerMP i09 = (EntityPlayerMP) i08;\n \n i06.a(i09, i04);\n- if (i09.a.e() <= 5) {\n+ if (i09.a.f() <= 5) {\n Packet i10 = Item.bf.c(i04, this.a.q, i09);\n \n if (i10 != null) {\n@@ -182,7 +182,7 @@ public void a(List list) {\n this.w = true;\n }\n \n- i0 = MathHelper.d(this.a.an() * 256.0F / 360.0F);\n+ i0 = MathHelper.d(this.a.ao() * 256.0F / 360.0F);\n if (Math.abs(i0 - this.i) >= 4) {\n this.a((Packet) (new Packet35EntityHeadRotation(this.a.k, (byte) i0)));\n this.i = i0;\n@@ -206,7 +206,7 @@ private void b() {\n }\n \n if (this.a instanceof EntityLivingBase) {\n- ServersideAttributeMap serversideattributemap = (ServersideAttributeMap) ((EntityLivingBase) this.a).aT();\n+ ServersideAttributeMap serversideattributemap = (ServersideAttributeMap) ((EntityLivingBase) this.a).aW();\n Set set = serversideattributemap.b();\n \n if (!set.isEmpty()) {\n@@ -267,7 +267,7 @@ public void b(EntityPlayerMP entityplayermp) {\n }\n \n if (this.a instanceof EntityLivingBase) {\n- ServersideAttributeMap serversideattributemap = (ServersideAttributeMap) ((EntityLivingBase) this.a).aT();\n+ ServersideAttributeMap serversideattributemap = (ServersideAttributeMap) ((EntityLivingBase) this.a).aW();\n Collection collection = serversideattributemap.c();\n \n if (!collection.isEmpty()) {\n@@ -286,8 +286,8 @@ public void b(EntityPlayerMP entityplayermp) {\n entityplayermp.a.b(new Packet39AttachEntity(0, this.a, this.a.o));\n }\n \n- if (this.a instanceof EntityLiving && ((EntityLiving) this.a).bE() != null) {\n- entityplayermp.a.b(new Packet39AttachEntity(1, this.a, ((EntityLiving) this.a).bE()));\n+ if (this.a instanceof EntityLiving && ((EntityLiving) this.a).bI() != null) {\n+ entityplayermp.a.b(new Packet39AttachEntity(1, this.a, ((EntityLiving) this.a).bI()));\n }\n \n if (this.a instanceof EntityLivingBase) {\n@@ -303,14 +303,14 @@ public void b(EntityPlayerMP entityplayermp) {\n if (this.a instanceof EntityPlayer) {\n EntityPlayer entityplayer = (EntityPlayer) this.a;\n \n- if (entityplayer.bd()) {\n+ if (entityplayer.bg()) {\n entityplayermp.a.b(new Packet17Sleep(this.a, 0, MathHelper.c(this.a.u), MathHelper.c(this.a.v), MathHelper.c(this.a.w)));\n }\n }\n \n if (this.a instanceof EntityLivingBase) {\n EntityLivingBase entitylivingbase = (EntityLivingBase) this.a;\n- Iterator iterator = entitylivingbase.aH().iterator();\n+ Iterator iterator = entitylivingbase.aK().iterator();\n \n while (iterator.hasNext()) {\n PotionEffect potioneffect = (PotionEffect) iterator.next();\n@@ -434,7 +434,7 @@ private Packet c() {\n }\n }\n } else {\n- this.i = MathHelper.d(this.a.an() * 256.0F / 360.0F);\n+ this.i = MathHelper.d(this.a.ao() * 256.0F / 360.0F);\n return new Packet24MobSpawn((EntityLivingBase) this.a);\n }\n }", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityTrackerEntry.java", "sha": "0c0bb94c3b64d48524f1e0a85059e3aa13287556", "status": "modified" }, { "additions": 91, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityVillager.java", "changes": 182, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityVillager.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 91, "filename": "src/main/java/net/minecraft/server/EntityVillager.java", "new_code": " this.c.a(5, new EntityAIMoveTowardsRestriction(this, 0.6D));\n protected void ay() {\n super.ay();\n public boolean be() {\n protected void bj() {\n this.bR();\n if (!this.bW() && this.bv > 0) {\n this.c(new PotionEffect(Potion.l.H, 200, 0));\n super.bj();\n if (!flag0 && this.S() && !this.bW() && !this.g_()) {\n entityplayer.a((IMerchant) this, this.bA());\n nbttagcompound.a(\"Profession\", this.bT());\n return this.bW() ? \"mob.villager.haggle\" : \"mob.villager.idle\";\n protected String aN() {\n protected String aO() {\n public int bT() {\n public boolean bU() {\n public void i(boolean flag0) {\n public void j(boolean flag0) {\n public boolean bV() {\n if (this.S()) {\n public boolean bW() {\n this.a(\"mob.villager.yes\", this.aZ(), this.ba());\n this.a(\"mob.villager.yes\", this.aZ(), this.ba());\n this.a(\"mob.villager.no\", this.aZ(), this.ba());\n private float p(float f0) {\n label50: switch (this.bT()) {\n a(merchantrecipelist, Item.V.cv, this.ab, this.p(0.9F));\n a(merchantrecipelist, Block.ag.cF, this.ab, this.p(0.5F));\n a(merchantrecipelist, Item.bm.cv, this.ab, this.p(0.5F));\n a(merchantrecipelist, Item.aX.cv, this.ab, this.p(0.4F));\n b(merchantrecipelist, Item.W.cv, this.ab, this.p(0.9F));\n b(merchantrecipelist, Item.bh.cv, this.ab, this.p(0.3F));\n b(merchantrecipelist, Item.l.cv, this.ab, this.p(0.3F));\n b(merchantrecipelist, Item.be.cv, this.ab, this.p(0.3F));\n b(merchantrecipelist, Item.bg.cv, this.ab, this.p(0.3F));\n b(merchantrecipelist, Item.k.cv, this.ab, this.p(0.3F));\n b(merchantrecipelist, Item.bn.cv, this.ab, this.p(0.3F));\n b(merchantrecipelist, Item.n.cv, this.ab, this.p(0.5F));\n if (this.ab.nextFloat() < this.p(0.5F)) {\n a(merchantrecipelist, Item.aM.cv, this.ab, this.p(0.8F));\n a(merchantrecipelist, Item.aN.cv, this.ab, this.p(0.8F));\n a(merchantrecipelist, Item.bI.cv, this.ab, this.p(0.3F));\n b(merchantrecipelist, Block.as.cF, this.ab, this.p(0.8F));\n b(merchantrecipelist, Block.R.cF, this.ab, this.p(0.2F));\n b(merchantrecipelist, Item.aS.cv, this.ab, this.p(0.2F));\n b(merchantrecipelist, Item.aU.cv, this.ab, this.p(0.2F));\n if (this.ab.nextFloat() < this.p(0.07F)) {\n b(merchantrecipelist, Item.bC.cv, this.ab, this.p(0.3F));\n b(merchantrecipelist, Item.bF.cv, this.ab, this.p(0.2F));\n b(merchantrecipelist, Item.aE.cv, this.ab, this.p(0.4F));\n b(merchantrecipelist, Block.bi.cF, this.ab, this.p(0.3F));\n if (this.ab.nextFloat() < this.p(0.05F)) {\n a(merchantrecipelist, Item.o.cv, this.ab, this.p(0.7F));\n a(merchantrecipelist, Item.q.cv, this.ab, this.p(0.5F));\n a(merchantrecipelist, Item.r.cv, this.ab, this.p(0.5F));\n a(merchantrecipelist, Item.p.cv, this.ab, this.p(0.5F));\n b(merchantrecipelist, Item.s.cv, this.ab, this.p(0.5F));\n b(merchantrecipelist, Item.B.cv, this.ab, this.p(0.5F));\n b(merchantrecipelist, Item.j.cv, this.ab, this.p(0.3F));\n b(merchantrecipelist, Item.E.cv, this.ab, this.p(0.3F));\n b(merchantrecipelist, Item.i.cv, this.ab, this.p(0.5F));\n b(merchantrecipelist, Item.D.cv, this.ab, this.p(0.5F));\n b(merchantrecipelist, Item.h.cv, this.ab, this.p(0.2F));\n b(merchantrecipelist, Item.C.cv, this.ab, this.p(0.2F));\n b(merchantrecipelist, Item.R.cv, this.ab, this.p(0.2F));\n b(merchantrecipelist, Item.S.cv, this.ab, this.p(0.2F));\n b(merchantrecipelist, Item.ai.cv, this.ab, this.p(0.2F));\n b(merchantrecipelist, Item.am.cv, this.ab, this.p(0.2F));\n b(merchantrecipelist, Item.af.cv, this.ab, this.p(0.2F));\n b(merchantrecipelist, Item.aj.cv, this.ab, this.p(0.2F));\n b(merchantrecipelist, Item.ag.cv, this.ab, this.p(0.2F));\n b(merchantrecipelist, Item.ak.cv, this.ab, this.p(0.2F));\n b(merchantrecipelist, Item.ah.cv, this.ab, this.p(0.2F));\n b(merchantrecipelist, Item.al.cv, this.ab, this.p(0.2F));\n b(merchantrecipelist, Item.ae.cv, this.ab, this.p(0.1F));\n b(merchantrecipelist, Item.ab.cv, this.ab, this.p(0.1F));\n b(merchantrecipelist, Item.ac.cv, this.ab, this.p(0.1F));\n b(merchantrecipelist, Item.ad.cv, this.ab, this.p(0.1F));\n a(merchantrecipelist, Item.o.cv, this.ab, this.p(0.7F));\n a(merchantrecipelist, Item.as.cv, this.ab, this.p(0.5F));\n a(merchantrecipelist, Item.bk.cv, this.ab, this.p(0.5F));\n b(merchantrecipelist, Item.aC.cv, this.ab, this.p(0.1F));\n b(merchantrecipelist, Item.Y.cv, this.ab, this.p(0.3F));\n b(merchantrecipelist, Item.aa.cv, this.ab, this.p(0.3F));\n b(merchantrecipelist, Item.X.cv, this.ab, this.p(0.3F));\n b(merchantrecipelist, Item.Z.cv, this.ab, this.p(0.3F));\n b(merchantrecipelist, Item.at.cv, this.ab, this.p(0.3F));\n b(merchantrecipelist, Item.bl.cv, this.ab, this.p(0.3F));\n public void bX() {\n public boolean bG() {", "new_methods": [], "old_code": " this.c.a(5, new EntityAIMoveTwardsRestriction(this, 0.6D));\n protected void ax() {\n super.ax();\n public boolean bb() {\n protected void bg() {\n this.bN();\n if (!this.bS() && this.bv > 0) {\n this.d(new PotionEffect(Potion.l.H, 200, 0));\n super.bg();\n if (!flag0 && this.R() && !this.bS() && !this.g_()) {\n entityplayer.a((IMerchant) this, this.bw());\n nbttagcompound.a(\"Profession\", this.bP());\n return this.bS() ? \"mob.villager.haggle\" : \"mob.villager.idle\";\n protected String aK() {\n protected String aL() {\n public int bP() {\n public boolean bQ() {\n public void j(boolean flag0) {\n public void k(boolean flag0) {\n public boolean bR() {\n if (this.R()) {\n public boolean bS() {\n this.a(\"mob.villager.yes\", this.aW(), this.aX());\n this.a(\"mob.villager.yes\", this.aW(), this.aX());\n this.a(\"mob.villager.no\", this.aW(), this.aX());\n private float o(float f0) {\n label50: switch (this.bP()) {\n a(merchantrecipelist, Item.V.cv, this.ab, this.o(0.9F));\n a(merchantrecipelist, Block.ag.cF, this.ab, this.o(0.5F));\n a(merchantrecipelist, Item.bm.cv, this.ab, this.o(0.5F));\n a(merchantrecipelist, Item.aX.cv, this.ab, this.o(0.4F));\n b(merchantrecipelist, Item.W.cv, this.ab, this.o(0.9F));\n b(merchantrecipelist, Item.bh.cv, this.ab, this.o(0.3F));\n b(merchantrecipelist, Item.l.cv, this.ab, this.o(0.3F));\n b(merchantrecipelist, Item.be.cv, this.ab, this.o(0.3F));\n b(merchantrecipelist, Item.bg.cv, this.ab, this.o(0.3F));\n b(merchantrecipelist, Item.k.cv, this.ab, this.o(0.3F));\n b(merchantrecipelist, Item.bn.cv, this.ab, this.o(0.3F));\n b(merchantrecipelist, Item.n.cv, this.ab, this.o(0.5F));\n if (this.ab.nextFloat() < this.o(0.5F)) {\n a(merchantrecipelist, Item.aM.cv, this.ab, this.o(0.8F));\n a(merchantrecipelist, Item.aN.cv, this.ab, this.o(0.8F));\n a(merchantrecipelist, Item.bI.cv, this.ab, this.o(0.3F));\n b(merchantrecipelist, Block.as.cF, this.ab, this.o(0.8F));\n b(merchantrecipelist, Block.R.cF, this.ab, this.o(0.2F));\n b(merchantrecipelist, Item.aS.cv, this.ab, this.o(0.2F));\n b(merchantrecipelist, Item.aU.cv, this.ab, this.o(0.2F));\n if (this.ab.nextFloat() < this.o(0.07F)) {\n b(merchantrecipelist, Item.bC.cv, this.ab, this.o(0.3F));\n b(merchantrecipelist, Item.bF.cv, this.ab, this.o(0.2F));\n b(merchantrecipelist, Item.aE.cv, this.ab, this.o(0.4F));\n b(merchantrecipelist, Block.bi.cF, this.ab, this.o(0.3F));\n if (this.ab.nextFloat() < this.o(0.05F)) {\n a(merchantrecipelist, Item.o.cv, this.ab, this.o(0.7F));\n a(merchantrecipelist, Item.q.cv, this.ab, this.o(0.5F));\n a(merchantrecipelist, Item.r.cv, this.ab, this.o(0.5F));\n a(merchantrecipelist, Item.p.cv, this.ab, this.o(0.5F));\n b(merchantrecipelist, Item.s.cv, this.ab, this.o(0.5F));\n b(merchantrecipelist, Item.B.cv, this.ab, this.o(0.5F));\n b(merchantrecipelist, Item.j.cv, this.ab, this.o(0.3F));\n b(merchantrecipelist, Item.E.cv, this.ab, this.o(0.3F));\n b(merchantrecipelist, Item.i.cv, this.ab, this.o(0.5F));\n b(merchantrecipelist, Item.D.cv, this.ab, this.o(0.5F));\n b(merchantrecipelist, Item.h.cv, this.ab, this.o(0.2F));\n b(merchantrecipelist, Item.C.cv, this.ab, this.o(0.2F));\n b(merchantrecipelist, Item.R.cv, this.ab, this.o(0.2F));\n b(merchantrecipelist, Item.S.cv, this.ab, this.o(0.2F));\n b(merchantrecipelist, Item.ai.cv, this.ab, this.o(0.2F));\n b(merchantrecipelist, Item.am.cv, this.ab, this.o(0.2F));\n b(merchantrecipelist, Item.af.cv, this.ab, this.o(0.2F));\n b(merchantrecipelist, Item.aj.cv, this.ab, this.o(0.2F));\n b(merchantrecipelist, Item.ag.cv, this.ab, this.o(0.2F));\n b(merchantrecipelist, Item.ak.cv, this.ab, this.o(0.2F));\n b(merchantrecipelist, Item.ah.cv, this.ab, this.o(0.2F));\n b(merchantrecipelist, Item.al.cv, this.ab, this.o(0.2F));\n b(merchantrecipelist, Item.ae.cv, this.ab, this.o(0.1F));\n b(merchantrecipelist, Item.ab.cv, this.ab, this.o(0.1F));\n b(merchantrecipelist, Item.ac.cv, this.ab, this.o(0.1F));\n b(merchantrecipelist, Item.ad.cv, this.ab, this.o(0.1F));\n a(merchantrecipelist, Item.o.cv, this.ab, this.o(0.7F));\n a(merchantrecipelist, Item.as.cv, this.ab, this.o(0.5F));\n a(merchantrecipelist, Item.bk.cv, this.ab, this.o(0.5F));\n b(merchantrecipelist, Item.aC.cv, this.ab, this.o(0.1F));\n b(merchantrecipelist, Item.Y.cv, this.ab, this.o(0.3F));\n b(merchantrecipelist, Item.aa.cv, this.ab, this.o(0.3F));\n b(merchantrecipelist, Item.X.cv, this.ab, this.o(0.3F));\n b(merchantrecipelist, Item.Z.cv, this.ab, this.o(0.3F));\n b(merchantrecipelist, Item.at.cv, this.ab, this.o(0.3F));\n b(merchantrecipelist, Item.bl.cv, this.ab, this.o(0.3F));\n public void bT() {\n public boolean bC() {", "old_methods": [], "patch": "@@ -44,7 +44,7 @@ public EntityVillager(World world, int i0) {\n this.c.a(2, new EntityAIMoveIndoors(this));\n this.c.a(3, new EntityAIRestrictOpenDoor(this));\n this.c.a(4, new EntityAIOpenDoor(this, true));\n- this.c.a(5, new EntityAIMoveTwardsRestriction(this, 0.6D));\n+ this.c.a(5, new EntityAIMoveTowardsRestriction(this, 0.6D));\n this.c.a(6, new EntityAIVillagerMate(this));\n this.c.a(7, new EntityAIFollowGolem(this));\n this.c.a(8, new EntityAIPlay(this, 0.32D));\n@@ -55,22 +55,22 @@ public EntityVillager(World world, int i0) {\n this.entity = new CanaryVillager(this); // CanaryMod: Wrap Entity\n }\n \n- protected void ax() {\n- super.ax();\n+ protected void ay() {\n+ super.ay();\n this.a(SharedMonsterAttributes.d).a(0.5D);\n }\n \n- public boolean bb() {\n+ public boolean be() {\n return true;\n }\n \n- protected void bg() {\n+ protected void bj() {\n if (--this.bq <= 0) {\n this.q.A.a(MathHelper.c(this.u), MathHelper.c(this.v), MathHelper.c(this.w));\n this.bq = 70 + this.ab.nextInt(50);\n this.bp = this.q.A.a(MathHelper.c(this.u), MathHelper.c(this.v), MathHelper.c(this.w), 32);\n if (this.bp == null) {\n- this.bN();\n+ this.bR();\n } else {\n ChunkCoordinates chunkcoordinates = this.bp.a();\n \n@@ -82,7 +82,7 @@ protected void bg() {\n }\n }\n \n- if (!this.bS() && this.bv > 0) {\n+ if (!this.bW() && this.bv > 0) {\n --this.bv;\n if (this.bv <= 0) {\n if (this.bw) {\n@@ -106,21 +106,21 @@ protected void bg() {\n }\n }\n \n- this.d(new PotionEffect(Potion.l.H, 200, 0));\n+ this.c(new PotionEffect(Potion.l.H, 200, 0));\n }\n }\n \n- super.bg();\n+ super.bj();\n }\n \n public boolean a(EntityPlayer entityplayer) {\n ItemStack itemstack = entityplayer.bn.h();\n boolean flag0 = itemstack != null && itemstack.d == Item.bE.cv;\n \n- if (!flag0 && this.R() && !this.bS() && !this.g_()) {\n+ if (!flag0 && this.S() && !this.bW() && !this.g_()) {\n if (!this.q.I) {\n this.a_(entityplayer);\n- entityplayer.a((IMerchant) this, this.bw());\n+ entityplayer.a((IMerchant) this, this.bA());\n }\n \n return true;\n@@ -136,7 +136,7 @@ protected void a() {\n \n public void b(NBTTagCompound nbttagcompound) {\n super.b(nbttagcompound);\n- nbttagcompound.a(\"Profession\", this.bP());\n+ nbttagcompound.a(\"Profession\", this.bT());\n nbttagcompound.a(\"Riches\", this.bx);\n if (this.bu != null) {\n nbttagcompound.a(\"Offers\", this.bu.a());\n@@ -159,38 +159,38 @@ protected boolean t() {\n }\n \n protected String r() {\n- return this.bS() ? \"mob.villager.haggle\" : \"mob.villager.idle\";\n+ return this.bW() ? \"mob.villager.haggle\" : \"mob.villager.idle\";\n }\n \n- protected String aK() {\n+ protected String aN() {\n return \"mob.villager.hit\";\n }\n \n- protected String aL() {\n+ protected String aO() {\n return \"mob.villager.death\";\n }\n \n public void p(int i0) {\n this.ah.b(16, Integer.valueOf(i0));\n }\n \n- public int bP() {\n+ public int bT() {\n return this.ah.c(16);\n }\n \n- public boolean bQ() {\n+ public boolean bU() {\n return this.br;\n }\n \n- public void j(boolean flag0) {\n+ public void i(boolean flag0) {\n this.br = flag0;\n }\n \n- public void k(boolean flag0) {\n+ public void j(boolean flag0) {\n this.bs = flag0;\n }\n \n- public boolean bR() {\n+ public boolean bV() {\n return this.bs;\n }\n \n@@ -206,7 +206,7 @@ public void b(EntityLivingBase entitylivingbase) {\n }\n \n this.bp.a(((EntityPlayer) entitylivingbase).c_(), b0);\n- if (this.R()) {\n+ if (this.S()) {\n this.q.a((Entity) this, (byte) 13);\n }\n }\n@@ -243,14 +243,14 @@ public EntityPlayer m_() {\n return this.bt;\n }\n \n- public boolean bS() {\n+ public boolean bW() {\n return this.bt != null;\n }\n \n public void a(MerchantRecipe merchantrecipe) {\n merchantrecipe.f();\n this.a_ = -this.o();\n- this.a(\"mob.villager.yes\", this.aW(), this.aX());\n+ this.a(\"mob.villager.yes\", this.aZ(), this.ba());\n if (merchantrecipe.a((MerchantRecipe) this.bu.get(this.bu.size() - 1))) {\n this.bv = 40;\n this.bw = true;\n@@ -270,9 +270,9 @@ public void a_(ItemStack itemstack) {\n if (!this.q.I && this.a_ > -this.o() + 20) {\n this.a_ = -this.o();\n if (itemstack != null) {\n- this.a(\"mob.villager.yes\", this.aW(), this.aX());\n+ this.a(\"mob.villager.yes\", this.aZ(), this.ba());\n } else {\n- this.a(\"mob.villager.no\", this.aW(), this.aX());\n+ this.a(\"mob.villager.no\", this.aZ(), this.ba());\n }\n }\n }\n@@ -285,7 +285,7 @@ public MerchantRecipeList b(EntityPlayer entityplayer) {\n return this.bu;\n }\n \n- private float o(float f0) {\n+ private float p(float f0) {\n float f1 = f0 + this.bA;\n \n return f1 > 0.9F ? 0.9F - (f1 - 0.9F) : f1;\n@@ -303,34 +303,34 @@ private void q(int i0) {\n merchantrecipelist = new MerchantRecipeList();\n int i1;\n \n- label50: switch (this.bP()) {\n+ label50: switch (this.bT()) {\n case 0:\n- a(merchantrecipelist, Item.V.cv, this.ab, this.o(0.9F));\n- a(merchantrecipelist, Block.ag.cF, this.ab, this.o(0.5F));\n- a(merchantrecipelist, Item.bm.cv, this.ab, this.o(0.5F));\n- a(merchantrecipelist, Item.aX.cv, this.ab, this.o(0.4F));\n- b(merchantrecipelist, Item.W.cv, this.ab, this.o(0.9F));\n- b(merchantrecipelist, Item.bh.cv, this.ab, this.o(0.3F));\n- b(merchantrecipelist, Item.l.cv, this.ab, this.o(0.3F));\n- b(merchantrecipelist, Item.be.cv, this.ab, this.o(0.3F));\n- b(merchantrecipelist, Item.bg.cv, this.ab, this.o(0.3F));\n- b(merchantrecipelist, Item.k.cv, this.ab, this.o(0.3F));\n- b(merchantrecipelist, Item.bn.cv, this.ab, this.o(0.3F));\n- b(merchantrecipelist, Item.n.cv, this.ab, this.o(0.5F));\n- if (this.ab.nextFloat() < this.o(0.5F)) {\n+ a(merchantrecipelist, Item.V.cv, this.ab, this.p(0.9F));\n+ a(merchantrecipelist, Block.ag.cF, this.ab, this.p(0.5F));\n+ a(merchantrecipelist, Item.bm.cv, this.ab, this.p(0.5F));\n+ a(merchantrecipelist, Item.aX.cv, this.ab, this.p(0.4F));\n+ b(merchantrecipelist, Item.W.cv, this.ab, this.p(0.9F));\n+ b(merchantrecipelist, Item.bh.cv, this.ab, this.p(0.3F));\n+ b(merchantrecipelist, Item.l.cv, this.ab, this.p(0.3F));\n+ b(merchantrecipelist, Item.be.cv, this.ab, this.p(0.3F));\n+ b(merchantrecipelist, Item.bg.cv, this.ab, this.p(0.3F));\n+ b(merchantrecipelist, Item.k.cv, this.ab, this.p(0.3F));\n+ b(merchantrecipelist, Item.bn.cv, this.ab, this.p(0.3F));\n+ b(merchantrecipelist, Item.n.cv, this.ab, this.p(0.5F));\n+ if (this.ab.nextFloat() < this.p(0.5F)) {\n merchantrecipelist.add(new MerchantRecipe(new ItemStack(Block.K, 10), new ItemStack(Item.bJ), new ItemStack(Item.ar.cv, 4 + this.ab.nextInt(2), 0)));\n }\n break;\n \n case 1:\n- a(merchantrecipelist, Item.aM.cv, this.ab, this.o(0.8F));\n- a(merchantrecipelist, Item.aN.cv, this.ab, this.o(0.8F));\n- a(merchantrecipelist, Item.bI.cv, this.ab, this.o(0.3F));\n- b(merchantrecipelist, Block.as.cF, this.ab, this.o(0.8F));\n- b(merchantrecipelist, Block.R.cF, this.ab, this.o(0.2F));\n- b(merchantrecipelist, Item.aS.cv, this.ab, this.o(0.2F));\n- b(merchantrecipelist, Item.aU.cv, this.ab, this.o(0.2F));\n- if (this.ab.nextFloat() < this.o(0.07F)) {\n+ a(merchantrecipelist, Item.aM.cv, this.ab, this.p(0.8F));\n+ a(merchantrecipelist, Item.aN.cv, this.ab, this.p(0.8F));\n+ a(merchantrecipelist, Item.bI.cv, this.ab, this.p(0.3F));\n+ b(merchantrecipelist, Block.as.cF, this.ab, this.p(0.8F));\n+ b(merchantrecipelist, Block.R.cF, this.ab, this.p(0.2F));\n+ b(merchantrecipelist, Item.aS.cv, this.ab, this.p(0.2F));\n+ b(merchantrecipelist, Item.aU.cv, this.ab, this.p(0.2F));\n+ if (this.ab.nextFloat() < this.p(0.07F)) {\n Enchantment enchantment = Enchantment.c[this.ab.nextInt(Enchantment.c.length)];\n int i2 = MathHelper.a(this.ab, enchantment.d(), enchantment.b());\n ItemStack itemstack = Item.bY.a(new EnchantmentData(enchantment, i2));\n@@ -341,10 +341,10 @@ private void q(int i0) {\n break;\n \n case 2:\n- b(merchantrecipelist, Item.bC.cv, this.ab, this.o(0.3F));\n- b(merchantrecipelist, Item.bF.cv, this.ab, this.o(0.2F));\n- b(merchantrecipelist, Item.aE.cv, this.ab, this.o(0.4F));\n- b(merchantrecipelist, Block.bi.cF, this.ab, this.o(0.3F));\n+ b(merchantrecipelist, Item.bC.cv, this.ab, this.p(0.3F));\n+ b(merchantrecipelist, Item.bF.cv, this.ab, this.p(0.2F));\n+ b(merchantrecipelist, Item.aE.cv, this.ab, this.p(0.4F));\n+ b(merchantrecipelist, Block.bi.cF, this.ab, this.p(0.3F));\n int[] aint = new int[]{ Item.s.cv, Item.B.cv, Item.ag.cv, Item.ak.cv, Item.j.cv, Item.E.cv, Item.i.cv, Item.D.cv };\n int[] aint1 = aint;\n int i3 = aint.length;\n@@ -358,53 +358,53 @@ private void q(int i0) {\n \n int i4 = aint1[i1];\n \n- if (this.ab.nextFloat() < this.o(0.05F)) {\n+ if (this.ab.nextFloat() < this.p(0.05F)) {\n merchantrecipelist.add(new MerchantRecipe(new ItemStack(i4, 1, 0), new ItemStack(Item.bJ, 2 + this.ab.nextInt(3), 0), EnchantmentHelper.a(this.ab, new ItemStack(i4, 1, 0), 5 + this.ab.nextInt(15))));\n }\n \n ++i1;\n }\n \n case 3:\n- a(merchantrecipelist, Item.o.cv, this.ab, this.o(0.7F));\n- a(merchantrecipelist, Item.q.cv, this.ab, this.o(0.5F));\n- a(merchantrecipelist, Item.r.cv, this.ab, this.o(0.5F));\n- a(merchantrecipelist, Item.p.cv, this.ab, this.o(0.5F));\n- b(merchantrecipelist, Item.s.cv, this.ab, this.o(0.5F));\n- b(merchantrecipelist, Item.B.cv, this.ab, this.o(0.5F));\n- b(merchantrecipelist, Item.j.cv, this.ab, this.o(0.3F));\n- b(merchantrecipelist, Item.E.cv, this.ab, this.o(0.3F));\n- b(merchantrecipelist, Item.i.cv, this.ab, this.o(0.5F));\n- b(merchantrecipelist, Item.D.cv, this.ab, this.o(0.5F));\n- b(merchantrecipelist, Item.h.cv, this.ab, this.o(0.2F));\n- b(merchantrecipelist, Item.C.cv, this.ab, this.o(0.2F));\n- b(merchantrecipelist, Item.R.cv, this.ab, this.o(0.2F));\n- b(merchantrecipelist, Item.S.cv, this.ab, this.o(0.2F));\n- b(merchantrecipelist, Item.ai.cv, this.ab, this.o(0.2F));\n- b(merchantrecipelist, Item.am.cv, this.ab, this.o(0.2F));\n- b(merchantrecipelist, Item.af.cv, this.ab, this.o(0.2F));\n- b(merchantrecipelist, Item.aj.cv, this.ab, this.o(0.2F));\n- b(merchantrecipelist, Item.ag.cv, this.ab, this.o(0.2F));\n- b(merchantrecipelist, Item.ak.cv, this.ab, this.o(0.2F));\n- b(merchantrecipelist, Item.ah.cv, this.ab, this.o(0.2F));\n- b(merchantrecipelist, Item.al.cv, this.ab, this.o(0.2F));\n- b(merchantrecipelist, Item.ae.cv, this.ab, this.o(0.1F));\n- b(merchantrecipelist, Item.ab.cv, this.ab, this.o(0.1F));\n- b(merchantrecipelist, Item.ac.cv, this.ab, this.o(0.1F));\n- b(merchantrecipelist, Item.ad.cv, this.ab, this.o(0.1F));\n+ a(merchantrecipelist, Item.o.cv, this.ab, this.p(0.7F));\n+ a(merchantrecipelist, Item.q.cv, this.ab, this.p(0.5F));\n+ a(merchantrecipelist, Item.r.cv, this.ab, this.p(0.5F));\n+ a(merchantrecipelist, Item.p.cv, this.ab, this.p(0.5F));\n+ b(merchantrecipelist, Item.s.cv, this.ab, this.p(0.5F));\n+ b(merchantrecipelist, Item.B.cv, this.ab, this.p(0.5F));\n+ b(merchantrecipelist, Item.j.cv, this.ab, this.p(0.3F));\n+ b(merchantrecipelist, Item.E.cv, this.ab, this.p(0.3F));\n+ b(merchantrecipelist, Item.i.cv, this.ab, this.p(0.5F));\n+ b(merchantrecipelist, Item.D.cv, this.ab, this.p(0.5F));\n+ b(merchantrecipelist, Item.h.cv, this.ab, this.p(0.2F));\n+ b(merchantrecipelist, Item.C.cv, this.ab, this.p(0.2F));\n+ b(merchantrecipelist, Item.R.cv, this.ab, this.p(0.2F));\n+ b(merchantrecipelist, Item.S.cv, this.ab, this.p(0.2F));\n+ b(merchantrecipelist, Item.ai.cv, this.ab, this.p(0.2F));\n+ b(merchantrecipelist, Item.am.cv, this.ab, this.p(0.2F));\n+ b(merchantrecipelist, Item.af.cv, this.ab, this.p(0.2F));\n+ b(merchantrecipelist, Item.aj.cv, this.ab, this.p(0.2F));\n+ b(merchantrecipelist, Item.ag.cv, this.ab, this.p(0.2F));\n+ b(merchantrecipelist, Item.ak.cv, this.ab, this.p(0.2F));\n+ b(merchantrecipelist, Item.ah.cv, this.ab, this.p(0.2F));\n+ b(merchantrecipelist, Item.al.cv, this.ab, this.p(0.2F));\n+ b(merchantrecipelist, Item.ae.cv, this.ab, this.p(0.1F));\n+ b(merchantrecipelist, Item.ab.cv, this.ab, this.p(0.1F));\n+ b(merchantrecipelist, Item.ac.cv, this.ab, this.p(0.1F));\n+ b(merchantrecipelist, Item.ad.cv, this.ab, this.p(0.1F));\n break;\n \n case 4:\n- a(merchantrecipelist, Item.o.cv, this.ab, this.o(0.7F));\n- a(merchantrecipelist, Item.as.cv, this.ab, this.o(0.5F));\n- a(merchantrecipelist, Item.bk.cv, this.ab, this.o(0.5F));\n- b(merchantrecipelist, Item.aC.cv, this.ab, this.o(0.1F));\n- b(merchantrecipelist, Item.Y.cv, this.ab, this.o(0.3F));\n- b(merchantrecipelist, Item.aa.cv, this.ab, this.o(0.3F));\n- b(merchantrecipelist, Item.X.cv, this.ab, this.o(0.3F));\n- b(merchantrecipelist, Item.Z.cv, this.ab, this.o(0.3F));\n- b(merchantrecipelist, Item.at.cv, this.ab, this.o(0.3F));\n- b(merchantrecipelist, Item.bl.cv, this.ab, this.o(0.3F));\n+ a(merchantrecipelist, Item.o.cv, this.ab, this.p(0.7F));\n+ a(merchantrecipelist, Item.as.cv, this.ab, this.p(0.5F));\n+ a(merchantrecipelist, Item.bk.cv, this.ab, this.p(0.5F));\n+ b(merchantrecipelist, Item.aC.cv, this.ab, this.p(0.1F));\n+ b(merchantrecipelist, Item.Y.cv, this.ab, this.p(0.3F));\n+ b(merchantrecipelist, Item.aa.cv, this.ab, this.p(0.3F));\n+ b(merchantrecipelist, Item.X.cv, this.ab, this.p(0.3F));\n+ b(merchantrecipelist, Item.Z.cv, this.ab, this.p(0.3F));\n+ b(merchantrecipelist, Item.at.cv, this.ab, this.p(0.3F));\n+ b(merchantrecipelist, Item.bl.cv, this.ab, this.p(0.3F));\n }\n \n if (merchantrecipelist.isEmpty()) {\n@@ -473,7 +473,7 @@ public EntityLivingData a(EntityLivingData entitylivingdata) {\n return entitylivingdata;\n }\n \n- public void bT() {\n+ public void bX() {\n this.bz = true;\n }\n \n@@ -484,7 +484,7 @@ public EntityVillager b(EntityAgeable entityageable) {\n return entityvillager;\n }\n \n- public boolean bC() {\n+ public boolean bG() {\n return false;\n }\n ", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityVillager.java", "sha": "39e2c2294a36e4b1f9721b55232ff15b40f5ece8", "status": "modified" }, { "additions": 16, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityWitch.java", "changes": 32, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityWitch.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 16, "filename": "src/main/java/net/minecraft/server/EntityWitch.java", "new_code": " protected String aN() {\n protected String aO() {\n public boolean bT() {\n protected void ay() {\n super.ay();\n public boolean be() {\n if (this.bT()) {\n ItemStack itemstack = this.aY();\n this.c(new PotionEffect(potioneffect));\n if (this.ab.nextFloat() < 0.15F && this.ae() && !this.a(Potion.n)) {\n } else if (this.ab.nextFloat() < 0.05F && this.aM() < this.aS()) {\n } else if (this.ab.nextFloat() < 0.25F && this.m() != null && !this.a(Potion.c) && this.m().e(this) > 121.0D) {\n } else if (this.ab.nextFloat() < 0.25F && this.m() != null && !this.a(Potion.c) && this.m().e(this) > 121.0D) {\n this.bs = this.aY().n();\n if (!this.bT()) {\n } else if (entitylivingbase.aM() >= 8.0F && !entitylivingbase.a(Potion.u)) {", "new_methods": [ { "arguments": [], "filename": "src/main/java/net/minecraft/server/EntityWitch.java", "implementation": "protected String aO() {\n public boolean bT() {\n protected void ay() {\n super.ay();\n public boolean be() {\n if (this.bT()) {\n ItemStack itemstack = this.aY();\n this.c(new PotionEffect(potioneffect));\n if (this.ab.nextFloat() < 0.15F && this.ae() && !this.a(Potion.n)) {", "signature": "String aN()" } ], "old_code": " protected String aK() {\n protected String aL() {\n public boolean bP() {\n protected void ax() {\n super.ax();\n public boolean bb() {\n if (this.bP()) {\n ItemStack itemstack = this.aV();\n this.d(new PotionEffect(potioneffect));\n if (this.ab.nextFloat() < 0.15F && this.ad() && !this.a(Potion.n)) {\n } else if (this.ab.nextFloat() < 0.05F && this.aJ() < this.aP()) {\n } else if (this.ab.nextFloat() < 0.25F && this.m() != null && !this.a(Potion.c) && this.m().e((Entity) this) > 121.0D) {\n } else if (this.ab.nextFloat() < 0.25F && this.m() != null && !this.a(Potion.c) && this.m().e((Entity) this) > 121.0D) {\n this.bs = this.aV().n();\n if (!this.bP()) {\n } else if (entitylivingbase.aJ() >= 8.0F && !entitylivingbase.a(Potion.u)) {", "old_methods": [ { "arguments": [], "filename": "src/main/java/net/minecraft/server/EntityWitch.java", "implementation": "protected String aL() {\n public boolean bP() {\n protected void ax() {\n super.ax();\n public boolean bb() {\n if (this.bP()) {\n ItemStack itemstack = this.aV();\n this.d(new PotionEffect(potioneffect));\n if (this.ab.nextFloat() < 0.15F && this.ad() && !this.a(Potion.n)) {", "signature": "String aK()" } ], "patch": "@@ -33,38 +33,38 @@ protected String r() {\n return \"mob.witch.idle\";\n }\n \n- protected String aK() {\n+ protected String aN() {\n return \"mob.witch.hurt\";\n }\n \n- protected String aL() {\n+ protected String aO() {\n return \"mob.witch.death\";\n }\n \n public void a(boolean flag0) {\n this.u().b(21, Byte.valueOf((byte) (flag0 ? 1 : 0)));\n }\n \n- public boolean bP() {\n+ public boolean bT() {\n return this.u().a(21) == 1;\n }\n \n- protected void ax() {\n- super.ax();\n+ protected void ay() {\n+ super.ay();\n this.a(SharedMonsterAttributes.a).a(26.0D);\n this.a(SharedMonsterAttributes.d).a(0.25D);\n }\n \n- public boolean bb() {\n+ public boolean be() {\n return true;\n }\n \n public void c() {\n if (!this.q.I) {\n- if (this.bP()) {\n+ if (this.bT()) {\n if (this.bs-- <= 0) {\n this.a(false);\n- ItemStack itemstack = this.aV();\n+ ItemStack itemstack = this.aY();\n \n this.c(0, (ItemStack) null);\n if (itemstack != null && itemstack.d == Item.bu.cv) {\n@@ -76,7 +76,7 @@ public void c() {\n while (iterator.hasNext()) {\n PotionEffect potioneffect = (PotionEffect) iterator.next();\n \n- this.d(new PotionEffect(potioneffect));\n+ this.c(new PotionEffect(potioneffect));\n }\n }\n }\n@@ -86,19 +86,19 @@ public void c() {\n } else {\n short short1 = -1;\n \n- if (this.ab.nextFloat() < 0.15F && this.ad() && !this.a(Potion.n)) {\n+ if (this.ab.nextFloat() < 0.15F && this.ae() && !this.a(Potion.n)) {\n short1 = 16307;\n- } else if (this.ab.nextFloat() < 0.05F && this.aJ() < this.aP()) {\n+ } else if (this.ab.nextFloat() < 0.05F && this.aM() < this.aS()) {\n short1 = 16341;\n- } else if (this.ab.nextFloat() < 0.25F && this.m() != null && !this.a(Potion.c) && this.m().e((Entity) this) > 121.0D) {\n+ } else if (this.ab.nextFloat() < 0.25F && this.m() != null && !this.a(Potion.c) && this.m().e(this) > 121.0D) {\n short1 = 16274;\n- } else if (this.ab.nextFloat() < 0.25F && this.m() != null && !this.a(Potion.c) && this.m().e((Entity) this) > 121.0D) {\n+ } else if (this.ab.nextFloat() < 0.25F && this.m() != null && !this.a(Potion.c) && this.m().e(this) > 121.0D) {\n short1 = 16274;\n }\n \n if (short1 > -1) {\n this.c(0, new ItemStack(Item.bu, 1, short1));\n- this.bs = this.aV().n();\n+ this.bs = this.aY().n();\n this.a(true);\n AttributeInstance attributeinstance = this.a(SharedMonsterAttributes.d);\n \n@@ -146,7 +146,7 @@ protected void b(boolean flag0, int i0) {\n }\n \n public void a(EntityLivingBase entitylivingbase, float f0) {\n- if (!this.bP()) {\n+ if (!this.bT()) {\n EntityPotion entitypotion = new EntityPotion(this.q, this, 32732);\n \n entitypotion.B -= -20.0F;\n@@ -157,7 +157,7 @@ public void a(EntityLivingBase entitylivingbase, float f0) {\n \n if (f1 >= 8.0F && !entitylivingbase.a(Potion.d)) {\n entitypotion.a(32698);\n- } else if (entitylivingbase.aJ() >= 8.0F && !entitylivingbase.a(Potion.u)) {\n+ } else if (entitylivingbase.aM() >= 8.0F && !entitylivingbase.a(Potion.u)) {\n entitypotion.a(32660);\n } else if (f1 <= 3.0F && !entitylivingbase.a(Potion.t) && this.ab.nextFloat() < 0.25F) {\n entitypotion.a(32696);", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityWitch.java", "sha": "0554d920941364aac03d7a30e054f36b0f818ffa", "status": "modified" }, { "additions": 31, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityWither.java", "changes": 64, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityWither.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 33, "filename": "src/main/java/net/minecraft/server/EntityWither.java", "new_code": " this.g(this.aS());\n this.entity = new CanaryWither(this); // CanaryMod: Wrap Entity\n nbttagcompound.a(\"Invul\", this.bU());\n protected String aN() {\n protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {}\n public int aP() {\n if (this.aq()) {\n } else if (this.bU() > 0) {\n if (this.bV()) {\n if (entity != null && !(entity instanceof EntityPlayer) && entity instanceof EntityLivingBase && ((EntityLivingBase) entity).aX() == this.aX()) {\n protected void bo() {\n public void c(PotionEffect potioneffect) {}\n protected boolean be() {\n protected void ay() {\n super.ay();\n public int bU() {\n public boolean bV() {\n return this.aM() <= this.aS() / 2.0F;\n public EnumCreatureAttribute aX() {", "new_methods": [ { "arguments": [], "filename": "src/main/java/net/minecraft/server/EntityWither.java", "implementation": "protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {", "signature": "String aN()" }, { "arguments": [], "filename": "src/main/java/net/minecraft/server/EntityWither.java", "implementation": "if (this.aq()) {", "signature": "int aP()" }, { "arguments": [], "filename": "src/main/java/net/minecraft/server/EntityWither.java", "implementation": "public void c(PotionEffect potioneffect) {", "signature": "void bo()" } ], "old_code": "\n\n this.g(this.aP());\nthis.entity = new CanaryWither(this); // CanaryMod: Wrap Entity\n nbttagcompound.a(\"Invul\", this.bQ());\n protected String aK() {\n protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {}\n public int aM() {\n if (this.ap()) {\n } else if (this.bQ() > 0) {\n if (this.bR()) {\n if (entity != null && !(entity instanceof EntityPlayer) && entity instanceof EntityLivingBase && ((EntityLivingBase) entity).aU() == this.aU()) {\n protected void bk() {\n public void d(PotionEffect potioneffect) {}\n protected boolean bb() {\n protected void ax() {\n super.ax();\n public int bQ() {\n public boolean bR() {\n return this.aJ() <= this.aP() / 2.0F;\n public EnumCreatureAttribute aU() {", "old_methods": [ { "arguments": [], "filename": "src/main/java/net/minecraft/server/EntityWither.java", "implementation": "protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {", "signature": "String aK()" }, { "arguments": [], "filename": "src/main/java/net/minecraft/server/EntityWither.java", "implementation": "if (this.ap()) {", "signature": "int aM()" }, { "arguments": [], "filename": "src/main/java/net/minecraft/server/EntityWither.java", "implementation": "public void d(PotionEffect potioneffect) {", "signature": "void bk()" } ], "patch": "@@ -1,10 +1,8 @@\n package net.minecraft.server;\n \n-\n import java.util.List;\n import net.canarymod.api.entity.living.monster.CanaryWither;\n \n-\n public class EntityWither extends EntityMob implements IRangedAttackMob {\n \n private float[] bp = new float[2];\n@@ -18,7 +16,7 @@ public class EntityWither extends EntityMob implements IRangedAttackMob {\n \n public EntityWither(World world) {\n super(world);\n- this.g(this.aP());\n+ this.g(this.aS());\n this.a(0.9F, 4.0F);\n this.ag = true;\n this.k().e(true);\n@@ -30,7 +28,7 @@ public EntityWither(World world) {\n this.d.a(1, new EntityAIHurtByTarget(this, false));\n this.d.a(2, new EntityAINearestAttackableTarget(this, EntityLiving.class, 0, false, false, bw));\n this.b = 50;\n-this.entity = new CanaryWither(this); // CanaryMod: Wrap Entity\n+ this.entity = new CanaryWither(this); // CanaryMod: Wrap Entity\n }\n \n protected void a() {\n@@ -43,7 +41,7 @@ protected void a() {\n \n public void b(NBTTagCompound nbttagcompound) {\n super.b(nbttagcompound);\n- nbttagcompound.a(\"Invul\", this.bQ());\n+ nbttagcompound.a(\"Invul\", this.bU());\n }\n \n public void a(NBTTagCompound nbttagcompound) {\n@@ -55,11 +53,11 @@ protected String r() {\n return \"mob.wither.idle\";\n }\n \n- protected String aK() {\n+ protected String aN() {\n return \"mob.wither.hurt\";\n }\n \n- protected String aL() {\n+ protected String aO() {\n return \"mob.wither.death\";\n }\n \n@@ -73,7 +71,7 @@ public void c() {\n Entity entity = this.q.a(this.q(0));\n \n if (entity != null) {\n- if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n+ if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n if (this.y < 0.0D) {\n this.y = 0.0D;\n }\n@@ -134,7 +132,7 @@ public void c() {\n }\n }\n \n- boolean flag0 = this.bR();\n+ boolean flag0 = this.bV();\n \n for (i1 = 0; i1 < 3; ++i1) {\n double d8 = this.r(i1);\n@@ -147,18 +145,18 @@ public void c() {\n }\n }\n \n- if (this.bQ() > 0) {\n+ if (this.bU() > 0) {\n for (i1 = 0; i1 < 3; ++i1) {\n this.q.a(\"mobSpell\", this.u + this.ab.nextGaussian() * 1.0D, this.v + (double) (this.ab.nextFloat() * 3.3F), this.w + this.ab.nextGaussian() * 1.0D, 0.699999988079071D, 0.699999988079071D, 0.8999999761581421D);\n }\n }\n }\n \n- protected void be() {\n+ protected void bh() {\n int i0;\n \n- if (this.bQ() > 0) {\n- i0 = this.bQ() - 1;\n+ if (this.bU() > 0) {\n+ i0 = this.bU() - 1;\n if (i0 <= 0) {\n this.q.a(this, this.u, this.v + (double) this.f(), this.w, 7.0F, false, this.q.O().b(\"mobGriefing\"));\n this.q.d(1013, (int) this.u, (int) this.v, (int) this.w, 0);\n@@ -169,7 +167,7 @@ protected void be() {\n this.f(10.0F);\n }\n } else {\n- super.be();\n+ super.bh();\n \n int i1;\n \n@@ -197,7 +195,7 @@ protected void be() {\n if (i1 > 0) {\n Entity entity = this.q.a(i1);\n \n- if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n+ if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n this.a(i0 + 1, (EntityLivingBase) entity);\n this.bt[i0 - 1] = this.ac + 40 + this.ab.nextInt(20);\n this.bu[i0 - 1] = 0;\n@@ -210,7 +208,7 @@ protected void be() {\n for (int i4 = 0; i4 < 10 && !list.isEmpty(); ++i4) {\n EntityLivingBase entitylivingbase = (EntityLivingBase) list.get(this.ab.nextInt(list.size()));\n \n- if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n+ if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n if (entitylivingbase instanceof EntityPlayer) {\n if (!((EntityPlayer) entitylivingbase).bG.a) {\n this.c(i0, entitylivingbase.k);\n@@ -268,14 +266,14 @@ protected void be() {\n }\n }\n \n- public void bP() {\n+ public void bT() {\n this.p(220);\n- this.g(this.aP() / 3.0F);\n+ this.g(this.aS() / 3.0F);\n }\n \n- public void ak() {}\n+ public void al() {}\n \n- public int aM() {\n+ public int aP() {\n return 4;\n }\n \n@@ -348,24 +346,24 @@ public void a(EntityLivingBase entitylivingbase, float f0) {\n }\n \n public boolean a(DamageSource damagesource, float f0) {\n- if (this.ap()) {\n+ if (this.aq()) {\n return false;\n } else if (damagesource == DamageSource.e) {\n return false;\n- } else if (this.bQ() > 0) {\n+ } else if (this.bU() > 0) {\n return false;\n } else {\n Entity entity;\n \n- if (this.bR()) {\n+ if (this.bV()) {\n entity = damagesource.h();\n if (entity instanceof EntityArrow) {\n return false;\n }\n }\n \n entity = damagesource.i();\n- if (entity != null && !(entity instanceof EntityPlayer) && entity instanceof EntityLivingBase && ((EntityLivingBase) entity).aU() == this.aU()) {\n+ if (entity != null && !(entity instanceof EntityPlayer) && entity instanceof EntityLivingBase && ((EntityLivingBase) entity).aX() == this.aX()) {\n return false;\n } else {\n if (this.bv <= 0) {\n@@ -385,7 +383,7 @@ protected void b(boolean flag0, int i0) {\n this.b(Item.bU.cv, 1);\n }\n \n- protected void bk() {\n+ protected void bo() {\n this.aV = 0;\n }\n \n@@ -395,20 +393,20 @@ public boolean K() {\n \n protected void b(float f0) {}\n \n- public void d(PotionEffect potioneffect) {}\n+ public void c(PotionEffect potioneffect) {}\n \n- protected boolean bb() {\n+ protected boolean be() {\n return true;\n }\n \n- protected void ax() {\n- super.ax();\n+ protected void ay() {\n+ super.ay();\n this.a(SharedMonsterAttributes.a).a(300.0D);\n this.a(SharedMonsterAttributes.d).a(0.6000000238418579D);\n this.a(SharedMonsterAttributes.b).a(40.0D);\n }\n \n- public int bQ() {\n+ public int bU() {\n return this.ah.c(20);\n }\n \n@@ -424,11 +422,11 @@ public void c(int i0, int i1) {\n this.ah.b(17 + i0, Integer.valueOf(i1));\n }\n \n- public boolean bR() {\n- return this.aJ() <= this.aP() / 2.0F;\n+ public boolean bV() {\n+ return this.aM() <= this.aS() / 2.0F;\n }\n \n- public EnumCreatureAttribute aU() {\n+ public EnumCreatureAttribute aX() {\n return EnumCreatureAttribute.b;\n }\n ", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityWither.java", "sha": "5ab1823477cb703ae7649effb70e145153148726", "status": "modified" }, { "additions": 3, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityWitherSkull.java", "changes": 6, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityWitherSkull.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 3, "filename": "src/main/java/net/minecraft/server/EntityWitherSkull.java", "new_code": " public boolean ae() {\n if (movingobjectposition.g.a(DamageSource.a(this.a), 8.0F) && !movingobjectposition.g.S()) {\n ((EntityLivingBase) movingobjectposition.g).c(new PotionEffect(Potion.v.H, 20 * b0, 1));", "new_methods": [], "old_code": " public boolean ad() {\n if (movingobjectposition.g.a(DamageSource.a(this.a), 8.0F) && !movingobjectposition.g.R()) {\n ((EntityLivingBase) movingobjectposition.g).d(new PotionEffect(Potion.v.H, 20 * b0, 1));", "old_methods": [], "patch": "@@ -20,7 +20,7 @@ public float c() {\n return /* this.d() ? 0.73F : */super.c(); // CanaryMod: Motion Factor was made configurable\n }\n \n- public boolean ad() {\n+ public boolean ae() {\n return false;\n }\n \n@@ -38,7 +38,7 @@ protected void a(MovingObjectPosition movingobjectposition) {\n if (!this.q.I) {\n if (movingobjectposition.g != null) {\n if (this.a != null) {\n- if (movingobjectposition.g.a(DamageSource.a(this.a), 8.0F) && !movingobjectposition.g.R()) {\n+ if (movingobjectposition.g.a(DamageSource.a(this.a), 8.0F) && !movingobjectposition.g.S()) {\n this.a.f(5.0F);\n }\n } else {\n@@ -57,7 +57,7 @@ protected void a(MovingObjectPosition movingobjectposition) {\n }\n \n if (b0 > 0) {\n- ((EntityLivingBase) movingobjectposition.g).d(new PotionEffect(Potion.v.H, 20 * b0, 1));\n+ ((EntityLivingBase) movingobjectposition.g).c(new PotionEffect(Potion.v.H, 20 * b0, 1));\n }\n }\n }", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityWitherSkull.java", "sha": "b2024c83cdc6f2f23621fb612c62b3e834f08bbd", "status": "modified" }, { "additions": 66, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityWolf.java", "changes": 129, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityWolf.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 63, "filename": "src/main/java/net/minecraft/server/EntityWolf.java", "new_code": " this.j(false);\n protected void ay() {\n super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);\n } else if (!this.bT()) {\n this.l(true);\n protected void bj() {\n this.ah.b(18, Float.valueOf(this.aM()));\n this.ah.a(18, new Float(this.aM()));\n nbttagcompound.a(\"Angry\", this.cc());\n nbttagcompound.a(\"CollarColor\", (byte) this.cd());\n this.l(nbttagcompound.n(\"Angry\"));\n return this.cc() ? \"mob.wolf.growl\" : (this.ab.nextInt(3) == 0 ? (this.bT() && this.ah.d(18) < 10.0F ? \"mob.wolf.whine\" : \"mob.wolf.panting\") : \"mob.wolf.bark\");\n protected String aN() {\n protected String aO() {\n protected float aZ() {\n if (!this.q.I && this.bs && !this.bt && !this.bM() && this.F) {\n if (this.ce()) {\n if (this.ce()) {\n this.a(\"mob.wolf.shake\", this.aZ(), (this.ab.nextFloat() - this.ab.nextFloat()) * 0.2F + 1.0F);\n public int bp() {\n return this.bU() ? 20 : super.bp();\n if (this.aq()) {\n int i0 = this.bT() ? 4 : 2;\n public void j(boolean flag0) {\n super.j(flag0);\n if (this.bT()) {\n if (i0 != this.cd()) {\n this.bp.a(!this.bU());\n this.b((Entity) null);\n this.d((EntityLivingBase) null);\n } else if (itemstack != null && itemstack.d == Item.aZ.cv && !this.cc()) {\n this.j(true);\n this.d((EntityLivingBase) null);\n this.i(true);\n this.i(false);\n public int bv() {\n public boolean cc() {\n public void l(boolean flag0) {\n public int cd() {\n entitywolf.j(true);\n public void m(boolean flag0) {\n } else if (!this.bT()) {\n return !entitywolf.bT() ? false : (entitywolf.bU() ? false : this.bY() && entitywolf.bY());\n public boolean ce() {\n return !this.bT() && this.ac > 2400;\n }\n\n public boolean a(EntityLivingBase entitylivingbase, EntityLivingBase entitylivingbase1) {\n if (!(entitylivingbase instanceof EntityCreeper) && !(entitylivingbase instanceof EntityGhast)) {\n if (entitylivingbase instanceof EntityWolf) {\n EntityWolf entitywolf = (EntityWolf) entitylivingbase;\n\n if (entitywolf.bT() && entitywolf.bV() == entitylivingbase1) {\n return false;\n }\n }\n\n return entitylivingbase instanceof EntityPlayer && entitylivingbase1 instanceof EntityPlayer && !((EntityPlayer) entitylivingbase1).a((EntityPlayer) entitylivingbase) ? false : !(entitylivingbase instanceof EntityHorse) || !((EntityHorse) entitylivingbase).bW();\n } else {\n return false;\n }", "new_methods": [ { "arguments": [], "filename": "src/main/java/net/minecraft/server/EntityWolf.java", "implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "signature": "void ay()" }, { "arguments": [], "filename": "src/main/java/net/minecraft/server/EntityWolf.java", "implementation": "this.ah.b(18, Float.valueOf(this.aM()));\n this.ah.a(18, new Float(this.aM()));\n nbttagcompound.a(\"Angry\", this.cc());\n nbttagcompound.a(\"CollarColor\", (byte) this.cd());\n this.l(nbttagcompound.n(\"Angry\"));\n return this.cc() ? \"mob.wolf.growl\" : (this.ab.nextInt(3) == 0 ? (this.bT() && this.ah.d(18) < 10.0F ? \"mob.wolf.whine\" : \"mob.wolf.panting\") : \"mob.wolf.bark\");\n protected String aN() {\n protected String aO() {\n protected float aZ() {\n if (!this.q.I && this.bs && !this.bt && !this.bM() && this.F) {\n if (this.ce()) {\n if (this.ce()) {\n this.a(\"mob.wolf.shake\", this.aZ(), (this.ab.nextFloat() - this.ab.nextFloat()) * 0.2F + 1.0F);\n public int bp() {\n return this.bU() ? 20 : super.bp();\n if (this.aq()) {\n int i0 = this.bT() ? 4 : 2;\n public void j(boolean flag0) {\n super.j(flag0);\n if (this.bT()) {\n if (i0 != this.cd()) {\n this.bp.a(!this.bU());\n this.b((Entity) null);\n this.d((EntityLivingBase) null);", "signature": "void bj()" }, { "arguments": [], "filename": "src/main/java/net/minecraft/server/EntityWolf.java", "implementation": "public boolean cc() {\n public void l(boolean flag0) {\n public int cd() {\n entitywolf.j(true);\n public void m(boolean flag0) {", "signature": "int bv()" }, { "arguments": [], "filename": "src/main/java/net/minecraft/server/EntityWolf.java", "implementation": "return !this.bT() && this.ac > 2400;", "signature": "boolean ce()" }, { "arguments": [ "EntityLivingBase entitylivingbase", " EntityLivingBase entitylivingbase1" ], "filename": "src/main/java/net/minecraft/server/EntityWolf.java", "implementation": "if (!(entitylivingbase instanceof EntityCreeper) && !(entitylivingbase instanceof EntityGhast)) {\n if (entitylivingbase instanceof EntityWolf) {\n EntityWolf entitywolf = (EntityWolf) entitylivingbase;\n\n if (entitywolf.bT() && entitywolf.bV() == entitylivingbase1) {\n return false;", "signature": "boolean a(EntityLivingBase entitylivingbase, EntityLivingBase entitylivingbase1)" } ], "old_code": "\n this.k(false);\n protected void ax() {\n super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;\n }\n\n this.m(false);\n List list = this.q.a(this.getClass(), AxisAlignedBB.a().a(this.u, this.v, this.w, this.u + 1.0D, this.v + 1.0D, this.w + 1.0D).b(16.0D, 10.0D, 16.0D));\n Iterator iterator = list.iterator();\n\n while (iterator.hasNext()) {\n EntityWolf entitywolf = (EntityWolf) iterator.next();\n\n if (this != entitywolf) {\n entitywolf.m(false);\n }\n }\n } else {\n this.m(true);\n protected void bg() {\n this.ah.b(18, Float.valueOf(this.aJ()));\n this.ah.a(18, new Float(this.aJ()));\n nbttagcompound.a(\"Angry\", this.bY());\n nbttagcompound.a(\"CollarColor\", (byte) this.bZ());\n this.m(nbttagcompound.n(\"Angry\"));\n return this.bY() ? \"mob.wolf.growl\" : (this.ab.nextInt(3) == 0 ? (this.bP() && this.ah.d(18) < 10.0F ? \"mob.wolf.whine\" : \"mob.wolf.panting\") : \"mob.wolf.bark\");\n protected String aK() {\n protected String aL() {\n protected float aW() {\n if (!this.q.I && this.bs && !this.bt && !this.bI() && this.F) {\n if (this.ca()) {\n if (this.ca()) {\n this.a(\"mob.wolf.shake\", this.aW(), (this.ab.nextFloat() - this.ab.nextFloat()) * 0.2F + 1.0F);\n public int bl() {\n return this.bQ() ? 20 : super.bl();\n if (this.ap()) {\n int i0 = this.bP() ? 4 : 2;\n public void k(boolean flag0) {\n super.k(flag0);\n if (this.bP()) {\n if (i0 != this.bZ()) {\n this.bp.a(!this.bQ());\n } else if (itemstack != null && itemstack.d == Item.aZ.cv && !this.bY()) {\n this.k(true);\n this.c((EntityLivingBase) null);\n this.j(true);\n this.j(false);\n public int br() {\n public boolean bY() {\n public void m(boolean flag0) {\n public int bZ() {\n entitywolf.k(true);\n public void n(boolean flag0) {\n } else if (!this.bP()) {\n return !entitywolf.bP() ? false : (entitywolf.bQ() ? false : this.bU() && entitywolf.bU());\n public boolean ca() {\n return !this.bP() && this.ac > 2400;", "old_methods": [ { "arguments": [], "filename": "src/main/java/net/minecraft/server/EntityWolf.java", "implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "signature": "void ax()" }, { "arguments": [], "filename": "src/main/java/net/minecraft/server/EntityWolf.java", "implementation": "this.ah.b(18, Float.valueOf(this.aJ()));\n this.ah.a(18, new Float(this.aJ()));\n nbttagcompound.a(\"Angry\", this.bY());\n nbttagcompound.a(\"CollarColor\", (byte) this.bZ());\n this.m(nbttagcompound.n(\"Angry\"));\n return this.bY() ? \"mob.wolf.growl\" : (this.ab.nextInt(3) == 0 ? (this.bP() && this.ah.d(18) < 10.0F ? \"mob.wolf.whine\" : \"mob.wolf.panting\") : \"mob.wolf.bark\");\n protected String aK() {\n protected String aL() {\n protected float aW() {\n if (!this.q.I && this.bs && !this.bt && !this.bI() && this.F) {\n if (this.ca()) {\n if (this.ca()) {\n this.a(\"mob.wolf.shake\", this.aW(), (this.ab.nextFloat() - this.ab.nextFloat()) * 0.2F + 1.0F);\n public int bl() {\n return this.bQ() ? 20 : super.bl();\n if (this.ap()) {\n int i0 = this.bP() ? 4 : 2;\n public void k(boolean flag0) {\n super.k(flag0);\n if (this.bP()) {\n if (i0 != this.bZ()) {\n this.bp.a(!this.bQ());", "signature": "void bg()" }, { "arguments": [], "filename": "src/main/java/net/minecraft/server/EntityWolf.java", "implementation": "public boolean bY() {\n public void m(boolean flag0) {\n public int bZ() {\n entitywolf.k(true);\n public void n(boolean flag0) {", "signature": "int br()" } ], "patch": "@@ -5,7 +5,6 @@\n import net.canarymod.api.entity.living.animal.CanaryWolf;\n import net.canarymod.hook.entity.EntityTameHook;\n \n-\n public class EntityWolf extends EntityTameable {\n \n private float bq;\n@@ -33,54 +32,40 @@ public EntityWolf(World world) {\n this.d.a(2, new EntityAIOwnerHurtTarget(this));\n this.d.a(3, new EntityAIHurtByTarget(this, true));\n this.d.a(4, new EntityAITargetNonTamed(this, EntitySheep.class, 200, false));\n- this.k(false);\n+ this.j(false);\n this.entity = new CanaryWolf(this); // CanaryMod: Wrap Entity\n }\n \n- protected void ax() {\n- super.ax();\n+ protected void ay() {\n+ super.ay();\n this.a(SharedMonsterAttributes.d).a(0.30000001192092896D);\n- if (this.bP()) {\n+ if (this.bT()) {\n this.a(SharedMonsterAttributes.a).a(20.0D);\n } else {\n this.a(SharedMonsterAttributes.a).a(8.0D);\n }\n }\n \n- public boolean bb() {\n+ public boolean be() {\n return true;\n }\n \n- public void c(EntityLivingBase entitylivingbase) {\n- super.c(entitylivingbase);\n+ public void d(EntityLivingBase entitylivingbase) {\n+ super.d(entitylivingbase);\n if (entitylivingbase == null) {\n- if (!this.bY()) {\n- return;\n- }\n-\n- this.m(false);\n- List list = this.q.a(this.getClass(), AxisAlignedBB.a().a(this.u, this.v, this.w, this.u + 1.0D, this.v + 1.0D, this.w + 1.0D).b(16.0D, 10.0D, 16.0D));\n- Iterator iterator = list.iterator();\n-\n- while (iterator.hasNext()) {\n- EntityWolf entitywolf = (EntityWolf) iterator.next();\n-\n- if (this != entitywolf) {\n- entitywolf.m(false);\n- }\n- }\n- } else {\n- this.m(true);\n+ this.l(false);\n+ } else if (!this.bT()) {\n+ this.l(true);\n }\n }\n \n- protected void bg() {\n- this.ah.b(18, Float.valueOf(this.aJ()));\n+ protected void bj() {\n+ this.ah.b(18, Float.valueOf(this.aM()));\n }\n \n protected void a() {\n super.a();\n- this.ah.a(18, new Float(this.aJ()));\n+ this.ah.a(18, new Float(this.aM()));\n this.ah.a(19, new Byte((byte) 0));\n this.ah.a(20, new Byte((byte) BlockColored.j_(1)));\n }\n@@ -91,31 +76,31 @@ protected void a(int i0, int i1, int i2, int i3) {\n \n public void b(NBTTagCompound nbttagcompound) {\n super.b(nbttagcompound);\n- nbttagcompound.a(\"Angry\", this.bY());\n- nbttagcompound.a(\"CollarColor\", (byte) this.bZ());\n+ nbttagcompound.a(\"Angry\", this.cc());\n+ nbttagcompound.a(\"CollarColor\", (byte) this.cd());\n }\n \n public void a(NBTTagCompound nbttagcompound) {\n super.a(nbttagcompound);\n- this.m(nbttagcompound.n(\"Angry\"));\n+ this.l(nbttagcompound.n(\"Angry\"));\n if (nbttagcompound.b(\"CollarColor\")) {\n this.p(nbttagcompound.c(\"CollarColor\"));\n }\n }\n \n protected String r() {\n- return this.bY() ? \"mob.wolf.growl\" : (this.ab.nextInt(3) == 0 ? (this.bP() && this.ah.d(18) < 10.0F ? \"mob.wolf.whine\" : \"mob.wolf.panting\") : \"mob.wolf.bark\");\n+ return this.cc() ? \"mob.wolf.growl\" : (this.ab.nextInt(3) == 0 ? (this.bT() && this.ah.d(18) < 10.0F ? \"mob.wolf.whine\" : \"mob.wolf.panting\") : \"mob.wolf.bark\");\n }\n \n- protected String aK() {\n+ protected String aN() {\n return \"mob.wolf.hurt\";\n }\n \n- protected String aL() {\n+ protected String aO() {\n return \"mob.wolf.death\";\n }\n \n- protected float aW() {\n+ protected float aZ() {\n return 0.4F;\n }\n \n@@ -125,7 +110,7 @@ protected int s() {\n \n public void c() {\n super.c();\n- if (!this.q.I && this.bs && !this.bt && !this.bI() && this.F) {\n+ if (!this.q.I && this.bs && !this.bt && !this.bM() && this.F) {\n this.bt = true;\n this.bu = 0.0F;\n this.bv = 0.0F;\n@@ -136,13 +121,13 @@ public void c() {\n public void l_() {\n super.l_();\n this.br = this.bq;\n- if (this.ca()) {\n+ if (this.ce()) {\n this.bq += (1.0F - this.bq) * 0.4F;\n } else {\n this.bq += (0.0F - this.bq) * 0.4F;\n }\n \n- if (this.ca()) {\n+ if (this.ce()) {\n this.g = 10;\n }\n \n@@ -153,7 +138,7 @@ public void l_() {\n this.bv = 0.0F;\n } else if ((this.bs || this.bt) && this.bt) {\n if (this.bu == 0.0F) {\n- this.a(\"mob.wolf.shake\", this.aW(), (this.ab.nextFloat() - this.ab.nextFloat()) * 0.2F + 1.0F);\n+ this.a(\"mob.wolf.shake\", this.aZ(), (this.ab.nextFloat() - this.ab.nextFloat()) * 0.2F + 1.0F);\n }\n \n this.bv = this.bu;\n@@ -183,12 +168,12 @@ public float f() {\n return this.P * 0.8F;\n }\n \n- public int bl() {\n- return this.bQ() ? 20 : super.bl();\n+ public int bp() {\n+ return this.bU() ? 20 : super.bp();\n }\n \n public boolean a(DamageSource damagesource, float f0) {\n- if (this.ap()) {\n+ if (this.aq()) {\n return false;\n } else {\n Entity entity = damagesource.i();\n@@ -203,13 +188,13 @@ public boolean a(DamageSource damagesource, float f0) {\n }\n \n public boolean m(Entity entity) {\n- int i0 = this.bP() ? 4 : 2;\n+ int i0 = this.bT() ? 4 : 2;\n \n return entity.a(DamageSource.a((EntityLivingBase) this), (float) i0);\n }\n \n- public void k(boolean flag0) {\n- super.k(flag0);\n+ public void j(boolean flag0) {\n+ super.j(flag0);\n if (flag0) {\n this.a(SharedMonsterAttributes.a).a(20.0D);\n } else {\n@@ -220,7 +205,7 @@ public void k(boolean flag0) {\n public boolean a(EntityPlayer entityplayer) {\n ItemStack itemstack = entityplayer.bn.h();\n \n- if (this.bP()) {\n+ if (this.bT()) {\n if (itemstack != null) {\n if (Item.g[itemstack.d] instanceof ItemFood) {\n ItemFood itemfood = (ItemFood) Item.g[itemstack.d];\n@@ -240,7 +225,7 @@ public boolean a(EntityPlayer entityplayer) {\n } else if (itemstack.d == Item.aY.cv) {\n int i0 = BlockColored.j_(itemstack.k());\n \n- if (i0 != this.bZ()) {\n+ if (i0 != this.cd()) {\n this.p(i0);\n if (!entityplayer.bG.d && --itemstack.b <= 0) {\n entityplayer.bn.a(entityplayer.bn.c, (ItemStack) null);\n@@ -252,11 +237,13 @@ public boolean a(EntityPlayer entityplayer) {\n }\n \n if (entityplayer.c_().equalsIgnoreCase(this.h_()) && !this.q.I && !this.c(itemstack)) {\n- this.bp.a(!this.bQ());\n+ this.bp.a(!this.bU());\n this.bd = false;\n this.a((PathEntity) null);\n+ this.b((Entity) null);\n+ this.d((EntityLivingBase) null);\n }\n- } else if (itemstack != null && itemstack.d == Item.aZ.cv && !this.bY()) {\n+ } else if (itemstack != null && itemstack.d == Item.aZ.cv && !this.cc()) {\n if (!entityplayer.bG.d) {\n --itemstack.b;\n }\n@@ -271,16 +258,16 @@ public boolean a(EntityPlayer entityplayer) {\n \n if (hook.isTamed() && !hook.isCanceled()) {\n //\n- this.k(true);\n+ this.j(true);\n this.a((PathEntity) null);\n- this.c((EntityLivingBase) null);\n+ this.d((EntityLivingBase) null);\n this.bp.a(true);\n this.g(20.0F);\n this.b(entityplayer.c_());\n- this.j(true);\n+ this.i(true);\n this.q.a((Entity) this, (byte) 7);\n } else {\n- this.j(false);\n+ this.i(false);\n this.q.a((Entity) this, (byte) 6);\n }\n }\n@@ -295,15 +282,15 @@ public boolean c(ItemStack itemstack) {\n return itemstack == null ? false : (!(Item.g[itemstack.d] instanceof ItemFood) ? false : ((ItemFood) Item.g[itemstack.d]).j());\n }\n \n- public int br() {\n+ public int bv() {\n return 8;\n }\n \n- public boolean bY() {\n+ public boolean cc() {\n return (this.ah.a(16) & 2) != 0;\n }\n \n- public void m(boolean flag0) {\n+ public void l(boolean flag0) {\n byte b0 = this.ah.a(16);\n \n if (flag0) {\n@@ -313,7 +300,7 @@ public void m(boolean flag0) {\n }\n }\n \n- public int bZ() {\n+ public int cd() {\n return this.ah.a(20) & 15;\n }\n \n@@ -327,13 +314,13 @@ public EntityWolf b(EntityAgeable entityageable) {\n \n if (s0 != null && s0.trim().length() > 0) {\n entitywolf.b(s0);\n- entitywolf.k(true);\n+ entitywolf.j(true);\n }\n \n return entitywolf;\n }\n \n- public void n(boolean flag0) {\n+ public void m(boolean flag0) {\n if (flag0) {\n this.ah.b(19, Byte.valueOf((byte) 1));\n } else {\n@@ -344,23 +331,39 @@ public void n(boolean flag0) {\n public boolean a(EntityAnimal entityanimal) {\n if (entityanimal == this) {\n return false;\n- } else if (!this.bP()) {\n+ } else if (!this.bT()) {\n return false;\n } else if (!(entityanimal instanceof EntityWolf)) {\n return false;\n } else {\n EntityWolf entitywolf = (EntityWolf) entityanimal;\n \n- return !entitywolf.bP() ? false : (entitywolf.bQ() ? false : this.bU() && entitywolf.bU());\n+ return !entitywolf.bT() ? false : (entitywolf.bU() ? false : this.bY() && entitywolf.bY());\n }\n }\n \n- public boolean ca() {\n+ public boolean ce() {\n return this.ah.a(19) == 1;\n }\n \n protected boolean t() {\n- return !this.bP() && this.ac > 2400;\n+ return !this.bT() && this.ac > 2400;\n+ }\n+\n+ public boolean a(EntityLivingBase entitylivingbase, EntityLivingBase entitylivingbase1) {\n+ if (!(entitylivingbase instanceof EntityCreeper) && !(entitylivingbase instanceof EntityGhast)) {\n+ if (entitylivingbase instanceof EntityWolf) {\n+ EntityWolf entitywolf = (EntityWolf) entitylivingbase;\n+\n+ if (entitywolf.bT() && entitywolf.bV() == entitylivingbase1) {\n+ return false;\n+ }\n+ }\n+\n+ return entitylivingbase instanceof EntityPlayer && entitylivingbase1 instanceof EntityPlayer && !((EntityPlayer) entitylivingbase1).a((EntityPlayer) entitylivingbase) ? false : !(entitylivingbase instanceof EntityHorse) || !((EntityHorse) entitylivingbase).bW();\n+ } else {\n+ return false;\n+ }\n }\n \n public EntityAgeable a(EntityAgeable entityageable) {", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityWolf.java", "sha": "ab5b2b5bc74ff968b9be22abbbbbc5c61025180d", "status": "modified" }, { "additions": 2, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityXPOrb.java", "changes": 4, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityXPOrb.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 2, "filename": "src/main/java/net/minecraft/server/EntityXPOrb.java", "new_code": " if (this.aq()) {\n public boolean ap() {", "new_methods": [], "old_code": " if (this.ap()) {\n public boolean ao() {", "old_methods": [], "patch": "@@ -116,7 +116,7 @@ protected void e(int i0) {\n }\n \n public boolean a(DamageSource damagesource, float f0) {\n- if (this.ap()) {\n+ if (this.aq()) {\n return false;\n } else {\n this.J();\n@@ -161,7 +161,7 @@ public static int a(int i0) {\n return i0 >= 2477 ? 2477 : (i0 >= 1237 ? 1237 : (i0 >= 617 ? 617 : (i0 >= 307 ? 307 : (i0 >= 149 ? 149 : (i0 >= 73 ? 73 : (i0 >= 37 ? 37 : (i0 >= 17 ? 17 : (i0 >= 7 ? 7 : (i0 >= 3 ? 3 : 1)))))))));\n }\n \n- public boolean ao() {\n+ public boolean ap() {\n return false;\n }\n ", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityXPOrb.java", "sha": "e3450cbf1a977056f8669d577978bc25086f4ac1", "status": "modified" }, { "additions": 54, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityZombie.java", "changes": 96, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityZombie.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 42, "filename": "src/main/java/net/minecraft/server/EntityZombie.java", "new_code": " private static final AttributeModifier br = new AttributeModifier(bq, \"Baby speed boost\", 0.5D, 1);\n this.c.a(4, new EntityAIMoveTowardsRestriction(this, 1.0D));\n protected void ay() {\n super.ay();\n this.aW().b(bp).a(this.ab.nextDouble() * 0.10000000149011612D);\n public int aP() {\n int i0 = super.aP() + 2;\n protected boolean be() {\n public boolean bT() {\n public void i(boolean flag0) {\n if (entitylivingbase == null && this.bN() instanceof EntityLivingBase) {\n entitylivingbase = (EntityLivingBase) this.bN();\n entityzombie.d(entitylivingbase);\n if (!this.q.I && this.bV()) {\n int i0 = this.bX();\n this.bW();\n if (flag0 && this.aY() == null && this.ae() && this.ab.nextFloat() < (float) this.q.r * 0.3F) {\n protected String aN() {\n protected String aO() {\n public EnumCreatureAttribute aX() {\n protected void bw() {\n super.bw();\n if (this.bT()) {\n nbttagcompound.a(\"ConversionTime\", this.bV() ? this.bs : -1);\n this.i(true);\n entityzombie.i(true);\n Object object = super.a(entitylivingdata);\n if (object == null) {\n object = new EntityZombieGroupData(this, this.q.s.nextFloat() < 0.05F, this.q.s.nextFloat() < 0.05F, (EntityZombieINNER1) null);\n if (object instanceof EntityZombieGroupData) {\n EntityZombieGroupData entityzombiegroupdata = (EntityZombieGroupData) object;\n\n if (entityzombiegroupdata.b) {\n this.i(true);\n }\n\n if (entityzombiegroupdata.a) {\n this.a(true);\n }\n }\n\n this.bw();\n this.bx();\n return (EntityLivingData) object;\n ItemStack itemstack = entityplayer.bx();\n if (itemstack != null && itemstack.b() == Item.av && itemstack.k() == 0 && this.bT() && this.a(Potion.t)) {\n protected void a(int i0) {\n this.c(new PotionEffect(Potion.g.H, i0, Math.min(this.q.r - 1, 0)));\n return !this.bV();\n public boolean bV() {\n public void bW() { // CanaryMod: protected => public\n entityvillager.bX();\n entityvillager.c(new PotionEffect(Potion.k.H, 200, 0));\n protected int bX() {", "new_methods": [ { "arguments": [], "filename": "src/main/java/net/minecraft/server/EntityZombie.java", "implementation": "super.ay();\n this.aW().b(bp).a(this.ab.nextDouble() * 0.10000000149011612D);\n public int aP() {\n int i0 = super.aP() + 2;\n protected boolean be() {\n public boolean bT() {\n public void i(boolean flag0) {\n if (entitylivingbase == null && this.bN() instanceof EntityLivingBase) {\n entitylivingbase = (EntityLivingBase) this.bN();\n entityzombie.d(entitylivingbase);\n if (!this.q.I && this.bV()) {\n int i0 = this.bX();\n this.bW();\n if (flag0 && this.aY() == null && this.ae() && this.ab.nextFloat() < (float) this.q.r * 0.3F) {\n protected String aN() {\n protected String aO() {\n public EnumCreatureAttribute aX() {\n protected void bw() {\n super.bw();\n if (this.bT()) {\n nbttagcompound.a(\"ConversionTime\", this.bV() ? this.bs : -1);\n this.i(true);\n entityzombie.i(true);\n Object object = super.a(entitylivingdata);\n if (object == null) {\n object = new EntityZombieGroupData(this, this.q.s.nextFloat() < 0.05F, this.q.s.nextFloat() < 0.05F, (EntityZombieINNER1) null);\n if (object instanceof EntityZombieGroupData) {\n EntityZombieGroupData entityzombiegroupdata = (EntityZombieGroupData) object;\n\n if (entityzombiegroupdata.b) {\n this.i(true);", "signature": "void ay()" } ], "old_code": " private static final AttributeModifier br = new AttributeModifier(bq, \"Baby speed boost\", 0.5D, 0);\n this.c.a(4, new EntityAIMoveTwardsRestriction(this, 1.0D));\n protected void ax() {\n super.ax();\n this.aT().b(bp).a(this.ab.nextDouble() * 0.10000000149011612D);\n public int aM() {\n int i0 = super.aM() + 2;\n protected boolean bb() {\n public boolean bP() {\n public void j(boolean flag0) {\n if (entitylivingbase == null && this.bJ() instanceof EntityLivingBase) {\n entitylivingbase = (EntityLivingBase) this.bJ();\n entityzombie.c(entitylivingbase);\n if (!this.q.I && this.bR()) {\n int i0 = this.bT();\n this.bS();\n if (flag0 && this.aV() == null && this.ad() && this.ab.nextFloat() < (float) this.q.r * 0.3F) {\n protected String aK() {\n protected String aL() {\n public EnumCreatureAttribute aU() {\n protected void bs() {\n super.bs();\n if (this.bP()) {\n nbttagcompound.a(\"ConversionTime\", this.bR() ? this.bs : -1);\n this.j(true);\n entityzombie.j(true);\n entitylivingdata = super.a(entitylivingdata);\n if (this.q.s.nextFloat() < 0.05F) {\n this.j(true);\n this.bs();\n this.bt();\n return entitylivingdata;\n ItemStack itemstack = entityplayer.bt();\n if (itemstack != null && itemstack.b() == Item.av && itemstack.k() == 0 && this.bP() && this.a(Potion.t)) {\n public void a(int i0) { // CanaryMod: protected => public\n this.d(new PotionEffect(Potion.g.H, i0, Math.min(this.q.r - 1, 0)));\n return !this.bR();\n public boolean bR() {\n public void bS() { // CanaryMod: protected => public\n entityvillager.bT();\n entityvillager.d(new PotionEffect(Potion.k.H, 200, 0));\n protected int bT() {", "old_methods": [], "patch": "@@ -8,7 +8,7 @@ public class EntityZombie extends EntityMob {\n \n protected static final Attribute bp = (new RangedAttribute(\"zombie.spawnReinforcements\", 0.0D, 0.0D, 1.0D)).a(\"Spawn Reinforcements Chance\");\n private static final UUID bq = UUID.fromString(\"B9766B59-9566-4402-BC1F-2EE2A276D836\");\n- private static final AttributeModifier br = new AttributeModifier(bq, \"Baby speed boost\", 0.5D, 0);\n+ private static final AttributeModifier br = new AttributeModifier(bq, \"Baby speed boost\", 0.5D, 1);\n private int bs;\n \n public EntityZombie(World world) {\n@@ -18,7 +18,7 @@ public EntityZombie(World world) {\n this.c.a(1, new EntityAIBreakDoor(this));\n this.c.a(2, new EntityAIAttackOnCollide(this, EntityPlayer.class, 1.0D, false));\n this.c.a(3, new EntityAIAttackOnCollide(this, EntityVillager.class, 1.0D, true));\n- this.c.a(4, new EntityAIMoveTwardsRestriction(this, 1.0D));\n+ this.c.a(4, new EntityAIMoveTowardsRestriction(this, 1.0D));\n this.c.a(5, new EntityAIMoveThroughVillage(this, 1.0D, false));\n this.c.a(6, new EntityAIWander(this, 1.0D));\n this.c.a(7, new EntityAIWatchClosest(this, EntityPlayer.class, 8.0F));\n@@ -29,12 +29,12 @@ public EntityZombie(World world) {\n this.entity = new CanaryZombie(this); // CanaryMod: Wrap Entity\n }\n \n- protected void ax() {\n- super.ax();\n+ protected void ay() {\n+ super.ay();\n this.a(SharedMonsterAttributes.b).a(40.0D);\n this.a(SharedMonsterAttributes.d).a(0.23000000417232513D);\n this.a(SharedMonsterAttributes.e).a(3.0D);\n- this.aT().b(bp).a(this.ab.nextDouble() * 0.10000000149011612D);\n+ this.aW().b(bp).a(this.ab.nextDouble() * 0.10000000149011612D);\n }\n \n protected void a() {\n@@ -44,8 +44,8 @@ protected void a() {\n this.u().a(14, Byte.valueOf((byte) 0));\n }\n \n- public int aM() {\n- int i0 = super.aM() + 2;\n+ public int aP() {\n+ int i0 = super.aP() + 2;\n \n if (i0 > 20) {\n i0 = 20;\n@@ -54,7 +54,7 @@ public int aM() {\n return i0;\n }\n \n- protected boolean bb() {\n+ protected boolean be() {\n return true;\n }\n \n@@ -74,11 +74,11 @@ public void a(boolean flag0) {\n }\n }\n \n- public boolean bP() {\n+ public boolean bT() {\n return this.u().a(13) == 1;\n }\n \n- public void j(boolean flag0) {\n+ public void i(boolean flag0) {\n this.u().b(13, Byte.valueOf((byte) (flag0 ? 1 : 0)));\n }\n \n@@ -117,8 +117,8 @@ public boolean a(DamageSource damagesource, float f0) {\n } else {\n EntityLivingBase entitylivingbase = this.m();\n \n- if (entitylivingbase == null && this.bJ() instanceof EntityLivingBase) {\n- entitylivingbase = (EntityLivingBase) this.bJ();\n+ if (entitylivingbase == null && this.bN() instanceof EntityLivingBase) {\n+ entitylivingbase = (EntityLivingBase) this.bN();\n }\n \n if (entitylivingbase == null && damagesource.i() instanceof EntityLivingBase) {\n@@ -140,7 +140,7 @@ public boolean a(DamageSource damagesource, float f0) {\n entityzombie.b((double) i4, (double) i5, (double) i6);\n if (this.q.b(entityzombie.E) && this.q.a((Entity) entityzombie, entityzombie.E).isEmpty() && !this.q.d(entityzombie.E)) {\n this.q.d((Entity) entityzombie);\n- entityzombie.c(entitylivingbase);\n+ entityzombie.d(entitylivingbase);\n entityzombie.a((EntityLivingData) null);\n this.a(bp).a(new AttributeModifier(\"Zombie reinforcement caller charge\", -0.05000000074505806D, 0));\n entityzombie.a(bp).a(new AttributeModifier(\"Zombie reinforcement callee charge\", -0.05000000074505806D, 0));\n@@ -155,12 +155,12 @@ public boolean a(DamageSource damagesource, float f0) {\n }\n \n public void l_() {\n- if (!this.q.I && this.bR()) {\n- int i0 = this.bT();\n+ if (!this.q.I && this.bV()) {\n+ int i0 = this.bX();\n \n this.bs -= i0;\n if (this.bs <= 0) {\n- this.bS();\n+ this.bW();\n }\n }\n \n@@ -170,7 +170,7 @@ public void l_() {\n public boolean m(Entity entity) {\n boolean flag0 = super.m(entity);\n \n- if (flag0 && this.aV() == null && this.ad() && this.ab.nextFloat() < (float) this.q.r * 0.3F) {\n+ if (flag0 && this.aY() == null && this.ae() && this.ab.nextFloat() < (float) this.q.r * 0.3F) {\n entity.d(2 * this.q.r);\n }\n \n@@ -181,11 +181,11 @@ protected String r() {\n return \"mob.zombie.say\";\n }\n \n- protected String aK() {\n+ protected String aN() {\n return \"mob.zombie.hurt\";\n }\n \n- protected String aL() {\n+ protected String aO() {\n return \"mob.zombie.death\";\n }\n \n@@ -197,7 +197,7 @@ protected int s() {\n return Item.bo.cv;\n }\n \n- public EnumCreatureAttribute aU() {\n+ public EnumCreatureAttribute aX() {\n return EnumCreatureAttribute.b;\n }\n \n@@ -216,8 +216,8 @@ protected void l(int i0) {\n }\n }\n \n- protected void bs() {\n- super.bs();\n+ protected void bw() {\n+ super.bw();\n if (this.ab.nextFloat() < (this.q.r == 3 ? 0.05F : 0.01F)) {\n int i0 = this.ab.nextInt(3);\n \n@@ -235,11 +235,11 @@ public void b(NBTTagCompound nbttagcompound) {\n nbttagcompound.a(\"IsBaby\", true);\n }\n \n- if (this.bP()) {\n+ if (this.bT()) {\n nbttagcompound.a(\"IsVillager\", true);\n }\n \n- nbttagcompound.a(\"ConversionTime\", this.bR() ? this.bs : -1);\n+ nbttagcompound.a(\"ConversionTime\", this.bV() ? this.bs : -1);\n }\n \n public void a(NBTTagCompound nbttagcompound) {\n@@ -249,7 +249,7 @@ public void a(NBTTagCompound nbttagcompound) {\n }\n \n if (nbttagcompound.n(\"IsVillager\")) {\n- this.j(true);\n+ this.i(true);\n }\n \n if (nbttagcompound.b(\"ConversionTime\") && nbttagcompound.e(\"ConversionTime\") > -1) {\n@@ -269,7 +269,7 @@ public void a(EntityLivingBase entitylivingbase) {\n entityzombie.j(entitylivingbase);\n this.q.e((Entity) entitylivingbase);\n entityzombie.a((EntityLivingData) null);\n- entityzombie.j(true);\n+ entityzombie.i(true);\n if (entitylivingbase.g_()) {\n entityzombie.a(true);\n }\n@@ -280,16 +280,28 @@ public void a(EntityLivingBase entitylivingbase) {\n }\n \n public EntityLivingData a(EntityLivingData entitylivingdata) {\n- entitylivingdata = super.a(entitylivingdata);\n+ Object object = super.a(entitylivingdata);\n float f0 = this.q.b(this.u, this.v, this.w);\n \n this.h(this.ab.nextFloat() < 0.55F * f0);\n- if (this.q.s.nextFloat() < 0.05F) {\n- this.j(true);\n+ if (object == null) {\n+ object = new EntityZombieGroupData(this, this.q.s.nextFloat() < 0.05F, this.q.s.nextFloat() < 0.05F, (EntityZombieINNER1) null);\n }\n \n- this.bs();\n- this.bt();\n+ if (object instanceof EntityZombieGroupData) {\n+ EntityZombieGroupData entityzombiegroupdata = (EntityZombieGroupData) object;\n+\n+ if (entityzombiegroupdata.b) {\n+ this.i(true);\n+ }\n+\n+ if (entityzombiegroupdata.a) {\n+ this.a(true);\n+ }\n+ }\n+\n+ this.bw();\n+ this.bx();\n if (this.n(4) == null) {\n Calendar calendar = this.q.W();\n \n@@ -306,13 +318,13 @@ public EntityLivingData a(EntityLivingData entitylivingdata) {\n this.a(SharedMonsterAttributes.a).a(new AttributeModifier(\"Leader zombie bonus\", this.ab.nextDouble() * 3.0D + 1.0D, 2));\n }\n \n- return entitylivingdata;\n+ return (EntityLivingData) object;\n }\n \n public boolean a(EntityPlayer entityplayer) {\n- ItemStack itemstack = entityplayer.bt();\n+ ItemStack itemstack = entityplayer.bx();\n \n- if (itemstack != null && itemstack.b() == Item.av && itemstack.k() == 0 && this.bP() && this.a(Potion.t)) {\n+ if (itemstack != null && itemstack.b() == Item.av && itemstack.k() == 0 && this.bT() && this.a(Potion.t)) {\n if (!entityplayer.bG.d) {\n --itemstack.b;\n }\n@@ -331,39 +343,39 @@ public boolean a(EntityPlayer entityplayer) {\n }\n }\n \n- public void a(int i0) { // CanaryMod: protected => public\n+ protected void a(int i0) {\n this.bs = i0;\n this.u().b(14, Byte.valueOf((byte) 1));\n this.k(Potion.t.H);\n- this.d(new PotionEffect(Potion.g.H, i0, Math.min(this.q.r - 1, 0)));\n+ this.c(new PotionEffect(Potion.g.H, i0, Math.min(this.q.r - 1, 0)));\n this.q.a((Entity) this, (byte) 16);\n }\n \n protected boolean t() {\n- return !this.bR();\n+ return !this.bV();\n }\n \n- public boolean bR() {\n+ public boolean bV() {\n return this.u().a(14) == 1;\n }\n \n- public void bS() { // CanaryMod: protected => public\n+ public void bW() { // CanaryMod: protected => public\n EntityVillager entityvillager = new EntityVillager(this.q);\n \n entityvillager.j(this);\n entityvillager.a((EntityLivingData) null);\n- entityvillager.bT();\n+ entityvillager.bX();\n if (this.g_()) {\n entityvillager.c(-24000);\n }\n \n this.q.e((Entity) this);\n this.q.d((Entity) entityvillager);\n- entityvillager.d(new PotionEffect(Potion.k.H, 200, 0));\n+ entityvillager.c(new PotionEffect(Potion.k.H, 200, 0));\n this.q.a((EntityPlayer) null, 1017, (int) this.u, (int) this.v, (int) this.w, 0);\n }\n \n- protected int bT() {\n+ protected int bX() {\n int i0 = 1;\n \n if (this.ab.nextFloat() < 0.01F) {", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityZombie.java", "sha": "7a578c42957ec52504f6ffa04d2fe25bb21ff8f4", "status": "modified" }, { "additions": 3, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FFoodStats.java", "changes": 6, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FFoodStats.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 3, "filename": "src/main/java/net/minecraft/server/FoodStats.java", "new_code": " if (entityplayer.q.O().b(\"naturalRegeneration\") && this.a >= 18 && entityplayer.bI()) {\n if (entityplayer.aM() > 10.0F || i0 >= 3 || entityplayer.aM() > 1.0F && i0 >= 2) {\n DamageHook dmg = (DamageHook) new DamageHook(null, entityplayer.getCanaryEntity(), new CanaryDamageSource(DamageSource.f), 1.0F).call();", "new_methods": [], "old_code": " if (entityplayer.q.O().b(\"naturalRegeneration\") && this.a >= 18 && entityplayer.bE()) {\n if (entityplayer.aJ() > 10.0F || i0 >= 3 || entityplayer.aJ() > 1.0F && i0 >= 2) {\n DamageHook dmg = (DamageHook) new DamageHook(null, entityplayer.getCanaryEntity(), new CanaryDamageSource(DamageSource.f), 1).call();", "old_methods": [], "patch": "@@ -58,7 +58,7 @@ public void a(EntityPlayer entityplayer) {\n }\n }\n \n- if (entityplayer.q.O().b(\"naturalRegeneration\") && this.a >= 18 && entityplayer.bE()) {\n+ if (entityplayer.q.O().b(\"naturalRegeneration\") && this.a >= 18 && entityplayer.bI()) {\n ++this.d;\n if (this.d >= 80) {\n entityplayer.f(1.0F);\n@@ -68,9 +68,9 @@ public void a(EntityPlayer entityplayer) {\n } else if (this.a <= 0) {\n ++this.d;\n if (this.d >= 80) {\n- if (entityplayer.aJ() > 10.0F || i0 >= 3 || entityplayer.aJ() > 1.0F && i0 >= 2) {\n+ if (entityplayer.aM() > 10.0F || i0 >= 3 || entityplayer.aM() > 1.0F && i0 >= 2) {\n // CanaryMod: DamageHook (starve)\n- DamageHook dmg = (DamageHook) new DamageHook(null, entityplayer.getCanaryEntity(), new CanaryDamageSource(DamageSource.f), 1).call();\n+ DamageHook dmg = (DamageHook) new DamageHook(null, entityplayer.getCanaryEntity(), new CanaryDamageSource(DamageSource.f), 1.0F).call();\n if (!dmg.isCanceled()) {\n entityplayer.a((((CanaryDamageSource) dmg.getDamageSource()).getHandle()), dmg.getDamageDealt());\n }", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FFoodStats.java", "sha": "2d7b7f3814dfefceda950d04100da3fba19621d5", "status": "modified" }, { "additions": 0, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FInventoryCraftResult.java", "changes": 1, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FInventoryCraftResult.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 1, "filename": "src/main/java/net/minecraft/server/InventoryCraftResult.java", "new_code": "", "new_methods": [], "old_code": "", "old_methods": [], "patch": "@@ -1,6 +1,5 @@\n package net.minecraft.server;\n \n-\n public class InventoryCraftResult implements IInventory {\n \n public ItemStack[] a = new ItemStack[1]; // CanaryMod: private -> public", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FInventoryCraftResult.java", "sha": "3989e313980236c142dc7414ccfd683c53d7fe25", "status": "modified" }, { "additions": 0, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FInventoryCrafting.java", "changes": 1, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FInventoryCrafting.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 1, "filename": "src/main/java/net/minecraft/server/InventoryCrafting.java", "new_code": "", "new_methods": [], "old_code": "", "old_methods": [], "patch": "@@ -1,6 +1,5 @@\n package net.minecraft.server;\n \n-\n public class InventoryCrafting implements IInventory {\n \n public ItemStack[] a; // CanaryMod: private -> public", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FInventoryCrafting.java", "sha": "51e2b05785ce90add3dc06a239906079af694018", "status": "modified" }, { "additions": 0, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FInventoryLargeChest.java", "changes": 1, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FInventoryLargeChest.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 1, "filename": "src/main/java/net/minecraft/server/InventoryLargeChest.java", "new_code": "", "new_methods": [], "old_code": "", "old_methods": [], "patch": "@@ -1,6 +1,5 @@\n package net.minecraft.server;\n \n-\n public class InventoryLargeChest implements IInventory {\n \n private String a;", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FInventoryLargeChest.java", "sha": "22736828a424534ed3bff6e210702545321d960c", "status": "modified" }, { "additions": 0, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FInventoryMerchant.java", "changes": 1, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FInventoryMerchant.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 1, "filename": "src/main/java/net/minecraft/server/InventoryMerchant.java", "new_code": "", "new_methods": [], "old_code": "", "old_methods": [], "patch": "@@ -1,6 +1,5 @@\n package net.minecraft.server;\n \n-\n public class InventoryMerchant implements IInventory {\n \n private final IMerchant a;", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FInventoryMerchant.java", "sha": "a82d502077ac78dd658042de461c15d5b2eb9dd0", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FItemBucketMilk.java", "changes": 2, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FItemBucketMilk.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 1, "filename": "src/main/java/net/minecraft/server/ItemBucketMilk.java", "new_code": " entityplayer.aJ();", "new_methods": [], "old_code": " entityplayer.aG();", "old_methods": [], "patch": "@@ -25,7 +25,7 @@ public ItemStack b(ItemStack itemstack, World world, EntityPlayer entityplayer)\n }\n \n if (!world.I) {\n- entityplayer.aG();\n+ entityplayer.aJ();\n }\n \n return itemstack.b <= 0 ? new ItemStack(Item.ay) : itemstack;", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FItemBucketMilk.java", "sha": "9dd9796b8c108a955bbf6b84dda5f70e99416505", "status": "modified" }, { "additions": 3, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FItemFood.java", "changes": 6, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FItemFood.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 3, "filename": "src/main/java/net/minecraft/server/ItemFood.java", "new_code": " entityplayer.bH().a(hook.getLevelGain(), hook.getSaturationGain());\n entityplayer.c(((CanaryPotionEffect) effect).getHandle());\n entityplayer.c(new PotionEffect(this.cC, this.cD * 20, this.cE));", "new_methods": [], "old_code": " entityplayer.bD().a(hook.getLevelGain(), hook.getSaturationGain());\n entityplayer.d(((CanaryPotionEffect) effect).getHandle());\n entityplayer.d(new PotionEffect(this.cC, this.cD * 20, this.cE));", "old_methods": [], "patch": "@@ -47,13 +47,13 @@ public ItemStack b(ItemStack itemstack, World world, EntityPlayer entityplayer)\n EatHook hook = (EatHook) new EatHook(((EntityPlayerMP) entityplayer).getPlayer(), itemstack.getCanaryItem(), this.g(), this.i(), effects).call();\n if (!hook.isCanceled()) {\n --itemstack.b;\n- entityplayer.bD().a(hook.getLevelGain(), hook.getSaturationGain());\n+ entityplayer.bH().a(hook.getLevelGain(), hook.getSaturationGain());\n world.a((Entity) entityplayer, \"random.burp\", 0.5F, world.s.nextFloat() * 0.1F + 0.9F);\n // this.c(itemstack, world, entityplayer); moved above and below\n if (hook.getPotionEffects() != null) {\n for (net.canarymod.api.potion.PotionEffect effect : hook.getPotionEffects()) {\n if (effect != null) {\n- entityplayer.d(((CanaryPotionEffect) effect).getHandle());\n+ entityplayer.c(((CanaryPotionEffect) effect).getHandle());\n }\n }\n }\n@@ -64,7 +64,7 @@ public ItemStack b(ItemStack itemstack, World world, EntityPlayer entityplayer)\n \n protected void c(ItemStack itemstack, World world, EntityPlayer entityplayer) {\n if (!world.I && this.cC > 0 && world.s.nextFloat() < this.cF) {\n- entityplayer.d(new PotionEffect(this.cC, this.cD * 20, this.cE));\n+ entityplayer.c(new PotionEffect(this.cC, this.cD * 20, this.cE));\n }\n }\n ", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FItemFood.java", "sha": "1ee10e17bdaa7aa08b949aea75f47b303dbb64ef", "status": "modified" }, { "additions": 5, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FItemInWorldManager.java", "changes": 10, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FItemInWorldManager.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 5, "filename": "src/main/java/net/minecraft/server/ItemInWorldManager.java", "new_code": " } else if (this.c.d() && this.b.aY() != null && this.b.aY().b() instanceof ItemSword) {\n ItemStack itemstack = this.b.bx();\n this.b.by();\n if (!entityplayer.bq()) {\n if (!entityplayer.ag() || entityplayer.aY() == null) {", "new_methods": [], "old_code": " } else if (this.c.d() && this.b.aV() != null && this.b.aV().b() instanceof ItemSword) {\n ItemStack itemstack = this.b.bt();\n this.b.bu();\n if (!entityplayer.bm()) {\n if (!entityplayer.af() || entityplayer.aV() == null) {", "old_methods": [], "patch": "@@ -182,7 +182,7 @@ private boolean d(int i0, int i1, int i2) {\n public boolean b(int i0, int i1, int i2) {\n if (this.c.c() && !this.b.d(i0, i1, i2)) {\n return false;\n- } else if (this.c.d() && this.b.aV() != null && this.b.aV().b() instanceof ItemSword) {\n+ } else if (this.c.d() && this.b.aY() != null && this.b.aY().b() instanceof ItemSword) {\n return false;\n } else {\n // CanaryMod: BlockDestroyHook\n@@ -204,13 +204,13 @@ public boolean b(int i0, int i1, int i2) {\n if (this.d()) {\n this.b.a.b(new Packet53BlockChange(i0, i1, i2, this.a));\n } else {\n- ItemStack itemstack = this.b.bt();\n+ ItemStack itemstack = this.b.bx();\n boolean flag1 = this.b.a(Block.s[i3]);\n \n if (itemstack != null) {\n itemstack.a(this.a, i3, i0, i1, i2, this.b);\n if (itemstack.b == 0) {\n- this.b.bu();\n+ this.b.by();\n }\n }\n \n@@ -254,7 +254,7 @@ public boolean a(EntityPlayer entityplayer, World world, ItemStack itemstack) {\n entityplayer.bn.a[entityplayer.bn.c] = null;\n }\n \n- if (!entityplayer.bm()) {\n+ if (!entityplayer.bq()) {\n ((EntityPlayerMP) entityplayer).a(entityplayer.bo);\n }\n \n@@ -265,7 +265,7 @@ public boolean a(EntityPlayer entityplayer, World world, ItemStack itemstack) {\n public boolean a(EntityPlayer entityplayer, World world, ItemStack itemstack, int i0, int i1, int i2, int i3, float f0, float f1, float f2) {\n int i4;\n \n- if (!entityplayer.af() || entityplayer.aV() == null) {\n+ if (!entityplayer.ag() || entityplayer.aY() == null) {\n i4 = world.a(i0, i1, i2);\n if (i4 > 0 && Block.s[i4].a(world, i0, i1, i2, entityplayer, i3, f0, f1, f2)) {\n return true;", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FItemInWorldManager.java", "sha": "d5174e04b6c58707939f46b5c6cdb96a6b910527", "status": "modified" }, { "additions": 3, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FItemPotion.java", "changes": 6, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FItemPotion.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 3, "filename": "src/main/java/net/minecraft/server/ItemPotion.java", "new_code": " // entityplayer.c(new PotionEffect(potioneffect));\n entityplayer.bH().a(hook.getLevelGain(), hook.getSaturationGain());\n entityplayer.c(((CanaryPotionEffect) effect).getHandle());", "new_methods": [], "old_code": " // entityplayer.d(new PotionEffect(potioneffect));\n entityplayer.bD().a(hook.getLevelGain(), hook.getSaturationGain());\n entityplayer.d(((CanaryPotionEffect) effect).getHandle());", "old_methods": [], "patch": "@@ -73,7 +73,7 @@ public ItemStack b(ItemStack itemstack, World world, EntityPlayer entityplayer)\n while (iterator.hasNext()) {\n PotionEffect potioneffect = (PotionEffect) iterator.next();\n \n- // entityplayer.d(new PotionEffect(potioneffect));\n+ // entityplayer.c(new PotionEffect(potioneffect));\n // add to the array first\n effects[index] = new CanaryPotionEffect(potioneffect);\n index++;\n@@ -88,12 +88,12 @@ public ItemStack b(ItemStack itemstack, World world, EntityPlayer entityplayer)\n return itemstack;\n }\n // Apply food changes\n- entityplayer.bD().a(hook.getLevelGain(), hook.getSaturationGain());\n+ entityplayer.bH().a(hook.getLevelGain(), hook.getSaturationGain());\n // And finally add the effects\n if (hook.getPotionEffects() != null) {\n for (net.canarymod.api.potion.PotionEffect effect : hook.getPotionEffects()) {\n if (effect != null) {\n- entityplayer.d(((CanaryPotionEffect) effect).getHandle());\n+ entityplayer.c(((CanaryPotionEffect) effect).getHandle());\n }\n }\n }", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FItemPotion.java", "sha": "30cbd44078343d61e60f59e04b86633f950a3ef7", "status": "modified" }, { "additions": 2, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FItemSign.java", "changes": 4, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FItemSign.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 2, "filename": "src/main/java/net/minecraft/server/ItemSign.java", "new_code": " world.f(i0, i1, i2, Block.aI.cF, i4, 3);\n world.f(i0, i1, i2, Block.aN.cF, i3, 3);", "new_methods": [], "old_code": " world.f(i0, i1, i2, Block.aI.cF, i4, 2);\n world.f(i0, i1, i2, Block.aN.cF, i3, 2);", "old_methods": [], "patch": "@@ -59,9 +59,9 @@ public boolean a(ItemStack itemstack, EntityPlayer entityplayer, World world, in\n if (i3 == 1) {\n int i4 = MathHelper.c((double) ((entityplayer.A + 180.0F) * 16.0F / 360.0F) + 0.5D) & 15;\n \n- world.f(i0, i1, i2, Block.aI.cF, i4, 2);\n+ world.f(i0, i1, i2, Block.aI.cF, i4, 3);\n } else {\n- world.f(i0, i1, i2, Block.aN.cF, i3, 2);\n+ world.f(i0, i1, i2, Block.aN.cF, i3, 3);\n }\n \n --itemstack.b;", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FItemSign.java", "sha": "427faae1c882d824772f86dcb97d288b6fe1367f", "status": "modified" }, { "additions": 2, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FItemStack.java", "changes": 4, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FItemStack.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 2, "filename": "src/main/java/net/minecraft/server/ItemStack.java", "new_code": " if (this.a(i0, entitylivingbase.aC())) {\n entityplayer.by();", "new_methods": [], "old_code": " if (this.a(i0, entitylivingbase.aB())) {\n entityplayer.bu();", "old_methods": [], "patch": "@@ -187,15 +187,15 @@ public boolean a(int i0, Random random) {\n public void a(int i0, EntityLivingBase entitylivingbase) {\n if (!(entitylivingbase instanceof EntityPlayer) || !((EntityPlayer) entitylivingbase).bG.d) {\n if (this.g()) {\n- if (this.a(i0, entitylivingbase.aB())) {\n+ if (this.a(i0, entitylivingbase.aC())) {\n entitylivingbase.a(this);\n --this.b;\n if (entitylivingbase instanceof EntityPlayer) {\n EntityPlayer entityplayer = (EntityPlayer) entitylivingbase;\n \n entityplayer.a(StatList.F[this.d], 1);\n if (this.b == 0 && this.b() instanceof ItemBow) {\n- entityplayer.bu();\n+ entityplayer.by();\n }\n }\n ", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FItemStack.java", "sha": "357f687abdfd81a43a159e325aae47207f4222e5", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FMerchantRecipe.java", "changes": 2, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FMerchantRecipe.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 1, "filename": "src/main/java/net/minecraft/server/MerchantRecipe.java", "new_code": " return this.a.d == merchantrecipe.a.d && this.c.d == merchantrecipe.c.d ? this.b == null && merchantrecipe.b == null || this.b != null && merchantrecipe.b != null && this.b.d == merchantrecipe.b.d : false;", "new_methods": [], "old_code": " return this.a.c == merchantrecipe.a.c && this.c.c == merchantrecipe.c.c ? this.b == null && merchantrecipe.b == null || this.b != null && merchantrecipe.b != null && this.b.c == merchantrecipe.b.c : false;", "old_methods": [], "patch": "@@ -46,7 +46,7 @@ public ItemStack d() {\n }\n \n public boolean a(MerchantRecipe merchantrecipe) {\n- return this.a.c == merchantrecipe.a.c && this.c.c == merchantrecipe.c.c ? this.b == null && merchantrecipe.b == null || this.b != null && merchantrecipe.b != null && this.b.c == merchantrecipe.b.c : false;\n+ return this.a.d == merchantrecipe.a.d && this.c.d == merchantrecipe.c.d ? this.b == null && merchantrecipe.b == null || this.b != null && merchantrecipe.b != null && this.b.d == merchantrecipe.b.d : false;\n }\n \n public boolean b(MerchantRecipe merchantrecipe) {", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FMerchantRecipe.java", "sha": "18d0e7ba1d5d5f6efe0b8c036c80fbfe8f2288c0", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FMinecraftServer.java", "changes": 2, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FMinecraftServer.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 1, "filename": "src/main/java/net/minecraft/server/MinecraftServer.java", "new_code": " return \"1.6.2\";", "new_methods": [], "old_code": " return \"1.6.1\";", "old_methods": [], "patch": "@@ -652,7 +652,7 @@ public String y() {\n }\n \n public String z() {\n- return \"1.6.1\";\n+ return \"1.6.2\";\n }\n \n public int A() {", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FMinecraftServer.java", "sha": "db1000bf9b1baf33ad16f261e24bb1b05f9c5dbe", "status": "modified" }, { "additions": 2, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FMobSpawnerBaseLogic.java", "changes": 5, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FMobSpawnerBaseLogic.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 3, "filename": "src/main/java/net/minecraft/server/MobSpawnerBaseLogic.java", "new_code": "\n if (entityliving == null || entityliving.bs()) {", "new_methods": [], "old_code": "\n\n if (entityliving == null || entityliving.bo()) {", "old_methods": [], "patch": "@@ -1,14 +1,12 @@\n package net.minecraft.server;\n \n-\n import java.util.ArrayList;\n import java.util.Collection;\n import java.util.Iterator;\n import java.util.List;\n import net.canarymod.api.CanaryMobSpawnerLogic;\n import net.canarymod.api.MobSpawnerLogic;\n \n-\n public abstract class MobSpawnerBaseLogic {\n \n public int b = 20;\n@@ -27,6 +25,7 @@ public abstract class MobSpawnerBaseLogic {\n \n // CanaryMod: Variable Declaration\n public MobSpawnerLogic logic = (MobSpawnerLogic) new CanaryMobSpawnerLogic(this);\n+\n // CanaryMod: End\n \n public MobSpawnerBaseLogic() {}\n@@ -100,7 +99,7 @@ public void g() {\n EntityLiving entityliving = entity instanceof EntityLiving ? (EntityLiving) entity : null;\n \n entity.b(d0, d3, d4, this.a().s.nextFloat() * 360.0F, 0.0F);\n- if (entityliving == null || entityliving.bo()) {\n+ if (entityliving == null || entityliving.bs()) {\n this.a(entity);\n this.a().e(2004, this.b(), this.c(), this.d(), 0);\n if (entityliving != null) {", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FMobSpawnerBaseLogic.java", "sha": "00750d227b15489369542f8d92d90767683a5853", "status": "modified" }, { "additions": 0, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FNBTTagList.java", "changes": 2, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FNBTTagList.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 2, "filename": "src/main/java/net/minecraft/server/NBTTagList.java", "new_code": "", "new_methods": [], "old_code": "\n", "old_methods": [], "patch": "@@ -1,14 +1,12 @@\n package net.minecraft.server;\n \n-\n import java.io.DataInput;\n import java.io.DataOutput;\n import java.io.IOException;\n import java.util.ArrayList;\n import java.util.Iterator;\n import java.util.List;\n \n-\n public class NBTTagList extends NBTBase {\n \n public List a = new ArrayList(); // CanaryMod: private -> public", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FNBTTagList.java", "sha": "3a2c934c53e1750567b206e1f00134280336e3c5", "status": "modified" }, { "additions": 12, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FNetLoginHandler.java", "changes": 20, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FNetLoginHandler.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 8, "filename": "src/main/java/net/minecraft/server/NetLoginHandler.java", "new_code": " public void d() {\n this.e();\n this.e.an().a(\"Disconnecting \" + this.f() + \": \" + s0);\n if (packet2clientprotocol.d() != 74) {\n if (packet2clientprotocol.d() > 74) {\n public void e() {\n this.e.an().a(this.f() + \" lost connection\");\n public String f() {\n public boolean c() {\n return this.b;\n }\n", "new_methods": [ { "arguments": [], "filename": "src/main/java/net/minecraft/server/NetLoginHandler.java", "implementation": "this.e();\n this.e.an().a(\"Disconnecting \" + this.f() + \": \" + s0);\n if (packet2clientprotocol.d() != 74) {\n if (packet2clientprotocol.d() > 74) {\n public void e() {\n this.e.an().a(this.f() + \" lost connection\");\n public String f() {\n public boolean c() {\n return this.b;", "signature": "void d()" } ], "old_code": " public void c() {\n this.d();\n this.e.an().a(\"Disconnecting \" + this.e() + \": \" + s0);\n if (packet2clientprotocol.d() != 73) {\n if (packet2clientprotocol.d() > 73) {\n public void d() {\n this.e.an().a(this.e() + \" lost connection\");\n public String e() {", "old_methods": [], "patch": "@@ -33,9 +33,9 @@ public NetLoginHandler(MinecraftServer minecraftserver, Socket socket, String s0\n this.a.e = 0;\n }\n \n- public void c() {\n+ public void d() {\n if (this.h) {\n- this.d();\n+ this.e();\n }\n \n if (this.f++ == 600) {\n@@ -47,7 +47,7 @@ public void c() {\n \n public void a(String s0) {\n try {\n- this.e.an().a(\"Disconnecting \" + this.e() + \": \" + s0);\n+ this.e.an().a(\"Disconnecting \" + this.f() + \": \" + s0);\n this.a.a((Packet) (new Packet255KickDisconnect(s0)));\n this.a.d();\n this.b = true;\n@@ -63,8 +63,8 @@ public void a(Packet2ClientProtocol packet2clientprotocol) {\n } else {\n PublicKey publickey = this.e.H().getPublic();\n \n- if (packet2clientprotocol.d() != 73) {\n- if (packet2clientprotocol.d() > 73) {\n+ if (packet2clientprotocol.d() != 74) {\n+ if (packet2clientprotocol.d() > 74) {\n this.a(\"Outdated server!\");\n } else {\n this.a(\"Outdated client!\");\n@@ -107,7 +107,7 @@ public void a(Packet205ClientCommand packet205clientcommand) {\n \n public void a(Packet1Login packet1login) {}\n \n- public void d() {\n+ public void e() {\n String s0 = this.e.af().a(this.a.c(), this.g);\n \n if (s0 != null) {\n@@ -124,7 +124,7 @@ public void d() {\n }\n \n public void a(String s0, Object[] aobject) {\n- this.e.an().a(this.e() + \" lost connection\");\n+ this.e.an().a(this.f() + \" lost connection\");\n this.b = true;\n }\n \n@@ -177,14 +177,18 @@ public void a(Packet packet) {\n this.a(\"Protocol error\");\n }\n \n- public String e() {\n+ public String f() {\n return this.g != null ? this.g + \" [\" + this.a.c().toString() + \"]\" : this.a.c().toString();\n }\n \n public boolean a() {\n return true;\n }\n \n+ public boolean c() {\n+ return this.b;\n+ }\n+\n static String a(NetLoginHandler netloginhandler) {\n return netloginhandler.i;\n }", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FNetLoginHandler.java", "sha": "e057bd03060d80334bca973c2ed5bdd717c9a732", "status": "modified" }, { "additions": 39, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FNetServerHandler.java", "changes": 93, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FNetServerHandler.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 54, "filename": "src/main/java/net/minecraft/server/NetServerHandler.java", "new_code": " public void e() {\n this.c.o.V();\n this.c.X = 0.0F;\n this.c.o.V();\n if (this.c.bg()) {\n double d4;\n\n if (!this.c.bg() && (d4 > 1.65D || d4 < 0.1D)) {\n double d5 = d2 - this.c.v;\n double d6 = d3 - this.c.w;\n double d7 = Math.min(Math.abs(d4), Math.abs(this.c.x));\n double d8 = Math.min(Math.abs(d5), Math.abs(this.c.y));\n double d9 = Math.min(Math.abs(d6), Math.abs(this.c.z));\n double d10 = d7 * d7 + d8 * d8 + d9 * d9;\n\n if (d10 > 100.0D && (!this.d.K() || !this.d.J().equals(this.c.c_()))) {\n this.d.an().b(this.c.c_() + \" moved too quickly! \" + d4 + \",\" + d5 + \",\" + d6 + \" (\" + d7 + \", \" + d8 + \", \" + d9 + \")\");\n if (this.c.F && !packet10flying.g && d5 > 0.0D) {\n this.c.d(d4, d5, d6);\n this.c.j(d4, d5, d6);\n double d11 = d5;\n d5 = d2 - this.c.v;\n if (d5 > -0.5D || d5 < 0.5D) {\n d5 = 0.0D;\n d6 = d3 - this.c.w;\n d10 = d4 * d4 + d5 * d5 + d6 * d6;\n if (d10 > 0.0625D && !this.c.bg() && !this.c.c.d()) {\n if (flag0 && (flag1 || !flag2) && !this.c.bg()) {\n if (d11 >= -0.03125D) {\n this.c.bs();\n ChatMessageComponent chatmessagecomponent = ChatMessageComponent.b(\"chat.type.text\", new Object[] { this.c.ax(), s0});\n this.c.aU();\n public int f() {\n if (this.c.aM() > 0.0F) {\n if (!tileentitysign.a() || tileentitysign.b() != this.c) {\n public boolean c() {\n return this.b;\n }\n", "new_methods": [ { "arguments": [], "filename": "src/main/java/net/minecraft/server/NetServerHandler.java", "implementation": "this.c.o.V();\n this.c.X = 0.0F;\n this.c.o.V();\n if (this.c.bg()) {\n double d4;\n\n if (!this.c.bg() && (d4 > 1.65D || d4 < 0.1D)) {\n double d5 = d2 - this.c.v;\n double d6 = d3 - this.c.w;\n double d7 = Math.min(Math.abs(d4), Math.abs(this.c.x));\n double d8 = Math.min(Math.abs(d5), Math.abs(this.c.y));\n double d9 = Math.min(Math.abs(d6), Math.abs(this.c.z));\n double d10 = d7 * d7 + d8 * d8 + d9 * d9;\n\n if (d10 > 100.0D && (!this.d.K() || !this.d.J().equals(this.c.c_()))) {\n this.d.an().b(this.c.c_() + \" moved too quickly! \" + d4 + \",\" + d5 + \",\" + d6 + \" (\" + d7 + \", \" + d8 + \", \" + d9 + \")\");\n if (this.c.F && !packet10flying.g && d5 > 0.0D) {\n this.c.d(d4, d5, d6);\n this.c.j(d4, d5, d6);\n double d11 = d5;\n d5 = d2 - this.c.v;\n if (d5 > -0.5D || d5 < 0.5D) {\n d5 = 0.0D;\n d6 = d3 - this.c.w;\n d10 = d4 * d4 + d5 * d5 + d6 * d6;\n if (d10 > 0.0625D && !this.c.bg() && !this.c.c.d()) {\n if (flag0 && (flag1 || !flag2) && !this.c.bg()) {\n if (d11 >= -0.03125D) {\n this.c.bs();\n ChatMessageComponent chatmessagecomponent = ChatMessageComponent.b(\"chat.type.text\", new Object[] { this.c.ax(), s0", "signature": "void e()" }, { "arguments": [], "filename": "src/main/java/net/minecraft/server/NetServerHandler.java", "implementation": "if (this.c.aM() > 0.0F) {\n if (!tileentitysign.a() || tileentitysign.b() != this.c) {\n public boolean c() {\n return this.b;", "signature": "int f()" } ], "old_code": " public void d() {\n double d4;\n this.c.o.U();\n double d5 = 0.0D;\n\n d4 = 0.0D;\n if (packet10flying.h && packet10flying.b == -999.0D && packet10flying.d == -999.0D) {\n if (Math.abs(packet10flying.a) > 1.0D || Math.abs(packet10flying.c) > 1.0D) {\n System.err.println(this.c.c_() + \" was caught trying to crash the server with an invalid position.\");\n this.c(\"Nope!\");\n return;\n }\n\n d5 = packet10flying.a;\n d4 = packet10flying.c;\n }\n\n this.c.d(d5, 0.0D, d4);\n this.c.x = d5;\n this.c.z = d4;\n worldserver.b(this.c.o, true);\n }\n\n if (this.c.o != null) {\n this.c.o.U();\n if (this.c.bd()) {\n if (!this.c.bd() && (d4 > 1.65D || d4 < 0.1D)) {\n double d6 = d2 - this.c.v;\n double d7 = d3 - this.c.w;\n double d8 = Math.min(Math.abs(d4), Math.abs(this.c.x));\n double d9 = Math.min(Math.abs(d6), Math.abs(this.c.y));\n double d10 = Math.min(Math.abs(d7), Math.abs(this.c.z));\n double d11 = d8 * d8 + d9 * d9 + d10 * d10;\n\n if (d11 > 100.0D && (!this.d.K() || !this.d.J().equals(this.c.c_()))) {\n this.d.an().b(this.c.c_() + \" moved too quickly! \" + d4 + \",\" + d6 + \",\" + d7 + \" (\" + d8 + \", \" + d9 + \", \" + d10 + \")\");\n if (this.c.F && !packet10flying.g && d6 > 0.0D) {\n this.c.d(d4, d6, d7);\n this.c.j(d4, d6, d7);\n double d12 = d6;\n d6 = d2 - this.c.v;\n if (d6 > -0.5D || d6 < 0.5D) {\n d6 = 0.0D;\n d7 = d3 - this.c.w;\n d11 = d4 * d4 + d6 * d6 + d7 * d7;\n if (d11 > 0.0625D && !this.c.bd() && !this.c.c.d()) {\n if (flag0 && (flag1 || !flag2) && !this.c.bd()) {\n if (d12 >= -0.03125D) {\n this.c.bo();\n ChatMessageComponent chatmessagecomponent = ChatMessageComponent.b(\"chat.type.text\", new Object[]{ this.c.aw(), s0 });\n this.c.aR();\n public int e() {\n if (this.c.aJ() > 0.0F) {\n if (!tileentitysign.a()) {", "old_methods": [ { "arguments": [], "filename": "src/main/java/net/minecraft/server/NetServerHandler.java", "implementation": "double d4;\n this.c.o.U();\n double d5 = 0.0D;\n\n d4 = 0.0D;\n if (packet10flying.h && packet10flying.b == -999.0D && packet10flying.d == -999.0D) {\n if (Math.abs(packet10flying.a) > 1.0D || Math.abs(packet10flying.c) > 1.0D) {\n System.err.println(this.c.c_() + \" was caught trying to crash the server with an invalid position.\");\n this.c(\"Nope!\");\n return;", "signature": "void d()" } ], "patch": "@@ -69,7 +69,7 @@ public NetServerHandler(MinecraftServer minecraftserver, INetworkManager inetwor\n serverHandler = new CanaryNetServerHandler(this);\n }\n \n- public void d() {\n+ public void e() {\n this.g = false;\n ++this.e;\n this.d.a.a(\"packetflow\");\n@@ -150,47 +150,26 @@ public void a(Packet10Flying packet10flying) {\n double d1;\n double d2;\n double d3;\n- double d4;\n \n if (this.c.o != null) {\n float f0 = this.c.A;\n float f1 = this.c.B;\n \n- this.c.o.U();\n+ this.c.o.V();\n d1 = this.c.u;\n d2 = this.c.v;\n d3 = this.c.w;\n- double d5 = 0.0D;\n-\n- d4 = 0.0D;\n if (packet10flying.i) {\n f0 = packet10flying.e;\n f1 = packet10flying.f;\n }\n \n- if (packet10flying.h && packet10flying.b == -999.0D && packet10flying.d == -999.0D) {\n- if (Math.abs(packet10flying.a) > 1.0D || Math.abs(packet10flying.c) > 1.0D) {\n- System.err.println(this.c.c_() + \" was caught trying to crash the server with an invalid position.\");\n- this.c(\"Nope!\");\n- return;\n- }\n-\n- d5 = packet10flying.a;\n- d4 = packet10flying.c;\n- }\n-\n this.c.F = packet10flying.g;\n this.c.h();\n- this.c.d(d5, 0.0D, d4);\n+ this.c.X = 0.0F;\n this.c.a(d1, d2, d3, f0, f1);\n- this.c.x = d5;\n- this.c.z = d4;\n if (this.c.o != null) {\n- worldserver.b(this.c.o, true);\n- }\n-\n- if (this.c.o != null) {\n- this.c.o.U();\n+ this.c.o.V();\n }\n \n this.d.af().d(this.c);\n@@ -204,7 +183,7 @@ public void a(Packet10Flying packet10flying) {\n return;\n }\n \n- if (this.c.bd()) {\n+ if (this.c.bg()) {\n this.c.h();\n this.c.a(this.n, this.o, this.p, this.c.A, this.c.B);\n worldserver.g(this.c);\n@@ -225,12 +204,14 @@ public void a(Packet10Flying packet10flying) {\n packet10flying.h = false;\n }\n \n+ double d4;\n+\n if (packet10flying.h) {\n d1 = packet10flying.a;\n d2 = packet10flying.b;\n d3 = packet10flying.c;\n d4 = packet10flying.d - packet10flying.b;\n- if (!this.c.bd() && (d4 > 1.65D || d4 < 0.1D)) {\n+ if (!this.c.bg() && (d4 > 1.65D || d4 < 0.1D)) {\n this.c(\"Illegal stance\");\n this.d.an().b(this.c.c_() + \" had an illegal stance: \" + d4);\n return;\n@@ -255,50 +236,50 @@ public void a(Packet10Flying packet10flying) {\n }\n \n d4 = d1 - this.c.u;\n- double d6 = d2 - this.c.v;\n- double d7 = d3 - this.c.w;\n- double d8 = Math.min(Math.abs(d4), Math.abs(this.c.x));\n- double d9 = Math.min(Math.abs(d6), Math.abs(this.c.y));\n- double d10 = Math.min(Math.abs(d7), Math.abs(this.c.z));\n- double d11 = d8 * d8 + d9 * d9 + d10 * d10;\n-\n- if (d11 > 100.0D && (!this.d.K() || !this.d.J().equals(this.c.c_()))) {\n- this.d.an().b(this.c.c_() + \" moved too quickly! \" + d4 + \",\" + d6 + \",\" + d7 + \" (\" + d8 + \", \" + d9 + \", \" + d10 + \")\");\n+ double d5 = d2 - this.c.v;\n+ double d6 = d3 - this.c.w;\n+ double d7 = Math.min(Math.abs(d4), Math.abs(this.c.x));\n+ double d8 = Math.min(Math.abs(d5), Math.abs(this.c.y));\n+ double d9 = Math.min(Math.abs(d6), Math.abs(this.c.z));\n+ double d10 = d7 * d7 + d8 * d8 + d9 * d9;\n+\n+ if (d10 > 100.0D && (!this.d.K() || !this.d.J().equals(this.c.c_()))) {\n+ this.d.an().b(this.c.c_() + \" moved too quickly! \" + d4 + \",\" + d5 + \",\" + d6 + \" (\" + d7 + \", \" + d8 + \", \" + d9 + \")\");\n this.a(this.n, this.o, this.p, this.c.A, this.c.B, this.c.q.getCanaryWorld().getType().getId(), this.c.q.getCanaryWorld().getName(), TeleportHook.TeleportCause.MOVEMENT);\n return;\n }\n \n float f4 = 0.0625F;\n boolean flag0 = worldserver.a(this.c, this.c.E.c().e((double) f4, (double) f4, (double) f4)).isEmpty();\n \n- if (this.c.F && !packet10flying.g && d6 > 0.0D) {\n+ if (this.c.F && !packet10flying.g && d5 > 0.0D) {\n this.c.a(0.2F);\n }\n \n- this.c.d(d4, d6, d7);\n+ this.c.d(d4, d5, d6);\n this.c.F = packet10flying.g;\n- this.c.j(d4, d6, d7);\n- double d12 = d6;\n+ this.c.j(d4, d5, d6);\n+ double d11 = d5;\n \n d4 = d1 - this.c.u;\n- d6 = d2 - this.c.v;\n- if (d6 > -0.5D || d6 < 0.5D) {\n- d6 = 0.0D;\n+ d5 = d2 - this.c.v;\n+ if (d5 > -0.5D || d5 < 0.5D) {\n+ d5 = 0.0D;\n }\n \n- d7 = d3 - this.c.w;\n- d11 = d4 * d4 + d6 * d6 + d7 * d7;\n+ d6 = d3 - this.c.w;\n+ d10 = d4 * d4 + d5 * d5 + d6 * d6;\n boolean flag1 = false;\n \n- if (d11 > 0.0625D && !this.c.bd() && !this.c.c.d()) {\n+ if (d10 > 0.0625D && !this.c.bg() && !this.c.c.d()) {\n flag1 = true;\n this.d.an().b(this.c.c_() + \" moved wrongly!\");\n }\n \n this.c.a(d1, d2, d3, f2, f3);\n boolean flag2 = worldserver.a(this.c, this.c.E.c().e((double) f4, (double) f4, (double) f4)).isEmpty();\n \n- if (flag0 && (flag1 || !flag2) && !this.c.bd()) {\n+ if (flag0 && (flag1 || !flag2) && !this.c.bg()) {\n this.a(this.n, this.o, this.p, f2, f3, c.getCanaryWorld().getType().getId(), c.getCanaryWorld().getName(), TeleportHook.TeleportCause.MOVEMENT);\n return;\n }\n@@ -308,7 +289,7 @@ public void a(Packet10Flying packet10flying) {\n // CanaryMod: check on flying capability instead of mode\n // moved allow-flight to per-world config\n if (!Configuration.getWorldConfig(c.getCanaryWorld().getFqName()).isFlightAllowed() && !this.c.bG.c && !worldserver.c(axisalignedbb)) {\n- if (d12 >= -0.03125D) {\n+ if (d11 >= -0.03125D) {\n ++this.f;\n if (this.f > 80) {\n this.d.an().b(this.c.c_() + \" was kicked for floating too long!\");\n@@ -356,7 +337,7 @@ public void a(Packet14BlockDig packet14blockdig) {\n } else if (packet14blockdig.e == 3) {\n this.c.a(true);\n } else if (packet14blockdig.e == 5) {\n- this.c.bo();\n+ this.c.bs();\n } else {\n boolean flag0 = false;\n \n@@ -598,7 +579,7 @@ public void a(Packet3Chat packet3chat) {\n return;\n }\n \n- ChatMessageComponent chatmessagecomponent = ChatMessageComponent.b(\"chat.type.text\", new Object[]{ this.c.aw(), s0 });\n+ ChatMessageComponent chatmessagecomponent = ChatMessageComponent.b(\"chat.type.text\", new Object[] { this.c.ax(), s0});\n \n this.d.af().a(chatmessagecomponent, false);\n }\n@@ -622,7 +603,7 @@ public void a(Packet18Animation packet18animation) {\n if (packet18animation.b == 1) {\n // CanaryMod: PlayerLeftClick\n new PlayerLeftClickHook(this.c.getPlayer()).call();\n- this.c.aR();\n+ this.c.aU();\n }\n }\n \n@@ -653,7 +634,7 @@ public void a(Packet255KickDisconnect packet255kickdisconnect) {\n this.a.a(\"disconnect.quitting\", new Object[0]);\n }\n \n- public int e() {\n+ public int f() {\n return this.a.e();\n }\n \n@@ -695,7 +676,7 @@ public void a(Packet205ClientCommand packet205clientcommand) {\n this.c.a.c(\"You have died. Game over, man, it\\'s game over!\");\n }\n } else {\n- if (this.c.aJ() > 0.0F) {\n+ if (this.c.aM() > 0.0F) {\n return;\n }\n \n@@ -825,7 +806,7 @@ public void a(Packet130UpdateSign packet130updatesign) {\n if (tileentity instanceof TileEntitySign) {\n TileEntitySign tileentitysign = (TileEntitySign) tileentity;\n \n- if (!tileentitysign.a()) {\n+ if (!tileentitysign.a() || tileentitysign.b() != this.c) {\n this.d.f(\"Player \" + this.c.c_() + \" just tried to change non-editable sign\");\n return;\n }\n@@ -1081,6 +1062,10 @@ public void a(Packet250CustomPayload packet250custompayload) {\n \n }\n \n+ public boolean c() {\n+ return this.b;\n+ }\n+\n /**\n * gets the CanaryNetServerHandler wrapper\n * ", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FNetServerHandler.java", "sha": "2514183a8023a6aef4990b91d0f829394d218f6d", "status": "modified" }, { "additions": 3, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FPacket.java", "changes": 6, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FPacket.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 3, "filename": "src/main/java/net/minecraft/server/Packet.java", "new_code": " public boolean s;\n eofexception.printStackTrace();\n a(133, true, false, Packet133TileEditorOpen.class);", "new_methods": [], "old_code": " public boolean s = false;\n\n", "old_methods": [], "patch": "@@ -22,7 +22,7 @@ public abstract class Packet {\n public static long p;\n public static long q;\n public static long r;\n- public boolean s = false;\n+ public boolean s;\n \n public Packet() {}\n \n@@ -82,9 +82,7 @@ public static Packet a(ILogAgent ilogagent, DataInput datainput, boolean flag0,\n boolean flag1 = false;\n Packet packet = null;\n int i0 = socket.getSoTimeout();\n-\n int i1;\n-\n try {\n i1 = datainput.readUnsignedByte();\n if (flag0 && !c.contains(Integer.valueOf(i1)) || !flag0 && !b.contains(Integer.valueOf(i1))) {\n@@ -106,6 +104,7 @@ public static Packet a(ILogAgent ilogagent, DataInput datainput, boolean flag0,\n p += (long) packet.a();\n } catch (EOFException eofexception) {\n ilogagent.c(\"Reached end of stream for \" + socket.getInetAddress());\n+ eofexception.printStackTrace();\n return null;\n }\n \n@@ -299,6 +298,7 @@ protected static void a(NBTTagCompound nbttagcompound, DataOutput dataoutput) th\n a(130, true, true, Packet130UpdateSign.class);\n a(131, true, false, Packet131MapData.class);\n a(132, true, false, Packet132TileEntityData.class);\n+ a(133, true, false, Packet133TileEditorOpen.class);\n a(200, true, false, Packet200Statistic.class);\n a(201, true, false, Packet201PlayerInfo.class);\n a(202, true, true, Packet202PlayerAbilities.class);", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FPacket.java", "sha": "bdcc929f955aff7e713fcfb1fcf907a5bc74ef22", "status": "modified" }, { "additions": 21, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FPacket63WorldParticles.java", "changes": 42, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FPacket63WorldParticles.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 21, "filename": "src/main/java/net/minecraft/server/Packet63WorldParticles.java", "new_code": " public void a(DataInput datainput) throws IOException {\n this.a = a(datainput, 64);\n this.b = datainput.readFloat();\n this.c = datainput.readFloat();\n this.d = datainput.readFloat();\n this.e = datainput.readFloat();\n this.f = datainput.readFloat();\n this.g = datainput.readFloat();\n this.h = datainput.readFloat();\n this.i = datainput.readInt();\n public void a(DataOutput dataoutput) throws IOException {\n a(this.a, dataoutput);\n dataoutput.writeFloat(this.b);\n dataoutput.writeFloat(this.c);\n dataoutput.writeFloat(this.d);\n dataoutput.writeFloat(this.e);\n dataoutput.writeFloat(this.f);\n dataoutput.writeFloat(this.g);\n dataoutput.writeFloat(this.h);\n dataoutput.writeInt(this.i);\n}", "new_methods": [], "old_code": " public void a(DataInput datainputstream) throws IOException {\n this.a = a(datainputstream, 64);\n this.b = datainputstream.readFloat();\n this.c = datainputstream.readFloat();\n this.d = datainputstream.readFloat();\n this.e = datainputstream.readFloat();\n this.f = datainputstream.readFloat();\n this.g = datainputstream.readFloat();\n this.h = datainputstream.readFloat();\n this.i = datainputstream.readInt();\n public void a(DataOutput dataoutputstream) throws IOException {\n a(this.a, dataoutputstream);\n dataoutputstream.writeFloat(this.b);\n dataoutputstream.writeFloat(this.c);\n dataoutputstream.writeFloat(this.d);\n dataoutputstream.writeFloat(this.e);\n dataoutputstream.writeFloat(this.f);\n dataoutputstream.writeFloat(this.g);\n dataoutputstream.writeFloat(this.h);\n dataoutputstream.writeInt(this.i);\n}", "old_methods": [], "patch": "@@ -32,28 +32,28 @@ public Packet63WorldParticles(Particle particle) {\n this.i = particle.quantity;\n }//\n \n- public void a(DataInput datainputstream) throws IOException {\n- this.a = a(datainputstream, 64);\n- this.b = datainputstream.readFloat();\n- this.c = datainputstream.readFloat();\n- this.d = datainputstream.readFloat();\n- this.e = datainputstream.readFloat();\n- this.f = datainputstream.readFloat();\n- this.g = datainputstream.readFloat();\n- this.h = datainputstream.readFloat();\n- this.i = datainputstream.readInt();\n+ public void a(DataInput datainput) throws IOException {\n+ this.a = a(datainput, 64);\n+ this.b = datainput.readFloat();\n+ this.c = datainput.readFloat();\n+ this.d = datainput.readFloat();\n+ this.e = datainput.readFloat();\n+ this.f = datainput.readFloat();\n+ this.g = datainput.readFloat();\n+ this.h = datainput.readFloat();\n+ this.i = datainput.readInt();\n }\n \n- public void a(DataOutput dataoutputstream) throws IOException {\n- a(this.a, dataoutputstream);\n- dataoutputstream.writeFloat(this.b);\n- dataoutputstream.writeFloat(this.c);\n- dataoutputstream.writeFloat(this.d);\n- dataoutputstream.writeFloat(this.e);\n- dataoutputstream.writeFloat(this.f);\n- dataoutputstream.writeFloat(this.g);\n- dataoutputstream.writeFloat(this.h);\n- dataoutputstream.writeInt(this.i);\n+ public void a(DataOutput dataoutput) throws IOException {\n+ a(this.a, dataoutput);\n+ dataoutput.writeFloat(this.b);\n+ dataoutput.writeFloat(this.c);\n+ dataoutput.writeFloat(this.d);\n+ dataoutput.writeFloat(this.e);\n+ dataoutput.writeFloat(this.f);\n+ dataoutput.writeFloat(this.g);\n+ dataoutput.writeFloat(this.h);\n+ dataoutput.writeInt(this.i);\n }\n \n public void a(NetHandler nethandler) {\n@@ -63,4 +63,4 @@ public void a(NetHandler nethandler) {\n public int a() {\n return 64;\n }\n-}\n\\ No newline at end of file\n+}", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FPacket63WorldParticles.java", "sha": "7b5818d8c3e542ecd03312f18ea6218cfdbda0d4", "status": "modified" }, { "additions": 0, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FPlayerInstance.java", "changes": 2, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FPlayerInstance.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 2, "filename": "src/main/java/net/minecraft/server/PlayerInstance.java", "new_code": "", "new_methods": [], "old_code": "\n", "old_methods": [], "patch": "@@ -1,10 +1,8 @@\n package net.minecraft.server;\n \n-\n import java.util.ArrayList;\n import java.util.List;\n \n-\n class PlayerInstance {\n \n private final List b;", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FPlayerInstance.java", "sha": "d119b8b8367db9af0f370fcaf8beda86ff076c29", "status": "modified" }, { "additions": 7, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FPotion.java", "changes": 14, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FPotion.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 7, "filename": "src/main/java/net/minecraft/server/Potion.java", "new_code": " if (entitylivingbase.aM() < entitylivingbase.aS()) {\n if (entitylivingbase.aM() > 1.0F) {\n ((EntityPlayer) entitylivingbase).bH().a(i0 + 1, 1.0F);\n } else if ((this.H != h.H || entitylivingbase.aL()) && (this.H != i.H || !entitylivingbase.aL())) {\n if (this.H == i.H && !entitylivingbase.aL() || this.H == h.H && entitylivingbase.aL()) {\n if ((this.H != h.H || entitylivingbase1.aL()) && (this.H != i.H || !entitylivingbase1.aL())) {\n if (this.H == i.H && !entitylivingbase1.aL() || this.H == h.H && entitylivingbase1.aL()) {", "new_methods": [], "old_code": " if (entitylivingbase.aJ() < entitylivingbase.aP()) {\n if (entitylivingbase.aJ() > 1.0F) {\n ((EntityPlayer) entitylivingbase).bD().a(i0 + 1, 1.0F);\n } else if ((this.H != h.H || entitylivingbase.aI()) && (this.H != i.H || !entitylivingbase.aI())) {\n if (this.H == i.H && !entitylivingbase.aI() || this.H == h.H && entitylivingbase.aI()) {\n if ((this.H != h.H || entitylivingbase1.aI()) && (this.H != i.H || !entitylivingbase1.aI())) {\n if (this.H == i.H && !entitylivingbase1.aI() || this.H == h.H && entitylivingbase1.aI()) {", "old_methods": [], "patch": "@@ -80,11 +80,11 @@ public int c() {\n \n public void a(EntityLivingBase entitylivingbase, int i0) {\n if (this.H == l.H) {\n- if (entitylivingbase.aJ() < entitylivingbase.aP()) {\n+ if (entitylivingbase.aM() < entitylivingbase.aS()) {\n entitylivingbase.f(1.0F);\n }\n } else if (this.H == u.H) {\n- if (entitylivingbase.aJ() > 1.0F) {\n+ if (entitylivingbase.aM() > 1.0F) {\n entitylivingbase.a(DamageSource.k, 1.0F);\n }\n } else if (this.H == v.H) {\n@@ -93,10 +93,10 @@ public void a(EntityLivingBase entitylivingbase, int i0) {\n ((EntityPlayer) entitylivingbase).a(0.025F * (float) (i0 + 1));\n } else if (this.H == y.H && entitylivingbase instanceof EntityPlayer) {\n if (!entitylivingbase.q.I) {\n- ((EntityPlayer) entitylivingbase).bD().a(i0 + 1, 1.0F);\n+ ((EntityPlayer) entitylivingbase).bH().a(i0 + 1, 1.0F);\n }\n- } else if ((this.H != h.H || entitylivingbase.aI()) && (this.H != i.H || !entitylivingbase.aI())) {\n- if (this.H == i.H && !entitylivingbase.aI() || this.H == h.H && entitylivingbase.aI()) {\n+ } else if ((this.H != h.H || entitylivingbase.aL()) && (this.H != i.H || !entitylivingbase.aL())) {\n+ if (this.H == i.H && !entitylivingbase.aL() || this.H == h.H && entitylivingbase.aL()) {\n entitylivingbase.a(DamageSource.k, (float) (6 << i0));\n }\n } else {\n@@ -114,8 +114,8 @@ public void a(EntityLivingBase entitylivingbase, EntityLivingBase entitylivingba\n //\n int i1;\n \n- if ((this.H != h.H || entitylivingbase1.aI()) && (this.H != i.H || !entitylivingbase1.aI())) {\n- if (this.H == i.H && !entitylivingbase1.aI() || this.H == h.H && entitylivingbase1.aI()) {\n+ if ((this.H != h.H || entitylivingbase1.aL()) && (this.H != i.H || !entitylivingbase1.aL())) {\n+ if (this.H == i.H && !entitylivingbase1.aL() || this.H == h.H && entitylivingbase1.aL()) {\n i1 = (int) (d0 * (double) (6 << i0) + 0.5D);\n if (entitylivingbase == null) {\n entitylivingbase1.a(DamageSource.k, (float) i1);", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FPotion.java", "sha": "f743fda33fc006c2ebe362ccbaa60a84e7f2a71a", "status": "modified" }, { "additions": 0, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FPotionEffect.java", "changes": 1, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FPotionEffect.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 1, "filename": "src/main/java/net/minecraft/server/PotionEffect.java", "new_code": "", "new_methods": [], "old_code": "", "old_methods": [], "patch": "@@ -1,6 +1,5 @@\n package net.minecraft.server;\n \n-\n public class PotionEffect {\n \n private int a;", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FPotionEffect.java", "sha": "ee40ae8c24e6f84378247ba42f5de1af60ea0725", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FSaveFormatOld.java", "changes": 3, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FSaveFormatOld.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 2, "filename": "src/main/java/net/minecraft/server/SaveFormatOld.java", "new_code": "", "new_methods": [], "old_code": "\n", "old_methods": [], "patch": "@@ -1,15 +1,14 @@\n package net.minecraft.server;\n \n-\n import java.io.File;\n import java.io.FileInputStream;\n import java.io.InputStream;\n \n-\n public class SaveFormatOld implements ISaveFormat {\n \n protected final File a;\n protected net.canarymod.api.world.DimensionType type;\n+\n // CanaryMod changed constructor\n \n public SaveFormatOld(File file1, net.canarymod.api.world.DimensionType type) {", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FSaveFormatOld.java", "sha": "acc6085981a6afa4820457d36d70d14cf5512803", "status": "modified" }, { "additions": 8, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FSaveHandler.java", "changes": 15, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FSaveHandler.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 7, "filename": "src/main/java/net/minecraft/server/SaveHandler.java", "new_code": " * \n * \n }\n finally {\n }\n finally {\n // CanaryMod enable writing dat files from player name and a given base tag\n // This is a copy of this.a(EntityPlayer and might need adjustments accordingly!)", "new_methods": [], "old_code": "\n\n\n } finally {\n } finally {\n //CanaryMod enable writing dat files from player name and a given base tag\n //This is a copy of this.a(EntityPlayer and might need adjustments accordingly!)", "old_methods": [], "patch": "@@ -1,6 +1,5 @@\n package net.minecraft.server;\n \n-\n import java.io.DataInputStream;\n import java.io.DataOutputStream;\n import java.io.File;\n@@ -9,10 +8,8 @@\n import java.io.IOException;\n import java.io.InputStream;\n import java.io.OutputStream;\n-\n import net.canarymod.api.nbt.CanaryCompoundTag;\n \n-\n public class SaveHandler implements ISaveHandler, IPlayerFileData {\n \n private final File a;\n@@ -44,6 +41,7 @@ public SaveHandler(File file1, String s0, boolean flag0, net.canarymod.api.world\n // CanaryMod added getname\n /**\n * get the base name of this world saver (only world name, without dimension appendix)\n+ * \n * @return\n */\n public String getBaseName() {\n@@ -53,6 +51,7 @@ public String getBaseName() {\n // CanaryMod\n /**\n * get the dir folder (worlds/)\n+ * \n * @return\n */\n public File getWorldBaseDir() {\n@@ -66,7 +65,8 @@ private void h() {\n \n try {\n dataoutputstream.writeLong(this.d);\n- } finally {\n+ }\n+ finally {\n dataoutputstream.close();\n }\n } catch (IOException ioexception) {\n@@ -89,7 +89,8 @@ public void c() throws MinecraftException {\n if (datainputstream.readLong() != this.d) {\n throw new MinecraftException(\"The save is being accessed from another location, aborting\");\n }\n- } finally {\n+ }\n+ finally {\n datainputstream.close();\n }\n } catch (IOException ioexception) {\n@@ -272,8 +273,8 @@ public String g() {\n return this.e;\n }\n \n- //CanaryMod enable writing dat files from player name and a given base tag\n- //This is a copy of this.a(EntityPlayer and might need adjustments accordingly!)\n+ // CanaryMod enable writing dat files from player name and a given base tag\n+ // This is a copy of this.a(EntityPlayer and might need adjustments accordingly!)\n public void writePlayerNbt(String player, CanaryCompoundTag tag) {\n try {\n NBTTagCompound nbttagcompound = tag.getHandle();", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FSaveHandler.java", "sha": "3c1740763e22b7e020333546f8c2aa48e730b5f5", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FScore.java", "changes": 2, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FScore.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 1, "filename": "src/main/java/net/minecraft/server/Score.java", "new_code": "", "new_methods": [], "old_code": " ", "old_methods": [], "patch": "@@ -77,5 +77,5 @@ public void a(List list) {\n public CanaryScore getCanaryScore() {\n return this.score;\n }\n- \n+\n }", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FScore.java", "sha": "67a8bb4afd68d95e717e2a1c52d9ba37a2528912", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FScoreDummyCriteria.java", "changes": 2, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FScoreDummyCriteria.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 1, "filename": "src/main/java/net/minecraft/server/ScoreDummyCriteria.java", "new_code": " // CanaryMod: Set Variable", "new_methods": [], "old_code": " // CanaryMod: Set Variable", "old_methods": [], "patch": "@@ -15,7 +15,7 @@ public ScoreDummyCriteria(String s0) {\n if (!ScoreObjectiveCriteria.a.containsKey(s0)) {\n ScoreObjectiveCriteria.a.put(s0, this);\n }//\n- // CanaryMod: Set Variable\n+ // CanaryMod: Set Variable\n if (!(this instanceof ScoreHealthCriteria)) {\n criteria = new CanaryScoreDummyCriteria(this);\n }//", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FScoreDummyCriteria.java", "sha": "41a0c583c579a769a223a81c87ff9cfb430c3f4e", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FScoreHealthCriteria.java", "changes": 2, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FScoreHealthCriteria.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 1, "filename": "src/main/java/net/minecraft/server/ScoreHealthCriteria.java", "new_code": " for (Iterator iterator = list.iterator(); iterator.hasNext(); f0 += entityplayer.aM() + entityplayer.bm()) {", "new_methods": [], "old_code": " for (Iterator iterator = list.iterator(); iterator.hasNext(); f0 += entityplayer.aJ() + entityplayer.bj()) {", "old_methods": [], "patch": "@@ -17,7 +17,7 @@ public int a(List list) {\n \n EntityPlayer entityplayer;\n \n- for (Iterator iterator = list.iterator(); iterator.hasNext(); f0 += entityplayer.aJ() + entityplayer.bj()) {\n+ for (Iterator iterator = list.iterator(); iterator.hasNext(); f0 += entityplayer.aM() + entityplayer.bm()) {\n entityplayer = (EntityPlayer) iterator.next();\n }\n ", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FScoreHealthCriteria.java", "sha": "e31fa9cef7fd7597cdf30d6e8a56ed094fe7cd2d", "status": "modified" }, { "additions": 8, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FScorePlayerTeam.java", "changes": 12, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FScorePlayerTeam.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 4, "filename": "src/main/java/net/minecraft/server/ScorePlayerTeam.java", "new_code": "public class ScorePlayerTeam extends Team {\n public final Scoreboard a; // CanaryMod: private to public\n public String d(String s0) {\n return this.e() + s0 + this.f();\n }\n\n public static String a(Team team, String s0) {\n return team == null ? s0 : team.d(s0);", "new_methods": [ { "arguments": [ "String s0" ], "filename": "src/main/java/net/minecraft/server/ScorePlayerTeam.java", "implementation": "return this.e() + s0 + this.f();", "signature": "String d(String s0)" } ], "old_code": "public class ScorePlayerTeam {\n public final Scoreboard a; //CanaryMod: private to public\n public static String a(ScorePlayerTeam scoreplayerteam, String s0) {\n return scoreplayerteam == null ? s0 : scoreplayerteam.e() + s0 + scoreplayerteam.f();", "old_methods": [], "patch": "@@ -5,9 +5,9 @@\n import java.util.Set;\n import net.canarymod.api.scoreboard.CanaryTeam;\n \n-public class ScorePlayerTeam {\n+public class ScorePlayerTeam extends Team {\n \n- public final Scoreboard a; //CanaryMod: private to public\n+ public final Scoreboard a; // CanaryMod: private to public\n private final String b;\n private final Set c = new HashSet();\n private String d;\n@@ -71,8 +71,12 @@ public void c(String s0) {\n }\n }\n \n- public static String a(ScorePlayerTeam scoreplayerteam, String s0) {\n- return scoreplayerteam == null ? s0 : scoreplayerteam.e() + s0 + scoreplayerteam.f();\n+ public String d(String s0) {\n+ return this.e() + s0 + this.f();\n+ }\n+\n+ public static String a(Team team, String s0) {\n+ return team == null ? s0 : team.d(s0);\n }\n \n public boolean g() {", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FScorePlayerTeam.java", "sha": "3848beb60ef8f03f30b20752b141963bfc7b38be", "status": "modified" }, { "additions": 0, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FServerBlockEventList.java", "changes": 2, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FServerBlockEventList.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 2, "filename": "src/main/java/net/minecraft/server/ServerBlockEventList.java", "new_code": "", "new_methods": [], "old_code": "\n", "old_methods": [], "patch": "@@ -1,9 +1,7 @@\n package net.minecraft.server;\n \n-\n import java.util.ArrayList;\n \n-\n class ServerBlockEventList extends ArrayList {\n \n private ServerBlockEventList() {}", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FServerBlockEventList.java", "sha": "0f76c5648598bbbf3792543104e27e0702ebdc11", "status": "modified" }, { "additions": 0, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FServerCommandManager.java", "changes": 2, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FServerCommandManager.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 2, "filename": "src/main/java/net/minecraft/server/ServerCommandManager.java", "new_code": "", "new_methods": [], "old_code": "\n", "old_methods": [], "patch": "@@ -1,11 +1,9 @@\n package net.minecraft.server;\n \n-\n import java.util.Iterator;\n import net.canarymod.Canary;\n import net.canarymod.api.world.CanaryWorld;\n \n-\n public class ServerCommandManager extends CommandHandler implements IAdminCommand {\n \n public ServerCommandManager() {", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FServerCommandManager.java", "sha": "6668074ef444b6daf0838f3557c237dac64d1b46", "status": "modified" }, { "additions": 5, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FServerCommandScoreboard.java", "changes": 9, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FServerCommandScoreboard.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 4, "filename": "src/main/java/net/minecraft/server/ServerCommandScoreboard.java", "new_code": " return ((CanaryWorld) Canary.getServer().getDefaultWorld()).getHandle().D;\n\n return ((CanaryWorld) Canary.getServer().getDefaultWorld()).getHandle().D;\n s0 = b(icommandsender).am();\n s0 = b(icommandsender).am();", "new_methods": [], "old_code": " return ((CanaryWorld)Canary.getServer().getDefaultWorld()).getHandle().D;\n return ((CanaryWorld)Canary.getServer().getDefaultWorld()).getHandle().D;\n s0 = b(icommandsender).al();\n s0 = b(icommandsender).al();", "old_methods": [], "patch": "@@ -168,11 +168,12 @@ public void b(ICommandSender icommandsender, String[] astring) {\n \n protected Scoreboard d() {\n // CanaryMod: This here returns the default world to get the default scoreboard.\n- return ((CanaryWorld)Canary.getServer().getDefaultWorld()).getHandle().D;\n+ return ((CanaryWorld) Canary.getServer().getDefaultWorld()).getHandle().D;\n }\n+\n protected Scoreboard getScoreboard(World world) {\n // CanaryMod: This here returns the default world to get the default scoreboard.\n- return ((CanaryWorld)Canary.getServer().getDefaultWorld()).getHandle().D;\n+ return ((CanaryWorld) Canary.getServer().getDefaultWorld()).getHandle().D;\n }\n \n protected ScoreObjective a(String s0, boolean flag0) {\n@@ -357,7 +358,7 @@ protected void g(ICommandSender icommandsender, String[] astring, int i0) {\n String s0;\n \n if (icommandsender instanceof EntityPlayer && i0 == astring.length) {\n- s0 = b(icommandsender).al();\n+ s0 = b(icommandsender).am();\n scoreboard.a(s0, scoreplayerteam);\n hashset.add(s0);\n } else {\n@@ -380,7 +381,7 @@ protected void h(ICommandSender icommandsender, String[] astring, int i0) {\n String s0;\n \n if (icommandsender instanceof EntityPlayer && i0 == astring.length) {\n- s0 = b(icommandsender).al();\n+ s0 = b(icommandsender).am();\n if (scoreboard.g(s0)) {\n hashset.add(s0);\n } else {", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FServerCommandScoreboard.java", "sha": "fb3208db7f8d5503ea1caf98301e0f38e71e350f", "status": "modified" }, { "additions": 19, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FServerConfigurationManager.java", "changes": 38, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FServerConfigurationManager.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 19, "filename": "src/main/java/net/minecraft/server/ServerConfigurationManager.java", "new_code": " ConnectionHook hook = (ConnectionHook) new ConnectionHook(entityplayermp.getPlayer(), ChatMessageComponent.b(\"multiplayer.player.joined\", new Object[]{ entityplayermp.ax() }).a(EnumChatFormatting.o).toString(), firstTime).call();\n Iterator iterator = entityplayermp.aK().iterator();\n // ChunkCoordinates chunkcoordinates = entityplayermp.bE(); //CanaryMod removed in favor of a real location\n boolean flag1 = entityplayermp.bF();\n entityplayermp1.g(entityplayermp1.aM());\n Iterator iterator = entityplayermp.aK().iterator();\n if (entity.S()) {\n if (entity.S()) {\n if (entity.S()) {\n if (entity.S()) {\n if ((world == null || entityplayermp.q == world) && (s0 == null || flag1 != s0.equalsIgnoreCase(entityplayermp.am()))) {\n Team team = entityplayermp.bn();\n String s2 = team == null ? \"\" : team.b();\n Scoreboard scoreboard = entityplayer.bL();\n Score score = entityplayer.bL().a(entityplayer.am(), scoreobjective);\n public void a(ChatMessageComponent chatmessagecomponent) {\n this.a(chatmessagecomponent, true);\n }\n", "new_methods": [ { "arguments": [ "ChatMessageComponent chatmessagecomponent" ], "filename": "src/main/java/net/minecraft/server/ServerConfigurationManager.java", "implementation": "this.a(chatmessagecomponent, true);", "signature": "void a(ChatMessageComponent chatmessagecomponent)" } ], "old_code": " ConnectionHook hook = (ConnectionHook) new ConnectionHook(entityplayermp.getPlayer(), ChatMessageComponent.b(\"multiplayer.player.joined\", new Object[]{ entityplayermp.aw() }).a(EnumChatFormatting.o).toString(), firstTime).call();\n Iterator iterator = entityplayermp.aH().iterator();\n // ChunkCoordinates chunkcoordinates = entityplayermp.bA(); //CanaryMod removed in favor of a real location\n boolean flag1 = entityplayermp.bB();\n entityplayermp1.g(entityplayermp1.aJ());\n Iterator iterator = entityplayermp.aH().iterator();\n if (entity.R()) {\n if (entity.R()) {\n if (entity.R()) {\n if (entity.R()) {\n if ((world == null || entityplayermp.q == world) && (s0 == null || flag1 != s0.equalsIgnoreCase(entityplayermp.al()))) {\n ScorePlayerTeam scoreplayerteam = entityplayermp.bI();\n String s2 = scoreplayerteam == null ? \"\" : scoreplayerteam.b();\n Scoreboard scoreboard = entityplayer.bH();\n Score score = entityplayer.bH().a(entityplayer.al(), scoreobjective);\n public void a(ChatMessageComponent chatmessagecomponent) {\n this.a(chatmessagecomponent, true);\n }\n", "old_methods": [ { "arguments": [ "ChatMessageComponent chatmessagecomponent" ], "filename": "src/main/java/net/minecraft/server/ServerConfigurationManager.java", "implementation": "this.a(chatmessagecomponent, true);", "signature": "void a(ChatMessageComponent chatmessagecomponent)" } ], "patch": "@@ -94,7 +94,7 @@ public void a(INetworkManager inetworkmanager, EntityPlayerMP entityplayermp) {\n this.a((ServerScoreboard) worldserver.X(), entityplayermp);\n this.b(entityplayermp, worldserver);\n // CanaryMod Connection hook\n- ConnectionHook hook = (ConnectionHook) new ConnectionHook(entityplayermp.getPlayer(), ChatMessageComponent.b(\"multiplayer.player.joined\", new Object[]{ entityplayermp.aw() }).a(EnumChatFormatting.o).toString(), firstTime).call();\n+ ConnectionHook hook = (ConnectionHook) new ConnectionHook(entityplayermp.getPlayer(), ChatMessageComponent.b(\"multiplayer.player.joined\", new Object[]{ entityplayermp.ax() }).a(EnumChatFormatting.o).toString(), firstTime).call();\n if (!hook.isHidden()) {\n this.a((Packet) (new Packet3Chat(ChatMessageComponent.e(hook.getMessage()))));\n }\n@@ -107,7 +107,7 @@ public void a(INetworkManager inetworkmanager, EntityPlayerMP entityplayermp) {\n entityplayermp.a(this.e.S(), this.e.U());\n }\n \n- Iterator iterator = entityplayermp.aH().iterator();\n+ Iterator iterator = entityplayermp.aK().iterator();\n \n while (iterator.hasNext()) {\n PotionEffect potioneffect = (PotionEffect) iterator.next();\n@@ -411,9 +411,9 @@ public EntityPlayerMP a(EntityPlayerMP entityplayermp, int i0, boolean flag0, Lo\n entityplayermp.p().s().c(entityplayermp);\n this.a.remove(entityplayermp);\n this.e.getWorld(entityplayermp.getCanaryWorld().getName(), entityplayermp.ar).f(entityplayermp); // CanaryMod: added multiworld support\n- // ChunkCoordinates chunkcoordinates = entityplayermp.bA(); //CanaryMod removed in favor of a real location\n+ // ChunkCoordinates chunkcoordinates = entityplayermp.bE(); //CanaryMod removed in favor of a real location\n Location respawnLocation = entityplayermp.getRespawnLocation();\n- boolean flag1 = entityplayermp.bB();\n+ boolean flag1 = entityplayermp.bF();\n boolean isBedSpawn = respawnLocation != null;\n entityplayermp.ar = i0;\n Object object;\n@@ -486,7 +486,7 @@ public EntityPlayerMP a(EntityPlayerMP entityplayermp, int i0, boolean flag0, Lo\n worldserver.d(entityplayermp1);\n this.a.add(entityplayermp1);\n entityplayermp1.d();\n- entityplayermp1.g(entityplayermp1.aJ());\n+ entityplayermp1.g(entityplayermp1.aM());\n //\n return entityplayermp1;\n }\n@@ -518,7 +518,7 @@ public void a(EntityPlayerMP entityplayermp, String worldName, int i0) {\n entityplayermp.c.a(worldserver1);\n this.b(entityplayermp, worldserver1);\n this.f(entityplayermp);\n- Iterator iterator = entityplayermp.aH().iterator();\n+ Iterator iterator = entityplayermp.aK().iterator();\n \n while (iterator.hasNext()) {\n PotionEffect potioneffect = (PotionEffect) iterator.next();\n@@ -541,14 +541,14 @@ public void a(Entity entity, int i0, WorldServer worldserver, WorldServer worlds\n d0 /= d2;\n d1 /= d2;\n entity.b(d0, entity.v, d1, entity.A, entity.B);\n- if (entity.R()) {\n+ if (entity.S()) {\n worldserver.a(entity, false);\n }\n } else if (entity.ar == 0) {\n d0 *= d2;\n d1 *= d2;\n entity.b(d0, entity.v, d1, entity.A, entity.B);\n- if (entity.R()) {\n+ if (entity.S()) {\n worldserver.a(entity, false);\n }\n } else {\n@@ -564,7 +564,7 @@ public void a(Entity entity, int i0, WorldServer worldserver, WorldServer worlds\n entity.v = (double) chunkcoordinates.b;\n d1 = (double) chunkcoordinates.c;\n entity.b(d0, entity.v, d1, 90.0F, 0.0F);\n- if (entity.R()) {\n+ if (entity.S()) {\n worldserver.a(entity, false);\n }\n }\n@@ -574,7 +574,7 @@ public void a(Entity entity, int i0, WorldServer worldserver, WorldServer worlds\n worldserver.C.a(\"placing\");\n d0 = (double) MathHelper.a((int) d0, -29999872, 29999872);\n d1 = (double) MathHelper.a((int) d1, -29999872, 29999872);\n- if (entity.R()) {\n+ if (entity.S()) {\n worldserver1.d(entity);\n entity.b(d0, entity.v, d1, entity.A, entity.B);\n worldserver1.a(entity, false);\n@@ -729,10 +729,10 @@ public List a(ChunkCoordinates chunkcoordinates, int i0, int i1, int i2, int i3,\n for (int i8 = 0; i8 < this.a.size(); ++i8) {\n EntityPlayerMP entityplayermp = (EntityPlayerMP) this.a.get(i8);\n \n- if ((world == null || entityplayermp.q == world) && (s0 == null || flag1 != s0.equalsIgnoreCase(entityplayermp.al()))) {\n+ if ((world == null || entityplayermp.q == world) && (s0 == null || flag1 != s0.equalsIgnoreCase(entityplayermp.am()))) {\n if (s1 != null) {\n- ScorePlayerTeam scoreplayerteam = entityplayermp.bI();\n- String s2 = scoreplayerteam == null ? \"\" : scoreplayerteam.b();\n+ Team team = entityplayermp.bn();\n+ String s2 = team == null ? \"\" : team.b();\n \n if (flag2 == s1.equalsIgnoreCase(s2)) {\n continue;\n@@ -791,14 +791,14 @@ private boolean a(EntityPlayer entityplayer, Map map) {\n s0 = s0.substring(0, s0.length() - 4);\n }\n \n- Scoreboard scoreboard = entityplayer.bH();\n+ Scoreboard scoreboard = entityplayer.bL();\n ScoreObjective scoreobjective = scoreboard.b(s0);\n \n if (scoreobjective == null) {\n return false;\n }\n \n- Score score = entityplayer.bH().a(entityplayer.al(), scoreobjective);\n+ Score score = entityplayer.bL().a(entityplayer.am(), scoreobjective);\n \n i0 = score.c();\n if (i0 < ((Integer) entry.getValue()).intValue() && flag0) {\n@@ -930,10 +930,6 @@ private void a(EntityPlayerMP entityplayermp, EntityPlayerMP entityplayermp1, Wo\n entityplayermp.c.b(world.N().r());\n }\n \n- public void a(ChatMessageComponent chatmessagecomponent) {\n- this.a(chatmessagecomponent, true);\n- }\n-\n public void r() {\n // CanaryMod shutdown hook\n ServerShutdownHook hook = (ServerShutdownHook) new ServerShutdownHook(\"Server closed\").call();\n@@ -943,6 +939,10 @@ public void r() {\n }\n }\n \n+ public void a(ChatMessageComponent chatmessagecomponent) {\n+ this.a(chatmessagecomponent, true);\n+ }\n+\n public void a(ChatMessageComponent chatmessagecomponent, boolean flag0) {\n this.e.a(chatmessagecomponent);\n this.a((Packet) (new Packet3Chat(chatmessagecomponent, flag0)));", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FServerConfigurationManager.java", "sha": "f7b98c1a7bc8d02023020ae4cfebb056b26a609f", "status": "modified" }, { "additions": 2, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FServerListenThread.java", "changes": 7, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FServerListenThread.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 5, "filename": "src/main/java/net/minecraft/server/ServerListenThread.java", "new_code": " netloginhandler.d();\n this.e.d().an().b(\"Failed to handle packet for \" + netloginhandler.f() + \": \" + exception, (Throwable) exception);", "new_methods": [], "old_code": "\n\n\n netloginhandler.c();\n this.e.d().an().b(\"Failed to handle packet for \" + netloginhandler.e() + \": \" + exception, (Throwable) exception);", "old_methods": [], "patch": "@@ -1,6 +1,5 @@\n package net.minecraft.server;\n \n-\n import java.io.IOException;\n import java.net.InetAddress;\n import java.net.ServerSocket;\n@@ -9,10 +8,8 @@\n import java.util.Collections;\n import java.util.HashMap;\n import java.util.List;\n-\n import net.canarymod.Canary;\n \n-\n public class ServerListenThread extends Thread {\n \n private final List a = Collections.synchronizedList(new ArrayList());\n@@ -40,10 +37,10 @@ public void a() {\n NetLoginHandler netloginhandler = (NetLoginHandler) this.a.get(i0);\n \n try {\n- netloginhandler.c();\n+ netloginhandler.d();\n } catch (Exception exception) {\n netloginhandler.a(\"Internal server error\");\n- this.e.d().an().b(\"Failed to handle packet for \" + netloginhandler.e() + \": \" + exception, (Throwable) exception);\n+ this.e.d().an().b(\"Failed to handle packet for \" + netloginhandler.f() + \": \" + exception, (Throwable) exception);\n }\n \n if (netloginhandler.b) {", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FServerListenThread.java", "sha": "65dcde73e93e9b798fc5952af0ffc5f3c0001ad3", "status": "modified" }, { "additions": 3, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FStructureStrongholdPieces.java", "changes": 6, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FStructureStrongholdPieces.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 3, "filename": "src/main/java/net/minecraft/server/StructureStrongholdPieces.java", "new_code": " private static final StructureStrongholdPieceWeight[] b = new StructureStrongholdPieceWeight[]{ new StructureStrongholdPieceWeight(ComponentStrongholdStraight.class, 40, 0), new StructureStrongholdPieceWeight(ComponentStrongholdPrison.class, 5, 5), new StructureStrongholdPieceWeight(ComponentStrongholdLeftTurn.class, 20, 0),\n new StructureStrongholdPieceWeight(ComponentStrongholdRightTurn.class, 20, 0), new StructureStrongholdPieceWeight(ComponentStrongholdRoomCrossing.class, 10, 6), new StructureStrongholdPieceWeight(ComponentStrongholdStairsStraight.class, 5, 5), new StructureStrongholdPieceWeight(ComponentStrongholdStairs.class, 5, 5),\n new StructureStrongholdPieceWeight(ComponentStrongholdCrossing.class, 5, 4), new StructureStrongholdPieceWeight(ComponentStrongholdChestCorridor.class, 5, 4), new StructureStrongholdPieceWeight2(ComponentStrongholdLibrary.class, 10, 2), new StructureStrongholdPieceWeight3(ComponentStrongholdPortalRoom.class, 20, 1) };", "new_methods": [], "old_code": "\n\n private static final StructureStrongholdPieceWeight[] b = new StructureStrongholdPieceWeight[]{ new StructureStrongholdPieceWeight(ComponentStrongholdStraight.class, 40, 0), new StructureStrongholdPieceWeight(ComponentStrongholdPrison.class, 5, 5), new StructureStrongholdPieceWeight(ComponentStrongholdLeftTurn.class, 20, 0), new StructureStrongholdPieceWeight(ComponentStrongholdRightTurn.class, 20, 0), new StructureStrongholdPieceWeight(ComponentStrongholdRoomCrossing.class, 10, 6), new StructureStrongholdPieceWeight(ComponentStrongholdStairsStraight.class, 5, 5), new StructureStrongholdPieceWeight(ComponentStrongholdStairs.class, 5, 5), new StructureStrongholdPieceWeight(ComponentStrongholdCrossing.class, 5, 4), new StructureStrongholdPieceWeight(ComponentStrongholdChestCorridor.class, 5, 4), new StructureStrongholdPieceWeight2(ComponentStrongholdLibrary.class, 10, 2), new StructureStrongholdPieceWeight3(ComponentStrongholdPortalRoom.class, 20, 1) };", "old_methods": [], "patch": "@@ -1,15 +1,15 @@\n package net.minecraft.server;\n \n-\n import java.util.ArrayList;\n import java.util.Iterator;\n import java.util.List;\n import java.util.Random;\n \n-\n public class StructureStrongholdPieces {\n \n- private static final StructureStrongholdPieceWeight[] b = new StructureStrongholdPieceWeight[]{ new StructureStrongholdPieceWeight(ComponentStrongholdStraight.class, 40, 0), new StructureStrongholdPieceWeight(ComponentStrongholdPrison.class, 5, 5), new StructureStrongholdPieceWeight(ComponentStrongholdLeftTurn.class, 20, 0), new StructureStrongholdPieceWeight(ComponentStrongholdRightTurn.class, 20, 0), new StructureStrongholdPieceWeight(ComponentStrongholdRoomCrossing.class, 10, 6), new StructureStrongholdPieceWeight(ComponentStrongholdStairsStraight.class, 5, 5), new StructureStrongholdPieceWeight(ComponentStrongholdStairs.class, 5, 5), new StructureStrongholdPieceWeight(ComponentStrongholdCrossing.class, 5, 4), new StructureStrongholdPieceWeight(ComponentStrongholdChestCorridor.class, 5, 4), new StructureStrongholdPieceWeight2(ComponentStrongholdLibrary.class, 10, 2), new StructureStrongholdPieceWeight3(ComponentStrongholdPortalRoom.class, 20, 1) };\n+ private static final StructureStrongholdPieceWeight[] b = new StructureStrongholdPieceWeight[]{ new StructureStrongholdPieceWeight(ComponentStrongholdStraight.class, 40, 0), new StructureStrongholdPieceWeight(ComponentStrongholdPrison.class, 5, 5), new StructureStrongholdPieceWeight(ComponentStrongholdLeftTurn.class, 20, 0),\n+ new StructureStrongholdPieceWeight(ComponentStrongholdRightTurn.class, 20, 0), new StructureStrongholdPieceWeight(ComponentStrongholdRoomCrossing.class, 10, 6), new StructureStrongholdPieceWeight(ComponentStrongholdStairsStraight.class, 5, 5), new StructureStrongholdPieceWeight(ComponentStrongholdStairs.class, 5, 5),\n+ new StructureStrongholdPieceWeight(ComponentStrongholdCrossing.class, 5, 4), new StructureStrongholdPieceWeight(ComponentStrongholdChestCorridor.class, 5, 4), new StructureStrongholdPieceWeight2(ComponentStrongholdLibrary.class, 10, 2), new StructureStrongholdPieceWeight3(ComponentStrongholdPortalRoom.class, 20, 1) };\n private static List c;\n private static Class d;\n static int a = 0;", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FStructureStrongholdPieces.java", "sha": "9860ffe43c1e928a73e247949f51aa39b497c766", "status": "modified" }, { "additions": 0, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FStructureStrongholdStones.java", "changes": 2, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FStructureStrongholdStones.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 2, "filename": "src/main/java/net/minecraft/server/StructureStrongholdStones.java", "new_code": "", "new_methods": [], "old_code": "\n", "old_methods": [], "patch": "@@ -1,9 +1,7 @@\n package net.minecraft.server;\n \n-\n import java.util.Random;\n \n-\n class StructureStrongholdStones extends StructurePieceBlockSelector {\n \n private StructureStrongholdStones() {}", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FStructureStrongholdStones.java", "sha": "7cbdb6999a72deca9c1a5ce24cee60ca85ecdce0", "status": "modified" }, { "additions": 2, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FTileEntity.java", "changes": 5, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FTileEntity.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 3, "filename": "src/main/java/net/minecraft/server/TileEntity.java", "new_code": "\n public World az() {", "new_methods": [], "old_code": "\n\n public World ay() {", "old_methods": [], "patch": "@@ -1,13 +1,11 @@\n package net.minecraft.server;\n \n-\n import java.util.HashMap;\n import java.util.Map;\n import java.util.concurrent.Callable;\n import net.canarymod.api.nbt.CanaryCompoundTag;\n import net.canarymod.api.world.blocks.ComplexBlock;\n \n-\n public class TileEntity {\n \n private static Map a = new HashMap();\n@@ -23,6 +21,7 @@ public class TileEntity {\n // CanaryMod: Variable Declaration\n public ComplexBlock complexBlock;\n private CanaryCompoundTag meta = new CanaryCompoundTag(\"Canary\"); // hold it for extra data\n+\n // CanaryMod: End\n \n public TileEntity() {}\n@@ -36,7 +35,7 @@ private static void a(Class oclass0, String s0) {\n }\n }\n \n- public World ay() {\n+ public World az() {\n return this.k;\n }\n ", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FTileEntity.java", "sha": "44d815001c91f60a8146d824da2aea3b68429dd1", "status": "modified" }, { "additions": 3, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FTileEntityBeacon.java", "changes": 8, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FTileEntityBeacon.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 5, "filename": "src/main/java/net/minecraft/server/TileEntityBeacon.java", "new_code": " public static final Potion[][] a = new Potion[][]{ { Potion.c, Potion.e }, { Potion.m, Potion.j }, { Potion.g }, { Potion.l } };\n entityplayer.c(new PotionEffect(this.f, 180, b0, true));\n entityplayer.c(new PotionEffect(this.g, 180, 0, true));", "new_methods": [], "old_code": "\n\n public static final Potion[][] a = new Potion[][] { { Potion.c, Potion.e}, { Potion.m, Potion.j}, { Potion.g}, { Potion.l}};\n entityplayer.d(new PotionEffect(this.f, 180, b0, true));\n entityplayer.d(new PotionEffect(this.g, 180, 0, true));", "old_methods": [], "patch": "@@ -1,14 +1,12 @@\n package net.minecraft.server;\n \n-\n import java.util.Iterator;\n import java.util.List;\n import net.canarymod.api.world.blocks.CanaryBeacon;\n \n-\n public class TileEntityBeacon extends TileEntity implements IInventory {\n \n- public static final Potion[][] a = new Potion[][] { { Potion.c, Potion.e}, { Potion.m, Potion.j}, { Potion.g}, { Potion.l}};\n+ public static final Potion[][] a = new Potion[][]{ { Potion.c, Potion.e }, { Potion.m, Potion.j }, { Potion.g }, { Potion.l } };\n private boolean d;\n private int e = -1;\n private int f;\n@@ -46,15 +44,15 @@ private void u() {\n \n while (iterator.hasNext()) {\n entityplayer = (EntityPlayer) iterator.next();\n- entityplayer.d(new PotionEffect(this.f, 180, b0, true));\n+ entityplayer.c(new PotionEffect(this.f, 180, b0, true));\n }\n \n if (this.e >= 4 && this.f != this.g && this.g > 0) {\n iterator = list.iterator();\n \n while (iterator.hasNext()) {\n entityplayer = (EntityPlayer) iterator.next();\n- entityplayer.d(new PotionEffect(this.g, 180, 0, true));\n+ entityplayer.c(new PotionEffect(this.g, 180, 0, true));\n }\n }\n }", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FTileEntityBeacon.java", "sha": "f1b102cf4f5f9878f735dcfb8692f2b499ee644b", "status": "modified" }, { "additions": 2, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FTileEntityBrewingStand.java", "changes": 6, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FTileEntityBrewingStand.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 4, "filename": "src/main/java/net/minecraft/server/TileEntityBrewingStand.java", "new_code": " private static final int[] a = new int[]{ 3 };\n private static final int[] b = new int[]{ 0, 1, 2 };", "new_methods": [], "old_code": "\n\n private static final int[] a = new int[] { 3};\n private static final int[] b = new int[] { 0, 1, 2};", "old_methods": [], "patch": "@@ -1,14 +1,12 @@\n package net.minecraft.server;\n \n-\n import java.util.List;\n import net.canarymod.api.world.blocks.CanaryBrewingStand;\n \n-\n public class TileEntityBrewingStand extends TileEntity implements ISidedInventory {\n \n- private static final int[] a = new int[] { 3};\n- private static final int[] b = new int[] { 0, 1, 2};\n+ private static final int[] a = new int[]{ 3 };\n+ private static final int[] b = new int[]{ 0, 1, 2 };\n public ItemStack[] c = new ItemStack[4]; // CanaryMod: private => public\n private int d;\n private int e;", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FTileEntityBrewingStand.java", "sha": "324e198ec68c11176db85014e9e4abe3079152ec", "status": "modified" }, { "additions": 0, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FTileEntityChest.java", "changes": 2, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FTileEntityChest.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 2, "filename": "src/main/java/net/minecraft/server/TileEntityChest.java", "new_code": "", "new_methods": [], "old_code": "\n", "old_methods": [], "patch": "@@ -1,11 +1,9 @@\n package net.minecraft.server;\n \n-\n import java.util.Iterator;\n import java.util.List;\n import net.canarymod.api.world.blocks.CanaryChest;\n \n-\n public class TileEntityChest extends TileEntity implements IInventory {\n \n public ItemStack[] i = new ItemStack[36]; // CanaryMod: private => public", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FTileEntityChest.java", "sha": "17c91226e9be44275dfb77ec1061e5bce2b8b923", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FTileEntityCommandBlock.java", "changes": 2, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FTileEntityCommandBlock.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 1, "filename": "src/main/java/net/minecraft/server/TileEntityCommandBlock.java", "new_code": " return this.az();", "new_methods": [], "old_code": " return this.ay();", "old_methods": [], "patch": "@@ -74,7 +74,7 @@ public ChunkCoordinates b() {\n }\n \n public World f_() {\n- return this.ay();\n+ return this.az();\n }\n \n public Packet m() {", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FTileEntityCommandBlock.java", "sha": "de83634386b8b4f8b9c52cd3387456de6f2c2e74", "status": "modified" }, { "additions": 0, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FTileEntityComparator.java", "changes": 2, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FTileEntityComparator.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 2, "filename": "src/main/java/net/minecraft/server/TileEntityComparator.java", "new_code": "", "new_methods": [], "old_code": "\n", "old_methods": [], "patch": "@@ -1,9 +1,7 @@\n package net.minecraft.server;\n \n-\n import net.canarymod.api.world.blocks.CanaryComparator;\n \n-\n public class TileEntityComparator extends TileEntity {\n \n private int a = 0;", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FTileEntityComparator.java", "sha": "a7ee0583b9746aae8fbc18a4e5631fba0ab46c44", "status": "modified" }, { "additions": 0, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FTileEntityDaylightDetector.java", "changes": 2, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FTileEntityDaylightDetector.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 2, "filename": "src/main/java/net/minecraft/server/TileEntityDaylightDetector.java", "new_code": "", "new_methods": [], "old_code": "\n", "old_methods": [], "patch": "@@ -1,9 +1,7 @@\n package net.minecraft.server;\n \n-\n import net.canarymod.api.world.blocks.CanaryDaylightDetector;\n \n-\n public class TileEntityDaylightDetector extends TileEntity {\n \n public TileEntityDaylightDetector() {", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FTileEntityDaylightDetector.java", "sha": "e5ec583b91e9c44c9a270b49ba98aeffbf659dab", "status": "modified" }, { "additions": 0, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FTileEntityDispenser.java", "changes": 2, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FTileEntityDispenser.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 2, "filename": "src/main/java/net/minecraft/server/TileEntityDispenser.java", "new_code": "", "new_methods": [], "old_code": "\n", "old_methods": [], "patch": "@@ -1,10 +1,8 @@\n package net.minecraft.server;\n \n-\n import java.util.Random;\n import net.canarymod.api.world.blocks.CanaryDispenser;\n \n-\n public class TileEntityDispenser extends TileEntity implements IInventory {\n \n public ItemStack[] b = new ItemStack[9]; // CanaryMod: private => public", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FTileEntityDispenser.java", "sha": "8c9bc7a691c835536113bd97343f6624c4078565", "status": "modified" }, { "additions": 0, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FTileEntityDropper.java", "changes": 2, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FTileEntityDropper.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 2, "filename": "src/main/java/net/minecraft/server/TileEntityDropper.java", "new_code": "", "new_methods": [], "old_code": "\n", "old_methods": [], "patch": "@@ -1,9 +1,7 @@\n package net.minecraft.server;\n \n-\n import net.canarymod.api.world.blocks.CanaryDropper;\n \n-\n public class TileEntityDropper extends TileEntityDispenser {\n \n public TileEntityDropper() {", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FTileEntityDropper.java", "sha": "5b51ee58c72cb1162b136a81c55b26085030aeef", "status": "modified" }, { "additions": 6, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FTileEntityHopper.java", "changes": 12, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FTileEntityHopper.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 6, "filename": "src/main/java/net/minecraft/server/TileEntityHopper.java", "new_code": " EntityItem entityitem = a(hopper.az(), hopper.aA(), hopper.aB() + 1.0D, hopper.aC());\n return b(this.az(), (double) (this.l + Facing.b[i0]), (double) (this.m + Facing.c[i0]), (double) (this.n + Facing.d[i0]));\n return b(hopper.az(), hopper.aA(), hopper.aB() + 1.0D, hopper.aC());\n public double aA() {\n public double aB() {\n public double aC() {", "new_methods": [], "old_code": " EntityItem entityitem = a(hopper.ay(), hopper.az(), hopper.aA() + 1.0D, hopper.aB());\n return b(this.ay(), (double) (this.l + Facing.b[i0]), (double) (this.m + Facing.c[i0]), (double) (this.n + Facing.d[i0]));\n return b(hopper.ay(), hopper.az(), hopper.aA() + 1.0D, hopper.aB());\n public double az() {\n public double aA() {\n public double aB() {", "old_methods": [], "patch": "@@ -219,7 +219,7 @@ public static boolean a(Hopper hopper) {\n }\n }\n } else {\n- EntityItem entityitem = a(hopper.ay(), hopper.az(), hopper.aA() + 1.0D, hopper.aB());\n+ EntityItem entityitem = a(hopper.az(), hopper.aA(), hopper.aB() + 1.0D, hopper.aC());\n \n if (entityitem != null) {\n return a((IInventory) hopper, entityitem);\n@@ -346,11 +346,11 @@ private static ItemStack c(IInventory iinventory, ItemStack itemstack, int i0, i\n private IInventory v() {\n int i0 = BlockHopper.c(this.p());\n \n- return b(this.ay(), (double) (this.l + Facing.b[i0]), (double) (this.m + Facing.c[i0]), (double) (this.n + Facing.d[i0]));\n+ return b(this.az(), (double) (this.l + Facing.b[i0]), (double) (this.m + Facing.c[i0]), (double) (this.n + Facing.d[i0]));\n }\n \n public static IInventory b(Hopper hopper) {\n- return b(hopper.ay(), hopper.az(), hopper.aA() + 1.0D, hopper.aB());\n+ return b(hopper.az(), hopper.aA(), hopper.aB() + 1.0D, hopper.aC());\n }\n \n public static EntityItem a(World world, double d0, double d1, double d2) {\n@@ -393,15 +393,15 @@ private static boolean a(ItemStack itemstack, ItemStack itemstack1) {\n return itemstack.d != itemstack1.d ? false : (itemstack.k() != itemstack1.k() ? false : (itemstack.b > itemstack.e() ? false : ItemStack.a(itemstack, itemstack1)));\n }\n \n- public double az() {\n+ public double aA() {\n return (double) this.l;\n }\n \n- public double aA() {\n+ public double aB() {\n return (double) this.m;\n }\n \n- public double aB() {\n+ public double aC() {\n return (double) this.n;\n }\n ", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FTileEntityHopper.java", "sha": "eabdce1b3a547f1682a3230e16235d5c65a9a0fd", "status": "modified" }, { "additions": 0, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FTileEntityMobSpawner.java", "changes": 2, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FTileEntityMobSpawner.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 2, "filename": "src/main/java/net/minecraft/server/TileEntityMobSpawner.java", "new_code": "", "new_methods": [], "old_code": "\n", "old_methods": [], "patch": "@@ -1,9 +1,7 @@\n package net.minecraft.server;\n \n-\n import net.canarymod.api.world.blocks.CanaryMobSpawner;\n \n-\n public class TileEntityMobSpawner extends TileEntity {\n \n private final MobSpawnerBaseLogic a = new TileEntityMobSpawnerLogic(this);", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FTileEntityMobSpawner.java", "sha": "e914ddf7e6a3a3b708b4cd985952f7dcac15ec33", "status": "modified" }, { "additions": 0, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FTileEntityNote.java", "changes": 2, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FTileEntityNote.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 2, "filename": "src/main/java/net/minecraft/server/TileEntityNote.java", "new_code": "", "new_methods": [], "old_code": "\n", "old_methods": [], "patch": "@@ -1,9 +1,7 @@\n package net.minecraft.server;\n \n-\n import net.canarymod.api.world.blocks.CanaryNoteBlock;\n \n-\n public class TileEntityNote extends TileEntity {\n \n public byte a = 0;", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FTileEntityNote.java", "sha": "235f09619b5db538a35ede5dff6e33c83562a23a", "status": "modified" }, { "additions": 0, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FTileEntityRecordPlayer.java", "changes": 2, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FTileEntityRecordPlayer.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 2, "filename": "src/main/java/net/minecraft/server/TileEntityRecordPlayer.java", "new_code": "", "new_methods": [], "old_code": "\n", "old_methods": [], "patch": "@@ -1,9 +1,7 @@\n package net.minecraft.server;\n \n-\n import net.canarymod.api.world.blocks.CanaryJukebox;\n \n-\n public class TileEntityRecordPlayer extends TileEntity {\n \n private ItemStack a;", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FTileEntityRecordPlayer.java", "sha": "b33d89ec241a5efbdeeaa27bf5532c4b645bdeb2", "status": "modified" }, { "additions": 10, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FTileEntitySign.java", "changes": 13, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FTileEntitySign.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 3, "filename": "src/main/java/net/minecraft/server/TileEntitySign.java", "new_code": " public String[] a = new String[]{ \"\", \"\", \"\", \"\" };\n private EntityPlayer d;\n public void a(EntityPlayer entityplayer) {\n this.d = entityplayer;\n }\n\n public EntityPlayer b() {\n return this.d;\n }\n", "new_methods": [ { "arguments": [ "EntityPlayer entityplayer" ], "filename": "src/main/java/net/minecraft/server/TileEntitySign.java", "implementation": "this.d = entityplayer;", "signature": "void a(EntityPlayer entityplayer)" }, { "arguments": [], "filename": "src/main/java/net/minecraft/server/TileEntitySign.java", "implementation": "return this.d;", "signature": "EntityPlayer b()" } ], "old_code": "\n\n public String[] a = new String[] { \"\", \"\", \"\", \"\"};", "old_methods": [], "patch": "@@ -1,14 +1,13 @@\n package net.minecraft.server;\n \n-\n import net.canarymod.api.world.blocks.CanarySign;\n \n-\n public class TileEntitySign extends TileEntity {\n \n- public String[] a = new String[] { \"\", \"\", \"\", \"\"};\n+ public String[] a = new String[]{ \"\", \"\", \"\", \"\" };\n public int b = -1;\n private boolean c = true;\n+ private EntityPlayer d;\n \n public TileEntitySign() {\n this.complexBlock = new CanarySign(this); // CanaryMod: wrap sign\n@@ -45,6 +44,14 @@ public boolean a() {\n return this.c;\n }\n \n+ public void a(EntityPlayer entityplayer) {\n+ this.d = entityplayer;\n+ }\n+\n+ public EntityPlayer b() {\n+ return this.d;\n+ }\n+\n // CanaryMod\n public CanarySign getCanarySign() {\n return (CanarySign) complexBlock;", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FTileEntitySign.java", "sha": "9daa8eb3cdc6417195fe1d1af1005d26dcbb36b5", "status": "modified" }, { "additions": 0, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FTileEntitySkull.java", "changes": 2, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FTileEntitySkull.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 2, "filename": "src/main/java/net/minecraft/server/TileEntitySkull.java", "new_code": "", "new_methods": [], "old_code": "\n", "old_methods": [], "patch": "@@ -1,9 +1,7 @@\n package net.minecraft.server;\n \n-\n import net.canarymod.api.world.blocks.CanarySkull;\n \n-\n public class TileEntitySkull extends TileEntity {\n \n private int a;", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FTileEntitySkull.java", "sha": "269500b10d09c49ad033ff3d188c101d2169191c", "status": "modified" }, { "additions": 3, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FVillage.java", "changes": 7, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FVillage.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 4, "filename": "src/main/java/net/minecraft/server/Village.java", "new_code": " }\n while (villagedoorinfo.a != i0 || villagedoorinfo.c != i2 || Math.abs(villagedoorinfo.b - i1) > 1);\n if (!villageagressor.a.S() || Math.abs(this.g - villageagressor.b) > 300) {", "new_methods": [], "old_code": "\n\n } while (villagedoorinfo.a != i0 || villagedoorinfo.c != i2 || Math.abs(villagedoorinfo.b - i1) > 1);\n if (!villageagressor.a.R() || Math.abs(this.g - villageagressor.b) > 300) {", "old_methods": [], "patch": "@@ -1,13 +1,11 @@\n package net.minecraft.server;\n \n-\n import java.util.ArrayList;\n import java.util.Iterator;\n import java.util.List;\n import java.util.TreeMap;\n import net.canarymod.api.world.CanaryVillage;\n \n-\n public class Village {\n \n private World a;\n@@ -202,7 +200,8 @@ public VillageDoorInfo e(int i0, int i1, int i2) {\n }\n \n villagedoorinfo = (VillageDoorInfo) iterator.next();\n- } while (villagedoorinfo.a != i0 || villagedoorinfo.c != i2 || Math.abs(villagedoorinfo.b - i1) > 1);\n+ }\n+ while (villagedoorinfo.a != i0 || villagedoorinfo.c != i2 || Math.abs(villagedoorinfo.b - i1) > 1);\n \n return villagedoorinfo;\n }\n@@ -287,7 +286,7 @@ private void l() {\n while (iterator.hasNext()) {\n VillageAgressor villageagressor = (VillageAgressor) iterator.next();\n \n- if (!villageagressor.a.R() || Math.abs(this.g - villageagressor.b) > 300) {\n+ if (!villageagressor.a.S() || Math.abs(this.g - villageagressor.b) > 300) {\n iterator.remove();\n }\n }", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FVillage.java", "sha": "a99feb182034bfecf5a62aec254c69fe4ce7264e", "status": "modified" }, { "additions": 0, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FWatchableObject.java", "changes": 1, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FWatchableObject.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 1, "filename": "src/main/java/net/minecraft/server/WatchableObject.java", "new_code": "", "new_methods": [], "old_code": "", "old_methods": [], "patch": "@@ -1,6 +1,5 @@\n package net.minecraft.server;\n \n-\n public class WatchableObject {\n \n private final int a;", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FWatchableObject.java", "sha": "463fdb6cf23eb9eec86e09e431533d5cf25d7644", "status": "modified" }, { "additions": 0, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FWeightedRandomChestContent.java", "changes": 2, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FWeightedRandomChestContent.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 2, "filename": "src/main/java/net/minecraft/server/WeightedRandomChestContent.java", "new_code": "", "new_methods": [], "old_code": "\n", "old_methods": [], "patch": "@@ -1,9 +1,7 @@\n package net.minecraft.server;\n \n-\n import java.util.Random;\n \n-\n public class WeightedRandomChestContent extends WeightedRandomItem {\n \n private ItemStack b = null;", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FWeightedRandomChestContent.java", "sha": "20bd5111fc24c2fc24ff24afcc984b1b8c70e213", "status": "modified" }, { "additions": 8, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FWorld.java", "changes": 16, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FWorld.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 8, "filename": "src/main/java/net/minecraft/server/World.java", "new_code": " ++entity.ac;\n entity.U();\n if (vec3.b() > 0.0D && entity.aw()) {\n if ((!(entity instanceof EntityLiving) || !((EntityLiving) entity).bE()) && oclass0.isAssignableFrom(entity.getClass())) {\n if (!entityplayer1.bG.a && entityplayer1.S()) {\n if (entityplayer1.ag()) {\n if (entityplayer1.ai()) {\n float f0 = entityplayer1.bw();", "new_methods": [], "old_code": " entity.T();\n ++entity.ac;\n if (vec3.b() > 0.0D && entity.av()) {\n if ((!(entity instanceof EntityLiving) || !((EntityLiving) entity).bA()) && oclass0.isAssignableFrom(entity.getClass())) {\n if (!entityplayer1.bG.a && entityplayer1.R()) {\n if (entityplayer1.af()) {\n if (entityplayer1.ah()) {\n float f0 = entityplayer1.bs();", "old_methods": [], "patch": "@@ -1269,10 +1269,10 @@ public void a(Entity entity, boolean flag0) {\n entity.C = entity.A;\n entity.D = entity.B;\n if (flag0 && entity.ai) {\n+ ++entity.ac;\n if (entity.o != null) {\n- entity.T();\n+ entity.U();\n } else {\n- ++entity.ac;\n entity.l_();\n }\n }\n@@ -1471,7 +1471,7 @@ public boolean a(AxisAlignedBB axisalignedbb, Material material, Entity entity)\n }\n }\n \n- if (vec3.b() > 0.0D && entity.av()) {\n+ if (vec3.b() > 0.0D && entity.aw()) {\n vec3 = vec3.a();\n double d1 = 0.014D;\n \n@@ -2245,7 +2245,7 @@ public int a(Class oclass0) {\n for (int i1 = 0; i1 < this.e.size(); ++i1) {\n Entity entity = (Entity) this.e.get(i1);\n \n- if ((!(entity instanceof EntityLiving) || !((EntityLiving) entity).bA()) && oclass0.isAssignableFrom(entity.getClass())) {\n+ if ((!(entity instanceof EntityLiving) || !((EntityLiving) entity).bE()) && oclass0.isAssignableFrom(entity.getClass())) {\n ++i0;\n }\n }\n@@ -2430,16 +2430,16 @@ public EntityPlayer b(double d0, double d1, double d2, double d3) {\n for (int i0 = 0; i0 < this.h.size(); ++i0) {\n EntityPlayer entityplayer1 = (EntityPlayer) this.h.get(i0);\n \n- if (!entityplayer1.bG.a && entityplayer1.R()) {\n+ if (!entityplayer1.bG.a && entityplayer1.S()) {\n double d5 = entityplayer1.e(d0, d1, d2);\n double d6 = d3;\n \n- if (entityplayer1.af()) {\n+ if (entityplayer1.ag()) {\n d6 = d3 * 0.800000011920929D;\n }\n \n- if (entityplayer1.ah()) {\n- float f0 = entityplayer1.bs();\n+ if (entityplayer1.ai()) {\n+ float f0 = entityplayer1.bw();\n \n if (f0 < 0.1F) {\n f0 = 0.1F;", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FWorld.java", "sha": "fb823ba886343fcfab7bade80dee395b25ad4275", "status": "modified" }, { "additions": 9, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FWorldServer.java", "changes": 27, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FWorldServer.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 18, "filename": "src/main/java/net/minecraft/server/WorldServer.java", "new_code": " if (!entityplayer.bg()) {\n if (entityplayer.bg()) {\n while (entityplayer.bC());\n if (!this.a.Y() && entity instanceof INpc) {\n entity.w();\n\n super.a(entity, flag0);\n Entity[] aentity = entity.an();\n Entity[] aentity = entity.an();", "new_methods": [], "old_code": " if (!entityplayer.bd()) {\n if (entityplayer.bd()) {\n while (entityplayer.by());\n if (!(entity.n instanceof EntityPlayer)) {\n super.a(entity, flag0);\n }\n }\n\n public void b(Entity entity, boolean flag0) {\n try {\n super.a(entity, flag0);\n } catch (Throwable throwable) {\n CrashReport crashreport = CrashReport.a(throwable, \"Forcefully ticking entity\");\n CrashReportCategory crashreportcategory = crashreport.a(\"Entity being force ticked\");\n entity.a(crashreportcategory);\n throw new ReportedException(crashreport);\n Entity[] aentity = entity.am();\n Entity[] aentity = entity.am();", "old_methods": [ { "arguments": [ "Entity entity", " boolean flag0" ], "filename": "src/main/java/net/minecraft/server/WorldServer.java", "implementation": "try {\n super.a(entity, flag0);", "signature": "void b(Entity entity, boolean flag0)" } ], "patch": "@@ -140,7 +140,7 @@ public void c() {\n while (iterator.hasNext()) {\n EntityPlayer entityplayer = (EntityPlayer) iterator.next();\n \n- if (!entityplayer.bd()) {\n+ if (!entityplayer.bg()) {\n this.N = false;\n break;\n }\n@@ -154,7 +154,7 @@ protected void d() {\n while (iterator.hasNext()) {\n EntityPlayer entityplayer = (EntityPlayer) iterator.next();\n \n- if (entityplayer.bd()) {\n+ if (entityplayer.bg()) {\n entityplayer.a(false, false, true);\n }\n }\n@@ -190,7 +190,7 @@ public boolean e() {\n \n entityplayer = (EntityPlayer) iterator.next();\n }\n- while (entityplayer.by());\n+ while (entityplayer.bC());\n \n return false;\n } else {\n@@ -480,21 +480,12 @@ public void a(Entity entity, boolean flag0) {\n if (!canSpawn(entity)) {\n entity.w();\n }\n- if (!(entity.n instanceof EntityPlayer)) {\n- super.a(entity, flag0);\n- }\n- }\n-\n- public void b(Entity entity, boolean flag0) {\n- try {\n- super.a(entity, flag0);\n- } catch (Throwable throwable) {\n- CrashReport crashreport = CrashReport.a(throwable, \"Forcefully ticking entity\");\n- CrashReportCategory crashreportcategory = crashreport.a(\"Entity being force ticked\");\n \n- entity.a(crashreportcategory);\n- throw new ReportedException(crashreport);\n+ if (!this.a.Y() && entity instanceof INpc) {\n+ entity.w();\n }\n+\n+ super.a(entity, flag0);\n }\n \n protected IChunkProvider j() {\n@@ -627,7 +618,7 @@ protected void a() throws MinecraftException {\n protected void a(Entity entity) {\n super.a(entity);\n this.V.a(entity.k, entity);\n- Entity[] aentity = entity.am();\n+ Entity[] aentity = entity.an();\n \n if (aentity != null) {\n for (int i0 = 0; i0 < aentity.length; ++i0) {\n@@ -639,7 +630,7 @@ protected void a(Entity entity) {\n protected void b(Entity entity) {\n super.b(entity);\n this.V.d(entity.k);\n- Entity[] aentity = entity.am();\n+ Entity[] aentity = entity.an();\n \n if (aentity != null) {\n for (int i0 = 0; i0 < aentity.length; ++i0) {", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FWorldServer.java", "sha": "0c72905083bf42806cc1dbf15cc7816eb30d2305", "status": "modified" }, { "additions": 0, "blob_url": "https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FWorldServerMulti.java", "changes": 1, "contents_url": "https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FWorldServerMulti.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5", "deletions": 1, "filename": "src/main/java/net/minecraft/server/WorldServerMulti.java", "new_code": "", "new_methods": [], "old_code": "", "old_methods": [], "patch": "@@ -1,6 +1,5 @@\n package net.minecraft.server;\n \n-\n public class WorldServerMulti extends WorldServer {\n \n public WorldServerMulti(MinecraftServer minecraftserver, ISaveHandler isavehandler, String s0, int i0, WorldSettings worldsettings, WorldServer worldserver, Profiler profiler, ILogAgent ilogagent) {", "raw_url": "https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FWorldServerMulti.java", "sha": "80262d21709a43c9bd2e44d037aeca4901f7302e", "status": "modified" } ]
183
[ { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "public boolean T() {\n public void U() {\n this.o.V();\n public void V() {\n this.n.b(this.u, this.v + this.X() + this.n.W(), this.w);\n public double W() {\n public double X() {\n public float Y() {\n public Vec3 Z() {\n public void aa() {\n this.ao = this.ab();\n public int ab() {\n public ItemStack[] ad() {\n public boolean ae() {\n public boolean af() {\n public boolean ag() {\n public boolean ah() {\n public boolean ai() {\n public int ak() {\n public void al() {\n public String am() {\n public Entity[] an() {\n public float ao() {\n public boolean ap() {\n return String.format(\"%s[\\'%s\\'/%d, l=\\'%s\\', x=%.2f, y=%.2f, z=%.2f]\", new Object[]{ this.getClass().getSimpleName(), this.am(), Integer.valueOf(this.k), this.q == null ? \"~NULL~\" : this.q.N().k(), Double.valueOf(this.u), Double.valueOf(this.v), Double.valueOf(this.w)", "new_return_type": "boolean", "new_signature": "boolean S()", "old_args": "", "old_implementation": "public boolean S() {\n public void T() {\n this.o.U();\n this.A = (float) ((double) this.A + d0);\n this.B = (float) ((double) this.B + d1);\n public void U() {\n this.n.b(this.u, this.v + this.W() + this.n.V(), this.w);\n public double V() {\n public double W() {\n public float X() {\n public Vec3 Y() {\n public void Z() {\n this.ao = this.aa();\n public int aa() {\n public ItemStack[] ac() {\n public boolean ad() {\n public boolean ae() {\n public boolean af() {\n public boolean ag() {\n public boolean ah() {\n public int aj() {\n public void ak() {\n public String al() {\n public Entity[] am() {\n public float an() {\n public boolean ao() {\n return String.format(\"%s[\\'%s\\'/%d, l=\\'%s\\', x=%.2f, y=%.2f, z=%.2f]\", new Object[]{ this.getClass().getSimpleName(), this.al(), Integer.valueOf(this.k), this.q == null ? \"~NULL~\" : this.q.N().k(), Double.valueOf(this.u), Double.valueOf(this.v), Double.valueOf(this.w)", "old_return_type": "boolean", "old_signature": "boolean R()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "protected float ba() {\n protected boolean bb() {\n return this.aM() <= 0.0F;\n protected void bd() {\n if (this.ah()) {\n this.a(f0, f1, this.be() ? 0.04F : 0.02F);\n f4 = this.bf() * f3;\n boolean flag0 = this.ag() && this instanceof EntityPlayer;\n protected boolean be() {\n public float bf() {\n return this.be() ? this.bp : 0.1F;\n this.bp = f0;\n public boolean bg() {\n int i0 = this.aT();\n if (this.bq > 0) {\n --this.bq;", "new_return_type": "float", "new_signature": "float aZ()", "old_args": "", "old_implementation": "protected float aX() {\n protected boolean aY() {\n return this.aJ() <= 0.0F;\n protected void ba() {\n if (this.ag()) {\n this.a(f0, f1, this.bb() ? 0.04F : 0.02F);\n f4 = this.bc() * f3;\n boolean flag0 = this.af() && this instanceof EntityPlayer;\n protected boolean bb() {\n public float bc() {\n return this.bb() ? this.bo : 0.1F;\n this.bo = f0;\n public boolean bd() {\n int i0 = this.aQ();\n if (this.bp > 0) {\n --this.bp;", "old_return_type": "float", "old_signature": "float aW()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "protected float ba() {\n protected boolean bb() {\n return this.aM() <= 0.0F;\n protected void bd() {\n if (this.ah()) {\n this.a(f0, f1, this.be() ? 0.04F : 0.02F);\n f4 = this.bf() * f3;\n boolean flag0 = this.ag() && this instanceof EntityPlayer;\n protected boolean be() {\n public float bf() {\n return this.be() ? this.bp : 0.1F;\n this.bp = f0;\n public boolean bg() {\n int i0 = this.aT();\n if (this.bq > 0) {\n --this.bq;", "new_return_type": "float", "new_signature": "float aZ()", "old_args": "", "old_implementation": "protected float aX() {\n protected boolean aY() {\n return this.aJ() <= 0.0F;\n protected void ba() {\n if (this.ag()) {\n this.a(f0, f1, this.bb() ? 0.04F : 0.02F);\n f4 = this.bc() * f3;\n boolean flag0 = this.af() && this instanceof EntityPlayer;\n protected boolean bb() {\n public float bc() {\n return this.bb() ? this.bo : 0.1F;\n this.bo = f0;\n public boolean bd() {\n int i0 = this.aQ();\n if (this.bp > 0) {\n --this.bp;", "old_return_type": "float", "old_signature": "float aW()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "protected float ba() {\n protected boolean bb() {\n return this.aM() <= 0.0F;\n protected void bd() {\n if (this.ah()) {\n this.a(f0, f1, this.be() ? 0.04F : 0.02F);\n f4 = this.bf() * f3;\n boolean flag0 = this.ag() && this instanceof EntityPlayer;\n protected boolean be() {\n public float bf() {\n return this.be() ? this.bp : 0.1F;\n this.bp = f0;\n public boolean bg() {\n int i0 = this.aT();\n if (this.bq > 0) {\n --this.bq;", "new_return_type": "float", "new_signature": "float aZ()", "old_args": "", "old_implementation": "protected float aX() {\n protected boolean aY() {\n return this.aJ() <= 0.0F;\n protected void ba() {\n if (this.ag()) {\n this.a(f0, f1, this.bb() ? 0.04F : 0.02F);\n f4 = this.bc() * f3;\n boolean flag0 = this.af() && this instanceof EntityPlayer;\n protected boolean bb() {\n public float bc() {\n return this.bb() ? this.bo : 0.1F;\n this.bo = f0;\n public boolean bd() {\n int i0 = this.aQ();\n if (this.bp > 0) {\n --this.bp;", "old_return_type": "float", "old_signature": "float aW()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "protected float ba() {\n protected boolean bb() {\n return this.aM() <= 0.0F;\n protected void bd() {\n if (this.ah()) {\n this.a(f0, f1, this.be() ? 0.04F : 0.02F);\n f4 = this.bf() * f3;\n boolean flag0 = this.ag() && this instanceof EntityPlayer;\n protected boolean be() {\n public float bf() {\n return this.be() ? this.bp : 0.1F;\n this.bp = f0;\n public boolean bg() {\n int i0 = this.aT();\n if (this.bq > 0) {\n --this.bq;", "new_return_type": "float", "new_signature": "float aZ()", "old_args": "", "old_implementation": "protected float aX() {\n protected boolean aY() {\n return this.aJ() <= 0.0F;\n protected void ba() {\n if (this.ag()) {\n this.a(f0, f1, this.bb() ? 0.04F : 0.02F);\n f4 = this.bc() * f3;\n boolean flag0 = this.af() && this instanceof EntityPlayer;\n protected boolean bb() {\n public float bc() {\n return this.bb() ? this.bo : 0.1F;\n this.bo = f0;\n public boolean bd() {\n int i0 = this.aQ();\n if (this.bp > 0) {\n --this.bp;", "old_return_type": "float", "old_signature": "float aW()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "protected float ba() {\n protected boolean bb() {\n return this.aM() <= 0.0F;\n protected void bd() {\n if (this.ah()) {\n this.a(f0, f1, this.be() ? 0.04F : 0.02F);\n f4 = this.bf() * f3;\n boolean flag0 = this.ag() && this instanceof EntityPlayer;\n protected boolean be() {\n public float bf() {\n return this.be() ? this.bp : 0.1F;\n this.bp = f0;\n public boolean bg() {\n int i0 = this.aT();\n if (this.bq > 0) {\n --this.bq;", "new_return_type": "float", "new_signature": "float aZ()", "old_args": "", "old_implementation": "protected float aX() {\n protected boolean aY() {\n return this.aJ() <= 0.0F;\n protected void ba() {\n if (this.ag()) {\n this.a(f0, f1, this.bb() ? 0.04F : 0.02F);\n f4 = this.bc() * f3;\n boolean flag0 = this.af() && this instanceof EntityPlayer;\n protected boolean bb() {\n public float bc() {\n return this.bb() ? this.bo : 0.1F;\n this.bo = f0;\n public boolean bd() {\n int i0 = this.aQ();\n if (this.bp > 0) {\n --this.bp;", "old_return_type": "float", "old_signature": "float aW()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "protected float ba() {\n protected boolean bb() {\n return this.aM() <= 0.0F;\n protected void bd() {\n if (this.ah()) {\n this.a(f0, f1, this.be() ? 0.04F : 0.02F);\n f4 = this.bf() * f3;\n boolean flag0 = this.ag() && this instanceof EntityPlayer;\n protected boolean be() {\n public float bf() {\n return this.be() ? this.bp : 0.1F;\n this.bp = f0;\n public boolean bg() {\n int i0 = this.aT();\n if (this.bq > 0) {\n --this.bq;", "new_return_type": "float", "new_signature": "float aZ()", "old_args": "", "old_implementation": "protected float aX() {\n protected boolean aY() {\n return this.aJ() <= 0.0F;\n protected void ba() {\n if (this.ag()) {\n this.a(f0, f1, this.bb() ? 0.04F : 0.02F);\n f4 = this.bc() * f3;\n boolean flag0 = this.af() && this instanceof EntityPlayer;\n protected boolean bb() {\n public float bc() {\n return this.bb() ? this.bo : 0.1F;\n this.bo = f0;\n public boolean bd() {\n int i0 = this.aQ();\n if (this.bp > 0) {\n --this.bp;", "old_return_type": "float", "old_signature": "float aW()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "protected float ba() {\n protected boolean bb() {\n return this.aM() <= 0.0F;\n protected void bd() {\n if (this.ah()) {\n this.a(f0, f1, this.be() ? 0.04F : 0.02F);\n f4 = this.bf() * f3;\n boolean flag0 = this.ag() && this instanceof EntityPlayer;\n protected boolean be() {\n public float bf() {\n return this.be() ? this.bp : 0.1F;\n this.bp = f0;\n public boolean bg() {\n int i0 = this.aT();\n if (this.bq > 0) {\n --this.bq;", "new_return_type": "float", "new_signature": "float aZ()", "old_args": "", "old_implementation": "protected float aX() {\n protected boolean aY() {\n return this.aJ() <= 0.0F;\n protected void ba() {\n if (this.ag()) {\n this.a(f0, f1, this.bb() ? 0.04F : 0.02F);\n f4 = this.bc() * f3;\n boolean flag0 = this.af() && this instanceof EntityPlayer;\n protected boolean bb() {\n public float bc() {\n return this.bb() ? this.bo : 0.1F;\n this.bo = f0;\n public boolean bd() {\n int i0 = this.aQ();\n if (this.bp > 0) {\n --this.bp;", "old_return_type": "float", "old_signature": "float aW()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "protected float ba() {\n protected boolean bb() {\n return this.aM() <= 0.0F;\n protected void bd() {\n if (this.ah()) {\n this.a(f0, f1, this.be() ? 0.04F : 0.02F);\n f4 = this.bf() * f3;\n boolean flag0 = this.ag() && this instanceof EntityPlayer;\n protected boolean be() {\n public float bf() {\n return this.be() ? this.bp : 0.1F;\n this.bp = f0;\n public boolean bg() {\n int i0 = this.aT();\n if (this.bq > 0) {\n --this.bq;", "new_return_type": "float", "new_signature": "float aZ()", "old_args": "", "old_implementation": "protected float aX() {\n protected boolean aY() {\n return this.aJ() <= 0.0F;\n protected void ba() {\n if (this.ag()) {\n this.a(f0, f1, this.bb() ? 0.04F : 0.02F);\n f4 = this.bc() * f3;\n boolean flag0 = this.af() && this instanceof EntityPlayer;\n protected boolean bb() {\n public float bc() {\n return this.bb() ? this.bo : 0.1F;\n this.bo = f0;\n public boolean bd() {\n int i0 = this.aQ();\n if (this.bp > 0) {\n --this.bp;", "old_return_type": "float", "old_signature": "float aW()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "protected float ba() {\n protected boolean bb() {\n return this.aM() <= 0.0F;\n protected void bd() {\n if (this.ah()) {\n this.a(f0, f1, this.be() ? 0.04F : 0.02F);\n f4 = this.bf() * f3;\n boolean flag0 = this.ag() && this instanceof EntityPlayer;\n protected boolean be() {\n public float bf() {\n return this.be() ? this.bp : 0.1F;\n this.bp = f0;\n public boolean bg() {\n int i0 = this.aT();\n if (this.bq > 0) {\n --this.bq;", "new_return_type": "float", "new_signature": "float aZ()", "old_args": "", "old_implementation": "protected float aX() {\n protected boolean aY() {\n return this.aJ() <= 0.0F;\n protected void ba() {\n if (this.ag()) {\n this.a(f0, f1, this.bb() ? 0.04F : 0.02F);\n f4 = this.bc() * f3;\n boolean flag0 = this.af() && this instanceof EntityPlayer;\n protected boolean bb() {\n public float bc() {\n return this.bb() ? this.bo : 0.1F;\n this.bo = f0;\n public boolean bd() {\n int i0 = this.aQ();\n if (this.bp > 0) {\n --this.bp;", "old_return_type": "float", "old_signature": "float aW()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "protected float ba() {\n protected boolean bb() {\n return this.aM() <= 0.0F;\n protected void bd() {\n if (this.ah()) {\n this.a(f0, f1, this.be() ? 0.04F : 0.02F);\n f4 = this.bf() * f3;\n boolean flag0 = this.ag() && this instanceof EntityPlayer;\n protected boolean be() {\n public float bf() {\n return this.be() ? this.bp : 0.1F;\n this.bp = f0;\n public boolean bg() {\n int i0 = this.aT();\n if (this.bq > 0) {\n --this.bq;", "new_return_type": "float", "new_signature": "float aZ()", "old_args": "", "old_implementation": "protected float aX() {\n protected boolean aY() {\n return this.aJ() <= 0.0F;\n protected void ba() {\n if (this.ag()) {\n this.a(f0, f1, this.bb() ? 0.04F : 0.02F);\n f4 = this.bc() * f3;\n boolean flag0 = this.af() && this instanceof EntityPlayer;\n protected boolean bb() {\n public float bc() {\n return this.bb() ? this.bo : 0.1F;\n this.bo = f0;\n public boolean bd() {\n int i0 = this.aQ();\n if (this.bp > 0) {\n --this.bp;", "old_return_type": "float", "old_signature": "float aW()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "protected void aA() {\n protected void bo() {", "new_return_type": "void", "new_signature": "void bK()", "old_args": "", "old_implementation": "protected void az() {\n protected void bk() {", "old_return_type": "void", "old_signature": "void bG()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "protected void aA() {\n protected void bo() {", "new_return_type": "void", "new_signature": "void bK()", "old_args": "", "old_implementation": "protected void az() {\n protected void bk() {", "old_return_type": "void", "old_signature": "void bG()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "protected void bk() {\n this.bn = this.bJ();\n Entity entity = this.bL();", "new_return_type": "boolean", "new_signature": "boolean bJ()", "old_args": "", "old_implementation": "protected void bh() {\n this.bn = this.bF();\n Entity entity = this.bH();", "old_return_type": "boolean", "old_signature": "boolean bF()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "protected void aA() {\n protected void bo() {", "new_return_type": "void", "new_signature": "void bK()", "old_args": "", "old_implementation": "protected void az() {\n protected void bk() {", "old_return_type": "void", "old_signature": "void bG()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "protected void aA() {\n protected void bo() {", "new_return_type": "void", "new_signature": "void bK()", "old_args": "", "old_implementation": "protected void az() {\n protected void bk() {", "old_return_type": "void", "old_signature": "void bG()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "this.cJ();\n public int bU() {\n public String am() {\n if (this.bB()) {\n return this.bA();\n int i0 = this.bT();\n public boolean bV() {\n public boolean bW() {\n public boolean ca() {\n return this.bV();", "new_return_type": "int", "new_signature": "int bT()", "old_args": "", "old_implementation": "this.cF();\n public int bQ() {\n public String al() {\n if (this.bx()) {\n return this.bw();\n int i0 = this.bP();\n public boolean bR() {\n public boolean bS() {\n public boolean bW() {\n return this.bR();\n public float bY() {\n this.a(this.bY());\n public boolean bZ() {\n public void j(boolean flag0) {\n public void k(boolean flag0) {\n public boolean bC() {\n return !this.cu() && super.bC();\n public boolean ca() {\n public int cb() {\n public boolean cc() {\n public boolean cd() {\n public boolean ce() {\n public boolean cf() {\n this.cF();\n public void l(boolean flag0) {\n public void m(boolean flag0) {\n public void n(boolean flag0) {\n public void o(boolean flag0) {\n public int cg() {\n int i1 = MathHelper.a(this.cg() + i0, 0, this.cm());\n if (this.n != null && this.n.equals(entity)) {\n return false;", "old_return_type": "int", "old_signature": "int bP()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "this.cJ();\n public int bU() {\n public String am() {\n if (this.bB()) {\n return this.bA();\n int i0 = this.bT();\n public boolean bV() {\n public boolean bW() {\n public boolean ca() {\n return this.bV();", "new_return_type": "int", "new_signature": "int bT()", "old_args": "", "old_implementation": "this.cF();\n public int bQ() {\n public String al() {\n if (this.bx()) {\n return this.bw();\n int i0 = this.bP();\n public boolean bR() {\n public boolean bS() {\n public boolean bW() {\n return this.bR();\n public float bY() {\n this.a(this.bY());\n public boolean bZ() {\n public void j(boolean flag0) {\n public void k(boolean flag0) {\n public boolean bC() {\n return !this.cu() && super.bC();\n public boolean ca() {\n public int cb() {\n public boolean cc() {\n public boolean cd() {\n public boolean ce() {\n public boolean cf() {\n this.cF();\n public void l(boolean flag0) {\n public void m(boolean flag0) {\n public void n(boolean flag0) {\n public void o(boolean flag0) {\n public int cg() {\n int i1 = MathHelper.a(this.cg() + i0, 0, this.cm());\n if (this.n != null && this.n.equals(entity)) {\n return false;", "old_return_type": "int", "old_signature": "int bP()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "protected float ba() {\n protected boolean bb() {\n return this.aM() <= 0.0F;\n protected void bd() {\n if (this.ah()) {\n this.a(f0, f1, this.be() ? 0.04F : 0.02F);\n f4 = this.bf() * f3;\n boolean flag0 = this.ag() && this instanceof EntityPlayer;\n protected boolean be() {\n public float bf() {\n return this.be() ? this.bp : 0.1F;\n this.bp = f0;\n public boolean bg() {\n int i0 = this.aT();\n if (this.bq > 0) {\n --this.bq;", "new_return_type": "float", "new_signature": "float aZ()", "old_args": "", "old_implementation": "protected float aX() {\n protected boolean aY() {\n return this.aJ() <= 0.0F;\n protected void ba() {\n if (this.ag()) {\n this.a(f0, f1, this.bb() ? 0.04F : 0.02F);\n f4 = this.bc() * f3;\n boolean flag0 = this.af() && this instanceof EntityPlayer;\n protected boolean bb() {\n public float bc() {\n return this.bb() ? this.bo : 0.1F;\n this.bo = f0;\n public boolean bd() {\n int i0 = this.aQ();\n if (this.bp > 0) {\n --this.bp;", "old_return_type": "float", "old_signature": "float aW()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "protected float ba() {\n protected boolean bb() {\n return this.aM() <= 0.0F;\n protected void bd() {\n if (this.ah()) {\n this.a(f0, f1, this.be() ? 0.04F : 0.02F);\n f4 = this.bf() * f3;\n boolean flag0 = this.ag() && this instanceof EntityPlayer;\n protected boolean be() {\n public float bf() {\n return this.be() ? this.bp : 0.1F;\n this.bp = f0;\n public boolean bg() {\n int i0 = this.aT();\n if (this.bq > 0) {\n --this.bq;", "new_return_type": "float", "new_signature": "float aZ()", "old_args": "", "old_implementation": "protected float aX() {\n protected boolean aY() {\n return this.aJ() <= 0.0F;\n protected void ba() {\n if (this.ag()) {\n this.a(f0, f1, this.bb() ? 0.04F : 0.02F);\n f4 = this.bc() * f3;\n boolean flag0 = this.af() && this instanceof EntityPlayer;\n protected boolean bb() {\n public float bc() {\n return this.bb() ? this.bo : 0.1F;\n this.bo = f0;\n public boolean bd() {\n int i0 = this.aQ();\n if (this.bp > 0) {\n --this.bp;", "old_return_type": "float", "old_signature": "float aW()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "protected float ba() {\n protected boolean bb() {\n return this.aM() <= 0.0F;\n protected void bd() {\n if (this.ah()) {\n this.a(f0, f1, this.be() ? 0.04F : 0.02F);\n f4 = this.bf() * f3;\n boolean flag0 = this.ag() && this instanceof EntityPlayer;\n protected boolean be() {\n public float bf() {\n return this.be() ? this.bp : 0.1F;\n this.bp = f0;\n public boolean bg() {\n int i0 = this.aT();\n if (this.bq > 0) {\n --this.bq;", "new_return_type": "float", "new_signature": "float aZ()", "old_args": "", "old_implementation": "protected float aX() {\n protected boolean aY() {\n return this.aJ() <= 0.0F;\n protected void ba() {\n if (this.ag()) {\n this.a(f0, f1, this.bb() ? 0.04F : 0.02F);\n f4 = this.bc() * f3;\n boolean flag0 = this.af() && this instanceof EntityPlayer;\n protected boolean bb() {\n public float bc() {\n return this.bb() ? this.bo : 0.1F;\n this.bo = f0;\n public boolean bd() {\n int i0 = this.aQ();\n if (this.bp > 0) {\n --this.bp;", "old_return_type": "float", "old_signature": "float aW()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "protected float ba() {\n protected boolean bb() {\n return this.aM() <= 0.0F;\n protected void bd() {\n if (this.ah()) {\n this.a(f0, f1, this.be() ? 0.04F : 0.02F);\n f4 = this.bf() * f3;\n boolean flag0 = this.ag() && this instanceof EntityPlayer;\n protected boolean be() {\n public float bf() {\n return this.be() ? this.bp : 0.1F;\n this.bp = f0;\n public boolean bg() {\n int i0 = this.aT();\n if (this.bq > 0) {\n --this.bq;", "new_return_type": "float", "new_signature": "float aZ()", "old_args": "", "old_implementation": "protected float aX() {\n protected boolean aY() {\n return this.aJ() <= 0.0F;\n protected void ba() {\n if (this.ag()) {\n this.a(f0, f1, this.bb() ? 0.04F : 0.02F);\n f4 = this.bc() * f3;\n boolean flag0 = this.af() && this instanceof EntityPlayer;\n protected boolean bb() {\n public float bc() {\n return this.bb() ? this.bo : 0.1F;\n this.bo = f0;\n public boolean bd() {\n int i0 = this.aQ();\n if (this.bp > 0) {\n --this.bp;", "old_return_type": "float", "old_signature": "float aW()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "protected float ba() {\n protected boolean bb() {\n return this.aM() <= 0.0F;\n protected void bd() {\n if (this.ah()) {\n this.a(f0, f1, this.be() ? 0.04F : 0.02F);\n f4 = this.bf() * f3;\n boolean flag0 = this.ag() && this instanceof EntityPlayer;\n protected boolean be() {\n public float bf() {\n return this.be() ? this.bp : 0.1F;\n this.bp = f0;\n public boolean bg() {\n int i0 = this.aT();\n if (this.bq > 0) {\n --this.bq;", "new_return_type": "float", "new_signature": "float aZ()", "old_args": "", "old_implementation": "protected float aX() {\n protected boolean aY() {\n return this.aJ() <= 0.0F;\n protected void ba() {\n if (this.ag()) {\n this.a(f0, f1, this.bb() ? 0.04F : 0.02F);\n f4 = this.bc() * f3;\n boolean flag0 = this.af() && this instanceof EntityPlayer;\n protected boolean bb() {\n public float bc() {\n return this.bb() ? this.bo : 0.1F;\n this.bo = f0;\n public boolean bd() {\n int i0 = this.aQ();\n if (this.bp > 0) {\n --this.bp;", "old_return_type": "float", "old_signature": "float aW()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "protected float ba() {\n protected boolean bb() {\n return this.aM() <= 0.0F;\n protected void bd() {\n if (this.ah()) {\n this.a(f0, f1, this.be() ? 0.04F : 0.02F);\n f4 = this.bf() * f3;\n boolean flag0 = this.ag() && this instanceof EntityPlayer;\n protected boolean be() {\n public float bf() {\n return this.be() ? this.bp : 0.1F;\n this.bp = f0;\n public boolean bg() {\n int i0 = this.aT();\n if (this.bq > 0) {\n --this.bq;", "new_return_type": "float", "new_signature": "float aZ()", "old_args": "", "old_implementation": "protected float aX() {\n protected boolean aY() {\n return this.aJ() <= 0.0F;\n protected void ba() {\n if (this.ag()) {\n this.a(f0, f1, this.bb() ? 0.04F : 0.02F);\n f4 = this.bc() * f3;\n boolean flag0 = this.af() && this instanceof EntityPlayer;\n protected boolean bb() {\n public float bc() {\n return this.bb() ? this.bo : 0.1F;\n this.bo = f0;\n public boolean bd() {\n int i0 = this.aQ();\n if (this.bp > 0) {\n --this.bp;", "old_return_type": "float", "old_signature": "float aW()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "protected float ba() {\n protected boolean bb() {\n return this.aM() <= 0.0F;\n protected void bd() {\n if (this.ah()) {\n this.a(f0, f1, this.be() ? 0.04F : 0.02F);\n f4 = this.bf() * f3;\n boolean flag0 = this.ag() && this instanceof EntityPlayer;\n protected boolean be() {\n public float bf() {\n return this.be() ? this.bp : 0.1F;\n this.bp = f0;\n public boolean bg() {\n int i0 = this.aT();\n if (this.bq > 0) {\n --this.bq;", "new_return_type": "float", "new_signature": "float aZ()", "old_args": "", "old_implementation": "protected float aX() {\n protected boolean aY() {\n return this.aJ() <= 0.0F;\n protected void ba() {\n if (this.ag()) {\n this.a(f0, f1, this.bb() ? 0.04F : 0.02F);\n f4 = this.bc() * f3;\n boolean flag0 = this.af() && this instanceof EntityPlayer;\n protected boolean bb() {\n public float bc() {\n return this.bb() ? this.bo : 0.1F;\n this.bo = f0;\n public boolean bd() {\n int i0 = this.aQ();\n if (this.bp > 0) {\n --this.bp;", "old_return_type": "float", "old_signature": "float aW()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "protected float ba() {\n protected boolean bb() {\n return this.aM() <= 0.0F;\n protected void bd() {\n if (this.ah()) {\n this.a(f0, f1, this.be() ? 0.04F : 0.02F);\n f4 = this.bf() * f3;\n boolean flag0 = this.ag() && this instanceof EntityPlayer;\n protected boolean be() {\n public float bf() {\n return this.be() ? this.bp : 0.1F;\n this.bp = f0;\n public boolean bg() {\n int i0 = this.aT();\n if (this.bq > 0) {\n --this.bq;", "new_return_type": "float", "new_signature": "float aZ()", "old_args": "", "old_implementation": "protected float aX() {\n protected boolean aY() {\n return this.aJ() <= 0.0F;\n protected void ba() {\n if (this.ag()) {\n this.a(f0, f1, this.bb() ? 0.04F : 0.02F);\n f4 = this.bc() * f3;\n boolean flag0 = this.af() && this instanceof EntityPlayer;\n protected boolean bb() {\n public float bc() {\n return this.bb() ? this.bo : 0.1F;\n this.bo = f0;\n public boolean bd() {\n int i0 = this.aQ();\n if (this.bp > 0) {\n --this.bp;", "old_return_type": "float", "old_signature": "float aW()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "protected float ba() {\n protected boolean bb() {\n return this.aM() <= 0.0F;\n protected void bd() {\n if (this.ah()) {\n this.a(f0, f1, this.be() ? 0.04F : 0.02F);\n f4 = this.bf() * f3;\n boolean flag0 = this.ag() && this instanceof EntityPlayer;\n protected boolean be() {\n public float bf() {\n return this.be() ? this.bp : 0.1F;\n this.bp = f0;\n public boolean bg() {\n int i0 = this.aT();\n if (this.bq > 0) {\n --this.bq;", "new_return_type": "float", "new_signature": "float aZ()", "old_args": "", "old_implementation": "protected float aX() {\n protected boolean aY() {\n return this.aJ() <= 0.0F;\n protected void ba() {\n if (this.ag()) {\n this.a(f0, f1, this.bb() ? 0.04F : 0.02F);\n f4 = this.bc() * f3;\n boolean flag0 = this.af() && this instanceof EntityPlayer;\n protected boolean bb() {\n public float bc() {\n return this.bb() ? this.bo : 0.1F;\n this.bo = f0;\n public boolean bd() {\n int i0 = this.aQ();\n if (this.bp > 0) {\n --this.bp;", "old_return_type": "float", "old_signature": "float aW()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "protected float ba() {\n protected boolean bb() {\n return this.aM() <= 0.0F;\n protected void bd() {\n if (this.ah()) {\n this.a(f0, f1, this.be() ? 0.04F : 0.02F);\n f4 = this.bf() * f3;\n boolean flag0 = this.ag() && this instanceof EntityPlayer;\n protected boolean be() {\n public float bf() {\n return this.be() ? this.bp : 0.1F;\n this.bp = f0;\n public boolean bg() {\n int i0 = this.aT();\n if (this.bq > 0) {\n --this.bq;", "new_return_type": "float", "new_signature": "float aZ()", "old_args": "", "old_implementation": "protected float aX() {\n protected boolean aY() {\n return this.aJ() <= 0.0F;\n protected void ba() {\n if (this.ag()) {\n this.a(f0, f1, this.bb() ? 0.04F : 0.02F);\n f4 = this.bc() * f3;\n boolean flag0 = this.af() && this instanceof EntityPlayer;\n protected boolean bb() {\n public float bc() {\n return this.bb() ? this.bo : 0.1F;\n this.bo = f0;\n public boolean bd() {\n int i0 = this.aQ();\n if (this.bp > 0) {\n --this.bp;", "old_return_type": "float", "old_signature": "float aW()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "", "new_return_type": "void", "new_signature": "void bh()", "old_args": "", "old_implementation": "", "old_return_type": "void", "old_signature": "void be()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "", "new_return_type": "void", "new_signature": "void bh()", "old_args": "", "old_implementation": "", "old_return_type": "void", "old_signature": "void be()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "public void U() {\n super.U();\n protected void bj() {", "new_return_type": "void", "new_signature": "void bi()", "old_args": "", "old_implementation": "public void T() {\n super.T();\n protected void bg() {", "old_return_type": "void", "old_signature": "void bf()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "this.ah.b(18, Float.valueOf(this.aM()));\n this.ah.a(18, new Float(this.aM()));\n nbttagcompound.a(\"Angry\", this.cc());\n nbttagcompound.a(\"CollarColor\", (byte) this.cd());\n this.l(nbttagcompound.n(\"Angry\"));\n return this.cc() ? \"mob.wolf.growl\" : (this.ab.nextInt(3) == 0 ? (this.bT() && this.ah.d(18) < 10.0F ? \"mob.wolf.whine\" : \"mob.wolf.panting\") : \"mob.wolf.bark\");\n protected String aN() {\n protected String aO() {\n protected float aZ() {\n if (!this.q.I && this.bs && !this.bt && !this.bM() && this.F) {\n if (this.ce()) {\n if (this.ce()) {\n this.a(\"mob.wolf.shake\", this.aZ(), (this.ab.nextFloat() - this.ab.nextFloat()) * 0.2F + 1.0F);\n public int bp() {\n return this.bU() ? 20 : super.bp();\n if (this.aq()) {\n int i0 = this.bT() ? 4 : 2;\n public void j(boolean flag0) {\n super.j(flag0);\n if (this.bT()) {\n if (i0 != this.cd()) {\n this.bp.a(!this.bU());\n this.b((Entity) null);\n this.d((EntityLivingBase) null);", "new_return_type": "void", "new_signature": "void bj()", "old_args": "", "old_implementation": "this.ah.b(18, Float.valueOf(this.aJ()));\n this.ah.a(18, new Float(this.aJ()));\n nbttagcompound.a(\"Angry\", this.bY());\n nbttagcompound.a(\"CollarColor\", (byte) this.bZ());\n this.m(nbttagcompound.n(\"Angry\"));\n return this.bY() ? \"mob.wolf.growl\" : (this.ab.nextInt(3) == 0 ? (this.bP() && this.ah.d(18) < 10.0F ? \"mob.wolf.whine\" : \"mob.wolf.panting\") : \"mob.wolf.bark\");\n protected String aK() {\n protected String aL() {\n protected float aW() {\n if (!this.q.I && this.bs && !this.bt && !this.bI() && this.F) {\n if (this.ca()) {\n if (this.ca()) {\n this.a(\"mob.wolf.shake\", this.aW(), (this.ab.nextFloat() - this.ab.nextFloat()) * 0.2F + 1.0F);\n public int bl() {\n return this.bQ() ? 20 : super.bl();\n if (this.ap()) {\n int i0 = this.bP() ? 4 : 2;\n public void k(boolean flag0) {\n super.k(flag0);\n if (this.bP()) {\n if (i0 != this.bZ()) {\n this.bp.a(!this.bQ());", "old_return_type": "void", "old_signature": "void bg()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "this.ah.b(18, Float.valueOf(this.aM()));\n this.ah.a(18, new Float(this.aM()));\n nbttagcompound.a(\"Angry\", this.cc());\n nbttagcompound.a(\"CollarColor\", (byte) this.cd());\n this.l(nbttagcompound.n(\"Angry\"));\n return this.cc() ? \"mob.wolf.growl\" : (this.ab.nextInt(3) == 0 ? (this.bT() && this.ah.d(18) < 10.0F ? \"mob.wolf.whine\" : \"mob.wolf.panting\") : \"mob.wolf.bark\");\n protected String aN() {\n protected String aO() {\n protected float aZ() {\n if (!this.q.I && this.bs && !this.bt && !this.bM() && this.F) {\n if (this.ce()) {\n if (this.ce()) {\n this.a(\"mob.wolf.shake\", this.aZ(), (this.ab.nextFloat() - this.ab.nextFloat()) * 0.2F + 1.0F);\n public int bp() {\n return this.bU() ? 20 : super.bp();\n if (this.aq()) {\n int i0 = this.bT() ? 4 : 2;\n public void j(boolean flag0) {\n super.j(flag0);\n if (this.bT()) {\n if (i0 != this.cd()) {\n this.bp.a(!this.bU());\n this.b((Entity) null);\n this.d((EntityLivingBase) null);", "new_return_type": "void", "new_signature": "void bj()", "old_args": "", "old_implementation": "this.ah.b(18, Float.valueOf(this.aJ()));\n this.ah.a(18, new Float(this.aJ()));\n nbttagcompound.a(\"Angry\", this.bY());\n nbttagcompound.a(\"CollarColor\", (byte) this.bZ());\n this.m(nbttagcompound.n(\"Angry\"));\n return this.bY() ? \"mob.wolf.growl\" : (this.ab.nextInt(3) == 0 ? (this.bP() && this.ah.d(18) < 10.0F ? \"mob.wolf.whine\" : \"mob.wolf.panting\") : \"mob.wolf.bark\");\n protected String aK() {\n protected String aL() {\n protected float aW() {\n if (!this.q.I && this.bs && !this.bt && !this.bI() && this.F) {\n if (this.ca()) {\n if (this.ca()) {\n this.a(\"mob.wolf.shake\", this.aW(), (this.ab.nextFloat() - this.ab.nextFloat()) * 0.2F + 1.0F);\n public int bl() {\n return this.bQ() ? 20 : super.bl();\n if (this.ap()) {\n int i0 = this.bP() ? 4 : 2;\n public void k(boolean flag0) {\n super.k(flag0);\n if (this.bP()) {\n if (i0 != this.bZ()) {\n this.bp.a(!this.bQ());", "old_return_type": "void", "old_signature": "void bg()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "this.ah.b(18, Float.valueOf(this.aM()));\n this.ah.a(18, new Float(this.aM()));\n nbttagcompound.a(\"Angry\", this.cc());\n nbttagcompound.a(\"CollarColor\", (byte) this.cd());\n this.l(nbttagcompound.n(\"Angry\"));\n return this.cc() ? \"mob.wolf.growl\" : (this.ab.nextInt(3) == 0 ? (this.bT() && this.ah.d(18) < 10.0F ? \"mob.wolf.whine\" : \"mob.wolf.panting\") : \"mob.wolf.bark\");\n protected String aN() {\n protected String aO() {\n protected float aZ() {\n if (!this.q.I && this.bs && !this.bt && !this.bM() && this.F) {\n if (this.ce()) {\n if (this.ce()) {\n this.a(\"mob.wolf.shake\", this.aZ(), (this.ab.nextFloat() - this.ab.nextFloat()) * 0.2F + 1.0F);\n public int bp() {\n return this.bU() ? 20 : super.bp();\n if (this.aq()) {\n int i0 = this.bT() ? 4 : 2;\n public void j(boolean flag0) {\n super.j(flag0);\n if (this.bT()) {\n if (i0 != this.cd()) {\n this.bp.a(!this.bU());\n this.b((Entity) null);\n this.d((EntityLivingBase) null);", "new_return_type": "void", "new_signature": "void bj()", "old_args": "", "old_implementation": "this.ah.b(18, Float.valueOf(this.aJ()));\n this.ah.a(18, new Float(this.aJ()));\n nbttagcompound.a(\"Angry\", this.bY());\n nbttagcompound.a(\"CollarColor\", (byte) this.bZ());\n this.m(nbttagcompound.n(\"Angry\"));\n return this.bY() ? \"mob.wolf.growl\" : (this.ab.nextInt(3) == 0 ? (this.bP() && this.ah.d(18) < 10.0F ? \"mob.wolf.whine\" : \"mob.wolf.panting\") : \"mob.wolf.bark\");\n protected String aK() {\n protected String aL() {\n protected float aW() {\n if (!this.q.I && this.bs && !this.bt && !this.bI() && this.F) {\n if (this.ca()) {\n if (this.ca()) {\n this.a(\"mob.wolf.shake\", this.aW(), (this.ab.nextFloat() - this.ab.nextFloat()) * 0.2F + 1.0F);\n public int bl() {\n return this.bQ() ? 20 : super.bl();\n if (this.ap()) {\n int i0 = this.bP() ? 4 : 2;\n public void k(boolean flag0) {\n super.k(flag0);\n if (this.bP()) {\n if (i0 != this.bZ()) {\n this.bp.a(!this.bQ());", "old_return_type": "void", "old_signature": "void bg()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "this.ah.b(18, Float.valueOf(this.aM()));\n this.ah.a(18, new Float(this.aM()));\n nbttagcompound.a(\"Angry\", this.cc());\n nbttagcompound.a(\"CollarColor\", (byte) this.cd());\n this.l(nbttagcompound.n(\"Angry\"));\n return this.cc() ? \"mob.wolf.growl\" : (this.ab.nextInt(3) == 0 ? (this.bT() && this.ah.d(18) < 10.0F ? \"mob.wolf.whine\" : \"mob.wolf.panting\") : \"mob.wolf.bark\");\n protected String aN() {\n protected String aO() {\n protected float aZ() {\n if (!this.q.I && this.bs && !this.bt && !this.bM() && this.F) {\n if (this.ce()) {\n if (this.ce()) {\n this.a(\"mob.wolf.shake\", this.aZ(), (this.ab.nextFloat() - this.ab.nextFloat()) * 0.2F + 1.0F);\n public int bp() {\n return this.bU() ? 20 : super.bp();\n if (this.aq()) {\n int i0 = this.bT() ? 4 : 2;\n public void j(boolean flag0) {\n super.j(flag0);\n if (this.bT()) {\n if (i0 != this.cd()) {\n this.bp.a(!this.bU());\n this.b((Entity) null);\n this.d((EntityLivingBase) null);", "new_return_type": "void", "new_signature": "void bj()", "old_args": "", "old_implementation": "this.ah.b(18, Float.valueOf(this.aJ()));\n this.ah.a(18, new Float(this.aJ()));\n nbttagcompound.a(\"Angry\", this.bY());\n nbttagcompound.a(\"CollarColor\", (byte) this.bZ());\n this.m(nbttagcompound.n(\"Angry\"));\n return this.bY() ? \"mob.wolf.growl\" : (this.ab.nextInt(3) == 0 ? (this.bP() && this.ah.d(18) < 10.0F ? \"mob.wolf.whine\" : \"mob.wolf.panting\") : \"mob.wolf.bark\");\n protected String aK() {\n protected String aL() {\n protected float aW() {\n if (!this.q.I && this.bs && !this.bt && !this.bI() && this.F) {\n if (this.ca()) {\n if (this.ca()) {\n this.a(\"mob.wolf.shake\", this.aW(), (this.ab.nextFloat() - this.ab.nextFloat()) * 0.2F + 1.0F);\n public int bl() {\n return this.bQ() ? 20 : super.bl();\n if (this.ap()) {\n int i0 = this.bP() ? 4 : 2;\n public void k(boolean flag0) {\n super.k(flag0);\n if (this.bP()) {\n if (i0 != this.bZ()) {\n this.bp.a(!this.bQ());", "old_return_type": "void", "old_signature": "void bg()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "protected void ay() {\n super.ay();\n protected void bh() {\n super.bh();\n public boolean by() {\n ItemStack itemstack = ((EntityPlayer) this.n).aY();\n nbttagcompound.a(\"Saddle\", this.bT());\n this.i(nbttagcompound.n(\"Saddle\"));\n protected String aN() {\n protected String aO() {", "new_return_type": "boolean", "new_signature": "boolean be()", "old_args": "", "old_implementation": "protected void ax() {\n super.ax();\n protected void be() {\n super.be();\n public boolean bu() {\n ItemStack itemstack = ((EntityPlayer) this.n).aV();\n nbttagcompound.a(\"Saddle\", this.bP());\n this.j(nbttagcompound.n(\"Saddle\"));\n protected String aK() {\n protected String aL() {", "old_return_type": "boolean", "old_signature": "boolean bb()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "protected void ay() {\n super.ay();\n protected void bh() {\n super.bh();\n public boolean by() {\n ItemStack itemstack = ((EntityPlayer) this.n).aY();\n nbttagcompound.a(\"Saddle\", this.bT());\n this.i(nbttagcompound.n(\"Saddle\"));\n protected String aN() {\n protected String aO() {", "new_return_type": "boolean", "new_signature": "boolean be()", "old_args": "", "old_implementation": "protected void ax() {\n super.ax();\n protected void be() {\n super.be();\n public boolean bu() {\n ItemStack itemstack = ((EntityPlayer) this.n).aV();\n nbttagcompound.a(\"Saddle\", this.bP());\n this.j(nbttagcompound.n(\"Saddle\"));\n protected String aK() {\n protected String aL() {", "old_return_type": "boolean", "old_signature": "boolean bb()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "protected void ay() {\n super.ay();\n protected void bh() {\n super.bh();\n public boolean by() {\n ItemStack itemstack = ((EntityPlayer) this.n).aY();\n nbttagcompound.a(\"Saddle\", this.bT());\n this.i(nbttagcompound.n(\"Saddle\"));\n protected String aN() {\n protected String aO() {", "new_return_type": "boolean", "new_signature": "boolean be()", "old_args": "", "old_implementation": "protected void ax() {\n super.ax();\n protected void be() {\n super.be();\n public boolean bu() {\n ItemStack itemstack = ((EntityPlayer) this.n).aV();\n nbttagcompound.a(\"Saddle\", this.bP());\n this.j(nbttagcompound.n(\"Saddle\"));\n protected String aK() {\n protected String aL() {", "old_return_type": "boolean", "old_signature": "boolean bb()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "protected void ay() {\n super.ay();\n protected void bh() {\n super.bh();\n public boolean by() {\n ItemStack itemstack = ((EntityPlayer) this.n).aY();\n nbttagcompound.a(\"Saddle\", this.bT());\n this.i(nbttagcompound.n(\"Saddle\"));\n protected String aN() {\n protected String aO() {", "new_return_type": "boolean", "new_signature": "boolean be()", "old_args": "", "old_implementation": "protected void ax() {\n super.ax();\n protected void be() {\n super.be();\n public boolean bu() {\n ItemStack itemstack = ((EntityPlayer) this.n).aV();\n nbttagcompound.a(\"Saddle\", this.bP());\n this.j(nbttagcompound.n(\"Saddle\"));\n protected String aK() {\n protected String aL() {", "old_return_type": "boolean", "old_signature": "boolean bb()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "protected void ay() {\n super.ay();\n protected void bh() {\n super.bh();\n public boolean by() {\n ItemStack itemstack = ((EntityPlayer) this.n).aY();\n nbttagcompound.a(\"Saddle\", this.bT());\n this.i(nbttagcompound.n(\"Saddle\"));\n protected String aN() {\n protected String aO() {", "new_return_type": "boolean", "new_signature": "boolean be()", "old_args": "", "old_implementation": "protected void ax() {\n super.ax();\n protected void be() {\n super.be();\n public boolean bu() {\n ItemStack itemstack = ((EntityPlayer) this.n).aV();\n nbttagcompound.a(\"Saddle\", this.bP());\n this.j(nbttagcompound.n(\"Saddle\"));\n protected String aK() {\n protected String aL() {", "old_return_type": "boolean", "old_signature": "boolean bb()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "protected void ay() {\n super.ay();\n protected void bh() {\n super.bh();\n public boolean by() {\n ItemStack itemstack = ((EntityPlayer) this.n).aY();\n nbttagcompound.a(\"Saddle\", this.bT());\n this.i(nbttagcompound.n(\"Saddle\"));\n protected String aN() {\n protected String aO() {", "new_return_type": "boolean", "new_signature": "boolean be()", "old_args": "", "old_implementation": "protected void ax() {\n super.ax();\n protected void be() {\n super.be();\n public boolean bu() {\n ItemStack itemstack = ((EntityPlayer) this.n).aV();\n nbttagcompound.a(\"Saddle\", this.bP());\n this.j(nbttagcompound.n(\"Saddle\"));\n protected String aK() {\n protected String aL() {", "old_return_type": "boolean", "old_signature": "boolean bb()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "protected void ay() {\n super.ay();\n protected void bh() {\n super.bh();\n public boolean by() {\n ItemStack itemstack = ((EntityPlayer) this.n).aY();\n nbttagcompound.a(\"Saddle\", this.bT());\n this.i(nbttagcompound.n(\"Saddle\"));\n protected String aN() {\n protected String aO() {", "new_return_type": "boolean", "new_signature": "boolean be()", "old_args": "", "old_implementation": "protected void ax() {\n super.ax();\n protected void be() {\n super.be();\n public boolean bu() {\n ItemStack itemstack = ((EntityPlayer) this.n).aV();\n nbttagcompound.a(\"Saddle\", this.bP());\n this.j(nbttagcompound.n(\"Saddle\"));\n protected String aK() {\n protected String aL() {", "old_return_type": "boolean", "old_signature": "boolean bb()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "protected void ay() {\n super.ay();\n protected void bh() {\n super.bh();\n public boolean by() {\n ItemStack itemstack = ((EntityPlayer) this.n).aY();\n nbttagcompound.a(\"Saddle\", this.bT());\n this.i(nbttagcompound.n(\"Saddle\"));\n protected String aN() {\n protected String aO() {", "new_return_type": "boolean", "new_signature": "boolean be()", "old_args": "", "old_implementation": "protected void ax() {\n super.ax();\n protected void be() {\n super.be();\n public boolean bu() {\n ItemStack itemstack = ((EntityPlayer) this.n).aV();\n nbttagcompound.a(\"Saddle\", this.bP());\n this.j(nbttagcompound.n(\"Saddle\"));\n protected String aK() {\n protected String aL() {", "old_return_type": "boolean", "old_signature": "boolean bb()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "protected void ay() {\n super.ay();\n protected void bh() {\n super.bh();\n public boolean by() {\n ItemStack itemstack = ((EntityPlayer) this.n).aY();\n nbttagcompound.a(\"Saddle\", this.bT());\n this.i(nbttagcompound.n(\"Saddle\"));\n protected String aN() {\n protected String aO() {", "new_return_type": "boolean", "new_signature": "boolean be()", "old_args": "", "old_implementation": "protected void ax() {\n super.ax();\n protected void be() {\n super.be();\n public boolean bu() {\n ItemStack itemstack = ((EntityPlayer) this.n).aV();\n nbttagcompound.a(\"Saddle\", this.bP());\n this.j(nbttagcompound.n(\"Saddle\"));\n protected String aK() {\n protected String aL() {", "old_return_type": "boolean", "old_signature": "boolean bb()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "protected void ay() {\n super.ay();\n protected void bh() {\n super.bh();\n public boolean by() {\n ItemStack itemstack = ((EntityPlayer) this.n).aY();\n nbttagcompound.a(\"Saddle\", this.bT());\n this.i(nbttagcompound.n(\"Saddle\"));\n protected String aN() {\n protected String aO() {", "new_return_type": "boolean", "new_signature": "boolean be()", "old_args": "", "old_implementation": "protected void ax() {\n super.ax();\n protected void be() {\n super.be();\n public boolean bu() {\n ItemStack itemstack = ((EntityPlayer) this.n).aV();\n nbttagcompound.a(\"Saddle\", this.bP());\n this.j(nbttagcompound.n(\"Saddle\"));\n protected String aK() {\n protected String aL() {", "old_return_type": "boolean", "old_signature": "boolean bb()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "protected void ay() {\n super.ay();\n protected void bh() {\n super.bh();\n public boolean by() {\n ItemStack itemstack = ((EntityPlayer) this.n).aY();\n nbttagcompound.a(\"Saddle\", this.bT());\n this.i(nbttagcompound.n(\"Saddle\"));\n protected String aN() {\n protected String aO() {", "new_return_type": "boolean", "new_signature": "boolean be()", "old_args": "", "old_implementation": "protected void ax() {\n super.ax();\n protected void be() {\n super.be();\n public boolean bu() {\n ItemStack itemstack = ((EntityPlayer) this.n).aV();\n nbttagcompound.a(\"Saddle\", this.bP());\n this.j(nbttagcompound.n(\"Saddle\"));\n protected String aK() {\n protected String aL() {", "old_return_type": "boolean", "old_signature": "boolean bb()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "protected void ay() {\n super.ay();\n protected void bh() {\n super.bh();\n public boolean by() {\n ItemStack itemstack = ((EntityPlayer) this.n).aY();\n nbttagcompound.a(\"Saddle\", this.bT());\n this.i(nbttagcompound.n(\"Saddle\"));\n protected String aN() {\n protected String aO() {", "new_return_type": "boolean", "new_signature": "boolean be()", "old_args": "", "old_implementation": "protected void ax() {\n super.ax();\n protected void be() {\n super.be();\n public boolean bu() {\n ItemStack itemstack = ((EntityPlayer) this.n).aV();\n nbttagcompound.a(\"Saddle\", this.bP());\n this.j(nbttagcompound.n(\"Saddle\"));\n protected String aK() {\n protected String aL() {", "old_return_type": "boolean", "old_signature": "boolean bb()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "protected void ay() {\n super.ay();\n protected void bh() {\n super.bh();\n public boolean by() {\n ItemStack itemstack = ((EntityPlayer) this.n).aY();\n nbttagcompound.a(\"Saddle\", this.bT());\n this.i(nbttagcompound.n(\"Saddle\"));\n protected String aN() {\n protected String aO() {", "new_return_type": "boolean", "new_signature": "boolean be()", "old_args": "", "old_implementation": "protected void ax() {\n super.ax();\n protected void be() {\n super.be();\n public boolean bu() {\n ItemStack itemstack = ((EntityPlayer) this.n).aV();\n nbttagcompound.a(\"Saddle\", this.bP());\n this.j(nbttagcompound.n(\"Saddle\"));\n protected String aK() {\n protected String aL() {", "old_return_type": "boolean", "old_signature": "boolean bb()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {", "new_return_type": "String", "new_signature": "String aN()", "old_args": "", "old_implementation": "protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {", "old_return_type": "String", "old_signature": "String aK()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {", "new_return_type": "String", "new_signature": "String aN()", "old_args": "", "old_implementation": "protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {", "old_return_type": "String", "old_signature": "String aK()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {", "new_return_type": "String", "new_signature": "String aN()", "old_args": "", "old_implementation": "protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {", "old_return_type": "String", "old_signature": "String aK()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {", "new_return_type": "String", "new_signature": "String aN()", "old_args": "", "old_implementation": "protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {", "old_return_type": "String", "old_signature": "String aK()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {", "new_return_type": "String", "new_signature": "String aN()", "old_args": "", "old_implementation": "protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {", "old_return_type": "String", "old_signature": "String aK()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {", "new_return_type": "String", "new_signature": "String aN()", "old_args": "", "old_implementation": "protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {", "old_return_type": "String", "old_signature": "String aK()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {", "new_return_type": "String", "new_signature": "String aN()", "old_args": "", "old_implementation": "protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {", "old_return_type": "String", "old_signature": "String aK()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {", "new_return_type": "String", "new_signature": "String aN()", "old_args": "", "old_implementation": "protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {", "old_return_type": "String", "old_signature": "String aK()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {", "new_return_type": "String", "new_signature": "String aN()", "old_args": "", "old_implementation": "protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {", "old_return_type": "String", "old_signature": "String aK()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {", "new_return_type": "String", "new_signature": "String aN()", "old_args": "", "old_implementation": "protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {", "old_return_type": "String", "old_signature": "String aK()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {", "new_return_type": "String", "new_signature": "String aN()", "old_args": "", "old_implementation": "protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {", "old_return_type": "String", "old_signature": "String aK()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {", "new_return_type": "String", "new_signature": "String aN()", "old_args": "", "old_implementation": "protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {", "old_return_type": "String", "old_signature": "String aK()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {", "new_return_type": "String", "new_signature": "String aN()", "old_args": "", "old_implementation": "protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {", "old_return_type": "String", "old_signature": "String aK()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {", "new_return_type": "String", "new_signature": "String aN()", "old_args": "", "old_implementation": "protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {", "old_return_type": "String", "old_signature": "String aK()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {", "new_return_type": "String", "new_signature": "String aN()", "old_args": "", "old_implementation": "protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {", "old_return_type": "String", "old_signature": "String aK()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {", "new_return_type": "String", "new_signature": "String aN()", "old_args": "", "old_implementation": "protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {", "old_return_type": "String", "old_signature": "String aK()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {", "new_return_type": "String", "new_signature": "String aN()", "old_args": "", "old_implementation": "protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {", "old_return_type": "String", "old_signature": "String aK()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {", "new_return_type": "String", "new_signature": "String aN()", "old_args": "", "old_implementation": "protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {", "old_return_type": "String", "old_signature": "String aK()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {", "new_return_type": "String", "new_signature": "String aN()", "old_args": "", "old_implementation": "protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {", "old_return_type": "String", "old_signature": "String aK()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {", "new_return_type": "String", "new_signature": "String aN()", "old_args": "", "old_implementation": "protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {", "old_return_type": "String", "old_signature": "String aK()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {", "new_return_type": "String", "new_signature": "String aN()", "old_args": "", "old_implementation": "protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {", "old_return_type": "String", "old_signature": "String aK()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {", "new_return_type": "String", "new_signature": "String aN()", "old_args": "", "old_implementation": "protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {", "old_return_type": "String", "old_signature": "String aK()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {", "new_return_type": "String", "new_signature": "String aN()", "old_args": "", "old_implementation": "protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {", "old_return_type": "String", "old_signature": "String aK()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {", "new_return_type": "String", "new_signature": "String aN()", "old_args": "", "old_implementation": "protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {", "old_return_type": "String", "old_signature": "String aK()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {", "new_return_type": "String", "new_signature": "String aN()", "old_args": "", "old_implementation": "protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {", "old_return_type": "String", "old_signature": "String aK()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {", "new_return_type": "String", "new_signature": "String aN()", "old_args": "", "old_implementation": "protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {", "old_return_type": "String", "old_signature": "String aK()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {", "new_return_type": "String", "new_signature": "String aN()", "old_args": "", "old_implementation": "protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {", "old_return_type": "String", "old_signature": "String aK()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {", "new_return_type": "String", "new_signature": "String aN()", "old_args": "", "old_implementation": "protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {", "old_return_type": "String", "old_signature": "String aK()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {", "new_return_type": "String", "new_signature": "String aN()", "old_args": "", "old_implementation": "protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {", "old_return_type": "String", "old_signature": "String aK()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {", "new_return_type": "String", "new_signature": "String aN()", "old_args": "", "old_implementation": "protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {", "old_return_type": "String", "old_signature": "String aK()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {", "new_return_type": "String", "new_signature": "String aN()", "old_args": "", "old_implementation": "protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {", "old_return_type": "String", "old_signature": "String aK()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {", "new_return_type": "String", "new_signature": "String aN()", "old_args": "", "old_implementation": "protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {", "old_return_type": "String", "old_signature": "String aK()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {", "new_return_type": "String", "new_signature": "String aN()", "old_args": "", "old_implementation": "protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {", "old_return_type": "String", "old_signature": "String aK()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {", "new_return_type": "String", "new_signature": "String aN()", "old_args": "", "old_implementation": "protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {", "old_return_type": "String", "old_signature": "String aK()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {", "new_return_type": "String", "new_signature": "String aN()", "old_args": "", "old_implementation": "protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {", "old_return_type": "String", "old_signature": "String aK()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {", "new_return_type": "String", "new_signature": "String aN()", "old_args": "", "old_implementation": "protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {", "old_return_type": "String", "old_signature": "String aK()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {", "new_return_type": "String", "new_signature": "String aN()", "old_args": "", "old_implementation": "protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {", "old_return_type": "String", "old_signature": "String aK()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {", "new_return_type": "String", "new_signature": "String aN()", "old_args": "", "old_implementation": "protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {", "old_return_type": "String", "old_signature": "String aK()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {", "new_return_type": "String", "new_signature": "String aN()", "old_args": "", "old_implementation": "protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {", "old_return_type": "String", "old_signature": "String aK()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {", "new_return_type": "String", "new_signature": "String aN()", "old_args": "", "old_implementation": "protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {", "old_return_type": "String", "old_signature": "String aK()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {", "new_return_type": "String", "new_signature": "String aN()", "old_args": "", "old_implementation": "protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {", "old_return_type": "String", "old_signature": "String aK()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {", "new_return_type": "String", "new_signature": "String aN()", "old_args": "", "old_implementation": "protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {", "old_return_type": "String", "old_signature": "String aK()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {", "new_return_type": "String", "new_signature": "String aN()", "old_args": "", "old_implementation": "protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {", "old_return_type": "String", "old_signature": "String aK()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {", "new_return_type": "String", "new_signature": "String aN()", "old_args": "", "old_implementation": "protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {", "old_return_type": "String", "old_signature": "String aK()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {", "new_return_type": "String", "new_signature": "String aN()", "old_args": "", "old_implementation": "protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {", "old_return_type": "String", "old_signature": "String aK()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {", "new_return_type": "String", "new_signature": "String aN()", "old_args": "", "old_implementation": "protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {", "old_return_type": "String", "old_signature": "String aK()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {", "new_return_type": "String", "new_signature": "String aN()", "old_args": "", "old_implementation": "protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {", "old_return_type": "String", "old_signature": "String aK()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {", "new_return_type": "String", "new_signature": "String aN()", "old_args": "", "old_implementation": "protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {", "old_return_type": "String", "old_signature": "String aK()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {", "new_return_type": "String", "new_signature": "String aN()", "old_args": "", "old_implementation": "protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {", "old_return_type": "String", "old_signature": "String aK()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {", "new_return_type": "String", "new_signature": "String aN()", "old_args": "", "old_implementation": "protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {", "old_return_type": "String", "old_signature": "String aK()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {", "new_return_type": "String", "new_signature": "String aN()", "old_args": "", "old_implementation": "protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {", "old_return_type": "String", "old_signature": "String aK()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {", "new_return_type": "String", "new_signature": "String aN()", "old_args": "", "old_implementation": "protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {", "old_return_type": "String", "old_signature": "String aK()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "public void c(PotionEffect potioneffect) {", "new_return_type": "void", "new_signature": "void bo()", "old_args": "", "old_implementation": "public void d(PotionEffect potioneffect) {", "old_return_type": "void", "old_signature": "void bk()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "if (this.aq()) {", "new_return_type": "int", "new_signature": "int aP()", "old_args": "", "old_implementation": "if (this.ap()) {", "old_return_type": "int", "old_signature": "int aM()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "if (this.aq()) {", "new_return_type": "int", "new_signature": "int aP()", "old_args": "", "old_implementation": "if (this.ap()) {", "old_return_type": "int", "old_signature": "int aM()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "if (this.aq()) {", "new_return_type": "int", "new_signature": "int aP()", "old_args": "", "old_implementation": "if (this.ap()) {", "old_return_type": "int", "old_signature": "int aM()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "if (this.aq()) {", "new_return_type": "int", "new_signature": "int aP()", "old_args": "", "old_implementation": "if (this.ap()) {", "old_return_type": "int", "old_signature": "int aM()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "if (this.aq()) {", "new_return_type": "int", "new_signature": "int aP()", "old_args": "", "old_implementation": "if (this.ap()) {", "old_return_type": "int", "old_signature": "int aM()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);", "new_return_type": "void", "new_signature": "void ay()", "old_args": "", "old_implementation": "super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;", "old_return_type": "void", "old_signature": "void ax()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "this.ah.b(18, Float.valueOf(this.aM()));\n this.ah.a(18, new Float(this.aM()));\n nbttagcompound.a(\"Angry\", this.cc());\n nbttagcompound.a(\"CollarColor\", (byte) this.cd());\n this.l(nbttagcompound.n(\"Angry\"));\n return this.cc() ? \"mob.wolf.growl\" : (this.ab.nextInt(3) == 0 ? (this.bT() && this.ah.d(18) < 10.0F ? \"mob.wolf.whine\" : \"mob.wolf.panting\") : \"mob.wolf.bark\");\n protected String aN() {\n protected String aO() {\n protected float aZ() {\n if (!this.q.I && this.bs && !this.bt && !this.bM() && this.F) {\n if (this.ce()) {\n if (this.ce()) {\n this.a(\"mob.wolf.shake\", this.aZ(), (this.ab.nextFloat() - this.ab.nextFloat()) * 0.2F + 1.0F);\n public int bp() {\n return this.bU() ? 20 : super.bp();\n if (this.aq()) {\n int i0 = this.bT() ? 4 : 2;\n public void j(boolean flag0) {\n super.j(flag0);\n if (this.bT()) {\n if (i0 != this.cd()) {\n this.bp.a(!this.bU());\n this.b((Entity) null);\n this.d((EntityLivingBase) null);", "new_return_type": "void", "new_signature": "void bj()", "old_args": "", "old_implementation": "this.ah.b(18, Float.valueOf(this.aJ()));\n this.ah.a(18, new Float(this.aJ()));\n nbttagcompound.a(\"Angry\", this.bY());\n nbttagcompound.a(\"CollarColor\", (byte) this.bZ());\n this.m(nbttagcompound.n(\"Angry\"));\n return this.bY() ? \"mob.wolf.growl\" : (this.ab.nextInt(3) == 0 ? (this.bP() && this.ah.d(18) < 10.0F ? \"mob.wolf.whine\" : \"mob.wolf.panting\") : \"mob.wolf.bark\");\n protected String aK() {\n protected String aL() {\n protected float aW() {\n if (!this.q.I && this.bs && !this.bt && !this.bI() && this.F) {\n if (this.ca()) {\n if (this.ca()) {\n this.a(\"mob.wolf.shake\", this.aW(), (this.ab.nextFloat() - this.ab.nextFloat()) * 0.2F + 1.0F);\n public int bl() {\n return this.bQ() ? 20 : super.bl();\n if (this.ap()) {\n int i0 = this.bP() ? 4 : 2;\n public void k(boolean flag0) {\n super.k(flag0);\n if (this.bP()) {\n if (i0 != this.bZ()) {\n this.bp.a(!this.bQ());", "old_return_type": "void", "old_signature": "void bg()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "this.ah.b(18, Float.valueOf(this.aM()));\n this.ah.a(18, new Float(this.aM()));\n nbttagcompound.a(\"Angry\", this.cc());\n nbttagcompound.a(\"CollarColor\", (byte) this.cd());\n this.l(nbttagcompound.n(\"Angry\"));\n return this.cc() ? \"mob.wolf.growl\" : (this.ab.nextInt(3) == 0 ? (this.bT() && this.ah.d(18) < 10.0F ? \"mob.wolf.whine\" : \"mob.wolf.panting\") : \"mob.wolf.bark\");\n protected String aN() {\n protected String aO() {\n protected float aZ() {\n if (!this.q.I && this.bs && !this.bt && !this.bM() && this.F) {\n if (this.ce()) {\n if (this.ce()) {\n this.a(\"mob.wolf.shake\", this.aZ(), (this.ab.nextFloat() - this.ab.nextFloat()) * 0.2F + 1.0F);\n public int bp() {\n return this.bU() ? 20 : super.bp();\n if (this.aq()) {\n int i0 = this.bT() ? 4 : 2;\n public void j(boolean flag0) {\n super.j(flag0);\n if (this.bT()) {\n if (i0 != this.cd()) {\n this.bp.a(!this.bU());\n this.b((Entity) null);\n this.d((EntityLivingBase) null);", "new_return_type": "void", "new_signature": "void bj()", "old_args": "", "old_implementation": "this.ah.b(18, Float.valueOf(this.aJ()));\n this.ah.a(18, new Float(this.aJ()));\n nbttagcompound.a(\"Angry\", this.bY());\n nbttagcompound.a(\"CollarColor\", (byte) this.bZ());\n this.m(nbttagcompound.n(\"Angry\"));\n return this.bY() ? \"mob.wolf.growl\" : (this.ab.nextInt(3) == 0 ? (this.bP() && this.ah.d(18) < 10.0F ? \"mob.wolf.whine\" : \"mob.wolf.panting\") : \"mob.wolf.bark\");\n protected String aK() {\n protected String aL() {\n protected float aW() {\n if (!this.q.I && this.bs && !this.bt && !this.bI() && this.F) {\n if (this.ca()) {\n if (this.ca()) {\n this.a(\"mob.wolf.shake\", this.aW(), (this.ab.nextFloat() - this.ab.nextFloat()) * 0.2F + 1.0F);\n public int bl() {\n return this.bQ() ? 20 : super.bl();\n if (this.ap()) {\n int i0 = this.bP() ? 4 : 2;\n public void k(boolean flag0) {\n super.k(flag0);\n if (this.bP()) {\n if (i0 != this.bZ()) {\n this.bp.a(!this.bQ());", "old_return_type": "void", "old_signature": "void bg()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "this.ah.b(18, Float.valueOf(this.aM()));\n this.ah.a(18, new Float(this.aM()));\n nbttagcompound.a(\"Angry\", this.cc());\n nbttagcompound.a(\"CollarColor\", (byte) this.cd());\n this.l(nbttagcompound.n(\"Angry\"));\n return this.cc() ? \"mob.wolf.growl\" : (this.ab.nextInt(3) == 0 ? (this.bT() && this.ah.d(18) < 10.0F ? \"mob.wolf.whine\" : \"mob.wolf.panting\") : \"mob.wolf.bark\");\n protected String aN() {\n protected String aO() {\n protected float aZ() {\n if (!this.q.I && this.bs && !this.bt && !this.bM() && this.F) {\n if (this.ce()) {\n if (this.ce()) {\n this.a(\"mob.wolf.shake\", this.aZ(), (this.ab.nextFloat() - this.ab.nextFloat()) * 0.2F + 1.0F);\n public int bp() {\n return this.bU() ? 20 : super.bp();\n if (this.aq()) {\n int i0 = this.bT() ? 4 : 2;\n public void j(boolean flag0) {\n super.j(flag0);\n if (this.bT()) {\n if (i0 != this.cd()) {\n this.bp.a(!this.bU());\n this.b((Entity) null);\n this.d((EntityLivingBase) null);", "new_return_type": "void", "new_signature": "void bj()", "old_args": "", "old_implementation": "this.ah.b(18, Float.valueOf(this.aJ()));\n this.ah.a(18, new Float(this.aJ()));\n nbttagcompound.a(\"Angry\", this.bY());\n nbttagcompound.a(\"CollarColor\", (byte) this.bZ());\n this.m(nbttagcompound.n(\"Angry\"));\n return this.bY() ? \"mob.wolf.growl\" : (this.ab.nextInt(3) == 0 ? (this.bP() && this.ah.d(18) < 10.0F ? \"mob.wolf.whine\" : \"mob.wolf.panting\") : \"mob.wolf.bark\");\n protected String aK() {\n protected String aL() {\n protected float aW() {\n if (!this.q.I && this.bs && !this.bt && !this.bI() && this.F) {\n if (this.ca()) {\n if (this.ca()) {\n this.a(\"mob.wolf.shake\", this.aW(), (this.ab.nextFloat() - this.ab.nextFloat()) * 0.2F + 1.0F);\n public int bl() {\n return this.bQ() ? 20 : super.bl();\n if (this.ap()) {\n int i0 = this.bP() ? 4 : 2;\n public void k(boolean flag0) {\n super.k(flag0);\n if (this.bP()) {\n if (i0 != this.bZ()) {\n this.bp.a(!this.bQ());", "old_return_type": "void", "old_signature": "void bg()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "this.ah.b(18, Float.valueOf(this.aM()));\n this.ah.a(18, new Float(this.aM()));\n nbttagcompound.a(\"Angry\", this.cc());\n nbttagcompound.a(\"CollarColor\", (byte) this.cd());\n this.l(nbttagcompound.n(\"Angry\"));\n return this.cc() ? \"mob.wolf.growl\" : (this.ab.nextInt(3) == 0 ? (this.bT() && this.ah.d(18) < 10.0F ? \"mob.wolf.whine\" : \"mob.wolf.panting\") : \"mob.wolf.bark\");\n protected String aN() {\n protected String aO() {\n protected float aZ() {\n if (!this.q.I && this.bs && !this.bt && !this.bM() && this.F) {\n if (this.ce()) {\n if (this.ce()) {\n this.a(\"mob.wolf.shake\", this.aZ(), (this.ab.nextFloat() - this.ab.nextFloat()) * 0.2F + 1.0F);\n public int bp() {\n return this.bU() ? 20 : super.bp();\n if (this.aq()) {\n int i0 = this.bT() ? 4 : 2;\n public void j(boolean flag0) {\n super.j(flag0);\n if (this.bT()) {\n if (i0 != this.cd()) {\n this.bp.a(!this.bU());\n this.b((Entity) null);\n this.d((EntityLivingBase) null);", "new_return_type": "void", "new_signature": "void bj()", "old_args": "", "old_implementation": "this.ah.b(18, Float.valueOf(this.aJ()));\n this.ah.a(18, new Float(this.aJ()));\n nbttagcompound.a(\"Angry\", this.bY());\n nbttagcompound.a(\"CollarColor\", (byte) this.bZ());\n this.m(nbttagcompound.n(\"Angry\"));\n return this.bY() ? \"mob.wolf.growl\" : (this.ab.nextInt(3) == 0 ? (this.bP() && this.ah.d(18) < 10.0F ? \"mob.wolf.whine\" : \"mob.wolf.panting\") : \"mob.wolf.bark\");\n protected String aK() {\n protected String aL() {\n protected float aW() {\n if (!this.q.I && this.bs && !this.bt && !this.bI() && this.F) {\n if (this.ca()) {\n if (this.ca()) {\n this.a(\"mob.wolf.shake\", this.aW(), (this.ab.nextFloat() - this.ab.nextFloat()) * 0.2F + 1.0F);\n public int bl() {\n return this.bQ() ? 20 : super.bl();\n if (this.ap()) {\n int i0 = this.bP() ? 4 : 2;\n public void k(boolean flag0) {\n super.k(flag0);\n if (this.bP()) {\n if (i0 != this.bZ()) {\n this.bp.a(!this.bQ());", "old_return_type": "void", "old_signature": "void bg()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "public boolean cc() {\n public void l(boolean flag0) {\n public int cd() {\n entitywolf.j(true);\n public void m(boolean flag0) {", "new_return_type": "int", "new_signature": "int bv()", "old_args": "", "old_implementation": "public boolean bY() {\n public void m(boolean flag0) {\n public int bZ() {\n entitywolf.k(true);\n public void n(boolean flag0) {", "old_return_type": "int", "old_signature": "int br()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "public boolean cc() {\n public void l(boolean flag0) {\n public int cd() {\n entitywolf.j(true);\n public void m(boolean flag0) {", "new_return_type": "int", "new_signature": "int bv()", "old_args": "", "old_implementation": "public boolean bY() {\n public void m(boolean flag0) {\n public int bZ() {\n entitywolf.k(true);\n public void n(boolean flag0) {", "old_return_type": "int", "old_signature": "int br()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "public boolean cc() {\n public void l(boolean flag0) {\n public int cd() {\n entitywolf.j(true);\n public void m(boolean flag0) {", "new_return_type": "int", "new_signature": "int bv()", "old_args": "", "old_implementation": "public boolean bY() {\n public void m(boolean flag0) {\n public int bZ() {\n entitywolf.k(true);\n public void n(boolean flag0) {", "old_return_type": "int", "old_signature": "int br()" }, { "name": "fallenmoonnetwork$canaryrecode", "new_args": "", "new_implementation": "public boolean cc() {\n public void l(boolean flag0) {\n public int cd() {\n entitywolf.j(true);\n public void m(boolean flag0) {", "new_return_type": "int", "new_signature": "int bv()", "old_args": "", "old_implementation": "public boolean bY() {\n public void m(boolean flag0) {\n public int bZ() {\n entitywolf.k(true);\n public void n(boolean flag0) {", "old_return_type": "int", "old_signature": "int br()" } ]
300
272
42584cd5328fc55a499d318dda6fefff6459242c
[ { "name": "apache$hama", "new_args": "", "new_implementation": "v1.add(v2);\n int i = 0;\n Iterator<Writable> it = v1.iterator();\n while (it.hasNext()) {\n DoubleEntry c = (DoubleEntry) it.next();\n assertEquals(c.getValue(), values[0][i] + values[1][i]);\n i++;", "new_return_type": "void", "new_signature": "void add()", "old_args": "", "old_implementation": "v1.add(v2);\r\n int i = 0;\r\n Iterator<Writable> it = v1.iterator();\r\n while (it.hasNext()) {\r\n DoubleEntry c = (DoubleEntry) it.next();\r\n assertEquals(c.getValue(), values[0][i] + values[1][i]);\r\n i++;", "old_return_type": "void", "old_signature": "void testAdd()" }, { "name": "apache$hama", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void addTest()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void testAdd()" }, { "name": "apache$hama", "new_args": "Matrix m1,Matrix m2", "new_implementation": null, "new_return_type": "void", "new_signature": "void addAlphaMatrix(Matrix m1,Matrix m2)", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void testAddAlphaMatrix()" }, { "name": "apache$hama", "new_args": "", "new_implementation": "((DenseVector) v1).clear();\n assertEquals(v1.size(), 0);", "new_return_type": "void", "new_signature": "void clear()", "old_args": "", "old_implementation": "((DenseVector) v1).clear();\r\n assertEquals(v1.size(), 0);", "old_return_type": "void", "old_signature": "void testClear()" }, { "name": "apache$hama", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void testDenseVector()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void testDot()" }, { "name": "apache$hama", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void getSetTest()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void testGetSet()" }, { "name": "apache$hama", "new_args": "Matrix m1,Matrix m2", "new_implementation": null, "new_return_type": "void", "new_signature": "void matrixAdd(Matrix m1,Matrix m2)", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void testMatrixAdd()" }, { "name": "apache$hama", "new_args": "Matrix m1,Matrix m2", "new_implementation": null, "new_return_type": "void", "new_signature": "void matrixMult(Matrix m1,Matrix m2)", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void testMatrixMult()" }, { "name": "apache$hama", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void testMult()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void testMatrixMult()" }, { "name": "apache$hama", "new_args": "Matrix m1,Matrix m2,Matrix m3", "new_implementation": null, "new_return_type": "void", "new_signature": "void multMatrixAdd(Matrix m1,Matrix m2,Matrix m3)", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void testMultiMatrixAdd()" }, { "name": "apache$hama", "new_args": "", "new_implementation": "v1.set(v2);\n\n for(int i = 0; i < v1.size(); i ++) {\n assertEquals(v2.get(i), v1.get(i));", "new_return_type": "void", "new_signature": "void setTest()", "old_args": "", "old_implementation": "v1.set(v2);\r\n \r\n for(int i = 0; i < v1.size(); i ++) {\r\n assertEquals(v2.get(i), v1.get(i));", "old_return_type": "void", "old_signature": "void testSet()" }, { "name": "apache$hama", "new_args": "Matrix m1", "new_implementation": null, "new_return_type": "void", "new_signature": "void setAlphaMatrix(Matrix m1)", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void testSetAlphaMatrix()" }, { "name": "apache$hama", "new_args": "Matrix m1", "new_implementation": null, "new_return_type": "void", "new_signature": "void setMatrix(Matrix m1)", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void testSetMatrix()" }, { "name": "apache$hama", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void setRowColumn()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void testSetRow()" }, { "name": "apache$hama", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void sparsity()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void testSparsity()" }, { "name": "apache$hama", "new_args": "", "new_implementation": "int start = 2;\n Vector subVector = v1.subVector(start, v1.size() - 1);\n Iterator<Writable> it = subVector.iterator();\n\n int i = start;\n while (it.hasNext()) {\n assertEquals(v1.get(i), ((DoubleEntry) it.next()).getValue());\n i++;", "new_return_type": "void", "new_signature": "void subVector()", "old_args": "", "old_implementation": "int start = 2;\r\n Vector subVector = v1.subVector(start, v1.size() - 1);\r\n Iterator<Writable> it = subVector.iterator();\r\n\r\n int i = start;\r\n while (it.hasNext()) {\r\n assertEquals(v1.get(i), ((DoubleEntry) it.next()).getValue());\r\n i++;", "old_return_type": "void", "old_signature": "void testSubVector()" } ]
[ { "additions": 1, "blob_url": "https://github.com/apache/hama/blob/42584cd5328fc55a499d318dda6fefff6459242c/CHANGES.txt", "changes": 1, "contents_url": "https://api.github.com/repos/apache/hama/contents/CHANGES.txt?ref=42584cd5328fc55a499d318dda6fefff6459242c", "deletions": 0, "filename": "CHANGES.txt", "new_code": " HAMA-188: Upgrade dependencies for hadoop/hbase 2.0 (edwardyoon)", "new_methods": [], "old_code": "", "old_methods": [], "patch": "@@ -40,6 +40,7 @@ Trunk (unreleased changes)\n \n IMPROVEMENTS\n \n+ HAMA-188: Upgrade dependencies for hadoop/hbase 2.0 (edwardyoon)\n HAMA-192: Refactor top-level package (edwardyoon)\n HAMA-189: Update website (edwardyoon)\n HAMA-187: Add matrix subtraction test case (edwardyoon)", "raw_url": "https://github.com/apache/hama/raw/42584cd5328fc55a499d318dda6fefff6459242c/CHANGES.txt", "sha": "a0ae72a6a567226cb201224eda80907fb4e8931d", "status": "modified" }, { "additions": 324, "blob_url": "https://github.com/apache/hama/blob/42584cd5328fc55a499d318dda6fefff6459242c/build.xml", "changes": 651, "contents_url": "https://api.github.com/repos/apache/hama/contents/build.xml?ref=42584cd5328fc55a499d318dda6fefff6459242c", "deletions": 327, "filename": "build.xml", "new_code": "<?xml version=\"1.0\"?>\n\n<!--\n Licensed to the Apache Software Foundation (ASF) under one or more\n contributor license agreements. See the NOTICE file distributed with\n this work for additional information regarding copyright ownership.\n The ASF licenses this file to You under the Apache License, Version 2.0\n (the \"License\"); you may not use this file except in compliance with\n the License. You may obtain a copy of the License at\n\n http://www.apache.org/licenses/LICENSE-2.0\n\n Unless required by applicable law or agreed to in writing, software\n distributed under the License is distributed on an \"AS IS\" BASIS,\n WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n See the License for the specific language governing permissions and\n limitations under the License.\n-->\n\n<project name=\"hama\" default=\"jar\">\n <property name=\"version\" value=\"0.2.0-dev\" />\n <property name=\"Name\" value=\"Hama\" />\n <property name=\"final.name\" value=\"hama-${version}\" />\n <property name=\"year\" value=\"2009\" />\n\n <!-- Load all the default properties, and any the user wants -->\n <!-- to contribute (without having to type -D or edit this file -->\n <property file=\"${user.home}/${name}.build.properties\" />\n <property file=\"${basedir}/build.properties\" />\n\n <property name=\"src.dir\" location=\"${basedir}/src/java\" />\n <property name=\"src.gen.dir\" location=\"${basedir}/src-gen\" />\n <property name=\"src.test\" location=\"${basedir}/src/test\" />\n <property name=\"src.examples\" location=\"${basedir}/src/examples\" />\n\n <property name=\"lib.dir\" value=\"${basedir}/lib\" />\n <property name=\"conf.dir\" value=\"${basedir}/conf\" />\n <property name=\"docs.dir\" value=\"${basedir}/docs\" />\n <property name=\"docs.src\" value=\"${basedir}/src/docs\" />\n\n\t<!-- javacc properties -->\n <property name=\"javacc.home\" value=\"${basedir}/lib\" />\n\n <property name=\"src.gen.parser.expression.dir\" value=\"${src.gen.dir}/org/apache/hama/shell/parser/expression\" />\n <property name=\"src.gen.parser.script.dir\" value=\"${src.gen.dir}/org/apache/hama/shell/parser/script\" />\n\n\t<!-- build properties -->\n\t\n <property name=\"test.output\" value=\"no\" />\n <property name=\"test.timeout\" value=\"600000\" />\n\n <property name=\"build.dir\" location=\"${basedir}/build\" />\n <property name=\"build.lib\" location=\"${build.dir}/lib\" />\n <property name=\"build.classes\" location=\"${build.dir}/classes\" />\n <property name=\"build.test\" location=\"${build.dir}/test\" />\n <property name=\"build.examples\" location=\"${build.dir}/examples\" />\n <property name=\"build.docs\" value=\"${build.dir}/docs/site\" />\n <property name=\"build.javadoc\" value=\"${build.docs}/api\" />\n <property name=\"build.encoding\" value=\"ISO-8859-1\" />\n <property name=\"build.src\" value=\"${build.dir}/src\" />\n \n <property name=\"build.report\" value=\"${build.dir}/reports\" />\n <property name=\"build.report.findbugs\" value=\"${build.report}/findbugs\" />\n <property name=\"build.report.tests\" value=\"${build.report}/tests\" />\n \n <property name=\"test.build.dir\" value=\"${build.dir}/test\" />\n <property name=\"test.junit.output.format\" value=\"plain\" />\n\n <property name=\"dist.dir\" value=\"${build.dir}/${final.name}\" />\n\n <property name=\"javac.deprecation\" value=\"off\" />\n <property name=\"javac.debug\" value=\"on\" />\n\n <property name=\"javadoc.link.java\" \n value=\"http://java.sun.com/javase/6/docs/api/\" />\n <property name=\"javadoc.packages\" value=\"org.apache.hama.*\" />\n\n <fileset id=\"lib.jars\" dir=\"${basedir}\" includes=\"lib/*.jar\" />\n <path id=\"classpath\">\n <fileset refid=\"lib.jars\" />\n <fileset dir=\"${lib.dir}/findbugs/\">\n <include name=\"*jar\" />\n </fileset>\n <pathelement location=\"${build.classes}\" />\n <pathelement location=\"${conf.dir}\" />\n </path>\n\n <taskdef name=\"findbugs\" classpathref=\"classpath\" \n \tclassname=\"edu.umd.cs.findbugs.anttask.FindBugsTask\" />\n\n <target name=\"init\">\n <mkdir dir=\"${src.gen.dir}\" />\n <mkdir dir=\"${src.gen.parser.script.dir}\" />\n <mkdir dir=\"${src.gen.parser.expression.dir}\" />\n <mkdir dir=\"${build.dir}\" />\n <mkdir dir=\"${build.classes}\" />\n <mkdir dir=\"${build.test}\" />\n <mkdir dir=\"${build.examples}\" />\n <mkdir dir=\"${build.report.findbugs}\" />\n <mkdir dir=\"${build.report.tests}\" />\n <!--Copy bin, lib, and conf. too-->\n <mkdir dir=\"${build.lib}\" />\n <copy todir=\"${build.lib}\">\n <fileset dir=\"${lib.dir}\" />\n </copy>\n </target>\n\t\n\t<!-- ================================================================== -->\n <!-- Java Compiler Compiler, generate Parsers -->\n <!-- ================================================================== -->\n <target name=\"cc-compile\" depends=\"init\" description=\"Create and Compile Parser\">\n <jjtree target=\"${src.dir}/org/apache/hama/shell/parser/expression/HamaExpressionParser.jjt\" outputdirectory=\"${src.gen.parser.expression.dir}\" javacchome=\"${javacc.home}\" />\n <javacc target=\"${src.gen.parser.expression.dir}/HamaExpressionParser.jj\" outputdirectory=\"${src.gen.parser.expression.dir}\" javacchome=\"${javacc.home}\" />\n <javacc target=\"${src.dir}/org/apache/hama/shell/parser/script/HamaScriptParser.jj\" outputdirectory=\"${src.gen.parser.script.dir}\" javacchome=\"${javacc.home}\" />\n </target>\n\n <target name=\"compile\" depends=\"init, cc-compile\">\n <!--Compile whats under src and generated java classes made from jsp-->\n <mkdir dir=\"${build.src}\" />\n <javac encoding=\"${build.encoding}\" \n srcdir=\"${src.dir};${src.gen.dir};${build.src}\" includes=\"**/*.java\" \n \tdestdir=\"${build.classes}\" debug=\"${javac.debug}\" \n deprecation=\"${javac.deprecation}\">\n <classpath refid=\"classpath\" />\n </javac>\n </target>\n\n <target name=\"compile-examples\" depends=\"compile\">\n <javac encoding=\"${build.encoding}\" srcdir=\"${src.examples}\" \n includes=\"**/*.java\" \n \tdestdir=\"${build.examples}\" debug=\"${javac.debug}\" \n deprecation=\"${javac.deprecation}\">\n <classpath refid=\"classpath\" />\n </javac>\n </target>\n\n <!-- Override jar target to specify main class -->\n <target name=\"jar\" depends=\"compile\">\n <jar jarfile=\"${build.dir}/${final.name}.jar\" \n basedir=\"${build.classes}\">\n <manifest>\n <attribute name=\"Main-Class\" \n value=\"org/apache/hama/shell/HamaShell\" />\n </manifest>\n </jar>\n </target>\n\n <target name=\"examples\" depends=\"jar, compile-examples\" \n \tdescription=\"Make the hama examples jar.\">\n <jar jarfile=\"${build.dir}/${final.name}-examples.jar\" \n basedir=\"${build.examples}\">\n <manifest>\n <attribute name=\"Main-Class\" \n value=\"org/apache/hama/examples/ExampleDriver\" />\n </manifest>\n </jar>\n </target>\n\n <target name=\"package\" depends=\"jar,javadoc,compile-test, examples\" \n \tdescription=\"Build distribution\">\n <mkdir dir=\"${dist.dir}\" />\n <copy todir=\"${dist.dir}\" includeEmptyDirs=\"false\" flatten=\"true\">\n <fileset dir=\"${build.dir}\">\n <include name=\"${final.name}.jar\" />\n <include name=\"${final.name}-test.jar\" />\n </fileset>\n </copy>\n <mkdir dir=\"${dist.dir}/lib\" />\n <copy todir=\"${dist.dir}/lib\">\n <fileset dir=\"${build.lib}\" />\n </copy>\n <copy todir=\"${dist.dir}\">\n <fileset dir=\".\">\n <include name=\"*.txt\" />\n </fileset>\n </copy>\n <mkdir dir=\"${dist.dir}/src\" />\n <copy todir=\"${dist.dir}/src\" includeEmptyDirs=\"true\">\n <fileset dir=\"src\" excludes=\"**/*.template **/docs/build/**/*\" />\n </copy>\n </target>\n\n <!-- ================================================================== -->\n <!-- Make release tarball -->\n <!-- ================================================================== -->\n <macrodef name=\"macro_tar\" description=\"Worker Macro for tar\">\n <attribute name=\"param.destfile\" />\n <element name=\"param.listofitems\" />\n <sequential>\n <tar compression=\"gzip\" longfile=\"gnu\" destfile=\"@{param.destfile}\">\n <param.listofitems />\n </tar>\n </sequential>\n </macrodef>\n <target name=\"tar\" depends=\"package\" description=\"Make release tarball\">\n <macro_tar param.destfile=\"${build.dir}/${final.name}.tar.gz\">\n <param.listofitems>\n <tarfileset dir=\"${build.dir}\" mode=\"664\">\n <exclude name=\"${final.name}/bin/*\" />\n <include name=\"${final.name}/**\" />\n </tarfileset>\n <tarfileset dir=\"${build.dir}\" mode=\"755\">\n <include name=\"${final.name}/bin/*\" />\n </tarfileset>\n </param.listofitems>\n </macro_tar>\n </target>\n\n <target name=\"binary\" depends=\"package\" \n \tdescription=\"Make tarball without source and documentation\">\n <macro_tar param.destfile=\"${build.dir}/${final.name}-bin.tar.gz\">\n <param.listofitems>\n <tarfileset dir=\"${build.dir}\" mode=\"664\">\n <exclude name=\"${final.name}/bin/*\" />\n <exclude name=\"${final.name}/src/**\" />\n <exclude name=\"${final.name}/docs/**\" />\n <include name=\"${final.name}/**\" />\n </tarfileset>\n <tarfileset dir=\"${build.dir}\" mode=\"755\">\n <include name=\"${final.name}/bin/*\" />\n </tarfileset>\n </param.listofitems>\n </macro_tar>\n </target>\n\n <!-- ================================================================== -->\n <!-- Doc -->\n <!-- ================================================================== -->\n <target name=\"docs\" depends=\"forrest.check\" description=\"Generate forrest-based documentation. To use, specify -Dforrest.home=&lt;base of Apache Forrest installation&gt; on the command line.\" if=\"forrest.home\">\n <exec dir=\"${docs.src}\" executable=\"${forrest.home}/bin/forrest\" \n failonerror=\"true\">\n \t<env key=\"JAVA_HOME\" value=\"${java5.home}\"/>\n </exec>\n <copy todir=\"${build.docs}\">\n <fileset dir=\"${docs.src}/build/site/\" />\n </copy>\n \t<delete dir=\"${docs.src}/build/\"/>\n </target>\n\n <target name=\"forrest.check\" unless=\"forrest.home\">\n <fail message=\"'forrest.home' is not defined. Please pass -Dforrest.home=&lt;base of Apache Forrest installation&gt; to Ant on the command-line.\" />\n </target>\n\n <!-- Javadoc -->\n <target name=\"javadoc\" depends=\"cc-compile\" description=\"Generate javadoc\">\n <mkdir dir=\"${build.javadoc}\" />\n <javadoc overview=\"${src.dir}/overview.html\" packagenames=\"org.apache.hama.*\" \n \t destdir=\"${build.javadoc}\" author=\"true\" version=\"true\" use=\"true\" \n \t windowtitle=\"${Name} ${version} API\" doctitle=\"${Name} ${version} API\" \n \t bottom=\"Copyright &amp;copy; ${year} The Apache Software Foundation\">\n <packageset dir=\"${src.dir}\">\n <include name=\"org/apache/**\" />\n </packageset>\n <packageset dir=\"${src.gen.dir}\">\n <include name=\"org/apache/**\" />\n </packageset>\n <link href=\"${javadoc.link.java}\" />\n <classpath>\n <path refid=\"classpath\" />\n <pathelement path=\"${java.class.path}\" />\n </classpath>\n <group title=\"${Name}\" packages=\"org.apache.hama.*\" />\n </javadoc>\n </target>\n\n <!-- ================================================================== -->\n <!-- Run unit tests -->\n <!-- ================================================================== -->\n <path id=\"test.classpath\">\n <pathelement location=\"${src.test}\" />\n <pathelement location=\"${build.test}\" />\n <path refid=\"classpath\" />\n <pathelement location=\"${build.dir}\" />\n </path>\n\n <target name=\"compile-test\" depends=\"compile\">\n <javac encoding=\"${build.encoding}\" srcdir=\"${src.test}\" \n includes=\"**/*.java\" destdir=\"${build.test}\" debug=\"${javac.debug}\">\n <classpath refid=\"test.classpath\" />\n </javac>\n <jar jarfile=\"${build.dir}/${final.name}-test.jar\">\n <fileset dir=\"${build.test}\" includes=\"org/**\" />\n <fileset dir=\"${build.classes}\" />\n <fileset dir=\"${src.test}\" includes=\"**/*.properties\" />\n <manifest>\n <attribute name=\"Main-Class\" value=\"org/apache/hama/Benchmarks\" />\n </manifest>\n </jar>\n </target>\n\n <target name=\"test\" depends=\"compile-test, compile\">\n <junit printsummary=\"yes\" showoutput=\"${test.output}\" haltonfailure=\"no\"\n fork=\"yes\" maxmemory=\"512m\" errorProperty=\"tests.failed\" \n \t failureProperty=\"tests.failed\" timeout=\"${test.timeout}\">\n <classpath refid=\"test.classpath\" />\n <formatter type=\"${test.junit.output.format}\" />\n <batchtest todir=\"${build.report.tests}\">\n <fileset dir=\"${src.test}\" includes=\"**/Test*.java\" \n \t excludes=\"**/${test.exclude}.java\" />\n </batchtest>\n </junit>\n <fail if=\"tests.failed\">Tests failed!</fail>\n </target>\n\n <target name=\"findbugs\" depends=\"init, jar\">\n <findbugs home=\"${lib.dir}/findbugs\" output=\"xml\" \n \t outputFile=\"${build.report.findbugs}/hama-findbugs.xml\" \n excludeFilter=\"${conf.dir}/findbugs-exclude-filter.xml\"\n \t auxClasspathRef=\"classpath\">\n <sourcePath path=\"${src.dir}\" />\n <class location=\"${build.dir}/${final.name}.jar\" />\n </findbugs>\n </target>\n \n <target name=\"report\" depends=\"findbugs,test\"></target>\n \n <!-- ================================================================== -->\n <!-- Clean. Delete the build files, and their directories -->\n <!-- ================================================================== -->\n <target name=\"clean\">\n <delete dir=\"${src.gen.dir}\" />\n <delete dir=\"${build.dir}\" />\n </target>\n</project>", "new_methods": [], "old_code": "<?xml version=\"1.0\"?>\r\n\r\n<!--\r\n Licensed to the Apache Software Foundation (ASF) under one or more\r\n contributor license agreements. See the NOTICE file distributed with\r\n this work for additional information regarding copyright ownership.\r\n The ASF licenses this file to You under the Apache License, Version 2.0\r\n (the \"License\"); you may not use this file except in compliance with\r\n the License. You may obtain a copy of the License at\r\n\r\n http://www.apache.org/licenses/LICENSE-2.0\r\n\r\n Unless required by applicable law or agreed to in writing, software\r\n distributed under the License is distributed on an \"AS IS\" BASIS,\r\n WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r\n See the License for the specific language governing permissions and\r\n limitations under the License.\r\n-->\r\n\r\n<project name=\"hama\" default=\"jar\">\r\n <property name=\"version\" value=\"0.1.0-dev\" />\r\n <property name=\"Name\" value=\"Hama\" />\r\n <property name=\"final.name\" value=\"hama-${version}\" />\r\n <property name=\"year\" value=\"2008\" />\r\n\r\n <!-- Load all the default properties, and any the user wants -->\r\n <!-- to contribute (without having to type -D or edit this file -->\r\n <property file=\"${user.home}/${name}.build.properties\" />\r\n <property file=\"${basedir}/build.properties\" />\r\n\r\n <property name=\"src.dir\" location=\"${basedir}/src/java\" />\r\n <property name=\"src.gen.dir\" location=\"${basedir}/src-gen\" />\r\n <property name=\"src.test\" location=\"${basedir}/src/test\" />\r\n <property name=\"src.examples\" location=\"${basedir}/src/examples\" />\r\n\r\n <property name=\"lib.dir\" value=\"${basedir}/lib\" />\r\n <property name=\"conf.dir\" value=\"${basedir}/conf\" />\r\n <property name=\"docs.dir\" value=\"${basedir}/docs\" />\r\n <property name=\"docs.src\" value=\"${basedir}/src/docs\" />\r\n\r\n\t<!-- javacc properties -->\r\n <property name=\"javacc.home\" value=\"${basedir}/lib\" />\r\n\r\n <property name=\"src.gen.parser.expression.dir\" value=\"${src.gen.dir}/org/apache/hama/shell/parser/expression\" />\r\n <property name=\"src.gen.parser.script.dir\" value=\"${src.gen.dir}/org/apache/hama/shell/parser/script\" />\r\n\r\n\t<!-- build properties -->\r\n\t\r\n <property name=\"test.output\" value=\"no\" />\r\n <property name=\"test.timeout\" value=\"600000\" />\r\n\r\n <property name=\"build.dir\" location=\"${basedir}/build\" />\r\n <property name=\"build.lib\" location=\"${build.dir}/lib\" />\r\n <property name=\"build.classes\" location=\"${build.dir}/classes\" />\r\n <property name=\"build.test\" location=\"${build.dir}/test\" />\r\n <property name=\"build.examples\" location=\"${build.dir}/examples\" />\r\n <property name=\"build.docs\" value=\"${build.dir}/docs/site\" />\r\n <property name=\"build.javadoc\" value=\"${build.docs}/api\" />\r\n <property name=\"build.encoding\" value=\"ISO-8859-1\" />\r\n <property name=\"build.src\" value=\"${build.dir}/src\" />\r\n \r\n <property name=\"build.report\" value=\"${build.dir}/reports\" />\r\n <property name=\"build.report.findbugs\" value=\"${build.report}/findbugs\" />\r\n <property name=\"build.report.tests\" value=\"${build.report}/tests\" />\r\n \r\n <property name=\"test.build.dir\" value=\"${build.dir}/test\" />\r\n <property name=\"test.junit.output.format\" value=\"plain\" />\r\n\r\n <property name=\"dist.dir\" value=\"${build.dir}/${final.name}\" />\r\n\r\n <property name=\"javac.deprecation\" value=\"off\" />\r\n <property name=\"javac.debug\" value=\"on\" />\r\n\r\n <property name=\"javadoc.link.java\" \r\n value=\"http://java.sun.com/javase/6/docs/api/\" />\r\n <property name=\"javadoc.packages\" value=\"org.apache.hama.*\" />\r\n\r\n <fileset id=\"lib.jars\" dir=\"${basedir}\" includes=\"lib/*.jar\" />\r\n <path id=\"classpath\">\r\n <fileset refid=\"lib.jars\" />\r\n <fileset dir=\"${lib.dir}/jetty-ext/\">\r\n <include name=\"*jar\" />\r\n </fileset>\r\n <fileset dir=\"${lib.dir}/findbugs/\">\r\n <include name=\"*jar\" />\r\n </fileset>\r\n <pathelement location=\"${build.classes}\" />\r\n <pathelement location=\"${conf.dir}\" />\r\n </path>\r\n\r\n <taskdef name=\"findbugs\" classpathref=\"classpath\" \r\n \tclassname=\"edu.umd.cs.findbugs.anttask.FindBugsTask\" />\r\n\r\n <target name=\"init\">\r\n <mkdir dir=\"${src.gen.dir}\" />\r\n <mkdir dir=\"${src.gen.parser.script.dir}\" />\r\n <mkdir dir=\"${src.gen.parser.expression.dir}\" />\r\n <mkdir dir=\"${build.dir}\" />\r\n <mkdir dir=\"${build.classes}\" />\r\n <mkdir dir=\"${build.test}\" />\r\n <mkdir dir=\"${build.examples}\" />\r\n <mkdir dir=\"${build.report.findbugs}\" />\r\n <mkdir dir=\"${build.report.tests}\" />\r\n <!--Copy bin, lib, and conf. too-->\r\n <mkdir dir=\"${build.lib}\" />\r\n <copy todir=\"${build.lib}\">\r\n <fileset dir=\"${lib.dir}\" />\r\n </copy>\r\n </target>\r\n\t\r\n\t<!-- ================================================================== -->\r\n <!-- Java Compiler Compiler, generate Parsers -->\r\n <!-- ================================================================== -->\r\n <target name=\"cc-compile\" depends=\"init\" description=\"Create and Compile Parser\">\r\n <jjtree target=\"${src.dir}/org/apache/hama/shell/parser/expression/HamaExpressionParser.jjt\" outputdirectory=\"${src.gen.parser.expression.dir}\" javacchome=\"${javacc.home}\" />\r\n <javacc target=\"${src.gen.parser.expression.dir}/HamaExpressionParser.jj\" outputdirectory=\"${src.gen.parser.expression.dir}\" javacchome=\"${javacc.home}\" />\r\n <javacc target=\"${src.dir}/org/apache/hama/shell/parser/script/HamaScriptParser.jj\" outputdirectory=\"${src.gen.parser.script.dir}\" javacchome=\"${javacc.home}\" />\r\n </target>\r\n\r\n <target name=\"compile\" depends=\"init, cc-compile\">\r\n <!--Compile whats under src and generated java classes made from jsp-->\r\n <mkdir dir=\"${build.src}\" />\r\n <javac encoding=\"${build.encoding}\" \r\n srcdir=\"${src.dir};${src.gen.dir};${build.src}\" includes=\"**/*.java\" \r\n \tdestdir=\"${build.classes}\" debug=\"${javac.debug}\" \r\n deprecation=\"${javac.deprecation}\">\r\n <classpath refid=\"classpath\" />\r\n </javac>\r\n </target>\r\n\r\n <target name=\"compile-examples\" depends=\"compile\">\r\n <javac encoding=\"${build.encoding}\" srcdir=\"${src.examples}\" \r\n includes=\"**/*.java\" \r\n \tdestdir=\"${build.examples}\" debug=\"${javac.debug}\" \r\n deprecation=\"${javac.deprecation}\">\r\n <classpath refid=\"classpath\" />\r\n </javac>\r\n </target>\r\n\r\n <!-- Override jar target to specify main class -->\r\n <target name=\"jar\" depends=\"compile\">\r\n <jar jarfile=\"${build.dir}/${final.name}.jar\" \r\n basedir=\"${build.classes}\">\r\n <manifest>\r\n <attribute name=\"Main-Class\" \r\n value=\"org/apache/hama/shell/HamaShell\" />\r\n </manifest>\r\n </jar>\r\n </target>\r\n\r\n <target name=\"examples\" depends=\"jar, compile-examples\" \r\n \tdescription=\"Make the hama examples jar.\">\r\n <jar jarfile=\"${build.dir}/${final.name}-examples.jar\" \r\n basedir=\"${build.examples}\">\r\n <manifest>\r\n <attribute name=\"Main-Class\" \r\n value=\"org/apache/hama/examples/ExampleDriver\" />\r\n </manifest>\r\n </jar>\r\n </target>\r\n\r\n <target name=\"package\" depends=\"jar,javadoc,compile-test, examples\" \r\n \tdescription=\"Build distribution\">\r\n <mkdir dir=\"${dist.dir}\" />\r\n <copy todir=\"${dist.dir}\" includeEmptyDirs=\"false\" flatten=\"true\">\r\n <fileset dir=\"${build.dir}\">\r\n <include name=\"${final.name}.jar\" />\r\n <include name=\"${final.name}-test.jar\" />\r\n </fileset>\r\n </copy>\r\n <mkdir dir=\"${dist.dir}/lib\" />\r\n <copy todir=\"${dist.dir}/lib\">\r\n <fileset dir=\"${build.lib}\" />\r\n </copy>\r\n <copy todir=\"${dist.dir}\">\r\n <fileset dir=\".\">\r\n <include name=\"*.txt\" />\r\n </fileset>\r\n </copy>\r\n <mkdir dir=\"${dist.dir}/src\" />\r\n <copy todir=\"${dist.dir}/src\" includeEmptyDirs=\"true\">\r\n <fileset dir=\"src\" excludes=\"**/*.template **/docs/build/**/*\" />\r\n </copy>\r\n </target>\r\n\r\n <!-- ================================================================== -->\r\n <!-- Make release tarball -->\r\n <!-- ================================================================== -->\r\n <macrodef name=\"macro_tar\" description=\"Worker Macro for tar\">\r\n <attribute name=\"param.destfile\" />\r\n <element name=\"param.listofitems\" />\r\n <sequential>\r\n <tar compression=\"gzip\" longfile=\"gnu\" destfile=\"@{param.destfile}\">\r\n <param.listofitems />\r\n </tar>\r\n </sequential>\r\n </macrodef>\r\n <target name=\"tar\" depends=\"package\" description=\"Make release tarball\">\r\n <macro_tar param.destfile=\"${build.dir}/${final.name}.tar.gz\">\r\n <param.listofitems>\r\n <tarfileset dir=\"${build.dir}\" mode=\"664\">\r\n <exclude name=\"${final.name}/bin/*\" />\r\n <include name=\"${final.name}/**\" />\r\n </tarfileset>\r\n <tarfileset dir=\"${build.dir}\" mode=\"755\">\r\n <include name=\"${final.name}/bin/*\" />\r\n </tarfileset>\r\n </param.listofitems>\r\n </macro_tar>\r\n </target>\r\n\r\n <target name=\"binary\" depends=\"package\" \r\n \tdescription=\"Make tarball without source and documentation\">\r\n <macro_tar param.destfile=\"${build.dir}/${final.name}-bin.tar.gz\">\r\n <param.listofitems>\r\n <tarfileset dir=\"${build.dir}\" mode=\"664\">\r\n <exclude name=\"${final.name}/bin/*\" />\r\n <exclude name=\"${final.name}/src/**\" />\r\n <exclude name=\"${final.name}/docs/**\" />\r\n <include name=\"${final.name}/**\" />\r\n </tarfileset>\r\n <tarfileset dir=\"${build.dir}\" mode=\"755\">\r\n <include name=\"${final.name}/bin/*\" />\r\n </tarfileset>\r\n </param.listofitems>\r\n </macro_tar>\r\n </target>\r\n\r\n <!-- ================================================================== -->\r\n <!-- Doc -->\r\n <!-- ================================================================== -->\r\n <target name=\"docs\" depends=\"forrest.check\" description=\"Generate forrest-based documentation. To use, specify -Dforrest.home=&lt;base of Apache Forrest installation&gt; on the command line.\" if=\"forrest.home\">\r\n <exec dir=\"${docs.src}\" executable=\"${forrest.home}/bin/forrest\" \r\n failonerror=\"true\">\r\n \t<env key=\"JAVA_HOME\" value=\"${java5.home}\"/>\r\n </exec>\r\n <copy todir=\"${build.docs}\">\r\n <fileset dir=\"${docs.src}/build/site/\" />\r\n </copy>\r\n \t<delete dir=\"${docs.src}/build/\"/>\r\n </target>\r\n\r\n <target name=\"forrest.check\" unless=\"forrest.home\">\r\n <fail message=\"'forrest.home' is not defined. Please pass -Dforrest.home=&lt;base of Apache Forrest installation&gt; to Ant on the command-line.\" />\r\n </target>\r\n\r\n <!-- Javadoc -->\r\n <target name=\"javadoc\" depends=\"cc-compile\" description=\"Generate javadoc\">\r\n <mkdir dir=\"${build.javadoc}\" />\r\n <javadoc overview=\"${src.dir}/overview.html\" packagenames=\"org.apache.hama.*\" \r\n \t destdir=\"${build.javadoc}\" author=\"true\" version=\"true\" use=\"true\" \r\n \t windowtitle=\"${Name} ${version} API\" doctitle=\"${Name} ${version} API\" \r\n \t bottom=\"Copyright &amp;copy; ${year} The Apache Software Foundation\">\r\n <packageset dir=\"${src.dir}\">\r\n <include name=\"org/apache/**\" />\r\n </packageset>\r\n <packageset dir=\"${src.gen.dir}\">\r\n <include name=\"org/apache/**\" />\r\n </packageset>\r\n <link href=\"${javadoc.link.java}\" />\r\n <classpath>\r\n <path refid=\"classpath\" />\r\n <pathelement path=\"${java.class.path}\" />\r\n </classpath>\r\n <group title=\"${Name}\" packages=\"org.apache.hama.*\" />\r\n </javadoc>\r\n </target>\r\n\r\n <!-- ================================================================== -->\r\n <!-- Run unit tests -->\r\n <!-- ================================================================== -->\r\n <path id=\"test.classpath\">\r\n <pathelement location=\"${src.test}\" />\r\n <pathelement location=\"${build.test}\" />\r\n <path refid=\"classpath\" />\r\n <pathelement location=\"${build.dir}\" />\r\n </path>\r\n\r\n <target name=\"compile-test\" depends=\"compile\">\r\n <javac encoding=\"${build.encoding}\" srcdir=\"${src.test}\" \r\n includes=\"**/*.java\" destdir=\"${build.test}\" debug=\"${javac.debug}\">\r\n <classpath refid=\"test.classpath\" />\r\n </javac>\r\n <jar jarfile=\"${build.dir}/${final.name}-test.jar\">\r\n <fileset dir=\"${build.test}\" includes=\"org/**\" />\r\n <fileset dir=\"${build.classes}\" />\r\n <fileset dir=\"${src.test}\" includes=\"**/*.properties\" />\r\n <manifest>\r\n <attribute name=\"Main-Class\" value=\"org/apache/hama/Benchmarks\" />\r\n </manifest>\r\n </jar>\r\n </target>\r\n\r\n <target name=\"test\" depends=\"compile-test, compile\">\r\n <junit printsummary=\"yes\" showoutput=\"${test.output}\" haltonfailure=\"no\"\r\n fork=\"yes\" maxmemory=\"512m\" errorProperty=\"tests.failed\" \r\n \t failureProperty=\"tests.failed\" timeout=\"${test.timeout}\">\r\n <classpath refid=\"test.classpath\" />\r\n <formatter type=\"${test.junit.output.format}\" />\r\n <batchtest todir=\"${build.report.tests}\">\r\n <fileset dir=\"${src.test}\" includes=\"**/Test*.java\" \r\n \t excludes=\"**/${test.exclude}.java\" />\r\n </batchtest>\r\n </junit>\r\n <fail if=\"tests.failed\">Tests failed!</fail>\r\n </target>\r\n\r\n <target name=\"findbugs\" depends=\"init, jar\">\r\n <findbugs home=\"${lib.dir}/findbugs\" output=\"xml\" \r\n \t outputFile=\"${build.report.findbugs}/hama-findbugs.xml\" \r\n excludeFilter=\"${conf.dir}/findbugs-exclude-filter.xml\"\r\n \t auxClasspathRef=\"classpath\">\r\n <sourcePath path=\"${src.dir}\" />\r\n <class location=\"${build.dir}/${final.name}.jar\" />\r\n </findbugs>\r\n </target>\r\n \r\n <target name=\"report\" depends=\"findbugs,test\"></target>\r\n \r\n <!-- ================================================================== -->\r\n <!-- Clean. Delete the build files, and their directories -->\r\n <!-- ================================================================== -->\r\n <target name=\"clean\">\r\n <delete dir=\"${src.gen.dir}\" />\r\n <delete dir=\"${build.dir}\" />\r\n </target>\r\n</project>\r", "old_methods": [], "patch": "@@ -1,327 +1,324 @@\n-<?xml version=\"1.0\"?>\r\n-\r\n-<!--\r\n- Licensed to the Apache Software Foundation (ASF) under one or more\r\n- contributor license agreements. See the NOTICE file distributed with\r\n- this work for additional information regarding copyright ownership.\r\n- The ASF licenses this file to You under the Apache License, Version 2.0\r\n- (the \"License\"); you may not use this file except in compliance with\r\n- the License. You may obtain a copy of the License at\r\n-\r\n- http://www.apache.org/licenses/LICENSE-2.0\r\n-\r\n- Unless required by applicable law or agreed to in writing, software\r\n- distributed under the License is distributed on an \"AS IS\" BASIS,\r\n- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r\n- See the License for the specific language governing permissions and\r\n- limitations under the License.\r\n--->\r\n-\r\n-<project name=\"hama\" default=\"jar\">\r\n- <property name=\"version\" value=\"0.1.0-dev\" />\r\n- <property name=\"Name\" value=\"Hama\" />\r\n- <property name=\"final.name\" value=\"hama-${version}\" />\r\n- <property name=\"year\" value=\"2008\" />\r\n-\r\n- <!-- Load all the default properties, and any the user wants -->\r\n- <!-- to contribute (without having to type -D or edit this file -->\r\n- <property file=\"${user.home}/${name}.build.properties\" />\r\n- <property file=\"${basedir}/build.properties\" />\r\n-\r\n- <property name=\"src.dir\" location=\"${basedir}/src/java\" />\r\n- <property name=\"src.gen.dir\" location=\"${basedir}/src-gen\" />\r\n- <property name=\"src.test\" location=\"${basedir}/src/test\" />\r\n- <property name=\"src.examples\" location=\"${basedir}/src/examples\" />\r\n-\r\n- <property name=\"lib.dir\" value=\"${basedir}/lib\" />\r\n- <property name=\"conf.dir\" value=\"${basedir}/conf\" />\r\n- <property name=\"docs.dir\" value=\"${basedir}/docs\" />\r\n- <property name=\"docs.src\" value=\"${basedir}/src/docs\" />\r\n-\r\n-\t<!-- javacc properties -->\r\n- <property name=\"javacc.home\" value=\"${basedir}/lib\" />\r\n-\r\n- <property name=\"src.gen.parser.expression.dir\" value=\"${src.gen.dir}/org/apache/hama/shell/parser/expression\" />\r\n- <property name=\"src.gen.parser.script.dir\" value=\"${src.gen.dir}/org/apache/hama/shell/parser/script\" />\r\n-\r\n-\t<!-- build properties -->\r\n-\t\r\n- <property name=\"test.output\" value=\"no\" />\r\n- <property name=\"test.timeout\" value=\"600000\" />\r\n-\r\n- <property name=\"build.dir\" location=\"${basedir}/build\" />\r\n- <property name=\"build.lib\" location=\"${build.dir}/lib\" />\r\n- <property name=\"build.classes\" location=\"${build.dir}/classes\" />\r\n- <property name=\"build.test\" location=\"${build.dir}/test\" />\r\n- <property name=\"build.examples\" location=\"${build.dir}/examples\" />\r\n- <property name=\"build.docs\" value=\"${build.dir}/docs/site\" />\r\n- <property name=\"build.javadoc\" value=\"${build.docs}/api\" />\r\n- <property name=\"build.encoding\" value=\"ISO-8859-1\" />\r\n- <property name=\"build.src\" value=\"${build.dir}/src\" />\r\n- \r\n- <property name=\"build.report\" value=\"${build.dir}/reports\" />\r\n- <property name=\"build.report.findbugs\" value=\"${build.report}/findbugs\" />\r\n- <property name=\"build.report.tests\" value=\"${build.report}/tests\" />\r\n- \r\n- <property name=\"test.build.dir\" value=\"${build.dir}/test\" />\r\n- <property name=\"test.junit.output.format\" value=\"plain\" />\r\n-\r\n- <property name=\"dist.dir\" value=\"${build.dir}/${final.name}\" />\r\n-\r\n- <property name=\"javac.deprecation\" value=\"off\" />\r\n- <property name=\"javac.debug\" value=\"on\" />\r\n-\r\n- <property name=\"javadoc.link.java\" \r\n- value=\"http://java.sun.com/javase/6/docs/api/\" />\r\n- <property name=\"javadoc.packages\" value=\"org.apache.hama.*\" />\r\n-\r\n- <fileset id=\"lib.jars\" dir=\"${basedir}\" includes=\"lib/*.jar\" />\r\n- <path id=\"classpath\">\r\n- <fileset refid=\"lib.jars\" />\r\n- <fileset dir=\"${lib.dir}/jetty-ext/\">\r\n- <include name=\"*jar\" />\r\n- </fileset>\r\n- <fileset dir=\"${lib.dir}/findbugs/\">\r\n- <include name=\"*jar\" />\r\n- </fileset>\r\n- <pathelement location=\"${build.classes}\" />\r\n- <pathelement location=\"${conf.dir}\" />\r\n- </path>\r\n-\r\n- <taskdef name=\"findbugs\" classpathref=\"classpath\" \r\n- \tclassname=\"edu.umd.cs.findbugs.anttask.FindBugsTask\" />\r\n-\r\n- <target name=\"init\">\r\n- <mkdir dir=\"${src.gen.dir}\" />\r\n- <mkdir dir=\"${src.gen.parser.script.dir}\" />\r\n- <mkdir dir=\"${src.gen.parser.expression.dir}\" />\r\n- <mkdir dir=\"${build.dir}\" />\r\n- <mkdir dir=\"${build.classes}\" />\r\n- <mkdir dir=\"${build.test}\" />\r\n- <mkdir dir=\"${build.examples}\" />\r\n- <mkdir dir=\"${build.report.findbugs}\" />\r\n- <mkdir dir=\"${build.report.tests}\" />\r\n- <!--Copy bin, lib, and conf. too-->\r\n- <mkdir dir=\"${build.lib}\" />\r\n- <copy todir=\"${build.lib}\">\r\n- <fileset dir=\"${lib.dir}\" />\r\n- </copy>\r\n- </target>\r\n-\t\r\n-\t<!-- ================================================================== -->\r\n- <!-- Java Compiler Compiler, generate Parsers -->\r\n- <!-- ================================================================== -->\r\n- <target name=\"cc-compile\" depends=\"init\" description=\"Create and Compile Parser\">\r\n- <jjtree target=\"${src.dir}/org/apache/hama/shell/parser/expression/HamaExpressionParser.jjt\" outputdirectory=\"${src.gen.parser.expression.dir}\" javacchome=\"${javacc.home}\" />\r\n- <javacc target=\"${src.gen.parser.expression.dir}/HamaExpressionParser.jj\" outputdirectory=\"${src.gen.parser.expression.dir}\" javacchome=\"${javacc.home}\" />\r\n- <javacc target=\"${src.dir}/org/apache/hama/shell/parser/script/HamaScriptParser.jj\" outputdirectory=\"${src.gen.parser.script.dir}\" javacchome=\"${javacc.home}\" />\r\n- </target>\r\n-\r\n- <target name=\"compile\" depends=\"init, cc-compile\">\r\n- <!--Compile whats under src and generated java classes made from jsp-->\r\n- <mkdir dir=\"${build.src}\" />\r\n- <javac encoding=\"${build.encoding}\" \r\n- srcdir=\"${src.dir};${src.gen.dir};${build.src}\" includes=\"**/*.java\" \r\n- \tdestdir=\"${build.classes}\" debug=\"${javac.debug}\" \r\n- deprecation=\"${javac.deprecation}\">\r\n- <classpath refid=\"classpath\" />\r\n- </javac>\r\n- </target>\r\n-\r\n- <target name=\"compile-examples\" depends=\"compile\">\r\n- <javac encoding=\"${build.encoding}\" srcdir=\"${src.examples}\" \r\n- includes=\"**/*.java\" \r\n- \tdestdir=\"${build.examples}\" debug=\"${javac.debug}\" \r\n- deprecation=\"${javac.deprecation}\">\r\n- <classpath refid=\"classpath\" />\r\n- </javac>\r\n- </target>\r\n-\r\n- <!-- Override jar target to specify main class -->\r\n- <target name=\"jar\" depends=\"compile\">\r\n- <jar jarfile=\"${build.dir}/${final.name}.jar\" \r\n- basedir=\"${build.classes}\">\r\n- <manifest>\r\n- <attribute name=\"Main-Class\" \r\n- value=\"org/apache/hama/shell/HamaShell\" />\r\n- </manifest>\r\n- </jar>\r\n- </target>\r\n-\r\n- <target name=\"examples\" depends=\"jar, compile-examples\" \r\n- \tdescription=\"Make the hama examples jar.\">\r\n- <jar jarfile=\"${build.dir}/${final.name}-examples.jar\" \r\n- basedir=\"${build.examples}\">\r\n- <manifest>\r\n- <attribute name=\"Main-Class\" \r\n- value=\"org/apache/hama/examples/ExampleDriver\" />\r\n- </manifest>\r\n- </jar>\r\n- </target>\r\n-\r\n- <target name=\"package\" depends=\"jar,javadoc,compile-test, examples\" \r\n- \tdescription=\"Build distribution\">\r\n- <mkdir dir=\"${dist.dir}\" />\r\n- <copy todir=\"${dist.dir}\" includeEmptyDirs=\"false\" flatten=\"true\">\r\n- <fileset dir=\"${build.dir}\">\r\n- <include name=\"${final.name}.jar\" />\r\n- <include name=\"${final.name}-test.jar\" />\r\n- </fileset>\r\n- </copy>\r\n- <mkdir dir=\"${dist.dir}/lib\" />\r\n- <copy todir=\"${dist.dir}/lib\">\r\n- <fileset dir=\"${build.lib}\" />\r\n- </copy>\r\n- <copy todir=\"${dist.dir}\">\r\n- <fileset dir=\".\">\r\n- <include name=\"*.txt\" />\r\n- </fileset>\r\n- </copy>\r\n- <mkdir dir=\"${dist.dir}/src\" />\r\n- <copy todir=\"${dist.dir}/src\" includeEmptyDirs=\"true\">\r\n- <fileset dir=\"src\" excludes=\"**/*.template **/docs/build/**/*\" />\r\n- </copy>\r\n- </target>\r\n-\r\n- <!-- ================================================================== -->\r\n- <!-- Make release tarball -->\r\n- <!-- ================================================================== -->\r\n- <macrodef name=\"macro_tar\" description=\"Worker Macro for tar\">\r\n- <attribute name=\"param.destfile\" />\r\n- <element name=\"param.listofitems\" />\r\n- <sequential>\r\n- <tar compression=\"gzip\" longfile=\"gnu\" destfile=\"@{param.destfile}\">\r\n- <param.listofitems />\r\n- </tar>\r\n- </sequential>\r\n- </macrodef>\r\n- <target name=\"tar\" depends=\"package\" description=\"Make release tarball\">\r\n- <macro_tar param.destfile=\"${build.dir}/${final.name}.tar.gz\">\r\n- <param.listofitems>\r\n- <tarfileset dir=\"${build.dir}\" mode=\"664\">\r\n- <exclude name=\"${final.name}/bin/*\" />\r\n- <include name=\"${final.name}/**\" />\r\n- </tarfileset>\r\n- <tarfileset dir=\"${build.dir}\" mode=\"755\">\r\n- <include name=\"${final.name}/bin/*\" />\r\n- </tarfileset>\r\n- </param.listofitems>\r\n- </macro_tar>\r\n- </target>\r\n-\r\n- <target name=\"binary\" depends=\"package\" \r\n- \tdescription=\"Make tarball without source and documentation\">\r\n- <macro_tar param.destfile=\"${build.dir}/${final.name}-bin.tar.gz\">\r\n- <param.listofitems>\r\n- <tarfileset dir=\"${build.dir}\" mode=\"664\">\r\n- <exclude name=\"${final.name}/bin/*\" />\r\n- <exclude name=\"${final.name}/src/**\" />\r\n- <exclude name=\"${final.name}/docs/**\" />\r\n- <include name=\"${final.name}/**\" />\r\n- </tarfileset>\r\n- <tarfileset dir=\"${build.dir}\" mode=\"755\">\r\n- <include name=\"${final.name}/bin/*\" />\r\n- </tarfileset>\r\n- </param.listofitems>\r\n- </macro_tar>\r\n- </target>\r\n-\r\n- <!-- ================================================================== -->\r\n- <!-- Doc -->\r\n- <!-- ================================================================== -->\r\n- <target name=\"docs\" depends=\"forrest.check\" description=\"Generate forrest-based documentation. To use, specify -Dforrest.home=&lt;base of Apache Forrest installation&gt; on the command line.\" if=\"forrest.home\">\r\n- <exec dir=\"${docs.src}\" executable=\"${forrest.home}/bin/forrest\" \r\n- failonerror=\"true\">\r\n- \t<env key=\"JAVA_HOME\" value=\"${java5.home}\"/>\r\n- </exec>\r\n- <copy todir=\"${build.docs}\">\r\n- <fileset dir=\"${docs.src}/build/site/\" />\r\n- </copy>\r\n- \t<delete dir=\"${docs.src}/build/\"/>\r\n- </target>\r\n-\r\n- <target name=\"forrest.check\" unless=\"forrest.home\">\r\n- <fail message=\"'forrest.home' is not defined. Please pass -Dforrest.home=&lt;base of Apache Forrest installation&gt; to Ant on the command-line.\" />\r\n- </target>\r\n-\r\n- <!-- Javadoc -->\r\n- <target name=\"javadoc\" depends=\"cc-compile\" description=\"Generate javadoc\">\r\n- <mkdir dir=\"${build.javadoc}\" />\r\n- <javadoc overview=\"${src.dir}/overview.html\" packagenames=\"org.apache.hama.*\" \r\n- \t destdir=\"${build.javadoc}\" author=\"true\" version=\"true\" use=\"true\" \r\n- \t windowtitle=\"${Name} ${version} API\" doctitle=\"${Name} ${version} API\" \r\n- \t bottom=\"Copyright &amp;copy; ${year} The Apache Software Foundation\">\r\n- <packageset dir=\"${src.dir}\">\r\n- <include name=\"org/apache/**\" />\r\n- </packageset>\r\n- <packageset dir=\"${src.gen.dir}\">\r\n- <include name=\"org/apache/**\" />\r\n- </packageset>\r\n- <link href=\"${javadoc.link.java}\" />\r\n- <classpath>\r\n- <path refid=\"classpath\" />\r\n- <pathelement path=\"${java.class.path}\" />\r\n- </classpath>\r\n- <group title=\"${Name}\" packages=\"org.apache.hama.*\" />\r\n- </javadoc>\r\n- </target>\r\n-\r\n- <!-- ================================================================== -->\r\n- <!-- Run unit tests -->\r\n- <!-- ================================================================== -->\r\n- <path id=\"test.classpath\">\r\n- <pathelement location=\"${src.test}\" />\r\n- <pathelement location=\"${build.test}\" />\r\n- <path refid=\"classpath\" />\r\n- <pathelement location=\"${build.dir}\" />\r\n- </path>\r\n-\r\n- <target name=\"compile-test\" depends=\"compile\">\r\n- <javac encoding=\"${build.encoding}\" srcdir=\"${src.test}\" \r\n- includes=\"**/*.java\" destdir=\"${build.test}\" debug=\"${javac.debug}\">\r\n- <classpath refid=\"test.classpath\" />\r\n- </javac>\r\n- <jar jarfile=\"${build.dir}/${final.name}-test.jar\">\r\n- <fileset dir=\"${build.test}\" includes=\"org/**\" />\r\n- <fileset dir=\"${build.classes}\" />\r\n- <fileset dir=\"${src.test}\" includes=\"**/*.properties\" />\r\n- <manifest>\r\n- <attribute name=\"Main-Class\" value=\"org/apache/hama/Benchmarks\" />\r\n- </manifest>\r\n- </jar>\r\n- </target>\r\n-\r\n- <target name=\"test\" depends=\"compile-test, compile\">\r\n- <junit printsummary=\"yes\" showoutput=\"${test.output}\" haltonfailure=\"no\"\r\n- fork=\"yes\" maxmemory=\"512m\" errorProperty=\"tests.failed\" \r\n- \t failureProperty=\"tests.failed\" timeout=\"${test.timeout}\">\r\n- <classpath refid=\"test.classpath\" />\r\n- <formatter type=\"${test.junit.output.format}\" />\r\n- <batchtest todir=\"${build.report.tests}\">\r\n- <fileset dir=\"${src.test}\" includes=\"**/Test*.java\" \r\n- \t excludes=\"**/${test.exclude}.java\" />\r\n- </batchtest>\r\n- </junit>\r\n- <fail if=\"tests.failed\">Tests failed!</fail>\r\n- </target>\r\n-\r\n- <target name=\"findbugs\" depends=\"init, jar\">\r\n- <findbugs home=\"${lib.dir}/findbugs\" output=\"xml\" \r\n- \t outputFile=\"${build.report.findbugs}/hama-findbugs.xml\" \r\n- excludeFilter=\"${conf.dir}/findbugs-exclude-filter.xml\"\r\n- \t auxClasspathRef=\"classpath\">\r\n- <sourcePath path=\"${src.dir}\" />\r\n- <class location=\"${build.dir}/${final.name}.jar\" />\r\n- </findbugs>\r\n- </target>\r\n- \r\n- <target name=\"report\" depends=\"findbugs,test\"></target>\r\n- \r\n- <!-- ================================================================== -->\r\n- <!-- Clean. Delete the build files, and their directories -->\r\n- <!-- ================================================================== -->\r\n- <target name=\"clean\">\r\n- <delete dir=\"${src.gen.dir}\" />\r\n- <delete dir=\"${build.dir}\" />\r\n- </target>\r\n-</project>\r\n+<?xml version=\"1.0\"?>\n+\n+<!--\n+ Licensed to the Apache Software Foundation (ASF) under one or more\n+ contributor license agreements. See the NOTICE file distributed with\n+ this work for additional information regarding copyright ownership.\n+ The ASF licenses this file to You under the Apache License, Version 2.0\n+ (the \"License\"); you may not use this file except in compliance with\n+ the License. You may obtain a copy of the License at\n+\n+ http://www.apache.org/licenses/LICENSE-2.0\n+\n+ Unless required by applicable law or agreed to in writing, software\n+ distributed under the License is distributed on an \"AS IS\" BASIS,\n+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ See the License for the specific language governing permissions and\n+ limitations under the License.\n+-->\n+\n+<project name=\"hama\" default=\"jar\">\n+ <property name=\"version\" value=\"0.2.0-dev\" />\n+ <property name=\"Name\" value=\"Hama\" />\n+ <property name=\"final.name\" value=\"hama-${version}\" />\n+ <property name=\"year\" value=\"2009\" />\n+\n+ <!-- Load all the default properties, and any the user wants -->\n+ <!-- to contribute (without having to type -D or edit this file -->\n+ <property file=\"${user.home}/${name}.build.properties\" />\n+ <property file=\"${basedir}/build.properties\" />\n+\n+ <property name=\"src.dir\" location=\"${basedir}/src/java\" />\n+ <property name=\"src.gen.dir\" location=\"${basedir}/src-gen\" />\n+ <property name=\"src.test\" location=\"${basedir}/src/test\" />\n+ <property name=\"src.examples\" location=\"${basedir}/src/examples\" />\n+\n+ <property name=\"lib.dir\" value=\"${basedir}/lib\" />\n+ <property name=\"conf.dir\" value=\"${basedir}/conf\" />\n+ <property name=\"docs.dir\" value=\"${basedir}/docs\" />\n+ <property name=\"docs.src\" value=\"${basedir}/src/docs\" />\n+\n+\t<!-- javacc properties -->\n+ <property name=\"javacc.home\" value=\"${basedir}/lib\" />\n+\n+ <property name=\"src.gen.parser.expression.dir\" value=\"${src.gen.dir}/org/apache/hama/shell/parser/expression\" />\n+ <property name=\"src.gen.parser.script.dir\" value=\"${src.gen.dir}/org/apache/hama/shell/parser/script\" />\n+\n+\t<!-- build properties -->\n+\t\n+ <property name=\"test.output\" value=\"no\" />\n+ <property name=\"test.timeout\" value=\"600000\" />\n+\n+ <property name=\"build.dir\" location=\"${basedir}/build\" />\n+ <property name=\"build.lib\" location=\"${build.dir}/lib\" />\n+ <property name=\"build.classes\" location=\"${build.dir}/classes\" />\n+ <property name=\"build.test\" location=\"${build.dir}/test\" />\n+ <property name=\"build.examples\" location=\"${build.dir}/examples\" />\n+ <property name=\"build.docs\" value=\"${build.dir}/docs/site\" />\n+ <property name=\"build.javadoc\" value=\"${build.docs}/api\" />\n+ <property name=\"build.encoding\" value=\"ISO-8859-1\" />\n+ <property name=\"build.src\" value=\"${build.dir}/src\" />\n+ \n+ <property name=\"build.report\" value=\"${build.dir}/reports\" />\n+ <property name=\"build.report.findbugs\" value=\"${build.report}/findbugs\" />\n+ <property name=\"build.report.tests\" value=\"${build.report}/tests\" />\n+ \n+ <property name=\"test.build.dir\" value=\"${build.dir}/test\" />\n+ <property name=\"test.junit.output.format\" value=\"plain\" />\n+\n+ <property name=\"dist.dir\" value=\"${build.dir}/${final.name}\" />\n+\n+ <property name=\"javac.deprecation\" value=\"off\" />\n+ <property name=\"javac.debug\" value=\"on\" />\n+\n+ <property name=\"javadoc.link.java\" \n+ value=\"http://java.sun.com/javase/6/docs/api/\" />\n+ <property name=\"javadoc.packages\" value=\"org.apache.hama.*\" />\n+\n+ <fileset id=\"lib.jars\" dir=\"${basedir}\" includes=\"lib/*.jar\" />\n+ <path id=\"classpath\">\n+ <fileset refid=\"lib.jars\" />\n+ <fileset dir=\"${lib.dir}/findbugs/\">\n+ <include name=\"*jar\" />\n+ </fileset>\n+ <pathelement location=\"${build.classes}\" />\n+ <pathelement location=\"${conf.dir}\" />\n+ </path>\n+\n+ <taskdef name=\"findbugs\" classpathref=\"classpath\" \n+ \tclassname=\"edu.umd.cs.findbugs.anttask.FindBugsTask\" />\n+\n+ <target name=\"init\">\n+ <mkdir dir=\"${src.gen.dir}\" />\n+ <mkdir dir=\"${src.gen.parser.script.dir}\" />\n+ <mkdir dir=\"${src.gen.parser.expression.dir}\" />\n+ <mkdir dir=\"${build.dir}\" />\n+ <mkdir dir=\"${build.classes}\" />\n+ <mkdir dir=\"${build.test}\" />\n+ <mkdir dir=\"${build.examples}\" />\n+ <mkdir dir=\"${build.report.findbugs}\" />\n+ <mkdir dir=\"${build.report.tests}\" />\n+ <!--Copy bin, lib, and conf. too-->\n+ <mkdir dir=\"${build.lib}\" />\n+ <copy todir=\"${build.lib}\">\n+ <fileset dir=\"${lib.dir}\" />\n+ </copy>\n+ </target>\n+\t\n+\t<!-- ================================================================== -->\n+ <!-- Java Compiler Compiler, generate Parsers -->\n+ <!-- ================================================================== -->\n+ <target name=\"cc-compile\" depends=\"init\" description=\"Create and Compile Parser\">\n+ <jjtree target=\"${src.dir}/org/apache/hama/shell/parser/expression/HamaExpressionParser.jjt\" outputdirectory=\"${src.gen.parser.expression.dir}\" javacchome=\"${javacc.home}\" />\n+ <javacc target=\"${src.gen.parser.expression.dir}/HamaExpressionParser.jj\" outputdirectory=\"${src.gen.parser.expression.dir}\" javacchome=\"${javacc.home}\" />\n+ <javacc target=\"${src.dir}/org/apache/hama/shell/parser/script/HamaScriptParser.jj\" outputdirectory=\"${src.gen.parser.script.dir}\" javacchome=\"${javacc.home}\" />\n+ </target>\n+\n+ <target name=\"compile\" depends=\"init, cc-compile\">\n+ <!--Compile whats under src and generated java classes made from jsp-->\n+ <mkdir dir=\"${build.src}\" />\n+ <javac encoding=\"${build.encoding}\" \n+ srcdir=\"${src.dir};${src.gen.dir};${build.src}\" includes=\"**/*.java\" \n+ \tdestdir=\"${build.classes}\" debug=\"${javac.debug}\" \n+ deprecation=\"${javac.deprecation}\">\n+ <classpath refid=\"classpath\" />\n+ </javac>\n+ </target>\n+\n+ <target name=\"compile-examples\" depends=\"compile\">\n+ <javac encoding=\"${build.encoding}\" srcdir=\"${src.examples}\" \n+ includes=\"**/*.java\" \n+ \tdestdir=\"${build.examples}\" debug=\"${javac.debug}\" \n+ deprecation=\"${javac.deprecation}\">\n+ <classpath refid=\"classpath\" />\n+ </javac>\n+ </target>\n+\n+ <!-- Override jar target to specify main class -->\n+ <target name=\"jar\" depends=\"compile\">\n+ <jar jarfile=\"${build.dir}/${final.name}.jar\" \n+ basedir=\"${build.classes}\">\n+ <manifest>\n+ <attribute name=\"Main-Class\" \n+ value=\"org/apache/hama/shell/HamaShell\" />\n+ </manifest>\n+ </jar>\n+ </target>\n+\n+ <target name=\"examples\" depends=\"jar, compile-examples\" \n+ \tdescription=\"Make the hama examples jar.\">\n+ <jar jarfile=\"${build.dir}/${final.name}-examples.jar\" \n+ basedir=\"${build.examples}\">\n+ <manifest>\n+ <attribute name=\"Main-Class\" \n+ value=\"org/apache/hama/examples/ExampleDriver\" />\n+ </manifest>\n+ </jar>\n+ </target>\n+\n+ <target name=\"package\" depends=\"jar,javadoc,compile-test, examples\" \n+ \tdescription=\"Build distribution\">\n+ <mkdir dir=\"${dist.dir}\" />\n+ <copy todir=\"${dist.dir}\" includeEmptyDirs=\"false\" flatten=\"true\">\n+ <fileset dir=\"${build.dir}\">\n+ <include name=\"${final.name}.jar\" />\n+ <include name=\"${final.name}-test.jar\" />\n+ </fileset>\n+ </copy>\n+ <mkdir dir=\"${dist.dir}/lib\" />\n+ <copy todir=\"${dist.dir}/lib\">\n+ <fileset dir=\"${build.lib}\" />\n+ </copy>\n+ <copy todir=\"${dist.dir}\">\n+ <fileset dir=\".\">\n+ <include name=\"*.txt\" />\n+ </fileset>\n+ </copy>\n+ <mkdir dir=\"${dist.dir}/src\" />\n+ <copy todir=\"${dist.dir}/src\" includeEmptyDirs=\"true\">\n+ <fileset dir=\"src\" excludes=\"**/*.template **/docs/build/**/*\" />\n+ </copy>\n+ </target>\n+\n+ <!-- ================================================================== -->\n+ <!-- Make release tarball -->\n+ <!-- ================================================================== -->\n+ <macrodef name=\"macro_tar\" description=\"Worker Macro for tar\">\n+ <attribute name=\"param.destfile\" />\n+ <element name=\"param.listofitems\" />\n+ <sequential>\n+ <tar compression=\"gzip\" longfile=\"gnu\" destfile=\"@{param.destfile}\">\n+ <param.listofitems />\n+ </tar>\n+ </sequential>\n+ </macrodef>\n+ <target name=\"tar\" depends=\"package\" description=\"Make release tarball\">\n+ <macro_tar param.destfile=\"${build.dir}/${final.name}.tar.gz\">\n+ <param.listofitems>\n+ <tarfileset dir=\"${build.dir}\" mode=\"664\">\n+ <exclude name=\"${final.name}/bin/*\" />\n+ <include name=\"${final.name}/**\" />\n+ </tarfileset>\n+ <tarfileset dir=\"${build.dir}\" mode=\"755\">\n+ <include name=\"${final.name}/bin/*\" />\n+ </tarfileset>\n+ </param.listofitems>\n+ </macro_tar>\n+ </target>\n+\n+ <target name=\"binary\" depends=\"package\" \n+ \tdescription=\"Make tarball without source and documentation\">\n+ <macro_tar param.destfile=\"${build.dir}/${final.name}-bin.tar.gz\">\n+ <param.listofitems>\n+ <tarfileset dir=\"${build.dir}\" mode=\"664\">\n+ <exclude name=\"${final.name}/bin/*\" />\n+ <exclude name=\"${final.name}/src/**\" />\n+ <exclude name=\"${final.name}/docs/**\" />\n+ <include name=\"${final.name}/**\" />\n+ </tarfileset>\n+ <tarfileset dir=\"${build.dir}\" mode=\"755\">\n+ <include name=\"${final.name}/bin/*\" />\n+ </tarfileset>\n+ </param.listofitems>\n+ </macro_tar>\n+ </target>\n+\n+ <!-- ================================================================== -->\n+ <!-- Doc -->\n+ <!-- ================================================================== -->\n+ <target name=\"docs\" depends=\"forrest.check\" description=\"Generate forrest-based documentation. To use, specify -Dforrest.home=&lt;base of Apache Forrest installation&gt; on the command line.\" if=\"forrest.home\">\n+ <exec dir=\"${docs.src}\" executable=\"${forrest.home}/bin/forrest\" \n+ failonerror=\"true\">\n+ \t<env key=\"JAVA_HOME\" value=\"${java5.home}\"/>\n+ </exec>\n+ <copy todir=\"${build.docs}\">\n+ <fileset dir=\"${docs.src}/build/site/\" />\n+ </copy>\n+ \t<delete dir=\"${docs.src}/build/\"/>\n+ </target>\n+\n+ <target name=\"forrest.check\" unless=\"forrest.home\">\n+ <fail message=\"'forrest.home' is not defined. Please pass -Dforrest.home=&lt;base of Apache Forrest installation&gt; to Ant on the command-line.\" />\n+ </target>\n+\n+ <!-- Javadoc -->\n+ <target name=\"javadoc\" depends=\"cc-compile\" description=\"Generate javadoc\">\n+ <mkdir dir=\"${build.javadoc}\" />\n+ <javadoc overview=\"${src.dir}/overview.html\" packagenames=\"org.apache.hama.*\" \n+ \t destdir=\"${build.javadoc}\" author=\"true\" version=\"true\" use=\"true\" \n+ \t windowtitle=\"${Name} ${version} API\" doctitle=\"${Name} ${version} API\" \n+ \t bottom=\"Copyright &amp;copy; ${year} The Apache Software Foundation\">\n+ <packageset dir=\"${src.dir}\">\n+ <include name=\"org/apache/**\" />\n+ </packageset>\n+ <packageset dir=\"${src.gen.dir}\">\n+ <include name=\"org/apache/**\" />\n+ </packageset>\n+ <link href=\"${javadoc.link.java}\" />\n+ <classpath>\n+ <path refid=\"classpath\" />\n+ <pathelement path=\"${java.class.path}\" />\n+ </classpath>\n+ <group title=\"${Name}\" packages=\"org.apache.hama.*\" />\n+ </javadoc>\n+ </target>\n+\n+ <!-- ================================================================== -->\n+ <!-- Run unit tests -->\n+ <!-- ================================================================== -->\n+ <path id=\"test.classpath\">\n+ <pathelement location=\"${src.test}\" />\n+ <pathelement location=\"${build.test}\" />\n+ <path refid=\"classpath\" />\n+ <pathelement location=\"${build.dir}\" />\n+ </path>\n+\n+ <target name=\"compile-test\" depends=\"compile\">\n+ <javac encoding=\"${build.encoding}\" srcdir=\"${src.test}\" \n+ includes=\"**/*.java\" destdir=\"${build.test}\" debug=\"${javac.debug}\">\n+ <classpath refid=\"test.classpath\" />\n+ </javac>\n+ <jar jarfile=\"${build.dir}/${final.name}-test.jar\">\n+ <fileset dir=\"${build.test}\" includes=\"org/**\" />\n+ <fileset dir=\"${build.classes}\" />\n+ <fileset dir=\"${src.test}\" includes=\"**/*.properties\" />\n+ <manifest>\n+ <attribute name=\"Main-Class\" value=\"org/apache/hama/Benchmarks\" />\n+ </manifest>\n+ </jar>\n+ </target>\n+\n+ <target name=\"test\" depends=\"compile-test, compile\">\n+ <junit printsummary=\"yes\" showoutput=\"${test.output}\" haltonfailure=\"no\"\n+ fork=\"yes\" maxmemory=\"512m\" errorProperty=\"tests.failed\" \n+ \t failureProperty=\"tests.failed\" timeout=\"${test.timeout}\">\n+ <classpath refid=\"test.classpath\" />\n+ <formatter type=\"${test.junit.output.format}\" />\n+ <batchtest todir=\"${build.report.tests}\">\n+ <fileset dir=\"${src.test}\" includes=\"**/Test*.java\" \n+ \t excludes=\"**/${test.exclude}.java\" />\n+ </batchtest>\n+ </junit>\n+ <fail if=\"tests.failed\">Tests failed!</fail>\n+ </target>\n+\n+ <target name=\"findbugs\" depends=\"init, jar\">\n+ <findbugs home=\"${lib.dir}/findbugs\" output=\"xml\" \n+ \t outputFile=\"${build.report.findbugs}/hama-findbugs.xml\" \n+ excludeFilter=\"${conf.dir}/findbugs-exclude-filter.xml\"\n+ \t auxClasspathRef=\"classpath\">\n+ <sourcePath path=\"${src.dir}\" />\n+ <class location=\"${build.dir}/${final.name}.jar\" />\n+ </findbugs>\n+ </target>\n+ \n+ <target name=\"report\" depends=\"findbugs,test\"></target>\n+ \n+ <!-- ================================================================== -->\n+ <!-- Clean. Delete the build files, and their directories -->\n+ <!-- ================================================================== -->\n+ <target name=\"clean\">\n+ <delete dir=\"${src.gen.dir}\" />\n+ <delete dir=\"${build.dir}\" />\n+ </target>\n+</project>", "raw_url": "https://github.com/apache/hama/raw/42584cd5328fc55a499d318dda6fefff6459242c/build.xml", "sha": "c45e160c5f4258d11573be997351b4718cf43a73", "status": "modified" }, { "additions": 2, "blob_url": "https://github.com/apache/hama/blob/42584cd5328fc55a499d318dda6fefff6459242c/src%2Fjava%2Forg%2Fapache%2Fhama%2FHamaAdminImpl.java", "changes": 2, "contents_url": "https://api.github.com/repos/apache/hama/contents/src%2Fjava%2Forg%2Fapache%2Fhama%2FHamaAdminImpl.java?ref=42584cd5328fc55a499d318dda6fefff6459242c", "deletions": 0, "filename": "src/java/org/apache/hama/HamaAdminImpl.java", "new_code": "import org.apache.hadoop.hbase.client.Get;\nimport org.apache.hadoop.hbase.client.Result;", "new_methods": [], "old_code": "", "old_methods": [], "patch": "@@ -25,8 +25,10 @@\n import org.apache.hadoop.hbase.HTableDescriptor;\n import org.apache.hadoop.hbase.MasterNotRunningException;\n import org.apache.hadoop.hbase.RegionException;\n+import org.apache.hadoop.hbase.client.Get;\n import org.apache.hadoop.hbase.client.HBaseAdmin;\n import org.apache.hadoop.hbase.client.HTable;\n+import org.apache.hadoop.hbase.client.Result;\n import org.apache.hadoop.hbase.io.BatchUpdate;\n import org.apache.hadoop.hbase.io.Cell;\n import org.apache.hadoop.hbase.util.Bytes;", "raw_url": "https://github.com/apache/hama/raw/42584cd5328fc55a499d318dda6fefff6459242c/src%2Fjava%2Forg%2Fapache%2Fhama%2FHamaAdminImpl.java", "sha": "39568b43f7cfa5c02867b88ec49d851a7c954faf", "status": "modified" }, { "additions": 13, "blob_url": "https://github.com/apache/hama/blob/42584cd5328fc55a499d318dda6fefff6459242c/src%2Fjava%2Forg%2Fapache%2Fhama%2Fmatrix%2FAbstractMatrix.java", "changes": 14, "contents_url": "https://api.github.com/repos/apache/hama/contents/src%2Fjava%2Forg%2Fapache%2Fhama%2Fmatrix%2FAbstractMatrix.java?ref=42584cd5328fc55a499d318dda6fefff6459242c", "deletions": 1, "filename": "src/java/org/apache/hama/matrix/AbstractMatrix.java", "new_code": " this.tableDesc.addFamily(new HColumnDescriptor(Bytes.toBytes(Constants.COLUMN)));\n this.tableDesc.addFamily(new HColumnDescriptor(Bytes.toBytes(Constants.ATTRIBUTE)));\n this.tableDesc.addFamily(new HColumnDescriptor(Bytes.toBytes(Constants.ALIASEFAMILY)));\n \n // It's a temporary data.\n this.tableDesc.addFamily(new HColumnDescriptor(Bytes.toBytes(Constants.BLOCK)));\n // the following families are used in JacobiEigenValue computation\n this.tableDesc.addFamily(new HColumnDescriptor(Bytes.toBytes(JacobiEigenValue.EI)));\n this.tableDesc.addFamily(new HColumnDescriptor(Bytes.toBytes(JacobiEigenValue.EICOL)));\n this.tableDesc.addFamily(new HColumnDescriptor(Bytes.toBytes(JacobiEigenValue.EIVEC)));\n \n /*\n */", "new_methods": [], "old_code": "", "old_methods": [], "patch": "@@ -143,6 +143,18 @@ protected void tryToCreateTable(String table_prefix) throws IOException {\n protected void create() throws IOException {\n // It should run only when table doesn't exist.\n if (!admin.tableExists(matrixPath)) {\n+ this.tableDesc.addFamily(new HColumnDescriptor(Bytes.toBytes(Constants.COLUMN)));\n+ this.tableDesc.addFamily(new HColumnDescriptor(Bytes.toBytes(Constants.ATTRIBUTE)));\n+ this.tableDesc.addFamily(new HColumnDescriptor(Bytes.toBytes(Constants.ALIASEFAMILY)));\n+ \n+ // It's a temporary data.\n+ this.tableDesc.addFamily(new HColumnDescriptor(Bytes.toBytes(Constants.BLOCK)));\n+ // the following families are used in JacobiEigenValue computation\n+ this.tableDesc.addFamily(new HColumnDescriptor(Bytes.toBytes(JacobiEigenValue.EI)));\n+ this.tableDesc.addFamily(new HColumnDescriptor(Bytes.toBytes(JacobiEigenValue.EICOL)));\n+ this.tableDesc.addFamily(new HColumnDescriptor(Bytes.toBytes(JacobiEigenValue.EIVEC)));\n+ \n+ /*\n this.tableDesc.addFamily(new HColumnDescriptor(Bytes\n .toBytes(Constants.COLUMN), 3, CompressionType.NONE, false, false,\n Integer.MAX_VALUE, HConstants.FOREVER, false));\n@@ -162,7 +174,7 @@ protected void create() throws IOException {\n this.tableDesc.addFamily(new HColumnDescriptor(Bytes\n .toBytes(JacobiEigenValue.EIVEC), 10, CompressionType.NONE, false,\n false, Integer.MAX_VALUE, HConstants.FOREVER, false));\n-\n+ */\n LOG.info(\"Initializing the matrix storage.\");\n this.admin.createTable(this.tableDesc);\n LOG.info(\"Create Matrix \" + matrixPath);", "raw_url": "https://github.com/apache/hama/raw/42584cd5328fc55a499d318dda6fefff6459242c/src%2Fjava%2Forg%2Fapache%2Fhama%2Fmatrix%2FAbstractMatrix.java", "sha": "54d9308ec83d3eccadce44883b70f367b07cd939", "status": "modified" }, { "additions": 0, "blob_url": "https://github.com/apache/hama/blob/42584cd5328fc55a499d318dda6fefff6459242c/src%2Fjava%2Forg%2Fapache%2Fhama%2Fmatrix%2FDenseMatrix.java", "changes": 1, "contents_url": "https://api.github.com/repos/apache/hama/contents/src%2Fjava%2Forg%2Fapache%2Fhama%2Fmatrix%2FDenseMatrix.java?ref=42584cd5328fc55a499d318dda6fefff6459242c", "deletions": 1, "filename": "src/java/org/apache/hama/matrix/DenseMatrix.java", "new_code": "", "new_methods": [], "old_code": "import org.apache.hama.matrix.Matrix.Norm;", "old_methods": [], "patch": "@@ -59,7 +59,6 @@\n import org.apache.hama.mapred.RandomMatrixMap;\n import org.apache.hama.mapred.RandomMatrixReduce;\n import org.apache.hama.mapred.VectorInputFormat;\n-import org.apache.hama.matrix.Matrix.Norm;\n import org.apache.hama.matrix.algebra.BlockMultiplyMap;\n import org.apache.hama.matrix.algebra.BlockMultiplyReduce;\n import org.apache.hama.matrix.algebra.DenseMatrixVectorMultMap;", "raw_url": "https://github.com/apache/hama/raw/42584cd5328fc55a499d318dda6fefff6459242c/src%2Fjava%2Forg%2Fapache%2Fhama%2Fmatrix%2FDenseMatrix.java", "sha": "3e70326f6b8dc2c970255fed8d5db15c57d53609", "status": "modified" }, { "additions": 185, "blob_url": "https://github.com/apache/hama/blob/42584cd5328fc55a499d318dda6fefff6459242c/src%2Fjava%2Forg%2Fapache%2Fhama%2Fmatrix%2FSparseVector.java", "changes": 371, "contents_url": "https://api.github.com/repos/apache/hama/contents/src%2Fjava%2Forg%2Fapache%2Fhama%2Fmatrix%2FSparseVector.java?ref=42584cd5328fc55a499d318dda6fefff6459242c", "deletions": 186, "filename": "src/java/org/apache/hama/matrix/SparseVector.java", "new_code": "/**\n * Copyright 2007 The Apache Software Foundation\n *\n * Licensed to the Apache Software Foundation (ASF) under one\n * or more contributor license agreements. See the NOTICE file\n * distributed with this work for additional information\n * regarding copyright ownership. The ASF licenses this file\n * to you under the Apache License, Version 2.0 (the\n * \"License\"); you may not use this file except in compliance\n * with the License. You may obtain a copy of the License at\n *\n * http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\npackage org.apache.hama.matrix;\n\nimport java.io.IOException;\nimport java.util.Map;\n\nimport org.apache.hadoop.hbase.io.RowResult;\nimport org.apache.hadoop.io.IntWritable;\nimport org.apache.hadoop.io.MapWritable;\nimport org.apache.hadoop.io.Writable;\nimport org.apache.hama.io.DoubleEntry;\nimport org.apache.log4j.Logger;\n\n/**\n * This class represents a sparse vector.\n */\npublic class SparseVector extends AbstractVector implements Vector {\n static final Logger LOG = Logger.getLogger(SparseVector.class);\n\n public SparseVector() {\n this(new MapWritable());\n }\n\n public SparseVector(MapWritable m) {\n this.entries = m;\n }\n\n public SparseVector(RowResult row) {\n this.initMap(row);\n }\n\n @Override\n public Vector add(double alpha, Vector v) {\n if (alpha == 0)\n return this;\n\n for (Map.Entry<Writable, Writable> e : v.getEntries().entrySet()) {\n if (this.entries.containsKey(e.getKey())) {\n // add\n double value = alpha * ((DoubleEntry) e.getValue()).getValue()\n + this.get(((IntWritable) e.getKey()).get());\n this.entries.put(e.getKey(), new DoubleEntry(value));\n } else {\n // put\n double value = alpha * ((DoubleEntry) e.getValue()).getValue();\n this.entries.put(e.getKey(), new DoubleEntry(value));\n }\n }\n\n return this;\n }\n\n /**\n * x = v + x\n * \n * @param v2\n * @return x = v + x\n */\n public SparseVector add(Vector v2) {\n\n for (Map.Entry<Writable, Writable> e : v2.getEntries().entrySet()) {\n int key = ((IntWritable) e.getKey()).get();\n if (this.entries.containsKey(e.getKey())) {\n this.add(key, ((DoubleEntry) e.getValue()).getValue());\n } else {\n this.set(key, ((DoubleEntry) e.getValue()).getValue());\n }\n }\n\n return this;\n }\n\n @Override\n public double dot(Vector v) {\n // TODO Auto-generated method stub\n return 0;\n }\n\n @Override\n public double norm(Norm type) {\n // TODO Auto-generated method stub\n return 0;\n }\n\n /**\n * v = alpha*v\n * \n * @param alpha\n * @return v = alpha*v\n */\n public SparseVector scale(double alpha) {\n for (Map.Entry<Writable, Writable> e : this.entries.entrySet()) {\n this.entries.put(e.getKey(), new DoubleEntry(((DoubleEntry) e.getValue())\n .getValue()\n * alpha));\n }\n return this;\n }\n\n /**\n * Gets the value of index\n * \n * @param index\n * @return the value of v(index)\n * @throws IOException\n */\n public double get(int index) {\n double value;\n try {\n value = ((DoubleEntry) this.entries.get(new IntWritable(index)))\n .getValue();\n } catch (NullPointerException e) { // returns zero if there is no value\n return 0;\n }\n\n return value;\n }\n\n /**\n * Sets the value of index\n * \n * @param index\n * @param value\n */\n public void set(int index, double value) {\n // If entries are null, create new object\n if (this.entries == null) {\n this.entries = new MapWritable();\n }\n\n if (value != 0) // only stores non-zero element\n this.entries.put(new IntWritable(index), new DoubleEntry(value));\n }\n\n /**\n * Adds the value to v(index)\n * \n * @param index\n * @param value\n */\n public void add(int index, double value) {\n set(index, get(index) + value);\n }\n\n /**\n * Sets the vector\n * \n * @param v\n * @return x = v\n */\n public SparseVector set(Vector v) {\n return new SparseVector(v.getEntries());\n }\n\n @Override\n public Vector subVector(int i0, int i1) {\n // TODO Auto-generated method stub\n return null;\n }\n\n @Override\n public Vector set(double alpha, Vector v) {\n // TODO Auto-generated method stub\n return null;\n }\n\n}", "new_methods": [ { "arguments": [], "filename": "src/java/org/apache/hama/matrix/SparseVector.java", "implementation": "this(new MapWritable());", "signature": "public SparseVector()" }, { "arguments": [ "MapWritable m" ], "filename": "src/java/org/apache/hama/matrix/SparseVector.java", "implementation": "this.entries = m;", "signature": "public SparseVector(MapWritable m)" }, { "arguments": [ "RowResult row" ], "filename": "src/java/org/apache/hama/matrix/SparseVector.java", "implementation": "this.initMap(row);", "signature": "public SparseVector(RowResult row)" }, { "arguments": [ "double alpha", " Vector v" ], "filename": "src/java/org/apache/hama/matrix/SparseVector.java", "implementation": "if (alpha == 0)\n return this;\n\n for (Map.Entry<Writable, Writable> e : v.getEntries().entrySet()) {\n if (this.entries.containsKey(e.getKey())) {\n // add\n double value = alpha * ((DoubleEntry) e.getValue()).getValue()\n + this.get(((IntWritable) e.getKey()).get());\n this.entries.put(e.getKey(), new DoubleEntry(value));", "signature": "Vector add(double alpha, Vector v)" }, { "arguments": [ "Vector v2" ], "filename": "src/java/org/apache/hama/matrix/SparseVector.java", "implementation": "for (Map.Entry<Writable, Writable> e : v2.getEntries().entrySet()) {\n int key = ((IntWritable) e.getKey()).get();\n if (this.entries.containsKey(e.getKey())) {\n this.add(key, ((DoubleEntry) e.getValue()).getValue());", "signature": "SparseVector add(Vector v2)" }, { "arguments": [ "Vector v" ], "filename": "src/java/org/apache/hama/matrix/SparseVector.java", "implementation": "// TODO Auto-generated method stub\n return 0;", "signature": "double dot(Vector v)" }, { "arguments": [ "Norm type" ], "filename": "src/java/org/apache/hama/matrix/SparseVector.java", "implementation": "// TODO Auto-generated method stub\n return 0;", "signature": "double norm(Norm type)" }, { "arguments": [ "double alpha" ], "filename": "src/java/org/apache/hama/matrix/SparseVector.java", "implementation": "for (Map.Entry<Writable, Writable> e : this.entries.entrySet()) {\n this.entries.put(e.getKey(), new DoubleEntry(((DoubleEntry) e.getValue())\n .getValue()\n * alpha));", "signature": "SparseVector scale(double alpha)" }, { "arguments": [ "int index" ], "filename": "src/java/org/apache/hama/matrix/SparseVector.java", "implementation": "double value;\n try {\n value = ((DoubleEntry) this.entries.get(new IntWritable(index)))\n .getValue();", "signature": "double get(int index)" }, { "arguments": [ "int index", " double value" ], "filename": "src/java/org/apache/hama/matrix/SparseVector.java", "implementation": "// If entries are null, create new object\n if (this.entries == null) {\n this.entries = new MapWritable();", "signature": "void set(int index, double value)" }, { "arguments": [ "int index", " double value" ], "filename": "src/java/org/apache/hama/matrix/SparseVector.java", "implementation": "set(index, get(index) + value);", "signature": "void add(int index, double value)" }, { "arguments": [ "Vector v" ], "filename": "src/java/org/apache/hama/matrix/SparseVector.java", "implementation": "return new SparseVector(v.getEntries());", "signature": "SparseVector set(Vector v)" }, { "arguments": [ "int i0", " int i1" ], "filename": "src/java/org/apache/hama/matrix/SparseVector.java", "implementation": "// TODO Auto-generated method stub\n return null;", "signature": "Vector subVector(int i0, int i1)" }, { "arguments": [ "double alpha", " Vector v" ], "filename": "src/java/org/apache/hama/matrix/SparseVector.java", "implementation": "// TODO Auto-generated method stub\n return null;", "signature": "Vector set(double alpha, Vector v)" } ], "old_code": "/**\r\n * Copyright 2007 The Apache Software Foundation\r\n *\r\n * Licensed to the Apache Software Foundation (ASF) under one\r\n * or more contributor license agreements. See the NOTICE file\r\n * distributed with this work for additional information\r\n * regarding copyright ownership. The ASF licenses this file\r\n * to you under the Apache License, Version 2.0 (the\r\n * \"License\"); you may not use this file except in compliance\r\n * with the License. You may obtain a copy of the License at\r\n *\r\n * http://www.apache.org/licenses/LICENSE-2.0\r\n *\r\n * Unless required by applicable law or agreed to in writing, software\r\n * distributed under the License is distributed on an \"AS IS\" BASIS,\r\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r\n * See the License for the specific language governing permissions and\r\n * limitations under the License.\r\n */\r\npackage org.apache.hama.matrix;\r\n\r\nimport java.io.IOException;\r\nimport java.util.Map;\r\n\r\nimport org.apache.hadoop.hbase.io.RowResult;\r\nimport org.apache.hadoop.io.IntWritable;\r\nimport org.apache.hadoop.io.MapWritable;\r\nimport org.apache.hadoop.io.Writable;\r\nimport org.apache.hama.io.DoubleEntry;\r\nimport org.apache.hama.matrix.Vector.Norm;\r\nimport org.apache.log4j.Logger;\r\n\r\n/**\r\n * This class represents a sparse vector.\r\n */\r\npublic class SparseVector extends AbstractVector implements Vector {\r\n static final Logger LOG = Logger.getLogger(SparseVector.class);\r\n\r\n public SparseVector() {\r\n this(new MapWritable());\r\n }\r\n\r\n public SparseVector(MapWritable m) {\r\n this.entries = m;\r\n }\r\n\r\n public SparseVector(RowResult row) {\r\n this.initMap(row);\r\n }\r\n\r\n @Override\r\n public Vector add(double alpha, Vector v) {\r\n if (alpha == 0)\r\n return this;\r\n\r\n for (Map.Entry<Writable, Writable> e : v.getEntries().entrySet()) {\r\n if (this.entries.containsKey(e.getKey())) {\r\n // add\r\n double value = alpha * ((DoubleEntry) e.getValue()).getValue()\r\n + this.get(((IntWritable) e.getKey()).get());\r\n this.entries.put(e.getKey(), new DoubleEntry(value));\r\n } else {\r\n // put\r\n double value = alpha * ((DoubleEntry) e.getValue()).getValue();\r\n this.entries.put(e.getKey(), new DoubleEntry(value));\r\n }\r\n }\r\n\r\n return this;\r\n }\r\n\r\n /**\r\n * x = v + x\r\n * \r\n * @param v2\r\n * @return x = v + x\r\n */\r\n public SparseVector add(Vector v2) {\r\n\r\n for (Map.Entry<Writable, Writable> e : v2.getEntries().entrySet()) {\r\n int key = ((IntWritable) e.getKey()).get();\r\n if (this.entries.containsKey(e.getKey())) {\r\n this.add(key, ((DoubleEntry) e.getValue()).getValue());\r\n } else {\r\n this.set(key, ((DoubleEntry) e.getValue()).getValue());\r\n }\r\n }\r\n\r\n return this;\r\n }\r\n\r\n @Override\r\n public double dot(Vector v) {\r\n // TODO Auto-generated method stub\r\n return 0;\r\n }\r\n\r\n @Override\r\n public double norm(Norm type) {\r\n // TODO Auto-generated method stub\r\n return 0;\r\n }\r\n\r\n /**\r\n * v = alpha*v\r\n * \r\n * @param alpha\r\n * @return v = alpha*v\r\n */\r\n public SparseVector scale(double alpha) {\r\n for (Map.Entry<Writable, Writable> e : this.entries.entrySet()) {\r\n this.entries.put(e.getKey(), new DoubleEntry(((DoubleEntry) e.getValue())\r\n .getValue()\r\n * alpha));\r\n }\r\n return this;\r\n }\r\n\r\n /**\r\n * Gets the value of index\r\n * \r\n * @param index\r\n * @return the value of v(index)\r\n * @throws IOException\r\n */\r\n public double get(int index) {\r\n double value;\r\n try {\r\n value = ((DoubleEntry) this.entries.get(new IntWritable(index)))\r\n .getValue();\r\n } catch (NullPointerException e) { // returns zero if there is no value\r\n return 0;\r\n }\r\n\r\n return value;\r\n }\r\n\r\n /**\r\n * Sets the value of index\r\n * \r\n * @param index\r\n * @param value\r\n */\r\n public void set(int index, double value) {\r\n // If entries are null, create new object\r\n if (this.entries == null) {\r\n this.entries = new MapWritable();\r\n }\r\n\r\n if (value != 0) // only stores non-zero element\r\n this.entries.put(new IntWritable(index), new DoubleEntry(value));\r\n }\r\n\r\n /**\r\n * Adds the value to v(index)\r\n * \r\n * @param index\r\n * @param value\r\n */\r\n public void add(int index, double value) {\r\n set(index, get(index) + value);\r\n }\r\n\r\n /**\r\n * Sets the vector\r\n * \r\n * @param v\r\n * @return x = v\r\n */\r\n public SparseVector set(Vector v) {\r\n return new SparseVector(v.getEntries());\r\n }\r\n\r\n @Override\r\n public Vector subVector(int i0, int i1) {\r\n // TODO Auto-generated method stub\r\n return null;\r\n }\r\n\r\n @Override\r\n public Vector set(double alpha, Vector v) {\r\n // TODO Auto-generated method stub\r\n return null;\r\n }\r\n\r\n}\r", "old_methods": [ { "arguments": [], "filename": "src/java/org/apache/hama/matrix/SparseVector.java", "implementation": "this(new MapWritable());", "signature": "public SparseVector()" }, { "arguments": [ "MapWritable m" ], "filename": "src/java/org/apache/hama/matrix/SparseVector.java", "implementation": "this.entries = m;", "signature": "public SparseVector(MapWritable m)" }, { "arguments": [ "RowResult row" ], "filename": "src/java/org/apache/hama/matrix/SparseVector.java", "implementation": "this.initMap(row);", "signature": "public SparseVector(RowResult row)" }, { "arguments": [ "double alpha", " Vector v" ], "filename": "src/java/org/apache/hama/matrix/SparseVector.java", "implementation": "if (alpha == 0)\r\n return this;\r\n\r\n for (Map.Entry<Writable, Writable> e : v.getEntries().entrySet()) {\r\n if (this.entries.containsKey(e.getKey())) {\r\n // add\r\n double value = alpha * ((DoubleEntry) e.getValue()).getValue()\r\n + this.get(((IntWritable) e.getKey()).get());\r\n this.entries.put(e.getKey(), new DoubleEntry(value));", "signature": "Vector add(double alpha, Vector v)" }, { "arguments": [ "Vector v2" ], "filename": "src/java/org/apache/hama/matrix/SparseVector.java", "implementation": "for (Map.Entry<Writable, Writable> e : v2.getEntries().entrySet()) {\r\n int key = ((IntWritable) e.getKey()).get();\r\n if (this.entries.containsKey(e.getKey())) {\r\n this.add(key, ((DoubleEntry) e.getValue()).getValue());", "signature": "SparseVector add(Vector v2)" }, { "arguments": [ "Vector v" ], "filename": "src/java/org/apache/hama/matrix/SparseVector.java", "implementation": "// TODO Auto-generated method stub\r\n return 0;", "signature": "double dot(Vector v)" }, { "arguments": [ "Norm type" ], "filename": "src/java/org/apache/hama/matrix/SparseVector.java", "implementation": "// TODO Auto-generated method stub\r\n return 0;", "signature": "double norm(Norm type)" }, { "arguments": [ "double alpha" ], "filename": "src/java/org/apache/hama/matrix/SparseVector.java", "implementation": "for (Map.Entry<Writable, Writable> e : this.entries.entrySet()) {\r\n this.entries.put(e.getKey(), new DoubleEntry(((DoubleEntry) e.getValue())\r\n .getValue()\r\n * alpha));", "signature": "SparseVector scale(double alpha)" }, { "arguments": [ "int index" ], "filename": "src/java/org/apache/hama/matrix/SparseVector.java", "implementation": "double value;\r\n try {\r\n value = ((DoubleEntry) this.entries.get(new IntWritable(index)))\r\n .getValue();", "signature": "double get(int index)" }, { "arguments": [ "int index", " double value" ], "filename": "src/java/org/apache/hama/matrix/SparseVector.java", "implementation": "// If entries are null, create new object\r\n if (this.entries == null) {\r\n this.entries = new MapWritable();", "signature": "void set(int index, double value)" }, { "arguments": [ "int index", " double value" ], "filename": "src/java/org/apache/hama/matrix/SparseVector.java", "implementation": "set(index, get(index) + value);", "signature": "void add(int index, double value)" }, { "arguments": [ "Vector v" ], "filename": "src/java/org/apache/hama/matrix/SparseVector.java", "implementation": "return new SparseVector(v.getEntries());", "signature": "SparseVector set(Vector v)" }, { "arguments": [ "int i0", " int i1" ], "filename": "src/java/org/apache/hama/matrix/SparseVector.java", "implementation": "// TODO Auto-generated method stub\r\n return null;", "signature": "Vector subVector(int i0, int i1)" }, { "arguments": [ "double alpha", " Vector v" ], "filename": "src/java/org/apache/hama/matrix/SparseVector.java", "implementation": "// TODO Auto-generated method stub\r\n return null;", "signature": "Vector set(double alpha, Vector v)" } ], "patch": "@@ -1,186 +1,185 @@\n-/**\r\n- * Copyright 2007 The Apache Software Foundation\r\n- *\r\n- * Licensed to the Apache Software Foundation (ASF) under one\r\n- * or more contributor license agreements. See the NOTICE file\r\n- * distributed with this work for additional information\r\n- * regarding copyright ownership. The ASF licenses this file\r\n- * to you under the Apache License, Version 2.0 (the\r\n- * \"License\"); you may not use this file except in compliance\r\n- * with the License. You may obtain a copy of the License at\r\n- *\r\n- * http://www.apache.org/licenses/LICENSE-2.0\r\n- *\r\n- * Unless required by applicable law or agreed to in writing, software\r\n- * distributed under the License is distributed on an \"AS IS\" BASIS,\r\n- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r\n- * See the License for the specific language governing permissions and\r\n- * limitations under the License.\r\n- */\r\n-package org.apache.hama.matrix;\r\n-\r\n-import java.io.IOException;\r\n-import java.util.Map;\r\n-\r\n-import org.apache.hadoop.hbase.io.RowResult;\r\n-import org.apache.hadoop.io.IntWritable;\r\n-import org.apache.hadoop.io.MapWritable;\r\n-import org.apache.hadoop.io.Writable;\r\n-import org.apache.hama.io.DoubleEntry;\r\n-import org.apache.hama.matrix.Vector.Norm;\r\n-import org.apache.log4j.Logger;\r\n-\r\n-/**\r\n- * This class represents a sparse vector.\r\n- */\r\n-public class SparseVector extends AbstractVector implements Vector {\r\n- static final Logger LOG = Logger.getLogger(SparseVector.class);\r\n-\r\n- public SparseVector() {\r\n- this(new MapWritable());\r\n- }\r\n-\r\n- public SparseVector(MapWritable m) {\r\n- this.entries = m;\r\n- }\r\n-\r\n- public SparseVector(RowResult row) {\r\n- this.initMap(row);\r\n- }\r\n-\r\n- @Override\r\n- public Vector add(double alpha, Vector v) {\r\n- if (alpha == 0)\r\n- return this;\r\n-\r\n- for (Map.Entry<Writable, Writable> e : v.getEntries().entrySet()) {\r\n- if (this.entries.containsKey(e.getKey())) {\r\n- // add\r\n- double value = alpha * ((DoubleEntry) e.getValue()).getValue()\r\n- + this.get(((IntWritable) e.getKey()).get());\r\n- this.entries.put(e.getKey(), new DoubleEntry(value));\r\n- } else {\r\n- // put\r\n- double value = alpha * ((DoubleEntry) e.getValue()).getValue();\r\n- this.entries.put(e.getKey(), new DoubleEntry(value));\r\n- }\r\n- }\r\n-\r\n- return this;\r\n- }\r\n-\r\n- /**\r\n- * x = v + x\r\n- * \r\n- * @param v2\r\n- * @return x = v + x\r\n- */\r\n- public SparseVector add(Vector v2) {\r\n-\r\n- for (Map.Entry<Writable, Writable> e : v2.getEntries().entrySet()) {\r\n- int key = ((IntWritable) e.getKey()).get();\r\n- if (this.entries.containsKey(e.getKey())) {\r\n- this.add(key, ((DoubleEntry) e.getValue()).getValue());\r\n- } else {\r\n- this.set(key, ((DoubleEntry) e.getValue()).getValue());\r\n- }\r\n- }\r\n-\r\n- return this;\r\n- }\r\n-\r\n- @Override\r\n- public double dot(Vector v) {\r\n- // TODO Auto-generated method stub\r\n- return 0;\r\n- }\r\n-\r\n- @Override\r\n- public double norm(Norm type) {\r\n- // TODO Auto-generated method stub\r\n- return 0;\r\n- }\r\n-\r\n- /**\r\n- * v = alpha*v\r\n- * \r\n- * @param alpha\r\n- * @return v = alpha*v\r\n- */\r\n- public SparseVector scale(double alpha) {\r\n- for (Map.Entry<Writable, Writable> e : this.entries.entrySet()) {\r\n- this.entries.put(e.getKey(), new DoubleEntry(((DoubleEntry) e.getValue())\r\n- .getValue()\r\n- * alpha));\r\n- }\r\n- return this;\r\n- }\r\n-\r\n- /**\r\n- * Gets the value of index\r\n- * \r\n- * @param index\r\n- * @return the value of v(index)\r\n- * @throws IOException\r\n- */\r\n- public double get(int index) {\r\n- double value;\r\n- try {\r\n- value = ((DoubleEntry) this.entries.get(new IntWritable(index)))\r\n- .getValue();\r\n- } catch (NullPointerException e) { // returns zero if there is no value\r\n- return 0;\r\n- }\r\n-\r\n- return value;\r\n- }\r\n-\r\n- /**\r\n- * Sets the value of index\r\n- * \r\n- * @param index\r\n- * @param value\r\n- */\r\n- public void set(int index, double value) {\r\n- // If entries are null, create new object\r\n- if (this.entries == null) {\r\n- this.entries = new MapWritable();\r\n- }\r\n-\r\n- if (value != 0) // only stores non-zero element\r\n- this.entries.put(new IntWritable(index), new DoubleEntry(value));\r\n- }\r\n-\r\n- /**\r\n- * Adds the value to v(index)\r\n- * \r\n- * @param index\r\n- * @param value\r\n- */\r\n- public void add(int index, double value) {\r\n- set(index, get(index) + value);\r\n- }\r\n-\r\n- /**\r\n- * Sets the vector\r\n- * \r\n- * @param v\r\n- * @return x = v\r\n- */\r\n- public SparseVector set(Vector v) {\r\n- return new SparseVector(v.getEntries());\r\n- }\r\n-\r\n- @Override\r\n- public Vector subVector(int i0, int i1) {\r\n- // TODO Auto-generated method stub\r\n- return null;\r\n- }\r\n-\r\n- @Override\r\n- public Vector set(double alpha, Vector v) {\r\n- // TODO Auto-generated method stub\r\n- return null;\r\n- }\r\n-\r\n-}\r\n+/**\n+ * Copyright 2007 The Apache Software Foundation\n+ *\n+ * Licensed to the Apache Software Foundation (ASF) under one\n+ * or more contributor license agreements. See the NOTICE file\n+ * distributed with this work for additional information\n+ * regarding copyright ownership. The ASF licenses this file\n+ * to you under the Apache License, Version 2.0 (the\n+ * \"License\"); you may not use this file except in compliance\n+ * with the License. You may obtain a copy of the License at\n+ *\n+ * http://www.apache.org/licenses/LICENSE-2.0\n+ *\n+ * Unless required by applicable law or agreed to in writing, software\n+ * distributed under the License is distributed on an \"AS IS\" BASIS,\n+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ * See the License for the specific language governing permissions and\n+ * limitations under the License.\n+ */\n+package org.apache.hama.matrix;\n+\n+import java.io.IOException;\n+import java.util.Map;\n+\n+import org.apache.hadoop.hbase.io.RowResult;\n+import org.apache.hadoop.io.IntWritable;\n+import org.apache.hadoop.io.MapWritable;\n+import org.apache.hadoop.io.Writable;\n+import org.apache.hama.io.DoubleEntry;\n+import org.apache.log4j.Logger;\n+\n+/**\n+ * This class represents a sparse vector.\n+ */\n+public class SparseVector extends AbstractVector implements Vector {\n+ static final Logger LOG = Logger.getLogger(SparseVector.class);\n+\n+ public SparseVector() {\n+ this(new MapWritable());\n+ }\n+\n+ public SparseVector(MapWritable m) {\n+ this.entries = m;\n+ }\n+\n+ public SparseVector(RowResult row) {\n+ this.initMap(row);\n+ }\n+\n+ @Override\n+ public Vector add(double alpha, Vector v) {\n+ if (alpha == 0)\n+ return this;\n+\n+ for (Map.Entry<Writable, Writable> e : v.getEntries().entrySet()) {\n+ if (this.entries.containsKey(e.getKey())) {\n+ // add\n+ double value = alpha * ((DoubleEntry) e.getValue()).getValue()\n+ + this.get(((IntWritable) e.getKey()).get());\n+ this.entries.put(e.getKey(), new DoubleEntry(value));\n+ } else {\n+ // put\n+ double value = alpha * ((DoubleEntry) e.getValue()).getValue();\n+ this.entries.put(e.getKey(), new DoubleEntry(value));\n+ }\n+ }\n+\n+ return this;\n+ }\n+\n+ /**\n+ * x = v + x\n+ * \n+ * @param v2\n+ * @return x = v + x\n+ */\n+ public SparseVector add(Vector v2) {\n+\n+ for (Map.Entry<Writable, Writable> e : v2.getEntries().entrySet()) {\n+ int key = ((IntWritable) e.getKey()).get();\n+ if (this.entries.containsKey(e.getKey())) {\n+ this.add(key, ((DoubleEntry) e.getValue()).getValue());\n+ } else {\n+ this.set(key, ((DoubleEntry) e.getValue()).getValue());\n+ }\n+ }\n+\n+ return this;\n+ }\n+\n+ @Override\n+ public double dot(Vector v) {\n+ // TODO Auto-generated method stub\n+ return 0;\n+ }\n+\n+ @Override\n+ public double norm(Norm type) {\n+ // TODO Auto-generated method stub\n+ return 0;\n+ }\n+\n+ /**\n+ * v = alpha*v\n+ * \n+ * @param alpha\n+ * @return v = alpha*v\n+ */\n+ public SparseVector scale(double alpha) {\n+ for (Map.Entry<Writable, Writable> e : this.entries.entrySet()) {\n+ this.entries.put(e.getKey(), new DoubleEntry(((DoubleEntry) e.getValue())\n+ .getValue()\n+ * alpha));\n+ }\n+ return this;\n+ }\n+\n+ /**\n+ * Gets the value of index\n+ * \n+ * @param index\n+ * @return the value of v(index)\n+ * @throws IOException\n+ */\n+ public double get(int index) {\n+ double value;\n+ try {\n+ value = ((DoubleEntry) this.entries.get(new IntWritable(index)))\n+ .getValue();\n+ } catch (NullPointerException e) { // returns zero if there is no value\n+ return 0;\n+ }\n+\n+ return value;\n+ }\n+\n+ /**\n+ * Sets the value of index\n+ * \n+ * @param index\n+ * @param value\n+ */\n+ public void set(int index, double value) {\n+ // If entries are null, create new object\n+ if (this.entries == null) {\n+ this.entries = new MapWritable();\n+ }\n+\n+ if (value != 0) // only stores non-zero element\n+ this.entries.put(new IntWritable(index), new DoubleEntry(value));\n+ }\n+\n+ /**\n+ * Adds the value to v(index)\n+ * \n+ * @param index\n+ * @param value\n+ */\n+ public void add(int index, double value) {\n+ set(index, get(index) + value);\n+ }\n+\n+ /**\n+ * Sets the vector\n+ * \n+ * @param v\n+ * @return x = v\n+ */\n+ public SparseVector set(Vector v) {\n+ return new SparseVector(v.getEntries());\n+ }\n+\n+ @Override\n+ public Vector subVector(int i0, int i1) {\n+ // TODO Auto-generated method stub\n+ return null;\n+ }\n+\n+ @Override\n+ public Vector set(double alpha, Vector v) {\n+ // TODO Auto-generated method stub\n+ return null;\n+ }\n+\n+}", "raw_url": "https://github.com/apache/hama/raw/42584cd5328fc55a499d318dda6fefff6459242c/src%2Fjava%2Forg%2Fapache%2Fhama%2Fmatrix%2FSparseVector.java", "sha": "5480a4915ff8d739e87ae67063ba5a53e23a2112", "status": "modified" }, { "additions": 13, "blob_url": "https://github.com/apache/hama/blob/42584cd5328fc55a499d318dda6fefff6459242c/src%2Ftest%2Forg%2Fapache%2Fhama%2Fgraph%2FTestGraph.java", "changes": 32, "contents_url": "https://api.github.com/repos/apache/hama/contents/src%2Ftest%2Forg%2Fapache%2Fhama%2Fgraph%2FTestGraph.java?ref=42584cd5328fc55a499d318dda6fefff6459242c", "deletions": 19, "filename": "src/test/org/apache/hama/graph/TestGraph.java", "new_code": "import java.io.UnsupportedEncodingException;\nimport org.apache.hama.HamaCluster;\npublic class TestGraph extends HamaCluster {\n /**\n * @throws UnsupportedEncodingException\n */\n public TestGraph() throws UnsupportedEncodingException {\n super();\n }\n public void setUp() throws Exception {\n super.setUp();\n conf = getConf();\n adj = new SparseGraph(conf);", "new_methods": [], "old_code": "import junit.extensions.TestSetup;\nimport junit.framework.Test;\nimport junit.framework.TestCase;\nimport junit.framework.TestSuite;\n\nimport org.apache.hama.matrix.HCluster;\npublic class TestGraph extends TestCase {\n public static Test suite() {\n TestSetup setup = new TestSetup(new TestSuite(TestGraph.class)) {\n protected void setUp() throws Exception {\n HCluster hCluster = new HCluster();\n hCluster.setUp();\n conf = hCluster.getConf();\n adj = new SparseGraph(conf);\n }\n protected void tearDown() {\n }\n };\n return setup;", "old_methods": [ { "arguments": [], "filename": "src/test/org/apache/hama/graph/TestGraph.java", "implementation": "TestSetup setup = new TestSetup(new TestSuite(TestGraph.class)) {\n protected void setUp() throws Exception {\n HCluster hCluster = new HCluster();\n hCluster.setUp();\n conf = hCluster.getConf();\n adj = new SparseGraph(conf);", "signature": "Test suite()" }, { "arguments": [], "filename": "src/test/org/apache/hama/graph/TestGraph.java", "implementation": "", "signature": "void tearDown()" } ], "patch": "@@ -20,38 +20,32 @@\n package org.apache.hama.graph;\n \n import java.io.IOException;\n+import java.io.UnsupportedEncodingException;\n import java.util.HashMap;\n import java.util.Map;\n \n-import junit.extensions.TestSetup;\n-import junit.framework.Test;\n-import junit.framework.TestCase;\n-import junit.framework.TestSuite;\n-\n+import org.apache.hama.HamaCluster;\n import org.apache.hama.HamaConfiguration;\n-import org.apache.hama.matrix.HCluster;\n import org.apache.log4j.Logger;\n \n-public class TestGraph extends TestCase {\n+public class TestGraph extends HamaCluster {\n static final Logger LOG = Logger.getLogger(TestGraph.class);\n private static HamaConfiguration conf;\n private static Graph adj;\n private static int[] result = new int[] { 4, 3, 2, 0, 1 };\n \n- public static Test suite() {\n- TestSetup setup = new TestSetup(new TestSuite(TestGraph.class)) {\n- protected void setUp() throws Exception {\n- HCluster hCluster = new HCluster();\n- hCluster.setUp();\n \n- conf = hCluster.getConf();\n- adj = new SparseGraph(conf);\n- }\n+ /**\n+ * @throws UnsupportedEncodingException\n+ */\n+ public TestGraph() throws UnsupportedEncodingException {\n+ super();\n+ }\n \n- protected void tearDown() {\n- }\n- };\n- return setup;\n+ public void setUp() throws Exception {\n+ super.setUp();\n+ conf = getConf();\n+ adj = new SparseGraph(conf);\n }\n \n public void testAddEdge() throws IOException {", "raw_url": "https://github.com/apache/hama/raw/42584cd5328fc55a499d318dda6fefff6459242c/src%2Ftest%2Forg%2Fapache%2Fhama%2Fgraph%2FTestGraph.java", "sha": "3a22f64e33cbab0acadaf146bbb70b07f1698271", "status": "modified" }, { "additions": 60, "blob_url": "https://github.com/apache/hama/blob/42584cd5328fc55a499d318dda6fefff6459242c/src%2Ftest%2Forg%2Fapache%2Fhama%2Fmapred%2FTestBlockMatrixMapReduce.java", "changes": 120, "contents_url": "https://api.github.com/repos/apache/hama/contents/src%2Ftest%2Forg%2Fapache%2Fhama%2Fmapred%2FTestBlockMatrixMapReduce.java?ref=42584cd5328fc55a499d318dda6fefff6459242c", "deletions": 60, "filename": "src/test/org/apache/hama/mapred/TestBlockMatrixMapReduce.java", "new_code": "/**\n * Copyright 2007 The Apache Software Foundation\n *\n * Licensed to the Apache Software Foundation (ASF) under one\n * or more contributor license agreements. See the NOTICE file\n * distributed with this work for additional information\n * regarding copyright ownership. The ASF licenses this file\n * to you under the Apache License, Version 2.0 (the\n * \"License\"); you may not use this file except in compliance\n * with the License. You may obtain a copy of the License at\n *\n * http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\npackage org.apache.hama.mapred;\n\nimport java.io.IOException;\n\nimport org.apache.hama.HamaCluster;\nimport org.apache.hama.matrix.DenseMatrix;\nimport org.apache.log4j.Logger;\n\npublic class TestBlockMatrixMapReduce extends HamaCluster {\n static final Logger LOG = Logger.getLogger(TestBlockMatrixMapReduce.class);\n static final int SIZE = 32;\n\n /** constructor */\n public TestBlockMatrixMapReduce() {\n super();\n }\n\n public void testBlockMatrixMapReduce() throws IOException,\n ClassNotFoundException {\n DenseMatrix m1 = DenseMatrix.random(conf, SIZE, SIZE);\n DenseMatrix m2 = DenseMatrix.random(conf, SIZE, SIZE);\n\n DenseMatrix c = (DenseMatrix) m1.mult(m2, 16);\n\n double[][] mem = new double[SIZE][SIZE];\n for (int i = 0; i < SIZE; i++) {\n for (int j = 0; j < SIZE; j++) {\n for (int k = 0; k < SIZE; k++) {\n mem[i][k] += m1.get(i, j) * m2.get(j, k);\n }\n }\n }\n\n for (int i = 0; i < SIZE; i++) {\n for (int j = 0; j < SIZE; j++) {\n double gap = (mem[i][j] - c.get(i, j));\n assertTrue(gap < 0.000001 || gap < -0.000001);\n }\n }\n }\n}", "new_methods": [ { "arguments": [], "filename": "src/test/org/apache/hama/mapred/TestBlockMatrixMapReduce.java", "implementation": "super();", "signature": "public TestBlockMatrixMapReduce()" } ], "old_code": "/**\r\n * Copyright 2007 The Apache Software Foundation\r\n *\r\n * Licensed to the Apache Software Foundation (ASF) under one\r\n * or more contributor license agreements. See the NOTICE file\r\n * distributed with this work for additional information\r\n * regarding copyright ownership. The ASF licenses this file\r\n * to you under the Apache License, Version 2.0 (the\r\n * \"License\"); you may not use this file except in compliance\r\n * with the License. You may obtain a copy of the License at\r\n *\r\n * http://www.apache.org/licenses/LICENSE-2.0\r\n *\r\n * Unless required by applicable law or agreed to in writing, software\r\n * distributed under the License is distributed on an \"AS IS\" BASIS,\r\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r\n * See the License for the specific language governing permissions and\r\n * limitations under the License.\r\n */\r\npackage org.apache.hama.mapred;\r\n\r\nimport java.io.IOException;\r\n\r\nimport org.apache.hama.matrix.DenseMatrix;\r\nimport org.apache.hama.matrix.HCluster;\r\nimport org.apache.log4j.Logger;\r\n\r\npublic class TestBlockMatrixMapReduce extends HCluster {\r\n static final Logger LOG = Logger.getLogger(TestBlockMatrixMapReduce.class);\r\n static final int SIZE = 32;\r\n\r\n /** constructor */\r\n public TestBlockMatrixMapReduce() {\r\n super();\r\n }\r\n\r\n public void testBlockMatrixMapReduce() throws IOException,\r\n ClassNotFoundException {\r\n DenseMatrix m1 = DenseMatrix.random(conf, SIZE, SIZE);\r\n DenseMatrix m2 = DenseMatrix.random(conf, SIZE, SIZE);\r\n\r\n DenseMatrix c = (DenseMatrix) m1.mult(m2, 16);\r\n\r\n double[][] mem = new double[SIZE][SIZE];\r\n for (int i = 0; i < SIZE; i++) {\r\n for (int j = 0; j < SIZE; j++) {\r\n for (int k = 0; k < SIZE; k++) {\r\n mem[i][k] += m1.get(i, j) * m2.get(j, k);\r\n }\r\n }\r\n }\r\n\r\n for (int i = 0; i < SIZE; i++) {\r\n for (int j = 0; j < SIZE; j++) {\r\n double gap = (mem[i][j] - c.get(i, j));\r\n assertTrue(gap < 0.000001 || gap < -0.000001);\r\n }\r\n }\r\n }\r\n}\r", "old_methods": [ { "arguments": [], "filename": "src/test/org/apache/hama/mapred/TestBlockMatrixMapReduce.java", "implementation": "super();", "signature": "public TestBlockMatrixMapReduce()" } ], "patch": "@@ -1,60 +1,60 @@\n-/**\r\n- * Copyright 2007 The Apache Software Foundation\r\n- *\r\n- * Licensed to the Apache Software Foundation (ASF) under one\r\n- * or more contributor license agreements. See the NOTICE file\r\n- * distributed with this work for additional information\r\n- * regarding copyright ownership. The ASF licenses this file\r\n- * to you under the Apache License, Version 2.0 (the\r\n- * \"License\"); you may not use this file except in compliance\r\n- * with the License. You may obtain a copy of the License at\r\n- *\r\n- * http://www.apache.org/licenses/LICENSE-2.0\r\n- *\r\n- * Unless required by applicable law or agreed to in writing, software\r\n- * distributed under the License is distributed on an \"AS IS\" BASIS,\r\n- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r\n- * See the License for the specific language governing permissions and\r\n- * limitations under the License.\r\n- */\r\n-package org.apache.hama.mapred;\r\n-\r\n-import java.io.IOException;\r\n-\r\n-import org.apache.hama.matrix.DenseMatrix;\r\n-import org.apache.hama.matrix.HCluster;\r\n-import org.apache.log4j.Logger;\r\n-\r\n-public class TestBlockMatrixMapReduce extends HCluster {\r\n- static final Logger LOG = Logger.getLogger(TestBlockMatrixMapReduce.class);\r\n- static final int SIZE = 32;\r\n-\r\n- /** constructor */\r\n- public TestBlockMatrixMapReduce() {\r\n- super();\r\n- }\r\n-\r\n- public void testBlockMatrixMapReduce() throws IOException,\r\n- ClassNotFoundException {\r\n- DenseMatrix m1 = DenseMatrix.random(conf, SIZE, SIZE);\r\n- DenseMatrix m2 = DenseMatrix.random(conf, SIZE, SIZE);\r\n-\r\n- DenseMatrix c = (DenseMatrix) m1.mult(m2, 16);\r\n-\r\n- double[][] mem = new double[SIZE][SIZE];\r\n- for (int i = 0; i < SIZE; i++) {\r\n- for (int j = 0; j < SIZE; j++) {\r\n- for (int k = 0; k < SIZE; k++) {\r\n- mem[i][k] += m1.get(i, j) * m2.get(j, k);\r\n- }\r\n- }\r\n- }\r\n-\r\n- for (int i = 0; i < SIZE; i++) {\r\n- for (int j = 0; j < SIZE; j++) {\r\n- double gap = (mem[i][j] - c.get(i, j));\r\n- assertTrue(gap < 0.000001 || gap < -0.000001);\r\n- }\r\n- }\r\n- }\r\n-}\r\n+/**\n+ * Copyright 2007 The Apache Software Foundation\n+ *\n+ * Licensed to the Apache Software Foundation (ASF) under one\n+ * or more contributor license agreements. See the NOTICE file\n+ * distributed with this work for additional information\n+ * regarding copyright ownership. The ASF licenses this file\n+ * to you under the Apache License, Version 2.0 (the\n+ * \"License\"); you may not use this file except in compliance\n+ * with the License. You may obtain a copy of the License at\n+ *\n+ * http://www.apache.org/licenses/LICENSE-2.0\n+ *\n+ * Unless required by applicable law or agreed to in writing, software\n+ * distributed under the License is distributed on an \"AS IS\" BASIS,\n+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ * See the License for the specific language governing permissions and\n+ * limitations under the License.\n+ */\n+package org.apache.hama.mapred;\n+\n+import java.io.IOException;\n+\n+import org.apache.hama.HamaCluster;\n+import org.apache.hama.matrix.DenseMatrix;\n+import org.apache.log4j.Logger;\n+\n+public class TestBlockMatrixMapReduce extends HamaCluster {\n+ static final Logger LOG = Logger.getLogger(TestBlockMatrixMapReduce.class);\n+ static final int SIZE = 32;\n+\n+ /** constructor */\n+ public TestBlockMatrixMapReduce() {\n+ super();\n+ }\n+\n+ public void testBlockMatrixMapReduce() throws IOException,\n+ ClassNotFoundException {\n+ DenseMatrix m1 = DenseMatrix.random(conf, SIZE, SIZE);\n+ DenseMatrix m2 = DenseMatrix.random(conf, SIZE, SIZE);\n+\n+ DenseMatrix c = (DenseMatrix) m1.mult(m2, 16);\n+\n+ double[][] mem = new double[SIZE][SIZE];\n+ for (int i = 0; i < SIZE; i++) {\n+ for (int j = 0; j < SIZE; j++) {\n+ for (int k = 0; k < SIZE; k++) {\n+ mem[i][k] += m1.get(i, j) * m2.get(j, k);\n+ }\n+ }\n+ }\n+\n+ for (int i = 0; i < SIZE; i++) {\n+ for (int j = 0; j < SIZE; j++) {\n+ double gap = (mem[i][j] - c.get(i, j));\n+ assertTrue(gap < 0.000001 || gap < -0.000001);\n+ }\n+ }\n+ }\n+}", "raw_url": "https://github.com/apache/hama/raw/42584cd5328fc55a499d318dda6fefff6459242c/src%2Ftest%2Forg%2Fapache%2Fhama%2Fmapred%2FTestBlockMatrixMapReduce.java", "sha": "96419f3cee20b7fd3167f286812a23d740564721", "status": "modified" }, { "additions": 2, "blob_url": "https://github.com/apache/hama/blob/42584cd5328fc55a499d318dda6fefff6459242c/src%2Ftest%2Forg%2Fapache%2Fhama%2Fmapred%2FTestRandomMatrixMapReduce.java", "changes": 4, "contents_url": "https://api.github.com/repos/apache/hama/contents/src%2Ftest%2Forg%2Fapache%2Fhama%2Fmapred%2FTestRandomMatrixMapReduce.java?ref=42584cd5328fc55a499d318dda6fefff6459242c", "deletions": 2, "filename": "src/test/org/apache/hama/mapred/TestRandomMatrixMapReduce.java", "new_code": "import org.apache.hama.HamaCluster;\npublic class TestRandomMatrixMapReduce extends HamaCluster {", "new_methods": [], "old_code": "import org.apache.hama.matrix.HCluster;\npublic class TestRandomMatrixMapReduce extends HCluster {", "old_methods": [], "patch": "@@ -21,12 +21,12 @@\n \n import java.io.IOException;\n \n+import org.apache.hama.HamaCluster;\n import org.apache.hama.matrix.DenseMatrix;\n-import org.apache.hama.matrix.HCluster;\n import org.apache.hama.matrix.SparseMatrix;\n import org.apache.log4j.Logger;\n \n-public class TestRandomMatrixMapReduce extends HCluster {\n+public class TestRandomMatrixMapReduce extends HamaCluster {\n static final Logger LOG = Logger.getLogger(TestRandomMatrixMapReduce.class);\n \n public void testRandomMatrixMapReduce() throws IOException {", "raw_url": "https://github.com/apache/hama/raw/42584cd5328fc55a499d318dda6fefff6459242c/src%2Ftest%2Forg%2Fapache%2Fhama%2Fmapred%2FTestRandomMatrixMapReduce.java", "sha": "7c2979b382bb14adec6e4f892915ef7d9b8e0899", "status": "modified" }, { "additions": 74, "blob_url": "https://github.com/apache/hama/blob/42584cd5328fc55a499d318dda6fefff6459242c/src%2Ftest%2Forg%2Fapache%2Fhama%2Fmatrix%2FMatrixTestCommon.java", "changes": 148, "contents_url": "https://api.github.com/repos/apache/hama/contents/src%2Ftest%2Forg%2Fapache%2Fhama%2Fmatrix%2FMatrixTestCommon.java?ref=42584cd5328fc55a499d318dda6fefff6459242c", "deletions": 74, "filename": "src/test/org/apache/hama/matrix/MatrixTestCommon.java", "new_code": "/**\n * Licensed to the Apache Software Foundation (ASF) under one or more\n * contributor license agreements. See the NOTICE file distributed with this\n * work for additional information regarding copyright ownership. The ASF\n * licenses this file to you under the Apache License, Version 2.0 (the\n * \"License\"); you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n * \n * http://www.apache.org/licenses/LICENSE-2.0\n * \n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS, WITHOUT\n * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the\n * License for the specific language governing permissions and limitations under\n * the License.\n */\npackage org.apache.hama.matrix;\n\nimport java.io.IOException;\n\nclass MatrixTestCommon {\n\n static double verifyNorm1(Matrix m1) throws IOException {\n double[] colSum = new double[m1.getColumns()];\n for (int j = 0; j < m1.getColumns(); j++) {\n for (int i = 0; i < m1.getRows(); i++) {\n colSum[j] += Math.abs(m1.get(i, j));\n }\n }\n\n double max = 0;\n for (int i = 0; i < colSum.length; i++) {\n max = Math.max(colSum[i], max);\n }\n return max;\n }\n\n static double verifyNormInfinity(Matrix m1) throws IOException {\n double[] rowSum = new double[m1.getRows()];\n for (int i = 0; i < m1.getRows(); i++) {\n for (int j = 0; j < m1.getColumns(); j++) {\n rowSum[i] += Math.abs(m1.get(i, j));\n }\n }\n\n double max = 0;\n for (int i = 0; i < rowSum.length; ++i)\n max = Math.max(rowSum[i], max);\n return max;\n }\n\n static double verifyNormMaxValue(Matrix m1) throws IOException {\n double max = 0;\n for (int i = 0; i < m1.getRows(); i++) {\n for (int j = 0; j < m1.getColumns(); j++) {\n max = Math.max(Math.abs(m1.get(i, j)), max);\n }\n }\n\n return max;\n }\n\n static double verifyNormFrobenius(Matrix m1) throws IOException {\n double sqrtSum = 0;\n for (int i = 0; i < m1.getRows(); i++) {\n for (int j = 0; j < m1.getColumns(); j++) {\n double cellValue = m1.get(i, j);\n sqrtSum += (cellValue * cellValue);\n }\n }\n return Math.sqrt(sqrtSum);\n }\n\n}", "new_methods": [], "old_code": "/**\r\n * Licensed to the Apache Software Foundation (ASF) under one or more\r\n * contributor license agreements. See the NOTICE file distributed with this\r\n * work for additional information regarding copyright ownership. The ASF\r\n * licenses this file to you under the Apache License, Version 2.0 (the\r\n * \"License\"); you may not use this file except in compliance with the License.\r\n * You may obtain a copy of the License at\r\n * \r\n * http://www.apache.org/licenses/LICENSE-2.0\r\n * \r\n * Unless required by applicable law or agreed to in writing, software\r\n * distributed under the License is distributed on an \"AS IS\" BASIS, WITHOUT\r\n * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the\r\n * License for the specific language governing permissions and limitations under\r\n * the License.\r\n */\r\npackage org.apache.hama.matrix;\r\n\r\nimport java.io.IOException;\r\n\r\nclass MatrixTestCommon {\r\n\r\n static double verifyNorm1(Matrix m1) throws IOException {\r\n double[] colSum = new double[m1.getColumns()];\r\n for (int j = 0; j < m1.getColumns(); j++) {\r\n for (int i = 0; i < m1.getRows(); i++) {\r\n colSum[j] += Math.abs(m1.get(i, j));\r\n }\r\n }\r\n \r\n double max = 0;\r\n for (int i=0; i < colSum.length; i++) {\r\n max = Math.max(colSum[i], max);\r\n }\r\n return max;\r\n }\r\n \r\n static double verifyNormInfinity(Matrix m1) throws IOException {\r\n double[] rowSum = new double[m1.getRows()];\r\n for (int i = 0; i < m1.getRows(); i++) {\r\n for (int j = 0; j < m1.getColumns(); j++) {\r\n rowSum[i] += Math.abs(m1.get(i, j));\r\n }\r\n }\r\n\r\n double max = 0;\r\n for (int i = 0; i < rowSum.length; ++i)\r\n max = Math.max(rowSum[i], max);\r\n return max;\r\n }\r\n \r\n static double verifyNormMaxValue(Matrix m1) throws IOException {\r\n double max = 0;\r\n for (int i = 0; i < m1.getRows(); i++) {\r\n for (int j = 0; j < m1.getColumns(); j++) {\r\n max = Math.max(Math.abs(m1.get(i, j)), max);\r\n }\r\n }\r\n \r\n return max;\r\n }\r\n \r\n static double verifyNormFrobenius(Matrix m1) throws IOException {\r\n double sqrtSum = 0;\r\n for (int i = 0; i < m1.getRows(); i++) {\r\n for (int j = 0; j < m1.getColumns(); j++) {\r\n double cellValue = m1.get(i, j);\r\n sqrtSum += ( cellValue * cellValue );\r\n }\r\n } \r\n return Math.sqrt(sqrtSum);\r\n }\r\n \r\n}\r", "old_methods": [], "patch": "@@ -1,74 +1,74 @@\n-/**\r\n- * Licensed to the Apache Software Foundation (ASF) under one or more\r\n- * contributor license agreements. See the NOTICE file distributed with this\r\n- * work for additional information regarding copyright ownership. The ASF\r\n- * licenses this file to you under the Apache License, Version 2.0 (the\r\n- * \"License\"); you may not use this file except in compliance with the License.\r\n- * You may obtain a copy of the License at\r\n- * \r\n- * http://www.apache.org/licenses/LICENSE-2.0\r\n- * \r\n- * Unless required by applicable law or agreed to in writing, software\r\n- * distributed under the License is distributed on an \"AS IS\" BASIS, WITHOUT\r\n- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the\r\n- * License for the specific language governing permissions and limitations under\r\n- * the License.\r\n- */\r\n-package org.apache.hama.matrix;\r\n-\r\n-import java.io.IOException;\r\n-\r\n-class MatrixTestCommon {\r\n-\r\n- static double verifyNorm1(Matrix m1) throws IOException {\r\n- double[] colSum = new double[m1.getColumns()];\r\n- for (int j = 0; j < m1.getColumns(); j++) {\r\n- for (int i = 0; i < m1.getRows(); i++) {\r\n- colSum[j] += Math.abs(m1.get(i, j));\r\n- }\r\n- }\r\n- \r\n- double max = 0;\r\n- for (int i=0; i < colSum.length; i++) {\r\n- max = Math.max(colSum[i], max);\r\n- }\r\n- return max;\r\n- }\r\n- \r\n- static double verifyNormInfinity(Matrix m1) throws IOException {\r\n- double[] rowSum = new double[m1.getRows()];\r\n- for (int i = 0; i < m1.getRows(); i++) {\r\n- for (int j = 0; j < m1.getColumns(); j++) {\r\n- rowSum[i] += Math.abs(m1.get(i, j));\r\n- }\r\n- }\r\n-\r\n- double max = 0;\r\n- for (int i = 0; i < rowSum.length; ++i)\r\n- max = Math.max(rowSum[i], max);\r\n- return max;\r\n- }\r\n- \r\n- static double verifyNormMaxValue(Matrix m1) throws IOException {\r\n- double max = 0;\r\n- for (int i = 0; i < m1.getRows(); i++) {\r\n- for (int j = 0; j < m1.getColumns(); j++) {\r\n- max = Math.max(Math.abs(m1.get(i, j)), max);\r\n- }\r\n- }\r\n- \r\n- return max;\r\n- }\r\n- \r\n- static double verifyNormFrobenius(Matrix m1) throws IOException {\r\n- double sqrtSum = 0;\r\n- for (int i = 0; i < m1.getRows(); i++) {\r\n- for (int j = 0; j < m1.getColumns(); j++) {\r\n- double cellValue = m1.get(i, j);\r\n- sqrtSum += ( cellValue * cellValue );\r\n- }\r\n- } \r\n- return Math.sqrt(sqrtSum);\r\n- }\r\n- \r\n-}\r\n+/**\n+ * Licensed to the Apache Software Foundation (ASF) under one or more\n+ * contributor license agreements. See the NOTICE file distributed with this\n+ * work for additional information regarding copyright ownership. The ASF\n+ * licenses this file to you under the Apache License, Version 2.0 (the\n+ * \"License\"); you may not use this file except in compliance with the License.\n+ * You may obtain a copy of the License at\n+ * \n+ * http://www.apache.org/licenses/LICENSE-2.0\n+ * \n+ * Unless required by applicable law or agreed to in writing, software\n+ * distributed under the License is distributed on an \"AS IS\" BASIS, WITHOUT\n+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the\n+ * License for the specific language governing permissions and limitations under\n+ * the License.\n+ */\n+package org.apache.hama.matrix;\n+\n+import java.io.IOException;\n+\n+class MatrixTestCommon {\n+\n+ static double verifyNorm1(Matrix m1) throws IOException {\n+ double[] colSum = new double[m1.getColumns()];\n+ for (int j = 0; j < m1.getColumns(); j++) {\n+ for (int i = 0; i < m1.getRows(); i++) {\n+ colSum[j] += Math.abs(m1.get(i, j));\n+ }\n+ }\n+\n+ double max = 0;\n+ for (int i = 0; i < colSum.length; i++) {\n+ max = Math.max(colSum[i], max);\n+ }\n+ return max;\n+ }\n+\n+ static double verifyNormInfinity(Matrix m1) throws IOException {\n+ double[] rowSum = new double[m1.getRows()];\n+ for (int i = 0; i < m1.getRows(); i++) {\n+ for (int j = 0; j < m1.getColumns(); j++) {\n+ rowSum[i] += Math.abs(m1.get(i, j));\n+ }\n+ }\n+\n+ double max = 0;\n+ for (int i = 0; i < rowSum.length; ++i)\n+ max = Math.max(rowSum[i], max);\n+ return max;\n+ }\n+\n+ static double verifyNormMaxValue(Matrix m1) throws IOException {\n+ double max = 0;\n+ for (int i = 0; i < m1.getRows(); i++) {\n+ for (int j = 0; j < m1.getColumns(); j++) {\n+ max = Math.max(Math.abs(m1.get(i, j)), max);\n+ }\n+ }\n+\n+ return max;\n+ }\n+\n+ static double verifyNormFrobenius(Matrix m1) throws IOException {\n+ double sqrtSum = 0;\n+ for (int i = 0; i < m1.getRows(); i++) {\n+ for (int j = 0; j < m1.getColumns(); j++) {\n+ double cellValue = m1.get(i, j);\n+ sqrtSum += (cellValue * cellValue);\n+ }\n+ }\n+ return Math.sqrt(sqrtSum);\n+ }\n+\n+}", "raw_url": "https://github.com/apache/hama/raw/42584cd5328fc55a499d318dda6fefff6459242c/src%2Ftest%2Forg%2Fapache%2Fhama%2Fmatrix%2FMatrixTestCommon.java", "sha": "7c00eb66ef35f28a763649fb25b0b91e8ce6a138", "status": "modified" }, { "additions": 90, "blob_url": "https://github.com/apache/hama/blob/42584cd5328fc55a499d318dda6fefff6459242c/src%2Ftest%2Forg%2Fapache%2Fhama%2Fmatrix%2FTestDenseMatrix.java", "changes": 497, "contents_url": "https://api.github.com/repos/apache/hama/contents/src%2Ftest%2Forg%2Fapache%2Fhama%2Fmatrix%2FTestDenseMatrix.java?ref=42584cd5328fc55a499d318dda6fefff6459242c", "deletions": 407, "filename": "src/test/org/apache/hama/matrix/TestDenseMatrix.java", "new_code": "import java.io.UnsupportedEncodingException;\nimport org.apache.hama.HamaCluster;\npublic class TestDenseMatrix extends HamaCluster {\n private int SIZE = 10;\n private Matrix m1;\n private Matrix m2;\n private HamaConfiguration conf;\n * @throws UnsupportedEncodingException\n public TestDenseMatrix() throws UnsupportedEncodingException {\n super();\n public void setUp() throws Exception {\n super.setUp();\n conf = getConf();\n m1 = DenseMatrix.random(conf, SIZE, SIZE);\n m2 = DenseMatrix.random(conf, SIZE, SIZE);\n }\n public void testAddMult() throws IOException {\n Matrix m3 = DenseMatrix.random(conf, SIZE, SIZE);\n Matrix m4 = DenseMatrix.random(conf, SIZE - 2, SIZE - 2);\n try {\n m1.add(m4);\n fail(\"Matrix-Addition should be failed while rows and columns aren't same.\");\n } catch (IOException e) {\n LOG.info(e.toString());\n try {\n m1.mult(m4);\n fail(\"Matrix-Mult should be failed while A.columns!=B.rows.\");\n } catch (IOException e) {\n LOG.info(e.toString());\n \n double origin = m1.get(1, 1);\n m1.add(1, 1, 0.5);\n assertEquals(m1.get(1, 1), origin + 0.5);\n \n matrixAdd(m1, m2);\n multMatrixAdd(m1, m2, m3);\n matrixMult(m1, m2);\n addAlphaMatrix(m1, m2);\n \n getRowColumn();\n setRowColumn();\n setMatrix(m1);\n setAlphaMatrix(m1);\n public void matrixAdd(Matrix m1, Matrix m2) throws IOException {\n public void multMatrixAdd(Matrix m1, Matrix m2, Matrix m3) throws IOException {\n Matrix result = ((DenseMatrix) m1).add(m2, m3);\n\n\n assertEquals(result.get(i, j), m1.get(i, j) + m2.get(i, j)\n + m3.get(i, j));\n public void matrixMult(Matrix m1, Matrix m2) throws IOException {\n public void addAlphaMatrix(Matrix m1, Matrix m2) throws IOException {\n double value = m1.get(0, 0) + (m2.get(0, 0) * 0.1);\n Matrix result = m1.add(0.1, m2);\n assertEquals(value, result.get(0, 0));\n }\n \n public void setMatrix(Matrix m1) throws IOException {\n public void setAlphaMatrix(Matrix m1) throws IOException {\n\n\n public void getRowColumn() throws IOException {\n boolean ex = false;\n try {\n m1.get(SIZE + 1, SIZE + 1);\n } catch (ArrayIndexOutOfBoundsException e) {\n ex = true;\n }\n assertTrue(ex);\n assertTrue(m1.get(0, 0) > 0);\n Vector v = m1.getColumn(0);\n Iterator<Writable> it = v.iterator();\n int x = 0;\n while (it.hasNext()) {\n assertEquals(m1.get(x, 0), ((DoubleEntry) it.next()).getValue());\n x++;\n }\n m1.setRowLabel(0, \"row1\");\n assertEquals(m1.getRowLabel(0), \"row1\");\n assertEquals(m1.getRowLabel(1), null);\n\n m1.setColumnLabel(0, \"column1\");\n assertEquals(m1.getColumnLabel(0), \"column1\");\n assertEquals(m1.getColumnLabel(1), null);\n public void setRowColumn() throws IOException {\n Iterator<Writable> it2 = m1.getColumn(SIZE).iterator();\n int x = 0;\n while (it2.hasNext()) {\n assertEquals(entries[x], ((DoubleEntry) it2.next()).getValue());\n x++;", "new_methods": [], "old_code": "import junit.extensions.TestSetup;\nimport junit.framework.Test;\nimport junit.framework.TestCase;\nimport junit.framework.TestSuite;\n\nimport org.apache.hadoop.hbase.client.HBaseAdmin;\nimport org.apache.hama.HamaAdmin;\nimport org.apache.hama.HamaAdminImpl;\nimport org.apache.hama.matrix.Matrix.Norm;\npublic class TestDenseMatrix extends TestCase {\n private static int SIZE = 10;\n private static Matrix m1;\n private static Matrix m2;\n private static Matrix m3;\n private static Matrix m4, m5;\n private final static String aliase1 = \"matrix_aliase_A\";\n private final static String aliase2 = \"matrix_aliase_B\";\n private static HamaConfiguration conf;\n private static HBaseAdmin admin;\n private static HamaAdmin hamaAdmin;\n\n public static Test suite() {\n TestSetup setup = new TestSetup(new TestSuite(TestDenseMatrix.class)) {\n protected void setUp() throws Exception {\n HCluster hCluster = new HCluster();\n hCluster.setUp();\n\n conf = hCluster.getConf();\n admin = new HBaseAdmin(conf);\n hamaAdmin = new HamaAdminImpl(conf, admin);\n\n m1 = DenseMatrix.random(hCluster.getConf(), SIZE, SIZE);\n m2 = DenseMatrix.random(hCluster.getConf(), SIZE, SIZE);\n m3 = DenseMatrix.random(hCluster.getConf(), SIZE, SIZE);\n m4 = DenseMatrix.random(hCluster.getConf(), SIZE-2, SIZE-2);\n m5 = DenseMatrix.random(hCluster.getConf(), SIZE, SIZE);\n }\n\n protected void tearDown() {\n try {\n closeTest();\n } catch (IOException e) {\n e.printStackTrace();\n }\n }\n };\n return setup;\n }\n\n public static void closeTest() throws IOException {\n m1.close();\n m2.close();\n }\n\n public void testEntryAdd() throws IOException {\n double origin = m1.get(1, 1);\n m1.add(1, 1, 0.5);\n\n assertEquals(m1.get(1, 1), origin + 0.5);\n }\n\n public void testGet() throws IOException {\n boolean ex = false;\n try {\n m1.get(SIZE + 1, SIZE + 1);\n } catch (ArrayIndexOutOfBoundsException e) {\n ex = true;\n }\n assertTrue(ex);\n assertTrue(m1.get(0, 0) > 0);\n }\n \n public void testTranspose() throws IOException {\n DenseMatrix trans = (DenseMatrix) m1.transpose();\n for(int i = 0; i < trans.getRows(); i++) {\n for(int j = 0; j < trans.getColumns(); j++) {\n assertEquals(trans.get(i, j), m1.get(j, i));\n }\n }\n }\n * Column vector test.\n * \n * @param rand\n * @throws IOException\n public void testGetColumn() throws IOException {\n Vector v = m1.getColumn(0);\n Iterator<Writable> it = v.iterator();\n int x = 0;\n while (it.hasNext()) {\n assertEquals(m1.get(x, 0), ((DoubleEntry) it.next()).getValue());\n x++;\n }\n public void testGetSetAttribute() throws IOException {\n m1.setRowLabel(0, \"row1\");\n assertEquals(m1.getRowLabel(0), \"row1\");\n assertEquals(m1.getRowLabel(1), null);\n\n m1.setColumnLabel(0, \"column1\");\n assertEquals(m1.getColumnLabel(0), \"column1\");\n assertEquals(m1.getColumnLabel(1), null);\n }\n public void testSubMatrix() throws IOException {\n SubMatrix a = m1.subMatrix(2, 4, 2, 5); // A : 3 * 4\n for (int i = 0; i < a.getRows(); i++) {\n for (int j = 0; j < a.getColumns(); j++) {\n assertEquals(a.get(i, j), m1.get(i + 2, j + 2));\n }\n }\n SubMatrix b = m2.subMatrix(0, 3, 0, 2); // B : 4 * 3\n SubMatrix c = a.mult(b);\n double[][] C = new double[3][3]; // A * B\n for (int i = 0; i < 3; i++) {\n for (int j = 0; j < 3; j++) {\n for (int k = 0; k < 4; k++) {\n C[i][j] += m1.get(i + 2, k + 2) * m2.get(k, j);\n }\n }\n for (int i = 0; i < 3; i++) {\n for (int j = 0; j < 3; j++) {\n assertEquals(C[i][j], c.get(i, j));\n }\n public void testMatrixAdd() throws IOException {\n public void testMultiMatrixAdd() throws IOException {\n Matrix result = ((DenseMatrix)m1).add(m2, m3);\n \n \n assertEquals(result.get(i, j), m1.get(i, j) + m2.get(i, j) + m3.get(i, j));\n public void testMatrixMult() throws IOException {\n public void testSetMatrix() throws IOException {\n public void testSetAlphaMatrix() throws IOException {\n \n \n public void testAddAlphaMatrix() throws IOException {\n double value = m1.get(0, 0) + (m2.get(0, 0) * 0.1);\n Matrix result = m1.add(0.1, m2);\n assertEquals(value, result.get(0, 0));\n }\n \n public void testNorm() throws IOException {\n double gap = 0.000001;\n \n double norm1 = m1.norm(Norm.One);\n double verify_norm1 = MatrixTestCommon.verifyNorm1(m1);\n gap = norm1 - verify_norm1;\n LOG.info(\"Norm One : gap \" + gap);\n assertTrue(gap < 0.000001 && gap > -0.000001);\n \n double normInfinity = m1.norm(Norm.Infinity);\n double verify_normInf = MatrixTestCommon.verifyNormInfinity(m1);\n gap = normInfinity - verify_normInf;\n LOG.info(\"Norm Infinity : gap \" + gap);\n assertTrue(gap < 0.000001 && gap > -0.000001);\n double normMaxValue = m1.norm(Norm.Maxvalue);\n double verify_normMV = MatrixTestCommon.verifyNormMaxValue(m1);\n gap = normMaxValue - verify_normMV;\n LOG.info(\"Norm MaxValue : gap \" + gap);\n assertTrue(gap < 0.000001 && gap > -0.000001);\n double normFrobenius = m1.norm(Norm.Frobenius);\n double verify_normFrobenius = MatrixTestCommon.verifyNormFrobenius(m1);\n gap = normFrobenius - verify_normFrobenius;\n LOG.info(\"Norm Frobenius : \" + normFrobenius + \"(map/reduce) - \" + verify_normFrobenius + \" expected\");\n LOG.info(\"Norm Frobenius : gap \" + gap);\n assertTrue(gap < 0.000001 && gap > -0.000001);\n public void testSetRow() throws IOException {\n }\n\n public void testSetColumn() throws IOException {\n Vector v = new DenseVector();\n double[] entries = new double[] { 1, 2, 3, 4, 5, 6, 7, 8, 9, 0 };\n\n for (int i = 0; i < SIZE; i++) {\n v.set(i, entries[i]);\n }\n Iterator<Writable> it = m1.getColumn(SIZE).iterator();\n\n int i = 0;\n while (it.hasNext()) {\n assertEquals(entries[i], ((DoubleEntry) it.next()).getValue());\n i++;\n }\n }\n\n public void testJacobiEigenValue() throws IOException {\n // copy Matrix m5 to the array\n double[][] S = new double[SIZE][SIZE];\n \n for (int i = 0; i < SIZE; i++) {\n for (int j = 0; j < SIZE; j++) {\n S[i][j] = m5.get(i, j);\n }\n }\n \n // do m/r jacobi eigen value computation\n DenseMatrix dm = (DenseMatrix)m5;\n dm.jacobiEigenValue(3);\n \n // do jacobi egien value over S array\n int i, j, k, l, m, state;\n double s, c, t, p, y;\n double e1, e2;\n // index array\n int[] ind = new int[SIZE];\n boolean[] changed = new boolean[SIZE];\n \n // output\n double[] e = new double[SIZE];\n double[][] E = new double[SIZE][SIZE];\n \n // init e & E; ind & changed\n for(i=0; i<SIZE; i++) {\n for(j=0; j<SIZE; j++) {\n E[i][j] = 0;\n }\n E[i][i] = 1;\n }\n \n state = SIZE;\n \n for(i=0; i<SIZE; i++) {\n ind[i] = maxind(S, i, SIZE); \n e[i] = S[i][i];\n changed[i] = true;\n }\n \n int loops = 3;\n // next rotation\n while(state != 0 && loops > 0) {\n // find index(k, l) for pivot p\n m = 0;\n for(k = 1; k <= SIZE-2; k++) {\n if(Math.abs(S[m][ind[m]]) < Math.abs(S[k][ind[k]])) {\n m = k;\n }\n }\n \n k = m; l = ind[m]; p = S[k][l];\n \n // calculate c = cos, s = sin\n y = (e[l] - e[k]) / 2;\n t = Math.abs(y) + Math.sqrt(p * p + y * y);\n s = Math.sqrt(p * p + t * t);\n c = t / s;\n s = p / s;\n t = (p * p) / t;\n if(y < 0) {\n s = -s;\n t = -t;\n }\n \n S[k][l] = 0.0;\n state = update(e, changed, k, -t, state);\n state = update(e, changed, l, t, state);\n \n for(i = 0; i <= k-1; i++) \n rotate(S, i, k, i, l, c, s);\n \n for(i = l+1; i < SIZE; i++)\n rotate(S, k, i, l, i, c, s);\n \n for(i = k+1; i <= l-1; i++)\n rotate(S, k, i, i, l, c, s);\n \n // rotate eigenvectors\n for(i = 0; i < SIZE; i++) {\n e1 = E[k][i];\n e2 = E[l][i];\n \n E[k][i] = c * e1 - s * e2;\n E[l][i] = s * e1 + c * e2;\n }\n \n ind[k] = maxind(S, k, SIZE);\n ind[l] = maxind(S, l, SIZE);\n \n loops --;\n }\n \n // verify the results\n assertTrue(dm.verifyEigenValue(e, E));\n }\n\n public void testEnsureForAddition() {\n try {\n m1.add(m4);\n fail(\"Matrix-Addition should be failed while rows and columns aren't same.\");\n } catch (IOException e) {\n LOG.info(e.toString());\n }\n }\n\n public void testEnsureForMultiplication() {\n try {\n m1.mult(m4);\n fail(\"Matrix-Mult should be failed while A.columns!=B.rows.\");\n } catch (IOException e) {\n LOG.info(e.toString());\n }\n }\n \n public void testLoadSave() throws IOException {\n String path1 = m1.getPath();\n // save m1 to aliase1\n m1.save(aliase1);\n // load matrix m1 using aliase1\n DenseMatrix loadTest = new DenseMatrix(conf, aliase1, false);\n for (int i = 0; i < SIZE; i++) {\n for (int j = 0; j < SIZE; j++) {\n assertEquals(m1.get(i, j), loadTest.get(i, j));\n }\n }\n\n assertEquals(path1, loadTest.getPath());\n // close loadTest, it just disconnect to the table but didn't delete it.\n loadTest.close();\n\n // try to close m1 & load matrix m1 using aliase1 again.\n m1.close();\n DenseMatrix loadTest2 = new DenseMatrix(conf, aliase1, false);\n assertEquals(path1, loadTest2.getPath());\n // remove aliase1\n // because loadTest2 connect the aliase1, so we just remove aliase entry\n // but didn't delete the table.\n hamaAdmin.delete(aliase1);\n assertEquals(true, admin.tableExists(path1));\n // close loadTest2, because it is the last one who reference table 'path1'\n // it will do the gc!\n loadTest2.close();\n assertEquals(false, admin.tableExists(path1));\n\n // if we try to load non-existed matrix using aliase name, it should fail.\n DenseMatrix loadTest3 = null;\n try {\n loadTest3 = new DenseMatrix(conf, aliase1, false);\n fail(\"Try to load a non-existed matrix should fail!\");\n } catch (IOException e) {\n\n } finally {\n if (loadTest3 != null)\n loadTest3.close();\n \n public void testForceCreate() throws IOException {\n String path2 = m2.getPath();\n // save m2 to aliase2\n m2.save(aliase2);\n // load matrix m2 using aliase2\n DenseMatrix loadTest = new DenseMatrix(conf, aliase2, false);\n\n for (int i = 0; i < loadTest.getRows(); i++) {\n for (int j = 0; j < loadTest.getColumns(); j++) {\n assertEquals(m2.get(i, j), loadTest.get(i, j));\n }\n }\n\n assertEquals(path2, loadTest.getPath());\n\n Matrix test = hamaAdmin.getMatrix(aliase2);\n assertEquals(test.getType(), \"DenseMatrix\");\n \n // force to create matrix loadTest2 using aliasename 'aliase2'\n DenseMatrix loadTest2 = new DenseMatrix(conf, aliase2, true);\n String loadPath2 = loadTest2.getPath();\n assertFalse(path2.equals(loadPath2));\n assertEquals(loadPath2, hamaAdmin.getPath(aliase2));\n assertFalse(path2.equals(hamaAdmin.getPath(aliase2)));\n\n // try to close m2 & loadTest, it table will be deleted finally\n m2.close();\n assertEquals(true, admin.tableExists(path2));\n loadTest.close();\n assertEquals(false, admin.tableExists(path2));\n\n // remove 'aliase2' & close loadTest2\n loadTest2.close();\n assertEquals(true, admin.tableExists(loadPath2));\n hamaAdmin.delete(aliase2);\n assertEquals(false, admin.tableExists(loadPath2));\n }\n \n //index of largest off-diagonal element in row k\n int maxind(double[][] S, int row, int size) {\n int m = row + 1;\n for(int i=row + 2; i<size; i++) {\n if(Math.abs(S[row][i]) > Math.abs(S[row][m]))\n m = i;\n }\n return m;\n }\n \n int update(double[] e, boolean[] changed, int row, double value, int state) {\n double y = e[row];\n e[row] += value;\n \n if(changed[row] && y == e[row]) {\n changed[row] = false;\n return state - 1;\n } else if(!changed[row] && y != e[row]) {\n changed[row] = true;\n return state + 1;\n } else\n return state;\n }\n \n void rotate(double[][] S, int k, int l, int i, int j, double c, double s) {\n double s1 = S[k][l], s2 = S[i][j];\n S[k][l] = c * s1 - s * s2;\n S[i][j] = s * s1 + c * s2;\n }", "old_methods": [ { "arguments": [], "filename": "src/test/org/apache/hama/matrix/TestDenseMatrix.java", "implementation": "TestSetup setup = new TestSetup(new TestSuite(TestDenseMatrix.class)) {\n protected void setUp() throws Exception {\n HCluster hCluster = new HCluster();\n hCluster.setUp();\n\n conf = hCluster.getConf();\n admin = new HBaseAdmin(conf);\n hamaAdmin = new HamaAdminImpl(conf, admin);\n\n m1 = DenseMatrix.random(hCluster.getConf(), SIZE, SIZE);\n m2 = DenseMatrix.random(hCluster.getConf(), SIZE, SIZE);\n m3 = DenseMatrix.random(hCluster.getConf(), SIZE, SIZE);\n m4 = DenseMatrix.random(hCluster.getConf(), SIZE-2, SIZE-2);\n m5 = DenseMatrix.random(hCluster.getConf(), SIZE, SIZE);", "signature": "Test suite()" }, { "arguments": [], "filename": "src/test/org/apache/hama/matrix/TestDenseMatrix.java", "implementation": "try {\n closeTest();", "signature": "void tearDown()" }, { "arguments": [ "int i = 0; i < 3; i++" ], "filename": "src/test/org/apache/hama/matrix/TestDenseMatrix.java", "implementation": "for (int j = 0; j < 3; j++) {\n for (int k = 0; k < 4; k++) {\n C[i][j] += m1.get(i + 2, k + 2) * m2.get(k, j);", "signature": "B\n for (int i = 0; i < 3; i++)" }, { "arguments": [ "i=0; i<SIZE; i++" ], "filename": "src/test/org/apache/hama/matrix/TestDenseMatrix.java", "implementation": "for(j=0; j<SIZE; j++) {\n E[i][j] = 0;", "signature": "changed\n for(i=0; i<SIZE; i++)" }, { "arguments": [ "state != 0 && loops > 0" ], "filename": "src/test/org/apache/hama/matrix/TestDenseMatrix.java", "implementation": "// find index(k, l) for pivot p\n m = 0;\n for(k = 1; k <= SIZE-2; k++) {\n if(Math.abs(S[m][ind[m]]) < Math.abs(S[k][ind[k]])) {\n m = k;", "signature": "rotation\n while(state != 0 && loops > 0)" }, { "arguments": [ "i = 0; i < SIZE; i++" ], "filename": "src/test/org/apache/hama/matrix/TestDenseMatrix.java", "implementation": "e1 = E[k][i];\n e2 = E[l][i];\n \n E[k][i] = c * e1 - s * e2;\n E[l][i] = s * e1 + c * e2;", "signature": "eigenvectors\n for(i = 0; i < SIZE; i++)" }, { "arguments": [], "filename": "src/test/org/apache/hama/matrix/TestDenseMatrix.java", "implementation": "try {\n m1.add(m4);\n fail(\"Matrix-Addition should be failed while rows and columns aren't same.\");", "signature": "void testEnsureForAddition()" }, { "arguments": [], "filename": "src/test/org/apache/hama/matrix/TestDenseMatrix.java", "implementation": "try {\n m1.mult(m4);\n fail(\"Matrix-Mult should be failed while A.columns!=B.rows.\");", "signature": "void testEnsureForMultiplication()" }, { "arguments": [ "double[][] S", " int row", " int size" ], "filename": "src/test/org/apache/hama/matrix/TestDenseMatrix.java", "implementation": "int m = row + 1;\n for(int i=row + 2; i<size; i++) {\n if(Math.abs(S[row][i]) > Math.abs(S[row][m]))\n m = i;", "signature": "int maxind(double[][] S, int row, int size)" }, { "arguments": [ "double[] e", " boolean[] changed", " int row", " double value", " int state" ], "filename": "src/test/org/apache/hama/matrix/TestDenseMatrix.java", "implementation": "double y = e[row];\n e[row] += value;\n \n if(changed[row] && y == e[row]) {\n changed[row] = false;\n return state - 1;", "signature": "int update(double[] e, boolean[] changed, int row, double value, int state)" }, { "arguments": [ "!changed[row] && y != e[row]" ], "filename": "src/test/org/apache/hama/matrix/TestDenseMatrix.java", "implementation": "changed[row] = true;\n return state + 1;", "signature": "else if(!changed[row] && y != e[row])" }, { "arguments": [ "double[][] S", " int k", " int l", " int i", " int j", " double c", " double s" ], "filename": "src/test/org/apache/hama/matrix/TestDenseMatrix.java", "implementation": "double s1 = S[k][l], s2 = S[i][j];\n S[k][l] = c * s1 - s * s2;\n S[i][j] = s * s1 + c * s2;", "signature": "void rotate(double[][] S, int k, int l, int i, int j, double c, double s)" } ], "patch": "@@ -20,158 +20,80 @@\n package org.apache.hama.matrix;\n \n import java.io.IOException;\n+import java.io.UnsupportedEncodingException;\n import java.util.Iterator;\n \n-import junit.extensions.TestSetup;\n-import junit.framework.Test;\n-import junit.framework.TestCase;\n-import junit.framework.TestSuite;\n-\n-import org.apache.hadoop.hbase.client.HBaseAdmin;\n import org.apache.hadoop.io.Writable;\n-import org.apache.hama.HamaAdmin;\n-import org.apache.hama.HamaAdminImpl;\n+import org.apache.hama.HamaCluster;\n import org.apache.hama.HamaConfiguration;\n import org.apache.hama.io.DoubleEntry;\n-import org.apache.hama.matrix.Matrix.Norm;\n import org.apache.hama.util.RandomVariable;\n import org.apache.log4j.Logger;\n \n /**\n * Matrix test\n */\n-public class TestDenseMatrix extends TestCase {\n+public class TestDenseMatrix extends HamaCluster {\n static final Logger LOG = Logger.getLogger(TestDenseMatrix.class);\n- private static int SIZE = 10;\n- private static Matrix m1;\n- private static Matrix m2;\n- private static Matrix m3;\n- private static Matrix m4, m5;\n- private final static String aliase1 = \"matrix_aliase_A\";\n- private final static String aliase2 = \"matrix_aliase_B\";\n- private static HamaConfiguration conf;\n- private static HBaseAdmin admin;\n- private static HamaAdmin hamaAdmin;\n-\n- public static Test suite() {\n- TestSetup setup = new TestSetup(new TestSuite(TestDenseMatrix.class)) {\n- protected void setUp() throws Exception {\n- HCluster hCluster = new HCluster();\n- hCluster.setUp();\n-\n- conf = hCluster.getConf();\n- admin = new HBaseAdmin(conf);\n- hamaAdmin = new HamaAdminImpl(conf, admin);\n-\n- m1 = DenseMatrix.random(hCluster.getConf(), SIZE, SIZE);\n- m2 = DenseMatrix.random(hCluster.getConf(), SIZE, SIZE);\n- m3 = DenseMatrix.random(hCluster.getConf(), SIZE, SIZE);\n- m4 = DenseMatrix.random(hCluster.getConf(), SIZE-2, SIZE-2);\n- m5 = DenseMatrix.random(hCluster.getConf(), SIZE, SIZE);\n- }\n-\n- protected void tearDown() {\n- try {\n- closeTest();\n- } catch (IOException e) {\n- e.printStackTrace();\n- }\n- }\n- };\n- return setup;\n- }\n-\n- public static void closeTest() throws IOException {\n- m1.close();\n- m2.close();\n- }\n-\n- public void testEntryAdd() throws IOException {\n- double origin = m1.get(1, 1);\n- m1.add(1, 1, 0.5);\n-\n- assertEquals(m1.get(1, 1), origin + 0.5);\n- }\n-\n- public void testGet() throws IOException {\n- boolean ex = false;\n- try {\n- m1.get(SIZE + 1, SIZE + 1);\n- } catch (ArrayIndexOutOfBoundsException e) {\n- ex = true;\n- }\n- assertTrue(ex);\n- assertTrue(m1.get(0, 0) > 0);\n- }\n- \n- public void testTranspose() throws IOException {\n- DenseMatrix trans = (DenseMatrix) m1.transpose();\n- for(int i = 0; i < trans.getRows(); i++) {\n- for(int j = 0; j < trans.getColumns(); j++) {\n- assertEquals(trans.get(i, j), m1.get(j, i));\n- }\n- }\n- }\n+ private int SIZE = 10;\n+ private Matrix m1;\n+ private Matrix m2;\n+ private HamaConfiguration conf;\n \n /**\n- * Column vector test.\n- * \n- * @param rand\n- * @throws IOException\n+ * @throws UnsupportedEncodingException\n */\n- public void testGetColumn() throws IOException {\n- Vector v = m1.getColumn(0);\n- Iterator<Writable> it = v.iterator();\n- int x = 0;\n- while (it.hasNext()) {\n- assertEquals(m1.get(x, 0), ((DoubleEntry) it.next()).getValue());\n- x++;\n- }\n+ public TestDenseMatrix() throws UnsupportedEncodingException {\n+ super();\n }\n \n- public void testGetSetAttribute() throws IOException {\n- m1.setRowLabel(0, \"row1\");\n- assertEquals(m1.getRowLabel(0), \"row1\");\n- assertEquals(m1.getRowLabel(1), null);\n-\n- m1.setColumnLabel(0, \"column1\");\n- assertEquals(m1.getColumnLabel(0), \"column1\");\n- assertEquals(m1.getColumnLabel(1), null);\n- }\n+ public void setUp() throws Exception {\n+ super.setUp();\n \n- public void testSubMatrix() throws IOException {\n- SubMatrix a = m1.subMatrix(2, 4, 2, 5); // A : 3 * 4\n- for (int i = 0; i < a.getRows(); i++) {\n- for (int j = 0; j < a.getColumns(); j++) {\n- assertEquals(a.get(i, j), m1.get(i + 2, j + 2));\n- }\n- }\n+ conf = getConf();\n \n- SubMatrix b = m2.subMatrix(0, 3, 0, 2); // B : 4 * 3\n- SubMatrix c = a.mult(b);\n+ m1 = DenseMatrix.random(conf, SIZE, SIZE);\n+ m2 = DenseMatrix.random(conf, SIZE, SIZE);\n+ }\n \n- double[][] C = new double[3][3]; // A * B\n- for (int i = 0; i < 3; i++) {\n- for (int j = 0; j < 3; j++) {\n- for (int k = 0; k < 4; k++) {\n- C[i][j] += m1.get(i + 2, k + 2) * m2.get(k, j);\n- }\n- }\n+ public void testAddMult() throws IOException {\n+ Matrix m3 = DenseMatrix.random(conf, SIZE, SIZE);\n+ Matrix m4 = DenseMatrix.random(conf, SIZE - 2, SIZE - 2);\n+ try {\n+ m1.add(m4);\n+ fail(\"Matrix-Addition should be failed while rows and columns aren't same.\");\n+ } catch (IOException e) {\n+ LOG.info(e.toString());\n }\n \n- for (int i = 0; i < 3; i++) {\n- for (int j = 0; j < 3; j++) {\n- assertEquals(C[i][j], c.get(i, j));\n- }\n+ try {\n+ m1.mult(m4);\n+ fail(\"Matrix-Mult should be failed while A.columns!=B.rows.\");\n+ } catch (IOException e) {\n+ LOG.info(e.toString());\n }\n+ \n+ double origin = m1.get(1, 1);\n+ m1.add(1, 1, 0.5);\n+ assertEquals(m1.get(1, 1), origin + 0.5);\n+ \n+ matrixAdd(m1, m2);\n+ multMatrixAdd(m1, m2, m3);\n+ matrixMult(m1, m2);\n+ addAlphaMatrix(m1, m2);\n+ \n+ getRowColumn();\n+ setRowColumn();\n+ setMatrix(m1);\n+ setAlphaMatrix(m1);\n }\n \n /**\n * Test matrices addition\n * \n * @throws IOException\n */\n- public void testMatrixAdd() throws IOException {\n+ public void matrixAdd(Matrix m1, Matrix m2) throws IOException {\n Matrix result = m1.add(m2);\n \n assertEquals(result.getRows(), SIZE);\n@@ -193,15 +115,16 @@ public void testMatrixAdd() throws IOException {\n }\n }\n \n- public void testMultiMatrixAdd() throws IOException {\n- Matrix result = ((DenseMatrix)m1).add(m2, m3);\n- \n+ public void multMatrixAdd(Matrix m1, Matrix m2, Matrix m3) throws IOException {\n+ Matrix result = ((DenseMatrix) m1).add(m2, m3);\n+\n assertEquals(result.getRows(), SIZE);\n assertEquals(result.getColumns(), SIZE);\n- \n+\n for (int i = 0; i < SIZE; i++) {\n for (int j = 0; j < SIZE; j++) {\n- assertEquals(result.get(i, j), m1.get(i, j) + m2.get(i, j) + m3.get(i, j));\n+ assertEquals(result.get(i, j), m1.get(i, j) + m2.get(i, j)\n+ + m3.get(i, j));\n }\n }\n }\n@@ -211,7 +134,7 @@ public void testMultiMatrixAdd() throws IOException {\n * \n * @throws IOException\n */\n- public void testMatrixMult() throws IOException {\n+ public void matrixMult(Matrix m1, Matrix m2) throws IOException {\n Matrix result = m1.mult(m2);\n \n assertEquals(result.getRows(), SIZE);\n@@ -220,7 +143,13 @@ public void testMatrixMult() throws IOException {\n verifyMultResult(m1, m2, result);\n }\n \n- public void testSetMatrix() throws IOException {\n+ public void addAlphaMatrix(Matrix m1, Matrix m2) throws IOException {\n+ double value = m1.get(0, 0) + (m2.get(0, 0) * 0.1);\n+ Matrix result = m1.add(0.1, m2);\n+ assertEquals(value, result.get(0, 0));\n+ }\n+ \n+ public void setMatrix(Matrix m1) throws IOException {\n Matrix a = new DenseMatrix(conf, m1.getRows(), m1.getColumns());\n a.set(m1);\n \n@@ -232,53 +161,45 @@ public void testSetMatrix() throws IOException {\n }\n }\n \n- public void testSetAlphaMatrix() throws IOException {\n+ public void setAlphaMatrix(Matrix m1) throws IOException {\n Matrix a = new DenseMatrix(conf, m1.getRows(), m1.getColumns());\n a.set(0.5, m1);\n- \n+\n for (int i = 0; i < 5; i++) {\n int x = RandomVariable.randInt(0, SIZE - 1);\n int y = RandomVariable.randInt(0, SIZE - 1);\n assertEquals(a.get(x, y), (m1.get(x, y) * 0.5));\n }\n }\n- \n- public void testAddAlphaMatrix() throws IOException {\n- double value = m1.get(0, 0) + (m2.get(0, 0) * 0.1);\n- Matrix result = m1.add(0.1, m2);\n- assertEquals(value, result.get(0, 0));\n- }\n- \n- public void testNorm() throws IOException {\n- double gap = 0.000001;\n- \n- double norm1 = m1.norm(Norm.One);\n- double verify_norm1 = MatrixTestCommon.verifyNorm1(m1);\n- gap = norm1 - verify_norm1;\n- LOG.info(\"Norm One : gap \" + gap);\n- assertTrue(gap < 0.000001 && gap > -0.000001);\n- \n- double normInfinity = m1.norm(Norm.Infinity);\n- double verify_normInf = MatrixTestCommon.verifyNormInfinity(m1);\n- gap = normInfinity - verify_normInf;\n- LOG.info(\"Norm Infinity : gap \" + gap);\n- assertTrue(gap < 0.000001 && gap > -0.000001);\n+\n+ public void getRowColumn() throws IOException {\n+ boolean ex = false;\n+ try {\n+ m1.get(SIZE + 1, SIZE + 1);\n+ } catch (ArrayIndexOutOfBoundsException e) {\n+ ex = true;\n+ }\n+ assertTrue(ex);\n+ assertTrue(m1.get(0, 0) > 0);\n \n- double normMaxValue = m1.norm(Norm.Maxvalue);\n- double verify_normMV = MatrixTestCommon.verifyNormMaxValue(m1);\n- gap = normMaxValue - verify_normMV;\n- LOG.info(\"Norm MaxValue : gap \" + gap);\n- assertTrue(gap < 0.000001 && gap > -0.000001);\n+ Vector v = m1.getColumn(0);\n+ Iterator<Writable> it = v.iterator();\n+ int x = 0;\n+ while (it.hasNext()) {\n+ assertEquals(m1.get(x, 0), ((DoubleEntry) it.next()).getValue());\n+ x++;\n+ }\n \n- double normFrobenius = m1.norm(Norm.Frobenius);\n- double verify_normFrobenius = MatrixTestCommon.verifyNormFrobenius(m1);\n- gap = normFrobenius - verify_normFrobenius;\n- LOG.info(\"Norm Frobenius : \" + normFrobenius + \"(map/reduce) - \" + verify_normFrobenius + \" expected\");\n- LOG.info(\"Norm Frobenius : gap \" + gap);\n- assertTrue(gap < 0.000001 && gap > -0.000001);\n+ m1.setRowLabel(0, \"row1\");\n+ assertEquals(m1.getRowLabel(0), \"row1\");\n+ assertEquals(m1.getRowLabel(1), null);\n+\n+ m1.setColumnLabel(0, \"column1\");\n+ assertEquals(m1.getColumnLabel(0), \"column1\");\n+ assertEquals(m1.getColumnLabel(1), null);\n }\n \n- public void testSetRow() throws IOException {\n+ public void setRowColumn() throws IOException {\n Vector v = new DenseVector();\n double[] entries = new double[] { 1, 2, 3, 4, 5, 6, 7, 8, 9, 0 };\n \n@@ -294,224 +215,16 @@ public void testSetRow() throws IOException {\n assertEquals(entries[i], ((DoubleEntry) it.next()).getValue());\n i++;\n }\n- }\n-\n- public void testSetColumn() throws IOException {\n- Vector v = new DenseVector();\n- double[] entries = new double[] { 1, 2, 3, 4, 5, 6, 7, 8, 9, 0 };\n-\n- for (int i = 0; i < SIZE; i++) {\n- v.set(i, entries[i]);\n- }\n \n m1.setColumn(SIZE, v);\n- Iterator<Writable> it = m1.getColumn(SIZE).iterator();\n-\n- int i = 0;\n- while (it.hasNext()) {\n- assertEquals(entries[i], ((DoubleEntry) it.next()).getValue());\n- i++;\n- }\n- }\n-\n- public void testJacobiEigenValue() throws IOException {\n- // copy Matrix m5 to the array\n- double[][] S = new double[SIZE][SIZE];\n- \n- for (int i = 0; i < SIZE; i++) {\n- for (int j = 0; j < SIZE; j++) {\n- S[i][j] = m5.get(i, j);\n- }\n- }\n- \n- // do m/r jacobi eigen value computation\n- DenseMatrix dm = (DenseMatrix)m5;\n- dm.jacobiEigenValue(3);\n- \n- // do jacobi egien value over S array\n- int i, j, k, l, m, state;\n- double s, c, t, p, y;\n- double e1, e2;\n- // index array\n- int[] ind = new int[SIZE];\n- boolean[] changed = new boolean[SIZE];\n- \n- // output\n- double[] e = new double[SIZE];\n- double[][] E = new double[SIZE][SIZE];\n- \n- // init e & E; ind & changed\n- for(i=0; i<SIZE; i++) {\n- for(j=0; j<SIZE; j++) {\n- E[i][j] = 0;\n- }\n- E[i][i] = 1;\n- }\n- \n- state = SIZE;\n- \n- for(i=0; i<SIZE; i++) {\n- ind[i] = maxind(S, i, SIZE); \n- e[i] = S[i][i];\n- changed[i] = true;\n- }\n- \n- int loops = 3;\n- // next rotation\n- while(state != 0 && loops > 0) {\n- // find index(k, l) for pivot p\n- m = 0;\n- for(k = 1; k <= SIZE-2; k++) {\n- if(Math.abs(S[m][ind[m]]) < Math.abs(S[k][ind[k]])) {\n- m = k;\n- }\n- }\n- \n- k = m; l = ind[m]; p = S[k][l];\n- \n- // calculate c = cos, s = sin\n- y = (e[l] - e[k]) / 2;\n- t = Math.abs(y) + Math.sqrt(p * p + y * y);\n- s = Math.sqrt(p * p + t * t);\n- c = t / s;\n- s = p / s;\n- t = (p * p) / t;\n- if(y < 0) {\n- s = -s;\n- t = -t;\n- }\n- \n- S[k][l] = 0.0;\n- state = update(e, changed, k, -t, state);\n- state = update(e, changed, l, t, state);\n- \n- for(i = 0; i <= k-1; i++) \n- rotate(S, i, k, i, l, c, s);\n- \n- for(i = l+1; i < SIZE; i++)\n- rotate(S, k, i, l, i, c, s);\n- \n- for(i = k+1; i <= l-1; i++)\n- rotate(S, k, i, i, l, c, s);\n- \n- // rotate eigenvectors\n- for(i = 0; i < SIZE; i++) {\n- e1 = E[k][i];\n- e2 = E[l][i];\n- \n- E[k][i] = c * e1 - s * e2;\n- E[l][i] = s * e1 + c * e2;\n- }\n- \n- ind[k] = maxind(S, k, SIZE);\n- ind[l] = maxind(S, l, SIZE);\n- \n- loops --;\n- }\n- \n- // verify the results\n- assertTrue(dm.verifyEigenValue(e, E));\n- }\n-\n- public void testEnsureForAddition() {\n- try {\n- m1.add(m4);\n- fail(\"Matrix-Addition should be failed while rows and columns aren't same.\");\n- } catch (IOException e) {\n- LOG.info(e.toString());\n- }\n- }\n-\n- public void testEnsureForMultiplication() {\n- try {\n- m1.mult(m4);\n- fail(\"Matrix-Mult should be failed while A.columns!=B.rows.\");\n- } catch (IOException e) {\n- LOG.info(e.toString());\n- }\n- }\n- \n- public void testLoadSave() throws IOException {\n- String path1 = m1.getPath();\n- // save m1 to aliase1\n- m1.save(aliase1);\n- // load matrix m1 using aliase1\n- DenseMatrix loadTest = new DenseMatrix(conf, aliase1, false);\n+ Iterator<Writable> it2 = m1.getColumn(SIZE).iterator();\n \n- for (int i = 0; i < SIZE; i++) {\n- for (int j = 0; j < SIZE; j++) {\n- assertEquals(m1.get(i, j), loadTest.get(i, j));\n- }\n- }\n-\n- assertEquals(path1, loadTest.getPath());\n- // close loadTest, it just disconnect to the table but didn't delete it.\n- loadTest.close();\n-\n- // try to close m1 & load matrix m1 using aliase1 again.\n- m1.close();\n- DenseMatrix loadTest2 = new DenseMatrix(conf, aliase1, false);\n- assertEquals(path1, loadTest2.getPath());\n- // remove aliase1\n- // because loadTest2 connect the aliase1, so we just remove aliase entry\n- // but didn't delete the table.\n- hamaAdmin.delete(aliase1);\n- assertEquals(true, admin.tableExists(path1));\n- // close loadTest2, because it is the last one who reference table 'path1'\n- // it will do the gc!\n- loadTest2.close();\n- assertEquals(false, admin.tableExists(path1));\n-\n- // if we try to load non-existed matrix using aliase name, it should fail.\n- DenseMatrix loadTest3 = null;\n- try {\n- loadTest3 = new DenseMatrix(conf, aliase1, false);\n- fail(\"Try to load a non-existed matrix should fail!\");\n- } catch (IOException e) {\n-\n- } finally {\n- if (loadTest3 != null)\n- loadTest3.close();\n+ int x = 0;\n+ while (it2.hasNext()) {\n+ assertEquals(entries[x], ((DoubleEntry) it2.next()).getValue());\n+ x++;\n }\n }\n- \n- public void testForceCreate() throws IOException {\n- String path2 = m2.getPath();\n- // save m2 to aliase2\n- m2.save(aliase2);\n- // load matrix m2 using aliase2\n- DenseMatrix loadTest = new DenseMatrix(conf, aliase2, false);\n-\n- for (int i = 0; i < loadTest.getRows(); i++) {\n- for (int j = 0; j < loadTest.getColumns(); j++) {\n- assertEquals(m2.get(i, j), loadTest.get(i, j));\n- }\n- }\n-\n- assertEquals(path2, loadTest.getPath());\n-\n- Matrix test = hamaAdmin.getMatrix(aliase2);\n- assertEquals(test.getType(), \"DenseMatrix\");\n- \n- // force to create matrix loadTest2 using aliasename 'aliase2'\n- DenseMatrix loadTest2 = new DenseMatrix(conf, aliase2, true);\n- String loadPath2 = loadTest2.getPath();\n- assertFalse(path2.equals(loadPath2));\n- assertEquals(loadPath2, hamaAdmin.getPath(aliase2));\n- assertFalse(path2.equals(hamaAdmin.getPath(aliase2)));\n-\n- // try to close m2 & loadTest, it table will be deleted finally\n- m2.close();\n- assertEquals(true, admin.tableExists(path2));\n- loadTest.close();\n- assertEquals(false, admin.tableExists(path2));\n-\n- // remove 'aliase2' & close loadTest2\n- loadTest2.close();\n- assertEquals(true, admin.tableExists(loadPath2));\n- hamaAdmin.delete(aliase2);\n- assertEquals(false, admin.tableExists(loadPath2));\n- }\n \n /**\n * Verifying multiplication result\n@@ -539,34 +252,4 @@ private void verifyMultResult(Matrix m1, Matrix m2, Matrix result)\n }\n }\n }\n- \n- //index of largest off-diagonal element in row k\n- int maxind(double[][] S, int row, int size) {\n- int m = row + 1;\n- for(int i=row + 2; i<size; i++) {\n- if(Math.abs(S[row][i]) > Math.abs(S[row][m]))\n- m = i;\n- }\n- return m;\n- }\n- \n- int update(double[] e, boolean[] changed, int row, double value, int state) {\n- double y = e[row];\n- e[row] += value;\n- \n- if(changed[row] && y == e[row]) {\n- changed[row] = false;\n- return state - 1;\n- } else if(!changed[row] && y != e[row]) {\n- changed[row] = true;\n- return state + 1;\n- } else\n- return state;\n- }\n- \n- void rotate(double[][] S, int k, int l, int i, int j, double c, double s) {\n- double s1 = S[k][l], s2 = S[i][j];\n- S[k][l] = c * s1 - s * s2;\n- S[i][j] = s * s1 + c * s2;\n- }\n }", "raw_url": "https://github.com/apache/hama/raw/42584cd5328fc55a499d318dda6fefff6459242c/src%2Ftest%2Forg%2Fapache%2Fhama%2Fmatrix%2FTestDenseMatrix.java", "sha": "463f6c1a10d2611bb386cdb08ffac4a4cc167fe3", "status": "modified" }, { "additions": 204, "blob_url": "https://github.com/apache/hama/blob/42584cd5328fc55a499d318dda6fefff6459242c/src%2Ftest%2Forg%2Fapache%2Fhama%2Fmatrix%2FTestDenseVector.java", "changes": 433, "contents_url": "https://api.github.com/repos/apache/hama/contents/src%2Ftest%2Forg%2Fapache%2Fhama%2Fmatrix%2FTestDenseVector.java?ref=42584cd5328fc55a499d318dda6fefff6459242c", "deletions": 229, "filename": "src/test/org/apache/hama/matrix/TestDenseVector.java", "new_code": "/**\n * Copyright 2007 The Apache Software Foundation\n *\n * Licensed to the Apache Software Foundation (ASF) under one\n * or more contributor license agreements. See the NOTICE file\n * distributed with this work for additional information\n * regarding copyright ownership. The ASF licenses this file\n * to you under the Apache License, Version 2.0 (the\n * \"License\"); you may not use this file except in compliance\n * with the License. You may obtain a copy of the License at\n *\n * http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\npackage org.apache.hama.matrix;\n\nimport java.io.IOException;\nimport java.io.UnsupportedEncodingException;\nimport java.util.Iterator;\n\nimport org.apache.commons.logging.Log;\nimport org.apache.commons.logging.LogFactory;\nimport org.apache.hadoop.io.Writable;\nimport org.apache.hama.HamaCluster;\nimport org.apache.hama.io.DoubleEntry;\n\npublic class TestDenseVector extends HamaCluster {\n final static Log LOG = LogFactory.getLog(TestDenseVector.class.getName());\n\n private final double cosine = 0.6978227007909176;\n private final double norm1 = 12.0;\n private final double norm2 = 6.782329983125268;\n private final double normInf = 5.0;\n private final double norm2Robust = 6.782329983125269;\n private double[][] values = { { 2, 5, 1, 4 }, { 4, 1, 3, 3 } };\n private DenseMatrix m1;\n private DenseVector v1;\n private DenseVector v2;\n private DenseVector smallSize = new DenseVector();\n\n /**\n * @throws UnsupportedEncodingException\n */\n public TestDenseVector() throws UnsupportedEncodingException {\n super();\n }\n\n public void setUp() throws Exception {\n super.setUp();\n\n m1 = new DenseMatrix(getConf(), 2, 4);\n\n for (int i = 0; i < 2; i++)\n for (int j = 0; j < 4; j++)\n m1.set(i, j, values[i][j]);\n\n v1 = m1.getRow(0);\n v2 = m1.getRow(1);\n smallSize.set(0, 0.5);\n }\n\n /**\n * @throws IOException \n */\n public void testDenseVector() throws IOException {\n double cos = v1.dot(v2);\n assertEquals(cos, cosine);\n\n boolean except = false;\n try {\n v1.dot(smallSize);\n } catch (IndexOutOfBoundsException e) {\n except = true;\n }\n \n assertTrue(except);\n subVector();\n \n assertEquals(norm1, v1.norm(Vector.Norm.One));\n assertEquals(norm2, v1.norm(Vector.Norm.Two));\n assertEquals(normInf, v1.norm(Vector.Norm.Infinity));\n assertEquals(norm2Robust, v1.norm(Vector.Norm.TwoRobust));\n\n getSetTest();\n add();\n scalingTest();\n setTest();\n clear();\n }\n\n /**\n * Test scaling\n */\n public void scalingTest() {\n v2.scale(0.5);\n\n for (int i = 0; i < v2.size(); i++) {\n assertEquals(values[1][i] * 0.5, v2.get(i));\n }\n }\n\n /**\n * Test get/set methods\n * @throws IOException \n */\n public void getSetTest() throws IOException {\n assertEquals(v1.get(0), values[0][0]);\n boolean ex = false;\n try {\n v1.get(5);\n } catch (NullPointerException e) {\n ex = true;\n }\n assertTrue(ex);\n assertEquals(m1.getColumn(0).size(), 2);\n }\n\n /**\n * Test add()\n */\n public void add() {\n v1.add(v2);\n int i = 0;\n Iterator<Writable> it = v1.iterator();\n while (it.hasNext()) {\n DoubleEntry c = (DoubleEntry) it.next();\n assertEquals(c.getValue(), values[0][i] + values[1][i]);\n i++;\n }\n\n v1.add(0.5, v2);\n int j = 0;\n Iterator<Writable> itt = v1.iterator();\n while (itt.hasNext()) {\n DoubleEntry c = (DoubleEntry) itt.next();\n assertEquals(c.getValue(), (values[0][j] + values[1][j]) + (0.5 * values[1][j]));\n j++;\n }\n \n double old = v1.get(0);\n v1.add(0, norm1);\n assertEquals(v1.get(0), old + norm1);\n \n boolean except = false;\n try {\n v1.add(smallSize);\n } catch (IndexOutOfBoundsException e) {\n except = true;\n }\n \n assertTrue(except);\n \n except = false;\n try {\n v1.add(0.6, smallSize);\n } catch (IndexOutOfBoundsException e) {\n except = true;\n }\n \n assertTrue(except);\n }\n \n public void setTest() {\n v1.set(v2);\n\n for(int i = 0; i < v1.size(); i ++) {\n assertEquals(v2.get(i), v1.get(i));\n }\n \n boolean except = false;\n try {\n v1.set(0.6, smallSize);\n } catch (IndexOutOfBoundsException e) {\n except = true;\n }\n \n assertTrue(except);\n }\n \n public void subVector() {\n int start = 2;\n Vector subVector = v1.subVector(start, v1.size() - 1);\n Iterator<Writable> it = subVector.iterator();\n\n int i = start;\n while (it.hasNext()) {\n assertEquals(v1.get(i), ((DoubleEntry) it.next()).getValue());\n i++;\n }\n }\n \n /**\n * Clear test\n */\n public void clear() {\n ((DenseVector) v1).clear();\n assertEquals(v1.size(), 0);\n }\n}", "new_methods": [ { "arguments": [], "filename": "src/test/org/apache/hama/matrix/TestDenseVector.java", "implementation": "v2.scale(0.5);\n\n for (int i = 0; i < v2.size(); i++) {\n assertEquals(values[1][i] * 0.5, v2.get(i));", "signature": "void scalingTest()" }, { "arguments": [], "filename": "src/test/org/apache/hama/matrix/TestDenseVector.java", "implementation": "v1.add(v2);\n int i = 0;\n Iterator<Writable> it = v1.iterator();\n while (it.hasNext()) {\n DoubleEntry c = (DoubleEntry) it.next();\n assertEquals(c.getValue(), values[0][i] + values[1][i]);\n i++;", "signature": "void add()" }, { "arguments": [], "filename": "src/test/org/apache/hama/matrix/TestDenseVector.java", "implementation": "v1.set(v2);\n\n for(int i = 0; i < v1.size(); i ++) {\n assertEquals(v2.get(i), v1.get(i));", "signature": "void setTest()" }, { "arguments": [], "filename": "src/test/org/apache/hama/matrix/TestDenseVector.java", "implementation": "int start = 2;\n Vector subVector = v1.subVector(start, v1.size() - 1);\n Iterator<Writable> it = subVector.iterator();\n\n int i = start;\n while (it.hasNext()) {\n assertEquals(v1.get(i), ((DoubleEntry) it.next()).getValue());\n i++;", "signature": "void subVector()" }, { "arguments": [], "filename": "src/test/org/apache/hama/matrix/TestDenseVector.java", "implementation": "((DenseVector) v1).clear();\n assertEquals(v1.size(), 0);", "signature": "void clear()" } ], "old_code": "/**\r\n * Copyright 2007 The Apache Software Foundation\r\n *\r\n * Licensed to the Apache Software Foundation (ASF) under one\r\n * or more contributor license agreements. See the NOTICE file\r\n * distributed with this work for additional information\r\n * regarding copyright ownership. The ASF licenses this file\r\n * to you under the Apache License, Version 2.0 (the\r\n * \"License\"); you may not use this file except in compliance\r\n * with the License. You may obtain a copy of the License at\r\n *\r\n * http://www.apache.org/licenses/LICENSE-2.0\r\n *\r\n * Unless required by applicable law or agreed to in writing, software\r\n * distributed under the License is distributed on an \"AS IS\" BASIS,\r\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r\n * See the License for the specific language governing permissions and\r\n * limitations under the License.\r\n */\r\npackage org.apache.hama.matrix;\r\n\r\nimport java.io.IOException;\r\nimport java.util.Iterator;\r\n\r\nimport junit.extensions.TestSetup;\r\nimport junit.framework.Test;\r\nimport junit.framework.TestCase;\r\nimport junit.framework.TestSuite;\r\n\r\nimport org.apache.commons.logging.Log;\r\nimport org.apache.commons.logging.LogFactory;\r\nimport org.apache.hadoop.io.Writable;\r\nimport org.apache.hama.io.DoubleEntry;\r\nimport org.apache.hama.matrix.DenseMatrix;\r\nimport org.apache.hama.matrix.DenseVector;\r\nimport org.apache.hama.matrix.Vector;\r\n\r\npublic class TestDenseVector extends TestCase {\r\n final static Log LOG = LogFactory.getLog(TestDenseVector.class.getName());\r\n \r\n private static final double cosine = 0.6978227007909176;\r\n private static final double norm1 = 12.0;\r\n private static final double norm2 = 6.782329983125268;\r\n private static final double normInf = 5.0;\r\n private static final double norm2Robust = 6.782329983125269;\r\n private static double[][] values = { { 2, 5, 1, 4 }, { 4, 1, 3, 3 } };\r\n private static DenseMatrix m1;\r\n private static DenseVector v1;\r\n private static DenseVector v2;\r\n private static DenseVector smallSize = new DenseVector();\r\n \r\n public static Test suite() {\r\n TestSetup setup = new TestSetup(new TestSuite(TestDenseVector.class)) {\r\n protected void setUp() throws Exception {\r\n HCluster hCluster = new HCluster();\r\n hCluster.setUp();\r\n\r\n m1 = new DenseMatrix(hCluster.getConf(), 2, 4);\r\n\r\n for (int i = 0; i < 2; i++)\r\n for (int j = 0; j < 4; j++)\r\n m1.set(i, j, values[i][j]);\r\n\r\n v1 = m1.getRow(0);\r\n v2 = m1.getRow(1);\r\n smallSize.set(0, 0.5);\r\n }\r\n\r\n protected void tearDown() {\r\n LOG.info(\"tearDown()\");\r\n }\r\n };\r\n return setup;\r\n }\r\n\r\n /**\r\n * Test |a| dot |b|\r\n */\r\n public void testDot() {\r\n double cos = v1.dot(v2);\r\n assertEquals(cos, cosine);\r\n \r\n boolean except = false;\r\n try {\r\n v1.dot(smallSize);\r\n } catch (IndexOutOfBoundsException e) {\r\n except = true;\r\n }\r\n \r\n assertTrue(except);\r\n }\r\n\r\n public void testSubVector() {\r\n int start = 2;\r\n Vector subVector = v1.subVector(start, v1.size() - 1);\r\n Iterator<Writable> it = subVector.iterator();\r\n\r\n int i = start;\r\n while (it.hasNext()) {\r\n assertEquals(v1.get(i), ((DoubleEntry) it.next()).getValue());\r\n i++;\r\n }\r\n }\r\n\r\n /**\r\n * Test norm one\r\n */\r\n public void testNom1() {\r\n assertEquals(norm1, v1.norm(Vector.Norm.One));\r\n }\r\n\r\n /**\r\n * Test norm two\r\n */\r\n public void testNom2() {\r\n assertEquals(norm2, v1.norm(Vector.Norm.Two));\r\n }\r\n\r\n /**\r\n * Test infinity norm\r\n */\r\n public void testNormInf() {\r\n assertEquals(normInf, v1.norm(Vector.Norm.Infinity));\r\n }\r\n \r\n /**\r\n * Test infinity norm\r\n */\r\n public void testNorm2Robust() {\r\n assertEquals(norm2Robust, v1.norm(Vector.Norm.TwoRobust));\r\n }\r\n \r\n /**\r\n * Test scaling\r\n */\r\n public void scalingTest() {\r\n v2.scale(0.5);\r\n\r\n for (int i = 0; i < v2.size(); i++) {\r\n assertEquals(values[1][i] * 0.5, v2.get(i));\r\n }\r\n }\r\n\r\n /**\r\n * Test get/set methods\r\n * @throws IOException \r\n */\r\n public void testGetSet() throws IOException {\r\n assertEquals(v1.get(0), values[0][0]);\r\n boolean ex = false;\r\n try {\r\n v1.get(5);\r\n } catch (NullPointerException e) {\r\n ex = true;\r\n }\r\n assertTrue(ex);\r\n assertEquals(m1.getColumn(0).size(), 2);\r\n }\r\n\r\n /**\r\n * Test add()\r\n */\r\n public void testAdd() {\r\n v1.add(v2);\r\n int i = 0;\r\n Iterator<Writable> it = v1.iterator();\r\n while (it.hasNext()) {\r\n DoubleEntry c = (DoubleEntry) it.next();\r\n assertEquals(c.getValue(), values[0][i] + values[1][i]);\r\n i++;\r\n }\r\n\r\n v1.add(0.5, v2);\r\n int j = 0;\r\n Iterator<Writable> itt = v1.iterator();\r\n while (itt.hasNext()) {\r\n DoubleEntry c = (DoubleEntry) itt.next();\r\n assertEquals(c.getValue(), (values[0][j] + values[1][j]) + (0.5 * values[1][j]));\r\n j++;\r\n }\r\n \r\n double old = v1.get(0);\r\n v1.add(0, norm1);\r\n assertEquals(v1.get(0), old + norm1);\r\n \r\n boolean except = false;\r\n try {\r\n v1.add(smallSize);\r\n } catch (IndexOutOfBoundsException e) {\r\n except = true;\r\n }\r\n \r\n assertTrue(except);\r\n \r\n except = false;\r\n try {\r\n v1.add(0.6, smallSize);\r\n } catch (IndexOutOfBoundsException e) {\r\n except = true;\r\n }\r\n \r\n assertTrue(except);\r\n }\r\n \r\n public void testSet() {\r\n v1.set(v2);\r\n \r\n for(int i = 0; i < v1.size(); i ++) {\r\n assertEquals(v2.get(i), v1.get(i));\r\n }\r\n \r\n boolean except = false;\r\n try {\r\n v1.set(0.6, smallSize);\r\n } catch (IndexOutOfBoundsException e) {\r\n except = true;\r\n }\r\n \r\n assertTrue(except);\r\n }\r\n \r\n /**\r\n * Clear test\r\n */\r\n public void testClear() {\r\n ((DenseVector) v1).clear();\r\n assertEquals(v1.size(), 0);\r\n }\r\n}\r", "old_methods": [ { "arguments": [], "filename": "src/test/org/apache/hama/matrix/TestDenseVector.java", "implementation": "TestSetup setup = new TestSetup(new TestSuite(TestDenseVector.class)) {\r\n protected void setUp() throws Exception {\r\n HCluster hCluster = new HCluster();\r\n hCluster.setUp();\r\n\r\n m1 = new DenseMatrix(hCluster.getConf(), 2, 4);\r\n\r\n for (int i = 0; i < 2; i++)\r\n for (int j = 0; j < 4; j++)\r\n m1.set(i, j, values[i][j]);\r\n\r\n v1 = m1.getRow(0);\r\n v2 = m1.getRow(1);\r\n smallSize.set(0, 0.5);", "signature": "Test suite()" }, { "arguments": [], "filename": "src/test/org/apache/hama/matrix/TestDenseVector.java", "implementation": "LOG.info(\"tearDown()\");", "signature": "void tearDown()" }, { "arguments": [], "filename": "src/test/org/apache/hama/matrix/TestDenseVector.java", "implementation": "double cos = v1.dot(v2);\r\n assertEquals(cos, cosine);\r\n \r\n boolean except = false;\r\n try {\r\n v1.dot(smallSize);", "signature": "void testDot()" }, { "arguments": [], "filename": "src/test/org/apache/hama/matrix/TestDenseVector.java", "implementation": "int start = 2;\r\n Vector subVector = v1.subVector(start, v1.size() - 1);\r\n Iterator<Writable> it = subVector.iterator();\r\n\r\n int i = start;\r\n while (it.hasNext()) {\r\n assertEquals(v1.get(i), ((DoubleEntry) it.next()).getValue());\r\n i++;", "signature": "void testSubVector()" }, { "arguments": [], "filename": "src/test/org/apache/hama/matrix/TestDenseVector.java", "implementation": "assertEquals(norm1, v1.norm(Vector.Norm.One));", "signature": "void testNom1()" }, { "arguments": [], "filename": "src/test/org/apache/hama/matrix/TestDenseVector.java", "implementation": "assertEquals(norm2, v1.norm(Vector.Norm.Two));", "signature": "void testNom2()" }, { "arguments": [], "filename": "src/test/org/apache/hama/matrix/TestDenseVector.java", "implementation": "assertEquals(normInf, v1.norm(Vector.Norm.Infinity));", "signature": "void testNormInf()" }, { "arguments": [], "filename": "src/test/org/apache/hama/matrix/TestDenseVector.java", "implementation": "assertEquals(norm2Robust, v1.norm(Vector.Norm.TwoRobust));", "signature": "void testNorm2Robust()" }, { "arguments": [], "filename": "src/test/org/apache/hama/matrix/TestDenseVector.java", "implementation": "v2.scale(0.5);\r\n\r\n for (int i = 0; i < v2.size(); i++) {\r\n assertEquals(values[1][i] * 0.5, v2.get(i));", "signature": "void scalingTest()" }, { "arguments": [], "filename": "src/test/org/apache/hama/matrix/TestDenseVector.java", "implementation": "v1.add(v2);\r\n int i = 0;\r\n Iterator<Writable> it = v1.iterator();\r\n while (it.hasNext()) {\r\n DoubleEntry c = (DoubleEntry) it.next();\r\n assertEquals(c.getValue(), values[0][i] + values[1][i]);\r\n i++;", "signature": "void testAdd()" }, { "arguments": [], "filename": "src/test/org/apache/hama/matrix/TestDenseVector.java", "implementation": "v1.set(v2);\r\n \r\n for(int i = 0; i < v1.size(); i ++) {\r\n assertEquals(v2.get(i), v1.get(i));", "signature": "void testSet()" }, { "arguments": [], "filename": "src/test/org/apache/hama/matrix/TestDenseVector.java", "implementation": "((DenseVector) v1).clear();\r\n assertEquals(v1.size(), 0);", "signature": "void testClear()" } ], "patch": "@@ -1,229 +1,204 @@\n-/**\r\n- * Copyright 2007 The Apache Software Foundation\r\n- *\r\n- * Licensed to the Apache Software Foundation (ASF) under one\r\n- * or more contributor license agreements. See the NOTICE file\r\n- * distributed with this work for additional information\r\n- * regarding copyright ownership. The ASF licenses this file\r\n- * to you under the Apache License, Version 2.0 (the\r\n- * \"License\"); you may not use this file except in compliance\r\n- * with the License. You may obtain a copy of the License at\r\n- *\r\n- * http://www.apache.org/licenses/LICENSE-2.0\r\n- *\r\n- * Unless required by applicable law or agreed to in writing, software\r\n- * distributed under the License is distributed on an \"AS IS\" BASIS,\r\n- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r\n- * See the License for the specific language governing permissions and\r\n- * limitations under the License.\r\n- */\r\n-package org.apache.hama.matrix;\r\n-\r\n-import java.io.IOException;\r\n-import java.util.Iterator;\r\n-\r\n-import junit.extensions.TestSetup;\r\n-import junit.framework.Test;\r\n-import junit.framework.TestCase;\r\n-import junit.framework.TestSuite;\r\n-\r\n-import org.apache.commons.logging.Log;\r\n-import org.apache.commons.logging.LogFactory;\r\n-import org.apache.hadoop.io.Writable;\r\n-import org.apache.hama.io.DoubleEntry;\r\n-import org.apache.hama.matrix.DenseMatrix;\r\n-import org.apache.hama.matrix.DenseVector;\r\n-import org.apache.hama.matrix.Vector;\r\n-\r\n-public class TestDenseVector extends TestCase {\r\n- final static Log LOG = LogFactory.getLog(TestDenseVector.class.getName());\r\n- \r\n- private static final double cosine = 0.6978227007909176;\r\n- private static final double norm1 = 12.0;\r\n- private static final double norm2 = 6.782329983125268;\r\n- private static final double normInf = 5.0;\r\n- private static final double norm2Robust = 6.782329983125269;\r\n- private static double[][] values = { { 2, 5, 1, 4 }, { 4, 1, 3, 3 } };\r\n- private static DenseMatrix m1;\r\n- private static DenseVector v1;\r\n- private static DenseVector v2;\r\n- private static DenseVector smallSize = new DenseVector();\r\n- \r\n- public static Test suite() {\r\n- TestSetup setup = new TestSetup(new TestSuite(TestDenseVector.class)) {\r\n- protected void setUp() throws Exception {\r\n- HCluster hCluster = new HCluster();\r\n- hCluster.setUp();\r\n-\r\n- m1 = new DenseMatrix(hCluster.getConf(), 2, 4);\r\n-\r\n- for (int i = 0; i < 2; i++)\r\n- for (int j = 0; j < 4; j++)\r\n- m1.set(i, j, values[i][j]);\r\n-\r\n- v1 = m1.getRow(0);\r\n- v2 = m1.getRow(1);\r\n- smallSize.set(0, 0.5);\r\n- }\r\n-\r\n- protected void tearDown() {\r\n- LOG.info(\"tearDown()\");\r\n- }\r\n- };\r\n- return setup;\r\n- }\r\n-\r\n- /**\r\n- * Test |a| dot |b|\r\n- */\r\n- public void testDot() {\r\n- double cos = v1.dot(v2);\r\n- assertEquals(cos, cosine);\r\n- \r\n- boolean except = false;\r\n- try {\r\n- v1.dot(smallSize);\r\n- } catch (IndexOutOfBoundsException e) {\r\n- except = true;\r\n- }\r\n- \r\n- assertTrue(except);\r\n- }\r\n-\r\n- public void testSubVector() {\r\n- int start = 2;\r\n- Vector subVector = v1.subVector(start, v1.size() - 1);\r\n- Iterator<Writable> it = subVector.iterator();\r\n-\r\n- int i = start;\r\n- while (it.hasNext()) {\r\n- assertEquals(v1.get(i), ((DoubleEntry) it.next()).getValue());\r\n- i++;\r\n- }\r\n- }\r\n-\r\n- /**\r\n- * Test norm one\r\n- */\r\n- public void testNom1() {\r\n- assertEquals(norm1, v1.norm(Vector.Norm.One));\r\n- }\r\n-\r\n- /**\r\n- * Test norm two\r\n- */\r\n- public void testNom2() {\r\n- assertEquals(norm2, v1.norm(Vector.Norm.Two));\r\n- }\r\n-\r\n- /**\r\n- * Test infinity norm\r\n- */\r\n- public void testNormInf() {\r\n- assertEquals(normInf, v1.norm(Vector.Norm.Infinity));\r\n- }\r\n- \r\n- /**\r\n- * Test infinity norm\r\n- */\r\n- public void testNorm2Robust() {\r\n- assertEquals(norm2Robust, v1.norm(Vector.Norm.TwoRobust));\r\n- }\r\n- \r\n- /**\r\n- * Test scaling\r\n- */\r\n- public void scalingTest() {\r\n- v2.scale(0.5);\r\n-\r\n- for (int i = 0; i < v2.size(); i++) {\r\n- assertEquals(values[1][i] * 0.5, v2.get(i));\r\n- }\r\n- }\r\n-\r\n- /**\r\n- * Test get/set methods\r\n- * @throws IOException \r\n- */\r\n- public void testGetSet() throws IOException {\r\n- assertEquals(v1.get(0), values[0][0]);\r\n- boolean ex = false;\r\n- try {\r\n- v1.get(5);\r\n- } catch (NullPointerException e) {\r\n- ex = true;\r\n- }\r\n- assertTrue(ex);\r\n- assertEquals(m1.getColumn(0).size(), 2);\r\n- }\r\n-\r\n- /**\r\n- * Test add()\r\n- */\r\n- public void testAdd() {\r\n- v1.add(v2);\r\n- int i = 0;\r\n- Iterator<Writable> it = v1.iterator();\r\n- while (it.hasNext()) {\r\n- DoubleEntry c = (DoubleEntry) it.next();\r\n- assertEquals(c.getValue(), values[0][i] + values[1][i]);\r\n- i++;\r\n- }\r\n-\r\n- v1.add(0.5, v2);\r\n- int j = 0;\r\n- Iterator<Writable> itt = v1.iterator();\r\n- while (itt.hasNext()) {\r\n- DoubleEntry c = (DoubleEntry) itt.next();\r\n- assertEquals(c.getValue(), (values[0][j] + values[1][j]) + (0.5 * values[1][j]));\r\n- j++;\r\n- }\r\n- \r\n- double old = v1.get(0);\r\n- v1.add(0, norm1);\r\n- assertEquals(v1.get(0), old + norm1);\r\n- \r\n- boolean except = false;\r\n- try {\r\n- v1.add(smallSize);\r\n- } catch (IndexOutOfBoundsException e) {\r\n- except = true;\r\n- }\r\n- \r\n- assertTrue(except);\r\n- \r\n- except = false;\r\n- try {\r\n- v1.add(0.6, smallSize);\r\n- } catch (IndexOutOfBoundsException e) {\r\n- except = true;\r\n- }\r\n- \r\n- assertTrue(except);\r\n- }\r\n- \r\n- public void testSet() {\r\n- v1.set(v2);\r\n- \r\n- for(int i = 0; i < v1.size(); i ++) {\r\n- assertEquals(v2.get(i), v1.get(i));\r\n- }\r\n- \r\n- boolean except = false;\r\n- try {\r\n- v1.set(0.6, smallSize);\r\n- } catch (IndexOutOfBoundsException e) {\r\n- except = true;\r\n- }\r\n- \r\n- assertTrue(except);\r\n- }\r\n- \r\n- /**\r\n- * Clear test\r\n- */\r\n- public void testClear() {\r\n- ((DenseVector) v1).clear();\r\n- assertEquals(v1.size(), 0);\r\n- }\r\n-}\r\n+/**\n+ * Copyright 2007 The Apache Software Foundation\n+ *\n+ * Licensed to the Apache Software Foundation (ASF) under one\n+ * or more contributor license agreements. See the NOTICE file\n+ * distributed with this work for additional information\n+ * regarding copyright ownership. The ASF licenses this file\n+ * to you under the Apache License, Version 2.0 (the\n+ * \"License\"); you may not use this file except in compliance\n+ * with the License. You may obtain a copy of the License at\n+ *\n+ * http://www.apache.org/licenses/LICENSE-2.0\n+ *\n+ * Unless required by applicable law or agreed to in writing, software\n+ * distributed under the License is distributed on an \"AS IS\" BASIS,\n+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ * See the License for the specific language governing permissions and\n+ * limitations under the License.\n+ */\n+package org.apache.hama.matrix;\n+\n+import java.io.IOException;\n+import java.io.UnsupportedEncodingException;\n+import java.util.Iterator;\n+\n+import org.apache.commons.logging.Log;\n+import org.apache.commons.logging.LogFactory;\n+import org.apache.hadoop.io.Writable;\n+import org.apache.hama.HamaCluster;\n+import org.apache.hama.io.DoubleEntry;\n+\n+public class TestDenseVector extends HamaCluster {\n+ final static Log LOG = LogFactory.getLog(TestDenseVector.class.getName());\n+\n+ private final double cosine = 0.6978227007909176;\n+ private final double norm1 = 12.0;\n+ private final double norm2 = 6.782329983125268;\n+ private final double normInf = 5.0;\n+ private final double norm2Robust = 6.782329983125269;\n+ private double[][] values = { { 2, 5, 1, 4 }, { 4, 1, 3, 3 } };\n+ private DenseMatrix m1;\n+ private DenseVector v1;\n+ private DenseVector v2;\n+ private DenseVector smallSize = new DenseVector();\n+\n+ /**\n+ * @throws UnsupportedEncodingException\n+ */\n+ public TestDenseVector() throws UnsupportedEncodingException {\n+ super();\n+ }\n+\n+ public void setUp() throws Exception {\n+ super.setUp();\n+\n+ m1 = new DenseMatrix(getConf(), 2, 4);\n+\n+ for (int i = 0; i < 2; i++)\n+ for (int j = 0; j < 4; j++)\n+ m1.set(i, j, values[i][j]);\n+\n+ v1 = m1.getRow(0);\n+ v2 = m1.getRow(1);\n+ smallSize.set(0, 0.5);\n+ }\n+\n+ /**\n+ * @throws IOException \n+ */\n+ public void testDenseVector() throws IOException {\n+ double cos = v1.dot(v2);\n+ assertEquals(cos, cosine);\n+\n+ boolean except = false;\n+ try {\n+ v1.dot(smallSize);\n+ } catch (IndexOutOfBoundsException e) {\n+ except = true;\n+ }\n+ \n+ assertTrue(except);\n+ subVector();\n+ \n+ assertEquals(norm1, v1.norm(Vector.Norm.One));\n+ assertEquals(norm2, v1.norm(Vector.Norm.Two));\n+ assertEquals(normInf, v1.norm(Vector.Norm.Infinity));\n+ assertEquals(norm2Robust, v1.norm(Vector.Norm.TwoRobust));\n+\n+ getSetTest();\n+ add();\n+ scalingTest();\n+ setTest();\n+ clear();\n+ }\n+\n+ /**\n+ * Test scaling\n+ */\n+ public void scalingTest() {\n+ v2.scale(0.5);\n+\n+ for (int i = 0; i < v2.size(); i++) {\n+ assertEquals(values[1][i] * 0.5, v2.get(i));\n+ }\n+ }\n+\n+ /**\n+ * Test get/set methods\n+ * @throws IOException \n+ */\n+ public void getSetTest() throws IOException {\n+ assertEquals(v1.get(0), values[0][0]);\n+ boolean ex = false;\n+ try {\n+ v1.get(5);\n+ } catch (NullPointerException e) {\n+ ex = true;\n+ }\n+ assertTrue(ex);\n+ assertEquals(m1.getColumn(0).size(), 2);\n+ }\n+\n+ /**\n+ * Test add()\n+ */\n+ public void add() {\n+ v1.add(v2);\n+ int i = 0;\n+ Iterator<Writable> it = v1.iterator();\n+ while (it.hasNext()) {\n+ DoubleEntry c = (DoubleEntry) it.next();\n+ assertEquals(c.getValue(), values[0][i] + values[1][i]);\n+ i++;\n+ }\n+\n+ v1.add(0.5, v2);\n+ int j = 0;\n+ Iterator<Writable> itt = v1.iterator();\n+ while (itt.hasNext()) {\n+ DoubleEntry c = (DoubleEntry) itt.next();\n+ assertEquals(c.getValue(), (values[0][j] + values[1][j]) + (0.5 * values[1][j]));\n+ j++;\n+ }\n+ \n+ double old = v1.get(0);\n+ v1.add(0, norm1);\n+ assertEquals(v1.get(0), old + norm1);\n+ \n+ boolean except = false;\n+ try {\n+ v1.add(smallSize);\n+ } catch (IndexOutOfBoundsException e) {\n+ except = true;\n+ }\n+ \n+ assertTrue(except);\n+ \n+ except = false;\n+ try {\n+ v1.add(0.6, smallSize);\n+ } catch (IndexOutOfBoundsException e) {\n+ except = true;\n+ }\n+ \n+ assertTrue(except);\n+ }\n+ \n+ public void setTest() {\n+ v1.set(v2);\n+\n+ for(int i = 0; i < v1.size(); i ++) {\n+ assertEquals(v2.get(i), v1.get(i));\n+ }\n+ \n+ boolean except = false;\n+ try {\n+ v1.set(0.6, smallSize);\n+ } catch (IndexOutOfBoundsException e) {\n+ except = true;\n+ }\n+ \n+ assertTrue(except);\n+ }\n+ \n+ public void subVector() {\n+ int start = 2;\n+ Vector subVector = v1.subVector(start, v1.size() - 1);\n+ Iterator<Writable> it = subVector.iterator();\n+\n+ int i = start;\n+ while (it.hasNext()) {\n+ assertEquals(v1.get(i), ((DoubleEntry) it.next()).getValue());\n+ i++;\n+ }\n+ }\n+ \n+ /**\n+ * Clear test\n+ */\n+ public void clear() {\n+ ((DenseVector) v1).clear();\n+ assertEquals(v1.size(), 0);\n+ }\n+}", "raw_url": "https://github.com/apache/hama/raw/42584cd5328fc55a499d318dda6fefff6459242c/src%2Ftest%2Forg%2Fapache%2Fhama%2Fmatrix%2FTestDenseVector.java", "sha": "5abfb33047adfd7dbd1a8699cd5e5f261bf37fea", "status": "modified" }, { "additions": 25, "blob_url": "https://github.com/apache/hama/blob/42584cd5328fc55a499d318dda6fefff6459242c/src%2Ftest%2Forg%2Fapache%2Fhama%2Fmatrix%2FTestMatrixVectorMult.java", "changes": 66, "contents_url": "https://api.github.com/repos/apache/hama/contents/src%2Ftest%2Forg%2Fapache%2Fhama%2Fmatrix%2FTestMatrixVectorMult.java?ref=42584cd5328fc55a499d318dda6fefff6459242c", "deletions": 41, "filename": "src/test/org/apache/hama/matrix/TestMatrixVectorMult.java", "new_code": "import java.io.UnsupportedEncodingException;\nimport org.apache.hama.HamaCluster;\npublic class TestMatrixVectorMult extends HamaCluster {\n private Matrix m1, m2;\n private HamaConfiguration conf;\n private double[][] result = { { 5 }, { 11 } };\n /**\n * @throws UnsupportedEncodingException\n */\n public TestMatrixVectorMult() throws UnsupportedEncodingException {\n super();\n }\n public void setUp() throws Exception {\n super.setUp();\n conf = getConf();\n m1 = new DenseMatrix(conf, \"A\", true);\n m1.setDimension(2, 2);\n m1.set(0, 0, 1);\n m1.set(0, 1, 2);\n m1.set(1, 0, 3);\n m1.set(1, 1, 4);\n m2 = new DenseMatrix(conf, \"B\", true);\n m2.setDimension(2, 1);\n m2.set(0, 0, 1);\n m2.set(1, 0, 2);", "new_methods": [], "old_code": "import junit.extensions.TestSetup;\nimport junit.framework.Test;\nimport junit.framework.TestCase;\nimport junit.framework.TestSuite;\n\npublic class TestMatrixVectorMult extends TestCase {\n private static Matrix m1;\n private static Matrix m2;\n private static HamaConfiguration conf;\n private static double[][] result = { { 5 }, { 11 } };\n\n public static Test suite() {\n TestSetup setup = new TestSetup(new TestSuite(TestMatrixVectorMult.class)) {\n protected void setUp() throws Exception {\n HCluster hCluster = new HCluster();\n hCluster.setUp();\n conf = hCluster.getConf();\n m1 = new DenseMatrix(conf, \"A\", true);\n m1.setDimension(2, 2);\n m1.set(0, 0, 1);\n m1.set(0, 1, 2);\n m1.set(1, 0, 3);\n m1.set(1, 1, 4);\n m2 = new DenseMatrix(conf, \"B\", true);\n m2.setDimension(2, 1);\n m2.set(0, 0, 1);\n m2.set(1, 0, 2);\n }\n protected void tearDown() {\n try {\n closeTest();\n } catch (IOException e) {\n e.printStackTrace();\n }\n }\n };\n return setup;\n }\n public static void closeTest() throws IOException {\n m1.close();\n m2.close();", "old_methods": [ { "arguments": [], "filename": "src/test/org/apache/hama/matrix/TestMatrixVectorMult.java", "implementation": "TestSetup setup = new TestSetup(new TestSuite(TestMatrixVectorMult.class)) {\n protected void setUp() throws Exception {\n HCluster hCluster = new HCluster();\n hCluster.setUp();\n conf = hCluster.getConf();\n m1 = new DenseMatrix(conf, \"A\", true);\n m1.setDimension(2, 2);\n m1.set(0, 0, 1);\n m1.set(0, 1, 2);\n m1.set(1, 0, 3);\n m1.set(1, 1, 4);\n m2 = new DenseMatrix(conf, \"B\", true);\n m2.setDimension(2, 1);\n m2.set(0, 0, 1);\n m2.set(1, 0, 2);", "signature": "Test suite()" }, { "arguments": [], "filename": "src/test/org/apache/hama/matrix/TestMatrixVectorMult.java", "implementation": "try {\n closeTest();", "signature": "void tearDown()" } ], "patch": "@@ -20,56 +20,40 @@\n package org.apache.hama.matrix;\n \n import java.io.IOException;\n+import java.io.UnsupportedEncodingException;\n \n-import junit.extensions.TestSetup;\n-import junit.framework.Test;\n-import junit.framework.TestCase;\n-import junit.framework.TestSuite;\n-\n+import org.apache.hama.HamaCluster;\n import org.apache.hama.HamaConfiguration;\n import org.apache.log4j.Logger;\n \n-public class TestMatrixVectorMult extends TestCase {\n+public class TestMatrixVectorMult extends HamaCluster {\n static final Logger LOG = Logger.getLogger(TestMatrixVectorMult.class);\n- private static Matrix m1;\n- private static Matrix m2;\n- private static HamaConfiguration conf;\n- private static double[][] result = { { 5 }, { 11 } };\n-\n- public static Test suite() {\n- TestSetup setup = new TestSetup(new TestSuite(TestMatrixVectorMult.class)) {\n- protected void setUp() throws Exception {\n- HCluster hCluster = new HCluster();\n- hCluster.setUp();\n+ private Matrix m1, m2;\n+ private HamaConfiguration conf;\n+ private double[][] result = { { 5 }, { 11 } };\n \n- conf = hCluster.getConf();\n+ /**\n+ * @throws UnsupportedEncodingException\n+ */\n+ public TestMatrixVectorMult() throws UnsupportedEncodingException {\n+ super();\n+ }\n \n- m1 = new DenseMatrix(conf, \"A\", true);\n- m1.setDimension(2, 2);\n- m1.set(0, 0, 1);\n- m1.set(0, 1, 2);\n- m1.set(1, 0, 3);\n- m1.set(1, 1, 4);\n- m2 = new DenseMatrix(conf, \"B\", true);\n- m2.setDimension(2, 1);\n- m2.set(0, 0, 1);\n- m2.set(1, 0, 2);\n- }\n+ public void setUp() throws Exception {\n+ super.setUp();\n \n- protected void tearDown() {\n- try {\n- closeTest();\n- } catch (IOException e) {\n- e.printStackTrace();\n- }\n- }\n- };\n- return setup;\n- }\n+ conf = getConf();\n \n- public static void closeTest() throws IOException {\n- m1.close();\n- m2.close();\n+ m1 = new DenseMatrix(conf, \"A\", true);\n+ m1.setDimension(2, 2);\n+ m1.set(0, 0, 1);\n+ m1.set(0, 1, 2);\n+ m1.set(1, 0, 3);\n+ m1.set(1, 1, 4);\n+ m2 = new DenseMatrix(conf, \"B\", true);\n+ m2.setDimension(2, 1);\n+ m2.set(0, 0, 1);\n+ m2.set(1, 0, 2);\n }\n \n public void testMatVectorMult() throws IOException {", "raw_url": "https://github.com/apache/hama/raw/42584cd5328fc55a499d318dda6fefff6459242c/src%2Ftest%2Forg%2Fapache%2Fhama%2Fmatrix%2FTestMatrixVectorMult.java", "sha": "e547dfc18dd947678d685721bd988a41037d017f", "status": "modified" }, { "additions": 43, "blob_url": "https://github.com/apache/hama/blob/42584cd5328fc55a499d318dda6fefff6459242c/src%2Ftest%2Forg%2Fapache%2Fhama%2Fmatrix%2FTestSingularValueDecomposition.java", "changes": 88, "contents_url": "https://api.github.com/repos/apache/hama/contents/src%2Ftest%2Forg%2Fapache%2Fhama%2Fmatrix%2FTestSingularValueDecomposition.java?ref=42584cd5328fc55a499d318dda6fefff6459242c", "deletions": 45, "filename": "src/test/org/apache/hama/matrix/TestSingularValueDecomposition.java", "new_code": "import java.io.UnsupportedEncodingException;\nimport org.apache.hadoop.hbase.client.Get;\nimport org.apache.hama.HamaCluster;\npublic class TestSingularValueDecomposition extends HamaCluster {\n static final Logger LOG = Logger\n .getLogger(TestSingularValueDecomposition.class);\n private DenseMatrix m1;\n private HamaConfiguration conf;\n /**\n * @throws UnsupportedEncodingException\n */\n public TestSingularValueDecomposition() throws UnsupportedEncodingException {\n super();\n }\n public void setUp() throws Exception {\n super.setUp();\n conf = getConf();\n m1 = new DenseMatrix(conf, 2, 2);\n for (int i = 0; i < 2; i++)\n for (int j = 0; j < 2; j++)\n m1.set(i, j, matrixA[i][j]);\n // Let's assume the A = [4 0; 3-5]\n private double[][] matrixA = { { 4, 0 }, { 3, -5 } };\n // A'A = [25 -15; -15 25]\n private double[][] values = { { 25, -15 }, { -15, 25 } };\n // Then, eigenvalues of A'A are 10, 40\n private double[] eigenvalues = { 10, 40 };\n // And, Singular values are 3.1623, 6.3246\n private double[] singularvalues = { 3.1622776601683795, 6.324555320336759 };\n\n\n for (int i = 0; i < m1.getRows(); i++) {\n for (int j = 0; j < m1.getRows(); j++) {\n\n for (int x = 0; x < 2; x++) {\n Get get = new Get(BytesUtil.getRowIndex(x));\n get.addColumn(Bytes.toBytes(JacobiEigenValue.EIVAL));\n double eigenvalue = BytesUtil.bytesToDouble(table.get(get).getCellValue()\n .getValue());\n\n // TODO: need to compute the inverse of S, S(-1)\n // TODO: need to find out the V(T)\n", "new_methods": [], "old_code": "import junit.extensions.TestSetup;\nimport junit.framework.Test;\nimport junit.framework.TestCase;\nimport junit.framework.TestSuite;\n\npublic class TestSingularValueDecomposition extends TestCase {\n static final Logger LOG = Logger.getLogger(TestSingularValueDecomposition.class);\n private static DenseMatrix m1;\n private static HamaConfiguration conf;\n // Let's assume the A = [4 0; 3-5]\n private static double[][] matrixA = {{4, 0}, {3, -5}};\n // A'A = [25 -15; -15 25]\n private static double[][] values = { { 25, -15 }, { -15, 25 } };\n // Then, eigenvalues of A'A are 10, 40 \n private static double[] eigenvalues = { 10, 40};\n // And, Singular values are 3.1623, 6.3246\n private static double[] singularvalues = { 3.1622776601683795, 6.324555320336759 };\n \n public static Test suite() {\n TestSetup setup = new TestSetup(new TestSuite(TestSingularValueDecomposition.class)) {\n protected void setUp() throws Exception {\n HCluster hCluster = new HCluster();\n hCluster.setUp();\n conf = hCluster.getConf();\n m1 = new DenseMatrix(conf, 2, 2);\n for (int i = 0; i < 2; i++)\n for (int j = 0; j < 2; j++)\n m1.set(i, j, matrixA[i][j]);\n }\n protected void tearDown() {\n // do nothing\n }\n };\n return setup;\n \n for(int i = 0; i < m1.getRows(); i++) {\n for(int j = 0; j < m1.getRows(); j++) {\n \n for(int x=0; x<2; x++) {\n double eigenvalue = BytesUtil.bytesToDouble(table.get(BytesUtil.getRowIndex(x), \n Bytes.toBytes(JacobiEigenValue.EIVAL)).getValue());\n \n //TODO: need to compute the inverse of S, S(-1)\n //TODO: need to find out the V(T)\n ", "old_methods": [ { "arguments": [], "filename": "src/test/org/apache/hama/matrix/TestSingularValueDecomposition.java", "implementation": "TestSetup setup = new TestSetup(new TestSuite(TestSingularValueDecomposition.class)) {\n protected void setUp() throws Exception {\n HCluster hCluster = new HCluster();\n hCluster.setUp();\n conf = hCluster.getConf();\n m1 = new DenseMatrix(conf, 2, 2);\n for (int i = 0; i < 2; i++)\n for (int j = 0; j < 2; j++)\n m1.set(i, j, matrixA[i][j]);", "signature": "Test suite()" }, { "arguments": [], "filename": "src/test/org/apache/hama/matrix/TestSingularValueDecomposition.java", "implementation": "// do nothing", "signature": "void tearDown()" } ], "patch": "@@ -20,77 +20,75 @@\n package org.apache.hama.matrix;\n \n import java.io.IOException;\n+import java.io.UnsupportedEncodingException;\n \n-import junit.extensions.TestSetup;\n-import junit.framework.Test;\n-import junit.framework.TestCase;\n-import junit.framework.TestSuite;\n-\n+import org.apache.hadoop.hbase.client.Get;\n import org.apache.hadoop.hbase.client.HTable;\n import org.apache.hadoop.hbase.util.Bytes;\n+import org.apache.hama.HamaCluster;\n import org.apache.hama.HamaConfiguration;\n import org.apache.hama.matrix.algebra.JacobiEigenValue;\n import org.apache.hama.util.BytesUtil;\n import org.apache.log4j.Logger;\n \n-public class TestSingularValueDecomposition extends TestCase {\n- static final Logger LOG = Logger.getLogger(TestSingularValueDecomposition.class);\n- private static DenseMatrix m1;\n- private static HamaConfiguration conf;\n+public class TestSingularValueDecomposition extends HamaCluster {\n+ static final Logger LOG = Logger\n+ .getLogger(TestSingularValueDecomposition.class);\n+ private DenseMatrix m1;\n+ private HamaConfiguration conf;\n \n- // Let's assume the A = [4 0; 3-5]\n- private static double[][] matrixA = {{4, 0}, {3, -5}};\n- // A'A = [25 -15; -15 25]\n- private static double[][] values = { { 25, -15 }, { -15, 25 } };\n- // Then, eigenvalues of A'A are 10, 40 \n- private static double[] eigenvalues = { 10, 40};\n- // And, Singular values are 3.1623, 6.3246\n- private static double[] singularvalues = { 3.1622776601683795, 6.324555320336759 };\n- \n- public static Test suite() {\n- TestSetup setup = new TestSetup(new TestSuite(TestSingularValueDecomposition.class)) {\n- protected void setUp() throws Exception {\n- HCluster hCluster = new HCluster();\n- hCluster.setUp();\n+ /**\n+ * @throws UnsupportedEncodingException\n+ */\n+ public TestSingularValueDecomposition() throws UnsupportedEncodingException {\n+ super();\n+ }\n \n- conf = hCluster.getConf();\n- m1 = new DenseMatrix(conf, 2, 2);\n- for (int i = 0; i < 2; i++)\n- for (int j = 0; j < 2; j++)\n- m1.set(i, j, matrixA[i][j]);\n- }\n+ public void setUp() throws Exception {\n+ super.setUp();\n \n- protected void tearDown() {\n- // do nothing\n- }\n- };\n- return setup;\n+ conf = getConf();\n+ m1 = new DenseMatrix(conf, 2, 2);\n+ for (int i = 0; i < 2; i++)\n+ for (int j = 0; j < 2; j++)\n+ m1.set(i, j, matrixA[i][j]);\n }\n \n+ // Let's assume the A = [4 0; 3-5]\n+ private double[][] matrixA = { { 4, 0 }, { 3, -5 } };\n+ // A'A = [25 -15; -15 25]\n+ private double[][] values = { { 25, -15 }, { -15, 25 } };\n+ // Then, eigenvalues of A'A are 10, 40\n+ private double[] eigenvalues = { 10, 40 };\n+ // And, Singular values are 3.1623, 6.3246\n+ private double[] singularvalues = { 3.1622776601683795, 6.324555320336759 };\n+\n public void testEigenSingularValues() throws IOException {\n Matrix aT = m1.transpose();\n DenseMatrix aTa = (DenseMatrix) aT.mult(m1);\n- \n- for(int i = 0; i < m1.getRows(); i++) {\n- for(int j = 0; j < m1.getRows(); j++) {\n+\n+ for (int i = 0; i < m1.getRows(); i++) {\n+ for (int j = 0; j < m1.getRows(); j++) {\n assertEquals(aTa.get(i, j), values[i][j]);\n }\n }\n- \n+\n // Find the eigen/singular values and vectors of A'A\n aTa.jacobiEigenValue(1);\n HTable table = aTa.getHTable();\n \n- for(int x=0; x<2; x++) {\n- double eigenvalue = BytesUtil.bytesToDouble(table.get(BytesUtil.getRowIndex(x), \n- Bytes.toBytes(JacobiEigenValue.EIVAL)).getValue());\n+ for (int x = 0; x < 2; x++) {\n+ Get get = new Get(BytesUtil.getRowIndex(x));\n+ get.addColumn(Bytes.toBytes(JacobiEigenValue.EIVAL));\n+ double eigenvalue = BytesUtil.bytesToDouble(table.get(get).getCellValue()\n+ .getValue());\n assertTrue(Math.abs(eigenvalues[x] - eigenvalue) < .0000001);\n assertTrue(Math.abs(Math.pow(eigenvalue, 0.5) - singularvalues[x]) < .0000001);\n }\n- \n- //TODO: need to compute the inverse of S, S(-1)\n- //TODO: need to find out the V(T)\n- \n+\n+ // TODO: need to compute the inverse of S, S(-1)\n+ // TODO: need to find out the V(T)\n+\n // Therefore, U= AVS'1=[-0.8944 -0.4472; 0.4472 -0.8944]\n // A = USV'=[4 0; 3 -5]\n }", "raw_url": "https://github.com/apache/hama/raw/42584cd5328fc55a499d318dda6fefff6459242c/src%2Ftest%2Forg%2Fapache%2Fhama%2Fmatrix%2FTestSingularValueDecomposition.java", "sha": "2f5732ddd544ca667283c33d3248d0e164e4b315", "status": "modified" }, { "additions": 23, "blob_url": "https://github.com/apache/hama/blob/42584cd5328fc55a499d318dda6fefff6459242c/src%2Ftest%2Forg%2Fapache%2Fhama%2Fmatrix%2FTestSparseMatrix.java", "changes": 103, "contents_url": "https://api.github.com/repos/apache/hama/contents/src%2Ftest%2Forg%2Fapache%2Fhama%2Fmatrix%2FTestSparseMatrix.java?ref=42584cd5328fc55a499d318dda6fefff6459242c", "deletions": 80, "filename": "src/test/org/apache/hama/matrix/TestSparseMatrix.java", "new_code": "import java.io.UnsupportedEncodingException;\nimport org.apache.hama.HamaCluster;\npublic class TestSparseMatrix extends HamaCluster {\n private int SIZE = 10;\n private SparseMatrix m1;\n private SparseMatrix m2;\n /**\n * @throws UnsupportedEncodingException\n */\n public TestSparseMatrix() throws UnsupportedEncodingException {\n super();\n public void setUp() throws Exception {\n super.setUp();\n m1 = SparseMatrix.random(getConf(), SIZE, SIZE);\n m2 = SparseMatrix.random(getConf(), SIZE, SIZE);\n public void testMult() throws IOException {\n assertTrue(m1.getRows() > 0);\n sparsity();\n \n SparseMatrix result = m1.mult(m2);\n verifyMultResult(m1, m2, result);\n \n public void sparsity() throws IOException {", "new_methods": [], "old_code": "import junit.extensions.TestSetup;\nimport junit.framework.Test;\nimport junit.framework.TestCase;\nimport junit.framework.TestSuite;\n\nimport org.apache.hama.matrix.Matrix.Norm;\npublic class TestSparseMatrix extends TestCase {\n private static int SIZE = 10;\n private static SparseMatrix m1;\n private static SparseMatrix m2;\n\n public static Test suite() {\n TestSetup setup = new TestSetup(new TestSuite(TestSparseMatrix.class)) {\n protected void setUp() throws Exception {\n HCluster hCluster = new HCluster();\n hCluster.setUp();\n\n m1 = SparseMatrix.random(hCluster.getConf(), SIZE, SIZE);\n m2 = SparseMatrix.random(hCluster.getConf(), SIZE, SIZE);\n }\n protected void tearDown() {\n try {\n closeTest();\n } catch (IOException e) {\n e.printStackTrace();\n }\n }\n };\n return setup;\n public static void closeTest() throws IOException {\n m1.close();\n m2.close();\n public void testTranspose() throws IOException {\n SparseMatrix trans = (SparseMatrix) m1.transpose();\n for (int i = 0; i < trans.getRows(); i++) {\n for (int j = 0; j < trans.getColumns(); j++) {\n assertEquals(trans.get(i, j), m1.get(j, i));\n }\n }\n\n public void testSparsity() throws IOException {\n /**\n * Test matrices multiplication\n * \n * @throws IOException\n */\n public void testMatrixMult() throws IOException {\n SparseMatrix result = m1.mult(m2);\n verifyMultResult(m1, m2, result);\n }\n\n public void testNorm1() throws IOException {\n double gap = 0.000001;\n \n double norm1 = m1.norm(Norm.One);\n double verify_norm1 = MatrixTestCommon.verifyNorm1(m1);\n gap = norm1 - verify_norm1;\n LOG.info(\"Norm One : gap \" + gap);\n assertTrue(gap < 0.000001 && gap > -0.000001);\n \n double normInfinity = m1.norm(Norm.Infinity);\n double verify_normInf = MatrixTestCommon.verifyNormInfinity(m1);\n gap = normInfinity - verify_normInf;\n LOG.info(\"Norm Infinity : gap \" + gap);\n assertTrue(gap < 0.000001 && gap > -0.000001);\n \n double normMaxValue = m1.norm(Norm.Maxvalue);\n double verify_normMV = MatrixTestCommon.verifyNormMaxValue(m1);\n gap = normMaxValue - verify_normMV;\n LOG.info(\"Norm MaxValue : gap \" + gap);\n assertTrue(gap < 0.000001 && gap > -0.000001);\n \n double normFrobenius = m1.norm(Norm.Frobenius);\n double verify_normFrobenius = MatrixTestCommon.verifyNormFrobenius(m1);\n gap = normFrobenius - verify_normFrobenius;\n LOG.info(\"Norm Frobenius : gap \" + gap);\n assertTrue(gap < 0.000001 && gap > -0.000001);\n }\n\n ", "old_methods": [ { "arguments": [], "filename": "src/test/org/apache/hama/matrix/TestSparseMatrix.java", "implementation": "TestSetup setup = new TestSetup(new TestSuite(TestSparseMatrix.class)) {\n protected void setUp() throws Exception {\n HCluster hCluster = new HCluster();\n hCluster.setUp();\n\n m1 = SparseMatrix.random(hCluster.getConf(), SIZE, SIZE);\n m2 = SparseMatrix.random(hCluster.getConf(), SIZE, SIZE);", "signature": "Test suite()" }, { "arguments": [], "filename": "src/test/org/apache/hama/matrix/TestSparseMatrix.java", "implementation": "try {\n closeTest();", "signature": "void tearDown()" } ], "patch": "@@ -20,57 +20,39 @@\n package org.apache.hama.matrix;\n \n import java.io.IOException;\n+import java.io.UnsupportedEncodingException;\n \n-import junit.extensions.TestSetup;\n-import junit.framework.Test;\n-import junit.framework.TestCase;\n-import junit.framework.TestSuite;\n-\n-import org.apache.hama.matrix.Matrix.Norm;\n+import org.apache.hama.HamaCluster;\n import org.apache.log4j.Logger;\n \n-public class TestSparseMatrix extends TestCase {\n+public class TestSparseMatrix extends HamaCluster {\n static final Logger LOG = Logger.getLogger(TestSparseMatrix.class);\n- private static int SIZE = 10;\n- private static SparseMatrix m1;\n- private static SparseMatrix m2;\n-\n- public static Test suite() {\n- TestSetup setup = new TestSetup(new TestSuite(TestSparseMatrix.class)) {\n- protected void setUp() throws Exception {\n- HCluster hCluster = new HCluster();\n- hCluster.setUp();\n-\n- m1 = SparseMatrix.random(hCluster.getConf(), SIZE, SIZE);\n- m2 = SparseMatrix.random(hCluster.getConf(), SIZE, SIZE);\n- }\n+ private int SIZE = 10;\n+ private SparseMatrix m1;\n+ private SparseMatrix m2;\n \n- protected void tearDown() {\n- try {\n- closeTest();\n- } catch (IOException e) {\n- e.printStackTrace();\n- }\n- }\n- };\n- return setup;\n+ /**\n+ * @throws UnsupportedEncodingException\n+ */\n+ public TestSparseMatrix() throws UnsupportedEncodingException {\n+ super();\n }\n \n- public static void closeTest() throws IOException {\n- m1.close();\n- m2.close();\n+ public void setUp() throws Exception {\n+ super.setUp();\n+ m1 = SparseMatrix.random(getConf(), SIZE, SIZE);\n+ m2 = SparseMatrix.random(getConf(), SIZE, SIZE);\n }\n \n- public void testTranspose() throws IOException {\n- SparseMatrix trans = (SparseMatrix) m1.transpose();\n- for (int i = 0; i < trans.getRows(); i++) {\n- for (int j = 0; j < trans.getColumns(); j++) {\n- assertEquals(trans.get(i, j), m1.get(j, i));\n- }\n- }\n+ public void testMult() throws IOException {\n+ assertTrue(m1.getRows() > 0);\n+ sparsity();\n+ \n+ SparseMatrix result = m1.mult(m2);\n+ verifyMultResult(m1, m2, result);\n }\n-\n- public void testSparsity() throws IOException {\n+ \n+ public void sparsity() throws IOException {\n boolean appeared = false;\n for (int i = 0; i < m1.getRows(); i++) {\n for (int j = 0; j < m1.getColumns(); j++) {\n@@ -82,44 +64,6 @@ public void testSparsity() throws IOException {\n assertTrue(appeared);\n }\n \n- /**\n- * Test matrices multiplication\n- * \n- * @throws IOException\n- */\n- public void testMatrixMult() throws IOException {\n- SparseMatrix result = m1.mult(m2);\n- verifyMultResult(m1, m2, result);\n- }\n-\n- public void testNorm1() throws IOException {\n- double gap = 0.000001;\n- \n- double norm1 = m1.norm(Norm.One);\n- double verify_norm1 = MatrixTestCommon.verifyNorm1(m1);\n- gap = norm1 - verify_norm1;\n- LOG.info(\"Norm One : gap \" + gap);\n- assertTrue(gap < 0.000001 && gap > -0.000001);\n- \n- double normInfinity = m1.norm(Norm.Infinity);\n- double verify_normInf = MatrixTestCommon.verifyNormInfinity(m1);\n- gap = normInfinity - verify_normInf;\n- LOG.info(\"Norm Infinity : gap \" + gap);\n- assertTrue(gap < 0.000001 && gap > -0.000001);\n- \n- double normMaxValue = m1.norm(Norm.Maxvalue);\n- double verify_normMV = MatrixTestCommon.verifyNormMaxValue(m1);\n- gap = normMaxValue - verify_normMV;\n- LOG.info(\"Norm MaxValue : gap \" + gap);\n- assertTrue(gap < 0.000001 && gap > -0.000001);\n- \n- double normFrobenius = m1.norm(Norm.Frobenius);\n- double verify_normFrobenius = MatrixTestCommon.verifyNormFrobenius(m1);\n- gap = normFrobenius - verify_normFrobenius;\n- LOG.info(\"Norm Frobenius : gap \" + gap);\n- assertTrue(gap < 0.000001 && gap > -0.000001);\n- }\n-\n /**\n * Verifying multiplication result\n * \n@@ -147,5 +91,4 @@ private void verifyMultResult(SparseMatrix m1, SparseMatrix m2,\n }\n }\n }\n- \n }", "raw_url": "https://github.com/apache/hama/raw/42584cd5328fc55a499d318dda6fefff6459242c/src%2Ftest%2Forg%2Fapache%2Fhama%2Fmatrix%2FTestSparseMatrix.java", "sha": "f7d19b275967c37c12bdf3dbeb363b9feb41406c", "status": "modified" }, { "additions": 36, "blob_url": "https://github.com/apache/hama/blob/42584cd5328fc55a499d318dda6fefff6459242c/src%2Ftest%2Forg%2Fapache%2Fhama%2Fmatrix%2FTestSparseVector.java", "changes": 73, "contents_url": "https://api.github.com/repos/apache/hama/contents/src%2Ftest%2Forg%2Fapache%2Fhama%2Fmatrix%2FTestSparseVector.java?ref=42584cd5328fc55a499d318dda6fefff6459242c", "deletions": 37, "filename": "src/test/org/apache/hama/matrix/TestSparseVector.java", "new_code": "import java.io.UnsupportedEncodingException;\nimport org.apache.hadoop.hbase.client.Get;\nimport org.apache.hadoop.hbase.client.Result;\nimport org.apache.hama.HamaCluster;\npublic class TestSparseVector extends HamaCluster {\n private SparseMatrix m1;\n private SparseVector v1;\n private SparseVector v2;\n private double[][] values = { { 2, 0, 0, 4 }, { 0, 0, 3, 3 } };\n /**\n * @throws UnsupportedEncodingException\n */\n public TestSparseVector() throws UnsupportedEncodingException {\n super();\n }\n public void setUp() throws Exception {\n super.setUp();\n m1 = new SparseMatrix(getConf(), 2, 4);\n for (int i = 0; i < 2; i++)\n for (int j = 0; j < 4; j++)\n m1.set(i, j, values[i][j]);\n v1 = m1.getRow(0);\n v2 = m1.getRow(1);\n Get get = new Get(BytesUtil.getRowIndex(0));\n get.addColumn(BytesUtil.getColumnIndex(1));\n Result r = table.get(get);\n assertTrue(r.getCellValue() == null);\n \n addTest();\n\n public void addTest() {\n\n for (int i = 0; i < values[0].length; i++) {\n for (int i = 0; i < values[0].length; i++) {\n assertEquals(v1.get(i), (values[0][i] + values[1][i])\n + (0.5 * values[1][i]));", "new_methods": [], "old_code": "\nimport junit.extensions.TestSetup;\nimport junit.framework.Test;\nimport junit.framework.TestCase;\nimport junit.framework.TestSuite;\nimport org.apache.hadoop.hbase.io.Cell;\npublic class TestSparseVector extends TestCase {\n private static SparseMatrix m1;\n private static SparseVector v1;\n private static SparseVector v2;\n private static double[][] values = { { 2, 0, 0, 4 }, { 0, 0, 3, 3 } };\n\n public static Test suite() {\n TestSetup setup = new TestSetup(new TestSuite(TestSparseVector.class)) {\n protected void setUp() throws Exception {\n HCluster hCluster = new HCluster();\n hCluster.setUp();\n m1 = new SparseMatrix(hCluster.getConf(), 2, 4);\n for (int i = 0; i < 2; i++)\n for (int j = 0; j < 4; j++)\n m1.set(i, j, values[i][j]);\n v1 = m1.getRow(0);\n v2 = m1.getRow(1);\n }\n protected void tearDown() {\n LOG.info(\"tearDown()\");\n }\n };\n return setup;\n Cell c = table.get(BytesUtil.getRowIndex(0), BytesUtil.getColumnIndex(1));\n assertTrue(c == null);\n \n public void testAdd() {\n \n for(int i = 0; i < values[0].length; i++) {\n for(int i = 0; i < values[0].length; i++) {\n assertEquals(v1.get(i), (values[0][i] + values[1][i]) + (0.5 * values[1][i]));", "old_methods": [ { "arguments": [], "filename": "src/test/org/apache/hama/matrix/TestSparseVector.java", "implementation": "TestSetup setup = new TestSetup(new TestSuite(TestSparseVector.class)) {\n protected void setUp() throws Exception {\n HCluster hCluster = new HCluster();\n hCluster.setUp();\n m1 = new SparseMatrix(hCluster.getConf(), 2, 4);\n for (int i = 0; i < 2; i++)\n for (int j = 0; j < 4; j++)\n m1.set(i, j, values[i][j]);\n v1 = m1.getRow(0);\n v2 = m1.getRow(1);", "signature": "Test suite()" }, { "arguments": [], "filename": "src/test/org/apache/hama/matrix/TestSparseVector.java", "implementation": "LOG.info(\"tearDown()\");", "signature": "void tearDown()" } ], "patch": "@@ -20,46 +20,40 @@\n package org.apache.hama.matrix;\n \n import java.io.IOException;\n-\n-import junit.extensions.TestSetup;\n-import junit.framework.Test;\n-import junit.framework.TestCase;\n-import junit.framework.TestSuite;\n+import java.io.UnsupportedEncodingException;\n \n import org.apache.commons.logging.Log;\n import org.apache.commons.logging.LogFactory;\n+import org.apache.hadoop.hbase.client.Get;\n import org.apache.hadoop.hbase.client.HTable;\n-import org.apache.hadoop.hbase.io.Cell;\n+import org.apache.hadoop.hbase.client.Result;\n+import org.apache.hama.HamaCluster;\n import org.apache.hama.util.BytesUtil;\n \n-public class TestSparseVector extends TestCase {\n+public class TestSparseVector extends HamaCluster {\n final static Log LOG = LogFactory.getLog(TestSparseVector.class.getName());\n- private static SparseMatrix m1;\n- private static SparseVector v1;\n- private static SparseVector v2;\n- private static double[][] values = { { 2, 0, 0, 4 }, { 0, 0, 3, 3 } };\n-\n- public static Test suite() {\n- TestSetup setup = new TestSetup(new TestSuite(TestSparseVector.class)) {\n- protected void setUp() throws Exception {\n- HCluster hCluster = new HCluster();\n- hCluster.setUp();\n+ private SparseMatrix m1;\n+ private SparseVector v1;\n+ private SparseVector v2;\n+ private double[][] values = { { 2, 0, 0, 4 }, { 0, 0, 3, 3 } };\n \n- m1 = new SparseMatrix(hCluster.getConf(), 2, 4);\n+ /**\n+ * @throws UnsupportedEncodingException\n+ */\n+ public TestSparseVector() throws UnsupportedEncodingException {\n+ super();\n+ }\n \n- for (int i = 0; i < 2; i++)\n- for (int j = 0; j < 4; j++)\n- m1.set(i, j, values[i][j]);\n+ public void setUp() throws Exception {\n+ super.setUp();\n+ m1 = new SparseMatrix(getConf(), 2, 4);\n \n- v1 = m1.getRow(0);\n- v2 = m1.getRow(1);\n- }\n+ for (int i = 0; i < 2; i++)\n+ for (int j = 0; j < 4; j++)\n+ m1.set(i, j, values[i][j]);\n \n- protected void tearDown() {\n- LOG.info(\"tearDown()\");\n- }\n- };\n- return setup;\n+ v1 = m1.getRow(0);\n+ v2 = m1.getRow(1);\n }\n \n /**\n@@ -72,23 +66,28 @@ public void testGetSet() throws IOException {\n assertEquals(v2.get(1), 0.0);\n \n HTable table = m1.getHTable();\n- Cell c = table.get(BytesUtil.getRowIndex(0), BytesUtil.getColumnIndex(1));\n- assertTrue(c == null);\n+ Get get = new Get(BytesUtil.getRowIndex(0));\n+ get.addColumn(BytesUtil.getColumnIndex(1));\n+ Result r = table.get(get);\n+ assertTrue(r.getCellValue() == null);\n+ \n+ addTest();\n }\n- \n+\n /**\n * Test add()\n */\n- public void testAdd() {\n+ public void addTest() {\n v1.add(v2);\n- \n- for(int i = 0; i < values[0].length; i++) {\n+\n+ for (int i = 0; i < values[0].length; i++) {\n assertEquals(v1.get(i), values[0][i] + values[1][i]);\n }\n \n v1.add(0.5, v2);\n- for(int i = 0; i < values[0].length; i++) {\n- assertEquals(v1.get(i), (values[0][i] + values[1][i]) + (0.5 * values[1][i]));\n+ for (int i = 0; i < values[0].length; i++) {\n+ assertEquals(v1.get(i), (values[0][i] + values[1][i])\n+ + (0.5 * values[1][i]));\n }\n }\n }", "raw_url": "https://github.com/apache/hama/raw/42584cd5328fc55a499d318dda6fefff6459242c/src%2Ftest%2Forg%2Fapache%2Fhama%2Fmatrix%2FTestSparseVector.java", "sha": "abb2700c8077f6addd68fae88d631138039a2e5a", "status": "modified" } ]
16
[ { "name": "apache$hama", "new_args": "", "new_implementation": "v1.add(v2);\n int i = 0;\n Iterator<Writable> it = v1.iterator();\n while (it.hasNext()) {\n DoubleEntry c = (DoubleEntry) it.next();\n assertEquals(c.getValue(), values[0][i] + values[1][i]);\n i++;", "new_return_type": "void", "new_signature": "void add()", "old_args": "", "old_implementation": "v1.add(v2);\r\n int i = 0;\r\n Iterator<Writable> it = v1.iterator();\r\n while (it.hasNext()) {\r\n DoubleEntry c = (DoubleEntry) it.next();\r\n assertEquals(c.getValue(), values[0][i] + values[1][i]);\r\n i++;", "old_return_type": "void", "old_signature": "void testAdd()" }, { "name": "apache$hama", "new_args": "", "new_implementation": "((DenseVector) v1).clear();\n assertEquals(v1.size(), 0);", "new_return_type": "void", "new_signature": "void clear()", "old_args": "", "old_implementation": "((DenseVector) v1).clear();\r\n assertEquals(v1.size(), 0);", "old_return_type": "void", "old_signature": "void testClear()" }, { "name": "apache$hama", "new_args": "", "new_implementation": "v1.set(v2);\n\n for(int i = 0; i < v1.size(); i ++) {\n assertEquals(v2.get(i), v1.get(i));", "new_return_type": "void", "new_signature": "void setTest()", "old_args": "", "old_implementation": "v1.set(v2);\r\n \r\n for(int i = 0; i < v1.size(); i ++) {\r\n assertEquals(v2.get(i), v1.get(i));", "old_return_type": "void", "old_signature": "void testSet()" }, { "name": "apache$hama", "new_args": "", "new_implementation": "int start = 2;\n Vector subVector = v1.subVector(start, v1.size() - 1);\n Iterator<Writable> it = subVector.iterator();\n\n int i = start;\n while (it.hasNext()) {\n assertEquals(v1.get(i), ((DoubleEntry) it.next()).getValue());\n i++;", "new_return_type": "void", "new_signature": "void subVector()", "old_args": "", "old_implementation": "int start = 2;\r\n Vector subVector = v1.subVector(start, v1.size() - 1);\r\n Iterator<Writable> it = subVector.iterator();\r\n\r\n int i = start;\r\n while (it.hasNext()) {\r\n assertEquals(v1.get(i), ((DoubleEntry) it.next()).getValue());\r\n i++;", "old_return_type": "void", "old_signature": "void testSubVector()" } ]
4
16
5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd
[ { "name": "fluentlenium$fluentlenium", "new_args": "", "new_implementation": "assertThat(fluentWebElement).isInstanceOf(FluentWebElement.class);\n Filter[] filters = new Filter[] {filter1, filter2", "new_return_type": "void", "new_signature": "void canLoopIntoFluentWebElementAfterASearch()", "old_args": "", "old_implementation": "Filter[] filters = new Filter[] { filter1, filter2", "old_return_type": "void", "old_signature": "void can_loop_into_fluentWebElement_after_a_search()" }, { "name": "fluentlenium$fluentlenium", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void checkDollarAndIndexWorks()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void check$AndIndexWorks()" }, { "name": "fluentlenium$fluentlenium", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void checkDollarWorks()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void check$Works()" }, { "name": "fluentlenium$fluentlenium", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void deletagesToWebDriverWhenInitialized()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void deletages_to_webdriver_when_initialized()" }, { "name": "fluentlenium$fluentlenium", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void doNotUseOverridableMethodsInAConstructor()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void do_not_use_overridable_methods_in_a_constructor()" }, { "name": "fluentlenium$fluentlenium", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void getOrCreateDriverWithDifferentTestClassesCreatesDistinctInstances()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void getOrCreateDriver_with_different_test_classes_creates_distinct_instances()" }, { "name": "fluentlenium$fluentlenium", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void getOrCreateDriverWithDifferentTestNamesAndDifferentTestClassAndStrategyOnceCreatesOneInstance()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void getOrCreateDriver_with_different_test_names_and_different_test_class_and_strategy_once_creates_one_instance()" }, { "name": "fluentlenium$fluentlenium", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void getOrCreateDriverWithDifferentTestNamesAndDifferentTestClassAndStrategyPerClassCreatesDistinctInstance()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void getOrCreateDriver_with_different_test_names_and_different_test_class_and_strategy_per_class_creates_distinct_instance()" }, { "name": "fluentlenium$fluentlenium", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void getOrCreateDriverWithDifferentTestNamesAndStrategyPerClassCreatesOneInstance()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void getOrCreateDriver_with_different_test_names_and_strategy_per_class_creates_one_instance()" }, { "name": "fluentlenium$fluentlenium", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void getOrCreateDriverWithDifferentTestNamesCreatesDistinctInstances()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void getOrCreateDriver_with_different_test_names_creates_distinct_instances()" }, { "name": "fluentlenium$fluentlenium", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void getOrCreateDriverWithSameTestNamesCreatesOneInstance()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void getOrCreateDriver_with_same_test_names_creates_one_instance()" }, { "name": "fluentlenium$fluentlenium", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void isDriverAvailableBehavesAsExpected()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void is_driver_available_behaves_as_expected()" }, { "name": "fluentlenium$fluentlenium", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void pagesShouldBeInjected()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void pages_should_be_injected()" }, { "name": "fluentlenium$fluentlenium", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void pagesShouldBeInjected()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void pages_should_be_injected()" }, { "name": "fluentlenium$fluentlenium", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void pagesShouldBeInjected()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void pages_should_be_injected()" }, { "name": "fluentlenium$fluentlenium", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void quitAllShouldQuitAllDrivers()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void quitAll_should_quit_all_drivers()" }, { "name": "fluentlenium$fluentlenium", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void registeringAnotherDriverThrowException()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void registering_another_driver_throw_exception()" }, { "name": "fluentlenium$fluentlenium", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void registeringSameDriverDoesntThrowException()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void registering_same_driver_doesnt_throw_exception()" }, { "name": "fluentlenium$fluentlenium", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void registeringSameDriverMultipleTimeDoesntThrowException()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void registering_same_driver_multiple_time_doesnt_throw_exception()" }, { "name": "fluentlenium$fluentlenium", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void shouldConfigureProperly()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void should_configure_properly()" }, { "name": "fluentlenium$fluentlenium", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void shouldExecuteAsyncScriptReturnString()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void should_executeAsyncScript_return_String()" }, { "name": "fluentlenium$fluentlenium", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void shouldExecuteScriptReturnBoolean()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void should_executeScript_return_Boolean()" }, { "name": "fluentlenium$fluentlenium", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void shouldExecuteScriptReturnDouble()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void should_executeScript_return_Double()" }, { "name": "fluentlenium$fluentlenium", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void shouldExecuteScriptReturnList()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void should_executeScript_return_List()" }, { "name": "fluentlenium$fluentlenium", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void shouldExecuteScriptReturnLong()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void should_executeScript_return_Long()" }, { "name": "fluentlenium$fluentlenium", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void shouldExecuteScriptReturnString()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void should_executeScript_return_String()" }, { "name": "fluentlenium$fluentlenium", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void shouldFindAllFindByRetrieveList()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void should_findAll_findBy_retrieve_list()" }, { "name": "fluentlenium$fluentlenium", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void shouldFindAllFindByRetrieveList()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void should_findAll_findBy_retrieve_list()" }, { "name": "fluentlenium$fluentlenium", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void shouldFindByRetrieveElement()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void should_findBy_retrieve_element()" }, { "name": "fluentlenium$fluentlenium", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void shouldFindByRetrieveList()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void should_findBy_retrieve_list()" }, { "name": "fluentlenium$fluentlenium", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void shouldFindByRetrieveList()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void should_findBy_retrieve_list()" }, { "name": "fluentlenium$fluentlenium", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void shouldFindByRetrievedObjectWorkForSeleniumActions()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void should_findBy_retrieved_object_work_for_selenium_actions()" }, { "name": "fluentlenium$fluentlenium", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void shouldGetElementIntoAFrameWithFluentSwitchTo()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void should_get_element_into_a_frame_with_Fluent_switchTo()" }, { "name": "fluentlenium$fluentlenium", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void shouldGetElementIntoAFrameWithFluentSwitchToDefault()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void should_get_element_into_a_frame_with_Fluent_switchToDefault()" }, { "name": "fluentlenium$fluentlenium", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void shouldGetElementIntoAFrameWithFluentSwitchToBis()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void should_get_element_into_a_frame_with_Fluent_switchTo_bis()" }, { "name": "fluentlenium$fluentlenium", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void shouldGetElementIntoAFrameWithNativeInstructions()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void should_get_element_into_a_frame_with_native_instructions()" }, { "name": "fluentlenium$fluentlenium", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void shouldNewWebDriverCreateNewInstances()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void should_new_web_driver_create_new_instances()" }, { "name": "fluentlenium$fluentlenium", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void testIgnoreAllNegative()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void test_ignoreAll_negative()" }, { "name": "fluentlenium$fluentlenium", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void testIgnoreAllPositive()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void test_ignoreAll_positive()" }, { "name": "fluentlenium$fluentlenium", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void testIgnoring1Negative()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void test_ignoring_1_negative()" }, { "name": "fluentlenium$fluentlenium", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void testIgnoring1Positive()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void test_ignoring_1_positive()" }, { "name": "fluentlenium$fluentlenium", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void testIgnoring2Negative()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void test_ignoring_2_negative()" }, { "name": "fluentlenium$fluentlenium", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void testIgnoring2Positive()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void test_ignoring_2_positive()" }, { "name": "fluentlenium$fluentlenium", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void testInternalFluentWebElementInstantiate()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void test_internal_fluentwebelement_instantiate()" }, { "name": "fluentlenium$fluentlenium", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void testNoException()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void test_no_exception()" }, { "name": "fluentlenium$fluentlenium", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void testNoException()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void test_no_exception()" }, { "name": "fluentlenium$fluentlenium", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void testNoExceptionWhenInnerClass()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void test_no_exception_when_inner_class()" }, { "name": "fluentlenium$fluentlenium", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void testSuperclassFluentWebElementInstantiate()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void test_superclass_fluentwebelement_instantiate()" }, { "name": "fluentlenium$fluentlenium", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void titleOfDuckDuckGoShouldContainSearchQueryName()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void title_of_duck_duck_go_should_contain_search_query_name()" }, { "name": "fluentlenium$fluentlenium", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void whenAElementIsNotPresentThenIsNotPresentReturnTrue()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void when_a_element_is_not_present_then_isNotPresent_return_true()" }, { "name": "fluentlenium$fluentlenium", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void whenAElementIsPresentThenIsNotPresentThrowAnException()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void when_a_element_is_present_then_isNotPresent_throw_an_exception()" }, { "name": "fluentlenium$fluentlenium", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void whenBrowserDoNotImplementsJavascriptExecutorThrowsException()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void when_browser_do_not_implemets_Javascript_executor_throws_exception()" }, { "name": "fluentlenium$fluentlenium", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void whenBrowserDoesAcceptScreenshotThenNoException()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void when_browser_does_accept_screenshot_then_no_exception()" }, { "name": "fluentlenium$fluentlenium", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void whenBrowserDoesntAcceptScreenshotThenCustomError()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void when_browser_doesnt_accept_screenshot_then_custom_error()" }, { "name": "fluentlenium$fluentlenium", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void whenBrowserImplementsJavascriptExecutorThenGoToPredicate()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void when_browser_implemets_Javascript_executor_then_go_to_predicate()" }, { "name": "fluentlenium$fluentlenium", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void whenDefaultSharedDriverThenDriverIsClosedAfterMethodCall()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void when_default_shared_driver_then_driver_is_closed_after_method_call()" }, { "name": "fluentlenium$fluentlenium", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void whenElementIsDisplayedThenAreNotDisplayedThrowsException()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void when_element_is_displayed_then_areNotDisplayed_throws_exception()" }, { "name": "fluentlenium$fluentlenium", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void whenElementIsDisplayedThenAreNotDisplayedThrowsException()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void when_element_is_displayed_then_areNotDisplayed_throws_exception()" }, { "name": "fluentlenium$fluentlenium", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void whenElementIsDisplayedThenIsNotDisplayedThrowsException()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void when_element_is_displayed_then_isNotDisplayed_throws_exception()" }, { "name": "fluentlenium$fluentlenium", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void whenElementIsDisplayedThenIsNotDisplayedThrowsException()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void when_element_is_displayed_then_isNotDisplayed_throws_exception()" }, { "name": "fluentlenium$fluentlenium", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void whenElementIsEnabledThenAreEnabledReturnTrue()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void when_element_is_enabled_then_areEnabled_return_true()" }, { "name": "fluentlenium$fluentlenium", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void whenElementIsEnabledThenAreEnabledReturnTrue()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void when_element_is_enabled_then_areEnabled_return_true()" }, { "name": "fluentlenium$fluentlenium", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void whenElementIsEnabledThenIsEnabledReturnTrue()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void when_element_is_enabled_then_isEnabled_return_true()" }, { "name": "fluentlenium$fluentlenium", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void whenElementIsEnabledThenIsEnabledReturnTrue()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void when_element_is_enabled_then_isEnabled_return_true()" }, { "name": "fluentlenium$fluentlenium", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void whenElementIsNotDisplayedThenAreDisplayedThrowsException()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void when_element_is_not_displayed_then_areDisplayed_throws_exception()" }, { "name": "fluentlenium$fluentlenium", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void whenElementIsNotDisplayedThenAreDisplayedThrowsException()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void when_element_is_not_displayed_then_areDisplayed_throws_exception()" }, { "name": "fluentlenium$fluentlenium", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void whenElementIsNotDisplayedThenAreNotDisplayedReturnTrue()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void when_element_is_not_displayed_then_areNotDisplayed_return_true()" }, { "name": "fluentlenium$fluentlenium", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void whenElementIsNotDisplayedThenAreNotDisplayedReturnTrue()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void when_element_is_not_displayed_then_areNotDisplayed_return_true()" }, { "name": "fluentlenium$fluentlenium", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void whenElementIsNotDisplayedThenIsDisplayedThrowsException()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void when_element_is_not_displayed_then_isDisplayed_throws_exception()" }, { "name": "fluentlenium$fluentlenium", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void whenElementIsNotDisplayedThenIsDisplayedThrowsException()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void when_element_is_not_displayed_then_isDisplayed_throws_exception()" }, { "name": "fluentlenium$fluentlenium", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void whenElementIsNotDisplayedThenIsNotDisplayedReturnTrue()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void when_element_is_not_displayed_then_isNotDisplayed_return_true()" }, { "name": "fluentlenium$fluentlenium", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void whenElementIsNotDisplayedThenIsNotDisplayedReturnTrue()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void when_element_is_not_displayed_then_isNotDisplayed_return_true()" }, { "name": "fluentlenium$fluentlenium", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void whenElementIsNotDisplayedThenIsPresentReturnTrue()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void when_element_is_not_displayed_then_isPresent_return_true()" }, { "name": "fluentlenium$fluentlenium", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void whenElementIsNotDisplayedThenIsPresentReturnTrue()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void when_element_is_not_displayed_then_isPresent_return_true()" }, { "name": "fluentlenium$fluentlenium", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void whenElementIsNotEnabledThenAreEnabledThrowsException()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void when_element_is_not_enabled_then_areEnabled_throws_exception()" }, { "name": "fluentlenium$fluentlenium", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void whenElementIsNotEnabledThenAreEnabledThrowsException()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void when_element_is_not_enabled_then_areEnabled_throws_exception()" }, { "name": "fluentlenium$fluentlenium", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void whenElementIsNotEnabledThenIsEnabledThrowsException()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void when_element_is_not_enabled_then_isEnabled_throws_exception()" }, { "name": "fluentlenium$fluentlenium", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void whenElementIsNotEnabledThenIsEnabledThrowsException()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void when_element_is_not_enabled_then_isEnabled_throws_exception()" }, { "name": "fluentlenium$fluentlenium", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void whenElementIsNotEnabledThenIsNotEnabledReturnTrue()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void when_element_is_not_enabled_then_isNotEnabled_return_true()" }, { "name": "fluentlenium$fluentlenium", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void whenElementIsNotPresentThenAreNotDisplayedReturnTrue()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void when_element_is_not_present_then_areNotDisplayed_return_true()" }, { "name": "fluentlenium$fluentlenium", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void whenElementIsNotPresentThenAreNotDisplayedReturnTrue()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void when_element_is_not_present_then_areNotDisplayed_return_true()" }, { "name": "fluentlenium$fluentlenium", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void whenElementIsNotPresentThenIsNotDisplayedReturnTrue()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void when_element_is_not_present_then_isNotDisplayed_return_true()" }, { "name": "fluentlenium$fluentlenium", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void whenElementIsNotPresentThenIsNotDisplayedReturnTrue()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void when_element_is_not_present_then_isNotDisplayed_return_true()" }, { "name": "fluentlenium$fluentlenium", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void whenElementIsPresentThenAreDisplayedReturnTrue()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void when_element_is_present_then_areDisplayed_return_true()" }, { "name": "fluentlenium$fluentlenium", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void whenElementIsPresentThenAreDisplayedReturnTrue()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void when_element_is_present_then_areDisplayed_return_true()" }, { "name": "fluentlenium$fluentlenium", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void whenElementIsPresentThenIsDisplayedReturnTrue()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void when_element_is_present_then_isDisplayed_return_true()" }, { "name": "fluentlenium$fluentlenium", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void whenElementIsPresentThenIsDisplayedReturnTrue()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void when_element_is_present_then_isDisplayed_return_true()" }, { "name": "fluentlenium$fluentlenium", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void whenInitFailsTestIsNotCalled()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void when_init_fails_test_is_not_called()" }, { "name": "fluentlenium$fluentlenium", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void whenNoErrorEverythingIsCalled()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void when_no_error_everything_is_called()" }, { "name": "fluentlenium$fluentlenium", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void whenSingleElementIsEnabledThenIsEnabledReturnTrue()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void when_single_element_is_enabled_then_isEnabled_return_true()" }, { "name": "fluentlenium$fluentlenium", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void whenSingleElementIsNotEnabledThenIsEnabledThrowsException()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void when_single_element_is_not_enabled_then_isEnabled_throws_exception()" }, { "name": "fluentlenium$fluentlenium", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void whenSingleElementIsNotEnabledThenIsNotEnabledReturnTrue()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void when_single_element_is_not_enabled_then_isNotEnabled_return_true()" }, { "name": "fluentlenium$fluentlenium", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void whenSingleNonexistingElementThenIsEnabledThrowsException()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void when_single_nonexisting_element_then_isEnabled_throws_exception()" }, { "name": "fluentlenium$fluentlenium", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void whenWebElementInTestThenTheyAreInstanciated()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void when_web_element_in_test_then_they_are_instanciated()" }, { "name": "fluentlenium$fluentlenium", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void whenWebElementInTestThenTheyAreInstanciated()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void when_web_element_in_test_then_they_are_instanciated()" }, { "name": "fluentlenium$fluentlenium", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void whenWebElementInTestThenTheyAreInstanciated()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void when_web_element_in_test_then_they_are_instanciated()" } ]
[ { "additions": 1, "blob_url": "https://github.com/FluentLenium/FluentLenium/blob/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/deploy-settings.xml", "changes": 2, "contents_url": "https://api.github.com/repos/FluentLenium/FluentLenium/contents/deploy-settings.xml?ref=5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd", "deletions": 1, "filename": "deploy-settings.xml", "new_code": "</settings>", "new_methods": [], "old_code": "</settings>", "old_methods": [], "patch": "@@ -6,4 +6,4 @@\n <password>${env.CI_DEPLOY_PASSWORD}</password>\n </server>\n </servers>\n-</settings>\n\\ No newline at end of file\n+</settings>", "raw_url": "https://github.com/FluentLenium/FluentLenium/raw/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/deploy-settings.xml", "sha": "eeedbf9ebbf33ab0c9b8f6f1510899365ba7d7e9", "status": "modified" }, { "additions": 7, "blob_url": "https://github.com/FluentLenium/FluentLenium/blob/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/dev-config%2Fcheckstyle%2Ffluentlenium_checks.xml", "changes": 8, "contents_url": "https://api.github.com/repos/FluentLenium/FluentLenium/contents/dev-config%2Fcheckstyle%2Ffluentlenium_checks.xml?ref=5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd", "deletions": 1, "filename": "dev-config/checkstyle/fluentlenium_checks.xml", "new_code": " <property name=\"fileExtensions\" value=\"java, js, json, xml, yml\"/>\n\n <property name=\"option\" value=\"nl\"/>\n <!--\n -->\n <property name=\"protectedAllowed\" value=\"true\"/>\n <property name=\"packageAllowed\" value=\"true\"/>", "new_methods": [], "old_code": " <property name=\"option\" value=\"eol\"/>", "old_methods": [], "patch": "@@ -22,6 +22,8 @@\n -->\n \n <module name=\"Checker\">\n+ <property name=\"fileExtensions\" value=\"java, js, json, xml, yml\"/>\n+\n <!-- Ability to turn off checkstyle using comments. Example :\n //CHECKSTYLE.OFF: IllegalCatch - Much more readable than catching 7 exceptions\n catch (Exception e)\n@@ -142,7 +144,7 @@\n <module name=\"NoWhitespaceAfter\"/>\n <module name=\"NoWhitespaceBefore\"/>\n <module name=\"OperatorWrap\">\n- <property name=\"option\" value=\"eol\"/>\n+ <property name=\"option\" value=\"nl\"/>\n </module>\n <module name=\"ParenPad\"/>\n <module name=\"TypecastParenPad\"/>\n@@ -176,10 +178,12 @@\n </module>\n <module name=\"IllegalInstantiation\"/>\n <module name=\"InnerAssignment\"/>\n+ <!--\n <module name=\"MagicNumber\">\n <property name=\"ignoreHashCodeMethod\" value=\"true\"/>\n <property name=\"ignoreAnnotation\" value=\"true\"/>\n </module>\n+ -->\n <module name=\"MissingSwitchDefault\"/>\n <module name=\"IllegalThrows\"/>\n <module name=\"SimplifyBooleanExpression\"/>\n@@ -192,6 +196,8 @@\n <module name=\"HideUtilityClassConstructor\"/>\n <module name=\"InterfaceIsType\"/>\n <module name=\"VisibilityModifier\">\n+ <property name=\"protectedAllowed\" value=\"true\"/>\n+ <property name=\"packageAllowed\" value=\"true\"/>\n <property name=\"ignoreAnnotationCanonicalNames\"\n value=\"org.jboss.arquillian.test.api.ArquillianResource,org.junit.Rule\"/>\n <property name=\"immutableClassCanonicalNames\"", "raw_url": "https://github.com/FluentLenium/FluentLenium/raw/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/dev-config%2Fcheckstyle%2Ffluentlenium_checks.xml", "sha": "818f68e82a5ebeee0a83d6d82ada9831699a4ff4", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/FluentLenium/FluentLenium/blob/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/dev-config%2Fidea%2Fcode-style.xml", "changes": 2, "contents_url": "https://api.github.com/repos/FluentLenium/FluentLenium/contents/dev-config%2Fidea%2Fcode-style.xml?ref=5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd", "deletions": 1, "filename": "dev-config/idea/code-style.xml", "new_code": " <option name=\"TERNARY_OPERATION_SIGNS_ON_NEXT_LINE\" value=\"true\"/>", "new_methods": [], "old_code": " <option name=\"SPACE_WITHIN_ARRAY_INITIALIZER_BRACES\" value=\"true\"/>", "old_methods": [], "patch": "@@ -13,7 +13,6 @@\n <option name=\"INDENT_CASE_FROM_SWITCH\" value=\"false\"/>\n <option name=\"ALIGN_MULTILINE_PARAMETERS\" value=\"false\"/>\n <option name=\"ALIGN_MULTILINE_RESOURCES\" value=\"false\"/>\n- <option name=\"SPACE_WITHIN_ARRAY_INITIALIZER_BRACES\" value=\"true\"/>\n <option name=\"SPACE_BEFORE_ARRAY_INITIALIZER_LBRACE\" value=\"true\"/>\n <option name=\"CALL_PARAMETERS_WRAP\" value=\"1\"/>\n <option name=\"METHOD_PARAMETERS_WRAP\" value=\"1\"/>\n@@ -26,6 +25,7 @@\n <option name=\"BINARY_OPERATION_WRAP\" value=\"1\"/>\n <option name=\"BINARY_OPERATION_SIGN_ON_NEXT_LINE\" value=\"true\"/>\n <option name=\"TERNARY_OPERATION_WRAP\" value=\"5\"/>\n+ <option name=\"TERNARY_OPERATION_SIGNS_ON_NEXT_LINE\" value=\"true\"/>\n <option name=\"ARRAY_INITIALIZER_WRAP\" value=\"1\"/>\n <option name=\"WRAP_LONG_LINES\" value=\"true\"/>\n <option name=\"PARAMETER_ANNOTATION_WRAP\" value=\"2\"/>", "raw_url": "https://github.com/FluentLenium/FluentLenium/raw/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/dev-config%2Fidea%2Fcode-style.xml", "sha": "d1e527c2f755b1f385969c2ea7e60c62c2ed4688", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/FluentLenium/FluentLenium/blob/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/dev-config%2Fpmd%2Ffluentlenium_pmd.xml", "changes": 2, "contents_url": "https://api.github.com/repos/FluentLenium/FluentLenium/contents/dev-config%2Fpmd%2Ffluentlenium_pmd.xml?ref=5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd", "deletions": 1, "filename": "dev-config/pmd/fluentlenium_pmd.xml", "new_code": "</ruleset>", "new_methods": [], "old_code": "</ruleset>", "old_methods": [], "patch": "@@ -32,4 +32,4 @@\n <rule ref=\"rulesets/java/unnecessary.xml\"/>\n <rule ref=\"rulesets/java/unusedcode.xml\"/>\n \n-</ruleset>\n\\ No newline at end of file\n+</ruleset>", "raw_url": "https://github.com/FluentLenium/FluentLenium/raw/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/dev-config%2Fpmd%2Ffluentlenium_pmd.xml", "sha": "2cd236d607f103a5533bc2ad529c9aa40a5ef900", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/FluentLenium/FluentLenium/blob/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/examples%2Fquickstart%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fexamples%2Fhooks%2FExampleHookTest.java", "changes": 2, "contents_url": "https://api.github.com/repos/FluentLenium/FluentLenium/contents/examples%2Fquickstart%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fexamples%2Fhooks%2FExampleHookTest.java?ref=5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd", "deletions": 1, "filename": "examples/quickstart/src/test/java/org/fluentlenium/examples/hooks/ExampleHookTest.java", "new_code": " public void titleOfDuckDuckGoShouldContainSearchQueryName() {", "new_methods": [], "old_code": " public void title_of_duck_duck_go_should_contain_search_query_name() {", "old_methods": [], "patch": "@@ -10,7 +10,7 @@\n @Example\n public class ExampleHookTest extends FluentTest {\n @Test\n- public void title_of_duck_duck_go_should_contain_search_query_name() {\n+ public void titleOfDuckDuckGoShouldContainSearchQueryName() {\n goTo(\"https://duckduckgo.com\");\n $(\"#search_form_input_homepage\").fill().with(\"FluentLenium\");\n $(\"#search_button_homepage\").submit();", "raw_url": "https://github.com/FluentLenium/FluentLenium/raw/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/examples%2Fquickstart%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fexamples%2Fhooks%2FExampleHookTest.java", "sha": "2c44ae0d183a56f1b052b23d21f47684076f2c51", "status": "modified" }, { "additions": 6, "blob_url": "https://github.com/FluentLenium/FluentLenium/blob/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/examples%2Fspring%2Fsrc%2Fmain%2Fjava%2Forg%2Ffluentlenium%2Fexample%2Fspring%2Fconfig%2FBrowserConfig.java", "changes": 12, "contents_url": "https://api.github.com/repos/FluentLenium/FluentLenium/contents/examples%2Fspring%2Fsrc%2Fmain%2Fjava%2Forg%2Ffluentlenium%2Fexample%2Fspring%2Fconfig%2FBrowserConfig.java?ref=5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd", "deletions": 6, "filename": "examples/spring/src/main/java/org/fluentlenium/example/spring/config/BrowserConfig.java", "new_code": " * @param browserType browser type\n * @param useHub use hub\n * @param hubLocation hub url\n return browserConfig.usesHub()\n ? browserType.getRemoteWebDriver(browserConfig.getHubLocation())\n : browserType.getWebDriver();", "new_methods": [], "old_code": " * @param browserType\n * @param useHub\n * @param hubLocation\n return browserConfig.usesHub() ?\n browserType.getRemoteWebDriver(browserConfig.getHubLocation()) :\n browserType.getWebDriver();", "old_methods": [], "patch": "@@ -14,9 +14,9 @@ public class BrowserConfig {\n /**\n * Creates a new browser configuration\n *\n- * @param browserType\n- * @param useHub\n- * @param hubLocation\n+ * @param browserType browser type\n+ * @param useHub use hub\n+ * @param hubLocation hub url\n */\n public BrowserConfig(final BrowserType browserType, final boolean useHub, final String hubLocation) {\n this.browserType = browserType;\n@@ -33,9 +33,9 @@ public String getHubLocation() {\n }\n \n public WebDriver resolveDriver(final BrowserConfig browserConfig) {\n- return browserConfig.usesHub() ?\n- browserType.getRemoteWebDriver(browserConfig.getHubLocation()) :\n- browserType.getWebDriver();\n+ return browserConfig.usesHub()\n+ ? browserType.getRemoteWebDriver(browserConfig.getHubLocation())\n+ : browserType.getWebDriver();\n }\n \n }", "raw_url": "https://github.com/FluentLenium/FluentLenium/raw/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/examples%2Fspring%2Fsrc%2Fmain%2Fjava%2Forg%2Ffluentlenium%2Fexample%2Fspring%2Fconfig%2FBrowserConfig.java", "sha": "bcb613b6d722eb318b240407269519de4382e131", "status": "modified" }, { "additions": 2, "blob_url": "https://github.com/FluentLenium/FluentLenium/blob/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/examples%2Fspring%2Fsrc%2Fmain%2Fjava%2Forg%2Ffluentlenium%2Fexample%2Fspring%2Fconfig%2FConfig.java", "changes": 2, "contents_url": "https://api.github.com/repos/FluentLenium/FluentLenium/contents/examples%2Fspring%2Fsrc%2Fmain%2Fjava%2Forg%2Ffluentlenium%2Fexample%2Fspring%2Fconfig%2FConfig.java?ref=5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd", "deletions": 0, "filename": "examples/spring/src/main/java/org/fluentlenium/example/spring/config/Config.java", "new_code": "//CHECKSTYLE.OFF: HideUtilityClassConstructor\n//CHECKSTYLE.ON: HideUtilityClassConstructor", "new_methods": [], "old_code": "", "old_methods": [], "patch": "@@ -7,6 +7,7 @@\n import org.springframework.context.annotation.PropertySources;\n import org.springframework.context.support.PropertySourcesPlaceholderConfigurer;\n \n+//CHECKSTYLE.OFF: HideUtilityClassConstructor\n @Configuration\n @ComponentScan(value = { \"org.fluentlenium.example.spring\" })\n @PropertySources(@PropertySource(\"config.properties\"))\n@@ -16,3 +17,4 @@ public static PropertySourcesPlaceholderConfigurer propertySourcesPlaceholderCon\n return new PropertySourcesPlaceholderConfigurer();\n }\n }\n+//CHECKSTYLE.ON: HideUtilityClassConstructor", "raw_url": "https://github.com/FluentLenium/FluentLenium/raw/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/examples%2Fspring%2Fsrc%2Fmain%2Fjava%2Forg%2Ffluentlenium%2Fexample%2Fspring%2Fconfig%2FConfig.java", "sha": "b3f36965170e39f4a621cf64a4351fbb7a99d937", "status": "modified" }, { "additions": 2, "blob_url": "https://github.com/FluentLenium/FluentLenium/blob/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/examples%2Fspring%2Fsrc%2Fmain%2Fjava%2Forg%2Ffluentlenium%2Fexample%2Fspring%2Fconfig%2FConfigException.java", "changes": 4, "contents_url": "https://api.github.com/repos/FluentLenium/FluentLenium/contents/examples%2Fspring%2Fsrc%2Fmain%2Fjava%2Forg%2Ffluentlenium%2Fexample%2Fspring%2Fconfig%2FConfigException.java?ref=5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd", "deletions": 2, "filename": "examples/spring/src/main/java/org/fluentlenium/example/spring/config/ConfigException.java", "new_code": " * @param message message\n * @param cause cause", "new_methods": [], "old_code": " * @param message\n * @param cause", "old_methods": [], "patch": "@@ -8,8 +8,8 @@ public class ConfigException extends RuntimeException {\n /**\n * Creates configuration exception\n *\n- * @param message\n- * @param cause\n+ * @param message message\n+ * @param cause cause\n */\n public ConfigException(final String message, final Exception cause) {\n super(message, cause);", "raw_url": "https://github.com/FluentLenium/FluentLenium/raw/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/examples%2Fspring%2Fsrc%2Fmain%2Fjava%2Forg%2Ffluentlenium%2Fexample%2Fspring%2Fconfig%2FConfigException.java", "sha": "39c85b2536a476b155c74086bce17112bf9604a5", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/FluentLenium/FluentLenium/blob/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/examples%2Fspring%2Fsrc%2Fmain%2Fresources%2Fconfig.properties", "changes": 2, "contents_url": "https://api.github.com/repos/FluentLenium/FluentLenium/contents/examples%2Fspring%2Fsrc%2Fmain%2Fresources%2Fconfig.properties?ref=5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd", "deletions": 1, "filename": "examples/spring/src/main/resources/config.properties", "new_code": "selenium.hub.location=http://127.0.0.1:4444/wd/hub", "new_methods": [], "old_code": "selenium.hub.location=http://127.0.0.1:4444/wd/hub", "old_methods": [], "patch": "@@ -1,4 +1,4 @@\n selenium.get.url=http://google.com\n selenium.browser.type=CHROME\n selenium.hub.enabled=false\n-selenium.hub.location=http://127.0.0.1:4444/wd/hub\n\\ No newline at end of file\n+selenium.hub.location=http://127.0.0.1:4444/wd/hub", "raw_url": "https://github.com/FluentLenium/FluentLenium/raw/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/examples%2Fspring%2Fsrc%2Fmain%2Fresources%2Fconfig.properties", "sha": "046ca1bd3e1be8d8ea7013970e06eb84e183cd2c", "status": "modified" }, { "additions": 4, "blob_url": "https://github.com/FluentLenium/FluentLenium/blob/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-assertj%2Fsrc%2Fmain%2Fjava%2Forg%2Ffluentlenium%2Fassertj%2Fcustom%2FAlertAssert.java", "changes": 7, "contents_url": "https://api.github.com/repos/FluentLenium/FluentLenium/contents/fluentlenium-assertj%2Fsrc%2Fmain%2Fjava%2Forg%2Ffluentlenium%2Fassertj%2Fcustom%2FAlertAssert.java?ref=5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd", "deletions": 3, "filename": "fluentlenium-assertj/src/main/java/org/fluentlenium/assertj/custom/AlertAssert.java", "new_code": " * @param text text to search for\n public AlertAssert hasText(String text) {\n if (!actual.getText().contains(text)) {\n \"The alert box does not contain the text: \" + text + \" . Actual text found : \" + actual.getText());", "new_methods": [], "old_code": " public AlertAssert hasText(String textToFind) {\n if (!actual.getText().contains(textToFind)) {\n \"The alert box does not contain the text: \" + textToFind + \" . Actual text found : \" + actual.getText());", "old_methods": [], "patch": "@@ -13,13 +13,14 @@ public AlertAssert(Alert actual) {\n /**\n * Check that the alert box contains the given text\n *\n+ * @param text text to search for\n * @return self\n */\n- public AlertAssert hasText(String textToFind) {\n+ public AlertAssert hasText(String text) {\n try {\n- if (!actual.getText().contains(textToFind)) {\n+ if (!actual.getText().contains(text)) {\n super.failWithMessage(\n- \"The alert box does not contain the text: \" + textToFind + \" . Actual text found : \" + actual.getText());\n+ \"The alert box does not contain the text: \" + text + \" . Actual text found : \" + actual.getText());\n }\n } catch (NoAlertPresentException e) {\n super.failWithMessage(\"There is no alert box\");", "raw_url": "https://github.com/FluentLenium/FluentLenium/raw/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-assertj%2Fsrc%2Fmain%2Fjava%2Forg%2Ffluentlenium%2Fassertj%2Fcustom%2FAlertAssert.java", "sha": "518b1b2e5feec0a74ed09f8fbaeb9e1006436f2c", "status": "modified" }, { "additions": 10, "blob_url": "https://github.com/FluentLenium/FluentLenium/blob/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-assertj%2Fsrc%2Fmain%2Fjava%2Forg%2Ffluentlenium%2Fassertj%2Fcustom%2FFluentListAssert.java", "changes": 16, "contents_url": "https://api.github.com/repos/FluentLenium/FluentLenium/contents/fluentlenium-assertj%2Fsrc%2Fmain%2Fjava%2Forg%2Ffluentlenium%2Fassertj%2Fcustom%2FFluentListAssert.java?ref=5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd", "deletions": 6, "filename": "fluentlenium-assertj/src/main/java/org/fluentlenium/assertj/custom/FluentListAssert.java", "new_code": " * @param textToFind text to find\n * @return assertion object\n * @param textToFind text to find\n * @return assertion object\n * @param idToFind id to find\n * @return assertion object\n * @param classToFind class to find\n * @return assertion object\n if (classesLst.contains(classToFind)) {\n }", "new_methods": [], "old_code": " * @return\n * @return\n * @param idToFind\n * @return\n * @return\n if (classesLst.contains(classToFind))", "old_methods": [], "patch": "@@ -14,7 +14,8 @@ public FluentListAssert(FluentList<?> actual) {\n /**\n * check if at least one element of the FluentList contains the text\n *\n- * @return\n+ * @param textToFind text to find\n+ * @return assertion object\n */\n public FluentListAssert hasText(String textToFind) {\n List<String> actualTexts = actual.texts();\n@@ -30,7 +31,8 @@ public FluentListAssert hasText(String textToFind) {\n /**\n * check if at no element of the FluentList contains the text\n *\n- * @return\n+ * @param textToFind text to find\n+ * @return assertion object\n */\n public FluentListAssert hasNotText(String textToFind) {\n List<String> actualTexts = actual.texts();\n@@ -57,8 +59,8 @@ public FluentListSizeBuilder hasSize() {\n /**\n * check if an element of the FluentList has the id\n *\n- * @param idToFind\n- * @return\n+ * @param idToFind id to find\n+ * @return assertion object\n */\n public FluentListAssert hasId(String idToFind) {\n List actualIds = actual.ids();\n@@ -71,15 +73,17 @@ public FluentListAssert hasId(String idToFind) {\n /**\n * check if at least one element of the FluentList contains the text\n *\n- * @return\n+ * @param classToFind class to find\n+ * @return assertion object\n */\n public FluentListAssert hasClass(String classToFind) {\n List<String> classesFromElements = (List<String>) actual.attributes(\"class\");\n \n for (String classesStr : classesFromElements) {\n List<String> classesLst = Arrays.asList(classesStr.split(\" \"));\n- if (classesLst.contains(classToFind))\n+ if (classesLst.contains(classToFind)) {\n return this;\n+ }\n }\n \n StringBuilder sb = new StringBuilder();", "raw_url": "https://github.com/FluentLenium/FluentLenium/raw/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-assertj%2Fsrc%2Fmain%2Fjava%2Forg%2Ffluentlenium%2Fassertj%2Fcustom%2FFluentListAssert.java", "sha": "4c25360100ce8c88dec73092e31dd9960393a0e5", "status": "modified" }, { "additions": 19, "blob_url": "https://github.com/FluentLenium/FluentLenium/blob/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-assertj%2Fsrc%2Fmain%2Fjava%2Forg%2Ffluentlenium%2Fassertj%2Fcustom%2FFluentWebElementAssert.java", "changes": 35, "contents_url": "https://api.github.com/repos/FluentLenium/FluentLenium/contents/fluentlenium-assertj%2Fsrc%2Fmain%2Fjava%2Forg%2Ffluentlenium%2Fassertj%2Fcustom%2FFluentWebElementAssert.java?ref=5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd", "deletions": 16, "filename": "fluentlenium-assertj/src/main/java/org/fluentlenium/assertj/custom/FluentWebElementAssert.java", "new_code": " * @return {@code this} assertion object.\n * @return {@code this} assertion object.\n * @return {@code this} assertion object.\n * @return {@code this} assertion object.\n * @return {@code this} assertion object.\n * @return {@code this} assertion object.\n * @param textToFind text to find\n * @return {@code this} assertion object.\n * @param regexToBeMatched regex to be matched\n * @return {@code this} assertion object.\n * @param textToFind text to find\n * @return {@code this} assertion object.\n * @param idToFind id to find\n * @return {@code this} assertion object.\n public FluentWebElementAssert hasId(String idToFind) {\n if (!actual.id().equals(idToFind)) {\n failWithMessage(\"The element does not have the id: \" + idToFind + \" . Actual id found : \" + actual.id());\n * @param classToFind class to find\n * @return {@code this} assertion object.", "new_methods": [ { "arguments": [ "String idToFind" ], "filename": "fluentlenium-assertj/src/main/java/org/fluentlenium/assertj/custom/FluentWebElementAssert.java", "implementation": "if (!actual.id().equals(idToFind)) {\n failWithMessage(\"The element does not have the id: \" + idToFind + \" . Actual id found : \" + actual.id());\n * @param classToFind class to find\n * @return {@code this", "signature": "FluentWebElementAssert hasId(String idToFind)" } ], "old_code": " * @return\n * @return\n * @return\n * @return\n * @return\n * @return\n * @return\n * @return\n * @return\n * @param id to check\n * @return\n public FluentWebElementAssert hasId(String id) {\n if (!actual.id().equals(id)) {\n failWithMessage(\"The element does not have the id: \" + id + \" . Actual id found : \" + actual.id());\n * @param classToFind\n * @return", "old_methods": [], "patch": "@@ -23,7 +23,7 @@ private void failIsNotEnabled() {\n /**\n * check if the element is enabled\n *\n- * @return\n+ * @return {@code this} assertion object.\n */\n public FluentWebElementAssert isEnabled() {\n if (!actual.enabled()) {\n@@ -35,7 +35,7 @@ public FluentWebElementAssert isEnabled() {\n /**\n * check if the element is not enabled\n *\n- * @return\n+ * @return {@code this} assertion object.\n */\n public FluentWebElementAssert isNotEnabled() {\n if (actual.enabled()) {\n@@ -47,7 +47,7 @@ public FluentWebElementAssert isNotEnabled() {\n /**\n * check if the element is displayed\n *\n- * @return\n+ * @return {@code this} assertion object.\n */\n public FluentWebElementAssert isDisplayed() {\n if (!actual.displayed()) {\n@@ -60,7 +60,7 @@ public FluentWebElementAssert isDisplayed() {\n /**\n * check if the element is not displayed\n *\n- * @return\n+ * @return {@code this} assertion object.\n */\n public FluentWebElementAssert isNotDisplayed() {\n if (actual.displayed()) {\n@@ -80,7 +80,7 @@ private void failIsNotDisplayed() {\n /**\n * check if the element is selected\n *\n- * @return\n+ * @return {@code this} assertion object.\n */\n public FluentWebElementAssert isSelected() {\n if (!actual.selected()) {\n@@ -92,7 +92,7 @@ public FluentWebElementAssert isSelected() {\n /**\n * check if the element is not selected\n *\n- * @return\n+ * @return {@code this} assertion object.\n */\n public FluentWebElementAssert isNotSelected() {\n if (actual.selected()) {\n@@ -113,7 +113,8 @@ protected void failWithMessage(String errorMessage) {\n /**\n * check if the element contains the text\n *\n- * @return\n+ * @param textToFind text to find\n+ * @return {@code this} assertion object.\n */\n public FluentWebElementAssert hasText(String textToFind) {\n if (!actual.text().contains(textToFind)) {\n@@ -126,7 +127,8 @@ public FluentWebElementAssert hasText(String textToFind) {\n /**\n * check if the element matches the given regex\n *\n- * @return\n+ * @param regexToBeMatched regex to be matched\n+ * @return {@code this} assertion object.\n */\n public FluentWebElementAssert hasTextMatching(String regexToBeMatched) {\n if (!actual.text().matches(regexToBeMatched)) {\n@@ -141,7 +143,8 @@ public FluentWebElementAssert hasTextMatching(String regexToBeMatched) {\n /**\n * check if the element does not contain the text\n *\n- * @return\n+ * @param textToFind text to find\n+ * @return {@code this} assertion object.\n */\n public FluentWebElementAssert hasNotText(String textToFind) {\n if (actual.text().contains(textToFind)) {\n@@ -162,21 +165,21 @@ private void failIsNotSelected() {\n /**\n * check if the element has the given id\n *\n- * @param id to check\n- * @return\n+ * @param idToFind id to find\n+ * @return {@code this} assertion object.\n */\n- public FluentWebElementAssert hasId(String id) {\n- if (!actual.id().equals(id)) {\n- failWithMessage(\"The element does not have the id: \" + id + \" . Actual id found : \" + actual.id());\n+ public FluentWebElementAssert hasId(String idToFind) {\n+ if (!actual.id().equals(idToFind)) {\n+ failWithMessage(\"The element does not have the id: \" + idToFind + \" . Actual id found : \" + actual.id());\n }\n return this;\n }\n \n /**\n * check if the element has the class\n *\n- * @param classToFind\n- * @return\n+ * @param classToFind class to find\n+ * @return {@code this} assertion object.\n */\n public FluentWebElementAssert hasClass(String classToFind) {\n if (!getClasses().contains(classToFind)) {", "raw_url": "https://github.com/FluentLenium/FluentLenium/raw/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-assertj%2Fsrc%2Fmain%2Fjava%2Forg%2Ffluentlenium%2Fassertj%2Fcustom%2FFluentWebElementAssert.java", "sha": "b43cd33763c78ab92fffec7a87ea178e3290554e", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/FluentLenium/FluentLenium/blob/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-assertj%2Fsrc%2Fmain%2Fjava%2Forg%2Ffluentlenium%2Fassertj%2Fcustom%2FPageAssert.java", "changes": 2, "contents_url": "https://api.github.com/repos/FluentLenium/FluentLenium/contents/fluentlenium-assertj%2Fsrc%2Fmain%2Fjava%2Forg%2Ffluentlenium%2Fassertj%2Fcustom%2FPageAssert.java?ref=5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd", "deletions": 1, "filename": "fluentlenium-assertj/src/main/java/org/fluentlenium/assertj/custom/PageAssert.java", "new_code": " * @return page assertion object", "new_methods": [], "old_code": " * @return", "old_methods": [], "patch": "@@ -12,7 +12,7 @@ public PageAssert(FluentPage actual) {\n /**\n * check if it is at the current page. Call the page.isAt() methods\n *\n- * @return\n+ * @return page assertion object\n */\n public PageAssert isAt() {\n actual.isAt();", "raw_url": "https://github.com/FluentLenium/FluentLenium/raw/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-assertj%2Fsrc%2Fmain%2Fjava%2Forg%2Ffluentlenium%2Fassertj%2Fcustom%2FPageAssert.java", "sha": "76ba7c48553502f2e1c10ea31a9bbfb9e69170c9", "status": "modified" }, { "additions": 2, "blob_url": "https://github.com/FluentLenium/FluentLenium/blob/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-assertj%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fassertj%2Fintegration%2Futil%2Fadapter%2FFluentTest.java", "changes": 2, "contents_url": "https://api.github.com/repos/FluentLenium/FluentLenium/contents/fluentlenium-assertj%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fassertj%2Fintegration%2Futil%2Fadapter%2FFluentTest.java?ref=5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd", "deletions": 0, "filename": "fluentlenium-assertj/src/test/java/org/fluentlenium/assertj/integration/util/adapter/FluentTest.java", "new_code": " //CHECKSTYLE.OFF: VisibilityModifier\n //CHECKSTYLE.ON: VisibilityModifier", "new_methods": [], "old_code": "", "old_methods": [], "patch": "@@ -36,6 +36,7 @@ public void failed(Throwable e, Description description) {\n }\n };\n \n+ //CHECKSTYLE.OFF: VisibilityModifier\n @ClassRule\n public static TestRule classWatchman = new TestRule() {\n \n@@ -54,5 +55,6 @@ public void evaluate() throws Throwable {\n };\n }\n };\n+ //CHECKSTYLE.ON: VisibilityModifier\n \n }", "raw_url": "https://github.com/FluentLenium/FluentLenium/raw/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-assertj%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fassertj%2Fintegration%2Futil%2Fadapter%2FFluentTest.java", "sha": "8c4f5baeb399bee62145ab4fb0da9e369cdd32bb", "status": "modified" }, { "additions": 3, "blob_url": "https://github.com/FluentLenium/FluentLenium/blob/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Fmain%2Fjava%2Forg%2Ffluentlenium%2Fconfiguration%2FAbstractFactoryRegistryImpl.java", "changes": 6, "contents_url": "https://api.github.com/repos/FluentLenium/FluentLenium/contents/fluentlenium-core%2Fsrc%2Fmain%2Fjava%2Forg%2Ffluentlenium%2Fconfiguration%2FAbstractFactoryRegistryImpl.java?ref=5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd", "deletions": 3, "filename": "fluentlenium-core/src/main/java/org/fluentlenium/configuration/AbstractFactoryRegistryImpl.java", "new_code": " List<T> factoriesList = new ArrayList<>(this.factories.values());\n Collections.sort(factoriesList, new Comparator<T>() {\n for (T factory : factoriesList) {", "new_methods": [], "old_code": " List<T> factories = new ArrayList<>(this.factories.values());\n Collections.sort(factories, new Comparator<T>() {\n for (T factory : factories) {", "old_methods": [], "patch": "@@ -50,8 +50,8 @@ public AbstractFactoryRegistryImpl(Class<T> factoryType, Class<R> reflectiveFact\n protected Map<String, T> factories = new LinkedHashMap<>();\n \n public synchronized T getDefault() {\n- List<T> factories = new ArrayList<>(this.factories.values());\n- Collections.sort(factories, new Comparator<T>() {\n+ List<T> factoriesList = new ArrayList<>(this.factories.values());\n+ Collections.sort(factoriesList, new Comparator<T>() {\n @Override\n public int compare(T o1, T o2) {\n FactoryPriority annotation1 = o1.getClass().getAnnotation(FactoryPriority.class);\n@@ -64,7 +64,7 @@ public int compare(T o1, T o2) {\n }\n });\n List<T> filteredFactories = new ArrayList<>();\n- for (T factory : factories) {\n+ for (T factory : factoriesList) {\n if (factory instanceof ReflectiveFactory) {\n if (((ReflectiveFactory) factory).isAvailable()) {\n filteredFactories.add(factory);", "raw_url": "https://github.com/FluentLenium/FluentLenium/raw/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Fmain%2Fjava%2Forg%2Ffluentlenium%2Fconfiguration%2FAbstractFactoryRegistryImpl.java", "sha": "0b42da9940266db3f6f1c538a11c3ed5435f853c", "status": "modified" }, { "additions": 5, "blob_url": "https://github.com/FluentLenium/FluentLenium/blob/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Fmain%2Fjava%2Forg%2Ffluentlenium%2Fconfiguration%2FConfigurationFactoryProvider.java", "changes": 6, "contents_url": "https://api.github.com/repos/FluentLenium/FluentLenium/contents/fluentlenium-core%2Fsrc%2Fmain%2Fjava%2Forg%2Ffluentlenium%2Fconfiguration%2FConfigurationFactoryProvider.java?ref=5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd", "deletions": 1, "filename": "fluentlenium-core/src/main/java/org/fluentlenium/configuration/ConfigurationFactoryProvider.java", "new_code": "public final class ConfigurationFactoryProvider {\n private ConfigurationFactoryProvider() {\n // Utility class\n }\n", "new_methods": [ { "arguments": [], "filename": "fluentlenium-core/src/main/java/org/fluentlenium/configuration/ConfigurationFactoryProvider.java", "implementation": "// Utility class", "signature": "private ConfigurationFactoryProvider()" } ], "old_code": "public class ConfigurationFactoryProvider {", "old_methods": [], "patch": "@@ -4,7 +4,11 @@\n \n import java.lang.reflect.InvocationTargetException;\n \n-public class ConfigurationFactoryProvider {\n+public final class ConfigurationFactoryProvider {\n+ private ConfigurationFactoryProvider() {\n+ // Utility class\n+ }\n+\n private static ConfigurationFactory bootstrapFactory = new DefaultConfigurationFactory();\n \n public static ConfigurationFactory getConfigurationFactory(Class<?> container) {", "raw_url": "https://github.com/FluentLenium/FluentLenium/raw/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Fmain%2Fjava%2Forg%2Ffluentlenium%2Fconfiguration%2FConfigurationFactoryProvider.java", "sha": "30ed2ae7ad8349cd7a51b1a68aa87a46e0bb1032", "status": "modified" }, { "additions": 2, "blob_url": "https://github.com/FluentLenium/FluentLenium/blob/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Fmain%2Fjava%2Forg%2Ffluentlenium%2Fconfiguration%2FConfigurationProperties.java", "changes": 4, "contents_url": "https://api.github.com/repos/FluentLenium/FluentLenium/contents/fluentlenium-core%2Fsrc%2Fmain%2Fjava%2Forg%2Ffluentlenium%2Fconfiguration%2FConfigurationProperties.java?ref=5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd", "deletions": 2, "filename": "fluentlenium-core/src/main/java/org/fluentlenium/configuration/ConfigurationProperties.java", "new_code": " * {@link org.fluentlenium.configuration.WebDriversRegistryImpl#newWebDriver(String, Capabilities, ConfigurationProperties)}\n * registry using the value stored in webDriver and capabilities property.", "new_methods": [], "old_code": " * {@link org.fluentlenium.configuration.WebDriversRegistryImpl#newWebDriver(String, Capabilities, ConfigurationProperties)} registry using the value stored in\n * webDriver and capabilities property.", "old_methods": [], "patch": "@@ -107,8 +107,8 @@ enum DriverLifecycle {\n *\n * When FluentLenium needs to create a new {@link WebDriver} instance, it calls {@link FluentAdapter#newWebDriver()}\n * which delegates to\n- * {@link org.fluentlenium.configuration.WebDriversRegistryImpl#newWebDriver(String, Capabilities, ConfigurationProperties)} registry using the value stored in\n- * webDriver and capabilities property.\n+ * {@link org.fluentlenium.configuration.WebDriversRegistryImpl#newWebDriver(String, Capabilities, ConfigurationProperties)}\n+ * registry using the value stored in webDriver and capabilities property.\n *\n * Possible values are \"firefox\", \"chrome\", \"ie\", \"htmlunit\", or any class name implementing {@link WebDriver}.\n *", "raw_url": "https://github.com/FluentLenium/FluentLenium/raw/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Fmain%2Fjava%2Forg%2Ffluentlenium%2Fconfiguration%2FConfigurationProperties.java", "sha": "b95da11309e0ba654088c7c8f71a350e8f3c9f08", "status": "modified" }, { "additions": 2, "blob_url": "https://github.com/FluentLenium/FluentLenium/blob/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Fmain%2Fjava%2Forg%2Ffluentlenium%2Fconfiguration%2FMethodInvocationReflectionFactory.java", "changes": 4, "contents_url": "https://api.github.com/repos/FluentLenium/FluentLenium/contents/fluentlenium-core%2Fsrc%2Fmain%2Fjava%2Forg%2Ffluentlenium%2Fconfiguration%2FMethodInvocationReflectionFactory.java?ref=5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd", "deletions": 2, "filename": "fluentlenium-core/src/main/java/org/fluentlenium/configuration/MethodInvocationReflectionFactory.java", "new_code": " return new String[] {this.method.getDeclaringClass().getName() + \".\" + this.method.getName(),\n this.method.getDeclaringClass().getSimpleName() + \".\" + this.method.getName(), this.method.getName()};", "new_methods": [], "old_code": " return new String[] { this.method.getDeclaringClass().getName() + \".\" + this.method.getName(),\n this.method.getDeclaringClass().getSimpleName() + \".\" + this.method.getName(), this.method.getName() };", "old_methods": [], "patch": "@@ -30,7 +30,7 @@ public Capabilities newCapabilities() {\n \n @Override\n public String[] getNames() {\n- return new String[] { this.method.getDeclaringClass().getName() + \".\" + this.method.getName(),\n- this.method.getDeclaringClass().getSimpleName() + \".\" + this.method.getName(), this.method.getName() };\n+ return new String[] {this.method.getDeclaringClass().getName() + \".\" + this.method.getName(),\n+ this.method.getDeclaringClass().getSimpleName() + \".\" + this.method.getName(), this.method.getName()};\n }\n }", "raw_url": "https://github.com/FluentLenium/FluentLenium/raw/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Fmain%2Fjava%2Forg%2Ffluentlenium%2Fconfiguration%2FMethodInvocationReflectionFactory.java", "sha": "96f0cee1ecb2a9008fdb7905635aef2cfc7332e2", "status": "modified" }, { "additions": 5, "blob_url": "https://github.com/FluentLenium/FluentLenium/blob/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Fmain%2Fjava%2Forg%2Ffluentlenium%2Fcore%2FFluentDriver.java", "changes": 10, "contents_url": "https://api.github.com/repos/FluentLenium/FluentLenium/contents/fluentlenium-core%2Fsrc%2Fmain%2Fjava%2Forg%2Ffluentlenium%2Fcore%2FFluentDriver.java?ref=5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd", "deletions": 5, "filename": "fluentlenium-core/src/main/java/org/fluentlenium/core/FluentDriver.java", "new_code": " String configBaseUrl = this.configuration.getBaseUrl();\n if (configBaseUrl != null) {\n if (configBaseUrl.endsWith(\"/\")) {\n configBaseUrl = configBaseUrl.substring(0, configBaseUrl.length() - 1);\n this.baseUrl = configBaseUrl;", "new_methods": [], "old_code": " String baseUrl = this.configuration.getBaseUrl();\n if (baseUrl != null) {\n if (baseUrl.endsWith(\"/\")) {\n baseUrl = baseUrl.substring(0, baseUrl.length() - 1);\n this.baseUrl = baseUrl;", "old_methods": [], "patch": "@@ -110,12 +110,12 @@ private void configureDriver() {\n }\n \n if (this.configuration.getBaseUrl() != null) {\n- String baseUrl = this.configuration.getBaseUrl();\n- if (baseUrl != null) {\n- if (baseUrl.endsWith(\"/\")) {\n- baseUrl = baseUrl.substring(0, baseUrl.length() - 1);\n+ String configBaseUrl = this.configuration.getBaseUrl();\n+ if (configBaseUrl != null) {\n+ if (configBaseUrl.endsWith(\"/\")) {\n+ configBaseUrl = configBaseUrl.substring(0, configBaseUrl.length() - 1);\n }\n- this.baseUrl = baseUrl;\n+ this.baseUrl = configBaseUrl;\n }\n }\n }", "raw_url": "https://github.com/FluentLenium/FluentLenium/raw/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Fmain%2Fjava%2Forg%2Ffluentlenium%2Fcore%2FFluentDriver.java", "sha": "cdea7199c2ddc142a9f92dc0d9da30bf966c27c8", "status": "modified" }, { "additions": 2, "blob_url": "https://github.com/FluentLenium/FluentLenium/blob/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Fmain%2Fjava%2Forg%2Ffluentlenium%2Fcore%2Faxes%2FAxes.java", "changes": 4, "contents_url": "https://api.github.com/repos/FluentLenium/FluentLenium/contents/fluentlenium-core%2Fsrc%2Fmain%2Fjava%2Forg%2Ffluentlenium%2Fcore%2Faxes%2FAxes.java?ref=5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd", "deletions": 2, "filename": "fluentlenium-core/src/main/java/org/fluentlenium/core/axes/Axes.java", "new_code": " WebElement parentElement = LocatorProxies.createWebElement(new Supplier<WebElement>() {\n return instantiator.newComponent(FluentWebElement.class, parentElement);", "new_methods": [], "old_code": " WebElement webElement = LocatorProxies.createWebElement(new Supplier<WebElement>() {\n return instantiator.newComponent(FluentWebElement.class, webElement);", "old_methods": [], "patch": "@@ -32,14 +32,14 @@ public Axes(WebElement element, ComponentInstantiator instantiator, HookChainBui\n * @return fluent web element\n */\n public FluentWebElement parent() {\n- WebElement webElement = LocatorProxies.createWebElement(new Supplier<WebElement>() {\n+ WebElement parentElement = LocatorProxies.createWebElement(new Supplier<WebElement>() {\n @Override\n public WebElement get() {\n return Axes.this.webElement.findElement(By.xpath(\"parent::*\"));\n }\n });\n \n- return instantiator.newComponent(FluentWebElement.class, webElement);\n+ return instantiator.newComponent(FluentWebElement.class, parentElement);\n }\n \n protected FluentList<FluentWebElement> handleAxe(final String axe) {", "raw_url": "https://github.com/FluentLenium/FluentLenium/raw/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Fmain%2Fjava%2Forg%2Ffluentlenium%2Fcore%2Faxes%2FAxes.java", "sha": "b4aa9a49164a6ca0958a247cf9207498f3d6ebdd", "status": "modified" }, { "additions": 14, "blob_url": "https://github.com/FluentLenium/FluentLenium/blob/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Fmain%2Fjava%2Forg%2Ffluentlenium%2Fcore%2Fconditions%2FAbstractFluentListConditions.java", "changes": 16, "contents_url": "https://api.github.com/repos/FluentLenium/FluentLenium/contents/fluentlenium-core%2Fsrc%2Fmain%2Fjava%2Forg%2Ffluentlenium%2Fcore%2Fconditions%2FAbstractFluentListConditions.java?ref=5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd", "deletions": 2, "filename": "fluentlenium-core/src/main/java/org/fluentlenium/core/conditions/AbstractFluentListConditions.java", "new_code": " private boolean negation = false;\n private final List<? extends FluentWebElement> elements;\n protected boolean isNegation() {\n return negation;\n }\n\n public void setNegation(boolean negation) {\n this.negation = negation;\n }\n\n protected List<? extends FluentWebElement> getElements() {\n return elements;\n }\n", "new_methods": [ { "arguments": [], "filename": "fluentlenium-core/src/main/java/org/fluentlenium/core/conditions/AbstractFluentListConditions.java", "implementation": "return negation;", "signature": "boolean isNegation()" }, { "arguments": [ "boolean negation" ], "filename": "fluentlenium-core/src/main/java/org/fluentlenium/core/conditions/AbstractFluentListConditions.java", "implementation": "this.negation = negation;", "signature": "void setNegation(boolean negation)" } ], "old_code": " protected boolean negation = false;\n protected final List<? extends FluentWebElement> elements;", "old_methods": [], "patch": "@@ -10,9 +10,9 @@\n * Abstract class conditions on list of elements.\n */\n public abstract class AbstractFluentListConditions implements FluentListConditions {\n- protected boolean negation = false;\n+ private boolean negation = false;\n \n- protected final List<? extends FluentWebElement> elements;\n+ private final List<? extends FluentWebElement> elements;\n \n protected AbstractFluentListConditions(List<? extends FluentWebElement> elements) {\n this.elements = elements;\n@@ -26,6 +26,18 @@ public boolean size(int size) {\n return elements.size() == size;\n }\n \n+ protected boolean isNegation() {\n+ return negation;\n+ }\n+\n+ public void setNegation(boolean negation) {\n+ this.negation = negation;\n+ }\n+\n+ protected List<? extends FluentWebElement> getElements() {\n+ return elements;\n+ }\n+\n @Override\n public IntegerConditions size() {\n return new IntegerConditionsImpl(elements.size(), negation);", "raw_url": "https://github.com/FluentLenium/FluentLenium/raw/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Fmain%2Fjava%2Forg%2Ffluentlenium%2Fcore%2Fconditions%2FAbstractFluentListConditions.java", "sha": "976ee64819c3eb997dfd8f571fa69a0022252c0b", "status": "modified" }, { "additions": 5, "blob_url": "https://github.com/FluentLenium/FluentLenium/blob/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Fmain%2Fjava%2Forg%2Ffluentlenium%2Fcore%2Fconditions%2FAtLeastOneElementConditions.java", "changes": 10, "contents_url": "https://api.github.com/repos/FluentLenium/FluentLenium/contents/fluentlenium-core%2Fsrc%2Fmain%2Fjava%2Forg%2Ffluentlenium%2Fcore%2Fconditions%2FAtLeastOneElementConditions.java?ref=5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd", "deletions": 5, "filename": "fluentlenium-core/src/main/java/org/fluentlenium/core/conditions/AtLeastOneElementConditions.java", "new_code": " AtLeastOneElementConditions negatedConditions = new AtLeastOneElementConditions(getElements());\n negatedConditions.setNegation(!isNegation());\n if (isNegation()) {\n if (getElements().size() > 0) {\n for (FluentWebElement element : getElements()) {", "new_methods": [], "old_code": " AtLeastOneElementConditions negatedConditions = new AtLeastOneElementConditions(elements);\n negatedConditions.negation = !negation;\n if (negation) {\n if (elements.size() > 0) {\n for (FluentWebElement element : elements) {", "old_methods": [], "patch": "@@ -17,14 +17,14 @@ public AtLeastOneElementConditions(List<? extends FluentWebElement> elements) {\n \n @Override\n public AtLeastOneElementConditions not() {\n- AtLeastOneElementConditions negatedConditions = new AtLeastOneElementConditions(elements);\n- negatedConditions.negation = !negation;\n+ AtLeastOneElementConditions negatedConditions = new AtLeastOneElementConditions(getElements());\n+ negatedConditions.setNegation(!isNegation());\n return negatedConditions;\n }\n \n @Override\n public boolean verify(Predicate<FluentWebElement> predicate, boolean defaultValue) {\n- if (negation) {\n+ if (isNegation()) {\n predicate = Predicates.not(predicate);\n defaultValue = !defaultValue;\n }\n@@ -35,8 +35,8 @@ protected Predicate<FluentDriver> buildAtLeastOnePredicate(final Predicate<Fluen\n final boolean defaultValue) {\n Predicate<FluentDriver> untilPredicate = new com.google.common.base.Predicate<FluentDriver>() {\n public boolean apply(FluentDriver fluent) {\n- if (elements.size() > 0) {\n- for (FluentWebElement element : elements) {\n+ if (getElements().size() > 0) {\n+ for (FluentWebElement element : getElements()) {\n if (predicate.apply(element)) {\n return true;\n }", "raw_url": "https://github.com/FluentLenium/FluentLenium/raw/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Fmain%2Fjava%2Forg%2Ffluentlenium%2Fcore%2Fconditions%2FAtLeastOneElementConditions.java", "sha": "e5e04690d255b93232f478b3f935c2e236319529", "status": "modified" }, { "additions": 5, "blob_url": "https://github.com/FluentLenium/FluentLenium/blob/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Fmain%2Fjava%2Forg%2Ffluentlenium%2Fcore%2Fconditions%2FEachElementConditions.java", "changes": 10, "contents_url": "https://api.github.com/repos/FluentLenium/FluentLenium/contents/fluentlenium-core%2Fsrc%2Fmain%2Fjava%2Forg%2Ffluentlenium%2Fcore%2Fconditions%2FEachElementConditions.java?ref=5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd", "deletions": 5, "filename": "fluentlenium-core/src/main/java/org/fluentlenium/core/conditions/EachElementConditions.java", "new_code": " EachElementConditions negatedConditions = new EachElementConditions(getElements());\n negatedConditions.setNegation(!isNegation());\n if (isNegation()) {\n if (getElements().size() > 0) {\n for (FluentWebElement element : getElements()) {", "new_methods": [], "old_code": " EachElementConditions negatedConditions = new EachElementConditions(elements);\n negatedConditions.negation = !negation;\n if (negation) {\n if (elements.size() > 0) {\n for (FluentWebElement element : elements) {", "old_methods": [], "patch": "@@ -17,13 +17,13 @@ public EachElementConditions(List<? extends FluentWebElement> elements) {\n \n @Override\n public EachElementConditions not() {\n- EachElementConditions negatedConditions = new EachElementConditions(elements);\n- negatedConditions.negation = !negation;\n+ EachElementConditions negatedConditions = new EachElementConditions(getElements());\n+ negatedConditions.setNegation(!isNegation());\n return negatedConditions;\n }\n \n public boolean verify(Predicate<FluentWebElement> predicate, boolean defaultValue) {\n- if (negation) {\n+ if (isNegation()) {\n predicate = Predicates.not(predicate);\n defaultValue = !defaultValue;\n }\n@@ -34,8 +34,8 @@ protected Predicate<FluentDriver> buildEachElementPredicate(final Predicate<Flue\n final boolean defaultValue) {\n Predicate<FluentDriver> untilPredicate = new com.google.common.base.Predicate<FluentDriver>() {\n public boolean apply(FluentDriver fluent) {\n- if (elements.size() > 0) {\n- for (FluentWebElement element : elements) {\n+ if (getElements().size() > 0) {\n+ for (FluentWebElement element : getElements()) {\n if (!predicate.apply(element)) {\n return false;\n }", "raw_url": "https://github.com/FluentLenium/FluentLenium/raw/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Fmain%2Fjava%2Forg%2Ffluentlenium%2Fcore%2Fconditions%2FEachElementConditions.java", "sha": "30e68c0645f35af9d240749b945422128de03c71", "status": "modified" }, { "additions": 2, "blob_url": "https://github.com/FluentLenium/FluentLenium/blob/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Fmain%2Fjava%2Forg%2Ffluentlenium%2Fcore%2Fconditions%2FFluentConditions.java", "changes": 4, "contents_url": "https://api.github.com/repos/FluentLenium/FluentLenium/contents/fluentlenium-core%2Fsrc%2Fmain%2Fjava%2Forg%2Ffluentlenium%2Fcore%2Fconditions%2FFluentConditions.java?ref=5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd", "deletions": 2, "filename": "fluentlenium-core/src/main/java/org/fluentlenium/core/conditions/FluentConditions.java", "new_code": " boolean attribute(String name, String value);\n StringConditions attribute(String name);", "new_methods": [], "old_code": " boolean attribute(final String name, final String value);\n StringConditions attribute(final String name);", "old_methods": [], "patch": "@@ -191,7 +191,7 @@ public interface FluentConditions extends Conditions<FluentWebElement> {\n */\n @Message(\"has attribute \\\"{0}\\\"=\\\"{1}\\\"\")\n @NotMessage(\"does not have attribute \\\"{0}\\\"=\\\"{1}\\\"\")\n- boolean attribute(final String name, final String value);\n+ boolean attribute(String name, String value);\n \n /**\n * Check conditions on the given attribute the attribute has the given value.\n@@ -200,7 +200,7 @@ public interface FluentConditions extends Conditions<FluentWebElement> {\n * @return An object to configure text attribute value conditions.\n */\n @MessageContext(\"attribute(\\\"{0}\\\"\")\n- StringConditions attribute(final String name);\n+ StringConditions attribute(String name);\n \n /**\n * check conditions on rectangle of this element", "raw_url": "https://github.com/FluentLenium/FluentLenium/raw/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Fmain%2Fjava%2Forg%2Ffluentlenium%2Fcore%2Fconditions%2FFluentConditions.java", "sha": "4d02b86120bed176b71bf2c3a74cb93de7b13f0d", "status": "modified" }, { "additions": 5, "blob_url": "https://github.com/FluentLenium/FluentLenium/blob/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Fmain%2Fjava%2Forg%2Ffluentlenium%2Fcore%2Fconditions%2FIntegerConditions.java", "changes": 10, "contents_url": "https://api.github.com/repos/FluentLenium/FluentLenium/contents/fluentlenium-core%2Fsrc%2Fmain%2Fjava%2Forg%2Ffluentlenium%2Fcore%2Fconditions%2FIntegerConditions.java?ref=5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd", "deletions": 5, "filename": "fluentlenium-core/src/main/java/org/fluentlenium/core/conditions/IntegerConditions.java", "new_code": " boolean equalTo(int value);\n boolean lessThan(int value);\n boolean lessThanOrEqualTo(int value);\n boolean greaterThan(int value);\n boolean greaterThanOrEqualTo(int value);", "new_methods": [], "old_code": " boolean equalTo(final int value);\n boolean lessThan(final int value);\n boolean lessThanOrEqualTo(final int value);\n boolean greaterThan(final int value);\n boolean greaterThanOrEqualTo(final int value);", "old_methods": [], "patch": "@@ -19,7 +19,7 @@ public interface IntegerConditions extends Conditions<Integer> {\n */\n @Message(\"is equal to {0}\")\n @NotMessage(\"is not equal to {0}\")\n- boolean equalTo(final int value);\n+ boolean equalTo(int value);\n \n /**\n * Check that this is less than given value\n@@ -29,7 +29,7 @@ public interface IntegerConditions extends Conditions<Integer> {\n */\n @Message(\"is less than {0}\")\n @NotMessage(\"is not less than {0}\")\n- boolean lessThan(final int value);\n+ boolean lessThan(int value);\n \n /**\n * Check that this is less than or equal given value\n@@ -39,7 +39,7 @@ public interface IntegerConditions extends Conditions<Integer> {\n */\n @Message(\"is less than or equal to {0}\")\n @NotMessage(\"is not less than or equal to {0}\")\n- boolean lessThanOrEqualTo(final int value);\n+ boolean lessThanOrEqualTo(int value);\n \n /**\n * Check that this is greater than given value\n@@ -49,7 +49,7 @@ public interface IntegerConditions extends Conditions<Integer> {\n */\n @Message(\"is greater than {0}\")\n @NotMessage(\"is not greater than {0}\")\n- boolean greaterThan(final int value);\n+ boolean greaterThan(int value);\n \n /**\n * Check that this is greater than or equal given value\n@@ -59,6 +59,6 @@ public interface IntegerConditions extends Conditions<Integer> {\n */\n @Message(\"is greater than or equal to {0}\")\n @NotMessage(\"is not greater than or equal to {0}\")\n- boolean greaterThanOrEqualTo(final int value);\n+ boolean greaterThanOrEqualTo(int value);\n \n }", "raw_url": "https://github.com/FluentLenium/FluentLenium/raw/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Fmain%2Fjava%2Forg%2Ffluentlenium%2Fcore%2Fconditions%2FIntegerConditions.java", "sha": "f86cae93b1221b1acc93e64f0aa85bd5e2467ec9", "status": "modified" }, { "additions": 14, "blob_url": "https://github.com/FluentLenium/FluentLenium/blob/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Fmain%2Fjava%2Forg%2Ffluentlenium%2Fcore%2Fconditions%2FStringConditionsImpl.java", "changes": 21, "contents_url": "https://api.github.com/repos/FluentLenium/FluentLenium/contents/fluentlenium-core%2Fsrc%2Fmain%2Fjava%2Forg%2Ffluentlenium%2Fcore%2Fconditions%2FStringConditionsImpl.java?ref=5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd", "deletions": 7, "filename": "fluentlenium-core/src/main/java/org/fluentlenium/core/conditions/StringConditionsImpl.java", "new_code": " if (input == null) {\n }\n if (input == null) {\n }\n if (input == null) {\n }\n if (input == null) {\n }\n if (input == null) {\n }\n if (input == null) {\n }\n if (input == null) {\n }", "new_methods": [], "old_code": " if (input == null)\n if (input == null)\n if (input == null)\n if (input == null)\n if (input == null)\n if (input == null)\n if (input == null)", "old_methods": [], "patch": "@@ -30,8 +30,9 @@ public boolean contains(final CharSequence s) {\n return verify(new Predicate<String>() {\n @Override\n public boolean apply(String input) {\n- if (input == null)\n+ if (input == null) {\n return false;\n+ }\n return input.contains(s);\n }\n });\n@@ -42,8 +43,9 @@ public boolean startsWith(final String prefix) {\n return verify(new Predicate<String>() {\n @Override\n public boolean apply(String input) {\n- if (input == null)\n+ if (input == null) {\n return false;\n+ }\n return input.startsWith(prefix);\n }\n });\n@@ -54,8 +56,9 @@ public boolean endsWith(final String suffix) {\n return verify(new Predicate<String>() {\n @Override\n public boolean apply(String input) {\n- if (input == null)\n+ if (input == null) {\n return false;\n+ }\n return input.endsWith(suffix);\n }\n });\n@@ -66,8 +69,9 @@ public boolean equalTo(final String anotherString) {\n return verify(new Predicate<String>() {\n @Override\n public boolean apply(String input) {\n- if (input == null)\n+ if (input == null) {\n return false;\n+ }\n return input.equals(anotherString);\n }\n });\n@@ -78,8 +82,9 @@ public boolean equalToIgnoreCase(final String anotherString) {\n return verify(new Predicate<String>() {\n @Override\n public boolean apply(String input) {\n- if (input == null)\n+ if (input == null) {\n return false;\n+ }\n return input.equalsIgnoreCase(anotherString);\n }\n });\n@@ -90,8 +95,9 @@ public boolean matches(final String regex) {\n return verify(new Predicate<String>() {\n @Override\n public boolean apply(String input) {\n- if (input == null)\n+ if (input == null) {\n return false;\n+ }\n return input.matches(regex);\n }\n });\n@@ -102,8 +108,9 @@ public boolean matches(final Pattern pattern) {\n return verify(new Predicate<String>() {\n @Override\n public boolean apply(String input) {\n- if (input == null)\n+ if (input == null) {\n return false;\n+ }\n Matcher m = pattern.matcher(input);\n return m.matches();\n }", "raw_url": "https://github.com/FluentLenium/FluentLenium/raw/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Fmain%2Fjava%2Forg%2Ffluentlenium%2Fcore%2Fconditions%2FStringConditionsImpl.java", "sha": "04bc216005090b3a1f19229f2f048930b22a73ef", "status": "modified" }, { "additions": 12, "blob_url": "https://github.com/FluentLenium/FluentLenium/blob/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Fmain%2Fjava%2Forg%2Ffluentlenium%2Fcore%2Fconditions%2Fmessage%2FMessageProxy.java", "changes": 19, "contents_url": "https://api.github.com/repos/FluentLenium/FluentLenium/contents/fluentlenium-core%2Fsrc%2Fmain%2Fjava%2Forg%2Ffluentlenium%2Fcore%2Fconditions%2Fmessage%2FMessageProxy.java?ref=5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd", "deletions": 7, "filename": "fluentlenium-core/src/main/java/org/fluentlenium/core/conditions/message/MessageProxy.java", "new_code": "public final class MessageProxy {\n private MessageProxy() {\n // Utility class\n }\n\n return (T) Proxy.newProxyInstance(MessageProxy.class.getClassLoader(), new Class<?>[] {messageClass},\n return (T) Proxy.newProxyInstance(MessageProxy.class.getClassLoader(), new Class<?>[] {messageClass},\n return (T) Proxy.newProxyInstance(MessageProxy.class.getClassLoader(), new Class<?>[] {messageClass},\n return (T) Proxy.newProxyInstance(MessageProxy.class.getClassLoader(), new Class<?>[] {messageClass},\n * @param proxy message builder proxy\n if (invocationHandler == null) {\n }", "new_methods": [ { "arguments": [], "filename": "fluentlenium-core/src/main/java/org/fluentlenium/core/conditions/message/MessageProxy.java", "implementation": "// Utility class", "signature": "private MessageProxy()" }, { "arguments": [ "invocationHandler == null" ], "filename": "fluentlenium-core/src/main/java/org/fluentlenium/core/conditions/message/MessageProxy.java", "implementation": "", "signature": "proxy\n if (invocationHandler == null)" } ], "old_code": "public class MessageProxy {\n return (T) Proxy.newProxyInstance(MessageProxy.class.getClassLoader(), new Class<?>[] { messageClass },\n return (T) Proxy.newProxyInstance(MessageProxy.class.getClassLoader(), new Class<?>[] { messageClass },\n return (T) Proxy.newProxyInstance(MessageProxy.class.getClassLoader(), new Class<?>[] { messageClass },\n return (T) Proxy.newProxyInstance(MessageProxy.class.getClassLoader(), new Class<?>[] { messageClass },\n * @param proxy\n if (invocationHandler == null)", "old_methods": [], "patch": "@@ -7,7 +7,11 @@\n * Provides message proxy implementations of interface that records calls to build message from methods annotated with\n * {@link Message}, {@link NotMessage} and {@link MessageContext}.\n */\n-public class MessageProxy {\n+public final class MessageProxy {\n+ private MessageProxy() {\n+ // Utility class\n+ }\n+\n /**\n * Wrap an object into a message proxy supporting {@link Message}, {@link NotMessage} and {@link MessageContext}.\n *\n@@ -18,7 +22,7 @@ public class MessageProxy {\n * @return a proxy generating message from annotations.\n */\n public static <T> T wrap(Class<T> messageClass, Object instance, String context) {\n- return (T) Proxy.newProxyInstance(MessageProxy.class.getClassLoader(), new Class<?>[] { messageClass },\n+ return (T) Proxy.newProxyInstance(MessageProxy.class.getClassLoader(), new Class<?>[] {messageClass},\n new MessageBuilderInvocationHandler(context, instance));\n }\n \n@@ -32,7 +36,7 @@ public static <T> T wrap(Class<T> messageClass, Object instance, String context)\n * @return a proxy generating message from annotations.\n */\n protected static <T> T wrap(Class<T> messageClass, Object instance, List<MessageBuilderCall> calls) {\n- return (T) Proxy.newProxyInstance(MessageProxy.class.getClassLoader(), new Class<?>[] { messageClass },\n+ return (T) Proxy.newProxyInstance(MessageProxy.class.getClassLoader(), new Class<?>[] {messageClass},\n new MessageBuilderInvocationHandler(calls));\n }\n \n@@ -45,7 +49,7 @@ protected static <T> T wrap(Class<T> messageClass, Object instance, List<Message\n * @return a proxy generating message from annotations.\n */\n public static <T> T builder(Class<T> messageClass, String context) {\n- return (T) Proxy.newProxyInstance(MessageProxy.class.getClassLoader(), new Class<?>[] { messageClass },\n+ return (T) Proxy.newProxyInstance(MessageProxy.class.getClassLoader(), new Class<?>[] {messageClass},\n new MessageBuilderInvocationHandler(context));\n }\n \n@@ -58,20 +62,21 @@ public static <T> T builder(Class<T> messageClass, String context) {\n * @return a proxy generating message from annotations.\n */\n protected static <T> T builder(Class<T> messageClass, List<MessageBuilderCall> calls) {\n- return (T) Proxy.newProxyInstance(MessageProxy.class.getClassLoader(), new Class<?>[] { messageClass },\n+ return (T) Proxy.newProxyInstance(MessageProxy.class.getClassLoader(), new Class<?>[] {messageClass},\n new MessageBuilderInvocationHandler(calls));\n }\n \n /**\n * Build the message from a proxy\n *\n- * @param proxy\n+ * @param proxy message builder proxy\n * @return generated message.\n */\n public static String message(Object proxy) {\n MessageBuilderInvocationHandler invocationHandler = (MessageBuilderInvocationHandler) Proxy.getInvocationHandler(proxy);\n- if (invocationHandler == null)\n+ if (invocationHandler == null) {\n return null;\n+ }\n return invocationHandler.buildMessage();\n }\n }", "raw_url": "https://github.com/FluentLenium/FluentLenium/raw/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Fmain%2Fjava%2Forg%2Ffluentlenium%2Fcore%2Fconditions%2Fmessage%2FMessageProxy.java", "sha": "d00f005f21bb2ff2586268d82663b0b97d1942fb", "status": "modified" }, { "additions": 2, "blob_url": "https://github.com/FluentLenium/FluentLenium/blob/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Fmain%2Fjava%2Forg%2Ffluentlenium%2Fcore%2Fconditions%2Fwait%2FWaitConditionInvocationHandler.java", "changes": 3, "contents_url": "https://api.github.com/repos/FluentLenium/FluentLenium/contents/fluentlenium-core%2Fsrc%2Fmain%2Fjava%2Forg%2Ffluentlenium%2Fcore%2Fconditions%2Fwait%2FWaitConditionInvocationHandler.java?ref=5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd", "deletions": 1, "filename": "fluentlenium-core/src/main/java/org/fluentlenium/core/conditions/wait/WaitConditionInvocationHandler.java", "new_code": " if (!ignoreNegation && negation) {\n }", "new_methods": [], "old_code": " if (!ignoreNegation && negation)", "old_methods": [], "patch": "@@ -65,8 +65,9 @@ protected C conditions(boolean ignoreNot) {\n * @return conditions with the negation applied.\n */\n protected C applyNegation(C conditions, boolean ignoreNegation) {\n- if (!ignoreNegation && negation)\n+ if (!ignoreNegation && negation) {\n return (C) conditions.not();\n+ }\n return conditions;\n }\n ", "raw_url": "https://github.com/FluentLenium/FluentLenium/raw/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Fmain%2Fjava%2Forg%2Ffluentlenium%2Fcore%2Fconditions%2Fwait%2FWaitConditionInvocationHandler.java", "sha": "be2dcd9bf099b5898f19480b1c9d18380147caed", "status": "modified" }, { "additions": 17, "blob_url": "https://github.com/FluentLenium/FluentLenium/blob/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Fmain%2Fjava%2Forg%2Ffluentlenium%2Fcore%2Fconditions%2Fwait%2FWaitConditionProxy.java", "changes": 29, "contents_url": "https://api.github.com/repos/FluentLenium/FluentLenium/contents/fluentlenium-core%2Fsrc%2Fmain%2Fjava%2Forg%2Ffluentlenium%2Fcore%2Fconditions%2Fwait%2FWaitConditionProxy.java?ref=5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd", "deletions": 12, "filename": "fluentlenium-core/src/main/java/org/fluentlenium/core/conditions/wait/WaitConditionProxy.java", "new_code": "public final class WaitConditionProxy {\n private WaitConditionProxy() {\n //Utility class\n }\n\n .newProxyInstance(MessageProxy.class.getClassLoader(), new Class<?>[] {FluentListConditions.class},\n .newProxyInstance(MessageProxy.class.getClassLoader(), new Class<?>[] {FluentConditions.class},\n new WaitConditionInvocationHandler(FluentConditions.class, wait, context,\n new Supplier<FluentConditions>() {\n @Override\n public FluentConditions get() {\n return new WebElementConditions(elementSupplier.get());\n }\n }));\n * @param conditionClass condition class\n * @param <C> condition type\n return (C) Proxy.newProxyInstance(MessageProxy.class.getClassLoader(), new Class<?>[] {conditionClass},", "new_methods": [ { "arguments": [], "filename": "fluentlenium-core/src/main/java/org/fluentlenium/core/conditions/wait/WaitConditionProxy.java", "implementation": "//Utility class", "signature": "private WaitConditionProxy()" }, { "arguments": [ "FluentConditions.class", " wait", " context", "\n new Supplier<FluentConditions>" ], "filename": "fluentlenium-core/src/main/java/org/fluentlenium/core/conditions/wait/WaitConditionProxy.java", "implementation": "@Override\n public FluentConditions get() {\n return new WebElementConditions(elementSupplier.get());", "signature": "new WaitConditionInvocationHandler(FluentConditions.class, wait, context,\n new Supplier<FluentConditions>()" } ], "old_code": "public class WaitConditionProxy {\n .newProxyInstance(MessageProxy.class.getClassLoader(), new Class<?>[] { FluentListConditions.class },\n .newProxyInstance(MessageProxy.class.getClassLoader(), new Class<?>[] { FluentConditions.class },\n new WaitConditionInvocationHandler(FluentConditions.class, wait, context,\n new Supplier<FluentConditions>() {\n @Override\n public FluentConditions get() {\n return new WebElementConditions(elementSupplier.get());\n }\n }));\n * @param conditionClass\n return (C) Proxy.newProxyInstance(MessageProxy.class.getClassLoader(), new Class<?>[] { conditionClass },", "old_methods": [ { "arguments": [ "FluentConditions.class", " wait", " context", "\n new Supplier<FluentConditions>" ], "filename": "fluentlenium-core/src/main/java/org/fluentlenium/core/conditions/wait/WaitConditionProxy.java", "implementation": "@Override\n public FluentConditions get() {\n return new WebElementConditions(elementSupplier.get());", "signature": "new WaitConditionInvocationHandler(FluentConditions.class, wait, context,\n new Supplier<FluentConditions>()" } ], "patch": "@@ -17,7 +17,11 @@\n /**\n * Provides proxy implementations of conditions that performs wait from those conditions.\n */\n-public class WaitConditionProxy {\n+public final class WaitConditionProxy {\n+ private WaitConditionProxy() {\n+ //Utility class\n+ }\n+\n /**\n * Build a wait proxy.\n *\n@@ -65,7 +69,7 @@ public FluentListConditions get() {\n public static FluentListConditions list(FluentWait wait, String context,\n Supplier<? extends FluentListConditions> conditionsSupplier) {\n return (FluentListConditions) Proxy\n- .newProxyInstance(MessageProxy.class.getClassLoader(), new Class<?>[] { FluentListConditions.class },\n+ .newProxyInstance(MessageProxy.class.getClassLoader(), new Class<?>[] {FluentListConditions.class},\n new WaitConditionInvocationHandler(FluentListConditions.class, wait, context, conditionsSupplier));\n }\n \n@@ -80,28 +84,29 @@ public static FluentListConditions list(FluentWait wait, String context,\n public static FluentConditions element(FluentWait wait, String context,\n final Supplier<? extends FluentWebElement> elementSupplier) {\n return (FluentConditions) Proxy\n- .newProxyInstance(MessageProxy.class.getClassLoader(), new Class<?>[] { FluentConditions.class },\n- new WaitConditionInvocationHandler(FluentConditions.class, wait, context,\n- new Supplier<FluentConditions>() {\n- @Override\n- public FluentConditions get() {\n- return new WebElementConditions(elementSupplier.get());\n- }\n- }));\n+ .newProxyInstance(MessageProxy.class.getClassLoader(), new Class<?>[] {FluentConditions.class},\n+ new WaitConditionInvocationHandler(FluentConditions.class, wait, context,\n+ new Supplier<FluentConditions>() {\n+ @Override\n+ public FluentConditions get() {\n+ return new WebElementConditions(elementSupplier.get());\n+ }\n+ }));\n }\n \n /**\n * Build a wait proxy.\n *\n- * @param conditionClass\n+ * @param conditionClass condition class\n * @param wait Fluent wait\n * @param context Message context\n * @param conditionsSupplier Supplier for elements to wait.\n+ * @param <C> condition type\n * @return a proxy generating message from annotations.\n */\n public static <C extends Conditions<?>> C custom(Class<C> conditionClass, FluentWait wait, String context,\n Supplier<C> conditionsSupplier) {\n- return (C) Proxy.newProxyInstance(MessageProxy.class.getClassLoader(), new Class<?>[] { conditionClass },\n+ return (C) Proxy.newProxyInstance(MessageProxy.class.getClassLoader(), new Class<?>[] {conditionClass},\n new WaitConditionInvocationHandler(conditionClass, wait, context, conditionsSupplier));\n }\n }", "raw_url": "https://github.com/FluentLenium/FluentLenium/raw/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Fmain%2Fjava%2Forg%2Ffluentlenium%2Fcore%2Fconditions%2Fwait%2FWaitConditionProxy.java", "sha": "952f4691fdbe16d7ac467e748660eeb17b7bac44", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/FluentLenium/FluentLenium/blob/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Fmain%2Fjava%2Forg%2Ffluentlenium%2Fcore%2Fcss%2FCssSupport.java", "changes": 2, "contents_url": "https://api.github.com/repos/FluentLenium/FluentLenium/contents/fluentlenium-core%2Fsrc%2Fmain%2Fjava%2Forg%2Ffluentlenium%2Fcore%2Fcss%2FCssSupport.java?ref=5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd", "deletions": 1, "filename": "fluentlenium-core/src/main/java/org/fluentlenium/core/css/CssSupport.java", "new_code": " void injectResource(String cssResource);", "new_methods": [], "old_code": " void injectResource(final String cssResource);", "old_methods": [], "patch": "@@ -17,5 +17,5 @@ public interface CssSupport {\n *\n * @param cssResource css classpath resource to inject.\n */\n- void injectResource(final String cssResource);\n+ void injectResource(String cssResource);\n }", "raw_url": "https://github.com/FluentLenium/FluentLenium/raw/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Fmain%2Fjava%2Forg%2Ffluentlenium%2Fcore%2Fcss%2FCssSupport.java", "sha": "01fc11272db4f17d85115694121688b6bfbd2821", "status": "modified" }, { "additions": 8, "blob_url": "https://github.com/FluentLenium/FluentLenium/blob/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Fmain%2Fjava%2Forg%2Ffluentlenium%2Fcore%2Fevents%2FAnnotationsComponentListener.java", "changes": 12, "contents_url": "https://api.github.com/repos/FluentLenium/FluentLenium/contents/fluentlenium-core%2Fsrc%2Fmain%2Fjava%2Forg%2Ffluentlenium%2Fcore%2Fevents%2FAnnotationsComponentListener.java?ref=5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd", "deletions": 4, "filename": "fluentlenium-core/src/main/java/org/fluentlenium/core/events/AnnotationsComponentListener.java", "new_code": " if (element == null) {\n }\n if (components == null) {\n }\n if (element == null) {\n }\n if (components == null) {\n }", "new_methods": [], "old_code": " if (element == null)\n if (components == null)\n if (element == null)\n if (components == null)", "old_methods": [], "patch": "@@ -27,11 +27,13 @@ public AnnotationsComponentListener(ComponentsAccessor componentsAccessor) {\n }\n \n protected void findByHandler(Class<? extends Annotation> annotation, final By by, WebElement element, WebDriver driver) {\n- if (element == null)\n+ if (element == null) {\n return;\n+ }\n Set<Object> components = this.componentsAccessor.getComponents(element);\n- if (components == null)\n+ if (components == null) {\n return;\n+ }\n for (Object component : components) {\n for (Method method : ReflectionUtils.getDeclaredMethodsWithAnnotation(component, annotation)) {\n Class<?>[] parameterTypes = method.getParameterTypes();\n@@ -73,11 +75,13 @@ public void afterFindBy(By by, WebElement element, WebDriver driver) {\n }\n \n protected void defaultHandler(Class<? extends Annotation> annotation, WebElement element, WebDriver driver) {\n- if (element == null)\n+ if (element == null) {\n return;\n+ }\n Set<Object> components = this.componentsAccessor.getComponents(element);\n- if (components == null)\n+ if (components == null) {\n return;\n+ }\n for (Object component : components) {\n for (Method method : ReflectionUtils.getDeclaredMethodsWithAnnotation(component, annotation)) {\n Class<?>[] parameterTypes = method.getParameterTypes();", "raw_url": "https://github.com/FluentLenium/FluentLenium/raw/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Fmain%2Fjava%2Forg%2Ffluentlenium%2Fcore%2Fevents%2FAnnotationsComponentListener.java", "sha": "71b7bb4be4d2102ba143f3aa196e7a4148e7712d", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/FluentLenium/FluentLenium/blob/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Fmain%2Fjava%2Forg%2Ffluentlenium%2Fcore%2Fevents%2FElementListener.java", "changes": 2, "contents_url": "https://api.github.com/repos/FluentLenium/FluentLenium/contents/fluentlenium-core%2Fsrc%2Fmain%2Fjava%2Forg%2Ffluentlenium%2Fcore%2Fevents%2FElementListener.java?ref=5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd", "deletions": 1, "filename": "fluentlenium-core/src/main/java/org/fluentlenium/core/events/ElementListener.java", "new_code": " void on(FluentWebElement element, WebDriver driver);", "new_methods": [], "old_code": " void on(final FluentWebElement element, final WebDriver driver);", "old_methods": [], "patch": "@@ -14,5 +14,5 @@ public interface ElementListener {\n * @param element the element\n * @param driver the selenium driver\n */\n- void on(final FluentWebElement element, final WebDriver driver);\n+ void on(FluentWebElement element, WebDriver driver);\n }", "raw_url": "https://github.com/FluentLenium/FluentLenium/raw/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Fmain%2Fjava%2Forg%2Ffluentlenium%2Fcore%2Fevents%2FElementListener.java", "sha": "c2303a36a8073f570477310c64392074a034c320", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/FluentLenium/FluentLenium/blob/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Fmain%2Fjava%2Forg%2Ffluentlenium%2Fcore%2Fevents%2FEventAdapter.java", "changes": 2, "contents_url": "https://api.github.com/repos/FluentLenium/FluentLenium/contents/fluentlenium-core%2Fsrc%2Fmain%2Fjava%2Forg%2Ffluentlenium%2Fcore%2Fevents%2FEventAdapter.java?ref=5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd", "deletions": 1, "filename": "fluentlenium-core/src/main/java/org/fluentlenium/core/events/EventAdapter.java", "new_code": " EventAdapter(final EventListener listener, ComponentInstantiator instantiator) {", "new_methods": [], "old_code": " public EventAdapter(final EventListener listener, ComponentInstantiator instantiator) {", "old_methods": [], "patch": "@@ -12,7 +12,7 @@ class EventAdapter implements WebDriverEventListener {\n private final EventListener listener;\n private final ComponentInstantiator instantiator;\n \n- public EventAdapter(final EventListener listener, ComponentInstantiator instantiator) {\n+ EventAdapter(final EventListener listener, ComponentInstantiator instantiator) {\n this.listener = listener;\n this.instantiator = instantiator;\n }", "raw_url": "https://github.com/FluentLenium/FluentLenium/raw/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Fmain%2Fjava%2Forg%2Ffluentlenium%2Fcore%2Fevents%2FEventAdapter.java", "sha": "f0fbe806cf4c78c1873b6eb4e9360288e4522809", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/FluentLenium/FluentLenium/blob/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Fmain%2Fjava%2Forg%2Ffluentlenium%2Fcore%2Fevents%2FNavigateAllListener.java", "changes": 2, "contents_url": "https://api.github.com/repos/FluentLenium/FluentLenium/contents/fluentlenium-core%2Fsrc%2Fmain%2Fjava%2Forg%2Ffluentlenium%2Fcore%2Fevents%2FNavigateAllListener.java?ref=5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd", "deletions": 1, "filename": "fluentlenium-core/src/main/java/org/fluentlenium/core/events/NavigateAllListener.java", "new_code": " void on(String url, WebDriver driver, Direction direction);", "new_methods": [], "old_code": " void on(final String url, final WebDriver driver, final Direction direction);", "old_methods": [], "patch": "@@ -8,5 +8,5 @@ enum Direction {\n BACK, FORWARD, REFRESH\n }\n \n- void on(final String url, final WebDriver driver, final Direction direction);\n+ void on(String url, WebDriver driver, Direction direction);\n }", "raw_url": "https://github.com/FluentLenium/FluentLenium/raw/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Fmain%2Fjava%2Forg%2Ffluentlenium%2Fcore%2Fevents%2FNavigateAllListener.java", "sha": "e1e1cf2f63640d04890219550f5d18f6ebe2364f", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/FluentLenium/FluentLenium/blob/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Fmain%2Fjava%2Forg%2Ffluentlenium%2Fcore%2Fevents%2FNavigateListener.java", "changes": 2, "contents_url": "https://api.github.com/repos/FluentLenium/FluentLenium/contents/fluentlenium-core%2Fsrc%2Fmain%2Fjava%2Forg%2Ffluentlenium%2Fcore%2Fevents%2FNavigateListener.java?ref=5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd", "deletions": 1, "filename": "fluentlenium-core/src/main/java/org/fluentlenium/core/events/NavigateListener.java", "new_code": " void on(WebDriver driver);", "new_methods": [], "old_code": " void on(final WebDriver driver);", "old_methods": [], "patch": "@@ -4,5 +4,5 @@\n \n public interface NavigateListener {\n \n- void on(final WebDriver driver);\n+ void on(WebDriver driver);\n }", "raw_url": "https://github.com/FluentLenium/FluentLenium/raw/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Fmain%2Fjava%2Forg%2Ffluentlenium%2Fcore%2Fevents%2FNavigateListener.java", "sha": "f2872d082f5ea2f08a863ac5edd12211feaa2b6e", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/FluentLenium/FluentLenium/blob/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Fmain%2Fjava%2Forg%2Ffluentlenium%2Fcore%2Fevents%2FNavigateToListener.java", "changes": 2, "contents_url": "https://api.github.com/repos/FluentLenium/FluentLenium/contents/fluentlenium-core%2Fsrc%2Fmain%2Fjava%2Forg%2Ffluentlenium%2Fcore%2Fevents%2FNavigateToListener.java?ref=5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd", "deletions": 1, "filename": "fluentlenium-core/src/main/java/org/fluentlenium/core/events/NavigateToListener.java", "new_code": " void on(String url, WebDriver driver);", "new_methods": [], "old_code": " void on(final String url, final WebDriver driver);", "old_methods": [], "patch": "@@ -4,5 +4,5 @@\n \n public interface NavigateToListener {\n \n- void on(final String url, final WebDriver driver);\n+ void on(String url, WebDriver driver);\n }", "raw_url": "https://github.com/FluentLenium/FluentLenium/raw/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Fmain%2Fjava%2Forg%2Ffluentlenium%2Fcore%2Fevents%2FNavigateToListener.java", "sha": "db7fcc4fb68b48923ed00c9213bbcdf80ef3dbf6", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/FluentLenium/FluentLenium/blob/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Fmain%2Fjava%2Forg%2Ffluentlenium%2Fcore%2Fevents%2FScriptListener.java", "changes": 2, "contents_url": "https://api.github.com/repos/FluentLenium/FluentLenium/contents/fluentlenium-core%2Fsrc%2Fmain%2Fjava%2Forg%2Ffluentlenium%2Fcore%2Fevents%2FScriptListener.java?ref=5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd", "deletions": 1, "filename": "fluentlenium-core/src/main/java/org/fluentlenium/core/events/ScriptListener.java", "new_code": " void on(String script, WebDriver driver);", "new_methods": [], "old_code": " void on(final String script, final WebDriver driver);", "old_methods": [], "patch": "@@ -4,5 +4,5 @@\n \n public interface ScriptListener {\n \n- void on(final String script, final WebDriver driver);\n+ void on(String script, WebDriver driver);\n }", "raw_url": "https://github.com/FluentLenium/FluentLenium/raw/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Fmain%2Fjava%2Forg%2Ffluentlenium%2Fcore%2Fevents%2FScriptListener.java", "sha": "2a1a9740a722a97cf6ddc0aeaec8a5c61ba4ef70", "status": "modified" }, { "additions": 2, "blob_url": "https://github.com/FluentLenium/FluentLenium/blob/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Fmain%2Fjava%2Forg%2Ffluentlenium%2Fcore%2Ffilter%2FFilter.java", "changes": 3, "contents_url": "https://api.github.com/repos/FluentLenium/FluentLenium/contents/fluentlenium-core%2Fsrc%2Fmain%2Fjava%2Forg%2Ffluentlenium%2Fcore%2Ffilter%2FFilter.java?ref=5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd", "deletions": 1, "filename": "fluentlenium-core/src/main/java/org/fluentlenium/core/filter/Filter.java", "new_code": " if (matcherAttribute == null) {\n }", "new_methods": [], "old_code": " if (matcherAttribute == null)", "old_methods": [], "patch": "@@ -57,8 +57,9 @@ public String getAttribut() {\n \n public String toString() {\n String matcherAttribute = matcher != null ? matcher.getMatcherSymbol() : \"\";\n- if (matcherAttribute == null)\n+ if (matcherAttribute == null) {\n matcherAttribute = \"\";\n+ }\n return \"[\" + attribut.toLowerCase() + matcherAttribute + \"=\\\"\" + matcher.getValue() + \"\\\"]\";\n }\n ", "raw_url": "https://github.com/FluentLenium/FluentLenium/raw/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Fmain%2Fjava%2Forg%2Ffluentlenium%2Fcore%2Ffilter%2FFilter.java", "sha": "27fbfb223bb30f79921841cc63509a76a98ce2d2", "status": "modified" }, { "additions": 3, "blob_url": "https://github.com/FluentLenium/FluentLenium/blob/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Fmain%2Fjava%2Forg%2Ffluentlenium%2Fcore%2Ffilter%2FFilterPredicate.java", "changes": 6, "contents_url": "https://api.github.com/repos/FluentLenium/FluentLenium/contents/fluentlenium-core%2Fsrc%2Fmain%2Fjava%2Forg%2Ffluentlenium%2Fcore%2Ffilter%2FFilterPredicate.java?ref=5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd", "deletions": 3, "filename": "fluentlenium-core/src/main/java/org/fluentlenium/core/filter/FilterPredicate.java", "new_code": " return (\"text\".equalsIgnoreCase(filter.getAttribut()))\n ? webElementCustom.text()\n : webElementCustom.attribute(filter.getAttribut());", "new_methods": [], "old_code": " return (\"text\".equalsIgnoreCase(filter.getAttribut())) ?\n webElementCustom.text() :\n webElementCustom.attribute(filter.getAttribut());", "old_methods": [], "patch": "@@ -23,9 +23,9 @@ public boolean apply(FluentWebElement webElementCustom) {\n }\n \n private String returnTextIfTextAttributeElseAttributeValue(FluentWebElement webElementCustom) {\n- return (\"text\".equalsIgnoreCase(filter.getAttribut())) ?\n- webElementCustom.text() :\n- webElementCustom.attribute(filter.getAttribut());\n+ return (\"text\".equalsIgnoreCase(filter.getAttribut()))\n+ ? webElementCustom.text()\n+ : webElementCustom.attribute(filter.getAttribut());\n }\n \n }", "raw_url": "https://github.com/FluentLenium/FluentLenium/raw/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Fmain%2Fjava%2Forg%2Ffluentlenium%2Fcore%2Ffilter%2FFilterPredicate.java", "sha": "8dc8dacb04067f90a4295356c4867df4e0798ee1", "status": "modified" }, { "additions": 4, "blob_url": "https://github.com/FluentLenium/FluentLenium/blob/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Fmain%2Fjava%2Forg%2Ffluentlenium%2Fcore%2Finject%2FInjectionAnnotations.java", "changes": 6, "contents_url": "https://api.github.com/repos/FluentLenium/FluentLenium/contents/fluentlenium-core%2Fsrc%2Fmain%2Fjava%2Forg%2Ffluentlenium%2Fcore%2Finject%2FInjectionAnnotations.java?ref=5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd", "deletions": 2, "filename": "fluentlenium-core/src/main/java/org/fluentlenium/core/inject/InjectionAnnotations.java", "new_code": " if (effectiveClass != null) {\n }\n if (classBy != null && fieldBy instanceof ByIdOrName) {\n }", "new_methods": [], "old_code": " if (effectiveClass != null)\n if (classBy != null && fieldBy instanceof ByIdOrName)", "old_methods": [], "patch": "@@ -22,8 +22,9 @@ private static boolean isList(Field field) {\n private static Class<?> getEffectiveClass(Field field) {\n if (isList(field)) {\n Class<?> effectiveClass = ReflectionUtils.getFirstGenericType(field);\n- if (effectiveClass != null)\n+ if (effectiveClass != null) {\n return effectiveClass;\n+ }\n }\n return field.getType();\n }\n@@ -38,8 +39,9 @@ public InjectionAnnotations(Field field) {\n public By buildBy() {\n By fieldBy = fieldAnnotations.buildBy();\n By classBy = classAnnotations.buildBy();\n- if (classBy != null && fieldBy instanceof ByIdOrName)\n+ if (classBy != null && fieldBy instanceof ByIdOrName) {\n return classBy;\n+ }\n return fieldBy;\n }\n ", "raw_url": "https://github.com/FluentLenium/FluentLenium/raw/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Fmain%2Fjava%2Forg%2Ffluentlenium%2Fcore%2Finject%2FInjectionAnnotations.java", "sha": "a1a39310a9128abd5bb8a736159ea4d8a9270f5b", "status": "modified" }, { "additions": 4, "blob_url": "https://github.com/FluentLenium/FluentLenium/blob/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Fmain%2Fjava%2Forg%2Ffluentlenium%2Fcore%2Finject%2FInjectionElementLocator.java", "changes": 4, "contents_url": "https://api.github.com/repos/FluentLenium/FluentLenium/contents/fluentlenium-core%2Fsrc%2Fmain%2Fjava%2Forg%2Ffluentlenium%2Fcore%2Finject%2FInjectionElementLocator.java?ref=5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd", "deletions": 0, "filename": "fluentlenium-core/src/main/java/org/fluentlenium/core/inject/InjectionElementLocator.java", "new_code": " *\n * @return then found element\n *\n * @return list of found elements", "new_methods": [], "old_code": "", "old_methods": [], "patch": "@@ -54,6 +54,8 @@ FluentLabelProvider getLabelProvider() {\n \n /**\n * Find the element.\n+ *\n+ * @return then found element\n */\n public WebElement findElement() {\n if (cachedElement != null && shouldCache) {\n@@ -70,6 +72,8 @@ public WebElement findElement() {\n \n /**\n * Find the element list.\n+ *\n+ * @return list of found elements\n */\n public List<WebElement> findElements() {\n if (cachedElementList != null && shouldCache) {", "raw_url": "https://github.com/FluentLenium/FluentLenium/raw/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Fmain%2Fjava%2Forg%2Ffluentlenium%2Fcore%2Finject%2FInjectionElementLocator.java", "sha": "9b74bccaee59744d96bac591992368288945c346", "status": "modified" }, { "additions": 14, "blob_url": "https://github.com/FluentLenium/FluentLenium/blob/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Fmain%2Fjava%2Forg%2Ffluentlenium%2Fcore%2Fproxy%2FAbstractLocatorHandler.java", "changes": 20, "contents_url": "https://api.github.com/repos/FluentLenium/FluentLenium/contents/fluentlenium-core%2Fsrc%2Fmain%2Fjava%2Forg%2Ffluentlenium%2Fcore%2Fproxy%2FAbstractLocatorHandler.java?ref=5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd", "deletions": 6, "filename": "fluentlenium-core/src/main/java/org/fluentlenium/core/proxy/AbstractLocatorHandler.java", "new_code": " private static final int MAX_RETRY = 5;\n private static final int HASH_CODE_SEED = 2048;\n\n public abstract T getLocatorResultImpl();\n if (getElement() == null) {\n }\n return HASH_CODE_SEED + locator.hashCode();\n for (int i = 0; i < MAX_RETRY; i++) {\n //CHECKSTYLE.OFF: IllegalThrows\n //CHECKSTYLE.ON: IllegalThrows\n if (this == o) {\n }\n if (o == null || getClass() != o.getClass()) {\n }", "new_methods": [ { "arguments": [ "this == o" ], "filename": "fluentlenium-core/src/main/java/org/fluentlenium/core/proxy/AbstractLocatorHandler.java", "implementation": "", "signature": "IllegalThrows\n if (this == o)" } ], "old_code": " abstract public T getLocatorResultImpl();\n if (getElement() == null)\n return 2048 + locator.hashCode();\n for (int i = 0; i < 5; i++) {\n if (this == o)\n if (o == null || getClass() != o.getClass())", "old_methods": [], "patch": "@@ -27,6 +27,9 @@ public abstract class AbstractLocatorHandler<T> implements InvocationHandler, Lo\n private static final Method EQUALS = getMethod(Object.class, \"equals\", Object.class);\n private static final Method HASH_CODE = getMethod(Object.class, \"hashCode\");\n \n+ private static final int MAX_RETRY = 5;\n+ private static final int HASH_CODE_SEED = 2048;\n+\n protected HookChainBuilder hookChainBuilder = null;\n protected List<HookDefinition<?>> hookDefinitions = null;\n \n@@ -78,7 +81,7 @@ public void setProxy(T proxy) {\n this.proxy = proxy;\n }\n \n- abstract public T getLocatorResultImpl();\n+ public abstract T getLocatorResultImpl();\n \n public synchronized T getLocatorResult() {\n if (result != null) {\n@@ -143,8 +146,9 @@ public ElementLocator getHookLocator() {\n \n @Override\n public WebElement getHookElement() {\n- if (getElement() == null)\n+ if (getElement() == null) {\n return null;\n+ }\n if (hooks != null && hooks.size() > 0) {\n return hooks.get(hooks.size() - 1);\n }\n@@ -196,7 +200,7 @@ public Object invoke(Object proxy, Method method, Object[] args) throws Throwabl\n }\n \n if (HASH_CODE.equals(method)) {\n- return 2048 + locator.hashCode();\n+ return HASH_CODE_SEED + locator.hashCode();\n }\n }\n \n@@ -211,7 +215,7 @@ public Object invoke(Object proxy, Method method, Object[] args) throws Throwabl\n getLocatorResult();\n \n Throwable lastThrowable = null;\n- for (int i = 0; i < 5; i++) {\n+ for (int i = 0; i < MAX_RETRY; i++) {\n try {\n return invoke(method, args);\n } catch (StaleElementReferenceException e) {\n@@ -224,6 +228,7 @@ public Object invoke(Object proxy, Method method, Object[] args) throws Throwabl\n throw lastThrowable;\n }\n \n+ //CHECKSTYLE.OFF: IllegalThrows\n private Object invoke(Method method, Object[] args) throws Throwable {\n Object returnValue;\n try {\n@@ -234,13 +239,16 @@ private Object invoke(Method method, Object[] args) throws Throwable {\n }\n return returnValue;\n }\n+ //CHECKSTYLE.ON: IllegalThrows\n \n @Override\n public boolean equals(Object o) {\n- if (this == o)\n+ if (this == o) {\n return true;\n- if (o == null || getClass() != o.getClass())\n+ }\n+ if (o == null || getClass() != o.getClass()) {\n return false;\n+ }\n \n AbstractLocatorHandler that = (AbstractLocatorHandler) o;\n ", "raw_url": "https://github.com/FluentLenium/FluentLenium/raw/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Fmain%2Fjava%2Forg%2Ffluentlenium%2Fcore%2Fproxy%2FAbstractLocatorHandler.java", "sha": "8f9e0e139914045a22bdcafd5f712a5bfaba04a9", "status": "modified" }, { "additions": 4, "blob_url": "https://github.com/FluentLenium/FluentLenium/blob/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Fmain%2Fjava%2Forg%2Ffluentlenium%2Fcore%2Fproxy%2FAtIndexElementLocator.java", "changes": 6, "contents_url": "https://api.github.com/repos/FluentLenium/FluentLenium/contents/fluentlenium-core%2Fsrc%2Fmain%2Fjava%2Forg%2Ffluentlenium%2Fcore%2Fproxy%2FAtIndexElementLocator.java?ref=5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd", "deletions": 2, "filename": "fluentlenium-core/src/main/java/org/fluentlenium/core/proxy/AtIndexElementLocator.java", "new_code": " if (index >= elements.size()) {\n }\n if (element == null) {\n }", "new_methods": [], "old_code": " if (index >= elements.size())\n if (element == null)", "old_methods": [], "patch": "@@ -22,16 +22,18 @@ public AtIndexElementLocator(ElementLocator listLocator, int index) {\n @Override\n public WebElement findElement() {\n List<WebElement> elements = this.listLocator.findElements();\n- if (index >= elements.size())\n+ if (index >= elements.size()) {\n return null;\n+ }\n return elements.get(index);\n }\n \n @Override\n public List<WebElement> findElements() {\n WebElement element = findElement();\n- if (element == null)\n+ if (element == null) {\n return Collections.emptyList();\n+ }\n return Arrays.asList(element);\n }\n ", "raw_url": "https://github.com/FluentLenium/FluentLenium/raw/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Fmain%2Fjava%2Forg%2Ffluentlenium%2Fcore%2Fproxy%2FAtIndexElementLocator.java", "sha": "63ecd1b1f6e221ee1d6237723a80fa978a9360bf", "status": "modified" }, { "additions": 2, "blob_url": "https://github.com/FluentLenium/FluentLenium/blob/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Fmain%2Fjava%2Forg%2Ffluentlenium%2Fcore%2Fproxy%2FComponentHandler.java", "changes": 2, "contents_url": "https://api.github.com/repos/FluentLenium/FluentLenium/contents/fluentlenium-core%2Fsrc%2Fmain%2Fjava%2Forg%2Ffluentlenium%2Fcore%2Fproxy%2FComponentHandler.java?ref=5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd", "deletions": 0, "filename": "fluentlenium-core/src/main/java/org/fluentlenium/core/proxy/ComponentHandler.java", "new_code": " //CHECKSTYLE.OFF: IllegalThrows\n //CHECKSTYLE.ON: IllegalThrows", "new_methods": [], "old_code": "", "old_methods": [], "patch": "@@ -68,11 +68,13 @@ protected WebElement getInvocationTarget(Method method) {\n return getHookElement();\n }\n \n+ //CHECKSTYLE.OFF: IllegalThrows\n public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {\n if (GET_WRAPPED_ELEMENT.equals(method)) {\n return isLoaded() ? getLocatorResult() : proxy;\n }\n return super.invoke(proxy, method, args);\n }\n+ //CHECKSTYLE.ON: IllegalThrows\n \n }", "raw_url": "https://github.com/FluentLenium/FluentLenium/raw/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Fmain%2Fjava%2Forg%2Ffluentlenium%2Fcore%2Fproxy%2FComponentHandler.java", "sha": "4d0b6aad64ca27724d5de720ad5f081a7ad99a01", "status": "modified" }, { "additions": 2, "blob_url": "https://github.com/FluentLenium/FluentLenium/blob/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Fmain%2Fjava%2Forg%2Ffluentlenium%2Fcore%2Fproxy%2FElementSupplierLocator.java", "changes": 3, "contents_url": "https://api.github.com/repos/FluentLenium/FluentLenium/contents/fluentlenium-core%2Fsrc%2Fmain%2Fjava%2Forg%2Ffluentlenium%2Fcore%2Fproxy%2FElementSupplierLocator.java?ref=5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd", "deletions": 1, "filename": "fluentlenium-core/src/main/java/org/fluentlenium/core/proxy/ElementSupplierLocator.java", "new_code": " if (webElement == null) {\n }", "new_methods": [], "old_code": " if (webElement == null)", "old_methods": [], "patch": "@@ -26,8 +26,9 @@ public WebElement findElement() {\n @Override\n public List<WebElement> findElements() {\n WebElement webElement = elementSupplier.get();\n- if (webElement == null)\n+ if (webElement == null) {\n return Collections.emptyList();\n+ }\n return Arrays.asList(webElement);\n }\n }", "raw_url": "https://github.com/FluentLenium/FluentLenium/raw/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Fmain%2Fjava%2Forg%2Ffluentlenium%2Fcore%2Fproxy%2FElementSupplierLocator.java", "sha": "015224fad37fd4475bf612f72a74f8a4c636e25b", "status": "modified" }, { "additions": 4, "blob_url": "https://github.com/FluentLenium/FluentLenium/blob/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Fmain%2Fjava%2Forg%2Ffluentlenium%2Fcore%2Fproxy%2FLastElementLocator.java", "changes": 6, "contents_url": "https://api.github.com/repos/FluentLenium/FluentLenium/contents/fluentlenium-core%2Fsrc%2Fmain%2Fjava%2Forg%2Ffluentlenium%2Fcore%2Fproxy%2FLastElementLocator.java?ref=5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd", "deletions": 2, "filename": "fluentlenium-core/src/main/java/org/fluentlenium/core/proxy/LastElementLocator.java", "new_code": " if (elements.size() == 0) {\n }\n if (element == null) {\n }", "new_methods": [], "old_code": " if (elements.size() == 0)\n if (element == null)", "old_methods": [], "patch": "@@ -20,16 +20,18 @@ public LastElementLocator(ElementLocator listLocator) {\n @Override\n public WebElement findElement() {\n List<WebElement> elements = this.listLocator.findElements();\n- if (elements.size() == 0)\n+ if (elements.size() == 0) {\n return null;\n+ }\n return elements.get(elements.size() - 1);\n }\n \n @Override\n public List<WebElement> findElements() {\n WebElement element = findElement();\n- if (element == null)\n+ if (element == null) {\n return Collections.emptyList();\n+ }\n return Arrays.asList(element);\n }\n ", "raw_url": "https://github.com/FluentLenium/FluentLenium/raw/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Fmain%2Fjava%2Forg%2Ffluentlenium%2Fcore%2Fproxy%2FLastElementLocator.java", "sha": "6ff59e121154092d89c839d51720e10de44206f1", "status": "modified" }, { "additions": 4, "blob_url": "https://github.com/FluentLenium/FluentLenium/blob/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Fmain%2Fjava%2Forg%2Ffluentlenium%2Fcore%2Fproxy%2FListHandler.java", "changes": 6, "contents_url": "https://api.github.com/repos/FluentLenium/FluentLenium/contents/fluentlenium-core%2Fsrc%2Fmain%2Fjava%2Forg%2Ffluentlenium%2Fcore%2Fproxy%2FListHandler.java?ref=5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd", "deletions": 2, "filename": "fluentlenium-core/src/main/java/org/fluentlenium/core/proxy/ListHandler.java", "new_code": " if (foundElements == null) {\n }\n if (foundElements == null) {\n }", "new_methods": [], "old_code": " if (foundElements == null)\n if (foundElements == null)", "old_methods": [], "patch": "@@ -21,8 +21,9 @@ public ListHandler(ElementLocator locator) {\n if (this.locator instanceof WrapsElements) {\n fireProxyElementSearch();\n List<WebElement> foundElements = ((WrapsElements) this.locator).getWrappedElements();\n- if (foundElements == null)\n+ if (foundElements == null) {\n foundElements = Collections.emptyList();\n+ }\n this.result = wrapElements(foundElements);\n fireProxyElementFound(this.result);\n }\n@@ -63,8 +64,9 @@ protected boolean isStale() {\n @Override\n public List<WebElement> getLocatorResultImpl() {\n List<WebElement> foundElements = getHookLocator().findElements();\n- if (foundElements == null)\n+ if (foundElements == null) {\n foundElements = Collections.emptyList();\n+ }\n return wrapElements(foundElements);\n }\n ", "raw_url": "https://github.com/FluentLenium/FluentLenium/raw/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Fmain%2Fjava%2Forg%2Ffluentlenium%2Fcore%2Fproxy%2FListHandler.java", "sha": "6ab93727124d8cf68a4015973ee7b3d3be8628c0", "status": "modified" }, { "additions": 9, "blob_url": "https://github.com/FluentLenium/FluentLenium/blob/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Fmain%2Fjava%2Forg%2Ffluentlenium%2Fcore%2Fproxy%2FLocatorProxies.java", "changes": 13, "contents_url": "https://api.github.com/repos/FluentLenium/FluentLenium/contents/fluentlenium-core%2Fsrc%2Fmain%2Fjava%2Forg%2Ffluentlenium%2Fcore%2Fproxy%2FLocatorProxies.java?ref=5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd", "deletions": 4, "filename": "fluentlenium-core/src/main/java/org/fluentlenium/core/proxy/LocatorProxies.java", "new_code": "public final class LocatorProxies {\n private LocatorProxies() {\n // Utility class\n }\n\n if (locatorHandler == null) {\n }\n new Class[] {WebElement.class, Locatable.class, WrapsElement.class}, handler);\n .newProxyInstance(locator.getClass().getClassLoader(), new Class[] {List.class, WrapsElements.class}, handler);", "new_methods": [ { "arguments": [], "filename": "fluentlenium-core/src/main/java/org/fluentlenium/core/proxy/LocatorProxies.java", "implementation": "// Utility class", "signature": "private LocatorProxies()" } ], "old_code": "public class LocatorProxies {\n if (locatorHandler == null)\n new Class[] { WebElement.class, Locatable.class, WrapsElement.class }, handler);\n .newProxyInstance(locator.getClass().getClassLoader(), new Class[] { List.class, WrapsElements.class }, handler);", "old_methods": [], "patch": "@@ -16,7 +16,11 @@\n /**\n * Utility class to create proxies of WebElement, Component, FluentList and List of Components based on their locators.\n */\n-public class LocatorProxies {\n+public final class LocatorProxies {\n+ private LocatorProxies() {\n+ // Utility class\n+ }\n+\n public static LocatorHandler getLocatorHandler(Object proxy) {\n while (proxy instanceof WrapsElements && !Proxy.isProxyClass(proxy.getClass())) {\n proxy = ((WrapsElements) proxy).getWrappedElements();\n@@ -47,8 +51,9 @@ public static void reset(Object proxy) {\n \n public static boolean isPresent(Object proxy) {\n LocatorHandler locatorHandler = getLocatorHandler(proxy);\n- if (locatorHandler == null)\n+ if (locatorHandler == null) {\n return true;\n+ }\n return locatorHandler.isPresent();\n }\n \n@@ -98,7 +103,7 @@ public static WebElement createWebElement(Supplier<WebElement> elementSupplier)\n public static WebElement createWebElement(ElementLocator locator) {\n final ComponentHandler handler = new ComponentHandler(locator);\n WebElement proxy = (WebElement) Proxy.newProxyInstance(locator.getClass().getClassLoader(),\n- new Class[] { WebElement.class, Locatable.class, WrapsElement.class }, handler);\n+ new Class[] {WebElement.class, Locatable.class, WrapsElement.class}, handler);\n handler.setProxy(proxy);\n return proxy;\n }\n@@ -114,7 +119,7 @@ public static List<WebElement> createWebElementList(Supplier<List<WebElement>> e\n public static List<WebElement> createWebElementList(ElementLocator locator) {\n final ListHandler handler = new ListHandler(locator);\n List<WebElement> proxy = (List<WebElement>) Proxy\n- .newProxyInstance(locator.getClass().getClassLoader(), new Class[] { List.class, WrapsElements.class }, handler);\n+ .newProxyInstance(locator.getClass().getClassLoader(), new Class[] {List.class, WrapsElements.class}, handler);\n handler.setProxy(proxy);\n return proxy;\n }", "raw_url": "https://github.com/FluentLenium/FluentLenium/raw/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Fmain%2Fjava%2Forg%2Ffluentlenium%2Fcore%2Fproxy%2FLocatorProxies.java", "sha": "2049085a0cb2e6023a708a5314c5b3c3e6714b06", "status": "modified" }, { "additions": 5, "blob_url": "https://github.com/FluentLenium/FluentLenium/blob/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Fmain%2Fjava%2Forg%2Ffluentlenium%2Fcore%2Fsearch%2FSearchControl.java", "changes": 8, "contents_url": "https://api.github.com/repos/FluentLenium/FluentLenium/contents/fluentlenium-core%2Fsrc%2Fmain%2Fjava%2Forg%2Ffluentlenium%2Fcore%2Fsearch%2FSearchControl.java?ref=5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd", "deletions": 3, "filename": "fluentlenium-core/src/main/java/org/fluentlenium/core/search/SearchControl.java", "new_code": " //CHECKSTYLE.OFF: MethodName\n FluentList<E> find(By locator, Filter... filters);\n FluentList<E> $(By locator, Filter... filters);\n E el(By locator, Filter... filters);\n //CHECKSTYLE.ON: MethodName", "new_methods": [], "old_code": " FluentList<E> find(By locator, final Filter... filters);\n FluentList<E> $(By locator, final Filter... filters);\n E el(By locator, final Filter... filters);", "old_methods": [], "patch": "@@ -6,6 +6,7 @@\n import org.openqa.selenium.By;\n \n public interface SearchControl<E extends FluentWebElement> {\n+ //CHECKSTYLE.OFF: MethodName\n /**\n * Find list of elements with CSS selector and filters.\n *\n@@ -64,7 +65,7 @@ public interface SearchControl<E extends FluentWebElement> {\n * @param filters filters set\n * @return list of elements\n */\n- FluentList<E> find(By locator, final Filter... filters);\n+ FluentList<E> find(By locator, Filter... filters);\n \n /**\n * Find list of elements with Selenium locator and filters.\n@@ -73,7 +74,7 @@ public interface SearchControl<E extends FluentWebElement> {\n * @param filters filters set\n * @return list of elements\n */\n- FluentList<E> $(By locator, final Filter... filters);\n+ FluentList<E> $(By locator, Filter... filters);\n \n /**\n * Find first element with Selenium locator and filters.\n@@ -82,5 +83,6 @@ public interface SearchControl<E extends FluentWebElement> {\n * @param filters filters set\n * @return element\n */\n- E el(By locator, final Filter... filters);\n+ E el(By locator, Filter... filters);\n+ //CHECKSTYLE.ON: MethodName\n }", "raw_url": "https://github.com/FluentLenium/FluentLenium/raw/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Fmain%2Fjava%2Forg%2Ffluentlenium%2Fcore%2Fsearch%2FSearchControl.java", "sha": "1eb3e42c3277a4f6707f151941e06c2e83b5c4c5", "status": "modified" }, { "additions": 22, "blob_url": "https://github.com/FluentLenium/FluentLenium/blob/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Fmain%2Fjava%2Forg%2Ffluentlenium%2Futils%2FReflectionUtils.java", "changes": 32, "contents_url": "https://api.github.com/repos/FluentLenium/FluentLenium/contents/fluentlenium-core%2Fsrc%2Fmain%2Fjava%2Forg%2Ffluentlenium%2Futils%2FReflectionUtils.java?ref=5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd", "deletions": 10, "filename": "fluentlenium-core/src/main/java/org/fluentlenium/utils/ReflectionUtils.java", "new_code": "public final class ReflectionUtils {\n private ReflectionUtils() {\n // Utility class\n }\n\n if (parameterTypes.length != argsTypes.length) {\n }\n if (argsTypes.length == mandatoryCount) {\n }\n if (args.length == mandatoryCount) {\n }\n if (object == null) {\n return getDeclaredMethodsWithAnnotation(null, annotation);\n }\n if (objectClass == null) {\n }\n if (accessible) {\n }\n if (accessible) {\n }\n if (accessible) {\n }", "new_methods": [ { "arguments": [], "filename": "fluentlenium-core/src/main/java/org/fluentlenium/utils/ReflectionUtils.java", "implementation": "// Utility class", "signature": "private ReflectionUtils()" } ], "old_code": "public class ReflectionUtils {\n if (parameterTypes.length != argsTypes.length)\n if (argsTypes.length == mandatoryCount)\n if (args.length == mandatoryCount)\n if (object == null)\n return getDeclaredMethodsWithAnnotation((Class<?>) null, annotation);\n if (objectClass == null)\n if (accessible)\n if (accessible)\n if (accessible)", "old_methods": [], "patch": "@@ -23,7 +23,11 @@\n /**\n * Utility class for reflection.\n */\n-public class ReflectionUtils {\n+public final class ReflectionUtils {\n+ private ReflectionUtils() {\n+ // Utility class\n+ }\n+\n private static final Class<?>[] EMPTY_CLASS_ARRAY = new Class<?>[0];\n private static final Object[] EMPTY_OBJECT_ARRAY = new Object[0];\n \n@@ -154,8 +158,9 @@ public static <T> Constructor<T> getConstructor(Class<T> cls, Class<?>... argsTy\n } catch (NoSuchMethodException e) {\n for (Constructor<?> constructor : cls.getDeclaredConstructors()) {\n Class<?>[] parameterTypes = constructor.getParameterTypes();\n- if (parameterTypes.length != argsTypes.length)\n+ if (parameterTypes.length != argsTypes.length) {\n continue;\n+ }\n \n boolean match = true;\n for (int i = 0; i < parameterTypes.length; i++) {\n@@ -209,8 +214,9 @@ public static <T> Constructor<T> getConstructorOptional(int mandatoryCount, Clas\n try {\n return getConstructor(cls, argsTypes);\n } catch (NoSuchMethodException e) {\n- if (argsTypes.length == mandatoryCount)\n+ if (argsTypes.length == mandatoryCount) {\n break;\n+ }\n argsTypes = Arrays.copyOf(argsTypes, argsTypes.length - 1);\n }\n }\n@@ -293,17 +299,19 @@ public static <T> T newInstanceOptionalArgs(int mandatoryCount, Class<T> cls, Ob\n try {\n return newInstance(cls, args);\n } catch (NoSuchMethodException e) {\n- if (args.length == mandatoryCount)\n+ if (args.length == mandatoryCount) {\n break;\n+ }\n args = Arrays.copyOf(args, args.length - 1);\n }\n }\n throw new NoSuchMethodException(\"Can't find any valid constructor.\");\n }\n \n public static List<Method> getDeclaredMethodsWithAnnotation(Object object, Class<? extends Annotation> annotation) {\n- if (object == null)\n- return getDeclaredMethodsWithAnnotation((Class<?>) null, annotation);\n+ if (object == null) {\n+ return getDeclaredMethodsWithAnnotation(null, annotation);\n+ }\n return getDeclaredMethodsWithAnnotation(object.getClass(), annotation);\n }\n \n@@ -317,8 +325,9 @@ public static List<Method> getDeclaredMethodsWithAnnotation(Object object, Class\n public static List<Method> getDeclaredMethodsWithAnnotation(Class<?> objectClass, Class<? extends Annotation> annotation) {\n List<Method> methods = new ArrayList<>();\n \n- if (objectClass == null)\n+ if (objectClass == null) {\n return methods;\n+ }\n \n ClassAnnotationKey cacheKey = new ClassAnnotationKey(objectClass, annotation);\n if (DECLARED_METHODS_CACHE.containsKey(cacheKey)) {\n@@ -353,8 +362,9 @@ public static List<Method> getDeclaredMethodsWithAnnotation(Class<?> objectClass\n public static Object invoke(Method method, Object obj, Object... args)\n throws InvocationTargetException, IllegalAccessException {\n boolean accessible = method.isAccessible();\n- if (accessible)\n+ if (accessible) {\n return method.invoke(obj, args);\n+ }\n method.setAccessible(true);\n try {\n return method.invoke(obj, args);\n@@ -376,8 +386,9 @@ public static Object invoke(Method method, Object obj, Object... args)\n */\n public static Object get(Field field, Object obj) throws IllegalAccessException {\n boolean accessible = field.isAccessible();\n- if (accessible)\n+ if (accessible) {\n return field.get(obj);\n+ }\n field.setAccessible(true);\n try {\n return field.get(obj);\n@@ -399,8 +410,9 @@ public static Object get(Field field, Object obj) throws IllegalAccessException\n */\n public static void set(Field field, Object obj, Object value) throws IllegalAccessException {\n boolean accessible = field.isAccessible();\n- if (accessible)\n+ if (accessible) {\n field.set(obj, value);\n+ }\n field.setAccessible(true);\n try {\n field.set(obj, value);", "raw_url": "https://github.com/FluentLenium/FluentLenium/raw/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Fmain%2Fjava%2Forg%2Ffluentlenium%2Futils%2FReflectionUtils.java", "sha": "99e031d698c900056509d20a718e8e9b992a3a7e", "status": "modified" }, { "additions": 20, "blob_url": "https://github.com/FluentLenium/FluentLenium/blob/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fadapter%2FFluentAdapterTest.java", "changes": 40, "contents_url": "https://api.github.com/repos/FluentLenium/FluentLenium/contents/fluentlenium-core%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fadapter%2FFluentAdapterTest.java?ref=5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd", "deletions": 20, "filename": "fluentlenium-core/src/test/java/org/fluentlenium/adapter/FluentAdapterTest.java", "new_code": " public void isDriverAvailableBehavesAsExpected() {\n public void deletagesToWebDriverWhenInitialized() {\n public void registeringSameDriverMultipleTimeDoesntThrowException() {\n public void registeringAnotherDriverThrowException() {\n public void registeringSameDriverDoesntThrowException() {\n public void shouldConfigureProperly() {\n public void shouldNewWebDriverCreateNewInstances() {\n WebDriver newWebDriver = null;\n WebDriver newWebDriver2 = null;\n newWebDriver = adapter.newWebDriver();\n newWebDriver2 = adapter.newWebDriver();\n assertThat(newWebDriver).isNotSameAs(newWebDriver2);\n assertThat(newWebDriver).isInstanceOf(EventFiringWebDriver.class);\n assertThat(newWebDriver2).isInstanceOf(EventFiringWebDriver.class);\n assertThat(((WrapsDriver) newWebDriver).getWrappedDriver()).isInstanceOf(HtmlUnitDriver.class);\n assertThat(((WrapsDriver) newWebDriver).getWrappedDriver()).isInstanceOf(HtmlUnitDriver.class);\n if (newWebDriver != null) {\n newWebDriver.quit();\n if (newWebDriver2 != null) {\n newWebDriver2.quit();", "new_methods": [], "old_code": " public void is_driver_available_behaves_as_expected() {\n public void deletages_to_webdriver_when_initialized() {\n public void registering_same_driver_multiple_time_doesnt_throw_exception() {\n public void registering_another_driver_throw_exception() {\n public void registering_same_driver_doesnt_throw_exception() {\n public void should_configure_properly() {\n public void should_new_web_driver_create_new_instances() {\n WebDriver webDriver = null;\n WebDriver webDriver2 = null;\n webDriver = adapter.newWebDriver();\n webDriver2 = adapter.newWebDriver();\n assertThat(webDriver).isNotSameAs(webDriver2);\n assertThat(webDriver).isInstanceOf(EventFiringWebDriver.class);\n assertThat(webDriver2).isInstanceOf(EventFiringWebDriver.class);\n assertThat(((WrapsDriver) webDriver).getWrappedDriver()).isInstanceOf(HtmlUnitDriver.class);\n assertThat(((WrapsDriver) webDriver).getWrappedDriver()).isInstanceOf(HtmlUnitDriver.class);\n if (webDriver != null) {\n webDriver.quit();\n if (webDriver2 != null) {\n webDriver2.quit();", "old_methods": [], "patch": "@@ -25,7 +25,7 @@ public class FluentAdapterTest {\n private SharedMutator sharedMutator;\n \n @Test\n- public void is_driver_available_behaves_as_expected() {\n+ public void isDriverAvailableBehavesAsExpected() {\n FluentAdapter adapter = new FluentAdapter(webDriver);\n assertThat(adapter.isFluentDriverAvailable()).isTrue();\n \n@@ -34,7 +34,7 @@ public void is_driver_available_behaves_as_expected() {\n }\n \n @Test\n- public void deletages_to_webdriver_when_initialized() {\n+ public void deletagesToWebDriverWhenInitialized() {\n FluentAdapter adapter = new FluentAdapter();\n adapter.initFluent(webDriver);\n \n@@ -43,7 +43,7 @@ public void deletages_to_webdriver_when_initialized() {\n }\n \n @Test\n- public void registering_same_driver_multiple_time_doesnt_throw_exception() {\n+ public void registeringSameDriverMultipleTimeDoesntThrowException() {\n FluentAdapter adapter = new FluentAdapter();\n adapter.initFluent(webDriver);\n \n@@ -52,21 +52,21 @@ public void registering_same_driver_multiple_time_doesnt_throw_exception() {\n }\n \n @Test(expected = IllegalStateException.class)\n- public void registering_another_driver_throw_exception() {\n+ public void registeringAnotherDriverThrowException() {\n FluentAdapter adapter = new FluentAdapter();\n adapter.initFluent(webDriver);\n adapter.initFluent(webDriver2);\n }\n \n @Test\n- public void registering_same_driver_doesnt_throw_exception() {\n+ public void registeringSameDriverDoesntThrowException() {\n FluentAdapter adapter = new FluentAdapter();\n adapter.initFluent(webDriver);\n adapter.initFluent(webDriver);\n }\n \n @Test\n- public void should_configure_properly() {\n+ public void shouldConfigureProperly() {\n FluentAdapter adapter = new FluentAdapter();\n \n adapter.getConfiguration().setScreenshotMode(ConfigurationProperties.TriggerMode.AUTOMATIC_ON_FAIL);\n@@ -87,7 +87,7 @@ public void should_configure_properly() {\n }\n \n @Test\n- public void should_new_web_driver_create_new_instances() {\n+ public void shouldNewWebDriverCreateNewInstances() {\n FluentAdapter adapter = new FluentAdapter() {\n @Override\n public String getWebDriver() {\n@@ -97,24 +97,24 @@ public String getWebDriver() {\n \n adapter.initFluent(this.webDriver);\n \n- WebDriver webDriver = null;\n- WebDriver webDriver2 = null;\n+ WebDriver newWebDriver = null;\n+ WebDriver newWebDriver2 = null;\n try {\n- webDriver = adapter.newWebDriver();\n- webDriver2 = adapter.newWebDriver();\n+ newWebDriver = adapter.newWebDriver();\n+ newWebDriver2 = adapter.newWebDriver();\n \n- assertThat(webDriver).isNotSameAs(webDriver2);\n- assertThat(webDriver).isInstanceOf(EventFiringWebDriver.class);\n- assertThat(webDriver2).isInstanceOf(EventFiringWebDriver.class);\n+ assertThat(newWebDriver).isNotSameAs(newWebDriver2);\n+ assertThat(newWebDriver).isInstanceOf(EventFiringWebDriver.class);\n+ assertThat(newWebDriver2).isInstanceOf(EventFiringWebDriver.class);\n \n- assertThat(((WrapsDriver) webDriver).getWrappedDriver()).isInstanceOf(HtmlUnitDriver.class);\n- assertThat(((WrapsDriver) webDriver).getWrappedDriver()).isInstanceOf(HtmlUnitDriver.class);\n+ assertThat(((WrapsDriver) newWebDriver).getWrappedDriver()).isInstanceOf(HtmlUnitDriver.class);\n+ assertThat(((WrapsDriver) newWebDriver).getWrappedDriver()).isInstanceOf(HtmlUnitDriver.class);\n } finally {\n- if (webDriver != null) {\n- webDriver.quit();\n+ if (newWebDriver != null) {\n+ newWebDriver.quit();\n }\n- if (webDriver2 != null) {\n- webDriver2.quit();\n+ if (newWebDriver2 != null) {\n+ newWebDriver2.quit();\n }\n }\n ", "raw_url": "https://github.com/FluentLenium/FluentLenium/raw/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fadapter%2FFluentAdapterTest.java", "sha": "8021a9735fa5f563ce3c85401f403f9c51e05fec", "status": "modified" }, { "additions": 7, "blob_url": "https://github.com/FluentLenium/FluentLenium/blob/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fadapter%2FSharedWebDriverContainerTest.java", "changes": 15, "contents_url": "https://api.github.com/repos/FluentLenium/FluentLenium/contents/fluentlenium-core%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fadapter%2FSharedWebDriverContainerTest.java?ref=5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd", "deletions": 8, "filename": "fluentlenium-core/src/test/java/org/fluentlenium/adapter/SharedWebDriverContainerTest.java", "new_code": " public void getOrCreateDriverWithSameTestNamesCreatesOneInstance() {\n public void getOrCreateDriverWithDifferentTestNamesCreatesDistinctInstances() {\n public void getOrCreateDriverWithDifferentTestClassesCreatesDistinctInstances() {\n public void getOrCreateDriverWithDifferentTestNamesAndStrategyPerClassCreatesOneInstance() {\n public void getOrCreateDriverWithDifferentTestNamesAndDifferentTestClassAndStrategyPerClassCreatesDistinctInstance() {\n public void getOrCreateDriverWithDifferentTestNamesAndDifferentTestClassAndStrategyOnceCreatesOneInstance() {\n public void quitAllShouldQuitAllDrivers() {", "new_methods": [], "old_code": " public void getOrCreateDriver_with_same_test_names_creates_one_instance() {\n public void getOrCreateDriver_with_different_test_names_creates_distinct_instances() {\n public void getOrCreateDriver_with_different_test_classes_creates_distinct_instances() {\n public void getOrCreateDriver_with_different_test_names_and_strategy_per_class_creates_one_instance() {\n public void\n getOrCreateDriver_with_different_test_names_and_different_test_class_and_strategy_per_class_creates_distinct_instance() {\n public void getOrCreateDriver_with_different_test_names_and_different_test_class_and_strategy_once_creates_one_instance() {\n public void quitAll_should_quit_all_drivers() {", "old_methods": [], "patch": "@@ -29,7 +29,7 @@ public void after() {\n }\n \n @Test\n- public void getOrCreateDriver_with_same_test_names_creates_one_instance() {\n+ public void getOrCreateDriverWithSameTestNamesCreatesOneInstance() {\n SharedWebDriver driver = container.getOrCreateDriver(this, Object.class, \"test\", DriverLifecycle.METHOD);\n \n assertThat(container.getAllDrivers()).containsOnly(driver);\n@@ -48,7 +48,7 @@ public void getOrCreateDriver_with_same_test_names_creates_one_instance() {\n }\n \n @Test\n- public void getOrCreateDriver_with_different_test_names_creates_distinct_instances() {\n+ public void getOrCreateDriverWithDifferentTestNamesCreatesDistinctInstances() {\n SharedWebDriver driver = container.getOrCreateDriver(this, Object.class, \"test\", DriverLifecycle.METHOD);\n \n assertThat(container.getAllDrivers()).containsOnly(driver);\n@@ -71,7 +71,7 @@ public void getOrCreateDriver_with_different_test_names_creates_distinct_instanc\n }\n \n @Test\n- public void getOrCreateDriver_with_different_test_classes_creates_distinct_instances() {\n+ public void getOrCreateDriverWithDifferentTestClassesCreatesDistinctInstances() {\n SharedWebDriver driver = container.getOrCreateDriver(this, Object.class, \"test\", DriverLifecycle.METHOD);\n \n assertThat(container.getAllDrivers()).containsOnly(driver);\n@@ -97,7 +97,7 @@ public void getOrCreateDriver_with_different_test_classes_creates_distinct_insta\n }\n \n @Test\n- public void getOrCreateDriver_with_different_test_names_and_strategy_per_class_creates_one_instance() {\n+ public void getOrCreateDriverWithDifferentTestNamesAndStrategyPerClassCreatesOneInstance() {\n SharedWebDriver driver = container.getOrCreateDriver(this, Object.class, \"test\", DriverLifecycle.CLASS);\n \n assertThat(container.getAllDrivers()).containsOnly(driver);\n@@ -116,8 +116,7 @@ public void getOrCreateDriver_with_different_test_names_and_strategy_per_class_c\n }\n \n @Test\n- public void\n- getOrCreateDriver_with_different_test_names_and_different_test_class_and_strategy_per_class_creates_distinct_instance() {\n+ public void getOrCreateDriverWithDifferentTestNamesAndDifferentTestClassAndStrategyPerClassCreatesDistinctInstance() {\n SharedWebDriver driver = container.getOrCreateDriver(this, Object.class, \"test\", DriverLifecycle.CLASS);\n \n assertThat(container.getAllDrivers()).containsOnly(driver);\n@@ -143,7 +142,7 @@ public void getOrCreateDriver_with_different_test_names_and_strategy_per_class_c\n }\n \n @Test\n- public void getOrCreateDriver_with_different_test_names_and_different_test_class_and_strategy_once_creates_one_instance() {\n+ public void getOrCreateDriverWithDifferentTestNamesAndDifferentTestClassAndStrategyOnceCreatesOneInstance() {\n SharedWebDriver driver = container.getOrCreateDriver(this, Object.class, \"test\", DriverLifecycle.JVM);\n \n assertThat(container.getAllDrivers()).containsOnly(driver);\n@@ -165,7 +164,7 @@ public void getOrCreateDriver_with_different_test_names_and_different_test_class\n }\n \n @Test\n- public void quitAll_should_quit_all_drivers() {\n+ public void quitAllShouldQuitAllDrivers() {\n SharedWebDriver driver = container.getOrCreateDriver(this, Object.class, \"test\", DriverLifecycle.METHOD);\n SharedWebDriver driver2 = container.getOrCreateDriver(this, String.class, \"test\", DriverLifecycle.METHOD);\n ", "raw_url": "https://github.com/FluentLenium/FluentLenium/raw/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fadapter%2FSharedWebDriverContainerTest.java", "sha": "6fee291ace21bc1b88c63abdd1a379890871b7b2", "status": "modified" }, { "additions": 2, "blob_url": "https://github.com/FluentLenium/FluentLenium/blob/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fconfiguration%2FAbstractPropertiesConfigurationTest.java", "changes": 3, "contents_url": "https://api.github.com/repos/FluentLenium/FluentLenium/contents/fluentlenium-core%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fconfiguration%2FAbstractPropertiesConfigurationTest.java?ref=5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd", "deletions": 1, "filename": "fluentlenium-core/src/test/java/org/fluentlenium/configuration/AbstractPropertiesConfigurationTest.java", "new_code": " if (propertyValue == null) {\n }", "new_methods": [], "old_code": " if (propertyValue == null)", "old_methods": [], "patch": "@@ -25,8 +25,9 @@ public static class DummyConfigurationDefaults extends ConfigurationDefaults {\n protected abstract void mockProperty(String propertyName, Object propertyValue);\n \n protected String valueToString(Object propertyValue) {\n- if (propertyValue == null)\n+ if (propertyValue == null) {\n return null;\n+ }\n if (propertyValue instanceof Class) {\n return ((Class) propertyValue).getName();\n }", "raw_url": "https://github.com/FluentLenium/FluentLenium/raw/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fconfiguration%2FAbstractPropertiesConfigurationTest.java", "sha": "bad9adf39194ebb5e27c997813f2761af8278cf5", "status": "modified" }, { "additions": 2, "blob_url": "https://github.com/FluentLenium/FluentLenium/blob/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fconfiguration%2FConfigurationDefaultsTest.java", "changes": 3, "contents_url": "https://api.github.com/repos/FluentLenium/FluentLenium/contents/fluentlenium-core%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fconfiguration%2FConfigurationDefaultsTest.java?ref=5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd", "deletions": 1, "filename": "fluentlenium-core/src/test/java/org/fluentlenium/configuration/ConfigurationDefaultsTest.java", "new_code": " if (readMethod.getDeclaringClass() == Object.class) {\n }", "new_methods": [], "old_code": " if (readMethod.getDeclaringClass() == Object.class)", "old_methods": [], "patch": "@@ -19,8 +19,9 @@ public void testConfiguration() throws IntrospectionException, InvocationTargetE\n \n for (PropertyDescriptor prop : props) {\n Method readMethod = prop.getReadMethod();\n- if (readMethod.getDeclaringClass() == Object.class)\n+ if (readMethod.getDeclaringClass() == Object.class) {\n continue;\n+ }\n switch (prop.getName()) {\n case \"driverLifecycle\":\n Assertions.assertThat(readMethod.invoke(configurationDefaults)).isEqualTo(DriverLifecycle.METHOD);", "raw_url": "https://github.com/FluentLenium/FluentLenium/raw/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fconfiguration%2FConfigurationDefaultsTest.java", "sha": "80b40d74296ceccdac7b63992d955de452f320e0", "status": "modified" }, { "additions": 2, "blob_url": "https://github.com/FluentLenium/FluentLenium/blob/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fconfiguration%2FConfigurationFactoryProviderTest.java", "changes": 4, "contents_url": "https://api.github.com/repos/FluentLenium/FluentLenium/contents/fluentlenium-core%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fconfiguration%2FConfigurationFactoryProviderTest.java?ref=5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd", "deletions": 2, "filename": "fluentlenium-core/src/test/java/org/fluentlenium/configuration/ConfigurationFactoryProviderTest.java", "new_code": " private static final class PrivateConfigurationDefaults extends ConfigurationDefaults {\n public static final class FailingConfigurationDefaults extends ConfigurationDefaults {", "new_methods": [], "old_code": " private static class PrivateConfigurationDefaults extends ConfigurationDefaults {\n public static class FailingConfigurationDefaults extends ConfigurationDefaults {", "old_methods": [], "patch": "@@ -61,12 +61,12 @@ public String getBaseUrl() {\n }\n }\n \n- private static class PrivateConfigurationDefaults extends ConfigurationDefaults {\n+ private static final class PrivateConfigurationDefaults extends ConfigurationDefaults {\n private PrivateConfigurationDefaults() {\n }\n }\n \n- public static class FailingConfigurationDefaults extends ConfigurationDefaults {\n+ public static final class FailingConfigurationDefaults extends ConfigurationDefaults {\n private FailingConfigurationDefaults() {\n throw new IllegalStateException(\"This must FAIL!\");\n }", "raw_url": "https://github.com/FluentLenium/FluentLenium/raw/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fconfiguration%2FConfigurationFactoryProviderTest.java", "sha": "20c13ccba6bdf238c8c4dc8c9fd8978693ea552d", "status": "modified" }, { "additions": 2, "blob_url": "https://github.com/FluentLenium/FluentLenium/blob/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fconfiguration%2FReflectiveWebDriverFactoryTest.java", "changes": 4, "contents_url": "https://api.github.com/repos/FluentLenium/FluentLenium/contents/fluentlenium-core%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fconfiguration%2FReflectiveWebDriverFactoryTest.java?ref=5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd", "deletions": 2, "filename": "fluentlenium-core/src/test/java/org/fluentlenium/configuration/ReflectiveWebDriverFactoryTest.java", "new_code": " public static final class NoConstructorDriver extends HtmlUnitDriver {\n public abstract static class AbstractDriver extends HtmlUnitDriver {", "new_methods": [], "old_code": " public static class NoConstructorDriver extends HtmlUnitDriver {\n public static abstract class AbstractDriver extends HtmlUnitDriver {", "old_methods": [], "patch": "@@ -11,12 +11,12 @@\n import static org.assertj.core.api.Assertions.assertThatThrownBy;\n \n public class ReflectiveWebDriverFactoryTest {\n- public static class NoConstructorDriver extends HtmlUnitDriver {\n+ public static final class NoConstructorDriver extends HtmlUnitDriver {\n private NoConstructorDriver() {\n }\n }\n \n- public static abstract class AbstractDriver extends HtmlUnitDriver {\n+ public abstract static class AbstractDriver extends HtmlUnitDriver {\n public AbstractDriver() {\n }\n }", "raw_url": "https://github.com/FluentLenium/FluentLenium/raw/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fconfiguration%2FReflectiveWebDriverFactoryTest.java", "sha": "714eab8f35926193ec76ed7ac81ee872a9a1327d", "status": "modified" }, { "additions": 13, "blob_url": "https://github.com/FluentLenium/FluentLenium/blob/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fconfiguration%2FRemoteWebDriverTest.java", "changes": 29, "contents_url": "https://api.github.com/repos/FluentLenium/FluentLenium/contents/fluentlenium-core%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fconfiguration%2FRemoteWebDriverTest.java?ref=5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd", "deletions": 16, "filename": "fluentlenium-core/src/test/java/org/fluentlenium/configuration/RemoteWebDriverTest.java", "new_code": " return webDriver;\n WebDriver newWebDriver = factorySpy.newWebDriver(null, null);\n Assertions.assertThat(newWebDriver).isSameAs(webDriver);\n verify(factorySpy).newRemoteWebDriver(new Object[] {null, defaultCapabilities});\n WebDriver newWebDriver = factorySpy.newWebDriver(null, programmaticConfiguration);\n Assertions.assertThat(newWebDriver).isSameAs(webDriver);\n verify(factorySpy).newRemoteWebDriver(new Object[] {new URL(\"http://localhost:4444\"), defaultCapabilities});\n WebDriver newWebDriver = factorySpy.newWebDriver(capabilities, programmaticConfiguration);\n Assertions.assertThat(newWebDriver).isSameAs(webDriver);\n verify(factorySpy).newRemoteWebDriver(new Object[] {new URL(\"http://localhost:4444\"), capabilities});\n WebDriver newWebDriver = factorySpy.newWebDriver(capabilities, null);\n Assertions.assertThat(newWebDriver).isSameAs(webDriver);\n verify(factorySpy).newRemoteWebDriver(new Object[] {null, capabilities});", "new_methods": [], "old_code": "import static org.mockito.Mockito.mock;\n final WebDriver webDriverMock = mock(WebDriver.class);\n\n return webDriverMock;\n WebDriver webDriver = factorySpy.newWebDriver(null, null);\n Assertions.assertThat(webDriver).isSameAs(webDriver);\n verify(factorySpy).newRemoteWebDriver(new Object[] { null, defaultCapabilities });\n WebDriver webDriver = factorySpy.newWebDriver(null, programmaticConfiguration);\n Assertions.assertThat(webDriver).isSameAs(webDriver);\n verify(factorySpy).newRemoteWebDriver(new Object[] { new URL(\"http://localhost:4444\"), defaultCapabilities });\n WebDriver webDriver = factorySpy.newWebDriver(capabilities, programmaticConfiguration);\n Assertions.assertThat(webDriver).isSameAs(webDriver);\n verify(factorySpy).newRemoteWebDriver(new Object[] { new URL(\"http://localhost:4444\"), capabilities });\n WebDriver webDriver = factorySpy.newWebDriver(capabilities, null);\n Assertions.assertThat(webDriver).isSameAs(webDriver);\n verify(factorySpy).newRemoteWebDriver(new Object[] { null, capabilities });", "old_methods": [], "patch": "@@ -12,7 +12,6 @@\n import java.net.MalformedURLException;\n import java.net.URL;\n \n-import static org.mockito.Mockito.mock;\n import static org.mockito.Mockito.spy;\n import static org.mockito.Mockito.verify;\n \n@@ -24,13 +23,11 @@ public class RemoteWebDriverTest {\n \n @Before\n public void before() {\n- final WebDriver webDriverMock = mock(WebDriver.class);\n-\n RemoteWebDriverFactory factory = new RemoteWebDriverFactory() {\n @Override\n protected WebDriver newRemoteWebDriver(Object[] args)\n throws NoSuchMethodException, IllegalAccessException, InvocationTargetException, InstantiationException {\n- return webDriverMock;\n+ return webDriver;\n }\n };\n factorySpy = spy(factory);\n@@ -39,12 +36,12 @@ protected WebDriver newRemoteWebDriver(Object[] args)\n @Test\n public void testDefault()\n throws InvocationTargetException, NoSuchMethodException, InstantiationException, IllegalAccessException {\n- WebDriver webDriver = factorySpy.newWebDriver(null, null);\n- Assertions.assertThat(webDriver).isSameAs(webDriver);\n+ WebDriver newWebDriver = factorySpy.newWebDriver(null, null);\n+ Assertions.assertThat(newWebDriver).isSameAs(webDriver);\n \n DesiredCapabilities defaultCapabilities = new DesiredCapabilities();\n \n- verify(factorySpy).newRemoteWebDriver(new Object[] { null, defaultCapabilities });\n+ verify(factorySpy).newRemoteWebDriver(new Object[] {null, defaultCapabilities});\n }\n \n @Test\n@@ -55,12 +52,12 @@ public void testCustomRemoteUrl()\n ProgrammaticConfiguration programmaticConfiguration = new ProgrammaticConfiguration();\n programmaticConfiguration.setRemoteUrl(\"http://localhost:4444\");\n \n- WebDriver webDriver = factorySpy.newWebDriver(null, programmaticConfiguration);\n- Assertions.assertThat(webDriver).isSameAs(webDriver);\n+ WebDriver newWebDriver = factorySpy.newWebDriver(null, programmaticConfiguration);\n+ Assertions.assertThat(newWebDriver).isSameAs(webDriver);\n \n DesiredCapabilities defaultCapabilities = new DesiredCapabilities();\n \n- verify(factorySpy).newRemoteWebDriver(new Object[] { new URL(\"http://localhost:4444\"), defaultCapabilities });\n+ verify(factorySpy).newRemoteWebDriver(new Object[] {new URL(\"http://localhost:4444\"), defaultCapabilities});\n }\n \n @Test(expected = ConfigurationException.class)\n@@ -84,10 +81,10 @@ public void testCustomRemoteUrlAndCapabilities()\n \n DesiredCapabilities capabilities = DesiredCapabilities.chrome();\n \n- WebDriver webDriver = factorySpy.newWebDriver(capabilities, programmaticConfiguration);\n- Assertions.assertThat(webDriver).isSameAs(webDriver);\n+ WebDriver newWebDriver = factorySpy.newWebDriver(capabilities, programmaticConfiguration);\n+ Assertions.assertThat(newWebDriver).isSameAs(webDriver);\n \n- verify(factorySpy).newRemoteWebDriver(new Object[] { new URL(\"http://localhost:4444\"), capabilities });\n+ verify(factorySpy).newRemoteWebDriver(new Object[] {new URL(\"http://localhost:4444\"), capabilities});\n }\n \n @Test\n@@ -97,9 +94,9 @@ public void testCustomCapabilities()\n \n DesiredCapabilities capabilities = DesiredCapabilities.chrome();\n \n- WebDriver webDriver = factorySpy.newWebDriver(capabilities, null);\n- Assertions.assertThat(webDriver).isSameAs(webDriver);\n+ WebDriver newWebDriver = factorySpy.newWebDriver(capabilities, null);\n+ Assertions.assertThat(newWebDriver).isSameAs(webDriver);\n \n- verify(factorySpy).newRemoteWebDriver(new Object[] { null, capabilities });\n+ verify(factorySpy).newRemoteWebDriver(new Object[] {null, capabilities});\n }\n }", "raw_url": "https://github.com/FluentLenium/FluentLenium/raw/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fconfiguration%2FRemoteWebDriverTest.java", "sha": "c1321f95407385e09f516be833c217221390ff13", "status": "modified" }, { "additions": 2, "blob_url": "https://github.com/FluentLenium/FluentLenium/blob/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fcore%2FScreenshotTest.java", "changes": 4, "contents_url": "https://api.github.com/repos/FluentLenium/FluentLenium/contents/fluentlenium-core%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fcore%2FScreenshotTest.java?ref=5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd", "deletions": 2, "filename": "fluentlenium-core/src/test/java/org/fluentlenium/core/ScreenshotTest.java", "new_code": " public void whenBrowserDoesntAcceptScreenshotThenCustomError() {\n public void whenBrowserDoesAcceptScreenshotThenNoException() throws IOException {", "new_methods": [], "old_code": " public void when_browser_doesnt_accept_screenshot_then_custom_error() {\n public void when_browser_does_accept_screenshot_then_no_exception() throws IOException {", "old_methods": [], "patch": "@@ -24,13 +24,13 @@ public class ScreenshotTest {\n private FluentAdapter adapter;\n \n @Test(expected = WebDriverException.class)\n- public void when_browser_doesnt_accept_screenshot_then_custom_error() {\n+ public void whenBrowserDoesntAcceptScreenshotThenCustomError() {\n adapter = new FluentAdapter(new CustomWebDriverNoScreenshot());\n adapter.takeScreenShot();\n }\n \n @Test\n- public void when_browser_does_accept_screenshot_then_no_exception() throws IOException {\n+ public void whenBrowserDoesAcceptScreenshotThenNoException() throws IOException {\n adapter = new FluentAdapter(new CustomWebDriverScreenshot());\n adapter.takeScreenShot(folder.newFile(\"test.jpg\").getAbsolutePath());\n }", "raw_url": "https://github.com/FluentLenium/FluentLenium/raw/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fcore%2FScreenshotTest.java", "sha": "451628b2beac833f29913cc2a73d7e5c68c86929", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/FluentLenium/FluentLenium/blob/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fcore%2Faction%2FKeyboardActionsTest.java", "changes": 2, "contents_url": "https://api.github.com/repos/FluentLenium/FluentLenium/contents/fluentlenium-core%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fcore%2Faction%2FKeyboardActionsTest.java?ref=5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd", "deletions": 1, "filename": "fluentlenium-core/src/test/java/org/fluentlenium/core/action/KeyboardActionsTest.java", "new_code": " private abstract static class InputDevicesDriver implements WebDriver, HasInputDevices {", "new_methods": [], "old_code": " private static abstract class InputDevicesDriver implements WebDriver, HasInputDevices {", "old_methods": [], "patch": "@@ -87,7 +87,7 @@ public void testBasic() {\n Assertions.assertThat(actionsAlt.basic()).isSameAs(keyboard);\n }\n \n- private static abstract class InputDevicesDriver implements WebDriver, HasInputDevices {\n+ private abstract static class InputDevicesDriver implements WebDriver, HasInputDevices {\n \n }\n }", "raw_url": "https://github.com/FluentLenium/FluentLenium/raw/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fcore%2Faction%2FKeyboardActionsTest.java", "sha": "e0e71c473c10f56ae7777497925776e706a31609", "status": "modified" }, { "additions": 2, "blob_url": "https://github.com/FluentLenium/FluentLenium/blob/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fcore%2Faction%2FKeyboardElementActionsTest.java", "changes": 4, "contents_url": "https://api.github.com/repos/FluentLenium/FluentLenium/contents/fluentlenium-core%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fcore%2Faction%2FKeyboardElementActionsTest.java?ref=5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd", "deletions": 2, "filename": "fluentlenium-core/src/test/java/org/fluentlenium/core/action/KeyboardElementActionsTest.java", "new_code": " private abstract static class InputDevicesDriver implements WebDriver, HasInputDevices {\n private abstract static class LocatableElement implements WebElement, Locatable {", "new_methods": [], "old_code": " private static abstract class InputDevicesDriver implements WebDriver, HasInputDevices {\n private static abstract class LocatableElement implements WebElement, Locatable {", "old_methods": [], "patch": "@@ -95,11 +95,11 @@ public void testBasic() {\n Assertions.assertThat(actionsAlt.basic()).isSameAs(keyboard);\n }\n \n- private static abstract class InputDevicesDriver implements WebDriver, HasInputDevices {\n+ private abstract static class InputDevicesDriver implements WebDriver, HasInputDevices {\n \n }\n \n- private static abstract class LocatableElement implements WebElement, Locatable {\n+ private abstract static class LocatableElement implements WebElement, Locatable {\n \n }\n }", "raw_url": "https://github.com/FluentLenium/FluentLenium/raw/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fcore%2Faction%2FKeyboardElementActionsTest.java", "sha": "bd8dc4836afcc732c65ee1cd298823d0c6ede352", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/FluentLenium/FluentLenium/blob/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fcore%2Faction%2FMouseActionsTest.java", "changes": 2, "contents_url": "https://api.github.com/repos/FluentLenium/FluentLenium/contents/fluentlenium-core%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fcore%2Faction%2FMouseActionsTest.java?ref=5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd", "deletions": 1, "filename": "fluentlenium-core/src/test/java/org/fluentlenium/core/action/MouseActionsTest.java", "new_code": " private abstract static class InputDevicesDriver implements WebDriver, HasInputDevices {", "new_methods": [], "old_code": " private static abstract class InputDevicesDriver implements WebDriver, HasInputDevices {", "old_methods": [], "patch": "@@ -104,7 +104,7 @@ public void testBasic() {\n Assertions.assertThat(actionsAlt.basic()).isSameAs(mouse);\n }\n \n- private static abstract class InputDevicesDriver implements WebDriver, HasInputDevices {\n+ private abstract static class InputDevicesDriver implements WebDriver, HasInputDevices {\n \n }\n }", "raw_url": "https://github.com/FluentLenium/FluentLenium/raw/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fcore%2Faction%2FMouseActionsTest.java", "sha": "d2a4b4c9ca6432908a8a75ce938d156c3d653dac", "status": "modified" }, { "additions": 2, "blob_url": "https://github.com/FluentLenium/FluentLenium/blob/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fcore%2Faction%2FMouseElementActionsTest.java", "changes": 4, "contents_url": "https://api.github.com/repos/FluentLenium/FluentLenium/contents/fluentlenium-core%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fcore%2Faction%2FMouseElementActionsTest.java?ref=5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd", "deletions": 2, "filename": "fluentlenium-core/src/test/java/org/fluentlenium/core/action/MouseElementActionsTest.java", "new_code": " private abstract static class InputDevicesDriver implements WebDriver, HasInputDevices {\n private abstract static class LocatableElement implements WebElement, Locatable {", "new_methods": [], "old_code": " private static abstract class InputDevicesDriver implements WebDriver, HasInputDevices {\n private static abstract class LocatableElement implements WebElement, Locatable {", "old_methods": [], "patch": "@@ -173,11 +173,11 @@ public void testBasic() {\n Assertions.assertThat(actionsAlt.basic()).isSameAs(mouse);\n }\n \n- private static abstract class InputDevicesDriver implements WebDriver, HasInputDevices {\n+ private abstract static class InputDevicesDriver implements WebDriver, HasInputDevices {\n \n }\n \n- private static abstract class LocatableElement implements WebElement, Locatable {\n+ private abstract static class LocatableElement implements WebElement, Locatable {\n \n }\n }", "raw_url": "https://github.com/FluentLenium/FluentLenium/raw/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fcore%2Faction%2FMouseElementActionsTest.java", "sha": "0f59f327b7bd7904bdcddd3139fa981ec0f5b7a8", "status": "modified" }, { "additions": 4, "blob_url": "https://github.com/FluentLenium/FluentLenium/blob/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fcore%2Faction%2FWindowActionsTest.java", "changes": 8, "contents_url": "https://api.github.com/repos/FluentLenium/FluentLenium/contents/fluentlenium-core%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fcore%2Faction%2FWindowActionsTest.java?ref=5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd", "deletions": 4, "filename": "fluentlenium-core/src/test/java/org/fluentlenium/core/action/WindowActionsTest.java", "new_code": " FluentDriver currentFluentDriver = new FluentDriver(jsDriver, configurationProperties, fluentControl);\n FluentDriver fluentDriverSpied = spy(currentFluentDriver);\n FluentDriver currentFluentDriver = new FluentDriver(driver, configurationProperties, fluentControl);\n FluentDriver fluentDriverSpied = spy(currentFluentDriver);", "new_methods": [], "old_code": " FluentDriver fluentDriver = new FluentDriver(jsDriver, configurationProperties, fluentControl);\n FluentDriver fluentDriverSpied = spy(fluentDriver);\n FluentDriver fluentDriver = new FluentDriver(driver, configurationProperties, fluentControl);\n FluentDriver fluentDriverSpied = spy(fluentDriver);", "old_methods": [], "patch": "@@ -130,8 +130,8 @@ public void openNewAndSwitch() {\n FluentWaitWindowMatcher fluentWaitWindowMatcher = mock(FluentWaitWindowMatcher.class);\n ConfigurationProperties configurationProperties = mock(ConfigurationProperties.class);\n \n- FluentDriver fluentDriver = new FluentDriver(jsDriver, configurationProperties, fluentControl);\n- FluentDriver fluentDriverSpied = spy(fluentDriver);\n+ FluentDriver currentFluentDriver = new FluentDriver(jsDriver, configurationProperties, fluentControl);\n+ FluentDriver fluentDriverSpied = spy(currentFluentDriver);\n \n when(jsDriver.getWindowHandles()).thenReturn(ImmutableSet.of(windowHandle, windowHandle1),\n ImmutableSet.of(windowHandle, windowHandle1, windowHandle2));\n@@ -201,8 +201,8 @@ public void clickAndOpenNewTest() throws InterruptedException {\n FluentWaitWindowMatcher fluentWaitWindowMatcher = mock(FluentWaitWindowMatcher.class);\n ConfigurationProperties configurationProperties = mock(ConfigurationProperties.class);\n \n- FluentDriver fluentDriver = new FluentDriver(driver, configurationProperties, fluentControl);\n- FluentDriver fluentDriverSpied = spy(fluentDriver);\n+ FluentDriver currentFluentDriver = new FluentDriver(driver, configurationProperties, fluentControl);\n+ FluentDriver fluentDriverSpied = spy(currentFluentDriver);\n \n when(driver.getWindowHandles()).thenReturn(ImmutableSet.of(windowHandle, windowHandle1),\n ImmutableSet.of(windowHandle, windowHandle1, windowHandle2));", "raw_url": "https://github.com/FluentLenium/FluentLenium/raw/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fcore%2Faction%2FWindowActionsTest.java", "sha": "eec25bd959ebbf2c560e2a50f7f24c31ab3d8dcc", "status": "modified" }, { "additions": 2, "blob_url": "https://github.com/FluentLenium/FluentLenium/blob/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fcore%2Fconditions%2FAtLeastOneElementConditionsTest.java", "changes": 4, "contents_url": "https://api.github.com/repos/FluentLenium/FluentLenium/contents/fluentlenium-core%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fcore%2Fconditions%2FAtLeastOneElementConditionsTest.java?ref=5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd", "deletions": 2, "filename": "fluentlenium-core/src/test/java/org/fluentlenium/core/conditions/AtLeastOneElementConditionsTest.java", "new_code": " AtLeastOneElementConditions emptyConditions = new AtLeastOneElementConditions(Arrays.<FluentWebElement>asList());\n assertThat(emptyConditions.enabled()).isFalse();", "new_methods": [], "old_code": " AtLeastOneElementConditions conditions = new AtLeastOneElementConditions(Arrays.<FluentWebElement>asList());\n assertThat(conditions.enabled()).isFalse();", "old_methods": [], "patch": "@@ -226,8 +226,8 @@ public void hasSize() {\n \n @Test\n public void defaultValueWhenEmpty() {\n- AtLeastOneElementConditions conditions = new AtLeastOneElementConditions(Arrays.<FluentWebElement>asList());\n+ AtLeastOneElementConditions emptyConditions = new AtLeastOneElementConditions(Arrays.<FluentWebElement>asList());\n \n- assertThat(conditions.enabled()).isFalse();\n+ assertThat(emptyConditions.enabled()).isFalse();\n }\n }", "raw_url": "https://github.com/FluentLenium/FluentLenium/raw/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fcore%2Fconditions%2FAtLeastOneElementConditionsTest.java", "sha": "c036af5a45de05784b95989837d1559ad9aad75c", "status": "modified" }, { "additions": 2, "blob_url": "https://github.com/FluentLenium/FluentLenium/blob/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fcore%2Fconditions%2FEachElementConditionsTest.java", "changes": 4, "contents_url": "https://api.github.com/repos/FluentLenium/FluentLenium/contents/fluentlenium-core%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fcore%2Fconditions%2FEachElementConditionsTest.java?ref=5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd", "deletions": 2, "filename": "fluentlenium-core/src/test/java/org/fluentlenium/core/conditions/EachElementConditionsTest.java", "new_code": " EachElementConditions defaultConditions = new EachElementConditions(Arrays.<FluentWebElement>asList());\n assertThat(defaultConditions.enabled()).isFalse();", "new_methods": [], "old_code": " EachElementConditions conditions = new EachElementConditions(Arrays.<FluentWebElement>asList());\n assertThat(conditions.enabled()).isFalse();", "old_methods": [], "patch": "@@ -269,8 +269,8 @@ public void hasSize() {\n \n @Test\n public void defaultValueWhenEmpty() {\n- EachElementConditions conditions = new EachElementConditions(Arrays.<FluentWebElement>asList());\n+ EachElementConditions defaultConditions = new EachElementConditions(Arrays.<FluentWebElement>asList());\n \n- assertThat(conditions.enabled()).isFalse();\n+ assertThat(defaultConditions.enabled()).isFalse();\n }\n }", "raw_url": "https://github.com/FluentLenium/FluentLenium/raw/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fcore%2Fconditions%2FEachElementConditionsTest.java", "sha": "bf16058fd41ce2b6944e190de2a5dacf9a2e61f5", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/FluentLenium/FluentLenium/blob/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fcore%2Fdomain%2FFluentJavascriptTest.java", "changes": 2, "contents_url": "https://api.github.com/repos/FluentLenium/FluentLenium/contents/fluentlenium-core%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fcore%2Fdomain%2FFluentJavascriptTest.java?ref=5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd", "deletions": 1, "filename": "fluentlenium-core/src/test/java/org/fluentlenium/core/domain/FluentJavascriptTest.java", "new_code": " private abstract static class JavascriptWebDriver implements WebDriver, JavascriptExecutor {", "new_methods": [], "old_code": " private static abstract class JavascriptWebDriver implements WebDriver, JavascriptExecutor {", "old_methods": [], "patch": "@@ -82,7 +82,7 @@ public void testAsync() {\n assertThat(fluentJavascript.getResult()).isEqualTo(scriptRet);\n }\n \n- private static abstract class JavascriptWebDriver implements WebDriver, JavascriptExecutor {\n+ private abstract static class JavascriptWebDriver implements WebDriver, JavascriptExecutor {\n \n }\n }", "raw_url": "https://github.com/FluentLenium/FluentLenium/raw/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fcore%2Fdomain%2FFluentJavascriptTest.java", "sha": "0b5efe76d8b04c4ee6ab5e730ae3e0855fa3d617", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/FluentLenium/FluentLenium/blob/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fcore%2Fdomain%2FFluentListImplTest.java", "changes": 2, "contents_url": "https://api.github.com/repos/FluentLenium/FluentLenium/contents/fluentlenium-core%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fcore%2Fdomain%2FFluentListImplTest.java?ref=5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd", "deletions": 1, "filename": "fluentlenium-core/src/test/java/org/fluentlenium/core/domain/FluentListImplTest.java", "new_code": " Component(WebElement webElement, FluentControl fluentControl, ComponentInstantiator instantiator) {", "new_methods": [], "old_code": " public Component(WebElement webElement, FluentControl fluentControl, ComponentInstantiator instantiator) {", "old_methods": [], "patch": "@@ -352,7 +352,7 @@ public void testAs() {\n }\n \n private static class Component extends FluentWebElement {\n- public Component(WebElement webElement, FluentControl fluentControl, ComponentInstantiator instantiator) {\n+ Component(WebElement webElement, FluentControl fluentControl, ComponentInstantiator instantiator) {\n super(webElement, fluentControl, instantiator);\n }\n }", "raw_url": "https://github.com/FluentLenium/FluentLenium/raw/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fcore%2Fdomain%2FFluentListImplTest.java", "sha": "f31b9229b1b8136229b81ebd97bea6b0976dbfd2", "status": "modified" }, { "additions": 8, "blob_url": "https://github.com/FluentLenium/FluentLenium/blob/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fcore%2Fdomain%2FFluentListSearchTest.java", "changes": 16, "contents_url": "https://api.github.com/repos/FluentLenium/FluentLenium/contents/fluentlenium-core%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fcore%2Fdomain%2FFluentListSearchTest.java?ref=5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd", "deletions": 8, "filename": "fluentlenium-core/src/test/java/org/fluentlenium/core/domain/FluentListSearchTest.java", "new_code": " FluentWebElement element = fluentList.find(name, null).index(0);\n assertThat(element).isEqualTo(this.fluentWebElement);\n FluentWebElement element = fluentList.find(name, null).index(1);\n element.now();\n FluentWebElement element = fluentList.el(name, null);\n assertThat(element).isEqualTo(this.fluentWebElement);\n FluentWebElement element = fluentList.el(name, null);\n element.now();", "new_methods": [], "old_code": " FluentWebElement fluentWebElement = fluentList.find(name, null).index(0);\n assertThat(fluentWebElement).isEqualTo(this.fluentWebElement);\n FluentWebElement fluentWebElement = fluentList.find(name, null).index(1);\n fluentWebElement.now();\n FluentWebElement fluentWebElement = fluentList.el(name, null);\n assertThat(fluentWebElement).isEqualTo(this.fluentWebElement);\n FluentWebElement fluentWebElement = fluentList.el(name, null);\n fluentWebElement.now();", "old_methods": [], "patch": "@@ -76,8 +76,8 @@ public void findElementsIsSearched() {\n public void findElementByPosition() {\n String name = \"cssStyle\";\n when(search.find(name, null)).thenReturn(fluentAdapter.newFluentList(webElements));\n- FluentWebElement fluentWebElement = fluentList.find(name, null).index(0);\n- assertThat(fluentWebElement).isEqualTo(this.fluentWebElement);\n+ FluentWebElement element = fluentList.find(name, null).index(0);\n+ assertThat(element).isEqualTo(this.fluentWebElement);\n }\n \n @Test(expected = NoSuchElementException.class)\n@@ -90,24 +90,24 @@ public void whenNoElementMatchingFillThenThrowsExceptions() {\n public void shouldThrowAnErrorWhenWrongPosition() {\n String name = \"cssStyle\";\n when(search.find(name, null)).thenReturn(fluentAdapter.newFluentList(webElements));\n- FluentWebElement fluentWebElement = fluentList.find(name, null).index(1);\n- fluentWebElement.now();\n+ FluentWebElement element = fluentList.find(name, null).index(1);\n+ element.now();\n }\n \n @Test\n public void findFirstElement() {\n String name = \"cssStyle\";\n when(search.find(name, null)).thenReturn(fluentAdapter.newFluentList(webElements));\n- FluentWebElement fluentWebElement = fluentList.el(name, null);\n- assertThat(fluentWebElement).isEqualTo(this.fluentWebElement);\n+ FluentWebElement element = fluentList.el(name, null);\n+ assertThat(element).isEqualTo(this.fluentWebElement);\n }\n \n @Test(expected = NoSuchElementException.class)\n public void shouldThrowAnErrorWhenNoFirstPosition() {\n String name = \"cssStyle\";\n when(search.find(name, null)).thenReturn(fluentAdapter.newFluentList());\n- FluentWebElement fluentWebElement = fluentList.el(name, null);\n- fluentWebElement.now();\n+ FluentWebElement element = fluentList.el(name, null);\n+ element.now();\n }\n \n }", "raw_url": "https://github.com/FluentLenium/FluentLenium/raw/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fcore%2Fdomain%2FFluentListSearchTest.java", "sha": "8bcd60a4fe0b4132fb13ca8a85722e718d18bb93", "status": "modified" }, { "additions": 3, "blob_url": "https://github.com/FluentLenium/FluentLenium/blob/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fcore%2Fdomain%2FFluentWebElementTest.java", "changes": 6, "contents_url": "https://api.github.com/repos/FluentLenium/FluentLenium/contents/fluentlenium-core%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fcore%2Fdomain%2FFluentWebElementTest.java?ref=5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd", "deletions": 3, "filename": "fluentlenium-core/src/test/java/org/fluentlenium/core/domain/FluentWebElementTest.java", "new_code": " Component(WebElement element) {\n private abstract static class InputDevicesDriver implements WebDriver, HasInputDevices {\n private abstract static class LocatableElement implements WebElement, Locatable {", "new_methods": [], "old_code": " public Component(WebElement element) {\n private static abstract class InputDevicesDriver implements WebDriver, HasInputDevices {\n private static abstract class LocatableElement implements WebElement, Locatable {", "old_methods": [], "patch": "@@ -340,7 +340,7 @@ public void testToString() {\n private static class Component {\n private WebElement element;\n \n- public Component(WebElement element) {\n+ Component(WebElement element) {\n this.element = element;\n }\n \n@@ -357,11 +357,11 @@ public String toString() {\n private static class InvalidComponent {\n }\n \n- private static abstract class InputDevicesDriver implements WebDriver, HasInputDevices {\n+ private abstract static class InputDevicesDriver implements WebDriver, HasInputDevices {\n \n }\n \n- private static abstract class LocatableElement implements WebElement, Locatable {\n+ private abstract static class LocatableElement implements WebElement, Locatable {\n \n }\n ", "raw_url": "https://github.com/FluentLenium/FluentLenium/raw/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fcore%2Fdomain%2FFluentWebElementTest.java", "sha": "607143b65cf07b36c38e70ecd9f3f1f83c9e59ed", "status": "modified" }, { "additions": 6, "blob_url": "https://github.com/FluentLenium/FluentLenium/blob/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fcore%2Fevents%2FEventsTest.java", "changes": 12, "contents_url": "https://api.github.com/repos/FluentLenium/FluentLenium/contents/fluentlenium-core%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fcore%2Fevents%2FEventsTest.java?ref=5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd", "deletions": 6, "filename": "fluentlenium-core/src/test/java/org/fluentlenium/core/events/EventsTest.java", "new_code": " private static final class ElementMatcher extends CustomMatcher<FluentWebElement> {\n WebElement argElement = ((FluentWebElement) argument).getElement();\n while (argElement instanceof WrapsElement) {\n argElement = ((WrapsElement) argElement).getWrappedElement();\n return argElement == this.element;\n private abstract static class JavascriptWebDriver implements WebDriver, JavascriptExecutor {", "new_methods": [], "old_code": " private static class ElementMatcher extends CustomMatcher<FluentWebElement> {\n WebElement element = ((FluentWebElement) argument).getElement();\n while (element instanceof WrapsElement) {\n element = ((WrapsElement) element).getWrappedElement();\n return element == this.element;\n private static abstract class JavascriptWebDriver implements WebDriver, JavascriptExecutor {", "old_methods": [], "patch": "@@ -263,7 +263,7 @@ public void testAdapterHashcodeEquals() {\n assertThat(instance).isEqualTo(instance);\n }\n \n- private static class ElementMatcher extends CustomMatcher<FluentWebElement> {\n+ private static final class ElementMatcher extends CustomMatcher<FluentWebElement> {\n private final WebElement element;\n \n private ElementMatcher(WebElement element) {\n@@ -279,15 +279,15 @@ public boolean matches(Object argument) {\n if (argument == null && this.element != null) {\n return false;\n }\n- WebElement element = ((FluentWebElement) argument).getElement();\n- while (element instanceof WrapsElement) {\n- element = ((WrapsElement) element).getWrappedElement();\n+ WebElement argElement = ((FluentWebElement) argument).getElement();\n+ while (argElement instanceof WrapsElement) {\n+ argElement = ((WrapsElement) argElement).getWrappedElement();\n }\n- return element == this.element;\n+ return argElement == this.element;\n }\n }\n \n- private static abstract class JavascriptWebDriver implements WebDriver, JavascriptExecutor {\n+ private abstract static class JavascriptWebDriver implements WebDriver, JavascriptExecutor {\n \n }\n }", "raw_url": "https://github.com/FluentLenium/FluentLenium/raw/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fcore%2Fevents%2FEventsTest.java", "sha": "880e564f6ea062ea89613444752d5cc05e9d4c42", "status": "modified" }, { "additions": 2, "blob_url": "https://github.com/FluentLenium/FluentLenium/blob/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fcore%2Fhook%2FDefaultHookChainBuilderTest.java", "changes": 4, "contents_url": "https://api.github.com/repos/FluentLenium/FluentLenium/contents/fluentlenium-core%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fcore%2Fhook%2FDefaultHookChainBuilderTest.java?ref=5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd", "deletions": 2, "filename": "fluentlenium-core/src/test/java/org/fluentlenium/core/hook/DefaultHookChainBuilderTest.java", "new_code": " InvalidConstructorHook() {\n FailingConstructorHook(FluentControl fluentControl, ComponentInstantiator instantiator,", "new_methods": [], "old_code": " public InvalidConstructorHook() {\n public FailingConstructorHook(FluentControl fluentControl, ComponentInstantiator instantiator,", "old_methods": [], "patch": "@@ -110,7 +110,7 @@ public void testBuildHook() {\n }\n \n private static class InvalidConstructorHook extends BaseHook<Object> {\n- public InvalidConstructorHook() {\n+ InvalidConstructorHook() {\n super(null, null, null, null, null, null);\n }\n }\n@@ -133,7 +133,7 @@ public void call() throws Throwable {\n }\n \n private static class FailingConstructorHook extends BaseHook<Object> {\n- public FailingConstructorHook(FluentControl fluentControl, ComponentInstantiator instantiator,\n+ FailingConstructorHook(FluentControl fluentControl, ComponentInstantiator instantiator,\n Supplier<WebElement> elementSupplier, Supplier<ElementLocator> locatorSupplier, Supplier<String> toStringSupplier,\n Object options) {\n super(fluentControl, instantiator, elementSupplier, locatorSupplier, toStringSupplier, options);", "raw_url": "https://github.com/FluentLenium/FluentLenium/raw/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fcore%2Fhook%2FDefaultHookChainBuilderTest.java", "sha": "7ddbedec4f77dceaf9728968ea901afd92058204", "status": "modified" }, { "additions": 2, "blob_url": "https://github.com/FluentLenium/FluentLenium/blob/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fcore%2Fhook%2Fwait%2FWaitHookTest.java", "changes": 4, "contents_url": "https://api.github.com/repos/FluentLenium/FluentLenium/contents/fluentlenium-core%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fcore%2Fhook%2Fwait%2FWaitHookTest.java?ref=5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd", "deletions": 2, "filename": "fluentlenium-core/src/test/java/org/fluentlenium/core/hook/wait/WaitHookTest.java", "new_code": " WaitHook defaultWaitHook = new WaitHook(fluentControl, instantiator, Suppliers.ofInstance(element),\n assertThat(defaultWaitHook.getOptions()).isEqualToComparingFieldByField(new WaitHookOptions());", "new_methods": [], "old_code": " WaitHook waitHook = new WaitHook(fluentControl, instantiator, Suppliers.ofInstance(element),\n assertThat(waitHook.getOptions()).isEqualToComparingFieldByField(new WaitHookOptions());", "old_methods": [], "patch": "@@ -149,9 +149,9 @@ public void testElementClear() {\n \n @Test\n public void testDefaultOptions() {\n- WaitHook waitHook = new WaitHook(fluentControl, instantiator, Suppliers.ofInstance(element),\n+ WaitHook defaultWaitHook = new WaitHook(fluentControl, instantiator, Suppliers.ofInstance(element),\n Suppliers.ofInstance(locator), Suppliers.ofInstance(\"toString\"), null);\n \n- assertThat(waitHook.getOptions()).isEqualToComparingFieldByField(new WaitHookOptions());\n+ assertThat(defaultWaitHook.getOptions()).isEqualToComparingFieldByField(new WaitHookOptions());\n }\n }", "raw_url": "https://github.com/FluentLenium/FluentLenium/raw/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fcore%2Fhook%2Fwait%2FWaitHookTest.java", "sha": "561a3c98478cfb5b8eccb65453b5dc6636d73a90", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/FluentLenium/FluentLenium/blob/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fcore%2Fproxy%2FProxyListenerTest.java", "changes": 2, "contents_url": "https://api.github.com/repos/FluentLenium/FluentLenium/contents/fluentlenium-core%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fcore%2Fproxy%2FProxyListenerTest.java?ref=5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd", "deletions": 1, "filename": "fluentlenium-core/src/test/java/org/fluentlenium/core/proxy/ProxyListenerTest.java", "new_code": " ElementMatcher(List<WebElement> expected) {", "new_methods": [], "old_code": " public ElementMatcher(List<WebElement> expected) {", "old_methods": [], "patch": "@@ -65,7 +65,7 @@ public WebElement get() {\n private static class ElementMatcher extends CustomMatcher<List<WebElement>> {\n private final List<WebElement> expected;\n \n- public ElementMatcher(List<WebElement> expected) {\n+ ElementMatcher(List<WebElement> expected) {\n super(\"matches element\");\n this.expected = expected;\n }", "raw_url": "https://github.com/FluentLenium/FluentLenium/raw/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fcore%2Fproxy%2FProxyListenerTest.java", "sha": "328c40ab798605da256ce000c82a97db0bb7cf46", "status": "modified" }, { "additions": 8, "blob_url": "https://github.com/FluentLenium/FluentLenium/blob/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fcore%2Fsearch%2FSearchTest.java", "changes": 15, "contents_url": "https://api.github.com/repos/FluentLenium/FluentLenium/contents/fluentlenium-core%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fcore%2Fsearch%2FSearchTest.java?ref=5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd", "deletions": 7, "filename": "fluentlenium-core/src/test/java/org/fluentlenium/core/search/SearchTest.java", "new_code": " Filter[] filters = new Filter[] {filter1, filter2};\n public void canLoopIntoFluentWebElementAfterASearch() {\n assertThat(fluentWebElement).isInstanceOf(FluentWebElement.class);\n Filter[] filters = new Filter[] {filter1, filter2};\n Filter[] filters = new Filter[] {filter1, filter2};\n Filter[] filters = new Filter[] {filter1};\n final Filter[] filters = new Filter[] {filter1};\n Filter[] filters = new Filter[] {filter1};", "new_methods": [ { "arguments": [], "filename": "fluentlenium-core/src/test/java/org/fluentlenium/core/search/SearchTest.java", "implementation": "assertThat(fluentWebElement).isInstanceOf(FluentWebElement.class);\n Filter[] filters = new Filter[] {filter1, filter2", "signature": "void canLoopIntoFluentWebElementAfterASearch()" } ], "old_code": " Filter[] filters = new Filter[] { filter1, filter2 };\n public void can_loop_into_fluentWebElement_after_a_search() {\n Filter[] filters = new Filter[] { filter1, filter2 };\n Filter[] filters = new Filter[] { filter1, filter2 };\n Filter[] filters = new Filter[] { filter1 };\n final Filter[] filters = new Filter[] { filter1 };\n Filter[] filters = new Filter[] { filter1 };", "old_methods": [ { "arguments": [], "filename": "fluentlenium-core/src/test/java/org/fluentlenium/core/search/SearchTest.java", "implementation": "Filter[] filters = new Filter[] { filter1, filter2", "signature": "void can_loop_into_fluentWebElement_after_a_search()" } ], "patch": "@@ -75,7 +75,7 @@ public void findCheckCssIsWellFormed() {\n when(searchContext.findElements(By.cssSelector(\"cssStyle[generated=true][checked=ok]\"))).thenReturn(webElements);\n \n String name = \"cssStyle\";\n- Filter[] filters = new Filter[] { filter1, filter2 };\n+ Filter[] filters = new Filter[] {filter1, filter2};\n when(filter1.isPreFilter()).thenReturn(true);\n when(filter1.toString()).thenReturn(\"[generated=true]\");\n when(filter2.isPreFilter()).thenReturn(true);\n@@ -86,14 +86,15 @@ public void findCheckCssIsWellFormed() {\n }\n \n @Test\n- public void can_loop_into_fluentWebElement_after_a_search() {\n+ public void canLoopIntoFluentWebElementAfterASearch() {\n WebElement webElement = mock(WebElement.class);\n WebElement webElement2 = mock(WebElement.class);\n List<WebElement> webElements = Lists.newArrayList(webElement, webElement2);\n \n when(searchContext.findElements(By.cssSelector(\"cssStyle\"))).thenReturn(webElements);\n for (FluentWebElement fluentWebElement : search.find(\"cssStyle\")) {\n //just to check the cast\n+ assertThat(fluentWebElement).isInstanceOf(FluentWebElement.class);\n }\n \n }\n@@ -107,7 +108,7 @@ public void findCheckCssIsWellFormedWithPostSelector() {\n when(searchContext.findElements(By.cssSelector(\"cssStyle[generated=true]\"))).thenReturn(webElements);\n \n String name = \"cssStyle\";\n- Filter[] filters = new Filter[] { filter1, filter2 };\n+ Filter[] filters = new Filter[] {filter1, filter2};\n when(filter1.isPreFilter()).thenReturn(true);\n when(filter1.toString()).thenReturn(\"[generated=true]\");\n when(filter2.isPreFilter()).thenReturn(false);\n@@ -129,7 +130,7 @@ public void findCheckCssIsWellFormedWithPostSelectorAndByLocator() {\n when(searchContext.findElements(By.cssSelector(\"cssStyle[generated=true]\"))).thenReturn(webElements);\n \n By locator = By.cssSelector(\"cssStyle\");\n- Filter[] filters = new Filter[] { filter1, filter2 };\n+ Filter[] filters = new Filter[] {filter1, filter2};\n when(filter1.isPreFilter()).thenReturn(true);\n when(filter1.toString()).thenReturn(\"[generated=true]\");\n when(filter2.isPreFilter()).thenReturn(false);\n@@ -145,7 +146,7 @@ public void findCheckCssIsWellFormedWithPostSelectorAndByLocator() {\n @Test\n public void findPostSelectorFilterWithElementThatMatch() {\n String name = \"cssStyle\";\n- Filter[] filters = new Filter[] { filter1 };\n+ Filter[] filters = new Filter[] {filter1};\n when(filter1.isPreFilter()).thenReturn(false);\n WebElement webElement = mock(WebElement.class);\n when(searchContext.findElements(By.cssSelector(\"cssStyle\"))).thenReturn(Collections.singletonList(webElement));\n@@ -159,7 +160,7 @@ public void findPostSelectorFilterWithElementThatMatch() {\n @Test\n public void findPostSelectorFilterWithElementThatDontMatch() {\n final String name = \"cssStyle\";\n- final Filter[] filters = new Filter[] { filter1 };\n+ final Filter[] filters = new Filter[] {filter1};\n when(filter1.isPreFilter()).thenReturn(false);\n WebElement webElement = mock(WebElement.class);\n when(searchContext.findElements(By.cssSelector(\"cssStyle\"))).thenReturn(Collections.singletonList(webElement));\n@@ -180,7 +181,7 @@ public void call() throws Throwable {\n @Test\n public void findPostSelectorFilterWithFilterOnText() {\n String name = \"cssStyle\";\n- Filter[] filters = new Filter[] { filter1 };\n+ Filter[] filters = new Filter[] {filter1};\n when(filter1.isPreFilter()).thenReturn(false);\n WebElement webElement = mock(WebElement.class);\n when(searchContext.findElements(By.cssSelector(\"cssStyle\"))).thenReturn(Collections.singletonList(webElement));", "raw_url": "https://github.com/FluentLenium/FluentLenium/raw/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fcore%2Fsearch%2FSearchTest.java", "sha": "6b6ebfecb11ca5bc4131dc82d83a1db308903ecd", "status": "modified" }, { "additions": 2, "blob_url": "https://github.com/FluentLenium/FluentLenium/blob/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fcore%2Fwait%2FWaitForPageToLoadTest.java", "changes": 4, "contents_url": "https://api.github.com/repos/FluentLenium/FluentLenium/contents/fluentlenium-core%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fcore%2Fwait%2FWaitForPageToLoadTest.java?ref=5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd", "deletions": 2, "filename": "fluentlenium-core/src/test/java/org/fluentlenium/core/wait/WaitForPageToLoadTest.java", "new_code": " public void whenBrowserDoNotImplementsJavascriptExecutorThrowsException() {\n public void whenBrowserImplementsJavascriptExecutorThenGoToPredicate() {", "new_methods": [], "old_code": " public void when_browser_do_not_implemets_Javascript_executor_throws_exception() {\n public void when_browser_implemets_Javascript_executor_then_go_to_predicate() {", "old_methods": [], "patch": "@@ -37,13 +37,13 @@ public void before() {\n }\n \n @Test(expected = UnsupportedOperationException.class)\n- public void when_browser_do_not_implemets_Javascript_executor_throws_exception() {\n+ public void whenBrowserDoNotImplementsJavascriptExecutorThrowsException() {\n FluentWaitPageMatcher fluentWaitPageBuilder = new FluentWaitPageMatcher(wait, webDriver);\n fluentWaitPageBuilder.isLoaded();\n }\n \n @Test\n- public void when_browser_implemets_Javascript_executor_then_go_to_predicate() {\n+ public void whenBrowserImplementsJavascriptExecutorThenGoToPredicate() {\n FluentWaitPageMatcher fluentWaitPageBuilder = new FluentWaitPageMatcher(wait, new WebDriverWithJavascriptExecutor());\n fluentWaitPageBuilder.isLoaded();\n verify(wait).untilPredicate(any(Predicate.class));", "raw_url": "https://github.com/FluentLenium/FluentLenium/raw/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fcore%2Fwait%2FWaitForPageToLoadTest.java", "sha": "deea47d6082f4df8198ca9f8a350e8897abd2ab0", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/FluentLenium/FluentLenium/blob/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fintegration%2FAfterTest.java", "changes": 2, "contents_url": "https://api.github.com/repos/FluentLenium/FluentLenium/contents/fluentlenium-core%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fintegration%2FAfterTest.java?ref=5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd", "deletions": 1, "filename": "fluentlenium-core/src/test/java/org/fluentlenium/integration/AfterTest.java", "new_code": " public void whenDriverIsNullThenItIsHandle() {", "new_methods": [], "old_code": " public void when_driver_is_null_then_it_is_handle() {", "old_methods": [], "patch": "@@ -12,7 +12,7 @@ public WebDriver newWebDriver() {\n }\n \n @Test\n- public void when_driver_is_null_then_it_is_handle() {\n+ public void whenDriverIsNullThenItIsHandle() {\n // after();\n }\n }", "raw_url": "https://github.com/FluentLenium/FluentLenium/raw/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fintegration%2FAfterTest.java", "sha": "91b18456313517aa079bb58f3b629ce1def1b141", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/FluentLenium/FluentLenium/blob/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fintegration%2FAnnotationsEventsTest.java", "changes": 2, "contents_url": "https://api.github.com/repos/FluentLenium/FluentLenium/contents/fluentlenium-core%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fintegration%2FAnnotationsEventsTest.java?ref=5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd", "deletions": 1, "filename": "fluentlenium-core/src/test/java/org/fluentlenium/integration/AnnotationsEventsTest.java", "new_code": " private static final class Component {", "new_methods": [], "old_code": " private static class Component {", "old_methods": [], "patch": "@@ -33,7 +33,7 @@ public class AnnotationsEventsTest extends IntegrationFluentTest {\n private int beforeNavigateRefresh;\n private int afterNavigateRefresh;\n \n- private static class Component {\n+ private static final class Component {\n private final WebElement element;\n \n private Component(WebElement element) {", "raw_url": "https://github.com/FluentLenium/FluentLenium/raw/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fintegration%2FAnnotationsEventsTest.java", "sha": "7aedc9e30f99262ab05a62c4625436c99ae15d7b", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/FluentLenium/FluentLenium/blob/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fintegration%2FCssInjectTest.java", "changes": 2, "contents_url": "https://api.github.com/repos/FluentLenium/FluentLenium/contents/fluentlenium-core%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fintegration%2FCssInjectTest.java?ref=5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd", "deletions": 1, "filename": "fluentlenium-core/src/test/java/org/fluentlenium/integration/CssInjectTest.java", "new_code": " private FluentWebElement location;", "new_methods": [], "old_code": " public FluentWebElement location;", "old_methods": [], "patch": "@@ -7,7 +7,7 @@\n import static org.assertj.core.api.Assertions.assertThat;\n \n public class CssInjectTest extends IntegrationFluentTest {\n- public FluentWebElement location;\n+ private FluentWebElement location;\n \n @Test\n public void injectDisplayNoneShouldMakeElementNotPresent() {", "raw_url": "https://github.com/FluentLenium/FluentLenium/raw/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fintegration%2FCssInjectTest.java", "sha": "4c5f3124267505ebca188c436e45502eb529db09", "status": "modified" }, { "additions": 2, "blob_url": "https://github.com/FluentLenium/FluentLenium/blob/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fintegration%2FFindByOfListTest.java", "changes": 4, "contents_url": "https://api.github.com/repos/FluentLenium/FluentLenium/contents/fluentlenium-core%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fintegration%2FFindByOfListTest.java?ref=5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd", "deletions": 2, "filename": "fluentlenium-core/src/test/java/org/fluentlenium/integration/FindByOfListTest.java", "new_code": " public void shouldFindByRetrieveList() {\n public void shouldFindAllFindByRetrieveList() {", "new_methods": [], "old_code": " public void should_findBy_retrieve_list() {\n public void should_findAll_findBy_retrieve_list() {", "old_methods": [], "patch": "@@ -18,15 +18,15 @@ public class FindByOfListTest extends IntegrationFluentTest {\n private PageIndex page;\n \n @Test\n- public void should_findBy_retrieve_list() {\n+ public void shouldFindByRetrieveList() {\n page.go();\n page.isAt();\n Assertions.assertThat(page.smalls).hasSize(3);\n Assertions.assertThat(page.smalls.texts()).containsExactly(\"Small 1\", \"Small 2\", \"Small 3\");\n }\n \n @Test\n- public void should_findAll_findBy_retrieve_list() {\n+ public void shouldFindAllFindByRetrieveList() {\n page.go();\n page.isAt();\n Assertions.assertThat(page.findAllElements).hasSize(4);", "raw_url": "https://github.com/FluentLenium/FluentLenium/raw/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fintegration%2FFindByOfListTest.java", "sha": "f626e2aa78cdbfefa0d32c44dc334a319727e804", "status": "modified" }, { "additions": 17, "blob_url": "https://github.com/FluentLenium/FluentLenium/blob/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fintegration%2FFluentLeniumFunctionalWaitTest.java", "changes": 34, "contents_url": "https://api.github.com/repos/FluentLenium/FluentLenium/contents/fluentlenium-core%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fintegration%2FFluentLeniumFunctionalWaitTest.java?ref=5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd", "deletions": 17, "filename": "fluentlenium-core/src/test/java/org/fluentlenium/integration/FluentLeniumFunctionalWaitTest.java", "new_code": " public void whenAElementIsNotPresentThenIsNotPresentReturnTrue() {\n public void whenAElementIsPresentThenIsNotPresentThrowAnException() {\n public void whenElementIsPresentThenAreDisplayedReturnTrue() {\n public void whenElementIsPresentThenIsDisplayedReturnTrue() {\n public void whenElementIsNotDisplayedThenAreDisplayedThrowsException() {\n public void whenElementIsNotDisplayedThenIsDisplayedThrowsException() {\n public void whenElementIsNotPresentThenAreNotDisplayedReturnTrue() {\n public void whenElementIsNotPresentThenIsNotDisplayedReturnTrue() {\n public void whenElementIsNotDisplayedThenAreNotDisplayedReturnTrue() {\n public void whenElementIsNotDisplayedThenIsNotDisplayedReturnTrue() {\n public void whenElementIsDisplayedThenAreNotDisplayedThrowsException() {\n public void whenElementIsDisplayedThenIsNotDisplayedThrowsException() {\n public void whenElementIsEnabledThenAreEnabledReturnTrue() {\n public void whenElementIsEnabledThenIsEnabledReturnTrue() {\n public void whenElementIsNotEnabledThenAreEnabledThrowsException() {\n public void whenElementIsNotEnabledThenIsEnabledThrowsException() {\n public void whenElementIsNotDisplayedThenIsPresentReturnTrue() {", "new_methods": [], "old_code": " public void when_a_element_is_not_present_then_isNotPresent_return_true() {\n public void when_a_element_is_present_then_isNotPresent_throw_an_exception() {\n public void when_element_is_present_then_areDisplayed_return_true() {\n public void when_element_is_present_then_isDisplayed_return_true() {\n public void when_element_is_not_displayed_then_areDisplayed_throws_exception() {\n public void when_element_is_not_displayed_then_isDisplayed_throws_exception() {\n public void when_element_is_not_present_then_areNotDisplayed_return_true() {\n public void when_element_is_not_present_then_isNotDisplayed_return_true() {\n public void when_element_is_not_displayed_then_areNotDisplayed_return_true() {\n public void when_element_is_not_displayed_then_isNotDisplayed_return_true() {\n public void when_element_is_displayed_then_areNotDisplayed_throws_exception() {\n public void when_element_is_displayed_then_isNotDisplayed_throws_exception() {\n public void when_element_is_enabled_then_areEnabled_return_true() {\n public void when_element_is_enabled_then_isEnabled_return_true() {\n public void when_element_is_not_enabled_then_areEnabled_throws_exception() {\n public void when_element_is_not_enabled_then_isEnabled_throws_exception() {\n public void when_element_is_not_displayed_then_isPresent_return_true() {", "old_methods": [], "patch": "@@ -224,7 +224,7 @@ public FluentWebElement get() {\n }\n \n @Test\n- public void when_a_element_is_not_present_then_isNotPresent_return_true() {\n+ public void whenAElementIsNotPresentThenIsNotPresentReturnTrue() {\n await().atMost(1, NANOSECONDS).untilElements(new Supplier<FluentList<FluentWebElement>>() {\n @Override\n public FluentList<FluentWebElement> get() {\n@@ -234,7 +234,7 @@ public FluentList<FluentWebElement> get() {\n }\n \n @Test(expected = TimeoutException.class)\n- public void when_a_element_is_present_then_isNotPresent_throw_an_exception() {\n+ public void whenAElementIsPresentThenIsNotPresentThrowAnException() {\n await().atMost(1, NANOSECONDS).untilElement(new Supplier<FluentWebElement>() {\n @Override\n public FluentWebElement get() {\n@@ -434,7 +434,7 @@ public FluentWebElement get() {\n }\n \n @Test\n- public void when_element_is_present_then_areDisplayed_return_true() {\n+ public void whenElementIsPresentThenAreDisplayedReturnTrue() {\n goTo(JAVASCRIPT_URL);\n await().atMost(1, NANOSECONDS).untilEachElements(new Supplier<FluentList<FluentWebElement>>() {\n @Override\n@@ -445,7 +445,7 @@ public FluentList<FluentWebElement> get() {\n }\n \n @Test\n- public void when_element_is_present_then_isDisplayed_return_true() {\n+ public void whenElementIsPresentThenIsDisplayedReturnTrue() {\n goTo(JAVASCRIPT_URL);\n await().atMost(1, NANOSECONDS).untilElements(new Supplier<FluentList<FluentWebElement>>() {\n @Override\n@@ -456,7 +456,7 @@ public FluentList<FluentWebElement> get() {\n }\n \n @Test(expected = TimeoutException.class)\n- public void when_element_is_not_displayed_then_areDisplayed_throws_exception() {\n+ public void whenElementIsNotDisplayedThenAreDisplayedThrowsException() {\n goTo(JAVASCRIPT_URL);\n await().atMost(1, NANOSECONDS).untilEachElements(new Supplier<FluentList<FluentWebElement>>() {\n @Override\n@@ -467,7 +467,7 @@ public FluentList<FluentWebElement> get() {\n }\n \n @Test(expected = TimeoutException.class)\n- public void when_element_is_not_displayed_then_isDisplayed_throws_exception() {\n+ public void whenElementIsNotDisplayedThenIsDisplayedThrowsException() {\n goTo(JAVASCRIPT_URL);\n await().atMost(1, NANOSECONDS).untilElements(new Supplier<FluentList<FluentWebElement>>() {\n @Override\n@@ -478,7 +478,7 @@ public FluentList<FluentWebElement> get() {\n }\n \n @Test\n- public void when_element_is_not_present_then_areNotDisplayed_return_true() {\n+ public void whenElementIsNotPresentThenAreNotDisplayedReturnTrue() {\n goTo(JAVASCRIPT_URL);\n await().atMost(1, NANOSECONDS).untilEachElements(new Supplier<FluentList<FluentWebElement>>() {\n @Override\n@@ -489,7 +489,7 @@ public FluentList<FluentWebElement> get() {\n }\n \n @Test\n- public void when_element_is_not_present_then_isNotDisplayed_return_true() {\n+ public void whenElementIsNotPresentThenIsNotDisplayedReturnTrue() {\n goTo(JAVASCRIPT_URL);\n await().atMost(1, NANOSECONDS).untilEachElements(new Supplier<FluentList<FluentWebElement>>() {\n @Override\n@@ -500,7 +500,7 @@ public FluentList<FluentWebElement> get() {\n }\n \n @Test\n- public void when_element_is_not_displayed_then_areNotDisplayed_return_true() {\n+ public void whenElementIsNotDisplayedThenAreNotDisplayedReturnTrue() {\n goTo(JAVASCRIPT_URL);\n await().atMost(1, NANOSECONDS).untilEachElements(new Supplier<FluentList<FluentWebElement>>() {\n @Override\n@@ -511,7 +511,7 @@ public FluentList<FluentWebElement> get() {\n }\n \n @Test\n- public void when_element_is_not_displayed_then_isNotDisplayed_return_true() {\n+ public void whenElementIsNotDisplayedThenIsNotDisplayedReturnTrue() {\n goTo(JAVASCRIPT_URL);\n await().atMost(1, NANOSECONDS).untilEachElements(new Supplier<FluentList<FluentWebElement>>() {\n @Override\n@@ -522,7 +522,7 @@ public FluentList<FluentWebElement> get() {\n }\n \n @Test(expected = TimeoutException.class)\n- public void when_element_is_displayed_then_areNotDisplayed_throws_exception() {\n+ public void whenElementIsDisplayedThenAreNotDisplayedThrowsException() {\n goTo(JAVASCRIPT_URL);\n await().atMost(1, NANOSECONDS).untilEachElements(new Supplier<FluentList<FluentWebElement>>() {\n @Override\n@@ -533,7 +533,7 @@ public FluentList<FluentWebElement> get() {\n }\n \n @Test(expected = TimeoutException.class)\n- public void when_element_is_displayed_then_isNotDisplayed_throws_exception() {\n+ public void whenElementIsDisplayedThenIsNotDisplayedThrowsException() {\n goTo(JAVASCRIPT_URL);\n await().atMost(1, NANOSECONDS).untilElements(new Supplier<FluentList<FluentWebElement>>() {\n @Override\n@@ -544,7 +544,7 @@ public FluentList<FluentWebElement> get() {\n }\n \n @Test\n- public void when_element_is_enabled_then_areEnabled_return_true() {\n+ public void whenElementIsEnabledThenAreEnabledReturnTrue() {\n goTo(JAVASCRIPT_URL);\n await().atMost(1, NANOSECONDS).untilEachElements(new Supplier<FluentList<FluentWebElement>>() {\n @Override\n@@ -555,7 +555,7 @@ public FluentList<FluentWebElement> get() {\n }\n \n @Test\n- public void when_element_is_enabled_then_isEnabled_return_true() {\n+ public void whenElementIsEnabledThenIsEnabledReturnTrue() {\n goTo(JAVASCRIPT_URL);\n await().atMost(1, NANOSECONDS).untilElements(new Supplier<FluentList<FluentWebElement>>() {\n @Override\n@@ -566,7 +566,7 @@ public FluentList<FluentWebElement> get() {\n }\n \n @Test(expected = TimeoutException.class)\n- public void when_element_is_not_enabled_then_areEnabled_throws_exception() {\n+ public void whenElementIsNotEnabledThenAreEnabledThrowsException() {\n goTo(JAVASCRIPT_URL);\n await().atMost(1, NANOSECONDS).untilEachElements(new Supplier<FluentList<FluentWebElement>>() {\n @Override\n@@ -577,7 +577,7 @@ public FluentList<FluentWebElement> get() {\n }\n \n @Test(expected = TimeoutException.class)\n- public void when_element_is_not_enabled_then_isEnabled_throws_exception() {\n+ public void whenElementIsNotEnabledThenIsEnabledThrowsException() {\n goTo(JAVASCRIPT_URL);\n await().atMost(1, NANOSECONDS).untilElements(new Supplier<FluentList<FluentWebElement>>() {\n @Override\n@@ -588,7 +588,7 @@ public FluentList<FluentWebElement> get() {\n }\n \n @Test\n- public void when_element_is_not_displayed_then_isPresent_return_true() {\n+ public void whenElementIsNotDisplayedThenIsPresentReturnTrue() {\n goTo(JAVASCRIPT_URL);\n await().atMost(1, NANOSECONDS).untilElements(new Supplier<FluentList<FluentWebElement>>() {\n @Override", "raw_url": "https://github.com/FluentLenium/FluentLenium/raw/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fintegration%2FFluentLeniumFunctionalWaitTest.java", "sha": "aeb7f9760868ce4dfda7b8252df90c5a59fac3d4", "status": "modified" }, { "additions": 20, "blob_url": "https://github.com/FluentLenium/FluentLenium/blob/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fintegration%2FFluentLeniumWaitElementTest.java", "changes": 40, "contents_url": "https://api.github.com/repos/FluentLenium/FluentLenium/contents/fluentlenium-core%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fintegration%2FFluentLeniumWaitElementTest.java?ref=5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd", "deletions": 20, "filename": "fluentlenium-core/src/test/java/org/fluentlenium/integration/FluentLeniumWaitElementTest.java", "new_code": " public void whenElementIsPresentThenAreDisplayedReturnTrue() {\n public void whenElementIsPresentThenIsDisplayedReturnTrue() {\n public void whenElementIsNotDisplayedThenAreDisplayedThrowsException() {\n public void whenElementIsNotDisplayedThenIsDisplayedThrowsException() {\n public void whenElementIsNotPresentThenAreNotDisplayedReturnTrue() {\n public void whenElementIsNotPresentThenIsNotDisplayedReturnTrue() {\n public void whenElementIsNotDisplayedThenAreNotDisplayedReturnTrue() {\n public void whenElementIsNotDisplayedThenIsNotDisplayedReturnTrue() {\n public void whenElementIsDisplayedThenAreNotDisplayedThrowsException() {\n public void whenElementIsDisplayedThenIsNotDisplayedThrowsException() {\n public void whenElementIsEnabledThenAreEnabledReturnTrue() {\n public void whenElementIsEnabledThenIsEnabledReturnTrue() {\n public void whenSingleElementIsEnabledThenIsEnabledReturnTrue() {\n public void whenSingleNonexistingElementThenIsEnabledThrowsException() {\n public void whenElementIsNotEnabledThenAreEnabledThrowsException() {\n public void whenElementIsNotEnabledThenIsEnabledThrowsException() {\n public void whenElementIsNotEnabledThenIsNotEnabledReturnTrue() {\n public void whenSingleElementIsNotEnabledThenIsEnabledThrowsException() {\n public void whenSingleElementIsNotEnabledThenIsNotEnabledReturnTrue() {\n public void whenElementIsNotDisplayedThenIsPresentReturnTrue() {", "new_methods": [], "old_code": " public void when_element_is_present_then_areDisplayed_return_true() {\n public void when_element_is_present_then_isDisplayed_return_true() {\n public void when_element_is_not_displayed_then_areDisplayed_throws_exception() {\n public void when_element_is_not_displayed_then_isDisplayed_throws_exception() {\n public void when_element_is_not_present_then_areNotDisplayed_return_true() {\n public void when_element_is_not_present_then_isNotDisplayed_return_true() {\n public void when_element_is_not_displayed_then_areNotDisplayed_return_true() {\n public void when_element_is_not_displayed_then_isNotDisplayed_return_true() {\n public void when_element_is_displayed_then_areNotDisplayed_throws_exception() {\n public void when_element_is_displayed_then_isNotDisplayed_throws_exception() {\n public void when_element_is_enabled_then_areEnabled_return_true() {\n public void when_element_is_enabled_then_isEnabled_return_true() {\n public void when_single_element_is_enabled_then_isEnabled_return_true() {\n public void when_single_nonexisting_element_then_isEnabled_throws_exception() {\n public void when_element_is_not_enabled_then_areEnabled_throws_exception() {\n public void when_element_is_not_enabled_then_isEnabled_throws_exception() {\n public void when_element_is_not_enabled_then_isNotEnabled_return_true() {\n public void when_single_element_is_not_enabled_then_isEnabled_throws_exception() {\n public void when_single_element_is_not_enabled_then_isNotEnabled_return_true() {\n public void when_element_is_not_displayed_then_isPresent_return_true() {", "old_methods": [], "patch": "@@ -143,121 +143,121 @@ public void checkHasAttribute() {\n }\n \n @Test\n- public void when_element_is_present_then_areDisplayed_return_true() {\n+ public void whenElementIsPresentThenAreDisplayedReturnTrue() {\n goTo(JAVASCRIPT_URL);\n await().atMost(1, NANOSECONDS).untilEach(defaultElements).displayed();\n }\n \n @Test\n- public void when_element_is_present_then_isDisplayed_return_true() {\n+ public void whenElementIsPresentThenIsDisplayedReturnTrue() {\n goTo(JAVASCRIPT_URL);\n await().atMost(1, NANOSECONDS).until(defaultElements).displayed();\n }\n \n @Test(expected = TimeoutException.class)\n- public void when_element_is_not_displayed_then_areDisplayed_throws_exception() {\n+ public void whenElementIsNotDisplayedThenAreDisplayedThrowsException() {\n goTo(JAVASCRIPT_URL);\n await().atMost(1, NANOSECONDS).untilEach(unvisibleElements).displayed();\n }\n \n @Test(expected = TimeoutException.class)\n- public void when_element_is_not_displayed_then_isDisplayed_throws_exception() {\n+ public void whenElementIsNotDisplayedThenIsDisplayedThrowsException() {\n goTo(JAVASCRIPT_URL);\n await().atMost(1, NANOSECONDS).until(unvisibleElements).displayed();\n }\n \n @Test\n- public void when_element_is_not_present_then_areNotDisplayed_return_true() {\n+ public void whenElementIsNotPresentThenAreNotDisplayedReturnTrue() {\n goTo(JAVASCRIPT_URL);\n await().atMost(1, NANOSECONDS).untilEach(nonexistentElements).not().displayed();\n }\n \n @Test\n- public void when_element_is_not_present_then_isNotDisplayed_return_true() {\n+ public void whenElementIsNotPresentThenIsNotDisplayedReturnTrue() {\n goTo(JAVASCRIPT_URL);\n await().atMost(1, NANOSECONDS).until(nonexistentElements).not().displayed();\n }\n \n @Test\n- public void when_element_is_not_displayed_then_areNotDisplayed_return_true() {\n+ public void whenElementIsNotDisplayedThenAreNotDisplayedReturnTrue() {\n goTo(JAVASCRIPT_URL);\n await().atMost(1, NANOSECONDS).untilEach(unvisibleElements).not().displayed();\n }\n \n @Test\n- public void when_element_is_not_displayed_then_isNotDisplayed_return_true() {\n+ public void whenElementIsNotDisplayedThenIsNotDisplayedReturnTrue() {\n goTo(JAVASCRIPT_URL);\n await().atMost(1, NANOSECONDS).until(unvisibleElements).not().displayed();\n }\n \n @Test(expected = TimeoutException.class)\n- public void when_element_is_displayed_then_areNotDisplayed_throws_exception() {\n+ public void whenElementIsDisplayedThenAreNotDisplayedThrowsException() {\n goTo(JAVASCRIPT_URL);\n await().atMost(1, NANOSECONDS).untilEach(defaultElements).not().displayed();\n }\n \n @Test(expected = TimeoutException.class)\n- public void when_element_is_displayed_then_isNotDisplayed_throws_exception() {\n+ public void whenElementIsDisplayedThenIsNotDisplayedThrowsException() {\n goTo(JAVASCRIPT_URL);\n await().atMost(1, NANOSECONDS).until(defaultElements).not().displayed();\n }\n \n @Test\n- public void when_element_is_enabled_then_areEnabled_return_true() {\n+ public void whenElementIsEnabledThenAreEnabledReturnTrue() {\n goTo(JAVASCRIPT_URL);\n await().atMost(1, NANOSECONDS).untilEach(defaultElements).enabled();\n }\n \n @Test\n- public void when_element_is_enabled_then_isEnabled_return_true() {\n+ public void whenElementIsEnabledThenIsEnabledReturnTrue() {\n goTo(JAVASCRIPT_URL);\n await().atMost(1, NANOSECONDS).until(defaultElements).enabled();\n }\n \n @Test\n- public void when_single_element_is_enabled_then_isEnabled_return_true() {\n+ public void whenSingleElementIsEnabledThenIsEnabledReturnTrue() {\n goTo(JAVASCRIPT_URL);\n await().atMost(1, NANOSECONDS).until(defaultElement).enabled();\n }\n \n @Test(expected = TimeoutException.class)\n- public void when_single_nonexisting_element_then_isEnabled_throws_exception() {\n+ public void whenSingleNonexistingElementThenIsEnabledThrowsException() {\n goTo(JAVASCRIPT_URL);\n await().atMost(1, NANOSECONDS).until(nonexistentElement).enabled();\n }\n \n @Test(expected = TimeoutException.class)\n- public void when_element_is_not_enabled_then_areEnabled_throws_exception() {\n+ public void whenElementIsNotEnabledThenAreEnabledThrowsException() {\n goTo(JAVASCRIPT_URL);\n await().atMost(1, NANOSECONDS).untilEach(disabledElements).enabled();\n }\n \n @Test(expected = TimeoutException.class)\n- public void when_element_is_not_enabled_then_isEnabled_throws_exception() {\n+ public void whenElementIsNotEnabledThenIsEnabledThrowsException() {\n goTo(JAVASCRIPT_URL);\n await().atMost(1, NANOSECONDS).until(disabledElements).enabled();\n }\n \n @Test\n- public void when_element_is_not_enabled_then_isNotEnabled_return_true() {\n+ public void whenElementIsNotEnabledThenIsNotEnabledReturnTrue() {\n goTo(JAVASCRIPT_URL);\n await().atMost(1, NANOSECONDS).until(disabledElements).not().enabled();\n }\n \n @Test(expected = TimeoutException.class)\n- public void when_single_element_is_not_enabled_then_isEnabled_throws_exception() {\n+ public void whenSingleElementIsNotEnabledThenIsEnabledThrowsException() {\n goTo(JAVASCRIPT_URL);\n await().atMost(1, NANOSECONDS).until(disabledElement).enabled();\n }\n \n @Test\n- public void when_single_element_is_not_enabled_then_isNotEnabled_return_true() {\n+ public void whenSingleElementIsNotEnabledThenIsNotEnabledReturnTrue() {\n goTo(JAVASCRIPT_URL);\n await().atMost(1, NANOSECONDS).until(disabledElement).not().enabled();\n }\n \n @Test\n- public void when_element_is_not_displayed_then_isPresent_return_true() {\n+ public void whenElementIsNotDisplayedThenIsPresentReturnTrue() {\n goTo(JAVASCRIPT_URL);\n await().atMost(1, NANOSECONDS).until(unvisibleElements).present();\n }", "raw_url": "https://github.com/FluentLenium/FluentLenium/raw/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fintegration%2FFluentLeniumWaitElementTest.java", "sha": "9a2570f2d5174c0a47d8de04e2dc11f97b468449", "status": "modified" }, { "additions": 6, "blob_url": "https://github.com/FluentLenium/FluentLenium/blob/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fintegration%2FFluentLeniumWaitIgnoringTest.java", "changes": 12, "contents_url": "https://api.github.com/repos/FluentLenium/FluentLenium/contents/fluentlenium-core%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fintegration%2FFluentLeniumWaitIgnoringTest.java?ref=5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd", "deletions": 6, "filename": "fluentlenium-core/src/test/java/org/fluentlenium/integration/FluentLeniumWaitIgnoringTest.java", "new_code": " public void testIgnoreAllPositive() {\n public void testIgnoreAllNegative() {\n public void testIgnoring1Positive() {\n public void testIgnoring1Negative() {\n public void testIgnoring2Positive() {\n public void testIgnoring2Negative() {", "new_methods": [], "old_code": " public void test_ignoreAll_positive() {\n public void test_ignoreAll_negative() {\n public void test_ignoring_1_positive() {\n public void test_ignoring_1_negative() {\n public void test_ignoring_2_positive() {\n public void test_ignoring_2_negative() {", "old_methods": [], "patch": "@@ -30,7 +30,7 @@ private static class CustomException3 extends RuntimeException {\n }\n \n @Test\n- public void test_ignoreAll_positive() {\n+ public void testIgnoreAllPositive() {\n \n try {\n Collection<Class<? extends Throwable>> exceptions = new ArrayList<>();\n@@ -51,7 +51,7 @@ public Boolean get() {\n }\n \n @Test(expected = CustomException3.class)\n- public void test_ignoreAll_negative() {\n+ public void testIgnoreAllNegative() {\n \n try {\n Collection<Class<? extends Throwable>> exceptions = new ArrayList<>();\n@@ -72,7 +72,7 @@ public Boolean get() {\n }\n \n @Test\n- public void test_ignoring_1_positive() {\n+ public void testIgnoring1Positive() {\n \n try {\n await().atMost(1, TimeUnit.NANOSECONDS).ignoring(CustomException.class).ignoring(CustomException2.class)\n@@ -90,7 +90,7 @@ public Boolean get() {\n }\n \n @Test(expected = CustomException3.class)\n- public void test_ignoring_1_negative() {\n+ public void testIgnoring1Negative() {\n \n try {\n await().atMost(1, TimeUnit.NANOSECONDS).ignoring(CustomException.class).ignoring(CustomException2.class)\n@@ -108,7 +108,7 @@ public Boolean get() {\n }\n \n @Test\n- public void test_ignoring_2_positive() {\n+ public void testIgnoring2Positive() {\n \n try {\n await().atMost(1, TimeUnit.NANOSECONDS).ignoring(CustomException.class, CustomException2.class)\n@@ -126,7 +126,7 @@ public Boolean get() {\n }\n \n @Test(expected = CustomException3.class)\n- public void test_ignoring_2_negative() {\n+ public void testIgnoring2Negative() {\n \n try {\n await().atMost(1, TimeUnit.NANOSECONDS).ignoring(CustomException.class, CustomException2.class)", "raw_url": "https://github.com/FluentLenium/FluentLenium/raw/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fintegration%2FFluentLeniumWaitIgnoringTest.java", "sha": "c201cf392c7ddbc0c4f446482231545f58203845", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/FluentLenium/FluentLenium/blob/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fintegration%2FFluentWebElementDelegateClassInTest.java", "changes": 2, "contents_url": "https://api.github.com/repos/FluentLenium/FluentLenium/contents/fluentlenium-core%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fintegration%2FFluentWebElementDelegateClassInTest.java?ref=5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd", "deletions": 1, "filename": "fluentlenium-core/src/test/java/org/fluentlenium/integration/FluentWebElementDelegateClassInTest.java", "new_code": " public void whenWebElementInTestThenTheyAreInstanciated() {", "new_methods": [], "old_code": " public void when_web_element_in_test_then_they_are_instanciated() {", "old_methods": [], "patch": "@@ -24,7 +24,7 @@ public void clickIfDisplayed() {\n }\n \n @Test\n- public void when_web_element_in_test_then_they_are_instanciated() {\n+ public void whenWebElementInTestThenTheyAreInstanciated() {\n goTo(IntegrationFluentTest.DEFAULT_URL);\n linkToPage2.clickIfDisplayed();\n assertThat(url()).isEqualTo(IntegrationFluentTest.PAGE_2_URL);", "raw_url": "https://github.com/FluentLenium/FluentLenium/raw/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fintegration%2FFluentWebElementDelegateClassInTest.java", "sha": "63d5b86fc31210e33faf8c4d7d420c6c88530e1c", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/FluentLenium/FluentLenium/blob/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fintegration%2FFluentWebElementInTest.java", "changes": 2, "contents_url": "https://api.github.com/repos/FluentLenium/FluentLenium/contents/fluentlenium-core%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fintegration%2FFluentWebElementInTest.java?ref=5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd", "deletions": 1, "filename": "fluentlenium-core/src/test/java/org/fluentlenium/integration/FluentWebElementInTest.java", "new_code": " public void whenWebElementInTestThenTheyAreInstanciated() {", "new_methods": [], "old_code": " public void when_web_element_in_test_then_they_are_instanciated() {", "old_methods": [], "patch": "@@ -10,7 +10,7 @@ public class FluentWebElementInTest extends IntegrationFluentTest {\n FluentWebElement linkToPage2;\n \n @Test\n- public void when_web_element_in_test_then_they_are_instanciated() {\n+ public void whenWebElementInTestThenTheyAreInstanciated() {\n goTo(IntegrationFluentTest.DEFAULT_URL);\n linkToPage2.click();\n assertThat(url()).isEqualTo(IntegrationFluentTest.PAGE_2_URL);", "raw_url": "https://github.com/FluentLenium/FluentLenium/raw/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fintegration%2FFluentWebElementInTest.java", "sha": "2389d33578581edb2e174202165082b62e13484b", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/FluentLenium/FluentLenium/blob/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fintegration%2FFluentWebElementSubclassInTest.java", "changes": 2, "contents_url": "https://api.github.com/repos/FluentLenium/FluentLenium/contents/fluentlenium-core%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fintegration%2FFluentWebElementSubclassInTest.java?ref=5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd", "deletions": 1, "filename": "fluentlenium-core/src/test/java/org/fluentlenium/integration/FluentWebElementSubclassInTest.java", "new_code": " public void whenWebElementInTestThenTheyAreInstanciated() {", "new_methods": [], "old_code": " public void when_web_element_in_test_then_they_are_instanciated() {", "old_methods": [], "patch": "@@ -25,7 +25,7 @@ public void clickIfDisplayed() {\n }\n \n @Test\n- public void when_web_element_in_test_then_they_are_instanciated() {\n+ public void whenWebElementInTestThenTheyAreInstanciated() {\n goTo(IntegrationFluentTest.DEFAULT_URL);\n linkToPage2.clickIfDisplayed();\n assertThat(url()).isEqualTo(IntegrationFluentTest.PAGE_2_URL);", "raw_url": "https://github.com/FluentLenium/FluentLenium/raw/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fintegration%2FFluentWebElementSubclassInTest.java", "sha": "966e5a969529c1431f077e5f02da86229d0a12d4", "status": "modified" }, { "additions": 4, "blob_url": "https://github.com/FluentLenium/FluentLenium/blob/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fintegration%2FIframeTest.java", "changes": 8, "contents_url": "https://api.github.com/repos/FluentLenium/FluentLenium/contents/fluentlenium-core%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fintegration%2FIframeTest.java?ref=5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd", "deletions": 4, "filename": "fluentlenium-core/src/test/java/org/fluentlenium/integration/IframeTest.java", "new_code": " public void shouldGetElementIntoAFrameWithNativeInstructions() {\n public void shouldGetElementIntoAFrameWithFluentSwitchTo() {\n public void shouldGetElementIntoAFrameWithFluentSwitchToBis() {\n public void shouldGetElementIntoAFrameWithFluentSwitchToDefault() {", "new_methods": [], "old_code": " public void should_get_element_into_a_frame_with_native_instructions() {\n public void should_get_element_into_a_frame_with_Fluent_switchTo() {\n public void should_get_element_into_a_frame_with_Fluent_switchTo_bis() {\n public void should_get_element_into_a_frame_with_Fluent_switchToDefault() {", "old_methods": [], "patch": "@@ -13,7 +13,7 @@ public class IframeTest extends IntegrationFluentTest {\n private IFramePage iFramePage;\n \n @Test\n- public void should_get_element_into_a_frame_with_native_instructions() {\n+ public void shouldGetElementIntoAFrameWithNativeInstructions() {\n // Given\n // When\n iFramePage.go();\n@@ -28,7 +28,7 @@ public void should_get_element_into_a_frame_with_native_instructions() {\n }\n \n @Test\n- public void should_get_element_into_a_frame_with_Fluent_switchTo() {\n+ public void shouldGetElementIntoAFrameWithFluentSwitchTo() {\n // Given\n // When\n iFramePage.go();\n@@ -43,7 +43,7 @@ public void should_get_element_into_a_frame_with_Fluent_switchTo() {\n }\n \n @Test\n- public void should_get_element_into_a_frame_with_Fluent_switchTo_bis() {\n+ public void shouldGetElementIntoAFrameWithFluentSwitchToBis() {\n // Given\n // When\n iFramePage.go();\n@@ -58,7 +58,7 @@ public void should_get_element_into_a_frame_with_Fluent_switchTo_bis() {\n }\n \n @Test\n- public void should_get_element_into_a_frame_with_Fluent_switchToDefault() {\n+ public void shouldGetElementIntoAFrameWithFluentSwitchToDefault() {\n // Given\n // When\n iFramePage.go();", "raw_url": "https://github.com/FluentLenium/FluentLenium/raw/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fintegration%2FIframeTest.java", "sha": "edb708b1b2a1bd7ca0a0225ed5504a8e73e9d69c", "status": "modified" }, { "additions": 6, "blob_url": "https://github.com/FluentLenium/FluentLenium/blob/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fintegration%2FJavascriptTest.java", "changes": 12, "contents_url": "https://api.github.com/repos/FluentLenium/FluentLenium/contents/fluentlenium-core%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fintegration%2FJavascriptTest.java?ref=5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd", "deletions": 6, "filename": "fluentlenium-core/src/test/java/org/fluentlenium/integration/JavascriptTest.java", "new_code": " public void shouldExecuteScriptReturnString() {\n public void shouldExecuteScriptReturnBoolean() {\n public void shouldExecuteScriptReturnDouble() {\n public void shouldExecuteScriptReturnLong() {\n public void shouldExecuteScriptReturnList() {\n public void shouldExecuteAsyncScriptReturnString() {", "new_methods": [], "old_code": " public void should_executeScript_return_String() {\n public void should_executeScript_return_Boolean() {\n public void should_executeScript_return_Double() {\n public void should_executeScript_return_Long() {\n public void should_executeScript_return_List() {\n public void should_executeAsyncScript_return_String() {", "old_methods": [], "patch": "@@ -31,7 +31,7 @@ public void checkTextParam() {\n }\n \n @Test\n- public void should_executeScript_return_String() {\n+ public void shouldExecuteScriptReturnString() {\n final String script = \"return 'string';\";\n final FluentJavascript fluentJavascript = executeScript(script);\n assertThat(fluentJavascript.isBooleanResult()).isFalse();\n@@ -45,7 +45,7 @@ public void should_executeScript_return_String() {\n }\n \n @Test\n- public void should_executeScript_return_Boolean() {\n+ public void shouldExecuteScriptReturnBoolean() {\n final String script = \"return true;\";\n final FluentJavascript fluentJavascript = executeScript(script);\n assertThat(fluentJavascript.isBooleanResult()).isTrue();\n@@ -59,7 +59,7 @@ public void should_executeScript_return_Boolean() {\n }\n \n @Test\n- public void should_executeScript_return_Double() {\n+ public void shouldExecuteScriptReturnDouble() {\n final String script = \"return 12.12;\";\n final FluentJavascript fluentJavascript = executeScript(script);\n assertThat(fluentJavascript.isBooleanResult()).isFalse();\n@@ -73,7 +73,7 @@ public void should_executeScript_return_Double() {\n }\n \n @Test\n- public void should_executeScript_return_Long() {\n+ public void shouldExecuteScriptReturnLong() {\n final String script = \"return 5;\";\n final FluentJavascript fluentJavascript = executeScript(script);\n assertThat(fluentJavascript.isBooleanResult()).isFalse();\n@@ -87,7 +87,7 @@ public void should_executeScript_return_Long() {\n }\n \n @Test\n- public void should_executeScript_return_List() {\n+ public void shouldExecuteScriptReturnList() {\n final String script = \"return Array('string 1', 'string 2', 5, 12.12, true, Array('test 1', 'test 2'));\";\n final FluentJavascript fluentJavascript = executeScript(script);\n assertThat(fluentJavascript.isBooleanResult()).isFalse();\n@@ -102,7 +102,7 @@ public void should_executeScript_return_List() {\n }\n \n @Test\n- public void should_executeAsyncScript_return_String() {\n+ public void shouldExecuteAsyncScriptReturnString() {\n getDriver().manage().timeouts().setScriptTimeout(200, TimeUnit.MILLISECONDS);\n \n final Stopwatch stopwatch = Stopwatch.createStarted();", "raw_url": "https://github.com/FluentLenium/FluentLenium/raw/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fintegration%2FJavascriptTest.java", "sha": "9cee7cafa1e107dbb0566dcfe9cf0f79c2123e24", "status": "modified" }, { "additions": 5, "blob_url": "https://github.com/FluentLenium/FluentLenium/blob/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fintegration%2FPageInPageTest.java", "changes": 7, "contents_url": "https://api.github.com/repos/FluentLenium/FluentLenium/contents/fluentlenium-core%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fintegration%2FPageInPageTest.java?ref=5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd", "deletions": 2, "filename": "fluentlenium-core/src/test/java/org/fluentlenium/integration/PageInPageTest.java", "new_code": " public void pagesShouldBeInjected() {\n private IncludedPage pageWithCreatePage;\n public IncludedPage getPageWithCreatePage() {\n return pageWithCreatePage;\n }", "new_methods": [ { "arguments": [], "filename": "fluentlenium-core/src/test/java/org/fluentlenium/integration/PageInPageTest.java", "implementation": "private IncludedPage pageWithCreatePage;\n public IncludedPage getPageWithCreatePage() {\n return pageWithCreatePage;", "signature": "void pagesShouldBeInjected()" } ], "old_code": " public void pages_should_be_injected() {\n public IncludedPage pageWithCreatePage;", "old_methods": [], "patch": "@@ -21,7 +21,7 @@ public class PageInPageTest extends IntegrationFluentTest {\n private SubSubTestPage subTestPage;\n \n @Test\n- public void pages_should_be_injected() {\n+ public void pagesShouldBeInjected() {\n assertThat(testPage).isNotNull();\n assertThat(testPage).isInstanceOf(TestPage.class);\n assertThat(testPage.includedPage).isNotNull();\n@@ -51,13 +51,16 @@ class SubTestPage extends TestPage {\n \n class SubTestPageWithCreate extends FluentPage {\n \n- public IncludedPage pageWithCreatePage;\n+ private IncludedPage pageWithCreatePage;\n \n public void initFluent(FluentControl control) {\n super.initFluent(control);\n pageWithCreatePage = newInstance(IncludedPage.class);\n }\n \n+ public IncludedPage getPageWithCreatePage() {\n+ return pageWithCreatePage;\n+ }\n }\n \n class IncludedPage extends FluentPage {", "raw_url": "https://github.com/FluentLenium/FluentLenium/raw/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fintegration%2FPageInPageTest.java", "sha": "dbd07d81434fc8a7833320d0ed206e5b9e53468c", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/FluentLenium/FluentLenium/blob/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fintegration%2FPageInPageWithAnnotationPageTest.java", "changes": 2, "contents_url": "https://api.github.com/repos/FluentLenium/FluentLenium/contents/fluentlenium-core%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fintegration%2FPageInPageWithAnnotationPageTest.java?ref=5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd", "deletions": 1, "filename": "fluentlenium-core/src/test/java/org/fluentlenium/integration/PageInPageWithAnnotationPageTest.java", "new_code": " public void pagesShouldBeInjected() {", "new_methods": [], "old_code": " public void pages_should_be_injected() {", "old_methods": [], "patch": "@@ -15,7 +15,7 @@ public class PageInPageWithAnnotationPageTest extends IntegrationFluentTest {\n private SubSubTestPage subTestPage;\n \n @Test\n- public void pages_should_be_injected() {\n+ public void pagesShouldBeInjected() {\n TestPage testPage = newInstance(SubSubTestPage.class);\n assertThat(testPage).isNotNull();\n assertThat(testPage).isInstanceOf(TestPage.class);", "raw_url": "https://github.com/FluentLenium/FluentLenium/raw/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fintegration%2FPageInPageWithAnnotationPageTest.java", "sha": "715428924177b4f0e20c35afe10ce90ff03f9f9b", "status": "modified" }, { "additions": 3, "blob_url": "https://github.com/FluentLenium/FluentLenium/blob/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fintegration%2FPageInPageWithCreatePageTest.java", "changes": 6, "contents_url": "https://api.github.com/repos/FluentLenium/FluentLenium/contents/fluentlenium-core%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fintegration%2FPageInPageWithCreatePageTest.java?ref=5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd", "deletions": 3, "filename": "fluentlenium-core/src/test/java/org/fluentlenium/integration/PageInPageWithCreatePageTest.java", "new_code": " public void pagesShouldBeInjected() {\n assertThat(subTestPage.getPageWithCreatePage()).isNotNull();\n assertThat(subTestPage.getPageWithCreatePage()).isInstanceOf(IncludedPage.class);", "new_methods": [], "old_code": " public void pages_should_be_injected() {\n assertThat(subTestPage.pageWithCreatePage).isNotNull();\n assertThat(subTestPage.pageWithCreatePage).isInstanceOf(IncludedPage.class);", "old_methods": [], "patch": "@@ -15,8 +15,8 @@ public class PageInPageWithCreatePageTest extends IntegrationFluentTest {\n private SubTestPageWithCreate subTestPage;\n \n @Test\n- public void pages_should_be_injected() {\n- assertThat(subTestPage.pageWithCreatePage).isNotNull();\n- assertThat(subTestPage.pageWithCreatePage).isInstanceOf(IncludedPage.class);\n+ public void pagesShouldBeInjected() {\n+ assertThat(subTestPage.getPageWithCreatePage()).isNotNull();\n+ assertThat(subTestPage.getPageWithCreatePage()).isInstanceOf(IncludedPage.class);\n }\n }", "raw_url": "https://github.com/FluentLenium/FluentLenium/raw/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fintegration%2FPageInPageWithCreatePageTest.java", "sha": "be9b06f14d712e5fbed0284670d0da71f5aa4cfa", "status": "modified" }, { "additions": 2, "blob_url": "https://github.com/FluentLenium/FluentLenium/blob/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fintegration%2FSearchOnlyWithFiltersTest.java", "changes": 4, "contents_url": "https://api.github.com/repos/FluentLenium/FluentLenium/contents/fluentlenium-core%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fintegration%2FSearchOnlyWithFiltersTest.java?ref=5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd", "deletions": 2, "filename": "fluentlenium-core/src/test/java/org/fluentlenium/integration/SearchOnlyWithFiltersTest.java", "new_code": " public void checkDollarWorks() {\n public void checkDollarAndIndexWorks() {", "new_methods": [], "old_code": " public void check$Works() {\n public void check$AndIndexWorks() {", "old_methods": [], "patch": "@@ -58,14 +58,14 @@ public void checkMultipleWithWorks() {\n }\n \n @Test\n- public void check$Works() {\n+ public void checkDollarWorks() {\n goTo(DEFAULT_URL);\n FluentList list = $(withName(\"name\"));\n assertThat(list.ids()).containsOnly(\"id\");\n }\n \n @Test\n- public void check$AndIndexWorks() {\n+ public void checkDollarAndIndexWorks() {\n goTo(DEFAULT_URL);\n FluentWebElement element = $(withClass(\"small\")).index(1);\n assertThat(element.id()).isEqualTo(\"id2\");", "raw_url": "https://github.com/FluentLenium/FluentLenium/raw/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fintegration%2FSearchOnlyWithFiltersTest.java", "sha": "365e5c6d6682d3e486d94be617c1ec58971cca07", "status": "modified" }, { "additions": 4, "blob_url": "https://github.com/FluentLenium/FluentLenium/blob/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fintegration%2FSeleniumFindBy.java", "changes": 8, "contents_url": "https://api.github.com/repos/FluentLenium/FluentLenium/contents/fluentlenium-core%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fintegration%2FSeleniumFindBy.java?ref=5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd", "deletions": 4, "filename": "fluentlenium-core/src/test/java/org/fluentlenium/integration/SeleniumFindBy.java", "new_code": " public void shouldFindByRetrieveElement() {\n public void shouldFindByRetrieveList() {\n public void shouldFindAllFindByRetrieveList() {\n public void shouldFindByRetrievedObjectWorkForSeleniumActions() {", "new_methods": [], "old_code": " public void should_findBy_retrieve_element() {\n public void should_findBy_retrieve_list() {\n public void should_findAll_findBy_retrieve_list() {\n public void should_findBy_retrieved_object_work_for_selenium_actions() {", "old_methods": [], "patch": "@@ -22,15 +22,15 @@ public class SeleniumFindBy extends IntegrationFluentTest {\n @Page\n PageIndex page;\n \n- public void should_findBy_retrieve_element() {\n+ public void shouldFindByRetrieveElement() {\n page.go();\n page.isAt();\n \n Assertions.assertThat(page.location.getText()).isEqualTo(\"Pharmacy\");\n }\n \n @Test\n- public void should_findBy_retrieve_list() {\n+ public void shouldFindByRetrieveList() {\n page.go();\n page.isAt();\n Assertions.assertThat(page.smalls).hasSize(3);\n@@ -44,7 +44,7 @@ public void should_findBy_retrieve_list() {\n }\n \n @Test\n- public void should_findAll_findBy_retrieve_list() {\n+ public void shouldFindAllFindByRetrieveList() {\n page.go();\n page.isAt();\n Assertions.assertThat(page.findAllElements).hasSize(4);\n@@ -58,7 +58,7 @@ public void should_findAll_findBy_retrieve_list() {\n }\n \n @Test\n- public void should_findBy_retrieved_object_work_for_selenium_actions() {\n+ public void shouldFindByRetrievedObjectWorkForSeleniumActions() {\n page.go();\n page.isAt();\n assertThat(page.getText()).isEqualTo(\"This text should change on MouseOver\");", "raw_url": "https://github.com/FluentLenium/FluentLenium/raw/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fintegration%2FSeleniumFindBy.java", "sha": "8bb5eceee6a9d7afb78475bf6330ebd57c1799cc", "status": "modified" }, { "additions": 5, "blob_url": "https://github.com/FluentLenium/FluentLenium/blob/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fintegration%2Finitialization%2FAnnotationInitialization.java", "changes": 10, "contents_url": "https://api.github.com/repos/FluentLenium/FluentLenium/contents/fluentlenium-core%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fintegration%2Finitialization%2FAnnotationInitialization.java?ref=5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd", "deletions": 5, "filename": "fluentlenium-core/src/test/java/org/fluentlenium/integration/initialization/AnnotationInitialization.java", "new_code": " private WebDriver webDriver = new HtmlUnitDriver();\n private TestAboutBlankPage page2;\n private TestPrivatePage page;\n public void testNoException() {\n public void testNoExceptionWhenInnerClass() {", "new_methods": [], "old_code": " public WebDriver webDriver = new HtmlUnitDriver();\n public TestAboutBlankPage page2;\n public TestPrivatePage page;\n public void test_no_exception() {\n public void test_no_exception_when_inner_class() {", "old_methods": [], "patch": "@@ -8,21 +8,21 @@\n import org.openqa.selenium.htmlunit.HtmlUnitDriver;\n \n public class AnnotationInitialization extends FluentTest {\n- public WebDriver webDriver = new HtmlUnitDriver();\n+ private WebDriver webDriver = new HtmlUnitDriver();\n \n @Page\n- public TestAboutBlankPage page2;\n+ private TestAboutBlankPage page2;\n \n @Page\n- public TestPrivatePage page;\n+ private TestPrivatePage page;\n \n @Test\n- public void test_no_exception() {\n+ public void testNoException() {\n page2.go();\n }\n \n @Test\n- public void test_no_exception_when_inner_class() {\n+ public void testNoExceptionWhenInnerClass() {\n page2.go();\n }\n ", "raw_url": "https://github.com/FluentLenium/FluentLenium/raw/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fintegration%2Finitialization%2FAnnotationInitialization.java", "sha": "42c96142a0be4fcf1b30e2d849d474d389eaa4b0", "status": "modified" }, { "additions": 10, "blob_url": "https://github.com/FluentLenium/FluentLenium/blob/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fintegration%2Finitialization%2FBeforeInitialization.java", "changes": 20, "contents_url": "https://api.github.com/repos/FluentLenium/FluentLenium/contents/fluentlenium-core%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fintegration%2Finitialization%2FBeforeInitialization.java?ref=5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd", "deletions": 10, "filename": "fluentlenium-core/src/test/java/org/fluentlenium/integration/initialization/BeforeInitialization.java", "new_code": " private WebDriver webDriver = new HtmlUnitDriver();\n private TestPrivatePageWithElement page2;\n private TestPrivatePage2 page;\n public void testNoException() {\n public void testInternalFluentWebElementInstantiate() {\n TestPrivatePageWithElement privatePage = newInstance(TestPrivatePageWithElement.class);\n assertThat(privatePage.myElement).isNotNull();\n public void testSuperclassFluentWebElementInstantiate() {\n TestPrivatePageWithElementSubclass privatePage = newInstance(TestPrivatePageWithElementSubclass.class);\n assertThat(privatePage.myElement).isNotNull();", "new_methods": [], "old_code": " public WebDriver webDriver = new HtmlUnitDriver();\n public TestPrivatePageWithElement page2;\n public TestPrivatePage2 page;\n public void test_no_exception() {\n public void test_internal_fluentwebelement_instantiate() {\n TestPrivatePageWithElement page = newInstance(TestPrivatePageWithElement.class);\n assertThat(page.myElement).isNotNull();\n public void test_superclass_fluentwebelement_instantiate() {\n TestPrivatePageWithElementSubclass page = newInstance(TestPrivatePageWithElementSubclass.class);\n assertThat(page.myElement).isNotNull();", "old_methods": [], "patch": "@@ -11,9 +11,9 @@\n import static org.assertj.core.api.Assertions.assertThat;\n \n public class BeforeInitialization extends FluentTest {\n- public WebDriver webDriver = new HtmlUnitDriver();\n- public TestPrivatePageWithElement page2;\n- public TestPrivatePage2 page;\n+ private WebDriver webDriver = new HtmlUnitDriver();\n+ private TestPrivatePageWithElement page2;\n+ private TestPrivatePage2 page;\n \n @Before\n public void beforeTest() {\n@@ -22,20 +22,20 @@ public void beforeTest() {\n }\n \n @Test\n- public void test_no_exception() {\n+ public void testNoException() {\n page.go();\n }\n \n @Test\n- public void test_internal_fluentwebelement_instantiate() {\n- TestPrivatePageWithElement page = newInstance(TestPrivatePageWithElement.class);\n- assertThat(page.myElement).isNotNull();\n+ public void testInternalFluentWebElementInstantiate() {\n+ TestPrivatePageWithElement privatePage = newInstance(TestPrivatePageWithElement.class);\n+ assertThat(privatePage.myElement).isNotNull();\n }\n \n @Test\n- public void test_superclass_fluentwebelement_instantiate() {\n- TestPrivatePageWithElementSubclass page = newInstance(TestPrivatePageWithElementSubclass.class);\n- assertThat(page.myElement).isNotNull();\n+ public void testSuperclassFluentWebElementInstantiate() {\n+ TestPrivatePageWithElementSubclass privatePage = newInstance(TestPrivatePageWithElementSubclass.class);\n+ assertThat(privatePage.myElement).isNotNull();\n }\n \n @Override", "raw_url": "https://github.com/FluentLenium/FluentLenium/raw/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fintegration%2Finitialization%2FBeforeInitialization.java", "sha": "db22fd189917ee46d09805d81cd8692761447644", "status": "modified" }, { "additions": 2, "blob_url": "https://github.com/FluentLenium/FluentLenium/blob/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fintegration%2Finitialization%2FConstructorInitialization.java", "changes": 4, "contents_url": "https://api.github.com/repos/FluentLenium/FluentLenium/contents/fluentlenium-core%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fintegration%2Finitialization%2FConstructorInitialization.java?ref=5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd", "deletions": 2, "filename": "fluentlenium-core/src/test/java/org/fluentlenium/integration/initialization/ConstructorInitialization.java", "new_code": " private WebDriver webDriver = new HtmlUnitDriver();\n public void doNotUseOverridableMethodsInAConstructor() {", "new_methods": [], "old_code": " public WebDriver webDriver = new HtmlUnitDriver();\n public void do_not_use_overridable_methods_in_a_constructor() {", "old_methods": [], "patch": "@@ -8,10 +8,10 @@\n import static org.assertj.core.api.Assertions.assertThat;\n \n public class ConstructorInitialization extends FluentTest {\n- public WebDriver webDriver = new HtmlUnitDriver();\n+ private WebDriver webDriver = new HtmlUnitDriver();\n \n @Test\n- public void do_not_use_overridable_methods_in_a_constructor() {\n+ public void doNotUseOverridableMethodsInAConstructor() {\n assertThat(webDriver).isEqualTo(this.getDriver());\n }\n ", "raw_url": "https://github.com/FluentLenium/FluentLenium/raw/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fintegration%2Finitialization%2FConstructorInitialization.java", "sha": "0a140f6253b83f0dc23ac5225231c7fdeb56565e", "status": "modified" }, { "additions": 2, "blob_url": "https://github.com/FluentLenium/FluentLenium/blob/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fintegration%2Futil%2Fadapter%2FFluentTest.java", "changes": 2, "contents_url": "https://api.github.com/repos/FluentLenium/FluentLenium/contents/fluentlenium-core%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fintegration%2Futil%2Fadapter%2FFluentTest.java?ref=5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd", "deletions": 0, "filename": "fluentlenium-core/src/test/java/org/fluentlenium/integration/util/adapter/FluentTest.java", "new_code": " //CHECKSTYLE.OFF: VisibilityModifier\n //CHECKSTYLE.ON: VisibilityModifier", "new_methods": [], "old_code": "", "old_methods": [], "patch": "@@ -36,6 +36,7 @@ public void failed(Throwable e, Description description) {\n }\n };\n \n+ //CHECKSTYLE.OFF: VisibilityModifier\n @ClassRule\n public static TestRule classWatchman = new TestRule() {\n \n@@ -54,5 +55,6 @@ public void evaluate() throws Throwable {\n };\n }\n };\n+ //CHECKSTYLE.ON: VisibilityModifier\n \n }", "raw_url": "https://github.com/FluentLenium/FluentLenium/raw/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fintegration%2Futil%2Fadapter%2FFluentTest.java", "sha": "dfad12d75b7791cb3b5e344dfdd3646cf23414ee", "status": "modified" }, { "additions": 2, "blob_url": "https://github.com/FluentLenium/FluentLenium/blob/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Futils%2FReflectionUtilsTest.java", "changes": 4, "contents_url": "https://api.github.com/repos/FluentLenium/FluentLenium/contents/fluentlenium-core%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Futils%2FReflectionUtilsTest.java?ref=5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd", "deletions": 2, "filename": "fluentlenium-core/src/test/java/org/fluentlenium/utils/ReflectionUtilsTest.java", "new_code": " Object[] objects = {\"test\", 1, 2L, true, Integer.valueOf(3)};\n .isEqualTo(new Class<?>[] {String.class, Integer.class, boolean.class, Object.class});", "new_methods": [], "old_code": " Object[] objects = { \"test\", 1, 2L, true, Integer.valueOf(3) };\n .isEqualTo(new Class<?>[] { String.class, Integer.class, boolean.class, Object.class });", "old_methods": [], "patch": "@@ -12,7 +12,7 @@\n public class ReflectionUtilsTest {\n @Test\n public void testToClass() {\n- Object[] objects = { \"test\", 1, 2L, true, Integer.valueOf(3) };\n+ Object[] objects = {\"test\", 1, 2L, true, Integer.valueOf(3)};\n \n Class<?>[] classes = ReflectionUtils.toClass(objects);\n \n@@ -58,7 +58,7 @@ public void call() throws Throwable {\n \n Constructor<SuperClass> superClassConstructor = ReflectionUtils.getConstructor(SuperClass.class, \"1\", 2, true, \"object\");\n assertThat(superClassConstructor.getParameterTypes())\n- .isEqualTo(new Class<?>[] { String.class, Integer.class, boolean.class, Object.class });\n+ .isEqualTo(new Class<?>[] {String.class, Integer.class, boolean.class, Object.class});\n \n SuperClass object = ReflectionUtils.newInstance(SuperClass.class, \"1\", 2, true, \"object\");\n assertThat(object.param1).isEqualTo(\"1\");", "raw_url": "https://github.com/FluentLenium/FluentLenium/raw/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Futils%2FReflectionUtilsTest.java", "sha": "f343c1d13031defa22b869ec9d35d8fcf142fe9b", "status": "modified" }, { "additions": 8, "blob_url": "https://github.com/FluentLenium/FluentLenium/blob/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Futils%2FResourceUtils.java", "changes": 9, "contents_url": "https://api.github.com/repos/FluentLenium/FluentLenium/contents/fluentlenium-core%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Futils%2FResourceUtils.java?ref=5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd", "deletions": 1, "filename": "fluentlenium-core/src/test/java/org/fluentlenium/utils/ResourceUtils.java", "new_code": "/**\n * Utility class to access classpath resource\n */\npublic final class ResourceUtils {\n private ResourceUtils() {\n // Utility class\n }\n", "new_methods": [ { "arguments": [], "filename": "fluentlenium-core/src/test/java/org/fluentlenium/utils/ResourceUtils.java", "implementation": "// Utility class", "signature": "private ResourceUtils()" } ], "old_code": "public class ResourceUtils {", "old_methods": [], "patch": "@@ -8,7 +8,14 @@\n import java.io.InputStream;\n import java.net.URL;\n \n-public class ResourceUtils {\n+/**\n+ * Utility class to access classpath resource\n+ */\n+public final class ResourceUtils {\n+ private ResourceUtils() {\n+ // Utility class\n+ }\n+\n public static File getResourceAsFile(final String resourcePath) throws IOException {\n InputStream resourceStream = ClassLoader.getSystemClassLoader().getResourceAsStream(resourcePath);\n if (resourceStream == null) {", "raw_url": "https://github.com/FluentLenium/FluentLenium/raw/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Futils%2FResourceUtils.java", "sha": "144b072a32b0550840ea17c6a2bb990067bfe79b", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/FluentLenium/FluentLenium/blob/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Ftest%2Fresources%2Forg%2Ffluentlenium%2Fconfiguration%2Fcapabilities-false.json", "changes": 2, "contents_url": "https://api.github.com/repos/FluentLenium/FluentLenium/contents/fluentlenium-core%2Fsrc%2Ftest%2Fresources%2Forg%2Ffluentlenium%2Fconfiguration%2Fcapabilities-false.json?ref=5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd", "deletions": 1, "filename": "fluentlenium-core/src/test/resources/org/fluentlenium/configuration/capabilities-false.json", "new_code": "}", "new_methods": [], "old_code": "}", "old_methods": [], "patch": "@@ -1,3 +1,3 @@\n {\n \"javascriptEnabled\": false\n-}\n\\ No newline at end of file\n+}", "raw_url": "https://github.com/FluentLenium/FluentLenium/raw/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Ftest%2Fresources%2Forg%2Ffluentlenium%2Fconfiguration%2Fcapabilities-false.json", "sha": "0c4ca73721a2be7ad6b08dd8ee5c483edaeb057a", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/FluentLenium/FluentLenium/blob/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Ftest%2Fresources%2Forg%2Ffluentlenium%2Fconfiguration%2Fcapabilities.json", "changes": 2, "contents_url": "https://api.github.com/repos/FluentLenium/FluentLenium/contents/fluentlenium-core%2Fsrc%2Ftest%2Fresources%2Forg%2Ffluentlenium%2Fconfiguration%2Fcapabilities.json?ref=5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd", "deletions": 1, "filename": "fluentlenium-core/src/test/resources/org/fluentlenium/configuration/capabilities.json", "new_code": "}", "new_methods": [], "old_code": "}", "old_methods": [], "patch": "@@ -1,3 +1,3 @@\n {\n \"javascriptEnabled\": true\n-}\n\\ No newline at end of file\n+}", "raw_url": "https://github.com/FluentLenium/FluentLenium/raw/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-core%2Fsrc%2Ftest%2Fresources%2Forg%2Ffluentlenium%2Fconfiguration%2Fcapabilities.json", "sha": "f8e14dc46982646e8091fc58566145b483ac33f0", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/FluentLenium/FluentLenium/blob/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-junit%2Fsrc%2Fit%2Fjunit%2Fjunit-default%2Fpom.xml", "changes": 2, "contents_url": "https://api.github.com/repos/FluentLenium/FluentLenium/contents/fluentlenium-junit%2Fsrc%2Fit%2Fjunit%2Fjunit-default%2Fpom.xml?ref=5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd", "deletions": 1, "filename": "fluentlenium-junit/src/it/junit/junit-default/pom.xml", "new_code": "</project>", "new_methods": [], "old_code": "</project>", "old_methods": [], "patch": "@@ -40,4 +40,4 @@\n <scope>test</scope>\n </dependency>\n </dependencies>\n-</project>\n\\ No newline at end of file\n+</project>", "raw_url": "https://github.com/FluentLenium/FluentLenium/raw/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-junit%2Fsrc%2Fit%2Fjunit%2Fjunit-default%2Fpom.xml", "sha": "a51a41b2af12cff940212baee4b3d4a1c92fc564", "status": "modified" }, { "additions": 2, "blob_url": "https://github.com/FluentLenium/FluentLenium/blob/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-junit%2Fsrc%2Fmain%2Fjava%2Forg%2Ffluentlenium%2Fadapter%2Fjunit%2FFluentTest.java", "changes": 2, "contents_url": "https://api.github.com/repos/FluentLenium/FluentLenium/contents/fluentlenium-junit%2Fsrc%2Fmain%2Fjava%2Forg%2Ffluentlenium%2Fadapter%2Fjunit%2FFluentTest.java?ref=5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd", "deletions": 0, "filename": "fluentlenium-junit/src/main/java/org/fluentlenium/adapter/junit/FluentTest.java", "new_code": " //CHECKSTYLE.OFF: VisibilityModifier\n //CHECKSTYLE.ON: VisibilityModifier", "new_methods": [], "old_code": "", "old_methods": [], "patch": "@@ -38,6 +38,7 @@ public void failed(Throwable e, Description description) {\n }\n };\n \n+ //CHECKSTYLE.OFF: VisibilityModifier\n @ClassRule\n public static TestRule classWatchman = new TestRule() {\n \n@@ -56,5 +57,6 @@ public void evaluate() throws Throwable {\n };\n }\n };\n+ //CHECKSTYLE.ON: VisibilityModifier\n \n }", "raw_url": "https://github.com/FluentLenium/FluentLenium/raw/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-junit%2Fsrc%2Fmain%2Fjava%2Forg%2Ffluentlenium%2Fadapter%2Fjunit%2FFluentTest.java", "sha": "3e972287d914fed8bebbe6c540b22c22d9b7f6d6", "status": "modified" }, { "additions": 4, "blob_url": "https://github.com/FluentLenium/FluentLenium/blob/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-junit%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fadapter%2Fjunit%2FFluentTestRuleTest.java", "changes": 6, "contents_url": "https://api.github.com/repos/FluentLenium/FluentLenium/contents/fluentlenium-junit%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fadapter%2Fjunit%2FFluentTestRuleTest.java?ref=5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd", "deletions": 2, "filename": "fluentlenium-junit/src/test/java/org/fluentlenium/adapter/junit/FluentTestRuleTest.java", "new_code": " //CHECKSTYLE.OFF: IllegalThrows\n public void whenNoErrorEverythingIsCalled() throws Throwable {\n public void whenInitFailsTestIsNotCalled() throws Throwable {\n //CHECKSTYLE.ON: IllegalThrows", "new_methods": [], "old_code": " public void when_no_error_everything_is_called() throws Throwable {\n public void when_init_fails_test_is_not_called() throws Throwable {", "old_methods": [], "patch": "@@ -39,8 +39,9 @@ private static class TestException extends Exception {\n \n }\n \n+ //CHECKSTYLE.OFF: IllegalThrows\n @Test\n- public void when_no_error_everything_is_called() throws Throwable {\n+ public void whenNoErrorEverythingIsCalled() throws Throwable {\n final FluentTestRule testRule = spy(new FluentTestRule());\n \n testRule.apply(base, description).evaluate();\n@@ -53,7 +54,7 @@ public void when_no_error_everything_is_called() throws Throwable {\n }\n \n @Test\n- public void when_init_fails_test_is_not_called() throws Throwable {\n+ public void whenInitFailsTestIsNotCalled() throws Throwable {\n final FluentTestRule testRule = spy(new FluentTestRule());\n \n doThrow(TestException.class).when(testRule).starting(description);\n@@ -70,4 +71,5 @@ public void call() throws Throwable {\n verify(testRule).failed(any(TestException.class), eq(description));\n verify(testRule).finished(description);\n }\n+ //CHECKSTYLE.ON: IllegalThrows\n }", "raw_url": "https://github.com/FluentLenium/FluentLenium/raw/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-junit%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fadapter%2Fjunit%2FFluentTestRuleTest.java", "sha": "f31b7896cac68ffcee492205b2655da537af8049", "status": "modified" }, { "additions": 7, "blob_url": "https://github.com/FluentLenium/FluentLenium/blob/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-junit%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fadapter%2Fjunit%2Fintegration%2FFluentTestTest.java", "changes": 17, "contents_url": "https://api.github.com/repos/FluentLenium/FluentLenium/contents/fluentlenium-junit%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fadapter%2Fjunit%2Fintegration%2FFluentTestTest.java?ref=5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd", "deletions": 10, "filename": "fluentlenium-junit/src/test/java/org/fluentlenium/adapter/junit/integration/FluentTestTest.java", "new_code": " private static byte[] screenshotData = {1, 4, 7, 9, 2, 4, 2, 4, 3};\n assertThat(tmpPath.list()).contains(\"AutomaticScreenShotTest_failingTest(org.fluentlenium.adapter.junit.integration\"\n + \".FluentTestTest$AutomaticScreenShotTest).html\");\n assertThat(tmpPath.list()).contains(\"AutomaticScreenShotTest_failingTest(org.fluentlenium.adapter.junit.integration\"\n + \".FluentTestTest$AutomaticScreenShotTest).png\");\n File htmlDumpFile = new File(tmpPath, \"AutomaticScreenShotTest_failingTest(org.fluentlenium.adapter.junit.integration\"\n + \".FluentTestTest$AutomaticScreenShotTest).html\");", "new_methods": [], "old_code": " private static byte[] screenshotData = { 1, 4, 7, 9, 2, 4, 2, 4, 3 };\n assertThat(tmpPath.list()).contains(\n \"AutomaticScreenShotTest_failingTest(org.fluentlenium.adapter.junit.integration\"\n + \".FluentTestTest$AutomaticScreenShotTest).html\");\n assertThat(tmpPath.list()).contains(\n \"AutomaticScreenShotTest_failingTest(org.fluentlenium.adapter.junit.integration\"\n + \".FluentTestTest$AutomaticScreenShotTest).png\");\n File htmlDumpFile = new File(tmpPath,\n \"AutomaticScreenShotTest_failingTest(org.fluentlenium.adapter.junit.integration\"\n + \".FluentTestTest$AutomaticScreenShotTest).html\");", "old_methods": [], "patch": "@@ -40,7 +40,7 @@ private interface ScreenshotWebDriver extends WebDriver, TakesScreenshot {\n private static List<ScreenshotWebDriver> screenshotWebDrivers = new ArrayList<>();\n private static File screenshotFile;\n private static String html = \"<html>FluentLenium</html>\";\n- private static byte[] screenshotData = { 1, 4, 7, 9, 2, 4, 2, 4, 3 };\n+ private static byte[] screenshotData = {1, 4, 7, 9, 2, 4, 2, 4, 3};\n \n private static File tmpPath = Files.newTemporaryFolder();\n \n@@ -272,19 +272,16 @@ public void testAutomaticScreenShotTest() throws IOException {\n Mockito.verify(driver).getScreenshotAs(OutputType.FILE);\n Mockito.verify(driver).findElements(By.cssSelector(\"html\"));\n \n- assertThat(tmpPath.list()).contains(\n- \"AutomaticScreenShotTest_failingTest(org.fluentlenium.adapter.junit.integration\"\n- + \".FluentTestTest$AutomaticScreenShotTest).html\");\n- assertThat(tmpPath.list()).contains(\n- \"AutomaticScreenShotTest_failingTest(org.fluentlenium.adapter.junit.integration\"\n- + \".FluentTestTest$AutomaticScreenShotTest).png\");\n+ assertThat(tmpPath.list()).contains(\"AutomaticScreenShotTest_failingTest(org.fluentlenium.adapter.junit.integration\"\n+ + \".FluentTestTest$AutomaticScreenShotTest).html\");\n+ assertThat(tmpPath.list()).contains(\"AutomaticScreenShotTest_failingTest(org.fluentlenium.adapter.junit.integration\"\n+ + \".FluentTestTest$AutomaticScreenShotTest).png\");\n \n File screenshotGeneratedFile = new File(tmpPath,\n \"AutomaticScreenShotTest_failingTest(org.fluentlenium.adapter.junit.integration\"\n + \".FluentTestTest$AutomaticScreenShotTest).png\");\n- File htmlDumpFile = new File(tmpPath,\n- \"AutomaticScreenShotTest_failingTest(org.fluentlenium.adapter.junit.integration\"\n- + \".FluentTestTest$AutomaticScreenShotTest).html\");\n+ File htmlDumpFile = new File(tmpPath, \"AutomaticScreenShotTest_failingTest(org.fluentlenium.adapter.junit.integration\"\n+ + \".FluentTestTest$AutomaticScreenShotTest).html\");\n \n try {\n assertThat(FileUtils.readFileToByteArray(screenshotGeneratedFile)).isEqualTo(screenshotData);", "raw_url": "https://github.com/FluentLenium/FluentLenium/raw/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-junit%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fadapter%2Fjunit%2Fintegration%2FFluentTestTest.java", "sha": "b3b6689aa89aa7180c8e9740ff55e99dd390c94c", "status": "modified" }, { "additions": 2, "blob_url": "https://github.com/FluentLenium/FluentLenium/blob/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-testng%2Fsrc%2Fmain%2Fjava%2Forg%2Ffluentlenium%2Fadapter%2Ftestng%2FFluentTestNg.java", "changes": 4, "contents_url": "https://api.github.com/repos/FluentLenium/FluentLenium/contents/fluentlenium-testng%2Fsrc%2Fmain%2Fjava%2Forg%2Ffluentlenium%2Fadapter%2Ftestng%2FFluentTestNg.java?ref=5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd", "deletions": 2, "filename": "fluentlenium-testng/src/main/java/org/fluentlenium/adapter/testng/FluentTestNg.java", "new_code": " public synchronized Map<Method, ITestNGMethod> getMethods(ITestContext context) {\n public synchronized void afterTest(ITestContext context) {", "new_methods": [], "old_code": " synchronized public Map<Method, ITestNGMethod> getMethods(ITestContext context) {\n synchronized public void afterTest(ITestContext context) {", "old_methods": [], "patch": "@@ -27,7 +27,7 @@ public FluentTestNg() {\n \n private Map<ITestContext, Map<Method, ITestNGMethod>> methods = new HashMap<>();\n \n- synchronized public Map<Method, ITestNGMethod> getMethods(ITestContext context) {\n+ public synchronized Map<Method, ITestNGMethod> getMethods(ITestContext context) {\n Map<Method, ITestNGMethod> testMethods = methods.get(context);\n \n if (testMethods == null) {\n@@ -43,7 +43,7 @@ synchronized public Map<Method, ITestNGMethod> getMethods(ITestContext context)\n }\n \n @AfterTest(alwaysRun = true)\n- synchronized public void afterTest(ITestContext context) {\n+ public synchronized void afterTest(ITestContext context) {\n methods.remove(context);\n }\n ", "raw_url": "https://github.com/FluentLenium/FluentLenium/raw/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-testng%2Fsrc%2Fmain%2Fjava%2Forg%2Ffluentlenium%2Fadapter%2Ftestng%2FFluentTestNg.java", "sha": "eb7b0be3b213e3363a6519290db4e6a973341d2f", "status": "modified" }, { "additions": 2, "blob_url": "https://github.com/FluentLenium/FluentLenium/blob/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-testng%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fadapter%2Ftestng%2Fintegration%2FDontRunTestsWhenInitFailTest.java", "changes": 4, "contents_url": "https://api.github.com/repos/FluentLenium/FluentLenium/contents/fluentlenium-testng%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fadapter%2Ftestng%2Fintegration%2FDontRunTestsWhenInitFailTest.java?ref=5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd", "deletions": 2, "filename": "fluentlenium-testng/src/test/java/org/fluentlenium/adapter/testng/integration/DontRunTestsWhenInitFailTest.java", "new_code": " TestClass() {\n testNG.setTestClasses(new Class[] {TestClass.class});", "new_methods": [], "old_code": " public TestClass() {\n testNG.setTestClasses(new Class[] { TestClass.class });", "old_methods": [ { "arguments": [], "filename": "fluentlenium-testng/src/test/java/org/fluentlenium/adapter/testng/integration/DontRunTestsWhenInitFailTest.java", "implementation": "testNG.setTestClasses(new Class[] { TestClass.class", "signature": "public TestClass()" } ], "patch": "@@ -14,7 +14,7 @@ public class DontRunTestsWhenInitFailTest {\n \n private static class TestClass extends FluentTestNg {\n \n- public TestClass() {\n+ TestClass() {\n getConfiguration().setScreenshotMode(TriggerMode.AUTOMATIC_ON_FAIL);\n getConfiguration().setHtmlDumpMode(TriggerMode.AUTOMATIC_ON_FAIL);\n }\n@@ -36,7 +36,7 @@ public void testDriverFailShouldNotCallTestMethod() {\n public void testRun() {\n \n TestNG testNG = new TestNG(false);\n- testNG.setTestClasses(new Class[] { TestClass.class });\n+ testNG.setTestClasses(new Class[] {TestClass.class});\n \n TestListenerAdapter listenerAdapter = Mockito.mock(TestListenerAdapter.class);\n testNG.addListener(listenerAdapter);", "raw_url": "https://github.com/FluentLenium/FluentLenium/raw/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-testng%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fadapter%2Ftestng%2Fintegration%2FDontRunTestsWhenInitFailTest.java", "sha": "f80f52828f71da3d00752e9dc83b97fe19fb9f2e", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/FluentLenium/FluentLenium/blob/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-testng%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fadapter%2Ftestng%2Fintegration%2FFluentCloseTest.java", "changes": 2, "contents_url": "https://api.github.com/repos/FluentLenium/FluentLenium/contents/fluentlenium-testng%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fadapter%2Ftestng%2Fintegration%2FFluentCloseTest.java?ref=5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd", "deletions": 1, "filename": "fluentlenium-testng/src/test/java/org/fluentlenium/adapter/testng/integration/FluentCloseTest.java", "new_code": " public void whenDefaultSharedDriverThenDriverIsClosedAfterMethodCall() {", "new_methods": [], "old_code": " public void when_default_shared_driver_then_driver_is_closed_after_method_call() {", "old_methods": [], "patch": "@@ -9,7 +9,7 @@\n public class FluentCloseTest extends IntegrationFluentTestNg {\n \n @Test\n- public void when_default_shared_driver_then_driver_is_closed_after_method_call() {\n+ public void whenDefaultSharedDriverThenDriverIsClosedAfterMethodCall() {\n goTo(\"about:blank\");\n }\n ", "raw_url": "https://github.com/FluentLenium/FluentLenium/raw/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/fluentlenium-testng%2Fsrc%2Ftest%2Fjava%2Forg%2Ffluentlenium%2Fadapter%2Ftestng%2Fintegration%2FFluentCloseTest.java", "sha": "b9f84cc90925eb014f97152a69c974426d80522b", "status": "modified" } ]
107
[ { "name": "fluentlenium$fluentlenium", "new_args": "", "new_implementation": "assertThat(fluentWebElement).isInstanceOf(FluentWebElement.class);\n Filter[] filters = new Filter[] {filter1, filter2", "new_return_type": "void", "new_signature": "void canLoopIntoFluentWebElementAfterASearch()", "old_args": "", "old_implementation": "Filter[] filters = new Filter[] { filter1, filter2", "old_return_type": "void", "old_signature": "void can_loop_into_fluentWebElement_after_a_search()" } ]
1
96
6b0eb897ce8abe5cda472a8e6af89cd62a47dd66
[ { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cANY_WSParserRuleCall_1_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getANY_WSParserRuleCall_1_0()", "old_args": "", "old_implementation": "return cANY_WSParserRuleCall_1;", "old_return_type": "RuleCall", "old_signature": "RuleCall getANY_WSParserRuleCall_1()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cANY_WSParserRuleCall_2;", "new_return_type": "RuleCall", "new_signature": "RuleCall getANY_WSParserRuleCall_2()", "old_args": "", "old_implementation": "return cANY_WSParserRuleCall_1;", "old_return_type": "RuleCall", "old_signature": "RuleCall getANY_WSParserRuleCall_1()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cANY_WSParserRuleCall_2;", "new_return_type": "RuleCall", "new_signature": "RuleCall getANY_WSParserRuleCall_2()", "old_args": "", "old_implementation": "return cANY_WSParserRuleCall_1;", "old_return_type": "RuleCall", "old_signature": "RuleCall getANY_WSParserRuleCall_1()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cANY_WSParserRuleCall_3;", "new_return_type": "RuleCall", "new_signature": "RuleCall getANY_WSParserRuleCall_3()", "old_args": "", "old_implementation": "return cANY_WSParserRuleCall_1;", "old_return_type": "RuleCall", "old_signature": "RuleCall getANY_WSParserRuleCall_1()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cANY_WSParserRuleCall_3;", "new_return_type": "RuleCall", "new_signature": "RuleCall getANY_WSParserRuleCall_3()", "old_args": "", "old_implementation": "return cANY_WSParserRuleCall_1;", "old_return_type": "RuleCall", "old_signature": "RuleCall getANY_WSParserRuleCall_1()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cStyleTextParserRuleCall_9_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getStyleTextParserRuleCall_9_0()", "old_args": "", "old_implementation": "return cANY_WSParserRuleCall_10;", "old_return_type": "RuleCall", "old_signature": "RuleCall getANY_WSParserRuleCall_10()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cANY_WSParserRuleCall_11;", "new_return_type": "RuleCall", "new_signature": "RuleCall getANY_WSParserRuleCall_11()", "old_args": "", "old_implementation": "return cANY_WSParserRuleCall_2_1;", "old_return_type": "RuleCall", "old_signature": "RuleCall getANY_WSParserRuleCall_2_1()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cANY_WSParserRuleCall_1_2;", "new_return_type": "RuleCall", "new_signature": "RuleCall getANY_WSParserRuleCall_1_2()", "old_args": "", "old_implementation": "return cANY_WSParserRuleCall_2_1;", "old_return_type": "RuleCall", "old_signature": "RuleCall getANY_WSParserRuleCall_2_1()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cANY_WSParserRuleCall_0_0_3;", "new_return_type": "RuleCall", "new_signature": "RuleCall getANY_WSParserRuleCall_0_0_3()", "old_args": "", "old_implementation": "return cANY_WSParserRuleCall_2_3;", "old_return_type": "RuleCall", "old_signature": "RuleCall getANY_WSParserRuleCall_2_3()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cANY_WSParserRuleCall_1_4;", "new_return_type": "RuleCall", "new_signature": "RuleCall getANY_WSParserRuleCall_1_4()", "old_args": "", "old_implementation": "return cANY_WSParserRuleCall_2_3;", "old_return_type": "RuleCall", "old_signature": "RuleCall getANY_WSParserRuleCall_2_3()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cANY_WSParserRuleCall_1_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getANY_WSParserRuleCall_1_0()", "old_args": "", "old_implementation": "return cANY_WSParserRuleCall_3_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getANY_WSParserRuleCall_3_0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cANY_WSParserRuleCall_1_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getANY_WSParserRuleCall_1_0()", "old_args": "", "old_implementation": "return cANY_WSParserRuleCall_3_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getANY_WSParserRuleCall_3_0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cANY_WSParserRuleCall_7;", "new_return_type": "RuleCall", "new_signature": "RuleCall getANY_WSParserRuleCall_7()", "old_args": "", "old_implementation": "return cANY_WSParserRuleCall_6;", "old_return_type": "RuleCall", "old_signature": "RuleCall getANY_WSParserRuleCall_6()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cAlternatives_2;", "new_return_type": "Alternatives", "new_signature": "Alternatives getAlternatives_2()", "old_args": "", "old_implementation": "return cAlternatives_4;", "old_return_type": "Alternatives", "old_signature": "Alternatives getAlternatives_4()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cCaptionAssignment_13;", "new_return_type": "Assignment", "new_signature": "Assignment getCaptionAssignment_13()", "old_args": "", "old_implementation": "return cCaptionAssignment_16;", "old_return_type": "Assignment", "old_signature": "Assignment getCaptionAssignment_16()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cChapterKeyword_0_1;", "new_return_type": "Keyword", "new_signature": "Keyword getChapterKeyword_0_1()", "old_args": "", "old_implementation": "return cChapterKeyword_0;", "old_return_type": "Keyword", "old_signature": "Keyword getChapterKeyword_0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cClazzAssignment_5;", "new_return_type": "Assignment", "new_signature": "Assignment getClazzAssignment_5()", "old_args": "", "old_implementation": "return cClazzAssignment_8;", "old_return_type": "Assignment", "old_signature": "Assignment getClazzAssignment_8()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cClazzTextParserRuleCall_5_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getClazzTextParserRuleCall_5_0()", "old_args": "", "old_implementation": "return cClazzTextParserRuleCall_8_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getClazzTextParserRuleCall_8_0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cChapterKeyword_0_0_0;", "new_return_type": "Keyword", "new_signature": "Keyword getChapterKeyword_0_0_0()", "old_args": "", "old_implementation": "return cColonKeyword_1_0;", "old_return_type": "Keyword", "old_signature": "Keyword getColonKeyword_1_0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cSection3Keyword_0_0_0;", "new_return_type": "Keyword", "new_signature": "Keyword getSection3Keyword_0_0_0()", "old_args": "", "old_implementation": "return cColonKeyword_1_0;", "old_return_type": "Keyword", "old_signature": "Keyword getColonKeyword_1_0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cSection4Keyword_0_0_0;", "new_return_type": "Keyword", "new_signature": "Keyword getSection4Keyword_0_0_0()", "old_args": "", "old_implementation": "return cColonKeyword_1_0;", "old_return_type": "Keyword", "old_signature": "Keyword getColonKeyword_1_0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cSectionKeyword_0_0_0;", "new_return_type": "Keyword", "new_signature": "Keyword getSectionKeyword_0_0_0()", "old_args": "", "old_implementation": "return cColonKeyword_1_0;", "old_return_type": "Keyword", "old_signature": "Keyword getColonKeyword_1_0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cSubsectionKeyword_0_0_0;", "new_return_type": "Keyword", "new_signature": "Keyword getSubsectionKeyword_0_0_0()", "old_args": "", "old_implementation": "return cColonKeyword_1_0;", "old_return_type": "Keyword", "old_signature": "Keyword getColonKeyword_1_0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cImgKeyword_0_0_0;", "new_return_type": "Keyword", "new_signature": "Keyword getImgKeyword_0_0_0()", "old_args": "", "old_implementation": "return cColonKeyword_2_0;", "old_return_type": "Keyword", "old_signature": "Keyword getColonKeyword_2_0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cContentsAssignment_2;", "new_return_type": "Assignment", "new_signature": "Assignment getContentsAssignment_2()", "old_args": "", "old_implementation": "return cContentsAssignment_3;", "old_return_type": "Assignment", "old_signature": "Assignment getContentsAssignment_3()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cContentsAssignment_2;", "new_return_type": "Assignment", "new_signature": "Assignment getContentsAssignment_2()", "old_args": "", "old_implementation": "return cContentsAssignment_4;", "old_return_type": "Assignment", "old_signature": "Assignment getContentsAssignment_4()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cContentsAssignment_2_0_0;", "new_return_type": "Assignment", "new_signature": "Assignment getContentsAssignment_2_0_0()", "old_args": "", "old_implementation": "return cContentsAssignment_4_0_0;", "old_return_type": "Assignment", "old_signature": "Assignment getContentsAssignment_4_0_0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cContentsAssignment_2_0_1_0;", "new_return_type": "Assignment", "new_signature": "Assignment getContentsAssignment_2_0_1_0()", "old_args": "", "old_implementation": "return cContentsAssignment_4_0_1_0;", "old_return_type": "Assignment", "old_signature": "Assignment getContentsAssignment_4_0_1_0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cContentsAssignment_2_0_1_1;", "new_return_type": "Assignment", "new_signature": "Assignment getContentsAssignment_2_0_1_1()", "old_args": "", "old_implementation": "return cContentsAssignment_4_0_1_1;", "old_return_type": "Assignment", "old_signature": "Assignment getContentsAssignment_4_0_1_1()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cContentsAssignment_2_1_0;", "new_return_type": "Assignment", "new_signature": "Assignment getContentsAssignment_2_1_0()", "old_args": "", "old_implementation": "return cContentsAssignment_4_1_0;", "old_return_type": "Assignment", "old_signature": "Assignment getContentsAssignment_4_1_0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cContentsAssignment_2_1_1;", "new_return_type": "Assignment", "new_signature": "Assignment getContentsAssignment_2_1_1()", "old_args": "", "old_implementation": "return cContentsAssignment_4_1_1;", "old_return_type": "Assignment", "old_signature": "Assignment getContentsAssignment_4_1_1()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cContentsAssignment_4;", "new_return_type": "Assignment", "new_signature": "Assignment getContentsAssignment_4()", "old_args": "", "old_implementation": "return cContentsAssignment_5;", "old_return_type": "Assignment", "old_signature": "Assignment getContentsAssignment_5()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cContentsAssignment_3_1;", "new_return_type": "Assignment", "new_signature": "Assignment getContentsAssignment_3_1()", "old_args": "", "old_implementation": "return cContentsAssignment_5_1;", "old_return_type": "Assignment", "old_signature": "Assignment getContentsAssignment_5_1()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cContentsAssignment_3_1;", "new_return_type": "Assignment", "new_signature": "Assignment getContentsAssignment_3_1()", "old_args": "", "old_implementation": "return cContentsAssignment_5_1;", "old_return_type": "Assignment", "old_signature": "Assignment getContentsAssignment_5_1()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cContentsAssignment_3_1;", "new_return_type": "Assignment", "new_signature": "Assignment getContentsAssignment_3_1()", "old_args": "", "old_implementation": "return cContentsAssignment_5_1;", "old_return_type": "Assignment", "old_signature": "Assignment getContentsAssignment_5_1()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cContentsAssignment_3_1;", "new_return_type": "Assignment", "new_signature": "Assignment getContentsAssignment_3_1()", "old_args": "", "old_implementation": "return cContentsAssignment_5_1;", "old_return_type": "Assignment", "old_signature": "Assignment getContentsAssignment_5_1()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cContentsAssignment_3_1;", "new_return_type": "Assignment", "new_signature": "Assignment getContentsAssignment_3_1()", "old_args": "", "old_implementation": "return cContentsAssignment_5_1;", "old_return_type": "Assignment", "old_signature": "Assignment getContentsAssignment_5_1()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cContentsAssignment_3_1;", "new_return_type": "Assignment", "new_signature": "Assignment getContentsAssignment_3_1()", "old_args": "", "old_implementation": "return cContentsAssignment_5_1;", "old_return_type": "Assignment", "old_signature": "Assignment getContentsAssignment_5_1()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cContentsAssignment_4_1;", "new_return_type": "Assignment", "new_signature": "Assignment getContentsAssignment_4_1()", "old_args": "", "old_implementation": "return cContentsAssignment_6_1;", "old_return_type": "Assignment", "old_signature": "Assignment getContentsAssignment_6_1()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cContentsAssignment_4_1;", "new_return_type": "Assignment", "new_signature": "Assignment getContentsAssignment_4_1()", "old_args": "", "old_implementation": "return cContentsAssignment_6_1;", "old_return_type": "Assignment", "old_signature": "Assignment getContentsAssignment_6_1()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cContentsAssignment_4_1;", "new_return_type": "Assignment", "new_signature": "Assignment getContentsAssignment_4_1()", "old_args": "", "old_implementation": "return cContentsAssignment_6_1;", "old_return_type": "Assignment", "old_signature": "Assignment getContentsAssignment_6_1()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cContentsAssignment_4_1;", "new_return_type": "Assignment", "new_signature": "Assignment getContentsAssignment_4_1()", "old_args": "", "old_implementation": "return cContentsAssignment_6_1;", "old_return_type": "Assignment", "old_signature": "Assignment getContentsAssignment_6_1()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cContentsCodeParserRuleCall_2_0_0_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getContentsCodeParserRuleCall_2_0_0_0()", "old_args": "", "old_implementation": "return cContentsCodeParserRuleCall_4_0_0_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getContentsCodeParserRuleCall_4_0_0_0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cContentsCodeParserRuleCall_2_0_1_1_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getContentsCodeParserRuleCall_2_0_1_1_0()", "old_args": "", "old_implementation": "return cContentsCodeParserRuleCall_4_0_1_1_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getContentsCodeParserRuleCall_4_0_1_1_0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cContentsCodeParserRuleCall_2_1_1_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getContentsCodeParserRuleCall_2_1_1_0()", "old_args": "", "old_implementation": "return cContentsCodeParserRuleCall_4_1_1_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getContentsCodeParserRuleCall_4_1_1_0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cContentsMarkupInCodeParserRuleCall_2_0_1_0_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getContentsMarkupInCodeParserRuleCall_2_0_1_0_0()", "old_args": "", "old_implementation": "return cContentsMarkupInCodeParserRuleCall_4_0_1_0_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getContentsMarkupInCodeParserRuleCall_4_0_1_0_0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cContentsMarkupInCodeParserRuleCall_2_1_0_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getContentsMarkupInCodeParserRuleCall_2_1_0_0()", "old_args": "", "old_implementation": "return cContentsMarkupInCodeParserRuleCall_4_1_0_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getContentsMarkupInCodeParserRuleCall_4_1_0_0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cContentsSection3ParserRuleCall_4_1_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getContentsSection3ParserRuleCall_4_1_0()", "old_args": "", "old_implementation": "return cContentsSection3ParserRuleCall_6_1_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getContentsSection3ParserRuleCall_6_1_0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cContentsSection4ParserRuleCall_4_1_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getContentsSection4ParserRuleCall_4_1_0()", "old_args": "", "old_implementation": "return cContentsSection4ParserRuleCall_6_1_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getContentsSection4ParserRuleCall_6_1_0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cContentsSectionParserRuleCall_4_1_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getContentsSectionParserRuleCall_4_1_0()", "old_args": "", "old_implementation": "return cContentsSectionParserRuleCall_6_1_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getContentsSectionParserRuleCall_6_1_0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cContentsSubSectionParserRuleCall_4_1_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getContentsSubSectionParserRuleCall_4_1_0()", "old_args": "", "old_implementation": "return cContentsSubSectionParserRuleCall_6_1_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getContentsSubSectionParserRuleCall_6_1_0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cContentsTextOrMarkupParserRuleCall_2_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getContentsTextOrMarkupParserRuleCall_2_0()", "old_args": "", "old_implementation": "return cContentsTextOrMarkupParserRuleCall_3_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getContentsTextOrMarkupParserRuleCall_3_0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cContentsTextOrMarkupParserRuleCall_2_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getContentsTextOrMarkupParserRuleCall_2_0()", "old_args": "", "old_implementation": "return cContentsTextOrMarkupParserRuleCall_4_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getContentsTextOrMarkupParserRuleCall_4_0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cContentsTextOrMarkupParserRuleCall_4_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getContentsTextOrMarkupParserRuleCall_4_0()", "old_args": "", "old_implementation": "return cContentsTextOrMarkupParserRuleCall_5_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getContentsTextOrMarkupParserRuleCall_5_0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cContentsTextOrMarkupParserRuleCall_3_1_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getContentsTextOrMarkupParserRuleCall_3_1_0()", "old_args": "", "old_implementation": "return cContentsTextOrMarkupParserRuleCall_5_1_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getContentsTextOrMarkupParserRuleCall_5_1_0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cContentsTextOrMarkupParserRuleCall_3_1_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getContentsTextOrMarkupParserRuleCall_3_1_0()", "old_args": "", "old_implementation": "return cContentsTextOrMarkupParserRuleCall_5_1_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getContentsTextOrMarkupParserRuleCall_5_1_0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cContentsTextOrMarkupParserRuleCall_3_1_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getContentsTextOrMarkupParserRuleCall_3_1_0()", "old_args": "", "old_implementation": "return cContentsTextOrMarkupParserRuleCall_5_1_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getContentsTextOrMarkupParserRuleCall_5_1_0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cContentsTextOrMarkupParserRuleCall_3_1_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getContentsTextOrMarkupParserRuleCall_3_1_0()", "old_args": "", "old_implementation": "return cContentsTextOrMarkupParserRuleCall_5_1_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getContentsTextOrMarkupParserRuleCall_5_1_0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cContentsTextOrMarkupParserRuleCall_3_1_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getContentsTextOrMarkupParserRuleCall_3_1_0()", "old_args": "", "old_implementation": "return cContentsTextOrMarkupParserRuleCall_5_1_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getContentsTextOrMarkupParserRuleCall_5_1_0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cContentsTextOrMarkupParserRuleCall_3_1_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getContentsTextOrMarkupParserRuleCall_3_1_0()", "old_args": "", "old_implementation": "return cContentsTextOrMarkupParserRuleCall_5_1_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getContentsTextOrMarkupParserRuleCall_5_1_0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cElementAssignment_1;", "new_return_type": "Assignment", "new_signature": "Assignment getElementAssignment_1()", "old_args": "", "old_implementation": "return cElementAssignment_3;", "old_return_type": "Assignment", "old_signature": "Assignment getElementAssignment_3()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cElementJvmIdentifyableElementCrossReference_1_0;", "new_return_type": "CrossReference", "new_signature": "CrossReference getElementJvmIdentifyableElementCrossReference_1_0()", "old_args": "", "old_implementation": "return cElementJvmIdentifyableElementCrossReference_3_0;", "old_return_type": "CrossReference", "old_signature": "CrossReference getElementJvmIdentifyableElementCrossReference_3_0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cElementJvmIdentifyableElementTextParserRuleCall_1_0_1;", "new_return_type": "RuleCall", "new_signature": "RuleCall getElementJvmIdentifyableElementTextParserRuleCall_1_0_1()", "old_args": "", "old_implementation": "return cElementJvmIdentifyableElementTextParserRuleCall_3_0_1;", "old_return_type": "RuleCall", "old_signature": "RuleCall getElementJvmIdentifyableElementTextParserRuleCall_3_0_1()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cGroup_3;", "new_return_type": "Group", "new_signature": "Group getGroup_3()", "old_args": "", "old_implementation": "return cGroup_1;", "old_return_type": "Group", "old_signature": "Group getGroup_1()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cGroup_3;", "new_return_type": "Group", "new_signature": "Group getGroup_3()", "old_args": "", "old_implementation": "return cGroup_1;", "old_return_type": "Group", "old_signature": "Group getGroup_1()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cGroup_3;", "new_return_type": "Group", "new_signature": "Group getGroup_3()", "old_args": "", "old_implementation": "return cGroup_1;", "old_return_type": "Group", "old_signature": "Group getGroup_1()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cGroup_3;", "new_return_type": "Group", "new_signature": "Group getGroup_3()", "old_args": "", "old_implementation": "return cGroup_1;", "old_return_type": "Group", "old_signature": "Group getGroup_1()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cGroup_3;", "new_return_type": "Group", "new_signature": "Group getGroup_3()", "old_args": "", "old_implementation": "return cGroup_1;", "old_return_type": "Group", "old_signature": "Group getGroup_1()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cGroup_0_0;", "new_return_type": "Group", "new_signature": "Group getGroup_0_0()", "old_args": "", "old_implementation": "return cGroup_2;", "old_return_type": "Group", "old_signature": "Group getGroup_2()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cGroup_1;", "new_return_type": "Group", "new_signature": "Group getGroup_1()", "old_args": "", "old_implementation": "return cGroup_2;", "old_return_type": "Group", "old_signature": "Group getGroup_2()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cGroup_1;", "new_return_type": "Group", "new_signature": "Group getGroup_1()", "old_args": "", "old_implementation": "return cGroup_3;", "old_return_type": "Group", "old_signature": "Group getGroup_3()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cGroup_1;", "new_return_type": "Group", "new_signature": "Group getGroup_1()", "old_args": "", "old_implementation": "return cGroup_3;", "old_return_type": "Group", "old_signature": "Group getGroup_3()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cGroup_2_0;", "new_return_type": "Group", "new_signature": "Group getGroup_2_0()", "old_args": "", "old_implementation": "return cGroup_4_0;", "old_return_type": "Group", "old_signature": "Group getGroup_4_0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cGroup_2_0_1;", "new_return_type": "Group", "new_signature": "Group getGroup_2_0_1()", "old_args": "", "old_implementation": "return cGroup_4_0_1;", "old_return_type": "Group", "old_signature": "Group getGroup_4_0_1()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cGroup_2_1;", "new_return_type": "Group", "new_signature": "Group getGroup_2_1()", "old_args": "", "old_implementation": "return cGroup_4_1;", "old_return_type": "Group", "old_signature": "Group getGroup_4_1()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cGroup_3;", "new_return_type": "Group", "new_signature": "Group getGroup_3()", "old_args": "", "old_implementation": "return cGroup_5;", "old_return_type": "Group", "old_signature": "Group getGroup_5()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cGroup_4;", "new_return_type": "Group", "new_signature": "Group getGroup_4()", "old_args": "", "old_implementation": "return cGroup_5;", "old_return_type": "Group", "old_signature": "Group getGroup_5()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cGroup_4;", "new_return_type": "Group", "new_signature": "Group getGroup_4()", "old_args": "", "old_implementation": "return cGroup_5;", "old_return_type": "Group", "old_signature": "Group getGroup_5()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cGroup_4;", "new_return_type": "Group", "new_signature": "Group getGroup_4()", "old_args": "", "old_implementation": "return cGroup_5;", "old_return_type": "Group", "old_signature": "Group getGroup_5()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cGroup_4;", "new_return_type": "Group", "new_signature": "Group getGroup_4()", "old_args": "", "old_implementation": "return cGroup_5;", "old_return_type": "Group", "old_signature": "Group getGroup_5()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cImgKeyword_0_1;", "new_return_type": "Keyword", "new_signature": "Keyword getImgKeyword_0_1()", "old_args": "", "old_implementation": "return cImgKeyword_0;", "old_return_type": "Keyword", "old_signature": "Keyword getImgKeyword_0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cItemsAssignment_1_1;", "new_return_type": "Assignment", "new_signature": "Assignment getItemsAssignment_1_1()", "old_args": "", "old_implementation": "return cItemsAssignment_3_1;", "old_return_type": "Assignment", "old_signature": "Assignment getItemsAssignment_3_1()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cItemsAssignment_1_1;", "new_return_type": "Assignment", "new_signature": "Assignment getItemsAssignment_1_1()", "old_args": "", "old_implementation": "return cItemsAssignment_3_1;", "old_return_type": "Assignment", "old_signature": "Assignment getItemsAssignment_3_1()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cItemsItemParserRuleCall_1_1_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getItemsItemParserRuleCall_1_1_0()", "old_args": "", "old_implementation": "return cItemsItemParserRuleCall_3_1_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getItemsItemParserRuleCall_3_1_0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cItemsItemParserRuleCall_1_1_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getItemsItemParserRuleCall_1_1_0()", "old_args": "", "old_implementation": "return cItemsItemParserRuleCall_3_1_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getItemsItemParserRuleCall_3_1_0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cLanguageAssignment_1_1;", "new_return_type": "Assignment", "new_signature": "Assignment getLanguageAssignment_1_1()", "old_args": "", "old_implementation": "return cLanguageAssignment_2_2;", "old_return_type": "Assignment", "old_signature": "Assignment getLanguageAssignment_2_2()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cLanguageIDTerminalRuleCall_1_1_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getLanguageIDTerminalRuleCall_1_1_0()", "old_args": "", "old_implementation": "return cLanguageIDTerminalRuleCall_2_2_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getLanguageIDTerminalRuleCall_2_2_0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cLeftSquareBracketKeyword_12;", "new_return_type": "Keyword", "new_signature": "Keyword getLeftSquareBracketKeyword_12()", "old_args": "", "old_implementation": "return cLeftSquareBracketKeyword_11;", "old_return_type": "Keyword", "old_signature": "Keyword getLeftSquareBracketKeyword_11()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cRightSquareBracketKeyword_14;", "new_return_type": "Keyword", "new_signature": "Keyword getRightSquareBracketKeyword_14()", "old_args": "", "old_implementation": "return cLeftSquareBracketKeyword_15;", "old_return_type": "Keyword", "old_signature": "Keyword getLeftSquareBracketKeyword_15()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cLeftSquareBracketKeyword_0_0_2;", "new_return_type": "Keyword", "new_signature": "Keyword getLeftSquareBracketKeyword_0_0_2()", "old_args": "", "old_implementation": "return cLeftSquareBracketKeyword_2;", "old_return_type": "Keyword", "old_signature": "Keyword getLeftSquareBracketKeyword_2()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cLeftSquareBracketKeyword_0_0_2;", "new_return_type": "Keyword", "new_signature": "Keyword getLeftSquareBracketKeyword_0_0_2()", "old_args": "", "old_implementation": "return cLeftSquareBracketKeyword_2;", "old_return_type": "Keyword", "old_signature": "Keyword getLeftSquareBracketKeyword_2()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cLeftSquareBracketKeyword_0_0_2;", "new_return_type": "Keyword", "new_signature": "Keyword getLeftSquareBracketKeyword_0_0_2()", "old_args": "", "old_implementation": "return cLeftSquareBracketKeyword_2;", "old_return_type": "Keyword", "old_signature": "Keyword getLeftSquareBracketKeyword_2()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cLeftSquareBracketKeyword_0_0_2;", "new_return_type": "Keyword", "new_signature": "Keyword getLeftSquareBracketKeyword_0_0_2()", "old_args": "", "old_implementation": "return cLeftSquareBracketKeyword_2;", "old_return_type": "Keyword", "old_signature": "Keyword getLeftSquareBracketKeyword_2()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cLeftSquareBracketKeyword_0_0_2;", "new_return_type": "Keyword", "new_signature": "Keyword getLeftSquareBracketKeyword_0_0_2()", "old_args": "", "old_implementation": "return cLeftSquareBracketKeyword_2;", "old_return_type": "Keyword", "old_signature": "Keyword getLeftSquareBracketKeyword_2()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cLeftSquareBracketKeyword_4;", "new_return_type": "Keyword", "new_signature": "Keyword getLeftSquareBracketKeyword_4()", "old_args": "", "old_implementation": "return cLeftSquareBracketKeyword_2;", "old_return_type": "Keyword", "old_signature": "Keyword getLeftSquareBracketKeyword_2()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cLeftSquareBracketKeyword_1_5;", "new_return_type": "Keyword", "new_signature": "Keyword getLeftSquareBracketKeyword_1_5()", "old_args": "", "old_implementation": "return cLeftSquareBracketKeyword_2_0;", "old_return_type": "Keyword", "old_signature": "Keyword getLeftSquareBracketKeyword_2_0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cLeftSquareBracketKeyword_2;", "new_return_type": "Keyword", "new_signature": "Keyword getLeftSquareBracketKeyword_2()", "old_args": "", "old_implementation": "return cLeftSquareBracketKeyword_3;", "old_return_type": "Keyword", "old_signature": "Keyword getLeftSquareBracketKeyword_3()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cLeftSquareBracketKeyword_4;", "new_return_type": "Keyword", "new_signature": "Keyword getLeftSquareBracketKeyword_4()", "old_args": "", "old_implementation": "return cLeftSquareBracketKeyword_3;", "old_return_type": "Keyword", "old_signature": "Keyword getLeftSquareBracketKeyword_3()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cLeftSquareBracketKeyword_8;", "new_return_type": "Keyword", "new_signature": "Keyword getLeftSquareBracketKeyword_8()", "old_args": "", "old_implementation": "return cLeftSquareBracketKeyword_7;", "old_return_type": "Keyword", "old_signature": "Keyword getLeftSquareBracketKeyword_7()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cMULTI_NLTerminalRuleCall_1;", "new_return_type": "RuleCall", "new_signature": "RuleCall getMULTI_NLTerminalRuleCall_1()", "old_args": "", "old_implementation": "return cMULTI_NLTerminalRuleCall_2;", "old_return_type": "RuleCall", "old_signature": "RuleCall getMULTI_NLTerminalRuleCall_2()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cMULTI_NLTerminalRuleCall_1;", "new_return_type": "RuleCall", "new_signature": "RuleCall getMULTI_NLTerminalRuleCall_1()", "old_args": "", "old_implementation": "return cMULTI_NLTerminalRuleCall_3;", "old_return_type": "RuleCall", "old_signature": "RuleCall getMULTI_NLTerminalRuleCall_3()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cMULTI_NLTerminalRuleCall_3;", "new_return_type": "RuleCall", "new_signature": "RuleCall getMULTI_NLTerminalRuleCall_3()", "old_args": "", "old_implementation": "return cMULTI_NLTerminalRuleCall_4;", "old_return_type": "RuleCall", "old_signature": "RuleCall getMULTI_NLTerminalRuleCall_4()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cMULTI_NLTerminalRuleCall_3;", "new_return_type": "RuleCall", "new_signature": "RuleCall getMULTI_NLTerminalRuleCall_3()", "old_args": "", "old_implementation": "return cMULTI_NLTerminalRuleCall_4;", "old_return_type": "RuleCall", "old_signature": "RuleCall getMULTI_NLTerminalRuleCall_4()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cMULTI_NLTerminalRuleCall_3_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getMULTI_NLTerminalRuleCall_3_0()", "old_args": "", "old_implementation": "return cMULTI_NLTerminalRuleCall_5_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getMULTI_NLTerminalRuleCall_5_0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cMULTI_NLTerminalRuleCall_3_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getMULTI_NLTerminalRuleCall_3_0()", "old_args": "", "old_implementation": "return cMULTI_NLTerminalRuleCall_5_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getMULTI_NLTerminalRuleCall_5_0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cMULTI_NLTerminalRuleCall_3_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getMULTI_NLTerminalRuleCall_3_0()", "old_args": "", "old_implementation": "return cMULTI_NLTerminalRuleCall_5_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getMULTI_NLTerminalRuleCall_5_0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cMULTI_NLTerminalRuleCall_3_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getMULTI_NLTerminalRuleCall_3_0()", "old_args": "", "old_implementation": "return cMULTI_NLTerminalRuleCall_5_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getMULTI_NLTerminalRuleCall_5_0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cMULTI_NLTerminalRuleCall_3_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getMULTI_NLTerminalRuleCall_3_0()", "old_args": "", "old_implementation": "return cMULTI_NLTerminalRuleCall_5_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getMULTI_NLTerminalRuleCall_5_0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cMULTI_NLTerminalRuleCall_3_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getMULTI_NLTerminalRuleCall_3_0()", "old_args": "", "old_implementation": "return cMULTI_NLTerminalRuleCall_5_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getMULTI_NLTerminalRuleCall_5_0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cMULTI_NLTerminalRuleCall_5;", "new_return_type": "RuleCall", "new_signature": "RuleCall getMULTI_NLTerminalRuleCall_5()", "old_args": "", "old_implementation": "return cMULTI_NLTerminalRuleCall_6;", "old_return_type": "RuleCall", "old_signature": "RuleCall getMULTI_NLTerminalRuleCall_6()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cMULTI_NLTerminalRuleCall_4_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getMULTI_NLTerminalRuleCall_4_0()", "old_args": "", "old_implementation": "return cMULTI_NLTerminalRuleCall_6_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getMULTI_NLTerminalRuleCall_6_0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cMULTI_NLTerminalRuleCall_4_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getMULTI_NLTerminalRuleCall_4_0()", "old_args": "", "old_implementation": "return cMULTI_NLTerminalRuleCall_6_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getMULTI_NLTerminalRuleCall_6_0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cMULTI_NLTerminalRuleCall_4_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getMULTI_NLTerminalRuleCall_4_0()", "old_args": "", "old_implementation": "return cMULTI_NLTerminalRuleCall_6_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getMULTI_NLTerminalRuleCall_6_0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cMULTI_NLTerminalRuleCall_4_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getMULTI_NLTerminalRuleCall_4_0()", "old_args": "", "old_implementation": "return cMULTI_NLTerminalRuleCall_6_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getMULTI_NLTerminalRuleCall_6_0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cNameAssignment_0_0_1;", "new_return_type": "Assignment", "new_signature": "Assignment getNameAssignment_0_0_1()", "old_args": "", "old_implementation": "return cNameAssignment_1_1;", "old_return_type": "Assignment", "old_signature": "Assignment getNameAssignment_1_1()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cNameAssignment_0_0_1;", "new_return_type": "Assignment", "new_signature": "Assignment getNameAssignment_0_0_1()", "old_args": "", "old_implementation": "return cNameAssignment_1_1;", "old_return_type": "Assignment", "old_signature": "Assignment getNameAssignment_1_1()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cNameAssignment_0_0_1;", "new_return_type": "Assignment", "new_signature": "Assignment getNameAssignment_0_0_1()", "old_args": "", "old_implementation": "return cNameAssignment_1_1;", "old_return_type": "Assignment", "old_signature": "Assignment getNameAssignment_1_1()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cNameAssignment_0_0_1;", "new_return_type": "Assignment", "new_signature": "Assignment getNameAssignment_0_0_1()", "old_args": "", "old_implementation": "return cNameAssignment_1_1;", "old_return_type": "Assignment", "old_signature": "Assignment getNameAssignment_1_1()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cNameAssignment_0_0_1;", "new_return_type": "Assignment", "new_signature": "Assignment getNameAssignment_0_0_1()", "old_args": "", "old_implementation": "return cNameAssignment_1_1;", "old_return_type": "Assignment", "old_signature": "Assignment getNameAssignment_1_1()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cNameAssignment_1;", "new_return_type": "Assignment", "new_signature": "Assignment getNameAssignment_1()", "old_args": "", "old_implementation": "return cNameAssignment_2;", "old_return_type": "Assignment", "old_signature": "Assignment getNameAssignment_2()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cNameAssignment_0_0_2;", "new_return_type": "Assignment", "new_signature": "Assignment getNameAssignment_0_0_2()", "old_args": "", "old_implementation": "return cNameAssignment_2_2;", "old_return_type": "Assignment", "old_signature": "Assignment getNameAssignment_2_2()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cNameIDTerminalRuleCall_0_0_1_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getNameIDTerminalRuleCall_0_0_1_0()", "old_args": "", "old_implementation": "return cNameIDTerminalRuleCall_1_1_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getNameIDTerminalRuleCall_1_1_0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cNameIDTerminalRuleCall_0_0_1_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getNameIDTerminalRuleCall_0_0_1_0()", "old_args": "", "old_implementation": "return cNameIDTerminalRuleCall_1_1_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getNameIDTerminalRuleCall_1_1_0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cNameIDTerminalRuleCall_0_0_1_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getNameIDTerminalRuleCall_0_0_1_0()", "old_args": "", "old_implementation": "return cNameIDTerminalRuleCall_1_1_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getNameIDTerminalRuleCall_1_1_0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cNameIDTerminalRuleCall_0_0_1_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getNameIDTerminalRuleCall_0_0_1_0()", "old_args": "", "old_implementation": "return cNameIDTerminalRuleCall_1_1_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getNameIDTerminalRuleCall_1_1_0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cNameIDTerminalRuleCall_0_0_1_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getNameIDTerminalRuleCall_0_0_1_0()", "old_args": "", "old_implementation": "return cNameIDTerminalRuleCall_1_1_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getNameIDTerminalRuleCall_1_1_0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cNameIDTerminalRuleCall_1_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getNameIDTerminalRuleCall_1_0()", "old_args": "", "old_implementation": "return cNameIDTerminalRuleCall_2_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getNameIDTerminalRuleCall_2_0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cNameIDTerminalRuleCall_0_0_2_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getNameIDTerminalRuleCall_0_0_2_0()", "old_args": "", "old_implementation": "return cNameIDTerminalRuleCall_2_2_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getNameIDTerminalRuleCall_2_2_0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cPathAssignment_1;", "new_return_type": "Assignment", "new_signature": "Assignment getPathAssignment_1()", "old_args": "", "old_implementation": "return cPathAssignment_4;", "old_return_type": "Assignment", "old_signature": "Assignment getPathAssignment_4()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cPathTextParserRuleCall_1_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getPathTextParserRuleCall_1_0()", "old_args": "", "old_implementation": "return cPathTextParserRuleCall_4_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getPathTextParserRuleCall_4_0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cRefAssignment_1;", "new_return_type": "Assignment", "new_signature": "Assignment getRefAssignment_1()", "old_args": "", "old_implementation": "return cRefAssignment_2;", "old_return_type": "Assignment", "old_signature": "Assignment getRefAssignment_2()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cRefIdentifiableCrossReference_1_0;", "new_return_type": "CrossReference", "new_signature": "CrossReference getRefIdentifiableCrossReference_1_0()", "old_args": "", "old_implementation": "return cRefIdentifiableCrossReference_2_0;", "old_return_type": "CrossReference", "old_signature": "CrossReference getRefIdentifiableCrossReference_2_0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cRefIdentifiableIDTerminalRuleCall_1_0_1;", "new_return_type": "RuleCall", "new_signature": "RuleCall getRefIdentifiableIDTerminalRuleCall_1_0_1()", "old_args": "", "old_implementation": "return cRefIdentifiableIDTerminalRuleCall_2_0_1;", "old_return_type": "RuleCall", "old_signature": "RuleCall getRefIdentifiableIDTerminalRuleCall_2_0_1()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cRightSquareBracketKeyword_10;", "new_return_type": "Keyword", "new_signature": "Keyword getRightSquareBracketKeyword_10()", "old_args": "", "old_implementation": "return cRightSquareBracketKeyword_13;", "old_return_type": "Keyword", "old_signature": "Keyword getRightSquareBracketKeyword_13()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cRightSquareBracketKeyword_1_3;", "new_return_type": "Keyword", "new_signature": "Keyword getRightSquareBracketKeyword_1_3()", "old_args": "", "old_implementation": "return cRightSquareBracketKeyword_2_4;", "old_return_type": "Keyword", "old_signature": "Keyword getRightSquareBracketKeyword_2_4()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cRightSquareBracketKeyword_2;", "new_return_type": "Keyword", "new_signature": "Keyword getRightSquareBracketKeyword_2()", "old_args": "", "old_implementation": "return cRightSquareBracketKeyword_3_1;", "old_return_type": "Keyword", "old_signature": "Keyword getRightSquareBracketKeyword_3_1()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cRightSquareBracketKeyword_2;", "new_return_type": "Keyword", "new_signature": "Keyword getRightSquareBracketKeyword_2()", "old_args": "", "old_implementation": "return cRightSquareBracketKeyword_4;", "old_return_type": "Keyword", "old_signature": "Keyword getRightSquareBracketKeyword_4()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cRightSquareBracketKeyword_2;", "new_return_type": "Keyword", "new_signature": "Keyword getRightSquareBracketKeyword_2()", "old_args": "", "old_implementation": "return cRightSquareBracketKeyword_4;", "old_return_type": "Keyword", "old_signature": "Keyword getRightSquareBracketKeyword_4()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cRightSquareBracketKeyword_2;", "new_return_type": "Keyword", "new_signature": "Keyword getRightSquareBracketKeyword_2()", "old_args": "", "old_implementation": "return cRightSquareBracketKeyword_4;", "old_return_type": "Keyword", "old_signature": "Keyword getRightSquareBracketKeyword_4()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cRightSquareBracketKeyword_2;", "new_return_type": "Keyword", "new_signature": "Keyword getRightSquareBracketKeyword_2()", "old_args": "", "old_implementation": "return cRightSquareBracketKeyword_4;", "old_return_type": "Keyword", "old_signature": "Keyword getRightSquareBracketKeyword_4()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cRightSquareBracketKeyword_2;", "new_return_type": "Keyword", "new_signature": "Keyword getRightSquareBracketKeyword_2()", "old_args": "", "old_implementation": "return cRightSquareBracketKeyword_4;", "old_return_type": "Keyword", "old_signature": "Keyword getRightSquareBracketKeyword_4()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cRightSquareBracketKeyword_2;", "new_return_type": "Keyword", "new_signature": "Keyword getRightSquareBracketKeyword_2()", "old_args": "", "old_implementation": "return cRightSquareBracketKeyword_4;", "old_return_type": "Keyword", "old_signature": "Keyword getRightSquareBracketKeyword_4()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cRightSquareBracketKeyword_2;", "new_return_type": "Keyword", "new_signature": "Keyword getRightSquareBracketKeyword_2()", "old_args": "", "old_implementation": "return cRightSquareBracketKeyword_4;", "old_return_type": "Keyword", "old_signature": "Keyword getRightSquareBracketKeyword_4()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cRightSquareBracketKeyword_2;", "new_return_type": "Keyword", "new_signature": "Keyword getRightSquareBracketKeyword_2()", "old_args": "", "old_implementation": "return cRightSquareBracketKeyword_5;", "old_return_type": "Keyword", "old_signature": "Keyword getRightSquareBracketKeyword_5()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cRightSquareBracketKeyword_3;", "new_return_type": "Keyword", "new_signature": "Keyword getRightSquareBracketKeyword_3()", "old_args": "", "old_implementation": "return cRightSquareBracketKeyword_5;", "old_return_type": "Keyword", "old_signature": "Keyword getRightSquareBracketKeyword_5()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cRightSquareBracketKeyword_3;", "new_return_type": "Keyword", "new_signature": "Keyword getRightSquareBracketKeyword_3()", "old_args": "", "old_implementation": "return cRightSquareBracketKeyword_5;", "old_return_type": "Keyword", "old_signature": "Keyword getRightSquareBracketKeyword_5()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cRightSquareBracketKeyword_3;", "new_return_type": "Keyword", "new_signature": "Keyword getRightSquareBracketKeyword_3()", "old_args": "", "old_implementation": "return cRightSquareBracketKeyword_5;", "old_return_type": "Keyword", "old_signature": "Keyword getRightSquareBracketKeyword_5()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cRightSquareBracketKeyword_4;", "new_return_type": "Keyword", "new_signature": "Keyword getRightSquareBracketKeyword_4()", "old_args": "", "old_implementation": "return cRightSquareBracketKeyword_5;", "old_return_type": "Keyword", "old_signature": "Keyword getRightSquareBracketKeyword_5()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cRightSquareBracketKeyword_4;", "new_return_type": "Keyword", "new_signature": "Keyword getRightSquareBracketKeyword_4()", "old_args": "", "old_implementation": "return cRightSquareBracketKeyword_6;", "old_return_type": "Keyword", "old_signature": "Keyword getRightSquareBracketKeyword_6()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cRightSquareBracketKeyword_6;", "new_return_type": "Keyword", "new_signature": "Keyword getRightSquareBracketKeyword_6()", "old_args": "", "old_implementation": "return cRightSquareBracketKeyword_7;", "old_return_type": "Keyword", "old_signature": "Keyword getRightSquareBracketKeyword_7()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cRightSquareBracketKeyword_6;", "new_return_type": "Keyword", "new_signature": "Keyword getRightSquareBracketKeyword_6()", "old_args": "", "old_implementation": "return cRightSquareBracketKeyword_8;", "old_return_type": "Keyword", "old_signature": "Keyword getRightSquareBracketKeyword_8()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cRightSquareBracketKeyword_6;", "new_return_type": "Keyword", "new_signature": "Keyword getRightSquareBracketKeyword_6()", "old_args": "", "old_implementation": "return cRightSquareBracketKeyword_9;", "old_return_type": "Keyword", "old_signature": "Keyword getRightSquareBracketKeyword_9()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cSection3Keyword_0_1;", "new_return_type": "Keyword", "new_signature": "Keyword getSection3Keyword_0_1()", "old_args": "", "old_implementation": "return cSection3Keyword_0;", "old_return_type": "Keyword", "old_signature": "Keyword getSection3Keyword_0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cSection4Keyword_0_1;", "new_return_type": "Keyword", "new_signature": "Keyword getSection4Keyword_0_1()", "old_args": "", "old_implementation": "return cSection4Keyword_0;", "old_return_type": "Keyword", "old_signature": "Keyword getSection4Keyword_0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cSectionKeyword_0_1;", "new_return_type": "Keyword", "new_signature": "Keyword getSectionKeyword_0_1()", "old_args": "", "old_implementation": "return cSectionKeyword_0;", "old_return_type": "Keyword", "old_signature": "Keyword getSectionKeyword_0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cStyleAssignment_9;", "new_return_type": "Assignment", "new_signature": "Assignment getStyleAssignment_9()", "old_args": "", "old_implementation": "return cStyleAssignment_12;", "old_return_type": "Assignment", "old_signature": "Assignment getStyleAssignment_12()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cCaptionTextParserRuleCall_13_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getCaptionTextParserRuleCall_13_0()", "old_args": "", "old_implementation": "return cStyleTextParserRuleCall_12_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getStyleTextParserRuleCall_12_0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cSubsectionKeyword_0_1;", "new_return_type": "Keyword", "new_signature": "Keyword getSubsectionKeyword_0_1()", "old_args": "", "old_implementation": "return cSubsectionKeyword_0;", "old_return_type": "Keyword", "old_signature": "Keyword getSubsectionKeyword_0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cTextAssignment_5;", "new_return_type": "Assignment", "new_signature": "Assignment getTextAssignment_5()", "old_args": "", "old_implementation": "return cTextAssignment_7;", "old_return_type": "Assignment", "old_signature": "Assignment getTextAssignment_7()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cTextTextParserRuleCall_5_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getTextTextParserRuleCall_5_0()", "old_args": "", "old_implementation": "return cTextTextParserRuleCall_7_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getTextTextParserRuleCall_7_0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cTitleAssignment_1;", "new_return_type": "Assignment", "new_signature": "Assignment getTitleAssignment_1()", "old_args": "", "old_implementation": "return cTitleAssignment_3;", "old_return_type": "Assignment", "old_signature": "Assignment getTitleAssignment_3()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cTitleAssignment_1;", "new_return_type": "Assignment", "new_signature": "Assignment getTitleAssignment_1()", "old_args": "", "old_implementation": "return cTitleAssignment_3;", "old_return_type": "Assignment", "old_signature": "Assignment getTitleAssignment_3()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cTitleAssignment_1;", "new_return_type": "Assignment", "new_signature": "Assignment getTitleAssignment_1()", "old_args": "", "old_implementation": "return cTitleAssignment_3;", "old_return_type": "Assignment", "old_signature": "Assignment getTitleAssignment_3()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cTitleAssignment_1;", "new_return_type": "Assignment", "new_signature": "Assignment getTitleAssignment_1()", "old_args": "", "old_implementation": "return cTitleAssignment_3;", "old_return_type": "Assignment", "old_signature": "Assignment getTitleAssignment_3()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cTitleAssignment_1;", "new_return_type": "Assignment", "new_signature": "Assignment getTitleAssignment_1()", "old_args": "", "old_implementation": "return cTitleAssignment_3;", "old_return_type": "Assignment", "old_signature": "Assignment getTitleAssignment_3()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cTitleTextOrMarkupParserRuleCall_1_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getTitleTextOrMarkupParserRuleCall_1_0()", "old_args": "", "old_implementation": "return cTitleTextOrMarkupParserRuleCall_3_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getTitleTextOrMarkupParserRuleCall_3_0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cTitleTextOrMarkupParserRuleCall_1_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getTitleTextOrMarkupParserRuleCall_1_0()", "old_args": "", "old_implementation": "return cTitleTextOrMarkupParserRuleCall_3_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getTitleTextOrMarkupParserRuleCall_3_0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cTitleTextOrMarkupParserRuleCall_1_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getTitleTextOrMarkupParserRuleCall_1_0()", "old_args": "", "old_implementation": "return cTitleTextOrMarkupParserRuleCall_3_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getTitleTextOrMarkupParserRuleCall_3_0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cTitleTextOrMarkupParserRuleCall_1_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getTitleTextOrMarkupParserRuleCall_1_0()", "old_args": "", "old_implementation": "return cTitleTextOrMarkupParserRuleCall_3_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getTitleTextOrMarkupParserRuleCall_3_0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cTitleTextOrMarkupParserRuleCall_1_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getTitleTextOrMarkupParserRuleCall_1_0()", "old_args": "", "old_implementation": "return cTitleTextOrMarkupParserRuleCall_3_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getTitleTextOrMarkupParserRuleCall_3_0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cUrlAssignment_1;", "new_return_type": "Assignment", "new_signature": "Assignment getUrlAssignment_1()", "old_args": "", "old_implementation": "return cUrlAssignment_3;", "old_return_type": "Assignment", "old_signature": "Assignment getUrlAssignment_3()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cUrlTextParserRuleCall_1_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getUrlTextParserRuleCall_1_0()", "old_args": "", "old_implementation": "return cUrlTextParserRuleCall_3_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getUrlTextParserRuleCall_3_0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Chapter__Group_0_0__2__Impl()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Anchor__Group_3__0__Impl()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__SubSection__Group_0_0__2__Impl()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Anchor__Group_3__1()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Section3__Group_0_0__2__Impl()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Anchor__Group_3__1__Impl()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Anchor__NameAssignment_1()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Anchor__NameAssignment_2()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Chapter__ContentsAssignment_3_1()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Chapter__ContentsAssignment_5_1()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Chapter__ContentsAssignment_4_1()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Chapter__ContentsAssignment_6_1()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Chapter__Group_4__0()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Chapter__Group_1__0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Chapter__Group_0_0__0__Impl()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Chapter__Group_1__0__Impl()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Chapter__Group_0_0__1__Impl()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Chapter__Group_1__1()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Chapter__Group_3__0()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Chapter__Group_5__0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Chapter__Group_3__0__Impl()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Chapter__Group_5__0__Impl()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Chapter__Group_3__1()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Chapter__Group_5__1()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Chapter__Group_3__1__Impl()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Chapter__Group_5__1__Impl()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Chapter__Group_0_0__2()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Chapter__Group_6__0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Chapter__Group_4__0__Impl()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Chapter__Group_6__0__Impl()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Chapter__Group_4__1()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Chapter__Group_6__1()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Chapter__Group_4__1__Impl()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Chapter__Group_6__1__Impl()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Chapter__Group_0_0__0()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Chapter__Group__5__Impl()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__ImageRef__Alternatives_0()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Chapter__Group__6()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Chapter__Group_0_0__1()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Chapter__Group__6__Impl()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Chapter__NameAssignment_0_0_1()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Chapter__NameAssignment_1_1()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Chapter__TitleAssignment_1()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Chapter__TitleAssignment_3()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Chapter__Alternatives_0()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__CodeBlock__Alternatives_4()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__CodeBlock__ContentsAssignment_2_0_0()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__CodeBlock__ContentsAssignment_4_0_0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__CodeBlock__ContentsAssignment_2_0_1_0()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__CodeBlock__ContentsAssignment_4_0_1_0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__CodeBlock__ContentsAssignment_2_0_1_1()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__CodeBlock__ContentsAssignment_4_0_1_1()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__CodeBlock__ContentsAssignment_2_1_0()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__CodeBlock__ContentsAssignment_4_1_0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__CodeBlock__ContentsAssignment_2_1_1()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__CodeBlock__ContentsAssignment_4_1_1()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__CodeBlock__Group_1__5__Impl()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__CodeBlock__Group_2__0__Impl()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__CodeBlock__Group_1__2__Impl()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__CodeBlock__Group_2__1__Impl()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__CodeBlock__Group_1__1__Impl()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__CodeBlock__Group_2__2()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__CodeBlock__LanguageAssignment_1_1()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__CodeBlock__Group_2__2__Impl()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__CodeBlock__Group_1__3()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__CodeBlock__Group_2__3()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__CodeBlock__Group_1__4__Impl()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__CodeBlock__Group_2__3__Impl()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__CodeBlock__Group_1__4()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__CodeBlock__Group_2__4()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__CodeBlock__Group_1__3__Impl()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__CodeBlock__Group_2__4__Impl()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__CodeBlock__Group_1__5()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__CodeBlock__Group_2__5()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__CodeBlock__Group_1__0__Impl()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__CodeBlock__Group_2__5__Impl()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__CodeBlock__Group_2_0_1__0()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__CodeBlock__Group_4_0_1__0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__CodeBlock__Group_2_0_1__0__Impl()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__CodeBlock__Group_4_0_1__0__Impl()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__CodeBlock__Group_2_0_1__1()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__CodeBlock__Group_4_0_1__1()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__CodeBlock__Group_2_0_1__1__Impl()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__CodeBlock__Group_4_0_1__1__Impl()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__CodeBlock__Group_2_0__0()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__CodeBlock__Group_4_0__0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__CodeBlock__Group_2_0__0__Impl()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__CodeBlock__Group_4_0__0__Impl()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__CodeBlock__Group_2_0__1()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__CodeBlock__Group_4_0__1()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__CodeBlock__Group_2_0__1__Impl()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__CodeBlock__Group_4_0__1__Impl()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__CodeBlock__Group_2_1__0()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__CodeBlock__Group_4_1__0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__CodeBlock__Group_2_1__0__Impl()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__CodeBlock__Group_4_1__0__Impl()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__CodeBlock__Group_2_1__1()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__CodeBlock__Group_4_1__1()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__CodeBlock__Group_2_1__1__Impl()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__CodeBlock__Group_4_1__1__Impl()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__CodeRef__ElementAssignment_1()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__CodeRef__ElementAssignment_3()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Emphasize__ContentsAssignment_2()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Emphasize__ContentsAssignment_3()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__ImageRef__ClazzAssignment_5()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__ImageRef__ClazzAssignment_8()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__ImageRef__Group_0_0__0()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__ImageRef__Group_2__0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__ImageRef__Group_0_0__0__Impl()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__ImageRef__Group_2__0__Impl()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__ImageRef__Group_0_0__1()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__ImageRef__Group_2__1()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__ImageRef__Group_0_0__1__Impl()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__ImageRef__Group_2__1__Impl()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__ImageRef__Group_0_0__2()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__ImageRef__Group_2__2()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__ImageRef__Group_0_0__2__Impl()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__ImageRef__Group_2__2__Impl()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__ImageRef__Group_0_0__3__Impl()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__ImageRef__Group_2__3()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__ImageRef__Group_0_0__3()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__ImageRef__Group__15()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__ImageRef__Group_0_0__4__Impl()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__ImageRef__Group__15__Impl()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__ImageRef__Group_0_0__4()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__ImageRef__Group__16()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__ImageRef__CaptionAssignment_13()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__ImageRef__Group__16__Impl()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__ImageRef__NameAssignment_0_0_2()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__ImageRef__NameAssignment_2_2()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__ImageRef__PathAssignment_1()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__ImageRef__PathAssignment_4()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__ImageRef__StyleAssignment_9()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__ImageRef__StyleAssignment_12()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Item__ContentsAssignment_2()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Item__ContentsAssignment_4()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Item__ContentsAssignment_3_1()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Item__ContentsAssignment_5_1()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Item__Group_3__1()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Item__Group_5__0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Item__Group_3__0__Impl()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Item__Group_5__0__Impl()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Item__Group_3__1__Impl()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Item__Group_5__1()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Item__Group_3__0()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Item__Group__5__Impl()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Link__TextAssignment_5()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Link__TextAssignment_7()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Link__UrlAssignment_1()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Link__UrlAssignment_3()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__OrderedList__Group_1__0()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__OrderedList__Group_3__0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__OrderedList__Group_1__1()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__OrderedList__Group_3__1()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__OrderedList__Group_1__1__Impl()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__OrderedList__Group_3__1__Impl()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__OrderedList__Group_1__0__Impl()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__OrderedList__Group__4()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__OrderedList__ItemsAssignment_1_1()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__OrderedList__ItemsAssignment_3_1()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Ref__ContentsAssignment_4()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Ref__ContentsAssignment_5()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Section4__Group_0_0__2__Impl()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Ref__Group__7()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Ref__RefAssignment_1()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Ref__RefAssignment_2()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Section3__ContentsAssignment_3_1()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Section3__ContentsAssignment_5_1()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Section3__ContentsAssignment_4_1()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Section3__ContentsAssignment_6_1()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Section3__Group_0_0__0()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Section3__Group_1__0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Section3__Group_0_0__0__Impl()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Section3__Group_1__0__Impl()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Section__Group_4__1()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Section3__Group_1__1()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Section3__Group_0_0__1__Impl()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Section3__Group_1__1__Impl()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Section3__Group_3__0()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Section3__Group_5__0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Section3__Group_3__0__Impl()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Section3__Group_5__0__Impl()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Section3__Group_3__1()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Section3__Group_5__1()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Section3__Group_3__1__Impl()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Section3__Group_5__1__Impl()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Section3__Group_0_0__1()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Section3__Group_6__0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Section3__Group_4__0__Impl()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Section3__Group_6__0__Impl()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__SubSection__Group_4__1()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Section3__Group_6__1()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Section3__Group_4__1__Impl()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Section3__Group_6__1__Impl()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Section4__Group_3__0()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Section3__Group__5()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Section3__Group_0_0__2()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Section3__Group__5__Impl()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Section3__Alternatives_0()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Section3__Group__6__Impl()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Section3__NameAssignment_0_0_1()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Section3__NameAssignment_1_1()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Section3__TitleAssignment_1()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Section3__TitleAssignment_3()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Section4__ContentsAssignment_3_1()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Section4__ContentsAssignment_5_1()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Section3__Group_4__0()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Section4__Group_1__0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Section4__Group_0_0__0__Impl()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Section4__Group_1__0__Impl()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Section3__Group_4__1()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Section4__Group_1__1()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Section4__Group_0_0__1__Impl()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Section4__Group_1__1__Impl()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Section4__Group_0_0__0()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Section4__Group_5__0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Section4__Group_3__0__Impl()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Section4__Group_5__0__Impl()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Section4__Group_0_0__2()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Section4__Group_5__1()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Section4__Group_3__1__Impl()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Section4__Group_5__1__Impl()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Section4__Group_0_0__1()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Section4__Group__4()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Section__Group_0_0__2__Impl()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Section4__Group__4__Impl()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Section4__Group_3__1()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Section4__Group__5()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Section__Group_4__0()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Section4__Group__5__Impl()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Section4__NameAssignment_0_0_1()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Section4__NameAssignment_1_1()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Section4__TitleAssignment_1()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Section4__TitleAssignment_3()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Section__ContentsAssignment_3_1()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Section__ContentsAssignment_5_1()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Section__ContentsAssignment_4_1()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Section__ContentsAssignment_6_1()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Section__Group_3__0()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Section__Group_1__0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Section__Group_0_0__0__Impl()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Section__Group_1__0__Impl()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Section__Group_0_0__1__Impl()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Section__Group_1__1()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Section__Group_0_0__1()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Section__Group_5__0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Section__Group_3__0__Impl()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Section__Group_5__0__Impl()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Section__Group_3__1()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Section__Group_5__1()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Section__Group_0_0__2()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Section__Group_6__0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Section__Group_4__0__Impl()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Section__Group_6__0__Impl()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Section__Group_3__1__Impl()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Section__Group_6__1()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Section__Group_4__1__Impl()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Section__Group_6__1__Impl()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Section__Group_0_0__0()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Section__Group__5__Impl()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Section__Alternatives_0()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Section__Group__6__Impl()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Section__NameAssignment_0_0_1()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Section__NameAssignment_1_1()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Section__TitleAssignment_1()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__Section__TitleAssignment_3()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__SubSection__ContentsAssignment_3_1()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__SubSection__ContentsAssignment_5_1()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__SubSection__ContentsAssignment_4_1()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__SubSection__ContentsAssignment_6_1()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__SubSection__Group_0_0__0()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__SubSection__Group_1__0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__SubSection__Group_0_0__0__Impl()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__SubSection__Group_1__0__Impl()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__SubSection__Group_0_0__1__Impl()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__SubSection__Group_1__1()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__SubSection__Group_0_0__2()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__SubSection__Group_5__0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__SubSection__Group_3__0__Impl()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__SubSection__Group_5__0__Impl()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__SubSection__Group_3__1()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__SubSection__Group_5__1()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__SubSection__Group_4__1__Impl()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__SubSection__Group_5__1__Impl()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__SubSection__Group_3__0()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__SubSection__Group_6__0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__SubSection__Group_4__0__Impl()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__SubSection__Group_6__0__Impl()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__SubSection__Group_3__1__Impl()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__SubSection__Group_6__1()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__SubSection__Group_4__0()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__SubSection__Group__5()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__SubSection__Group_0_0__1()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__SubSection__Group__5__Impl()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__SubSection__Alternatives_0()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__SubSection__Group__6()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__Section4__Alternatives_0()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__SubSection__Group__6__Impl()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__SubSection__NameAssignment_0_0_1()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__SubSection__NameAssignment_1_1()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__SubSection__TitleAssignment_1()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__SubSection__TitleAssignment_3()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__UnorderedList__Group_1__0()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__UnorderedList__Group_3__0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__UnorderedList__Group_1__0__Impl()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__UnorderedList__Group_3__0__Impl()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__UnorderedList__Group_1__1()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__UnorderedList__Group_3__1()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__UnorderedList__Group_1__1__Impl()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__UnorderedList__Group_3__1__Impl()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void rule__UnorderedList__ItemsAssignment_1_1()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void rule__UnorderedList__ItemsAssignment_3_1()" } ]
[ { "additions": 5, "blob_url": "https://github.com/RvonMassow/xDoc/blob/6b0eb897ce8abe5cda472a8e6af89cd62a47dd66/org.eclipse.xtext.xdoc.tests%2Fsrc%2Forg%2Feclipse%2Fxtext%2Fxdoc%2Ftests%2FParserTest.java", "changes": 10, "contents_url": "https://api.github.com/repos/RvonMassow/xDoc/contents/org.eclipse.xtext.xdoc.tests%2Fsrc%2Forg%2Feclipse%2Fxtext%2Fxdoc%2Ftests%2FParserTest.java?ref=6b0eb897ce8abe5cda472a8e6af89cd62a47dd66", "deletions": 5, "filename": "org.eclipse.xtext.xdoc.tests/src/org/eclipse/xtext/xdoc/tests/ParserTest.java", "new_code": "\t\tString text = \"chapter[\" + title + \"]\\r\\n\\r\\n\" + firstPart\n\t\t\t\t+ \"emph[\" + emphasized + \"]\" + secondPart + \"\\n\\n\";\n\t\tgetDoc(\"chapter[foo]\\n\\n bar\");\n\t\tgetDoc(\"section[foo]\\n\\n bar\");\n\t\tgetDoc(\"subsection[foo]\\n\\n bar\");", "new_methods": [], "old_code": "\t\tString text = \"\\\\chapter[\" + title + \"]\\r\\n\\r\\n\" + firstPart\n\t\t\t\t+ \"\\\\emph[\" + emphasized + \"]\" + secondPart + \"\\n\\n\";\n\t\tgetDoc(\"\\\\chapter[foo]\\n\\n bar\");\n\t\tgetDoc(\"\\\\section[foo]\\n\\n bar\");\n\t\tgetDoc(\"\\\\subsection[foo]\\n\\n bar\");", "old_methods": [], "patch": "@@ -37,8 +37,8 @@ public void testSimple() throws Exception {\n \t\tString firstPart = \"Hier kommt dann mal text \";\n \t\tString emphasized = \"manchmal fett\";\n \t\tString secondPart = \" und manchmal nicht.\\nNewlines und so gibt es auch.\";\n-\t\tString text = \"\\\\chapter[\" + title + \"]\\r\\n\\r\\n\" + firstPart\n-\t\t\t\t+ \"\\\\emph[\" + emphasized + \"]\" + secondPart + \"\\n\\n\";\n+\t\tString text = \"chapter[\" + title + \"]\\r\\n\\r\\n\" + firstPart\n+\t\t\t\t+ \"emph[\" + emphasized + \"]\" + secondPart + \"\\n\\n\";\n \t\tSystem.out.println(text);\n \t\tDocument model = (Document) getModel(text);\n \t\tChapter chapter = model.getChapters().get(0);\n@@ -56,9 +56,9 @@ public void testSimple() throws Exception {\n \t}\n \n \tpublic void testsmallestDoc() throws Exception {\n-\t\tgetDoc(\"\\\\chapter[foo]\\n\\n bar\");\n-\t\tgetDoc(\"\\\\section[foo]\\n\\n bar\");\n-\t\tgetDoc(\"\\\\subsection[foo]\\n\\n bar\");\n+\t\tgetDoc(\"chapter[foo]\\n\\n bar\");\n+\t\tgetDoc(\"section[foo]\\n\\n bar\");\n+\t\tgetDoc(\"subsection[foo]\\n\\n bar\");\n \t}\n \n \tpublic void testAnchoredReference() throws Exception {", "raw_url": "https://github.com/RvonMassow/xDoc/raw/6b0eb897ce8abe5cda472a8e6af89cd62a47dd66/org.eclipse.xtext.xdoc.tests%2Fsrc%2Forg%2Feclipse%2Fxtext%2Fxdoc%2Ftests%2FParserTest.java", "sha": "1c9d673f2347da862698269260ad257532e67090", "status": "modified" }, { "additions": 2, "blob_url": "https://github.com/RvonMassow/xDoc/blob/6b0eb897ce8abe5cda472a8e6af89cd62a47dd66/org.eclipse.xtext.xdoc.tests%2Ftestfiles%2FaRefTest.xdoc", "changes": 4, "contents_url": "https://api.github.com/repos/RvonMassow/xDoc/contents/org.eclipse.xtext.xdoc.tests%2Ftestfiles%2FaRefTest.xdoc?ref=6b0eb897ce8abe5cda472a8e6af89cd62a47dd66", "deletions": 2, "filename": "org.eclipse.xtext.xdoc.tests/testfiles/aRefTest.xdoc", "new_code": "chapter[Dummy Title]\na[refName] Jump ref:refName[to]", "new_methods": [], "old_code": "\\chapter[Dummy Title]\n\\a:refName Jump \\ref:refName[to]", "old_methods": [], "patch": "@@ -1,3 +1,3 @@\n-\\chapter[Dummy Title]\n+chapter[Dummy Title]\n \n-\\a:refName Jump \\ref:refName[to]\n+a[refName] Jump ref:refName[to]", "raw_url": "https://github.com/RvonMassow/xDoc/raw/6b0eb897ce8abe5cda472a8e6af89cd62a47dd66/org.eclipse.xtext.xdoc.tests%2Ftestfiles%2FaRefTest.xdoc", "sha": "91356ac8458a37c1e1fd141e44cb93981506ebef", "status": "modified" }, { "additions": 2, "blob_url": "https://github.com/RvonMassow/xDoc/blob/6b0eb897ce8abe5cda472a8e6af89cd62a47dd66/org.eclipse.xtext.xdoc.tests%2Ftestfiles%2FcodeRef.xdoc", "changes": 4, "contents_url": "https://api.github.com/repos/RvonMassow/xDoc/contents/org.eclipse.xtext.xdoc.tests%2Ftestfiles%2FcodeRef.xdoc?ref=6b0eb897ce8abe5cda472a8e6af89cd62a47dd66", "deletions": 2, "filename": "org.eclipse.xtext.xdoc.tests/testfiles/codeRef.xdoc", "new_code": "chapter[Dummy Title]\nSee codeRef[java.lang.String.charAt(int)]", "new_methods": [], "old_code": "\\chapter[Dummy Title]\nSee \\codeRef[java.lang.String.charAt(int)]", "old_methods": [], "patch": "@@ -1,5 +1,5 @@\n-\\chapter[Dummy Title]\n+chapter[Dummy Title]\n \n-See \\codeRef[java.lang.String.charAt(int)]\n+See codeRef[java.lang.String.charAt(int)]\n \n ", "raw_url": "https://github.com/RvonMassow/xDoc/raw/6b0eb897ce8abe5cda472a8e6af89cd62a47dd66/org.eclipse.xtext.xdoc.tests%2Ftestfiles%2FcodeRef.xdoc", "sha": "bd9796e5ccccdc3dc40a253c24b512e3efac8dde", "status": "modified" }, { "additions": 2, "blob_url": "https://github.com/RvonMassow/xDoc/blob/6b0eb897ce8abe5cda472a8e6af89cd62a47dd66/org.eclipse.xtext.xdoc.tests%2Ftestfiles%2FcodeTest.xdoc", "changes": 4, "contents_url": "https://api.github.com/repos/RvonMassow/xDoc/contents/org.eclipse.xtext.xdoc.tests%2Ftestfiles%2FcodeTest.xdoc?ref=6b0eb897ce8abe5cda472a8e6af89cd62a47dd66", "deletions": 2, "filename": "org.eclipse.xtext.xdoc.tests/testfiles/codeTest.xdoc", "new_code": "chapter[Dummy Title]\ncode[", "new_methods": [], "old_code": "\\chapter[Dummy Title]\n\\code[", "old_methods": [], "patch": "@@ -1,6 +1,6 @@\n-\\chapter[Dummy Title]\n+chapter[Dummy Title]\n \n-\\code[\n+code[\n class Foo {\n public static void main(String\\[\\] args){\n System.out.println(\"Hello World\\n\");", "raw_url": "https://github.com/RvonMassow/xDoc/raw/6b0eb897ce8abe5cda472a8e6af89cd62a47dd66/org.eclipse.xtext.xdoc.tests%2Ftestfiles%2FcodeTest.xdoc", "sha": "40c613302f5581232b752a7ccbb2f3d2add57865", "status": "modified" }, { "additions": 2, "blob_url": "https://github.com/RvonMassow/xDoc/blob/6b0eb897ce8abe5cda472a8e6af89cd62a47dd66/org.eclipse.xtext.xdoc.tests%2Ftestfiles%2FcodeWithLanguageTest.xdoc", "changes": 4, "contents_url": "https://api.github.com/repos/RvonMassow/xDoc/contents/org.eclipse.xtext.xdoc.tests%2Ftestfiles%2FcodeWithLanguageTest.xdoc?ref=6b0eb897ce8abe5cda472a8e6af89cd62a47dd66", "deletions": 2, "filename": "org.eclipse.xtext.xdoc.tests/testfiles/codeWithLanguageTest.xdoc", "new_code": "chapter[Dummy Title]\ncode[Java][", "new_methods": [], "old_code": "\\chapter[Dummy Title]\n\\code[Java][", "old_methods": [], "patch": "@@ -1,6 +1,6 @@\n-\\chapter[Dummy Title]\n+chapter[Dummy Title]\n \n-\\code[Java][\n+code[Java][\n class Foo {\n public static void main(String\\[\\] args){\n System.out.println(\"Hello World\\n\");", "raw_url": "https://github.com/RvonMassow/xDoc/raw/6b0eb897ce8abe5cda472a8e6af89cd62a47dd66/org.eclipse.xtext.xdoc.tests%2Ftestfiles%2FcodeWithLanguageTest.xdoc", "sha": "5de1c1e81e200015bb6ec61fca8d65855b902d35", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/RvonMassow/xDoc/blob/6b0eb897ce8abe5cda472a8e6af89cd62a47dd66/org.eclipse.xtext.xdoc.tests%2Ftestfiles%2FcommentTest.xdoc", "changes": 2, "contents_url": "https://api.github.com/repos/RvonMassow/xDoc/contents/org.eclipse.xtext.xdoc.tests%2Ftestfiles%2FcommentTest.xdoc?ref=6b0eb897ce8abe5cda472a8e6af89cd62a47dd66", "deletions": 1, "filename": "org.eclipse.xtext.xdoc.tests/testfiles/commentTest.xdoc", "new_code": "chapter[Dummy title]", "new_methods": [], "old_code": "\\chapter[Dummy title]", "old_methods": [], "patch": "@@ -1,4 +1,4 @@\n-\\chapter[Dummy title]\n+chapter[Dummy title]\n \n %% comment\n some text", "raw_url": "https://github.com/RvonMassow/xDoc/raw/6b0eb897ce8abe5cda472a8e6af89cd62a47dd66/org.eclipse.xtext.xdoc.tests%2Ftestfiles%2FcommentTest.xdoc", "sha": "89fbcab98fe28bcdd856cb53cb169afd01998652", "status": "modified" }, { "additions": 2, "blob_url": "https://github.com/RvonMassow/xDoc/blob/6b0eb897ce8abe5cda472a8e6af89cd62a47dd66/org.eclipse.xtext.xdoc.tests%2Ftestfiles%2FimgTest.xdoc", "changes": 4, "contents_url": "https://api.github.com/repos/RvonMassow/xDoc/contents/org.eclipse.xtext.xdoc.tests%2Ftestfiles%2FimgTest.xdoc?ref=6b0eb897ce8abe5cda472a8e6af89cd62a47dd66", "deletions": 2, "filename": "org.eclipse.xtext.xdoc.tests/testfiles/imgTest.xdoc", "new_code": "chapter[Dummy title]\nimg:anchor[path][class=ImageClass][pdf=65%][caption=MyCaption bla mit ]]", "new_methods": [], "old_code": "\\chapter[Dummy title]\n\\img:anchor[path][class=ImageClass][pdf=65%][caption=MyCaption bla mit \\]]", "old_methods": [], "patch": "@@ -1,3 +1,3 @@\n-\\chapter[Dummy title]\n+chapter[Dummy title]\n \n-\\img:anchor[path][class=ImageClass][pdf=65%][caption=MyCaption bla mit \\]]\n+img:anchor[path][class=ImageClass][pdf=65%][caption=MyCaption bla mit ]]", "raw_url": "https://github.com/RvonMassow/xDoc/raw/6b0eb897ce8abe5cda472a8e6af89cd62a47dd66/org.eclipse.xtext.xdoc.tests%2Ftestfiles%2FimgTest.xdoc", "sha": "c586c381d411fb007a173d24be6344bbe900eb3c", "status": "modified" }, { "additions": 2, "blob_url": "https://github.com/RvonMassow/xDoc/blob/6b0eb897ce8abe5cda472a8e6af89cd62a47dd66/org.eclipse.xtext.xdoc.tests%2Ftestfiles%2FlinkTest.xdoc", "changes": 4, "contents_url": "https://api.github.com/repos/RvonMassow/xDoc/contents/org.eclipse.xtext.xdoc.tests%2Ftestfiles%2FlinkTest.xdoc?ref=6b0eb897ce8abe5cda472a8e6af89cd62a47dd66", "deletions": 2, "filename": "org.eclipse.xtext.xdoc.tests/testfiles/linkTest.xdoc", "new_code": "chapter[Dummy Title]\nlink[http://example.org][Example Link]", "new_methods": [], "old_code": "\\chapter[Dummy Title]\n\\link[http://example.org][Example Link]", "old_methods": [], "patch": "@@ -1,3 +1,3 @@\n-\\chapter[Dummy Title]\n+chapter[Dummy Title]\n \n-\\link[http://example.org][Example Link]\n+link[http://example.org][Example Link]", "raw_url": "https://github.com/RvonMassow/xDoc/raw/6b0eb897ce8abe5cda472a8e6af89cd62a47dd66/org.eclipse.xtext.xdoc.tests%2Ftestfiles%2FlinkTest.xdoc", "sha": "a90456cdc20c8290f58482ab81c726a459704ab1", "status": "modified" }, { "additions": 2, "blob_url": "https://github.com/RvonMassow/xDoc/blob/6b0eb897ce8abe5cda472a8e6af89cd62a47dd66/org.eclipse.xtext.xdoc.tests%2Ftestfiles%2FnamedRefAndTextTest.xdoc", "changes": 4, "contents_url": "https://api.github.com/repos/RvonMassow/xDoc/contents/org.eclipse.xtext.xdoc.tests%2Ftestfiles%2FnamedRefAndTextTest.xdoc?ref=6b0eb897ce8abe5cda472a8e6af89cd62a47dd66", "deletions": 2, "filename": "org.eclipse.xtext.xdoc.tests/testfiles/namedRefAndTextTest.xdoc", "new_code": "chapter:refName[Dummy Title]\nref:refName[a Chapter]", "new_methods": [], "old_code": "\\chapter:refName[Dummy Title]\n\\ref:refName[a Chapter]", "old_methods": [], "patch": "@@ -1,3 +1,3 @@\n-\\chapter:refName[Dummy Title]\n+chapter:refName[Dummy Title]\n \n-\\ref:refName[a Chapter]\n+ref:refName[a Chapter]", "raw_url": "https://github.com/RvonMassow/xDoc/raw/6b0eb897ce8abe5cda472a8e6af89cd62a47dd66/org.eclipse.xtext.xdoc.tests%2Ftestfiles%2FnamedRefAndTextTest.xdoc", "sha": "0e5445e2bdb1770d551504f4d342ce1fd6646c45", "status": "modified" }, { "additions": 5, "blob_url": "https://github.com/RvonMassow/xDoc/blob/6b0eb897ce8abe5cda472a8e6af89cd62a47dd66/org.eclipse.xtext.xdoc.tests%2Ftestfiles%2FnestedListTest.xdoc", "changes": 10, "contents_url": "https://api.github.com/repos/RvonMassow/xDoc/contents/org.eclipse.xtext.xdoc.tests%2Ftestfiles%2FnestedListTest.xdoc?ref=6b0eb897ce8abe5cda472a8e6af89cd62a47dd66", "deletions": 5, "filename": "org.eclipse.xtext.xdoc.tests/testfiles/nestedListTest.xdoc", "new_code": "chapter[Dummy title]\nul [\nitem[\nul[\nitem[some item]", "new_methods": [], "old_code": "\\chapter[Dummy title]\n\\ul [\n\\item[\n\\ul[\n\\item[some item]", "old_methods": [], "patch": "@@ -1,9 +1,9 @@\n-\\chapter[Dummy title]\n+chapter[Dummy title]\n \n-\\ul [\n-\\item[\n-\\ul[\n-\\item[some item]\n+ul [\n+item[\n+ul[\n+item[some item]\n ]\n ]\n ]", "raw_url": "https://github.com/RvonMassow/xDoc/raw/6b0eb897ce8abe5cda472a8e6af89cd62a47dd66/org.eclipse.xtext.xdoc.tests%2Ftestfiles%2FnestedListTest.xdoc", "sha": "618d1da09a3da181eec60de7c5fa84bf2bd303f2", "status": "modified" }, { "additions": 2, "blob_url": "https://github.com/RvonMassow/xDoc/blob/6b0eb897ce8abe5cda472a8e6af89cd62a47dd66/org.eclipse.xtext.xdoc.tests%2Ftestfiles%2FsimpleRefTest.xdoc", "changes": 4, "contents_url": "https://api.github.com/repos/RvonMassow/xDoc/contents/org.eclipse.xtext.xdoc.tests%2Ftestfiles%2FsimpleRefTest.xdoc?ref=6b0eb897ce8abe5cda472a8e6af89cd62a47dd66", "deletions": 2, "filename": "org.eclipse.xtext.xdoc.tests/testfiles/simpleRefTest.xdoc", "new_code": "chapter:refName[Dummy Title]\nThis is ref:refName[the Reference]", "new_methods": [], "old_code": "\\chapter:refName[Dummy Title]\nThis is \\ref:refName[the Reference]", "old_methods": [], "patch": "@@ -1,5 +1,5 @@\n-\\chapter:refName[Dummy Title]\n+chapter:refName[Dummy Title]\n \n-This is \\ref:refName[the Reference]\n+This is ref:refName[the Reference]\n \n ", "raw_url": "https://github.com/RvonMassow/xDoc/raw/6b0eb897ce8abe5cda472a8e6af89cd62a47dd66/org.eclipse.xtext.xdoc.tests%2Ftestfiles%2FsimpleRefTest.xdoc", "sha": "e37b500daeffb59224cb7c53013e56b9e3e8fd3b", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/RvonMassow/xDoc/blob/6b0eb897ce8abe5cda472a8e6af89cd62a47dd66/org.eclipse.xtext.xdoc.tests%2Ftestfiles%2FtestEscape.xdoc", "changes": 2, "contents_url": "https://api.github.com/repos/RvonMassow/xDoc/contents/org.eclipse.xtext.xdoc.tests%2Ftestfiles%2FtestEscape.xdoc?ref=6b0eb897ce8abe5cda472a8e6af89cd62a47dd66", "deletions": 1, "filename": "org.eclipse.xtext.xdoc.tests/testfiles/testEscape.xdoc", "new_code": "chapter[Dummy title]", "new_methods": [], "old_code": "\\chapter[Dummy title]", "old_methods": [], "patch": "@@ -1,3 +1,3 @@\n-\\chapter[Dummy title]\n+chapter[Dummy title]\n \n \\\\ \\[ \\]\n\\ No newline at end of file", "raw_url": "https://github.com/RvonMassow/xDoc/raw/6b0eb897ce8abe5cda472a8e6af89cd62a47dd66/org.eclipse.xtext.xdoc.tests%2Ftestfiles%2FtestEscape.xdoc", "sha": "086d84979030318e99937a27dea67b295a499c0f", "status": "modified" }, { "additions": 4, "blob_url": "https://github.com/RvonMassow/xDoc/blob/6b0eb897ce8abe5cda472a8e6af89cd62a47dd66/org.eclipse.xtext.xdoc.tests%2Ftestfiles%2FtwoChapters.xdoc", "changes": 8, "contents_url": "https://api.github.com/repos/RvonMassow/xDoc/contents/org.eclipse.xtext.xdoc.tests%2Ftestfiles%2FtwoChapters.xdoc?ref=6b0eb897ce8abe5cda472a8e6af89cd62a47dd66", "deletions": 4, "filename": "org.eclipse.xtext.xdoc.tests/testfiles/twoChapters.xdoc", "new_code": "chapter:id[Dummy Title]\nSome content a:anchor\nchapter[Dummy Title]\nMore content with ref to ref:id[the other chapter] and ref:anchor[an anchor]", "new_methods": [], "old_code": "\\chapter:id[Dummy Title]\nSome content \\a:anchor\n\\chapter[Dummy Title]\nMore content with ref to \\ref:id[the other chapter] and \\ref:anchor[an anchor]", "old_methods": [], "patch": "@@ -1,7 +1,7 @@\n-\\chapter:id[Dummy Title]\n+chapter:id[Dummy Title]\n \n-Some content \\a:anchor\n+Some content a:anchor\n \n-\\chapter[Dummy Title]\n+chapter[Dummy Title]\n \n-More content with ref to \\ref:id[the other chapter] and \\ref:anchor[an anchor]\n+More content with ref to ref:id[the other chapter] and ref:anchor[an anchor]", "raw_url": "https://github.com/RvonMassow/xDoc/raw/6b0eb897ce8abe5cda472a8e6af89cd62a47dd66/org.eclipse.xtext.xdoc.tests%2Ftestfiles%2FtwoChapters.xdoc", "sha": "33a5978126aea0246a4dabd1a4a6d0f1de2d360c", "status": "modified" }, { "additions": 4, "blob_url": "https://github.com/RvonMassow/xDoc/blob/6b0eb897ce8abe5cda472a8e6af89cd62a47dd66/org.eclipse.xtext.xdoc.tests%2Ftestfiles%2FulTest.xdoc", "changes": 8, "contents_url": "https://api.github.com/repos/RvonMassow/xDoc/contents/org.eclipse.xtext.xdoc.tests%2Ftestfiles%2FulTest.xdoc?ref=6b0eb897ce8abe5cda472a8e6af89cd62a47dd66", "deletions": 4, "filename": "org.eclipse.xtext.xdoc.tests/testfiles/ulTest.xdoc", "new_code": "chapter[Dummy Title]\nul[\nitem [An item]\nitem [A paragraph", "new_methods": [], "old_code": "\\chapter[Dummy Title]\n\\ul[\n\\item [An item]\n\\item [A paragraph", "old_methods": [], "patch": "@@ -1,8 +1,8 @@\n-\\chapter[Dummy Title]\n+chapter[Dummy Title]\n \n-\\ul[\n-\\item [An item]\n-\\item [A paragraph\n+ul[\n+item [An item]\n+item [A paragraph\n \n item]\n ]", "raw_url": "https://github.com/RvonMassow/xDoc/raw/6b0eb897ce8abe5cda472a8e6af89cd62a47dd66/org.eclipse.xtext.xdoc.tests%2Ftestfiles%2FulTest.xdoc", "sha": "2a197e0d46048ebbfd440b783855b028a49b6295", "status": "modified" }, { "additions": 26, "blob_url": "https://github.com/RvonMassow/xDoc/blob/6b0eb897ce8abe5cda472a8e6af89cd62a47dd66/org.eclipse.xtext.xdoc.ui%2Fbin%2Forg%2Feclipse%2Fxtext%2Fxdoc%2Fui%2Fcontentassist%2Fantlr%2Finternal%2FInternalXDoc.tokens", "changes": 46, "contents_url": "https://api.github.com/repos/RvonMassow/xDoc/contents/org.eclipse.xtext.xdoc.ui%2Fbin%2Forg%2Feclipse%2Fxtext%2Fxdoc%2Fui%2Fcontentassist%2Fantlr%2Finternal%2FInternalXDoc.tokens?ref=6b0eb897ce8abe5cda472a8e6af89cd62a47dd66", "deletions": 20, "filename": "org.eclipse.xtext.xdoc.ui/bin/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.tokens", "new_code": "'ref:'=28\n'section4:'=25\n'section4['=14\n'chapter:'=20\n']'=19\n'\\\\]'=16\n'code['=35\n'ol['=29\n'section['=11\n'img['=17\n'section3['=13\n'['=21\n'item['=31\n'codeRef['=32\n'img:'=34\n'emph['=26\n'ul['=30\n'subsection:'=23\n'section:'=22\n'a['=27\n'\\\\['=15\n'chapter['=10\n'section3:'=24\n':'=18\n'subsection['=12\n'link['=33", "new_methods": [], "old_code": "'\\\\link'=27\n'\\\\chapter'=13\n'\\\\ref'=22\n'\\\\item'=25\n'\\\\code'=29\n'\\\\subsection'=17\n'\\\\ul'=24\n'\\\\['=10\n']'=15\n'\\\\section4'=19\n'\\\\]'=11\n'\\\\section3'=18\n'\\\\img'=28\n'\\\\codeRef'=26\n':'=12\n'\\\\emph'=20\n'\\\\ol'=23\n'['=14\n'\\\\a'=21\n'\\\\section'=16", "old_methods": [], "patch": "@@ -4,23 +4,29 @@ RULE_MULTI_NL=8\n RULE_SINGLE_NL=6\n RULE_ANY_OTHER=7\n RULE_SL_COMMENT=9\n-'\\\\link'=27\n-'\\\\chapter'=13\n-'\\\\ref'=22\n-'\\\\item'=25\n-'\\\\code'=29\n-'\\\\subsection'=17\n-'\\\\ul'=24\n-'\\\\['=10\n-']'=15\n-'\\\\section4'=19\n-'\\\\]'=11\n-'\\\\section3'=18\n-'\\\\img'=28\n-'\\\\codeRef'=26\n-':'=12\n-'\\\\emph'=20\n-'\\\\ol'=23\n-'['=14\n-'\\\\a'=21\n-'\\\\section'=16\n+'ref:'=28\n+'section4:'=25\n+'section4['=14\n+'chapter:'=20\n+']'=19\n+'\\\\]'=16\n+'code['=35\n+'ol['=29\n+'section['=11\n+'img['=17\n+'section3['=13\n+'['=21\n+'item['=31\n+'codeRef['=32\n+'img:'=34\n+'emph['=26\n+'ul['=30\n+'subsection:'=23\n+'section:'=22\n+'a['=27\n+'\\\\['=15\n+'chapter['=10\n+'section3:'=24\n+':'=18\n+'subsection['=12\n+'link['=33", "raw_url": "https://github.com/RvonMassow/xDoc/raw/6b0eb897ce8abe5cda472a8e6af89cd62a47dd66/org.eclipse.xtext.xdoc.ui%2Fbin%2Forg%2Feclipse%2Fxtext%2Fxdoc%2Fui%2Fcontentassist%2Fantlr%2Finternal%2FInternalXDoc.tokens", "sha": "da99585b61babd2206bcfb6fed95f86ff39507e2", "status": "modified" }, { "additions": 33, "blob_url": "https://github.com/RvonMassow/xDoc/blob/6b0eb897ce8abe5cda472a8e6af89cd62a47dd66/org.eclipse.xtext.xdoc.ui%2Fbin%2Forg%2Feclipse%2Fxtext%2Fxdoc%2Fui%2Fcontentassist%2Fantlr%2Finternal%2FInternalXDoc__.g", "changes": 60, "contents_url": "https://api.github.com/repos/RvonMassow/xDoc/contents/org.eclipse.xtext.xdoc.ui%2Fbin%2Forg%2Feclipse%2Fxtext%2Fxdoc%2Fui%2Fcontentassist%2Fantlr%2Finternal%2FInternalXDoc__.g?ref=6b0eb897ce8abe5cda472a8e6af89cd62a47dd66", "deletions": 27, "filename": "org.eclipse.xtext.xdoc.ui/bin/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc__.g", "new_code": "T10 : 'chapter[' ;\nT11 : 'section[' ;\nT12 : 'subsection[' ;\nT13 : 'section3[' ;\nT14 : 'section4[' ;\nT15 : '\\\\[' ;\nT16 : '\\\\]' ;\nT17 : 'img[' ;\nT18 : ':' ;\nT19 : ']' ;\nT20 : 'chapter:' ;\nT21 : '[' ;\nT22 : 'section:' ;\nT23 : 'subsection:' ;\nT24 : 'section3:' ;\nT25 : 'section4:' ;\nT26 : 'emph[' ;\nT27 : 'a[' ;\nT28 : 'ref:' ;\nT29 : 'ol[' ;\nT30 : 'ul[' ;\nT31 : 'item[' ;\nT32 : 'codeRef[' ;\nT33 : 'link[' ;\nT34 : 'img:' ;\nT35 : 'code[' ;\n\n// $ANTLR src \"../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g\" 7089\n// $ANTLR src \"../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g\" 7091\n// $ANTLR src \"../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g\" 7093\n// $ANTLR src \"../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g\" 7095\n// $ANTLR src \"../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g\" 7097\n// $ANTLR src \"../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g\" 7099", "new_methods": [], "old_code": "T10 : '\\\\[' ;\nT11 : '\\\\]' ;\nT12 : ':' ;\nT13 : '\\\\chapter' ;\nT14 : '[' ;\nT15 : ']' ;\nT16 : '\\\\section' ;\nT17 : '\\\\subsection' ;\nT18 : '\\\\section3' ;\nT19 : '\\\\section4' ;\nT20 : '\\\\emph' ;\nT21 : '\\\\a' ;\nT22 : '\\\\ref' ;\nT23 : '\\\\ol' ;\nT24 : '\\\\ul' ;\nT25 : '\\\\item' ;\nT26 : '\\\\codeRef' ;\nT27 : '\\\\link' ;\nT28 : '\\\\img' ;\nT29 : '\\\\code' ;\n\n// $ANTLR src \"../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g\" 7728\n// $ANTLR src \"../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g\" 7730\n// $ANTLR src \"../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g\" 7732\n// $ANTLR src \"../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g\" 7734\n// $ANTLR src \"../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g\" 7736\n// $ANTLR src \"../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g\" 7738", "old_methods": [], "patch": "@@ -7,43 +7,49 @@ package org.eclipse.xtext.xdoc.ui.contentassist.antlr.internal;\n import org.eclipse.xtext.ui.editor.contentassist.antlr.internal.Lexer;\n }\n \n-T10 : '\\\\[' ;\n-T11 : '\\\\]' ;\n-T12 : ':' ;\n-T13 : '\\\\chapter' ;\n-T14 : '[' ;\n-T15 : ']' ;\n-T16 : '\\\\section' ;\n-T17 : '\\\\subsection' ;\n-T18 : '\\\\section3' ;\n-T19 : '\\\\section4' ;\n-T20 : '\\\\emph' ;\n-T21 : '\\\\a' ;\n-T22 : '\\\\ref' ;\n-T23 : '\\\\ol' ;\n-T24 : '\\\\ul' ;\n-T25 : '\\\\item' ;\n-T26 : '\\\\codeRef' ;\n-T27 : '\\\\link' ;\n-T28 : '\\\\img' ;\n-T29 : '\\\\code' ;\n-\n-// $ANTLR src \"../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g\" 7728\n+T10 : 'chapter[' ;\n+T11 : 'section[' ;\n+T12 : 'subsection[' ;\n+T13 : 'section3[' ;\n+T14 : 'section4[' ;\n+T15 : '\\\\[' ;\n+T16 : '\\\\]' ;\n+T17 : 'img[' ;\n+T18 : ':' ;\n+T19 : ']' ;\n+T20 : 'chapter:' ;\n+T21 : '[' ;\n+T22 : 'section:' ;\n+T23 : 'subsection:' ;\n+T24 : 'section3:' ;\n+T25 : 'section4:' ;\n+T26 : 'emph[' ;\n+T27 : 'a[' ;\n+T28 : 'ref:' ;\n+T29 : 'ol[' ;\n+T30 : 'ul[' ;\n+T31 : 'item[' ;\n+T32 : 'codeRef[' ;\n+T33 : 'link[' ;\n+T34 : 'img:' ;\n+T35 : 'code[' ;\n+\n+// $ANTLR src \"../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g\" 7089\n RULE_ID : ('a'..'z'|'A'..'Z'|'_') ('a'..'z'|'A'..'Z'|'_'|'0'..'9')*;\n \n-// $ANTLR src \"../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g\" 7730\n+// $ANTLR src \"../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g\" 7091\n RULE_SL_COMMENT : '%%' ~(('\\n'|'\\r'))* ('\\r'? '\\n')?;\n \n-// $ANTLR src \"../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g\" 7732\n+// $ANTLR src \"../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g\" 7093\n RULE_MULTI_NL : '\\r'? '\\n' ('\\r'? '\\n')+;\n \n-// $ANTLR src \"../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g\" 7734\n+// $ANTLR src \"../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g\" 7095\n RULE_SINGLE_NL : '\\r'? '\\n';\n \n-// $ANTLR src \"../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g\" 7736\n+// $ANTLR src \"../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g\" 7097\n RULE_WS : (' '|'\\t');\n \n-// $ANTLR src \"../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g\" 7738\n+// $ANTLR src \"../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g\" 7099\n RULE_ANY_OTHER : .;\n \n ", "raw_url": "https://github.com/RvonMassow/xDoc/raw/6b0eb897ce8abe5cda472a8e6af89cd62a47dd66/org.eclipse.xtext.xdoc.ui%2Fbin%2Forg%2Feclipse%2Fxtext%2Fxdoc%2Fui%2Fcontentassist%2Fantlr%2Finternal%2FInternalXDoc__.g", "sha": "03b175e5929573f20be2276921d83a0f1876a7d5", "status": "modified" }, { "additions": 70, "blob_url": "https://github.com/RvonMassow/xDoc/blob/6b0eb897ce8abe5cda472a8e6af89cd62a47dd66/org.eclipse.xtext.xdoc.ui%2Fsrc-gen%2Forg%2Feclipse%2Fxtext%2Fxdoc%2Fui%2Fcontentassist%2Fantlr%2FXDocParser.java", "changes": 135, "contents_url": "https://api.github.com/repos/RvonMassow/xDoc/contents/org.eclipse.xtext.xdoc.ui%2Fsrc-gen%2Forg%2Feclipse%2Fxtext%2Fxdoc%2Fui%2Fcontentassist%2Fantlr%2FXDocParser.java?ref=6b0eb897ce8abe5cda472a8e6af89cd62a47dd66", "deletions": 65, "filename": "org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/XDocParser.java", "new_code": "\t\t\t\t\tput(grammarAccess.getChapterAccess().getAlternatives_0(), \"rule__Chapter__Alternatives_0\");\n\t\t\t\t\tput(grammarAccess.getSectionAccess().getAlternatives_0(), \"rule__Section__Alternatives_0\");\n\t\t\t\t\tput(grammarAccess.getSubSectionAccess().getAlternatives_0(), \"rule__SubSection__Alternatives_0\");\n\t\t\t\t\tput(grammarAccess.getSection3Access().getAlternatives_0(), \"rule__Section3__Alternatives_0\");\n\t\t\t\t\tput(grammarAccess.getSection4Access().getAlternatives_0(), \"rule__Section4__Alternatives_0\");\n\t\t\t\t\tput(grammarAccess.getImageRefAccess().getAlternatives_0(), \"rule__ImageRef__Alternatives_0\");\n\t\t\t\t\tput(grammarAccess.getCodeBlockAccess().getAlternatives_2(), \"rule__CodeBlock__Alternatives_2\");\n\t\t\t\t\tput(grammarAccess.getChapterAccess().getGroup_0_0(), \"rule__Chapter__Group_0_0__0\");\n\t\t\t\t\tput(grammarAccess.getChapterAccess().getGroup_3(), \"rule__Chapter__Group_3__0\");\n\t\t\t\t\tput(grammarAccess.getChapterAccess().getGroup_4(), \"rule__Chapter__Group_4__0\");\n\t\t\t\t\tput(grammarAccess.getSectionAccess().getGroup_0_0(), \"rule__Section__Group_0_0__0\");\n\t\t\t\t\tput(grammarAccess.getSectionAccess().getGroup_3(), \"rule__Section__Group_3__0\");\n\t\t\t\t\tput(grammarAccess.getSectionAccess().getGroup_4(), \"rule__Section__Group_4__0\");\n\t\t\t\t\tput(grammarAccess.getSubSectionAccess().getGroup_0_0(), \"rule__SubSection__Group_0_0__0\");\n\t\t\t\t\tput(grammarAccess.getSubSectionAccess().getGroup_3(), \"rule__SubSection__Group_3__0\");\n\t\t\t\t\tput(grammarAccess.getSubSectionAccess().getGroup_4(), \"rule__SubSection__Group_4__0\");\n\t\t\t\t\tput(grammarAccess.getSection3Access().getGroup_0_0(), \"rule__Section3__Group_0_0__0\");\n\t\t\t\t\tput(grammarAccess.getSection3Access().getGroup_3(), \"rule__Section3__Group_3__0\");\n\t\t\t\t\tput(grammarAccess.getSection3Access().getGroup_4(), \"rule__Section3__Group_4__0\");\n\t\t\t\t\tput(grammarAccess.getSection4Access().getGroup_0_0(), \"rule__Section4__Group_0_0__0\");\n\t\t\t\t\tput(grammarAccess.getSection4Access().getGroup_3(), \"rule__Section4__Group_3__0\");\n\t\t\t\t\tput(grammarAccess.getOrderedListAccess().getGroup_1(), \"rule__OrderedList__Group_1__0\");\n\t\t\t\t\tput(grammarAccess.getUnorderedListAccess().getGroup_1(), \"rule__UnorderedList__Group_1__0\");\n\t\t\t\t\tput(grammarAccess.getItemAccess().getGroup_3(), \"rule__Item__Group_3__0\");\n\t\t\t\t\tput(grammarAccess.getImageRefAccess().getGroup_0_0(), \"rule__ImageRef__Group_0_0__0\");\n\t\t\t\t\tput(grammarAccess.getCodeBlockAccess().getGroup_1(), \"rule__CodeBlock__Group_1__0\");\n\t\t\t\t\tput(grammarAccess.getCodeBlockAccess().getGroup_2_0(), \"rule__CodeBlock__Group_2_0__0\");\n\t\t\t\t\tput(grammarAccess.getCodeBlockAccess().getGroup_2_0_1(), \"rule__CodeBlock__Group_2_0_1__0\");\n\t\t\t\t\tput(grammarAccess.getCodeBlockAccess().getGroup_2_1(), \"rule__CodeBlock__Group_2_1__0\");\n\t\t\t\t\tput(grammarAccess.getChapterAccess().getNameAssignment_0_0_1(), \"rule__Chapter__NameAssignment_0_0_1\");\n\t\t\t\t\tput(grammarAccess.getChapterAccess().getTitleAssignment_1(), \"rule__Chapter__TitleAssignment_1\");\n\t\t\t\t\tput(grammarAccess.getChapterAccess().getContentsAssignment_3_1(), \"rule__Chapter__ContentsAssignment_3_1\");\n\t\t\t\t\tput(grammarAccess.getChapterAccess().getContentsAssignment_4_1(), \"rule__Chapter__ContentsAssignment_4_1\");\n\t\t\t\t\tput(grammarAccess.getSectionAccess().getNameAssignment_0_0_1(), \"rule__Section__NameAssignment_0_0_1\");\n\t\t\t\t\tput(grammarAccess.getSectionAccess().getTitleAssignment_1(), \"rule__Section__TitleAssignment_1\");\n\t\t\t\t\tput(grammarAccess.getSectionAccess().getContentsAssignment_3_1(), \"rule__Section__ContentsAssignment_3_1\");\n\t\t\t\t\tput(grammarAccess.getSectionAccess().getContentsAssignment_4_1(), \"rule__Section__ContentsAssignment_4_1\");\n\t\t\t\t\tput(grammarAccess.getSubSectionAccess().getNameAssignment_0_0_1(), \"rule__SubSection__NameAssignment_0_0_1\");\n\t\t\t\t\tput(grammarAccess.getSubSectionAccess().getTitleAssignment_1(), \"rule__SubSection__TitleAssignment_1\");\n\t\t\t\t\tput(grammarAccess.getSubSectionAccess().getContentsAssignment_3_1(), \"rule__SubSection__ContentsAssignment_3_1\");\n\t\t\t\t\tput(grammarAccess.getSubSectionAccess().getContentsAssignment_4_1(), \"rule__SubSection__ContentsAssignment_4_1\");\n\t\t\t\t\tput(grammarAccess.getSection3Access().getNameAssignment_0_0_1(), \"rule__Section3__NameAssignment_0_0_1\");\n\t\t\t\t\tput(grammarAccess.getSection3Access().getTitleAssignment_1(), \"rule__Section3__TitleAssignment_1\");\n\t\t\t\t\tput(grammarAccess.getSection3Access().getContentsAssignment_3_1(), \"rule__Section3__ContentsAssignment_3_1\");\n\t\t\t\t\tput(grammarAccess.getSection3Access().getContentsAssignment_4_1(), \"rule__Section3__ContentsAssignment_4_1\");\n\t\t\t\t\tput(grammarAccess.getSection4Access().getNameAssignment_0_0_1(), \"rule__Section4__NameAssignment_0_0_1\");\n\t\t\t\t\tput(grammarAccess.getSection4Access().getTitleAssignment_1(), \"rule__Section4__TitleAssignment_1\");\n\t\t\t\t\tput(grammarAccess.getSection4Access().getContentsAssignment_3_1(), \"rule__Section4__ContentsAssignment_3_1\");\n\t\t\t\t\tput(grammarAccess.getEmphasizeAccess().getContentsAssignment_2(), \"rule__Emphasize__ContentsAssignment_2\");\n\t\t\t\t\tput(grammarAccess.getAnchorAccess().getNameAssignment_1(), \"rule__Anchor__NameAssignment_1\");\n\t\t\t\t\tput(grammarAccess.getRefAccess().getRefAssignment_1(), \"rule__Ref__RefAssignment_1\");\n\t\t\t\t\tput(grammarAccess.getRefAccess().getContentsAssignment_4(), \"rule__Ref__ContentsAssignment_4\");\n\t\t\t\t\tput(grammarAccess.getOrderedListAccess().getItemsAssignment_1_1(), \"rule__OrderedList__ItemsAssignment_1_1\");\n\t\t\t\t\tput(grammarAccess.getUnorderedListAccess().getItemsAssignment_1_1(), \"rule__UnorderedList__ItemsAssignment_1_1\");\n\t\t\t\t\tput(grammarAccess.getItemAccess().getContentsAssignment_2(), \"rule__Item__ContentsAssignment_2\");\n\t\t\t\t\tput(grammarAccess.getItemAccess().getContentsAssignment_3_1(), \"rule__Item__ContentsAssignment_3_1\");\n\t\t\t\t\tput(grammarAccess.getCodeRefAccess().getElementAssignment_1(), \"rule__CodeRef__ElementAssignment_1\");\n\t\t\t\t\tput(grammarAccess.getLinkAccess().getUrlAssignment_1(), \"rule__Link__UrlAssignment_1\");\n\t\t\t\t\tput(grammarAccess.getLinkAccess().getTextAssignment_5(), \"rule__Link__TextAssignment_5\");\n\t\t\t\t\tput(grammarAccess.getImageRefAccess().getNameAssignment_0_0_2(), \"rule__ImageRef__NameAssignment_0_0_2\");\n\t\t\t\t\tput(grammarAccess.getImageRefAccess().getPathAssignment_1(), \"rule__ImageRef__PathAssignment_1\");\n\t\t\t\t\tput(grammarAccess.getImageRefAccess().getClazzAssignment_5(), \"rule__ImageRef__ClazzAssignment_5\");\n\t\t\t\t\tput(grammarAccess.getImageRefAccess().getStyleAssignment_9(), \"rule__ImageRef__StyleAssignment_9\");\n\t\t\t\t\tput(grammarAccess.getImageRefAccess().getCaptionAssignment_13(), \"rule__ImageRef__CaptionAssignment_13\");\n\t\t\t\t\tput(grammarAccess.getCodeBlockAccess().getLanguageAssignment_1_1(), \"rule__CodeBlock__LanguageAssignment_1_1\");\n\t\t\t\t\tput(grammarAccess.getCodeBlockAccess().getContentsAssignment_2_0_0(), \"rule__CodeBlock__ContentsAssignment_2_0_0\");\n\t\t\t\t\tput(grammarAccess.getCodeBlockAccess().getContentsAssignment_2_0_1_0(), \"rule__CodeBlock__ContentsAssignment_2_0_1_0\");\n\t\t\t\t\tput(grammarAccess.getCodeBlockAccess().getContentsAssignment_2_0_1_1(), \"rule__CodeBlock__ContentsAssignment_2_0_1_1\");\n\t\t\t\t\tput(grammarAccess.getCodeBlockAccess().getContentsAssignment_2_1_0(), \"rule__CodeBlock__ContentsAssignment_2_1_0\");\n\t\t\t\t\tput(grammarAccess.getCodeBlockAccess().getContentsAssignment_2_1_1(), \"rule__CodeBlock__ContentsAssignment_2_1_1\");", "new_methods": [], "old_code": "\t\t\t\t\tput(grammarAccess.getCodeBlockAccess().getAlternatives_4(), \"rule__CodeBlock__Alternatives_4\");\n\t\t\t\t\tput(grammarAccess.getChapterAccess().getGroup_1(), \"rule__Chapter__Group_1__0\");\n\t\t\t\t\tput(grammarAccess.getChapterAccess().getGroup_5(), \"rule__Chapter__Group_5__0\");\n\t\t\t\t\tput(grammarAccess.getChapterAccess().getGroup_6(), \"rule__Chapter__Group_6__0\");\n\t\t\t\t\tput(grammarAccess.getSectionAccess().getGroup_1(), \"rule__Section__Group_1__0\");\n\t\t\t\t\tput(grammarAccess.getSectionAccess().getGroup_5(), \"rule__Section__Group_5__0\");\n\t\t\t\t\tput(grammarAccess.getSectionAccess().getGroup_6(), \"rule__Section__Group_6__0\");\n\t\t\t\t\tput(grammarAccess.getSubSectionAccess().getGroup_1(), \"rule__SubSection__Group_1__0\");\n\t\t\t\t\tput(grammarAccess.getSubSectionAccess().getGroup_5(), \"rule__SubSection__Group_5__0\");\n\t\t\t\t\tput(grammarAccess.getSubSectionAccess().getGroup_6(), \"rule__SubSection__Group_6__0\");\n\t\t\t\t\tput(grammarAccess.getSection3Access().getGroup_1(), \"rule__Section3__Group_1__0\");\n\t\t\t\t\tput(grammarAccess.getSection3Access().getGroup_5(), \"rule__Section3__Group_5__0\");\n\t\t\t\t\tput(grammarAccess.getSection3Access().getGroup_6(), \"rule__Section3__Group_6__0\");\n\t\t\t\t\tput(grammarAccess.getSection4Access().getGroup_1(), \"rule__Section4__Group_1__0\");\n\t\t\t\t\tput(grammarAccess.getSection4Access().getGroup_5(), \"rule__Section4__Group_5__0\");\n\t\t\t\t\tput(grammarAccess.getAnchorAccess().getGroup_3(), \"rule__Anchor__Group_3__0\");\n\t\t\t\t\tput(grammarAccess.getOrderedListAccess().getGroup_3(), \"rule__OrderedList__Group_3__0\");\n\t\t\t\t\tput(grammarAccess.getUnorderedListAccess().getGroup_3(), \"rule__UnorderedList__Group_3__0\");\n\t\t\t\t\tput(grammarAccess.getItemAccess().getGroup_5(), \"rule__Item__Group_5__0\");\n\t\t\t\t\tput(grammarAccess.getImageRefAccess().getGroup_2(), \"rule__ImageRef__Group_2__0\");\n\t\t\t\t\tput(grammarAccess.getCodeBlockAccess().getGroup_2(), \"rule__CodeBlock__Group_2__0\");\n\t\t\t\t\tput(grammarAccess.getCodeBlockAccess().getGroup_4_0(), \"rule__CodeBlock__Group_4_0__0\");\n\t\t\t\t\tput(grammarAccess.getCodeBlockAccess().getGroup_4_0_1(), \"rule__CodeBlock__Group_4_0_1__0\");\n\t\t\t\t\tput(grammarAccess.getCodeBlockAccess().getGroup_4_1(), \"rule__CodeBlock__Group_4_1__0\");\n\t\t\t\t\tput(grammarAccess.getChapterAccess().getNameAssignment_1_1(), \"rule__Chapter__NameAssignment_1_1\");\n\t\t\t\t\tput(grammarAccess.getChapterAccess().getTitleAssignment_3(), \"rule__Chapter__TitleAssignment_3\");\n\t\t\t\t\tput(grammarAccess.getChapterAccess().getContentsAssignment_5_1(), \"rule__Chapter__ContentsAssignment_5_1\");\n\t\t\t\t\tput(grammarAccess.getChapterAccess().getContentsAssignment_6_1(), \"rule__Chapter__ContentsAssignment_6_1\");\n\t\t\t\t\tput(grammarAccess.getSectionAccess().getNameAssignment_1_1(), \"rule__Section__NameAssignment_1_1\");\n\t\t\t\t\tput(grammarAccess.getSectionAccess().getTitleAssignment_3(), \"rule__Section__TitleAssignment_3\");\n\t\t\t\t\tput(grammarAccess.getSectionAccess().getContentsAssignment_5_1(), \"rule__Section__ContentsAssignment_5_1\");\n\t\t\t\t\tput(grammarAccess.getSectionAccess().getContentsAssignment_6_1(), \"rule__Section__ContentsAssignment_6_1\");\n\t\t\t\t\tput(grammarAccess.getSubSectionAccess().getNameAssignment_1_1(), \"rule__SubSection__NameAssignment_1_1\");\n\t\t\t\t\tput(grammarAccess.getSubSectionAccess().getTitleAssignment_3(), \"rule__SubSection__TitleAssignment_3\");\n\t\t\t\t\tput(grammarAccess.getSubSectionAccess().getContentsAssignment_5_1(), \"rule__SubSection__ContentsAssignment_5_1\");\n\t\t\t\t\tput(grammarAccess.getSubSectionAccess().getContentsAssignment_6_1(), \"rule__SubSection__ContentsAssignment_6_1\");\n\t\t\t\t\tput(grammarAccess.getSection3Access().getNameAssignment_1_1(), \"rule__Section3__NameAssignment_1_1\");\n\t\t\t\t\tput(grammarAccess.getSection3Access().getTitleAssignment_3(), \"rule__Section3__TitleAssignment_3\");\n\t\t\t\t\tput(grammarAccess.getSection3Access().getContentsAssignment_5_1(), \"rule__Section3__ContentsAssignment_5_1\");\n\t\t\t\t\tput(grammarAccess.getSection3Access().getContentsAssignment_6_1(), \"rule__Section3__ContentsAssignment_6_1\");\n\t\t\t\t\tput(grammarAccess.getSection4Access().getNameAssignment_1_1(), \"rule__Section4__NameAssignment_1_1\");\n\t\t\t\t\tput(grammarAccess.getSection4Access().getTitleAssignment_3(), \"rule__Section4__TitleAssignment_3\");\n\t\t\t\t\tput(grammarAccess.getSection4Access().getContentsAssignment_5_1(), \"rule__Section4__ContentsAssignment_5_1\");\n\t\t\t\t\tput(grammarAccess.getEmphasizeAccess().getContentsAssignment_3(), \"rule__Emphasize__ContentsAssignment_3\");\n\t\t\t\t\tput(grammarAccess.getAnchorAccess().getNameAssignment_2(), \"rule__Anchor__NameAssignment_2\");\n\t\t\t\t\tput(grammarAccess.getRefAccess().getRefAssignment_2(), \"rule__Ref__RefAssignment_2\");\n\t\t\t\t\tput(grammarAccess.getRefAccess().getContentsAssignment_5(), \"rule__Ref__ContentsAssignment_5\");\n\t\t\t\t\tput(grammarAccess.getOrderedListAccess().getItemsAssignment_3_1(), \"rule__OrderedList__ItemsAssignment_3_1\");\n\t\t\t\t\tput(grammarAccess.getUnorderedListAccess().getItemsAssignment_3_1(), \"rule__UnorderedList__ItemsAssignment_3_1\");\n\t\t\t\t\tput(grammarAccess.getItemAccess().getContentsAssignment_4(), \"rule__Item__ContentsAssignment_4\");\n\t\t\t\t\tput(grammarAccess.getItemAccess().getContentsAssignment_5_1(), \"rule__Item__ContentsAssignment_5_1\");\n\t\t\t\t\tput(grammarAccess.getCodeRefAccess().getElementAssignment_3(), \"rule__CodeRef__ElementAssignment_3\");\n\t\t\t\t\tput(grammarAccess.getLinkAccess().getUrlAssignment_3(), \"rule__Link__UrlAssignment_3\");\n\t\t\t\t\tput(grammarAccess.getLinkAccess().getTextAssignment_7(), \"rule__Link__TextAssignment_7\");\n\t\t\t\t\tput(grammarAccess.getImageRefAccess().getNameAssignment_2_2(), \"rule__ImageRef__NameAssignment_2_2\");\n\t\t\t\t\tput(grammarAccess.getImageRefAccess().getPathAssignment_4(), \"rule__ImageRef__PathAssignment_4\");\n\t\t\t\t\tput(grammarAccess.getImageRefAccess().getClazzAssignment_8(), \"rule__ImageRef__ClazzAssignment_8\");\n\t\t\t\t\tput(grammarAccess.getImageRefAccess().getStyleAssignment_12(), \"rule__ImageRef__StyleAssignment_12\");\n\t\t\t\t\tput(grammarAccess.getImageRefAccess().getCaptionAssignment_16(), \"rule__ImageRef__CaptionAssignment_16\");\n\t\t\t\t\tput(grammarAccess.getCodeBlockAccess().getLanguageAssignment_2_2(), \"rule__CodeBlock__LanguageAssignment_2_2\");\n\t\t\t\t\tput(grammarAccess.getCodeBlockAccess().getContentsAssignment_4_0_0(), \"rule__CodeBlock__ContentsAssignment_4_0_0\");\n\t\t\t\t\tput(grammarAccess.getCodeBlockAccess().getContentsAssignment_4_0_1_0(), \"rule__CodeBlock__ContentsAssignment_4_0_1_0\");\n\t\t\t\t\tput(grammarAccess.getCodeBlockAccess().getContentsAssignment_4_0_1_1(), \"rule__CodeBlock__ContentsAssignment_4_0_1_1\");\n\t\t\t\t\tput(grammarAccess.getCodeBlockAccess().getContentsAssignment_4_1_0(), \"rule__CodeBlock__ContentsAssignment_4_1_0\");\n\t\t\t\t\tput(grammarAccess.getCodeBlockAccess().getContentsAssignment_4_1_1(), \"rule__CodeBlock__ContentsAssignment_4_1_1\");", "old_methods": [], "patch": "@@ -38,11 +38,17 @@ protected String getRuleName(AbstractElement element) {\n \t\t\t\tprivate static final long serialVersionUID = 1L;\n \t\t\t\t{\n \t\t\t\t\tput(grammarAccess.getDocumentAccess().getAlternatives_3_0(), \"rule__Document__Alternatives_3_0\");\n+\t\t\t\t\tput(grammarAccess.getChapterAccess().getAlternatives_0(), \"rule__Chapter__Alternatives_0\");\n+\t\t\t\t\tput(grammarAccess.getSectionAccess().getAlternatives_0(), \"rule__Section__Alternatives_0\");\n+\t\t\t\t\tput(grammarAccess.getSubSectionAccess().getAlternatives_0(), \"rule__SubSection__Alternatives_0\");\n+\t\t\t\t\tput(grammarAccess.getSection3Access().getAlternatives_0(), \"rule__Section3__Alternatives_0\");\n+\t\t\t\t\tput(grammarAccess.getSection4Access().getAlternatives_0(), \"rule__Section4__Alternatives_0\");\n \t\t\t\t\tput(grammarAccess.getIdentifiableAccess().getAlternatives(), \"rule__Identifiable__Alternatives\");\n \t\t\t\t\tput(grammarAccess.getTextOrMarkupAccess().getAlternatives(), \"rule__TextOrMarkup__Alternatives\");\n \t\t\t\t\tput(grammarAccess.getTextAccess().getAlternatives(), \"rule__Text__Alternatives\");\n \t\t\t\t\tput(grammarAccess.getMarkUpAccess().getAlternatives(), \"rule__MarkUp__Alternatives\");\n-\t\t\t\t\tput(grammarAccess.getCodeBlockAccess().getAlternatives_4(), \"rule__CodeBlock__Alternatives_4\");\n+\t\t\t\t\tput(grammarAccess.getImageRefAccess().getAlternatives_0(), \"rule__ImageRef__Alternatives_0\");\n+\t\t\t\t\tput(grammarAccess.getCodeBlockAccess().getAlternatives_2(), \"rule__CodeBlock__Alternatives_2\");\n \t\t\t\t\tput(grammarAccess.getMarkupInCodeAccess().getAlternatives(), \"rule__MarkupInCode__Alternatives\");\n \t\t\t\t\tput(grammarAccess.getCodeTextAccess().getAlternatives(), \"rule__CodeText__Alternatives\");\n \t\t\t\t\tput(grammarAccess.getANY_WSAccess().getAlternatives(), \"rule__ANY_WS__Alternatives\");\n@@ -55,99 +61,98 @@ protected String getRuleName(AbstractElement element) {\n \t\t\t\t\tput(grammarAccess.getDocumentAccess().getGroup_3_0_2(), \"rule__Document__Group_3_0_2__0\");\n \t\t\t\t\tput(grammarAccess.getDocumentAccess().getGroup_3_0_2_1(), \"rule__Document__Group_3_0_2_1__0\");\n \t\t\t\t\tput(grammarAccess.getChapterAccess().getGroup(), \"rule__Chapter__Group__0\");\n-\t\t\t\t\tput(grammarAccess.getChapterAccess().getGroup_1(), \"rule__Chapter__Group_1__0\");\n-\t\t\t\t\tput(grammarAccess.getChapterAccess().getGroup_5(), \"rule__Chapter__Group_5__0\");\n-\t\t\t\t\tput(grammarAccess.getChapterAccess().getGroup_6(), \"rule__Chapter__Group_6__0\");\n+\t\t\t\t\tput(grammarAccess.getChapterAccess().getGroup_0_0(), \"rule__Chapter__Group_0_0__0\");\n+\t\t\t\t\tput(grammarAccess.getChapterAccess().getGroup_3(), \"rule__Chapter__Group_3__0\");\n+\t\t\t\t\tput(grammarAccess.getChapterAccess().getGroup_4(), \"rule__Chapter__Group_4__0\");\n \t\t\t\t\tput(grammarAccess.getSectionAccess().getGroup(), \"rule__Section__Group__0\");\n-\t\t\t\t\tput(grammarAccess.getSectionAccess().getGroup_1(), \"rule__Section__Group_1__0\");\n-\t\t\t\t\tput(grammarAccess.getSectionAccess().getGroup_5(), \"rule__Section__Group_5__0\");\n-\t\t\t\t\tput(grammarAccess.getSectionAccess().getGroup_6(), \"rule__Section__Group_6__0\");\n+\t\t\t\t\tput(grammarAccess.getSectionAccess().getGroup_0_0(), \"rule__Section__Group_0_0__0\");\n+\t\t\t\t\tput(grammarAccess.getSectionAccess().getGroup_3(), \"rule__Section__Group_3__0\");\n+\t\t\t\t\tput(grammarAccess.getSectionAccess().getGroup_4(), \"rule__Section__Group_4__0\");\n \t\t\t\t\tput(grammarAccess.getSubSectionAccess().getGroup(), \"rule__SubSection__Group__0\");\n-\t\t\t\t\tput(grammarAccess.getSubSectionAccess().getGroup_1(), \"rule__SubSection__Group_1__0\");\n-\t\t\t\t\tput(grammarAccess.getSubSectionAccess().getGroup_5(), \"rule__SubSection__Group_5__0\");\n-\t\t\t\t\tput(grammarAccess.getSubSectionAccess().getGroup_6(), \"rule__SubSection__Group_6__0\");\n+\t\t\t\t\tput(grammarAccess.getSubSectionAccess().getGroup_0_0(), \"rule__SubSection__Group_0_0__0\");\n+\t\t\t\t\tput(grammarAccess.getSubSectionAccess().getGroup_3(), \"rule__SubSection__Group_3__0\");\n+\t\t\t\t\tput(grammarAccess.getSubSectionAccess().getGroup_4(), \"rule__SubSection__Group_4__0\");\n \t\t\t\t\tput(grammarAccess.getSection3Access().getGroup(), \"rule__Section3__Group__0\");\n-\t\t\t\t\tput(grammarAccess.getSection3Access().getGroup_1(), \"rule__Section3__Group_1__0\");\n-\t\t\t\t\tput(grammarAccess.getSection3Access().getGroup_5(), \"rule__Section3__Group_5__0\");\n-\t\t\t\t\tput(grammarAccess.getSection3Access().getGroup_6(), \"rule__Section3__Group_6__0\");\n+\t\t\t\t\tput(grammarAccess.getSection3Access().getGroup_0_0(), \"rule__Section3__Group_0_0__0\");\n+\t\t\t\t\tput(grammarAccess.getSection3Access().getGroup_3(), \"rule__Section3__Group_3__0\");\n+\t\t\t\t\tput(grammarAccess.getSection3Access().getGroup_4(), \"rule__Section3__Group_4__0\");\n \t\t\t\t\tput(grammarAccess.getSection4Access().getGroup(), \"rule__Section4__Group__0\");\n-\t\t\t\t\tput(grammarAccess.getSection4Access().getGroup_1(), \"rule__Section4__Group_1__0\");\n-\t\t\t\t\tput(grammarAccess.getSection4Access().getGroup_5(), \"rule__Section4__Group_5__0\");\n+\t\t\t\t\tput(grammarAccess.getSection4Access().getGroup_0_0(), \"rule__Section4__Group_0_0__0\");\n+\t\t\t\t\tput(grammarAccess.getSection4Access().getGroup_3(), \"rule__Section4__Group_3__0\");\n \t\t\t\t\tput(grammarAccess.getTextOrMarkupAccess().getGroup_0(), \"rule__TextOrMarkup__Group_0__0\");\n \t\t\t\t\tput(grammarAccess.getTextOrMarkupAccess().getGroup_0_1(), \"rule__TextOrMarkup__Group_0_1__0\");\n \t\t\t\t\tput(grammarAccess.getTextOrMarkupAccess().getGroup_1(), \"rule__TextOrMarkup__Group_1__0\");\n \t\t\t\t\tput(grammarAccess.getEmphasizeAccess().getGroup(), \"rule__Emphasize__Group__0\");\n \t\t\t\t\tput(grammarAccess.getAnchorAccess().getGroup(), \"rule__Anchor__Group__0\");\n-\t\t\t\t\tput(grammarAccess.getAnchorAccess().getGroup_3(), \"rule__Anchor__Group_3__0\");\n \t\t\t\t\tput(grammarAccess.getRefAccess().getGroup(), \"rule__Ref__Group__0\");\n \t\t\t\t\tput(grammarAccess.getOrderedListAccess().getGroup(), \"rule__OrderedList__Group__0\");\n-\t\t\t\t\tput(grammarAccess.getOrderedListAccess().getGroup_3(), \"rule__OrderedList__Group_3__0\");\n+\t\t\t\t\tput(grammarAccess.getOrderedListAccess().getGroup_1(), \"rule__OrderedList__Group_1__0\");\n \t\t\t\t\tput(grammarAccess.getUnorderedListAccess().getGroup(), \"rule__UnorderedList__Group__0\");\n-\t\t\t\t\tput(grammarAccess.getUnorderedListAccess().getGroup_3(), \"rule__UnorderedList__Group_3__0\");\n+\t\t\t\t\tput(grammarAccess.getUnorderedListAccess().getGroup_1(), \"rule__UnorderedList__Group_1__0\");\n \t\t\t\t\tput(grammarAccess.getItemAccess().getGroup(), \"rule__Item__Group__0\");\n-\t\t\t\t\tput(grammarAccess.getItemAccess().getGroup_5(), \"rule__Item__Group_5__0\");\n+\t\t\t\t\tput(grammarAccess.getItemAccess().getGroup_3(), \"rule__Item__Group_3__0\");\n \t\t\t\t\tput(grammarAccess.getCodeRefAccess().getGroup(), \"rule__CodeRef__Group__0\");\n \t\t\t\t\tput(grammarAccess.getLinkAccess().getGroup(), \"rule__Link__Group__0\");\n \t\t\t\t\tput(grammarAccess.getImageRefAccess().getGroup(), \"rule__ImageRef__Group__0\");\n-\t\t\t\t\tput(grammarAccess.getImageRefAccess().getGroup_2(), \"rule__ImageRef__Group_2__0\");\n+\t\t\t\t\tput(grammarAccess.getImageRefAccess().getGroup_0_0(), \"rule__ImageRef__Group_0_0__0\");\n \t\t\t\t\tput(grammarAccess.getCodeBlockAccess().getGroup(), \"rule__CodeBlock__Group__0\");\n-\t\t\t\t\tput(grammarAccess.getCodeBlockAccess().getGroup_2(), \"rule__CodeBlock__Group_2__0\");\n-\t\t\t\t\tput(grammarAccess.getCodeBlockAccess().getGroup_4_0(), \"rule__CodeBlock__Group_4_0__0\");\n-\t\t\t\t\tput(grammarAccess.getCodeBlockAccess().getGroup_4_0_1(), \"rule__CodeBlock__Group_4_0_1__0\");\n-\t\t\t\t\tput(grammarAccess.getCodeBlockAccess().getGroup_4_1(), \"rule__CodeBlock__Group_4_1__0\");\n+\t\t\t\t\tput(grammarAccess.getCodeBlockAccess().getGroup_1(), \"rule__CodeBlock__Group_1__0\");\n+\t\t\t\t\tput(grammarAccess.getCodeBlockAccess().getGroup_2_0(), \"rule__CodeBlock__Group_2_0__0\");\n+\t\t\t\t\tput(grammarAccess.getCodeBlockAccess().getGroup_2_0_1(), \"rule__CodeBlock__Group_2_0_1__0\");\n+\t\t\t\t\tput(grammarAccess.getCodeBlockAccess().getGroup_2_1(), \"rule__CodeBlock__Group_2_1__0\");\n \t\t\t\t\tput(grammarAccess.getDocumentAccess().getChaptersAssignment_3_0_0_0(), \"rule__Document__ChaptersAssignment_3_0_0_0\");\n \t\t\t\t\tput(grammarAccess.getDocumentAccess().getChaptersAssignment_3_0_0_1_1(), \"rule__Document__ChaptersAssignment_3_0_0_1_1\");\n \t\t\t\t\tput(grammarAccess.getDocumentAccess().getSectionsAssignment_3_0_1_0(), \"rule__Document__SectionsAssignment_3_0_1_0\");\n \t\t\t\t\tput(grammarAccess.getDocumentAccess().getSectionsAssignment_3_0_1_1_1(), \"rule__Document__SectionsAssignment_3_0_1_1_1\");\n \t\t\t\t\tput(grammarAccess.getDocumentAccess().getSubsectionsAssignment_3_0_2_0(), \"rule__Document__SubsectionsAssignment_3_0_2_0\");\n \t\t\t\t\tput(grammarAccess.getDocumentAccess().getSubsectionsAssignment_3_0_2_1_1(), \"rule__Document__SubsectionsAssignment_3_0_2_1_1\");\n-\t\t\t\t\tput(grammarAccess.getChapterAccess().getNameAssignment_1_1(), \"rule__Chapter__NameAssignment_1_1\");\n-\t\t\t\t\tput(grammarAccess.getChapterAccess().getTitleAssignment_3(), \"rule__Chapter__TitleAssignment_3\");\n-\t\t\t\t\tput(grammarAccess.getChapterAccess().getContentsAssignment_5_1(), \"rule__Chapter__ContentsAssignment_5_1\");\n-\t\t\t\t\tput(grammarAccess.getChapterAccess().getContentsAssignment_6_1(), \"rule__Chapter__ContentsAssignment_6_1\");\n-\t\t\t\t\tput(grammarAccess.getSectionAccess().getNameAssignment_1_1(), \"rule__Section__NameAssignment_1_1\");\n-\t\t\t\t\tput(grammarAccess.getSectionAccess().getTitleAssignment_3(), \"rule__Section__TitleAssignment_3\");\n-\t\t\t\t\tput(grammarAccess.getSectionAccess().getContentsAssignment_5_1(), \"rule__Section__ContentsAssignment_5_1\");\n-\t\t\t\t\tput(grammarAccess.getSectionAccess().getContentsAssignment_6_1(), \"rule__Section__ContentsAssignment_6_1\");\n-\t\t\t\t\tput(grammarAccess.getSubSectionAccess().getNameAssignment_1_1(), \"rule__SubSection__NameAssignment_1_1\");\n-\t\t\t\t\tput(grammarAccess.getSubSectionAccess().getTitleAssignment_3(), \"rule__SubSection__TitleAssignment_3\");\n-\t\t\t\t\tput(grammarAccess.getSubSectionAccess().getContentsAssignment_5_1(), \"rule__SubSection__ContentsAssignment_5_1\");\n-\t\t\t\t\tput(grammarAccess.getSubSectionAccess().getContentsAssignment_6_1(), \"rule__SubSection__ContentsAssignment_6_1\");\n-\t\t\t\t\tput(grammarAccess.getSection3Access().getNameAssignment_1_1(), \"rule__Section3__NameAssignment_1_1\");\n-\t\t\t\t\tput(grammarAccess.getSection3Access().getTitleAssignment_3(), \"rule__Section3__TitleAssignment_3\");\n-\t\t\t\t\tput(grammarAccess.getSection3Access().getContentsAssignment_5_1(), \"rule__Section3__ContentsAssignment_5_1\");\n-\t\t\t\t\tput(grammarAccess.getSection3Access().getContentsAssignment_6_1(), \"rule__Section3__ContentsAssignment_6_1\");\n-\t\t\t\t\tput(grammarAccess.getSection4Access().getNameAssignment_1_1(), \"rule__Section4__NameAssignment_1_1\");\n-\t\t\t\t\tput(grammarAccess.getSection4Access().getTitleAssignment_3(), \"rule__Section4__TitleAssignment_3\");\n-\t\t\t\t\tput(grammarAccess.getSection4Access().getContentsAssignment_5_1(), \"rule__Section4__ContentsAssignment_5_1\");\n+\t\t\t\t\tput(grammarAccess.getChapterAccess().getNameAssignment_0_0_1(), \"rule__Chapter__NameAssignment_0_0_1\");\n+\t\t\t\t\tput(grammarAccess.getChapterAccess().getTitleAssignment_1(), \"rule__Chapter__TitleAssignment_1\");\n+\t\t\t\t\tput(grammarAccess.getChapterAccess().getContentsAssignment_3_1(), \"rule__Chapter__ContentsAssignment_3_1\");\n+\t\t\t\t\tput(grammarAccess.getChapterAccess().getContentsAssignment_4_1(), \"rule__Chapter__ContentsAssignment_4_1\");\n+\t\t\t\t\tput(grammarAccess.getSectionAccess().getNameAssignment_0_0_1(), \"rule__Section__NameAssignment_0_0_1\");\n+\t\t\t\t\tput(grammarAccess.getSectionAccess().getTitleAssignment_1(), \"rule__Section__TitleAssignment_1\");\n+\t\t\t\t\tput(grammarAccess.getSectionAccess().getContentsAssignment_3_1(), \"rule__Section__ContentsAssignment_3_1\");\n+\t\t\t\t\tput(grammarAccess.getSectionAccess().getContentsAssignment_4_1(), \"rule__Section__ContentsAssignment_4_1\");\n+\t\t\t\t\tput(grammarAccess.getSubSectionAccess().getNameAssignment_0_0_1(), \"rule__SubSection__NameAssignment_0_0_1\");\n+\t\t\t\t\tput(grammarAccess.getSubSectionAccess().getTitleAssignment_1(), \"rule__SubSection__TitleAssignment_1\");\n+\t\t\t\t\tput(grammarAccess.getSubSectionAccess().getContentsAssignment_3_1(), \"rule__SubSection__ContentsAssignment_3_1\");\n+\t\t\t\t\tput(grammarAccess.getSubSectionAccess().getContentsAssignment_4_1(), \"rule__SubSection__ContentsAssignment_4_1\");\n+\t\t\t\t\tput(grammarAccess.getSection3Access().getNameAssignment_0_0_1(), \"rule__Section3__NameAssignment_0_0_1\");\n+\t\t\t\t\tput(grammarAccess.getSection3Access().getTitleAssignment_1(), \"rule__Section3__TitleAssignment_1\");\n+\t\t\t\t\tput(grammarAccess.getSection3Access().getContentsAssignment_3_1(), \"rule__Section3__ContentsAssignment_3_1\");\n+\t\t\t\t\tput(grammarAccess.getSection3Access().getContentsAssignment_4_1(), \"rule__Section3__ContentsAssignment_4_1\");\n+\t\t\t\t\tput(grammarAccess.getSection4Access().getNameAssignment_0_0_1(), \"rule__Section4__NameAssignment_0_0_1\");\n+\t\t\t\t\tput(grammarAccess.getSection4Access().getTitleAssignment_1(), \"rule__Section4__TitleAssignment_1\");\n+\t\t\t\t\tput(grammarAccess.getSection4Access().getContentsAssignment_3_1(), \"rule__Section4__ContentsAssignment_3_1\");\n \t\t\t\t\tput(grammarAccess.getTextOrMarkupAccess().getContentsAssignment_0_0(), \"rule__TextOrMarkup__ContentsAssignment_0_0\");\n \t\t\t\t\tput(grammarAccess.getTextOrMarkupAccess().getContentsAssignment_0_1_0(), \"rule__TextOrMarkup__ContentsAssignment_0_1_0\");\n \t\t\t\t\tput(grammarAccess.getTextOrMarkupAccess().getContentsAssignment_0_1_1(), \"rule__TextOrMarkup__ContentsAssignment_0_1_1\");\n \t\t\t\t\tput(grammarAccess.getTextOrMarkupAccess().getContentsAssignment_1_0(), \"rule__TextOrMarkup__ContentsAssignment_1_0\");\n \t\t\t\t\tput(grammarAccess.getTextOrMarkupAccess().getContentsAssignment_1_1(), \"rule__TextOrMarkup__ContentsAssignment_1_1\");\n \t\t\t\t\tput(grammarAccess.getTextPartAccess().getTextAssignment(), \"rule__TextPart__TextAssignment\");\n-\t\t\t\t\tput(grammarAccess.getEmphasizeAccess().getContentsAssignment_3(), \"rule__Emphasize__ContentsAssignment_3\");\n-\t\t\t\t\tput(grammarAccess.getAnchorAccess().getNameAssignment_2(), \"rule__Anchor__NameAssignment_2\");\n-\t\t\t\t\tput(grammarAccess.getRefAccess().getRefAssignment_2(), \"rule__Ref__RefAssignment_2\");\n-\t\t\t\t\tput(grammarAccess.getRefAccess().getContentsAssignment_5(), \"rule__Ref__ContentsAssignment_5\");\n-\t\t\t\t\tput(grammarAccess.getOrderedListAccess().getItemsAssignment_3_1(), \"rule__OrderedList__ItemsAssignment_3_1\");\n-\t\t\t\t\tput(grammarAccess.getUnorderedListAccess().getItemsAssignment_3_1(), \"rule__UnorderedList__ItemsAssignment_3_1\");\n-\t\t\t\t\tput(grammarAccess.getItemAccess().getContentsAssignment_4(), \"rule__Item__ContentsAssignment_4\");\n-\t\t\t\t\tput(grammarAccess.getItemAccess().getContentsAssignment_5_1(), \"rule__Item__ContentsAssignment_5_1\");\n-\t\t\t\t\tput(grammarAccess.getCodeRefAccess().getElementAssignment_3(), \"rule__CodeRef__ElementAssignment_3\");\n-\t\t\t\t\tput(grammarAccess.getLinkAccess().getUrlAssignment_3(), \"rule__Link__UrlAssignment_3\");\n-\t\t\t\t\tput(grammarAccess.getLinkAccess().getTextAssignment_7(), \"rule__Link__TextAssignment_7\");\n-\t\t\t\t\tput(grammarAccess.getImageRefAccess().getNameAssignment_2_2(), \"rule__ImageRef__NameAssignment_2_2\");\n-\t\t\t\t\tput(grammarAccess.getImageRefAccess().getPathAssignment_4(), \"rule__ImageRef__PathAssignment_4\");\n-\t\t\t\t\tput(grammarAccess.getImageRefAccess().getClazzAssignment_8(), \"rule__ImageRef__ClazzAssignment_8\");\n-\t\t\t\t\tput(grammarAccess.getImageRefAccess().getStyleAssignment_12(), \"rule__ImageRef__StyleAssignment_12\");\n-\t\t\t\t\tput(grammarAccess.getImageRefAccess().getCaptionAssignment_16(), \"rule__ImageRef__CaptionAssignment_16\");\n-\t\t\t\t\tput(grammarAccess.getCodeBlockAccess().getLanguageAssignment_2_2(), \"rule__CodeBlock__LanguageAssignment_2_2\");\n-\t\t\t\t\tput(grammarAccess.getCodeBlockAccess().getContentsAssignment_4_0_0(), \"rule__CodeBlock__ContentsAssignment_4_0_0\");\n-\t\t\t\t\tput(grammarAccess.getCodeBlockAccess().getContentsAssignment_4_0_1_0(), \"rule__CodeBlock__ContentsAssignment_4_0_1_0\");\n-\t\t\t\t\tput(grammarAccess.getCodeBlockAccess().getContentsAssignment_4_0_1_1(), \"rule__CodeBlock__ContentsAssignment_4_0_1_1\");\n-\t\t\t\t\tput(grammarAccess.getCodeBlockAccess().getContentsAssignment_4_1_0(), \"rule__CodeBlock__ContentsAssignment_4_1_0\");\n-\t\t\t\t\tput(grammarAccess.getCodeBlockAccess().getContentsAssignment_4_1_1(), \"rule__CodeBlock__ContentsAssignment_4_1_1\");\n+\t\t\t\t\tput(grammarAccess.getEmphasizeAccess().getContentsAssignment_2(), \"rule__Emphasize__ContentsAssignment_2\");\n+\t\t\t\t\tput(grammarAccess.getAnchorAccess().getNameAssignment_1(), \"rule__Anchor__NameAssignment_1\");\n+\t\t\t\t\tput(grammarAccess.getRefAccess().getRefAssignment_1(), \"rule__Ref__RefAssignment_1\");\n+\t\t\t\t\tput(grammarAccess.getRefAccess().getContentsAssignment_4(), \"rule__Ref__ContentsAssignment_4\");\n+\t\t\t\t\tput(grammarAccess.getOrderedListAccess().getItemsAssignment_1_1(), \"rule__OrderedList__ItemsAssignment_1_1\");\n+\t\t\t\t\tput(grammarAccess.getUnorderedListAccess().getItemsAssignment_1_1(), \"rule__UnorderedList__ItemsAssignment_1_1\");\n+\t\t\t\t\tput(grammarAccess.getItemAccess().getContentsAssignment_2(), \"rule__Item__ContentsAssignment_2\");\n+\t\t\t\t\tput(grammarAccess.getItemAccess().getContentsAssignment_3_1(), \"rule__Item__ContentsAssignment_3_1\");\n+\t\t\t\t\tput(grammarAccess.getCodeRefAccess().getElementAssignment_1(), \"rule__CodeRef__ElementAssignment_1\");\n+\t\t\t\t\tput(grammarAccess.getLinkAccess().getUrlAssignment_1(), \"rule__Link__UrlAssignment_1\");\n+\t\t\t\t\tput(grammarAccess.getLinkAccess().getTextAssignment_5(), \"rule__Link__TextAssignment_5\");\n+\t\t\t\t\tput(grammarAccess.getImageRefAccess().getNameAssignment_0_0_2(), \"rule__ImageRef__NameAssignment_0_0_2\");\n+\t\t\t\t\tput(grammarAccess.getImageRefAccess().getPathAssignment_1(), \"rule__ImageRef__PathAssignment_1\");\n+\t\t\t\t\tput(grammarAccess.getImageRefAccess().getClazzAssignment_5(), \"rule__ImageRef__ClazzAssignment_5\");\n+\t\t\t\t\tput(grammarAccess.getImageRefAccess().getStyleAssignment_9(), \"rule__ImageRef__StyleAssignment_9\");\n+\t\t\t\t\tput(grammarAccess.getImageRefAccess().getCaptionAssignment_13(), \"rule__ImageRef__CaptionAssignment_13\");\n+\t\t\t\t\tput(grammarAccess.getCodeBlockAccess().getLanguageAssignment_1_1(), \"rule__CodeBlock__LanguageAssignment_1_1\");\n+\t\t\t\t\tput(grammarAccess.getCodeBlockAccess().getContentsAssignment_2_0_0(), \"rule__CodeBlock__ContentsAssignment_2_0_0\");\n+\t\t\t\t\tput(grammarAccess.getCodeBlockAccess().getContentsAssignment_2_0_1_0(), \"rule__CodeBlock__ContentsAssignment_2_0_1_0\");\n+\t\t\t\t\tput(grammarAccess.getCodeBlockAccess().getContentsAssignment_2_0_1_1(), \"rule__CodeBlock__ContentsAssignment_2_0_1_1\");\n+\t\t\t\t\tput(grammarAccess.getCodeBlockAccess().getContentsAssignment_2_1_0(), \"rule__CodeBlock__ContentsAssignment_2_1_0\");\n+\t\t\t\t\tput(grammarAccess.getCodeBlockAccess().getContentsAssignment_2_1_1(), \"rule__CodeBlock__ContentsAssignment_2_1_1\");\n \t\t\t\t\tput(grammarAccess.getCodeAccess().getContentsAssignment(), \"rule__Code__ContentsAssignment\");\n \t\t\t\t}\n \t\t\t};", "raw_url": "https://github.com/RvonMassow/xDoc/raw/6b0eb897ce8abe5cda472a8e6af89cd62a47dd66/org.eclipse.xtext.xdoc.ui%2Fsrc-gen%2Forg%2Feclipse%2Fxtext%2Fxdoc%2Fui%2Fcontentassist%2Fantlr%2FXDocParser.java", "sha": "aeaf915b0a57f455b4937e01d79d12aadf4639aa", "status": "modified" }, { "additions": 26, "blob_url": "https://github.com/RvonMassow/xDoc/blob/6b0eb897ce8abe5cda472a8e6af89cd62a47dd66/org.eclipse.xtext.xdoc.ui%2Fsrc-gen%2Forg%2Feclipse%2Fxtext%2Fxdoc%2Fui%2Fcontentassist%2Fantlr%2Finternal%2FInternalXDoc.tokens", "changes": 46, "contents_url": "https://api.github.com/repos/RvonMassow/xDoc/contents/org.eclipse.xtext.xdoc.ui%2Fsrc-gen%2Forg%2Feclipse%2Fxtext%2Fxdoc%2Fui%2Fcontentassist%2Fantlr%2Finternal%2FInternalXDoc.tokens?ref=6b0eb897ce8abe5cda472a8e6af89cd62a47dd66", "deletions": 20, "filename": "org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.tokens", "new_code": "'ref:'=28\n'section4:'=25\n'section4['=14\n'chapter:'=20\n']'=19\n'\\\\]'=16\n'code['=35\n'ol['=29\n'section['=11\n'img['=17\n'section3['=13\n'['=21\n'item['=31\n'codeRef['=32\n'img:'=34\n'emph['=26\n'ul['=30\n'subsection:'=23\n'section:'=22\n'a['=27\n'\\\\['=15\n'chapter['=10\n'section3:'=24\n':'=18\n'subsection['=12\n'link['=33", "new_methods": [], "old_code": "'\\\\link'=27\n'\\\\chapter'=13\n'\\\\ref'=22\n'\\\\item'=25\n'\\\\code'=29\n'\\\\subsection'=17\n'\\\\ul'=24\n'\\\\['=10\n']'=15\n'\\\\section4'=19\n'\\\\]'=11\n'\\\\section3'=18\n'\\\\img'=28\n'\\\\codeRef'=26\n':'=12\n'\\\\emph'=20\n'\\\\ol'=23\n'['=14\n'\\\\a'=21\n'\\\\section'=16", "old_methods": [], "patch": "@@ -4,23 +4,29 @@ RULE_MULTI_NL=8\n RULE_SINGLE_NL=6\n RULE_ANY_OTHER=7\n RULE_SL_COMMENT=9\n-'\\\\link'=27\n-'\\\\chapter'=13\n-'\\\\ref'=22\n-'\\\\item'=25\n-'\\\\code'=29\n-'\\\\subsection'=17\n-'\\\\ul'=24\n-'\\\\['=10\n-']'=15\n-'\\\\section4'=19\n-'\\\\]'=11\n-'\\\\section3'=18\n-'\\\\img'=28\n-'\\\\codeRef'=26\n-':'=12\n-'\\\\emph'=20\n-'\\\\ol'=23\n-'['=14\n-'\\\\a'=21\n-'\\\\section'=16\n+'ref:'=28\n+'section4:'=25\n+'section4['=14\n+'chapter:'=20\n+']'=19\n+'\\\\]'=16\n+'code['=35\n+'ol['=29\n+'section['=11\n+'img['=17\n+'section3['=13\n+'['=21\n+'item['=31\n+'codeRef['=32\n+'img:'=34\n+'emph['=26\n+'ul['=30\n+'subsection:'=23\n+'section:'=22\n+'a['=27\n+'\\\\['=15\n+'chapter['=10\n+'section3:'=24\n+':'=18\n+'subsection['=12\n+'link['=33", "raw_url": "https://github.com/RvonMassow/xDoc/raw/6b0eb897ce8abe5cda472a8e6af89cd62a47dd66/org.eclipse.xtext.xdoc.ui%2Fsrc-gen%2Forg%2Feclipse%2Fxtext%2Fxdoc%2Fui%2Fcontentassist%2Fantlr%2Finternal%2FInternalXDoc.tokens", "sha": "da99585b61babd2206bcfb6fed95f86ff39507e2", "status": "modified" }, { "additions": 662, "blob_url": "https://github.com/RvonMassow/xDoc/blob/6b0eb897ce8abe5cda472a8e6af89cd62a47dd66/org.eclipse.xtext.xdoc.ui%2Fsrc-gen%2Forg%2Feclipse%2Fxtext%2Fxdoc%2Fui%2Fcontentassist%2Fantlr%2Finternal%2FInternalXDocLexer.java", "changes": 910, "contents_url": "https://api.github.com/repos/RvonMassow/xDoc/contents/org.eclipse.xtext.xdoc.ui%2Fsrc-gen%2Forg%2Feclipse%2Fxtext%2Fxdoc%2Fui%2Fcontentassist%2Fantlr%2Finternal%2FInternalXDocLexer.java?ref=6b0eb897ce8abe5cda472a8e6af89cd62a47dd66", "deletions": 248, "filename": "org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDocLexer.java", "new_code": " public static final int T33=33;\n public static final int T35=35;\n public static final int T34=34;\n public static final int T32=32;\n public static final int Tokens=36;\n public static final int T31=31;\n public static final int T30=30;\n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:10:5: ( 'chapter[' )\n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:10:7: 'chapter['\n match(\"chapter[\"); \n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:11:5: ( 'section[' )\n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:11:7: 'section['\n match(\"section[\"); \n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:12:5: ( 'subsection[' )\n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:12:7: 'subsection['\n match(\"subsection[\"); \n\n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:13:5: ( 'section3[' )\n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:13:7: 'section3['\n match(\"section3[\"); \n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:14:5: ( 'section4[' )\n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:14:7: 'section4['\n match(\"section4[\"); \n\n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:15:5: ( '\\\\\\\\[' )\n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:15:7: '\\\\\\\\['\n match(\"\\\\[\"); \n\n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:16:5: ( '\\\\\\\\]' )\n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:16:7: '\\\\\\\\]'\n match(\"\\\\]\"); \n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:17:5: ( 'img[' )\n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:17:7: 'img['\n match(\"img[\"); \n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:18:5: ( ':' )\n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:18:7: ':'\n match(':'); \n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:19:5: ( ']' )\n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:19:7: ']'\n match(']'); \n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:20:5: ( 'chapter:' )\n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:20:7: 'chapter:'\n match(\"chapter:\"); \n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:21:5: ( '[' )\n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:21:7: '['\n match('['); \n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:22:5: ( 'section:' )\n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:22:7: 'section:'\n match(\"section:\"); \n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:23:5: ( 'subsection:' )\n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:23:7: 'subsection:'\n match(\"subsection:\"); \n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:24:5: ( 'section3:' )\n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:24:7: 'section3:'\n match(\"section3:\"); \n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:25:5: ( 'section4:' )\n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:25:7: 'section4:'\n match(\"section4:\"); \n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:26:5: ( 'emph[' )\n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:26:7: 'emph['\n match(\"emph[\"); \n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:27:5: ( 'a[' )\n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:27:7: 'a['\n match(\"a[\"); \n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:28:5: ( 'ref:' )\n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:28:7: 'ref:'\n match(\"ref:\"); \n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:29:5: ( 'ol[' )\n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:29:7: 'ol['\n match(\"ol[\"); \n // $ANTLR start T30\n public final void mT30() throws RecognitionException {\n try {\n int _type = T30;\n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:30:5: ( 'ul[' )\n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:30:7: 'ul['\n {\n match(\"ul[\"); \n\n\n }\n\n this.type = _type;\n }\n finally {\n }\n }\n // $ANTLR end T30\n\n // $ANTLR start T31\n public final void mT31() throws RecognitionException {\n try {\n int _type = T31;\n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:31:5: ( 'item[' )\n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:31:7: 'item['\n {\n match(\"item[\"); \n\n\n }\n\n this.type = _type;\n }\n finally {\n }\n }\n // $ANTLR end T31\n\n // $ANTLR start T32\n public final void mT32() throws RecognitionException {\n try {\n int _type = T32;\n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:32:5: ( 'codeRef[' )\n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:32:7: 'codeRef['\n {\n match(\"codeRef[\"); \n\n\n }\n\n this.type = _type;\n }\n finally {\n }\n }\n // $ANTLR end T32\n\n // $ANTLR start T33\n public final void mT33() throws RecognitionException {\n try {\n int _type = T33;\n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:33:5: ( 'link[' )\n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:33:7: 'link['\n {\n match(\"link[\"); \n\n\n }\n\n this.type = _type;\n }\n finally {\n }\n }\n // $ANTLR end T33\n\n // $ANTLR start T34\n public final void mT34() throws RecognitionException {\n try {\n int _type = T34;\n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:34:5: ( 'img:' )\n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:34:7: 'img:'\n {\n match(\"img:\"); \n\n\n }\n\n this.type = _type;\n }\n finally {\n }\n }\n // $ANTLR end T34\n\n // $ANTLR start T35\n public final void mT35() throws RecognitionException {\n try {\n int _type = T35;\n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:35:5: ( 'code[' )\n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:35:7: 'code['\n {\n match(\"code[\"); \n\n\n }\n\n this.type = _type;\n }\n finally {\n }\n }\n // $ANTLR end T35\n\n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:7089:9: ( ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )\n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:7089:11: ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*\n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:7089:35: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*\n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:7091:17: ( '%%' (~ ( ( '\\\\n' | '\\\\r' ) ) )* ( ( '\\\\r' )? '\\\\n' )? )\n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:7091:19: '%%' (~ ( ( '\\\\n' | '\\\\r' ) ) )* ( ( '\\\\r' )? '\\\\n' )?\n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:7091:24: (~ ( ( '\\\\n' | '\\\\r' ) ) )*\n \t // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:7091:24: ~ ( ( '\\\\n' | '\\\\r' ) )\n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:7091:40: ( ( '\\\\r' )? '\\\\n' )?\n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:7091:41: ( '\\\\r' )? '\\\\n'\n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:7091:41: ( '\\\\r' )?\n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:7091:41: '\\\\r'\n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:7093:15: ( ( '\\\\r' )? '\\\\n' ( ( '\\\\r' )? '\\\\n' )+ )\n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:7093:17: ( '\\\\r' )? '\\\\n' ( ( '\\\\r' )? '\\\\n' )+\n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:7093:17: ( '\\\\r' )?\n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:7093:17: '\\\\r'\n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:7093:28: ( ( '\\\\r' )? '\\\\n' )+\n \t // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:7093:29: ( '\\\\r' )? '\\\\n'\n \t // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:7093:29: ( '\\\\r' )?\n \t // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:7093:29: '\\\\r'\n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:7095:16: ( ( '\\\\r' )? '\\\\n' )\n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:7095:18: ( '\\\\r' )? '\\\\n'\n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:7095:18: ( '\\\\r' )?\n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:7095:18: '\\\\r'\n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:7097:9: ( ( ' ' | '\\\\t' ) )\n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:7097:11: ( ' ' | '\\\\t' )\n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:7099:16: ( . )\n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:7099:18: .\n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:1:8: ( T10 | T11 | T12 | T13 | T14 | T15 | T16 | T17 | T18 | T19 | T20 | T21 | T22 | T23 | T24 | T25 | T26 | T27 | T28 | T29 | T30 | T31 | T32 | T33 | T34 | T35 | RULE_ID | RULE_SL_COMMENT | RULE_MULTI_NL | RULE_SINGLE_NL | RULE_WS | RULE_ANY_OTHER )\n int alt9=32;\n if ( (LA9_0=='c') ) {\n case 'h':\n int LA9_20 = input.LA(3);\n\n if ( (LA9_20=='a') ) {\n int LA9_43 = input.LA(4);\n\n if ( (LA9_43=='p') ) {\n int LA9_54 = input.LA(5);\n\n if ( (LA9_54=='t') ) {\n int LA9_64 = input.LA(6);\n\n if ( (LA9_64=='e') ) {\n int LA9_72 = input.LA(7);\n\n if ( (LA9_72=='r') ) {\n switch ( input.LA(8) ) {\n case ':':\n {\n alt9=11;\n }\n break;\n case '[':\n {\n alt9=1;\n }\n break;\n default:\n alt9=27;}\n\n }\n else {\n alt9=27;}\n }\n else {\n alt9=27;}\n }\n else {\n alt9=27;}\n }\n else {\n alt9=27;}\n else {\n alt9=27;}\n case 'o':\n int LA9_21 = input.LA(3);\n if ( (LA9_21=='d') ) {\n int LA9_44 = input.LA(4);\n if ( (LA9_44=='e') ) {\n switch ( input.LA(5) ) {\n case '[':\n {\n alt9=26;\n }\n break;\n case 'R':\n {\n int LA9_66 = input.LA(6);\n\n if ( (LA9_66=='e') ) {\n int LA9_73 = input.LA(7);\n if ( (LA9_73=='f') ) {\n int LA9_77 = input.LA(8);\n if ( (LA9_77=='[') ) {\n alt9=23;\n }\n else {\n alt9=27;}\n }\n else {\n alt9=27;}\n alt9=27;}\n }\n break;\n default:\n alt9=27;}\n alt9=27;}\n alt9=27;}\n default:\n alt9=27;}\n }\n else if ( (LA9_0=='s') ) {\n switch ( input.LA(2) ) {\n case 'e':\n {\n int LA9_23 = input.LA(3);\n if ( (LA9_23=='c') ) {\n int LA9_45 = input.LA(4);\n if ( (LA9_45=='t') ) {\n int LA9_56 = input.LA(5);\n if ( (LA9_56=='i') ) {\n int LA9_67 = input.LA(6);\n if ( (LA9_67=='o') ) {\n int LA9_74 = input.LA(7);\n if ( (LA9_74=='n') ) {\n switch ( input.LA(8) ) {\n case '4':\n {\n case '[':\n alt9=5;\n case ':':\n alt9=16;\n alt9=27;}\n\n }\n break;\n case ':':\n {\n alt9=13;\n }\n break;\n case '[':\n {\n alt9=2;\n }\n break;\n case '3':\n {\n switch ( input.LA(9) ) {\n case '[':\n {\n alt9=4;\n }\n break;\n case ':':\n {\n alt9=15;\n }\n break;\n default:\n alt9=27;}\n }\n break;\n default:\n alt9=27;}\n alt9=27;}\n alt9=27;}\n alt9=27;}\n alt9=27;}\n alt9=27;}\n case 'u':\n int LA9_24 = input.LA(3);\n if ( (LA9_24=='b') ) {\n int LA9_46 = input.LA(4);\n\n if ( (LA9_46=='s') ) {\n int LA9_57 = input.LA(5);\n\n if ( (LA9_57=='e') ) {\n int LA9_68 = input.LA(6);\n\n if ( (LA9_68=='c') ) {\n int LA9_75 = input.LA(7);\n if ( (LA9_75=='t') ) {\n int LA9_79 = input.LA(8);\n\n if ( (LA9_79=='i') ) {\n int LA9_87 = input.LA(9);\n\n if ( (LA9_87=='o') ) {\n int LA9_92 = input.LA(10);\n\n if ( (LA9_92=='n') ) {\n switch ( input.LA(11) ) {\n case '[':\n {\n alt9=3;\n }\n break;\n case ':':\n {\n alt9=14;\n }\n break;\n default:\n alt9=27;}\n\n }\n else {\n alt9=27;}\n }\n else {\n alt9=27;}\n }\n else {\n alt9=27;}\n }\n else {\n alt9=27;}\n }\n else {\n alt9=27;}\n }\n else {\n alt9=27;}\n }\n else {\n alt9=27;}\n else {\n alt9=27;}\n default:\n alt9=27;}\n\n }\n else if ( (LA9_0=='\\\\') ) {\n switch ( input.LA(2) ) {\n case '[':\n alt9=6;\n case ']':\n alt9=7;\n default:\n alt9=32;}\n\n }\n else if ( (LA9_0=='i') ) {\n switch ( input.LA(2) ) {\n case 'm':\n int LA9_27 = input.LA(3);\n\n if ( (LA9_27=='g') ) {\n switch ( input.LA(4) ) {\n case ':':\n {\n alt9=25;\n }\n break;\n case '[':\n {\n alt9=8;\n }\n break;\n default:\n alt9=27;}\n\n else {\n alt9=27;}\n case 't':\n int LA9_28 = input.LA(3);\n\n if ( (LA9_28=='e') ) {\n int LA9_48 = input.LA(4);\n\n if ( (LA9_48=='m') ) {\n int LA9_60 = input.LA(5);\n\n if ( (LA9_60=='[') ) {\n alt9=22;\n }\n else {\n alt9=27;}\n }\n else {\n alt9=27;}\n }\n else {\n alt9=27;}\n alt9=27;}\n alt9=9;\n }\n else if ( (LA9_0==']') ) {\n alt9=10;\n alt9=12;\n else if ( (LA9_0=='e') ) {\n int LA9_8 = input.LA(2);\n\n if ( (LA9_8=='m') ) {\n int LA9_32 = input.LA(3);\n\n if ( (LA9_32=='p') ) {\n int LA9_49 = input.LA(4);\n\n if ( (LA9_49=='h') ) {\n int LA9_61 = input.LA(5);\n\n if ( (LA9_61=='[') ) {\n alt9=17;\n }\n else {\n alt9=27;}\n }\n else {\n alt9=27;}\n }\n else {\n alt9=27;}\n }\n else {\n alt9=27;}\n }\n else if ( (LA9_0=='a') ) {\n int LA9_9 = input.LA(2);\n\n if ( (LA9_9=='[') ) {\n alt9=18;\n }\n else {\n alt9=27;}\n }\n else if ( (LA9_0=='r') ) {\n int LA9_10 = input.LA(2);\n\n if ( (LA9_10=='e') ) {\n int LA9_34 = input.LA(3);\n\n if ( (LA9_34=='f') ) {\n int LA9_50 = input.LA(4);\n\n if ( (LA9_50==':') ) {\n alt9=19;\n }\n else {\n alt9=27;}\n }\n else {\n alt9=27;}\n }\n else {\n alt9=27;}\n }\n else if ( (LA9_0=='o') ) {\n int LA9_11 = input.LA(2);\n\n if ( (LA9_11=='l') ) {\n int LA9_35 = input.LA(3);\n\n if ( (LA9_35=='[') ) {\n alt9=20;\n }\n else {\n alt9=27;}\n }\n else {\n alt9=27;}\n else if ( (LA9_0=='u') ) {\n int LA9_12 = input.LA(2);\n\n if ( (LA9_12=='l') ) {\n int LA9_36 = input.LA(3);\n\n if ( (LA9_36=='[') ) {\n alt9=21;\n }\n else {\n alt9=27;}\n }\n else {\n alt9=27;}\n }\n else if ( (LA9_0=='l') ) {\n int LA9_13 = input.LA(2);\n\n if ( (LA9_13=='i') ) {\n int LA9_37 = input.LA(3);\n\n if ( (LA9_37=='n') ) {\n int LA9_53 = input.LA(4);\n\n if ( (LA9_53=='k') ) {\n int LA9_63 = input.LA(5);\n\n if ( (LA9_63=='[') ) {\n alt9=24;\n }\n else {\n alt9=27;}\n }\n else {\n alt9=27;}\n }\n else {\n alt9=27;}\n }\n else {\n alt9=27;}\n }\n else if ( ((LA9_0>='A' && LA9_0<='Z')||LA9_0=='_'||LA9_0=='b'||LA9_0=='d'||(LA9_0>='f' && LA9_0<='h')||(LA9_0>='j' && LA9_0<='k')||(LA9_0>='m' && LA9_0<='n')||(LA9_0>='p' && LA9_0<='q')||LA9_0=='t'||(LA9_0>='v' && LA9_0<='z')) ) {\n alt9=27;\n int LA9_15 = input.LA(2);\n if ( (LA9_15=='%') ) {\n alt9=28;\n alt9=32;}\n int LA9_16 = input.LA(2);\n if ( (LA9_16=='\\n') ) {\n int LA9_39 = input.LA(3);\n if ( (LA9_39=='\\n'||LA9_39=='\\r') ) {\n alt9=29;\n alt9=30;}\n alt9=32;}\n int LA9_17 = input.LA(2);\n if ( (LA9_17=='\\n'||LA9_17=='\\r') ) {\n alt9=29;\n alt9=30;}\n alt9=31;\n alt9=32;\n new NoViableAltException(\"1:1: Tokens : ( T10 | T11 | T12 | T13 | T14 | T15 | T16 | T17 | T18 | T19 | T20 | T21 | T22 | T23 | T24 | T25 | T26 | T27 | T28 | T29 | T30 | T31 | T32 | T33 | T34 | T35 | RULE_ID | RULE_SL_COMMENT | RULE_MULTI_NL | RULE_SINGLE_NL | RULE_WS | RULE_ANY_OTHER );\", 9, 0, input);\n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:1:90: T30\n mT30(); \n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:1:94: T31\n mT31(); \n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:1:98: T32\n mT32(); \n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:1:102: T33\n mT33(); \n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:1:106: T34\n mT34(); \n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:1:110: T35\n {\n mT35(); \n\n }\n break;\n case 27 :\n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:1:114: RULE_ID\n {\n mRULE_ID(); \n\n }\n break;\n case 28 :\n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:1:122: RULE_SL_COMMENT\n {\n mRULE_SL_COMMENT(); \n\n }\n break;\n case 29 :\n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:1:138: RULE_MULTI_NL\n {\n mRULE_MULTI_NL(); \n\n }\n break;\n case 30 :\n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:1:152: RULE_SINGLE_NL\n {\n mRULE_SINGLE_NL(); \n\n }\n break;\n case 31 :\n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:1:167: RULE_WS\n {\n mRULE_WS(); \n\n }\n break;\n case 32 :\n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:1:175: RULE_ANY_OTHER", "new_methods": [], "old_code": " public static final int Tokens=30;\n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:10:5: ( '\\\\\\\\[' )\n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:10:7: '\\\\\\\\['\n match(\"\\\\[\"); \n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:11:5: ( '\\\\\\\\]' )\n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:11:7: '\\\\\\\\]'\n match(\"\\\\]\"); \n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:12:5: ( ':' )\n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:12:7: ':'\n match(':'); \n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:13:5: ( '\\\\\\\\chapter' )\n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:13:7: '\\\\\\\\chapter'\n match(\"\\\\chapter\"); \n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:14:5: ( '[' )\n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:14:7: '['\n match('['); \n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:15:5: ( ']' )\n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:15:7: ']'\n match(']'); \n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:16:5: ( '\\\\\\\\section' )\n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:16:7: '\\\\\\\\section'\n match(\"\\\\section\"); \n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:17:5: ( '\\\\\\\\subsection' )\n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:17:7: '\\\\\\\\subsection'\n match(\"\\\\subsection\"); \n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:18:5: ( '\\\\\\\\section3' )\n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:18:7: '\\\\\\\\section3'\n match(\"\\\\section3\"); \n\n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:19:5: ( '\\\\\\\\section4' )\n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:19:7: '\\\\\\\\section4'\n match(\"\\\\section4\"); \n\n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:20:5: ( '\\\\\\\\emph' )\n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:20:7: '\\\\\\\\emph'\n match(\"\\\\emph\"); \n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:21:5: ( '\\\\\\\\a' )\n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:21:7: '\\\\\\\\a'\n match(\"\\\\a\"); \n\n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:22:5: ( '\\\\\\\\ref' )\n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:22:7: '\\\\\\\\ref'\n match(\"\\\\ref\"); \n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:23:5: ( '\\\\\\\\ol' )\n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:23:7: '\\\\\\\\ol'\n match(\"\\\\ol\"); \n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:24:5: ( '\\\\\\\\ul' )\n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:24:7: '\\\\\\\\ul'\n match(\"\\\\ul\"); \n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:25:5: ( '\\\\\\\\item' )\n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:25:7: '\\\\\\\\item'\n match(\"\\\\item\"); \n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:26:5: ( '\\\\\\\\codeRef' )\n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:26:7: '\\\\\\\\codeRef'\n match(\"\\\\codeRef\"); \n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:27:5: ( '\\\\\\\\link' )\n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:27:7: '\\\\\\\\link'\n match(\"\\\\link\"); \n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:28:5: ( '\\\\\\\\img' )\n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:28:7: '\\\\\\\\img'\n match(\"\\\\img\"); \n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:29:5: ( '\\\\\\\\code' )\n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:29:7: '\\\\\\\\code'\n match(\"\\\\code\"); \n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:7728:9: ( ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )\n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:7728:11: ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*\n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:7728:35: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*\n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:7730:17: ( '%%' (~ ( ( '\\\\n' | '\\\\r' ) ) )* ( ( '\\\\r' )? '\\\\n' )? )\n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:7730:19: '%%' (~ ( ( '\\\\n' | '\\\\r' ) ) )* ( ( '\\\\r' )? '\\\\n' )?\n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:7730:24: (~ ( ( '\\\\n' | '\\\\r' ) ) )*\n \t // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:7730:24: ~ ( ( '\\\\n' | '\\\\r' ) )\n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:7730:40: ( ( '\\\\r' )? '\\\\n' )?\n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:7730:41: ( '\\\\r' )? '\\\\n'\n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:7730:41: ( '\\\\r' )?\n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:7730:41: '\\\\r'\n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:7732:15: ( ( '\\\\r' )? '\\\\n' ( ( '\\\\r' )? '\\\\n' )+ )\n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:7732:17: ( '\\\\r' )? '\\\\n' ( ( '\\\\r' )? '\\\\n' )+\n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:7732:17: ( '\\\\r' )?\n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:7732:17: '\\\\r'\n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:7732:28: ( ( '\\\\r' )? '\\\\n' )+\n \t // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:7732:29: ( '\\\\r' )? '\\\\n'\n \t // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:7732:29: ( '\\\\r' )?\n \t // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:7732:29: '\\\\r'\n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:7734:16: ( ( '\\\\r' )? '\\\\n' )\n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:7734:18: ( '\\\\r' )? '\\\\n'\n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:7734:18: ( '\\\\r' )?\n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:7734:18: '\\\\r'\n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:7736:9: ( ( ' ' | '\\\\t' ) )\n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:7736:11: ( ' ' | '\\\\t' )\n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:7738:16: ( . )\n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:7738:18: .\n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:1:8: ( T10 | T11 | T12 | T13 | T14 | T15 | T16 | T17 | T18 | T19 | T20 | T21 | T22 | T23 | T24 | T25 | T26 | T27 | T28 | T29 | RULE_ID | RULE_SL_COMMENT | RULE_MULTI_NL | RULE_SINGLE_NL | RULE_WS | RULE_ANY_OTHER )\n int alt9=26;\n if ( (LA9_0=='\\\\') ) {\n case 'u':\n alt9=15;\n }\n break;\n case ']':\n {\n alt9=2;\n break;\n case '[':\n {\n alt9=1;\n case 'c':\n int LA9_14 = input.LA(3);\n if ( (LA9_14=='o') ) {\n int LA9_31 = input.LA(4);\n if ( (LA9_31=='d') ) {\n int LA9_37 = input.LA(5);\n if ( (LA9_37=='e') ) {\n int LA9_39 = input.LA(6);\n if ( (LA9_39=='R') ) {\n alt9=17;\n alt9=20;}\n }\n else {\n NoViableAltException nvae =\n new NoViableAltException(\"1:1: Tokens : ( T10 | T11 | T12 | T13 | T14 | T15 | T16 | T17 | T18 | T19 | T20 | T21 | T22 | T23 | T24 | T25 | T26 | T27 | T28 | T29 | RULE_ID | RULE_SL_COMMENT | RULE_MULTI_NL | RULE_SINGLE_NL | RULE_WS | RULE_ANY_OTHER );\", 9, 37, input);\n throw nvae;\n }\n NoViableAltException nvae =\n new NoViableAltException(\"1:1: Tokens : ( T10 | T11 | T12 | T13 | T14 | T15 | T16 | T17 | T18 | T19 | T20 | T21 | T22 | T23 | T24 | T25 | T26 | T27 | T28 | T29 | RULE_ID | RULE_SL_COMMENT | RULE_MULTI_NL | RULE_SINGLE_NL | RULE_WS | RULE_ANY_OTHER );\", 9, 31, input);\n\n throw nvae;\n }\n }\n else if ( (LA9_14=='h') ) {\n alt9=4;\n NoViableAltException nvae =\n new NoViableAltException(\"1:1: Tokens : ( T10 | T11 | T12 | T13 | T14 | T15 | T16 | T17 | T18 | T19 | T20 | T21 | T22 | T23 | T24 | T25 | T26 | T27 | T28 | T29 | RULE_ID | RULE_SL_COMMENT | RULE_MULTI_NL | RULE_SINGLE_NL | RULE_WS | RULE_ANY_OTHER );\", 9, 14, input);\n\n throw nvae;\n }\n case 's':\n {\n int LA9_15 = input.LA(3);\n if ( (LA9_15=='u') ) {\n alt9=8;\n }\n else if ( (LA9_15=='e') ) {\n int LA9_34 = input.LA(4);\n if ( (LA9_34=='c') ) {\n int LA9_38 = input.LA(5);\n if ( (LA9_38=='t') ) {\n int LA9_40 = input.LA(6);\n if ( (LA9_40=='i') ) {\n int LA9_43 = input.LA(7);\n if ( (LA9_43=='o') ) {\n int LA9_44 = input.LA(8);\n if ( (LA9_44=='n') ) {\n case '4':\n alt9=10;\n case '3':\n alt9=9;\n alt9=7;}\n }\n else {\n NoViableAltException nvae =\n new NoViableAltException(\"1:1: Tokens : ( T10 | T11 | T12 | T13 | T14 | T15 | T16 | T17 | T18 | T19 | T20 | T21 | T22 | T23 | T24 | T25 | T26 | T27 | T28 | T29 | RULE_ID | RULE_SL_COMMENT | RULE_MULTI_NL | RULE_SINGLE_NL | RULE_WS | RULE_ANY_OTHER );\", 9, 44, input);\n throw nvae;\n }\n NoViableAltException nvae =\n new NoViableAltException(\"1:1: Tokens : ( T10 | T11 | T12 | T13 | T14 | T15 | T16 | T17 | T18 | T19 | T20 | T21 | T22 | T23 | T24 | T25 | T26 | T27 | T28 | T29 | RULE_ID | RULE_SL_COMMENT | RULE_MULTI_NL | RULE_SINGLE_NL | RULE_WS | RULE_ANY_OTHER );\", 9, 43, input);\n\n throw nvae;\n }\n NoViableAltException nvae =\n new NoViableAltException(\"1:1: Tokens : ( T10 | T11 | T12 | T13 | T14 | T15 | T16 | T17 | T18 | T19 | T20 | T21 | T22 | T23 | T24 | T25 | T26 | T27 | T28 | T29 | RULE_ID | RULE_SL_COMMENT | RULE_MULTI_NL | RULE_SINGLE_NL | RULE_WS | RULE_ANY_OTHER );\", 9, 40, input);\n\n throw nvae;\n }\n NoViableAltException nvae =\n new NoViableAltException(\"1:1: Tokens : ( T10 | T11 | T12 | T13 | T14 | T15 | T16 | T17 | T18 | T19 | T20 | T21 | T22 | T23 | T24 | T25 | T26 | T27 | T28 | T29 | RULE_ID | RULE_SL_COMMENT | RULE_MULTI_NL | RULE_SINGLE_NL | RULE_WS | RULE_ANY_OTHER );\", 9, 38, input);\n\n throw nvae;\n }\n NoViableAltException nvae =\n new NoViableAltException(\"1:1: Tokens : ( T10 | T11 | T12 | T13 | T14 | T15 | T16 | T17 | T18 | T19 | T20 | T21 | T22 | T23 | T24 | T25 | T26 | T27 | T28 | T29 | RULE_ID | RULE_SL_COMMENT | RULE_MULTI_NL | RULE_SINGLE_NL | RULE_WS | RULE_ANY_OTHER );\", 9, 34, input);\n\n throw nvae;\n }\n NoViableAltException nvae =\n new NoViableAltException(\"1:1: Tokens : ( T10 | T11 | T12 | T13 | T14 | T15 | T16 | T17 | T18 | T19 | T20 | T21 | T22 | T23 | T24 | T25 | T26 | T27 | T28 | T29 | RULE_ID | RULE_SL_COMMENT | RULE_MULTI_NL | RULE_SINGLE_NL | RULE_WS | RULE_ANY_OTHER );\", 9, 15, input);\n\n throw nvae;\n }\n case 'i':\n int LA9_16 = input.LA(3);\n if ( (LA9_16=='t') ) {\n alt9=16;\n }\n else if ( (LA9_16=='m') ) {\n alt9=19;\n }\n else {\n NoViableAltException nvae =\n new NoViableAltException(\"1:1: Tokens : ( T10 | T11 | T12 | T13 | T14 | T15 | T16 | T17 | T18 | T19 | T20 | T21 | T22 | T23 | T24 | T25 | T26 | T27 | T28 | T29 | RULE_ID | RULE_SL_COMMENT | RULE_MULTI_NL | RULE_SINGLE_NL | RULE_WS | RULE_ANY_OTHER );\", 9, 16, input);\n throw nvae;\n case 'e':\n alt9=11;\n case 'a':\n alt9=12;\n case 'o':\n alt9=14;\n break;\n case 'l':\n {\n alt9=18;\n case 'r':\n alt9=13;\n alt9=26;}\n alt9=3;\n alt9=5;\n else if ( (LA9_0==']') ) {\n alt9=6;\n else if ( ((LA9_0>='A' && LA9_0<='Z')||LA9_0=='_'||(LA9_0>='a' && LA9_0<='z')) ) {\n alt9=21;\n int LA9_6 = input.LA(2);\n if ( (LA9_6=='%') ) {\n alt9=22;\n alt9=26;}\n int LA9_7 = input.LA(2);\n if ( (LA9_7=='\\n') ) {\n int LA9_27 = input.LA(3);\n if ( (LA9_27=='\\n'||LA9_27=='\\r') ) {\n alt9=23;\n alt9=24;}\n alt9=26;}\n int LA9_8 = input.LA(2);\n if ( (LA9_8=='\\n'||LA9_8=='\\r') ) {\n alt9=23;\n alt9=24;}\n alt9=25;\n alt9=26;\n new NoViableAltException(\"1:1: Tokens : ( T10 | T11 | T12 | T13 | T14 | T15 | T16 | T17 | T18 | T19 | T20 | T21 | T22 | T23 | T24 | T25 | T26 | T27 | T28 | T29 | RULE_ID | RULE_SL_COMMENT | RULE_MULTI_NL | RULE_SINGLE_NL | RULE_WS | RULE_ANY_OTHER );\", 9, 0, input);\n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:1:90: RULE_ID\n mRULE_ID(); \n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:1:98: RULE_SL_COMMENT\n mRULE_SL_COMMENT(); \n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:1:114: RULE_MULTI_NL\n mRULE_MULTI_NL(); \n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:1:128: RULE_SINGLE_NL\n mRULE_SINGLE_NL(); \n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:1:143: RULE_WS\n mRULE_WS(); \n // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:1:151: RULE_ANY_OTHER", "old_methods": [], "patch": "@@ -16,12 +16,15 @@ public class InternalXDocLexer extends Lexer {\n public static final int T14=14;\n public static final int T29=29;\n public static final int RULE_ID=4;\n+ public static final int T33=33;\n public static final int T22=22;\n public static final int T11=11;\n public static final int T12=12;\n public static final int T28=28;\n public static final int T23=23;\n+ public static final int T35=35;\n public static final int T13=13;\n+ public static final int T34=34;\n public static final int T20=20;\n public static final int T10=10;\n public static final int T25=25;\n@@ -31,13 +34,16 @@ public class InternalXDocLexer extends Lexer {\n public static final int T15=15;\n public static final int EOF=-1;\n public static final int RULE_MULTI_NL=8;\n+ public static final int T32=32;\n public static final int RULE_SINGLE_NL=6;\n public static final int T17=17;\n- public static final int Tokens=30;\n+ public static final int Tokens=36;\n+ public static final int T31=31;\n public static final int RULE_ANY_OTHER=7;\n public static final int T16=16;\n public static final int T27=27;\n public static final int RULE_SL_COMMENT=9;\n+ public static final int T30=30;\n public static final int T24=24;\n public static final int T19=19;\n public InternalXDocLexer() {;} \n@@ -50,10 +56,10 @@ public InternalXDocLexer(CharStream input) {\n public final void mT10() throws RecognitionException {\n try {\n int _type = T10;\n- // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:10:5: ( '\\\\\\\\[' )\n- // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:10:7: '\\\\\\\\['\n+ // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:10:5: ( 'chapter[' )\n+ // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:10:7: 'chapter['\n {\n- match(\"\\\\[\"); \n+ match(\"chapter[\"); \n \n \n }\n@@ -69,10 +75,10 @@ public final void mT10() throws RecognitionException {\n public final void mT11() throws RecognitionException {\n try {\n int _type = T11;\n- // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:11:5: ( '\\\\\\\\]' )\n- // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:11:7: '\\\\\\\\]'\n+ // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:11:5: ( 'section[' )\n+ // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:11:7: 'section['\n {\n- match(\"\\\\]\"); \n+ match(\"section[\"); \n \n \n }\n@@ -88,10 +94,11 @@ public final void mT11() throws RecognitionException {\n public final void mT12() throws RecognitionException {\n try {\n int _type = T12;\n- // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:12:5: ( ':' )\n- // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:12:7: ':'\n+ // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:12:5: ( 'subsection[' )\n+ // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:12:7: 'subsection['\n {\n- match(':'); \n+ match(\"subsection[\"); \n+\n \n }\n \n@@ -106,10 +113,10 @@ public final void mT12() throws RecognitionException {\n public final void mT13() throws RecognitionException {\n try {\n int _type = T13;\n- // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:13:5: ( '\\\\\\\\chapter' )\n- // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:13:7: '\\\\\\\\chapter'\n+ // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:13:5: ( 'section3[' )\n+ // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:13:7: 'section3['\n {\n- match(\"\\\\chapter\"); \n+ match(\"section3[\"); \n \n \n }\n@@ -125,10 +132,11 @@ public final void mT13() throws RecognitionException {\n public final void mT14() throws RecognitionException {\n try {\n int _type = T14;\n- // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:14:5: ( '[' )\n- // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:14:7: '['\n+ // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:14:5: ( 'section4[' )\n+ // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:14:7: 'section4['\n {\n- match('['); \n+ match(\"section4[\"); \n+\n \n }\n \n@@ -143,10 +151,11 @@ public final void mT14() throws RecognitionException {\n public final void mT15() throws RecognitionException {\n try {\n int _type = T15;\n- // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:15:5: ( ']' )\n- // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:15:7: ']'\n+ // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:15:5: ( '\\\\\\\\[' )\n+ // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:15:7: '\\\\\\\\['\n {\n- match(']'); \n+ match(\"\\\\[\"); \n+\n \n }\n \n@@ -161,10 +170,10 @@ public final void mT15() throws RecognitionException {\n public final void mT16() throws RecognitionException {\n try {\n int _type = T16;\n- // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:16:5: ( '\\\\\\\\section' )\n- // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:16:7: '\\\\\\\\section'\n+ // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:16:5: ( '\\\\\\\\]' )\n+ // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:16:7: '\\\\\\\\]'\n {\n- match(\"\\\\section\"); \n+ match(\"\\\\]\"); \n \n \n }\n@@ -180,10 +189,10 @@ public final void mT16() throws RecognitionException {\n public final void mT17() throws RecognitionException {\n try {\n int _type = T17;\n- // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:17:5: ( '\\\\\\\\subsection' )\n- // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:17:7: '\\\\\\\\subsection'\n+ // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:17:5: ( 'img[' )\n+ // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:17:7: 'img['\n {\n- match(\"\\\\subsection\"); \n+ match(\"img[\"); \n \n \n }\n@@ -199,11 +208,10 @@ public final void mT17() throws RecognitionException {\n public final void mT18() throws RecognitionException {\n try {\n int _type = T18;\n- // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:18:5: ( '\\\\\\\\section3' )\n- // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:18:7: '\\\\\\\\section3'\n+ // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:18:5: ( ':' )\n+ // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:18:7: ':'\n {\n- match(\"\\\\section3\"); \n-\n+ match(':'); \n \n }\n \n@@ -218,11 +226,10 @@ public final void mT18() throws RecognitionException {\n public final void mT19() throws RecognitionException {\n try {\n int _type = T19;\n- // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:19:5: ( '\\\\\\\\section4' )\n- // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:19:7: '\\\\\\\\section4'\n+ // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:19:5: ( ']' )\n+ // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:19:7: ']'\n {\n- match(\"\\\\section4\"); \n-\n+ match(']'); \n \n }\n \n@@ -237,10 +244,10 @@ public final void mT19() throws RecognitionException {\n public final void mT20() throws RecognitionException {\n try {\n int _type = T20;\n- // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:20:5: ( '\\\\\\\\emph' )\n- // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:20:7: '\\\\\\\\emph'\n+ // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:20:5: ( 'chapter:' )\n+ // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:20:7: 'chapter:'\n {\n- match(\"\\\\emph\"); \n+ match(\"chapter:\"); \n \n \n }\n@@ -256,11 +263,10 @@ public final void mT20() throws RecognitionException {\n public final void mT21() throws RecognitionException {\n try {\n int _type = T21;\n- // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:21:5: ( '\\\\\\\\a' )\n- // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:21:7: '\\\\\\\\a'\n+ // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:21:5: ( '[' )\n+ // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:21:7: '['\n {\n- match(\"\\\\a\"); \n-\n+ match('['); \n \n }\n \n@@ -275,10 +281,10 @@ public final void mT21() throws RecognitionException {\n public final void mT22() throws RecognitionException {\n try {\n int _type = T22;\n- // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:22:5: ( '\\\\\\\\ref' )\n- // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:22:7: '\\\\\\\\ref'\n+ // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:22:5: ( 'section:' )\n+ // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:22:7: 'section:'\n {\n- match(\"\\\\ref\"); \n+ match(\"section:\"); \n \n \n }\n@@ -294,10 +300,10 @@ public final void mT22() throws RecognitionException {\n public final void mT23() throws RecognitionException {\n try {\n int _type = T23;\n- // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:23:5: ( '\\\\\\\\ol' )\n- // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:23:7: '\\\\\\\\ol'\n+ // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:23:5: ( 'subsection:' )\n+ // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:23:7: 'subsection:'\n {\n- match(\"\\\\ol\"); \n+ match(\"subsection:\"); \n \n \n }\n@@ -313,10 +319,10 @@ public final void mT23() throws RecognitionException {\n public final void mT24() throws RecognitionException {\n try {\n int _type = T24;\n- // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:24:5: ( '\\\\\\\\ul' )\n- // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:24:7: '\\\\\\\\ul'\n+ // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:24:5: ( 'section3:' )\n+ // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:24:7: 'section3:'\n {\n- match(\"\\\\ul\"); \n+ match(\"section3:\"); \n \n \n }\n@@ -332,10 +338,10 @@ public final void mT24() throws RecognitionException {\n public final void mT25() throws RecognitionException {\n try {\n int _type = T25;\n- // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:25:5: ( '\\\\\\\\item' )\n- // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:25:7: '\\\\\\\\item'\n+ // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:25:5: ( 'section4:' )\n+ // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:25:7: 'section4:'\n {\n- match(\"\\\\item\"); \n+ match(\"section4:\"); \n \n \n }\n@@ -351,10 +357,10 @@ public final void mT25() throws RecognitionException {\n public final void mT26() throws RecognitionException {\n try {\n int _type = T26;\n- // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:26:5: ( '\\\\\\\\codeRef' )\n- // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:26:7: '\\\\\\\\codeRef'\n+ // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:26:5: ( 'emph[' )\n+ // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:26:7: 'emph['\n {\n- match(\"\\\\codeRef\"); \n+ match(\"emph[\"); \n \n \n }\n@@ -370,10 +376,10 @@ public final void mT26() throws RecognitionException {\n public final void mT27() throws RecognitionException {\n try {\n int _type = T27;\n- // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:27:5: ( '\\\\\\\\link' )\n- // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:27:7: '\\\\\\\\link'\n+ // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:27:5: ( 'a[' )\n+ // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:27:7: 'a['\n {\n- match(\"\\\\link\"); \n+ match(\"a[\"); \n \n \n }\n@@ -389,10 +395,10 @@ public final void mT27() throws RecognitionException {\n public final void mT28() throws RecognitionException {\n try {\n int _type = T28;\n- // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:28:5: ( '\\\\\\\\img' )\n- // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:28:7: '\\\\\\\\img'\n+ // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:28:5: ( 'ref:' )\n+ // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:28:7: 'ref:'\n {\n- match(\"\\\\img\"); \n+ match(\"ref:\"); \n \n \n }\n@@ -408,10 +414,10 @@ public final void mT28() throws RecognitionException {\n public final void mT29() throws RecognitionException {\n try {\n int _type = T29;\n- // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:29:5: ( '\\\\\\\\code' )\n- // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:29:7: '\\\\\\\\code'\n+ // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:29:5: ( 'ol[' )\n+ // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:29:7: 'ol['\n {\n- match(\"\\\\code\"); \n+ match(\"ol[\"); \n \n \n }\n@@ -423,12 +429,126 @@ public final void mT29() throws RecognitionException {\n }\n // $ANTLR end T29\n \n+ // $ANTLR start T30\n+ public final void mT30() throws RecognitionException {\n+ try {\n+ int _type = T30;\n+ // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:30:5: ( 'ul[' )\n+ // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:30:7: 'ul['\n+ {\n+ match(\"ul[\"); \n+\n+\n+ }\n+\n+ this.type = _type;\n+ }\n+ finally {\n+ }\n+ }\n+ // $ANTLR end T30\n+\n+ // $ANTLR start T31\n+ public final void mT31() throws RecognitionException {\n+ try {\n+ int _type = T31;\n+ // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:31:5: ( 'item[' )\n+ // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:31:7: 'item['\n+ {\n+ match(\"item[\"); \n+\n+\n+ }\n+\n+ this.type = _type;\n+ }\n+ finally {\n+ }\n+ }\n+ // $ANTLR end T31\n+\n+ // $ANTLR start T32\n+ public final void mT32() throws RecognitionException {\n+ try {\n+ int _type = T32;\n+ // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:32:5: ( 'codeRef[' )\n+ // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:32:7: 'codeRef['\n+ {\n+ match(\"codeRef[\"); \n+\n+\n+ }\n+\n+ this.type = _type;\n+ }\n+ finally {\n+ }\n+ }\n+ // $ANTLR end T32\n+\n+ // $ANTLR start T33\n+ public final void mT33() throws RecognitionException {\n+ try {\n+ int _type = T33;\n+ // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:33:5: ( 'link[' )\n+ // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:33:7: 'link['\n+ {\n+ match(\"link[\"); \n+\n+\n+ }\n+\n+ this.type = _type;\n+ }\n+ finally {\n+ }\n+ }\n+ // $ANTLR end T33\n+\n+ // $ANTLR start T34\n+ public final void mT34() throws RecognitionException {\n+ try {\n+ int _type = T34;\n+ // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:34:5: ( 'img:' )\n+ // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:34:7: 'img:'\n+ {\n+ match(\"img:\"); \n+\n+\n+ }\n+\n+ this.type = _type;\n+ }\n+ finally {\n+ }\n+ }\n+ // $ANTLR end T34\n+\n+ // $ANTLR start T35\n+ public final void mT35() throws RecognitionException {\n+ try {\n+ int _type = T35;\n+ // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:35:5: ( 'code[' )\n+ // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:35:7: 'code['\n+ {\n+ match(\"code[\"); \n+\n+\n+ }\n+\n+ this.type = _type;\n+ }\n+ finally {\n+ }\n+ }\n+ // $ANTLR end T35\n+\n // $ANTLR start RULE_ID\n public final void mRULE_ID() throws RecognitionException {\n try {\n int _type = RULE_ID;\n- // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:7728:9: ( ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )\n- // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:7728:11: ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*\n+ // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:7089:9: ( ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )\n+ // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:7089:11: ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*\n {\n if ( (input.LA(1)>='A' && input.LA(1)<='Z')||input.LA(1)=='_'||(input.LA(1)>='a' && input.LA(1)<='z') ) {\n input.consume();\n@@ -440,7 +560,7 @@ public final void mRULE_ID() throws RecognitionException {\n recover(mse); throw mse;\n }\n \n- // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:7728:35: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*\n+ // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:7089:35: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*\n loop1:\n do {\n int alt1=2;\n@@ -488,12 +608,12 @@ public final void mRULE_ID() throws RecognitionException {\n public final void mRULE_SL_COMMENT() throws RecognitionException {\n try {\n int _type = RULE_SL_COMMENT;\n- // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:7730:17: ( '%%' (~ ( ( '\\\\n' | '\\\\r' ) ) )* ( ( '\\\\r' )? '\\\\n' )? )\n- // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:7730:19: '%%' (~ ( ( '\\\\n' | '\\\\r' ) ) )* ( ( '\\\\r' )? '\\\\n' )?\n+ // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:7091:17: ( '%%' (~ ( ( '\\\\n' | '\\\\r' ) ) )* ( ( '\\\\r' )? '\\\\n' )? )\n+ // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:7091:19: '%%' (~ ( ( '\\\\n' | '\\\\r' ) ) )* ( ( '\\\\r' )? '\\\\n' )?\n {\n match(\"%%\"); \n \n- // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:7730:24: (~ ( ( '\\\\n' | '\\\\r' ) ) )*\n+ // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:7091:24: (~ ( ( '\\\\n' | '\\\\r' ) ) )*\n loop2:\n do {\n int alt2=2;\n@@ -506,7 +626,7 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {\n \n switch (alt2) {\n \tcase 1 :\n- \t // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:7730:24: ~ ( ( '\\\\n' | '\\\\r' ) )\n+ \t // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:7091:24: ~ ( ( '\\\\n' | '\\\\r' ) )\n \t {\n \t if ( (input.LA(1)>='\\u0000' && input.LA(1)<='\\t')||(input.LA(1)>='\\u000B' && input.LA(1)<='\\f')||(input.LA(1)>='\\u000E' && input.LA(1)<='\\uFFFE') ) {\n \t input.consume();\n@@ -527,7 +647,7 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {\n }\n } while (true);\n \n- // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:7730:40: ( ( '\\\\r' )? '\\\\n' )?\n+ // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:7091:40: ( ( '\\\\r' )? '\\\\n' )?\n int alt4=2;\n int LA4_0 = input.LA(1);\n \n@@ -536,9 +656,9 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {\n }\n switch (alt4) {\n case 1 :\n- // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:7730:41: ( '\\\\r' )? '\\\\n'\n+ // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:7091:41: ( '\\\\r' )? '\\\\n'\n {\n- // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:7730:41: ( '\\\\r' )?\n+ // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:7091:41: ( '\\\\r' )?\n int alt3=2;\n int LA3_0 = input.LA(1);\n \n@@ -547,7 +667,7 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {\n }\n switch (alt3) {\n case 1 :\n- // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:7730:41: '\\\\r'\n+ // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:7091:41: '\\\\r'\n {\n match('\\r'); \n \n@@ -577,10 +697,10 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {\n public final void mRULE_MULTI_NL() throws RecognitionException {\n try {\n int _type = RULE_MULTI_NL;\n- // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:7732:15: ( ( '\\\\r' )? '\\\\n' ( ( '\\\\r' )? '\\\\n' )+ )\n- // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:7732:17: ( '\\\\r' )? '\\\\n' ( ( '\\\\r' )? '\\\\n' )+\n+ // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:7093:15: ( ( '\\\\r' )? '\\\\n' ( ( '\\\\r' )? '\\\\n' )+ )\n+ // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:7093:17: ( '\\\\r' )? '\\\\n' ( ( '\\\\r' )? '\\\\n' )+\n {\n- // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:7732:17: ( '\\\\r' )?\n+ // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:7093:17: ( '\\\\r' )?\n int alt5=2;\n int LA5_0 = input.LA(1);\n \n@@ -589,7 +709,7 @@ public final void mRULE_MULTI_NL() throws RecognitionException {\n }\n switch (alt5) {\n case 1 :\n- // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:7732:17: '\\\\r'\n+ // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:7093:17: '\\\\r'\n {\n match('\\r'); \n \n@@ -599,7 +719,7 @@ public final void mRULE_MULTI_NL() throws RecognitionException {\n }\n \n match('\\n'); \n- // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:7732:28: ( ( '\\\\r' )? '\\\\n' )+\n+ // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:7093:28: ( ( '\\\\r' )? '\\\\n' )+\n int cnt7=0;\n loop7:\n do {\n@@ -613,9 +733,9 @@ public final void mRULE_MULTI_NL() throws RecognitionException {\n \n switch (alt7) {\n \tcase 1 :\n- \t // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:7732:29: ( '\\\\r' )? '\\\\n'\n+ \t // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:7093:29: ( '\\\\r' )? '\\\\n'\n \t {\n- \t // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:7732:29: ( '\\\\r' )?\n+ \t // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:7093:29: ( '\\\\r' )?\n \t int alt6=2;\n \t int LA6_0 = input.LA(1);\n \n@@ -624,7 +744,7 @@ public final void mRULE_MULTI_NL() throws RecognitionException {\n \t }\n \t switch (alt6) {\n \t case 1 :\n- \t // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:7732:29: '\\\\r'\n+ \t // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:7093:29: '\\\\r'\n \t {\n \t match('\\r'); \n \n@@ -661,10 +781,10 @@ public final void mRULE_MULTI_NL() throws RecognitionException {\n public final void mRULE_SINGLE_NL() throws RecognitionException {\n try {\n int _type = RULE_SINGLE_NL;\n- // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:7734:16: ( ( '\\\\r' )? '\\\\n' )\n- // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:7734:18: ( '\\\\r' )? '\\\\n'\n+ // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:7095:16: ( ( '\\\\r' )? '\\\\n' )\n+ // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:7095:18: ( '\\\\r' )? '\\\\n'\n {\n- // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:7734:18: ( '\\\\r' )?\n+ // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:7095:18: ( '\\\\r' )?\n int alt8=2;\n int LA8_0 = input.LA(1);\n \n@@ -673,7 +793,7 @@ public final void mRULE_SINGLE_NL() throws RecognitionException {\n }\n switch (alt8) {\n case 1 :\n- // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:7734:18: '\\\\r'\n+ // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:7095:18: '\\\\r'\n {\n match('\\r'); \n \n@@ -697,8 +817,8 @@ public final void mRULE_SINGLE_NL() throws RecognitionException {\n public final void mRULE_WS() throws RecognitionException {\n try {\n int _type = RULE_WS;\n- // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:7736:9: ( ( ' ' | '\\\\t' ) )\n- // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:7736:11: ( ' ' | '\\\\t' )\n+ // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:7097:9: ( ( ' ' | '\\\\t' ) )\n+ // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:7097:11: ( ' ' | '\\\\t' )\n {\n if ( input.LA(1)=='\\t'||input.LA(1)==' ' ) {\n input.consume();\n@@ -724,8 +844,8 @@ public final void mRULE_WS() throws RecognitionException {\n public final void mRULE_ANY_OTHER() throws RecognitionException {\n try {\n int _type = RULE_ANY_OTHER;\n- // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:7738:16: ( . )\n- // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:7738:18: .\n+ // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:7099:16: ( . )\n+ // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:7099:18: .\n {\n matchAny(); \n \n@@ -739,253 +859,505 @@ public final void mRULE_ANY_OTHER() throws RecognitionException {\n // $ANTLR end RULE_ANY_OTHER\n \n public void mTokens() throws RecognitionException {\n- // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:1:8: ( T10 | T11 | T12 | T13 | T14 | T15 | T16 | T17 | T18 | T19 | T20 | T21 | T22 | T23 | T24 | T25 | T26 | T27 | T28 | T29 | RULE_ID | RULE_SL_COMMENT | RULE_MULTI_NL | RULE_SINGLE_NL | RULE_WS | RULE_ANY_OTHER )\n- int alt9=26;\n+ // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:1:8: ( T10 | T11 | T12 | T13 | T14 | T15 | T16 | T17 | T18 | T19 | T20 | T21 | T22 | T23 | T24 | T25 | T26 | T27 | T28 | T29 | T30 | T31 | T32 | T33 | T34 | T35 | RULE_ID | RULE_SL_COMMENT | RULE_MULTI_NL | RULE_SINGLE_NL | RULE_WS | RULE_ANY_OTHER )\n+ int alt9=32;\n int LA9_0 = input.LA(1);\n \n- if ( (LA9_0=='\\\\') ) {\n+ if ( (LA9_0=='c') ) {\n switch ( input.LA(2) ) {\n- case 'u':\n+ case 'h':\n {\n- alt9=15;\n- }\n- break;\n- case ']':\n- {\n- alt9=2;\n+ int LA9_20 = input.LA(3);\n+\n+ if ( (LA9_20=='a') ) {\n+ int LA9_43 = input.LA(4);\n+\n+ if ( (LA9_43=='p') ) {\n+ int LA9_54 = input.LA(5);\n+\n+ if ( (LA9_54=='t') ) {\n+ int LA9_64 = input.LA(6);\n+\n+ if ( (LA9_64=='e') ) {\n+ int LA9_72 = input.LA(7);\n+\n+ if ( (LA9_72=='r') ) {\n+ switch ( input.LA(8) ) {\n+ case ':':\n+ {\n+ alt9=11;\n+ }\n+ break;\n+ case '[':\n+ {\n+ alt9=1;\n+ }\n+ break;\n+ default:\n+ alt9=27;}\n+\n+ }\n+ else {\n+ alt9=27;}\n+ }\n+ else {\n+ alt9=27;}\n+ }\n+ else {\n+ alt9=27;}\n+ }\n+ else {\n+ alt9=27;}\n }\n- break;\n- case '[':\n- {\n- alt9=1;\n+ else {\n+ alt9=27;}\n }\n break;\n- case 'c':\n+ case 'o':\n {\n- int LA9_14 = input.LA(3);\n+ int LA9_21 = input.LA(3);\n \n- if ( (LA9_14=='o') ) {\n- int LA9_31 = input.LA(4);\n+ if ( (LA9_21=='d') ) {\n+ int LA9_44 = input.LA(4);\n \n- if ( (LA9_31=='d') ) {\n- int LA9_37 = input.LA(5);\n+ if ( (LA9_44=='e') ) {\n+ switch ( input.LA(5) ) {\n+ case '[':\n+ {\n+ alt9=26;\n+ }\n+ break;\n+ case 'R':\n+ {\n+ int LA9_66 = input.LA(6);\n+\n+ if ( (LA9_66=='e') ) {\n+ int LA9_73 = input.LA(7);\n \n- if ( (LA9_37=='e') ) {\n- int LA9_39 = input.LA(6);\n+ if ( (LA9_73=='f') ) {\n+ int LA9_77 = input.LA(8);\n \n- if ( (LA9_39=='R') ) {\n- alt9=17;\n+ if ( (LA9_77=='[') ) {\n+ alt9=23;\n+ }\n+ else {\n+ alt9=27;}\n+ }\n+ else {\n+ alt9=27;}\n }\n else {\n- alt9=20;}\n- }\n- else {\n- NoViableAltException nvae =\n- new NoViableAltException(\"1:1: Tokens : ( T10 | T11 | T12 | T13 | T14 | T15 | T16 | T17 | T18 | T19 | T20 | T21 | T22 | T23 | T24 | T25 | T26 | T27 | T28 | T29 | RULE_ID | RULE_SL_COMMENT | RULE_MULTI_NL | RULE_SINGLE_NL | RULE_WS | RULE_ANY_OTHER );\", 9, 37, input);\n+ alt9=27;}\n+ }\n+ break;\n+ default:\n+ alt9=27;}\n \n- throw nvae;\n- }\n }\n else {\n- NoViableAltException nvae =\n- new NoViableAltException(\"1:1: Tokens : ( T10 | T11 | T12 | T13 | T14 | T15 | T16 | T17 | T18 | T19 | T20 | T21 | T22 | T23 | T24 | T25 | T26 | T27 | T28 | T29 | RULE_ID | RULE_SL_COMMENT | RULE_MULTI_NL | RULE_SINGLE_NL | RULE_WS | RULE_ANY_OTHER );\", 9, 31, input);\n-\n- throw nvae;\n- }\n- }\n- else if ( (LA9_14=='h') ) {\n- alt9=4;\n+ alt9=27;}\n }\n else {\n- NoViableAltException nvae =\n- new NoViableAltException(\"1:1: Tokens : ( T10 | T11 | T12 | T13 | T14 | T15 | T16 | T17 | T18 | T19 | T20 | T21 | T22 | T23 | T24 | T25 | T26 | T27 | T28 | T29 | RULE_ID | RULE_SL_COMMENT | RULE_MULTI_NL | RULE_SINGLE_NL | RULE_WS | RULE_ANY_OTHER );\", 9, 14, input);\n-\n- throw nvae;\n- }\n+ alt9=27;}\n }\n break;\n- case 's':\n- {\n- int LA9_15 = input.LA(3);\n+ default:\n+ alt9=27;}\n \n- if ( (LA9_15=='u') ) {\n- alt9=8;\n- }\n- else if ( (LA9_15=='e') ) {\n- int LA9_34 = input.LA(4);\n+ }\n+ else if ( (LA9_0=='s') ) {\n+ switch ( input.LA(2) ) {\n+ case 'e':\n+ {\n+ int LA9_23 = input.LA(3);\n \n- if ( (LA9_34=='c') ) {\n- int LA9_38 = input.LA(5);\n+ if ( (LA9_23=='c') ) {\n+ int LA9_45 = input.LA(4);\n \n- if ( (LA9_38=='t') ) {\n- int LA9_40 = input.LA(6);\n+ if ( (LA9_45=='t') ) {\n+ int LA9_56 = input.LA(5);\n \n- if ( (LA9_40=='i') ) {\n- int LA9_43 = input.LA(7);\n+ if ( (LA9_56=='i') ) {\n+ int LA9_67 = input.LA(6);\n \n- if ( (LA9_43=='o') ) {\n- int LA9_44 = input.LA(8);\n+ if ( (LA9_67=='o') ) {\n+ int LA9_74 = input.LA(7);\n \n- if ( (LA9_44=='n') ) {\n+ if ( (LA9_74=='n') ) {\n+ switch ( input.LA(8) ) {\n+ case '4':\n+ {\n switch ( input.LA(9) ) {\n- case '4':\n+ case '[':\n {\n- alt9=10;\n+ alt9=5;\n }\n break;\n- case '3':\n+ case ':':\n {\n- alt9=9;\n+ alt9=16;\n }\n break;\n default:\n- alt9=7;}\n+ alt9=27;}\n+\n+ }\n+ break;\n+ case ':':\n+ {\n+ alt9=13;\n+ }\n+ break;\n+ case '[':\n+ {\n+ alt9=2;\n+ }\n+ break;\n+ case '3':\n+ {\n+ switch ( input.LA(9) ) {\n+ case '[':\n+ {\n+ alt9=4;\n+ }\n+ break;\n+ case ':':\n+ {\n+ alt9=15;\n+ }\n+ break;\n+ default:\n+ alt9=27;}\n \n- }\n- else {\n- NoViableAltException nvae =\n- new NoViableAltException(\"1:1: Tokens : ( T10 | T11 | T12 | T13 | T14 | T15 | T16 | T17 | T18 | T19 | T20 | T21 | T22 | T23 | T24 | T25 | T26 | T27 | T28 | T29 | RULE_ID | RULE_SL_COMMENT | RULE_MULTI_NL | RULE_SINGLE_NL | RULE_WS | RULE_ANY_OTHER );\", 9, 44, input);\n+ }\n+ break;\n+ default:\n+ alt9=27;}\n \n- throw nvae;\n- }\n }\n else {\n- NoViableAltException nvae =\n- new NoViableAltException(\"1:1: Tokens : ( T10 | T11 | T12 | T13 | T14 | T15 | T16 | T17 | T18 | T19 | T20 | T21 | T22 | T23 | T24 | T25 | T26 | T27 | T28 | T29 | RULE_ID | RULE_SL_COMMENT | RULE_MULTI_NL | RULE_SINGLE_NL | RULE_WS | RULE_ANY_OTHER );\", 9, 43, input);\n-\n- throw nvae;\n- }\n+ alt9=27;}\n }\n else {\n- NoViableAltException nvae =\n- new NoViableAltException(\"1:1: Tokens : ( T10 | T11 | T12 | T13 | T14 | T15 | T16 | T17 | T18 | T19 | T20 | T21 | T22 | T23 | T24 | T25 | T26 | T27 | T28 | T29 | RULE_ID | RULE_SL_COMMENT | RULE_MULTI_NL | RULE_SINGLE_NL | RULE_WS | RULE_ANY_OTHER );\", 9, 40, input);\n-\n- throw nvae;\n- }\n+ alt9=27;}\n }\n else {\n- NoViableAltException nvae =\n- new NoViableAltException(\"1:1: Tokens : ( T10 | T11 | T12 | T13 | T14 | T15 | T16 | T17 | T18 | T19 | T20 | T21 | T22 | T23 | T24 | T25 | T26 | T27 | T28 | T29 | RULE_ID | RULE_SL_COMMENT | RULE_MULTI_NL | RULE_SINGLE_NL | RULE_WS | RULE_ANY_OTHER );\", 9, 38, input);\n-\n- throw nvae;\n- }\n+ alt9=27;}\n }\n else {\n- NoViableAltException nvae =\n- new NoViableAltException(\"1:1: Tokens : ( T10 | T11 | T12 | T13 | T14 | T15 | T16 | T17 | T18 | T19 | T20 | T21 | T22 | T23 | T24 | T25 | T26 | T27 | T28 | T29 | RULE_ID | RULE_SL_COMMENT | RULE_MULTI_NL | RULE_SINGLE_NL | RULE_WS | RULE_ANY_OTHER );\", 9, 34, input);\n-\n- throw nvae;\n- }\n+ alt9=27;}\n }\n else {\n- NoViableAltException nvae =\n- new NoViableAltException(\"1:1: Tokens : ( T10 | T11 | T12 | T13 | T14 | T15 | T16 | T17 | T18 | T19 | T20 | T21 | T22 | T23 | T24 | T25 | T26 | T27 | T28 | T29 | RULE_ID | RULE_SL_COMMENT | RULE_MULTI_NL | RULE_SINGLE_NL | RULE_WS | RULE_ANY_OTHER );\", 9, 15, input);\n-\n- throw nvae;\n- }\n+ alt9=27;}\n }\n break;\n- case 'i':\n+ case 'u':\n {\n- int LA9_16 = input.LA(3);\n+ int LA9_24 = input.LA(3);\n \n- if ( (LA9_16=='t') ) {\n- alt9=16;\n- }\n- else if ( (LA9_16=='m') ) {\n- alt9=19;\n- }\n- else {\n- NoViableAltException nvae =\n- new NoViableAltException(\"1:1: Tokens : ( T10 | T11 | T12 | T13 | T14 | T15 | T16 | T17 | T18 | T19 | T20 | T21 | T22 | T23 | T24 | T25 | T26 | T27 | T28 | T29 | RULE_ID | RULE_SL_COMMENT | RULE_MULTI_NL | RULE_SINGLE_NL | RULE_WS | RULE_ANY_OTHER );\", 9, 16, input);\n+ if ( (LA9_24=='b') ) {\n+ int LA9_46 = input.LA(4);\n+\n+ if ( (LA9_46=='s') ) {\n+ int LA9_57 = input.LA(5);\n+\n+ if ( (LA9_57=='e') ) {\n+ int LA9_68 = input.LA(6);\n+\n+ if ( (LA9_68=='c') ) {\n+ int LA9_75 = input.LA(7);\n \n- throw nvae;\n+ if ( (LA9_75=='t') ) {\n+ int LA9_79 = input.LA(8);\n+\n+ if ( (LA9_79=='i') ) {\n+ int LA9_87 = input.LA(9);\n+\n+ if ( (LA9_87=='o') ) {\n+ int LA9_92 = input.LA(10);\n+\n+ if ( (LA9_92=='n') ) {\n+ switch ( input.LA(11) ) {\n+ case '[':\n+ {\n+ alt9=3;\n+ }\n+ break;\n+ case ':':\n+ {\n+ alt9=14;\n+ }\n+ break;\n+ default:\n+ alt9=27;}\n+\n+ }\n+ else {\n+ alt9=27;}\n+ }\n+ else {\n+ alt9=27;}\n+ }\n+ else {\n+ alt9=27;}\n+ }\n+ else {\n+ alt9=27;}\n+ }\n+ else {\n+ alt9=27;}\n+ }\n+ else {\n+ alt9=27;}\n+ }\n+ else {\n+ alt9=27;}\n }\n+ else {\n+ alt9=27;}\n }\n break;\n- case 'e':\n+ default:\n+ alt9=27;}\n+\n+ }\n+ else if ( (LA9_0=='\\\\') ) {\n+ switch ( input.LA(2) ) {\n+ case '[':\n {\n- alt9=11;\n+ alt9=6;\n }\n break;\n- case 'a':\n+ case ']':\n {\n- alt9=12;\n+ alt9=7;\n }\n break;\n- case 'o':\n+ default:\n+ alt9=32;}\n+\n+ }\n+ else if ( (LA9_0=='i') ) {\n+ switch ( input.LA(2) ) {\n+ case 'm':\n {\n- alt9=14;\n+ int LA9_27 = input.LA(3);\n+\n+ if ( (LA9_27=='g') ) {\n+ switch ( input.LA(4) ) {\n+ case ':':\n+ {\n+ alt9=25;\n+ }\n+ break;\n+ case '[':\n+ {\n+ alt9=8;\n+ }\n+ break;\n+ default:\n+ alt9=27;}\n+\n }\n- break;\n- case 'l':\n- {\n- alt9=18;\n+ else {\n+ alt9=27;}\n }\n break;\n- case 'r':\n+ case 't':\n {\n- alt9=13;\n+ int LA9_28 = input.LA(3);\n+\n+ if ( (LA9_28=='e') ) {\n+ int LA9_48 = input.LA(4);\n+\n+ if ( (LA9_48=='m') ) {\n+ int LA9_60 = input.LA(5);\n+\n+ if ( (LA9_60=='[') ) {\n+ alt9=22;\n+ }\n+ else {\n+ alt9=27;}\n+ }\n+ else {\n+ alt9=27;}\n+ }\n+ else {\n+ alt9=27;}\n }\n break;\n default:\n- alt9=26;}\n+ alt9=27;}\n \n }\n else if ( (LA9_0==':') ) {\n- alt9=3;\n+ alt9=9;\n+ }\n+ else if ( (LA9_0==']') ) {\n+ alt9=10;\n }\n else if ( (LA9_0=='[') ) {\n- alt9=5;\n+ alt9=12;\n }\n- else if ( (LA9_0==']') ) {\n- alt9=6;\n+ else if ( (LA9_0=='e') ) {\n+ int LA9_8 = input.LA(2);\n+\n+ if ( (LA9_8=='m') ) {\n+ int LA9_32 = input.LA(3);\n+\n+ if ( (LA9_32=='p') ) {\n+ int LA9_49 = input.LA(4);\n+\n+ if ( (LA9_49=='h') ) {\n+ int LA9_61 = input.LA(5);\n+\n+ if ( (LA9_61=='[') ) {\n+ alt9=17;\n+ }\n+ else {\n+ alt9=27;}\n+ }\n+ else {\n+ alt9=27;}\n+ }\n+ else {\n+ alt9=27;}\n+ }\n+ else {\n+ alt9=27;}\n+ }\n+ else if ( (LA9_0=='a') ) {\n+ int LA9_9 = input.LA(2);\n+\n+ if ( (LA9_9=='[') ) {\n+ alt9=18;\n+ }\n+ else {\n+ alt9=27;}\n+ }\n+ else if ( (LA9_0=='r') ) {\n+ int LA9_10 = input.LA(2);\n+\n+ if ( (LA9_10=='e') ) {\n+ int LA9_34 = input.LA(3);\n+\n+ if ( (LA9_34=='f') ) {\n+ int LA9_50 = input.LA(4);\n+\n+ if ( (LA9_50==':') ) {\n+ alt9=19;\n+ }\n+ else {\n+ alt9=27;}\n+ }\n+ else {\n+ alt9=27;}\n+ }\n+ else {\n+ alt9=27;}\n+ }\n+ else if ( (LA9_0=='o') ) {\n+ int LA9_11 = input.LA(2);\n+\n+ if ( (LA9_11=='l') ) {\n+ int LA9_35 = input.LA(3);\n+\n+ if ( (LA9_35=='[') ) {\n+ alt9=20;\n+ }\n+ else {\n+ alt9=27;}\n+ }\n+ else {\n+ alt9=27;}\n }\n- else if ( ((LA9_0>='A' && LA9_0<='Z')||LA9_0=='_'||(LA9_0>='a' && LA9_0<='z')) ) {\n- alt9=21;\n+ else if ( (LA9_0=='u') ) {\n+ int LA9_12 = input.LA(2);\n+\n+ if ( (LA9_12=='l') ) {\n+ int LA9_36 = input.LA(3);\n+\n+ if ( (LA9_36=='[') ) {\n+ alt9=21;\n+ }\n+ else {\n+ alt9=27;}\n+ }\n+ else {\n+ alt9=27;}\n+ }\n+ else if ( (LA9_0=='l') ) {\n+ int LA9_13 = input.LA(2);\n+\n+ if ( (LA9_13=='i') ) {\n+ int LA9_37 = input.LA(3);\n+\n+ if ( (LA9_37=='n') ) {\n+ int LA9_53 = input.LA(4);\n+\n+ if ( (LA9_53=='k') ) {\n+ int LA9_63 = input.LA(5);\n+\n+ if ( (LA9_63=='[') ) {\n+ alt9=24;\n+ }\n+ else {\n+ alt9=27;}\n+ }\n+ else {\n+ alt9=27;}\n+ }\n+ else {\n+ alt9=27;}\n+ }\n+ else {\n+ alt9=27;}\n+ }\n+ else if ( ((LA9_0>='A' && LA9_0<='Z')||LA9_0=='_'||LA9_0=='b'||LA9_0=='d'||(LA9_0>='f' && LA9_0<='h')||(LA9_0>='j' && LA9_0<='k')||(LA9_0>='m' && LA9_0<='n')||(LA9_0>='p' && LA9_0<='q')||LA9_0=='t'||(LA9_0>='v' && LA9_0<='z')) ) {\n+ alt9=27;\n }\n else if ( (LA9_0=='%') ) {\n- int LA9_6 = input.LA(2);\n+ int LA9_15 = input.LA(2);\n \n- if ( (LA9_6=='%') ) {\n- alt9=22;\n+ if ( (LA9_15=='%') ) {\n+ alt9=28;\n }\n else {\n- alt9=26;}\n+ alt9=32;}\n }\n else if ( (LA9_0=='\\r') ) {\n- int LA9_7 = input.LA(2);\n+ int LA9_16 = input.LA(2);\n \n- if ( (LA9_7=='\\n') ) {\n- int LA9_27 = input.LA(3);\n+ if ( (LA9_16=='\\n') ) {\n+ int LA9_39 = input.LA(3);\n \n- if ( (LA9_27=='\\n'||LA9_27=='\\r') ) {\n- alt9=23;\n+ if ( (LA9_39=='\\n'||LA9_39=='\\r') ) {\n+ alt9=29;\n }\n else {\n- alt9=24;}\n+ alt9=30;}\n }\n else {\n- alt9=26;}\n+ alt9=32;}\n }\n else if ( (LA9_0=='\\n') ) {\n- int LA9_8 = input.LA(2);\n+ int LA9_17 = input.LA(2);\n \n- if ( (LA9_8=='\\n'||LA9_8=='\\r') ) {\n- alt9=23;\n+ if ( (LA9_17=='\\n'||LA9_17=='\\r') ) {\n+ alt9=29;\n }\n else {\n- alt9=24;}\n+ alt9=30;}\n }\n else if ( (LA9_0=='\\t'||LA9_0==' ') ) {\n- alt9=25;\n+ alt9=31;\n }\n else if ( ((LA9_0>='\\u0000' && LA9_0<='\\b')||(LA9_0>='\\u000B' && LA9_0<='\\f')||(LA9_0>='\\u000E' && LA9_0<='\\u001F')||(LA9_0>='!' && LA9_0<='$')||(LA9_0>='&' && LA9_0<='9')||(LA9_0>=';' && LA9_0<='@')||LA9_0=='^'||LA9_0=='`'||(LA9_0>='{' && LA9_0<='\\uFFFE')) ) {\n- alt9=26;\n+ alt9=32;\n }\n else {\n NoViableAltException nvae =\n- new NoViableAltException(\"1:1: Tokens : ( T10 | T11 | T12 | T13 | T14 | T15 | T16 | T17 | T18 | T19 | T20 | T21 | T22 | T23 | T24 | T25 | T26 | T27 | T28 | T29 | RULE_ID | RULE_SL_COMMENT | RULE_MULTI_NL | RULE_SINGLE_NL | RULE_WS | RULE_ANY_OTHER );\", 9, 0, input);\n+ new NoViableAltException(\"1:1: Tokens : ( T10 | T11 | T12 | T13 | T14 | T15 | T16 | T17 | T18 | T19 | T20 | T21 | T22 | T23 | T24 | T25 | T26 | T27 | T28 | T29 | T30 | T31 | T32 | T33 | T34 | T35 | RULE_ID | RULE_SL_COMMENT | RULE_MULTI_NL | RULE_SINGLE_NL | RULE_WS | RULE_ANY_OTHER );\", 9, 0, input);\n \n throw nvae;\n }\n@@ -1131,42 +1503,84 @@ else if ( (LA9_0=='\\t'||LA9_0==' ') ) {\n }\n break;\n case 21 :\n- // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:1:90: RULE_ID\n+ // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:1:90: T30\n {\n- mRULE_ID(); \n+ mT30(); \n \n }\n break;\n case 22 :\n- // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:1:98: RULE_SL_COMMENT\n+ // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:1:94: T31\n {\n- mRULE_SL_COMMENT(); \n+ mT31(); \n \n }\n break;\n case 23 :\n- // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:1:114: RULE_MULTI_NL\n+ // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:1:98: T32\n {\n- mRULE_MULTI_NL(); \n+ mT32(); \n \n }\n break;\n case 24 :\n- // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:1:128: RULE_SINGLE_NL\n+ // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:1:102: T33\n {\n- mRULE_SINGLE_NL(); \n+ mT33(); \n \n }\n break;\n case 25 :\n- // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:1:143: RULE_WS\n+ // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:1:106: T34\n {\n- mRULE_WS(); \n+ mT34(); \n \n }\n break;\n case 26 :\n- // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:1:151: RULE_ANY_OTHER\n+ // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:1:110: T35\n+ {\n+ mT35(); \n+\n+ }\n+ break;\n+ case 27 :\n+ // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:1:114: RULE_ID\n+ {\n+ mRULE_ID(); \n+\n+ }\n+ break;\n+ case 28 :\n+ // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:1:122: RULE_SL_COMMENT\n+ {\n+ mRULE_SL_COMMENT(); \n+\n+ }\n+ break;\n+ case 29 :\n+ // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:1:138: RULE_MULTI_NL\n+ {\n+ mRULE_MULTI_NL(); \n+\n+ }\n+ break;\n+ case 30 :\n+ // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:1:152: RULE_SINGLE_NL\n+ {\n+ mRULE_SINGLE_NL(); \n+\n+ }\n+ break;\n+ case 31 :\n+ // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:1:167: RULE_WS\n+ {\n+ mRULE_WS(); \n+\n+ }\n+ break;\n+ case 32 :\n+ // ../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g:1:175: RULE_ANY_OTHER\n {\n mRULE_ANY_OTHER(); \n ", "raw_url": "https://github.com/RvonMassow/xDoc/raw/6b0eb897ce8abe5cda472a8e6af89cd62a47dd66/org.eclipse.xtext.xdoc.ui%2Fsrc-gen%2Forg%2Feclipse%2Fxtext%2Fxdoc%2Fui%2Fcontentassist%2Fantlr%2Finternal%2FInternalXDocLexer.java", "sha": "04fb3420149cbc95405e3ea1a112f26242c5e7d9", "status": "modified" }, { "additions": 33, "blob_url": "https://github.com/RvonMassow/xDoc/blob/6b0eb897ce8abe5cda472a8e6af89cd62a47dd66/org.eclipse.xtext.xdoc.ui%2Fsrc-gen%2Forg%2Feclipse%2Fxtext%2Fxdoc%2Fui%2Fcontentassist%2Fantlr%2Finternal%2FInternalXDoc__.g", "changes": 60, "contents_url": "https://api.github.com/repos/RvonMassow/xDoc/contents/org.eclipse.xtext.xdoc.ui%2Fsrc-gen%2Forg%2Feclipse%2Fxtext%2Fxdoc%2Fui%2Fcontentassist%2Fantlr%2Finternal%2FInternalXDoc__.g?ref=6b0eb897ce8abe5cda472a8e6af89cd62a47dd66", "deletions": 27, "filename": "org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc__.g", "new_code": "T10 : 'chapter[' ;\nT11 : 'section[' ;\nT12 : 'subsection[' ;\nT13 : 'section3[' ;\nT14 : 'section4[' ;\nT15 : '\\\\[' ;\nT16 : '\\\\]' ;\nT17 : 'img[' ;\nT18 : ':' ;\nT19 : ']' ;\nT20 : 'chapter:' ;\nT21 : '[' ;\nT22 : 'section:' ;\nT23 : 'subsection:' ;\nT24 : 'section3:' ;\nT25 : 'section4:' ;\nT26 : 'emph[' ;\nT27 : 'a[' ;\nT28 : 'ref:' ;\nT29 : 'ol[' ;\nT30 : 'ul[' ;\nT31 : 'item[' ;\nT32 : 'codeRef[' ;\nT33 : 'link[' ;\nT34 : 'img:' ;\nT35 : 'code[' ;\n\n// $ANTLR src \"../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g\" 7089\n// $ANTLR src \"../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g\" 7091\n// $ANTLR src \"../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g\" 7093\n// $ANTLR src \"../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g\" 7095\n// $ANTLR src \"../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g\" 7097\n// $ANTLR src \"../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g\" 7099", "new_methods": [], "old_code": "T10 : '\\\\[' ;\nT11 : '\\\\]' ;\nT12 : ':' ;\nT13 : '\\\\chapter' ;\nT14 : '[' ;\nT15 : ']' ;\nT16 : '\\\\section' ;\nT17 : '\\\\subsection' ;\nT18 : '\\\\section3' ;\nT19 : '\\\\section4' ;\nT20 : '\\\\emph' ;\nT21 : '\\\\a' ;\nT22 : '\\\\ref' ;\nT23 : '\\\\ol' ;\nT24 : '\\\\ul' ;\nT25 : '\\\\item' ;\nT26 : '\\\\codeRef' ;\nT27 : '\\\\link' ;\nT28 : '\\\\img' ;\nT29 : '\\\\code' ;\n\n// $ANTLR src \"../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g\" 7728\n// $ANTLR src \"../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g\" 7730\n// $ANTLR src \"../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g\" 7732\n// $ANTLR src \"../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g\" 7734\n// $ANTLR src \"../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g\" 7736\n// $ANTLR src \"../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g\" 7738", "old_methods": [], "patch": "@@ -7,43 +7,49 @@ package org.eclipse.xtext.xdoc.ui.contentassist.antlr.internal;\n import org.eclipse.xtext.ui.editor.contentassist.antlr.internal.Lexer;\n }\n \n-T10 : '\\\\[' ;\n-T11 : '\\\\]' ;\n-T12 : ':' ;\n-T13 : '\\\\chapter' ;\n-T14 : '[' ;\n-T15 : ']' ;\n-T16 : '\\\\section' ;\n-T17 : '\\\\subsection' ;\n-T18 : '\\\\section3' ;\n-T19 : '\\\\section4' ;\n-T20 : '\\\\emph' ;\n-T21 : '\\\\a' ;\n-T22 : '\\\\ref' ;\n-T23 : '\\\\ol' ;\n-T24 : '\\\\ul' ;\n-T25 : '\\\\item' ;\n-T26 : '\\\\codeRef' ;\n-T27 : '\\\\link' ;\n-T28 : '\\\\img' ;\n-T29 : '\\\\code' ;\n-\n-// $ANTLR src \"../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g\" 7728\n+T10 : 'chapter[' ;\n+T11 : 'section[' ;\n+T12 : 'subsection[' ;\n+T13 : 'section3[' ;\n+T14 : 'section4[' ;\n+T15 : '\\\\[' ;\n+T16 : '\\\\]' ;\n+T17 : 'img[' ;\n+T18 : ':' ;\n+T19 : ']' ;\n+T20 : 'chapter:' ;\n+T21 : '[' ;\n+T22 : 'section:' ;\n+T23 : 'subsection:' ;\n+T24 : 'section3:' ;\n+T25 : 'section4:' ;\n+T26 : 'emph[' ;\n+T27 : 'a[' ;\n+T28 : 'ref:' ;\n+T29 : 'ol[' ;\n+T30 : 'ul[' ;\n+T31 : 'item[' ;\n+T32 : 'codeRef[' ;\n+T33 : 'link[' ;\n+T34 : 'img:' ;\n+T35 : 'code[' ;\n+\n+// $ANTLR src \"../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g\" 7089\n RULE_ID : ('a'..'z'|'A'..'Z'|'_') ('a'..'z'|'A'..'Z'|'_'|'0'..'9')*;\n \n-// $ANTLR src \"../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g\" 7730\n+// $ANTLR src \"../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g\" 7091\n RULE_SL_COMMENT : '%%' ~(('\\n'|'\\r'))* ('\\r'? '\\n')?;\n \n-// $ANTLR src \"../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g\" 7732\n+// $ANTLR src \"../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g\" 7093\n RULE_MULTI_NL : '\\r'? '\\n' ('\\r'? '\\n')+;\n \n-// $ANTLR src \"../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g\" 7734\n+// $ANTLR src \"../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g\" 7095\n RULE_SINGLE_NL : '\\r'? '\\n';\n \n-// $ANTLR src \"../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g\" 7736\n+// $ANTLR src \"../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g\" 7097\n RULE_WS : (' '|'\\t');\n \n-// $ANTLR src \"../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g\" 7738\n+// $ANTLR src \"../org.eclipse.xtext.xdoc.ui/src-gen/org/eclipse/xtext/xdoc/ui/contentassist/antlr/internal/InternalXDoc.g\" 7099\n RULE_ANY_OTHER : .;\n \n ", "raw_url": "https://github.com/RvonMassow/xDoc/raw/6b0eb897ce8abe5cda472a8e6af89cd62a47dd66/org.eclipse.xtext.xdoc.ui%2Fsrc-gen%2Forg%2Feclipse%2Fxtext%2Fxdoc%2Fui%2Fcontentassist%2Fantlr%2Finternal%2FInternalXDoc__.g", "sha": "03b175e5929573f20be2276921d83a0f1876a7d5", "status": "modified" }, { "additions": 61, "blob_url": "https://github.com/RvonMassow/xDoc/blob/6b0eb897ce8abe5cda472a8e6af89cd62a47dd66/org.eclipse.xtext.xdoc%2Fsrc-gen%2Forg%2Feclipse%2Fxtext%2Fxdoc%2FXDoc.xmi", "changes": 130, "contents_url": "https://api.github.com/repos/RvonMassow/xDoc/contents/org.eclipse.xtext.xdoc%2Fsrc-gen%2Forg%2Feclipse%2Fxtext%2Fxdoc%2FXDoc.xmi?ref=6b0eb897ce8abe5cda472a8e6af89cd62a47dd66", "deletions": 69, "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/XDoc.xmi", "new_code": " <elements xsi:type=\"xtext:Alternatives\">\n <elements xsi:type=\"xtext:Group\">\n <elements xsi:type=\"xtext:Keyword\" value=\"chapter:\"/>\n <elements xsi:type=\"xtext:Assignment\" feature=\"name\" operator=\"=\">\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"//@rules.25\"/>\n </elements>\n <elements xsi:type=\"xtext:Keyword\" value=\"[\"/>\n <elements xsi:type=\"xtext:Keyword\" value=\"chapter[\"/>\n <elements xsi:type=\"xtext:Alternatives\">\n <elements xsi:type=\"xtext:Group\">\n <elements xsi:type=\"xtext:Keyword\" value=\"section:\"/>\n <elements xsi:type=\"xtext:Assignment\" feature=\"name\" operator=\"=\">\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"//@rules.25\"/>\n </elements>\n <elements xsi:type=\"xtext:Keyword\" value=\"[\"/>\n <elements xsi:type=\"xtext:Keyword\" value=\"section[\"/>\n <elements xsi:type=\"xtext:Alternatives\">\n <elements xsi:type=\"xtext:Group\">\n <elements xsi:type=\"xtext:Keyword\" value=\"subsection:\"/>\n <elements xsi:type=\"xtext:Assignment\" feature=\"name\" operator=\"=\">\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"//@rules.25\"/>\n </elements>\n <elements xsi:type=\"xtext:Keyword\" value=\"[\"/>\n <elements xsi:type=\"xtext:Keyword\" value=\"subsection[\"/>\n <elements xsi:type=\"xtext:Alternatives\">\n <elements xsi:type=\"xtext:Group\">\n <elements xsi:type=\"xtext:Keyword\" value=\"section3:\"/>\n <elements xsi:type=\"xtext:Assignment\" feature=\"name\" operator=\"=\">\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"//@rules.25\"/>\n </elements>\n <elements xsi:type=\"xtext:Keyword\" value=\"[\"/>\n <elements xsi:type=\"xtext:Keyword\" value=\"section3[\"/>\n <elements xsi:type=\"xtext:Alternatives\">\n <elements xsi:type=\"xtext:Group\">\n <elements xsi:type=\"xtext:Keyword\" value=\"section4:\"/>\n <elements xsi:type=\"xtext:Assignment\" feature=\"name\" operator=\"=\">\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"//@rules.25\"/>\n </elements>\n <elements xsi:type=\"xtext:Keyword\" value=\"[\"/>\n <elements xsi:type=\"xtext:Keyword\" value=\"section4[\"/>\n <elements xsi:type=\"xtext:Keyword\" value=\"emph[\"/>\n <elements xsi:type=\"xtext:Keyword\" value=\"a[\"/>\n <elements xsi:type=\"xtext:Keyword\" value=\"]\"/>\n <elements xsi:type=\"xtext:Keyword\" value=\"ref:\"/>\n <elements xsi:type=\"xtext:Keyword\" value=\"ol[\"/>\n <elements xsi:type=\"xtext:Keyword\" value=\"ul[\"/>\n <elements xsi:type=\"xtext:Keyword\" value=\"item[\"/>\n <elements xsi:type=\"xtext:Keyword\" value=\"codeRef[\"/>\n <elements xsi:type=\"xtext:Keyword\" value=\"link[\"/>\n <elements xsi:type=\"xtext:Alternatives\">\n <elements xsi:type=\"xtext:Group\">\n <elements xsi:type=\"xtext:Keyword\" value=\"img:\"/>\n <elements xsi:type=\"xtext:RuleCall\" cardinality=\"*\" rule=\"//@rules.24\"/>\n <elements xsi:type=\"xtext:Assignment\" feature=\"name\" operator=\"=\">\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"//@rules.25\"/>\n </elements>\n <elements xsi:type=\"xtext:RuleCall\" cardinality=\"*\" rule=\"//@rules.24\"/>\n <elements xsi:type=\"xtext:Keyword\" value=\"[\"/>\n <elements xsi:type=\"xtext:Keyword\" value=\"img[\"/>\n <elements xsi:type=\"xtext:Keyword\" value=\"code[\"/>\n <elements xsi:type=\"xtext:Keyword\" value=\"[\"/>", "new_methods": [], "old_code": " <elements xsi:type=\"xtext:Keyword\" value=\"\\chapter\"/>\n <elements xsi:type=\"xtext:Group\" cardinality=\"?\">\n <elements xsi:type=\"xtext:Keyword\" value=\":\"/>\n <elements xsi:type=\"xtext:Assignment\" feature=\"name\" operator=\"=\">\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"//@rules.25\"/>\n <elements xsi:type=\"xtext:Keyword\" value=\"[\"/>\n <elements xsi:type=\"xtext:Keyword\" value=\"\\section\"/>\n <elements xsi:type=\"xtext:Group\" cardinality=\"?\">\n <elements xsi:type=\"xtext:Keyword\" value=\":\"/>\n <elements xsi:type=\"xtext:Assignment\" feature=\"name\" operator=\"=\">\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"//@rules.25\"/>\n <elements xsi:type=\"xtext:Keyword\" value=\"[\"/>\n <elements xsi:type=\"xtext:Keyword\" value=\"\\subsection\"/>\n <elements xsi:type=\"xtext:Group\" cardinality=\"?\">\n <elements xsi:type=\"xtext:Keyword\" value=\":\"/>\n <elements xsi:type=\"xtext:Assignment\" feature=\"name\" operator=\"=\">\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"//@rules.25\"/>\n <elements xsi:type=\"xtext:Keyword\" value=\"[\"/>\n <elements xsi:type=\"xtext:Keyword\" value=\"\\section3\"/>\n <elements xsi:type=\"xtext:Group\" cardinality=\"?\">\n <elements xsi:type=\"xtext:Keyword\" value=\":\"/>\n <elements xsi:type=\"xtext:Assignment\" feature=\"name\" operator=\"=\">\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"//@rules.25\"/>\n <elements xsi:type=\"xtext:Keyword\" value=\"[\"/>\n <elements xsi:type=\"xtext:Keyword\" value=\"\\section4\"/>\n <elements xsi:type=\"xtext:Group\" cardinality=\"?\">\n <elements xsi:type=\"xtext:Keyword\" value=\":\"/>\n <elements xsi:type=\"xtext:Assignment\" feature=\"name\" operator=\"=\">\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"//@rules.25\"/>\n <elements xsi:type=\"xtext:Keyword\" value=\"[\"/>\n <elements xsi:type=\"xtext:Keyword\" value=\":\"/>\n <elements xsi:type=\"xtext:Keyword\" value=\"\\emph\"/>\n <elements xsi:type=\"xtext:Keyword\" value=\"[\"/>\n <elements xsi:type=\"xtext:Keyword\" value=\"\\a\"/>\n <elements xsi:type=\"xtext:Keyword\" value=\":\"/>\n <elements xsi:type=\"xtext:Group\" cardinality=\"?\">\n <elements xsi:type=\"xtext:Keyword\" value=\"[\"/>\n <elements xsi:type=\"xtext:Keyword\" value=\"]\"/>\n </elements>\n <elements xsi:type=\"xtext:Keyword\" value=\"\\ref\"/>\n <elements xsi:type=\"xtext:Keyword\" value=\":\"/>\n <elements xsi:type=\"xtext:Keyword\" value=\"\\ol\"/>\n <elements xsi:type=\"xtext:RuleCall\" cardinality=\"*\" rule=\"//@rules.24\"/>\n <elements xsi:type=\"xtext:Keyword\" value=\"[\"/>\n <elements xsi:type=\"xtext:Keyword\" value=\"\\ul\"/>\n <elements xsi:type=\"xtext:RuleCall\" cardinality=\"*\" rule=\"//@rules.24\"/>\n <elements xsi:type=\"xtext:Keyword\" value=\"[\"/>\n <elements xsi:type=\"xtext:Keyword\" value=\"\\item\"/>\n <elements xsi:type=\"xtext:RuleCall\" cardinality=\"*\" rule=\"//@rules.24\"/>\n <elements xsi:type=\"xtext:Keyword\" value=\"[\"/>\n <elements xsi:type=\"xtext:Keyword\" value=\"\\codeRef\"/>\n <elements xsi:type=\"xtext:RuleCall\" cardinality=\"*\" rule=\"//@rules.24\"/>\n <elements xsi:type=\"xtext:Keyword\" value=\"[\"/>\n <elements xsi:type=\"xtext:Keyword\" value=\"\\link\"/>\n <elements xsi:type=\"xtext:RuleCall\" cardinality=\"*\" rule=\"//@rules.24\"/>\n <elements xsi:type=\"xtext:Keyword\" value=\"[\"/>\n <elements xsi:type=\"xtext:Keyword\" value=\"\\img\"/>\n <elements xsi:type=\"xtext:RuleCall\" cardinality=\"*\" rule=\"//@rules.24\"/>\n <elements xsi:type=\"xtext:Group\" cardinality=\"?\">\n <elements xsi:type=\"xtext:Keyword\" value=\":\"/>\n <elements xsi:type=\"xtext:RuleCall\" cardinality=\"*\" rule=\"//@rules.24\"/>\n <elements xsi:type=\"xtext:Assignment\" feature=\"name\" operator=\"=\">\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"//@rules.25\"/>\n <elements xsi:type=\"xtext:RuleCall\" cardinality=\"*\" rule=\"//@rules.24\"/>\n <elements xsi:type=\"xtext:Keyword\" value=\"[\"/>\n <elements xsi:type=\"xtext:Keyword\" value=\"\\code\"/>\n <elements xsi:type=\"xtext:RuleCall\" cardinality=\"*\" rule=\"//@rules.24\"/>\n <elements xsi:type=\"xtext:Keyword\" value=\"[\"/>\n <elements xsi:type=\"xtext:Keyword\" value=\"[\"/>", "old_methods": [], "patch": "@@ -66,14 +66,16 @@\n <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/xtext/xdoc/Xdoc#//Chapter\"/>\n </type>\n <alternatives xsi:type=\"xtext:Group\">\n- <elements xsi:type=\"xtext:Keyword\" value=\"\\chapter\"/>\n- <elements xsi:type=\"xtext:Group\" cardinality=\"?\">\n- <elements xsi:type=\"xtext:Keyword\" value=\":\"/>\n- <elements xsi:type=\"xtext:Assignment\" feature=\"name\" operator=\"=\">\n- <terminal xsi:type=\"xtext:RuleCall\" rule=\"//@rules.25\"/>\n+ <elements xsi:type=\"xtext:Alternatives\">\n+ <elements xsi:type=\"xtext:Group\">\n+ <elements xsi:type=\"xtext:Keyword\" value=\"chapter:\"/>\n+ <elements xsi:type=\"xtext:Assignment\" feature=\"name\" operator=\"=\">\n+ <terminal xsi:type=\"xtext:RuleCall\" rule=\"//@rules.25\"/>\n+ </elements>\n+ <elements xsi:type=\"xtext:Keyword\" value=\"[\"/>\n </elements>\n+ <elements xsi:type=\"xtext:Keyword\" value=\"chapter[\"/>\n </elements>\n- <elements xsi:type=\"xtext:Keyword\" value=\"[\"/>\n <elements xsi:type=\"xtext:Assignment\" feature=\"title\" operator=\"=\">\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"//@rules.7\"/>\n </elements>\n@@ -97,14 +99,16 @@\n <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/xtext/xdoc/Xdoc#//Section\"/>\n </type>\n <alternatives xsi:type=\"xtext:Group\">\n- <elements xsi:type=\"xtext:Keyword\" value=\"\\section\"/>\n- <elements xsi:type=\"xtext:Group\" cardinality=\"?\">\n- <elements xsi:type=\"xtext:Keyword\" value=\":\"/>\n- <elements xsi:type=\"xtext:Assignment\" feature=\"name\" operator=\"=\">\n- <terminal xsi:type=\"xtext:RuleCall\" rule=\"//@rules.25\"/>\n+ <elements xsi:type=\"xtext:Alternatives\">\n+ <elements xsi:type=\"xtext:Group\">\n+ <elements xsi:type=\"xtext:Keyword\" value=\"section:\"/>\n+ <elements xsi:type=\"xtext:Assignment\" feature=\"name\" operator=\"=\">\n+ <terminal xsi:type=\"xtext:RuleCall\" rule=\"//@rules.25\"/>\n+ </elements>\n+ <elements xsi:type=\"xtext:Keyword\" value=\"[\"/>\n </elements>\n+ <elements xsi:type=\"xtext:Keyword\" value=\"section[\"/>\n </elements>\n- <elements xsi:type=\"xtext:Keyword\" value=\"[\"/>\n <elements xsi:type=\"xtext:Assignment\" feature=\"title\" operator=\"=\">\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"//@rules.7\"/>\n </elements>\n@@ -128,14 +132,16 @@\n <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/xtext/xdoc/Xdoc#//SubSection\"/>\n </type>\n <alternatives xsi:type=\"xtext:Group\">\n- <elements xsi:type=\"xtext:Keyword\" value=\"\\subsection\"/>\n- <elements xsi:type=\"xtext:Group\" cardinality=\"?\">\n- <elements xsi:type=\"xtext:Keyword\" value=\":\"/>\n- <elements xsi:type=\"xtext:Assignment\" feature=\"name\" operator=\"=\">\n- <terminal xsi:type=\"xtext:RuleCall\" rule=\"//@rules.25\"/>\n+ <elements xsi:type=\"xtext:Alternatives\">\n+ <elements xsi:type=\"xtext:Group\">\n+ <elements xsi:type=\"xtext:Keyword\" value=\"subsection:\"/>\n+ <elements xsi:type=\"xtext:Assignment\" feature=\"name\" operator=\"=\">\n+ <terminal xsi:type=\"xtext:RuleCall\" rule=\"//@rules.25\"/>\n+ </elements>\n+ <elements xsi:type=\"xtext:Keyword\" value=\"[\"/>\n </elements>\n+ <elements xsi:type=\"xtext:Keyword\" value=\"subsection[\"/>\n </elements>\n- <elements xsi:type=\"xtext:Keyword\" value=\"[\"/>\n <elements xsi:type=\"xtext:Assignment\" feature=\"title\" operator=\"=\">\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"//@rules.7\"/>\n </elements>\n@@ -159,14 +165,16 @@\n <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/xtext/xdoc/Xdoc#//Section3\"/>\n </type>\n <alternatives xsi:type=\"xtext:Group\">\n- <elements xsi:type=\"xtext:Keyword\" value=\"\\section3\"/>\n- <elements xsi:type=\"xtext:Group\" cardinality=\"?\">\n- <elements xsi:type=\"xtext:Keyword\" value=\":\"/>\n- <elements xsi:type=\"xtext:Assignment\" feature=\"name\" operator=\"=\">\n- <terminal xsi:type=\"xtext:RuleCall\" rule=\"//@rules.25\"/>\n+ <elements xsi:type=\"xtext:Alternatives\">\n+ <elements xsi:type=\"xtext:Group\">\n+ <elements xsi:type=\"xtext:Keyword\" value=\"section3:\"/>\n+ <elements xsi:type=\"xtext:Assignment\" feature=\"name\" operator=\"=\">\n+ <terminal xsi:type=\"xtext:RuleCall\" rule=\"//@rules.25\"/>\n+ </elements>\n+ <elements xsi:type=\"xtext:Keyword\" value=\"[\"/>\n </elements>\n+ <elements xsi:type=\"xtext:Keyword\" value=\"section3[\"/>\n </elements>\n- <elements xsi:type=\"xtext:Keyword\" value=\"[\"/>\n <elements xsi:type=\"xtext:Assignment\" feature=\"title\" operator=\"=\">\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"//@rules.7\"/>\n </elements>\n@@ -190,14 +198,16 @@\n <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/xtext/xdoc/Xdoc#//Section4\"/>\n </type>\n <alternatives xsi:type=\"xtext:Group\">\n- <elements xsi:type=\"xtext:Keyword\" value=\"\\section4\"/>\n- <elements xsi:type=\"xtext:Group\" cardinality=\"?\">\n- <elements xsi:type=\"xtext:Keyword\" value=\":\"/>\n- <elements xsi:type=\"xtext:Assignment\" feature=\"name\" operator=\"=\">\n- <terminal xsi:type=\"xtext:RuleCall\" rule=\"//@rules.25\"/>\n+ <elements xsi:type=\"xtext:Alternatives\">\n+ <elements xsi:type=\"xtext:Group\">\n+ <elements xsi:type=\"xtext:Keyword\" value=\"section4:\"/>\n+ <elements xsi:type=\"xtext:Assignment\" feature=\"name\" operator=\"=\">\n+ <terminal xsi:type=\"xtext:RuleCall\" rule=\"//@rules.25\"/>\n+ </elements>\n+ <elements xsi:type=\"xtext:Keyword\" value=\"[\"/>\n </elements>\n+ <elements xsi:type=\"xtext:Keyword\" value=\"section4[\"/>\n </elements>\n- <elements xsi:type=\"xtext:Keyword\" value=\"[\"/>\n <elements xsi:type=\"xtext:Assignment\" feature=\"title\" operator=\"=\">\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"//@rules.7\"/>\n </elements>\n@@ -270,7 +280,6 @@\n <elements xsi:type=\"xtext:RuleCall\" rule=\"//@rules.30\"/>\n <elements xsi:type=\"xtext:Keyword\" value=\"\\[\"/>\n <elements xsi:type=\"xtext:Keyword\" value=\"\\]\"/>\n- <elements xsi:type=\"xtext:Keyword\" value=\":\"/>\n </alternatives>\n </rules>\n <rules xsi:type=\"xtext:ParserRule\" name=\"MarkUp\">\n@@ -294,8 +303,7 @@\n <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/xtext/xdoc/Xdoc#//Emphasize\"/>\n </type>\n <alternatives xsi:type=\"xtext:Group\">\n- <elements xsi:type=\"xtext:Keyword\" value=\"\\emph\"/>\n- <elements xsi:type=\"xtext:Keyword\" value=\"[\"/>\n+ <elements xsi:type=\"xtext:Keyword\" value=\"emph[\"/>\n <elements xsi:type=\"xtext:RuleCall\" cardinality=\"?\" rule=\"//@rules.27\"/>\n <elements xsi:type=\"xtext:Assignment\" feature=\"contents\" operator=\"+=\">\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"//@rules.7\"/>\n@@ -309,24 +317,19 @@\n <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/xtext/xdoc/Xdoc#//Anchor\"/>\n </type>\n <alternatives xsi:type=\"xtext:Group\">\n- <elements xsi:type=\"xtext:Keyword\" value=\"\\a\"/>\n- <elements xsi:type=\"xtext:Keyword\" value=\":\"/>\n+ <elements xsi:type=\"xtext:Keyword\" value=\"a[\"/>\n <elements xsi:type=\"xtext:Assignment\" feature=\"name\" operator=\"=\">\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"//@rules.25\"/>\n </elements>\n- <elements xsi:type=\"xtext:Group\" cardinality=\"?\">\n- <elements xsi:type=\"xtext:Keyword\" value=\"[\"/>\n- <elements xsi:type=\"xtext:Keyword\" value=\"]\"/>\n- </elements>\n+ <elements xsi:type=\"xtext:Keyword\" value=\"]\"/>\n </alternatives>\n </rules>\n <rules xsi:type=\"xtext:ParserRule\" name=\"Ref\">\n <type metamodel=\"//@metamodelDeclarations.2\">\n <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/xtext/xdoc/Xdoc#//Ref\"/>\n </type>\n <alternatives xsi:type=\"xtext:Group\">\n- <elements xsi:type=\"xtext:Keyword\" value=\"\\ref\"/>\n- <elements xsi:type=\"xtext:Keyword\" value=\":\"/>\n+ <elements xsi:type=\"xtext:Keyword\" value=\"ref:\"/>\n <elements xsi:type=\"xtext:Assignment\" feature=\"ref\" operator=\"=\">\n <terminal xsi:type=\"xtext:CrossReference\">\n <type metamodel=\"//@metamodelDeclarations.2\">\n@@ -349,9 +352,7 @@\n <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/xtext/xdoc/Xdoc#//OrderedList\"/>\n </type>\n <alternatives xsi:type=\"xtext:Group\">\n- <elements xsi:type=\"xtext:Keyword\" value=\"\\ol\"/>\n- <elements xsi:type=\"xtext:RuleCall\" cardinality=\"*\" rule=\"//@rules.24\"/>\n- <elements xsi:type=\"xtext:Keyword\" value=\"[\"/>\n+ <elements xsi:type=\"xtext:Keyword\" value=\"ol[\"/>\n <elements xsi:type=\"xtext:Group\" cardinality=\"+\">\n <elements xsi:type=\"xtext:RuleCall\" cardinality=\"*\" rule=\"//@rules.24\"/>\n <elements xsi:type=\"xtext:Assignment\" feature=\"items\" operator=\"+=\">\n@@ -367,9 +368,7 @@\n <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/xtext/xdoc/Xdoc#//UnorderedList\"/>\n </type>\n <alternatives xsi:type=\"xtext:Group\">\n- <elements xsi:type=\"xtext:Keyword\" value=\"\\ul\"/>\n- <elements xsi:type=\"xtext:RuleCall\" cardinality=\"*\" rule=\"//@rules.24\"/>\n- <elements xsi:type=\"xtext:Keyword\" value=\"[\"/>\n+ <elements xsi:type=\"xtext:Keyword\" value=\"ul[\"/>\n <elements xsi:type=\"xtext:Group\" cardinality=\"+\">\n <elements xsi:type=\"xtext:RuleCall\" cardinality=\"*\" rule=\"//@rules.24\"/>\n <elements xsi:type=\"xtext:Assignment\" feature=\"items\" operator=\"+=\">\n@@ -385,9 +384,7 @@\n <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/xtext/xdoc/Xdoc#//Item\"/>\n </type>\n <alternatives xsi:type=\"xtext:Group\">\n- <elements xsi:type=\"xtext:Keyword\" value=\"\\item\"/>\n- <elements xsi:type=\"xtext:RuleCall\" cardinality=\"*\" rule=\"//@rules.24\"/>\n- <elements xsi:type=\"xtext:Keyword\" value=\"[\"/>\n+ <elements xsi:type=\"xtext:Keyword\" value=\"item[\"/>\n <elements xsi:type=\"xtext:RuleCall\" cardinality=\"?\" rule=\"//@rules.27\"/>\n <elements xsi:type=\"xtext:Assignment\" feature=\"contents\" operator=\"+=\">\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"//@rules.7\"/>\n@@ -406,9 +403,7 @@\n <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/xtext/xdoc/Xdoc#//CodeRef\"/>\n </type>\n <alternatives xsi:type=\"xtext:Group\">\n- <elements xsi:type=\"xtext:Keyword\" value=\"\\codeRef\"/>\n- <elements xsi:type=\"xtext:RuleCall\" cardinality=\"*\" rule=\"//@rules.24\"/>\n- <elements xsi:type=\"xtext:Keyword\" value=\"[\"/>\n+ <elements xsi:type=\"xtext:Keyword\" value=\"codeRef[\"/>\n <elements xsi:type=\"xtext:Assignment\" feature=\"element\" operator=\"=\">\n <terminal xsi:type=\"xtext:CrossReference\">\n <type metamodel=\"//@metamodelDeclarations.1\">\n@@ -425,9 +420,7 @@\n <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/xtext/xdoc/Xdoc#//Link\"/>\n </type>\n <alternatives xsi:type=\"xtext:Group\">\n- <elements xsi:type=\"xtext:Keyword\" value=\"\\link\"/>\n- <elements xsi:type=\"xtext:RuleCall\" cardinality=\"*\" rule=\"//@rules.24\"/>\n- <elements xsi:type=\"xtext:Keyword\" value=\"[\"/>\n+ <elements xsi:type=\"xtext:Keyword\" value=\"link[\"/>\n <elements xsi:type=\"xtext:Assignment\" feature=\"url\" operator=\"=\">\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"//@rules.9\"/>\n </elements>\n@@ -445,17 +438,18 @@\n <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/xtext/xdoc/Xdoc#//ImageRef\"/>\n </type>\n <alternatives xsi:type=\"xtext:Group\">\n- <elements xsi:type=\"xtext:Keyword\" value=\"\\img\"/>\n- <elements xsi:type=\"xtext:RuleCall\" cardinality=\"*\" rule=\"//@rules.24\"/>\n- <elements xsi:type=\"xtext:Group\" cardinality=\"?\">\n- <elements xsi:type=\"xtext:Keyword\" value=\":\"/>\n- <elements xsi:type=\"xtext:RuleCall\" cardinality=\"*\" rule=\"//@rules.24\"/>\n- <elements xsi:type=\"xtext:Assignment\" feature=\"name\" operator=\"=\">\n- <terminal xsi:type=\"xtext:RuleCall\" rule=\"//@rules.25\"/>\n+ <elements xsi:type=\"xtext:Alternatives\">\n+ <elements xsi:type=\"xtext:Group\">\n+ <elements xsi:type=\"xtext:Keyword\" value=\"img:\"/>\n+ <elements xsi:type=\"xtext:RuleCall\" cardinality=\"*\" rule=\"//@rules.24\"/>\n+ <elements xsi:type=\"xtext:Assignment\" feature=\"name\" operator=\"=\">\n+ <terminal xsi:type=\"xtext:RuleCall\" rule=\"//@rules.25\"/>\n+ </elements>\n+ <elements xsi:type=\"xtext:RuleCall\" cardinality=\"*\" rule=\"//@rules.24\"/>\n+ <elements xsi:type=\"xtext:Keyword\" value=\"[\"/>\n </elements>\n- <elements xsi:type=\"xtext:RuleCall\" cardinality=\"*\" rule=\"//@rules.24\"/>\n+ <elements xsi:type=\"xtext:Keyword\" value=\"img[\"/>\n </elements>\n- <elements xsi:type=\"xtext:Keyword\" value=\"[\"/>\n <elements xsi:type=\"xtext:Assignment\" feature=\"path\" operator=\"=\">\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"//@rules.9\"/>\n </elements>\n@@ -485,19 +479,17 @@\n <classifier xsi:type=\"ecore:EClass\" href=\"http://www.eclipse.org/xtext/xdoc/Xdoc#//CodeBlock\"/>\n </type>\n <alternatives xsi:type=\"xtext:Group\">\n- <elements xsi:type=\"xtext:Keyword\" value=\"\\code\"/>\n- <elements xsi:type=\"xtext:RuleCall\" cardinality=\"*\" rule=\"//@rules.24\"/>\n+ <elements xsi:type=\"xtext:Keyword\" value=\"code[\"/>\n <elements xsi:type=\"xtext:Group\" cardinality=\"?\">\n- <elements xsi:type=\"xtext:Keyword\" value=\"[\"/>\n <elements xsi:type=\"xtext:RuleCall\" cardinality=\"*\" rule=\"//@rules.24\"/>\n <elements xsi:type=\"xtext:Assignment\" feature=\"language\" operator=\"=\">\n <terminal xsi:type=\"xtext:RuleCall\" rule=\"//@rules.25\"/>\n </elements>\n <elements xsi:type=\"xtext:RuleCall\" cardinality=\"*\" rule=\"//@rules.24\"/>\n <elements xsi:type=\"xtext:Keyword\" value=\"]\"/>\n <elements xsi:type=\"xtext:RuleCall\" cardinality=\"*\" rule=\"//@rules.24\"/>\n+ <elements xsi:type=\"xtext:Keyword\" value=\"[\"/>\n </elements>\n- <elements xsi:type=\"xtext:Keyword\" value=\"[\"/>\n <elements xsi:type=\"xtext:Alternatives\">\n <elements xsi:type=\"xtext:Group\">\n <elements xsi:type=\"xtext:Assignment\" feature=\"contents\" operator=\"+=\">", "raw_url": "https://github.com/RvonMassow/xDoc/raw/6b0eb897ce8abe5cda472a8e6af89cd62a47dd66/org.eclipse.xtext.xdoc%2Fsrc-gen%2Forg%2Feclipse%2Fxtext%2Fxdoc%2FXDoc.xmi", "sha": "7f36c3334b2645f50c3e2715ef4312ffd02013f5", "status": "modified" }, { "additions": 219, "blob_url": "https://github.com/RvonMassow/xDoc/blob/6b0eb897ce8abe5cda472a8e6af89cd62a47dd66/org.eclipse.xtext.xdoc%2Fsrc-gen%2Forg%2Feclipse%2Fxtext%2Fxdoc%2Fparser%2Fantlr%2Finternal%2FInternalXDoc.g", "changes": 535, "contents_url": "https://api.github.com/repos/RvonMassow/xDoc/contents/org.eclipse.xtext.xdoc%2Fsrc-gen%2Forg%2Feclipse%2Fxtext%2Fxdoc%2Fparser%2Fantlr%2Finternal%2FInternalXDoc.g?ref=6b0eb897ce8abe5cda472a8e6af89cd62a47dd66", "deletions": 316, "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g", "new_code": "(((\t'chapter:' \n createLeafNode(grammarAccess.getChapterAccess().getChapterKeyword_0_0_0(), null); \n\t\tlv_name_1_0=RULE_ID\n\t\t\tcreateLeafNode(grammarAccess.getChapterAccess().getNameIDTerminalRuleCall_0_0_1_0(), \"name\"); \n\t \t\tlv_name_1_0, \n)\t'[' \n createLeafNode(grammarAccess.getChapterAccess().getLeftSquareBracketKeyword_0_0_2(), null); \n)\n |\t'chapter[' \n {\n createLeafNode(grammarAccess.getChapterAccess().getChapterKeyword_0_1(), null); \n }\n)(\n\t currentNode=createCompositeNode(grammarAccess.getChapterAccess().getTitleTextOrMarkupParserRuleCall_1_0(), currentNode); \n createLeafNode(grammarAccess.getChapterAccess().getRightSquareBracketKeyword_2(), null); \n createLeafNode(grammarAccess.getChapterAccess().getMULTI_NLTerminalRuleCall_3_0(), null); \n\t currentNode=createCompositeNode(grammarAccess.getChapterAccess().getContentsTextOrMarkupParserRuleCall_3_1_0(), currentNode); \n createLeafNode(grammarAccess.getChapterAccess().getMULTI_NLTerminalRuleCall_4_0(), null); \n\t currentNode=createCompositeNode(grammarAccess.getChapterAccess().getContentsSectionParserRuleCall_4_1_0(), currentNode); \n(((\t'section:' \n createLeafNode(grammarAccess.getSectionAccess().getSectionKeyword_0_0_0(), null); \n\t\tlv_name_1_0=RULE_ID\n\t\t\tcreateLeafNode(grammarAccess.getSectionAccess().getNameIDTerminalRuleCall_0_0_1_0(), \"name\"); \n\t \t\tlv_name_1_0, \n)\t'[' \n createLeafNode(grammarAccess.getSectionAccess().getLeftSquareBracketKeyword_0_0_2(), null); \n)\n |\t'section[' \n {\n createLeafNode(grammarAccess.getSectionAccess().getSectionKeyword_0_1(), null); \n }\n)(\n\t currentNode=createCompositeNode(grammarAccess.getSectionAccess().getTitleTextOrMarkupParserRuleCall_1_0(), currentNode); \n createLeafNode(grammarAccess.getSectionAccess().getRightSquareBracketKeyword_2(), null); \n createLeafNode(grammarAccess.getSectionAccess().getMULTI_NLTerminalRuleCall_3_0(), null); \n\t currentNode=createCompositeNode(grammarAccess.getSectionAccess().getContentsTextOrMarkupParserRuleCall_3_1_0(), currentNode); \n createLeafNode(grammarAccess.getSectionAccess().getMULTI_NLTerminalRuleCall_4_0(), null); \n\t currentNode=createCompositeNode(grammarAccess.getSectionAccess().getContentsSubSectionParserRuleCall_4_1_0(), currentNode); \n(((\t'subsection:' \n createLeafNode(grammarAccess.getSubSectionAccess().getSubsectionKeyword_0_0_0(), null); \n\t\tlv_name_1_0=RULE_ID\n\t\t\tcreateLeafNode(grammarAccess.getSubSectionAccess().getNameIDTerminalRuleCall_0_0_1_0(), \"name\"); \n\t \t\tlv_name_1_0, \n)\t'[' \n createLeafNode(grammarAccess.getSubSectionAccess().getLeftSquareBracketKeyword_0_0_2(), null); \n)\n |\t'subsection[' \n {\n createLeafNode(grammarAccess.getSubSectionAccess().getSubsectionKeyword_0_1(), null); \n }\n)(\n\t currentNode=createCompositeNode(grammarAccess.getSubSectionAccess().getTitleTextOrMarkupParserRuleCall_1_0(), currentNode); \n createLeafNode(grammarAccess.getSubSectionAccess().getRightSquareBracketKeyword_2(), null); \n createLeafNode(grammarAccess.getSubSectionAccess().getMULTI_NLTerminalRuleCall_3_0(), null); \n\t currentNode=createCompositeNode(grammarAccess.getSubSectionAccess().getContentsTextOrMarkupParserRuleCall_3_1_0(), currentNode); \n createLeafNode(grammarAccess.getSubSectionAccess().getMULTI_NLTerminalRuleCall_4_0(), null); \n\t currentNode=createCompositeNode(grammarAccess.getSubSectionAccess().getContentsSection3ParserRuleCall_4_1_0(), currentNode); \n(((\t'section3:' \n createLeafNode(grammarAccess.getSection3Access().getSection3Keyword_0_0_0(), null); \n\t\tlv_name_1_0=RULE_ID\n\t\t\tcreateLeafNode(grammarAccess.getSection3Access().getNameIDTerminalRuleCall_0_0_1_0(), \"name\"); \n\t \t\tlv_name_1_0, \n)\t'[' \n createLeafNode(grammarAccess.getSection3Access().getLeftSquareBracketKeyword_0_0_2(), null); \n)\n |\t'section3[' \n {\n createLeafNode(grammarAccess.getSection3Access().getSection3Keyword_0_1(), null); \n }\n)(\n\t currentNode=createCompositeNode(grammarAccess.getSection3Access().getTitleTextOrMarkupParserRuleCall_1_0(), currentNode); \n createLeafNode(grammarAccess.getSection3Access().getRightSquareBracketKeyword_2(), null); \n createLeafNode(grammarAccess.getSection3Access().getMULTI_NLTerminalRuleCall_3_0(), null); \n\t currentNode=createCompositeNode(grammarAccess.getSection3Access().getContentsTextOrMarkupParserRuleCall_3_1_0(), currentNode); \n createLeafNode(grammarAccess.getSection3Access().getMULTI_NLTerminalRuleCall_4_0(), null); \n\t currentNode=createCompositeNode(grammarAccess.getSection3Access().getContentsSection4ParserRuleCall_4_1_0(), currentNode); \n(((\t'section4:' \n createLeafNode(grammarAccess.getSection4Access().getSection4Keyword_0_0_0(), null); \n\t\tlv_name_1_0=RULE_ID\n\t\t\tcreateLeafNode(grammarAccess.getSection4Access().getNameIDTerminalRuleCall_0_0_1_0(), \"name\"); \n\t \t\tlv_name_1_0, \n)\t'[' \n createLeafNode(grammarAccess.getSection4Access().getLeftSquareBracketKeyword_0_0_2(), null); \n)\n |\t'section4[' \n {\n createLeafNode(grammarAccess.getSection4Access().getSection4Keyword_0_1(), null); \n }\n)(\n\t currentNode=createCompositeNode(grammarAccess.getSection4Access().getTitleTextOrMarkupParserRuleCall_1_0(), currentNode); \n createLeafNode(grammarAccess.getSection4Access().getRightSquareBracketKeyword_2(), null); \n createLeafNode(grammarAccess.getSection4Access().getMULTI_NLTerminalRuleCall_3_0(), null); \n\t currentNode=createCompositeNode(grammarAccess.getSection4Access().getContentsTextOrMarkupParserRuleCall_3_1_0(), currentNode); \n(\t'emph[' \n createLeafNode(grammarAccess.getEmphasizeAccess().getMULTI_NLTerminalRuleCall_1(), null); \n\t currentNode=createCompositeNode(grammarAccess.getEmphasizeAccess().getContentsTextOrMarkupParserRuleCall_2_0(), currentNode); \n\t\tlv_contents_2_0=ruleTextOrMarkup\t\t{\n\t \t\tlv_contents_2_0, \n createLeafNode(grammarAccess.getEmphasizeAccess().getMULTI_NLTerminalRuleCall_3(), null); \n createLeafNode(grammarAccess.getEmphasizeAccess().getRightSquareBracketKeyword_4(), null); \n(\t'a[' \n\t\tlv_name_1_0=RULE_ID\n\t\t\tcreateLeafNode(grammarAccess.getAnchorAccess().getNameIDTerminalRuleCall_1_0(), \"name\"); \n\t \t\tlv_name_1_0, \n)\t']' \n createLeafNode(grammarAccess.getAnchorAccess().getRightSquareBracketKeyword_2(), null); \n)\n(\t'ref:' \n\t\tcreateLeafNode(grammarAccess.getRefAccess().getRefIdentifiableCrossReference_1_0(), \"ref\"); \n createLeafNode(grammarAccess.getRefAccess().getLeftSquareBracketKeyword_2(), null); \n createLeafNode(grammarAccess.getRefAccess().getMULTI_NLTerminalRuleCall_3(), null); \n\t currentNode=createCompositeNode(grammarAccess.getRefAccess().getContentsTextOrMarkupParserRuleCall_4_0(), currentNode); \n\t\tlv_contents_4_0=ruleTextOrMarkup\t\t{\n\t \t\tlv_contents_4_0, \n createLeafNode(grammarAccess.getRefAccess().getMULTI_NLTerminalRuleCall_5(), null); \n createLeafNode(grammarAccess.getRefAccess().getRightSquareBracketKeyword_6(), null); \n(\t'ol[' \n currentNode=createCompositeNode(grammarAccess.getOrderedListAccess().getANY_WSParserRuleCall_1_0(), currentNode); \n\t currentNode=createCompositeNode(grammarAccess.getOrderedListAccess().getItemsItemParserRuleCall_1_1_0(), currentNode); \n\t\tlv_items_2_0=ruleItem\t\t{\n\t \t\tlv_items_2_0, \n currentNode=createCompositeNode(grammarAccess.getOrderedListAccess().getANY_WSParserRuleCall_2(), currentNode); \n createLeafNode(grammarAccess.getOrderedListAccess().getRightSquareBracketKeyword_3(), null); \n(\t'ul[' \n currentNode=createCompositeNode(grammarAccess.getUnorderedListAccess().getANY_WSParserRuleCall_1_0(), currentNode); \n\t currentNode=createCompositeNode(grammarAccess.getUnorderedListAccess().getItemsItemParserRuleCall_1_1_0(), currentNode); \n\t\tlv_items_2_0=ruleItem\t\t{\n\t \t\tlv_items_2_0, \n currentNode=createCompositeNode(grammarAccess.getUnorderedListAccess().getANY_WSParserRuleCall_2(), currentNode); \n createLeafNode(grammarAccess.getUnorderedListAccess().getRightSquareBracketKeyword_3(), null); \n(\t'item[' \n createLeafNode(grammarAccess.getItemAccess().getMULTI_NLTerminalRuleCall_1(), null); \n\t currentNode=createCompositeNode(grammarAccess.getItemAccess().getContentsTextOrMarkupParserRuleCall_2_0(), currentNode); \n\t\tlv_contents_2_0=ruleTextOrMarkup\t\t{\n\t \t\tlv_contents_2_0, \n createLeafNode(grammarAccess.getItemAccess().getMULTI_NLTerminalRuleCall_3_0(), null); \n\t currentNode=createCompositeNode(grammarAccess.getItemAccess().getContentsTextOrMarkupParserRuleCall_3_1_0(), currentNode); \n\t\tlv_contents_4_0=ruleTextOrMarkup\t\t{\n\t \t\tlv_contents_4_0, \n createLeafNode(grammarAccess.getItemAccess().getRightSquareBracketKeyword_4(), null); \n(\t'codeRef[' \n\t currentNode=createCompositeNode(grammarAccess.getCodeRefAccess().getElementJvmIdentifyableElementCrossReference_1_0(), currentNode); \n createLeafNode(grammarAccess.getCodeRefAccess().getRightSquareBracketKeyword_2(), null); \n(\t'link[' \n\t currentNode=createCompositeNode(grammarAccess.getLinkAccess().getUrlTextParserRuleCall_1_0(), currentNode); \n\t\tlv_url_1_0=ruleText\t\t{\n\t \t\tlv_url_1_0, \n createLeafNode(grammarAccess.getLinkAccess().getRightSquareBracketKeyword_2(), null); \n currentNode=createCompositeNode(grammarAccess.getLinkAccess().getANY_WSParserRuleCall_3(), currentNode); \n createLeafNode(grammarAccess.getLinkAccess().getLeftSquareBracketKeyword_4(), null); \n\t currentNode=createCompositeNode(grammarAccess.getLinkAccess().getTextTextParserRuleCall_5_0(), currentNode); \n\t\tlv_text_5_0=ruleText\t\t{\n\t \t\tlv_text_5_0, \n createLeafNode(grammarAccess.getLinkAccess().getRightSquareBracketKeyword_6(), null); \n(((\t'img:' \n createLeafNode(grammarAccess.getImageRefAccess().getImgKeyword_0_0_0(), null); \n currentNode=createCompositeNode(grammarAccess.getImageRefAccess().getANY_WSParserRuleCall_0_0_1(), currentNode); \n\t\tlv_name_2_0=RULE_ID\n\t\t\tcreateLeafNode(grammarAccess.getImageRefAccess().getNameIDTerminalRuleCall_0_0_2_0(), \"name\"); \n\t \t\tlv_name_2_0, \n currentNode=createCompositeNode(grammarAccess.getImageRefAccess().getANY_WSParserRuleCall_0_0_3(), currentNode); \n)*\t'[' \n createLeafNode(grammarAccess.getImageRefAccess().getLeftSquareBracketKeyword_0_0_4(), null); \n)\n |\t'img[' \n {\n createLeafNode(grammarAccess.getImageRefAccess().getImgKeyword_0_1(), null); \n }\n)(\n\t currentNode=createCompositeNode(grammarAccess.getImageRefAccess().getPathTextParserRuleCall_1_0(), currentNode); \n\t\tlv_path_6_0=ruleText\t\t{\n\t \t\tlv_path_6_0, \n createLeafNode(grammarAccess.getImageRefAccess().getRightSquareBracketKeyword_2(), null); \n currentNode=createCompositeNode(grammarAccess.getImageRefAccess().getANY_WSParserRuleCall_3(), currentNode); \n createLeafNode(grammarAccess.getImageRefAccess().getLeftSquareBracketKeyword_4(), null); \n\t currentNode=createCompositeNode(grammarAccess.getImageRefAccess().getClazzTextParserRuleCall_5_0(), currentNode); \n\t\tlv_clazz_10_0=ruleText\t\t{\n\t \t\tlv_clazz_10_0, \n createLeafNode(grammarAccess.getImageRefAccess().getRightSquareBracketKeyword_6(), null); \n currentNode=createCompositeNode(grammarAccess.getImageRefAccess().getANY_WSParserRuleCall_7(), currentNode); \n createLeafNode(grammarAccess.getImageRefAccess().getLeftSquareBracketKeyword_8(), null); \n\t currentNode=createCompositeNode(grammarAccess.getImageRefAccess().getStyleTextParserRuleCall_9_0(), currentNode); \n\t\tlv_style_14_0=ruleText\t\t{\n\t \t\tlv_style_14_0, \n createLeafNode(grammarAccess.getImageRefAccess().getRightSquareBracketKeyword_10(), null); \n currentNode=createCompositeNode(grammarAccess.getImageRefAccess().getANY_WSParserRuleCall_11(), currentNode); \n createLeafNode(grammarAccess.getImageRefAccess().getLeftSquareBracketKeyword_12(), null); \n\t currentNode=createCompositeNode(grammarAccess.getImageRefAccess().getCaptionTextParserRuleCall_13_0(), currentNode); \n\t\tlv_caption_18_0=ruleText\t\t{\n\t \t\tlv_caption_18_0, \n createLeafNode(grammarAccess.getImageRefAccess().getRightSquareBracketKeyword_14(), null); \n(\t'code[' \n((\n currentNode=createCompositeNode(grammarAccess.getCodeBlockAccess().getANY_WSParserRuleCall_1_0(), currentNode); \n\t\tlv_language_2_0=RULE_ID\n\t\t\tcreateLeafNode(grammarAccess.getCodeBlockAccess().getLanguageIDTerminalRuleCall_1_1_0(), \"language\"); \n\t \t\tlv_language_2_0, \n currentNode=createCompositeNode(grammarAccess.getCodeBlockAccess().getANY_WSParserRuleCall_1_2(), currentNode); \n createLeafNode(grammarAccess.getCodeBlockAccess().getRightSquareBracketKeyword_1_3(), null); \n currentNode=createCompositeNode(grammarAccess.getCodeBlockAccess().getANY_WSParserRuleCall_1_4(), currentNode); \n)*\t'[' \n createLeafNode(grammarAccess.getCodeBlockAccess().getLeftSquareBracketKeyword_1_5(), null); \n)?(((\n\t currentNode=createCompositeNode(grammarAccess.getCodeBlockAccess().getContentsCodeParserRuleCall_2_0_0_0(), currentNode); \n\t\tlv_contents_7_0=ruleCode\t\t{\n\t \t\tlv_contents_7_0, \n\t currentNode=createCompositeNode(grammarAccess.getCodeBlockAccess().getContentsMarkupInCodeParserRuleCall_2_0_1_0_0(), currentNode); \n\t\tlv_contents_8_0=ruleMarkupInCode\t\t{\n\t \t\tlv_contents_8_0, \n\t currentNode=createCompositeNode(grammarAccess.getCodeBlockAccess().getContentsCodeParserRuleCall_2_0_1_1_0(), currentNode); \n\t\tlv_contents_9_0=ruleCode\t\t{\n\t \t\tlv_contents_9_0, \n\t currentNode=createCompositeNode(grammarAccess.getCodeBlockAccess().getContentsMarkupInCodeParserRuleCall_2_1_0_0(), currentNode); \n\t\tlv_contents_10_0=ruleMarkupInCode\t\t{\n\t \t\tlv_contents_10_0, \n\t currentNode=createCompositeNode(grammarAccess.getCodeBlockAccess().getContentsCodeParserRuleCall_2_1_1_0(), currentNode); \n\t\tlv_contents_11_0=ruleCode\t\t{\n\t \t\tlv_contents_11_0, \n createLeafNode(grammarAccess.getCodeBlockAccess().getRightSquareBracketKeyword_3(), null); ", "new_methods": [], "old_code": "(\t'\\\\chapter' \n createLeafNode(grammarAccess.getChapterAccess().getChapterKeyword_0(), null); \n }\n(\t':' \n {\n createLeafNode(grammarAccess.getChapterAccess().getColonKeyword_1_0(), null); \n\t\tlv_name_2_0=RULE_ID\n\t\t\tcreateLeafNode(grammarAccess.getChapterAccess().getNameIDTerminalRuleCall_1_1_0(), \"name\"); \n\t \t\tlv_name_2_0, \n))?\t'[' \n createLeafNode(grammarAccess.getChapterAccess().getLeftSquareBracketKeyword_2(), null); \n(\n\t currentNode=createCompositeNode(grammarAccess.getChapterAccess().getTitleTextOrMarkupParserRuleCall_3_0(), currentNode); \n createLeafNode(grammarAccess.getChapterAccess().getRightSquareBracketKeyword_4(), null); \n createLeafNode(grammarAccess.getChapterAccess().getMULTI_NLTerminalRuleCall_5_0(), null); \n\t currentNode=createCompositeNode(grammarAccess.getChapterAccess().getContentsTextOrMarkupParserRuleCall_5_1_0(), currentNode); \n createLeafNode(grammarAccess.getChapterAccess().getMULTI_NLTerminalRuleCall_6_0(), null); \n\t currentNode=createCompositeNode(grammarAccess.getChapterAccess().getContentsSectionParserRuleCall_6_1_0(), currentNode); \n(\t'\\\\section' \n {\n createLeafNode(grammarAccess.getSectionAccess().getSectionKeyword_0(), null); \n }\n(\t':' \n createLeafNode(grammarAccess.getSectionAccess().getColonKeyword_1_0(), null); \n\t\tlv_name_2_0=RULE_ID\n\t\t\tcreateLeafNode(grammarAccess.getSectionAccess().getNameIDTerminalRuleCall_1_1_0(), \"name\"); \n\t \t\tlv_name_2_0, \n))?\t'[' \n createLeafNode(grammarAccess.getSectionAccess().getLeftSquareBracketKeyword_2(), null); \n(\n\t currentNode=createCompositeNode(grammarAccess.getSectionAccess().getTitleTextOrMarkupParserRuleCall_3_0(), currentNode); \n createLeafNode(grammarAccess.getSectionAccess().getRightSquareBracketKeyword_4(), null); \n createLeafNode(grammarAccess.getSectionAccess().getMULTI_NLTerminalRuleCall_5_0(), null); \n\t currentNode=createCompositeNode(grammarAccess.getSectionAccess().getContentsTextOrMarkupParserRuleCall_5_1_0(), currentNode); \n createLeafNode(grammarAccess.getSectionAccess().getMULTI_NLTerminalRuleCall_6_0(), null); \n\t currentNode=createCompositeNode(grammarAccess.getSectionAccess().getContentsSubSectionParserRuleCall_6_1_0(), currentNode); \n(\t'\\\\subsection' \n {\n createLeafNode(grammarAccess.getSubSectionAccess().getSubsectionKeyword_0(), null); \n }\n(\t':' \n createLeafNode(grammarAccess.getSubSectionAccess().getColonKeyword_1_0(), null); \n\t\tlv_name_2_0=RULE_ID\n\t\t\tcreateLeafNode(grammarAccess.getSubSectionAccess().getNameIDTerminalRuleCall_1_1_0(), \"name\"); \n\t \t\tlv_name_2_0, \n))?\t'[' \n createLeafNode(grammarAccess.getSubSectionAccess().getLeftSquareBracketKeyword_2(), null); \n(\n\t currentNode=createCompositeNode(grammarAccess.getSubSectionAccess().getTitleTextOrMarkupParserRuleCall_3_0(), currentNode); \n createLeafNode(grammarAccess.getSubSectionAccess().getRightSquareBracketKeyword_4(), null); \n createLeafNode(grammarAccess.getSubSectionAccess().getMULTI_NLTerminalRuleCall_5_0(), null); \n\t currentNode=createCompositeNode(grammarAccess.getSubSectionAccess().getContentsTextOrMarkupParserRuleCall_5_1_0(), currentNode); \n createLeafNode(grammarAccess.getSubSectionAccess().getMULTI_NLTerminalRuleCall_6_0(), null); \n\t currentNode=createCompositeNode(grammarAccess.getSubSectionAccess().getContentsSection3ParserRuleCall_6_1_0(), currentNode); \n(\t'\\\\section3' \n createLeafNode(grammarAccess.getSection3Access().getSection3Keyword_0(), null); \n }\n(\t':' \n {\n createLeafNode(grammarAccess.getSection3Access().getColonKeyword_1_0(), null); \n\t\tlv_name_2_0=RULE_ID\n\t\t\tcreateLeafNode(grammarAccess.getSection3Access().getNameIDTerminalRuleCall_1_1_0(), \"name\"); \n\t \t\tlv_name_2_0, \n))?\t'[' \n createLeafNode(grammarAccess.getSection3Access().getLeftSquareBracketKeyword_2(), null); \n(\n\t currentNode=createCompositeNode(grammarAccess.getSection3Access().getTitleTextOrMarkupParserRuleCall_3_0(), currentNode); \n createLeafNode(grammarAccess.getSection3Access().getRightSquareBracketKeyword_4(), null); \n createLeafNode(grammarAccess.getSection3Access().getMULTI_NLTerminalRuleCall_5_0(), null); \n\t currentNode=createCompositeNode(grammarAccess.getSection3Access().getContentsTextOrMarkupParserRuleCall_5_1_0(), currentNode); \n createLeafNode(grammarAccess.getSection3Access().getMULTI_NLTerminalRuleCall_6_0(), null); \n\t currentNode=createCompositeNode(grammarAccess.getSection3Access().getContentsSection4ParserRuleCall_6_1_0(), currentNode); \n(\t'\\\\section4' \n createLeafNode(grammarAccess.getSection4Access().getSection4Keyword_0(), null); \n }\n(\t':' \n {\n createLeafNode(grammarAccess.getSection4Access().getColonKeyword_1_0(), null); \n\t\tlv_name_2_0=RULE_ID\n\t\t\tcreateLeafNode(grammarAccess.getSection4Access().getNameIDTerminalRuleCall_1_1_0(), \"name\"); \n\t \t\tlv_name_2_0, \n))?\t'[' \n createLeafNode(grammarAccess.getSection4Access().getLeftSquareBracketKeyword_2(), null); \n(\n\t currentNode=createCompositeNode(grammarAccess.getSection4Access().getTitleTextOrMarkupParserRuleCall_3_0(), currentNode); \n createLeafNode(grammarAccess.getSection4Access().getRightSquareBracketKeyword_4(), null); \n createLeafNode(grammarAccess.getSection4Access().getMULTI_NLTerminalRuleCall_5_0(), null); \n\t currentNode=createCompositeNode(grammarAccess.getSection4Access().getContentsTextOrMarkupParserRuleCall_5_1_0(), currentNode); \n\n |\n\tkw=':' \n {\n $current.merge(kw);\n createLeafNode(grammarAccess.getTextAccess().getColonKeyword_6(), null); \n }\n(\t'\\\\emph' \n\t'[' \n {\n createLeafNode(grammarAccess.getEmphasizeAccess().getLeftSquareBracketKeyword_1(), null); \n }\n createLeafNode(grammarAccess.getEmphasizeAccess().getMULTI_NLTerminalRuleCall_2(), null); \n\t currentNode=createCompositeNode(grammarAccess.getEmphasizeAccess().getContentsTextOrMarkupParserRuleCall_3_0(), currentNode); \n\t\tlv_contents_3_0=ruleTextOrMarkup\t\t{\n\t \t\tlv_contents_3_0, \n createLeafNode(grammarAccess.getEmphasizeAccess().getMULTI_NLTerminalRuleCall_4(), null); \n createLeafNode(grammarAccess.getEmphasizeAccess().getRightSquareBracketKeyword_5(), null); \n(\t'\\\\a' \n\t':' \n {\n createLeafNode(grammarAccess.getAnchorAccess().getColonKeyword_1(), null); \n }\n\t\tlv_name_2_0=RULE_ID\n\t\t\tcreateLeafNode(grammarAccess.getAnchorAccess().getNameIDTerminalRuleCall_2_0(), \"name\"); \n\t \t\tlv_name_2_0, \n)(\t'[' \n {\n createLeafNode(grammarAccess.getAnchorAccess().getLeftSquareBracketKeyword_3_0(), null); \n }\n\t']' \n createLeafNode(grammarAccess.getAnchorAccess().getRightSquareBracketKeyword_3_1(), null); \n)?)\n(\t'\\\\ref' \n\t':' \n {\n createLeafNode(grammarAccess.getRefAccess().getColonKeyword_1(), null); \n }\n\t\tcreateLeafNode(grammarAccess.getRefAccess().getRefIdentifiableCrossReference_2_0(), \"ref\"); \n createLeafNode(grammarAccess.getRefAccess().getLeftSquareBracketKeyword_3(), null); \n createLeafNode(grammarAccess.getRefAccess().getMULTI_NLTerminalRuleCall_4(), null); \n\t currentNode=createCompositeNode(grammarAccess.getRefAccess().getContentsTextOrMarkupParserRuleCall_5_0(), currentNode); \n\t\tlv_contents_5_0=ruleTextOrMarkup\t\t{\n\t \t\tlv_contents_5_0, \n createLeafNode(grammarAccess.getRefAccess().getMULTI_NLTerminalRuleCall_6(), null); \n createLeafNode(grammarAccess.getRefAccess().getRightSquareBracketKeyword_7(), null); \n(\t'\\\\ol' \n(\n { \n currentNode=createCompositeNode(grammarAccess.getOrderedListAccess().getANY_WSParserRuleCall_1(), currentNode); \n }\nruleANY_WS\n { \n currentNode = currentNode.getParent();\n }\n)*\t'[' \n {\n createLeafNode(grammarAccess.getOrderedListAccess().getLeftSquareBracketKeyword_2(), null); \n }\n currentNode=createCompositeNode(grammarAccess.getOrderedListAccess().getANY_WSParserRuleCall_3_0(), currentNode); \n\t currentNode=createCompositeNode(grammarAccess.getOrderedListAccess().getItemsItemParserRuleCall_3_1_0(), currentNode); \n\t\tlv_items_4_0=ruleItem\t\t{\n\t \t\tlv_items_4_0, \n currentNode=createCompositeNode(grammarAccess.getOrderedListAccess().getANY_WSParserRuleCall_4(), currentNode); \n createLeafNode(grammarAccess.getOrderedListAccess().getRightSquareBracketKeyword_5(), null); \n(\t'\\\\ul' \n(\n { \n currentNode=createCompositeNode(grammarAccess.getUnorderedListAccess().getANY_WSParserRuleCall_1(), currentNode); \n }\nruleANY_WS\n { \n currentNode = currentNode.getParent();\n }\n)*\t'[' \n {\n createLeafNode(grammarAccess.getUnorderedListAccess().getLeftSquareBracketKeyword_2(), null); \n }\n currentNode=createCompositeNode(grammarAccess.getUnorderedListAccess().getANY_WSParserRuleCall_3_0(), currentNode); \n\t currentNode=createCompositeNode(grammarAccess.getUnorderedListAccess().getItemsItemParserRuleCall_3_1_0(), currentNode); \n\t\tlv_items_4_0=ruleItem\t\t{\n\t \t\tlv_items_4_0, \n currentNode=createCompositeNode(grammarAccess.getUnorderedListAccess().getANY_WSParserRuleCall_4(), currentNode); \n createLeafNode(grammarAccess.getUnorderedListAccess().getRightSquareBracketKeyword_5(), null); \n(\t'\\\\item' \n(\n { \n currentNode=createCompositeNode(grammarAccess.getItemAccess().getANY_WSParserRuleCall_1(), currentNode); \n }\nruleANY_WS\n { \n currentNode = currentNode.getParent();\n }\n)*\t'[' \n {\n createLeafNode(grammarAccess.getItemAccess().getLeftSquareBracketKeyword_2(), null); \n }\n createLeafNode(grammarAccess.getItemAccess().getMULTI_NLTerminalRuleCall_3(), null); \n\t currentNode=createCompositeNode(grammarAccess.getItemAccess().getContentsTextOrMarkupParserRuleCall_4_0(), currentNode); \n\t\tlv_contents_4_0=ruleTextOrMarkup\t\t{\n\t \t\tlv_contents_4_0, \n createLeafNode(grammarAccess.getItemAccess().getMULTI_NLTerminalRuleCall_5_0(), null); \n\t currentNode=createCompositeNode(grammarAccess.getItemAccess().getContentsTextOrMarkupParserRuleCall_5_1_0(), currentNode); \n\t\tlv_contents_6_0=ruleTextOrMarkup\t\t{\n\t \t\tlv_contents_6_0, \n createLeafNode(grammarAccess.getItemAccess().getRightSquareBracketKeyword_6(), null); \n(\t'\\\\codeRef' \n(\n { \n currentNode=createCompositeNode(grammarAccess.getCodeRefAccess().getANY_WSParserRuleCall_1(), currentNode); \n }\nruleANY_WS\n { \n currentNode = currentNode.getParent();\n }\n)*\t'[' \n {\n createLeafNode(grammarAccess.getCodeRefAccess().getLeftSquareBracketKeyword_2(), null); \n }\n\t currentNode=createCompositeNode(grammarAccess.getCodeRefAccess().getElementJvmIdentifyableElementCrossReference_3_0(), currentNode); \n createLeafNode(grammarAccess.getCodeRefAccess().getRightSquareBracketKeyword_4(), null); \n(\t'\\\\link' \n(\n { \n currentNode=createCompositeNode(grammarAccess.getLinkAccess().getANY_WSParserRuleCall_1(), currentNode); \n }\nruleANY_WS\n { \n currentNode = currentNode.getParent();\n }\n)*\t'[' \n {\n createLeafNode(grammarAccess.getLinkAccess().getLeftSquareBracketKeyword_2(), null); \n }\n\t currentNode=createCompositeNode(grammarAccess.getLinkAccess().getUrlTextParserRuleCall_3_0(), currentNode); \n\t\tlv_url_3_0=ruleText\t\t{\n\t \t\tlv_url_3_0, \n createLeafNode(grammarAccess.getLinkAccess().getRightSquareBracketKeyword_4(), null); \n currentNode=createCompositeNode(grammarAccess.getLinkAccess().getANY_WSParserRuleCall_5(), currentNode); \n createLeafNode(grammarAccess.getLinkAccess().getLeftSquareBracketKeyword_6(), null); \n\t currentNode=createCompositeNode(grammarAccess.getLinkAccess().getTextTextParserRuleCall_7_0(), currentNode); \n\t\tlv_text_7_0=ruleText\t\t{\n\t \t\tlv_text_7_0, \n createLeafNode(grammarAccess.getLinkAccess().getRightSquareBracketKeyword_8(), null); \n(\t'\\\\img' \n createLeafNode(grammarAccess.getImageRefAccess().getImgKeyword_0(), null); \n currentNode=createCompositeNode(grammarAccess.getImageRefAccess().getANY_WSParserRuleCall_1(), currentNode); \n }\nruleANY_WS\n { \n currentNode = currentNode.getParent();\n }\n)*(\t':' \n {\n createLeafNode(grammarAccess.getImageRefAccess().getColonKeyword_2_0(), null); \n }\n(\n { \n currentNode=createCompositeNode(grammarAccess.getImageRefAccess().getANY_WSParserRuleCall_2_1(), currentNode); \n\t\tlv_name_4_0=RULE_ID\n\t\t\tcreateLeafNode(grammarAccess.getImageRefAccess().getNameIDTerminalRuleCall_2_2_0(), \"name\"); \n\t \t\tlv_name_4_0, \n currentNode=createCompositeNode(grammarAccess.getImageRefAccess().getANY_WSParserRuleCall_2_3(), currentNode); \n)*)?\t'[' \n createLeafNode(grammarAccess.getImageRefAccess().getLeftSquareBracketKeyword_3(), null); \n(\n\t currentNode=createCompositeNode(grammarAccess.getImageRefAccess().getPathTextParserRuleCall_4_0(), currentNode); \n\t\tlv_path_7_0=ruleText\t\t{\n\t \t\tlv_path_7_0, \n createLeafNode(grammarAccess.getImageRefAccess().getRightSquareBracketKeyword_5(), null); \n currentNode=createCompositeNode(grammarAccess.getImageRefAccess().getANY_WSParserRuleCall_6(), currentNode); \n createLeafNode(grammarAccess.getImageRefAccess().getLeftSquareBracketKeyword_7(), null); \n\t currentNode=createCompositeNode(grammarAccess.getImageRefAccess().getClazzTextParserRuleCall_8_0(), currentNode); \n\t\tlv_clazz_11_0=ruleText\t\t{\n\t \t\tlv_clazz_11_0, \n createLeafNode(grammarAccess.getImageRefAccess().getRightSquareBracketKeyword_9(), null); \n currentNode=createCompositeNode(grammarAccess.getImageRefAccess().getANY_WSParserRuleCall_10(), currentNode); \n createLeafNode(grammarAccess.getImageRefAccess().getLeftSquareBracketKeyword_11(), null); \n\t currentNode=createCompositeNode(grammarAccess.getImageRefAccess().getStyleTextParserRuleCall_12_0(), currentNode); \n\t\tlv_style_15_0=ruleText\t\t{\n\t \t\tlv_style_15_0, \n createLeafNode(grammarAccess.getImageRefAccess().getRightSquareBracketKeyword_13(), null); \n currentNode=createCompositeNode(grammarAccess.getImageRefAccess().getANY_WSParserRuleCall_14(), currentNode); \n createLeafNode(grammarAccess.getImageRefAccess().getLeftSquareBracketKeyword_15(), null); \n\t currentNode=createCompositeNode(grammarAccess.getImageRefAccess().getCaptionTextParserRuleCall_16_0(), currentNode); \n\t\tlv_caption_19_0=ruleText\t\t{\n\t \t\tlv_caption_19_0, \n createLeafNode(grammarAccess.getImageRefAccess().getRightSquareBracketKeyword_17(), null); \n(\t'\\\\code' \n(\n { \n currentNode=createCompositeNode(grammarAccess.getCodeBlockAccess().getANY_WSParserRuleCall_1(), currentNode); \n }\nruleANY_WS\n { \n currentNode = currentNode.getParent();\n }\n)*(\t'[' \n {\n createLeafNode(grammarAccess.getCodeBlockAccess().getLeftSquareBracketKeyword_2_0(), null); \n }\n(\n currentNode=createCompositeNode(grammarAccess.getCodeBlockAccess().getANY_WSParserRuleCall_2_1(), currentNode); \n\t\tlv_language_4_0=RULE_ID\n\t\t\tcreateLeafNode(grammarAccess.getCodeBlockAccess().getLanguageIDTerminalRuleCall_2_2_0(), \"language\"); \n\t \t\tlv_language_4_0, \n currentNode=createCompositeNode(grammarAccess.getCodeBlockAccess().getANY_WSParserRuleCall_2_3(), currentNode); \n createLeafNode(grammarAccess.getCodeBlockAccess().getRightSquareBracketKeyword_2_4(), null); \n currentNode=createCompositeNode(grammarAccess.getCodeBlockAccess().getANY_WSParserRuleCall_2_5(), currentNode); \n)*)?\t'[' \n createLeafNode(grammarAccess.getCodeBlockAccess().getLeftSquareBracketKeyword_3(), null); \n(((\n\t currentNode=createCompositeNode(grammarAccess.getCodeBlockAccess().getContentsCodeParserRuleCall_4_0_0_0(), currentNode); \n\t\tlv_contents_9_0=ruleCode\t\t{\n\t \t\tlv_contents_9_0, \n\t currentNode=createCompositeNode(grammarAccess.getCodeBlockAccess().getContentsMarkupInCodeParserRuleCall_4_0_1_0_0(), currentNode); \n\t\tlv_contents_10_0=ruleMarkupInCode\t\t{\n\t \t\tlv_contents_10_0, \n\t currentNode=createCompositeNode(grammarAccess.getCodeBlockAccess().getContentsCodeParserRuleCall_4_0_1_1_0(), currentNode); \n\t\tlv_contents_11_0=ruleCode\t\t{\n\t \t\tlv_contents_11_0, \n\t currentNode=createCompositeNode(grammarAccess.getCodeBlockAccess().getContentsMarkupInCodeParserRuleCall_4_1_0_0(), currentNode); \n\t\tlv_contents_12_0=ruleMarkupInCode\t\t{\n\t \t\tlv_contents_12_0, \n\t currentNode=createCompositeNode(grammarAccess.getCodeBlockAccess().getContentsCodeParserRuleCall_4_1_1_0(), currentNode); \n\t\tlv_contents_13_0=ruleCode\t\t{\n\t \t\tlv_contents_13_0, \n createLeafNode(grammarAccess.getCodeBlockAccess().getRightSquareBracketKeyword_5(), null); ", "old_methods": [], "patch": "@@ -293,19 +293,15 @@ ruleChapter returns [EObject current=null]\n @after { resetLookahead(); \n \tlastConsumedNode = currentNode;\n }:\n-(\t'\\\\chapter' \n+(((\t'chapter:' \n {\n- createLeafNode(grammarAccess.getChapterAccess().getChapterKeyword_0(), null); \n- }\n-(\t':' \n- {\n- createLeafNode(grammarAccess.getChapterAccess().getColonKeyword_1_0(), null); \n+ createLeafNode(grammarAccess.getChapterAccess().getChapterKeyword_0_0_0(), null); \n }\n (\n (\n-\t\tlv_name_2_0=RULE_ID\n+\t\tlv_name_1_0=RULE_ID\n \t\t{\n-\t\t\tcreateLeafNode(grammarAccess.getChapterAccess().getNameIDTerminalRuleCall_1_1_0(), \"name\"); \n+\t\t\tcreateLeafNode(grammarAccess.getChapterAccess().getNameIDTerminalRuleCall_0_0_1_0(), \"name\"); \n \t\t}\n \t\t{\n \t if ($current==null) {\n@@ -316,7 +312,7 @@ ruleChapter returns [EObject current=null]\n \t \t\tset(\n \t \t\t\t$current, \n \t \t\t\t\"name\",\n-\t \t\tlv_name_2_0, \n+\t \t\tlv_name_1_0, \n \t \t\t\"ID\", \n \t \t\tlastConsumedNode);\n \t } catch (ValueConverterException vce) {\n@@ -325,14 +321,19 @@ ruleChapter returns [EObject current=null]\n \t }\n \n )\n-))?\t'[' \n+)\t'[' \n {\n- createLeafNode(grammarAccess.getChapterAccess().getLeftSquareBracketKeyword_2(), null); \n+ createLeafNode(grammarAccess.getChapterAccess().getLeftSquareBracketKeyword_0_0_2(), null); \n }\n-(\n+)\n+ |\t'chapter[' \n+ {\n+ createLeafNode(grammarAccess.getChapterAccess().getChapterKeyword_0_1(), null); \n+ }\n+)(\n (\n \t\t{ \n-\t currentNode=createCompositeNode(grammarAccess.getChapterAccess().getTitleTextOrMarkupParserRuleCall_3_0(), currentNode); \n+\t currentNode=createCompositeNode(grammarAccess.getChapterAccess().getTitleTextOrMarkupParserRuleCall_1_0(), currentNode); \n \t }\n \t\tlv_title_4_0=ruleTextOrMarkup\t\t{\n \t if ($current==null) {\n@@ -355,16 +356,16 @@ ruleChapter returns [EObject current=null]\n )\n )\t']' \n {\n- createLeafNode(grammarAccess.getChapterAccess().getRightSquareBracketKeyword_4(), null); \n+ createLeafNode(grammarAccess.getChapterAccess().getRightSquareBracketKeyword_2(), null); \n }\n (RULE_MULTI_NL\n { \n- createLeafNode(grammarAccess.getChapterAccess().getMULTI_NLTerminalRuleCall_5_0(), null); \n+ createLeafNode(grammarAccess.getChapterAccess().getMULTI_NLTerminalRuleCall_3_0(), null); \n }\n (\n (\n \t\t{ \n-\t currentNode=createCompositeNode(grammarAccess.getChapterAccess().getContentsTextOrMarkupParserRuleCall_5_1_0(), currentNode); \n+\t currentNode=createCompositeNode(grammarAccess.getChapterAccess().getContentsTextOrMarkupParserRuleCall_3_1_0(), currentNode); \n \t }\n \t\tlv_contents_7_0=ruleTextOrMarkup\t\t{\n \t if ($current==null) {\n@@ -387,12 +388,12 @@ ruleChapter returns [EObject current=null]\n )\n ))*(RULE_MULTI_NL\n { \n- createLeafNode(grammarAccess.getChapterAccess().getMULTI_NLTerminalRuleCall_6_0(), null); \n+ createLeafNode(grammarAccess.getChapterAccess().getMULTI_NLTerminalRuleCall_4_0(), null); \n }\n (\n (\n \t\t{ \n-\t currentNode=createCompositeNode(grammarAccess.getChapterAccess().getContentsSectionParserRuleCall_6_1_0(), currentNode); \n+\t currentNode=createCompositeNode(grammarAccess.getChapterAccess().getContentsSectionParserRuleCall_4_1_0(), currentNode); \n \t }\n \t\tlv_contents_9_0=ruleSection\t\t{\n \t if ($current==null) {\n@@ -436,19 +437,15 @@ ruleSection returns [EObject current=null]\n @after { resetLookahead(); \n \tlastConsumedNode = currentNode;\n }:\n-(\t'\\\\section' \n- {\n- createLeafNode(grammarAccess.getSectionAccess().getSectionKeyword_0(), null); \n- }\n-(\t':' \n+(((\t'section:' \n {\n- createLeafNode(grammarAccess.getSectionAccess().getColonKeyword_1_0(), null); \n+ createLeafNode(grammarAccess.getSectionAccess().getSectionKeyword_0_0_0(), null); \n }\n (\n (\n-\t\tlv_name_2_0=RULE_ID\n+\t\tlv_name_1_0=RULE_ID\n \t\t{\n-\t\t\tcreateLeafNode(grammarAccess.getSectionAccess().getNameIDTerminalRuleCall_1_1_0(), \"name\"); \n+\t\t\tcreateLeafNode(grammarAccess.getSectionAccess().getNameIDTerminalRuleCall_0_0_1_0(), \"name\"); \n \t\t}\n \t\t{\n \t if ($current==null) {\n@@ -459,7 +456,7 @@ ruleSection returns [EObject current=null]\n \t \t\tset(\n \t \t\t\t$current, \n \t \t\t\t\"name\",\n-\t \t\tlv_name_2_0, \n+\t \t\tlv_name_1_0, \n \t \t\t\"ID\", \n \t \t\tlastConsumedNode);\n \t } catch (ValueConverterException vce) {\n@@ -468,14 +465,19 @@ ruleSection returns [EObject current=null]\n \t }\n \n )\n-))?\t'[' \n+)\t'[' \n {\n- createLeafNode(grammarAccess.getSectionAccess().getLeftSquareBracketKeyword_2(), null); \n+ createLeafNode(grammarAccess.getSectionAccess().getLeftSquareBracketKeyword_0_0_2(), null); \n }\n-(\n+)\n+ |\t'section[' \n+ {\n+ createLeafNode(grammarAccess.getSectionAccess().getSectionKeyword_0_1(), null); \n+ }\n+)(\n (\n \t\t{ \n-\t currentNode=createCompositeNode(grammarAccess.getSectionAccess().getTitleTextOrMarkupParserRuleCall_3_0(), currentNode); \n+\t currentNode=createCompositeNode(grammarAccess.getSectionAccess().getTitleTextOrMarkupParserRuleCall_1_0(), currentNode); \n \t }\n \t\tlv_title_4_0=ruleTextOrMarkup\t\t{\n \t if ($current==null) {\n@@ -498,16 +500,16 @@ ruleSection returns [EObject current=null]\n )\n )\t']' \n {\n- createLeafNode(grammarAccess.getSectionAccess().getRightSquareBracketKeyword_4(), null); \n+ createLeafNode(grammarAccess.getSectionAccess().getRightSquareBracketKeyword_2(), null); \n }\n (RULE_MULTI_NL\n { \n- createLeafNode(grammarAccess.getSectionAccess().getMULTI_NLTerminalRuleCall_5_0(), null); \n+ createLeafNode(grammarAccess.getSectionAccess().getMULTI_NLTerminalRuleCall_3_0(), null); \n }\n (\n (\n \t\t{ \n-\t currentNode=createCompositeNode(grammarAccess.getSectionAccess().getContentsTextOrMarkupParserRuleCall_5_1_0(), currentNode); \n+\t currentNode=createCompositeNode(grammarAccess.getSectionAccess().getContentsTextOrMarkupParserRuleCall_3_1_0(), currentNode); \n \t }\n \t\tlv_contents_7_0=ruleTextOrMarkup\t\t{\n \t if ($current==null) {\n@@ -530,12 +532,12 @@ ruleSection returns [EObject current=null]\n )\n ))*(RULE_MULTI_NL\n { \n- createLeafNode(grammarAccess.getSectionAccess().getMULTI_NLTerminalRuleCall_6_0(), null); \n+ createLeafNode(grammarAccess.getSectionAccess().getMULTI_NLTerminalRuleCall_4_0(), null); \n }\n (\n (\n \t\t{ \n-\t currentNode=createCompositeNode(grammarAccess.getSectionAccess().getContentsSubSectionParserRuleCall_6_1_0(), currentNode); \n+\t currentNode=createCompositeNode(grammarAccess.getSectionAccess().getContentsSubSectionParserRuleCall_4_1_0(), currentNode); \n \t }\n \t\tlv_contents_9_0=ruleSubSection\t\t{\n \t if ($current==null) {\n@@ -579,19 +581,15 @@ ruleSubSection returns [EObject current=null]\n @after { resetLookahead(); \n \tlastConsumedNode = currentNode;\n }:\n-(\t'\\\\subsection' \n- {\n- createLeafNode(grammarAccess.getSubSectionAccess().getSubsectionKeyword_0(), null); \n- }\n-(\t':' \n+(((\t'subsection:' \n {\n- createLeafNode(grammarAccess.getSubSectionAccess().getColonKeyword_1_0(), null); \n+ createLeafNode(grammarAccess.getSubSectionAccess().getSubsectionKeyword_0_0_0(), null); \n }\n (\n (\n-\t\tlv_name_2_0=RULE_ID\n+\t\tlv_name_1_0=RULE_ID\n \t\t{\n-\t\t\tcreateLeafNode(grammarAccess.getSubSectionAccess().getNameIDTerminalRuleCall_1_1_0(), \"name\"); \n+\t\t\tcreateLeafNode(grammarAccess.getSubSectionAccess().getNameIDTerminalRuleCall_0_0_1_0(), \"name\"); \n \t\t}\n \t\t{\n \t if ($current==null) {\n@@ -602,7 +600,7 @@ ruleSubSection returns [EObject current=null]\n \t \t\tset(\n \t \t\t\t$current, \n \t \t\t\t\"name\",\n-\t \t\tlv_name_2_0, \n+\t \t\tlv_name_1_0, \n \t \t\t\"ID\", \n \t \t\tlastConsumedNode);\n \t } catch (ValueConverterException vce) {\n@@ -611,14 +609,19 @@ ruleSubSection returns [EObject current=null]\n \t }\n \n )\n-))?\t'[' \n+)\t'[' \n {\n- createLeafNode(grammarAccess.getSubSectionAccess().getLeftSquareBracketKeyword_2(), null); \n+ createLeafNode(grammarAccess.getSubSectionAccess().getLeftSquareBracketKeyword_0_0_2(), null); \n }\n-(\n+)\n+ |\t'subsection[' \n+ {\n+ createLeafNode(grammarAccess.getSubSectionAccess().getSubsectionKeyword_0_1(), null); \n+ }\n+)(\n (\n \t\t{ \n-\t currentNode=createCompositeNode(grammarAccess.getSubSectionAccess().getTitleTextOrMarkupParserRuleCall_3_0(), currentNode); \n+\t currentNode=createCompositeNode(grammarAccess.getSubSectionAccess().getTitleTextOrMarkupParserRuleCall_1_0(), currentNode); \n \t }\n \t\tlv_title_4_0=ruleTextOrMarkup\t\t{\n \t if ($current==null) {\n@@ -641,16 +644,16 @@ ruleSubSection returns [EObject current=null]\n )\n )\t']' \n {\n- createLeafNode(grammarAccess.getSubSectionAccess().getRightSquareBracketKeyword_4(), null); \n+ createLeafNode(grammarAccess.getSubSectionAccess().getRightSquareBracketKeyword_2(), null); \n }\n (RULE_MULTI_NL\n { \n- createLeafNode(grammarAccess.getSubSectionAccess().getMULTI_NLTerminalRuleCall_5_0(), null); \n+ createLeafNode(grammarAccess.getSubSectionAccess().getMULTI_NLTerminalRuleCall_3_0(), null); \n }\n (\n (\n \t\t{ \n-\t currentNode=createCompositeNode(grammarAccess.getSubSectionAccess().getContentsTextOrMarkupParserRuleCall_5_1_0(), currentNode); \n+\t currentNode=createCompositeNode(grammarAccess.getSubSectionAccess().getContentsTextOrMarkupParserRuleCall_3_1_0(), currentNode); \n \t }\n \t\tlv_contents_7_0=ruleTextOrMarkup\t\t{\n \t if ($current==null) {\n@@ -673,12 +676,12 @@ ruleSubSection returns [EObject current=null]\n )\n ))*(RULE_MULTI_NL\n { \n- createLeafNode(grammarAccess.getSubSectionAccess().getMULTI_NLTerminalRuleCall_6_0(), null); \n+ createLeafNode(grammarAccess.getSubSectionAccess().getMULTI_NLTerminalRuleCall_4_0(), null); \n }\n (\n (\n \t\t{ \n-\t currentNode=createCompositeNode(grammarAccess.getSubSectionAccess().getContentsSection3ParserRuleCall_6_1_0(), currentNode); \n+\t currentNode=createCompositeNode(grammarAccess.getSubSectionAccess().getContentsSection3ParserRuleCall_4_1_0(), currentNode); \n \t }\n \t\tlv_contents_9_0=ruleSection3\t\t{\n \t if ($current==null) {\n@@ -722,19 +725,15 @@ ruleSection3 returns [EObject current=null]\n @after { resetLookahead(); \n \tlastConsumedNode = currentNode;\n }:\n-(\t'\\\\section3' \n+(((\t'section3:' \n {\n- createLeafNode(grammarAccess.getSection3Access().getSection3Keyword_0(), null); \n- }\n-(\t':' \n- {\n- createLeafNode(grammarAccess.getSection3Access().getColonKeyword_1_0(), null); \n+ createLeafNode(grammarAccess.getSection3Access().getSection3Keyword_0_0_0(), null); \n }\n (\n (\n-\t\tlv_name_2_0=RULE_ID\n+\t\tlv_name_1_0=RULE_ID\n \t\t{\n-\t\t\tcreateLeafNode(grammarAccess.getSection3Access().getNameIDTerminalRuleCall_1_1_0(), \"name\"); \n+\t\t\tcreateLeafNode(grammarAccess.getSection3Access().getNameIDTerminalRuleCall_0_0_1_0(), \"name\"); \n \t\t}\n \t\t{\n \t if ($current==null) {\n@@ -745,7 +744,7 @@ ruleSection3 returns [EObject current=null]\n \t \t\tset(\n \t \t\t\t$current, \n \t \t\t\t\"name\",\n-\t \t\tlv_name_2_0, \n+\t \t\tlv_name_1_0, \n \t \t\t\"ID\", \n \t \t\tlastConsumedNode);\n \t } catch (ValueConverterException vce) {\n@@ -754,14 +753,19 @@ ruleSection3 returns [EObject current=null]\n \t }\n \n )\n-))?\t'[' \n+)\t'[' \n {\n- createLeafNode(grammarAccess.getSection3Access().getLeftSquareBracketKeyword_2(), null); \n+ createLeafNode(grammarAccess.getSection3Access().getLeftSquareBracketKeyword_0_0_2(), null); \n }\n-(\n+)\n+ |\t'section3[' \n+ {\n+ createLeafNode(grammarAccess.getSection3Access().getSection3Keyword_0_1(), null); \n+ }\n+)(\n (\n \t\t{ \n-\t currentNode=createCompositeNode(grammarAccess.getSection3Access().getTitleTextOrMarkupParserRuleCall_3_0(), currentNode); \n+\t currentNode=createCompositeNode(grammarAccess.getSection3Access().getTitleTextOrMarkupParserRuleCall_1_0(), currentNode); \n \t }\n \t\tlv_title_4_0=ruleTextOrMarkup\t\t{\n \t if ($current==null) {\n@@ -784,16 +788,16 @@ ruleSection3 returns [EObject current=null]\n )\n )\t']' \n {\n- createLeafNode(grammarAccess.getSection3Access().getRightSquareBracketKeyword_4(), null); \n+ createLeafNode(grammarAccess.getSection3Access().getRightSquareBracketKeyword_2(), null); \n }\n (RULE_MULTI_NL\n { \n- createLeafNode(grammarAccess.getSection3Access().getMULTI_NLTerminalRuleCall_5_0(), null); \n+ createLeafNode(grammarAccess.getSection3Access().getMULTI_NLTerminalRuleCall_3_0(), null); \n }\n (\n (\n \t\t{ \n-\t currentNode=createCompositeNode(grammarAccess.getSection3Access().getContentsTextOrMarkupParserRuleCall_5_1_0(), currentNode); \n+\t currentNode=createCompositeNode(grammarAccess.getSection3Access().getContentsTextOrMarkupParserRuleCall_3_1_0(), currentNode); \n \t }\n \t\tlv_contents_7_0=ruleTextOrMarkup\t\t{\n \t if ($current==null) {\n@@ -816,12 +820,12 @@ ruleSection3 returns [EObject current=null]\n )\n ))*(RULE_MULTI_NL\n { \n- createLeafNode(grammarAccess.getSection3Access().getMULTI_NLTerminalRuleCall_6_0(), null); \n+ createLeafNode(grammarAccess.getSection3Access().getMULTI_NLTerminalRuleCall_4_0(), null); \n }\n (\n (\n \t\t{ \n-\t currentNode=createCompositeNode(grammarAccess.getSection3Access().getContentsSection4ParserRuleCall_6_1_0(), currentNode); \n+\t currentNode=createCompositeNode(grammarAccess.getSection3Access().getContentsSection4ParserRuleCall_4_1_0(), currentNode); \n \t }\n \t\tlv_contents_9_0=ruleSection4\t\t{\n \t if ($current==null) {\n@@ -865,19 +869,15 @@ ruleSection4 returns [EObject current=null]\n @after { resetLookahead(); \n \tlastConsumedNode = currentNode;\n }:\n-(\t'\\\\section4' \n+(((\t'section4:' \n {\n- createLeafNode(grammarAccess.getSection4Access().getSection4Keyword_0(), null); \n- }\n-(\t':' \n- {\n- createLeafNode(grammarAccess.getSection4Access().getColonKeyword_1_0(), null); \n+ createLeafNode(grammarAccess.getSection4Access().getSection4Keyword_0_0_0(), null); \n }\n (\n (\n-\t\tlv_name_2_0=RULE_ID\n+\t\tlv_name_1_0=RULE_ID\n \t\t{\n-\t\t\tcreateLeafNode(grammarAccess.getSection4Access().getNameIDTerminalRuleCall_1_1_0(), \"name\"); \n+\t\t\tcreateLeafNode(grammarAccess.getSection4Access().getNameIDTerminalRuleCall_0_0_1_0(), \"name\"); \n \t\t}\n \t\t{\n \t if ($current==null) {\n@@ -888,7 +888,7 @@ ruleSection4 returns [EObject current=null]\n \t \t\tset(\n \t \t\t\t$current, \n \t \t\t\t\"name\",\n-\t \t\tlv_name_2_0, \n+\t \t\tlv_name_1_0, \n \t \t\t\"ID\", \n \t \t\tlastConsumedNode);\n \t } catch (ValueConverterException vce) {\n@@ -897,14 +897,19 @@ ruleSection4 returns [EObject current=null]\n \t }\n \n )\n-))?\t'[' \n+)\t'[' \n {\n- createLeafNode(grammarAccess.getSection4Access().getLeftSquareBracketKeyword_2(), null); \n+ createLeafNode(grammarAccess.getSection4Access().getLeftSquareBracketKeyword_0_0_2(), null); \n }\n-(\n+)\n+ |\t'section4[' \n+ {\n+ createLeafNode(grammarAccess.getSection4Access().getSection4Keyword_0_1(), null); \n+ }\n+)(\n (\n \t\t{ \n-\t currentNode=createCompositeNode(grammarAccess.getSection4Access().getTitleTextOrMarkupParserRuleCall_3_0(), currentNode); \n+\t currentNode=createCompositeNode(grammarAccess.getSection4Access().getTitleTextOrMarkupParserRuleCall_1_0(), currentNode); \n \t }\n \t\tlv_title_4_0=ruleTextOrMarkup\t\t{\n \t if ($current==null) {\n@@ -927,16 +932,16 @@ ruleSection4 returns [EObject current=null]\n )\n )\t']' \n {\n- createLeafNode(grammarAccess.getSection4Access().getRightSquareBracketKeyword_4(), null); \n+ createLeafNode(grammarAccess.getSection4Access().getRightSquareBracketKeyword_2(), null); \n }\n (RULE_MULTI_NL\n { \n- createLeafNode(grammarAccess.getSection4Access().getMULTI_NLTerminalRuleCall_5_0(), null); \n+ createLeafNode(grammarAccess.getSection4Access().getMULTI_NLTerminalRuleCall_3_0(), null); \n }\n (\n (\n \t\t{ \n-\t currentNode=createCompositeNode(grammarAccess.getSection4Access().getContentsTextOrMarkupParserRuleCall_5_1_0(), currentNode); \n+\t currentNode=createCompositeNode(grammarAccess.getSection4Access().getContentsTextOrMarkupParserRuleCall_3_1_0(), currentNode); \n \t }\n \t\tlv_contents_7_0=ruleTextOrMarkup\t\t{\n \t if ($current==null) {\n@@ -1218,13 +1223,6 @@ ruleText returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()]\n $current.merge(kw);\n createLeafNode(grammarAccess.getTextAccess().getReverseSolidusRightSquareBracketKeyword_5(), null); \n }\n-\n- |\n-\tkw=':' \n- {\n- $current.merge(kw);\n- createLeafNode(grammarAccess.getTextAccess().getColonKeyword_6(), null); \n- }\n )+\n ;\n \n@@ -1360,24 +1358,20 @@ ruleEmphasize returns [EObject current=null]\n @after { resetLookahead(); \n \tlastConsumedNode = currentNode;\n }:\n-(\t'\\\\emph' \n+(\t'emph[' \n {\n createLeafNode(grammarAccess.getEmphasizeAccess().getEmphKeyword_0(), null); \n }\n-\t'[' \n- {\n- createLeafNode(grammarAccess.getEmphasizeAccess().getLeftSquareBracketKeyword_1(), null); \n- }\n (RULE_MULTI_NL\n { \n- createLeafNode(grammarAccess.getEmphasizeAccess().getMULTI_NLTerminalRuleCall_2(), null); \n+ createLeafNode(grammarAccess.getEmphasizeAccess().getMULTI_NLTerminalRuleCall_1(), null); \n }\n )?(\n (\n \t\t{ \n-\t currentNode=createCompositeNode(grammarAccess.getEmphasizeAccess().getContentsTextOrMarkupParserRuleCall_3_0(), currentNode); \n+\t currentNode=createCompositeNode(grammarAccess.getEmphasizeAccess().getContentsTextOrMarkupParserRuleCall_2_0(), currentNode); \n \t }\n-\t\tlv_contents_3_0=ruleTextOrMarkup\t\t{\n+\t\tlv_contents_2_0=ruleTextOrMarkup\t\t{\n \t if ($current==null) {\n \t $current = factory.create(grammarAccess.getEmphasizeRule().getType().getClassifier());\n \t associateNodeWithAstElement(currentNode.getParent(), $current);\n@@ -1386,7 +1380,7 @@ ruleEmphasize returns [EObject current=null]\n \t \t\tadd(\n \t \t\t\t$current, \n \t \t\t\t\"contents\",\n-\t \t\tlv_contents_3_0, \n+\t \t\tlv_contents_2_0, \n \t \t\t\"TextOrMarkup\", \n \t \t\tcurrentNode);\n \t } catch (ValueConverterException vce) {\n@@ -1398,11 +1392,11 @@ ruleEmphasize returns [EObject current=null]\n )\n )(RULE_MULTI_NL\n { \n- createLeafNode(grammarAccess.getEmphasizeAccess().getMULTI_NLTerminalRuleCall_4(), null); \n+ createLeafNode(grammarAccess.getEmphasizeAccess().getMULTI_NLTerminalRuleCall_3(), null); \n }\n )?\t']' \n {\n- createLeafNode(grammarAccess.getEmphasizeAccess().getRightSquareBracketKeyword_5(), null); \n+ createLeafNode(grammarAccess.getEmphasizeAccess().getRightSquareBracketKeyword_4(), null); \n }\n )\n ;\n@@ -1427,19 +1421,15 @@ ruleAnchor returns [EObject current=null]\n @after { resetLookahead(); \n \tlastConsumedNode = currentNode;\n }:\n-(\t'\\\\a' \n+(\t'a[' \n {\n createLeafNode(grammarAccess.getAnchorAccess().getAKeyword_0(), null); \n }\n-\t':' \n- {\n- createLeafNode(grammarAccess.getAnchorAccess().getColonKeyword_1(), null); \n- }\n (\n (\n-\t\tlv_name_2_0=RULE_ID\n+\t\tlv_name_1_0=RULE_ID\n \t\t{\n-\t\t\tcreateLeafNode(grammarAccess.getAnchorAccess().getNameIDTerminalRuleCall_2_0(), \"name\"); \n+\t\t\tcreateLeafNode(grammarAccess.getAnchorAccess().getNameIDTerminalRuleCall_1_0(), \"name\"); \n \t\t}\n \t\t{\n \t if ($current==null) {\n@@ -1450,7 +1440,7 @@ ruleAnchor returns [EObject current=null]\n \t \t\tset(\n \t \t\t\t$current, \n \t \t\t\t\"name\",\n-\t \t\tlv_name_2_0, \n+\t \t\tlv_name_1_0, \n \t \t\t\"ID\", \n \t \t\tlastConsumedNode);\n \t } catch (ValueConverterException vce) {\n@@ -1459,15 +1449,11 @@ ruleAnchor returns [EObject current=null]\n \t }\n \n )\n-)(\t'[' \n- {\n- createLeafNode(grammarAccess.getAnchorAccess().getLeftSquareBracketKeyword_3_0(), null); \n- }\n-\t']' \n+)\t']' \n {\n- createLeafNode(grammarAccess.getAnchorAccess().getRightSquareBracketKeyword_3_1(), null); \n+ createLeafNode(grammarAccess.getAnchorAccess().getRightSquareBracketKeyword_2(), null); \n }\n-)?)\n+)\n ;\n \n \n@@ -1490,14 +1476,10 @@ ruleRef returns [EObject current=null]\n @after { resetLookahead(); \n \tlastConsumedNode = currentNode;\n }:\n-(\t'\\\\ref' \n+(\t'ref:' \n {\n createLeafNode(grammarAccess.getRefAccess().getRefKeyword_0(), null); \n }\n-\t':' \n- {\n- createLeafNode(grammarAccess.getRefAccess().getColonKeyword_1(), null); \n- }\n (\n (\n \t\t{\n@@ -1508,24 +1490,24 @@ ruleRef returns [EObject current=null]\n }\n \tRULE_ID\n \t{\n-\t\tcreateLeafNode(grammarAccess.getRefAccess().getRefIdentifiableCrossReference_2_0(), \"ref\"); \n+\t\tcreateLeafNode(grammarAccess.getRefAccess().getRefIdentifiableCrossReference_1_0(), \"ref\"); \n \t}\n \n )\n )\t'[' \n {\n- createLeafNode(grammarAccess.getRefAccess().getLeftSquareBracketKeyword_3(), null); \n+ createLeafNode(grammarAccess.getRefAccess().getLeftSquareBracketKeyword_2(), null); \n }\n (RULE_MULTI_NL\n { \n- createLeafNode(grammarAccess.getRefAccess().getMULTI_NLTerminalRuleCall_4(), null); \n+ createLeafNode(grammarAccess.getRefAccess().getMULTI_NLTerminalRuleCall_3(), null); \n }\n )?(\n (\n \t\t{ \n-\t currentNode=createCompositeNode(grammarAccess.getRefAccess().getContentsTextOrMarkupParserRuleCall_5_0(), currentNode); \n+\t currentNode=createCompositeNode(grammarAccess.getRefAccess().getContentsTextOrMarkupParserRuleCall_4_0(), currentNode); \n \t }\n-\t\tlv_contents_5_0=ruleTextOrMarkup\t\t{\n+\t\tlv_contents_4_0=ruleTextOrMarkup\t\t{\n \t if ($current==null) {\n \t $current = factory.create(grammarAccess.getRefRule().getType().getClassifier());\n \t associateNodeWithAstElement(currentNode.getParent(), $current);\n@@ -1534,7 +1516,7 @@ ruleRef returns [EObject current=null]\n \t \t\tadd(\n \t \t\t\t$current, \n \t \t\t\t\"contents\",\n-\t \t\tlv_contents_5_0, \n+\t \t\tlv_contents_4_0, \n \t \t\t\"TextOrMarkup\", \n \t \t\tcurrentNode);\n \t } catch (ValueConverterException vce) {\n@@ -1546,11 +1528,11 @@ ruleRef returns [EObject current=null]\n )\n )(RULE_MULTI_NL\n { \n- createLeafNode(grammarAccess.getRefAccess().getMULTI_NLTerminalRuleCall_6(), null); \n+ createLeafNode(grammarAccess.getRefAccess().getMULTI_NLTerminalRuleCall_5(), null); \n }\n )?\t']' \n {\n- createLeafNode(grammarAccess.getRefAccess().getRightSquareBracketKeyword_7(), null); \n+ createLeafNode(grammarAccess.getRefAccess().getRightSquareBracketKeyword_6(), null); \n }\n )\n ;\n@@ -1575,25 +1557,13 @@ ruleOrderedList returns [EObject current=null]\n @after { resetLookahead(); \n \tlastConsumedNode = currentNode;\n }:\n-(\t'\\\\ol' \n+(\t'ol[' \n {\n createLeafNode(grammarAccess.getOrderedListAccess().getOlKeyword_0(), null); \n }\n-(\n- { \n- currentNode=createCompositeNode(grammarAccess.getOrderedListAccess().getANY_WSParserRuleCall_1(), currentNode); \n- }\n-ruleANY_WS\n- { \n- currentNode = currentNode.getParent();\n- }\n-)*\t'[' \n- {\n- createLeafNode(grammarAccess.getOrderedListAccess().getLeftSquareBracketKeyword_2(), null); \n- }\n ((\n { \n- currentNode=createCompositeNode(grammarAccess.getOrderedListAccess().getANY_WSParserRuleCall_3_0(), currentNode); \n+ currentNode=createCompositeNode(grammarAccess.getOrderedListAccess().getANY_WSParserRuleCall_1_0(), currentNode); \n }\n ruleANY_WS\n { \n@@ -1602,9 +1572,9 @@ ruleANY_WS\n )*(\n (\n \t\t{ \n-\t currentNode=createCompositeNode(grammarAccess.getOrderedListAccess().getItemsItemParserRuleCall_3_1_0(), currentNode); \n+\t currentNode=createCompositeNode(grammarAccess.getOrderedListAccess().getItemsItemParserRuleCall_1_1_0(), currentNode); \n \t }\n-\t\tlv_items_4_0=ruleItem\t\t{\n+\t\tlv_items_2_0=ruleItem\t\t{\n \t if ($current==null) {\n \t $current = factory.create(grammarAccess.getOrderedListRule().getType().getClassifier());\n \t associateNodeWithAstElement(currentNode.getParent(), $current);\n@@ -1613,7 +1583,7 @@ ruleANY_WS\n \t \t\tadd(\n \t \t\t\t$current, \n \t \t\t\t\"items\",\n-\t \t\tlv_items_4_0, \n+\t \t\tlv_items_2_0, \n \t \t\t\"Item\", \n \t \t\tcurrentNode);\n \t } catch (ValueConverterException vce) {\n@@ -1625,15 +1595,15 @@ ruleANY_WS\n )\n ))+(\n { \n- currentNode=createCompositeNode(grammarAccess.getOrderedListAccess().getANY_WSParserRuleCall_4(), currentNode); \n+ currentNode=createCompositeNode(grammarAccess.getOrderedListAccess().getANY_WSParserRuleCall_2(), currentNode); \n }\n ruleANY_WS\n { \n currentNode = currentNode.getParent();\n }\n )*\t']' \n {\n- createLeafNode(grammarAccess.getOrderedListAccess().getRightSquareBracketKeyword_5(), null); \n+ createLeafNode(grammarAccess.getOrderedListAccess().getRightSquareBracketKeyword_3(), null); \n }\n )\n ;\n@@ -1658,25 +1628,13 @@ ruleUnorderedList returns [EObject current=null]\n @after { resetLookahead(); \n \tlastConsumedNode = currentNode;\n }:\n-(\t'\\\\ul' \n+(\t'ul[' \n {\n createLeafNode(grammarAccess.getUnorderedListAccess().getUlKeyword_0(), null); \n }\n-(\n- { \n- currentNode=createCompositeNode(grammarAccess.getUnorderedListAccess().getANY_WSParserRuleCall_1(), currentNode); \n- }\n-ruleANY_WS\n- { \n- currentNode = currentNode.getParent();\n- }\n-)*\t'[' \n- {\n- createLeafNode(grammarAccess.getUnorderedListAccess().getLeftSquareBracketKeyword_2(), null); \n- }\n ((\n { \n- currentNode=createCompositeNode(grammarAccess.getUnorderedListAccess().getANY_WSParserRuleCall_3_0(), currentNode); \n+ currentNode=createCompositeNode(grammarAccess.getUnorderedListAccess().getANY_WSParserRuleCall_1_0(), currentNode); \n }\n ruleANY_WS\n { \n@@ -1685,9 +1643,9 @@ ruleANY_WS\n )*(\n (\n \t\t{ \n-\t currentNode=createCompositeNode(grammarAccess.getUnorderedListAccess().getItemsItemParserRuleCall_3_1_0(), currentNode); \n+\t currentNode=createCompositeNode(grammarAccess.getUnorderedListAccess().getItemsItemParserRuleCall_1_1_0(), currentNode); \n \t }\n-\t\tlv_items_4_0=ruleItem\t\t{\n+\t\tlv_items_2_0=ruleItem\t\t{\n \t if ($current==null) {\n \t $current = factory.create(grammarAccess.getUnorderedListRule().getType().getClassifier());\n \t associateNodeWithAstElement(currentNode.getParent(), $current);\n@@ -1696,7 +1654,7 @@ ruleANY_WS\n \t \t\tadd(\n \t \t\t\t$current, \n \t \t\t\t\"items\",\n-\t \t\tlv_items_4_0, \n+\t \t\tlv_items_2_0, \n \t \t\t\"Item\", \n \t \t\tcurrentNode);\n \t } catch (ValueConverterException vce) {\n@@ -1708,15 +1666,15 @@ ruleANY_WS\n )\n ))+(\n { \n- currentNode=createCompositeNode(grammarAccess.getUnorderedListAccess().getANY_WSParserRuleCall_4(), currentNode); \n+ currentNode=createCompositeNode(grammarAccess.getUnorderedListAccess().getANY_WSParserRuleCall_2(), currentNode); \n }\n ruleANY_WS\n { \n currentNode = currentNode.getParent();\n }\n )*\t']' \n {\n- createLeafNode(grammarAccess.getUnorderedListAccess().getRightSquareBracketKeyword_5(), null); \n+ createLeafNode(grammarAccess.getUnorderedListAccess().getRightSquareBracketKeyword_3(), null); \n }\n )\n ;\n@@ -1741,32 +1699,20 @@ ruleItem returns [EObject current=null]\n @after { resetLookahead(); \n \tlastConsumedNode = currentNode;\n }:\n-(\t'\\\\item' \n+(\t'item[' \n {\n createLeafNode(grammarAccess.getItemAccess().getItemKeyword_0(), null); \n }\n-(\n- { \n- currentNode=createCompositeNode(grammarAccess.getItemAccess().getANY_WSParserRuleCall_1(), currentNode); \n- }\n-ruleANY_WS\n- { \n- currentNode = currentNode.getParent();\n- }\n-)*\t'[' \n- {\n- createLeafNode(grammarAccess.getItemAccess().getLeftSquareBracketKeyword_2(), null); \n- }\n (RULE_MULTI_NL\n { \n- createLeafNode(grammarAccess.getItemAccess().getMULTI_NLTerminalRuleCall_3(), null); \n+ createLeafNode(grammarAccess.getItemAccess().getMULTI_NLTerminalRuleCall_1(), null); \n }\n )?(\n (\n \t\t{ \n-\t currentNode=createCompositeNode(grammarAccess.getItemAccess().getContentsTextOrMarkupParserRuleCall_4_0(), currentNode); \n+\t currentNode=createCompositeNode(grammarAccess.getItemAccess().getContentsTextOrMarkupParserRuleCall_2_0(), currentNode); \n \t }\n-\t\tlv_contents_4_0=ruleTextOrMarkup\t\t{\n+\t\tlv_contents_2_0=ruleTextOrMarkup\t\t{\n \t if ($current==null) {\n \t $current = factory.create(grammarAccess.getItemRule().getType().getClassifier());\n \t associateNodeWithAstElement(currentNode.getParent(), $current);\n@@ -1775,7 +1721,7 @@ ruleANY_WS\n \t \t\tadd(\n \t \t\t\t$current, \n \t \t\t\t\"contents\",\n-\t \t\tlv_contents_4_0, \n+\t \t\tlv_contents_2_0, \n \t \t\t\"TextOrMarkup\", \n \t \t\tcurrentNode);\n \t } catch (ValueConverterException vce) {\n@@ -1787,14 +1733,14 @@ ruleANY_WS\n )\n )(RULE_MULTI_NL\n { \n- createLeafNode(grammarAccess.getItemAccess().getMULTI_NLTerminalRuleCall_5_0(), null); \n+ createLeafNode(grammarAccess.getItemAccess().getMULTI_NLTerminalRuleCall_3_0(), null); \n }\n (\n (\n \t\t{ \n-\t currentNode=createCompositeNode(grammarAccess.getItemAccess().getContentsTextOrMarkupParserRuleCall_5_1_0(), currentNode); \n+\t currentNode=createCompositeNode(grammarAccess.getItemAccess().getContentsTextOrMarkupParserRuleCall_3_1_0(), currentNode); \n \t }\n-\t\tlv_contents_6_0=ruleTextOrMarkup\t\t{\n+\t\tlv_contents_4_0=ruleTextOrMarkup\t\t{\n \t if ($current==null) {\n \t $current = factory.create(grammarAccess.getItemRule().getType().getClassifier());\n \t associateNodeWithAstElement(currentNode.getParent(), $current);\n@@ -1803,7 +1749,7 @@ ruleANY_WS\n \t \t\tadd(\n \t \t\t\t$current, \n \t \t\t\t\"contents\",\n-\t \t\tlv_contents_6_0, \n+\t \t\tlv_contents_4_0, \n \t \t\t\"TextOrMarkup\", \n \t \t\tcurrentNode);\n \t } catch (ValueConverterException vce) {\n@@ -1815,7 +1761,7 @@ ruleANY_WS\n )\n ))*\t']' \n {\n- createLeafNode(grammarAccess.getItemAccess().getRightSquareBracketKeyword_6(), null); \n+ createLeafNode(grammarAccess.getItemAccess().getRightSquareBracketKeyword_4(), null); \n }\n )\n ;\n@@ -1840,22 +1786,10 @@ ruleCodeRef returns [EObject current=null]\n @after { resetLookahead(); \n \tlastConsumedNode = currentNode;\n }:\n-(\t'\\\\codeRef' \n+(\t'codeRef[' \n {\n createLeafNode(grammarAccess.getCodeRefAccess().getCodeRefKeyword_0(), null); \n }\n-(\n- { \n- currentNode=createCompositeNode(grammarAccess.getCodeRefAccess().getANY_WSParserRuleCall_1(), currentNode); \n- }\n-ruleANY_WS\n- { \n- currentNode = currentNode.getParent();\n- }\n-)*\t'[' \n- {\n- createLeafNode(grammarAccess.getCodeRefAccess().getLeftSquareBracketKeyword_2(), null); \n- }\n (\n (\n \t\t{\n@@ -1865,7 +1799,7 @@ ruleANY_WS\n \t }\n }\n \t\t{ \n-\t currentNode=createCompositeNode(grammarAccess.getCodeRefAccess().getElementJvmIdentifyableElementCrossReference_3_0(), currentNode); \n+\t currentNode=createCompositeNode(grammarAccess.getCodeRefAccess().getElementJvmIdentifyableElementCrossReference_1_0(), currentNode); \n \t }\n \t\truleText\t\t{ \n \t currentNode = currentNode.getParent();\n@@ -1874,7 +1808,7 @@ ruleANY_WS\n )\n )\t']' \n {\n- createLeafNode(grammarAccess.getCodeRefAccess().getRightSquareBracketKeyword_4(), null); \n+ createLeafNode(grammarAccess.getCodeRefAccess().getRightSquareBracketKeyword_2(), null); \n }\n )\n ;\n@@ -1899,28 +1833,16 @@ ruleLink returns [EObject current=null]\n @after { resetLookahead(); \n \tlastConsumedNode = currentNode;\n }:\n-(\t'\\\\link' \n+(\t'link[' \n {\n createLeafNode(grammarAccess.getLinkAccess().getLinkKeyword_0(), null); \n }\n-(\n- { \n- currentNode=createCompositeNode(grammarAccess.getLinkAccess().getANY_WSParserRuleCall_1(), currentNode); \n- }\n-ruleANY_WS\n- { \n- currentNode = currentNode.getParent();\n- }\n-)*\t'[' \n- {\n- createLeafNode(grammarAccess.getLinkAccess().getLeftSquareBracketKeyword_2(), null); \n- }\n (\n (\n \t\t{ \n-\t currentNode=createCompositeNode(grammarAccess.getLinkAccess().getUrlTextParserRuleCall_3_0(), currentNode); \n+\t currentNode=createCompositeNode(grammarAccess.getLinkAccess().getUrlTextParserRuleCall_1_0(), currentNode); \n \t }\n-\t\tlv_url_3_0=ruleText\t\t{\n+\t\tlv_url_1_0=ruleText\t\t{\n \t if ($current==null) {\n \t $current = factory.create(grammarAccess.getLinkRule().getType().getClassifier());\n \t associateNodeWithAstElement(currentNode.getParent(), $current);\n@@ -1929,7 +1851,7 @@ ruleANY_WS\n \t \t\tset(\n \t \t\t\t$current, \n \t \t\t\t\"url\",\n-\t \t\tlv_url_3_0, \n+\t \t\tlv_url_1_0, \n \t \t\t\"Text\", \n \t \t\tcurrentNode);\n \t } catch (ValueConverterException vce) {\n@@ -1941,26 +1863,26 @@ ruleANY_WS\n )\n )\t']' \n {\n- createLeafNode(grammarAccess.getLinkAccess().getRightSquareBracketKeyword_4(), null); \n+ createLeafNode(grammarAccess.getLinkAccess().getRightSquareBracketKeyword_2(), null); \n }\n (\n { \n- currentNode=createCompositeNode(grammarAccess.getLinkAccess().getANY_WSParserRuleCall_5(), currentNode); \n+ currentNode=createCompositeNode(grammarAccess.getLinkAccess().getANY_WSParserRuleCall_3(), currentNode); \n }\n ruleANY_WS\n { \n currentNode = currentNode.getParent();\n }\n )*\t'[' \n {\n- createLeafNode(grammarAccess.getLinkAccess().getLeftSquareBracketKeyword_6(), null); \n+ createLeafNode(grammarAccess.getLinkAccess().getLeftSquareBracketKeyword_4(), null); \n }\n (\n (\n \t\t{ \n-\t currentNode=createCompositeNode(grammarAccess.getLinkAccess().getTextTextParserRuleCall_7_0(), currentNode); \n+\t currentNode=createCompositeNode(grammarAccess.getLinkAccess().getTextTextParserRuleCall_5_0(), currentNode); \n \t }\n-\t\tlv_text_7_0=ruleText\t\t{\n+\t\tlv_text_5_0=ruleText\t\t{\n \t if ($current==null) {\n \t $current = factory.create(grammarAccess.getLinkRule().getType().getClassifier());\n \t associateNodeWithAstElement(currentNode.getParent(), $current);\n@@ -1969,7 +1891,7 @@ ruleANY_WS\n \t \t\tset(\n \t \t\t\t$current, \n \t \t\t\t\"text\",\n-\t \t\tlv_text_7_0, \n+\t \t\tlv_text_5_0, \n \t \t\t\"Text\", \n \t \t\tcurrentNode);\n \t } catch (ValueConverterException vce) {\n@@ -1981,7 +1903,7 @@ ruleANY_WS\n )\n )\t']' \n {\n- createLeafNode(grammarAccess.getLinkAccess().getRightSquareBracketKeyword_8(), null); \n+ createLeafNode(grammarAccess.getLinkAccess().getRightSquareBracketKeyword_6(), null); \n }\n )\n ;\n@@ -2006,35 +1928,23 @@ ruleImageRef returns [EObject current=null]\n @after { resetLookahead(); \n \tlastConsumedNode = currentNode;\n }:\n-(\t'\\\\img' \n+(((\t'img:' \n {\n- createLeafNode(grammarAccess.getImageRefAccess().getImgKeyword_0(), null); \n+ createLeafNode(grammarAccess.getImageRefAccess().getImgKeyword_0_0_0(), null); \n }\n (\n { \n- currentNode=createCompositeNode(grammarAccess.getImageRefAccess().getANY_WSParserRuleCall_1(), currentNode); \n- }\n-ruleANY_WS\n- { \n- currentNode = currentNode.getParent();\n- }\n-)*(\t':' \n- {\n- createLeafNode(grammarAccess.getImageRefAccess().getColonKeyword_2_0(), null); \n- }\n-(\n- { \n- currentNode=createCompositeNode(grammarAccess.getImageRefAccess().getANY_WSParserRuleCall_2_1(), currentNode); \n+ currentNode=createCompositeNode(grammarAccess.getImageRefAccess().getANY_WSParserRuleCall_0_0_1(), currentNode); \n }\n ruleANY_WS\n { \n currentNode = currentNode.getParent();\n }\n )*(\n (\n-\t\tlv_name_4_0=RULE_ID\n+\t\tlv_name_2_0=RULE_ID\n \t\t{\n-\t\t\tcreateLeafNode(grammarAccess.getImageRefAccess().getNameIDTerminalRuleCall_2_2_0(), \"name\"); \n+\t\t\tcreateLeafNode(grammarAccess.getImageRefAccess().getNameIDTerminalRuleCall_0_0_2_0(), \"name\"); \n \t\t}\n \t\t{\n \t if ($current==null) {\n@@ -2045,7 +1955,7 @@ ruleANY_WS\n \t \t\tset(\n \t \t\t\t$current, \n \t \t\t\t\"name\",\n-\t \t\tlv_name_4_0, \n+\t \t\tlv_name_2_0, \n \t \t\t\"ID\", \n \t \t\tlastConsumedNode);\n \t } catch (ValueConverterException vce) {\n@@ -2056,22 +1966,27 @@ ruleANY_WS\n )\n )(\n { \n- currentNode=createCompositeNode(grammarAccess.getImageRefAccess().getANY_WSParserRuleCall_2_3(), currentNode); \n+ currentNode=createCompositeNode(grammarAccess.getImageRefAccess().getANY_WSParserRuleCall_0_0_3(), currentNode); \n }\n ruleANY_WS\n { \n currentNode = currentNode.getParent();\n }\n-)*)?\t'[' \n+)*\t'[' \n {\n- createLeafNode(grammarAccess.getImageRefAccess().getLeftSquareBracketKeyword_3(), null); \n+ createLeafNode(grammarAccess.getImageRefAccess().getLeftSquareBracketKeyword_0_0_4(), null); \n }\n-(\n+)\n+ |\t'img[' \n+ {\n+ createLeafNode(grammarAccess.getImageRefAccess().getImgKeyword_0_1(), null); \n+ }\n+)(\n (\n \t\t{ \n-\t currentNode=createCompositeNode(grammarAccess.getImageRefAccess().getPathTextParserRuleCall_4_0(), currentNode); \n+\t currentNode=createCompositeNode(grammarAccess.getImageRefAccess().getPathTextParserRuleCall_1_0(), currentNode); \n \t }\n-\t\tlv_path_7_0=ruleText\t\t{\n+\t\tlv_path_6_0=ruleText\t\t{\n \t if ($current==null) {\n \t $current = factory.create(grammarAccess.getImageRefRule().getType().getClassifier());\n \t associateNodeWithAstElement(currentNode.getParent(), $current);\n@@ -2080,7 +1995,7 @@ ruleANY_WS\n \t \t\tset(\n \t \t\t\t$current, \n \t \t\t\t\"path\",\n-\t \t\tlv_path_7_0, \n+\t \t\tlv_path_6_0, \n \t \t\t\"Text\", \n \t \t\tcurrentNode);\n \t } catch (ValueConverterException vce) {\n@@ -2092,26 +2007,26 @@ ruleANY_WS\n )\n )\t']' \n {\n- createLeafNode(grammarAccess.getImageRefAccess().getRightSquareBracketKeyword_5(), null); \n+ createLeafNode(grammarAccess.getImageRefAccess().getRightSquareBracketKeyword_2(), null); \n }\n (\n { \n- currentNode=createCompositeNode(grammarAccess.getImageRefAccess().getANY_WSParserRuleCall_6(), currentNode); \n+ currentNode=createCompositeNode(grammarAccess.getImageRefAccess().getANY_WSParserRuleCall_3(), currentNode); \n }\n ruleANY_WS\n { \n currentNode = currentNode.getParent();\n }\n )*\t'[' \n {\n- createLeafNode(grammarAccess.getImageRefAccess().getLeftSquareBracketKeyword_7(), null); \n+ createLeafNode(grammarAccess.getImageRefAccess().getLeftSquareBracketKeyword_4(), null); \n }\n (\n (\n \t\t{ \n-\t currentNode=createCompositeNode(grammarAccess.getImageRefAccess().getClazzTextParserRuleCall_8_0(), currentNode); \n+\t currentNode=createCompositeNode(grammarAccess.getImageRefAccess().getClazzTextParserRuleCall_5_0(), currentNode); \n \t }\n-\t\tlv_clazz_11_0=ruleText\t\t{\n+\t\tlv_clazz_10_0=ruleText\t\t{\n \t if ($current==null) {\n \t $current = factory.create(grammarAccess.getImageRefRule().getType().getClassifier());\n \t associateNodeWithAstElement(currentNode.getParent(), $current);\n@@ -2120,7 +2035,7 @@ ruleANY_WS\n \t \t\tset(\n \t \t\t\t$current, \n \t \t\t\t\"clazz\",\n-\t \t\tlv_clazz_11_0, \n+\t \t\tlv_clazz_10_0, \n \t \t\t\"Text\", \n \t \t\tcurrentNode);\n \t } catch (ValueConverterException vce) {\n@@ -2132,26 +2047,26 @@ ruleANY_WS\n )\n )\t']' \n {\n- createLeafNode(grammarAccess.getImageRefAccess().getRightSquareBracketKeyword_9(), null); \n+ createLeafNode(grammarAccess.getImageRefAccess().getRightSquareBracketKeyword_6(), null); \n }\n (\n { \n- currentNode=createCompositeNode(grammarAccess.getImageRefAccess().getANY_WSParserRuleCall_10(), currentNode); \n+ currentNode=createCompositeNode(grammarAccess.getImageRefAccess().getANY_WSParserRuleCall_7(), currentNode); \n }\n ruleANY_WS\n { \n currentNode = currentNode.getParent();\n }\n )*\t'[' \n {\n- createLeafNode(grammarAccess.getImageRefAccess().getLeftSquareBracketKeyword_11(), null); \n+ createLeafNode(grammarAccess.getImageRefAccess().getLeftSquareBracketKeyword_8(), null); \n }\n (\n (\n \t\t{ \n-\t currentNode=createCompositeNode(grammarAccess.getImageRefAccess().getStyleTextParserRuleCall_12_0(), currentNode); \n+\t currentNode=createCompositeNode(grammarAccess.getImageRefAccess().getStyleTextParserRuleCall_9_0(), currentNode); \n \t }\n-\t\tlv_style_15_0=ruleText\t\t{\n+\t\tlv_style_14_0=ruleText\t\t{\n \t if ($current==null) {\n \t $current = factory.create(grammarAccess.getImageRefRule().getType().getClassifier());\n \t associateNodeWithAstElement(currentNode.getParent(), $current);\n@@ -2160,7 +2075,7 @@ ruleANY_WS\n \t \t\tset(\n \t \t\t\t$current, \n \t \t\t\t\"style\",\n-\t \t\tlv_style_15_0, \n+\t \t\tlv_style_14_0, \n \t \t\t\"Text\", \n \t \t\tcurrentNode);\n \t } catch (ValueConverterException vce) {\n@@ -2172,26 +2087,26 @@ ruleANY_WS\n )\n )\t']' \n {\n- createLeafNode(grammarAccess.getImageRefAccess().getRightSquareBracketKeyword_13(), null); \n+ createLeafNode(grammarAccess.getImageRefAccess().getRightSquareBracketKeyword_10(), null); \n }\n (\n { \n- currentNode=createCompositeNode(grammarAccess.getImageRefAccess().getANY_WSParserRuleCall_14(), currentNode); \n+ currentNode=createCompositeNode(grammarAccess.getImageRefAccess().getANY_WSParserRuleCall_11(), currentNode); \n }\n ruleANY_WS\n { \n currentNode = currentNode.getParent();\n }\n )*\t'[' \n {\n- createLeafNode(grammarAccess.getImageRefAccess().getLeftSquareBracketKeyword_15(), null); \n+ createLeafNode(grammarAccess.getImageRefAccess().getLeftSquareBracketKeyword_12(), null); \n }\n (\n (\n \t\t{ \n-\t currentNode=createCompositeNode(grammarAccess.getImageRefAccess().getCaptionTextParserRuleCall_16_0(), currentNode); \n+\t currentNode=createCompositeNode(grammarAccess.getImageRefAccess().getCaptionTextParserRuleCall_13_0(), currentNode); \n \t }\n-\t\tlv_caption_19_0=ruleText\t\t{\n+\t\tlv_caption_18_0=ruleText\t\t{\n \t if ($current==null) {\n \t $current = factory.create(grammarAccess.getImageRefRule().getType().getClassifier());\n \t associateNodeWithAstElement(currentNode.getParent(), $current);\n@@ -2200,7 +2115,7 @@ ruleANY_WS\n \t \t\tset(\n \t \t\t\t$current, \n \t \t\t\t\"caption\",\n-\t \t\tlv_caption_19_0, \n+\t \t\tlv_caption_18_0, \n \t \t\t\"Text\", \n \t \t\tcurrentNode);\n \t } catch (ValueConverterException vce) {\n@@ -2212,7 +2127,7 @@ ruleANY_WS\n )\n )\t']' \n {\n- createLeafNode(grammarAccess.getImageRefAccess().getRightSquareBracketKeyword_17(), null); \n+ createLeafNode(grammarAccess.getImageRefAccess().getRightSquareBracketKeyword_14(), null); \n }\n )\n ;\n@@ -2237,35 +2152,23 @@ ruleCodeBlock returns [EObject current=null]\n @after { resetLookahead(); \n \tlastConsumedNode = currentNode;\n }:\n-(\t'\\\\code' \n+(\t'code[' \n {\n createLeafNode(grammarAccess.getCodeBlockAccess().getCodeKeyword_0(), null); \n }\n-(\n- { \n- currentNode=createCompositeNode(grammarAccess.getCodeBlockAccess().getANY_WSParserRuleCall_1(), currentNode); \n- }\n-ruleANY_WS\n- { \n- currentNode = currentNode.getParent();\n- }\n-)*(\t'[' \n- {\n- createLeafNode(grammarAccess.getCodeBlockAccess().getLeftSquareBracketKeyword_2_0(), null); \n- }\n-(\n+((\n { \n- currentNode=createCompositeNode(grammarAccess.getCodeBlockAccess().getANY_WSParserRuleCall_2_1(), currentNode); \n+ currentNode=createCompositeNode(grammarAccess.getCodeBlockAccess().getANY_WSParserRuleCall_1_0(), currentNode); \n }\n ruleANY_WS\n { \n currentNode = currentNode.getParent();\n }\n )*(\n (\n-\t\tlv_language_4_0=RULE_ID\n+\t\tlv_language_2_0=RULE_ID\n \t\t{\n-\t\t\tcreateLeafNode(grammarAccess.getCodeBlockAccess().getLanguageIDTerminalRuleCall_2_2_0(), \"language\"); \n+\t\t\tcreateLeafNode(grammarAccess.getCodeBlockAccess().getLanguageIDTerminalRuleCall_1_1_0(), \"language\"); \n \t\t}\n \t\t{\n \t if ($current==null) {\n@@ -2276,7 +2179,7 @@ ruleANY_WS\n \t \t\tset(\n \t \t\t\t$current, \n \t \t\t\t\"language\",\n-\t \t\tlv_language_4_0, \n+\t \t\tlv_language_2_0, \n \t \t\t\"ID\", \n \t \t\tlastConsumedNode);\n \t } catch (ValueConverterException vce) {\n@@ -2287,34 +2190,34 @@ ruleANY_WS\n )\n )(\n { \n- currentNode=createCompositeNode(grammarAccess.getCodeBlockAccess().getANY_WSParserRuleCall_2_3(), currentNode); \n+ currentNode=createCompositeNode(grammarAccess.getCodeBlockAccess().getANY_WSParserRuleCall_1_2(), currentNode); \n }\n ruleANY_WS\n { \n currentNode = currentNode.getParent();\n }\n )*\t']' \n {\n- createLeafNode(grammarAccess.getCodeBlockAccess().getRightSquareBracketKeyword_2_4(), null); \n+ createLeafNode(grammarAccess.getCodeBlockAccess().getRightSquareBracketKeyword_1_3(), null); \n }\n (\n { \n- currentNode=createCompositeNode(grammarAccess.getCodeBlockAccess().getANY_WSParserRuleCall_2_5(), currentNode); \n+ currentNode=createCompositeNode(grammarAccess.getCodeBlockAccess().getANY_WSParserRuleCall_1_4(), currentNode); \n }\n ruleANY_WS\n { \n currentNode = currentNode.getParent();\n }\n-)*)?\t'[' \n+)*\t'[' \n {\n- createLeafNode(grammarAccess.getCodeBlockAccess().getLeftSquareBracketKeyword_3(), null); \n+ createLeafNode(grammarAccess.getCodeBlockAccess().getLeftSquareBracketKeyword_1_5(), null); \n }\n-(((\n+)?(((\n (\n \t\t{ \n-\t currentNode=createCompositeNode(grammarAccess.getCodeBlockAccess().getContentsCodeParserRuleCall_4_0_0_0(), currentNode); \n+\t currentNode=createCompositeNode(grammarAccess.getCodeBlockAccess().getContentsCodeParserRuleCall_2_0_0_0(), currentNode); \n \t }\n-\t\tlv_contents_9_0=ruleCode\t\t{\n+\t\tlv_contents_7_0=ruleCode\t\t{\n \t if ($current==null) {\n \t $current = factory.create(grammarAccess.getCodeBlockRule().getType().getClassifier());\n \t associateNodeWithAstElement(currentNode.getParent(), $current);\n@@ -2323,7 +2226,7 @@ ruleANY_WS\n \t \t\tadd(\n \t \t\t\t$current, \n \t \t\t\t\"contents\",\n-\t \t\tlv_contents_9_0, \n+\t \t\tlv_contents_7_0, \n \t \t\t\"Code\", \n \t \t\tcurrentNode);\n \t } catch (ValueConverterException vce) {\n@@ -2336,9 +2239,9 @@ ruleANY_WS\n )((\n (\n \t\t{ \n-\t currentNode=createCompositeNode(grammarAccess.getCodeBlockAccess().getContentsMarkupInCodeParserRuleCall_4_0_1_0_0(), currentNode); \n+\t currentNode=createCompositeNode(grammarAccess.getCodeBlockAccess().getContentsMarkupInCodeParserRuleCall_2_0_1_0_0(), currentNode); \n \t }\n-\t\tlv_contents_10_0=ruleMarkupInCode\t\t{\n+\t\tlv_contents_8_0=ruleMarkupInCode\t\t{\n \t if ($current==null) {\n \t $current = factory.create(grammarAccess.getCodeBlockRule().getType().getClassifier());\n \t associateNodeWithAstElement(currentNode.getParent(), $current);\n@@ -2347,7 +2250,7 @@ ruleANY_WS\n \t \t\tadd(\n \t \t\t\t$current, \n \t \t\t\t\"contents\",\n-\t \t\tlv_contents_10_0, \n+\t \t\tlv_contents_8_0, \n \t \t\t\"MarkupInCode\", \n \t \t\tcurrentNode);\n \t } catch (ValueConverterException vce) {\n@@ -2360,9 +2263,9 @@ ruleANY_WS\n )(\n (\n \t\t{ \n-\t currentNode=createCompositeNode(grammarAccess.getCodeBlockAccess().getContentsCodeParserRuleCall_4_0_1_1_0(), currentNode); \n+\t currentNode=createCompositeNode(grammarAccess.getCodeBlockAccess().getContentsCodeParserRuleCall_2_0_1_1_0(), currentNode); \n \t }\n-\t\tlv_contents_11_0=ruleCode\t\t{\n+\t\tlv_contents_9_0=ruleCode\t\t{\n \t if ($current==null) {\n \t $current = factory.create(grammarAccess.getCodeBlockRule().getType().getClassifier());\n \t associateNodeWithAstElement(currentNode.getParent(), $current);\n@@ -2371,7 +2274,7 @@ ruleANY_WS\n \t \t\tadd(\n \t \t\t\t$current, \n \t \t\t\t\"contents\",\n-\t \t\tlv_contents_11_0, \n+\t \t\tlv_contents_9_0, \n \t \t\t\"Code\", \n \t \t\tcurrentNode);\n \t } catch (ValueConverterException vce) {\n@@ -2385,9 +2288,9 @@ ruleANY_WS\n |((\n (\n \t\t{ \n-\t currentNode=createCompositeNode(grammarAccess.getCodeBlockAccess().getContentsMarkupInCodeParserRuleCall_4_1_0_0(), currentNode); \n+\t currentNode=createCompositeNode(grammarAccess.getCodeBlockAccess().getContentsMarkupInCodeParserRuleCall_2_1_0_0(), currentNode); \n \t }\n-\t\tlv_contents_12_0=ruleMarkupInCode\t\t{\n+\t\tlv_contents_10_0=ruleMarkupInCode\t\t{\n \t if ($current==null) {\n \t $current = factory.create(grammarAccess.getCodeBlockRule().getType().getClassifier());\n \t associateNodeWithAstElement(currentNode.getParent(), $current);\n@@ -2396,7 +2299,7 @@ ruleANY_WS\n \t \t\tadd(\n \t \t\t\t$current, \n \t \t\t\t\"contents\",\n-\t \t\tlv_contents_12_0, \n+\t \t\tlv_contents_10_0, \n \t \t\t\"MarkupInCode\", \n \t \t\tcurrentNode);\n \t } catch (ValueConverterException vce) {\n@@ -2409,9 +2312,9 @@ ruleANY_WS\n )(\n (\n \t\t{ \n-\t currentNode=createCompositeNode(grammarAccess.getCodeBlockAccess().getContentsCodeParserRuleCall_4_1_1_0(), currentNode); \n+\t currentNode=createCompositeNode(grammarAccess.getCodeBlockAccess().getContentsCodeParserRuleCall_2_1_1_0(), currentNode); \n \t }\n-\t\tlv_contents_13_0=ruleCode\t\t{\n+\t\tlv_contents_11_0=ruleCode\t\t{\n \t if ($current==null) {\n \t $current = factory.create(grammarAccess.getCodeBlockRule().getType().getClassifier());\n \t associateNodeWithAstElement(currentNode.getParent(), $current);\n@@ -2420,7 +2323,7 @@ ruleANY_WS\n \t \t\tadd(\n \t \t\t\t$current, \n \t \t\t\t\"contents\",\n-\t \t\tlv_contents_13_0, \n+\t \t\tlv_contents_11_0, \n \t \t\t\"Code\", \n \t \t\tcurrentNode);\n \t } catch (ValueConverterException vce) {\n@@ -2432,7 +2335,7 @@ ruleANY_WS\n )\n )?)+)\t']' \n {\n- createLeafNode(grammarAccess.getCodeBlockAccess().getRightSquareBracketKeyword_5(), null); \n+ createLeafNode(grammarAccess.getCodeBlockAccess().getRightSquareBracketKeyword_3(), null); \n }\n )\n ;", "raw_url": "https://github.com/RvonMassow/xDoc/raw/6b0eb897ce8abe5cda472a8e6af89cd62a47dd66/org.eclipse.xtext.xdoc%2Fsrc-gen%2Forg%2Feclipse%2Fxtext%2Fxdoc%2Fparser%2Fantlr%2Finternal%2FInternalXDoc.g", "sha": "6264c816d9ddb04627e7c8ab215cfb358c9d8064", "status": "modified" }, { "additions": 25, "blob_url": "https://github.com/RvonMassow/xDoc/blob/6b0eb897ce8abe5cda472a8e6af89cd62a47dd66/org.eclipse.xtext.xdoc%2Fsrc-gen%2Forg%2Feclipse%2Fxtext%2Fxdoc%2Fparser%2Fantlr%2Finternal%2FInternalXDoc.tokens", "changes": 44, "contents_url": "https://api.github.com/repos/RvonMassow/xDoc/contents/org.eclipse.xtext.xdoc%2Fsrc-gen%2Forg%2Feclipse%2Fxtext%2Fxdoc%2Fparser%2Fantlr%2Finternal%2FInternalXDoc.tokens?ref=6b0eb897ce8abe5cda472a8e6af89cd62a47dd66", "deletions": 19, "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.tokens", "new_code": "'ref:'=26\n'section4:'=20\n'section4['=21\n'chapter:'=10\n'\\\\]'=23\n'code['=34\n'ol['=27\n'section['=15\n'img['=33\n'section3['=19\n'['=11\n'item['=29\n'codeRef['=30\n'img:'=32\n'emph['=24\n'ul['=28\n'subsection:'=16\n'section:'=14\n'a['=25\n'\\\\['=22\n'chapter['=12\n'section3:'=18\n':'=35\n'subsection['=17\n'link['=31", "new_methods": [], "old_code": "'\\\\link'=27\n'\\\\chapter'=10\n'\\\\ref'=22\n'\\\\item'=25\n'\\\\code'=29\n'\\\\subsection'=15\n'\\\\ul'=24\n'\\\\['=18\n'\\\\section4'=17\n'\\\\]'=19\n'\\\\section3'=16\n'\\\\img'=28\n'\\\\codeRef'=26\n':'=11\n'\\\\emph'=20\n'\\\\ol'=23\n'['=12\n'\\\\a'=21\n'\\\\section'=14", "old_methods": [], "patch": "@@ -4,23 +4,29 @@ RULE_MULTI_NL=5\n RULE_SINGLE_NL=7\n RULE_ANY_OTHER=8\n RULE_SL_COMMENT=9\n-'\\\\link'=27\n-'\\\\chapter'=10\n-'\\\\ref'=22\n-'\\\\item'=25\n-'\\\\code'=29\n-'\\\\subsection'=15\n-'\\\\ul'=24\n-'\\\\['=18\n+'ref:'=26\n+'section4:'=20\n+'section4['=21\n+'chapter:'=10\n ']'=13\n-'\\\\section4'=17\n-'\\\\]'=19\n-'\\\\section3'=16\n-'\\\\img'=28\n-'\\\\codeRef'=26\n-':'=11\n-'\\\\emph'=20\n-'\\\\ol'=23\n-'['=12\n-'\\\\a'=21\n-'\\\\section'=14\n+'\\\\]'=23\n+'code['=34\n+'ol['=27\n+'section['=15\n+'img['=33\n+'section3['=19\n+'['=11\n+'item['=29\n+'codeRef['=30\n+'img:'=32\n+'emph['=24\n+'ul['=28\n+'subsection:'=16\n+'section:'=14\n+'a['=25\n+'\\\\['=22\n+'chapter['=12\n+'section3:'=18\n+':'=35\n+'subsection['=17\n+'link['=31", "raw_url": "https://github.com/RvonMassow/xDoc/raw/6b0eb897ce8abe5cda472a8e6af89cd62a47dd66/org.eclipse.xtext.xdoc%2Fsrc-gen%2Forg%2Feclipse%2Fxtext%2Fxdoc%2Fparser%2Fantlr%2Finternal%2FInternalXDoc.tokens", "sha": "1ec417a158e0b708b1100fc4aadfea22f12603e5", "status": "modified" }, { "additions": 660, "blob_url": "https://github.com/RvonMassow/xDoc/blob/6b0eb897ce8abe5cda472a8e6af89cd62a47dd66/org.eclipse.xtext.xdoc%2Fsrc-gen%2Forg%2Feclipse%2Fxtext%2Fxdoc%2Fparser%2Fantlr%2Finternal%2FInternalXDocLexer.java", "changes": 906, "contents_url": "https://api.github.com/repos/RvonMassow/xDoc/contents/org.eclipse.xtext.xdoc%2Fsrc-gen%2Forg%2Feclipse%2Fxtext%2Fxdoc%2Fparser%2Fantlr%2Finternal%2FInternalXDocLexer.java?ref=6b0eb897ce8abe5cda472a8e6af89cd62a47dd66", "deletions": 246, "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDocLexer.java", "new_code": " public static final int T33=33;\n public static final int T35=35;\n public static final int T34=34;\n public static final int T32=32;\n public static final int Tokens=36;\n public static final int T31=31;\n public static final int T30=30;\n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:10:5: ( 'chapter:' )\n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:10:7: 'chapter:'\n match(\"chapter:\"); \n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:11:5: ( '[' )\n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:11:7: '['\n match('['); \n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:12:5: ( 'chapter[' )\n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:12:7: 'chapter['\n match(\"chapter[\"); \n\n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:14:5: ( 'section:' )\n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:14:7: 'section:'\n match(\"section:\"); \n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:15:5: ( 'section[' )\n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:15:7: 'section['\n match(\"section[\"); \n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:16:5: ( 'subsection:' )\n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:16:7: 'subsection:'\n match(\"subsection:\"); \n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:17:5: ( 'subsection[' )\n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:17:7: 'subsection['\n match(\"subsection[\"); \n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:18:5: ( 'section3:' )\n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:18:7: 'section3:'\n match(\"section3:\"); \n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:19:5: ( 'section3[' )\n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:19:7: 'section3['\n match(\"section3[\"); \n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:20:5: ( 'section4:' )\n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:20:7: 'section4:'\n match(\"section4:\"); \n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:21:5: ( 'section4[' )\n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:21:7: 'section4['\n match(\"section4[\"); \n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:22:5: ( '\\\\\\\\[' )\n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:22:7: '\\\\\\\\['\n match(\"\\\\[\"); \n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:23:5: ( '\\\\\\\\]' )\n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:23:7: '\\\\\\\\]'\n match(\"\\\\]\"); \n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:24:5: ( 'emph[' )\n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:24:7: 'emph['\n match(\"emph[\"); \n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:25:5: ( 'a[' )\n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:25:7: 'a['\n match(\"a[\"); \n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:26:5: ( 'ref:' )\n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:26:7: 'ref:'\n match(\"ref:\"); \n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:27:5: ( 'ol[' )\n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:27:7: 'ol['\n match(\"ol[\"); \n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:28:5: ( 'ul[' )\n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:28:7: 'ul['\n match(\"ul[\"); \n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:29:5: ( 'item[' )\n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:29:7: 'item['\n match(\"item[\"); \n // $ANTLR start T30\n public final void mT30() throws RecognitionException {\n try {\n int _type = T30;\n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:30:5: ( 'codeRef[' )\n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:30:7: 'codeRef['\n {\n match(\"codeRef[\"); \n\n\n }\n\n this.type = _type;\n }\n finally {\n }\n }\n // $ANTLR end T30\n\n // $ANTLR start T31\n public final void mT31() throws RecognitionException {\n try {\n int _type = T31;\n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:31:5: ( 'link[' )\n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:31:7: 'link['\n {\n match(\"link[\"); \n\n\n }\n\n this.type = _type;\n }\n finally {\n }\n }\n // $ANTLR end T31\n\n // $ANTLR start T32\n public final void mT32() throws RecognitionException {\n try {\n int _type = T32;\n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:32:5: ( 'img:' )\n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:32:7: 'img:'\n {\n match(\"img:\"); \n\n\n }\n\n this.type = _type;\n }\n finally {\n }\n }\n // $ANTLR end T32\n\n // $ANTLR start T33\n public final void mT33() throws RecognitionException {\n try {\n int _type = T33;\n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:33:5: ( 'img[' )\n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:33:7: 'img['\n {\n match(\"img[\"); \n\n\n }\n\n this.type = _type;\n }\n finally {\n }\n }\n // $ANTLR end T33\n\n // $ANTLR start T34\n public final void mT34() throws RecognitionException {\n try {\n int _type = T34;\n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:34:5: ( 'code[' )\n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:34:7: 'code['\n {\n match(\"code[\"); \n\n\n }\n\n this.type = _type;\n }\n finally {\n }\n }\n // $ANTLR end T34\n\n // $ANTLR start T35\n public final void mT35() throws RecognitionException {\n try {\n int _type = T35;\n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:35:5: ( ':' )\n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:35:7: ':'\n {\n match(':'); \n\n }\n\n this.type = _type;\n }\n finally {\n }\n }\n // $ANTLR end T35\n\n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:2575:9: ( ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )\n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:2575:11: ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*\n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:2575:35: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*\n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:2577:17: ( '%%' (~ ( ( '\\\\n' | '\\\\r' ) ) )* ( ( '\\\\r' )? '\\\\n' )? )\n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:2577:19: '%%' (~ ( ( '\\\\n' | '\\\\r' ) ) )* ( ( '\\\\r' )? '\\\\n' )?\n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:2577:24: (~ ( ( '\\\\n' | '\\\\r' ) ) )*\n \t // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:2577:24: ~ ( ( '\\\\n' | '\\\\r' ) )\n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:2577:40: ( ( '\\\\r' )? '\\\\n' )?\n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:2577:41: ( '\\\\r' )? '\\\\n'\n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:2577:41: ( '\\\\r' )?\n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:2577:41: '\\\\r'\n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:2579:15: ( ( '\\\\r' )? '\\\\n' ( ( '\\\\r' )? '\\\\n' )+ )\n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:2579:17: ( '\\\\r' )? '\\\\n' ( ( '\\\\r' )? '\\\\n' )+\n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:2579:17: ( '\\\\r' )?\n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:2579:17: '\\\\r'\n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:2579:28: ( ( '\\\\r' )? '\\\\n' )+\n \t // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:2579:29: ( '\\\\r' )? '\\\\n'\n \t // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:2579:29: ( '\\\\r' )?\n \t // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:2579:29: '\\\\r'\n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:2581:16: ( ( '\\\\r' )? '\\\\n' )\n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:2581:18: ( '\\\\r' )? '\\\\n'\n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:2581:18: ( '\\\\r' )?\n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:2581:18: '\\\\r'\n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:2583:9: ( ( ' ' | '\\\\t' ) )\n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:2583:11: ( ' ' | '\\\\t' )\n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:2585:16: ( . )\n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:2585:18: .\n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:1:8: ( T10 | T11 | T12 | T13 | T14 | T15 | T16 | T17 | T18 | T19 | T20 | T21 | T22 | T23 | T24 | T25 | T26 | T27 | T28 | T29 | T30 | T31 | T32 | T33 | T34 | T35 | RULE_ID | RULE_SL_COMMENT | RULE_MULTI_NL | RULE_SINGLE_NL | RULE_WS | RULE_ANY_OTHER )\n int alt9=32;\n if ( (LA9_0=='c') ) {\n case 'h':\n {\n int LA9_20 = input.LA(3);\n\n if ( (LA9_20=='a') ) {\n int LA9_43 = input.LA(4);\n\n if ( (LA9_43=='p') ) {\n int LA9_54 = input.LA(5);\n\n if ( (LA9_54=='t') ) {\n int LA9_64 = input.LA(6);\n\n if ( (LA9_64=='e') ) {\n int LA9_72 = input.LA(7);\n\n if ( (LA9_72=='r') ) {\n switch ( input.LA(8) ) {\n case '[':\n {\n alt9=3;\n }\n break;\n case ':':\n {\n alt9=1;\n }\n break;\n default:\n alt9=27;}\n\n }\n else {\n alt9=27;}\n }\n else {\n alt9=27;}\n }\n else {\n alt9=27;}\n }\n else {\n alt9=27;}\n }\n else {\n alt9=27;}\n }\n break;\n case 'o':\n int LA9_21 = input.LA(3);\n\n if ( (LA9_21=='d') ) {\n int LA9_44 = input.LA(4);\n\n if ( (LA9_44=='e') ) {\n switch ( input.LA(5) ) {\n case '[':\n {\n alt9=25;\n }\n break;\n case 'R':\n {\n int LA9_66 = input.LA(6);\n\n if ( (LA9_66=='e') ) {\n int LA9_73 = input.LA(7);\n\n if ( (LA9_73=='f') ) {\n int LA9_77 = input.LA(8);\n\n if ( (LA9_77=='[') ) {\n alt9=21;\n }\n else {\n alt9=27;}\n }\n else {\n alt9=27;}\n }\n else {\n alt9=27;}\n }\n break;\n default:\n alt9=27;}\n\n }\n else {\n alt9=27;}\n }\n else {\n alt9=27;}\n }\n break;\n default:\n alt9=27;}\n }\n else if ( (LA9_0=='[') ) {\n alt9=2;\n }\n else if ( (LA9_0==']') ) {\n alt9=4;\n }\n else if ( (LA9_0=='s') ) {\n switch ( input.LA(2) ) {\n case 'e':\n {\n int LA9_25 = input.LA(3);\n if ( (LA9_25=='c') ) {\n int LA9_45 = input.LA(4);\n if ( (LA9_45=='t') ) {\n int LA9_56 = input.LA(5);\n if ( (LA9_56=='i') ) {\n int LA9_67 = input.LA(6);\n if ( (LA9_67=='o') ) {\n int LA9_74 = input.LA(7);\n if ( (LA9_74=='n') ) {\n switch ( input.LA(8) ) {\n case '4':\n {\n case '[':\n alt9=12;\n case ':':\n alt9=11;\n alt9=27;}\n }\n break;\n case '3':\n {\n switch ( input.LA(9) ) {\n case ':':\n {\n alt9=9;\n }\n break;\n case '[':\n {\n alt9=10;\n }\n break;\n default:\n alt9=27;}\n\n }\n break;\n case ':':\n {\n alt9=5;\n }\n break;\n case '[':\n {\n alt9=6;\n }\n break;\n default:\n alt9=27;}\n alt9=27;}\n alt9=27;}\n alt9=27;}\n alt9=27;}\n alt9=27;}\n }\n break;\n case 'u':\n {\n int LA9_26 = input.LA(3);\n\n if ( (LA9_26=='b') ) {\n int LA9_46 = input.LA(4);\n\n if ( (LA9_46=='s') ) {\n int LA9_57 = input.LA(5);\n\n if ( (LA9_57=='e') ) {\n int LA9_68 = input.LA(6);\n if ( (LA9_68=='c') ) {\n int LA9_75 = input.LA(7);\n\n if ( (LA9_75=='t') ) {\n int LA9_79 = input.LA(8);\n\n if ( (LA9_79=='i') ) {\n int LA9_87 = input.LA(9);\n\n if ( (LA9_87=='o') ) {\n int LA9_92 = input.LA(10);\n\n if ( (LA9_92=='n') ) {\n switch ( input.LA(11) ) {\n case '[':\n {\n alt9=8;\n }\n break;\n case ':':\n {\n alt9=7;\n }\n break;\n default:\n alt9=27;}\n\n }\n else {\n alt9=27;}\n }\n else {\n alt9=27;}\n }\n else {\n alt9=27;}\n }\n else {\n alt9=27;}\n }\n else {\n alt9=27;}\n }\n else {\n alt9=27;}\n }\n else {\n alt9=27;}\n else {\n alt9=27;}\n default:\n alt9=27;}\n\n }\n else if ( (LA9_0=='\\\\') ) {\n switch ( input.LA(2) ) {\n case '[':\n alt9=13;\n alt9=14;\n default:\n alt9=32;}\n }\n else if ( (LA9_0=='e') ) {\n int LA9_6 = input.LA(2);\n if ( (LA9_6=='m') ) {\n int LA9_29 = input.LA(3);\n if ( (LA9_29=='p') ) {\n int LA9_47 = input.LA(4);\n if ( (LA9_47=='h') ) {\n int LA9_58 = input.LA(5);\n if ( (LA9_58=='[') ) {\n alt9=15;\n else {\n alt9=27;}\n alt9=27;}\n }\n else {\n alt9=27;}\n }\n else {\n alt9=27;}\n }\n else if ( (LA9_0=='a') ) {\n int LA9_7 = input.LA(2);\n\n if ( (LA9_7=='[') ) {\n alt9=16;\n }\n else {\n alt9=27;}\n }\n else if ( (LA9_0=='r') ) {\n int LA9_8 = input.LA(2);\n\n if ( (LA9_8=='e') ) {\n int LA9_31 = input.LA(3);\n\n if ( (LA9_31=='f') ) {\n int LA9_48 = input.LA(4);\n if ( (LA9_48==':') ) {\n alt9=17;\n else {\n alt9=27;}\n alt9=27;}\n }\n else {\n alt9=27;}\n }\n else if ( (LA9_0=='o') ) {\n int LA9_9 = input.LA(2);\n if ( (LA9_9=='l') ) {\n int LA9_32 = input.LA(3);\n if ( (LA9_32=='[') ) {\n alt9=18;\n alt9=27;}\n }\n else {\n alt9=27;}\n }\n else if ( (LA9_0=='u') ) {\n int LA9_10 = input.LA(2);\n if ( (LA9_10=='l') ) {\n int LA9_33 = input.LA(3);\n\n if ( (LA9_33=='[') ) {\n alt9=19;\n else {\n alt9=27;}\n }\n else {\n alt9=27;}\n }\n else if ( (LA9_0=='i') ) {\n switch ( input.LA(2) ) {\n case 't':\n int LA9_34 = input.LA(3);\n\n if ( (LA9_34=='e') ) {\n int LA9_51 = input.LA(4);\n\n if ( (LA9_51=='m') ) {\n int LA9_60 = input.LA(5);\n\n if ( (LA9_60=='[') ) {\n alt9=20;\n }\n else {\n alt9=27;}\n }\n else {\n alt9=27;}\n else {\n alt9=27;}\n case 'm':\n int LA9_35 = input.LA(3);\n\n if ( (LA9_35=='g') ) {\n switch ( input.LA(4) ) {\n case '[':\n {\n alt9=24;\n }\n break;\n case ':':\n {\n alt9=23;\n }\n break;\n default:\n alt9=27;}\n\n else {\n alt9=27;}\n alt9=27;}\n else if ( (LA9_0=='l') ) {\n int LA9_12 = input.LA(2);\n\n if ( (LA9_12=='i') ) {\n int LA9_36 = input.LA(3);\n\n if ( (LA9_36=='n') ) {\n int LA9_53 = input.LA(4);\n\n if ( (LA9_53=='k') ) {\n int LA9_63 = input.LA(5);\n\n if ( (LA9_63=='[') ) {\n alt9=22;\n }\n else {\n alt9=27;}\n }\n else {\n alt9=27;}\n }\n else {\n alt9=27;}\n }\n else {\n alt9=27;}\n else if ( (LA9_0==':') ) {\n alt9=26;\n else if ( ((LA9_0>='A' && LA9_0<='Z')||LA9_0=='_'||LA9_0=='b'||LA9_0=='d'||(LA9_0>='f' && LA9_0<='h')||(LA9_0>='j' && LA9_0<='k')||(LA9_0>='m' && LA9_0<='n')||(LA9_0>='p' && LA9_0<='q')||LA9_0=='t'||(LA9_0>='v' && LA9_0<='z')) ) {\n alt9=27;\n int LA9_15 = input.LA(2);\n if ( (LA9_15=='%') ) {\n alt9=28;\n alt9=32;}\n int LA9_16 = input.LA(2);\n if ( (LA9_16=='\\n') ) {\n int LA9_39 = input.LA(3);\n if ( (LA9_39=='\\n'||LA9_39=='\\r') ) {\n alt9=29;\n alt9=30;}\n alt9=32;}\n int LA9_17 = input.LA(2);\n if ( (LA9_17=='\\n'||LA9_17=='\\r') ) {\n alt9=29;\n alt9=30;}\n alt9=31;\n alt9=32;\n new NoViableAltException(\"1:1: Tokens : ( T10 | T11 | T12 | T13 | T14 | T15 | T16 | T17 | T18 | T19 | T20 | T21 | T22 | T23 | T24 | T25 | T26 | T27 | T28 | T29 | T30 | T31 | T32 | T33 | T34 | T35 | RULE_ID | RULE_SL_COMMENT | RULE_MULTI_NL | RULE_SINGLE_NL | RULE_WS | RULE_ANY_OTHER );\", 9, 0, input);\n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:1:90: T30\n mT30(); \n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:1:94: T31\n mT31(); \n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:1:98: T32\n mT32(); \n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:1:102: T33\n mT33(); \n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:1:106: T34\n mT34(); \n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:1:110: T35\n {\n mT35(); \n\n }\n break;\n case 27 :\n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:1:114: RULE_ID\n {\n mRULE_ID(); \n\n }\n break;\n case 28 :\n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:1:122: RULE_SL_COMMENT\n {\n mRULE_SL_COMMENT(); \n\n }\n break;\n case 29 :\n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:1:138: RULE_MULTI_NL\n {\n mRULE_MULTI_NL(); \n\n }\n break;\n case 30 :\n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:1:152: RULE_SINGLE_NL\n {\n mRULE_SINGLE_NL(); \n\n }\n break;\n case 31 :\n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:1:167: RULE_WS\n {\n mRULE_WS(); \n\n }\n break;\n case 32 :\n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:1:175: RULE_ANY_OTHER", "new_methods": [], "old_code": " public static final int Tokens=30;\n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:10:5: ( '\\\\\\\\chapter' )\n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:10:7: '\\\\\\\\chapter'\n match(\"\\\\chapter\"); \n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:11:5: ( ':' )\n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:11:7: ':'\n match(':'); \n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:12:5: ( '[' )\n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:12:7: '['\n match('['); \n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:14:5: ( '\\\\\\\\section' )\n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:14:7: '\\\\\\\\section'\n match(\"\\\\section\"); \n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:15:5: ( '\\\\\\\\subsection' )\n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:15:7: '\\\\\\\\subsection'\n match(\"\\\\subsection\"); \n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:16:5: ( '\\\\\\\\section3' )\n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:16:7: '\\\\\\\\section3'\n match(\"\\\\section3\"); \n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:17:5: ( '\\\\\\\\section4' )\n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:17:7: '\\\\\\\\section4'\n match(\"\\\\section4\"); \n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:18:5: ( '\\\\\\\\[' )\n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:18:7: '\\\\\\\\['\n match(\"\\\\[\"); \n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:19:5: ( '\\\\\\\\]' )\n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:19:7: '\\\\\\\\]'\n match(\"\\\\]\"); \n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:20:5: ( '\\\\\\\\emph' )\n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:20:7: '\\\\\\\\emph'\n match(\"\\\\emph\"); \n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:21:5: ( '\\\\\\\\a' )\n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:21:7: '\\\\\\\\a'\n match(\"\\\\a\"); \n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:22:5: ( '\\\\\\\\ref' )\n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:22:7: '\\\\\\\\ref'\n match(\"\\\\ref\"); \n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:23:5: ( '\\\\\\\\ol' )\n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:23:7: '\\\\\\\\ol'\n match(\"\\\\ol\"); \n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:24:5: ( '\\\\\\\\ul' )\n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:24:7: '\\\\\\\\ul'\n match(\"\\\\ul\"); \n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:25:5: ( '\\\\\\\\item' )\n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:25:7: '\\\\\\\\item'\n match(\"\\\\item\"); \n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:26:5: ( '\\\\\\\\codeRef' )\n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:26:7: '\\\\\\\\codeRef'\n match(\"\\\\codeRef\"); \n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:27:5: ( '\\\\\\\\link' )\n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:27:7: '\\\\\\\\link'\n match(\"\\\\link\"); \n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:28:5: ( '\\\\\\\\img' )\n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:28:7: '\\\\\\\\img'\n match(\"\\\\img\"); \n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:29:5: ( '\\\\\\\\code' )\n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:29:7: '\\\\\\\\code'\n match(\"\\\\code\"); \n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:2672:9: ( ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )\n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:2672:11: ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*\n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:2672:35: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*\n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:2674:17: ( '%%' (~ ( ( '\\\\n' | '\\\\r' ) ) )* ( ( '\\\\r' )? '\\\\n' )? )\n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:2674:19: '%%' (~ ( ( '\\\\n' | '\\\\r' ) ) )* ( ( '\\\\r' )? '\\\\n' )?\n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:2674:24: (~ ( ( '\\\\n' | '\\\\r' ) ) )*\n \t // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:2674:24: ~ ( ( '\\\\n' | '\\\\r' ) )\n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:2674:40: ( ( '\\\\r' )? '\\\\n' )?\n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:2674:41: ( '\\\\r' )? '\\\\n'\n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:2674:41: ( '\\\\r' )?\n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:2674:41: '\\\\r'\n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:2676:15: ( ( '\\\\r' )? '\\\\n' ( ( '\\\\r' )? '\\\\n' )+ )\n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:2676:17: ( '\\\\r' )? '\\\\n' ( ( '\\\\r' )? '\\\\n' )+\n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:2676:17: ( '\\\\r' )?\n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:2676:17: '\\\\r'\n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:2676:28: ( ( '\\\\r' )? '\\\\n' )+\n \t // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:2676:29: ( '\\\\r' )? '\\\\n'\n \t // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:2676:29: ( '\\\\r' )?\n \t // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:2676:29: '\\\\r'\n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:2678:16: ( ( '\\\\r' )? '\\\\n' )\n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:2678:18: ( '\\\\r' )? '\\\\n'\n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:2678:18: ( '\\\\r' )?\n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:2678:18: '\\\\r'\n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:2680:9: ( ( ' ' | '\\\\t' ) )\n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:2680:11: ( ' ' | '\\\\t' )\n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:2682:16: ( . )\n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:2682:18: .\n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:1:8: ( T10 | T11 | T12 | T13 | T14 | T15 | T16 | T17 | T18 | T19 | T20 | T21 | T22 | T23 | T24 | T25 | T26 | T27 | T28 | T29 | RULE_ID | RULE_SL_COMMENT | RULE_MULTI_NL | RULE_SINGLE_NL | RULE_WS | RULE_ANY_OTHER )\n int alt9=26;\n if ( (LA9_0=='\\\\') ) {\n case 's':\n int LA9_11 = input.LA(3);\n if ( (LA9_11=='e') ) {\n int LA9_31 = input.LA(4);\n if ( (LA9_31=='c') ) {\n int LA9_37 = input.LA(5);\n if ( (LA9_37=='t') ) {\n int LA9_39 = input.LA(6);\n if ( (LA9_39=='i') ) {\n int LA9_41 = input.LA(7);\n if ( (LA9_41=='o') ) {\n int LA9_44 = input.LA(8);\n if ( (LA9_44=='n') ) {\n case '3':\n alt9=7;\n case '4':\n alt9=8;\n alt9=5;}\n }\n else {\n NoViableAltException nvae =\n new NoViableAltException(\"1:1: Tokens : ( T10 | T11 | T12 | T13 | T14 | T15 | T16 | T17 | T18 | T19 | T20 | T21 | T22 | T23 | T24 | T25 | T26 | T27 | T28 | T29 | RULE_ID | RULE_SL_COMMENT | RULE_MULTI_NL | RULE_SINGLE_NL | RULE_WS | RULE_ANY_OTHER );\", 9, 44, input);\n throw nvae;\n }\n NoViableAltException nvae =\n new NoViableAltException(\"1:1: Tokens : ( T10 | T11 | T12 | T13 | T14 | T15 | T16 | T17 | T18 | T19 | T20 | T21 | T22 | T23 | T24 | T25 | T26 | T27 | T28 | T29 | RULE_ID | RULE_SL_COMMENT | RULE_MULTI_NL | RULE_SINGLE_NL | RULE_WS | RULE_ANY_OTHER );\", 9, 41, input);\n\n throw nvae;\n }\n NoViableAltException nvae =\n new NoViableAltException(\"1:1: Tokens : ( T10 | T11 | T12 | T13 | T14 | T15 | T16 | T17 | T18 | T19 | T20 | T21 | T22 | T23 | T24 | T25 | T26 | T27 | T28 | T29 | RULE_ID | RULE_SL_COMMENT | RULE_MULTI_NL | RULE_SINGLE_NL | RULE_WS | RULE_ANY_OTHER );\", 9, 39, input);\n\n throw nvae;\n }\n NoViableAltException nvae =\n new NoViableAltException(\"1:1: Tokens : ( T10 | T11 | T12 | T13 | T14 | T15 | T16 | T17 | T18 | T19 | T20 | T21 | T22 | T23 | T24 | T25 | T26 | T27 | T28 | T29 | RULE_ID | RULE_SL_COMMENT | RULE_MULTI_NL | RULE_SINGLE_NL | RULE_WS | RULE_ANY_OTHER );\", 9, 37, input);\n\n throw nvae;\n }\n NoViableAltException nvae =\n new NoViableAltException(\"1:1: Tokens : ( T10 | T11 | T12 | T13 | T14 | T15 | T16 | T17 | T18 | T19 | T20 | T21 | T22 | T23 | T24 | T25 | T26 | T27 | T28 | T29 | RULE_ID | RULE_SL_COMMENT | RULE_MULTI_NL | RULE_SINGLE_NL | RULE_WS | RULE_ANY_OTHER );\", 9, 31, input);\n\n throw nvae;\n }\n }\n else if ( (LA9_11=='u') ) {\n alt9=6;\n NoViableAltException nvae =\n new NoViableAltException(\"1:1: Tokens : ( T10 | T11 | T12 | T13 | T14 | T15 | T16 | T17 | T18 | T19 | T20 | T21 | T22 | T23 | T24 | T25 | T26 | T27 | T28 | T29 | RULE_ID | RULE_SL_COMMENT | RULE_MULTI_NL | RULE_SINGLE_NL | RULE_WS | RULE_ANY_OTHER );\", 9, 11, input);\n throw nvae;\n case 'u':\n alt9=15;\n alt9=10;\n case 'c':\n {\n int LA9_14 = input.LA(3);\n if ( (LA9_14=='o') ) {\n int LA9_33 = input.LA(4);\n if ( (LA9_33=='d') ) {\n int LA9_38 = input.LA(5);\n if ( (LA9_38=='e') ) {\n int LA9_40 = input.LA(6);\n if ( (LA9_40=='R') ) {\n alt9=17;\n }\n else {\n alt9=20;}\n }\n else {\n NoViableAltException nvae =\n new NoViableAltException(\"1:1: Tokens : ( T10 | T11 | T12 | T13 | T14 | T15 | T16 | T17 | T18 | T19 | T20 | T21 | T22 | T23 | T24 | T25 | T26 | T27 | T28 | T29 | RULE_ID | RULE_SL_COMMENT | RULE_MULTI_NL | RULE_SINGLE_NL | RULE_WS | RULE_ANY_OTHER );\", 9, 38, input);\n throw nvae;\n NoViableAltException nvae =\n new NoViableAltException(\"1:1: Tokens : ( T10 | T11 | T12 | T13 | T14 | T15 | T16 | T17 | T18 | T19 | T20 | T21 | T22 | T23 | T24 | T25 | T26 | T27 | T28 | T29 | RULE_ID | RULE_SL_COMMENT | RULE_MULTI_NL | RULE_SINGLE_NL | RULE_WS | RULE_ANY_OTHER );\", 9, 33, input);\n throw nvae;\n }\n else if ( (LA9_14=='h') ) {\n alt9=1;\n NoViableAltException nvae =\n new NoViableAltException(\"1:1: Tokens : ( T10 | T11 | T12 | T13 | T14 | T15 | T16 | T17 | T18 | T19 | T20 | T21 | T22 | T23 | T24 | T25 | T26 | T27 | T28 | T29 | RULE_ID | RULE_SL_COMMENT | RULE_MULTI_NL | RULE_SINGLE_NL | RULE_WS | RULE_ANY_OTHER );\", 9, 14, input);\n throw nvae;\n }\n }\n break;\n case 'i':\n {\n int LA9_15 = input.LA(3);\n if ( (LA9_15=='t') ) {\n alt9=16;\n }\n else if ( (LA9_15=='m') ) {\n alt9=19;\n NoViableAltException nvae =\n new NoViableAltException(\"1:1: Tokens : ( T10 | T11 | T12 | T13 | T14 | T15 | T16 | T17 | T18 | T19 | T20 | T21 | T22 | T23 | T24 | T25 | T26 | T27 | T28 | T29 | RULE_ID | RULE_SL_COMMENT | RULE_MULTI_NL | RULE_SINGLE_NL | RULE_WS | RULE_ANY_OTHER );\", 9, 15, input);\n throw nvae;\n }\n }\n break;\n case '[':\n {\n alt9=9;\n }\n break;\n case 'e':\n {\n alt9=11;\n break;\n case 'a':\n alt9=12;\n break;\n case 'o':\n {\n alt9=14;\n case 'l':\n alt9=18;\n break;\n case 'r':\n {\n alt9=13;\n alt9=26;}\n else if ( (LA9_0==':') ) {\n alt9=2;\n }\n else if ( (LA9_0=='[') ) {\n alt9=3;\n else if ( (LA9_0==']') ) {\n alt9=4;\n else if ( ((LA9_0>='A' && LA9_0<='Z')||LA9_0=='_'||(LA9_0>='a' && LA9_0<='z')) ) {\n alt9=21;\n int LA9_6 = input.LA(2);\n if ( (LA9_6=='%') ) {\n alt9=22;\n alt9=26;}\n int LA9_7 = input.LA(2);\n if ( (LA9_7=='\\n') ) {\n int LA9_27 = input.LA(3);\n if ( (LA9_27=='\\n'||LA9_27=='\\r') ) {\n alt9=23;\n alt9=24;}\n alt9=26;}\n int LA9_8 = input.LA(2);\n if ( (LA9_8=='\\n'||LA9_8=='\\r') ) {\n alt9=23;\n alt9=24;}\n alt9=25;\n alt9=26;\n new NoViableAltException(\"1:1: Tokens : ( T10 | T11 | T12 | T13 | T14 | T15 | T16 | T17 | T18 | T19 | T20 | T21 | T22 | T23 | T24 | T25 | T26 | T27 | T28 | T29 | RULE_ID | RULE_SL_COMMENT | RULE_MULTI_NL | RULE_SINGLE_NL | RULE_WS | RULE_ANY_OTHER );\", 9, 0, input);\n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:1:90: RULE_ID\n mRULE_ID(); \n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:1:98: RULE_SL_COMMENT\n mRULE_SL_COMMENT(); \n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:1:114: RULE_MULTI_NL\n mRULE_MULTI_NL(); \n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:1:128: RULE_SINGLE_NL\n mRULE_SINGLE_NL(); \n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:1:143: RULE_WS\n mRULE_WS(); \n // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:1:151: RULE_ANY_OTHER", "old_methods": [], "patch": "@@ -16,12 +16,15 @@ public class InternalXDocLexer extends Lexer {\n public static final int T14=14;\n public static final int T29=29;\n public static final int RULE_ID=6;\n+ public static final int T33=33;\n public static final int T22=22;\n public static final int T11=11;\n public static final int T12=12;\n public static final int T28=28;\n public static final int T23=23;\n+ public static final int T35=35;\n public static final int T13=13;\n+ public static final int T34=34;\n public static final int T20=20;\n public static final int T10=10;\n public static final int T25=25;\n@@ -31,13 +34,16 @@ public class InternalXDocLexer extends Lexer {\n public static final int T15=15;\n public static final int EOF=-1;\n public static final int RULE_MULTI_NL=5;\n+ public static final int T32=32;\n public static final int RULE_SINGLE_NL=7;\n public static final int T17=17;\n- public static final int Tokens=30;\n+ public static final int Tokens=36;\n+ public static final int T31=31;\n public static final int RULE_ANY_OTHER=8;\n public static final int T16=16;\n public static final int T27=27;\n public static final int RULE_SL_COMMENT=9;\n+ public static final int T30=30;\n public static final int T24=24;\n public static final int T19=19;\n public InternalXDocLexer() {;} \n@@ -50,10 +56,10 @@ public InternalXDocLexer(CharStream input) {\n public final void mT10() throws RecognitionException {\n try {\n int _type = T10;\n- // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:10:5: ( '\\\\\\\\chapter' )\n- // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:10:7: '\\\\\\\\chapter'\n+ // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:10:5: ( 'chapter:' )\n+ // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:10:7: 'chapter:'\n {\n- match(\"\\\\chapter\"); \n+ match(\"chapter:\"); \n \n \n }\n@@ -69,10 +75,10 @@ public final void mT10() throws RecognitionException {\n public final void mT11() throws RecognitionException {\n try {\n int _type = T11;\n- // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:11:5: ( ':' )\n- // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:11:7: ':'\n+ // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:11:5: ( '[' )\n+ // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:11:7: '['\n {\n- match(':'); \n+ match('['); \n \n }\n \n@@ -87,10 +93,11 @@ public final void mT11() throws RecognitionException {\n public final void mT12() throws RecognitionException {\n try {\n int _type = T12;\n- // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:12:5: ( '[' )\n- // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:12:7: '['\n+ // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:12:5: ( 'chapter[' )\n+ // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:12:7: 'chapter['\n {\n- match('['); \n+ match(\"chapter[\"); \n+\n \n }\n \n@@ -123,10 +130,10 @@ public final void mT13() throws RecognitionException {\n public final void mT14() throws RecognitionException {\n try {\n int _type = T14;\n- // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:14:5: ( '\\\\\\\\section' )\n- // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:14:7: '\\\\\\\\section'\n+ // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:14:5: ( 'section:' )\n+ // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:14:7: 'section:'\n {\n- match(\"\\\\section\"); \n+ match(\"section:\"); \n \n \n }\n@@ -142,10 +149,10 @@ public final void mT14() throws RecognitionException {\n public final void mT15() throws RecognitionException {\n try {\n int _type = T15;\n- // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:15:5: ( '\\\\\\\\subsection' )\n- // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:15:7: '\\\\\\\\subsection'\n+ // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:15:5: ( 'section[' )\n+ // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:15:7: 'section['\n {\n- match(\"\\\\subsection\"); \n+ match(\"section[\"); \n \n \n }\n@@ -161,10 +168,10 @@ public final void mT15() throws RecognitionException {\n public final void mT16() throws RecognitionException {\n try {\n int _type = T16;\n- // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:16:5: ( '\\\\\\\\section3' )\n- // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:16:7: '\\\\\\\\section3'\n+ // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:16:5: ( 'subsection:' )\n+ // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:16:7: 'subsection:'\n {\n- match(\"\\\\section3\"); \n+ match(\"subsection:\"); \n \n \n }\n@@ -180,10 +187,10 @@ public final void mT16() throws RecognitionException {\n public final void mT17() throws RecognitionException {\n try {\n int _type = T17;\n- // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:17:5: ( '\\\\\\\\section4' )\n- // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:17:7: '\\\\\\\\section4'\n+ // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:17:5: ( 'subsection[' )\n+ // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:17:7: 'subsection['\n {\n- match(\"\\\\section4\"); \n+ match(\"subsection[\"); \n \n \n }\n@@ -199,10 +206,10 @@ public final void mT17() throws RecognitionException {\n public final void mT18() throws RecognitionException {\n try {\n int _type = T18;\n- // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:18:5: ( '\\\\\\\\[' )\n- // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:18:7: '\\\\\\\\['\n+ // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:18:5: ( 'section3:' )\n+ // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:18:7: 'section3:'\n {\n- match(\"\\\\[\"); \n+ match(\"section3:\"); \n \n \n }\n@@ -218,10 +225,10 @@ public final void mT18() throws RecognitionException {\n public final void mT19() throws RecognitionException {\n try {\n int _type = T19;\n- // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:19:5: ( '\\\\\\\\]' )\n- // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:19:7: '\\\\\\\\]'\n+ // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:19:5: ( 'section3[' )\n+ // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:19:7: 'section3['\n {\n- match(\"\\\\]\"); \n+ match(\"section3[\"); \n \n \n }\n@@ -237,10 +244,10 @@ public final void mT19() throws RecognitionException {\n public final void mT20() throws RecognitionException {\n try {\n int _type = T20;\n- // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:20:5: ( '\\\\\\\\emph' )\n- // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:20:7: '\\\\\\\\emph'\n+ // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:20:5: ( 'section4:' )\n+ // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:20:7: 'section4:'\n {\n- match(\"\\\\emph\"); \n+ match(\"section4:\"); \n \n \n }\n@@ -256,10 +263,10 @@ public final void mT20() throws RecognitionException {\n public final void mT21() throws RecognitionException {\n try {\n int _type = T21;\n- // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:21:5: ( '\\\\\\\\a' )\n- // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:21:7: '\\\\\\\\a'\n+ // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:21:5: ( 'section4[' )\n+ // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:21:7: 'section4['\n {\n- match(\"\\\\a\"); \n+ match(\"section4[\"); \n \n \n }\n@@ -275,10 +282,10 @@ public final void mT21() throws RecognitionException {\n public final void mT22() throws RecognitionException {\n try {\n int _type = T22;\n- // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:22:5: ( '\\\\\\\\ref' )\n- // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:22:7: '\\\\\\\\ref'\n+ // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:22:5: ( '\\\\\\\\[' )\n+ // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:22:7: '\\\\\\\\['\n {\n- match(\"\\\\ref\"); \n+ match(\"\\\\[\"); \n \n \n }\n@@ -294,10 +301,10 @@ public final void mT22() throws RecognitionException {\n public final void mT23() throws RecognitionException {\n try {\n int _type = T23;\n- // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:23:5: ( '\\\\\\\\ol' )\n- // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:23:7: '\\\\\\\\ol'\n+ // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:23:5: ( '\\\\\\\\]' )\n+ // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:23:7: '\\\\\\\\]'\n {\n- match(\"\\\\ol\"); \n+ match(\"\\\\]\"); \n \n \n }\n@@ -313,10 +320,10 @@ public final void mT23() throws RecognitionException {\n public final void mT24() throws RecognitionException {\n try {\n int _type = T24;\n- // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:24:5: ( '\\\\\\\\ul' )\n- // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:24:7: '\\\\\\\\ul'\n+ // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:24:5: ( 'emph[' )\n+ // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:24:7: 'emph['\n {\n- match(\"\\\\ul\"); \n+ match(\"emph[\"); \n \n \n }\n@@ -332,10 +339,10 @@ public final void mT24() throws RecognitionException {\n public final void mT25() throws RecognitionException {\n try {\n int _type = T25;\n- // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:25:5: ( '\\\\\\\\item' )\n- // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:25:7: '\\\\\\\\item'\n+ // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:25:5: ( 'a[' )\n+ // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:25:7: 'a['\n {\n- match(\"\\\\item\"); \n+ match(\"a[\"); \n \n \n }\n@@ -351,10 +358,10 @@ public final void mT25() throws RecognitionException {\n public final void mT26() throws RecognitionException {\n try {\n int _type = T26;\n- // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:26:5: ( '\\\\\\\\codeRef' )\n- // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:26:7: '\\\\\\\\codeRef'\n+ // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:26:5: ( 'ref:' )\n+ // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:26:7: 'ref:'\n {\n- match(\"\\\\codeRef\"); \n+ match(\"ref:\"); \n \n \n }\n@@ -370,10 +377,10 @@ public final void mT26() throws RecognitionException {\n public final void mT27() throws RecognitionException {\n try {\n int _type = T27;\n- // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:27:5: ( '\\\\\\\\link' )\n- // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:27:7: '\\\\\\\\link'\n+ // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:27:5: ( 'ol[' )\n+ // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:27:7: 'ol['\n {\n- match(\"\\\\link\"); \n+ match(\"ol[\"); \n \n \n }\n@@ -389,10 +396,10 @@ public final void mT27() throws RecognitionException {\n public final void mT28() throws RecognitionException {\n try {\n int _type = T28;\n- // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:28:5: ( '\\\\\\\\img' )\n- // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:28:7: '\\\\\\\\img'\n+ // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:28:5: ( 'ul[' )\n+ // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:28:7: 'ul['\n {\n- match(\"\\\\img\"); \n+ match(\"ul[\"); \n \n \n }\n@@ -408,10 +415,10 @@ public final void mT28() throws RecognitionException {\n public final void mT29() throws RecognitionException {\n try {\n int _type = T29;\n- // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:29:5: ( '\\\\\\\\code' )\n- // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:29:7: '\\\\\\\\code'\n+ // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:29:5: ( 'item[' )\n+ // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:29:7: 'item['\n {\n- match(\"\\\\code\"); \n+ match(\"item[\"); \n \n \n }\n@@ -423,12 +430,125 @@ public final void mT29() throws RecognitionException {\n }\n // $ANTLR end T29\n \n+ // $ANTLR start T30\n+ public final void mT30() throws RecognitionException {\n+ try {\n+ int _type = T30;\n+ // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:30:5: ( 'codeRef[' )\n+ // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:30:7: 'codeRef['\n+ {\n+ match(\"codeRef[\"); \n+\n+\n+ }\n+\n+ this.type = _type;\n+ }\n+ finally {\n+ }\n+ }\n+ // $ANTLR end T30\n+\n+ // $ANTLR start T31\n+ public final void mT31() throws RecognitionException {\n+ try {\n+ int _type = T31;\n+ // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:31:5: ( 'link[' )\n+ // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:31:7: 'link['\n+ {\n+ match(\"link[\"); \n+\n+\n+ }\n+\n+ this.type = _type;\n+ }\n+ finally {\n+ }\n+ }\n+ // $ANTLR end T31\n+\n+ // $ANTLR start T32\n+ public final void mT32() throws RecognitionException {\n+ try {\n+ int _type = T32;\n+ // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:32:5: ( 'img:' )\n+ // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:32:7: 'img:'\n+ {\n+ match(\"img:\"); \n+\n+\n+ }\n+\n+ this.type = _type;\n+ }\n+ finally {\n+ }\n+ }\n+ // $ANTLR end T32\n+\n+ // $ANTLR start T33\n+ public final void mT33() throws RecognitionException {\n+ try {\n+ int _type = T33;\n+ // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:33:5: ( 'img[' )\n+ // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:33:7: 'img['\n+ {\n+ match(\"img[\"); \n+\n+\n+ }\n+\n+ this.type = _type;\n+ }\n+ finally {\n+ }\n+ }\n+ // $ANTLR end T33\n+\n+ // $ANTLR start T34\n+ public final void mT34() throws RecognitionException {\n+ try {\n+ int _type = T34;\n+ // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:34:5: ( 'code[' )\n+ // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:34:7: 'code['\n+ {\n+ match(\"code[\"); \n+\n+\n+ }\n+\n+ this.type = _type;\n+ }\n+ finally {\n+ }\n+ }\n+ // $ANTLR end T34\n+\n+ // $ANTLR start T35\n+ public final void mT35() throws RecognitionException {\n+ try {\n+ int _type = T35;\n+ // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:35:5: ( ':' )\n+ // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:35:7: ':'\n+ {\n+ match(':'); \n+\n+ }\n+\n+ this.type = _type;\n+ }\n+ finally {\n+ }\n+ }\n+ // $ANTLR end T35\n+\n // $ANTLR start RULE_ID\n public final void mRULE_ID() throws RecognitionException {\n try {\n int _type = RULE_ID;\n- // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:2672:9: ( ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )\n- // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:2672:11: ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*\n+ // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:2575:9: ( ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )\n+ // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:2575:11: ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*\n {\n if ( (input.LA(1)>='A' && input.LA(1)<='Z')||input.LA(1)=='_'||(input.LA(1)>='a' && input.LA(1)<='z') ) {\n input.consume();\n@@ -440,7 +560,7 @@ public final void mRULE_ID() throws RecognitionException {\n recover(mse); throw mse;\n }\n \n- // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:2672:35: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*\n+ // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:2575:35: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*\n loop1:\n do {\n int alt1=2;\n@@ -488,12 +608,12 @@ public final void mRULE_ID() throws RecognitionException {\n public final void mRULE_SL_COMMENT() throws RecognitionException {\n try {\n int _type = RULE_SL_COMMENT;\n- // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:2674:17: ( '%%' (~ ( ( '\\\\n' | '\\\\r' ) ) )* ( ( '\\\\r' )? '\\\\n' )? )\n- // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:2674:19: '%%' (~ ( ( '\\\\n' | '\\\\r' ) ) )* ( ( '\\\\r' )? '\\\\n' )?\n+ // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:2577:17: ( '%%' (~ ( ( '\\\\n' | '\\\\r' ) ) )* ( ( '\\\\r' )? '\\\\n' )? )\n+ // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:2577:19: '%%' (~ ( ( '\\\\n' | '\\\\r' ) ) )* ( ( '\\\\r' )? '\\\\n' )?\n {\n match(\"%%\"); \n \n- // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:2674:24: (~ ( ( '\\\\n' | '\\\\r' ) ) )*\n+ // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:2577:24: (~ ( ( '\\\\n' | '\\\\r' ) ) )*\n loop2:\n do {\n int alt2=2;\n@@ -506,7 +626,7 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {\n \n switch (alt2) {\n \tcase 1 :\n- \t // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:2674:24: ~ ( ( '\\\\n' | '\\\\r' ) )\n+ \t // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:2577:24: ~ ( ( '\\\\n' | '\\\\r' ) )\n \t {\n \t if ( (input.LA(1)>='\\u0000' && input.LA(1)<='\\t')||(input.LA(1)>='\\u000B' && input.LA(1)<='\\f')||(input.LA(1)>='\\u000E' && input.LA(1)<='\\uFFFE') ) {\n \t input.consume();\n@@ -527,7 +647,7 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {\n }\n } while (true);\n \n- // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:2674:40: ( ( '\\\\r' )? '\\\\n' )?\n+ // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:2577:40: ( ( '\\\\r' )? '\\\\n' )?\n int alt4=2;\n int LA4_0 = input.LA(1);\n \n@@ -536,9 +656,9 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {\n }\n switch (alt4) {\n case 1 :\n- // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:2674:41: ( '\\\\r' )? '\\\\n'\n+ // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:2577:41: ( '\\\\r' )? '\\\\n'\n {\n- // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:2674:41: ( '\\\\r' )?\n+ // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:2577:41: ( '\\\\r' )?\n int alt3=2;\n int LA3_0 = input.LA(1);\n \n@@ -547,7 +667,7 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {\n }\n switch (alt3) {\n case 1 :\n- // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:2674:41: '\\\\r'\n+ // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:2577:41: '\\\\r'\n {\n match('\\r'); \n \n@@ -577,10 +697,10 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {\n public final void mRULE_MULTI_NL() throws RecognitionException {\n try {\n int _type = RULE_MULTI_NL;\n- // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:2676:15: ( ( '\\\\r' )? '\\\\n' ( ( '\\\\r' )? '\\\\n' )+ )\n- // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:2676:17: ( '\\\\r' )? '\\\\n' ( ( '\\\\r' )? '\\\\n' )+\n+ // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:2579:15: ( ( '\\\\r' )? '\\\\n' ( ( '\\\\r' )? '\\\\n' )+ )\n+ // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:2579:17: ( '\\\\r' )? '\\\\n' ( ( '\\\\r' )? '\\\\n' )+\n {\n- // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:2676:17: ( '\\\\r' )?\n+ // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:2579:17: ( '\\\\r' )?\n int alt5=2;\n int LA5_0 = input.LA(1);\n \n@@ -589,7 +709,7 @@ public final void mRULE_MULTI_NL() throws RecognitionException {\n }\n switch (alt5) {\n case 1 :\n- // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:2676:17: '\\\\r'\n+ // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:2579:17: '\\\\r'\n {\n match('\\r'); \n \n@@ -599,7 +719,7 @@ public final void mRULE_MULTI_NL() throws RecognitionException {\n }\n \n match('\\n'); \n- // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:2676:28: ( ( '\\\\r' )? '\\\\n' )+\n+ // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:2579:28: ( ( '\\\\r' )? '\\\\n' )+\n int cnt7=0;\n loop7:\n do {\n@@ -613,9 +733,9 @@ public final void mRULE_MULTI_NL() throws RecognitionException {\n \n switch (alt7) {\n \tcase 1 :\n- \t // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:2676:29: ( '\\\\r' )? '\\\\n'\n+ \t // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:2579:29: ( '\\\\r' )? '\\\\n'\n \t {\n- \t // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:2676:29: ( '\\\\r' )?\n+ \t // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:2579:29: ( '\\\\r' )?\n \t int alt6=2;\n \t int LA6_0 = input.LA(1);\n \n@@ -624,7 +744,7 @@ public final void mRULE_MULTI_NL() throws RecognitionException {\n \t }\n \t switch (alt6) {\n \t case 1 :\n- \t // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:2676:29: '\\\\r'\n+ \t // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:2579:29: '\\\\r'\n \t {\n \t match('\\r'); \n \n@@ -661,10 +781,10 @@ public final void mRULE_MULTI_NL() throws RecognitionException {\n public final void mRULE_SINGLE_NL() throws RecognitionException {\n try {\n int _type = RULE_SINGLE_NL;\n- // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:2678:16: ( ( '\\\\r' )? '\\\\n' )\n- // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:2678:18: ( '\\\\r' )? '\\\\n'\n+ // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:2581:16: ( ( '\\\\r' )? '\\\\n' )\n+ // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:2581:18: ( '\\\\r' )? '\\\\n'\n {\n- // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:2678:18: ( '\\\\r' )?\n+ // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:2581:18: ( '\\\\r' )?\n int alt8=2;\n int LA8_0 = input.LA(1);\n \n@@ -673,7 +793,7 @@ public final void mRULE_SINGLE_NL() throws RecognitionException {\n }\n switch (alt8) {\n case 1 :\n- // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:2678:18: '\\\\r'\n+ // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:2581:18: '\\\\r'\n {\n match('\\r'); \n \n@@ -697,8 +817,8 @@ public final void mRULE_SINGLE_NL() throws RecognitionException {\n public final void mRULE_WS() throws RecognitionException {\n try {\n int _type = RULE_WS;\n- // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:2680:9: ( ( ' ' | '\\\\t' ) )\n- // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:2680:11: ( ' ' | '\\\\t' )\n+ // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:2583:9: ( ( ' ' | '\\\\t' ) )\n+ // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:2583:11: ( ' ' | '\\\\t' )\n {\n if ( input.LA(1)=='\\t'||input.LA(1)==' ' ) {\n input.consume();\n@@ -724,8 +844,8 @@ public final void mRULE_WS() throws RecognitionException {\n public final void mRULE_ANY_OTHER() throws RecognitionException {\n try {\n int _type = RULE_ANY_OTHER;\n- // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:2682:16: ( . )\n- // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:2682:18: .\n+ // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:2585:16: ( . )\n+ // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:2585:18: .\n {\n matchAny(); \n \n@@ -739,253 +859,505 @@ public final void mRULE_ANY_OTHER() throws RecognitionException {\n // $ANTLR end RULE_ANY_OTHER\n \n public void mTokens() throws RecognitionException {\n- // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:1:8: ( T10 | T11 | T12 | T13 | T14 | T15 | T16 | T17 | T18 | T19 | T20 | T21 | T22 | T23 | T24 | T25 | T26 | T27 | T28 | T29 | RULE_ID | RULE_SL_COMMENT | RULE_MULTI_NL | RULE_SINGLE_NL | RULE_WS | RULE_ANY_OTHER )\n- int alt9=26;\n+ // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:1:8: ( T10 | T11 | T12 | T13 | T14 | T15 | T16 | T17 | T18 | T19 | T20 | T21 | T22 | T23 | T24 | T25 | T26 | T27 | T28 | T29 | T30 | T31 | T32 | T33 | T34 | T35 | RULE_ID | RULE_SL_COMMENT | RULE_MULTI_NL | RULE_SINGLE_NL | RULE_WS | RULE_ANY_OTHER )\n+ int alt9=32;\n int LA9_0 = input.LA(1);\n \n- if ( (LA9_0=='\\\\') ) {\n+ if ( (LA9_0=='c') ) {\n switch ( input.LA(2) ) {\n- case 's':\n+ case 'h':\n+ {\n+ int LA9_20 = input.LA(3);\n+\n+ if ( (LA9_20=='a') ) {\n+ int LA9_43 = input.LA(4);\n+\n+ if ( (LA9_43=='p') ) {\n+ int LA9_54 = input.LA(5);\n+\n+ if ( (LA9_54=='t') ) {\n+ int LA9_64 = input.LA(6);\n+\n+ if ( (LA9_64=='e') ) {\n+ int LA9_72 = input.LA(7);\n+\n+ if ( (LA9_72=='r') ) {\n+ switch ( input.LA(8) ) {\n+ case '[':\n+ {\n+ alt9=3;\n+ }\n+ break;\n+ case ':':\n+ {\n+ alt9=1;\n+ }\n+ break;\n+ default:\n+ alt9=27;}\n+\n+ }\n+ else {\n+ alt9=27;}\n+ }\n+ else {\n+ alt9=27;}\n+ }\n+ else {\n+ alt9=27;}\n+ }\n+ else {\n+ alt9=27;}\n+ }\n+ else {\n+ alt9=27;}\n+ }\n+ break;\n+ case 'o':\n {\n- int LA9_11 = input.LA(3);\n+ int LA9_21 = input.LA(3);\n+\n+ if ( (LA9_21=='d') ) {\n+ int LA9_44 = input.LA(4);\n+\n+ if ( (LA9_44=='e') ) {\n+ switch ( input.LA(5) ) {\n+ case '[':\n+ {\n+ alt9=25;\n+ }\n+ break;\n+ case 'R':\n+ {\n+ int LA9_66 = input.LA(6);\n+\n+ if ( (LA9_66=='e') ) {\n+ int LA9_73 = input.LA(7);\n+\n+ if ( (LA9_73=='f') ) {\n+ int LA9_77 = input.LA(8);\n+\n+ if ( (LA9_77=='[') ) {\n+ alt9=21;\n+ }\n+ else {\n+ alt9=27;}\n+ }\n+ else {\n+ alt9=27;}\n+ }\n+ else {\n+ alt9=27;}\n+ }\n+ break;\n+ default:\n+ alt9=27;}\n+\n+ }\n+ else {\n+ alt9=27;}\n+ }\n+ else {\n+ alt9=27;}\n+ }\n+ break;\n+ default:\n+ alt9=27;}\n \n- if ( (LA9_11=='e') ) {\n- int LA9_31 = input.LA(4);\n+ }\n+ else if ( (LA9_0=='[') ) {\n+ alt9=2;\n+ }\n+ else if ( (LA9_0==']') ) {\n+ alt9=4;\n+ }\n+ else if ( (LA9_0=='s') ) {\n+ switch ( input.LA(2) ) {\n+ case 'e':\n+ {\n+ int LA9_25 = input.LA(3);\n \n- if ( (LA9_31=='c') ) {\n- int LA9_37 = input.LA(5);\n+ if ( (LA9_25=='c') ) {\n+ int LA9_45 = input.LA(4);\n \n- if ( (LA9_37=='t') ) {\n- int LA9_39 = input.LA(6);\n+ if ( (LA9_45=='t') ) {\n+ int LA9_56 = input.LA(5);\n \n- if ( (LA9_39=='i') ) {\n- int LA9_41 = input.LA(7);\n+ if ( (LA9_56=='i') ) {\n+ int LA9_67 = input.LA(6);\n \n- if ( (LA9_41=='o') ) {\n- int LA9_44 = input.LA(8);\n+ if ( (LA9_67=='o') ) {\n+ int LA9_74 = input.LA(7);\n \n- if ( (LA9_44=='n') ) {\n+ if ( (LA9_74=='n') ) {\n+ switch ( input.LA(8) ) {\n+ case '4':\n+ {\n switch ( input.LA(9) ) {\n- case '3':\n+ case '[':\n {\n- alt9=7;\n+ alt9=12;\n }\n break;\n- case '4':\n+ case ':':\n {\n- alt9=8;\n+ alt9=11;\n }\n break;\n default:\n- alt9=5;}\n+ alt9=27;}\n \n- }\n- else {\n- NoViableAltException nvae =\n- new NoViableAltException(\"1:1: Tokens : ( T10 | T11 | T12 | T13 | T14 | T15 | T16 | T17 | T18 | T19 | T20 | T21 | T22 | T23 | T24 | T25 | T26 | T27 | T28 | T29 | RULE_ID | RULE_SL_COMMENT | RULE_MULTI_NL | RULE_SINGLE_NL | RULE_WS | RULE_ANY_OTHER );\", 9, 44, input);\n+ }\n+ break;\n+ case '3':\n+ {\n+ switch ( input.LA(9) ) {\n+ case ':':\n+ {\n+ alt9=9;\n+ }\n+ break;\n+ case '[':\n+ {\n+ alt9=10;\n+ }\n+ break;\n+ default:\n+ alt9=27;}\n+\n+ }\n+ break;\n+ case ':':\n+ {\n+ alt9=5;\n+ }\n+ break;\n+ case '[':\n+ {\n+ alt9=6;\n+ }\n+ break;\n+ default:\n+ alt9=27;}\n \n- throw nvae;\n- }\n }\n else {\n- NoViableAltException nvae =\n- new NoViableAltException(\"1:1: Tokens : ( T10 | T11 | T12 | T13 | T14 | T15 | T16 | T17 | T18 | T19 | T20 | T21 | T22 | T23 | T24 | T25 | T26 | T27 | T28 | T29 | RULE_ID | RULE_SL_COMMENT | RULE_MULTI_NL | RULE_SINGLE_NL | RULE_WS | RULE_ANY_OTHER );\", 9, 41, input);\n-\n- throw nvae;\n- }\n+ alt9=27;}\n }\n else {\n- NoViableAltException nvae =\n- new NoViableAltException(\"1:1: Tokens : ( T10 | T11 | T12 | T13 | T14 | T15 | T16 | T17 | T18 | T19 | T20 | T21 | T22 | T23 | T24 | T25 | T26 | T27 | T28 | T29 | RULE_ID | RULE_SL_COMMENT | RULE_MULTI_NL | RULE_SINGLE_NL | RULE_WS | RULE_ANY_OTHER );\", 9, 39, input);\n-\n- throw nvae;\n- }\n+ alt9=27;}\n }\n else {\n- NoViableAltException nvae =\n- new NoViableAltException(\"1:1: Tokens : ( T10 | T11 | T12 | T13 | T14 | T15 | T16 | T17 | T18 | T19 | T20 | T21 | T22 | T23 | T24 | T25 | T26 | T27 | T28 | T29 | RULE_ID | RULE_SL_COMMENT | RULE_MULTI_NL | RULE_SINGLE_NL | RULE_WS | RULE_ANY_OTHER );\", 9, 37, input);\n-\n- throw nvae;\n- }\n+ alt9=27;}\n }\n else {\n- NoViableAltException nvae =\n- new NoViableAltException(\"1:1: Tokens : ( T10 | T11 | T12 | T13 | T14 | T15 | T16 | T17 | T18 | T19 | T20 | T21 | T22 | T23 | T24 | T25 | T26 | T27 | T28 | T29 | RULE_ID | RULE_SL_COMMENT | RULE_MULTI_NL | RULE_SINGLE_NL | RULE_WS | RULE_ANY_OTHER );\", 9, 31, input);\n-\n- throw nvae;\n- }\n- }\n- else if ( (LA9_11=='u') ) {\n- alt9=6;\n+ alt9=27;}\n }\n else {\n- NoViableAltException nvae =\n- new NoViableAltException(\"1:1: Tokens : ( T10 | T11 | T12 | T13 | T14 | T15 | T16 | T17 | T18 | T19 | T20 | T21 | T22 | T23 | T24 | T25 | T26 | T27 | T28 | T29 | RULE_ID | RULE_SL_COMMENT | RULE_MULTI_NL | RULE_SINGLE_NL | RULE_WS | RULE_ANY_OTHER );\", 9, 11, input);\n+ alt9=27;}\n+ }\n+ break;\n+ case 'u':\n+ {\n+ int LA9_26 = input.LA(3);\n+\n+ if ( (LA9_26=='b') ) {\n+ int LA9_46 = input.LA(4);\n+\n+ if ( (LA9_46=='s') ) {\n+ int LA9_57 = input.LA(5);\n+\n+ if ( (LA9_57=='e') ) {\n+ int LA9_68 = input.LA(6);\n \n- throw nvae;\n+ if ( (LA9_68=='c') ) {\n+ int LA9_75 = input.LA(7);\n+\n+ if ( (LA9_75=='t') ) {\n+ int LA9_79 = input.LA(8);\n+\n+ if ( (LA9_79=='i') ) {\n+ int LA9_87 = input.LA(9);\n+\n+ if ( (LA9_87=='o') ) {\n+ int LA9_92 = input.LA(10);\n+\n+ if ( (LA9_92=='n') ) {\n+ switch ( input.LA(11) ) {\n+ case '[':\n+ {\n+ alt9=8;\n+ }\n+ break;\n+ case ':':\n+ {\n+ alt9=7;\n+ }\n+ break;\n+ default:\n+ alt9=27;}\n+\n+ }\n+ else {\n+ alt9=27;}\n+ }\n+ else {\n+ alt9=27;}\n+ }\n+ else {\n+ alt9=27;}\n+ }\n+ else {\n+ alt9=27;}\n+ }\n+ else {\n+ alt9=27;}\n+ }\n+ else {\n+ alt9=27;}\n+ }\n+ else {\n+ alt9=27;}\n }\n+ else {\n+ alt9=27;}\n }\n break;\n- case 'u':\n+ default:\n+ alt9=27;}\n+\n+ }\n+ else if ( (LA9_0=='\\\\') ) {\n+ switch ( input.LA(2) ) {\n+ case '[':\n {\n- alt9=15;\n+ alt9=13;\n }\n break;\n case ']':\n {\n- alt9=10;\n+ alt9=14;\n }\n break;\n- case 'c':\n- {\n- int LA9_14 = input.LA(3);\n+ default:\n+ alt9=32;}\n \n- if ( (LA9_14=='o') ) {\n- int LA9_33 = input.LA(4);\n+ }\n+ else if ( (LA9_0=='e') ) {\n+ int LA9_6 = input.LA(2);\n \n- if ( (LA9_33=='d') ) {\n- int LA9_38 = input.LA(5);\n+ if ( (LA9_6=='m') ) {\n+ int LA9_29 = input.LA(3);\n \n- if ( (LA9_38=='e') ) {\n- int LA9_40 = input.LA(6);\n+ if ( (LA9_29=='p') ) {\n+ int LA9_47 = input.LA(4);\n \n- if ( (LA9_40=='R') ) {\n- alt9=17;\n- }\n- else {\n- alt9=20;}\n- }\n- else {\n- NoViableAltException nvae =\n- new NoViableAltException(\"1:1: Tokens : ( T10 | T11 | T12 | T13 | T14 | T15 | T16 | T17 | T18 | T19 | T20 | T21 | T22 | T23 | T24 | T25 | T26 | T27 | T28 | T29 | RULE_ID | RULE_SL_COMMENT | RULE_MULTI_NL | RULE_SINGLE_NL | RULE_WS | RULE_ANY_OTHER );\", 9, 38, input);\n+ if ( (LA9_47=='h') ) {\n+ int LA9_58 = input.LA(5);\n \n- throw nvae;\n+ if ( (LA9_58=='[') ) {\n+ alt9=15;\n }\n+ else {\n+ alt9=27;}\n }\n else {\n- NoViableAltException nvae =\n- new NoViableAltException(\"1:1: Tokens : ( T10 | T11 | T12 | T13 | T14 | T15 | T16 | T17 | T18 | T19 | T20 | T21 | T22 | T23 | T24 | T25 | T26 | T27 | T28 | T29 | RULE_ID | RULE_SL_COMMENT | RULE_MULTI_NL | RULE_SINGLE_NL | RULE_WS | RULE_ANY_OTHER );\", 9, 33, input);\n+ alt9=27;}\n+ }\n+ else {\n+ alt9=27;}\n+ }\n+ else {\n+ alt9=27;}\n+ }\n+ else if ( (LA9_0=='a') ) {\n+ int LA9_7 = input.LA(2);\n+\n+ if ( (LA9_7=='[') ) {\n+ alt9=16;\n+ }\n+ else {\n+ alt9=27;}\n+ }\n+ else if ( (LA9_0=='r') ) {\n+ int LA9_8 = input.LA(2);\n+\n+ if ( (LA9_8=='e') ) {\n+ int LA9_31 = input.LA(3);\n+\n+ if ( (LA9_31=='f') ) {\n+ int LA9_48 = input.LA(4);\n \n- throw nvae;\n+ if ( (LA9_48==':') ) {\n+ alt9=17;\n }\n- }\n- else if ( (LA9_14=='h') ) {\n- alt9=1;\n+ else {\n+ alt9=27;}\n }\n else {\n- NoViableAltException nvae =\n- new NoViableAltException(\"1:1: Tokens : ( T10 | T11 | T12 | T13 | T14 | T15 | T16 | T17 | T18 | T19 | T20 | T21 | T22 | T23 | T24 | T25 | T26 | T27 | T28 | T29 | RULE_ID | RULE_SL_COMMENT | RULE_MULTI_NL | RULE_SINGLE_NL | RULE_WS | RULE_ANY_OTHER );\", 9, 14, input);\n+ alt9=27;}\n+ }\n+ else {\n+ alt9=27;}\n+ }\n+ else if ( (LA9_0=='o') ) {\n+ int LA9_9 = input.LA(2);\n \n- throw nvae;\n- }\n- }\n- break;\n- case 'i':\n- {\n- int LA9_15 = input.LA(3);\n+ if ( (LA9_9=='l') ) {\n+ int LA9_32 = input.LA(3);\n \n- if ( (LA9_15=='t') ) {\n- alt9=16;\n- }\n- else if ( (LA9_15=='m') ) {\n- alt9=19;\n+ if ( (LA9_32=='[') ) {\n+ alt9=18;\n }\n else {\n- NoViableAltException nvae =\n- new NoViableAltException(\"1:1: Tokens : ( T10 | T11 | T12 | T13 | T14 | T15 | T16 | T17 | T18 | T19 | T20 | T21 | T22 | T23 | T24 | T25 | T26 | T27 | T28 | T29 | RULE_ID | RULE_SL_COMMENT | RULE_MULTI_NL | RULE_SINGLE_NL | RULE_WS | RULE_ANY_OTHER );\", 9, 15, input);\n+ alt9=27;}\n+ }\n+ else {\n+ alt9=27;}\n+ }\n+ else if ( (LA9_0=='u') ) {\n+ int LA9_10 = input.LA(2);\n \n- throw nvae;\n- }\n- }\n- break;\n- case '[':\n- {\n- alt9=9;\n- }\n- break;\n- case 'e':\n- {\n- alt9=11;\n+ if ( (LA9_10=='l') ) {\n+ int LA9_33 = input.LA(3);\n+\n+ if ( (LA9_33=='[') ) {\n+ alt9=19;\n }\n- break;\n- case 'a':\n+ else {\n+ alt9=27;}\n+ }\n+ else {\n+ alt9=27;}\n+ }\n+ else if ( (LA9_0=='i') ) {\n+ switch ( input.LA(2) ) {\n+ case 't':\n {\n- alt9=12;\n+ int LA9_34 = input.LA(3);\n+\n+ if ( (LA9_34=='e') ) {\n+ int LA9_51 = input.LA(4);\n+\n+ if ( (LA9_51=='m') ) {\n+ int LA9_60 = input.LA(5);\n+\n+ if ( (LA9_60=='[') ) {\n+ alt9=20;\n+ }\n+ else {\n+ alt9=27;}\n+ }\n+ else {\n+ alt9=27;}\n }\n- break;\n- case 'o':\n- {\n- alt9=14;\n+ else {\n+ alt9=27;}\n }\n break;\n- case 'l':\n+ case 'm':\n {\n- alt9=18;\n+ int LA9_35 = input.LA(3);\n+\n+ if ( (LA9_35=='g') ) {\n+ switch ( input.LA(4) ) {\n+ case '[':\n+ {\n+ alt9=24;\n+ }\n+ break;\n+ case ':':\n+ {\n+ alt9=23;\n+ }\n+ break;\n+ default:\n+ alt9=27;}\n+\n }\n- break;\n- case 'r':\n- {\n- alt9=13;\n+ else {\n+ alt9=27;}\n }\n break;\n default:\n- alt9=26;}\n+ alt9=27;}\n \n }\n- else if ( (LA9_0==':') ) {\n- alt9=2;\n- }\n- else if ( (LA9_0=='[') ) {\n- alt9=3;\n+ else if ( (LA9_0=='l') ) {\n+ int LA9_12 = input.LA(2);\n+\n+ if ( (LA9_12=='i') ) {\n+ int LA9_36 = input.LA(3);\n+\n+ if ( (LA9_36=='n') ) {\n+ int LA9_53 = input.LA(4);\n+\n+ if ( (LA9_53=='k') ) {\n+ int LA9_63 = input.LA(5);\n+\n+ if ( (LA9_63=='[') ) {\n+ alt9=22;\n+ }\n+ else {\n+ alt9=27;}\n+ }\n+ else {\n+ alt9=27;}\n+ }\n+ else {\n+ alt9=27;}\n+ }\n+ else {\n+ alt9=27;}\n }\n- else if ( (LA9_0==']') ) {\n- alt9=4;\n+ else if ( (LA9_0==':') ) {\n+ alt9=26;\n }\n- else if ( ((LA9_0>='A' && LA9_0<='Z')||LA9_0=='_'||(LA9_0>='a' && LA9_0<='z')) ) {\n- alt9=21;\n+ else if ( ((LA9_0>='A' && LA9_0<='Z')||LA9_0=='_'||LA9_0=='b'||LA9_0=='d'||(LA9_0>='f' && LA9_0<='h')||(LA9_0>='j' && LA9_0<='k')||(LA9_0>='m' && LA9_0<='n')||(LA9_0>='p' && LA9_0<='q')||LA9_0=='t'||(LA9_0>='v' && LA9_0<='z')) ) {\n+ alt9=27;\n }\n else if ( (LA9_0=='%') ) {\n- int LA9_6 = input.LA(2);\n+ int LA9_15 = input.LA(2);\n \n- if ( (LA9_6=='%') ) {\n- alt9=22;\n+ if ( (LA9_15=='%') ) {\n+ alt9=28;\n }\n else {\n- alt9=26;}\n+ alt9=32;}\n }\n else if ( (LA9_0=='\\r') ) {\n- int LA9_7 = input.LA(2);\n+ int LA9_16 = input.LA(2);\n \n- if ( (LA9_7=='\\n') ) {\n- int LA9_27 = input.LA(3);\n+ if ( (LA9_16=='\\n') ) {\n+ int LA9_39 = input.LA(3);\n \n- if ( (LA9_27=='\\n'||LA9_27=='\\r') ) {\n- alt9=23;\n+ if ( (LA9_39=='\\n'||LA9_39=='\\r') ) {\n+ alt9=29;\n }\n else {\n- alt9=24;}\n+ alt9=30;}\n }\n else {\n- alt9=26;}\n+ alt9=32;}\n }\n else if ( (LA9_0=='\\n') ) {\n- int LA9_8 = input.LA(2);\n+ int LA9_17 = input.LA(2);\n \n- if ( (LA9_8=='\\n'||LA9_8=='\\r') ) {\n- alt9=23;\n+ if ( (LA9_17=='\\n'||LA9_17=='\\r') ) {\n+ alt9=29;\n }\n else {\n- alt9=24;}\n+ alt9=30;}\n }\n else if ( (LA9_0=='\\t'||LA9_0==' ') ) {\n- alt9=25;\n+ alt9=31;\n }\n else if ( ((LA9_0>='\\u0000' && LA9_0<='\\b')||(LA9_0>='\\u000B' && LA9_0<='\\f')||(LA9_0>='\\u000E' && LA9_0<='\\u001F')||(LA9_0>='!' && LA9_0<='$')||(LA9_0>='&' && LA9_0<='9')||(LA9_0>=';' && LA9_0<='@')||LA9_0=='^'||LA9_0=='`'||(LA9_0>='{' && LA9_0<='\\uFFFE')) ) {\n- alt9=26;\n+ alt9=32;\n }\n else {\n NoViableAltException nvae =\n- new NoViableAltException(\"1:1: Tokens : ( T10 | T11 | T12 | T13 | T14 | T15 | T16 | T17 | T18 | T19 | T20 | T21 | T22 | T23 | T24 | T25 | T26 | T27 | T28 | T29 | RULE_ID | RULE_SL_COMMENT | RULE_MULTI_NL | RULE_SINGLE_NL | RULE_WS | RULE_ANY_OTHER );\", 9, 0, input);\n+ new NoViableAltException(\"1:1: Tokens : ( T10 | T11 | T12 | T13 | T14 | T15 | T16 | T17 | T18 | T19 | T20 | T21 | T22 | T23 | T24 | T25 | T26 | T27 | T28 | T29 | T30 | T31 | T32 | T33 | T34 | T35 | RULE_ID | RULE_SL_COMMENT | RULE_MULTI_NL | RULE_SINGLE_NL | RULE_WS | RULE_ANY_OTHER );\", 9, 0, input);\n \n throw nvae;\n }\n@@ -1131,42 +1503,84 @@ else if ( (LA9_0=='\\t'||LA9_0==' ') ) {\n }\n break;\n case 21 :\n- // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:1:90: RULE_ID\n+ // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:1:90: T30\n {\n- mRULE_ID(); \n+ mT30(); \n \n }\n break;\n case 22 :\n- // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:1:98: RULE_SL_COMMENT\n+ // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:1:94: T31\n {\n- mRULE_SL_COMMENT(); \n+ mT31(); \n \n }\n break;\n case 23 :\n- // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:1:114: RULE_MULTI_NL\n+ // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:1:98: T32\n {\n- mRULE_MULTI_NL(); \n+ mT32(); \n \n }\n break;\n case 24 :\n- // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:1:128: RULE_SINGLE_NL\n+ // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:1:102: T33\n {\n- mRULE_SINGLE_NL(); \n+ mT33(); \n \n }\n break;\n case 25 :\n- // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:1:143: RULE_WS\n+ // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:1:106: T34\n {\n- mRULE_WS(); \n+ mT34(); \n \n }\n break;\n case 26 :\n- // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:1:151: RULE_ANY_OTHER\n+ // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:1:110: T35\n+ {\n+ mT35(); \n+\n+ }\n+ break;\n+ case 27 :\n+ // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:1:114: RULE_ID\n+ {\n+ mRULE_ID(); \n+\n+ }\n+ break;\n+ case 28 :\n+ // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:1:122: RULE_SL_COMMENT\n+ {\n+ mRULE_SL_COMMENT(); \n+\n+ }\n+ break;\n+ case 29 :\n+ // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:1:138: RULE_MULTI_NL\n+ {\n+ mRULE_MULTI_NL(); \n+\n+ }\n+ break;\n+ case 30 :\n+ // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:1:152: RULE_SINGLE_NL\n+ {\n+ mRULE_SINGLE_NL(); \n+\n+ }\n+ break;\n+ case 31 :\n+ // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:1:167: RULE_WS\n+ {\n+ mRULE_WS(); \n+\n+ }\n+ break;\n+ case 32 :\n+ // ../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g:1:175: RULE_ANY_OTHER\n {\n mRULE_ANY_OTHER(); \n ", "raw_url": "https://github.com/RvonMassow/xDoc/raw/6b0eb897ce8abe5cda472a8e6af89cd62a47dd66/org.eclipse.xtext.xdoc%2Fsrc-gen%2Forg%2Feclipse%2Fxtext%2Fxdoc%2Fparser%2Fantlr%2Finternal%2FInternalXDocLexer.java", "sha": "87ebf00837e0c58d87a8d9f7d2bc7457eb7d8e71", "status": "modified" }, { "additions": 32, "blob_url": "https://github.com/RvonMassow/xDoc/blob/6b0eb897ce8abe5cda472a8e6af89cd62a47dd66/org.eclipse.xtext.xdoc%2Fsrc-gen%2Forg%2Feclipse%2Fxtext%2Fxdoc%2Fparser%2Fantlr%2Finternal%2FInternalXDoc__.g", "changes": 58, "contents_url": "https://api.github.com/repos/RvonMassow/xDoc/contents/org.eclipse.xtext.xdoc%2Fsrc-gen%2Forg%2Feclipse%2Fxtext%2Fxdoc%2Fparser%2Fantlr%2Finternal%2FInternalXDoc__.g?ref=6b0eb897ce8abe5cda472a8e6af89cd62a47dd66", "deletions": 26, "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc__.g", "new_code": "T10 : 'chapter:' ;\nT11 : '[' ;\nT12 : 'chapter[' ;\nT14 : 'section:' ;\nT15 : 'section[' ;\nT16 : 'subsection:' ;\nT17 : 'subsection[' ;\nT18 : 'section3:' ;\nT19 : 'section3[' ;\nT20 : 'section4:' ;\nT21 : 'section4[' ;\nT22 : '\\\\[' ;\nT23 : '\\\\]' ;\nT24 : 'emph[' ;\nT25 : 'a[' ;\nT26 : 'ref:' ;\nT27 : 'ol[' ;\nT28 : 'ul[' ;\nT29 : 'item[' ;\nT30 : 'codeRef[' ;\nT31 : 'link[' ;\nT32 : 'img:' ;\nT33 : 'img[' ;\nT34 : 'code[' ;\nT35 : ':' ;\n\n// $ANTLR src \"../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g\" 2575\n// $ANTLR src \"../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g\" 2577\n// $ANTLR src \"../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g\" 2579\n// $ANTLR src \"../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g\" 2581\n// $ANTLR src \"../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g\" 2583\n// $ANTLR src \"../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g\" 2585", "new_methods": [], "old_code": "T10 : '\\\\chapter' ;\nT11 : ':' ;\nT12 : '[' ;\nT14 : '\\\\section' ;\nT15 : '\\\\subsection' ;\nT16 : '\\\\section3' ;\nT17 : '\\\\section4' ;\nT18 : '\\\\[' ;\nT19 : '\\\\]' ;\nT20 : '\\\\emph' ;\nT21 : '\\\\a' ;\nT22 : '\\\\ref' ;\nT23 : '\\\\ol' ;\nT24 : '\\\\ul' ;\nT25 : '\\\\item' ;\nT26 : '\\\\codeRef' ;\nT27 : '\\\\link' ;\nT28 : '\\\\img' ;\nT29 : '\\\\code' ;\n\n// $ANTLR src \"../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g\" 2672\n// $ANTLR src \"../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g\" 2674\n// $ANTLR src \"../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g\" 2676\n// $ANTLR src \"../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g\" 2678\n// $ANTLR src \"../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g\" 2680\n// $ANTLR src \"../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g\" 2682", "old_methods": [], "patch": "@@ -7,43 +7,49 @@ package org.eclipse.xtext.xdoc.parser.antlr.internal;\n import org.eclipse.xtext.parser.antlr.Lexer;\n }\n \n-T10 : '\\\\chapter' ;\n-T11 : ':' ;\n-T12 : '[' ;\n+T10 : 'chapter:' ;\n+T11 : '[' ;\n+T12 : 'chapter[' ;\n T13 : ']' ;\n-T14 : '\\\\section' ;\n-T15 : '\\\\subsection' ;\n-T16 : '\\\\section3' ;\n-T17 : '\\\\section4' ;\n-T18 : '\\\\[' ;\n-T19 : '\\\\]' ;\n-T20 : '\\\\emph' ;\n-T21 : '\\\\a' ;\n-T22 : '\\\\ref' ;\n-T23 : '\\\\ol' ;\n-T24 : '\\\\ul' ;\n-T25 : '\\\\item' ;\n-T26 : '\\\\codeRef' ;\n-T27 : '\\\\link' ;\n-T28 : '\\\\img' ;\n-T29 : '\\\\code' ;\n-\n-// $ANTLR src \"../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g\" 2672\n+T14 : 'section:' ;\n+T15 : 'section[' ;\n+T16 : 'subsection:' ;\n+T17 : 'subsection[' ;\n+T18 : 'section3:' ;\n+T19 : 'section3[' ;\n+T20 : 'section4:' ;\n+T21 : 'section4[' ;\n+T22 : '\\\\[' ;\n+T23 : '\\\\]' ;\n+T24 : 'emph[' ;\n+T25 : 'a[' ;\n+T26 : 'ref:' ;\n+T27 : 'ol[' ;\n+T28 : 'ul[' ;\n+T29 : 'item[' ;\n+T30 : 'codeRef[' ;\n+T31 : 'link[' ;\n+T32 : 'img:' ;\n+T33 : 'img[' ;\n+T34 : 'code[' ;\n+T35 : ':' ;\n+\n+// $ANTLR src \"../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g\" 2575\n RULE_ID : ('a'..'z'|'A'..'Z'|'_') ('a'..'z'|'A'..'Z'|'_'|'0'..'9')*;\n \n-// $ANTLR src \"../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g\" 2674\n+// $ANTLR src \"../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g\" 2577\n RULE_SL_COMMENT : '%%' ~(('\\n'|'\\r'))* ('\\r'? '\\n')?;\n \n-// $ANTLR src \"../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g\" 2676\n+// $ANTLR src \"../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g\" 2579\n RULE_MULTI_NL : '\\r'? '\\n' ('\\r'? '\\n')+;\n \n-// $ANTLR src \"../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g\" 2678\n+// $ANTLR src \"../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g\" 2581\n RULE_SINGLE_NL : '\\r'? '\\n';\n \n-// $ANTLR src \"../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g\" 2680\n+// $ANTLR src \"../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g\" 2583\n RULE_WS : (' '|'\\t');\n \n-// $ANTLR src \"../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g\" 2682\n+// $ANTLR src \"../org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/parser/antlr/internal/InternalXDoc.g\" 2585\n RULE_ANY_OTHER : .;\n \n ", "raw_url": "https://github.com/RvonMassow/xDoc/raw/6b0eb897ce8abe5cda472a8e6af89cd62a47dd66/org.eclipse.xtext.xdoc%2Fsrc-gen%2Forg%2Feclipse%2Fxtext%2Fxdoc%2Fparser%2Fantlr%2Finternal%2FInternalXDoc__.g", "sha": "0e7758be4e45ac68c62711433a7d9dbde221c22d", "status": "modified" }, { "additions": 466, "blob_url": "https://github.com/RvonMassow/xDoc/blob/6b0eb897ce8abe5cda472a8e6af89cd62a47dd66/org.eclipse.xtext.xdoc%2Fsrc-gen%2Forg%2Feclipse%2Fxtext%2Fxdoc%2Fservices%2FXDocGrammarAccess.java", "changes": 988, "contents_url": "https://api.github.com/repos/RvonMassow/xDoc/contents/org.eclipse.xtext.xdoc%2Fsrc-gen%2Forg%2Feclipse%2Fxtext%2Fxdoc%2Fservices%2FXDocGrammarAccess.java?ref=6b0eb897ce8abe5cda472a8e6af89cd62a47dd66", "deletions": 522, "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "new_code": "\t\tprivate final Alternatives cAlternatives_0 = (Alternatives)cGroup.eContents().get(0);\n\t\tprivate final Group cGroup_0_0 = (Group)cAlternatives_0.eContents().get(0);\n\t\tprivate final Keyword cChapterKeyword_0_0_0 = (Keyword)cGroup_0_0.eContents().get(0);\n\t\tprivate final Assignment cNameAssignment_0_0_1 = (Assignment)cGroup_0_0.eContents().get(1);\n\t\tprivate final RuleCall cNameIDTerminalRuleCall_0_0_1_0 = (RuleCall)cNameAssignment_0_0_1.eContents().get(0);\n\t\tprivate final Keyword cLeftSquareBracketKeyword_0_0_2 = (Keyword)cGroup_0_0.eContents().get(2);\n\t\tprivate final Keyword cChapterKeyword_0_1 = (Keyword)cAlternatives_0.eContents().get(1);\n\t\tprivate final Assignment cTitleAssignment_1 = (Assignment)cGroup.eContents().get(1);\n\t\tprivate final RuleCall cTitleTextOrMarkupParserRuleCall_1_0 = (RuleCall)cTitleAssignment_1.eContents().get(0);\n\t\tprivate final Keyword cRightSquareBracketKeyword_2 = (Keyword)cGroup.eContents().get(2);\n\t\tprivate final Group cGroup_3 = (Group)cGroup.eContents().get(3);\n\t\tprivate final RuleCall cMULTI_NLTerminalRuleCall_3_0 = (RuleCall)cGroup_3.eContents().get(0);\n\t\tprivate final Assignment cContentsAssignment_3_1 = (Assignment)cGroup_3.eContents().get(1);\n\t\tprivate final RuleCall cContentsTextOrMarkupParserRuleCall_3_1_0 = (RuleCall)cContentsAssignment_3_1.eContents().get(0);\n\t\tprivate final Group cGroup_4 = (Group)cGroup.eContents().get(4);\n\t\tprivate final RuleCall cMULTI_NLTerminalRuleCall_4_0 = (RuleCall)cGroup_4.eContents().get(0);\n\t\tprivate final Assignment cContentsAssignment_4_1 = (Assignment)cGroup_4.eContents().get(1);\n\t\tprivate final RuleCall cContentsSectionParserRuleCall_4_1_0 = (RuleCall)cContentsAssignment_4_1.eContents().get(0);\n\t\t//\t(\"chapter:\" name=ID \"[\" | \"chapter[\") title=TextOrMarkup \"]\" (MULTI_NL contents+=TextOrMarkup)* (MULTI_NL\n\t\t//(\"chapter:\" name=ID \"[\" | \"chapter[\") title=TextOrMarkup \"]\" (MULTI_NL contents+=TextOrMarkup)* (MULTI_NL\n\t\t//contents+=Section)*\n\t\t//\"chapter:\" name=ID \"[\" | \"chapter[\"\n\t\tpublic Alternatives getAlternatives_0() { return cAlternatives_0; }\n\t\t//\"chapter:\" name=ID \"[\"\n\t\tpublic Group getGroup_0_0() { return cGroup_0_0; }\n\t\t//\"chapter:\"\n\t\tpublic Keyword getChapterKeyword_0_0_0() { return cChapterKeyword_0_0_0; }\n\t\tpublic Assignment getNameAssignment_0_0_1() { return cNameAssignment_0_0_1; }\n\t\tpublic RuleCall getNameIDTerminalRuleCall_0_0_1_0() { return cNameIDTerminalRuleCall_0_0_1_0; }\n\t\tpublic Keyword getLeftSquareBracketKeyword_0_0_2() { return cLeftSquareBracketKeyword_0_0_2; }\n\n\t\t//\"chapter[\"\n\t\tpublic Keyword getChapterKeyword_0_1() { return cChapterKeyword_0_1; }\n\t\tpublic Assignment getTitleAssignment_1() { return cTitleAssignment_1; }\n\t\tpublic RuleCall getTitleTextOrMarkupParserRuleCall_1_0() { return cTitleTextOrMarkupParserRuleCall_1_0; }\n\t\tpublic Keyword getRightSquareBracketKeyword_2() { return cRightSquareBracketKeyword_2; }\n\t\tpublic Group getGroup_3() { return cGroup_3; }\n\t\tpublic RuleCall getMULTI_NLTerminalRuleCall_3_0() { return cMULTI_NLTerminalRuleCall_3_0; }\n\t\tpublic Assignment getContentsAssignment_3_1() { return cContentsAssignment_3_1; }\n\t\tpublic RuleCall getContentsTextOrMarkupParserRuleCall_3_1_0() { return cContentsTextOrMarkupParserRuleCall_3_1_0; }\n\t\tpublic Group getGroup_4() { return cGroup_4; }\n\t\tpublic RuleCall getMULTI_NLTerminalRuleCall_4_0() { return cMULTI_NLTerminalRuleCall_4_0; }\n\t\tpublic Assignment getContentsAssignment_4_1() { return cContentsAssignment_4_1; }\n\t\tpublic RuleCall getContentsSectionParserRuleCall_4_1_0() { return cContentsSectionParserRuleCall_4_1_0; }\n\t\tprivate final Alternatives cAlternatives_0 = (Alternatives)cGroup.eContents().get(0);\n\t\tprivate final Group cGroup_0_0 = (Group)cAlternatives_0.eContents().get(0);\n\t\tprivate final Keyword cSectionKeyword_0_0_0 = (Keyword)cGroup_0_0.eContents().get(0);\n\t\tprivate final Assignment cNameAssignment_0_0_1 = (Assignment)cGroup_0_0.eContents().get(1);\n\t\tprivate final RuleCall cNameIDTerminalRuleCall_0_0_1_0 = (RuleCall)cNameAssignment_0_0_1.eContents().get(0);\n\t\tprivate final Keyword cLeftSquareBracketKeyword_0_0_2 = (Keyword)cGroup_0_0.eContents().get(2);\n\t\tprivate final Keyword cSectionKeyword_0_1 = (Keyword)cAlternatives_0.eContents().get(1);\n\t\tprivate final Assignment cTitleAssignment_1 = (Assignment)cGroup.eContents().get(1);\n\t\tprivate final RuleCall cTitleTextOrMarkupParserRuleCall_1_0 = (RuleCall)cTitleAssignment_1.eContents().get(0);\n\t\tprivate final Keyword cRightSquareBracketKeyword_2 = (Keyword)cGroup.eContents().get(2);\n\t\tprivate final Group cGroup_3 = (Group)cGroup.eContents().get(3);\n\t\tprivate final RuleCall cMULTI_NLTerminalRuleCall_3_0 = (RuleCall)cGroup_3.eContents().get(0);\n\t\tprivate final Assignment cContentsAssignment_3_1 = (Assignment)cGroup_3.eContents().get(1);\n\t\tprivate final RuleCall cContentsTextOrMarkupParserRuleCall_3_1_0 = (RuleCall)cContentsAssignment_3_1.eContents().get(0);\n\t\tprivate final Group cGroup_4 = (Group)cGroup.eContents().get(4);\n\t\tprivate final RuleCall cMULTI_NLTerminalRuleCall_4_0 = (RuleCall)cGroup_4.eContents().get(0);\n\t\tprivate final Assignment cContentsAssignment_4_1 = (Assignment)cGroup_4.eContents().get(1);\n\t\tprivate final RuleCall cContentsSubSectionParserRuleCall_4_1_0 = (RuleCall)cContentsAssignment_4_1.eContents().get(0);\n\t\t//\t(\"section:\" name=ID \"[\" | \"section[\") title=TextOrMarkup \"]\" (MULTI_NL contents+=TextOrMarkup)* (MULTI_NL\n\t\t//(\"section:\" name=ID \"[\" | \"section[\") title=TextOrMarkup \"]\" (MULTI_NL contents+=TextOrMarkup)* (MULTI_NL\n\t\t//\"section:\" name=ID \"[\" | \"section[\"\n\t\tpublic Alternatives getAlternatives_0() { return cAlternatives_0; }\n\t\t//\"section:\" name=ID \"[\"\n\t\tpublic Group getGroup_0_0() { return cGroup_0_0; }\n\t\t//\"section:\"\n\t\tpublic Keyword getSectionKeyword_0_0_0() { return cSectionKeyword_0_0_0; }\n\t\tpublic Assignment getNameAssignment_0_0_1() { return cNameAssignment_0_0_1; }\n\t\tpublic RuleCall getNameIDTerminalRuleCall_0_0_1_0() { return cNameIDTerminalRuleCall_0_0_1_0; }\n\t\tpublic Keyword getLeftSquareBracketKeyword_0_0_2() { return cLeftSquareBracketKeyword_0_0_2; }\n\n\t\t//\"section[\"\n\t\tpublic Keyword getSectionKeyword_0_1() { return cSectionKeyword_0_1; }\n\t\tpublic Assignment getTitleAssignment_1() { return cTitleAssignment_1; }\n\t\tpublic RuleCall getTitleTextOrMarkupParserRuleCall_1_0() { return cTitleTextOrMarkupParserRuleCall_1_0; }\n\t\tpublic Keyword getRightSquareBracketKeyword_2() { return cRightSquareBracketKeyword_2; }\n\t\tpublic Group getGroup_3() { return cGroup_3; }\n\t\tpublic RuleCall getMULTI_NLTerminalRuleCall_3_0() { return cMULTI_NLTerminalRuleCall_3_0; }\n\t\tpublic Assignment getContentsAssignment_3_1() { return cContentsAssignment_3_1; }\n\t\tpublic RuleCall getContentsTextOrMarkupParserRuleCall_3_1_0() { return cContentsTextOrMarkupParserRuleCall_3_1_0; }\n\t\tpublic Group getGroup_4() { return cGroup_4; }\n\t\tpublic RuleCall getMULTI_NLTerminalRuleCall_4_0() { return cMULTI_NLTerminalRuleCall_4_0; }\n\t\tpublic Assignment getContentsAssignment_4_1() { return cContentsAssignment_4_1; }\n\t\tpublic RuleCall getContentsSubSectionParserRuleCall_4_1_0() { return cContentsSubSectionParserRuleCall_4_1_0; }\n\t\tprivate final Alternatives cAlternatives_0 = (Alternatives)cGroup.eContents().get(0);\n\t\tprivate final Group cGroup_0_0 = (Group)cAlternatives_0.eContents().get(0);\n\t\tprivate final Keyword cSubsectionKeyword_0_0_0 = (Keyword)cGroup_0_0.eContents().get(0);\n\t\tprivate final Assignment cNameAssignment_0_0_1 = (Assignment)cGroup_0_0.eContents().get(1);\n\t\tprivate final RuleCall cNameIDTerminalRuleCall_0_0_1_0 = (RuleCall)cNameAssignment_0_0_1.eContents().get(0);\n\t\tprivate final Keyword cLeftSquareBracketKeyword_0_0_2 = (Keyword)cGroup_0_0.eContents().get(2);\n\t\tprivate final Keyword cSubsectionKeyword_0_1 = (Keyword)cAlternatives_0.eContents().get(1);\n\t\tprivate final Assignment cTitleAssignment_1 = (Assignment)cGroup.eContents().get(1);\n\t\tprivate final RuleCall cTitleTextOrMarkupParserRuleCall_1_0 = (RuleCall)cTitleAssignment_1.eContents().get(0);\n\t\tprivate final Keyword cRightSquareBracketKeyword_2 = (Keyword)cGroup.eContents().get(2);\n\t\tprivate final Group cGroup_3 = (Group)cGroup.eContents().get(3);\n\t\tprivate final RuleCall cMULTI_NLTerminalRuleCall_3_0 = (RuleCall)cGroup_3.eContents().get(0);\n\t\tprivate final Assignment cContentsAssignment_3_1 = (Assignment)cGroup_3.eContents().get(1);\n\t\tprivate final RuleCall cContentsTextOrMarkupParserRuleCall_3_1_0 = (RuleCall)cContentsAssignment_3_1.eContents().get(0);\n\t\tprivate final Group cGroup_4 = (Group)cGroup.eContents().get(4);\n\t\tprivate final RuleCall cMULTI_NLTerminalRuleCall_4_0 = (RuleCall)cGroup_4.eContents().get(0);\n\t\tprivate final Assignment cContentsAssignment_4_1 = (Assignment)cGroup_4.eContents().get(1);\n\t\tprivate final RuleCall cContentsSection3ParserRuleCall_4_1_0 = (RuleCall)cContentsAssignment_4_1.eContents().get(0);\n\t\t//\t(\"subsection:\" name=ID \"[\" | \"subsection[\") title=TextOrMarkup \"]\" (MULTI_NL contents+=TextOrMarkup)* (MULTI_NL\n\t\t//(\"subsection:\" name=ID \"[\" | \"subsection[\") title=TextOrMarkup \"]\" (MULTI_NL contents+=TextOrMarkup)* (MULTI_NL\n\t\t//\"subsection:\" name=ID \"[\" | \"subsection[\"\n\t\tpublic Alternatives getAlternatives_0() { return cAlternatives_0; }\n\t\t//\"subsection:\" name=ID \"[\"\n\t\tpublic Group getGroup_0_0() { return cGroup_0_0; }\n\t\t//\"subsection:\"\n\t\tpublic Keyword getSubsectionKeyword_0_0_0() { return cSubsectionKeyword_0_0_0; }\n\t\tpublic Assignment getNameAssignment_0_0_1() { return cNameAssignment_0_0_1; }\n\t\tpublic RuleCall getNameIDTerminalRuleCall_0_0_1_0() { return cNameIDTerminalRuleCall_0_0_1_0; }\n\t\tpublic Keyword getLeftSquareBracketKeyword_0_0_2() { return cLeftSquareBracketKeyword_0_0_2; }\n\n\t\t//\"subsection[\"\n\t\tpublic Keyword getSubsectionKeyword_0_1() { return cSubsectionKeyword_0_1; }\n\t\tpublic Assignment getTitleAssignment_1() { return cTitleAssignment_1; }\n\t\tpublic RuleCall getTitleTextOrMarkupParserRuleCall_1_0() { return cTitleTextOrMarkupParserRuleCall_1_0; }\n\t\tpublic Keyword getRightSquareBracketKeyword_2() { return cRightSquareBracketKeyword_2; }\n\t\tpublic Group getGroup_3() { return cGroup_3; }\n\t\tpublic RuleCall getMULTI_NLTerminalRuleCall_3_0() { return cMULTI_NLTerminalRuleCall_3_0; }\n\t\tpublic Assignment getContentsAssignment_3_1() { return cContentsAssignment_3_1; }\n\t\tpublic RuleCall getContentsTextOrMarkupParserRuleCall_3_1_0() { return cContentsTextOrMarkupParserRuleCall_3_1_0; }\n\t\tpublic Group getGroup_4() { return cGroup_4; }\n\t\tpublic RuleCall getMULTI_NLTerminalRuleCall_4_0() { return cMULTI_NLTerminalRuleCall_4_0; }\n\t\tpublic Assignment getContentsAssignment_4_1() { return cContentsAssignment_4_1; }\n\t\tpublic RuleCall getContentsSection3ParserRuleCall_4_1_0() { return cContentsSection3ParserRuleCall_4_1_0; }\n\t\tprivate final Alternatives cAlternatives_0 = (Alternatives)cGroup.eContents().get(0);\n\t\tprivate final Group cGroup_0_0 = (Group)cAlternatives_0.eContents().get(0);\n\t\tprivate final Keyword cSection3Keyword_0_0_0 = (Keyword)cGroup_0_0.eContents().get(0);\n\t\tprivate final Assignment cNameAssignment_0_0_1 = (Assignment)cGroup_0_0.eContents().get(1);\n\t\tprivate final RuleCall cNameIDTerminalRuleCall_0_0_1_0 = (RuleCall)cNameAssignment_0_0_1.eContents().get(0);\n\t\tprivate final Keyword cLeftSquareBracketKeyword_0_0_2 = (Keyword)cGroup_0_0.eContents().get(2);\n\t\tprivate final Keyword cSection3Keyword_0_1 = (Keyword)cAlternatives_0.eContents().get(1);\n\t\tprivate final Assignment cTitleAssignment_1 = (Assignment)cGroup.eContents().get(1);\n\t\tprivate final RuleCall cTitleTextOrMarkupParserRuleCall_1_0 = (RuleCall)cTitleAssignment_1.eContents().get(0);\n\t\tprivate final Keyword cRightSquareBracketKeyword_2 = (Keyword)cGroup.eContents().get(2);\n\t\tprivate final Group cGroup_3 = (Group)cGroup.eContents().get(3);\n\t\tprivate final RuleCall cMULTI_NLTerminalRuleCall_3_0 = (RuleCall)cGroup_3.eContents().get(0);\n\t\tprivate final Assignment cContentsAssignment_3_1 = (Assignment)cGroup_3.eContents().get(1);\n\t\tprivate final RuleCall cContentsTextOrMarkupParserRuleCall_3_1_0 = (RuleCall)cContentsAssignment_3_1.eContents().get(0);\n\t\tprivate final Group cGroup_4 = (Group)cGroup.eContents().get(4);\n\t\tprivate final RuleCall cMULTI_NLTerminalRuleCall_4_0 = (RuleCall)cGroup_4.eContents().get(0);\n\t\tprivate final Assignment cContentsAssignment_4_1 = (Assignment)cGroup_4.eContents().get(1);\n\t\tprivate final RuleCall cContentsSection4ParserRuleCall_4_1_0 = (RuleCall)cContentsAssignment_4_1.eContents().get(0);\n\t\t//\t(\"section3:\" name=ID \"[\" | \"section3[\") title=TextOrMarkup \"]\" (MULTI_NL contents+=TextOrMarkup)* (MULTI_NL\n\t\t//(\"section3:\" name=ID \"[\" | \"section3[\") title=TextOrMarkup \"]\" (MULTI_NL contents+=TextOrMarkup)* (MULTI_NL\n\t\t//contents+=Section4)*\n\t\t//\"section3:\" name=ID \"[\" | \"section3[\"\n\t\tpublic Alternatives getAlternatives_0() { return cAlternatives_0; }\n\t\t//\"section3:\" name=ID \"[\"\n\t\tpublic Group getGroup_0_0() { return cGroup_0_0; }\n\t\t//\"section3:\"\n\t\tpublic Keyword getSection3Keyword_0_0_0() { return cSection3Keyword_0_0_0; }\n\t\tpublic Assignment getNameAssignment_0_0_1() { return cNameAssignment_0_0_1; }\n\t\tpublic RuleCall getNameIDTerminalRuleCall_0_0_1_0() { return cNameIDTerminalRuleCall_0_0_1_0; }\n\t\tpublic Keyword getLeftSquareBracketKeyword_0_0_2() { return cLeftSquareBracketKeyword_0_0_2; }\n\n\t\t//\"section3[\"\n\t\tpublic Keyword getSection3Keyword_0_1() { return cSection3Keyword_0_1; }\n\t\tpublic Assignment getTitleAssignment_1() { return cTitleAssignment_1; }\n\t\tpublic RuleCall getTitleTextOrMarkupParserRuleCall_1_0() { return cTitleTextOrMarkupParserRuleCall_1_0; }\n\t\tpublic Keyword getRightSquareBracketKeyword_2() { return cRightSquareBracketKeyword_2; }\n\t\tpublic Group getGroup_3() { return cGroup_3; }\n\t\tpublic RuleCall getMULTI_NLTerminalRuleCall_3_0() { return cMULTI_NLTerminalRuleCall_3_0; }\n\t\tpublic Assignment getContentsAssignment_3_1() { return cContentsAssignment_3_1; }\n\t\tpublic RuleCall getContentsTextOrMarkupParserRuleCall_3_1_0() { return cContentsTextOrMarkupParserRuleCall_3_1_0; }\n\t\tpublic Group getGroup_4() { return cGroup_4; }\n\t\tpublic RuleCall getMULTI_NLTerminalRuleCall_4_0() { return cMULTI_NLTerminalRuleCall_4_0; }\n\t\tpublic Assignment getContentsAssignment_4_1() { return cContentsAssignment_4_1; }\n\t\tpublic RuleCall getContentsSection4ParserRuleCall_4_1_0() { return cContentsSection4ParserRuleCall_4_1_0; }\n\t\tprivate final Alternatives cAlternatives_0 = (Alternatives)cGroup.eContents().get(0);\n\t\tprivate final Group cGroup_0_0 = (Group)cAlternatives_0.eContents().get(0);\n\t\tprivate final Keyword cSection4Keyword_0_0_0 = (Keyword)cGroup_0_0.eContents().get(0);\n\t\tprivate final Assignment cNameAssignment_0_0_1 = (Assignment)cGroup_0_0.eContents().get(1);\n\t\tprivate final RuleCall cNameIDTerminalRuleCall_0_0_1_0 = (RuleCall)cNameAssignment_0_0_1.eContents().get(0);\n\t\tprivate final Keyword cLeftSquareBracketKeyword_0_0_2 = (Keyword)cGroup_0_0.eContents().get(2);\n\t\tprivate final Keyword cSection4Keyword_0_1 = (Keyword)cAlternatives_0.eContents().get(1);\n\t\tprivate final Assignment cTitleAssignment_1 = (Assignment)cGroup.eContents().get(1);\n\t\tprivate final RuleCall cTitleTextOrMarkupParserRuleCall_1_0 = (RuleCall)cTitleAssignment_1.eContents().get(0);\n\t\tprivate final Keyword cRightSquareBracketKeyword_2 = (Keyword)cGroup.eContents().get(2);\n\t\tprivate final Group cGroup_3 = (Group)cGroup.eContents().get(3);\n\t\tprivate final RuleCall cMULTI_NLTerminalRuleCall_3_0 = (RuleCall)cGroup_3.eContents().get(0);\n\t\tprivate final Assignment cContentsAssignment_3_1 = (Assignment)cGroup_3.eContents().get(1);\n\t\tprivate final RuleCall cContentsTextOrMarkupParserRuleCall_3_1_0 = (RuleCall)cContentsAssignment_3_1.eContents().get(0);\n\t\t//\t(\"section4:\" name=ID \"[\" | \"section4[\") title=TextOrMarkup \"]\" (MULTI_NL contents+=TextOrMarkup)*;\n\t\t//(\"section4:\" name=ID \"[\" | \"section4[\") title=TextOrMarkup \"]\" (MULTI_NL contents+=TextOrMarkup)*\n\t\t//\"section4:\" name=ID \"[\" | \"section4[\"\n\t\tpublic Alternatives getAlternatives_0() { return cAlternatives_0; }\n\t\t//\"section4:\" name=ID \"[\"\n\t\tpublic Group getGroup_0_0() { return cGroup_0_0; }\n\t\t//\"section4:\"\n\t\tpublic Keyword getSection4Keyword_0_0_0() { return cSection4Keyword_0_0_0; }\n\t\tpublic Assignment getNameAssignment_0_0_1() { return cNameAssignment_0_0_1; }\n\t\tpublic RuleCall getNameIDTerminalRuleCall_0_0_1_0() { return cNameIDTerminalRuleCall_0_0_1_0; }\n\t\tpublic Keyword getLeftSquareBracketKeyword_0_0_2() { return cLeftSquareBracketKeyword_0_0_2; }\n\n\t\t//\"section4[\"\n\t\tpublic Keyword getSection4Keyword_0_1() { return cSection4Keyword_0_1; }\n\t\tpublic Assignment getTitleAssignment_1() { return cTitleAssignment_1; }\n\t\tpublic RuleCall getTitleTextOrMarkupParserRuleCall_1_0() { return cTitleTextOrMarkupParserRuleCall_1_0; }\n\t\tpublic Keyword getRightSquareBracketKeyword_2() { return cRightSquareBracketKeyword_2; }\n\t\tpublic Group getGroup_3() { return cGroup_3; }\n\t\tpublic RuleCall getMULTI_NLTerminalRuleCall_3_0() { return cMULTI_NLTerminalRuleCall_3_0; }\n\t\tpublic Assignment getContentsAssignment_3_1() { return cContentsAssignment_3_1; }\n\t\tpublic RuleCall getContentsTextOrMarkupParserRuleCall_3_1_0() { return cContentsTextOrMarkupParserRuleCall_3_1_0; }\n\t\t//\t(ID | WS | SINGLE_NL | ANY_OTHER | \"\\\\[\" | \"\\\\]\")+;\n\t\t//(ID | WS | SINGLE_NL | ANY_OTHER | \"\\\\[\" | \"\\\\]\")+\n\t\tprivate final RuleCall cMULTI_NLTerminalRuleCall_1 = (RuleCall)cGroup.eContents().get(1);\n\t\tprivate final Assignment cContentsAssignment_2 = (Assignment)cGroup.eContents().get(2);\n\t\tprivate final RuleCall cContentsTextOrMarkupParserRuleCall_2_0 = (RuleCall)cContentsAssignment_2.eContents().get(0);\n\t\tprivate final RuleCall cMULTI_NLTerminalRuleCall_3 = (RuleCall)cGroup.eContents().get(3);\n\t\tprivate final Keyword cRightSquareBracketKeyword_4 = (Keyword)cGroup.eContents().get(4);\n\t\t//\t\"emph[\" MULTI_NL? contents+=TextOrMarkup MULTI_NL? \"]\";\n\t\t//\"emph[\" MULTI_NL? contents+=TextOrMarkup MULTI_NL? \"]\"\n\t\t//\"emph[\"\n\t\tpublic RuleCall getMULTI_NLTerminalRuleCall_1() { return cMULTI_NLTerminalRuleCall_1; }\n\t\tpublic Assignment getContentsAssignment_2() { return cContentsAssignment_2; }\n\t\tpublic RuleCall getContentsTextOrMarkupParserRuleCall_2_0() { return cContentsTextOrMarkupParserRuleCall_2_0; }\n\t\tpublic RuleCall getMULTI_NLTerminalRuleCall_3() { return cMULTI_NLTerminalRuleCall_3; }\n\t\tpublic Keyword getRightSquareBracketKeyword_4() { return cRightSquareBracketKeyword_4; }\n\t\tprivate final Assignment cNameAssignment_1 = (Assignment)cGroup.eContents().get(1);\n\t\tprivate final RuleCall cNameIDTerminalRuleCall_1_0 = (RuleCall)cNameAssignment_1.eContents().get(0);\n\t\tprivate final Keyword cRightSquareBracketKeyword_2 = (Keyword)cGroup.eContents().get(2);\n\t\t//\t\"a[\" name=ID \"]\";\n\t\t//\"a[\" name=ID \"]\"\n\t\t//\"a[\"\n\t\tpublic Assignment getNameAssignment_1() { return cNameAssignment_1; }\n\t\tpublic RuleCall getNameIDTerminalRuleCall_1_0() { return cNameIDTerminalRuleCall_1_0; }\n\t\tpublic Keyword getRightSquareBracketKeyword_2() { return cRightSquareBracketKeyword_2; }\n\t\tprivate final Assignment cRefAssignment_1 = (Assignment)cGroup.eContents().get(1);\n\t\tprivate final CrossReference cRefIdentifiableCrossReference_1_0 = (CrossReference)cRefAssignment_1.eContents().get(0);\n\t\tprivate final RuleCall cRefIdentifiableIDTerminalRuleCall_1_0_1 = (RuleCall)cRefIdentifiableCrossReference_1_0.eContents().get(1);\n\t\tprivate final Keyword cLeftSquareBracketKeyword_2 = (Keyword)cGroup.eContents().get(2);\n\t\tprivate final RuleCall cMULTI_NLTerminalRuleCall_3 = (RuleCall)cGroup.eContents().get(3);\n\t\tprivate final Assignment cContentsAssignment_4 = (Assignment)cGroup.eContents().get(4);\n\t\tprivate final RuleCall cContentsTextOrMarkupParserRuleCall_4_0 = (RuleCall)cContentsAssignment_4.eContents().get(0);\n\t\tprivate final RuleCall cMULTI_NLTerminalRuleCall_5 = (RuleCall)cGroup.eContents().get(5);\n\t\tprivate final Keyword cRightSquareBracketKeyword_6 = (Keyword)cGroup.eContents().get(6);\n\t\t//\t\"ref:\" ref=[Identifiable] \"[\" MULTI_NL? contents+=TextOrMarkup MULTI_NL? \"]\";\n\t\t//\"ref:\" ref=[Identifiable] \"[\" MULTI_NL? contents+=TextOrMarkup MULTI_NL? \"]\"\n\t\t//\"ref:\"\n\t\tpublic Assignment getRefAssignment_1() { return cRefAssignment_1; }\n\t\tpublic CrossReference getRefIdentifiableCrossReference_1_0() { return cRefIdentifiableCrossReference_1_0; }\n\t\tpublic RuleCall getRefIdentifiableIDTerminalRuleCall_1_0_1() { return cRefIdentifiableIDTerminalRuleCall_1_0_1; }\n\t\tpublic Keyword getLeftSquareBracketKeyword_2() { return cLeftSquareBracketKeyword_2; }\n\t\tpublic RuleCall getMULTI_NLTerminalRuleCall_3() { return cMULTI_NLTerminalRuleCall_3; }\n\t\tpublic Assignment getContentsAssignment_4() { return cContentsAssignment_4; }\n\t\tpublic RuleCall getContentsTextOrMarkupParserRuleCall_4_0() { return cContentsTextOrMarkupParserRuleCall_4_0; }\n\t\tpublic RuleCall getMULTI_NLTerminalRuleCall_5() { return cMULTI_NLTerminalRuleCall_5; }\n\t\tpublic Keyword getRightSquareBracketKeyword_6() { return cRightSquareBracketKeyword_6; }\n\t\tprivate final Group cGroup_1 = (Group)cGroup.eContents().get(1);\n\t\tprivate final RuleCall cANY_WSParserRuleCall_1_0 = (RuleCall)cGroup_1.eContents().get(0);\n\t\tprivate final Assignment cItemsAssignment_1_1 = (Assignment)cGroup_1.eContents().get(1);\n\t\tprivate final RuleCall cItemsItemParserRuleCall_1_1_0 = (RuleCall)cItemsAssignment_1_1.eContents().get(0);\n\t\tprivate final RuleCall cANY_WSParserRuleCall_2 = (RuleCall)cGroup.eContents().get(2);\n\t\tprivate final Keyword cRightSquareBracketKeyword_3 = (Keyword)cGroup.eContents().get(3);\n\t\t//\t\"ol[\" (ANY_WS* items+=Item)+ ANY_WS* \"]\";\n\t\t//\"ol[\" (ANY_WS* items+=Item)+ ANY_WS* \"]\"\n\t\t//\"ol[\"\n\t\tpublic Group getGroup_1() { return cGroup_1; }\n\t\tpublic RuleCall getANY_WSParserRuleCall_1_0() { return cANY_WSParserRuleCall_1_0; }\n\t\tpublic Assignment getItemsAssignment_1_1() { return cItemsAssignment_1_1; }\n\t\tpublic RuleCall getItemsItemParserRuleCall_1_1_0() { return cItemsItemParserRuleCall_1_1_0; }\n\t\tpublic RuleCall getANY_WSParserRuleCall_2() { return cANY_WSParserRuleCall_2; }\n\t\tpublic Keyword getRightSquareBracketKeyword_3() { return cRightSquareBracketKeyword_3; }\n\t\tprivate final Group cGroup_1 = (Group)cGroup.eContents().get(1);\n\t\tprivate final RuleCall cANY_WSParserRuleCall_1_0 = (RuleCall)cGroup_1.eContents().get(0);\n\t\tprivate final Assignment cItemsAssignment_1_1 = (Assignment)cGroup_1.eContents().get(1);\n\t\tprivate final RuleCall cItemsItemParserRuleCall_1_1_0 = (RuleCall)cItemsAssignment_1_1.eContents().get(0);\n\t\tprivate final RuleCall cANY_WSParserRuleCall_2 = (RuleCall)cGroup.eContents().get(2);\n\t\tprivate final Keyword cRightSquareBracketKeyword_3 = (Keyword)cGroup.eContents().get(3);\n\t\t//\t\"ul[\" (ANY_WS* items+=Item)+ ANY_WS* \"]\";\n\t\t//\"ul[\" (ANY_WS* items+=Item)+ ANY_WS* \"]\"\n\t\t//\"ul[\"\n\t\tpublic Group getGroup_1() { return cGroup_1; }\n\t\tpublic RuleCall getANY_WSParserRuleCall_1_0() { return cANY_WSParserRuleCall_1_0; }\n\t\tpublic Assignment getItemsAssignment_1_1() { return cItemsAssignment_1_1; }\n\t\tpublic RuleCall getItemsItemParserRuleCall_1_1_0() { return cItemsItemParserRuleCall_1_1_0; }\n\t\tpublic RuleCall getANY_WSParserRuleCall_2() { return cANY_WSParserRuleCall_2; }\n\t\tpublic Keyword getRightSquareBracketKeyword_3() { return cRightSquareBracketKeyword_3; }\n\t\tprivate final RuleCall cMULTI_NLTerminalRuleCall_1 = (RuleCall)cGroup.eContents().get(1);\n\t\tprivate final Assignment cContentsAssignment_2 = (Assignment)cGroup.eContents().get(2);\n\t\tprivate final RuleCall cContentsTextOrMarkupParserRuleCall_2_0 = (RuleCall)cContentsAssignment_2.eContents().get(0);\n\t\tprivate final Group cGroup_3 = (Group)cGroup.eContents().get(3);\n\t\tprivate final RuleCall cMULTI_NLTerminalRuleCall_3_0 = (RuleCall)cGroup_3.eContents().get(0);\n\t\tprivate final Assignment cContentsAssignment_3_1 = (Assignment)cGroup_3.eContents().get(1);\n\t\tprivate final RuleCall cContentsTextOrMarkupParserRuleCall_3_1_0 = (RuleCall)cContentsAssignment_3_1.eContents().get(0);\n\t\tprivate final Keyword cRightSquareBracketKeyword_4 = (Keyword)cGroup.eContents().get(4);\n\t\t//\t\"item[\" MULTI_NL? contents+=TextOrMarkup (MULTI_NL contents+=TextOrMarkup)* \"]\";\n\t\t//\"item[\" MULTI_NL? contents+=TextOrMarkup (MULTI_NL contents+=TextOrMarkup)* \"]\"\n\t\t//\"item[\"\n\t\tpublic RuleCall getMULTI_NLTerminalRuleCall_1() { return cMULTI_NLTerminalRuleCall_1; }\n\t\tpublic Assignment getContentsAssignment_2() { return cContentsAssignment_2; }\n\t\tpublic RuleCall getContentsTextOrMarkupParserRuleCall_2_0() { return cContentsTextOrMarkupParserRuleCall_2_0; }\n\t\tpublic Group getGroup_3() { return cGroup_3; }\n\t\tpublic RuleCall getMULTI_NLTerminalRuleCall_3_0() { return cMULTI_NLTerminalRuleCall_3_0; }\n\t\tpublic Assignment getContentsAssignment_3_1() { return cContentsAssignment_3_1; }\n\t\tpublic RuleCall getContentsTextOrMarkupParserRuleCall_3_1_0() { return cContentsTextOrMarkupParserRuleCall_3_1_0; }\n\t\tpublic Keyword getRightSquareBracketKeyword_4() { return cRightSquareBracketKeyword_4; }\n\t\tprivate final Assignment cElementAssignment_1 = (Assignment)cGroup.eContents().get(1);\n\t\tprivate final CrossReference cElementJvmIdentifyableElementCrossReference_1_0 = (CrossReference)cElementAssignment_1.eContents().get(0);\n\t\tprivate final RuleCall cElementJvmIdentifyableElementTextParserRuleCall_1_0_1 = (RuleCall)cElementJvmIdentifyableElementCrossReference_1_0.eContents().get(1);\n\t\tprivate final Keyword cRightSquareBracketKeyword_2 = (Keyword)cGroup.eContents().get(2);\n\t\t//\t\"codeRef[\" element=[types::JvmIdentifyableElement|Text] \"]\";\n\t\t//\"codeRef[\" element=[types::JvmIdentifyableElement|Text] \"]\"\n\t\t//\"codeRef[\"\n\t\tpublic Assignment getElementAssignment_1() { return cElementAssignment_1; }\n\t\tpublic CrossReference getElementJvmIdentifyableElementCrossReference_1_0() { return cElementJvmIdentifyableElementCrossReference_1_0; }\n\t\tpublic RuleCall getElementJvmIdentifyableElementTextParserRuleCall_1_0_1() { return cElementJvmIdentifyableElementTextParserRuleCall_1_0_1; }\n\t\tpublic Keyword getRightSquareBracketKeyword_2() { return cRightSquareBracketKeyword_2; }\n\t\tprivate final Assignment cUrlAssignment_1 = (Assignment)cGroup.eContents().get(1);\n\t\tprivate final RuleCall cUrlTextParserRuleCall_1_0 = (RuleCall)cUrlAssignment_1.eContents().get(0);\n\t\tprivate final Keyword cRightSquareBracketKeyword_2 = (Keyword)cGroup.eContents().get(2);\n\t\tprivate final RuleCall cANY_WSParserRuleCall_3 = (RuleCall)cGroup.eContents().get(3);\n\t\tprivate final Keyword cLeftSquareBracketKeyword_4 = (Keyword)cGroup.eContents().get(4);\n\t\tprivate final Assignment cTextAssignment_5 = (Assignment)cGroup.eContents().get(5);\n\t\tprivate final RuleCall cTextTextParserRuleCall_5_0 = (RuleCall)cTextAssignment_5.eContents().get(0);\n\t\tprivate final Keyword cRightSquareBracketKeyword_6 = (Keyword)cGroup.eContents().get(6);\n\t\t//\t\"link[\" url=Text \"]\" ANY_WS* \"[\" text=Text \"]\";\n\t\t//\"link[\" url=Text \"]\" ANY_WS* \"[\" text=Text \"]\"\n\t\t//\"link[\"\n\t\tpublic Assignment getUrlAssignment_1() { return cUrlAssignment_1; }\n\t\tpublic RuleCall getUrlTextParserRuleCall_1_0() { return cUrlTextParserRuleCall_1_0; }\n\t\tpublic Keyword getRightSquareBracketKeyword_2() { return cRightSquareBracketKeyword_2; }\n\t\tpublic RuleCall getANY_WSParserRuleCall_3() { return cANY_WSParserRuleCall_3; }\n\t\tpublic Keyword getLeftSquareBracketKeyword_4() { return cLeftSquareBracketKeyword_4; }\n\t\tpublic Assignment getTextAssignment_5() { return cTextAssignment_5; }\n\t\tpublic RuleCall getTextTextParserRuleCall_5_0() { return cTextTextParserRuleCall_5_0; }\n\t\tpublic Keyword getRightSquareBracketKeyword_6() { return cRightSquareBracketKeyword_6; }\n\t\tprivate final Alternatives cAlternatives_0 = (Alternatives)cGroup.eContents().get(0);\n\t\tprivate final Group cGroup_0_0 = (Group)cAlternatives_0.eContents().get(0);\n\t\tprivate final Keyword cImgKeyword_0_0_0 = (Keyword)cGroup_0_0.eContents().get(0);\n\t\tprivate final RuleCall cANY_WSParserRuleCall_0_0_1 = (RuleCall)cGroup_0_0.eContents().get(1);\n\t\tprivate final Assignment cNameAssignment_0_0_2 = (Assignment)cGroup_0_0.eContents().get(2);\n\t\tprivate final RuleCall cNameIDTerminalRuleCall_0_0_2_0 = (RuleCall)cNameAssignment_0_0_2.eContents().get(0);\n\t\tprivate final RuleCall cANY_WSParserRuleCall_0_0_3 = (RuleCall)cGroup_0_0.eContents().get(3);\n\t\tprivate final Keyword cLeftSquareBracketKeyword_0_0_4 = (Keyword)cGroup_0_0.eContents().get(4);\n\t\tprivate final Keyword cImgKeyword_0_1 = (Keyword)cAlternatives_0.eContents().get(1);\n\t\tprivate final Assignment cPathAssignment_1 = (Assignment)cGroup.eContents().get(1);\n\t\tprivate final RuleCall cPathTextParserRuleCall_1_0 = (RuleCall)cPathAssignment_1.eContents().get(0);\n\t\tprivate final Keyword cRightSquareBracketKeyword_2 = (Keyword)cGroup.eContents().get(2);\n\t\tprivate final RuleCall cANY_WSParserRuleCall_3 = (RuleCall)cGroup.eContents().get(3);\n\t\tprivate final Keyword cLeftSquareBracketKeyword_4 = (Keyword)cGroup.eContents().get(4);\n\t\tprivate final Assignment cClazzAssignment_5 = (Assignment)cGroup.eContents().get(5);\n\t\tprivate final RuleCall cClazzTextParserRuleCall_5_0 = (RuleCall)cClazzAssignment_5.eContents().get(0);\n\t\tprivate final Keyword cRightSquareBracketKeyword_6 = (Keyword)cGroup.eContents().get(6);\n\t\tprivate final RuleCall cANY_WSParserRuleCall_7 = (RuleCall)cGroup.eContents().get(7);\n\t\tprivate final Keyword cLeftSquareBracketKeyword_8 = (Keyword)cGroup.eContents().get(8);\n\t\tprivate final Assignment cStyleAssignment_9 = (Assignment)cGroup.eContents().get(9);\n\t\tprivate final RuleCall cStyleTextParserRuleCall_9_0 = (RuleCall)cStyleAssignment_9.eContents().get(0);\n\t\tprivate final Keyword cRightSquareBracketKeyword_10 = (Keyword)cGroup.eContents().get(10);\n\t\tprivate final RuleCall cANY_WSParserRuleCall_11 = (RuleCall)cGroup.eContents().get(11);\n\t\tprivate final Keyword cLeftSquareBracketKeyword_12 = (Keyword)cGroup.eContents().get(12);\n\t\tprivate final Assignment cCaptionAssignment_13 = (Assignment)cGroup.eContents().get(13);\n\t\tprivate final RuleCall cCaptionTextParserRuleCall_13_0 = (RuleCall)cCaptionAssignment_13.eContents().get(0);\n\t\tprivate final Keyword cRightSquareBracketKeyword_14 = (Keyword)cGroup.eContents().get(14);\n\t\t//\t(\"img:\" ANY_WS* name=ID ANY_WS* \"[\" | \"img[\") path=Text / *TODO make it a crossreference to images * / \"]\" ANY_WS* \"[\"\n\t\t//\tclazz=Text \"]\" ANY_WS* \"[\" style=Text \"]\" ANY_WS* \"[\" caption=Text \"]\";\n\t\t//(\"img:\" ANY_WS* name=ID ANY_WS* \"[\" | \"img[\") path=Text / *TODO make it a crossreference to images * / \"]\" ANY_WS* \"[\"\n\t\t//clazz=Text \"]\" ANY_WS* \"[\" style=Text \"]\" ANY_WS* \"[\" caption=Text \"]\"\n\t\t//\"img:\" ANY_WS* name=ID ANY_WS* \"[\" | \"img[\"\n\t\tpublic Alternatives getAlternatives_0() { return cAlternatives_0; }\n\t\t//\"img:\" ANY_WS* name=ID ANY_WS* \"[\"\n\t\tpublic Group getGroup_0_0() { return cGroup_0_0; }\n\t\t//\"img:\"\n\t\tpublic Keyword getImgKeyword_0_0_0() { return cImgKeyword_0_0_0; }\n\t\tpublic RuleCall getANY_WSParserRuleCall_0_0_1() { return cANY_WSParserRuleCall_0_0_1; }\n\t\tpublic Assignment getNameAssignment_0_0_2() { return cNameAssignment_0_0_2; }\n\t\tpublic RuleCall getNameIDTerminalRuleCall_0_0_2_0() { return cNameIDTerminalRuleCall_0_0_2_0; }\n\t\tpublic RuleCall getANY_WSParserRuleCall_0_0_3() { return cANY_WSParserRuleCall_0_0_3; }\n\t\tpublic Keyword getLeftSquareBracketKeyword_0_0_4() { return cLeftSquareBracketKeyword_0_0_4; }\n\n\t\t//\"img[\"\n\t\tpublic Keyword getImgKeyword_0_1() { return cImgKeyword_0_1; }\n\t\tpublic Assignment getPathAssignment_1() { return cPathAssignment_1; }\n\t\tpublic RuleCall getPathTextParserRuleCall_1_0() { return cPathTextParserRuleCall_1_0; }\n\t\tpublic Keyword getRightSquareBracketKeyword_2() { return cRightSquareBracketKeyword_2; }\n\t\tpublic RuleCall getANY_WSParserRuleCall_3() { return cANY_WSParserRuleCall_3; }\n\t\tpublic Keyword getLeftSquareBracketKeyword_4() { return cLeftSquareBracketKeyword_4; }\n\t\tpublic Assignment getClazzAssignment_5() { return cClazzAssignment_5; }\n\t\tpublic RuleCall getClazzTextParserRuleCall_5_0() { return cClazzTextParserRuleCall_5_0; }\n\t\tpublic Keyword getRightSquareBracketKeyword_6() { return cRightSquareBracketKeyword_6; }\n\t\tpublic RuleCall getANY_WSParserRuleCall_7() { return cANY_WSParserRuleCall_7; }\n\t\tpublic Keyword getLeftSquareBracketKeyword_8() { return cLeftSquareBracketKeyword_8; }\n\t\tpublic Assignment getStyleAssignment_9() { return cStyleAssignment_9; }\n\t\tpublic RuleCall getStyleTextParserRuleCall_9_0() { return cStyleTextParserRuleCall_9_0; }\n\t\tpublic Keyword getRightSquareBracketKeyword_10() { return cRightSquareBracketKeyword_10; }\n\t\tpublic RuleCall getANY_WSParserRuleCall_11() { return cANY_WSParserRuleCall_11; }\n\t\tpublic Keyword getLeftSquareBracketKeyword_12() { return cLeftSquareBracketKeyword_12; }\n\t\tpublic Assignment getCaptionAssignment_13() { return cCaptionAssignment_13; }\n\t\tpublic RuleCall getCaptionTextParserRuleCall_13_0() { return cCaptionTextParserRuleCall_13_0; }\n\t\tpublic Keyword getRightSquareBracketKeyword_14() { return cRightSquareBracketKeyword_14; }\n\t\tprivate final Group cGroup_1 = (Group)cGroup.eContents().get(1);\n\t\tprivate final RuleCall cANY_WSParserRuleCall_1_0 = (RuleCall)cGroup_1.eContents().get(0);\n\t\tprivate final Assignment cLanguageAssignment_1_1 = (Assignment)cGroup_1.eContents().get(1);\n\t\tprivate final RuleCall cLanguageIDTerminalRuleCall_1_1_0 = (RuleCall)cLanguageAssignment_1_1.eContents().get(0);\n\t\tprivate final RuleCall cANY_WSParserRuleCall_1_2 = (RuleCall)cGroup_1.eContents().get(2);\n\t\tprivate final Keyword cRightSquareBracketKeyword_1_3 = (Keyword)cGroup_1.eContents().get(3);\n\t\tprivate final RuleCall cANY_WSParserRuleCall_1_4 = (RuleCall)cGroup_1.eContents().get(4);\n\t\tprivate final Keyword cLeftSquareBracketKeyword_1_5 = (Keyword)cGroup_1.eContents().get(5);\n\t\tprivate final Alternatives cAlternatives_2 = (Alternatives)cGroup.eContents().get(2);\n\t\tprivate final Group cGroup_2_0 = (Group)cAlternatives_2.eContents().get(0);\n\t\tprivate final Assignment cContentsAssignment_2_0_0 = (Assignment)cGroup_2_0.eContents().get(0);\n\t\tprivate final RuleCall cContentsCodeParserRuleCall_2_0_0_0 = (RuleCall)cContentsAssignment_2_0_0.eContents().get(0);\n\t\tprivate final Group cGroup_2_0_1 = (Group)cGroup_2_0.eContents().get(1);\n\t\tprivate final Assignment cContentsAssignment_2_0_1_0 = (Assignment)cGroup_2_0_1.eContents().get(0);\n\t\tprivate final RuleCall cContentsMarkupInCodeParserRuleCall_2_0_1_0_0 = (RuleCall)cContentsAssignment_2_0_1_0.eContents().get(0);\n\t\tprivate final Assignment cContentsAssignment_2_0_1_1 = (Assignment)cGroup_2_0_1.eContents().get(1);\n\t\tprivate final RuleCall cContentsCodeParserRuleCall_2_0_1_1_0 = (RuleCall)cContentsAssignment_2_0_1_1.eContents().get(0);\n\t\tprivate final Group cGroup_2_1 = (Group)cAlternatives_2.eContents().get(1);\n\t\tprivate final Assignment cContentsAssignment_2_1_0 = (Assignment)cGroup_2_1.eContents().get(0);\n\t\tprivate final RuleCall cContentsMarkupInCodeParserRuleCall_2_1_0_0 = (RuleCall)cContentsAssignment_2_1_0.eContents().get(0);\n\t\tprivate final Assignment cContentsAssignment_2_1_1 = (Assignment)cGroup_2_1.eContents().get(1);\n\t\tprivate final RuleCall cContentsCodeParserRuleCall_2_1_1_0 = (RuleCall)cContentsAssignment_2_1_1.eContents().get(0);\n\t\tprivate final Keyword cRightSquareBracketKeyword_3 = (Keyword)cGroup.eContents().get(3);\n\t\t//\t\"code[\" (ANY_WS* language=ID ANY_WS* \"]\" ANY_WS* \"[\")? (contents+=Code (contents+=MarkupInCode contents+=Code?)* |\n\t\t//\t(contents+=MarkupInCode contents+=Code?)+) \"]\";\n\t\t//\"code[\" (ANY_WS* language=ID ANY_WS* \"]\" ANY_WS* \"[\")? (contents+=Code (contents+=MarkupInCode contents+=Code?)* |\n\t\t//(contents+=MarkupInCode contents+=Code?)+) \"]\"\n\t\t//\"code[\"\n\t\t//(ANY_WS* language=ID ANY_WS* \"]\" ANY_WS* \"[\")?\n\t\tpublic Group getGroup_1() { return cGroup_1; }\n\t\tpublic RuleCall getANY_WSParserRuleCall_1_0() { return cANY_WSParserRuleCall_1_0; }\n\t\tpublic Assignment getLanguageAssignment_1_1() { return cLanguageAssignment_1_1; }\n\t\tpublic RuleCall getLanguageIDTerminalRuleCall_1_1_0() { return cLanguageIDTerminalRuleCall_1_1_0; }\n\t\tpublic RuleCall getANY_WSParserRuleCall_1_2() { return cANY_WSParserRuleCall_1_2; }\n\t\tpublic Keyword getRightSquareBracketKeyword_1_3() { return cRightSquareBracketKeyword_1_3; }\n\t\tpublic RuleCall getANY_WSParserRuleCall_1_4() { return cANY_WSParserRuleCall_1_4; }\n\t\tpublic Keyword getLeftSquareBracketKeyword_1_5() { return cLeftSquareBracketKeyword_1_5; }\n\t\tpublic Alternatives getAlternatives_2() { return cAlternatives_2; }\n\t\tpublic Group getGroup_2_0() { return cGroup_2_0; }\n\t\tpublic Assignment getContentsAssignment_2_0_0() { return cContentsAssignment_2_0_0; }\n\t\tpublic RuleCall getContentsCodeParserRuleCall_2_0_0_0() { return cContentsCodeParserRuleCall_2_0_0_0; }\n\t\tpublic Group getGroup_2_0_1() { return cGroup_2_0_1; }\n\t\tpublic Assignment getContentsAssignment_2_0_1_0() { return cContentsAssignment_2_0_1_0; }\n\t\tpublic RuleCall getContentsMarkupInCodeParserRuleCall_2_0_1_0_0() { return cContentsMarkupInCodeParserRuleCall_2_0_1_0_0; }\n\t\tpublic Assignment getContentsAssignment_2_0_1_1() { return cContentsAssignment_2_0_1_1; }\n\t\tpublic RuleCall getContentsCodeParserRuleCall_2_0_1_1_0() { return cContentsCodeParserRuleCall_2_0_1_1_0; }\n\t\tpublic Group getGroup_2_1() { return cGroup_2_1; }\n\t\tpublic Assignment getContentsAssignment_2_1_0() { return cContentsAssignment_2_1_0; }\n\t\tpublic RuleCall getContentsMarkupInCodeParserRuleCall_2_1_0_0() { return cContentsMarkupInCodeParserRuleCall_2_1_0_0; }\n\t\tpublic Assignment getContentsAssignment_2_1_1() { return cContentsAssignment_2_1_1; }\n\t\tpublic RuleCall getContentsCodeParserRuleCall_2_1_1_0() { return cContentsCodeParserRuleCall_2_1_1_0; }\n\t\tpublic Keyword getRightSquareBracketKeyword_3() { return cRightSquareBracketKeyword_3; }\n\t//\t(\"chapter:\" name=ID \"[\" | \"chapter[\") title=TextOrMarkup \"]\" (MULTI_NL contents+=TextOrMarkup)* (MULTI_NL\n\t//\t(\"section:\" name=ID \"[\" | \"section[\") title=TextOrMarkup \"]\" (MULTI_NL contents+=TextOrMarkup)* (MULTI_NL\n\t//\t(\"subsection:\" name=ID \"[\" | \"subsection[\") title=TextOrMarkup \"]\" (MULTI_NL contents+=TextOrMarkup)* (MULTI_NL\n\t//\t(\"section3:\" name=ID \"[\" | \"section3[\") title=TextOrMarkup \"]\" (MULTI_NL contents+=TextOrMarkup)* (MULTI_NL\n\t//\t(\"section4:\" name=ID \"[\" | \"section4[\") title=TextOrMarkup \"]\" (MULTI_NL contents+=TextOrMarkup)*;\n\t//\t(ID | WS | SINGLE_NL | ANY_OTHER | \"\\\\[\" | \"\\\\]\")+;\n\t//\t\"emph[\" MULTI_NL? contents+=TextOrMarkup MULTI_NL? \"]\";\n\t//\t\"a[\" name=ID \"]\";\n\t//\t\"ref:\" ref=[Identifiable] \"[\" MULTI_NL? contents+=TextOrMarkup MULTI_NL? \"]\";\n\t//\t\"ol[\" (ANY_WS* items+=Item)+ ANY_WS* \"]\";\n\t//\t\"ul[\" (ANY_WS* items+=Item)+ ANY_WS* \"]\";\n\t//\t\"item[\" MULTI_NL? contents+=TextOrMarkup (MULTI_NL contents+=TextOrMarkup)* \"]\";\n\t//\t\"codeRef[\" element=[types::JvmIdentifyableElement|Text] \"]\";\n\t//\t\"link[\" url=Text \"]\" ANY_WS* \"[\" text=Text \"]\";\n\t//\t(\"img:\" ANY_WS* name=ID ANY_WS* \"[\" | \"img[\") path=Text / *TODO make it a crossreference to images * / \"]\" ANY_WS* \"[\"\n\t//\tclazz=Text \"]\" ANY_WS* \"[\" style=Text \"]\" ANY_WS* \"[\" caption=Text \"]\";\n\t//\t\"code[\" (ANY_WS* language=ID ANY_WS* \"]\" ANY_WS* \"[\")? (contents+=Code (contents+=MarkupInCode contents+=Code?)* |\n\t//\t(contents+=MarkupInCode contents+=Code?)+) \"]\";", "new_methods": [ { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cAlternatives_0;", "signature": "Alternatives getAlternatives_0()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cGroup_0_0;", "signature": "Group getGroup_0_0()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cChapterKeyword_0_0_0;", "signature": "Keyword getChapterKeyword_0_0_0()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cNameAssignment_0_0_1;", "signature": "Assignment getNameAssignment_0_0_1()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cNameIDTerminalRuleCall_0_0_1_0;", "signature": "RuleCall getNameIDTerminalRuleCall_0_0_1_0()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cLeftSquareBracketKeyword_0_0_2;", "signature": "Keyword getLeftSquareBracketKeyword_0_0_2()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cChapterKeyword_0_1;", "signature": "Keyword getChapterKeyword_0_1()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cTitleAssignment_1;", "signature": "Assignment getTitleAssignment_1()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cTitleTextOrMarkupParserRuleCall_1_0;", "signature": "RuleCall getTitleTextOrMarkupParserRuleCall_1_0()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cRightSquareBracketKeyword_2;", "signature": "Keyword getRightSquareBracketKeyword_2()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cGroup_3;", "signature": "Group getGroup_3()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cMULTI_NLTerminalRuleCall_3_0;", "signature": "RuleCall getMULTI_NLTerminalRuleCall_3_0()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cContentsAssignment_3_1;", "signature": "Assignment getContentsAssignment_3_1()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cContentsTextOrMarkupParserRuleCall_3_1_0;", "signature": "RuleCall getContentsTextOrMarkupParserRuleCall_3_1_0()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cGroup_4;", "signature": "Group getGroup_4()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cMULTI_NLTerminalRuleCall_4_0;", "signature": "RuleCall getMULTI_NLTerminalRuleCall_4_0()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cContentsAssignment_4_1;", "signature": "Assignment getContentsAssignment_4_1()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cContentsSectionParserRuleCall_4_1_0;", "signature": "RuleCall getContentsSectionParserRuleCall_4_1_0()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cAlternatives_0;", "signature": "Alternatives getAlternatives_0()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cGroup_0_0;", "signature": "Group getGroup_0_0()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cSectionKeyword_0_0_0;", "signature": "Keyword getSectionKeyword_0_0_0()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cNameAssignment_0_0_1;", "signature": "Assignment getNameAssignment_0_0_1()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cNameIDTerminalRuleCall_0_0_1_0;", "signature": "RuleCall getNameIDTerminalRuleCall_0_0_1_0()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cLeftSquareBracketKeyword_0_0_2;", "signature": "Keyword getLeftSquareBracketKeyword_0_0_2()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cSectionKeyword_0_1;", "signature": "Keyword getSectionKeyword_0_1()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cTitleAssignment_1;", "signature": "Assignment getTitleAssignment_1()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cTitleTextOrMarkupParserRuleCall_1_0;", "signature": "RuleCall getTitleTextOrMarkupParserRuleCall_1_0()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cRightSquareBracketKeyword_2;", "signature": "Keyword getRightSquareBracketKeyword_2()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cGroup_3;", "signature": "Group getGroup_3()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cMULTI_NLTerminalRuleCall_3_0;", "signature": "RuleCall getMULTI_NLTerminalRuleCall_3_0()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cContentsAssignment_3_1;", "signature": "Assignment getContentsAssignment_3_1()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cContentsTextOrMarkupParserRuleCall_3_1_0;", "signature": "RuleCall getContentsTextOrMarkupParserRuleCall_3_1_0()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cGroup_4;", "signature": "Group getGroup_4()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cMULTI_NLTerminalRuleCall_4_0;", "signature": "RuleCall getMULTI_NLTerminalRuleCall_4_0()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cContentsAssignment_4_1;", "signature": "Assignment getContentsAssignment_4_1()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cContentsSubSectionParserRuleCall_4_1_0;", "signature": "RuleCall getContentsSubSectionParserRuleCall_4_1_0()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cAlternatives_0;", "signature": "Alternatives getAlternatives_0()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cGroup_0_0;", "signature": "Group getGroup_0_0()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cSubsectionKeyword_0_0_0;", "signature": "Keyword getSubsectionKeyword_0_0_0()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cNameAssignment_0_0_1;", "signature": "Assignment getNameAssignment_0_0_1()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cNameIDTerminalRuleCall_0_0_1_0;", "signature": "RuleCall getNameIDTerminalRuleCall_0_0_1_0()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cLeftSquareBracketKeyword_0_0_2;", "signature": "Keyword getLeftSquareBracketKeyword_0_0_2()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cSubsectionKeyword_0_1;", "signature": "Keyword getSubsectionKeyword_0_1()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cTitleAssignment_1;", "signature": "Assignment getTitleAssignment_1()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cTitleTextOrMarkupParserRuleCall_1_0;", "signature": "RuleCall getTitleTextOrMarkupParserRuleCall_1_0()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cRightSquareBracketKeyword_2;", "signature": "Keyword getRightSquareBracketKeyword_2()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cGroup_3;", "signature": "Group getGroup_3()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cMULTI_NLTerminalRuleCall_3_0;", "signature": "RuleCall getMULTI_NLTerminalRuleCall_3_0()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cContentsAssignment_3_1;", "signature": "Assignment getContentsAssignment_3_1()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cContentsTextOrMarkupParserRuleCall_3_1_0;", "signature": "RuleCall getContentsTextOrMarkupParserRuleCall_3_1_0()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cGroup_4;", "signature": "Group getGroup_4()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cMULTI_NLTerminalRuleCall_4_0;", "signature": "RuleCall getMULTI_NLTerminalRuleCall_4_0()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cContentsAssignment_4_1;", "signature": "Assignment getContentsAssignment_4_1()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cContentsSection3ParserRuleCall_4_1_0;", "signature": "RuleCall getContentsSection3ParserRuleCall_4_1_0()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cAlternatives_0;", "signature": "Alternatives getAlternatives_0()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cGroup_0_0;", "signature": "Group getGroup_0_0()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cSection3Keyword_0_0_0;", "signature": "Keyword getSection3Keyword_0_0_0()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cNameAssignment_0_0_1;", "signature": "Assignment getNameAssignment_0_0_1()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cNameIDTerminalRuleCall_0_0_1_0;", "signature": "RuleCall getNameIDTerminalRuleCall_0_0_1_0()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cLeftSquareBracketKeyword_0_0_2;", "signature": "Keyword getLeftSquareBracketKeyword_0_0_2()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cSection3Keyword_0_1;", "signature": "Keyword getSection3Keyword_0_1()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cTitleAssignment_1;", "signature": "Assignment getTitleAssignment_1()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cTitleTextOrMarkupParserRuleCall_1_0;", "signature": "RuleCall getTitleTextOrMarkupParserRuleCall_1_0()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cRightSquareBracketKeyword_2;", "signature": "Keyword getRightSquareBracketKeyword_2()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cGroup_3;", "signature": "Group getGroup_3()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cMULTI_NLTerminalRuleCall_3_0;", "signature": "RuleCall getMULTI_NLTerminalRuleCall_3_0()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cContentsAssignment_3_1;", "signature": "Assignment getContentsAssignment_3_1()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cContentsTextOrMarkupParserRuleCall_3_1_0;", "signature": "RuleCall getContentsTextOrMarkupParserRuleCall_3_1_0()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cGroup_4;", "signature": "Group getGroup_4()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cMULTI_NLTerminalRuleCall_4_0;", "signature": "RuleCall getMULTI_NLTerminalRuleCall_4_0()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cContentsAssignment_4_1;", "signature": "Assignment getContentsAssignment_4_1()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cContentsSection4ParserRuleCall_4_1_0;", "signature": "RuleCall getContentsSection4ParserRuleCall_4_1_0()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cAlternatives_0;", "signature": "Alternatives getAlternatives_0()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cGroup_0_0;", "signature": "Group getGroup_0_0()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cSection4Keyword_0_0_0;", "signature": "Keyword getSection4Keyword_0_0_0()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cNameAssignment_0_0_1;", "signature": "Assignment getNameAssignment_0_0_1()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cNameIDTerminalRuleCall_0_0_1_0;", "signature": "RuleCall getNameIDTerminalRuleCall_0_0_1_0()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cLeftSquareBracketKeyword_0_0_2;", "signature": "Keyword getLeftSquareBracketKeyword_0_0_2()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cSection4Keyword_0_1;", "signature": "Keyword getSection4Keyword_0_1()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cTitleAssignment_1;", "signature": "Assignment getTitleAssignment_1()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cTitleTextOrMarkupParserRuleCall_1_0;", "signature": "RuleCall getTitleTextOrMarkupParserRuleCall_1_0()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cRightSquareBracketKeyword_2;", "signature": "Keyword getRightSquareBracketKeyword_2()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cGroup_3;", "signature": "Group getGroup_3()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cMULTI_NLTerminalRuleCall_3_0;", "signature": "RuleCall getMULTI_NLTerminalRuleCall_3_0()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cContentsAssignment_3_1;", "signature": "Assignment getContentsAssignment_3_1()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cContentsTextOrMarkupParserRuleCall_3_1_0;", "signature": "RuleCall getContentsTextOrMarkupParserRuleCall_3_1_0()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cMULTI_NLTerminalRuleCall_1;", "signature": "RuleCall getMULTI_NLTerminalRuleCall_1()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cContentsAssignment_2;", "signature": "Assignment getContentsAssignment_2()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cContentsTextOrMarkupParserRuleCall_2_0;", "signature": "RuleCall getContentsTextOrMarkupParserRuleCall_2_0()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cMULTI_NLTerminalRuleCall_3;", "signature": "RuleCall getMULTI_NLTerminalRuleCall_3()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cRightSquareBracketKeyword_4;", "signature": "Keyword getRightSquareBracketKeyword_4()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cNameAssignment_1;", "signature": "Assignment getNameAssignment_1()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cNameIDTerminalRuleCall_1_0;", "signature": "RuleCall getNameIDTerminalRuleCall_1_0()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cRightSquareBracketKeyword_2;", "signature": "Keyword getRightSquareBracketKeyword_2()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cRefAssignment_1;", "signature": "Assignment getRefAssignment_1()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cRefIdentifiableCrossReference_1_0;", "signature": "CrossReference getRefIdentifiableCrossReference_1_0()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cRefIdentifiableIDTerminalRuleCall_1_0_1;", "signature": "RuleCall getRefIdentifiableIDTerminalRuleCall_1_0_1()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cLeftSquareBracketKeyword_2;", "signature": "Keyword getLeftSquareBracketKeyword_2()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cMULTI_NLTerminalRuleCall_3;", "signature": "RuleCall getMULTI_NLTerminalRuleCall_3()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cContentsAssignment_4;", "signature": "Assignment getContentsAssignment_4()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cContentsTextOrMarkupParserRuleCall_4_0;", "signature": "RuleCall getContentsTextOrMarkupParserRuleCall_4_0()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cMULTI_NLTerminalRuleCall_5;", "signature": "RuleCall getMULTI_NLTerminalRuleCall_5()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cRightSquareBracketKeyword_6;", "signature": "Keyword getRightSquareBracketKeyword_6()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cGroup_1;", "signature": "Group getGroup_1()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cANY_WSParserRuleCall_1_0;", "signature": "RuleCall getANY_WSParserRuleCall_1_0()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cItemsAssignment_1_1;", "signature": "Assignment getItemsAssignment_1_1()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cItemsItemParserRuleCall_1_1_0;", "signature": "RuleCall getItemsItemParserRuleCall_1_1_0()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cANY_WSParserRuleCall_2;", "signature": "RuleCall getANY_WSParserRuleCall_2()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cRightSquareBracketKeyword_3;", "signature": "Keyword getRightSquareBracketKeyword_3()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cGroup_1;", "signature": "Group getGroup_1()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cANY_WSParserRuleCall_1_0;", "signature": "RuleCall getANY_WSParserRuleCall_1_0()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cItemsAssignment_1_1;", "signature": "Assignment getItemsAssignment_1_1()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cItemsItemParserRuleCall_1_1_0;", "signature": "RuleCall getItemsItemParserRuleCall_1_1_0()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cANY_WSParserRuleCall_2;", "signature": "RuleCall getANY_WSParserRuleCall_2()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cRightSquareBracketKeyword_3;", "signature": "Keyword getRightSquareBracketKeyword_3()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cMULTI_NLTerminalRuleCall_1;", "signature": "RuleCall getMULTI_NLTerminalRuleCall_1()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cContentsAssignment_2;", "signature": "Assignment getContentsAssignment_2()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cContentsTextOrMarkupParserRuleCall_2_0;", "signature": "RuleCall getContentsTextOrMarkupParserRuleCall_2_0()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cGroup_3;", "signature": "Group getGroup_3()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cMULTI_NLTerminalRuleCall_3_0;", "signature": "RuleCall getMULTI_NLTerminalRuleCall_3_0()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cContentsAssignment_3_1;", "signature": "Assignment getContentsAssignment_3_1()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cContentsTextOrMarkupParserRuleCall_3_1_0;", "signature": "RuleCall getContentsTextOrMarkupParserRuleCall_3_1_0()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cRightSquareBracketKeyword_4;", "signature": "Keyword getRightSquareBracketKeyword_4()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cElementAssignment_1;", "signature": "Assignment getElementAssignment_1()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cElementJvmIdentifyableElementCrossReference_1_0;", "signature": "CrossReference getElementJvmIdentifyableElementCrossReference_1_0()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cElementJvmIdentifyableElementTextParserRuleCall_1_0_1;", "signature": "RuleCall getElementJvmIdentifyableElementTextParserRuleCall_1_0_1()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cRightSquareBracketKeyword_2;", "signature": "Keyword getRightSquareBracketKeyword_2()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cUrlAssignment_1;", "signature": "Assignment getUrlAssignment_1()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cUrlTextParserRuleCall_1_0;", "signature": "RuleCall getUrlTextParserRuleCall_1_0()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cRightSquareBracketKeyword_2;", "signature": "Keyword getRightSquareBracketKeyword_2()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cANY_WSParserRuleCall_3;", "signature": "RuleCall getANY_WSParserRuleCall_3()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cLeftSquareBracketKeyword_4;", "signature": "Keyword getLeftSquareBracketKeyword_4()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cTextAssignment_5;", "signature": "Assignment getTextAssignment_5()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cTextTextParserRuleCall_5_0;", "signature": "RuleCall getTextTextParserRuleCall_5_0()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cRightSquareBracketKeyword_6;", "signature": "Keyword getRightSquareBracketKeyword_6()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cAlternatives_0;", "signature": "Alternatives getAlternatives_0()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cGroup_0_0;", "signature": "Group getGroup_0_0()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cImgKeyword_0_0_0;", "signature": "Keyword getImgKeyword_0_0_0()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cANY_WSParserRuleCall_0_0_1;", "signature": "RuleCall getANY_WSParserRuleCall_0_0_1()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cNameAssignment_0_0_2;", "signature": "Assignment getNameAssignment_0_0_2()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cNameIDTerminalRuleCall_0_0_2_0;", "signature": "RuleCall getNameIDTerminalRuleCall_0_0_2_0()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cANY_WSParserRuleCall_0_0_3;", "signature": "RuleCall getANY_WSParserRuleCall_0_0_3()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cLeftSquareBracketKeyword_0_0_4;", "signature": "Keyword getLeftSquareBracketKeyword_0_0_4()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cImgKeyword_0_1;", "signature": "Keyword getImgKeyword_0_1()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cPathAssignment_1;", "signature": "Assignment getPathAssignment_1()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cPathTextParserRuleCall_1_0;", "signature": "RuleCall getPathTextParserRuleCall_1_0()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cRightSquareBracketKeyword_2;", "signature": "Keyword getRightSquareBracketKeyword_2()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cANY_WSParserRuleCall_3;", "signature": "RuleCall getANY_WSParserRuleCall_3()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cLeftSquareBracketKeyword_4;", "signature": "Keyword getLeftSquareBracketKeyword_4()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cClazzAssignment_5;", "signature": "Assignment getClazzAssignment_5()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cClazzTextParserRuleCall_5_0;", "signature": "RuleCall getClazzTextParserRuleCall_5_0()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cRightSquareBracketKeyword_6;", "signature": "Keyword getRightSquareBracketKeyword_6()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cANY_WSParserRuleCall_7;", "signature": "RuleCall getANY_WSParserRuleCall_7()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cLeftSquareBracketKeyword_8;", "signature": "Keyword getLeftSquareBracketKeyword_8()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cStyleAssignment_9;", "signature": "Assignment getStyleAssignment_9()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cStyleTextParserRuleCall_9_0;", "signature": "RuleCall getStyleTextParserRuleCall_9_0()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cRightSquareBracketKeyword_10;", "signature": "Keyword getRightSquareBracketKeyword_10()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cANY_WSParserRuleCall_11;", "signature": "RuleCall getANY_WSParserRuleCall_11()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cLeftSquareBracketKeyword_12;", "signature": "Keyword getLeftSquareBracketKeyword_12()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cCaptionAssignment_13;", "signature": "Assignment getCaptionAssignment_13()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cCaptionTextParserRuleCall_13_0;", "signature": "RuleCall getCaptionTextParserRuleCall_13_0()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cRightSquareBracketKeyword_14;", "signature": "Keyword getRightSquareBracketKeyword_14()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cGroup_1;", "signature": "Group getGroup_1()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cANY_WSParserRuleCall_1_0;", "signature": "RuleCall getANY_WSParserRuleCall_1_0()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cLanguageAssignment_1_1;", "signature": "Assignment getLanguageAssignment_1_1()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cLanguageIDTerminalRuleCall_1_1_0;", "signature": "RuleCall getLanguageIDTerminalRuleCall_1_1_0()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cANY_WSParserRuleCall_1_2;", "signature": "RuleCall getANY_WSParserRuleCall_1_2()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cRightSquareBracketKeyword_1_3;", "signature": "Keyword getRightSquareBracketKeyword_1_3()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cANY_WSParserRuleCall_1_4;", "signature": "RuleCall getANY_WSParserRuleCall_1_4()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cLeftSquareBracketKeyword_1_5;", "signature": "Keyword getLeftSquareBracketKeyword_1_5()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cAlternatives_2;", "signature": "Alternatives getAlternatives_2()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cGroup_2_0;", "signature": "Group getGroup_2_0()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cContentsAssignment_2_0_0;", "signature": "Assignment getContentsAssignment_2_0_0()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cContentsCodeParserRuleCall_2_0_0_0;", "signature": "RuleCall getContentsCodeParserRuleCall_2_0_0_0()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cGroup_2_0_1;", "signature": "Group getGroup_2_0_1()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cContentsAssignment_2_0_1_0;", "signature": "Assignment getContentsAssignment_2_0_1_0()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cContentsMarkupInCodeParserRuleCall_2_0_1_0_0;", "signature": "RuleCall getContentsMarkupInCodeParserRuleCall_2_0_1_0_0()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cContentsAssignment_2_0_1_1;", "signature": "Assignment getContentsAssignment_2_0_1_1()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cContentsCodeParserRuleCall_2_0_1_1_0;", "signature": "RuleCall getContentsCodeParserRuleCall_2_0_1_1_0()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cGroup_2_1;", "signature": "Group getGroup_2_1()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cContentsAssignment_2_1_0;", "signature": "Assignment getContentsAssignment_2_1_0()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cContentsMarkupInCodeParserRuleCall_2_1_0_0;", "signature": "RuleCall getContentsMarkupInCodeParserRuleCall_2_1_0_0()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cContentsAssignment_2_1_1;", "signature": "Assignment getContentsAssignment_2_1_1()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cContentsCodeParserRuleCall_2_1_1_0;", "signature": "RuleCall getContentsCodeParserRuleCall_2_1_1_0()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cRightSquareBracketKeyword_3;", "signature": "Keyword getRightSquareBracketKeyword_3()" } ], "old_code": "\t\tprivate final Keyword cChapterKeyword_0 = (Keyword)cGroup.eContents().get(0);\n\t\tprivate final Group cGroup_1 = (Group)cGroup.eContents().get(1);\n\t\tprivate final Keyword cColonKeyword_1_0 = (Keyword)cGroup_1.eContents().get(0);\n\t\tprivate final Assignment cNameAssignment_1_1 = (Assignment)cGroup_1.eContents().get(1);\n\t\tprivate final RuleCall cNameIDTerminalRuleCall_1_1_0 = (RuleCall)cNameAssignment_1_1.eContents().get(0);\n\t\tprivate final Keyword cLeftSquareBracketKeyword_2 = (Keyword)cGroup.eContents().get(2);\n\t\tprivate final Assignment cTitleAssignment_3 = (Assignment)cGroup.eContents().get(3);\n\t\tprivate final RuleCall cTitleTextOrMarkupParserRuleCall_3_0 = (RuleCall)cTitleAssignment_3.eContents().get(0);\n\t\tprivate final Keyword cRightSquareBracketKeyword_4 = (Keyword)cGroup.eContents().get(4);\n\t\tprivate final Group cGroup_5 = (Group)cGroup.eContents().get(5);\n\t\tprivate final RuleCall cMULTI_NLTerminalRuleCall_5_0 = (RuleCall)cGroup_5.eContents().get(0);\n\t\tprivate final Assignment cContentsAssignment_5_1 = (Assignment)cGroup_5.eContents().get(1);\n\t\tprivate final RuleCall cContentsTextOrMarkupParserRuleCall_5_1_0 = (RuleCall)cContentsAssignment_5_1.eContents().get(0);\n\t\tprivate final Group cGroup_6 = (Group)cGroup.eContents().get(6);\n\t\tprivate final RuleCall cMULTI_NLTerminalRuleCall_6_0 = (RuleCall)cGroup_6.eContents().get(0);\n\t\tprivate final Assignment cContentsAssignment_6_1 = (Assignment)cGroup_6.eContents().get(1);\n\t\tprivate final RuleCall cContentsSectionParserRuleCall_6_1_0 = (RuleCall)cContentsAssignment_6_1.eContents().get(0);\n\t\t//\t\"\\\\chapter\" (\":\" name=ID)? \"[\" title=TextOrMarkup \"]\" (MULTI_NL contents+=TextOrMarkup)* (MULTI_NL\n\t\t//\"\\\\chapter\" (\":\" name=ID)? \"[\" title=TextOrMarkup \"]\" (MULTI_NL contents+=TextOrMarkup)* (MULTI_NL contents+=Section)*\n\t\t//\"\\\\chapter\"\n\t\tpublic Keyword getChapterKeyword_0() { return cChapterKeyword_0; }\n\t\t//(\":\" name=ID)?\n\t\tpublic Group getGroup_1() { return cGroup_1; }\n\t\t//\":\"\n\t\tpublic Keyword getColonKeyword_1_0() { return cColonKeyword_1_0; }\n\t\tpublic Assignment getNameAssignment_1_1() { return cNameAssignment_1_1; }\n\t\tpublic RuleCall getNameIDTerminalRuleCall_1_1_0() { return cNameIDTerminalRuleCall_1_1_0; }\n\t\tpublic Keyword getLeftSquareBracketKeyword_2() { return cLeftSquareBracketKeyword_2; }\n\t\tpublic Assignment getTitleAssignment_3() { return cTitleAssignment_3; }\n\t\tpublic RuleCall getTitleTextOrMarkupParserRuleCall_3_0() { return cTitleTextOrMarkupParserRuleCall_3_0; }\n\t\tpublic Keyword getRightSquareBracketKeyword_4() { return cRightSquareBracketKeyword_4; }\n\t\tpublic Group getGroup_5() { return cGroup_5; }\n\t\tpublic RuleCall getMULTI_NLTerminalRuleCall_5_0() { return cMULTI_NLTerminalRuleCall_5_0; }\n\t\tpublic Assignment getContentsAssignment_5_1() { return cContentsAssignment_5_1; }\n\t\tpublic RuleCall getContentsTextOrMarkupParserRuleCall_5_1_0() { return cContentsTextOrMarkupParserRuleCall_5_1_0; }\n\t\tpublic Group getGroup_6() { return cGroup_6; }\n\t\tpublic RuleCall getMULTI_NLTerminalRuleCall_6_0() { return cMULTI_NLTerminalRuleCall_6_0; }\n\t\tpublic Assignment getContentsAssignment_6_1() { return cContentsAssignment_6_1; }\n\t\tpublic RuleCall getContentsSectionParserRuleCall_6_1_0() { return cContentsSectionParserRuleCall_6_1_0; }\n\t\tprivate final Keyword cSectionKeyword_0 = (Keyword)cGroup.eContents().get(0);\n\t\tprivate final Group cGroup_1 = (Group)cGroup.eContents().get(1);\n\t\tprivate final Keyword cColonKeyword_1_0 = (Keyword)cGroup_1.eContents().get(0);\n\t\tprivate final Assignment cNameAssignment_1_1 = (Assignment)cGroup_1.eContents().get(1);\n\t\tprivate final RuleCall cNameIDTerminalRuleCall_1_1_0 = (RuleCall)cNameAssignment_1_1.eContents().get(0);\n\t\tprivate final Keyword cLeftSquareBracketKeyword_2 = (Keyword)cGroup.eContents().get(2);\n\t\tprivate final Assignment cTitleAssignment_3 = (Assignment)cGroup.eContents().get(3);\n\t\tprivate final RuleCall cTitleTextOrMarkupParserRuleCall_3_0 = (RuleCall)cTitleAssignment_3.eContents().get(0);\n\t\tprivate final Keyword cRightSquareBracketKeyword_4 = (Keyword)cGroup.eContents().get(4);\n\t\tprivate final Group cGroup_5 = (Group)cGroup.eContents().get(5);\n\t\tprivate final RuleCall cMULTI_NLTerminalRuleCall_5_0 = (RuleCall)cGroup_5.eContents().get(0);\n\t\tprivate final Assignment cContentsAssignment_5_1 = (Assignment)cGroup_5.eContents().get(1);\n\t\tprivate final RuleCall cContentsTextOrMarkupParserRuleCall_5_1_0 = (RuleCall)cContentsAssignment_5_1.eContents().get(0);\n\t\tprivate final Group cGroup_6 = (Group)cGroup.eContents().get(6);\n\t\tprivate final RuleCall cMULTI_NLTerminalRuleCall_6_0 = (RuleCall)cGroup_6.eContents().get(0);\n\t\tprivate final Assignment cContentsAssignment_6_1 = (Assignment)cGroup_6.eContents().get(1);\n\t\tprivate final RuleCall cContentsSubSectionParserRuleCall_6_1_0 = (RuleCall)cContentsAssignment_6_1.eContents().get(0);\n\t\t//\t\"\\\\section\" (\":\" name=ID)? \"[\" title=TextOrMarkup \"]\" (MULTI_NL contents+=TextOrMarkup)* (MULTI_NL\n\t\t//\"\\\\section\" (\":\" name=ID)? \"[\" title=TextOrMarkup \"]\" (MULTI_NL contents+=TextOrMarkup)* (MULTI_NL\n\t\t//\"\\\\section\"\n\t\tpublic Keyword getSectionKeyword_0() { return cSectionKeyword_0; }\n\t\t//(\":\" name=ID)?\n\t\tpublic Group getGroup_1() { return cGroup_1; }\n\t\t//\":\"\n\t\tpublic Keyword getColonKeyword_1_0() { return cColonKeyword_1_0; }\n\t\tpublic Assignment getNameAssignment_1_1() { return cNameAssignment_1_1; }\n\t\tpublic RuleCall getNameIDTerminalRuleCall_1_1_0() { return cNameIDTerminalRuleCall_1_1_0; }\n\t\tpublic Keyword getLeftSquareBracketKeyword_2() { return cLeftSquareBracketKeyword_2; }\n\t\tpublic Assignment getTitleAssignment_3() { return cTitleAssignment_3; }\n\t\tpublic RuleCall getTitleTextOrMarkupParserRuleCall_3_0() { return cTitleTextOrMarkupParserRuleCall_3_0; }\n\t\tpublic Keyword getRightSquareBracketKeyword_4() { return cRightSquareBracketKeyword_4; }\n\t\tpublic Group getGroup_5() { return cGroup_5; }\n\t\tpublic RuleCall getMULTI_NLTerminalRuleCall_5_0() { return cMULTI_NLTerminalRuleCall_5_0; }\n\t\tpublic Assignment getContentsAssignment_5_1() { return cContentsAssignment_5_1; }\n\t\tpublic RuleCall getContentsTextOrMarkupParserRuleCall_5_1_0() { return cContentsTextOrMarkupParserRuleCall_5_1_0; }\n\t\tpublic Group getGroup_6() { return cGroup_6; }\n\t\tpublic RuleCall getMULTI_NLTerminalRuleCall_6_0() { return cMULTI_NLTerminalRuleCall_6_0; }\n\t\tpublic Assignment getContentsAssignment_6_1() { return cContentsAssignment_6_1; }\n\t\tpublic RuleCall getContentsSubSectionParserRuleCall_6_1_0() { return cContentsSubSectionParserRuleCall_6_1_0; }\n\t\tprivate final Keyword cSubsectionKeyword_0 = (Keyword)cGroup.eContents().get(0);\n\t\tprivate final Group cGroup_1 = (Group)cGroup.eContents().get(1);\n\t\tprivate final Keyword cColonKeyword_1_0 = (Keyword)cGroup_1.eContents().get(0);\n\t\tprivate final Assignment cNameAssignment_1_1 = (Assignment)cGroup_1.eContents().get(1);\n\t\tprivate final RuleCall cNameIDTerminalRuleCall_1_1_0 = (RuleCall)cNameAssignment_1_1.eContents().get(0);\n\t\tprivate final Keyword cLeftSquareBracketKeyword_2 = (Keyword)cGroup.eContents().get(2);\n\t\tprivate final Assignment cTitleAssignment_3 = (Assignment)cGroup.eContents().get(3);\n\t\tprivate final RuleCall cTitleTextOrMarkupParserRuleCall_3_0 = (RuleCall)cTitleAssignment_3.eContents().get(0);\n\t\tprivate final Keyword cRightSquareBracketKeyword_4 = (Keyword)cGroup.eContents().get(4);\n\t\tprivate final Group cGroup_5 = (Group)cGroup.eContents().get(5);\n\t\tprivate final RuleCall cMULTI_NLTerminalRuleCall_5_0 = (RuleCall)cGroup_5.eContents().get(0);\n\t\tprivate final Assignment cContentsAssignment_5_1 = (Assignment)cGroup_5.eContents().get(1);\n\t\tprivate final RuleCall cContentsTextOrMarkupParserRuleCall_5_1_0 = (RuleCall)cContentsAssignment_5_1.eContents().get(0);\n\t\tprivate final Group cGroup_6 = (Group)cGroup.eContents().get(6);\n\t\tprivate final RuleCall cMULTI_NLTerminalRuleCall_6_0 = (RuleCall)cGroup_6.eContents().get(0);\n\t\tprivate final Assignment cContentsAssignment_6_1 = (Assignment)cGroup_6.eContents().get(1);\n\t\tprivate final RuleCall cContentsSection3ParserRuleCall_6_1_0 = (RuleCall)cContentsAssignment_6_1.eContents().get(0);\n\t\t//\t\"\\\\subsection\" (\":\" name=ID)? \"[\" title=TextOrMarkup \"]\" (MULTI_NL contents+=TextOrMarkup)* (MULTI_NL\n\t\t//\"\\\\subsection\" (\":\" name=ID)? \"[\" title=TextOrMarkup \"]\" (MULTI_NL contents+=TextOrMarkup)* (MULTI_NL\n\t\t//\"\\\\subsection\"\n\t\tpublic Keyword getSubsectionKeyword_0() { return cSubsectionKeyword_0; }\n\t\t//(\":\" name=ID)?\n\t\tpublic Group getGroup_1() { return cGroup_1; }\n\t\t//\":\"\n\t\tpublic Keyword getColonKeyword_1_0() { return cColonKeyword_1_0; }\n\t\tpublic Assignment getNameAssignment_1_1() { return cNameAssignment_1_1; }\n\t\tpublic RuleCall getNameIDTerminalRuleCall_1_1_0() { return cNameIDTerminalRuleCall_1_1_0; }\n\t\tpublic Keyword getLeftSquareBracketKeyword_2() { return cLeftSquareBracketKeyword_2; }\n\t\tpublic Assignment getTitleAssignment_3() { return cTitleAssignment_3; }\n\t\tpublic RuleCall getTitleTextOrMarkupParserRuleCall_3_0() { return cTitleTextOrMarkupParserRuleCall_3_0; }\n\t\tpublic Keyword getRightSquareBracketKeyword_4() { return cRightSquareBracketKeyword_4; }\n\t\tpublic Group getGroup_5() { return cGroup_5; }\n\t\tpublic RuleCall getMULTI_NLTerminalRuleCall_5_0() { return cMULTI_NLTerminalRuleCall_5_0; }\n\t\tpublic Assignment getContentsAssignment_5_1() { return cContentsAssignment_5_1; }\n\t\tpublic RuleCall getContentsTextOrMarkupParserRuleCall_5_1_0() { return cContentsTextOrMarkupParserRuleCall_5_1_0; }\n\t\tpublic Group getGroup_6() { return cGroup_6; }\n\t\tpublic RuleCall getMULTI_NLTerminalRuleCall_6_0() { return cMULTI_NLTerminalRuleCall_6_0; }\n\t\tpublic Assignment getContentsAssignment_6_1() { return cContentsAssignment_6_1; }\n\t\tpublic RuleCall getContentsSection3ParserRuleCall_6_1_0() { return cContentsSection3ParserRuleCall_6_1_0; }\n\t\tprivate final Keyword cSection3Keyword_0 = (Keyword)cGroup.eContents().get(0);\n\t\tprivate final Group cGroup_1 = (Group)cGroup.eContents().get(1);\n\t\tprivate final Keyword cColonKeyword_1_0 = (Keyword)cGroup_1.eContents().get(0);\n\t\tprivate final Assignment cNameAssignment_1_1 = (Assignment)cGroup_1.eContents().get(1);\n\t\tprivate final RuleCall cNameIDTerminalRuleCall_1_1_0 = (RuleCall)cNameAssignment_1_1.eContents().get(0);\n\t\tprivate final Keyword cLeftSquareBracketKeyword_2 = (Keyword)cGroup.eContents().get(2);\n\t\tprivate final Assignment cTitleAssignment_3 = (Assignment)cGroup.eContents().get(3);\n\t\tprivate final RuleCall cTitleTextOrMarkupParserRuleCall_3_0 = (RuleCall)cTitleAssignment_3.eContents().get(0);\n\t\tprivate final Keyword cRightSquareBracketKeyword_4 = (Keyword)cGroup.eContents().get(4);\n\t\tprivate final Group cGroup_5 = (Group)cGroup.eContents().get(5);\n\t\tprivate final RuleCall cMULTI_NLTerminalRuleCall_5_0 = (RuleCall)cGroup_5.eContents().get(0);\n\t\tprivate final Assignment cContentsAssignment_5_1 = (Assignment)cGroup_5.eContents().get(1);\n\t\tprivate final RuleCall cContentsTextOrMarkupParserRuleCall_5_1_0 = (RuleCall)cContentsAssignment_5_1.eContents().get(0);\n\t\tprivate final Group cGroup_6 = (Group)cGroup.eContents().get(6);\n\t\tprivate final RuleCall cMULTI_NLTerminalRuleCall_6_0 = (RuleCall)cGroup_6.eContents().get(0);\n\t\tprivate final Assignment cContentsAssignment_6_1 = (Assignment)cGroup_6.eContents().get(1);\n\t\tprivate final RuleCall cContentsSection4ParserRuleCall_6_1_0 = (RuleCall)cContentsAssignment_6_1.eContents().get(0);\n\t\t//\t\"\\\\section3\" (\":\" name=ID)? \"[\" title=TextOrMarkup \"]\" (MULTI_NL contents+=TextOrMarkup)* (MULTI_NL\n\t\t//\"\\\\section3\" (\":\" name=ID)? \"[\" title=TextOrMarkup \"]\" (MULTI_NL contents+=TextOrMarkup)* (MULTI_NL contents+=Section4)*\n\t\t//\"\\\\section3\"\n\t\tpublic Keyword getSection3Keyword_0() { return cSection3Keyword_0; }\n\t\t//(\":\" name=ID)?\n\t\tpublic Group getGroup_1() { return cGroup_1; }\n\t\t//\":\"\n\t\tpublic Keyword getColonKeyword_1_0() { return cColonKeyword_1_0; }\n\t\tpublic Assignment getNameAssignment_1_1() { return cNameAssignment_1_1; }\n\t\tpublic RuleCall getNameIDTerminalRuleCall_1_1_0() { return cNameIDTerminalRuleCall_1_1_0; }\n\t\tpublic Keyword getLeftSquareBracketKeyword_2() { return cLeftSquareBracketKeyword_2; }\n\t\tpublic Assignment getTitleAssignment_3() { return cTitleAssignment_3; }\n\t\tpublic RuleCall getTitleTextOrMarkupParserRuleCall_3_0() { return cTitleTextOrMarkupParserRuleCall_3_0; }\n\t\tpublic Keyword getRightSquareBracketKeyword_4() { return cRightSquareBracketKeyword_4; }\n\t\tpublic Group getGroup_5() { return cGroup_5; }\n\t\tpublic RuleCall getMULTI_NLTerminalRuleCall_5_0() { return cMULTI_NLTerminalRuleCall_5_0; }\n\t\tpublic Assignment getContentsAssignment_5_1() { return cContentsAssignment_5_1; }\n\t\tpublic RuleCall getContentsTextOrMarkupParserRuleCall_5_1_0() { return cContentsTextOrMarkupParserRuleCall_5_1_0; }\n\t\tpublic Group getGroup_6() { return cGroup_6; }\n\t\tpublic RuleCall getMULTI_NLTerminalRuleCall_6_0() { return cMULTI_NLTerminalRuleCall_6_0; }\n\t\tpublic Assignment getContentsAssignment_6_1() { return cContentsAssignment_6_1; }\n\t\tpublic RuleCall getContentsSection4ParserRuleCall_6_1_0() { return cContentsSection4ParserRuleCall_6_1_0; }\n\t\tprivate final Keyword cSection4Keyword_0 = (Keyword)cGroup.eContents().get(0);\n\t\tprivate final Group cGroup_1 = (Group)cGroup.eContents().get(1);\n\t\tprivate final Keyword cColonKeyword_1_0 = (Keyword)cGroup_1.eContents().get(0);\n\t\tprivate final Assignment cNameAssignment_1_1 = (Assignment)cGroup_1.eContents().get(1);\n\t\tprivate final RuleCall cNameIDTerminalRuleCall_1_1_0 = (RuleCall)cNameAssignment_1_1.eContents().get(0);\n\t\tprivate final Keyword cLeftSquareBracketKeyword_2 = (Keyword)cGroup.eContents().get(2);\n\t\tprivate final Assignment cTitleAssignment_3 = (Assignment)cGroup.eContents().get(3);\n\t\tprivate final RuleCall cTitleTextOrMarkupParserRuleCall_3_0 = (RuleCall)cTitleAssignment_3.eContents().get(0);\n\t\tprivate final Keyword cRightSquareBracketKeyword_4 = (Keyword)cGroup.eContents().get(4);\n\t\tprivate final Group cGroup_5 = (Group)cGroup.eContents().get(5);\n\t\tprivate final RuleCall cMULTI_NLTerminalRuleCall_5_0 = (RuleCall)cGroup_5.eContents().get(0);\n\t\tprivate final Assignment cContentsAssignment_5_1 = (Assignment)cGroup_5.eContents().get(1);\n\t\tprivate final RuleCall cContentsTextOrMarkupParserRuleCall_5_1_0 = (RuleCall)cContentsAssignment_5_1.eContents().get(0);\n\t\t//\t\"\\\\section4\" (\":\" name=ID)? \"[\" title=TextOrMarkup \"]\" (MULTI_NL contents+=TextOrMarkup)*;\n\t\t//\"\\\\section4\" (\":\" name=ID)? \"[\" title=TextOrMarkup \"]\" (MULTI_NL contents+=TextOrMarkup)*\n\t\t//\"\\\\section4\"\n\t\tpublic Keyword getSection4Keyword_0() { return cSection4Keyword_0; }\n\t\t//(\":\" name=ID)?\n\t\tpublic Group getGroup_1() { return cGroup_1; }\n\t\t//\":\"\n\t\tpublic Keyword getColonKeyword_1_0() { return cColonKeyword_1_0; }\n\t\tpublic Assignment getNameAssignment_1_1() { return cNameAssignment_1_1; }\n\t\tpublic RuleCall getNameIDTerminalRuleCall_1_1_0() { return cNameIDTerminalRuleCall_1_1_0; }\n\t\tpublic Keyword getLeftSquareBracketKeyword_2() { return cLeftSquareBracketKeyword_2; }\n\t\tpublic Assignment getTitleAssignment_3() { return cTitleAssignment_3; }\n\t\tpublic RuleCall getTitleTextOrMarkupParserRuleCall_3_0() { return cTitleTextOrMarkupParserRuleCall_3_0; }\n\t\tpublic Keyword getRightSquareBracketKeyword_4() { return cRightSquareBracketKeyword_4; }\n\t\tpublic Group getGroup_5() { return cGroup_5; }\n\t\tpublic RuleCall getMULTI_NLTerminalRuleCall_5_0() { return cMULTI_NLTerminalRuleCall_5_0; }\n\t\tpublic Assignment getContentsAssignment_5_1() { return cContentsAssignment_5_1; }\n\t\tpublic RuleCall getContentsTextOrMarkupParserRuleCall_5_1_0() { return cContentsTextOrMarkupParserRuleCall_5_1_0; }\n\t\tprivate final Keyword cColonKeyword_6 = (Keyword)cAlternatives.eContents().get(6);\n\t\t//\t(ID | WS | SINGLE_NL | ANY_OTHER | \"\\\\[\" | \"\\\\]\" | \":\")+;\n\t\t//(ID | WS | SINGLE_NL | ANY_OTHER | \"\\\\[\" | \"\\\\]\" | \":\")+\n\n\t\t//\":\"\n\t\tpublic Keyword getColonKeyword_6() { return cColonKeyword_6; }\n\t\tprivate final Keyword cLeftSquareBracketKeyword_1 = (Keyword)cGroup.eContents().get(1);\n\t\tprivate final RuleCall cMULTI_NLTerminalRuleCall_2 = (RuleCall)cGroup.eContents().get(2);\n\t\tprivate final Assignment cContentsAssignment_3 = (Assignment)cGroup.eContents().get(3);\n\t\tprivate final RuleCall cContentsTextOrMarkupParserRuleCall_3_0 = (RuleCall)cContentsAssignment_3.eContents().get(0);\n\t\tprivate final RuleCall cMULTI_NLTerminalRuleCall_4 = (RuleCall)cGroup.eContents().get(4);\n\t\tprivate final Keyword cRightSquareBracketKeyword_5 = (Keyword)cGroup.eContents().get(5);\n\t\t//\t\"\\\\emph\" \"[\" MULTI_NL? contents+=TextOrMarkup MULTI_NL? \"]\";\n\t\t//\"\\\\emph\" \"[\" MULTI_NL? contents+=TextOrMarkup MULTI_NL? \"]\"\n\t\t//\"\\\\emph\"\n\t\t//\"[\"\n\t\tpublic Keyword getLeftSquareBracketKeyword_1() { return cLeftSquareBracketKeyword_1; }\n\n\t\tpublic RuleCall getMULTI_NLTerminalRuleCall_2() { return cMULTI_NLTerminalRuleCall_2; }\n\t\tpublic Assignment getContentsAssignment_3() { return cContentsAssignment_3; }\n\t\tpublic RuleCall getContentsTextOrMarkupParserRuleCall_3_0() { return cContentsTextOrMarkupParserRuleCall_3_0; }\n\t\tpublic RuleCall getMULTI_NLTerminalRuleCall_4() { return cMULTI_NLTerminalRuleCall_4; }\n\t\tpublic Keyword getRightSquareBracketKeyword_5() { return cRightSquareBracketKeyword_5; }\n\t\tprivate final Keyword cColonKeyword_1 = (Keyword)cGroup.eContents().get(1);\n\t\tprivate final Assignment cNameAssignment_2 = (Assignment)cGroup.eContents().get(2);\n\t\tprivate final RuleCall cNameIDTerminalRuleCall_2_0 = (RuleCall)cNameAssignment_2.eContents().get(0);\n\t\tprivate final Group cGroup_3 = (Group)cGroup.eContents().get(3);\n\t\tprivate final Keyword cLeftSquareBracketKeyword_3_0 = (Keyword)cGroup_3.eContents().get(0);\n\t\tprivate final Keyword cRightSquareBracketKeyword_3_1 = (Keyword)cGroup_3.eContents().get(1);\n\t\t//\t\"\\\\a\" \":\" name=ID (\"[\" \"]\")?;\n\t\t//\"\\\\a\" \":\" name=ID (\"[\" \"]\")?\n\t\t//\"\\\\a\"\n\t\t//\":\"\n\t\tpublic Keyword getColonKeyword_1() { return cColonKeyword_1; }\n\n\t\tpublic Assignment getNameAssignment_2() { return cNameAssignment_2; }\n\t\tpublic RuleCall getNameIDTerminalRuleCall_2_0() { return cNameIDTerminalRuleCall_2_0; }\n\n\t\t//(\"[\" \"]\")?\n\t\tpublic Group getGroup_3() { return cGroup_3; }\n\n\t\t//\"[\"\n\t\tpublic Keyword getLeftSquareBracketKeyword_3_0() { return cLeftSquareBracketKeyword_3_0; }\n\t\tpublic Keyword getRightSquareBracketKeyword_3_1() { return cRightSquareBracketKeyword_3_1; }\n\t\tprivate final Keyword cColonKeyword_1 = (Keyword)cGroup.eContents().get(1);\n\t\tprivate final Assignment cRefAssignment_2 = (Assignment)cGroup.eContents().get(2);\n\t\tprivate final CrossReference cRefIdentifiableCrossReference_2_0 = (CrossReference)cRefAssignment_2.eContents().get(0);\n\t\tprivate final RuleCall cRefIdentifiableIDTerminalRuleCall_2_0_1 = (RuleCall)cRefIdentifiableCrossReference_2_0.eContents().get(1);\n\t\tprivate final Keyword cLeftSquareBracketKeyword_3 = (Keyword)cGroup.eContents().get(3);\n\t\tprivate final RuleCall cMULTI_NLTerminalRuleCall_4 = (RuleCall)cGroup.eContents().get(4);\n\t\tprivate final Assignment cContentsAssignment_5 = (Assignment)cGroup.eContents().get(5);\n\t\tprivate final RuleCall cContentsTextOrMarkupParserRuleCall_5_0 = (RuleCall)cContentsAssignment_5.eContents().get(0);\n\t\tprivate final RuleCall cMULTI_NLTerminalRuleCall_6 = (RuleCall)cGroup.eContents().get(6);\n\t\tprivate final Keyword cRightSquareBracketKeyword_7 = (Keyword)cGroup.eContents().get(7);\n\t\t//\t\"\\\\ref\" \":\" ref=[Identifiable] \"[\" MULTI_NL? contents+=TextOrMarkup MULTI_NL? \"]\";\n\t\t//\"\\\\ref\" \":\" ref=[Identifiable] \"[\" MULTI_NL? contents+=TextOrMarkup MULTI_NL? \"]\"\n\t\t//\"\\\\ref\"\n\t\t//\":\"\n\t\tpublic Keyword getColonKeyword_1() { return cColonKeyword_1; }\n\n\t\tpublic Assignment getRefAssignment_2() { return cRefAssignment_2; }\n\t\tpublic CrossReference getRefIdentifiableCrossReference_2_0() { return cRefIdentifiableCrossReference_2_0; }\n\t\tpublic RuleCall getRefIdentifiableIDTerminalRuleCall_2_0_1() { return cRefIdentifiableIDTerminalRuleCall_2_0_1; }\n\t\tpublic Keyword getLeftSquareBracketKeyword_3() { return cLeftSquareBracketKeyword_3; }\n\t\tpublic RuleCall getMULTI_NLTerminalRuleCall_4() { return cMULTI_NLTerminalRuleCall_4; }\n\t\tpublic Assignment getContentsAssignment_5() { return cContentsAssignment_5; }\n\t\tpublic RuleCall getContentsTextOrMarkupParserRuleCall_5_0() { return cContentsTextOrMarkupParserRuleCall_5_0; }\n\t\tpublic RuleCall getMULTI_NLTerminalRuleCall_6() { return cMULTI_NLTerminalRuleCall_6; }\n\t\tpublic Keyword getRightSquareBracketKeyword_7() { return cRightSquareBracketKeyword_7; }\n\t\tprivate final RuleCall cANY_WSParserRuleCall_1 = (RuleCall)cGroup.eContents().get(1);\n\t\tprivate final Keyword cLeftSquareBracketKeyword_2 = (Keyword)cGroup.eContents().get(2);\n\t\tprivate final Group cGroup_3 = (Group)cGroup.eContents().get(3);\n\t\tprivate final RuleCall cANY_WSParserRuleCall_3_0 = (RuleCall)cGroup_3.eContents().get(0);\n\t\tprivate final Assignment cItemsAssignment_3_1 = (Assignment)cGroup_3.eContents().get(1);\n\t\tprivate final RuleCall cItemsItemParserRuleCall_3_1_0 = (RuleCall)cItemsAssignment_3_1.eContents().get(0);\n\t\tprivate final RuleCall cANY_WSParserRuleCall_4 = (RuleCall)cGroup.eContents().get(4);\n\t\tprivate final Keyword cRightSquareBracketKeyword_5 = (Keyword)cGroup.eContents().get(5);\n\t\t//\t\"\\\\ol\" ANY_WS* \"[\" (ANY_WS* items+=Item)+ ANY_WS* \"]\";\n\t\t//\"\\\\ol\" ANY_WS* \"[\" (ANY_WS* items+=Item)+ ANY_WS* \"]\"\n\t\t//\"\\\\ol\"\n\t\t//ANY_WS*\n\t\tpublic RuleCall getANY_WSParserRuleCall_1() { return cANY_WSParserRuleCall_1; }\n\n\t\t//\"[\"\n\t\tpublic Keyword getLeftSquareBracketKeyword_2() { return cLeftSquareBracketKeyword_2; }\n\n\t\tpublic Group getGroup_3() { return cGroup_3; }\n\t\tpublic RuleCall getANY_WSParserRuleCall_3_0() { return cANY_WSParserRuleCall_3_0; }\n\t\tpublic Assignment getItemsAssignment_3_1() { return cItemsAssignment_3_1; }\n\t\tpublic RuleCall getItemsItemParserRuleCall_3_1_0() { return cItemsItemParserRuleCall_3_1_0; }\n\t\tpublic RuleCall getANY_WSParserRuleCall_4() { return cANY_WSParserRuleCall_4; }\n\t\tpublic Keyword getRightSquareBracketKeyword_5() { return cRightSquareBracketKeyword_5; }\n\t\tprivate final RuleCall cANY_WSParserRuleCall_1 = (RuleCall)cGroup.eContents().get(1);\n\t\tprivate final Keyword cLeftSquareBracketKeyword_2 = (Keyword)cGroup.eContents().get(2);\n\t\tprivate final Group cGroup_3 = (Group)cGroup.eContents().get(3);\n\t\tprivate final RuleCall cANY_WSParserRuleCall_3_0 = (RuleCall)cGroup_3.eContents().get(0);\n\t\tprivate final Assignment cItemsAssignment_3_1 = (Assignment)cGroup_3.eContents().get(1);\n\t\tprivate final RuleCall cItemsItemParserRuleCall_3_1_0 = (RuleCall)cItemsAssignment_3_1.eContents().get(0);\n\t\tprivate final RuleCall cANY_WSParserRuleCall_4 = (RuleCall)cGroup.eContents().get(4);\n\t\tprivate final Keyword cRightSquareBracketKeyword_5 = (Keyword)cGroup.eContents().get(5);\n\t\t//\t\"\\\\ul\" ANY_WS* \"[\" (ANY_WS* items+=Item)+ ANY_WS* \"]\";\n\t\t//\"\\\\ul\" ANY_WS* \"[\" (ANY_WS* items+=Item)+ ANY_WS* \"]\"\n\t\t//\"\\\\ul\"\n\t\t//ANY_WS*\n\t\tpublic RuleCall getANY_WSParserRuleCall_1() { return cANY_WSParserRuleCall_1; }\n\n\t\t//\"[\"\n\t\tpublic Keyword getLeftSquareBracketKeyword_2() { return cLeftSquareBracketKeyword_2; }\n\n\t\tpublic Group getGroup_3() { return cGroup_3; }\n\t\tpublic RuleCall getANY_WSParserRuleCall_3_0() { return cANY_WSParserRuleCall_3_0; }\n\t\tpublic Assignment getItemsAssignment_3_1() { return cItemsAssignment_3_1; }\n\t\tpublic RuleCall getItemsItemParserRuleCall_3_1_0() { return cItemsItemParserRuleCall_3_1_0; }\n\t\tpublic RuleCall getANY_WSParserRuleCall_4() { return cANY_WSParserRuleCall_4; }\n\t\tpublic Keyword getRightSquareBracketKeyword_5() { return cRightSquareBracketKeyword_5; }\n\t\tprivate final RuleCall cANY_WSParserRuleCall_1 = (RuleCall)cGroup.eContents().get(1);\n\t\tprivate final Keyword cLeftSquareBracketKeyword_2 = (Keyword)cGroup.eContents().get(2);\n\t\tprivate final RuleCall cMULTI_NLTerminalRuleCall_3 = (RuleCall)cGroup.eContents().get(3);\n\t\tprivate final Assignment cContentsAssignment_4 = (Assignment)cGroup.eContents().get(4);\n\t\tprivate final RuleCall cContentsTextOrMarkupParserRuleCall_4_0 = (RuleCall)cContentsAssignment_4.eContents().get(0);\n\t\tprivate final Group cGroup_5 = (Group)cGroup.eContents().get(5);\n\t\tprivate final RuleCall cMULTI_NLTerminalRuleCall_5_0 = (RuleCall)cGroup_5.eContents().get(0);\n\t\tprivate final Assignment cContentsAssignment_5_1 = (Assignment)cGroup_5.eContents().get(1);\n\t\tprivate final RuleCall cContentsTextOrMarkupParserRuleCall_5_1_0 = (RuleCall)cContentsAssignment_5_1.eContents().get(0);\n\t\tprivate final Keyword cRightSquareBracketKeyword_6 = (Keyword)cGroup.eContents().get(6);\n\t\t//\t\"\\\\item\" ANY_WS* \"[\" MULTI_NL? contents+=TextOrMarkup (MULTI_NL contents+=TextOrMarkup)* \"]\";\n\t\t//\"\\\\item\" ANY_WS* \"[\" MULTI_NL? contents+=TextOrMarkup (MULTI_NL contents+=TextOrMarkup)* \"]\"\n\t\t//\"\\\\item\"\n\t\t//ANY_WS*\n\t\tpublic RuleCall getANY_WSParserRuleCall_1() { return cANY_WSParserRuleCall_1; }\n\n\t\t//\"[\"\n\t\tpublic Keyword getLeftSquareBracketKeyword_2() { return cLeftSquareBracketKeyword_2; }\n\n\t\tpublic RuleCall getMULTI_NLTerminalRuleCall_3() { return cMULTI_NLTerminalRuleCall_3; }\n\t\tpublic Assignment getContentsAssignment_4() { return cContentsAssignment_4; }\n\t\tpublic RuleCall getContentsTextOrMarkupParserRuleCall_4_0() { return cContentsTextOrMarkupParserRuleCall_4_0; }\n\t\tpublic Group getGroup_5() { return cGroup_5; }\n\t\tpublic RuleCall getMULTI_NLTerminalRuleCall_5_0() { return cMULTI_NLTerminalRuleCall_5_0; }\n\t\tpublic Assignment getContentsAssignment_5_1() { return cContentsAssignment_5_1; }\n\t\tpublic RuleCall getContentsTextOrMarkupParserRuleCall_5_1_0() { return cContentsTextOrMarkupParserRuleCall_5_1_0; }\n\t\tpublic Keyword getRightSquareBracketKeyword_6() { return cRightSquareBracketKeyword_6; }\n\t\tprivate final RuleCall cANY_WSParserRuleCall_1 = (RuleCall)cGroup.eContents().get(1);\n\t\tprivate final Keyword cLeftSquareBracketKeyword_2 = (Keyword)cGroup.eContents().get(2);\n\t\tprivate final Assignment cElementAssignment_3 = (Assignment)cGroup.eContents().get(3);\n\t\tprivate final CrossReference cElementJvmIdentifyableElementCrossReference_3_0 = (CrossReference)cElementAssignment_3.eContents().get(0);\n\t\tprivate final RuleCall cElementJvmIdentifyableElementTextParserRuleCall_3_0_1 = (RuleCall)cElementJvmIdentifyableElementCrossReference_3_0.eContents().get(1);\n\t\tprivate final Keyword cRightSquareBracketKeyword_4 = (Keyword)cGroup.eContents().get(4);\n\t\t//\t\"\\\\codeRef\" ANY_WS* \"[\" element=[types::JvmIdentifyableElement|Text] \"]\";\n\t\t//\"\\\\codeRef\" ANY_WS* \"[\" element=[types::JvmIdentifyableElement|Text] \"]\"\n\t\t//\"\\\\codeRef\"\n\t\t//ANY_WS*\n\t\tpublic RuleCall getANY_WSParserRuleCall_1() { return cANY_WSParserRuleCall_1; }\n\n\t\t//\"[\"\n\t\tpublic Keyword getLeftSquareBracketKeyword_2() { return cLeftSquareBracketKeyword_2; }\n\n\t\tpublic Assignment getElementAssignment_3() { return cElementAssignment_3; }\n\t\tpublic CrossReference getElementJvmIdentifyableElementCrossReference_3_0() { return cElementJvmIdentifyableElementCrossReference_3_0; }\n\t\tpublic RuleCall getElementJvmIdentifyableElementTextParserRuleCall_3_0_1() { return cElementJvmIdentifyableElementTextParserRuleCall_3_0_1; }\n\t\tpublic Keyword getRightSquareBracketKeyword_4() { return cRightSquareBracketKeyword_4; }\n\t\tprivate final RuleCall cANY_WSParserRuleCall_1 = (RuleCall)cGroup.eContents().get(1);\n\t\tprivate final Keyword cLeftSquareBracketKeyword_2 = (Keyword)cGroup.eContents().get(2);\n\t\tprivate final Assignment cUrlAssignment_3 = (Assignment)cGroup.eContents().get(3);\n\t\tprivate final RuleCall cUrlTextParserRuleCall_3_0 = (RuleCall)cUrlAssignment_3.eContents().get(0);\n\t\tprivate final Keyword cRightSquareBracketKeyword_4 = (Keyword)cGroup.eContents().get(4);\n\t\tprivate final RuleCall cANY_WSParserRuleCall_5 = (RuleCall)cGroup.eContents().get(5);\n\t\tprivate final Keyword cLeftSquareBracketKeyword_6 = (Keyword)cGroup.eContents().get(6);\n\t\tprivate final Assignment cTextAssignment_7 = (Assignment)cGroup.eContents().get(7);\n\t\tprivate final RuleCall cTextTextParserRuleCall_7_0 = (RuleCall)cTextAssignment_7.eContents().get(0);\n\t\tprivate final Keyword cRightSquareBracketKeyword_8 = (Keyword)cGroup.eContents().get(8);\n\t\t//\t\"\\\\link\" ANY_WS* \"[\" url=Text \"]\" ANY_WS* \"[\" text=Text \"]\";\n\t\t//\"\\\\link\" ANY_WS* \"[\" url=Text \"]\" ANY_WS* \"[\" text=Text \"]\"\n\t\t//\"\\\\link\"\n\t\t//ANY_WS*\n\t\tpublic RuleCall getANY_WSParserRuleCall_1() { return cANY_WSParserRuleCall_1; }\n\n\t\t//\"[\"\n\t\tpublic Keyword getLeftSquareBracketKeyword_2() { return cLeftSquareBracketKeyword_2; }\n\n\t\tpublic Assignment getUrlAssignment_3() { return cUrlAssignment_3; }\n\t\tpublic RuleCall getUrlTextParserRuleCall_3_0() { return cUrlTextParserRuleCall_3_0; }\n\t\tpublic Keyword getRightSquareBracketKeyword_4() { return cRightSquareBracketKeyword_4; }\n\t\tpublic RuleCall getANY_WSParserRuleCall_5() { return cANY_WSParserRuleCall_5; }\n\t\tpublic Keyword getLeftSquareBracketKeyword_6() { return cLeftSquareBracketKeyword_6; }\n\t\tpublic Assignment getTextAssignment_7() { return cTextAssignment_7; }\n\t\tpublic RuleCall getTextTextParserRuleCall_7_0() { return cTextTextParserRuleCall_7_0; }\n\t\tpublic Keyword getRightSquareBracketKeyword_8() { return cRightSquareBracketKeyword_8; }\n\t\tprivate final Keyword cImgKeyword_0 = (Keyword)cGroup.eContents().get(0);\n\t\tprivate final RuleCall cANY_WSParserRuleCall_1 = (RuleCall)cGroup.eContents().get(1);\n\t\tprivate final Group cGroup_2 = (Group)cGroup.eContents().get(2);\n\t\tprivate final Keyword cColonKeyword_2_0 = (Keyword)cGroup_2.eContents().get(0);\n\t\tprivate final RuleCall cANY_WSParserRuleCall_2_1 = (RuleCall)cGroup_2.eContents().get(1);\n\t\tprivate final Assignment cNameAssignment_2_2 = (Assignment)cGroup_2.eContents().get(2);\n\t\tprivate final RuleCall cNameIDTerminalRuleCall_2_2_0 = (RuleCall)cNameAssignment_2_2.eContents().get(0);\n\t\tprivate final RuleCall cANY_WSParserRuleCall_2_3 = (RuleCall)cGroup_2.eContents().get(3);\n\t\tprivate final Keyword cLeftSquareBracketKeyword_3 = (Keyword)cGroup.eContents().get(3);\n\t\tprivate final Assignment cPathAssignment_4 = (Assignment)cGroup.eContents().get(4);\n\t\tprivate final RuleCall cPathTextParserRuleCall_4_0 = (RuleCall)cPathAssignment_4.eContents().get(0);\n\t\tprivate final Keyword cRightSquareBracketKeyword_5 = (Keyword)cGroup.eContents().get(5);\n\t\tprivate final RuleCall cANY_WSParserRuleCall_6 = (RuleCall)cGroup.eContents().get(6);\n\t\tprivate final Keyword cLeftSquareBracketKeyword_7 = (Keyword)cGroup.eContents().get(7);\n\t\tprivate final Assignment cClazzAssignment_8 = (Assignment)cGroup.eContents().get(8);\n\t\tprivate final RuleCall cClazzTextParserRuleCall_8_0 = (RuleCall)cClazzAssignment_8.eContents().get(0);\n\t\tprivate final Keyword cRightSquareBracketKeyword_9 = (Keyword)cGroup.eContents().get(9);\n\t\tprivate final RuleCall cANY_WSParserRuleCall_10 = (RuleCall)cGroup.eContents().get(10);\n\t\tprivate final Keyword cLeftSquareBracketKeyword_11 = (Keyword)cGroup.eContents().get(11);\n\t\tprivate final Assignment cStyleAssignment_12 = (Assignment)cGroup.eContents().get(12);\n\t\tprivate final RuleCall cStyleTextParserRuleCall_12_0 = (RuleCall)cStyleAssignment_12.eContents().get(0);\n\t\tprivate final Keyword cRightSquareBracketKeyword_13 = (Keyword)cGroup.eContents().get(13);\n\t\tprivate final RuleCall cANY_WSParserRuleCall_14 = (RuleCall)cGroup.eContents().get(14);\n\t\tprivate final Keyword cLeftSquareBracketKeyword_15 = (Keyword)cGroup.eContents().get(15);\n\t\tprivate final Assignment cCaptionAssignment_16 = (Assignment)cGroup.eContents().get(16);\n\t\tprivate final RuleCall cCaptionTextParserRuleCall_16_0 = (RuleCall)cCaptionAssignment_16.eContents().get(0);\n\t\tprivate final Keyword cRightSquareBracketKeyword_17 = (Keyword)cGroup.eContents().get(17);\n\t\t//\t\"\\\\img\" ANY_WS* (\":\" ANY_WS* name=ID ANY_WS*)? \"[\" path=Text / *TODO make it a crossreference to images * / \"]\" ANY_WS*\n\t\t//\t\"[\" clazz=Text \"]\" ANY_WS* \"[\" style=Text \"]\" ANY_WS* \"[\" caption=Text \"]\";\n\t\t//\"\\\\img\" ANY_WS* (\":\" ANY_WS* name=ID ANY_WS*)? \"[\" path=Text / *TODO make it a crossreference to images * / \"]\" ANY_WS*\n\t\t//\"[\" clazz=Text \"]\" ANY_WS* \"[\" style=Text \"]\" ANY_WS* \"[\" caption=Text \"]\"\n\t\t//\"\\\\img\"\n\t\tpublic Keyword getImgKeyword_0() { return cImgKeyword_0; }\n\n\t\t//ANY_WS*\n\t\tpublic RuleCall getANY_WSParserRuleCall_1() { return cANY_WSParserRuleCall_1; }\n\t\t//(\":\" ANY_WS* name=ID ANY_WS*)?\n\t\tpublic Group getGroup_2() { return cGroup_2; }\n\t\t//\":\"\n\t\tpublic Keyword getColonKeyword_2_0() { return cColonKeyword_2_0; }\n\t\tpublic RuleCall getANY_WSParserRuleCall_2_1() { return cANY_WSParserRuleCall_2_1; }\n\t\tpublic Assignment getNameAssignment_2_2() { return cNameAssignment_2_2; }\n\t\tpublic RuleCall getNameIDTerminalRuleCall_2_2_0() { return cNameIDTerminalRuleCall_2_2_0; }\n\t\tpublic RuleCall getANY_WSParserRuleCall_2_3() { return cANY_WSParserRuleCall_2_3; }\n\t\tpublic Keyword getLeftSquareBracketKeyword_3() { return cLeftSquareBracketKeyword_3; }\n\t\tpublic Assignment getPathAssignment_4() { return cPathAssignment_4; }\n\t\tpublic RuleCall getPathTextParserRuleCall_4_0() { return cPathTextParserRuleCall_4_0; }\n\t\tpublic Keyword getRightSquareBracketKeyword_5() { return cRightSquareBracketKeyword_5; }\n\t\tpublic RuleCall getANY_WSParserRuleCall_6() { return cANY_WSParserRuleCall_6; }\n\t\tpublic Keyword getLeftSquareBracketKeyword_7() { return cLeftSquareBracketKeyword_7; }\n\t\tpublic Assignment getClazzAssignment_8() { return cClazzAssignment_8; }\n\t\tpublic RuleCall getClazzTextParserRuleCall_8_0() { return cClazzTextParserRuleCall_8_0; }\n\t\tpublic Keyword getRightSquareBracketKeyword_9() { return cRightSquareBracketKeyword_9; }\n\t\tpublic RuleCall getANY_WSParserRuleCall_10() { return cANY_WSParserRuleCall_10; }\n\t\tpublic Keyword getLeftSquareBracketKeyword_11() { return cLeftSquareBracketKeyword_11; }\n\t\tpublic Assignment getStyleAssignment_12() { return cStyleAssignment_12; }\n\t\tpublic RuleCall getStyleTextParserRuleCall_12_0() { return cStyleTextParserRuleCall_12_0; }\n\t\tpublic Keyword getRightSquareBracketKeyword_13() { return cRightSquareBracketKeyword_13; }\n\t\tpublic RuleCall getANY_WSParserRuleCall_14() { return cANY_WSParserRuleCall_14; }\n\t\tpublic Keyword getLeftSquareBracketKeyword_15() { return cLeftSquareBracketKeyword_15; }\n\t\tpublic Assignment getCaptionAssignment_16() { return cCaptionAssignment_16; }\n\t\tpublic RuleCall getCaptionTextParserRuleCall_16_0() { return cCaptionTextParserRuleCall_16_0; }\n\t\tpublic Keyword getRightSquareBracketKeyword_17() { return cRightSquareBracketKeyword_17; }\n\t\tprivate final RuleCall cANY_WSParserRuleCall_1 = (RuleCall)cGroup.eContents().get(1);\n\t\tprivate final Group cGroup_2 = (Group)cGroup.eContents().get(2);\n\t\tprivate final Keyword cLeftSquareBracketKeyword_2_0 = (Keyword)cGroup_2.eContents().get(0);\n\t\tprivate final RuleCall cANY_WSParserRuleCall_2_1 = (RuleCall)cGroup_2.eContents().get(1);\n\t\tprivate final Assignment cLanguageAssignment_2_2 = (Assignment)cGroup_2.eContents().get(2);\n\t\tprivate final RuleCall cLanguageIDTerminalRuleCall_2_2_0 = (RuleCall)cLanguageAssignment_2_2.eContents().get(0);\n\t\tprivate final RuleCall cANY_WSParserRuleCall_2_3 = (RuleCall)cGroup_2.eContents().get(3);\n\t\tprivate final Keyword cRightSquareBracketKeyword_2_4 = (Keyword)cGroup_2.eContents().get(4);\n\t\tprivate final RuleCall cANY_WSParserRuleCall_2_5 = (RuleCall)cGroup_2.eContents().get(5);\n\t\tprivate final Keyword cLeftSquareBracketKeyword_3 = (Keyword)cGroup.eContents().get(3);\n\t\tprivate final Alternatives cAlternatives_4 = (Alternatives)cGroup.eContents().get(4);\n\t\tprivate final Group cGroup_4_0 = (Group)cAlternatives_4.eContents().get(0);\n\t\tprivate final Assignment cContentsAssignment_4_0_0 = (Assignment)cGroup_4_0.eContents().get(0);\n\t\tprivate final RuleCall cContentsCodeParserRuleCall_4_0_0_0 = (RuleCall)cContentsAssignment_4_0_0.eContents().get(0);\n\t\tprivate final Group cGroup_4_0_1 = (Group)cGroup_4_0.eContents().get(1);\n\t\tprivate final Assignment cContentsAssignment_4_0_1_0 = (Assignment)cGroup_4_0_1.eContents().get(0);\n\t\tprivate final RuleCall cContentsMarkupInCodeParserRuleCall_4_0_1_0_0 = (RuleCall)cContentsAssignment_4_0_1_0.eContents().get(0);\n\t\tprivate final Assignment cContentsAssignment_4_0_1_1 = (Assignment)cGroup_4_0_1.eContents().get(1);\n\t\tprivate final RuleCall cContentsCodeParserRuleCall_4_0_1_1_0 = (RuleCall)cContentsAssignment_4_0_1_1.eContents().get(0);\n\t\tprivate final Group cGroup_4_1 = (Group)cAlternatives_4.eContents().get(1);\n\t\tprivate final Assignment cContentsAssignment_4_1_0 = (Assignment)cGroup_4_1.eContents().get(0);\n\t\tprivate final RuleCall cContentsMarkupInCodeParserRuleCall_4_1_0_0 = (RuleCall)cContentsAssignment_4_1_0.eContents().get(0);\n\t\tprivate final Assignment cContentsAssignment_4_1_1 = (Assignment)cGroup_4_1.eContents().get(1);\n\t\tprivate final RuleCall cContentsCodeParserRuleCall_4_1_1_0 = (RuleCall)cContentsAssignment_4_1_1.eContents().get(0);\n\t\tprivate final Keyword cRightSquareBracketKeyword_5 = (Keyword)cGroup.eContents().get(5);\n\t\t//\t\"\\\\code\" ANY_WS* (\"[\" ANY_WS* language=ID ANY_WS* \"]\" ANY_WS*)? \"[\" (contents+=Code (contents+=MarkupInCode\n\t\t//\tcontents+=Code?)* | (contents+=MarkupInCode contents+=Code?)+) \"]\";\n\t\t//\"\\\\code\" ANY_WS* (\"[\" ANY_WS* language=ID ANY_WS* \"]\" ANY_WS*)? \"[\" (contents+=Code (contents+=MarkupInCode\n\t\t//contents+=Code?)* | (contents+=MarkupInCode contents+=Code?)+) \"]\"\n\t\t//\"\\\\code\"\n\t\t//ANY_WS*\n\t\tpublic RuleCall getANY_WSParserRuleCall_1() { return cANY_WSParserRuleCall_1; }\n\n\t\t//(\"[\" ANY_WS* language=ID ANY_WS* \"]\" ANY_WS*)?\n\t\tpublic Group getGroup_2() { return cGroup_2; }\n\n\t\t//\"[\"\n\t\tpublic Keyword getLeftSquareBracketKeyword_2_0() { return cLeftSquareBracketKeyword_2_0; }\n\t\tpublic RuleCall getANY_WSParserRuleCall_2_1() { return cANY_WSParserRuleCall_2_1; }\n\t\tpublic Assignment getLanguageAssignment_2_2() { return cLanguageAssignment_2_2; }\n\t\tpublic RuleCall getLanguageIDTerminalRuleCall_2_2_0() { return cLanguageIDTerminalRuleCall_2_2_0; }\n\t\tpublic RuleCall getANY_WSParserRuleCall_2_3() { return cANY_WSParserRuleCall_2_3; }\n\t\tpublic Keyword getRightSquareBracketKeyword_2_4() { return cRightSquareBracketKeyword_2_4; }\n\t\tpublic RuleCall getANY_WSParserRuleCall_2_5() { return cANY_WSParserRuleCall_2_5; }\n\t\tpublic Keyword getLeftSquareBracketKeyword_3() { return cLeftSquareBracketKeyword_3; }\n\t\tpublic Alternatives getAlternatives_4() { return cAlternatives_4; }\n\t\tpublic Group getGroup_4_0() { return cGroup_4_0; }\n\t\tpublic Assignment getContentsAssignment_4_0_0() { return cContentsAssignment_4_0_0; }\n\t\tpublic RuleCall getContentsCodeParserRuleCall_4_0_0_0() { return cContentsCodeParserRuleCall_4_0_0_0; }\n\t\tpublic Group getGroup_4_0_1() { return cGroup_4_0_1; }\n\t\tpublic Assignment getContentsAssignment_4_0_1_0() { return cContentsAssignment_4_0_1_0; }\n\t\tpublic RuleCall getContentsMarkupInCodeParserRuleCall_4_0_1_0_0() { return cContentsMarkupInCodeParserRuleCall_4_0_1_0_0; }\n\t\tpublic Assignment getContentsAssignment_4_0_1_1() { return cContentsAssignment_4_0_1_1; }\n\t\tpublic RuleCall getContentsCodeParserRuleCall_4_0_1_1_0() { return cContentsCodeParserRuleCall_4_0_1_1_0; }\n\t\tpublic Group getGroup_4_1() { return cGroup_4_1; }\n\t\tpublic Assignment getContentsAssignment_4_1_0() { return cContentsAssignment_4_1_0; }\n\t\tpublic RuleCall getContentsMarkupInCodeParserRuleCall_4_1_0_0() { return cContentsMarkupInCodeParserRuleCall_4_1_0_0; }\n\t\tpublic Assignment getContentsAssignment_4_1_1() { return cContentsAssignment_4_1_1; }\n\t\tpublic RuleCall getContentsCodeParserRuleCall_4_1_1_0() { return cContentsCodeParserRuleCall_4_1_1_0; }\n\t\tpublic Keyword getRightSquareBracketKeyword_5() { return cRightSquareBracketKeyword_5; }\n\t\t////\n\t\t////ParBreak:\n\t\t////\tc=MULTI_NL;\n\t//\t\"\\\\chapter\" (\":\" name=ID)? \"[\" title=TextOrMarkup \"]\" (MULTI_NL contents+=TextOrMarkup)* (MULTI_NL\n\t//\t\"\\\\section\" (\":\" name=ID)? \"[\" title=TextOrMarkup \"]\" (MULTI_NL contents+=TextOrMarkup)* (MULTI_NL\n\t//\t\"\\\\subsection\" (\":\" name=ID)? \"[\" title=TextOrMarkup \"]\" (MULTI_NL contents+=TextOrMarkup)* (MULTI_NL\n\t//\t\"\\\\section3\" (\":\" name=ID)? \"[\" title=TextOrMarkup \"]\" (MULTI_NL contents+=TextOrMarkup)* (MULTI_NL\n\t//\t\"\\\\section4\" (\":\" name=ID)? \"[\" title=TextOrMarkup \"]\" (MULTI_NL contents+=TextOrMarkup)*;\n\t//\t(ID | WS | SINGLE_NL | ANY_OTHER | \"\\\\[\" | \"\\\\]\" | \":\")+;\n\t//\t\"\\\\emph\" \"[\" MULTI_NL? contents+=TextOrMarkup MULTI_NL? \"]\";\n\t//\t\"\\\\a\" \":\" name=ID (\"[\" \"]\")?;\n\t//\t\"\\\\ref\" \":\" ref=[Identifiable] \"[\" MULTI_NL? contents+=TextOrMarkup MULTI_NL? \"]\";\n\t//\t\"\\\\ol\" ANY_WS* \"[\" (ANY_WS* items+=Item)+ ANY_WS* \"]\";\n\t//\t\"\\\\ul\" ANY_WS* \"[\" (ANY_WS* items+=Item)+ ANY_WS* \"]\";\n\t//\t\"\\\\item\" ANY_WS* \"[\" MULTI_NL? contents+=TextOrMarkup (MULTI_NL contents+=TextOrMarkup)* \"]\";\n\t//\t\"\\\\codeRef\" ANY_WS* \"[\" element=[types::JvmIdentifyableElement|Text] \"]\";\n\t//\t\"\\\\link\" ANY_WS* \"[\" url=Text \"]\" ANY_WS* \"[\" text=Text \"]\";\n\t//\t\"\\\\img\" ANY_WS* (\":\" ANY_WS* name=ID ANY_WS*)? \"[\" path=Text / *TODO make it a crossreference to images * / \"]\" ANY_WS*\n\t//\t\"[\" clazz=Text \"]\" ANY_WS* \"[\" style=Text \"]\" ANY_WS* \"[\" caption=Text \"]\";\n\t//\t\"\\\\code\" ANY_WS* (\"[\" ANY_WS* language=ID ANY_WS* \"]\" ANY_WS*)? \"[\" (contents+=Code (contents+=MarkupInCode\n\t//\tcontents+=Code?)* | (contents+=MarkupInCode contents+=Code?)+) \"]\";\n\t////\n\t////ParBreak:\n\t////\tc=MULTI_NL;", "old_methods": [ { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cChapterKeyword_0;", "signature": "Keyword getChapterKeyword_0()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cGroup_1;", "signature": "Group getGroup_1()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cColonKeyword_1_0;", "signature": "Keyword getColonKeyword_1_0()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cNameAssignment_1_1;", "signature": "Assignment getNameAssignment_1_1()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cNameIDTerminalRuleCall_1_1_0;", "signature": "RuleCall getNameIDTerminalRuleCall_1_1_0()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cLeftSquareBracketKeyword_2;", "signature": "Keyword getLeftSquareBracketKeyword_2()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cTitleAssignment_3;", "signature": "Assignment getTitleAssignment_3()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cTitleTextOrMarkupParserRuleCall_3_0;", "signature": "RuleCall getTitleTextOrMarkupParserRuleCall_3_0()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cRightSquareBracketKeyword_4;", "signature": "Keyword getRightSquareBracketKeyword_4()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cGroup_5;", "signature": "Group getGroup_5()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cMULTI_NLTerminalRuleCall_5_0;", "signature": "RuleCall getMULTI_NLTerminalRuleCall_5_0()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cContentsAssignment_5_1;", "signature": "Assignment getContentsAssignment_5_1()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cContentsTextOrMarkupParserRuleCall_5_1_0;", "signature": "RuleCall getContentsTextOrMarkupParserRuleCall_5_1_0()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cGroup_6;", "signature": "Group getGroup_6()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cMULTI_NLTerminalRuleCall_6_0;", "signature": "RuleCall getMULTI_NLTerminalRuleCall_6_0()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cContentsAssignment_6_1;", "signature": "Assignment getContentsAssignment_6_1()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cContentsSectionParserRuleCall_6_1_0;", "signature": "RuleCall getContentsSectionParserRuleCall_6_1_0()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cSectionKeyword_0;", "signature": "Keyword getSectionKeyword_0()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cGroup_1;", "signature": "Group getGroup_1()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cColonKeyword_1_0;", "signature": "Keyword getColonKeyword_1_0()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cNameAssignment_1_1;", "signature": "Assignment getNameAssignment_1_1()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cNameIDTerminalRuleCall_1_1_0;", "signature": "RuleCall getNameIDTerminalRuleCall_1_1_0()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cLeftSquareBracketKeyword_2;", "signature": "Keyword getLeftSquareBracketKeyword_2()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cTitleAssignment_3;", "signature": "Assignment getTitleAssignment_3()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cTitleTextOrMarkupParserRuleCall_3_0;", "signature": "RuleCall getTitleTextOrMarkupParserRuleCall_3_0()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cRightSquareBracketKeyword_4;", "signature": "Keyword getRightSquareBracketKeyword_4()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cGroup_5;", "signature": "Group getGroup_5()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cMULTI_NLTerminalRuleCall_5_0;", "signature": "RuleCall getMULTI_NLTerminalRuleCall_5_0()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cContentsAssignment_5_1;", "signature": "Assignment getContentsAssignment_5_1()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cContentsTextOrMarkupParserRuleCall_5_1_0;", "signature": "RuleCall getContentsTextOrMarkupParserRuleCall_5_1_0()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cGroup_6;", "signature": "Group getGroup_6()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cMULTI_NLTerminalRuleCall_6_0;", "signature": "RuleCall getMULTI_NLTerminalRuleCall_6_0()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cContentsAssignment_6_1;", "signature": "Assignment getContentsAssignment_6_1()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cContentsSubSectionParserRuleCall_6_1_0;", "signature": "RuleCall getContentsSubSectionParserRuleCall_6_1_0()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cSubsectionKeyword_0;", "signature": "Keyword getSubsectionKeyword_0()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cGroup_1;", "signature": "Group getGroup_1()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cColonKeyword_1_0;", "signature": "Keyword getColonKeyword_1_0()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cNameAssignment_1_1;", "signature": "Assignment getNameAssignment_1_1()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cNameIDTerminalRuleCall_1_1_0;", "signature": "RuleCall getNameIDTerminalRuleCall_1_1_0()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cLeftSquareBracketKeyword_2;", "signature": "Keyword getLeftSquareBracketKeyword_2()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cTitleAssignment_3;", "signature": "Assignment getTitleAssignment_3()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cTitleTextOrMarkupParserRuleCall_3_0;", "signature": "RuleCall getTitleTextOrMarkupParserRuleCall_3_0()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cRightSquareBracketKeyword_4;", "signature": "Keyword getRightSquareBracketKeyword_4()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cGroup_5;", "signature": "Group getGroup_5()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cMULTI_NLTerminalRuleCall_5_0;", "signature": "RuleCall getMULTI_NLTerminalRuleCall_5_0()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cContentsAssignment_5_1;", "signature": "Assignment getContentsAssignment_5_1()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cContentsTextOrMarkupParserRuleCall_5_1_0;", "signature": "RuleCall getContentsTextOrMarkupParserRuleCall_5_1_0()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cGroup_6;", "signature": "Group getGroup_6()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cMULTI_NLTerminalRuleCall_6_0;", "signature": "RuleCall getMULTI_NLTerminalRuleCall_6_0()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cContentsAssignment_6_1;", "signature": "Assignment getContentsAssignment_6_1()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cContentsSection3ParserRuleCall_6_1_0;", "signature": "RuleCall getContentsSection3ParserRuleCall_6_1_0()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cSection3Keyword_0;", "signature": "Keyword getSection3Keyword_0()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cGroup_1;", "signature": "Group getGroup_1()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cColonKeyword_1_0;", "signature": "Keyword getColonKeyword_1_0()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cNameAssignment_1_1;", "signature": "Assignment getNameAssignment_1_1()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cNameIDTerminalRuleCall_1_1_0;", "signature": "RuleCall getNameIDTerminalRuleCall_1_1_0()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cLeftSquareBracketKeyword_2;", "signature": "Keyword getLeftSquareBracketKeyword_2()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cTitleAssignment_3;", "signature": "Assignment getTitleAssignment_3()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cTitleTextOrMarkupParserRuleCall_3_0;", "signature": "RuleCall getTitleTextOrMarkupParserRuleCall_3_0()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cRightSquareBracketKeyword_4;", "signature": "Keyword getRightSquareBracketKeyword_4()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cGroup_5;", "signature": "Group getGroup_5()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cMULTI_NLTerminalRuleCall_5_0;", "signature": "RuleCall getMULTI_NLTerminalRuleCall_5_0()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cContentsAssignment_5_1;", "signature": "Assignment getContentsAssignment_5_1()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cContentsTextOrMarkupParserRuleCall_5_1_0;", "signature": "RuleCall getContentsTextOrMarkupParserRuleCall_5_1_0()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cGroup_6;", "signature": "Group getGroup_6()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cMULTI_NLTerminalRuleCall_6_0;", "signature": "RuleCall getMULTI_NLTerminalRuleCall_6_0()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cContentsAssignment_6_1;", "signature": "Assignment getContentsAssignment_6_1()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cContentsSection4ParserRuleCall_6_1_0;", "signature": "RuleCall getContentsSection4ParserRuleCall_6_1_0()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cSection4Keyword_0;", "signature": "Keyword getSection4Keyword_0()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cGroup_1;", "signature": "Group getGroup_1()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cColonKeyword_1_0;", "signature": "Keyword getColonKeyword_1_0()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cNameAssignment_1_1;", "signature": "Assignment getNameAssignment_1_1()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cNameIDTerminalRuleCall_1_1_0;", "signature": "RuleCall getNameIDTerminalRuleCall_1_1_0()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cLeftSquareBracketKeyword_2;", "signature": "Keyword getLeftSquareBracketKeyword_2()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cTitleAssignment_3;", "signature": "Assignment getTitleAssignment_3()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cTitleTextOrMarkupParserRuleCall_3_0;", "signature": "RuleCall getTitleTextOrMarkupParserRuleCall_3_0()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cRightSquareBracketKeyword_4;", "signature": "Keyword getRightSquareBracketKeyword_4()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cGroup_5;", "signature": "Group getGroup_5()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cMULTI_NLTerminalRuleCall_5_0;", "signature": "RuleCall getMULTI_NLTerminalRuleCall_5_0()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cContentsAssignment_5_1;", "signature": "Assignment getContentsAssignment_5_1()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cContentsTextOrMarkupParserRuleCall_5_1_0;", "signature": "RuleCall getContentsTextOrMarkupParserRuleCall_5_1_0()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cColonKeyword_6;", "signature": "Keyword getColonKeyword_6()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cLeftSquareBracketKeyword_1;", "signature": "Keyword getLeftSquareBracketKeyword_1()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cMULTI_NLTerminalRuleCall_2;", "signature": "RuleCall getMULTI_NLTerminalRuleCall_2()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cContentsAssignment_3;", "signature": "Assignment getContentsAssignment_3()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cContentsTextOrMarkupParserRuleCall_3_0;", "signature": "RuleCall getContentsTextOrMarkupParserRuleCall_3_0()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cMULTI_NLTerminalRuleCall_4;", "signature": "RuleCall getMULTI_NLTerminalRuleCall_4()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cRightSquareBracketKeyword_5;", "signature": "Keyword getRightSquareBracketKeyword_5()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cColonKeyword_1;", "signature": "Keyword getColonKeyword_1()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cNameAssignment_2;", "signature": "Assignment getNameAssignment_2()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cNameIDTerminalRuleCall_2_0;", "signature": "RuleCall getNameIDTerminalRuleCall_2_0()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cGroup_3;", "signature": "Group getGroup_3()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cLeftSquareBracketKeyword_3_0;", "signature": "Keyword getLeftSquareBracketKeyword_3_0()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cRightSquareBracketKeyword_3_1;", "signature": "Keyword getRightSquareBracketKeyword_3_1()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cColonKeyword_1;", "signature": "Keyword getColonKeyword_1()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cRefAssignment_2;", "signature": "Assignment getRefAssignment_2()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cRefIdentifiableCrossReference_2_0;", "signature": "CrossReference getRefIdentifiableCrossReference_2_0()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cRefIdentifiableIDTerminalRuleCall_2_0_1;", "signature": "RuleCall getRefIdentifiableIDTerminalRuleCall_2_0_1()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cLeftSquareBracketKeyword_3;", "signature": "Keyword getLeftSquareBracketKeyword_3()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cMULTI_NLTerminalRuleCall_4;", "signature": "RuleCall getMULTI_NLTerminalRuleCall_4()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cContentsAssignment_5;", "signature": "Assignment getContentsAssignment_5()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cContentsTextOrMarkupParserRuleCall_5_0;", "signature": "RuleCall getContentsTextOrMarkupParserRuleCall_5_0()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cMULTI_NLTerminalRuleCall_6;", "signature": "RuleCall getMULTI_NLTerminalRuleCall_6()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cRightSquareBracketKeyword_7;", "signature": "Keyword getRightSquareBracketKeyword_7()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cANY_WSParserRuleCall_1;", "signature": "RuleCall getANY_WSParserRuleCall_1()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cLeftSquareBracketKeyword_2;", "signature": "Keyword getLeftSquareBracketKeyword_2()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cGroup_3;", "signature": "Group getGroup_3()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cANY_WSParserRuleCall_3_0;", "signature": "RuleCall getANY_WSParserRuleCall_3_0()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cItemsAssignment_3_1;", "signature": "Assignment getItemsAssignment_3_1()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cItemsItemParserRuleCall_3_1_0;", "signature": "RuleCall getItemsItemParserRuleCall_3_1_0()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cANY_WSParserRuleCall_4;", "signature": "RuleCall getANY_WSParserRuleCall_4()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cRightSquareBracketKeyword_5;", "signature": "Keyword getRightSquareBracketKeyword_5()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cANY_WSParserRuleCall_1;", "signature": "RuleCall getANY_WSParserRuleCall_1()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cLeftSquareBracketKeyword_2;", "signature": "Keyword getLeftSquareBracketKeyword_2()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cGroup_3;", "signature": "Group getGroup_3()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cANY_WSParserRuleCall_3_0;", "signature": "RuleCall getANY_WSParserRuleCall_3_0()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cItemsAssignment_3_1;", "signature": "Assignment getItemsAssignment_3_1()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cItemsItemParserRuleCall_3_1_0;", "signature": "RuleCall getItemsItemParserRuleCall_3_1_0()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cANY_WSParserRuleCall_4;", "signature": "RuleCall getANY_WSParserRuleCall_4()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cRightSquareBracketKeyword_5;", "signature": "Keyword getRightSquareBracketKeyword_5()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cANY_WSParserRuleCall_1;", "signature": "RuleCall getANY_WSParserRuleCall_1()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cLeftSquareBracketKeyword_2;", "signature": "Keyword getLeftSquareBracketKeyword_2()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cMULTI_NLTerminalRuleCall_3;", "signature": "RuleCall getMULTI_NLTerminalRuleCall_3()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cContentsAssignment_4;", "signature": "Assignment getContentsAssignment_4()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cContentsTextOrMarkupParserRuleCall_4_0;", "signature": "RuleCall getContentsTextOrMarkupParserRuleCall_4_0()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cGroup_5;", "signature": "Group getGroup_5()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cMULTI_NLTerminalRuleCall_5_0;", "signature": "RuleCall getMULTI_NLTerminalRuleCall_5_0()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cContentsAssignment_5_1;", "signature": "Assignment getContentsAssignment_5_1()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cContentsTextOrMarkupParserRuleCall_5_1_0;", "signature": "RuleCall getContentsTextOrMarkupParserRuleCall_5_1_0()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cRightSquareBracketKeyword_6;", "signature": "Keyword getRightSquareBracketKeyword_6()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cANY_WSParserRuleCall_1;", "signature": "RuleCall getANY_WSParserRuleCall_1()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cLeftSquareBracketKeyword_2;", "signature": "Keyword getLeftSquareBracketKeyword_2()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cElementAssignment_3;", "signature": "Assignment getElementAssignment_3()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cElementJvmIdentifyableElementCrossReference_3_0;", "signature": "CrossReference getElementJvmIdentifyableElementCrossReference_3_0()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cElementJvmIdentifyableElementTextParserRuleCall_3_0_1;", "signature": "RuleCall getElementJvmIdentifyableElementTextParserRuleCall_3_0_1()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cRightSquareBracketKeyword_4;", "signature": "Keyword getRightSquareBracketKeyword_4()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cANY_WSParserRuleCall_1;", "signature": "RuleCall getANY_WSParserRuleCall_1()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cLeftSquareBracketKeyword_2;", "signature": "Keyword getLeftSquareBracketKeyword_2()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cUrlAssignment_3;", "signature": "Assignment getUrlAssignment_3()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cUrlTextParserRuleCall_3_0;", "signature": "RuleCall getUrlTextParserRuleCall_3_0()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cRightSquareBracketKeyword_4;", "signature": "Keyword getRightSquareBracketKeyword_4()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cANY_WSParserRuleCall_5;", "signature": "RuleCall getANY_WSParserRuleCall_5()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cLeftSquareBracketKeyword_6;", "signature": "Keyword getLeftSquareBracketKeyword_6()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cTextAssignment_7;", "signature": "Assignment getTextAssignment_7()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cTextTextParserRuleCall_7_0;", "signature": "RuleCall getTextTextParserRuleCall_7_0()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cRightSquareBracketKeyword_8;", "signature": "Keyword getRightSquareBracketKeyword_8()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cImgKeyword_0;", "signature": "Keyword getImgKeyword_0()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cANY_WSParserRuleCall_1;", "signature": "RuleCall getANY_WSParserRuleCall_1()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cGroup_2;", "signature": "Group getGroup_2()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cColonKeyword_2_0;", "signature": "Keyword getColonKeyword_2_0()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cANY_WSParserRuleCall_2_1;", "signature": "RuleCall getANY_WSParserRuleCall_2_1()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cNameAssignment_2_2;", "signature": "Assignment getNameAssignment_2_2()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cNameIDTerminalRuleCall_2_2_0;", "signature": "RuleCall getNameIDTerminalRuleCall_2_2_0()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cANY_WSParserRuleCall_2_3;", "signature": "RuleCall getANY_WSParserRuleCall_2_3()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cLeftSquareBracketKeyword_3;", "signature": "Keyword getLeftSquareBracketKeyword_3()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cPathAssignment_4;", "signature": "Assignment getPathAssignment_4()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cPathTextParserRuleCall_4_0;", "signature": "RuleCall getPathTextParserRuleCall_4_0()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cRightSquareBracketKeyword_5;", "signature": "Keyword getRightSquareBracketKeyword_5()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cANY_WSParserRuleCall_6;", "signature": "RuleCall getANY_WSParserRuleCall_6()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cLeftSquareBracketKeyword_7;", "signature": "Keyword getLeftSquareBracketKeyword_7()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cClazzAssignment_8;", "signature": "Assignment getClazzAssignment_8()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cClazzTextParserRuleCall_8_0;", "signature": "RuleCall getClazzTextParserRuleCall_8_0()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cRightSquareBracketKeyword_9;", "signature": "Keyword getRightSquareBracketKeyword_9()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cANY_WSParserRuleCall_10;", "signature": "RuleCall getANY_WSParserRuleCall_10()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cLeftSquareBracketKeyword_11;", "signature": "Keyword getLeftSquareBracketKeyword_11()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cStyleAssignment_12;", "signature": "Assignment getStyleAssignment_12()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cStyleTextParserRuleCall_12_0;", "signature": "RuleCall getStyleTextParserRuleCall_12_0()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cRightSquareBracketKeyword_13;", "signature": "Keyword getRightSquareBracketKeyword_13()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cANY_WSParserRuleCall_14;", "signature": "RuleCall getANY_WSParserRuleCall_14()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cLeftSquareBracketKeyword_15;", "signature": "Keyword getLeftSquareBracketKeyword_15()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cCaptionAssignment_16;", "signature": "Assignment getCaptionAssignment_16()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cCaptionTextParserRuleCall_16_0;", "signature": "RuleCall getCaptionTextParserRuleCall_16_0()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cRightSquareBracketKeyword_17;", "signature": "Keyword getRightSquareBracketKeyword_17()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cANY_WSParserRuleCall_1;", "signature": "RuleCall getANY_WSParserRuleCall_1()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cGroup_2;", "signature": "Group getGroup_2()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cLeftSquareBracketKeyword_2_0;", "signature": "Keyword getLeftSquareBracketKeyword_2_0()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cANY_WSParserRuleCall_2_1;", "signature": "RuleCall getANY_WSParserRuleCall_2_1()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cLanguageAssignment_2_2;", "signature": "Assignment getLanguageAssignment_2_2()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cLanguageIDTerminalRuleCall_2_2_0;", "signature": "RuleCall getLanguageIDTerminalRuleCall_2_2_0()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cANY_WSParserRuleCall_2_3;", "signature": "RuleCall getANY_WSParserRuleCall_2_3()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cRightSquareBracketKeyword_2_4;", "signature": "Keyword getRightSquareBracketKeyword_2_4()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cANY_WSParserRuleCall_2_5;", "signature": "RuleCall getANY_WSParserRuleCall_2_5()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cLeftSquareBracketKeyword_3;", "signature": "Keyword getLeftSquareBracketKeyword_3()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cAlternatives_4;", "signature": "Alternatives getAlternatives_4()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cGroup_4_0;", "signature": "Group getGroup_4_0()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cContentsAssignment_4_0_0;", "signature": "Assignment getContentsAssignment_4_0_0()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cContentsCodeParserRuleCall_4_0_0_0;", "signature": "RuleCall getContentsCodeParserRuleCall_4_0_0_0()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cGroup_4_0_1;", "signature": "Group getGroup_4_0_1()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cContentsAssignment_4_0_1_0;", "signature": "Assignment getContentsAssignment_4_0_1_0()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cContentsMarkupInCodeParserRuleCall_4_0_1_0_0;", "signature": "RuleCall getContentsMarkupInCodeParserRuleCall_4_0_1_0_0()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cContentsAssignment_4_0_1_1;", "signature": "Assignment getContentsAssignment_4_0_1_1()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cContentsCodeParserRuleCall_4_0_1_1_0;", "signature": "RuleCall getContentsCodeParserRuleCall_4_0_1_1_0()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cGroup_4_1;", "signature": "Group getGroup_4_1()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cContentsAssignment_4_1_0;", "signature": "Assignment getContentsAssignment_4_1_0()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cContentsMarkupInCodeParserRuleCall_4_1_0_0;", "signature": "RuleCall getContentsMarkupInCodeParserRuleCall_4_1_0_0()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cContentsAssignment_4_1_1;", "signature": "Assignment getContentsAssignment_4_1_1()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cContentsCodeParserRuleCall_4_1_1_0;", "signature": "RuleCall getContentsCodeParserRuleCall_4_1_1_0()" }, { "arguments": [], "filename": "org.eclipse.xtext.xdoc/src-gen/org/eclipse/xtext/xdoc/services/XDocGrammarAccess.java", "implementation": "return cRightSquareBracketKeyword_5;", "signature": "Keyword getRightSquareBracketKeyword_5()" } ], "patch": "@@ -143,391 +143,413 @@ public class DocumentElements extends AbstractParserRuleElementFinder {\n \tpublic class ChapterElements extends AbstractParserRuleElementFinder {\n \t\tprivate final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), \"Chapter\");\n \t\tprivate final Group cGroup = (Group)rule.eContents().get(1);\n-\t\tprivate final Keyword cChapterKeyword_0 = (Keyword)cGroup.eContents().get(0);\n-\t\tprivate final Group cGroup_1 = (Group)cGroup.eContents().get(1);\n-\t\tprivate final Keyword cColonKeyword_1_0 = (Keyword)cGroup_1.eContents().get(0);\n-\t\tprivate final Assignment cNameAssignment_1_1 = (Assignment)cGroup_1.eContents().get(1);\n-\t\tprivate final RuleCall cNameIDTerminalRuleCall_1_1_0 = (RuleCall)cNameAssignment_1_1.eContents().get(0);\n-\t\tprivate final Keyword cLeftSquareBracketKeyword_2 = (Keyword)cGroup.eContents().get(2);\n-\t\tprivate final Assignment cTitleAssignment_3 = (Assignment)cGroup.eContents().get(3);\n-\t\tprivate final RuleCall cTitleTextOrMarkupParserRuleCall_3_0 = (RuleCall)cTitleAssignment_3.eContents().get(0);\n-\t\tprivate final Keyword cRightSquareBracketKeyword_4 = (Keyword)cGroup.eContents().get(4);\n-\t\tprivate final Group cGroup_5 = (Group)cGroup.eContents().get(5);\n-\t\tprivate final RuleCall cMULTI_NLTerminalRuleCall_5_0 = (RuleCall)cGroup_5.eContents().get(0);\n-\t\tprivate final Assignment cContentsAssignment_5_1 = (Assignment)cGroup_5.eContents().get(1);\n-\t\tprivate final RuleCall cContentsTextOrMarkupParserRuleCall_5_1_0 = (RuleCall)cContentsAssignment_5_1.eContents().get(0);\n-\t\tprivate final Group cGroup_6 = (Group)cGroup.eContents().get(6);\n-\t\tprivate final RuleCall cMULTI_NLTerminalRuleCall_6_0 = (RuleCall)cGroup_6.eContents().get(0);\n-\t\tprivate final Assignment cContentsAssignment_6_1 = (Assignment)cGroup_6.eContents().get(1);\n-\t\tprivate final RuleCall cContentsSectionParserRuleCall_6_1_0 = (RuleCall)cContentsAssignment_6_1.eContents().get(0);\n+\t\tprivate final Alternatives cAlternatives_0 = (Alternatives)cGroup.eContents().get(0);\n+\t\tprivate final Group cGroup_0_0 = (Group)cAlternatives_0.eContents().get(0);\n+\t\tprivate final Keyword cChapterKeyword_0_0_0 = (Keyword)cGroup_0_0.eContents().get(0);\n+\t\tprivate final Assignment cNameAssignment_0_0_1 = (Assignment)cGroup_0_0.eContents().get(1);\n+\t\tprivate final RuleCall cNameIDTerminalRuleCall_0_0_1_0 = (RuleCall)cNameAssignment_0_0_1.eContents().get(0);\n+\t\tprivate final Keyword cLeftSquareBracketKeyword_0_0_2 = (Keyword)cGroup_0_0.eContents().get(2);\n+\t\tprivate final Keyword cChapterKeyword_0_1 = (Keyword)cAlternatives_0.eContents().get(1);\n+\t\tprivate final Assignment cTitleAssignment_1 = (Assignment)cGroup.eContents().get(1);\n+\t\tprivate final RuleCall cTitleTextOrMarkupParserRuleCall_1_0 = (RuleCall)cTitleAssignment_1.eContents().get(0);\n+\t\tprivate final Keyword cRightSquareBracketKeyword_2 = (Keyword)cGroup.eContents().get(2);\n+\t\tprivate final Group cGroup_3 = (Group)cGroup.eContents().get(3);\n+\t\tprivate final RuleCall cMULTI_NLTerminalRuleCall_3_0 = (RuleCall)cGroup_3.eContents().get(0);\n+\t\tprivate final Assignment cContentsAssignment_3_1 = (Assignment)cGroup_3.eContents().get(1);\n+\t\tprivate final RuleCall cContentsTextOrMarkupParserRuleCall_3_1_0 = (RuleCall)cContentsAssignment_3_1.eContents().get(0);\n+\t\tprivate final Group cGroup_4 = (Group)cGroup.eContents().get(4);\n+\t\tprivate final RuleCall cMULTI_NLTerminalRuleCall_4_0 = (RuleCall)cGroup_4.eContents().get(0);\n+\t\tprivate final Assignment cContentsAssignment_4_1 = (Assignment)cGroup_4.eContents().get(1);\n+\t\tprivate final RuleCall cContentsSectionParserRuleCall_4_1_0 = (RuleCall)cContentsAssignment_4_1.eContents().get(0);\n \t\t\n \t\t//Chapter:\n-\t\t//\t\"\\\\chapter\" (\":\" name=ID)? \"[\" title=TextOrMarkup \"]\" (MULTI_NL contents+=TextOrMarkup)* (MULTI_NL\n+\t\t//\t(\"chapter:\" name=ID \"[\" | \"chapter[\") title=TextOrMarkup \"]\" (MULTI_NL contents+=TextOrMarkup)* (MULTI_NL\n \t\t//\tcontents+=Section)*;\n \t\tpublic ParserRule getRule() { return rule; }\n \n-\t\t//\"\\\\chapter\" (\":\" name=ID)? \"[\" title=TextOrMarkup \"]\" (MULTI_NL contents+=TextOrMarkup)* (MULTI_NL contents+=Section)*\n+\t\t//(\"chapter:\" name=ID \"[\" | \"chapter[\") title=TextOrMarkup \"]\" (MULTI_NL contents+=TextOrMarkup)* (MULTI_NL\n+\t\t//contents+=Section)*\n \t\tpublic Group getGroup() { return cGroup; }\n \n-\t\t//\"\\\\chapter\"\n-\t\tpublic Keyword getChapterKeyword_0() { return cChapterKeyword_0; }\n+\t\t//\"chapter:\" name=ID \"[\" | \"chapter[\"\n+\t\tpublic Alternatives getAlternatives_0() { return cAlternatives_0; }\n \n-\t\t//(\":\" name=ID)?\n-\t\tpublic Group getGroup_1() { return cGroup_1; }\n+\t\t//\"chapter:\" name=ID \"[\"\n+\t\tpublic Group getGroup_0_0() { return cGroup_0_0; }\n \n-\t\t//\":\"\n-\t\tpublic Keyword getColonKeyword_1_0() { return cColonKeyword_1_0; }\n+\t\t//\"chapter:\"\n+\t\tpublic Keyword getChapterKeyword_0_0_0() { return cChapterKeyword_0_0_0; }\n \n \t\t//name=ID\n-\t\tpublic Assignment getNameAssignment_1_1() { return cNameAssignment_1_1; }\n+\t\tpublic Assignment getNameAssignment_0_0_1() { return cNameAssignment_0_0_1; }\n \n \t\t//ID\n-\t\tpublic RuleCall getNameIDTerminalRuleCall_1_1_0() { return cNameIDTerminalRuleCall_1_1_0; }\n+\t\tpublic RuleCall getNameIDTerminalRuleCall_0_0_1_0() { return cNameIDTerminalRuleCall_0_0_1_0; }\n \n \t\t//\"[\"\n-\t\tpublic Keyword getLeftSquareBracketKeyword_2() { return cLeftSquareBracketKeyword_2; }\n+\t\tpublic Keyword getLeftSquareBracketKeyword_0_0_2() { return cLeftSquareBracketKeyword_0_0_2; }\n+\n+\t\t//\"chapter[\"\n+\t\tpublic Keyword getChapterKeyword_0_1() { return cChapterKeyword_0_1; }\n \n \t\t//title=TextOrMarkup\n-\t\tpublic Assignment getTitleAssignment_3() { return cTitleAssignment_3; }\n+\t\tpublic Assignment getTitleAssignment_1() { return cTitleAssignment_1; }\n \n \t\t//TextOrMarkup\n-\t\tpublic RuleCall getTitleTextOrMarkupParserRuleCall_3_0() { return cTitleTextOrMarkupParserRuleCall_3_0; }\n+\t\tpublic RuleCall getTitleTextOrMarkupParserRuleCall_1_0() { return cTitleTextOrMarkupParserRuleCall_1_0; }\n \n \t\t//\"]\"\n-\t\tpublic Keyword getRightSquareBracketKeyword_4() { return cRightSquareBracketKeyword_4; }\n+\t\tpublic Keyword getRightSquareBracketKeyword_2() { return cRightSquareBracketKeyword_2; }\n \n \t\t//(MULTI_NL contents+=TextOrMarkup)*\n-\t\tpublic Group getGroup_5() { return cGroup_5; }\n+\t\tpublic Group getGroup_3() { return cGroup_3; }\n \n \t\t//MULTI_NL\n-\t\tpublic RuleCall getMULTI_NLTerminalRuleCall_5_0() { return cMULTI_NLTerminalRuleCall_5_0; }\n+\t\tpublic RuleCall getMULTI_NLTerminalRuleCall_3_0() { return cMULTI_NLTerminalRuleCall_3_0; }\n \n \t\t//contents+=TextOrMarkup\n-\t\tpublic Assignment getContentsAssignment_5_1() { return cContentsAssignment_5_1; }\n+\t\tpublic Assignment getContentsAssignment_3_1() { return cContentsAssignment_3_1; }\n \n \t\t//TextOrMarkup\n-\t\tpublic RuleCall getContentsTextOrMarkupParserRuleCall_5_1_0() { return cContentsTextOrMarkupParserRuleCall_5_1_0; }\n+\t\tpublic RuleCall getContentsTextOrMarkupParserRuleCall_3_1_0() { return cContentsTextOrMarkupParserRuleCall_3_1_0; }\n \n \t\t//(MULTI_NL contents+=Section)*\n-\t\tpublic Group getGroup_6() { return cGroup_6; }\n+\t\tpublic Group getGroup_4() { return cGroup_4; }\n \n \t\t//MULTI_NL\n-\t\tpublic RuleCall getMULTI_NLTerminalRuleCall_6_0() { return cMULTI_NLTerminalRuleCall_6_0; }\n+\t\tpublic RuleCall getMULTI_NLTerminalRuleCall_4_0() { return cMULTI_NLTerminalRuleCall_4_0; }\n \n \t\t//contents+=Section\n-\t\tpublic Assignment getContentsAssignment_6_1() { return cContentsAssignment_6_1; }\n+\t\tpublic Assignment getContentsAssignment_4_1() { return cContentsAssignment_4_1; }\n \n \t\t//Section\n-\t\tpublic RuleCall getContentsSectionParserRuleCall_6_1_0() { return cContentsSectionParserRuleCall_6_1_0; }\n+\t\tpublic RuleCall getContentsSectionParserRuleCall_4_1_0() { return cContentsSectionParserRuleCall_4_1_0; }\n \t}\n \n \tpublic class SectionElements extends AbstractParserRuleElementFinder {\n \t\tprivate final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), \"Section\");\n \t\tprivate final Group cGroup = (Group)rule.eContents().get(1);\n-\t\tprivate final Keyword cSectionKeyword_0 = (Keyword)cGroup.eContents().get(0);\n-\t\tprivate final Group cGroup_1 = (Group)cGroup.eContents().get(1);\n-\t\tprivate final Keyword cColonKeyword_1_0 = (Keyword)cGroup_1.eContents().get(0);\n-\t\tprivate final Assignment cNameAssignment_1_1 = (Assignment)cGroup_1.eContents().get(1);\n-\t\tprivate final RuleCall cNameIDTerminalRuleCall_1_1_0 = (RuleCall)cNameAssignment_1_1.eContents().get(0);\n-\t\tprivate final Keyword cLeftSquareBracketKeyword_2 = (Keyword)cGroup.eContents().get(2);\n-\t\tprivate final Assignment cTitleAssignment_3 = (Assignment)cGroup.eContents().get(3);\n-\t\tprivate final RuleCall cTitleTextOrMarkupParserRuleCall_3_0 = (RuleCall)cTitleAssignment_3.eContents().get(0);\n-\t\tprivate final Keyword cRightSquareBracketKeyword_4 = (Keyword)cGroup.eContents().get(4);\n-\t\tprivate final Group cGroup_5 = (Group)cGroup.eContents().get(5);\n-\t\tprivate final RuleCall cMULTI_NLTerminalRuleCall_5_0 = (RuleCall)cGroup_5.eContents().get(0);\n-\t\tprivate final Assignment cContentsAssignment_5_1 = (Assignment)cGroup_5.eContents().get(1);\n-\t\tprivate final RuleCall cContentsTextOrMarkupParserRuleCall_5_1_0 = (RuleCall)cContentsAssignment_5_1.eContents().get(0);\n-\t\tprivate final Group cGroup_6 = (Group)cGroup.eContents().get(6);\n-\t\tprivate final RuleCall cMULTI_NLTerminalRuleCall_6_0 = (RuleCall)cGroup_6.eContents().get(0);\n-\t\tprivate final Assignment cContentsAssignment_6_1 = (Assignment)cGroup_6.eContents().get(1);\n-\t\tprivate final RuleCall cContentsSubSectionParserRuleCall_6_1_0 = (RuleCall)cContentsAssignment_6_1.eContents().get(0);\n+\t\tprivate final Alternatives cAlternatives_0 = (Alternatives)cGroup.eContents().get(0);\n+\t\tprivate final Group cGroup_0_0 = (Group)cAlternatives_0.eContents().get(0);\n+\t\tprivate final Keyword cSectionKeyword_0_0_0 = (Keyword)cGroup_0_0.eContents().get(0);\n+\t\tprivate final Assignment cNameAssignment_0_0_1 = (Assignment)cGroup_0_0.eContents().get(1);\n+\t\tprivate final RuleCall cNameIDTerminalRuleCall_0_0_1_0 = (RuleCall)cNameAssignment_0_0_1.eContents().get(0);\n+\t\tprivate final Keyword cLeftSquareBracketKeyword_0_0_2 = (Keyword)cGroup_0_0.eContents().get(2);\n+\t\tprivate final Keyword cSectionKeyword_0_1 = (Keyword)cAlternatives_0.eContents().get(1);\n+\t\tprivate final Assignment cTitleAssignment_1 = (Assignment)cGroup.eContents().get(1);\n+\t\tprivate final RuleCall cTitleTextOrMarkupParserRuleCall_1_0 = (RuleCall)cTitleAssignment_1.eContents().get(0);\n+\t\tprivate final Keyword cRightSquareBracketKeyword_2 = (Keyword)cGroup.eContents().get(2);\n+\t\tprivate final Group cGroup_3 = (Group)cGroup.eContents().get(3);\n+\t\tprivate final RuleCall cMULTI_NLTerminalRuleCall_3_0 = (RuleCall)cGroup_3.eContents().get(0);\n+\t\tprivate final Assignment cContentsAssignment_3_1 = (Assignment)cGroup_3.eContents().get(1);\n+\t\tprivate final RuleCall cContentsTextOrMarkupParserRuleCall_3_1_0 = (RuleCall)cContentsAssignment_3_1.eContents().get(0);\n+\t\tprivate final Group cGroup_4 = (Group)cGroup.eContents().get(4);\n+\t\tprivate final RuleCall cMULTI_NLTerminalRuleCall_4_0 = (RuleCall)cGroup_4.eContents().get(0);\n+\t\tprivate final Assignment cContentsAssignment_4_1 = (Assignment)cGroup_4.eContents().get(1);\n+\t\tprivate final RuleCall cContentsSubSectionParserRuleCall_4_1_0 = (RuleCall)cContentsAssignment_4_1.eContents().get(0);\n \t\t\n \t\t//Section:\n-\t\t//\t\"\\\\section\" (\":\" name=ID)? \"[\" title=TextOrMarkup \"]\" (MULTI_NL contents+=TextOrMarkup)* (MULTI_NL\n+\t\t//\t(\"section:\" name=ID \"[\" | \"section[\") title=TextOrMarkup \"]\" (MULTI_NL contents+=TextOrMarkup)* (MULTI_NL\n \t\t//\tcontents+=SubSection)*;\n \t\tpublic ParserRule getRule() { return rule; }\n \n-\t\t//\"\\\\section\" (\":\" name=ID)? \"[\" title=TextOrMarkup \"]\" (MULTI_NL contents+=TextOrMarkup)* (MULTI_NL\n+\t\t//(\"section:\" name=ID \"[\" | \"section[\") title=TextOrMarkup \"]\" (MULTI_NL contents+=TextOrMarkup)* (MULTI_NL\n \t\t//contents+=SubSection)*\n \t\tpublic Group getGroup() { return cGroup; }\n \n-\t\t//\"\\\\section\"\n-\t\tpublic Keyword getSectionKeyword_0() { return cSectionKeyword_0; }\n+\t\t//\"section:\" name=ID \"[\" | \"section[\"\n+\t\tpublic Alternatives getAlternatives_0() { return cAlternatives_0; }\n \n-\t\t//(\":\" name=ID)?\n-\t\tpublic Group getGroup_1() { return cGroup_1; }\n+\t\t//\"section:\" name=ID \"[\"\n+\t\tpublic Group getGroup_0_0() { return cGroup_0_0; }\n \n-\t\t//\":\"\n-\t\tpublic Keyword getColonKeyword_1_0() { return cColonKeyword_1_0; }\n+\t\t//\"section:\"\n+\t\tpublic Keyword getSectionKeyword_0_0_0() { return cSectionKeyword_0_0_0; }\n \n \t\t//name=ID\n-\t\tpublic Assignment getNameAssignment_1_1() { return cNameAssignment_1_1; }\n+\t\tpublic Assignment getNameAssignment_0_0_1() { return cNameAssignment_0_0_1; }\n \n \t\t//ID\n-\t\tpublic RuleCall getNameIDTerminalRuleCall_1_1_0() { return cNameIDTerminalRuleCall_1_1_0; }\n+\t\tpublic RuleCall getNameIDTerminalRuleCall_0_0_1_0() { return cNameIDTerminalRuleCall_0_0_1_0; }\n \n \t\t//\"[\"\n-\t\tpublic Keyword getLeftSquareBracketKeyword_2() { return cLeftSquareBracketKeyword_2; }\n+\t\tpublic Keyword getLeftSquareBracketKeyword_0_0_2() { return cLeftSquareBracketKeyword_0_0_2; }\n+\n+\t\t//\"section[\"\n+\t\tpublic Keyword getSectionKeyword_0_1() { return cSectionKeyword_0_1; }\n \n \t\t//title=TextOrMarkup\n-\t\tpublic Assignment getTitleAssignment_3() { return cTitleAssignment_3; }\n+\t\tpublic Assignment getTitleAssignment_1() { return cTitleAssignment_1; }\n \n \t\t//TextOrMarkup\n-\t\tpublic RuleCall getTitleTextOrMarkupParserRuleCall_3_0() { return cTitleTextOrMarkupParserRuleCall_3_0; }\n+\t\tpublic RuleCall getTitleTextOrMarkupParserRuleCall_1_0() { return cTitleTextOrMarkupParserRuleCall_1_0; }\n \n \t\t//\"]\"\n-\t\tpublic Keyword getRightSquareBracketKeyword_4() { return cRightSquareBracketKeyword_4; }\n+\t\tpublic Keyword getRightSquareBracketKeyword_2() { return cRightSquareBracketKeyword_2; }\n \n \t\t//(MULTI_NL contents+=TextOrMarkup)*\n-\t\tpublic Group getGroup_5() { return cGroup_5; }\n+\t\tpublic Group getGroup_3() { return cGroup_3; }\n \n \t\t//MULTI_NL\n-\t\tpublic RuleCall getMULTI_NLTerminalRuleCall_5_0() { return cMULTI_NLTerminalRuleCall_5_0; }\n+\t\tpublic RuleCall getMULTI_NLTerminalRuleCall_3_0() { return cMULTI_NLTerminalRuleCall_3_0; }\n \n \t\t//contents+=TextOrMarkup\n-\t\tpublic Assignment getContentsAssignment_5_1() { return cContentsAssignment_5_1; }\n+\t\tpublic Assignment getContentsAssignment_3_1() { return cContentsAssignment_3_1; }\n \n \t\t//TextOrMarkup\n-\t\tpublic RuleCall getContentsTextOrMarkupParserRuleCall_5_1_0() { return cContentsTextOrMarkupParserRuleCall_5_1_0; }\n+\t\tpublic RuleCall getContentsTextOrMarkupParserRuleCall_3_1_0() { return cContentsTextOrMarkupParserRuleCall_3_1_0; }\n \n \t\t//(MULTI_NL contents+=SubSection)*\n-\t\tpublic Group getGroup_6() { return cGroup_6; }\n+\t\tpublic Group getGroup_4() { return cGroup_4; }\n \n \t\t//MULTI_NL\n-\t\tpublic RuleCall getMULTI_NLTerminalRuleCall_6_0() { return cMULTI_NLTerminalRuleCall_6_0; }\n+\t\tpublic RuleCall getMULTI_NLTerminalRuleCall_4_0() { return cMULTI_NLTerminalRuleCall_4_0; }\n \n \t\t//contents+=SubSection\n-\t\tpublic Assignment getContentsAssignment_6_1() { return cContentsAssignment_6_1; }\n+\t\tpublic Assignment getContentsAssignment_4_1() { return cContentsAssignment_4_1; }\n \n \t\t//SubSection\n-\t\tpublic RuleCall getContentsSubSectionParserRuleCall_6_1_0() { return cContentsSubSectionParserRuleCall_6_1_0; }\n+\t\tpublic RuleCall getContentsSubSectionParserRuleCall_4_1_0() { return cContentsSubSectionParserRuleCall_4_1_0; }\n \t}\n \n \tpublic class SubSectionElements extends AbstractParserRuleElementFinder {\n \t\tprivate final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), \"SubSection\");\n \t\tprivate final Group cGroup = (Group)rule.eContents().get(1);\n-\t\tprivate final Keyword cSubsectionKeyword_0 = (Keyword)cGroup.eContents().get(0);\n-\t\tprivate final Group cGroup_1 = (Group)cGroup.eContents().get(1);\n-\t\tprivate final Keyword cColonKeyword_1_0 = (Keyword)cGroup_1.eContents().get(0);\n-\t\tprivate final Assignment cNameAssignment_1_1 = (Assignment)cGroup_1.eContents().get(1);\n-\t\tprivate final RuleCall cNameIDTerminalRuleCall_1_1_0 = (RuleCall)cNameAssignment_1_1.eContents().get(0);\n-\t\tprivate final Keyword cLeftSquareBracketKeyword_2 = (Keyword)cGroup.eContents().get(2);\n-\t\tprivate final Assignment cTitleAssignment_3 = (Assignment)cGroup.eContents().get(3);\n-\t\tprivate final RuleCall cTitleTextOrMarkupParserRuleCall_3_0 = (RuleCall)cTitleAssignment_3.eContents().get(0);\n-\t\tprivate final Keyword cRightSquareBracketKeyword_4 = (Keyword)cGroup.eContents().get(4);\n-\t\tprivate final Group cGroup_5 = (Group)cGroup.eContents().get(5);\n-\t\tprivate final RuleCall cMULTI_NLTerminalRuleCall_5_0 = (RuleCall)cGroup_5.eContents().get(0);\n-\t\tprivate final Assignment cContentsAssignment_5_1 = (Assignment)cGroup_5.eContents().get(1);\n-\t\tprivate final RuleCall cContentsTextOrMarkupParserRuleCall_5_1_0 = (RuleCall)cContentsAssignment_5_1.eContents().get(0);\n-\t\tprivate final Group cGroup_6 = (Group)cGroup.eContents().get(6);\n-\t\tprivate final RuleCall cMULTI_NLTerminalRuleCall_6_0 = (RuleCall)cGroup_6.eContents().get(0);\n-\t\tprivate final Assignment cContentsAssignment_6_1 = (Assignment)cGroup_6.eContents().get(1);\n-\t\tprivate final RuleCall cContentsSection3ParserRuleCall_6_1_0 = (RuleCall)cContentsAssignment_6_1.eContents().get(0);\n+\t\tprivate final Alternatives cAlternatives_0 = (Alternatives)cGroup.eContents().get(0);\n+\t\tprivate final Group cGroup_0_0 = (Group)cAlternatives_0.eContents().get(0);\n+\t\tprivate final Keyword cSubsectionKeyword_0_0_0 = (Keyword)cGroup_0_0.eContents().get(0);\n+\t\tprivate final Assignment cNameAssignment_0_0_1 = (Assignment)cGroup_0_0.eContents().get(1);\n+\t\tprivate final RuleCall cNameIDTerminalRuleCall_0_0_1_0 = (RuleCall)cNameAssignment_0_0_1.eContents().get(0);\n+\t\tprivate final Keyword cLeftSquareBracketKeyword_0_0_2 = (Keyword)cGroup_0_0.eContents().get(2);\n+\t\tprivate final Keyword cSubsectionKeyword_0_1 = (Keyword)cAlternatives_0.eContents().get(1);\n+\t\tprivate final Assignment cTitleAssignment_1 = (Assignment)cGroup.eContents().get(1);\n+\t\tprivate final RuleCall cTitleTextOrMarkupParserRuleCall_1_0 = (RuleCall)cTitleAssignment_1.eContents().get(0);\n+\t\tprivate final Keyword cRightSquareBracketKeyword_2 = (Keyword)cGroup.eContents().get(2);\n+\t\tprivate final Group cGroup_3 = (Group)cGroup.eContents().get(3);\n+\t\tprivate final RuleCall cMULTI_NLTerminalRuleCall_3_0 = (RuleCall)cGroup_3.eContents().get(0);\n+\t\tprivate final Assignment cContentsAssignment_3_1 = (Assignment)cGroup_3.eContents().get(1);\n+\t\tprivate final RuleCall cContentsTextOrMarkupParserRuleCall_3_1_0 = (RuleCall)cContentsAssignment_3_1.eContents().get(0);\n+\t\tprivate final Group cGroup_4 = (Group)cGroup.eContents().get(4);\n+\t\tprivate final RuleCall cMULTI_NLTerminalRuleCall_4_0 = (RuleCall)cGroup_4.eContents().get(0);\n+\t\tprivate final Assignment cContentsAssignment_4_1 = (Assignment)cGroup_4.eContents().get(1);\n+\t\tprivate final RuleCall cContentsSection3ParserRuleCall_4_1_0 = (RuleCall)cContentsAssignment_4_1.eContents().get(0);\n \t\t\n \t\t//SubSection:\n-\t\t//\t\"\\\\subsection\" (\":\" name=ID)? \"[\" title=TextOrMarkup \"]\" (MULTI_NL contents+=TextOrMarkup)* (MULTI_NL\n+\t\t//\t(\"subsection:\" name=ID \"[\" | \"subsection[\") title=TextOrMarkup \"]\" (MULTI_NL contents+=TextOrMarkup)* (MULTI_NL\n \t\t//\tcontents+=Section3)*;\n \t\tpublic ParserRule getRule() { return rule; }\n \n-\t\t//\"\\\\subsection\" (\":\" name=ID)? \"[\" title=TextOrMarkup \"]\" (MULTI_NL contents+=TextOrMarkup)* (MULTI_NL\n+\t\t//(\"subsection:\" name=ID \"[\" | \"subsection[\") title=TextOrMarkup \"]\" (MULTI_NL contents+=TextOrMarkup)* (MULTI_NL\n \t\t//contents+=Section3)*\n \t\tpublic Group getGroup() { return cGroup; }\n \n-\t\t//\"\\\\subsection\"\n-\t\tpublic Keyword getSubsectionKeyword_0() { return cSubsectionKeyword_0; }\n+\t\t//\"subsection:\" name=ID \"[\" | \"subsection[\"\n+\t\tpublic Alternatives getAlternatives_0() { return cAlternatives_0; }\n \n-\t\t//(\":\" name=ID)?\n-\t\tpublic Group getGroup_1() { return cGroup_1; }\n+\t\t//\"subsection:\" name=ID \"[\"\n+\t\tpublic Group getGroup_0_0() { return cGroup_0_0; }\n \n-\t\t//\":\"\n-\t\tpublic Keyword getColonKeyword_1_0() { return cColonKeyword_1_0; }\n+\t\t//\"subsection:\"\n+\t\tpublic Keyword getSubsectionKeyword_0_0_0() { return cSubsectionKeyword_0_0_0; }\n \n \t\t//name=ID\n-\t\tpublic Assignment getNameAssignment_1_1() { return cNameAssignment_1_1; }\n+\t\tpublic Assignment getNameAssignment_0_0_1() { return cNameAssignment_0_0_1; }\n \n \t\t//ID\n-\t\tpublic RuleCall getNameIDTerminalRuleCall_1_1_0() { return cNameIDTerminalRuleCall_1_1_0; }\n+\t\tpublic RuleCall getNameIDTerminalRuleCall_0_0_1_0() { return cNameIDTerminalRuleCall_0_0_1_0; }\n \n \t\t//\"[\"\n-\t\tpublic Keyword getLeftSquareBracketKeyword_2() { return cLeftSquareBracketKeyword_2; }\n+\t\tpublic Keyword getLeftSquareBracketKeyword_0_0_2() { return cLeftSquareBracketKeyword_0_0_2; }\n+\n+\t\t//\"subsection[\"\n+\t\tpublic Keyword getSubsectionKeyword_0_1() { return cSubsectionKeyword_0_1; }\n \n \t\t//title=TextOrMarkup\n-\t\tpublic Assignment getTitleAssignment_3() { return cTitleAssignment_3; }\n+\t\tpublic Assignment getTitleAssignment_1() { return cTitleAssignment_1; }\n \n \t\t//TextOrMarkup\n-\t\tpublic RuleCall getTitleTextOrMarkupParserRuleCall_3_0() { return cTitleTextOrMarkupParserRuleCall_3_0; }\n+\t\tpublic RuleCall getTitleTextOrMarkupParserRuleCall_1_0() { return cTitleTextOrMarkupParserRuleCall_1_0; }\n \n \t\t//\"]\"\n-\t\tpublic Keyword getRightSquareBracketKeyword_4() { return cRightSquareBracketKeyword_4; }\n+\t\tpublic Keyword getRightSquareBracketKeyword_2() { return cRightSquareBracketKeyword_2; }\n \n \t\t//(MULTI_NL contents+=TextOrMarkup)*\n-\t\tpublic Group getGroup_5() { return cGroup_5; }\n+\t\tpublic Group getGroup_3() { return cGroup_3; }\n \n \t\t//MULTI_NL\n-\t\tpublic RuleCall getMULTI_NLTerminalRuleCall_5_0() { return cMULTI_NLTerminalRuleCall_5_0; }\n+\t\tpublic RuleCall getMULTI_NLTerminalRuleCall_3_0() { return cMULTI_NLTerminalRuleCall_3_0; }\n \n \t\t//contents+=TextOrMarkup\n-\t\tpublic Assignment getContentsAssignment_5_1() { return cContentsAssignment_5_1; }\n+\t\tpublic Assignment getContentsAssignment_3_1() { return cContentsAssignment_3_1; }\n \n \t\t//TextOrMarkup\n-\t\tpublic RuleCall getContentsTextOrMarkupParserRuleCall_5_1_0() { return cContentsTextOrMarkupParserRuleCall_5_1_0; }\n+\t\tpublic RuleCall getContentsTextOrMarkupParserRuleCall_3_1_0() { return cContentsTextOrMarkupParserRuleCall_3_1_0; }\n \n \t\t//(MULTI_NL contents+=Section3)*\n-\t\tpublic Group getGroup_6() { return cGroup_6; }\n+\t\tpublic Group getGroup_4() { return cGroup_4; }\n \n \t\t//MULTI_NL\n-\t\tpublic RuleCall getMULTI_NLTerminalRuleCall_6_0() { return cMULTI_NLTerminalRuleCall_6_0; }\n+\t\tpublic RuleCall getMULTI_NLTerminalRuleCall_4_0() { return cMULTI_NLTerminalRuleCall_4_0; }\n \n \t\t//contents+=Section3\n-\t\tpublic Assignment getContentsAssignment_6_1() { return cContentsAssignment_6_1; }\n+\t\tpublic Assignment getContentsAssignment_4_1() { return cContentsAssignment_4_1; }\n \n \t\t//Section3\n-\t\tpublic RuleCall getContentsSection3ParserRuleCall_6_1_0() { return cContentsSection3ParserRuleCall_6_1_0; }\n+\t\tpublic RuleCall getContentsSection3ParserRuleCall_4_1_0() { return cContentsSection3ParserRuleCall_4_1_0; }\n \t}\n \n \tpublic class Section3Elements extends AbstractParserRuleElementFinder {\n \t\tprivate final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), \"Section3\");\n \t\tprivate final Group cGroup = (Group)rule.eContents().get(1);\n-\t\tprivate final Keyword cSection3Keyword_0 = (Keyword)cGroup.eContents().get(0);\n-\t\tprivate final Group cGroup_1 = (Group)cGroup.eContents().get(1);\n-\t\tprivate final Keyword cColonKeyword_1_0 = (Keyword)cGroup_1.eContents().get(0);\n-\t\tprivate final Assignment cNameAssignment_1_1 = (Assignment)cGroup_1.eContents().get(1);\n-\t\tprivate final RuleCall cNameIDTerminalRuleCall_1_1_0 = (RuleCall)cNameAssignment_1_1.eContents().get(0);\n-\t\tprivate final Keyword cLeftSquareBracketKeyword_2 = (Keyword)cGroup.eContents().get(2);\n-\t\tprivate final Assignment cTitleAssignment_3 = (Assignment)cGroup.eContents().get(3);\n-\t\tprivate final RuleCall cTitleTextOrMarkupParserRuleCall_3_0 = (RuleCall)cTitleAssignment_3.eContents().get(0);\n-\t\tprivate final Keyword cRightSquareBracketKeyword_4 = (Keyword)cGroup.eContents().get(4);\n-\t\tprivate final Group cGroup_5 = (Group)cGroup.eContents().get(5);\n-\t\tprivate final RuleCall cMULTI_NLTerminalRuleCall_5_0 = (RuleCall)cGroup_5.eContents().get(0);\n-\t\tprivate final Assignment cContentsAssignment_5_1 = (Assignment)cGroup_5.eContents().get(1);\n-\t\tprivate final RuleCall cContentsTextOrMarkupParserRuleCall_5_1_0 = (RuleCall)cContentsAssignment_5_1.eContents().get(0);\n-\t\tprivate final Group cGroup_6 = (Group)cGroup.eContents().get(6);\n-\t\tprivate final RuleCall cMULTI_NLTerminalRuleCall_6_0 = (RuleCall)cGroup_6.eContents().get(0);\n-\t\tprivate final Assignment cContentsAssignment_6_1 = (Assignment)cGroup_6.eContents().get(1);\n-\t\tprivate final RuleCall cContentsSection4ParserRuleCall_6_1_0 = (RuleCall)cContentsAssignment_6_1.eContents().get(0);\n+\t\tprivate final Alternatives cAlternatives_0 = (Alternatives)cGroup.eContents().get(0);\n+\t\tprivate final Group cGroup_0_0 = (Group)cAlternatives_0.eContents().get(0);\n+\t\tprivate final Keyword cSection3Keyword_0_0_0 = (Keyword)cGroup_0_0.eContents().get(0);\n+\t\tprivate final Assignment cNameAssignment_0_0_1 = (Assignment)cGroup_0_0.eContents().get(1);\n+\t\tprivate final RuleCall cNameIDTerminalRuleCall_0_0_1_0 = (RuleCall)cNameAssignment_0_0_1.eContents().get(0);\n+\t\tprivate final Keyword cLeftSquareBracketKeyword_0_0_2 = (Keyword)cGroup_0_0.eContents().get(2);\n+\t\tprivate final Keyword cSection3Keyword_0_1 = (Keyword)cAlternatives_0.eContents().get(1);\n+\t\tprivate final Assignment cTitleAssignment_1 = (Assignment)cGroup.eContents().get(1);\n+\t\tprivate final RuleCall cTitleTextOrMarkupParserRuleCall_1_0 = (RuleCall)cTitleAssignment_1.eContents().get(0);\n+\t\tprivate final Keyword cRightSquareBracketKeyword_2 = (Keyword)cGroup.eContents().get(2);\n+\t\tprivate final Group cGroup_3 = (Group)cGroup.eContents().get(3);\n+\t\tprivate final RuleCall cMULTI_NLTerminalRuleCall_3_0 = (RuleCall)cGroup_3.eContents().get(0);\n+\t\tprivate final Assignment cContentsAssignment_3_1 = (Assignment)cGroup_3.eContents().get(1);\n+\t\tprivate final RuleCall cContentsTextOrMarkupParserRuleCall_3_1_0 = (RuleCall)cContentsAssignment_3_1.eContents().get(0);\n+\t\tprivate final Group cGroup_4 = (Group)cGroup.eContents().get(4);\n+\t\tprivate final RuleCall cMULTI_NLTerminalRuleCall_4_0 = (RuleCall)cGroup_4.eContents().get(0);\n+\t\tprivate final Assignment cContentsAssignment_4_1 = (Assignment)cGroup_4.eContents().get(1);\n+\t\tprivate final RuleCall cContentsSection4ParserRuleCall_4_1_0 = (RuleCall)cContentsAssignment_4_1.eContents().get(0);\n \t\t\n \t\t//Section3:\n-\t\t//\t\"\\\\section3\" (\":\" name=ID)? \"[\" title=TextOrMarkup \"]\" (MULTI_NL contents+=TextOrMarkup)* (MULTI_NL\n+\t\t//\t(\"section3:\" name=ID \"[\" | \"section3[\") title=TextOrMarkup \"]\" (MULTI_NL contents+=TextOrMarkup)* (MULTI_NL\n \t\t//\tcontents+=Section4)*;\n \t\tpublic ParserRule getRule() { return rule; }\n \n-\t\t//\"\\\\section3\" (\":\" name=ID)? \"[\" title=TextOrMarkup \"]\" (MULTI_NL contents+=TextOrMarkup)* (MULTI_NL contents+=Section4)*\n+\t\t//(\"section3:\" name=ID \"[\" | \"section3[\") title=TextOrMarkup \"]\" (MULTI_NL contents+=TextOrMarkup)* (MULTI_NL\n+\t\t//contents+=Section4)*\n \t\tpublic Group getGroup() { return cGroup; }\n \n-\t\t//\"\\\\section3\"\n-\t\tpublic Keyword getSection3Keyword_0() { return cSection3Keyword_0; }\n+\t\t//\"section3:\" name=ID \"[\" | \"section3[\"\n+\t\tpublic Alternatives getAlternatives_0() { return cAlternatives_0; }\n \n-\t\t//(\":\" name=ID)?\n-\t\tpublic Group getGroup_1() { return cGroup_1; }\n+\t\t//\"section3:\" name=ID \"[\"\n+\t\tpublic Group getGroup_0_0() { return cGroup_0_0; }\n \n-\t\t//\":\"\n-\t\tpublic Keyword getColonKeyword_1_0() { return cColonKeyword_1_0; }\n+\t\t//\"section3:\"\n+\t\tpublic Keyword getSection3Keyword_0_0_0() { return cSection3Keyword_0_0_0; }\n \n \t\t//name=ID\n-\t\tpublic Assignment getNameAssignment_1_1() { return cNameAssignment_1_1; }\n+\t\tpublic Assignment getNameAssignment_0_0_1() { return cNameAssignment_0_0_1; }\n \n \t\t//ID\n-\t\tpublic RuleCall getNameIDTerminalRuleCall_1_1_0() { return cNameIDTerminalRuleCall_1_1_0; }\n+\t\tpublic RuleCall getNameIDTerminalRuleCall_0_0_1_0() { return cNameIDTerminalRuleCall_0_0_1_0; }\n \n \t\t//\"[\"\n-\t\tpublic Keyword getLeftSquareBracketKeyword_2() { return cLeftSquareBracketKeyword_2; }\n+\t\tpublic Keyword getLeftSquareBracketKeyword_0_0_2() { return cLeftSquareBracketKeyword_0_0_2; }\n+\n+\t\t//\"section3[\"\n+\t\tpublic Keyword getSection3Keyword_0_1() { return cSection3Keyword_0_1; }\n \n \t\t//title=TextOrMarkup\n-\t\tpublic Assignment getTitleAssignment_3() { return cTitleAssignment_3; }\n+\t\tpublic Assignment getTitleAssignment_1() { return cTitleAssignment_1; }\n \n \t\t//TextOrMarkup\n-\t\tpublic RuleCall getTitleTextOrMarkupParserRuleCall_3_0() { return cTitleTextOrMarkupParserRuleCall_3_0; }\n+\t\tpublic RuleCall getTitleTextOrMarkupParserRuleCall_1_0() { return cTitleTextOrMarkupParserRuleCall_1_0; }\n \n \t\t//\"]\"\n-\t\tpublic Keyword getRightSquareBracketKeyword_4() { return cRightSquareBracketKeyword_4; }\n+\t\tpublic Keyword getRightSquareBracketKeyword_2() { return cRightSquareBracketKeyword_2; }\n \n \t\t//(MULTI_NL contents+=TextOrMarkup)*\n-\t\tpublic Group getGroup_5() { return cGroup_5; }\n+\t\tpublic Group getGroup_3() { return cGroup_3; }\n \n \t\t//MULTI_NL\n-\t\tpublic RuleCall getMULTI_NLTerminalRuleCall_5_0() { return cMULTI_NLTerminalRuleCall_5_0; }\n+\t\tpublic RuleCall getMULTI_NLTerminalRuleCall_3_0() { return cMULTI_NLTerminalRuleCall_3_0; }\n \n \t\t//contents+=TextOrMarkup\n-\t\tpublic Assignment getContentsAssignment_5_1() { return cContentsAssignment_5_1; }\n+\t\tpublic Assignment getContentsAssignment_3_1() { return cContentsAssignment_3_1; }\n \n \t\t//TextOrMarkup\n-\t\tpublic RuleCall getContentsTextOrMarkupParserRuleCall_5_1_0() { return cContentsTextOrMarkupParserRuleCall_5_1_0; }\n+\t\tpublic RuleCall getContentsTextOrMarkupParserRuleCall_3_1_0() { return cContentsTextOrMarkupParserRuleCall_3_1_0; }\n \n \t\t//(MULTI_NL contents+=Section4)*\n-\t\tpublic Group getGroup_6() { return cGroup_6; }\n+\t\tpublic Group getGroup_4() { return cGroup_4; }\n \n \t\t//MULTI_NL\n-\t\tpublic RuleCall getMULTI_NLTerminalRuleCall_6_0() { return cMULTI_NLTerminalRuleCall_6_0; }\n+\t\tpublic RuleCall getMULTI_NLTerminalRuleCall_4_0() { return cMULTI_NLTerminalRuleCall_4_0; }\n \n \t\t//contents+=Section4\n-\t\tpublic Assignment getContentsAssignment_6_1() { return cContentsAssignment_6_1; }\n+\t\tpublic Assignment getContentsAssignment_4_1() { return cContentsAssignment_4_1; }\n \n \t\t//Section4\n-\t\tpublic RuleCall getContentsSection4ParserRuleCall_6_1_0() { return cContentsSection4ParserRuleCall_6_1_0; }\n+\t\tpublic RuleCall getContentsSection4ParserRuleCall_4_1_0() { return cContentsSection4ParserRuleCall_4_1_0; }\n \t}\n \n \tpublic class Section4Elements extends AbstractParserRuleElementFinder {\n \t\tprivate final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), \"Section4\");\n \t\tprivate final Group cGroup = (Group)rule.eContents().get(1);\n-\t\tprivate final Keyword cSection4Keyword_0 = (Keyword)cGroup.eContents().get(0);\n-\t\tprivate final Group cGroup_1 = (Group)cGroup.eContents().get(1);\n-\t\tprivate final Keyword cColonKeyword_1_0 = (Keyword)cGroup_1.eContents().get(0);\n-\t\tprivate final Assignment cNameAssignment_1_1 = (Assignment)cGroup_1.eContents().get(1);\n-\t\tprivate final RuleCall cNameIDTerminalRuleCall_1_1_0 = (RuleCall)cNameAssignment_1_1.eContents().get(0);\n-\t\tprivate final Keyword cLeftSquareBracketKeyword_2 = (Keyword)cGroup.eContents().get(2);\n-\t\tprivate final Assignment cTitleAssignment_3 = (Assignment)cGroup.eContents().get(3);\n-\t\tprivate final RuleCall cTitleTextOrMarkupParserRuleCall_3_0 = (RuleCall)cTitleAssignment_3.eContents().get(0);\n-\t\tprivate final Keyword cRightSquareBracketKeyword_4 = (Keyword)cGroup.eContents().get(4);\n-\t\tprivate final Group cGroup_5 = (Group)cGroup.eContents().get(5);\n-\t\tprivate final RuleCall cMULTI_NLTerminalRuleCall_5_0 = (RuleCall)cGroup_5.eContents().get(0);\n-\t\tprivate final Assignment cContentsAssignment_5_1 = (Assignment)cGroup_5.eContents().get(1);\n-\t\tprivate final RuleCall cContentsTextOrMarkupParserRuleCall_5_1_0 = (RuleCall)cContentsAssignment_5_1.eContents().get(0);\n+\t\tprivate final Alternatives cAlternatives_0 = (Alternatives)cGroup.eContents().get(0);\n+\t\tprivate final Group cGroup_0_0 = (Group)cAlternatives_0.eContents().get(0);\n+\t\tprivate final Keyword cSection4Keyword_0_0_0 = (Keyword)cGroup_0_0.eContents().get(0);\n+\t\tprivate final Assignment cNameAssignment_0_0_1 = (Assignment)cGroup_0_0.eContents().get(1);\n+\t\tprivate final RuleCall cNameIDTerminalRuleCall_0_0_1_0 = (RuleCall)cNameAssignment_0_0_1.eContents().get(0);\n+\t\tprivate final Keyword cLeftSquareBracketKeyword_0_0_2 = (Keyword)cGroup_0_0.eContents().get(2);\n+\t\tprivate final Keyword cSection4Keyword_0_1 = (Keyword)cAlternatives_0.eContents().get(1);\n+\t\tprivate final Assignment cTitleAssignment_1 = (Assignment)cGroup.eContents().get(1);\n+\t\tprivate final RuleCall cTitleTextOrMarkupParserRuleCall_1_0 = (RuleCall)cTitleAssignment_1.eContents().get(0);\n+\t\tprivate final Keyword cRightSquareBracketKeyword_2 = (Keyword)cGroup.eContents().get(2);\n+\t\tprivate final Group cGroup_3 = (Group)cGroup.eContents().get(3);\n+\t\tprivate final RuleCall cMULTI_NLTerminalRuleCall_3_0 = (RuleCall)cGroup_3.eContents().get(0);\n+\t\tprivate final Assignment cContentsAssignment_3_1 = (Assignment)cGroup_3.eContents().get(1);\n+\t\tprivate final RuleCall cContentsTextOrMarkupParserRuleCall_3_1_0 = (RuleCall)cContentsAssignment_3_1.eContents().get(0);\n \t\t\n \t\t//Section4:\n-\t\t//\t\"\\\\section4\" (\":\" name=ID)? \"[\" title=TextOrMarkup \"]\" (MULTI_NL contents+=TextOrMarkup)*;\n+\t\t//\t(\"section4:\" name=ID \"[\" | \"section4[\") title=TextOrMarkup \"]\" (MULTI_NL contents+=TextOrMarkup)*;\n \t\tpublic ParserRule getRule() { return rule; }\n \n-\t\t//\"\\\\section4\" (\":\" name=ID)? \"[\" title=TextOrMarkup \"]\" (MULTI_NL contents+=TextOrMarkup)*\n+\t\t//(\"section4:\" name=ID \"[\" | \"section4[\") title=TextOrMarkup \"]\" (MULTI_NL contents+=TextOrMarkup)*\n \t\tpublic Group getGroup() { return cGroup; }\n \n-\t\t//\"\\\\section4\"\n-\t\tpublic Keyword getSection4Keyword_0() { return cSection4Keyword_0; }\n+\t\t//\"section4:\" name=ID \"[\" | \"section4[\"\n+\t\tpublic Alternatives getAlternatives_0() { return cAlternatives_0; }\n \n-\t\t//(\":\" name=ID)?\n-\t\tpublic Group getGroup_1() { return cGroup_1; }\n+\t\t//\"section4:\" name=ID \"[\"\n+\t\tpublic Group getGroup_0_0() { return cGroup_0_0; }\n \n-\t\t//\":\"\n-\t\tpublic Keyword getColonKeyword_1_0() { return cColonKeyword_1_0; }\n+\t\t//\"section4:\"\n+\t\tpublic Keyword getSection4Keyword_0_0_0() { return cSection4Keyword_0_0_0; }\n \n \t\t//name=ID\n-\t\tpublic Assignment getNameAssignment_1_1() { return cNameAssignment_1_1; }\n+\t\tpublic Assignment getNameAssignment_0_0_1() { return cNameAssignment_0_0_1; }\n \n \t\t//ID\n-\t\tpublic RuleCall getNameIDTerminalRuleCall_1_1_0() { return cNameIDTerminalRuleCall_1_1_0; }\n+\t\tpublic RuleCall getNameIDTerminalRuleCall_0_0_1_0() { return cNameIDTerminalRuleCall_0_0_1_0; }\n \n \t\t//\"[\"\n-\t\tpublic Keyword getLeftSquareBracketKeyword_2() { return cLeftSquareBracketKeyword_2; }\n+\t\tpublic Keyword getLeftSquareBracketKeyword_0_0_2() { return cLeftSquareBracketKeyword_0_0_2; }\n+\n+\t\t//\"section4[\"\n+\t\tpublic Keyword getSection4Keyword_0_1() { return cSection4Keyword_0_1; }\n \n \t\t//title=TextOrMarkup\n-\t\tpublic Assignment getTitleAssignment_3() { return cTitleAssignment_3; }\n+\t\tpublic Assignment getTitleAssignment_1() { return cTitleAssignment_1; }\n \n \t\t//TextOrMarkup\n-\t\tpublic RuleCall getTitleTextOrMarkupParserRuleCall_3_0() { return cTitleTextOrMarkupParserRuleCall_3_0; }\n+\t\tpublic RuleCall getTitleTextOrMarkupParserRuleCall_1_0() { return cTitleTextOrMarkupParserRuleCall_1_0; }\n \n \t\t//\"]\"\n-\t\tpublic Keyword getRightSquareBracketKeyword_4() { return cRightSquareBracketKeyword_4; }\n+\t\tpublic Keyword getRightSquareBracketKeyword_2() { return cRightSquareBracketKeyword_2; }\n \n \t\t//(MULTI_NL contents+=TextOrMarkup)*\n-\t\tpublic Group getGroup_5() { return cGroup_5; }\n+\t\tpublic Group getGroup_3() { return cGroup_3; }\n \n \t\t//MULTI_NL\n-\t\tpublic RuleCall getMULTI_NLTerminalRuleCall_5_0() { return cMULTI_NLTerminalRuleCall_5_0; }\n+\t\tpublic RuleCall getMULTI_NLTerminalRuleCall_3_0() { return cMULTI_NLTerminalRuleCall_3_0; }\n \n \t\t//contents+=TextOrMarkup\n-\t\tpublic Assignment getContentsAssignment_5_1() { return cContentsAssignment_5_1; }\n+\t\tpublic Assignment getContentsAssignment_3_1() { return cContentsAssignment_3_1; }\n \n \t\t//TextOrMarkup\n-\t\tpublic RuleCall getContentsTextOrMarkupParserRuleCall_5_1_0() { return cContentsTextOrMarkupParserRuleCall_5_1_0; }\n+\t\tpublic RuleCall getContentsTextOrMarkupParserRuleCall_3_1_0() { return cContentsTextOrMarkupParserRuleCall_3_1_0; }\n \t}\n \n \tpublic class IdentifiableElements extends AbstractParserRuleElementFinder {\n@@ -655,13 +677,12 @@ public class TextElements extends AbstractParserRuleElementFinder {\n \t\tprivate final RuleCall cANY_OTHERTerminalRuleCall_3 = (RuleCall)cAlternatives.eContents().get(3);\n \t\tprivate final Keyword cReverseSolidusLeftSquareBracketKeyword_4 = (Keyword)cAlternatives.eContents().get(4);\n \t\tprivate final Keyword cReverseSolidusRightSquareBracketKeyword_5 = (Keyword)cAlternatives.eContents().get(5);\n-\t\tprivate final Keyword cColonKeyword_6 = (Keyword)cAlternatives.eContents().get(6);\n \t\t\n \t\t//Text returns ecore::EString:\n-\t\t//\t(ID | WS | SINGLE_NL | ANY_OTHER | \"\\\\[\" | \"\\\\]\" | \":\")+;\n+\t\t//\t(ID | WS | SINGLE_NL | ANY_OTHER | \"\\\\[\" | \"\\\\]\")+;\n \t\tpublic ParserRule getRule() { return rule; }\n \n-\t\t//(ID | WS | SINGLE_NL | ANY_OTHER | \"\\\\[\" | \"\\\\]\" | \":\")+\n+\t\t//(ID | WS | SINGLE_NL | ANY_OTHER | \"\\\\[\" | \"\\\\]\")+\n \t\tpublic Alternatives getAlternatives() { return cAlternatives; }\n \n \t\t//ID\n@@ -681,9 +702,6 @@ public class TextElements extends AbstractParserRuleElementFinder {\n \n \t\t//\"\\\\]\"\n \t\tpublic Keyword getReverseSolidusRightSquareBracketKeyword_5() { return cReverseSolidusRightSquareBracketKeyword_5; }\n-\n-\t\t//\":\"\n-\t\tpublic Keyword getColonKeyword_6() { return cColonKeyword_6; }\n \t}\n \n \tpublic class MarkUpElements extends AbstractParserRuleElementFinder {\n@@ -738,635 +756,564 @@ public class EmphasizeElements extends AbstractParserRuleElementFinder {\n \t\tprivate final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), \"Emphasize\");\n \t\tprivate final Group cGroup = (Group)rule.eContents().get(1);\n \t\tprivate final Keyword cEmphKeyword_0 = (Keyword)cGroup.eContents().get(0);\n-\t\tprivate final Keyword cLeftSquareBracketKeyword_1 = (Keyword)cGroup.eContents().get(1);\n-\t\tprivate final RuleCall cMULTI_NLTerminalRuleCall_2 = (RuleCall)cGroup.eContents().get(2);\n-\t\tprivate final Assignment cContentsAssignment_3 = (Assignment)cGroup.eContents().get(3);\n-\t\tprivate final RuleCall cContentsTextOrMarkupParserRuleCall_3_0 = (RuleCall)cContentsAssignment_3.eContents().get(0);\n-\t\tprivate final RuleCall cMULTI_NLTerminalRuleCall_4 = (RuleCall)cGroup.eContents().get(4);\n-\t\tprivate final Keyword cRightSquareBracketKeyword_5 = (Keyword)cGroup.eContents().get(5);\n+\t\tprivate final RuleCall cMULTI_NLTerminalRuleCall_1 = (RuleCall)cGroup.eContents().get(1);\n+\t\tprivate final Assignment cContentsAssignment_2 = (Assignment)cGroup.eContents().get(2);\n+\t\tprivate final RuleCall cContentsTextOrMarkupParserRuleCall_2_0 = (RuleCall)cContentsAssignment_2.eContents().get(0);\n+\t\tprivate final RuleCall cMULTI_NLTerminalRuleCall_3 = (RuleCall)cGroup.eContents().get(3);\n+\t\tprivate final Keyword cRightSquareBracketKeyword_4 = (Keyword)cGroup.eContents().get(4);\n \t\t\n \t\t//Emphasize:\n-\t\t//\t\"\\\\emph\" \"[\" MULTI_NL? contents+=TextOrMarkup MULTI_NL? \"]\";\n+\t\t//\t\"emph[\" MULTI_NL? contents+=TextOrMarkup MULTI_NL? \"]\";\n \t\tpublic ParserRule getRule() { return rule; }\n \n-\t\t//\"\\\\emph\" \"[\" MULTI_NL? contents+=TextOrMarkup MULTI_NL? \"]\"\n+\t\t//\"emph[\" MULTI_NL? contents+=TextOrMarkup MULTI_NL? \"]\"\n \t\tpublic Group getGroup() { return cGroup; }\n \n-\t\t//\"\\\\emph\"\n+\t\t//\"emph[\"\n \t\tpublic Keyword getEmphKeyword_0() { return cEmphKeyword_0; }\n \n-\t\t//\"[\"\n-\t\tpublic Keyword getLeftSquareBracketKeyword_1() { return cLeftSquareBracketKeyword_1; }\n-\n \t\t//MULTI_NL?\n-\t\tpublic RuleCall getMULTI_NLTerminalRuleCall_2() { return cMULTI_NLTerminalRuleCall_2; }\n+\t\tpublic RuleCall getMULTI_NLTerminalRuleCall_1() { return cMULTI_NLTerminalRuleCall_1; }\n \n \t\t//contents+=TextOrMarkup\n-\t\tpublic Assignment getContentsAssignment_3() { return cContentsAssignment_3; }\n+\t\tpublic Assignment getContentsAssignment_2() { return cContentsAssignment_2; }\n \n \t\t//TextOrMarkup\n-\t\tpublic RuleCall getContentsTextOrMarkupParserRuleCall_3_0() { return cContentsTextOrMarkupParserRuleCall_3_0; }\n+\t\tpublic RuleCall getContentsTextOrMarkupParserRuleCall_2_0() { return cContentsTextOrMarkupParserRuleCall_2_0; }\n \n \t\t//MULTI_NL?\n-\t\tpublic RuleCall getMULTI_NLTerminalRuleCall_4() { return cMULTI_NLTerminalRuleCall_4; }\n+\t\tpublic RuleCall getMULTI_NLTerminalRuleCall_3() { return cMULTI_NLTerminalRuleCall_3; }\n \n \t\t//\"]\"\n-\t\tpublic Keyword getRightSquareBracketKeyword_5() { return cRightSquareBracketKeyword_5; }\n+\t\tpublic Keyword getRightSquareBracketKeyword_4() { return cRightSquareBracketKeyword_4; }\n \t}\n \n \tpublic class AnchorElements extends AbstractParserRuleElementFinder {\n \t\tprivate final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), \"Anchor\");\n \t\tprivate final Group cGroup = (Group)rule.eContents().get(1);\n \t\tprivate final Keyword cAKeyword_0 = (Keyword)cGroup.eContents().get(0);\n-\t\tprivate final Keyword cColonKeyword_1 = (Keyword)cGroup.eContents().get(1);\n-\t\tprivate final Assignment cNameAssignment_2 = (Assignment)cGroup.eContents().get(2);\n-\t\tprivate final RuleCall cNameIDTerminalRuleCall_2_0 = (RuleCall)cNameAssignment_2.eContents().get(0);\n-\t\tprivate final Group cGroup_3 = (Group)cGroup.eContents().get(3);\n-\t\tprivate final Keyword cLeftSquareBracketKeyword_3_0 = (Keyword)cGroup_3.eContents().get(0);\n-\t\tprivate final Keyword cRightSquareBracketKeyword_3_1 = (Keyword)cGroup_3.eContents().get(1);\n+\t\tprivate final Assignment cNameAssignment_1 = (Assignment)cGroup.eContents().get(1);\n+\t\tprivate final RuleCall cNameIDTerminalRuleCall_1_0 = (RuleCall)cNameAssignment_1.eContents().get(0);\n+\t\tprivate final Keyword cRightSquareBracketKeyword_2 = (Keyword)cGroup.eContents().get(2);\n \t\t\n \t\t//Anchor:\n-\t\t//\t\"\\\\a\" \":\" name=ID (\"[\" \"]\")?;\n+\t\t//\t\"a[\" name=ID \"]\";\n \t\tpublic ParserRule getRule() { return rule; }\n \n-\t\t//\"\\\\a\" \":\" name=ID (\"[\" \"]\")?\n+\t\t//\"a[\" name=ID \"]\"\n \t\tpublic Group getGroup() { return cGroup; }\n \n-\t\t//\"\\\\a\"\n+\t\t//\"a[\"\n \t\tpublic Keyword getAKeyword_0() { return cAKeyword_0; }\n \n-\t\t//\":\"\n-\t\tpublic Keyword getColonKeyword_1() { return cColonKeyword_1; }\n-\n \t\t//name=ID\n-\t\tpublic Assignment getNameAssignment_2() { return cNameAssignment_2; }\n+\t\tpublic Assignment getNameAssignment_1() { return cNameAssignment_1; }\n \n \t\t//ID\n-\t\tpublic RuleCall getNameIDTerminalRuleCall_2_0() { return cNameIDTerminalRuleCall_2_0; }\n-\n-\t\t//(\"[\" \"]\")?\n-\t\tpublic Group getGroup_3() { return cGroup_3; }\n-\n-\t\t//\"[\"\n-\t\tpublic Keyword getLeftSquareBracketKeyword_3_0() { return cLeftSquareBracketKeyword_3_0; }\n+\t\tpublic RuleCall getNameIDTerminalRuleCall_1_0() { return cNameIDTerminalRuleCall_1_0; }\n \n \t\t//\"]\"\n-\t\tpublic Keyword getRightSquareBracketKeyword_3_1() { return cRightSquareBracketKeyword_3_1; }\n+\t\tpublic Keyword getRightSquareBracketKeyword_2() { return cRightSquareBracketKeyword_2; }\n \t}\n \n \tpublic class RefElements extends AbstractParserRuleElementFinder {\n \t\tprivate final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), \"Ref\");\n \t\tprivate final Group cGroup = (Group)rule.eContents().get(1);\n \t\tprivate final Keyword cRefKeyword_0 = (Keyword)cGroup.eContents().get(0);\n-\t\tprivate final Keyword cColonKeyword_1 = (Keyword)cGroup.eContents().get(1);\n-\t\tprivate final Assignment cRefAssignment_2 = (Assignment)cGroup.eContents().get(2);\n-\t\tprivate final CrossReference cRefIdentifiableCrossReference_2_0 = (CrossReference)cRefAssignment_2.eContents().get(0);\n-\t\tprivate final RuleCall cRefIdentifiableIDTerminalRuleCall_2_0_1 = (RuleCall)cRefIdentifiableCrossReference_2_0.eContents().get(1);\n-\t\tprivate final Keyword cLeftSquareBracketKeyword_3 = (Keyword)cGroup.eContents().get(3);\n-\t\tprivate final RuleCall cMULTI_NLTerminalRuleCall_4 = (RuleCall)cGroup.eContents().get(4);\n-\t\tprivate final Assignment cContentsAssignment_5 = (Assignment)cGroup.eContents().get(5);\n-\t\tprivate final RuleCall cContentsTextOrMarkupParserRuleCall_5_0 = (RuleCall)cContentsAssignment_5.eContents().get(0);\n-\t\tprivate final RuleCall cMULTI_NLTerminalRuleCall_6 = (RuleCall)cGroup.eContents().get(6);\n-\t\tprivate final Keyword cRightSquareBracketKeyword_7 = (Keyword)cGroup.eContents().get(7);\n+\t\tprivate final Assignment cRefAssignment_1 = (Assignment)cGroup.eContents().get(1);\n+\t\tprivate final CrossReference cRefIdentifiableCrossReference_1_0 = (CrossReference)cRefAssignment_1.eContents().get(0);\n+\t\tprivate final RuleCall cRefIdentifiableIDTerminalRuleCall_1_0_1 = (RuleCall)cRefIdentifiableCrossReference_1_0.eContents().get(1);\n+\t\tprivate final Keyword cLeftSquareBracketKeyword_2 = (Keyword)cGroup.eContents().get(2);\n+\t\tprivate final RuleCall cMULTI_NLTerminalRuleCall_3 = (RuleCall)cGroup.eContents().get(3);\n+\t\tprivate final Assignment cContentsAssignment_4 = (Assignment)cGroup.eContents().get(4);\n+\t\tprivate final RuleCall cContentsTextOrMarkupParserRuleCall_4_0 = (RuleCall)cContentsAssignment_4.eContents().get(0);\n+\t\tprivate final RuleCall cMULTI_NLTerminalRuleCall_5 = (RuleCall)cGroup.eContents().get(5);\n+\t\tprivate final Keyword cRightSquareBracketKeyword_6 = (Keyword)cGroup.eContents().get(6);\n \t\t\n \t\t//Ref:\n-\t\t//\t\"\\\\ref\" \":\" ref=[Identifiable] \"[\" MULTI_NL? contents+=TextOrMarkup MULTI_NL? \"]\";\n+\t\t//\t\"ref:\" ref=[Identifiable] \"[\" MULTI_NL? contents+=TextOrMarkup MULTI_NL? \"]\";\n \t\tpublic ParserRule getRule() { return rule; }\n \n-\t\t//\"\\\\ref\" \":\" ref=[Identifiable] \"[\" MULTI_NL? contents+=TextOrMarkup MULTI_NL? \"]\"\n+\t\t//\"ref:\" ref=[Identifiable] \"[\" MULTI_NL? contents+=TextOrMarkup MULTI_NL? \"]\"\n \t\tpublic Group getGroup() { return cGroup; }\n \n-\t\t//\"\\\\ref\"\n+\t\t//\"ref:\"\n \t\tpublic Keyword getRefKeyword_0() { return cRefKeyword_0; }\n \n-\t\t//\":\"\n-\t\tpublic Keyword getColonKeyword_1() { return cColonKeyword_1; }\n-\n \t\t//ref=[Identifiable]\n-\t\tpublic Assignment getRefAssignment_2() { return cRefAssignment_2; }\n+\t\tpublic Assignment getRefAssignment_1() { return cRefAssignment_1; }\n \n \t\t//[Identifiable]\n-\t\tpublic CrossReference getRefIdentifiableCrossReference_2_0() { return cRefIdentifiableCrossReference_2_0; }\n+\t\tpublic CrossReference getRefIdentifiableCrossReference_1_0() { return cRefIdentifiableCrossReference_1_0; }\n \n \t\t//ID\n-\t\tpublic RuleCall getRefIdentifiableIDTerminalRuleCall_2_0_1() { return cRefIdentifiableIDTerminalRuleCall_2_0_1; }\n+\t\tpublic RuleCall getRefIdentifiableIDTerminalRuleCall_1_0_1() { return cRefIdentifiableIDTerminalRuleCall_1_0_1; }\n \n \t\t//\"[\"\n-\t\tpublic Keyword getLeftSquareBracketKeyword_3() { return cLeftSquareBracketKeyword_3; }\n+\t\tpublic Keyword getLeftSquareBracketKeyword_2() { return cLeftSquareBracketKeyword_2; }\n \n \t\t//MULTI_NL?\n-\t\tpublic RuleCall getMULTI_NLTerminalRuleCall_4() { return cMULTI_NLTerminalRuleCall_4; }\n+\t\tpublic RuleCall getMULTI_NLTerminalRuleCall_3() { return cMULTI_NLTerminalRuleCall_3; }\n \n \t\t//contents+=TextOrMarkup\n-\t\tpublic Assignment getContentsAssignment_5() { return cContentsAssignment_5; }\n+\t\tpublic Assignment getContentsAssignment_4() { return cContentsAssignment_4; }\n \n \t\t//TextOrMarkup\n-\t\tpublic RuleCall getContentsTextOrMarkupParserRuleCall_5_0() { return cContentsTextOrMarkupParserRuleCall_5_0; }\n+\t\tpublic RuleCall getContentsTextOrMarkupParserRuleCall_4_0() { return cContentsTextOrMarkupParserRuleCall_4_0; }\n \n \t\t//MULTI_NL?\n-\t\tpublic RuleCall getMULTI_NLTerminalRuleCall_6() { return cMULTI_NLTerminalRuleCall_6; }\n+\t\tpublic RuleCall getMULTI_NLTerminalRuleCall_5() { return cMULTI_NLTerminalRuleCall_5; }\n \n \t\t//\"]\"\n-\t\tpublic Keyword getRightSquareBracketKeyword_7() { return cRightSquareBracketKeyword_7; }\n+\t\tpublic Keyword getRightSquareBracketKeyword_6() { return cRightSquareBracketKeyword_6; }\n \t}\n \n \tpublic class OrderedListElements extends AbstractParserRuleElementFinder {\n \t\tprivate final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), \"OrderedList\");\n \t\tprivate final Group cGroup = (Group)rule.eContents().get(1);\n \t\tprivate final Keyword cOlKeyword_0 = (Keyword)cGroup.eContents().get(0);\n-\t\tprivate final RuleCall cANY_WSParserRuleCall_1 = (RuleCall)cGroup.eContents().get(1);\n-\t\tprivate final Keyword cLeftSquareBracketKeyword_2 = (Keyword)cGroup.eContents().get(2);\n-\t\tprivate final Group cGroup_3 = (Group)cGroup.eContents().get(3);\n-\t\tprivate final RuleCall cANY_WSParserRuleCall_3_0 = (RuleCall)cGroup_3.eContents().get(0);\n-\t\tprivate final Assignment cItemsAssignment_3_1 = (Assignment)cGroup_3.eContents().get(1);\n-\t\tprivate final RuleCall cItemsItemParserRuleCall_3_1_0 = (RuleCall)cItemsAssignment_3_1.eContents().get(0);\n-\t\tprivate final RuleCall cANY_WSParserRuleCall_4 = (RuleCall)cGroup.eContents().get(4);\n-\t\tprivate final Keyword cRightSquareBracketKeyword_5 = (Keyword)cGroup.eContents().get(5);\n+\t\tprivate final Group cGroup_1 = (Group)cGroup.eContents().get(1);\n+\t\tprivate final RuleCall cANY_WSParserRuleCall_1_0 = (RuleCall)cGroup_1.eContents().get(0);\n+\t\tprivate final Assignment cItemsAssignment_1_1 = (Assignment)cGroup_1.eContents().get(1);\n+\t\tprivate final RuleCall cItemsItemParserRuleCall_1_1_0 = (RuleCall)cItemsAssignment_1_1.eContents().get(0);\n+\t\tprivate final RuleCall cANY_WSParserRuleCall_2 = (RuleCall)cGroup.eContents().get(2);\n+\t\tprivate final Keyword cRightSquareBracketKeyword_3 = (Keyword)cGroup.eContents().get(3);\n \t\t\n \t\t//OrderedList:\n-\t\t//\t\"\\\\ol\" ANY_WS* \"[\" (ANY_WS* items+=Item)+ ANY_WS* \"]\";\n+\t\t//\t\"ol[\" (ANY_WS* items+=Item)+ ANY_WS* \"]\";\n \t\tpublic ParserRule getRule() { return rule; }\n \n-\t\t//\"\\\\ol\" ANY_WS* \"[\" (ANY_WS* items+=Item)+ ANY_WS* \"]\"\n+\t\t//\"ol[\" (ANY_WS* items+=Item)+ ANY_WS* \"]\"\n \t\tpublic Group getGroup() { return cGroup; }\n \n-\t\t//\"\\\\ol\"\n+\t\t//\"ol[\"\n \t\tpublic Keyword getOlKeyword_0() { return cOlKeyword_0; }\n \n-\t\t//ANY_WS*\n-\t\tpublic RuleCall getANY_WSParserRuleCall_1() { return cANY_WSParserRuleCall_1; }\n-\n-\t\t//\"[\"\n-\t\tpublic Keyword getLeftSquareBracketKeyword_2() { return cLeftSquareBracketKeyword_2; }\n-\n \t\t//(ANY_WS* items+=Item)+\n-\t\tpublic Group getGroup_3() { return cGroup_3; }\n+\t\tpublic Group getGroup_1() { return cGroup_1; }\n \n \t\t//ANY_WS*\n-\t\tpublic RuleCall getANY_WSParserRuleCall_3_0() { return cANY_WSParserRuleCall_3_0; }\n+\t\tpublic RuleCall getANY_WSParserRuleCall_1_0() { return cANY_WSParserRuleCall_1_0; }\n \n \t\t//items+=Item\n-\t\tpublic Assignment getItemsAssignment_3_1() { return cItemsAssignment_3_1; }\n+\t\tpublic Assignment getItemsAssignment_1_1() { return cItemsAssignment_1_1; }\n \n \t\t//Item\n-\t\tpublic RuleCall getItemsItemParserRuleCall_3_1_0() { return cItemsItemParserRuleCall_3_1_0; }\n+\t\tpublic RuleCall getItemsItemParserRuleCall_1_1_0() { return cItemsItemParserRuleCall_1_1_0; }\n \n \t\t//ANY_WS*\n-\t\tpublic RuleCall getANY_WSParserRuleCall_4() { return cANY_WSParserRuleCall_4; }\n+\t\tpublic RuleCall getANY_WSParserRuleCall_2() { return cANY_WSParserRuleCall_2; }\n \n \t\t//\"]\"\n-\t\tpublic Keyword getRightSquareBracketKeyword_5() { return cRightSquareBracketKeyword_5; }\n+\t\tpublic Keyword getRightSquareBracketKeyword_3() { return cRightSquareBracketKeyword_3; }\n \t}\n \n \tpublic class UnorderedListElements extends AbstractParserRuleElementFinder {\n \t\tprivate final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), \"UnorderedList\");\n \t\tprivate final Group cGroup = (Group)rule.eContents().get(1);\n \t\tprivate final Keyword cUlKeyword_0 = (Keyword)cGroup.eContents().get(0);\n-\t\tprivate final RuleCall cANY_WSParserRuleCall_1 = (RuleCall)cGroup.eContents().get(1);\n-\t\tprivate final Keyword cLeftSquareBracketKeyword_2 = (Keyword)cGroup.eContents().get(2);\n-\t\tprivate final Group cGroup_3 = (Group)cGroup.eContents().get(3);\n-\t\tprivate final RuleCall cANY_WSParserRuleCall_3_0 = (RuleCall)cGroup_3.eContents().get(0);\n-\t\tprivate final Assignment cItemsAssignment_3_1 = (Assignment)cGroup_3.eContents().get(1);\n-\t\tprivate final RuleCall cItemsItemParserRuleCall_3_1_0 = (RuleCall)cItemsAssignment_3_1.eContents().get(0);\n-\t\tprivate final RuleCall cANY_WSParserRuleCall_4 = (RuleCall)cGroup.eContents().get(4);\n-\t\tprivate final Keyword cRightSquareBracketKeyword_5 = (Keyword)cGroup.eContents().get(5);\n+\t\tprivate final Group cGroup_1 = (Group)cGroup.eContents().get(1);\n+\t\tprivate final RuleCall cANY_WSParserRuleCall_1_0 = (RuleCall)cGroup_1.eContents().get(0);\n+\t\tprivate final Assignment cItemsAssignment_1_1 = (Assignment)cGroup_1.eContents().get(1);\n+\t\tprivate final RuleCall cItemsItemParserRuleCall_1_1_0 = (RuleCall)cItemsAssignment_1_1.eContents().get(0);\n+\t\tprivate final RuleCall cANY_WSParserRuleCall_2 = (RuleCall)cGroup.eContents().get(2);\n+\t\tprivate final Keyword cRightSquareBracketKeyword_3 = (Keyword)cGroup.eContents().get(3);\n \t\t\n \t\t//UnorderedList:\n-\t\t//\t\"\\\\ul\" ANY_WS* \"[\" (ANY_WS* items+=Item)+ ANY_WS* \"]\";\n+\t\t//\t\"ul[\" (ANY_WS* items+=Item)+ ANY_WS* \"]\";\n \t\tpublic ParserRule getRule() { return rule; }\n \n-\t\t//\"\\\\ul\" ANY_WS* \"[\" (ANY_WS* items+=Item)+ ANY_WS* \"]\"\n+\t\t//\"ul[\" (ANY_WS* items+=Item)+ ANY_WS* \"]\"\n \t\tpublic Group getGroup() { return cGroup; }\n \n-\t\t//\"\\\\ul\"\n+\t\t//\"ul[\"\n \t\tpublic Keyword getUlKeyword_0() { return cUlKeyword_0; }\n \n-\t\t//ANY_WS*\n-\t\tpublic RuleCall getANY_WSParserRuleCall_1() { return cANY_WSParserRuleCall_1; }\n-\n-\t\t//\"[\"\n-\t\tpublic Keyword getLeftSquareBracketKeyword_2() { return cLeftSquareBracketKeyword_2; }\n-\n \t\t//(ANY_WS* items+=Item)+\n-\t\tpublic Group getGroup_3() { return cGroup_3; }\n+\t\tpublic Group getGroup_1() { return cGroup_1; }\n \n \t\t//ANY_WS*\n-\t\tpublic RuleCall getANY_WSParserRuleCall_3_0() { return cANY_WSParserRuleCall_3_0; }\n+\t\tpublic RuleCall getANY_WSParserRuleCall_1_0() { return cANY_WSParserRuleCall_1_0; }\n \n \t\t//items+=Item\n-\t\tpublic Assignment getItemsAssignment_3_1() { return cItemsAssignment_3_1; }\n+\t\tpublic Assignment getItemsAssignment_1_1() { return cItemsAssignment_1_1; }\n \n \t\t//Item\n-\t\tpublic RuleCall getItemsItemParserRuleCall_3_1_0() { return cItemsItemParserRuleCall_3_1_0; }\n+\t\tpublic RuleCall getItemsItemParserRuleCall_1_1_0() { return cItemsItemParserRuleCall_1_1_0; }\n \n \t\t//ANY_WS*\n-\t\tpublic RuleCall getANY_WSParserRuleCall_4() { return cANY_WSParserRuleCall_4; }\n+\t\tpublic RuleCall getANY_WSParserRuleCall_2() { return cANY_WSParserRuleCall_2; }\n \n \t\t//\"]\"\n-\t\tpublic Keyword getRightSquareBracketKeyword_5() { return cRightSquareBracketKeyword_5; }\n+\t\tpublic Keyword getRightSquareBracketKeyword_3() { return cRightSquareBracketKeyword_3; }\n \t}\n \n \tpublic class ItemElements extends AbstractParserRuleElementFinder {\n \t\tprivate final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), \"Item\");\n \t\tprivate final Group cGroup = (Group)rule.eContents().get(1);\n \t\tprivate final Keyword cItemKeyword_0 = (Keyword)cGroup.eContents().get(0);\n-\t\tprivate final RuleCall cANY_WSParserRuleCall_1 = (RuleCall)cGroup.eContents().get(1);\n-\t\tprivate final Keyword cLeftSquareBracketKeyword_2 = (Keyword)cGroup.eContents().get(2);\n-\t\tprivate final RuleCall cMULTI_NLTerminalRuleCall_3 = (RuleCall)cGroup.eContents().get(3);\n-\t\tprivate final Assignment cContentsAssignment_4 = (Assignment)cGroup.eContents().get(4);\n-\t\tprivate final RuleCall cContentsTextOrMarkupParserRuleCall_4_0 = (RuleCall)cContentsAssignment_4.eContents().get(0);\n-\t\tprivate final Group cGroup_5 = (Group)cGroup.eContents().get(5);\n-\t\tprivate final RuleCall cMULTI_NLTerminalRuleCall_5_0 = (RuleCall)cGroup_5.eContents().get(0);\n-\t\tprivate final Assignment cContentsAssignment_5_1 = (Assignment)cGroup_5.eContents().get(1);\n-\t\tprivate final RuleCall cContentsTextOrMarkupParserRuleCall_5_1_0 = (RuleCall)cContentsAssignment_5_1.eContents().get(0);\n-\t\tprivate final Keyword cRightSquareBracketKeyword_6 = (Keyword)cGroup.eContents().get(6);\n+\t\tprivate final RuleCall cMULTI_NLTerminalRuleCall_1 = (RuleCall)cGroup.eContents().get(1);\n+\t\tprivate final Assignment cContentsAssignment_2 = (Assignment)cGroup.eContents().get(2);\n+\t\tprivate final RuleCall cContentsTextOrMarkupParserRuleCall_2_0 = (RuleCall)cContentsAssignment_2.eContents().get(0);\n+\t\tprivate final Group cGroup_3 = (Group)cGroup.eContents().get(3);\n+\t\tprivate final RuleCall cMULTI_NLTerminalRuleCall_3_0 = (RuleCall)cGroup_3.eContents().get(0);\n+\t\tprivate final Assignment cContentsAssignment_3_1 = (Assignment)cGroup_3.eContents().get(1);\n+\t\tprivate final RuleCall cContentsTextOrMarkupParserRuleCall_3_1_0 = (RuleCall)cContentsAssignment_3_1.eContents().get(0);\n+\t\tprivate final Keyword cRightSquareBracketKeyword_4 = (Keyword)cGroup.eContents().get(4);\n \t\t\n \t\t//Item:\n-\t\t//\t\"\\\\item\" ANY_WS* \"[\" MULTI_NL? contents+=TextOrMarkup (MULTI_NL contents+=TextOrMarkup)* \"]\";\n+\t\t//\t\"item[\" MULTI_NL? contents+=TextOrMarkup (MULTI_NL contents+=TextOrMarkup)* \"]\";\n \t\tpublic ParserRule getRule() { return rule; }\n \n-\t\t//\"\\\\item\" ANY_WS* \"[\" MULTI_NL? contents+=TextOrMarkup (MULTI_NL contents+=TextOrMarkup)* \"]\"\n+\t\t//\"item[\" MULTI_NL? contents+=TextOrMarkup (MULTI_NL contents+=TextOrMarkup)* \"]\"\n \t\tpublic Group getGroup() { return cGroup; }\n \n-\t\t//\"\\\\item\"\n+\t\t//\"item[\"\n \t\tpublic Keyword getItemKeyword_0() { return cItemKeyword_0; }\n \n-\t\t//ANY_WS*\n-\t\tpublic RuleCall getANY_WSParserRuleCall_1() { return cANY_WSParserRuleCall_1; }\n-\n-\t\t//\"[\"\n-\t\tpublic Keyword getLeftSquareBracketKeyword_2() { return cLeftSquareBracketKeyword_2; }\n-\n \t\t//MULTI_NL?\n-\t\tpublic RuleCall getMULTI_NLTerminalRuleCall_3() { return cMULTI_NLTerminalRuleCall_3; }\n+\t\tpublic RuleCall getMULTI_NLTerminalRuleCall_1() { return cMULTI_NLTerminalRuleCall_1; }\n \n \t\t//contents+=TextOrMarkup\n-\t\tpublic Assignment getContentsAssignment_4() { return cContentsAssignment_4; }\n+\t\tpublic Assignment getContentsAssignment_2() { return cContentsAssignment_2; }\n \n \t\t//TextOrMarkup\n-\t\tpublic RuleCall getContentsTextOrMarkupParserRuleCall_4_0() { return cContentsTextOrMarkupParserRuleCall_4_0; }\n+\t\tpublic RuleCall getContentsTextOrMarkupParserRuleCall_2_0() { return cContentsTextOrMarkupParserRuleCall_2_0; }\n \n \t\t//(MULTI_NL contents+=TextOrMarkup)*\n-\t\tpublic Group getGroup_5() { return cGroup_5; }\n+\t\tpublic Group getGroup_3() { return cGroup_3; }\n \n \t\t//MULTI_NL\n-\t\tpublic RuleCall getMULTI_NLTerminalRuleCall_5_0() { return cMULTI_NLTerminalRuleCall_5_0; }\n+\t\tpublic RuleCall getMULTI_NLTerminalRuleCall_3_0() { return cMULTI_NLTerminalRuleCall_3_0; }\n \n \t\t//contents+=TextOrMarkup\n-\t\tpublic Assignment getContentsAssignment_5_1() { return cContentsAssignment_5_1; }\n+\t\tpublic Assignment getContentsAssignment_3_1() { return cContentsAssignment_3_1; }\n \n \t\t//TextOrMarkup\n-\t\tpublic RuleCall getContentsTextOrMarkupParserRuleCall_5_1_0() { return cContentsTextOrMarkupParserRuleCall_5_1_0; }\n+\t\tpublic RuleCall getContentsTextOrMarkupParserRuleCall_3_1_0() { return cContentsTextOrMarkupParserRuleCall_3_1_0; }\n \n \t\t//\"]\"\n-\t\tpublic Keyword getRightSquareBracketKeyword_6() { return cRightSquareBracketKeyword_6; }\n+\t\tpublic Keyword getRightSquareBracketKeyword_4() { return cRightSquareBracketKeyword_4; }\n \t}\n \n \tpublic class CodeRefElements extends AbstractParserRuleElementFinder {\n \t\tprivate final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), \"CodeRef\");\n \t\tprivate final Group cGroup = (Group)rule.eContents().get(1);\n \t\tprivate final Keyword cCodeRefKeyword_0 = (Keyword)cGroup.eContents().get(0);\n-\t\tprivate final RuleCall cANY_WSParserRuleCall_1 = (RuleCall)cGroup.eContents().get(1);\n-\t\tprivate final Keyword cLeftSquareBracketKeyword_2 = (Keyword)cGroup.eContents().get(2);\n-\t\tprivate final Assignment cElementAssignment_3 = (Assignment)cGroup.eContents().get(3);\n-\t\tprivate final CrossReference cElementJvmIdentifyableElementCrossReference_3_0 = (CrossReference)cElementAssignment_3.eContents().get(0);\n-\t\tprivate final RuleCall cElementJvmIdentifyableElementTextParserRuleCall_3_0_1 = (RuleCall)cElementJvmIdentifyableElementCrossReference_3_0.eContents().get(1);\n-\t\tprivate final Keyword cRightSquareBracketKeyword_4 = (Keyword)cGroup.eContents().get(4);\n+\t\tprivate final Assignment cElementAssignment_1 = (Assignment)cGroup.eContents().get(1);\n+\t\tprivate final CrossReference cElementJvmIdentifyableElementCrossReference_1_0 = (CrossReference)cElementAssignment_1.eContents().get(0);\n+\t\tprivate final RuleCall cElementJvmIdentifyableElementTextParserRuleCall_1_0_1 = (RuleCall)cElementJvmIdentifyableElementCrossReference_1_0.eContents().get(1);\n+\t\tprivate final Keyword cRightSquareBracketKeyword_2 = (Keyword)cGroup.eContents().get(2);\n \t\t\n \t\t//CodeRef:\n-\t\t//\t\"\\\\codeRef\" ANY_WS* \"[\" element=[types::JvmIdentifyableElement|Text] \"]\";\n+\t\t//\t\"codeRef[\" element=[types::JvmIdentifyableElement|Text] \"]\";\n \t\tpublic ParserRule getRule() { return rule; }\n \n-\t\t//\"\\\\codeRef\" ANY_WS* \"[\" element=[types::JvmIdentifyableElement|Text] \"]\"\n+\t\t//\"codeRef[\" element=[types::JvmIdentifyableElement|Text] \"]\"\n \t\tpublic Group getGroup() { return cGroup; }\n \n-\t\t//\"\\\\codeRef\"\n+\t\t//\"codeRef[\"\n \t\tpublic Keyword getCodeRefKeyword_0() { return cCodeRefKeyword_0; }\n \n-\t\t//ANY_WS*\n-\t\tpublic RuleCall getANY_WSParserRuleCall_1() { return cANY_WSParserRuleCall_1; }\n-\n-\t\t//\"[\"\n-\t\tpublic Keyword getLeftSquareBracketKeyword_2() { return cLeftSquareBracketKeyword_2; }\n-\n \t\t//element=[types::JvmIdentifyableElement|Text]\n-\t\tpublic Assignment getElementAssignment_3() { return cElementAssignment_3; }\n+\t\tpublic Assignment getElementAssignment_1() { return cElementAssignment_1; }\n \n \t\t//[types::JvmIdentifyableElement|Text]\n-\t\tpublic CrossReference getElementJvmIdentifyableElementCrossReference_3_0() { return cElementJvmIdentifyableElementCrossReference_3_0; }\n+\t\tpublic CrossReference getElementJvmIdentifyableElementCrossReference_1_0() { return cElementJvmIdentifyableElementCrossReference_1_0; }\n \n \t\t//Text\n-\t\tpublic RuleCall getElementJvmIdentifyableElementTextParserRuleCall_3_0_1() { return cElementJvmIdentifyableElementTextParserRuleCall_3_0_1; }\n+\t\tpublic RuleCall getElementJvmIdentifyableElementTextParserRuleCall_1_0_1() { return cElementJvmIdentifyableElementTextParserRuleCall_1_0_1; }\n \n \t\t//\"]\"\n-\t\tpublic Keyword getRightSquareBracketKeyword_4() { return cRightSquareBracketKeyword_4; }\n+\t\tpublic Keyword getRightSquareBracketKeyword_2() { return cRightSquareBracketKeyword_2; }\n \t}\n \n \tpublic class LinkElements extends AbstractParserRuleElementFinder {\n \t\tprivate final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), \"Link\");\n \t\tprivate final Group cGroup = (Group)rule.eContents().get(1);\n \t\tprivate final Keyword cLinkKeyword_0 = (Keyword)cGroup.eContents().get(0);\n-\t\tprivate final RuleCall cANY_WSParserRuleCall_1 = (RuleCall)cGroup.eContents().get(1);\n-\t\tprivate final Keyword cLeftSquareBracketKeyword_2 = (Keyword)cGroup.eContents().get(2);\n-\t\tprivate final Assignment cUrlAssignment_3 = (Assignment)cGroup.eContents().get(3);\n-\t\tprivate final RuleCall cUrlTextParserRuleCall_3_0 = (RuleCall)cUrlAssignment_3.eContents().get(0);\n-\t\tprivate final Keyword cRightSquareBracketKeyword_4 = (Keyword)cGroup.eContents().get(4);\n-\t\tprivate final RuleCall cANY_WSParserRuleCall_5 = (RuleCall)cGroup.eContents().get(5);\n-\t\tprivate final Keyword cLeftSquareBracketKeyword_6 = (Keyword)cGroup.eContents().get(6);\n-\t\tprivate final Assignment cTextAssignment_7 = (Assignment)cGroup.eContents().get(7);\n-\t\tprivate final RuleCall cTextTextParserRuleCall_7_0 = (RuleCall)cTextAssignment_7.eContents().get(0);\n-\t\tprivate final Keyword cRightSquareBracketKeyword_8 = (Keyword)cGroup.eContents().get(8);\n+\t\tprivate final Assignment cUrlAssignment_1 = (Assignment)cGroup.eContents().get(1);\n+\t\tprivate final RuleCall cUrlTextParserRuleCall_1_0 = (RuleCall)cUrlAssignment_1.eContents().get(0);\n+\t\tprivate final Keyword cRightSquareBracketKeyword_2 = (Keyword)cGroup.eContents().get(2);\n+\t\tprivate final RuleCall cANY_WSParserRuleCall_3 = (RuleCall)cGroup.eContents().get(3);\n+\t\tprivate final Keyword cLeftSquareBracketKeyword_4 = (Keyword)cGroup.eContents().get(4);\n+\t\tprivate final Assignment cTextAssignment_5 = (Assignment)cGroup.eContents().get(5);\n+\t\tprivate final RuleCall cTextTextParserRuleCall_5_0 = (RuleCall)cTextAssignment_5.eContents().get(0);\n+\t\tprivate final Keyword cRightSquareBracketKeyword_6 = (Keyword)cGroup.eContents().get(6);\n \t\t\n \t\t//Link:\n-\t\t//\t\"\\\\link\" ANY_WS* \"[\" url=Text \"]\" ANY_WS* \"[\" text=Text \"]\";\n+\t\t//\t\"link[\" url=Text \"]\" ANY_WS* \"[\" text=Text \"]\";\n \t\tpublic ParserRule getRule() { return rule; }\n \n-\t\t//\"\\\\link\" ANY_WS* \"[\" url=Text \"]\" ANY_WS* \"[\" text=Text \"]\"\n+\t\t//\"link[\" url=Text \"]\" ANY_WS* \"[\" text=Text \"]\"\n \t\tpublic Group getGroup() { return cGroup; }\n \n-\t\t//\"\\\\link\"\n+\t\t//\"link[\"\n \t\tpublic Keyword getLinkKeyword_0() { return cLinkKeyword_0; }\n \n-\t\t//ANY_WS*\n-\t\tpublic RuleCall getANY_WSParserRuleCall_1() { return cANY_WSParserRuleCall_1; }\n-\n-\t\t//\"[\"\n-\t\tpublic Keyword getLeftSquareBracketKeyword_2() { return cLeftSquareBracketKeyword_2; }\n-\n \t\t//url=Text\n-\t\tpublic Assignment getUrlAssignment_3() { return cUrlAssignment_3; }\n+\t\tpublic Assignment getUrlAssignment_1() { return cUrlAssignment_1; }\n \n \t\t//Text\n-\t\tpublic RuleCall getUrlTextParserRuleCall_3_0() { return cUrlTextParserRuleCall_3_0; }\n+\t\tpublic RuleCall getUrlTextParserRuleCall_1_0() { return cUrlTextParserRuleCall_1_0; }\n \n \t\t//\"]\"\n-\t\tpublic Keyword getRightSquareBracketKeyword_4() { return cRightSquareBracketKeyword_4; }\n+\t\tpublic Keyword getRightSquareBracketKeyword_2() { return cRightSquareBracketKeyword_2; }\n \n \t\t//ANY_WS*\n-\t\tpublic RuleCall getANY_WSParserRuleCall_5() { return cANY_WSParserRuleCall_5; }\n+\t\tpublic RuleCall getANY_WSParserRuleCall_3() { return cANY_WSParserRuleCall_3; }\n \n \t\t//\"[\"\n-\t\tpublic Keyword getLeftSquareBracketKeyword_6() { return cLeftSquareBracketKeyword_6; }\n+\t\tpublic Keyword getLeftSquareBracketKeyword_4() { return cLeftSquareBracketKeyword_4; }\n \n \t\t//text=Text\n-\t\tpublic Assignment getTextAssignment_7() { return cTextAssignment_7; }\n+\t\tpublic Assignment getTextAssignment_5() { return cTextAssignment_5; }\n \n \t\t//Text\n-\t\tpublic RuleCall getTextTextParserRuleCall_7_0() { return cTextTextParserRuleCall_7_0; }\n+\t\tpublic RuleCall getTextTextParserRuleCall_5_0() { return cTextTextParserRuleCall_5_0; }\n \n \t\t//\"]\"\n-\t\tpublic Keyword getRightSquareBracketKeyword_8() { return cRightSquareBracketKeyword_8; }\n+\t\tpublic Keyword getRightSquareBracketKeyword_6() { return cRightSquareBracketKeyword_6; }\n \t}\n \n \tpublic class ImageRefElements extends AbstractParserRuleElementFinder {\n \t\tprivate final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), \"ImageRef\");\n \t\tprivate final Group cGroup = (Group)rule.eContents().get(1);\n-\t\tprivate final Keyword cImgKeyword_0 = (Keyword)cGroup.eContents().get(0);\n-\t\tprivate final RuleCall cANY_WSParserRuleCall_1 = (RuleCall)cGroup.eContents().get(1);\n-\t\tprivate final Group cGroup_2 = (Group)cGroup.eContents().get(2);\n-\t\tprivate final Keyword cColonKeyword_2_0 = (Keyword)cGroup_2.eContents().get(0);\n-\t\tprivate final RuleCall cANY_WSParserRuleCall_2_1 = (RuleCall)cGroup_2.eContents().get(1);\n-\t\tprivate final Assignment cNameAssignment_2_2 = (Assignment)cGroup_2.eContents().get(2);\n-\t\tprivate final RuleCall cNameIDTerminalRuleCall_2_2_0 = (RuleCall)cNameAssignment_2_2.eContents().get(0);\n-\t\tprivate final RuleCall cANY_WSParserRuleCall_2_3 = (RuleCall)cGroup_2.eContents().get(3);\n-\t\tprivate final Keyword cLeftSquareBracketKeyword_3 = (Keyword)cGroup.eContents().get(3);\n-\t\tprivate final Assignment cPathAssignment_4 = (Assignment)cGroup.eContents().get(4);\n-\t\tprivate final RuleCall cPathTextParserRuleCall_4_0 = (RuleCall)cPathAssignment_4.eContents().get(0);\n-\t\tprivate final Keyword cRightSquareBracketKeyword_5 = (Keyword)cGroup.eContents().get(5);\n-\t\tprivate final RuleCall cANY_WSParserRuleCall_6 = (RuleCall)cGroup.eContents().get(6);\n-\t\tprivate final Keyword cLeftSquareBracketKeyword_7 = (Keyword)cGroup.eContents().get(7);\n-\t\tprivate final Assignment cClazzAssignment_8 = (Assignment)cGroup.eContents().get(8);\n-\t\tprivate final RuleCall cClazzTextParserRuleCall_8_0 = (RuleCall)cClazzAssignment_8.eContents().get(0);\n-\t\tprivate final Keyword cRightSquareBracketKeyword_9 = (Keyword)cGroup.eContents().get(9);\n-\t\tprivate final RuleCall cANY_WSParserRuleCall_10 = (RuleCall)cGroup.eContents().get(10);\n-\t\tprivate final Keyword cLeftSquareBracketKeyword_11 = (Keyword)cGroup.eContents().get(11);\n-\t\tprivate final Assignment cStyleAssignment_12 = (Assignment)cGroup.eContents().get(12);\n-\t\tprivate final RuleCall cStyleTextParserRuleCall_12_0 = (RuleCall)cStyleAssignment_12.eContents().get(0);\n-\t\tprivate final Keyword cRightSquareBracketKeyword_13 = (Keyword)cGroup.eContents().get(13);\n-\t\tprivate final RuleCall cANY_WSParserRuleCall_14 = (RuleCall)cGroup.eContents().get(14);\n-\t\tprivate final Keyword cLeftSquareBracketKeyword_15 = (Keyword)cGroup.eContents().get(15);\n-\t\tprivate final Assignment cCaptionAssignment_16 = (Assignment)cGroup.eContents().get(16);\n-\t\tprivate final RuleCall cCaptionTextParserRuleCall_16_0 = (RuleCall)cCaptionAssignment_16.eContents().get(0);\n-\t\tprivate final Keyword cRightSquareBracketKeyword_17 = (Keyword)cGroup.eContents().get(17);\n+\t\tprivate final Alternatives cAlternatives_0 = (Alternatives)cGroup.eContents().get(0);\n+\t\tprivate final Group cGroup_0_0 = (Group)cAlternatives_0.eContents().get(0);\n+\t\tprivate final Keyword cImgKeyword_0_0_0 = (Keyword)cGroup_0_0.eContents().get(0);\n+\t\tprivate final RuleCall cANY_WSParserRuleCall_0_0_1 = (RuleCall)cGroup_0_0.eContents().get(1);\n+\t\tprivate final Assignment cNameAssignment_0_0_2 = (Assignment)cGroup_0_0.eContents().get(2);\n+\t\tprivate final RuleCall cNameIDTerminalRuleCall_0_0_2_0 = (RuleCall)cNameAssignment_0_0_2.eContents().get(0);\n+\t\tprivate final RuleCall cANY_WSParserRuleCall_0_0_3 = (RuleCall)cGroup_0_0.eContents().get(3);\n+\t\tprivate final Keyword cLeftSquareBracketKeyword_0_0_4 = (Keyword)cGroup_0_0.eContents().get(4);\n+\t\tprivate final Keyword cImgKeyword_0_1 = (Keyword)cAlternatives_0.eContents().get(1);\n+\t\tprivate final Assignment cPathAssignment_1 = (Assignment)cGroup.eContents().get(1);\n+\t\tprivate final RuleCall cPathTextParserRuleCall_1_0 = (RuleCall)cPathAssignment_1.eContents().get(0);\n+\t\tprivate final Keyword cRightSquareBracketKeyword_2 = (Keyword)cGroup.eContents().get(2);\n+\t\tprivate final RuleCall cANY_WSParserRuleCall_3 = (RuleCall)cGroup.eContents().get(3);\n+\t\tprivate final Keyword cLeftSquareBracketKeyword_4 = (Keyword)cGroup.eContents().get(4);\n+\t\tprivate final Assignment cClazzAssignment_5 = (Assignment)cGroup.eContents().get(5);\n+\t\tprivate final RuleCall cClazzTextParserRuleCall_5_0 = (RuleCall)cClazzAssignment_5.eContents().get(0);\n+\t\tprivate final Keyword cRightSquareBracketKeyword_6 = (Keyword)cGroup.eContents().get(6);\n+\t\tprivate final RuleCall cANY_WSParserRuleCall_7 = (RuleCall)cGroup.eContents().get(7);\n+\t\tprivate final Keyword cLeftSquareBracketKeyword_8 = (Keyword)cGroup.eContents().get(8);\n+\t\tprivate final Assignment cStyleAssignment_9 = (Assignment)cGroup.eContents().get(9);\n+\t\tprivate final RuleCall cStyleTextParserRuleCall_9_0 = (RuleCall)cStyleAssignment_9.eContents().get(0);\n+\t\tprivate final Keyword cRightSquareBracketKeyword_10 = (Keyword)cGroup.eContents().get(10);\n+\t\tprivate final RuleCall cANY_WSParserRuleCall_11 = (RuleCall)cGroup.eContents().get(11);\n+\t\tprivate final Keyword cLeftSquareBracketKeyword_12 = (Keyword)cGroup.eContents().get(12);\n+\t\tprivate final Assignment cCaptionAssignment_13 = (Assignment)cGroup.eContents().get(13);\n+\t\tprivate final RuleCall cCaptionTextParserRuleCall_13_0 = (RuleCall)cCaptionAssignment_13.eContents().get(0);\n+\t\tprivate final Keyword cRightSquareBracketKeyword_14 = (Keyword)cGroup.eContents().get(14);\n \t\t\n \t\t//// Don't think this was the discussed syntax\n \t\t//ImageRef:\n-\t\t//\t\"\\\\img\" ANY_WS* (\":\" ANY_WS* name=ID ANY_WS*)? \"[\" path=Text / *TODO make it a crossreference to images * / \"]\" ANY_WS*\n-\t\t//\t\"[\" clazz=Text \"]\" ANY_WS* \"[\" style=Text \"]\" ANY_WS* \"[\" caption=Text \"]\";\n+\t\t//\t(\"img:\" ANY_WS* name=ID ANY_WS* \"[\" | \"img[\") path=Text / *TODO make it a crossreference to images * / \"]\" ANY_WS* \"[\"\n+\t\t//\tclazz=Text \"]\" ANY_WS* \"[\" style=Text \"]\" ANY_WS* \"[\" caption=Text \"]\";\n \t\tpublic ParserRule getRule() { return rule; }\n \n-\t\t//\"\\\\img\" ANY_WS* (\":\" ANY_WS* name=ID ANY_WS*)? \"[\" path=Text / *TODO make it a crossreference to images * / \"]\" ANY_WS*\n-\t\t//\"[\" clazz=Text \"]\" ANY_WS* \"[\" style=Text \"]\" ANY_WS* \"[\" caption=Text \"]\"\n+\t\t//(\"img:\" ANY_WS* name=ID ANY_WS* \"[\" | \"img[\") path=Text / *TODO make it a crossreference to images * / \"]\" ANY_WS* \"[\"\n+\t\t//clazz=Text \"]\" ANY_WS* \"[\" style=Text \"]\" ANY_WS* \"[\" caption=Text \"]\"\n \t\tpublic Group getGroup() { return cGroup; }\n \n-\t\t//\"\\\\img\"\n-\t\tpublic Keyword getImgKeyword_0() { return cImgKeyword_0; }\n-\n-\t\t//ANY_WS*\n-\t\tpublic RuleCall getANY_WSParserRuleCall_1() { return cANY_WSParserRuleCall_1; }\n+\t\t//\"img:\" ANY_WS* name=ID ANY_WS* \"[\" | \"img[\"\n+\t\tpublic Alternatives getAlternatives_0() { return cAlternatives_0; }\n \n-\t\t//(\":\" ANY_WS* name=ID ANY_WS*)?\n-\t\tpublic Group getGroup_2() { return cGroup_2; }\n+\t\t//\"img:\" ANY_WS* name=ID ANY_WS* \"[\"\n+\t\tpublic Group getGroup_0_0() { return cGroup_0_0; }\n \n-\t\t//\":\"\n-\t\tpublic Keyword getColonKeyword_2_0() { return cColonKeyword_2_0; }\n+\t\t//\"img:\"\n+\t\tpublic Keyword getImgKeyword_0_0_0() { return cImgKeyword_0_0_0; }\n \n \t\t//ANY_WS*\n-\t\tpublic RuleCall getANY_WSParserRuleCall_2_1() { return cANY_WSParserRuleCall_2_1; }\n+\t\tpublic RuleCall getANY_WSParserRuleCall_0_0_1() { return cANY_WSParserRuleCall_0_0_1; }\n \n \t\t//name=ID\n-\t\tpublic Assignment getNameAssignment_2_2() { return cNameAssignment_2_2; }\n+\t\tpublic Assignment getNameAssignment_0_0_2() { return cNameAssignment_0_0_2; }\n \n \t\t//ID\n-\t\tpublic RuleCall getNameIDTerminalRuleCall_2_2_0() { return cNameIDTerminalRuleCall_2_2_0; }\n+\t\tpublic RuleCall getNameIDTerminalRuleCall_0_0_2_0() { return cNameIDTerminalRuleCall_0_0_2_0; }\n \n \t\t//ANY_WS*\n-\t\tpublic RuleCall getANY_WSParserRuleCall_2_3() { return cANY_WSParserRuleCall_2_3; }\n+\t\tpublic RuleCall getANY_WSParserRuleCall_0_0_3() { return cANY_WSParserRuleCall_0_0_3; }\n \n \t\t//\"[\"\n-\t\tpublic Keyword getLeftSquareBracketKeyword_3() { return cLeftSquareBracketKeyword_3; }\n+\t\tpublic Keyword getLeftSquareBracketKeyword_0_0_4() { return cLeftSquareBracketKeyword_0_0_4; }\n+\n+\t\t//\"img[\"\n+\t\tpublic Keyword getImgKeyword_0_1() { return cImgKeyword_0_1; }\n \n \t\t//path=Text\n-\t\tpublic Assignment getPathAssignment_4() { return cPathAssignment_4; }\n+\t\tpublic Assignment getPathAssignment_1() { return cPathAssignment_1; }\n \n \t\t//Text\n-\t\tpublic RuleCall getPathTextParserRuleCall_4_0() { return cPathTextParserRuleCall_4_0; }\n+\t\tpublic RuleCall getPathTextParserRuleCall_1_0() { return cPathTextParserRuleCall_1_0; }\n \n \t\t/// *TODO make it a crossreference to images * / \"]\"\n-\t\tpublic Keyword getRightSquareBracketKeyword_5() { return cRightSquareBracketKeyword_5; }\n+\t\tpublic Keyword getRightSquareBracketKeyword_2() { return cRightSquareBracketKeyword_2; }\n \n \t\t//ANY_WS*\n-\t\tpublic RuleCall getANY_WSParserRuleCall_6() { return cANY_WSParserRuleCall_6; }\n+\t\tpublic RuleCall getANY_WSParserRuleCall_3() { return cANY_WSParserRuleCall_3; }\n \n \t\t//\"[\"\n-\t\tpublic Keyword getLeftSquareBracketKeyword_7() { return cLeftSquareBracketKeyword_7; }\n+\t\tpublic Keyword getLeftSquareBracketKeyword_4() { return cLeftSquareBracketKeyword_4; }\n \n \t\t//clazz=Text\n-\t\tpublic Assignment getClazzAssignment_8() { return cClazzAssignment_8; }\n+\t\tpublic Assignment getClazzAssignment_5() { return cClazzAssignment_5; }\n \n \t\t//Text\n-\t\tpublic RuleCall getClazzTextParserRuleCall_8_0() { return cClazzTextParserRuleCall_8_0; }\n+\t\tpublic RuleCall getClazzTextParserRuleCall_5_0() { return cClazzTextParserRuleCall_5_0; }\n \n \t\t//\"]\"\n-\t\tpublic Keyword getRightSquareBracketKeyword_9() { return cRightSquareBracketKeyword_9; }\n+\t\tpublic Keyword getRightSquareBracketKeyword_6() { return cRightSquareBracketKeyword_6; }\n \n \t\t//ANY_WS*\n-\t\tpublic RuleCall getANY_WSParserRuleCall_10() { return cANY_WSParserRuleCall_10; }\n+\t\tpublic RuleCall getANY_WSParserRuleCall_7() { return cANY_WSParserRuleCall_7; }\n \n \t\t//\"[\"\n-\t\tpublic Keyword getLeftSquareBracketKeyword_11() { return cLeftSquareBracketKeyword_11; }\n+\t\tpublic Keyword getLeftSquareBracketKeyword_8() { return cLeftSquareBracketKeyword_8; }\n \n \t\t//style=Text\n-\t\tpublic Assignment getStyleAssignment_12() { return cStyleAssignment_12; }\n+\t\tpublic Assignment getStyleAssignment_9() { return cStyleAssignment_9; }\n \n \t\t//Text\n-\t\tpublic RuleCall getStyleTextParserRuleCall_12_0() { return cStyleTextParserRuleCall_12_0; }\n+\t\tpublic RuleCall getStyleTextParserRuleCall_9_0() { return cStyleTextParserRuleCall_9_0; }\n \n \t\t//\"]\"\n-\t\tpublic Keyword getRightSquareBracketKeyword_13() { return cRightSquareBracketKeyword_13; }\n+\t\tpublic Keyword getRightSquareBracketKeyword_10() { return cRightSquareBracketKeyword_10; }\n \n \t\t//ANY_WS*\n-\t\tpublic RuleCall getANY_WSParserRuleCall_14() { return cANY_WSParserRuleCall_14; }\n+\t\tpublic RuleCall getANY_WSParserRuleCall_11() { return cANY_WSParserRuleCall_11; }\n \n \t\t//\"[\"\n-\t\tpublic Keyword getLeftSquareBracketKeyword_15() { return cLeftSquareBracketKeyword_15; }\n+\t\tpublic Keyword getLeftSquareBracketKeyword_12() { return cLeftSquareBracketKeyword_12; }\n \n \t\t//caption=Text\n-\t\tpublic Assignment getCaptionAssignment_16() { return cCaptionAssignment_16; }\n+\t\tpublic Assignment getCaptionAssignment_13() { return cCaptionAssignment_13; }\n \n \t\t//Text\n-\t\tpublic RuleCall getCaptionTextParserRuleCall_16_0() { return cCaptionTextParserRuleCall_16_0; }\n+\t\tpublic RuleCall getCaptionTextParserRuleCall_13_0() { return cCaptionTextParserRuleCall_13_0; }\n \n \t\t//\"]\"\n-\t\tpublic Keyword getRightSquareBracketKeyword_17() { return cRightSquareBracketKeyword_17; }\n+\t\tpublic Keyword getRightSquareBracketKeyword_14() { return cRightSquareBracketKeyword_14; }\n \t}\n \n \tpublic class CodeBlockElements extends AbstractParserRuleElementFinder {\n \t\tprivate final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), \"CodeBlock\");\n \t\tprivate final Group cGroup = (Group)rule.eContents().get(1);\n \t\tprivate final Keyword cCodeKeyword_0 = (Keyword)cGroup.eContents().get(0);\n-\t\tprivate final RuleCall cANY_WSParserRuleCall_1 = (RuleCall)cGroup.eContents().get(1);\n-\t\tprivate final Group cGroup_2 = (Group)cGroup.eContents().get(2);\n-\t\tprivate final Keyword cLeftSquareBracketKeyword_2_0 = (Keyword)cGroup_2.eContents().get(0);\n-\t\tprivate final RuleCall cANY_WSParserRuleCall_2_1 = (RuleCall)cGroup_2.eContents().get(1);\n-\t\tprivate final Assignment cLanguageAssignment_2_2 = (Assignment)cGroup_2.eContents().get(2);\n-\t\tprivate final RuleCall cLanguageIDTerminalRuleCall_2_2_0 = (RuleCall)cLanguageAssignment_2_2.eContents().get(0);\n-\t\tprivate final RuleCall cANY_WSParserRuleCall_2_3 = (RuleCall)cGroup_2.eContents().get(3);\n-\t\tprivate final Keyword cRightSquareBracketKeyword_2_4 = (Keyword)cGroup_2.eContents().get(4);\n-\t\tprivate final RuleCall cANY_WSParserRuleCall_2_5 = (RuleCall)cGroup_2.eContents().get(5);\n-\t\tprivate final Keyword cLeftSquareBracketKeyword_3 = (Keyword)cGroup.eContents().get(3);\n-\t\tprivate final Alternatives cAlternatives_4 = (Alternatives)cGroup.eContents().get(4);\n-\t\tprivate final Group cGroup_4_0 = (Group)cAlternatives_4.eContents().get(0);\n-\t\tprivate final Assignment cContentsAssignment_4_0_0 = (Assignment)cGroup_4_0.eContents().get(0);\n-\t\tprivate final RuleCall cContentsCodeParserRuleCall_4_0_0_0 = (RuleCall)cContentsAssignment_4_0_0.eContents().get(0);\n-\t\tprivate final Group cGroup_4_0_1 = (Group)cGroup_4_0.eContents().get(1);\n-\t\tprivate final Assignment cContentsAssignment_4_0_1_0 = (Assignment)cGroup_4_0_1.eContents().get(0);\n-\t\tprivate final RuleCall cContentsMarkupInCodeParserRuleCall_4_0_1_0_0 = (RuleCall)cContentsAssignment_4_0_1_0.eContents().get(0);\n-\t\tprivate final Assignment cContentsAssignment_4_0_1_1 = (Assignment)cGroup_4_0_1.eContents().get(1);\n-\t\tprivate final RuleCall cContentsCodeParserRuleCall_4_0_1_1_0 = (RuleCall)cContentsAssignment_4_0_1_1.eContents().get(0);\n-\t\tprivate final Group cGroup_4_1 = (Group)cAlternatives_4.eContents().get(1);\n-\t\tprivate final Assignment cContentsAssignment_4_1_0 = (Assignment)cGroup_4_1.eContents().get(0);\n-\t\tprivate final RuleCall cContentsMarkupInCodeParserRuleCall_4_1_0_0 = (RuleCall)cContentsAssignment_4_1_0.eContents().get(0);\n-\t\tprivate final Assignment cContentsAssignment_4_1_1 = (Assignment)cGroup_4_1.eContents().get(1);\n-\t\tprivate final RuleCall cContentsCodeParserRuleCall_4_1_1_0 = (RuleCall)cContentsAssignment_4_1_1.eContents().get(0);\n-\t\tprivate final Keyword cRightSquareBracketKeyword_5 = (Keyword)cGroup.eContents().get(5);\n+\t\tprivate final Group cGroup_1 = (Group)cGroup.eContents().get(1);\n+\t\tprivate final RuleCall cANY_WSParserRuleCall_1_0 = (RuleCall)cGroup_1.eContents().get(0);\n+\t\tprivate final Assignment cLanguageAssignment_1_1 = (Assignment)cGroup_1.eContents().get(1);\n+\t\tprivate final RuleCall cLanguageIDTerminalRuleCall_1_1_0 = (RuleCall)cLanguageAssignment_1_1.eContents().get(0);\n+\t\tprivate final RuleCall cANY_WSParserRuleCall_1_2 = (RuleCall)cGroup_1.eContents().get(2);\n+\t\tprivate final Keyword cRightSquareBracketKeyword_1_3 = (Keyword)cGroup_1.eContents().get(3);\n+\t\tprivate final RuleCall cANY_WSParserRuleCall_1_4 = (RuleCall)cGroup_1.eContents().get(4);\n+\t\tprivate final Keyword cLeftSquareBracketKeyword_1_5 = (Keyword)cGroup_1.eContents().get(5);\n+\t\tprivate final Alternatives cAlternatives_2 = (Alternatives)cGroup.eContents().get(2);\n+\t\tprivate final Group cGroup_2_0 = (Group)cAlternatives_2.eContents().get(0);\n+\t\tprivate final Assignment cContentsAssignment_2_0_0 = (Assignment)cGroup_2_0.eContents().get(0);\n+\t\tprivate final RuleCall cContentsCodeParserRuleCall_2_0_0_0 = (RuleCall)cContentsAssignment_2_0_0.eContents().get(0);\n+\t\tprivate final Group cGroup_2_0_1 = (Group)cGroup_2_0.eContents().get(1);\n+\t\tprivate final Assignment cContentsAssignment_2_0_1_0 = (Assignment)cGroup_2_0_1.eContents().get(0);\n+\t\tprivate final RuleCall cContentsMarkupInCodeParserRuleCall_2_0_1_0_0 = (RuleCall)cContentsAssignment_2_0_1_0.eContents().get(0);\n+\t\tprivate final Assignment cContentsAssignment_2_0_1_1 = (Assignment)cGroup_2_0_1.eContents().get(1);\n+\t\tprivate final RuleCall cContentsCodeParserRuleCall_2_0_1_1_0 = (RuleCall)cContentsAssignment_2_0_1_1.eContents().get(0);\n+\t\tprivate final Group cGroup_2_1 = (Group)cAlternatives_2.eContents().get(1);\n+\t\tprivate final Assignment cContentsAssignment_2_1_0 = (Assignment)cGroup_2_1.eContents().get(0);\n+\t\tprivate final RuleCall cContentsMarkupInCodeParserRuleCall_2_1_0_0 = (RuleCall)cContentsAssignment_2_1_0.eContents().get(0);\n+\t\tprivate final Assignment cContentsAssignment_2_1_1 = (Assignment)cGroup_2_1.eContents().get(1);\n+\t\tprivate final RuleCall cContentsCodeParserRuleCall_2_1_1_0 = (RuleCall)cContentsAssignment_2_1_1.eContents().get(0);\n+\t\tprivate final Keyword cRightSquareBracketKeyword_3 = (Keyword)cGroup.eContents().get(3);\n \t\t\n \t\t//CodeBlock:\n-\t\t//\t\"\\\\code\" ANY_WS* (\"[\" ANY_WS* language=ID ANY_WS* \"]\" ANY_WS*)? \"[\" (contents+=Code (contents+=MarkupInCode\n-\t\t//\tcontents+=Code?)* | (contents+=MarkupInCode contents+=Code?)+) \"]\";\n+\t\t//\t\"code[\" (ANY_WS* language=ID ANY_WS* \"]\" ANY_WS* \"[\")? (contents+=Code (contents+=MarkupInCode contents+=Code?)* |\n+\t\t//\t(contents+=MarkupInCode contents+=Code?)+) \"]\";\n \t\tpublic ParserRule getRule() { return rule; }\n \n-\t\t//\"\\\\code\" ANY_WS* (\"[\" ANY_WS* language=ID ANY_WS* \"]\" ANY_WS*)? \"[\" (contents+=Code (contents+=MarkupInCode\n-\t\t//contents+=Code?)* | (contents+=MarkupInCode contents+=Code?)+) \"]\"\n+\t\t//\"code[\" (ANY_WS* language=ID ANY_WS* \"]\" ANY_WS* \"[\")? (contents+=Code (contents+=MarkupInCode contents+=Code?)* |\n+\t\t//(contents+=MarkupInCode contents+=Code?)+) \"]\"\n \t\tpublic Group getGroup() { return cGroup; }\n \n-\t\t//\"\\\\code\"\n+\t\t//\"code[\"\n \t\tpublic Keyword getCodeKeyword_0() { return cCodeKeyword_0; }\n \n-\t\t//ANY_WS*\n-\t\tpublic RuleCall getANY_WSParserRuleCall_1() { return cANY_WSParserRuleCall_1; }\n-\n-\t\t//(\"[\" ANY_WS* language=ID ANY_WS* \"]\" ANY_WS*)?\n-\t\tpublic Group getGroup_2() { return cGroup_2; }\n-\n-\t\t//\"[\"\n-\t\tpublic Keyword getLeftSquareBracketKeyword_2_0() { return cLeftSquareBracketKeyword_2_0; }\n+\t\t//(ANY_WS* language=ID ANY_WS* \"]\" ANY_WS* \"[\")?\n+\t\tpublic Group getGroup_1() { return cGroup_1; }\n \n \t\t//ANY_WS*\n-\t\tpublic RuleCall getANY_WSParserRuleCall_2_1() { return cANY_WSParserRuleCall_2_1; }\n+\t\tpublic RuleCall getANY_WSParserRuleCall_1_0() { return cANY_WSParserRuleCall_1_0; }\n \n \t\t//language=ID\n-\t\tpublic Assignment getLanguageAssignment_2_2() { return cLanguageAssignment_2_2; }\n+\t\tpublic Assignment getLanguageAssignment_1_1() { return cLanguageAssignment_1_1; }\n \n \t\t//ID\n-\t\tpublic RuleCall getLanguageIDTerminalRuleCall_2_2_0() { return cLanguageIDTerminalRuleCall_2_2_0; }\n+\t\tpublic RuleCall getLanguageIDTerminalRuleCall_1_1_0() { return cLanguageIDTerminalRuleCall_1_1_0; }\n \n \t\t//ANY_WS*\n-\t\tpublic RuleCall getANY_WSParserRuleCall_2_3() { return cANY_WSParserRuleCall_2_3; }\n+\t\tpublic RuleCall getANY_WSParserRuleCall_1_2() { return cANY_WSParserRuleCall_1_2; }\n \n \t\t//\"]\"\n-\t\tpublic Keyword getRightSquareBracketKeyword_2_4() { return cRightSquareBracketKeyword_2_4; }\n+\t\tpublic Keyword getRightSquareBracketKeyword_1_3() { return cRightSquareBracketKeyword_1_3; }\n \n \t\t//ANY_WS*\n-\t\tpublic RuleCall getANY_WSParserRuleCall_2_5() { return cANY_WSParserRuleCall_2_5; }\n+\t\tpublic RuleCall getANY_WSParserRuleCall_1_4() { return cANY_WSParserRuleCall_1_4; }\n \n \t\t//\"[\"\n-\t\tpublic Keyword getLeftSquareBracketKeyword_3() { return cLeftSquareBracketKeyword_3; }\n+\t\tpublic Keyword getLeftSquareBracketKeyword_1_5() { return cLeftSquareBracketKeyword_1_5; }\n \n \t\t//contents+=Code (contents+=MarkupInCode contents+=Code?)* | (contents+=MarkupInCode contents+=Code?)+\n-\t\tpublic Alternatives getAlternatives_4() { return cAlternatives_4; }\n+\t\tpublic Alternatives getAlternatives_2() { return cAlternatives_2; }\n \n \t\t//contents+=Code (contents+=MarkupInCode contents+=Code?)*\n-\t\tpublic Group getGroup_4_0() { return cGroup_4_0; }\n+\t\tpublic Group getGroup_2_0() { return cGroup_2_0; }\n \n \t\t//contents+=Code\n-\t\tpublic Assignment getContentsAssignment_4_0_0() { return cContentsAssignment_4_0_0; }\n+\t\tpublic Assignment getContentsAssignment_2_0_0() { return cContentsAssignment_2_0_0; }\n \n \t\t//Code\n-\t\tpublic RuleCall getContentsCodeParserRuleCall_4_0_0_0() { return cContentsCodeParserRuleCall_4_0_0_0; }\n+\t\tpublic RuleCall getContentsCodeParserRuleCall_2_0_0_0() { return cContentsCodeParserRuleCall_2_0_0_0; }\n \n \t\t//(contents+=MarkupInCode contents+=Code?)*\n-\t\tpublic Group getGroup_4_0_1() { return cGroup_4_0_1; }\n+\t\tpublic Group getGroup_2_0_1() { return cGroup_2_0_1; }\n \n \t\t//contents+=MarkupInCode\n-\t\tpublic Assignment getContentsAssignment_4_0_1_0() { return cContentsAssignment_4_0_1_0; }\n+\t\tpublic Assignment getContentsAssignment_2_0_1_0() { return cContentsAssignment_2_0_1_0; }\n \n \t\t//MarkupInCode\n-\t\tpublic RuleCall getContentsMarkupInCodeParserRuleCall_4_0_1_0_0() { return cContentsMarkupInCodeParserRuleCall_4_0_1_0_0; }\n+\t\tpublic RuleCall getContentsMarkupInCodeParserRuleCall_2_0_1_0_0() { return cContentsMarkupInCodeParserRuleCall_2_0_1_0_0; }\n \n \t\t//contents+=Code?\n-\t\tpublic Assignment getContentsAssignment_4_0_1_1() { return cContentsAssignment_4_0_1_1; }\n+\t\tpublic Assignment getContentsAssignment_2_0_1_1() { return cContentsAssignment_2_0_1_1; }\n \n \t\t//Code\n-\t\tpublic RuleCall getContentsCodeParserRuleCall_4_0_1_1_0() { return cContentsCodeParserRuleCall_4_0_1_1_0; }\n+\t\tpublic RuleCall getContentsCodeParserRuleCall_2_0_1_1_0() { return cContentsCodeParserRuleCall_2_0_1_1_0; }\n \n \t\t//(contents+=MarkupInCode contents+=Code?)+\n-\t\tpublic Group getGroup_4_1() { return cGroup_4_1; }\n+\t\tpublic Group getGroup_2_1() { return cGroup_2_1; }\n \n \t\t//contents+=MarkupInCode\n-\t\tpublic Assignment getContentsAssignment_4_1_0() { return cContentsAssignment_4_1_0; }\n+\t\tpublic Assignment getContentsAssignment_2_1_0() { return cContentsAssignment_2_1_0; }\n \n \t\t//MarkupInCode\n-\t\tpublic RuleCall getContentsMarkupInCodeParserRuleCall_4_1_0_0() { return cContentsMarkupInCodeParserRuleCall_4_1_0_0; }\n+\t\tpublic RuleCall getContentsMarkupInCodeParserRuleCall_2_1_0_0() { return cContentsMarkupInCodeParserRuleCall_2_1_0_0; }\n \n \t\t//contents+=Code?\n-\t\tpublic Assignment getContentsAssignment_4_1_1() { return cContentsAssignment_4_1_1; }\n+\t\tpublic Assignment getContentsAssignment_2_1_1() { return cContentsAssignment_2_1_1; }\n \n \t\t//Code\n-\t\tpublic RuleCall getContentsCodeParserRuleCall_4_1_1_0() { return cContentsCodeParserRuleCall_4_1_1_0; }\n+\t\tpublic RuleCall getContentsCodeParserRuleCall_2_1_1_0() { return cContentsCodeParserRuleCall_2_1_1_0; }\n \n \t\t//\"]\"\n-\t\tpublic Keyword getRightSquareBracketKeyword_5() { return cRightSquareBracketKeyword_5; }\n+\t\tpublic Keyword getRightSquareBracketKeyword_3() { return cRightSquareBracketKeyword_3; }\n \t}\n \n \tpublic class CodeElements extends AbstractParserRuleElementFinder {\n \t\tprivate final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), \"Code\");\n \t\tprivate final Assignment cContentsAssignment = (Assignment)rule.eContents().get(1);\n \t\tprivate final RuleCall cContentsCodeTextParserRuleCall_0 = (RuleCall)cContentsAssignment.eContents().get(0);\n \t\t\n-\t\t////\n-\t\t////ParBreak:\n-\t\t////\tc=MULTI_NL;\n \t\t//Code:\n \t\t//\tcontents=CodeText;\n \t\tpublic ParserRule getRule() { return rule; }\n@@ -1528,7 +1475,7 @@ public ParserRule getDocumentRule() {\n \t}\n \n \t//Chapter:\n-\t//\t\"\\\\chapter\" (\":\" name=ID)? \"[\" title=TextOrMarkup \"]\" (MULTI_NL contents+=TextOrMarkup)* (MULTI_NL\n+\t//\t(\"chapter:\" name=ID \"[\" | \"chapter[\") title=TextOrMarkup \"]\" (MULTI_NL contents+=TextOrMarkup)* (MULTI_NL\n \t//\tcontents+=Section)*;\n \tpublic ChapterElements getChapterAccess() {\n \t\treturn (pChapter != null) ? pChapter : (pChapter = new ChapterElements());\n@@ -1539,7 +1486,7 @@ public ParserRule getChapterRule() {\n \t}\n \n \t//Section:\n-\t//\t\"\\\\section\" (\":\" name=ID)? \"[\" title=TextOrMarkup \"]\" (MULTI_NL contents+=TextOrMarkup)* (MULTI_NL\n+\t//\t(\"section:\" name=ID \"[\" | \"section[\") title=TextOrMarkup \"]\" (MULTI_NL contents+=TextOrMarkup)* (MULTI_NL\n \t//\tcontents+=SubSection)*;\n \tpublic SectionElements getSectionAccess() {\n \t\treturn (pSection != null) ? pSection : (pSection = new SectionElements());\n@@ -1550,7 +1497,7 @@ public ParserRule getSectionRule() {\n \t}\n \n \t//SubSection:\n-\t//\t\"\\\\subsection\" (\":\" name=ID)? \"[\" title=TextOrMarkup \"]\" (MULTI_NL contents+=TextOrMarkup)* (MULTI_NL\n+\t//\t(\"subsection:\" name=ID \"[\" | \"subsection[\") title=TextOrMarkup \"]\" (MULTI_NL contents+=TextOrMarkup)* (MULTI_NL\n \t//\tcontents+=Section3)*;\n \tpublic SubSectionElements getSubSectionAccess() {\n \t\treturn (pSubSection != null) ? pSubSection : (pSubSection = new SubSectionElements());\n@@ -1561,7 +1508,7 @@ public ParserRule getSubSectionRule() {\n \t}\n \n \t//Section3:\n-\t//\t\"\\\\section3\" (\":\" name=ID)? \"[\" title=TextOrMarkup \"]\" (MULTI_NL contents+=TextOrMarkup)* (MULTI_NL\n+\t//\t(\"section3:\" name=ID \"[\" | \"section3[\") title=TextOrMarkup \"]\" (MULTI_NL contents+=TextOrMarkup)* (MULTI_NL\n \t//\tcontents+=Section4)*;\n \tpublic Section3Elements getSection3Access() {\n \t\treturn (pSection3 != null) ? pSection3 : (pSection3 = new Section3Elements());\n@@ -1572,7 +1519,7 @@ public ParserRule getSection3Rule() {\n \t}\n \n \t//Section4:\n-\t//\t\"\\\\section4\" (\":\" name=ID)? \"[\" title=TextOrMarkup \"]\" (MULTI_NL contents+=TextOrMarkup)*;\n+\t//\t(\"section4:\" name=ID \"[\" | \"section4[\") title=TextOrMarkup \"]\" (MULTI_NL contents+=TextOrMarkup)*;\n \tpublic Section4Elements getSection4Access() {\n \t\treturn (pSection4 != null) ? pSection4 : (pSection4 = new Section4Elements());\n \t}\n@@ -1612,7 +1559,7 @@ public ParserRule getTextPartRule() {\n \t}\n \n \t//Text returns ecore::EString:\n-\t//\t(ID | WS | SINGLE_NL | ANY_OTHER | \"\\\\[\" | \"\\\\]\" | \":\")+;\n+\t//\t(ID | WS | SINGLE_NL | ANY_OTHER | \"\\\\[\" | \"\\\\]\")+;\n \tpublic TextElements getTextAccess() {\n \t\treturn (pText != null) ? pText : (pText = new TextElements());\n \t}\n@@ -1632,7 +1579,7 @@ public ParserRule getMarkUpRule() {\n \t}\n \n \t//Emphasize:\n-\t//\t\"\\\\emph\" \"[\" MULTI_NL? contents+=TextOrMarkup MULTI_NL? \"]\";\n+\t//\t\"emph[\" MULTI_NL? contents+=TextOrMarkup MULTI_NL? \"]\";\n \tpublic EmphasizeElements getEmphasizeAccess() {\n \t\treturn (pEmphasize != null) ? pEmphasize : (pEmphasize = new EmphasizeElements());\n \t}\n@@ -1642,7 +1589,7 @@ public ParserRule getEmphasizeRule() {\n \t}\n \n \t//Anchor:\n-\t//\t\"\\\\a\" \":\" name=ID (\"[\" \"]\")?;\n+\t//\t\"a[\" name=ID \"]\";\n \tpublic AnchorElements getAnchorAccess() {\n \t\treturn (pAnchor != null) ? pAnchor : (pAnchor = new AnchorElements());\n \t}\n@@ -1652,7 +1599,7 @@ public ParserRule getAnchorRule() {\n \t}\n \n \t//Ref:\n-\t//\t\"\\\\ref\" \":\" ref=[Identifiable] \"[\" MULTI_NL? contents+=TextOrMarkup MULTI_NL? \"]\";\n+\t//\t\"ref:\" ref=[Identifiable] \"[\" MULTI_NL? contents+=TextOrMarkup MULTI_NL? \"]\";\n \tpublic RefElements getRefAccess() {\n \t\treturn (pRef != null) ? pRef : (pRef = new RefElements());\n \t}\n@@ -1662,7 +1609,7 @@ public ParserRule getRefRule() {\n \t}\n \n \t//OrderedList:\n-\t//\t\"\\\\ol\" ANY_WS* \"[\" (ANY_WS* items+=Item)+ ANY_WS* \"]\";\n+\t//\t\"ol[\" (ANY_WS* items+=Item)+ ANY_WS* \"]\";\n \tpublic OrderedListElements getOrderedListAccess() {\n \t\treturn (pOrderedList != null) ? pOrderedList : (pOrderedList = new OrderedListElements());\n \t}\n@@ -1672,7 +1619,7 @@ public ParserRule getOrderedListRule() {\n \t}\n \n \t//UnorderedList:\n-\t//\t\"\\\\ul\" ANY_WS* \"[\" (ANY_WS* items+=Item)+ ANY_WS* \"]\";\n+\t//\t\"ul[\" (ANY_WS* items+=Item)+ ANY_WS* \"]\";\n \tpublic UnorderedListElements getUnorderedListAccess() {\n \t\treturn (pUnorderedList != null) ? pUnorderedList : (pUnorderedList = new UnorderedListElements());\n \t}\n@@ -1682,7 +1629,7 @@ public ParserRule getUnorderedListRule() {\n \t}\n \n \t//Item:\n-\t//\t\"\\\\item\" ANY_WS* \"[\" MULTI_NL? contents+=TextOrMarkup (MULTI_NL contents+=TextOrMarkup)* \"]\";\n+\t//\t\"item[\" MULTI_NL? contents+=TextOrMarkup (MULTI_NL contents+=TextOrMarkup)* \"]\";\n \tpublic ItemElements getItemAccess() {\n \t\treturn (pItem != null) ? pItem : (pItem = new ItemElements());\n \t}\n@@ -1692,7 +1639,7 @@ public ParserRule getItemRule() {\n \t}\n \n \t//CodeRef:\n-\t//\t\"\\\\codeRef\" ANY_WS* \"[\" element=[types::JvmIdentifyableElement|Text] \"]\";\n+\t//\t\"codeRef[\" element=[types::JvmIdentifyableElement|Text] \"]\";\n \tpublic CodeRefElements getCodeRefAccess() {\n \t\treturn (pCodeRef != null) ? pCodeRef : (pCodeRef = new CodeRefElements());\n \t}\n@@ -1702,7 +1649,7 @@ public ParserRule getCodeRefRule() {\n \t}\n \n \t//Link:\n-\t//\t\"\\\\link\" ANY_WS* \"[\" url=Text \"]\" ANY_WS* \"[\" text=Text \"]\";\n+\t//\t\"link[\" url=Text \"]\" ANY_WS* \"[\" text=Text \"]\";\n \tpublic LinkElements getLinkAccess() {\n \t\treturn (pLink != null) ? pLink : (pLink = new LinkElements());\n \t}\n@@ -1713,8 +1660,8 @@ public ParserRule getLinkRule() {\n \n \t//// Don't think this was the discussed syntax\n \t//ImageRef:\n-\t//\t\"\\\\img\" ANY_WS* (\":\" ANY_WS* name=ID ANY_WS*)? \"[\" path=Text / *TODO make it a crossreference to images * / \"]\" ANY_WS*\n-\t//\t\"[\" clazz=Text \"]\" ANY_WS* \"[\" style=Text \"]\" ANY_WS* \"[\" caption=Text \"]\";\n+\t//\t(\"img:\" ANY_WS* name=ID ANY_WS* \"[\" | \"img[\") path=Text / *TODO make it a crossreference to images * / \"]\" ANY_WS* \"[\"\n+\t//\tclazz=Text \"]\" ANY_WS* \"[\" style=Text \"]\" ANY_WS* \"[\" caption=Text \"]\";\n \tpublic ImageRefElements getImageRefAccess() {\n \t\treturn (pImageRef != null) ? pImageRef : (pImageRef = new ImageRefElements());\n \t}\n@@ -1724,8 +1671,8 @@ public ParserRule getImageRefRule() {\n \t}\n \n \t//CodeBlock:\n-\t//\t\"\\\\code\" ANY_WS* (\"[\" ANY_WS* language=ID ANY_WS* \"]\" ANY_WS*)? \"[\" (contents+=Code (contents+=MarkupInCode\n-\t//\tcontents+=Code?)* | (contents+=MarkupInCode contents+=Code?)+) \"]\";\n+\t//\t\"code[\" (ANY_WS* language=ID ANY_WS* \"]\" ANY_WS* \"[\")? (contents+=Code (contents+=MarkupInCode contents+=Code?)* |\n+\t//\t(contents+=MarkupInCode contents+=Code?)+) \"]\";\n \tpublic CodeBlockElements getCodeBlockAccess() {\n \t\treturn (pCodeBlock != null) ? pCodeBlock : (pCodeBlock = new CodeBlockElements());\n \t}\n@@ -1734,9 +1681,6 @@ public ParserRule getCodeBlockRule() {\n \t\treturn getCodeBlockAccess().getRule();\n \t}\n \n-\t////\n-\t////ParBreak:\n-\t////\tc=MULTI_NL;\n \t//Code:\n \t//\tcontents=CodeText;\n \tpublic CodeElements getCodeAccess() {", "raw_url": "https://github.com/RvonMassow/xDoc/raw/6b0eb897ce8abe5cda472a8e6af89cd62a47dd66/org.eclipse.xtext.xdoc%2Fsrc-gen%2Forg%2Feclipse%2Fxtext%2Fxdoc%2Fservices%2FXDocGrammarAccess.java", "sha": "be5a48f0966bb2ffd4922d933c33623282f53529", "status": "modified" }, { "additions": 17, "blob_url": "https://github.com/RvonMassow/xDoc/blob/6b0eb897ce8abe5cda472a8e6af89cd62a47dd66/org.eclipse.xtext.xdoc%2Fsrc%2Forg%2Feclipse%2Fxtext%2Fxdoc%2FXDoc.xtext", "changes": 36, "contents_url": "https://api.github.com/repos/RvonMassow/xDoc/contents/org.eclipse.xtext.xdoc%2Fsrc%2Forg%2Feclipse%2Fxtext%2Fxdoc%2FXDoc.xtext?ref=6b0eb897ce8abe5cda472a8e6af89cd62a47dd66", "deletions": 19, "filename": "org.eclipse.xtext.xdoc/src/org/eclipse/xtext/xdoc/XDoc.xtext", "new_code": "\t('chapter:' name=ID '['| 'chapter[') title=TextOrMarkup ']' \n\t('section:' name=ID '['| 'section[') title=TextOrMarkup ']' \n\t('subsection:' name=ID '['| 'subsection[') title=TextOrMarkup ']' \n\t('section3:' name=ID '['|'section3[') title=TextOrMarkup ']' \n\t('section4:' name=ID '['|'section4[') title=TextOrMarkup ']' \n\t(ID | WS | SINGLE_NL | ANY_OTHER | '\\\\[' | '\\\\]')+;\n\t'emph[' MULTI_NL? contents+=TextOrMarkup MULTI_NL? ']';\n\t'a[' name=ID ']';\n\t'ref:' ref=[Identifiable] '[' MULTI_NL? contents+=TextOrMarkup MULTI_NL? ']';\n\t'ol['\n\t'ul['\n\t'item[' MULTI_NL? contents+=TextOrMarkup (MULTI_NL contents+=TextOrMarkup)* ']';\n\t'codeRef[' element=[types::JvmIdentifyableElement|Text] ']';\n\t'link[' url=Text ']' ANY_WS* '[' text=Text ']';\n\t('img:' ANY_WS* name=ID ANY_WS* '['|'img[') path=Text /*TODO make it a crossreference to images */ ']' ANY_WS*\n\t'code[' (ANY_WS* language=ID ANY_WS* ']' ANY_WS* '[')? \n", "new_methods": [], "old_code": "\t'\\\\chapter' (':' name=ID)? '[' title=TextOrMarkup ']' \n\t'\\\\section' (':' name=ID)? '[' title=TextOrMarkup ']' \n\t'\\\\subsection' (':' name=ID)? '[' title=TextOrMarkup ']' \n\t'\\\\section3' (':' name=ID)? '[' title=TextOrMarkup ']' \n\t'\\\\section4' (':' name=ID)? '[' title=TextOrMarkup ']' \n\t(ID | WS | SINGLE_NL | ANY_OTHER | '\\\\[' | '\\\\]' | ':')+;\n\t'\\\\emph' '[' MULTI_NL? contents+=TextOrMarkup MULTI_NL? ']';\n\t'\\\\a' ':' name=ID ('[' ']')?;\n\t'\\\\ref' ':' ref=[Identifiable] '[' MULTI_NL? contents+=TextOrMarkup MULTI_NL? ']';\n\t'\\\\ol' ANY_WS* '['\n\t'\\\\ul' ANY_WS* '['\n\t'\\\\item' ANY_WS* '[' MULTI_NL? contents+=TextOrMarkup (MULTI_NL contents+=TextOrMarkup)* ']';\n\t'\\\\codeRef' ANY_WS* '[' element=[types::JvmIdentifyableElement|Text] ']';\n\t'\\\\link' ANY_WS* '[' url=Text ']' ANY_WS* '[' text=Text ']';\n\t'\\\\img' ANY_WS* (':' ANY_WS* name=ID ANY_WS*)? '[' path=Text /*TODO make it a crossreference to images */ ']' ANY_WS*\n\t'\\\\code' ANY_WS* ('[' ANY_WS* language=ID ANY_WS* ']' ANY_WS*)? '['\n\t//\n//ParBreak:\n//\tc=MULTI_NL;", "old_methods": [], "patch": "@@ -14,27 +14,27 @@ Document:\n \tMULTI_NL?)?;\n \n Chapter:\n-\t'\\\\chapter' (':' name=ID)? '[' title=TextOrMarkup ']' \n+\t('chapter:' name=ID '['| 'chapter[') title=TextOrMarkup ']' \n \t(MULTI_NL contents+=TextOrMarkup)*\n \t(MULTI_NL contents+=Section)*;\n \n Section:\n-\t'\\\\section' (':' name=ID)? '[' title=TextOrMarkup ']' \n+\t('section:' name=ID '['| 'section[') title=TextOrMarkup ']' \n \t(MULTI_NL contents+=TextOrMarkup)*\n \t(MULTI_NL contents+=SubSection)*;\n \n SubSection:\n-\t'\\\\subsection' (':' name=ID)? '[' title=TextOrMarkup ']' \n+\t('subsection:' name=ID '['| 'subsection[') title=TextOrMarkup ']' \n \t(MULTI_NL contents+=TextOrMarkup)*\n \t(MULTI_NL contents+=Section3)*;\n \n Section3:\n-\t'\\\\section3' (':' name=ID)? '[' title=TextOrMarkup ']' \n+\t('section3:' name=ID '['|'section3[') title=TextOrMarkup ']' \n \t(MULTI_NL contents+=TextOrMarkup)*\n \t(MULTI_NL contents+=Section4)*;\n \n Section4:\n-\t'\\\\section4' (':' name=ID)? '[' title=TextOrMarkup ']' \n+\t('section4:' name=ID '['|'section4[') title=TextOrMarkup ']' \n \t(MULTI_NL contents+=TextOrMarkup)*;\n \n Identifiable:\n@@ -49,7 +49,7 @@ TextPart:\n \ttext=Text;\n \n Text:\n-\t(ID | WS | SINGLE_NL | ANY_OTHER | '\\\\[' | '\\\\]' | ':')+;\n+\t(ID | WS | SINGLE_NL | ANY_OTHER | '\\\\[' | '\\\\]')+;\n \n MarkUp:\n \tEmphasize |\n@@ -63,49 +63,47 @@ MarkUp:\n \tImageRef;\n \n Emphasize:\n-\t'\\\\emph' '[' MULTI_NL? contents+=TextOrMarkup MULTI_NL? ']';\n+\t'emph[' MULTI_NL? contents+=TextOrMarkup MULTI_NL? ']';\n \n Anchor:\n-\t'\\\\a' ':' name=ID ('[' ']')?;\n+\t'a[' name=ID ']';\n \n Ref:\n-\t'\\\\ref' ':' ref=[Identifiable] '[' MULTI_NL? contents+=TextOrMarkup MULTI_NL? ']';\n+\t'ref:' ref=[Identifiable] '[' MULTI_NL? contents+=TextOrMarkup MULTI_NL? ']';\n \n OrderedList:\n-\t'\\\\ol' ANY_WS* '['\n+\t'ol['\n \t\t(ANY_WS* items+=Item)+\n \t\tANY_WS*\n \t']';\n \n UnorderedList:\n-\t'\\\\ul' ANY_WS* '['\n+\t'ul['\n \t\t(ANY_WS* items+=Item)+\n \t\tANY_WS*\n \t']';\n \n Item:\n-\t'\\\\item' ANY_WS* '[' MULTI_NL? contents+=TextOrMarkup (MULTI_NL contents+=TextOrMarkup)* ']';\n+\t'item[' MULTI_NL? contents+=TextOrMarkup (MULTI_NL contents+=TextOrMarkup)* ']';\n \n CodeRef:\n-\t'\\\\codeRef' ANY_WS* '[' element=[types::JvmIdentifyableElement|Text] ']';\n+\t'codeRef[' element=[types::JvmIdentifyableElement|Text] ']';\n \n Link:\n-\t'\\\\link' ANY_WS* '[' url=Text ']' ANY_WS* '[' text=Text ']';\n+\t'link[' url=Text ']' ANY_WS* '[' text=Text ']';\n \n \t// Don't think this was the discussed syntax\n ImageRef:\n-\t'\\\\img' ANY_WS* (':' ANY_WS* name=ID ANY_WS*)? '[' path=Text /*TODO make it a crossreference to images */ ']' ANY_WS*\n+\t('img:' ANY_WS* name=ID ANY_WS* '['|'img[') path=Text /*TODO make it a crossreference to images */ ']' ANY_WS*\n \t'[' clazz=Text ']' ANY_WS* '[' style=Text ']' ANY_WS* '[' caption=Text ']';\n \n CodeBlock:\n-\t'\\\\code' ANY_WS* ('[' ANY_WS* language=ID ANY_WS* ']' ANY_WS*)? '['\n+\t'code[' (ANY_WS* language=ID ANY_WS* ']' ANY_WS* '[')? \n \t\t(contents+=Code\n \t\t(contents+=MarkupInCode contents+=Code?)* |\n \t\t(contents+=MarkupInCode contents+=Code?)+)\n \t']';\n-\t//\n-//ParBreak:\n-//\tc=MULTI_NL;\n+\n Code:\n \tcontents=CodeText;\n ", "raw_url": "https://github.com/RvonMassow/xDoc/raw/6b0eb897ce8abe5cda472a8e6af89cd62a47dd66/org.eclipse.xtext.xdoc%2Fsrc%2Forg%2Feclipse%2Fxtext%2Fxdoc%2FXDoc.xtext", "sha": "4008cc6ae91635301425b7d6d911e97abd8491cf", "status": "modified" } ]
27
[ { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cANY_WSParserRuleCall_1_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getANY_WSParserRuleCall_1_0()", "old_args": "", "old_implementation": "return cANY_WSParserRuleCall_1;", "old_return_type": "RuleCall", "old_signature": "RuleCall getANY_WSParserRuleCall_1()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cANY_WSParserRuleCall_2;", "new_return_type": "RuleCall", "new_signature": "RuleCall getANY_WSParserRuleCall_2()", "old_args": "", "old_implementation": "return cANY_WSParserRuleCall_1;", "old_return_type": "RuleCall", "old_signature": "RuleCall getANY_WSParserRuleCall_1()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cANY_WSParserRuleCall_2;", "new_return_type": "RuleCall", "new_signature": "RuleCall getANY_WSParserRuleCall_2()", "old_args": "", "old_implementation": "return cANY_WSParserRuleCall_1;", "old_return_type": "RuleCall", "old_signature": "RuleCall getANY_WSParserRuleCall_1()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cANY_WSParserRuleCall_3;", "new_return_type": "RuleCall", "new_signature": "RuleCall getANY_WSParserRuleCall_3()", "old_args": "", "old_implementation": "return cANY_WSParserRuleCall_1;", "old_return_type": "RuleCall", "old_signature": "RuleCall getANY_WSParserRuleCall_1()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cANY_WSParserRuleCall_3;", "new_return_type": "RuleCall", "new_signature": "RuleCall getANY_WSParserRuleCall_3()", "old_args": "", "old_implementation": "return cANY_WSParserRuleCall_1;", "old_return_type": "RuleCall", "old_signature": "RuleCall getANY_WSParserRuleCall_1()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cStyleTextParserRuleCall_9_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getStyleTextParserRuleCall_9_0()", "old_args": "", "old_implementation": "return cANY_WSParserRuleCall_10;", "old_return_type": "RuleCall", "old_signature": "RuleCall getANY_WSParserRuleCall_10()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cANY_WSParserRuleCall_11;", "new_return_type": "RuleCall", "new_signature": "RuleCall getANY_WSParserRuleCall_11()", "old_args": "", "old_implementation": "return cANY_WSParserRuleCall_2_1;", "old_return_type": "RuleCall", "old_signature": "RuleCall getANY_WSParserRuleCall_2_1()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cANY_WSParserRuleCall_1_2;", "new_return_type": "RuleCall", "new_signature": "RuleCall getANY_WSParserRuleCall_1_2()", "old_args": "", "old_implementation": "return cANY_WSParserRuleCall_2_1;", "old_return_type": "RuleCall", "old_signature": "RuleCall getANY_WSParserRuleCall_2_1()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cANY_WSParserRuleCall_0_0_3;", "new_return_type": "RuleCall", "new_signature": "RuleCall getANY_WSParserRuleCall_0_0_3()", "old_args": "", "old_implementation": "return cANY_WSParserRuleCall_2_3;", "old_return_type": "RuleCall", "old_signature": "RuleCall getANY_WSParserRuleCall_2_3()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cANY_WSParserRuleCall_1_4;", "new_return_type": "RuleCall", "new_signature": "RuleCall getANY_WSParserRuleCall_1_4()", "old_args": "", "old_implementation": "return cANY_WSParserRuleCall_2_3;", "old_return_type": "RuleCall", "old_signature": "RuleCall getANY_WSParserRuleCall_2_3()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cANY_WSParserRuleCall_1_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getANY_WSParserRuleCall_1_0()", "old_args": "", "old_implementation": "return cANY_WSParserRuleCall_3_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getANY_WSParserRuleCall_3_0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cANY_WSParserRuleCall_1_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getANY_WSParserRuleCall_1_0()", "old_args": "", "old_implementation": "return cANY_WSParserRuleCall_3_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getANY_WSParserRuleCall_3_0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cANY_WSParserRuleCall_7;", "new_return_type": "RuleCall", "new_signature": "RuleCall getANY_WSParserRuleCall_7()", "old_args": "", "old_implementation": "return cANY_WSParserRuleCall_6;", "old_return_type": "RuleCall", "old_signature": "RuleCall getANY_WSParserRuleCall_6()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cAlternatives_2;", "new_return_type": "Alternatives", "new_signature": "Alternatives getAlternatives_2()", "old_args": "", "old_implementation": "return cAlternatives_4;", "old_return_type": "Alternatives", "old_signature": "Alternatives getAlternatives_4()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cCaptionAssignment_13;", "new_return_type": "Assignment", "new_signature": "Assignment getCaptionAssignment_13()", "old_args": "", "old_implementation": "return cCaptionAssignment_16;", "old_return_type": "Assignment", "old_signature": "Assignment getCaptionAssignment_16()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cChapterKeyword_0_1;", "new_return_type": "Keyword", "new_signature": "Keyword getChapterKeyword_0_1()", "old_args": "", "old_implementation": "return cChapterKeyword_0;", "old_return_type": "Keyword", "old_signature": "Keyword getChapterKeyword_0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cClazzAssignment_5;", "new_return_type": "Assignment", "new_signature": "Assignment getClazzAssignment_5()", "old_args": "", "old_implementation": "return cClazzAssignment_8;", "old_return_type": "Assignment", "old_signature": "Assignment getClazzAssignment_8()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cClazzTextParserRuleCall_5_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getClazzTextParserRuleCall_5_0()", "old_args": "", "old_implementation": "return cClazzTextParserRuleCall_8_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getClazzTextParserRuleCall_8_0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cChapterKeyword_0_0_0;", "new_return_type": "Keyword", "new_signature": "Keyword getChapterKeyword_0_0_0()", "old_args": "", "old_implementation": "return cColonKeyword_1_0;", "old_return_type": "Keyword", "old_signature": "Keyword getColonKeyword_1_0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cSection3Keyword_0_0_0;", "new_return_type": "Keyword", "new_signature": "Keyword getSection3Keyword_0_0_0()", "old_args": "", "old_implementation": "return cColonKeyword_1_0;", "old_return_type": "Keyword", "old_signature": "Keyword getColonKeyword_1_0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cSection4Keyword_0_0_0;", "new_return_type": "Keyword", "new_signature": "Keyword getSection4Keyword_0_0_0()", "old_args": "", "old_implementation": "return cColonKeyword_1_0;", "old_return_type": "Keyword", "old_signature": "Keyword getColonKeyword_1_0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cSectionKeyword_0_0_0;", "new_return_type": "Keyword", "new_signature": "Keyword getSectionKeyword_0_0_0()", "old_args": "", "old_implementation": "return cColonKeyword_1_0;", "old_return_type": "Keyword", "old_signature": "Keyword getColonKeyword_1_0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cSubsectionKeyword_0_0_0;", "new_return_type": "Keyword", "new_signature": "Keyword getSubsectionKeyword_0_0_0()", "old_args": "", "old_implementation": "return cColonKeyword_1_0;", "old_return_type": "Keyword", "old_signature": "Keyword getColonKeyword_1_0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cImgKeyword_0_0_0;", "new_return_type": "Keyword", "new_signature": "Keyword getImgKeyword_0_0_0()", "old_args": "", "old_implementation": "return cColonKeyword_2_0;", "old_return_type": "Keyword", "old_signature": "Keyword getColonKeyword_2_0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cContentsAssignment_2;", "new_return_type": "Assignment", "new_signature": "Assignment getContentsAssignment_2()", "old_args": "", "old_implementation": "return cContentsAssignment_3;", "old_return_type": "Assignment", "old_signature": "Assignment getContentsAssignment_3()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cContentsAssignment_2;", "new_return_type": "Assignment", "new_signature": "Assignment getContentsAssignment_2()", "old_args": "", "old_implementation": "return cContentsAssignment_4;", "old_return_type": "Assignment", "old_signature": "Assignment getContentsAssignment_4()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cContentsAssignment_2_0_0;", "new_return_type": "Assignment", "new_signature": "Assignment getContentsAssignment_2_0_0()", "old_args": "", "old_implementation": "return cContentsAssignment_4_0_0;", "old_return_type": "Assignment", "old_signature": "Assignment getContentsAssignment_4_0_0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cContentsAssignment_2_0_1_0;", "new_return_type": "Assignment", "new_signature": "Assignment getContentsAssignment_2_0_1_0()", "old_args": "", "old_implementation": "return cContentsAssignment_4_0_1_0;", "old_return_type": "Assignment", "old_signature": "Assignment getContentsAssignment_4_0_1_0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cContentsAssignment_2_0_1_1;", "new_return_type": "Assignment", "new_signature": "Assignment getContentsAssignment_2_0_1_1()", "old_args": "", "old_implementation": "return cContentsAssignment_4_0_1_1;", "old_return_type": "Assignment", "old_signature": "Assignment getContentsAssignment_4_0_1_1()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cContentsAssignment_2_1_0;", "new_return_type": "Assignment", "new_signature": "Assignment getContentsAssignment_2_1_0()", "old_args": "", "old_implementation": "return cContentsAssignment_4_1_0;", "old_return_type": "Assignment", "old_signature": "Assignment getContentsAssignment_4_1_0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cContentsAssignment_2_1_1;", "new_return_type": "Assignment", "new_signature": "Assignment getContentsAssignment_2_1_1()", "old_args": "", "old_implementation": "return cContentsAssignment_4_1_1;", "old_return_type": "Assignment", "old_signature": "Assignment getContentsAssignment_4_1_1()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cContentsAssignment_4;", "new_return_type": "Assignment", "new_signature": "Assignment getContentsAssignment_4()", "old_args": "", "old_implementation": "return cContentsAssignment_5;", "old_return_type": "Assignment", "old_signature": "Assignment getContentsAssignment_5()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cContentsAssignment_3_1;", "new_return_type": "Assignment", "new_signature": "Assignment getContentsAssignment_3_1()", "old_args": "", "old_implementation": "return cContentsAssignment_5_1;", "old_return_type": "Assignment", "old_signature": "Assignment getContentsAssignment_5_1()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cContentsAssignment_3_1;", "new_return_type": "Assignment", "new_signature": "Assignment getContentsAssignment_3_1()", "old_args": "", "old_implementation": "return cContentsAssignment_5_1;", "old_return_type": "Assignment", "old_signature": "Assignment getContentsAssignment_5_1()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cContentsAssignment_3_1;", "new_return_type": "Assignment", "new_signature": "Assignment getContentsAssignment_3_1()", "old_args": "", "old_implementation": "return cContentsAssignment_5_1;", "old_return_type": "Assignment", "old_signature": "Assignment getContentsAssignment_5_1()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cContentsAssignment_3_1;", "new_return_type": "Assignment", "new_signature": "Assignment getContentsAssignment_3_1()", "old_args": "", "old_implementation": "return cContentsAssignment_5_1;", "old_return_type": "Assignment", "old_signature": "Assignment getContentsAssignment_5_1()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cContentsAssignment_3_1;", "new_return_type": "Assignment", "new_signature": "Assignment getContentsAssignment_3_1()", "old_args": "", "old_implementation": "return cContentsAssignment_5_1;", "old_return_type": "Assignment", "old_signature": "Assignment getContentsAssignment_5_1()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cContentsAssignment_3_1;", "new_return_type": "Assignment", "new_signature": "Assignment getContentsAssignment_3_1()", "old_args": "", "old_implementation": "return cContentsAssignment_5_1;", "old_return_type": "Assignment", "old_signature": "Assignment getContentsAssignment_5_1()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cContentsAssignment_4_1;", "new_return_type": "Assignment", "new_signature": "Assignment getContentsAssignment_4_1()", "old_args": "", "old_implementation": "return cContentsAssignment_6_1;", "old_return_type": "Assignment", "old_signature": "Assignment getContentsAssignment_6_1()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cContentsAssignment_4_1;", "new_return_type": "Assignment", "new_signature": "Assignment getContentsAssignment_4_1()", "old_args": "", "old_implementation": "return cContentsAssignment_6_1;", "old_return_type": "Assignment", "old_signature": "Assignment getContentsAssignment_6_1()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cContentsAssignment_4_1;", "new_return_type": "Assignment", "new_signature": "Assignment getContentsAssignment_4_1()", "old_args": "", "old_implementation": "return cContentsAssignment_6_1;", "old_return_type": "Assignment", "old_signature": "Assignment getContentsAssignment_6_1()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cContentsAssignment_4_1;", "new_return_type": "Assignment", "new_signature": "Assignment getContentsAssignment_4_1()", "old_args": "", "old_implementation": "return cContentsAssignment_6_1;", "old_return_type": "Assignment", "old_signature": "Assignment getContentsAssignment_6_1()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cContentsCodeParserRuleCall_2_0_0_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getContentsCodeParserRuleCall_2_0_0_0()", "old_args": "", "old_implementation": "return cContentsCodeParserRuleCall_4_0_0_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getContentsCodeParserRuleCall_4_0_0_0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cContentsCodeParserRuleCall_2_0_1_1_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getContentsCodeParserRuleCall_2_0_1_1_0()", "old_args": "", "old_implementation": "return cContentsCodeParserRuleCall_4_0_1_1_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getContentsCodeParserRuleCall_4_0_1_1_0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cContentsCodeParserRuleCall_2_1_1_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getContentsCodeParserRuleCall_2_1_1_0()", "old_args": "", "old_implementation": "return cContentsCodeParserRuleCall_4_1_1_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getContentsCodeParserRuleCall_4_1_1_0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cContentsMarkupInCodeParserRuleCall_2_0_1_0_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getContentsMarkupInCodeParserRuleCall_2_0_1_0_0()", "old_args": "", "old_implementation": "return cContentsMarkupInCodeParserRuleCall_4_0_1_0_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getContentsMarkupInCodeParserRuleCall_4_0_1_0_0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cContentsMarkupInCodeParserRuleCall_2_1_0_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getContentsMarkupInCodeParserRuleCall_2_1_0_0()", "old_args": "", "old_implementation": "return cContentsMarkupInCodeParserRuleCall_4_1_0_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getContentsMarkupInCodeParserRuleCall_4_1_0_0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cContentsSection3ParserRuleCall_4_1_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getContentsSection3ParserRuleCall_4_1_0()", "old_args": "", "old_implementation": "return cContentsSection3ParserRuleCall_6_1_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getContentsSection3ParserRuleCall_6_1_0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cContentsSection4ParserRuleCall_4_1_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getContentsSection4ParserRuleCall_4_1_0()", "old_args": "", "old_implementation": "return cContentsSection4ParserRuleCall_6_1_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getContentsSection4ParserRuleCall_6_1_0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cContentsSectionParserRuleCall_4_1_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getContentsSectionParserRuleCall_4_1_0()", "old_args": "", "old_implementation": "return cContentsSectionParserRuleCall_6_1_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getContentsSectionParserRuleCall_6_1_0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cContentsSubSectionParserRuleCall_4_1_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getContentsSubSectionParserRuleCall_4_1_0()", "old_args": "", "old_implementation": "return cContentsSubSectionParserRuleCall_6_1_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getContentsSubSectionParserRuleCall_6_1_0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cContentsTextOrMarkupParserRuleCall_2_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getContentsTextOrMarkupParserRuleCall_2_0()", "old_args": "", "old_implementation": "return cContentsTextOrMarkupParserRuleCall_3_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getContentsTextOrMarkupParserRuleCall_3_0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cContentsTextOrMarkupParserRuleCall_2_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getContentsTextOrMarkupParserRuleCall_2_0()", "old_args": "", "old_implementation": "return cContentsTextOrMarkupParserRuleCall_4_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getContentsTextOrMarkupParserRuleCall_4_0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cContentsTextOrMarkupParserRuleCall_4_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getContentsTextOrMarkupParserRuleCall_4_0()", "old_args": "", "old_implementation": "return cContentsTextOrMarkupParserRuleCall_5_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getContentsTextOrMarkupParserRuleCall_5_0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cContentsTextOrMarkupParserRuleCall_3_1_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getContentsTextOrMarkupParserRuleCall_3_1_0()", "old_args": "", "old_implementation": "return cContentsTextOrMarkupParserRuleCall_5_1_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getContentsTextOrMarkupParserRuleCall_5_1_0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cContentsTextOrMarkupParserRuleCall_3_1_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getContentsTextOrMarkupParserRuleCall_3_1_0()", "old_args": "", "old_implementation": "return cContentsTextOrMarkupParserRuleCall_5_1_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getContentsTextOrMarkupParserRuleCall_5_1_0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cContentsTextOrMarkupParserRuleCall_3_1_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getContentsTextOrMarkupParserRuleCall_3_1_0()", "old_args": "", "old_implementation": "return cContentsTextOrMarkupParserRuleCall_5_1_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getContentsTextOrMarkupParserRuleCall_5_1_0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cContentsTextOrMarkupParserRuleCall_3_1_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getContentsTextOrMarkupParserRuleCall_3_1_0()", "old_args": "", "old_implementation": "return cContentsTextOrMarkupParserRuleCall_5_1_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getContentsTextOrMarkupParserRuleCall_5_1_0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cContentsTextOrMarkupParserRuleCall_3_1_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getContentsTextOrMarkupParserRuleCall_3_1_0()", "old_args": "", "old_implementation": "return cContentsTextOrMarkupParserRuleCall_5_1_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getContentsTextOrMarkupParserRuleCall_5_1_0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cContentsTextOrMarkupParserRuleCall_3_1_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getContentsTextOrMarkupParserRuleCall_3_1_0()", "old_args": "", "old_implementation": "return cContentsTextOrMarkupParserRuleCall_5_1_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getContentsTextOrMarkupParserRuleCall_5_1_0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cElementAssignment_1;", "new_return_type": "Assignment", "new_signature": "Assignment getElementAssignment_1()", "old_args": "", "old_implementation": "return cElementAssignment_3;", "old_return_type": "Assignment", "old_signature": "Assignment getElementAssignment_3()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cElementJvmIdentifyableElementCrossReference_1_0;", "new_return_type": "CrossReference", "new_signature": "CrossReference getElementJvmIdentifyableElementCrossReference_1_0()", "old_args": "", "old_implementation": "return cElementJvmIdentifyableElementCrossReference_3_0;", "old_return_type": "CrossReference", "old_signature": "CrossReference getElementJvmIdentifyableElementCrossReference_3_0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cElementJvmIdentifyableElementTextParserRuleCall_1_0_1;", "new_return_type": "RuleCall", "new_signature": "RuleCall getElementJvmIdentifyableElementTextParserRuleCall_1_0_1()", "old_args": "", "old_implementation": "return cElementJvmIdentifyableElementTextParserRuleCall_3_0_1;", "old_return_type": "RuleCall", "old_signature": "RuleCall getElementJvmIdentifyableElementTextParserRuleCall_3_0_1()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cGroup_3;", "new_return_type": "Group", "new_signature": "Group getGroup_3()", "old_args": "", "old_implementation": "return cGroup_1;", "old_return_type": "Group", "old_signature": "Group getGroup_1()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cGroup_3;", "new_return_type": "Group", "new_signature": "Group getGroup_3()", "old_args": "", "old_implementation": "return cGroup_1;", "old_return_type": "Group", "old_signature": "Group getGroup_1()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cGroup_3;", "new_return_type": "Group", "new_signature": "Group getGroup_3()", "old_args": "", "old_implementation": "return cGroup_1;", "old_return_type": "Group", "old_signature": "Group getGroup_1()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cGroup_3;", "new_return_type": "Group", "new_signature": "Group getGroup_3()", "old_args": "", "old_implementation": "return cGroup_1;", "old_return_type": "Group", "old_signature": "Group getGroup_1()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cGroup_3;", "new_return_type": "Group", "new_signature": "Group getGroup_3()", "old_args": "", "old_implementation": "return cGroup_1;", "old_return_type": "Group", "old_signature": "Group getGroup_1()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cGroup_0_0;", "new_return_type": "Group", "new_signature": "Group getGroup_0_0()", "old_args": "", "old_implementation": "return cGroup_2;", "old_return_type": "Group", "old_signature": "Group getGroup_2()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cGroup_1;", "new_return_type": "Group", "new_signature": "Group getGroup_1()", "old_args": "", "old_implementation": "return cGroup_2;", "old_return_type": "Group", "old_signature": "Group getGroup_2()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cGroup_1;", "new_return_type": "Group", "new_signature": "Group getGroup_1()", "old_args": "", "old_implementation": "return cGroup_3;", "old_return_type": "Group", "old_signature": "Group getGroup_3()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cGroup_1;", "new_return_type": "Group", "new_signature": "Group getGroup_1()", "old_args": "", "old_implementation": "return cGroup_3;", "old_return_type": "Group", "old_signature": "Group getGroup_3()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cGroup_2_0;", "new_return_type": "Group", "new_signature": "Group getGroup_2_0()", "old_args": "", "old_implementation": "return cGroup_4_0;", "old_return_type": "Group", "old_signature": "Group getGroup_4_0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cGroup_2_0_1;", "new_return_type": "Group", "new_signature": "Group getGroup_2_0_1()", "old_args": "", "old_implementation": "return cGroup_4_0_1;", "old_return_type": "Group", "old_signature": "Group getGroup_4_0_1()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cGroup_2_1;", "new_return_type": "Group", "new_signature": "Group getGroup_2_1()", "old_args": "", "old_implementation": "return cGroup_4_1;", "old_return_type": "Group", "old_signature": "Group getGroup_4_1()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cGroup_3;", "new_return_type": "Group", "new_signature": "Group getGroup_3()", "old_args": "", "old_implementation": "return cGroup_5;", "old_return_type": "Group", "old_signature": "Group getGroup_5()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cGroup_4;", "new_return_type": "Group", "new_signature": "Group getGroup_4()", "old_args": "", "old_implementation": "return cGroup_5;", "old_return_type": "Group", "old_signature": "Group getGroup_5()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cGroup_4;", "new_return_type": "Group", "new_signature": "Group getGroup_4()", "old_args": "", "old_implementation": "return cGroup_5;", "old_return_type": "Group", "old_signature": "Group getGroup_5()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cGroup_4;", "new_return_type": "Group", "new_signature": "Group getGroup_4()", "old_args": "", "old_implementation": "return cGroup_5;", "old_return_type": "Group", "old_signature": "Group getGroup_5()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cGroup_4;", "new_return_type": "Group", "new_signature": "Group getGroup_4()", "old_args": "", "old_implementation": "return cGroup_5;", "old_return_type": "Group", "old_signature": "Group getGroup_5()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cImgKeyword_0_1;", "new_return_type": "Keyword", "new_signature": "Keyword getImgKeyword_0_1()", "old_args": "", "old_implementation": "return cImgKeyword_0;", "old_return_type": "Keyword", "old_signature": "Keyword getImgKeyword_0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cItemsAssignment_1_1;", "new_return_type": "Assignment", "new_signature": "Assignment getItemsAssignment_1_1()", "old_args": "", "old_implementation": "return cItemsAssignment_3_1;", "old_return_type": "Assignment", "old_signature": "Assignment getItemsAssignment_3_1()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cItemsAssignment_1_1;", "new_return_type": "Assignment", "new_signature": "Assignment getItemsAssignment_1_1()", "old_args": "", "old_implementation": "return cItemsAssignment_3_1;", "old_return_type": "Assignment", "old_signature": "Assignment getItemsAssignment_3_1()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cItemsItemParserRuleCall_1_1_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getItemsItemParserRuleCall_1_1_0()", "old_args": "", "old_implementation": "return cItemsItemParserRuleCall_3_1_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getItemsItemParserRuleCall_3_1_0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cItemsItemParserRuleCall_1_1_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getItemsItemParserRuleCall_1_1_0()", "old_args": "", "old_implementation": "return cItemsItemParserRuleCall_3_1_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getItemsItemParserRuleCall_3_1_0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cLanguageAssignment_1_1;", "new_return_type": "Assignment", "new_signature": "Assignment getLanguageAssignment_1_1()", "old_args": "", "old_implementation": "return cLanguageAssignment_2_2;", "old_return_type": "Assignment", "old_signature": "Assignment getLanguageAssignment_2_2()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cLanguageIDTerminalRuleCall_1_1_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getLanguageIDTerminalRuleCall_1_1_0()", "old_args": "", "old_implementation": "return cLanguageIDTerminalRuleCall_2_2_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getLanguageIDTerminalRuleCall_2_2_0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cLeftSquareBracketKeyword_12;", "new_return_type": "Keyword", "new_signature": "Keyword getLeftSquareBracketKeyword_12()", "old_args": "", "old_implementation": "return cLeftSquareBracketKeyword_11;", "old_return_type": "Keyword", "old_signature": "Keyword getLeftSquareBracketKeyword_11()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cRightSquareBracketKeyword_14;", "new_return_type": "Keyword", "new_signature": "Keyword getRightSquareBracketKeyword_14()", "old_args": "", "old_implementation": "return cLeftSquareBracketKeyword_15;", "old_return_type": "Keyword", "old_signature": "Keyword getLeftSquareBracketKeyword_15()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cLeftSquareBracketKeyword_0_0_2;", "new_return_type": "Keyword", "new_signature": "Keyword getLeftSquareBracketKeyword_0_0_2()", "old_args": "", "old_implementation": "return cLeftSquareBracketKeyword_2;", "old_return_type": "Keyword", "old_signature": "Keyword getLeftSquareBracketKeyword_2()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cLeftSquareBracketKeyword_0_0_2;", "new_return_type": "Keyword", "new_signature": "Keyword getLeftSquareBracketKeyword_0_0_2()", "old_args": "", "old_implementation": "return cLeftSquareBracketKeyword_2;", "old_return_type": "Keyword", "old_signature": "Keyword getLeftSquareBracketKeyword_2()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cLeftSquareBracketKeyword_0_0_2;", "new_return_type": "Keyword", "new_signature": "Keyword getLeftSquareBracketKeyword_0_0_2()", "old_args": "", "old_implementation": "return cLeftSquareBracketKeyword_2;", "old_return_type": "Keyword", "old_signature": "Keyword getLeftSquareBracketKeyword_2()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cLeftSquareBracketKeyword_0_0_2;", "new_return_type": "Keyword", "new_signature": "Keyword getLeftSquareBracketKeyword_0_0_2()", "old_args": "", "old_implementation": "return cLeftSquareBracketKeyword_2;", "old_return_type": "Keyword", "old_signature": "Keyword getLeftSquareBracketKeyword_2()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cLeftSquareBracketKeyword_0_0_2;", "new_return_type": "Keyword", "new_signature": "Keyword getLeftSquareBracketKeyword_0_0_2()", "old_args": "", "old_implementation": "return cLeftSquareBracketKeyword_2;", "old_return_type": "Keyword", "old_signature": "Keyword getLeftSquareBracketKeyword_2()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cLeftSquareBracketKeyword_4;", "new_return_type": "Keyword", "new_signature": "Keyword getLeftSquareBracketKeyword_4()", "old_args": "", "old_implementation": "return cLeftSquareBracketKeyword_2;", "old_return_type": "Keyword", "old_signature": "Keyword getLeftSquareBracketKeyword_2()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cLeftSquareBracketKeyword_1_5;", "new_return_type": "Keyword", "new_signature": "Keyword getLeftSquareBracketKeyword_1_5()", "old_args": "", "old_implementation": "return cLeftSquareBracketKeyword_2_0;", "old_return_type": "Keyword", "old_signature": "Keyword getLeftSquareBracketKeyword_2_0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cLeftSquareBracketKeyword_2;", "new_return_type": "Keyword", "new_signature": "Keyword getLeftSquareBracketKeyword_2()", "old_args": "", "old_implementation": "return cLeftSquareBracketKeyword_3;", "old_return_type": "Keyword", "old_signature": "Keyword getLeftSquareBracketKeyword_3()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cLeftSquareBracketKeyword_4;", "new_return_type": "Keyword", "new_signature": "Keyword getLeftSquareBracketKeyword_4()", "old_args": "", "old_implementation": "return cLeftSquareBracketKeyword_3;", "old_return_type": "Keyword", "old_signature": "Keyword getLeftSquareBracketKeyword_3()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cLeftSquareBracketKeyword_8;", "new_return_type": "Keyword", "new_signature": "Keyword getLeftSquareBracketKeyword_8()", "old_args": "", "old_implementation": "return cLeftSquareBracketKeyword_7;", "old_return_type": "Keyword", "old_signature": "Keyword getLeftSquareBracketKeyword_7()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cMULTI_NLTerminalRuleCall_1;", "new_return_type": "RuleCall", "new_signature": "RuleCall getMULTI_NLTerminalRuleCall_1()", "old_args": "", "old_implementation": "return cMULTI_NLTerminalRuleCall_2;", "old_return_type": "RuleCall", "old_signature": "RuleCall getMULTI_NLTerminalRuleCall_2()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cMULTI_NLTerminalRuleCall_1;", "new_return_type": "RuleCall", "new_signature": "RuleCall getMULTI_NLTerminalRuleCall_1()", "old_args": "", "old_implementation": "return cMULTI_NLTerminalRuleCall_3;", "old_return_type": "RuleCall", "old_signature": "RuleCall getMULTI_NLTerminalRuleCall_3()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cMULTI_NLTerminalRuleCall_3;", "new_return_type": "RuleCall", "new_signature": "RuleCall getMULTI_NLTerminalRuleCall_3()", "old_args": "", "old_implementation": "return cMULTI_NLTerminalRuleCall_4;", "old_return_type": "RuleCall", "old_signature": "RuleCall getMULTI_NLTerminalRuleCall_4()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cMULTI_NLTerminalRuleCall_3;", "new_return_type": "RuleCall", "new_signature": "RuleCall getMULTI_NLTerminalRuleCall_3()", "old_args": "", "old_implementation": "return cMULTI_NLTerminalRuleCall_4;", "old_return_type": "RuleCall", "old_signature": "RuleCall getMULTI_NLTerminalRuleCall_4()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cMULTI_NLTerminalRuleCall_3_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getMULTI_NLTerminalRuleCall_3_0()", "old_args": "", "old_implementation": "return cMULTI_NLTerminalRuleCall_5_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getMULTI_NLTerminalRuleCall_5_0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cMULTI_NLTerminalRuleCall_3_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getMULTI_NLTerminalRuleCall_3_0()", "old_args": "", "old_implementation": "return cMULTI_NLTerminalRuleCall_5_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getMULTI_NLTerminalRuleCall_5_0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cMULTI_NLTerminalRuleCall_3_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getMULTI_NLTerminalRuleCall_3_0()", "old_args": "", "old_implementation": "return cMULTI_NLTerminalRuleCall_5_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getMULTI_NLTerminalRuleCall_5_0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cMULTI_NLTerminalRuleCall_3_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getMULTI_NLTerminalRuleCall_3_0()", "old_args": "", "old_implementation": "return cMULTI_NLTerminalRuleCall_5_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getMULTI_NLTerminalRuleCall_5_0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cMULTI_NLTerminalRuleCall_3_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getMULTI_NLTerminalRuleCall_3_0()", "old_args": "", "old_implementation": "return cMULTI_NLTerminalRuleCall_5_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getMULTI_NLTerminalRuleCall_5_0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cMULTI_NLTerminalRuleCall_3_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getMULTI_NLTerminalRuleCall_3_0()", "old_args": "", "old_implementation": "return cMULTI_NLTerminalRuleCall_5_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getMULTI_NLTerminalRuleCall_5_0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cMULTI_NLTerminalRuleCall_5;", "new_return_type": "RuleCall", "new_signature": "RuleCall getMULTI_NLTerminalRuleCall_5()", "old_args": "", "old_implementation": "return cMULTI_NLTerminalRuleCall_6;", "old_return_type": "RuleCall", "old_signature": "RuleCall getMULTI_NLTerminalRuleCall_6()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cMULTI_NLTerminalRuleCall_4_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getMULTI_NLTerminalRuleCall_4_0()", "old_args": "", "old_implementation": "return cMULTI_NLTerminalRuleCall_6_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getMULTI_NLTerminalRuleCall_6_0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cMULTI_NLTerminalRuleCall_4_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getMULTI_NLTerminalRuleCall_4_0()", "old_args": "", "old_implementation": "return cMULTI_NLTerminalRuleCall_6_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getMULTI_NLTerminalRuleCall_6_0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cMULTI_NLTerminalRuleCall_4_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getMULTI_NLTerminalRuleCall_4_0()", "old_args": "", "old_implementation": "return cMULTI_NLTerminalRuleCall_6_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getMULTI_NLTerminalRuleCall_6_0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cMULTI_NLTerminalRuleCall_4_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getMULTI_NLTerminalRuleCall_4_0()", "old_args": "", "old_implementation": "return cMULTI_NLTerminalRuleCall_6_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getMULTI_NLTerminalRuleCall_6_0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cNameAssignment_0_0_1;", "new_return_type": "Assignment", "new_signature": "Assignment getNameAssignment_0_0_1()", "old_args": "", "old_implementation": "return cNameAssignment_1_1;", "old_return_type": "Assignment", "old_signature": "Assignment getNameAssignment_1_1()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cNameAssignment_0_0_1;", "new_return_type": "Assignment", "new_signature": "Assignment getNameAssignment_0_0_1()", "old_args": "", "old_implementation": "return cNameAssignment_1_1;", "old_return_type": "Assignment", "old_signature": "Assignment getNameAssignment_1_1()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cNameAssignment_0_0_1;", "new_return_type": "Assignment", "new_signature": "Assignment getNameAssignment_0_0_1()", "old_args": "", "old_implementation": "return cNameAssignment_1_1;", "old_return_type": "Assignment", "old_signature": "Assignment getNameAssignment_1_1()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cNameAssignment_0_0_1;", "new_return_type": "Assignment", "new_signature": "Assignment getNameAssignment_0_0_1()", "old_args": "", "old_implementation": "return cNameAssignment_1_1;", "old_return_type": "Assignment", "old_signature": "Assignment getNameAssignment_1_1()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cNameAssignment_0_0_1;", "new_return_type": "Assignment", "new_signature": "Assignment getNameAssignment_0_0_1()", "old_args": "", "old_implementation": "return cNameAssignment_1_1;", "old_return_type": "Assignment", "old_signature": "Assignment getNameAssignment_1_1()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cNameAssignment_1;", "new_return_type": "Assignment", "new_signature": "Assignment getNameAssignment_1()", "old_args": "", "old_implementation": "return cNameAssignment_2;", "old_return_type": "Assignment", "old_signature": "Assignment getNameAssignment_2()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cNameAssignment_0_0_2;", "new_return_type": "Assignment", "new_signature": "Assignment getNameAssignment_0_0_2()", "old_args": "", "old_implementation": "return cNameAssignment_2_2;", "old_return_type": "Assignment", "old_signature": "Assignment getNameAssignment_2_2()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cNameIDTerminalRuleCall_0_0_1_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getNameIDTerminalRuleCall_0_0_1_0()", "old_args": "", "old_implementation": "return cNameIDTerminalRuleCall_1_1_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getNameIDTerminalRuleCall_1_1_0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cNameIDTerminalRuleCall_0_0_1_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getNameIDTerminalRuleCall_0_0_1_0()", "old_args": "", "old_implementation": "return cNameIDTerminalRuleCall_1_1_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getNameIDTerminalRuleCall_1_1_0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cNameIDTerminalRuleCall_0_0_1_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getNameIDTerminalRuleCall_0_0_1_0()", "old_args": "", "old_implementation": "return cNameIDTerminalRuleCall_1_1_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getNameIDTerminalRuleCall_1_1_0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cNameIDTerminalRuleCall_0_0_1_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getNameIDTerminalRuleCall_0_0_1_0()", "old_args": "", "old_implementation": "return cNameIDTerminalRuleCall_1_1_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getNameIDTerminalRuleCall_1_1_0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cNameIDTerminalRuleCall_0_0_1_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getNameIDTerminalRuleCall_0_0_1_0()", "old_args": "", "old_implementation": "return cNameIDTerminalRuleCall_1_1_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getNameIDTerminalRuleCall_1_1_0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cNameIDTerminalRuleCall_1_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getNameIDTerminalRuleCall_1_0()", "old_args": "", "old_implementation": "return cNameIDTerminalRuleCall_2_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getNameIDTerminalRuleCall_2_0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cNameIDTerminalRuleCall_0_0_2_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getNameIDTerminalRuleCall_0_0_2_0()", "old_args": "", "old_implementation": "return cNameIDTerminalRuleCall_2_2_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getNameIDTerminalRuleCall_2_2_0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cPathAssignment_1;", "new_return_type": "Assignment", "new_signature": "Assignment getPathAssignment_1()", "old_args": "", "old_implementation": "return cPathAssignment_4;", "old_return_type": "Assignment", "old_signature": "Assignment getPathAssignment_4()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cPathTextParserRuleCall_1_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getPathTextParserRuleCall_1_0()", "old_args": "", "old_implementation": "return cPathTextParserRuleCall_4_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getPathTextParserRuleCall_4_0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cRefAssignment_1;", "new_return_type": "Assignment", "new_signature": "Assignment getRefAssignment_1()", "old_args": "", "old_implementation": "return cRefAssignment_2;", "old_return_type": "Assignment", "old_signature": "Assignment getRefAssignment_2()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cRefIdentifiableCrossReference_1_0;", "new_return_type": "CrossReference", "new_signature": "CrossReference getRefIdentifiableCrossReference_1_0()", "old_args": "", "old_implementation": "return cRefIdentifiableCrossReference_2_0;", "old_return_type": "CrossReference", "old_signature": "CrossReference getRefIdentifiableCrossReference_2_0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cRefIdentifiableIDTerminalRuleCall_1_0_1;", "new_return_type": "RuleCall", "new_signature": "RuleCall getRefIdentifiableIDTerminalRuleCall_1_0_1()", "old_args": "", "old_implementation": "return cRefIdentifiableIDTerminalRuleCall_2_0_1;", "old_return_type": "RuleCall", "old_signature": "RuleCall getRefIdentifiableIDTerminalRuleCall_2_0_1()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cRightSquareBracketKeyword_10;", "new_return_type": "Keyword", "new_signature": "Keyword getRightSquareBracketKeyword_10()", "old_args": "", "old_implementation": "return cRightSquareBracketKeyword_13;", "old_return_type": "Keyword", "old_signature": "Keyword getRightSquareBracketKeyword_13()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cRightSquareBracketKeyword_1_3;", "new_return_type": "Keyword", "new_signature": "Keyword getRightSquareBracketKeyword_1_3()", "old_args": "", "old_implementation": "return cRightSquareBracketKeyword_2_4;", "old_return_type": "Keyword", "old_signature": "Keyword getRightSquareBracketKeyword_2_4()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cRightSquareBracketKeyword_2;", "new_return_type": "Keyword", "new_signature": "Keyword getRightSquareBracketKeyword_2()", "old_args": "", "old_implementation": "return cRightSquareBracketKeyword_3_1;", "old_return_type": "Keyword", "old_signature": "Keyword getRightSquareBracketKeyword_3_1()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cRightSquareBracketKeyword_2;", "new_return_type": "Keyword", "new_signature": "Keyword getRightSquareBracketKeyword_2()", "old_args": "", "old_implementation": "return cRightSquareBracketKeyword_4;", "old_return_type": "Keyword", "old_signature": "Keyword getRightSquareBracketKeyword_4()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cRightSquareBracketKeyword_2;", "new_return_type": "Keyword", "new_signature": "Keyword getRightSquareBracketKeyword_2()", "old_args": "", "old_implementation": "return cRightSquareBracketKeyword_4;", "old_return_type": "Keyword", "old_signature": "Keyword getRightSquareBracketKeyword_4()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cRightSquareBracketKeyword_2;", "new_return_type": "Keyword", "new_signature": "Keyword getRightSquareBracketKeyword_2()", "old_args": "", "old_implementation": "return cRightSquareBracketKeyword_4;", "old_return_type": "Keyword", "old_signature": "Keyword getRightSquareBracketKeyword_4()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cRightSquareBracketKeyword_2;", "new_return_type": "Keyword", "new_signature": "Keyword getRightSquareBracketKeyword_2()", "old_args": "", "old_implementation": "return cRightSquareBracketKeyword_4;", "old_return_type": "Keyword", "old_signature": "Keyword getRightSquareBracketKeyword_4()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cRightSquareBracketKeyword_2;", "new_return_type": "Keyword", "new_signature": "Keyword getRightSquareBracketKeyword_2()", "old_args": "", "old_implementation": "return cRightSquareBracketKeyword_4;", "old_return_type": "Keyword", "old_signature": "Keyword getRightSquareBracketKeyword_4()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cRightSquareBracketKeyword_2;", "new_return_type": "Keyword", "new_signature": "Keyword getRightSquareBracketKeyword_2()", "old_args": "", "old_implementation": "return cRightSquareBracketKeyword_4;", "old_return_type": "Keyword", "old_signature": "Keyword getRightSquareBracketKeyword_4()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cRightSquareBracketKeyword_2;", "new_return_type": "Keyword", "new_signature": "Keyword getRightSquareBracketKeyword_2()", "old_args": "", "old_implementation": "return cRightSquareBracketKeyword_4;", "old_return_type": "Keyword", "old_signature": "Keyword getRightSquareBracketKeyword_4()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cRightSquareBracketKeyword_2;", "new_return_type": "Keyword", "new_signature": "Keyword getRightSquareBracketKeyword_2()", "old_args": "", "old_implementation": "return cRightSquareBracketKeyword_5;", "old_return_type": "Keyword", "old_signature": "Keyword getRightSquareBracketKeyword_5()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cRightSquareBracketKeyword_3;", "new_return_type": "Keyword", "new_signature": "Keyword getRightSquareBracketKeyword_3()", "old_args": "", "old_implementation": "return cRightSquareBracketKeyword_5;", "old_return_type": "Keyword", "old_signature": "Keyword getRightSquareBracketKeyword_5()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cRightSquareBracketKeyword_3;", "new_return_type": "Keyword", "new_signature": "Keyword getRightSquareBracketKeyword_3()", "old_args": "", "old_implementation": "return cRightSquareBracketKeyword_5;", "old_return_type": "Keyword", "old_signature": "Keyword getRightSquareBracketKeyword_5()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cRightSquareBracketKeyword_3;", "new_return_type": "Keyword", "new_signature": "Keyword getRightSquareBracketKeyword_3()", "old_args": "", "old_implementation": "return cRightSquareBracketKeyword_5;", "old_return_type": "Keyword", "old_signature": "Keyword getRightSquareBracketKeyword_5()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cRightSquareBracketKeyword_4;", "new_return_type": "Keyword", "new_signature": "Keyword getRightSquareBracketKeyword_4()", "old_args": "", "old_implementation": "return cRightSquareBracketKeyword_5;", "old_return_type": "Keyword", "old_signature": "Keyword getRightSquareBracketKeyword_5()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cRightSquareBracketKeyword_4;", "new_return_type": "Keyword", "new_signature": "Keyword getRightSquareBracketKeyword_4()", "old_args": "", "old_implementation": "return cRightSquareBracketKeyword_6;", "old_return_type": "Keyword", "old_signature": "Keyword getRightSquareBracketKeyword_6()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cRightSquareBracketKeyword_6;", "new_return_type": "Keyword", "new_signature": "Keyword getRightSquareBracketKeyword_6()", "old_args": "", "old_implementation": "return cRightSquareBracketKeyword_7;", "old_return_type": "Keyword", "old_signature": "Keyword getRightSquareBracketKeyword_7()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cRightSquareBracketKeyword_6;", "new_return_type": "Keyword", "new_signature": "Keyword getRightSquareBracketKeyword_6()", "old_args": "", "old_implementation": "return cRightSquareBracketKeyword_8;", "old_return_type": "Keyword", "old_signature": "Keyword getRightSquareBracketKeyword_8()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cRightSquareBracketKeyword_6;", "new_return_type": "Keyword", "new_signature": "Keyword getRightSquareBracketKeyword_6()", "old_args": "", "old_implementation": "return cRightSquareBracketKeyword_9;", "old_return_type": "Keyword", "old_signature": "Keyword getRightSquareBracketKeyword_9()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cSection3Keyword_0_1;", "new_return_type": "Keyword", "new_signature": "Keyword getSection3Keyword_0_1()", "old_args": "", "old_implementation": "return cSection3Keyword_0;", "old_return_type": "Keyword", "old_signature": "Keyword getSection3Keyword_0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cSection4Keyword_0_1;", "new_return_type": "Keyword", "new_signature": "Keyword getSection4Keyword_0_1()", "old_args": "", "old_implementation": "return cSection4Keyword_0;", "old_return_type": "Keyword", "old_signature": "Keyword getSection4Keyword_0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cSectionKeyword_0_1;", "new_return_type": "Keyword", "new_signature": "Keyword getSectionKeyword_0_1()", "old_args": "", "old_implementation": "return cSectionKeyword_0;", "old_return_type": "Keyword", "old_signature": "Keyword getSectionKeyword_0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cStyleAssignment_9;", "new_return_type": "Assignment", "new_signature": "Assignment getStyleAssignment_9()", "old_args": "", "old_implementation": "return cStyleAssignment_12;", "old_return_type": "Assignment", "old_signature": "Assignment getStyleAssignment_12()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cCaptionTextParserRuleCall_13_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getCaptionTextParserRuleCall_13_0()", "old_args": "", "old_implementation": "return cStyleTextParserRuleCall_12_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getStyleTextParserRuleCall_12_0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cSubsectionKeyword_0_1;", "new_return_type": "Keyword", "new_signature": "Keyword getSubsectionKeyword_0_1()", "old_args": "", "old_implementation": "return cSubsectionKeyword_0;", "old_return_type": "Keyword", "old_signature": "Keyword getSubsectionKeyword_0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cTextAssignment_5;", "new_return_type": "Assignment", "new_signature": "Assignment getTextAssignment_5()", "old_args": "", "old_implementation": "return cTextAssignment_7;", "old_return_type": "Assignment", "old_signature": "Assignment getTextAssignment_7()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cTextTextParserRuleCall_5_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getTextTextParserRuleCall_5_0()", "old_args": "", "old_implementation": "return cTextTextParserRuleCall_7_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getTextTextParserRuleCall_7_0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cTitleAssignment_1;", "new_return_type": "Assignment", "new_signature": "Assignment getTitleAssignment_1()", "old_args": "", "old_implementation": "return cTitleAssignment_3;", "old_return_type": "Assignment", "old_signature": "Assignment getTitleAssignment_3()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cTitleAssignment_1;", "new_return_type": "Assignment", "new_signature": "Assignment getTitleAssignment_1()", "old_args": "", "old_implementation": "return cTitleAssignment_3;", "old_return_type": "Assignment", "old_signature": "Assignment getTitleAssignment_3()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cTitleAssignment_1;", "new_return_type": "Assignment", "new_signature": "Assignment getTitleAssignment_1()", "old_args": "", "old_implementation": "return cTitleAssignment_3;", "old_return_type": "Assignment", "old_signature": "Assignment getTitleAssignment_3()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cTitleAssignment_1;", "new_return_type": "Assignment", "new_signature": "Assignment getTitleAssignment_1()", "old_args": "", "old_implementation": "return cTitleAssignment_3;", "old_return_type": "Assignment", "old_signature": "Assignment getTitleAssignment_3()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cTitleAssignment_1;", "new_return_type": "Assignment", "new_signature": "Assignment getTitleAssignment_1()", "old_args": "", "old_implementation": "return cTitleAssignment_3;", "old_return_type": "Assignment", "old_signature": "Assignment getTitleAssignment_3()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cTitleTextOrMarkupParserRuleCall_1_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getTitleTextOrMarkupParserRuleCall_1_0()", "old_args": "", "old_implementation": "return cTitleTextOrMarkupParserRuleCall_3_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getTitleTextOrMarkupParserRuleCall_3_0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cTitleTextOrMarkupParserRuleCall_1_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getTitleTextOrMarkupParserRuleCall_1_0()", "old_args": "", "old_implementation": "return cTitleTextOrMarkupParserRuleCall_3_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getTitleTextOrMarkupParserRuleCall_3_0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cTitleTextOrMarkupParserRuleCall_1_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getTitleTextOrMarkupParserRuleCall_1_0()", "old_args": "", "old_implementation": "return cTitleTextOrMarkupParserRuleCall_3_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getTitleTextOrMarkupParserRuleCall_3_0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cTitleTextOrMarkupParserRuleCall_1_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getTitleTextOrMarkupParserRuleCall_1_0()", "old_args": "", "old_implementation": "return cTitleTextOrMarkupParserRuleCall_3_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getTitleTextOrMarkupParserRuleCall_3_0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cTitleTextOrMarkupParserRuleCall_1_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getTitleTextOrMarkupParserRuleCall_1_0()", "old_args": "", "old_implementation": "return cTitleTextOrMarkupParserRuleCall_3_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getTitleTextOrMarkupParserRuleCall_3_0()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cUrlAssignment_1;", "new_return_type": "Assignment", "new_signature": "Assignment getUrlAssignment_1()", "old_args": "", "old_implementation": "return cUrlAssignment_3;", "old_return_type": "Assignment", "old_signature": "Assignment getUrlAssignment_3()" }, { "name": "rvonmassow$xdoc", "new_args": "", "new_implementation": "return cUrlTextParserRuleCall_1_0;", "new_return_type": "RuleCall", "new_signature": "RuleCall getUrlTextParserRuleCall_1_0()", "old_args": "", "old_implementation": "return cUrlTextParserRuleCall_3_0;", "old_return_type": "RuleCall", "old_signature": "RuleCall getUrlTextParserRuleCall_3_0()" } ]
172
328
ace6d95ab88d82689674a3978c51b9faac7573e7
[ { "name": "internetarchive$heritrix3", "new_args": "", "new_implementation": "// wait up to 3 seconds for stop\r\n for(int i = 0; i < 10; i++) {\r\n try {\r\n Thread.sleep(300);", "new_return_type": "boolean", "new_signature": "boolean teardown()", "old_args": "", "old_implementation": "", "old_return_type": "void", "old_signature": "void reset()" } ]
[ { "additions": 4, "blob_url": "https://github.com/internetarchive/heritrix3/blob/ace6d95ab88d82689674a3978c51b9faac7573e7/engine%2Fsrc%2Fmain%2Fjava%2Forg%2Farchive%2Fcrawler%2Fframework%2FCrawlController.java", "changes": 4, "contents_url": "https://api.github.com/repos/internetarchive/heritrix3/contents/engine%2Fsrc%2Fmain%2Fjava%2Forg%2Farchive%2Fcrawler%2Fframework%2FCrawlController.java?ref=ace6d95ab88d82689674a3978c51b9faac7573e7", "deletions": 0, "filename": "engine/src/main/java/org/archive/crawler/framework/CrawlController.java", "new_code": " public boolean isFinished() {\n return state == State.FINISHED;\n }\n ", "new_methods": [ { "arguments": [], "filename": "engine/src/main/java/org/archive/crawler/framework/CrawlController.java", "implementation": "return state == State.FINISHED;", "signature": "boolean isFinished()" } ], "old_code": "", "old_methods": [], "patch": "@@ -477,6 +477,10 @@ public boolean isStateRunning() {\n return state == State.RUNNING;\n }\n \n+ public boolean isFinished() {\n+ return state == State.FINISHED;\n+ }\n+ \n /**\n * Resume crawl from paused state\n */", "raw_url": "https://github.com/internetarchive/heritrix3/raw/ace6d95ab88d82689674a3978c51b9faac7573e7/engine%2Fsrc%2Fmain%2Fjava%2Forg%2Farchive%2Fcrawler%2Fframework%2FCrawlController.java", "sha": "c297add3d2da541e6a50b19d50de602a0ad939df", "status": "modified" }, { "additions": 16, "blob_url": "https://github.com/internetarchive/heritrix3/blob/ace6d95ab88d82689674a3978c51b9faac7573e7/engine%2Fsrc%2Fmain%2Fjava%2Forg%2Farchive%2Fcrawler%2Fframework%2FCrawlJob.java", "changes": 20, "contents_url": "https://api.github.com/repos/internetarchive/heritrix3/contents/engine%2Fsrc%2Fmain%2Fjava%2Forg%2Farchive%2Fcrawler%2Fframework%2FCrawlJob.java?ref=ace6d95ab88d82689674a3978c51b9faac7573e7", "deletions": 4, "filename": "engine/src/main/java/org/archive/crawler/framework/CrawlJob.java", "new_code": " public boolean teardown() {\r\n // wait up to 3 seconds for stop\r\n for(int i = 0; i < 10; i++) {\r\n try {\r\n Thread.sleep(300);\r\n } catch (InterruptedException e) {\r\n // do nothing\r\n }\r\n if(cc.isFinished()) {\r\n break;\r\n }\r\n }\r\n if(!cc.isFinished()) {\r\n return false; \r\n }\r\n return true; \r", "new_methods": [ { "arguments": [], "filename": "engine/src/main/java/org/archive/crawler/framework/CrawlJob.java", "implementation": "// wait up to 3 seconds for stop\r\n for(int i = 0; i < 10; i++) {\r\n try {\r\n Thread.sleep(300);", "signature": "boolean teardown()" } ], "old_code": " public void reset() {\r\n }\r\n if(ac.isRunning()) {\r\n ac.stop(); \r", "old_methods": [ { "arguments": [], "filename": "engine/src/main/java/org/archive/crawler/framework/CrawlJob.java", "implementation": "", "signature": "void reset()" } ], "patch": "@@ -482,20 +482,32 @@ public boolean isUnpausable() {\n * Ensure a fresh start for any configuration changes or relaunches,\r\n * by stopping and discarding an existing ApplicationContext.\r\n */\r\n- public void reset() {\r\n+ public boolean teardown() {\r\n if(ac!=null) {\r\n CrawlController cc = getCrawlController();\r\n if(cc!=null) {\r\n cc.requestCrawlStop();\r\n // TODO: wait for stop?\r\n- }\r\n- if(ac.isRunning()) {\r\n- ac.stop(); \r\n+ // wait up to 3 seconds for stop\r\n+ for(int i = 0; i < 10; i++) {\r\n+ try {\r\n+ Thread.sleep(300);\r\n+ } catch (InterruptedException e) {\r\n+ // do nothing\r\n+ }\r\n+ if(cc.isFinished()) {\r\n+ break;\r\n+ }\r\n+ }\r\n+ if(!cc.isFinished()) {\r\n+ return false; \r\n+ }\r\n }\r\n ac = null;\r\n }\r\n xmlOkAt = new DateTime(0); \r\n getJobLogger().log(Level.INFO,\"Job instance discarded\");\r\n+ return true; \r\n }\r\n \r\n /**\r", "raw_url": "https://github.com/internetarchive/heritrix3/raw/ace6d95ab88d82689674a3978c51b9faac7573e7/engine%2Fsrc%2Fmain%2Fjava%2Forg%2Farchive%2Fcrawler%2Fframework%2FCrawlJob.java", "sha": "d286e27e1e5ee0e905af17497e2d725d7efe79a5", "status": "modified" }, { "additions": 5, "blob_url": "https://github.com/internetarchive/heritrix3/blob/ace6d95ab88d82689674a3978c51b9faac7573e7/engine%2Fsrc%2Fmain%2Fjava%2Forg%2Farchive%2Fcrawler%2Frestlet%2FJobResource.java", "changes": 6, "contents_url": "https://api.github.com/repos/internetarchive/heritrix3/contents/engine%2Fsrc%2Fmain%2Fjava%2Forg%2Farchive%2Fcrawler%2Frestlet%2FJobResource.java?ref=ace6d95ab88d82689674a3978c51b9faac7573e7", "deletions": 1, "filename": "engine/src/main/java/org/archive/crawler/restlet/JobResource.java", "new_code": " Flash.renderFlashesHTML(pw, getRequest());\r\n \r\n if(!cj.teardown()) {\r\n Flash.addFlash(getResponse(), \"waiting for job to finish\", Flash.Kind.NACK);\r\n }\r", "new_methods": [], "old_code": " cj.reset(); \r", "old_methods": [], "patch": "@@ -104,6 +104,8 @@ protected void writeHtml(Writer writer) {\n }\r\n pw.println(\")</h1>\");\r\n \r\n+ Flash.renderFlashesHTML(pw, getRequest());\r\n+ \r\n if(cj.isProfile()) {\r\n pw.print(\r\n \"<p>As a <i>profile</i>, this job may be built for \" +\r\n@@ -381,7 +383,9 @@ public void acceptRepresentation(Representation entity) throws ResourceException\n } else if(\"build\".equals(action)||\"validate\".equals(action)) {\r\n cj.validateConfiguration();\r\n } else if(\"teardown\".equals(action)) {\r\n- cj.reset(); \r\n+ if(!cj.teardown()) {\r\n+ Flash.addFlash(getResponse(), \"waiting for job to finish\", Flash.Kind.NACK);\r\n+ }\r\n } else if(\"pause\".equals(action)) {\r\n cj.getCrawlController().requestCrawlPause();\r\n } else if(\"unpause\".equals(action)) {\r", "raw_url": "https://github.com/internetarchive/heritrix3/raw/ace6d95ab88d82689674a3978c51b9faac7573e7/engine%2Fsrc%2Fmain%2Fjava%2Forg%2Farchive%2Fcrawler%2Frestlet%2FJobResource.java", "sha": "7bfebecb75cc6f0ce88c888a394673547f423407", "status": "modified" }, { "additions": 11, "blob_url": "https://github.com/internetarchive/heritrix3/blob/ace6d95ab88d82689674a3978c51b9faac7573e7/engine%2Fsrc%2Fmain%2Fjava%2Forg%2Farchive%2Fcrawler%2Futil%2FBdbUriUniqFilter.java", "changes": 17, "contents_url": "https://api.github.com/repos/internetarchive/heritrix3/contents/engine%2Fsrc%2Fmain%2Fjava%2Forg%2Farchive%2Fcrawler%2Futil%2FBdbUriUniqFilter.java?ref=ace6d95ab88d82689674a3978c51b9faac7573e7", "deletions": 6, "filename": "engine/src/main/java/org/archive/crawler/util/BdbUriUniqFilter.java", "new_code": " public synchronized long getCacheMisses() {\n try {\n long cacheMiss = this.alreadySeen.getEnvironment().\n // FIXME: get shouldn't define intervals (should be idempotent)\n this.lastCacheMissDiff = cacheMiss - this.lastCacheMiss;\n this.lastCacheMiss = cacheMiss;\n return this.lastCacheMiss;\n } catch (DatabaseException de) {\n return 0;\n }\n ", "new_methods": [ { "arguments": [], "filename": "engine/src/main/java/org/archive/crawler/util/BdbUriUniqFilter.java", "implementation": "try {\n long cacheMiss = this.alreadySeen.getEnvironment().\n // FIXME: get shouldn't define intervals (should be idempotent)\n this.lastCacheMissDiff = cacheMiss - this.lastCacheMiss;\n this.lastCacheMiss = cacheMiss;\n return this.lastCacheMiss;", "signature": "long getCacheMisses()" } ], "old_code": " public synchronized long getCacheMisses() throws DatabaseException {\n long cacheMiss = this.alreadySeen.getEnvironment().\n // FIXME: get shouldn't define intervals (should be idempotent)\n this.lastCacheMissDiff = cacheMiss - this.lastCacheMiss;\n this.lastCacheMiss = cacheMiss;\n return this.lastCacheMiss;", "old_methods": [], "patch": "@@ -261,16 +261,21 @@ public synchronized void close() {\n }\n }\n \n- public synchronized long getCacheMisses() throws DatabaseException {\n+ public synchronized long getCacheMisses() {\n if(alreadySeen==null) {\n return 0;\n }\n- long cacheMiss = this.alreadySeen.getEnvironment().\n+ try {\n+ long cacheMiss = this.alreadySeen.getEnvironment().\n getStats(null).getNCacheMiss();\n- // FIXME: get shouldn't define intervals (should be idempotent)\n- this.lastCacheMissDiff = cacheMiss - this.lastCacheMiss;\n- this.lastCacheMiss = cacheMiss;\n- return this.lastCacheMiss;\n+ // FIXME: get shouldn't define intervals (should be idempotent)\n+ this.lastCacheMissDiff = cacheMiss - this.lastCacheMiss;\n+ this.lastCacheMiss = cacheMiss;\n+ return this.lastCacheMiss;\n+ } catch (DatabaseException de) {\n+ return 0;\n+ }\n+ \n }\n \n public long getLastCacheMissDiff() {", "raw_url": "https://github.com/internetarchive/heritrix3/raw/ace6d95ab88d82689674a3978c51b9faac7573e7/engine%2Fsrc%2Fmain%2Fjava%2Forg%2Farchive%2Fcrawler%2Futil%2FBdbUriUniqFilter.java", "sha": "d37fbff2cc69fbbec84e707f6095c17a6167a65b", "status": "modified" } ]
4
[ { "name": "internetarchive$heritrix3", "new_args": "", "new_implementation": "// wait up to 3 seconds for stop\r\n for(int i = 0; i < 10; i++) {\r\n try {\r\n Thread.sleep(300);", "new_return_type": "boolean", "new_signature": "boolean teardown()", "old_args": "", "old_implementation": "", "old_return_type": "void", "old_signature": "void reset()" } ]
1
1
bfded7cf4b2a843dcf577008ca4d2e8b4ac2f467
[ { "name": "nhydock$ff1-battle-system", "new_args": "int lvl", "new_implementation": "return 2;", "new_return_type": "int", "new_signature": "int getInt(int lvl)", "old_args": "int lvl", "old_implementation": "return 2;", "old_return_type": "int", "old_signature": "int getEvd(int lvl)" } ]
[ { "additions": 3, "blob_url": "https://github.com/erodozer/FF1-Battle-System/blob/bfded7cf4b2a843dcf577008ca4d2e8b4ac2f467/src%2Factors%2FMockActor.java", "changes": 5, "contents_url": "https://api.github.com/repos/erodozer/FF1-Battle-System/contents/src%2Factors%2FMockActor.java?ref=bfded7cf4b2a843dcf577008ca4d2e8b4ac2f467", "deletions": 2, "filename": "src/actors/MockActor.java", "new_code": "\t\tvit = 10;\n\t\tacc = 10;\n\t\titl = 10;", "new_methods": [], "old_code": "\t\tmag = 10;\n\t\tres = 10;", "old_methods": [], "patch": "@@ -13,8 +13,9 @@ public MockActor(String n)\n \t\tdef = 10;\n \t\tspd = 10;\n \t\tevd = 10;\n-\t\tmag = 10;\n-\t\tres = 10;\n+\t\tvit = 10;\n+\t\tacc = 10;\n+\t\titl = 10;\n \t\tloadSprites();\n \t}\n ", "raw_url": "https://github.com/erodozer/FF1-Battle-System/raw/bfded7cf4b2a843dcf577008ca4d2e8b4ac2f467/src%2Factors%2FMockActor.java", "sha": "8242d576c62ffe1a3b6051aa2a77dc201ac6637f", "status": "modified" }, { "additions": 9, "blob_url": "https://github.com/erodozer/FF1-Battle-System/blob/bfded7cf4b2a843dcf577008ca4d2e8b4ac2f467/src%2Factors%2FTestEnemy.java", "changes": 11, "contents_url": "https://api.github.com/repos/erodozer/FF1-Battle-System/contents/src%2Factors%2FTestEnemy.java?ref=bfded7cf4b2a843dcf577008ca4d2e8b4ac2f467", "deletions": 2, "filename": "src/actors/TestEnemy.java", "new_code": "/**\n * TestEnemy.java\n * @author nhydock\n *\tJunit test for enemies\n */\n\t/**\n\t * Tests initializing of an enemy...there's not much else to really test\n\t */\n\t\tassertEquals(9, a.getInt());", "new_methods": [], "old_code": "\t\tassertEquals(7, a.getMag());\n\t\tassertEquals(9, a.getRes());", "old_methods": [], "patch": "@@ -4,8 +4,16 @@\n \n import junit.framework.TestCase;\n \n+/**\n+ * TestEnemy.java\n+ * @author nhydock\n+ *\tJunit test for enemies\n+ */\n public class TestEnemy extends TestCase {\n \n+\t/**\n+\t * Tests initializing of an enemy...there's not much else to really test\n+\t */\n \t@Test\n \tpublic void testInitalization()\n \t{\n@@ -17,8 +25,7 @@ public void testInitalization()\n \t\tassertEquals(8, a.getDef());\n \t\tassertEquals(8, a.getSpd());\n \t\tassertEquals(9, a.getEvd());\n-\t\tassertEquals(7, a.getMag());\n-\t\tassertEquals(9, a.getRes());\n+\t\tassertEquals(9, a.getInt());\n \t\tassertEquals(15, a.getExp());\n \t\tassertTrue(a.getAlive());\n \t}", "raw_url": "https://github.com/erodozer/FF1-Battle-System/raw/bfded7cf4b2a843dcf577008ca4d2e8b4ac2f467/src%2Factors%2FTestEnemy.java", "sha": "1c314f3672a9a708d41cc00cd375ef79e566d1df", "status": "modified" }, { "additions": 27, "blob_url": "https://github.com/erodozer/FF1-Battle-System/blob/bfded7cf4b2a843dcf577008ca4d2e8b4ac2f467/src%2Factors%2FTestPlayer.java", "changes": 36, "contents_url": "https://api.github.com/repos/erodozer/FF1-Battle-System/contents/src%2Factors%2FTestPlayer.java?ref=bfded7cf4b2a843dcf577008ca4d2e8b4ac2f467", "deletions": 9, "filename": "src/actors/TestPlayer.java", "new_code": "/**\n * TestPlayer.java\n * @author nhydock\n *\n *\tJUnit test file for player class\n */\n\t/**\n\t * Test initialization\n\t */\n\t\tassertEquals(5, a.getHP());\n\t\tassertEquals(1, a.getStr());\n\t\tassertEquals(1, a.getDef());\n\t\tassertEquals(1, a.getSpd());\n\t\tassertEquals(1, a.getEvd());\n\t\tassertEquals(1, a.getInt());\n\t\tassertEquals(1, a.getVit());\n\t\tassertEquals(1, a.getAcc());\n\t\tassertEquals(Player.STAND, a.getState());\n\t\t\n\t/**\n\t * Tests the player to make sure animations are working\n\t */\n\tpublic void testSpriteFlipping()\n\t{\n\t\tPlayer a = new Player(\"Twil\");\n\t\t\n\t}", "new_methods": [ { "arguments": [], "filename": "src/actors/TestPlayer.java", "implementation": "Player a = new Player(\"Twil\");", "signature": "void testSpriteFlipping()" } ], "old_code": "\t\t//All stats should be 1 more than default because players level up\n\t\t// to level 1 upon creation\n\t\tassertEquals(6, a.getHP());\n\t\tassertEquals(2, a.getStr());\n\t\tassertEquals(2, a.getDef());\n\t\tassertEquals(2, a.getSpd());\n\t\tassertEquals(2, a.getEvd());\n\t\tassertEquals(2, a.getMag());\n\t\tassertEquals(2, a.getRes());", "old_methods": [], "patch": "@@ -5,24 +5,42 @@\n import jobs.Fighter;\n import junit.framework.TestCase;\n \n+/**\n+ * TestPlayer.java\n+ * @author nhydock\n+ *\n+ *\tJUnit test file for player class\n+ */\n public class TestPlayer extends TestCase {\n \n+\t/**\n+\t * Test initialization\n+\t */\n \t@Test\n \tpublic void testInitalization()\n \t{\n \t\tPlayer a = new Player(\"Twil\");\n \t\t\n-\t\t//All stats should be 1 more than default because players level up\n-\t\t// to level 1 upon creation\n \t\tassertEquals(\"Twil\", a.getName());\n-\t\tassertEquals(6, a.getHP());\n-\t\tassertEquals(2, a.getStr());\n-\t\tassertEquals(2, a.getDef());\n-\t\tassertEquals(2, a.getSpd());\n-\t\tassertEquals(2, a.getEvd());\n-\t\tassertEquals(2, a.getMag());\n-\t\tassertEquals(2, a.getRes());\n+\t\tassertEquals(5, a.getHP());\n+\t\tassertEquals(1, a.getStr());\n+\t\tassertEquals(1, a.getDef());\n+\t\tassertEquals(1, a.getSpd());\n+\t\tassertEquals(1, a.getEvd());\n+\t\tassertEquals(1, a.getInt());\n+\t\tassertEquals(1, a.getVit());\n+\t\tassertEquals(1, a.getAcc());\n \t\tassertTrue(a.getAlive());\n+\t\tassertEquals(Player.STAND, a.getState());\n+\t\t\n \t}\n \t\n+\t/**\n+\t * Tests the player to make sure animations are working\n+\t */\n+\tpublic void testSpriteFlipping()\n+\t{\n+\t\tPlayer a = new Player(\"Twil\");\n+\t\t\n+\t}\n }", "raw_url": "https://github.com/erodozer/FF1-Battle-System/raw/bfded7cf4b2a843dcf577008ca4d2e8b4ac2f467/src%2Factors%2FTestPlayer.java", "sha": "41c87367ea56ead6027f88b397d5ee50e4e0d005", "status": "modified" }, { "additions": 23, "blob_url": "https://github.com/erodozer/FF1-Battle-System/blob/bfded7cf4b2a843dcf577008ca4d2e8b4ac2f467/src%2Fgroups%2FFormationTest.java", "changes": 24, "contents_url": "https://api.github.com/repos/erodozer/FF1-Battle-System/contents/src%2Fgroups%2FFormationTest.java?ref=bfded7cf4b2a843dcf577008ca4d2e8b4ac2f467", "deletions": 1, "filename": "src/groups/FormationTest.java", "new_code": "import actors.Enemy;\n\n\t\tFormation f = new Formation();\n\t\t\n\t\tassertEquals(0, f.size());\n\t}\n\t\n\t@Test\n\tpublic void testAddEnemyByName() {\n\t\tFormation f = new Formation();\n\t\t\n\t\tf.add(\"Gel\");\n\t\tassertEquals(\"Gel\", f.get(0).getName());\n\t}\n\t\n\t@Test\n\tpublic void testAddEnemyByInstance() {\n\t\tFormation f = new Formation();\n\t\tEnemy e = new Enemy(\"Gel\");\n\t\tf.add(e);\n\t\t\n\t\tassertEquals(e, f.get(0));\n\t", "new_methods": [ { "arguments": [], "filename": "src/groups/FormationTest.java", "implementation": "Formation f = new Formation();\n\t\t\n\t\tf.add(\"Gel\");\n\t\tassertEquals(\"Gel\", f.get(0).getName());", "signature": "void testAddEnemyByName()" } ], "old_code": "\t\tfail(\"Not yet implemented\");", "old_methods": [], "patch": "@@ -4,6 +4,8 @@\n \n import org.junit.Test;\n \n+import actors.Enemy;\n+\n /**\n * FormationTest.java\n * @author Nicholas Hydock \n@@ -16,7 +18,27 @@ public class FormationTest {\n \n \t@Test\n \tpublic void test() {\n-\t\tfail(\"Not yet implemented\");\n+\t\tFormation f = new Formation();\n+\t\t\n+\t\tassertEquals(0, f.size());\n+\t}\n+\t\n+\t@Test\n+\tpublic void testAddEnemyByName() {\n+\t\tFormation f = new Formation();\n+\t\t\n+\t\tf.add(\"Gel\");\n+\t\tassertEquals(\"Gel\", f.get(0).getName());\n+\t}\n+\t\n+\t@Test\n+\tpublic void testAddEnemyByInstance() {\n+\t\tFormation f = new Formation();\n+\t\tEnemy e = new Enemy(\"Gel\");\n+\t\tf.add(e);\n+\t\t\n+\t\tassertEquals(e, f.get(0));\n \t}\n+\t\n \n }", "raw_url": "https://github.com/erodozer/FF1-Battle-System/raw/bfded7cf4b2a843dcf577008ca4d2e8b4ac2f467/src%2Fgroups%2FFormationTest.java", "sha": "215c9fda71dc45dbcf6d3ef63d178ac92f0211c3", "status": "modified" }, { "additions": 2, "blob_url": "https://github.com/erodozer/FF1-Battle-System/blob/bfded7cf4b2a843dcf577008ca4d2e8b4ac2f467/src%2Fgroups%2FPartyTest.java", "changes": 3, "contents_url": "https://api.github.com/repos/erodozer/FF1-Battle-System/contents/src%2Fgroups%2FPartyTest.java?ref=bfded7cf4b2a843dcf577008ca4d2e8b4ac2f467", "deletions": 1, "filename": "src/groups/PartyTest.java", "new_code": "import jobs.Job;\n\t\tassertEquals(\"Fighter\", ((Job)p.get(0)).getJobName());", "new_methods": [], "old_code": "\t\tassertEquals(\"Fighter\", p.get(0).getJob());", "old_methods": [], "patch": "@@ -13,6 +13,7 @@\n import org.junit.Test;\n \n import actors.Player;\n+import jobs.Job;\n \n public class PartyTest extends TestCase{\n \n@@ -43,7 +44,7 @@ public void testAddMember()\n \t\tassertEquals(1, p.toArray().length);\t\n \t\t\n \t\tassertEquals(\"APPL\", p.get(0).getName());\n-\t\tassertEquals(\"Fighter\", p.get(0).getJob());\n+\t\tassertEquals(\"Fighter\", ((Job)p.get(0)).getJobName());\n \t\t\n \t}\n \t", "raw_url": "https://github.com/erodozer/FF1-Battle-System/raw/bfded7cf4b2a843dcf577008ca4d2e8b4ac2f467/src%2Fgroups%2FPartyTest.java", "sha": "a95843e5f68b415c2437d586f51759395080f699", "status": "modified" }, { "additions": 11, "blob_url": "https://github.com/erodozer/FF1-Battle-System/blob/bfded7cf4b2a843dcf577008ca4d2e8b4ac2f467/src%2Fjobs%2FJobTest.java", "changes": 28, "contents_url": "https://api.github.com/repos/erodozer/FF1-Battle-System/contents/src%2Fjobs%2FJobTest.java?ref=bfded7cf4b2a843dcf577008ca4d2e8b4ac2f467", "deletions": 17, "filename": "src/jobs/JobTest.java", "new_code": "\t\tassertEquals(55, j.getEvd());\n\t\tassertEquals(7, j.getInt());\n\t\tassertEquals(58, j.getEvd());\n\t\tassertEquals(9, j.getInt());\n\t\titl = 7;\n\t\n\t@Override\n\tprotected int getInt(int lvl) {\n\t\treturn 2;\n\t}\n", "new_methods": [ { "arguments": [ "int lvl" ], "filename": "src/jobs/JobTest.java", "implementation": "return 2;", "signature": "int getInt(int lvl)" } ], "old_code": "\t\tassertEquals(6, j.getEvd());\n\t\tassertEquals(53, j.getRes());\n\t\tassertEquals(8, j.getEvd());\n\t\tassertEquals(59, j.getRes());\n\t\tevd = 6;\n\t\tres = 53;\n\n\t@Override\n\tpublic int getEvd(int lvl) {\n\t\treturn 2;\n\t}\n\n\t@Override\n\tpublic int getRes(int lvl) {\n\t\treturn 6;\n\t}\n", "old_methods": [ { "arguments": [ "int lvl" ], "filename": "src/jobs/JobTest.java", "implementation": "return 2;", "signature": "int getEvd(int lvl)" }, { "arguments": [ "int lvl" ], "filename": "src/jobs/JobTest.java", "implementation": "return 6;", "signature": "int getRes(int lvl)" } ], "patch": "@@ -32,8 +32,8 @@ public void test() {\n \t\tassertEquals(8, j.getStr());\n \t\tassertEquals(34, j.getDef());\n \t\tassertEquals(7, j.getSpd());\n-\t\tassertEquals(6, j.getEvd());\n-\t\tassertEquals(53, j.getRes());\n+\t\tassertEquals(55, j.getEvd());\n+\t\tassertEquals(7, j.getInt());\n \t\tassertEquals(15, j.getAcc());\n \t\tassertEquals(12, j.getVit());\n \t\t\n@@ -46,8 +46,8 @@ public void test() {\n \t\tassertEquals(11, j.getStr());\n \t\tassertEquals(39, j.getDef());\n \t\tassertEquals(10, j.getSpd());\n-\t\tassertEquals(8, j.getEvd());\n-\t\tassertEquals(59, j.getRes());\n+\t\tassertEquals(58, j.getEvd());\n+\t\tassertEquals(9, j.getInt());\n \t\tassertEquals(21, j.getVit());\n \t\tassertEquals(16, j.getAcc());\n \t\n@@ -73,10 +73,9 @@ public MockJob(Player p)\n \t\tstr = 8;\n \t\tdef = 34;\n \t\tspd = 7;\n-\t\tevd = 6;\n-\t\tres = 53;\n \t\tacc = 15;\n \t\tvit = 12;\n+\t\titl = 7;\n \t}\n \n \t@Override\n@@ -93,17 +92,7 @@ public int getDef(int lvl) {\n \tpublic int getSpd(int lvl) {\n \t\treturn 3;\n \t}\n-\n-\t@Override\n-\tpublic int getEvd(int lvl) {\n-\t\treturn 2;\n-\t}\n-\n-\t@Override\n-\tpublic int getRes(int lvl) {\n-\t\treturn 6;\n-\t}\n-\n+\t\n \t@Override\n \tprotected int getAcc(int lvl) {\n \t\treturn 1;\n@@ -114,4 +103,9 @@ protected int getVit(int lvl) {\n \t\treturn (int)(lvl+7);\n \t}\n \n+\t@Override\n+\tprotected int getInt(int lvl) {\n+\t\treturn 2;\n+\t}\n+\n }", "raw_url": "https://github.com/erodozer/FF1-Battle-System/raw/bfded7cf4b2a843dcf577008ca4d2e8b4ac2f467/src%2Fjobs%2FJobTest.java", "sha": "0fa476eecb967c29e24475cbf476f32a099e2b64", "status": "modified" } ]
6
[ { "name": "nhydock$ff1-battle-system", "new_args": "int lvl", "new_implementation": "return 2;", "new_return_type": "int", "new_signature": "int getInt(int lvl)", "old_args": "int lvl", "old_implementation": "return 2;", "old_return_type": "int", "old_signature": "int getEvd(int lvl)" } ]
1
1
c8c3080c49e883f01a64afc8119c041a889f82d4
[ { "name": "vainolo$object-process-programming", "new_args": "OPPObjectInstance value", "new_implementation": "if (compositeValues.size() > 0) {\r\n lastKey = compositeValues.lastKey();\r\n compositeValues.put(newKey, value);\r\n compositeKeyToIndexMapping.put(UUID.randomUUID().toString(), newKey);\r\n public void setPart(String name, OPPObjectInstance value) {\r\n checkTypeForCompositeOnlyOperations();\r\n if (compositeKeyToIndexMapping.containsKey(name)) {\r\n compositeValues.remove(compositeKeyToIndexMapping.get(name));\r\n compositeKeyToIndexMapping.remove(name);\r\n int lastKey = 0;\r\n if (compositeValues.size() > 0) {\r\n lastKey = compositeValues.lastKey();", "new_return_type": "void", "new_signature": "void addLastPart(OPPObjectInstance value)", "old_args": "OPPObjectInstance value", "old_implementation": "checkTypeForCollectionOnlyOperations();\r\n if(collectionValues.size() > 0) {\r\n lastKey = collectionValues.lastKey();\r\n collectionValues.put(newKey, value);\r\n collectionNameToIndexMapping.put(UUID.randomUUID().toString(), newKey);\r\n return newKey;\r\n public void putCollectionElement(String name, OPPObjectInstance value) {\r\n checkTypeForCollectionOnlyOperations();\r\n if(collectionNameToIndexMapping.containsKey(name)) {\r\n collectionValues.remove(collectionNameToIndexMapping.get(name));\r\n collectionNameToIndexMapping.remove(name);\r\n int index = appendCollectionElement(value);\r\n collectionNameToIndexMapping.inverse().remove(index);\r\n collectionNameToIndexMapping.put(name, index);\r\n public void putCollectionElementAtIndex(int index, OPPObjectInstance value) {\r\n checkTypeForCollectionOnlyOperations();\r\n checkNotNull(value, \"Cannot insert a null element to a collection.\");\r\n if(collectionValues.containsKey(index)) {\r\n collectionValues.remove(index);\r\n collectionNameToIndexMapping.inverse().remove(index);", "old_return_type": "int", "old_signature": "int appendCollectionElement(OPPObjectInstance value)" }, { "name": "vainolo$object-process-programming", "new_args": "", "new_implementation": null, "new_return_type": "Collection<OPPObjectInstance>", "new_signature": "Collection<OPPObjectInstance> getAllParts()", "old_args": "", "old_implementation": null, "old_return_type": "Collection<OPPObjectInstance>", "old_signature": "Collection<OPPObjectInstance> getCollectionAllElements()" }, { "name": "vainolo$object-process-programming", "new_args": "", "new_implementation": null, "new_return_type": "Set<String>", "new_signature": "Set<String> getAllPartIndexes()", "old_args": "", "old_implementation": null, "old_return_type": "Set<String>", "old_signature": "Set<String> getCollectionAllIndexes()" }, { "name": "vainolo$object-process-programming", "new_args": "String key", "new_implementation": "checkTypeForCompositeOnlyOperations();\r\n checkState((key != null) && (!\"\".equals(key)), \"Key cannot be null or empty.\");\r\n return compositeValues.get(compositeKeyToIndexMapping.get(key));", "new_return_type": "OPPObjectInstance", "new_signature": "OPPObjectInstance getPart(String key)", "old_args": "String name", "old_implementation": "checkTypeForCollectionOnlyOperations();\r\n checkState((name != null) && !(\"\".equals(name)), \"Named location of element must not be null or empty.\");\r\n checkState(collectionNameToIndexMapping.containsKey(name), \"Collection does contain a value at index %s.\", name);\r\n return collectionValues.get(collectionNameToIndexMapping.get(name));\r\n public OPPObjectInstance getCollectionElementAtIndex(int index) {\r\n checkTypeForCollectionOnlyOperations();\r\n return collectionValues.get(index);\r\n public OPPObjectInstance getCollectionFirstElement() {\r\n checkTypeForCollectionOnlyOperations();\r\n return collectionValues.get(collectionValues.firstKey());\r\n public OPPObjectInstance getLastCollectionElement() {\r\n checkTypeForCollectionOnlyOperations();\r\n return collectionValues.get(collectionValues.lastKey());\r\n public Collection<OPPObjectInstance> getCollectionAllElements() {\r\n checkTypeForCollectionOnlyOperations();\r\n return Collections.unmodifiableCollection(collectionValues.values());\r\n public Set<String> getCollectionAllIndexes() {\r\n checkTypeForCollectionOnlyOperations();\r\n return Collections.unmodifiableSet(collectionNameToIndexMapping.keySet());\r\n if(InstanceType.STRING.equals(type) || InstanceType.NUMERICAL.equals(type))\r\n else if(InstanceType.COMPOSITE.equals(type)) {\r\n for(String partName : parts.keySet()) {\r\n ret.append(partName + \":\" + parts.get(partName) + \",\");", "old_return_type": "OPPObjectInstance", "old_signature": "OPPObjectInstance getCollectionElement(String name)" }, { "name": "vainolo$object-process-programming", "new_args": "", "new_implementation": null, "new_return_type": "OPPObjectInstance", "new_signature": "OPPObjectInstance getLastPart()", "old_args": "int index", "old_implementation": null, "old_return_type": "OPPObjectInstance", "old_signature": "OPPObjectInstance getCollectionElementAtIndex(int index)" }, { "name": "vainolo$object-process-programming", "new_args": "", "new_implementation": null, "new_return_type": "OPPObjectInstance", "new_signature": "OPPObjectInstance getFirstPart()", "old_args": "", "old_implementation": null, "old_return_type": "OPPObjectInstance", "old_signature": "OPPObjectInstance getCollectionFirstElement()" }, { "name": "vainolo$object-process-programming", "new_args": "", "new_implementation": null, "new_return_type": "List<OPPParameter>", "new_signature": "List<OPPParameter> getIncomingParameters()", "old_args": "", "old_implementation": null, "old_return_type": "List<OPPParameter>", "old_signature": "List<OPPParameter> getIncomingParameterNames()" }, { "name": "vainolo$object-process-programming", "new_args": "", "new_implementation": null, "new_return_type": "List<OPPParameter>", "new_signature": "List<OPPParameter> getIncomingParameters()", "old_args": "", "old_implementation": null, "old_return_type": "List<OPPParameter>", "old_signature": "List<OPPParameter> getIncomingParameterNames()" }, { "name": "vainolo$object-process-programming", "new_args": "", "new_implementation": null, "new_return_type": "List<OPPParameter>", "new_signature": "List<OPPParameter> getIncomingParameters()", "old_args": "", "old_implementation": null, "old_return_type": "List<OPPParameter>", "old_signature": "List<OPPParameter> getIncomingParameterNames()" }, { "name": "vainolo$object-process-programming", "new_args": "", "new_implementation": null, "new_return_type": "List<OPPParameter>", "new_signature": "List<OPPParameter> getIncomingParameters()", "old_args": "", "old_implementation": null, "old_return_type": "List<OPPParameter>", "old_signature": "List<OPPParameter> getIncomingParameterNames()" }, { "name": "vainolo$object-process-programming", "new_args": "", "new_implementation": null, "new_return_type": "List<OPPParameter>", "new_signature": "List<OPPParameter> getIncomingParameters()", "old_args": "", "old_implementation": null, "old_return_type": "List<OPPParameter>", "old_signature": "List<OPPParameter> getIncomingParameterNames()" }, { "name": "vainolo$object-process-programming", "new_args": "", "new_implementation": null, "new_return_type": "List<OPPParameter>", "new_signature": "List<OPPParameter> getIncomingParameters()", "old_args": "", "old_implementation": null, "old_return_type": "List<OPPParameter>", "old_signature": "List<OPPParameter> getIncomingParameterNames()" }, { "name": "vainolo$object-process-programming", "new_args": "", "new_implementation": null, "new_return_type": "List<OPPParameter>", "new_signature": "List<OPPParameter> getOutgoingParameters()", "old_args": "", "old_implementation": null, "old_return_type": "List<OPPParameter>", "old_signature": "List<OPPParameter> getIncomingParameterNames()" }, { "name": "vainolo$object-process-programming", "new_args": "", "new_implementation": null, "new_return_type": "List<OPPParameter>", "new_signature": "List<OPPParameter> getOutgoingParameters()", "old_args": "", "old_implementation": null, "old_return_type": "List<OPPParameter>", "old_signature": "List<OPPParameter> getIncomingParameterNames()" }, { "name": "vainolo$object-process-programming", "new_args": "", "new_implementation": null, "new_return_type": "List<OPPParameter>", "new_signature": "List<OPPParameter> getOutgoingParameters()", "old_args": "", "old_implementation": null, "old_return_type": "List<OPPParameter>", "old_signature": "List<OPPParameter> getIncomingParameterNames()" }, { "name": "vainolo$object-process-programming", "new_args": "", "new_implementation": null, "new_return_type": "List<OPPParameter>", "new_signature": "List<OPPParameter> getIncomingParameters()", "old_args": "", "old_implementation": null, "old_return_type": "List<OPPParameter>", "old_signature": "List<OPPParameter> getOutgoingParameterNames()" }, { "name": "vainolo$object-process-programming", "new_args": "", "new_implementation": null, "new_return_type": "List<OPPParameter>", "new_signature": "List<OPPParameter> getIncomingParameters()", "old_args": "", "old_implementation": null, "old_return_type": "List<OPPParameter>", "old_signature": "List<OPPParameter> getOutgoingParameterNames()" }, { "name": "vainolo$object-process-programming", "new_args": "", "new_implementation": null, "new_return_type": "List<OPPParameter>", "new_signature": "List<OPPParameter> getIncomingParameters()", "old_args": "", "old_implementation": null, "old_return_type": "List<OPPParameter>", "old_signature": "List<OPPParameter> getOutgoingParameterNames()" }, { "name": "vainolo$object-process-programming", "new_args": "", "new_implementation": null, "new_return_type": "List<OPPParameter>", "new_signature": "List<OPPParameter> getOutgoingParameters()", "old_args": "", "old_implementation": null, "old_return_type": "List<OPPParameter>", "old_signature": "List<OPPParameter> getOutgoingParameterNames()" }, { "name": "vainolo$object-process-programming", "new_args": "", "new_implementation": null, "new_return_type": "List<OPPParameter>", "new_signature": "List<OPPParameter> getOutgoingParameters()", "old_args": "", "old_implementation": null, "old_return_type": "List<OPPParameter>", "old_signature": "List<OPPParameter> getOutgoingParameterNames()" }, { "name": "vainolo$object-process-programming", "new_args": "", "new_implementation": null, "new_return_type": "List<OPPParameter>", "new_signature": "List<OPPParameter> getOutgoingParameters()", "old_args": "", "old_implementation": null, "old_return_type": "List<OPPParameter>", "old_signature": "List<OPPParameter> getOutgoingParameterNames()" }, { "name": "vainolo$object-process-programming", "new_args": "", "new_implementation": null, "new_return_type": "List<OPPParameter>", "new_signature": "List<OPPParameter> getOutgoingParameters()", "old_args": "", "old_implementation": null, "old_return_type": "List<OPPParameter>", "old_signature": "List<OPPParameter> getOutgoingParameterNames()" }, { "name": "vainolo$object-process-programming", "new_args": "", "new_implementation": null, "new_return_type": "List<OPPParameter>", "new_signature": "List<OPPParameter> getOutgoingParameters()", "old_args": "", "old_implementation": null, "old_return_type": "List<OPPParameter>", "old_signature": "List<OPPParameter> getOutgoingParameterNames()" }, { "name": "vainolo$object-process-programming", "new_args": "", "new_implementation": null, "new_return_type": "List<OPPParameter>", "new_signature": "List<OPPParameter> getOutgoingParameters()", "old_args": "", "old_implementation": null, "old_return_type": "List<OPPParameter>", "old_signature": "List<OPPParameter> getOutgoingParameterNames()" }, { "name": "vainolo$object-process-programming", "new_args": "String name,OPPObjectInstance value", "new_implementation": null, "new_return_type": "void", "new_signature": "void setPart(String name,OPPObjectInstance value)", "old_args": "String name,OPPObjectInstance value", "old_implementation": null, "old_return_type": "void", "old_signature": "void putCollectionElement(String name,OPPObjectInstance value)" } ]
[ { "additions": 0, "blob_url": "https://github.com/vainolo/Object-Process-Programming/blob/c8c3080c49e883f01a64afc8119c041a889f82d4/com.vainolo.phd.opp.editor%2F.settings%2Forg.eclipse.jdt.core.prefs", "changes": 280, "contents_url": "https://api.github.com/repos/vainolo/Object-Process-Programming/contents/com.vainolo.phd.opp.editor%2F.settings%2Forg.eclipse.jdt.core.prefs?ref=c8c3080c49e883f01a64afc8119c041a889f82d4", "deletions": 280, "filename": "com.vainolo.phd.opp.editor/.settings/org.eclipse.jdt.core.prefs", "new_code": "", "new_methods": [], "old_code": "org.eclipse.jdt.core.formatter.align_type_members_on_columns=false\r\norg.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16\r\norg.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0\r\norg.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16\r\norg.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16\r\norg.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16\r\norg.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16\r\norg.eclipse.jdt.core.formatter.alignment_for_assignment=0\r\norg.eclipse.jdt.core.formatter.alignment_for_binary_expression=16\r\norg.eclipse.jdt.core.formatter.alignment_for_compact_if=16\r\norg.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80\r\norg.eclipse.jdt.core.formatter.alignment_for_enum_constants=0\r\norg.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16\r\norg.eclipse.jdt.core.formatter.alignment_for_method_declaration=0\r\norg.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16\r\norg.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16\r\norg.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16\r\norg.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80\r\norg.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16\r\norg.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16\r\norg.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16\r\norg.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16\r\norg.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16\r\norg.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16\r\norg.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16\r\norg.eclipse.jdt.core.formatter.blank_lines_after_imports=1\r\norg.eclipse.jdt.core.formatter.blank_lines_after_package=1\r\norg.eclipse.jdt.core.formatter.blank_lines_before_field=0\r\norg.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0\r\norg.eclipse.jdt.core.formatter.blank_lines_before_imports=1\r\norg.eclipse.jdt.core.formatter.blank_lines_before_member_type=1\r\norg.eclipse.jdt.core.formatter.blank_lines_before_method=1\r\norg.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1\r\norg.eclipse.jdt.core.formatter.blank_lines_before_package=0\r\norg.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1\r\norg.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1\r\norg.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line\r\norg.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line\r\norg.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line\r\norg.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line\r\norg.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line\r\norg.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line\r\norg.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line\r\norg.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line\r\norg.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line\r\norg.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line\r\norg.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line\r\norg.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false\r\norg.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false\r\norg.eclipse.jdt.core.formatter.comment.format_block_comments=true\r\norg.eclipse.jdt.core.formatter.comment.format_header=false\r\norg.eclipse.jdt.core.formatter.comment.format_html=true\r\norg.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true\r\norg.eclipse.jdt.core.formatter.comment.format_line_comments=true\r\norg.eclipse.jdt.core.formatter.comment.format_source_code=true\r\norg.eclipse.jdt.core.formatter.comment.indent_parameter_description=true\r\norg.eclipse.jdt.core.formatter.comment.indent_root_tags=true\r\norg.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert\r\norg.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert\r\norg.eclipse.jdt.core.formatter.comment.line_length=80\r\norg.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true\r\norg.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true\r\norg.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false\r\norg.eclipse.jdt.core.formatter.compact_else_if=true\r\norg.eclipse.jdt.core.formatter.continuation_indentation=2\r\norg.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2\r\norg.eclipse.jdt.core.formatter.disabling_tag=@formatter\\:off\r\norg.eclipse.jdt.core.formatter.enabling_tag=@formatter\\:on\r\norg.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false\r\norg.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true\r\norg.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true\r\norg.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true\r\norg.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true\r\norg.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true\r\norg.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true\r\norg.eclipse.jdt.core.formatter.indent_empty_lines=false\r\norg.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true\r\norg.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true\r\norg.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true\r\norg.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false\r\norg.eclipse.jdt.core.formatter.indentation.size=2\r\norg.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert\r\norg.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert\r\norg.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert\r\norg.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert\r\norg.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert\r\norg.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert\r\norg.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert\r\norg.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert\r\norg.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert\r\norg.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert\r\norg.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert\r\norg.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert\r\norg.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert\r\norg.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert\r\norg.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert\r\norg.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert\r\norg.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert\r\norg.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert\r\norg.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert\r\norg.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert\r\norg.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert\r\norg.eclipse.jdt.core.formatter.join_lines_in_comments=true\r\norg.eclipse.jdt.core.formatter.join_wrapped_lines=true\r\norg.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false\r\norg.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false\r\norg.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false\r\norg.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false\r\norg.eclipse.jdt.core.formatter.lineSplit=120\r\norg.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false\r\norg.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false\r\norg.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0\r\norg.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1\r\norg.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true\r\norg.eclipse.jdt.core.formatter.tabulation.char=space\r\norg.eclipse.jdt.core.formatter.tabulation.size=2\r\norg.eclipse.jdt.core.formatter.use_on_off_tags=true\r\norg.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false\r\norg.eclipse.jdt.core.formatter.wrap_before_binary_operator=true\r\norg.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true\r\norg.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true\r", "old_methods": [], "patch": "@@ -94,283 +94,3 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning\n org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning\r\n org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning\r\n org.eclipse.jdt.core.compiler.source=1.8\r\n-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false\r\n-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16\r\n-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0\r\n-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16\r\n-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16\r\n-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16\r\n-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16\r\n-org.eclipse.jdt.core.formatter.alignment_for_assignment=0\r\n-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16\r\n-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16\r\n-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80\r\n-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0\r\n-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16\r\n-org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0\r\n-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16\r\n-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16\r\n-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16\r\n-org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80\r\n-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16\r\n-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16\r\n-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16\r\n-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16\r\n-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16\r\n-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16\r\n-org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16\r\n-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1\r\n-org.eclipse.jdt.core.formatter.blank_lines_after_package=1\r\n-org.eclipse.jdt.core.formatter.blank_lines_before_field=0\r\n-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0\r\n-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1\r\n-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1\r\n-org.eclipse.jdt.core.formatter.blank_lines_before_method=1\r\n-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1\r\n-org.eclipse.jdt.core.formatter.blank_lines_before_package=0\r\n-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1\r\n-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1\r\n-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line\r\n-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line\r\n-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line\r\n-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line\r\n-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line\r\n-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line\r\n-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line\r\n-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line\r\n-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line\r\n-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line\r\n-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line\r\n-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false\r\n-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false\r\n-org.eclipse.jdt.core.formatter.comment.format_block_comments=true\r\n-org.eclipse.jdt.core.formatter.comment.format_header=false\r\n-org.eclipse.jdt.core.formatter.comment.format_html=true\r\n-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true\r\n-org.eclipse.jdt.core.formatter.comment.format_line_comments=true\r\n-org.eclipse.jdt.core.formatter.comment.format_source_code=true\r\n-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true\r\n-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true\r\n-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert\r\n-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert\r\n-org.eclipse.jdt.core.formatter.comment.line_length=80\r\n-org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true\r\n-org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true\r\n-org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false\r\n-org.eclipse.jdt.core.formatter.compact_else_if=true\r\n-org.eclipse.jdt.core.formatter.continuation_indentation=2\r\n-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2\r\n-org.eclipse.jdt.core.formatter.disabling_tag=@formatter\\:off\r\n-org.eclipse.jdt.core.formatter.enabling_tag=@formatter\\:on\r\n-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false\r\n-org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true\r\n-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true\r\n-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true\r\n-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true\r\n-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true\r\n-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true\r\n-org.eclipse.jdt.core.formatter.indent_empty_lines=false\r\n-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true\r\n-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true\r\n-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true\r\n-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false\r\n-org.eclipse.jdt.core.formatter.indentation.size=2\r\n-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert\r\n-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert\r\n-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert\r\n-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert\r\n-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert\r\n-org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert\r\n-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert\r\n-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert\r\n-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert\r\n-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert\r\n-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert\r\n-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert\r\n-org.eclipse.jdt.core.formatter.join_lines_in_comments=true\r\n-org.eclipse.jdt.core.formatter.join_wrapped_lines=true\r\n-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false\r\n-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false\r\n-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false\r\n-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false\r\n-org.eclipse.jdt.core.formatter.lineSplit=120\r\n-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false\r\n-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false\r\n-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0\r\n-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1\r\n-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true\r\n-org.eclipse.jdt.core.formatter.tabulation.char=space\r\n-org.eclipse.jdt.core.formatter.tabulation.size=2\r\n-org.eclipse.jdt.core.formatter.use_on_off_tags=true\r\n-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false\r\n-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true\r\n-org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true\r\n-org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true\r", "raw_url": "https://github.com/vainolo/Object-Process-Programming/raw/c8c3080c49e883f01a64afc8119c041a889f82d4/com.vainolo.phd.opp.editor%2F.settings%2Forg.eclipse.jdt.core.prefs", "sha": "1a2bf2d5c84f8f4a1f477716d43d5a902b24f128", "status": "modified" }, { "additions": 0, "blob_url": "https://github.com/vainolo/Object-Process-Programming/blob/c8c3080c49e883f01a64afc8119c041a889f82d4/com.vainolo.phd.opp.editor%2F.settings%2Forg.eclipse.jdt.ui.prefs", "changes": 1, "contents_url": "https://api.github.com/repos/vainolo/Object-Process-Programming/contents/com.vainolo.phd.opp.editor%2F.settings%2Forg.eclipse.jdt.ui.prefs?ref=c8c3080c49e883f01a64afc8119c041a889f82d4", "deletions": 1, "filename": "com.vainolo.phd.opp.editor/.settings/org.eclipse.jdt.ui.prefs", "new_code": "", "new_methods": [], "old_code": "formatter_profile=_Vainolo\r", "old_methods": [], "patch": "@@ -1,6 +1,5 @@\n eclipse.preferences.version=1\r\n editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true\r\n-formatter_profile=_Vainolo\r\n formatter_settings_version=12\r\n org.eclipse.jdt.ui.ignorelowercasenames=true\r\n org.eclipse.jdt.ui.importorder=java;javax;org;com;\\#org.mockito.Mockito;\\#org.junit.Assert;\\#;\r", "raw_url": "https://github.com/vainolo/Object-Process-Programming/raw/c8c3080c49e883f01a64afc8119c041a889f82d4/com.vainolo.phd.opp.editor%2F.settings%2Forg.eclipse.jdt.ui.prefs", "sha": "88ded1e13b5548717f754cf768918e466a9f94b2", "status": "modified" }, { "additions": 16, "blob_url": "https://github.com/vainolo/Object-Process-Programming/blob/c8c3080c49e883f01a64afc8119c041a889f82d4/com.vainolo.phd.opp.editor%2Fsrc%2Fcom%2Fvainolo%2Fphd%2Fopp%2Feditor%2FOPPGraphicalEditor.java", "changes": 42, "contents_url": "https://api.github.com/repos/vainolo/Object-Process-Programming/contents/com.vainolo.phd.opp.editor%2Fsrc%2Fcom%2Fvainolo%2Fphd%2Fopp%2Feditor%2FOPPGraphicalEditor.java?ref=c8c3080c49e883f01a64afc8119c041a889f82d4", "deletions": 26, "filename": "com.vainolo.phd.opp.editor/src/com/vainolo/phd/opp/editor/OPPGraphicalEditor.java", "new_code": " getGraphicalViewer().setContextMenu(new OPPGraphicalEditorContextMenuProvider(getGraphicalViewer(), getActionRegistry()));\r\n getEditDomain().getPaletteViewer().addDragSourceListener(new TemplateTransferDragSourceListener(getEditDomain().getPaletteViewer()));\r\n keyHandler.put(KeyStroke.getPressed(SWT.F3, 0), getActionRegistry().getAction(OPPResizeToContentsAction.RESIZE_TO_CONTENTS_ID));\r\n if (palette == null)\r\n } catch (Exception e) {\r\n if (input instanceof IFileEditorInput) {\r\n if (opd == null) {\r\n action = new OPPToggledProceduralLinkSubkindAction(this, OPPToggledProceduralLinkSubkindAction.CONDITIONAL_SUBKIND_ID);\r\n if (type.equals(IPropertySheetPage.class)) {\r\n if (propertyPage == null) {\r\n IPropertySourceProvider modelPropertySourceProvider = new AdapterFactoryContentProvider(new OPPItemProviderAdapterFactory());\r\n if (object instanceof EditPart) {\r\n if (source != null) {\r\n } else if (type == ZoomManager.class) {\r\n if (value instanceof PropertyValueWrapper) {\r\n if (value instanceof PropertyValueWrapper) {\r", "new_methods": [], "old_code": " getGraphicalViewer().setContextMenu(\r\n new OPPGraphicalEditorContextMenuProvider(getGraphicalViewer(), getActionRegistry()));\r\n getEditDomain().getPaletteViewer().addDragSourceListener(\r\n new TemplateTransferDragSourceListener(getEditDomain().getPaletteViewer()));\r\n keyHandler.put(KeyStroke.getPressed(SWT.F3, 0),\r\n getActionRegistry().getAction(OPPResizeToContentsAction.RESIZE_TO_CONTENTS_ID));\r\n if(palette == null)\r\n } catch(Exception e) {\r\n if(input instanceof IFileEditorInput) {\r\n if(opd == null) {\r\n // if(opd.getId() == 0) {\r\n // opd.setId(1);\r\n // opd.setLastKnownUsedId(2);\r\n // }\r\n // OPMIdManager.setInitialId(opd.getNextId());\r\n action = new OPPToggledProceduralLinkSubkindAction(this,\r\n OPPToggledProceduralLinkSubkindAction.CONDITIONAL_SUBKIND_ID);\r\n if(type.equals(IPropertySheetPage.class)) {\r\n if(propertyPage == null) {\r\n IPropertySourceProvider modelPropertySourceProvider = new AdapterFactoryContentProvider(\r\n new OPPItemProviderAdapterFactory());\r\n if(object instanceof EditPart) {\r\n if(source != null) {\r\n } else if(type == ZoomManager.class) {\r\n if(value instanceof PropertyValueWrapper) {\r\n if(value instanceof PropertyValueWrapper) {\r", "old_methods": [], "patch": "@@ -85,14 +85,12 @@ protected void configureGraphicalViewer() {\n getGraphicalViewer().setEditPartFactory(new OPPEditPartFactory());\r\n getActionRegistry().registerAction(new ToggleGridAction(getGraphicalViewer()));\r\n getActionRegistry().registerAction(new ToggleSnapToGeometryAction(getGraphicalViewer()));\r\n- getGraphicalViewer().setContextMenu(\r\n- new OPPGraphicalEditorContextMenuProvider(getGraphicalViewer(), getActionRegistry()));\r\n+ getGraphicalViewer().setContextMenu(new OPPGraphicalEditorContextMenuProvider(getGraphicalViewer(), getActionRegistry()));\r\n configureKeyboardShortcuts();\r\n \r\n // D&D\r\n getGraphicalViewer().addDropTargetListener(new TemplateTransferDropTargetListener(getGraphicalViewer()));\r\n- getEditDomain().getPaletteViewer().addDragSourceListener(\r\n- new TemplateTransferDragSourceListener(getEditDomain().getPaletteViewer()));\r\n+ getEditDomain().getPaletteViewer().addDragSourceListener(new TemplateTransferDragSourceListener(getEditDomain().getPaletteViewer()));\r\n // end D&D\r\n \r\n // start zoom\r\n@@ -115,15 +113,14 @@ protected void configureGraphicalViewer() {\n private void configureKeyboardShortcuts() {\r\n GraphicalViewerKeyHandler keyHandler = new GraphicalViewerKeyHandler(getGraphicalViewer());\r\n keyHandler.put(KeyStroke.getPressed(SWT.F2, 0), getActionRegistry().getAction(GEFActionConstants.OPEN_EXT));\r\n- keyHandler.put(KeyStroke.getPressed(SWT.F3, 0),\r\n- getActionRegistry().getAction(OPPResizeToContentsAction.RESIZE_TO_CONTENTS_ID));\r\n+ keyHandler.put(KeyStroke.getPressed(SWT.F3, 0), getActionRegistry().getAction(OPPResizeToContentsAction.RESIZE_TO_CONTENTS_ID));\r\n getGraphicalViewer().setKeyHandler(keyHandler);\r\n \r\n }\r\n \r\n @Override\r\n protected PaletteRoot getPaletteRoot() {\r\n- if(palette == null)\r\n+ if (palette == null)\r\n palette = new OPPGraphicalEditorPalette(idManager);\r\n return palette;\r\n }\r\n@@ -144,7 +141,7 @@ public void doSave(IProgressMonitor monitor) {\n opd.eResource().save(null);\r\n opdFile.touch(null);\r\n getCommandStack().markSaveLocation();\r\n- } catch(Exception e) {\r\n+ } catch (Exception e) {\r\n throw new RuntimeException(e);\r\n }\r\n }\r\n@@ -160,20 +157,15 @@ private void loadInput(IEditorInput input) {\n OPPPackage.eINSTANCE.eClass(); // This initializes the OPMPackage\r\n // singleton implementation. Must be called\r\n // before reading the file.\r\n- if(input instanceof IFileEditorInput) {\r\n+ if (input instanceof IFileEditorInput) {\r\n \r\n IFileEditorInput fileInput = (IFileEditorInput) input;\r\n opdFile = fileInput.getFile();\r\n opd = OPPFileUtils.loadOPPFile(opdFile.getLocationURI().toString());\r\n- if(opd == null) {\r\n+ if (opd == null) {\r\n throw new RuntimeException(\"Could not load OPD file \" + opdFile.getLocationURI().toString());\r\n }\r\n idManager.setInitialId(opd.getLastKnownUsedId());\r\n- // if(opd.getId() == 0) {\r\n- // opd.setId(1);\r\n- // opd.setLastKnownUsedId(2);\r\n- // }\r\n- // OPMIdManager.setInitialId(opd.getNextId());\r\n }\r\n }\r\n \r\n@@ -190,8 +182,7 @@ protected void createActions() {\n getActionRegistry().registerAction(action);\r\n getSelectionActions().add(action.getId());\r\n \r\n- action = new OPPToggledProceduralLinkSubkindAction(this,\r\n- OPPToggledProceduralLinkSubkindAction.CONDITIONAL_SUBKIND_ID);\r\n+ action = new OPPToggledProceduralLinkSubkindAction(this, OPPToggledProceduralLinkSubkindAction.CONDITIONAL_SUBKIND_ID);\r\n getActionRegistry().registerAction(action);\r\n getSelectionActions().add(action.getId());\r\n \r\n@@ -254,8 +245,8 @@ public void commandStackChanged(EventObject event) {\n */\r\n @Override\r\n public Object getAdapter(@SuppressWarnings(\"rawtypes\") Class type) {\r\n- if(type.equals(IPropertySheetPage.class)) {\r\n- if(propertyPage == null) {\r\n+ if (type.equals(IPropertySheetPage.class)) {\r\n+ if (propertyPage == null) {\r\n propertyPage = (UndoablePropertySheetPage) super.getAdapter(type);\r\n // A new PropertySourceProvider was implemented to fetch the model\r\n // from the edit part when required. The property source is provided\r\n@@ -264,19 +255,18 @@ public Object getAdapter(@SuppressWarnings(\"rawtypes\") Class type) {\n // to yield standard eclipse interfaces.\r\n \r\n IPropertySourceProvider sourceProvider = new IPropertySourceProvider() {\r\n- IPropertySourceProvider modelPropertySourceProvider = new AdapterFactoryContentProvider(\r\n- new OPPItemProviderAdapterFactory());\r\n+ IPropertySourceProvider modelPropertySourceProvider = new AdapterFactoryContentProvider(new OPPItemProviderAdapterFactory());\r\n \r\n @Override\r\n public IPropertySource getPropertySource(Object object) {\r\n IPropertySource source = null;\r\n- if(object instanceof EditPart) {\r\n+ if (object instanceof EditPart) {\r\n source = modelPropertySourceProvider.getPropertySource(((EditPart) object).getModel());\r\n } else {\r\n source = modelPropertySourceProvider.getPropertySource(object);\r\n }\r\n \r\n- if(source != null) {\r\n+ if (source != null) {\r\n return new UnwrappingPropertySource(source);\r\n } else {\r\n return null;\r\n@@ -288,7 +278,7 @@ public IPropertySource getPropertySource(Object object) {\n propertyPage.setRootEntry(root);\r\n }\r\n return propertyPage;\r\n- } else if(type == ZoomManager.class) {\r\n+ } else if (type == ZoomManager.class) {\r\n return ((ScalableFreeformRootEditPart) getGraphicalViewer().getRootEditPart()).getZoomManager();\r\n }\r\n \r\n@@ -312,7 +302,7 @@ public UnwrappingPropertySource(final IPropertySource source) {\n @Override\r\n public Object getEditableValue() {\r\n Object value = source.getEditableValue();\r\n- if(value instanceof PropertyValueWrapper) {\r\n+ if (value instanceof PropertyValueWrapper) {\r\n PropertyValueWrapper wrapper = (PropertyValueWrapper) value;\r\n return wrapper.getEditableValue(null);\r\n } else {\r\n@@ -328,7 +318,7 @@ public IPropertyDescriptor[] getPropertyDescriptors() {\n @Override\r\n public Object getPropertyValue(Object id) {\r\n Object value = source.getPropertyValue(id);\r\n- if(value instanceof PropertyValueWrapper) {\r\n+ if (value instanceof PropertyValueWrapper) {\r\n PropertyValueWrapper wrapper = (PropertyValueWrapper) value;\r\n return wrapper.getEditableValue(null);\r\n } else {\r", "raw_url": "https://github.com/vainolo/Object-Process-Programming/raw/c8c3080c49e883f01a64afc8119c041a889f82d4/com.vainolo.phd.opp.editor%2Fsrc%2Fcom%2Fvainolo%2Fphd%2Fopp%2Feditor%2FOPPGraphicalEditor.java", "sha": "9c2a157c30a602f814342e4ccd65ff765ed37fe4", "status": "modified" }, { "additions": 2, "blob_url": "https://github.com/vainolo/Object-Process-Programming/blob/c8c3080c49e883f01a64afc8119c041a889f82d4/com.vainolo.phd.opp.editor%2Fsrc%2Fcom%2Fvainolo%2Fphd%2Fopp%2Feditor%2Ffigure%2FOPPProcessFigure.java", "changes": 8, "contents_url": "https://api.github.com/repos/vainolo/Object-Process-Programming/contents/com.vainolo.phd.opp.editor%2Fsrc%2Fcom%2Fvainolo%2Fphd%2Fopp%2Feditor%2Ffigure%2FOPPProcessFigure.java?ref=c8c3080c49e883f01a64afc8119c041a889f82d4", "deletions": 6, "filename": "com.vainolo.phd.opp.editor/src/com/vainolo/phd/opp/editor/figure/OPPProcessFigure.java", "new_code": " if (isMultiple)\r\n if (connectionAnchor == null) {\r", "new_methods": [], "old_code": " if(isMultiple)\r\n if(connectionAnchor == null) {\r\n public void setText(String text) {\r\n smartLabel.setText(text);\r\n }\r\n\r", "old_methods": [ { "arguments": [ "String text" ], "filename": "com.vainolo.phd.opp.editor/src/com/vainolo/phd/opp/editor/figure/OPPProcessFigure.java", "implementation": "smartLabel.setText(text);", "signature": "void setText(String text)" } ], "patch": "@@ -72,7 +72,7 @@ private void paintMultipleProcess(Rectangle r) {\n protected void paintFigure(Graphics graphics) {\r\n super.paintFigure(graphics);\r\n Rectangle r = getBounds().getCopy();\r\n- if(isMultiple)\r\n+ if (isMultiple)\r\n paintMultipleProcess(r);\r\n else\r\n paintSimpleProcess(r);\r\n@@ -100,7 +100,7 @@ private Dimension calculateEllipseDimensionBasedOnLabelSize(Dimension labelDim)\n * @return an {@link EllipseAnchor} on the figure.\r\n */\r\n private ConnectionAnchor getConnectionAnchor() {\r\n- if(connectionAnchor == null) {\r\n+ if (connectionAnchor == null) {\r\n connectionAnchor = new EllipseAnchor(this);\r\n }\r\n return connectionAnchor;\r\n@@ -116,10 +116,6 @@ public ConnectionAnchor getTargetConnectionAnchor() {\n return getConnectionAnchor();\r\n }\r\n \r\n- public void setText(String text) {\r\n- smartLabel.setText(text);\r\n- }\r\n-\r\n @Override\r\n public Dimension getPreferredSize(int wHint, int hHint) {\r\n Dimension smartLabelSize = smartLabel.calculateSize();\r", "raw_url": "https://github.com/vainolo/Object-Process-Programming/raw/c8c3080c49e883f01a64afc8119c041a889f82d4/com.vainolo.phd.opp.editor%2Fsrc%2Fcom%2Fvainolo%2Fphd%2Fopp%2Feditor%2Ffigure%2FOPPProcessFigure.java", "sha": "c07ee728ba1f01ff1c950840651cc13b3ab47890", "status": "modified" }, { "additions": 3, "blob_url": "https://github.com/vainolo/Object-Process-Programming/blob/c8c3080c49e883f01a64afc8119c041a889f82d4/com.vainolo.phd.opp.editor%2Fsrc%2Fcom%2Fvainolo%2Fphd%2Fopp%2Feditor%2Fpart%2FOPPProcessEditPart.java", "changes": 6, "contents_url": "https://api.github.com/repos/vainolo/Object-Process-Programming/contents/com.vainolo.phd.opp.editor%2Fsrc%2Fcom%2Fvainolo%2Fphd%2Fopp%2Feditor%2Fpart%2FOPPProcessEditPart.java?ref=c8c3080c49e883f01a64afc8119c041a889f82d4", "deletions": 3, "filename": "com.vainolo.phd.opp.editor/src/com/vainolo/phd/opp/editor/part/OPPProcessEditPart.java", "new_code": " if (!model.isMain())\r\n figure.getNameFigure().setText(model.getName());\r\n parent.setLayoutConstraint(this, figure, new Rectangle(model.getX(), model.getY(), model.getWidth(), model.getHeight()));\r", "new_methods": [], "old_code": " figure.getNameFigure().setText(model.getName());\r\n parent.setLayoutConstraint(this, figure,\r\n new Rectangle(model.getX(), model.getY(), model.getWidth(), model.getHeight()));\r", "old_methods": [], "patch": "@@ -28,12 +28,12 @@ protected void refreshVisuals() {\n final GraphicalEditPart parent = (GraphicalEditPart) getParent();\r\n \r\n figure.setMultiple(model.isCollection());\r\n- figure.getNameFigure().setText(model.getName());\r\n+ if (!model.isMain())\r\n+ figure.getNameFigure().setText(model.getName());\r\n figure.setTooltipText(model.getDescription());\r\n figure.invalidateTree();\r\n \r\n- parent.setLayoutConstraint(this, figure,\r\n- new Rectangle(model.getX(), model.getY(), model.getWidth(), model.getHeight()));\r\n+ parent.setLayoutConstraint(this, figure, new Rectangle(model.getX(), model.getY(), model.getWidth(), model.getHeight()));\r\n \r\n }\r\n \r", "raw_url": "https://github.com/vainolo/Object-Process-Programming/raw/c8c3080c49e883f01a64afc8119c041a889f82d4/com.vainolo.phd.opp.editor%2Fsrc%2Fcom%2Fvainolo%2Fphd%2Fopp%2Feditor%2Fpart%2FOPPProcessEditPart.java", "sha": "bbe07439840f7dc852fa18c1ac6aad2d991e9354", "status": "modified" }, { "additions": 0, "blob_url": "https://github.com/vainolo/Object-Process-Programming/blob/c8c3080c49e883f01a64afc8119c041a889f82d4/com.vainolo.phd.opp.interpreter.tests%2F.settings%2Forg.eclipse.jdt.core.prefs", "changes": 280, "contents_url": "https://api.github.com/repos/vainolo/Object-Process-Programming/contents/com.vainolo.phd.opp.interpreter.tests%2F.settings%2Forg.eclipse.jdt.core.prefs?ref=c8c3080c49e883f01a64afc8119c041a889f82d4", "deletions": 280, "filename": "com.vainolo.phd.opp.interpreter.tests/.settings/org.eclipse.jdt.core.prefs", "new_code": "", "new_methods": [], "old_code": "org.eclipse.jdt.core.formatter.align_type_members_on_columns=false\r\norg.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16\r\norg.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0\r\norg.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16\r\norg.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16\r\norg.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16\r\norg.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16\r\norg.eclipse.jdt.core.formatter.alignment_for_assignment=0\r\norg.eclipse.jdt.core.formatter.alignment_for_binary_expression=16\r\norg.eclipse.jdt.core.formatter.alignment_for_compact_if=16\r\norg.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80\r\norg.eclipse.jdt.core.formatter.alignment_for_enum_constants=0\r\norg.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16\r\norg.eclipse.jdt.core.formatter.alignment_for_method_declaration=0\r\norg.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16\r\norg.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16\r\norg.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16\r\norg.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80\r\norg.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16\r\norg.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16\r\norg.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16\r\norg.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16\r\norg.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16\r\norg.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16\r\norg.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16\r\norg.eclipse.jdt.core.formatter.blank_lines_after_imports=1\r\norg.eclipse.jdt.core.formatter.blank_lines_after_package=1\r\norg.eclipse.jdt.core.formatter.blank_lines_before_field=0\r\norg.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0\r\norg.eclipse.jdt.core.formatter.blank_lines_before_imports=1\r\norg.eclipse.jdt.core.formatter.blank_lines_before_member_type=1\r\norg.eclipse.jdt.core.formatter.blank_lines_before_method=1\r\norg.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1\r\norg.eclipse.jdt.core.formatter.blank_lines_before_package=0\r\norg.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1\r\norg.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1\r\norg.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line\r\norg.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line\r\norg.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line\r\norg.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line\r\norg.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line\r\norg.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line\r\norg.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line\r\norg.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line\r\norg.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line\r\norg.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line\r\norg.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line\r\norg.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false\r\norg.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false\r\norg.eclipse.jdt.core.formatter.comment.format_block_comments=true\r\norg.eclipse.jdt.core.formatter.comment.format_header=false\r\norg.eclipse.jdt.core.formatter.comment.format_html=true\r\norg.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true\r\norg.eclipse.jdt.core.formatter.comment.format_line_comments=true\r\norg.eclipse.jdt.core.formatter.comment.format_source_code=true\r\norg.eclipse.jdt.core.formatter.comment.indent_parameter_description=true\r\norg.eclipse.jdt.core.formatter.comment.indent_root_tags=true\r\norg.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert\r\norg.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert\r\norg.eclipse.jdt.core.formatter.comment.line_length=80\r\norg.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true\r\norg.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true\r\norg.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false\r\norg.eclipse.jdt.core.formatter.compact_else_if=true\r\norg.eclipse.jdt.core.formatter.continuation_indentation=2\r\norg.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2\r\norg.eclipse.jdt.core.formatter.disabling_tag=@formatter\\:off\r\norg.eclipse.jdt.core.formatter.enabling_tag=@formatter\\:on\r\norg.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false\r\norg.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true\r\norg.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true\r\norg.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true\r\norg.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true\r\norg.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true\r\norg.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true\r\norg.eclipse.jdt.core.formatter.indent_empty_lines=false\r\norg.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true\r\norg.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true\r\norg.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true\r\norg.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false\r\norg.eclipse.jdt.core.formatter.indentation.size=2\r\norg.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert\r\norg.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert\r\norg.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert\r\norg.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert\r\norg.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert\r\norg.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert\r\norg.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert\r\norg.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert\r\norg.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert\r\norg.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert\r\norg.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert\r\norg.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert\r\norg.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert\r\norg.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert\r\norg.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert\r\norg.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert\r\norg.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert\r\norg.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert\r\norg.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert\r\norg.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert\r\norg.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert\r\norg.eclipse.jdt.core.formatter.join_lines_in_comments=true\r\norg.eclipse.jdt.core.formatter.join_wrapped_lines=true\r\norg.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false\r\norg.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false\r\norg.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false\r\norg.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false\r\norg.eclipse.jdt.core.formatter.lineSplit=120\r\norg.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false\r\norg.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false\r\norg.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0\r\norg.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1\r\norg.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true\r\norg.eclipse.jdt.core.formatter.tabulation.char=space\r\norg.eclipse.jdt.core.formatter.tabulation.size=2\r\norg.eclipse.jdt.core.formatter.use_on_off_tags=false\r\norg.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false\r\norg.eclipse.jdt.core.formatter.wrap_before_binary_operator=true\r\norg.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true\r\norg.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true\r", "old_methods": [], "patch": "@@ -20,283 +20,3 @@ org.eclipse.jdt.core.compiler.debug.sourceFile=generate\n org.eclipse.jdt.core.compiler.problem.assertIdentifier=error\r\n org.eclipse.jdt.core.compiler.problem.enumIdentifier=error\r\n org.eclipse.jdt.core.compiler.source=1.8\r\n-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false\r\n-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16\r\n-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0\r\n-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16\r\n-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16\r\n-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16\r\n-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16\r\n-org.eclipse.jdt.core.formatter.alignment_for_assignment=0\r\n-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16\r\n-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16\r\n-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80\r\n-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0\r\n-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16\r\n-org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0\r\n-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16\r\n-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16\r\n-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16\r\n-org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80\r\n-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16\r\n-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16\r\n-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16\r\n-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16\r\n-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16\r\n-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16\r\n-org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16\r\n-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1\r\n-org.eclipse.jdt.core.formatter.blank_lines_after_package=1\r\n-org.eclipse.jdt.core.formatter.blank_lines_before_field=0\r\n-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0\r\n-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1\r\n-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1\r\n-org.eclipse.jdt.core.formatter.blank_lines_before_method=1\r\n-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1\r\n-org.eclipse.jdt.core.formatter.blank_lines_before_package=0\r\n-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1\r\n-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1\r\n-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line\r\n-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line\r\n-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line\r\n-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line\r\n-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line\r\n-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line\r\n-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line\r\n-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line\r\n-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line\r\n-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line\r\n-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line\r\n-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false\r\n-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false\r\n-org.eclipse.jdt.core.formatter.comment.format_block_comments=true\r\n-org.eclipse.jdt.core.formatter.comment.format_header=false\r\n-org.eclipse.jdt.core.formatter.comment.format_html=true\r\n-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true\r\n-org.eclipse.jdt.core.formatter.comment.format_line_comments=true\r\n-org.eclipse.jdt.core.formatter.comment.format_source_code=true\r\n-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true\r\n-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true\r\n-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert\r\n-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert\r\n-org.eclipse.jdt.core.formatter.comment.line_length=80\r\n-org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true\r\n-org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true\r\n-org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false\r\n-org.eclipse.jdt.core.formatter.compact_else_if=true\r\n-org.eclipse.jdt.core.formatter.continuation_indentation=2\r\n-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2\r\n-org.eclipse.jdt.core.formatter.disabling_tag=@formatter\\:off\r\n-org.eclipse.jdt.core.formatter.enabling_tag=@formatter\\:on\r\n-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false\r\n-org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true\r\n-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true\r\n-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true\r\n-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true\r\n-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true\r\n-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true\r\n-org.eclipse.jdt.core.formatter.indent_empty_lines=false\r\n-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true\r\n-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true\r\n-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true\r\n-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false\r\n-org.eclipse.jdt.core.formatter.indentation.size=2\r\n-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert\r\n-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert\r\n-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert\r\n-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert\r\n-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert\r\n-org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert\r\n-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert\r\n-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert\r\n-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert\r\n-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert\r\n-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert\r\n-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert\r\n-org.eclipse.jdt.core.formatter.join_lines_in_comments=true\r\n-org.eclipse.jdt.core.formatter.join_wrapped_lines=true\r\n-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false\r\n-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false\r\n-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false\r\n-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false\r\n-org.eclipse.jdt.core.formatter.lineSplit=120\r\n-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false\r\n-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false\r\n-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0\r\n-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1\r\n-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true\r\n-org.eclipse.jdt.core.formatter.tabulation.char=space\r\n-org.eclipse.jdt.core.formatter.tabulation.size=2\r\n-org.eclipse.jdt.core.formatter.use_on_off_tags=false\r\n-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false\r\n-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true\r\n-org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true\r\n-org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true\r", "raw_url": "https://github.com/vainolo/Object-Process-Programming/raw/c8c3080c49e883f01a64afc8119c041a889f82d4/com.vainolo.phd.opp.interpreter.tests%2F.settings%2Forg.eclipse.jdt.core.prefs", "sha": "e58a10392564a363580dee1b101ce9efe520016d", "status": "modified" }, { "additions": 0, "blob_url": "https://github.com/vainolo/Object-Process-Programming/blob/c8c3080c49e883f01a64afc8119c041a889f82d4/com.vainolo.phd.opp.interpreter.tests%2F.settings%2Forg.eclipse.jdt.ui.prefs", "changes": 1, "contents_url": "https://api.github.com/repos/vainolo/Object-Process-Programming/contents/com.vainolo.phd.opp.interpreter.tests%2F.settings%2Forg.eclipse.jdt.ui.prefs?ref=c8c3080c49e883f01a64afc8119c041a889f82d4", "deletions": 1, "filename": "com.vainolo.phd.opp.interpreter.tests/.settings/org.eclipse.jdt.ui.prefs", "new_code": "", "new_methods": [], "old_code": "formatter_profile=_Vainolo\r", "old_methods": [], "patch": "@@ -1,6 +1,5 @@\n eclipse.preferences.version=1\r\n editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true\r\n-formatter_profile=_Vainolo\r\n formatter_settings_version=12\r\n org.eclipse.jdt.ui.exception.name=e\r\n org.eclipse.jdt.ui.gettersetter.use.is=true\r", "raw_url": "https://github.com/vainolo/Object-Process-Programming/raw/c8c3080c49e883f01a64afc8119c041a889f82d4/com.vainolo.phd.opp.interpreter.tests%2F.settings%2Forg.eclipse.jdt.ui.prefs", "sha": "d2d842afd1ee726c7e69a0ff2e0f3bdb85640034", "status": "modified" }, { "additions": 17, "blob_url": "https://github.com/vainolo/Object-Process-Programming/blob/c8c3080c49e883f01a64afc8119c041a889f82d4/com.vainolo.phd.opp.interpreter.tests%2Fsrc%2Fcom%2Fvainolo%2Fphd%2Fopp%2Finterpreter%2FOPPObjectInstanceTest.java", "changes": 34, "contents_url": "https://api.github.com/repos/vainolo/Object-Process-Programming/contents/com.vainolo.phd.opp.interpreter.tests%2Fsrc%2Fcom%2Fvainolo%2Fphd%2Fopp%2Finterpreter%2FOPPObjectInstanceTest.java?ref=c8c3080c49e883f01a64afc8119c041a889f82d4", "deletions": 17, "filename": "com.vainolo.phd.opp.interpreter.tests/src/com/vainolo/phd/opp/interpreter/OPPObjectInstanceTest.java", "new_code": "import com.vainolo.phd.opp.interpreter.OPPObjectInstance.InstanceKind;\r\n composite1.setPart(\"part1\", instance1);\r\n composite1.setPart(\"part2\", instance2);\r\n assertEquals(InstanceKind.COMPOSITE, composite1.kind);\r\n assertEquals(composite1.getAllParts().size(), 2);\r\n assertEquals(composite1.getPart(\"part1\"), instance1);\r\n assertEquals(composite1.getPart(\"part2\"), instance2);\r\n instance1.getAllParts();\r\n instance1.setPart(\"name\", instance2);\r\n instance1.setPart(\"name\", instance2);\r\n composite1.setPart(\"part1\", instance1);\r\n instance1 = OPPObjectInstance.createCompositeInstance();\r\n instance1.addLastPart(instance2);\r\n assertEquals(instance2.getValue(), instance1.getFirstPart().getValue());\r\n instance1 = OPPObjectInstance.createCompositeInstance();\r\n instance1.addLastPart(instance2);\r\n assertEquals(instance2.getValue(), instance1.getLastPart().getValue());\r", "new_methods": [], "old_code": "import com.vainolo.phd.opp.interpreter.OPPObjectInstance.InstanceType;\r\n composite1.addCompositePart(\"part1\", instance1);\r\n composite1.addCompositePart(\"part2\", instance2);\r\n assertEquals(InstanceType.COMPOSITE, composite1.type);\r\n assertEquals(composite1.getCompositeParts().size(), 2);\r\n assertEquals(composite1.getCompositePart(\"part1\"), instance1);\r\n assertEquals(composite1.getCompositePart(\"part2\"), instance2);\r\n instance1.getCompositeParts();\r\n instance1.addCompositePart(\"name\", instance2);\r\n instance1.addCompositePart(\"name\", instance2);\r\n composite1.addCompositePart(\"part1\", instance1);\r\n instance1 = OPPObjectInstance.createCollectionInstace();\r\n instance1.appendCollectionElement(instance2);\r\n assertEquals(instance2.getValue(), instance1.getCollectionFirstElement().getValue());\r\n instance1 = OPPObjectInstance.createCollectionInstace();\r\n instance1.appendCollectionElement(instance2);\r\n assertEquals(instance2.getValue(), instance1.getLastCollectionElement().getValue());\r", "old_methods": [], "patch": "@@ -7,7 +7,7 @@\n import org.junit.Test;\r\n \r\n import com.vainolo.phd.opp.interpreter.OPPObjectInstance;\r\n-import com.vainolo.phd.opp.interpreter.OPPObjectInstance.InstanceType;\r\n+import com.vainolo.phd.opp.interpreter.OPPObjectInstance.InstanceKind;\r\n \r\n import static org.junit.Assert.*;\r\n \r\n@@ -60,13 +60,13 @@ public void test_getStringValueFromNumericalInstance() {\n public void test_AddPartsToCompoundInstance() {\r\n instance1 = OPPObjectInstance.createFromValue(state1);\r\n instance2 = OPPObjectInstance.createFromValue(string1);\r\n- composite1.addCompositePart(\"part1\", instance1);\r\n- composite1.addCompositePart(\"part2\", instance2);\r\n+ composite1.setPart(\"part1\", instance1);\r\n+ composite1.setPart(\"part2\", instance2);\r\n \r\n- assertEquals(InstanceType.COMPOSITE, composite1.type);\r\n- assertEquals(composite1.getCompositeParts().size(), 2);\r\n- assertEquals(composite1.getCompositePart(\"part1\"), instance1);\r\n- assertEquals(composite1.getCompositePart(\"part2\"), instance2);\r\n+ assertEquals(InstanceKind.COMPOSITE, composite1.kind);\r\n+ assertEquals(composite1.getAllParts().size(), 2);\r\n+ assertEquals(composite1.getPart(\"part1\"), instance1);\r\n+ assertEquals(composite1.getPart(\"part2\"), instance2);\r\n }\r\n \r\n @Test(expected = IllegalStateException.class)\r\n@@ -77,45 +77,45 @@ public void test_GetValueFromCompountInstance_ExpectException() {\n @Test(expected = IllegalStateException.class)\r\n public void test_GetPartsFromValueInstance_ExpectException() {\r\n instance1 = OPPObjectInstance.createFromValue(number1);\r\n- instance1.getCompositeParts();\r\n+ instance1.getAllParts();\r\n }\r\n \r\n @Test(expected = IllegalStateException.class)\r\n public void test_AddPartToValueInstance_ExpectException() {\r\n instance1 = OPPObjectInstance.createFromValue(number1);\r\n instance2 = OPPObjectInstance.createFromValue(number1);\r\n- instance1.addCompositePart(\"name\", instance2);\r\n+ instance1.setPart(\"name\", instance2);\r\n }\r\n \r\n @Test(expected = IllegalStateException.class)\r\n public void test_AddPartToStateInstance_ExpectException() {\r\n instance1 = OPPObjectInstance.createFromValue(state1);\r\n instance2 = OPPObjectInstance.createFromValue(number1);\r\n- instance1.addCompositePart(\"name\", instance2);\r\n+ instance1.setPart(\"name\", instance2);\r\n }\r\n \r\n @Test\r\n public void test_CompoundInstanceToString() {\r\n instance1 = OPPObjectInstance.createFromValue(number1);\r\n- composite1.addCompositePart(\"part1\", instance1);\r\n+ composite1.setPart(\"part1\", instance1);\r\n assertEquals(\"{part1:\" + instance1.toString() + \"}\", composite1.toString());\r\n \r\n }\r\n \r\n // Collection instance tests\r\n @Test\r\n public void test_CreateCollectionAddInstanceAndGetFirstElement() {\r\n- instance1 = OPPObjectInstance.createCollectionInstace();\r\n+ instance1 = OPPObjectInstance.createCompositeInstance();\r\n instance2 = OPPObjectInstance.createFromValue(number1);\r\n- instance1.appendCollectionElement(instance2);\r\n- assertEquals(instance2.getValue(), instance1.getCollectionFirstElement().getValue());\r\n+ instance1.addLastPart(instance2);\r\n+ assertEquals(instance2.getValue(), instance1.getFirstPart().getValue());\r\n }\r\n \r\n public void test_CreateCollectionAddInstanceAndGetLastElement() {\r\n- instance1 = OPPObjectInstance.createCollectionInstace();\r\n+ instance1 = OPPObjectInstance.createCompositeInstance();\r\n instance2 = OPPObjectInstance.createFromValue(number1);\r\n- instance1.appendCollectionElement(instance2);\r\n- assertEquals(instance2.getValue(), instance1.getLastCollectionElement().getValue());\r\n+ instance1.addLastPart(instance2);\r\n+ assertEquals(instance2.getValue(), instance1.getLastPart().getValue());\r\n }\r\n \r\n @Before\r", "raw_url": "https://github.com/vainolo/Object-Process-Programming/raw/c8c3080c49e883f01a64afc8119c041a889f82d4/com.vainolo.phd.opp.interpreter.tests%2Fsrc%2Fcom%2Fvainolo%2Fphd%2Fopp%2Finterpreter%2FOPPObjectInstanceTest.java", "sha": "2ae8b7b68c27bf14bc0307cda1bb54f8a0a2612b", "status": "modified" }, { "additions": 6, "blob_url": "https://github.com/vainolo/Object-Process-Programming/blob/c8c3080c49e883f01a64afc8119c041a889f82d4/com.vainolo.phd.opp.interpreter.tests%2Fsrc%2Fcom%2Fvainolo%2Fphd%2Fopp%2Finterpreter%2FOPPObjectInstanceValueAnalyzerTests.java", "changes": 12, "contents_url": "https://api.github.com/repos/vainolo/Object-Process-Programming/contents/com.vainolo.phd.opp.interpreter.tests%2Fsrc%2Fcom%2Fvainolo%2Fphd%2Fopp%2Finterpreter%2FOPPObjectInstanceValueAnalyzerTests.java?ref=c8c3080c49e883f01a64afc8119c041a889f82d4", "deletions": 6, "filename": "com.vainolo.phd.opp.interpreter.tests/src/com/vainolo/phd/opp/interpreter/OPPObjectInstanceValueAnalyzerTests.java", "new_code": " assertEquals(5, instance.getAllParts().size());\r\n List<OPPObjectInstance> collectionElements = Lists.newArrayList(instance.getAllParts());\r\n assertEquals(52, instance.getAllParts().size());\r\n collectionElements = Lists.newArrayList(instance.getAllParts());\r\n assertEquals(6, instance.getAllParts().size());\r\n collectionElements = Lists.newArrayList(instance.getAllParts());\r", "new_methods": [], "old_code": " assertEquals(5, instance.getCollectionAllElements().size());\r\n List<OPPObjectInstance> collectionElements = Lists.newArrayList(instance.getCollectionAllElements());\r\n assertEquals(52, instance.getCollectionAllElements().size());\r\n collectionElements = Lists.newArrayList(instance.getCollectionAllElements());\r\n assertEquals(6, instance.getCollectionAllElements().size());\r\n collectionElements = Lists.newArrayList(instance.getCollectionAllElements());\r", "old_methods": [], "patch": "@@ -48,24 +48,24 @@ public void test_calculateArrayLiteralValue() {\n \r\n array = \"[1..5]\";\r\n instance = valueAnalyzer.calculateOPMObjectValue(array);\r\n- assertEquals(5, instance.getCollectionAllElements().size());\r\n- List<OPPObjectInstance> collectionElements = Lists.newArrayList(instance.getCollectionAllElements());\r\n+ assertEquals(5, instance.getAllParts().size());\r\n+ List<OPPObjectInstance> collectionElements = Lists.newArrayList(instance.getAllParts());\r\n for(int i = 1; i <= 5; i++) {\r\n assertEquals(i, collectionElements.get(i - 1).getNumericalValue().intValue());\r\n }\r\n \r\n array = \"[25..76]\";\r\n instance = valueAnalyzer.calculateOPMObjectValue(array);\r\n- assertEquals(52, instance.getCollectionAllElements().size());\r\n- collectionElements = Lists.newArrayList(instance.getCollectionAllElements());\r\n+ assertEquals(52, instance.getAllParts().size());\r\n+ collectionElements = Lists.newArrayList(instance.getAllParts());\r\n for(int i = 25; i <= 76; i++) {\r\n assertEquals(i, collectionElements.get(i - 25).getNumericalValue().intValue());\r\n }\r\n \r\n array = \"[15..10]\";\r\n instance = valueAnalyzer.calculateOPMObjectValue(array);\r\n- assertEquals(6, instance.getCollectionAllElements().size());\r\n- collectionElements = Lists.newArrayList(instance.getCollectionAllElements());\r\n+ assertEquals(6, instance.getAllParts().size());\r\n+ collectionElements = Lists.newArrayList(instance.getAllParts());\r\n for(int i = 15; i >= 10; i--) {\r\n assertEquals(i, collectionElements.get(15 - i).getNumericalValue().intValue());\r\n }\r", "raw_url": "https://github.com/vainolo/Object-Process-Programming/raw/c8c3080c49e883f01a64afc8119c041a889f82d4/com.vainolo.phd.opp.interpreter.tests%2Fsrc%2Fcom%2Fvainolo%2Fphd%2Fopp%2Finterpreter%2FOPPObjectInstanceValueAnalyzerTests.java", "sha": "7511b20f14858cf59888840670b2ee46ea4af8e8", "status": "modified" }, { "additions": 12, "blob_url": "https://github.com/vainolo/Object-Process-Programming/blob/c8c3080c49e883f01a64afc8119c041a889f82d4/com.vainolo.phd.opp.interpreter.tests%2Fsrc%2Fcom%2Fvainolo%2Fphd%2Fopp%2Finterpreter%2Fbuiltin%2FOPPReadJSONObjectProcessInstanceTest.java", "changes": 24, "contents_url": "https://api.github.com/repos/vainolo/Object-Process-Programming/contents/com.vainolo.phd.opp.interpreter.tests%2Fsrc%2Fcom%2Fvainolo%2Fphd%2Fopp%2Finterpreter%2Fbuiltin%2FOPPReadJSONObjectProcessInstanceTest.java?ref=c8c3080c49e883f01a64afc8119c041a889f82d4", "deletions": 12, "filename": "com.vainolo.phd.opp.interpreter.tests/src/com/vainolo/phd/opp/interpreter/builtin/OPPReadJSONObjectProcessInstanceTest.java", "new_code": " assertEquals(0, instance.getPart(\"a\").getNumericalValue().intValue());\r\n assertEquals(5.43, instance.getPart(\"a\").getNumericalValue().doubleValue(), 0.0001);\r\n assertEquals(\"hello\", instance.getPart(\"a\").getStringValue());\r\n assertEquals(\"false\", instance.getPart(\"a\").getStringValue());\r\n assertEquals(\"false\", instance.getPart(\"a\").getStringValue());\r\n assertEquals(2, instance.getPart(\"b\").getNumericalValue().intValue());\r\n assertEquals(\"true\", instance.getPart(\"a\").getPart(\"b\").getStringValue());\r\n assertEquals(\"true\", instance.getPart(\"a\").getPart(\"b\").getStringValue());\r\n assertEquals(\"false\", instance.getPart(\"b\").getStringValue());\r\n assertEquals(\"true\", instance.getPart(\"a\").getPart(\"b\").getStringValue());\r\n assertEquals(3, instance.getPart(\"a\").getPart(\"c\").getNumericalValue().intValue());\r\n assertEquals(\"hello\", instance.getPart(\"a\").getPart(\"d\").getStringValue());\r", "new_methods": [], "old_code": " assertEquals(0, instance.getCompositePart(\"a\").getNumericalValue().intValue());\r\n assertEquals(5.43, instance.getCompositePart(\"a\").getNumericalValue().doubleValue(), 0.0001);\r\n assertEquals(\"hello\", instance.getCompositePart(\"a\").getStringValue());\r\n assertEquals(\"false\", instance.getCompositePart(\"a\").getStringValue());\r\n assertEquals(\"false\", instance.getCompositePart(\"a\").getStringValue());\r\n assertEquals(2, instance.getCompositePart(\"b\").getNumericalValue().intValue());\r\n assertEquals(\"true\", instance.getCompositePart(\"a\").getCompositePart(\"b\").getStringValue());\r\n assertEquals(\"true\", instance.getCompositePart(\"a\").getCompositePart(\"b\").getStringValue());\r\n assertEquals(\"false\", instance.getCompositePart(\"b\").getStringValue());\r\n assertEquals(\"true\", instance.getCompositePart(\"a\").getCompositePart(\"b\").getStringValue());\r\n assertEquals(3, instance.getCompositePart(\"a\").getCompositePart(\"c\").getNumericalValue().intValue());\r\n assertEquals(\"hello\", instance.getCompositePart(\"a\").getCompositePart(\"d\").getStringValue());\r", "old_methods": [], "patch": "@@ -29,44 +29,44 @@ private OPPObjectInstance readJson(String json) throws Exception {\n @Test\r\n public void test_execute_intElement() throws Exception {\r\n OPPObjectInstance instance = readJson(\"{\\\"a\\\":0}\");\r\n- assertEquals(0, instance.getCompositePart(\"a\").getNumericalValue().intValue());\r\n+ assertEquals(0, instance.getPart(\"a\").getNumericalValue().intValue());\r\n }\r\n \r\n @Test\r\n public void test_execute_doubleElement() throws Exception {\r\n OPPObjectInstance instance = readJson(\"{\\\"a\\\":5.43}\");\r\n- assertEquals(5.43, instance.getCompositePart(\"a\").getNumericalValue().doubleValue(), 0.0001);\r\n+ assertEquals(5.43, instance.getPart(\"a\").getNumericalValue().doubleValue(), 0.0001);\r\n }\r\n \r\n @Test\r\n public void test_execute_stringElement() throws Exception {\r\n OPPObjectInstance instance = readJson(\"{\\\"a\\\":\\\"hello\\\"}\");\r\n- assertEquals(\"hello\", instance.getCompositePart(\"a\").getStringValue());\r\n+ assertEquals(\"hello\", instance.getPart(\"a\").getStringValue());\r\n }\r\n \r\n @Test\r\n public void test_execute_booleanElement() throws Exception {\r\n OPPObjectInstance instance = readJson(\"{\\\"a\\\":false}\");\r\n- assertEquals(\"false\", instance.getCompositePart(\"a\").getStringValue());\r\n+ assertEquals(\"false\", instance.getPart(\"a\").getStringValue());\r\n }\r\n \r\n @Test\r\n public void text_execute_multipleElements() throws Exception {\r\n OPPObjectInstance instance = readJson(\"{\\\"a\\\":false,\\\"b\\\":2}\");\r\n- assertEquals(\"false\", instance.getCompositePart(\"a\").getStringValue());\r\n- assertEquals(2, instance.getCompositePart(\"b\").getNumericalValue().intValue());\r\n+ assertEquals(\"false\", instance.getPart(\"a\").getStringValue());\r\n+ assertEquals(2, instance.getPart(\"b\").getNumericalValue().intValue());\r\n }\r\n \r\n @Test\r\n public void test_execute_complexInstance() throws Exception {\r\n OPPObjectInstance instance = readJson(\"{\\\"a\\\":{\\\"b\\\":true}}\");\r\n- assertEquals(\"true\", instance.getCompositePart(\"a\").getCompositePart(\"b\").getStringValue());\r\n+ assertEquals(\"true\", instance.getPart(\"a\").getPart(\"b\").getStringValue());\r\n \r\n instance = readJson(\"{\\\"a\\\":{\\\"b\\\":true, \\\"c\\\":3,\\\"d\\\":\\\"hello\\\"}, \\\"b\\\":false}\");\r\n- assertEquals(\"true\", instance.getCompositePart(\"a\").getCompositePart(\"b\").getStringValue());\r\n- assertEquals(\"false\", instance.getCompositePart(\"b\").getStringValue());\r\n- assertEquals(\"true\", instance.getCompositePart(\"a\").getCompositePart(\"b\").getStringValue());\r\n- assertEquals(3, instance.getCompositePart(\"a\").getCompositePart(\"c\").getNumericalValue().intValue());\r\n- assertEquals(\"hello\", instance.getCompositePart(\"a\").getCompositePart(\"d\").getStringValue());\r\n+ assertEquals(\"true\", instance.getPart(\"a\").getPart(\"b\").getStringValue());\r\n+ assertEquals(\"false\", instance.getPart(\"b\").getStringValue());\r\n+ assertEquals(\"true\", instance.getPart(\"a\").getPart(\"b\").getStringValue());\r\n+ assertEquals(3, instance.getPart(\"a\").getPart(\"c\").getNumericalValue().intValue());\r\n+ assertEquals(\"hello\", instance.getPart(\"a\").getPart(\"d\").getStringValue());\r\n }\r\n }\n\\ No newline at end of file", "raw_url": "https://github.com/vainolo/Object-Process-Programming/raw/c8c3080c49e883f01a64afc8119c041a889f82d4/com.vainolo.phd.opp.interpreter.tests%2Fsrc%2Fcom%2Fvainolo%2Fphd%2Fopp%2Finterpreter%2Fbuiltin%2FOPPReadJSONObjectProcessInstanceTest.java", "sha": "3ae41a4a528750730a87f20556c9793fcb7644e4", "status": "modified" }, { "additions": 9, "blob_url": "https://github.com/vainolo/Object-Process-Programming/blob/c8c3080c49e883f01a64afc8119c041a889f82d4/com.vainolo.phd.opp.interpreter.tests%2Fsrc%2Fcom%2Fvainolo%2Fphd%2Fopp%2Finterpreter%2Fbuiltin%2FOPPWriteOPMObjectInstanceToJSONProcessInstanceTest.java", "changes": 18, "contents_url": "https://api.github.com/repos/vainolo/Object-Process-Programming/contents/com.vainolo.phd.opp.interpreter.tests%2Fsrc%2Fcom%2Fvainolo%2Fphd%2Fopp%2Finterpreter%2Fbuiltin%2FOPPWriteOPMObjectInstanceToJSONProcessInstanceTest.java?ref=c8c3080c49e883f01a64afc8119c041a889f82d4", "deletions": 9, "filename": "com.vainolo.phd.opp.interpreter.tests/src/com/vainolo/phd/opp/interpreter/builtin/OPPWriteOPMObjectInstanceToJSONProcessInstanceTest.java", "new_code": " opmObject.setPart(\"int\", OPPObjectInstance.createFromValue(new BigDecimal(3)));\r\n opmObject.setPart(\"double\", OPPObjectInstance.createFromValue(new BigDecimal(5.47)));\r\n opmObject.setPart(\"name\", OPPObjectInstance.createFromValue(\"hello\"));\r\n opmObject.setPart(\"bool\", OPPObjectInstance.createFromValue(\"true\"));\r\n opmObject.setPart(\"a\", OPPObjectInstance.createFromValue(new BigDecimal(5)));\r\n part.setPart(\"b1\", OPPObjectInstance.createFromValue(\"hello\"));\r\n part.setPart(\"b2\", OPPObjectInstance.createFromValue(new BigDecimal(5.43)));\r\n opmObject.setPart(\"b\", part);\r\n opmObject.setPart(\"c\", OPPObjectInstance.createFromValue(\"one\"));\r", "new_methods": [], "old_code": " opmObject.addCompositePart(\"int\", OPPObjectInstance.createFromValue(new BigDecimal(3)));\r\n opmObject.addCompositePart(\"double\", OPPObjectInstance.createFromValue(new BigDecimal(5.47)));\r\n opmObject.addCompositePart(\"name\", OPPObjectInstance.createFromValue(\"hello\"));\r\n opmObject.addCompositePart(\"bool\", OPPObjectInstance.createFromValue(\"true\"));\r\n opmObject.addCompositePart(\"a\", OPPObjectInstance.createFromValue(new BigDecimal(5)));\r\n part.addCompositePart(\"b1\", OPPObjectInstance.createFromValue(\"hello\"));\r\n part.addCompositePart(\"b2\", OPPObjectInstance.createFromValue(new BigDecimal(5.43)));\r\n opmObject.addCompositePart(\"b\", part);\r\n opmObject.addCompositePart(\"c\", OPPObjectInstance.createFromValue(\"one\"));\r", "old_methods": [], "patch": "@@ -32,7 +32,7 @@ private OPPObjectInstance writeJson(OPPObjectInstance opmObject) throws Exceptio\n @Test\r\n public void test_execute_intElement() throws Exception {\r\n OPPObjectInstance opmObject = OPPObjectInstance.createCompositeInstance();\r\n- opmObject.addCompositePart(\"int\", OPPObjectInstance.createFromValue(new BigDecimal(3)));\r\n+ opmObject.setPart(\"int\", OPPObjectInstance.createFromValue(new BigDecimal(3)));\r\n OPPObjectInstance result = writeJson(opmObject);\r\n JsonObject jsonObject = JsonObject.readFrom(result.getStringValue());\r\n assertEquals(3, jsonObject.get(\"int\").asInt());\r\n@@ -41,7 +41,7 @@ public void test_execute_intElement() throws Exception {\n @Test\r\n public void test_execute_doubleElement() throws Exception {\r\n OPPObjectInstance opmObject = OPPObjectInstance.createCompositeInstance();\r\n- opmObject.addCompositePart(\"double\", OPPObjectInstance.createFromValue(new BigDecimal(5.47)));\r\n+ opmObject.setPart(\"double\", OPPObjectInstance.createFromValue(new BigDecimal(5.47)));\r\n OPPObjectInstance result = writeJson(opmObject);\r\n JsonObject jsonObject = JsonObject.readFrom(result.getStringValue());\r\n assertEquals(5.47, jsonObject.get(\"double\").asDouble(), 0.00001);\r\n@@ -50,7 +50,7 @@ public void test_execute_doubleElement() throws Exception {\n @Test\r\n public void test_execute_stringElement() throws Exception {\r\n OPPObjectInstance opmObject = OPPObjectInstance.createCompositeInstance();\r\n- opmObject.addCompositePart(\"name\", OPPObjectInstance.createFromValue(\"hello\"));\r\n+ opmObject.setPart(\"name\", OPPObjectInstance.createFromValue(\"hello\"));\r\n OPPObjectInstance result = writeJson(opmObject);\r\n JsonObject jsonObject = JsonObject.readFrom(result.getStringValue());\r\n assertEquals(\"hello\", jsonObject.get(\"name\").asString());\r\n@@ -59,7 +59,7 @@ public void test_execute_stringElement() throws Exception {\n @Test\r\n public void test_execute_stateElement() throws Exception {\r\n OPPObjectInstance opmObject = OPPObjectInstance.createCompositeInstance();\r\n- opmObject.addCompositePart(\"bool\", OPPObjectInstance.createFromValue(\"true\"));\r\n+ opmObject.setPart(\"bool\", OPPObjectInstance.createFromValue(\"true\"));\r\n OPPObjectInstance result = writeJson(opmObject);\r\n JsonObject jsonObject = JsonObject.readFrom(result.getStringValue());\r\n assertEquals(\"true\", jsonObject.get(\"bool\").asString());\r\n@@ -68,12 +68,12 @@ public void test_execute_stateElement() throws Exception {\n @Test\r\n public void text_execute_multipleElements() throws Exception {\r\n OPPObjectInstance opmObject = OPPObjectInstance.createCompositeInstance();\r\n- opmObject.addCompositePart(\"a\", OPPObjectInstance.createFromValue(new BigDecimal(5)));\r\n+ opmObject.setPart(\"a\", OPPObjectInstance.createFromValue(new BigDecimal(5)));\r\n OPPObjectInstance part = OPPObjectInstance.createCompositeInstance();\r\n- part.addCompositePart(\"b1\", OPPObjectInstance.createFromValue(\"hello\"));\r\n- part.addCompositePart(\"b2\", OPPObjectInstance.createFromValue(new BigDecimal(5.43)));\r\n- opmObject.addCompositePart(\"b\", part);\r\n- opmObject.addCompositePart(\"c\", OPPObjectInstance.createFromValue(\"one\"));\r\n+ part.setPart(\"b1\", OPPObjectInstance.createFromValue(\"hello\"));\r\n+ part.setPart(\"b2\", OPPObjectInstance.createFromValue(new BigDecimal(5.43)));\r\n+ opmObject.setPart(\"b\", part);\r\n+ opmObject.setPart(\"c\", OPPObjectInstance.createFromValue(\"one\"));\r\n OPPObjectInstance result = writeJson(opmObject);\r\n JsonObject json = JsonObject.readFrom(result.getStringValue());\r\n assertEquals(5, json.get(\"a\").asInt());\r", "raw_url": "https://github.com/vainolo/Object-Process-Programming/raw/c8c3080c49e883f01a64afc8119c041a889f82d4/com.vainolo.phd.opp.interpreter.tests%2Fsrc%2Fcom%2Fvainolo%2Fphd%2Fopp%2Finterpreter%2Fbuiltin%2FOPPWriteOPMObjectInstanceToJSONProcessInstanceTest.java", "sha": "a4ba95a48dfad3f56724001bedab32525f669b23", "status": "modified" }, { "additions": 13, "blob_url": "https://github.com/vainolo/Object-Process-Programming/blob/c8c3080c49e883f01a64afc8119c041a889f82d4/com.vainolo.phd.opp.interpreter.tests%2Fsrc%2Fcom%2Fvainolo%2Fphd%2Fopp%2Finterpreter%2Finzoomedprocessinstance%2FOPPInZoomedProcessInstanceHeapTest.java", "changes": 39, "contents_url": "https://api.github.com/repos/vainolo/Object-Process-Programming/contents/com.vainolo.phd.opp.interpreter.tests%2Fsrc%2Fcom%2Fvainolo%2Fphd%2Fopp%2Finterpreter%2Finzoomedprocessinstance%2FOPPInZoomedProcessInstanceHeapTest.java?ref=c8c3080c49e883f01a64afc8119c041a889f82d4", "deletions": 26, "filename": "com.vainolo.phd.opp.interpreter.tests/src/com/vainolo/phd/opp/interpreter/inzoomedprocessinstance/OPPInZoomedProcessInstanceHeapTest.java", "new_code": "import com.vainolo.phd.opp.interpreter.OPPObjectInstance.InstanceKind;\r\n OPPObjectInstance instance2 = instance1.getPart(part1.getName());\r\n assertTrue(observer.changes.get(1).objectInstance.kind == InstanceKind.COMPOSITE);\r\n assertEquals(inst1.getNumericalValue(), observer.changes.get(0).objectInstance.getPart(part1.getName()).getNumericalValue());\r\n assertEquals(heap.getVariable(obj1).getAllParts().size(), 0);\r\n assertNotNull(heap.getVariable(obj1).getPart(part1.getName()));\r\n assertEquals(1, heap.getVariable(obj1).getAllParts().size());\r\n assertNotNull(heap.getVariable(obj1).getPart(part2.getName()));\r\n assertNotNull(heap.getVariable(obj1).getPart(part1.getName()));\r\n assertEquals(2, heap.getVariable(obj1).getAllParts().size());\r\n assertNotNull(heap.getVariable(obj1).getPart(part2.getName()).getPart(part11.getName()));\r\n assertEquals(2, heap.getVariable(obj1).getAllParts().size());\r\n assertEquals(1, heap.getVariable(part2).getAllParts().size());\r", "new_methods": [], "old_code": "import com.vainolo.phd.opp.interpreter.OPPObjectInstance.InstanceType;\r\n OPPObjectInstance instance2 = instance1.getCompositePart(part1.getName());\r\n assertTrue(observer.changes.get(1).objectInstance.type == InstanceType.COMPOSITE);\r\n assertEquals(inst1.getNumericalValue(), observer.changes.get(0).objectInstance.getCompositePart(part1.getName())\r\n .getNumericalValue());\r\n assertEquals(heap.getVariable(obj1).getCompositeParts().size(), 0);\r\n assertNotNull(heap.getVariable(obj1).getCompositePart(part1.getName()));\r\n assertEquals(1, heap.getVariable(obj1).getCompositeParts().size());\r\n assertNotNull(heap.getVariable(obj1).getCompositePart(part2.getName()));\r\n assertNotNull(heap.getVariable(obj1).getCompositePart(part1.getName()));\r\n assertEquals(2, heap.getVariable(obj1).getCompositeParts().size());\r\n assertNotNull(heap.getVariable(obj1).getCompositePart(part2.getName()).getCompositePart(part11.getName()));\r\n assertEquals(2, heap.getVariable(obj1).getCompositeParts().size());\r\n assertEquals(1, heap.getVariable(part2).getCompositeParts().size());\r\n }\r\n\r\n @Test(expected = IllegalArgumentException.class)\r\n public void assignSimpleInstanceToCompositeObject() {\r\n createAggregationRelation(obj1, part1);\r\n\r\n heap.setVariable(obj1, inst1);\r\n }\r\n\r\n @Test(expected = IllegalArgumentException.class)\r\n public void assignCompositeInstanceToSimpleObject() {\r\n heap.setVariable(obj1, compInst1);\r", "old_methods": [ { "arguments": [], "filename": "com.vainolo.phd.opp.interpreter.tests/src/com/vainolo/phd/opp/interpreter/inzoomedprocessinstance/OPPInZoomedProcessInstanceHeapTest.java", "implementation": "createAggregationRelation(obj1, part1);\r\n\r\n heap.setVariable(obj1, inst1);", "signature": "void assignSimpleInstanceToCompositeObject()" } ], "patch": "@@ -13,7 +13,7 @@\n import com.google.common.collect.Lists;\r\n import com.vainolo.phd.opp.interpreter.OPPObjectInstance;\r\n import com.vainolo.phd.opp.interpreter.OPPObjectInstanceValueAnalyzer;\r\n-import com.vainolo.phd.opp.interpreter.OPPObjectInstance.InstanceType;\r\n+import com.vainolo.phd.opp.interpreter.OPPObjectInstance.InstanceKind;\r\n import com.vainolo.phd.opp.interpreter.inzoomedprocessinstance.OPPInZoomedProcessInstanceHeap;\r\n import com.vainolo.phd.opp.interpreter.inzoomedprocessinstance.OPPInZoomedProcessInstanceHeap.OPMHeapChange;\r\n import com.vainolo.phd.opp.interpreter.inzoomedprocessinstance.OPPInZoomedProcessInstanceHeap.OPMHeapChangeType;\r\n@@ -61,7 +61,7 @@ public void createVariablePart_ValidateParentCreation() {\n \r\n OPPObjectInstance instance1 = heap.getVariable(obj1);\r\n assertNotNull(instance1);\r\n- OPPObjectInstance instance2 = instance1.getCompositePart(part1.getName());\r\n+ OPPObjectInstance instance2 = instance1.getPart(part1.getName());\r\n assertNotNull(instance2);\r\n assertEquals(inst1.getNumericalValue(), instance2.getNumericalValue());\r\n }\r\n@@ -80,9 +80,8 @@ public void createVariablePart_ValidateNotificationOfParentAndPart() {\n assertEquals(part1, observer.changes.get(0).child);\r\n assertEquals(inst1.getNumericalValue(), observer.changes.get(0).childInstance.getNumericalValue());\r\n assertEquals(OPMHeapChangeType.VARIABLE_SET, observer.changes.get(1).changeType);\r\n- assertTrue(observer.changes.get(1).objectInstance.type == InstanceType.COMPOSITE);\r\n- assertEquals(inst1.getNumericalValue(), observer.changes.get(0).objectInstance.getCompositePart(part1.getName())\r\n- .getNumericalValue());\r\n+ assertTrue(observer.changes.get(1).objectInstance.kind == InstanceKind.COMPOSITE);\r\n+ assertEquals(inst1.getNumericalValue(), observer.changes.get(0).objectInstance.getPart(part1.getName()).getNumericalValue());\r\n }\r\n \r\n @Test\r\n@@ -94,39 +93,27 @@ public void createAndChangeCompositePart() {\n heap.setVariable(obj1, compInst1);\r\n \r\n assertNotNull(heap.getVariable(obj1));\r\n- assertEquals(heap.getVariable(obj1).getCompositeParts().size(), 0);\r\n+ assertEquals(heap.getVariable(obj1).getAllParts().size(), 0);\r\n \r\n heap.setVariable(part1, inst1);\r\n \r\n assertNotNull(heap.getVariable(part1));\r\n- assertNotNull(heap.getVariable(obj1).getCompositePart(part1.getName()));\r\n- assertEquals(1, heap.getVariable(obj1).getCompositeParts().size());\r\n+ assertNotNull(heap.getVariable(obj1).getPart(part1.getName()));\r\n+ assertEquals(1, heap.getVariable(obj1).getAllParts().size());\r\n \r\n heap.setVariable(part2, compInst2);\r\n \r\n assertNotNull(heap.getVariable(part2));\r\n- assertNotNull(heap.getVariable(obj1).getCompositePart(part2.getName()));\r\n- assertNotNull(heap.getVariable(obj1).getCompositePart(part1.getName()));\r\n- assertEquals(2, heap.getVariable(obj1).getCompositeParts().size());\r\n+ assertNotNull(heap.getVariable(obj1).getPart(part2.getName()));\r\n+ assertNotNull(heap.getVariable(obj1).getPart(part1.getName()));\r\n+ assertEquals(2, heap.getVariable(obj1).getAllParts().size());\r\n \r\n heap.setVariable(part11, inst3);\r\n \r\n assertNotNull(heap.getVariable(part11));\r\n- assertNotNull(heap.getVariable(obj1).getCompositePart(part2.getName()).getCompositePart(part11.getName()));\r\n- assertEquals(2, heap.getVariable(obj1).getCompositeParts().size());\r\n- assertEquals(1, heap.getVariable(part2).getCompositeParts().size());\r\n- }\r\n-\r\n- @Test(expected = IllegalArgumentException.class)\r\n- public void assignSimpleInstanceToCompositeObject() {\r\n- createAggregationRelation(obj1, part1);\r\n-\r\n- heap.setVariable(obj1, inst1);\r\n- }\r\n-\r\n- @Test(expected = IllegalArgumentException.class)\r\n- public void assignCompositeInstanceToSimpleObject() {\r\n- heap.setVariable(obj1, compInst1);\r\n+ assertNotNull(heap.getVariable(obj1).getPart(part2.getName()).getPart(part11.getName()));\r\n+ assertEquals(2, heap.getVariable(obj1).getAllParts().size());\r\n+ assertEquals(1, heap.getVariable(part2).getAllParts().size());\r\n }\r\n \r\n @Before\r", "raw_url": "https://github.com/vainolo/Object-Process-Programming/raw/c8c3080c49e883f01a64afc8119c041a889f82d4/com.vainolo.phd.opp.interpreter.tests%2Fsrc%2Fcom%2Fvainolo%2Fphd%2Fopp%2Finterpreter%2Finzoomedprocessinstance%2FOPPInZoomedProcessInstanceHeapTest.java", "sha": "90c6d28486a96792fd9255594497c6ae0b293dd0", "status": "modified" }, { "additions": 0, "blob_url": "https://github.com/vainolo/Object-Process-Programming/blob/c8c3080c49e883f01a64afc8119c041a889f82d4/com.vainolo.phd.opp.interpreter%2F.settings%2Forg.eclipse.jdt.core.prefs", "changes": 280, "contents_url": "https://api.github.com/repos/vainolo/Object-Process-Programming/contents/com.vainolo.phd.opp.interpreter%2F.settings%2Forg.eclipse.jdt.core.prefs?ref=c8c3080c49e883f01a64afc8119c041a889f82d4", "deletions": 280, "filename": "com.vainolo.phd.opp.interpreter/.settings/org.eclipse.jdt.core.prefs", "new_code": "", "new_methods": [], "old_code": "org.eclipse.jdt.core.formatter.align_type_members_on_columns=false\r\norg.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16\r\norg.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0\r\norg.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16\r\norg.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16\r\norg.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16\r\norg.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16\r\norg.eclipse.jdt.core.formatter.alignment_for_assignment=0\r\norg.eclipse.jdt.core.formatter.alignment_for_binary_expression=16\r\norg.eclipse.jdt.core.formatter.alignment_for_compact_if=16\r\norg.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80\r\norg.eclipse.jdt.core.formatter.alignment_for_enum_constants=0\r\norg.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16\r\norg.eclipse.jdt.core.formatter.alignment_for_method_declaration=0\r\norg.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16\r\norg.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16\r\norg.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16\r\norg.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80\r\norg.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16\r\norg.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16\r\norg.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16\r\norg.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16\r\norg.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16\r\norg.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16\r\norg.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16\r\norg.eclipse.jdt.core.formatter.blank_lines_after_imports=1\r\norg.eclipse.jdt.core.formatter.blank_lines_after_package=1\r\norg.eclipse.jdt.core.formatter.blank_lines_before_field=0\r\norg.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0\r\norg.eclipse.jdt.core.formatter.blank_lines_before_imports=1\r\norg.eclipse.jdt.core.formatter.blank_lines_before_member_type=1\r\norg.eclipse.jdt.core.formatter.blank_lines_before_method=1\r\norg.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1\r\norg.eclipse.jdt.core.formatter.blank_lines_before_package=0\r\norg.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1\r\norg.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1\r\norg.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line\r\norg.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line\r\norg.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line\r\norg.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line\r\norg.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line\r\norg.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line\r\norg.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line\r\norg.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line\r\norg.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line\r\norg.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line\r\norg.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line\r\norg.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false\r\norg.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false\r\norg.eclipse.jdt.core.formatter.comment.format_block_comments=true\r\norg.eclipse.jdt.core.formatter.comment.format_header=false\r\norg.eclipse.jdt.core.formatter.comment.format_html=true\r\norg.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true\r\norg.eclipse.jdt.core.formatter.comment.format_line_comments=true\r\norg.eclipse.jdt.core.formatter.comment.format_source_code=true\r\norg.eclipse.jdt.core.formatter.comment.indent_parameter_description=true\r\norg.eclipse.jdt.core.formatter.comment.indent_root_tags=true\r\norg.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert\r\norg.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert\r\norg.eclipse.jdt.core.formatter.comment.line_length=80\r\norg.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true\r\norg.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true\r\norg.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false\r\norg.eclipse.jdt.core.formatter.compact_else_if=true\r\norg.eclipse.jdt.core.formatter.continuation_indentation=2\r\norg.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2\r\norg.eclipse.jdt.core.formatter.disabling_tag=@formatter\\:off\r\norg.eclipse.jdt.core.formatter.enabling_tag=@formatter\\:on\r\norg.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false\r\norg.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true\r\norg.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true\r\norg.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true\r\norg.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true\r\norg.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true\r\norg.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true\r\norg.eclipse.jdt.core.formatter.indent_empty_lines=false\r\norg.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true\r\norg.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true\r\norg.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true\r\norg.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false\r\norg.eclipse.jdt.core.formatter.indentation.size=2\r\norg.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert\r\norg.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert\r\norg.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert\r\norg.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert\r\norg.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert\r\norg.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert\r\norg.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert\r\norg.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert\r\norg.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert\r\norg.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert\r\norg.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert\r\norg.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert\r\norg.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert\r\norg.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert\r\norg.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert\r\norg.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert\r\norg.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert\r\norg.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert\r\norg.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert\r\norg.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert\r\norg.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert\r\norg.eclipse.jdt.core.formatter.join_lines_in_comments=true\r\norg.eclipse.jdt.core.formatter.join_wrapped_lines=true\r\norg.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false\r\norg.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false\r\norg.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false\r\norg.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false\r\norg.eclipse.jdt.core.formatter.lineSplit=120\r\norg.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false\r\norg.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false\r\norg.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0\r\norg.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1\r\norg.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true\r\norg.eclipse.jdt.core.formatter.tabulation.char=space\r\norg.eclipse.jdt.core.formatter.tabulation.size=2\r\norg.eclipse.jdt.core.formatter.use_on_off_tags=false\r\norg.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false\r\norg.eclipse.jdt.core.formatter.wrap_before_binary_operator=true\r\norg.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true\r\norg.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true\r", "old_methods": [], "patch": "@@ -108,283 +108,3 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore\n org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning\r\n org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning\r\n org.eclipse.jdt.core.compiler.source=1.8\r\n-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false\r\n-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16\r\n-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0\r\n-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16\r\n-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16\r\n-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16\r\n-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16\r\n-org.eclipse.jdt.core.formatter.alignment_for_assignment=0\r\n-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16\r\n-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16\r\n-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80\r\n-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0\r\n-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16\r\n-org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0\r\n-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16\r\n-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16\r\n-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16\r\n-org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80\r\n-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16\r\n-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16\r\n-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16\r\n-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16\r\n-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16\r\n-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16\r\n-org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16\r\n-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1\r\n-org.eclipse.jdt.core.formatter.blank_lines_after_package=1\r\n-org.eclipse.jdt.core.formatter.blank_lines_before_field=0\r\n-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0\r\n-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1\r\n-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1\r\n-org.eclipse.jdt.core.formatter.blank_lines_before_method=1\r\n-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1\r\n-org.eclipse.jdt.core.formatter.blank_lines_before_package=0\r\n-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1\r\n-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1\r\n-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line\r\n-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line\r\n-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line\r\n-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line\r\n-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line\r\n-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line\r\n-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line\r\n-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line\r\n-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line\r\n-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line\r\n-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line\r\n-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false\r\n-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false\r\n-org.eclipse.jdt.core.formatter.comment.format_block_comments=true\r\n-org.eclipse.jdt.core.formatter.comment.format_header=false\r\n-org.eclipse.jdt.core.formatter.comment.format_html=true\r\n-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true\r\n-org.eclipse.jdt.core.formatter.comment.format_line_comments=true\r\n-org.eclipse.jdt.core.formatter.comment.format_source_code=true\r\n-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true\r\n-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true\r\n-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert\r\n-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert\r\n-org.eclipse.jdt.core.formatter.comment.line_length=80\r\n-org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true\r\n-org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true\r\n-org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false\r\n-org.eclipse.jdt.core.formatter.compact_else_if=true\r\n-org.eclipse.jdt.core.formatter.continuation_indentation=2\r\n-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2\r\n-org.eclipse.jdt.core.formatter.disabling_tag=@formatter\\:off\r\n-org.eclipse.jdt.core.formatter.enabling_tag=@formatter\\:on\r\n-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false\r\n-org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true\r\n-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true\r\n-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true\r\n-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true\r\n-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true\r\n-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true\r\n-org.eclipse.jdt.core.formatter.indent_empty_lines=false\r\n-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true\r\n-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true\r\n-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true\r\n-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false\r\n-org.eclipse.jdt.core.formatter.indentation.size=2\r\n-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert\r\n-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert\r\n-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert\r\n-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert\r\n-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert\r\n-org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert\r\n-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert\r\n-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert\r\n-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert\r\n-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert\r\n-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert\r\n-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert\r\n-org.eclipse.jdt.core.formatter.join_lines_in_comments=true\r\n-org.eclipse.jdt.core.formatter.join_wrapped_lines=true\r\n-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false\r\n-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false\r\n-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false\r\n-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false\r\n-org.eclipse.jdt.core.formatter.lineSplit=120\r\n-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false\r\n-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false\r\n-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0\r\n-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1\r\n-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true\r\n-org.eclipse.jdt.core.formatter.tabulation.char=space\r\n-org.eclipse.jdt.core.formatter.tabulation.size=2\r\n-org.eclipse.jdt.core.formatter.use_on_off_tags=false\r\n-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false\r\n-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true\r\n-org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true\r\n-org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true\r", "raw_url": "https://github.com/vainolo/Object-Process-Programming/raw/c8c3080c49e883f01a64afc8119c041a889f82d4/com.vainolo.phd.opp.interpreter%2F.settings%2Forg.eclipse.jdt.core.prefs", "sha": "bdf09ee85cc8c5bb800a3b778772588d6dba0697", "status": "modified" }, { "additions": 0, "blob_url": "https://github.com/vainolo/Object-Process-Programming/blob/c8c3080c49e883f01a64afc8119c041a889f82d4/com.vainolo.phd.opp.interpreter%2F.settings%2Forg.eclipse.jdt.ui.prefs", "changes": 1, "contents_url": "https://api.github.com/repos/vainolo/Object-Process-Programming/contents/com.vainolo.phd.opp.interpreter%2F.settings%2Forg.eclipse.jdt.ui.prefs?ref=c8c3080c49e883f01a64afc8119c041a889f82d4", "deletions": 1, "filename": "com.vainolo.phd.opp.interpreter/.settings/org.eclipse.jdt.ui.prefs", "new_code": "", "new_methods": [], "old_code": "formatter_profile=_Vainolo\r", "old_methods": [], "patch": "@@ -1,7 +1,6 @@\n cleanup_settings_version=2\r\n eclipse.preferences.version=1\r\n editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true\r\n-formatter_profile=_Vainolo\r\n formatter_settings_version=12\r\n org.eclipse.jdt.ui.exception.name=e\r\n org.eclipse.jdt.ui.gettersetter.use.is=true\r", "raw_url": "https://github.com/vainolo/Object-Process-Programming/raw/c8c3080c49e883f01a64afc8119c041a889f82d4/com.vainolo.phd.opp.interpreter%2F.settings%2Forg.eclipse.jdt.ui.prefs", "sha": "cd1653cad9d85d3aab5faccca8b729d3aff333ae", "status": "modified" }, { "additions": 2, "blob_url": "https://github.com/vainolo/Object-Process-Programming/blob/c8c3080c49e883f01a64afc8119c041a889f82d4/com.vainolo.phd.opp.interpreter%2Fsrc%2Fcom%2Fvainolo%2Fphd%2Fopp%2Finterpreter%2FOPPAbstractProcessInstance.java", "changes": 4, "contents_url": "https://api.github.com/repos/vainolo/Object-Process-Programming/contents/com.vainolo.phd.opp.interpreter%2Fsrc%2Fcom%2Fvainolo%2Fphd%2Fopp%2Finterpreter%2FOPPAbstractProcessInstance.java?ref=c8c3080c49e883f01a64afc8119c041a889f82d4", "deletions": 2, "filename": "com.vainolo.phd.opp.interpreter/src/com/vainolo/phd/opp/interpreter/OPPAbstractProcessInstance.java", "new_code": " public List<OPPParameter> getIncomingParameters() {\r\n public List<OPPParameter> getOutgoingParameters() {\r", "new_methods": [], "old_code": " public List<OPPParameter> getIncomingParameterNames() {\r\n public List<OPPParameter> getOutgoingParameterNames() {\r", "old_methods": [], "patch": "@@ -81,12 +81,12 @@ public OPPObjectInstance getArgument(String name) {\n }\r\n \r\n @Override\r\n- public List<OPPParameter> getIncomingParameterNames() {\r\n+ public List<OPPParameter> getIncomingParameters() {\r\n return Lists.newArrayList();\r\n }\r\n \r\n @Override\r\n- public List<OPPParameter> getOutgoingParameterNames() {\r\n+ public List<OPPParameter> getOutgoingParameters() {\r\n return Lists.newArrayList();\r\n }\r\n \r", "raw_url": "https://github.com/vainolo/Object-Process-Programming/raw/c8c3080c49e883f01a64afc8119c041a889f82d4/com.vainolo.phd.opp.interpreter%2Fsrc%2Fcom%2Fvainolo%2Fphd%2Fopp%2Finterpreter%2FOPPAbstractProcessInstance.java", "sha": "f5b2391613c54f9e299bb96dbd3c8a7bfbd59112", "status": "modified" }, { "additions": 3, "blob_url": "https://github.com/vainolo/Object-Process-Programming/blob/c8c3080c49e883f01a64afc8119c041a889f82d4/com.vainolo.phd.opp.interpreter%2Fsrc%2Fcom%2Fvainolo%2Fphd%2Fopp%2Finterpreter%2FOPPInterpreter.java", "changes": 6, "contents_url": "https://api.github.com/repos/vainolo/Object-Process-Programming/contents/com.vainolo.phd.opp.interpreter%2Fsrc%2Fcom%2Fvainolo%2Fphd%2Fopp%2Finterpreter%2FOPPInterpreter.java?ref=c8c3080c49e883f01a64afc8119c041a889f82d4", "deletions": 3, "filename": "com.vainolo.phd.opp.interpreter/src/com/vainolo/phd/opp/interpreter/OPPInterpreter.java", "new_code": " * {@link OPPObjectProcessDiagramKind#SYSTEM} and\r\n * {@link OPPObjectProcessDiagramKind#COMPOUND}, but they can both be executed\r\n } catch (Exception e) {\r", "new_methods": [], "old_code": " * {@link OPMObjectProcessDiagramKind#SYSTEM} and\r\n * {@link OPMObjectProcessDiagramKind#COMPOUND}, but they can both be executed\r\n } catch(Exception e) {\r", "old_methods": [], "patch": "@@ -35,8 +35,8 @@ private OPPInterpreter() {\n \r\n /**\r\n * Execute an Object Process Diagram (OPD). An OPD can be of two kinds,\r\n- * {@link OPMObjectProcessDiagramKind#SYSTEM} and\r\n- * {@link OPMObjectProcessDiagramKind#COMPOUND}, but they can both be executed\r\n+ * {@link OPPObjectProcessDiagramKind#SYSTEM} and\r\n+ * {@link OPPObjectProcessDiagramKind#COMPOUND}, but they can both be executed\r\n * in the same way.\r\n * \r\n * @param opdName\r\n@@ -50,7 +50,7 @@ public void interpret(String opdName, final IContainer _container) {\n \r\n try {\r\n instance.call();\r\n- } catch(Exception e) {\r\n+ } catch (Exception e) {\r\n logSevere(\"Unexpected exception: \" + e.getMessage());\r\n }\r\n logInfo(\"Finished interpreting {0}.\", opdName);\r", "raw_url": "https://github.com/vainolo/Object-Process-Programming/raw/c8c3080c49e883f01a64afc8119c041a889f82d4/com.vainolo.phd.opp.interpreter%2Fsrc%2Fcom%2Fvainolo%2Fphd%2Fopp%2Finterpreter%2FOPPInterpreter.java", "sha": "256d1b232676a75336eee175a6831945ba53f592", "status": "modified" }, { "additions": 23, "blob_url": "https://github.com/vainolo/Object-Process-Programming/blob/c8c3080c49e883f01a64afc8119c041a889f82d4/com.vainolo.phd.opp.interpreter%2Fsrc%2Fcom%2Fvainolo%2Fphd%2Fopp%2Finterpreter%2FOPPJavaProcessExecutableInstance.java", "changes": 55, "contents_url": "https://api.github.com/repos/vainolo/Object-Process-Programming/contents/com.vainolo.phd.opp.interpreter%2Fsrc%2Fcom%2Fvainolo%2Fphd%2Fopp%2Finterpreter%2FOPPJavaProcessExecutableInstance.java?ref=c8c3080c49e883f01a64afc8119c041a889f82d4", "deletions": 32, "filename": "com.vainolo.phd.opp.interpreter/src/com/vainolo/phd/opp/interpreter/OPPJavaProcessExecutableInstance.java", "new_code": " for (String parameter : parameters) {\r\n for (int i = 0; i < parameters.length; i++) {\r\n if (!method.getReturnType().equals(Void.TYPE)) {\r\n final Matcher classAndMethodAndParametersMatcher = classAndMethodAndParametersPattern.matcher(process.getDescription());\r\n if (!classAndMethodAndParametersMatcher.find()) {\r\n throw new RuntimeException(\"Could not parse method definition \" + process.getDescription() + \" for process \" + process.getName());\r\n if (!methodParameters.isEmpty()) {\r\n if (parameters.length != 0) {\r\n for (int i = 0; i < parameters.length; i++) {\r\n } catch (ClassNotFoundException e) {\r\n logInfo(\"Could not load class \" + className + \" for process \" + process.getName() + \". Check that the class is in the classpath.\");\r\n } catch (NoSuchMethodException e) {\r\n logInfo(\"Could not find methdod \" + methodName + \" in class \" + className + \". Please check that you have given the correct parameters and try again.\");\r\n } catch (SecurityException e) {\r\n if (byte.class.getName().equals(name))\r\n if (short.class.getName().equals(name))\r\n if (int.class.getName().equals(name))\r\n if (long.class.getName().equals(name))\r\n if (float.class.getName().equals(name))\r\n if (double.class.getName().equals(name))\r\n if (boolean.class.getName().equals(name))\r\n if (char.class.getName().equals(name))\r\n if (name.charAt(0) == '[')\r", "new_methods": [], "old_code": " for(String parameter : parameters) {\r\n for(int i = 0; i < parameters.length; i++) {\r\n if(!method.getReturnType().equals(Void.TYPE)) {\r\n final Matcher classAndMethodAndParametersMatcher = classAndMethodAndParametersPattern.matcher(process\r\n .getDescription());\r\n if(!classAndMethodAndParametersMatcher.find()) {\r\n throw new RuntimeException(\"Could not parse method definition \" + process.getDescription() + \" for process \"\r\n + process.getName());\r\n if(!methodParameters.isEmpty()) {\r\n if(parameters.length != 0) {\r\n for(int i = 0; i < parameters.length; i++) {\r\n } catch(ClassNotFoundException e) {\r\n logInfo(\"Could not load class \" + className + \" for process \" + process.getName()\r\n + \". Check that the class is in the classpath.\");\r\n } catch(NoSuchMethodException e) {\r\n logInfo(\"Could not find methdod \" + methodName + \" in class \" + className\r\n + \". Please check that you have given the correct parameters and try again.\");\r\n } catch(SecurityException e) {\r\n if(byte.class.getName().equals(name))\r\n if(short.class.getName().equals(name))\r\n if(int.class.getName().equals(name))\r\n if(long.class.getName().equals(name))\r\n if(float.class.getName().equals(name))\r\n if(double.class.getName().equals(name))\r\n if(boolean.class.getName().equals(name))\r\n if(char.class.getName().equals(name))\r\n if(name.charAt(0) == '[')\r\n\r\n @Override\r\n public boolean isReady() {\r\n return true;\r\n }\r", "old_methods": [ { "arguments": [], "filename": "com.vainolo.phd.opp.interpreter/src/com/vainolo/phd/opp/interpreter/OPPJavaProcessExecutableInstance.java", "implementation": "return true;", "signature": "boolean isReady()" } ], "patch": "@@ -40,13 +40,13 @@ public String getName() {\n @Override\r\n protected void executing() {\r\n loadMethod();\r\n- for(String parameter : parameters) {\r\n+ for (String parameter : parameters) {\r\n OPPObject object = OPPFactory.eINSTANCE.createOPPObject();\r\n object.setName(parameter);\r\n }\r\n \r\n arguments = new Object[parameters.length];\r\n- for(int i = 0; i < parameters.length; i++) {\r\n+ for (int i = 0; i < parameters.length; i++) {\r\n arguments[i] = getArgument(\"arg\" + i);\r\n }\r\n \r\n@@ -55,7 +55,7 @@ protected void executing() {\n \r\n // final Object result = callMethod(method);\r\n OPPObjectInstance instance = null; // OPMObjectInstance.createFromValue(result);\r\n- if(!method.getReturnType().equals(Void.TYPE)) {\r\n+ if (!method.getReturnType().equals(Void.TYPE)) {\r\n setArgument(\"result\", instance);\r\n }\r\n }\r\n@@ -75,20 +75,18 @@ protected void executing() {\n // }\r\n \r\n private Method loadMethod() {\r\n- final Matcher classAndMethodAndParametersMatcher = classAndMethodAndParametersPattern.matcher(process\r\n- .getDescription());\r\n+ final Matcher classAndMethodAndParametersMatcher = classAndMethodAndParametersPattern.matcher(process.getDescription());\r\n \r\n- if(!classAndMethodAndParametersMatcher.find()) {\r\n+ if (!classAndMethodAndParametersMatcher.find()) {\r\n logInfo(\"Could not parse method definition \" + process.getDescription() + \" for process \" + process.getName());\r\n- throw new RuntimeException(\"Could not parse method definition \" + process.getDescription() + \" for process \"\r\n- + process.getName());\r\n+ throw new RuntimeException(\"Could not parse method definition \" + process.getDescription() + \" for process \" + process.getName());\r\n }\r\n \r\n className = classAndMethodAndParametersMatcher.group(1);\r\n methodName = classAndMethodAndParametersMatcher.group(2);\r\n String methodParameters = classAndMethodAndParametersMatcher.group(3);\r\n \r\n- if(!methodParameters.isEmpty()) {\r\n+ if (!methodParameters.isEmpty()) {\r\n methodParameters = methodParameters.replaceAll(\"\\\\s*\", \"\");\r\n parameters = methodParameters.split(\",\");\r\n }\r\n@@ -100,23 +98,21 @@ private Method loadMethod() {\n Class<?>[] parameterClasses = null;\r\n cls = getClass(className);\r\n \r\n- if(parameters.length != 0) {\r\n+ if (parameters.length != 0) {\r\n parameterClasses = new Class[parameters.length];\r\n- for(int i = 0; i < parameters.length; i++) {\r\n+ for (int i = 0; i < parameters.length; i++) {\r\n parameterClasses[i] = getClass(parameters[i]);\r\n }\r\n }\r\n method = cls.getMethod(methodName, parameterClasses);\r\n \r\n- } catch(ClassNotFoundException e) {\r\n- logInfo(\"Could not load class \" + className + \" for process \" + process.getName()\r\n- + \". Check that the class is in the classpath.\");\r\n+ } catch (ClassNotFoundException e) {\r\n+ logInfo(\"Could not load class \" + className + \" for process \" + process.getName() + \". Check that the class is in the classpath.\");\r\n throw new RuntimeException(e);\r\n- } catch(NoSuchMethodException e) {\r\n- logInfo(\"Could not find methdod \" + methodName + \" in class \" + className\r\n- + \". Please check that you have given the correct parameters and try again.\");\r\n+ } catch (NoSuchMethodException e) {\r\n+ logInfo(\"Could not find methdod \" + methodName + \" in class \" + className + \". Please check that you have given the correct parameters and try again.\");\r\n throw new RuntimeException(e);\r\n- } catch(SecurityException e) {\r\n+ } catch (SecurityException e) {\r\n logInfo(\"Some security exception happened. Don't know what this means :-)\");\r\n throw new RuntimeException(e);\r\n }\r\n@@ -125,31 +121,26 @@ private Method loadMethod() {\n }\r\n \r\n private Class<?> getClass(String name) throws ClassNotFoundException {\r\n- if(byte.class.getName().equals(name))\r\n+ if (byte.class.getName().equals(name))\r\n return byte.class;\r\n- if(short.class.getName().equals(name))\r\n+ if (short.class.getName().equals(name))\r\n return short.class;\r\n- if(int.class.getName().equals(name))\r\n+ if (int.class.getName().equals(name))\r\n return int.class;\r\n- if(long.class.getName().equals(name))\r\n+ if (long.class.getName().equals(name))\r\n return long.class;\r\n- if(float.class.getName().equals(name))\r\n+ if (float.class.getName().equals(name))\r\n return float.class;\r\n- if(double.class.getName().equals(name))\r\n+ if (double.class.getName().equals(name))\r\n return double.class;\r\n- if(boolean.class.getName().equals(name))\r\n+ if (boolean.class.getName().equals(name))\r\n return boolean.class;\r\n- if(char.class.getName().equals(name))\r\n+ if (char.class.getName().equals(name))\r\n return char.class;\r\n \r\n- if(name.charAt(0) == '[')\r\n+ if (name.charAt(0) == '[')\r\n throw new UnsupportedOperationException(\"Array parameters are not supported yet.\");\r\n \r\n return Class.forName(name);\r\n }\r\n-\r\n- @Override\r\n- public boolean isReady() {\r\n- return true;\r\n- }\r\n }\r", "raw_url": "https://github.com/vainolo/Object-Process-Programming/raw/c8c3080c49e883f01a64afc8119c041a889f82d4/com.vainolo.phd.opp.interpreter%2Fsrc%2Fcom%2Fvainolo%2Fphd%2Fopp%2Finterpreter%2FOPPJavaProcessExecutableInstance.java", "sha": "2dab750e38b0dde10c06d21bf2a16215ea3da69d", "status": "modified" }, { "additions": 126, "blob_url": "https://github.com/vainolo/Object-Process-Programming/blob/c8c3080c49e883f01a64afc8119c041a889f82d4/com.vainolo.phd.opp.interpreter%2Fsrc%2Fcom%2Fvainolo%2Fphd%2Fopp%2Finterpreter%2FOPPObjectInstance.java", "changes": 249, "contents_url": "https://api.github.com/repos/vainolo/Object-Process-Programming/contents/com.vainolo.phd.opp.interpreter%2Fsrc%2Fcom%2Fvainolo%2Fphd%2Fopp%2Finterpreter%2FOPPObjectInstance.java?ref=c8c3080c49e883f01a64afc8119c041a889f82d4", "deletions": 123, "filename": "com.vainolo.phd.opp.interpreter/src/com/vainolo/phd/opp/interpreter/OPPObjectInstance.java", "new_code": " * And instance of an OPM Object. An OPM object can have two primary constructs: it either has a value or is composite.\r\n * Values can be {@link String}, {@link BigDecimal}, or a state, which is treated pretty similarly to a string.\r\n private SortedMap<Integer, OPPObjectInstance> compositeValues = Maps.newTreeMap();\r\n private BiMap<String, Integer> compositeKeyToIndexMapping = HashBiMap.create();\r\n public final InstanceKind kind;\r\n private UUID id;\r\n\r\n private OPPObjectInstance(InstanceKind type) {\r\n this.kind = type;\r\n this.id = UUID.randomUUID();\r\n public String getId() {\r\n return id.toString();\r\n // Creation\r\n public static OPPObjectInstance createCompositeInstance() {\r\n return new OPPObjectInstance(InstanceKind.COMPOSITE);\r\n OPPObjectInstance instance = new OPPObjectInstance(InstanceKind.NUMERICAL);\r\n OPPObjectInstance instance = new OPPObjectInstance(InstanceKind.STRING);\r\n public static OPPObjectInstance createFromValue(Object object) {\r\n Preconditions.checkNotNull(object);\r\n OPPObjectInstance instance = new OPPObjectInstance(InstanceKind.JAVA_OBJECT);\r\n instance.setValue(object);\r\n return instance;\r\n }\r\n\r\n switch (existingInstance.kind) {\r\n case JAVA_OBJECT:\r\n newInstance = createFromValue(existingInstance.getValue());\r\n break;\r\n for (Integer index : existingInstance.compositeValues.keySet()) {\r\n newInstance.compositeValues.put(index, existingInstance.compositeValues.get(index));\r\n newInstance.compositeKeyToIndexMapping.inverse().put(index, existingInstance.compositeKeyToIndexMapping.inverse().get(index));\r\n default:\r\n if (InstanceKind.STRING.equals(kind)) {\r\n return (String) getValue();\r\n } else if (InstanceKind.NUMERICAL.equals(kind)) {\r\n return ((BigDecimal) getValue()).toString();\r\n if (InstanceKind.STRING.equals(kind)) {\r\n } else if (InstanceKind.NUMERICAL.equals(kind)) {\r\n // Compound\r\n public void addFirstPart(OPPObjectInstance value) {\r\n checkNotNull(value, \"Cannot append a null element to a collection.\");\r\n Integer firstKey = 0;\r\n if (compositeValues.size() > 0) {\r\n firstKey = compositeValues.firstKey();\r\n }\r\n int newKey = firstKey - 1;\r\n compositeValues.put(newKey, value);\r\n compositeKeyToIndexMapping.put(UUID.randomUUID().toString(), newKey);\r\n public void addLastPart(OPPObjectInstance value) {\r\n if (compositeValues.size() > 0) {\r\n lastKey = compositeValues.lastKey();\r\n compositeValues.put(newKey, value);\r\n compositeKeyToIndexMapping.put(UUID.randomUUID().toString(), newKey);\r\n public void setPart(String name, OPPObjectInstance value) {\r\n checkTypeForCompositeOnlyOperations();\r\n if (compositeKeyToIndexMapping.containsKey(name)) {\r\n compositeValues.remove(compositeKeyToIndexMapping.get(name));\r\n compositeKeyToIndexMapping.remove(name);\r\n int lastKey = 0;\r\n if (compositeValues.size() > 0) {\r\n lastKey = compositeValues.lastKey();\r\n }\r\n int newKey = lastKey + 1;\r\n compositeValues.put(newKey, value);\r\n compositeKeyToIndexMapping.put(name, newKey);\r\n public OPPObjectInstance getPart(String key) {\r\n checkTypeForCompositeOnlyOperations();\r\n checkState((key != null) && (!\"\".equals(key)), \"Key cannot be null or empty.\");\r\n return compositeValues.get(compositeKeyToIndexMapping.get(key));\r\n }\r\n public OPPObjectInstance getFirstPart() {\r\n checkTypeForCompositeOnlyOperations();\r\n return compositeValues.get(compositeValues.firstKey());\r\n public OPPObjectInstance getLastPart() {\r\n checkTypeForCompositeOnlyOperations();\r\n return compositeValues.get(compositeValues.lastKey());\r\n public Collection<OPPObjectInstance> getAllParts() {\r\n checkTypeForCompositeOnlyOperations();\r\n return Collections.unmodifiableCollection(compositeValues.values());\r\n public Set<String> getAllPartIndexes() {\r\n checkTypeForCompositeOnlyOperations();\r\n return Collections.unmodifiableSet(compositeKeyToIndexMapping.keySet());\r\n public void removePart(OPPObjectInstance key) {\r\n checkTypeForCompositeOnlyOperations();\r\n checkState(key != null, \"Key cannot be null.\");\r\n switch (key.kind) {\r\n case STRING:\r\n case NUMERICAL:\r\n removePart(key.getStringValue());\r\n break;\r\n case COMPOSITE:\r\n removePart(key.getId());\r\n break;\r\n case JAVA_OBJECT:\r\n throw new OPPRuntimeException(\"Java object keys are not supported.\");\r\n }\r\n public void removePart(String key) {\r\n checkTypeForCompositeOnlyOperations();\r\n checkState((key != null) && (\"\".equals(key)), \"Key cannot be null or empty.\");\r\n Integer index = compositeKeyToIndexMapping.get(key);\r\n compositeValues.remove(index);\r\n compositeKeyToIndexMapping.remove(key);\r\n }\r\n\r\n public OPPObjectInstance removeFirstPart() {\r\n checkTypeForCompositeOnlyOperations();\r\n Integer firstIndex = compositeValues.firstKey();\r\n OPPObjectInstance firstInstance = compositeValues.remove(firstIndex);\r\n compositeKeyToIndexMapping.inverse().remove(firstIndex);\r\n return firstInstance;\r\n public OPPObjectInstance removeLastPart() {\r\n checkTypeForCompositeOnlyOperations();\r\n Integer lastIndex = compositeValues.lastKey();\r\n OPPObjectInstance lastInstance = compositeValues.remove(lastIndex);\r\n compositeKeyToIndexMapping.inverse().remove(lastIndex);\r\n return lastInstance;\r\n if (InstanceKind.STRING.equals(kind) || InstanceKind.NUMERICAL.equals(kind)) {\r\n } else if (InstanceKind.COMPOSITE.equals(kind)) {\r\n for (Integer index : compositeValues.keySet()) {\r\n ret.append(compositeKeyToIndexMapping.inverse().get(index).toString() + \":\" + compositeValues.get(index).toString() + \",\");\r\n if (ret.length() > 2)\r\n ret.replace(ret.length() - 1, ret.length(), \"}\");\r\n checkState(!InstanceKind.COMPOSITE.equals(kind), \"Instance is a collection but operation is only valid for value instances.\");\r\n checkState(InstanceKind.COMPOSITE.equals(kind), \"Collection operations can only be applied to collection instances.\");\r\n public enum InstanceKind {\r\n NUMERICAL, STRING, JAVA_OBJECT, COMPOSITE;\r", "new_methods": [ { "arguments": [ "InstanceKind type" ], "filename": "com.vainolo.phd.opp.interpreter/src/com/vainolo/phd/opp/interpreter/OPPObjectInstance.java", "implementation": "this.kind = type;\r\n this.id = UUID.randomUUID();\r\n public String getId() {\r\n return id.toString();\r\n // Creation\r\n public static OPPObjectInstance createCompositeInstance() {\r\n return new OPPObjectInstance(InstanceKind.COMPOSITE);\r\n OPPObjectInstance instance = new OPPObjectInstance(InstanceKind.NUMERICAL);\r\n OPPObjectInstance instance = new OPPObjectInstance(InstanceKind.STRING);\r\n public static OPPObjectInstance createFromValue(Object object) {\r\n Preconditions.checkNotNull(object);\r\n OPPObjectInstance instance = new OPPObjectInstance(InstanceKind.JAVA_OBJECT);\r\n instance.setValue(object);\r\n return instance;", "signature": "private OPPObjectInstance(InstanceKind type)" }, { "arguments": [ "OPPObjectInstance value" ], "filename": "com.vainolo.phd.opp.interpreter/src/com/vainolo/phd/opp/interpreter/OPPObjectInstance.java", "implementation": "checkNotNull(value, \"Cannot append a null element to a collection.\");\r\n Integer firstKey = 0;\r\n if (compositeValues.size() > 0) {\r\n firstKey = compositeValues.firstKey();", "signature": "void addFirstPart(OPPObjectInstance value)" }, { "arguments": [ "OPPObjectInstance value" ], "filename": "com.vainolo.phd.opp.interpreter/src/com/vainolo/phd/opp/interpreter/OPPObjectInstance.java", "implementation": "if (compositeValues.size() > 0) {\r\n lastKey = compositeValues.lastKey();\r\n compositeValues.put(newKey, value);\r\n compositeKeyToIndexMapping.put(UUID.randomUUID().toString(), newKey);\r\n public void setPart(String name, OPPObjectInstance value) {\r\n checkTypeForCompositeOnlyOperations();\r\n if (compositeKeyToIndexMapping.containsKey(name)) {\r\n compositeValues.remove(compositeKeyToIndexMapping.get(name));\r\n compositeKeyToIndexMapping.remove(name);\r\n int lastKey = 0;\r\n if (compositeValues.size() > 0) {\r\n lastKey = compositeValues.lastKey();", "signature": "void addLastPart(OPPObjectInstance value)" }, { "arguments": [ "String key" ], "filename": "com.vainolo.phd.opp.interpreter/src/com/vainolo/phd/opp/interpreter/OPPObjectInstance.java", "implementation": "checkTypeForCompositeOnlyOperations();\r\n checkState((key != null) && (!\"\".equals(key)), \"Key cannot be null or empty.\");\r\n return compositeValues.get(compositeKeyToIndexMapping.get(key));", "signature": "OPPObjectInstance getPart(String key)" }, { "arguments": [], "filename": "com.vainolo.phd.opp.interpreter/src/com/vainolo/phd/opp/interpreter/OPPObjectInstance.java", "implementation": "checkTypeForCompositeOnlyOperations();\r\n return compositeValues.get(compositeValues.firstKey());\r\n public OPPObjectInstance getLastPart() {\r\n checkTypeForCompositeOnlyOperations();\r\n return compositeValues.get(compositeValues.lastKey());\r\n public Collection<OPPObjectInstance> getAllParts() {\r\n checkTypeForCompositeOnlyOperations();\r\n return Collections.unmodifiableCollection(compositeValues.values());\r\n public Set<String> getAllPartIndexes() {\r\n checkTypeForCompositeOnlyOperations();\r\n return Collections.unmodifiableSet(compositeKeyToIndexMapping.keySet());\r\n public void removePart(OPPObjectInstance key) {\r\n checkTypeForCompositeOnlyOperations();\r\n checkState(key != null, \"Key cannot be null.\");\r\n switch (key.kind) {\r\n case STRING:\r\n case NUMERICAL:\r\n removePart(key.getStringValue());\r\n break;\r\n case COMPOSITE:\r\n removePart(key.getId());\r\n break;\r\n case JAVA_OBJECT:\r\n throw new OPPRuntimeException(\"Java object keys are not supported.\");", "signature": "OPPObjectInstance getFirstPart()" }, { "arguments": [ "String key" ], "filename": "com.vainolo.phd.opp.interpreter/src/com/vainolo/phd/opp/interpreter/OPPObjectInstance.java", "implementation": "checkTypeForCompositeOnlyOperations();\r\n checkState((key != null) && (\"\".equals(key)), \"Key cannot be null or empty.\");\r\n Integer index = compositeKeyToIndexMapping.get(key);\r\n compositeValues.remove(index);\r\n compositeKeyToIndexMapping.remove(key);", "signature": "void removePart(String key)" }, { "arguments": [], "filename": "com.vainolo.phd.opp.interpreter/src/com/vainolo/phd/opp/interpreter/OPPObjectInstance.java", "implementation": "checkTypeForCompositeOnlyOperations();\r\n Integer firstIndex = compositeValues.firstKey();\r\n OPPObjectInstance firstInstance = compositeValues.remove(firstIndex);\r\n compositeKeyToIndexMapping.inverse().remove(firstIndex);\r\n return firstInstance;\r\n public OPPObjectInstance removeLastPart() {\r\n checkTypeForCompositeOnlyOperations();\r\n Integer lastIndex = compositeValues.lastKey();\r\n OPPObjectInstance lastInstance = compositeValues.remove(lastIndex);\r\n compositeKeyToIndexMapping.inverse().remove(lastIndex);\r\n return lastInstance;\r\n if (InstanceKind.STRING.equals(kind) || InstanceKind.NUMERICAL.equals(kind)) {", "signature": "OPPObjectInstance removeFirstPart()" } ], "old_code": "import java.util.Map;\r\nimport java.util.Map.Entry;\r\n * And instance of an OPM Object. An OPM object can have two primary constructs:\r\n * it either has a value or is composite. Values can be {@link String},\r\n * {@link BigDecimal}, or a state, which is treated pretty similarly to a\r\n * string.\r\n private Map<String, OPPObjectInstance> parts = Maps.newHashMap();\r\n // private List<OPMObjectInstance> collectionValues = Lists.newArrayList();\r\n private SortedMap<Integer, OPPObjectInstance> collectionValues = Maps.newTreeMap();\r\n private BiMap<String, Integer> collectionNameToIndexMapping = HashBiMap.create();\r\n public final InstanceType type;\r\n\r\n private OPPObjectInstance(InstanceType type) {\r\n this.type = type;\r\n // Creation\r\n public static OPPObjectInstance createCompositeInstance() {\r\n return new OPPObjectInstance(InstanceType.COMPOSITE);\r\n public static OPPObjectInstance createCollectionInstace() {\r\n return new OPPObjectInstance(InstanceType.COLLECTION);\r\n OPPObjectInstance instance = new OPPObjectInstance(InstanceType.NUMERICAL);\r\n OPPObjectInstance instance = new OPPObjectInstance(InstanceType.STRING);\r\n switch(existingInstance.type) {\r\n for(Entry<String, OPPObjectInstance> part : existingInstance.getCompositeParts()) {\r\n newInstance.addCompositePart(part.getKey(), createFromExistingInstance(part.getValue()));\r\n case COLLECTION:\r\n newInstance = createCollectionInstace();\r\n for(Integer index : existingInstance.collectionValues.keySet()) {\r\n newInstance.collectionValues.put(index, existingInstance.collectionValues.get(index));\r\n newInstance.collectionNameToIndexMapping.inverse().put(index,\r\n existingInstance.collectionNameToIndexMapping.inverse().get(index));\r\n }\r\n if(InstanceType.STRING.equals(type)) {\r\n return String.class.cast(getValue());\r\n } else if(InstanceType.NUMERICAL.equals(type)) {\r\n return BigDecimal.class.cast(getValue()).toString();\r\n if(InstanceType.STRING.equals(type)) {\r\n } else if(InstanceType.NUMERICAL.equals(type)) {\r\n // Composite\r\n public void addCompositePart(String name, OPPObjectInstance part) {\r\n checkTypeForCompositeOnlyOperations();\r\n checkNotNull(name);\r\n checkNotNull(part);\r\n parts.put(name, part);\r\n }\r\n\r\n public OPPObjectInstance getCompositePart(String name) {\r\n checkNotNull(name, \"Part name cannot be null\");\r\n checkArgument(!\"\".equals(name), \"Part name cannot be empty\");\r\n return parts.get(name);\r\n public Set<Entry<String, OPPObjectInstance>> getCompositeParts() {\r\n return Collections.unmodifiableSet(parts.entrySet());\r\n }\r\n\r\n // Collection\r\n public int appendCollectionElement(OPPObjectInstance value) {\r\n checkTypeForCollectionOnlyOperations();\r\n if(collectionValues.size() > 0) {\r\n lastKey = collectionValues.lastKey();\r\n collectionValues.put(newKey, value);\r\n collectionNameToIndexMapping.put(UUID.randomUUID().toString(), newKey);\r\n return newKey;\r\n public void putCollectionElement(String name, OPPObjectInstance value) {\r\n checkTypeForCollectionOnlyOperations();\r\n if(collectionNameToIndexMapping.containsKey(name)) {\r\n collectionValues.remove(collectionNameToIndexMapping.get(name));\r\n collectionNameToIndexMapping.remove(name);\r\n int index = appendCollectionElement(value);\r\n collectionNameToIndexMapping.inverse().remove(index);\r\n collectionNameToIndexMapping.put(name, index);\r\n public void putCollectionElementAtIndex(int index, OPPObjectInstance value) {\r\n checkTypeForCollectionOnlyOperations();\r\n checkNotNull(value, \"Cannot insert a null element to a collection.\");\r\n if(collectionValues.containsKey(index)) {\r\n collectionValues.remove(index);\r\n collectionNameToIndexMapping.inverse().remove(index);\r\n }\r\n collectionValues.put(index, value);\r\n collectionNameToIndexMapping.put(UUID.randomUUID().toString(), index);\r\n public OPPObjectInstance getCollectionElement(String name) {\r\n checkTypeForCollectionOnlyOperations();\r\n checkState((name != null) && !(\"\".equals(name)), \"Named location of element must not be null or empty.\");\r\n checkState(collectionNameToIndexMapping.containsKey(name), \"Collection does contain a value at index %s.\", name);\r\n return collectionValues.get(collectionNameToIndexMapping.get(name));\r\n public OPPObjectInstance getCollectionElementAtIndex(int index) {\r\n checkTypeForCollectionOnlyOperations();\r\n return collectionValues.get(index);\r\n public OPPObjectInstance getCollectionFirstElement() {\r\n checkTypeForCollectionOnlyOperations();\r\n return collectionValues.get(collectionValues.firstKey());\r\n public OPPObjectInstance getLastCollectionElement() {\r\n checkTypeForCollectionOnlyOperations();\r\n return collectionValues.get(collectionValues.lastKey());\r\n public Collection<OPPObjectInstance> getCollectionAllElements() {\r\n checkTypeForCollectionOnlyOperations();\r\n return Collections.unmodifiableCollection(collectionValues.values());\r\n public Set<String> getCollectionAllIndexes() {\r\n checkTypeForCollectionOnlyOperations();\r\n return Collections.unmodifiableSet(collectionNameToIndexMapping.keySet());\r\n if(InstanceType.STRING.equals(type) || InstanceType.NUMERICAL.equals(type))\r\n else if(InstanceType.COMPOSITE.equals(type)) {\r\n for(String partName : parts.keySet()) {\r\n ret.append(partName + \":\" + parts.get(partName) + \",\");\r\n }\r\n ret.replace(ret.length() - 1, ret.length(), \"}\");\r\n return ret.toString();\r\n } else if(InstanceType.COLLECTION.equals(type)) {\r\n StringBuilder ret = new StringBuilder(\"[\");\r\n for(OPPObjectInstance element : collectionValues.values()) {\r\n ret.append(element.toString() + \",\");\r\n if(ret.length() > 2)\r\n ret.replace(ret.length() - 1, ret.length(), \"]\");\r\n checkState(!InstanceType.COLLECTION.equals(type),\r\n \"Instance is a collection but operation is only valid for value instances.\");\r\n checkState(!InstanceType.COMPOSITE.equals(type),\r\n \"Instance is a collection but operation is only valid for value instances.\");\r\n checkState(InstanceType.COMPOSITE.equals(type), \"Composite operations can only be applied to composite instances.\");\r\n }\r\n\r\n private void checkTypeForCollectionOnlyOperations() {\r\n checkState(InstanceType.COLLECTION.equals(type),\r\n \"Collection operations can only be applied to collection instances.\");\r\n public enum InstanceType {\r\n NUMERICAL, STRING, COMPOSITE, COLLECTION;\r", "old_methods": [ { "arguments": [ "InstanceType type" ], "filename": "com.vainolo.phd.opp.interpreter/src/com/vainolo/phd/opp/interpreter/OPPObjectInstance.java", "implementation": "this.type = type;\r\n // Creation\r\n public static OPPObjectInstance createCompositeInstance() {\r\n return new OPPObjectInstance(InstanceType.COMPOSITE);\r\n public static OPPObjectInstance createCollectionInstace() {\r\n return new OPPObjectInstance(InstanceType.COLLECTION);\r\n OPPObjectInstance instance = new OPPObjectInstance(InstanceType.NUMERICAL);\r\n OPPObjectInstance instance = new OPPObjectInstance(InstanceType.STRING);\r\n switch(existingInstance.type) {\r\n for(Entry<String, OPPObjectInstance> part : existingInstance.getCompositeParts()) {\r\n newInstance.addCompositePart(part.getKey(), createFromExistingInstance(part.getValue()));\r\n case COLLECTION:\r\n newInstance = createCollectionInstace();\r\n for(Integer index : existingInstance.collectionValues.keySet()) {\r\n newInstance.collectionValues.put(index, existingInstance.collectionValues.get(index));\r\n newInstance.collectionNameToIndexMapping.inverse().put(index,\r\n existingInstance.collectionNameToIndexMapping.inverse().get(index));", "signature": "private OPPObjectInstance(InstanceType type)" }, { "arguments": [ "String name", " OPPObjectInstance part" ], "filename": "com.vainolo.phd.opp.interpreter/src/com/vainolo/phd/opp/interpreter/OPPObjectInstance.java", "implementation": "checkTypeForCompositeOnlyOperations();\r\n checkNotNull(name);\r\n checkNotNull(part);\r\n parts.put(name, part);", "signature": "void addCompositePart(String name, OPPObjectInstance part)" }, { "arguments": [ "String name" ], "filename": "com.vainolo.phd.opp.interpreter/src/com/vainolo/phd/opp/interpreter/OPPObjectInstance.java", "implementation": "checkNotNull(name, \"Part name cannot be null\");\r\n checkArgument(!\"\".equals(name), \"Part name cannot be empty\");\r\n return parts.get(name);\r\n public Set<Entry<String, OPPObjectInstance>> getCompositeParts() {\r\n return Collections.unmodifiableSet(parts.entrySet());", "signature": "OPPObjectInstance getCompositePart(String name)" }, { "arguments": [ "OPPObjectInstance value" ], "filename": "com.vainolo.phd.opp.interpreter/src/com/vainolo/phd/opp/interpreter/OPPObjectInstance.java", "implementation": "checkTypeForCollectionOnlyOperations();\r\n if(collectionValues.size() > 0) {\r\n lastKey = collectionValues.lastKey();\r\n collectionValues.put(newKey, value);\r\n collectionNameToIndexMapping.put(UUID.randomUUID().toString(), newKey);\r\n return newKey;\r\n public void putCollectionElement(String name, OPPObjectInstance value) {\r\n checkTypeForCollectionOnlyOperations();\r\n if(collectionNameToIndexMapping.containsKey(name)) {\r\n collectionValues.remove(collectionNameToIndexMapping.get(name));\r\n collectionNameToIndexMapping.remove(name);\r\n int index = appendCollectionElement(value);\r\n collectionNameToIndexMapping.inverse().remove(index);\r\n collectionNameToIndexMapping.put(name, index);\r\n public void putCollectionElementAtIndex(int index, OPPObjectInstance value) {\r\n checkTypeForCollectionOnlyOperations();\r\n checkNotNull(value, \"Cannot insert a null element to a collection.\");\r\n if(collectionValues.containsKey(index)) {\r\n collectionValues.remove(index);\r\n collectionNameToIndexMapping.inverse().remove(index);", "signature": "int appendCollectionElement(OPPObjectInstance value)" }, { "arguments": [ "String name" ], "filename": "com.vainolo.phd.opp.interpreter/src/com/vainolo/phd/opp/interpreter/OPPObjectInstance.java", "implementation": "checkTypeForCollectionOnlyOperations();\r\n checkState((name != null) && !(\"\".equals(name)), \"Named location of element must not be null or empty.\");\r\n checkState(collectionNameToIndexMapping.containsKey(name), \"Collection does contain a value at index %s.\", name);\r\n return collectionValues.get(collectionNameToIndexMapping.get(name));\r\n public OPPObjectInstance getCollectionElementAtIndex(int index) {\r\n checkTypeForCollectionOnlyOperations();\r\n return collectionValues.get(index);\r\n public OPPObjectInstance getCollectionFirstElement() {\r\n checkTypeForCollectionOnlyOperations();\r\n return collectionValues.get(collectionValues.firstKey());\r\n public OPPObjectInstance getLastCollectionElement() {\r\n checkTypeForCollectionOnlyOperations();\r\n return collectionValues.get(collectionValues.lastKey());\r\n public Collection<OPPObjectInstance> getCollectionAllElements() {\r\n checkTypeForCollectionOnlyOperations();\r\n return Collections.unmodifiableCollection(collectionValues.values());\r\n public Set<String> getCollectionAllIndexes() {\r\n checkTypeForCollectionOnlyOperations();\r\n return Collections.unmodifiableSet(collectionNameToIndexMapping.keySet());\r\n if(InstanceType.STRING.equals(type) || InstanceType.NUMERICAL.equals(type))\r\n else if(InstanceType.COMPOSITE.equals(type)) {\r\n for(String partName : parts.keySet()) {\r\n ret.append(partName + \":\" + parts.get(partName) + \",\");", "signature": "OPPObjectInstance getCollectionElement(String name)" } ], "patch": "@@ -10,8 +10,6 @@\n import java.math.BigDecimal;\r\n import java.util.Collection;\r\n import java.util.Collections;\r\n-import java.util.Map;\r\n-import java.util.Map.Entry;\r\n import java.util.Set;\r\n import java.util.SortedMap;\r\n import java.util.UUID;\r\n@@ -22,73 +20,76 @@\n import com.google.common.collect.Maps;\r\n \r\n /**\r\n- * And instance of an OPM Object. An OPM object can have two primary constructs:\r\n- * it either has a value or is composite. Values can be {@link String},\r\n- * {@link BigDecimal}, or a state, which is treated pretty similarly to a\r\n- * string.\r\n+ * And instance of an OPM Object. An OPM object can have two primary constructs: it either has a value or is composite.\r\n+ * Values can be {@link String}, {@link BigDecimal}, or a state, which is treated pretty similarly to a string.\r\n * \r\n * @author Arieh 'Vainolo' Bibliowicz\r\n * \r\n */\r\n public class OPPObjectInstance {\r\n \r\n private Object value = null;\r\n- private Map<String, OPPObjectInstance> parts = Maps.newHashMap();\r\n- // private List<OPMObjectInstance> collectionValues = Lists.newArrayList();\r\n- private SortedMap<Integer, OPPObjectInstance> collectionValues = Maps.newTreeMap();\r\n- private BiMap<String, Integer> collectionNameToIndexMapping = HashBiMap.create();\r\n- public final InstanceType type;\r\n-\r\n- private OPPObjectInstance(InstanceType type) {\r\n- this.type = type;\r\n+ private SortedMap<Integer, OPPObjectInstance> compositeValues = Maps.newTreeMap();\r\n+ private BiMap<String, Integer> compositeKeyToIndexMapping = HashBiMap.create();\r\n+ public final InstanceKind kind;\r\n+ private UUID id;\r\n+\r\n+ private OPPObjectInstance(InstanceKind type) {\r\n+ this.kind = type;\r\n+ this.id = UUID.randomUUID();\r\n }\r\n \r\n- // Creation\r\n- public static OPPObjectInstance createCompositeInstance() {\r\n- return new OPPObjectInstance(InstanceType.COMPOSITE);\r\n+ public String getId() {\r\n+ return id.toString();\r\n }\r\n \r\n- public static OPPObjectInstance createCollectionInstace() {\r\n- return new OPPObjectInstance(InstanceType.COLLECTION);\r\n+ // Creation\r\n+ public static OPPObjectInstance createCompositeInstance() {\r\n+ return new OPPObjectInstance(InstanceKind.COMPOSITE);\r\n }\r\n \r\n public static OPPObjectInstance createFromValue(BigDecimal decimalValue) {\r\n Preconditions.checkNotNull(decimalValue, \"Value cannot be null.\");\r\n- OPPObjectInstance instance = new OPPObjectInstance(InstanceType.NUMERICAL);\r\n+ OPPObjectInstance instance = new OPPObjectInstance(InstanceKind.NUMERICAL);\r\n instance.setValue(decimalValue);\r\n return instance;\r\n }\r\n \r\n public static OPPObjectInstance createFromValue(String stringValue) {\r\n Preconditions.checkNotNull(stringValue, \"Value cannot be null.\");\r\n- OPPObjectInstance instance = new OPPObjectInstance(InstanceType.STRING);\r\n+ OPPObjectInstance instance = new OPPObjectInstance(InstanceKind.STRING);\r\n instance.setValue(stringValue);\r\n return instance;\r\n }\r\n \r\n+ public static OPPObjectInstance createFromValue(Object object) {\r\n+ Preconditions.checkNotNull(object);\r\n+ OPPObjectInstance instance = new OPPObjectInstance(InstanceKind.JAVA_OBJECT);\r\n+ instance.setValue(object);\r\n+ return instance;\r\n+ }\r\n+\r\n public static OPPObjectInstance createFromExistingInstance(OPPObjectInstance existingInstance) {\r\n Preconditions.checkNotNull(existingInstance, \"Existing instance cannot be null.\");\r\n OPPObjectInstance newInstance = null;\r\n- switch(existingInstance.type) {\r\n+ switch (existingInstance.kind) {\r\n case NUMERICAL:\r\n newInstance = createFromValue(existingInstance.getNumericalValue());\r\n break;\r\n case STRING:\r\n newInstance = createFromValue(existingInstance.getStringValue());\r\n break;\r\n+ case JAVA_OBJECT:\r\n+ newInstance = createFromValue(existingInstance.getValue());\r\n+ break;\r\n case COMPOSITE:\r\n newInstance = createCompositeInstance();\r\n- for(Entry<String, OPPObjectInstance> part : existingInstance.getCompositeParts()) {\r\n- newInstance.addCompositePart(part.getKey(), createFromExistingInstance(part.getValue()));\r\n+ for (Integer index : existingInstance.compositeValues.keySet()) {\r\n+ newInstance.compositeValues.put(index, existingInstance.compositeValues.get(index));\r\n+ newInstance.compositeKeyToIndexMapping.inverse().put(index, existingInstance.compositeKeyToIndexMapping.inverse().get(index));\r\n }\r\n+ default:\r\n break;\r\n- case COLLECTION:\r\n- newInstance = createCollectionInstace();\r\n- for(Integer index : existingInstance.collectionValues.keySet()) {\r\n- newInstance.collectionValues.put(index, existingInstance.collectionValues.get(index));\r\n- newInstance.collectionNameToIndexMapping.inverse().put(index,\r\n- existingInstance.collectionNameToIndexMapping.inverse().get(index));\r\n- }\r\n }\r\n \r\n return newInstance;\r\n@@ -109,20 +110,20 @@ public Object getValue() {\n \r\n public String getStringValue() {\r\n checkTypeForValueOnlyOperations();\r\n- if(InstanceType.STRING.equals(type)) {\r\n- return String.class.cast(getValue());\r\n- } else if(InstanceType.NUMERICAL.equals(type)) {\r\n- return BigDecimal.class.cast(getValue()).toString();\r\n+ if (InstanceKind.STRING.equals(kind)) {\r\n+ return (String) getValue();\r\n+ } else if (InstanceKind.NUMERICAL.equals(kind)) {\r\n+ return ((BigDecimal) getValue()).toString();\r\n } else {\r\n throw new IllegalStateException(\"Cannot fetch value of an instance that is not a value\");\r\n }\r\n }\r\n \r\n public BigDecimal getNumericalValue() {\r\n checkTypeForValueOnlyOperations();\r\n- if(InstanceType.STRING.equals(type)) {\r\n+ if (InstanceKind.STRING.equals(kind)) {\r\n return new BigDecimal(String.class.cast(getValue()));\r\n- } else if(InstanceType.NUMERICAL.equals(type)) {\r\n+ } else if (InstanceKind.NUMERICAL.equals(kind)) {\r\n return BigDecimal.class.cast(getValue());\r\n } else {\r\n throw new IllegalStateException(\"Cannot fetch value of an instance that is not a value\");\r\n@@ -133,140 +134,142 @@ public boolean isValue() {\n return value != null;\r\n }\r\n \r\n- // Composite\r\n- public void addCompositePart(String name, OPPObjectInstance part) {\r\n- checkTypeForCompositeOnlyOperations();\r\n- checkNotNull(name);\r\n- checkNotNull(part);\r\n- parts.put(name, part);\r\n- }\r\n-\r\n- public OPPObjectInstance getCompositePart(String name) {\r\n+ // Compound\r\n+ public void addFirstPart(OPPObjectInstance value) {\r\n checkTypeForCompositeOnlyOperations();\r\n- checkNotNull(name, \"Part name cannot be null\");\r\n- checkArgument(!\"\".equals(name), \"Part name cannot be empty\");\r\n- return parts.get(name);\r\n+ checkNotNull(value, \"Cannot append a null element to a collection.\");\r\n+ Integer firstKey = 0;\r\n+ if (compositeValues.size() > 0) {\r\n+ firstKey = compositeValues.firstKey();\r\n+ }\r\n+ int newKey = firstKey - 1;\r\n+ compositeValues.put(newKey, value);\r\n+ compositeKeyToIndexMapping.put(UUID.randomUUID().toString(), newKey);\r\n }\r\n \r\n- public Set<Entry<String, OPPObjectInstance>> getCompositeParts() {\r\n+ public void addLastPart(OPPObjectInstance value) {\r\n checkTypeForCompositeOnlyOperations();\r\n- return Collections.unmodifiableSet(parts.entrySet());\r\n- }\r\n-\r\n- // Collection\r\n- public int appendCollectionElement(OPPObjectInstance value) {\r\n- checkTypeForCollectionOnlyOperations();\r\n checkNotNull(value, \"Cannot append a null element to a collection.\");\r\n Integer lastKey = 0;\r\n- if(collectionValues.size() > 0) {\r\n- lastKey = collectionValues.lastKey();\r\n+ if (compositeValues.size() > 0) {\r\n+ lastKey = compositeValues.lastKey();\r\n }\r\n int newKey = lastKey + 1;\r\n- collectionValues.put(newKey, value);\r\n- collectionNameToIndexMapping.put(UUID.randomUUID().toString(), newKey);\r\n- return newKey;\r\n+ compositeValues.put(newKey, value);\r\n+ compositeKeyToIndexMapping.put(UUID.randomUUID().toString(), newKey);\r\n }\r\n \r\n- public void putCollectionElement(String name, OPPObjectInstance value) {\r\n- checkTypeForCollectionOnlyOperations();\r\n+ public void setPart(String name, OPPObjectInstance value) {\r\n+ checkTypeForCompositeOnlyOperations();\r\n checkState((name != null) && !(\"\".equals(name)), \"Named location of element must not be null or empty.\");\r\n checkNotNull(value, \"Cannot put a null element to a collection.\");\r\n- if(collectionNameToIndexMapping.containsKey(name)) {\r\n- collectionValues.remove(collectionNameToIndexMapping.get(name));\r\n- collectionNameToIndexMapping.remove(name);\r\n+ if (compositeKeyToIndexMapping.containsKey(name)) {\r\n+ compositeValues.remove(compositeKeyToIndexMapping.get(name));\r\n+ compositeKeyToIndexMapping.remove(name);\r\n }\r\n- int index = appendCollectionElement(value);\r\n- collectionNameToIndexMapping.inverse().remove(index);\r\n- collectionNameToIndexMapping.put(name, index);\r\n+ int lastKey = 0;\r\n+ if (compositeValues.size() > 0) {\r\n+ lastKey = compositeValues.lastKey();\r\n+ }\r\n+ int newKey = lastKey + 1;\r\n+ compositeValues.put(newKey, value);\r\n+ compositeKeyToIndexMapping.put(name, newKey);\r\n }\r\n \r\n- public void putCollectionElementAtIndex(int index, OPPObjectInstance value) {\r\n- checkTypeForCollectionOnlyOperations();\r\n- checkNotNull(value, \"Cannot insert a null element to a collection.\");\r\n- if(collectionValues.containsKey(index)) {\r\n- collectionValues.remove(index);\r\n- collectionNameToIndexMapping.inverse().remove(index);\r\n- }\r\n- collectionValues.put(index, value);\r\n- collectionNameToIndexMapping.put(UUID.randomUUID().toString(), index);\r\n+ public OPPObjectInstance getPart(String key) {\r\n+ checkTypeForCompositeOnlyOperations();\r\n+ checkState((key != null) && (!\"\".equals(key)), \"Key cannot be null or empty.\");\r\n+ return compositeValues.get(compositeKeyToIndexMapping.get(key));\r\n+ }\r\n \r\n+ public OPPObjectInstance getFirstPart() {\r\n+ checkTypeForCompositeOnlyOperations();\r\n+ return compositeValues.get(compositeValues.firstKey());\r\n }\r\n \r\n- public OPPObjectInstance getCollectionElement(String name) {\r\n- checkTypeForCollectionOnlyOperations();\r\n- checkState((name != null) && !(\"\".equals(name)), \"Named location of element must not be null or empty.\");\r\n- checkState(collectionNameToIndexMapping.containsKey(name), \"Collection does contain a value at index %s.\", name);\r\n- return collectionValues.get(collectionNameToIndexMapping.get(name));\r\n+ public OPPObjectInstance getLastPart() {\r\n+ checkTypeForCompositeOnlyOperations();\r\n+ return compositeValues.get(compositeValues.lastKey());\r\n }\r\n \r\n- public OPPObjectInstance getCollectionElementAtIndex(int index) {\r\n- checkTypeForCollectionOnlyOperations();\r\n- return collectionValues.get(index);\r\n+ public Collection<OPPObjectInstance> getAllParts() {\r\n+ checkTypeForCompositeOnlyOperations();\r\n+ return Collections.unmodifiableCollection(compositeValues.values());\r\n }\r\n \r\n- public OPPObjectInstance getCollectionFirstElement() {\r\n- checkTypeForCollectionOnlyOperations();\r\n- return collectionValues.get(collectionValues.firstKey());\r\n+ public Set<String> getAllPartIndexes() {\r\n+ checkTypeForCompositeOnlyOperations();\r\n+ return Collections.unmodifiableSet(compositeKeyToIndexMapping.keySet());\r\n }\r\n \r\n- public OPPObjectInstance getLastCollectionElement() {\r\n- checkTypeForCollectionOnlyOperations();\r\n- return collectionValues.get(collectionValues.lastKey());\r\n+ public void removePart(OPPObjectInstance key) {\r\n+ checkTypeForCompositeOnlyOperations();\r\n+ checkState(key != null, \"Key cannot be null.\");\r\n+ switch (key.kind) {\r\n+ case STRING:\r\n+ case NUMERICAL:\r\n+ removePart(key.getStringValue());\r\n+ break;\r\n+ case COMPOSITE:\r\n+ removePart(key.getId());\r\n+ break;\r\n+ case JAVA_OBJECT:\r\n+ throw new OPPRuntimeException(\"Java object keys are not supported.\");\r\n+ }\r\n }\r\n \r\n- public Collection<OPPObjectInstance> getCollectionAllElements() {\r\n- checkTypeForCollectionOnlyOperations();\r\n- return Collections.unmodifiableCollection(collectionValues.values());\r\n+ public void removePart(String key) {\r\n+ checkTypeForCompositeOnlyOperations();\r\n+ checkState((key != null) && (\"\".equals(key)), \"Key cannot be null or empty.\");\r\n+ Integer index = compositeKeyToIndexMapping.get(key);\r\n+ compositeValues.remove(index);\r\n+ compositeKeyToIndexMapping.remove(key);\r\n+ }\r\n+\r\n+ public OPPObjectInstance removeFirstPart() {\r\n+ checkTypeForCompositeOnlyOperations();\r\n+ Integer firstIndex = compositeValues.firstKey();\r\n+ OPPObjectInstance firstInstance = compositeValues.remove(firstIndex);\r\n+ compositeKeyToIndexMapping.inverse().remove(firstIndex);\r\n+ return firstInstance;\r\n }\r\n \r\n- public Set<String> getCollectionAllIndexes() {\r\n- checkTypeForCollectionOnlyOperations();\r\n- return Collections.unmodifiableSet(collectionNameToIndexMapping.keySet());\r\n+ public OPPObjectInstance removeLastPart() {\r\n+ checkTypeForCompositeOnlyOperations();\r\n+ Integer lastIndex = compositeValues.lastKey();\r\n+ OPPObjectInstance lastInstance = compositeValues.remove(lastIndex);\r\n+ compositeKeyToIndexMapping.inverse().remove(lastIndex);\r\n+ return lastInstance;\r\n }\r\n \r\n // General\r\n @Override\r\n public String toString() {\r\n- if(InstanceType.STRING.equals(type) || InstanceType.NUMERICAL.equals(type))\r\n+ if (InstanceKind.STRING.equals(kind) || InstanceKind.NUMERICAL.equals(kind)) {\r\n return value.toString();\r\n- else if(InstanceType.COMPOSITE.equals(type)) {\r\n+ } else if (InstanceKind.COMPOSITE.equals(kind)) {\r\n StringBuilder ret = new StringBuilder(\"{\");\r\n- for(String partName : parts.keySet()) {\r\n- ret.append(partName + \":\" + parts.get(partName) + \",\");\r\n- }\r\n- ret.replace(ret.length() - 1, ret.length(), \"}\");\r\n- return ret.toString();\r\n- } else if(InstanceType.COLLECTION.equals(type)) {\r\n- StringBuilder ret = new StringBuilder(\"[\");\r\n- for(OPPObjectInstance element : collectionValues.values()) {\r\n- ret.append(element.toString() + \",\");\r\n+ for (Integer index : compositeValues.keySet()) {\r\n+ ret.append(compositeKeyToIndexMapping.inverse().get(index).toString() + \":\" + compositeValues.get(index).toString() + \",\");\r\n }\r\n- if(ret.length() > 2)\r\n- ret.replace(ret.length() - 1, ret.length(), \"]\");\r\n+ if (ret.length() > 2)\r\n+ ret.replace(ret.length() - 1, ret.length(), \"}\");\r\n return ret.toString();\r\n } else {\r\n return super.toString();\r\n }\r\n }\r\n \r\n private void checkTypeForValueOnlyOperations() {\r\n- checkState(!InstanceType.COLLECTION.equals(type),\r\n- \"Instance is a collection but operation is only valid for value instances.\");\r\n- checkState(!InstanceType.COMPOSITE.equals(type),\r\n- \"Instance is a collection but operation is only valid for value instances.\");\r\n+ checkState(!InstanceKind.COMPOSITE.equals(kind), \"Instance is a collection but operation is only valid for value instances.\");\r\n }\r\n \r\n private void checkTypeForCompositeOnlyOperations() {\r\n- checkState(InstanceType.COMPOSITE.equals(type), \"Composite operations can only be applied to composite instances.\");\r\n- }\r\n-\r\n- private void checkTypeForCollectionOnlyOperations() {\r\n- checkState(InstanceType.COLLECTION.equals(type),\r\n- \"Collection operations can only be applied to collection instances.\");\r\n+ checkState(InstanceKind.COMPOSITE.equals(kind), \"Collection operations can only be applied to collection instances.\");\r\n }\r\n \r\n- public enum InstanceType {\r\n- NUMERICAL, STRING, COMPOSITE, COLLECTION;\r\n+ public enum InstanceKind {\r\n+ NUMERICAL, STRING, JAVA_OBJECT, COMPOSITE;\r\n }\r\n \r\n }\r", "raw_url": "https://github.com/vainolo/Object-Process-Programming/raw/c8c3080c49e883f01a64afc8119c041a889f82d4/com.vainolo.phd.opp.interpreter%2Fsrc%2Fcom%2Fvainolo%2Fphd%2Fopp%2Finterpreter%2FOPPObjectInstance.java", "sha": "705a5770a9fa3ef16a1324e90fb776c19a66c18b", "status": "modified" }, { "additions": 24, "blob_url": "https://github.com/vainolo/Object-Process-Programming/blob/c8c3080c49e883f01a64afc8119c041a889f82d4/com.vainolo.phd.opp.interpreter%2Fsrc%2Fcom%2Fvainolo%2Fphd%2Fopp%2Finterpreter%2FOPPObjectInstanceValueAnalyzer.java", "changes": 49, "contents_url": "https://api.github.com/repos/vainolo/Object-Process-Programming/contents/com.vainolo.phd.opp.interpreter%2Fsrc%2Fcom%2Fvainolo%2Fphd%2Fopp%2Finterpreter%2FOPPObjectInstanceValueAnalyzer.java?ref=c8c3080c49e883f01a64afc8119c041a889f82d4", "deletions": 25, "filename": "com.vainolo.phd.opp.interpreter/src/com/vainolo/phd/opp/interpreter/OPPObjectInstanceValueAnalyzer.java", "new_code": " if (value.startsWith(\"\\\"\") || value.startsWith(\"'\"))\r\n if (start <= end) {\r\n for (int i = start; i <= end; i++) {\r\n for (int i = start; i >= end; i--) {\r\n if (objectName != null && !\"\".equals(objectName)) {\r\n if (isStringLiteral(objectName)) {\r\n } else if (isNumericalLiteral(objectName)) {\r\n } else if (isCollectionLiteral(objectName)) {\r\n objectInstance = OPPObjectInstance.createCompositeInstance();\r\n for (BigDecimal value : parseCollectionLiteral(objectName)) {\r\n objectInstance.addLastPart(OPPObjectInstance.createFromValue(value));\r\n for (OPPState state : states) {\r\n if (state.isValue()) {\r\n if (isStringLiteral(value)) {\r\n } else if (isNumericalLiteral(value)) {\r\n } else if (isCollectionLiteral(value)) {\r\n objectInstance = OPPObjectInstance.createCompositeInstance();\r\n for (BigDecimal v : parseCollectionLiteral(value)) {\r\n objectInstance.addLastPart(OPPObjectInstance.createFromValue(v));\r\n if (isNumericalLiteral(stateName)) {\r\n switch (split[1]) {\r\n if (instance == null) {\r\n if (isStringLiteral(state.getName()) || state.getName().matches(\"[a-zA-Z]+\")) {\r\n return (parseStringLiteral(state.getName()).equals(instance.getValue()) || state.getName().equals(instance.getValue()));\r", "new_methods": [], "old_code": " if(value.startsWith(\"\\\"\") || value.startsWith(\"'\"))\r\n if(start <= end) {\r\n for(int i = start; i <= end; i++) {\r\n for(int i = start; i >= end; i--) {\r\n if(objectName != null && !\"\".equals(objectName)) {\r\n if(isStringLiteral(objectName)) {\r\n } else if(isNumericalLiteral(objectName)) {\r\n } else if(isCollectionLiteral(objectName)) {\r\n objectInstance = OPPObjectInstance.createCollectionInstace();\r\n for(BigDecimal value : parseCollectionLiteral(objectName)) {\r\n objectInstance.appendCollectionElement(OPPObjectInstance.createFromValue(value));\r\n for(OPPState state : states) {\r\n if(state.isValue()) {\r\n if(isStringLiteral(value)) {\r\n } else if(isNumericalLiteral(value)) {\r\n } else if(isCollectionLiteral(value)) {\r\n objectInstance = OPPObjectInstance.createCollectionInstace();\r\n for(BigDecimal v : parseCollectionLiteral(value)) {\r\n objectInstance.appendCollectionElement(OPPObjectInstance.createFromValue(v));\r\n if(isNumericalLiteral(stateName)) {\r\n switch(split[1]) {\r\n if(instance == null) {\r\n if(isStringLiteral(state.getName()) || state.getName().matches(\"[a-zA-Z]+\")) {\r\n return (parseStringLiteral(state.getName()).equals(instance.getValue()) || state.getName().equals(\r\n instance.getValue()));\r", "old_methods": [], "patch": "@@ -35,7 +35,7 @@ public class OPPObjectInstanceValueAnalyzer {\n * <code>false</code> otherwise.\r\n */\r\n public boolean isStringLiteral(String value) {\r\n- if(value.startsWith(\"\\\"\") || value.startsWith(\"'\"))\r\n+ if (value.startsWith(\"\\\"\") || value.startsWith(\"'\"))\r\n return true;\r\n else\r\n return false;\r\n@@ -97,12 +97,12 @@ public List<BigDecimal> parseCollectionLiteral(String literal) {\n String[] indices = literal.split(\"\\\\.\\\\.\");\r\n int start = Integer.parseInt(indices[0]);\r\n int end = Integer.parseInt(indices[1]);\r\n- if(start <= end) {\r\n- for(int i = start; i <= end; i++) {\r\n+ if (start <= end) {\r\n+ for (int i = start; i <= end; i++) {\r\n collection.add(new BigDecimal(i));\r\n }\r\n } else {\r\n- for(int i = start; i >= end; i--) {\r\n+ for (int i = start; i >= end; i--) {\r\n collection.add(new BigDecimal(i));\r\n }\r\n }\r\n@@ -123,21 +123,21 @@ public OPPObjectInstance calculateOPMObjectValue(OPPObject object, OPPOPDAnalyze\n OPPObjectInstance objectInstance = null;\r\n \r\n String objectName = object.getName();\r\n- if(objectName != null && !\"\".equals(objectName)) {\r\n- if(isStringLiteral(objectName)) {\r\n+ if (objectName != null && !\"\".equals(objectName)) {\r\n+ if (isStringLiteral(objectName)) {\r\n objectInstance = OPPObjectInstance.createFromValue(parseStringLiteral(objectName));\r\n- } else if(isNumericalLiteral(objectName)) {\r\n+ } else if (isNumericalLiteral(objectName)) {\r\n objectInstance = OPPObjectInstance.createFromValue(parseNumericalLiteral(objectName));\r\n- } else if(isCollectionLiteral(objectName)) {\r\n- objectInstance = OPPObjectInstance.createCollectionInstace();\r\n- for(BigDecimal value : parseCollectionLiteral(objectName)) {\r\n- objectInstance.appendCollectionElement(OPPObjectInstance.createFromValue(value));\r\n+ } else if (isCollectionLiteral(objectName)) {\r\n+ objectInstance = OPPObjectInstance.createCompositeInstance();\r\n+ for (BigDecimal value : parseCollectionLiteral(objectName)) {\r\n+ objectInstance.addLastPart(OPPObjectInstance.createFromValue(value));\r\n }\r\n }\r\n } else {\r\n Collection<OPPState> states = analyzer.findStates(object);\r\n- for(OPPState state : states) {\r\n- if(state.isValue()) {\r\n+ for (OPPState state : states) {\r\n+ if (state.isValue()) {\r\n objectInstance = OPPObjectInstance.createFromValue(state.getName());\r\n }\r\n }\r\n@@ -159,14 +159,14 @@ public OPPObjectInstance calculateOPMObjectValue(String value) {\n logFinest(\"Calculating value of {0}.\", value);\r\n checkArgument((value != null) && (!\"\".equals(value)), \"Value cannot be null or empty.\");\r\n OPPObjectInstance objectInstance = null;\r\n- if(isStringLiteral(value)) {\r\n+ if (isStringLiteral(value)) {\r\n objectInstance = OPPObjectInstance.createFromValue(parseStringLiteral(value));\r\n- } else if(isNumericalLiteral(value)) {\r\n+ } else if (isNumericalLiteral(value)) {\r\n objectInstance = OPPObjectInstance.createFromValue(parseNumericalLiteral(value));\r\n- } else if(isCollectionLiteral(value)) {\r\n- objectInstance = OPPObjectInstance.createCollectionInstace();\r\n- for(BigDecimal v : parseCollectionLiteral(value)) {\r\n- objectInstance.appendCollectionElement(OPPObjectInstance.createFromValue(v));\r\n+ } else if (isCollectionLiteral(value)) {\r\n+ objectInstance = OPPObjectInstance.createCompositeInstance();\r\n+ for (BigDecimal v : parseCollectionLiteral(value)) {\r\n+ objectInstance.addLastPart(OPPObjectInstance.createFromValue(v));\r\n }\r\n } else {\r\n logInfo(\"Assume this is a string with no enclosing quotes.\");\r\n@@ -188,15 +188,15 @@ public OPPObjectInstance calculateOPMObjectValue(String value) {\n */\r\n public boolean isObjectNumericalValueInState(String stateName, BigDecimal value) {\r\n logFinest(\"Checking numerical state {0} against value {1}.\", stateName, value);\r\n- if(isNumericalLiteral(stateName)) {\r\n+ if (isNumericalLiteral(stateName)) {\r\n return parseNumericalLiteral(stateName).equals(value);\r\n } else {\r\n // state name is a numerical logical expression\r\n // supported expressions are: x < NUM, x <= NUM, x > NUM, x >= NUM. Spaces\r\n // are MANDATORY\r\n String[] split = stateName.split(\" \");\r\n BigDecimal number = new BigDecimal(split[2]);\r\n- switch(split[1]) {\r\n+ switch (split[1]) {\r\n case \"<\":\r\n return value.compareTo(number) == -1;\r\n case \"<=\":\r\n@@ -234,12 +234,11 @@ public boolean isObjectNumericalValueInState(String stateName, BigDecimal value)\n * false</code> otherwise.\r\n */\r\n public boolean isObjectInstanceInState(OPPObjectInstance instance, OPPState state) {\r\n- if(instance == null) {\r\n+ if (instance == null) {\r\n return false;\r\n }\r\n- if(isStringLiteral(state.getName()) || state.getName().matches(\"[a-zA-Z]+\")) {\r\n- return (parseStringLiteral(state.getName()).equals(instance.getValue()) || state.getName().equals(\r\n- instance.getValue()));\r\n+ if (isStringLiteral(state.getName()) || state.getName().matches(\"[a-zA-Z]+\")) {\r\n+ return (parseStringLiteral(state.getName()).equals(instance.getValue()) || state.getName().equals(instance.getValue()));\r\n } else {\r\n return isObjectNumericalValueInState(state.getName(), BigDecimal.class.cast(instance.getValue()));\r\n }\r", "raw_url": "https://github.com/vainolo/Object-Process-Programming/raw/c8c3080c49e883f01a64afc8119c041a889f82d4/com.vainolo.phd.opp.interpreter%2Fsrc%2Fcom%2Fvainolo%2Fphd%2Fopp%2Finterpreter%2FOPPObjectInstanceValueAnalyzer.java", "sha": "345ff02d8b7b847bb0b87abc502a98964e230e63", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/vainolo/Object-Process-Programming/blob/c8c3080c49e883f01a64afc8119c041a889f82d4/com.vainolo.phd.opp.interpreter%2Fsrc%2Fcom%2Fvainolo%2Fphd%2Fopp%2Finterpreter%2FOPPParameter.java", "changes": 8, "contents_url": "https://api.github.com/repos/vainolo/Object-Process-Programming/contents/com.vainolo.phd.opp.interpreter%2Fsrc%2Fcom%2Fvainolo%2Fphd%2Fopp%2Finterpreter%2FOPPParameter.java?ref=c8c3080c49e883f01a64afc8119c041a889f82d4", "deletions": 7, "filename": "com.vainolo.phd.opp.interpreter/src/com/vainolo/phd/opp/interpreter/OPPParameter.java", "new_code": " public OPPParameter(String name) {\r", "new_methods": [], "old_code": " public OPPParameter(String name, boolean isCollection) {\r\n this.isCollection = isCollection;\r\n\r\n public boolean isCollection() {\r\n return isCollection;\r\n }\r\n\r", "old_methods": [ { "arguments": [ "String name", " boolean isCollection" ], "filename": "com.vainolo.phd.opp.interpreter/src/com/vainolo/phd/opp/interpreter/OPPParameter.java", "implementation": "this.isCollection = isCollection;\r\n\r\n public boolean isCollection() {\r\n return isCollection;", "signature": "public OPPParameter(String name, boolean isCollection)" } ], "patch": "@@ -4,17 +4,11 @@ public class OPPParameter {\n String name;\r\n boolean isCollection;\r\n \r\n- public OPPParameter(String name, boolean isCollection) {\r\n+ public OPPParameter(String name) {\r\n this.name = name;\r\n- this.isCollection = isCollection;\r\n }\r\n \r\n public String getName() {\r\n return name;\r\n }\r\n-\r\n- public boolean isCollection() {\r\n- return isCollection;\r\n- }\r\n-\r\n }\n\\ No newline at end of file", "raw_url": "https://github.com/vainolo/Object-Process-Programming/raw/c8c3080c49e883f01a64afc8119c041a889f82d4/com.vainolo.phd.opp.interpreter%2Fsrc%2Fcom%2Fvainolo%2Fphd%2Fopp%2Finterpreter%2FOPPParameter.java", "sha": "ba7ee5eeade749170441765d64b53d513af9e5e8", "status": "modified" }, { "additions": 2, "blob_url": "https://github.com/vainolo/Object-Process-Programming/blob/c8c3080c49e883f01a64afc8119c041a889f82d4/com.vainolo.phd.opp.interpreter%2Fsrc%2Fcom%2Fvainolo%2Fphd%2Fopp%2Finterpreter%2FOPPProcessInstance.java", "changes": 12, "contents_url": "https://api.github.com/repos/vainolo/Object-Process-Programming/contents/com.vainolo.phd.opp.interpreter%2Fsrc%2Fcom%2Fvainolo%2Fphd%2Fopp%2Finterpreter%2FOPPProcessInstance.java?ref=c8c3080c49e883f01a64afc8119c041a889f82d4", "deletions": 10, "filename": "com.vainolo.phd.opp.interpreter/src/com/vainolo/phd/opp/interpreter/OPPProcessInstance.java", "new_code": " List<OPPParameter> getIncomingParameters();\r\n List<OPPParameter> getOutgoingParameters();\r", "new_methods": [], "old_code": " List<OPPParameter> getIncomingParameterNames();\r\n List<OPPParameter> getOutgoingParameterNames();\r\n\r\n /**\r\n * Check if the instance is ready for execution\r\n * \r\n * @return <code>true</code> if all required parameters are available,\r\n * <code>false</code> otherwise.\r\n */\r\n boolean isReady();\r", "old_methods": [], "patch": "@@ -44,15 +44,15 @@ public interface OPPProcessInstance extends Callable<OPPProcessExecutionResult>\n * \r\n * @return a list of the incoming parameter names.\r\n */\r\n- List<OPPParameter> getIncomingParameterNames();\r\n+ List<OPPParameter> getIncomingParameters();\r\n \r\n /**\r\n * Get a list of the names of all the outgoing parameters of this\r\n * {@link OPPProcessInstance}.\r\n * \r\n * @return a list of the outgoing parameter names.\r\n */\r\n- List<OPPParameter> getOutgoingParameterNames();\r\n+ List<OPPParameter> getOutgoingParameters();\r\n \r\n /**\r\n * Get the name of the OPD/Process\r\n@@ -65,12 +65,4 @@ public interface OPPProcessInstance extends Callable<OPPProcessExecutionResult>\n * Set the name of the Process.\r\n */\r\n void setName(String name);\r\n-\r\n- /**\r\n- * Check if the instance is ready for execution\r\n- * \r\n- * @return <code>true</code> if all required parameters are available,\r\n- * <code>false</code> otherwise.\r\n- */\r\n- boolean isReady();\r\n }\r", "raw_url": "https://github.com/vainolo/Object-Process-Programming/raw/c8c3080c49e883f01a64afc8119c041a889f82d4/com.vainolo.phd.opp.interpreter%2Fsrc%2Fcom%2Fvainolo%2Fphd%2Fopp%2Finterpreter%2FOPPProcessInstance.java", "sha": "b4e6204c3d1150d56ad74226ab289349902bd394", "status": "modified" }, { "additions": 21, "blob_url": "https://github.com/vainolo/Object-Process-Programming/blob/c8c3080c49e883f01a64afc8119c041a889f82d4/com.vainolo.phd.opp.interpreter%2Fsrc%2Fcom%2Fvainolo%2Fphd%2Fopp%2Finterpreter%2FOPPProcessInstanceFactory.java", "changes": 44, "contents_url": "https://api.github.com/repos/vainolo/Object-Process-Programming/contents/com.vainolo.phd.opp.interpreter%2Fsrc%2Fcom%2Fvainolo%2Fphd%2Fopp%2Finterpreter%2FOPPProcessInstanceFactory.java?ref=c8c3080c49e883f01a64afc8119c041a889f82d4", "deletions": 23, "filename": "com.vainolo.phd.opp.interpreter/src/com/vainolo/phd/opp/interpreter/OPPProcessInstanceFactory.java", "new_code": "import com.vainolo.phd.opp.interpreter.builtin.OPPBinaryMathOpProcessInstance.OPPBinaryMathOpType;\r\n switch (opd.getKind()) {\r\n OPPObjectProcessDiagram opd = OPPFileUtils.loadOPPFile(OPPInterpreter.container.getFile(new Path(opdName + \".opp\")).getFullPath().toString());\r\n switch (process.getKind()) {\r\n if (process.getName().equals(\"Input\")) {\r\n } else if (process.getName().equals(\"Output\") || process.getName().equals(\"Dialog\") || process.getName().equals(\"Print\")) {\r\n } else if (process.getName().equals(\"+\")) {\r\n processInstance = new OPPBinaryMathOpProcessInstance(OPPBinaryMathOpType.ADD);\r\n } else if (process.getName().equals(\"-\")) {\r\n processInstance = new OPPBinaryMathOpProcessInstance(OPPBinaryMathOpType.SUBS);\r\n } else if (process.getName().equals(\"*\")) {\r\n } else if (process.getName().equals(\"/\")) {\r\n } else if (process.getName().equals(\"^\")) {\r\n } else if (process.getName().equals(\"Sleep\")) {\r\n } else if (process.getName().equals(\"Hello World\")) {\r\n } else if (process.getName().equals(\"Create\") || process.getName().equals(\"New\")) {\r\n } else if (process.getName().equals(\"<=\")) {\r\n } else if (process.getName().equals(\">=\")) {\r\n } else if (process.getName().equals(\">\")) {\r\n } else if (process.getName().equals(\"<\")) {\r\n } else if (process.getName().equals(\"==\")) {\r", "new_methods": [], "old_code": "import com.vainolo.phd.opp.interpreter.builtin.OPPBinaryMathOpType;\r\n switch(opd.getKind()) {\r\n OPPObjectProcessDiagram opd = OPPFileUtils.loadOPPFile(OPPInterpreter.container.getFile(new Path(opdName + \".opm\"))\r\n .getFullPath().toString());\r\n switch(process.getKind()) {\r\n if(process.getName().equals(\"Input\")) {\r\n } else if(process.getName().equals(\"Output\") || process.getName().equals(\"Dialog\")\r\n || process.getName().equals(\"Print\")) {\r\n } else if(process.getName().equals(\"+\")) {\r\n processInstance = new OPPBinaryMathOpProcessInstance(OPPBinaryMathOpType.ADD);// OPMAddProcessInstance();\r\n } else if(process.getName().equals(\"-\")) {\r\n processInstance = new OPPBinaryMathOpProcessInstance(OPPBinaryMathOpType.SUBS);// OPMSubstractProcessInstance();\r\n } else if(process.getName().equals(\"*\")) {\r\n } else if(process.getName().equals(\"/\")) {\r\n } else if(process.getName().equals(\"^\")) {\r\n } else if(process.getName().equals(\"Sleep\")) {\r\n } else if(process.getName().equals(\"Hello World\")) {\r\n } else if(process.getName().equals(\"Create\") || process.getName().equals(\"New\")) {\r\n } else if(process.getName().equals(\"<=\")) {\r\n } else if(process.getName().equals(\">=\")) {\r\n } else if(process.getName().equals(\">\")) {\r\n } else if(process.getName().equals(\"<\")) {\r\n } else if(process.getName().equals(\"==\")) {\r", "old_methods": [], "patch": "@@ -9,7 +9,7 @@\n \r\n import org.eclipse.core.runtime.Path;\r\n \r\n-import com.vainolo.phd.opp.interpreter.builtin.OPPBinaryMathOpType;\r\n+import com.vainolo.phd.opp.interpreter.builtin.OPPBinaryMathOpProcessInstance.OPPBinaryMathOpType;\r\n import com.vainolo.phd.opp.interpreter.builtin.OPPBinaryMathOpProcessInstance;\r\n import com.vainolo.phd.opp.interpreter.builtin.OPPCompareProcessInstance;\r\n import com.vainolo.phd.opp.interpreter.builtin.OPPConceptualProcess;\r\n@@ -28,7 +28,7 @@\n public class OPPProcessInstanceFactory {\r\n \r\n public static OPPProcessInstance createExecutableInstance(OPPObjectProcessDiagram opd) {\r\n- switch(opd.getKind()) {\r\n+ switch (opd.getKind()) {\r\n case COMPOUND:\r\n return new OPPInZoomedProcessExecutableInstance(opd, new OPPOPDAnalyzer());\r\n case UNFOLDED:\r\n@@ -42,15 +42,14 @@ public static OPPProcessInstance createExecutableInstance(OPPObjectProcessDiagra\n }\r\n \r\n public static OPPProcessInstance createExecutableInstance(String opdName) {\r\n- OPPObjectProcessDiagram opd = OPPFileUtils.loadOPPFile(OPPInterpreter.container.getFile(new Path(opdName + \".opm\"))\r\n- .getFullPath().toString());\r\n+ OPPObjectProcessDiagram opd = OPPFileUtils.loadOPPFile(OPPInterpreter.container.getFile(new Path(opdName + \".opp\")).getFullPath().toString());\r\n return createExecutableInstance(opd);\r\n \r\n }\r\n \r\n public static OPPProcessInstance createExecutableInstance(OPPProcess process) {\r\n OPPProcessInstance executableInstance = null;\r\n- switch(process.getKind()) {\r\n+ switch (process.getKind()) {\r\n case BUILT_IN:\r\n executableInstance = createBuiltInProcess(process);\r\n break;\r\n@@ -71,38 +70,37 @@ public static OPPProcessInstance createExecutableInstance(OPPProcess process) {\n private static OPPProcessInstance createBuiltInProcess(final OPPProcess process) {\r\n OPPProcessInstance processInstance;\r\n \r\n- if(process.getName().equals(\"Input\")) {\r\n+ if (process.getName().equals(\"Input\")) {\r\n processInstance = OPPInterpreterInjector.INSTANCE.getInstance(OPPInputProcessInstance.class);\r\n- } else if(process.getName().equals(\"Output\") || process.getName().equals(\"Dialog\")\r\n- || process.getName().equals(\"Print\")) {\r\n+ } else if (process.getName().equals(\"Output\") || process.getName().equals(\"Dialog\") || process.getName().equals(\"Print\")) {\r\n processInstance = new OPPOutputProcessInstance();\r\n processInstance.setName(process.getName());\r\n- } else if(process.getName().equals(\"+\")) {\r\n- processInstance = new OPPBinaryMathOpProcessInstance(OPPBinaryMathOpType.ADD);// OPMAddProcessInstance();\r\n- } else if(process.getName().equals(\"-\")) {\r\n- processInstance = new OPPBinaryMathOpProcessInstance(OPPBinaryMathOpType.SUBS);// OPMSubstractProcessInstance();\r\n- } else if(process.getName().equals(\"*\")) {\r\n+ } else if (process.getName().equals(\"+\")) {\r\n+ processInstance = new OPPBinaryMathOpProcessInstance(OPPBinaryMathOpType.ADD);\r\n+ } else if (process.getName().equals(\"-\")) {\r\n+ processInstance = new OPPBinaryMathOpProcessInstance(OPPBinaryMathOpType.SUBS);\r\n+ } else if (process.getName().equals(\"*\")) {\r\n processInstance = new OPPBinaryMathOpProcessInstance(OPPBinaryMathOpType.MULT);\r\n- } else if(process.getName().equals(\"/\")) {\r\n+ } else if (process.getName().equals(\"/\")) {\r\n processInstance = new OPPBinaryMathOpProcessInstance(OPPBinaryMathOpType.DIV);\r\n- } else if(process.getName().equals(\"^\")) {\r\n+ } else if (process.getName().equals(\"^\")) {\r\n processInstance = new OPPBinaryMathOpProcessInstance(OPPBinaryMathOpType.POW);\r\n- } else if(process.getName().equals(\"Sleep\")) {\r\n+ } else if (process.getName().equals(\"Sleep\")) {\r\n processInstance = new OPPSleepProcessInstance();\r\n processInstance.setName(process.getName());\r\n- } else if(process.getName().equals(\"Hello World\")) {\r\n+ } else if (process.getName().equals(\"Hello World\")) {\r\n processInstance = new OPPPrintHelloWorldProcessInstance();\r\n- } else if(process.getName().equals(\"Create\") || process.getName().equals(\"New\")) {\r\n+ } else if (process.getName().equals(\"Create\") || process.getName().equals(\"New\")) {\r\n processInstance = new OPPCreateObjectProcessInstance();\r\n- } else if(process.getName().equals(\"<=\")) {\r\n+ } else if (process.getName().equals(\"<=\")) {\r\n processInstance = new OPPCompareProcessInstance(ComparisonType.LESS_THAN_OR_EQUAL);\r\n- } else if(process.getName().equals(\">=\")) {\r\n+ } else if (process.getName().equals(\">=\")) {\r\n processInstance = new OPPCompareProcessInstance(ComparisonType.GREATER_THAN_OR_EQUAL);\r\n- } else if(process.getName().equals(\">\")) {\r\n+ } else if (process.getName().equals(\">\")) {\r\n processInstance = new OPPCompareProcessInstance(ComparisonType.GREATER_THAN);\r\n- } else if(process.getName().equals(\"<\")) {\r\n+ } else if (process.getName().equals(\"<\")) {\r\n processInstance = new OPPCompareProcessInstance(ComparisonType.LESS_THAN);\r\n- } else if(process.getName().equals(\"==\")) {\r\n+ } else if (process.getName().equals(\"==\")) {\r\n processInstance = new OPPCompareProcessInstance(ComparisonType.EQUAL);\r\n } else {\r\n throw new IllegalStateException(\"Tried to create unexistent build-in process \" + process.getName());\r", "raw_url": "https://github.com/vainolo/Object-Process-Programming/raw/c8c3080c49e883f01a64afc8119c041a889f82d4/com.vainolo.phd.opp.interpreter%2Fsrc%2Fcom%2Fvainolo%2Fphd%2Fopp%2Finterpreter%2FOPPProcessInstanceFactory.java", "sha": "9f7b4d1e4bce3bec1d7c519ce5b90e683264c7e7", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/vainolo/Object-Process-Programming/blob/c8c3080c49e883f01a64afc8119c041a889f82d4/com.vainolo.phd.opp.interpreter%2Fsrc%2Fcom%2Fvainolo%2Fphd%2Fopp%2Finterpreter%2FOPPProcessInstanceHeap.java", "changes": 2, "contents_url": "https://api.github.com/repos/vainolo/Object-Process-Programming/contents/com.vainolo.phd.opp.interpreter%2Fsrc%2Fcom%2Fvainolo%2Fphd%2Fopp%2Finterpreter%2FOPPProcessInstanceHeap.java?ref=c8c3080c49e883f01a64afc8119c041a889f82d4", "deletions": 1, "filename": "com.vainolo.phd.opp.interpreter/src/com/vainolo/phd/opp/interpreter/OPPProcessInstanceHeap.java", "new_code": " if (value == null)\r", "new_methods": [], "old_code": " if(value == null)\r", "old_methods": [], "patch": "@@ -15,7 +15,7 @@ public OPPProcessInstanceHeap() {\n \r\n public void addArgument(String name, OPPObjectInstance value) {\r\n logFinest(\"Setting argument {0} with value {1}.\", name, value);\r\n- if(value == null)\r\n+ if (value == null)\r\n return;\r\n arguments.put(name.toLowerCase(), OPPObjectInstance.createFromExistingInstance(value));\r\n }\r", "raw_url": "https://github.com/vainolo/Object-Process-Programming/raw/c8c3080c49e883f01a64afc8119c041a889f82d4/com.vainolo.phd.opp.interpreter%2Fsrc%2Fcom%2Fvainolo%2Fphd%2Fopp%2Finterpreter%2FOPPProcessInstanceHeap.java", "sha": "36e2e26c2499fb9be3f3adf2eaac461e096dee77", "status": "modified" }, { "additions": 8, "blob_url": "https://github.com/vainolo/Object-Process-Programming/blob/c8c3080c49e883f01a64afc8119c041a889f82d4/com.vainolo.phd.opp.interpreter%2Fsrc%2Fcom%2Fvainolo%2Fphd%2Fopp%2Finterpreter%2FOPPRuntimeException.java", "changes": 8, "contents_url": "https://api.github.com/repos/vainolo/Object-Process-Programming/contents/com.vainolo.phd.opp.interpreter%2Fsrc%2Fcom%2Fvainolo%2Fphd%2Fopp%2Finterpreter%2FOPPRuntimeException.java?ref=c8c3080c49e883f01a64afc8119c041a889f82d4", "deletions": 0, "filename": "com.vainolo.phd.opp.interpreter/src/com/vainolo/phd/opp/interpreter/OPPRuntimeException.java", "new_code": "\r\n public OPPRuntimeException() {\r\n super();\r\n }\r\n\r\n public OPPRuntimeException(String message) {\r\n super(message);\r\n }\r", "new_methods": [ { "arguments": [], "filename": "com.vainolo.phd.opp.interpreter/src/com/vainolo/phd/opp/interpreter/OPPRuntimeException.java", "implementation": "super();", "signature": "public OPPRuntimeException()" }, { "arguments": [ "String message" ], "filename": "com.vainolo.phd.opp.interpreter/src/com/vainolo/phd/opp/interpreter/OPPRuntimeException.java", "implementation": "super(message);", "signature": "public OPPRuntimeException(String message)" } ], "old_code": "", "old_methods": [], "patch": "@@ -14,4 +14,12 @@ public class OPPRuntimeException extends RuntimeException {\n public OPPRuntimeException(Throwable cause) {\r\n super(cause);\r\n }\r\n+\r\n+ public OPPRuntimeException() {\r\n+ super();\r\n+ }\r\n+\r\n+ public OPPRuntimeException(String message) {\r\n+ super(message);\r\n+ }\r\n }\r", "raw_url": "https://github.com/vainolo/Object-Process-Programming/raw/c8c3080c49e883f01a64afc8119c041a889f82d4/com.vainolo.phd.opp.interpreter%2Fsrc%2Fcom%2Fvainolo%2Fphd%2Fopp%2Finterpreter%2FOPPRuntimeException.java", "sha": "c384fcbef45318f20073972633f3db9778cebef6", "status": "modified" }, { "additions": 24, "blob_url": "https://github.com/vainolo/Object-Process-Programming/blob/c8c3080c49e883f01a64afc8119c041a889f82d4/com.vainolo.phd.opp.interpreter%2Fsrc%2Fcom%2Fvainolo%2Fphd%2Fopp%2Finterpreter%2Fbuiltin%2FOPPBinaryMathOpProcessInstance.java", "changes": 32, "contents_url": "https://api.github.com/repos/vainolo/Object-Process-Programming/contents/com.vainolo.phd.opp.interpreter%2Fsrc%2Fcom%2Fvainolo%2Fphd%2Fopp%2Finterpreter%2Fbuiltin%2FOPPBinaryMathOpProcessInstance.java?ref=c8c3080c49e883f01a64afc8119c041a889f82d4", "deletions": 8, "filename": "com.vainolo.phd.opp.interpreter/src/com/vainolo/phd/opp/interpreter/builtin/OPPBinaryMathOpProcessInstance.java", "new_code": " switch (opType) {\r\n public List<OPPParameter> getIncomingParameters() {\r\n return Lists.newArrayList(new OPPParameter(\"a\"), new OPPParameter(\"b\"));\r\n public List<OPPParameter> getOutgoingParameters() {\r\n return Lists.newArrayList(new OPPParameter(\"c\"));\r\n public static enum OPPBinaryMathOpType {\r\n ADD, SUBS, MULT, DIV, POW;\r\n\r\n public String getName() {\r\n switch (this) {\r\n case ADD:\r\n return \"Add\";\r\n case SUBS:\r\n return \"Subtract\";\r\n case MULT:\r\n return \"Multiply\";\r\n case DIV:\r\n return \"Divide\";\r\n case POW:\r\n return \"Power\";\r\n }\r\n throw new IllegalStateException(\"This should NEVER happen!\");\r\n }\r\n\r", "new_methods": [ { "arguments": [], "filename": "com.vainolo.phd.opp.interpreter/src/com/vainolo/phd/opp/interpreter/builtin/OPPBinaryMathOpProcessInstance.java", "implementation": "switch (this) {\r\n case ADD:\r\n return \"Add\";\r\n case SUBS:\r\n return \"Subtract\";\r\n case MULT:\r\n return \"Multiply\";\r\n case DIV:\r\n return \"Divide\";\r\n case POW:\r\n return \"Power\";", "signature": "String getName()" } ], "old_code": " switch(opType) {\r\n public boolean isReady() {\r\n return (getArgument(\"a\") != null) && (getArgument(\"b\") != null);\r\n public List<OPPParameter> getIncomingParameterNames() {\r\n return Lists.newArrayList(new OPPParameter(\"a\", false), new OPPParameter(\"b\", false));\r\n @Override\r\n public List<OPPParameter> getOutgoingParameterNames() {\r\n return Lists.newArrayList(new OPPParameter(\"c\", false));\r", "old_methods": [], "patch": "@@ -24,7 +24,7 @@ public void executing() {\n BigDecimal a = getArgument(\"a\").getNumericalValue();\r\n BigDecimal b = getArgument(\"b\").getNumericalValue();\r\n BigDecimal c = null;\r\n- switch(opType) {\r\n+ switch (opType) {\r\n case ADD:\r\n c = a.add(b);\r\n break;\r\n@@ -51,17 +51,33 @@ public String getName() {\n }\r\n \r\n @Override\r\n- public boolean isReady() {\r\n- return (getArgument(\"a\") != null) && (getArgument(\"b\") != null);\r\n+ public List<OPPParameter> getIncomingParameters() {\r\n+ return Lists.newArrayList(new OPPParameter(\"a\"), new OPPParameter(\"b\"));\r\n }\r\n \r\n @Override\r\n- public List<OPPParameter> getIncomingParameterNames() {\r\n- return Lists.newArrayList(new OPPParameter(\"a\", false), new OPPParameter(\"b\", false));\r\n+ public List<OPPParameter> getOutgoingParameters() {\r\n+ return Lists.newArrayList(new OPPParameter(\"c\"));\r\n }\r\n \r\n- @Override\r\n- public List<OPPParameter> getOutgoingParameterNames() {\r\n- return Lists.newArrayList(new OPPParameter(\"c\", false));\r\n+ public static enum OPPBinaryMathOpType {\r\n+ ADD, SUBS, MULT, DIV, POW;\r\n+\r\n+ public String getName() {\r\n+ switch (this) {\r\n+ case ADD:\r\n+ return \"Add\";\r\n+ case SUBS:\r\n+ return \"Subtract\";\r\n+ case MULT:\r\n+ return \"Multiply\";\r\n+ case DIV:\r\n+ return \"Divide\";\r\n+ case POW:\r\n+ return \"Power\";\r\n+ }\r\n+ throw new IllegalStateException(\"This should NEVER happen!\");\r\n+ }\r\n }\r\n+\r\n }\r", "raw_url": "https://github.com/vainolo/Object-Process-Programming/raw/c8c3080c49e883f01a64afc8119c041a889f82d4/com.vainolo.phd.opp.interpreter%2Fsrc%2Fcom%2Fvainolo%2Fphd%2Fopp%2Finterpreter%2Fbuiltin%2FOPPBinaryMathOpProcessInstance.java", "sha": "2e0856199484a683018f92b009d65ae662677c6b", "status": "modified" }, { "additions": 6, "blob_url": "https://github.com/vainolo/Object-Process-Programming/blob/c8c3080c49e883f01a64afc8119c041a889f82d4/com.vainolo.phd.opp.interpreter%2Fsrc%2Fcom%2Fvainolo%2Fphd%2Fopp%2Finterpreter%2Fbuiltin%2FOPPCompareProcessInstance.java", "changes": 17, "contents_url": "https://api.github.com/repos/vainolo/Object-Process-Programming/contents/com.vainolo.phd.opp.interpreter%2Fsrc%2Fcom%2Fvainolo%2Fphd%2Fopp%2Finterpreter%2Fbuiltin%2FOPPCompareProcessInstance.java?ref=c8c3080c49e883f01a64afc8119c041a889f82d4", "deletions": 11, "filename": "com.vainolo.phd.opp.interpreter/src/com/vainolo/phd/opp/interpreter/builtin/OPPCompareProcessInstance.java", "new_code": " switch (comparisonType) {\r\n if (result) {\r\n public List<OPPParameter> getIncomingParameters() {\r\n return Lists.newArrayList(new OPPParameter(\"a\"), new OPPParameter(\"b\"));\r\n public List<OPPParameter> getOutgoingParameters() {\r\n return Lists.newArrayList(new OPPParameter(\"c\"));\r", "new_methods": [], "old_code": " switch(comparisonType) {\r\n if(result) {\r\n public boolean isReady() {\r\n return (getArgument(\"a\") != null) && (getArgument(\"b\") != null);\r\n public List<OPPParameter> getIncomingParameterNames() {\r\n return Lists.newArrayList(new OPPParameter(\"a\", false), new OPPParameter(\"b\", false));\r\n }\r\n\r\n @Override\r\n public List<OPPParameter> getOutgoingParameterNames() {\r\n return Lists.newArrayList(new OPPParameter(\"c\", false));\r", "old_methods": [ { "arguments": [], "filename": "com.vainolo.phd.opp.interpreter/src/com/vainolo/phd/opp/interpreter/builtin/OPPCompareProcessInstance.java", "implementation": "return (getArgument(\"a\") != null) && (getArgument(\"b\") != null);\r\n public List<OPPParameter> getIncomingParameterNames() {\r\n return Lists.newArrayList(new OPPParameter(\"a\", false), new OPPParameter(\"b\", false));", "signature": "boolean isReady()" } ], "patch": "@@ -39,7 +39,7 @@ public void executing() {\n OPPObjectInstance c;\r\n \r\n boolean result = false;\r\n- switch(comparisonType) {\r\n+ switch (comparisonType) {\r\n case EQUAL:\r\n result = (a.compareTo(b) == 0);\r\n break;\r\n@@ -59,7 +59,7 @@ public void executing() {\n break;\r\n }\r\n \r\n- if(result) {\r\n+ if (result) {\r\n c = OPPObjectInstance.createFromValue(\"true\");\r\n } else {\r\n c = OPPObjectInstance.createFromValue(\"false\");\r\n@@ -73,17 +73,12 @@ public String getName() {\n }\r\n \r\n @Override\r\n- public boolean isReady() {\r\n- return (getArgument(\"a\") != null) && (getArgument(\"b\") != null);\r\n+ public List<OPPParameter> getIncomingParameters() {\r\n+ return Lists.newArrayList(new OPPParameter(\"a\"), new OPPParameter(\"b\"));\r\n }\r\n \r\n @Override\r\n- public List<OPPParameter> getIncomingParameterNames() {\r\n- return Lists.newArrayList(new OPPParameter(\"a\", false), new OPPParameter(\"b\", false));\r\n- }\r\n-\r\n- @Override\r\n- public List<OPPParameter> getOutgoingParameterNames() {\r\n- return Lists.newArrayList(new OPPParameter(\"c\", false));\r\n+ public List<OPPParameter> getOutgoingParameters() {\r\n+ return Lists.newArrayList(new OPPParameter(\"c\"));\r\n }\r\n }\r", "raw_url": "https://github.com/vainolo/Object-Process-Programming/raw/c8c3080c49e883f01a64afc8119c041a889f82d4/com.vainolo.phd.opp.interpreter%2Fsrc%2Fcom%2Fvainolo%2Fphd%2Fopp%2Finterpreter%2Fbuiltin%2FOPPCompareProcessInstance.java", "sha": "05074fb9c74f20f7e1619a27dd6d489b0de4a6d7", "status": "modified" }, { "additions": 0, "blob_url": "https://github.com/vainolo/Object-Process-Programming/blob/c8c3080c49e883f01a64afc8119c041a889f82d4/com.vainolo.phd.opp.interpreter%2Fsrc%2Fcom%2Fvainolo%2Fphd%2Fopp%2Finterpreter%2Fbuiltin%2FOPPConceptualProcess.java", "changes": 5, "contents_url": "https://api.github.com/repos/vainolo/Object-Process-Programming/contents/com.vainolo.phd.opp.interpreter%2Fsrc%2Fcom%2Fvainolo%2Fphd%2Fopp%2Finterpreter%2Fbuiltin%2FOPPConceptualProcess.java?ref=c8c3080c49e883f01a64afc8119c041a889f82d4", "deletions": 5, "filename": "com.vainolo.phd.opp.interpreter/src/com/vainolo/phd/opp/interpreter/builtin/OPPConceptualProcess.java", "new_code": "", "new_methods": [], "old_code": "\r\n @Override\r\n public boolean isReady() {\r\n return true;\r\n }\r", "old_methods": [ { "arguments": [], "filename": "com.vainolo.phd.opp.interpreter/src/com/vainolo/phd/opp/interpreter/builtin/OPPConceptualProcess.java", "implementation": "return true;", "signature": "boolean isReady()" } ], "patch": "@@ -35,9 +35,4 @@ protected void executing() {\n public String getName() {\r\n return process.getName();\r\n }\r\n-\r\n- @Override\r\n- public boolean isReady() {\r\n- return true;\r\n- }\r\n }\r", "raw_url": "https://github.com/vainolo/Object-Process-Programming/raw/c8c3080c49e883f01a64afc8119c041a889f82d4/com.vainolo.phd.opp.interpreter%2Fsrc%2Fcom%2Fvainolo%2Fphd%2Fopp%2Finterpreter%2Fbuiltin%2FOPPConceptualProcess.java", "sha": "afd6de2c4860916de09db12f5d6c851b66ef91f5", "status": "modified" }, { "additions": 2, "blob_url": "https://github.com/vainolo/Object-Process-Programming/blob/c8c3080c49e883f01a64afc8119c041a889f82d4/com.vainolo.phd.opp.interpreter%2Fsrc%2Fcom%2Fvainolo%2Fphd%2Fopp%2Finterpreter%2Fbuiltin%2FOPPCreateObjectProcessInstance.java", "changes": 9, "contents_url": "https://api.github.com/repos/vainolo/Object-Process-Programming/contents/com.vainolo.phd.opp.interpreter%2Fsrc%2Fcom%2Fvainolo%2Fphd%2Fopp%2Finterpreter%2Fbuiltin%2FOPPCreateObjectProcessInstance.java?ref=c8c3080c49e883f01a64afc8119c041a889f82d4", "deletions": 7, "filename": "com.vainolo.phd.opp.interpreter/src/com/vainolo/phd/opp/interpreter/builtin/OPPCreateObjectProcessInstance.java", "new_code": " public List<OPPParameter> getOutgoingParameters() {\r\n return Lists.newArrayList(new OPPParameter(\"object\"));\r", "new_methods": [], "old_code": " public boolean isReady() {\r\n return true;\r\n }\r\n\r\n @Override\r\n public List<OPPParameter> getOutgoingParameterNames() {\r\n return Lists.newArrayList(new OPPParameter(\"object\", false));\r", "old_methods": [ { "arguments": [], "filename": "com.vainolo.phd.opp.interpreter/src/com/vainolo/phd/opp/interpreter/builtin/OPPCreateObjectProcessInstance.java", "implementation": "return true;", "signature": "boolean isReady()" } ], "patch": "@@ -25,12 +25,7 @@ public String getName() {\n }\r\n \r\n @Override\r\n- public boolean isReady() {\r\n- return true;\r\n- }\r\n-\r\n- @Override\r\n- public List<OPPParameter> getOutgoingParameterNames() {\r\n- return Lists.newArrayList(new OPPParameter(\"object\", false));\r\n+ public List<OPPParameter> getOutgoingParameters() {\r\n+ return Lists.newArrayList(new OPPParameter(\"object\"));\r\n }\r\n }\r", "raw_url": "https://github.com/vainolo/Object-Process-Programming/raw/c8c3080c49e883f01a64afc8119c041a889f82d4/com.vainolo.phd.opp.interpreter%2Fsrc%2Fcom%2Fvainolo%2Fphd%2Fopp%2Finterpreter%2Fbuiltin%2FOPPCreateObjectProcessInstance.java", "sha": "5b9e519d0657a022d6d2ee98146110a1dd884306", "status": "modified" }, { "additions": 2, "blob_url": "https://github.com/vainolo/Object-Process-Programming/blob/c8c3080c49e883f01a64afc8119c041a889f82d4/com.vainolo.phd.opp.interpreter%2Fsrc%2Fcom%2Fvainolo%2Fphd%2Fopp%2Finterpreter%2Fbuiltin%2FOPPInputProcessInstance.java", "changes": 9, "contents_url": "https://api.github.com/repos/vainolo/Object-Process-Programming/contents/com.vainolo.phd.opp.interpreter%2Fsrc%2Fcom%2Fvainolo%2Fphd%2Fopp%2Finterpreter%2Fbuiltin%2FOPPInputProcessInstance.java?ref=c8c3080c49e883f01a64afc8119c041a889f82d4", "deletions": 7, "filename": "com.vainolo.phd.opp.interpreter/src/com/vainolo/phd/opp/interpreter/builtin/OPPInputProcessInstance.java", "new_code": " public List<OPPParameter> getOutgoingParameters() {\r\n return Lists.newArrayList(new OPPParameter(\"text\"));\r", "new_methods": [], "old_code": " public boolean isReady() {\r\n return true;\r\n }\r\n\r\n @Override\r\n public List<OPPParameter> getOutgoingParameterNames() {\r\n return Lists.newArrayList(new OPPParameter(\"text\", false));\r", "old_methods": [ { "arguments": [], "filename": "com.vainolo.phd.opp.interpreter/src/com/vainolo/phd/opp/interpreter/builtin/OPPInputProcessInstance.java", "implementation": "return true;", "signature": "boolean isReady()" } ], "patch": "@@ -52,12 +52,7 @@ public String getName() {\n }\r\n \r\n @Override\r\n- public boolean isReady() {\r\n- return true;\r\n- }\r\n-\r\n- @Override\r\n- public List<OPPParameter> getOutgoingParameterNames() {\r\n- return Lists.newArrayList(new OPPParameter(\"text\", false));\r\n+ public List<OPPParameter> getOutgoingParameters() {\r\n+ return Lists.newArrayList(new OPPParameter(\"text\"));\r\n }\r\n }\r", "raw_url": "https://github.com/vainolo/Object-Process-Programming/raw/c8c3080c49e883f01a64afc8119c041a889f82d4/com.vainolo.phd.opp.interpreter%2Fsrc%2Fcom%2Fvainolo%2Fphd%2Fopp%2Finterpreter%2Fbuiltin%2FOPPInputProcessInstance.java", "sha": "821020bd2c6ef122f62b2c884be9b1b34cbab5b1", "status": "modified" }, { "additions": 2, "blob_url": "https://github.com/vainolo/Object-Process-Programming/blob/c8c3080c49e883f01a64afc8119c041a889f82d4/com.vainolo.phd.opp.interpreter%2Fsrc%2Fcom%2Fvainolo%2Fphd%2Fopp%2Finterpreter%2Fbuiltin%2FOPPOutputProcessInstance.java", "changes": 9, "contents_url": "https://api.github.com/repos/vainolo/Object-Process-Programming/contents/com.vainolo.phd.opp.interpreter%2Fsrc%2Fcom%2Fvainolo%2Fphd%2Fopp%2Finterpreter%2Fbuiltin%2FOPPOutputProcessInstance.java?ref=c8c3080c49e883f01a64afc8119c041a889f82d4", "deletions": 7, "filename": "com.vainolo.phd.opp.interpreter/src/com/vainolo/phd/opp/interpreter/builtin/OPPOutputProcessInstance.java", "new_code": " public List<OPPParameter> getIncomingParameters() {\r\n return Lists.newArrayList(new OPPParameter(\"text\"));\r", "new_methods": [], "old_code": " public boolean isReady() {\r\n return getArgument(\"text\") != null;\r\n }\r\n\r\n @Override\r\n public List<OPPParameter> getIncomingParameterNames() {\r\n return Lists.newArrayList(new OPPParameter(\"text\", false));\r", "old_methods": [ { "arguments": [], "filename": "com.vainolo.phd.opp.interpreter/src/com/vainolo/phd/opp/interpreter/builtin/OPPOutputProcessInstance.java", "implementation": "return getArgument(\"text\") != null;", "signature": "boolean isReady()" } ], "patch": "@@ -28,12 +28,7 @@ public String getName() {\n }\r\n \r\n @Override\r\n- public boolean isReady() {\r\n- return getArgument(\"text\") != null;\r\n- }\r\n-\r\n- @Override\r\n- public List<OPPParameter> getIncomingParameterNames() {\r\n- return Lists.newArrayList(new OPPParameter(\"text\", false));\r\n+ public List<OPPParameter> getIncomingParameters() {\r\n+ return Lists.newArrayList(new OPPParameter(\"text\"));\r\n }\r\n }\r", "raw_url": "https://github.com/vainolo/Object-Process-Programming/raw/c8c3080c49e883f01a64afc8119c041a889f82d4/com.vainolo.phd.opp.interpreter%2Fsrc%2Fcom%2Fvainolo%2Fphd%2Fopp%2Finterpreter%2Fbuiltin%2FOPPOutputProcessInstance.java", "sha": "4c7a7de55e00d548760ed0a8c09973556e56ad86", "status": "modified" }, { "additions": 0, "blob_url": "https://github.com/vainolo/Object-Process-Programming/blob/c8c3080c49e883f01a64afc8119c041a889f82d4/com.vainolo.phd.opp.interpreter%2Fsrc%2Fcom%2Fvainolo%2Fphd%2Fopp%2Finterpreter%2Fbuiltin%2FOPPPrintHelloWorldProcessInstance.java", "changes": 6, "contents_url": "https://api.github.com/repos/vainolo/Object-Process-Programming/contents/com.vainolo.phd.opp.interpreter%2Fsrc%2Fcom%2Fvainolo%2Fphd%2Fopp%2Finterpreter%2Fbuiltin%2FOPPPrintHelloWorldProcessInstance.java?ref=c8c3080c49e883f01a64afc8119c041a889f82d4", "deletions": 6, "filename": "com.vainolo.phd.opp.interpreter/src/com/vainolo/phd/opp/interpreter/builtin/OPPPrintHelloWorldProcessInstance.java", "new_code": "", "new_methods": [], "old_code": "\r\n @Override\r\n public boolean isReady() {\r\n return true;\r\n }\r\n\r", "old_methods": [ { "arguments": [], "filename": "com.vainolo.phd.opp.interpreter/src/com/vainolo/phd/opp/interpreter/builtin/OPPPrintHelloWorldProcessInstance.java", "implementation": "return true;", "signature": "boolean isReady()" } ], "patch": "@@ -27,10 +27,4 @@ public void executing() {\n public String getName() {\r\n return \"Hello World\";\r\n }\r\n-\r\n- @Override\r\n- public boolean isReady() {\r\n- return true;\r\n- }\r\n-\r\n }\r", "raw_url": "https://github.com/vainolo/Object-Process-Programming/raw/c8c3080c49e883f01a64afc8119c041a889f82d4/com.vainolo.phd.opp.interpreter%2Fsrc%2Fcom%2Fvainolo%2Fphd%2Fopp%2Finterpreter%2Fbuiltin%2FOPPPrintHelloWorldProcessInstance.java", "sha": "4725f2c08976203169f01eb7ddef0ebd3cc79fbe", "status": "modified" }, { "additions": 15, "blob_url": "https://github.com/vainolo/Object-Process-Programming/blob/c8c3080c49e883f01a64afc8119c041a889f82d4/com.vainolo.phd.opp.interpreter%2Fsrc%2Fcom%2Fvainolo%2Fphd%2Fopp%2Finterpreter%2Fbuiltin%2FOPPReadJSONObjectProcessInstance.java", "changes": 35, "contents_url": "https://api.github.com/repos/vainolo/Object-Process-Programming/contents/com.vainolo.phd.opp.interpreter%2Fsrc%2Fcom%2Fvainolo%2Fphd%2Fopp%2Finterpreter%2Fbuiltin%2FOPPReadJSONObjectProcessInstance.java?ref=c8c3080c49e883f01a64afc8119c041a889f82d4", "deletions": 20, "filename": "com.vainolo.phd.opp.interpreter/src/com/vainolo/phd/opp/interpreter/builtin/OPPReadJSONObjectProcessInstance.java", "new_code": " } catch (Exception e) {\r\n while (it.hasNext()) {\r\n if (member.getValue().isArray()) {\r\n } else if (member.getValue().isString()) {\r\n } else if (member.getValue().isNumber()) {\r\n } else if (member.getValue().isBoolean()) {\r\n } else if (member.getValue().isObject()) {\r\n whole.setPart(name, part);\r\n whole.setPart(name, OPPObjectInstance.createFromValue(value));\r\n instance.setPart(whole, OPPObjectInstance.createFromValue(new BigDecimal(value)));\r\n whole.setPart(name, bool);\r\n public List<OPPParameter> getIncomingParameters() {\r\n return Lists.newArrayList(new OPPParameter(\"json\"));\r\n public List<OPPParameter> getOutgoingParameters() {\r\n return Lists.newArrayList(new OPPParameter(\"object\"));\r", "new_methods": [], "old_code": " } catch(Exception e) {\r\n while(it.hasNext()) {\r\n if(member.getValue().isArray()) {\r\n } else if(member.getValue().isString()) {\r\n } else if(member.getValue().isNumber()) {\r\n } else if(member.getValue().isBoolean()) {\r\n } else if(member.getValue().isObject()) {\r\n whole.addCompositePart(name, part);\r\n whole.addCompositePart(name, OPPObjectInstance.createFromValue(value));\r\n instance.addCompositePart(whole, OPPObjectInstance.createFromValue(new BigDecimal(value)));\r\n whole.addCompositePart(name, bool);\r\n public boolean isReady() {\r\n return getArgument(\"json\") != null;\r\n public List<OPPParameter> getIncomingParameterNames() {\r\n return Lists.newArrayList(new OPPParameter(\"json\", false));\r\n }\r\n\r\n @Override\r\n public List<OPPParameter> getOutgoingParameterNames() {\r\n return Lists.newArrayList(new OPPParameter(\"object\", false));\r", "old_methods": [ { "arguments": [], "filename": "com.vainolo.phd.opp.interpreter/src/com/vainolo/phd/opp/interpreter/builtin/OPPReadJSONObjectProcessInstance.java", "implementation": "return getArgument(\"json\") != null;\r\n public List<OPPParameter> getIncomingParameterNames() {\r\n return Lists.newArrayList(new OPPParameter(\"json\", false));", "signature": "boolean isReady()" } ], "patch": "@@ -28,30 +28,30 @@ protected void executing() {\n JsonObject jsonObject = JsonObject.readFrom(getArgument(\"json\").getStringValue());\r\n populateOPMObjectInstanceFromJSONObject(opmObjectInstance, jsonObject);\r\n setArgument(\"object\", opmObjectInstance);\r\n- } catch(Exception e) {\r\n+ } catch (Exception e) {\r\n e.printStackTrace();\r\n logSevere(e.getLocalizedMessage());\r\n }\r\n }\r\n \r\n private void populateOPMObjectInstanceFromJSONObject(OPPObjectInstance opmObjectInstance, JsonObject jsonObject) {\r\n Iterator<Member> it = jsonObject.iterator();\r\n- while(it.hasNext()) {\r\n+ while (it.hasNext()) {\r\n addPart(opmObjectInstance, it.next());\r\n }\r\n }\r\n \r\n private void addPart(OPPObjectInstance whole, Member member) {\r\n logInfo(\"Adding part \" + member.getName() + \" with value \" + member.getValue().toString());\r\n- if(member.getValue().isArray()) {\r\n+ if (member.getValue().isArray()) {\r\n throw new UnsupportedOperationException();\r\n- } else if(member.getValue().isString()) {\r\n+ } else if (member.getValue().isString()) {\r\n addStringPart(whole, member.getName(), member.getValue().asString());\r\n- } else if(member.getValue().isNumber()) {\r\n+ } else if (member.getValue().isNumber()) {\r\n addNumberPart(whole, member.getName(), member.getValue().asDouble());\r\n- } else if(member.getValue().isBoolean()) {\r\n+ } else if (member.getValue().isBoolean()) {\r\n addBooleanPart(whole, member.getName(), member.getValue().asBoolean());\r\n- } else if(member.getValue().isObject()) {\r\n+ } else if (member.getValue().isObject()) {\r\n addObjectPart(whole, member.getName(), member.getValue().asObject());\r\n }\r\n // null JSON values are ignored.\r\n@@ -60,20 +60,20 @@ private void addPart(OPPObjectInstance whole, Member member) {\n private void addObjectPart(OPPObjectInstance whole, String name, JsonObject value) {\r\n OPPObjectInstance part = OPPObjectInstance.createCompositeInstance();\r\n populateOPMObjectInstanceFromJSONObject(part, value);\r\n- whole.addCompositePart(name, part);\r\n+ whole.setPart(name, part);\r\n }\r\n \r\n private void addStringPart(OPPObjectInstance whole, String name, String value) {\r\n- whole.addCompositePart(name, OPPObjectInstance.createFromValue(value));\r\n+ whole.setPart(name, OPPObjectInstance.createFromValue(value));\r\n }\r\n \r\n private void addNumberPart(OPPObjectInstance instance, String whole, double value) {\r\n- instance.addCompositePart(whole, OPPObjectInstance.createFromValue(new BigDecimal(value)));\r\n+ instance.setPart(whole, OPPObjectInstance.createFromValue(new BigDecimal(value)));\r\n }\r\n \r\n private void addBooleanPart(OPPObjectInstance whole, String name, boolean value) {\r\n OPPObjectInstance bool = OPPObjectInstance.createFromValue(Boolean.toString(value));\r\n- whole.addCompositePart(name, bool);\r\n+ whole.setPart(name, bool);\r\n }\r\n \r\n @Override\r\n@@ -82,18 +82,13 @@ public String getName() {\n }\r\n \r\n @Override\r\n- public boolean isReady() {\r\n- return getArgument(\"json\") != null;\r\n+ public List<OPPParameter> getIncomingParameters() {\r\n+ return Lists.newArrayList(new OPPParameter(\"json\"));\r\n }\r\n \r\n @Override\r\n- public List<OPPParameter> getIncomingParameterNames() {\r\n- return Lists.newArrayList(new OPPParameter(\"json\", false));\r\n- }\r\n-\r\n- @Override\r\n- public List<OPPParameter> getOutgoingParameterNames() {\r\n- return Lists.newArrayList(new OPPParameter(\"object\", false));\r\n+ public List<OPPParameter> getOutgoingParameters() {\r\n+ return Lists.newArrayList(new OPPParameter(\"object\"));\r\n }\r\n \r\n }\r", "raw_url": "https://github.com/vainolo/Object-Process-Programming/raw/c8c3080c49e883f01a64afc8119c041a889f82d4/com.vainolo.phd.opp.interpreter%2Fsrc%2Fcom%2Fvainolo%2Fphd%2Fopp%2Finterpreter%2Fbuiltin%2FOPPReadJSONObjectProcessInstance.java", "sha": "363c184c155d5885e5967a5a2966ec413f3d74dc", "status": "modified" }, { "additions": 3, "blob_url": "https://github.com/vainolo/Object-Process-Programming/blob/c8c3080c49e883f01a64afc8119c041a889f82d4/com.vainolo.phd.opp.interpreter%2Fsrc%2Fcom%2Fvainolo%2Fphd%2Fopp%2Finterpreter%2Fbuiltin%2FOPPSleepProcessInstance.java", "changes": 11, "contents_url": "https://api.github.com/repos/vainolo/Object-Process-Programming/contents/com.vainolo.phd.opp.interpreter%2Fsrc%2Fcom%2Fvainolo%2Fphd%2Fopp%2Finterpreter%2Fbuiltin%2FOPPSleepProcessInstance.java?ref=c8c3080c49e883f01a64afc8119c041a889f82d4", "deletions": 8, "filename": "com.vainolo.phd.opp.interpreter/src/com/vainolo/phd/opp/interpreter/builtin/OPPSleepProcessInstance.java", "new_code": " } catch (InterruptedException e) {\r\n public List<OPPParameter> getIncomingParameters() {\r\n return Lists.newArrayList(new OPPParameter(\"time\"));\r", "new_methods": [], "old_code": " } catch(InterruptedException e) {\r\n public boolean isReady() {\r\n return getArgument(\"time\") != null;\r\n }\r\n\r\n @Override\r\n public List<OPPParameter> getIncomingParameterNames() {\r\n return Lists.newArrayList(new OPPParameter(\"time\", false));\r", "old_methods": [ { "arguments": [], "filename": "com.vainolo.phd.opp.interpreter/src/com/vainolo/phd/opp/interpreter/builtin/OPPSleepProcessInstance.java", "implementation": "return getArgument(\"time\") != null;", "signature": "boolean isReady()" } ], "patch": "@@ -29,7 +29,7 @@ protected void executing() {\n logInfo(\"Sleeping for \" + time + \" seconds.\");\r\n try {\r\n Thread.sleep((int) time * 1000);\r\n- } catch(InterruptedException e) {\r\n+ } catch (InterruptedException e) {\r\n logFinest(\"Sleep process interrupted. Returning.\");\r\n return;\r\n }\r\n@@ -41,13 +41,8 @@ public String getName() {\n }\r\n \r\n @Override\r\n- public boolean isReady() {\r\n- return getArgument(\"time\") != null;\r\n- }\r\n-\r\n- @Override\r\n- public List<OPPParameter> getIncomingParameterNames() {\r\n- return Lists.newArrayList(new OPPParameter(\"time\", false));\r\n+ public List<OPPParameter> getIncomingParameters() {\r\n+ return Lists.newArrayList(new OPPParameter(\"time\"));\r\n }\r\n \r\n }\r", "raw_url": "https://github.com/vainolo/Object-Process-Programming/raw/c8c3080c49e883f01a64afc8119c041a889f82d4/com.vainolo.phd.opp.interpreter%2Fsrc%2Fcom%2Fvainolo%2Fphd%2Fopp%2Finterpreter%2Fbuiltin%2FOPPSleepProcessInstance.java", "sha": "aaf449fbec57a831da8f7e2a7dd190b407127fe1", "status": "modified" }, { "additions": 4, "blob_url": "https://github.com/vainolo/Object-Process-Programming/blob/c8c3080c49e883f01a64afc8119c041a889f82d4/com.vainolo.phd.opp.interpreter%2Fsrc%2Fcom%2Fvainolo%2Fphd%2Fopp%2Finterpreter%2Fbuiltin%2FOPPSubstractProcessInstance.java", "changes": 13, "contents_url": "https://api.github.com/repos/vainolo/Object-Process-Programming/contents/com.vainolo.phd.opp.interpreter%2Fsrc%2Fcom%2Fvainolo%2Fphd%2Fopp%2Finterpreter%2Fbuiltin%2FOPPSubstractProcessInstance.java?ref=c8c3080c49e883f01a64afc8119c041a889f82d4", "deletions": 9, "filename": "com.vainolo.phd.opp.interpreter/src/com/vainolo/phd/opp/interpreter/builtin/OPPSubstractProcessInstance.java", "new_code": " public List<OPPParameter> getIncomingParameters() {\r\n return Lists.newArrayList(new OPPParameter(\"a\"), new OPPParameter(\"b\"));\r\n public List<OPPParameter> getOutgoingParameters() {\r\n return Lists.newArrayList(new OPPParameter(\"c\"));\r", "new_methods": [], "old_code": " public boolean isReady() {\r\n return (getArgument(\"a\") != null) && (getArgument(\"b\") != null);\r\n public List<OPPParameter> getIncomingParameterNames() {\r\n return Lists.newArrayList(new OPPParameter(\"a\", false), new OPPParameter(\"b\", false));\r\n }\r\n\r\n @Override\r\n public List<OPPParameter> getOutgoingParameterNames() {\r\n return Lists.newArrayList(new OPPParameter(\"c\", false));\r", "old_methods": [ { "arguments": [], "filename": "com.vainolo.phd.opp.interpreter/src/com/vainolo/phd/opp/interpreter/builtin/OPPSubstractProcessInstance.java", "implementation": "return (getArgument(\"a\") != null) && (getArgument(\"b\") != null);\r\n public List<OPPParameter> getIncomingParameterNames() {\r\n return Lists.newArrayList(new OPPParameter(\"a\", false), new OPPParameter(\"b\", false));", "signature": "boolean isReady()" } ], "patch": "@@ -32,17 +32,12 @@ public void executing() {\n }\r\n \r\n @Override\r\n- public boolean isReady() {\r\n- return (getArgument(\"a\") != null) && (getArgument(\"b\") != null);\r\n+ public List<OPPParameter> getIncomingParameters() {\r\n+ return Lists.newArrayList(new OPPParameter(\"a\"), new OPPParameter(\"b\"));\r\n }\r\n \r\n @Override\r\n- public List<OPPParameter> getIncomingParameterNames() {\r\n- return Lists.newArrayList(new OPPParameter(\"a\", false), new OPPParameter(\"b\", false));\r\n- }\r\n-\r\n- @Override\r\n- public List<OPPParameter> getOutgoingParameterNames() {\r\n- return Lists.newArrayList(new OPPParameter(\"c\", false));\r\n+ public List<OPPParameter> getOutgoingParameters() {\r\n+ return Lists.newArrayList(new OPPParameter(\"c\"));\r\n }\r\n }\r", "raw_url": "https://github.com/vainolo/Object-Process-Programming/raw/c8c3080c49e883f01a64afc8119c041a889f82d4/com.vainolo.phd.opp.interpreter%2Fsrc%2Fcom%2Fvainolo%2Fphd%2Fopp%2Finterpreter%2Fbuiltin%2FOPPSubstractProcessInstance.java", "sha": "b66101eff9fecf9f6101c5a9e8a070394e3879d2", "status": "modified" }, { "additions": 13, "blob_url": "https://github.com/vainolo/Object-Process-Programming/blob/c8c3080c49e883f01a64afc8119c041a889f82d4/com.vainolo.phd.opp.interpreter%2Fsrc%2Fcom%2Fvainolo%2Fphd%2Fopp%2Finterpreter%2Fbuiltin%2FOPPWriteOPMObjectInstanceToJSON.java", "changes": 32, "contents_url": "https://api.github.com/repos/vainolo/Object-Process-Programming/contents/com.vainolo.phd.opp.interpreter%2Fsrc%2Fcom%2Fvainolo%2Fphd%2Fopp%2Finterpreter%2Fbuiltin%2FOPPWriteOPMObjectInstanceToJSON.java?ref=c8c3080c49e883f01a64afc8119c041a889f82d4", "deletions": 19, "filename": "com.vainolo.phd.opp.interpreter/src/com/vainolo/phd/opp/interpreter/builtin/OPPWriteOPMObjectInstanceToJSON.java", "new_code": "import com.vainolo.phd.opp.interpreter.OPPObjectInstance.InstanceKind;\r\n } catch (Exception e) {\r\n Preconditions.checkState(opmObjectInstance.kind == InstanceKind.COMPOSITE);\r\n for (String partName : opmObjectInstance.getAllPartIndexes()) {\r\n OPPObjectInstance partValue = opmObjectInstance.getPart(partName);\r\n addJSONElement(jsonObject, partName, partValue);\r\n if (opmObject.kind == InstanceKind.STRING) {\r\n } else if (opmObject.kind == InstanceKind.NUMERICAL) {\r\n } else if (opmObject.kind == InstanceKind.COMPOSITE) {\r\n public List<OPPParameter> getIncomingParameters() {\r\n return Lists.newArrayList(new OPPParameter(\"object\"));\r\n public List<OPPParameter> getOutgoingParameters() {\r\n return Lists.newArrayList(new OPPParameter(\"json\"));\r", "new_methods": [ { "arguments": [ "opmObject.kind == InstanceKind.NUMERICAL" ], "filename": "com.vainolo.phd.opp.interpreter/src/com/vainolo/phd/opp/interpreter/builtin/OPPWriteOPMObjectInstanceToJSON.java", "implementation": "", "signature": "else if (opmObject.kind == InstanceKind.NUMERICAL)" } ], "old_code": "import com.vainolo.phd.opp.interpreter.OPPObjectInstance.InstanceType;\r\n } catch(Exception e) {\r\n Preconditions.checkState(opmObjectInstance.type == InstanceType.COMPOSITE);\r\n for(Entry<String, OPPObjectInstance> part : opmObjectInstance.getCompositeParts()) {\r\n String name = part.getKey();\r\n OPPObjectInstance value = part.getValue();\r\n addJSONElement(jsonObject, name, value);\r\n if(opmObject.type == InstanceType.STRING) {\r\n } else if(opmObject.type == InstanceType.NUMERICAL) {\r\n } else if(opmObject.type == InstanceType.COMPOSITE) {\r\n public boolean isReady() {\r\n return getArgument(\"object\") != null;\r\n public List<OPPParameter> getIncomingParameterNames() {\r\n return Lists.newArrayList(new OPPParameter(\"object\", false));\r\n }\r\n\r\n @Override\r\n public List<OPPParameter> getOutgoingParameterNames() {\r\n return Lists.newArrayList(new OPPParameter(\"json\", false));\r", "old_methods": [ { "arguments": [ "opmObject.type == InstanceType.NUMERICAL" ], "filename": "com.vainolo.phd.opp.interpreter/src/com/vainolo/phd/opp/interpreter/builtin/OPPWriteOPMObjectInstanceToJSON.java", "implementation": "", "signature": "else if(opmObject.type == InstanceType.NUMERICAL)" }, { "arguments": [ "opmObject.type == InstanceType.COMPOSITE" ], "filename": "com.vainolo.phd.opp.interpreter/src/com/vainolo/phd/opp/interpreter/builtin/OPPWriteOPMObjectInstanceToJSON.java", "implementation": "public boolean isReady() {\r\n return getArgument(\"object\") != null;\r\n public List<OPPParameter> getIncomingParameterNames() {\r\n return Lists.newArrayList(new OPPParameter(\"object\", false));", "signature": "else if(opmObject.type == InstanceType.COMPOSITE)" } ], "patch": "@@ -17,7 +17,7 @@\n import com.vainolo.phd.opp.interpreter.OPPObjectInstance;\r\n import com.vainolo.phd.opp.interpreter.OPPParameter;\r\n import com.vainolo.phd.opp.interpreter.OPPProcessInstance;\r\n-import com.vainolo.phd.opp.interpreter.OPPObjectInstance.InstanceType;\r\n+import com.vainolo.phd.opp.interpreter.OPPObjectInstance.InstanceKind;\r\n \r\n public class OPPWriteOPMObjectInstanceToJSON extends OPPAbstractProcessInstance implements OPPProcessInstance {\r\n \r\n@@ -27,29 +27,28 @@ protected void executing() {\n try {\r\n JsonObject jsonObject = populateJSONFromOPMObjectInstance(opmObjectInstance);\r\n setArgument(\"json\", OPPObjectInstance.createFromValue(jsonObject.toString()));\r\n- } catch(Exception e) {\r\n+ } catch (Exception e) {\r\n e.printStackTrace();\r\n logSevere(e.getLocalizedMessage());\r\n }\r\n }\r\n \r\n private JsonObject populateJSONFromOPMObjectInstance(OPPObjectInstance opmObjectInstance) {\r\n- Preconditions.checkState(opmObjectInstance.type == InstanceType.COMPOSITE);\r\n+ Preconditions.checkState(opmObjectInstance.kind == InstanceKind.COMPOSITE);\r\n JsonObject jsonObject = new JsonObject();\r\n- for(Entry<String, OPPObjectInstance> part : opmObjectInstance.getCompositeParts()) {\r\n- String name = part.getKey();\r\n- OPPObjectInstance value = part.getValue();\r\n- addJSONElement(jsonObject, name, value);\r\n+ for (String partName : opmObjectInstance.getAllPartIndexes()) {\r\n+ OPPObjectInstance partValue = opmObjectInstance.getPart(partName);\r\n+ addJSONElement(jsonObject, partName, partValue);\r\n }\r\n return jsonObject;\r\n }\r\n \r\n private void addJSONElement(JsonObject jsonObject, String name, OPPObjectInstance opmObject) {\r\n- if(opmObject.type == InstanceType.STRING) {\r\n+ if (opmObject.kind == InstanceKind.STRING) {\r\n jsonObject.add(name, opmObject.getStringValue());\r\n- } else if(opmObject.type == InstanceType.NUMERICAL) {\r\n+ } else if (opmObject.kind == InstanceKind.NUMERICAL) {\r\n jsonObject.add(name, opmObject.getNumericalValue().doubleValue());\r\n- } else if(opmObject.type == InstanceType.COMPOSITE) {\r\n+ } else if (opmObject.kind == InstanceKind.COMPOSITE) {\r\n jsonObject.add(name, populateJSONFromOPMObjectInstance(opmObject));\r\n } else {\r\n throw new IllegalStateException();\r\n@@ -62,18 +61,13 @@ public String getName() {\n }\r\n \r\n @Override\r\n- public boolean isReady() {\r\n- return getArgument(\"object\") != null;\r\n+ public List<OPPParameter> getIncomingParameters() {\r\n+ return Lists.newArrayList(new OPPParameter(\"object\"));\r\n }\r\n \r\n @Override\r\n- public List<OPPParameter> getIncomingParameterNames() {\r\n- return Lists.newArrayList(new OPPParameter(\"object\", false));\r\n- }\r\n-\r\n- @Override\r\n- public List<OPPParameter> getOutgoingParameterNames() {\r\n- return Lists.newArrayList(new OPPParameter(\"json\", false));\r\n+ public List<OPPParameter> getOutgoingParameters() {\r\n+ return Lists.newArrayList(new OPPParameter(\"json\"));\r\n }\r\n \r\n }\r", "raw_url": "https://github.com/vainolo/Object-Process-Programming/raw/c8c3080c49e883f01a64afc8119c041a889f82d4/com.vainolo.phd.opp.interpreter%2Fsrc%2Fcom%2Fvainolo%2Fphd%2Fopp%2Finterpreter%2Fbuiltin%2FOPPWriteOPMObjectInstanceToJSON.java", "sha": "5ea0702976d217675e823c968750812d6323af5e", "status": "modified" }, { "additions": 46, "blob_url": "https://github.com/vainolo/Object-Process-Programming/blob/c8c3080c49e883f01a64afc8119c041a889f82d4/com.vainolo.phd.opp.interpreter%2Fsrc%2Fcom%2Fvainolo%2Fphd%2Fopp%2Finterpreter%2Finzoomedprocessinstance%2FOPPInZoomedProcessArgumentHandler.java", "changes": 154, "contents_url": "https://api.github.com/repos/vainolo/Object-Process-Programming/contents/com.vainolo.phd.opp.interpreter%2Fsrc%2Fcom%2Fvainolo%2Fphd%2Fopp%2Finterpreter%2Finzoomedprocessinstance%2FOPPInZoomedProcessArgumentHandler.java?ref=c8c3080c49e883f01a64afc8119c041a889f82d4", "deletions": 108, "filename": "com.vainolo.phd.opp.interpreter/src/com/vainolo/phd/opp/interpreter/inzoomedprocessinstance/OPPInZoomedProcessArgumentHandler.java", "new_code": "import java.util.stream.Collectors;\r\nimport com.vainolo.phd.opp.interpreter.OPPRuntimeException;\r\n Map<String, OPPArgument> namedArguments = Maps.newHashMap();\r\n List<OPPArgument> anonymousArguments = Lists.newArrayList();\r\n OPPArgument argument = new OPPArgument(analyzer.getObject(incomingDataLink));\r\n throw new OPPRuntimeException(\"Argument modifiers are not supported.\");\r\n List<String> availableParametersNames = instance.getIncomingParameters().stream().map(param -> param.getName())\r\n .collect(Collectors.toList());\r\n private void loadNamedArguments(OPPProcessInstance instance, Map<String, OPPArgument> namedArguments) {\r\n private void loadAnonymousArguments(OPPProcessInstance instance, List<OPPArgument> arguments,\r\n for(OPPArgument argument : arguments) {\r\n Map<String, OPPArgument> namedResults = Maps.newHashMap();\r\n List<OPPArgument> anonymousResult = Lists.newArrayList();\r\n OPPArgument argument = new OPPArgument(analyzer.getObject(resultLink));\r\n throw new OPPRuntimeException(\"Argument modifiers are not supported.\");\r\n List<String> outgoingParametersNames = instance.getOutgoingParameters().stream().map(p -> p.getName())\r\n .collect(Collectors.toList());\r\n setValue(namedResults.get(namedResult), instance.getArgument(namedResult));\r\n // Then extract results where the variable in the instance matches the\r\n // result object\r\n Iterator<OPPArgument> anonymousResultsIterator = anonymousResult.iterator();\r\n OPPArgument argument = anonymousResultsIterator.next();\r\n if(instance.getOutgoingParameters().contains(argument.object.getName())) {\r\n setValue(argument, instance.getArgument(argument.object.getName()));\r\n // Finally, extract all remaining outgoing parameters to the remaining\r\n // anonymous result objects.\r\n for(int i = 0; i < anonymousResult.size(); i++) {\r\n setValue(anonymousResult.get(i), instance.getArgument(outgoingParametersNames.get(i)));\r\n private void setValue(OPPArgument argument, OPPObjectInstance objectInstance) {\r\n if(argument.hasModifier) {\r\n throw new OPPRuntimeException(\"Argument modifiers are not supported.\");\r\n heap.setVariable(argument.object, objectInstance);\r\n private OPPObjectInstance getValue(OPPArgument argument) {\r\n if(!argument.hasModifier) {\r\n throw new OPPRuntimeException(\"Argument modifiers are not supported.\");\r\n /**\r\n * Representation of an argument that is passed to a\r\n * {@link OPPProcessInstance}. If the argument is passed to the instance using\r\n * a modifier, this modifier is stored here and is applied only when the value\r\n * of the argument is retrieved.\r\n */\r\n class OPPArgument {\r\n public BigDecimal collectionElementIndex;\r\n public boolean hasModifier = false;\r\n public String modifier;\r\n public OPPArgument(OPPObject object) {\r", "new_methods": [ { "arguments": [ "OPPProcessInstance instance", " Map<String", " OPPArgument> namedArguments" ], "filename": "com.vainolo.phd.opp.interpreter/src/com/vainolo/phd/opp/interpreter/inzoomedprocessinstance/OPPInZoomedProcessArgumentHandler.java", "implementation": "private void loadAnonymousArguments(OPPProcessInstance instance, List<OPPArgument> arguments,\r\n for(OPPArgument argument : arguments) {\r\n Map<String, OPPArgument> namedResults = Maps.newHashMap();\r\n List<OPPArgument> anonymousResult = Lists.newArrayList();\r\n OPPArgument argument = new OPPArgument(analyzer.getObject(resultLink));\r\n throw new OPPRuntimeException(\"Argument modifiers are not supported.\");\r\n List<String> outgoingParametersNames = instance.getOutgoingParameters().stream().map(p -> p.getName())\r\n .collect(Collectors.toList());\r\n setValue(namedResults.get(namedResult), instance.getArgument(namedResult));\r\n // Then extract results where the variable in the instance matches the\r\n // result object\r\n Iterator<OPPArgument> anonymousResultsIterator = anonymousResult.iterator();\r\n OPPArgument argument = anonymousResultsIterator.next();\r\n if(instance.getOutgoingParameters().contains(argument.object.getName())) {\r\n setValue(argument, instance.getArgument(argument.object.getName()));\r\n // Finally, extract all remaining outgoing parameters to the remaining\r\n // anonymous result objects.\r\n for(int i = 0; i < anonymousResult.size(); i++) {\r\n setValue(anonymousResult.get(i), instance.getArgument(outgoingParametersNames.get(i)));\r\n private void setValue(OPPArgument argument, OPPObjectInstance objectInstance) {\r\n if(argument.hasModifier) {\r\n throw new OPPRuntimeException(\"Argument modifiers are not supported.\");\r\n heap.setVariable(argument.object, objectInstance);\r\n private OPPObjectInstance getValue(OPPArgument argument) {\r\n if(!argument.hasModifier) {\r\n throw new OPPRuntimeException(\"Argument modifiers are not supported.\");\r\n /**\r\n * Representation of an argument that is passed to a\r\n * {@link OPPProcessInstance", "signature": "void loadNamedArguments(OPPProcessInstance instance, Map<String, OPPArgument> namedArguments)" } ], "old_code": "import com.google.common.base.Function;\r\nimport com.vainolo.phd.opp.interpreter.OPPObjectInstanceValueAnalyzer;\r\nimport com.vainolo.phd.opp.interpreter.OPPParameter;\r\n private OPPObjectInstanceValueAnalyzer valueAnalyzer;\r\n this.valueAnalyzer = new OPPObjectInstanceValueAnalyzer();\r\n Map<String, OPMArgument> namedArguments = Maps.newHashMap();\r\n List<OPMArgument> anonymousArguments = Lists.newArrayList();\r\n OPMArgument argument = new OPMArgument(analyzer.getObject(incomingDataLink));\r\n argument.isCollectionElement = true;\r\n String argName = incomingDataLink.getCenterDecoration().split(\",\")[0];\r\n String collectionReference = incomingDataLink.getCenterDecoration().split(\",\")[1];\r\n if(valueAnalyzer.isNumericalLiteral(collectionReference)) {\r\n argument.collectionElementIndex = valueAnalyzer.parseNumericalLiteral(collectionReference);\r\n } else {\r\n argument.collectionElementName = collectionReference;\r\n }\r\n if(\"\".equals(argName)) {\r\n anonymousArguments.add(argument);\r\n } else {\r\n namedArguments.put(argName, argument);\r\n }\r\n List<String> availableParametersNames = Lists.transform(instance.getIncomingParameterNames(),\r\n new Function<OPPParameter, String>() {\r\n @Override\r\n public String apply(OPPParameter input) {\r\n return input.getName();\r\n }\r\n });\r\n private void loadNamedArguments(OPPProcessInstance instance, Map<String, OPMArgument> namedArguments) {\r\n private void loadAnonymousArguments(OPPProcessInstance instance, List<OPMArgument> arguments,\r\n for(OPMArgument argument : arguments) {\r\n Map<String, OPMArgument> namedResults = Maps.newHashMap();\r\n List<OPMArgument> anonymousResult = Lists.newArrayList();\r\n OPMArgument argument = new OPMArgument(analyzer.getObject(resultLink));\r\n argument.isCollectionElement = true;\r\n String argName = resultLink.getCenterDecoration().split(\",\")[0];\r\n String collectionReference = resultLink.getCenterDecoration().split(\",\")[1];\r\n if(valueAnalyzer.isNumericalLiteral(collectionReference)) {\r\n argument.collectionElementIndex = valueAnalyzer.parseNumericalLiteral(collectionReference);\r\n } else {\r\n argument.collectionElementName = collectionReference;\r\n }\r\n if(\"\".equals(argName)) {\r\n anonymousResult.add(argument);\r\n } else {\r\n namedResults.put(argName, argument);\r\n }\r\n List<String> outgoingParametersNames = Lists.transform(instance.getOutgoingParameterNames(),\r\n new Function<OPPParameter, String>() {\r\n @Override\r\n public String apply(OPPParameter input) {\r\n return input.getName();\r\n }\r\n });\r\n OPMArgument argument = namedResults.get(namedResult);\r\n if(argument.object.isCollection()) {\r\n setCollectionElementValue(argument, instance.getArgument(namedResult));\r\n } else {\r\n heap.setVariable(argument.object, instance.getArgument(namedResult));\r\n }\r\n // Now extract where the variable in the instance matched the result object\r\n Iterator<OPMArgument> anonymousResultsIterator = anonymousResult.iterator();\r\n OPMArgument argument = anonymousResultsIterator.next();\r\n if(instance.getOutgoingParameterNames().contains(argument.object.getName())) {\r\n if(argument.object.isCollection()) {\r\n setCollectionElementValue(argument, instance.getArgument(argument.object.getName()));\r\n } else {\r\n heap.setVariable(argument.object, instance.getArgument(argument.object.getName()));\r\n }\r\n // Now extract all remaining outgoing parameters to the remaining anonymous\r\n // result objects\r\n int remainingResults = (outgoingParametersNames.size() < anonymousResult.size()) ? outgoingParametersNames.size()\r\n : anonymousResult.size();\r\n for(int i = 0; i < remainingResults; i++) {\r\n OPMArgument argument = anonymousResult.get(i);\r\n if(argument.object.isCollection()) {\r\n setCollectionElementValue(argument, instance.getArgument(outgoingParametersNames.get(i)));\r\n } else {\r\n heap.setVariable(argument.object, instance.getArgument(outgoingParametersNames.get(i)));\r\n }\r\n public void setCollectionElementValue(OPMArgument argument, OPPObjectInstance value) {\r\n OPPObjectInstance currentValue = heap.getVariable(argument.object);\r\n if(currentValue == null) {\r\n currentValue = OPPObjectInstance.createCollectionInstace();\r\n }\r\n if(argument.isCollectionElement) {\r\n if(argument.collectionElementName != null) {\r\n currentValue.putCollectionElement(argument.collectionElementName, value);\r\n } else if(argument.collectionElementIndex != null) {\r\n currentValue.putCollectionElementAtIndex(argument.collectionElementIndex.intValue(), value);\r\n }\r\n currentValue.appendCollectionElement(value);\r\n heap.setVariable(argument.object, currentValue);\r\n private OPPObjectInstance getValue(OPMArgument argument) {\r\n if(!argument.isCollectionElement) {\r\n OPPObjectInstance instance = heap.getVariable(argument.object);\r\n if(argument.collectionElementName != null) {\r\n return instance.getCollectionElement(argument.collectionElementName);\r\n } else if(argument.collectionElementIndex != null) {\r\n return instance.getCollectionElementAtIndex(argument.collectionElementIndex.intValue());\r\n } else {\r\n throw new IllegalStateException(\"Referenced collection element with no index or name.\");\r\n }\r\n class OPMArgument {\r\n public BigDecimal collectionElementIndex;\r\n public String collectionElementName;\r\n private boolean isCollectionElement = false;\r\n public OPMArgument(OPPObject object) {\r", "old_methods": [ { "arguments": [ "OPPParameter input" ], "filename": "com.vainolo.phd.opp.interpreter/src/com/vainolo/phd/opp/interpreter/inzoomedprocessinstance/OPPInZoomedProcessArgumentHandler.java", "implementation": "return input.getName();", "signature": "String apply(OPPParameter input)" }, { "arguments": [ "OPPProcessInstance instance", " Map<String", " OPMArgument> namedArguments" ], "filename": "com.vainolo.phd.opp.interpreter/src/com/vainolo/phd/opp/interpreter/inzoomedprocessinstance/OPPInZoomedProcessArgumentHandler.java", "implementation": "private void loadAnonymousArguments(OPPProcessInstance instance, List<OPMArgument> arguments,\r\n for(OPMArgument argument : arguments) {\r\n Map<String, OPMArgument> namedResults = Maps.newHashMap();\r\n List<OPMArgument> anonymousResult = Lists.newArrayList();\r\n OPMArgument argument = new OPMArgument(analyzer.getObject(resultLink));\r\n argument.isCollectionElement = true;\r\n String argName = resultLink.getCenterDecoration().split(\",\")[0];\r\n String collectionReference = resultLink.getCenterDecoration().split(\",\")[1];\r\n if(valueAnalyzer.isNumericalLiteral(collectionReference)) {\r\n argument.collectionElementIndex = valueAnalyzer.parseNumericalLiteral(collectionReference);", "signature": "void loadNamedArguments(OPPProcessInstance instance, Map<String, OPMArgument> namedArguments)" }, { "arguments": [ "OPPParameter input" ], "filename": "com.vainolo.phd.opp.interpreter/src/com/vainolo/phd/opp/interpreter/inzoomedprocessinstance/OPPInZoomedProcessArgumentHandler.java", "implementation": "return input.getName();", "signature": "String apply(OPPParameter input)" }, { "arguments": [ "OPMArgument argument", " OPPObjectInstance value" ], "filename": "com.vainolo.phd.opp.interpreter/src/com/vainolo/phd/opp/interpreter/inzoomedprocessinstance/OPPInZoomedProcessArgumentHandler.java", "implementation": "OPPObjectInstance currentValue = heap.getVariable(argument.object);\r\n if(currentValue == null) {\r\n currentValue = OPPObjectInstance.createCollectionInstace();", "signature": "void setCollectionElementValue(OPMArgument argument, OPPObjectInstance value)" }, { "arguments": [ "argument.collectionElementIndex != null" ], "filename": "com.vainolo.phd.opp.interpreter/src/com/vainolo/phd/opp/interpreter/inzoomedprocessinstance/OPPInZoomedProcessArgumentHandler.java", "implementation": "currentValue.putCollectionElementAtIndex(argument.collectionElementIndex.intValue(), value);", "signature": "else if(argument.collectionElementIndex != null)" }, { "arguments": [ "OPMArgument argument" ], "filename": "com.vainolo.phd.opp.interpreter/src/com/vainolo/phd/opp/interpreter/inzoomedprocessinstance/OPPInZoomedProcessArgumentHandler.java", "implementation": "if(!argument.isCollectionElement) {\r\n OPPObjectInstance instance = heap.getVariable(argument.object);\r\n if(argument.collectionElementName != null) {\r\n return instance.getCollectionElement(argument.collectionElementName);", "signature": "OPPObjectInstance getValue(OPMArgument argument)" }, { "arguments": [ "argument.collectionElementIndex != null" ], "filename": "com.vainolo.phd.opp.interpreter/src/com/vainolo/phd/opp/interpreter/inzoomedprocessinstance/OPPInZoomedProcessArgumentHandler.java", "implementation": "return instance.getCollectionElementAtIndex(argument.collectionElementIndex.intValue());", "signature": "else if(argument.collectionElementIndex != null)" } ], "patch": "@@ -6,79 +6,59 @@\n import java.util.Iterator;\r\n import java.util.List;\r\n import java.util.Map;\r\n+import java.util.stream.Collectors;\r\n \r\n-import com.google.common.base.Function;\r\n import com.google.common.collect.Lists;\r\n import com.google.common.collect.Maps;\r\n import com.vainolo.phd.opp.interpreter.OPPObjectInstance;\r\n-import com.vainolo.phd.opp.interpreter.OPPObjectInstanceValueAnalyzer;\r\n-import com.vainolo.phd.opp.interpreter.OPPParameter;\r\n import com.vainolo.phd.opp.interpreter.OPPProcessInstance;\r\n+import com.vainolo.phd.opp.interpreter.OPPRuntimeException;\r\n import com.vainolo.phd.opp.model.OPPLink;\r\n import com.vainolo.phd.opp.model.OPPObject;\r\n import com.vainolo.phd.opp.model.OPPProcess;\r\n import com.vainolo.phd.opp.utilities.analysis.OPPOPDAnalyzer;\r\n \r\n public class OPPInZoomedProcessArgumentHandler {\r\n private OPPOPDAnalyzer analyzer = new OPPOPDAnalyzer();\r\n- private OPPObjectInstanceValueAnalyzer valueAnalyzer;\r\n private OPPInZoomedProcessInstanceHeap heap;\r\n \r\n public OPPInZoomedProcessArgumentHandler(OPPOPDAnalyzer analyzer, OPPInZoomedProcessInstanceHeap heap) {\r\n this.analyzer = analyzer;\r\n this.heap = heap;\r\n- this.valueAnalyzer = new OPPObjectInstanceValueAnalyzer();\r\n }\r\n \r\n public void loadInstanceArguments(OPPProcess process, OPPProcessInstance instance) {\r\n- Map<String, OPMArgument> namedArguments = Maps.newHashMap();\r\n- List<OPMArgument> anonymousArguments = Lists.newArrayList();\r\n+ Map<String, OPPArgument> namedArguments = Maps.newHashMap();\r\n+ List<OPPArgument> anonymousArguments = Lists.newArrayList();\r\n \r\n for(OPPLink incomingDataLink : analyzer.findIncomingDataLinks(process)) {\r\n- OPMArgument argument = new OPMArgument(analyzer.getObject(incomingDataLink));\r\n+ OPPArgument argument = new OPPArgument(analyzer.getObject(incomingDataLink));\r\n if(incomingDataLink.getCenterDecoration() == null || \"\".equals(incomingDataLink.getCenterDecoration())) {\r\n anonymousArguments.add(argument);\r\n } else if(incomingDataLink.getCenterDecoration().contains(\",\")) {\r\n- argument.isCollectionElement = true;\r\n- String argName = incomingDataLink.getCenterDecoration().split(\",\")[0];\r\n- String collectionReference = incomingDataLink.getCenterDecoration().split(\",\")[1];\r\n- if(valueAnalyzer.isNumericalLiteral(collectionReference)) {\r\n- argument.collectionElementIndex = valueAnalyzer.parseNumericalLiteral(collectionReference);\r\n- } else {\r\n- argument.collectionElementName = collectionReference;\r\n- }\r\n- if(\"\".equals(argName)) {\r\n- anonymousArguments.add(argument);\r\n- } else {\r\n- namedArguments.put(argName, argument);\r\n- }\r\n+ throw new OPPRuntimeException(\"Argument modifiers are not supported.\");\r\n } else {\r\n namedArguments.put(incomingDataLink.getCenterDecoration(), argument);\r\n }\r\n }\r\n \r\n logFine(\"Found {0} anonymous arguments and {1} named arguments.\", anonymousArguments.size(), namedArguments.size());\r\n \r\n- List<String> availableParametersNames = Lists.transform(instance.getIncomingParameterNames(),\r\n- new Function<OPPParameter, String>() {\r\n- @Override\r\n- public String apply(OPPParameter input) {\r\n- return input.getName();\r\n- }\r\n- });\r\n+ List<String> availableParametersNames = instance.getIncomingParameters().stream().map(param -> param.getName())\r\n+ .collect(Collectors.toList());\r\n loadNamedArguments(instance, namedArguments);\r\n availableParametersNames.removeAll(namedArguments.keySet());\r\n \r\n loadAnonymousArguments(instance, anonymousArguments, availableParametersNames);\r\n }\r\n \r\n- private void loadNamedArguments(OPPProcessInstance instance, Map<String, OPMArgument> namedArguments) {\r\n+ private void loadNamedArguments(OPPProcessInstance instance, Map<String, OPPArgument> namedArguments) {\r\n for(String parameterName : namedArguments.keySet()) {\r\n instance.setArgument(parameterName, getValue(namedArguments.get(parameterName)));\r\n }\r\n }\r\n \r\n- private void loadAnonymousArguments(OPPProcessInstance instance, List<OPMArgument> arguments,\r\n+ private void loadAnonymousArguments(OPPProcessInstance instance, List<OPPArgument> arguments,\r\n List<String> availableParameters) {\r\n \r\n // First arguments who's variable names matches the parameter name\r\n@@ -105,35 +85,23 @@ private void loadAnonymousArguments(OPPProcessInstance instance, List<OPMArgumen\n // names\r\n if(arguments.size() > 0) {\r\n int argNumber = 0;\r\n- for(OPMArgument argument : arguments) {\r\n+ for(OPPArgument argument : arguments) {\r\n instance.setArgument(\"arg\" + argNumber, getValue(argument));\r\n argNumber++;\r\n }\r\n }\r\n }\r\n \r\n public void extractResultsToVariables(OPPProcess process, OPPProcessInstance instance) {\r\n- Map<String, OPMArgument> namedResults = Maps.newHashMap();\r\n- List<OPMArgument> anonymousResult = Lists.newArrayList();\r\n+ Map<String, OPPArgument> namedResults = Maps.newHashMap();\r\n+ List<OPPArgument> anonymousResult = Lists.newArrayList();\r\n \r\n for(OPPLink resultLink : analyzer.findOutgoingDataLinks(process)) {\r\n- OPMArgument argument = new OPMArgument(analyzer.getObject(resultLink));\r\n+ OPPArgument argument = new OPPArgument(analyzer.getObject(resultLink));\r\n if(resultLink.getCenterDecoration() == null || \"\".equals(resultLink.getCenterDecoration())) {\r\n anonymousResult.add(argument);\r\n } else if(resultLink.getCenterDecoration().contains(\",\")) {\r\n- argument.isCollectionElement = true;\r\n- String argName = resultLink.getCenterDecoration().split(\",\")[0];\r\n- String collectionReference = resultLink.getCenterDecoration().split(\",\")[1];\r\n- if(valueAnalyzer.isNumericalLiteral(collectionReference)) {\r\n- argument.collectionElementIndex = valueAnalyzer.parseNumericalLiteral(collectionReference);\r\n- } else {\r\n- argument.collectionElementName = collectionReference;\r\n- }\r\n- if(\"\".equals(argName)) {\r\n- anonymousResult.add(argument);\r\n- } else {\r\n- namedResults.put(argName, argument);\r\n- }\r\n+ throw new OPPRuntimeException(\"Argument modifiers are not supported.\");\r\n } else {\r\n namedResults.put(resultLink.getCenterDecoration(), argument);\r\n }\r\n@@ -142,92 +110,62 @@ public void extractResultsToVariables(OPPProcess process, OPPProcessInstance ins\n logFine(\"Found {0} anonymous results and {1} named results.\", anonymousResult.size(), namedResults.size());\r\n \r\n // First extract named results\r\n- List<String> outgoingParametersNames = Lists.transform(instance.getOutgoingParameterNames(),\r\n- new Function<OPPParameter, String>() {\r\n- @Override\r\n- public String apply(OPPParameter input) {\r\n- return input.getName();\r\n- }\r\n- });\r\n+ List<String> outgoingParametersNames = instance.getOutgoingParameters().stream().map(p -> p.getName())\r\n+ .collect(Collectors.toList());\r\n for(String namedResult : namedResults.keySet()) {\r\n- OPMArgument argument = namedResults.get(namedResult);\r\n- if(argument.object.isCollection()) {\r\n- setCollectionElementValue(argument, instance.getArgument(namedResult));\r\n- } else {\r\n- heap.setVariable(argument.object, instance.getArgument(namedResult));\r\n- }\r\n+ setValue(namedResults.get(namedResult), instance.getArgument(namedResult));\r\n outgoingParametersNames.remove(namedResult);\r\n }\r\n \r\n- // Now extract where the variable in the instance matched the result object\r\n- Iterator<OPMArgument> anonymousResultsIterator = anonymousResult.iterator();\r\n+ // Then extract results where the variable in the instance matches the\r\n+ // result object\r\n+ Iterator<OPPArgument> anonymousResultsIterator = anonymousResult.iterator();\r\n while(anonymousResultsIterator.hasNext()) {\r\n- OPMArgument argument = anonymousResultsIterator.next();\r\n- if(instance.getOutgoingParameterNames().contains(argument.object.getName())) {\r\n+ OPPArgument argument = anonymousResultsIterator.next();\r\n+ if(instance.getOutgoingParameters().contains(argument.object.getName())) {\r\n if(instance.getArgument(argument.object.getName()) != null) {\r\n- if(argument.object.isCollection()) {\r\n- setCollectionElementValue(argument, instance.getArgument(argument.object.getName()));\r\n- } else {\r\n- heap.setVariable(argument.object, instance.getArgument(argument.object.getName()));\r\n- }\r\n+ setValue(argument, instance.getArgument(argument.object.getName()));\r\n anonymousResultsIterator.remove();\r\n }\r\n }\r\n }\r\n \r\n- // Now extract all remaining outgoing parameters to the remaining anonymous\r\n- // result objects\r\n- int remainingResults = (outgoingParametersNames.size() < anonymousResult.size()) ? outgoingParametersNames.size()\r\n- : anonymousResult.size();\r\n- for(int i = 0; i < remainingResults; i++) {\r\n- OPMArgument argument = anonymousResult.get(i);\r\n- if(argument.object.isCollection()) {\r\n- setCollectionElementValue(argument, instance.getArgument(outgoingParametersNames.get(i)));\r\n- } else {\r\n- heap.setVariable(argument.object, instance.getArgument(outgoingParametersNames.get(i)));\r\n- }\r\n+ // Finally, extract all remaining outgoing parameters to the remaining\r\n+ // anonymous result objects.\r\n+ for(int i = 0; i < anonymousResult.size(); i++) {\r\n+ setValue(anonymousResult.get(i), instance.getArgument(outgoingParametersNames.get(i)));\r\n }\r\n }\r\n \r\n- public void setCollectionElementValue(OPMArgument argument, OPPObjectInstance value) {\r\n- OPPObjectInstance currentValue = heap.getVariable(argument.object);\r\n- if(currentValue == null) {\r\n- currentValue = OPPObjectInstance.createCollectionInstace();\r\n- }\r\n- if(argument.isCollectionElement) {\r\n- if(argument.collectionElementName != null) {\r\n- currentValue.putCollectionElement(argument.collectionElementName, value);\r\n- } else if(argument.collectionElementIndex != null) {\r\n- currentValue.putCollectionElementAtIndex(argument.collectionElementIndex.intValue(), value);\r\n- }\r\n+ private void setValue(OPPArgument argument, OPPObjectInstance objectInstance) {\r\n+ if(argument.hasModifier) {\r\n+ throw new OPPRuntimeException(\"Argument modifiers are not supported.\");\r\n } else {\r\n- currentValue.appendCollectionElement(value);\r\n+ heap.setVariable(argument.object, objectInstance);\r\n }\r\n- heap.setVariable(argument.object, currentValue);\r\n }\r\n \r\n- private OPPObjectInstance getValue(OPMArgument argument) {\r\n- if(!argument.isCollectionElement) {\r\n+ private OPPObjectInstance getValue(OPPArgument argument) {\r\n+ if(!argument.hasModifier) {\r\n return heap.getVariable(argument.object);\r\n } else {\r\n- OPPObjectInstance instance = heap.getVariable(argument.object);\r\n- if(argument.collectionElementName != null) {\r\n- return instance.getCollectionElement(argument.collectionElementName);\r\n- } else if(argument.collectionElementIndex != null) {\r\n- return instance.getCollectionElementAtIndex(argument.collectionElementIndex.intValue());\r\n- } else {\r\n- throw new IllegalStateException(\"Referenced collection element with no index or name.\");\r\n- }\r\n+ throw new OPPRuntimeException(\"Argument modifiers are not supported.\");\r\n }\r\n }\r\n \r\n- class OPMArgument {\r\n- public BigDecimal collectionElementIndex;\r\n- public String collectionElementName;\r\n+ /**\r\n+ * Representation of an argument that is passed to a\r\n+ * {@link OPPProcessInstance}. If the argument is passed to the instance using\r\n+ * a modifier, this modifier is stored here and is applied only when the value\r\n+ * of the argument is retrieved.\r\n+ */\r\n+ class OPPArgument {\r\n private OPPObject object;\r\n- private boolean isCollectionElement = false;\r\n+ public BigDecimal collectionElementIndex;\r\n+ public boolean hasModifier = false;\r\n+ public String modifier;\r\n \r\n- public OPMArgument(OPPObject object) {\r\n+ public OPPArgument(OPPObject object) {\r\n this.object = object;\r\n }\r\n }\r", "raw_url": "https://github.com/vainolo/Object-Process-Programming/raw/c8c3080c49e883f01a64afc8119c041a889f82d4/com.vainolo.phd.opp.interpreter%2Fsrc%2Fcom%2Fvainolo%2Fphd%2Fopp%2Finterpreter%2Finzoomedprocessinstance%2FOPPInZoomedProcessArgumentHandler.java", "sha": "090bf9247bcd477900072769cbe331deb48b0634", "status": "modified" }, { "additions": 69, "blob_url": "https://github.com/vainolo/Object-Process-Programming/blob/c8c3080c49e883f01a64afc8119c041a889f82d4/com.vainolo.phd.opp.interpreter%2Fsrc%2Fcom%2Fvainolo%2Fphd%2Fopp%2Finterpreter%2Finzoomedprocessinstance%2FOPPInZoomedProcessExecutableInstance.java", "changes": 134, "contents_url": "https://api.github.com/repos/vainolo/Object-Process-Programming/contents/com.vainolo.phd.opp.interpreter%2Fsrc%2Fcom%2Fvainolo%2Fphd%2Fopp%2Finterpreter%2Finzoomedprocessinstance%2FOPPInZoomedProcessExecutableInstance.java?ref=c8c3080c49e883f01a64afc8119c041a889f82d4", "deletions": 65, "filename": "com.vainolo.phd.opp.interpreter/src/com/vainolo/phd/opp/interpreter/inzoomedprocessinstance/OPPInZoomedProcessExecutableInstance.java", "new_code": "import java.util.Collections;\r\nimport java.util.stream.Collectors;\r\n * Executable instance used for a {@link OPPObjectProcessDiagram} containing an\r\n final Map<OPPProcessInstance, OPPProcess> instance2ProcessMap = Maps.newHashMap();\r\n Set<OPPProcess> P_ready = Sets.newHashSet(Sets.union(Sets.filter(P_init, isReadyAndNotSkipPred), findInvokedProcesses()));\r\n if (P_waiting.size() == 0 && P_ready.size() == 0) {\r\n while (Sets.union(P_ready, P_executing).size() > 0) {\r\n logInfo(\"Starting execution loop, {0} waiting, {1} ready, and {2} executing .\", P_waiting.size(), P_ready.size(), P_executing.size());\r\n for (OPPProcess readyProcess : P_ready) {\r\n instance2ProcessMap.put(readyInstance, readyProcess);\r\n OPPProcessInstance executedInstance = executionResult.get().getInstance();\r\n P_executing.remove(executedInstance);\r\n argumentHandler.extractResultsToVariables(instance2ProcessMap.get(executedInstance), executedInstance);\r\n\r\n Set<OPPProcess> P_executingProcesses2 = P_executing.stream().map(p -> instance2ProcessMap.get(p)).collect(Collectors.toSet());\r\n Set<OPPProcess> P_executingProcesses = Sets.newHashSet(Collections2.transform(P_executing, new Function<OPPProcessInstance, OPPProcess>() {\r\n @Override\r\n public OPPProcess apply(OPPProcessInstance input) {\r\n return instance2ProcessMap.get(input);\r\n }\r\n }));\r\n\r\n if (P_executingProcesses.containsAll(P_executingProcesses2) && P_executingProcesses2.containsAll(P_executingProcesses)) {\r\n logInfo(\"P_executingProcesses are equal\");\r\n } else {\r\n logInfo(\"P_ExecutingProcesses are not equal!!!!!!!\");\r\n }\r\n\r\n P_waiting = calculateNewWaitingProcessesSet(instance2ProcessMap.get(executedInstance), P_waiting, P_executingProcesses);\r\n logInfo(\"Finished execution loop, {0} waiting, {1} ready, and {2} executing.\", P_waiting.size(), P_ready.size(), P_executing.size());\r\n instance2ProcessMap.remove(executedInstance);\r\n if (P_waiting.size() > 0) {\r\n private Set<OPPProcess> calculateNewWaitingProcessesSet(OPPProcess process, Set<OPPProcess> P_waiting, Set<OPPProcess> P_executing) {\r\n while (successors.size() > 0) {\r\n for (OPPProcess succ : Sets.filter(successors, Predicates.not(mustSkipPred))) {\r\n if (Sets.intersection(Sets.union(P_waiting, P_executing), pred).size() == 0) {\r\n for (OPPProcess skippedSucc : Sets.filter(successors, mustSkipPred)) {\r\n if (Sets.intersection(Sets.union(P_waiting, P_executing), pred).size() == 0) {\r\n for (OPPObject changedObject : heapObserver.getObjectsWithNewValue()) {\r\n for (OPPProceduralLink eventLink : outgoingEventLinks) {\r\n if (objectValueTriggersEvent(eventLink, value)) {\r\n if (OPPObject.class.isInstance(link.getSource())) {\r\n } else if (OPPState.class.isInstance(link.getSource())) {\r\n if (valueAnalyzer.isObjectInstanceInState(objectInstance, state)) {\r\n // @Override\r\n // public boolean isReady() {\r\n // Collection<OPPObject> parameters =\r\n // analyzer.findIncomingParameters(getOpd());\r\n // for (OPPObject object : parameters) {\r\n // if (getArgument(object.getName()) == null) {\r\n // return false;\r\n // }\r\n // }\r\n // return true;\r\n // }\r\n public List<OPPParameter> getIncomingParameters() {\r\n for (OPPObject object : parameters) {\r\n incomingParameters.add(new OPPParameter(object.getName()));\r\n public List<OPPParameter> getOutgoingParameters() {\r\n for (OPPObject object : parameters) {\r\n outgoingParameters.add(new OPPParameter(object.getName()));\r\n for (OPPProceduralLink link : analyzer.findIncomingProceduralLinks(process)) {\r\n if (!isLinkSourceReady(link)) {\r\n for (OPPProceduralLink link : analyzer.findIncomingProceduralLinks(process)) {\r\n if (link.getSubKinds().contains(OPPConstants.OPP_CONDITIONAL_LINK_SUBKIND) && !isLinkSourceReady(link)) {\r\n if (variable == null) {\r\n if (!valueAnalyzer.isObjectInstanceInState(variable, state)) {\r\n if (analyzer.isSourceObject(link)) {\r\n } else if (analyzer.isSourceState(link)) {\r", "new_methods": [ { "arguments": [ "OPPProcessInstance input" ], "filename": "com.vainolo.phd.opp.interpreter/src/com/vainolo/phd/opp/interpreter/inzoomedprocessinstance/OPPInZoomedProcessExecutableInstance.java", "implementation": "return instance2ProcessMap.get(input);", "signature": "OPPProcess apply(OPPProcessInstance input)" }, { "arguments": [], "filename": "com.vainolo.phd.opp.interpreter/src/com/vainolo/phd/opp/interpreter/inzoomedprocessinstance/OPPInZoomedProcessExecutableInstance.java", "implementation": "// Collection<OPPObject> parameters =\r\n // analyzer.findIncomingParameters(getOpd());\r\n // for (OPPObject object : parameters) {\r\n // if (getArgument(object.getName()) == null) {\r\n // return false;\r\n //", "signature": "boolean isReady()" } ], "old_code": " * Executable instance used for a {@link OPMObjectProcessDiagram} containing an\r\n // this.storer = OPMInZoomedProcessResultStorer.createResultStorer(analyzer,\r\n // executionState, heap);\r\n final Map<OPPProcessInstance, OPPProcess> mapping = Maps.newHashMap();\r\n Set<OPPProcess> P_ready = Sets.newHashSet(Sets.union(Sets.filter(P_init, isReadyAndNotSkipPred),\r\n findInvokedProcesses()));\r\n if(P_waiting.size() == 0 && P_ready.size() == 0) {\r\n while(Sets.union(P_ready, P_executing).size() > 0) {\r\n logInfo(\"Starting execution loop, {0} waiting, {1} ready, and {2} executing .\", P_waiting.size(), P_ready.size(),\r\n P_executing.size());\r\n for(OPPProcess readyProcess : P_ready) {\r\n mapping.put(readyInstance, readyProcess);\r\n OPPProcessInstance instance = executionResult.get().getInstance();\r\n P_executing.remove(instance);\r\n argumentHandler.extractResultsToVariables(mapping.get(instance), instance);\r\n\r\n Set<OPPProcess> P_executingProcesses = Sets.newHashSet(Collections2.transform(P_executing,\r\n new Function<OPPProcessInstance, OPPProcess>() {\r\n @Override\r\n public OPPProcess apply(OPPProcessInstance input) {\r\n return mapping.get(input);\r\n }\r\n }));\r\n P_waiting = calculateNewWaitingProcessesSet(mapping.get(instance), P_waiting, P_executingProcesses);\r\n logInfo(\"Finished execution loop, {0} waiting, {1} ready, and {2} executing.\", P_waiting.size(), P_ready.size(),\r\n P_executing.size());\r\n mapping.remove(instance);\r\n if(P_waiting.size() > 0) {\r\n private Set<OPPProcess> calculateNewWaitingProcessesSet(OPPProcess process, Set<OPPProcess> P_waiting,\r\n Set<OPPProcess> P_executing) {\r\n while(successors.size() > 0) {\r\n for(OPPProcess succ : Sets.filter(successors, Predicates.not(mustSkipPred))) {\r\n if(Sets.intersection(Sets.union(P_waiting, P_executing), pred).size() == 0) {\r\n for(OPPProcess skippedSucc : Sets.filter(successors, mustSkipPred)) {\r\n if(Sets.intersection(Sets.union(P_waiting, P_executing), pred).size() == 0) {\r\n for(OPPObject changedObject : heapObserver.getObjectsWithNewValue()) {\r\n for(OPPProceduralLink eventLink : outgoingEventLinks) {\r\n if(objectValueTriggersEvent(eventLink, value)) {\r\n if(OPPObject.class.isInstance(link.getSource())) {\r\n } else if(OPPState.class.isInstance(link.getSource())) {\r\n if(valueAnalyzer.isObjectInstanceInState(objectInstance, state)) {\r\n @Override\r\n public boolean isReady() {\r\n Collection<OPPObject> parameters = analyzer.findIncomingParameters(getOpd());\r\n for(OPPObject object : parameters) {\r\n if(getArgument(object.getName()) == null) {\r\n return false;\r\n }\r\n }\r\n return true;\r\n }\r\n public List<OPPParameter> getIncomingParameterNames() {\r\n for(OPPObject object : parameters) {\r\n incomingParameters.add(new OPPParameter(object.getName(), object.isCollection()));\r\n public List<OPPParameter> getOutgoingParameterNames() {\r\n for(OPPObject object : parameters) {\r\n outgoingParameters.add(new OPPParameter(object.getName(), object.isCollection()));\r\n for(OPPProceduralLink link : analyzer.findIncomingProceduralLinks(process)) {\r\n if(!isLinkSourceReady(link)) {\r\n for(OPPProceduralLink link : analyzer.findIncomingProceduralLinks(process)) {\r\n if(link.getSubKinds().contains(OPPConstants.OPP_CONDITIONAL_LINK_SUBKIND) && !isLinkSourceReady(link)) {\r\n if(variable == null) {\r\n if(!valueAnalyzer.isObjectInstanceInState(variable, state)) {\r\n if(analyzer.isSourceObject(link)) {\r\n } else if(analyzer.isSourceState(link)) {\r", "old_methods": [ { "arguments": [ "OPPProcessInstance input" ], "filename": "com.vainolo.phd.opp.interpreter/src/com/vainolo/phd/opp/interpreter/inzoomedprocessinstance/OPPInZoomedProcessExecutableInstance.java", "implementation": "return mapping.get(input);", "signature": "OPPProcess apply(OPPProcessInstance input)" }, { "arguments": [], "filename": "com.vainolo.phd.opp.interpreter/src/com/vainolo/phd/opp/interpreter/inzoomedprocessinstance/OPPInZoomedProcessExecutableInstance.java", "implementation": "Collection<OPPObject> parameters = analyzer.findIncomingParameters(getOpd());\r\n for(OPPObject object : parameters) {\r\n if(getArgument(object.getName()) == null) {\r\n return false;", "signature": "boolean isReady()" } ], "patch": "@@ -5,12 +5,14 @@\n import static com.google.common.base.Preconditions.*;\r\n \r\n import java.util.Collection;\r\n+import java.util.Collections;\r\n import java.util.List;\r\n import java.util.Map;\r\n import java.util.Set;\r\n import java.util.concurrent.ExecutorCompletionService;\r\n import java.util.concurrent.Executors;\r\n import java.util.concurrent.Future;\r\n+import java.util.stream.Collectors;\r\n \r\n import org.jgrapht.experimental.dag.DirectedAcyclicGraph;\r\n import org.jgrapht.graph.DefaultEdge;\r\n@@ -42,7 +44,7 @@\n import com.vainolo.phd.opp.model.OPPState;\r\n \r\n /**\r\n- * Executable instance used for a {@link OPMObjectProcessDiagram} containing an\r\n+ * Executable instance used for a {@link OPPObjectProcessDiagram} containing an\r\n * in-zoomed process.\r\n * \r\n * @author Arieh \"Vainolo\" Bibliowicz\r\n@@ -78,8 +80,6 @@ public OPPInZoomedProcessExecutableInstance(OPPObjectProcessDiagram opd, OPPOPDA\n this.valueAnalyzer = new OPPObjectInstanceValueAnalyzer();\r\n this.heap = new OPPInZoomedProcessInstanceHeap(valueAnalyzer, analyzer);\r\n this.argumentHandler = new OPPInZoomedProcessArgumentHandler(analyzer, heap);\r\n- // this.storer = OPMInZoomedProcessResultStorer.createResultStorer(analyzer,\r\n- // executionState, heap);\r\n this.heapObserver = new OPMHeapObserver();\r\n this.heap.addObserver(heapObserver);\r\n this.isReadyPred = new IsProcessReady();\r\n@@ -106,74 +106,77 @@ protected void postExecution() {\n @Override\r\n protected void executing() throws Exception {\r\n logInfo(OPPStrings.STARTING_EXECUTION, getName());\r\n- final Map<OPPProcessInstance, OPPProcess> mapping = Maps.newHashMap();\r\n+ final Map<OPPProcessInstance, OPPProcess> instance2ProcessMap = Maps.newHashMap();\r\n heap.initializeVariablesWithLiterals(analyzer.getInZoomedProcess(getOpd()));\r\n \r\n Set<OPPProcess> P_init = executionAnalyzer.findInitialProcesses(opdDag);\r\n Set<OPPProcess> P_waiting = Sets.newHashSet(Sets.filter(P_init, notReadyAndNotSkipPred));\r\n- Set<OPPProcess> P_ready = Sets.newHashSet(Sets.union(Sets.filter(P_init, isReadyAndNotSkipPred),\r\n- findInvokedProcesses()));\r\n+ Set<OPPProcess> P_ready = Sets.newHashSet(Sets.union(Sets.filter(P_init, isReadyAndNotSkipPred), findInvokedProcesses()));\r\n Set<OPPProcessInstance> P_executing = Sets.newHashSet();\r\n \r\n- if(P_waiting.size() == 0 && P_ready.size() == 0) {\r\n+ if (P_waiting.size() == 0 && P_ready.size() == 0) {\r\n logInfo(\"Could not find anything to execute in process {0}. Exiting.\", getName());\r\n return;\r\n }\r\n \r\n- while(Sets.union(P_ready, P_executing).size() > 0) {\r\n- logInfo(\"Starting execution loop, {0} waiting, {1} ready, and {2} executing .\", P_waiting.size(), P_ready.size(),\r\n- P_executing.size());\r\n+ while (Sets.union(P_ready, P_executing).size() > 0) {\r\n+ logInfo(\"Starting execution loop, {0} waiting, {1} ready, and {2} executing .\", P_waiting.size(), P_ready.size(), P_executing.size());\r\n heapObserver.clear();\r\n- for(OPPProcess readyProcess : P_ready) {\r\n+ for (OPPProcess readyProcess : P_ready) {\r\n OPPProcessInstance readyInstance = OPPProcessInstanceFactory.createExecutableInstance(readyProcess);\r\n argumentHandler.loadInstanceArguments(readyProcess, readyInstance);\r\n- mapping.put(readyInstance, readyProcess);\r\n+ instance2ProcessMap.put(readyInstance, readyProcess);\r\n completionService.submit(readyInstance);\r\n P_executing.add(readyInstance);\r\n }\r\n \r\n Future<OPPProcessExecutionResult> executionResult = completionService.take();\r\n- OPPProcessInstance instance = executionResult.get().getInstance();\r\n- P_executing.remove(instance);\r\n- argumentHandler.extractResultsToVariables(mapping.get(instance), instance);\r\n-\r\n- Set<OPPProcess> P_executingProcesses = Sets.newHashSet(Collections2.transform(P_executing,\r\n- new Function<OPPProcessInstance, OPPProcess>() {\r\n- @Override\r\n- public OPPProcess apply(OPPProcessInstance input) {\r\n- return mapping.get(input);\r\n- }\r\n- }));\r\n- P_waiting = calculateNewWaitingProcessesSet(mapping.get(instance), P_waiting, P_executingProcesses);\r\n+ OPPProcessInstance executedInstance = executionResult.get().getInstance();\r\n+ P_executing.remove(executedInstance);\r\n+ argumentHandler.extractResultsToVariables(instance2ProcessMap.get(executedInstance), executedInstance);\r\n+\r\n+ Set<OPPProcess> P_executingProcesses2 = P_executing.stream().map(p -> instance2ProcessMap.get(p)).collect(Collectors.toSet());\r\n+ Set<OPPProcess> P_executingProcesses = Sets.newHashSet(Collections2.transform(P_executing, new Function<OPPProcessInstance, OPPProcess>() {\r\n+ @Override\r\n+ public OPPProcess apply(OPPProcessInstance input) {\r\n+ return instance2ProcessMap.get(input);\r\n+ }\r\n+ }));\r\n+\r\n+ if (P_executingProcesses.containsAll(P_executingProcesses2) && P_executingProcesses2.containsAll(P_executingProcesses)) {\r\n+ logInfo(\"P_executingProcesses are equal\");\r\n+ } else {\r\n+ logInfo(\"P_ExecutingProcesses are not equal!!!!!!!\");\r\n+ }\r\n+\r\n+ P_waiting = calculateNewWaitingProcessesSet(instance2ProcessMap.get(executedInstance), P_waiting, P_executingProcesses);\r\n P_ready = Sets.newHashSet(Sets.union(Sets.filter(P_waiting, isReadyPred), findInvokedProcesses()));\r\n P_waiting = Sets.newHashSet(Sets.difference(P_waiting, P_ready));\r\n- logInfo(\"Finished execution loop, {0} waiting, {1} ready, and {2} executing.\", P_waiting.size(), P_ready.size(),\r\n- P_executing.size());\r\n- mapping.remove(instance);\r\n+ logInfo(\"Finished execution loop, {0} waiting, {1} ready, and {2} executing.\", P_waiting.size(), P_ready.size(), P_executing.size());\r\n+ instance2ProcessMap.remove(executedInstance);\r\n }\r\n \r\n- if(P_waiting.size() > 0) {\r\n+ if (P_waiting.size() > 0) {\r\n logInfo(\"Finished execution of {0} with waiting processes.\", getName());\r\n }\r\n \r\n }\r\n \r\n- private Set<OPPProcess> calculateNewWaitingProcessesSet(OPPProcess process, Set<OPPProcess> P_waiting,\r\n- Set<OPPProcess> P_executing) {\r\n+ private Set<OPPProcess> calculateNewWaitingProcessesSet(OPPProcess process, Set<OPPProcess> P_waiting, Set<OPPProcess> P_executing) {\r\n Set<OPPProcess> successors = executionAnalyzer.findFollowingProcesses(opdDag, process);\r\n Set<OPPProcess> P_waitingLocal = Sets.newHashSet(P_waiting);\r\n- while(successors.size() > 0) {\r\n- for(OPPProcess succ : Sets.filter(successors, Predicates.not(mustSkipPred))) {\r\n+ while (successors.size() > 0) {\r\n+ for (OPPProcess succ : Sets.filter(successors, Predicates.not(mustSkipPred))) {\r\n Set<OPPProcess> pred = executionAnalyzer.findRequiredProcesses(opdDag, succ);\r\n- if(Sets.intersection(Sets.union(P_waiting, P_executing), pred).size() == 0) {\r\n+ if (Sets.intersection(Sets.union(P_waiting, P_executing), pred).size() == 0) {\r\n P_waitingLocal.add(succ);\r\n }\r\n }\r\n \r\n Set<OPPProcess> newSuccessors = Sets.newHashSet();\r\n- for(OPPProcess skippedSucc : Sets.filter(successors, mustSkipPred)) {\r\n+ for (OPPProcess skippedSucc : Sets.filter(successors, mustSkipPred)) {\r\n Set<OPPProcess> pred = executionAnalyzer.findRequiredProcesses(opdDag, skippedSucc);\r\n- if(Sets.intersection(Sets.union(P_waiting, P_executing), pred).size() == 0) {\r\n+ if (Sets.intersection(Sets.union(P_waiting, P_executing), pred).size() == 0) {\r\n newSuccessors.addAll(executionAnalyzer.findFollowingProcesses(opdDag, skippedSucc));\r\n }\r\n }\r\n@@ -184,7 +187,7 @@ private Set<OPPProcess> calculateNewWaitingProcessesSet(OPPProcess process, Set<\n \r\n private Set<OPPProcess> findInvokedProcesses() {\r\n Set<OPPProcess> invokedProcesses = Sets.newHashSet();\r\n- for(OPPObject changedObject : heapObserver.getObjectsWithNewValue()) {\r\n+ for (OPPObject changedObject : heapObserver.getObjectsWithNewValue()) {\r\n invokedProcesses.addAll(findProcessesToInvokeAfterObjectHasChanged(changedObject));\r\n }\r\n invokedProcesses = Sets.filter(invokedProcesses, isReadyAndNotSkipPred);\r\n@@ -197,36 +200,37 @@ private Set<OPPProcess> findProcessesToInvokeAfterObjectHasChanged(OPPObject obj\n checkNotNull(value, \"Changed object cannot be null.\");\r\n Set<OPPProcess> ret = Sets.newHashSet();\r\n Collection<OPPProceduralLink> outgoingEventLinks = analyzer.findOutgoingEventLinks(object);\r\n- for(OPPProceduralLink eventLink : outgoingEventLinks) {\r\n- if(objectValueTriggersEvent(eventLink, value)) {\r\n+ for (OPPProceduralLink eventLink : outgoingEventLinks) {\r\n+ if (objectValueTriggersEvent(eventLink, value)) {\r\n ret.add(analyzer.getProcess(eventLink));\r\n }\r\n }\r\n return ret;\r\n }\r\n \r\n private boolean objectValueTriggersEvent(OPPProceduralLink link, OPPObjectInstance objectInstance) {\r\n- if(OPPObject.class.isInstance(link.getSource())) {\r\n+ if (OPPObject.class.isInstance(link.getSource())) {\r\n return true;\r\n- } else if(OPPState.class.isInstance(link.getSource())) {\r\n+ } else if (OPPState.class.isInstance(link.getSource())) {\r\n OPPState state = OPPState.class.cast(link.getSource());\r\n- if(valueAnalyzer.isObjectInstanceInState(objectInstance, state)) {\r\n+ if (valueAnalyzer.isObjectInstanceInState(objectInstance, state)) {\r\n return true;\r\n }\r\n }\r\n return false;\r\n }\r\n \r\n- @Override\r\n- public boolean isReady() {\r\n- Collection<OPPObject> parameters = analyzer.findIncomingParameters(getOpd());\r\n- for(OPPObject object : parameters) {\r\n- if(getArgument(object.getName()) == null) {\r\n- return false;\r\n- }\r\n- }\r\n- return true;\r\n- }\r\n+ // @Override\r\n+ // public boolean isReady() {\r\n+ // Collection<OPPObject> parameters =\r\n+ // analyzer.findIncomingParameters(getOpd());\r\n+ // for (OPPObject object : parameters) {\r\n+ // if (getArgument(object.getName()) == null) {\r\n+ // return false;\r\n+ // }\r\n+ // }\r\n+ // return true;\r\n+ // }\r\n \r\n /**\r\n * Get the main in-zoomed {@link OPPProcess} of the\r\n@@ -248,21 +252,21 @@ private OPPObjectProcessDiagram getOpd() {\n }\r\n \r\n @Override\r\n- public List<OPPParameter> getIncomingParameterNames() {\r\n+ public List<OPPParameter> getIncomingParameters() {\r\n List<OPPParameter> incomingParameters = Lists.newArrayList();\r\n Collection<OPPObject> parameters = analyzer.findIncomingParameters(getOpd());\r\n- for(OPPObject object : parameters) {\r\n- incomingParameters.add(new OPPParameter(object.getName(), object.isCollection()));\r\n+ for (OPPObject object : parameters) {\r\n+ incomingParameters.add(new OPPParameter(object.getName()));\r\n }\r\n return incomingParameters;\r\n }\r\n \r\n @Override\r\n- public List<OPPParameter> getOutgoingParameterNames() {\r\n+ public List<OPPParameter> getOutgoingParameters() {\r\n List<OPPParameter> outgoingParameters = Lists.newArrayList();\r\n Collection<OPPObject> parameters = analyzer.findOutgoingParameters(getOpd());\r\n- for(OPPObject object : parameters) {\r\n- outgoingParameters.add(new OPPParameter(object.getName(), object.isCollection()));\r\n+ for (OPPObject object : parameters) {\r\n+ outgoingParameters.add(new OPPParameter(object.getName()));\r\n }\r\n return outgoingParameters;\r\n }\r\n@@ -289,8 +293,8 @@ protected OPPProcessInstanceHeap getHeap() {\n class IsProcessReady extends ExecutablePredicateCommons implements Predicate<OPPProcess> {\r\n @Override\r\n public boolean apply(OPPProcess process) {\r\n- for(OPPProceduralLink link : analyzer.findIncomingProceduralLinks(process)) {\r\n- if(!isLinkSourceReady(link)) {\r\n+ for (OPPProceduralLink link : analyzer.findIncomingProceduralLinks(process)) {\r\n+ if (!isLinkSourceReady(link)) {\r\n logFine(PROCESS_NOT_READY, process.getName(), analyzer.getSourceObject(link).getName());\r\n return false;\r\n }\r\n@@ -302,8 +306,8 @@ public boolean apply(OPPProcess process) {\n class mustSkipProcess extends ExecutablePredicateCommons implements Predicate<OPPProcess> {\r\n @Override\r\n public boolean apply(OPPProcess process) {\r\n- for(OPPProceduralLink link : analyzer.findIncomingProceduralLinks(process)) {\r\n- if(link.getSubKinds().contains(OPPConstants.OPP_CONDITIONAL_LINK_SUBKIND) && !isLinkSourceReady(link)) {\r\n+ for (OPPProceduralLink link : analyzer.findIncomingProceduralLinks(process)) {\r\n+ if (link.getSubKinds().contains(OPPConstants.OPP_CONDITIONAL_LINK_SUBKIND) && !isLinkSourceReady(link)) {\r\n return true;\r\n }\r\n }\r\n@@ -314,7 +318,7 @@ public boolean apply(OPPProcess process) {\n class ExecutablePredicateCommons {\r\n public boolean isObjectReady(OPPObject object) {\r\n OPPObjectInstance variable = heap.getVariable(object);\r\n- if(variable == null) {\r\n+ if (variable == null) {\r\n return false;\r\n } else {\r\n return true;\r\n@@ -324,7 +328,7 @@ public boolean isObjectReady(OPPObject object) {\n public boolean isObjectInState(OPPState state) {\r\n OPPObject sourceObject = analyzer.getObject(state);\r\n OPPObjectInstance variable = heap.getVariable(sourceObject);\r\n- if(!valueAnalyzer.isObjectInstanceInState(variable, state)) {\r\n+ if (!valueAnalyzer.isObjectInstanceInState(variable, state)) {\r\n return false;\r\n } else {\r\n return true;\r\n@@ -333,9 +337,9 @@ public boolean isObjectInState(OPPState state) {\n }\r\n \r\n public boolean isLinkSourceReady(OPPProceduralLink link) {\r\n- if(analyzer.isSourceObject(link)) {\r\n+ if (analyzer.isSourceObject(link)) {\r\n return isObjectReady(analyzer.getSourceObject(link));\r\n- } else if(analyzer.isSourceState(link)) {\r\n+ } else if (analyzer.isSourceState(link)) {\r\n return isObjectInState(analyzer.getSourceState(link));\r\n } else {\r\n throw new IllegalStateException(\"Process has incoming links with a source that is not an object.\");\r", "raw_url": "https://github.com/vainolo/Object-Process-Programming/raw/c8c3080c49e883f01a64afc8119c041a889f82d4/com.vainolo.phd.opp.interpreter%2Fsrc%2Fcom%2Fvainolo%2Fphd%2Fopp%2Finterpreter%2Finzoomedprocessinstance%2FOPPInZoomedProcessExecutableInstance.java", "sha": "68b343ffa566d0050ec31348615fb8150a0c70db", "status": "modified" }, { "additions": 29, "blob_url": "https://github.com/vainolo/Object-Process-Programming/blob/c8c3080c49e883f01a64afc8119c041a889f82d4/com.vainolo.phd.opp.interpreter%2Fsrc%2Fcom%2Fvainolo%2Fphd%2Fopp%2Finterpreter%2Finzoomedprocessinstance%2FOPPInZoomedProcessInstanceHeap.java", "changes": 130, "contents_url": "https://api.github.com/repos/vainolo/Object-Process-Programming/contents/com.vainolo.phd.opp.interpreter%2Fsrc%2Fcom%2Fvainolo%2Fphd%2Fopp%2Finterpreter%2Finzoomedprocessinstance%2FOPPInZoomedProcessInstanceHeap.java?ref=c8c3080c49e883f01a64afc8119c041a889f82d4", "deletions": 101, "filename": "com.vainolo.phd.opp.interpreter/src/com/vainolo/phd/opp/interpreter/inzoomedprocessinstance/OPPInZoomedProcessInstanceHeap.java", "new_code": "import com.vainolo.phd.opp.interpreter.OPPRuntimeException;\r\n if (analyzer.isObjectPartOfAnotherObject(object)) {\r\n if (parentValue == null) {\r\n parentValue.setPart(object.getName(), OPPObjectInstance.createFromExistingInstance(value));\r\n if (analyzer.isObjectPartOfAnotherObject(object)) {\r\n if (parent == null) {\r\n logSevere(\"Tried to get the value of {0} which is part of another object, but parent object doesn't exist.\", object.getName());\r\n throw new IllegalStateException(\"Getting value of an object which is part of another object, but parent doesn't exist.\");\r\n logFinest(\"Getting value of {0} which is {1}.\", object.getName(), parent.getPart(object.getName()));\r\n return parent.getPart(object.getName());\r\n for (OPPProceduralLink link : dataTransferLinks) {\r\n if (analyzer.isTargetProcess(link))\r\n\r\n if ((link.getCenterDecoration() == null) || (link.getCenterDecoration().equals(\"\"))) {\r\n setVariable(target, getVariable(source));\r\n } else if (!link.getCenterDecoration().contains(\",\")) {\r\n } else {\r\n throw new OPPRuntimeException(\"Data transfer modifiers are not supported.\");\r\n throw new OPPRuntimeException(\"Double data link modifiers are not supported\");\r\n if (objectValue != null)\r\n for (OPPObject object : objectVariables) {\r\n if (getVariable(object) != null)\r\n for (OPPObject object : objectArguments) {\r\n if (getArgument(object.getName()) != null) {\r\n for (OPPObject object : objectArguments) {\r\n if (getVariable(object) != null) {\r\n for (OPMHeapChange change : changes) {\r\n if (change.changeType.equals(OPMHeapChangeType.VARIABLE_SET)) {\r\n public OPMHeapChange(OPPObject parent, OPPObjectInstance parentInstance, OPPObject child, OPPObjectInstance childInstance) {\r", "new_methods": [], "old_code": "import static com.vainolo.phd.opp.interpreter.utils.OPPInterpreterPreconditions.*;\r\n if(analyzer.isObjectComposite(object)) {\r\n checkInstanceArgumentIsComposite(value, \"The value of a composite object must be a composite instance.\");\r\n } else {\r\n checkInstanceArgumentIsNotComposite(value, \"The value of a simple object cannot be a composite instance.\");\r\n }\r\n if(analyzer.isObjectCollection(object)) {\r\n checkInstanceArgumentIsCollection(value, \"The value of a collection object must be a collection instance.\");\r\n } else {\r\n checkInstanceArgumentIsNotCollection(value, \"The value of a simple object cannot be a collection instance.\");\r\n }\r\n\r\n if(analyzer.isObjectPartOfAnotherObject(object)) {\r\n if(parentValue == null) {\r\n parentValue.addCompositePart(object.getName(), OPPObjectInstance.createFromExistingInstance(value));\r\n if(analyzer.isObjectPartOfAnotherObject(object)) {\r\n if(parent == null) {\r\n logSevere(\"Tried to get the value of {0} which is part of another object, but parent object doesn't exist.\",\r\n object.getName());\r\n throw new IllegalStateException(\r\n \"Getting value of an object which is part of another object, but parent doesn't exist.\");\r\n logFinest(\"Getting value of {0} which is {1}.\", object.getName(), parent.getCompositePart(object.getName()));\r\n return parent.getCompositePart(object.getName());\r\n for(OPPProceduralLink link : dataTransferLinks) {\r\n if(analyzer.isTargetProcess(link))\r\n if((link.getCenterDecoration() == null) || (link.getCenterDecoration().equals(\"\"))) {\r\n transferDataWithNoReferences(source, target);\r\n } else if(!link.getCenterDecoration().contains(\",\")) {\r\n } else { // link.getCenterDecoration().contains(\",\")\r\n private void transferDataWithNoReferences(OPPObject source, OPPObject target) {\r\n if((source.isCollection() && target.isCollection()) || (!source.isCollection() && !target.isCollection())) {\r\n setVariable(target, getVariable(source));\r\n } else if(source.isCollection() && !target.isCollection()) {\r\n setVariable(target, getVariable(source).getCollectionFirstElement());\r\n } else { // !source.isCollection() && target.isCollection()\r\n OPPObjectInstance targetValue = getVariable(target);\r\n if(targetValue == null) {\r\n targetValue = OPPObjectInstance.createCollectionInstace();\r\n }\r\n targetValue.appendCollectionElement(getVariable(source));\r\n setVariable(target, targetValue);\r\n }\r\n }\r\n\r\n if(source.isCollection() && !target.isCollection()) {\r\n setVariable(target, getCollectionValueUsingReference(source, link.getCenterDecoration()));\r\n } else if(!source.isCollection() && target.isCollection()) {\r\n OPPObjectInstance targetValue = putValueInCollectionUsingReference(getVariable(source),\r\n link.getCenterDecoration(), target);\r\n setVariable(target, targetValue);\r\n } else {\r\n throw new IllegalStateException(\"Invalid reference state in data transfer link.\");\r\n }\r\n if(source.isCollection() && target.isCollection()) {\r\n String[] refs = link.getCenterDecoration().split(\",\");\r\n if(refs[0].equals(\"\") || refs[0].equals(\"\")) {\r\n throw new IllegalStateException(\"Invalid reference state in data transfer link.\");\r\n }\r\n OPPObjectInstance sourceValue = getCollectionValueUsingReference(source, refs[0]);\r\n OPPObjectInstance targetValue = putValueInCollectionUsingReference(sourceValue, refs[1], target);\r\n setVariable(target, targetValue);\r\n } else {\r\n throw new IllegalStateException(\"Invalid reference state in data transfer link.\");\r\n }\r\n }\r\n\r\n private OPPObjectInstance getCollectionValueUsingReference(OPPObject source, String reference) {\r\n OPPObjectInstance sourceValue = null;\r\n if(valueAnalyzer.isNumericalLiteral(reference)) {\r\n int sourceIndex = valueAnalyzer.parseNumericalLiteral(reference).intValue();\r\n sourceValue = getVariable(source).getCollectionElementAtIndex(sourceIndex);\r\n } else {\r\n sourceValue = getVariable(source).getCollectionElement(reference);\r\n }\r\n return sourceValue;\r\n }\r\n\r\n private OPPObjectInstance putValueInCollectionUsingReference(OPPObjectInstance value, String reference,\r\n OPPObject targetCollection) {\r\n OPPObjectInstance targetValue = getVariable(targetCollection);\r\n if(targetValue == null) {\r\n targetValue = OPPObjectInstance.createCollectionInstace();\r\n }\r\n if(valueAnalyzer.isNumericalLiteral(reference)) {\r\n int targetIndex = valueAnalyzer.parseNumericalLiteral(reference).intValue();\r\n targetValue.putCollectionElementAtIndex(targetIndex, value);\r\n } else {\r\n targetValue.putCollectionElement(reference, value);\r\n }\r\n return targetValue;\r\n if(objectValue != null)\r\n for(OPPObject object : objectVariables) {\r\n if(getVariable(object) != null)\r\n for(OPPObject object : objectArguments) {\r\n if(getArgument(object.getName()) != null) {\r\n for(OPPObject object : objectArguments) {\r\n if(getVariable(object) != null) {\r\n for(OPMHeapChange change : changes) {\r\n if(change.changeType.equals(OPMHeapChangeType.VARIABLE_SET)) {\r\n public OPMHeapChange(OPPObject parent, OPPObjectInstance parentInstance, OPPObject child,\r\n OPPObjectInstance childInstance) {\r", "old_methods": [ { "arguments": [ "OPPObject source", " OPPObject target" ], "filename": "com.vainolo.phd.opp.interpreter/src/com/vainolo/phd/opp/interpreter/inzoomedprocessinstance/OPPInZoomedProcessInstanceHeap.java", "implementation": "if((source.isCollection() && target.isCollection()) || (!source.isCollection() && !target.isCollection())) {\r\n setVariable(target, getVariable(source));", "signature": "void transferDataWithNoReferences(OPPObject source, OPPObject target)" }, { "arguments": [ "OPPObject source", " String reference" ], "filename": "com.vainolo.phd.opp.interpreter/src/com/vainolo/phd/opp/interpreter/inzoomedprocessinstance/OPPInZoomedProcessInstanceHeap.java", "implementation": "OPPObjectInstance sourceValue = null;\r\n if(valueAnalyzer.isNumericalLiteral(reference)) {\r\n int sourceIndex = valueAnalyzer.parseNumericalLiteral(reference).intValue();\r\n sourceValue = getVariable(source).getCollectionElementAtIndex(sourceIndex);", "signature": "OPPObjectInstance getCollectionValueUsingReference(OPPObject source, String reference)" }, { "arguments": [ "OPPObjectInstance value", " String reference", "\r\n OPPObject targetCollection" ], "filename": "com.vainolo.phd.opp.interpreter/src/com/vainolo/phd/opp/interpreter/inzoomedprocessinstance/OPPInZoomedProcessInstanceHeap.java", "implementation": "OPPObjectInstance targetValue = getVariable(targetCollection);\r\n if(targetValue == null) {\r\n targetValue = OPPObjectInstance.createCollectionInstace();", "signature": "OPPObjectInstance putValueInCollectionUsingReference(OPPObjectInstance value, String reference,\r\n OPPObject targetCollection)" } ], "patch": "@@ -9,7 +9,6 @@\n import java.util.Set;\r\n \r\n import static com.google.common.base.Preconditions.*;\r\n-import static com.vainolo.phd.opp.interpreter.utils.OPPInterpreterPreconditions.*;\r\n import static com.vainolo.phd.opp.utilities.OPPLogger.*;\r\n \r\n import com.google.common.collect.Lists;\r\n@@ -19,6 +18,7 @@\n import com.vainolo.phd.opp.interpreter.OPPObjectInstance;\r\n import com.vainolo.phd.opp.interpreter.OPPObjectInstanceValueAnalyzer;\r\n import com.vainolo.phd.opp.interpreter.OPPProcessInstanceHeap;\r\n+import com.vainolo.phd.opp.interpreter.OPPRuntimeException;\r\n import com.vainolo.phd.opp.model.OPPObject;\r\n import com.vainolo.phd.opp.model.OPPObjectProcessDiagram;\r\n import com.vainolo.phd.opp.model.OPPProceduralLink;\r\n@@ -64,27 +64,16 @@ public class OPPInZoomedProcessInstanceHeap extends OPPProcessInstanceHeap {\n public void setVariable(OPPObject object, OPPObjectInstance value) {\r\n logFiner(\"Setting value of object {0} with value {1}.\", object.getName(), value.toString());\r\n checkArgument(value != null, \"Value cannot be null\");\r\n- if(analyzer.isObjectComposite(object)) {\r\n- checkInstanceArgumentIsComposite(value, \"The value of a composite object must be a composite instance.\");\r\n- } else {\r\n- checkInstanceArgumentIsNotComposite(value, \"The value of a simple object cannot be a composite instance.\");\r\n- }\r\n \r\n- if(analyzer.isObjectCollection(object)) {\r\n- checkInstanceArgumentIsCollection(value, \"The value of a collection object must be a collection instance.\");\r\n- } else {\r\n- checkInstanceArgumentIsNotCollection(value, \"The value of a simple object cannot be a collection instance.\");\r\n- }\r\n-\r\n- if(analyzer.isObjectPartOfAnotherObject(object)) {\r\n+ if (analyzer.isObjectPartOfAnotherObject(object)) {\r\n OPPObject parentObject = analyzer.findParent(object);\r\n OPPObjectInstance parentValue = getVariable(parentObject);\r\n- if(parentValue == null) {\r\n+ if (parentValue == null) {\r\n parentValue = OPPObjectInstance.createCompositeInstance();\r\n }\r\n setVariable(parentObject, parentValue);\r\n parentValue = getVariable(parentObject);\r\n- parentValue.addCompositePart(object.getName(), OPPObjectInstance.createFromExistingInstance(value));\r\n+ parentValue.setPart(object.getName(), OPPObjectInstance.createFromExistingInstance(value));\r\n observable.notifyObservers(new OPMHeapChange(parentObject, parentValue, object, getVariable(object)));\r\n } else {\r\n OPPObjectInstance objectValue = OPPObjectInstance.createFromExistingInstance(value);\r\n@@ -105,16 +94,14 @@ public void setVariable(OPPObject object, OPPObjectInstance value) {\n * value has been assigned.\r\n */\r\n public OPPObjectInstance getVariable(OPPObject object) {\r\n- if(analyzer.isObjectPartOfAnotherObject(object)) {\r\n+ if (analyzer.isObjectPartOfAnotherObject(object)) {\r\n OPPObjectInstance parent = getVariable(analyzer.findParent(object));\r\n- if(parent == null) {\r\n- logSevere(\"Tried to get the value of {0} which is part of another object, but parent object doesn't exist.\",\r\n- object.getName());\r\n- throw new IllegalStateException(\r\n- \"Getting value of an object which is part of another object, but parent doesn't exist.\");\r\n+ if (parent == null) {\r\n+ logSevere(\"Tried to get the value of {0} which is part of another object, but parent object doesn't exist.\", object.getName());\r\n+ throw new IllegalStateException(\"Getting value of an object which is part of another object, but parent doesn't exist.\");\r\n } else {\r\n- logFinest(\"Getting value of {0} which is {1}.\", object.getName(), parent.getCompositePart(object.getName()));\r\n- return parent.getCompositePart(object.getName());\r\n+ logFinest(\"Getting value of {0} which is {1}.\", object.getName(), parent.getPart(object.getName()));\r\n+ return parent.getPart(object.getName());\r\n }\r\n } else {\r\n logFinest(\"Getting value of {0} which is {1}.\", object.getName(), variables.get(object));\r\n@@ -130,86 +117,28 @@ public OPPObjectInstance getVariable(OPPObject object) {\n */\r\n private void transferDataFromObject(OPPObject source) {\r\n Collection<OPPProceduralLink> dataTransferLinks = analyzer.findOutgoingDataLinks(source);\r\n- for(OPPProceduralLink link : dataTransferLinks) {\r\n- if(analyzer.isTargetProcess(link))\r\n+ for (OPPProceduralLink link : dataTransferLinks) {\r\n+ if (analyzer.isTargetProcess(link))\r\n continue;\r\n+\r\n OPPObject target = analyzer.getTargetObject(link);\r\n \r\n- if((link.getCenterDecoration() == null) || (link.getCenterDecoration().equals(\"\"))) {\r\n- transferDataWithNoReferences(source, target);\r\n- } else if(!link.getCenterDecoration().contains(\",\")) {\r\n+ if ((link.getCenterDecoration() == null) || (link.getCenterDecoration().equals(\"\"))) {\r\n+ setVariable(target, getVariable(source));\r\n+ } else if (!link.getCenterDecoration().contains(\",\")) {\r\n transferDataWithOneReference(source, link, target);\r\n- } else { // link.getCenterDecoration().contains(\",\")\r\n+ } else {\r\n transferDataWithTwoReferences(source, link, target);\r\n }\r\n }\r\n }\r\n \r\n- private void transferDataWithNoReferences(OPPObject source, OPPObject target) {\r\n- if((source.isCollection() && target.isCollection()) || (!source.isCollection() && !target.isCollection())) {\r\n- setVariable(target, getVariable(source));\r\n- } else if(source.isCollection() && !target.isCollection()) {\r\n- setVariable(target, getVariable(source).getCollectionFirstElement());\r\n- } else { // !source.isCollection() && target.isCollection()\r\n- OPPObjectInstance targetValue = getVariable(target);\r\n- if(targetValue == null) {\r\n- targetValue = OPPObjectInstance.createCollectionInstace();\r\n- }\r\n- targetValue.appendCollectionElement(getVariable(source));\r\n- setVariable(target, targetValue);\r\n- }\r\n- }\r\n-\r\n private void transferDataWithOneReference(OPPObject source, OPPProceduralLink link, OPPObject target) {\r\n- if(source.isCollection() && !target.isCollection()) {\r\n- setVariable(target, getCollectionValueUsingReference(source, link.getCenterDecoration()));\r\n- } else if(!source.isCollection() && target.isCollection()) {\r\n- OPPObjectInstance targetValue = putValueInCollectionUsingReference(getVariable(source),\r\n- link.getCenterDecoration(), target);\r\n- setVariable(target, targetValue);\r\n- } else {\r\n- throw new IllegalStateException(\"Invalid reference state in data transfer link.\");\r\n- }\r\n+ throw new OPPRuntimeException(\"Data transfer modifiers are not supported.\");\r\n }\r\n \r\n private void transferDataWithTwoReferences(OPPObject source, OPPProceduralLink link, OPPObject target) {\r\n- if(source.isCollection() && target.isCollection()) {\r\n- String[] refs = link.getCenterDecoration().split(\",\");\r\n- if(refs[0].equals(\"\") || refs[0].equals(\"\")) {\r\n- throw new IllegalStateException(\"Invalid reference state in data transfer link.\");\r\n- }\r\n- OPPObjectInstance sourceValue = getCollectionValueUsingReference(source, refs[0]);\r\n- OPPObjectInstance targetValue = putValueInCollectionUsingReference(sourceValue, refs[1], target);\r\n- setVariable(target, targetValue);\r\n- } else {\r\n- throw new IllegalStateException(\"Invalid reference state in data transfer link.\");\r\n- }\r\n- }\r\n-\r\n- private OPPObjectInstance getCollectionValueUsingReference(OPPObject source, String reference) {\r\n- OPPObjectInstance sourceValue = null;\r\n- if(valueAnalyzer.isNumericalLiteral(reference)) {\r\n- int sourceIndex = valueAnalyzer.parseNumericalLiteral(reference).intValue();\r\n- sourceValue = getVariable(source).getCollectionElementAtIndex(sourceIndex);\r\n- } else {\r\n- sourceValue = getVariable(source).getCollectionElement(reference);\r\n- }\r\n- return sourceValue;\r\n- }\r\n-\r\n- private OPPObjectInstance putValueInCollectionUsingReference(OPPObjectInstance value, String reference,\r\n- OPPObject targetCollection) {\r\n- OPPObjectInstance targetValue = getVariable(targetCollection);\r\n- if(targetValue == null) {\r\n- targetValue = OPPObjectInstance.createCollectionInstace();\r\n- }\r\n- if(valueAnalyzer.isNumericalLiteral(reference)) {\r\n- int targetIndex = valueAnalyzer.parseNumericalLiteral(reference).intValue();\r\n- targetValue.putCollectionElementAtIndex(targetIndex, value);\r\n- } else {\r\n- targetValue.putCollectionElement(reference, value);\r\n- }\r\n- return targetValue;\r\n+ throw new OPPRuntimeException(\"Double data link modifiers are not supported\");\r\n }\r\n \r\n /**\r\n@@ -221,7 +150,7 @@ private OPPObjectInstance putValueInCollectionUsingReference(OPPObjectInstance v\n */\r\n public void calculateOPMObjectValueAndSetVariableIfValueIfExists(OPPObject object) {\r\n OPPObjectInstance objectValue = valueAnalyzer.calculateOPMObjectValue(object, analyzer);\r\n- if(objectValue != null)\r\n+ if (objectValue != null)\r\n setVariable(object, objectValue);\r\n }\r\n \r\n@@ -230,9 +159,9 @@ public void calculateOPMObjectValueAndSetVariableIfValueIfExists(OPPObject objec\n */\r\n public void initializeVariablesWithLiterals(OPPProcess mainProcess) {\r\n Collection<OPPObject> objectVariables = analyzer.findObjects(mainProcess);\r\n- for(OPPObject object : objectVariables) {\r\n+ for (OPPObject object : objectVariables) {\r\n calculateOPMObjectValueAndSetVariableIfValueIfExists(object);\r\n- if(getVariable(object) != null)\r\n+ if (getVariable(object) != null)\r\n transferDataFromObject(object);\r\n }\r\n }\r\n@@ -243,8 +172,8 @@ public void initializeVariablesWithLiterals(OPPProcess mainProcess) {\n */\r\n public void initializeVariablesWithArgumentValues(OPPObjectProcessDiagram opd) {\r\n Collection<OPPObject> objectArguments = analyzer.findParameters(opd);\r\n- for(OPPObject object : objectArguments) {\r\n- if(getArgument(object.getName()) != null) {\r\n+ for (OPPObject object : objectArguments) {\r\n+ if (getArgument(object.getName()) != null) {\r\n setVariable(object, getArgument(object.getName()));\r\n } else {\r\n calculateOPMObjectValueAndSetVariableIfValueIfExists(object);\r\n@@ -275,8 +204,8 @@ public void initializeVariables(OPPObjectProcessDiagram opd) {\n */\r\n public void exportVariableValuesToArguments(OPPObjectProcessDiagram opd) {\r\n Collection<OPPObject> objectArguments = analyzer.findParameters(opd);\r\n- for(OPPObject object : objectArguments) {\r\n- if(getVariable(object) != null) {\r\n+ for (OPPObject object : objectArguments) {\r\n+ if (getVariable(object) != null) {\r\n addArgument(object.getName(), getVariable(object));\r\n }\r\n }\r\n@@ -318,8 +247,8 @@ public List<OPMHeapChange> getChanges() {\n \r\n public Set<OPPObject> getObjectsWithNewValue() {\r\n Set<OPPObject> objects = Sets.newHashSet();\r\n- for(OPMHeapChange change : changes) {\r\n- if(change.changeType.equals(OPMHeapChangeType.VARIABLE_SET)) {\r\n+ for (OPMHeapChange change : changes) {\r\n+ if (change.changeType.equals(OPMHeapChangeType.VARIABLE_SET)) {\r\n objects.add(change.object);\r\n }\r\n }\r\n@@ -344,8 +273,7 @@ public OPMHeapChange(OPPObject object, OPPObjectInstance instance) {\n this.objectInstance = instance;\r\n }\r\n \r\n- public OPMHeapChange(OPPObject parent, OPPObjectInstance parentInstance, OPPObject child,\r\n- OPPObjectInstance childInstance) {\r\n+ public OPMHeapChange(OPPObject parent, OPPObjectInstance parentInstance, OPPObject child, OPPObjectInstance childInstance) {\r\n this.changeType = OPMHeapChangeType.PART_ADDED;\r\n this.object = parent;\r\n this.objectInstance = parentInstance;\r", "raw_url": "https://github.com/vainolo/Object-Process-Programming/raw/c8c3080c49e883f01a64afc8119c041a889f82d4/com.vainolo.phd.opp.interpreter%2Fsrc%2Fcom%2Fvainolo%2Fphd%2Fopp%2Finterpreter%2Finzoomedprocessinstance%2FOPPInZoomedProcessInstanceHeap.java", "sha": "7b6e241301d90f6c233248448430a8bc142221ca", "status": "modified" }, { "additions": 2, "blob_url": "https://github.com/vainolo/Object-Process-Programming/blob/c8c3080c49e883f01a64afc8119c041a889f82d4/com.vainolo.phd.opp.interpreter%2Fsrc%2Fcom%2Fvainolo%2Fphd%2Fopp%2Finterpreter%2Finzoomedprocessinstance%2FOPPInZoomedProcessResultStorer.java", "changes": 4, "contents_url": "https://api.github.com/repos/vainolo/Object-Process-Programming/contents/com.vainolo.phd.opp.interpreter%2Fsrc%2Fcom%2Fvainolo%2Fphd%2Fopp%2Finterpreter%2Finzoomedprocessinstance%2FOPPInZoomedProcessResultStorer.java?ref=c8c3080c49e883f01a64afc8119c041a889f82d4", "deletions": 2, "filename": "com.vainolo.phd.opp.interpreter/src/com/vainolo/phd/opp/interpreter/inzoomedprocessinstance/OPPInZoomedProcessResultStorer.java", "new_code": " List<String> outgoingParameters = Lists.transform(instance.getOutgoingParameters(),\r\n if(instance.getOutgoingParameters().contains(resultObject.getName())) {\r", "new_methods": [], "old_code": " List<String> outgoingParameters = Lists.transform(instance.getOutgoingParameterNames(),\r\n if(instance.getOutgoingParameterNames().contains(resultObject.getName())) {\r", "old_methods": [], "patch": "@@ -44,7 +44,7 @@ public void extractResultsToVariables(OPPProcess process, OPPProcessInstance ins\n logFine(\"Found {0} anonymous results and {1} named results.\", anonymousResultObjects.size(), namedResults.size());\r\n \r\n // First extract named results\r\n- List<String> outgoingParameters = Lists.transform(instance.getOutgoingParameterNames(),\r\n+ List<String> outgoingParameters = Lists.transform(instance.getOutgoingParameters(),\r\n new Function<OPPParameter, String>() {\r\n @Override\r\n public String apply(OPPParameter input) {\r\n@@ -60,7 +60,7 @@ public String apply(OPPParameter input) {\n Iterator<OPPObject> anonymousResultsIterator = anonymousResultObjects.iterator();\r\n while(anonymousResultsIterator.hasNext()) {\r\n OPPObject resultObject = anonymousResultsIterator.next();\r\n- if(instance.getOutgoingParameterNames().contains(resultObject.getName())) {\r\n+ if(instance.getOutgoingParameters().contains(resultObject.getName())) {\r\n if(instance.getArgument(resultObject.getName()) != null) {\r\n heap.setVariable(resultObject, instance.getArgument(resultObject.getName()));\r\n anonymousResultsIterator.remove();\r", "raw_url": "https://github.com/vainolo/Object-Process-Programming/raw/c8c3080c49e883f01a64afc8119c041a889f82d4/com.vainolo.phd.opp.interpreter%2Fsrc%2Fcom%2Fvainolo%2Fphd%2Fopp%2Finterpreter%2Finzoomedprocessinstance%2FOPPInZoomedProcessResultStorer.java", "sha": "6ee3c399f7c66e3ee6dd9b93557db2adf59ef53f", "status": "modified" }, { "additions": 0, "blob_url": "https://github.com/vainolo/Object-Process-Programming/blob/c8c3080c49e883f01a64afc8119c041a889f82d4/com.vainolo.phd.opp.model%2F.settings%2Forg.eclipse.jdt.core.prefs", "changes": 280, "contents_url": "https://api.github.com/repos/vainolo/Object-Process-Programming/contents/com.vainolo.phd.opp.model%2F.settings%2Forg.eclipse.jdt.core.prefs?ref=c8c3080c49e883f01a64afc8119c041a889f82d4", "deletions": 280, "filename": "com.vainolo.phd.opp.model/.settings/org.eclipse.jdt.core.prefs", "new_code": "", "new_methods": [], "old_code": "org.eclipse.jdt.core.formatter.align_type_members_on_columns=false\r\norg.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16\r\norg.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0\r\norg.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16\r\norg.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16\r\norg.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16\r\norg.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16\r\norg.eclipse.jdt.core.formatter.alignment_for_assignment=0\r\norg.eclipse.jdt.core.formatter.alignment_for_binary_expression=16\r\norg.eclipse.jdt.core.formatter.alignment_for_compact_if=16\r\norg.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80\r\norg.eclipse.jdt.core.formatter.alignment_for_enum_constants=0\r\norg.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16\r\norg.eclipse.jdt.core.formatter.alignment_for_method_declaration=0\r\norg.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16\r\norg.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16\r\norg.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16\r\norg.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80\r\norg.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16\r\norg.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16\r\norg.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16\r\norg.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16\r\norg.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16\r\norg.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16\r\norg.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16\r\norg.eclipse.jdt.core.formatter.blank_lines_after_imports=1\r\norg.eclipse.jdt.core.formatter.blank_lines_after_package=1\r\norg.eclipse.jdt.core.formatter.blank_lines_before_field=0\r\norg.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0\r\norg.eclipse.jdt.core.formatter.blank_lines_before_imports=1\r\norg.eclipse.jdt.core.formatter.blank_lines_before_member_type=1\r\norg.eclipse.jdt.core.formatter.blank_lines_before_method=1\r\norg.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1\r\norg.eclipse.jdt.core.formatter.blank_lines_before_package=0\r\norg.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1\r\norg.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1\r\norg.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line\r\norg.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line\r\norg.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line\r\norg.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line\r\norg.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line\r\norg.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line\r\norg.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line\r\norg.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line\r\norg.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line\r\norg.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line\r\norg.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line\r\norg.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false\r\norg.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false\r\norg.eclipse.jdt.core.formatter.comment.format_block_comments=true\r\norg.eclipse.jdt.core.formatter.comment.format_header=false\r\norg.eclipse.jdt.core.formatter.comment.format_html=true\r\norg.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true\r\norg.eclipse.jdt.core.formatter.comment.format_line_comments=true\r\norg.eclipse.jdt.core.formatter.comment.format_source_code=true\r\norg.eclipse.jdt.core.formatter.comment.indent_parameter_description=true\r\norg.eclipse.jdt.core.formatter.comment.indent_root_tags=true\r\norg.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert\r\norg.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert\r\norg.eclipse.jdt.core.formatter.comment.line_length=80\r\norg.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true\r\norg.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true\r\norg.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false\r\norg.eclipse.jdt.core.formatter.compact_else_if=true\r\norg.eclipse.jdt.core.formatter.continuation_indentation=2\r\norg.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2\r\norg.eclipse.jdt.core.formatter.disabling_tag=@formatter\\:off\r\norg.eclipse.jdt.core.formatter.enabling_tag=@formatter\\:on\r\norg.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false\r\norg.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true\r\norg.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true\r\norg.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true\r\norg.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true\r\norg.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true\r\norg.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true\r\norg.eclipse.jdt.core.formatter.indent_empty_lines=false\r\norg.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true\r\norg.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true\r\norg.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true\r\norg.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false\r\norg.eclipse.jdt.core.formatter.indentation.size=2\r\norg.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert\r\norg.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert\r\norg.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert\r\norg.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert\r\norg.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert\r\norg.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert\r\norg.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert\r\norg.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert\r\norg.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert\r\norg.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert\r\norg.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert\r\norg.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert\r\norg.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert\r\norg.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert\r\norg.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert\r\norg.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert\r\norg.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert\r\norg.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert\r\norg.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert\r\norg.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert\r\norg.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert\r\norg.eclipse.jdt.core.formatter.join_lines_in_comments=true\r\norg.eclipse.jdt.core.formatter.join_wrapped_lines=true\r\norg.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false\r\norg.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false\r\norg.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false\r\norg.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false\r\norg.eclipse.jdt.core.formatter.lineSplit=120\r\norg.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false\r\norg.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false\r\norg.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0\r\norg.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1\r\norg.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true\r\norg.eclipse.jdt.core.formatter.tabulation.char=space\r\norg.eclipse.jdt.core.formatter.tabulation.size=2\r\norg.eclipse.jdt.core.formatter.use_on_off_tags=true\r\norg.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false\r\norg.eclipse.jdt.core.formatter.wrap_before_binary_operator=true\r\norg.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true\r\norg.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true\r", "old_methods": [], "patch": "@@ -10,283 +10,3 @@ org.eclipse.jdt.core.compiler.problem.assertIdentifier=error\n org.eclipse.jdt.core.compiler.problem.enumIdentifier=error\r\n org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning\r\n org.eclipse.jdt.core.compiler.source=1.7\r\n-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false\r\n-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16\r\n-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0\r\n-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16\r\n-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16\r\n-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16\r\n-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16\r\n-org.eclipse.jdt.core.formatter.alignment_for_assignment=0\r\n-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16\r\n-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16\r\n-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80\r\n-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0\r\n-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16\r\n-org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0\r\n-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16\r\n-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16\r\n-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16\r\n-org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80\r\n-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16\r\n-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16\r\n-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16\r\n-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16\r\n-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16\r\n-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16\r\n-org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16\r\n-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1\r\n-org.eclipse.jdt.core.formatter.blank_lines_after_package=1\r\n-org.eclipse.jdt.core.formatter.blank_lines_before_field=0\r\n-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0\r\n-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1\r\n-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1\r\n-org.eclipse.jdt.core.formatter.blank_lines_before_method=1\r\n-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1\r\n-org.eclipse.jdt.core.formatter.blank_lines_before_package=0\r\n-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1\r\n-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1\r\n-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line\r\n-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line\r\n-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line\r\n-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line\r\n-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line\r\n-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line\r\n-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line\r\n-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line\r\n-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line\r\n-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line\r\n-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line\r\n-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false\r\n-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false\r\n-org.eclipse.jdt.core.formatter.comment.format_block_comments=true\r\n-org.eclipse.jdt.core.formatter.comment.format_header=false\r\n-org.eclipse.jdt.core.formatter.comment.format_html=true\r\n-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true\r\n-org.eclipse.jdt.core.formatter.comment.format_line_comments=true\r\n-org.eclipse.jdt.core.formatter.comment.format_source_code=true\r\n-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true\r\n-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true\r\n-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert\r\n-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert\r\n-org.eclipse.jdt.core.formatter.comment.line_length=80\r\n-org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true\r\n-org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true\r\n-org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false\r\n-org.eclipse.jdt.core.formatter.compact_else_if=true\r\n-org.eclipse.jdt.core.formatter.continuation_indentation=2\r\n-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2\r\n-org.eclipse.jdt.core.formatter.disabling_tag=@formatter\\:off\r\n-org.eclipse.jdt.core.formatter.enabling_tag=@formatter\\:on\r\n-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false\r\n-org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true\r\n-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true\r\n-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true\r\n-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true\r\n-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true\r\n-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true\r\n-org.eclipse.jdt.core.formatter.indent_empty_lines=false\r\n-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true\r\n-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true\r\n-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true\r\n-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false\r\n-org.eclipse.jdt.core.formatter.indentation.size=2\r\n-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert\r\n-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert\r\n-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert\r\n-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert\r\n-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert\r\n-org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert\r\n-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert\r\n-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert\r\n-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert\r\n-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert\r\n-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert\r\n-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert\r\n-org.eclipse.jdt.core.formatter.join_lines_in_comments=true\r\n-org.eclipse.jdt.core.formatter.join_wrapped_lines=true\r\n-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false\r\n-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false\r\n-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false\r\n-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false\r\n-org.eclipse.jdt.core.formatter.lineSplit=120\r\n-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false\r\n-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false\r\n-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0\r\n-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1\r\n-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true\r\n-org.eclipse.jdt.core.formatter.tabulation.char=space\r\n-org.eclipse.jdt.core.formatter.tabulation.size=2\r\n-org.eclipse.jdt.core.formatter.use_on_off_tags=true\r\n-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false\r\n-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true\r\n-org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true\r\n-org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true\r", "raw_url": "https://github.com/vainolo/Object-Process-Programming/raw/c8c3080c49e883f01a64afc8119c041a889f82d4/com.vainolo.phd.opp.model%2F.settings%2Forg.eclipse.jdt.core.prefs", "sha": "f4217b01dd2e048b7250aa1835ddf636fb75d6ea", "status": "modified" }, { "additions": 0, "blob_url": "https://github.com/vainolo/Object-Process-Programming/blob/c8c3080c49e883f01a64afc8119c041a889f82d4/com.vainolo.phd.opp.model%2F.settings%2Forg.eclipse.jdt.ui.prefs", "changes": 1, "contents_url": "https://api.github.com/repos/vainolo/Object-Process-Programming/contents/com.vainolo.phd.opp.model%2F.settings%2Forg.eclipse.jdt.ui.prefs?ref=c8c3080c49e883f01a64afc8119c041a889f82d4", "deletions": 1, "filename": "com.vainolo.phd.opp.model/.settings/org.eclipse.jdt.ui.prefs", "new_code": "", "new_methods": [], "old_code": "formatter_profile=_Vainolo\r", "old_methods": [], "patch": "@@ -1,3 +1,2 @@\n eclipse.preferences.version=1\r\n-formatter_profile=_Vainolo\r\n formatter_settings_version=12\r", "raw_url": "https://github.com/vainolo/Object-Process-Programming/raw/c8c3080c49e883f01a64afc8119c041a889f82d4/com.vainolo.phd.opp.model%2F.settings%2Forg.eclipse.jdt.ui.prefs", "sha": "069fa88fb669c47c870f5b7f6d16ef0c368481a1", "status": "modified" }, { "additions": 0, "blob_url": "https://github.com/vainolo/Object-Process-Programming/blob/c8c3080c49e883f01a64afc8119c041a889f82d4/com.vainolo.phd.opp.releng%2Fpom.xml", "changes": 5, "contents_url": "https://api.github.com/repos/vainolo/Object-Process-Programming/contents/com.vainolo.phd.opp.releng%2Fpom.xml?ref=c8c3080c49e883f01a64afc8119c041a889f82d4", "deletions": 5, "filename": "com.vainolo.phd.opp.releng/pom.xml", "new_code": "", "new_methods": [], "old_code": "\t\t<repository>\r\n\t\t <id>com.vainolo.vainolibraries</id>\r\n\t\t <layout>p2</layout>\r\n\t\t <url>http://www.vainolo.com/files/repos/vainolibraries/repository</url>\r\n\t\t</repository>\r", "old_methods": [], "patch": "@@ -12,11 +12,6 @@\n \t\t\t<layout>p2</layout>\r\n \t\t\t<url>http://download.eclipse.org/releases/luna</url>\r\n \t\t</repository>\r\n-\t\t<repository>\r\n-\t\t <id>com.vainolo.vainolibraries</id>\r\n-\t\t <layout>p2</layout>\r\n-\t\t <url>http://www.vainolo.com/files/repos/vainolibraries/repository</url>\r\n-\t\t</repository>\r\n \t</repositories>\r\n \r\n \t<build>\r", "raw_url": "https://github.com/vainolo/Object-Process-Programming/raw/c8c3080c49e883f01a64afc8119c041a889f82d4/com.vainolo.phd.opp.releng%2Fpom.xml", "sha": "11e7102aa4e73f0c0aa0c052e0415bcd6b7ec146", "status": "modified" }, { "additions": 0, "blob_url": "https://github.com/vainolo/Object-Process-Programming/blob/c8c3080c49e883f01a64afc8119c041a889f82d4/com.vainolo.phd.opp.utilities%2F.settings%2Forg.eclipse.jdt.core.prefs", "changes": 280, "contents_url": "https://api.github.com/repos/vainolo/Object-Process-Programming/contents/com.vainolo.phd.opp.utilities%2F.settings%2Forg.eclipse.jdt.core.prefs?ref=c8c3080c49e883f01a64afc8119c041a889f82d4", "deletions": 280, "filename": "com.vainolo.phd.opp.utilities/.settings/org.eclipse.jdt.core.prefs", "new_code": "", "new_methods": [], "old_code": "org.eclipse.jdt.core.formatter.align_type_members_on_columns=false\r\norg.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16\r\norg.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0\r\norg.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16\r\norg.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16\r\norg.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16\r\norg.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16\r\norg.eclipse.jdt.core.formatter.alignment_for_assignment=0\r\norg.eclipse.jdt.core.formatter.alignment_for_binary_expression=16\r\norg.eclipse.jdt.core.formatter.alignment_for_compact_if=16\r\norg.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80\r\norg.eclipse.jdt.core.formatter.alignment_for_enum_constants=0\r\norg.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16\r\norg.eclipse.jdt.core.formatter.alignment_for_method_declaration=0\r\norg.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16\r\norg.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16\r\norg.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16\r\norg.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80\r\norg.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16\r\norg.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16\r\norg.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16\r\norg.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16\r\norg.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16\r\norg.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16\r\norg.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16\r\norg.eclipse.jdt.core.formatter.blank_lines_after_imports=1\r\norg.eclipse.jdt.core.formatter.blank_lines_after_package=1\r\norg.eclipse.jdt.core.formatter.blank_lines_before_field=0\r\norg.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0\r\norg.eclipse.jdt.core.formatter.blank_lines_before_imports=1\r\norg.eclipse.jdt.core.formatter.blank_lines_before_member_type=1\r\norg.eclipse.jdt.core.formatter.blank_lines_before_method=1\r\norg.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1\r\norg.eclipse.jdt.core.formatter.blank_lines_before_package=0\r\norg.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1\r\norg.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1\r\norg.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line\r\norg.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line\r\norg.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line\r\norg.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line\r\norg.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line\r\norg.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line\r\norg.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line\r\norg.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line\r\norg.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line\r\norg.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line\r\norg.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line\r\norg.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false\r\norg.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false\r\norg.eclipse.jdt.core.formatter.comment.format_block_comments=true\r\norg.eclipse.jdt.core.formatter.comment.format_header=false\r\norg.eclipse.jdt.core.formatter.comment.format_html=true\r\norg.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true\r\norg.eclipse.jdt.core.formatter.comment.format_line_comments=true\r\norg.eclipse.jdt.core.formatter.comment.format_source_code=true\r\norg.eclipse.jdt.core.formatter.comment.indent_parameter_description=true\r\norg.eclipse.jdt.core.formatter.comment.indent_root_tags=true\r\norg.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert\r\norg.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert\r\norg.eclipse.jdt.core.formatter.comment.line_length=80\r\norg.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true\r\norg.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true\r\norg.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false\r\norg.eclipse.jdt.core.formatter.compact_else_if=true\r\norg.eclipse.jdt.core.formatter.continuation_indentation=2\r\norg.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2\r\norg.eclipse.jdt.core.formatter.disabling_tag=@formatter\\:off\r\norg.eclipse.jdt.core.formatter.enabling_tag=@formatter\\:on\r\norg.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false\r\norg.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true\r\norg.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true\r\norg.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true\r\norg.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true\r\norg.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true\r\norg.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true\r\norg.eclipse.jdt.core.formatter.indent_empty_lines=false\r\norg.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true\r\norg.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true\r\norg.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true\r\norg.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false\r\norg.eclipse.jdt.core.formatter.indentation.size=2\r\norg.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert\r\norg.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert\r\norg.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert\r\norg.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert\r\norg.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert\r\norg.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert\r\norg.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert\r\norg.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert\r\norg.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert\r\norg.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert\r\norg.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert\r\norg.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert\r\norg.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert\r\norg.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert\r\norg.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert\r\norg.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert\r\norg.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert\r\norg.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert\r\norg.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert\r\norg.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert\r\norg.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert\r\norg.eclipse.jdt.core.formatter.join_lines_in_comments=true\r\norg.eclipse.jdt.core.formatter.join_wrapped_lines=true\r\norg.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false\r\norg.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false\r\norg.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false\r\norg.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false\r\norg.eclipse.jdt.core.formatter.lineSplit=120\r\norg.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false\r\norg.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false\r\norg.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0\r\norg.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1\r\norg.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true\r\norg.eclipse.jdt.core.formatter.tabulation.char=space\r\norg.eclipse.jdt.core.formatter.tabulation.size=2\r\norg.eclipse.jdt.core.formatter.use_on_off_tags=true\r\norg.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false\r\norg.eclipse.jdt.core.formatter.wrap_before_binary_operator=true\r\norg.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true\r\norg.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true\r", "old_methods": [], "patch": "@@ -10,283 +10,3 @@ org.eclipse.jdt.core.compiler.debug.sourceFile=generate\n org.eclipse.jdt.core.compiler.problem.assertIdentifier=error\r\n org.eclipse.jdt.core.compiler.problem.enumIdentifier=error\r\n org.eclipse.jdt.core.compiler.source=1.8\r\n-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false\r\n-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16\r\n-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0\r\n-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16\r\n-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16\r\n-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16\r\n-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16\r\n-org.eclipse.jdt.core.formatter.alignment_for_assignment=0\r\n-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16\r\n-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16\r\n-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80\r\n-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0\r\n-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16\r\n-org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0\r\n-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16\r\n-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16\r\n-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16\r\n-org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80\r\n-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16\r\n-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16\r\n-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16\r\n-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16\r\n-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16\r\n-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16\r\n-org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16\r\n-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1\r\n-org.eclipse.jdt.core.formatter.blank_lines_after_package=1\r\n-org.eclipse.jdt.core.formatter.blank_lines_before_field=0\r\n-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0\r\n-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1\r\n-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1\r\n-org.eclipse.jdt.core.formatter.blank_lines_before_method=1\r\n-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1\r\n-org.eclipse.jdt.core.formatter.blank_lines_before_package=0\r\n-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1\r\n-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1\r\n-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line\r\n-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line\r\n-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line\r\n-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line\r\n-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line\r\n-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line\r\n-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line\r\n-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line\r\n-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line\r\n-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line\r\n-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line\r\n-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false\r\n-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false\r\n-org.eclipse.jdt.core.formatter.comment.format_block_comments=true\r\n-org.eclipse.jdt.core.formatter.comment.format_header=false\r\n-org.eclipse.jdt.core.formatter.comment.format_html=true\r\n-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true\r\n-org.eclipse.jdt.core.formatter.comment.format_line_comments=true\r\n-org.eclipse.jdt.core.formatter.comment.format_source_code=true\r\n-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true\r\n-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true\r\n-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert\r\n-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert\r\n-org.eclipse.jdt.core.formatter.comment.line_length=80\r\n-org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true\r\n-org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true\r\n-org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false\r\n-org.eclipse.jdt.core.formatter.compact_else_if=true\r\n-org.eclipse.jdt.core.formatter.continuation_indentation=2\r\n-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2\r\n-org.eclipse.jdt.core.formatter.disabling_tag=@formatter\\:off\r\n-org.eclipse.jdt.core.formatter.enabling_tag=@formatter\\:on\r\n-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false\r\n-org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true\r\n-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true\r\n-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true\r\n-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true\r\n-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true\r\n-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true\r\n-org.eclipse.jdt.core.formatter.indent_empty_lines=false\r\n-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true\r\n-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true\r\n-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true\r\n-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false\r\n-org.eclipse.jdt.core.formatter.indentation.size=2\r\n-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert\r\n-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert\r\n-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert\r\n-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert\r\n-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert\r\n-org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert\r\n-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert\r\n-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert\r\n-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert\r\n-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert\r\n-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert\r\n-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert\r\n-org.eclipse.jdt.core.formatter.join_lines_in_comments=true\r\n-org.eclipse.jdt.core.formatter.join_wrapped_lines=true\r\n-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false\r\n-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false\r\n-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false\r\n-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false\r\n-org.eclipse.jdt.core.formatter.lineSplit=120\r\n-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false\r\n-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false\r\n-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0\r\n-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1\r\n-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true\r\n-org.eclipse.jdt.core.formatter.tabulation.char=space\r\n-org.eclipse.jdt.core.formatter.tabulation.size=2\r\n-org.eclipse.jdt.core.formatter.use_on_off_tags=true\r\n-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false\r\n-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true\r\n-org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true\r\n-org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true\r", "raw_url": "https://github.com/vainolo/Object-Process-Programming/raw/c8c3080c49e883f01a64afc8119c041a889f82d4/com.vainolo.phd.opp.utilities%2F.settings%2Forg.eclipse.jdt.core.prefs", "sha": "ace45ceefb456b3fa957d31f9c54df016ce54e53", "status": "modified" }, { "additions": 0, "blob_url": "https://github.com/vainolo/Object-Process-Programming/blob/c8c3080c49e883f01a64afc8119c041a889f82d4/com.vainolo.phd.opp.utilities%2F.settings%2Forg.eclipse.jdt.ui.prefs", "changes": 1, "contents_url": "https://api.github.com/repos/vainolo/Object-Process-Programming/contents/com.vainolo.phd.opp.utilities%2F.settings%2Forg.eclipse.jdt.ui.prefs?ref=c8c3080c49e883f01a64afc8119c041a889f82d4", "deletions": 1, "filename": "com.vainolo.phd.opp.utilities/.settings/org.eclipse.jdt.ui.prefs", "new_code": "", "new_methods": [], "old_code": "formatter_profile=_Vainolo\r", "old_methods": [], "patch": "@@ -1,6 +1,5 @@\n eclipse.preferences.version=1\r\n editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true\r\n-formatter_profile=_Vainolo\r\n formatter_settings_version=12\r\n sp_cleanup.add_default_serial_version_id=true\r\n sp_cleanup.add_generated_serial_version_id=false\r", "raw_url": "https://github.com/vainolo/Object-Process-Programming/raw/c8c3080c49e883f01a64afc8119c041a889f82d4/com.vainolo.phd.opp.utilities%2F.settings%2Forg.eclipse.jdt.ui.prefs", "sha": "fac0abca3c71af47e11438829136a2e67f087ae1", "status": "modified" }, { "additions": 8, "blob_url": "https://github.com/vainolo/Object-Process-Programming/blob/c8c3080c49e883f01a64afc8119c041a889f82d4/com.vainolo.phd.opp.utilities%2Fsrc%2Fcom%2Fvainolo%2Fphd%2Fopp%2Futilities%2FOPPFileUtils.java", "changes": 91, "contents_url": "https://api.github.com/repos/vainolo/Object-Process-Programming/contents/com.vainolo.phd.opp.utilities%2Fsrc%2Fcom%2Fvainolo%2Fphd%2Fopp%2Futilities%2FOPPFileUtils.java?ref=c8c3080c49e883f01a64afc8119c041a889f82d4", "deletions": 83, "filename": "com.vainolo.phd.opp.utilities/src/com/vainolo/phd/opp/utilities/OPPFileUtils.java", "new_code": "import static com.vainolo.phd.opp.utilities.OPPLogger.logSevere;\r\n resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap().put(Resource.Factory.Registry.DEFAULT_EXTENSION, new XMIResourceFactoryImpl());\r\n } catch (final IOException e) {\r\n logSevere(\"OPD File \" + uri + \" could not be loaded. Please check the path.\");\r\n logSevere(\"Exception thrown: \" + e);\r\n public static void createOPPFile(IFile opdFile, String name, OPPObjectProcessDiagramKind kind, boolean isObject, boolean isProcess) throws IOException {\r\n if (opdFile.exists()) {\r\n switch (kind) {\r", "new_methods": [], "old_code": "import static com.vainolo.phd.opp.utilities.OPPLogger.logWarning;\r\n resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap()\r\n .put(Resource.Factory.Registry.DEFAULT_EXTENSION, new XMIResourceFactoryImpl());\r\n } catch(final IOException e) {\r\n logWarning(\"OPD File \" + uri + \" could not be loaded. Please check the path.\");\r\n logWarning(\"Exception thrown: \" + e);\r\n public static void createOPPFile(IFile opdFile, String name, OPPObjectProcessDiagramKind kind, boolean isObject,\r\n boolean isProcess) throws IOException {\r\n if(opdFile.exists()) {\r\n switch(kind) {\r\n\r\n // public static OPMObjectProcessDiagram loadOPDFile(String uri) {\r\n // OPMObjectProcessDiagram opd;\r\n // final ResourceSet resourceSet = new ResourceSetImpl();\r\n // resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap()\r\n // .put(Resource.Factory.Registry.DEFAULT_EXTENSION, new\r\n // XMIResourceFactoryImpl());\r\n // final Resource opdResource =\r\n // resourceSet.createResource(URI.createURI(uri));\r\n // try {\r\n // opdResource.load(null);\r\n // opd = (OPMObjectProcessDiagram) opdResource.getContents().get(0);\r\n // } catch(final IOException e) {\r\n // logWarning(\"OPD File \" + uri +\r\n // \" could not be loaded. Please check the path.\");\r\n // logWarning(\"Exception thrown: \" + e);\r\n // opd = null;\r\n // }\r\n //\r\n // return opd;\r\n // }\r\n //\r\n // public static void createOPDFile2(IFile opdFile, String name,\r\n // OPMObjectProcessDiagramKind kind, boolean isObject,\r\n // boolean isProcess) throws IOException {\r\n // if(opdFile.exists()) {\r\n // logInfo(\"Tried to create file that already exists.\");\r\n // logInfo(\"Filename: \" + opdFile.getFullPath());\r\n // throw new\r\n // IllegalArgumentException(\"Tried to create a file that already exists: \" +\r\n // opdFile.getName());\r\n // }\r\n //\r\n // final ResourceSet resourceSet = new ResourceSetImpl();\r\n // final Resource resource =\r\n // resourceSet.createResource(URI.createURI(opdFile.getLocationURI().toString()));\r\n // OPMObjectProcessDiagram opd =\r\n // OPMFactory.eINSTANCE.createOPMObjectProcessDiagram();\r\n // opd.setId(0);\r\n // opd.setName(name);\r\n // opd.setKind(kind);\r\n // resource.getContents().add(opd);\r\n // switch(kind) {\r\n // case COMPOUND:\r\n // createInitialProcessNode(opd);\r\n // break;\r\n // case UNFOLDED:\r\n // createInitialObjectNode(opd, name);\r\n // break;\r\n // case SYSTEM:\r\n // break;\r\n // }\r\n // resource.save(null);\r\n // }\r\n //\r\n // private static void createInitialProcessNode(OPMObjectProcessDiagram opd) {\r\n // OPMProcess process = OPMFactory.eINSTANCE.createOPMProcess();\r\n // process.setId(1);\r\n // process.setName(\"\");\r\n // process.setConstraints(new Rectangle(200, 100, 100, 100));\r\n // opd.getNodes().add(process);\r\n // opd.setLastKnownUsedId(1);\r\n // }\r\n //\r\n // private static void createInitialObjectNode(OPMObjectProcessDiagram opd,\r\n // String name) {\r\n // OPMObject object = OPMFactory.eINSTANCE.createOPMObject();\r\n // object.setId(1);\r\n // object.setName(name);\r\n // object.setConstraints(new Rectangle(200, 100, 100, 100));\r\n // opd.getNodes().add(object);\r\n // opd.setLastKnownUsedId(1);\r\n // }\r", "old_methods": [ { "arguments": [ "String uri" ], "filename": "com.vainolo.phd.opp.utilities/src/com/vainolo/phd/opp/utilities/OPPFileUtils.java", "implementation": "// OPMObjectProcessDiagram opd;\r\n // final ResourceSet resourceSet = new ResourceSetImpl();\r\n // resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap()\r\n // .put(Resource.Factory.Registry.DEFAULT_EXTENSION, new\r\n // XMIResourceFactoryImpl());\r\n // final Resource opdResource =\r\n // resourceSet.createResource(URI.createURI(uri));\r\n // try {\r\n // opdResource.load(null);\r\n // opd = (OPMObjectProcessDiagram) opdResource.getContents().get(0);\r\n //", "signature": "OPMObjectProcessDiagram loadOPDFile(String uri)" }, { "arguments": [ "OPMObjectProcessDiagram opd" ], "filename": "com.vainolo.phd.opp.utilities/src/com/vainolo/phd/opp/utilities/OPPFileUtils.java", "implementation": "// OPMProcess process = OPMFactory.eINSTANCE.createOPMProcess();\r\n // process.setId(1);\r\n // process.setName(\"\");\r\n // process.setConstraints(new Rectangle(200, 100, 100, 100));\r\n // opd.getNodes().add(process);\r\n // opd.setLastKnownUsedId(1);\r\n //", "signature": "void createInitialProcessNode(OPMObjectProcessDiagram opd)" }, { "arguments": [ "OPMObjectProcessDiagram opd", "\r\n // String name" ], "filename": "com.vainolo.phd.opp.utilities/src/com/vainolo/phd/opp/utilities/OPPFileUtils.java", "implementation": "// OPMObject object = OPMFactory.eINSTANCE.createOPMObject();\r\n // object.setId(1);\r\n // object.setName(name);\r\n // object.setConstraints(new Rectangle(200, 100, 100, 100));\r\n // opd.getNodes().add(object);\r\n // opd.setLastKnownUsedId(1);\r\n //", "signature": "void createInitialObjectNode(OPMObjectProcessDiagram opd,\r\n // String name)" } ], "patch": "@@ -6,7 +6,7 @@\n package com.vainolo.phd.opp.utilities;\r\n \r\n import static com.vainolo.phd.opp.utilities.OPPLogger.logInfo;\r\n-import static com.vainolo.phd.opp.utilities.OPPLogger.logWarning;\r\n+import static com.vainolo.phd.opp.utilities.OPPLogger.logSevere;\r\n \r\n import java.io.IOException;\r\n \r\n@@ -28,24 +28,22 @@ public class OPPFileUtils {\n public static OPPObjectProcessDiagram loadOPPFile(String uri) {\r\n OPPObjectProcessDiagram opd;\r\n ResourceSet resourceSet = new ResourceSetImpl();\r\n- resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap()\r\n- .put(Resource.Factory.Registry.DEFAULT_EXTENSION, new XMIResourceFactoryImpl());\r\n+ resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap().put(Resource.Factory.Registry.DEFAULT_EXTENSION, new XMIResourceFactoryImpl());\r\n Resource oppResource = resourceSet.createResource(URI.createURI(uri));\r\n try {\r\n oppResource.load(null);\r\n opd = (OPPObjectProcessDiagram) oppResource.getContents().get(0);\r\n- } catch(final IOException e) {\r\n- logWarning(\"OPD File \" + uri + \" could not be loaded. Please check the path.\");\r\n- logWarning(\"Exception thrown: \" + e);\r\n+ } catch (final IOException e) {\r\n+ logSevere(\"OPD File \" + uri + \" could not be loaded. Please check the path.\");\r\n+ logSevere(\"Exception thrown: \" + e);\r\n opd = null;\r\n }\r\n \r\n return opd;\r\n }\r\n \r\n- public static void createOPPFile(IFile opdFile, String name, OPPObjectProcessDiagramKind kind, boolean isObject,\r\n- boolean isProcess) throws IOException {\r\n- if(opdFile.exists()) {\r\n+ public static void createOPPFile(IFile opdFile, String name, OPPObjectProcessDiagramKind kind, boolean isObject, boolean isProcess) throws IOException {\r\n+ if (opdFile.exists()) {\r\n logInfo(\"Tried to create file that already exists.\");\r\n logInfo(\"Filename: \" + opdFile.getFullPath());\r\n throw new IllegalArgumentException(\"Tried to create a file that already exists: \" + opdFile.getName());\r\n@@ -58,7 +56,7 @@ public static void createOPPFile(IFile opdFile, String name, OPPObjectProcessDia\n opd.setName(name);\r\n opd.setKind(kind);\r\n resource.getContents().add(opd);\r\n- switch(kind) {\r\n+ switch (kind) {\r\n case COMPOUND:\r\n createInitialOPPProcessNode(opd, name);\r\n break;\r\n@@ -90,77 +88,4 @@ private static void createInitialOPPObjectNode(OPPObjectProcessDiagram opd, Stri\n opd.getNodes().add(object);\r\n opd.setLastKnownUsedId(1);\r\n }\r\n-\r\n- // public static OPMObjectProcessDiagram loadOPDFile(String uri) {\r\n- // OPMObjectProcessDiagram opd;\r\n- // final ResourceSet resourceSet = new ResourceSetImpl();\r\n- // resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap()\r\n- // .put(Resource.Factory.Registry.DEFAULT_EXTENSION, new\r\n- // XMIResourceFactoryImpl());\r\n- // final Resource opdResource =\r\n- // resourceSet.createResource(URI.createURI(uri));\r\n- // try {\r\n- // opdResource.load(null);\r\n- // opd = (OPMObjectProcessDiagram) opdResource.getContents().get(0);\r\n- // } catch(final IOException e) {\r\n- // logWarning(\"OPD File \" + uri +\r\n- // \" could not be loaded. Please check the path.\");\r\n- // logWarning(\"Exception thrown: \" + e);\r\n- // opd = null;\r\n- // }\r\n- //\r\n- // return opd;\r\n- // }\r\n- //\r\n- // public static void createOPDFile2(IFile opdFile, String name,\r\n- // OPMObjectProcessDiagramKind kind, boolean isObject,\r\n- // boolean isProcess) throws IOException {\r\n- // if(opdFile.exists()) {\r\n- // logInfo(\"Tried to create file that already exists.\");\r\n- // logInfo(\"Filename: \" + opdFile.getFullPath());\r\n- // throw new\r\n- // IllegalArgumentException(\"Tried to create a file that already exists: \" +\r\n- // opdFile.getName());\r\n- // }\r\n- //\r\n- // final ResourceSet resourceSet = new ResourceSetImpl();\r\n- // final Resource resource =\r\n- // resourceSet.createResource(URI.createURI(opdFile.getLocationURI().toString()));\r\n- // OPMObjectProcessDiagram opd =\r\n- // OPMFactory.eINSTANCE.createOPMObjectProcessDiagram();\r\n- // opd.setId(0);\r\n- // opd.setName(name);\r\n- // opd.setKind(kind);\r\n- // resource.getContents().add(opd);\r\n- // switch(kind) {\r\n- // case COMPOUND:\r\n- // createInitialProcessNode(opd);\r\n- // break;\r\n- // case UNFOLDED:\r\n- // createInitialObjectNode(opd, name);\r\n- // break;\r\n- // case SYSTEM:\r\n- // break;\r\n- // }\r\n- // resource.save(null);\r\n- // }\r\n- //\r\n- // private static void createInitialProcessNode(OPMObjectProcessDiagram opd) {\r\n- // OPMProcess process = OPMFactory.eINSTANCE.createOPMProcess();\r\n- // process.setId(1);\r\n- // process.setName(\"\");\r\n- // process.setConstraints(new Rectangle(200, 100, 100, 100));\r\n- // opd.getNodes().add(process);\r\n- // opd.setLastKnownUsedId(1);\r\n- // }\r\n- //\r\n- // private static void createInitialObjectNode(OPMObjectProcessDiagram opd,\r\n- // String name) {\r\n- // OPMObject object = OPMFactory.eINSTANCE.createOPMObject();\r\n- // object.setId(1);\r\n- // object.setName(name);\r\n- // object.setConstraints(new Rectangle(200, 100, 100, 100));\r\n- // opd.getNodes().add(object);\r\n- // opd.setLastKnownUsedId(1);\r\n- // }\r\n }\r", "raw_url": "https://github.com/vainolo/Object-Process-Programming/raw/c8c3080c49e883f01a64afc8119c041a889f82d4/com.vainolo.phd.opp.utilities%2Fsrc%2Fcom%2Fvainolo%2Fphd%2Fopp%2Futilities%2FOPPFileUtils.java", "sha": "06c82f9001689ea90006e767de4dc97999975be2", "status": "modified" }, { "additions": 42, "blob_url": "https://github.com/vainolo/Object-Process-Programming/blob/c8c3080c49e883f01a64afc8119c041a889f82d4/com.vainolo.phd.opp.utilities%2Fsrc%2Fcom%2Fvainolo%2Fphd%2Fopp%2Futilities%2Fanalysis%2FOPPOPDAnalyzer.java", "changes": 116, "contents_url": "https://api.github.com/repos/vainolo/Object-Process-Programming/contents/com.vainolo.phd.opp.utilities%2Fsrc%2Fcom%2Fvainolo%2Fphd%2Fopp%2Futilities%2Fanalysis%2FOPPOPDAnalyzer.java?ref=c8c3080c49e883f01a64afc8119c041a889f82d4", "deletions": 74, "filename": "com.vainolo.phd.opp.utilities/src/com/vainolo/phd/opp/utilities/analysis/OPPOPDAnalyzer.java", "new_code": " if (OPPObject.class.isInstance(source) && !OPPObject.class.isInstance(target))\r\n else if (!OPPObject.class.isInstance(source) && OPPObject.class.isInstance(target))\r\n else if (OPPState.class.isInstance(source))\r\n if (OPPObject.class.isInstance(source))\r\n else if (OPPState.class.isInstance(source))\r\n if (OPPProcess.class.isInstance(source) && !OPPProcess.class.isInstance(target))\r\n else if (!OPPProcess.class.isInstance(source) && OPPProcess.class.isInstance(target))\r\n while (!(currentContainer instanceof OPPObjectProcessDiagram)) {\r\n for (OPPObject parameter : findParameters(opd)) {\r\n if (hasOutgoingDataLinks(parameter)) {\r\n for (OPPObject parameter : findParameters(opd)) {\r\n if (hasIncomingResultLink(parameter)) {\r\n for (OPPLink link : parameter.getIncomingLinks()) {\r\n if (OPPProceduralLink.class.isInstance(link)) {\r\n if (IsOPPResultLink.INSTANCE.apply(OPPProceduralLink.class.cast(link)) || IsOPPConsumptionLink.INSTANCE.apply(OPPProceduralLink.class.cast(link))) {\r\n for (OPPState state : findStates(object)) {\r\n for (OPPState state : findStates(object)) {\r\n for (OPPNode node : opd.getNodes()) {\r\n if (OPPProcess.class.isInstance(node)) {\r\n if (inZoomedProcess != null) {\r\n if (inZoomedProcess == null) {\r\n if (unfoldedThing == null)\r\n if (systemThing == null)\r\n for (OPPNode node : opd.getNodes()) {\r\n if (OPPThing.class.isInstance(node)) {\r\n if (thing.getName().equals(opd.getName())) {\r\n if (OPPPackage.eINSTANCE.getOPPStructuralLinkAggregator().isInstance(link.getSource())\r\n if (OPPObject.class.isInstance(node)) {\r\n if (o.isParameter()) {\r\n if (OPPObject.class.isInstance(node)) {\r\n if (!o.isParameter()) {\r\n if (!OPPProceduralLink.class.isInstance(link))\r\n switch (localLink.getKind()) {\r\n if (!OPPProceduralLink.class.isInstance(link))\r\n switch (localLink.getKind()) {\r\n if (OPPObject.class.isInstance(node))\r\n if (OPPProcess.class.isInstance(node))\r\n if (OPPProceduralLink.class.isInstance(input)) {\r\n for (OPPLink link : incomingStructuralLinks) {\r\n if (source.getKind().equals(OPPStructuralLinkAggregatorKind.AGGREGATION)) {\r\n if (OPPObject.class.isInstance(target))\r\n else if (OPPState.class.isInstance(target))\r", "new_methods": [], "old_code": " if(OPPObject.class.isInstance(source) && !OPPObject.class.isInstance(target))\r\n else if(!OPPObject.class.isInstance(source) && OPPObject.class.isInstance(target))\r\n else if(OPPState.class.isInstance(source))\r\n if(OPPObject.class.isInstance(source))\r\n else if(OPPState.class.isInstance(source))\r\n if(OPPProcess.class.isInstance(source) && !OPPProcess.class.isInstance(target))\r\n else if(!OPPProcess.class.isInstance(source) && OPPProcess.class.isInstance(target))\r\n while(!(currentContainer instanceof OPPObjectProcessDiagram)) {\r\n for(OPPObject parameter : findParameters(opd)) {\r\n if(hasOutgoingDataLinks(parameter)) {\r\n for(OPPObject parameter : findParameters(opd)) {\r\n if(hasIncomingResultLink(parameter)) {\r\n for(OPPLink link : parameter.getIncomingLinks()) {\r\n if(OPPProceduralLink.class.isInstance(link)) {\r\n if(IsOPPResultLink.INSTANCE.apply(OPPProceduralLink.class.cast(link))\r\n || IsOPPConsumptionLink.INSTANCE.apply(OPPProceduralLink.class.cast(link))) {\r\n for(OPPState state : findStates(object)) {\r\n for(OPPState state : findStates(object)) {\r\n for(OPPNode node : opd.getNodes()) {\r\n if(OPPProcess.class.isInstance(node)) {\r\n if(inZoomedProcess != null) {\r\n if(inZoomedProcess == null) {\r\n if(unfoldedThing == null)\r\n if(systemThing == null)\r\n for(OPPNode node : opd.getNodes()) {\r\n if(OPPThing.class.isInstance(node)) {\r\n if(thing.getName().equals(opd.getName())) {\r\n if(OPPPackage.eINSTANCE.getOPPStructuralLinkAggregator().isInstance(link.getSource())\r\n if(OPPObject.class.isInstance(node)) {\r\n if(o.isParameter()) {\r\n if(OPPObject.class.isInstance(node)) {\r\n if(!o.isParameter()) {\r\n if(!OPPProceduralLink.class.isInstance(link))\r\n switch(localLink.getKind()) {\r\n if(!OPPProceduralLink.class.isInstance(link))\r\n switch(localLink.getKind()) {\r\n if(OPPObject.class.isInstance(node))\r\n if(OPPProcess.class.isInstance(node))\r\n if(OPPProceduralLink.class.isInstance(input)) {\r\n /**\r\n * Check if the given object is parent of other objects\r\n * \r\n * @param object\r\n * and {@link OPPObject}\r\n * @return <code>true</code> if the object is composite, <code>false</code>\r\n * otherwise.\r\n */\r\n public boolean isObjectComposite(OPPObject object) {\r\n Collection<OPPLink> outgoingStructuralLinks = findOutgoingStructuralLinks(object);\r\n for(OPPLink link : outgoingStructuralLinks) {\r\n OPPStructuralLinkAggregator target = OPPStructuralLinkAggregator.class.cast(link.getTarget());\r\n if(target.getKind().equals(OPPStructuralLinkAggregatorKind.AGGREGATION)) {\r\n return true;\r\n }\r\n }\r\n return false;\r\n }\r\n\r\n for(OPPLink link : incomingStructuralLinks) {\r\n if(source.getKind().equals(OPPStructuralLinkAggregatorKind.AGGREGATION)) {\r\n /**\r\n * Check if the given object is a collection.\r\n * \r\n * @param object\r\n * an {@link OPPObject}\r\n * @return <code>true</code> if the object is a collection, <code>false</code>\r\n * otherwise.\r\n */\r\n public boolean isObjectCollection(OPPObject object) {\r\n return object.isCollection();\r\n }\r\n\r\n if(OPPObject.class.isInstance(target))\r\n else if(OPPState.class.isInstance(target))\r", "old_methods": [ { "arguments": [ "OPPObject object" ], "filename": "com.vainolo.phd.opp.utilities/src/com/vainolo/phd/opp/utilities/analysis/OPPOPDAnalyzer.java", "implementation": "Collection<OPPLink> outgoingStructuralLinks = findOutgoingStructuralLinks(object);\r\n for(OPPLink link : outgoingStructuralLinks) {\r\n OPPStructuralLinkAggregator target = OPPStructuralLinkAggregator.class.cast(link.getTarget());\r\n if(target.getKind().equals(OPPStructuralLinkAggregatorKind.AGGREGATION)) {\r\n return true;", "signature": "boolean isObjectComposite(OPPObject object)" }, { "arguments": [ "OPPObject object" ], "filename": "com.vainolo.phd.opp.utilities/src/com/vainolo/phd/opp/utilities/analysis/OPPOPDAnalyzer.java", "implementation": "return object.isCollection();", "signature": "boolean isObjectCollection(OPPObject object)" } ], "patch": "@@ -45,11 +45,11 @@ public Collection<OPPProcess> findFirstLevelContainedProcesses(OPPContainer cont\n public OPPObject getObject(OPPLink link) {\r\n OPPNode source = link.getSource();\r\n OPPNode target = link.getTarget();\r\n- if(OPPObject.class.isInstance(source) && !OPPObject.class.isInstance(target))\r\n+ if (OPPObject.class.isInstance(source) && !OPPObject.class.isInstance(target))\r\n return OPPObject.class.cast(source);\r\n- else if(!OPPObject.class.isInstance(source) && OPPObject.class.isInstance(target))\r\n+ else if (!OPPObject.class.isInstance(source) && OPPObject.class.isInstance(target))\r\n return OPPObject.class.cast(target);\r\n- else if(OPPState.class.isInstance(source))\r\n+ else if (OPPState.class.isInstance(source))\r\n return OPPObject.class.cast(source.getContainer());\r\n else\r\n return null;\r\n@@ -67,9 +67,9 @@ else if(OPPState.class.isInstance(source))\n */\r\n public OPPObject getSourceObject(OPPLink link) {\r\n OPPNode source = link.getSource();\r\n- if(OPPObject.class.isInstance(source))\r\n+ if (OPPObject.class.isInstance(source))\r\n return OPPObject.class.cast(source);\r\n- else if(OPPState.class.isInstance(source))\r\n+ else if (OPPState.class.isInstance(source))\r\n return OPPObject.class.cast(source.getContainer());\r\n else\r\n throw new IllegalArgumentException(\"Source must be a state or an object.\");\r\n@@ -87,9 +87,9 @@ else if(OPPState.class.isInstance(source))\n public OPPProcess getProcess(OPPLink link) {\r\n OPPNode source = link.getSource();\r\n OPPNode target = link.getTarget();\r\n- if(OPPProcess.class.isInstance(source) && !OPPProcess.class.isInstance(target))\r\n+ if (OPPProcess.class.isInstance(source) && !OPPProcess.class.isInstance(target))\r\n return OPPProcess.class.cast(source);\r\n- else if(!OPPProcess.class.isInstance(source) && OPPProcess.class.isInstance(target))\r\n+ else if (!OPPProcess.class.isInstance(source) && OPPProcess.class.isInstance(target))\r\n return OPPProcess.class.cast(target);\r\n else\r\n return null;\r\n@@ -104,7 +104,7 @@ else if(!OPPProcess.class.isInstance(source) && OPPProcess.class.isInstance(targ\n */\r\n public OPPObjectProcessDiagram findOPD(OPPNode node) {\r\n OPPContainer currentContainer = node.getContainer();\r\n- while(!(currentContainer instanceof OPPObjectProcessDiagram)) {\r\n+ while (!(currentContainer instanceof OPPObjectProcessDiagram)) {\r\n currentContainer = ((OPPNode) currentContainer).getContainer();\r\n }\r\n return (OPPObjectProcessDiagram) currentContainer;\r\n@@ -127,8 +127,8 @@ public Collection<OPPObject> findParameters(OPPObjectProcessDiagram opd) {\n \r\n public Collection<OPPObject> findIncomingParameters(OPPObjectProcessDiagram opd) {\r\n Collection<OPPObject> incomingParameters = Lists.newArrayList();\r\n- for(OPPObject parameter : findParameters(opd)) {\r\n- if(hasOutgoingDataLinks(parameter)) {\r\n+ for (OPPObject parameter : findParameters(opd)) {\r\n+ if (hasOutgoingDataLinks(parameter)) {\r\n incomingParameters.add(parameter);\r\n }\r\n }\r\n@@ -137,19 +137,18 @@ public Collection<OPPObject> findIncomingParameters(OPPObjectProcessDiagram opd)\n \r\n public Collection<OPPObject> findOutgoingParameters(OPPObjectProcessDiagram opd) {\r\n Collection<OPPObject> outgoingParameters = Lists.newArrayList();\r\n- for(OPPObject parameter : findParameters(opd)) {\r\n- if(hasIncomingResultLink(parameter)) {\r\n+ for (OPPObject parameter : findParameters(opd)) {\r\n+ if (hasIncomingResultLink(parameter)) {\r\n outgoingParameters.add(parameter);\r\n }\r\n }\r\n return outgoingParameters;\r\n }\r\n \r\n private boolean hasIncomingResultLink(OPPObject parameter) {\r\n- for(OPPLink link : parameter.getIncomingLinks()) {\r\n- if(OPPProceduralLink.class.isInstance(link)) {\r\n- if(IsOPPResultLink.INSTANCE.apply(OPPProceduralLink.class.cast(link))\r\n- || IsOPPConsumptionLink.INSTANCE.apply(OPPProceduralLink.class.cast(link))) {\r\n+ for (OPPLink link : parameter.getIncomingLinks()) {\r\n+ if (OPPProceduralLink.class.isInstance(link)) {\r\n+ if (IsOPPResultLink.INSTANCE.apply(OPPProceduralLink.class.cast(link)) || IsOPPConsumptionLink.INSTANCE.apply(OPPProceduralLink.class.cast(link))) {\r\n return true;\r\n }\r\n }\r\n@@ -310,7 +309,7 @@ public Collection<OPPProceduralLink> findOutgoingDataLinks(OPPState state) {\n public Collection<OPPProceduralLink> findOutgoingDataLinks(OPPObject object) {\r\n Collection result = Lists.newArrayList();\r\n result.addAll(Collections2.filter(object.getOutgoingLinks(), new IsOPPObjectOutgoingDataTransferLink()));\r\n- for(OPPState state : findStates(object)) {\r\n+ for (OPPState state : findStates(object)) {\r\n result.addAll(findOutgoingDataLinks(state));\r\n }\r\n return result;\r\n@@ -325,7 +324,7 @@ public Collection<OPPProceduralLink> findOutgoingAgentLinks(OPPState state) {\n public Collection<OPPProceduralLink> findOutgoingAgentLinks(OPPObject object) {\r\n Collection result = Lists.newArrayList();\r\n result.addAll(Collections2.filter(object.getOutgoingLinks(), IsOPPAgentLink.INSTANCE));\r\n- for(OPPState state : findStates(object)) {\r\n+ for (OPPState state : findStates(object)) {\r\n result.addAll(findOutgoingAgentLinks(state));\r\n }\r\n return result;\r\n@@ -375,16 +374,16 @@ public Collection<OPPState> findStates(OPPObject object) {\n */\r\n public OPPProcess getInZoomedProcess(OPPObjectProcessDiagram opd) {\r\n OPPProcess inZoomedProcess = null;\r\n- for(OPPNode node : opd.getNodes()) {\r\n- if(OPPProcess.class.isInstance(node)) {\r\n- if(inZoomedProcess != null) {\r\n+ for (OPPNode node : opd.getNodes()) {\r\n+ if (OPPProcess.class.isInstance(node)) {\r\n+ if (inZoomedProcess != null) {\r\n throw new IllegalStateException(\"More than one process found in an in-zoomed OPD\");\r\n } else {\r\n inZoomedProcess = (OPPProcess) node;\r\n }\r\n }\r\n }\r\n- if(inZoomedProcess == null) {\r\n+ if (inZoomedProcess == null) {\r\n logWarning(\"Tried to get an in-zoomed process when none exist in the diagram. OPD: {0}.\", opd.getName());\r\n }\r\n return inZoomedProcess;\r\n@@ -400,7 +399,7 @@ public OPPProcess getInZoomedProcess(OPPObjectProcessDiagram opd) {\n */\r\n public OPPThing getUnfoldedThing(OPPObjectProcessDiagram opd) {\r\n OPPThing unfoldedThing = getThingByName(opd, opd.getName());\r\n- if(unfoldedThing == null)\r\n+ if (unfoldedThing == null)\r\n logWarning(\"Tried to get an unfolded thing when none exist in the diagram. OPD: {0}.\", opd.getName());\r\n return unfoldedThing;\r\n }\r\n@@ -416,16 +415,16 @@ public OPPThing getUnfoldedThing(OPPObjectProcessDiagram opd) {\n */\r\n public OPPProcess getSystemProcess(OPPObjectProcessDiagram opd) {\r\n OPPThing systemThing = getThingByName(opd, opd.getName());\r\n- if(systemThing == null)\r\n+ if (systemThing == null)\r\n logWarning(\"Tried to get a system thing when none exist in the diagram. OPD: {0}.\", opd.getName());\r\n return OPPProcess.class.cast(systemThing);\r\n }\r\n \r\n private OPPThing getThingByName(OPPObjectProcessDiagram opd, String name) {\r\n- for(OPPNode node : opd.getNodes()) {\r\n- if(OPPThing.class.isInstance(node)) {\r\n+ for (OPPNode node : opd.getNodes()) {\r\n+ if (OPPThing.class.isInstance(node)) {\r\n OPPThing thing = OPPThing.class.cast(node);\r\n- if(thing.getName().equals(opd.getName())) {\r\n+ if (thing.getName().equals(opd.getName())) {\r\n return thing;\r\n }\r\n }\r\n@@ -444,7 +443,7 @@ public enum IsOPPStructuralLink implements Predicate<OPPLink> {\n \r\n @Override\r\n public boolean apply(final OPPLink link) {\r\n- if(OPPPackage.eINSTANCE.getOPPStructuralLinkAggregator().isInstance(link.getSource())\r\n+ if (OPPPackage.eINSTANCE.getOPPStructuralLinkAggregator().isInstance(link.getSource())\r\n || OPPPackage.eINSTANCE.getOPPStructuralLinkAggregator().isInstance(link.getTarget()))\r\n return true;\r\n \r\n@@ -463,9 +462,9 @@ public enum IsOPPParameter implements Predicate<OPPNode> {\n \r\n @Override\r\n public boolean apply(final OPPNode node) {\r\n- if(OPPObject.class.isInstance(node)) {\r\n+ if (OPPObject.class.isInstance(node)) {\r\n OPPObject o = (OPPObject) node;\r\n- if(o.isParameter()) {\r\n+ if (o.isParameter()) {\r\n return true;\r\n }\r\n }\r\n@@ -484,9 +483,9 @@ public enum IsOPPVariable implements Predicate<OPPNode> {\n \r\n @Override\r\n public boolean apply(final OPPNode node) {\r\n- if(OPPObject.class.isInstance(node)) {\r\n+ if (OPPObject.class.isInstance(node)) {\r\n OPPObject o = (OPPObject) node;\r\n- if(!o.isParameter()) {\r\n+ if (!o.isParameter()) {\r\n return true;\r\n }\r\n }\r\n@@ -503,11 +502,11 @@ public boolean apply(final OPPNode node) {\n public static class IsOPPDataLink implements Predicate<OPPLink> {\r\n @Override\r\n public boolean apply(final OPPLink link) {\r\n- if(!OPPProceduralLink.class.isInstance(link))\r\n+ if (!OPPProceduralLink.class.isInstance(link))\r\n return false;\r\n else {\r\n OPPProceduralLink localLink = (OPPProceduralLink) link;\r\n- switch(localLink.getKind()) {\r\n+ switch (localLink.getKind()) {\r\n case DATA:\r\n return true;\r\n default:\r\n@@ -547,11 +546,11 @@ public enum IsOPPProcessOutgoingDataLink implements Predicate<OPPLink> {\n \r\n @Override\r\n public boolean apply(final OPPLink link) {\r\n- if(!OPPProceduralLink.class.isInstance(link))\r\n+ if (!OPPProceduralLink.class.isInstance(link))\r\n return false;\r\n else {\r\n OPPProceduralLink localLink = OPPProceduralLink.class.cast(link);\r\n- switch(localLink.getKind()) {\r\n+ switch (localLink.getKind()) {\r\n case DATA:\r\n return true;\r\n default:\r\n@@ -571,7 +570,7 @@ public enum IsOPPObjectNode implements Predicate<OPPNode> {\n \r\n @Override\r\n public boolean apply(final OPPNode node) {\r\n- if(OPPObject.class.isInstance(node))\r\n+ if (OPPObject.class.isInstance(node))\r\n return true;\r\n return false;\r\n }\r\n@@ -587,7 +586,7 @@ public enum IsOPPProcessNode implements Predicate<OPPNode> {\n \r\n @Override\r\n public boolean apply(final OPPNode node) {\r\n- if(OPPProcess.class.isInstance(node))\r\n+ if (OPPProcess.class.isInstance(node))\r\n return true;\r\n return false;\r\n }\r\n@@ -603,7 +602,7 @@ public enum IsOPPAgentLink implements Predicate<OPPLink> {\n \r\n @Override\r\n public boolean apply(OPPLink input) {\r\n- if(OPPProceduralLink.class.isInstance(input)) {\r\n+ if (OPPProceduralLink.class.isInstance(input)) {\r\n OPPProceduralLink link = OPPProceduralLink.class.cast(input);\r\n return OPPProceduralLinkKind.AGENT.equals(link.getKind());\r\n } else {\r\n@@ -665,25 +664,6 @@ public boolean isObjectPartOfAnotherObject(OPPObject object) {\n return findParent(object) != null;\r\n }\r\n \r\n- /**\r\n- * Check if the given object is parent of other objects\r\n- * \r\n- * @param object\r\n- * and {@link OPPObject}\r\n- * @return <code>true</code> if the object is composite, <code>false</code>\r\n- * otherwise.\r\n- */\r\n- public boolean isObjectComposite(OPPObject object) {\r\n- Collection<OPPLink> outgoingStructuralLinks = findOutgoingStructuralLinks(object);\r\n- for(OPPLink link : outgoingStructuralLinks) {\r\n- OPPStructuralLinkAggregator target = OPPStructuralLinkAggregator.class.cast(link.getTarget());\r\n- if(target.getKind().equals(OPPStructuralLinkAggregatorKind.AGGREGATION)) {\r\n- return true;\r\n- }\r\n- }\r\n- return false;\r\n- }\r\n-\r\n /**\r\n * Find the aggregate parent of this {@link OPPObject}, or <code>null</code>\r\n * if the {@link OPPObject} has no parent.\r\n@@ -695,28 +675,16 @@ public boolean isObjectComposite(OPPObject object) {\n */\r\n public OPPObject findParent(OPPObject object) {\r\n Collection<OPPLink> incomingStructuralLinks = findIncomingStructuralLinks(object);\r\n- for(OPPLink link : incomingStructuralLinks) {\r\n+ for (OPPLink link : incomingStructuralLinks) {\r\n OPPStructuralLinkAggregator source = OPPStructuralLinkAggregator.class.cast(link.getSource());\r\n- if(source.getKind().equals(OPPStructuralLinkAggregatorKind.AGGREGATION)) {\r\n+ if (source.getKind().equals(OPPStructuralLinkAggregatorKind.AGGREGATION)) {\r\n OPPLink aggregatorIncomingLink = source.getIncomingLinks().iterator().next();\r\n return OPPObject.class.cast(aggregatorIncomingLink.getSource());\r\n }\r\n }\r\n return null;\r\n }\r\n \r\n- /**\r\n- * Check if the given object is a collection.\r\n- * \r\n- * @param object\r\n- * an {@link OPPObject}\r\n- * @return <code>true</code> if the object is a collection, <code>false</code>\r\n- * otherwise.\r\n- */\r\n- public boolean isObjectCollection(OPPObject object) {\r\n- return object.isCollection();\r\n- }\r\n-\r\n public boolean isSourceObject(OPPLink link) {\r\n return OPPObject.class.isInstance(link.getSource());\r\n }\r\n@@ -739,9 +707,9 @@ public OPPObject getObject(OPPState state) {\n \r\n public OPPObject getTargetObject(OPPProceduralLink link) {\r\n OPPNode target = link.getTarget();\r\n- if(OPPObject.class.isInstance(target))\r\n+ if (OPPObject.class.isInstance(target))\r\n return OPPObject.class.cast(target);\r\n- else if(OPPState.class.isInstance(target))\r\n+ else if (OPPState.class.isInstance(target))\r\n return OPPObject.class.cast(target.getContainer());\r\n else\r\n throw new IllegalArgumentException(\"Target must be an object or a state.\");\r", "raw_url": "https://github.com/vainolo/Object-Process-Programming/raw/c8c3080c49e883f01a64afc8119c041a889f82d4/com.vainolo.phd.opp.utilities%2Fsrc%2Fcom%2Fvainolo%2Fphd%2Fopp%2Futilities%2Fanalysis%2FOPPOPDAnalyzer.java", "sha": "0932c7eda36312941c4fad68b339ee90b41ec3d1", "status": "modified" }, { "additions": 0, "blob_url": "https://github.com/vainolo/Object-Process-Programming/blob/c8c3080c49e883f01a64afc8119c041a889f82d4/com.vainolo.phd.opp.validation%2F.settings%2Forg.eclipse.jdt.core.prefs", "changes": 280, "contents_url": "https://api.github.com/repos/vainolo/Object-Process-Programming/contents/com.vainolo.phd.opp.validation%2F.settings%2Forg.eclipse.jdt.core.prefs?ref=c8c3080c49e883f01a64afc8119c041a889f82d4", "deletions": 280, "filename": "com.vainolo.phd.opp.validation/.settings/org.eclipse.jdt.core.prefs", "new_code": "", "new_methods": [], "old_code": "org.eclipse.jdt.core.formatter.align_type_members_on_columns=false\r\norg.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16\r\norg.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0\r\norg.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16\r\norg.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16\r\norg.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16\r\norg.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16\r\norg.eclipse.jdt.core.formatter.alignment_for_assignment=0\r\norg.eclipse.jdt.core.formatter.alignment_for_binary_expression=16\r\norg.eclipse.jdt.core.formatter.alignment_for_compact_if=16\r\norg.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80\r\norg.eclipse.jdt.core.formatter.alignment_for_enum_constants=0\r\norg.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16\r\norg.eclipse.jdt.core.formatter.alignment_for_method_declaration=0\r\norg.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16\r\norg.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16\r\norg.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16\r\norg.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80\r\norg.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16\r\norg.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16\r\norg.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16\r\norg.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16\r\norg.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16\r\norg.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16\r\norg.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16\r\norg.eclipse.jdt.core.formatter.blank_lines_after_imports=1\r\norg.eclipse.jdt.core.formatter.blank_lines_after_package=1\r\norg.eclipse.jdt.core.formatter.blank_lines_before_field=0\r\norg.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0\r\norg.eclipse.jdt.core.formatter.blank_lines_before_imports=1\r\norg.eclipse.jdt.core.formatter.blank_lines_before_member_type=1\r\norg.eclipse.jdt.core.formatter.blank_lines_before_method=1\r\norg.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1\r\norg.eclipse.jdt.core.formatter.blank_lines_before_package=0\r\norg.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1\r\norg.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1\r\norg.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line\r\norg.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line\r\norg.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line\r\norg.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line\r\norg.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line\r\norg.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line\r\norg.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line\r\norg.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line\r\norg.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line\r\norg.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line\r\norg.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line\r\norg.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false\r\norg.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false\r\norg.eclipse.jdt.core.formatter.comment.format_block_comments=true\r\norg.eclipse.jdt.core.formatter.comment.format_header=false\r\norg.eclipse.jdt.core.formatter.comment.format_html=true\r\norg.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true\r\norg.eclipse.jdt.core.formatter.comment.format_line_comments=true\r\norg.eclipse.jdt.core.formatter.comment.format_source_code=true\r\norg.eclipse.jdt.core.formatter.comment.indent_parameter_description=true\r\norg.eclipse.jdt.core.formatter.comment.indent_root_tags=true\r\norg.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert\r\norg.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert\r\norg.eclipse.jdt.core.formatter.comment.line_length=80\r\norg.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true\r\norg.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true\r\norg.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false\r\norg.eclipse.jdt.core.formatter.compact_else_if=true\r\norg.eclipse.jdt.core.formatter.continuation_indentation=2\r\norg.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2\r\norg.eclipse.jdt.core.formatter.disabling_tag=@formatter\\:off\r\norg.eclipse.jdt.core.formatter.enabling_tag=@formatter\\:on\r\norg.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false\r\norg.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true\r\norg.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true\r\norg.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true\r\norg.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true\r\norg.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true\r\norg.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true\r\norg.eclipse.jdt.core.formatter.indent_empty_lines=false\r\norg.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true\r\norg.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true\r\norg.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true\r\norg.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false\r\norg.eclipse.jdt.core.formatter.indentation.size=2\r\norg.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert\r\norg.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert\r\norg.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert\r\norg.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert\r\norg.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert\r\norg.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert\r\norg.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert\r\norg.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert\r\norg.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert\r\norg.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert\r\norg.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert\r\norg.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert\r\norg.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert\r\norg.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert\r\norg.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert\r\norg.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert\r\norg.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert\r\norg.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert\r\norg.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert\r\norg.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert\r\norg.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert\r\norg.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert\r\norg.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert\r\norg.eclipse.jdt.core.formatter.join_lines_in_comments=true\r\norg.eclipse.jdt.core.formatter.join_wrapped_lines=true\r\norg.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false\r\norg.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false\r\norg.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false\r\norg.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false\r\norg.eclipse.jdt.core.formatter.lineSplit=120\r\norg.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false\r\norg.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false\r\norg.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0\r\norg.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1\r\norg.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true\r\norg.eclipse.jdt.core.formatter.tabulation.char=space\r\norg.eclipse.jdt.core.formatter.tabulation.size=2\r\norg.eclipse.jdt.core.formatter.use_on_off_tags=true\r\norg.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false\r\norg.eclipse.jdt.core.formatter.wrap_before_binary_operator=true\r\norg.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true\r\norg.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true\r", "old_methods": [], "patch": "@@ -5,283 +5,3 @@ org.eclipse.jdt.core.compiler.compliance=1.8\n org.eclipse.jdt.core.compiler.problem.assertIdentifier=error\r\n org.eclipse.jdt.core.compiler.problem.enumIdentifier=error\r\n org.eclipse.jdt.core.compiler.source=1.8\r\n-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false\r\n-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16\r\n-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0\r\n-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16\r\n-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16\r\n-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16\r\n-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16\r\n-org.eclipse.jdt.core.formatter.alignment_for_assignment=0\r\n-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16\r\n-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16\r\n-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80\r\n-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0\r\n-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16\r\n-org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0\r\n-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16\r\n-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16\r\n-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16\r\n-org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80\r\n-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16\r\n-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16\r\n-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16\r\n-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16\r\n-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16\r\n-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16\r\n-org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16\r\n-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1\r\n-org.eclipse.jdt.core.formatter.blank_lines_after_package=1\r\n-org.eclipse.jdt.core.formatter.blank_lines_before_field=0\r\n-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0\r\n-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1\r\n-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1\r\n-org.eclipse.jdt.core.formatter.blank_lines_before_method=1\r\n-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1\r\n-org.eclipse.jdt.core.formatter.blank_lines_before_package=0\r\n-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1\r\n-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1\r\n-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line\r\n-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line\r\n-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line\r\n-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line\r\n-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line\r\n-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line\r\n-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line\r\n-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line\r\n-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line\r\n-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line\r\n-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line\r\n-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false\r\n-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false\r\n-org.eclipse.jdt.core.formatter.comment.format_block_comments=true\r\n-org.eclipse.jdt.core.formatter.comment.format_header=false\r\n-org.eclipse.jdt.core.formatter.comment.format_html=true\r\n-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true\r\n-org.eclipse.jdt.core.formatter.comment.format_line_comments=true\r\n-org.eclipse.jdt.core.formatter.comment.format_source_code=true\r\n-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true\r\n-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true\r\n-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert\r\n-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert\r\n-org.eclipse.jdt.core.formatter.comment.line_length=80\r\n-org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true\r\n-org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true\r\n-org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false\r\n-org.eclipse.jdt.core.formatter.compact_else_if=true\r\n-org.eclipse.jdt.core.formatter.continuation_indentation=2\r\n-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2\r\n-org.eclipse.jdt.core.formatter.disabling_tag=@formatter\\:off\r\n-org.eclipse.jdt.core.formatter.enabling_tag=@formatter\\:on\r\n-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false\r\n-org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true\r\n-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true\r\n-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true\r\n-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true\r\n-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true\r\n-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true\r\n-org.eclipse.jdt.core.formatter.indent_empty_lines=false\r\n-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true\r\n-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true\r\n-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true\r\n-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false\r\n-org.eclipse.jdt.core.formatter.indentation.size=2\r\n-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert\r\n-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert\r\n-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert\r\n-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert\r\n-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert\r\n-org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert\r\n-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert\r\n-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert\r\n-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert\r\n-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert\r\n-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert\r\n-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert\r\n-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert\r\n-org.eclipse.jdt.core.formatter.join_lines_in_comments=true\r\n-org.eclipse.jdt.core.formatter.join_wrapped_lines=true\r\n-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false\r\n-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false\r\n-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false\r\n-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false\r\n-org.eclipse.jdt.core.formatter.lineSplit=120\r\n-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false\r\n-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false\r\n-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0\r\n-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1\r\n-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true\r\n-org.eclipse.jdt.core.formatter.tabulation.char=space\r\n-org.eclipse.jdt.core.formatter.tabulation.size=2\r\n-org.eclipse.jdt.core.formatter.use_on_off_tags=true\r\n-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false\r\n-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true\r\n-org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true\r\n-org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true\r", "raw_url": "https://github.com/vainolo/Object-Process-Programming/raw/c8c3080c49e883f01a64afc8119c041a889f82d4/com.vainolo.phd.opp.validation%2F.settings%2Forg.eclipse.jdt.core.prefs", "sha": "295926d964165896ea8aa7c1b1b3c9d3d3caa77e", "status": "modified" }, { "additions": 0, "blob_url": "https://github.com/vainolo/Object-Process-Programming/blob/c8c3080c49e883f01a64afc8119c041a889f82d4/com.vainolo.phd.opp.validation%2F.settings%2Forg.eclipse.jdt.ui.prefs", "changes": 1, "contents_url": "https://api.github.com/repos/vainolo/Object-Process-Programming/contents/com.vainolo.phd.opp.validation%2F.settings%2Forg.eclipse.jdt.ui.prefs?ref=c8c3080c49e883f01a64afc8119c041a889f82d4", "deletions": 1, "filename": "com.vainolo.phd.opp.validation/.settings/org.eclipse.jdt.ui.prefs", "new_code": "", "new_methods": [], "old_code": "formatter_profile=_Vainolo\r", "old_methods": [], "patch": "@@ -1,6 +1,5 @@\n eclipse.preferences.version=1\r\n editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true\r\n-formatter_profile=_Vainolo\r\n formatter_settings_version=12\r\n sp_cleanup.add_default_serial_version_id=true\r\n sp_cleanup.add_generated_serial_version_id=false\r", "raw_url": "https://github.com/vainolo/Object-Process-Programming/raw/c8c3080c49e883f01a64afc8119c041a889f82d4/com.vainolo.phd.opp.validation%2F.settings%2Forg.eclipse.jdt.ui.prefs", "sha": "19aa3c212964a19ce41be7889b26936ca0f80993", "status": "modified" } ]
48
[ { "name": "vainolo$object-process-programming", "new_args": "OPPObjectInstance value", "new_implementation": "if (compositeValues.size() > 0) {\r\n lastKey = compositeValues.lastKey();\r\n compositeValues.put(newKey, value);\r\n compositeKeyToIndexMapping.put(UUID.randomUUID().toString(), newKey);\r\n public void setPart(String name, OPPObjectInstance value) {\r\n checkTypeForCompositeOnlyOperations();\r\n if (compositeKeyToIndexMapping.containsKey(name)) {\r\n compositeValues.remove(compositeKeyToIndexMapping.get(name));\r\n compositeKeyToIndexMapping.remove(name);\r\n int lastKey = 0;\r\n if (compositeValues.size() > 0) {\r\n lastKey = compositeValues.lastKey();", "new_return_type": "void", "new_signature": "void addLastPart(OPPObjectInstance value)", "old_args": "OPPObjectInstance value", "old_implementation": "checkTypeForCollectionOnlyOperations();\r\n if(collectionValues.size() > 0) {\r\n lastKey = collectionValues.lastKey();\r\n collectionValues.put(newKey, value);\r\n collectionNameToIndexMapping.put(UUID.randomUUID().toString(), newKey);\r\n return newKey;\r\n public void putCollectionElement(String name, OPPObjectInstance value) {\r\n checkTypeForCollectionOnlyOperations();\r\n if(collectionNameToIndexMapping.containsKey(name)) {\r\n collectionValues.remove(collectionNameToIndexMapping.get(name));\r\n collectionNameToIndexMapping.remove(name);\r\n int index = appendCollectionElement(value);\r\n collectionNameToIndexMapping.inverse().remove(index);\r\n collectionNameToIndexMapping.put(name, index);\r\n public void putCollectionElementAtIndex(int index, OPPObjectInstance value) {\r\n checkTypeForCollectionOnlyOperations();\r\n checkNotNull(value, \"Cannot insert a null element to a collection.\");\r\n if(collectionValues.containsKey(index)) {\r\n collectionValues.remove(index);\r\n collectionNameToIndexMapping.inverse().remove(index);", "old_return_type": "int", "old_signature": "int appendCollectionElement(OPPObjectInstance value)" }, { "name": "vainolo$object-process-programming", "new_args": "String key", "new_implementation": "checkTypeForCompositeOnlyOperations();\r\n checkState((key != null) && (!\"\".equals(key)), \"Key cannot be null or empty.\");\r\n return compositeValues.get(compositeKeyToIndexMapping.get(key));", "new_return_type": "OPPObjectInstance", "new_signature": "OPPObjectInstance getPart(String key)", "old_args": "String name", "old_implementation": "checkTypeForCollectionOnlyOperations();\r\n checkState((name != null) && !(\"\".equals(name)), \"Named location of element must not be null or empty.\");\r\n checkState(collectionNameToIndexMapping.containsKey(name), \"Collection does contain a value at index %s.\", name);\r\n return collectionValues.get(collectionNameToIndexMapping.get(name));\r\n public OPPObjectInstance getCollectionElementAtIndex(int index) {\r\n checkTypeForCollectionOnlyOperations();\r\n return collectionValues.get(index);\r\n public OPPObjectInstance getCollectionFirstElement() {\r\n checkTypeForCollectionOnlyOperations();\r\n return collectionValues.get(collectionValues.firstKey());\r\n public OPPObjectInstance getLastCollectionElement() {\r\n checkTypeForCollectionOnlyOperations();\r\n return collectionValues.get(collectionValues.lastKey());\r\n public Collection<OPPObjectInstance> getCollectionAllElements() {\r\n checkTypeForCollectionOnlyOperations();\r\n return Collections.unmodifiableCollection(collectionValues.values());\r\n public Set<String> getCollectionAllIndexes() {\r\n checkTypeForCollectionOnlyOperations();\r\n return Collections.unmodifiableSet(collectionNameToIndexMapping.keySet());\r\n if(InstanceType.STRING.equals(type) || InstanceType.NUMERICAL.equals(type))\r\n else if(InstanceType.COMPOSITE.equals(type)) {\r\n for(String partName : parts.keySet()) {\r\n ret.append(partName + \":\" + parts.get(partName) + \",\");", "old_return_type": "OPPObjectInstance", "old_signature": "OPPObjectInstance getCollectionElement(String name)" } ]
2
25
cbf0cac3f03c8dffbc415eab1421234dfc3ead24
[ { "name": "pgroth$hbase-rdf", "new_args": "", "new_implementation": "throws IOException {//we expect the pattern in the order SPOC\t\n\t\t\tretrievalInit();\n\t\t\tlong start = System.currentTimeMillis();\n\t\t\tbyte[] startKey = buildRangeScanKeyFromQuad(quad);\n\t\t\tlong keyBuildOverhead = System.currentTimeMillis()-start;\n\t\t\tlong startSearch = System.currentTimeMillis();\n\t\t\tArrayList<Get> batchIdGets = doRangeScan(startKey);\n\t\t\tstart = System.currentTimeMillis();\n\t\t\tResult[] id2StringResults = doBatchId2String(batchIdGets);\n\t\t\tSystem.out.println(\"Search time: \"+searchTime+\"; Id2StringOverhead: \"+id2StringOverhead+\"; String2IdOverhead: \"\n\t\t\t\t\t\t\t\t\t+string2IdOverhead+\"; KeyBuildOverhead: \"+keyBuildOverhead);\n\t\t\tupdateId2ValueMap(id2StringResults);\t\t\t\n\t\t\treturn buildSPOCOrderResults();\n\t\t\n\t\t\tSystem.err.println(\"Bound variable numerical not in expected range: \"+e.getMessage());\n\t\t\treturn null;", "new_return_type": "void", "new_signature": "void buildPattern2TableHashMap()", "old_args": "", "old_implementation": "throws IOException {//we expect the pattern in the order SPOC\n\t\t\n\t\t\tid2ValueMap.clear();\n\t\t\tquadResults.clear();\n\t\t\tboundElements.clear();\n\t\t\tid2StringOverhead = 0;\n\t\t\tbyte[] startKey = buildKey(quad);\n\t\t\tif (startKey == null) {\n\t\t\t\treturn new ArrayList<ArrayList<Value>>();", "old_return_type": "void", "old_signature": "void buildHashMap()" }, { "name": "pgroth$hbase-rdf", "new_args": "Value quad", "new_implementation": null, "new_return_type": "byte[]", "new_signature": "byte[] buildRangeScanKeyFromQuad(Value quad)", "old_args": "Value quad", "old_implementation": null, "old_return_type": "byte[]", "old_signature": "byte[] buildKey(Value quad)" }, { "name": "pgroth$hbase-rdf", "new_args": "Job j1", "new_implementation": null, "new_return_type": "void", "new_signature": "void retrieveTripleToResourceCounters(Job j1)", "old_args": "Job j1", "old_implementation": null, "old_return_type": "void", "old_signature": "void retrieveCounters(Job j1)" } ]
[ { "additions": 232, "blob_url": "https://github.com/pgroth/hbase-rdf/blob/cbf0cac3f03c8dffbc415eab1421234dfc3ead24/src%2Fmain%2Fjava%2Fnl%2Fvu%2Fdatalayer%2Fhbase%2Fbulkload%2FBulkLoad.java", "changes": 411, "contents_url": "https://api.github.com/repos/pgroth/hbase-rdf/contents/src%2Fmain%2Fjava%2Fnl%2Fvu%2Fdatalayer%2Fhbase%2Fbulkload%2FBulkLoad.java?ref=cbf0cac3f03c8dffbc415eab1421234dfc3ead24", "deletions": 179, "filename": "src/main/java/nl/vu/datalayer/hbase/bulkload/BulkLoad.java", "new_code": "import nl.vu.datalayer.hbase.id.HBaseValue;\nimport org.apache.hadoop.fs.FileSystem;\nimport org.apache.hadoop.fs.FileUtil;\n\t//public static SortedMap<Short, Long> sufixCounters;\n\n\tprivate static Path input;\n\n\tprivate static int inputEstimateSize;\n\n\tprivate static String outputPath;\n\n\tprivate static boolean onlyTriples;\n\n\tprivate static NativeJavaConnection con;\n\t/*public static void main(String[] args) {\n\t\ttry {\n\t\tPath input = new Path(args[0]);\n\t\tString outputPath = args[2];\n\t\tPath resourceIds = new Path(outputPath+TripleToResource.RESOURCE_IDS_DIR);\n\t\tPath convertedTripletsPath = new Path(outputPath+ResourceToTriple.TEMP_TRIPLETS_DIR);\n\t\t\n\t\tPath string2IdInput = new Path(outputPath+TripleToResource.ID2STRING_DIR);\n\t\tPath string2IdOutput = new Path(outputPath+StringIdAssoc.STRING2ID_DIR);\n\t\t\n\t\tHBaseConnection con = new HBaseConnection(HBaseConnection.JAVA_API);\n\t\tHBPrefixMatchSchema.createCounterTable(con.getAdmin());\n\t\t\n\t\tlong start = System.currentTimeMillis();\n\t\t\n\t\tJob j1 = createTripleToResourceJob(input, resourceIds, Integer.parseInt(args[1]));\n\t\tj1.getConfiguration().set(\"outputPath\", outputPath);\n\t\tj1.waitForCompletion(true);\n\t\t\n\t\tlong firstJob = System.currentTimeMillis()-start;\n\t\tSystem.out.println(\"First pass finished in \"+firstJob+\" ms\");\n\t\t\n\t\t//retrieve counter values and build a SortedMap\n\t\tretrieveCounters(j1);\n\t\tlong startPartition = HBPrefixMatchSchema.updateLastCounter(tripleToResourceReduceTasks, con.getConfiguration())+1;\n\t\t}\n\t\tcatch (Exception e) {\n\t\t\te.printStackTrace();\n\t\t}\n\t}*/\n\t\n\t/**\n\t * @param args\n\t */\n\tpublic static void main(String[] args) {\n\t\ttry {\n\t\t\tif (args.length != 5){\n\t\t\t\tSystem.out.println(\"Usage: bulkLoad <inputPath> <inputSizeEstimate in MB> <outputPath> <schemaSuffix> <onlyTriples(true/false)>\");\n\t\t\t\treturn;\n\t\t\t}\t\t\n\t\t\tinitializeLocalVariables(args); \n\t\t\t\n\t\t\tPath convertedTripletsPath = new Path(outputPath+ResourceToTriple.TEMP_TRIPLETS_DIR);\n\t\t\tPath idStringAssocInput = new Path(outputPath+\"/\"+TripleToResource.ID2STRING_DIR);\n\t\t\t\n\t\t\tcon = (NativeJavaConnection)HBaseConnection.create(HBaseConnection.NATIVE_JAVA);\n\t\t\tHBPrefixMatchSchema prefMatchSchema = new HBPrefixMatchSchema(con, schemaSuffix);\n\t\t\tprefMatchSchema.createCounterTable(con.getAdmin());\n\t\t\t\n\t\t\tlong startPartition = runIdGenerationJobs(convertedTripletsPath, idStringAssocInput);\n\t\t\n\t\t\t//create all tables containing PrefixMatch schema ----------------------\n\t\t\tSystem.out.println(totalStringCount+\" : \"+numericalCount);\n\t\t\t\t\t\n\t\t\tprefMatchSchema.setTableSplitInfo(totalStringCount, numericalCount, \n\t\t\t\t\ttripleToResourceReduceTasks, startPartition, onlyTriples);\n\t\t\tprefMatchSchema.create();\n\t\t\t\n\t\t\tLoadIncrementalHFiles bulkLoad = new LoadIncrementalHFiles(con.getConfiguration());\n\t\t\t\n\t\t\tbulkLoadIdStringMappingTables(idStringAssocInput, bulkLoad);\t\t\n\t\t\tbulkLoadQuadTables(convertedTripletsPath, bulkLoad);\n\t\t\t\n\t\t\tcon.close();\t\t\n\t\t} catch (IOException e) {\n\t\t\te.printStackTrace();\n\t\t}\n\t\tcatch(Exception e){\n\t\t\te.printStackTrace();\n\t\t}\n\t}\n\n\tprivate static void bulkLoadQuadTables(Path convertedTripletsPath, LoadIncrementalHFiles bulkLoad) throws Exception, IOException, InterruptedException, ClassNotFoundException {\n\t\tPath spocPath = new Path(outputPath+\"/\"+HBPrefixMatchSchema.TABLE_NAMES[HBPrefixMatchSchema.SPOC]);\n\t\tPath pocsPath = new Path(outputPath+\"/\"+HBPrefixMatchSchema.TABLE_NAMES[HBPrefixMatchSchema.POCS]);\n\t\tPath ospcPath = new Path(outputPath+\"/\"+HBPrefixMatchSchema.TABLE_NAMES[HBPrefixMatchSchema.OSPC]);\n\t\t\n\t\t//SPOC--------------------\n\t\tJob j5 = createPrefixMatchJob(con, convertedTripletsPath, spocPath, HBPrefixMatchSchema.SPOC, PrefixMatch.PrefixMatchSPOCMapper.class);\n\t\tj5.waitForCompletion(true);\n\t\t\n\t\tdoBulkLoad(bulkLoad, spocPath, currentTable, con);\n\n\t\tif (onlyTriples == false){\n\t\t\tbulkLoadQuadOnlyTables(convertedTripletsPath, bulkLoad);\n\t\t}\n\t\t\n\t\t//OSPC---------------------------\n\t\tJob j10 = createPrefixMatchJob(con, convertedTripletsPath, ospcPath, HBPrefixMatchSchema.OSPC, PrefixMatch.PrefixMatchOSPCMapper.class);\n\t\tj10.waitForCompletion(true);\n\t\t\n\t\tdoBulkLoad(bulkLoad, ospcPath, currentTable, con);\n\t\t\n\t\t//POCS---------------------\n\t\tJob j6 = createPrefixMatchJob(con, convertedTripletsPath, pocsPath, HBPrefixMatchSchema.POCS, PrefixMatch.PrefixMatchPOCSMapper.class);\n\t\tj6.waitForCompletion(true);\n\t\t\n\t\tdoBulkLoad(bulkLoad, pocsPath, currentTable, con);\n\t}\n\n\tprivate static void bulkLoadQuadOnlyTables(Path convertedTripletsPath, LoadIncrementalHFiles bulkLoad) throws Exception, IOException, InterruptedException, ClassNotFoundException {\n\t\tPath cspoPath = new Path(outputPath+\"/\"+HBPrefixMatchSchema.TABLE_NAMES[HBPrefixMatchSchema.CSPO]);\n\t\tPath cpsoPath = new Path(outputPath+\"/\"+HBPrefixMatchSchema.TABLE_NAMES[HBPrefixMatchSchema.CPSO]);\n\t\tPath ocspPath = new Path(outputPath+\"/\"+HBPrefixMatchSchema.TABLE_NAMES[HBPrefixMatchSchema.OCSP]);\n\t\t\n\t\t//CSPO----------------------\n\t\tJob j7 = createPrefixMatchJob(con, convertedTripletsPath, cspoPath, HBPrefixMatchSchema.CSPO, PrefixMatch.PrefixMatchCSPOMapper.class);\n\t\tj7.waitForCompletion(true);\n\t\t\n\t\tdoBulkLoad(bulkLoad, cspoPath, currentTable, con);\n\t\t\n\t\t//CPSO-------------------------\n\t\tJob j8 = createPrefixMatchJob(con, convertedTripletsPath, cpsoPath, HBPrefixMatchSchema.CPSO, PrefixMatch.PrefixMatchCPSOMapper.class);\n\t\tj8.waitForCompletion(true);\n\t\t\n\t\tdoBulkLoad(bulkLoad, cpsoPath, currentTable, con);\n\t\t\n\t\t//OCSP--------------------------\t\t\t\n\t\tJob j9 = createPrefixMatchJob(con, convertedTripletsPath, ocspPath, HBPrefixMatchSchema.OCSP, PrefixMatch.PrefixMatchOCSPMapper.class);\n\t\tj9.waitForCompletion(true);\n\t\t\n\t\tdoBulkLoad(bulkLoad, ocspPath, currentTable, con);\n\t}\n\n\tfinal private static void bulkLoadIdStringMappingTables(Path idStringAssocInput, LoadIncrementalHFiles bulkLoad) throws Exception, IOException, InterruptedException, ClassNotFoundException {\n\t\tPath string2IdOutput = new Path(outputPath+StringIdAssoc.STRING2ID_DIR);\n\t\tPath id2StringOutput = new Path(outputPath+StringIdAssoc.ID2STRING_DIR);\n\t\t\n\t\t//String2Id PASS----------------------------------------------\t\t\n\t\tJob j3 = createString2IdJob(con, idStringAssocInput, string2IdOutput);\n\t\tj3.waitForCompletion(true);\n\t\t\n\t\t//string2Id = con.getTable(HBPrefixMatchSchema.STRING2ID+schemaSuffix);\n\t\tdoBulkLoad(bulkLoad, string2IdOutput, string2Id, con);\n\t\t\n\t\tSystem.out.println(\"Finished bulk load for String2Id table\");//=====================//=============\n\t\t\n\t\tJob j4 = createId2StringJob(con, idStringAssocInput, id2StringOutput);\n\t\tj4.waitForCompletion(true);\n\t\t\n\t\tdoBulkLoad(bulkLoad, id2StringOutput, id2String, con);\t\t\n\t\tSystem.out.println(\"Finished bulk load for Id2String table\");//=====================//==================================\n\t}\n\n\tfinal private static long runIdGenerationJobs(Path convertedTripletsPath, Path idStringAssocInput) throws IOException, InterruptedException, ClassNotFoundException {\t\t\n\t\tPath resourceIds = new Path(outputPath+\"/\"+TripleToResource.RESOURCE_IDS_DIR);\n\t\t\n\t\trunTripleToResourceJob(idStringAssocInput, resourceIds);\n\t\tlong startPartition = HBPrefixMatchSchema.updateLastCounter(tripleToResourceReduceTasks, con.getConfiguration(), schemaSuffix)+1;\n\t\t//long startPartition = HBPrefixMatchSchema.getLastCounter(con.getConfiguration())+1;\n\t\t\n\t\t//SECOND PASS-----------------------------------------------\t\n\t\tJob j2 = createResourceToTripleJob(resourceIds, convertedTripletsPath);\t\n\t\tj2.waitForCompletion(true);\n\t\tSystem.out.println(\"Second pass finished\");\n\t\t\n\t\t//read counters from file\n\t\t//buildCountersFromFile();\n\t\t\n\t\treturn startPartition;\n\t}\n\n\tprivate static void runTripleToResourceJob(Path idStringAssocInput, Path resourceIds) throws IOException, InterruptedException, ClassNotFoundException {\n\t\tlong start = System.currentTimeMillis();\n\t\tJob j1 = createTripleToResourceJob(input, resourceIds, inputEstimateSize);\n\t\tj1.getConfiguration().set(\"outputPath\", outputPath);\n\t\tj1.getConfiguration().set(\"schemaSuffix\", schemaSuffix);\n\t\tj1.waitForCompletion(true);\n\t\t\n\t\t//move side effect files out of TripleToResource output directory\n\t\tmoveIdStringAssocDirectory(resourceIds, idStringAssocInput);\n\t\t\n\t\tlong firstJob = System.currentTimeMillis()-start;\n\t\tSystem.out.println(\"First pass finished in \"+firstJob+\" ms\");\n\t\tretrieveTripleToResourceCounters(j1);\n\t}\n\n\tprivate static void initializeLocalVariables(String[] args) {\n\t\tinput = new Path(args[0]);\n\t\tinputEstimateSize = Integer.parseInt(args[1]);\n\t\toutputPath = args[2];\n\t\tschemaSuffix = args[3];\n\t\tonlyTriples = Boolean.parseBoolean(args[4]);\n\t}\n\n\n\tpublic static Job createTripleToResourceJob(Path input, Path output, int inputSizeEstimate) throws IOException{\n\t\t//tripleToResourceReduceTasks = (int)(Math.ceil((double)totalNumberOfElements/Math.pow(2.0, 24.0)) * LOAD_BALANCER_FACTOR);\n\t\ttripleToResourceReduceTasks = 2;//TODO\n\t\tj.setMapOutputKeyClass(HBaseValue.class);\n\tpublic static void retrieveTripleToResourceCounters(Job j1) throws IOException{\n\t\t//sufixCounters = new TreeMap<Short, Long>();\n\t\t/*CounterGroup histogramGroup = counters.getGroup(TripleToResource.TripleToResourceReducer.HISTOGRAM_GROUP);\n\t\t}*/\t\t\n\t\t/*for (Map.Entry<Short, Long> entry : sufixCounters.entrySet()) {\n\t\t}*/\n\t\t//sufixCounters = new TreeMap();\n\t\t/*String line;\n\t\tSystem.out.println(totalCounter);*/\n\tprivate static void doBulkLoad(LoadIncrementalHFiles bulkLoad, Path dir, HTableInterface table, NativeJavaConnection con) throws InterruptedException{\n\t\tboolean timedOut = false;\n\t\t\t\t\n\t\t\tSystem.out.println(\"Bulk load taking longer than usual: sleeping for 10 minutes before proceeding to the next table..\");\n\t\t\ttimedOut = true;\n\t\tif (timedOut){//the BulkLoad took too long - which means the cluster is unbalanced\n\t\t\ttry {\n\t\t\t\tcon.getAdmin().split(table.getTableName());\n\t\t\t\tThread.sleep(300000);//TODO find a better method to do these splits\n\t\t\t} catch (IOException e) {\n\t\t\t\te.printStackTrace();\n\t\t}\n\t}\n\tpublic static void moveIdStringAssocDirectory(Path resourceIds, Path id2StringInput) throws IOException{\n\t\tConfiguration conf = new Configuration();\n\t\tFileSystem fs = FileSystem.get(conf);\n\t\tPath source = new Path(resourceIds, TripleToResource.ID2STRING_DIR);\n\t\tFileUtil.copy(fs, source, fs, id2StringInput, true, false, conf);\n\t", "new_methods": [ { "arguments": [ "String[] args" ], "filename": "src/main/java/nl/vu/datalayer/hbase/bulkload/BulkLoad.java", "implementation": "try {\n\t\tPath input = new Path(args[0]);\n\t\tString outputPath = args[2];\n\t\tPath resourceIds = new Path(outputPath+TripleToResource.RESOURCE_IDS_DIR);\n\t\tPath convertedTripletsPath = new Path(outputPath+ResourceToTriple.TEMP_TRIPLETS_DIR);\n\t\t\n\t\tPath string2IdInput = new Path(outputPath+TripleToResource.ID2STRING_DIR);\n\t\tPath string2IdOutput = new Path(outputPath+StringIdAssoc.STRING2ID_DIR);\n\t\t\n\t\tHBaseConnection con = new HBaseConnection(HBaseConnection.JAVA_API);\n\t\tHBPrefixMatchSchema.createCounterTable(con.getAdmin());\n\t\t\n\t\tlong start = System.currentTimeMillis();\n\t\t\n\t\tJob j1 = createTripleToResourceJob(input, resourceIds, Integer.parseInt(args[1]));\n\t\tj1.getConfiguration().set(\"outputPath\", outputPath);\n\t\tj1.waitForCompletion(true);\n\t\t\n\t\tlong firstJob = System.currentTimeMillis()-start;\n\t\tSystem.out.println(\"First pass finished in \"+firstJob+\" ms\");\n\t\t\n\t\t//retrieve counter values and build a SortedMap\n\t\tretrieveCounters(j1);\n\t\tlong startPartition = HBPrefixMatchSchema.updateLastCounter(tripleToResourceReduceTasks, con.getConfiguration())+1;", "signature": "void main(String[] args)" }, { "arguments": [ "String[] args" ], "filename": "src/main/java/nl/vu/datalayer/hbase/bulkload/BulkLoad.java", "implementation": "try {\n\t\t\tif (args.length != 5){\n\t\t\t\tSystem.out.println(\"Usage: bulkLoad <inputPath> <inputSizeEstimate in MB> <outputPath> <schemaSuffix> <onlyTriples(true/false)>\");\n\t\t\t\treturn;", "signature": "void main(String[] args)" }, { "arguments": [ "String[] args" ], "filename": "src/main/java/nl/vu/datalayer/hbase/bulkload/BulkLoad.java", "implementation": "input = new Path(args[0]);\n\t\tinputEstimateSize = Integer.parseInt(args[1]);\n\t\toutputPath = args[2];\n\t\tschemaSuffix = args[3];\n\t\tonlyTriples = Boolean.parseBoolean(args[4]);", "signature": "void initializeLocalVariables(String[] args)" } ], "old_code": "import org.apache.hadoop.io.Text;\n\tpublic static SortedMap<Short, Long> sufixCounters;\n\tpublic static Job createTripleToResourceJob(Path input, Path output, int inputSizeEstimate) throws IOException{\n\t\ttripleToResourceReduceTasks = (int)(Math.ceil((double)totalNumberOfElements/Math.pow(2.0, 24.0)) * LOAD_BALANCER_FACTOR);\n\t\tj.setMapOutputKeyClass(Text.class);\n\tpublic static void retrieveCounters(Job j1) throws IOException{\n\t\tsufixCounters = new TreeMap<Short, Long>();\n\t\tCounterGroup histogramGroup = counters.getGroup(TripleToResource.TripleToResourceReducer.HISTOGRAM_GROUP);\n\t\t}\t\t\n\t\tfor (Map.Entry<Short, Long> entry : sufixCounters.entrySet()) {\n\t\t}\n\t\tsufixCounters = new TreeMap();\n\t\tString line;\n\t\tSystem.out.println(totalCounter);\n\tprivate static void doBulkLoad(LoadIncrementalHFiles bulkLoad, Path dir, HTableInterface table) throws InterruptedException{\n\t\t\tSystem.out.println(\"Bulk load taking longer than usual: sleeping for 5 minutes before proceeding to the next table..\");\n\t}\n\t\n\t/*public static void main(String[] args) {\n\t\ttry {\n\t\tPath input = new Path(args[0]);\n\t\tString outputPath = args[2];\n\t\tPath resourceIds = new Path(outputPath+TripleToResource.RESOURCE_IDS_DIR);\n\t\tPath convertedTripletsPath = new Path(outputPath+ResourceToTriple.TEMP_TRIPLETS_DIR);\n\t\t\n\t\tPath string2IdInput = new Path(outputPath+TripleToResource.ID2STRING_DIR);\n\t\tPath string2IdOutput = new Path(outputPath+StringIdAssoc.STRING2ID_DIR);\n\t\t\n\t\tHBaseConnection con = new HBaseConnection(HBaseConnection.JAVA_API);\n\t\tHBPrefixMatchSchema.createCounterTable(con.getAdmin());\n\t\t\n\t\tlong start = System.currentTimeMillis();\n\t\t\n\t\tJob j1 = createTripleToResourceJob(input, resourceIds, Integer.parseInt(args[1]));\n\t\tj1.getConfiguration().set(\"outputPath\", outputPath);\n\t\tj1.waitForCompletion(true);\n\t\tlong firstJob = System.currentTimeMillis()-start;\n\t\tSystem.out.println(\"First pass finished in \"+firstJob+\" ms\");\n\t\t\n\t\t//retrieve counter values and build a SortedMap\n\t\tretrieveCounters(j1);\n\t\tlong startPartition = HBPrefixMatchSchema.updateLastCounter(tripleToResourceReduceTasks, con.getConfiguration())+1;\n\t\t}\n\t\tcatch (Exception e) {\n\t\t\te.printStackTrace();\n\t\t}\n\t}*/\n\t\n\t/**\n\t * @param args\n\t */\n\tpublic static void main(String[] args) {\n\t\ttry {\n\t\t\tif (args.length != 5){\n\t\t\t\tSystem.out.println(\"Usage: bulkLoad <inputPath> <inputSizeEstimate in MB> <outputPath> <schemaSuffix> <onlyTriples(true/false)>\");\n\t\t\t\treturn;\n\t\t\t\n\t\t\tPath input = new Path(args[0]);\n\t\t\tString outputPath = args[2];\n\t\t\tschemaSuffix = args[3];\n\t\t\tboolean onlyTriples = Boolean.parseBoolean(args[4]); \n\t\t\t\n\t\t\tPath resourceIds = new Path(outputPath+TripleToResource.RESOURCE_IDS_DIR);\n\t\t\tPath convertedTripletsPath = new Path(outputPath+ResourceToTriple.TEMP_TRIPLETS_DIR);\n\t\t\t\n\t\t\tPath string2IdInput = new Path(outputPath+TripleToResource.ID2STRING_DIR);\n\t\t\tPath string2IdOutput = new Path(outputPath+StringIdAssoc.STRING2ID_DIR);\n\t\t\t\n\t\t\tNativeJavaConnection con = (NativeJavaConnection)HBaseConnection.create(HBaseConnection.NATIVE_JAVA);\n\t\t\tHBPrefixMatchSchema prefMatchSchema = new HBPrefixMatchSchema(con, schemaSuffix);\n\t\t\tprefMatchSchema.createCounterTable(con.getAdmin());\n\t\t\t\n\t\t\tlong start = System.currentTimeMillis();\n\t\t\t\n\t\t\tJob j1 = createTripleToResourceJob(input, resourceIds, Integer.parseInt(args[1]));//TODO\n\t\t\tj1.getConfiguration().set(\"outputPath\", outputPath);\n\t\t\tj1.getConfiguration().set(\"schemaSuffix\", schemaSuffix);\n\t\t\tj1.waitForCompletion(true);\n\t\t\t\n\t\t\tlong firstJob = System.currentTimeMillis()-start;\n\t\t\tSystem.out.println(\"First pass finished in \"+firstJob+\" ms\");\n\t\t\t\n\t\t\t//retrieve counter values and build a SortedMap\n\t\t\tretrieveCounters(j1);//TODO\n\t\t\tlong startPartition = HBPrefixMatchSchema.updateLastCounter(tripleToResourceReduceTasks, con.getConfiguration(), schemaSuffix)+1;//TODO\n\t\t\t//long startPartition = HBPrefixMatchSchema.getLastCounter(con.getConfiguration())+1;\n\t\t\t\n\t\t\t\n\t\t\t//SECOND PASS-----------------------------------------------\t\n\t\t\t\n\t\t\tJob j2 = createResourceToTripleJob(resourceIds, convertedTripletsPath);\t\n\t\t\tj2.waitForCompletion(true);\n\t\t\t\n\t\t\tSystem.out.println(\"Second pass finished\");\n\t\t\t\n\t\t\t//read counters from file\n\t\t\t//buildCountersFromFile();\n\t\t\t//create all tables containing PrefixMatch schema ----------------------\n\t\t\tSystem.out.println(totalStringCount+\" : \"+numericalCount);\n\t\t\t\t\t\n\t\t\tprefMatchSchema.setTableSplitInfo(totalStringCount, numericalCount, \n\t\t\t\t\ttripleToResourceReduceTasks, startPartition, sufixCounters, \n\t\t\t\t\tonlyTriples);\n\t\t\tprefMatchSchema.create();\n\t\t\t\n\t\t\tLoadIncrementalHFiles bulkLoad = new LoadIncrementalHFiles(con.getConfiguration());\n\t\t\t\n\t\t\t//String2Id PASS----------------------------------------------\n\t\t\t\t\t\n\t\t\tJob j3 = createString2IdJob(con, string2IdInput, string2IdOutput);\n\t\t\tj3.waitForCompletion(true);\n\t\t\t\n\t\t\t//string2Id = con.getTable(HBPrefixMatchSchema.STRING2ID);\n\t\t\tdoBulkLoad(bulkLoad, string2IdOutput, string2Id);\n\t\t\t\n\t\t\tSystem.out.println(\"Finished bulk load for String2Id table\");//=====================//=============\n\t\t\t\n\t\t\tPath id2StringOutput = new Path(outputPath+StringIdAssoc.ID2STRING_DIR);\n\t\t\tJob j4 = createId2StringJob(con, string2IdInput, id2StringOutput);\n\t\t\tj4.waitForCompletion(true);\n\t\t\t\n\t\t\tdoBulkLoad(bulkLoad, id2StringOutput, id2String);\n\t\t\t\n\t\t\tSystem.out.println(\"Finished bulk load for Id2String table\");//=====================//==================================\n\t\t\t\n\t\t\tPath spocPath = new Path(outputPath+\"/\"+HBPrefixMatchSchema.TABLE_NAMES[HBPrefixMatchSchema.SPOC]);\n\t\t\tPath pocsPath = new Path(outputPath+\"/\"+HBPrefixMatchSchema.TABLE_NAMES[HBPrefixMatchSchema.POCS]);\n\t\t\tPath ospcPath = new Path(outputPath+\"/\"+HBPrefixMatchSchema.TABLE_NAMES[HBPrefixMatchSchema.OSPC]);\n\t\t\t\n\t\t\t//SPOC--------------------\n\t\t\tJob j5 = createPrefixMatchJob(con, convertedTripletsPath, spocPath, HBPrefixMatchSchema.SPOC, PrefixMatch.PrefixMatchSPOCMapper.class);\n\t\t\tj5.waitForCompletion(true);\n\t\t\t\n\t\t\tdoBulkLoad(bulkLoad, spocPath, currentTable);\n\t\t\tif (onlyTriples == false){//the table with prefix context\n\t\t\t\tPath cspoPath = new Path(outputPath+\"/\"+HBPrefixMatchSchema.TABLE_NAMES[HBPrefixMatchSchema.CSPO]);\n\t\t\t\tPath cpsoPath = new Path(outputPath+\"/\"+HBPrefixMatchSchema.TABLE_NAMES[HBPrefixMatchSchema.CPSO]);\n\t\t\t\tPath ocspPath = new Path(outputPath+\"/\"+HBPrefixMatchSchema.TABLE_NAMES[HBPrefixMatchSchema.OCSP]);\n\t\t\t\t\n\t\t\t\t//CSPO----------------------\n\t\t\t\tJob j7 = createPrefixMatchJob(con, convertedTripletsPath, cspoPath, HBPrefixMatchSchema.CSPO, PrefixMatch.PrefixMatchCSPOMapper.class);\n\t\t\t\tj7.waitForCompletion(true);\n\t\t\t\t\n\t\t\t\tdoBulkLoad(bulkLoad, cspoPath, currentTable);\n\t\t\t\t\n\t\t\t\t//CPSO-------------------------\n\t\t\t\tJob j8 = createPrefixMatchJob(con, convertedTripletsPath, cpsoPath, HBPrefixMatchSchema.CPSO, PrefixMatch.PrefixMatchCPSOMapper.class);\n\t\t\t\tj8.waitForCompletion(true);\n\t\t\t\t\n\t\t\t\tdoBulkLoad(bulkLoad, cpsoPath, currentTable);\n\t\t\t\t\n\t\t\t\t//OCSP--------------------------\t\t\t\n\t\t\t\tJob j9 = createPrefixMatchJob(con, convertedTripletsPath, ocspPath, HBPrefixMatchSchema.OCSP, PrefixMatch.PrefixMatchOCSPMapper.class);\n\t\t\t\tj9.waitForCompletion(true);\n\t\t\t\t\n\t\t\t\tdoBulkLoad(bulkLoad, ocspPath, currentTable);\n\t\t\t}\n\t\t\t\n\t\t\t//OSPC---------------------------\n\t\t\tJob j10 = createPrefixMatchJob(con, convertedTripletsPath, ospcPath, HBPrefixMatchSchema.OSPC, PrefixMatch.PrefixMatchOSPCMapper.class);\n\t\t\tj10.waitForCompletion(true);\n\t\t\t\n\t\t\tdoBulkLoad(bulkLoad, ospcPath, currentTable);\n\t\t\t\n\t\t\t//POCS---------------------\n\t\t\tJob j6 = createPrefixMatchJob(con, convertedTripletsPath, pocsPath, HBPrefixMatchSchema.POCS, PrefixMatch.PrefixMatchPOCSMapper.class);\n\t\t\tj6.waitForCompletion(true);\n\t\t\t\n\t\t\tdoBulkLoad(bulkLoad, pocsPath, currentTable);\n\t\t\t\n\t\t\tcon.close();\n\t\t\t\n\t\t} catch (IOException e) {\n\t\t\te.printStackTrace();\n\t\t}\n\t\tcatch(Exception e){\n\t\t\te.printStackTrace();\n\t\t}\n", "old_methods": [ { "arguments": [ "String[] args" ], "filename": "src/main/java/nl/vu/datalayer/hbase/bulkload/BulkLoad.java", "implementation": "try {\n\t\tPath input = new Path(args[0]);\n\t\tString outputPath = args[2];\n\t\tPath resourceIds = new Path(outputPath+TripleToResource.RESOURCE_IDS_DIR);\n\t\tPath convertedTripletsPath = new Path(outputPath+ResourceToTriple.TEMP_TRIPLETS_DIR);\n\t\t\n\t\tPath string2IdInput = new Path(outputPath+TripleToResource.ID2STRING_DIR);\n\t\tPath string2IdOutput = new Path(outputPath+StringIdAssoc.STRING2ID_DIR);\n\t\t\n\t\tHBaseConnection con = new HBaseConnection(HBaseConnection.JAVA_API);\n\t\tHBPrefixMatchSchema.createCounterTable(con.getAdmin());\n\t\t\n\t\tlong start = System.currentTimeMillis();\n\t\t\n\t\tJob j1 = createTripleToResourceJob(input, resourceIds, Integer.parseInt(args[1]));\n\t\tj1.getConfiguration().set(\"outputPath\", outputPath);\n\t\tj1.waitForCompletion(true);\n\t\tlong firstJob = System.currentTimeMillis()-start;\n\t\tSystem.out.println(\"First pass finished in \"+firstJob+\" ms\");\n\t\t\n\t\t//retrieve counter values and build a SortedMap\n\t\tretrieveCounters(j1);\n\t\tlong startPartition = HBPrefixMatchSchema.updateLastCounter(tripleToResourceReduceTasks, con.getConfiguration())+1;", "signature": "void main(String[] args)" }, { "arguments": [ "String[] args" ], "filename": "src/main/java/nl/vu/datalayer/hbase/bulkload/BulkLoad.java", "implementation": "try {\n\t\t\tif (args.length != 5){\n\t\t\t\tSystem.out.println(\"Usage: bulkLoad <inputPath> <inputSizeEstimate in MB> <outputPath> <schemaSuffix> <onlyTriples(true/false)>\");\n\t\t\t\treturn;\n\t\t\t\n\t\t\tPath input = new Path(args[0]);\n\t\t\tString outputPath = args[2];\n\t\t\tschemaSuffix = args[3];\n\t\t\tboolean onlyTriples = Boolean.parseBoolean(args[4]); \n\t\t\t\n\t\t\tPath resourceIds = new Path(outputPath+TripleToResource.RESOURCE_IDS_DIR);\n\t\t\tPath convertedTripletsPath = new Path(outputPath+ResourceToTriple.TEMP_TRIPLETS_DIR);\n\t\t\t\n\t\t\tPath string2IdInput = new Path(outputPath+TripleToResource.ID2STRING_DIR);\n\t\t\tPath string2IdOutput = new Path(outputPath+StringIdAssoc.STRING2ID_DIR);\n\t\t\t\n\t\t\tNativeJavaConnection con = (NativeJavaConnection)HBaseConnection.create(HBaseConnection.NATIVE_JAVA);\n\t\t\tHBPrefixMatchSchema prefMatchSchema = new HBPrefixMatchSchema(con, schemaSuffix);\n\t\t\tprefMatchSchema.createCounterTable(con.getAdmin());\n\t\t\t\n\t\t\tlong start = System.currentTimeMillis();\n\t\t\t\n\t\t\tJob j1 = createTripleToResourceJob(input, resourceIds, Integer.parseInt(args[1]));//TODO\n\t\t\tj1.getConfiguration().set(\"outputPath\", outputPath);\n\t\t\tj1.getConfiguration().set(\"schemaSuffix\", schemaSuffix);\n\t\t\tj1.waitForCompletion(true);\n\t\t\t\n\t\t\tlong firstJob = System.currentTimeMillis()-start;\n\t\t\tSystem.out.println(\"First pass finished in \"+firstJob+\" ms\");\n\t\t\t\n\t\t\t//retrieve counter values and build a SortedMap\n\t\t\tretrieveCounters(j1);//TODO\n\t\t\tlong startPartition = HBPrefixMatchSchema.updateLastCounter(tripleToResourceReduceTasks, con.getConfiguration(), schemaSuffix)+1;//TODO\n\t\t\t//long startPartition = HBPrefixMatchSchema.getLastCounter(con.getConfiguration())+1;\n\t\t\t\n\t\t\t\n\t\t\t//SECOND PASS-----------------------------------------------\t\n\t\t\t\n\t\t\tJob j2 = createResourceToTripleJob(resourceIds, convertedTripletsPath);\t\n\t\t\tj2.waitForCompletion(true);\n\t\t\t\n\t\t\tSystem.out.println(\"Second pass finished\");\n\t\t\t\n\t\t\t//read counters from file\n\t\t\t//buildCountersFromFile();\n\t\t\t//create all tables containing PrefixMatch schema ----------------------\n\t\t\tSystem.out.println(totalStringCount+\" : \"+numericalCount);\n\t\t\t\t\t\n\t\t\tprefMatchSchema.setTableSplitInfo(totalStringCount, numericalCount, \n\t\t\t\t\ttripleToResourceReduceTasks, startPartition, sufixCounters, \n\t\t\t\t\tonlyTriples);\n\t\t\tprefMatchSchema.create();\n\t\t\t\n\t\t\tLoadIncrementalHFiles bulkLoad = new LoadIncrementalHFiles(con.getConfiguration());\n\t\t\t\n\t\t\t//String2Id PASS----------------------------------------------\n\t\t\t\t\t\n\t\t\tJob j3 = createString2IdJob(con, string2IdInput, string2IdOutput);\n\t\t\tj3.waitForCompletion(true);\n\t\t\t\n\t\t\t//string2Id = con.getTable(HBPrefixMatchSchema.STRING2ID);\n\t\t\tdoBulkLoad(bulkLoad, string2IdOutput, string2Id);\n\t\t\t\n\t\t\tSystem.out.println(\"Finished bulk load for String2Id table\");//=====================//=============\n\t\t\t\n\t\t\tPath id2StringOutput = new Path(outputPath+StringIdAssoc.ID2STRING_DIR);\n\t\t\tJob j4 = createId2StringJob(con, string2IdInput, id2StringOutput);\n\t\t\tj4.waitForCompletion(true);\n\t\t\t\n\t\t\tdoBulkLoad(bulkLoad, id2StringOutput, id2String);\n\t\t\t\n\t\t\tSystem.out.println(\"Finished bulk load for Id2String table\");//=====================//==================================\n\t\t\t\n\t\t\tPath spocPath = new Path(outputPath+\"/\"+HBPrefixMatchSchema.TABLE_NAMES[HBPrefixMatchSchema.SPOC]);\n\t\t\tPath pocsPath = new Path(outputPath+\"/\"+HBPrefixMatchSchema.TABLE_NAMES[HBPrefixMatchSchema.POCS]);\n\t\t\tPath ospcPath = new Path(outputPath+\"/\"+HBPrefixMatchSchema.TABLE_NAMES[HBPrefixMatchSchema.OSPC]);\n\t\t\t\n\t\t\t//SPOC--------------------\n\t\t\tJob j5 = createPrefixMatchJob(con, convertedTripletsPath, spocPath, HBPrefixMatchSchema.SPOC, PrefixMatch.PrefixMatchSPOCMapper.class);\n\t\t\tj5.waitForCompletion(true);\n\t\t\t\n\t\t\tdoBulkLoad(bulkLoad, spocPath, currentTable);\n\t\t\tif (onlyTriples == false){//the table with prefix context\n\t\t\t\tPath cspoPath = new Path(outputPath+\"/\"+HBPrefixMatchSchema.TABLE_NAMES[HBPrefixMatchSchema.CSPO]);\n\t\t\t\tPath cpsoPath = new Path(outputPath+\"/\"+HBPrefixMatchSchema.TABLE_NAMES[HBPrefixMatchSchema.CPSO]);\n\t\t\t\tPath ocspPath = new Path(outputPath+\"/\"+HBPrefixMatchSchema.TABLE_NAMES[HBPrefixMatchSchema.OCSP]);\n\t\t\t\t\n\t\t\t\t//CSPO----------------------\n\t\t\t\tJob j7 = createPrefixMatchJob(con, convertedTripletsPath, cspoPath, HBPrefixMatchSchema.CSPO, PrefixMatch.PrefixMatchCSPOMapper.class);\n\t\t\t\tj7.waitForCompletion(true);\n\t\t\t\t\n\t\t\t\tdoBulkLoad(bulkLoad, cspoPath, currentTable);\n\t\t\t\t\n\t\t\t\t//CPSO-------------------------\n\t\t\t\tJob j8 = createPrefixMatchJob(con, convertedTripletsPath, cpsoPath, HBPrefixMatchSchema.CPSO, PrefixMatch.PrefixMatchCPSOMapper.class);\n\t\t\t\tj8.waitForCompletion(true);\n\t\t\t\t\n\t\t\t\tdoBulkLoad(bulkLoad, cpsoPath, currentTable);\n\t\t\t\t\n\t\t\t\t//OCSP--------------------------\t\t\t\n\t\t\t\tJob j9 = createPrefixMatchJob(con, convertedTripletsPath, ocspPath, HBPrefixMatchSchema.OCSP, PrefixMatch.PrefixMatchOCSPMapper.class);\n\t\t\t\tj9.waitForCompletion(true);\n\t\t\t\t\n\t\t\t\tdoBulkLoad(bulkLoad, ocspPath, currentTable);", "signature": "void main(String[] args)" } ], "patch": "@@ -14,9 +14,12 @@\n import nl.vu.datalayer.hbase.id.BaseId;\n import nl.vu.datalayer.hbase.id.DataPair;\n import nl.vu.datalayer.hbase.id.TypedId;\n+import nl.vu.datalayer.hbase.id.HBaseValue;\n import nl.vu.datalayer.hbase.schema.HBPrefixMatchSchema;\n \n import org.apache.hadoop.conf.Configuration;\n+import org.apache.hadoop.fs.FileSystem;\n+import org.apache.hadoop.fs.FileUtil;\n import org.apache.hadoop.fs.Path;\n import org.apache.hadoop.hbase.client.HTable;\n import org.apache.hadoop.hbase.client.HTableInterface;\n@@ -25,7 +28,6 @@\n import org.apache.hadoop.hbase.mapreduce.HFileOutputFormat;\n import org.apache.hadoop.hbase.mapreduce.LoadIncrementalHFiles;\n import org.apache.hadoop.io.NullWritable;\n-import org.apache.hadoop.io.Text;\n import org.apache.hadoop.mapred.JobConf;\n import org.apache.hadoop.mapreduce.Counter;\n import org.apache.hadoop.mapreduce.CounterGroup;\n@@ -71,15 +73,211 @@ public class BulkLoad {\n \t */\n \tpublic static double LOAD_BALANCER_FACTOR = 1.2;\n \t\n-\tpublic static SortedMap<Short, Long> sufixCounters;\n+\t//public static SortedMap<Short, Long> sufixCounters;\n \t\n \tpublic static long totalStringCount, numericalCount, literalCount, bNodeCount;\n \tpublic static int tripleToResourceReduceTasks;\n \t\n \tpublic static String schemaSuffix = \"\";\n+\n+\tprivate static Path input;\n+\n+\tprivate static int inputEstimateSize;\n+\n+\tprivate static String outputPath;\n+\n+\tprivate static boolean onlyTriples;\n+\n+\tprivate static NativeJavaConnection con;\n \t\n-\tpublic static Job createTripleToResourceJob(Path input, Path output, int inputSizeEstimate) throws IOException{\n+\t/*public static void main(String[] args) {\n+\t\ttry {\n+\t\tPath input = new Path(args[0]);\n+\t\tString outputPath = args[2];\n+\t\tPath resourceIds = new Path(outputPath+TripleToResource.RESOURCE_IDS_DIR);\n+\t\tPath convertedTripletsPath = new Path(outputPath+ResourceToTriple.TEMP_TRIPLETS_DIR);\n+\t\t\n+\t\tPath string2IdInput = new Path(outputPath+TripleToResource.ID2STRING_DIR);\n+\t\tPath string2IdOutput = new Path(outputPath+StringIdAssoc.STRING2ID_DIR);\n+\t\t\n+\t\tHBaseConnection con = new HBaseConnection(HBaseConnection.JAVA_API);\n+\t\tHBPrefixMatchSchema.createCounterTable(con.getAdmin());\n+\t\t\n+\t\tlong start = System.currentTimeMillis();\n+\t\t\n+\t\tJob j1 = createTripleToResourceJob(input, resourceIds, Integer.parseInt(args[1]));\n+\t\tj1.getConfiguration().set(\"outputPath\", outputPath);\n+\t\tj1.waitForCompletion(true);\n+\t\t\n+\t\tlong firstJob = System.currentTimeMillis()-start;\n+\t\tSystem.out.println(\"First pass finished in \"+firstJob+\" ms\");\n+\t\t\n+\t\t//retrieve counter values and build a SortedMap\n+\t\tretrieveCounters(j1);\n+\t\tlong startPartition = HBPrefixMatchSchema.updateLastCounter(tripleToResourceReduceTasks, con.getConfiguration())+1;\n+\t\t}\n+\t\tcatch (Exception e) {\n+\t\t\te.printStackTrace();\n+\t\t}\n+\t}*/\n+\t\n+\t/**\n+\t * @param args\n+\t */\n+\tpublic static void main(String[] args) {\n+\t\ttry {\n+\t\t\tif (args.length != 5){\n+\t\t\t\tSystem.out.println(\"Usage: bulkLoad <inputPath> <inputSizeEstimate in MB> <outputPath> <schemaSuffix> <onlyTriples(true/false)>\");\n+\t\t\t\treturn;\n+\t\t\t}\t\t\n+\t\t\tinitializeLocalVariables(args); \n+\t\t\t\n+\t\t\tPath convertedTripletsPath = new Path(outputPath+ResourceToTriple.TEMP_TRIPLETS_DIR);\n+\t\t\tPath idStringAssocInput = new Path(outputPath+\"/\"+TripleToResource.ID2STRING_DIR);\n+\t\t\t\n+\t\t\tcon = (NativeJavaConnection)HBaseConnection.create(HBaseConnection.NATIVE_JAVA);\n+\t\t\tHBPrefixMatchSchema prefMatchSchema = new HBPrefixMatchSchema(con, schemaSuffix);\n+\t\t\tprefMatchSchema.createCounterTable(con.getAdmin());\n+\t\t\t\n+\t\t\tlong startPartition = runIdGenerationJobs(convertedTripletsPath, idStringAssocInput);\n+\t\t\n+\t\t\t//create all tables containing PrefixMatch schema ----------------------\n+\t\t\tSystem.out.println(totalStringCount+\" : \"+numericalCount);\n+\t\t\t\t\t\n+\t\t\tprefMatchSchema.setTableSplitInfo(totalStringCount, numericalCount, \n+\t\t\t\t\ttripleToResourceReduceTasks, startPartition, onlyTriples);\n+\t\t\tprefMatchSchema.create();\n+\t\t\t\n+\t\t\tLoadIncrementalHFiles bulkLoad = new LoadIncrementalHFiles(con.getConfiguration());\n+\t\t\t\n+\t\t\tbulkLoadIdStringMappingTables(idStringAssocInput, bulkLoad);\t\t\n+\t\t\tbulkLoadQuadTables(convertedTripletsPath, bulkLoad);\n+\t\t\t\n+\t\t\tcon.close();\t\t\n+\t\t} catch (IOException e) {\n+\t\t\te.printStackTrace();\n+\t\t}\n+\t\tcatch(Exception e){\n+\t\t\te.printStackTrace();\n+\t\t}\n+\t}\n+\n+\tprivate static void bulkLoadQuadTables(Path convertedTripletsPath, LoadIncrementalHFiles bulkLoad) throws Exception, IOException, InterruptedException, ClassNotFoundException {\n+\t\tPath spocPath = new Path(outputPath+\"/\"+HBPrefixMatchSchema.TABLE_NAMES[HBPrefixMatchSchema.SPOC]);\n+\t\tPath pocsPath = new Path(outputPath+\"/\"+HBPrefixMatchSchema.TABLE_NAMES[HBPrefixMatchSchema.POCS]);\n+\t\tPath ospcPath = new Path(outputPath+\"/\"+HBPrefixMatchSchema.TABLE_NAMES[HBPrefixMatchSchema.OSPC]);\n+\t\t\n+\t\t//SPOC--------------------\n+\t\tJob j5 = createPrefixMatchJob(con, convertedTripletsPath, spocPath, HBPrefixMatchSchema.SPOC, PrefixMatch.PrefixMatchSPOCMapper.class);\n+\t\tj5.waitForCompletion(true);\n+\t\t\n+\t\tdoBulkLoad(bulkLoad, spocPath, currentTable, con);\n+\n+\t\tif (onlyTriples == false){\n+\t\t\tbulkLoadQuadOnlyTables(convertedTripletsPath, bulkLoad);\n+\t\t}\n+\t\t\n+\t\t//OSPC---------------------------\n+\t\tJob j10 = createPrefixMatchJob(con, convertedTripletsPath, ospcPath, HBPrefixMatchSchema.OSPC, PrefixMatch.PrefixMatchOSPCMapper.class);\n+\t\tj10.waitForCompletion(true);\n+\t\t\n+\t\tdoBulkLoad(bulkLoad, ospcPath, currentTable, con);\n+\t\t\n+\t\t//POCS---------------------\n+\t\tJob j6 = createPrefixMatchJob(con, convertedTripletsPath, pocsPath, HBPrefixMatchSchema.POCS, PrefixMatch.PrefixMatchPOCSMapper.class);\n+\t\tj6.waitForCompletion(true);\n+\t\t\n+\t\tdoBulkLoad(bulkLoad, pocsPath, currentTable, con);\n+\t}\n+\n+\tprivate static void bulkLoadQuadOnlyTables(Path convertedTripletsPath, LoadIncrementalHFiles bulkLoad) throws Exception, IOException, InterruptedException, ClassNotFoundException {\n+\t\tPath cspoPath = new Path(outputPath+\"/\"+HBPrefixMatchSchema.TABLE_NAMES[HBPrefixMatchSchema.CSPO]);\n+\t\tPath cpsoPath = new Path(outputPath+\"/\"+HBPrefixMatchSchema.TABLE_NAMES[HBPrefixMatchSchema.CPSO]);\n+\t\tPath ocspPath = new Path(outputPath+\"/\"+HBPrefixMatchSchema.TABLE_NAMES[HBPrefixMatchSchema.OCSP]);\n+\t\t\n+\t\t//CSPO----------------------\n+\t\tJob j7 = createPrefixMatchJob(con, convertedTripletsPath, cspoPath, HBPrefixMatchSchema.CSPO, PrefixMatch.PrefixMatchCSPOMapper.class);\n+\t\tj7.waitForCompletion(true);\n+\t\t\n+\t\tdoBulkLoad(bulkLoad, cspoPath, currentTable, con);\n+\t\t\n+\t\t//CPSO-------------------------\n+\t\tJob j8 = createPrefixMatchJob(con, convertedTripletsPath, cpsoPath, HBPrefixMatchSchema.CPSO, PrefixMatch.PrefixMatchCPSOMapper.class);\n+\t\tj8.waitForCompletion(true);\n+\t\t\n+\t\tdoBulkLoad(bulkLoad, cpsoPath, currentTable, con);\n+\t\t\n+\t\t//OCSP--------------------------\t\t\t\n+\t\tJob j9 = createPrefixMatchJob(con, convertedTripletsPath, ocspPath, HBPrefixMatchSchema.OCSP, PrefixMatch.PrefixMatchOCSPMapper.class);\n+\t\tj9.waitForCompletion(true);\n+\t\t\n+\t\tdoBulkLoad(bulkLoad, ocspPath, currentTable, con);\n+\t}\n+\n+\tfinal private static void bulkLoadIdStringMappingTables(Path idStringAssocInput, LoadIncrementalHFiles bulkLoad) throws Exception, IOException, InterruptedException, ClassNotFoundException {\n+\t\tPath string2IdOutput = new Path(outputPath+StringIdAssoc.STRING2ID_DIR);\n+\t\tPath id2StringOutput = new Path(outputPath+StringIdAssoc.ID2STRING_DIR);\n+\t\t\n+\t\t//String2Id PASS----------------------------------------------\t\t\n+\t\tJob j3 = createString2IdJob(con, idStringAssocInput, string2IdOutput);\n+\t\tj3.waitForCompletion(true);\n+\t\t\n+\t\t//string2Id = con.getTable(HBPrefixMatchSchema.STRING2ID+schemaSuffix);\n+\t\tdoBulkLoad(bulkLoad, string2IdOutput, string2Id, con);\n+\t\t\n+\t\tSystem.out.println(\"Finished bulk load for String2Id table\");//=====================//=============\n+\t\t\n+\t\tJob j4 = createId2StringJob(con, idStringAssocInput, id2StringOutput);\n+\t\tj4.waitForCompletion(true);\n+\t\t\n+\t\tdoBulkLoad(bulkLoad, id2StringOutput, id2String, con);\t\t\n+\t\tSystem.out.println(\"Finished bulk load for Id2String table\");//=====================//==================================\n+\t}\n+\n+\tfinal private static long runIdGenerationJobs(Path convertedTripletsPath, Path idStringAssocInput) throws IOException, InterruptedException, ClassNotFoundException {\t\t\n+\t\tPath resourceIds = new Path(outputPath+\"/\"+TripleToResource.RESOURCE_IDS_DIR);\n+\t\t\n+\t\trunTripleToResourceJob(idStringAssocInput, resourceIds);\n+\t\tlong startPartition = HBPrefixMatchSchema.updateLastCounter(tripleToResourceReduceTasks, con.getConfiguration(), schemaSuffix)+1;\n+\t\t//long startPartition = HBPrefixMatchSchema.getLastCounter(con.getConfiguration())+1;\n+\t\t\n+\t\t//SECOND PASS-----------------------------------------------\t\n+\t\tJob j2 = createResourceToTripleJob(resourceIds, convertedTripletsPath);\t\n+\t\tj2.waitForCompletion(true);\n+\t\tSystem.out.println(\"Second pass finished\");\n+\t\t\n+\t\t//read counters from file\n+\t\t//buildCountersFromFile();\n+\t\t\n+\t\treturn startPartition;\n+\t}\n+\n+\tprivate static void runTripleToResourceJob(Path idStringAssocInput, Path resourceIds) throws IOException, InterruptedException, ClassNotFoundException {\n+\t\tlong start = System.currentTimeMillis();\n+\t\tJob j1 = createTripleToResourceJob(input, resourceIds, inputEstimateSize);\n+\t\tj1.getConfiguration().set(\"outputPath\", outputPath);\n+\t\tj1.getConfiguration().set(\"schemaSuffix\", schemaSuffix);\n+\t\tj1.waitForCompletion(true);\n+\t\t\n+\t\t//move side effect files out of TripleToResource output directory\n+\t\tmoveIdStringAssocDirectory(resourceIds, idStringAssocInput);\n+\t\t\n+\t\tlong firstJob = System.currentTimeMillis()-start;\n+\t\tSystem.out.println(\"First pass finished in \"+firstJob+\" ms\");\n \t\t\n+\t\tretrieveTripleToResourceCounters(j1);\n+\t}\n+\n+\tprivate static void initializeLocalVariables(String[] args) {\n+\t\tinput = new Path(args[0]);\n+\t\tinputEstimateSize = Integer.parseInt(args[1]);\n+\t\toutputPath = args[2];\n+\t\tschemaSuffix = args[3];\n+\t\tonlyTriples = Boolean.parseBoolean(args[4]);\n+\t}\n+\n+\n+\tpublic static Job createTripleToResourceJob(Path input, Path output, int inputSizeEstimate) throws IOException{\n \t\tConfiguration conf = new Configuration();\n \t\tconf.setInt(\"mapred.job.reuse.jvm.num.tasks\", -1);\n \t\t\n@@ -97,7 +295,8 @@ public static Job createTripleToResourceJob(Path input, Path output, int inputSi\n \t\tlong numInputBytes = (long)(inputSizeEstimate*Math.pow(10.0, 6.0));\n \t\tlong numQuads = numInputBytes/QUAD_AVERAGE_SIZE;\n \t\tlong totalNumberOfElements = numQuads*ELEMENTS_PER_QUAD;\t\t\n-\t\ttripleToResourceReduceTasks = (int)(Math.ceil((double)totalNumberOfElements/Math.pow(2.0, 24.0)) * LOAD_BALANCER_FACTOR);\n+\t\t//tripleToResourceReduceTasks = (int)(Math.ceil((double)totalNumberOfElements/Math.pow(2.0, 24.0)) * LOAD_BALANCER_FACTOR);\n+\t\ttripleToResourceReduceTasks = 2;//TODO\n \t\tSystem.out.println(\"Number of reduce tasks: \"+tripleToResourceReduceTasks);\n \t\t\n \t\tj.setJarByClass(BulkLoad.class);\n@@ -107,7 +306,7 @@ public static Job createTripleToResourceJob(Path input, Path output, int inputSi\n \t\tj.setOutputKeyClass(TypedId.class);\n \t\tj.setOutputValueClass(DataPair.class);\n \t\t\n-\t\tj.setMapOutputKeyClass(Text.class);\n+\t\tj.setMapOutputKeyClass(HBaseValue.class);\n \t\tj.setMapOutputValueClass(DataPair.class);\n \n \t\tj.setInputFormatClass(TextInputFormat.class);\n@@ -219,8 +418,8 @@ public static Job createPrefixMatchJob(HBaseConnection con, Path input, Path out\n \t\treturn j;\n \t}\n \t\n-\tpublic static void retrieveCounters(Job j1) throws IOException{\n-\t\tsufixCounters = new TreeMap<Short, Long>();\n+\tpublic static void retrieveTripleToResourceCounters(Job j1) throws IOException{\n+\t\t//sufixCounters = new TreeMap<Short, Long>();\n \t\t\n \t\tCounters counters = j1.getCounters();\n \t\tCounterGroup numGroup = counters.getGroup(TripleToResource.TripleToResourceReducer.NUMERICAL_GROUP);\n@@ -232,7 +431,7 @@ public static void retrieveCounters(Job j1) throws IOException{\n \t\tbNodeCount = elemsGroup.findCounter(\"Blanks\").getValue();\n \t\t\n \t\t//build histogram\n-\t\tCounterGroup histogramGroup = counters.getGroup(TripleToResource.TripleToResourceReducer.HISTOGRAM_GROUP);\n+\t\t/*CounterGroup histogramGroup = counters.getGroup(TripleToResource.TripleToResourceReducer.HISTOGRAM_GROUP);\n \t\tIterator<Counter> it = histogramGroup.iterator();\n \t\twhile (it.hasNext()){\n \t\t\tCounter c = it.next();\n@@ -242,29 +441,29 @@ public static void retrieveCounters(Job j1) throws IOException{\n \t\t\tlong half = c.getValue()/2;\n \t\t\tsufixCounters.put(b, half);\n \t\t\tsufixCounters.put((short)(b | 0x01), c.getValue()-half);\n-\t\t}\t\t\n+\t\t}*/\t\t\n \t\t\n \t\t//save counter values to file\n \t\tFileWriter file = new FileWriter(\"Counters\");\n \t\tfile.write(Long.toString(totalStringCount)+\"\\n\");\n \t\tfile.write(Long.toString(numericalCount)+\"\\n\");\n \t\tfile.write(Integer.toString(tripleToResourceReduceTasks)+\"\\n\");\n \t\t\n-\t\tfor (Map.Entry<Short, Long> entry : sufixCounters.entrySet()) {\n+\t\t/*for (Map.Entry<Short, Long> entry : sufixCounters.entrySet()) {\n \t\t\tfile.write(entry.getKey()+\"@\"+entry.getValue()+\"\\n\");\n-\t\t}\n+\t\t}*/\n \t\tfile.close();\n \t}\n \t\n \tpublic static void buildCountersFromFile() throws IOException{\n-\t\tsufixCounters = new TreeMap();\n+\t\t//sufixCounters = new TreeMap();\n \t\tFileReader file2 = new FileReader(\"Counters\");\n \t\tBufferedReader reader = new BufferedReader(file2);\n \t\ttotalStringCount = Long.parseLong(reader.readLine());\n \t\tnumericalCount = Long.parseLong(reader.readLine());\n \t\ttripleToResourceReduceTasks = Integer.parseInt(reader.readLine());\n \t\t\n-\t\tString line;\n+\t\t/*String line;\n \t\tlong totalCounter = 0;\n \t\twhile ((line=reader.readLine()) != null){\n \t\t\tString []tokens = line.split(\"@\");\n@@ -274,186 +473,40 @@ public static void buildCountersFromFile() throws IOException{\n \t\t\tsufixCounters.put(s, current);\n \t\t\ttotalCounter += current;\n \t\t}\n-\t\tSystem.out.println(totalCounter);\n+\t\tSystem.out.println(totalCounter);*/\n \t}\n \n-\tprivate static void doBulkLoad(LoadIncrementalHFiles bulkLoad, Path dir, HTableInterface table) throws InterruptedException{\n+\tprivate static void doBulkLoad(LoadIncrementalHFiles bulkLoad, Path dir, HTableInterface table, NativeJavaConnection con) throws InterruptedException{\n+\t\tboolean timedOut = false;\n \t\ttry{\n \t\t\tlong start = System.currentTimeMillis();\n \t\t\tbulkLoad.doBulkLoad(dir, (HTable)table);\n \t\t\tlong bulkTime = System.currentTimeMillis()-start;\n \t\t\tSystem.out.println(table.getTableDescriptor().getNameAsString()+\" bulkLoad time: \"+bulkTime);\n+\t\t\t\t\n \t\t}\n \t\tcatch(java.io.IOException e){\n-\t\t\tSystem.out.println(\"Bulk load taking longer than usual: sleeping for 5 minutes before proceeding to the next table..\");\n+\t\t\tSystem.out.println(\"Bulk load taking longer than usual: sleeping for 10 minutes before proceeding to the next table..\");\n \t\t\tThread.sleep(600000);\n+\t\t\ttimedOut = true;\n \t\t}\n-\t}\n-\t\n-\t/*public static void main(String[] args) {\n-\t\ttry {\n-\t\tPath input = new Path(args[0]);\n-\t\tString outputPath = args[2];\n-\t\tPath resourceIds = new Path(outputPath+TripleToResource.RESOURCE_IDS_DIR);\n-\t\tPath convertedTripletsPath = new Path(outputPath+ResourceToTriple.TEMP_TRIPLETS_DIR);\n-\t\t\n-\t\tPath string2IdInput = new Path(outputPath+TripleToResource.ID2STRING_DIR);\n-\t\tPath string2IdOutput = new Path(outputPath+StringIdAssoc.STRING2ID_DIR);\n-\t\t\n-\t\tHBaseConnection con = new HBaseConnection(HBaseConnection.JAVA_API);\n-\t\tHBPrefixMatchSchema.createCounterTable(con.getAdmin());\n-\t\t\n-\t\tlong start = System.currentTimeMillis();\n-\t\t\n-\t\tJob j1 = createTripleToResourceJob(input, resourceIds, Integer.parseInt(args[1]));\n-\t\tj1.getConfiguration().set(\"outputPath\", outputPath);\n-\t\tj1.waitForCompletion(true);\n \t\t\n-\t\tlong firstJob = System.currentTimeMillis()-start;\n-\t\tSystem.out.println(\"First pass finished in \"+firstJob+\" ms\");\n-\t\t\n-\t\t//retrieve counter values and build a SortedMap\n-\t\tretrieveCounters(j1);\n-\t\tlong startPartition = HBPrefixMatchSchema.updateLastCounter(tripleToResourceReduceTasks, con.getConfiguration())+1;\n-\t\t}\n-\t\tcatch (Exception e) {\n-\t\t\te.printStackTrace();\n-\t\t}\n-\t}*/\n-\t\n-\t/**\n-\t * @param args\n-\t */\n-\tpublic static void main(String[] args) {\n-\t\ttry {\n-\t\t\tif (args.length != 5){\n-\t\t\t\tSystem.out.println(\"Usage: bulkLoad <inputPath> <inputSizeEstimate in MB> <outputPath> <schemaSuffix> <onlyTriples(true/false)>\");\n-\t\t\t\treturn;\n+\t\tif (timedOut){//the BulkLoad took too long - which means the cluster is unbalanced\n+\t\t\ttry {\n+\t\t\t\tcon.getAdmin().split(table.getTableName());\n+\t\t\t\tThread.sleep(300000);//TODO find a better method to do these splits\n+\t\t\t} catch (IOException e) {\n+\t\t\t\te.printStackTrace();\n \t\t\t}\n-\t\t\t\n-\t\t\tPath input = new Path(args[0]);\n-\t\t\tString outputPath = args[2];\n-\t\t\tschemaSuffix = args[3];\n-\t\t\tboolean onlyTriples = Boolean.parseBoolean(args[4]); \n-\t\t\t\n-\t\t\tPath resourceIds = new Path(outputPath+TripleToResource.RESOURCE_IDS_DIR);\n-\t\t\tPath convertedTripletsPath = new Path(outputPath+ResourceToTriple.TEMP_TRIPLETS_DIR);\n-\t\t\t\n-\t\t\tPath string2IdInput = new Path(outputPath+TripleToResource.ID2STRING_DIR);\n-\t\t\tPath string2IdOutput = new Path(outputPath+StringIdAssoc.STRING2ID_DIR);\n-\t\t\t\n-\t\t\tNativeJavaConnection con = (NativeJavaConnection)HBaseConnection.create(HBaseConnection.NATIVE_JAVA);\n-\t\t\tHBPrefixMatchSchema prefMatchSchema = new HBPrefixMatchSchema(con, schemaSuffix);\n-\t\t\tprefMatchSchema.createCounterTable(con.getAdmin());\n-\t\t\t\n-\t\t\tlong start = System.currentTimeMillis();\n-\t\t\t\n-\t\t\tJob j1 = createTripleToResourceJob(input, resourceIds, Integer.parseInt(args[1]));//TODO\n-\t\t\tj1.getConfiguration().set(\"outputPath\", outputPath);\n-\t\t\tj1.getConfiguration().set(\"schemaSuffix\", schemaSuffix);\n-\t\t\tj1.waitForCompletion(true);\n-\t\t\t\n-\t\t\tlong firstJob = System.currentTimeMillis()-start;\n-\t\t\tSystem.out.println(\"First pass finished in \"+firstJob+\" ms\");\n-\t\t\t\n-\t\t\t//retrieve counter values and build a SortedMap\n-\t\t\tretrieveCounters(j1);//TODO\n-\t\t\tlong startPartition = HBPrefixMatchSchema.updateLastCounter(tripleToResourceReduceTasks, con.getConfiguration(), schemaSuffix)+1;//TODO\n-\t\t\t//long startPartition = HBPrefixMatchSchema.getLastCounter(con.getConfiguration())+1;\n-\t\t\t\n-\t\t\t\n-\t\t\t//SECOND PASS-----------------------------------------------\t\n-\t\t\t\n-\t\t\tJob j2 = createResourceToTripleJob(resourceIds, convertedTripletsPath);\t\n-\t\t\tj2.waitForCompletion(true);\n-\t\t\t\n-\t\t\tSystem.out.println(\"Second pass finished\");\n-\t\t\t\n-\t\t\t//read counters from file\n-\t\t\t//buildCountersFromFile();\n+\t\t}\n \t\t\n-\t\t\t//create all tables containing PrefixMatch schema ----------------------\n-\t\t\tSystem.out.println(totalStringCount+\" : \"+numericalCount);\n-\t\t\t\t\t\n-\t\t\tprefMatchSchema.setTableSplitInfo(totalStringCount, numericalCount, \n-\t\t\t\t\ttripleToResourceReduceTasks, startPartition, sufixCounters, \n-\t\t\t\t\tonlyTriples);\n-\t\t\tprefMatchSchema.create();\n-\t\t\t\n-\t\t\tLoadIncrementalHFiles bulkLoad = new LoadIncrementalHFiles(con.getConfiguration());\n-\t\t\t\n-\t\t\t//String2Id PASS----------------------------------------------\n-\t\t\t\t\t\n-\t\t\tJob j3 = createString2IdJob(con, string2IdInput, string2IdOutput);\n-\t\t\tj3.waitForCompletion(true);\n-\t\t\t\n-\t\t\t//string2Id = con.getTable(HBPrefixMatchSchema.STRING2ID);\n-\t\t\tdoBulkLoad(bulkLoad, string2IdOutput, string2Id);\n-\t\t\t\n-\t\t\tSystem.out.println(\"Finished bulk load for String2Id table\");//=====================//=============\n-\t\t\t\n-\t\t\tPath id2StringOutput = new Path(outputPath+StringIdAssoc.ID2STRING_DIR);\n-\t\t\tJob j4 = createId2StringJob(con, string2IdInput, id2StringOutput);\n-\t\t\tj4.waitForCompletion(true);\n-\t\t\t\n-\t\t\tdoBulkLoad(bulkLoad, id2StringOutput, id2String);\n-\t\t\t\n-\t\t\tSystem.out.println(\"Finished bulk load for Id2String table\");//=====================//==================================\n-\t\t\t\n-\t\t\tPath spocPath = new Path(outputPath+\"/\"+HBPrefixMatchSchema.TABLE_NAMES[HBPrefixMatchSchema.SPOC]);\n-\t\t\tPath pocsPath = new Path(outputPath+\"/\"+HBPrefixMatchSchema.TABLE_NAMES[HBPrefixMatchSchema.POCS]);\n-\t\t\tPath ospcPath = new Path(outputPath+\"/\"+HBPrefixMatchSchema.TABLE_NAMES[HBPrefixMatchSchema.OSPC]);\n-\t\t\t\n-\t\t\t//SPOC--------------------\n-\t\t\tJob j5 = createPrefixMatchJob(con, convertedTripletsPath, spocPath, HBPrefixMatchSchema.SPOC, PrefixMatch.PrefixMatchSPOCMapper.class);\n-\t\t\tj5.waitForCompletion(true);\n-\t\t\t\n-\t\t\tdoBulkLoad(bulkLoad, spocPath, currentTable);\n+\t}\n \t\n-\t\t\tif (onlyTriples == false){//the table with prefix context\n-\t\t\t\tPath cspoPath = new Path(outputPath+\"/\"+HBPrefixMatchSchema.TABLE_NAMES[HBPrefixMatchSchema.CSPO]);\n-\t\t\t\tPath cpsoPath = new Path(outputPath+\"/\"+HBPrefixMatchSchema.TABLE_NAMES[HBPrefixMatchSchema.CPSO]);\n-\t\t\t\tPath ocspPath = new Path(outputPath+\"/\"+HBPrefixMatchSchema.TABLE_NAMES[HBPrefixMatchSchema.OCSP]);\n-\t\t\t\t\n-\t\t\t\t//CSPO----------------------\n-\t\t\t\tJob j7 = createPrefixMatchJob(con, convertedTripletsPath, cspoPath, HBPrefixMatchSchema.CSPO, PrefixMatch.PrefixMatchCSPOMapper.class);\n-\t\t\t\tj7.waitForCompletion(true);\n-\t\t\t\t\n-\t\t\t\tdoBulkLoad(bulkLoad, cspoPath, currentTable);\n-\t\t\t\t\n-\t\t\t\t//CPSO-------------------------\n-\t\t\t\tJob j8 = createPrefixMatchJob(con, convertedTripletsPath, cpsoPath, HBPrefixMatchSchema.CPSO, PrefixMatch.PrefixMatchCPSOMapper.class);\n-\t\t\t\tj8.waitForCompletion(true);\n-\t\t\t\t\n-\t\t\t\tdoBulkLoad(bulkLoad, cpsoPath, currentTable);\n-\t\t\t\t\n-\t\t\t\t//OCSP--------------------------\t\t\t\n-\t\t\t\tJob j9 = createPrefixMatchJob(con, convertedTripletsPath, ocspPath, HBPrefixMatchSchema.OCSP, PrefixMatch.PrefixMatchOCSPMapper.class);\n-\t\t\t\tj9.waitForCompletion(true);\n-\t\t\t\t\n-\t\t\t\tdoBulkLoad(bulkLoad, ocspPath, currentTable);\n-\t\t\t}\n-\t\t\t\n-\t\t\t//OSPC---------------------------\n-\t\t\tJob j10 = createPrefixMatchJob(con, convertedTripletsPath, ospcPath, HBPrefixMatchSchema.OSPC, PrefixMatch.PrefixMatchOSPCMapper.class);\n-\t\t\tj10.waitForCompletion(true);\n-\t\t\t\n-\t\t\tdoBulkLoad(bulkLoad, ospcPath, currentTable);\n-\t\t\t\n-\t\t\t//POCS---------------------\n-\t\t\tJob j6 = createPrefixMatchJob(con, convertedTripletsPath, pocsPath, HBPrefixMatchSchema.POCS, PrefixMatch.PrefixMatchPOCSMapper.class);\n-\t\t\tj6.waitForCompletion(true);\n-\t\t\t\n-\t\t\tdoBulkLoad(bulkLoad, pocsPath, currentTable);\n-\t\t\t\n-\t\t\tcon.close();\n-\t\t\t\n-\t\t} catch (IOException e) {\n-\t\t\te.printStackTrace();\n-\t\t}\n-\t\tcatch(Exception e){\n-\t\t\te.printStackTrace();\n-\t\t}\n+\tpublic static void moveIdStringAssocDirectory(Path resourceIds, Path id2StringInput) throws IOException{\n+\t\tConfiguration conf = new Configuration();\n+\t\tFileSystem fs = FileSystem.get(conf);\n+\t\tPath source = new Path(resourceIds, TripleToResource.ID2STRING_DIR);\n+\t\tFileUtil.copy(fs, source, fs, id2StringInput, true, false, conf);\n \t}\n-\n+\t\n }", "raw_url": "https://github.com/pgroth/hbase-rdf/raw/cbf0cac3f03c8dffbc415eab1421234dfc3ead24/src%2Fmain%2Fjava%2Fnl%2Fvu%2Fdatalayer%2Fhbase%2Fbulkload%2FBulkLoad.java", "sha": "5b176fe9d63525411ece6cfa8457befe0c4a5648", "status": "modified" }, { "additions": 33, "blob_url": "https://github.com/pgroth/hbase-rdf/blob/cbf0cac3f03c8dffbc415eab1421234dfc3ead24/src%2Fmain%2Fjava%2Fnl%2Fvu%2Fdatalayer%2Fhbase%2Fbulkload%2FStringIdAssoc.java", "changes": 62, "contents_url": "https://api.github.com/repos/pgroth/hbase-rdf/contents/src%2Fmain%2Fjava%2Fnl%2Fvu%2Fdatalayer%2Fhbase%2Fbulkload%2FStringIdAssoc.java?ref=cbf0cac3f03c8dffbc415eab1421234dfc3ead24", "deletions": 29, "filename": "src/main/java/nl/vu/datalayer/hbase/bulkload/StringIdAssoc.java", "new_code": "import java.io.ByteArrayOutputStream;\nimport java.io.DataOutputStream;\nimport java.io.UnsupportedEncodingException;\nimport java.security.MessageDigest;\nimport java.security.NoSuchAlgorithmException;\nimport nl.vu.datalayer.hbase.id.HBaseValue;\nimport org.apache.hadoop.mapreduce.Mapper.Context;\n\t\t\torg.apache.hadoop.mapreduce.Mapper<ImmutableBytesWritable, HBaseValue, ImmutableBytesWritable, Put>\n\t\tprotected void map(ImmutableBytesWritable key, HBaseValue value, Context context) throws IOException, InterruptedException {\n\t\t\tByteArrayOutputStream out = new ByteArrayOutputStream();\n\t\t\tvalue.write(new DataOutputStream(out));\n\t\t\t//byte []valueBytes = new byte [value.getLength()];\n\t\t\t//System.arraycopy(value.getBytes(), 0, valueBytes, 0, value.getLength());\n\t\t\t\n\t\t\toutVal.add(HBPrefixMatchSchema.COLUMN_FAMILY, HBPrefixMatchSchema.COLUMN_NAME, out.toByteArray());\n\tpublic static byte []reverseBytes(byte []sourceBytes){\n\t\tint lastIndex = sourceBytes.length-1;\n\t\t\torg.apache.hadoop.mapreduce.Mapper<ImmutableBytesWritable, HBaseValue, ImmutableBytesWritable, Put> \n\t\tprivate MessageDigest mDigest;\n\t\t\n\t\tprotected void setup(Context context) throws IOException, InterruptedException {\n\t\t\ttry {\n\t\t\t\tmDigest = MessageDigest.getInstance(\"MD5\");\n\t\t\t} catch (NoSuchAlgorithmException e) {\n\t\t\t\te.printStackTrace();\n\t\t\t}\n\t\t}\n\n\t\t@Override\n\t\tprotected void map(ImmutableBytesWritable inKey, HBaseValue inValue, Context context) \n\t\t\tbyte []md5HashBytes = mDigest.digest(inValue.toString().getBytes(\"UTF-8\"));\n\t\t\tImmutableBytesWritable outKey = new ImmutableBytesWritable(md5HashBytes);\t\t\t\t\n\t\t\tPut outVal = new Put(md5HashBytes);", "new_methods": [], "old_code": "\t\t\torg.apache.hadoop.mapreduce.Mapper<ImmutableBytesWritable, Text, ImmutableBytesWritable, Put>\n\t\tprotected void map(ImmutableBytesWritable key, Text value, Context context) throws IOException, InterruptedException {\n\t\t\tbyte []valueBytes = new byte [value.getLength()];\n\t\t\tSystem.arraycopy(value.getBytes(), 0, valueBytes, 0, value.getLength());\n\t\t\toutVal.add(HBPrefixMatchSchema.COLUMN_FAMILY, HBPrefixMatchSchema.COLUMN_NAME, valueBytes);\n\tpublic static byte []reverseBytes(byte []sourceBytes, int sourceLength){\n\t\tint lastIndex;\n\t\tif (sourceBytes[sourceLength-1] == '\\\"')//eliminate last \" for literals in order to have a good dispersion\n\t\t\tlastIndex = sourceLength-2;\n\t\telse\n\t\t\tlastIndex = sourceLength-1;\n\t\t\torg.apache.hadoop.mapreduce.Mapper<ImmutableBytesWritable, Text, ImmutableBytesWritable, Put> \n\t\tprotected void map(ImmutableBytesWritable inKey, Text inValue, Context context) \n\t\t\tbyte []inValueBytes;\n\t\t\tbyte []sourceBytes = inValue.getBytes();\n\t\t\tint sourceLength = inValue.getLength();\n\t\t\tif (sourceLength > HConstants.MAX_ROW_LENGTH){//if the key is too long use the hash\n\t\t\t\tString s = Text.decode(sourceBytes, 0, sourceLength);\n\t\t\t\tlong hash = hashFunction(s);\n\t\t\t\tinValueBytes = new byte[9];\n\t\t\t\t//the first byte is left 00, because it is not part of RDF characters\n\t\t\t\t//it acts as an escape in case all the bytes in the hash are valid RDF characters\n\t\t\t\tBytes.putLong(inValueBytes, 1, hash);\n\t\t\t}\n\t\t\telse{//reverse the value so that we have a better dispersion for links which have the same prefix\t\t\n\t\t\t\tinValueBytes = reverseBytes(sourceBytes, sourceLength);\n\t\t\t}\t\t\n\t\t\tImmutableBytesWritable outKey = new ImmutableBytesWritable(inValueBytes);\t\t\t\t\n\t\t\tPut outVal = new Put(inValueBytes);", "old_methods": [], "patch": "@@ -1,34 +1,44 @@\n package nl.vu.datalayer.hbase.bulkload;\n \n+import java.io.ByteArrayOutputStream;\n+import java.io.DataOutputStream;\n import java.io.IOException;\n+import java.io.UnsupportedEncodingException;\n+import java.security.MessageDigest;\n+import java.security.NoSuchAlgorithmException;\n \n+import nl.vu.datalayer.hbase.id.HBaseValue;\n import nl.vu.datalayer.hbase.schema.HBPrefixMatchSchema;\n \n import org.apache.hadoop.hbase.HConstants;\n import org.apache.hadoop.hbase.client.Put;\n import org.apache.hadoop.hbase.io.ImmutableBytesWritable;\n import org.apache.hadoop.hbase.util.Bytes;\n import org.apache.hadoop.io.Text;\n+import org.apache.hadoop.mapreduce.Mapper.Context;\n \n public class StringIdAssoc {\n \t\n \tpublic static final String STRING2ID_DIR = \"/string2Id\";\n \tpublic static final String ID2STRING_DIR = \"/id2String\";\n \t\n \tpublic static class Id2StringMapper extends \n-\t\t\torg.apache.hadoop.mapreduce.Mapper<ImmutableBytesWritable, Text, ImmutableBytesWritable, Put>\n+\t\t\torg.apache.hadoop.mapreduce.Mapper<ImmutableBytesWritable, HBaseValue, ImmutableBytesWritable, Put>\n \t{\n \t\t@Override\n-\t\tprotected void map(ImmutableBytesWritable key, Text value, Context context) throws IOException, InterruptedException {\n+\t\tprotected void map(ImmutableBytesWritable key, HBaseValue value, Context context) throws IOException, InterruptedException {\n \t\t\t\n \t\t\tbyte []keyBytes = new byte [key.getLength()];\n \t\t\tSystem.arraycopy(key.get(), key.getOffset(), keyBytes, 0, key.getLength());\n \t\t\t\n \t\t\tPut outVal = new Put(keyBytes);\n \t\t\t\n-\t\t\tbyte []valueBytes = new byte [value.getLength()];\n-\t\t\tSystem.arraycopy(value.getBytes(), 0, valueBytes, 0, value.getLength());\n-\t\t\toutVal.add(HBPrefixMatchSchema.COLUMN_FAMILY, HBPrefixMatchSchema.COLUMN_NAME, valueBytes);\n+\t\t\tByteArrayOutputStream out = new ByteArrayOutputStream();\n+\t\t\tvalue.write(new DataOutputStream(out));\n+\t\t\t//byte []valueBytes = new byte [value.getLength()];\n+\t\t\t//System.arraycopy(value.getBytes(), 0, valueBytes, 0, value.getLength());\n+\t\t\t\n+\t\t\toutVal.add(HBPrefixMatchSchema.COLUMN_FAMILY, HBPrefixMatchSchema.COLUMN_NAME, out.toByteArray());\n \t\t\t\n \t\t\tcontext.write(key, outVal);\n \t\t}\n@@ -49,12 +59,8 @@ private static long hashFunction(String key){\n \t\treturn hash;\n \t}\n \t\n-\tpublic static byte []reverseBytes(byte []sourceBytes, int sourceLength){\n-\t\tint lastIndex;\n-\t\tif (sourceBytes[sourceLength-1] == '\\\"')//eliminate last \" for literals in order to have a good dispersion\n-\t\t\tlastIndex = sourceLength-2;\n-\t\telse\n-\t\t\tlastIndex = sourceLength-1;\n+\tpublic static byte []reverseBytes(byte []sourceBytes){\n+\t\tint lastIndex = sourceBytes.length-1;\n \t\t\n \t\tbyte []outValueBytes = new byte[lastIndex+1];\n \t\tfor (int i = 0; i < outValueBytes.length; i++) {\n@@ -64,29 +70,27 @@ private static long hashFunction(String key){\n \t}\n \t\n \tpublic static class String2IdMapper extends \n-\t\t\torg.apache.hadoop.mapreduce.Mapper<ImmutableBytesWritable, Text, ImmutableBytesWritable, Put> \n+\t\t\torg.apache.hadoop.mapreduce.Mapper<ImmutableBytesWritable, HBaseValue, ImmutableBytesWritable, Put> \n \t{\n+\t\tprivate MessageDigest mDigest;\n+\t\t\n \t\t@Override\n-\t\tprotected void map(ImmutableBytesWritable inKey, Text inValue, Context context) \n+\t\tprotected void setup(Context context) throws IOException, InterruptedException {\n+\t\t\ttry {\n+\t\t\t\tmDigest = MessageDigest.getInstance(\"MD5\");\n+\t\t\t} catch (NoSuchAlgorithmException e) {\n+\t\t\t\te.printStackTrace();\n+\t\t\t}\n+\t\t}\n+\n+\t\t@Override\n+\t\tprotected void map(ImmutableBytesWritable inKey, HBaseValue inValue, Context context) \n \t\t\t\t\t\t\t\t\t\tthrows IOException, InterruptedException {\n-\t\t\tbyte []inValueBytes;\n-\t\t\tbyte []sourceBytes = inValue.getBytes();\n-\t\t\tint sourceLength = inValue.getLength();\n \t\t\t\n-\t\t\tif (sourceLength > HConstants.MAX_ROW_LENGTH){//if the key is too long use the hash\n-\t\t\t\tString s = Text.decode(sourceBytes, 0, sourceLength);\n-\t\t\t\tlong hash = hashFunction(s);\n-\t\t\t\tinValueBytes = new byte[9];\n-\t\t\t\t//the first byte is left 00, because it is not part of RDF characters\n-\t\t\t\t//it acts as an escape in case all the bytes in the hash are valid RDF characters\n-\t\t\t\tBytes.putLong(inValueBytes, 1, hash);\n-\t\t\t}\n-\t\t\telse{//reverse the value so that we have a better dispersion for links which have the same prefix\t\t\n-\t\t\t\tinValueBytes = reverseBytes(sourceBytes, sourceLength);\n-\t\t\t}\t\t\n-\t\t\tImmutableBytesWritable outKey = new ImmutableBytesWritable(inValueBytes);\t\t\t\t\n+\t\t\tbyte []md5HashBytes = mDigest.digest(inValue.toString().getBytes(\"UTF-8\"));\n+\t\t\tImmutableBytesWritable outKey = new ImmutableBytesWritable(md5HashBytes);\t\t\t\t\n \n-\t\t\tPut outVal = new Put(inValueBytes);\n+\t\t\tPut outVal = new Put(md5HashBytes);\n \t\t\tbyte []inKeyBytes = new byte [inKey.getLength()];\n \t\t\tSystem.arraycopy(inKey.get(), inKey.getOffset(), inKeyBytes, 0, inKey.getLength());\n \t\t\toutVal.add(HBPrefixMatchSchema.COLUMN_FAMILY, HBPrefixMatchSchema.COLUMN_NAME, inKeyBytes);", "raw_url": "https://github.com/pgroth/hbase-rdf/raw/cbf0cac3f03c8dffbc415eab1421234dfc3ead24/src%2Fmain%2Fjava%2Fnl%2Fvu%2Fdatalayer%2Fhbase%2Fbulkload%2FStringIdAssoc.java", "sha": "42a39479d3e024a7e524d737a8b0d049d0b291f0", "status": "modified" }, { "additions": 176, "blob_url": "https://github.com/pgroth/hbase-rdf/blob/cbf0cac3f03c8dffbc415eab1421234dfc3ead24/src%2Fmain%2Fjava%2Fnl%2Fvu%2Fdatalayer%2Fhbase%2Fbulkload%2FTripleToResource.java", "changes": 291, "contents_url": "https://api.github.com/repos/pgroth/hbase-rdf/contents/src%2Fmain%2Fjava%2Fnl%2Fvu%2Fdatalayer%2Fhbase%2Fbulkload%2FTripleToResource.java?ref=cbf0cac3f03c8dffbc415eab1421234dfc3ead24", "deletions": 115, "filename": "src/main/java/nl/vu/datalayer/hbase/bulkload/TripleToResource.java", "new_code": "import nl.vu.datalayer.hbase.exceptions.NumericalRangeException;\nimport nl.vu.datalayer.hbase.id.HBaseValue;\nimport org.apache.hadoop.fs.FileUtil;\nimport org.apache.hadoop.mapreduce.Job;\nimport org.apache.hadoop.mapreduce.lib.output.FileOutputFormat;\nimport org.openrdf.model.BNode;\nimport org.openrdf.model.Value;\nimport org.openrdf.model.impl.URIImpl;\n\tpublic static final String RESOURCE_IDS_DIR = \"resourceIds\";\n\tpublic static final String ID2STRING_DIR = \"idStringAssoc\";\n\t\t\t\torg.apache.hadoop.mapreduce.Mapper<LongWritable, Writable, HBaseValue, DataPair>\n\t\t\t\tStatement s = getNewStatement(value);\n\t\t\t\tBaseId quadId = new BaseId(partitionId, localRowCount);\n\t\t\t\tDataPair []outputPairs = createDataPairs(quadId);\n\t\t\t\temitOutputPairs(context, s, outputPairs);\n\t\t\t\tcontext.getCounter(EXCEPTION_GROUP, \"RDFParseExceptions\").increment(1);\n\t\t\t\tcontext.getCounter(EXCEPTION_GROUP, \"RDFHandlerExceptions\").increment(1);\n\n\t\tfinal private void emitOutputPairs(Context context, Statement s, DataPair[] dataPairs) throws IOException, InterruptedException {\n\t\t\tcontext.write(new HBaseValue(s.getSubject()), dataPairs[DataPair.S]);\n\t\t\tcontext.write(new HBaseValue(s.getPredicate()), dataPairs[DataPair.P]);\n\t\t\tcontext.write(new HBaseValue(s.getObject()), dataPairs[DataPair.O]);\n\t\t\t\n\t\t\tValue quadContext;\n\t\t\tif (s.getContext() == null){\n\t\t\t\tquadContext = new URIImpl(DEFAULT_CONTEXT);\n\t\t\t}\n\t\t\telse{\n\t\t\t\tquadContext = s.getContext();\n\t\t\t}\n\t\t\tcontext.write(new HBaseValue(quadContext), dataPairs[DataPair.C]);\n\t\t}\n\t\t\n\t\tfinal private DataPair []createDataPairs(BaseId id){\n\t\t\tDataPair []outputPair = new DataPair[4];\n\t\t\tfor (int i = 0; i < outputPair.length; i++) {\n\t\t\t\toutputPair[i] = new DataPair(id, (byte)i);\n\t\t\t}\n\t\t\treturn outputPair;\n\t\t}\n\n\t\tfinal private Statement getNewStatement(Writable value) throws IOException, RDFParseException, RDFHandlerException {\n\t\t\tInputStream in = new ByteArrayInputStream(value.toString().getBytes());\n\t\t\tparser.parse(in, \"\");\n\t\t\tif (statements.size() == 0){\n\t\t\t\treturn null;\n\t\t\t}\t\t\t\t\t\t\t\n\t\t\tStatement ret = statements.get(statements.size()-1);\n\t\t\tif (statements.size() == 5000){\n\t\t\t\tstatements.clear();\n\t\t\t}\n\t\t\t\n\t\t\treturn ret;\n\t\t}\n\tpublic static class TripleToResourceReducer extends org.apache.hadoop.mapreduce.Reducer<HBaseValue, DataPair, TypedId, DataPair>\n\t\t\t//public static final String HISTOGRAM_GROUP = \"HistogramGroup\";\n\t\n\t\t\t\tConfiguration config = context.getConfiguration();\n\t\t\t\tpartitionId = config.getInt(\"mapred.task.partition\", 0);\n\t\t\t\tschemaSuffix = config.get(\"schemaSuffix\");\n\t\t\t\tString outputPath = config.get(\"outputPath\");\n\t\t\t\tfs = FileSystem.get(config);\n\t\n\t\t\t\tvalFact = new ValueFactoryImpl();\n\t\n\t\t\t\tPath sideEffectFile = new Path(FileOutputFormat.getWorkOutputPath(context), \n\t\t\t\t\t\tID2STRING_DIR + String.format(\"/%05d\", partitionId));\n\t\t\t\tid2StringWriter = SequenceFile.createWriter(fs, config, sideEffectFile,\n\t\t\t\t//new Path(outputPath+ID2STRING_DIR+\"/\"+context.getTaskAttemptID()),\n\t\t\t\t//new Path(\"idStringAssoc\"+String.format(\"/%05d\", partitionId)),\n\t\t\t\t\t\tImmutableBytesWritable.class, HBaseValue.class, CompressionType.RECORD);\n\t\t\t\t//id2StringWriter.syncFs();\n\t\t\t/*public void updateHistogram(Context context, Value literal){\n\t\t\t\tbyte []bytes = literal.stringValue().getBytes();\n\t\t\t\tcontext.getCounter(HISTOGRAM_GROUP, \n\t\t\t\t\t\tString.format(\"%02x\", (short)bytes[bytes.length-1] & 0xfe)).increment(1);\n\t\t\t\t\n\t\t\t}*/\n\t\t\tpublic void reduce(HBaseValue key, Iterable<DataPair> values, Context context) throws IOException, InterruptedException {\n\t\t\t\ttry{\n\t\t\t\t\tTypedId newId = generateTypedId(context, key.getUnderlyingValue());\t\t\t\t\n\t\t\t\t\tsaveTypeIdToFile(newId, key, context);\n\t\t\t\t\t\n\t\t\t\t\t//emit (elementID, <tripleID, position>) elements\n\t\t\t\t\tfor (DataPair dataPair : values) {\n\t\t\t\t\t\tcontext.write(newId, dataPair);\n\t\t\t\tcatch(NumericalRangeException e){\n\t\t\t\t\tSystem.err.println(\"Numerical not in expected range: \"+e.getMessage());\n\t\t\t\t\tcontext.getCounter(EXCEPTION_GROUP, \"RangeExceptions\").increment(1);\n\t\t\t\t\treturn;\n\t\t\t\t}\n\t\t\t}\n\n\t\t\tfinal private TypedId generateTypedId(Context context, Value elem) throws IOException, NumericalRangeException {\n\t\t\t\tif (elem instanceof Literal){//Literals\t\t\t\t\n\t\t\t\t\treturn handleLiteral(context, elem);\n\t\t\t\t}\n\t\t\t\t\t//context.getCounter(HISTOGRAM_GROUP, String.format(\"%02x\", (short)elemBytes[elemBytes.length-1] & 0xfe)).increment(1);\n\t\t\t\t\treturn handleNonLiteral(context, elem);\n\t\t\t\t}\n\t\t\t}\n\t\t\t\n\t\t\tfinal private TypedId handleLiteral(Context context, Value elem) throws IOException, NumericalRangeException{\n\t\t\t\tCounter c = context.getCounter(ELEMENT_TYPE_GROUP, \"Literals\"); \n\t\t\t\tc.increment(1);\n\t\t\t\tLiteral l = (Literal)elem;\n\t\t\t\tif (l.getDatatype() == null){//the Literals with no datatype are considered Strings\n\t\t\t\t\treturn new TypedId(partitionId, localRowCount);\n\t\t\t\t\t//updateHistogram(context, elem);\n\t\t\t\t}\n\t\t\t\telse{//we have a datatype\n\t\t\t\t\tTypedId newId = TypedId.createNumerical(l);\n\t\t\t\t\tif (newId == null){//non-numerical literal\n\t\t\t\t\t\tnewId = new TypedId(partitionId, localRowCount);\n\t\t\t\t\t\t//updateHistogram(context, elem);\n\t\t\t\t\treturn newId;\n\t\t\t}\n\t\t\t\n\t\t\tfinal private TypedId handleNonLiteral(Context context, Value elem){\n\t\t\t\tincreaseNonLiteralCounters(elem, context);\n\t\t\t\treturn new TypedId(partitionId, localRowCount);\n\t\t\t}\n\t\t\t\n\t\t\tfinal private void increaseNonLiteralCounters(Value elem, Context context){\n\t\t\t\tif (elem instanceof BNode){\n\t\t\t\t\tcontext.getCounter(ELEMENT_TYPE_GROUP, \"Blanks\").increment(1);\n\t\t\t\t}\n\t\t\t\telse{\n\t\t\t\t\tcontext.getCounter(ELEMENT_TYPE_GROUP, \"URIs\").increment(1);\n\t\t\t\t}\n\t\t\t}\t\n\t\t\t\n\t\t\tfinal private void saveTypeIdToFile(TypedId newId, HBaseValue value, Context context) throws IOException{\n\t\t\t\t\tid2StringWriter.append(new ImmutableBytesWritable(newId.getContent()), value);\n\t\t\t\t\t/*if (localRowCount % 1000 == 0){\n\t\t\t\t\t}*/\n\tpublic static void main(String[] args) {\t\t\n\t\tJob j1;\n\t\ttry {\n\t\t\t//Path p = new Path(new Path(\"/test1\"), new Path(ID2STRING_DIR));\n\t\t\t//System.out.println(p);\n\t\t\n\t\t\tif (args.length != 3){\n\t\t\t\tSystem.out.println(\"Usage: TripleToResource <inputPath> <inputSizeEstimate in MB> <outputPath>\");\n\t\t\t\treturn;\n\t\t\t}\n\t\t\t\n\t\t\tPath input = new Path(args[0]);\n\t\t\tString outputPath = args[2];\n\t\t\t\n\t\t\tPath resourceIds = new Path(outputPath+TripleToResource.RESOURCE_IDS_DIR);\n\t\t\t\n\t\t\tj1 = BulkLoad.createTripleToResourceJob(input, resourceIds, Integer.parseInt(args[1]));\n\t\t\t\n\t\t\tj1.getConfiguration().set(\"outputPath\", outputPath);\n\t\t\tj1.getConfiguration().set(\"schemaSuffix\", \"_TEST\");\n\t\t\tj1.waitForCompletion(true);\n\t\t\t\n\t\t\tConfiguration conf = new Configuration();\n\t\t\tFileSystem fs = FileSystem.get(conf);\n\t\t\tPath source = new Path(resourceIds, \"idStringAssoc\");\n\t\t\tPath id2String = new Path(outputPath+\"/idStringAssoc\");\n\t\t\tFileUtil.copy(fs, source, fs, id2String, true, false, conf);\n\t\t\t\n\t\t} catch (NumberFormatException e) {\n\t\t\te.printStackTrace();\n\t\t} catch (IOException e) {\n\t\t\te.printStackTrace();\n\t\t}\n\t\tcatch (InterruptedException e) {\n\t\t\te.printStackTrace();\n\t\t} catch (ClassNotFoundException e) {\n\t\t\te.printStackTrace();\n\t\t}\n\n\t}", "new_methods": [ { "arguments": [ "Context context", " Value literal" ], "filename": "src/main/java/nl/vu/datalayer/hbase/bulkload/TripleToResource.java", "implementation": "byte []bytes = literal.stringValue().getBytes();\n\t\t\t\tcontext.getCounter(HISTOGRAM_GROUP, \n\t\t\t\t\t\tString.format(\"%02x\", (short)bytes[bytes.length-1] & 0xfe)).increment(1);", "signature": "void updateHistogram(Context context, Value literal)" }, { "arguments": [ "DataPair dataPair : values" ], "filename": "src/main/java/nl/vu/datalayer/hbase/bulkload/TripleToResource.java", "implementation": "context.write(newId, dataPair);\n\t\t\t\tcatch(NumericalRangeException e){\n\t\t\t\t\tSystem.err.println(\"Numerical not in expected range: \"+e.getMessage());\n\t\t\t\t\tcontext.getCounter(EXCEPTION_GROUP, \"RangeExceptions\").increment(1);\n\t\t\t\t\treturn;", "signature": "elements\n\t\t\t\t\tfor (DataPair dataPair : values)" }, { "arguments": [ "Context context", " Value elem" ], "filename": "src/main/java/nl/vu/datalayer/hbase/bulkload/TripleToResource.java", "implementation": "increaseNonLiteralCounters(elem, context);\n\t\t\t\treturn new TypedId(partitionId, localRowCount);", "signature": "TypedId handleNonLiteral(Context context, Value elem)" }, { "arguments": [ "Value elem", " Context context" ], "filename": "src/main/java/nl/vu/datalayer/hbase/bulkload/TripleToResource.java", "implementation": "if (elem instanceof BNode){\n\t\t\t\t\tcontext.getCounter(ELEMENT_TYPE_GROUP, \"Blanks\").increment(1);", "signature": "void increaseNonLiteralCounters(Value elem, Context context)" }, { "arguments": [ "String[] args" ], "filename": "src/main/java/nl/vu/datalayer/hbase/bulkload/TripleToResource.java", "implementation": "Job j1;\n\t\ttry {\n\t\t\t//Path p = new Path(new Path(\"/test1\"), new Path(ID2STRING_DIR));\n\t\t\t//System.out.println(p);\n\t\t\n\t\t\tif (args.length != 3){\n\t\t\t\tSystem.out.println(\"Usage: TripleToResource <inputPath> <inputSizeEstimate in MB> <outputPath>\");\n\t\t\t\treturn;", "signature": "void main(String[] args)" } ], "old_code": "import nl.vu.datalayer.hbase.id.NumericalRangeException;\nimport org.apache.hadoop.io.Text;\nimport org.openrdf.rio.ntriples.NTriplesUtil;\n\tpublic static final String RESOURCE_IDS_DIR = \"/resourceIds\";\n\tpublic static final String ID2STRING_DIR = \"/idStringAssoc\";\n\t\t\t\torg.apache.hadoop.mapreduce.Mapper<LongWritable, Writable, Text, DataPair>\n\t\t\t\tInputStream in = new ByteArrayInputStream(value.toString().getBytes());\n\t\t\t\tparser.parse(in, \"\");\n\t\t\t\tif (statements.size() == 0){\n\t\t\t\t\treturn;\n\t\t\t\t}\t\t\t\t\n\t\t\t\t\n\t\t\t\tStatement s = statements.get(statements.size()-1);\n\t\t\t\t\n\t\t\t\t//generate triple ID\n\t\t\t\tBaseId id = new BaseId(partitionId, localRowCount);\n\t\t\t\t//create output pairs\n\t\t\t\tDataPair subject = new DataPair(id, DataPair.S);\n\t\t\t\tDataPair predicate = new DataPair(id, DataPair.P);\n\t\t\t\tDataPair object = new DataPair(id, DataPair.O);\n\t\t\t\tDataPair tContext = new DataPair(id, DataPair.C);\n\t\t\t\t//emit output\n\t\t\t\tcontext.write(new Text(s.getSubject().toString()), subject);\n\t\t\t\tcontext.write(new Text(s.getPredicate().toString()), predicate);\n\t\t\t\tcontext.write(new Text(s.getObject().toString()), object);\n\t\t\t\t\n\t\t\t\tString quadContext;\n\t\t\t\tif (s.getContext() == null)\n\t\t\t\t\tquadContext = DEFAULT_CONTEXT;\n\t\t\t\telse\n\t\t\t\t\tquadContext = s.getContext().toString();\n\t\t\t\tcontext.write(new Text(quadContext), tContext);\n\t\t\t\t\n\t\t\t\tif (statements.size() == 5000){\n\t\t\t\t\tstatements.clear();\n\t\t\t\t}\n\t\t\t\tcontext.getCounter(EXCEPTION_GROUP, \"RDDParseExceptions\").increment(1);\n\t\t\t\tcontext.getCounter(EXCEPTION_GROUP, \"RDDHandlerExceptions\").increment(1);\n\tpublic static class TripleToResourceReducer extends org.apache.hadoop.mapreduce.Reducer<Text, DataPair, TypedId, DataPair>\n\t\t\tpublic static final String HISTOGRAM_GROUP = \"HistogramGroup\";\n\t\t\t\ttry {\n\t\t\t\t\tConfiguration config = context.getConfiguration();\n\t\t\t\t\tpartitionId = config.getInt(\"mapred.task.partition\", 0);\n\t\t\t\t\tschemaSuffix = config.get(\"schemaSuffix\");\n\t\t\t\t\tString outputPath = config.get(\"outputPath\");\n\t\t\t\t\tfs = FileSystem.get(config);\n\t\t\t\t\t\n\t\t\t\t\tvalFact = new ValueFactoryImpl();\n\t\t\t\t\t\n\t\t\t\t\tid2StringWriter = SequenceFile.createWriter(fs, config, \n\t\t\t\t\t\t\tnew Path(outputPath+ID2STRING_DIR+String.format(\"/%05d\", partitionId)),\n\t\t\t\t\t\t\t//new Path(\"idStringAssoc\"+String.format(\"/%05d\", partitionId)),\n\t\t\t\t\t\t\tImmutableBytesWritable.class, Text.class,\n\t\t\t\t\t\t\tCompressionType.RECORD);\n\t\t\t\t} catch (IOException e) {\n\t\t\t\t\te.printStackTrace();\n\t\t\t\t}\n\t\t\t\tid2StringWriter.syncFs();\n\t\t\tpublic void updateHistogram(Context context, String literal){\n\t\t\t\tif (literal.endsWith(\"\\\"\")){\n\t\t\t\t\tcontext.getCounter(HISTOGRAM_GROUP, String.format(\"%02x\", (short)literal.getBytes()[literal.getBytes().length-2] & 0xfe)).increment(1);\n\t\t\t\t}\n\t\t\t\telse{\n\t\t\t\t\tcontext.getCounter(HISTOGRAM_GROUP, String.format(\"%02x\", (short)literal.getBytes()[literal.getBytes().length-1] & 0xfe)).increment(1);\n\t\t\t\t}\n\t\t\t}\n\t\t\tpublic void reduce(Text key, Iterable<DataPair> values, Context context) throws IOException, InterruptedException {\n\t\t\t\t\n\t\t\t\tTypedId newId;\n\t\t\t\tString elem = key.toString();\t\t\t\n\t\t\t\tif (elem.startsWith(\"\\\"\")){//Literals\n\t\t\t\t\tCounter c = context.getCounter(ELEMENT_TYPE_GROUP, \"Literals\"); \n\t\t\t\t\tc.increment(1);\n\t\t\t\t\ttry{\n\t\t\t\t\t\tLiteral l = NTriplesUtil.parseLiteral(elem, valFact);\n\t\t\t\t\t\tif (l.getDatatype() == null){//the Literals with no datatype are considered Strings\n\t\t\t\t\t\t\tnewId = new TypedId(partitionId, localRowCount);\n\t\t\t\t\t\t\tupdateHistogram(context, elem);\n\t\t\t\t\t\t}\n\t\t\t\t\t\telse{//we have a datatype\n\t\t\t\t\t\t\tnewId = TypedId.createNumerical(l);\n\t\t\t\t\t\t\tif (newId == null){//non-numerical literal\n\t\t\t\t\t\t\t\tnewId = new TypedId(partitionId, localRowCount);\n\t\t\t\t\t\t\t\tupdateHistogram(context, elem);\n\t\t\t\t\t\t\t}\n\t\t\t\t\t\t}\n\t\t\t\t\t}\n\t\t\t\t\tcatch(NumericalRangeException e){\n\t\t\t\t\t\tSystem.err.println(\"Numerical not in expected range: \"+e.getMessage());\n\t\t\t\t\t\tcontext.getCounter(EXCEPTION_GROUP, \"RangeExceptions\").increment(1);\n\t\t\t\t\t\treturn;\n\t\t\t\t\t}\n\t\t\t\t\tcatch(IllegalArgumentException e){\n\t\t\t\t\t\tSystem.err.println(\"Literal not in proper format: \"+e.getMessage());\n\t\t\t\t\t\tcontext.getCounter(EXCEPTION_GROUP, \"LiteralExceptions\").increment(1); \n\t\t\t\t\t\treturn;\n\t\t\t\t\tcontext.getCounter(HISTOGRAM_GROUP, String.format(\"%02x\", (short)elem.getBytes()[elem.getBytes().length-1] & 0xfe)).increment(1);\n\t\t\t\t\tif (elem.startsWith(\"_:\")){\n\t\t\t\t\t\tcontext.getCounter(ELEMENT_TYPE_GROUP, \"Blanks\").increment(1);\n\t\t\t\t\t}\n\t\t\t\t\telse{\n\t\t\t\t\t\tcontext.getCounter(ELEMENT_TYPE_GROUP, \"URIs\").increment(1);\n\t\t\t\t\t\n\t\t\t\t\tnewId = new TypedId(partitionId, localRowCount);\n\t\t\t\t\n\t\t\t\t//write the association between IDs and Strings in a SequenceFile\n\t\t\t\t\tid2StringWriter.append(new ImmutableBytesWritable(newId.getContent()), key);\n\t\t\t\t\tif (localRowCount % 1000 == 0){\n\t\t\t\t\t}\n\t\t\t\t\n\t\t\t\t//emit (elementID, <tripleID, position>) elements\n\t\t\t\tfor (DataPair dataPair : values) {\n\t\t\t\t\tcontext.write(newId, dataPair);\n\t\t\t\t}\t\t\t\t\t\t\t\t\t\t\n\t\t\t\t\t", "old_methods": [ { "arguments": [ "Context context", " String literal" ], "filename": "src/main/java/nl/vu/datalayer/hbase/bulkload/TripleToResource.java", "implementation": "if (literal.endsWith(\"\\\"\")){\n\t\t\t\t\tcontext.getCounter(HISTOGRAM_GROUP, String.format(\"%02x\", (short)literal.getBytes()[literal.getBytes().length-2] & 0xfe)).increment(1);", "signature": "void updateHistogram(Context context, String literal)" }, { "arguments": [ "DataPair dataPair : values" ], "filename": "src/main/java/nl/vu/datalayer/hbase/bulkload/TripleToResource.java", "implementation": "context.write(newId, dataPair);", "signature": "elements\n\t\t\t\tfor (DataPair dataPair : values)" } ], "patch": "@@ -6,43 +6,48 @@\n import java.util.ArrayList;\n \n import net.fortytwo.sesametools.nquads.NQuadsParser;\n+import nl.vu.datalayer.hbase.exceptions.NumericalRangeException;\n import nl.vu.datalayer.hbase.id.BaseId;\n import nl.vu.datalayer.hbase.id.DataPair;\n-import nl.vu.datalayer.hbase.id.NumericalRangeException;\n+import nl.vu.datalayer.hbase.id.HBaseValue;\n import nl.vu.datalayer.hbase.id.TypedId;\n import nl.vu.datalayer.hbase.schema.HBPrefixMatchSchema;\n \n import org.apache.hadoop.conf.Configuration;\n import org.apache.hadoop.fs.FileSystem;\n+import org.apache.hadoop.fs.FileUtil;\n import org.apache.hadoop.fs.Path;\n import org.apache.hadoop.hbase.io.ImmutableBytesWritable;\n import org.apache.hadoop.io.LongWritable;\n import org.apache.hadoop.io.SequenceFile;\n import org.apache.hadoop.io.SequenceFile.CompressionType;\n-import org.apache.hadoop.io.Text;\n import org.apache.hadoop.io.Writable;\n import org.apache.hadoop.mapreduce.Counter;\n+import org.apache.hadoop.mapreduce.Job;\n import org.apache.hadoop.mapreduce.lib.input.FileSplit;\n+import org.apache.hadoop.mapreduce.lib.output.FileOutputFormat;\n+import org.openrdf.model.BNode;\n import org.openrdf.model.Literal;\n import org.openrdf.model.Statement;\n+import org.openrdf.model.Value;\n import org.openrdf.model.ValueFactory;\n+import org.openrdf.model.impl.URIImpl;\n import org.openrdf.model.impl.ValueFactoryImpl;\n import org.openrdf.rio.RDFHandlerException;\n import org.openrdf.rio.RDFParseException;\n import org.openrdf.rio.RDFParser;\n import org.openrdf.rio.helpers.StatementCollector;\n-import org.openrdf.rio.ntriples.NTriplesUtil;\n \n public class TripleToResource {\n \t\n-\tpublic static final String RESOURCE_IDS_DIR = \"/resourceIds\";\n-\tpublic static final String ID2STRING_DIR = \"/idStringAssoc\";\n+\tpublic static final String RESOURCE_IDS_DIR = \"resourceIds\";\n+\tpublic static final String ID2STRING_DIR = \"idStringAssoc\";\n \tpublic static final String DEFAULT_CONTEXT = \"http://DEFAULT_CONTEXT\";\n \t\n \tpublic static final String EXCEPTION_GROUP = \"ExceptionGroup\";\n \t\n \tpublic static class TripleToResourceMapper extends \n-\t\t\t\torg.apache.hadoop.mapreduce.Mapper<LongWritable, Writable, Text, DataPair>\n+\t\t\t\torg.apache.hadoop.mapreduce.Mapper<LongWritable, Writable, HBaseValue, DataPair>\n \t{\n \t\tprivate static RDFParser parser = null;\n \t\tprivate static StatementCollector collector = null;\n@@ -68,49 +73,60 @@ protected void setup(Context context) throws IOException, InterruptedException {\n \t\t@Override\n \t\tpublic void map(LongWritable key, Writable value, Context context) throws IOException, InterruptedException{\n \t\t\ttry {\n-\t\t\t\tInputStream in = new ByteArrayInputStream(value.toString().getBytes());\n-\t\t\t\tparser.parse(in, \"\");\n+\t\t\t\tStatement s = getNewStatement(value);\n \t\t\t\t\n-\t\t\t\tif (statements.size() == 0){\n-\t\t\t\t\treturn;\n-\t\t\t\t}\t\t\t\t\n-\t\t\t\t\n-\t\t\t\tStatement s = statements.get(statements.size()-1);\n-\t\t\t\t\n-\t\t\t\t//generate triple ID\n-\t\t\t\tBaseId id = new BaseId(partitionId, localRowCount);\n+\t\t\t\tBaseId quadId = new BaseId(partitionId, localRowCount);\n \t\t\t\tlocalRowCount++;\n \t\t\t\t\n-\t\t\t\t//create output pairs\n-\t\t\t\tDataPair subject = new DataPair(id, DataPair.S);\n-\t\t\t\tDataPair predicate = new DataPair(id, DataPair.P);\n-\t\t\t\tDataPair object = new DataPair(id, DataPair.O);\n-\t\t\t\tDataPair tContext = new DataPair(id, DataPair.C);\n+\t\t\t\tDataPair []outputPairs = createDataPairs(quadId);\n \t\t\t\t\n-\t\t\t\t//emit output\n-\t\t\t\tcontext.write(new Text(s.getSubject().toString()), subject);\n-\t\t\t\tcontext.write(new Text(s.getPredicate().toString()), predicate);\n-\t\t\t\tcontext.write(new Text(s.getObject().toString()), object);\n-\t\t\t\t\n-\t\t\t\tString quadContext;\n-\t\t\t\tif (s.getContext() == null)\n-\t\t\t\t\tquadContext = DEFAULT_CONTEXT;\n-\t\t\t\telse\n-\t\t\t\t\tquadContext = s.getContext().toString();\n-\t\t\t\tcontext.write(new Text(quadContext), tContext);\n-\t\t\t\t\n-\t\t\t\tif (statements.size() == 5000){\n-\t\t\t\t\tstatements.clear();\n-\t\t\t\t}\n+\t\t\t\temitOutputPairs(context, s, outputPairs);\n \t\t\t\t\n \t\t\t} catch (RDFParseException e) {\n \t\t\t\tSystem.err.println(\"Unexpected input at line: \"+key.get()+\" : \"+e.getMessage());\n-\t\t\t\tcontext.getCounter(EXCEPTION_GROUP, \"RDDParseExceptions\").increment(1);\n+\t\t\t\tcontext.getCounter(EXCEPTION_GROUP, \"RDFParseExceptions\").increment(1);\n \t\t\t} catch (RDFHandlerException e) {\n \t\t\t\tSystem.err.println(\"Line: \"+key.get()+\"; \"+e.getMessage());\n-\t\t\t\tcontext.getCounter(EXCEPTION_GROUP, \"RDDHandlerExceptions\").increment(1);\n+\t\t\t\tcontext.getCounter(EXCEPTION_GROUP, \"RDFHandlerExceptions\").increment(1);\n \t\t\t} \n \t\t}\n+\n+\t\tfinal private void emitOutputPairs(Context context, Statement s, DataPair[] dataPairs) throws IOException, InterruptedException {\n+\t\t\tcontext.write(new HBaseValue(s.getSubject()), dataPairs[DataPair.S]);\n+\t\t\tcontext.write(new HBaseValue(s.getPredicate()), dataPairs[DataPair.P]);\n+\t\t\tcontext.write(new HBaseValue(s.getObject()), dataPairs[DataPair.O]);\n+\t\t\t\n+\t\t\tValue quadContext;\n+\t\t\tif (s.getContext() == null){\n+\t\t\t\tquadContext = new URIImpl(DEFAULT_CONTEXT);\n+\t\t\t}\n+\t\t\telse{\n+\t\t\t\tquadContext = s.getContext();\n+\t\t\t}\n+\t\t\tcontext.write(new HBaseValue(quadContext), dataPairs[DataPair.C]);\n+\t\t}\n+\t\t\n+\t\tfinal private DataPair []createDataPairs(BaseId id){\n+\t\t\tDataPair []outputPair = new DataPair[4];\n+\t\t\tfor (int i = 0; i < outputPair.length; i++) {\n+\t\t\t\toutputPair[i] = new DataPair(id, (byte)i);\n+\t\t\t}\n+\t\t\treturn outputPair;\n+\t\t}\n+\n+\t\tfinal private Statement getNewStatement(Writable value) throws IOException, RDFParseException, RDFHandlerException {\n+\t\t\tInputStream in = new ByteArrayInputStream(value.toString().getBytes());\n+\t\t\tparser.parse(in, \"\");\n+\t\t\tif (statements.size() == 0){\n+\t\t\t\treturn null;\n+\t\t\t}\t\t\t\t\t\t\t\n+\t\t\tStatement ret = statements.get(statements.size()-1);\n+\t\t\tif (statements.size() == 5000){\n+\t\t\t\tstatements.clear();\n+\t\t\t}\n+\t\t\t\n+\t\t\treturn ret;\n+\t\t}\n \t\n \t\t@Override\n \t\tprotected void cleanup(Context context) throws IOException, InterruptedException {\n@@ -119,7 +135,7 @@ protected void cleanup(Context context) throws IOException, InterruptedException\n \t}\n \t\n \t\n-\tpublic static class TripleToResourceReducer extends org.apache.hadoop.mapreduce.Reducer<Text, DataPair, TypedId, DataPair>\n+\tpublic static class TripleToResourceReducer extends org.apache.hadoop.mapreduce.Reducer<HBaseValue, DataPair, TypedId, DataPair>\n \t{\n \t\t\tprivate int partitionId;\n \t\t\tprivate long localRowCount = 0;\n@@ -139,36 +155,34 @@ public static class TripleToResourceReducer extends org.apache.hadoop.mapreduce.\n \t\t\t * so 2 byte values are counted with the same counter, and we assume that they are equally distributed\n \t\t\t * TODO change in future releases when counter limit can be configured\n \t\t\t */\n-\t\t\tpublic static final String HISTOGRAM_GROUP = \"HistogramGroup\";\n+\t\t\t//public static final String HISTOGRAM_GROUP = \"HistogramGroup\";\n \t\t\tpublic static final String NUMERICAL_GROUP = \"NumericalGroup\";\t\t\n \t\t\t\n \t\t\tprivate String schemaSuffix;\n \t\t\t\n \t\t\t@Override\n \t\t\tprotected void setup(Context context) throws IOException, InterruptedException {\n \t\t\t\tFileSystem fs;\n-\t\t\t\ttry {\n-\t\t\t\t\tConfiguration config = context.getConfiguration();\n-\t\t\t\t\tpartitionId = config.getInt(\"mapred.task.partition\", 0);\n-\t\t\t\t\tschemaSuffix = config.get(\"schemaSuffix\");\n-\t\t\t\t\tString outputPath = config.get(\"outputPath\");\n-\t\t\t\t\tfs = FileSystem.get(config);\n-\t\t\t\t\t\n-\t\t\t\t\tvalFact = new ValueFactoryImpl();\n-\t\t\t\t\t\n-\t\t\t\t\tid2StringWriter = SequenceFile.createWriter(fs, config, \n-\t\t\t\t\t\t\tnew Path(outputPath+ID2STRING_DIR+String.format(\"/%05d\", partitionId)),\n-\t\t\t\t\t\t\t//new Path(\"idStringAssoc\"+String.format(\"/%05d\", partitionId)),\n-\t\t\t\t\t\t\tImmutableBytesWritable.class, Text.class,\n-\t\t\t\t\t\t\tCompressionType.RECORD);\n-\t\t\t\t} catch (IOException e) {\n-\t\t\t\t\te.printStackTrace();\n-\t\t\t\t}\n+\t\n+\t\t\t\tConfiguration config = context.getConfiguration();\n+\t\t\t\tpartitionId = config.getInt(\"mapred.task.partition\", 0);\n+\t\t\t\tschemaSuffix = config.get(\"schemaSuffix\");\n+\t\t\t\tString outputPath = config.get(\"outputPath\");\n+\t\t\t\tfs = FileSystem.get(config);\n+\t\n+\t\t\t\tvalFact = new ValueFactoryImpl();\n+\t\n+\t\t\t\tPath sideEffectFile = new Path(FileOutputFormat.getWorkOutputPath(context), \n+\t\t\t\t\t\tID2STRING_DIR + String.format(\"/%05d\", partitionId));\n+\t\t\t\tid2StringWriter = SequenceFile.createWriter(fs, config, sideEffectFile,\n+\t\t\t\t//new Path(outputPath+ID2STRING_DIR+\"/\"+context.getTaskAttemptID()),\n+\t\t\t\t//new Path(\"idStringAssoc\"+String.format(\"/%05d\", partitionId)),\n+\t\t\t\t\t\tImmutableBytesWritable.class, HBaseValue.class, CompressionType.RECORD);\n \t\t\t}\n \t\t\t\n \t\t\t@Override\n \t\t\tprotected void cleanup(Context context) throws IOException, InterruptedException {\n-\t\t\t\tid2StringWriter.syncFs();\n+\t\t\t\t//id2StringWriter.syncFs();\n \t\t\t\tid2StringWriter.close();\n \t\t\t\t\n \t\t\t\tSystem.out.println(\"Closed file writer\");\n@@ -181,80 +195,127 @@ public static void setValueVatory(ValueFactory valFactory){\n \t\t\t\tvalFact = valFactory;\n \t\t\t}\n \t\t\t\n-\t\t\tpublic void updateHistogram(Context context, String literal){\n-\t\t\t\tif (literal.endsWith(\"\\\"\")){\n-\t\t\t\t\tcontext.getCounter(HISTOGRAM_GROUP, String.format(\"%02x\", (short)literal.getBytes()[literal.getBytes().length-2] & 0xfe)).increment(1);\n-\t\t\t\t}\n-\t\t\t\telse{\n-\t\t\t\t\tcontext.getCounter(HISTOGRAM_GROUP, String.format(\"%02x\", (short)literal.getBytes()[literal.getBytes().length-1] & 0xfe)).increment(1);\n-\t\t\t\t}\n-\t\t\t}\n+\t\t\t/*public void updateHistogram(Context context, Value literal){\n+\t\t\t\tbyte []bytes = literal.stringValue().getBytes();\n+\t\t\t\tcontext.getCounter(HISTOGRAM_GROUP, \n+\t\t\t\t\t\tString.format(\"%02x\", (short)bytes[bytes.length-1] & 0xfe)).increment(1);\n+\t\t\t\t\n+\t\t\t}*/\n \n \t\t\t@Override\n-\t\t\tpublic void reduce(Text key, Iterable<DataPair> values, Context context) throws IOException, InterruptedException {\n+\t\t\tpublic void reduce(HBaseValue key, Iterable<DataPair> values, Context context) throws IOException, InterruptedException {\n \t\t\t\t//generate a new id for the triple element represented by the key\n-\t\t\t\t\n-\t\t\t\tTypedId newId;\n-\t\t\t\tString elem = key.toString();\t\t\t\n-\t\t\t\tif (elem.startsWith(\"\\\"\")){//Literals\n-\t\t\t\t\tCounter c = context.getCounter(ELEMENT_TYPE_GROUP, \"Literals\"); \n-\t\t\t\t\tc.increment(1);\n-\t\t\t\t\ttry{\n-\t\t\t\t\t\tLiteral l = NTriplesUtil.parseLiteral(elem, valFact);\n-\t\t\t\t\t\tif (l.getDatatype() == null){//the Literals with no datatype are considered Strings\n-\t\t\t\t\t\t\tnewId = new TypedId(partitionId, localRowCount);\n-\t\t\t\t\t\t\tupdateHistogram(context, elem);\n-\t\t\t\t\t\t}\n-\t\t\t\t\t\telse{//we have a datatype\n-\t\t\t\t\t\t\tnewId = TypedId.createNumerical(l);\n-\t\t\t\t\t\t\tif (newId == null){//non-numerical literal\n-\t\t\t\t\t\t\t\tnewId = new TypedId(partitionId, localRowCount);\n-\t\t\t\t\t\t\t\tupdateHistogram(context, elem);\n-\t\t\t\t\t\t\t}\n-\t\t\t\t\t\t}\n-\t\t\t\t\t}\n-\t\t\t\t\tcatch(NumericalRangeException e){\n-\t\t\t\t\t\tSystem.err.println(\"Numerical not in expected range: \"+e.getMessage());\n-\t\t\t\t\t\tcontext.getCounter(EXCEPTION_GROUP, \"RangeExceptions\").increment(1);\n-\t\t\t\t\t\treturn;\n-\t\t\t\t\t}\n-\t\t\t\t\tcatch(IllegalArgumentException e){\n-\t\t\t\t\t\tSystem.err.println(\"Literal not in proper format: \"+e.getMessage());\n-\t\t\t\t\t\tcontext.getCounter(EXCEPTION_GROUP, \"LiteralExceptions\").increment(1); \n-\t\t\t\t\t\treturn;\n+\t\t\t\ttry{\n+\t\t\t\t\tTypedId newId = generateTypedId(context, key.getUnderlyingValue());\t\t\t\t\n+\t\t\t\t\tsaveTypeIdToFile(newId, key, context);\n+\t\t\t\t\t\n+\t\t\t\t\t//emit (elementID, <tripleID, position>) elements\n+\t\t\t\t\tfor (DataPair dataPair : values) {\n+\t\t\t\t\t\tcontext.write(newId, dataPair);\n \t\t\t\t\t}\t\n \t\t\t\t}\n+\t\t\t\tcatch(NumericalRangeException e){\n+\t\t\t\t\tSystem.err.println(\"Numerical not in expected range: \"+e.getMessage());\n+\t\t\t\t\tcontext.getCounter(EXCEPTION_GROUP, \"RangeExceptions\").increment(1);\n+\t\t\t\t\treturn;\n+\t\t\t\t}\n+\t\t\t}\n+\n+\t\t\tfinal private TypedId generateTypedId(Context context, Value elem) throws IOException, NumericalRangeException {\n+\t\t\t\tif (elem instanceof Literal){//Literals\t\t\t\t\n+\t\t\t\t\treturn handleLiteral(context, elem);\n+\t\t\t\t}\n \t\t\t\telse{//non-Literals\n-\t\t\t\t\tcontext.getCounter(HISTOGRAM_GROUP, String.format(\"%02x\", (short)elem.getBytes()[elem.getBytes().length-1] & 0xfe)).increment(1);\n-\t\t\t\t\tif (elem.startsWith(\"_:\")){\n-\t\t\t\t\t\tcontext.getCounter(ELEMENT_TYPE_GROUP, \"Blanks\").increment(1);\n-\t\t\t\t\t}\n-\t\t\t\t\telse{\n-\t\t\t\t\t\tcontext.getCounter(ELEMENT_TYPE_GROUP, \"URIs\").increment(1);\n+\t\t\t\t\t//context.getCounter(HISTOGRAM_GROUP, String.format(\"%02x\", (short)elemBytes[elemBytes.length-1] & 0xfe)).increment(1);\n+\t\t\t\t\treturn handleNonLiteral(context, elem);\n+\t\t\t\t}\n+\t\t\t}\n+\t\t\t\n+\t\t\tfinal private TypedId handleLiteral(Context context, Value elem) throws IOException, NumericalRangeException{\n+\t\t\t\tCounter c = context.getCounter(ELEMENT_TYPE_GROUP, \"Literals\"); \n+\t\t\t\tc.increment(1);\n+\t\t\t\tLiteral l = (Literal)elem;\n+\t\t\t\tif (l.getDatatype() == null){//the Literals with no datatype are considered Strings\n+\t\t\t\t\treturn new TypedId(partitionId, localRowCount);\n+\t\t\t\t\t//updateHistogram(context, elem);\n+\t\t\t\t}\n+\t\t\t\telse{//we have a datatype\n+\t\t\t\t\tTypedId newId = TypedId.createNumerical(l);\n+\t\t\t\t\tif (newId == null){//non-numerical literal\n+\t\t\t\t\t\tnewId = new TypedId(partitionId, localRowCount);\n+\t\t\t\t\t\t//updateHistogram(context, elem);\n \t\t\t\t\t}\n-\t\t\t\t\t\n-\t\t\t\t\tnewId = new TypedId(partitionId, localRowCount);\n+\t\t\t\t\treturn newId;\n \t\t\t\t}\n-\t\t\t\t\n-\t\t\t\t//write the association between IDs and Strings in a SequenceFile\n+\t\t\t}\n+\t\t\t\n+\t\t\tfinal private TypedId handleNonLiteral(Context context, Value elem){\n+\t\t\t\tincreaseNonLiteralCounters(elem, context);\n+\t\t\t\treturn new TypedId(partitionId, localRowCount);\n+\t\t\t}\n+\t\t\t\n+\t\t\tfinal private void increaseNonLiteralCounters(Value elem, Context context){\n+\t\t\t\tif (elem instanceof BNode){\n+\t\t\t\t\tcontext.getCounter(ELEMENT_TYPE_GROUP, \"Blanks\").increment(1);\n+\t\t\t\t}\n+\t\t\t\telse{\n+\t\t\t\t\tcontext.getCounter(ELEMENT_TYPE_GROUP, \"URIs\").increment(1);\n+\t\t\t\t}\n+\t\t\t}\t\n+\t\t\t\n+\t\t\tfinal private void saveTypeIdToFile(TypedId newId, HBaseValue value, Context context) throws IOException{\n \t\t\t\tif (newId.getType() != TypedId.NUMERICAL){\n-\t\t\t\t\tid2StringWriter.append(new ImmutableBytesWritable(newId.getContent()), key);\n-\t\t\t\t\tif (localRowCount % 1000 == 0){\n+\t\t\t\t\tid2StringWriter.append(new ImmutableBytesWritable(newId.getContent()), value);\n+\t\t\t\t\t/*if (localRowCount % 1000 == 0){\n \t\t\t\t\t\tid2StringWriter.syncFs();\n-\t\t\t\t\t}\n+\t\t\t\t\t}*/\n \t\t\t\t\tlocalRowCount++;\n \t\t\t\t\tcontext.getCounter(NUMERICAL_GROUP, \"NonNumericals\").increment(1);\n \t\t\t\t}\n \t\t\t\telse{\n \t\t\t\t\tcontext.getCounter(NUMERICAL_GROUP, \"Numericals\").increment(1);\n \t\t\t\t}\n-\t\t\t\t\n-\t\t\t\t//emit (elementID, <tripleID, position>) elements\n-\t\t\t\tfor (DataPair dataPair : values) {\n-\t\t\t\t\tcontext.write(newId, dataPair);\n-\t\t\t\t}\t\t\t\t\t\t\t\t\t\t\n-\t\t\t\t\t\n \t\t\t}\n \t}\n \n+\tpublic static void main(String[] args) {\t\t\n+\t\tJob j1;\n+\t\ttry {\n+\t\t\t//Path p = new Path(new Path(\"/test1\"), new Path(ID2STRING_DIR));\n+\t\t\t//System.out.println(p);\n+\t\t\n+\t\t\tif (args.length != 3){\n+\t\t\t\tSystem.out.println(\"Usage: TripleToResource <inputPath> <inputSizeEstimate in MB> <outputPath>\");\n+\t\t\t\treturn;\n+\t\t\t}\n+\t\t\t\n+\t\t\tPath input = new Path(args[0]);\n+\t\t\tString outputPath = args[2];\n+\t\t\t\n+\t\t\tPath resourceIds = new Path(outputPath+TripleToResource.RESOURCE_IDS_DIR);\n+\t\t\t\n+\t\t\tj1 = BulkLoad.createTripleToResourceJob(input, resourceIds, Integer.parseInt(args[1]));\n+\t\t\t\n+\t\t\tj1.getConfiguration().set(\"outputPath\", outputPath);\n+\t\t\tj1.getConfiguration().set(\"schemaSuffix\", \"_TEST\");\n+\t\t\tj1.waitForCompletion(true);\n+\t\t\t\n+\t\t\tConfiguration conf = new Configuration();\n+\t\t\tFileSystem fs = FileSystem.get(conf);\n+\t\t\tPath source = new Path(resourceIds, \"idStringAssoc\");\n+\t\t\tPath id2String = new Path(outputPath+\"/idStringAssoc\");\n+\t\t\tFileUtil.copy(fs, source, fs, id2String, true, false, conf);\n+\t\t\t\n+\t\t} catch (NumberFormatException e) {\n+\t\t\te.printStackTrace();\n+\t\t} catch (IOException e) {\n+\t\t\te.printStackTrace();\n+\t\t}\n+\t\tcatch (InterruptedException e) {\n+\t\t\te.printStackTrace();\n+\t\t} catch (ClassNotFoundException e) {\n+\t\t\te.printStackTrace();\n+\t\t}\n+\n+\t}\n }", "raw_url": "https://github.com/pgroth/hbase-rdf/raw/cbf0cac3f03c8dffbc415eab1421234dfc3ead24/src%2Fmain%2Fjava%2Fnl%2Fvu%2Fdatalayer%2Fhbase%2Fbulkload%2FTripleToResource.java", "sha": "58f0ae191e6421a275fb03dbf365fcaa0625e32f", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/pgroth/hbase-rdf/blob/cbf0cac3f03c8dffbc415eab1421234dfc3ead24/src%2Fmain%2Fjava%2Fnl%2Fvu%2Fdatalayer%2Fhbase%2Fid%2FBaseId.java", "changes": 2, "contents_url": "https://api.github.com/repos/pgroth/hbase-rdf/contents/src%2Fmain%2Fjava%2Fnl%2Fvu%2Fdatalayer%2Fhbase%2Fid%2FBaseId.java?ref=cbf0cac3f03c8dffbc415eab1421234dfc3ead24", "deletions": 1, "filename": "src/main/java/nl/vu/datalayer/hbase/id/BaseId.java", "new_code": "\tpublic int hashCode() {//used for partitioning", "new_methods": [], "old_code": "\tpublic int hashCode() {", "old_methods": [], "patch": "@@ -35,7 +35,7 @@ public BaseId(){\n \t}\n \n \t@Override\n-\tpublic int hashCode() {\n+\tpublic int hashCode() {//used for partitioning\n \t\treturn Bytes.toInt(id, id.length-4, 4);\n \t}\n ", "raw_url": "https://github.com/pgroth/hbase-rdf/raw/cbf0cac3f03c8dffbc415eab1421234dfc3ead24/src%2Fmain%2Fjava%2Fnl%2Fvu%2Fdatalayer%2Fhbase%2Fid%2FBaseId.java", "sha": "d9dab74267a36bbfc3f8a7da520954ce921c8847", "status": "modified" }, { "additions": 2, "blob_url": "https://github.com/pgroth/hbase-rdf/blob/cbf0cac3f03c8dffbc415eab1421234dfc3ead24/src%2Fmain%2Fjava%2Fnl%2Fvu%2Fdatalayer%2Fhbase%2Fid%2FTypedId.java", "changes": 2, "contents_url": "https://api.github.com/repos/pgroth/hbase-rdf/contents/src%2Fmain%2Fjava%2Fnl%2Fvu%2Fdatalayer%2Fhbase%2Fid%2FTypedId.java?ref=cbf0cac3f03c8dffbc415eab1421234dfc3ead24", "deletions": 0, "filename": "src/main/java/nl/vu/datalayer/hbase/id/TypedId.java", "new_code": "import nl.vu.datalayer.hbase.exceptions.NumericalRangeException;\n", "new_methods": [], "old_code": "", "old_methods": [], "patch": "@@ -3,6 +3,8 @@\n import java.math.BigDecimal;\n import java.math.BigInteger;\n \n+import nl.vu.datalayer.hbase.exceptions.NumericalRangeException;\n+\n import org.apache.hadoop.hbase.util.Bytes;\n import org.openrdf.model.Literal;\n import org.openrdf.model.URI;", "raw_url": "https://github.com/pgroth/hbase-rdf/raw/cbf0cac3f03c8dffbc415eab1421234dfc3ead24/src%2Fmain%2Fjava%2Fnl%2Fvu%2Fdatalayer%2Fhbase%2Fid%2FTypedId.java", "sha": "2ceb158462467e681b1977858dd28aa29a98b0ad", "status": "modified" }, { "additions": 152, "blob_url": "https://github.com/pgroth/hbase-rdf/blob/cbf0cac3f03c8dffbc415eab1421234dfc3ead24/src%2Fmain%2Fjava%2Fnl%2Fvu%2Fdatalayer%2Fhbase%2Fschema%2FHBPrefixMatchSchema.java", "changes": 290, "contents_url": "https://api.github.com/repos/pgroth/hbase-rdf/contents/src%2Fmain%2Fjava%2Fnl%2Fvu%2Fdatalayer%2Fhbase%2Fschema%2FHBPrefixMatchSchema.java?ref=cbf0cac3f03c8dffbc415eab1421234dfc3ead24", "deletions": 138, "filename": "src/main/java/nl/vu/datalayer/hbase/schema/HBPrefixMatchSchema.java", "new_code": "\t//private SortedMap<Short, Long> prefixCounters = null;\n\t\t//prefixCounters = prefixCounter;\n\t@Override\n\tpublic void create() throws Exception {\n\t\tHBaseAdmin admin = ((NativeJavaConnection)con).getAdmin();\n\t\n\t\t//distribute the regions over the entire ID space for String2ID\n\t\tbyte[][] splits = getString2IdSplits();\n\t\t\n\t\tcreateTable(admin, STRING2ID+schemaSuffix, splits, false);\n\t\t\n\t\tsplits = getNonNumericalSplits(NUM_REGIONS, 0);\n\t\t\n\t\tSystem.out.println(\"Id2String splits: \");\n\t\tprintSplits(splits);\n\t\t\n\t\tcreateTable(admin, ID2STRING+schemaSuffix, splits, true);\n\t\t\n\t\tcreateTable(admin, TABLE_NAMES[SPOC]+schemaSuffix, splits, false);\n\t\t\n\t\tcreateTable(admin, TABLE_NAMES[POCS]+schemaSuffix, splits, false);\n\t\t\n\t\tbyte [][] objectSplits = getObjectPrefixSplits(NUM_REGIONS);\n\t\tprintSplits(objectSplits);\n\t\tcreateTable(admin, TABLE_NAMES[OSPC]+schemaSuffix, objectSplits, false);\n\t\t\n\t\tif (onlyTriples == false){\n\t\t\tcreateTable(admin, TABLE_NAMES[CSPO]+schemaSuffix, splits, false);\n\t\t\tcreateTable(admin, TABLE_NAMES[CPSO]+schemaSuffix, splits, false);\t\n\t\t\t\n\t\t\tcreateTable(admin, TABLE_NAMES[OCSP]+schemaSuffix, objectSplits, false);\n\t\t}\n\t}\n\t\n\t/**\n\t * Creates an HBase table with specified splits and optional compression for the values in the table\n\t * \n\t * @param admin\n\t * @param tableName\n\t * @param splits\n\t * @param enableCompression\n\t * @throws IOException\n\t */\n\tpublic static void createTable(HBaseAdmin admin, String tableName, byte [][]splits, boolean enableCompression) throws IOException{\n\t\tif (admin.tableExists(tableName) == false){\n\t\t\tHTableDescriptor desc = new HTableDescriptor(tableName);\n\t\t\tHColumnDescriptor famDesc = new HColumnDescriptor(COLUMN_FAMILY);\n\t\t\t\n\t\t\tfamDesc.setBloomFilterType(StoreFile.BloomType.ROW);\n\t\t\tfamDesc.setMaxVersions(1);\n\t\t\tif (enableCompression)//by default it is disabled\n\t\t\t\tfamDesc.setCompactionCompressionType(Algorithm.LZO);\n\t\t\tdesc.addFamily(famDesc);\n\t\t\tdesc.setMaxFileSize(10*1024*1024*1024);//set maximum StoreFile size to a high value-10GB\n\t\t\t\t\t\t\t\t\t\t\t\t//so that the splits are not triggered automatically by HBase\n\n\t\t\tSystem.out.println(\"Creating table: \" + tableName);\n\t\t\tadmin.createTable(desc, splits);\n\t\t}\n\t}\n\t\n\t * Divide the space between startKey and endKey into an equal amount of regions\n\t * \n\t\n\t/**\n\t * Splits the space between startPartition and lastPartition into equal parts\n\t * \n\t * @param numRegions\n\t * @param startOffset - 0 or 1\n\t * @return\n\t */\n\tfinal public byte [][]getNonNumericalSplits(int numRegions, int startOffset){\n\t\tbyte []startKey = new byte[KEY_LENGTH];\n\t\tbyte []endKey = new byte[KEY_LENGTH];\n\t\tArrays.fill(endKey, startOffset+Long.SIZE/8, KEY_LENGTH, (byte)0xff);\n\t\t\n\t\tlong startKeyPrefix = startPartition << 24;\n\t\tBytes.putLong(startKey, startOffset, startKeyPrefix);\n\t\tlong endKeyPrefix = ((startPartition+numInputPartitions-1) << 24) | 0xffffffL;;\n\t\tBytes.putLong(endKey, startOffset, endKeyPrefix);\n\t\t\n\t\tSystem.out.println(\"Start: \"+String.format(\"%x\", startKeyPrefix)+\"; End: \"+String.format(\"%x\", endKeyPrefix));\n\t\t\n\t\treturn getSplits(startKey, endKey, numRegions);\n\t}\n\t\n\t/**\n\t * Splits the space between 0x80 and 0xff in equal parts\n\t * \n\t * @param numRegions\n\t * @return\n\t */\n\tfinal public byte [][]getNumericalSplits(int numRegions){\n\t\tbyte []startKey = new byte[KEY_LENGTH];\n\t\tstartKey[0] = (byte)0x80;\t\t\n\t\tbyte []endKey = new byte[KEY_LENGTH];\n\t\tArrays.fill(endKey, (byte)0xff);\n\t\t\n\t\treturn getSplits(startKey, endKey, numRegions);\n\t}\n\t\n\t/**\n\t * @param numRegions\n\t * @return\n\t */\n\tfinal private byte [][]getObjectPrefixSplits(int numRegions){\n\t\tint numericalRegions = (int)Math.round((double)numRegions*((double)numericalCount/(double)(totalStringCount+numericalCount)));\n\t\t\n\t\tbyte [][]nonNumSplits = getNonNumericalSplits(numRegions-numericalRegions, 1);\n\t\tbyte [][]numSplits = getNumericalSplits(numericalRegions);\n\t\t\n\t\tbyte [][]splits = new byte[numRegions-1][];\n\t\tfor (int i = 0; i < nonNumSplits.length; i++) {\n\t\t\tsplits[i] = nonNumSplits[i];\n\t\t}\n\t\t\n\t\tif (nonNumSplits.length < numRegions-1){\n\t\t\tsplits[nonNumSplits.length] = new byte[KEY_LENGTH];\n\t\t\tsplits[nonNumSplits.length][0] = (byte)0x80;//place the key between the numerical and non-numerical splits\n\t\t\tfor (int i = 0; i < numSplits.length; i++) {\n\t\t\t\tsplits[i+nonNumSplits.length+1] = numSplits[i];\n\t\t\t}\n\t\t}\n\t\treturn splits;\n\t}\n\t\n\tfinal private void printSplits(byte [][]splits){\n\t\tSystem.out.println(\"Number of splits: \"+splits.length);\n\t\tfor (int i = 0; i < splits.length; i++) {\n\t\t\tfor (int j = 0; j < splits[i].length; j++) {\n\t\t\t\tSystem.out.print(String.format(\"%02x \", splits[i][j]));\n\t\t\t}\n\t\t\tSystem.out.println();\n\t\t}\n\t}\n\n\tfinal private byte[][] getString2IdSplits() {\n\t\tbyte []startKey = new byte[KEY_LENGTH];\n\t\tbyte []endKey = new byte[KEY_LENGTH];\n\t\tArrays.fill(endKey, 0, KEY_LENGTH, (byte)0xff);\n\t\tbyte [][]splits = getSplits(startKey, endKey, NUM_REGIONS);\n\t\tSystem.out.println(\" String2Id splits: \");\n\t\tprintSplits(splits);\n\t\treturn splits;\n\t}\n\n\t\n\t/*public static BigInteger getAddress(BigInteger range, BigInteger startAddress, long chunkCount, long totalCount ){\n\t/*public static byte [] convertBigIntegerToAddress(BigInteger address, int length){\n\t}*/\n\t/*public byte [][] getString2IdSplits(int numRegions){\n\t}*/", "new_methods": [ { "arguments": [ "int i = 0; i < numSplits.length; i++" ], "filename": "src/main/java/nl/vu/datalayer/hbase/schema/HBPrefixMatchSchema.java", "implementation": "splits[i+nonNumSplits.length+1] = numSplits[i];", "signature": "splits\n\t\t\tfor (int i = 0; i < numSplits.length; i++)" }, { "arguments": [ "byte [][]splits" ], "filename": "src/main/java/nl/vu/datalayer/hbase/schema/HBPrefixMatchSchema.java", "implementation": "System.out.println(\"Number of splits: \"+splits.length);\n\t\tfor (int i = 0; i < splits.length; i++) {\n\t\t\tfor (int j = 0; j < splits[i].length; j++) {\n\t\t\t\tSystem.out.print(String.format(\"%02x \", splits[i][j]));", "signature": "void printSplits(byte [][]splits)" }, { "arguments": [ "BigInteger range", " BigInteger startAddress", " long chunkCount", " long totalCount " ], "filename": "src/main/java/nl/vu/datalayer/hbase/schema/HBPrefixMatchSchema.java", "implementation": "/*public static byte [] convertBigIntegerToAddress(BigInteger address, int length){", "signature": "BigInteger getAddress(BigInteger range, BigInteger startAddress, long chunkCount, long totalCount )" } ], "old_code": "\t//public static final String []TABLE_NAMES = {\"SPOCLUBM\", \"POCSLUBM\", \"OCSPLUBM\", \"CSPOLUBM\", \"CPSOLUBM\", \"OSPCLUBM\"};\n\tprivate SortedMap<Short, Long> prefixCounters = null;\n\t\t\t\t\t\t\t\t\tSortedMap<Short, Long> prefixCounter,\n\t\tprefixCounters = prefixCounter;\n\t/**\n\t * Creates an HBase table with specified splits and optional compression for the values in the table\n\t * \n\t * @param admin\n\t * @param tableName\n\t * @param splits\n\t * @param enableCompression\n\t * @throws IOException\n\t */\n\tpublic static void createTable(HBaseAdmin admin, String tableName, byte [][]splits, boolean enableCompression) throws IOException{\n\t\tif (admin.tableExists(tableName) == false){\n\t\t\tHTableDescriptor desc = new HTableDescriptor(tableName);\n\n\t\t\tHColumnDescriptor famDesc = new HColumnDescriptor(COLUMN_FAMILY);\n\t\t\tfamDesc.setBloomFilterType(StoreFile.BloomType.ROW);\n\t\t\tfamDesc.setMaxVersions(1);\n\t\t\tif (enableCompression)//by default it is disabled\n\t\t\t\tfamDesc.setCompactionCompressionType(Algorithm.LZO);\n\t\t\tdesc.addFamily(famDesc);\n\n\t\t\tSystem.out.println(\"Creating table: \" + tableName);\n\t\t\tadmin.createTable(desc, splits);\n\t\t}\n\t}\n\t\n\tpublic static BigInteger getAddress(BigInteger range, BigInteger startAddress, long chunkCount, long totalCount ){\n\tpublic static byte [] convertBigIntegerToAddress(BigInteger address, int length){\n\t}\n\tpublic byte [][] getString2IdSplits(int numRegions){\n\t}\n\t\n\t/**\n\t * Splits the space between 0x80 and 0xff in equal parts\n\t * \n\t * @param numRegions\n\t * @param startOffset - 0 or 1\n\t * @return\n\t */\n\tpublic byte [][]getNonNumericalSplits(int numRegions, int startOffset){\n\t\tbyte []startKey = new byte[KEY_LENGTH];\n\t\tbyte []endKey = new byte[KEY_LENGTH];\n\t\tArrays.fill(endKey, startOffset+Long.SIZE/8, KEY_LENGTH, (byte)0xff);\n\t\t\n\t\tlong startKeyPrefix = startPartition << 24;\n\t\tBytes.putLong(startKey, startOffset, startKeyPrefix);\n\t\tlong endKeyPrefix = ((startPartition+numInputPartitions-1) << 24) | 0xffffffL;;\n\t\tBytes.putLong(endKey, startOffset, endKeyPrefix);\n\t\t\n\t\tSystem.out.println(\"Start: \"+String.format(\"%x\", startKeyPrefix)+\"; End: \"+String.format(\"%x\", endKeyPrefix));\n\t\t\n\t\treturn getSplits(startKey, endKey, numRegions);\n\t}\n\t\n\t/**\n\t * @param numRegions\n\t * @return\n\t */\n\tpublic byte [][]getNumericalSplits(int numRegions){\n\t\tbyte []startKey = new byte[KEY_LENGTH];\n\t\tstartKey[0] = (byte)0x80;\t\t\n\t\tbyte []endKey = new byte[KEY_LENGTH];\n\t\tArrays.fill(endKey, (byte)0xff);\n\t\t\n\t\treturn getSplits(startKey, endKey, numRegions);\n\t}\n\t\n\t/**\n\t * @param numRegions\n\t * @return\n\t */\n\tpublic byte [][]getObjectPrefixSplits(int numRegions){\n\t\tint numericalRegions = (int)Math.round((double)numRegions*((double)numericalCount/(double)(totalStringCount+numericalCount)));\n\t\t\n\t\tbyte [][]nonNumSplits = getNonNumericalSplits(numRegions-numericalRegions, 1);\n\t\tbyte [][]numSplits = getNumericalSplits(numericalRegions);\n\t\t\n\t\tbyte [][]splits = new byte[numRegions-1][];\n\t\tfor (int i = 0; i < nonNumSplits.length; i++) {\n\t\t\tsplits[i] = nonNumSplits[i];\n\t\t}\n\t\t\n\t\tif (nonNumSplits.length < numRegions-1){\n\t\t\tsplits[nonNumSplits.length] = new byte[KEY_LENGTH];\n\t\t\tsplits[nonNumSplits.length][0] = (byte)0x80;\n\t\t\tfor (int i = 0; i < numSplits.length; i++) {\n\t\t\t\tsplits[i+nonNumSplits.length+1] = numSplits[i];\n\t\t\t}\n\t\t}\n\t\treturn splits;\n\t}\n\t\n\tprivate void printSplits(byte [][]splits){\n\t\tSystem.out.println(\"Number of splits: \"+splits.length);\n\t\tfor (int i = 0; i < splits.length; i++) {\n\t\t\tfor (int j = 0; j < splits[i].length; j++) {\n\t\t\t\tSystem.out.print(String.format(\"%02x \", splits[i][j]));\n\t\t\t}\n\t\t\tSystem.out.println();\n\t\t}\n\t}\n\n\t@Override\n\tpublic void create() throws Exception {\n\t\tHBaseAdmin admin = ((NativeJavaConnection)con).getAdmin();\n\t\t//distribute the regions over the entire ID space for String2ID\n\t\tbyte [][]splits = getString2IdSplits(NUM_REGIONS);\n\t\tSystem.out.println(\" String2Id splits: \");\n\t\tprintSplits(splits);\n\t\t\n\t\tcreateTable(admin, STRING2ID+schemaSuffix, splits, false);\n\t\t\n\t\tsplits = getNonNumericalSplits(NUM_REGIONS, 0);\n\t\t\n\t\tSystem.out.println(\"Id2String splits: \");\n\t\tprintSplits(splits);\n\t\t\n\t\tcreateTable(admin, ID2STRING+schemaSuffix, splits, true);\n\t\t\n\t\tcreateTable(admin, TABLE_NAMES[SPOC]+schemaSuffix, splits, false);\n\t\t\n\t\tcreateTable(admin, TABLE_NAMES[POCS]+schemaSuffix, splits, false);\n\t\t\n\t\tbyte [][] objectSplits = getObjectPrefixSplits(NUM_REGIONS);\n\t\tprintSplits(objectSplits);\n\t\tcreateTable(admin, TABLE_NAMES[OSPC]+schemaSuffix, objectSplits, false);\n\t\t\n\t\tif (onlyTriples == false){\n\t\t\tcreateTable(admin, TABLE_NAMES[CSPO]+schemaSuffix, splits, false);\n\t\t\tcreateTable(admin, TABLE_NAMES[CPSO]+schemaSuffix, splits, false);\t\n\t\t\t\n\t\t\tcreateTable(admin, TABLE_NAMES[OCSP]+schemaSuffix, objectSplits, false);\n\t\t}\n\t}\n", "old_methods": [ { "arguments": [ "BigInteger range", " BigInteger startAddress", " long chunkCount", " long totalCount " ], "filename": "src/main/java/nl/vu/datalayer/hbase/schema/HBPrefixMatchSchema.java", "implementation": "public static byte [] convertBigIntegerToAddress(BigInteger address, int length){", "signature": "BigInteger getAddress(BigInteger range, BigInteger startAddress, long chunkCount, long totalCount )" }, { "arguments": [ "byte [][]splits" ], "filename": "src/main/java/nl/vu/datalayer/hbase/schema/HBPrefixMatchSchema.java", "implementation": "System.out.println(\"Number of splits: \"+splits.length);\n\t\tfor (int i = 0; i < splits.length; i++) {\n\t\t\tfor (int j = 0; j < splits[i].length; j++) {\n\t\t\t\tSystem.out.print(String.format(\"%02x \", splits[i][j]));", "signature": "void printSplits(byte [][]splits)" } ], "patch": "@@ -33,7 +33,6 @@ public class HBPrefixMatchSchema implements IHBaseSchema {\n \tpublic static final byte [] COLUMN_NAME = \"\".getBytes();\n \t\n \tpublic static final String []TABLE_NAMES = {\"SPOC\", \"POCS\", \"OCSP\", \"CSPO\", \"CPSO\", \"OSPC\"};\n-\t//public static final String []TABLE_NAMES = {\"SPOCLUBM\", \"POCSLUBM\", \"OCSPLUBM\", \"CSPOLUBM\", \"CPSOLUBM\", \"OSPCLUBM\"};\n \t\n \t//3 BaseIds + 1 TypedId (in the Object position of each table)\n \tpublic static final int KEY_LENGTH = 33;\n@@ -77,7 +76,7 @@ public class HBPrefixMatchSchema implements IHBaseSchema {\n \t * Histogram that stores the frequency of the last byte in each quad element \n \t * used for proper splits for the table String2Id\n \t */\n-\tprivate SortedMap<Short, Long> prefixCounters = null;\n+\t//private SortedMap<Short, Long> prefixCounters = null;\n \t\n \t/**\n \t * Number of non-numerical elements: includes URIs, bNodes and non-numerical Literals\n@@ -107,12 +106,11 @@ public HBPrefixMatchSchema(HBaseConnection con, String schemaSuffix) {\n \t */\n \tpublic void setTableSplitInfo(long totalNumberOfStrings, long numericalParam,\n \t\t\t\t\t\t\t\t\tint numPartitions, long startPartitionParam, \n-\t\t\t\t\t\t\t\t\tSortedMap<Short, Long> prefixCounter,\n \t\t\t\t\t\t\t\t\tboolean onlyTriplesParam){\n \t\tstartPartition = startPartitionParam;\n \t\tnumInputPartitions = numPartitions;\n \t\ttotalStringCount = totalNumberOfStrings;\n-\t\tprefixCounters = prefixCounter;\n+\t\t//prefixCounters = prefixCounter;\n \t\tnumericalCount = numericalParam;\n \t\tonlyTriples = onlyTriplesParam; \n \t}\n@@ -132,31 +130,6 @@ public static void setObjectPrefixTableSplitInfo(long totalNumberOfString, long\n \t\ttotalStringCount = totalNumberOfString;\n \t}*/\n \t\n-\t/**\n-\t * Creates an HBase table with specified splits and optional compression for the values in the table\n-\t * \n-\t * @param admin\n-\t * @param tableName\n-\t * @param splits\n-\t * @param enableCompression\n-\t * @throws IOException\n-\t */\n-\tpublic static void createTable(HBaseAdmin admin, String tableName, byte [][]splits, boolean enableCompression) throws IOException{\n-\t\tif (admin.tableExists(tableName) == false){\n-\t\t\tHTableDescriptor desc = new HTableDescriptor(tableName);\n-\n-\t\t\tHColumnDescriptor famDesc = new HColumnDescriptor(COLUMN_FAMILY);\n-\t\t\tfamDesc.setBloomFilterType(StoreFile.BloomType.ROW);\n-\t\t\tfamDesc.setMaxVersions(1);\n-\t\t\tif (enableCompression)//by default it is disabled\n-\t\t\t\tfamDesc.setCompactionCompressionType(Algorithm.LZO);\n-\t\t\tdesc.addFamily(famDesc);\n-\n-\t\t\tSystem.out.println(\"Creating table: \" + tableName);\n-\t\t\tadmin.createTable(desc, splits);\n-\t\t}\n-\t}\n-\t\n \tpublic void createCounterTable(HBaseAdmin admin) throws IOException{\n \t\t\n \t\tString fullName = COUNTER_TABLE+schemaSuffix;\n@@ -247,7 +220,68 @@ public static Long getLastCounter(Configuration conf, String schemaSuffix) throw\n \t\treturn lastCounter;\n \t}\n \t\n+\t@Override\n+\tpublic void create() throws Exception {\n+\t\tHBaseAdmin admin = ((NativeJavaConnection)con).getAdmin();\n+\t\n+\t\t//distribute the regions over the entire ID space for String2ID\n+\t\tbyte[][] splits = getString2IdSplits();\n+\t\t\n+\t\tcreateTable(admin, STRING2ID+schemaSuffix, splits, false);\n+\t\t\n+\t\tsplits = getNonNumericalSplits(NUM_REGIONS, 0);\n+\t\t\n+\t\tSystem.out.println(\"Id2String splits: \");\n+\t\tprintSplits(splits);\n+\t\t\n+\t\tcreateTable(admin, ID2STRING+schemaSuffix, splits, true);\n+\t\t\n+\t\tcreateTable(admin, TABLE_NAMES[SPOC]+schemaSuffix, splits, false);\n+\t\t\n+\t\tcreateTable(admin, TABLE_NAMES[POCS]+schemaSuffix, splits, false);\n+\t\t\n+\t\tbyte [][] objectSplits = getObjectPrefixSplits(NUM_REGIONS);\n+\t\tprintSplits(objectSplits);\n+\t\tcreateTable(admin, TABLE_NAMES[OSPC]+schemaSuffix, objectSplits, false);\n+\t\t\n+\t\tif (onlyTriples == false){\n+\t\t\tcreateTable(admin, TABLE_NAMES[CSPO]+schemaSuffix, splits, false);\n+\t\t\tcreateTable(admin, TABLE_NAMES[CPSO]+schemaSuffix, splits, false);\t\n+\t\t\t\n+\t\t\tcreateTable(admin, TABLE_NAMES[OCSP]+schemaSuffix, objectSplits, false);\n+\t\t}\n+\t}\n+\t\n+\t/**\n+\t * Creates an HBase table with specified splits and optional compression for the values in the table\n+\t * \n+\t * @param admin\n+\t * @param tableName\n+\t * @param splits\n+\t * @param enableCompression\n+\t * @throws IOException\n+\t */\n+\tpublic static void createTable(HBaseAdmin admin, String tableName, byte [][]splits, boolean enableCompression) throws IOException{\n+\t\tif (admin.tableExists(tableName) == false){\n+\t\t\tHTableDescriptor desc = new HTableDescriptor(tableName);\n+\t\t\tHColumnDescriptor famDesc = new HColumnDescriptor(COLUMN_FAMILY);\n+\t\t\t\n+\t\t\tfamDesc.setBloomFilterType(StoreFile.BloomType.ROW);\n+\t\t\tfamDesc.setMaxVersions(1);\n+\t\t\tif (enableCompression)//by default it is disabled\n+\t\t\t\tfamDesc.setCompactionCompressionType(Algorithm.LZO);\n+\t\t\tdesc.addFamily(famDesc);\n+\t\t\tdesc.setMaxFileSize(10*1024*1024*1024);//set maximum StoreFile size to a high value-10GB\n+\t\t\t\t\t\t\t\t\t\t\t\t//so that the splits are not triggered automatically by HBase\n+\n+\t\t\tSystem.out.println(\"Creating table: \" + tableName);\n+\t\t\tadmin.createTable(desc, splits);\n+\t\t}\n+\t}\n+\t\n \t/**\n+\t * Divide the space between startKey and endKey into an equal amount of regions\n+\t * \n \t * @param startKey\n \t * @param endKey\n \t * @param numRegions\n@@ -276,19 +310,103 @@ public static byte[][] getSplits(byte []startKey, byte []endKey, int numRegions)\n \t\treturn splits;\n \t}\n \t\n+\t\n+\t/**\n+\t * Splits the space between startPartition and lastPartition into equal parts\n+\t * \n+\t * @param numRegions\n+\t * @param startOffset - 0 or 1\n+\t * @return\n+\t */\n+\tfinal public byte [][]getNonNumericalSplits(int numRegions, int startOffset){\n+\t\tbyte []startKey = new byte[KEY_LENGTH];\n+\t\tbyte []endKey = new byte[KEY_LENGTH];\n+\t\tArrays.fill(endKey, startOffset+Long.SIZE/8, KEY_LENGTH, (byte)0xff);\n+\t\t\n+\t\tlong startKeyPrefix = startPartition << 24;\n+\t\tBytes.putLong(startKey, startOffset, startKeyPrefix);\n+\t\tlong endKeyPrefix = ((startPartition+numInputPartitions-1) << 24) | 0xffffffL;;\n+\t\tBytes.putLong(endKey, startOffset, endKeyPrefix);\n+\t\t\n+\t\tSystem.out.println(\"Start: \"+String.format(\"%x\", startKeyPrefix)+\"; End: \"+String.format(\"%x\", endKeyPrefix));\n+\t\t\n+\t\treturn getSplits(startKey, endKey, numRegions);\n+\t}\n+\t\n+\t/**\n+\t * Splits the space between 0x80 and 0xff in equal parts\n+\t * \n+\t * @param numRegions\n+\t * @return\n+\t */\n+\tfinal public byte [][]getNumericalSplits(int numRegions){\n+\t\tbyte []startKey = new byte[KEY_LENGTH];\n+\t\tstartKey[0] = (byte)0x80;\t\t\n+\t\tbyte []endKey = new byte[KEY_LENGTH];\n+\t\tArrays.fill(endKey, (byte)0xff);\n+\t\t\n+\t\treturn getSplits(startKey, endKey, numRegions);\n+\t}\n+\t\n+\t/**\n+\t * @param numRegions\n+\t * @return\n+\t */\n+\tfinal private byte [][]getObjectPrefixSplits(int numRegions){\n+\t\tint numericalRegions = (int)Math.round((double)numRegions*((double)numericalCount/(double)(totalStringCount+numericalCount)));\n+\t\t\n+\t\tbyte [][]nonNumSplits = getNonNumericalSplits(numRegions-numericalRegions, 1);\n+\t\tbyte [][]numSplits = getNumericalSplits(numericalRegions);\n+\t\t\n+\t\tbyte [][]splits = new byte[numRegions-1][];\n+\t\tfor (int i = 0; i < nonNumSplits.length; i++) {\n+\t\t\tsplits[i] = nonNumSplits[i];\n+\t\t}\n+\t\t\n+\t\tif (nonNumSplits.length < numRegions-1){\n+\t\t\tsplits[nonNumSplits.length] = new byte[KEY_LENGTH];\n+\t\t\tsplits[nonNumSplits.length][0] = (byte)0x80;//place the key between the numerical and non-numerical splits\n+\t\t\tfor (int i = 0; i < numSplits.length; i++) {\n+\t\t\t\tsplits[i+nonNumSplits.length+1] = numSplits[i];\n+\t\t\t}\n+\t\t}\n+\t\treturn splits;\n+\t}\n+\t\n+\tfinal private void printSplits(byte [][]splits){\n+\t\tSystem.out.println(\"Number of splits: \"+splits.length);\n+\t\tfor (int i = 0; i < splits.length; i++) {\n+\t\t\tfor (int j = 0; j < splits[i].length; j++) {\n+\t\t\t\tSystem.out.print(String.format(\"%02x \", splits[i][j]));\n+\t\t\t}\n+\t\t\tSystem.out.println();\n+\t\t}\n+\t}\n+\n+\tfinal private byte[][] getString2IdSplits() {\n+\t\tbyte []startKey = new byte[KEY_LENGTH];\n+\t\tbyte []endKey = new byte[KEY_LENGTH];\n+\t\tArrays.fill(endKey, 0, KEY_LENGTH, (byte)0xff);\n+\t\tbyte [][]splits = getSplits(startKey, endKey, NUM_REGIONS);\n+\t\tSystem.out.println(\" String2Id splits: \");\n+\t\tprintSplits(splits);\n+\t\treturn splits;\n+\t}\n+\n+\t\n \t/**\n \t * \n \t * @param start\n \t * @param end\n \t * @param portion\n \t */\n-\tpublic static BigInteger getAddress(BigInteger range, BigInteger startAddress, long chunkCount, long totalCount ){\n+\t/*public static BigInteger getAddress(BigInteger range, BigInteger startAddress, long chunkCount, long totalCount ){\n \t\tBigInteger chunkSize = range.multiply(BigInteger.valueOf(chunkCount)).divide(BigInteger.valueOf(totalCount));\n \t\t\n \t\treturn startAddress.add(chunkSize);\n \t}\n \t\n-\tpublic static byte [] convertBigIntegerToAddress(BigInteger address, int length){\n+\t/*public static byte [] convertBigIntegerToAddress(BigInteger address, int length){\n \t\tbyte []ret = address.toByteArray();\n \t\tint offset = ret.length-length;\n \t\t\n@@ -300,7 +418,7 @@ else if (offset > 0){\n \t\t}\n \t\telse\n \t\t\treturn ret;\n-\t}\n+\t}*/\n \t\n \t\n \t/**\n@@ -309,7 +427,7 @@ else if (offset > 0){\n \t * @param numRegions\n \t * @return\n \t */\n-\tpublic byte [][] getString2IdSplits(int numRegions){\n+\t/*public byte [][] getString2IdSplits(int numRegions){\n \t\t\n \t\t//divide all elements to the desired number of regions, so that a proper load balance is maintained\n \t\tif (totalStringCount < numRegions){\n@@ -382,110 +500,6 @@ else if (offset > 0){\n \t\t\tret = byteSplits;\n \t\t\n \t\treturn ret;\n-\t}\n-\t\n-\t/**\n-\t * Splits the space between 0x80 and 0xff in equal parts\n-\t * \n-\t * @param numRegions\n-\t * @param startOffset - 0 or 1\n-\t * @return\n-\t */\n-\tpublic byte [][]getNonNumericalSplits(int numRegions, int startOffset){\n-\t\tbyte []startKey = new byte[KEY_LENGTH];\n-\t\tbyte []endKey = new byte[KEY_LENGTH];\n-\t\tArrays.fill(endKey, startOffset+Long.SIZE/8, KEY_LENGTH, (byte)0xff);\n-\t\t\n-\t\tlong startKeyPrefix = startPartition << 24;\n-\t\tBytes.putLong(startKey, startOffset, startKeyPrefix);\n-\t\tlong endKeyPrefix = ((startPartition+numInputPartitions-1) << 24) | 0xffffffL;;\n-\t\tBytes.putLong(endKey, startOffset, endKeyPrefix);\n-\t\t\n-\t\tSystem.out.println(\"Start: \"+String.format(\"%x\", startKeyPrefix)+\"; End: \"+String.format(\"%x\", endKeyPrefix));\n-\t\t\n-\t\treturn getSplits(startKey, endKey, numRegions);\n-\t}\n-\t\n-\t/**\n-\t * @param numRegions\n-\t * @return\n-\t */\n-\tpublic byte [][]getNumericalSplits(int numRegions){\n-\t\tbyte []startKey = new byte[KEY_LENGTH];\n-\t\tstartKey[0] = (byte)0x80;\t\t\n-\t\tbyte []endKey = new byte[KEY_LENGTH];\n-\t\tArrays.fill(endKey, (byte)0xff);\n-\t\t\n-\t\treturn getSplits(startKey, endKey, numRegions);\n-\t}\n-\t\n-\t/**\n-\t * @param numRegions\n-\t * @return\n-\t */\n-\tpublic byte [][]getObjectPrefixSplits(int numRegions){\n-\t\tint numericalRegions = (int)Math.round((double)numRegions*((double)numericalCount/(double)(totalStringCount+numericalCount)));\n-\t\t\n-\t\tbyte [][]nonNumSplits = getNonNumericalSplits(numRegions-numericalRegions, 1);\n-\t\tbyte [][]numSplits = getNumericalSplits(numericalRegions);\n-\t\t\n-\t\tbyte [][]splits = new byte[numRegions-1][];\n-\t\tfor (int i = 0; i < nonNumSplits.length; i++) {\n-\t\t\tsplits[i] = nonNumSplits[i];\n-\t\t}\n-\t\t\n-\t\tif (nonNumSplits.length < numRegions-1){\n-\t\t\tsplits[nonNumSplits.length] = new byte[KEY_LENGTH];\n-\t\t\tsplits[nonNumSplits.length][0] = (byte)0x80;\n-\t\t\tfor (int i = 0; i < numSplits.length; i++) {\n-\t\t\t\tsplits[i+nonNumSplits.length+1] = numSplits[i];\n-\t\t\t}\n-\t\t}\n-\t\treturn splits;\n-\t}\n-\t\n-\tprivate void printSplits(byte [][]splits){\n-\t\tSystem.out.println(\"Number of splits: \"+splits.length);\n-\t\tfor (int i = 0; i < splits.length; i++) {\n-\t\t\tfor (int j = 0; j < splits[i].length; j++) {\n-\t\t\t\tSystem.out.print(String.format(\"%02x \", splits[i][j]));\n-\t\t\t}\n-\t\t\tSystem.out.println();\n-\t\t}\n-\t}\n-\n-\t@Override\n-\tpublic void create() throws Exception {\n-\t\tHBaseAdmin admin = ((NativeJavaConnection)con).getAdmin();\n+\t}*/\n \t\n-\t\t//distribute the regions over the entire ID space for String2ID\n-\t\tbyte [][]splits = getString2IdSplits(NUM_REGIONS);\n-\t\tSystem.out.println(\" String2Id splits: \");\n-\t\tprintSplits(splits);\n-\t\t\n-\t\tcreateTable(admin, STRING2ID+schemaSuffix, splits, false);\n-\t\t\n-\t\tsplits = getNonNumericalSplits(NUM_REGIONS, 0);\n-\t\t\n-\t\tSystem.out.println(\"Id2String splits: \");\n-\t\tprintSplits(splits);\n-\t\t\n-\t\tcreateTable(admin, ID2STRING+schemaSuffix, splits, true);\n-\t\t\n-\t\tcreateTable(admin, TABLE_NAMES[SPOC]+schemaSuffix, splits, false);\n-\t\t\n-\t\tcreateTable(admin, TABLE_NAMES[POCS]+schemaSuffix, splits, false);\n-\t\t\n-\t\tbyte [][] objectSplits = getObjectPrefixSplits(NUM_REGIONS);\n-\t\tprintSplits(objectSplits);\n-\t\tcreateTable(admin, TABLE_NAMES[OSPC]+schemaSuffix, objectSplits, false);\n-\t\t\n-\t\tif (onlyTriples == false){\n-\t\t\tcreateTable(admin, TABLE_NAMES[CSPO]+schemaSuffix, splits, false);\n-\t\t\tcreateTable(admin, TABLE_NAMES[CPSO]+schemaSuffix, splits, false);\t\n-\t\t\t\n-\t\t\tcreateTable(admin, TABLE_NAMES[OCSP]+schemaSuffix, objectSplits, false);\n-\t\t}\n-\t}\n-\n }", "raw_url": "https://github.com/pgroth/hbase-rdf/raw/cbf0cac3f03c8dffbc415eab1421234dfc3ead24/src%2Fmain%2Fjava%2Fnl%2Fvu%2Fdatalayer%2Fhbase%2Fschema%2FHBPrefixMatchSchema.java", "sha": "99327ca9dd608c10a8d80c3af908ca6242edab47", "status": "modified" }, { "additions": 213, "blob_url": "https://github.com/pgroth/hbase-rdf/blob/cbf0cac3f03c8dffbc415eab1421234dfc3ead24/src%2Fmain%2Fjava%2Fnl%2Fvu%2Fdatalayer%2Fhbase%2Futil%2FHBPrefixMatchUtil.java", "changes": 359, "contents_url": "https://api.github.com/repos/pgroth/hbase-rdf/contents/src%2Fmain%2Fjava%2Fnl%2Fvu%2Fdatalayer%2Fhbase%2Futil%2FHBPrefixMatchUtil.java?ref=cbf0cac3f03c8dffbc415eab1421234dfc3ead24", "deletions": 146, "filename": "src/main/java/nl/vu/datalayer/hbase/util/HBPrefixMatchUtil.java", "new_code": "import java.io.ByteArrayInputStream;\nimport java.io.DataInputStream;\nimport java.io.UnsupportedEncodingException;\nimport java.security.MessageDigest;\nimport java.security.NoSuchAlgorithmException;\nimport nl.vu.datalayer.hbase.exceptions.ElementNotFoundException;\nimport nl.vu.datalayer.hbase.exceptions.NumericalRangeException;\nimport nl.vu.datalayer.hbase.id.HBaseValue;\n\tprivate int currentTableIndex;\n\t/**\n\t * Internal map that stores associations between Ids in the results and the corresponding Value objects\n\t */\n\t\n\tprivate MessageDigest mDigest;\n\n\tprivate int keySize;\n\n\tprivate byte [] numericalElement;\n\n\tprivate String currentPattern;\n\n\tprivate HashMap<ByteArray, Integer> spocOffsetMap = new HashMap<ByteArray, Integer>();\n\t\tbuildPattern2TableHashMap();\n\t\ttry {\n\t\t\tmDigest = MessageDigest.getInstance(\"MD5\");\n\t\t} catch (NoSuchAlgorithmException e) {\n\t\t\te.printStackTrace();\n\t\t}\n\tprivate void buildPattern2TableHashMap(){\n\t\t\tthrows IOException {//we expect the pattern in the order SPOC\t\n\t\t\tretrievalInit();\n\t\t\tlong start = System.currentTimeMillis();\n\t\t\tbyte[] startKey = buildRangeScanKeyFromQuad(quad);\n\t\t\tlong keyBuildOverhead = System.currentTimeMillis()-start;\n\t\t\tlong startSearch = System.currentTimeMillis();\n\t\t\tArrayList<Get> batchIdGets = doRangeScan(startKey);\n\t\t\tstart = System.currentTimeMillis();\n\t\t\tResult[] id2StringResults = doBatchId2String(batchIdGets);\n\t\t\tSystem.out.println(\"Search time: \"+searchTime+\"; Id2StringOverhead: \"+id2StringOverhead+\"; String2IdOverhead: \"\n\t\t\t\t\t\t\t\t\t+string2IdOverhead+\"; KeyBuildOverhead: \"+keyBuildOverhead);\n\t\t\tupdateId2ValueMap(id2StringResults);\t\t\t\n\t\t\treturn buildSPOCOrderResults();\n\t\t\n\t\t\tSystem.err.println(\"Bound variable numerical not in expected range: \"+e.getMessage());\n\t\t\treturn null;\n\t\t} catch (ElementNotFoundException e) {\n\t\t\tSystem.err.println(e.getMessage());\n\n\tfinal private ArrayList<ArrayList<Value>> buildSPOCOrderResults() {\n\t\tint queryElemNo = boundElements.size();\n\t\tArrayList<ArrayList<Value>> ret = new ArrayList<ArrayList<Value>>();\n\t\t\n\t\tfor (ArrayList<ByteArray> quadList : quadResults) {\n\t\t\tArrayList<Value> newQuadResult = new ArrayList<Value>(4);\n\t\t\tnewQuadResult.addAll(Arrays.asList(new Value[]{null, null, null, null}));\t\t\t\n\t\t\t\n\t\t\tfillInUnboundElements(queryElemNo, quadList, newQuadResult);\t\t\n\t\t\tfillInBoundElements(newQuadResult);\n\t\t\t\n\t\t\tret.add(newQuadResult);\n\t\t}\n\t\treturn ret;\n\t}\n\n\tfinal private void fillInBoundElements(ArrayList<Value> newQuadResult) {\n\t\tfor (int i = 0, j = 0; i<newQuadResult.size() && j<boundElements.size(); i++) {\n\t\t\tif (newQuadResult.get(i) == null){\n\t\t\t\tnewQuadResult.set(i, boundElements.get(j++));\n\t\t\t}\n\t\t}\n\t}\n\n\tfinal private void fillInUnboundElements(int queryElemNo, ArrayList<ByteArray> quadList, ArrayList<Value> newQuadResult) {\n\t\tfor (int i = 0; i < quadList.size(); i++) {\n\t\t\tif ((i+queryElemNo) == HBPrefixMatchSchema.ORDER[currentTableIndex][2] && \n\t\t\t\t\tTypedId.getType(quadList.get(i).getBytes()[0]) == TypedId.NUMERICAL){\n\t\t\t\t//handle numericals\n\t\t\t\tTypedId id = new TypedId(quadList.get(i).getBytes());\n\t\t\t\tnewQuadResult.set(2, id.toLiteral());\n\t\t\t}\n\t\t\telse{\n\t\t\t\tnewQuadResult.set(HBPrefixMatchSchema.TO_SPOC_ORDER[currentTableIndex][(i+queryElemNo)], \n\t\t\t\t\t\tid2ValueMap.get(quadList.get(i)));\n\t\t\t}\n\t\t}\n\t}\n\n\tfinal private void updateId2ValueMap(Result[] id2StringResults) throws IOException, ElementNotFoundException {\n\t\tHBaseValue hbaseValue = new HBaseValue();\n\t\tfor (Result result : id2StringResults) {\n\t\t\tbyte []rowVal = result.getValue(HBPrefixMatchSchema.COLUMN_FAMILY, HBPrefixMatchSchema.COLUMN_NAME);\n\t\t\tbyte []rowKey = result.getRow();\n\t\t\tif (rowVal == null || rowKey == null){\n\t\t\t\tthrow new ElementNotFoundException(\"Id not found in Id2String table: \"+(rowKey == null ? null : hexaString(rowKey)));\n\t\t\t}\n\t\t\telse{\n\t\t\t\tByteArrayInputStream byteStream = new ByteArrayInputStream(rowVal);\n\t\t\t\thbaseValue.readFields(new DataInputStream(byteStream));\n\t\t\t\tValue val = hbaseValue.getUnderlyingValue();\n\t\t\t\tid2ValueMap.put(new ByteArray(rowKey), val);\n\t\t\t}\n\t\t}\n\t}\n\n\tfinal private Result[] doBatchId2String(ArrayList<Get> batchIdGets) throws IOException {\n\t\tHTableInterface id2StringTable = con.getTable(HBPrefixMatchSchema.ID2STRING+schemaSuffix);\n\t\tResult []id2StringResults = id2StringTable.get(batchIdGets);\n\t\tid2StringTable.close();\n\t\treturn id2StringResults;\n\t}\n\n\tfinal private ArrayList<Get> doRangeScan(byte[] startKey) throws IOException {\n\t\tFilter prefixFilter = new PrefixFilter(startKey);\n\t\tFilter keyOnlyFilter = new KeyOnlyFilter();\n\t\tFilter filterList = new FilterList(FilterList.Operator.MUST_PASS_ALL, prefixFilter, keyOnlyFilter);\n\t\t\n\t\tScan scan = new Scan(startKey, filterList);\n\t\tscan.setCaching(100);\n\n\t\tString tableName = HBPrefixMatchSchema.TABLE_NAMES[currentTableIndex]+schemaSuffix;\n\t\tSystem.out.println(\"Retrieving from table: \"+tableName);\n\t\t\n\t\tHTableInterface table = con.getTable(tableName);\n\t\tResultScanner results = table.getScanner(scan);\n\n\t\tArrayList<Get> batchGets = parseRangeScanResults(startKey.length, results);\n\t\ttable.close();\n\t\treturn batchGets;\n\t}\n\n\tfinal private ArrayList<Get> parseRangeScanResults(int startKeyLength, ResultScanner results) throws IOException {\n\t\tResult r = null;\n\t\tint sizeOfInterest = HBPrefixMatchSchema.KEY_LENGTH - startKeyLength;\n\n\t\tArrayList<Get> batchGets = new ArrayList<Get>();\n\t\twhile ((r = results.next()) != null) {\n\t\t\tparseKey(r.getRow(), startKeyLength, sizeOfInterest, batchGets);\n\t\t}\n\t\tresults.close();\n\t\treturn batchGets;\n\t}\n\n\tfinal private void retrievalInit() {\n\t\tid2ValueMap.clear();\n\t\tquadResults.clear();\n\t\tboundElements.clear();\n\t\tid2StringOverhead = 0;\n\t\tstring2IdOverhead = 0;\n\t}\n\t/*public Value convertStringToValue(String val){\n\t}*/\n\t\tbyte []md5Hash = mDigest.digest(sBytes);\n\t\tGet g = new Get(md5Hash);\n\t\t\tif (crtIndex == HBPrefixMatchSchema.OFFSETS[currentTableIndex][2]){//for the Object position\n\tfinal private byte []buildRangeScanKeyFromQuad(Value []quad) throws IOException, NumericalRangeException, ElementNotFoundException\n\t\tcurrentPattern = \"\";\n\t\tkeySize = 0;\n\t\tspocOffsetMap.clear();\n\t\t\n\t\tArrayList<Get> string2IdGets = buildString2IdGets(quad);\t\n\t\tcurrentTableIndex = pattern2Table.get(currentPattern);\n\t\t\n\t\t//Query the String2Id table\n\t\tlong start = System.currentTimeMillis();\n\t\tHTableInterface table = con.getTable(HBPrefixMatchSchema.STRING2ID+schemaSuffix);\n\t\tResult []results = table.get(string2IdGets);\n\t\ttable.close();\n\t\tstring2IdOverhead += System.currentTimeMillis()-start;\n\t\t\n\t\treturn buildRangeScanKeyFromResults(results);\n\t}\n\n\tfinal private byte[] buildRangeScanKeyFromResults(Result[] results) throws ElementNotFoundException {\n\t\tbyte []key = new byte[keySize];\n\t\tfor (Result result : results) {\n\t\t\t\n\t\t\tbyte []value = result.getValue(HBPrefixMatchSchema.COLUMN_FAMILY, HBPrefixMatchSchema.COLUMN_NAME);\n\t\t\tif (value == null){\n\t\t\t\tthrow new ElementNotFoundException(\"Quad element could not be found: \"+new String(result.getRow())+\"\\n\"+hexaString(result.getRow()));\n\t\t\t}\n\t\t\t\n\t\t\tint spocIndex = spocOffsetMap.get(new ByteArray(result.getRow()));\n\t\t\tint offset = HBPrefixMatchSchema.OFFSETS[currentTableIndex][spocIndex];\n\t\t\t\n\t\t\tif (spocIndex == 2)\n\t\t\t\tBytes.putBytes(key, offset+1, value, 0, value.length);\n\t\t\telse\n\t\t\t\tBytes.putBytes(key, offset, value, 0, value.length);\n\t\t}\t\n\t\tif (numericalElement != null){\n\t\t\tBytes.putBytes(key, HBPrefixMatchSchema.OFFSETS[currentTableIndex][2], numericalElement, 0, numericalElement.length);\n\t\t}\n\t\treturn key;\n\t}\n\n\tprivate ArrayList<Get> buildString2IdGets(Value[] quad) throws UnsupportedEncodingException, NumericalRangeException {\n\t\tArrayList<Get> string2IdGets = new ArrayList<Get>();\n\t\t\n\t\tnumericalElement = null;\n\t\t\t\tcurrentPattern += \"?\";\n\t\t\t\tcurrentPattern += \"|\";\n\t\t\t\t\tsBytes = quad[i].toString().getBytes(\"UTF-8\");\n\t\t\t\telse{//Object\n\t\t\t\t\t\t\t\tnumericalElement = id.getBytes();\n\t\t\t\t\t\tsBytes = lString.getBytes(\"UTF-8\");\t\t\t\t\t\n\t\t\t\t\telse{//bNode or URI\n\t\t\t\t\t\tsBytes = quad[i].toString().getBytes(\"UTF-8\");\n\t\t\t\t//byte []reverseString = StringIdAssoc.reverseBytes(sBytes, sBytes.length);\n\t\t\t\tbyte []md5Hash = mDigest.digest(sBytes);\n\t\t\t\tGet g = new Get(md5Hash);\n\t\t\t\tstring2IdGets.add(g);\n\t\t\t\tspocOffsetMap.put(new ByteArray(md5Hash), i);\n\t\treturn string2IdGets;", "new_methods": [ { "arguments": [], "filename": "src/main/java/nl/vu/datalayer/hbase/util/HBPrefixMatchUtil.java", "implementation": "throws IOException {//we expect the pattern in the order SPOC\t\n\t\t\tretrievalInit();\n\t\t\tlong start = System.currentTimeMillis();\n\t\t\tbyte[] startKey = buildRangeScanKeyFromQuad(quad);\n\t\t\tlong keyBuildOverhead = System.currentTimeMillis()-start;\n\t\t\tlong startSearch = System.currentTimeMillis();\n\t\t\tArrayList<Get> batchIdGets = doRangeScan(startKey);\n\t\t\tstart = System.currentTimeMillis();\n\t\t\tResult[] id2StringResults = doBatchId2String(batchIdGets);\n\t\t\tSystem.out.println(\"Search time: \"+searchTime+\"; Id2StringOverhead: \"+id2StringOverhead+\"; String2IdOverhead: \"\n\t\t\t\t\t\t\t\t\t+string2IdOverhead+\"; KeyBuildOverhead: \"+keyBuildOverhead);\n\t\t\tupdateId2ValueMap(id2StringResults);\t\t\t\n\t\t\treturn buildSPOCOrderResults();\n\t\t\n\t\t\tSystem.err.println(\"Bound variable numerical not in expected range: \"+e.getMessage());\n\t\t\treturn null;", "signature": "void buildPattern2TableHashMap()" }, { "arguments": [ "ArrayList<Value> newQuadResult" ], "filename": "src/main/java/nl/vu/datalayer/hbase/util/HBPrefixMatchUtil.java", "implementation": "for (int i = 0, j = 0; i<newQuadResult.size() && j<boundElements.size(); i++) {\n\t\t\tif (newQuadResult.get(i) == null){\n\t\t\t\tnewQuadResult.set(i, boundElements.get(j++));", "signature": "void fillInBoundElements(ArrayList<Value> newQuadResult)" }, { "arguments": [ "int queryElemNo", " ArrayList<ByteArray> quadList", " ArrayList<Value> newQuadResult" ], "filename": "src/main/java/nl/vu/datalayer/hbase/util/HBPrefixMatchUtil.java", "implementation": "for (int i = 0; i < quadList.size(); i++) {\n\t\t\tif ((i+queryElemNo) == HBPrefixMatchSchema.ORDER[currentTableIndex][2] && \n\t\t\t\t\tTypedId.getType(quadList.get(i).getBytes()[0]) == TypedId.NUMERICAL){\n\t\t\t\t//handle numericals\n\t\t\t\tTypedId id = new TypedId(quadList.get(i).getBytes());\n\t\t\t\tnewQuadResult.set(2, id.toLiteral());", "signature": "void fillInUnboundElements(int queryElemNo, ArrayList<ByteArray> quadList, ArrayList<Value> newQuadResult)" }, { "arguments": [], "filename": "src/main/java/nl/vu/datalayer/hbase/util/HBPrefixMatchUtil.java", "implementation": "id2ValueMap.clear();\n\t\tquadResults.clear();\n\t\tboundElements.clear();\n\t\tid2StringOverhead = 0;\n\t\tstring2IdOverhead = 0;", "signature": "void retrievalInit()" }, { "arguments": [ "String val" ], "filename": "src/main/java/nl/vu/datalayer/hbase/util/HBPrefixMatchUtil.java", "implementation": "", "signature": "Value convertStringToValue(String val)" } ], "old_code": "import nl.vu.datalayer.hbase.bulkload.StringIdAssoc;\nimport nl.vu.datalayer.hbase.id.NumericalRangeException;\n\tprivate int tableIndex;\n\t\tbuildHashMap();\n\tprivate void buildHashMap(){\n\t\t\tthrows IOException {//we expect the pattern in the order SPOC\n\t\t\n\t\t\tid2ValueMap.clear();\n\t\t\tquadResults.clear();\n\t\t\tboundElements.clear();\n\t\t\tid2StringOverhead = 0;\n\t\t\tbyte[] startKey = buildKey(quad);\n\t\t\tif (startKey == null) {\n\t\t\t\treturn new ArrayList<ArrayList<Value>>();\n\t\t\t}\n\n\t\t\t//start search in the quad tables\n\t\t\tlong startSearch = System.currentTimeMillis();\n\t\t\tFilter prefixFilter = new PrefixFilter(startKey);\n\t\t\tFilter keyOnlyFilter = new KeyOnlyFilter();\n\t\t\tFilter filterList = new FilterList(FilterList.Operator.MUST_PASS_ALL, prefixFilter, keyOnlyFilter);\n\t\t\tScan scan = new Scan(startKey, filterList);\n\t\t\tscan.setCaching(100);\n\n\t\t\tString tableName = HBPrefixMatchSchema.TABLE_NAMES[tableIndex]+schemaSuffix;\n\t\t\tHTableInterface table = con.getTable(tableName);\n\t\t\tResultScanner results = table.getScanner(scan);\n\n\t\t\tResult r = null;\n\t\t\tint sizeOfInterest = HBPrefixMatchSchema.KEY_LENGTH - startKey.length;\n\t\t\tHTableInterface id2StringTable = con.getTable(HBPrefixMatchSchema.ID2STRING+schemaSuffix);\n\t\t\tArrayList<Get> batchGets = new ArrayList<Get>();\n\t\t\twhile ((r = results.next()) != null) {\n\t\t\t\tparseKey(r.getRow(), startKey.length, sizeOfInterest, batchGets);\n\t\t\t}\n\t\t\tresults.close();\n\t\t\ttable.close();\n\t\t\tlong start = System.currentTimeMillis();\n\t\t\tResult []id2StringResults = id2StringTable.get(batchGets);\n\t\t\tid2StringTable.close();\n\t\t\t//System.out.println(\"Search time: \"+searchTime+\"; Id2StringOverhead: \"+id2StringOverhead+\"; String2IdOverhead: \"+string2IdOverhead);\n\t\t\t//update the internal mapping between ids and strings\n\t\t\tfor (Result result : id2StringResults) {\n\t\t\t\tbyte []rowVal = result.getValue(HBPrefixMatchSchema.COLUMN_FAMILY, HBPrefixMatchSchema.COLUMN_NAME);\n\t\t\t\tbyte []rowKey = result.getRow();\n\t\t\t\tif (rowVal == null || rowKey == null){\n\t\t\t\t\tSystem.err.println(\"Id not found: \"+(rowKey == null ? null : hexaString(rowKey)));\n\t\t\t\t}\n\t\t\t\telse{\n\t\t\t\t\tValue val = convertStringToValue(new String(rowVal));\n\t\t\t\t\tid2ValueMap.put(new ByteArray(rowKey), val);\n\t\t\t\t}\n\t\t\t}\t\t\t\n\t\t\t\n\t\t\tint queryElemNo = boundElements.size();\n\t\t\t// build the quads in SPOC order using strings\n\t\t\tArrayList<ArrayList<Value>> ret = new ArrayList<ArrayList<Value>>();\n\t\t\t\n\t\t\tfor (ArrayList<ByteArray> quadList : quadResults) {\n\t\t\t\t//ArrayList<String> newList = new ArrayList<String>(quadList.size());\n\t\t\t\t\n\t\t\t\tArrayList<Value> newQuadResult = new ArrayList<Value>(4);\n\t\t\t\tnewQuadResult.addAll(Arrays.asList(new Value[]{null, null, null, null}));\t\t\t\n\t\t\t\t\n\t\t\t\t//fill in unbound elements\n\t\t\t\tfor (int i = 0; i < quadList.size(); i++) {\n\t\t\t\t\tif ((i+queryElemNo) == HBPrefixMatchSchema.ORDER[tableIndex][2] && \n\t\t\t\t\t\t\tTypedId.getType(quadList.get(i).getBytes()[0]) == TypedId.NUMERICAL){\n\t\t\t\t\t\t//handle numerical\n\t\t\t\t\t\tTypedId id = new TypedId(quadList.get(i).getBytes());\n\t\t\t\t\t\tnewQuadResult.set(2, id.toLiteral());\n\t\t\t\t\t}\n\t\t\t\t\telse{\n\t\t\t\t\t\tnewQuadResult.set(HBPrefixMatchSchema.TO_SPOC_ORDER[tableIndex][(i+queryElemNo)], id2ValueMap.get(quadList.get(i)));\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t\t\t\n\t\t\t\t//fill in bound elements\n\t\t\t\tfor (int i = 0, j = 0; i<newQuadResult.size() && j<boundElements.size(); i++) {\n\t\t\t\t\tif (newQuadResult.get(i) == null){\n\t\t\t\t\t\tnewQuadResult.set(i, boundElements.get(j++));\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t\t\n\t\t\t\tret.add(newQuadResult);\n\t\t\t}\n\t\t\t\n\t\t\treturn ret;\n\t\t\te.printStackTrace();\n\tpublic Value convertStringToValue(String val){\n\t}\n\t\tbyte []key = StringIdAssoc.reverseBytes(sBytes, sBytes.length);\n\t\tGet g = new Get(key);\n\t\t\tif (crtIndex == HBPrefixMatchSchema.OFFSETS[tableIndex][2]){//for the Object position\n\tprivate byte []buildKey(Value []quad) throws IOException, NumericalRangeException\n\t\tString pattern = \"\";\n\t\tint keySize = 0;\n\t\tArrayList<Get> string2Ids = new ArrayList<Get>();\n\t\tArrayList<Integer> offsets = new ArrayList<Integer>();\n\t\tbyte []numerical = null;\n\t\t\t\tpattern += \"?\";\n\t\t\t\tpattern += \"|\";\n\t\t\t\t\tsBytes = quad[i].toString().getBytes();\n\t\t\t\telse{\n\t\t\t\t\t\t\t\tnumerical = id.getBytes();\n\t\t\t\t\t\tsBytes = lString.getBytes();\t\t\t\t\t\n\t\t\t\t\telse{\n\t\t\t\t\t\tString elem = quad[i].toString();\n\t\t\t\t\t\tsBytes = elem.getBytes();\n\t\t\t\tbyte []reverseString = StringIdAssoc.reverseBytes(sBytes, sBytes.length);\n\t\t\t\tGet g = new Get(reverseString);\n\t\t\t\tstring2Ids.add(g);\n\t\t\t\toffsets.add(i);\n\t\t\t}\n\t\t}\n\t\t\n\t\ttableIndex = pattern2Table.get(pattern);\n\t\t\n\t\t//HTable table = con.getTable(HBPrefixMatchSchema.STRING2ID);\n\t\tHTableInterface table = con.getTable(HBPrefixMatchSchema.STRING2ID+schemaSuffix);\n\t\t\n\t\tbyte []key = new byte[keySize];\n\t\tfor (int i=0; i<string2Ids.size(); i++) {\n\t\t\tGet get = string2Ids.get(i);\n\t\t\t\n\t\t\tlong start = System.currentTimeMillis();\n\t\t\tResult result = table.get(get);\n\t\t\tbyte []value = result.getValue(HBPrefixMatchSchema.COLUMN_FAMILY, HBPrefixMatchSchema.COLUMN_NAME);\n\t\t\tstring2IdOverhead += System.currentTimeMillis()-start;\n\t\t\t\n\t\t\tif (value == null){\n\t\t\t\tSystem.err.println(\"Quad element could not be found: \"+new String(get.getRow())+\"\\n\"+hexaString(get.getRow()));\n\t\t\t\treturn null;\n\t\t\t\n\t\t\tint spocIndex = offsets.get(i);\n\t\t\tint offset = HBPrefixMatchSchema.OFFSETS[tableIndex][spocIndex];\n\t\t\t\n\t\t\tif (spocIndex == 2)\n\t\t\t\tBytes.putBytes(key, offset+1, value, 0, value.length);\n\t\t\telse\n\t\t\t\tBytes.putBytes(key, offset, value, 0, value.length);\n\t\t}\t\n\t\ttable.close();\n\t\tif (numerical != null){\n\t\t\tBytes.putBytes(key, HBPrefixMatchSchema.OFFSETS[tableIndex][2], numerical, 0, numerical.length);\n\t\treturn key;", "old_methods": [ { "arguments": [], "filename": "src/main/java/nl/vu/datalayer/hbase/util/HBPrefixMatchUtil.java", "implementation": "throws IOException {//we expect the pattern in the order SPOC\n\t\t\n\t\t\tid2ValueMap.clear();\n\t\t\tquadResults.clear();\n\t\t\tboundElements.clear();\n\t\t\tid2StringOverhead = 0;\n\t\t\tbyte[] startKey = buildKey(quad);\n\t\t\tif (startKey == null) {\n\t\t\t\treturn new ArrayList<ArrayList<Value>>();", "signature": "void buildHashMap()" }, { "arguments": [ "Result result : id2StringResults" ], "filename": "src/main/java/nl/vu/datalayer/hbase/util/HBPrefixMatchUtil.java", "implementation": "byte []rowVal = result.getValue(HBPrefixMatchSchema.COLUMN_FAMILY, HBPrefixMatchSchema.COLUMN_NAME);\n\t\t\t\tbyte []rowKey = result.getRow();\n\t\t\t\tif (rowVal == null || rowKey == null){\n\t\t\t\t\tSystem.err.println(\"Id not found: \"+(rowKey == null ? null : hexaString(rowKey)));", "signature": "strings\n\t\t\tfor (Result result : id2StringResults)" }, { "arguments": [ "String val" ], "filename": "src/main/java/nl/vu/datalayer/hbase/util/HBPrefixMatchUtil.java", "implementation": "", "signature": "Value convertStringToValue(String val)" } ], "patch": "@@ -1,16 +1,22 @@\n package nl.vu.datalayer.hbase.util;\n \n+import java.io.ByteArrayInputStream;\n+import java.io.DataInputStream;\n import java.io.FileInputStream;\n import java.io.IOException;\n+import java.io.UnsupportedEncodingException;\n+import java.security.MessageDigest;\n+import java.security.NoSuchAlgorithmException;\n import java.util.ArrayList;\n import java.util.Arrays;\n import java.util.HashMap;\n import java.util.Properties;\n \n-import nl.vu.datalayer.hbase.bulkload.StringIdAssoc;\n import nl.vu.datalayer.hbase.connection.HBaseConnection;\n+import nl.vu.datalayer.hbase.exceptions.ElementNotFoundException;\n+import nl.vu.datalayer.hbase.exceptions.NumericalRangeException;\n import nl.vu.datalayer.hbase.id.BaseId;\n-import nl.vu.datalayer.hbase.id.NumericalRangeException;\n+import nl.vu.datalayer.hbase.id.HBaseValue;\n import nl.vu.datalayer.hbase.id.TypedId;\n import nl.vu.datalayer.hbase.schema.HBPrefixMatchSchema;\n \n@@ -47,7 +53,7 @@ public class HBPrefixMatchUtil implements IHBaseUtil {\n \t/**\n \t * Internal use: the index of the table used for retrieval\n \t */\n-\tprivate int tableIndex;\n+\tprivate int currentTableIndex;\n \t\n \t/**\n \t * Variable storing time for the overhead of id2StringMap mappings upon retrieval\n@@ -59,6 +65,9 @@ public class HBPrefixMatchUtil implements IHBaseUtil {\n \t */\n \tprivate long string2IdOverhead = 0;\n \t\n+\t/**\n+\t * Internal map that stores associations between Ids in the results and the corresponding Value objects\n+\t */\n \tprivate HashMap<ByteArray, Value> id2ValueMap;\n \t\n \tprivate ArrayList<ArrayList<ByteArray>> quadResults;\n@@ -68,12 +77,22 @@ public class HBPrefixMatchUtil implements IHBaseUtil {\n \tprivate ValueFactory valueFactory;\n \t\n \tprivate String schemaSuffix;\n+\t\n+\tprivate MessageDigest mDigest;\n+\n+\tprivate int keySize;\n+\n+\tprivate byte [] numericalElement;\n+\n+\tprivate String currentPattern;\n+\n+\tprivate HashMap<ByteArray, Integer> spocOffsetMap = new HashMap<ByteArray, Integer>();\n \n \tpublic HBPrefixMatchUtil(HBaseConnection con) {\n \t\tsuper();\n \t\tthis.con = con;\n \t\tpattern2Table = new HashMap<String, Integer>(16);\n-\t\tbuildHashMap();\n+\t\tbuildPattern2TableHashMap();\n \t\tid2ValueMap = new HashMap<ByteArray, Value>();\n \t\tquadResults = new ArrayList<ArrayList<ByteArray>>();\n \t\tboundElements = new ArrayList<Value>();\n@@ -87,9 +106,14 @@ public HBPrefixMatchUtil(HBaseConnection con) {\n \t\t\t//continue to use the default properties\n \t\t}\n \t\tschemaSuffix = prop.getProperty(HBPrefixMatchSchema.SUFFIX_PROPERTY, \"\");\t\n+\t\ttry {\n+\t\t\tmDigest = MessageDigest.getInstance(\"MD5\");\n+\t\t} catch (NoSuchAlgorithmException e) {\n+\t\t\te.printStackTrace();\n+\t\t}\n \t}\n \t\n-\tprivate void buildHashMap(){\n+\tprivate void buildPattern2TableHashMap(){\n \t\tpattern2Table.put(\"????\", HBPrefixMatchSchema.SPOC);\n \t\tpattern2Table.put(\"|???\", HBPrefixMatchSchema.SPOC);\n \t\tpattern2Table.put(\"||??\", HBPrefixMatchSchema.SPOC);\n@@ -120,105 +144,141 @@ public ArrayList<ArrayList<String>> getRow(String[] quad){\n \t\n \t@Override\n \tpublic ArrayList<ArrayList<Value>> getResults(Value[] quad)\n-\t\t\tthrows IOException {//we expect the pattern in the order SPOC\n-\t\t\n+\t\t\tthrows IOException {//we expect the pattern in the order SPOC\t\n \t\ttry {\n-\t\t\tid2ValueMap.clear();\n-\t\t\tquadResults.clear();\n-\t\t\tboundElements.clear();\n-\t\t\tid2StringOverhead = 0;\n-\t\t\tbyte[] startKey = buildKey(quad);\n-\t\t\tif (startKey == null) {\n-\t\t\t\treturn new ArrayList<ArrayList<Value>>();\n-\t\t\t}\n-\n-\t\t\t//start search in the quad tables\n-\t\t\tlong startSearch = System.currentTimeMillis();\n-\t\t\tFilter prefixFilter = new PrefixFilter(startKey);\n-\t\t\tFilter keyOnlyFilter = new KeyOnlyFilter();\n-\t\t\tFilter filterList = new FilterList(FilterList.Operator.MUST_PASS_ALL, prefixFilter, keyOnlyFilter);\n+\t\t\tretrievalInit();\n \t\t\t\n-\t\t\tScan scan = new Scan(startKey, filterList);\n-\t\t\tscan.setCaching(100);\n-\n-\t\t\tString tableName = HBPrefixMatchSchema.TABLE_NAMES[tableIndex]+schemaSuffix;\n-\t\t\tHTableInterface table = con.getTable(tableName);\n-\t\t\tResultScanner results = table.getScanner(scan);\n-\n-\t\t\tResult r = null;\n-\t\t\tint sizeOfInterest = HBPrefixMatchSchema.KEY_LENGTH - startKey.length;\n-\t\t\tHTableInterface id2StringTable = con.getTable(HBPrefixMatchSchema.ID2STRING+schemaSuffix);\n+\t\t\tlong start = System.currentTimeMillis();\n+\t\t\tbyte[] startKey = buildRangeScanKeyFromQuad(quad);\n+\t\t\tlong keyBuildOverhead = System.currentTimeMillis()-start;\n \n-\t\t\tArrayList<Get> batchGets = new ArrayList<Get>();\n-\t\t\twhile ((r = results.next()) != null) {\n-\t\t\t\tparseKey(r.getRow(), startKey.length, sizeOfInterest, batchGets);\n-\t\t\t}\n-\t\t\tresults.close();\n-\t\t\ttable.close();\n+\t\t\tlong startSearch = System.currentTimeMillis();\n+\t\t\tArrayList<Get> batchIdGets = doRangeScan(startKey);\n \t\t\tlong searchTime = System.currentTimeMillis() - startSearch;\n \n-\t\t\tlong start = System.currentTimeMillis();\n-\t\t\tResult []id2StringResults = id2StringTable.get(batchGets);\n-\t\t\tid2StringTable.close();\n+\t\t\tstart = System.currentTimeMillis();\n+\t\t\tResult[] id2StringResults = doBatchId2String(batchIdGets);\n \t\t\tid2StringOverhead = System.currentTimeMillis()-start;\n \t\t\t\n-\t\t\t//System.out.println(\"Search time: \"+searchTime+\"; Id2StringOverhead: \"+id2StringOverhead+\"; String2IdOverhead: \"+string2IdOverhead);\n+\t\t\tSystem.out.println(\"Search time: \"+searchTime+\"; Id2StringOverhead: \"+id2StringOverhead+\"; String2IdOverhead: \"\n+\t\t\t\t\t\t\t\t\t+string2IdOverhead+\"; KeyBuildOverhead: \"+keyBuildOverhead);\n \t\t\t\n-\t\t\t//update the internal mapping between ids and strings\n-\t\t\tfor (Result result : id2StringResults) {\n-\t\t\t\tbyte []rowVal = result.getValue(HBPrefixMatchSchema.COLUMN_FAMILY, HBPrefixMatchSchema.COLUMN_NAME);\n-\t\t\t\tbyte []rowKey = result.getRow();\n-\t\t\t\tif (rowVal == null || rowKey == null){\n-\t\t\t\t\tSystem.err.println(\"Id not found: \"+(rowKey == null ? null : hexaString(rowKey)));\n-\t\t\t\t}\n-\t\t\t\telse{\n-\t\t\t\t\tValue val = convertStringToValue(new String(rowVal));\n-\t\t\t\t\tid2ValueMap.put(new ByteArray(rowKey), val);\n-\t\t\t\t}\n-\t\t\t}\t\t\t\n-\t\t\t\n-\t\t\tint queryElemNo = boundElements.size();\n-\t\t\t// build the quads in SPOC order using strings\n-\t\t\tArrayList<ArrayList<Value>> ret = new ArrayList<ArrayList<Value>>();\n-\t\t\t\n-\t\t\tfor (ArrayList<ByteArray> quadList : quadResults) {\n-\t\t\t\t//ArrayList<String> newList = new ArrayList<String>(quadList.size());\n-\t\t\t\t\n-\t\t\t\tArrayList<Value> newQuadResult = new ArrayList<Value>(4);\n-\t\t\t\tnewQuadResult.addAll(Arrays.asList(new Value[]{null, null, null, null}));\t\t\t\n-\t\t\t\t\n-\t\t\t\t//fill in unbound elements\n-\t\t\t\tfor (int i = 0; i < quadList.size(); i++) {\n-\t\t\t\t\tif ((i+queryElemNo) == HBPrefixMatchSchema.ORDER[tableIndex][2] && \n-\t\t\t\t\t\t\tTypedId.getType(quadList.get(i).getBytes()[0]) == TypedId.NUMERICAL){\n-\t\t\t\t\t\t//handle numerical\n-\t\t\t\t\t\tTypedId id = new TypedId(quadList.get(i).getBytes());\n-\t\t\t\t\t\tnewQuadResult.set(2, id.toLiteral());\n-\t\t\t\t\t}\n-\t\t\t\t\telse{\n-\t\t\t\t\t\tnewQuadResult.set(HBPrefixMatchSchema.TO_SPOC_ORDER[tableIndex][(i+queryElemNo)], id2ValueMap.get(quadList.get(i)));\n-\t\t\t\t\t}\n-\t\t\t\t}\n-\t\t\t\t\t\n-\t\t\t\t//fill in bound elements\n-\t\t\t\tfor (int i = 0, j = 0; i<newQuadResult.size() && j<boundElements.size(); i++) {\n-\t\t\t\t\tif (newQuadResult.get(i) == null){\n-\t\t\t\t\t\tnewQuadResult.set(i, boundElements.get(j++));\n-\t\t\t\t\t}\n-\t\t\t\t}\n-\t\t\t\t\n-\t\t\t\tret.add(newQuadResult);\n-\t\t\t}\n-\t\t\t\n-\t\t\treturn ret;\n+\t\t\tupdateId2ValueMap(id2StringResults);\t\t\t\n \t\t\t\n+\t\t\treturn buildSPOCOrderResults();\n+\t\t\n \t\t} catch (NumericalRangeException e) {\n-\t\t\te.printStackTrace();\n+\t\t\tSystem.err.println(\"Bound variable numerical not in expected range: \"+e.getMessage());\n+\t\t\treturn null;\n+\t\t} catch (ElementNotFoundException e) {\n+\t\t\tSystem.err.println(e.getMessage());\n \t\t\treturn null;\n \t\t}\n \t}\n+\n+\tfinal private ArrayList<ArrayList<Value>> buildSPOCOrderResults() {\n+\t\tint queryElemNo = boundElements.size();\n+\t\tArrayList<ArrayList<Value>> ret = new ArrayList<ArrayList<Value>>();\n+\t\t\n+\t\tfor (ArrayList<ByteArray> quadList : quadResults) {\n+\t\t\tArrayList<Value> newQuadResult = new ArrayList<Value>(4);\n+\t\t\tnewQuadResult.addAll(Arrays.asList(new Value[]{null, null, null, null}));\t\t\t\n+\t\t\t\n+\t\t\tfillInUnboundElements(queryElemNo, quadList, newQuadResult);\t\t\n+\t\t\tfillInBoundElements(newQuadResult);\n+\t\t\t\n+\t\t\tret.add(newQuadResult);\n+\t\t}\n+\t\treturn ret;\n+\t}\n+\n+\tfinal private void fillInBoundElements(ArrayList<Value> newQuadResult) {\n+\t\tfor (int i = 0, j = 0; i<newQuadResult.size() && j<boundElements.size(); i++) {\n+\t\t\tif (newQuadResult.get(i) == null){\n+\t\t\t\tnewQuadResult.set(i, boundElements.get(j++));\n+\t\t\t}\n+\t\t}\n+\t}\n+\n+\tfinal private void fillInUnboundElements(int queryElemNo, ArrayList<ByteArray> quadList, ArrayList<Value> newQuadResult) {\n+\t\tfor (int i = 0; i < quadList.size(); i++) {\n+\t\t\tif ((i+queryElemNo) == HBPrefixMatchSchema.ORDER[currentTableIndex][2] && \n+\t\t\t\t\tTypedId.getType(quadList.get(i).getBytes()[0]) == TypedId.NUMERICAL){\n+\t\t\t\t//handle numericals\n+\t\t\t\tTypedId id = new TypedId(quadList.get(i).getBytes());\n+\t\t\t\tnewQuadResult.set(2, id.toLiteral());\n+\t\t\t}\n+\t\t\telse{\n+\t\t\t\tnewQuadResult.set(HBPrefixMatchSchema.TO_SPOC_ORDER[currentTableIndex][(i+queryElemNo)], \n+\t\t\t\t\t\tid2ValueMap.get(quadList.get(i)));\n+\t\t\t}\n+\t\t}\n+\t}\n+\n+\tfinal private void updateId2ValueMap(Result[] id2StringResults) throws IOException, ElementNotFoundException {\n+\t\tHBaseValue hbaseValue = new HBaseValue();\n+\t\tfor (Result result : id2StringResults) {\n+\t\t\tbyte []rowVal = result.getValue(HBPrefixMatchSchema.COLUMN_FAMILY, HBPrefixMatchSchema.COLUMN_NAME);\n+\t\t\tbyte []rowKey = result.getRow();\n+\t\t\tif (rowVal == null || rowKey == null){\n+\t\t\t\tthrow new ElementNotFoundException(\"Id not found in Id2String table: \"+(rowKey == null ? null : hexaString(rowKey)));\n+\t\t\t}\n+\t\t\telse{\n+\t\t\t\tByteArrayInputStream byteStream = new ByteArrayInputStream(rowVal);\n+\t\t\t\thbaseValue.readFields(new DataInputStream(byteStream));\n+\t\t\t\tValue val = hbaseValue.getUnderlyingValue();\n+\t\t\t\tid2ValueMap.put(new ByteArray(rowKey), val);\n+\t\t\t}\n+\t\t}\n+\t}\n+\n+\tfinal private Result[] doBatchId2String(ArrayList<Get> batchIdGets) throws IOException {\n+\t\tHTableInterface id2StringTable = con.getTable(HBPrefixMatchSchema.ID2STRING+schemaSuffix);\n+\t\tResult []id2StringResults = id2StringTable.get(batchIdGets);\n+\t\tid2StringTable.close();\n+\t\treturn id2StringResults;\n+\t}\n+\n+\tfinal private ArrayList<Get> doRangeScan(byte[] startKey) throws IOException {\n+\t\tFilter prefixFilter = new PrefixFilter(startKey);\n+\t\tFilter keyOnlyFilter = new KeyOnlyFilter();\n+\t\tFilter filterList = new FilterList(FilterList.Operator.MUST_PASS_ALL, prefixFilter, keyOnlyFilter);\n+\t\t\n+\t\tScan scan = new Scan(startKey, filterList);\n+\t\tscan.setCaching(100);\n+\n+\t\tString tableName = HBPrefixMatchSchema.TABLE_NAMES[currentTableIndex]+schemaSuffix;\n+\t\tSystem.out.println(\"Retrieving from table: \"+tableName);\n+\t\t\n+\t\tHTableInterface table = con.getTable(tableName);\n+\t\tResultScanner results = table.getScanner(scan);\n+\n+\t\tArrayList<Get> batchGets = parseRangeScanResults(startKey.length, results);\n+\t\ttable.close();\n+\t\treturn batchGets;\n+\t}\n+\n+\tfinal private ArrayList<Get> parseRangeScanResults(int startKeyLength, ResultScanner results) throws IOException {\n+\t\tResult r = null;\n+\t\tint sizeOfInterest = HBPrefixMatchSchema.KEY_LENGTH - startKeyLength;\n+\n+\t\tArrayList<Get> batchGets = new ArrayList<Get>();\n+\t\twhile ((r = results.next()) != null) {\n+\t\t\tparseKey(r.getRow(), startKeyLength, sizeOfInterest, batchGets);\n+\t\t}\n+\t\tresults.close();\n+\t\treturn batchGets;\n+\t}\n+\n+\tfinal private void retrievalInit() {\n+\t\tid2ValueMap.clear();\n+\t\tquadResults.clear();\n+\t\tboundElements.clear();\n+\t\tid2StringOverhead = 0;\n+\t\tstring2IdOverhead = 0;\n+\t}\n \t\n-\tpublic Value convertStringToValue(String val){\n+\t/*public Value convertStringToValue(String val){\n \t\tif (val.startsWith(\"_:\")){//bNode\n \t\t\treturn valueFactory.createBNode(val.substring(2));\n \t\t}\n@@ -243,7 +303,7 @@ else if (val.charAt(lastDQuote+1) == '^'){\n \t\t}else{//URIs\n \t\t\treturn valueFactory.createURI(val);\n \t\t}\n-\t}\n+\t}*/\n \t\n \tpublic static String hexaString(byte []b){\n \t\tString ret = \"\";\n@@ -255,9 +315,9 @@ public static String hexaString(byte []b){\n \t\n \tpublic byte []retrieveId(String s) throws IOException{\n \t\tbyte []sBytes = s.getBytes();\n-\t\tbyte []key = StringIdAssoc.reverseBytes(sBytes, sBytes.length);\n+\t\tbyte []md5Hash = mDigest.digest(sBytes);\n \t\t\n-\t\tGet g = new Get(key);\n+\t\tGet g = new Get(md5Hash);\n \t\tg.addColumn(HBPrefixMatchSchema.COLUMN_FAMILY, HBPrefixMatchSchema.COLUMN_NAME);\n \t\t\n \t\tHTableInterface table = con.getTable(HBPrefixMatchSchema.STRING2ID+schemaSuffix);\n@@ -279,7 +339,7 @@ private void parseKey(byte []key, int startIndex, int sizeOfInterest, ArrayList<\n \t\tfor (int i = 0; i < elemNo; i++) {\n \t\t\tint length;\n \t\t\tbyte [] elemKey;\n-\t\t\tif (crtIndex == HBPrefixMatchSchema.OFFSETS[tableIndex][2]){//for the Object position\n+\t\t\tif (crtIndex == HBPrefixMatchSchema.OFFSETS[currentTableIndex][2]){//for the Object position\n \t\t\t\tlength = TypedId.SIZE;\n \t\t\t\tif (TypedId.getType(key[crtIndex]) == TypedId.STRING){\n \t\t\t\t\telemKey = new byte[BaseId.SIZE];\n@@ -316,87 +376,94 @@ private void parseKey(byte []key, int startIndex, int sizeOfInterest, ArrayList<\n \t\tquadResults.add(currentQuad);\n \t}\n \t\n-\tprivate byte []buildKey(Value []quad) throws IOException, NumericalRangeException\n+\tfinal private byte []buildRangeScanKeyFromQuad(Value []quad) throws IOException, NumericalRangeException, ElementNotFoundException\n \t{\n-\t\tString pattern = \"\";\n-\t\tint keySize = 0;\n+\t\tcurrentPattern = \"\";\n+\t\tkeySize = 0;\n+\t\tspocOffsetMap.clear();\n+\t\t\n+\t\tArrayList<Get> string2IdGets = buildString2IdGets(quad);\t\n+\t\tcurrentTableIndex = pattern2Table.get(currentPattern);\n+\t\t\n+\t\t//Query the String2Id table\n+\t\tlong start = System.currentTimeMillis();\n+\t\tHTableInterface table = con.getTable(HBPrefixMatchSchema.STRING2ID+schemaSuffix);\n+\t\tResult []results = table.get(string2IdGets);\n+\t\ttable.close();\n+\t\tstring2IdOverhead += System.currentTimeMillis()-start;\n+\t\t\n+\t\treturn buildRangeScanKeyFromResults(results);\n+\t}\n+\n+\tfinal private byte[] buildRangeScanKeyFromResults(Result[] results) throws ElementNotFoundException {\n+\t\tbyte []key = new byte[keySize];\n+\t\tfor (Result result : results) {\n+\t\t\t\n+\t\t\tbyte []value = result.getValue(HBPrefixMatchSchema.COLUMN_FAMILY, HBPrefixMatchSchema.COLUMN_NAME);\n+\t\t\tif (value == null){\n+\t\t\t\tthrow new ElementNotFoundException(\"Quad element could not be found: \"+new String(result.getRow())+\"\\n\"+hexaString(result.getRow()));\n+\t\t\t}\n+\t\t\t\n+\t\t\tint spocIndex = spocOffsetMap.get(new ByteArray(result.getRow()));\n+\t\t\tint offset = HBPrefixMatchSchema.OFFSETS[currentTableIndex][spocIndex];\n+\t\t\t\n+\t\t\tif (spocIndex == 2)\n+\t\t\t\tBytes.putBytes(key, offset+1, value, 0, value.length);\n+\t\t\telse\n+\t\t\t\tBytes.putBytes(key, offset, value, 0, value.length);\n+\t\t}\t\n \t\t\n-\t\tArrayList<Get> string2Ids = new ArrayList<Get>();\n-\t\tArrayList<Integer> offsets = new ArrayList<Integer>();\n-\t\tbyte []numerical = null;\n+\t\tif (numericalElement != null){\n+\t\t\tBytes.putBytes(key, HBPrefixMatchSchema.OFFSETS[currentTableIndex][2], numericalElement, 0, numericalElement.length);\n+\t\t}\n+\t\treturn key;\n+\t}\n+\n+\tprivate ArrayList<Get> buildString2IdGets(Value[] quad) throws UnsupportedEncodingException, NumericalRangeException {\n+\t\tArrayList<Get> string2IdGets = new ArrayList<Get>();\n+\t\t\n+\t\tnumericalElement = null;\n \t\tfor (int i = 0; i < quad.length; i++) {\n \t\t\tif (quad[i] == null)\n-\t\t\t\tpattern += \"?\";\n+\t\t\t\tcurrentPattern += \"?\";\n \t\t\telse{\n-\t\t\t\tpattern += \"|\";\n+\t\t\t\tcurrentPattern += \"|\";\n \t\t\t\tboundElements.add(quad[i]);\n \t\t\t\t\n \t\t\t\tbyte []sBytes;\n \t\t\t\tif (i != 2){//not Object\n \t\t\t\t\tkeySize += BaseId.SIZE;\t\t\n-\t\t\t\t\tsBytes = quad[i].toString().getBytes();\n+\t\t\t\t\tsBytes = quad[i].toString().getBytes(\"UTF-8\");\n \t\t\t\t}\n-\t\t\t\telse{\n+\t\t\t\telse{//Object\n \t\t\t\t\tkeySize += TypedId.SIZE;\n \t\t\t\t\tif (quad[i] instanceof Literal){//literal\n \t\t\t\t\t\tLiteral l = (Literal)quad[i];\n \t\t\t\t\t\tif (l.getDatatype() != null){\n \t\t\t\t\t\t\tTypedId id = TypedId.createNumerical(l);\n \t\t\t\t\t\t\tif (id != null){\n-\t\t\t\t\t\t\t\tnumerical = id.getBytes();\n+\t\t\t\t\t\t\t\tnumericalElement = id.getBytes();\n \t\t\t\t\t\t\t\tcontinue;\n \t\t\t\t\t\t\t}\n \t\t\t\t\t\t}\n \t\t\t\t\t\tString lString = l.toString();\n-\t\t\t\t\t\tsBytes = lString.getBytes();\t\t\t\t\t\n+\t\t\t\t\t\tsBytes = lString.getBytes(\"UTF-8\");\t\t\t\t\t\n \t\t\t\t\t}\n-\t\t\t\t\telse{\n-\t\t\t\t\t\tString elem = quad[i].toString();\n-\t\t\t\t\t\tsBytes = elem.getBytes();\n+\t\t\t\t\telse{//bNode or URI\n+\t\t\t\t\t\tsBytes = quad[i].toString().getBytes(\"UTF-8\");\n \t\t\t\t\t}\n \t\t\t\t}\n \t\t\t\t\n-\t\t\t\tbyte []reverseString = StringIdAssoc.reverseBytes(sBytes, sBytes.length);\n-\t\t\t\tGet g = new Get(reverseString);\n+\t\t\t\t//byte []reverseString = StringIdAssoc.reverseBytes(sBytes, sBytes.length);\n+\t\t\t\tbyte []md5Hash = mDigest.digest(sBytes);\n+\t\t\t\tGet g = new Get(md5Hash);\n \t\t\t\tg.addColumn(HBPrefixMatchSchema.COLUMN_FAMILY, HBPrefixMatchSchema.COLUMN_NAME);\n-\t\t\t\tstring2Ids.add(g);\n-\t\t\t\toffsets.add(i);\n-\t\t\t}\n-\t\t}\n-\t\t\n-\t\ttableIndex = pattern2Table.get(pattern);\n-\t\t\n-\t\t//HTable table = con.getTable(HBPrefixMatchSchema.STRING2ID);\n-\t\tHTableInterface table = con.getTable(HBPrefixMatchSchema.STRING2ID+schemaSuffix);\n-\t\t\n-\t\tbyte []key = new byte[keySize];\n-\t\tfor (int i=0; i<string2Ids.size(); i++) {\n-\t\t\tGet get = string2Ids.get(i);\n-\t\t\t\n-\t\t\tlong start = System.currentTimeMillis();\n-\t\t\tResult result = table.get(get);\n-\t\t\tbyte []value = result.getValue(HBPrefixMatchSchema.COLUMN_FAMILY, HBPrefixMatchSchema.COLUMN_NAME);\n-\t\t\tstring2IdOverhead += System.currentTimeMillis()-start;\n-\t\t\t\n-\t\t\tif (value == null){\n-\t\t\t\tSystem.err.println(\"Quad element could not be found: \"+new String(get.getRow())+\"\\n\"+hexaString(get.getRow()));\n-\t\t\t\treturn null;\n+\t\t\t\tstring2IdGets.add(g);\n+\t\t\t\tspocOffsetMap.put(new ByteArray(md5Hash), i);\n \t\t\t}\n-\t\t\t\n-\t\t\tint spocIndex = offsets.get(i);\n-\t\t\tint offset = HBPrefixMatchSchema.OFFSETS[tableIndex][spocIndex];\n-\t\t\t\n-\t\t\tif (spocIndex == 2)\n-\t\t\t\tBytes.putBytes(key, offset+1, value, 0, value.length);\n-\t\t\telse\n-\t\t\t\tBytes.putBytes(key, offset, value, 0, value.length);\n-\t\t}\t\n-\t\ttable.close();\n-\t\tif (numerical != null){\n-\t\t\tBytes.putBytes(key, HBPrefixMatchSchema.OFFSETS[tableIndex][2], numerical, 0, numerical.length);\n \t\t}\n \t\t\n-\t\treturn key;\n+\t\treturn string2IdGets;\n \t}\n \n \t@Override", "raw_url": "https://github.com/pgroth/hbase-rdf/raw/cbf0cac3f03c8dffbc415eab1421234dfc3ead24/src%2Fmain%2Fjava%2Fnl%2Fvu%2Fdatalayer%2Fhbase%2Futil%2FHBPrefixMatchUtil.java", "sha": "d4e8a2428225e72009e98546539b2e513b8bcc03", "status": "modified" }, { "additions": 3, "blob_url": "https://github.com/pgroth/hbase-rdf/blob/cbf0cac3f03c8dffbc415eab1421234dfc3ead24/src%2Fmain%2Fjava%2Fnl%2Fvu%2Fdatalayer%2Fhbase%2Futil%2FIHBaseUtil.java", "changes": 5, "contents_url": "https://api.github.com/repos/pgroth/hbase-rdf/contents/src%2Fmain%2Fjava%2Fnl%2Fvu%2Fdatalayer%2Fhbase%2Futil%2FIHBaseUtil.java?ref=cbf0cac3f03c8dffbc415eab1421234dfc3ead24", "deletions": 2, "filename": "src/main/java/nl/vu/datalayer/hbase/util/IHBaseUtil.java", "new_code": "\t * @param quad - array of Value objects with null elements in un-bound positions\r\n\t * @return list of results\r\n\t * \t\t\tnull - in case of errors\r", "new_methods": [], "old_code": "\t * @param quad\r\n\t * @return\r", "old_methods": [], "patch": "@@ -18,8 +18,9 @@ public interface IHBaseUtil {\n \t/**\r\n \t * Solves a simple query in which un-bound variable are expected to be null\r\n \t * \r\n-\t * @param quad\r\n-\t * @return\r\n+\t * @param quad - array of Value objects with null elements in un-bound positions\r\n+\t * @return list of results\r\n+\t * \t\t\tnull - in case of errors\r\n \t * @throws IOException\r\n \t */\r\n \tpublic ArrayList<ArrayList<Value>> getResults(Value []quad) throws IOException;\r", "raw_url": "https://github.com/pgroth/hbase-rdf/raw/cbf0cac3f03c8dffbc415eab1421234dfc3ead24/src%2Fmain%2Fjava%2Fnl%2Fvu%2Fdatalayer%2Fhbase%2Futil%2FIHBaseUtil.java", "sha": "b6f18c4d022e7819fd92e662662b2f75233cfc00", "status": "modified" } ]
8
[ { "name": "pgroth$hbase-rdf", "new_args": "", "new_implementation": "throws IOException {//we expect the pattern in the order SPOC\t\n\t\t\tretrievalInit();\n\t\t\tlong start = System.currentTimeMillis();\n\t\t\tbyte[] startKey = buildRangeScanKeyFromQuad(quad);\n\t\t\tlong keyBuildOverhead = System.currentTimeMillis()-start;\n\t\t\tlong startSearch = System.currentTimeMillis();\n\t\t\tArrayList<Get> batchIdGets = doRangeScan(startKey);\n\t\t\tstart = System.currentTimeMillis();\n\t\t\tResult[] id2StringResults = doBatchId2String(batchIdGets);\n\t\t\tSystem.out.println(\"Search time: \"+searchTime+\"; Id2StringOverhead: \"+id2StringOverhead+\"; String2IdOverhead: \"\n\t\t\t\t\t\t\t\t\t+string2IdOverhead+\"; KeyBuildOverhead: \"+keyBuildOverhead);\n\t\t\tupdateId2ValueMap(id2StringResults);\t\t\t\n\t\t\treturn buildSPOCOrderResults();\n\t\t\n\t\t\tSystem.err.println(\"Bound variable numerical not in expected range: \"+e.getMessage());\n\t\t\treturn null;", "new_return_type": "void", "new_signature": "void buildPattern2TableHashMap()", "old_args": "", "old_implementation": "throws IOException {//we expect the pattern in the order SPOC\n\t\t\n\t\t\tid2ValueMap.clear();\n\t\t\tquadResults.clear();\n\t\t\tboundElements.clear();\n\t\t\tid2StringOverhead = 0;\n\t\t\tbyte[] startKey = buildKey(quad);\n\t\t\tif (startKey == null) {\n\t\t\t\treturn new ArrayList<ArrayList<Value>>();", "old_return_type": "void", "old_signature": "void buildHashMap()" } ]
1
3
cddfa1a013f7c6f02e6e496b211ac6da552641e7
[ { "name": "d3scomp$jdeeco", "new_args": "SchedulerEvent event,long delay", "new_implementation": null, "new_return_type": "void", "new_signature": "void scheduleAfter(SchedulerEvent event,long delay)", "old_args": "SchedulerEvent event,long period", "old_implementation": null, "old_return_type": "void", "old_signature": "void scheduleNow(SchedulerEvent event,long period)" }, { "name": "d3scomp$jdeeco", "new_args": "", "new_implementation": "TimeTriggerImpl timeTrigger = new TimeTriggerImpl();\n\t\treturn timeTrigger;", "new_return_type": "TimeTrigger", "new_signature": "TimeTrigger createTimeTrigger()", "old_args": "", "old_implementation": "PeriodicTriggerImpl periodicTrigger = new PeriodicTriggerImpl();\n\t\treturn periodicTrigger;", "old_return_type": "PeriodicTrigger", "old_signature": "PeriodicTrigger createPeriodicTrigger()" }, { "name": "d3scomp$jdeeco", "new_args": "", "new_implementation": null, "new_return_type": "TimeTrigger", "new_signature": "TimeTrigger getTimeTrigger()", "old_args": "", "old_implementation": null, "old_return_type": "PeriodicTrigger", "old_signature": "PeriodicTrigger getPeriodicTrigger()" }, { "name": "d3scomp$jdeeco", "new_args": "", "new_implementation": null, "new_return_type": "TimeTrigger", "new_signature": "TimeTrigger getTimeTrigger()", "old_args": "", "old_implementation": null, "old_return_type": "PeriodicTrigger", "old_signature": "PeriodicTrigger getPeriodicTrigger()" }, { "name": "d3scomp$jdeeco", "new_args": "", "new_implementation": null, "new_return_type": "TimeTrigger", "new_signature": "TimeTrigger getTimeTrigger()", "old_args": "", "old_implementation": null, "old_return_type": "PeriodicTrigger", "old_signature": "PeriodicTrigger getPeriodicTrigger()" } ]
[ { "additions": 4, "blob_url": "https://github.com/d3scomp/JDEECo/blob/cddfa1a013f7c6f02e6e496b211ac6da552641e7/jdeeco-core%2Fmodel%2FRuntimeModel.ecore", "changes": 6, "contents_url": "https://api.github.com/repos/d3scomp/JDEECo/contents/jdeeco-core%2Fmodel%2FRuntimeModel.ecore?ref=cddfa1a013f7c6f02e6e496b211ac6da552641e7", "deletions": 2, "filename": "jdeeco-core/model/RuntimeModel.ecore", "new_code": " <eClassifiers xsi:type=\"ecore:EClass\" name=\"TimeTrigger\" eSuperTypes=\"#//Trigger\">\n eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//ELong\" defaultValueLiteral=\"0\"/>\n <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"offset\" lowerBound=\"1\"\n eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//ELong\" defaultValueLiteral=\"0\"/>", "new_methods": [], "old_code": " <eClassifiers xsi:type=\"ecore:EClass\" name=\"PeriodicTrigger\" eSuperTypes=\"#//Trigger\">\n eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//ELong\"/>", "old_methods": [], "patch": "@@ -2,9 +2,11 @@\n <ecore:EPackage xmi:version=\"2.0\" xmlns:xmi=\"http://www.omg.org/XMI\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n xmlns:ecore=\"http://www.eclipse.org/emf/2002/Ecore\" name=\"runtime\" nsURI=\"http://cz.cuni.mff.d3s.deeco.model.runtime/1.0\"\n nsPrefix=\"cz.cuni.mff.d3s.deeco.model.runtime\">\n- <eClassifiers xsi:type=\"ecore:EClass\" name=\"PeriodicTrigger\" eSuperTypes=\"#//Trigger\">\n+ <eClassifiers xsi:type=\"ecore:EClass\" name=\"TimeTrigger\" eSuperTypes=\"#//Trigger\">\n <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"period\" lowerBound=\"1\"\n- eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//ELong\"/>\n+ eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//ELong\" defaultValueLiteral=\"0\"/>\n+ <eStructuralFeatures xsi:type=\"ecore:EAttribute\" name=\"offset\" lowerBound=\"1\"\n+ eType=\"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//ELong\" defaultValueLiteral=\"0\"/>\n </eClassifiers>\n <eClassifiers xsi:type=\"ecore:EClass\" name=\"Trigger\" abstract=\"true\"/>\n <eClassifiers xsi:type=\"ecore:EClass\" name=\"KnowledgeChangeTrigger\" eSuperTypes=\"#//Trigger\">", "raw_url": "https://github.com/d3scomp/JDEECo/raw/cddfa1a013f7c6f02e6e496b211ac6da552641e7/jdeeco-core%2Fmodel%2FRuntimeModel.ecore", "sha": "7ebece4fc181ad995b2f427132da1193ebc0f0c6", "status": "modified" }, { "additions": 6, "blob_url": "https://github.com/d3scomp/JDEECo/blob/cddfa1a013f7c6f02e6e496b211ac6da552641e7/jdeeco-core%2Fmodel%2FRuntimeModel.ecorediag", "changes": 8, "contents_url": "https://api.github.com/repos/d3scomp/JDEECo/contents/jdeeco-core%2Fmodel%2FRuntimeModel.ecorediag?ref=cddfa1a013f7c6f02e6e496b211ac6da552641e7", "deletions": 2, "filename": "jdeeco-core/model/RuntimeModel.ecorediag", "new_code": " <element xmi:type=\"ecore:EAttribute\" href=\"RuntimeModel.ecore#//TimeTrigger/period\"/>\n <children xmi:type=\"notation:Node\" xmi:id=\"_1r-MEI8rEeOwu4UaHkjubw\" type=\"2001\">\n <element xmi:type=\"ecore:EAttribute\" href=\"RuntimeModel.ecore#//TimeTrigger/offset\"/>\n <layoutConstraint xmi:type=\"notation:Location\" xmi:id=\"_1r-MEY8rEeOwu4UaHkjubw\"/>\n </children>\n <element xmi:type=\"ecore:EClass\" href=\"RuntimeModel.ecore#//TimeTrigger\"/>", "new_methods": [], "old_code": " <element xmi:type=\"ecore:EAttribute\" href=\"RuntimeModel.ecore#//PeriodicTrigger/period\"/>\n <element xmi:type=\"ecore:EClass\" href=\"RuntimeModel.ecore#//PeriodicTrigger\"/>", "old_methods": [], "patch": "@@ -4,9 +4,13 @@\n <children xmi:type=\"notation:Node\" xmi:id=\"_n6RFYzyaEeOBILfoZuXX_w\" type=\"4001\"/>\n <children xmi:type=\"notation:Node\" xmi:id=\"_n6RFZDyaEeOBILfoZuXX_w\" type=\"5001\">\n <children xmi:type=\"notation:Node\" xmi:id=\"_n6RscDyaEeOBILfoZuXX_w\" type=\"2001\">\n- <element xmi:type=\"ecore:EAttribute\" href=\"RuntimeModel.ecore#//PeriodicTrigger/period\"/>\n+ <element xmi:type=\"ecore:EAttribute\" href=\"RuntimeModel.ecore#//TimeTrigger/period\"/>\n <layoutConstraint xmi:type=\"notation:Location\" xmi:id=\"_n6RscTyaEeOBILfoZuXX_w\"/>\n </children>\n+ <children xmi:type=\"notation:Node\" xmi:id=\"_1r-MEI8rEeOwu4UaHkjubw\" type=\"2001\">\n+ <element xmi:type=\"ecore:EAttribute\" href=\"RuntimeModel.ecore#//TimeTrigger/offset\"/>\n+ <layoutConstraint xmi:type=\"notation:Location\" xmi:id=\"_1r-MEY8rEeOwu4UaHkjubw\"/>\n+ </children>\n <styles xmi:type=\"notation:DrawerStyle\" xmi:id=\"_n6RFZTyaEeOBILfoZuXX_w\"/>\n <styles xmi:type=\"notation:SortingStyle\" xmi:id=\"_n6RFZjyaEeOBILfoZuXX_w\"/>\n <styles xmi:type=\"notation:FilteringStyle\" xmi:id=\"_n6RFZzyaEeOBILfoZuXX_w\"/>\n@@ -17,7 +21,7 @@\n <styles xmi:type=\"notation:FilteringStyle\" xmi:id=\"_n6RFazyaEeOBILfoZuXX_w\"/>\n </children>\n <styles xmi:type=\"notation:ShapeStyle\" xmi:id=\"_n6RFYTyaEeOBILfoZuXX_w\" fontColor=\"4210752\" fontName=\"Segoe UI\" fontHeight=\"10\" fillColor=\"13761016\" lineColor=\"8421504\"/>\n- <element xmi:type=\"ecore:EClass\" href=\"RuntimeModel.ecore#//PeriodicTrigger\"/>\n+ <element xmi:type=\"ecore:EClass\" href=\"RuntimeModel.ecore#//TimeTrigger\"/>\n <layoutConstraint xmi:type=\"notation:Bounds\" xmi:id=\"_n6RFYjyaEeOBILfoZuXX_w\" x=\"48\" y=\"384\"/>\n </children>\n <children xmi:type=\"notation:Node\" xmi:id=\"_n6XzGTyaEeOBILfoZuXX_w\" type=\"1001\">", "raw_url": "https://github.com/d3scomp/JDEECo/raw/cddfa1a013f7c6f02e6e496b211ac6da552641e7/jdeeco-core%2Fmodel%2FRuntimeModel.ecorediag", "sha": "3c13cb6852dc48545b1c4b0adbbc9cb8eec6bce9", "status": "modified" }, { "additions": 5, "blob_url": "https://github.com/d3scomp/JDEECo/blob/cddfa1a013f7c6f02e6e496b211ac6da552641e7/jdeeco-core%2Fsrc%2Fcz%2Fcuni%2Fmff%2Fd3s%2Fdeeco%2Fannotations%2Fprocessor%2FAnnotationProcessor.java", "changes": 9, "contents_url": "https://api.github.com/repos/d3scomp/JDEECo/contents/jdeeco-core%2Fsrc%2Fcz%2Fcuni%2Fmff%2Fd3s%2Fdeeco%2Fannotations%2Fprocessor%2FAnnotationProcessor.java?ref=cddfa1a013f7c6f02e6e496b211ac6da552641e7", "deletions": 4, "filename": "jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/processor/AnnotationProcessor.java", "new_code": "\t\t\tTimeTrigger periodicEnsembleTrigger = createPeriodicTrigger(clazz);\n\t\t\tTimeTrigger periodicTrigger = createPeriodicTrigger(m);\n\tTimeTrigger createPeriodicTrigger(Object o)\n\t\t\t\tTimeTrigger periodicTrigger = factory.createTimeTrigger();\n\t\t\t\tperiodicTrigger.setOffset(0);", "new_methods": [], "old_code": "\t\t\tPeriodicTrigger periodicEnsembleTrigger = createPeriodicTrigger(clazz);\n\t\t\tPeriodicTrigger periodicTrigger = createPeriodicTrigger(m);\n\tPeriodicTrigger createPeriodicTrigger(Object o)\n\t\t\t\tPeriodicTrigger periodicTrigger = factory.createPeriodicTrigger();", "old_methods": [], "patch": "@@ -289,7 +289,7 @@ EnsembleDefinition createEnsembleDefinition(Class<?> clazz) throws AnnotationPro\n \t\t\tCommunicationBoundaryPredicate cBoundary = createCommunicationBoundary(clazz);\t\t\t\n \t\t\tensembleDefinition.setCommunicationBoundary(cBoundary);\n \t\t\t\n-\t\t\tPeriodicTrigger periodicEnsembleTrigger = createPeriodicTrigger(clazz);\n+\t\t\tTimeTrigger periodicEnsembleTrigger = createPeriodicTrigger(clazz);\n \t\t\tList<KnowledgeChangeTrigger> exchangeKChangeTriggers = createKnowledgeChangeTriggers(exchange.getMethod(), false);\n \t\t\tList<KnowledgeChangeTrigger> conditionKChangeTriggers = createKnowledgeChangeTriggers(condition.getMethod(), false);\n \t\t\tif (periodicEnsembleTrigger == null) {\n@@ -390,7 +390,7 @@ ComponentProcess createComponentProcess(ComponentInstance componentInstance, Met\n \t\t\tcomponentProcess.setMethod(m);\n \t\t\tcomponentProcess.setName(m.getName());\n \t\t\tcomponentProcess.getParameters().addAll(createParameters(m, true));\n-\t\t\tPeriodicTrigger periodicTrigger = createPeriodicTrigger(m);\n+\t\t\tTimeTrigger periodicTrigger = createPeriodicTrigger(m);\n \t\t\tList<KnowledgeChangeTrigger> knowledgeChangeTriggers = createKnowledgeChangeTriggers(m, true);\n \t\t\tif (periodicTrigger == null) {\n \t\t\t\tif (knowledgeChangeTriggers.isEmpty()) {\n@@ -413,7 +413,7 @@ ComponentProcess createComponentProcess(ComponentInstance componentInstance, Met\n \t * If no @{@link PeriodicScheduling} annotation is found, returns <code>null</code>.\n \t * </p>\n \t */\n-\tPeriodicTrigger createPeriodicTrigger(Object o)\n+\tTimeTrigger createPeriodicTrigger(Object o)\n \t\t\tthrows AnnotationProcessorException {\n \t\tAnnotation[] annotations = null;\n \t\tif (o instanceof Method) {\n@@ -426,8 +426,9 @@ else if (o instanceof Class<?>) {\n \t\t}\n \t\tfor (Annotation a : annotations) {\n \t\t\tif (a instanceof PeriodicScheduling) {\n-\t\t\t\tPeriodicTrigger periodicTrigger = factory.createPeriodicTrigger();\n+\t\t\t\tTimeTrigger periodicTrigger = factory.createTimeTrigger();\n \t\t\t\tperiodicTrigger.setPeriod(((PeriodicScheduling) a).value());\n+\t\t\t\tperiodicTrigger.setOffset(0);\n \t\t\t\treturn periodicTrigger;\n \t\t\t}\n \t\t}", "raw_url": "https://github.com/d3scomp/JDEECo/raw/cddfa1a013f7c6f02e6e496b211ac6da552641e7/jdeeco-core%2Fsrc%2Fcz%2Fcuni%2Fmff%2Fd3s%2Fdeeco%2Fannotations%2Fprocessor%2FAnnotationProcessor.java", "sha": "7ea3427d6c85532c5fd7f9ab95adb03f67fdf0cf", "status": "modified" }, { "additions": 3, "blob_url": "https://github.com/d3scomp/JDEECo/blob/cddfa1a013f7c6f02e6e496b211ac6da552641e7/jdeeco-core%2Fsrc%2Fcz%2Fcuni%2Fmff%2Fd3s%2Fdeeco%2Fmodel%2Fruntime%2Fcustom%2FRuntimeMetadataFactoryExt.java", "changes": 6, "contents_url": "https://api.github.com/repos/d3scomp/JDEECo/contents/jdeeco-core%2Fsrc%2Fcz%2Fcuni%2Fmff%2Fd3s%2Fdeeco%2Fmodel%2Fruntime%2Fcustom%2FRuntimeMetadataFactoryExt.java?ref=cddfa1a013f7c6f02e6e496b211ac6da552641e7", "deletions": 3, "filename": "jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/custom/RuntimeMetadataFactoryExt.java", "new_code": "import cz.cuni.mff.d3s.deeco.model.runtime.api.TimeTrigger;\n\tpublic TimeTrigger createTimeTrigger() {\n\t\treturn new TimeTriggerExt();", "new_methods": [], "old_code": "import cz.cuni.mff.d3s.deeco.model.runtime.api.PeriodicTrigger;\n\tpublic PeriodicTrigger createPeriodicTrigger() {\n\t\treturn new PeriodicTriggerExt();", "old_methods": [], "patch": "@@ -10,7 +10,7 @@\n import cz.cuni.mff.d3s.deeco.model.runtime.api.PathNodeField;\n import cz.cuni.mff.d3s.deeco.model.runtime.api.PathNodeMapKey;\n import cz.cuni.mff.d3s.deeco.model.runtime.api.PathNodeMember;\n-import cz.cuni.mff.d3s.deeco.model.runtime.api.PeriodicTrigger;\n+import cz.cuni.mff.d3s.deeco.model.runtime.api.TimeTrigger;\n import cz.cuni.mff.d3s.deeco.model.runtime.impl.RuntimeMetadataFactoryImpl;\n \n /**\n@@ -35,8 +35,8 @@ public RuntimeMetadataFactoryExt() {\n \t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.RuntimeMetadataFactoryImpl#createPeriodicTrigger()\n \t */\n \t@Override\n-\tpublic PeriodicTrigger createPeriodicTrigger() {\n-\t\treturn new PeriodicTriggerExt();\n+\tpublic TimeTrigger createTimeTrigger() {\n+\t\treturn new TimeTriggerExt();\n \t}\n \n \t/* (non-Javadoc)", "raw_url": "https://github.com/d3scomp/JDEECo/raw/cddfa1a013f7c6f02e6e496b211ac6da552641e7/jdeeco-core%2Fsrc%2Fcz%2Fcuni%2Fmff%2Fd3s%2Fdeeco%2Fmodel%2Fruntime%2Fcustom%2FRuntimeMetadataFactoryExt.java", "sha": "e9bec639f9cb2d8ea82b6bca12b452c5dffcce4f", "status": "modified" }, { "additions": 11, "blob_url": "https://github.com/d3scomp/JDEECo/blob/cddfa1a013f7c6f02e6e496b211ac6da552641e7/jdeeco-core%2Fsrc%2Fcz%2Fcuni%2Fmff%2Fd3s%2Fdeeco%2Fmodel%2Fruntime%2Fimpl%2FRuntimeMetadataFactoryImpl.java", "changes": 22, "contents_url": "https://api.github.com/repos/d3scomp/JDEECo/contents/jdeeco-core%2Fsrc%2Fcz%2Fcuni%2Fmff%2Fd3s%2Fdeeco%2Fmodel%2Fruntime%2Fimpl%2FRuntimeMetadataFactoryImpl.java?ref=cddfa1a013f7c6f02e6e496b211ac6da552641e7", "deletions": 11, "filename": "jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/impl/RuntimeMetadataFactoryImpl.java", "new_code": "\t\t\tcase RuntimeMetadataPackage.TIME_TRIGGER: return createTimeTrigger();\n\t/**\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @generated\n\t */\n\tpublic TimeTrigger createTimeTrigger() {\n\t\tTimeTriggerImpl timeTrigger = new TimeTriggerImpl();\n\t\treturn timeTrigger;\n\t}\n", "new_methods": [ { "arguments": [], "filename": "jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/impl/RuntimeMetadataFactoryImpl.java", "implementation": "TimeTriggerImpl timeTrigger = new TimeTriggerImpl();\n\t\treturn timeTrigger;", "signature": "TimeTrigger createTimeTrigger()" } ], "old_code": "\t\t\tcase RuntimeMetadataPackage.PERIODIC_TRIGGER: return createPeriodicTrigger();\n\t/**\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @generated\n\t */\n\tpublic PeriodicTrigger createPeriodicTrigger() {\n\t\tPeriodicTriggerImpl periodicTrigger = new PeriodicTriggerImpl();\n\t\treturn periodicTrigger;\n\t}\n", "old_methods": [ { "arguments": [], "filename": "jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/impl/RuntimeMetadataFactoryImpl.java", "implementation": "PeriodicTriggerImpl periodicTrigger = new PeriodicTriggerImpl();\n\t\treturn periodicTrigger;", "signature": "PeriodicTrigger createPeriodicTrigger()" } ], "patch": "@@ -67,7 +67,7 @@ public RuntimeMetadataFactoryImpl() {\n \t@Override\n \tpublic EObject create(EClass eClass) {\n \t\tswitch (eClass.getClassifierID()) {\n-\t\t\tcase RuntimeMetadataPackage.PERIODIC_TRIGGER: return createPeriodicTrigger();\n+\t\t\tcase RuntimeMetadataPackage.TIME_TRIGGER: return createTimeTrigger();\n \t\t\tcase RuntimeMetadataPackage.KNOWLEDGE_CHANGE_TRIGGER: return createKnowledgeChangeTrigger();\n \t\t\tcase RuntimeMetadataPackage.KNOWLEDGE_PATH: return createKnowledgePath();\n \t\t\tcase RuntimeMetadataPackage.PATH_NODE_FIELD: return createPathNodeField();\n@@ -136,16 +136,6 @@ public String convertToString(EDataType eDataType, Object instanceValue) {\n \t\t}\n \t}\n \n-\t/**\n-\t * <!-- begin-user-doc -->\n-\t * <!-- end-user-doc -->\n-\t * @generated\n-\t */\n-\tpublic PeriodicTrigger createPeriodicTrigger() {\n-\t\tPeriodicTriggerImpl periodicTrigger = new PeriodicTriggerImpl();\n-\t\treturn periodicTrigger;\n-\t}\n-\n \t/**\n \t * <!-- begin-user-doc -->\n \t * <!-- end-user-doc -->\n@@ -316,6 +306,16 @@ public Map.Entry<String, Object> createStringToObjectMap() {\n \t\treturn stringToObjectMap;\n \t}\n \n+\t/**\n+\t * <!-- begin-user-doc -->\n+\t * <!-- end-user-doc -->\n+\t * @generated\n+\t */\n+\tpublic TimeTrigger createTimeTrigger() {\n+\t\tTimeTriggerImpl timeTrigger = new TimeTriggerImpl();\n+\t\treturn timeTrigger;\n+\t}\n+\n \t/**\n \t * <!-- begin-user-doc -->\n \t * <!-- end-user-doc -->", "raw_url": "https://github.com/d3scomp/JDEECo/raw/cddfa1a013f7c6f02e6e496b211ac6da552641e7/jdeeco-core%2Fsrc%2Fcz%2Fcuni%2Fmff%2Fd3s%2Fdeeco%2Fmodel%2Fruntime%2Fimpl%2FRuntimeMetadataFactoryImpl.java", "sha": "3e9880b52b304762aaf5348e74d2b585872cac34", "status": "modified" }, { "additions": 42, "blob_url": "https://github.com/d3scomp/JDEECo/blob/cddfa1a013f7c6f02e6e496b211ac6da552641e7/jdeeco-core%2Fsrc%2Fcz%2Fcuni%2Fmff%2Fd3s%2Fdeeco%2Fmodel%2Fruntime%2Fimpl%2FRuntimeMetadataPackageImpl.java", "changes": 73, "contents_url": "https://api.github.com/repos/d3scomp/JDEECo/contents/jdeeco-core%2Fsrc%2Fcz%2Fcuni%2Fmff%2Fd3s%2Fdeeco%2Fmodel%2Fruntime%2Fimpl%2FRuntimeMetadataPackageImpl.java?ref=cddfa1a013f7c6f02e6e496b211ac6da552641e7", "deletions": 31, "filename": "jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/impl/RuntimeMetadataPackageImpl.java", "new_code": "import cz.cuni.mff.d3s.deeco.model.runtime.api.TimeTrigger;\n\t/**\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @generated\n\t */\n\tprivate EClass timeTriggerEClass = null;\n\n\t/**\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @generated\n\t */\n\tpublic EClass getTimeTrigger() {\n\t\treturn timeTriggerEClass;\n\t}\n\n\t/**\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @generated\n\t */\n\tpublic EAttribute getTimeTrigger_Period() {\n\t\treturn (EAttribute)timeTriggerEClass.getEStructuralFeatures().get(0);\n\t}\n\n\t/**\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @generated\n\t */\n\tpublic EAttribute getTimeTrigger_Offset() {\n\t\treturn (EAttribute)timeTriggerEClass.getEStructuralFeatures().get(1);\n\t}\n\n\t\ttimeTriggerEClass = createEClass(TIME_TRIGGER);\n\t\tcreateEAttribute(timeTriggerEClass, TIME_TRIGGER__PERIOD);\n\t\tcreateEAttribute(timeTriggerEClass, TIME_TRIGGER__OFFSET);\n\t\ttimeTriggerEClass.getESuperTypes().add(this.getTrigger());\n\t\tinitEClass(timeTriggerEClass, TimeTrigger.class, \"TimeTrigger\", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\n\t\tinitEAttribute(getTimeTrigger_Period(), ecorePackage.getELong(), \"period\", \"0\", 1, 1, TimeTrigger.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n\t\tinitEAttribute(getTimeTrigger_Offset(), ecorePackage.getELong(), \"offset\", \"0\", 1, 1, TimeTrigger.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);", "new_methods": [ { "arguments": [], "filename": "jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/impl/RuntimeMetadataPackageImpl.java", "implementation": "return timeTriggerEClass;", "signature": "EClass getTimeTrigger()" }, { "arguments": [], "filename": "jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/impl/RuntimeMetadataPackageImpl.java", "implementation": "return (EAttribute)timeTriggerEClass.getEStructuralFeatures().get(0);", "signature": "EAttribute getTimeTrigger_Period()" }, { "arguments": [], "filename": "jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/impl/RuntimeMetadataPackageImpl.java", "implementation": "return (EAttribute)timeTriggerEClass.getEStructuralFeatures().get(1);", "signature": "EAttribute getTimeTrigger_Offset()" } ], "old_code": "import cz.cuni.mff.d3s.deeco.model.runtime.api.PeriodicTrigger;\n\t/**\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @generated\n\t */\n\tprivate EClass periodicTriggerEClass = null;\n\n\t/**\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @generated\n\t */\n\tpublic EClass getPeriodicTrigger() {\n\t\treturn periodicTriggerEClass;\n\t}\n\n\t/**\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @generated\n\t */\n\tpublic EAttribute getPeriodicTrigger_Period() {\n\t\treturn (EAttribute)periodicTriggerEClass.getEStructuralFeatures().get(0);\n\t}\n\n\t\tperiodicTriggerEClass = createEClass(PERIODIC_TRIGGER);\n\t\tcreateEAttribute(periodicTriggerEClass, PERIODIC_TRIGGER__PERIOD);\n\t\tperiodicTriggerEClass.getESuperTypes().add(this.getTrigger());\n\t\tinitEClass(periodicTriggerEClass, PeriodicTrigger.class, \"PeriodicTrigger\", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\n\t\tinitEAttribute(getPeriodicTrigger_Period(), ecorePackage.getELong(), \"period\", null, 1, 1, PeriodicTrigger.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);", "old_methods": [ { "arguments": [], "filename": "jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/impl/RuntimeMetadataPackageImpl.java", "implementation": "return periodicTriggerEClass;", "signature": "EClass getPeriodicTrigger()" }, { "arguments": [], "filename": "jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/impl/RuntimeMetadataPackageImpl.java", "implementation": "return (EAttribute)periodicTriggerEClass.getEStructuralFeatures().get(0);", "signature": "EAttribute getPeriodicTrigger_Period()" } ], "patch": "@@ -22,8 +22,8 @@\n import cz.cuni.mff.d3s.deeco.model.runtime.api.PathNodeField;\n import cz.cuni.mff.d3s.deeco.model.runtime.api.PathNodeMapKey;\n import cz.cuni.mff.d3s.deeco.model.runtime.api.PathNodeMember;\n-import cz.cuni.mff.d3s.deeco.model.runtime.api.PeriodicTrigger;\n import cz.cuni.mff.d3s.deeco.model.runtime.api.RuntimeMetadata;\n+import cz.cuni.mff.d3s.deeco.model.runtime.api.TimeTrigger;\n import cz.cuni.mff.d3s.deeco.model.runtime.api.Trigger;\n \n import cz.cuni.mff.d3s.deeco.model.runtime.meta.RuntimeMetadataFactory;\n@@ -49,13 +49,6 @@\n * @generated\n */\n public class RuntimeMetadataPackageImpl extends EPackageImpl implements RuntimeMetadataPackage {\n-\t/**\n-\t * <!-- begin-user-doc -->\n-\t * <!-- end-user-doc -->\n-\t * @generated\n-\t */\n-\tprivate EClass periodicTriggerEClass = null;\n-\n \t/**\n \t * <!-- begin-user-doc -->\n \t * <!-- end-user-doc -->\n@@ -189,6 +182,13 @@ public class RuntimeMetadataPackageImpl extends EPackageImpl implements RuntimeM\n \t */\n \tprivate EClass stringToObjectMapEClass = null;\n \n+\t/**\n+\t * <!-- begin-user-doc -->\n+\t * <!-- end-user-doc -->\n+\t * @generated\n+\t */\n+\tprivate EClass timeTriggerEClass = null;\n+\n \t/**\n \t * <!-- begin-user-doc -->\n \t * <!-- end-user-doc -->\n@@ -285,24 +285,6 @@ public static RuntimeMetadataPackage init() {\n \t\treturn theRuntimeMetadataPackage;\n \t}\n \n-\t/**\n-\t * <!-- begin-user-doc -->\n-\t * <!-- end-user-doc -->\n-\t * @generated\n-\t */\n-\tpublic EClass getPeriodicTrigger() {\n-\t\treturn periodicTriggerEClass;\n-\t}\n-\n-\t/**\n-\t * <!-- begin-user-doc -->\n-\t * <!-- end-user-doc -->\n-\t * @generated\n-\t */\n-\tpublic EAttribute getPeriodicTrigger_Period() {\n-\t\treturn (EAttribute)periodicTriggerEClass.getEStructuralFeatures().get(0);\n-\t}\n-\n \t/**\n \t * <!-- begin-user-doc -->\n \t * <!-- end-user-doc -->\n@@ -744,6 +726,33 @@ public EAttribute getStringToObjectMap_Value() {\n \t\treturn (EAttribute)stringToObjectMapEClass.getEStructuralFeatures().get(1);\n \t}\n \n+\t/**\n+\t * <!-- begin-user-doc -->\n+\t * <!-- end-user-doc -->\n+\t * @generated\n+\t */\n+\tpublic EClass getTimeTrigger() {\n+\t\treturn timeTriggerEClass;\n+\t}\n+\n+\t/**\n+\t * <!-- begin-user-doc -->\n+\t * <!-- end-user-doc -->\n+\t * @generated\n+\t */\n+\tpublic EAttribute getTimeTrigger_Period() {\n+\t\treturn (EAttribute)timeTriggerEClass.getEStructuralFeatures().get(0);\n+\t}\n+\n+\t/**\n+\t * <!-- begin-user-doc -->\n+\t * <!-- end-user-doc -->\n+\t * @generated\n+\t */\n+\tpublic EAttribute getTimeTrigger_Offset() {\n+\t\treturn (EAttribute)timeTriggerEClass.getEStructuralFeatures().get(1);\n+\t}\n+\n \t/**\n \t * <!-- begin-user-doc -->\n \t * <!-- end-user-doc -->\n@@ -817,8 +826,9 @@ public void createPackageContents() {\n \t\tisCreated = true;\n \n \t\t// Create classes and their features\n-\t\tperiodicTriggerEClass = createEClass(PERIODIC_TRIGGER);\n-\t\tcreateEAttribute(periodicTriggerEClass, PERIODIC_TRIGGER__PERIOD);\n+\t\ttimeTriggerEClass = createEClass(TIME_TRIGGER);\n+\t\tcreateEAttribute(timeTriggerEClass, TIME_TRIGGER__PERIOD);\n+\t\tcreateEAttribute(timeTriggerEClass, TIME_TRIGGER__OFFSET);\n \n \t\ttriggerEClass = createEClass(TRIGGER);\n \n@@ -926,7 +936,7 @@ public void initializePackageContents() {\n \t\t// Set bounds for type parameters\n \n \t\t// Add supertypes to classes\n-\t\tperiodicTriggerEClass.getESuperTypes().add(this.getTrigger());\n+\t\ttimeTriggerEClass.getESuperTypes().add(this.getTrigger());\n \t\tknowledgeChangeTriggerEClass.getESuperTypes().add(this.getTrigger());\n \t\tpathNodeFieldEClass.getESuperTypes().add(this.getPathNode());\n \t\tpathNodeMapKeyEClass.getESuperTypes().add(this.getPathNode());\n@@ -938,8 +948,9 @@ public void initializePackageContents() {\n \t\tpathNodeComponentIdEClass.getESuperTypes().add(this.getPathNode());\n \n \t\t// Initialize classes, features, and operations; add parameters\n-\t\tinitEClass(periodicTriggerEClass, PeriodicTrigger.class, \"PeriodicTrigger\", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\n-\t\tinitEAttribute(getPeriodicTrigger_Period(), ecorePackage.getELong(), \"period\", null, 1, 1, PeriodicTrigger.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n+\t\tinitEClass(timeTriggerEClass, TimeTrigger.class, \"TimeTrigger\", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\n+\t\tinitEAttribute(getTimeTrigger_Period(), ecorePackage.getELong(), \"period\", \"0\", 1, 1, TimeTrigger.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n+\t\tinitEAttribute(getTimeTrigger_Offset(), ecorePackage.getELong(), \"offset\", \"0\", 1, 1, TimeTrigger.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n \n \t\tinitEClass(triggerEClass, Trigger.class, \"Trigger\", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\n ", "raw_url": "https://github.com/d3scomp/JDEECo/raw/cddfa1a013f7c6f02e6e496b211ac6da552641e7/jdeeco-core%2Fsrc%2Fcz%2Fcuni%2Fmff%2Fd3s%2Fdeeco%2Fmodel%2Fruntime%2Fimpl%2FRuntimeMetadataPackageImpl.java", "sha": "85c03201fa27bdeaad1245ac16ea069e9608d4e4", "status": "modified" }, { "additions": 10, "blob_url": "https://github.com/d3scomp/JDEECo/blob/cddfa1a013f7c6f02e6e496b211ac6da552641e7/jdeeco-core%2Fsrc%2Fcz%2Fcuni%2Fmff%2Fd3s%2Fdeeco%2Fmodel%2Fruntime%2Fmeta%2FRuntimeMetadataFactory.java", "changes": 20, "contents_url": "https://api.github.com/repos/d3scomp/JDEECo/contents/jdeeco-core%2Fsrc%2Fcz%2Fcuni%2Fmff%2Fd3s%2Fdeeco%2Fmodel%2Fruntime%2Fmeta%2FRuntimeMetadataFactory.java?ref=cddfa1a013f7c6f02e6e496b211ac6da552641e7", "deletions": 10, "filename": "jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/meta/RuntimeMetadataFactory.java", "new_code": "import cz.cuni.mff.d3s.deeco.model.runtime.api.TimeTrigger;\n\t/**\n\t * Returns a new object of class '<em>Time Trigger</em>'.\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @return a new object of class '<em>Time Trigger</em>'.\n\t * @generated\n\t */\n\tTimeTrigger createTimeTrigger();\n", "new_methods": [], "old_code": "import cz.cuni.mff.d3s.deeco.model.runtime.api.PeriodicTrigger;\n\t/**\n\t * Returns a new object of class '<em>Periodic Trigger</em>'.\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @return a new object of class '<em>Periodic Trigger</em>'.\n\t * @generated\n\t */\n\tPeriodicTrigger createPeriodicTrigger();\n", "old_methods": [], "patch": "@@ -17,9 +17,9 @@\n import cz.cuni.mff.d3s.deeco.model.runtime.api.PathNodeField;\n import cz.cuni.mff.d3s.deeco.model.runtime.api.PathNodeMapKey;\n import cz.cuni.mff.d3s.deeco.model.runtime.api.PathNodeMember;\n-import cz.cuni.mff.d3s.deeco.model.runtime.api.PeriodicTrigger;\n import cz.cuni.mff.d3s.deeco.model.runtime.api.RuntimeMetadata;\n \n+import cz.cuni.mff.d3s.deeco.model.runtime.api.TimeTrigger;\n import org.eclipse.emf.ecore.EFactory;\n \n /**\n@@ -39,15 +39,6 @@ public interface RuntimeMetadataFactory extends EFactory {\n \t */\n \tRuntimeMetadataFactory eINSTANCE = cz.cuni.mff.d3s.deeco.model.runtime.impl.RuntimeMetadataFactoryImpl.init();\n \n-\t/**\n-\t * Returns a new object of class '<em>Periodic Trigger</em>'.\n-\t * <!-- begin-user-doc -->\n-\t * <!-- end-user-doc -->\n-\t * @return a new object of class '<em>Periodic Trigger</em>'.\n-\t * @generated\n-\t */\n-\tPeriodicTrigger createPeriodicTrigger();\n-\n \t/**\n \t * Returns a new object of class '<em>Knowledge Change Trigger</em>'.\n \t * <!-- begin-user-doc -->\n@@ -192,6 +183,15 @@ public interface RuntimeMetadataFactory extends EFactory {\n \t */\n \tPathNodeComponentId createPathNodeComponentId();\n \n+\t/**\n+\t * Returns a new object of class '<em>Time Trigger</em>'.\n+\t * <!-- begin-user-doc -->\n+\t * <!-- end-user-doc -->\n+\t * @return a new object of class '<em>Time Trigger</em>'.\n+\t * @generated\n+\t */\n+\tTimeTrigger createTimeTrigger();\n+\n \t/**\n \t * Returns the package supported by this factory.\n \t * <!-- begin-user-doc -->", "raw_url": "https://github.com/d3scomp/JDEECo/raw/cddfa1a013f7c6f02e6e496b211ac6da552641e7/jdeeco-core%2Fsrc%2Fcz%2Fcuni%2Fmff%2Fd3s%2Fdeeco%2Fmodel%2Fruntime%2Fmeta%2FRuntimeMetadataFactory.java", "sha": "44c8fa127ac8c306d7d04cd2c507a2be986aa125", "status": "modified" }, { "additions": 250, "blob_url": "https://github.com/d3scomp/JDEECo/blob/cddfa1a013f7c6f02e6e496b211ac6da552641e7/jdeeco-core%2Fsrc%2Fcz%2Fcuni%2Fmff%2Fd3s%2Fdeeco%2Fmodel%2Fruntime%2Fmeta%2FRuntimeMetadataPackage.java", "changes": 472, "contents_url": "https://api.github.com/repos/d3scomp/JDEECo/contents/jdeeco-core%2Fsrc%2Fcz%2Fcuni%2Fmff%2Fd3s%2Fdeeco%2Fmodel%2Fruntime%2Fmeta%2FRuntimeMetadataPackage.java?ref=cddfa1a013f7c6f02e6e496b211ac6da552641e7", "deletions": 222, "filename": "jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/meta/RuntimeMetadataPackage.java", "new_code": "\t * The meta object id for the '{@link cz.cuni.mff.d3s.deeco.model.runtime.impl.KnowledgeChangeTriggerImpl <em>Knowledge Change Trigger</em>}' class.\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.KnowledgeChangeTriggerImpl\n\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.RuntimeMetadataPackageImpl#getKnowledgeChangeTrigger()\n\t * @generated\n\t */\n\tint KNOWLEDGE_CHANGE_TRIGGER = 2;\n\n\t/**\n\t * The meta object id for the '{@link cz.cuni.mff.d3s.deeco.model.runtime.impl.KnowledgePathImpl <em>Knowledge Path</em>}' class.\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.KnowledgePathImpl\n\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.RuntimeMetadataPackageImpl#getKnowledgePath()\n\t * @generated\n\t */\n\tint KNOWLEDGE_PATH = 3;\n\n\t/**\n\t * The meta object id for the '{@link cz.cuni.mff.d3s.deeco.model.runtime.impl.PathNodeImpl <em>Path Node</em>}' class.\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.PathNodeImpl\n\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.RuntimeMetadataPackageImpl#getPathNode()\n\t * @generated\n\t */\n\tint PATH_NODE = 4;\n\n\t/**\n\t * The meta object id for the '{@link cz.cuni.mff.d3s.deeco.model.runtime.impl.PathNodeFieldImpl <em>Path Node Field</em>}' class.\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.PathNodeFieldImpl\n\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.RuntimeMetadataPackageImpl#getPathNodeField()\n\t * @generated\n\t */\n\tint PATH_NODE_FIELD = 5;\n\n\t/**\n\t * The meta object id for the '{@link cz.cuni.mff.d3s.deeco.model.runtime.impl.PathNodeMapKeyImpl <em>Path Node Map Key</em>}' class.\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.PathNodeMapKeyImpl\n\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.RuntimeMetadataPackageImpl#getPathNodeMapKey()\n\t * @generated\n\t */\n\tint PATH_NODE_MAP_KEY = 6;\n\n\t/**\n\t * The meta object id for the '{@link cz.cuni.mff.d3s.deeco.model.runtime.impl.RuntimeMetadataImpl <em>Runtime Metadata</em>}' class.\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.RuntimeMetadataImpl\n\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.RuntimeMetadataPackageImpl#getRuntimeMetadata()\n\t * @generated\n\t */\n\tint RUNTIME_METADATA = 7;\n\n\t/**\n\t * The meta object id for the '{@link cz.cuni.mff.d3s.deeco.model.runtime.impl.ComponentInstanceImpl <em>Component Instance</em>}' class.\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.ComponentInstanceImpl\n\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.RuntimeMetadataPackageImpl#getComponentInstance()\n\t * @generated\n\t */\n\tint COMPONENT_INSTANCE = 8;\n\n\t/**\n\t * The meta object id for the '{@link cz.cuni.mff.d3s.deeco.model.runtime.impl.EnsembleDefinitionImpl <em>Ensemble Definition</em>}' class.\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.EnsembleDefinitionImpl\n\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.RuntimeMetadataPackageImpl#getEnsembleDefinition()\n\t * @generated\n\t */\n\tint ENSEMBLE_DEFINITION = 9;\n\n\t/**\n\t * The meta object id for the '{@link cz.cuni.mff.d3s.deeco.model.runtime.impl.InvocableImpl <em>Invocable</em>}' class.\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.InvocableImpl\n\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.RuntimeMetadataPackageImpl#getInvocable()\n\t * @generated\n\t */\n\tint INVOCABLE = 14;\n\n\t/**\n\t * The meta object id for the '{@link cz.cuni.mff.d3s.deeco.model.runtime.impl.ConditionImpl <em>Condition</em>}' class.\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.ConditionImpl\n\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.RuntimeMetadataPackageImpl#getCondition()\n\t * @generated\n\t */\n\tint CONDITION = 10;\n\n\t/**\n\t * The meta object id for the '{@link cz.cuni.mff.d3s.deeco.model.runtime.impl.ExchangeImpl <em>Exchange</em>}' class.\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.ExchangeImpl\n\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.RuntimeMetadataPackageImpl#getExchange()\n\t * @generated\n\t */\n\tint EXCHANGE = 11;\n\n\t/**\n\t * The meta object id for the '{@link cz.cuni.mff.d3s.deeco.model.runtime.impl.ComponentProcessImpl <em>Component Process</em>}' class.\n\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.ComponentProcessImpl\n\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.RuntimeMetadataPackageImpl#getComponentProcess()\n\tint COMPONENT_PROCESS = 12;\n\n\t/**\n\t * The meta object id for the '{@link cz.cuni.mff.d3s.deeco.model.runtime.impl.ParameterImpl <em>Parameter</em>}' class.\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.ParameterImpl\n\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.RuntimeMetadataPackageImpl#getParameter()\n\t * @generated\n\t */\n\tint PARAMETER = 13;\n\n\t/**\n\t * The meta object id for the '{@link cz.cuni.mff.d3s.deeco.model.runtime.impl.EnsembleControllerImpl <em>Ensemble Controller</em>}' class.\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.EnsembleControllerImpl\n\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.RuntimeMetadataPackageImpl#getEnsembleController()\n\t * @generated\n\t */\n\tint ENSEMBLE_CONTROLLER = 15;\n\n\t/**\n\t * The meta object id for the '{@link cz.cuni.mff.d3s.deeco.model.runtime.impl.PathNodeCoordinatorImpl <em>Path Node Coordinator</em>}' class.\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.PathNodeCoordinatorImpl\n\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.RuntimeMetadataPackageImpl#getPathNodeCoordinator()\n\t * @generated\n\t */\n\tint PATH_NODE_COORDINATOR = 16;\n\n\t/**\n\t * The meta object id for the '{@link cz.cuni.mff.d3s.deeco.model.runtime.impl.PathNodeMemberImpl <em>Path Node Member</em>}' class.\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.PathNodeMemberImpl\n\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.RuntimeMetadataPackageImpl#getPathNodeMember()\n\t * @generated\n\t */\n\tint PATH_NODE_MEMBER = 17;\n\n\t/**\n\t * The meta object id for the '{@link cz.cuni.mff.d3s.deeco.model.runtime.impl.PathNodeComponentIdImpl <em>Path Node Component Id</em>}' class.\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.PathNodeComponentIdImpl\n\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.RuntimeMetadataPackageImpl#getPathNodeComponentId()\n\t * @generated\n\t */\n\tint PATH_NODE_COMPONENT_ID = 18;\n\n\t/**\n\t * The meta object id for the '{@link cz.cuni.mff.d3s.deeco.model.runtime.impl.StringToObjectMapImpl <em>String To Object Map</em>}' class.\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.StringToObjectMapImpl\n\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.RuntimeMetadataPackageImpl#getStringToObjectMap()\n\t * @generated\n\t */\n\tint STRING_TO_OBJECT_MAP = 19;\n\n\t/**\n\t * The meta object id for the '{@link cz.cuni.mff.d3s.deeco.model.runtime.impl.TimeTriggerImpl <em>Time Trigger</em>}' class.\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.TimeTriggerImpl\n\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.RuntimeMetadataPackageImpl#getTimeTrigger()\n\t * @generated\n\t */\n\tint TIME_TRIGGER = 0;\n\tint TIME_TRIGGER__PERIOD = TRIGGER_FEATURE_COUNT + 0;\n\t * The feature id for the '<em><b>Offset</b></em>' attribute.\n\tint TIME_TRIGGER__OFFSET = TRIGGER_FEATURE_COUNT + 1;\n\t * The number of structural features of the '<em>Time Trigger</em>' class.\n\tint TIME_TRIGGER_FEATURE_COUNT = TRIGGER_FEATURE_COUNT + 2;\n\t * The number of operations of the '<em>Time Trigger</em>' class.\n\t * @ordered\n\tint TIME_TRIGGER_OPERATION_COUNT = TRIGGER_OPERATION_COUNT + 0;\n\t/**\n\t * Returns the meta object for class '{@link cz.cuni.mff.d3s.deeco.model.runtime.api.TimeTrigger <em>Time Trigger</em>}'.\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @return the meta object for class '<em>Time Trigger</em>'.\n\t * @see cz.cuni.mff.d3s.deeco.model.runtime.api.TimeTrigger\n\t * @generated\n\t */\n\tEClass getTimeTrigger();\n\n\t/**\n\t * Returns the meta object for the attribute '{@link cz.cuni.mff.d3s.deeco.model.runtime.api.TimeTrigger#getPeriod <em>Period</em>}'.\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @return the meta object for the attribute '<em>Period</em>'.\n\t * @see cz.cuni.mff.d3s.deeco.model.runtime.api.TimeTrigger#getPeriod()\n\t * @see #getTimeTrigger()\n\t * @generated\n\t */\n\tEAttribute getTimeTrigger_Period();\n\n\t/**\n\t * Returns the meta object for the attribute '{@link cz.cuni.mff.d3s.deeco.model.runtime.api.TimeTrigger#getOffset <em>Offset</em>}'.\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @return the meta object for the attribute '<em>Offset</em>'.\n\t * @see cz.cuni.mff.d3s.deeco.model.runtime.api.TimeTrigger#getOffset()\n\t * @see #getTimeTrigger()\n\t * @generated\n\t */\n\tEAttribute getTimeTrigger_Offset();\n\n\t\t/**\n\t\t * The meta object literal for the '{@link cz.cuni.mff.d3s.deeco.model.runtime.impl.TimeTriggerImpl <em>Time Trigger</em>}' class.\n\t\t * <!-- begin-user-doc -->\n\t\t * <!-- end-user-doc -->\n\t\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.TimeTriggerImpl\n\t\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.RuntimeMetadataPackageImpl#getTimeTrigger()\n\t\t * @generated\n\t\t */\n\t\tEClass TIME_TRIGGER = eINSTANCE.getTimeTrigger();\n\n\t\t/**\n\t\t * The meta object literal for the '<em><b>Period</b></em>' attribute feature.\n\t\t * <!-- begin-user-doc -->\n\t\t * <!-- end-user-doc -->\n\t\t * @generated\n\t\t */\n\t\tEAttribute TIME_TRIGGER__PERIOD = eINSTANCE.getTimeTrigger_Period();\n\n\t\t/**\n\t\t * The meta object literal for the '<em><b>Offset</b></em>' attribute feature.\n\t\t * <!-- begin-user-doc -->\n\t\t * <!-- end-user-doc -->\n\t\t * @generated\n\t\t */\n\t\tEAttribute TIME_TRIGGER__OFFSET = eINSTANCE.getTimeTrigger_Offset();\n", "new_methods": [], "old_code": "\t * The meta object id for the '{@link cz.cuni.mff.d3s.deeco.model.runtime.impl.PeriodicTriggerImpl <em>Periodic Trigger</em>}' class.\n\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.PeriodicTriggerImpl\n\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.RuntimeMetadataPackageImpl#getPeriodicTrigger()\n\tint PERIODIC_TRIGGER = 0;\n\tint PERIODIC_TRIGGER__PERIOD = TRIGGER_FEATURE_COUNT + 0;\n\t * The number of structural features of the '<em>Periodic Trigger</em>' class.\n\tint PERIODIC_TRIGGER_FEATURE_COUNT = TRIGGER_FEATURE_COUNT + 1;\n\t * The number of operations of the '<em>Periodic Trigger</em>' class.\n\tint PERIODIC_TRIGGER_OPERATION_COUNT = TRIGGER_OPERATION_COUNT + 0;\n\t * The meta object id for the '{@link cz.cuni.mff.d3s.deeco.model.runtime.impl.KnowledgeChangeTriggerImpl <em>Knowledge Change Trigger</em>}' class.\n\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.KnowledgeChangeTriggerImpl\n\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.RuntimeMetadataPackageImpl#getKnowledgeChangeTrigger()\n\tint KNOWLEDGE_CHANGE_TRIGGER = 2;\n\t/**\n\t * The meta object id for the '{@link cz.cuni.mff.d3s.deeco.model.runtime.impl.KnowledgePathImpl <em>Knowledge Path</em>}' class.\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.KnowledgePathImpl\n\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.RuntimeMetadataPackageImpl#getKnowledgePath()\n\t * @generated\n\t */\n\tint KNOWLEDGE_PATH = 3;\n\n\t/**\n\t * The meta object id for the '{@link cz.cuni.mff.d3s.deeco.model.runtime.impl.PathNodeImpl <em>Path Node</em>}' class.\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.PathNodeImpl\n\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.RuntimeMetadataPackageImpl#getPathNode()\n\t * @generated\n\t */\n\tint PATH_NODE = 4;\n\n\t/**\n\t * The meta object id for the '{@link cz.cuni.mff.d3s.deeco.model.runtime.impl.PathNodeFieldImpl <em>Path Node Field</em>}' class.\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.PathNodeFieldImpl\n\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.RuntimeMetadataPackageImpl#getPathNodeField()\n\t * @generated\n\t */\n\tint PATH_NODE_FIELD = 5;\n\n\t/**\n\t * The meta object id for the '{@link cz.cuni.mff.d3s.deeco.model.runtime.impl.PathNodeMapKeyImpl <em>Path Node Map Key</em>}' class.\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.PathNodeMapKeyImpl\n\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.RuntimeMetadataPackageImpl#getPathNodeMapKey()\n\t * @generated\n\t */\n\tint PATH_NODE_MAP_KEY = 6;\n\n\t/**\n\t * The meta object id for the '{@link cz.cuni.mff.d3s.deeco.model.runtime.impl.RuntimeMetadataImpl <em>Runtime Metadata</em>}' class.\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.RuntimeMetadataImpl\n\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.RuntimeMetadataPackageImpl#getRuntimeMetadata()\n\t * @generated\n\t */\n\tint RUNTIME_METADATA = 7;\n\n\t/**\n\t * The meta object id for the '{@link cz.cuni.mff.d3s.deeco.model.runtime.impl.ComponentInstanceImpl <em>Component Instance</em>}' class.\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.ComponentInstanceImpl\n\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.RuntimeMetadataPackageImpl#getComponentInstance()\n\t * @generated\n\t */\n\tint COMPONENT_INSTANCE = 8;\n\n\t/**\n\t * The meta object id for the '{@link cz.cuni.mff.d3s.deeco.model.runtime.impl.EnsembleDefinitionImpl <em>Ensemble Definition</em>}' class.\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.EnsembleDefinitionImpl\n\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.RuntimeMetadataPackageImpl#getEnsembleDefinition()\n\t * @generated\n\t */\n\tint ENSEMBLE_DEFINITION = 9;\n\n\t/**\n\t * The meta object id for the '{@link cz.cuni.mff.d3s.deeco.model.runtime.impl.InvocableImpl <em>Invocable</em>}' class.\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.InvocableImpl\n\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.RuntimeMetadataPackageImpl#getInvocable()\n\t * @generated\n\t */\n\tint INVOCABLE = 14;\n\n\t/**\n\t * The meta object id for the '{@link cz.cuni.mff.d3s.deeco.model.runtime.impl.ConditionImpl <em>Condition</em>}' class.\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.ConditionImpl\n\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.RuntimeMetadataPackageImpl#getCondition()\n\t * @generated\n\t */\n\tint CONDITION = 10;\n\n\t/**\n\t * The meta object id for the '{@link cz.cuni.mff.d3s.deeco.model.runtime.impl.ExchangeImpl <em>Exchange</em>}' class.\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.ExchangeImpl\n\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.RuntimeMetadataPackageImpl#getExchange()\n\t * @generated\n\t */\n\tint EXCHANGE = 11;\n\n\t/**\n\t * The meta object id for the '{@link cz.cuni.mff.d3s.deeco.model.runtime.impl.ComponentProcessImpl <em>Component Process</em>}' class.\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.ComponentProcessImpl\n\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.RuntimeMetadataPackageImpl#getComponentProcess()\n\t * @generated\n\t */\n\tint COMPONENT_PROCESS = 12;\n\n\t/**\n\t * The meta object id for the '{@link cz.cuni.mff.d3s.deeco.model.runtime.impl.ParameterImpl <em>Parameter</em>}' class.\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.ParameterImpl\n\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.RuntimeMetadataPackageImpl#getParameter()\n\t * @generated\n\t */\n\tint PARAMETER = 13;\n\n\t/**\n\t * The meta object id for the '{@link cz.cuni.mff.d3s.deeco.model.runtime.impl.EnsembleControllerImpl <em>Ensemble Controller</em>}' class.\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.EnsembleControllerImpl\n\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.RuntimeMetadataPackageImpl#getEnsembleController()\n\t * @generated\n\t */\n\tint ENSEMBLE_CONTROLLER = 15;\n\n\t/**\n\t * The meta object id for the '{@link cz.cuni.mff.d3s.deeco.model.runtime.impl.PathNodeCoordinatorImpl <em>Path Node Coordinator</em>}' class.\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.PathNodeCoordinatorImpl\n\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.RuntimeMetadataPackageImpl#getPathNodeCoordinator()\n\t * @generated\n\t */\n\tint PATH_NODE_COORDINATOR = 16;\n\n\t/**\n\t * The meta object id for the '{@link cz.cuni.mff.d3s.deeco.model.runtime.impl.PathNodeMemberImpl <em>Path Node Member</em>}' class.\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.PathNodeMemberImpl\n\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.RuntimeMetadataPackageImpl#getPathNodeMember()\n\t * @generated\n\t */\n\tint PATH_NODE_MEMBER = 17;\n\n\t/**\n\t * The meta object id for the '{@link cz.cuni.mff.d3s.deeco.model.runtime.impl.PathNodeComponentIdImpl <em>Path Node Component Id</em>}' class.\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.PathNodeComponentIdImpl\n\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.RuntimeMetadataPackageImpl#getPathNodeComponentId()\n\t * @generated\n\t */\n\tint PATH_NODE_COMPONENT_ID = 18;\n\n\t/**\n\t * The meta object id for the '{@link cz.cuni.mff.d3s.deeco.model.runtime.impl.StringToObjectMapImpl <em>String To Object Map</em>}' class.\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.StringToObjectMapImpl\n\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.RuntimeMetadataPackageImpl#getStringToObjectMap()\n\t * @generated\n\t */\n\tint STRING_TO_OBJECT_MAP = 19;\n\n\t/**\n\t * Returns the meta object for class '{@link cz.cuni.mff.d3s.deeco.model.runtime.api.PeriodicTrigger <em>Periodic Trigger</em>}'.\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @return the meta object for class '<em>Periodic Trigger</em>'.\n\t * @see cz.cuni.mff.d3s.deeco.model.runtime.api.PeriodicTrigger\n\t * @generated\n\t */\n\tEClass getPeriodicTrigger();\n\n\t/**\n\t * Returns the meta object for the attribute '{@link cz.cuni.mff.d3s.deeco.model.runtime.api.PeriodicTrigger#getPeriod <em>Period</em>}'.\n\t * <!-- begin-user-doc -->\n\t * <!-- end-user-doc -->\n\t * @return the meta object for the attribute '<em>Period</em>'.\n\t * @see cz.cuni.mff.d3s.deeco.model.runtime.api.PeriodicTrigger#getPeriod()\n\t * @see #getPeriodicTrigger()\n\t * @generated\n\t */\n\tEAttribute getPeriodicTrigger_Period();\n\n\t\t/**\n\t\t * The meta object literal for the '{@link cz.cuni.mff.d3s.deeco.model.runtime.impl.PeriodicTriggerImpl <em>Periodic Trigger</em>}' class.\n\t\t * <!-- begin-user-doc -->\n\t\t * <!-- end-user-doc -->\n\t\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.PeriodicTriggerImpl\n\t\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.RuntimeMetadataPackageImpl#getPeriodicTrigger()\n\t\t * @generated\n\t\t */\n\t\tEClass PERIODIC_TRIGGER = eINSTANCE.getPeriodicTrigger();\n\n\t\t/**\n\t\t * The meta object literal for the '<em><b>Period</b></em>' attribute feature.\n\t\t * <!-- begin-user-doc -->\n\t\t * <!-- end-user-doc -->\n\t\t * @generated\n\t\t */\n\t\tEAttribute PERIODIC_TRIGGER__PERIOD = eINSTANCE.getPeriodicTrigger_Period();\n", "old_methods": [], "patch": "@@ -87,14 +87,194 @@ public interface RuntimeMetadataPackage extends EPackage {\n \tint TRIGGER_OPERATION_COUNT = 0;\n \n \t/**\n-\t * The meta object id for the '{@link cz.cuni.mff.d3s.deeco.model.runtime.impl.PeriodicTriggerImpl <em>Periodic Trigger</em>}' class.\n+\t * The meta object id for the '{@link cz.cuni.mff.d3s.deeco.model.runtime.impl.KnowledgeChangeTriggerImpl <em>Knowledge Change Trigger</em>}' class.\n+\t * <!-- begin-user-doc -->\n+\t * <!-- end-user-doc -->\n+\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.KnowledgeChangeTriggerImpl\n+\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.RuntimeMetadataPackageImpl#getKnowledgeChangeTrigger()\n+\t * @generated\n+\t */\n+\tint KNOWLEDGE_CHANGE_TRIGGER = 2;\n+\n+\t/**\n+\t * The meta object id for the '{@link cz.cuni.mff.d3s.deeco.model.runtime.impl.KnowledgePathImpl <em>Knowledge Path</em>}' class.\n+\t * <!-- begin-user-doc -->\n+\t * <!-- end-user-doc -->\n+\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.KnowledgePathImpl\n+\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.RuntimeMetadataPackageImpl#getKnowledgePath()\n+\t * @generated\n+\t */\n+\tint KNOWLEDGE_PATH = 3;\n+\n+\t/**\n+\t * The meta object id for the '{@link cz.cuni.mff.d3s.deeco.model.runtime.impl.PathNodeImpl <em>Path Node</em>}' class.\n+\t * <!-- begin-user-doc -->\n+\t * <!-- end-user-doc -->\n+\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.PathNodeImpl\n+\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.RuntimeMetadataPackageImpl#getPathNode()\n+\t * @generated\n+\t */\n+\tint PATH_NODE = 4;\n+\n+\t/**\n+\t * The meta object id for the '{@link cz.cuni.mff.d3s.deeco.model.runtime.impl.PathNodeFieldImpl <em>Path Node Field</em>}' class.\n+\t * <!-- begin-user-doc -->\n+\t * <!-- end-user-doc -->\n+\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.PathNodeFieldImpl\n+\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.RuntimeMetadataPackageImpl#getPathNodeField()\n+\t * @generated\n+\t */\n+\tint PATH_NODE_FIELD = 5;\n+\n+\t/**\n+\t * The meta object id for the '{@link cz.cuni.mff.d3s.deeco.model.runtime.impl.PathNodeMapKeyImpl <em>Path Node Map Key</em>}' class.\n+\t * <!-- begin-user-doc -->\n+\t * <!-- end-user-doc -->\n+\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.PathNodeMapKeyImpl\n+\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.RuntimeMetadataPackageImpl#getPathNodeMapKey()\n+\t * @generated\n+\t */\n+\tint PATH_NODE_MAP_KEY = 6;\n+\n+\t/**\n+\t * The meta object id for the '{@link cz.cuni.mff.d3s.deeco.model.runtime.impl.RuntimeMetadataImpl <em>Runtime Metadata</em>}' class.\n+\t * <!-- begin-user-doc -->\n+\t * <!-- end-user-doc -->\n+\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.RuntimeMetadataImpl\n+\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.RuntimeMetadataPackageImpl#getRuntimeMetadata()\n+\t * @generated\n+\t */\n+\tint RUNTIME_METADATA = 7;\n+\n+\t/**\n+\t * The meta object id for the '{@link cz.cuni.mff.d3s.deeco.model.runtime.impl.ComponentInstanceImpl <em>Component Instance</em>}' class.\n+\t * <!-- begin-user-doc -->\n+\t * <!-- end-user-doc -->\n+\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.ComponentInstanceImpl\n+\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.RuntimeMetadataPackageImpl#getComponentInstance()\n+\t * @generated\n+\t */\n+\tint COMPONENT_INSTANCE = 8;\n+\n+\t/**\n+\t * The meta object id for the '{@link cz.cuni.mff.d3s.deeco.model.runtime.impl.EnsembleDefinitionImpl <em>Ensemble Definition</em>}' class.\n+\t * <!-- begin-user-doc -->\n+\t * <!-- end-user-doc -->\n+\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.EnsembleDefinitionImpl\n+\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.RuntimeMetadataPackageImpl#getEnsembleDefinition()\n+\t * @generated\n+\t */\n+\tint ENSEMBLE_DEFINITION = 9;\n+\n+\t/**\n+\t * The meta object id for the '{@link cz.cuni.mff.d3s.deeco.model.runtime.impl.InvocableImpl <em>Invocable</em>}' class.\n+\t * <!-- begin-user-doc -->\n+\t * <!-- end-user-doc -->\n+\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.InvocableImpl\n+\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.RuntimeMetadataPackageImpl#getInvocable()\n+\t * @generated\n+\t */\n+\tint INVOCABLE = 14;\n+\n+\t/**\n+\t * The meta object id for the '{@link cz.cuni.mff.d3s.deeco.model.runtime.impl.ConditionImpl <em>Condition</em>}' class.\n+\t * <!-- begin-user-doc -->\n+\t * <!-- end-user-doc -->\n+\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.ConditionImpl\n+\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.RuntimeMetadataPackageImpl#getCondition()\n+\t * @generated\n+\t */\n+\tint CONDITION = 10;\n+\n+\t/**\n+\t * The meta object id for the '{@link cz.cuni.mff.d3s.deeco.model.runtime.impl.ExchangeImpl <em>Exchange</em>}' class.\n+\t * <!-- begin-user-doc -->\n+\t * <!-- end-user-doc -->\n+\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.ExchangeImpl\n+\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.RuntimeMetadataPackageImpl#getExchange()\n+\t * @generated\n+\t */\n+\tint EXCHANGE = 11;\n+\n+\t/**\n+\t * The meta object id for the '{@link cz.cuni.mff.d3s.deeco.model.runtime.impl.ComponentProcessImpl <em>Component Process</em>}' class.\n \t * <!-- begin-user-doc -->\n \t * <!-- end-user-doc -->\n-\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.PeriodicTriggerImpl\n-\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.RuntimeMetadataPackageImpl#getPeriodicTrigger()\n+\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.ComponentProcessImpl\n+\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.RuntimeMetadataPackageImpl#getComponentProcess()\n \t * @generated\n \t */\n-\tint PERIODIC_TRIGGER = 0;\n+\tint COMPONENT_PROCESS = 12;\n+\n+\t/**\n+\t * The meta object id for the '{@link cz.cuni.mff.d3s.deeco.model.runtime.impl.ParameterImpl <em>Parameter</em>}' class.\n+\t * <!-- begin-user-doc -->\n+\t * <!-- end-user-doc -->\n+\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.ParameterImpl\n+\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.RuntimeMetadataPackageImpl#getParameter()\n+\t * @generated\n+\t */\n+\tint PARAMETER = 13;\n+\n+\t/**\n+\t * The meta object id for the '{@link cz.cuni.mff.d3s.deeco.model.runtime.impl.EnsembleControllerImpl <em>Ensemble Controller</em>}' class.\n+\t * <!-- begin-user-doc -->\n+\t * <!-- end-user-doc -->\n+\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.EnsembleControllerImpl\n+\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.RuntimeMetadataPackageImpl#getEnsembleController()\n+\t * @generated\n+\t */\n+\tint ENSEMBLE_CONTROLLER = 15;\n+\n+\t/**\n+\t * The meta object id for the '{@link cz.cuni.mff.d3s.deeco.model.runtime.impl.PathNodeCoordinatorImpl <em>Path Node Coordinator</em>}' class.\n+\t * <!-- begin-user-doc -->\n+\t * <!-- end-user-doc -->\n+\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.PathNodeCoordinatorImpl\n+\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.RuntimeMetadataPackageImpl#getPathNodeCoordinator()\n+\t * @generated\n+\t */\n+\tint PATH_NODE_COORDINATOR = 16;\n+\n+\t/**\n+\t * The meta object id for the '{@link cz.cuni.mff.d3s.deeco.model.runtime.impl.PathNodeMemberImpl <em>Path Node Member</em>}' class.\n+\t * <!-- begin-user-doc -->\n+\t * <!-- end-user-doc -->\n+\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.PathNodeMemberImpl\n+\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.RuntimeMetadataPackageImpl#getPathNodeMember()\n+\t * @generated\n+\t */\n+\tint PATH_NODE_MEMBER = 17;\n+\n+\t/**\n+\t * The meta object id for the '{@link cz.cuni.mff.d3s.deeco.model.runtime.impl.PathNodeComponentIdImpl <em>Path Node Component Id</em>}' class.\n+\t * <!-- begin-user-doc -->\n+\t * <!-- end-user-doc -->\n+\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.PathNodeComponentIdImpl\n+\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.RuntimeMetadataPackageImpl#getPathNodeComponentId()\n+\t * @generated\n+\t */\n+\tint PATH_NODE_COMPONENT_ID = 18;\n+\n+\t/**\n+\t * The meta object id for the '{@link cz.cuni.mff.d3s.deeco.model.runtime.impl.StringToObjectMapImpl <em>String To Object Map</em>}' class.\n+\t * <!-- begin-user-doc -->\n+\t * <!-- end-user-doc -->\n+\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.StringToObjectMapImpl\n+\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.RuntimeMetadataPackageImpl#getStringToObjectMap()\n+\t * @generated\n+\t */\n+\tint STRING_TO_OBJECT_MAP = 19;\n+\n+\t/**\n+\t * The meta object id for the '{@link cz.cuni.mff.d3s.deeco.model.runtime.impl.TimeTriggerImpl <em>Time Trigger</em>}' class.\n+\t * <!-- begin-user-doc -->\n+\t * <!-- end-user-doc -->\n+\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.TimeTriggerImpl\n+\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.RuntimeMetadataPackageImpl#getTimeTrigger()\n+\t * @generated\n+\t */\n+\tint TIME_TRIGGER = 0;\n \n \t/**\n \t * The feature id for the '<em><b>Period</b></em>' attribute.\n@@ -103,35 +283,34 @@ public interface RuntimeMetadataPackage extends EPackage {\n \t * @generated\n \t * @ordered\n \t */\n-\tint PERIODIC_TRIGGER__PERIOD = TRIGGER_FEATURE_COUNT + 0;\n+\tint TIME_TRIGGER__PERIOD = TRIGGER_FEATURE_COUNT + 0;\n \n \t/**\n-\t * The number of structural features of the '<em>Periodic Trigger</em>' class.\n+\t * The feature id for the '<em><b>Offset</b></em>' attribute.\n \t * <!-- begin-user-doc -->\n \t * <!-- end-user-doc -->\n \t * @generated\n \t * @ordered\n \t */\n-\tint PERIODIC_TRIGGER_FEATURE_COUNT = TRIGGER_FEATURE_COUNT + 1;\n+\tint TIME_TRIGGER__OFFSET = TRIGGER_FEATURE_COUNT + 1;\n \n \t/**\n-\t * The number of operations of the '<em>Periodic Trigger</em>' class.\n+\t * The number of structural features of the '<em>Time Trigger</em>' class.\n \t * <!-- begin-user-doc -->\n \t * <!-- end-user-doc -->\n \t * @generated\n \t * @ordered\n \t */\n-\tint PERIODIC_TRIGGER_OPERATION_COUNT = TRIGGER_OPERATION_COUNT + 0;\n+\tint TIME_TRIGGER_FEATURE_COUNT = TRIGGER_FEATURE_COUNT + 2;\n \n \t/**\n-\t * The meta object id for the '{@link cz.cuni.mff.d3s.deeco.model.runtime.impl.KnowledgeChangeTriggerImpl <em>Knowledge Change Trigger</em>}' class.\n+\t * The number of operations of the '<em>Time Trigger</em>' class.\n \t * <!-- begin-user-doc -->\n \t * <!-- end-user-doc -->\n-\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.KnowledgeChangeTriggerImpl\n-\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.RuntimeMetadataPackageImpl#getKnowledgeChangeTrigger()\n \t * @generated\n+\t * @ordered\n \t */\n-\tint KNOWLEDGE_CHANGE_TRIGGER = 2;\n+\tint TIME_TRIGGER_OPERATION_COUNT = TRIGGER_OPERATION_COUNT + 0;\n \n \t/**\n \t * The feature id for the '<em><b>Knowledge Path</b></em>' containment reference.\n@@ -160,16 +339,6 @@ public interface RuntimeMetadataPackage extends EPackage {\n \t */\n \tint KNOWLEDGE_CHANGE_TRIGGER_OPERATION_COUNT = TRIGGER_OPERATION_COUNT + 0;\n \n-\t/**\n-\t * The meta object id for the '{@link cz.cuni.mff.d3s.deeco.model.runtime.impl.KnowledgePathImpl <em>Knowledge Path</em>}' class.\n-\t * <!-- begin-user-doc -->\n-\t * <!-- end-user-doc -->\n-\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.KnowledgePathImpl\n-\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.RuntimeMetadataPackageImpl#getKnowledgePath()\n-\t * @generated\n-\t */\n-\tint KNOWLEDGE_PATH = 3;\n-\n \t/**\n \t * The feature id for the '<em><b>Nodes</b></em>' containment reference list.\n \t * <!-- begin-user-doc -->\n@@ -197,16 +366,6 @@ public interface RuntimeMetadataPackage extends EPackage {\n \t */\n \tint KNOWLEDGE_PATH_OPERATION_COUNT = 0;\n \n-\t/**\n-\t * The meta object id for the '{@link cz.cuni.mff.d3s.deeco.model.runtime.impl.PathNodeImpl <em>Path Node</em>}' class.\n-\t * <!-- begin-user-doc -->\n-\t * <!-- end-user-doc -->\n-\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.PathNodeImpl\n-\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.RuntimeMetadataPackageImpl#getPathNode()\n-\t * @generated\n-\t */\n-\tint PATH_NODE = 4;\n-\n \t/**\n \t * The number of structural features of the '<em>Path Node</em>' class.\n \t * <!-- begin-user-doc -->\n@@ -225,16 +384,6 @@ public interface RuntimeMetadataPackage extends EPackage {\n \t */\n \tint PATH_NODE_OPERATION_COUNT = 0;\n \n-\t/**\n-\t * The meta object id for the '{@link cz.cuni.mff.d3s.deeco.model.runtime.impl.PathNodeFieldImpl <em>Path Node Field</em>}' class.\n-\t * <!-- begin-user-doc -->\n-\t * <!-- end-user-doc -->\n-\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.PathNodeFieldImpl\n-\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.RuntimeMetadataPackageImpl#getPathNodeField()\n-\t * @generated\n-\t */\n-\tint PATH_NODE_FIELD = 5;\n-\n \t/**\n \t * The feature id for the '<em><b>Name</b></em>' attribute.\n \t * <!-- begin-user-doc -->\n@@ -262,16 +411,6 @@ public interface RuntimeMetadataPackage extends EPackage {\n \t */\n \tint PATH_NODE_FIELD_OPERATION_COUNT = PATH_NODE_OPERATION_COUNT + 0;\n \n-\t/**\n-\t * The meta object id for the '{@link cz.cuni.mff.d3s.deeco.model.runtime.impl.PathNodeMapKeyImpl <em>Path Node Map Key</em>}' class.\n-\t * <!-- begin-user-doc -->\n-\t * <!-- end-user-doc -->\n-\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.PathNodeMapKeyImpl\n-\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.RuntimeMetadataPackageImpl#getPathNodeMapKey()\n-\t * @generated\n-\t */\n-\tint PATH_NODE_MAP_KEY = 6;\n-\n \t/**\n \t * The feature id for the '<em><b>Key Path</b></em>' containment reference.\n \t * <!-- begin-user-doc -->\n@@ -299,16 +438,6 @@ public interface RuntimeMetadataPackage extends EPackage {\n \t */\n \tint PATH_NODE_MAP_KEY_OPERATION_COUNT = PATH_NODE_OPERATION_COUNT + 0;\n \n-\t/**\n-\t * The meta object id for the '{@link cz.cuni.mff.d3s.deeco.model.runtime.impl.RuntimeMetadataImpl <em>Runtime Metadata</em>}' class.\n-\t * <!-- begin-user-doc -->\n-\t * <!-- end-user-doc -->\n-\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.RuntimeMetadataImpl\n-\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.RuntimeMetadataPackageImpl#getRuntimeMetadata()\n-\t * @generated\n-\t */\n-\tint RUNTIME_METADATA = 7;\n-\n \t/**\n \t * The feature id for the '<em><b>Ensemble Definitions</b></em>' containment reference list.\n \t * <!-- begin-user-doc -->\n@@ -345,16 +474,6 @@ public interface RuntimeMetadataPackage extends EPackage {\n \t */\n \tint RUNTIME_METADATA_OPERATION_COUNT = 0;\n \n-\t/**\n-\t * The meta object id for the '{@link cz.cuni.mff.d3s.deeco.model.runtime.impl.ComponentInstanceImpl <em>Component Instance</em>}' class.\n-\t * <!-- begin-user-doc -->\n-\t * <!-- end-user-doc -->\n-\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.ComponentInstanceImpl\n-\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.RuntimeMetadataPackageImpl#getComponentInstance()\n-\t * @generated\n-\t */\n-\tint COMPONENT_INSTANCE = 8;\n-\n \t/**\n \t * The feature id for the '<em><b>Component Processes</b></em>' containment reference list.\n \t * <!-- begin-user-doc -->\n@@ -427,16 +546,6 @@ public interface RuntimeMetadataPackage extends EPackage {\n \t */\n \tint COMPONENT_INSTANCE_OPERATION_COUNT = 0;\n \n-\t/**\n-\t * The meta object id for the '{@link cz.cuni.mff.d3s.deeco.model.runtime.impl.EnsembleDefinitionImpl <em>Ensemble Definition</em>}' class.\n-\t * <!-- begin-user-doc -->\n-\t * <!-- end-user-doc -->\n-\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.EnsembleDefinitionImpl\n-\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.RuntimeMetadataPackageImpl#getEnsembleDefinition()\n-\t * @generated\n-\t */\n-\tint ENSEMBLE_DEFINITION = 9;\n-\n \t/**\n \t * The feature id for the '<em><b>Name</b></em>' attribute.\n \t * <!-- begin-user-doc -->\n@@ -500,16 +609,6 @@ public interface RuntimeMetadataPackage extends EPackage {\n \t */\n \tint ENSEMBLE_DEFINITION_OPERATION_COUNT = 0;\n \n-\t/**\n-\t * The meta object id for the '{@link cz.cuni.mff.d3s.deeco.model.runtime.impl.InvocableImpl <em>Invocable</em>}' class.\n-\t * <!-- begin-user-doc -->\n-\t * <!-- end-user-doc -->\n-\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.InvocableImpl\n-\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.RuntimeMetadataPackageImpl#getInvocable()\n-\t * @generated\n-\t */\n-\tint INVOCABLE = 14;\n-\n \t/**\n \t * The feature id for the '<em><b>Parameters</b></em>' containment reference list.\n \t * <!-- begin-user-doc -->\n@@ -546,16 +645,6 @@ public interface RuntimeMetadataPackage extends EPackage {\n \t */\n \tint INVOCABLE_OPERATION_COUNT = 0;\n \n-\t/**\n-\t * The meta object id for the '{@link cz.cuni.mff.d3s.deeco.model.runtime.impl.ConditionImpl <em>Condition</em>}' class.\n-\t * <!-- begin-user-doc -->\n-\t * <!-- end-user-doc -->\n-\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.ConditionImpl\n-\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.RuntimeMetadataPackageImpl#getCondition()\n-\t * @generated\n-\t */\n-\tint CONDITION = 10;\n-\n \t/**\n \t * The feature id for the '<em><b>Parameters</b></em>' containment reference list.\n \t * <!-- begin-user-doc -->\n@@ -592,16 +681,6 @@ public interface RuntimeMetadataPackage extends EPackage {\n \t */\n \tint CONDITION_OPERATION_COUNT = INVOCABLE_OPERATION_COUNT + 0;\n \n-\t/**\n-\t * The meta object id for the '{@link cz.cuni.mff.d3s.deeco.model.runtime.impl.ExchangeImpl <em>Exchange</em>}' class.\n-\t * <!-- begin-user-doc -->\n-\t * <!-- end-user-doc -->\n-\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.ExchangeImpl\n-\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.RuntimeMetadataPackageImpl#getExchange()\n-\t * @generated\n-\t */\n-\tint EXCHANGE = 11;\n-\n \t/**\n \t * The feature id for the '<em><b>Parameters</b></em>' containment reference list.\n \t * <!-- begin-user-doc -->\n@@ -638,16 +717,6 @@ public interface RuntimeMetadataPackage extends EPackage {\n \t */\n \tint EXCHANGE_OPERATION_COUNT = INVOCABLE_OPERATION_COUNT + 0;\n \n-\t/**\n-\t * The meta object id for the '{@link cz.cuni.mff.d3s.deeco.model.runtime.impl.ComponentProcessImpl <em>Component Process</em>}' class.\n-\t * <!-- begin-user-doc -->\n-\t * <!-- end-user-doc -->\n-\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.ComponentProcessImpl\n-\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.RuntimeMetadataPackageImpl#getComponentProcess()\n-\t * @generated\n-\t */\n-\tint COMPONENT_PROCESS = 12;\n-\n \t/**\n \t * The feature id for the '<em><b>Parameters</b></em>' containment reference list.\n \t * <!-- begin-user-doc -->\n@@ -720,16 +789,6 @@ public interface RuntimeMetadataPackage extends EPackage {\n \t */\n \tint COMPONENT_PROCESS_OPERATION_COUNT = INVOCABLE_OPERATION_COUNT + 0;\n \n-\t/**\n-\t * The meta object id for the '{@link cz.cuni.mff.d3s.deeco.model.runtime.impl.ParameterImpl <em>Parameter</em>}' class.\n-\t * <!-- begin-user-doc -->\n-\t * <!-- end-user-doc -->\n-\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.ParameterImpl\n-\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.RuntimeMetadataPackageImpl#getParameter()\n-\t * @generated\n-\t */\n-\tint PARAMETER = 13;\n-\n \t/**\n \t * The feature id for the '<em><b>Direction</b></em>' attribute.\n \t * <!-- begin-user-doc -->\n@@ -775,16 +834,6 @@ public interface RuntimeMetadataPackage extends EPackage {\n \t */\n \tint PARAMETER_OPERATION_COUNT = 0;\n \n-\t/**\n-\t * The meta object id for the '{@link cz.cuni.mff.d3s.deeco.model.runtime.impl.EnsembleControllerImpl <em>Ensemble Controller</em>}' class.\n-\t * <!-- begin-user-doc -->\n-\t * <!-- end-user-doc -->\n-\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.EnsembleControllerImpl\n-\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.RuntimeMetadataPackageImpl#getEnsembleController()\n-\t * @generated\n-\t */\n-\tint ENSEMBLE_CONTROLLER = 15;\n-\n \t/**\n \t * The feature id for the '<em><b>Component Instance</b></em>' container reference.\n \t * <!-- begin-user-doc -->\n@@ -821,16 +870,6 @@ public interface RuntimeMetadataPackage extends EPackage {\n \t */\n \tint ENSEMBLE_CONTROLLER_OPERATION_COUNT = 0;\n \n-\t/**\n-\t * The meta object id for the '{@link cz.cuni.mff.d3s.deeco.model.runtime.impl.PathNodeCoordinatorImpl <em>Path Node Coordinator</em>}' class.\n-\t * <!-- begin-user-doc -->\n-\t * <!-- end-user-doc -->\n-\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.PathNodeCoordinatorImpl\n-\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.RuntimeMetadataPackageImpl#getPathNodeCoordinator()\n-\t * @generated\n-\t */\n-\tint PATH_NODE_COORDINATOR = 16;\n-\n \t/**\n \t * The number of structural features of the '<em>Path Node Coordinator</em>' class.\n \t * <!-- begin-user-doc -->\n@@ -849,16 +888,6 @@ public interface RuntimeMetadataPackage extends EPackage {\n \t */\n \tint PATH_NODE_COORDINATOR_OPERATION_COUNT = PATH_NODE_OPERATION_COUNT + 0;\n \n-\t/**\n-\t * The meta object id for the '{@link cz.cuni.mff.d3s.deeco.model.runtime.impl.PathNodeMemberImpl <em>Path Node Member</em>}' class.\n-\t * <!-- begin-user-doc -->\n-\t * <!-- end-user-doc -->\n-\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.PathNodeMemberImpl\n-\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.RuntimeMetadataPackageImpl#getPathNodeMember()\n-\t * @generated\n-\t */\n-\tint PATH_NODE_MEMBER = 17;\n-\n \t/**\n \t * The number of structural features of the '<em>Path Node Member</em>' class.\n \t * <!-- begin-user-doc -->\n@@ -877,16 +906,6 @@ public interface RuntimeMetadataPackage extends EPackage {\n \t */\n \tint PATH_NODE_MEMBER_OPERATION_COUNT = PATH_NODE_OPERATION_COUNT + 0;\n \n-\t/**\n-\t * The meta object id for the '{@link cz.cuni.mff.d3s.deeco.model.runtime.impl.PathNodeComponentIdImpl <em>Path Node Component Id</em>}' class.\n-\t * <!-- begin-user-doc -->\n-\t * <!-- end-user-doc -->\n-\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.PathNodeComponentIdImpl\n-\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.RuntimeMetadataPackageImpl#getPathNodeComponentId()\n-\t * @generated\n-\t */\n-\tint PATH_NODE_COMPONENT_ID = 18;\n-\n \t/**\n \t * The number of structural features of the '<em>Path Node Component Id</em>' class.\n \t * <!-- begin-user-doc -->\n@@ -905,16 +924,6 @@ public interface RuntimeMetadataPackage extends EPackage {\n \t */\n \tint PATH_NODE_COMPONENT_ID_OPERATION_COUNT = PATH_NODE_OPERATION_COUNT + 0;\n \n-\t/**\n-\t * The meta object id for the '{@link cz.cuni.mff.d3s.deeco.model.runtime.impl.StringToObjectMapImpl <em>String To Object Map</em>}' class.\n-\t * <!-- begin-user-doc -->\n-\t * <!-- end-user-doc -->\n-\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.StringToObjectMapImpl\n-\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.RuntimeMetadataPackageImpl#getStringToObjectMap()\n-\t * @generated\n-\t */\n-\tint STRING_TO_OBJECT_MAP = 19;\n-\n \t/**\n \t * The feature id for the '<em><b>Key</b></em>' attribute.\n \t * <!-- begin-user-doc -->\n@@ -1001,27 +1010,6 @@ public interface RuntimeMetadataPackage extends EPackage {\n \t */\n \tint COMMUNICATION_BOUNDARY = 24;\n \n-\t/**\n-\t * Returns the meta object for class '{@link cz.cuni.mff.d3s.deeco.model.runtime.api.PeriodicTrigger <em>Periodic Trigger</em>}'.\n-\t * <!-- begin-user-doc -->\n-\t * <!-- end-user-doc -->\n-\t * @return the meta object for class '<em>Periodic Trigger</em>'.\n-\t * @see cz.cuni.mff.d3s.deeco.model.runtime.api.PeriodicTrigger\n-\t * @generated\n-\t */\n-\tEClass getPeriodicTrigger();\n-\n-\t/**\n-\t * Returns the meta object for the attribute '{@link cz.cuni.mff.d3s.deeco.model.runtime.api.PeriodicTrigger#getPeriod <em>Period</em>}'.\n-\t * <!-- begin-user-doc -->\n-\t * <!-- end-user-doc -->\n-\t * @return the meta object for the attribute '<em>Period</em>'.\n-\t * @see cz.cuni.mff.d3s.deeco.model.runtime.api.PeriodicTrigger#getPeriod()\n-\t * @see #getPeriodicTrigger()\n-\t * @generated\n-\t */\n-\tEAttribute getPeriodicTrigger_Period();\n-\n \t/**\n \t * Returns the meta object for class '{@link cz.cuni.mff.d3s.deeco.model.runtime.api.Trigger <em>Trigger</em>}'.\n \t * <!-- begin-user-doc -->\n@@ -1544,6 +1532,38 @@ public interface RuntimeMetadataPackage extends EPackage {\n \t */\n \tEAttribute getStringToObjectMap_Value();\n \n+\t/**\n+\t * Returns the meta object for class '{@link cz.cuni.mff.d3s.deeco.model.runtime.api.TimeTrigger <em>Time Trigger</em>}'.\n+\t * <!-- begin-user-doc -->\n+\t * <!-- end-user-doc -->\n+\t * @return the meta object for class '<em>Time Trigger</em>'.\n+\t * @see cz.cuni.mff.d3s.deeco.model.runtime.api.TimeTrigger\n+\t * @generated\n+\t */\n+\tEClass getTimeTrigger();\n+\n+\t/**\n+\t * Returns the meta object for the attribute '{@link cz.cuni.mff.d3s.deeco.model.runtime.api.TimeTrigger#getPeriod <em>Period</em>}'.\n+\t * <!-- begin-user-doc -->\n+\t * <!-- end-user-doc -->\n+\t * @return the meta object for the attribute '<em>Period</em>'.\n+\t * @see cz.cuni.mff.d3s.deeco.model.runtime.api.TimeTrigger#getPeriod()\n+\t * @see #getTimeTrigger()\n+\t * @generated\n+\t */\n+\tEAttribute getTimeTrigger_Period();\n+\n+\t/**\n+\t * Returns the meta object for the attribute '{@link cz.cuni.mff.d3s.deeco.model.runtime.api.TimeTrigger#getOffset <em>Offset</em>}'.\n+\t * <!-- begin-user-doc -->\n+\t * <!-- end-user-doc -->\n+\t * @return the meta object for the attribute '<em>Offset</em>'.\n+\t * @see cz.cuni.mff.d3s.deeco.model.runtime.api.TimeTrigger#getOffset()\n+\t * @see #getTimeTrigger()\n+\t * @generated\n+\t */\n+\tEAttribute getTimeTrigger_Offset();\n+\n \t/**\n \t * Returns the meta object for enum '{@link cz.cuni.mff.d3s.deeco.model.runtime.api.ParameterDirection <em>Parameter Direction</em>}'.\n \t * <!-- begin-user-doc -->\n@@ -1621,24 +1641,6 @@ public interface RuntimeMetadataPackage extends EPackage {\n \t * @generated\n \t */\n \tinterface Literals {\n-\t\t/**\n-\t\t * The meta object literal for the '{@link cz.cuni.mff.d3s.deeco.model.runtime.impl.PeriodicTriggerImpl <em>Periodic Trigger</em>}' class.\n-\t\t * <!-- begin-user-doc -->\n-\t\t * <!-- end-user-doc -->\n-\t\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.PeriodicTriggerImpl\n-\t\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.RuntimeMetadataPackageImpl#getPeriodicTrigger()\n-\t\t * @generated\n-\t\t */\n-\t\tEClass PERIODIC_TRIGGER = eINSTANCE.getPeriodicTrigger();\n-\n-\t\t/**\n-\t\t * The meta object literal for the '<em><b>Period</b></em>' attribute feature.\n-\t\t * <!-- begin-user-doc -->\n-\t\t * <!-- end-user-doc -->\n-\t\t * @generated\n-\t\t */\n-\t\tEAttribute PERIODIC_TRIGGER__PERIOD = eINSTANCE.getPeriodicTrigger_Period();\n-\n \t\t/**\n \t\t * The meta object literal for the '{@link cz.cuni.mff.d3s.deeco.model.runtime.impl.TriggerImpl <em>Trigger</em>}' class.\n \t\t * <!-- begin-user-doc -->\n@@ -2069,6 +2071,32 @@ interface Literals {\n \t\t */\n \t\tEAttribute STRING_TO_OBJECT_MAP__VALUE = eINSTANCE.getStringToObjectMap_Value();\n \n+\t\t/**\n+\t\t * The meta object literal for the '{@link cz.cuni.mff.d3s.deeco.model.runtime.impl.TimeTriggerImpl <em>Time Trigger</em>}' class.\n+\t\t * <!-- begin-user-doc -->\n+\t\t * <!-- end-user-doc -->\n+\t\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.TimeTriggerImpl\n+\t\t * @see cz.cuni.mff.d3s.deeco.model.runtime.impl.RuntimeMetadataPackageImpl#getTimeTrigger()\n+\t\t * @generated\n+\t\t */\n+\t\tEClass TIME_TRIGGER = eINSTANCE.getTimeTrigger();\n+\n+\t\t/**\n+\t\t * The meta object literal for the '<em><b>Period</b></em>' attribute feature.\n+\t\t * <!-- begin-user-doc -->\n+\t\t * <!-- end-user-doc -->\n+\t\t * @generated\n+\t\t */\n+\t\tEAttribute TIME_TRIGGER__PERIOD = eINSTANCE.getTimeTrigger_Period();\n+\n+\t\t/**\n+\t\t * The meta object literal for the '<em><b>Offset</b></em>' attribute feature.\n+\t\t * <!-- begin-user-doc -->\n+\t\t * <!-- end-user-doc -->\n+\t\t * @generated\n+\t\t */\n+\t\tEAttribute TIME_TRIGGER__OFFSET = eINSTANCE.getTimeTrigger_Offset();\n+\n \t\t/**\n \t\t * The meta object literal for the '{@link cz.cuni.mff.d3s.deeco.model.runtime.api.ParameterDirection <em>Parameter Direction</em>}' enum.\n \t\t * <!-- begin-user-doc -->", "raw_url": "https://github.com/d3scomp/JDEECo/raw/cddfa1a013f7c6f02e6e496b211ac6da552641e7/jdeeco-core%2Fsrc%2Fcz%2Fcuni%2Fmff%2Fd3s%2Fdeeco%2Fmodel%2Fruntime%2Fmeta%2FRuntimeMetadataPackage.java", "sha": "bf9336d3aae996ec26d2b8cee5d84835b99e136f", "status": "modified" }, { "additions": 39, "blob_url": "https://github.com/d3scomp/JDEECo/blob/cddfa1a013f7c6f02e6e496b211ac6da552641e7/jdeeco-core%2Fsrc%2Fcz%2Fcuni%2Fmff%2Fd3s%2Fdeeco%2Fnetwork%2FKnowledgeDataManager.java", "changes": 48, "contents_url": "https://api.github.com/repos/d3scomp/JDEECo/contents/jdeeco-core%2Fsrc%2Fcz%2Fcuni%2Fmff%2Fd3s%2Fdeeco%2Fnetwork%2FKnowledgeDataManager.java?ref=cddfa1a013f7c6f02e6e496b211ac6da552641e7", "deletions": 9, "filename": "jdeeco-core/src/cz/cuni/mff/d3s/deeco/network/KnowledgeDataManager.java", "new_code": "import cz.cuni.mff.d3s.deeco.DeecoProperties;\n\t// this rssi corresponds to roughly 50m distance\n\tpublic static final double RSSI_50m = 5.59e-9;\n\t\n\tprivate final boolean useIndividualPublishing;\n\tprivate final boolean checkGossipCondition;\n\tprivate final boolean checkBoundaryCondition;\n\tprivate final double rssiLimit;\n\n\t\t\n\t\tuseIndividualPublishing = Boolean.getBoolean(DeecoProperties.USE_INDIVIDUAL_KNOWLEDGE_PUBLISHING);\n\t\tLog.d(String.format(\"KnowledgeDataManager at %s uses %s publishing\", host, useIndividualPublishing ? \"individual\" : \"list\"));\n\t\t\n\t\tcheckGossipCondition = !Boolean.getBoolean(DeecoProperties.DISABLE_GOSSIP_CONDITION);\n\t\tLog.d(String.format(\"KnowledgeDataManager at %s uses checkGossipCondition = %b\", host, checkGossipCondition));\n\t\t\n\t\tcheckBoundaryCondition = !Boolean.getBoolean(DeecoProperties.DISABLE_BOUNDARY_CONDITIONS);\n\t\tLog.d(String.format(\"KnowledgeDataManager at %s uses checkBoundaryCondition = %b\", host, checkBoundaryCondition));\n\n\t\tdouble rssi = 0;\n\t\ttry {\n\t\t\trssi = Double.parseDouble(System.getProperty(DeecoProperties.GOSSIP_CONDITION_RSSI));\n\t\t} catch (Exception e) {\n\t\t\trssi = RSSI_50m;\n\t\t}\n\t\trssiLimit = rssi;\n\t\tLog.d(String.format(\"KnowledgeDataManager at %s uses rssiLimit = %g\", host, rssiLimit));\n\t\t\tif (useIndividualPublishing) {\n\t\t\t\t// broadcast each kd individually to minimize the message size and\n\t\t\t\t// thus reduce network collisions.\n\t\t\t\tfor (KnowledgeData kd: data) {\n\t\t\t\t\tknowledgeDataSender.broadcastKnowledgeData(Arrays.asList(kd));\n\t\t\t\t}\n\t\t\t} else {\n\t\t\t\tknowledgeDataSender.broadcastKnowledgeData(data);\n\t\t\t}\n\t\t\t\tif (checkGossipCondition && !satisfiesGossipCondition(kmd)) { \n\t\t\t\tif (checkBoundaryCondition && !isInSomeBoundary(kd, nodeKm)) {\n\t\treturn kmd.rssi < 0 || kmd.rssi <= rssiLimit;\t\t", "new_methods": [], "old_code": "//\t\t\t// broadcast each kd individually to minimize the message size and\n//\t\t\t// thus reduce network collisions.\n//\t\t\tfor (KnowledgeData kd: data)\n//\t\t\t\tknowledgeDataSender.broadcastKnowledgeData(Arrays.asList(kd));\n\t\t\tknowledgeDataSender.broadcastKnowledgeData(data);\n\t\t\t\tif (!satisfiesGossipCondition(kmd)) { \n\t\t\t\tif (!isInSomeBoundary(kd, nodeKm)) {\n\t\t// the signal came from more than 20m\n\t\treturn kmd.rssi < 0 || kmd.rssi <= RSSI_20m;\t\t", "old_methods": [], "patch": "@@ -6,6 +6,7 @@\n import java.util.List;\n import java.util.Map;\n \n+import cz.cuni.mff.d3s.deeco.DeecoProperties;\n import cz.cuni.mff.d3s.deeco.knowledge.ChangeSet;\n import cz.cuni.mff.d3s.deeco.knowledge.KnowledgeManager;\n import cz.cuni.mff.d3s.deeco.knowledge.KnowledgeManagerContainer;\n@@ -52,6 +53,8 @@ public class KnowledgeDataManager implements KnowledgeDataReceiver,\n \tpublic static final double RSSI_20m = 5.52e-8; \n \t// this rssi corresponds to roughly 10m distance\n \tpublic static final double RSSI_10m = 3.12e-7;\n+\t// this rssi corresponds to roughly 50m distance\n+\tpublic static final double RSSI_50m = 5.59e-9;\n \t\n \t/** Global version counter for all outgoing local knowledge. */\n \tprotected long localVersion;\t\n@@ -69,6 +72,12 @@ public class KnowledgeDataManager implements KnowledgeDataReceiver,\n \tprivate final List<KnowledgePath> emptyPath;\n \t/** List of ensemble definitions whose boundary conditions should be considered. */\n \tprivate final List<EnsembleDefinition> ensembleDefinitions;\n+\t\n+\tprivate final boolean useIndividualPublishing;\n+\tprivate final boolean checkGossipCondition;\n+\tprivate final boolean checkBoundaryCondition;\n+\tprivate final double rssiLimit;\n+\n \n \t\n \t/**\n@@ -97,6 +106,24 @@ public KnowledgeDataManager(\n \t\tKnowledgePath empty = factory.createKnowledgePath();\n \t\temptyPath = new LinkedList<>();\n \t\temptyPath.add(empty);\n+\t\t\n+\t\tuseIndividualPublishing = Boolean.getBoolean(DeecoProperties.USE_INDIVIDUAL_KNOWLEDGE_PUBLISHING);\n+\t\tLog.d(String.format(\"KnowledgeDataManager at %s uses %s publishing\", host, useIndividualPublishing ? \"individual\" : \"list\"));\n+\t\t\n+\t\tcheckGossipCondition = !Boolean.getBoolean(DeecoProperties.DISABLE_GOSSIP_CONDITION);\n+\t\tLog.d(String.format(\"KnowledgeDataManager at %s uses checkGossipCondition = %b\", host, checkGossipCondition));\n+\t\t\n+\t\tcheckBoundaryCondition = !Boolean.getBoolean(DeecoProperties.DISABLE_BOUNDARY_CONDITIONS);\n+\t\tLog.d(String.format(\"KnowledgeDataManager at %s uses checkBoundaryCondition = %b\", host, checkBoundaryCondition));\n+\n+\t\tdouble rssi = 0;\n+\t\ttry {\n+\t\t\trssi = Double.parseDouble(System.getProperty(DeecoProperties.GOSSIP_CONDITION_RSSI));\n+\t\t} catch (Exception e) {\n+\t\t\trssi = RSSI_50m;\n+\t\t}\n+\t\trssiLimit = rssi;\n+\t\tLog.d(String.format(\"KnowledgeDataManager at %s uses rssiLimit = %g\", host, rssiLimit));\n \t}\n \t\n \t@Override\n@@ -108,11 +135,15 @@ public void publish() {\n \t\t//TODO\n \t\tif (!data.isEmpty()) {\n \t\t\t\n-//\t\t\t// broadcast each kd individually to minimize the message size and\n-//\t\t\t// thus reduce network collisions.\n-//\t\t\tfor (KnowledgeData kd: data)\n-//\t\t\t\tknowledgeDataSender.broadcastKnowledgeData(Arrays.asList(kd));\n-\t\t\tknowledgeDataSender.broadcastKnowledgeData(data);\n+\t\t\tif (useIndividualPublishing) {\n+\t\t\t\t// broadcast each kd individually to minimize the message size and\n+\t\t\t\t// thus reduce network collisions.\n+\t\t\t\tfor (KnowledgeData kd: data) {\n+\t\t\t\t\tknowledgeDataSender.broadcastKnowledgeData(Arrays.asList(kd));\n+\t\t\t\t}\n+\t\t\t} else {\n+\t\t\t\tknowledgeDataSender.broadcastKnowledgeData(data);\n+\t\t\t}\n \t\t\tlocalVersion++;\n \t\t}\n \t}\n@@ -178,7 +209,7 @@ List<? extends KnowledgeData> prepareKnowledgeData() {\n \t\t\t\tKnowledgeMetaData kmd = replicaMetadata.get(km);\n \t\t\t\tKnowledgeManager nodeKm = getNodeKnowledge();\n \t\t\t\t\t\t\t\t\n-\t\t\t\tif (!satisfiesGossipCondition(kmd)) { \n+\t\t\t\tif (checkGossipCondition && !satisfiesGossipCondition(kmd)) { \n \t\t\t\t\tLog.d(String.format(\"Gossip condition failed (%d) at %s for %sv%d from %s with rssi %g\\n\", \n \t\t\t\t\t\t\ttimeProvider.getCurrentTime(), host, kmd.componentId, kmd.versionId, kmd.sender, kmd.rssi));\n \t\t\t\t\tcontinue;\n@@ -191,7 +222,7 @@ List<? extends KnowledgeData> prepareKnowledgeData() {\n \t\t\t\tkmdCopy.sender = host;\n \t\t\t\tKnowledgeData kd = new KnowledgeData(km.get(emptyPath), kmdCopy);\n \n-\t\t\t\tif (!isInSomeBoundary(kd, nodeKm)) {\n+\t\t\t\tif (checkBoundaryCondition && !isInSomeBoundary(kd, nodeKm)) {\n \t\t\t\t\tLog.d(String.format(\"Boundary failed (%d) at %s for %sv%d\\n\", \n \t\t\t\t\t\t\ttimeProvider.getCurrentTime(), host, kmd.componentId, kmd.versionId));\n \t\t\t\t\tcontinue;\n@@ -210,8 +241,7 @@ List<? extends KnowledgeData> prepareKnowledgeData() {\n \n \tprivate boolean satisfiesGossipCondition(KnowledgeMetaData kmd) {\n \t\t// rssi < 0 means received from IP\n-\t\t// the signal came from more than 20m\n-\t\treturn kmd.rssi < 0 || kmd.rssi <= RSSI_20m;\t\t\n+\t\treturn kmd.rssi < 0 || kmd.rssi <= rssiLimit;\t\t\n \t}\n \n \tprivate boolean isInSomeBoundary(KnowledgeData data, KnowledgeManager sender) {", "raw_url": "https://github.com/d3scomp/JDEECo/raw/cddfa1a013f7c6f02e6e496b211ac6da552641e7/jdeeco-core%2Fsrc%2Fcz%2Fcuni%2Fmff%2Fd3s%2Fdeeco%2Fnetwork%2FKnowledgeDataManager.java", "sha": "85a82d0b608f842def248906c9572fb0a4aa37e7", "status": "modified" }, { "additions": 21, "blob_url": "https://github.com/d3scomp/JDEECo/blob/cddfa1a013f7c6f02e6e496b211ac6da552641e7/jdeeco-core%2Fsrc%2Fcz%2Fcuni%2Fmff%2Fd3s%2Fdeeco%2Fnetwork%2FPacketReceiver.java", "changes": 25, "contents_url": "https://api.github.com/repos/d3scomp/JDEECo/contents/jdeeco-core%2Fsrc%2Fcz%2Fcuni%2Fmff%2Fd3s%2Fdeeco%2Fnetwork%2FPacketReceiver.java?ref=cddfa1a013f7c6f02e6e496b211ac6da552641e7", "deletions": 4, "filename": "jdeeco-core/src/cz/cuni/mff/d3s/deeco/network/PacketReceiver.java", "new_code": "import cz.cuni.mff.d3s.deeco.DeecoProperties;\n\tprivate final static int DEFAULT_MESSAGE_WIPE_PERIOD = 500;\n\t\n\tprivate final static int DEFAULT_MAX_MESSAGE_TIME = 2000;\n\n\t\n\tprivate final int maxMessageTime;\n\tprivate final int messageWipePeriod;\n\t\t\n\t\tmaxMessageTime = Integer.getInteger(DeecoProperties.MESSAGE_CACHE_DEADLINE, DEFAULT_MAX_MESSAGE_TIME);\n\t\tmessageWipePeriod = Integer.getInteger(DeecoProperties.MESSAGE_CACHE_WIPE_PERIOD, DEFAULT_MESSAGE_WIPE_PERIOD);\n\t\t\n\t\tLog.d(String.format(\"PacketReceiver at %s uses packetSize=%d, maxMessageTime=%d, messageWipePeriod=%d\", \n\t\t\t\thost, packetSize, maxMessageTime, messageWipePeriod));\n\t\t\n\t}\n\t\n\tpublic PacketReceiver(String host) {\n\t\tthis(host, Integer.getInteger(DeecoProperties.PACKET_SIZE, PacketSender.DEFAULT_PACKET_SIZE));\n\t\tif (timeProvider.getCurrentTime() - lastMessagesWipe >= messageWipePeriod) {\n\t\t\treturn timeProvider.getCurrentTime() - creationTime > maxMessageTime;", "new_methods": [], "old_code": "\tprivate final static int MESSAGE_WIPE_PERIOD = 500;\n\t\tif (timeProvider.getCurrentTime() - lastMessagesWipe >= MESSAGE_WIPE_PERIOD) {\n\t\tprivate final static int MAX_MESSAGE_TIME = 1000;\n\t\t\treturn timeProvider.getCurrentTime() - creationTime > MAX_MESSAGE_TIME;", "old_methods": [], "patch": "@@ -12,6 +12,7 @@\n import java.util.Map.Entry;\n import java.util.Set;\n \n+import cz.cuni.mff.d3s.deeco.DeecoProperties;\n import cz.cuni.mff.d3s.deeco.logging.Log;\n import cz.cuni.mff.d3s.deeco.scheduler.CurrentTimeProvider;\n \n@@ -27,7 +28,10 @@\n */\n public class PacketReceiver {\n \n-\tprivate final static int MESSAGE_WIPE_PERIOD = 500;\n+\tprivate final static int DEFAULT_MESSAGE_WIPE_PERIOD = 500;\n+\t\n+\tprivate final static int DEFAULT_MAX_MESSAGE_TIME = 2000;\n+\n \n \tprivate final String host;\n \t\n@@ -37,11 +41,25 @@ public class PacketReceiver {\n \tprivate KnowledgeDataReceiver knowledgeDataReceiver;\n \tprivate CurrentTimeProvider timeProvider;\n \tprivate long lastMessagesWipe = 0;\n+\t\n+\tprivate final int maxMessageTime;\n+\tprivate final int messageWipePeriod;\n \n \tpublic PacketReceiver(String host, int packetSize) {\n \t\tthis.packetSize = packetSize;\n \t\tthis.messages = new HashMap<Integer, Message>();\n \t\tthis.host = host;\n+\t\t\n+\t\tmaxMessageTime = Integer.getInteger(DeecoProperties.MESSAGE_CACHE_DEADLINE, DEFAULT_MAX_MESSAGE_TIME);\n+\t\tmessageWipePeriod = Integer.getInteger(DeecoProperties.MESSAGE_CACHE_WIPE_PERIOD, DEFAULT_MESSAGE_WIPE_PERIOD);\n+\t\t\n+\t\tLog.d(String.format(\"PacketReceiver at %s uses packetSize=%d, maxMessageTime=%d, messageWipePeriod=%d\", \n+\t\t\t\thost, packetSize, maxMessageTime, messageWipePeriod));\n+\t\t\n+\t}\n+\t\n+\tpublic PacketReceiver(String host) {\n+\t\tthis(host, Integer.getInteger(DeecoProperties.PACKET_SIZE, PacketSender.DEFAULT_PACKET_SIZE));\n \t}\n \n \tpublic void setKnowledgeDataReceiver(\n@@ -86,7 +104,7 @@ public void packetReceived(byte[] packet, double rssi) {\n \n \t//TODO Possibly this should be scheduled as a task in the Scheduler.\n \tprivate void clearCachedMessagesIfNecessary() {\n-\t\tif (timeProvider.getCurrentTime() - lastMessagesWipe >= MESSAGE_WIPE_PERIOD) {\n+\t\tif (timeProvider.getCurrentTime() - lastMessagesWipe >= messageWipePeriod) {\n \t\t\tint origCnt = messages.size();\n \n \t\t\tSet<Integer> droppedIds = new HashSet<>();\n@@ -138,7 +156,6 @@ private byte[] getPacketData(byte[] packet) {\n \n \tprivate class Message {\n \n-\t\tprivate final static int MAX_MESSAGE_TIME = 1000;\n \n \t\tprivate Map<Integer, Object> cache = new HashMap<>();\n \n@@ -156,7 +173,7 @@ public Message(int messageId) {\n \t\t}\n \n \t\tpublic boolean isStale() {\n-\t\t\treturn timeProvider.getCurrentTime() - creationTime > MAX_MESSAGE_TIME;\n+\t\t\treturn timeProvider.getCurrentTime() - creationTime > maxMessageTime;\n \t\t}\n \t\t\n \t\tpublic void setLastRSSI(double rssi) {", "raw_url": "https://github.com/d3scomp/JDEECo/raw/cddfa1a013f7c6f02e6e496b211ac6da552641e7/jdeeco-core%2Fsrc%2Fcz%2Fcuni%2Fmff%2Fd3s%2Fdeeco%2Fnetwork%2FPacketReceiver.java", "sha": "5e38e8e2ab29547b1df24b9eca11bbdf4873bed8", "status": "modified" }, { "additions": 12, "blob_url": "https://github.com/d3scomp/JDEECo/blob/cddfa1a013f7c6f02e6e496b211ac6da552641e7/jdeeco-core%2Fsrc%2Fcz%2Fcuni%2Fmff%2Fd3s%2Fdeeco%2Fnetwork%2FPacketSender.java", "changes": 13, "contents_url": "https://api.github.com/repos/d3scomp/JDEECo/contents/jdeeco-core%2Fsrc%2Fcz%2Fcuni%2Fmff%2Fd3s%2Fdeeco%2Fnetwork%2FPacketSender.java?ref=cddfa1a013f7c6f02e6e496b211ac6da552641e7", "deletions": 1, "filename": "jdeeco-core/src/cz/cuni/mff/d3s/deeco/network/PacketSender.java", "new_code": "import cz.cuni.mff.d3s.deeco.DeecoProperties;\n\tstatic int DEFAULT_PACKET_SIZE = 1000;\n\n\tprivate final int packetSize;\n\n\t//FIXME: this would not work if distributed on multiple JVMs\n\t\t\n\t\tLog.d(String.format(\"PacketSender at %s uses packetSize = %d\", host, packetSize));\n\t}\n\t\n\tpublic PacketSender(String host) {\n\t\tthis(host, Integer.getInteger(DeecoProperties.PACKET_SIZE, DEFAULT_PACKET_SIZE));", "new_methods": [], "old_code": "\tprivate final int packetSize;", "old_methods": [], "patch": "@@ -5,6 +5,7 @@\n import java.util.Arrays;\n import java.util.List;\n \n+import cz.cuni.mff.d3s.deeco.DeecoProperties;\n import cz.cuni.mff.d3s.deeco.logging.Log;\n \n /**\n@@ -19,17 +20,21 @@\n */\n public abstract class PacketSender implements KnowledgeDataSender {\n \n+\tstatic int DEFAULT_PACKET_SIZE = 1000;\n+\n \t// We reserver Integer.MIN_VALUE for distinguishing initial packets.\n \tprivate static int CURRENT_MESSAGE_ID = Integer.MIN_VALUE;\n \n \tprivate final String host;\n \t\n+\tprivate final int packetSize;\n+\n+\t//FIXME: this would not work if distributed on multiple JVMs\n \tpublic synchronized static int getNextMessageId() {\n \t\tCURRENT_MESSAGE_ID++;\n \t\treturn CURRENT_MESSAGE_ID;\n \t}\n \n-\tprivate final int packetSize;\n \n \t/**\n \t * Minimum fragment size is at least 12 bytes.\n@@ -41,6 +46,12 @@ public PacketSender(String host, int packetSize) {\n \t\tassert packetSize >= 12;\n \t\tthis.packetSize = packetSize;\n \t\tthis.host = host;\n+\t\t\n+\t\tLog.d(String.format(\"PacketSender at %s uses packetSize = %d\", host, packetSize));\n+\t}\n+\t\n+\tpublic PacketSender(String host) {\n+\t\tthis(host, Integer.getInteger(DeecoProperties.PACKET_SIZE, DEFAULT_PACKET_SIZE));\n \t}\n \t\n \t@Override", "raw_url": "https://github.com/d3scomp/JDEECo/raw/cddfa1a013f7c6f02e6e496b211ac6da552641e7/jdeeco-core%2Fsrc%2Fcz%2Fcuni%2Fmff%2Fd3s%2Fdeeco%2Fnetwork%2FPacketSender.java", "sha": "f1d61b73ec2e0334d9be0d8f7fb7bdfa4e0ff1ad", "status": "modified" }, { "additions": 20, "blob_url": "https://github.com/d3scomp/JDEECo/blob/cddfa1a013f7c6f02e6e496b211ac6da552641e7/jdeeco-core%2Fsrc%2Fcz%2Fcuni%2Fmff%2Fd3s%2Fdeeco%2Fnetwork%2FPublisherTask.java", "changes": 30, "contents_url": "https://api.github.com/repos/d3scomp/JDEECo/contents/jdeeco-core%2Fsrc%2Fcz%2Fcuni%2Fmff%2Fd3s%2Fdeeco%2Fnetwork%2FPublisherTask.java?ref=cddfa1a013f7c6f02e6e496b211ac6da552641e7", "deletions": 10, "filename": "jdeeco-core/src/cz/cuni/mff/d3s/deeco/network/PublisherTask.java", "new_code": "import cz.cuni.mff.d3s.deeco.DeecoProperties;\nimport cz.cuni.mff.d3s.deeco.logging.Log;\nimport cz.cuni.mff.d3s.deeco.model.runtime.api.TimeTrigger;\nimport cz.cuni.mff.d3s.deeco.model.runtime.custom.TimeTriggerExt;\n\tpublic static final int DEFAULT_PUBLISHING_PERIOD = 1000;\n\n\tprivate final PublisherTrigger trigger;\n\tprivate static class PublisherTrigger extends TimeTriggerExt {\n\n\t\tpublic PublisherTrigger(long period, long seed) {\n\t\t\tsetOffset(0);\n\t\t\trandom = new Random(seed);\n\t\t}\t\t\n\tpublic PublisherTask(Scheduler scheduler, KnowledgeDataPublisher publisher, String host) {\n\t\tthis(scheduler, publisher, Integer.getInteger(DeecoProperties.PUBLISHING_PERIOD, DEFAULT_PUBLISHING_PERIOD), host);\n\t}\n\t\tthis.trigger = new PublisherTrigger(period, seed);\n\t\t\n\t\tLog.i(String.format(\"PublisherTask at %s uses publishing period %d\", host, period));\n\tpublic TimeTrigger getTimeTrigger() {", "new_methods": [ { "arguments": [ "long period", " long seed" ], "filename": "jdeeco-core/src/cz/cuni/mff/d3s/deeco/network/PublisherTask.java", "implementation": "setOffset(0);\n\t\t\trandom = new Random(seed);", "signature": "public PublisherTrigger(long period, long seed)" }, { "arguments": [ "Scheduler scheduler", " KnowledgeDataPublisher publisher", " String host" ], "filename": "jdeeco-core/src/cz/cuni/mff/d3s/deeco/network/PublisherTask.java", "implementation": "this(scheduler, publisher, Integer.getInteger(DeecoProperties.PUBLISHING_PERIOD, DEFAULT_PUBLISHING_PERIOD), host);", "signature": "public PublisherTask(Scheduler scheduler, KnowledgeDataPublisher publisher, String host)" } ], "old_code": "import cz.cuni.mff.d3s.deeco.model.runtime.api.PeriodicTrigger;\nimport cz.cuni.mff.d3s.deeco.model.runtime.custom.PeriodicTriggerExt;\n\t\n\tprivate final PeriodicTrigger trigger;\n\tprivate static class PublisherPeriod extends PeriodicTriggerExt {\n\t\tpublic PublisherPeriod(long period, long seed) {\n\t\t\trandom = new Random(period);\n\t\t}\n\t\tthis.trigger = new PublisherPeriod(period, seed);\n\tpublic PeriodicTrigger getPeriodicTrigger() {", "old_methods": [ { "arguments": [ "long period", " long seed" ], "filename": "jdeeco-core/src/cz/cuni/mff/d3s/deeco/network/PublisherTask.java", "implementation": "random = new Random(period);", "signature": "public PublisherPeriod(long period, long seed)" } ], "patch": "@@ -5,9 +5,11 @@\n \n import java.util.Random;\n \n-import cz.cuni.mff.d3s.deeco.model.runtime.api.PeriodicTrigger;\n+import cz.cuni.mff.d3s.deeco.DeecoProperties;\n+import cz.cuni.mff.d3s.deeco.logging.Log;\n+import cz.cuni.mff.d3s.deeco.model.runtime.api.TimeTrigger;\n import cz.cuni.mff.d3s.deeco.model.runtime.api.Trigger;\n-import cz.cuni.mff.d3s.deeco.model.runtime.custom.PeriodicTriggerExt;\n+import cz.cuni.mff.d3s.deeco.model.runtime.custom.TimeTriggerExt;\n import cz.cuni.mff.d3s.deeco.scheduler.Scheduler;\n import cz.cuni.mff.d3s.deeco.task.Task;\n import cz.cuni.mff.d3s.deeco.task.TaskInvocationException;\n@@ -21,9 +23,10 @@\n * \n */\n public class PublisherTask extends Task {\n-\t\n+\tpublic static final int DEFAULT_PUBLISHING_PERIOD = 1000;\n+\n \tprivate final KnowledgeDataPublisher publisher;\n-\tprivate final PeriodicTrigger trigger;\n+\tprivate final PublisherTrigger trigger;\n \t\n \t/**\n \t * Randomized periodic trigger for avoiding recurring collisions of\n@@ -32,31 +35,38 @@ public class PublisherTask extends Task {\n \t * @author Jaroslav Keznikl <keznikl@d3s.mff.cuni.cz>\n \t * \n \t */\n-\tprivate static class PublisherPeriod extends PeriodicTriggerExt {\n+\tprivate static class PublisherTrigger extends TimeTriggerExt {\n \t\tpublic static final double PERIOD_VARIABILITY = 0.2;\n+\n \t\tRandom random;\n \n-\t\tpublic PublisherPeriod(long period, long seed) {\n+\t\tpublic PublisherTrigger(long period, long seed) {\n \t\t\tsuper();\n \t\t\tsetPeriod(period);\n-\t\t\trandom = new Random(period);\n+\t\t\tsetOffset(0);\n+\t\t\trandom = new Random(seed);\n \t\t}\n \t\t\n \t\t@Override\n \t\tpublic long getPeriod() {\t\t\t\n \t\t\t// variability is randomized by at most +- PERIOD_VARIABILITY * getPeriod()\n \t\t\tint variability = (int) (PERIOD_VARIABILITY*super.getPeriod());\n \t\t\treturn super.getPeriod() + random.nextInt(2*variability) - variability;\n-\t\t}\n+\t\t}\t\t\n \t}\n \t\n+\tpublic PublisherTask(Scheduler scheduler, KnowledgeDataPublisher publisher, String host) {\n+\t\tthis(scheduler, publisher, Integer.getInteger(DeecoProperties.PUBLISHING_PERIOD, DEFAULT_PUBLISHING_PERIOD), host);\n+\t}\n \tpublic PublisherTask(Scheduler scheduler, KnowledgeDataPublisher publisher, long period, String host) {\n \t\tsuper(scheduler);\t\t\n \t\tlong seed = 0;\n \t\tfor (char c: host.toCharArray())\n \t\t\tseed += c;\n-\t\tthis.trigger = new PublisherPeriod(period, seed);\n+\t\tthis.trigger = new PublisherTrigger(period, seed);\n \t\tthis.publisher = publisher;\n+\t\t\n+\t\tLog.i(String.format(\"PublisherTask at %s uses publishing period %d\", host, period));\n \t}\n \n \t/* (non-Javadoc)\n@@ -91,7 +101,7 @@ protected void unregisterTriggers() {\n \t * @see cz.cuni.mff.d3s.deeco.task.Task#getPeriodicTrigger()\n \t */\n \t@Override\n-\tpublic PeriodicTrigger getPeriodicTrigger() {\n+\tpublic TimeTrigger getTimeTrigger() {\n \t\treturn trigger;\n \t}\n ", "raw_url": "https://github.com/d3scomp/JDEECo/raw/cddfa1a013f7c6f02e6e496b211ac6da552641e7/jdeeco-core%2Fsrc%2Fcz%2Fcuni%2Fmff%2Fd3s%2Fdeeco%2Fnetwork%2FPublisherTask.java", "sha": "15fb714727f6b72c6651aa6d61e1e9c0ba94cd2d", "status": "modified" }, { "additions": 13, "blob_url": "https://github.com/d3scomp/JDEECo/blob/cddfa1a013f7c6f02e6e496b211ac6da552641e7/jdeeco-core%2Fsrc%2Fcz%2Fcuni%2Fmff%2Fd3s%2Fdeeco%2Fscheduler%2FSchedulerEvent.java", "changes": 20, "contents_url": "https://api.github.com/repos/d3scomp/JDEECo/contents/jdeeco-core%2Fsrc%2Fcz%2Fcuni%2Fmff%2Fd3s%2Fdeeco%2Fscheduler%2FSchedulerEvent.java?ref=cddfa1a013f7c6f02e6e496b211ac6da552641e7", "deletions": 7, "filename": "jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/SchedulerEvent.java", "new_code": "import cz.cuni.mff.d3s.deeco.model.runtime.api.TimeTrigger;\n * Wrapper class for all scheduler events\n * Indicator, whether the event is periodic (i.e., fixed-rate execution). \n * It is set to true only if the trigger is a TimeTrigger with period > 0.\n public final boolean periodic;\n public final Task executable;\n public final Trigger trigger;\n \tthis.trigger = trigger; \t\n \tif ((trigger != null) && (trigger instanceof TimeTrigger) && (((TimeTrigger) trigger).getPeriod() > 0)) {\n \t\tperiodic = true;\n \t} else {\n \t\tperiodic = false;\n \t}", "new_methods": [], "old_code": " * Wrapper class for all periodic events\n * Period in milliseconds for repeating tasks. A positive value indicates\n * fixed-rate execution. A value of 0 indicates a non-repeating task.\n public long period = 0;\n public Task executable;\n public Trigger trigger;\n \tthis.trigger = trigger;", "old_methods": [], "patch": "@@ -1,10 +1,11 @@\n package cz.cuni.mff.d3s.deeco.scheduler;\n \n+import cz.cuni.mff.d3s.deeco.model.runtime.api.TimeTrigger;\n import cz.cuni.mff.d3s.deeco.model.runtime.api.Trigger;\n import cz.cuni.mff.d3s.deeco.task.Task;\n \n /**\n- * Wrapper class for all periodic events\n+ * Wrapper class for all scheduler events\n * <p>\n * \n * @author \tAndranik Muradyan \t<muradian@d3s.mff.cuni.cz>\n@@ -32,28 +33,33 @@ public class SchedulerEvent implements Comparable<SchedulerEvent> {\n public long nextExecutionTime;\n \n /**\n- * Period in milliseconds for repeating tasks. A positive value indicates\n- * fixed-rate execution. A value of 0 indicates a non-repeating task.\n+ * Indicator, whether the event is periodic (i.e., fixed-rate execution). \n+ * It is set to true only if the trigger is a TimeTrigger with period > 0.\n */\n- public long period = 0;\n+ public final boolean periodic;\n \n /**\n * The actual task to be executed.\n */\n- public Task executable;\n+ public final Task executable;\n \n /** \n * The trigger associated with this event.\n */\n- public Trigger trigger;\n+ public final Trigger trigger;\n \n \n /**\n * Creates a new scheduler task.\n */\n public SchedulerEvent(Task task, Trigger trigger) {\n \tthis.executable = task;\n- \tthis.trigger = trigger;\n+ \tthis.trigger = trigger; \t\n+ \tif ((trigger != null) && (trigger instanceof TimeTrigger) && (((TimeTrigger) trigger).getPeriod() > 0)) {\n+ \t\tperiodic = true;\n+ \t} else {\n+ \t\tperiodic = false;\n+ \t}\n }\n \n ", "raw_url": "https://github.com/d3scomp/JDEECo/raw/cddfa1a013f7c6f02e6e496b211ac6da552641e7/jdeeco-core%2Fsrc%2Fcz%2Fcuni%2Fmff%2Fd3s%2Fdeeco%2Fscheduler%2FSchedulerEvent.java", "sha": "49814c07f01631be781bffba6c48be55dd57c239", "status": "modified" }, { "additions": 46, "blob_url": "https://github.com/d3scomp/JDEECo/blob/cddfa1a013f7c6f02e6e496b211ac6da552641e7/jdeeco-core%2Fsrc%2Fcz%2Fcuni%2Fmff%2Fd3s%2Fdeeco%2Fscheduler%2FSingleThreadedScheduler.java", "changes": 65, "contents_url": "https://api.github.com/repos/d3scomp/JDEECo/contents/jdeeco-core%2Fsrc%2Fcz%2Fcuni%2Fmff%2Fd3s%2Fdeeco%2Fscheduler%2FSingleThreadedScheduler.java?ref=cddfa1a013f7c6f02e6e496b211ac6da552641e7", "deletions": 19, "filename": "jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/SingleThreadedScheduler.java", "new_code": "import cz.cuni.mff.d3s.deeco.model.runtime.api.TimeTrigger;\nimport cz.cuni.mff.d3s.deeco.model.runtime.custom.TimeTriggerExt;\n\t\t\t// if the periodic task execution took more than it remained till the next period \n\t\t\tif (event.nextExecutionTime < System.currentTimeMillis()) {\t\t\t\t\n\t\t\t\tqueue.rescheduleTask(event, System.currentTimeMillis() + event.executable.getTimeTrigger().getPeriod());\n\t\t\t}\n\t\t\t\tif (task.getTimeTrigger() != null) {\n\t\t\t\t\tSchedulerEvent event = new SchedulerEvent(task, task.getTimeTrigger());\n\t\t\t\t\t\n\t\t\t\t\t// schedule periodic tasks immediately\n\t\t\t\t\tif (event.periodic) {\n\t\t\t\t\t\tperiodicEvents.put(task, event);\n\t\t\t\t\t}\n\t\t\t\t\t\n\t\t\t\t\tscheduleAfter(event, task.getTimeTrigger().getOffset());\t\t\t\t\t\n\t\t\t\t\t\t\tscheduleAfter(new SchedulerEvent(task, trigger), 0);\n\tvoid scheduleAfter(SchedulerEvent event, long delay) {\t\t\t\n\t\t\tevent.nextExecutionTime = System.currentTimeMillis() + delay;\t\t\t\n//\t\n//\t/**\n//\t * Note that this method has to be explicitly protected by queue's monitor!\n//\t */\n//\tvoid scheduleNow(SchedulerEvent event, long period) {\t\t\t\n//\t\t\tevent.nextExecutionTime = System.currentTimeMillis(); // start immediately\n//\t\t\tevent.period = period;\n//\t\t\tevent.state = SchedulerEvent.SCHEDULED;\n//\n//\t\t\tqueue.add(event);\n//\t\t\tif (queue.getMin() == event)\n//\t\t\t\tqueue.notify();\t\t\n//\t}\n\n if (event.periodic) { // Repeating task, reschedule\n \tqueue.rescheduleMin(event.nextExecutionTime + event.executable.getTimeTrigger().getPeriod()); \n } else { // Non-repeating, remove\n \tqueue.removeMin();\n\tTimeTrigger trigger;\n\t\n\tpublic InvokeAndWaitTask() {\n\t\tsuper(null);\n\t\ttrigger = new TimeTriggerExt();\n\t\ttrigger.setPeriod(0);\n\t\ttrigger.setOffset(0);\n\t}\n\tpublic TimeTrigger getTimeTrigger() {\t\t\n\t\treturn trigger;", "new_methods": [ { "arguments": [ "event.periodic" ], "filename": "jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/SingleThreadedScheduler.java", "implementation": "periodicEvents.put(task, event);", "signature": "immediately\n\t\t\t\t\tif (event.periodic)" }, { "arguments": [ "SchedulerEvent event", " long delay" ], "filename": "jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/SingleThreadedScheduler.java", "implementation": "event.nextExecutionTime = System.currentTimeMillis() + delay;\t\t\t\n//\t\n//\t/**\n//\t * Note that this method has to be explicitly protected by queue's monitor!\n//\t */\n//\tvoid scheduleNow(SchedulerEvent event, long period) {\t\t\t\n//\t\t\tevent.nextExecutionTime = System.currentTimeMillis(); // start immediately\n//\t\t\tevent.period = period;\n//\t\t\tevent.state = SchedulerEvent.SCHEDULED;\n//\n//\t\t\tqueue.add(event);\n//\t\t\tif (queue.getMin() == event)\n//\t\t\t\tqueue.notify();\t\t\n//", "signature": "void scheduleAfter(SchedulerEvent event, long delay)" }, { "arguments": [], "filename": "jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/SingleThreadedScheduler.java", "implementation": "super(null);\n\t\ttrigger = new TimeTriggerExt();\n\t\ttrigger.setPeriod(0);\n\t\ttrigger.setOffset(0);", "signature": "public InvokeAndWaitTask()" } ], "old_code": "import cz.cuni.mff.d3s.deeco.model.runtime.api.PeriodicTrigger;\n\t\t\t\t// if the periodic task execution took more than it remained till the next period \n\t\t\t\tif (event.nextExecutionTime < System.currentTimeMillis()) {\t\t\t\t\n\t\t\t\t\tqueue.rescheduleTask(event, System.currentTimeMillis() + event.period);\n\t\t\t\t}\n\t\t\t\tif (task.getPeriodicTrigger() != null) {\n\t\t\t\t\tSchedulerEvent event = new SchedulerEvent(task, task.getPeriodicTrigger());\n\t\t\t\t\tscheduleNow(event, task.getPeriodicTrigger().getPeriod());\n\t\t\t\t\tperiodicEvents.put(task, event);\n\t\t\t\t\t\t\tscheduleNow(new SchedulerEvent(task, trigger), 0);\n\tvoid scheduleNow(SchedulerEvent event, long period) {\t\t\t\n\t\t\tevent.nextExecutionTime = System.currentTimeMillis(); // start immediately\n\t\t\tevent.period = period;\n if (event.period == 0) { // Non-repeating, remove\n queue.removeMin();\n } else { // Repeating task, reschedule\n queue.rescheduleMin(event.nextExecutionTime + event.period);\n\tpublic PeriodicTrigger getPeriodicTrigger() {\t\t\n\t\treturn null;", "old_methods": [ { "arguments": [ "SchedulerEvent event", " long period" ], "filename": "jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/SingleThreadedScheduler.java", "implementation": "event.nextExecutionTime = System.currentTimeMillis(); // start immediately\n\t\t\tevent.period = period;\n if (event.period == 0) { // Non-repeating, remove\n queue.removeMin();", "signature": "void scheduleNow(SchedulerEvent event, long period)" } ], "patch": "@@ -35,8 +35,9 @@\n \n import cz.cuni.mff.d3s.deeco.executor.Executor;\n import cz.cuni.mff.d3s.deeco.logging.Log;\n-import cz.cuni.mff.d3s.deeco.model.runtime.api.PeriodicTrigger;\n+import cz.cuni.mff.d3s.deeco.model.runtime.api.TimeTrigger;\n import cz.cuni.mff.d3s.deeco.model.runtime.api.Trigger;\n+import cz.cuni.mff.d3s.deeco.model.runtime.custom.TimeTriggerExt;\n import cz.cuni.mff.d3s.deeco.task.Task;\n import cz.cuni.mff.d3s.deeco.task.TaskInvocationException;\n import cz.cuni.mff.d3s.deeco.task.TaskTriggerListener;\n@@ -125,10 +126,10 @@ public void executionCompleted(Task task) {\n \t\t\tif (event == null)\n \t\t\t\treturn;\n \t\t\t\n-\t\t\t\t// if the periodic task execution took more than it remained till the next period \n-\t\t\t\tif (event.nextExecutionTime < System.currentTimeMillis()) {\t\t\t\t\n-\t\t\t\t\tqueue.rescheduleTask(event, System.currentTimeMillis() + event.period);\n-\t\t\t\t}\n+\t\t\t// if the periodic task execution took more than it remained till the next period \n+\t\t\tif (event.nextExecutionTime < System.currentTimeMillis()) {\t\t\t\t\n+\t\t\t\tqueue.rescheduleTask(event, System.currentTimeMillis() + event.executable.getTimeTrigger().getPeriod());\n+\t\t\t}\n \t\t\t\n \t\t}\t\t\n \t}\n@@ -187,10 +188,15 @@ public void addTask(Task task) {\n \t\t\t\t\tthrow new IllegalStateException(\n \t\t\t\t\t\t\t\"Scheduler already terminated.\");\n \t\t\t\t\n-\t\t\t\tif (task.getPeriodicTrigger() != null) {\n-\t\t\t\t\tSchedulerEvent event = new SchedulerEvent(task, task.getPeriodicTrigger());\n-\t\t\t\t\tscheduleNow(event, task.getPeriodicTrigger().getPeriod());\n-\t\t\t\t\tperiodicEvents.put(task, event);\n+\t\t\t\tif (task.getTimeTrigger() != null) {\n+\t\t\t\t\tSchedulerEvent event = new SchedulerEvent(task, task.getTimeTrigger());\n+\t\t\t\t\t\n+\t\t\t\t\t// schedule periodic tasks immediately\n+\t\t\t\t\tif (event.periodic) {\n+\t\t\t\t\t\tperiodicEvents.put(task, event);\n+\t\t\t\t\t}\n+\t\t\t\t\t\n+\t\t\t\t\tscheduleAfter(event, task.getTimeTrigger().getOffset());\t\t\t\t\t\n \t\t\t\t}\n \t\t\t}\n \t\t\ttask.setTriggerListener(new TaskTriggerListener() {\t\n@@ -205,7 +211,7 @@ public void triggered(Task task, Trigger trigger) {\n \t\t\t\t\t\t\tisScheduled = allTasks.contains(task);\n \t\t\t\t\t\t}\n \t\t\t\t\t\tif (isScheduled) {\n-\t\t\t\t\t\t\tscheduleNow(new SchedulerEvent(task, trigger), 0);\n+\t\t\t\t\t\t\tscheduleAfter(new SchedulerEvent(task, trigger), 0);\n \t\t\t\t\t\t}\n \t\t\t\t\t}\n \t\t\t\t}\n@@ -218,16 +224,29 @@ public void triggered(Task task, Trigger trigger) {\n \t/**\n \t * Note that this method has to be explicitly protected by queue's monitor!\n \t */\n-\tvoid scheduleNow(SchedulerEvent event, long period) {\t\t\t\n-\t\t\tevent.nextExecutionTime = System.currentTimeMillis(); // start immediately\n-\t\t\tevent.period = period;\n+\tvoid scheduleAfter(SchedulerEvent event, long delay) {\t\t\t\n+\t\t\tevent.nextExecutionTime = System.currentTimeMillis() + delay;\t\t\t\n \t\t\tevent.state = SchedulerEvent.SCHEDULED;\n \n \t\t\tqueue.add(event);\n \t\t\tif (queue.getMin() == event)\n \t\t\t\tqueue.notify();\t\t\n \t}\n \n+//\t\n+//\t/**\n+//\t * Note that this method has to be explicitly protected by queue's monitor!\n+//\t */\n+//\tvoid scheduleNow(SchedulerEvent event, long period) {\t\t\t\n+//\t\t\tevent.nextExecutionTime = System.currentTimeMillis(); // start immediately\n+//\t\t\tevent.period = period;\n+//\t\t\tevent.state = SchedulerEvent.SCHEDULED;\n+//\n+//\t\t\tqueue.add(event);\n+//\t\t\tif (queue.getMin() == event)\n+//\t\t\t\tqueue.notify();\t\t\n+//\t}\n+\n \n \t@Override\n \tpublic void removeTask(Task task) {\n@@ -412,11 +431,11 @@ private void mainLoop() {\n if( event.state == SchedulerEvent.RUNNING )\n \tcontinue;\n \n- if (event.period == 0) { // Non-repeating, remove\n- queue.removeMin();\n+ if (event.periodic) { // Repeating task, reschedule\n+ \tqueue.rescheduleMin(event.nextExecutionTime + event.executable.getTimeTrigger().getPeriod()); \n+ } else { // Non-repeating, remove\n+ \tqueue.removeMin();\n event.state = SchedulerEvent.EXECUTED;\n- } else { // Repeating task, reschedule\n- queue.rescheduleMin(event.nextExecutionTime + event.period);\n } \n \n task = event.executable;\n@@ -676,6 +695,14 @@ void heapify() {\n class InvokeAndWaitTask extends Task {\n \n \tRunnable runnable;\n+\tTimeTrigger trigger;\n+\t\n+\tpublic InvokeAndWaitTask() {\n+\t\tsuper(null);\n+\t\ttrigger = new TimeTriggerExt();\n+\t\ttrigger.setPeriod(0);\n+\t\ttrigger.setOffset(0);\n+\t}\n \t\n \tpublic InvokeAndWaitTask(Scheduler scheduler, Runnable runnable) {\n \t\tsuper(scheduler);\n@@ -698,8 +725,8 @@ protected void unregisterTriggers() {\n \t}\n \n \t@Override\n-\tpublic PeriodicTrigger getPeriodicTrigger() {\t\t\n-\t\treturn null;\n+\tpublic TimeTrigger getTimeTrigger() {\t\t\n+\t\treturn trigger;\n \t}\n \t\n }\n\\ No newline at end of file", "raw_url": "https://github.com/d3scomp/JDEECo/raw/cddfa1a013f7c6f02e6e496b211ac6da552641e7/jdeeco-core%2Fsrc%2Fcz%2Fcuni%2Fmff%2Fd3s%2Fdeeco%2Fscheduler%2FSingleThreadedScheduler.java", "sha": "fb9c507bfc19133b6e06f266d3582b6d79cadde9", "status": "modified" }, { "additions": 6, "blob_url": "https://github.com/d3scomp/JDEECo/blob/cddfa1a013f7c6f02e6e496b211ac6da552641e7/jdeeco-core%2Fsrc%2Fcz%2Fcuni%2Fmff%2Fd3s%2Fdeeco%2Ftask%2FEnsembleTask.java", "changes": 12, "contents_url": "https://api.github.com/repos/d3scomp/JDEECo/contents/jdeeco-core%2Fsrc%2Fcz%2Fcuni%2Fmff%2Fd3s%2Fdeeco%2Ftask%2FEnsembleTask.java?ref=cddfa1a013f7c6f02e6e496b211ac6da552641e7", "deletions": 6, "filename": "jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/EnsembleTask.java", "new_code": "import cz.cuni.mff.d3s.deeco.model.runtime.api.TimeTrigger;\n\t * Returns the period associated with the ensemble in the in the meta-model as the {@link TimeTrigger}. Note that the {@link EnsembleTask} assumes that there is at most\n\t * one instance of {@link TimeTrigger} associated with the ensemble in the meta-model.\n\tpublic TimeTrigger getTimeTrigger() {\n\t\t\tif (trigger instanceof TimeTrigger) {\n\t\t\t\treturn ((TimeTrigger) trigger);", "new_methods": [], "old_code": "import cz.cuni.mff.d3s.deeco.model.runtime.api.PeriodicTrigger;\n\t * Returns the period associated with the ensemble in the in the meta-model as the {@link PeriodicTrigger}. Note that the {@link EnsembleTask} assumes that there is at most\n\t * one instance of {@link PeriodicTrigger} associated with the ensemble in the meta-model.\n\tpublic PeriodicTrigger getPeriodicTrigger() {\n\t\t\tif (trigger instanceof PeriodicTrigger) {\n\t\t\t\treturn ((PeriodicTrigger) trigger);", "old_methods": [], "patch": "@@ -23,7 +23,7 @@\n import cz.cuni.mff.d3s.deeco.model.runtime.api.KnowledgePath;\n import cz.cuni.mff.d3s.deeco.model.runtime.api.Parameter;\n import cz.cuni.mff.d3s.deeco.model.runtime.api.ParameterDirection;\n-import cz.cuni.mff.d3s.deeco.model.runtime.api.PeriodicTrigger;\n+import cz.cuni.mff.d3s.deeco.model.runtime.api.TimeTrigger;\n import cz.cuni.mff.d3s.deeco.model.runtime.api.Trigger;\n import cz.cuni.mff.d3s.deeco.model.runtime.impl.TriggerImpl;\n import cz.cuni.mff.d3s.deeco.model.runtime.meta.RuntimeMetadataFactory;\n@@ -503,16 +503,16 @@ public void invoke(Trigger trigger) throws TaskInvocationException {\n \t}\n \n \t/**\n-\t * Returns the period associated with the ensemble in the in the meta-model as the {@link PeriodicTrigger}. Note that the {@link EnsembleTask} assumes that there is at most\n-\t * one instance of {@link PeriodicTrigger} associated with the ensemble in the meta-model.\n+\t * Returns the period associated with the ensemble in the in the meta-model as the {@link TimeTrigger}. Note that the {@link EnsembleTask} assumes that there is at most\n+\t * one instance of {@link TimeTrigger} associated with the ensemble in the meta-model.\n \t * \n \t * @return Periodic trigger or null no period is associated with the task.\n \t */\n \t@Override\n-\tpublic PeriodicTrigger getPeriodicTrigger() {\n+\tpublic TimeTrigger getTimeTrigger() {\n \t\tfor (Trigger trigger : ensembleController.getEnsembleDefinition().getTriggers()) {\n-\t\t\tif (trigger instanceof PeriodicTrigger) {\n-\t\t\t\treturn ((PeriodicTrigger) trigger);\n+\t\t\tif (trigger instanceof TimeTrigger) {\n+\t\t\t\treturn ((TimeTrigger) trigger);\n \t\t\t}\n \t\t}\n \t\t", "raw_url": "https://github.com/d3scomp/JDEECo/raw/cddfa1a013f7c6f02e6e496b211ac6da552641e7/jdeeco-core%2Fsrc%2Fcz%2Fcuni%2Fmff%2Fd3s%2Fdeeco%2Ftask%2FEnsembleTask.java", "sha": "3ed2c0641508d1edcf28e273ba79074c0bfe1012", "status": "modified" }, { "additions": 6, "blob_url": "https://github.com/d3scomp/JDEECo/blob/cddfa1a013f7c6f02e6e496b211ac6da552641e7/jdeeco-core%2Fsrc%2Fcz%2Fcuni%2Fmff%2Fd3s%2Fdeeco%2Ftask%2FProcessTask.java", "changes": 12, "contents_url": "https://api.github.com/repos/d3scomp/JDEECo/contents/jdeeco-core%2Fsrc%2Fcz%2Fcuni%2Fmff%2Fd3s%2Fdeeco%2Ftask%2FProcessTask.java?ref=cddfa1a013f7c6f02e6e496b211ac6da552641e7", "deletions": 6, "filename": "jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/ProcessTask.java", "new_code": "import cz.cuni.mff.d3s.deeco.model.runtime.api.TimeTrigger;\n\t * Returns the period associated with the process in the in the meta-model as the {@link TimeTrigger}. Note that the {@link ProcessTask} assumes that there is at most\n\t * one instance of {@link TimeTrigger} associated with the process in the meta-model.\n\tpublic TimeTrigger getTimeTrigger() {\n\t\t\tif (trigger instanceof TimeTrigger) {\n\t\t\t\treturn ((TimeTrigger) trigger);", "new_methods": [], "old_code": "import cz.cuni.mff.d3s.deeco.model.runtime.api.PeriodicTrigger;\n\t * Returns the period associated with the process in the in the meta-model as the {@link PeriodicTrigger}. Note that the {@link ProcessTask} assumes that there is at most\n\t * one instance of {@link PeriodicTrigger} associated with the process in the meta-model.\n\tpublic PeriodicTrigger getPeriodicTrigger() {\n\t\t\tif (trigger instanceof PeriodicTrigger) {\n\t\t\t\treturn ((PeriodicTrigger) trigger);", "old_methods": [], "patch": "@@ -16,7 +16,7 @@\n import cz.cuni.mff.d3s.deeco.model.runtime.api.KnowledgePath;\n import cz.cuni.mff.d3s.deeco.model.runtime.api.Parameter;\n import cz.cuni.mff.d3s.deeco.model.runtime.api.ParameterDirection;\n-import cz.cuni.mff.d3s.deeco.model.runtime.api.PeriodicTrigger;\n+import cz.cuni.mff.d3s.deeco.model.runtime.api.TimeTrigger;\n import cz.cuni.mff.d3s.deeco.model.runtime.api.Trigger;\n import cz.cuni.mff.d3s.deeco.scheduler.Scheduler;\n \n@@ -204,16 +204,16 @@ protected void unregisterTriggers() {\n \t}\n \n \t/**\n-\t * Returns the period associated with the process in the in the meta-model as the {@link PeriodicTrigger}. Note that the {@link ProcessTask} assumes that there is at most\n-\t * one instance of {@link PeriodicTrigger} associated with the process in the meta-model.\n+\t * Returns the period associated with the process in the in the meta-model as the {@link TimeTrigger}. Note that the {@link ProcessTask} assumes that there is at most\n+\t * one instance of {@link TimeTrigger} associated with the process in the meta-model.\n \t * \n \t * @return Periodic trigger or null no period is associated with the task.\n \t */\n \t@Override\n-\tpublic PeriodicTrigger getPeriodicTrigger() {\n+\tpublic TimeTrigger getTimeTrigger() {\n \t\tfor (Trigger trigger : componentProcess.getTriggers()) {\n-\t\t\tif (trigger instanceof PeriodicTrigger) {\n-\t\t\t\treturn ((PeriodicTrigger) trigger);\n+\t\t\tif (trigger instanceof TimeTrigger) {\n+\t\t\t\treturn ((TimeTrigger) trigger);\n \t\t\t}\n \t\t}\n \t\t", "raw_url": "https://github.com/d3scomp/JDEECo/raw/cddfa1a013f7c6f02e6e496b211ac6da552641e7/jdeeco-core%2Fsrc%2Fcz%2Fcuni%2Fmff%2Fd3s%2Fdeeco%2Ftask%2FProcessTask.java", "sha": "766558973cad2badb781aebb6f322ac495eb183f", "status": "modified" }, { "additions": 3, "blob_url": "https://github.com/d3scomp/JDEECo/blob/cddfa1a013f7c6f02e6e496b211ac6da552641e7/jdeeco-core%2Fsrc%2Fcz%2Fcuni%2Fmff%2Fd3s%2Fdeeco%2Ftask%2FTask.java", "changes": 7, "contents_url": "https://api.github.com/repos/d3scomp/JDEECo/contents/jdeeco-core%2Fsrc%2Fcz%2Fcuni%2Fmff%2Fd3s%2Fdeeco%2Ftask%2FTask.java?ref=cddfa1a013f7c6f02e6e496b211ac6da552641e7", "deletions": 4, "filename": "jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/Task.java", "new_code": "import cz.cuni.mff.d3s.deeco.model.runtime.api.TimeTrigger;\n\t * Returns the time trigger associated with the task. \n\tabstract public TimeTrigger getTimeTrigger();", "new_methods": [], "old_code": "import cz.cuni.mff.d3s.deeco.model.runtime.api.PeriodicTrigger;\n\t * Returns the period associated with the task. \n\t * @return Period in miliseconds or -1 when there is no period associated with the task.\n\tabstract public PeriodicTrigger getPeriodicTrigger();", "old_methods": [], "patch": "@@ -1,6 +1,6 @@\n package cz.cuni.mff.d3s.deeco.task;\n \n-import cz.cuni.mff.d3s.deeco.model.runtime.api.PeriodicTrigger;\n+import cz.cuni.mff.d3s.deeco.model.runtime.api.TimeTrigger;\n import cz.cuni.mff.d3s.deeco.model.runtime.api.Trigger;\n import cz.cuni.mff.d3s.deeco.scheduler.Scheduler;\n \n@@ -67,8 +67,7 @@ public void unsetTriggerListener() {\n \t}\n \n \t/**\n-\t * Returns the period associated with the task. \n-\t * @return Period in miliseconds or -1 when there is no period associated with the task.\n+\t * Returns the time trigger associated with the task. \n \t */\n-\tabstract public PeriodicTrigger getPeriodicTrigger();\n+\tabstract public TimeTrigger getTimeTrigger();\n }", "raw_url": "https://github.com/d3scomp/JDEECo/raw/cddfa1a013f7c6f02e6e496b211ac6da552641e7/jdeeco-core%2Fsrc%2Fcz%2Fcuni%2Fmff%2Fd3s%2Fdeeco%2Ftask%2FTask.java", "sha": "e2ca2ec98f40772bf82b0c396af5a7bd4adea541", "status": "modified" }, { "additions": 3, "blob_url": "https://github.com/d3scomp/JDEECo/blob/cddfa1a013f7c6f02e6e496b211ac6da552641e7/jdeeco-core%2Ftest%2Fcz%2Fcuni%2Fmff%2Fd3s%2Fdeeco%2Fannotations%2Fprocessor%2Foutput%2FC1C2C3E1E2E3.xmi", "changes": 6, "contents_url": "https://api.github.com/repos/d3scomp/JDEECo/contents/jdeeco-core%2Ftest%2Fcz%2Fcuni%2Fmff%2Fd3s%2Fdeeco%2Fannotations%2Fprocessor%2Foutput%2FC1C2C3E1E2E3.xmi?ref=cddfa1a013f7c6f02e6e496b211ac6da552641e7", "deletions": 3, "filename": "jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/output/C1C2C3E1E2E3.xmi", "new_code": " <triggers xsi:type=\"cz.cuni.mff.d3s.deeco.model.runtime:TimeTrigger\" period=\"3000\"/>\n <triggers xsi:type=\"cz.cuni.mff.d3s.deeco.model.runtime:TimeTrigger\" period=\"1000\"/>\n <triggers xsi:type=\"cz.cuni.mff.d3s.deeco.model.runtime:TimeTrigger\" period=\"2000\"/>", "new_methods": [], "old_code": " <triggers xsi:type=\"cz.cuni.mff.d3s.deeco.model.runtime:PeriodicTrigger\" period=\"3000\"/>\n <triggers xsi:type=\"cz.cuni.mff.d3s.deeco.model.runtime:PeriodicTrigger\" period=\"1000\"/>\n <triggers xsi:type=\"cz.cuni.mff.d3s.deeco.model.runtime:PeriodicTrigger\" period=\"2000\"/>", "old_methods": [], "patch": "@@ -30,7 +30,7 @@\n </knowledgePath>\n </parameters>\n </knowledgeExchange>\n- <triggers xsi:type=\"cz.cuni.mff.d3s.deeco.model.runtime:PeriodicTrigger\" period=\"3000\"/>\n+ <triggers xsi:type=\"cz.cuni.mff.d3s.deeco.model.runtime:TimeTrigger\" period=\"3000\"/>\n <triggers xsi:type=\"cz.cuni.mff.d3s.deeco.model.runtime:KnowledgeChangeTrigger\">\n <knowledgePath>\n <nodes xsi:type=\"cz.cuni.mff.d3s.deeco.model.runtime:PathNodeCoordinator\"/>\n@@ -161,7 +161,7 @@\n <nodes xsi:type=\"cz.cuni.mff.d3s.deeco.model.runtime:PathNodeField\" name=\"level1\"/>\n </knowledgePath>\n </parameters>\n- <triggers xsi:type=\"cz.cuni.mff.d3s.deeco.model.runtime:PeriodicTrigger\" period=\"1000\"/>\n+ <triggers xsi:type=\"cz.cuni.mff.d3s.deeco.model.runtime:TimeTrigger\" period=\"1000\"/>\n <triggers xsi:type=\"cz.cuni.mff.d3s.deeco.model.runtime:KnowledgeChangeTrigger\">\n <knowledgePath>\n <nodes xsi:type=\"cz.cuni.mff.d3s.deeco.model.runtime:PathNodeField\" name=\"level1\"/>\n@@ -215,7 +215,7 @@\n <nodes xsi:type=\"cz.cuni.mff.d3s.deeco.model.runtime:PathNodeField\" name=\"level3\"/>\n </knowledgePath>\n </parameters>\n- <triggers xsi:type=\"cz.cuni.mff.d3s.deeco.model.runtime:PeriodicTrigger\" period=\"2000\"/>\n+ <triggers xsi:type=\"cz.cuni.mff.d3s.deeco.model.runtime:TimeTrigger\" period=\"2000\"/>\n </componentProcesses>\n <ensembleControllers ensembleDefinition=\"//@ensembleDefinitions.0\"/>\n <ensembleControllers ensembleDefinition=\"//@ensembleDefinitions.1\"/>", "raw_url": "https://github.com/d3scomp/JDEECo/raw/cddfa1a013f7c6f02e6e496b211ac6da552641e7/jdeeco-core%2Ftest%2Fcz%2Fcuni%2Fmff%2Fd3s%2Fdeeco%2Fannotations%2Fprocessor%2Foutput%2FC1C2C3E1E2E3.xmi", "sha": "4f16f24ceb26f1254a8b9976c766bcd4f21572b1", "status": "modified" }, { "additions": 2, "blob_url": "https://github.com/d3scomp/JDEECo/blob/cddfa1a013f7c6f02e6e496b211ac6da552641e7/jdeeco-core%2Ftest%2Fcz%2Fcuni%2Fmff%2Fd3s%2Fdeeco%2Fannotations%2Fprocessor%2Foutput%2FChildOfCorrectC1.xmi", "changes": 4, "contents_url": "https://api.github.com/repos/d3scomp/JDEECo/contents/jdeeco-core%2Ftest%2Fcz%2Fcuni%2Fmff%2Fd3s%2Fdeeco%2Fannotations%2Fprocessor%2Foutput%2FChildOfCorrectC1.xmi?ref=cddfa1a013f7c6f02e6e496b211ac6da552641e7", "deletions": 2, "filename": "jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/output/ChildOfCorrectC1.xmi", "new_code": " <triggers xsi:type=\"cz.cuni.mff.d3s.deeco.model.runtime:TimeTrigger\" period=\"2000\"/>\n <triggers xsi:type=\"cz.cuni.mff.d3s.deeco.model.runtime:TimeTrigger\" period=\"1000\"/>", "new_methods": [], "old_code": " <triggers xsi:type=\"cz.cuni.mff.d3s.deeco.model.runtime:PeriodicTrigger\" period=\"2000\"/>\n <triggers xsi:type=\"cz.cuni.mff.d3s.deeco.model.runtime:PeriodicTrigger\" period=\"1000\"/>", "old_methods": [], "patch": "@@ -7,7 +7,7 @@\n <nodes xsi:type=\"cz.cuni.mff.d3s.deeco.model.runtime:PathNodeField\" name=\"x\"/>\n </knowledgePath>\n </parameters>\n- <triggers xsi:type=\"cz.cuni.mff.d3s.deeco.model.runtime:PeriodicTrigger\" period=\"2000\"/>\n+ <triggers xsi:type=\"cz.cuni.mff.d3s.deeco.model.runtime:TimeTrigger\" period=\"2000\"/>\n </componentProcesses>\n <componentProcesses method=\"public static void cz.cuni.mff.d3s.deeco.annotations.processor.input.samples.CorrectC1.process1(java.lang.Integer,java.lang.String,java.lang.Boolean)\" name=\"process1\">\n <parameters direction=\"IN\" type=\"java.lang.Integer\">\n@@ -27,7 +27,7 @@\n <nodes xsi:type=\"cz.cuni.mff.d3s.deeco.model.runtime:PathNodeField\" name=\"level1\"/>\n </knowledgePath>\n </parameters>\n- <triggers xsi:type=\"cz.cuni.mff.d3s.deeco.model.runtime:PeriodicTrigger\" period=\"1000\"/>\n+ <triggers xsi:type=\"cz.cuni.mff.d3s.deeco.model.runtime:TimeTrigger\" period=\"1000\"/>\n <triggers xsi:type=\"cz.cuni.mff.d3s.deeco.model.runtime:KnowledgeChangeTrigger\">\n <knowledgePath>\n <nodes xsi:type=\"cz.cuni.mff.d3s.deeco.model.runtime:PathNodeField\" name=\"level1\"/>", "raw_url": "https://github.com/d3scomp/JDEECo/raw/cddfa1a013f7c6f02e6e496b211ac6da552641e7/jdeeco-core%2Ftest%2Fcz%2Fcuni%2Fmff%2Fd3s%2Fdeeco%2Fannotations%2Fprocessor%2Foutput%2FChildOfCorrectC1.xmi", "sha": "274058e5e305a0f2e1ae60aa9399bdd4ff16c70e", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/d3scomp/JDEECo/blob/cddfa1a013f7c6f02e6e496b211ac6da552641e7/jdeeco-core%2Ftest%2Fcz%2Fcuni%2Fmff%2Fd3s%2Fdeeco%2Fannotations%2Fprocessor%2Foutput%2FCorrectC1.xmi", "changes": 2, "contents_url": "https://api.github.com/repos/d3scomp/JDEECo/contents/jdeeco-core%2Ftest%2Fcz%2Fcuni%2Fmff%2Fd3s%2Fdeeco%2Fannotations%2Fprocessor%2Foutput%2FCorrectC1.xmi?ref=cddfa1a013f7c6f02e6e496b211ac6da552641e7", "deletions": 1, "filename": "jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/output/CorrectC1.xmi", "new_code": " <triggers xsi:type=\"cz.cuni.mff.d3s.deeco.model.runtime:TimeTrigger\" period=\"1000\"/>", "new_methods": [], "old_code": " <triggers xsi:type=\"cz.cuni.mff.d3s.deeco.model.runtime:PeriodicTrigger\" period=\"1000\"/>", "old_methods": [], "patch": "@@ -19,7 +19,7 @@\n <nodes xsi:type=\"cz.cuni.mff.d3s.deeco.model.runtime:PathNodeField\" name=\"level1\"/>\n </knowledgePath>\n </parameters>\n- <triggers xsi:type=\"cz.cuni.mff.d3s.deeco.model.runtime:PeriodicTrigger\" period=\"1000\"/>\n+ <triggers xsi:type=\"cz.cuni.mff.d3s.deeco.model.runtime:TimeTrigger\" period=\"1000\"/>\n <triggers xsi:type=\"cz.cuni.mff.d3s.deeco.model.runtime:KnowledgeChangeTrigger\">\n <knowledgePath>\n <nodes xsi:type=\"cz.cuni.mff.d3s.deeco.model.runtime:PathNodeField\" name=\"level1\"/>", "raw_url": "https://github.com/d3scomp/JDEECo/raw/cddfa1a013f7c6f02e6e496b211ac6da552641e7/jdeeco-core%2Ftest%2Fcz%2Fcuni%2Fmff%2Fd3s%2Fdeeco%2Fannotations%2Fprocessor%2Foutput%2FCorrectC1.xmi", "sha": "def2873c966e6dafd6a62974fdfe69b1f7c92fa2", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/d3scomp/JDEECo/blob/cddfa1a013f7c6f02e6e496b211ac6da552641e7/jdeeco-core%2Ftest%2Fcz%2Fcuni%2Fmff%2Fd3s%2Fdeeco%2Fannotations%2Fprocessor%2Foutput%2FCorrectC3.xmi", "changes": 2, "contents_url": "https://api.github.com/repos/d3scomp/JDEECo/contents/jdeeco-core%2Ftest%2Fcz%2Fcuni%2Fmff%2Fd3s%2Fdeeco%2Fannotations%2Fprocessor%2Foutput%2FCorrectC3.xmi?ref=cddfa1a013f7c6f02e6e496b211ac6da552641e7", "deletions": 1, "filename": "jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/output/CorrectC3.xmi", "new_code": " <triggers xsi:type=\"cz.cuni.mff.d3s.deeco.model.runtime:TimeTrigger\" period=\"2000\"/>", "new_methods": [], "old_code": " <triggers xsi:type=\"cz.cuni.mff.d3s.deeco.model.runtime:PeriodicTrigger\" period=\"2000\"/>", "old_methods": [], "patch": "@@ -14,7 +14,7 @@\n <nodes xsi:type=\"cz.cuni.mff.d3s.deeco.model.runtime:PathNodeField\" name=\"level3\"/>\n </knowledgePath>\n </parameters>\n- <triggers xsi:type=\"cz.cuni.mff.d3s.deeco.model.runtime:PeriodicTrigger\" period=\"2000\"/>\n+ <triggers xsi:type=\"cz.cuni.mff.d3s.deeco.model.runtime:TimeTrigger\" period=\"2000\"/>\n </componentProcesses>\n </componentInstances>\n </cz.cuni.mff.d3s.deeco.model.runtime:RuntimeMetadata>", "raw_url": "https://github.com/d3scomp/JDEECo/raw/cddfa1a013f7c6f02e6e496b211ac6da552641e7/jdeeco-core%2Ftest%2Fcz%2Fcuni%2Fmff%2Fd3s%2Fdeeco%2Fannotations%2Fprocessor%2Foutput%2FCorrectC3.xmi", "sha": "8584906cef28844583c922f0e645980acdeee498", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/d3scomp/JDEECo/blob/cddfa1a013f7c6f02e6e496b211ac6da552641e7/jdeeco-core%2Ftest%2Fcz%2Fcuni%2Fmff%2Fd3s%2Fdeeco%2Fannotations%2Fprocessor%2Foutput%2FCorrectE1.xmi", "changes": 2, "contents_url": "https://api.github.com/repos/d3scomp/JDEECo/contents/jdeeco-core%2Ftest%2Fcz%2Fcuni%2Fmff%2Fd3s%2Fdeeco%2Fannotations%2Fprocessor%2Foutput%2FCorrectE1.xmi?ref=cddfa1a013f7c6f02e6e496b211ac6da552641e7", "deletions": 1, "filename": "jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/output/CorrectE1.xmi", "new_code": " <triggers xsi:type=\"cz.cuni.mff.d3s.deeco.model.runtime:TimeTrigger\" period=\"3000\"/>", "new_methods": [], "old_code": " <triggers xsi:type=\"cz.cuni.mff.d3s.deeco.model.runtime:PeriodicTrigger\" period=\"3000\"/>", "old_methods": [], "patch": "@@ -30,7 +30,7 @@\n </knowledgePath>\n </parameters>\n </knowledgeExchange>\n- <triggers xsi:type=\"cz.cuni.mff.d3s.deeco.model.runtime:PeriodicTrigger\" period=\"3000\"/>\n+ <triggers xsi:type=\"cz.cuni.mff.d3s.deeco.model.runtime:TimeTrigger\" period=\"3000\"/>\n <triggers xsi:type=\"cz.cuni.mff.d3s.deeco.model.runtime:KnowledgeChangeTrigger\">\n <knowledgePath>\n <nodes xsi:type=\"cz.cuni.mff.d3s.deeco.model.runtime:PathNodeCoordinator\"/>", "raw_url": "https://github.com/d3scomp/JDEECo/raw/cddfa1a013f7c6f02e6e496b211ac6da552641e7/jdeeco-core%2Ftest%2Fcz%2Fcuni%2Fmff%2Fd3s%2Fdeeco%2Fannotations%2Fprocessor%2Foutput%2FCorrectE1.xmi", "sha": "16c65aa069d5edca3e666aa1752aa73d0bf715ef", "status": "modified" }, { "additions": 4, "blob_url": "https://github.com/d3scomp/JDEECo/blob/cddfa1a013f7c6f02e6e496b211ac6da552641e7/jdeeco-core%2Ftest%2Fcz%2Fcuni%2Fmff%2Fd3s%2Fdeeco%2Fmodel%2Fruntime%2FRuntimeModelHelper.java", "changes": 7, "contents_url": "https://api.github.com/repos/d3scomp/JDEECo/contents/jdeeco-core%2Ftest%2Fcz%2Fcuni%2Fmff%2Fd3s%2Fdeeco%2Fmodel%2Fruntime%2FRuntimeModelHelper.java?ref=cddfa1a013f7c6f02e6e496b211ac6da552641e7", "deletions": 3, "filename": "jdeeco-core/test/cz/cuni/mff/d3s/deeco/model/runtime/RuntimeModelHelper.java", "new_code": "import cz.cuni.mff.d3s.deeco.model.runtime.api.TimeTrigger;\n\tpublic static TimeTrigger createPeriodicTrigger(long period) {\n\t\tTimeTrigger trigger = factory.createTimeTrigger();\n\t\ttrigger.setOffset(0);", "new_methods": [], "old_code": "import cz.cuni.mff.d3s.deeco.model.runtime.api.PeriodicTrigger;\n\tpublic static PeriodicTrigger createPeriodicTrigger(long period) {\n\t\tPeriodicTrigger trigger = factory.createPeriodicTrigger();", "old_methods": [], "patch": "@@ -6,7 +6,7 @@\n import cz.cuni.mff.d3s.deeco.model.runtime.api.ParameterDirection;\n import cz.cuni.mff.d3s.deeco.model.runtime.api.PathNode;\n import cz.cuni.mff.d3s.deeco.model.runtime.api.PathNodeField;\n-import cz.cuni.mff.d3s.deeco.model.runtime.api.PeriodicTrigger;\n+import cz.cuni.mff.d3s.deeco.model.runtime.api.TimeTrigger;\n import cz.cuni.mff.d3s.deeco.model.runtime.meta.RuntimeMetadataFactory;\n \n /**\n@@ -60,11 +60,12 @@ public static Parameter createParameter(ParameterDirection direction,\n \t\treturn param;\n \t}\n \n-\tpublic static PeriodicTrigger createPeriodicTrigger(long period) {\n+\tpublic static TimeTrigger createPeriodicTrigger(long period) {\n \t\tRuntimeMetadataFactory factory = RuntimeMetadataFactory.eINSTANCE;\n-\t\tPeriodicTrigger trigger = factory.createPeriodicTrigger();\n+\t\tTimeTrigger trigger = factory.createTimeTrigger();\n \n \t\ttrigger.setPeriod(period);\n+\t\ttrigger.setOffset(0);\n \n \t\treturn trigger;\n \t}", "raw_url": "https://github.com/d3scomp/JDEECo/raw/cddfa1a013f7c6f02e6e496b211ac6da552641e7/jdeeco-core%2Ftest%2Fcz%2Fcuni%2Fmff%2Fd3s%2Fdeeco%2Fmodel%2Fruntime%2FRuntimeModelHelper.java", "sha": "35070f4b6489cc04b1d73dc3719a8c8f70fa8dda", "status": "modified" }, { "additions": 3, "blob_url": "https://github.com/d3scomp/JDEECo/blob/cddfa1a013f7c6f02e6e496b211ac6da552641e7/jdeeco-core%2Ftest%2Fcz%2Fcuni%2Fmff%2Fd3s%2Fdeeco%2Fmodel%2Fruntime%2FSampleRuntimeModel.java", "changes": 6, "contents_url": "https://api.github.com/repos/d3scomp/JDEECo/contents/jdeeco-core%2Ftest%2Fcz%2Fcuni%2Fmff%2Fd3s%2Fdeeco%2Fmodel%2Fruntime%2FSampleRuntimeModel.java?ref=cddfa1a013f7c6f02e6e496b211ac6da552641e7", "deletions": 3, "filename": "jdeeco-core/test/cz/cuni/mff/d3s/deeco/model/runtime/SampleRuntimeModel.java", "new_code": "import cz.cuni.mff.d3s.deeco.model.runtime.api.TimeTrigger;\n\tpublic TimeTrigger processPeriodicTrigger;\n\tpublic TimeTrigger ensemblePeriodicTrigger;", "new_methods": [], "old_code": "import cz.cuni.mff.d3s.deeco.model.runtime.api.PeriodicTrigger;\n\tpublic PeriodicTrigger processPeriodicTrigger;\n\tpublic PeriodicTrigger ensemblePeriodicTrigger;", "old_methods": [], "patch": "@@ -16,8 +16,8 @@\n import cz.cuni.mff.d3s.deeco.model.runtime.api.ParameterDirection;\n import cz.cuni.mff.d3s.deeco.model.runtime.api.PathNode;\n import cz.cuni.mff.d3s.deeco.model.runtime.api.PathNodeField;\n-import cz.cuni.mff.d3s.deeco.model.runtime.api.PeriodicTrigger;\n import cz.cuni.mff.d3s.deeco.model.runtime.api.RuntimeMetadata;\n+import cz.cuni.mff.d3s.deeco.model.runtime.api.TimeTrigger;\n import cz.cuni.mff.d3s.deeco.model.runtime.meta.RuntimeMetadataFactory;\n import cz.cuni.mff.d3s.deeco.task.ParamHolder;\n \n@@ -36,14 +36,14 @@ public class SampleRuntimeModel {\n \tpublic ComponentInstance componentInstance;\n \tpublic EnsembleController ensembleController;\n \tpublic ComponentProcess process;\n-\tpublic PeriodicTrigger processPeriodicTrigger;\n+\tpublic TimeTrigger processPeriodicTrigger;\n \tpublic KnowledgeChangeTrigger processKnowledgeChangeTrigger;\n \tpublic Parameter processParamIn, processParamOut, processParamInOut;\n \t\n \tpublic EnsembleDefinition ensembleDefinition;\n \tpublic Condition membershipCondition;\n \tpublic Exchange knowledgeExchange;\n-\tpublic PeriodicTrigger ensemblePeriodicTrigger;\n+\tpublic TimeTrigger ensemblePeriodicTrigger;\n \tpublic KnowledgeChangeTrigger ensembleKnowledgeChangeTrigger;\n \t\n \t// It is assumed that xxxParamCoord and xxxParamMember are equal and that membershipParamXXX and exchangeParamXXXIn are equal", "raw_url": "https://github.com/d3scomp/JDEECo/raw/cddfa1a013f7c6f02e6e496b211ac6da552641e7/jdeeco-core%2Ftest%2Fcz%2Fcuni%2Fmff%2Fd3s%2Fdeeco%2Fmodel%2Fruntime%2FSampleRuntimeModel.java", "sha": "ad6bed06371b383458ad91c5901c2cbffc162fae", "status": "modified" }, { "additions": 15, "blob_url": "https://github.com/d3scomp/JDEECo/blob/cddfa1a013f7c6f02e6e496b211ac6da552641e7/jdeeco-core%2Ftest%2Fcz%2Fcuni%2Fmff%2Fd3s%2Fdeeco%2Fscheduler%2FSchedulerTest.java", "changes": 25, "contents_url": "https://api.github.com/repos/d3scomp/JDEECo/contents/jdeeco-core%2Ftest%2Fcz%2Fcuni%2Fmff%2Fd3s%2Fdeeco%2Fscheduler%2FSchedulerTest.java?ref=cddfa1a013f7c6f02e6e496b211ac6da552641e7", "deletions": 10, "filename": "jdeeco-core/test/cz/cuni/mff/d3s/deeco/scheduler/SchedulerTest.java", "new_code": "import cz.cuni.mff.d3s.deeco.model.runtime.api.TimeTrigger;\n\t\tTimeTrigger p = mock(TimeTrigger.class);\n\t\twhen(p.getOffset()).thenReturn(0L);\n\t\twhen(t.getTimeTrigger()).thenReturn(p);\n\t\tTimeTrigger p = mock(TimeTrigger.class);\n\t\twhen(p.getOffset()).thenReturn(0L);\n\t\twhen(t.getTimeTrigger()).thenReturn(p);\n\t\tTimeTrigger p = mock(TimeTrigger.class);\n\t\twhen(p.getOffset()).thenReturn(0L);\n\t\twhen(t.getTimeTrigger()).thenReturn(p);\n\t\n\t\tTimeTrigger p = mock(TimeTrigger.class);\n\t\twhen(p.getOffset()).thenReturn(0L);\n\t\twhen(t.getTimeTrigger()).thenReturn(p);\n\t\t\tpublic TimeTrigger getTimeTrigger() {", "new_methods": [], "old_code": "import cz.cuni.mff.d3s.deeco.model.runtime.api.PeriodicTrigger;\n\t\tPeriodicTrigger p = mock(PeriodicTrigger.class);\n\t\twhen(t.getPeriodicTrigger()).thenReturn(p);\n\t\tPeriodicTrigger p = mock(PeriodicTrigger.class);\n\t\twhen(t.getPeriodicTrigger()).thenReturn(p);\n\t\tPeriodicTrigger p = mock(PeriodicTrigger.class);\n\t\twhen(t.getPeriodicTrigger()).thenReturn(p);\n\t\tPeriodicTrigger p = mock(PeriodicTrigger.class);\n\t\twhen(t.getPeriodicTrigger()).thenReturn(p);\n\t\t\tpublic PeriodicTrigger getPeriodicTrigger() {", "old_methods": [], "patch": "@@ -7,7 +7,7 @@\n import org.mockito.stubbing.Answer;\n \n import cz.cuni.mff.d3s.deeco.executor.Executor;\n-import cz.cuni.mff.d3s.deeco.model.runtime.api.PeriodicTrigger;\n+import cz.cuni.mff.d3s.deeco.model.runtime.api.TimeTrigger;\n import cz.cuni.mff.d3s.deeco.model.runtime.api.Trigger;\n import cz.cuni.mff.d3s.deeco.task.Task;\n import cz.cuni.mff.d3s.deeco.task.TaskTriggerListener;\n@@ -44,13 +44,14 @@ public void tearDown() throws Exception{\n \t@Test\n \tpublic void testRepeatedExecution() throws InterruptedException{\n \t\tfinal Task t = mock(Task.class);\n-\t\tPeriodicTrigger p = mock(PeriodicTrigger.class);\n+\t\tTimeTrigger p = mock(TimeTrigger.class);\n \t\t// Stubbing mocks.\n \t\t// The period is chosen to be 300 millis because the SingleThreadedScheduler \n \t\t// may not able to spawn a thread and execute it properly in a shorter \n \t\t// period of time causing a test failure \n \t\twhen(p.getPeriod()).thenReturn(300L);\n-\t\twhen(t.getPeriodicTrigger()).thenReturn(p);\n+\t\twhen(p.getOffset()).thenReturn(0L);\n+\t\twhen(t.getTimeTrigger()).thenReturn(p);\n \t\tdoAnswer(new Answer<Object>() {\n \t\t\t public Object answer(InvocationOnMock invocation) {\n \t\t\t Object[] args = invocation.getArguments();\n@@ -85,9 +86,10 @@ public Object answer(InvocationOnMock invocation) {\n \t@Test\n \tpublic void testPeriodicTaskScheduledWhenSchedulerStarted() throws InterruptedException {\n \t\tTask t = mock(Task.class);\n-\t\tPeriodicTrigger p = mock(PeriodicTrigger.class);\n+\t\tTimeTrigger p = mock(TimeTrigger.class);\n \t\twhen(p.getPeriod()).thenReturn(11L);\n-\t\twhen(t.getPeriodicTrigger()).thenReturn(p);\n+\t\twhen(p.getOffset()).thenReturn(0L);\n+\t\twhen(t.getTimeTrigger()).thenReturn(p);\n \t\t\n \t\t// WHEN a periodic task is added to a new (stopped) scheduler\n \t\ttested.addTask(t);\t\t\n@@ -113,9 +115,11 @@ public void testPeriodicTaskScheduledWhenSchedulerStarted() throws InterruptedEx\n \t@Test\n \tpublic void testPeriodicTaskAutomaticallyScheduledWhenAddedToRunningScheduler() throws InterruptedException {\n \t\tTask t = mock(Task.class);\n-\t\tPeriodicTrigger p = mock(PeriodicTrigger.class);\n+\t\tTimeTrigger p = mock(TimeTrigger.class);\n \t\twhen(p.getPeriod()).thenReturn(11L);\n-\t\twhen(t.getPeriodicTrigger()).thenReturn(p);\n+\t\twhen(p.getOffset()).thenReturn(0L);\n+\t\twhen(t.getTimeTrigger()).thenReturn(p);\n+\t\n \t\ttested.start();\n \n \t\t// WHEN a task is added to a running scheduler\n@@ -127,9 +131,10 @@ public void testPeriodicTaskAutomaticallyScheduledWhenAddedToRunningScheduler()\n \t@Test\n \tpublic void testPeriodicTaskNotScheduledWhenRemovedRunningScheduler() throws InterruptedException {\n \t\tTask t = mock(Task.class);\n-\t\tPeriodicTrigger p = mock(PeriodicTrigger.class);\n+\t\tTimeTrigger p = mock(TimeTrigger.class);\n \t\twhen(p.getPeriod()).thenReturn(11L);\n-\t\twhen(t.getPeriodicTrigger()).thenReturn(p);\n+\t\twhen(p.getOffset()).thenReturn(0L);\n+\t\twhen(t.getTimeTrigger()).thenReturn(p);\n \t\t\n \t\ttested.addTask(t);\n \t\ttested.start();\n@@ -241,7 +246,7 @@ private Task createTriggeredTask() {\n \t\t\n \t\tTask t = new Task(tested) {\t\n \t\t\t@Override\n-\t\t\tpublic PeriodicTrigger getPeriodicTrigger() {\n+\t\t\tpublic TimeTrigger getTimeTrigger() {\n \t\t\t\treturn null;\n \t\t\t}\n \t\t\t", "raw_url": "https://github.com/d3scomp/JDEECo/raw/cddfa1a013f7c6f02e6e496b211ac6da552641e7/jdeeco-core%2Ftest%2Fcz%2Fcuni%2Fmff%2Fd3s%2Fdeeco%2Fscheduler%2FSchedulerTest.java", "sha": "8b2285aeed394bf52e56b9a17e4fde095de39579", "status": "modified" }, { "additions": 4, "blob_url": "https://github.com/d3scomp/JDEECo/blob/cddfa1a013f7c6f02e6e496b211ac6da552641e7/jdeeco-core%2Ftest%2Fcz%2Fcuni%2Fmff%2Fd3s%2Fdeeco%2Fscheduler%2FSingleThreadedSchedulerTest.java", "changes": 7, "contents_url": "https://api.github.com/repos/d3scomp/JDEECo/contents/jdeeco-core%2Ftest%2Fcz%2Fcuni%2Fmff%2Fd3s%2Fdeeco%2Fscheduler%2FSingleThreadedSchedulerTest.java?ref=cddfa1a013f7c6f02e6e496b211ac6da552641e7", "deletions": 3, "filename": "jdeeco-core/test/cz/cuni/mff/d3s/deeco/scheduler/SingleThreadedSchedulerTest.java", "new_code": "import cz.cuni.mff.d3s.deeco.model.runtime.api.TimeTrigger;\n\t\tTimeTrigger trigger = mock(TimeTrigger.class);\n\t\twhen(trigger.getOffset()).thenReturn(0L);\n\t\twhen(t.getTimeTrigger()).thenReturn(trigger);", "new_methods": [], "old_code": "import cz.cuni.mff.d3s.deeco.model.runtime.api.PeriodicTrigger;\n\t\tPeriodicTrigger trigger = mock(PeriodicTrigger.class);\n\t\twhen(t.getPeriodicTrigger()).thenReturn(trigger);", "old_methods": [], "patch": "@@ -9,7 +9,7 @@\n import org.junit.Test;\n \n import cz.cuni.mff.d3s.deeco.executor.Executor;\n-import cz.cuni.mff.d3s.deeco.model.runtime.api.PeriodicTrigger;\n+import cz.cuni.mff.d3s.deeco.model.runtime.api.TimeTrigger;\n import cz.cuni.mff.d3s.deeco.task.Task;\n \n /**\n@@ -75,13 +75,14 @@ public void testDieOnEmptyQueueWhenNotNewTasksMayBeScheduled() throws Interrupte\n \tpublic void testRemovesCancelledEvents() throws InterruptedException {\n \t\t// Creating mocks of the task and the trigger \n \t\tTask t= mock(Task.class);\n-\t\tPeriodicTrigger trigger = mock(PeriodicTrigger.class);\n+\t\tTimeTrigger trigger = mock(TimeTrigger.class);\n \n \t\t// And stubbing their behavior\n \t\t// Task period has to be big. We don't need to run\n \t\t// the task too often since we don't need it\n \t\twhen(trigger.getPeriod()).thenReturn(20000L); \n-\t\twhen(t.getPeriodicTrigger()).thenReturn(trigger);\n+\t\twhen(trigger.getOffset()).thenReturn(0L);\n+\t\twhen(t.getTimeTrigger()).thenReturn(trigger);\n \t\t\n \t\ttested.addTask(t);\n \t\ttested.start();", "raw_url": "https://github.com/d3scomp/JDEECo/raw/cddfa1a013f7c6f02e6e496b211ac6da552641e7/jdeeco-core%2Ftest%2Fcz%2Fcuni%2Fmff%2Fd3s%2Fdeeco%2Fscheduler%2FSingleThreadedSchedulerTest.java", "sha": "e4a59c117465ca13882564a37a77162b2fe0726d", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/d3scomp/JDEECo/blob/cddfa1a013f7c6f02e6e496b211ac6da552641e7/jdeeco-core%2Ftest%2Fcz%2Fcuni%2Fmff%2Fd3s%2Fdeeco%2Ftask%2FEnsembleTaskTest.java", "changes": 2, "contents_url": "https://api.github.com/repos/d3scomp/JDEECo/contents/jdeeco-core%2Ftest%2Fcz%2Fcuni%2Fmff%2Fd3s%2Fdeeco%2Ftask%2FEnsembleTaskTest.java?ref=cddfa1a013f7c6f02e6e496b211ac6da552641e7", "deletions": 1, "filename": "jdeeco-core/test/cz/cuni/mff/d3s/deeco/task/EnsembleTaskTest.java", "new_code": "\t\tlong period = task.getTimeTrigger().getPeriod();", "new_methods": [], "old_code": "\t\tlong period = task.getPeriodicTrigger().getPeriod();", "old_methods": [], "patch": "@@ -169,7 +169,7 @@ public ValueSet answer(InvocationOnMock invocation) {\n \tpublic void testSchedulingPeriod() {\n \t\t// GIVEN an EnsembleTask initialized with an InstanceEnsemblingController\n \t\t// WHEN getSchedulingPeriod is called\n-\t\tlong period = task.getPeriodicTrigger().getPeriod();\n+\t\tlong period = task.getTimeTrigger().getPeriod();\n \t\t// THEN it returns the period specified in the model\n \t\t// THEN it returns the period specified in the model\n \t\tassertEquals(model.ensemblePeriodicTrigger.getPeriod(), period);", "raw_url": "https://github.com/d3scomp/JDEECo/raw/cddfa1a013f7c6f02e6e496b211ac6da552641e7/jdeeco-core%2Ftest%2Fcz%2Fcuni%2Fmff%2Fd3s%2Fdeeco%2Ftask%2FEnsembleTaskTest.java", "sha": "5fcf2da266f652b17e105808fecc2f29d7b49b5e", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/d3scomp/JDEECo/blob/cddfa1a013f7c6f02e6e496b211ac6da552641e7/jdeeco-core%2Ftest%2Fcz%2Fcuni%2Fmff%2Fd3s%2Fdeeco%2Ftask%2FProcessTaskTest.java", "changes": 2, "contents_url": "https://api.github.com/repos/d3scomp/JDEECo/contents/jdeeco-core%2Ftest%2Fcz%2Fcuni%2Fmff%2Fd3s%2Fdeeco%2Ftask%2FProcessTaskTest.java?ref=cddfa1a013f7c6f02e6e496b211ac6da552641e7", "deletions": 1, "filename": "jdeeco-core/test/cz/cuni/mff/d3s/deeco/task/ProcessTaskTest.java", "new_code": "\t\tlong period = task.getTimeTrigger().getPeriod();", "new_methods": [], "old_code": "\t\tlong period = task.getPeriodicTrigger().getPeriod();", "old_methods": [], "patch": "@@ -97,7 +97,7 @@ public ValueSet answer(InvocationOnMock invocation) {\n \tpublic void testSchedulingPeriod() {\n \t\t// GIVEN a ProcessTask initialized with an ComponentProcess\n \t\t// WHEN getSchedulingPeriod is called\n-\t\tlong period = task.getPeriodicTrigger().getPeriod();\n+\t\tlong period = task.getTimeTrigger().getPeriod();\n \t\t// THEN it returns the period specified in the model\n \t\tassertEquals(model.processPeriodicTrigger.getPeriod(), period);\n \t}", "raw_url": "https://github.com/d3scomp/JDEECo/raw/cddfa1a013f7c6f02e6e496b211ac6da552641e7/jdeeco-core%2Ftest%2Fcz%2Fcuni%2Fmff%2Fd3s%2Fdeeco%2Ftask%2FProcessTaskTest.java", "sha": "5124fad8e4219dfaa31a0479ef6ee744579b684c", "status": "modified" } ]
28
[ { "name": "d3scomp$jdeeco", "new_args": "", "new_implementation": "TimeTriggerImpl timeTrigger = new TimeTriggerImpl();\n\t\treturn timeTrigger;", "new_return_type": "TimeTrigger", "new_signature": "TimeTrigger createTimeTrigger()", "old_args": "", "old_implementation": "PeriodicTriggerImpl periodicTrigger = new PeriodicTriggerImpl();\n\t\treturn periodicTrigger;", "old_return_type": "PeriodicTrigger", "old_signature": "PeriodicTrigger createPeriodicTrigger()" } ]
1
5
e8949857917389cb594a4fcbd8ede077af7f24e7
[ { "name": "pentaho$modeler", "new_args": "", "new_implementation": null, "new_return_type": "void", "new_signature": "void fireTablesChanged()", "old_args": "", "old_implementation": null, "old_return_type": "void", "old_signature": "void fireFieldsChanged()" }, { "name": "pentaho$modeler", "new_args": "", "new_implementation": "return availableTables;\n private void fireTablesChanged() {\n firePropertyChange(\"availableTables\", null, this.availableTables); //$NON-NLS-1$\n // Add in new physical tables/columns\n // see if the table is in the availableTables list\n AvailableTable aTable = availableTables.findAvailableTable(table.getName(LocalizedString.DEFAULT_LOCALE));\n if (aTable == null) {\n // new table, make sure we add it\n availableTables.add(new AvailableTable(table));", "new_return_type": "AvailableItemCollection", "new_signature": "AvailableItemCollection getAvailableTables()", "old_args": "", "old_implementation": "return availableFields;\n\n private void fireFieldsChanged() {\n firePropertyChange(\"availableFields\", null, this.availableFields); //$NON-NLS-1$\n // Add in new physical columns\n for(IPhysicalColumn column : table.getPhysicalColumns()) {\n boolean exists = false;\n inner:\n for(AvailableField field : this.availableFields) {\n if (field.isSameUnderlyingPhysicalColumn(column)) {\n exists = true;\n break inner;", "old_return_type": "AvailableFieldCollection", "old_signature": "AvailableFieldCollection getAvailableFields()" } ]
[ { "additions": 23, "blob_url": "https://github.com/pentaho/modeler/blob/e8949857917389cb594a4fcbd8ede077af7f24e7/src%2Forg%2Fpentaho%2Fagilebi%2Fmodeler%2FBaseModelerWorkspaceHelper.java", "changes": 44, "contents_url": "https://api.github.com/repos/pentaho/modeler/contents/src%2Forg%2Fpentaho%2Fagilebi%2Fmodeler%2FBaseModelerWorkspaceHelper.java?ref=e8949857917389cb594a4fcbd8ede077af7f24e7", "deletions": 21, "filename": "src/org/pentaho/agilebi/modeler/BaseModelerWorkspaceHelper.java", "new_code": " for (AvailableTable table : workspace.getAvailableTables().getAsAvailableTablesList()) {\n for( AvailableField field : table.getAvailableFields() ) {\n LogicalTable parentTable = workspace.findLogicalTable(field.getPhysicalColumn().getPhysicalTable(), ModelerPerspective.ANALYSIS);\n DataType dataType = field.getPhysicalColumn().getDataType();\n if( dataType == DataType.NUMERIC) {\n // create a measure\n MeasureMetaData measure = workspace.createMeasureForNode(field);\n workspace.getModel().getMeasures().add(measure);\n }\n // create a dimension\n workspace.addDimensionFromNode(workspace.createColumnBackedNode(field, ModelerPerspective.ANALYSIS));\n }\n\n List<AvailableTable> tablesList = workspace.getAvailableTables().getAsAvailableTablesList();\n\n for (AvailableTable aTable : tablesList) {\n if (aTable.isSameUnderlyingPhysicalTable(table)) {\n for( AvailableField field : aTable.getAvailableFields() ) {\n if (field.getPhysicalColumn().getPhysicalTable().getId().equals(table.getId())) {\n category.add(workspace.createFieldForParentWithNode(category, field));\n }\n }\n", "new_methods": [], "old_code": " public static String getCorrespondingOlapColumnId(LogicalColumn lc) {\n String tableId = lc.getLogicalTable().getId().replaceAll(\"BT\", \"LC\");\n String olapColId = tableId + OLAP_SUFFIX + \"_\" + lc.getPhysicalColumn().getId();\n return olapColId;\n }\n\n List<AvailableField> fields = workspace.getAvailableFields();\n for( AvailableField field : fields ) {\n LogicalTable parentTable = workspace.findLogicalTable(field.getPhysicalColumn().getPhysicalTable(), ModelerPerspective.ANALYSIS);\n DataType dataType = field.getPhysicalColumn().getDataType();\n if( dataType == DataType.NUMERIC) {\n // create a measure\n MeasureMetaData measure = workspace.createMeasureForNode(field);\n workspace.getModel().getMeasures().add(measure);\n }\n // create a dimension\n workspace.addDimensionFromNode(workspace.createColumnBackedNode(field, ModelerPerspective.ANALYSIS));\n List<AvailableField> fields = workspace.getAvailableFields();\n for( AvailableField field : fields ) {\n if (field.getPhysicalColumn().getPhysicalTable().getId().equals(table.getId())) {\n category.add(workspace.createFieldForParentWithNode(category, field));", "old_methods": [ { "arguments": [ "LogicalColumn lc" ], "filename": "src/org/pentaho/agilebi/modeler/BaseModelerWorkspaceHelper.java", "implementation": "String tableId = lc.getLogicalTable().getId().replaceAll(\"BT\", \"LC\");\n String olapColId = tableId + OLAP_SUFFIX + \"_\" + lc.getPhysicalColumn().getId();\n return olapColId;", "signature": "String getCorrespondingOlapColumnId(LogicalColumn lc)" } ], "patch": "@@ -234,12 +234,6 @@ protected void populateCategories(ModelerWorkspace workspace) {\n }\n \n \n- public static String getCorrespondingOlapColumnId(LogicalColumn lc) {\n- String tableId = lc.getLogicalTable().getId().replaceAll(\"BT\", \"LC\");\n- String olapColId = tableId + OLAP_SUFFIX + \"_\" + lc.getPhysicalColumn().getId();\n- return olapColId;\n- }\n-\n public static void duplicateLogicalTablesForDualModelingMode(LogicalModel model) {\n String locale = \"en-US\";\n int tableCount = model.getLogicalTables().size();\n@@ -271,18 +265,19 @@ public void autoModelFlat( ModelerWorkspace workspace ) throws ModelerException\n }\n }\n \n- List<AvailableField> fields = workspace.getAvailableFields();\n- for( AvailableField field : fields ) {\n- LogicalTable parentTable = workspace.findLogicalTable(field.getPhysicalColumn().getPhysicalTable(), ModelerPerspective.ANALYSIS);\n- DataType dataType = field.getPhysicalColumn().getDataType();\n- if( dataType == DataType.NUMERIC) {\n- // create a measure\n- MeasureMetaData measure = workspace.createMeasureForNode(field);\n- workspace.getModel().getMeasures().add(measure);\n- }\n- // create a dimension\n- workspace.addDimensionFromNode(workspace.createColumnBackedNode(field, ModelerPerspective.ANALYSIS));\n+ for (AvailableTable table : workspace.getAvailableTables().getAsAvailableTablesList()) {\n+ for( AvailableField field : table.getAvailableFields() ) {\n+ LogicalTable parentTable = workspace.findLogicalTable(field.getPhysicalColumn().getPhysicalTable(), ModelerPerspective.ANALYSIS);\n+ DataType dataType = field.getPhysicalColumn().getDataType();\n+ if( dataType == DataType.NUMERIC) {\n+ // create a measure\n+ MeasureMetaData measure = workspace.createMeasureForNode(field);\n+ workspace.getModel().getMeasures().add(measure);\n+ }\n+ // create a dimension\n+ workspace.addDimensionFromNode(workspace.createColumnBackedNode(field, ModelerPerspective.ANALYSIS));\n \n+ }\n }\n workspace.setModelIsChanging(prevChangeState);\n workspace.setSelectedNode(workspace.getModel());\n@@ -344,18 +339,25 @@ public void autoModelRelationalFlat(ModelerWorkspace workspace) throws ModelerEx\n \n List<? extends IPhysicalTable> tables = workspace.getDomain().getPhysicalModels().get(0).getPhysicalTables();\n Set<String> tableIds = new HashSet<String>();\n+\n+ List<AvailableTable> tablesList = workspace.getAvailableTables().getAsAvailableTablesList();\n+\n for (IPhysicalTable table : tables) {\n if (!tableIds.contains(table.getId())) {\n tableIds.add(table.getId());\n String catName = getCleanCategoryName(table.getName(getLocale()), workspace, tableIds.size());\n CategoryMetaData category = new CategoryMetaData(catName);\n \n- List<AvailableField> fields = workspace.getAvailableFields();\n- for( AvailableField field : fields ) {\n- if (field.getPhysicalColumn().getPhysicalTable().getId().equals(table.getId())) {\n- category.add(workspace.createFieldForParentWithNode(category, field));\n+ for (AvailableTable aTable : tablesList) {\n+ if (aTable.isSameUnderlyingPhysicalTable(table)) {\n+ for( AvailableField field : aTable.getAvailableFields() ) {\n+ if (field.getPhysicalColumn().getPhysicalTable().getId().equals(table.getId())) {\n+ category.add(workspace.createFieldForParentWithNode(category, field));\n+ }\n+ }\n }\n }\n+\n relationalModelNode.getCategories().add(category);\n }\n }", "raw_url": "https://github.com/pentaho/modeler/raw/e8949857917389cb594a4fcbd8ede077af7f24e7/src%2Forg%2Fpentaho%2Fagilebi%2Fmodeler%2FBaseModelerWorkspaceHelper.java", "sha": "ebbd9bf6263fdf503ca195253cfda9d1fa133e2a", "status": "modified" }, { "additions": 25, "blob_url": "https://github.com/pentaho/modeler/blob/e8949857917389cb594a4fcbd8ede077af7f24e7/src%2Forg%2Fpentaho%2Fagilebi%2Fmodeler%2FCategoryTreeHelper.java", "changes": 40, "contents_url": "https://api.github.com/repos/pentaho/modeler/contents/src%2Forg%2Fpentaho%2Fagilebi%2Fmodeler%2FCategoryTreeHelper.java?ref=e8949857917389cb594a4fcbd8ede077af7f24e7", "deletions": 15, "filename": "src/org/pentaho/agilebi/modeler/CategoryTreeHelper.java", "new_code": " if (obj instanceof AvailableTable) {\r\n AvailableTable table = (AvailableTable)obj;\r\n for (AvailableField field : table.getAvailableFields()) {\r\n addAvailableField(field);\r\n } else if (obj instanceof AvailableField) {\r\n AvailableField availableField = (AvailableField)obj;\r\n addAvailableField(availableField);\r\n\r\n private void addAvailableField(AvailableField availableField) {\r\n AbstractMetaDataModelNode theNode = null;\r\n Object selectedTreeItem = getSelectedTreeItem();\r\n // depending on the parent\r\n if (selectedTreeItem == null) {\r\n // null - cannot add fields at this level\r\n } else if (selectedTreeItem instanceof CategoryMetaData) {\r\n // category - add as a field\r\n theNode = workspace.createFieldForParentWithNode((CategoryMetaData) selectedTreeItem, availableField);\r\n CategoryMetaData theCategory = (CategoryMetaData) selectedTreeItem;\r\n theCategory.add((FieldMetaData) theNode);\r\n }\r\n if (theNode != null) {\r\n theNode.setParent((AbstractMetaDataModelNode) selectedTreeItem);\r\n }\r\n }\r\n\r", "new_methods": [ { "arguments": [ "obj instanceof AvailableField" ], "filename": "src/org/pentaho/agilebi/modeler/CategoryTreeHelper.java", "implementation": "AvailableField availableField = (AvailableField)obj;\r\n addAvailableField(availableField);\r\n\r\n private void addAvailableField(AvailableField availableField) {\r\n AbstractMetaDataModelNode theNode = null;\r\n Object selectedTreeItem = getSelectedTreeItem();\r\n // depending on the parent\r\n if (selectedTreeItem == null) {\r\n // null - cannot add fields at this level", "signature": "else if (obj instanceof AvailableField)" }, { "arguments": [ "selectedTreeItem instanceof CategoryMetaData" ], "filename": "src/org/pentaho/agilebi/modeler/CategoryTreeHelper.java", "implementation": "// category - add as a field\r\n theNode = workspace.createFieldForParentWithNode((CategoryMetaData) selectedTreeItem, availableField);\r\n CategoryMetaData theCategory = (CategoryMetaData) selectedTreeItem;\r\n theCategory.add((FieldMetaData) theNode);", "signature": "else if (selectedTreeItem instanceof CategoryMetaData)" } ], "old_code": " AbstractMetaDataModelNode theNode = null;\r\n Object selectedTreeItem = getSelectedTreeItem();\r\n if (obj instanceof AvailableField) {\r\n AvailableField availableField = (AvailableField)obj;\r\n // depending on the parent\r\n if (selectedTreeItem == null) {\r\n // null - cannot add fields at this level\r\n } else if (selectedTreeItem instanceof CategoryMetaData) {\r\n // category - add as a field\r\n theNode = workspace.createFieldForParentWithNode((CategoryMetaData) selectedTreeItem, availableField);\r\n CategoryMetaData theCategory = (CategoryMetaData) selectedTreeItem;\r\n theCategory.add((FieldMetaData) theNode);\r\n }\r\n if (theNode != null) {\r\n theNode.setParent((AbstractMetaDataModelNode) selectedTreeItem);\r", "old_methods": [ { "arguments": [ "selectedTreeItem == null" ], "filename": "src/org/pentaho/agilebi/modeler/CategoryTreeHelper.java", "implementation": "// null - cannot add fields at this level", "signature": "parent\r\n if (selectedTreeItem == null)" }, { "arguments": [ "selectedTreeItem instanceof CategoryMetaData" ], "filename": "src/org/pentaho/agilebi/modeler/CategoryTreeHelper.java", "implementation": "// category - add as a field\r\n theNode = workspace.createFieldForParentWithNode((CategoryMetaData) selectedTreeItem, availableField);\r\n CategoryMetaData theCategory = (CategoryMetaData) selectedTreeItem;\r\n theCategory.add((FieldMetaData) theNode);", "signature": "else if (selectedTreeItem instanceof CategoryMetaData)" } ], "patch": "@@ -49,28 +49,38 @@ public void removeField() {\n public void addField(Object[] selectedFields) {\r\n boolean prevChangeState = workspace.isModelChanging();\r\n workspace.setRelationalModelIsChanging(true);\r\n- AbstractMetaDataModelNode theNode = null;\r\n- Object selectedTreeItem = getSelectedTreeItem();\r\n \r\n for (Object obj : selectedFields) {\r\n- if (obj instanceof AvailableField) {\r\n- AvailableField availableField = (AvailableField)obj;\r\n- // depending on the parent\r\n- if (selectedTreeItem == null) {\r\n- // null - cannot add fields at this level\r\n- } else if (selectedTreeItem instanceof CategoryMetaData) {\r\n- // category - add as a field\r\n- theNode = workspace.createFieldForParentWithNode((CategoryMetaData) selectedTreeItem, availableField);\r\n- CategoryMetaData theCategory = (CategoryMetaData) selectedTreeItem;\r\n- theCategory.add((FieldMetaData) theNode);\r\n- }\r\n- if (theNode != null) {\r\n- theNode.setParent((AbstractMetaDataModelNode) selectedTreeItem);\r\n+ if (obj instanceof AvailableTable) {\r\n+ AvailableTable table = (AvailableTable)obj;\r\n+ for (AvailableField field : table.getAvailableFields()) {\r\n+ addAvailableField(field);\r\n }\r\n+ } else if (obj instanceof AvailableField) {\r\n+ AvailableField availableField = (AvailableField)obj;\r\n+ addAvailableField(availableField);\r\n }\r\n }\r\n workspace.setRelationalModelIsChanging(prevChangeState);\r\n }\r\n+\r\n+ private void addAvailableField(AvailableField availableField) {\r\n+ AbstractMetaDataModelNode theNode = null;\r\n+ Object selectedTreeItem = getSelectedTreeItem();\r\n+ // depending on the parent\r\n+ if (selectedTreeItem == null) {\r\n+ // null - cannot add fields at this level\r\n+ } else if (selectedTreeItem instanceof CategoryMetaData) {\r\n+ // category - add as a field\r\n+ theNode = workspace.createFieldForParentWithNode((CategoryMetaData) selectedTreeItem, availableField);\r\n+ CategoryMetaData theCategory = (CategoryMetaData) selectedTreeItem;\r\n+ theCategory.add((FieldMetaData) theNode);\r\n+ }\r\n+ if (theNode != null) {\r\n+ theNode.setParent((AbstractMetaDataModelNode) selectedTreeItem);\r\n+ }\r\n+ }\r\n+\r\n @Override\r\n public void clearTreeModel(){\r\n workspace.setRelationalModelIsChanging(true);\r", "raw_url": "https://github.com/pentaho/modeler/raw/e8949857917389cb594a4fcbd8ede077af7f24e7/src%2Forg%2Fpentaho%2Fagilebi%2Fmodeler%2FCategoryTreeHelper.java", "sha": "3175f8d5a4ee2310be79dbe4859bbfb4ec86e5d8", "status": "modified" }, { "additions": 2, "blob_url": "https://github.com/pentaho/modeler/blob/e8949857917389cb594a4fcbd8ede077af7f24e7/src%2Forg%2Fpentaho%2Fagilebi%2Fmodeler%2FColResolverController.java", "changes": 4, "contents_url": "https://api.github.com/repos/pentaho/modeler/contents/src%2Forg%2Fpentaho%2Fagilebi%2Fmodeler%2FColResolverController.java?ref=e8949857917389cb594a4fcbd8ede077af7f24e7", "deletions": 2, "filename": "src/org/pentaho/agilebi/modeler/ColResolverController.java", "new_code": " availableCols.setElements(workspace.getAvailableTables().getAsAvailableTablesList().get(0).getAvailableFields());\n ColumnBackedNode cnode = workspace.createColumnBackedNode(workspace.getAvailableTables().getAsAvailableTablesList().get(0).getAvailableFields().get(idx), workspace.getCurrentModelerPerspective());", "new_methods": [], "old_code": " availableCols.setElements(workspace.getAvailableFields());\n ColumnBackedNode cnode = workspace.createColumnBackedNode(workspace.getAvailableFields().get(idx), workspace.getCurrentModelerPerspective());", "old_methods": [], "patch": "@@ -43,7 +43,7 @@ public ColResolverController() {\n public void show( ModelerWorkspace workspace, ColumnBackedNode node ) {\n this.workspace = workspace;\n this.node = node;\n- availableCols.setElements(workspace.getAvailableFields());\n+ availableCols.setElements(workspace.getAvailableTables().getAsAvailableTablesList().get(0).getAvailableFields());\n dialog.show();\n }\n \n@@ -57,7 +57,7 @@ public void init() {\n public void done() {\n int idx = this.availableCols.getSelectedIndex();\n if (idx > -1) {\n- ColumnBackedNode cnode = workspace.createColumnBackedNode(workspace.getAvailableFields().get(idx), workspace.getCurrentModelerPerspective());\n+ ColumnBackedNode cnode = workspace.createColumnBackedNode(workspace.getAvailableTables().getAsAvailableTablesList().get(0).getAvailableFields().get(idx), workspace.getCurrentModelerPerspective());\n LogicalColumn lCol = cnode.getLogicalColumn();\n node.setLogicalColumn(lCol);\n workspace.setDirty(true);", "raw_url": "https://github.com/pentaho/modeler/raw/e8949857917389cb594a4fcbd8ede077af7f24e7/src%2Forg%2Fpentaho%2Fagilebi%2Fmodeler%2FColResolverController.java", "sha": "2122a1b313e38279481e8502863af8241ef3d675", "status": "modified" }, { "additions": 44, "blob_url": "https://github.com/pentaho/modeler/blob/e8949857917389cb594a4fcbd8ede077af7f24e7/src%2Forg%2Fpentaho%2Fagilebi%2Fmodeler%2FModelerController.java", "changes": 65, "contents_url": "https://api.github.com/repos/pentaho/modeler/contents/src%2Forg%2Fpentaho%2Fagilebi%2Fmodeler%2FModelerController.java?ref=e8949857917389cb594a4fcbd8ede077af7f24e7", "deletions": 21, "filename": "src/org/pentaho/agilebi/modeler/ModelerController.java", "new_code": "import java.util.Collection;\nimport java.util.Collections;\nimport java.util.HashMap;\nimport java.util.Map;\n private IAvailableItem[] selectedFields = new IAvailableItem[]{};\n @Bindable\n public void setSelectedFieldsChanged(Object selected) {\n if (selected != null && selected instanceof IAvailableItem) {\n selectedFields = new IAvailableItem[]{(IAvailableItem)selected};\n }\n }\n\n fieldListBinding = bf.createBinding(workspace.getAvailableTables(), \"children\", FIELD_LIST_ID,\n selectedFieldsBinding = bf.createBinding(FIELD_LIST_ID, \"selectedItem\", this,\n \"selectedFieldsChanged\"); //$NON-NLS-1$//$NON-NLS-2$\n IAvailableItem item = selectedFields[0];\n if (item instanceof AvailableField) {\n AvailableField f = (AvailableField)selectedFields[0];\n if(f != null){\n ColumnBackedNode node = workspace.createColumnBackedNode(f, ModelerPerspective.ANALYSIS);\n theMeasure.setLogicalColumn(node.getLogicalColumn());\n workspace.setDirty(true);\n }\n IAvailableItem item = selectedFields[0];\n if (item instanceof AvailableField) {\n AvailableField f = (AvailableField)selectedFields[0];\n ColumnBackedNode node = workspace.createColumnBackedNode(f, ModelerPerspective.ANALYSIS);\n theLevel.setLogicalColumn(node.getLogicalColumn());\n workspace.setDirty(true);\n }\n IAvailableItem item = selectedFields[0];\n if (item instanceof AvailableField) {\n AvailableField f = (AvailableField)selectedFields[0];\n ColumnBackedNode node = workspace.createColumnBackedNode(f, ModelerPerspective.REPORTING);\n theField.setLogicalColumn(node.getLogicalColumn());\n workspace.setDirty(true);\n }\n IAvailableItem[] f = new IAvailableItem[aFields.length];\n if (aFields[i] instanceof AvailableField) {\n f[i] = (AvailableField)aFields[i];\n } else if (aFields[i] instanceof AvailableTable) {\n f[i] = (AvailableTable)aFields[i];\n }\n selectedFields = new IAvailableItem[]{};", "new_methods": [ { "arguments": [ "Object selected" ], "filename": "src/org/pentaho/agilebi/modeler/ModelerController.java", "implementation": "if (selected != null && selected instanceof IAvailableItem) {\n selectedFields = new IAvailableItem[]{(IAvailableItem)selected", "signature": "void setSelectedFieldsChanged(Object selected)" }, { "arguments": [ "aFields[i] instanceof AvailableTable" ], "filename": "src/org/pentaho/agilebi/modeler/ModelerController.java", "implementation": "f[i] = (AvailableTable)aFields[i];", "signature": "else if (aFields[i] instanceof AvailableTable)" } ], "old_code": "import java.util.*;\n private AvailableField[] selectedFields;\n fieldListBinding = bf.createBinding(workspace, \"availableFields\", FIELD_LIST_ID,\n selectedFieldsBinding = bf.createBinding(FIELD_LIST_ID, \"selectedItems\", this,\n \"selectedFields\"); //$NON-NLS-1$//$NON-NLS-2$\n AvailableField f = selectedFields[0];\n if(f != null){\n ColumnBackedNode node = workspace.createColumnBackedNode(f, ModelerPerspective.ANALYSIS);\n theMeasure.setLogicalColumn(node.getLogicalColumn());\n workspace.setDirty(true);\n AvailableField f = selectedFields[0];\n ColumnBackedNode node = workspace.createColumnBackedNode(f, ModelerPerspective.ANALYSIS);\n theLevel.setLogicalColumn(node.getLogicalColumn());\n workspace.setDirty(true);\n AvailableField f = selectedFields[0];\n ColumnBackedNode node = workspace.createColumnBackedNode(f, ModelerPerspective.REPORTING);\n theField.setLogicalColumn(node.getLogicalColumn());\n workspace.setDirty(true);\n AvailableField[] f = new AvailableField[aFields.length];\n f[i] = (AvailableField)aFields[i];\n selectedFields = new AvailableField[]{};", "old_methods": [], "patch": "@@ -35,7 +35,10 @@\n import org.pentaho.ui.xul.stereotype.Bindable;\n import org.pentaho.ui.xul.util.XulDialogCallback;\n \n-import java.util.*;\n+import java.util.Collection;\n+import java.util.Collections;\n+import java.util.HashMap;\n+import java.util.Map;\n \n /**\n * XUL Event Handler for the modeling interface. This class interacts with a ModelerModel to store state.\n@@ -55,7 +58,7 @@ public class ModelerController extends AbstractXulEventHandler {\n private XulTree dimensionTree;\n private XulTree categoriesTree;\n private XulDeck propDeck;\n- private AvailableField[] selectedFields;\n+ private IAvailableItem[] selectedFields = new IAvailableItem[]{};\n \n private XulDeck modelDeck;\n private XulVbox reportingPanel;\n@@ -117,6 +120,13 @@ public void addField() {\n }\n }\n \n+ @Bindable\n+ public void setSelectedFieldsChanged(Object selected) {\n+ if (selected != null && selected instanceof IAvailableItem) {\n+ selectedFields = new IAvailableItem[]{(IAvailableItem)selected};\n+ }\n+ }\n+\n @Bindable\n public void init() throws ModelerException {\n \n@@ -135,10 +145,10 @@ public void init() throws ModelerException {\n modelTabbox = (XulTabbox) document.getElementById(\"modelTabbox\");\n \n bf.setBindingType(Type.ONE_WAY);\n- fieldListBinding = bf.createBinding(workspace, \"availableFields\", FIELD_LIST_ID,\n+ fieldListBinding = bf.createBinding(workspace.getAvailableTables(), \"children\", FIELD_LIST_ID,\n \"elements\"); //$NON-NLS-1$ //$NON-NLS-2$\n- selectedFieldsBinding = bf.createBinding(FIELD_LIST_ID, \"selectedItems\", this,\n- \"selectedFields\"); //$NON-NLS-1$//$NON-NLS-2$\n+ selectedFieldsBinding = bf.createBinding(FIELD_LIST_ID, \"selectedItem\", this,\n+ \"selectedFieldsChanged\"); //$NON-NLS-1$//$NON-NLS-2$\n \n modelTreeBinding = bf.createBinding(workspace, \"model\", dimensionTree, \"elements\"); //$NON-NLS-1$//$NON-NLS-2$\n relModelTreeBinding = bf.createBinding(workspace, \"relationalModel\", categoriesTree, \"elements\"); //$NON-NLS-1$//$NON-NLS-2$\n@@ -341,11 +351,14 @@ public void onClose( XulComponent sender, Status returnCode, Object retVal ) {\n \"\" + retVal, workspaceHelper.getLocale()); //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$\n \n if (selectedFields.length > 0) {\n- AvailableField f = selectedFields[0];\n- if(f != null){\n- ColumnBackedNode node = workspace.createColumnBackedNode(f, ModelerPerspective.ANALYSIS);\n- theMeasure.setLogicalColumn(node.getLogicalColumn());\n- workspace.setDirty(true);\n+ IAvailableItem item = selectedFields[0];\n+ if (item instanceof AvailableField) {\n+ AvailableField f = (AvailableField)selectedFields[0];\n+ if(f != null){\n+ ColumnBackedNode node = workspace.createColumnBackedNode(f, ModelerPerspective.ANALYSIS);\n+ theMeasure.setLogicalColumn(node.getLogicalColumn());\n+ workspace.setDirty(true);\n+ }\n }\n }\n \n@@ -419,10 +432,13 @@ public void onClose( XulComponent sender, Status returnCode, Object retVal ) {\n LevelMetaData theLevel = new LevelMetaData(theHierarchy, \"\" + retVal);\n \n if (selectedFields.length > 0) {\n- AvailableField f = selectedFields[0];\n- ColumnBackedNode node = workspace.createColumnBackedNode(f, ModelerPerspective.ANALYSIS);\n- theLevel.setLogicalColumn(node.getLogicalColumn());\n- workspace.setDirty(true);\n+ IAvailableItem item = selectedFields[0];\n+ if (item instanceof AvailableField) {\n+ AvailableField f = (AvailableField)selectedFields[0];\n+ ColumnBackedNode node = workspace.createColumnBackedNode(f, ModelerPerspective.ANALYSIS);\n+ theLevel.setLogicalColumn(node.getLogicalColumn());\n+ workspace.setDirty(true);\n+ }\n }\n \n theLevel.validate();\n@@ -528,10 +544,13 @@ public void onClose( XulComponent sender, Status returnCode, Object retVal ) {\n FieldMetaData theField = new FieldMetaData(theCategory, \"\" + retVal, \"\", \"\" + retVal, workspaceHelper.getLocale());\n \n if (selectedFields.length > 0) {\n- AvailableField f = selectedFields[0];\n- ColumnBackedNode node = workspace.createColumnBackedNode(f, ModelerPerspective.REPORTING);\n- theField.setLogicalColumn(node.getLogicalColumn());\n- workspace.setDirty(true);\n+ IAvailableItem item = selectedFields[0];\n+ if (item instanceof AvailableField) {\n+ AvailableField f = (AvailableField)selectedFields[0];\n+ ColumnBackedNode node = workspace.createColumnBackedNode(f, ModelerPerspective.REPORTING);\n+ theField.setLogicalColumn(node.getLogicalColumn());\n+ workspace.setDirty(true);\n+ }\n }\n \n theField.validate();\n@@ -707,17 +726,21 @@ public Object targetToSource( Boolean value ) {\n \n @Bindable\n public void setSelectedFields( Object[] aFields ) {\n- AvailableField[] f = new AvailableField[aFields.length];\n+ IAvailableItem[] f = new IAvailableItem[aFields.length];\n for(int i=0; i<aFields.length; i++){\n- f[i] = (AvailableField)aFields[i];\n+ if (aFields[i] instanceof AvailableField) {\n+ f[i] = (AvailableField)aFields[i];\n+ } else if (aFields[i] instanceof AvailableTable) {\n+ f[i] = (AvailableTable)aFields[i];\n+ }\n }\n selectedFields = f;\n }\n \n @Bindable\n public Object[] getSelectedFields() {\n if (selectedFields == null) {\n- selectedFields = new AvailableField[]{};\n+ selectedFields = new IAvailableItem[]{};\n }\n return selectedFields;\n }", "raw_url": "https://github.com/pentaho/modeler/raw/e8949857917389cb594a4fcbd8ede077af7f24e7/src%2Forg%2Fpentaho%2Fagilebi%2Fmodeler%2FModelerController.java", "sha": "d1b830ab79e71b25b6833f73b9bbedde1992a52c", "status": "modified" }, { "additions": 97, "blob_url": "https://github.com/pentaho/modeler/blob/e8949857917389cb594a4fcbd8ede077af7f24e7/src%2Forg%2Fpentaho%2Fagilebi%2Fmodeler%2FModelerWorkspace.java", "changes": 176, "contents_url": "https://api.github.com/repos/pentaho/modeler/contents/src%2Forg%2Fpentaho%2Fagilebi%2Fmodeler%2FModelerWorkspace.java?ref=e8949857917389cb594a4fcbd8ede077af7f24e7", "deletions": 79, "filename": "src/org/pentaho/agilebi/modeler/ModelerWorkspace.java", "new_code": " private static final long serialVersionUID = 2058731810283858276L;\n private AvailableItemCollection availableTables = new AvailableItemCollection();\n public AvailableItemCollection getAvailableTables() {\n return availableTables;\n private void fireTablesChanged() {\n firePropertyChange(\"availableTables\", null, this.availableTables); //$NON-NLS-1$\n // Add in new physical tables/columns\n // see if the table is in the availableTables list\n AvailableTable aTable = availableTables.findAvailableTable(table.getName(LocalizedString.DEFAULT_LOCALE));\n if (aTable == null) {\n // new table, make sure we add it\n availableTables.add(new AvailableTable(table));\n } else {\n // table already exists here, make sure all the fields are accounted for\n boolean exists = false;\n inner:\n for(AvailableField field : aTable.getAvailableFields()) {\n if (field.isSameUnderlyingPhysicalColumn(column)) {\n }\n }\n if (!exists) {\n AvailableField field = new AvailableField(column);\n aTable.getAvailableFields().add(field);\n Collections.sort(aTable.getAvailableFields(), fieldComparator);\n // Remove available tables/fields that no longer exist correspond to an available physical column\n List<AvailableTable> tablesToRemove = new ArrayList<AvailableTable>();\n List<AvailableTable> tablesList = availableTables.getAsAvailableTablesList();\n for (AvailableTable aTable : tablesList) {\n List<AvailableField> toRemove = new ArrayList<AvailableField>();\n boolean tableExists = false;\n for (AvailableField field : aTable.getAvailableFields()) {\n boolean exists = false;\n inner:\n for (IPhysicalTable table : newDomain.getPhysicalModels().get(0).getPhysicalTables()) {\n if (aTable.isSameUnderlyingPhysicalTable(table)) {\n tableExists = true;\n for(IPhysicalColumn column : table.getPhysicalColumns()) {\n if (field.isSameUnderlyingPhysicalColumn(column)) {\n exists = true;\n break inner;\n }\n }\n }\n }\n if (!exists) {\n toRemove.add(field);\n }\n }\n aTable.getAvailableFields().removeAll(toRemove);\n workspaceHelper.sortFields(aTable.getAvailableFields());\n\n if (!tableExists) {\n tablesToRemove.add(aTable);\n }\n }\n availableTables.removeAll(tablesToRemove);\n // TODO, sort the tables???\n\n\n fireTablesChanged();\n for (AvailableTable table : tablesList) {\n if (table.containsUnderlyingPhysicalColumn(measure.getLogicalColumn().getPhysicalColumn())) {\n // the physical column backing this measure is still available, it is ok\n found = true;\n break inner;\n }\n }\n for (AvailableTable table : tablesList) {\n if (table.containsUnderlyingPhysicalColumn(lm.getLogicalColumn().getPhysicalColumn())) {\n // the physical column backing this level is still available, it is ok\n found = true;\n break inner;\n }\n }\n for (AvailableTable table : tablesList) {\n if (table.containsUnderlyingPhysicalColumn(field.getLogicalColumn().getPhysicalColumn())) {\n // the physical column backing this field is still available, it is ok\n found = true;\n break inner;\n }\n }\n public void setAvailableTables(AvailableItemCollection tables){\n this.availableTables = tables;\n firePropertyChange(\"availableTables\", null, getAvailableTables()); //$NON-NLS-1$\n\n this.availableTables.clear();\n availableTables.add(new AvailableTable(table));\n firePropertyChange(\"availableTables\", null, getAvailableTables()); //$NON-NLS-1$\n // create new logical columns\n AvailableField field = new AvailableField(level.getLogicalColumn().getPhysicalColumn());\n ColumnBackedNode node = createColumnBackedNode(field, ModelerPerspective.ANALYSIS);\n level.setLogicalColumn(node.getLogicalColumn());\n AvailableField field = new AvailableField(measure.getLogicalColumn().getPhysicalColumn());\n ColumnBackedNode node = createColumnBackedNode(field, ModelerPerspective.ANALYSIS);\n measure.setLogicalColumn(node.getLogicalColumn());\n fireTablesChanged();\n fireTablesChanged();", "new_methods": [ { "arguments": [], "filename": "src/org/pentaho/agilebi/modeler/ModelerWorkspace.java", "implementation": "return availableTables;\n private void fireTablesChanged() {\n firePropertyChange(\"availableTables\", null, this.availableTables); //$NON-NLS-1$\n // Add in new physical tables/columns\n // see if the table is in the availableTables list\n AvailableTable aTable = availableTables.findAvailableTable(table.getName(LocalizedString.DEFAULT_LOCALE));\n if (aTable == null) {\n // new table, make sure we add it\n availableTables.add(new AvailableTable(table));", "signature": "AvailableItemCollection getAvailableTables()" } ], "old_code": " private AvailableFieldCollection availableFields = new AvailableFieldCollection();\n// private AvailableFieldCollection availableOlapFields = new AvailableFieldCollection();\n public AvailableFieldCollection getAvailableFields() {\n return availableFields;\n\n private void fireFieldsChanged() {\n firePropertyChange(\"availableFields\", null, this.availableFields); //$NON-NLS-1$\n // Add in new physical columns\n for(IPhysicalColumn column : table.getPhysicalColumns()) {\n boolean exists = false;\n inner:\n for(AvailableField field : this.availableFields) {\n if (field.isSameUnderlyingPhysicalColumn(column)) {\n exists = true;\n break inner;\n }\n }\n if (!exists) {\n AvailableField field = new AvailableField(column);\n availableFields.add(field);\n Collections.sort(availableFields, fieldComparator);\n }\n }\n }\n\n // Remove available fields that no longer exist correspond to an available physical column\n List<AvailableField> toRemove = new ArrayList<AvailableField>();\n for (AvailableField field : availableFields) {\n boolean exists = false;\n inner:\n for (IPhysicalTable table : newDomain.getPhysicalModels().get(0).getPhysicalTables()) {\n if (field.isSameUnderlyingPhysicalColumn(column)) {\n if (!exists) {\n toRemove.add(field);\n }\n availableFields.removeAll(toRemove);\n workspaceHelper.sortFields(availableFields);\n fireFieldsChanged();\n for (AvailableField field : availableFields) {\n if (field.isSameUnderlyingPhysicalColumn(measure.getLogicalColumn().getPhysicalColumn())) {\n // the physical column backing this measure is still available, it is ok\n found = true;\n break inner;\n }\n }\n for (AvailableField field : availableFields) {\n if (field.isSameUnderlyingPhysicalColumn(lm.getLogicalColumn().getPhysicalColumn())) {\n // the physical column backing this level is still available, it is ok\n found = true;\n break inner;\n }\n }\n for (AvailableField af : availableFields) {\n if (af.isSameUnderlyingPhysicalColumn(field.getLogicalColumn().getPhysicalColumn())) {\n // the physical column backing this field is still available, it is ok\n found = true;\n break inner;\n }\n }\n public void setAvailableFields(AvailableFieldCollection fields){\n this.availableFields = fields;\n firePropertyChange(\"availableFields\", null, getAvailableFields()); //$NON-NLS-1$\n\n this.availableFields.clear();\n for (IPhysicalColumn column : table.getPhysicalColumns()) {\n AvailableField field = new AvailableField(column);\n availableFields.add(field);\n }\n workspaceHelper.sortFields(availableFields);\n\n firePropertyChange(\"availableFields\", null, getAvailableFields()); //$NON-NLS-1$\n String olapColumnId = BaseModelerWorkspaceHelper.getCorrespondingOlapColumnId(level.getLogicalColumn());\n LogicalColumn olapCol = model.findLogicalColumn(olapColumnId);\n level.setLogicalColumn(olapCol);\n String olapColumnId = BaseModelerWorkspaceHelper.getCorrespondingOlapColumnId(measure.getLogicalColumn());\n LogicalColumn olapCol = model.findLogicalColumn(olapColumnId);\n measure.setLogicalColumn(olapCol);\n fireFieldsChanged();\n fireFieldsChanged();", "old_methods": [ { "arguments": [], "filename": "src/org/pentaho/agilebi/modeler/ModelerWorkspace.java", "implementation": "return availableFields;\n\n private void fireFieldsChanged() {\n firePropertyChange(\"availableFields\", null, this.availableFields); //$NON-NLS-1$\n // Add in new physical columns\n for(IPhysicalColumn column : table.getPhysicalColumns()) {\n boolean exists = false;\n inner:\n for(AvailableField field : this.availableFields) {\n if (field.isSameUnderlyingPhysicalColumn(column)) {\n exists = true;\n break inner;", "signature": "AvailableFieldCollection getAvailableFields()" }, { "arguments": [ "AvailableFieldCollection fields" ], "filename": "src/org/pentaho/agilebi/modeler/ModelerWorkspace.java", "implementation": "this.availableFields = fields;\n firePropertyChange(\"availableFields\", null, getAvailableFields()); //$NON-NLS-1$\n\n this.availableFields.clear();\n for (IPhysicalColumn column : table.getPhysicalColumns()) {\n AvailableField field = new AvailableField(column);\n availableFields.add(field);", "signature": "void setAvailableFields(AvailableFieldCollection fields)" } ], "patch": "@@ -39,8 +39,8 @@\n @SuppressWarnings(\"unchecked\")\n public class ModelerWorkspace extends XulEventSourceAdapter implements Serializable{\n \n- private AvailableFieldCollection availableFields = new AvailableFieldCollection();\n-// private AvailableFieldCollection availableOlapFields = new AvailableFieldCollection();\n+ private static final long serialVersionUID = 2058731810283858276L;\n+ private AvailableItemCollection availableTables = new AvailableItemCollection();\n \n private MainModelNode model;\n private RelationalModelNode relationalModel;\n@@ -224,11 +224,10 @@ public void setDirty( boolean dirty ) {\n }\n \n @Bindable\n- public AvailableFieldCollection getAvailableFields() {\n- return availableFields;\n+ public AvailableItemCollection getAvailableTables() {\n+ return availableTables;\n }\n \n-\n @Bindable\n public void setSelectedVisualization( String aVisualization ) {\n this.selectedVisualization = aVisualization;\n@@ -313,8 +312,8 @@ public HierarchyMetaData createHierarchyForParentWithNode( DimensionMetaData par\n return hier;\n }\n \n- private void fireFieldsChanged() {\n- firePropertyChange(\"availableFields\", null, this.availableFields); //$NON-NLS-1$\n+ private void fireTablesChanged() {\n+ firePropertyChange(\"availableTables\", null, this.availableTables); //$NON-NLS-1$\n }\n \n private void fireModelChanged() {\n@@ -407,60 +406,83 @@ public int compare( AvailableField arg0, AvailableField arg1 ) {\n \n LogicalModel logicalModel = newDomain.getLogicalModels().get(0);\n \n- // Add in new physical columns\n+ // Add in new physical tables/columns\n for (IPhysicalTable table : newDomain.getPhysicalModels().get(0).getPhysicalTables()) {\n- for(IPhysicalColumn column : table.getPhysicalColumns()) {\n- boolean exists = false;\n- inner:\n- for(AvailableField field : this.availableFields) {\n- if (field.isSameUnderlyingPhysicalColumn(column)) {\n- exists = true;\n- break inner;\n- }\n- }\n- if (!exists) {\n- AvailableField field = new AvailableField(column);\n- availableFields.add(field);\n- Collections.sort(availableFields, fieldComparator);\n- }\n- }\n- }\n-\n- // Remove available fields that no longer exist correspond to an available physical column\n- List<AvailableField> toRemove = new ArrayList<AvailableField>();\n- for (AvailableField field : availableFields) {\n- boolean exists = false;\n- inner:\n- for (IPhysicalTable table : newDomain.getPhysicalModels().get(0).getPhysicalTables()) {\n+ // see if the table is in the availableTables list\n+ AvailableTable aTable = availableTables.findAvailableTable(table.getName(LocalizedString.DEFAULT_LOCALE));\n+ if (aTable == null) {\n+ // new table, make sure we add it\n+ availableTables.add(new AvailableTable(table));\n+ } else {\n+ // table already exists here, make sure all the fields are accounted for\n for(IPhysicalColumn column : table.getPhysicalColumns()) {\n- if (field.isSameUnderlyingPhysicalColumn(column)) {\n+ boolean exists = false;\n+ inner:\n+ for(AvailableField field : aTable.getAvailableFields()) {\n+ if (field.isSameUnderlyingPhysicalColumn(column)) {\n exists = true;\n break inner;\n+ }\n+ }\n+ if (!exists) {\n+ AvailableField field = new AvailableField(column);\n+ aTable.getAvailableFields().add(field);\n+ Collections.sort(aTable.getAvailableFields(), fieldComparator);\n }\n }\n }\n- if (!exists) {\n- toRemove.add(field);\n- }\n }\n- availableFields.removeAll(toRemove);\n- workspaceHelper.sortFields(availableFields);\n \n- fireFieldsChanged();\n+ // Remove available tables/fields that no longer exist correspond to an available physical column\n+ List<AvailableTable> tablesToRemove = new ArrayList<AvailableTable>();\n+ List<AvailableTable> tablesList = availableTables.getAsAvailableTablesList();\n \n+ for (AvailableTable aTable : tablesList) {\n+ List<AvailableField> toRemove = new ArrayList<AvailableField>();\n+ boolean tableExists = false;\n+ for (AvailableField field : aTable.getAvailableFields()) {\n+ boolean exists = false;\n+ inner:\n+ for (IPhysicalTable table : newDomain.getPhysicalModels().get(0).getPhysicalTables()) {\n+ if (aTable.isSameUnderlyingPhysicalTable(table)) {\n+ tableExists = true;\n+ for(IPhysicalColumn column : table.getPhysicalColumns()) {\n+ if (field.isSameUnderlyingPhysicalColumn(column)) {\n+ exists = true;\n+ break inner;\n+ }\n+ }\n+ }\n+ }\n+ if (!exists) {\n+ toRemove.add(field);\n+ }\n+ }\n+ aTable.getAvailableFields().removeAll(toRemove);\n+ workspaceHelper.sortFields(aTable.getAvailableFields());\n+\n+ if (!tableExists) {\n+ tablesToRemove.add(aTable);\n+ }\n+ }\n+ availableTables.removeAll(tablesToRemove);\n+ // TODO, sort the tables???\n+\n+\n+ fireTablesChanged();\n \n for (MeasureMetaData measure : model.getMeasures()) {\n boolean found = false;\n if (measure.getLogicalColumn() != null) {\n inner:\n- for (AvailableField field : availableFields) {\n- if (field.isSameUnderlyingPhysicalColumn(measure.getLogicalColumn().getPhysicalColumn())) {\n- // the physical column backing this measure is still available, it is ok\n- found = true;\n- break inner;\n+ for (AvailableTable table : tablesList) {\n+ if (table.containsUnderlyingPhysicalColumn(measure.getLogicalColumn().getPhysicalColumn())) {\n+ // the physical column backing this measure is still available, it is ok\n+ found = true;\n+ break inner;\n+ }\n+ }\n }\n- }\n- }\n if (!found) {\n // the physical column that backed this measure no longer exists in the model.\n // therefore, we must invalidate it's logical column\n@@ -475,14 +497,14 @@ public int compare( AvailableField arg0, AvailableField arg1 ) {\n boolean found = false;\n if (lm.getLogicalColumn() != null) {\n inner:\n- for (AvailableField field : availableFields) {\n- if (field.isSameUnderlyingPhysicalColumn(lm.getLogicalColumn().getPhysicalColumn())) {\n- // the physical column backing this level is still available, it is ok\n- found = true;\n- break inner;\n+ for (AvailableTable table : tablesList) {\n+ if (table.containsUnderlyingPhysicalColumn(lm.getLogicalColumn().getPhysicalColumn())) {\n+ // the physical column backing this level is still available, it is ok\n+ found = true;\n+ break inner;\n+ }\n+ }\n }\n- }\n- }\n if (!found) {\n // the physical column that backed this level no longer exists in the model.\n // therefore, we must invalidate it's logical column\n@@ -500,14 +522,14 @@ public int compare( AvailableField arg0, AvailableField arg1 ) {\n boolean found = false;\n if (field.getLogicalColumn() != null) {\n inner:\n- for (AvailableField af : availableFields) {\n- if (af.isSameUnderlyingPhysicalColumn(field.getLogicalColumn().getPhysicalColumn())) {\n- // the physical column backing this field is still available, it is ok\n- found = true;\n- break inner;\n+ for (AvailableTable table : tablesList) {\n+ if (table.containsUnderlyingPhysicalColumn(field.getLogicalColumn().getPhysicalColumn())) {\n+ // the physical column backing this field is still available, it is ok\n+ found = true;\n+ break inner;\n+ }\n+ }\n }\n- }\n- }\n if (!found) {\n // the physical column that backed this field no longer exists in the model.\n // therefore, we must invalidate it's logical column\n@@ -552,12 +574,12 @@ public void setSchemaName( String schemaName ) {\n this.schemaName = schemaName;\n }\n \n- public void setAvailableFields(AvailableFieldCollection fields){\n- this.availableFields = fields;\n- firePropertyChange(\"availableFields\", null, getAvailableFields()); //$NON-NLS-1$\n-\n+ public void setAvailableTables(AvailableItemCollection tables){\n+ this.availableTables = tables;\n+ firePropertyChange(\"availableTables\", null, getAvailableTables()); //$NON-NLS-1$\n }\n \n+\n public void setDomain( Domain d ) {\n setDomain(d, true);\n }\n@@ -570,7 +592,7 @@ protected void setDomain(Domain d, boolean upConvertDesired) {\n this.model.getDimensions().clear();\n this.model.getMeasures().clear();\n this.relationalModel.getCategories().clear();\n- this.availableFields.clear();\n+ this.availableTables.clear();\n \n // remove all logical columns from existing logical tables\n for (LogicalTable table : d.getLogicalModels().get(0).getLogicalTables()) {\n@@ -581,15 +603,10 @@ protected void setDomain(Domain d, boolean upConvertDesired) {\n if (upConvertDesired) needsUpConverted = upConvertLegacyModel();\n \n for (IPhysicalTable table : domain.getPhysicalModels().get(0).getPhysicalTables()) {\n- for (IPhysicalColumn column : table.getPhysicalColumns()) {\n- AvailableField field = new AvailableField(column);\n- availableFields.add(field);\n- }\n+ availableTables.add(new AvailableTable(table));\n }\n \n- workspaceHelper.sortFields(availableFields);\n-\n- firePropertyChange(\"availableFields\", null, getAvailableFields()); //$NON-NLS-1$\n+ firePropertyChange(\"availableTables\", null, getAvailableTables()); //$NON-NLS-1$\n \n LogicalModel lModel = domain.getLogicalModels().get(0);\n \n@@ -697,18 +714,19 @@ private void upConvertMeasuresAndDimensions() {\n for (DimensionMetaData dim : getModel().getDimensions()) {\n for (HierarchyMetaData hier : dim) {\n for (LevelMetaData level : hier) {\n- String olapColumnId = BaseModelerWorkspaceHelper.getCorrespondingOlapColumnId(level.getLogicalColumn());\n- LogicalColumn olapCol = model.findLogicalColumn(olapColumnId);\n- level.setLogicalColumn(olapCol);\n+ // create new logical columns\n+ AvailableField field = new AvailableField(level.getLogicalColumn().getPhysicalColumn());\n+ ColumnBackedNode node = createColumnBackedNode(field, ModelerPerspective.ANALYSIS);\n+ level.setLogicalColumn(node.getLogicalColumn());\n }\n }\n }\n \n // set the measure logical column references to the new olap columns\n for (MeasureMetaData measure : getModel().getMeasures()) {\n- String olapColumnId = BaseModelerWorkspaceHelper.getCorrespondingOlapColumnId(measure.getLogicalColumn());\n- LogicalColumn olapCol = model.findLogicalColumn(olapColumnId);\n- measure.setLogicalColumn(olapCol);\n+ AvailableField field = new AvailableField(measure.getLogicalColumn().getPhysicalColumn());\n+ ColumnBackedNode node = createColumnBackedNode(field, ModelerPerspective.ANALYSIS);\n+ measure.setLogicalColumn(node.getLogicalColumn());\n }\n \n return;\n@@ -761,7 +779,7 @@ public void setModelIsChanging( boolean changing ) {\n public void setModelIsChanging( boolean changing, boolean fireChanged ) {\n this.modelIsChanging = changing;\n if (!changing && fireChanged) {\n- fireFieldsChanged();\n+ fireTablesChanged();\n model.validateTree();\n isValid();\n fireModelChanged();\n@@ -776,7 +794,7 @@ public void setRelationalModelIsChanging( boolean changing ) {\n public void setRelationalModelIsChanging( boolean changing, boolean fireChanged ) {\n this.modelIsChanging = changing;\n if (!changing && fireChanged) {\n- fireFieldsChanged();\n+ fireTablesChanged();\n relationalModel.validateTree();\n isValid();\n fireRelationalModelChanged();", "raw_url": "https://github.com/pentaho/modeler/raw/e8949857917389cb594a4fcbd8ede077af7f24e7/src%2Forg%2Fpentaho%2Fagilebi%2Fmodeler%2FModelerWorkspace.java", "sha": "32edcfe9ad798d149b5c5fc8845d11d3b94e430f", "status": "modified" }, { "additions": 0, "blob_url": "https://github.com/pentaho/modeler/blob/e8949857917389cb594a4fcbd8ede077af7f24e7/src%2Forg%2Fpentaho%2Fagilebi%2Fmodeler%2Fgwt%2Fservices%2FIGwtModelerService.java", "changes": 7, "contents_url": "https://api.github.com/repos/pentaho/modeler/contents/src%2Forg%2Fpentaho%2Fagilebi%2Fmodeler%2Fgwt%2Fservices%2FIGwtModelerService.java?ref=e8949857917389cb594a4fcbd8ede077af7f24e7", "deletions": 7, "filename": "src/org/pentaho/agilebi/modeler/gwt/services/IGwtModelerService.java", "new_code": "", "new_methods": [], "old_code": "import com.google.gwt.user.client.rpc.AsyncCallback;\nimport org.pentaho.agilebi.modeler.ModelerWorkspace;\nimport org.pentaho.agilebi.modeler.gwt.BogoPojo;\nimport org.pentaho.agilebi.modeler.nodes.AvailableFieldCollection;\nimport org.pentaho.agilebi.modeler.nodes.MainModelNode;\nimport org.pentaho.metadata.model.Domain;\nimport org.pentaho.ui.xul.XulServiceCallback;", "old_methods": [], "patch": "@@ -1,14 +1,7 @@\n package org.pentaho.agilebi.modeler.gwt.services;\n \n-import com.google.gwt.user.client.rpc.AsyncCallback;\n import com.google.gwt.user.client.rpc.RemoteService;\n-import org.pentaho.agilebi.modeler.ModelerWorkspace;\n-import org.pentaho.agilebi.modeler.gwt.BogoPojo;\n-import org.pentaho.agilebi.modeler.nodes.AvailableFieldCollection;\n-import org.pentaho.agilebi.modeler.nodes.MainModelNode;\n import org.pentaho.agilebi.modeler.services.IModelerService;\n-import org.pentaho.metadata.model.Domain;\n-import org.pentaho.ui.xul.XulServiceCallback;\n \n /**\n * User: nbaker", "raw_url": "https://github.com/pentaho/modeler/raw/e8949857917389cb594a4fcbd8ede077af7f24e7/src%2Forg%2Fpentaho%2Fagilebi%2Fmodeler%2Fgwt%2Fservices%2FIGwtModelerService.java", "sha": "22dfedd96bbf6e440f5aaae263bc13736b970508", "status": "modified" }, { "additions": 0, "blob_url": "https://github.com/pentaho/modeler/blob/e8949857917389cb594a4fcbd8ede077af7f24e7/src%2Forg%2Fpentaho%2Fagilebi%2Fmodeler%2Fgwt%2Fservices%2FIGwtModelerServiceAsync.java", "changes": 3, "contents_url": "https://api.github.com/repos/pentaho/modeler/contents/src%2Forg%2Fpentaho%2Fagilebi%2Fmodeler%2Fgwt%2Fservices%2FIGwtModelerServiceAsync.java?ref=e8949857917389cb594a4fcbd8ede077af7f24e7", "deletions": 3, "filename": "src/org/pentaho/agilebi/modeler/gwt/services/IGwtModelerServiceAsync.java", "new_code": "", "new_methods": [], "old_code": "import org.pentaho.agilebi.modeler.ModelerWorkspace;\nimport org.pentaho.agilebi.modeler.nodes.AvailableFieldCollection;\nimport org.pentaho.agilebi.modeler.nodes.MainModelNode;", "old_methods": [], "patch": "@@ -1,10 +1,7 @@\n package org.pentaho.agilebi.modeler.gwt.services;\n \n import com.google.gwt.user.client.rpc.AsyncCallback;\n-import org.pentaho.agilebi.modeler.ModelerWorkspace;\n import org.pentaho.agilebi.modeler.gwt.BogoPojo;\n-import org.pentaho.agilebi.modeler.nodes.AvailableFieldCollection;\n-import org.pentaho.agilebi.modeler.nodes.MainModelNode;\n import org.pentaho.metadata.model.Domain;\n \n /**", "raw_url": "https://github.com/pentaho/modeler/raw/e8949857917389cb594a4fcbd8ede077af7f24e7/src%2Forg%2Fpentaho%2Fagilebi%2Fmodeler%2Fgwt%2Fservices%2FIGwtModelerServiceAsync.java", "sha": "47e411cf8ba8a8bf4259e4d33593d28d63b943ea", "status": "modified" }, { "additions": 7, "blob_url": "https://github.com/pentaho/modeler/blob/e8949857917389cb594a4fcbd8ede077af7f24e7/src%2Forg%2Fpentaho%2Fagilebi%2Fmodeler%2Fnodes%2FAvailableField.java", "changes": 37, "contents_url": "https://api.github.com/repos/pentaho/modeler/contents/src%2Forg%2Fpentaho%2Fagilebi%2Fmodeler%2Fnodes%2FAvailableField.java?ref=e8949857917389cb594a4fcbd8ede077af7f24e7", "deletions": 30, "filename": "src/org/pentaho/agilebi/modeler/nodes/AvailableField.java", "new_code": "public class AvailableField extends AbstractAvailableItem implements Serializable, IAvailableItem {\n\n private static final String FIELD_IMAGE = \"\";\n setImage(FIELD_IMAGE);\n setImage(FIELD_IMAGE);\n return getName();\n", "new_methods": [], "old_code": "import org.pentaho.ui.xul.stereotype.Bindable;\npublic class AvailableField implements Serializable {\n private String name, displayName;\n \n\n setDisplayName(physicalColumn.getName(LocalizedString.DEFAULT_LOCALE));\n }\n\n @Bindable\n public String getName() {\n return name;\n }\n\n @Bindable\n public void setName(String name) {\n this.name = name;\n @Bindable\n public String getDisplayName() {\n return displayName;\n }\n\n @Bindable\n public void setDisplayName(String displayName) {\n this.displayName = displayName;\n }\n\n\n\n return name;\n ", "old_methods": [ { "arguments": [], "filename": "src/org/pentaho/agilebi/modeler/nodes/AvailableField.java", "implementation": "return name;", "signature": "String getName()" }, { "arguments": [ "String name" ], "filename": "src/org/pentaho/agilebi/modeler/nodes/AvailableField.java", "implementation": "this.name = name;\n @Bindable\n public String getDisplayName() {\n return displayName;", "signature": "void setName(String name)" }, { "arguments": [ "String displayName" ], "filename": "src/org/pentaho/agilebi/modeler/nodes/AvailableField.java", "implementation": "this.displayName = displayName;", "signature": "void setDisplayName(String displayName)" } ], "patch": "@@ -19,54 +19,31 @@\n import org.pentaho.metadata.model.IPhysicalColumn;\n import org.pentaho.metadata.model.IPhysicalTable;\n import org.pentaho.metadata.model.concept.types.LocalizedString;\n-import org.pentaho.ui.xul.stereotype.Bindable;\n \n import java.io.Serializable;\n \n-public class AvailableField implements Serializable {\n+public class AvailableField extends AbstractAvailableItem implements Serializable, IAvailableItem {\n \n private static final long serialVersionUID = -4430951279551589688L;\n \n private transient IPhysicalColumn physicalColumn;\n- private String name, displayName;\n+\n+ private static final String FIELD_IMAGE = \"\";\n \n public static String MEASURE_PROP = \"potential_measure\";\n \n public AvailableField(){\n- \n+ setImage(FIELD_IMAGE);\n }\n \n-\n public AvailableField(IPhysicalColumn physicalColumn) {\n setPhysicalColumn(physicalColumn);\n setName(physicalColumn.getName(LocalizedString.DEFAULT_LOCALE));\n- setDisplayName(physicalColumn.getName(LocalizedString.DEFAULT_LOCALE));\n- }\n-\n- @Bindable\n- public String getName() {\n- return name;\n- }\n-\n- @Bindable\n- public void setName(String name) {\n- this.name = name;\n+ setImage(FIELD_IMAGE);\n }\n \n- @Bindable\n- public String getDisplayName() {\n- return displayName;\n- }\n-\n- @Bindable\n- public void setDisplayName(String displayName) {\n- this.displayName = displayName;\n- }\n-\n-\n-\n public String toString() {\n- return name;\n+ return getName();\n }\n \n public IPhysicalColumn getPhysicalColumn() {\n@@ -93,5 +70,5 @@ public boolean isPossibleMeasure(){\n public void setPossibleMeasure(boolean possibleMeasure){\n getPhysicalColumn().setProperty(MEASURE_PROP, \"\"+possibleMeasure);\n }\n- \n+\n }", "raw_url": "https://github.com/pentaho/modeler/raw/e8949857917389cb594a4fcbd8ede077af7f24e7/src%2Forg%2Fpentaho%2Fagilebi%2Fmodeler%2Fnodes%2FAvailableField.java", "sha": "6f4c2ecf117a709a32ecf18d7b1f4dece912d902", "status": "modified" }, { "additions": 18, "blob_url": "https://github.com/pentaho/modeler/blob/e8949857917389cb594a4fcbd8ede077af7f24e7/src%2Forg%2Fpentaho%2Fagilebi%2Fmodeler%2Fres%2Fpanel.xul", "changes": 29, "contents_url": "https://api.github.com/repos/pentaho/modeler/contents/src%2Forg%2Fpentaho%2Fagilebi%2Fmodeler%2Fres%2Fpanel.xul?ref=e8949857917389cb594a4fcbd8ede077af7f24e7", "deletions": 11, "filename": "src/org/pentaho/agilebi/modeler/res/panel.xul", "new_code": " <tree id=\"fieldList\" flex=\"1\" editable=\"false\" hiddenrootnode=\"true\" preserveselection=\"true\">\n <treecols>\n <treecol flex=\"1\" label=\"\" primary=\"true\"\n pen:binding=\"name\" pen:childrenbinding=\"children\"\n pen:imagebinding=\"image\" editable=\"false\"\n pen:expandedbinding=\"expanded\"/>\n </treecols>\n <treechildren>\n <treeitem container=\"true\" open=\"true\">\n <treerow>\n <treecell label=\"\" />\n </treerow>\n <treechildren></treechildren>\n </treeitem>\n </treechildren>\n\n </tree>\n </editpanel>", "new_methods": [], "old_code": " <listbox id=\"fieldList\" flex=\"1\" seltype=\"multi\"\n pen:binding=\"name\" ondrag=\"modeler.onFieldListDrag()\"\n pen:drageffect=\"copy\">\n <listitem label=\"field\" />\n <listitem label=\"field\" />\n <listitem label=\"field\" />\n <listitem label=\"field\" />\n <listitem label=\"field\" />\n <listitem label=\"field\" />\n </listbox>\n </editpanel>", "old_methods": [], "patch": "@@ -41,18 +41,25 @@\n <toolbarbutton id=\"addField\" image=\"images/insert_to_model.png\" onclick=\"modeler.addField()\" tooltiptext=\"${add}\"/>\n </toolbar>\n \n- <listbox id=\"fieldList\" flex=\"1\" seltype=\"multi\"\n- pen:binding=\"name\" ondrag=\"modeler.onFieldListDrag()\"\n- pen:drageffect=\"copy\">\n- <listitem label=\"field\" />\n- <listitem label=\"field\" />\n- <listitem label=\"field\" />\n- <listitem label=\"field\" />\n- <listitem label=\"field\" />\n- <listitem label=\"field\" />\n- </listbox>\n- </editpanel>\n+ <tree id=\"fieldList\" flex=\"1\" editable=\"false\" hiddenrootnode=\"true\" preserveselection=\"true\">\n+ <treecols>\n+ <treecol flex=\"1\" label=\"\" primary=\"true\"\n+ pen:binding=\"name\" pen:childrenbinding=\"children\"\n+ pen:imagebinding=\"image\" editable=\"false\"\n+ pen:expandedbinding=\"expanded\"/>\n+ </treecols>\n+ <treechildren>\n+ <treeitem container=\"true\" open=\"true\">\n+ <treerow>\n+ <treecell label=\"\" />\n+ </treerow>\n+ <treechildren></treechildren>\n+ </treeitem>\n+ </treechildren>\n+\n+ </tree>\n \n+ </editpanel>\n <deck id=\"modelDeck\" flex=\"1\">\n \n <tabbox id=\"modelTabbox\" flex=\"1\" >", "raw_url": "https://github.com/pentaho/modeler/raw/e8949857917389cb594a4fcbd8ede077af7f24e7/src%2Forg%2Fpentaho%2Fagilebi%2Fmodeler%2Fres%2Fpanel.xul", "sha": "1392e0bacc8a1a4b5f3f8054537fa039b134ef8c", "status": "modified" }, { "additions": 0, "blob_url": "https://github.com/pentaho/modeler/blob/e8949857917389cb594a4fcbd8ede077af7f24e7/src%2Forg%2Fpentaho%2Fagilebi%2Fmodeler%2Fservices%2FIModelerService.java", "changes": 7, "contents_url": "https://api.github.com/repos/pentaho/modeler/contents/src%2Forg%2Fpentaho%2Fagilebi%2Fmodeler%2Fservices%2FIModelerService.java?ref=e8949857917389cb594a4fcbd8ede077af7f24e7", "deletions": 7, "filename": "src/org/pentaho/agilebi/modeler/services/IModelerService.java", "new_code": "", "new_methods": [], "old_code": "import org.pentaho.agilebi.modeler.ModelerWorkspace;\nimport org.pentaho.agilebi.modeler.nodes.AvailableField;\nimport org.pentaho.agilebi.modeler.nodes.AvailableFieldCollection;\nimport org.pentaho.agilebi.modeler.nodes.MainModelNode;\nimport org.pentaho.ui.xul.XulServiceCallback;\n\nimport java.util.List;", "old_methods": [], "patch": "@@ -1,14 +1,7 @@\n package org.pentaho.agilebi.modeler.services;\n \n-import org.pentaho.agilebi.modeler.ModelerWorkspace;\n import org.pentaho.agilebi.modeler.gwt.BogoPojo;\n-import org.pentaho.agilebi.modeler.nodes.AvailableField;\n-import org.pentaho.agilebi.modeler.nodes.AvailableFieldCollection;\n-import org.pentaho.agilebi.modeler.nodes.MainModelNode;\n import org.pentaho.metadata.model.Domain;\n-import org.pentaho.ui.xul.XulServiceCallback;\n-\n-import java.util.List;\n \n /**\n * User: nbaker", "raw_url": "https://github.com/pentaho/modeler/raw/e8949857917389cb594a4fcbd8ede077af7f24e7/src%2Forg%2Fpentaho%2Fagilebi%2Fmodeler%2Fservices%2FIModelerService.java", "sha": "60e5d5cdbcbac15a8d545ac175dae521afe03af6", "status": "modified" }, { "additions": 0, "blob_url": "https://github.com/pentaho/modeler/blob/e8949857917389cb594a4fcbd8ede077af7f24e7/src%2Forg%2Fpentaho%2Fagilebi%2Fmodeler%2Fservices%2FIModelerServiceAsync.java", "changes": 3, "contents_url": "https://api.github.com/repos/pentaho/modeler/contents/src%2Forg%2Fpentaho%2Fagilebi%2Fmodeler%2Fservices%2FIModelerServiceAsync.java?ref=e8949857917389cb594a4fcbd8ede077af7f24e7", "deletions": 3, "filename": "src/org/pentaho/agilebi/modeler/services/IModelerServiceAsync.java", "new_code": "", "new_methods": [], "old_code": "import org.pentaho.agilebi.modeler.ModelerWorkspace;\nimport org.pentaho.agilebi.modeler.nodes.AvailableFieldCollection;\nimport org.pentaho.agilebi.modeler.nodes.MainModelNode;", "old_methods": [], "patch": "@@ -1,8 +1,5 @@\n package org.pentaho.agilebi.modeler.services;\n \n-import org.pentaho.agilebi.modeler.ModelerWorkspace;\n-import org.pentaho.agilebi.modeler.nodes.AvailableFieldCollection;\n-import org.pentaho.agilebi.modeler.nodes.MainModelNode;\n import org.pentaho.agilebi.modeler.gwt.BogoPojo;\n import org.pentaho.metadata.model.Domain;\n import org.pentaho.ui.xul.XulServiceCallback;", "raw_url": "https://github.com/pentaho/modeler/raw/e8949857917389cb594a4fcbd8ede077af7f24e7/src%2Forg%2Fpentaho%2Fagilebi%2Fmodeler%2Fservices%2FIModelerServiceAsync.java", "sha": "dd051353834ea4369b5d27991a03ec47a6003707", "status": "modified" }, { "additions": 9, "blob_url": "https://github.com/pentaho/modeler/blob/e8949857917389cb594a4fcbd8ede077af7f24e7/test-src%2Forg%2Fpentaho%2Fagilebi%2Fmodeler%2FAvailableColumnsTest.java", "changes": 15, "contents_url": "https://api.github.com/repos/pentaho/modeler/contents/test-src%2Forg%2Fpentaho%2Fagilebi%2Fmodeler%2FAvailableColumnsTest.java?ref=e8949857917389cb594a4fcbd8ede077af7f24e7", "deletions": 6, "filename": "test-src/org/pentaho/agilebi/modeler/AvailableColumnsTest.java", "new_code": "import org.pentaho.agilebi.modeler.nodes.AvailableTable;\nimport java.util.List;\n\nimport static org.junit.Assert.*;\n\n List<AvailableTable> tablesList = workspace.getAvailableTables().getAsAvailableTablesList();\n int fields = tablesList.get(0).getAvailableFields().size();\n AvailableField field1 = tablesList.get(0).getAvailableFields().get(0);\n AvailableField field2 = tablesList.get(0).getAvailableFields().get(1);", "new_methods": [], "old_code": "import org.junit.Before;\nimport static org.junit.Assert.*;\n\n int fields = workspace.getAvailableFields().size();\n AvailableField field1 = workspace.getAvailableFields().get(0);\n AvailableField field2 = workspace.getAvailableFields().get(1);", "old_methods": [], "patch": "@@ -1,12 +1,14 @@\n package org.pentaho.agilebi.modeler;\n \n-import org.junit.Before;\n import org.junit.Test;\n-import static org.junit.Assert.*;\n-\n import org.pentaho.agilebi.modeler.nodes.AvailableField;\n+import org.pentaho.agilebi.modeler.nodes.AvailableTable;\n import org.pentaho.metadata.model.LogicalModel;\n \n+import java.util.List;\n+\n+import static org.junit.Assert.*;\n+\n /**\n * User: nbaker\n * Date: 4/8/11\n@@ -17,14 +19,15 @@ public class AvailableColumnsTest extends AbstractModelerTest{\n public void testAvailableColumnPossibleMeasure() throws ModelerException {\n super.generateTestDomain();\n LogicalModel logicalModel = workspace.getDomain().getLogicalModels().get(0);\n- int fields = workspace.getAvailableFields().size();\n+ List<AvailableTable> tablesList = workspace.getAvailableTables().getAsAvailableTablesList();\n+ int fields = tablesList.get(0).getAvailableFields().size();\n assertTrue(fields > 2);\n \n // replicating work that would be done by the auto-modeler\n- AvailableField field1 = workspace.getAvailableFields().get(0);\n+ AvailableField field1 = tablesList.get(0).getAvailableFields().get(0);\n field1.setPossibleMeasure(true);\n \n- AvailableField field2 = workspace.getAvailableFields().get(1);\n+ AvailableField field2 = tablesList.get(0).getAvailableFields().get(1);\n field2.setPossibleMeasure(false);\n \n assertTrue(field1.isPossibleMeasure());", "raw_url": "https://github.com/pentaho/modeler/raw/e8949857917389cb594a4fcbd8ede077af7f24e7/test-src%2Forg%2Fpentaho%2Fagilebi%2Fmodeler%2FAvailableColumnsTest.java", "sha": "2858ac4c60cdeaf2034d9068702d73e5bbc2dfb1", "status": "modified" }, { "additions": 11, "blob_url": "https://github.com/pentaho/modeler/blob/e8949857917389cb594a4fcbd8ede077af7f24e7/test-src%2Forg%2Fpentaho%2Fagilebi%2Fmodeler%2FBaseModelerWorkspaceHelperTest.java", "changes": 50, "contents_url": "https://api.github.com/repos/pentaho/modeler/contents/test-src%2Forg%2Fpentaho%2Fagilebi%2Fmodeler%2FBaseModelerWorkspaceHelperTest.java?ref=e8949857917389cb594a4fcbd8ede077af7f24e7", "deletions": 39, "filename": "test-src/org/pentaho/agilebi/modeler/BaseModelerWorkspaceHelperTest.java", "new_code": "import org.pentaho.agilebi.modeler.nodes.*;\n List<AvailableTable> tablesList = workspace.getAvailableTables().getAsAvailableTablesList();\n\n int fields = tablesList.get(0).getAvailableFields().size();\n assertEquals(fields, tablesList.get(0).getAvailableFields().size());\n assertEquals(tablesList.get(0).getAvailableFields().size(), categories.get(0).getLogicalColumns().size());\n List<AvailableTable> tablesList = workspace.getAvailableTables().getAsAvailableTablesList();\n\n assertEquals(tablesList.get(0).getAvailableFields().size(), categories.get(0).getLogicalColumns().size());\n List<AvailableTable> tablesList = workspace.getAvailableTables().getAsAvailableTablesList();\n for (AvailableField af : tablesList.get(0).getAvailableFields()) {", "new_methods": [], "old_code": "import org.junit.Before;\nimport org.junit.BeforeClass;\nimport org.pentaho.agilebi.modeler.nodes.AvailableField;\nimport org.pentaho.agilebi.modeler.nodes.CategoryMetaData;\nimport org.pentaho.agilebi.modeler.nodes.FieldMetaData;\nimport org.pentaho.agilebi.modeler.nodes.RelationalModelNode;\nimport org.pentaho.agilebi.modeler.util.ModelerSourceUtil;\nimport org.pentaho.agilebi.modeler.util.SpoonModelerMessages;\nimport org.pentaho.di.core.KettleEnvironment;\nimport org.pentaho.di.core.Props;\nimport org.pentaho.di.core.database.DatabaseMeta;\nimport org.pentaho.di.core.exception.KettleException;\n int fields = workspace.getAvailableFields().size();\n assertEquals(fields, workspace.getAvailableFields().size());\n assertEquals(workspace.getAvailableFields().size(), categories.get(0).getLogicalColumns().size());\n assertEquals(workspace.getAvailableFields().size(), categories.get(0).getLogicalColumns().size());\n for (AvailableField af : workspace.getAvailableFields()) {\n @Test\n public void testGetCorrespondingOlapColumnId() {\n String origTableId = \"BT_CUSTOMERS_CUSTOMERS\";\n String origColumnId = \"LC_CUSTOMERS_CUSTOMERNUMBER\";\n String olapColumnId = \"LC_CUSTOMERS_CUSTOMERS_OLAP_CUSTOMERNUMBER\";\n\n LogicalTable ltOrig = new LogicalTable();\n ltOrig.setId(origTableId);\n\n LogicalColumn lcOrig = new LogicalColumn();\n lcOrig.setId(origColumnId);\n lcOrig.setLogicalTable(ltOrig);\n IPhysicalColumn pc = new SqlPhysicalColumn();\n pc.setId(\"CUSTOMERNUMBER\");\n lcOrig.setPhysicalColumn(pc);\n\n assertEquals(olapColumnId, BaseModelerWorkspaceHelper.getCorrespondingOlapColumnId(lcOrig));\n\n }\n\n\n", "old_methods": [ { "arguments": [], "filename": "test-src/org/pentaho/agilebi/modeler/BaseModelerWorkspaceHelperTest.java", "implementation": "String origTableId = \"BT_CUSTOMERS_CUSTOMERS\";\n String origColumnId = \"LC_CUSTOMERS_CUSTOMERNUMBER\";\n String olapColumnId = \"LC_CUSTOMERS_CUSTOMERS_OLAP_CUSTOMERNUMBER\";\n\n LogicalTable ltOrig = new LogicalTable();\n ltOrig.setId(origTableId);\n\n LogicalColumn lcOrig = new LogicalColumn();\n lcOrig.setId(origColumnId);\n lcOrig.setLogicalTable(ltOrig);\n IPhysicalColumn pc = new SqlPhysicalColumn();\n pc.setId(\"CUSTOMERNUMBER\");\n lcOrig.setPhysicalColumn(pc);\n\n assertEquals(olapColumnId, BaseModelerWorkspaceHelper.getCorrespondingOlapColumnId(lcOrig));", "signature": "void testGetCorrespondingOlapColumnId()" } ], "patch": "@@ -1,19 +1,8 @@\n package org.pentaho.agilebi.modeler;\n \n-import org.junit.Before;\n-import org.junit.BeforeClass;\n import org.junit.Test;\n-import org.pentaho.agilebi.modeler.nodes.AvailableField;\n-import org.pentaho.agilebi.modeler.nodes.CategoryMetaData;\n-import org.pentaho.agilebi.modeler.nodes.FieldMetaData;\n-import org.pentaho.agilebi.modeler.nodes.RelationalModelNode;\n-import org.pentaho.agilebi.modeler.util.ModelerSourceUtil;\n+import org.pentaho.agilebi.modeler.nodes.*;\n import org.pentaho.agilebi.modeler.util.ModelerWorkspaceHelper;\n-import org.pentaho.agilebi.modeler.util.SpoonModelerMessages;\n-import org.pentaho.di.core.KettleEnvironment;\n-import org.pentaho.di.core.Props;\n-import org.pentaho.di.core.database.DatabaseMeta;\n-import org.pentaho.di.core.exception.KettleException;\n import org.pentaho.metadata.model.*;\n import org.pentaho.metadata.model.concept.types.AggregationType;\n import org.pentaho.metadata.model.concept.types.DataType;\n@@ -78,17 +67,19 @@ public void testFieldAggregations() throws ModelerException{\n public void testPopulateCategories() throws ModelerException {\n ModelerWorkspaceHelper helper = new ModelerWorkspaceHelper(LOCALE);\n LogicalModel logicalModel = workspace.getDomain().getLogicalModels().get(0);\n- int fields = workspace.getAvailableFields().size();\n+ List<AvailableTable> tablesList = workspace.getAvailableTables().getAsAvailableTablesList();\n+\n+ int fields = tablesList.get(0).getAvailableFields().size();\n helper.autoModelFlat(workspace);\n helper.autoModelRelationalFlat(workspace);\n helper.populateCategories(workspace);\n \n List<Category> categories = logicalModel.getCategories();\n \n assertEquals(1, categories.size());\n- assertEquals(fields, workspace.getAvailableFields().size());\n+ assertEquals(fields, tablesList.get(0).getAvailableFields().size());\n System.out.println(logicalModel.getLogicalTables().get(0).getLogicalColumns().size());\n- assertEquals(workspace.getAvailableFields().size(), categories.get(0).getLogicalColumns().size());\n+ assertEquals(tablesList.get(0).getAvailableFields().size(), categories.get(0).getLogicalColumns().size());\n \n for (LogicalColumn lCol : categories.get(0).getLogicalColumns()) {\n FieldMetaData orig = null;\n@@ -121,9 +112,11 @@ public void testPopulateCategories_MultipleCategoriesAggregationTypesAndFormatMa\n spiceUpRelationalModel(workspace.getRelationalModel());\n helper.populateCategories(workspace);\n \n+ List<AvailableTable> tablesList = workspace.getAvailableTables().getAsAvailableTablesList();\n+\n List<Category> categories = logicalModel.getCategories();\n assertEquals(2, categories.size());\n- assertEquals(workspace.getAvailableFields().size(), categories.get(0).getLogicalColumns().size());\n+ assertEquals(tablesList.get(0).getAvailableFields().size(), categories.get(0).getLogicalColumns().size());\n System.out.println(logicalModel.getLogicalTables().get(0).getLogicalColumns().size());\n \n assertEquals(1, categories.get(1).getLogicalColumns().size());\n@@ -159,10 +152,11 @@ private void spiceUpRelationalModel(RelationalModelNode model) {\n \n private CategoryMetaData createCategoryMetaData(String name) {\n CategoryMetaData cat = new CategoryMetaData(name);\n+ List<AvailableTable> tablesList = workspace.getAvailableTables().getAsAvailableTablesList();\n \n FieldMetaData field = null;\n AvailableField avaialbleField = null;\n- for (AvailableField af : workspace.getAvailableFields()) {\n+ for (AvailableField af : tablesList.get(0).getAvailableFields()) {\n if (af.getPhysicalColumn().getDataType() == DataType.NUMERIC) {\n avaialbleField = af;\n break;\n@@ -176,26 +170,4 @@ private CategoryMetaData createCategoryMetaData(String name) {\n return cat;\n }\n \n- @Test\n- public void testGetCorrespondingOlapColumnId() {\n- String origTableId = \"BT_CUSTOMERS_CUSTOMERS\";\n- String origColumnId = \"LC_CUSTOMERS_CUSTOMERNUMBER\";\n- String olapColumnId = \"LC_CUSTOMERS_CUSTOMERS_OLAP_CUSTOMERNUMBER\";\n-\n- LogicalTable ltOrig = new LogicalTable();\n- ltOrig.setId(origTableId);\n-\n- LogicalColumn lcOrig = new LogicalColumn();\n- lcOrig.setId(origColumnId);\n- lcOrig.setLogicalTable(ltOrig);\n- IPhysicalColumn pc = new SqlPhysicalColumn();\n- pc.setId(\"CUSTOMERNUMBER\");\n- lcOrig.setPhysicalColumn(pc);\n-\n- assertEquals(olapColumnId, BaseModelerWorkspaceHelper.getCorrespondingOlapColumnId(lcOrig));\n-\n- }\n-\n-\n-\n }", "raw_url": "https://github.com/pentaho/modeler/raw/e8949857917389cb594a4fcbd8ede077af7f24e7/test-src%2Forg%2Fpentaho%2Fagilebi%2Fmodeler%2FBaseModelerWorkspaceHelperTest.java", "sha": "371ae06a5669ac12d41e348588f8b01948911c65", "status": "modified" }, { "additions": 4, "blob_url": "https://github.com/pentaho/modeler/blob/e8949857917389cb594a4fcbd8ede077af7f24e7/test-src%2Forg%2Fpentaho%2Fagilebi%2Fmodeler%2FModelerWorkspaceTest.java", "changes": 8, "contents_url": "https://api.github.com/repos/pentaho/modeler/contents/test-src%2Forg%2Fpentaho%2Fagilebi%2Fmodeler%2FModelerWorkspaceTest.java?ref=e8949857917389cb594a4fcbd8ede077af7f24e7", "deletions": 4, "filename": "test-src/org/pentaho/agilebi/modeler/ModelerWorkspaceTest.java", "new_code": " for (AvailableTable table : workspace.getAvailableTables().getAsAvailableTablesList()) {\n if (table.containsUnderlyingPhysicalColumn(lc.getPhysicalColumn())) {\n return true;\n }", "new_methods": [], "old_code": " for (AvailableField field : workspace.getAvailableFields()) {\n if (field.getPhysicalColumn().getId().equals(lc.getPhysicalColumn().getId())) {\n return true;\n }", "old_methods": [], "patch": "@@ -113,10 +113,10 @@ private boolean isReferencedTableReportingVersion(LogicalColumn logicalColumn) {\n }\n \n private boolean isColumnReferencedInAvailableFields(LogicalColumn lc) {\n- for (AvailableField field : workspace.getAvailableFields()) {\n- if (field.getPhysicalColumn().getId().equals(lc.getPhysicalColumn().getId())) {\n- return true;\n- }\n+ for (AvailableTable table : workspace.getAvailableTables().getAsAvailableTablesList()) {\n+ if (table.containsUnderlyingPhysicalColumn(lc.getPhysicalColumn())) {\n+ return true;\n+ }\n }\n return false;\n }", "raw_url": "https://github.com/pentaho/modeler/raw/e8949857917389cb594a4fcbd8ede077af7f24e7/test-src%2Forg%2Fpentaho%2Fagilebi%2Fmodeler%2FModelerWorkspaceTest.java", "sha": "32307bd573933efbb67d0a3a92d26d95cfc2c0a9", "status": "modified" }, { "additions": 0, "blob_url": "https://github.com/pentaho/modeler/blob/e8949857917389cb594a4fcbd8ede077af7f24e7/test-src%2Forg%2Fpentaho%2Fagilebi%2Fmodeler%2Futil%2FModelerSourceUtilTest.java", "changes": 25, "contents_url": "https://api.github.com/repos/pentaho/modeler/contents/test-src%2Forg%2Fpentaho%2Fagilebi%2Fmodeler%2Futil%2FModelerSourceUtilTest.java?ref=e8949857917389cb594a4fcbd8ede077af7f24e7", "deletions": 25, "filename": "test-src/org/pentaho/agilebi/modeler/util/ModelerSourceUtilTest.java", "new_code": "", "new_methods": [], "old_code": "import org.junit.BeforeClass;\nimport org.pentaho.agilebi.modeler.ModelerMessagesHolder;\nimport org.pentaho.di.core.KettleEnvironment;\nimport org.pentaho.di.core.Props;\nimport org.pentaho.di.core.exception.KettleException;\nimport org.pentaho.metadata.model.LogicalColumn;\nimport java.util.List;\n\n // make sure the column id's & names are not equal between the copies\n List<LogicalColumn> orig = logicalModel.getLogicalTables().get(0).getLogicalColumns();\n List<LogicalColumn> copy = logicalModel.getLogicalTables().get(1).getLogicalColumns();\n for(int i = 0; i < physicalColumns; i++) {\n assertCopiesAreKosher(orig.get(i), copy.get(i));\n }\n }\n\n private void assertCopiesAreKosher(LogicalColumn lc1, LogicalColumn lc2) {\n assertEquals(lc1.getPhysicalColumn(), lc2.getPhysicalColumn());\n\n String newColName = lc1.getLogicalTable().getId().replaceAll(\"BT\", \"LC\");\n newColName += \"_OLAP_\" + lc1.getPhysicalColumn().getId();\n \n assertEquals(newColName, lc2.getId());\n assertEquals(lc1.getAggregationType(), lc2.getAggregationType());\n assertEquals(lc1.getDataType(), lc2.getDataType());", "old_methods": [], "patch": "@@ -17,23 +17,15 @@\n \n package org.pentaho.agilebi.modeler.util;\n \n-import org.junit.BeforeClass;\n import org.junit.Test;\n import org.pentaho.agilebi.modeler.AbstractModelerTest;\n import org.pentaho.agilebi.modeler.BaseModelerWorkspaceHelper;\n import org.pentaho.agilebi.modeler.ModelerException;\n-import org.pentaho.agilebi.modeler.ModelerMessagesHolder;\n-import org.pentaho.di.core.KettleEnvironment;\n-import org.pentaho.di.core.Props;\n import org.pentaho.di.core.database.DatabaseMeta;\n-import org.pentaho.di.core.exception.KettleException;\n import org.pentaho.metadata.model.Domain;\n-import org.pentaho.metadata.model.LogicalColumn;\n import org.pentaho.metadata.model.LogicalModel;\n import org.pentaho.metadata.model.LogicalTable;\n \n-import java.util.List;\n-\n import static junit.framework.Assert.assertEquals;\n import static junit.framework.Assert.assertNotNull;\n \n@@ -114,23 +106,6 @@ public void testDuplicateLogicalTablesForDualModelingMode() throws ModelerExcept\n LogicalTable copyTable = logicalModel.getLogicalTables().get(1);\n assertEquals(origTable.getId() + \"_OLAP\", copyTable.getId());\n \n- // make sure the column id's & names are not equal between the copies\n- List<LogicalColumn> orig = logicalModel.getLogicalTables().get(0).getLogicalColumns();\n- List<LogicalColumn> copy = logicalModel.getLogicalTables().get(1).getLogicalColumns();\n- for(int i = 0; i < physicalColumns; i++) {\n- assertCopiesAreKosher(orig.get(i), copy.get(i));\n- }\n- }\n-\n- private void assertCopiesAreKosher(LogicalColumn lc1, LogicalColumn lc2) {\n- assertEquals(lc1.getPhysicalColumn(), lc2.getPhysicalColumn());\n-\n- String newColName = lc1.getLogicalTable().getId().replaceAll(\"BT\", \"LC\");\n- newColName += \"_OLAP_\" + lc1.getPhysicalColumn().getId();\n- \n- assertEquals(newColName, lc2.getId());\n- assertEquals(lc1.getAggregationType(), lc2.getAggregationType());\n- assertEquals(lc1.getDataType(), lc2.getDataType());\n }\n \n public static DatabaseMeta getDatabaseMeta() {", "raw_url": "https://github.com/pentaho/modeler/raw/e8949857917389cb594a4fcbd8ede077af7f24e7/test-src%2Forg%2Fpentaho%2Fagilebi%2Fmodeler%2Futil%2FModelerSourceUtilTest.java", "sha": "5cee45d03b0b809fd63874514de4df8d10f33de0", "status": "modified" }, { "additions": 6, "blob_url": "https://github.com/pentaho/modeler/blob/e8949857917389cb594a4fcbd8ede077af7f24e7/test-src%2Forg%2Fpentaho%2Fagilebi%2Fmodeler%2Futil%2FTableModelerSourceTest.java", "changes": 6, "contents_url": "https://api.github.com/repos/pentaho/modeler/contents/test-src%2Forg%2Fpentaho%2Fagilebi%2Fmodeler%2Futil%2FTableModelerSourceTest.java?ref=e8949857917389cb594a4fcbd8ede077af7f24e7", "deletions": 0, "filename": "test-src/org/pentaho/agilebi/modeler/util/TableModelerSourceTest.java", "new_code": "import org.junit.Test;\r\n\r\n @Test\r\n public void test() {\r\n // come back to this\r\n }\r", "new_methods": [ { "arguments": [], "filename": "test-src/org/pentaho/agilebi/modeler/util/TableModelerSourceTest.java", "implementation": "// come back to this", "signature": "void test()" } ], "old_code": "", "old_methods": [], "patch": "@@ -17,10 +17,16 @@\n \r\n package org.pentaho.agilebi.modeler.util;\r\n \r\n+import org.junit.Test;\r\n+\r\n /**\r\n * Created: 3/31/11\r\n *\r\n * @author rfellows\r\n */\r\n public class TableModelerSourceTest {\r\n+ @Test\r\n+ public void test() {\r\n+ // come back to this\r\n+ }\r\n }\r", "raw_url": "https://github.com/pentaho/modeler/raw/e8949857917389cb594a4fcbd8ede077af7f24e7/test-src%2Forg%2Fpentaho%2Fagilebi%2Fmodeler%2Futil%2FTableModelerSourceTest.java", "sha": "84e11d0c65372165268c58f685e8a7a7b280bee2", "status": "modified" } ]
16
[ { "name": "pentaho$modeler", "new_args": "", "new_implementation": "return availableTables;\n private void fireTablesChanged() {\n firePropertyChange(\"availableTables\", null, this.availableTables); //$NON-NLS-1$\n // Add in new physical tables/columns\n // see if the table is in the availableTables list\n AvailableTable aTable = availableTables.findAvailableTable(table.getName(LocalizedString.DEFAULT_LOCALE));\n if (aTable == null) {\n // new table, make sure we add it\n availableTables.add(new AvailableTable(table));", "new_return_type": "AvailableItemCollection", "new_signature": "AvailableItemCollection getAvailableTables()", "old_args": "", "old_implementation": "return availableFields;\n\n private void fireFieldsChanged() {\n firePropertyChange(\"availableFields\", null, this.availableFields); //$NON-NLS-1$\n // Add in new physical columns\n for(IPhysicalColumn column : table.getPhysicalColumns()) {\n boolean exists = false;\n inner:\n for(AvailableField field : this.availableFields) {\n if (field.isSameUnderlyingPhysicalColumn(column)) {\n exists = true;\n break inner;", "old_return_type": "AvailableFieldCollection", "old_signature": "AvailableFieldCollection getAvailableFields()" } ]
1
2
f0c4be4d6e9b0eacafd6ece453d8f8d18097a10f
[ { "name": "wocommunity$wonder", "new_args": "", "new_implementation": "return false;", "new_return_type": "boolean", "new_signature": "boolean synchronizesVariablesWithBindings()", "old_args": "", "old_implementation": "return false;", "old_return_type": "boolean", "old_signature": "boolean synchronizesBindingsWithVariables()" }, { "name": "wocommunity$wonder", "new_args": "", "new_implementation": "return false;", "new_return_type": "boolean", "new_signature": "boolean synchronizesVariablesWithBindings()", "old_args": "", "old_implementation": "return false;", "old_return_type": "boolean", "old_signature": "boolean synchronizesBindingsWithVariables()" }, { "name": "wocommunity$wonder", "new_args": "", "new_implementation": "return false;", "new_return_type": "boolean", "new_signature": "boolean synchronizesVariablesWithBindings()", "old_args": "", "old_implementation": "return false;", "old_return_type": "boolean", "old_signature": "boolean synchronizesBindingsWithVariables()" }, { "name": "wocommunity$wonder", "new_args": "", "new_implementation": "return false;", "new_return_type": "boolean", "new_signature": "boolean synchronizesVariablesWithBindings()", "old_args": "", "old_implementation": "return false;", "old_return_type": "boolean", "old_signature": "boolean synchronizesBindingsWithVariables()" }, { "name": "wocommunity$wonder", "new_args": "", "new_implementation": "return false;", "new_return_type": "boolean", "new_signature": "boolean synchronizesVariablesWithBindings()", "old_args": "", "old_implementation": "return false;", "old_return_type": "boolean", "old_signature": "boolean synchronizesBindingsWithVariables()" }, { "name": "wocommunity$wonder", "new_args": "", "new_implementation": "return false;", "new_return_type": "boolean", "new_signature": "boolean synchronizesVariablesWithBindings()", "old_args": "", "old_implementation": "return false;", "old_return_type": "boolean", "old_signature": "boolean synchronizesBindingsWithVariables()" }, { "name": "wocommunity$wonder", "new_args": "", "new_implementation": "return false;", "new_return_type": "boolean", "new_signature": "boolean synchronizesVariablesWithBindings()", "old_args": "", "old_implementation": "return false;", "old_return_type": "boolean", "old_signature": "boolean synchronizesBindingsWithVariables()" }, { "name": "wocommunity$wonder", "new_args": "", "new_implementation": "return false;", "new_return_type": "boolean", "new_signature": "boolean synchronizesVariablesWithBindings()", "old_args": "", "old_implementation": "return false;", "old_return_type": "boolean", "old_signature": "boolean synchronizesBindingsWithVariables()" } ]
[ { "additions": 1, "blob_url": "https://github.com/wocommunity/wonder/blob/f0c4be4d6e9b0eacafd6ece453d8f8d18097a10f/Common%2FFrameworks%2FERExtensions%2FSources%2Fer%2Fextensions%2FERXEqualConditional.java", "changes": 2, "contents_url": "https://api.github.com/repos/wocommunity/wonder/contents/Common%2FFrameworks%2FERExtensions%2FSources%2Fer%2Fextensions%2FERXEqualConditional.java?ref=f0c4be4d6e9b0eacafd6ece453d8f8d18097a10f", "deletions": 1, "filename": "Common/Frameworks/ERExtensions/Sources/er/extensions/ERXEqualConditional.java", "new_code": " public boolean synchronizesVariablesWithBindings() { return false; }", "new_methods": [ { "arguments": [], "filename": "Common/Frameworks/ERExtensions/Sources/er/extensions/ERXEqualConditional.java", "implementation": "return false;", "signature": "boolean synchronizesVariablesWithBindings()" } ], "old_code": " public boolean synchronizesBindingsWithVariables() { return false; }", "old_methods": [ { "arguments": [], "filename": "Common/Frameworks/ERExtensions/Sources/er/extensions/ERXEqualConditional.java", "implementation": "return false;", "signature": "boolean synchronizesBindingsWithVariables()" } ], "patch": "@@ -15,7 +15,7 @@ public ERXEqualConditional(WOContext aContext) {\n super(aContext);\n }\n \n- public boolean synchronizesBindingsWithVariables() { return false; }\n+ public boolean synchronizesVariablesWithBindings() { return false; }\n public boolean isStateless() { return true; }\n \n public boolean areEqual() {", "raw_url": "https://github.com/wocommunity/wonder/raw/f0c4be4d6e9b0eacafd6ece453d8f8d18097a10f/Common%2FFrameworks%2FERExtensions%2FSources%2Fer%2Fextensions%2FERXEqualConditional.java", "sha": "ec53306d7203620d4cf804670f9969d7d14292ca", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/wocommunity/wonder/blob/f0c4be4d6e9b0eacafd6ece453d8f8d18097a10f/Common%2FFrameworks%2FERExtensions%2FSources%2Fer%2Fextensions%2FERXHyperlinkKeyValueSetter.java", "changes": 2, "contents_url": "https://api.github.com/repos/wocommunity/wonder/contents/Common%2FFrameworks%2FERExtensions%2FSources%2Fer%2Fextensions%2FERXHyperlinkKeyValueSetter.java?ref=f0c4be4d6e9b0eacafd6ece453d8f8d18097a10f", "deletions": 1, "filename": "Common/Frameworks/ERExtensions/Sources/er/extensions/ERXHyperlinkKeyValueSetter.java", "new_code": " public boolean synchronizesVariablesWithBindings() { return false; }", "new_methods": [ { "arguments": [], "filename": "Common/Frameworks/ERExtensions/Sources/er/extensions/ERXHyperlinkKeyValueSetter.java", "implementation": "return false;", "signature": "boolean synchronizesVariablesWithBindings()" } ], "old_code": " public boolean synchronizesBindingsWithVariables() { return false; }", "old_methods": [ { "arguments": [], "filename": "Common/Frameworks/ERExtensions/Sources/er/extensions/ERXHyperlinkKeyValueSetter.java", "implementation": "return false;", "signature": "boolean synchronizesBindingsWithVariables()" } ], "patch": "@@ -15,7 +15,7 @@ public ERXHyperlinkKeyValueSetter(WOContext aContext) {\n super(aContext);\n }\n \n- public boolean synchronizesBindingsWithVariables() { return false; }\n+ public boolean synchronizesVariablesWithBindings() { return false; }\n public boolean isStateless() { return true; }\n \n public WOComponent action() {", "raw_url": "https://github.com/wocommunity/wonder/raw/f0c4be4d6e9b0eacafd6ece453d8f8d18097a10f/Common%2FFrameworks%2FERExtensions%2FSources%2Fer%2Fextensions%2FERXHyperlinkKeyValueSetter.java", "sha": "5da2023fd47c96fee4b78c4cb9105dbfb5ef6988", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/wocommunity/wonder/blob/f0c4be4d6e9b0eacafd6ece453d8f8d18097a10f/Common%2FFrameworks%2FERExtensions%2FSources%2Fer%2Fextensions%2FERXListContainsItemConditional.java", "changes": 2, "contents_url": "https://api.github.com/repos/wocommunity/wonder/contents/Common%2FFrameworks%2FERExtensions%2FSources%2Fer%2Fextensions%2FERXListContainsItemConditional.java?ref=f0c4be4d6e9b0eacafd6ece453d8f8d18097a10f", "deletions": 1, "filename": "Common/Frameworks/ERExtensions/Sources/er/extensions/ERXListContainsItemConditional.java", "new_code": " public boolean synchronizesVariablesWithBindings() { return false; }", "new_methods": [ { "arguments": [], "filename": "Common/Frameworks/ERExtensions/Sources/er/extensions/ERXListContainsItemConditional.java", "implementation": "return false;", "signature": "boolean synchronizesVariablesWithBindings()" } ], "old_code": " public boolean synchronizesBindingsWithVariables() { return false; }", "old_methods": [ { "arguments": [], "filename": "Common/Frameworks/ERExtensions/Sources/er/extensions/ERXListContainsItemConditional.java", "implementation": "return false;", "signature": "boolean synchronizesBindingsWithVariables()" } ], "patch": "@@ -16,7 +16,7 @@ public ERXListContainsItemConditional(WOContext aContext) {\n super(aContext);\n }\n \n- public boolean synchronizesBindingsWithVariables() { return false; }\n+ public boolean synchronizesVariablesWithBindings() { return false; }\n public boolean isStateless() { return true; }\n \n public boolean listContainsItem() {", "raw_url": "https://github.com/wocommunity/wonder/raw/f0c4be4d6e9b0eacafd6ece453d8f8d18097a10f/Common%2FFrameworks%2FERExtensions%2FSources%2Fer%2Fextensions%2FERXListContainsItemConditional.java", "sha": "c85dfb0dfb67740631a7e194b7bfa09a5f074fbb", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/wocommunity/wonder/blob/f0c4be4d6e9b0eacafd6ece453d8f8d18097a10f/Common%2FFrameworks%2FERExtensions%2FSources%2Fer%2Fextensions%2FERXListDisplay.java", "changes": 2, "contents_url": "https://api.github.com/repos/wocommunity/wonder/contents/Common%2FFrameworks%2FERExtensions%2FSources%2Fer%2Fextensions%2FERXListDisplay.java?ref=f0c4be4d6e9b0eacafd6ece453d8f8d18097a10f", "deletions": 1, "filename": "Common/Frameworks/ERExtensions/Sources/er/extensions/ERXListDisplay.java", "new_code": " public boolean synchronizesVariablesWithBindings() { return false; }", "new_methods": [ { "arguments": [], "filename": "Common/Frameworks/ERExtensions/Sources/er/extensions/ERXListDisplay.java", "implementation": "return false;", "signature": "boolean synchronizesVariablesWithBindings()" } ], "old_code": " public boolean synchronizesBindingsWithVariables() { return false; }", "old_methods": [ { "arguments": [], "filename": "Common/Frameworks/ERExtensions/Sources/er/extensions/ERXListDisplay.java", "implementation": "return false;", "signature": "boolean synchronizesBindingsWithVariables()" } ], "patch": "@@ -21,7 +21,7 @@ public ERXListDisplay(WOContext aContext) {\n /////////////////////////// log4j category ///////////////////////////\n public static final Category cat = Category.getInstance(ERXListDisplay.class);\n \n- public boolean synchronizesBindingsWithVariables() { return false; }\n+ public boolean synchronizesVariablesWithBindings() { return false; }\n public boolean isStateless() { return true; }\n \n public boolean escapeHTML() {", "raw_url": "https://github.com/wocommunity/wonder/raw/f0c4be4d6e9b0eacafd6ece453d8f8d18097a10f/Common%2FFrameworks%2FERExtensions%2FSources%2Fer%2Fextensions%2FERXListDisplay.java", "sha": "6e604fd4b530fba7102d0a017314009733c8163b", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/wocommunity/wonder/blob/f0c4be4d6e9b0eacafd6ece453d8f8d18097a10f/Common%2FFrameworks%2FERExtensions%2FSources%2Fer%2Fextensions%2FERXMandatoryFieldMarker.java", "changes": 2, "contents_url": "https://api.github.com/repos/wocommunity/wonder/contents/Common%2FFrameworks%2FERExtensions%2FSources%2Fer%2Fextensions%2FERXMandatoryFieldMarker.java?ref=f0c4be4d6e9b0eacafd6ece453d8f8d18097a10f", "deletions": 1, "filename": "Common/Frameworks/ERExtensions/Sources/er/extensions/ERXMandatoryFieldMarker.java", "new_code": " public boolean synchronizesVariablesWithBindings() { return false; }", "new_methods": [ { "arguments": [], "filename": "Common/Frameworks/ERExtensions/Sources/er/extensions/ERXMandatoryFieldMarker.java", "implementation": "return false;", "signature": "boolean synchronizesVariablesWithBindings()" } ], "old_code": " public boolean synchronizesBindingsWithVariables() { return false; }", "old_methods": [ { "arguments": [], "filename": "Common/Frameworks/ERExtensions/Sources/er/extensions/ERXMandatoryFieldMarker.java", "implementation": "return false;", "signature": "boolean synchronizesBindingsWithVariables()" } ], "patch": "@@ -15,6 +15,6 @@ public ERXMandatoryFieldMarker(WOContext aContext) {\n super(aContext);\n }\n \n- public boolean synchronizesBindingsWithVariables() { return false; }\n+ public boolean synchronizesVariablesWithBindings() { return false; }\n public boolean isStateless() { return true; }\n }", "raw_url": "https://github.com/wocommunity/wonder/raw/f0c4be4d6e9b0eacafd6ece453d8f8d18097a10f/Common%2FFrameworks%2FERExtensions%2FSources%2Fer%2Fextensions%2FERXMandatoryFieldMarker.java", "sha": "5fa94491fca120bc180b713c401a72f9adae378c", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/wocommunity/wonder/blob/f0c4be4d6e9b0eacafd6ece453d8f8d18097a10f/Common%2FFrameworks%2FERExtensions%2FSources%2Fer%2Fextensions%2FERXNonNullConditional.java", "changes": 2, "contents_url": "https://api.github.com/repos/wocommunity/wonder/contents/Common%2FFrameworks%2FERExtensions%2FSources%2Fer%2Fextensions%2FERXNonNullConditional.java?ref=f0c4be4d6e9b0eacafd6ece453d8f8d18097a10f", "deletions": 1, "filename": "Common/Frameworks/ERExtensions/Sources/er/extensions/ERXNonNullConditional.java", "new_code": " public boolean synchronizesVariablesWithBindings() { return false; }", "new_methods": [ { "arguments": [], "filename": "Common/Frameworks/ERExtensions/Sources/er/extensions/ERXNonNullConditional.java", "implementation": "return false;", "signature": "boolean synchronizesVariablesWithBindings()" } ], "old_code": " public boolean synchronizesBindingsWithVariables() { return false; }", "old_methods": [ { "arguments": [], "filename": "Common/Frameworks/ERExtensions/Sources/er/extensions/ERXNonNullConditional.java", "implementation": "return false;", "signature": "boolean synchronizesBindingsWithVariables()" } ], "patch": "@@ -15,7 +15,7 @@ public ERXNonNullConditional(WOContext aContext) {\n super(aContext);\n }\n \n- public boolean synchronizesBindingsWithVariables() { return false; }\n+ public boolean synchronizesVariablesWithBindings() { return false; }\n public boolean isStateless() { return true; }\n \n public boolean isNonNull() { return valueForBinding(\"condition\") != null; }", "raw_url": "https://github.com/wocommunity/wonder/raw/f0c4be4d6e9b0eacafd6ece453d8f8d18097a10f/Common%2FFrameworks%2FERExtensions%2FSources%2Fer%2Fextensions%2FERXNonNullConditional.java", "sha": "5f8f7bda2635e59eef8b16c74d78a2a8f2dff167", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/wocommunity/wonder/blob/f0c4be4d6e9b0eacafd6ece453d8f8d18097a10f/Common%2FFrameworks%2FERExtensions%2FSources%2Fer%2Fextensions%2FERXNonZeroConditional.java", "changes": 2, "contents_url": "https://api.github.com/repos/wocommunity/wonder/contents/Common%2FFrameworks%2FERExtensions%2FSources%2Fer%2Fextensions%2FERXNonZeroConditional.java?ref=f0c4be4d6e9b0eacafd6ece453d8f8d18097a10f", "deletions": 1, "filename": "Common/Frameworks/ERExtensions/Sources/er/extensions/ERXNonZeroConditional.java", "new_code": " public boolean synchronizesVariablesWithBindings() { return false; }", "new_methods": [ { "arguments": [], "filename": "Common/Frameworks/ERExtensions/Sources/er/extensions/ERXNonZeroConditional.java", "implementation": "return false;", "signature": "boolean synchronizesVariablesWithBindings()" } ], "old_code": " public boolean synchronizesBindingsWithVariables() { return false; }", "old_methods": [ { "arguments": [], "filename": "Common/Frameworks/ERExtensions/Sources/er/extensions/ERXNonZeroConditional.java", "implementation": "return false;", "signature": "boolean synchronizesBindingsWithVariables()" } ], "patch": "@@ -15,7 +15,7 @@ public ERXNonZeroConditional(WOContext aContext) {\n super(aContext);\n }\n \n- public boolean synchronizesBindingsWithVariables() { return false; }\n+ public boolean synchronizesVariablesWithBindings() { return false; }\n public boolean isStateless() { return true; }\n \n public boolean isNonZero() {", "raw_url": "https://github.com/wocommunity/wonder/raw/f0c4be4d6e9b0eacafd6ece453d8f8d18097a10f/Common%2FFrameworks%2FERExtensions%2FSources%2Fer%2Fextensions%2FERXNonZeroConditional.java", "sha": "17f7d5fd140e5d0aa024ee85bf8f6d7b36764978", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/wocommunity/wonder/blob/f0c4be4d6e9b0eacafd6ece453d8f8d18097a10f/Common%2FFrameworks%2FERExtensions%2FSources%2Fer%2Fextensions%2FERXUnreadMarker.java", "changes": 2, "contents_url": "https://api.github.com/repos/wocommunity/wonder/contents/Common%2FFrameworks%2FERExtensions%2FSources%2Fer%2Fextensions%2FERXUnreadMarker.java?ref=f0c4be4d6e9b0eacafd6ece453d8f8d18097a10f", "deletions": 1, "filename": "Common/Frameworks/ERExtensions/Sources/er/extensions/ERXUnreadMarker.java", "new_code": " public boolean synchronizesVariablesWithBindings() { return false; }", "new_methods": [ { "arguments": [], "filename": "Common/Frameworks/ERExtensions/Sources/er/extensions/ERXUnreadMarker.java", "implementation": "return false;", "signature": "boolean synchronizesVariablesWithBindings()" } ], "old_code": " public boolean synchronizesBindingsWithVariables() { return false; }", "old_methods": [ { "arguments": [], "filename": "Common/Frameworks/ERExtensions/Sources/er/extensions/ERXUnreadMarker.java", "implementation": "return false;", "signature": "boolean synchronizesBindingsWithVariables()" } ], "patch": "@@ -23,7 +23,7 @@ public ERXUnreadMarker(WOContext aContext) {\n ///////////////////////////////// log4j category /////////////////////////////////\n public static Category cat = Category.getInstance(ERXUnreadMarker.class);\n \n- public boolean synchronizesBindingsWithVariables() { return false; }\n+ public boolean synchronizesVariablesWithBindings() { return false; }\n public boolean isStateless() { return true; }\n \n public void reset() { super.reset(); initialized=false; }", "raw_url": "https://github.com/wocommunity/wonder/raw/f0c4be4d6e9b0eacafd6ece453d8f8d18097a10f/Common%2FFrameworks%2FERExtensions%2FSources%2Fer%2Fextensions%2FERXUnreadMarker.java", "sha": "4e12cd60f392ece521ddb2f3c42678f9b6011d36", "status": "modified" } ]
8
[ { "name": "wocommunity$wonder", "new_args": "", "new_implementation": "return false;", "new_return_type": "boolean", "new_signature": "boolean synchronizesVariablesWithBindings()", "old_args": "", "old_implementation": "return false;", "old_return_type": "boolean", "old_signature": "boolean synchronizesBindingsWithVariables()" }, { "name": "wocommunity$wonder", "new_args": "", "new_implementation": "return false;", "new_return_type": "boolean", "new_signature": "boolean synchronizesVariablesWithBindings()", "old_args": "", "old_implementation": "return false;", "old_return_type": "boolean", "old_signature": "boolean synchronizesBindingsWithVariables()" }, { "name": "wocommunity$wonder", "new_args": "", "new_implementation": "return false;", "new_return_type": "boolean", "new_signature": "boolean synchronizesVariablesWithBindings()", "old_args": "", "old_implementation": "return false;", "old_return_type": "boolean", "old_signature": "boolean synchronizesBindingsWithVariables()" }, { "name": "wocommunity$wonder", "new_args": "", "new_implementation": "return false;", "new_return_type": "boolean", "new_signature": "boolean synchronizesVariablesWithBindings()", "old_args": "", "old_implementation": "return false;", "old_return_type": "boolean", "old_signature": "boolean synchronizesBindingsWithVariables()" }, { "name": "wocommunity$wonder", "new_args": "", "new_implementation": "return false;", "new_return_type": "boolean", "new_signature": "boolean synchronizesVariablesWithBindings()", "old_args": "", "old_implementation": "return false;", "old_return_type": "boolean", "old_signature": "boolean synchronizesBindingsWithVariables()" }, { "name": "wocommunity$wonder", "new_args": "", "new_implementation": "return false;", "new_return_type": "boolean", "new_signature": "boolean synchronizesVariablesWithBindings()", "old_args": "", "old_implementation": "return false;", "old_return_type": "boolean", "old_signature": "boolean synchronizesBindingsWithVariables()" }, { "name": "wocommunity$wonder", "new_args": "", "new_implementation": "return false;", "new_return_type": "boolean", "new_signature": "boolean synchronizesVariablesWithBindings()", "old_args": "", "old_implementation": "return false;", "old_return_type": "boolean", "old_signature": "boolean synchronizesBindingsWithVariables()" }, { "name": "wocommunity$wonder", "new_args": "", "new_implementation": "return false;", "new_return_type": "boolean", "new_signature": "boolean synchronizesVariablesWithBindings()", "old_args": "", "old_implementation": "return false;", "old_return_type": "boolean", "old_signature": "boolean synchronizesBindingsWithVariables()" }, { "name": "wocommunity$wonder", "new_args": "", "new_implementation": "return false;", "new_return_type": "boolean", "new_signature": "boolean synchronizesVariablesWithBindings()", "old_args": "", "old_implementation": "return false;", "old_return_type": "boolean", "old_signature": "boolean synchronizesBindingsWithVariables()" }, { "name": "wocommunity$wonder", "new_args": "", "new_implementation": "return false;", "new_return_type": "boolean", "new_signature": "boolean synchronizesVariablesWithBindings()", "old_args": "", "old_implementation": "return false;", "old_return_type": "boolean", "old_signature": "boolean synchronizesBindingsWithVariables()" }, { "name": "wocommunity$wonder", "new_args": "", "new_implementation": "return false;", "new_return_type": "boolean", "new_signature": "boolean synchronizesVariablesWithBindings()", "old_args": "", "old_implementation": "return false;", "old_return_type": "boolean", "old_signature": "boolean synchronizesBindingsWithVariables()" }, { "name": "wocommunity$wonder", "new_args": "", "new_implementation": "return false;", "new_return_type": "boolean", "new_signature": "boolean synchronizesVariablesWithBindings()", "old_args": "", "old_implementation": "return false;", "old_return_type": "boolean", "old_signature": "boolean synchronizesBindingsWithVariables()" }, { "name": "wocommunity$wonder", "new_args": "", "new_implementation": "return false;", "new_return_type": "boolean", "new_signature": "boolean synchronizesVariablesWithBindings()", "old_args": "", "old_implementation": "return false;", "old_return_type": "boolean", "old_signature": "boolean synchronizesBindingsWithVariables()" }, { "name": "wocommunity$wonder", "new_args": "", "new_implementation": "return false;", "new_return_type": "boolean", "new_signature": "boolean synchronizesVariablesWithBindings()", "old_args": "", "old_implementation": "return false;", "old_return_type": "boolean", "old_signature": "boolean synchronizesBindingsWithVariables()" }, { "name": "wocommunity$wonder", "new_args": "", "new_implementation": "return false;", "new_return_type": "boolean", "new_signature": "boolean synchronizesVariablesWithBindings()", "old_args": "", "old_implementation": "return false;", "old_return_type": "boolean", "old_signature": "boolean synchronizesBindingsWithVariables()" }, { "name": "wocommunity$wonder", "new_args": "", "new_implementation": "return false;", "new_return_type": "boolean", "new_signature": "boolean synchronizesVariablesWithBindings()", "old_args": "", "old_implementation": "return false;", "old_return_type": "boolean", "old_signature": "boolean synchronizesBindingsWithVariables()" }, { "name": "wocommunity$wonder", "new_args": "", "new_implementation": "return false;", "new_return_type": "boolean", "new_signature": "boolean synchronizesVariablesWithBindings()", "old_args": "", "old_implementation": "return false;", "old_return_type": "boolean", "old_signature": "boolean synchronizesBindingsWithVariables()" }, { "name": "wocommunity$wonder", "new_args": "", "new_implementation": "return false;", "new_return_type": "boolean", "new_signature": "boolean synchronizesVariablesWithBindings()", "old_args": "", "old_implementation": "return false;", "old_return_type": "boolean", "old_signature": "boolean synchronizesBindingsWithVariables()" }, { "name": "wocommunity$wonder", "new_args": "", "new_implementation": "return false;", "new_return_type": "boolean", "new_signature": "boolean synchronizesVariablesWithBindings()", "old_args": "", "old_implementation": "return false;", "old_return_type": "boolean", "old_signature": "boolean synchronizesBindingsWithVariables()" }, { "name": "wocommunity$wonder", "new_args": "", "new_implementation": "return false;", "new_return_type": "boolean", "new_signature": "boolean synchronizesVariablesWithBindings()", "old_args": "", "old_implementation": "return false;", "old_return_type": "boolean", "old_signature": "boolean synchronizesBindingsWithVariables()" }, { "name": "wocommunity$wonder", "new_args": "", "new_implementation": "return false;", "new_return_type": "boolean", "new_signature": "boolean synchronizesVariablesWithBindings()", "old_args": "", "old_implementation": "return false;", "old_return_type": "boolean", "old_signature": "boolean synchronizesBindingsWithVariables()" }, { "name": "wocommunity$wonder", "new_args": "", "new_implementation": "return false;", "new_return_type": "boolean", "new_signature": "boolean synchronizesVariablesWithBindings()", "old_args": "", "old_implementation": "return false;", "old_return_type": "boolean", "old_signature": "boolean synchronizesBindingsWithVariables()" }, { "name": "wocommunity$wonder", "new_args": "", "new_implementation": "return false;", "new_return_type": "boolean", "new_signature": "boolean synchronizesVariablesWithBindings()", "old_args": "", "old_implementation": "return false;", "old_return_type": "boolean", "old_signature": "boolean synchronizesBindingsWithVariables()" }, { "name": "wocommunity$wonder", "new_args": "", "new_implementation": "return false;", "new_return_type": "boolean", "new_signature": "boolean synchronizesVariablesWithBindings()", "old_args": "", "old_implementation": "return false;", "old_return_type": "boolean", "old_signature": "boolean synchronizesBindingsWithVariables()" }, { "name": "wocommunity$wonder", "new_args": "", "new_implementation": "return false;", "new_return_type": "boolean", "new_signature": "boolean synchronizesVariablesWithBindings()", "old_args": "", "old_implementation": "return false;", "old_return_type": "boolean", "old_signature": "boolean synchronizesBindingsWithVariables()" }, { "name": "wocommunity$wonder", "new_args": "", "new_implementation": "return false;", "new_return_type": "boolean", "new_signature": "boolean synchronizesVariablesWithBindings()", "old_args": "", "old_implementation": "return false;", "old_return_type": "boolean", "old_signature": "boolean synchronizesBindingsWithVariables()" }, { "name": "wocommunity$wonder", "new_args": "", "new_implementation": "return false;", "new_return_type": "boolean", "new_signature": "boolean synchronizesVariablesWithBindings()", "old_args": "", "old_implementation": "return false;", "old_return_type": "boolean", "old_signature": "boolean synchronizesBindingsWithVariables()" }, { "name": "wocommunity$wonder", "new_args": "", "new_implementation": "return false;", "new_return_type": "boolean", "new_signature": "boolean synchronizesVariablesWithBindings()", "old_args": "", "old_implementation": "return false;", "old_return_type": "boolean", "old_signature": "boolean synchronizesBindingsWithVariables()" }, { "name": "wocommunity$wonder", "new_args": "", "new_implementation": "return false;", "new_return_type": "boolean", "new_signature": "boolean synchronizesVariablesWithBindings()", "old_args": "", "old_implementation": "return false;", "old_return_type": "boolean", "old_signature": "boolean synchronizesBindingsWithVariables()" }, { "name": "wocommunity$wonder", "new_args": "", "new_implementation": "return false;", "new_return_type": "boolean", "new_signature": "boolean synchronizesVariablesWithBindings()", "old_args": "", "old_implementation": "return false;", "old_return_type": "boolean", "old_signature": "boolean synchronizesBindingsWithVariables()" }, { "name": "wocommunity$wonder", "new_args": "", "new_implementation": "return false;", "new_return_type": "boolean", "new_signature": "boolean synchronizesVariablesWithBindings()", "old_args": "", "old_implementation": "return false;", "old_return_type": "boolean", "old_signature": "boolean synchronizesBindingsWithVariables()" }, { "name": "wocommunity$wonder", "new_args": "", "new_implementation": "return false;", "new_return_type": "boolean", "new_signature": "boolean synchronizesVariablesWithBindings()", "old_args": "", "old_implementation": "return false;", "old_return_type": "boolean", "old_signature": "boolean synchronizesBindingsWithVariables()" }, { "name": "wocommunity$wonder", "new_args": "", "new_implementation": "return false;", "new_return_type": "boolean", "new_signature": "boolean synchronizesVariablesWithBindings()", "old_args": "", "old_implementation": "return false;", "old_return_type": "boolean", "old_signature": "boolean synchronizesBindingsWithVariables()" }, { "name": "wocommunity$wonder", "new_args": "", "new_implementation": "return false;", "new_return_type": "boolean", "new_signature": "boolean synchronizesVariablesWithBindings()", "old_args": "", "old_implementation": "return false;", "old_return_type": "boolean", "old_signature": "boolean synchronizesBindingsWithVariables()" }, { "name": "wocommunity$wonder", "new_args": "", "new_implementation": "return false;", "new_return_type": "boolean", "new_signature": "boolean synchronizesVariablesWithBindings()", "old_args": "", "old_implementation": "return false;", "old_return_type": "boolean", "old_signature": "boolean synchronizesBindingsWithVariables()" }, { "name": "wocommunity$wonder", "new_args": "", "new_implementation": "return false;", "new_return_type": "boolean", "new_signature": "boolean synchronizesVariablesWithBindings()", "old_args": "", "old_implementation": "return false;", "old_return_type": "boolean", "old_signature": "boolean synchronizesBindingsWithVariables()" }, { "name": "wocommunity$wonder", "new_args": "", "new_implementation": "return false;", "new_return_type": "boolean", "new_signature": "boolean synchronizesVariablesWithBindings()", "old_args": "", "old_implementation": "return false;", "old_return_type": "boolean", "old_signature": "boolean synchronizesBindingsWithVariables()" }, { "name": "wocommunity$wonder", "new_args": "", "new_implementation": "return false;", "new_return_type": "boolean", "new_signature": "boolean synchronizesVariablesWithBindings()", "old_args": "", "old_implementation": "return false;", "old_return_type": "boolean", "old_signature": "boolean synchronizesBindingsWithVariables()" }, { "name": "wocommunity$wonder", "new_args": "", "new_implementation": "return false;", "new_return_type": "boolean", "new_signature": "boolean synchronizesVariablesWithBindings()", "old_args": "", "old_implementation": "return false;", "old_return_type": "boolean", "old_signature": "boolean synchronizesBindingsWithVariables()" }, { "name": "wocommunity$wonder", "new_args": "", "new_implementation": "return false;", "new_return_type": "boolean", "new_signature": "boolean synchronizesVariablesWithBindings()", "old_args": "", "old_implementation": "return false;", "old_return_type": "boolean", "old_signature": "boolean synchronizesBindingsWithVariables()" }, { "name": "wocommunity$wonder", "new_args": "", "new_implementation": "return false;", "new_return_type": "boolean", "new_signature": "boolean synchronizesVariablesWithBindings()", "old_args": "", "old_implementation": "return false;", "old_return_type": "boolean", "old_signature": "boolean synchronizesBindingsWithVariables()" }, { "name": "wocommunity$wonder", "new_args": "", "new_implementation": "return false;", "new_return_type": "boolean", "new_signature": "boolean synchronizesVariablesWithBindings()", "old_args": "", "old_implementation": "return false;", "old_return_type": "boolean", "old_signature": "boolean synchronizesBindingsWithVariables()" }, { "name": "wocommunity$wonder", "new_args": "", "new_implementation": "return false;", "new_return_type": "boolean", "new_signature": "boolean synchronizesVariablesWithBindings()", "old_args": "", "old_implementation": "return false;", "old_return_type": "boolean", "old_signature": "boolean synchronizesBindingsWithVariables()" }, { "name": "wocommunity$wonder", "new_args": "", "new_implementation": "return false;", "new_return_type": "boolean", "new_signature": "boolean synchronizesVariablesWithBindings()", "old_args": "", "old_implementation": "return false;", "old_return_type": "boolean", "old_signature": "boolean synchronizesBindingsWithVariables()" }, { "name": "wocommunity$wonder", "new_args": "", "new_implementation": "return false;", "new_return_type": "boolean", "new_signature": "boolean synchronizesVariablesWithBindings()", "old_args": "", "old_implementation": "return false;", "old_return_type": "boolean", "old_signature": "boolean synchronizesBindingsWithVariables()" }, { "name": "wocommunity$wonder", "new_args": "", "new_implementation": "return false;", "new_return_type": "boolean", "new_signature": "boolean synchronizesVariablesWithBindings()", "old_args": "", "old_implementation": "return false;", "old_return_type": "boolean", "old_signature": "boolean synchronizesBindingsWithVariables()" }, { "name": "wocommunity$wonder", "new_args": "", "new_implementation": "return false;", "new_return_type": "boolean", "new_signature": "boolean synchronizesVariablesWithBindings()", "old_args": "", "old_implementation": "return false;", "old_return_type": "boolean", "old_signature": "boolean synchronizesBindingsWithVariables()" }, { "name": "wocommunity$wonder", "new_args": "", "new_implementation": "return false;", "new_return_type": "boolean", "new_signature": "boolean synchronizesVariablesWithBindings()", "old_args": "", "old_implementation": "return false;", "old_return_type": "boolean", "old_signature": "boolean synchronizesBindingsWithVariables()" }, { "name": "wocommunity$wonder", "new_args": "", "new_implementation": "return false;", "new_return_type": "boolean", "new_signature": "boolean synchronizesVariablesWithBindings()", "old_args": "", "old_implementation": "return false;", "old_return_type": "boolean", "old_signature": "boolean synchronizesBindingsWithVariables()" }, { "name": "wocommunity$wonder", "new_args": "", "new_implementation": "return false;", "new_return_type": "boolean", "new_signature": "boolean synchronizesVariablesWithBindings()", "old_args": "", "old_implementation": "return false;", "old_return_type": "boolean", "old_signature": "boolean synchronizesBindingsWithVariables()" }, { "name": "wocommunity$wonder", "new_args": "", "new_implementation": "return false;", "new_return_type": "boolean", "new_signature": "boolean synchronizesVariablesWithBindings()", "old_args": "", "old_implementation": "return false;", "old_return_type": "boolean", "old_signature": "boolean synchronizesBindingsWithVariables()" }, { "name": "wocommunity$wonder", "new_args": "", "new_implementation": "return false;", "new_return_type": "boolean", "new_signature": "boolean synchronizesVariablesWithBindings()", "old_args": "", "old_implementation": "return false;", "old_return_type": "boolean", "old_signature": "boolean synchronizesBindingsWithVariables()" }, { "name": "wocommunity$wonder", "new_args": "", "new_implementation": "return false;", "new_return_type": "boolean", "new_signature": "boolean synchronizesVariablesWithBindings()", "old_args": "", "old_implementation": "return false;", "old_return_type": "boolean", "old_signature": "boolean synchronizesBindingsWithVariables()" }, { "name": "wocommunity$wonder", "new_args": "", "new_implementation": "return false;", "new_return_type": "boolean", "new_signature": "boolean synchronizesVariablesWithBindings()", "old_args": "", "old_implementation": "return false;", "old_return_type": "boolean", "old_signature": "boolean synchronizesBindingsWithVariables()" }, { "name": "wocommunity$wonder", "new_args": "", "new_implementation": "return false;", "new_return_type": "boolean", "new_signature": "boolean synchronizesVariablesWithBindings()", "old_args": "", "old_implementation": "return false;", "old_return_type": "boolean", "old_signature": "boolean synchronizesBindingsWithVariables()" }, { "name": "wocommunity$wonder", "new_args": "", "new_implementation": "return false;", "new_return_type": "boolean", "new_signature": "boolean synchronizesVariablesWithBindings()", "old_args": "", "old_implementation": "return false;", "old_return_type": "boolean", "old_signature": "boolean synchronizesBindingsWithVariables()" }, { "name": "wocommunity$wonder", "new_args": "", "new_implementation": "return false;", "new_return_type": "boolean", "new_signature": "boolean synchronizesVariablesWithBindings()", "old_args": "", "old_implementation": "return false;", "old_return_type": "boolean", "old_signature": "boolean synchronizesBindingsWithVariables()" }, { "name": "wocommunity$wonder", "new_args": "", "new_implementation": "return false;", "new_return_type": "boolean", "new_signature": "boolean synchronizesVariablesWithBindings()", "old_args": "", "old_implementation": "return false;", "old_return_type": "boolean", "old_signature": "boolean synchronizesBindingsWithVariables()" }, { "name": "wocommunity$wonder", "new_args": "", "new_implementation": "return false;", "new_return_type": "boolean", "new_signature": "boolean synchronizesVariablesWithBindings()", "old_args": "", "old_implementation": "return false;", "old_return_type": "boolean", "old_signature": "boolean synchronizesBindingsWithVariables()" }, { "name": "wocommunity$wonder", "new_args": "", "new_implementation": "return false;", "new_return_type": "boolean", "new_signature": "boolean synchronizesVariablesWithBindings()", "old_args": "", "old_implementation": "return false;", "old_return_type": "boolean", "old_signature": "boolean synchronizesBindingsWithVariables()" }, { "name": "wocommunity$wonder", "new_args": "", "new_implementation": "return false;", "new_return_type": "boolean", "new_signature": "boolean synchronizesVariablesWithBindings()", "old_args": "", "old_implementation": "return false;", "old_return_type": "boolean", "old_signature": "boolean synchronizesBindingsWithVariables()" }, { "name": "wocommunity$wonder", "new_args": "", "new_implementation": "return false;", "new_return_type": "boolean", "new_signature": "boolean synchronizesVariablesWithBindings()", "old_args": "", "old_implementation": "return false;", "old_return_type": "boolean", "old_signature": "boolean synchronizesBindingsWithVariables()" }, { "name": "wocommunity$wonder", "new_args": "", "new_implementation": "return false;", "new_return_type": "boolean", "new_signature": "boolean synchronizesVariablesWithBindings()", "old_args": "", "old_implementation": "return false;", "old_return_type": "boolean", "old_signature": "boolean synchronizesBindingsWithVariables()" }, { "name": "wocommunity$wonder", "new_args": "", "new_implementation": "return false;", "new_return_type": "boolean", "new_signature": "boolean synchronizesVariablesWithBindings()", "old_args": "", "old_implementation": "return false;", "old_return_type": "boolean", "old_signature": "boolean synchronizesBindingsWithVariables()" } ]
64
8
f89655fbb32c1372837f17bb6f7ed81f7a32c654
[ { "name": "nysenate$openlegislation", "new_args": "", "new_implementation": null, "new_return_type": "String", "new_signature": "String schema()", "old_args": "", "old_implementation": null, "old_return_type": "String", "old_signature": "String getEnvSchema()" }, { "name": "nysenate$openlegislation", "new_args": "", "new_implementation": null, "new_return_type": "String", "new_signature": "String getAmendmentVersion()", "old_args": "", "old_implementation": null, "old_return_type": "String", "old_signature": "String getBillAmendment()" }, { "name": "nysenate$openlegislation", "new_args": "", "new_implementation": null, "new_return_type": "SOBIFragmentType", "new_signature": "SOBIFragmentType getType()", "old_args": "", "old_implementation": null, "old_return_type": "SOBIFragmentType", "old_signature": "SOBIFragmentType getFragmentType()" }, { "name": "nysenate$openlegislation", "new_args": "", "new_implementation": null, "new_return_type": "String", "new_signature": "String getBaseBillPrintNo()", "old_args": "", "old_implementation": null, "old_return_type": "String", "old_signature": "String getOid()" }, { "name": "nysenate$openlegislation", "new_args": "", "new_implementation": null, "new_return_type": "String", "new_signature": "String getFragmentFileName()", "old_args": "", "old_implementation": null, "old_return_type": "String", "old_signature": "String getPrintNo()" }, { "name": "nysenate$openlegislation", "new_args": "String amendmentVersion", "new_implementation": null, "new_return_type": "void", "new_signature": "void setAmendmentVersion(String amendmentVersion)", "old_args": "String billVersion", "old_implementation": null, "old_return_type": "void", "old_signature": "void setBillAmendment(String billVersion)" }, { "name": "nysenate$openlegislation", "new_args": "String printNo", "new_implementation": null, "new_return_type": "void", "new_signature": "void setPrintNo(String printNo)", "old_args": "String billId", "old_implementation": null, "old_return_type": "void", "old_signature": "void setBillId(String billId)" }, { "name": "nysenate$openlegislation", "new_args": "String baseBillPrintNo", "new_implementation": "this.baseBillPrintNo = baseBillPrintNo;", "new_return_type": "void", "new_signature": "void setBaseBillPrintNo(String baseBillPrintNo)", "old_args": "String oid", "old_implementation": "this.oid = oid;\n /**\n * @return - The date of the action.\n */\n public Date getDate() {\n return date;", "old_return_type": "void", "old_signature": "void setOid(String oid)" }, { "name": "nysenate$openlegislation", "new_args": "String fileName", "new_implementation": null, "new_return_type": "void", "new_signature": "void setFileName(String fileName)", "old_args": "String text", "old_implementation": null, "old_return_type": "void", "old_signature": "void setText(String text)" } ]
[ { "additions": 1, "blob_url": "https://github.com/nysenate/OpenLegislation/blob/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2FEnvironment.java", "changes": 3, "contents_url": "https://api.github.com/repos/nysenate/OpenLegislation/contents/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2FEnvironment.java?ref=f89655fbb32c1372837f17bb6f7ed81f7a32c654", "deletions": 2, "filename": "src/main/java/gov/nysenate/openleg/Environment.java", "new_code": "import org.apache.commons.io.FileUtils;", "new_methods": [], "old_code": "import org.apache.commons.io.FileUtils;\n", "old_methods": [], "patch": "@@ -1,13 +1,12 @@\n package gov.nysenate.openleg;\n \n import gov.nysenate.util.Config;\n+import org.apache.commons.io.FileUtils;\n \n import java.io.File;\n import java.io.IOException;\n import java.util.Date;\n \n-import org.apache.commons.io.FileUtils;\n-\n /**\n * The Environment class is essentially a configuration for an OpenLeg workspace.\n * Each workspace contains its own set of directories to store the source data files", "raw_url": "https://github.com/nysenate/OpenLegislation/raw/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2FEnvironment.java", "sha": "2a9b53be49311cf6a5be8b499ce01dc56f4e14c0", "status": "modified" }, { "additions": 3, "blob_url": "https://github.com/nysenate/OpenLegislation/blob/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fapi%2FAbstractApiRequest.java", "changes": 7, "contents_url": "https://api.github.com/repos/nysenate/OpenLegislation/contents/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fapi%2FAbstractApiRequest.java?ref=f89655fbb32c1372837f17bb6f7ed81f7a32c654", "deletions": 4, "filename": "src/main/java/gov/nysenate/openleg/api/AbstractApiRequest.java", "new_code": "import javax.servlet.ServletException;\nimport javax.servlet.http.HttpServletRequest;\nimport javax.servlet.http.HttpServletResponse;", "new_methods": [], "old_code": "import javax.servlet.ServletException;\nimport javax.servlet.http.HttpServletRequest;\nimport javax.servlet.http.HttpServletResponse;\n", "old_methods": [], "patch": "@@ -4,15 +4,14 @@\n import gov.nysenate.openleg.util.OpenLegConstants;\n import gov.nysenate.openleg.util.TextFormatter;\n \n+import javax.servlet.ServletException;\n+import javax.servlet.http.HttpServletRequest;\n+import javax.servlet.http.HttpServletResponse;\n import java.io.IOException;\n import java.util.Arrays;\n import java.util.HashMap;\n import java.util.HashSet;\n \n-import javax.servlet.ServletException;\n-import javax.servlet.http.HttpServletRequest;\n-import javax.servlet.http.HttpServletResponse;\n-\n /*\n * abstract wrapper for api request objects\n */", "raw_url": "https://github.com/nysenate/OpenLegislation/raw/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fapi%2FAbstractApiRequest.java", "sha": "6954875a25d895fa72eff3d7347ff0826034978c", "status": "modified" }, { "additions": 5, "blob_url": "https://github.com/nysenate/OpenLegislation/blob/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fapi%2FApiType.java", "changes": 10, "contents_url": "https://api.github.com/repos/nysenate/OpenLegislation/contents/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fapi%2FApiType.java?ref=f89655fbb32c1372837f17bb6f7ed81f7a32c654", "deletions": 5, "filename": "src/main/java/gov/nysenate/openleg/api/ApiType.java", "new_code": "import gov.nysenate.openleg.model.bill.Bill;\nimport gov.nysenate.openleg.model.bill.BillAction;\nimport gov.nysenate.openleg.model.bill.Vote;\nimport gov.nysenate.openleg.model.calendar.Calendar;\nimport gov.nysenate.openleg.model.transcript.Transcript;", "new_methods": [], "old_code": "import gov.nysenate.openleg.model.BillAction;\nimport gov.nysenate.openleg.model.Bill;\nimport gov.nysenate.openleg.model.Calendar;\nimport gov.nysenate.openleg.model.Transcript;\nimport gov.nysenate.openleg.model.Vote;", "old_methods": [], "patch": "@@ -1,11 +1,11 @@\n package gov.nysenate.openleg.api;\n \n-import gov.nysenate.openleg.model.BillAction;\n import gov.nysenate.openleg.model.BaseObject;\n-import gov.nysenate.openleg.model.Bill;\n-import gov.nysenate.openleg.model.Calendar;\n-import gov.nysenate.openleg.model.Transcript;\n-import gov.nysenate.openleg.model.Vote;\n+import gov.nysenate.openleg.model.bill.Bill;\n+import gov.nysenate.openleg.model.bill.BillAction;\n+import gov.nysenate.openleg.model.bill.Vote;\n+import gov.nysenate.openleg.model.calendar.Calendar;\n+import gov.nysenate.openleg.model.transcript.Transcript;\n \n public enum ApiType {\n BILL\t\t(\"bill\", \t\tBill.class),", "raw_url": "https://github.com/nysenate/OpenLegislation/raw/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fapi%2FApiType.java", "sha": "a347f5300f471bd92c2a76e7babdb29d5c61fa56", "status": "modified" }, { "additions": 6, "blob_url": "https://github.com/nysenate/OpenLegislation/blob/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fapi%2Fservlets%2FAdvancedSearchServlet.java", "changes": 14, "contents_url": "https://api.github.com/repos/nysenate/OpenLegislation/contents/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fapi%2Fservlets%2FAdvancedSearchServlet.java?ref=f89655fbb32c1372837f17bb6f7ed81f7a32c654", "deletions": 8, "filename": "src/main/java/gov/nysenate/openleg/api/servlets/AdvancedSearchServlet.java", "new_code": "import org.apache.commons.io.FileUtils;\nimport org.codehaus.jackson.map.ObjectMapper;\nimport javax.servlet.ServletException;\nimport javax.servlet.http.HttpServlet;\nimport javax.servlet.http.HttpServletRequest;\nimport javax.servlet.http.HttpServletResponse;", "new_methods": [], "old_code": "import javax.servlet.ServletException;\nimport javax.servlet.http.HttpServlet;\nimport javax.servlet.http.HttpServletRequest;\nimport javax.servlet.http.HttpServletResponse;\n\nimport org.apache.commons.io.FileUtils;\nimport org.codehaus.jackson.map.ObjectMapper;\n", "old_methods": [], "patch": "@@ -3,21 +3,19 @@\n import gov.nysenate.openleg.util.SessionYear;\n import gov.nysenate.services.model.Committee;\n import gov.nysenate.services.model.Senator;\n+import org.apache.commons.io.FileUtils;\n+import org.codehaus.jackson.map.ObjectMapper;\n \n+import javax.servlet.ServletException;\n+import javax.servlet.http.HttpServlet;\n+import javax.servlet.http.HttpServletRequest;\n+import javax.servlet.http.HttpServletResponse;\n import java.io.File;\n import java.io.IOException;\n import java.util.ArrayList;\n import java.util.Collections;\n import java.util.Comparator;\n \n-import javax.servlet.ServletException;\n-import javax.servlet.http.HttpServlet;\n-import javax.servlet.http.HttpServletRequest;\n-import javax.servlet.http.HttpServletResponse;\n-\n-import org.apache.commons.io.FileUtils;\n-import org.codehaus.jackson.map.ObjectMapper;\n-\n @SuppressWarnings(\"serial\")\n public class AdvancedSearchServlet extends HttpServlet\n {", "raw_url": "https://github.com/nysenate/OpenLegislation/raw/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fapi%2Fservlets%2FAdvancedSearchServlet.java", "sha": "b97f787e98d0616c5eefca86adfcfa8d6339ca65", "status": "modified" }, { "additions": 7, "blob_url": "https://github.com/nysenate/OpenLegislation/blob/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fapi%2Fservlets%2FCommitteesServlet.java", "changes": 16, "contents_url": "https://api.github.com/repos/nysenate/OpenLegislation/contents/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fapi%2Fservlets%2FCommitteesServlet.java?ref=f89655fbb32c1372837f17bb6f7ed81f7a32c654", "deletions": 9, "filename": "src/main/java/gov/nysenate/openleg/api/servlets/CommitteesServlet.java", "new_code": "import org.apache.commons.io.FileUtils;\nimport org.apache.log4j.Logger;\nimport org.codehaus.jackson.map.ObjectMapper;\nimport javax.servlet.ServletException;\nimport javax.servlet.http.HttpServlet;\nimport javax.servlet.http.HttpServletRequest;\nimport javax.servlet.http.HttpServletResponse;", "new_methods": [], "old_code": "import javax.servlet.ServletException;\nimport javax.servlet.http.HttpServlet;\nimport javax.servlet.http.HttpServletRequest;\nimport javax.servlet.http.HttpServletResponse;\n\nimport org.apache.commons.io.FileUtils;\nimport org.apache.log4j.Logger;\nimport org.codehaus.jackson.map.ObjectMapper;\n", "old_methods": [], "patch": "@@ -5,7 +5,14 @@\n import gov.nysenate.openleg.util.SessionYear;\n import gov.nysenate.services.model.Committee;\n import gov.nysenate.services.model.Member;\n+import org.apache.commons.io.FileUtils;\n+import org.apache.log4j.Logger;\n+import org.codehaus.jackson.map.ObjectMapper;\n \n+import javax.servlet.ServletException;\n+import javax.servlet.http.HttpServlet;\n+import javax.servlet.http.HttpServletRequest;\n+import javax.servlet.http.HttpServletResponse;\n import java.io.File;\n import java.io.IOException;\n import java.util.ArrayList;\n@@ -14,15 +21,6 @@\n import java.util.regex.Matcher;\n import java.util.regex.Pattern;\n \n-import javax.servlet.ServletException;\n-import javax.servlet.http.HttpServlet;\n-import javax.servlet.http.HttpServletRequest;\n-import javax.servlet.http.HttpServletResponse;\n-\n-import org.apache.commons.io.FileUtils;\n-import org.apache.log4j.Logger;\n-import org.codehaus.jackson.map.ObjectMapper;\n-\n @SuppressWarnings(\"serial\")\n public class CommitteesServlet extends HttpServlet\n {", "raw_url": "https://github.com/nysenate/OpenLegislation/raw/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fapi%2Fservlets%2FCommitteesServlet.java", "sha": "88bb4a0873263246b14a11fea25ab1a248e9458e", "status": "modified" }, { "additions": 3, "blob_url": "https://github.com/nysenate/OpenLegislation/blob/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fapi%2Fservlets%2FLogFilter.java", "changes": 12, "contents_url": "https://api.github.com/repos/nysenate/OpenLegislation/contents/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fapi%2Fservlets%2FLogFilter.java?ref=f89655fbb32c1372837f17bb6f7ed81f7a32c654", "deletions": 9, "filename": "src/main/java/gov/nysenate/openleg/api/servlets/LogFilter.java", "new_code": "import org.apache.log4j.Logger;\nimport javax.servlet.*;\nimport java.io.IOException;", "new_methods": [], "old_code": "import java.io.IOException;\nimport javax.servlet.Filter;\nimport javax.servlet.FilterChain;\nimport javax.servlet.FilterConfig;\nimport javax.servlet.ServletException;\nimport javax.servlet.ServletRequest;\nimport javax.servlet.ServletResponse;\n\nimport org.apache.log4j.Logger;", "old_methods": [], "patch": "@@ -1,16 +1,10 @@\n package gov.nysenate.openleg.api.servlets;\n \n-import java.io.IOException;\n+import org.apache.log4j.Logger;\n \n-import javax.servlet.Filter;\n-import javax.servlet.FilterChain;\n-import javax.servlet.FilterConfig;\n-import javax.servlet.ServletException;\n-import javax.servlet.ServletRequest;\n-import javax.servlet.ServletResponse;\n+import javax.servlet.*;\n import javax.servlet.http.HttpServletRequest;\n-\n-import org.apache.log4j.Logger;\n+import java.io.IOException;\n \n public class LogFilter implements Filter\n {", "raw_url": "https://github.com/nysenate/OpenLegislation/raw/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fapi%2Fservlets%2FLogFilter.java", "sha": "18be339c97c6322798cf8b7ac25ec20c3b490fa9", "status": "modified" }, { "additions": 3, "blob_url": "https://github.com/nysenate/OpenLegislation/blob/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fapi%2Fservlets%2FRulesServlet.java", "changes": 8, "contents_url": "https://api.github.com/repos/nysenate/OpenLegislation/contents/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fapi%2Fservlets%2FRulesServlet.java?ref=f89655fbb32c1372837f17bb6f7ed81f7a32c654", "deletions": 5, "filename": "src/main/java/gov/nysenate/openleg/api/servlets/RulesServlet.java", "new_code": "import org.apache.commons.io.FileUtils;\nimport java.io.File;\nimport java.io.IOException;", "new_methods": [], "old_code": "\nimport java.io.File;\nimport java.io.IOException;\n\nimport org.apache.commons.io.FileUtils;", "old_methods": [], "patch": "@@ -1,16 +1,14 @@\n package gov.nysenate.openleg.api.servlets;\n \n import gov.nysenate.openleg.util.Application;\n-\n-import java.io.File;\n-import java.io.IOException;\n+import org.apache.commons.io.FileUtils;\n \n import javax.servlet.ServletException;\n import javax.servlet.http.HttpServlet;\n import javax.servlet.http.HttpServletRequest;\n import javax.servlet.http.HttpServletResponse;\n-\n-import org.apache.commons.io.FileUtils;\n+import java.io.File;\n+import java.io.IOException;\n \n @SuppressWarnings(\"serial\")\n public class RulesServlet extends HttpServlet {", "raw_url": "https://github.com/nysenate/OpenLegislation/raw/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fapi%2Fservlets%2FRulesServlet.java", "sha": "b96420d1b2bcf19cef2b5c7fde0a751d3bbe78f8", "status": "modified" }, { "additions": 7, "blob_url": "https://github.com/nysenate/OpenLegislation/blob/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fapi%2Fservlets%2FSenatorsServlet.java", "changes": 16, "contents_url": "https://api.github.com/repos/nysenate/OpenLegislation/contents/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fapi%2Fservlets%2FSenatorsServlet.java?ref=f89655fbb32c1372837f17bb6f7ed81f7a32c654", "deletions": 9, "filename": "src/main/java/gov/nysenate/openleg/api/servlets/SenatorsServlet.java", "new_code": "import org.apache.commons.io.FileUtils;\nimport org.apache.log4j.Logger;\nimport org.codehaus.jackson.map.ObjectMapper;\nimport javax.servlet.ServletException;\nimport javax.servlet.http.HttpServlet;\nimport javax.servlet.http.HttpServletRequest;\nimport javax.servlet.http.HttpServletResponse;", "new_methods": [], "old_code": "import javax.servlet.ServletException;\nimport javax.servlet.http.HttpServlet;\nimport javax.servlet.http.HttpServletRequest;\nimport javax.servlet.http.HttpServletResponse;\n\nimport org.apache.commons.io.FileUtils;\nimport org.apache.log4j.Logger;\nimport org.codehaus.jackson.map.ObjectMapper;\n", "old_methods": [], "patch": "@@ -4,7 +4,14 @@\n import gov.nysenate.openleg.util.RequestUtils.FORMAT;\n import gov.nysenate.openleg.util.SessionYear;\n import gov.nysenate.services.model.Senator;\n+import org.apache.commons.io.FileUtils;\n+import org.apache.log4j.Logger;\n+import org.codehaus.jackson.map.ObjectMapper;\n \n+import javax.servlet.ServletException;\n+import javax.servlet.http.HttpServlet;\n+import javax.servlet.http.HttpServletRequest;\n+import javax.servlet.http.HttpServletResponse;\n import java.io.File;\n import java.io.IOException;\n import java.util.ArrayList;\n@@ -13,15 +20,6 @@\n import java.util.regex.Matcher;\n import java.util.regex.Pattern;\n \n-import javax.servlet.ServletException;\n-import javax.servlet.http.HttpServlet;\n-import javax.servlet.http.HttpServletRequest;\n-import javax.servlet.http.HttpServletResponse;\n-\n-import org.apache.commons.io.FileUtils;\n-import org.apache.log4j.Logger;\n-import org.codehaus.jackson.map.ObjectMapper;\n-\n @SuppressWarnings(\"serial\")\n public class SenatorsServlet extends HttpServlet\n {", "raw_url": "https://github.com/nysenate/OpenLegislation/raw/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fapi%2Fservlets%2FSenatorsServlet.java", "sha": "e9482e31df78b4534e0375bd6617bd3a8ce6b48a", "status": "modified" }, { "additions": 8, "blob_url": "https://github.com/nysenate/OpenLegislation/blob/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fapi%2Fservlets%2Fadmin%2FReportsServlet.java", "changes": 18, "contents_url": "https://api.github.com/repos/nysenate/OpenLegislation/contents/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fapi%2Fservlets%2Fadmin%2FReportsServlet.java?ref=f89655fbb32c1372837f17bb6f7ed81f7a32c654", "deletions": 10, "filename": "src/main/java/gov/nysenate/openleg/api/servlets/admin/ReportsServlet.java", "new_code": "import org.apache.commons.dbutils.QueryRunner;\nimport org.apache.commons.dbutils.handlers.BeanHandler;\nimport org.apache.commons.dbutils.handlers.BeanListHandler;\nimport org.apache.log4j.Logger;\nimport java.io.IOException;\nimport java.sql.SQLException;\nimport java.util.ArrayList;\nimport java.util.List;", "new_methods": [], "old_code": "\nimport java.io.IOException;\nimport java.sql.SQLException;\nimport java.util.ArrayList;\nimport java.util.List;\n\nimport org.apache.commons.dbutils.QueryRunner;\nimport org.apache.commons.dbutils.handlers.BeanHandler;\nimport org.apache.commons.dbutils.handlers.BeanListHandler;\nimport org.apache.log4j.Logger;", "old_methods": [], "patch": "@@ -4,21 +4,19 @@\n import gov.nysenate.openleg.model.admin.ReportDAO;\n import gov.nysenate.openleg.model.admin.ReportError;\n import gov.nysenate.openleg.model.admin.ReportObservation;\n-\n-import java.io.IOException;\n-import java.sql.SQLException;\n-import java.util.ArrayList;\n-import java.util.List;\n+import org.apache.commons.dbutils.QueryRunner;\n+import org.apache.commons.dbutils.handlers.BeanHandler;\n+import org.apache.commons.dbutils.handlers.BeanListHandler;\n+import org.apache.log4j.Logger;\n \n import javax.servlet.ServletException;\n import javax.servlet.http.HttpServlet;\n import javax.servlet.http.HttpServletRequest;\n import javax.servlet.http.HttpServletResponse;\n-\n-import org.apache.commons.dbutils.QueryRunner;\n-import org.apache.commons.dbutils.handlers.BeanHandler;\n-import org.apache.commons.dbutils.handlers.BeanListHandler;\n-import org.apache.log4j.Logger;\n+import java.io.IOException;\n+import java.sql.SQLException;\n+import java.util.ArrayList;\n+import java.util.List;\n \n /**\n * Servlet implementation class ErrorLog", "raw_url": "https://github.com/nysenate/OpenLegislation/raw/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fapi%2Fservlets%2Fadmin%2FReportsServlet.java", "sha": "c9d4f215f20f06520c5f4edcbe3a819f45a813e2", "status": "modified" }, { "additions": 8, "blob_url": "https://github.com/nysenate/OpenLegislation/blob/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fapi%2Fservlets%2Fadmin%2FUpdatesServlet.java", "changes": 24, "contents_url": "https://api.github.com/repos/nysenate/OpenLegislation/contents/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fapi%2Fservlets%2Fadmin%2FUpdatesServlet.java?ref=f89655fbb32c1372837f17bb6f7ed81f7a32c654", "deletions": 16, "filename": "src/main/java/gov/nysenate/openleg/api/servlets/admin/UpdatesServlet.java", "new_code": "import org.apache.commons.dbutils.QueryRunner;\nimport org.apache.commons.dbutils.ResultSetHandler;\nimport org.apache.log4j.Logger;\nimport javax.servlet.ServletException;\nimport javax.servlet.http.HttpServlet;\nimport javax.servlet.http.HttpServletRequest;\nimport javax.servlet.http.HttpServletResponse;\nimport java.util.*;", "new_methods": [], "old_code": "import java.util.ArrayList;\nimport java.util.Arrays;\nimport java.util.Calendar;\nimport java.util.Collections;\nimport java.util.Date;\nimport java.util.List;\nimport java.util.TreeMap;\n\nimport javax.servlet.ServletException;\nimport javax.servlet.http.HttpServlet;\nimport javax.servlet.http.HttpServletRequest;\nimport javax.servlet.http.HttpServletResponse;\n\nimport org.apache.commons.dbutils.QueryRunner;\nimport org.apache.commons.dbutils.ResultSetHandler;\nimport org.apache.log4j.Logger;", "old_methods": [], "patch": "@@ -3,28 +3,20 @@\n import gov.nysenate.openleg.model.Change;\n import gov.nysenate.openleg.util.Application;\n import gov.nysenate.openleg.util.Storage;\n+import org.apache.commons.dbutils.QueryRunner;\n+import org.apache.commons.dbutils.ResultSetHandler;\n+import org.apache.log4j.Logger;\n \n+import javax.servlet.ServletException;\n+import javax.servlet.http.HttpServlet;\n+import javax.servlet.http.HttpServletRequest;\n+import javax.servlet.http.HttpServletResponse;\n import java.io.IOException;\n import java.sql.ResultSet;\n import java.sql.SQLException;\n import java.text.ParseException;\n import java.text.SimpleDateFormat;\n-import java.util.ArrayList;\n-import java.util.Arrays;\n-import java.util.Calendar;\n-import java.util.Collections;\n-import java.util.Date;\n-import java.util.List;\n-import java.util.TreeMap;\n-\n-import javax.servlet.ServletException;\n-import javax.servlet.http.HttpServlet;\n-import javax.servlet.http.HttpServletRequest;\n-import javax.servlet.http.HttpServletResponse;\n-\n-import org.apache.commons.dbutils.QueryRunner;\n-import org.apache.commons.dbutils.ResultSetHandler;\n-import org.apache.log4j.Logger;\n+import java.util.*;\n \n /**\n * Servlet implementation class UpdateServlet", "raw_url": "https://github.com/nysenate/OpenLegislation/raw/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fapi%2Fservlets%2Fadmin%2FUpdatesServlet.java", "sha": "6088e72a4c4b82defc170da011c92763fd0dcb25", "status": "modified" }, { "additions": 30, "blob_url": "https://github.com/nysenate/OpenLegislation/blob/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fdao%2Fbase%2FSqlBaseDao.java", "changes": 33, "contents_url": "https://api.github.com/repos/nysenate/OpenLegislation/contents/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fdao%2Fbase%2FSqlBaseDao.java?ref=f89655fbb32c1372837f17bb6f7ed81f7a32c654", "deletions": 3, "filename": "src/main/java/gov/nysenate/openleg/dao/base/SqlBaseDao.java", "new_code": "import java.util.List;\n /** --- Table Name Definitions --- */\n\n protected static String BILL_TABLE = \"bill\";\n protected static String BILL_AMENDEMENT_TABLE = \"bill_amendment\";\n protected static String BILL_AMENDMENT_ACTION_TABLE = \"bill_amendment_action\";\n protected static String BILL_AMENDMENT_COSPONSOR_TABLE = \"bill_amendment_cosponsor\";\n protected static String BILL_AMENDMENT_VOTE = \"bill_amendment_vote\";\n\n protected String schema() {\n return schema() + \".\" + tableName;\n /**\n * Outputs the ORDER BY clause for multiple column name and sort order pairs.\n * @param columnNames List<String>\n * @param sortOrders List<SortOrder>>\n * @return String\n */\n protected String orderBy(List<String> columnNames, List<SortOrder> sortOrders) {\n if (columnNames.size() != sortOrders.size()) {\n throw new IllegalArgumentException(\"For order by clause, number of column names must match sort orders!\");\n }\n String orderByClause = \"ORDER BY \";\n for (int i = 0; i < columnNames.size(); i++) {\n if (sortOrders.get(i) != null && !sortOrders.get(i).equals(SortOrder.NONE)) {\n orderByClause += (columnNames.get(i) + \" \" + sortOrders.get(i).name() + ((i + 1 == columnNames.size()) ? \" \" : \", \"));\n }\n }\n return orderByClause;\n }\n", "new_methods": [ { "arguments": [], "filename": "src/main/java/gov/nysenate/openleg/dao/base/SqlBaseDao.java", "implementation": "return schema() + \".\" + tableName;\n /**\n * Outputs the ORDER BY clause for multiple column name and sort order pairs.\n * @param columnNames List<String>\n * @param sortOrders List<SortOrder>>\n * @return String\n */\n protected String orderBy(List<String> columnNames, List<SortOrder> sortOrders) {\n if (columnNames.size() != sortOrders.size()) {\n throw new IllegalArgumentException(\"For order by clause, number of column names must match sort orders!\");", "signature": "String schema()" } ], "old_code": "import org.apache.commons.dbutils.QueryRunner;\n protected String getEnvSchema() {\n return getEnvSchema() + \".\" + tableName;", "old_methods": [], "patch": "@@ -2,12 +2,12 @@\n \n import gov.nysenate.openleg.Environment;\n import gov.nysenate.openleg.util.Application;\n-import org.apache.commons.dbutils.QueryRunner;\n import org.springframework.jdbc.core.JdbcTemplate;\n import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;\n \n import java.sql.Timestamp;\n import java.util.Date;\n+import java.util.List;\n \n /**\n * Base class for SQL data access layer classes to inherit common functionality from.\n@@ -26,6 +26,14 @@ public abstract class SqlBaseDao\n /** Reference to the environment in which the data is stored */\n protected Environment environment;\n \n+ /** --- Table Name Definitions --- */\n+\n+ protected static String BILL_TABLE = \"bill\";\n+ protected static String BILL_AMENDEMENT_TABLE = \"bill_amendment\";\n+ protected static String BILL_AMENDMENT_ACTION_TABLE = \"bill_amendment_action\";\n+ protected static String BILL_AMENDMENT_COSPONSOR_TABLE = \"bill_amendment_cosponsor\";\n+ protected static String BILL_AMENDMENT_VOTE = \"bill_amendment_vote\";\n+\n protected SqlBaseDao(Environment environment) {\n this.environment = environment;\n }\n@@ -34,7 +42,7 @@ protected SqlBaseDao(Environment environment) {\n * Returns the schema of the environment instance.\n * @return String\n */\n- protected String getEnvSchema() {\n+ protected String schema() {\n if (environment == null) {\n throw new IllegalStateException(\"The environment has not been initialized. Cannot perform SQL queries \" +\n \"since we can't determine which database schema to operate on.\");\n@@ -50,7 +58,7 @@ protected String getEnvSchema() {\n * @return String\n */\n protected String table(String tableName) {\n- return getEnvSchema() + \".\" + tableName;\n+ return schema() + \".\" + tableName;\n }\n \n /**\n@@ -66,6 +74,25 @@ protected String orderBy(String columnName, SortOrder sortOrder) {\n return \"ORDER BY \" + columnName + \" \" + sortOrder.name();\n }\n \n+ /**\n+ * Outputs the ORDER BY clause for multiple column name and sort order pairs.\n+ * @param columnNames List<String>\n+ * @param sortOrders List<SortOrder>>\n+ * @return String\n+ */\n+ protected String orderBy(List<String> columnNames, List<SortOrder> sortOrders) {\n+ if (columnNames.size() != sortOrders.size()) {\n+ throw new IllegalArgumentException(\"For order by clause, number of column names must match sort orders!\");\n+ }\n+ String orderByClause = \"ORDER BY \";\n+ for (int i = 0; i < columnNames.size(); i++) {\n+ if (sortOrders.get(i) != null && !sortOrders.get(i).equals(SortOrder.NONE)) {\n+ orderByClause += (columnNames.get(i) + \" \" + sortOrders.get(i).name() + ((i + 1 == columnNames.size()) ? \" \" : \", \"));\n+ }\n+ }\n+ return orderByClause;\n+ }\n+\n /** --- Static Helper Methods --- */\n \n /**", "raw_url": "https://github.com/nysenate/OpenLegislation/raw/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fdao%2Fbase%2FSqlBaseDao.java", "sha": "6f1f4eff6be8d09afb6d9e398e16255aeb473fe6", "status": "modified" }, { "additions": 262, "blob_url": "https://github.com/nysenate/OpenLegislation/blob/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fdao%2Fbill%2FSqlBillDao.java", "changes": 293, "contents_url": "https://api.github.com/repos/nysenate/OpenLegislation/contents/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fdao%2Fbill%2FSqlBillDao.java?ref=f89655fbb32c1372837f17bb6f7ed81f7a32c654", "deletions": 31, "filename": "src/main/java/gov/nysenate/openleg/dao/bill/SqlBillDao.java", "new_code": "import gov.nysenate.openleg.model.bill.BillAction;\nimport gov.nysenate.openleg.model.bill.BillAmendment;\nimport gov.nysenate.openleg.model.bill.BillId;\nimport org.springframework.dao.EmptyResultDataAccessException;\nimport org.springframework.jdbc.core.RowMapper;\nimport org.springframework.jdbc.core.namedparam.MapSqlParameterSource;\nimport java.sql.ResultSet;\nimport java.util.ArrayList;\nimport java.util.Collections;\nimport java.util.HashSet;\nimport java.util.List;\npublic class SqlBillDao extends SqlBaseDao implements BillDao\n /* --- Implemented Methods --- */\n\n @Override\n MapSqlParameterSource params = new MapSqlParameterSource();\n params.addValue(\"printNo\", printNo);\n params.addValue(\"sessionYear\", sessionYear);\n try {\n Bill bill = jdbcNamed.queryForObject(SqlBillQuery.SELECT_BILL_SQL.getSql(schema()), params, new BillRowMapper());\n List<BillAmendment> billAmendments =\n jdbcNamed.query(SqlBillQuery.SELECT_BILL_AMENDMENTS_SQL.getSql(schema()), params, new BillAmendmentRowMapper());\n for (BillAmendment amendment : billAmendments) {\n params.addValue(\"version\", amendment.getVersion());\n List<BillId> sameAsList =\n jdbcNamed.query(SqlBillQuery.SELECT_BILL_SAME_AS_SQL.getSql(schema()), params, new BillSameAsRowMapper());\n amendment.setSameAs(new HashSet<>(sameAsList));\n }\n List<BillAction> billActions =\n jdbcNamed.query(SqlBillQuery.SELECT_BILL_ACTIONS_SQL.getSql(schema()), params, new BillActionRowMapper());\n bill.addAmendments(billAmendments);\n bill.setActions(billActions);\n return bill;\n }\n catch (EmptyResultDataAccessException ex) {\n logger.debug(\"Bill \" + printNo + \"-\" + sessionYear + \" does not exist in database.\");\n return null;\n }\n }\n\n /**\n * {@inheritDoc}\n *\n * Updates information for an existing bill or creates new records if the bill is new.\n * Due to the normalized nature of the database it takes several queries to update all\n * the relevant pieces of data contained within the Bill object. The sobiFragment\n * reference is used to keep track of changes to the bill.\n */\n @Override\n public void updateBill(Bill bill, SOBIFragment sobiFragment) {\n // Update the bill record\n MapSqlParameterSource billParams = getBillParams(bill, sobiFragment);\n if (jdbcNamed.update(SqlBillQuery.UPDATE_BILL_SQL.getSql(schema()), billParams) == 0) {\n jdbcNamed.update(SqlBillQuery.INSERT_BILL_SQL.getSql(schema()), billParams);\n }\n // Update the bill amendments\n for (BillAmendment amendment : bill.getAmendmentList()) {\n MapSqlParameterSource amendParams = getBillAmendmentParams(amendment, sobiFragment);\n if (jdbcNamed.update(SqlBillQuery.UPDATE_BILL_AMENDMENT_SQL.getSql(schema()), amendParams) == 0) {\n jdbcNamed.update(SqlBillQuery.INSERT_BILL_AMENDMENT_SQL.getSql(schema()), amendParams);\n }\n // Update the same as bills\n List<BillId> existingSameAs =\n jdbcNamed.query(SqlBillQuery.SELECT_BILL_SAME_AS_SQL.getSql(schema()), amendParams, new BillSameAsRowMapper());\n if (existingSameAs.size() != amendment.getSameAs().size() || !existingSameAs.containsAll(amendment.getSameAs())) {\n jdbcNamed.update(SqlBillQuery.DELETE_SAME_AS_FOR_BILL_SQL.getSql(schema()), amendParams);\n for (BillId sameAsBillId : amendment.getSameAs()) {\n MapSqlParameterSource sameAsParams = getBillSameAsParams(amendment, sameAsBillId, sobiFragment);\n jdbcNamed.update(SqlBillQuery.INSERT_BILL_SAME_AS_SQL.getSql(schema()), sameAsParams);\n }\n }\n }\n // Determine which actions need to be inserted/deleted. Individual actions are not updated.\n List<BillAction> existingBillActions =\n jdbcNamed.query(SqlBillQuery.SELECT_BILL_ACTIONS_SQL.getSql(schema()), billParams, new BillActionRowMapper());\n List<BillAction> newBillActions = new ArrayList<>(bill.getActions());\n newBillActions.removeAll(existingBillActions); // New actions to insert\n existingBillActions.removeAll(bill.getActions()); // Old actions to delete\n // Delete actions that are not in the updated list\n for (BillAction action : existingBillActions) {\n MapSqlParameterSource actionParams = getBillActionParams(action, sobiFragment);\n jdbcNamed.update(SqlBillQuery.DELETE_BILL_ACTION_SQL.getSql(schema()), actionParams);\n }\n // Insert all new actions\n for (BillAction action : newBillActions) {\n MapSqlParameterSource actionParams = getBillActionParams(action, sobiFragment);\n jdbcNamed.update(SqlBillQuery.INSERT_BILL_ACTION_SQL.getSql(schema()), actionParams);\n }\n /** {@inheritDoc} */\n @Override\n public void deleteBill(Bill bill) {\n }\n /** {@inheritDoc} */\n @Override\n public void publishBill(Bill bill) {\n }\n /** {@inheritDoc} */\n @Override\n public void unPublishBill(Bill bill) {\n\n }\n\n /** {@inheritDoc} */\n @Override\n public void deleteAllBills() {\n\n }\n\n /** --- Helper Classes --- */\n\n private class BillRowMapper implements RowMapper<Bill>\n {\n @Override\n public Bill mapRow(ResultSet rs, int rowNum) throws SQLException {\n Bill bill = new Bill();\n bill.setPrintNo(rs.getString(\"print_no\"));\n bill.setSession(rs.getInt(\"session_year\"));\n bill.setTitle(rs.getString(\"title\"));\n bill.setLawSection(rs.getString(\"law_section\"));\n bill.setLaw(rs.getString(\"law_code\"));\n bill.setSummary(rs.getString(\"summary\"));\n bill.setActiveVersion(rs.getString(\"active_version\").trim());\n bill.setSponsor(null /** TODO */);\n bill.setYear(rs.getInt(\"active_year\"));\n bill.setModifiedDate(rs.getDate(\"modified_date_time\"));\n return bill;\n }\n }\n\n private class BillAmendmentRowMapper implements RowMapper<BillAmendment>\n {\n @Override\n public BillAmendment mapRow(ResultSet rs, int rowNum) throws SQLException {\n BillAmendment amend = new BillAmendment();\n amend.setBaseBillPrintNo(rs.getString(\"bill_print_no\"));\n amend.setSession(rs.getInt(\"bill_session_year\"));\n amend.setVersion(rs.getString(\"version\"));\n amend.setMemo(rs.getString(\"sponsor_memo\"));\n amend.setActClause(rs.getString(\"act_clause\"));\n amend.setFulltext(rs.getString(\"full_text\"));\n amend.setStricken(rs.getBoolean(\"stricken\"));\n amend.setCurrentCommittee(null); /** TODO */\n amend.setUniBill(rs.getBoolean(\"uni_bill\"));\n amend.setModifiedDate(rs.getDate(\"modified_date_time\"));\n amend.setPublishDate(rs.getDate(\"published_date_time\"));\n return amend;\n }\n }\n\n private class BillActionRowMapper implements RowMapper<BillAction>\n {\n @Override\n public BillAction mapRow(ResultSet rs, int rowNum) throws SQLException {\n BillAction billAction = new BillAction();\n billAction.setBaseBillPrintNo(rs.getString(\"bill_print_no\"));\n billAction.setAmendmentVersion(rs.getString(\"bill_amend_version\"));\n billAction.setSession(rs.getInt(\"bill_session_year\"));\n billAction.setDate(rs.getDate(\"effect_date\"));\n billAction.setText(rs.getString(\"text\"));\n billAction.setModifiedDate(rs.getDate(\"modified_date_time\"));\n billAction.setPublishDate(rs.getDate(\"published_date_time\"));\n return billAction;\n }\n }\n\n private class BillSameAsRowMapper implements RowMapper<BillId>\n {\n @Override\n public BillId mapRow(ResultSet rs, int rowNum) throws SQLException {\n return new BillId(rs.getString(\"same_as_bill_print_no\"), rs.getInt(\"same_as_session_year\"),\n rs.getString(\"same_as_amend_version\"));\n\n /** --- Internal Methods --- */\n\n /**\n * Returns a MapSqlParameterSource with columns mapped to Bill values for use in update/insert queries on\n * the bill table.\n * @param bill String\n * @return MapSqlParameterSource\n */\n private MapSqlParameterSource getBillParams(Bill bill, SOBIFragment fragment) {\n MapSqlParameterSource params = new MapSqlParameterSource();\n params.addValue(\"printNo\", bill.getPrintNo());\n params.addValue(\"sessionYear\", bill.getSession());\n params.addValue(\"title\", bill.getTitle());\n params.addValue(\"lawSection\", bill.getLawSection());\n params.addValue(\"lawCode\", bill.getLaw());\n params.addValue(\"summary\", bill.getSummary());\n params.addValue(\"activeVersion\", bill.getActiveVersion());\n params.addValue(\"sponsorId\", null /**TODO */);\n params.addValue(\"activeYear\", bill.getYear());\n params.addValue(\"modifiedDateTime\", toTimestamp(bill.getModifiedDate()));\n params.addValue(\"publishedDateTime\", toTimestamp(bill.getPublishDate()));\n addSOBIFragmentParams(fragment, params);\n return params;\n }\n\n /**\n * Returns a MapSqlParameterSource with columns mapped to BillAmendment values for use in update/insert\n * queries on the bill amendment table.\n * @param amendment BillAmendment\n * @param fragment SOBIFragment\n * @return MapSqlParameterSource\n */\n private MapSqlParameterSource getBillAmendmentParams(BillAmendment amendment, SOBIFragment fragment) {\n MapSqlParameterSource params = new MapSqlParameterSource();\n params.addValue(\"printNo\", amendment.getBaseBillPrintNo());\n params.addValue(\"sessionYear\", amendment.getSession());\n params.addValue(\"version\", amendment.getVersion());\n params.addValue(\"sponsorMemo\", amendment.getMemo());\n params.addValue(\"actClause\", amendment.getActClause());\n params.addValue(\"fullText\", amendment.getFulltext());\n params.addValue(\"stricken\", amendment.isStricken());\n params.addValue(\"currentCommitteeId\", null);\n params.addValue(\"uniBill\", amendment.isUniBill());\n params.addValue(\"modifiedDateTime\", toTimestamp(amendment.getModifiedDate()));\n params.addValue(\"publishedDateTime\", toTimestamp(amendment.getPublishDate()));\n addSOBIFragmentParams(fragment, params);\n return params;\n }\n\n /**\n * Returns a MapSqlParameterSource with columns mapped to BillAction for use in inserting records\n * into the bill action table.\n * @param billAction BillAction\n * @param fragment SOBIFragment\n * @return MapSqlParameterSource\n */\n private MapSqlParameterSource getBillActionParams(BillAction billAction, SOBIFragment fragment) {\n MapSqlParameterSource params = new MapSqlParameterSource();\n params.addValue(\"printNo\", billAction.getBaseBillPrintNo());\n params.addValue(\"sessionYear\", billAction.getSession());\n params.addValue(\"version\", billAction.getAmendmentVersion());\n params.addValue(\"effectDate\", billAction.getDate());\n params.addValue(\"text\", billAction.getText());\n params.addValue(\"modifiedDateTime\", toTimestamp(billAction.getModifiedDate()));\n params.addValue(\"publishedDateTime\", toTimestamp(billAction.getPublishDate()));\n addSOBIFragmentParams(fragment, params);\n return params;\n }\n\n private MapSqlParameterSource getBillSameAsParams(BillAmendment billAmendment, BillId sameAs, SOBIFragment fragment) {\n MapSqlParameterSource params = new MapSqlParameterSource();\n params.addValue(\"printNo\", billAmendment.getBaseBillPrintNo());\n params.addValue(\"sessionYear\", billAmendment.getSession());\n params.addValue(\"version\", billAmendment.getVersion());\n params.addValue(\"sameAsPrintNo\", sameAs.getBasePrintNo());\n params.addValue(\"sameAsSessionYear\", sameAs.getSession());\n params.addValue(\"sameAsVersion\", sameAs.getVersion());\n addSOBIFragmentParams(fragment, params);\n return params;\n }\n\n /**\n * Applies columns that identify a SOBIFragment to an existing MapSqlParameterSource.\n * @param fragment SOBIFragment\n * @param params MapSqlParameterSource\n */\n private void addSOBIFragmentParams(SOBIFragment fragment, MapSqlParameterSource params) {\n params.addValue(\"lastFragmentFileName\", fragment.getFileName());\n params.addValue(\"lastFragmentType\", fragment.getType().name());\n }", "new_methods": [ { "arguments": [ "Bill bill", " SOBIFragment sobiFragment" ], "filename": "src/main/java/gov/nysenate/openleg/dao/bill/SqlBillDao.java", "implementation": "// Update the bill record\n MapSqlParameterSource billParams = getBillParams(bill, sobiFragment);\n if (jdbcNamed.update(SqlBillQuery.UPDATE_BILL_SQL.getSql(schema()), billParams) == 0) {\n jdbcNamed.update(SqlBillQuery.INSERT_BILL_SQL.getSql(schema()), billParams);", "signature": "void updateBill(Bill bill, SOBIFragment sobiFragment)" }, { "arguments": [ "BillAction action : existingBillActions" ], "filename": "src/main/java/gov/nysenate/openleg/dao/bill/SqlBillDao.java", "implementation": "MapSqlParameterSource actionParams = getBillActionParams(action, sobiFragment);\n jdbcNamed.update(SqlBillQuery.DELETE_BILL_ACTION_SQL.getSql(schema()), actionParams);", "signature": "list\n for (BillAction action : existingBillActions)" }, { "arguments": [ "BillAction action : newBillActions" ], "filename": "src/main/java/gov/nysenate/openleg/dao/bill/SqlBillDao.java", "implementation": "MapSqlParameterSource actionParams = getBillActionParams(action, sobiFragment);\n jdbcNamed.update(SqlBillQuery.INSERT_BILL_ACTION_SQL.getSql(schema()), actionParams);", "signature": "actions\n for (BillAction action : newBillActions)" }, { "arguments": [ "Bill bill" ], "filename": "src/main/java/gov/nysenate/openleg/dao/bill/SqlBillDao.java", "implementation": "", "signature": "void deleteBill(Bill bill)" }, { "arguments": [ "Bill bill" ], "filename": "src/main/java/gov/nysenate/openleg/dao/bill/SqlBillDao.java", "implementation": "", "signature": "void publishBill(Bill bill)" }, { "arguments": [ "Bill bill" ], "filename": "src/main/java/gov/nysenate/openleg/dao/bill/SqlBillDao.java", "implementation": "", "signature": "void unPublishBill(Bill bill)" }, { "arguments": [], "filename": "src/main/java/gov/nysenate/openleg/dao/bill/SqlBillDao.java", "implementation": "", "signature": "void deleteAllBills()" }, { "arguments": [ "Bill bill", " SOBIFragment fragment" ], "filename": "src/main/java/gov/nysenate/openleg/dao/bill/SqlBillDao.java", "implementation": "MapSqlParameterSource params = new MapSqlParameterSource();\n params.addValue(\"printNo\", bill.getPrintNo());\n params.addValue(\"sessionYear\", bill.getSession());\n params.addValue(\"title\", bill.getTitle());\n params.addValue(\"lawSection\", bill.getLawSection());\n params.addValue(\"lawCode\", bill.getLaw());\n params.addValue(\"summary\", bill.getSummary());\n params.addValue(\"activeVersion\", bill.getActiveVersion());\n params.addValue(\"sponsorId\", null /**TODO */);\n params.addValue(\"activeYear\", bill.getYear());\n params.addValue(\"modifiedDateTime\", toTimestamp(bill.getModifiedDate()));\n params.addValue(\"publishedDateTime\", toTimestamp(bill.getPublishDate()));\n addSOBIFragmentParams(fragment, params);\n return params;", "signature": "MapSqlParameterSource getBillParams(Bill bill, SOBIFragment fragment)" }, { "arguments": [ "BillAmendment amendment", " SOBIFragment fragment" ], "filename": "src/main/java/gov/nysenate/openleg/dao/bill/SqlBillDao.java", "implementation": "MapSqlParameterSource params = new MapSqlParameterSource();\n params.addValue(\"printNo\", amendment.getBaseBillPrintNo());\n params.addValue(\"sessionYear\", amendment.getSession());\n params.addValue(\"version\", amendment.getVersion());\n params.addValue(\"sponsorMemo\", amendment.getMemo());\n params.addValue(\"actClause\", amendment.getActClause());\n params.addValue(\"fullText\", amendment.getFulltext());\n params.addValue(\"stricken\", amendment.isStricken());\n params.addValue(\"currentCommitteeId\", null);\n params.addValue(\"uniBill\", amendment.isUniBill());\n params.addValue(\"modifiedDateTime\", toTimestamp(amendment.getModifiedDate()));\n params.addValue(\"publishedDateTime\", toTimestamp(amendment.getPublishDate()));\n addSOBIFragmentParams(fragment, params);\n return params;", "signature": "MapSqlParameterSource getBillAmendmentParams(BillAmendment amendment, SOBIFragment fragment)" }, { "arguments": [ "BillAction billAction", " SOBIFragment fragment" ], "filename": "src/main/java/gov/nysenate/openleg/dao/bill/SqlBillDao.java", "implementation": "MapSqlParameterSource params = new MapSqlParameterSource();\n params.addValue(\"printNo\", billAction.getBaseBillPrintNo());\n params.addValue(\"sessionYear\", billAction.getSession());\n params.addValue(\"version\", billAction.getAmendmentVersion());\n params.addValue(\"effectDate\", billAction.getDate());\n params.addValue(\"text\", billAction.getText());\n params.addValue(\"modifiedDateTime\", toTimestamp(billAction.getModifiedDate()));\n params.addValue(\"publishedDateTime\", toTimestamp(billAction.getPublishDate()));\n addSOBIFragmentParams(fragment, params);\n return params;", "signature": "MapSqlParameterSource getBillActionParams(BillAction billAction, SOBIFragment fragment)" }, { "arguments": [ "BillAmendment billAmendment", " BillId sameAs", " SOBIFragment fragment" ], "filename": "src/main/java/gov/nysenate/openleg/dao/bill/SqlBillDao.java", "implementation": "MapSqlParameterSource params = new MapSqlParameterSource();\n params.addValue(\"printNo\", billAmendment.getBaseBillPrintNo());\n params.addValue(\"sessionYear\", billAmendment.getSession());\n params.addValue(\"version\", billAmendment.getVersion());\n params.addValue(\"sameAsPrintNo\", sameAs.getBasePrintNo());\n params.addValue(\"sameAsSessionYear\", sameAs.getSession());\n params.addValue(\"sameAsVersion\", sameAs.getVersion());\n addSOBIFragmentParams(fragment, params);\n return params;", "signature": "MapSqlParameterSource getBillSameAsParams(BillAmendment billAmendment, BillId sameAs, SOBIFragment fragment)" }, { "arguments": [ "SOBIFragment fragment", " MapSqlParameterSource params" ], "filename": "src/main/java/gov/nysenate/openleg/dao/bill/SqlBillDao.java", "implementation": "params.addValue(\"lastFragmentFileName\", fragment.getFileName());\n params.addValue(\"lastFragmentType\", fragment.getType().name());", "signature": "void addSOBIFragmentParams(SOBIFragment fragment, MapSqlParameterSource params)" } ], "old_code": "import java.sql.Timestamp;\npublic class SqlBillDao extends SqlBaseDao\n public SqlBillDao() {\n super(null);\n }\n\n return null;\n private static String UPDATE_BILL_SQL =\n \"UPDATE \" + DEFAULT_ENV_SCHEMA + \".bill \\n\" +\n \"SET title = ?, law_section = ?, summary = ?, active_version = ?, sponsor_id = ?, active_year = ?, \" +\n \" modified_date_time = ?, published_date_time = ? \\n\" +\n \"WHERE print_no = ? AND session_year = ?\";\n private static String INSERT_BILL_SQL =\n \"INSERT INTO \" + DEFAULT_ENV_SCHEMA + \".bill (print_no, session_year, title, law_section, summary, active_version, \" +\n \" sponsor_id, active_year, modified_date_time, published_date_time)\\n\" +\n \"SELECT ?, ?, ?, ?, ?, ?, ?, ?, ?, ? \\n\" +\n \"WHERE NOT EXISTS (SELECT 1 FROM \" + DEFAULT_ENV_SCHEMA + \".bill WHERE print_no = ? AND session_year = ?)\";\n public void saveBill(Bill bill, SOBIFragment sobiFragment) {\n if (bill != null) {\n /* try {\n runner.update(UPDATE_BILL_SQL, bill.getTitle(), bill.getLawSection(), bill.getSummary(), bill.getActiveVersion(),\n bill.getSponsor().getId(), bill.getYear(), new Timestamp(bill.getModifiedDate().getTime()),\n new Timestamp(bill.getPublishDate().getTime()), bill.getPrintNumber(), bill.getSession());\n runner.update(INSERT_BILL_SQL,\n bill.getPrintNumber(), bill.getSession(), bill.getTitle(), bill.getLawSection(),\n bill.getSummary(), bill.getActiveVersion(), bill.getSponsor().getId(), bill.getYear(),\n new Timestamp(bill.getModifiedDate().getTime()), new Timestamp(bill.getPublishDate().getTime()), bill.getPrintNumber(), bill.getSession());\n }\n catch (SQLException e) {\n logger.error(\"Failed to \", e);\n } */", "old_methods": [ { "arguments": [], "filename": "src/main/java/gov/nysenate/openleg/dao/bill/SqlBillDao.java", "implementation": "super(null);", "signature": "public SqlBillDao()" }, { "arguments": [ "Bill bill", " SOBIFragment sobiFragment" ], "filename": "src/main/java/gov/nysenate/openleg/dao/bill/SqlBillDao.java", "implementation": "if (bill != null) {\n /* try {\n runner.update(UPDATE_BILL_SQL, bill.getTitle(), bill.getLawSection(), bill.getSummary(), bill.getActiveVersion(),\n bill.getSponsor().getId(), bill.getYear(), new Timestamp(bill.getModifiedDate().getTime()),\n new Timestamp(bill.getPublishDate().getTime()), bill.getPrintNumber(), bill.getSession());\n runner.update(INSERT_BILL_SQL,\n bill.getPrintNumber(), bill.getSession(), bill.getTitle(), bill.getLawSection(),\n bill.getSummary(), bill.getActiveVersion(), bill.getSponsor().getId(), bill.getYear(),\n new Timestamp(bill.getModifiedDate().getTime()), new Timestamp(bill.getPublishDate().getTime()), bill.getPrintNumber(), bill.getSession());", "signature": "void saveBill(Bill bill, SOBIFragment sobiFragment)" } ], "patch": "@@ -3,56 +3,287 @@\n import gov.nysenate.openleg.Environment;\n import gov.nysenate.openleg.dao.base.SqlBaseDao;\n import gov.nysenate.openleg.model.bill.Bill;\n+import gov.nysenate.openleg.model.bill.BillAction;\n+import gov.nysenate.openleg.model.bill.BillAmendment;\n+import gov.nysenate.openleg.model.bill.BillId;\n import gov.nysenate.openleg.model.sobi.SOBIFragment;\n import org.apache.log4j.Logger;\n+import org.springframework.dao.EmptyResultDataAccessException;\n+import org.springframework.jdbc.core.RowMapper;\n+import org.springframework.jdbc.core.namedparam.MapSqlParameterSource;\n \n+import java.sql.ResultSet;\n import java.sql.SQLException;\n-import java.sql.Timestamp;\n+import java.util.ArrayList;\n+import java.util.Collections;\n+import java.util.HashSet;\n+import java.util.List;\n \n-public class SqlBillDao extends SqlBaseDao\n+public class SqlBillDao extends SqlBaseDao implements BillDao\n {\n private static Logger logger = Logger.getLogger(SqlBillDao.class);\n \n- public SqlBillDao() {\n- super(null);\n- }\n-\n public SqlBillDao(Environment environment) {\n super(environment);\n }\n \n+ /* --- Implemented Methods --- */\n+\n+ @Override\n public Bill getBill(String printNo, int sessionYear) {\n- return null;\n+ MapSqlParameterSource params = new MapSqlParameterSource();\n+ params.addValue(\"printNo\", printNo);\n+ params.addValue(\"sessionYear\", sessionYear);\n+ try {\n+ Bill bill = jdbcNamed.queryForObject(SqlBillQuery.SELECT_BILL_SQL.getSql(schema()), params, new BillRowMapper());\n+ List<BillAmendment> billAmendments =\n+ jdbcNamed.query(SqlBillQuery.SELECT_BILL_AMENDMENTS_SQL.getSql(schema()), params, new BillAmendmentRowMapper());\n+ for (BillAmendment amendment : billAmendments) {\n+ params.addValue(\"version\", amendment.getVersion());\n+ List<BillId> sameAsList =\n+ jdbcNamed.query(SqlBillQuery.SELECT_BILL_SAME_AS_SQL.getSql(schema()), params, new BillSameAsRowMapper());\n+ amendment.setSameAs(new HashSet<>(sameAsList));\n+ }\n+ List<BillAction> billActions =\n+ jdbcNamed.query(SqlBillQuery.SELECT_BILL_ACTIONS_SQL.getSql(schema()), params, new BillActionRowMapper());\n+ bill.addAmendments(billAmendments);\n+ bill.setActions(billActions);\n+ return bill;\n+ }\n+ catch (EmptyResultDataAccessException ex) {\n+ logger.debug(\"Bill \" + printNo + \"-\" + sessionYear + \" does not exist in database.\");\n+ return null;\n+ }\n+ }\n+\n+ /**\n+ * {@inheritDoc}\n+ *\n+ * Updates information for an existing bill or creates new records if the bill is new.\n+ * Due to the normalized nature of the database it takes several queries to update all\n+ * the relevant pieces of data contained within the Bill object. The sobiFragment\n+ * reference is used to keep track of changes to the bill.\n+ */\n+ @Override\n+ public void updateBill(Bill bill, SOBIFragment sobiFragment) {\n+ // Update the bill record\n+ MapSqlParameterSource billParams = getBillParams(bill, sobiFragment);\n+ if (jdbcNamed.update(SqlBillQuery.UPDATE_BILL_SQL.getSql(schema()), billParams) == 0) {\n+ jdbcNamed.update(SqlBillQuery.INSERT_BILL_SQL.getSql(schema()), billParams);\n+ }\n+ // Update the bill amendments\n+ for (BillAmendment amendment : bill.getAmendmentList()) {\n+ MapSqlParameterSource amendParams = getBillAmendmentParams(amendment, sobiFragment);\n+ if (jdbcNamed.update(SqlBillQuery.UPDATE_BILL_AMENDMENT_SQL.getSql(schema()), amendParams) == 0) {\n+ jdbcNamed.update(SqlBillQuery.INSERT_BILL_AMENDMENT_SQL.getSql(schema()), amendParams);\n+ }\n+ // Update the same as bills\n+ List<BillId> existingSameAs =\n+ jdbcNamed.query(SqlBillQuery.SELECT_BILL_SAME_AS_SQL.getSql(schema()), amendParams, new BillSameAsRowMapper());\n+ if (existingSameAs.size() != amendment.getSameAs().size() || !existingSameAs.containsAll(amendment.getSameAs())) {\n+ jdbcNamed.update(SqlBillQuery.DELETE_SAME_AS_FOR_BILL_SQL.getSql(schema()), amendParams);\n+ for (BillId sameAsBillId : amendment.getSameAs()) {\n+ MapSqlParameterSource sameAsParams = getBillSameAsParams(amendment, sameAsBillId, sobiFragment);\n+ jdbcNamed.update(SqlBillQuery.INSERT_BILL_SAME_AS_SQL.getSql(schema()), sameAsParams);\n+ }\n+ }\n+ }\n+ // Determine which actions need to be inserted/deleted. Individual actions are not updated.\n+ List<BillAction> existingBillActions =\n+ jdbcNamed.query(SqlBillQuery.SELECT_BILL_ACTIONS_SQL.getSql(schema()), billParams, new BillActionRowMapper());\n+ List<BillAction> newBillActions = new ArrayList<>(bill.getActions());\n+ newBillActions.removeAll(existingBillActions); // New actions to insert\n+ existingBillActions.removeAll(bill.getActions()); // Old actions to delete\n+ // Delete actions that are not in the updated list\n+ for (BillAction action : existingBillActions) {\n+ MapSqlParameterSource actionParams = getBillActionParams(action, sobiFragment);\n+ jdbcNamed.update(SqlBillQuery.DELETE_BILL_ACTION_SQL.getSql(schema()), actionParams);\n+ }\n+ // Insert all new actions\n+ for (BillAction action : newBillActions) {\n+ MapSqlParameterSource actionParams = getBillActionParams(action, sobiFragment);\n+ jdbcNamed.update(SqlBillQuery.INSERT_BILL_ACTION_SQL.getSql(schema()), actionParams);\n+ }\n }\n \n- private static String UPDATE_BILL_SQL =\n- \"UPDATE \" + DEFAULT_ENV_SCHEMA + \".bill \\n\" +\n- \"SET title = ?, law_section = ?, summary = ?, active_version = ?, sponsor_id = ?, active_year = ?, \" +\n- \" modified_date_time = ?, published_date_time = ? \\n\" +\n- \"WHERE print_no = ? AND session_year = ?\";\n+ /** {@inheritDoc} */\n+ @Override\n+ public void deleteBill(Bill bill) {\n \n- private static String INSERT_BILL_SQL =\n- \"INSERT INTO \" + DEFAULT_ENV_SCHEMA + \".bill (print_no, session_year, title, law_section, summary, active_version, \" +\n- \" sponsor_id, active_year, modified_date_time, published_date_time)\\n\" +\n- \"SELECT ?, ?, ?, ?, ?, ?, ?, ?, ?, ? \\n\" +\n- \"WHERE NOT EXISTS (SELECT 1 FROM \" + DEFAULT_ENV_SCHEMA + \".bill WHERE print_no = ? AND session_year = ?)\";\n+ }\n \n- public void saveBill(Bill bill, SOBIFragment sobiFragment) {\n- if (bill != null) {\n- /* try {\n+ /** {@inheritDoc} */\n+ @Override\n+ public void publishBill(Bill bill) {\n \n- runner.update(UPDATE_BILL_SQL, bill.getTitle(), bill.getLawSection(), bill.getSummary(), bill.getActiveVersion(),\n- bill.getSponsor().getId(), bill.getYear(), new Timestamp(bill.getModifiedDate().getTime()),\n- new Timestamp(bill.getPublishDate().getTime()), bill.getPrintNumber(), bill.getSession());\n+ }\n \n- runner.update(INSERT_BILL_SQL,\n- bill.getPrintNumber(), bill.getSession(), bill.getTitle(), bill.getLawSection(),\n- bill.getSummary(), bill.getActiveVersion(), bill.getSponsor().getId(), bill.getYear(),\n- new Timestamp(bill.getModifiedDate().getTime()), new Timestamp(bill.getPublishDate().getTime()), bill.getPrintNumber(), bill.getSession());\n- }\n- catch (SQLException e) {\n- logger.error(\"Failed to \", e);\n- } */\n+ /** {@inheritDoc} */\n+ @Override\n+ public void unPublishBill(Bill bill) {\n+\n+ }\n+\n+ /** {@inheritDoc} */\n+ @Override\n+ public void deleteAllBills() {\n+\n+ }\n+\n+ /** --- Helper Classes --- */\n+\n+ private class BillRowMapper implements RowMapper<Bill>\n+ {\n+ @Override\n+ public Bill mapRow(ResultSet rs, int rowNum) throws SQLException {\n+ Bill bill = new Bill();\n+ bill.setPrintNo(rs.getString(\"print_no\"));\n+ bill.setSession(rs.getInt(\"session_year\"));\n+ bill.setTitle(rs.getString(\"title\"));\n+ bill.setLawSection(rs.getString(\"law_section\"));\n+ bill.setLaw(rs.getString(\"law_code\"));\n+ bill.setSummary(rs.getString(\"summary\"));\n+ bill.setActiveVersion(rs.getString(\"active_version\").trim());\n+ bill.setSponsor(null /** TODO */);\n+ bill.setYear(rs.getInt(\"active_year\"));\n+ bill.setModifiedDate(rs.getDate(\"modified_date_time\"));\n+ return bill;\n+ }\n+ }\n+\n+ private class BillAmendmentRowMapper implements RowMapper<BillAmendment>\n+ {\n+ @Override\n+ public BillAmendment mapRow(ResultSet rs, int rowNum) throws SQLException {\n+ BillAmendment amend = new BillAmendment();\n+ amend.setBaseBillPrintNo(rs.getString(\"bill_print_no\"));\n+ amend.setSession(rs.getInt(\"bill_session_year\"));\n+ amend.setVersion(rs.getString(\"version\"));\n+ amend.setMemo(rs.getString(\"sponsor_memo\"));\n+ amend.setActClause(rs.getString(\"act_clause\"));\n+ amend.setFulltext(rs.getString(\"full_text\"));\n+ amend.setStricken(rs.getBoolean(\"stricken\"));\n+ amend.setCurrentCommittee(null); /** TODO */\n+ amend.setUniBill(rs.getBoolean(\"uni_bill\"));\n+ amend.setModifiedDate(rs.getDate(\"modified_date_time\"));\n+ amend.setPublishDate(rs.getDate(\"published_date_time\"));\n+ return amend;\n+ }\n+ }\n+\n+ private class BillActionRowMapper implements RowMapper<BillAction>\n+ {\n+ @Override\n+ public BillAction mapRow(ResultSet rs, int rowNum) throws SQLException {\n+ BillAction billAction = new BillAction();\n+ billAction.setBaseBillPrintNo(rs.getString(\"bill_print_no\"));\n+ billAction.setAmendmentVersion(rs.getString(\"bill_amend_version\"));\n+ billAction.setSession(rs.getInt(\"bill_session_year\"));\n+ billAction.setDate(rs.getDate(\"effect_date\"));\n+ billAction.setText(rs.getString(\"text\"));\n+ billAction.setModifiedDate(rs.getDate(\"modified_date_time\"));\n+ billAction.setPublishDate(rs.getDate(\"published_date_time\"));\n+ return billAction;\n+ }\n+ }\n+\n+ private class BillSameAsRowMapper implements RowMapper<BillId>\n+ {\n+ @Override\n+ public BillId mapRow(ResultSet rs, int rowNum) throws SQLException {\n+ return new BillId(rs.getString(\"same_as_bill_print_no\"), rs.getInt(\"same_as_session_year\"),\n+ rs.getString(\"same_as_amend_version\"));\n }\n }\n+\n+ /** --- Internal Methods --- */\n+\n+ /**\n+ * Returns a MapSqlParameterSource with columns mapped to Bill values for use in update/insert queries on\n+ * the bill table.\n+ * @param bill String\n+ * @return MapSqlParameterSource\n+ */\n+ private MapSqlParameterSource getBillParams(Bill bill, SOBIFragment fragment) {\n+ MapSqlParameterSource params = new MapSqlParameterSource();\n+ params.addValue(\"printNo\", bill.getPrintNo());\n+ params.addValue(\"sessionYear\", bill.getSession());\n+ params.addValue(\"title\", bill.getTitle());\n+ params.addValue(\"lawSection\", bill.getLawSection());\n+ params.addValue(\"lawCode\", bill.getLaw());\n+ params.addValue(\"summary\", bill.getSummary());\n+ params.addValue(\"activeVersion\", bill.getActiveVersion());\n+ params.addValue(\"sponsorId\", null /**TODO */);\n+ params.addValue(\"activeYear\", bill.getYear());\n+ params.addValue(\"modifiedDateTime\", toTimestamp(bill.getModifiedDate()));\n+ params.addValue(\"publishedDateTime\", toTimestamp(bill.getPublishDate()));\n+ addSOBIFragmentParams(fragment, params);\n+ return params;\n+ }\n+\n+ /**\n+ * Returns a MapSqlParameterSource with columns mapped to BillAmendment values for use in update/insert\n+ * queries on the bill amendment table.\n+ * @param amendment BillAmendment\n+ * @param fragment SOBIFragment\n+ * @return MapSqlParameterSource\n+ */\n+ private MapSqlParameterSource getBillAmendmentParams(BillAmendment amendment, SOBIFragment fragment) {\n+ MapSqlParameterSource params = new MapSqlParameterSource();\n+ params.addValue(\"printNo\", amendment.getBaseBillPrintNo());\n+ params.addValue(\"sessionYear\", amendment.getSession());\n+ params.addValue(\"version\", amendment.getVersion());\n+ params.addValue(\"sponsorMemo\", amendment.getMemo());\n+ params.addValue(\"actClause\", amendment.getActClause());\n+ params.addValue(\"fullText\", amendment.getFulltext());\n+ params.addValue(\"stricken\", amendment.isStricken());\n+ params.addValue(\"currentCommitteeId\", null);\n+ params.addValue(\"uniBill\", amendment.isUniBill());\n+ params.addValue(\"modifiedDateTime\", toTimestamp(amendment.getModifiedDate()));\n+ params.addValue(\"publishedDateTime\", toTimestamp(amendment.getPublishDate()));\n+ addSOBIFragmentParams(fragment, params);\n+ return params;\n+ }\n+\n+ /**\n+ * Returns a MapSqlParameterSource with columns mapped to BillAction for use in inserting records\n+ * into the bill action table.\n+ * @param billAction BillAction\n+ * @param fragment SOBIFragment\n+ * @return MapSqlParameterSource\n+ */\n+ private MapSqlParameterSource getBillActionParams(BillAction billAction, SOBIFragment fragment) {\n+ MapSqlParameterSource params = new MapSqlParameterSource();\n+ params.addValue(\"printNo\", billAction.getBaseBillPrintNo());\n+ params.addValue(\"sessionYear\", billAction.getSession());\n+ params.addValue(\"version\", billAction.getAmendmentVersion());\n+ params.addValue(\"effectDate\", billAction.getDate());\n+ params.addValue(\"text\", billAction.getText());\n+ params.addValue(\"modifiedDateTime\", toTimestamp(billAction.getModifiedDate()));\n+ params.addValue(\"publishedDateTime\", toTimestamp(billAction.getPublishDate()));\n+ addSOBIFragmentParams(fragment, params);\n+ return params;\n+ }\n+\n+ private MapSqlParameterSource getBillSameAsParams(BillAmendment billAmendment, BillId sameAs, SOBIFragment fragment) {\n+ MapSqlParameterSource params = new MapSqlParameterSource();\n+ params.addValue(\"printNo\", billAmendment.getBaseBillPrintNo());\n+ params.addValue(\"sessionYear\", billAmendment.getSession());\n+ params.addValue(\"version\", billAmendment.getVersion());\n+ params.addValue(\"sameAsPrintNo\", sameAs.getBasePrintNo());\n+ params.addValue(\"sameAsSessionYear\", sameAs.getSession());\n+ params.addValue(\"sameAsVersion\", sameAs.getVersion());\n+ addSOBIFragmentParams(fragment, params);\n+ return params;\n+ }\n+\n+ /**\n+ * Applies columns that identify a SOBIFragment to an existing MapSqlParameterSource.\n+ * @param fragment SOBIFragment\n+ * @param params MapSqlParameterSource\n+ */\n+ private void addSOBIFragmentParams(SOBIFragment fragment, MapSqlParameterSource params) {\n+ params.addValue(\"lastFragmentFileName\", fragment.getFileName());\n+ params.addValue(\"lastFragmentType\", fragment.getType().name());\n+ }\n }", "raw_url": "https://github.com/nysenate/OpenLegislation/raw/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fdao%2Fbill%2FSqlBillDao.java", "sha": "b8e7d514ba9e18cbf9b7b2b63ac9ba1764c6bdec", "status": "modified" }, { "additions": 7, "blob_url": "https://github.com/nysenate/OpenLegislation/blob/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fdao%2Fsobi%2FSOBIFileDao.java", "changes": 7, "contents_url": "https://api.github.com/repos/nysenate/OpenLegislation/contents/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fdao%2Fsobi%2FSOBIFileDao.java?ref=f89655fbb32c1372837f17bb6f7ed81f7a32c654", "deletions": 0, "filename": "src/main/java/gov/nysenate/openleg/dao/sobi/SOBIFileDao.java", "new_code": " *\n * A typical call stack when processing SOBI files could look like the following:\n * 1. stageSOBIFiles(true) - Stage new files for processing\n * 2. getPendingSOBIFiles(SortOrder.ASC) - Retrieve those new files\n * 3. [ Do some processing ] - Create and process SOBIFragments somewhere\n * 4. updateSOBIFile(..) - Update record after processing for the file is done\n * If the record doesn't already exist, no action will be taken.", "new_methods": [], "old_code": "", "old_methods": [], "patch": "@@ -10,6 +10,12 @@\n \n /**\n * DAO interface for managing and persisting SOBIFiles.\n+ *\n+ * A typical call stack when processing SOBI files could look like the following:\n+ * 1. stageSOBIFiles(true) - Stage new files for processing\n+ * 2. getPendingSOBIFiles(SortOrder.ASC) - Retrieve those new files\n+ * 3. [ Do some processing ] - Create and process SOBIFragments somewhere\n+ * 4. updateSOBIFile(..) - Update record after processing for the file is done\n */\n public interface SOBIFileDao\n {\n@@ -70,6 +76,7 @@ public interface SOBIFileDao\n \n /**\n * Updates an existing SOBIFile in the backing store with the given instance.\n+ * If the record doesn't already exist, no action will be taken.\n *\n * @param sobiFile SOBIFile\n * @return boolean - true if record was updated, false if nothing was updated", "raw_url": "https://github.com/nysenate/OpenLegislation/raw/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fdao%2Fsobi%2FSOBIFileDao.java", "sha": "b02b83ac12df33822545ae9365c621ef53f31afc", "status": "modified" }, { "additions": 25, "blob_url": "https://github.com/nysenate/OpenLegislation/blob/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fdao%2Fsobi%2FSOBIFragmentDao.java", "changes": 32, "contents_url": "https://api.github.com/repos/nysenate/OpenLegislation/contents/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fdao%2Fsobi%2FSOBIFragmentDao.java?ref=f89655fbb32c1372837f17bb6f7ed81f7a32c654", "deletions": 7, "filename": "src/main/java/gov/nysenate/openleg/dao/sobi/SOBIFragmentDao.java", "new_code": "import gov.nysenate.openleg.dao.base.SortOrder;\nimport gov.nysenate.openleg.model.sobi.SOBIFile;\nimport gov.nysenate.openleg.model.sobi.SOBIFragmentType;\nimport java.util.List;\n\n/**\n * DAO interface for managing and persisting SOBIFragments.\n */\n /** --- Retrieval Methods --- */\n\n public SOBIFragment getSOBIFragment(SOBIFragmentType fragmentType, String fragmentFileName);\n\n public List<SOBIFragment> getSOBIFragments(SOBIFile sobiFile, SortOrder order);\n\n public List<SOBIFragment> getSOBIFragments(SOBIFile sobiFile, SOBIFragmentType fragmentType, SortOrder order);\n\n /** --- Processing/Insertion Methods --- */\n\n * Persist the sobi fragments into the backing store. It is assumed that the SOBIFile objects have already\n * been staged otherwise the fragment cannot be recorded.\n * @param fragments List<SOBIFragment>\n public void saveSOBIFragments(List<SOBIFragment> fragments);\n * Delete the fragments that were generated for the given sobiFile.\n * @param sobiFile SOBIFile\n public void deleteSOBIFragments(SOBIFile sobiFile);", "new_methods": [], "old_code": " *\n * @param fragmentFileName\n * @return\n public SOBIFragment getSOBIFragmentByFileName(String fragmentFileName);\n *\n * @param fragment\n public void saveSOBIFragment(SOBIFragment fragment);", "old_methods": [], "patch": "@@ -1,19 +1,37 @@\n package gov.nysenate.openleg.dao.sobi;\n \n+import gov.nysenate.openleg.dao.base.SortOrder;\n+import gov.nysenate.openleg.model.sobi.SOBIFile;\n import gov.nysenate.openleg.model.sobi.SOBIFragment;\n+import gov.nysenate.openleg.model.sobi.SOBIFragmentType;\n \n+import java.util.List;\n+\n+/**\n+ * DAO interface for managing and persisting SOBIFragments.\n+ */\n public interface SOBIFragmentDao\n {\n+ /** --- Retrieval Methods --- */\n+\n+ public SOBIFragment getSOBIFragment(SOBIFragmentType fragmentType, String fragmentFileName);\n+\n+ public List<SOBIFragment> getSOBIFragments(SOBIFile sobiFile, SortOrder order);\n+\n+ public List<SOBIFragment> getSOBIFragments(SOBIFile sobiFile, SOBIFragmentType fragmentType, SortOrder order);\n+\n+ /** --- Processing/Insertion Methods --- */\n+\n /**\n- *\n- * @param fragmentFileName\n- * @return\n+ * Persist the sobi fragments into the backing store. It is assumed that the SOBIFile objects have already\n+ * been staged otherwise the fragment cannot be recorded.\n+ * @param fragments List<SOBIFragment>\n */\n- public SOBIFragment getSOBIFragmentByFileName(String fragmentFileName);\n+ public void saveSOBIFragments(List<SOBIFragment> fragments);\n \n /**\n- *\n- * @param fragment\n+ * Delete the fragments that were generated for the given sobiFile.\n+ * @param sobiFile SOBIFile\n */\n- public void saveSOBIFragment(SOBIFragment fragment);\n+ public void deleteSOBIFragments(SOBIFile sobiFile);\n }", "raw_url": "https://github.com/nysenate/OpenLegislation/raw/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fdao%2Fsobi%2FSOBIFragmentDao.java", "sha": "5b8b3b6d015211128e7fa11a10164fa92ad96170", "status": "modified" }, { "additions": 107, "blob_url": "https://github.com/nysenate/OpenLegislation/blob/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fdao%2Fsobi%2FSqlSOBIFileDao.java", "changes": 248, "contents_url": "https://api.github.com/repos/nysenate/OpenLegislation/contents/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fdao%2Fsobi%2FSqlSOBIFileDao.java?ref=f89655fbb32c1372837f17bb6f7ed81f7a32c654", "deletions": 141, "filename": "src/main/java/gov/nysenate/openleg/dao/sobi/SqlSOBIFileDao.java", "new_code": "import org.springframework.dao.DuplicateKeyException;\nimport java.io.FileNotFoundException;\n \"INSERT INTO \" + table(SOBI_FILE_TABLE) + \"\\n\" +\n \"(file_name, published_date_time, staged_date_time, processed_date_time, processed_count, pending_processing) \" +\n \"VALUES (:fileName, :publishedDateTime, :stagedDateTime, :processedDateTime, :processedCount, :pendingProcessing)\";\n \" staged_date_time = :stagedDateTime,\" +\n return jdbcNamed.queryForObject(GET_SOBI_FILES_BY_FILE_NAMES_SQL, params, new SOBIFileRowMapper());\n List<SOBIFile> sobiList = jdbcNamed.query(GET_SOBI_FILES_BY_FILE_NAMES_SQL, params, new SOBIFileRowMapper());\n for (SOBIFile sobiFile : sobiList) {\n sobiFileMap.put(sobiFile.getFileName(), sobiFile);\n return jdbcNamed.query(GET_SOBI_FILES_DURING_SQL + orderBy(\"published_date_time\", sortByPubDate),\n params, new SOBIFileRowMapper());\n return jdbc.query(GET_PENDING_SOBI_FILES_SQL + orderBy(\"published_date_time\", sortByPubDate), new SOBIFileRowMapper());\n sobiFile.setStagedDateTime(new Date());\n moveFileToWorking(file);\n catch (DuplicateKeyException ex) {\n existingSOBIFile.setStagedDateTime(new Date());\n existingSOBIFile.setPendingProcessing(true);\n updateSOBIFile(existingSOBIFile);\n moveFileToWorking(file);\n filesStaged++;\n logger.debug(\"Re-staged \" + existingSOBIFile + \" with latest file contents.\");\n logger.debug(\"Ignoring \" + sobiFile + \" since re-staging is disabled and file was previously processed.\");\n int affected = updateSOBIMetadataInDatabase(sobiFile);\n if (!sobiFile.isPendingProcessing()) {\n File workFile = getFileInWorkingDirectory(sobiFile.getFileName());\n if (workFile.exists()) {\n moveFiletoArchive(workFile, sobiFile.getPublishedDateTime());\n }\n }\n /**\n * Maps rows from the sobi table to SOBIFile objects.\n */\n protected class SOBIFileRowMapper implements RowMapper<SOBIFile> {\n private String pfx = \"\";\n\n public SOBIFileRowMapper(){}\n public SOBIFileRowMapper(String pfx) {\n this.pfx = pfx;\n @Override\n public SOBIFile mapRow(ResultSet rs, int rowNum) throws SQLException {\n String fileName = rs.getString(pfx + \"file_name\");\n Date publishedDateTime = rs.getDate(pfx + \"published_date_time\");\n boolean pendingProcessing = rs.getBoolean(pfx + \"pending_processing\");\n File file = getSOBIFileFromFileSystem(fileName, publishedDateTime, pendingProcessing);\n try {\n SOBIFile sobiFile = new SOBIFile(file);\n sobiFile.setPendingProcessing(pendingProcessing);\n sobiFile.setProcessedDateTime(rs.getDate(pfx + \"processed_date_time\"));\n sobiFile.setProcessedCount(rs.getInt(pfx + \"processed_count\"));\n return sobiFile;\n catch (FileNotFoundException ex) {\n logger.error(\"SOBI file \" + rs.getString(\"file_name\") + \" was not found in the expected location! \\n\" +\n \"This could be a result of modifications to the sobi file directory that were not synced with \" +\n \"the database. \", ex);\n }\n catch (IOException ex) {\n logger.error(ex);\n }\n return null;\n /** --- Internal Methods --- */\n\n jdbcNamed.update(INSERT_SOBI_FILE, getSOBIInsertUpdateParams(sobiFile));\n }\n\n /**\n * Updates the metadata of the SOBIFile into the database.\n * @throws java.lang.IllegalArgumentException if sobiFile is null\n */\n private int updateSOBIMetadataInDatabase(SOBIFile sobiFile) throws DataAccessException {\n return jdbcNamed.update(UPDATE_SOBI_FILE, getSOBIInsertUpdateParams(sobiFile));\n private File getSOBIFileFromFileSystem(String fileName, Date publishedDateTime, boolean pendingProcessing) {\n return (pendingProcessing) ? getFileInWorkingDirectory(fileName) : getFileInArchiveDirectory(fileName, publishedDateTime);\n * Moves the file into the working SOBI file directory.\n * @param file File\n private void moveFileToWorking(File file) throws IOException {\n File workingFile = getFileInWorkingDirectory(file.getName());\n if (workingFile.exists()) {\n FileUtils.deleteQuietly(workingFile);\n FileUtils.moveFile(file, workingFile);\n }\n\n /**\n * Moves the file into the archive SOBI file directory.\n * @param file File\n */\n private void moveFiletoArchive(File file, Date publishedDateTime) throws IOException {\n File archiveFile = getFileInArchiveDirectory(file.getName(), publishedDateTime);\n if (archiveFile.exists()) {\n FileUtils.deleteQuietly(archiveFile);\n FileUtils.moveFile(file, archiveFile);\n }\n\n /**\n * Delete any traces of the SOBI file (either in work or archive directory) from the file system.\n * @param fileName String\n * @param publishedDateTime Date\n */\n private void deleteSOBIFileFromFileSystem(String fileName, Date publishedDateTime) {\n FileUtils.deleteQuietly(getFileInWorkingDirectory(fileName));\n FileUtils.deleteQuietly(getFileInArchiveDirectory(fileName, publishedDateTime));\n * @param publishedDateTime Date\n private File getFileInArchiveDirectory(String fileName, Date publishedDateTime) {\n String year = Integer.toString(new LocalDate(publishedDateTime).getYear());\n * Returns a MapSqlParameterSource with columns mapped to SOBIFile values for use in update/insert queries.\n params.addValue(\"stagedDateTime\", toTimestamp(sobiFile.getStagedDateTime()));\n}", "new_methods": [ { "arguments": [], "filename": "src/main/java/gov/nysenate/openleg/dao/sobi/SqlSOBIFileDao.java", "implementation": "", "signature": "public SOBIFileRowMapper()" }, { "arguments": [ "String pfx" ], "filename": "src/main/java/gov/nysenate/openleg/dao/sobi/SqlSOBIFileDao.java", "implementation": "this.pfx = pfx;\n @Override\n public SOBIFile mapRow(ResultSet rs, int rowNum) throws SQLException {\n String fileName = rs.getString(pfx + \"file_name\");\n Date publishedDateTime = rs.getDate(pfx + \"published_date_time\");\n boolean pendingProcessing = rs.getBoolean(pfx + \"pending_processing\");\n File file = getSOBIFileFromFileSystem(fileName, publishedDateTime, pendingProcessing);\n try {\n SOBIFile sobiFile = new SOBIFile(file);\n sobiFile.setPendingProcessing(pendingProcessing);\n sobiFile.setProcessedDateTime(rs.getDate(pfx + \"processed_date_time\"));\n sobiFile.setProcessedCount(rs.getInt(pfx + \"processed_count\"));\n return sobiFile;\n catch (FileNotFoundException ex) {\n logger.error(\"SOBI file \" + rs.getString(\"file_name\") + \" was not found in the expected location! \\n\" +\n \"This could be a result of modifications to the sobi file directory that were not synced with \" +\n \"the database. \", ex);", "signature": "public SOBIFileRowMapper(String pfx)" }, { "arguments": [ "String fileName", " Date publishedDateTime", " boolean pendingProcessing" ], "filename": "src/main/java/gov/nysenate/openleg/dao/sobi/SqlSOBIFileDao.java", "implementation": "return (pendingProcessing) ? getFileInWorkingDirectory(fileName) : getFileInArchiveDirectory(fileName, publishedDateTime);\n * Moves the file into the working SOBI file directory.\n * @param file File\n private void moveFileToWorking(File file) throws IOException {\n File workingFile = getFileInWorkingDirectory(file.getName());\n if (workingFile.exists()) {\n FileUtils.deleteQuietly(workingFile);\n FileUtils.moveFile(file, workingFile);", "signature": "File getSOBIFileFromFileSystem(String fileName, Date publishedDateTime, boolean pendingProcessing)" }, { "arguments": [ "String fileName", " Date publishedDateTime" ], "filename": "src/main/java/gov/nysenate/openleg/dao/sobi/SqlSOBIFileDao.java", "implementation": "FileUtils.deleteQuietly(getFileInWorkingDirectory(fileName));\n FileUtils.deleteQuietly(getFileInArchiveDirectory(fileName, publishedDateTime));\n * @param publishedDateTime Date\n private File getFileInArchiveDirectory(String fileName, Date publishedDateTime) {\n String year = Integer.toString(new LocalDate(publishedDateTime).getYear());\n * Returns a MapSqlParameterSource with columns mapped to SOBIFile values for use in update/insert queries.\n params.addValue(\"stagedDateTime\", toTimestamp(sobiFile.getStagedDateTime()));", "signature": "void deleteSOBIFileFromFileSystem(String fileName, Date publishedDateTime)" } ], "old_code": "import org.springframework.dao.DataIntegrityViolationException;\nimport org.springframework.dao.IncorrectResultSizeDataAccessException;\nimport static gov.nysenate.openleg.util.FileHelper.moveFileToDirectory;\n \"INSERT INTO \" + table(SOBI_FILE_TABLE) + \" (file_name, published_date_time, processed_date_time, processed_count, pending_processing) \" +\n \"VALUES (:fileName, :publishedDateTime, :processedDateTime, :processedCount, :pendingProcessing)\";\n try {\n SOBIMetadata metaData = jdbcNamed.queryForObject(GET_SOBI_FILES_BY_FILE_NAMES_SQL, params, new SOBIMetadata.Mapper());\n sobiFile = new SOBIFile(getSOBIFileFromFileSystem(metaData));\n metaData.applyToSOBIFile(sobiFile);\n }\n catch (IncorrectResultSizeDataAccessException ex) {\n logger.debug(\"No sobi details were found in database for \" + fileName, ex);\n }\n catch (IOException ex) {\n logger.error(\"Possible inconsistency between file system and database! \" +\n \"Failed to construct SOBIFile instance with file name \" + fileName, ex);\n }\n return sobiFile;\n List<SOBIMetadata> metaDataList = jdbcNamed.query(GET_SOBI_FILES_BY_FILE_NAMES_SQL, params, new SOBIMetadata.Mapper());\n try {\n for (SOBIMetadata metaData : metaDataList) {\n SOBIFile sobiFile = new SOBIFile(getSOBIFileFromFileSystem(metaData));\n metaData.applyToSOBIFile(sobiFile);\n sobiFileMap.put(sobiFile.getFileName(), sobiFile);\n }\n }\n catch (IOException ex) {\n logger.error(\"Failed to construct SOBIFile instance!\", ex);\n return null;\n List<SOBIMetadata> metaDataList = jdbcNamed.query(GET_SOBI_FILES_DURING_SQL + orderBy(\"published_date_time\", sortByPubDate),\n params, new SOBIMetadata.Mapper());\n return getSobiFileListFromMetaDataList(metaDataList);\n List<SOBIMetadata> metaDataList =\n jdbc.query(GET_PENDING_SOBI_FILES_SQL + orderBy(\"published_date_time\", sortByPubDate), new SOBIMetadata.Mapper());\n return getSobiFileListFromMetaDataList(metaDataList);\n\n if (!file.delete()) {\n logger.fatal(\"Failed to delete \" + file.getAbsoluteFile() + \" from the sobi staging directory!\");\n }\n updateSOBIFileInFileSystem(sobiFile);\n catch(DataIntegrityViolationException ex) {\n File existingFile = getSOBIFileFromFileSystem(existingSOBIFile);\n if (existingFile.exists()) {\n moveFileToDirectory(file, this.workingSobiDir, true);\n existingSOBIFile.setPendingProcessing(true);\n updateSOBIFile(existingSOBIFile);\n filesStaged++;\n logger.debug(\"Re-staged \" + existingSOBIFile + \" with latest file contents.\");\n }\n else {\n logger.warn(\"Attempted to re-stage \" + existingSOBIFile + \" but the file \" +\n existingFile.getAbsolutePath() + \" doesn't exist!\");\n }\n logger.debug(\"Skipping \" + sobiFile + \" since re-staging is disabled.\");\n int affected = jdbcNamed.update(UPDATE_SOBI_FILE, getSOBIInsertUpdateParams(sobiFile));\n updateSOBIFileInFileSystem(sobiFile);\n /** Models the processing details for a sobi file which is stored in the database */\n protected static class SOBIMetadata {\n String fileName;\n Date publishedDateTime;\n Date processedDateTime;\n boolean pendingProcessing;\n int processedCount;\n\n /** Apply metadata info to SOBIFile */\n void applyToSOBIFile(SOBIFile sobiFile) {\n sobiFile.setProcessedDateTime(this.processedDateTime);\n sobiFile.setPendingProcessing(this.pendingProcessing);\n sobiFile.setProcessedCount(this.processedCount);\n /** Row Mapper implementation */\n static class Mapper implements RowMapper<SOBIMetadata> {\n @Override\n public SOBIMetadata mapRow(ResultSet rs, int rowNum) throws SQLException {\n SOBIMetadata metadata = new SOBIMetadata();\n metadata.fileName = rs.getString(\"file_name\");\n metadata.publishedDateTime = rs.getDate(\"published_date_time\");\n metadata.processedDateTime = rs.getDate(\"processed_date_time\");\n metadata.pendingProcessing = rs.getBoolean(\"pending_processing\");\n metadata.processedCount = rs.getInt(\"processed_count\");\n return metadata;\n if (sobiFile != null) {\n jdbcNamed.update(INSERT_SOBI_FILE, getSOBIInsertUpdateParams(sobiFile));\n }\n else {\n throw new IllegalArgumentException(\"Supplied SOBIFile object is null. Cannot persist to database.\");\n }\n private File getSOBIFileFromFileSystem(String fileName, Date publishedDate, boolean pendingProcessing) {\n return (pendingProcessing) ? getFileInWorkingDirectory(fileName) : getFileInArchiveDirectory(fileName, publishedDate);\n }\n\n /** Overload for convenience. @see #getSOBIFileFromFileSystem(String, java.util.Date, boolean) */\n private File getSOBIFileFromFileSystem(SOBIMetadata metaData) {\n return getSOBIFileFromFileSystem(metaData.fileName, metaData.publishedDateTime, metaData.pendingProcessing);\n * Deletes the actual SOBI file from the file system and writes the contents of SOBIFile to the appropriate directory.\n * @param sobiFile SOBIFile\n * @return File - Newly written file.\n * @throws IOException\n private File updateSOBIFileInFileSystem(SOBIFile sobiFile) throws IOException {\n File workFile = getFileInWorkingDirectory(sobiFile.getFileName());\n File archiveFile = getFileInArchiveDirectory(sobiFile.getFileName(), sobiFile.getPublishedDateTime());\n\n // Delete the file from any possible directory so we don't have to keep track of where it is.\n FileUtils.deleteQuietly(workFile);\n FileUtils.deleteQuietly(archiveFile);\n\n if (sobiFile.isPendingProcessing()) {\n // Write to the working directory.\n FileUtils.write(workFile, sobiFile.getText());\n return workFile;\n else {\n // Create any sub directories just to be safe and write to archive directory.\n archiveFile.getParentFile().mkdirs();\n FileUtils.write(archiveFile, sobiFile.getText());\n return archiveFile;\n * @param publishedDate Date\n private File getFileInArchiveDirectory(String fileName, Date publishedDate) {\n LocalDate localDate = new LocalDate(publishedDate);\n String year = Integer.toString(localDate.getYear());\n * Convenience method to convert a list of SOBIMetaData objects into SOBIFile objects.\n * @param metaDataList List<SOBIMetaData>\n * @return List<SOBIFile>\n */\n private List<SOBIFile> getSobiFileListFromMetaDataList(List<SOBIMetadata> metaDataList) {\n List<SOBIFile> sobiFiles = new ArrayList<>();\n try {\n for (SOBIMetadata metaData : metaDataList) {\n SOBIFile sobiFile = new SOBIFile(getSOBIFileFromFileSystem(metaData));\n metaData.applyToSOBIFile(sobiFile);\n sobiFiles.add(sobiFile);\n }\n }\n catch (IOException ex) {\n logger.error(\"Failed to construct SOBIFile instance!\", ex);\n return null;\n }\n return sobiFiles;\n }\n\n /**\n * Returns a ParameterSource with columns mapped to SOBIFile values for use in update/insert queries.\n}", "old_methods": [ { "arguments": [ "SOBIFile sobiFile" ], "filename": "src/main/java/gov/nysenate/openleg/dao/sobi/SqlSOBIFileDao.java", "implementation": "sobiFile.setProcessedDateTime(this.processedDateTime);\n sobiFile.setPendingProcessing(this.pendingProcessing);\n sobiFile.setProcessedCount(this.processedCount);\n /** Row Mapper implementation */\n static class Mapper implements RowMapper<SOBIMetadata> {\n @Override\n public SOBIMetadata mapRow(ResultSet rs, int rowNum) throws SQLException {\n SOBIMetadata metadata = new SOBIMetadata();\n metadata.fileName = rs.getString(\"file_name\");\n metadata.publishedDateTime = rs.getDate(\"published_date_time\");\n metadata.processedDateTime = rs.getDate(\"processed_date_time\");\n metadata.pendingProcessing = rs.getBoolean(\"pending_processing\");\n metadata.processedCount = rs.getInt(\"processed_count\");\n return metadata;\n if (sobiFile != null) {\n jdbcNamed.update(INSERT_SOBI_FILE, getSOBIInsertUpdateParams(sobiFile));", "signature": "void applyToSOBIFile(SOBIFile sobiFile)" }, { "arguments": [ "String fileName", " Date publishedDate", " boolean pendingProcessing" ], "filename": "src/main/java/gov/nysenate/openleg/dao/sobi/SqlSOBIFileDao.java", "implementation": "return (pendingProcessing) ? getFileInWorkingDirectory(fileName) : getFileInArchiveDirectory(fileName, publishedDate);", "signature": "File getSOBIFileFromFileSystem(String fileName, Date publishedDate, boolean pendingProcessing)" }, { "arguments": [ "SOBIMetadata metaData" ], "filename": "src/main/java/gov/nysenate/openleg/dao/sobi/SqlSOBIFileDao.java", "implementation": "return getSOBIFileFromFileSystem(metaData.fileName, metaData.publishedDateTime, metaData.pendingProcessing);\n * Deletes the actual SOBI file from the file system and writes the contents of SOBIFile to the appropriate directory.\n * @param sobiFile SOBIFile\n * @return File - Newly written file.\n * @throws IOException\n private File updateSOBIFileInFileSystem(SOBIFile sobiFile) throws IOException {\n File workFile = getFileInWorkingDirectory(sobiFile.getFileName());\n File archiveFile = getFileInArchiveDirectory(sobiFile.getFileName(), sobiFile.getPublishedDateTime());\n\n // Delete the file from any possible directory so we don't have to keep track of where it is.\n FileUtils.deleteQuietly(workFile);\n FileUtils.deleteQuietly(archiveFile);\n\n if (sobiFile.isPendingProcessing()) {\n // Write to the working directory.\n FileUtils.write(workFile, sobiFile.getText());\n return workFile;\n else {\n // Create any sub directories just to be safe and write to archive directory.\n archiveFile.getParentFile().mkdirs();\n FileUtils.write(archiveFile, sobiFile.getText());\n return archiveFile;\n * @param publishedDate Date\n private File getFileInArchiveDirectory(String fileName, Date publishedDate) {\n LocalDate localDate = new LocalDate(publishedDate);\n String year = Integer.toString(localDate.getYear());\n * Convenience method to convert a list of SOBIMetaData objects into SOBIFile objects.\n * @param metaDataList List<SOBIMetaData>\n * @return List<SOBIFile>\n */\n private List<SOBIFile> getSobiFileListFromMetaDataList(List<SOBIMetadata> metaDataList) {\n List<SOBIFile> sobiFiles = new ArrayList<>();\n try {\n for (SOBIMetadata metaData : metaDataList) {\n SOBIFile sobiFile = new SOBIFile(getSOBIFileFromFileSystem(metaData));\n metaData.applyToSOBIFile(sobiFile);\n sobiFiles.add(sobiFile);", "signature": "File getSOBIFileFromFileSystem(SOBIMetadata metaData)" } ], "patch": "@@ -8,18 +8,17 @@\n import org.apache.log4j.Logger;\n import org.joda.time.LocalDate;\n import org.springframework.dao.DataAccessException;\n-import org.springframework.dao.DataIntegrityViolationException;\n-import org.springframework.dao.IncorrectResultSizeDataAccessException;\n+import org.springframework.dao.DuplicateKeyException;\n import org.springframework.jdbc.core.RowMapper;\n import org.springframework.jdbc.core.namedparam.MapSqlParameterSource;\n \n import java.io.File;\n+import java.io.FileNotFoundException;\n import java.io.IOException;\n import java.sql.ResultSet;\n import java.sql.SQLException;\n import java.util.*;\n \n-import static gov.nysenate.openleg.util.FileHelper.moveFileToDirectory;\n import static gov.nysenate.openleg.util.FileHelper.safeListFiles;\n \n /**\n@@ -65,12 +64,14 @@ public SqlSOBIFileDao(Environment environment) {\n \"SELECT * FROM \" + table(SOBI_FILE_TABLE) + \" WHERE pending_processing = true \";\n \n private final String INSERT_SOBI_FILE =\n- \"INSERT INTO \" + table(SOBI_FILE_TABLE) + \" (file_name, published_date_time, processed_date_time, processed_count, pending_processing) \" +\n- \"VALUES (:fileName, :publishedDateTime, :processedDateTime, :processedCount, :pendingProcessing)\";\n+ \"INSERT INTO \" + table(SOBI_FILE_TABLE) + \"\\n\" +\n+ \"(file_name, published_date_time, staged_date_time, processed_date_time, processed_count, pending_processing) \" +\n+ \"VALUES (:fileName, :publishedDateTime, :stagedDateTime, :processedDateTime, :processedCount, :pendingProcessing)\";\n \n private final String UPDATE_SOBI_FILE =\n \"UPDATE \" + table(SOBI_FILE_TABLE) + \"\\n\" +\n \"SET published_date_time = :publishedDateTime,\" +\n+ \" staged_date_time = :stagedDateTime,\" +\n \" processed_date_time = :processedDateTime,\" +\n \" pending_processing = :pendingProcessing,\" +\n \" processed_count = :processedCount \" +\n@@ -83,37 +84,17 @@ public SqlSOBIFileDao(Environment environment) {\n public SOBIFile getSOBIFile(String fileName) {\n SOBIFile sobiFile = null;\n MapSqlParameterSource params = new MapSqlParameterSource(\"fileNames\", Arrays.asList(fileName));\n- try {\n- SOBIMetadata metaData = jdbcNamed.queryForObject(GET_SOBI_FILES_BY_FILE_NAMES_SQL, params, new SOBIMetadata.Mapper());\n- sobiFile = new SOBIFile(getSOBIFileFromFileSystem(metaData));\n- metaData.applyToSOBIFile(sobiFile);\n- }\n- catch (IncorrectResultSizeDataAccessException ex) {\n- logger.debug(\"No sobi details were found in database for \" + fileName, ex);\n- }\n- catch (IOException ex) {\n- logger.error(\"Possible inconsistency between file system and database! \" +\n- \"Failed to construct SOBIFile instance with file name \" + fileName, ex);\n- }\n- return sobiFile;\n+ return jdbcNamed.queryForObject(GET_SOBI_FILES_BY_FILE_NAMES_SQL, params, new SOBIFileRowMapper());\n }\n \n /** {@inheritDoc }*/\n @Override\n public Map<String, SOBIFile> getSOBIFiles(List<String> fileNames) {\n MapSqlParameterSource params = new MapSqlParameterSource(\"fileNames\", fileNames);\n Map<String, SOBIFile> sobiFileMap = new HashMap<>();\n- List<SOBIMetadata> metaDataList = jdbcNamed.query(GET_SOBI_FILES_BY_FILE_NAMES_SQL, params, new SOBIMetadata.Mapper());\n- try {\n- for (SOBIMetadata metaData : metaDataList) {\n- SOBIFile sobiFile = new SOBIFile(getSOBIFileFromFileSystem(metaData));\n- metaData.applyToSOBIFile(sobiFile);\n- sobiFileMap.put(sobiFile.getFileName(), sobiFile);\n- }\n- }\n- catch (IOException ex) {\n- logger.error(\"Failed to construct SOBIFile instance!\", ex);\n- return null;\n+ List<SOBIFile> sobiList = jdbcNamed.query(GET_SOBI_FILES_BY_FILE_NAMES_SQL, params, new SOBIFileRowMapper());\n+ for (SOBIFile sobiFile : sobiList) {\n+ sobiFileMap.put(sobiFile.getFileName(), sobiFile);\n }\n return sobiFileMap;\n }\n@@ -125,63 +106,51 @@ public List<SOBIFile> getSOBIFilesDuring(Date start, Date end, boolean processed\n params.addValue(\"startDate\", start);\n params.addValue(\"endDate\", end);\n params.addValue(\"processedOnly\", processedOnly);\n- List<SOBIMetadata> metaDataList = jdbcNamed.query(GET_SOBI_FILES_DURING_SQL + orderBy(\"published_date_time\", sortByPubDate),\n- params, new SOBIMetadata.Mapper());\n- return getSobiFileListFromMetaDataList(metaDataList);\n+ return jdbcNamed.query(GET_SOBI_FILES_DURING_SQL + orderBy(\"published_date_time\", sortByPubDate),\n+ params, new SOBIFileRowMapper());\n }\n \n /** {@inheritDoc }*/\n @Override\n public List<SOBIFile> getPendingSOBIFiles(SortOrder sortByPubDate) {\n- List<SOBIMetadata> metaDataList =\n- jdbc.query(GET_PENDING_SOBI_FILES_SQL + orderBy(\"published_date_time\", sortByPubDate), new SOBIMetadata.Mapper());\n- return getSobiFileListFromMetaDataList(metaDataList);\n+ return jdbc.query(GET_PENDING_SOBI_FILES_SQL + orderBy(\"published_date_time\", sortByPubDate), new SOBIFileRowMapper());\n }\n \n /** {@inheritDoc }*/\n @Override\n public void stageSOBIFiles(boolean allowReStaging) throws IOException {\n logger.info(\"Performing staging of new SOBI files...\");\n int filesStaged = 0;\n-\n for (File file : safeListFiles(this.stagingSobiDir, null, false)) {\n SOBIFile sobiFile = new SOBIFile(file);\n+ sobiFile.setStagedDateTime(new Date());\n sobiFile.setPendingProcessing(true);\n try {\n insertSOBIMetadataInDatabase(sobiFile);\n- if (!file.delete()) {\n- logger.fatal(\"Failed to delete \" + file.getAbsoluteFile() + \" from the sobi staging directory!\");\n- }\n- updateSOBIFileInFileSystem(sobiFile);\n+ moveFileToWorking(file);\n filesStaged++;\n logger.debug(\"Staged \" + sobiFile);\n }\n- catch(DataIntegrityViolationException ex) {\n+ catch (DuplicateKeyException ex) {\n if (allowReStaging) {\n // The SOBI file has been staged once before so we want to re-stage it with the contents of the\n // new file which may or may not be identical. This should rarely occur in production but can\n // be helpful during development.\n SOBIFile existingSOBIFile = getSOBIFile(sobiFile.getFileName());\n if (existingSOBIFile != null) {\n- File existingFile = getSOBIFileFromFileSystem(existingSOBIFile);\n- if (existingFile.exists()) {\n- moveFileToDirectory(file, this.workingSobiDir, true);\n- existingSOBIFile.setPendingProcessing(true);\n- updateSOBIFile(existingSOBIFile);\n- filesStaged++;\n- logger.debug(\"Re-staged \" + existingSOBIFile + \" with latest file contents.\");\n- }\n- else {\n- logger.warn(\"Attempted to re-stage \" + existingSOBIFile + \" but the file \" +\n- existingFile.getAbsolutePath() + \" doesn't exist!\");\n- }\n+ existingSOBIFile.setStagedDateTime(new Date());\n+ existingSOBIFile.setPendingProcessing(true);\n+ updateSOBIFile(existingSOBIFile);\n+ moveFileToWorking(file);\n+ filesStaged++;\n+ logger.debug(\"Re-staged \" + existingSOBIFile + \" with latest file contents.\");\n }\n else {\n logger.warn(\"Failed to stage \" + sobiFile + \" because a prior record exists but cannot be retrieved!\");\n }\n }\n else {\n- logger.debug(\"Skipping \" + sobiFile + \" since re-staging is disabled.\");\n+ logger.debug(\"Ignoring \" + sobiFile + \" since re-staging is disabled and file was previously processed.\");\n }\n }\n }\n@@ -193,9 +162,14 @@ public void stageSOBIFiles(boolean allowReStaging) throws IOException {\n public boolean updateSOBIFile(SOBIFile sobiFile) {\n if (sobiFile != null) {\n try {\n- int affected = jdbcNamed.update(UPDATE_SOBI_FILE, getSOBIInsertUpdateParams(sobiFile));\n+ int affected = updateSOBIMetadataInDatabase(sobiFile);\n if (affected > 0) {\n- updateSOBIFileInFileSystem(sobiFile);\n+ if (!sobiFile.isPendingProcessing()) {\n+ File workFile = getFileInWorkingDirectory(sobiFile.getFileName());\n+ if (workFile.exists()) {\n+ moveFiletoArchive(workFile, sobiFile.getPublishedDateTime());\n+ }\n+ }\n return true;\n }\n return false;\n@@ -226,47 +200,58 @@ public void deleteAll() throws IOException {\n \n /** --- Helper Classes --- */\n \n- /** Models the processing details for a sobi file which is stored in the database */\n- protected static class SOBIMetadata {\n- String fileName;\n- Date publishedDateTime;\n- Date processedDateTime;\n- boolean pendingProcessing;\n- int processedCount;\n-\n- /** Apply metadata info to SOBIFile */\n- void applyToSOBIFile(SOBIFile sobiFile) {\n- sobiFile.setProcessedDateTime(this.processedDateTime);\n- sobiFile.setPendingProcessing(this.pendingProcessing);\n- sobiFile.setProcessedCount(this.processedCount);\n+ /**\n+ * Maps rows from the sobi table to SOBIFile objects.\n+ */\n+ protected class SOBIFileRowMapper implements RowMapper<SOBIFile> {\n+ private String pfx = \"\";\n+\n+ public SOBIFileRowMapper(){}\n+ public SOBIFileRowMapper(String pfx) {\n+ this.pfx = pfx;\n }\n \n- /** Row Mapper implementation */\n- static class Mapper implements RowMapper<SOBIMetadata> {\n- @Override\n- public SOBIMetadata mapRow(ResultSet rs, int rowNum) throws SQLException {\n- SOBIMetadata metadata = new SOBIMetadata();\n- metadata.fileName = rs.getString(\"file_name\");\n- metadata.publishedDateTime = rs.getDate(\"published_date_time\");\n- metadata.processedDateTime = rs.getDate(\"processed_date_time\");\n- metadata.pendingProcessing = rs.getBoolean(\"pending_processing\");\n- metadata.processedCount = rs.getInt(\"processed_count\");\n- return metadata;\n+ @Override\n+ public SOBIFile mapRow(ResultSet rs, int rowNum) throws SQLException {\n+ String fileName = rs.getString(pfx + \"file_name\");\n+ Date publishedDateTime = rs.getDate(pfx + \"published_date_time\");\n+ boolean pendingProcessing = rs.getBoolean(pfx + \"pending_processing\");\n+ File file = getSOBIFileFromFileSystem(fileName, publishedDateTime, pendingProcessing);\n+ try {\n+ SOBIFile sobiFile = new SOBIFile(file);\n+ sobiFile.setPendingProcessing(pendingProcessing);\n+ sobiFile.setProcessedDateTime(rs.getDate(pfx + \"processed_date_time\"));\n+ sobiFile.setProcessedCount(rs.getInt(pfx + \"processed_count\"));\n+ return sobiFile;\n }\n+ catch (FileNotFoundException ex) {\n+ logger.error(\"SOBI file \" + rs.getString(\"file_name\") + \" was not found in the expected location! \\n\" +\n+ \"This could be a result of modifications to the sobi file directory that were not synced with \" +\n+ \"the database. \", ex);\n+ }\n+ catch (IOException ex) {\n+ logger.error(ex);\n+ }\n+ return null;\n }\n }\n \n+ /** --- Internal Methods --- */\n+\n /**\n * Saves the metadata of the SOBIFile into the database.\n * @throws java.lang.IllegalArgumentException if sobiFile is null\n */\n private void insertSOBIMetadataInDatabase(SOBIFile sobiFile) throws DataAccessException {\n- if (sobiFile != null) {\n- jdbcNamed.update(INSERT_SOBI_FILE, getSOBIInsertUpdateParams(sobiFile));\n- }\n- else {\n- throw new IllegalArgumentException(\"Supplied SOBIFile object is null. Cannot persist to database.\");\n- }\n+ jdbcNamed.update(INSERT_SOBI_FILE, getSOBIInsertUpdateParams(sobiFile));\n+ }\n+\n+ /**\n+ * Updates the metadata of the SOBIFile into the database.\n+ * @throws java.lang.IllegalArgumentException if sobiFile is null\n+ */\n+ private int updateSOBIMetadataInDatabase(SOBIFile sobiFile) throws DataAccessException {\n+ return jdbcNamed.update(UPDATE_SOBI_FILE, getSOBIInsertUpdateParams(sobiFile));\n }\n \n /**\n@@ -276,13 +261,8 @@ private void insertSOBIMetadataInDatabase(SOBIFile sobiFile) throws DataAccessEx\n * @param pendingProcessing boolean - Indicates where to look for the SOBI file.\n * @return File\n */\n- private File getSOBIFileFromFileSystem(String fileName, Date publishedDate, boolean pendingProcessing) {\n- return (pendingProcessing) ? getFileInWorkingDirectory(fileName) : getFileInArchiveDirectory(fileName, publishedDate);\n- }\n-\n- /** Overload for convenience. @see #getSOBIFileFromFileSystem(String, java.util.Date, boolean) */\n- private File getSOBIFileFromFileSystem(SOBIMetadata metaData) {\n- return getSOBIFileFromFileSystem(metaData.fileName, metaData.publishedDateTime, metaData.pendingProcessing);\n+ private File getSOBIFileFromFileSystem(String fileName, Date publishedDateTime, boolean pendingProcessing) {\n+ return (pendingProcessing) ? getFileInWorkingDirectory(fileName) : getFileInArchiveDirectory(fileName, publishedDateTime);\n }\n \n /** Overload for convenience. @see #getSOBIFileFromFileSystem(String, java.util.Date, boolean) */\n@@ -291,30 +271,37 @@ private File getSOBIFileFromFileSystem(SOBIFile sobiFile) {\n }\n \n /**\n- * Deletes the actual SOBI file from the file system and writes the contents of SOBIFile to the appropriate directory.\n- * @param sobiFile SOBIFile\n- * @return File - Newly written file.\n- * @throws IOException\n+ * Moves the file into the working SOBI file directory.\n+ * @param file File\n */\n- private File updateSOBIFileInFileSystem(SOBIFile sobiFile) throws IOException {\n- File workFile = getFileInWorkingDirectory(sobiFile.getFileName());\n- File archiveFile = getFileInArchiveDirectory(sobiFile.getFileName(), sobiFile.getPublishedDateTime());\n-\n- // Delete the file from any possible directory so we don't have to keep track of where it is.\n- FileUtils.deleteQuietly(workFile);\n- FileUtils.deleteQuietly(archiveFile);\n-\n- if (sobiFile.isPendingProcessing()) {\n- // Write to the working directory.\n- FileUtils.write(workFile, sobiFile.getText());\n- return workFile;\n+ private void moveFileToWorking(File file) throws IOException {\n+ File workingFile = getFileInWorkingDirectory(file.getName());\n+ if (workingFile.exists()) {\n+ FileUtils.deleteQuietly(workingFile);\n }\n- else {\n- // Create any sub directories just to be safe and write to archive directory.\n- archiveFile.getParentFile().mkdirs();\n- FileUtils.write(archiveFile, sobiFile.getText());\n- return archiveFile;\n+ FileUtils.moveFile(file, workingFile);\n+ }\n+\n+ /**\n+ * Moves the file into the archive SOBI file directory.\n+ * @param file File\n+ */\n+ private void moveFiletoArchive(File file, Date publishedDateTime) throws IOException {\n+ File archiveFile = getFileInArchiveDirectory(file.getName(), publishedDateTime);\n+ if (archiveFile.exists()) {\n+ FileUtils.deleteQuietly(archiveFile);\n }\n+ FileUtils.moveFile(file, archiveFile);\n+ }\n+\n+ /**\n+ * Delete any traces of the SOBI file (either in work or archive directory) from the file system.\n+ * @param fileName String\n+ * @param publishedDateTime Date\n+ */\n+ private void deleteSOBIFileFromFileSystem(String fileName, Date publishedDateTime) {\n+ FileUtils.deleteQuietly(getFileInWorkingDirectory(fileName));\n+ FileUtils.deleteQuietly(getFileInArchiveDirectory(fileName, publishedDateTime));\n }\n \n /**\n@@ -329,39 +316,17 @@ private File getFileInWorkingDirectory(String fileName) {\n /**\n * Get file handle from the sobi archive directory.\n * @param fileName String\n- * @param publishedDate Date\n+ * @param publishedDateTime Date\n * @return File\n */\n- private File getFileInArchiveDirectory(String fileName, Date publishedDate) {\n- LocalDate localDate = new LocalDate(publishedDate);\n- String year = Integer.toString(localDate.getYear());\n+ private File getFileInArchiveDirectory(String fileName, Date publishedDateTime) {\n+ String year = Integer.toString(new LocalDate(publishedDateTime).getYear());\n File dir = new File(this.archiveSobiDir, year);\n return new File(dir, fileName);\n }\n \n /**\n- * Convenience method to convert a list of SOBIMetaData objects into SOBIFile objects.\n- * @param metaDataList List<SOBIMetaData>\n- * @return List<SOBIFile>\n- */\n- private List<SOBIFile> getSobiFileListFromMetaDataList(List<SOBIMetadata> metaDataList) {\n- List<SOBIFile> sobiFiles = new ArrayList<>();\n- try {\n- for (SOBIMetadata metaData : metaDataList) {\n- SOBIFile sobiFile = new SOBIFile(getSOBIFileFromFileSystem(metaData));\n- metaData.applyToSOBIFile(sobiFile);\n- sobiFiles.add(sobiFile);\n- }\n- }\n- catch (IOException ex) {\n- logger.error(\"Failed to construct SOBIFile instance!\", ex);\n- return null;\n- }\n- return sobiFiles;\n- }\n-\n- /**\n- * Returns a ParameterSource with columns mapped to SOBIFile values for use in update/insert queries.\n+ * Returns a MapSqlParameterSource with columns mapped to SOBIFile values for use in update/insert queries.\n * @param sobiFile SOBIFile\n * @return MapSqlParameterSource\n */\n@@ -370,8 +335,9 @@ private MapSqlParameterSource getSOBIInsertUpdateParams(SOBIFile sobiFile) {\n params.addValue(\"fileName\", sobiFile.getFileName());\n params.addValue(\"publishedDateTime\", toTimestamp(sobiFile.getPublishedDateTime()));\n params.addValue(\"processedDateTime\", toTimestamp(sobiFile.getProcessedDateTime()));\n+ params.addValue(\"stagedDateTime\", toTimestamp(sobiFile.getStagedDateTime()));\n params.addValue(\"processedCount\", sobiFile.getProcessedCount());\n params.addValue(\"pendingProcessing\", sobiFile.isPendingProcessing());\n return params;\n }\n-}\n+}\n\\ No newline at end of file", "raw_url": "https://github.com/nysenate/OpenLegislation/raw/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fdao%2Fsobi%2FSqlSOBIFileDao.java", "sha": "be1d2c8aa127e1ffdbcc28f554f3c4eb5bc85656", "status": "modified" }, { "additions": 155, "blob_url": "https://github.com/nysenate/OpenLegislation/blob/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fdao%2Fsobi%2FSqlSOBIFragmentDao.java", "changes": 159, "contents_url": "https://api.github.com/repos/nysenate/OpenLegislation/contents/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fdao%2Fsobi%2FSqlSOBIFragmentDao.java?ref=f89655fbb32c1372837f17bb6f7ed81f7a32c654", "deletions": 4, "filename": "src/main/java/gov/nysenate/openleg/dao/sobi/SqlSOBIFragmentDao.java", "new_code": "import gov.nysenate.openleg.dao.base.SortOrder;\nimport gov.nysenate.openleg.model.sobi.SOBIFile;\nimport gov.nysenate.openleg.model.sobi.SOBIFragmentType;\nimport org.apache.commons.io.FileUtils;\nimport org.joda.time.LocalDate;\nimport org.springframework.dao.DuplicateKeyException;\nimport org.springframework.jdbc.core.RowMapper;\nimport org.springframework.jdbc.core.namedparam.MapSqlParameterSource;\n\nimport java.io.File;\nimport java.io.IOException;\nimport java.sql.ResultSet;\nimport java.sql.SQLException;\nimport java.util.*;\n protected static final String SOBI_FRAGMENT_TABLE = \"sobi_fragment\";\n\n /** --- SQL Statements --- */\n\n private final String CHECK_SOBI_FRAGMENT_EXISTS_SQL =\n \"SELECT 1 FROM \" + table(SOBI_FRAGMENT_TABLE) + \"\\n\" +\n \"WHERE fragment_file_name = :fragmentFileName\";\n\n private final String GET_SOBI_FRAGMENT_BY_FILE_NAME_SQL =\n \"SELECT * FROM \" + table(SOBI_FRAGMENT_TABLE) + \"\\n\" +\n \"WHERE sobi_fragment_type = :sobiFragmentType AND fragment_file_name = :fileName\";\n\n private final String GET_SOBI_FRAGMENTS_BY_SOBI_FILE_SQL =\n \"SELECT * FROM \" + table(SOBI_FRAGMENT_TABLE) + \" WHERE sobi_file_name = :sobiFileName \";\n\n private final String GET_SOBI_FRAGMENTS_BY_SOBI_FILE_FILTERED_SQL =\n \"SELECT * FROM \" + table(SOBI_FRAGMENT_TABLE) + \"\\n\" +\n \"WHERE sobi_file_name = :sobiFileName AND sobi_fragment_type = :sobiFragmentType \";\n\n private final String UPDATE_SOBI_FRAGMENT_SQL =\n \"UPDATE \" + table(SOBI_FRAGMENT_TABLE) + \"\\n\" +\n \"SET sobi_file_name = :sobiFileName, published_date_time = :publishedDateTime, \" +\n \" sobi_fragment_type = :sobiFragmentType, file_counter = :fileCounter, text = :text\\n\" +\n \"WHERE fragment_file_name = :fragmentFileName\";\n\n private final String INSERT_SOBI_FRAGMENT_SQL =\n \"INSERT INTO \" + table(SOBI_FRAGMENT_TABLE) +\n \" (sobi_file_name, fragment_file_name, published_date_time, sobi_fragment_type, file_counter, text)\" +\n \" VALUES (:sobiFileName, :fragmentFileName, :publishedDateTime, :sobiFragmentType, :fileCounter, :text)\";\n\n private final String DELETE_SOBI_FRAGMENTS_SQL =\n \"DELETE FROM \" + table(SOBI_FRAGMENT_TABLE) + \" WHERE sobi_file_name = :sobiFileName\";\n\n /** --- Constructors --- */\n /** --- Implemented Methods --- */\n\n public SOBIFragment getSOBIFragment(SOBIFragmentType fragmentType, String fragmentFileName) {\n MapSqlParameterSource params = new MapSqlParameterSource();\n params.addValue(\"sobiFragmentType\", fragmentType.name());\n params.addValue(\"fileName\", fragmentFileName);\n return jdbcNamed.queryForObject(GET_SOBI_FRAGMENT_BY_FILE_NAME_SQL, params, new SOBIFragmentRowMapper());\n /** {@inheritDoc} */\n public List<SOBIFragment> getSOBIFragments(SOBIFile sobiFile, SortOrder order) {\n MapSqlParameterSource params = new MapSqlParameterSource(\"sobiFileName\", sobiFile.getFileName());\n return jdbcNamed.query(GET_SOBI_FRAGMENTS_BY_SOBI_FILE_SQL + orderBy(\"fragment_file_name\", order), params,\n new SOBIFragmentRowMapper(sobiFile));\n }\n\n /** {@inheritDoc} */\n @Override\n public List<SOBIFragment> getSOBIFragments(SOBIFile sobiFile, SOBIFragmentType fragmentType, SortOrder order) {\n MapSqlParameterSource params = new MapSqlParameterSource();\n params.addValue(\"sobiFileName\", sobiFile.getFileName());\n params.addValue(\"sobiFragmentType\", fragmentType.name());\n return jdbcNamed.query(GET_SOBI_FRAGMENTS_BY_SOBI_FILE_FILTERED_SQL + orderBy(\"fragment_file_name\", order),\n params, new SOBIFragmentRowMapper(sobiFile));\n }\n\n /** {@inheritDoc} */\n @Override\n public void saveSOBIFragments(List<SOBIFragment> fragments) {\n for (SOBIFragment fragment : fragments) {\n // Set a unique file name for this fragment\n fragment.setFileName(createFileNameForFragment(fragment));\n // Persist the meta data of the fragment in the database\n MapSqlParameterSource params = new MapSqlParameterSource();\n params.addValue(\"sobiFileName\", fragment.getParentSOBIFile().getFileName());\n params.addValue(\"fragmentFileName\", fragment.getFileName());\n params.addValue(\"publishedDateTime\", toTimestamp(fragment.getPublishedDateTime()));\n params.addValue(\"sobiFragmentType\", fragment.getType().name());\n params.addValue(\"fileCounter\", fragment.getCounter());\n params.addValue(\"text\", fragment.getText().replace('\\0', ' '));\n if (jdbcNamed.update(UPDATE_SOBI_FRAGMENT_SQL, params) == 0) {\n jdbcNamed.update(INSERT_SOBI_FRAGMENT_SQL, params);\n }\n logger.debug(\"Saved sobi fragment \" + fragment.getFileName());\n }\n }\n\n /** {@inheritDoc} */\n @Override\n public void deleteSOBIFragments(SOBIFile sobiFile) {\n MapSqlParameterSource params = new MapSqlParameterSource(\"sobiFileName\", sobiFile.getFileName());\n jdbcNamed.update(DELETE_SOBI_FRAGMENTS_SQL, params);\n }\n\n /** --- Helper Classes --- */\n\n /**\n * Maps rows from the sobi fragment table to SOBIFragment objects.\n */\n protected class SOBIFragmentRowMapper implements RowMapper<SOBIFragment> {\n private String pfx = \"\";\n private Map<String, SOBIFile> sobiFileMap = new HashMap<>();\n\n public SOBIFragmentRowMapper() {\n this(\"\", Collections.<SOBIFile>emptyList());\n }\n\n public SOBIFragmentRowMapper(SOBIFile sobiFile) {\n this(\"\", Arrays.asList(sobiFile));\n }\n\n public SOBIFragmentRowMapper(String pfx, List<SOBIFile> sobiFiles) {\n this.pfx = pfx;\n for (SOBIFile sobiFile : sobiFiles) {\n this.sobiFileMap.put(sobiFile.getFileName(), sobiFile);\n }\n }\n\n @Override\n public SOBIFragment mapRow(ResultSet rs, int rowNum) throws SQLException {\n String sobiFileName = rs.getString(pfx + \"sobi_file_name\");\n // Passing the sobi file objects in the constructor is a means of caching the objects\n // so that they don't have to be re-mapped. If not supplied, the underlying sobi file dao\n // will need to be utilized.\n SOBIFile sobiFile = this.sobiFileMap.get(sobiFileName);\n if (sobiFile == null) {\n sobiFile = getSOBIFile(sobiFileName);\n }\n String fileName = rs.getString(pfx + \"fragment_file_name\");\n SOBIFragmentType type = SOBIFragmentType.valueOf(rs.getString(pfx + \"sobi_fragment_type\"));\n int counter = rs.getInt(pfx + \"file_counter\");\n String text = rs.getString(pfx + \"text\");\n SOBIFragment fragment = new SOBIFragment(sobiFile, type, text, counter);\n fragment.setFileName(fileName);\n return fragment;\n }\n }\n\n /** --- Internal Methods --- */\n /**\n * Generates unique file names for the fragments.\n * E.g SOBI.20140101.000001-bill-1.sobi, SOBI.20140101.000001-agenda-2.sobi\n * @param fragment SOBIFragment\n * @return String\n */\n private String createFileNameForFragment(SOBIFragment fragment) {\n return fragment.getParentSOBIFile().getFileName() + \"-\" +\n fragment.getType().name().toLowerCase() + \"-\" + fragment.getCounter() +\n ((fragment.getType().isXml()) ? \".xml\" : \".sobi\");", "new_methods": [ { "arguments": [ "SOBIFragmentType fragmentType", " String fragmentFileName" ], "filename": "src/main/java/gov/nysenate/openleg/dao/sobi/SqlSOBIFragmentDao.java", "implementation": "MapSqlParameterSource params = new MapSqlParameterSource();\n params.addValue(\"sobiFragmentType\", fragmentType.name());\n params.addValue(\"fileName\", fragmentFileName);\n return jdbcNamed.queryForObject(GET_SOBI_FRAGMENT_BY_FILE_NAME_SQL, params, new SOBIFragmentRowMapper());\n /** {@inheritDoc", "signature": "SOBIFragment getSOBIFragment(SOBIFragmentType fragmentType, String fragmentFileName)" }, { "arguments": [ "List<SOBIFragment> fragments" ], "filename": "src/main/java/gov/nysenate/openleg/dao/sobi/SqlSOBIFragmentDao.java", "implementation": "for (SOBIFragment fragment : fragments) {\n // Set a unique file name for this fragment\n fragment.setFileName(createFileNameForFragment(fragment));\n // Persist the meta data of the fragment in the database\n MapSqlParameterSource params = new MapSqlParameterSource();\n params.addValue(\"sobiFileName\", fragment.getParentSOBIFile().getFileName());\n params.addValue(\"fragmentFileName\", fragment.getFileName());\n params.addValue(\"publishedDateTime\", toTimestamp(fragment.getPublishedDateTime()));\n params.addValue(\"sobiFragmentType\", fragment.getType().name());\n params.addValue(\"fileCounter\", fragment.getCounter());\n params.addValue(\"text\", fragment.getText().replace('\\0', ' '));\n if (jdbcNamed.update(UPDATE_SOBI_FRAGMENT_SQL, params) == 0) {\n jdbcNamed.update(INSERT_SOBI_FRAGMENT_SQL, params);", "signature": "void saveSOBIFragments(List<SOBIFragment> fragments)" }, { "arguments": [ "SOBIFile sobiFile" ], "filename": "src/main/java/gov/nysenate/openleg/dao/sobi/SqlSOBIFragmentDao.java", "implementation": "MapSqlParameterSource params = new MapSqlParameterSource(\"sobiFileName\", sobiFile.getFileName());\n jdbcNamed.update(DELETE_SOBI_FRAGMENTS_SQL, params);", "signature": "void deleteSOBIFragments(SOBIFile sobiFile)" }, { "arguments": [], "filename": "src/main/java/gov/nysenate/openleg/dao/sobi/SqlSOBIFragmentDao.java", "implementation": "this(\"\", Collections.<SOBIFile>emptyList());", "signature": "public SOBIFragmentRowMapper()" }, { "arguments": [ "SOBIFile sobiFile" ], "filename": "src/main/java/gov/nysenate/openleg/dao/sobi/SqlSOBIFragmentDao.java", "implementation": "this(\"\", Arrays.asList(sobiFile));", "signature": "public SOBIFragmentRowMapper(SOBIFile sobiFile)" }, { "arguments": [ "String pfx", " List<SOBIFile> sobiFiles" ], "filename": "src/main/java/gov/nysenate/openleg/dao/sobi/SqlSOBIFragmentDao.java", "implementation": "this.pfx = pfx;\n for (SOBIFile sobiFile : sobiFiles) {\n this.sobiFileMap.put(sobiFile.getFileName(), sobiFile);", "signature": "public SOBIFragmentRowMapper(String pfx, List<SOBIFile> sobiFiles)" } ], "old_code": " private static String SOBI_FRAGMENT_TABLE = \"sobi_fragment\";\n public SOBIFragment getSOBIFragment(String fragmentFileName) {\n return null;\n public void saveSOBIFragment(SOBIFragment fragment) {", "old_methods": [], "patch": "@@ -1,27 +1,178 @@\n package gov.nysenate.openleg.dao.sobi;\n \n import gov.nysenate.openleg.Environment;\n+import gov.nysenate.openleg.dao.base.SortOrder;\n+import gov.nysenate.openleg.model.sobi.SOBIFile;\n import gov.nysenate.openleg.model.sobi.SOBIFragment;\n+import gov.nysenate.openleg.model.sobi.SOBIFragmentType;\n+import org.apache.commons.io.FileUtils;\n import org.apache.log4j.Logger;\n+import org.joda.time.LocalDate;\n+import org.springframework.dao.DuplicateKeyException;\n+import org.springframework.jdbc.core.RowMapper;\n+import org.springframework.jdbc.core.namedparam.MapSqlParameterSource;\n+\n+import java.io.File;\n+import java.io.IOException;\n+import java.sql.ResultSet;\n+import java.sql.SQLException;\n+import java.util.*;\n \n public class SqlSOBIFragmentDao extends SqlSOBIFileDao implements SOBIFragmentDao\n {\n private static Logger logger = Logger.getLogger(SqlSOBIFragmentDao.class);\n \n /** The database table where SOBI fragments are recorded */\n- private static String SOBI_FRAGMENT_TABLE = \"sobi_fragment\";\n+ protected static final String SOBI_FRAGMENT_TABLE = \"sobi_fragment\";\n+\n+ /** --- SQL Statements --- */\n+\n+ private final String CHECK_SOBI_FRAGMENT_EXISTS_SQL =\n+ \"SELECT 1 FROM \" + table(SOBI_FRAGMENT_TABLE) + \"\\n\" +\n+ \"WHERE fragment_file_name = :fragmentFileName\";\n+\n+ private final String GET_SOBI_FRAGMENT_BY_FILE_NAME_SQL =\n+ \"SELECT * FROM \" + table(SOBI_FRAGMENT_TABLE) + \"\\n\" +\n+ \"WHERE sobi_fragment_type = :sobiFragmentType AND fragment_file_name = :fileName\";\n+\n+ private final String GET_SOBI_FRAGMENTS_BY_SOBI_FILE_SQL =\n+ \"SELECT * FROM \" + table(SOBI_FRAGMENT_TABLE) + \" WHERE sobi_file_name = :sobiFileName \";\n+\n+ private final String GET_SOBI_FRAGMENTS_BY_SOBI_FILE_FILTERED_SQL =\n+ \"SELECT * FROM \" + table(SOBI_FRAGMENT_TABLE) + \"\\n\" +\n+ \"WHERE sobi_file_name = :sobiFileName AND sobi_fragment_type = :sobiFragmentType \";\n+\n+ private final String UPDATE_SOBI_FRAGMENT_SQL =\n+ \"UPDATE \" + table(SOBI_FRAGMENT_TABLE) + \"\\n\" +\n+ \"SET sobi_file_name = :sobiFileName, published_date_time = :publishedDateTime, \" +\n+ \" sobi_fragment_type = :sobiFragmentType, file_counter = :fileCounter, text = :text\\n\" +\n+ \"WHERE fragment_file_name = :fragmentFileName\";\n+\n+ private final String INSERT_SOBI_FRAGMENT_SQL =\n+ \"INSERT INTO \" + table(SOBI_FRAGMENT_TABLE) +\n+ \" (sobi_file_name, fragment_file_name, published_date_time, sobi_fragment_type, file_counter, text)\" +\n+ \" VALUES (:sobiFileName, :fragmentFileName, :publishedDateTime, :sobiFragmentType, :fileCounter, :text)\";\n+\n+ private final String DELETE_SOBI_FRAGMENTS_SQL =\n+ \"DELETE FROM \" + table(SOBI_FRAGMENT_TABLE) + \" WHERE sobi_file_name = :sobiFileName\";\n+\n+ /** --- Constructors --- */\n \n public SqlSOBIFragmentDao(Environment environment) {\n super(environment);\n }\n \n+ /** --- Implemented Methods --- */\n+\n @Override\n- public SOBIFragment getSOBIFragment(String fragmentFileName) {\n- return null;\n+ public SOBIFragment getSOBIFragment(SOBIFragmentType fragmentType, String fragmentFileName) {\n+ MapSqlParameterSource params = new MapSqlParameterSource();\n+ params.addValue(\"sobiFragmentType\", fragmentType.name());\n+ params.addValue(\"fileName\", fragmentFileName);\n+ return jdbcNamed.queryForObject(GET_SOBI_FRAGMENT_BY_FILE_NAME_SQL, params, new SOBIFragmentRowMapper());\n }\n \n+ /** {@inheritDoc} */\n @Override\n- public void saveSOBIFragment(SOBIFragment fragment) {\n+ public List<SOBIFragment> getSOBIFragments(SOBIFile sobiFile, SortOrder order) {\n+ MapSqlParameterSource params = new MapSqlParameterSource(\"sobiFileName\", sobiFile.getFileName());\n+ return jdbcNamed.query(GET_SOBI_FRAGMENTS_BY_SOBI_FILE_SQL + orderBy(\"fragment_file_name\", order), params,\n+ new SOBIFragmentRowMapper(sobiFile));\n+ }\n+\n+ /** {@inheritDoc} */\n+ @Override\n+ public List<SOBIFragment> getSOBIFragments(SOBIFile sobiFile, SOBIFragmentType fragmentType, SortOrder order) {\n+ MapSqlParameterSource params = new MapSqlParameterSource();\n+ params.addValue(\"sobiFileName\", sobiFile.getFileName());\n+ params.addValue(\"sobiFragmentType\", fragmentType.name());\n+ return jdbcNamed.query(GET_SOBI_FRAGMENTS_BY_SOBI_FILE_FILTERED_SQL + orderBy(\"fragment_file_name\", order),\n+ params, new SOBIFragmentRowMapper(sobiFile));\n+ }\n+\n+ /** {@inheritDoc} */\n+ @Override\n+ public void saveSOBIFragments(List<SOBIFragment> fragments) {\n+ for (SOBIFragment fragment : fragments) {\n+ // Set a unique file name for this fragment\n+ fragment.setFileName(createFileNameForFragment(fragment));\n+ // Persist the meta data of the fragment in the database\n+ MapSqlParameterSource params = new MapSqlParameterSource();\n+ params.addValue(\"sobiFileName\", fragment.getParentSOBIFile().getFileName());\n+ params.addValue(\"fragmentFileName\", fragment.getFileName());\n+ params.addValue(\"publishedDateTime\", toTimestamp(fragment.getPublishedDateTime()));\n+ params.addValue(\"sobiFragmentType\", fragment.getType().name());\n+ params.addValue(\"fileCounter\", fragment.getCounter());\n+ params.addValue(\"text\", fragment.getText().replace('\\0', ' '));\n+ if (jdbcNamed.update(UPDATE_SOBI_FRAGMENT_SQL, params) == 0) {\n+ jdbcNamed.update(INSERT_SOBI_FRAGMENT_SQL, params);\n+ }\n+ logger.debug(\"Saved sobi fragment \" + fragment.getFileName());\n+ }\n+ }\n+\n+ /** {@inheritDoc} */\n+ @Override\n+ public void deleteSOBIFragments(SOBIFile sobiFile) {\n+ MapSqlParameterSource params = new MapSqlParameterSource(\"sobiFileName\", sobiFile.getFileName());\n+ jdbcNamed.update(DELETE_SOBI_FRAGMENTS_SQL, params);\n+ }\n+\n+ /** --- Helper Classes --- */\n+\n+ /**\n+ * Maps rows from the sobi fragment table to SOBIFragment objects.\n+ */\n+ protected class SOBIFragmentRowMapper implements RowMapper<SOBIFragment> {\n+ private String pfx = \"\";\n+ private Map<String, SOBIFile> sobiFileMap = new HashMap<>();\n+\n+ public SOBIFragmentRowMapper() {\n+ this(\"\", Collections.<SOBIFile>emptyList());\n+ }\n+\n+ public SOBIFragmentRowMapper(SOBIFile sobiFile) {\n+ this(\"\", Arrays.asList(sobiFile));\n+ }\n+\n+ public SOBIFragmentRowMapper(String pfx, List<SOBIFile> sobiFiles) {\n+ this.pfx = pfx;\n+ for (SOBIFile sobiFile : sobiFiles) {\n+ this.sobiFileMap.put(sobiFile.getFileName(), sobiFile);\n+ }\n+ }\n+\n+ @Override\n+ public SOBIFragment mapRow(ResultSet rs, int rowNum) throws SQLException {\n+ String sobiFileName = rs.getString(pfx + \"sobi_file_name\");\n+ // Passing the sobi file objects in the constructor is a means of caching the objects\n+ // so that they don't have to be re-mapped. If not supplied, the underlying sobi file dao\n+ // will need to be utilized.\n+ SOBIFile sobiFile = this.sobiFileMap.get(sobiFileName);\n+ if (sobiFile == null) {\n+ sobiFile = getSOBIFile(sobiFileName);\n+ }\n+ String fileName = rs.getString(pfx + \"fragment_file_name\");\n+ SOBIFragmentType type = SOBIFragmentType.valueOf(rs.getString(pfx + \"sobi_fragment_type\"));\n+ int counter = rs.getInt(pfx + \"file_counter\");\n+ String text = rs.getString(pfx + \"text\");\n+ SOBIFragment fragment = new SOBIFragment(sobiFile, type, text, counter);\n+ fragment.setFileName(fileName);\n+ return fragment;\n+ }\n+ }\n+\n+ /** --- Internal Methods --- */\n \n+ /**\n+ * Generates unique file names for the fragments.\n+ * E.g SOBI.20140101.000001-bill-1.sobi, SOBI.20140101.000001-agenda-2.sobi\n+ * @param fragment SOBIFragment\n+ * @return String\n+ */\n+ private String createFileNameForFragment(SOBIFragment fragment) {\n+ return fragment.getParentSOBIFile().getFileName() + \"-\" +\n+ fragment.getType().name().toLowerCase() + \"-\" + fragment.getCounter() +\n+ ((fragment.getType().isXml()) ? \".xml\" : \".sobi\");\n }\n }", "raw_url": "https://github.com/nysenate/OpenLegislation/raw/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fdao%2Fsobi%2FSqlSOBIFragmentDao.java", "sha": "98764c56d5fb38066759f4a2038854427a21ba38", "status": "modified" }, { "additions": 20, "blob_url": "https://github.com/nysenate/OpenLegislation/blob/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fmodel%2FBaseObject.java", "changes": 109, "contents_url": "https://api.github.com/repos/nysenate/OpenLegislation/contents/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fmodel%2FBaseObject.java?ref=f89655fbb32c1372837f17bb6f7ed81f7a32c654", "deletions": 89, "filename": "src/main/java/gov/nysenate/openleg/model/BaseObject.java", "new_code": " /** True if the object was not retrieved from storage. */\n /** The date the object was most recently modified. */\n /** The date the object was most recently published. */\n /** The session this object was created in. */\n /** The calendar year this object was active in. */\n /** A set of SOBI files that contained modifications to this object. */\n /** Initializes BaseObject parameters. */\n /** --- Functional Getters/Setters --- */\n * Add a new source to the set of data sources. This is preferred to\n * getting a reference to the list and directly adding filenames\n *\n * @param source - The new source to add to the data sources.\n public void addDataSource(String source) {\n dataSources.add(source);\n }\n\n /** --- Basic Getters/Setters --- */\n public Date getPublishDate() {\n public void setPublishDate(Date publishDate) {\n public boolean isPublished() {", "new_methods": [ { "arguments": [ "String source" ], "filename": "src/main/java/gov/nysenate/openleg/model/BaseObject.java", "implementation": "dataSources.add(source);", "signature": "void addDataSource(String source)" } ], "old_code": " *\n * Does NOT implement getOid() or getOType(). All base classes are responsible for forming their\n * own unique object IDs and object types.\n *\n /**\n * True if the object was not retrieved from storage.\n */\n /**\n * The date the object was most recently modified\n */\n /**\n * The date the object was most recently published\n */\n /**\n * The session this object was created in.\n */\n /**\n * The calendar year this object was active in.\n */\n /**\n * A set of SOBI files that contained modifications to this object.\n */\n /**\n * Initializes BaseObject parameters.\n */\n /**\n * Get the unique id for this object for Lucene/web indexing and purging.\n */\n abstract public String getOid();\n * Get the document type for this object.\n abstract public String getOtype();\n /**\n * @return - True if the object was not retrieved from storage.\n */\n /**\n * @param brandNew - The new brandNew state.\n */\n /**\n * @return - The last publish date.\n */\n public Date getPublishDate()\n {\n /**\n * Set the last publish date.\n *\n * @param publishDate - The new publish date.\n */\n public void setPublishDate(Date publishDate)\n {\n /**\n * @return - true if the object has been published\n */\n public boolean isPublished()\n {\n /**\n * Gets the last modified time in milliseconds since epoch.\n */\n /**\n * Sets the last modified timestamp in milliseconds since epoch.\n */\n /**\n * @return - The session this object was created in.\n */\n /**\n * @param session - The new session this object was created in.\n */\n /**\n * @return - The calendar year this object was active in.\n */\n /**\n * @param year - The new calendar year for this object.\n */\n /**\n * Get the set of SOBI files that contain modifications for this object.\n */\n /**\n * @param dataSources - The new set of data sources that contain modifications for this object.\n */\n\n /**\n * Add a new source to the set of data sources. This is preferred to\n * getting a reference to the list and directly adding filenames\n *\n * @param source - The new source to add to the data sources.\n */\n public void addDataSource(String source)\n {\n dataSources.add(source);\n }", "old_methods": [ { "arguments": [], "filename": "src/main/java/gov/nysenate/openleg/model/BaseObject.java", "implementation": "/**\n * Set the last publish date.\n *\n * @param publishDate - The new publish date.\n */\n public void setPublishDate(Date publishDate)\n {\n /**\n * @return - true if the object has been published\n */\n public boolean isPublished()\n {\n /**\n * Gets the last modified time in milliseconds since epoch.\n */\n /**\n * Sets the last modified timestamp in milliseconds since epoch.\n */\n /**\n * @return - The session this object was created in.\n */\n /**\n * @param session - The new session this object was created in.\n */\n /**\n * @return - The calendar year this object was active in.\n */\n /**\n * @param year - The new calendar year for this object.\n */\n /**\n * Get the set of SOBI files that contain modifications for this object.\n */\n /**\n * @param dataSources - The new set of data sources that contain modifications for this object.\n */\n\n /**\n * Add a new source to the set of data sources. This is preferred to\n * getting a reference to the list and directly adding filenames\n *\n * @param source - The new source to add to the data sources.\n */\n public void addDataSource(String source)\n {\n dataSources.add(source);", "signature": "Date getPublishDate()" } ], "patch": "@@ -5,172 +5,103 @@\n \n /**\n * Implements the BaseObject interface of all published OpenLegislation content.\n- *\n- * Does NOT implement getOid() or getOType(). All base classes are responsible for forming their\n- * own unique object IDs and object types.\n- *\n * @author GraylinKim\n */\n abstract public class BaseObject\n {\n- /**\n- * True if the object was not retrieved from storage.\n- */\n+ /** True if the object was not retrieved from storage. */\n protected boolean brandNew = true;\n \n- /**\n- * The date the object was most recently modified\n- */\n+ /** The date the object was most recently modified. */\n protected Date modifiedDate = null;\n \n- /**\n- * The date the object was most recently published\n- */\n+ /** The date the object was most recently published. */\n protected Date publishDate = null;\n \n- /**\n- * The session this object was created in.\n- */\n+ /** The session this object was created in. */\n protected int session;\n \n- /**\n- * The calendar year this object was active in.\n- */\n+ /** The calendar year this object was active in. */\n protected int year;\n \n- /**\n- * A set of SOBI files that contained modifications to this object.\n- */\n+ /** A set of SOBI files that contained modifications to this object. */\n protected HashSet<String> dataSources;\n \n- /**\n- * Initializes BaseObject parameters.\n- */\n+ /** Initializes BaseObject parameters. */\n public BaseObject()\n {\n this.dataSources = new HashSet<String>();\n }\n \n- /**\n- * Get the unique id for this object for Lucene/web indexing and purging.\n- */\n- abstract public String getOid();\n+ /** --- Functional Getters/Setters --- */\n \n /**\n- * Get the document type for this object.\n+ * Add a new source to the set of data sources. This is preferred to\n+ * getting a reference to the list and directly adding filenames\n+ *\n+ * @param source - The new source to add to the data sources.\n */\n- abstract public String getOtype();\n+ public void addDataSource(String source) {\n+ dataSources.add(source);\n+ }\n+\n+ /** --- Basic Getters/Setters --- */\n \n- /**\n- * @return - True if the object was not retrieved from storage.\n- */\n public boolean isBrandNew() {\n return this.brandNew;\n }\n \n- /**\n- * @param brandNew - The new brandNew state.\n- */\n public void setBrandNew(boolean brandNew) {\n this.brandNew = brandNew;\n }\n \n- /**\n- * @return - The last publish date.\n- */\n- public Date getPublishDate()\n- {\n+ public Date getPublishDate() {\n return this.publishDate;\n }\n \n- /**\n- * Set the last publish date.\n- *\n- * @param publishDate - The new publish date.\n- */\n- public void setPublishDate(Date publishDate)\n- {\n+ public void setPublishDate(Date publishDate) {\n this.publishDate = publishDate;\n }\n \n- /**\n- * @return - true if the object has been published\n- */\n- public boolean isPublished()\n- {\n+ public boolean isPublished() {\n return this.getPublishDate() != null;\n }\n \n- /**\n- * Gets the last modified time in milliseconds since epoch.\n- */\n public Date getModifiedDate()\n {\n return this.modifiedDate;\n }\n \n- /**\n- * Sets the last modified timestamp in milliseconds since epoch.\n- */\n public void setModifiedDate(Date modifiedDate)\n {\n this.modifiedDate = modifiedDate;\n }\n \n- /**\n- * @return - The session this object was created in.\n- */\n public int getSession()\n {\n return this.session;\n }\n \n- /**\n- * @param session - The new session this object was created in.\n- */\n public void setSession(int session)\n {\n this.session = session;\n }\n \n- /**\n- * @return - The calendar year this object was active in.\n- */\n public int getYear() {\n return this.year;\n }\n \n- /**\n- * @param year - The new calendar year for this object.\n- */\n public void setYear(int year) {\n this.year = year;\n }\n \n- /**\n- * Get the set of SOBI files that contain modifications for this object.\n- */\n public HashSet<String> getDataSources()\n {\n return dataSources;\n }\n \n- /**\n- * @param dataSources - The new set of data sources that contain modifications for this object.\n- */\n public void setDataSources(HashSet<String> dataSources)\n {\n this.dataSources = dataSources;\n }\n-\n- /**\n- * Add a new source to the set of data sources. This is preferred to\n- * getting a reference to the list and directly adding filenames\n- *\n- * @param source - The new source to add to the data sources.\n- */\n- public void addDataSource(String source)\n- {\n- dataSources.add(source);\n- }\n }", "raw_url": "https://github.com/nysenate/OpenLegislation/raw/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fmodel%2FBaseObject.java", "sha": "55f6f91a1995a6091eef758933db7a19fe54da26", "status": "modified" }, { "additions": 2, "blob_url": "https://github.com/nysenate/OpenLegislation/blob/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fmodel%2Fadmin%2FReportDAO.java", "changes": 5, "contents_url": "https://api.github.com/repos/nysenate/OpenLegislation/contents/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fmodel%2Fadmin%2FReportDAO.java?ref=f89655fbb32c1372837f17bb6f7ed81f7a32c654", "deletions": 3, "filename": "src/main/java/gov/nysenate/openleg/model/admin/ReportDAO.java", "new_code": "import org.apache.commons.dbutils.QueryRunner;\nimport org.apache.commons.dbutils.ResultSetHandler;", "new_methods": [], "old_code": "import org.apache.commons.dbutils.QueryRunner;\nimport org.apache.commons.dbutils.ResultSetHandler;\n", "old_methods": [], "patch": "@@ -1,6 +1,8 @@\n package gov.nysenate.openleg.model.admin;\n \n import gov.nysenate.openleg.util.Application;\n+import org.apache.commons.dbutils.QueryRunner;\n+import org.apache.commons.dbutils.ResultSetHandler;\n \n import java.sql.ResultSet;\n import java.sql.SQLException;\n@@ -9,9 +11,6 @@\n import java.util.Date;\n import java.util.HashMap;\n \n-import org.apache.commons.dbutils.QueryRunner;\n-import org.apache.commons.dbutils.ResultSetHandler;\n-\n public class ReportDAO\n {\n private static class JoinedReportHandler implements ResultSetHandler<ArrayList<Report>> {", "raw_url": "https://github.com/nysenate/OpenLegislation/raw/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fmodel%2Fadmin%2FReportDAO.java", "sha": "682c644634b3219583f3b517b7e39937a5bf7571", "status": "modified" }, { "additions": 0, "blob_url": "https://github.com/nysenate/OpenLegislation/blob/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fmodel%2Fagenda%2FAgendaInfoAddendum.java", "changes": 12, "contents_url": "https://api.github.com/repos/nysenate/OpenLegislation/contents/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fmodel%2Fagenda%2FAgendaInfoAddendum.java?ref=f89655fbb32c1372837f17bb6f7ed81f7a32c654", "deletions": 12, "filename": "src/main/java/gov/nysenate/openleg/model/agenda/AgendaInfoAddendum.java", "new_code": "", "new_methods": [], "old_code": " @Override\n public String getOid()\n {\n return this.getOtype()+\"-\"+this.getYear()+\"-\"+this.getAgendaNumber()+this.getId();\n }\n\n @Override\n public String getOtype()\n {\n return \"agenda-info\";\n }\n", "old_methods": [ { "arguments": [], "filename": "src/main/java/gov/nysenate/openleg/model/agenda/AgendaInfoAddendum.java", "implementation": "return this.getOtype()+\"-\"+this.getYear()+\"-\"+this.getAgendaNumber()+this.getId();", "signature": "String getOid()" }, { "arguments": [], "filename": "src/main/java/gov/nysenate/openleg/model/agenda/AgendaInfoAddendum.java", "implementation": "return \"agenda-info\";", "signature": "String getOtype()" } ], "patch": "@@ -72,18 +72,6 @@ public void removeCommittee(String name)\n this.committees.remove(name);\n }\n \n- @Override\n- public String getOid()\n- {\n- return this.getOtype()+\"-\"+this.getYear()+\"-\"+this.getAgendaNumber()+this.getId();\n- }\n-\n- @Override\n- public String getOtype()\n- {\n- return \"agenda-info\";\n- }\n-\n public Integer getAgendaNumber()\n {\n return agendaNumber;", "raw_url": "https://github.com/nysenate/OpenLegislation/raw/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fmodel%2Fagenda%2FAgendaInfoAddendum.java", "sha": "c33b299989c6924143ae80f96562287cc7756604", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/nysenate/OpenLegislation/blob/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fmodel%2Fagenda%2FAgendaInfoCommitteeItem.java", "changes": 2, "contents_url": "https://api.github.com/repos/nysenate/OpenLegislation/contents/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fmodel%2Fagenda%2FAgendaInfoCommitteeItem.java?ref=f89655fbb32c1372837f17bb6f7ed81f7a32c654", "deletions": 1, "filename": "src/main/java/gov/nysenate/openleg/model/agenda/AgendaInfoCommitteeItem.java", "new_code": "import gov.nysenate.openleg.model.bill.Bill;", "new_methods": [], "old_code": "import gov.nysenate.openleg.model.Bill;", "old_methods": [], "patch": "@@ -1,6 +1,6 @@\n package gov.nysenate.openleg.model.agenda;\n \n-import gov.nysenate.openleg.model.Bill;\n+import gov.nysenate.openleg.model.bill.Bill;\n \n public class AgendaInfoCommitteeItem\n {", "raw_url": "https://github.com/nysenate/OpenLegislation/raw/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fmodel%2Fagenda%2FAgendaInfoCommitteeItem.java", "sha": "856a58c0cddf0779973feee52fe4b6f470b28587", "status": "modified" }, { "additions": 0, "blob_url": "https://github.com/nysenate/OpenLegislation/blob/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fmodel%2Fagenda%2FAgendaVoteAddendum.java", "changes": 13, "contents_url": "https://api.github.com/repos/nysenate/OpenLegislation/contents/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fmodel%2Fagenda%2FAgendaVoteAddendum.java?ref=f89655fbb32c1372837f17bb6f7ed81f7a32c654", "deletions": 13, "filename": "src/main/java/gov/nysenate/openleg/model/agenda/AgendaVoteAddendum.java", "new_code": "", "new_methods": [], "old_code": "\n @Override\n public String getOid()\n {\n // TODO Auto-generated method stub\n return null;\n }\n\n @Override\n public String getOtype()\n {\n return \"agendavote\";\n }", "old_methods": [ { "arguments": [], "filename": "src/main/java/gov/nysenate/openleg/model/agenda/AgendaVoteAddendum.java", "implementation": "// TODO Auto-generated method stub\n return null;", "signature": "String getOid()" }, { "arguments": [], "filename": "src/main/java/gov/nysenate/openleg/model/agenda/AgendaVoteAddendum.java", "implementation": "return \"agendavote\";", "signature": "String getOtype()" } ], "patch": "@@ -67,17 +67,4 @@ public void setAgendaNumber(Integer id)\n {\n this.agendaNumber = id;\n }\n-\n- @Override\n- public String getOid()\n- {\n- // TODO Auto-generated method stub\n- return null;\n- }\n-\n- @Override\n- public String getOtype()\n- {\n- return \"agendavote\";\n- }\n }", "raw_url": "https://github.com/nysenate/OpenLegislation/raw/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fmodel%2Fagenda%2FAgendaVoteAddendum.java", "sha": "d3939d0ba98311e64baaa53ba7d04ea745c7aa22", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/nysenate/OpenLegislation/blob/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fmodel%2Fagenda%2FAgendaVoteCommittee.java", "changes": 6, "contents_url": "https://api.github.com/repos/nysenate/OpenLegislation/contents/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fmodel%2Fagenda%2FAgendaVoteCommittee.java?ref=f89655fbb32c1372837f17bb6f7ed81f7a32c654", "deletions": 5, "filename": "src/main/java/gov/nysenate/openleg/model/agenda/AgendaVoteCommittee.java", "new_code": "import java.util.*;", "new_methods": [], "old_code": "import java.util.ArrayList;\nimport java.util.Date;\nimport java.util.HashMap;\nimport java.util.List;\nimport java.util.Map;", "old_methods": [], "patch": "@@ -1,10 +1,6 @@\n package gov.nysenate.openleg.model.agenda;\n \n-import java.util.ArrayList;\n-import java.util.Date;\n-import java.util.HashMap;\n-import java.util.List;\n-import java.util.Map;\n+import java.util.*;\n \n public class AgendaVoteCommittee\n {", "raw_url": "https://github.com/nysenate/OpenLegislation/raw/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fmodel%2Fagenda%2FAgendaVoteCommittee.java", "sha": "ff7f196599fd3f69650c8dcde7ac931dffb200c1", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/nysenate/OpenLegislation/blob/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fmodel%2Fagenda%2FAgendaVoteCommitteeItem.java", "changes": 2, "contents_url": "https://api.github.com/repos/nysenate/OpenLegislation/contents/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fmodel%2Fagenda%2FAgendaVoteCommitteeItem.java?ref=f89655fbb32c1372837f17bb6f7ed81f7a32c654", "deletions": 1, "filename": "src/main/java/gov/nysenate/openleg/model/agenda/AgendaVoteCommitteeItem.java", "new_code": "import gov.nysenate.openleg.model.bill.Bill;", "new_methods": [], "old_code": "import gov.nysenate.openleg.model.Bill;", "old_methods": [], "patch": "@@ -1,6 +1,6 @@\n package gov.nysenate.openleg.model.agenda;\n \n-import gov.nysenate.openleg.model.Bill;\n+import gov.nysenate.openleg.model.bill.Bill;\n import gov.nysenate.openleg.processors.SenagendaProcessor;\n \n import java.util.ArrayList;", "raw_url": "https://github.com/nysenate/OpenLegislation/raw/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fmodel%2Fagenda%2FAgendaVoteCommitteeItem.java", "sha": "8bb6d4645c12031664684806454d059e1ebf2cdc", "status": "modified" }, { "additions": 132, "blob_url": "https://github.com/nysenate/OpenLegislation/blob/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fmodel%2Fbill%2FBill.java", "changes": 632, "contents_url": "https://api.github.com/repos/nysenate/OpenLegislation/contents/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fmodel%2Fbill%2FBill.java?ref=f89655fbb32c1372837f17bb6f7ed81f7a32c654", "deletions": 500, "filename": "src/main/java/gov/nysenate/openleg/model/bill/Bill.java", "new_code": "import gov.nysenate.openleg.model.entity.Person;\nimport org.codehaus.jackson.annotate.JsonIgnore;\nimport java.util.*;\n/**\n * The Bill class serves as a container for all the entities that can be classified under a print number\n * and session year. It contains a collection of amendments (including the base amendment) as well as\n * shared information such as the sponsor or actions.\n */\n /** The print number of the bill, e.g S1234 */\n protected String printNo = \"\";\n /** The law code of the bill. */\n protected String law = \"\";\n\n /** The summary of the bill. */\n /** Map of amendment version -> Amendment. */\n protected Map<String, BillAmendment> amendmentMap = new TreeMap<>();\n protected String activeVersion = BASE_VERSION;\n protected List<String> previousVersions = new ArrayList<>();\n private List<Person> otherSponsors = new ArrayList<>();\n protected List<String> pastCommittees = new ArrayList<>();\n protected List<BillAction> actions = new ArrayList<>();\n\n /** --- Constructors --- */\n public Bill(String printNo, int sessionYear) {\n this.printNo = printNo;\n this.session = sessionYear;\n this.year = sessionYear;\n /** --- Functional Getters/Setter --- */\n\n * Indicates if this bill is currently set to the base version.\n public static boolean isBaseVersion(String version) {\n * Creates a unique id for the bill by using printNo and session year, e.g S1234-2013\n public String getBillId() {\n return this.printNo + \"-\" + this.session;\n * Indicate if this bill is a resolution by checking that it's not a senate/assembly bill.\n * @return - True if this bill is a resolution of some sort.\n public boolean isResolution() {\n return this.printNo.charAt(0) != 'A' && this.printNo.charAt(0) != 'S';\n * Creates a unique id for the bill with padding to resemble LBDC's representation.\n public String getPaddedBillId() {\n return this.getPaddedPrintNumber() + \"-\" + this.getSession();\n * Returns the print number padded with 5 zeros, e.g S01234. This is how LBDC represents\n * print numbers in their SOBI files.\n public String getPaddedPrintNumber() {\n Matcher billIdMatcher = printNumberPattern.matcher(this.getPrintNo());\n return String.format(\"%s%05d%s\", billIdMatcher.group(1), Integer.parseInt(billIdMatcher.group(2)),\n billIdMatcher.group(3));\n return \"\";\n * Retrieves an amendment stored in this bill using the version as the key.\n * @return BillAmendment if found, null otherwise\n public BillAmendment getAmendment(String version) {\n * Retrieves a list of all amendments stored in this bill.\n * @return - List<BillAmendment>\n public List<BillAmendment> getAmendmentList() {\n * @param billAmendment - Amendment to add to this bill.\n public void addAmendment(BillAmendment billAmendment) {\n /**\n * Associate a list of amendments with this bill.\n * @param billAmendments - List<Amendment> - Amendments to add to this bill\n */\n public void addAmendments(List<BillAmendment> billAmendments) {\n for (BillAmendment billAmendment : billAmendments) {\n this.addAmendment(billAmendment);\n }\n }\n\n * Convenience method to retrieve the currently active Amendment object.\n * @return BillAmendment\n public BillAmendment getActiveAmendment() {\n * Add an action to the list of actions.\n * @param action BillAction\n public void addAction(BillAction action) {\n actions.add(action);\n * Adds a committee to the list of past committees.\n * @param committee\n public void addPastCommittee(String committee) {\n if(!pastCommittees.contains(committee)) {\n pastCommittees.add(committee);\n /** --- Delegates --- */\n public String getFulltext() {\n /** --- Basic Getters/Setters --- */\n public String getPrintNo() {\n return printNo;\n public void setPrintNo(String printNo) {\n this.printNo = printNo;\n public String getTitle() {\n return title;\n public void setTitle(String title) {\n this.title = title;\n public String getLawSection() {\n return lawSection;\n public void setLawSection(String lawSection) {\n this.lawSection = lawSection;\n public String getLaw() {\n return law;\n public void setLaw(String law) {\n this.law = law;\n public String getSummary() {\n return summary;\n public void setSummary(String summary) {\n this.summary = summary;\n public String getActiveVersion() {\n return activeVersion;\n public void setActiveVersion(String activeVersion) {\n this.activeVersion = activeVersion;\n public Map<String, BillAmendment> getAmendmentMap() {\n return amendmentMap;\n public List<String> getPreviousVersions() {\n return previousVersions;\n public void setPreviousVersions(List<String> previousVersions) {\n this.previousVersions = previousVersions;\n public List<BillAction> getActions() {\n return actions;\n public void setActions(List<BillAction> actions) {\n this.actions = actions;\n public Person getSponsor() {\n return sponsor;\n public void setSponsor(Person sponsor) {\n this.sponsor = sponsor;\n public List<String> getPastCommittees() {\n return pastCommittees;\n public void setPastCommittees(List<String> pastCommittees) {\n this.pastCommittees = new ArrayList<>(pastCommittees);\n public List<Person> getOtherSponsors() {\n return otherSponsors;\n public void setOtherSponsors(List<Person> otherSponsors) {\n this.otherSponsors = otherSponsors;\n public void setPublishDate(Date publishDate) {\n public Date getModifiedDate() {\n public boolean equals(Object obj) {\n public int compareTo(Bill bill) {\n public static String formatBillNo(String term) {", "new_methods": [ { "arguments": [ "String printNo", " int sessionYear" ], "filename": "src/main/java/gov/nysenate/openleg/model/bill/Bill.java", "implementation": "this.printNo = printNo;\n this.session = sessionYear;\n this.year = sessionYear;\n /** --- Functional Getters/Setter --- */\n\n * Indicates if this bill is currently set to the base version.\n public static boolean isBaseVersion(String version) {\n * Creates a unique id for the bill by using printNo and session year, e.g S1234-2013\n public String getBillId() {\n return this.printNo + \"-\" + this.session;\n * Indicate if this bill is a resolution by checking that it's not a senate/assembly bill.\n * @return - True if this bill is a resolution of some sort.\n public boolean isResolution() {\n return this.printNo.charAt(0) != 'A' && this.printNo.charAt(0) != 'S';\n * Creates a unique id for the bill with padding to resemble LBDC's representation.\n public String getPaddedBillId() {\n return this.getPaddedPrintNumber() + \"-\" + this.getSession();\n * Returns the print number padded with 5 zeros, e.g S01234. This is how LBDC represents\n * print numbers in their SOBI files.\n public String getPaddedPrintNumber() {\n Matcher billIdMatcher = printNumberPattern.matcher(this.getPrintNo());\n return String.format(\"%s%05d%s\", billIdMatcher.group(1), Integer.parseInt(billIdMatcher.group(2)),\n billIdMatcher.group(3));\n return \"\";\n * Retrieves an amendment stored in this bill using the version as the key.\n * @return BillAmendment if found, null otherwise\n public BillAmendment getAmendment(String version) {\n * Retrieves a list of all amendments stored in this bill.\n * @return - List<BillAmendment>\n public List<BillAmendment> getAmendmentList() {\n * @param billAmendment - Amendment to add to this bill.\n public void addAmendment(BillAmendment billAmendment) {\n /**\n * Associate a list of amendments with this bill.\n * @param billAmendments - List<Amendment> - Amendments to add to this bill\n */\n public void addAmendments(List<BillAmendment> billAmendments) {\n for (BillAmendment billAmendment : billAmendments) {\n this.addAmendment(billAmendment);", "signature": "public Bill(String printNo, int sessionYear)" } ], "old_code": "import gov.nysenate.openleg.model.Person;\nimport gov.nysenate.openleg.model.Vote;\nimport java.util.ArrayList;\nimport java.util.Date;\nimport java.util.LinkedHashMap;\nimport java.util.LinkedList;\nimport java.util.List;\nimport java.util.Map;\nimport org.codehaus.jackson.annotate.JsonIgnore;\n\n public static Pattern billIdPattern = Pattern.compile(\"(\"+printNumberPattern.pattern()+\")-([0-9]{4})\");\n /** Error message for when an invalid bill version is supplied as an argument */\n private static final String INVALID_AMENDMENT_VERSION = \"Specified amendment version does not exist: \";\n\n /** The unique bill id. */\n protected String billId = \"\";\n /** The summary of the amendment. */\n /** Map of amendment version -> Amendment. The default amendment should\n * not be included in this mapping. */\n protected LinkedHashMap<String, BillAmendment> amendmentMap = new LinkedHashMap<>();\n protected String activeVersion = Bill.BASE_VERSION;\n\n /** Retains a history of versions that were activated */\n protected LinkedList<String> activeHistory = new LinkedList<>();\n protected List<String> previousVersions = new ArrayList<String>();\n private List<Person> otherSponsors = new ArrayList<Person>();\n protected List<String> pastCommittees = new ArrayList<String>();\n protected List<BillAction> actions = new ArrayList<BillAction>();\n /**\n * Constructs a minimal Bill object.\n *\n * @param billId - The unique bill id\n * @param session - The session year this bill was introduced to\n */\n public Bill(String billId, int session)\n {\n this();\n this.setBillId(billId);\n this.setSession(session);\n this.setYear(session);\n @JsonIgnore\n public static boolean isBaseVersion(String version)\n {\n * @return - True if this bill is a resolution of some sort.\n */\n @JsonIgnore\n public boolean isResolution()\n {\n return billId.charAt(0)!='A' && billId.charAt(0)!='S';\n }\n\n /**\n * @return - The URL used to construct Disqus threads\n */\n @JsonIgnore\n public String getDisqusUrl()\n {\n if (this.getSession()==2009) {\n String disqusId = this.getBillId().split(\"-\")[0];\n return \"http://open.nysenate.gov/legislation/api/html/bill/\" + disqusId;\n }\n else {\n String disqusId = this.getBillId();\n return \"http://open.nysenate.gov/legislation/bill/\" + disqusId;\n }\n }\n\n /**\n public String getBillId()\n {\n return billId;\n * @param billId - The new bill id.\n */\n public void setBillId(String billId)\n {\n this.billId = billId;\n }\n\n /**\n * The object type of the bill.\n */\n @JsonIgnore\n public String getOtype()\n {\n return \"bill\";\n }\n\n /**\n * @return - The unique object id.\n @JsonIgnore\n public String getOid()\n {\n return this.getBillId();\n @JsonIgnore\n public String getPaddedBillId()\n {\n return this.getPaddedPrintNumber()+\"-\"+this.getSession();\n @JsonIgnore\n public String getPaddedPrintNumber()\n {\n Matcher billIdMatcher = billIdPattern.matcher(this.getBillId());\n if (billIdMatcher.find()) {\n return String.format(\"%s%05d%s\", billIdMatcher.group(2), Integer.parseInt(billIdMatcher.group(3)), billIdMatcher.group(4));\n }\n else {\n // logger.warn(\"Invalid senateBillNo: \"+this.senateBillNo);\n return \"\";\n }\n }\n\n /**\n * @return - Just the print number without the session year suffix.\n */\n @JsonIgnore\n public String getPrintNumber()\n {\n Matcher billIdMatcher = billIdPattern.matcher(this.getBillId());\n return billIdMatcher.group(1);\n }\n else {\n // logger.warn(\"Invalid senateBillNo: \"+this.senateBillNo);\n return \"\";\n * @return Amendment if found, null otherwise\n @JsonIgnore\n public BillAmendment getAmendment(String version)\n {\n * @return - A list of all Amendments associated with this Bill.\n @JsonIgnore\n public List<BillAmendment> getAmendmentList()\n {\n * @param billAmendment - Amendment to associate.\n public void addAmendment(BillAmendment billAmendment)\n {\n * @return Mapping of Amendment versions to Amendment objects for keyed retrieval.\n public Map<String, BillAmendment> getAmendmentMap()\n {\n return amendmentMap;\n }\n\n public BillAmendment getActiveAmendment()\n {\n /**\n * @return The active amendment version.\n */\n public String getActiveVersion()\n {\n return activeVersion;\n }\n\n /**\n * @param activeVersion - The new active amendment version.\n */\n public void setActiveVersion(String activeVersion)\n {\n this.activeVersion = activeVersion;\n }\n\n public LinkedList<String> getActiveHistory() {\n return activeHistory;\n }\n\n public void setActiveHistory(LinkedList<String> activeHistory) {\n this.activeHistory = activeHistory;\n }\n\n /**\n * @return - The current bill title\n */\n public String getTitle()\n {\n return title;\n }\n\n /**\n * @param title - The new bill title\n */\n public void setTitle(String title)\n {\n this.title = title;\n }\n\n /**\n * @return - The current law section.\n */\n public String getLawSection()\n {\n return lawSection;\n }\n\n public void setLawSection(String lawSection)\n {\n this.lawSection = lawSection;\n }\n\n public String getSameAs()\n {\n return this.getActiveAmendment().getSameAs();\n }\n\n public String getSameAs(String version)\n {\n if (hasAmendment(version)) {\n return getAmendment(version).getSameAs();\n }\n throw new IllegalArgumentException(INVALID_AMENDMENT_VERSION+version);\n }\n\n /**\n * @param sameAs - The new same as bill ID.\n */\n public void setSameAs(String sameAs, String version)\n {\n if (hasAmendment(version)) {\n getAmendment(version).setSameAs(sameAs);\n } else {\n throw new IllegalArgumentException(INVALID_AMENDMENT_VERSION+version);\n }\n }\n\n /**\n * @return - The current list of bill ids of previous bill versions.\n */\n public List<String> getPreviousVersions()\n {\n return previousVersions;\n }\n\n /**\n * @param previousVersions - The new list of bill IDs of previous versions.\n */\n public void setPreviousVersions(List<String> previousVersions)\n {\n this.previousVersions = previousVersions;\n }\n\n * @return - The current bill sponsor.\n */\n public Person getSponsor()\n {\n return sponsor;\n }\n\n /**\n * @param sponsor - The new bill sponsor.\n */\n public void setSponsor(Person sponsor)\n {\n this.sponsor = sponsor;\n }\n\n /**\n * @return - The current list of \"other\" sponsors.\n */\n public List<Person> getOtherSponsors()\n {\n return otherSponsors;\n }\n\n /**\n * @param otherSponsors - The new list of \"other\" sponsors.\n public void setOtherSponsors(List<Person> otherSponsors)\n {\n this.otherSponsors = otherSponsors;\n }\n\n public List<Person> getCoSponsors()\n {\n return this.getActiveAmendment().getCoSponsors();\n }\n\n public List<Person> getCoSponsors(String version)\n {\n if (hasAmendment(version)) {\n return getAmendment(version).getCoSponsors();\n } else {\n throw new IllegalArgumentException(INVALID_AMENDMENT_VERSION+version);\n }\n * @param coSponsors - The new list of cosponsors.\n public void setCoSponsors(List<Person> coSponsors, String version)\n {\n if (hasAmendment(version)) {\n getAmendment(version).setCoSponsors(coSponsors);\n } else {\n throw new IllegalArgumentException(INVALID_AMENDMENT_VERSION+version);\n }\n }\n\n public List<Person> getMultiSponsors()\n {\n return this.getActiveAmendment().getMultiSponsors();\n }\n\n public List<Person> getMultiSponsorsList(String version)\n {\n if (hasAmendment(version)) {\n return getAmendment(version).getMultiSponsors();\n throw new IllegalArgumentException(INVALID_AMENDMENT_VERSION+version);\n public void setMultiSponsors(List<Person> multiSponsors, String version)\n {\n if (hasAmendment(version)) {\n getAmendment(version).setMultiSponsors(multiSponsors);\n } else {\n throw new IllegalArgumentException(INVALID_AMENDMENT_VERSION+version);\n }\n }\n public String getSummary()\n {\n return summary;\n }\n\n public void setSummary(String summary)\n {\n this.summary = summary;\n }\n\n public List<BillAction> getActions()\n {\n return actions;\n }\n\n public void setActions(List<BillAction> actions)\n {\n this.actions = actions;\n }\n\n public void addAction(BillAction action) {\n actions.add(action);\n }\n\n public String getFulltext()\n {\n public String getFulltext(String version)\n {\n if (hasAmendment(version)) {\n return getAmendment(version).getFulltext();\n }\n throw new IllegalArgumentException(INVALID_AMENDMENT_VERSION+version);\n }\n public void setFulltext(String fulltext, String version)\n {\n if (hasAmendment(version)) {\n getAmendment(version).setFulltext(fulltext);\n } else {\n throw new IllegalArgumentException(INVALID_AMENDMENT_VERSION+version);\n }\n public String getMemo()\n {\n return this.getActiveAmendment().getMemo();\n public String getMemo(String version)\n {\n if (hasAmendment(version)) {\n getAmendment(version).getMemo();\n }\n throw new IllegalArgumentException(INVALID_AMENDMENT_VERSION+version);\n public void setMemo(String memo, String version)\n {\n if (hasAmendment(version)) {\n getAmendment(version).setMemo(memo);\n } else {\n throw new IllegalArgumentException(INVALID_AMENDMENT_VERSION+version);\n }\n public String getLaw()\n {\n return this.getActiveAmendment().getLaw();\n public String getLaw(String version)\n {\n if (hasAmendment(version)) {\n return getAmendment(version).getLaw();\n }\n throw new IllegalArgumentException(INVALID_AMENDMENT_VERSION+version);\n public void setLaw(String law, String version)\n {\n if (hasAmendment(version)) {\n getAmendment(version).setLaw(law);\n } else {\n throw new IllegalArgumentException(INVALID_AMENDMENT_VERSION+version);\n }\n public String getActClause(String version)\n {\n if (hasAmendment(version)) {\n return getAmendment(version).getActClause();\n }\n throw new IllegalArgumentException(INVALID_AMENDMENT_VERSION+version);\n public void setActClause(String actClause, String version)\n {\n if (hasAmendment(version)) {\n getAmendment(version).setActClause(actClause);\n } else {\n throw new IllegalArgumentException(INVALID_AMENDMENT_VERSION+version);\n }\n public Boolean isStricken(String version)\n {\n if (hasAmendment(version)) {\n return getAmendment(version).isStricken();\n }\n throw new IllegalArgumentException(INVALID_AMENDMENT_VERSION+version);\n public void setStricken(Boolean stricken, String version)\n {\n if (hasAmendment(version)) {\n getAmendment(version).setStricken(stricken);\n } else {\n throw new IllegalArgumentException(INVALID_AMENDMENT_VERSION+version);\n }\n public boolean isUniBill(String version)\n {\n if (hasAmendment(version)) {\n return this.getAmendment(version).isUniBill();\n }\n else {\n throw new IllegalArgumentException(INVALID_AMENDMENT_VERSION+version);\n }\n public void setUniBill(boolean uniBill, String version)\n {\n if (hasAmendment(version)) {\n this.getAmendment(version).setUniBill(uniBill);\n }\n else {\n throw new IllegalArgumentException(INVALID_AMENDMENT_VERSION+version);\n }\n\n public String getCurrentCommittee()\n {\n return this.getActiveAmendment().getCurrentCommittee();\n public String getCurrentCommittee(String version)\n {\n if (hasAmendment(version)) {\n return getAmendment(version).getCurrentCommittee();\n }\n throw new IllegalArgumentException(INVALID_AMENDMENT_VERSION+version);\n public void setCurrentCommittee(String currentCommittee, String version)\n {\n if (hasAmendment(version)) {\n getAmendment(version).setCurrentCommittee(currentCommittee);\n } else {\n throw new IllegalArgumentException(INVALID_AMENDMENT_VERSION+version);\n }\n public List<String> getPastCommittees()\n {\n return pastCommittees;\n public void setPastCommittees(List<String> pastCommittees)\n {\n this.pastCommittees = new ArrayList<String>(pastCommittees);\n public void addPastCommittee(String committee)\n {\n if(!pastCommittees.contains(committee)) {\n pastCommittees.add(committee);\n }\n public List<Vote> getVotes()\n {\n ArrayList<Vote> votes = new ArrayList<Vote>();\n for(BillAmendment amendment : this.getAmendmentList()) {\n votes.addAll(amendment.getVotes());\n }\n return votes;\n public List<Vote> getVotes(String version)\n {\n if (hasAmendment(version)) {\n return getAmendment(version).getVotes();\n }\n throw new IllegalArgumentException(INVALID_AMENDMENT_VERSION+version);\n public void setVotes(List<Vote> votes, String version)\n {\n if (hasAmendment(version)) {\n getAmendment(version).setVotes(votes);\n } else {\n throw new IllegalArgumentException(INVALID_AMENDMENT_VERSION+version);\n }\n /**\n * @param vote - The new vote to add to the list of votes on this bill. Replaces exiting vote data if a match is found.\n */\n public void updateVote(Vote vote, String version)\n {\n if (hasAmendment(version)) {\n getAmendment(version).getVotes().remove(vote);\n getAmendment(version).getVotes().add(vote);\n } else {\n throw new IllegalArgumentException(INVALID_AMENDMENT_VERSION+version);\n }\n public void setPublishDate(Date publishDate)\n {\n public Date getModifiedDate()\n {\n /**\n * @param vote - The vote to remove from the list of votes on this bill.\n */\n public void removeVote(Vote vote, String version)\n {\n if (hasAmendment(version)) {\n getAmendment(version).getVotes().remove(vote);\n } else {\n throw new IllegalArgumentException(INVALID_AMENDMENT_VERSION+version);\n }\n }\n\n public boolean equals(Object obj)\n {\n public int compareTo(Bill bill)\n {\n public static String formatBillNo(String term)\n {", "old_methods": [ { "arguments": [ "String billId", " int session" ], "filename": "src/main/java/gov/nysenate/openleg/model/bill/Bill.java", "implementation": "this();\n this.setBillId(billId);\n this.setSession(session);\n this.setYear(session);\n @JsonIgnore\n public static boolean isBaseVersion(String version)\n {\n * @return - True if this bill is a resolution of some sort.\n */\n @JsonIgnore\n public boolean isResolution()\n {\n return billId.charAt(0)!='A' && billId.charAt(0)!='S';", "signature": "public Bill(String billId, int session)" }, { "arguments": [], "filename": "src/main/java/gov/nysenate/openleg/model/bill/Bill.java", "implementation": "if (this.getSession()==2009) {\n String disqusId = this.getBillId().split(\"-\")[0];\n return \"http://open.nysenate.gov/legislation/api/html/bill/\" + disqusId;", "signature": "String getDisqusUrl()" }, { "arguments": [], "filename": "src/main/java/gov/nysenate/openleg/model/bill/Bill.java", "implementation": "return billId;\n * @param billId - The new bill id.\n */\n public void setBillId(String billId)\n {\n this.billId = billId;", "signature": "String getBillId()" }, { "arguments": [], "filename": "src/main/java/gov/nysenate/openleg/model/bill/Bill.java", "implementation": "return \"bill\";", "signature": "String getOtype()" }, { "arguments": [], "filename": "src/main/java/gov/nysenate/openleg/model/bill/Bill.java", "implementation": "return this.getBillId();\n @JsonIgnore\n public String getPaddedBillId()\n {\n return this.getPaddedPrintNumber()+\"-\"+this.getSession();\n @JsonIgnore\n public String getPaddedPrintNumber()\n {\n Matcher billIdMatcher = billIdPattern.matcher(this.getBillId());\n if (billIdMatcher.find()) {\n return String.format(\"%s%05d%s\", billIdMatcher.group(2), Integer.parseInt(billIdMatcher.group(3)), billIdMatcher.group(4));", "signature": "String getOid()" }, { "arguments": [], "filename": "src/main/java/gov/nysenate/openleg/model/bill/Bill.java", "implementation": "Matcher billIdMatcher = billIdPattern.matcher(this.getBillId());\n return billIdMatcher.group(1);", "signature": "String getPrintNumber()" }, { "arguments": [ "String version" ], "filename": "src/main/java/gov/nysenate/openleg/model/bill/Bill.java", "implementation": "* @return - A list of all Amendments associated with this Bill.\n @JsonIgnore\n public List<BillAmendment> getAmendmentList()\n {\n * @param billAmendment - Amendment to associate.\n public void addAmendment(BillAmendment billAmendment)\n {\n * @return Mapping of Amendment versions to Amendment objects for keyed retrieval.\n public Map<String, BillAmendment> getAmendmentMap()\n {\n return amendmentMap;", "signature": "BillAmendment getAmendment(String version)" }, { "arguments": [], "filename": "src/main/java/gov/nysenate/openleg/model/bill/Bill.java", "implementation": "/**\n * @return The active amendment version.\n */\n public String getActiveVersion()\n {\n return activeVersion;", "signature": "BillAmendment getActiveAmendment()" }, { "arguments": [ "String activeVersion" ], "filename": "src/main/java/gov/nysenate/openleg/model/bill/Bill.java", "implementation": "this.activeVersion = activeVersion;", "signature": "void setActiveVersion(String activeVersion)" }, { "arguments": [ "LinkedList<String> activeHistory" ], "filename": "src/main/java/gov/nysenate/openleg/model/bill/Bill.java", "implementation": "this.activeHistory = activeHistory;", "signature": "void setActiveHistory(LinkedList<String> activeHistory)" }, { "arguments": [], "filename": "src/main/java/gov/nysenate/openleg/model/bill/Bill.java", "implementation": "return title;", "signature": "String getTitle()" }, { "arguments": [ "String title" ], "filename": "src/main/java/gov/nysenate/openleg/model/bill/Bill.java", "implementation": "this.title = title;", "signature": "void setTitle(String title)" }, { "arguments": [], "filename": "src/main/java/gov/nysenate/openleg/model/bill/Bill.java", "implementation": "return lawSection;", "signature": "String getLawSection()" }, { "arguments": [ "String lawSection" ], "filename": "src/main/java/gov/nysenate/openleg/model/bill/Bill.java", "implementation": "this.lawSection = lawSection;", "signature": "void setLawSection(String lawSection)" }, { "arguments": [], "filename": "src/main/java/gov/nysenate/openleg/model/bill/Bill.java", "implementation": "return this.getActiveAmendment().getSameAs();", "signature": "String getSameAs()" }, { "arguments": [ "String version" ], "filename": "src/main/java/gov/nysenate/openleg/model/bill/Bill.java", "implementation": "if (hasAmendment(version)) {\n return getAmendment(version).getSameAs();", "signature": "String getSameAs(String version)" }, { "arguments": [ "String sameAs", " String version" ], "filename": "src/main/java/gov/nysenate/openleg/model/bill/Bill.java", "implementation": "if (hasAmendment(version)) {\n getAmendment(version).setSameAs(sameAs);", "signature": "void setSameAs(String sameAs, String version)" }, { "arguments": [ "List<String> previousVersions" ], "filename": "src/main/java/gov/nysenate/openleg/model/bill/Bill.java", "implementation": "this.previousVersions = previousVersions;", "signature": "void setPreviousVersions(List<String> previousVersions)" }, { "arguments": [], "filename": "src/main/java/gov/nysenate/openleg/model/bill/Bill.java", "implementation": "return sponsor;", "signature": "Person getSponsor()" }, { "arguments": [ "Person sponsor" ], "filename": "src/main/java/gov/nysenate/openleg/model/bill/Bill.java", "implementation": "this.sponsor = sponsor;", "signature": "void setSponsor(Person sponsor)" }, { "arguments": [ "List<Person> otherSponsors" ], "filename": "src/main/java/gov/nysenate/openleg/model/bill/Bill.java", "implementation": "this.otherSponsors = otherSponsors;", "signature": "void setOtherSponsors(List<Person> otherSponsors)" }, { "arguments": [ "List<Person> coSponsors", " String version" ], "filename": "src/main/java/gov/nysenate/openleg/model/bill/Bill.java", "implementation": "if (hasAmendment(version)) {\n getAmendment(version).setCoSponsors(coSponsors);", "signature": "void setCoSponsors(List<Person> coSponsors, String version)" }, { "arguments": [ "List<Person> multiSponsors", " String version" ], "filename": "src/main/java/gov/nysenate/openleg/model/bill/Bill.java", "implementation": "if (hasAmendment(version)) {\n getAmendment(version).setMultiSponsors(multiSponsors);", "signature": "void setMultiSponsors(List<Person> multiSponsors, String version)" }, { "arguments": [], "filename": "src/main/java/gov/nysenate/openleg/model/bill/Bill.java", "implementation": "return summary;", "signature": "String getSummary()" }, { "arguments": [ "String summary" ], "filename": "src/main/java/gov/nysenate/openleg/model/bill/Bill.java", "implementation": "this.summary = summary;", "signature": "void setSummary(String summary)" }, { "arguments": [ "List<BillAction> actions" ], "filename": "src/main/java/gov/nysenate/openleg/model/bill/Bill.java", "implementation": "this.actions = actions;", "signature": "void setActions(List<BillAction> actions)" }, { "arguments": [ "BillAction action" ], "filename": "src/main/java/gov/nysenate/openleg/model/bill/Bill.java", "implementation": "actions.add(action);", "signature": "void addAction(BillAction action)" }, { "arguments": [], "filename": "src/main/java/gov/nysenate/openleg/model/bill/Bill.java", "implementation": "public String getFulltext(String version)\n {\n if (hasAmendment(version)) {\n return getAmendment(version).getFulltext();", "signature": "String getFulltext()" }, { "arguments": [ "String fulltext", " String version" ], "filename": "src/main/java/gov/nysenate/openleg/model/bill/Bill.java", "implementation": "if (hasAmendment(version)) {\n getAmendment(version).setFulltext(fulltext);", "signature": "void setFulltext(String fulltext, String version)" }, { "arguments": [], "filename": "src/main/java/gov/nysenate/openleg/model/bill/Bill.java", "implementation": "return this.getActiveAmendment().getMemo();\n public String getMemo(String version)\n {\n if (hasAmendment(version)) {\n getAmendment(version).getMemo();", "signature": "String getMemo()" }, { "arguments": [ "String memo", " String version" ], "filename": "src/main/java/gov/nysenate/openleg/model/bill/Bill.java", "implementation": "if (hasAmendment(version)) {\n getAmendment(version).setMemo(memo);", "signature": "void setMemo(String memo, String version)" }, { "arguments": [], "filename": "src/main/java/gov/nysenate/openleg/model/bill/Bill.java", "implementation": "return this.getActiveAmendment().getLaw();\n public String getLaw(String version)\n {\n if (hasAmendment(version)) {\n return getAmendment(version).getLaw();", "signature": "String getLaw()" }, { "arguments": [ "String law", " String version" ], "filename": "src/main/java/gov/nysenate/openleg/model/bill/Bill.java", "implementation": "if (hasAmendment(version)) {\n getAmendment(version).setLaw(law);", "signature": "void setLaw(String law, String version)" }, { "arguments": [ "String version" ], "filename": "src/main/java/gov/nysenate/openleg/model/bill/Bill.java", "implementation": "if (hasAmendment(version)) {\n return getAmendment(version).getActClause();", "signature": "String getActClause(String version)" }, { "arguments": [ "String actClause", " String version" ], "filename": "src/main/java/gov/nysenate/openleg/model/bill/Bill.java", "implementation": "if (hasAmendment(version)) {\n getAmendment(version).setActClause(actClause);", "signature": "void setActClause(String actClause, String version)" }, { "arguments": [ "String version" ], "filename": "src/main/java/gov/nysenate/openleg/model/bill/Bill.java", "implementation": "if (hasAmendment(version)) {\n return getAmendment(version).isStricken();", "signature": "Boolean isStricken(String version)" }, { "arguments": [ "Boolean stricken", " String version" ], "filename": "src/main/java/gov/nysenate/openleg/model/bill/Bill.java", "implementation": "if (hasAmendment(version)) {\n getAmendment(version).setStricken(stricken);", "signature": "void setStricken(Boolean stricken, String version)" }, { "arguments": [ "String version" ], "filename": "src/main/java/gov/nysenate/openleg/model/bill/Bill.java", "implementation": "if (hasAmendment(version)) {\n return this.getAmendment(version).isUniBill();", "signature": "boolean isUniBill(String version)" }, { "arguments": [ "boolean uniBill", " String version" ], "filename": "src/main/java/gov/nysenate/openleg/model/bill/Bill.java", "implementation": "if (hasAmendment(version)) {\n this.getAmendment(version).setUniBill(uniBill);", "signature": "void setUniBill(boolean uniBill, String version)" }, { "arguments": [], "filename": "src/main/java/gov/nysenate/openleg/model/bill/Bill.java", "implementation": "return this.getActiveAmendment().getCurrentCommittee();\n public String getCurrentCommittee(String version)\n {\n if (hasAmendment(version)) {\n return getAmendment(version).getCurrentCommittee();", "signature": "String getCurrentCommittee()" }, { "arguments": [ "String currentCommittee", " String version" ], "filename": "src/main/java/gov/nysenate/openleg/model/bill/Bill.java", "implementation": "if (hasAmendment(version)) {\n getAmendment(version).setCurrentCommittee(currentCommittee);", "signature": "void setCurrentCommittee(String currentCommittee, String version)" }, { "arguments": [ "List<String> pastCommittees" ], "filename": "src/main/java/gov/nysenate/openleg/model/bill/Bill.java", "implementation": "this.pastCommittees = new ArrayList<String>(pastCommittees);\n public void addPastCommittee(String committee)\n {\n if(!pastCommittees.contains(committee)) {\n pastCommittees.add(committee);", "signature": "void setPastCommittees(List<String> pastCommittees)" }, { "arguments": [ "List<Vote> votes", " String version" ], "filename": "src/main/java/gov/nysenate/openleg/model/bill/Bill.java", "implementation": "if (hasAmendment(version)) {\n getAmendment(version).setVotes(votes);", "signature": "void setVotes(List<Vote> votes, String version)" }, { "arguments": [ "Vote vote", " String version" ], "filename": "src/main/java/gov/nysenate/openleg/model/bill/Bill.java", "implementation": "if (hasAmendment(version)) {\n getAmendment(version).getVotes().remove(vote);\n getAmendment(version).getVotes().add(vote);", "signature": "void updateVote(Vote vote, String version)" }, { "arguments": [ "Date publishDate" ], "filename": "src/main/java/gov/nysenate/openleg/model/bill/Bill.java", "implementation": "public Date getModifiedDate()\n {\n /**\n * @param vote - The vote to remove from the list of votes on this bill.\n */\n public void removeVote(Vote vote, String version)\n {\n if (hasAmendment(version)) {\n getAmendment(version).getVotes().remove(vote);", "signature": "void setPublishDate(Date publishDate)" } ], "patch": "@@ -1,226 +1,159 @@\n package gov.nysenate.openleg.model.bill;\n \n import gov.nysenate.openleg.model.BaseObject;\n-import gov.nysenate.openleg.model.Person;\n-import gov.nysenate.openleg.model.Vote;\n+import gov.nysenate.openleg.model.entity.Person;\n import gov.nysenate.openleg.util.SessionYear;\n import gov.nysenate.openleg.util.TextFormatter;\n+import org.codehaus.jackson.annotate.JsonIgnore;\n \n-import java.util.ArrayList;\n-import java.util.Date;\n-import java.util.LinkedHashMap;\n-import java.util.LinkedList;\n-import java.util.List;\n-import java.util.Map;\n+import java.util.*;\n import java.util.regex.Matcher;\n import java.util.regex.Pattern;\n \n-import org.codehaus.jackson.annotate.JsonIgnore;\n-\n+/**\n+ * The Bill class serves as a container for all the entities that can be classified under a print number\n+ * and session year. It contains a collection of amendments (including the base amendment) as well as\n+ * shared information such as the sponsor or actions.\n+ */\n public class Bill extends BaseObject implements Comparable<Bill>\n {\n public static Pattern printNumberPattern = Pattern.compile(\"([ASLREJKBC])([0-9]{1,5})([A-Z]?)\");\n- public static Pattern billIdPattern = Pattern.compile(\"(\"+printNumberPattern.pattern()+\")-([0-9]{4})\");\n \n /** The default amendment version letter. */\n public static final String BASE_VERSION = \"\";\n \n- /** Error message for when an invalid bill version is supplied as an argument */\n- private static final String INVALID_AMENDMENT_VERSION = \"Specified amendment version does not exist: \";\n-\n- /** The unique bill id. */\n- protected String billId = \"\";\n+ /** The print number of the bill, e.g S1234 */\n+ protected String printNo = \"\";\n \n /** The bill title. */\n protected String title = \"\";\n \n /** The section of the law the bill affects. */\n protected String lawSection = \"\";\n \n- /** The summary of the amendment. */\n+ /** The law code of the bill. */\n+ protected String law = \"\";\n+\n+ /** The summary of the bill. */\n protected String summary = \"\";\n \n- /** Map of amendment version -> Amendment. The default amendment should\n- * not be included in this mapping. */\n- protected LinkedHashMap<String, BillAmendment> amendmentMap = new LinkedHashMap<>();\n+ /** Map of amendment version -> Amendment. */\n+ protected Map<String, BillAmendment> amendmentMap = new TreeMap<>();\n \n /** Indicates the amendment version that is active for this bill. */\n- protected String activeVersion = Bill.BASE_VERSION;\n-\n- /** Retains a history of versions that were activated */\n- protected LinkedList<String> activeHistory = new LinkedList<>();\n+ protected String activeVersion = BASE_VERSION;\n \n /** A list of ids of versions of this legislation in previous sessions. */\n- protected List<String> previousVersions = new ArrayList<String>();\n+ protected List<String> previousVersions = new ArrayList<>();\n \n /** The sponsor of this bill. */\n protected Person sponsor;\n \n /** A list of coSponsors to be given preferential display treatment. */\n- private List<Person> otherSponsors = new ArrayList<Person>();\n+ private List<Person> otherSponsors = new ArrayList<>();\n \n /** A list of committees this bill has been referred to. */\n- protected List<String> pastCommittees = new ArrayList<String>();\n+ protected List<String> pastCommittees = new ArrayList<>();\n \n /** A list of actions that have been made on this bill. */\n- protected List<BillAction> actions = new ArrayList<BillAction>();\n+ protected List<BillAction> actions = new ArrayList<>();\n+\n+ /** --- Constructors --- */\n \n public Bill() {\n super();\n }\n \n- /**\n- * Constructs a minimal Bill object.\n- *\n- * @param billId - The unique bill id\n- * @param session - The session year this bill was introduced to\n- */\n- public Bill(String billId, int session)\n- {\n- this();\n- this.setBillId(billId);\n- this.setSession(session);\n- this.setYear(session);\n+ public Bill(String printNo, int sessionYear) {\n+ this.printNo = printNo;\n+ this.session = sessionYear;\n+ this.year = sessionYear;\n }\n \n+ /** --- Functional Getters/Setter --- */\n+\n /**\n+ * Indicates if this bill is currently set to the base version.\n * @param version The bill version\n * @return Returns true if the version will be represented as a base bill\n */\n- @JsonIgnore\n- public static boolean isBaseVersion(String version)\n- {\n+ public static boolean isBaseVersion(String version) {\n return version == null || version.equals(BASE_VERSION);\n }\n \n /**\n- * @return - True if this bill is a resolution of some sort.\n- */\n- @JsonIgnore\n- public boolean isResolution()\n- {\n- return billId.charAt(0)!='A' && billId.charAt(0)!='S';\n- }\n-\n- /**\n- * @return - The URL used to construct Disqus threads\n- */\n- @JsonIgnore\n- public String getDisqusUrl()\n- {\n- if (this.getSession()==2009) {\n- String disqusId = this.getBillId().split(\"-\")[0];\n- return \"http://open.nysenate.gov/legislation/api/html/bill/\" + disqusId;\n- }\n- else {\n- String disqusId = this.getBillId();\n- return \"http://open.nysenate.gov/legislation/bill/\" + disqusId;\n- }\n- }\n-\n- /**\n+ * Creates a unique id for the bill by using printNo and session year, e.g S1234-2013\n * @return - The bill's unique id.\n */\n- public String getBillId()\n- {\n- return billId;\n+ public String getBillId() {\n+ return this.printNo + \"-\" + this.session;\n }\n \n /**\n- * @param billId - The new bill id.\n- */\n- public void setBillId(String billId)\n- {\n- this.billId = billId;\n- }\n-\n- /**\n- * The object type of the bill.\n- */\n- @JsonIgnore\n- public String getOtype()\n- {\n- return \"bill\";\n- }\n-\n- /**\n- * @return - The unique object id.\n+ * Indicate if this bill is a resolution by checking that it's not a senate/assembly bill.\n+ * @return - True if this bill is a resolution of some sort.\n */\n- @JsonIgnore\n- public String getOid()\n- {\n- return this.getBillId();\n+ public boolean isResolution() {\n+ return this.printNo.charAt(0) != 'A' && this.printNo.charAt(0) != 'S';\n }\n \n /**\n+ * Creates a unique id for the bill with padding to resemble LBDC's representation.\n * @return - The billId padded to 5 digits with zeros.\n */\n- @JsonIgnore\n- public String getPaddedBillId()\n- {\n- return this.getPaddedPrintNumber()+\"-\"+this.getSession();\n+ public String getPaddedBillId() {\n+ return this.getPaddedPrintNumber() + \"-\" + this.getSession();\n }\n \n /**\n+ * Returns the print number padded with 5 zeros, e.g S01234. This is how LBDC represents\n+ * print numbers in their SOBI files.\n * @return - The print number padded to 5 digits with zeros.\n */\n- @JsonIgnore\n- public String getPaddedPrintNumber()\n- {\n- Matcher billIdMatcher = billIdPattern.matcher(this.getBillId());\n- if (billIdMatcher.find()) {\n- return String.format(\"%s%05d%s\", billIdMatcher.group(2), Integer.parseInt(billIdMatcher.group(3)), billIdMatcher.group(4));\n- }\n- else {\n- // logger.warn(\"Invalid senateBillNo: \"+this.senateBillNo);\n- return \"\";\n- }\n- }\n-\n- /**\n- * @return - Just the print number without the session year suffix.\n- */\n- @JsonIgnore\n- public String getPrintNumber()\n- {\n- Matcher billIdMatcher = billIdPattern.matcher(this.getBillId());\n+ public String getPaddedPrintNumber() {\n+ Matcher billIdMatcher = printNumberPattern.matcher(this.getPrintNo());\n if (billIdMatcher.find()) {\n- return billIdMatcher.group(1);\n- }\n- else {\n- // logger.warn(\"Invalid senateBillNo: \"+this.senateBillNo);\n- return \"\";\n+ return String.format(\"%s%05d%s\", billIdMatcher.group(1), Integer.parseInt(billIdMatcher.group(2)),\n+ billIdMatcher.group(3));\n }\n+ return \"\";\n }\n \n /**\n+ * Retrieves an amendment stored in this bill using the version as the key.\n * @param version - The amendment version of the bill (e.g \"A\", \"B\", etc)\n- * @return Amendment if found, null otherwise\n+ * @return BillAmendment if found, null otherwise\n */\n- @JsonIgnore\n- public BillAmendment getAmendment(String version)\n- {\n+ public BillAmendment getAmendment(String version) {\n return this.amendmentMap.get(version.toUpperCase());\n }\n \n /**\n- * @return - A list of all Amendments associated with this Bill.\n+ * Retrieves a list of all amendments stored in this bill.\n+ * @return - List<BillAmendment>\n */\n- @JsonIgnore\n- public List<BillAmendment> getAmendmentList()\n- {\n+ public List<BillAmendment> getAmendmentList() {\n return new ArrayList<>(this.amendmentMap.values());\n }\n \n /**\n * Associate an amendment with this bill.\n- * @param billAmendment - Amendment to associate.\n+ * @param billAmendment - Amendment to add to this bill.\n */\n- public void addAmendment(BillAmendment billAmendment)\n- {\n+ public void addAmendment(BillAmendment billAmendment) {\n this.amendmentMap.put(billAmendment.getVersion().toUpperCase(), billAmendment);\n }\n \n+ /**\n+ * Associate a list of amendments with this bill.\n+ * @param billAmendments - List<Amendment> - Amendments to add to this bill\n+ */\n+ public void addAmendments(List<BillAmendment> billAmendments) {\n+ for (BillAmendment billAmendment : billAmendments) {\n+ this.addAmendment(billAmendment);\n+ }\n+ }\n+\n /**\n * Indicate whether the bill has a reference to a given amendment version.\n * @param version String - Amendment version\n@@ -233,112 +166,13 @@ public boolean hasAmendment(String version)\n }\n \n /**\n- * @return Mapping of Amendment versions to Amendment objects for keyed retrieval.\n+ * Convenience method to retrieve the currently active Amendment object.\n+ * @return BillAmendment\n */\n- public Map<String, BillAmendment> getAmendmentMap()\n- {\n- return amendmentMap;\n- }\n-\n- public BillAmendment getActiveAmendment()\n- {\n+ public BillAmendment getActiveAmendment() {\n return this.getAmendment(this.getActiveVersion());\n }\n \n- /**\n- * @return The active amendment version.\n- */\n- public String getActiveVersion()\n- {\n- return activeVersion;\n- }\n-\n- /**\n- * @param activeVersion - The new active amendment version.\n- */\n- public void setActiveVersion(String activeVersion)\n- {\n- this.activeVersion = activeVersion;\n- }\n-\n- public LinkedList<String> getActiveHistory() {\n- return activeHistory;\n- }\n-\n- public void setActiveHistory(LinkedList<String> activeHistory) {\n- this.activeHistory = activeHistory;\n- }\n-\n- /**\n- * @return - The current bill title\n- */\n- public String getTitle()\n- {\n- return title;\n- }\n-\n- /**\n- * @param title - The new bill title\n- */\n- public void setTitle(String title)\n- {\n- this.title = title;\n- }\n-\n- /**\n- * @return - The current law section.\n- */\n- public String getLawSection()\n- {\n- return lawSection;\n- }\n-\n- public void setLawSection(String lawSection)\n- {\n- this.lawSection = lawSection;\n- }\n-\n- public String getSameAs()\n- {\n- return this.getActiveAmendment().getSameAs();\n- }\n-\n- public String getSameAs(String version)\n- {\n- if (hasAmendment(version)) {\n- return getAmendment(version).getSameAs();\n- }\n- throw new IllegalArgumentException(INVALID_AMENDMENT_VERSION+version);\n- }\n-\n- /**\n- * @param sameAs - The new same as bill ID.\n- */\n- public void setSameAs(String sameAs, String version)\n- {\n- if (hasAmendment(version)) {\n- getAmendment(version).setSameAs(sameAs);\n- } else {\n- throw new IllegalArgumentException(INVALID_AMENDMENT_VERSION+version);\n- }\n- }\n-\n- /**\n- * @return - The current list of bill ids of previous bill versions.\n- */\n- public List<String> getPreviousVersions()\n- {\n- return previousVersions;\n- }\n-\n- /**\n- * @param previousVersions - The new list of bill IDs of previous versions.\n- */\n- public void setPreviousVersions(List<String> previousVersions)\n- {\n- this.previousVersions = previousVersions;\n- }\n-\n /**\n * @param previousVersion - The new bill ID to add to the previous versions list.\n */\n@@ -349,306 +183,121 @@ public void addPreviousVersion(String previousVersion) {\n }\n \n /**\n- * @return - The current bill sponsor.\n- */\n- public Person getSponsor()\n- {\n- return sponsor;\n- }\n-\n- /**\n- * @param sponsor - The new bill sponsor.\n- */\n- public void setSponsor(Person sponsor)\n- {\n- this.sponsor = sponsor;\n- }\n-\n- /**\n- * @return - The current list of \"other\" sponsors.\n- */\n- public List<Person> getOtherSponsors()\n- {\n- return otherSponsors;\n- }\n-\n- /**\n- * @param otherSponsors - The new list of \"other\" sponsors.\n+ * Add an action to the list of actions.\n+ * @param action BillAction\n */\n- public void setOtherSponsors(List<Person> otherSponsors)\n- {\n- this.otherSponsors = otherSponsors;\n- }\n-\n- public List<Person> getCoSponsors()\n- {\n- return this.getActiveAmendment().getCoSponsors();\n- }\n-\n- public List<Person> getCoSponsors(String version)\n- {\n- if (hasAmendment(version)) {\n- return getAmendment(version).getCoSponsors();\n- } else {\n- throw new IllegalArgumentException(INVALID_AMENDMENT_VERSION+version);\n- }\n+ public void addAction(BillAction action) {\n+ actions.add(action);\n }\n \n /**\n- * @param coSponsors - The new list of cosponsors.\n+ * Adds a committee to the list of past committees.\n+ * @param committee\n */\n- public void setCoSponsors(List<Person> coSponsors, String version)\n- {\n- if (hasAmendment(version)) {\n- getAmendment(version).setCoSponsors(coSponsors);\n- } else {\n- throw new IllegalArgumentException(INVALID_AMENDMENT_VERSION+version);\n- }\n- }\n-\n- public List<Person> getMultiSponsors()\n- {\n- return this.getActiveAmendment().getMultiSponsors();\n- }\n-\n- public List<Person> getMultiSponsorsList(String version)\n- {\n- if (hasAmendment(version)) {\n- return getAmendment(version).getMultiSponsors();\n+ public void addPastCommittee(String committee) {\n+ if(!pastCommittees.contains(committee)) {\n+ pastCommittees.add(committee);\n }\n- throw new IllegalArgumentException(INVALID_AMENDMENT_VERSION+version);\n }\n \n- public void setMultiSponsors(List<Person> multiSponsors, String version)\n- {\n- if (hasAmendment(version)) {\n- getAmendment(version).setMultiSponsors(multiSponsors);\n- } else {\n- throw new IllegalArgumentException(INVALID_AMENDMENT_VERSION+version);\n- }\n- }\n+ /** --- Delegates --- */\n \n- public String getSummary()\n- {\n- return summary;\n- }\n-\n- public void setSummary(String summary)\n- {\n- this.summary = summary;\n- }\n-\n- public List<BillAction> getActions()\n- {\n- return actions;\n- }\n-\n- public void setActions(List<BillAction> actions)\n- {\n- this.actions = actions;\n- }\n-\n- public void addAction(BillAction action) {\n- actions.add(action);\n- }\n-\n- public String getFulltext()\n- {\n+ public String getFulltext() {\n return this.getActiveAmendment().getFulltext();\n }\n \n- public String getFulltext(String version)\n- {\n- if (hasAmendment(version)) {\n- return getAmendment(version).getFulltext();\n- }\n- throw new IllegalArgumentException(INVALID_AMENDMENT_VERSION+version);\n- }\n+ /** --- Basic Getters/Setters --- */\n \n- public void setFulltext(String fulltext, String version)\n- {\n- if (hasAmendment(version)) {\n- getAmendment(version).setFulltext(fulltext);\n- } else {\n- throw new IllegalArgumentException(INVALID_AMENDMENT_VERSION+version);\n- }\n+ public String getPrintNo() {\n+ return printNo;\n }\n \n- public String getMemo()\n- {\n- return this.getActiveAmendment().getMemo();\n+ public void setPrintNo(String printNo) {\n+ this.printNo = printNo;\n }\n \n- public String getMemo(String version)\n- {\n- if (hasAmendment(version)) {\n- getAmendment(version).getMemo();\n- }\n- throw new IllegalArgumentException(INVALID_AMENDMENT_VERSION+version);\n+ public String getTitle() {\n+ return title;\n }\n \n- public void setMemo(String memo, String version)\n- {\n- if (hasAmendment(version)) {\n- getAmendment(version).setMemo(memo);\n- } else {\n- throw new IllegalArgumentException(INVALID_AMENDMENT_VERSION+version);\n- }\n+ public void setTitle(String title) {\n+ this.title = title;\n }\n \n- public String getLaw()\n- {\n- return this.getActiveAmendment().getLaw();\n+ public String getLawSection() {\n+ return lawSection;\n }\n \n- public String getLaw(String version)\n- {\n- if (hasAmendment(version)) {\n- return getAmendment(version).getLaw();\n- }\n- throw new IllegalArgumentException(INVALID_AMENDMENT_VERSION+version);\n+ public void setLawSection(String lawSection) {\n+ this.lawSection = lawSection;\n }\n \n- public void setLaw(String law, String version)\n- {\n- if (hasAmendment(version)) {\n- getAmendment(version).setLaw(law);\n- } else {\n- throw new IllegalArgumentException(INVALID_AMENDMENT_VERSION+version);\n- }\n+ public String getLaw() {\n+ return law;\n }\n \n- public String getActClause(String version)\n- {\n- if (hasAmendment(version)) {\n- return getAmendment(version).getActClause();\n- }\n- throw new IllegalArgumentException(INVALID_AMENDMENT_VERSION+version);\n+ public void setLaw(String law) {\n+ this.law = law;\n }\n \n- public void setActClause(String actClause, String version)\n- {\n- if (hasAmendment(version)) {\n- getAmendment(version).setActClause(actClause);\n- } else {\n- throw new IllegalArgumentException(INVALID_AMENDMENT_VERSION+version);\n- }\n+ public String getSummary() {\n+ return summary;\n }\n \n- public Boolean isStricken(String version)\n- {\n- if (hasAmendment(version)) {\n- return getAmendment(version).isStricken();\n- }\n- throw new IllegalArgumentException(INVALID_AMENDMENT_VERSION+version);\n+ public void setSummary(String summary) {\n+ this.summary = summary;\n }\n \n- public void setStricken(Boolean stricken, String version)\n- {\n- if (hasAmendment(version)) {\n- getAmendment(version).setStricken(stricken);\n- } else {\n- throw new IllegalArgumentException(INVALID_AMENDMENT_VERSION+version);\n- }\n+ public String getActiveVersion() {\n+ return activeVersion;\n }\n \n- public boolean isUniBill(String version)\n- {\n- if (hasAmendment(version)) {\n- return this.getAmendment(version).isUniBill();\n- }\n- else {\n- throw new IllegalArgumentException(INVALID_AMENDMENT_VERSION+version);\n- }\n+ public void setActiveVersion(String activeVersion) {\n+ this.activeVersion = activeVersion;\n }\n \n- public void setUniBill(boolean uniBill, String version)\n- {\n- if (hasAmendment(version)) {\n- this.getAmendment(version).setUniBill(uniBill);\n- }\n- else {\n- throw new IllegalArgumentException(INVALID_AMENDMENT_VERSION+version);\n- }\n-\n+ public Map<String, BillAmendment> getAmendmentMap() {\n+ return amendmentMap;\n }\n \n- public String getCurrentCommittee()\n- {\n- return this.getActiveAmendment().getCurrentCommittee();\n+ public List<String> getPreviousVersions() {\n+ return previousVersions;\n }\n \n- public String getCurrentCommittee(String version)\n- {\n- if (hasAmendment(version)) {\n- return getAmendment(version).getCurrentCommittee();\n- }\n- throw new IllegalArgumentException(INVALID_AMENDMENT_VERSION+version);\n+ public void setPreviousVersions(List<String> previousVersions) {\n+ this.previousVersions = previousVersions;\n }\n \n- public void setCurrentCommittee(String currentCommittee, String version)\n- {\n- if (hasAmendment(version)) {\n- getAmendment(version).setCurrentCommittee(currentCommittee);\n- } else {\n- throw new IllegalArgumentException(INVALID_AMENDMENT_VERSION+version);\n- }\n+ public List<BillAction> getActions() {\n+ return actions;\n }\n \n- public List<String> getPastCommittees()\n- {\n- return pastCommittees;\n+ public void setActions(List<BillAction> actions) {\n+ this.actions = actions;\n }\n \n- public void setPastCommittees(List<String> pastCommittees)\n- {\n- this.pastCommittees = new ArrayList<String>(pastCommittees);\n+ public Person getSponsor() {\n+ return sponsor;\n }\n \n- public void addPastCommittee(String committee)\n- {\n- if(!pastCommittees.contains(committee)) {\n- pastCommittees.add(committee);\n- }\n+ public void setSponsor(Person sponsor) {\n+ this.sponsor = sponsor;\n }\n \n- public List<Vote> getVotes()\n- {\n- ArrayList<Vote> votes = new ArrayList<Vote>();\n- for(BillAmendment amendment : this.getAmendmentList()) {\n- votes.addAll(amendment.getVotes());\n- }\n- return votes;\n+ public List<String> getPastCommittees() {\n+ return pastCommittees;\n }\n \n- public List<Vote> getVotes(String version)\n- {\n- if (hasAmendment(version)) {\n- return getAmendment(version).getVotes();\n- }\n- throw new IllegalArgumentException(INVALID_AMENDMENT_VERSION+version);\n+ public void setPastCommittees(List<String> pastCommittees) {\n+ this.pastCommittees = new ArrayList<>(pastCommittees);\n }\n \n- public void setVotes(List<Vote> votes, String version)\n- {\n- if (hasAmendment(version)) {\n- getAmendment(version).setVotes(votes);\n- } else {\n- throw new IllegalArgumentException(INVALID_AMENDMENT_VERSION+version);\n- }\n+ public List<Person> getOtherSponsors() {\n+ return otherSponsors;\n }\n \n- /**\n- * @param vote - The new vote to add to the list of votes on this bill. Replaces exiting vote data if a match is found.\n- */\n- public void updateVote(Vote vote, String version)\n- {\n- if (hasAmendment(version)) {\n- getAmendment(version).getVotes().remove(vote);\n- getAmendment(version).getVotes().add(vote);\n- } else {\n- throw new IllegalArgumentException(INVALID_AMENDMENT_VERSION+version);\n- }\n+ public void setOtherSponsors(List<Person> otherSponsors) {\n+ this.otherSponsors = otherSponsors;\n }\n \n @Override\n@@ -664,15 +313,13 @@ public Date getPublishDate()\n }\n \n @Override\n- public void setPublishDate(Date publishDate)\n- {\n+ public void setPublishDate(Date publishDate) {\n throw new RuntimeException(\"Cannot set publish on the bill container.\");\n }\n \n @Override\n @JsonIgnore\n- public Date getModifiedDate()\n- {\n+ public Date getModifiedDate() {\n for (BillAmendment amendment : amendmentMap.values()) {\n if (amendment.getModifiedDate().after(this.modifiedDate)) {\n return amendment.getModifiedDate();\n@@ -681,21 +328,8 @@ public Date getModifiedDate()\n return this.modifiedDate;\n }\n \n- /**\n- * @param vote - The vote to remove from the list of votes on this bill.\n- */\n- public void removeVote(Vote vote, String version)\n- {\n- if (hasAmendment(version)) {\n- getAmendment(version).getVotes().remove(vote);\n- } else {\n- throw new IllegalArgumentException(INVALID_AMENDMENT_VERSION+version);\n- }\n- }\n-\n @Override\n- public boolean equals(Object obj)\n- {\n+ public boolean equals(Object obj) {\n if (obj != null && obj instanceof Bill) {\n Bill other = (Bill)obj;\n return this.getBillId().equals(other.getBillId());\n@@ -705,8 +339,7 @@ public boolean equals(Object obj)\n }\n \n @Override\n- public int compareTo(Bill bill)\n- {\n+ public int compareTo(Bill bill) {\n return this.getBillId().compareTo(bill.getBillId());\n }\n \n@@ -716,8 +349,7 @@ public int compareTo(Bill bill)\n * @param term the term being searched\n * @return formatted bill number or original term\n */\n- public static String formatBillNo(String term)\n- {\n+ public static String formatBillNo(String term) {\n Pattern p = Pattern.compile(\"^((?i)[sajr]\\\\W?0*\\\\d+[a-zA-Z]?)(?:\\\\-)?(\\\\d{4})?$\");\n Matcher m = p.matcher(term);\n ", "raw_url": "https://github.com/nysenate/OpenLegislation/raw/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fmodel%2Fbill%2FBill.java", "sha": "f34337b79df7ecb4599710bffbf4c3c945dff8cc", "status": "modified" }, { "additions": 66, "blob_url": "https://github.com/nysenate/OpenLegislation/blob/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fmodel%2Fbill%2FBillAction.java", "changes": 175, "contents_url": "https://api.github.com/repos/nysenate/OpenLegislation/contents/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fmodel%2Fbill%2FBillAction.java?ref=f89655fbb32c1372837f17bb6f7ed81f7a32c654", "deletions": 109, "filename": "src/main/java/gov/nysenate/openleg/model/bill/BillAction.java", "new_code": "import org.joda.time.LocalDate;\n * Represents a single action on a single bill. E.g. REFERRED TO RULES.*\n /** Print number of the base bill. */\n protected String baseBillPrintNo = \"\";\n /** The bill amendment version the action was taken on. */\n private String amendmentVersion;\n\n /** The date this action was performed. Has no time component. */\n /** The text of this action. */\n /** --- Constructors --- */\n public BillAction() {\n this.setBaseBillPrintNo(bill.getPrintNo());\n this.setAmendmentVersion(billAmendment);\n /** --- Functional Getters/Setters --- */\n public int getYear() {\n return new LocalDate(date).getYear();\n /** --- Overrides --- */\n @Override\n public boolean equals(Object o) {\n if (this == o) return true;\n if (o == null || getClass() != o.getClass()) return false;\n BillAction that = (BillAction) o;\n if (baseBillPrintNo != null ? !baseBillPrintNo.equals(that.baseBillPrintNo) : that.baseBillPrintNo != null)\n return false;\n if (amendmentVersion != null ? !amendmentVersion.equals(that.amendmentVersion) : that.amendmentVersion != null) return false;\n if (date != null ? !date.equals(that.date) : that.date != null) return false;\n if (text != null ? !text.equals(that.text) : that.text != null) return false;\n return true;\n @Override\n public int hashCode() {\n int result = baseBillPrintNo != null ? baseBillPrintNo.hashCode() : 0;\n result = 31 * result + (amendmentVersion != null ? amendmentVersion.hashCode() : 0);\n result = 31 * result + (date != null ? date.hashCode() : 0);\n result = 31 * result + (text != null ? text.hashCode() : 0);\n return result;\n public String toString() {\n return date.toString() + \" \" + text;\n /** --- Helper classes --- */\n /** --- Basic Getters/Setters --- */\n\n public String getBaseBillPrintNo() {\n return baseBillPrintNo;\n }\n\n public void setBaseBillPrintNo(String baseBillPrintNo) {\n this.baseBillPrintNo = baseBillPrintNo;\n }\n\n public Date getDate() {\n return date;\n }\n\n public void setDate(Date date) {\n this.date = date;\n }\n\n public String getText() {\n return text;\n }\n\n public void setText(String text) {\n this.text = text;\n public String getAmendmentVersion() {\n return amendmentVersion;\n public void setAmendmentVersion(String amendmentVersion) {\n this.amendmentVersion = amendmentVersion;", "new_methods": [ { "arguments": [], "filename": "src/main/java/gov/nysenate/openleg/model/bill/BillAction.java", "implementation": "this.setBaseBillPrintNo(bill.getPrintNo());\n this.setAmendmentVersion(billAmendment);\n /** --- Functional Getters/Setters --- */\n public int getYear() {\n return new LocalDate(date).getYear();\n /** --- Overrides --- */\n @Override\n public boolean equals(Object o) {\n if (this == o) return true;\n if (o == null || getClass() != o.getClass()) return false;\n BillAction that = (BillAction) o;\n if (baseBillPrintNo != null ? !baseBillPrintNo.equals(that.baseBillPrintNo) : that.baseBillPrintNo != null)\n return false;\n if (amendmentVersion != null ? !amendmentVersion.equals(that.amendmentVersion) : that.amendmentVersion != null) return false;\n if (date != null ? !date.equals(that.date) : that.date != null) return false;\n if (text != null ? !text.equals(that.text) : that.text != null) return false;\n return true;\n @Override\n public int hashCode() {\n int result = baseBillPrintNo != null ? baseBillPrintNo.hashCode() : 0;\n result = 31 * result + (amendmentVersion != null ? amendmentVersion.hashCode() : 0);\n result = 31 * result + (date != null ? date.hashCode() : 0);\n result = 31 * result + (text != null ? text.hashCode() : 0);\n return result;\n public String toString() {\n return date.toString() + \" \" + text;\n /** --- Helper classes --- */\n /** --- Basic Getters/Setters --- */\n\n public String getBaseBillPrintNo() {\n return baseBillPrintNo;", "signature": "public BillAction()" }, { "arguments": [ "String baseBillPrintNo" ], "filename": "src/main/java/gov/nysenate/openleg/model/bill/BillAction.java", "implementation": "this.baseBillPrintNo = baseBillPrintNo;", "signature": "void setBaseBillPrintNo(String baseBillPrintNo)" }, { "arguments": [], "filename": "src/main/java/gov/nysenate/openleg/model/bill/BillAction.java", "implementation": "return date;", "signature": "Date getDate()" }, { "arguments": [ "Date date" ], "filename": "src/main/java/gov/nysenate/openleg/model/bill/BillAction.java", "implementation": "this.date = date;", "signature": "void setDate(Date date)" }, { "arguments": [], "filename": "src/main/java/gov/nysenate/openleg/model/bill/BillAction.java", "implementation": "return text;", "signature": "String getText()" } ], "old_code": " * Represents a single action on a single bill. E.g. REFERRED TO RULES\n *\n *\n * @author GraylinKim\n /**\n * This object's unique object id. Bill+Date.getTime()+Text.\n */\n private String oid = \"\";\n /**\n * The date this action was performed. Has no time component.\n */\n /**\n * The text of this action.\n */\n /**\n * The bill this action was taken on.\n */\n private Bill bill = null;\n\n\n private String billVersion;\n\n /**\n * JavaBean constructor.\n */\n public BillAction()\n {\n this.bill = bill;\n this.setBillAmendment(billAmendment);\n this.oid = this.bill.getBillId() + \"-\" + this.date.getTime() + \"-\" + this.text;\n java.util.Calendar calendar = java.util.Calendar.getInstance();\n calendar.setTime(date);\n this.setYear(calendar.get(java.util.Calendar.YEAR));\n /**\n * @return - The object's otype\n */\n public String getOtype()\n {\n return \"action\";\n }\n /**\n * @return - This object's unique object id.\n */\n public String getOid()\n {\n return this.oid;\n }\n\n /**\n * @param oid - The object's new oid.\n */\n public void setOid(String oid) {\n this.oid = oid;\n /**\n * @return - The date of the action.\n */\n public Date getDate() {\n return date;\n }\n /**\n * @param date - The new action date\n */\n public void setDate(Date date) {\n this.date = date;\n }\n /**\n * @return - The text of the action.\n */\n public String getText() {\n return text;\n }\n /**\n * @param text - The text of the action.\n */\n public void setText(String text) {\n this.text = text;\n }\n /**\n * @return - The bill the action was performed on.\n */\n public Bill getBill() {\n return bill;\n /**\n * @param bill - The new bill to this action targets.\n */\n public void setBill(Bill bill) {\n this.bill = bill;\n public boolean equals(Object obj) {\n if (obj != null && obj instanceof BillAction) {\n BillAction other = (BillAction)obj;\n return this.getOid().equals(other.getOid());\n }\n else {\n return false;\n }\n public int getYear() {\n java.util.Calendar cal = java.util.Calendar.getInstance();\n cal.setTime(date);\n return cal.get(java.util.Calendar.YEAR);\n }\n @Override\n public String toString() {\n return date.toString()+\" \"+text;\n public String getBillAmendment()\n {\n return billVersion;\n public void setBillAmendment(String billVersion)\n {\n this.billVersion = billVersion;", "old_methods": [ { "arguments": [], "filename": "src/main/java/gov/nysenate/openleg/model/bill/BillAction.java", "implementation": "this.bill = bill;\n this.setBillAmendment(billAmendment);\n this.oid = this.bill.getBillId() + \"-\" + this.date.getTime() + \"-\" + this.text;\n java.util.Calendar calendar = java.util.Calendar.getInstance();\n calendar.setTime(date);\n this.setYear(calendar.get(java.util.Calendar.YEAR));\n /**\n * @return - The object's otype\n */\n public String getOtype()\n {\n return \"action\";", "signature": "public BillAction()" }, { "arguments": [], "filename": "src/main/java/gov/nysenate/openleg/model/bill/BillAction.java", "implementation": "return this.oid;", "signature": "String getOid()" }, { "arguments": [ "String oid" ], "filename": "src/main/java/gov/nysenate/openleg/model/bill/BillAction.java", "implementation": "this.oid = oid;\n /**\n * @return - The date of the action.\n */\n public Date getDate() {\n return date;", "signature": "void setOid(String oid)" }, { "arguments": [ "Date date" ], "filename": "src/main/java/gov/nysenate/openleg/model/bill/BillAction.java", "implementation": "this.date = date;", "signature": "void setDate(Date date)" }, { "arguments": [], "filename": "src/main/java/gov/nysenate/openleg/model/bill/BillAction.java", "implementation": "return text;", "signature": "String getText()" }, { "arguments": [ "String text" ], "filename": "src/main/java/gov/nysenate/openleg/model/bill/BillAction.java", "implementation": "this.text = text;", "signature": "void setText(String text)" }, { "arguments": [], "filename": "src/main/java/gov/nysenate/openleg/model/bill/BillAction.java", "implementation": "return bill;\n /**\n * @param bill - The new bill to this action targets.\n */\n public void setBill(Bill bill) {\n this.bill = bill;\n public boolean equals(Object obj) {\n if (obj != null && obj instanceof BillAction) {\n BillAction other = (BillAction)obj;\n return this.getOid().equals(other.getOid());", "signature": "Bill getBill()" }, { "arguments": [], "filename": "src/main/java/gov/nysenate/openleg/model/bill/BillAction.java", "implementation": "java.util.Calendar cal = java.util.Calendar.getInstance();\n cal.setTime(date);\n return cal.get(java.util.Calendar.YEAR);", "signature": "int getYear()" } ], "patch": "@@ -1,48 +1,32 @@\n package gov.nysenate.openleg.model.bill;\n \n import gov.nysenate.openleg.model.BaseObject;\n+import org.joda.time.LocalDate;\n \n import java.util.Comparator;\n import java.util.Date;\n \n /**\n- * Represents a single action on a single bill. E.g. REFERRED TO RULES\n- *\n+ * Represents a single action on a single bill. E.g. REFERRED TO RULES.*\n * Uniquely identified by Bill+Date.getTime()+Text.\n- *\n- * @author GraylinKim\n */\n public class BillAction extends BaseObject\n {\n- /**\n- * This object's unique object id. Bill+Date.getTime()+Text.\n- */\n- private String oid = \"\";\n+ /** Print number of the base bill. */\n+ protected String baseBillPrintNo = \"\";\n \n- /**\n- * The date this action was performed. Has no time component.\n- */\n+ /** The bill amendment version the action was taken on. */\n+ private String amendmentVersion;\n+\n+ /** The date this action was performed. Has no time component. */\n private Date date = null;\n \n- /**\n- * The text of this action.\n- */\n+ /** The text of this action. */\n private String text = \"\";\n \n- /**\n- * The bill this action was taken on.\n- */\n- private Bill bill = null;\n-\n+ /** --- Constructors --- */\n \n-\n- private String billVersion;\n-\n- /**\n- * JavaBean constructor.\n- */\n- public BillAction()\n- {\n+ public BillAction() {\n super();\n }\n \n@@ -55,100 +39,54 @@ public BillAction()\n */\n public BillAction(Date date, String text, Bill bill, String billAmendment) {\n super();\n- this.bill = bill;\n- this.setBillAmendment(billAmendment);\n this.date = date;\n this.text = text;\n- this.oid = this.bill.getBillId() + \"-\" + this.date.getTime() + \"-\" + this.text;\n+ this.setBaseBillPrintNo(bill.getPrintNo());\n+ this.setAmendmentVersion(billAmendment);\n this.setPublishDate(this.date);\n this.setModifiedDate(this.date);\n this.setSession(bill.getSession());\n- java.util.Calendar calendar = java.util.Calendar.getInstance();\n- calendar.setTime(date);\n- this.setYear(calendar.get(java.util.Calendar.YEAR));\n }\n \n- /**\n- * @return - The object's otype\n- */\n- public String getOtype()\n- {\n- return \"action\";\n- }\n+ /** --- Functional Getters/Setters --- */\n \n- /**\n- * @return - This object's unique object id.\n- */\n- public String getOid()\n- {\n- return this.oid;\n- }\n-\n- /**\n- * @param oid - The object's new oid.\n- */\n- public void setOid(String oid) {\n- this.oid = oid;\n+ public int getYear() {\n+ return new LocalDate(date).getYear();\n }\n \n- /**\n- * @return - The date of the action.\n- */\n- public Date getDate() {\n- return date;\n- }\n+ /** --- Overrides --- */\n \n- /**\n- * @param date - The new action date\n- */\n- public void setDate(Date date) {\n- this.date = date;\n- }\n+ @Override\n+ public boolean equals(Object o) {\n+ if (this == o) return true;\n+ if (o == null || getClass() != o.getClass()) return false;\n \n- /**\n- * @return - The text of the action.\n- */\n- public String getText() {\n- return text;\n- }\n+ BillAction that = (BillAction) o;\n \n- /**\n- * @param text - The text of the action.\n- */\n- public void setText(String text) {\n- this.text = text;\n- }\n+ if (baseBillPrintNo != null ? !baseBillPrintNo.equals(that.baseBillPrintNo) : that.baseBillPrintNo != null)\n+ return false;\n+ if (amendmentVersion != null ? !amendmentVersion.equals(that.amendmentVersion) : that.amendmentVersion != null) return false;\n+ if (date != null ? !date.equals(that.date) : that.date != null) return false;\n+ if (text != null ? !text.equals(that.text) : that.text != null) return false;\n \n- /**\n- * @return - The bill the action was performed on.\n- */\n- public Bill getBill() {\n- return bill;\n+ return true;\n }\n \n- /**\n- * @param bill - The new bill to this action targets.\n- */\n- public void setBill(Bill bill) {\n- this.bill = bill;\n+ @Override\n+ public int hashCode() {\n+ int result = baseBillPrintNo != null ? baseBillPrintNo.hashCode() : 0;\n+ result = 31 * result + (amendmentVersion != null ? amendmentVersion.hashCode() : 0);\n+ result = 31 * result + (date != null ? date.hashCode() : 0);\n+ result = 31 * result + (text != null ? text.hashCode() : 0);\n+ return result;\n }\n \n @Override\n- public boolean equals(Object obj) {\n- if (obj != null && obj instanceof BillAction) {\n- BillAction other = (BillAction)obj;\n- return this.getOid().equals(other.getOid());\n- }\n- else {\n- return false;\n- }\n+ public String toString() {\n+ return date.toString() + \" \" + text;\n }\n \n- public int getYear() {\n- java.util.Calendar cal = java.util.Calendar.getInstance();\n- cal.setTime(date);\n- return cal.get(java.util.Calendar.YEAR);\n- }\n+ /** --- Helper classes --- */\n \n public static class ByEventDate implements Comparator<BillAction> {\n @Override\n@@ -161,18 +99,37 @@ public int compare(BillAction be1, BillAction be2) {\n }\n }\n \n- @Override\n- public String toString() {\n- return date.toString()+\" \"+text;\n+ /** --- Basic Getters/Setters --- */\n+\n+ public String getBaseBillPrintNo() {\n+ return baseBillPrintNo;\n+ }\n+\n+ public void setBaseBillPrintNo(String baseBillPrintNo) {\n+ this.baseBillPrintNo = baseBillPrintNo;\n+ }\n+\n+ public Date getDate() {\n+ return date;\n+ }\n+\n+ public void setDate(Date date) {\n+ this.date = date;\n+ }\n+\n+ public String getText() {\n+ return text;\n+ }\n+\n+ public void setText(String text) {\n+ this.text = text;\n }\n \n- public String getBillAmendment()\n- {\n- return billVersion;\n+ public String getAmendmentVersion() {\n+ return amendmentVersion;\n }\n \n- public void setBillAmendment(String billVersion)\n- {\n- this.billVersion = billVersion;\n+ public void setAmendmentVersion(String amendmentVersion) {\n+ this.amendmentVersion = amendmentVersion;\n }\n }", "raw_url": "https://github.com/nysenate/OpenLegislation/raw/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fmodel%2Fbill%2FBillAction.java", "sha": "cc0de4e5269601390d7e784c9c1991c88c4881bd", "status": "modified" }, { "additions": 41, "blob_url": "https://github.com/nysenate/OpenLegislation/blob/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fmodel%2Fbill%2FBillAmendment.java", "changes": 132, "contents_url": "https://api.github.com/repos/nysenate/OpenLegislation/contents/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fmodel%2Fbill%2FBillAmendment.java?ref=f89655fbb32c1372837f17bb6f7ed81f7a32c654", "deletions": 91, "filename": "src/main/java/gov/nysenate/openleg/model/bill/BillAmendment.java", "new_code": "import gov.nysenate.openleg.model.entity.Person;\nimport java.util.HashSet;\nimport java.util.Set;\n /** The \"sameAs\" bill in the other chamber that matches this version.\n * There can be multiple same as bills in some cases, typically just 0 or 1 though. */\n protected Set<BillId> sameAs = new HashSet<>();\n public BillAmendment(Bill baseBill, String version) {\n this.baseBillPrintNo = baseBill.getPrintNo();\n /** --- Functional Getters/Setters --- */\n\n public String getBillId() {\n return this.baseBillPrintNo + this.version + \"-\" + this.session;\n public void setVersion(String version) {\n this.version = version.trim().toUpperCase();\n public void updateVote(Vote vote) {\n this.getVotes().remove(vote);\n this.getVotes().add(vote);\n }\n\n /** --- Basic Getters/Setters --- */\n\n public String getVersion() {\n public Set<BillId> getSameAs() {\n public void setSameAs(Set<BillId> sameAs) {\n public String getMemo() {\n public void setMemo(String memo) {\n public String getActClause() {\n public void setActClause(String actClause) {\n public String getFulltext() {\n public void setFulltext(String fulltext) {\n public String getCurrentCommittee() {\n public void setCurrentCommittee(String currentCommittee) {\n public List<Person> getCoSponsors() {\n public void setCoSponsors(List<Person> coSponsors) {\n public List<Person> getMultiSponsors() {\n public void setMultiSponsors(List<Person> multiSponsors) {\n public Boolean isStricken() {\n public void setStricken(Boolean stricken) {\n public Boolean isUniBill() {\n public void setUniBill(Boolean uniBill) {\n}", "new_methods": [ { "arguments": [ "Bill baseBill", " String version" ], "filename": "src/main/java/gov/nysenate/openleg/model/bill/BillAmendment.java", "implementation": "this.baseBillPrintNo = baseBill.getPrintNo();\n /** --- Functional Getters/Setters --- */\n\n public String getBillId() {\n return this.baseBillPrintNo + this.version + \"-\" + this.session;\n public void setVersion(String version) {\n this.version = version.trim().toUpperCase();\n public void updateVote(Vote vote) {\n this.getVotes().remove(vote);\n this.getVotes().add(vote);", "signature": "public BillAmendment(Bill baseBill, String version)" }, { "arguments": [], "filename": "src/main/java/gov/nysenate/openleg/model/bill/BillAmendment.java", "implementation": "public Set<BillId> getSameAs() {\n public void setSameAs(Set<BillId> sameAs) {\n public String getMemo() {\n public void setMemo(String memo) {\n public String getActClause() {\n public void setActClause(String actClause) {\n public String getFulltext() {\n public void setFulltext(String fulltext) {\n public String getCurrentCommittee() {\n public void setCurrentCommittee(String currentCommittee) {\n public List<Person> getCoSponsors() {\n public void setCoSponsors(List<Person> coSponsors) {\n public List<Person> getMultiSponsors() {\n public void setMultiSponsors(List<Person> multiSponsors) {\n public Boolean isStricken() {\n public void setStricken(Boolean stricken) {\n public Boolean isUniBill() {\n public void setUniBill(Boolean uniBill) {", "signature": "String getVersion()" } ], "old_code": "import gov.nysenate.openleg.model.Person;\nimport gov.nysenate.openleg.model.Vote;\n /** Id of the base bill. */\n protected String baseBillId = \"\";\n\n /** The \"sameAs\" bill in the other chamber that matches this version. */\n protected String sameAs = \"\";\n /** The law code of the amendment. */\n protected String law = \"\";\n\n public BillAmendment(Bill baseBill, String version)\n {\n this.baseBillPrintNo = baseBill.getPrintNumber();\n this.baseBillId = baseBill.getBillId();\n public String getBaseBillId()\n {\n return baseBillId;\n public void setBaseBillId(String baseBillId)\n {\n this.baseBillId = baseBillId;\n public String getBillId()\n {\n return this.baseBillPrintNo + this.version + \"-\" + this.session;\n }\n\n public String getVersion()\n {\n public void setVersion(String version)\n {\n this.version = version.trim().toUpperCase();\n }\n\n public String getSameAs()\n {\n public void setSameAs(String sameAs)\n {\n public String getMemo()\n {\n public void setMemo(String memo)\n {\n public String getLaw()\n {\n return law;\n }\n\n public void setLaw(String law)\n {\n this.law = law;\n }\n\n public String getActClause()\n {\n public void setActClause(String actClause)\n {\n public String getFulltext()\n {\n public void setFulltext(String fulltext)\n {\n public String getCurrentCommittee()\n {\n public void setCurrentCommittee(String currentCommittee)\n {\n public List<Person> getCoSponsors()\n {\n public void setCoSponsors(List<Person> coSponsors)\n {\n public List<Person> getMultiSponsors()\n {\n public void setMultiSponsors(List<Person> multiSponsors)\n {\n public Boolean isStricken()\n {\n public void setStricken(Boolean stricken)\n {\n @Override\n public String getOid()\n {\n return this.getBillId();\n }\n\n @Override\n public String getOtype()\n {\n return \"billamendment\";\n }\n\n public Boolean isUniBill()\n {\n public void setUniBill(Boolean uniBill)\n {\n}", "old_methods": [ { "arguments": [ "Bill baseBill", " String version" ], "filename": "src/main/java/gov/nysenate/openleg/model/bill/BillAmendment.java", "implementation": "this.baseBillPrintNo = baseBill.getPrintNumber();\n this.baseBillId = baseBill.getBillId();\n public String getBaseBillId()\n {\n return baseBillId;\n public void setBaseBillId(String baseBillId)\n {\n this.baseBillId = baseBillId;\n public String getBillId()\n {\n return this.baseBillPrintNo + this.version + \"-\" + this.session;", "signature": "public BillAmendment(Bill baseBill, String version)" }, { "arguments": [], "filename": "src/main/java/gov/nysenate/openleg/model/bill/BillAmendment.java", "implementation": "public void setVersion(String version)\n {\n this.version = version.trim().toUpperCase();", "signature": "String getVersion()" }, { "arguments": [], "filename": "src/main/java/gov/nysenate/openleg/model/bill/BillAmendment.java", "implementation": "public void setSameAs(String sameAs)\n {\n public String getMemo()\n {\n public void setMemo(String memo)\n {\n public String getLaw()\n {\n return law;", "signature": "String getSameAs()" }, { "arguments": [ "String law" ], "filename": "src/main/java/gov/nysenate/openleg/model/bill/BillAmendment.java", "implementation": "this.law = law;", "signature": "void setLaw(String law)" }, { "arguments": [], "filename": "src/main/java/gov/nysenate/openleg/model/bill/BillAmendment.java", "implementation": "public void setActClause(String actClause)\n {\n public String getFulltext()\n {\n public void setFulltext(String fulltext)\n {\n public String getCurrentCommittee()\n {\n public void setCurrentCommittee(String currentCommittee)\n {\n public List<Person> getCoSponsors()\n {\n public void setCoSponsors(List<Person> coSponsors)\n {\n public List<Person> getMultiSponsors()\n {\n public void setMultiSponsors(List<Person> multiSponsors)\n {\n public Boolean isStricken()\n {\n public void setStricken(Boolean stricken)\n {\n @Override\n public String getOid()\n {\n return this.getBillId();", "signature": "String getActClause()" }, { "arguments": [], "filename": "src/main/java/gov/nysenate/openleg/model/bill/BillAmendment.java", "implementation": "return \"billamendment\";", "signature": "String getOtype()" }, { "arguments": [], "filename": "src/main/java/gov/nysenate/openleg/model/bill/BillAmendment.java", "implementation": "public void setUniBill(Boolean uniBill)\n {", "signature": "Boolean isUniBill()" } ], "patch": "@@ -1,32 +1,28 @@\n package gov.nysenate.openleg.model.bill;\n \n import gov.nysenate.openleg.model.BaseObject;\n-import gov.nysenate.openleg.model.Person;\n-import gov.nysenate.openleg.model.Vote;\n+import gov.nysenate.openleg.model.entity.Person;\n \n import java.util.ArrayList;\n+import java.util.HashSet;\n import java.util.List;\n+import java.util.Set;\n \n public class BillAmendment extends BaseObject\n {\n- /** Id of the base bill. */\n- protected String baseBillId = \"\";\n-\n /** Print number of the base bill. */\n protected String baseBillPrintNo = \"\";\n \n /** Amendment version, (e.g \"A\"). */\n protected String version = \"\";\n \n- /** The \"sameAs\" bill in the other chamber that matches this version. */\n- protected String sameAs = \"\";\n+ /** The \"sameAs\" bill in the other chamber that matches this version.\n+ * There can be multiple same as bills in some cases, typically just 0 or 1 though. */\n+ protected Set<BillId> sameAs = new HashSet<>();\n \n /** The sponsor memo of the amendment. */\n protected String memo = \"\";\n \n- /** The law code of the amendment. */\n- protected String law = \"\";\n-\n /** The AN ACT TO... clause for the bill version. */\n protected String actClause = \"\";\n \n@@ -55,26 +51,31 @@ public BillAmendment() {\n super();\n }\n \n- public BillAmendment(Bill baseBill, String version)\n- {\n+ public BillAmendment(Bill baseBill, String version) {\n this();\n- this.baseBillPrintNo = baseBill.getPrintNumber();\n- this.baseBillId = baseBill.getBillId();\n+ this.baseBillPrintNo = baseBill.getPrintNo();\n this.session = baseBill.getSession();\n this.year = baseBill.getYear();\n this.version = version;\n }\n \n- public String getBaseBillId()\n- {\n- return baseBillId;\n+ /** --- Functional Getters/Setters --- */\n+\n+ public String getBillId() {\n+ return this.baseBillPrintNo + this.version + \"-\" + this.session;\n }\n \n- public void setBaseBillId(String baseBillId)\n- {\n- this.baseBillId = baseBillId;\n+ public void setVersion(String version) {\n+ this.version = version.trim().toUpperCase();\n }\n \n+ public void updateVote(Vote vote) {\n+ this.getVotes().remove(vote);\n+ this.getVotes().add(vote);\n+ }\n+\n+ /** --- Basic Getters/Setters --- */\n+\n public String getBaseBillPrintNo() {\n return baseBillPrintNo;\n }\n@@ -83,108 +84,71 @@ public void setBaseBillPrintNo(String baseBillPrintNo) {\n this.baseBillPrintNo = baseBillPrintNo;\n }\n \n- public String getBillId()\n- {\n- return this.baseBillPrintNo + this.version + \"-\" + this.session;\n- }\n-\n- public String getVersion()\n- {\n+ public String getVersion() {\n return version;\n }\n \n- public void setVersion(String version)\n- {\n- this.version = version.trim().toUpperCase();\n- }\n-\n- public String getSameAs()\n- {\n+ public Set<BillId> getSameAs() {\n return sameAs;\n }\n \n- public void setSameAs(String sameAs)\n- {\n+ public void setSameAs(Set<BillId> sameAs) {\n this.sameAs = sameAs;\n }\n \n- public String getMemo()\n- {\n+ public String getMemo() {\n return memo;\n }\n \n- public void setMemo(String memo)\n- {\n+ public void setMemo(String memo) {\n this.memo = memo;\n }\n \n- public String getLaw()\n- {\n- return law;\n- }\n-\n- public void setLaw(String law)\n- {\n- this.law = law;\n- }\n-\n- public String getActClause()\n- {\n+ public String getActClause() {\n return actClause;\n }\n \n- public void setActClause(String actClause)\n- {\n+ public void setActClause(String actClause) {\n this.actClause = actClause;\n }\n \n- public String getFulltext()\n- {\n+ public String getFulltext() {\n return fulltext;\n }\n \n- public void setFulltext(String fulltext)\n- {\n+ public void setFulltext(String fulltext) {\n this.fulltext = fulltext;\n }\n \n- public String getCurrentCommittee()\n- {\n+ public String getCurrentCommittee() {\n return currentCommittee;\n }\n \n- public void setCurrentCommittee(String currentCommittee)\n- {\n+ public void setCurrentCommittee(String currentCommittee) {\n this.currentCommittee = currentCommittee;\n }\n \n- public List<Person> getCoSponsors()\n- {\n+ public List<Person> getCoSponsors() {\n return coSponsors;\n }\n \n- public void setCoSponsors(List<Person> coSponsors)\n- {\n+ public void setCoSponsors(List<Person> coSponsors) {\n this.coSponsors = coSponsors;\n }\n \n- public List<Person> getMultiSponsors()\n- {\n+ public List<Person> getMultiSponsors() {\n return multiSponsors;\n }\n \n- public void setMultiSponsors(List<Person> multiSponsors)\n- {\n+ public void setMultiSponsors(List<Person> multiSponsors) {\n this.multiSponsors = multiSponsors;\n }\n \n- public Boolean isStricken()\n- {\n+ public Boolean isStricken() {\n return stricken;\n }\n \n- public void setStricken(Boolean stricken)\n- {\n+ public void setStricken(Boolean stricken) {\n this.stricken = stricken;\n }\n \n@@ -196,25 +160,11 @@ public void setVotes(List<Vote> votes) {\n this.votes = votes;\n }\n \n- @Override\n- public String getOid()\n- {\n- return this.getBillId();\n- }\n-\n- @Override\n- public String getOtype()\n- {\n- return \"billamendment\";\n- }\n-\n- public Boolean isUniBill()\n- {\n+ public Boolean isUniBill() {\n return uniBill;\n }\n \n- public void setUniBill(Boolean uniBill)\n- {\n+ public void setUniBill(Boolean uniBill) {\n this.uniBill = uniBill;\n }\n-}\n+}\n\\ No newline at end of file", "raw_url": "https://github.com/nysenate/OpenLegislation/raw/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fmodel%2Fbill%2FBillAmendment.java", "sha": "969c931ef28ac0b3bdd991fe2c59028efe406287", "status": "modified" }, { "additions": 26, "blob_url": "https://github.com/nysenate/OpenLegislation/blob/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fmodel%2Fbill%2FVote.java", "changes": 52, "contents_url": "https://api.github.com/repos/nysenate/OpenLegislation/contents/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fmodel%2Fbill%2FVote.java?ref=f89655fbb32c1372837f17bb6f7ed81f7a32c654", "deletions": 26, "filename": "src/main/java/gov/nysenate/openleg/model/bill/Vote.java", "new_code": "import gov.nysenate.openleg.model.entity.Person;\nimport org.joda.time.LocalDate;\npublic class Vote extends BaseObject\n{\n public int count() {\n return ayes.size() + nays.size() + abstains.size() + excused.size();\n public Vote() {\n ayes = new ArrayList<>();\n ayeswr = new ArrayList<>();\n nays = new ArrayList<>();\n abstains = new ArrayList<>();\n excused = new ArrayList<>();\n absent = new ArrayList<>();\n public Vote(String billId, String billAmendment, Date date, int type, String sequenceNumber) {\n public Vote(Bill bill, String billAmendment, Date date, int type, String sequenceNumber) {\n public Vote(BillAmendment amendment, Date date, int type, String sequenceNumber) {\n this();\n this.voteDate = date;\n this.setYear(new LocalDate(voteDate).getYear());\n this.setSession(this.getYear() % 2 == 0 ? this.getYear() - 1 : this.getYear());\n this.voteType = type;\n this.setSequenceNumber(sequenceNumber);\n /** --- Basic Getters/Setters --- */\n\n public int getVoteType()\n return voteType;", "new_methods": [], "old_code": "import gov.nysenate.openleg.model.person.Person;\npublic class Vote extends BaseObject {\n\n public int count()\n {\n return ayes.size()+nays.size()+abstains.size()+excused.size();\n public Vote()\n {\n ayes = new ArrayList<String>();\n ayeswr = new ArrayList<String>();\n nays = new ArrayList<String>();\n abstains = new ArrayList<String>();\n excused = new ArrayList<String>();\n absent = new ArrayList<String>();\n public Vote(String billId, String billAmendment, Date date, int type, String sequenceNumber)\n {\n public Vote(Bill bill, String billAmendment, Date date, int type, String sequenceNumber)\n {\n public int getVoteType()\n {\n return voteType;\n /**\n * The object type of the bill.\n */\n public String getOtype()\n return \"vote\";", "old_methods": [], "patch": "@@ -1,15 +1,16 @@\n package gov.nysenate.openleg.model.bill;\n \n import gov.nysenate.openleg.model.BaseObject;\n-import gov.nysenate.openleg.model.person.Person;\n+import gov.nysenate.openleg.model.entity.Person;\n+import org.joda.time.LocalDate;\n \n import java.text.SimpleDateFormat;\n import java.util.ArrayList;\n import java.util.Date;\n import java.util.List;\n \n-public class Vote extends BaseObject {\n-\n+public class Vote extends BaseObject\n+{\n public static SimpleDateFormat dateFormat = new SimpleDateFormat(\"yyyy/MM/dd\");\n \n private int voteType;\n@@ -42,24 +43,21 @@ public class Vote extends BaseObject {\n \n public final static int VOTE_TYPE_COMMITTEE = 2;\n \n- public int count()\n- {\n- return ayes.size()+nays.size()+abstains.size()+excused.size();\n+ public int count() {\n+ return ayes.size() + nays.size() + abstains.size() + excused.size();\n }\n \n- public Vote()\n- {\n+ public Vote() {\n super();\n- ayes = new ArrayList<String>();\n- ayeswr = new ArrayList<String>();\n- nays = new ArrayList<String>();\n- abstains = new ArrayList<String>();\n- excused = new ArrayList<String>();\n- absent = new ArrayList<String>();\n+ ayes = new ArrayList<>();\n+ ayeswr = new ArrayList<>();\n+ nays = new ArrayList<>();\n+ abstains = new ArrayList<>();\n+ excused = new ArrayList<>();\n+ absent = new ArrayList<>();\n }\n \n- public Vote(String billId, String billAmendment, Date date, int type, String sequenceNumber)\n- {\n+ public Vote(String billId, String billAmendment, Date date, int type, String sequenceNumber) {\n this();\n this.voteDate = date;\n java.util.Calendar cal = java.util.Calendar.getInstance();\n@@ -71,23 +69,25 @@ public Vote(String billId, String billAmendment, Date date, int type, String seq\n this.oid = billId+'-'+dateFormat.format(voteDate)+'-'+String.valueOf(voteType)+'-'+sequenceNumber;\n }\n \n- public Vote(Bill bill, String billAmendment, Date date, int type, String sequenceNumber)\n- {\n+ public Vote(Bill bill, String billAmendment, Date date, int type, String sequenceNumber) {\n this(bill.getBillId(), billAmendment, date, type, sequenceNumber);\n this.bill = bill;\n }\n \n- public int getVoteType()\n- {\n- return voteType;\n+ public Vote(BillAmendment amendment, Date date, int type, String sequenceNumber) {\n+ this();\n+ this.voteDate = date;\n+ this.setYear(new LocalDate(voteDate).getYear());\n+ this.setSession(this.getYear() % 2 == 0 ? this.getYear() - 1 : this.getYear());\n+ this.voteType = type;\n+ this.setSequenceNumber(sequenceNumber);\n }\n \n- /**\n- * The object type of the bill.\n- */\n- public String getOtype()\n+ /** --- Basic Getters/Setters --- */\n+\n+ public int getVoteType()\n {\n- return \"vote\";\n+ return voteType;\n }\n \n public String getOid()", "raw_url": "https://github.com/nysenate/OpenLegislation/raw/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fmodel%2Fbill%2FVote.java", "sha": "58a200055f793c788ac2a313828b11041ee7014f", "status": "modified" }, { "additions": 0, "blob_url": "https://github.com/nysenate/OpenLegislation/blob/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fmodel%2Fcalendar%2FCalendar.java", "changes": 12, "contents_url": "https://api.github.com/repos/nysenate/OpenLegislation/contents/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fmodel%2Fcalendar%2FCalendar.java?ref=f89655fbb32c1372837f17bb6f7ed81f7a32c654", "deletions": 12, "filename": "src/main/java/gov/nysenate/openleg/model/calendar/Calendar.java", "new_code": "", "new_methods": [], "old_code": " @Override\n public String getOid()\n {\n return \"calendar-\"+this.getYear()+\"-\"+this.getNumber();\n }\n\n @Override\n public String getOtype()\n {\n return \"calendar\";\n }\n", "old_methods": [ { "arguments": [], "filename": "src/main/java/gov/nysenate/openleg/model/calendar/Calendar.java", "implementation": "return \"calendar-\"+this.getYear()+\"-\"+this.getNumber();", "signature": "String getOid()" }, { "arguments": [], "filename": "src/main/java/gov/nysenate/openleg/model/calendar/Calendar.java", "implementation": "return \"calendar\";", "signature": "String getOtype()" } ], "patch": "@@ -27,18 +27,6 @@ public Calendar(Integer number, Integer session, Integer year)\n this.setYear(year);\n }\n \n- @Override\n- public String getOid()\n- {\n- return \"calendar-\"+this.getYear()+\"-\"+this.getNumber();\n- }\n-\n- @Override\n- public String getOtype()\n- {\n- return \"calendar\";\n- }\n-\n public Integer getNumber()\n {\n return number;", "raw_url": "https://github.com/nysenate/OpenLegislation/raw/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fmodel%2Fcalendar%2FCalendar.java", "sha": "ece6ad3c563cab525a3b9f19a66879246742e16a", "status": "modified" }, { "additions": 0, "blob_url": "https://github.com/nysenate/OpenLegislation/blob/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fmodel%2Fcalendar%2FCalendarActiveList.java", "changes": 13, "contents_url": "https://api.github.com/repos/nysenate/OpenLegislation/contents/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fmodel%2Fcalendar%2FCalendarActiveList.java?ref=f89655fbb32c1372837f17bb6f7ed81f7a32c654", "deletions": 13, "filename": "src/main/java/gov/nysenate/openleg/model/calendar/CalendarActiveList.java", "new_code": "", "new_methods": [], "old_code": "import gov.nysenate.openleg.util.DateHelper;\n\n @Override\n public String getOid()\n {\n return this.getOtype()+\"-\"+DateHelper.LRS_DATE_ONLY_FORMAT.format(this.getCalDate())+\"-\"+this.getId();\n }\n\n @Override\n public String getOtype()\n {\n return \"calendar-active\";\n }", "old_methods": [ { "arguments": [], "filename": "src/main/java/gov/nysenate/openleg/model/calendar/CalendarActiveList.java", "implementation": "return this.getOtype()+\"-\"+DateHelper.LRS_DATE_ONLY_FORMAT.format(this.getCalDate())+\"-\"+this.getId();", "signature": "String getOid()" }, { "arguments": [], "filename": "src/main/java/gov/nysenate/openleg/model/calendar/CalendarActiveList.java", "implementation": "return \"calendar-active\";", "signature": "String getOtype()" } ], "patch": "@@ -1,7 +1,6 @@\n package gov.nysenate.openleg.model.calendar;\n \n import gov.nysenate.openleg.model.BaseObject;\n-import gov.nysenate.openleg.util.DateHelper;\n \n import java.util.ArrayList;\n import java.util.Date;\n@@ -83,16 +82,4 @@ public void setReleaseDateTime(Date releaseDateTime)\n {\n this.releaseDateTime = releaseDateTime;\n }\n-\n- @Override\n- public String getOid()\n- {\n- return this.getOtype()+\"-\"+DateHelper.LRS_DATE_ONLY_FORMAT.format(this.getCalDate())+\"-\"+this.getId();\n- }\n-\n- @Override\n- public String getOtype()\n- {\n- return \"calendar-active\";\n- }\n }", "raw_url": "https://github.com/nysenate/OpenLegislation/raw/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fmodel%2Fcalendar%2FCalendarActiveList.java", "sha": "e8bdbb2cda0ff957c4c276c6d7d14997d231b99f", "status": "modified" }, { "additions": 0, "blob_url": "https://github.com/nysenate/OpenLegislation/blob/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fmodel%2Fcalendar%2FCalendarSupplemental.java", "changes": 13, "contents_url": "https://api.github.com/repos/nysenate/OpenLegislation/contents/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fmodel%2Fcalendar%2FCalendarSupplemental.java?ref=f89655fbb32c1372837f17bb6f7ed81f7a32c654", "deletions": 13, "filename": "src/main/java/gov/nysenate/openleg/model/calendar/CalendarSupplemental.java", "new_code": "", "new_methods": [], "old_code": "import gov.nysenate.openleg.util.DateHelper;\n @Override\n public String getOid()\n {\n return this.getOtype()+\"-\"+DateHelper.LRS_DATE_ONLY_FORMAT.format(this.getCalDate())+\"-\"+this.getId();\n }\n\n @Override\n public String getOtype()\n {\n return \"calendar-supplemental\";\n }\n", "old_methods": [ { "arguments": [], "filename": "src/main/java/gov/nysenate/openleg/model/calendar/CalendarSupplemental.java", "implementation": "return this.getOtype()+\"-\"+DateHelper.LRS_DATE_ONLY_FORMAT.format(this.getCalDate())+\"-\"+this.getId();", "signature": "String getOid()" }, { "arguments": [], "filename": "src/main/java/gov/nysenate/openleg/model/calendar/CalendarSupplemental.java", "implementation": "return \"calendar-supplemental\";", "signature": "String getOtype()" } ], "patch": "@@ -1,7 +1,6 @@\n package gov.nysenate.openleg.model.calendar;\n \n import gov.nysenate.openleg.model.BaseObject;\n-import gov.nysenate.openleg.util.DateHelper;\n \n import java.util.Date;\n import java.util.LinkedHashMap;\n@@ -27,18 +26,6 @@ public CalendarSupplemental(String id, Date calDate, Date releaseDateTime)\n this.setReleaseDateTime(releaseDateTime);\n }\n \n- @Override\n- public String getOid()\n- {\n- return this.getOtype()+\"-\"+DateHelper.LRS_DATE_ONLY_FORMAT.format(this.getCalDate())+\"-\"+this.getId();\n- }\n-\n- @Override\n- public String getOtype()\n- {\n- return \"calendar-supplemental\";\n- }\n-\n public String getId()\n {\n return id;", "raw_url": "https://github.com/nysenate/OpenLegislation/raw/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fmodel%2Fcalendar%2FCalendarSupplemental.java", "sha": "795ee8e03026a3c6e44203c10798bc01fd9d0199", "status": "modified" }, { "additions": 60, "blob_url": "https://github.com/nysenate/OpenLegislation/blob/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fmodel%2Fsobi%2FSOBIBlock.java", "changes": 114, "contents_url": "https://api.github.com/repos/nysenate/OpenLegislation/contents/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fmodel%2Fsobi%2FSOBIBlock.java?ref=f89655fbb32c1372837f17bb6f7ed81f7a32c654", "deletions": 54, "filename": "src/main/java/gov/nysenate/openleg/model/sobi/SOBIBlock.java", "new_code": "import gov.nysenate.openleg.model.bill.BillId;\n\n /** The file name of the fragment that generated this block. */\n private String fragmentFileName;\n\n /** The type of SOBIFragment that generated this block. */\n private SOBIFragmentType fragmentType;\n\n /** The bill identifier. */\n private BillId billId;\n * assumed to be valid sobi file and is NOT checked for performance reasons.\n this.setBillId(line.substring(4,10), line.substring(10,11), Integer.parseInt(line.substring(0,4)));\n public SOBIBlock(String fragmentFileName, SOBIFragmentType type, int startLineNo, String line) {\n this.fragmentFileName = fragmentFileName;\n this.fragmentType = type;\n return (this.fragmentFileName + \":\" + this.getStartLineNo() + \"-\" + this.getEndLineNo());\n * Returns the session year of the bill.\n */\n public int getYear() {\n return (this.billId != null) ? this.billId.getSession() : -1;\n }\n\n /**\n * Returns the print no of the base bill.\n */\n public String getBasePrintNo() {\n return (this.billId != null) ? this.billId.getBasePrintNo() : null;\n }\n\n /**\n * Returns the amendment version.\n */\n public String getAmendment() {\n return (this.billId != null) ? this.billId.getVersion() : null;\n }\n\n /**\n * Sets the BillId for this block.\n * @param printNo String\n * @param version String\n * @param session int\n public void setBillId(String printNo, String version, int session) {\n this.billId = new BillId(printNo.substring(0,1) + Integer.parseInt(printNo.substring(1)),\n session, version.trim());\n public String getFragmentFileName() {\n return fragmentFileName;\n }\n\n public void setFragmentFileName(String fragmentFileName) {\n this.fragmentFileName = fragmentFileName;\n }\n\n public SOBIFragmentType getFragmentType() {\n return fragmentType;\n }\n\n public void setFragmentType(SOBIFragmentType fragmentType) {\n this.fragmentType = fragmentType;\n }\n", "new_methods": [ { "arguments": [ "String fragmentFileName", " SOBIFragmentType type", " int startLineNo", " String line" ], "filename": "src/main/java/gov/nysenate/openleg/model/sobi/SOBIBlock.java", "implementation": "this.fragmentFileName = fragmentFileName;\n this.fragmentType = type;\n return (this.fragmentFileName + \":\" + this.getStartLineNo() + \"-\" + this.getEndLineNo());\n * Returns the session year of the bill.\n */\n public int getYear() {\n return (this.billId != null) ? this.billId.getSession() : -1;", "signature": "public SOBIBlock(String fragmentFileName, SOBIFragmentType type, int startLineNo, String line)" }, { "arguments": [], "filename": "src/main/java/gov/nysenate/openleg/model/sobi/SOBIBlock.java", "implementation": "return (this.billId != null) ? this.billId.getBasePrintNo() : null;", "signature": "String getBasePrintNo()" }, { "arguments": [], "filename": "src/main/java/gov/nysenate/openleg/model/sobi/SOBIBlock.java", "implementation": "return (this.billId != null) ? this.billId.getVersion() : null;", "signature": "String getAmendment()" }, { "arguments": [ "String printNo", " String version", " int session" ], "filename": "src/main/java/gov/nysenate/openleg/model/sobi/SOBIBlock.java", "implementation": "this.billId = new BillId(printNo.substring(0,1) + Integer.parseInt(printNo.substring(1)),\n session, version.trim());\n public String getFragmentFileName() {\n return fragmentFileName;", "signature": "void setBillId(String printNo, String version, int session)" }, { "arguments": [ "String fragmentFileName" ], "filename": "src/main/java/gov/nysenate/openleg/model/sobi/SOBIBlock.java", "implementation": "this.fragmentFileName = fragmentFileName;", "signature": "void setFragmentFileName(String fragmentFileName)" }, { "arguments": [], "filename": "src/main/java/gov/nysenate/openleg/model/sobi/SOBIBlock.java", "implementation": "return fragmentType;", "signature": "SOBIFragmentType getFragmentType()" }, { "arguments": [ "SOBIFragmentType fragmentType" ], "filename": "src/main/java/gov/nysenate/openleg/model/sobi/SOBIBlock.java", "implementation": "this.fragmentType = fragmentType;", "signature": "void setFragmentType(SOBIFragmentType fragmentType)" } ], "old_code": "import java.io.File;\n /** The file from which the block was found. Defaults to null when using the basic constructor. */\n private File file = null;\n\n /** The year indicated in the block header. */\n private Integer year = 0;\n\n /** The printNo of the base bill. The amendment character is NOT included. */\n private String printNo = \"\";\n\n /** The amendment character for the base bill. Can be empty or single letter string from \"A-Z\" */\n private String amendment = \"\";\n * assumed to be valid SOBIFile file and is NOT checked for performance reasons.\n this.setYear(Integer.parseInt(line.substring(0,4)));\n this.setPrintNo(line.substring(4,10));\n this.setAmendment(line.substring(10,11).trim());\n public SOBIBlock(File file, int startLineNo, String line) {\n this.setFile(file);\n return (this.getFile() == null ? \"null\" : this.getFile().getName())+\":\"+this.getStartLineNo();\n * Strips all leading zeros from the numerical part of the print number:\n * <p>\n * A00370 -> A370\n *\n * @param printNo\n public void setPrintNo(String printNo) {\n this.printNo = printNo.substring(0,1)+Integer.parseInt(printNo.substring(1));\n public File getFile() {\n return file;\n }\n\n public void setFile(File file) {\n this.file = file;\n }\n\n public int getYear() {\n return year;\n }\n\n public void setYear(int year) {\n this.year = year;\n }\n\n public String getPrintNo() {\n return printNo;\n }\n\n public String getAmendment() {\n return amendment;\n }\n\n public void setAmendment(String amendment) {\n this.amendment = amendment;\n }\n", "old_methods": [ { "arguments": [ "File file", " int startLineNo", " String line" ], "filename": "src/main/java/gov/nysenate/openleg/model/sobi/SOBIBlock.java", "implementation": "this.setFile(file);\n return (this.getFile() == null ? \"null\" : this.getFile().getName())+\":\"+this.getStartLineNo();\n * Strips all leading zeros from the numerical part of the print number:\n * <p>\n * A00370 -> A370\n *\n * @param printNo\n public void setPrintNo(String printNo) {\n this.printNo = printNo.substring(0,1)+Integer.parseInt(printNo.substring(1));\n public File getFile() {\n return file;", "signature": "public SOBIBlock(File file, int startLineNo, String line)" }, { "arguments": [ "File file" ], "filename": "src/main/java/gov/nysenate/openleg/model/sobi/SOBIBlock.java", "implementation": "this.file = file;", "signature": "void setFile(File file)" }, { "arguments": [], "filename": "src/main/java/gov/nysenate/openleg/model/sobi/SOBIBlock.java", "implementation": "return year;", "signature": "int getYear()" }, { "arguments": [ "int year" ], "filename": "src/main/java/gov/nysenate/openleg/model/sobi/SOBIBlock.java", "implementation": "this.year = year;", "signature": "void setYear(int year)" }, { "arguments": [], "filename": "src/main/java/gov/nysenate/openleg/model/sobi/SOBIBlock.java", "implementation": "return printNo;", "signature": "String getPrintNo()" }, { "arguments": [], "filename": "src/main/java/gov/nysenate/openleg/model/sobi/SOBIBlock.java", "implementation": "return amendment;", "signature": "String getAmendment()" }, { "arguments": [ "String amendment" ], "filename": "src/main/java/gov/nysenate/openleg/model/sobi/SOBIBlock.java", "implementation": "this.amendment = amendment;", "signature": "void setAmendment(String amendment)" } ], "patch": "@@ -1,6 +1,7 @@\n package gov.nysenate.openleg.model.sobi;\n \n-import java.io.File;\n+import gov.nysenate.openleg.model.bill.BillId;\n+\n import java.util.Arrays;\n import java.util.List;\n import java.util.regex.Pattern;\n@@ -38,29 +39,26 @@ public class SOBIBlock\n /** A pattern to verify that a string is in the SOBI line format. */\n public static final Pattern blockPattern = Pattern.compile(\"^[0-9]{4}[A-Z][0-9]{5}[ A-Z][1-9ABCMRTV]\");\n \n+ /** The file name of the fragment that generated this block. */\n+ private String fragmentFileName;\n+\n+ /** The type of SOBIFragment that generated this block. */\n+ private SOBIFragmentType fragmentType;\n+\n /** The line number that the block starts at. Defaults to zero when using the basic constructor. */\n private Integer startLineNo = 0;\n \n /** The line number that the block ends at. Defaults to zero when using the basic constructor. */\n private Integer endLineNo = 0;\n \n- /** The file from which the block was found. Defaults to null when using the basic constructor. */\n- private File file = null;\n-\n /** The full line header from the line used to construct the Block. */\n private String header = \"\";\n \n /** The portion of the header containing just the bill designator, i.e not including line type. */\n private String billHeader = \"\";\n \n- /** The year indicated in the block header. */\n- private Integer year = 0;\n-\n- /** The printNo of the base bill. The amendment character is NOT included. */\n- private String printNo = \"\";\n-\n- /** The amendment character for the base bill. Can be empty or single letter string from \"A-Z\" */\n- private String amendment = \"\";\n+ /** The bill identifier. */\n+ private BillId billId;\n \n /** The sobi line type of the block. Determines how the data is interpreted. */\n private SOBILineType type;\n@@ -76,13 +74,11 @@ public class SOBIBlock\n \n /**\n * Construct a new block with without location information from a valid SOBIFile line. The line is\n- * assumed to be valid SOBIFile file and is NOT checked for performance reasons.\n+ * assumed to be valid sobi file and is NOT checked for performance reasons.\n */\n public SOBIBlock(String line) {\n- this.setYear(Integer.parseInt(line.substring(0,4)));\n- this.setPrintNo(line.substring(4,10));\n- this.setAmendment(line.substring(10,11).trim());\n this.setBillHeader(line.substring(0, 11));\n+ this.setBillId(line.substring(4,10), line.substring(10,11), Integer.parseInt(line.substring(0,4)));\n this.setType(SOBILineType.valueOfCode(line.charAt(11)));\n this.setHeader(line.substring(0,12));\n this.setData(line.substring(12));\n@@ -94,9 +90,10 @@ public SOBIBlock(String line) {\n * the source file and line number the block was initialized from. The line is assumed to be\n * valid SOBI file and is NOT checked for performance reasons.\n */\n- public SOBIBlock(File file, int startLineNo, String line) {\n+ public SOBIBlock(String fragmentFileName, SOBIFragmentType type, int startLineNo, String line) {\n this(line);\n- this.setFile(file);\n+ this.fragmentFileName = fragmentFileName;\n+ this.fragmentType = type;\n this.setStartLineNo(startLineNo);\n }\n \n@@ -135,7 +132,7 @@ public String toString() {\n * Returns a representation of the location of the block: fileName:lineNumber.\n */\n public String getLocation() {\n- return (this.getFile() == null ? \"null\" : this.getFile().getName())+\":\"+this.getStartLineNo();\n+ return (this.fragmentFileName + \":\" + this.getStartLineNo() + \"-\" + this.getEndLineNo());\n }\n \n /**\n@@ -153,16 +150,37 @@ public void setData(String data) {\n }\n \n /**\n- * Strips all leading zeros from the numerical part of the print number:\n- * <p>\n- * A00370 -> A370\n- *\n- * @param printNo\n+ * Returns the session year of the bill.\n+ */\n+ public int getYear() {\n+ return (this.billId != null) ? this.billId.getSession() : -1;\n+ }\n+\n+ /**\n+ * Returns the print no of the base bill.\n+ */\n+ public String getBasePrintNo() {\n+ return (this.billId != null) ? this.billId.getBasePrintNo() : null;\n+ }\n+\n+ /**\n+ * Returns the amendment version.\n+ */\n+ public String getAmendment() {\n+ return (this.billId != null) ? this.billId.getVersion() : null;\n+ }\n+\n+ /**\n+ * Sets the BillId for this block.\n+ * @param printNo String\n+ * @param version String\n+ * @param session int\n * @throws NumberFormatException on malformed print numbers\n */\n- public void setPrintNo(String printNo) {\n+ public void setBillId(String printNo, String version, int session) {\n // Integer conversion removes leading zeros in the print number.\n- this.printNo = printNo.substring(0,1)+Integer.parseInt(printNo.substring(1));\n+ this.billId = new BillId(printNo.substring(0,1) + Integer.parseInt(printNo.substring(1)),\n+ session, version.trim());\n }\n \n /**\n@@ -178,6 +196,22 @@ public void setEndLineNo(Integer endLineNo) {\n \n /** --- Basic Getters/Setters */\n \n+ public String getFragmentFileName() {\n+ return fragmentFileName;\n+ }\n+\n+ public void setFragmentFileName(String fragmentFileName) {\n+ this.fragmentFileName = fragmentFileName;\n+ }\n+\n+ public SOBIFragmentType getFragmentType() {\n+ return fragmentType;\n+ }\n+\n+ public void setFragmentType(SOBIFragmentType fragmentType) {\n+ this.fragmentType = fragmentType;\n+ }\n+\n public int getStartLineNo() {\n return startLineNo;\n }\n@@ -190,14 +224,6 @@ public Integer getEndLineNo() {\n return endLineNo;\n }\n \n- public File getFile() {\n- return file;\n- }\n-\n- public void setFile(File file) {\n- this.file = file;\n- }\n-\n public String getHeader() {\n return header;\n }\n@@ -206,26 +232,6 @@ public void setHeader(String header) {\n this.header = header;\n }\n \n- public int getYear() {\n- return year;\n- }\n-\n- public void setYear(int year) {\n- this.year = year;\n- }\n-\n- public String getPrintNo() {\n- return printNo;\n- }\n-\n- public String getAmendment() {\n- return amendment;\n- }\n-\n- public void setAmendment(String amendment) {\n- this.amendment = amendment;\n- }\n-\n public SOBILineType getType() {\n return type;\n }", "raw_url": "https://github.com/nysenate/OpenLegislation/raw/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fmodel%2Fsobi%2FSOBIBlock.java", "sha": "c85249ab9b599869dd6d4fb7d5f3e98f43b3fe4f", "status": "modified" }, { "additions": 36, "blob_url": "https://github.com/nysenate/OpenLegislation/blob/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fmodel%2Fsobi%2FSOBIFile.java", "changes": 43, "contents_url": "https://api.github.com/repos/nysenate/OpenLegislation/contents/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fmodel%2Fsobi%2FSOBIFile.java?ref=f89655fbb32c1372837f17bb6f7ed81f7a32c654", "deletions": 7, "filename": "src/main/java/gov/nysenate/openleg/model/sobi/SOBIFile.java", "new_code": "import java.io.FileNotFoundException;\n /**\n * SOBI files are (mostly) in a CP850 or similar encoding. This was determined from the byte mapping of\n * paragraph/section characters to 244/245. This can't be 100% correct though because the degree symbol\n * must be 193 in the correct code set. See SOBI.D120612.T125850.TXT.\n */\n /** The datetime when the SOBI file was last staged for processing */\n private Date stagedDateTime;\n\n public SOBIFile(File file, String encoding) throws IOException {\n if (file.exists()) {\n this.fileName = file.getName();\n this.text = FileUtils.readFileToString(file, encoding);\n this.publishedDateTime = new Date(file.lastModified());\n throw new FileNotFoundException(file.getAbsolutePath());\n return \"SOBIFile{\" +\n \"fileName='\" + fileName + '\\'' +\n \", processedCount=\" + processedCount +\n \", processedDateTime=\" + processedDateTime +\n \", publishedDateTime=\" + publishedDateTime +\n \", pendingProcessing=\" + pendingProcessing +\n '}';\n }\n\n /** --- Functional Getters/Setters --- */\n\n public void incrementProcessedCount() {\n this.processedCount++;\n public Date getStagedDateTime() {\n return stagedDateTime;\n }\n\n public void setStagedDateTime(Date stagedDateTime) {\n this.stagedDateTime = stagedDateTime;\n }\n", "new_methods": [ { "arguments": [], "filename": "src/main/java/gov/nysenate/openleg/model/sobi/SOBIFile.java", "implementation": "this.processedCount++;\n public Date getStagedDateTime() {\n return stagedDateTime;", "signature": "void incrementProcessedCount()" }, { "arguments": [ "Date stagedDateTime" ], "filename": "src/main/java/gov/nysenate/openleg/model/sobi/SOBIFile.java", "implementation": "this.stagedDateTime = stagedDateTime;", "signature": "void setStagedDateTime(Date stagedDateTime)" } ], "old_code": " public SOBIFile(File sobiFile, String encoding) throws IOException {\n if (sobiFile.exists()) {\n this.fileName = sobiFile.getName();\n this.text = FileUtils.readFileToString(sobiFile, encoding);\n this.publishedDateTime = new Date(sobiFile.lastModified());\n throw new IOException(\"Given sobiFile does not exist in the file system! (\" + sobiFile.getAbsolutePath() + \")\");\n return \"SOBIFile {fileName='\" + fileName + '\\'' + \", processedCount=\" + processedCount + '}';", "old_methods": [], "patch": "@@ -3,6 +3,7 @@\n import org.apache.commons.io.FileUtils;\n \n import java.io.File;\n+import java.io.FileNotFoundException;\n import java.io.IOException;\n import java.text.ParseException;\n import java.text.SimpleDateFormat;\n@@ -17,6 +18,11 @@\n */\n public class SOBIFile\n {\n+ /**\n+ * SOBI files are (mostly) in a CP850 or similar encoding. This was determined from the byte mapping of\n+ * paragraph/section characters to 244/245. This can't be 100% correct though because the degree symbol\n+ * must be 193 in the correct code set. See SOBI.D120612.T125850.TXT.\n+ */\n public static final String DEFAULT_ENCODING = \"CP850\";\n \n /** The format required for the SOBI file name. e.g. SOBI.D130323.T065432.TXT */\n@@ -31,6 +37,9 @@ public class SOBIFile\n /** The datetime when the SOBI file was last processed */\n private Date processedDateTime;\n \n+ /** The datetime when the SOBI file was last staged for processing */\n+ private Date stagedDateTime;\n+\n /** The actual text body of the file */\n private String text;\n \n@@ -46,29 +55,41 @@ public SOBIFile(File sobiFile) throws IOException {\n this(sobiFile, DEFAULT_ENCODING);\n }\n \n- public SOBIFile(File sobiFile, String encoding) throws IOException {\n- if (sobiFile.exists()) {\n- this.fileName = sobiFile.getName();\n- this.text = FileUtils.readFileToString(sobiFile, encoding);\n+ public SOBIFile(File file, String encoding) throws IOException {\n+ if (file.exists()) {\n+ this.fileName = file.getName();\n+ this.text = FileUtils.readFileToString(file, encoding);\n this.processedCount = 0;\n this.pendingProcessing = false;\n try {\n this.publishedDateTime = sobiDateFormat.parse(fileName);\n }\n catch (ParseException ex) {\n- this.publishedDateTime = new Date(sobiFile.lastModified());\n+ this.publishedDateTime = new Date(file.lastModified());\n ex.printStackTrace();\n }\n }\n else {\n- throw new IOException(\"Given sobiFile does not exist in the file system! (\" + sobiFile.getAbsolutePath() + \")\");\n+ throw new FileNotFoundException(file.getAbsolutePath());\n }\n }\n \n /** --- Override Methods --- */\n @Override\n public String toString() {\n- return \"SOBIFile {fileName='\" + fileName + '\\'' + \", processedCount=\" + processedCount + '}';\n+ return \"SOBIFile{\" +\n+ \"fileName='\" + fileName + '\\'' +\n+ \", processedCount=\" + processedCount +\n+ \", processedDateTime=\" + processedDateTime +\n+ \", publishedDateTime=\" + publishedDateTime +\n+ \", pendingProcessing=\" + pendingProcessing +\n+ '}';\n+ }\n+\n+ /** --- Functional Getters/Setters --- */\n+\n+ public void incrementProcessedCount() {\n+ this.processedCount++;\n }\n \n /** --- Basic Getters/Setters --- */\n@@ -97,6 +118,14 @@ public void setProcessedDateTime(Date processedDateTime) {\n this.processedDateTime = processedDateTime;\n }\n \n+ public Date getStagedDateTime() {\n+ return stagedDateTime;\n+ }\n+\n+ public void setStagedDateTime(Date stagedDateTime) {\n+ this.stagedDateTime = stagedDateTime;\n+ }\n+\n public String getText() {\n return text;\n }", "raw_url": "https://github.com/nysenate/OpenLegislation/raw/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fmodel%2Fsobi%2FSOBIFile.java", "sha": "1480971e57cdf37b83ddf72ad7727159de218d53", "status": "modified" }, { "additions": 39, "blob_url": "https://github.com/nysenate/OpenLegislation/blob/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fmodel%2Fsobi%2FSOBIFragment.java", "changes": 86, "contents_url": "https://api.github.com/repos/nysenate/OpenLegislation/contents/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fmodel%2Fsobi%2FSOBIFragment.java?ref=f89655fbb32c1372837f17bb6f7ed81f7a32c654", "deletions": 47, "filename": "src/main/java/gov/nysenate/openleg/model/sobi/SOBIFragment.java", "new_code": "import java.util.Arrays;\n private SOBIFragmentType type;\n /** A counter used to provide a means of ordering multiple fragments of the same type. */\n private int counter;\n public SOBIFragment(SOBIFile parentSOBIFile, SOBIFragmentType type, String text, int counter) {\n this.type = type;\n this.text = text;\n this.counter = counter;\n return type.equals(SOBIFragmentType.BILL);\n public List<SOBIBlock> getSOBIBlocks() {\n List<String> lines = new ArrayList<>(Arrays.asList(this.text.split(\"\\\\r?\\\\n\")));\n block = new SOBIBlock(fileName, type, lineNo, line);\n SOBIBlock newBlock = new SOBIBlock(fileName, type, lineNo, line);\n blocks.add(new SOBIBlock(fileName, type, lineNo,\n block.getBillHeader() + SOBILineType.LAW.getTypeCode()));\n @Override\n public String toString() {\n return \"SOBIFragment{\" + \"fragmentType=\" + type + \", fileName='\" + fileName + '\\'' +\n \", parentSOBIFile=\" + parentSOBIFile + '}';\n }\n\n /** --= Functional Getters/Setters --- */\n\n public Date getPublishedDateTime() {\n return parentSOBIFile.getPublishedDateTime();\n }\n\n public Date getProcessedDateTime() {\n return parentSOBIFile.getProcessedDateTime();\n }\n\n public SOBIFragmentType getType() {\n return type;\n public void setFileName(String fileName) {\n this.fileName = fileName;\n public String getText() {\n return text;\n public int getCounter() {\n return counter;", "new_methods": [ { "arguments": [ "SOBIFile parentSOBIFile", " SOBIFragmentType type", " String text", " int counter" ], "filename": "src/main/java/gov/nysenate/openleg/model/sobi/SOBIFragment.java", "implementation": "this.type = type;\n this.text = text;\n this.counter = counter;\n return type.equals(SOBIFragmentType.BILL);\n public List<SOBIBlock> getSOBIBlocks() {\n List<String> lines = new ArrayList<>(Arrays.asList(this.text.split(\"\\\\r?\\\\n\")));\n block = new SOBIBlock(fileName, type, lineNo, line);\n SOBIBlock newBlock = new SOBIBlock(fileName, type, lineNo, line);\n blocks.add(new SOBIBlock(fileName, type, lineNo,\n block.getBillHeader() + SOBILineType.LAW.getTypeCode()));\n @Override\n public String toString() {\n return \"SOBIFragment{\" + \"fragmentType=\" + type + \", fileName='\" + fileName + '\\'' +\n \", parentSOBIFile=\" + parentSOBIFile + '", "signature": "public SOBIFragment(SOBIFile parentSOBIFile, SOBIFragmentType type, String text, int counter)" }, { "arguments": [], "filename": "src/main/java/gov/nysenate/openleg/model/sobi/SOBIFragment.java", "implementation": "return parentSOBIFile.getPublishedDateTime();", "signature": "Date getPublishedDateTime()" }, { "arguments": [], "filename": "src/main/java/gov/nysenate/openleg/model/sobi/SOBIFragment.java", "implementation": "return parentSOBIFile.getProcessedDateTime();", "signature": "Date getProcessedDateTime()" } ], "old_code": "import org.apache.commons.io.FileUtils;\n\nimport java.io.File;\nimport java.io.IOException;\n private SOBIFragmentType fragmentType;\n /** The published datetime of the fragment which is the same as that of the parent SOBIFile. */\n private Date publishedDateTime;\n\n /** The datetime when the fragment was processed. */\n private Date processedDateTime;\n\n /** Reference to the file containing this fragment */\n private File fragmentFile;\n public SOBIFragment(SOBIFile parentSOBIFile, SOBIFragmentType fragmentType, File fragmentFile) throws IOException {\n this.fragmentType = fragmentType;\n this.fragmentFile = fragmentFile;\n this.fileName = fragmentFile.getName();\n this.publishedDateTime = parentSOBIFile.getPublishedDateTime();\n this.text = FileUtils.readFileToString(fragmentFile);\n return fragmentType.equals(SOBIFragmentType.BILL);\n * @throws IOException if fragment file cannot be opened for reading.\n public List<SOBIBlock> getSOBIBlocks() throws IOException {\n List<String> lines = FileUtils.readLines(fragmentFile);\n\n\n\n block = new SOBIBlock(fragmentFile, lineNo, line);\n SOBIBlock newBlock = new SOBIBlock(fragmentFile, lineNo, line);\n\n blocks.add(new SOBIBlock(fragmentFile, lineNo, block.getBillHeader()+\"B\"));\n\n public SOBIFragmentType getFragmentType() {\n return fragmentType;\n public String getText() {\n return text;\n }\n\n public void setText(String text) {\n this.text = text;\n }\n\n public Date getPublishedDateTime() {\n return publishedDateTime;\n public Date getProcessedDateTime() {\n return processedDateTime;\n public void setProcessedDateTime(Date processedDateTime) {\n this.processedDateTime = processedDateTime;", "old_methods": [ { "arguments": [], "filename": "src/main/java/gov/nysenate/openleg/model/sobi/SOBIFragment.java", "implementation": "return fragmentType;\n public String getText() {\n return text;", "signature": "SOBIFragmentType getFragmentType()" }, { "arguments": [ "String text" ], "filename": "src/main/java/gov/nysenate/openleg/model/sobi/SOBIFragment.java", "implementation": "this.text = text;", "signature": "void setText(String text)" } ], "patch": "@@ -1,10 +1,7 @@\n package gov.nysenate.openleg.model.sobi;\n \n-import org.apache.commons.io.FileUtils;\n-\n-import java.io.File;\n-import java.io.IOException;\n import java.util.ArrayList;\n+import java.util.Arrays;\n import java.util.Date;\n import java.util.List;\n import java.util.regex.Matcher;\n@@ -23,32 +20,24 @@ public class SOBIFragment\n private SOBIFile parentSOBIFile;\n \n /** The type of fragment, e.g bill, agenda, etc. */\n- private SOBIFragmentType fragmentType;\n+ private SOBIFragmentType type;\n \n /** The file name of the fragment. Serves as a unique identifier for the fragment. */\n private String fileName;\n \n- /** The published datetime of the fragment which is the same as that of the parent SOBIFile. */\n- private Date publishedDateTime;\n-\n- /** The datetime when the fragment was processed. */\n- private Date processedDateTime;\n-\n- /** Reference to the file containing this fragment */\n- private File fragmentFile;\n+ /** A counter used to provide a means of ordering multiple fragments of the same type. */\n+ private int counter;\n \n /** The actual text body of the fragment. */\n private String text;\n \n /** --- Constructors --- */\n \n- public SOBIFragment(SOBIFile parentSOBIFile, SOBIFragmentType fragmentType, File fragmentFile) throws IOException {\n+ public SOBIFragment(SOBIFile parentSOBIFile, SOBIFragmentType type, String text, int counter) {\n this.parentSOBIFile = parentSOBIFile;\n- this.fragmentType = fragmentType;\n- this.fragmentFile = fragmentFile;\n- this.fileName = fragmentFile.getName();\n- this.publishedDateTime = parentSOBIFile.getPublishedDateTime();\n- this.text = FileUtils.readFileToString(fragmentFile);\n+ this.type = type;\n+ this.text = text;\n+ this.counter = counter;\n }\n \n /** --- Methods --- */\n@@ -58,34 +47,30 @@ public SOBIFragment(SOBIFile parentSOBIFile, SOBIFragmentType fragmentType, File\n * @return boolean\n */\n public boolean isBlockFormat() {\n- return fragmentType.equals(SOBIFragmentType.BILL);\n+ return type.equals(SOBIFragmentType.BILL);\n }\n \n /**\n * Parses the given SOBI fragment into a list of blocks. Replaces null bytes in each line with spaces to\n * bring them into the proper fixed width formats.\n * <p>See the SOBIBlock class for more details.</p>\n * @return List<SOBIBlock> if fragment type supports blocks, empty list otherwise.\n- * @throws IOException if fragment file cannot be opened for reading.\n */\n- public List<SOBIBlock> getSOBIBlocks() throws IOException {\n+ public List<SOBIBlock> getSOBIBlocks() {\n List<SOBIBlock> blocks = new ArrayList<>();\n if (isBlockFormat()) {\n SOBIBlock block = null;\n- List<String> lines = FileUtils.readLines(fragmentFile);\n+ List<String> lines = new ArrayList<>(Arrays.asList(this.text.split(\"\\\\r?\\\\n\")));\n lines.add(\"\"); // Add a trailing line to end the last block and remove edge cases\n-\n for(int lineNo = 0; lineNo < lines.size(); lineNo++) {\n // Replace NULL bytes with spaces to properly format lines.\n String line = lines.get(lineNo).replace('\\0', ' ');\n-\n // Source file is not assumed to be 100% SOBI so we filter out other lines\n Matcher headerMatcher = SOBIBlock.blockPattern.matcher(line);\n-\n if (headerMatcher.find()) {\n if (block == null) {\n // No active block with a new matching line: create new block\n- block = new SOBIBlock(fragmentFile, lineNo, line);\n+ block = new SOBIBlock(fileName, type, lineNo, line);\n }\n else if (block.getHeader().equals(headerMatcher.group()) && block.isMultiline()) {\n // active multi-line block with a new matching line: extend block\n@@ -95,16 +80,15 @@ else if (block.getHeader().equals(headerMatcher.group()) && block.isMultiline())\n // active block does not match new line or can't be extended: create new block\n block.setEndLineNo(lineNo - 1);\n blocks.add(block);\n- SOBIBlock newBlock = new SOBIBlock(fragmentFile, lineNo, line);\n-\n+ SOBIBlock newBlock = new SOBIBlock(fileName, type, lineNo, line);\n // Handle certain SOBI grouping edge cases.\n if (newBlock.getBillHeader().equals(block.getBillHeader())) {\n // The law code line can be omitted when blank but it always precedes the 'C' line\n if (newBlock.getType().equals(SOBILineType.SUMMARY) && !block.getType().equals(SOBILineType.LAW)) {\n- blocks.add(new SOBIBlock(fragmentFile, lineNo, block.getBillHeader()+\"B\"));\n+ blocks.add(new SOBIBlock(fileName, type, lineNo,\n+ block.getBillHeader() + SOBILineType.LAW.getTypeCode()));\n }\n }\n-\n // Start a new block\n block = newBlock;\n }\n@@ -120,37 +104,45 @@ else if (block != null) {\n return blocks;\n }\n \n+ @Override\n+ public String toString() {\n+ return \"SOBIFragment{\" + \"fragmentType=\" + type + \", fileName='\" + fileName + '\\'' +\n+ \", parentSOBIFile=\" + parentSOBIFile + '}';\n+ }\n+\n+ /** --= Functional Getters/Setters --- */\n+\n+ public Date getPublishedDateTime() {\n+ return parentSOBIFile.getPublishedDateTime();\n+ }\n+\n+ public Date getProcessedDateTime() {\n+ return parentSOBIFile.getProcessedDateTime();\n+ }\n+\n /** --- Basic Getters/Setters --- */\n \n public SOBIFile getParentSOBIFile() {\n return parentSOBIFile;\n }\n \n- public SOBIFragmentType getFragmentType() {\n- return fragmentType;\n+ public SOBIFragmentType getType() {\n+ return type;\n }\n \n public String getFileName() {\n return fileName;\n }\n \n- public String getText() {\n- return text;\n- }\n-\n- public void setText(String text) {\n- this.text = text;\n- }\n-\n- public Date getPublishedDateTime() {\n- return publishedDateTime;\n+ public void setFileName(String fileName) {\n+ this.fileName = fileName;\n }\n \n- public Date getProcessedDateTime() {\n- return processedDateTime;\n+ public String getText() {\n+ return text;\n }\n \n- public void setProcessedDateTime(Date processedDateTime) {\n- this.processedDateTime = processedDateTime;\n+ public int getCounter() {\n+ return counter;\n }\n }\n\\ No newline at end of file", "raw_url": "https://github.com/nysenate/OpenLegislation/raw/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fmodel%2Fsobi%2FSOBIFragment.java", "sha": "20c37086cf3877f7746a3a058d13a514de698ce4", "status": "modified" }, { "additions": 30, "blob_url": "https://github.com/nysenate/OpenLegislation/blob/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fmodel%2Fsobi%2FSOBIFragmentType.java", "changes": 38, "contents_url": "https://api.github.com/repos/nysenate/OpenLegislation/contents/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fmodel%2Fsobi%2FSOBIFragmentType.java?ref=f89655fbb32c1372837f17bb6f7ed81f7a32c654", "deletions": 8, "filename": "src/main/java/gov/nysenate/openleg/model/sobi/SOBIFragmentType.java", "new_code": " * that a SOBIFragment can represent and regex patterns to extract them.\n BILL (false, \"[0-9]{4}[A-Z][0-9]{5}[ A-Z].+\", \"\"),\n AGENDA (true, \"<senagenda.+\", \"</senagenda.+\"),\n AGENDA_VOTE (true, \"<senagendavote.+\", \"</senagendavote.+\"),\n CALENDAR (true, \"<sencalendar.+\", \"</sencalendar.+\"),\n CALENDAR_ACTIVE (true, \"<sencalendaractive.+\", \"</sencalendaractive.+\"),\n COMMITTEE (true, \"<sencommmem.+\", \"</sencommmem.+\"),\n ANNOTATION (true, \"<senannotated.+\", \"</senannotated.+\");\n\n boolean isXml;\n String startPattern;\n String endPattern;\n\n SOBIFragmentType(boolean isXml, String startPattern, String endPattern) {\n this.isXml = isXml;\n this.startPattern = startPattern;\n this.endPattern = endPattern;\n }\n\n public boolean isXml() {\n return isXml;\n }\n\n public String getStartPattern() {\n return startPattern;\n }\n\n public String getEndPattern() {\n return endPattern;\n }", "new_methods": [ { "arguments": [], "filename": "src/main/java/gov/nysenate/openleg/model/sobi/SOBIFragmentType.java", "implementation": "return isXml;", "signature": "boolean isXml()" }, { "arguments": [], "filename": "src/main/java/gov/nysenate/openleg/model/sobi/SOBIFragmentType.java", "implementation": "return startPattern;", "signature": "String getStartPattern()" }, { "arguments": [], "filename": "src/main/java/gov/nysenate/openleg/model/sobi/SOBIFragmentType.java", "implementation": "return endPattern;", "signature": "String getEndPattern()" } ], "old_code": " * that a SOBIFragment can represent.\n BILL,\n AGENDA,\n AGENDA_VOTE,\n CALENDAR,\n CALENDAR_ACTIVE,\n COMMITTEE,\n ANNOTATION", "old_methods": [], "patch": "@@ -3,15 +3,37 @@\n /**\n * SOBIFragments are constructed to delineate a SOBI file into components based on a\n * common entity type. The SOBIFragmentType enum lists all the available entities\n- * that a SOBIFragment can represent.\n+ * that a SOBIFragment can represent and regex patterns to extract them.\n */\n public enum SOBIFragmentType\n {\n- BILL,\n- AGENDA,\n- AGENDA_VOTE,\n- CALENDAR,\n- CALENDAR_ACTIVE,\n- COMMITTEE,\n- ANNOTATION\n+ BILL (false, \"[0-9]{4}[A-Z][0-9]{5}[ A-Z].+\", \"\"),\n+ AGENDA (true, \"<senagenda.+\", \"</senagenda.+\"),\n+ AGENDA_VOTE (true, \"<senagendavote.+\", \"</senagendavote.+\"),\n+ CALENDAR (true, \"<sencalendar.+\", \"</sencalendar.+\"),\n+ CALENDAR_ACTIVE (true, \"<sencalendaractive.+\", \"</sencalendaractive.+\"),\n+ COMMITTEE (true, \"<sencommmem.+\", \"</sencommmem.+\"),\n+ ANNOTATION (true, \"<senannotated.+\", \"</senannotated.+\");\n+\n+ boolean isXml;\n+ String startPattern;\n+ String endPattern;\n+\n+ SOBIFragmentType(boolean isXml, String startPattern, String endPattern) {\n+ this.isXml = isXml;\n+ this.startPattern = startPattern;\n+ this.endPattern = endPattern;\n+ }\n+\n+ public boolean isXml() {\n+ return isXml;\n+ }\n+\n+ public String getStartPattern() {\n+ return startPattern;\n+ }\n+\n+ public String getEndPattern() {\n+ return endPattern;\n+ }\n }", "raw_url": "https://github.com/nysenate/OpenLegislation/raw/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fmodel%2Fsobi%2FSOBIFragmentType.java", "sha": "03a8ca4f3481bab809fb4c60b378217b3bf995af", "status": "modified" }, { "additions": 129, "blob_url": "https://github.com/nysenate/OpenLegislation/blob/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fprocessors%2FDataProcessor.java", "changes": 378, "contents_url": "https://api.github.com/repos/nysenate/OpenLegislation/contents/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fprocessors%2FDataProcessor.java?ref=f89655fbb32c1372837f17bb6f7ed81f7a32c654", "deletions": 249, "filename": "src/main/java/gov/nysenate/openleg/processors/DataProcessor.java", "new_code": "import gov.nysenate.openleg.Environment;\nimport gov.nysenate.openleg.dao.TranscriptDao;\nimport gov.nysenate.openleg.dao.base.SortOrder;\nimport gov.nysenate.openleg.dao.sobi.SOBIFileDao;\nimport gov.nysenate.openleg.dao.sobi.SOBIFragmentDao;\nimport gov.nysenate.openleg.dao.sobi.SqlSOBIFragmentDao;\nimport gov.nysenate.openleg.model.sobi.SOBIFile;\nimport gov.nysenate.openleg.model.sobi.SOBIFragment;\nimport gov.nysenate.openleg.model.sobi.SOBIFragmentType;\nimport gov.nysenate.openleg.processors.sobi.*;\nimport static gov.nysenate.openleg.util.FileHelper.*;\n\n private static Logger logger = Logger.getLogger(DataProcessor.class);\n /** The environment where the data is to be processed. */\n private Environment environment;\n private Map<SOBIFragmentType, SOBIProcessor> processorMap;\n /** -- DAO instances --- */\n\n private SOBIFileDao sobiFileDao;\n private SOBIFragmentDao sobiFragmentDao;\n private TranscriptDao transcriptDao;\n\n /** --- Constructors --- */\n\n public DataProcessor(Environment environment) {\n this.environment = environment;\n\n SqlSOBIFragmentDao fragmentDao = new SqlSOBIFragmentDao(environment);\n this.sobiFileDao = fragmentDao;\n this.sobiFragmentDao = fragmentDao;\n\n this.processorMap = new HashMap<>();\n this.processorMap.put(SOBIFragmentType.BILL, new BillProcessor(environment));\n this.processorMap.put(SOBIFragmentType.AGENDA, new AgendaProcessor());\n this.processorMap.put(SOBIFragmentType.AGENDA_VOTE, new AgendaVoteProcessor());\n this.processorMap.put(SOBIFragmentType.CALENDAR, new CalendarProcessor());\n this.processorMap.put(SOBIFragmentType.CALENDAR_ACTIVE, new CalendarActiveListProcessor());\n this.processorMap.put(SOBIFragmentType.COMMITTEE, new CommitteeProcessor());\n /** --- Processing methods --- */\n\n * @throws ParseException\n public void stage(File sourceDir, File workDir) throws IOException, ParseException {\n // Prepares incoming SOBI files for processing\n sobiFileDao.stageSOBIFiles(true);\n // TODO: Stage all hearings to the work directory.\n // TODO: Stage all transcripts\n *\n * @throws IOException, ParseException\n public void collate(File workDir) throws IOException, ParseException {\n for (SOBIFile sobiFile : sobiFileDao.getPendingSOBIFiles(SortOrder.ASC)) {\n StringBuilder billBuffer = new StringBuilder();\n int fragmentCounter = 1;\n List<SOBIFragment> sobiFragments = new ArrayList<>();\n List<String> lines = Arrays.asList(sobiFile.getText().split(\"\\\\r?\\\\n\"));\n Iterator<String> lineIterator = lines.iterator();\n // Construct fragments from SOBI text\n while (lineIterator.hasNext()) {\n String line = lineIterator.next();\n SOBIFragmentType fragmentType = getFragmentTypeFromLine(line);\n if (fragmentType != null) {\n // Bill portions are appended into a single buffer\n if (fragmentType.equals(SOBIFragmentType.BILL)) {\n if (line.charAt(11) == 'M') {\n // Memos are latin1 encoding\n line = new String(line.getBytes(encoding), \"latin1\");\n }\n line = line.replace((char)193, '°');\n billBuffer.append(line).append(\"\\n\");\n }\n // Other fragment types are in XML format\n else {\n String xmlText = extractXmlText(fragmentType, line, lineIterator);\n SOBIFragment fragment = new SOBIFragment(sobiFile, fragmentType, xmlText, fragmentCounter++);\n sobiFragments.add(fragment);\n if (billBuffer.length() > 0) {\n SOBIFragment billFragment = new SOBIFragment(sobiFile, SOBIFragmentType.BILL, billBuffer.toString(), 1);\n sobiFragments.add(billFragment);\n }\n // Persist the fragments\n sobiFragmentDao.saveSOBIFragments(sobiFragments);\n public void ingest(File workingDir, Storage storage) throws IOException {\n // Process SOBI files\n for (SOBIFile sobiFile : sobiFileDao.getPendingSOBIFiles(SortOrder.ASC)) {\n List<SOBIFragment> fragments = sobiFragmentDao.getSOBIFragments(sobiFile, SortOrder.ASC);\n for (SOBIFragment fragment : fragments) {\n if (processorMap.containsKey(fragment.getType())) {\n processorMap.get(fragment.getType()).process(fragment);\n else {\n logger.warn(\"No processors have been registered to handle: \" + fragment);\n sobiFile.incrementProcessedCount();\n sobiFile.setProcessedDateTime(new Date());\n sobiFile.setPendingProcessing(false);\n sobiFileDao.updateSOBIFile(sobiFile);\n\n // TODO: Process Transcripts / Public Hearings\n // TODO: Handle CMS.TEXT (Rules file)\n public void push(Storage storage, List<Entry<String, Change>> changes, List<ServiceBase> services) {\n public void archive(File workingDir, File archiveDir) throws IOException {\n /** --- Internal Methods --- */\n\n /**\n * Check the given SOBI line to determine if it matches the start of a SOBI Fragment type.\n * @param line String\n * @return SOBIFragmentType or null if no match\n */\n protected SOBIFragmentType getFragmentTypeFromLine(String line) {\n for (SOBIFragmentType fragmentType : SOBIFragmentType.values()) {\n if (line.matches(fragmentType.getStartPattern())) {\n return fragmentType;\n }\n return null;\n protected void archiveFiles(File sourceDir, File destDir, String subFolder) throws IOException {\n * Extracts a well formed XML document from the lines and writes it to the given\n * we'll get malformed XML docs. TODO: EDIT THIS DOC\n *\n * @param fragmentType SOBIFragmentType\n * @param line String - The starting line of the document\n * @param iterator Iterator<String>\n * @return String - The resulting XML string.\n protected String extractXmlText(SOBIFragmentType fragmentType, String line, Iterator<String> iterator) throws IOException {\n String endPattern = fragmentType.getEndPattern();\n\n String in = null;\n while (iterator.hasNext()) {\n in = iterator.next();\n if (in.matches(endPattern)) {\n }\n // TODO: Figure out all this matcher magic. How does it work?\n return data;", "new_methods": [ { "arguments": [ "Environment environment" ], "filename": "src/main/java/gov/nysenate/openleg/processors/DataProcessor.java", "implementation": "this.environment = environment;\n\n SqlSOBIFragmentDao fragmentDao = new SqlSOBIFragmentDao(environment);\n this.sobiFileDao = fragmentDao;\n this.sobiFragmentDao = fragmentDao;\n\n this.processorMap = new HashMap<>();\n this.processorMap.put(SOBIFragmentType.BILL, new BillProcessor(environment));\n this.processorMap.put(SOBIFragmentType.AGENDA, new AgendaProcessor());\n this.processorMap.put(SOBIFragmentType.AGENDA_VOTE, new AgendaVoteProcessor());\n this.processorMap.put(SOBIFragmentType.CALENDAR, new CalendarProcessor());\n this.processorMap.put(SOBIFragmentType.CALENDAR_ACTIVE, new CalendarActiveListProcessor());\n this.processorMap.put(SOBIFragmentType.COMMITTEE, new CommitteeProcessor());\n /** --- Processing methods --- */\n\n * @throws ParseException\n public void stage(File sourceDir, File workDir) throws IOException, ParseException {\n // Prepares incoming SOBI files for processing\n sobiFileDao.stageSOBIFiles(true);\n // TODO: Stage all hearings to the work directory.\n // TODO: Stage all transcripts\n *\n * @throws IOException, ParseException\n public void collate(File workDir) throws IOException, ParseException {\n for (SOBIFile sobiFile : sobiFileDao.getPendingSOBIFiles(SortOrder.ASC)) {\n StringBuilder billBuffer = new StringBuilder();\n int fragmentCounter = 1;\n List<SOBIFragment> sobiFragments = new ArrayList<>();\n List<String> lines = Arrays.asList(sobiFile.getText().split(\"\\\\r?\\\\n\"));\n Iterator<String> lineIterator = lines.iterator();\n // Construct fragments from SOBI text\n while (lineIterator.hasNext()) {\n String line = lineIterator.next();\n SOBIFragmentType fragmentType = getFragmentTypeFromLine(line);\n if (fragmentType != null) {\n // Bill portions are appended into a single buffer\n if (fragmentType.equals(SOBIFragmentType.BILL)) {\n if (line.charAt(11) == 'M') {\n // Memos are latin1 encoding\n line = new String(line.getBytes(encoding), \"latin1\");", "signature": "public DataProcessor(Environment environment)" }, { "arguments": [ "Storage storage", " List<Entry<String", " Change>> changes", " List<ServiceBase> services" ], "filename": "src/main/java/gov/nysenate/openleg/processors/DataProcessor.java", "implementation": "public void archive(File workingDir, File archiveDir) throws IOException {\n /** --- Internal Methods --- */\n\n /**\n * Check the given SOBI line to determine if it matches the start of a SOBI Fragment type.\n * @param line String\n * @return SOBIFragmentType or null if no match\n */\n protected SOBIFragmentType getFragmentTypeFromLine(String line) {\n for (SOBIFragmentType fragmentType : SOBIFragmentType.values()) {\n if (line.matches(fragmentType.getStartPattern())) {\n return fragmentType;", "signature": "void push(Storage storage, List<Entry<String, Change>> changes, List<ServiceBase> services)" } ], "old_code": "import org.apache.commons.io.FileUtils;\nimport org.apache.commons.io.filefilter.*;\nimport org.xml.sax.SAXException;\nimport javax.xml.xpath.XPathExpressionException;\nimport java.io.BufferedReader;\nimport java.io.StringReader;\n *\n * @author GraylinKim\n Logger logger = Logger.getLogger(DataProcessor.class);\n /**\n * SOBI.DYYMMDD.THHMMSS.TXT files are (mostly) in a CP850 or similar encoding. This\n * was determined from the byte mapping of paragraph/section characters to 244/245.\n *\n * This can't be 100% correct though because the degree symbol must be 193 in the\n * correct code set. See SOBI.D120612.T125850.TXT.\n */\n /**\n * Any directory that we attempt to list files from should exist. If it doesn't then\n * create them. This makes the processes robust against incomplete environment setups.\n *\n * @param directory - The directory to list files from (and create if necessary)\n * @param extensions - A list of extensions to grab. null for all extensions.\n * @param recursive - true when you want to list files recursively.\n * @return A collection of matching filenames\n * @throws IOException\n */\n public Collection<File> safeListFiles(File directory, String[] extensions, boolean recursive) throws IOException\n {\n FileUtils.forceMkdir(directory);\n return FileUtils.listFiles(directory, extensions, recursive);\n }\n /**\n * Any directory that we attempt to list files from should exist. If it doesn't then\n * create them. This overload can be used to exclude certain directories if recursive is true.\n *\n * @param directory - The directory to list files from (and create if necessary)\n * @param recursive - true when you want to list files recursively.\n * @param excludeDirs - Array of directory names that should be excluded from the match.\n * Set to null if all directories should be matched.\n * @return A collection of matching filenames\n * @throws IOException\n */\n public Collection<File> safeListFiles(File directory, boolean recursive, String[] excludeDirs) throws IOException\n {\n FileUtils.forceMkdir(directory);\n IOFileFilter dirFileFilter;\n if (excludeDirs != null && excludeDirs.length > 0) {\n List<IOFileFilter> excludeDirFilters = new ArrayList<>();\n for (String excludeDir : excludeDirs) {\n excludeDirFilters.add(FileFilterUtils.nameFileFilter(excludeDir));\n }\n dirFileFilter = FileFilterUtils.notFileFilter(new OrFileFilter(excludeDirFilters));\n }\n else {\n dirFileFilter = (recursive) ? TrueFileFilter.TRUE : FalseFileFilter.FALSE;\n }\n return FileUtils.listFiles(directory, TrueFileFilter.TRUE, dirFileFilter);\n }\n /**\n * Create the specified folder if necessary and return a File handle to it.\n *\n * @param parent - The parent directory for this folder\n * @param folderName - The name of the directory to retrieve\n * @return a File handle to the requested folder.\n * @throws IOException\n */\n public File safeGetFolder(File parent, String folderName) throws IOException\n {\n File directory = new File(parent, folderName);\n FileUtils.forceMkdir(directory);\n return directory;\n public void stage(File sourceDir, File workDir) throws IOException\n {\n // Everything else on this level should be a SOBI file\n File sobiDir = safeGetFolder(workDir, \"sobis\");\n for (File sobiFile : safeListFiles(sourceDir, null, false)) {\n moveFileToDirectory(sobiFile, sobiDir, true);\n }\n File hearingDir = safeGetFolder(workDir, \"hearings\");\n for (File hearingFile : safeListFiles(safeGetFolder(sourceDir, \"hearings\"), null, false)) {\n moveFileToDirectory(hearingFile, hearingDir, true);\n }\n File transcriptDir = safeGetFolder(workDir, \"transcripts\");\n for (File transcriptFile : safeListFiles(safeGetFolder(sourceDir, \"transcripts\"), null, false)) {\n moveFileToDirectory(transcriptFile, transcriptDir, true);\n }\n * Looks for SOBI files in the sobis directory and extracts the various sub-documents\n * into properly encoded UTF-8 files in their respective directories for later\n * processing.\n * @throws IOException\n public void collate(File workDir) throws IOException\n {\n // Folders for our extracted sub documents. Extracting them and writing them to file\n // provides an easily inspectable record of how this step went.\n File billDir = safeGetFolder(workDir, \"bills\");\n File agendaDir = safeGetFolder(workDir, \"agendas\");\n File agendaVoteDir = safeGetFolder(workDir, \"agendavotes\");\n File calendarDir = safeGetFolder(workDir, \"calendars\");\n File activeListDir = safeGetFolder(workDir, \"calendaractives\");\n File committeeDir = safeGetFolder(workDir, \"committees\");\n File annotationDir = safeGetFolder(workDir, \"annotations\");\n\n for (File sobiFile : safeListFiles(safeGetFolder(workDir, \"sobis\"), null, true)) {\n String line = null;\n int fileCounter = 1;\n StringBuffer billBuffer = new StringBuffer();\n BufferedReader br = new BufferedReader(new StringReader(FileUtils.readFileToString(sobiFile, encoding)));\n\n while((line = br.readLine()) != null) {\n if(line.matches(\"<sencalendaractive.+\")) {\n // Extract calendars and active lists\n File activeListFile = new File(activeListDir, sobiFile.getName()+\"-calendaractive-\"+(fileCounter++)+\".xml\");\n logger.info(\"Extracting calendaractive: \"+activeListFile);\n extractXml(\"</sencalendaractive.+\", line, br, activeListFile);\n }\n else if(line.matches(\"<sencalendar.+\")) {\n // Extract calendars and active lists\n File calendarFile = new File(calendarDir, sobiFile.getName()+\"-calendar-\"+(fileCounter++)+\".xml\");\n logger.info(\"Extracting calendar: \"+calendarFile);\n extractXml(\"</sencalendar.+\", line, br, calendarFile);\n }\n else if(line.matches(\"<sencommmem.+\")) {\n File committeeFile = new File(committeeDir, sobiFile.getName()+\"-committee-\"+(fileCounter++)+\".xml\");\n logger.info(\"Extracting commitee: \"+committeeFile);\n extractXml(\"</sencommmem.+\", line, br, committeeFile);\n }\n else if(line.matches(\"<senagendavote.+\")) {\n // Extract agendas and corresponding votes\n File agendaVoteFile = new File(agendaVoteDir, sobiFile.getName()+\"-agendavote-\"+(fileCounter++)+\".xml\");\n logger.info(\"Extracting agendavote: \"+agendaVoteFile);\n extractXml(\"</senagendavote.+\", line, br, agendaVoteFile);\n }\n else if(line.matches(\"<senagenda.+\")) {\n // Extract agendas and corresponding votes\n File agendaFile = new File(agendaDir, sobiFile.getName()+\"-agenda-\"+(fileCounter++)+\".xml\");\n logger.info(\"Extracting agenda: \"+agendaFile);\n extractXml(\"</senagenda.+\", line, br, agendaFile);\n }\n else if(line.matches(\"<senannotated.+\")) {\n // Extract unused annotation files. We stopped getting these in 2009.\n File annotationFile = new File(annotationDir, sobiFile.getName()+\"-annotation-\"+(fileCounter++)+\".xml\");\n logger.info(\"Extracting annotation: \"+annotationFile);\n extractXml(\"</senannotated.+\", line, br, annotationFile);\n }\n else if(line.matches(\"[0-9]{4}[A-Z][0-9]{5}[ A-Z].+\")) {\n if (line.charAt(11) == 'M') {\n // Memos are latin1 encoding\n line = new String(line.getBytes(encoding), \"latin1\");\n\n line = line.replace((char)193, '°');\n billBuffer.append(line).append(\"\\n\");\n\n br.close();\n logger.info(\"Writing bill sobi to \"+sobiFile);\n File billFile = new File(billDir, sobiFile.getName()+\"-bill-\"+(fileCounter++)+\".sobi\");\n FileUtils.write(billFile, billBuffer.toString());\n public void ingest(File workingDir, Storage storage) throws IOException, ParserConfigurationException\n {\n BillProcessor billProcessor = new BillProcessor();\n SenagendaProcessor agendaProcessor = new SenagendaProcessor();\n SencalendarProcessor calendarProcessor = new SencalendarProcessor();\n TranscriptProcessor transcriptProcessor = new TranscriptProcessor();\n\n for (File file : getSortedFiles(workingDir, true, new String[] {\"sobis\"})) {\n try {\n logger.info(\"Working on: \"+file);\n String type = file.getParentFile().getName();\n if (type.equals(\"bills\")) {\n billProcessor.process(file, storage);\n } else if (type.equals(\"calendars\")) {\n calendarProcessor.processSencalendar(file, storage);\n } else if (type.equals(\"calendaractives\")) {\n calendarProcessor.processSencalendarActive(file, storage);\n } else if (type.equals(\"agendas\")) {\n agendaProcessor.processSenagenda(file, storage);\n } else if (type.equals(\"agendavotes\")) {\n agendaProcessor.processSenagendaVote(file, storage);\n } else if (type.equals(\"annotations\")) {\n continue; // we don't process or receive these anymore\n } else if (type.equals(\"transcripts\")) {\n transcriptProcessor.process(file, storage);\n } else if (type.equals(\"hearings\")) {\n continue; // we don't process or receive these yet.\n } else if (type.equals(\"committees\")) {\n continue; // We don't process\n } else if (file.getName().equals(\"CMS.TEXT\")) {\n // The rules don't really need processing, just put them somewhere for later\n FileUtils.copyFileToDirectory(file, storage.getStorageDir());\n\n // To avoid memory issues, occasionally flush changes to file-system and truncate memory\n if (storage.memory.size() > 4000) {\n storage.flush();\n storage.clear();\n catch (IOException e) {\n logger.error(\"IO issue with \"+file.getName(), e);\n }\n catch (XPathExpressionException e) {\n logger.error(\"Xpath issue with \"+file.getName(), e);\n }\n catch (SAXException e) {\n logger.error(\"SAX issue with \"+file.getName(), e);\n }\n catch (ParseException e) {\n logger.error(\"XML issue with \"+file.getName(), e);\n }\n storage.flush();\n public void push(Storage storage, List<Entry<String, Change>> changes, List<ServiceBase> services)\n {\n public void archive(File workingDir, File archiveDir) throws IOException\n {\n public void moveFileToDirectory(File file, File directory, boolean createDirectory) throws IOException\n {\n File newFile = new File(directory, file.getName());\n if (newFile.exists()) {\n newFile.delete();\n FileUtils.moveFileToDirectory(file, directory, true);\n protected void archiveFiles(File sourceDir, File destDir, String subFolder) throws IOException\n {\n * Returns a collection of files sorted by file name (not file path!)\n *\n * @param directory - The directory to get files from.\n * @param recursive - true to retrieve files from sub-directories.\n * @return\n * @throws IOException\n */\n protected Collection<File> getSortedFiles(File directory, boolean recursive, String[] excludeDirs) throws IOException {\n Collection<File> files = safeListFiles(directory, recursive, excludeDirs);\n Collections.sort((List<File>)files, new Comparator<File>(){\n public int compare(File a, File b) {\n return a.getName().compareTo(b.getName());\n }\n });\n return files;\n }\n\n /**\n * Extracts a well formed XML document from a BufferedReader and writes it to the given\n * we'll get malformed XML docs.\n * @param escape - Regex matching the escape sequence for the XML document. e.g. {@literal </senagenda.+}\n * @param line - The starting line of the document\n * @param br - The buffered reader used to retrieve additional lines from the document\n * @param file - The file that the resulting XML document should be written to.\n protected void extractXml(String escape, String line, BufferedReader br, File file) throws IOException\n {\n String in;\n while((in = br.readLine()) != null) {\n if(in.matches(escape))\n // TODO: Figure out all this matcher magic. How does it work? What the hell is it doing?\n FileUtils.write(file, data);", "old_methods": [ { "arguments": [ "Storage storage", " List<Entry<String", " Change>> changes", " List<ServiceBase> services" ], "filename": "src/main/java/gov/nysenate/openleg/processors/DataProcessor.java", "implementation": "public void archive(File workingDir, File archiveDir) throws IOException\n {\n public void moveFileToDirectory(File file, File directory, boolean createDirectory) throws IOException\n {\n File newFile = new File(directory, file.getName());\n if (newFile.exists()) {\n newFile.delete();\n FileUtils.moveFileToDirectory(file, directory, true);\n protected void archiveFiles(File sourceDir, File destDir, String subFolder) throws IOException\n {\n * Returns a collection of files sorted by file name (not file path!)\n *\n * @param directory - The directory to get files from.\n * @param recursive - true to retrieve files from sub-directories.\n * @return\n * @throws IOException\n */\n protected Collection<File> getSortedFiles(File directory, boolean recursive, String[] excludeDirs) throws IOException {\n Collection<File> files = safeListFiles(directory, recursive, excludeDirs);\n Collections.sort((List<File>)files, new Comparator<File>(){\n public int compare(File a, File b) {\n return a.getName().compareTo(b.getName());", "signature": "void push(Storage storage, List<Entry<String, Change>> changes, List<ServiceBase> services)" } ], "patch": "@@ -1,26 +1,32 @@\n package gov.nysenate.openleg.processors;\n \n+import gov.nysenate.openleg.Environment;\n+import gov.nysenate.openleg.dao.TranscriptDao;\n+import gov.nysenate.openleg.dao.base.SortOrder;\n+import gov.nysenate.openleg.dao.sobi.SOBIFileDao;\n+import gov.nysenate.openleg.dao.sobi.SOBIFragmentDao;\n+import gov.nysenate.openleg.dao.sobi.SqlSOBIFragmentDao;\n import gov.nysenate.openleg.model.Change;\n+import gov.nysenate.openleg.model.sobi.SOBIFile;\n+import gov.nysenate.openleg.model.sobi.SOBIFragment;\n+import gov.nysenate.openleg.model.sobi.SOBIFragmentType;\n+import gov.nysenate.openleg.processors.sobi.*;\n import gov.nysenate.openleg.services.ServiceBase;\n import gov.nysenate.openleg.util.Storage;\n-import org.apache.commons.io.FileUtils;\n-import org.apache.commons.io.filefilter.*;\n import org.apache.log4j.Logger;\n-import org.xml.sax.SAXException;\n \n import javax.xml.parsers.ParserConfigurationException;\n-import javax.xml.xpath.XPathExpressionException;\n-import java.io.BufferedReader;\n import java.io.File;\n import java.io.IOException;\n-import java.io.StringReader;\n import java.text.ParseException;\n import java.text.SimpleDateFormat;\n import java.util.*;\n import java.util.Map.Entry;\n import java.util.regex.Matcher;\n import java.util.regex.Pattern;\n \n+import static gov.nysenate.openleg.util.FileHelper.*;\n+\n /**\n * Contains an implementation for each step of the Open Legislation data processing pipeline.\n *\n@@ -51,190 +57,108 @@\n * Archives all working files for reference when going through logs in the future.\n * </li>\n * </ul>\n- *\n- * @author GraylinKim\n */\n public class DataProcessor\n {\n- Logger logger = Logger.getLogger(DataProcessor.class);\n+ private static Logger logger = Logger.getLogger(DataProcessor.class);\n \n- /**\n- * SOBI.DYYMMDD.THHMMSS.TXT files are (mostly) in a CP850 or similar encoding. This\n- * was determined from the byte mapping of paragraph/section characters to 244/245.\n- *\n- * This can't be 100% correct though because the degree symbol must be 193 in the\n- * correct code set. See SOBI.D120612.T125850.TXT.\n- */\n protected static String encoding = \"CP850\";\n \n- /**\n- * Any directory that we attempt to list files from should exist. If it doesn't then\n- * create them. This makes the processes robust against incomplete environment setups.\n- *\n- * @param directory - The directory to list files from (and create if necessary)\n- * @param extensions - A list of extensions to grab. null for all extensions.\n- * @param recursive - true when you want to list files recursively.\n- * @return A collection of matching filenames\n- * @throws IOException\n- */\n- public Collection<File> safeListFiles(File directory, String[] extensions, boolean recursive) throws IOException\n- {\n- FileUtils.forceMkdir(directory);\n- return FileUtils.listFiles(directory, extensions, recursive);\n- }\n+ /** The environment where the data is to be processed. */\n+ private Environment environment;\n \n- /**\n- * Any directory that we attempt to list files from should exist. If it doesn't then\n- * create them. This overload can be used to exclude certain directories if recursive is true.\n- *\n- * @param directory - The directory to list files from (and create if necessary)\n- * @param recursive - true when you want to list files recursively.\n- * @param excludeDirs - Array of directory names that should be excluded from the match.\n- * Set to null if all directories should be matched.\n- * @return A collection of matching filenames\n- * @throws IOException\n- */\n- public Collection<File> safeListFiles(File directory, boolean recursive, String[] excludeDirs) throws IOException\n- {\n- FileUtils.forceMkdir(directory);\n- IOFileFilter dirFileFilter;\n- if (excludeDirs != null && excludeDirs.length > 0) {\n- List<IOFileFilter> excludeDirFilters = new ArrayList<>();\n- for (String excludeDir : excludeDirs) {\n- excludeDirFilters.add(FileFilterUtils.nameFileFilter(excludeDir));\n- }\n- dirFileFilter = FileFilterUtils.notFileFilter(new OrFileFilter(excludeDirFilters));\n- }\n- else {\n- dirFileFilter = (recursive) ? TrueFileFilter.TRUE : FalseFileFilter.FALSE;\n- }\n- return FileUtils.listFiles(directory, TrueFileFilter.TRUE, dirFileFilter);\n- }\n+ private Map<SOBIFragmentType, SOBIProcessor> processorMap;\n \n- /**\n- * Create the specified folder if necessary and return a File handle to it.\n- *\n- * @param parent - The parent directory for this folder\n- * @param folderName - The name of the directory to retrieve\n- * @return a File handle to the requested folder.\n- * @throws IOException\n- */\n- public File safeGetFolder(File parent, String folderName) throws IOException\n- {\n- File directory = new File(parent, folderName);\n- FileUtils.forceMkdir(directory);\n- return directory;\n+ /** -- DAO instances --- */\n+\n+ private SOBIFileDao sobiFileDao;\n+ private SOBIFragmentDao sobiFragmentDao;\n+ private TranscriptDao transcriptDao;\n+\n+ /** --- Constructors --- */\n+\n+ public DataProcessor(Environment environment) {\n+ this.environment = environment;\n+\n+ SqlSOBIFragmentDao fragmentDao = new SqlSOBIFragmentDao(environment);\n+ this.sobiFileDao = fragmentDao;\n+ this.sobiFragmentDao = fragmentDao;\n+\n+ this.processorMap = new HashMap<>();\n+ this.processorMap.put(SOBIFragmentType.BILL, new BillProcessor(environment));\n+ this.processorMap.put(SOBIFragmentType.AGENDA, new AgendaProcessor());\n+ this.processorMap.put(SOBIFragmentType.AGENDA_VOTE, new AgendaVoteProcessor());\n+ this.processorMap.put(SOBIFragmentType.CALENDAR, new CalendarProcessor());\n+ this.processorMap.put(SOBIFragmentType.CALENDAR_ACTIVE, new CalendarActiveListProcessor());\n+ this.processorMap.put(SOBIFragmentType.COMMITTEE, new CommitteeProcessor());\n }\n \n+ /** --- Processing methods --- */\n+\n /**\n * Stages CMS.TEXT, transcripts/, hearings/ and SOBI format files from the source\n * directory into their respective destinations subfolders in the work directory.\n *\n * @param sourceDir - The directory to pull files from\n * @param workDir - The directory to stage the files into\n * @throws IOException\n+ * @throws ParseException\n */\n- public void stage(File sourceDir, File workDir) throws IOException\n- {\n+ public void stage(File sourceDir, File workDir) throws IOException, ParseException {\n File rulesFile = new File(sourceDir,\"CMS.TEXT\");\n if (rulesFile.exists()) {\n moveFileToDirectory(rulesFile, workDir, true);\n }\n \n- // Everything else on this level should be a SOBI file\n- File sobiDir = safeGetFolder(workDir, \"sobis\");\n- for (File sobiFile : safeListFiles(sourceDir, null, false)) {\n- moveFileToDirectory(sobiFile, sobiDir, true);\n- }\n+ // Prepares incoming SOBI files for processing\n+ sobiFileDao.stageSOBIFiles(true);\n \n- File hearingDir = safeGetFolder(workDir, \"hearings\");\n- for (File hearingFile : safeListFiles(safeGetFolder(sourceDir, \"hearings\"), null, false)) {\n- moveFileToDirectory(hearingFile, hearingDir, true);\n- }\n+ // TODO: Stage all hearings to the work directory.\n \n- File transcriptDir = safeGetFolder(workDir, \"transcripts\");\n- for (File transcriptFile : safeListFiles(safeGetFolder(sourceDir, \"transcripts\"), null, false)) {\n- moveFileToDirectory(transcriptFile, transcriptDir, true);\n- }\n+ // TODO: Stage all transcripts\n }\n \n /**\n- * Looks for SOBI files in the sobis directory and extracts the various sub-documents\n- * into properly encoded UTF-8 files in their respective directories for later\n- * processing.\n+ *\n *\n * @param workDir - The working directory with files to collate\n- * @throws IOException\n+ * @throws IOException, ParseException\n */\n- public void collate(File workDir) throws IOException\n- {\n- // Folders for our extracted sub documents. Extracting them and writing them to file\n- // provides an easily inspectable record of how this step went.\n- File billDir = safeGetFolder(workDir, \"bills\");\n- File agendaDir = safeGetFolder(workDir, \"agendas\");\n- File agendaVoteDir = safeGetFolder(workDir, \"agendavotes\");\n- File calendarDir = safeGetFolder(workDir, \"calendars\");\n- File activeListDir = safeGetFolder(workDir, \"calendaractives\");\n- File committeeDir = safeGetFolder(workDir, \"committees\");\n- File annotationDir = safeGetFolder(workDir, \"annotations\");\n-\n- for (File sobiFile : safeListFiles(safeGetFolder(workDir, \"sobis\"), null, true)) {\n- String line = null;\n- int fileCounter = 1;\n- StringBuffer billBuffer = new StringBuffer();\n- BufferedReader br = new BufferedReader(new StringReader(FileUtils.readFileToString(sobiFile, encoding)));\n-\n- while((line = br.readLine()) != null) {\n- if(line.matches(\"<sencalendaractive.+\")) {\n- // Extract calendars and active lists\n- File activeListFile = new File(activeListDir, sobiFile.getName()+\"-calendaractive-\"+(fileCounter++)+\".xml\");\n- logger.info(\"Extracting calendaractive: \"+activeListFile);\n- extractXml(\"</sencalendaractive.+\", line, br, activeListFile);\n- }\n- else if(line.matches(\"<sencalendar.+\")) {\n- // Extract calendars and active lists\n- File calendarFile = new File(calendarDir, sobiFile.getName()+\"-calendar-\"+(fileCounter++)+\".xml\");\n- logger.info(\"Extracting calendar: \"+calendarFile);\n- extractXml(\"</sencalendar.+\", line, br, calendarFile);\n- }\n- else if(line.matches(\"<sencommmem.+\")) {\n- File committeeFile = new File(committeeDir, sobiFile.getName()+\"-committee-\"+(fileCounter++)+\".xml\");\n- logger.info(\"Extracting commitee: \"+committeeFile);\n- extractXml(\"</sencommmem.+\", line, br, committeeFile);\n- }\n- else if(line.matches(\"<senagendavote.+\")) {\n- // Extract agendas and corresponding votes\n- File agendaVoteFile = new File(agendaVoteDir, sobiFile.getName()+\"-agendavote-\"+(fileCounter++)+\".xml\");\n- logger.info(\"Extracting agendavote: \"+agendaVoteFile);\n- extractXml(\"</senagendavote.+\", line, br, agendaVoteFile);\n- }\n- else if(line.matches(\"<senagenda.+\")) {\n- // Extract agendas and corresponding votes\n- File agendaFile = new File(agendaDir, sobiFile.getName()+\"-agenda-\"+(fileCounter++)+\".xml\");\n- logger.info(\"Extracting agenda: \"+agendaFile);\n- extractXml(\"</senagenda.+\", line, br, agendaFile);\n- }\n- else if(line.matches(\"<senannotated.+\")) {\n- // Extract unused annotation files. We stopped getting these in 2009.\n- File annotationFile = new File(annotationDir, sobiFile.getName()+\"-annotation-\"+(fileCounter++)+\".xml\");\n- logger.info(\"Extracting annotation: \"+annotationFile);\n- extractXml(\"</senannotated.+\", line, br, annotationFile);\n- }\n- else if(line.matches(\"[0-9]{4}[A-Z][0-9]{5}[ A-Z].+\")) {\n- if (line.charAt(11) == 'M') {\n- // Memos are latin1 encoding\n- line = new String(line.getBytes(encoding), \"latin1\");\n+ public void collate(File workDir) throws IOException, ParseException {\n+ for (SOBIFile sobiFile : sobiFileDao.getPendingSOBIFiles(SortOrder.ASC)) {\n+ StringBuilder billBuffer = new StringBuilder();\n+ int fragmentCounter = 1;\n+ List<SOBIFragment> sobiFragments = new ArrayList<>();\n+ List<String> lines = Arrays.asList(sobiFile.getText().split(\"\\\\r?\\\\n\"));\n+ Iterator<String> lineIterator = lines.iterator();\n+ // Construct fragments from SOBI text\n+ while (lineIterator.hasNext()) {\n+ String line = lineIterator.next();\n+ SOBIFragmentType fragmentType = getFragmentTypeFromLine(line);\n+ if (fragmentType != null) {\n+ // Bill portions are appended into a single buffer\n+ if (fragmentType.equals(SOBIFragmentType.BILL)) {\n+ if (line.charAt(11) == 'M') {\n+ // Memos are latin1 encoding\n+ line = new String(line.getBytes(encoding), \"latin1\");\n+ }\n+ line = line.replace((char)193, '°');\n+ billBuffer.append(line).append(\"\\n\");\n+ }\n+ // Other fragment types are in XML format\n+ else {\n+ String xmlText = extractXmlText(fragmentType, line, lineIterator);\n+ SOBIFragment fragment = new SOBIFragment(sobiFile, fragmentType, xmlText, fragmentCounter++);\n+ sobiFragments.add(fragment);\n }\n-\n- line = line.replace((char)193, '°');\n- billBuffer.append(line).append(\"\\n\");\n }\n }\n-\n- br.close();\n- logger.info(\"Writing bill sobi to \"+sobiFile);\n- File billFile = new File(billDir, sobiFile.getName()+\"-bill-\"+(fileCounter++)+\".sobi\");\n- FileUtils.write(billFile, billBuffer.toString());\n+ if (billBuffer.length() > 0) {\n+ SOBIFragment billFragment = new SOBIFragment(sobiFile, SOBIFragmentType.BILL, billBuffer.toString(), 1);\n+ sobiFragments.add(billFragment);\n+ }\n+ // Persist the fragments\n+ sobiFragmentDao.saveSOBIFragments(sobiFragments);\n }\n }\n \n@@ -248,60 +172,26 @@ else if(line.matches(\"[0-9]{4}[A-Z][0-9]{5}[ A-Z].+\")) {\n * @throws IOException\n * @throws ParserConfigurationException\n */\n- public void ingest(File workingDir, Storage storage) throws IOException, ParserConfigurationException\n- {\n- BillProcessor billProcessor = new BillProcessor();\n- SenagendaProcessor agendaProcessor = new SenagendaProcessor();\n- SencalendarProcessor calendarProcessor = new SencalendarProcessor();\n- TranscriptProcessor transcriptProcessor = new TranscriptProcessor();\n-\n- for (File file : getSortedFiles(workingDir, true, new String[] {\"sobis\"})) {\n- try {\n- logger.info(\"Working on: \"+file);\n- String type = file.getParentFile().getName();\n- if (type.equals(\"bills\")) {\n- billProcessor.process(file, storage);\n- } else if (type.equals(\"calendars\")) {\n- calendarProcessor.processSencalendar(file, storage);\n- } else if (type.equals(\"calendaractives\")) {\n- calendarProcessor.processSencalendarActive(file, storage);\n- } else if (type.equals(\"agendas\")) {\n- agendaProcessor.processSenagenda(file, storage);\n- } else if (type.equals(\"agendavotes\")) {\n- agendaProcessor.processSenagendaVote(file, storage);\n- } else if (type.equals(\"annotations\")) {\n- continue; // we don't process or receive these anymore\n- } else if (type.equals(\"transcripts\")) {\n- transcriptProcessor.process(file, storage);\n- } else if (type.equals(\"hearings\")) {\n- continue; // we don't process or receive these yet.\n- } else if (type.equals(\"committees\")) {\n- continue; // We don't process\n- } else if (file.getName().equals(\"CMS.TEXT\")) {\n- // The rules don't really need processing, just put them somewhere for later\n- FileUtils.copyFileToDirectory(file, storage.getStorageDir());\n+ public void ingest(File workingDir, Storage storage) throws IOException {\n+ // Process SOBI files\n+ for (SOBIFile sobiFile : sobiFileDao.getPendingSOBIFiles(SortOrder.ASC)) {\n+ List<SOBIFragment> fragments = sobiFragmentDao.getSOBIFragments(sobiFile, SortOrder.ASC);\n+ for (SOBIFragment fragment : fragments) {\n+ if (processorMap.containsKey(fragment.getType())) {\n+ processorMap.get(fragment.getType()).process(fragment);\n }\n-\n- // To avoid memory issues, occasionally flush changes to file-system and truncate memory\n- if (storage.memory.size() > 4000) {\n- storage.flush();\n- storage.clear();\n+ else {\n+ logger.warn(\"No processors have been registered to handle: \" + fragment);\n }\n }\n- catch (IOException e) {\n- logger.error(\"IO issue with \"+file.getName(), e);\n- }\n- catch (XPathExpressionException e) {\n- logger.error(\"Xpath issue with \"+file.getName(), e);\n- }\n- catch (SAXException e) {\n- logger.error(\"SAX issue with \"+file.getName(), e);\n- }\n- catch (ParseException e) {\n- logger.error(\"XML issue with \"+file.getName(), e);\n- }\n+ sobiFile.incrementProcessedCount();\n+ sobiFile.setProcessedDateTime(new Date());\n+ sobiFile.setPendingProcessing(false);\n+ sobiFileDao.updateSOBIFile(sobiFile);\n }\n- storage.flush();\n+\n+ // TODO: Process Transcripts / Public Hearings\n+ // TODO: Handle CMS.TEXT (Rules file)\n }\n \n /**\n@@ -311,8 +201,7 @@ public void ingest(File workingDir, Storage storage) throws IOException, ParserC\n * @param changes - A list of changes to push out to all services\n * @param services - A list of services to push change to.\n */\n- public void push(Storage storage, List<Entry<String, Change>> changes, List<ServiceBase> services)\n- {\n+ public void push(Storage storage, List<Entry<String, Change>> changes, List<ServiceBase> services) {\n for(ServiceBase service : services) {\n try {\n service.process(changes, storage);\n@@ -332,8 +221,7 @@ public void push(Storage storage, List<Entry<String, Change>> changes, List<Serv\n * @param archiveDir - The directory to archive all work files to.\n * @throws IOException\n */\n- public void archive(File workingDir, File archiveDir) throws IOException\n- {\n+ public void archive(File workingDir, File archiveDir) throws IOException {\n File rulesFile = new File(workingDir, \"CMS.TEXT\");\n if (rulesFile.exists()) {\n moveFileToDirectory(rulesFile, archiveDir, true);\n@@ -357,13 +245,20 @@ public void archive(File workingDir, File archiveDir) throws IOException\n archiveFiles(safeGetFolder(workingDir, \"annotations\"), archiveDir, \"annotations\");\n }\n \n- public void moveFileToDirectory(File file, File directory, boolean createDirectory) throws IOException\n- {\n- File newFile = new File(directory, file.getName());\n- if (newFile.exists()) {\n- newFile.delete();\n+ /** --- Internal Methods --- */\n+\n+ /**\n+ * Check the given SOBI line to determine if it matches the start of a SOBI Fragment type.\n+ * @param line String\n+ * @return SOBIFragmentType or null if no match\n+ */\n+ protected SOBIFragmentType getFragmentTypeFromLine(String line) {\n+ for (SOBIFragmentType fragmentType : SOBIFragmentType.values()) {\n+ if (line.matches(fragmentType.getStartPattern())) {\n+ return fragmentType;\n+ }\n }\n- FileUtils.moveFileToDirectory(file, directory, true);\n+ return null;\n }\n \n /**\n@@ -377,8 +272,7 @@ public void moveFileToDirectory(File file, File directory, boolean createDirecto\n * @param subFolder - The name of the sub-directory to store the files. Cannot be null!\n * @throws IOException\n */\n- protected void archiveFiles(File sourceDir, File destDir, String subFolder) throws IOException\n- {\n+ protected void archiveFiles(File sourceDir, File destDir, String subFolder) throws IOException {\n Calendar calendar = Calendar.getInstance();\n SimpleDateFormat sobiDateFormat = new SimpleDateFormat(\"'SOBI.D'yyMMdd'.T'HHmmss'.TXT'\");\n for (File file : safeListFiles(sourceDir, null, false)) {\n@@ -394,47 +288,33 @@ protected void archiveFiles(File sourceDir, File destDir, String subFolder) thro\n }\n \n /**\n- * Returns a collection of files sorted by file name (not file path!)\n- *\n- * @param directory - The directory to get files from.\n- * @param recursive - true to retrieve files from sub-directories.\n- * @return\n- * @throws IOException\n- */\n- protected Collection<File> getSortedFiles(File directory, boolean recursive, String[] excludeDirs) throws IOException {\n- Collection<File> files = safeListFiles(directory, recursive, excludeDirs);\n- Collections.sort((List<File>)files, new Comparator<File>(){\n- public int compare(File a, File b) {\n- return a.getName().compareTo(b.getName());\n- }\n- });\n- return files;\n- }\n-\n- /**\n- * Extracts a well formed XML document from a BufferedReader and writes it to the given\n+ * Extracts a well formed XML document from the lines and writes it to the given\n * file. This depends strongly on escape sequences being on their own line; otherwise\n- * we'll get malformed XML docs.\n+ * we'll get malformed XML docs. TODO: EDIT THIS DOC\n+ *\n+ * @param fragmentType SOBIFragmentType\n+ * @param line String - The starting line of the document\n+ * @param iterator Iterator<String>\n *\n- * @param escape - Regex matching the escape sequence for the XML document. e.g. {@literal </senagenda.+}\n- * @param line - The starting line of the document\n- * @param br - The buffered reader used to retrieve additional lines from the document\n- * @param file - The file that the resulting XML document should be written to.\n+ * @return String - The resulting XML string.\n * @throws IOException\n */\n- protected void extractXml(String escape, String line, BufferedReader br, File file) throws IOException\n- {\n+ protected String extractXmlText(SOBIFragmentType fragmentType, String line, Iterator<String> iterator) throws IOException {\n+ String endPattern = fragmentType.getEndPattern();\n+\n StringBuffer sb = new StringBuffer(\n \"<?xml version='1.0' encoding='UTF-8'?>&newl;\" +\n \"<SENATEDATA>&newl;\" +\n line+\"&newl;\"\n );\n \n- String in;\n- while((in = br.readLine()) != null) {\n+ String in = null;\n+ while (iterator.hasNext()) {\n+ in = iterator.next();\n sb.append(in.replaceAll(\"\\\\xb9\",\"&sect;\") + \"&newl;\");\n- if(in.matches(escape))\n+ if (in.matches(endPattern)) {\n break;\n+ }\n }\n \n if (in == null) {\n@@ -445,7 +325,7 @@ protected void extractXml(String escape, String line, BufferedReader br, File fi\n \n String data = sb.append(\"</SENATEDATA>\").toString();\n \n- // TODO: Figure out all this matcher magic. How does it work? What the hell is it doing?\n+ // TODO: Figure out all this matcher magic. How does it work?\n sb = new StringBuffer();\n Matcher m = Pattern.compile(\"<\\\\!\\\\[CDATA\\\\[(.*?)\\\\]\\\\]>\").matcher(data);\n while(m.find()) {\n@@ -455,6 +335,6 @@ protected void extractXml(String escape, String line, BufferedReader br, File fi\n \n // TODO: What exactly are we replacing here?\n data = sb.toString().replaceAll(\"&newl;\", \"\\n\").replaceAll(\"(?!\\n)\\\\p{Cntrl}\",\"\").replaceAll(\"(?!\\\\.{2})[ ]{2,}\",\" \");\n- FileUtils.write(file, data);\n+ return data;\n }\n }", "raw_url": "https://github.com/nysenate/OpenLegislation/raw/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fprocessors%2FDataProcessor.java", "sha": "cda4867f39a44931080a46a83a0a70e0cad703bc", "status": "modified" }, { "additions": 3, "blob_url": "https://github.com/nysenate/OpenLegislation/blob/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fprocessors%2FPublicHearingProcessor.java", "changes": 7, "contents_url": "https://api.github.com/repos/nysenate/OpenLegislation/contents/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fprocessors%2FPublicHearingProcessor.java?ref=f89655fbb32c1372837f17bb6f7ed81f7a32c654", "deletions": 4, "filename": "src/main/java/gov/nysenate/openleg/processors/PublicHearingProcessor.java", "new_code": "import gov.nysenate.openleg.model.transcript.PublicHearing;\nimport org.apache.commons.io.FileUtils;\nimport org.apache.log4j.Logger;", "new_methods": [], "old_code": "import gov.nysenate.openleg.model.PublicHearing;\nimport org.apache.commons.io.FileUtils;\nimport org.apache.log4j.Logger;\n", "old_methods": [], "patch": "@@ -1,8 +1,10 @@\n package gov.nysenate.openleg.processors;\n \n-import gov.nysenate.openleg.model.PublicHearing;\n+import gov.nysenate.openleg.model.transcript.PublicHearing;\n import gov.nysenate.openleg.util.Storage;\n import gov.nysenate.openleg.util.TextFormatter;\n+import org.apache.commons.io.FileUtils;\n+import org.apache.log4j.Logger;\n \n import java.io.File;\n import java.io.IOException;\n@@ -12,9 +14,6 @@\n import java.util.regex.Matcher;\n import java.util.regex.Pattern;\n \n-import org.apache.commons.io.FileUtils;\n-import org.apache.log4j.Logger;\n-\n public class PublicHearingProcessor {\n private final Logger logger;\n ", "raw_url": "https://github.com/nysenate/OpenLegislation/raw/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fprocessors%2FPublicHearingProcessor.java", "sha": "e5832a58ff1dcbd093c5d0f8fed3a387eeca6b0c", "status": "modified" }, { "additions": 18, "blob_url": "https://github.com/nysenate/OpenLegislation/blob/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fprocessors%2FSenagendaProcessor.java", "changes": 49, "contents_url": "https://api.github.com/repos/nysenate/OpenLegislation/contents/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fprocessors%2FSenagendaProcessor.java?ref=f89655fbb32c1372837f17bb6f7ed81f7a32c654", "deletions": 31, "filename": "src/main/java/gov/nysenate/openleg/processors/SenagendaProcessor.java", "new_code": "import gov.nysenate.openleg.model.agenda.*;\nimport gov.nysenate.openleg.model.bill.Bill;\nimport gov.nysenate.openleg.model.bill.BillAmendment;\nimport gov.nysenate.openleg.model.entity.Person;\nimport gov.nysenate.openleg.model.sobi.SOBIBlock;\nimport gov.nysenate.openleg.processors.sobi.BillProcessor;\nimport gov.nysenate.openleg.util.*;\nimport org.apache.log4j.Logger;\nimport org.w3c.dom.Document;\nimport org.w3c.dom.Node;\nimport org.w3c.dom.NodeList;\nimport org.xml.sax.SAXException;\nimport javax.xml.xpath.XPathExpressionException;\n public static Map<String, VoteAction> VOTE_ACTION_MAP = new TreeMap<>();\n BillProcessor processor = new BillProcessor(Application.getEnvironment());\n Bill bill = null; /** FIXME processor.getOrCreateBaseBill(mockBlock, modifiedDate, storage); */\n /** FIXME processor.saveBill(bill, billAmendment, storage); */\n /** FIXME new BillProcessor(Application.getEnvironment()).saveBill(bill, Bill.BASE_VERSION, storage); */", "new_methods": [], "old_code": "import gov.nysenate.openleg.model.Agenda;\nimport gov.nysenate.openleg.model.AgendaInfoAddendum;\nimport gov.nysenate.openleg.model.AgendaInfoCommittee;\nimport gov.nysenate.openleg.model.AgendaInfoCommitteeItem;\nimport gov.nysenate.openleg.model.AgendaVoteAddendum;\nimport gov.nysenate.openleg.model.AgendaVoteCommittee;\nimport gov.nysenate.openleg.model.AgendaVoteCommitteeAttendance;\nimport gov.nysenate.openleg.model.AgendaVoteCommitteeItem;\nimport gov.nysenate.openleg.model.AgendaVoteCommitteeVote;\nimport gov.nysenate.openleg.model.Bill;\nimport gov.nysenate.openleg.model.BillAmendment;\nimport gov.nysenate.openleg.model.Person;\nimport gov.nysenate.openleg.model.SOBIBlock;\nimport gov.nysenate.openleg.util.Application;\nimport gov.nysenate.openleg.util.ChangeLogger;\nimport gov.nysenate.openleg.util.DateHelper;\nimport gov.nysenate.openleg.util.Storage;\nimport gov.nysenate.openleg.util.XmlHelper;\nimport javax.xml.xpath.XPathExpressionException;\n\nimport org.apache.log4j.Logger;\nimport org.w3c.dom.Document;\nimport org.w3c.dom.Node;\nimport org.w3c.dom.NodeList;\nimport org.xml.sax.SAXException;\n\n public static Map<String, VoteAction> VOTE_ACTION_MAP = new TreeMap<String, VoteAction>();\n BillProcessor processor = new BillProcessor();\n Bill bill = processor.getOrCreateBaseBill(mockBlock, modifiedDate, storage);\n processor.saveBill(bill, billAmendment, storage);\n new BillProcessor().saveBill(bill, Bill.BASE_VERSION, storage);", "old_methods": [], "patch": "@@ -1,24 +1,19 @@\n package gov.nysenate.openleg.processors;\n \n-import gov.nysenate.openleg.model.Agenda;\n-import gov.nysenate.openleg.model.AgendaInfoAddendum;\n-import gov.nysenate.openleg.model.AgendaInfoCommittee;\n-import gov.nysenate.openleg.model.AgendaInfoCommitteeItem;\n-import gov.nysenate.openleg.model.AgendaVoteAddendum;\n-import gov.nysenate.openleg.model.AgendaVoteCommittee;\n-import gov.nysenate.openleg.model.AgendaVoteCommitteeAttendance;\n-import gov.nysenate.openleg.model.AgendaVoteCommitteeItem;\n-import gov.nysenate.openleg.model.AgendaVoteCommitteeVote;\n-import gov.nysenate.openleg.model.Bill;\n-import gov.nysenate.openleg.model.BillAmendment;\n-import gov.nysenate.openleg.model.Person;\n-import gov.nysenate.openleg.model.SOBIBlock;\n-import gov.nysenate.openleg.util.Application;\n-import gov.nysenate.openleg.util.ChangeLogger;\n-import gov.nysenate.openleg.util.DateHelper;\n-import gov.nysenate.openleg.util.Storage;\n-import gov.nysenate.openleg.util.XmlHelper;\n+import gov.nysenate.openleg.model.agenda.*;\n+import gov.nysenate.openleg.model.bill.Bill;\n+import gov.nysenate.openleg.model.bill.BillAmendment;\n+import gov.nysenate.openleg.model.entity.Person;\n+import gov.nysenate.openleg.model.sobi.SOBIBlock;\n+import gov.nysenate.openleg.processors.sobi.BillProcessor;\n+import gov.nysenate.openleg.util.*;\n+import org.apache.log4j.Logger;\n+import org.w3c.dom.Document;\n+import org.w3c.dom.Node;\n+import org.w3c.dom.NodeList;\n+import org.xml.sax.SAXException;\n \n+import javax.xml.xpath.XPathExpressionException;\n import java.io.File;\n import java.io.IOException;\n import java.text.ParseException;\n@@ -27,20 +22,12 @@\n import java.util.Map;\n import java.util.TreeMap;\n \n-import javax.xml.xpath.XPathExpressionException;\n-\n-import org.apache.log4j.Logger;\n-import org.w3c.dom.Document;\n-import org.w3c.dom.Node;\n-import org.w3c.dom.NodeList;\n-import org.xml.sax.SAXException;\n-\n public class SenagendaProcessor\n {\n private final Logger logger = Logger.getLogger(SenagendaProcessor.class);\n \n public static enum VoteAction { FIRST_READING, THIRD_READING, REFERRED_TO_COMMITTEE, DEFEATED, RESTORED_TO_THIRD, SPECIAL}\n- public static Map<String, VoteAction> VOTE_ACTION_MAP = new TreeMap<String, VoteAction>();\n+ public static Map<String, VoteAction> VOTE_ACTION_MAP = new TreeMap<>();\n static {\n VOTE_ACTION_MAP.put(\"F\", VoteAction.FIRST_READING);\n VOTE_ACTION_MAP.put(\"3\", VoteAction.THIRD_READING);\n@@ -237,16 +224,16 @@ private Bill getOrCreateBill(Storage storage, String printNo, String billAmendme\n \n // All bills on calendars should already exist but sometimes, particularly during development/testing\n // they won't. Instead of breaking the processing, create a new bill using the bill processor.\n- BillProcessor processor = new BillProcessor();\n+ BillProcessor processor = new BillProcessor(Application.getEnvironment());\n SOBIBlock mockBlock = new SOBIBlock(year+printNo+(printNo.matches(\"[A-Z]$\") ? \"\" : \" \")+1+\" \");\n- Bill bill = processor.getOrCreateBaseBill(mockBlock, modifiedDate, storage);\n+ Bill bill = null; /** FIXME processor.getOrCreateBaseBill(mockBlock, modifiedDate, storage); */\n bill.setSponsor(new Person(sponsors[0].trim()));\n \n // It must be published if it is on the agenda\n BillAmendment amendment = bill.getAmendment(billAmendment);\n if (!amendment.isPublished()) {\n amendment.setPublishDate(modifiedDate);\n- processor.saveBill(bill, billAmendment, storage);\n+ /** FIXME processor.saveBill(bill, billAmendment, storage); */\n }\n \n // Other sponsors are removed when a calendar/agenda is resent without\n@@ -258,7 +245,7 @@ private Bill getOrCreateBill(Storage storage, String printNo, String billAmendme\n \n if (!bill.getOtherSponsors().equals(otherSponsors)) {\n bill.setOtherSponsors(otherSponsors);\n- new BillProcessor().saveBill(bill, Bill.BASE_VERSION, storage);\n+ /** FIXME new BillProcessor(Application.getEnvironment()).saveBill(bill, Bill.BASE_VERSION, storage); */\n }\n \n return bill;", "raw_url": "https://github.com/nysenate/OpenLegislation/raw/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fprocessors%2FSenagendaProcessor.java", "sha": "3da895d30e6a48f7a6e482acd5bca8d8e0204ce7", "status": "modified" }, { "additions": 16, "blob_url": "https://github.com/nysenate/OpenLegislation/blob/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fprocessors%2FSencalendarProcessor.java", "changes": 42, "contents_url": "https://api.github.com/repos/nysenate/OpenLegislation/contents/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fprocessors%2FSencalendarProcessor.java?ref=f89655fbb32c1372837f17bb6f7ed81f7a32c654", "deletions": 26, "filename": "src/main/java/gov/nysenate/openleg/processors/SencalendarProcessor.java", "new_code": "import gov.nysenate.openleg.model.bill.Bill;\nimport gov.nysenate.openleg.model.bill.BillAmendment;\nimport gov.nysenate.openleg.model.calendar.*;\nimport gov.nysenate.openleg.model.entity.Person;\nimport gov.nysenate.openleg.model.sobi.SOBIBlock;\nimport gov.nysenate.openleg.processors.sobi.BillProcessor;\nimport gov.nysenate.openleg.util.*;\nimport org.w3c.dom.Document;\nimport org.w3c.dom.Node;\nimport org.w3c.dom.NodeList;\nimport org.xml.sax.SAXException;\nimport javax.xml.xpath.XPathExpressionException;\n BillProcessor processor = new BillProcessor(Application.getEnvironment());\n Bill bill = null; /**FIXME processor.getOrCreateBaseBill(mockBlock, modifiedDate, storage); */\n /** FIXME processor.saveBill(bill, billAmendment, storage); */\n /** FIXME processor.saveBill(bill, billAmendment, storage); */", "new_methods": [], "old_code": "import gov.nysenate.openleg.model.Bill;\nimport gov.nysenate.openleg.model.BillAmendment;\nimport gov.nysenate.openleg.model.Calendar;\nimport gov.nysenate.openleg.model.CalendarActiveList;\nimport gov.nysenate.openleg.model.CalendarActiveListEntry;\nimport gov.nysenate.openleg.model.CalendarSupplemental;\nimport gov.nysenate.openleg.model.CalendarSupplementalSection;\nimport gov.nysenate.openleg.model.CalendarSupplementalSectionEntry;\nimport gov.nysenate.openleg.model.Person;\nimport gov.nysenate.openleg.model.SOBIBlock;\nimport gov.nysenate.openleg.util.Application;\nimport gov.nysenate.openleg.util.ChangeLogger;\nimport gov.nysenate.openleg.util.DateHelper;\nimport gov.nysenate.openleg.util.Storage;\nimport gov.nysenate.openleg.util.XmlHelper;\nimport javax.xml.xpath.XPathExpressionException;\n\nimport org.w3c.dom.Document;\nimport org.w3c.dom.Node;\nimport org.w3c.dom.NodeList;\nimport org.xml.sax.SAXException;\n\n BillProcessor processor = new BillProcessor();\n Bill bill = processor.getOrCreateBaseBill(mockBlock, modifiedDate, storage);\n processor.saveBill(bill, billAmendment, storage);\n processor.saveBill(bill, billAmendment, storage);", "old_methods": [], "patch": "@@ -1,33 +1,23 @@\n package gov.nysenate.openleg.processors;\n \n-import gov.nysenate.openleg.model.Bill;\n-import gov.nysenate.openleg.model.BillAmendment;\n-import gov.nysenate.openleg.model.Calendar;\n-import gov.nysenate.openleg.model.CalendarActiveList;\n-import gov.nysenate.openleg.model.CalendarActiveListEntry;\n-import gov.nysenate.openleg.model.CalendarSupplemental;\n-import gov.nysenate.openleg.model.CalendarSupplementalSection;\n-import gov.nysenate.openleg.model.CalendarSupplementalSectionEntry;\n-import gov.nysenate.openleg.model.Person;\n-import gov.nysenate.openleg.model.SOBIBlock;\n-import gov.nysenate.openleg.util.Application;\n-import gov.nysenate.openleg.util.ChangeLogger;\n-import gov.nysenate.openleg.util.DateHelper;\n-import gov.nysenate.openleg.util.Storage;\n-import gov.nysenate.openleg.util.XmlHelper;\n+import gov.nysenate.openleg.model.bill.Bill;\n+import gov.nysenate.openleg.model.bill.BillAmendment;\n+import gov.nysenate.openleg.model.calendar.*;\n+import gov.nysenate.openleg.model.entity.Person;\n+import gov.nysenate.openleg.model.sobi.SOBIBlock;\n+import gov.nysenate.openleg.processors.sobi.BillProcessor;\n+import gov.nysenate.openleg.util.*;\n+import org.w3c.dom.Document;\n+import org.w3c.dom.Node;\n+import org.w3c.dom.NodeList;\n+import org.xml.sax.SAXException;\n \n+import javax.xml.xpath.XPathExpressionException;\n import java.io.File;\n import java.io.IOException;\n import java.util.ArrayList;\n import java.util.Date;\n \n-import javax.xml.xpath.XPathExpressionException;\n-\n-import org.w3c.dom.Document;\n-import org.w3c.dom.Node;\n-import org.w3c.dom.NodeList;\n-import org.xml.sax.SAXException;\n-\n public class SencalendarProcessor\n {\n public Calendar getOrCreateCalendar(Integer calno, Integer sessYr, Integer year, Storage storage, Date date)\n@@ -166,9 +156,9 @@ private Bill getOrCreateBill(Storage storage, String billId, String billAmendmen\n // This is a crappy situation, all bills on calendars should already exist but sometimes they won't.\n // This almost exclusively because we are missing sobi files. It shouldn't happen in production but\n // does frequently in development.\n- BillProcessor processor = new BillProcessor();\n+ BillProcessor processor = new BillProcessor(Application.getEnvironment());\n SOBIBlock mockBlock = new SOBIBlock(year+billId+(billId.matches(\"[A-Z]$\") ? \"\" : \" \")+1+\" \");\n- Bill bill = processor.getOrCreateBaseBill(mockBlock, modifiedDate, storage);\n+ Bill bill = null; /**FIXME processor.getOrCreateBaseBill(mockBlock, modifiedDate, storage); */\n \n // Active lists don't have sponsor listed, so check first!\n if (sponsorName != null) {\n@@ -184,15 +174,15 @@ private Bill getOrCreateBill(Storage storage, String billId, String billAmendmen\n \n if (!bill.getOtherSponsors().equals(otherSponsors)) {\n bill.setOtherSponsors(otherSponsors);\n- processor.saveBill(bill, billAmendment, storage);\n+ /** FIXME processor.saveBill(bill, billAmendment, storage); */\n }\n }\n \n // It must be published if it is on the calendar\n BillAmendment amendment = bill.getAmendment(billAmendment);\n if (!amendment.isPublished()) {\n amendment.setPublishDate(modifiedDate);\n- processor.saveBill(bill, billAmendment, storage);\n+ /** FIXME processor.saveBill(bill, billAmendment, storage); */\n }\n \n return bill;", "raw_url": "https://github.com/nysenate/OpenLegislation/raw/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fprocessors%2FSencalendarProcessor.java", "sha": "496948e613cb11129d44c83d4fbe654c85aa9abc", "status": "modified" }, { "additions": 2, "blob_url": "https://github.com/nysenate/OpenLegislation/blob/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fscripts%2FBaseScript.java", "changes": 11, "contents_url": "https://api.github.com/repos/nysenate/OpenLegislation/contents/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fscripts%2FBaseScript.java?ref=f89655fbb32c1372837f17bb6f7ed81f7a32c654", "deletions": 9, "filename": "src/main/java/gov/nysenate/openleg/scripts/BaseScript.java", "new_code": "import org.apache.commons.cli.*;\nimport org.apache.log4j.Logger;", "new_methods": [], "old_code": "import org.apache.commons.cli.CommandLine;\nimport org.apache.commons.cli.HelpFormatter;\nimport org.apache.commons.cli.MissingOptionException;\nimport org.apache.commons.cli.Option;\nimport org.apache.commons.cli.Options;\nimport org.apache.commons.cli.ParseException;\nimport org.apache.commons.cli.PosixParser;\nimport org.apache.log4j.Logger;\n", "old_methods": [], "patch": "@@ -1,18 +1,11 @@\n package gov.nysenate.openleg.scripts;\n \n import gov.nysenate.openleg.util.Application;\n+import org.apache.commons.cli.*;\n+import org.apache.log4j.Logger;\n \n import java.io.File;\n \n-import org.apache.commons.cli.CommandLine;\n-import org.apache.commons.cli.HelpFormatter;\n-import org.apache.commons.cli.MissingOptionException;\n-import org.apache.commons.cli.Option;\n-import org.apache.commons.cli.Options;\n-import org.apache.commons.cli.ParseException;\n-import org.apache.commons.cli.PosixParser;\n-import org.apache.log4j.Logger;\n-\n /**\n * Provides a base wrapping layer for scripts that logs all uncaught exceptions\n * and provides utility functions for processing options and help messages.", "raw_url": "https://github.com/nysenate/OpenLegislation/raw/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fscripts%2FBaseScript.java", "sha": "ddf3db2a7729e7c04fb31f11fd145015e78539dd", "status": "modified" }, { "additions": 5, "blob_url": "https://github.com/nysenate/OpenLegislation/blob/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fscripts%2FLRSScraper.java", "changes": 10, "contents_url": "https://api.github.com/repos/nysenate/OpenLegislation/contents/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fscripts%2FLRSScraper.java?ref=f89655fbb32c1372837f17bb6f7ed81f7a32c654", "deletions": 5, "filename": "src/main/java/gov/nysenate/openleg/scripts/LRSScraper.java", "new_code": "import org.apache.commons.cli.CommandLine;\nimport org.apache.commons.io.FileUtils;\nimport org.apache.commons.io.IOUtils;\nimport org.apache.log4j.Logger;\n", "new_methods": [], "old_code": "import org.apache.commons.cli.CommandLine;\nimport org.apache.commons.io.FileUtils;\nimport org.apache.commons.io.IOUtils;\nimport org.apache.log4j.Logger;\n", "old_methods": [], "patch": "@@ -1,5 +1,10 @@\n package gov.nysenate.openleg.scripts;\n \n+import org.apache.commons.cli.CommandLine;\n+import org.apache.commons.io.FileUtils;\n+import org.apache.commons.io.IOUtils;\n+import org.apache.log4j.Logger;\n+\n import java.io.File;\n import java.io.IOException;\n import java.net.MalformedURLException;\n@@ -9,11 +14,6 @@\n import java.util.regex.Matcher;\n import java.util.regex.Pattern;\n \n-import org.apache.commons.cli.CommandLine;\n-import org.apache.commons.io.FileUtils;\n-import org.apache.commons.io.IOUtils;\n-import org.apache.log4j.Logger;\n-\n public class LRSScraper extends BaseScript\n {\n private final Logger logger = Logger.getLogger(LRSScraper.class);", "raw_url": "https://github.com/nysenate/OpenLegislation/raw/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fscripts%2FLRSScraper.java", "sha": "7c6411b3ed69de845b58ef5a0ef61c8113a39699", "status": "modified" }, { "additions": 28, "blob_url": "https://github.com/nysenate/OpenLegislation/blob/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fscripts%2FMemoCheck.java", "changes": 58, "contents_url": "https://api.github.com/repos/nysenate/OpenLegislation/contents/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fscripts%2FMemoCheck.java?ref=f89655fbb32c1372837f17bb6f7ed81f7a32c654", "deletions": 30, "filename": "src/main/java/gov/nysenate/openleg/scripts/MemoCheck.java", "new_code": "import gov.nysenate.openleg.model.bill.Bill;\nimport gov.nysenate.openleg.model.sobi.SOBIBlock;\nimport gov.nysenate.openleg.processors.sobi.BillProcessor;\nimport gov.nysenate.openleg.util.Application;\nimport org.apache.commons.cli.CommandLine;\nimport org.apache.commons.io.FileUtils;\nimport org.apache.commons.io.IOUtils;\nimport org.apache.log4j.Logger;\n BillProcessor bp = new BillProcessor(Application.getEnvironment());\n List<SOBIBlock> blocks = null; //FIXME: bp.getBlocks(blockFile);\n String billNo = block.getBasePrintNo()+block.getAmendment()+\"-\"+block.getYear();\n Bill jsonBill = storage.getBill(block.getBasePrintNo()+block.getAmendment(), block.getYear());\n// bp.applyText(block.getData(), lbdcBill, \"\", new Date());\n//\n// String jsonMemo = StringUtils.normalizeSpace(jsonBill.getMemo().replaceAll(\"[?�]\",\"§\").replaceAll(\"-\\n+ *\", \"\").replaceAll(\"\\n *\", \" \").replaceAll(\" *([:,]) *\", \"$1\").replaceAll(\" *([()!\\\\\\\"]) *\", \" $1 \").replaceAll(\"([A-Za-z])- ?([A-Za-z])\",\"$1$2\").trim()).toLowerCase();\n// String lbdcMemo = StringUtils.normalizeSpace(lbdcBill.getMemo().replaceAll(\"[?�]\",\"§\").replaceAll(\"-\\n+ *\", \"\").replaceAll(\"\\n *\", \" \").replaceAll(\" *([:,]) *\", \"$1\").replaceAll(\" *([()!\\\\\\\"]) *\", \" $1 \").replaceAll(\"([A-Za-z])- ?([A-Za-z])\",\"$1$2\").trim()).toLowerCase();\n//\n// if(jsonMemo.isEmpty()) {\n// logger.error(billNo+\": MISSING\");\n// errors.put(\"missing\", errors.get(\"missing\")+1);\n// }\n// else if (!jsonMemo.equals(lbdcMemo)) {\n// logger.error(billNo+\": MISMATCH\");\n// errors.put(\"mismatch\", errors.get(\"mismatch\")+1);\n// System.out.println(get_diff(jsonMemo, lbdcMemo));\n// System.out.println(errors);\n// System.out.println(\"Total bills \"+blocks.size());\n// }", "new_methods": [], "old_code": "import gov.nysenate.openleg.model.Bill;\nimport gov.nysenate.openleg.model.SOBIBlock;\nimport gov.nysenate.openleg.processors.BillProcessor;\nimport java.util.Date;\nimport org.apache.commons.cli.CommandLine;\nimport org.apache.commons.io.FileUtils;\nimport org.apache.commons.io.IOUtils;\nimport org.apache.commons.lang3.StringUtils;\nimport org.apache.log4j.Logger;\n\n BillProcessor bp = new BillProcessor();\n List<SOBIBlock> blocks = bp.getBlocks(blockFile);\n String billNo = block.getPrintNo()+block.getAmendment()+\"-\"+block.getYear();\n Bill jsonBill = storage.getBill(block.getPrintNo()+block.getAmendment(), block.getYear());\n bp.applyText(block.getData(), lbdcBill, \"\", new Date());\n\n String jsonMemo = StringUtils.normalizeSpace(jsonBill.getMemo().replaceAll(\"[?�]\",\"§\").replaceAll(\"-\\n+ *\", \"\").replaceAll(\"\\n *\", \" \").replaceAll(\" *([:,]) *\", \"$1\").replaceAll(\" *([()!\\\\\\\"]) *\", \" $1 \").replaceAll(\"([A-Za-z])- ?([A-Za-z])\",\"$1$2\").trim()).toLowerCase();\n String lbdcMemo = StringUtils.normalizeSpace(lbdcBill.getMemo().replaceAll(\"[?�]\",\"§\").replaceAll(\"-\\n+ *\", \"\").replaceAll(\"\\n *\", \" \").replaceAll(\" *([:,]) *\", \"$1\").replaceAll(\" *([()!\\\\\\\"]) *\", \" $1 \").replaceAll(\"([A-Za-z])- ?([A-Za-z])\",\"$1$2\").trim()).toLowerCase();\n\n if(jsonMemo.isEmpty()) {\n logger.error(billNo+\": MISSING\");\n errors.put(\"missing\", errors.get(\"missing\")+1);\n }\n else if (!jsonMemo.equals(lbdcMemo)) {\n logger.error(billNo+\": MISMATCH\");\n errors.put(\"mismatch\", errors.get(\"mismatch\")+1);\n System.out.println(get_diff(jsonMemo, lbdcMemo));\n System.out.println(errors);\n System.out.println(\"Total bills \"+blocks.size());\n }", "old_methods": [], "patch": "@@ -1,22 +1,20 @@\n package gov.nysenate.openleg.scripts;\n \n-import gov.nysenate.openleg.model.Bill;\n-import gov.nysenate.openleg.model.SOBIBlock;\n-import gov.nysenate.openleg.processors.BillProcessor;\n+import gov.nysenate.openleg.model.bill.Bill;\n+import gov.nysenate.openleg.model.sobi.SOBIBlock;\n+import gov.nysenate.openleg.processors.sobi.BillProcessor;\n+import gov.nysenate.openleg.util.Application;\n import gov.nysenate.openleg.util.Storage;\n+import org.apache.commons.cli.CommandLine;\n+import org.apache.commons.io.FileUtils;\n+import org.apache.commons.io.IOUtils;\n+import org.apache.log4j.Logger;\n \n import java.io.File;\n import java.io.IOException;\n-import java.util.Date;\n import java.util.HashMap;\n import java.util.List;\n \n-import org.apache.commons.cli.CommandLine;\n-import org.apache.commons.io.FileUtils;\n-import org.apache.commons.io.IOUtils;\n-import org.apache.commons.lang3.StringUtils;\n-import org.apache.log4j.Logger;\n-\n public class MemoCheck extends BaseScript\n {\n private final Logger logger = Logger.getLogger(MemoCheck.class);\n@@ -37,33 +35,33 @@ protected void execute(CommandLine opts) throws Exception\n errors.put(\"missing\",0);\n errors.put(\"mismatch\", 0);\n File blockFile = new File(\"/data/openleg/PALMER.SEN.ALL.MEMO2011.TXT\");\n- BillProcessor bp = new BillProcessor();\n+ BillProcessor bp = new BillProcessor(Application.getEnvironment());\n File storageDir = new File(\"/data/openleg/2011_test/json/\");\n Storage storage = new Storage(storageDir);\n- List<SOBIBlock> blocks = bp.getBlocks(blockFile);\n+ List<SOBIBlock> blocks = null; //FIXME: bp.getBlocks(blockFile);\n for (SOBIBlock block : blocks) {\n- String billNo = block.getPrintNo()+block.getAmendment()+\"-\"+block.getYear();\n- Bill jsonBill = storage.getBill(block.getPrintNo()+block.getAmendment(), block.getYear());\n+ String billNo = block.getBasePrintNo()+block.getAmendment()+\"-\"+block.getYear();\n+ Bill jsonBill = storage.getBill(block.getBasePrintNo()+block.getAmendment(), block.getYear());\n Bill lbdcBill = new Bill(billNo, block.getYear());\n- bp.applyText(block.getData(), lbdcBill, \"\", new Date());\n-\n- String jsonMemo = StringUtils.normalizeSpace(jsonBill.getMemo().replaceAll(\"[?�]\",\"§\").replaceAll(\"-\\n+ *\", \"\").replaceAll(\"\\n *\", \" \").replaceAll(\" *([:,]) *\", \"$1\").replaceAll(\" *([()!\\\\\\\"]) *\", \" $1 \").replaceAll(\"([A-Za-z])- ?([A-Za-z])\",\"$1$2\").trim()).toLowerCase();\n- String lbdcMemo = StringUtils.normalizeSpace(lbdcBill.getMemo().replaceAll(\"[?�]\",\"§\").replaceAll(\"-\\n+ *\", \"\").replaceAll(\"\\n *\", \" \").replaceAll(\" *([:,]) *\", \"$1\").replaceAll(\" *([()!\\\\\\\"]) *\", \" $1 \").replaceAll(\"([A-Za-z])- ?([A-Za-z])\",\"$1$2\").trim()).toLowerCase();\n-\n- if(jsonMemo.isEmpty()) {\n- logger.error(billNo+\": MISSING\");\n- errors.put(\"missing\", errors.get(\"missing\")+1);\n- }\n- else if (!jsonMemo.equals(lbdcMemo)) {\n- logger.error(billNo+\": MISMATCH\");\n- errors.put(\"mismatch\", errors.get(\"mismatch\")+1);\n- System.out.println(get_diff(jsonMemo, lbdcMemo));\n+// bp.applyText(block.getData(), lbdcBill, \"\", new Date());\n+//\n+// String jsonMemo = StringUtils.normalizeSpace(jsonBill.getMemo().replaceAll(\"[?�]\",\"§\").replaceAll(\"-\\n+ *\", \"\").replaceAll(\"\\n *\", \" \").replaceAll(\" *([:,]) *\", \"$1\").replaceAll(\" *([()!\\\\\\\"]) *\", \" $1 \").replaceAll(\"([A-Za-z])- ?([A-Za-z])\",\"$1$2\").trim()).toLowerCase();\n+// String lbdcMemo = StringUtils.normalizeSpace(lbdcBill.getMemo().replaceAll(\"[?�]\",\"§\").replaceAll(\"-\\n+ *\", \"\").replaceAll(\"\\n *\", \" \").replaceAll(\" *([:,]) *\", \"$1\").replaceAll(\" *([()!\\\\\\\"]) *\", \" $1 \").replaceAll(\"([A-Za-z])- ?([A-Za-z])\",\"$1$2\").trim()).toLowerCase();\n+//\n+// if(jsonMemo.isEmpty()) {\n+// logger.error(billNo+\": MISSING\");\n+// errors.put(\"missing\", errors.get(\"missing\")+1);\n+// }\n+// else if (!jsonMemo.equals(lbdcMemo)) {\n+// logger.error(billNo+\": MISMATCH\");\n+// errors.put(\"mismatch\", errors.get(\"mismatch\")+1);\n+// System.out.println(get_diff(jsonMemo, lbdcMemo));\n // System.in.read();\n }\n }\n- System.out.println(errors);\n- System.out.println(\"Total bills \"+blocks.size());\n- }\n+// System.out.println(errors);\n+// System.out.println(\"Total bills \"+blocks.size());\n+// }\n \n public static void main(String[] args) throws Exception\n {", "raw_url": "https://github.com/nysenate/OpenLegislation/raw/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fscripts%2FMemoCheck.java", "sha": "738a674f5d0964d4c80b91b493ecd8158c0e32c3", "status": "modified" }, { "additions": 12, "blob_url": "https://github.com/nysenate/OpenLegislation/blob/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fscripts%2FProcessData.java", "changes": 56, "contents_url": "https://api.github.com/repos/nysenate/OpenLegislation/contents/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fscripts%2FProcessData.java?ref=f89655fbb32c1372837f17bb6f7ed81f7a32c654", "deletions": 44, "filename": "src/main/java/gov/nysenate/openleg/scripts/ProcessData.java", "new_code": "import org.apache.commons.cli.CommandLine;\nimport org.apache.commons.cli.Options;\n if (target.equals(\"reporter\")) {\n DataProcessor process = new DataProcessor(env);\n switch (task) {\n case \"stage\": process.stage(env.getStagingDirectory(), env.getWorkingDirectory()); break;\n case \"collate\": process.collate(env.getWorkingDirectory()); break;\n case \"ingest\": process.ingest(env.getWorkingDirectory(), Application.getStorage()); break;\n case \"archive\": process.archive(env.getWorkingDirectory(), env.getArchiveDirectory()); break;\n default:\n System.err.println(\"Invalid task.\");\n System.exit(1);", "new_methods": [], "old_code": "import gov.nysenate.openleg.services.Lucene;\nimport gov.nysenate.openleg.services.Varnish;\nimport gov.nysenate.openleg.util.ChangeLogger;\nimport org.apache.commons.cli.CommandLine;\nimport org.apache.commons.cli.Options;\n\n if (target.equals(\"lucene\")) {\n services.add(new Lucene());\n }\n else if (target.equals(\"varnish\")) {\n services.add(new Varnish(\"127.0.0.1\", 80));\n }\n else if (target.equals(\"reporter\")) {\n DataProcessor process = new DataProcessor();\n // TODO: With Java7 we can make this a switch case\n if (task.equals(\"stage\")) {\n process.stage(env.getStagingDirectory(), env.getWorkingDirectory());\n }\n else if (task.equals(\"collate\")) {\n process.collate(env.getWorkingDirectory());\n }\n else if (task.equals(\"ingest\")) {\n process.ingest(env.getWorkingDirectory(), Application.getStorage());\n if (changeFile != null) {\n ChangeLogger.writeToFile(changeFile);\n }\n }\n else if (task.equals(\"push\")) {\n if (ChangeLogger.getChangeLog().isEmpty()) {\n if (changeFile != null) {\n ChangeLogger.readFromFile(changeFile);\n }\n else {\n System.err.println(\"Unable to push with an empty change log.\");\n }\n }\n process.push(Application.getStorage(), ChangeLogger.getEntries(), services);\n }\n else if (task.equalsIgnoreCase(\"archive\")) {\n process.archive(env.getWorkingDirectory(), env.getArchiveDirectory());\n }\n else {\n System.err.println(\"Invalid task.\");\n System.exit(1);", "old_methods": [], "patch": "@@ -2,21 +2,17 @@\n \n import gov.nysenate.openleg.Environment;\n import gov.nysenate.openleg.processors.DataProcessor;\n-import gov.nysenate.openleg.services.Lucene;\n import gov.nysenate.openleg.services.ServiceBase;\n import gov.nysenate.openleg.services.UpdateReporter;\n-import gov.nysenate.openleg.services.Varnish;\n import gov.nysenate.openleg.util.Application;\n-import gov.nysenate.openleg.util.ChangeLogger;\n+import org.apache.commons.cli.CommandLine;\n+import org.apache.commons.cli.Options;\n \n import java.io.File;\n import java.util.ArrayList;\n import java.util.Arrays;\n import java.util.List;\n \n-import org.apache.commons.cli.CommandLine;\n-import org.apache.commons.cli.Options;\n-\n /**\n * Usage: bin/run.sh ProcessData --environment app.properties --tasks collate,ingest,push,archive --push-targets lucene,varnish,reporter --change-file logs/D20130511.T123500.change.log &>> logs/D20130511.T123500.process.log\n *\n@@ -73,13 +69,7 @@ else if (tasks.contains(\"push\")) {\n \n ArrayList<ServiceBase> services = new ArrayList<ServiceBase>();\n for (String target : pushTargets) {\n- if (target.equals(\"lucene\")) {\n- services.add(new Lucene());\n- }\n- else if (target.equals(\"varnish\")) {\n- services.add(new Varnish(\"127.0.0.1\", 80));\n- }\n- else if (target.equals(\"reporter\")) {\n+ if (target.equals(\"reporter\")) {\n services.add(new UpdateReporter());\n }\n else {\n@@ -90,38 +80,16 @@ else if (target.equals(\"reporter\")) {\n }\n \n Environment env = Application.getEnvironment();\n- DataProcessor process = new DataProcessor();\n+ DataProcessor process = new DataProcessor(env);\n for (String task : tasks) {\n- // TODO: With Java7 we can make this a switch case\n- if (task.equals(\"stage\")) {\n- process.stage(env.getStagingDirectory(), env.getWorkingDirectory());\n- }\n- else if (task.equals(\"collate\")) {\n- process.collate(env.getWorkingDirectory());\n- }\n- else if (task.equals(\"ingest\")) {\n- process.ingest(env.getWorkingDirectory(), Application.getStorage());\n- if (changeFile != null) {\n- ChangeLogger.writeToFile(changeFile);\n- }\n- }\n- else if (task.equals(\"push\")) {\n- if (ChangeLogger.getChangeLog().isEmpty()) {\n- if (changeFile != null) {\n- ChangeLogger.readFromFile(changeFile);\n- }\n- else {\n- System.err.println(\"Unable to push with an empty change log.\");\n- }\n- }\n- process.push(Application.getStorage(), ChangeLogger.getEntries(), services);\n- }\n- else if (task.equalsIgnoreCase(\"archive\")) {\n- process.archive(env.getWorkingDirectory(), env.getArchiveDirectory());\n- }\n- else {\n- System.err.println(\"Invalid task.\");\n- System.exit(1);\n+ switch (task) {\n+ case \"stage\": process.stage(env.getStagingDirectory(), env.getWorkingDirectory()); break;\n+ case \"collate\": process.collate(env.getWorkingDirectory()); break;\n+ case \"ingest\": process.ingest(env.getWorkingDirectory(), Application.getStorage()); break;\n+ case \"archive\": process.archive(env.getWorkingDirectory(), env.getArchiveDirectory()); break;\n+ default:\n+ System.err.println(\"Invalid task.\");\n+ System.exit(1);\n }\n }\n }", "raw_url": "https://github.com/nysenate/OpenLegislation/raw/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fscripts%2FProcessData.java", "sha": "7c78ce39442fa46a7e0078016b51aec3cdf5da81", "status": "modified" }, { "additions": 2, "blob_url": "https://github.com/nysenate/OpenLegislation/blob/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fscripts%2FTextUpdateFrequency.java", "changes": 4, "contents_url": "https://api.github.com/repos/nysenate/OpenLegislation/contents/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fscripts%2FTextUpdateFrequency.java?ref=f89655fbb32c1372837f17bb6f7ed81f7a32c654", "deletions": 2, "filename": "src/main/java/gov/nysenate/openleg/scripts/TextUpdateFrequency.java", "new_code": "import org.apache.commons.io.FileUtils;\n", "new_methods": [], "old_code": "import org.apache.commons.io.FileUtils;\n", "old_methods": [], "patch": "@@ -1,5 +1,7 @@\n package gov.nysenate.openleg.scripts;\n \n+import org.apache.commons.io.FileUtils;\n+\n import java.io.File;\n import java.io.IOException;\n import java.text.ParseException;\n@@ -9,8 +11,6 @@\n import java.util.regex.Matcher;\n import java.util.regex.Pattern;\n \n-import org.apache.commons.io.FileUtils;\n-\n public class TextUpdateFrequency\n {\n public static void main(String[] args) throws IOException, ParseException", "raw_url": "https://github.com/nysenate/OpenLegislation/raw/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fscripts%2FTextUpdateFrequency.java", "sha": "b524d5143a7a695b116c1bc9899585b93aeac7fa", "status": "modified" }, { "additions": 6, "blob_url": "https://github.com/nysenate/OpenLegislation/blob/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fscripts%2FUpdateNYSenateData.java", "changes": 13, "contents_url": "https://api.github.com/repos/nysenate/OpenLegislation/contents/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fscripts%2FUpdateNYSenateData.java?ref=f89655fbb32c1372837f17bb6f7ed81f7a32c654", "deletions": 7, "filename": "src/main/java/gov/nysenate/openleg/scripts/UpdateNYSenateData.java", "new_code": "import java.io.File;\nimport java.io.IOException;\nimport java.util.ArrayList;\nimport java.util.Arrays;\nimport java.util.List;\n", "new_methods": [], "old_code": "\nimport java.io.File;\nimport java.io.IOException;\nimport java.util.ArrayList;\nimport java.util.Arrays;\nimport java.util.List;\n", "old_methods": [], "patch": "@@ -7,13 +7,6 @@\n import gov.nysenate.services.model.Committee;\n import gov.nysenate.services.model.Member;\n import gov.nysenate.services.model.Senator;\n-\n-import java.io.File;\n-import java.io.IOException;\n-import java.util.ArrayList;\n-import java.util.Arrays;\n-import java.util.List;\n-\n import org.apache.commons.cli.CommandLine;\n import org.apache.commons.cli.Options;\n import org.apache.commons.collections.ListUtils;\n@@ -23,6 +16,12 @@\n import org.codehaus.jackson.map.ObjectMapper;\n import org.codehaus.jackson.map.SerializationConfig.Feature;\n \n+import java.io.File;\n+import java.io.IOException;\n+import java.util.ArrayList;\n+import java.util.Arrays;\n+import java.util.List;\n+\n public class UpdateNYSenateData extends BaseScript\n {\n public static Logger logger = Logger.getLogger(UpdateNYSenateData.class);", "raw_url": "https://github.com/nysenate/OpenLegislation/raw/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fscripts%2FUpdateNYSenateData.java", "sha": "1ce67d70a3797418fcb77ad56193a5812e5991a4", "status": "modified" }, { "additions": 5, "blob_url": "https://github.com/nysenate/OpenLegislation/blob/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fscripts%2Fadmin%2FCheckMail.java", "changes": 19, "contents_url": "https://api.github.com/repos/nysenate/OpenLegislation/contents/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fscripts%2Fadmin%2FCheckMail.java?ref=f89655fbb32c1372837f17bb6f7ed81f7a32c654", "deletions": 14, "filename": "src/main/java/gov/nysenate/openleg/scripts/admin/CheckMail.java", "new_code": "import org.apache.commons.cli.CommandLine;\nimport org.apache.commons.io.FileUtils;\nimport org.apache.commons.io.IOUtils;\nimport org.apache.log4j.Logger;\nimport javax.mail.*;", "new_methods": [], "old_code": "import javax.mail.Flags;\nimport javax.mail.Folder;\nimport javax.mail.Message;\nimport javax.mail.Multipart;\nimport javax.mail.Part;\nimport javax.mail.Session;\nimport javax.mail.Store;\n\nimport org.apache.commons.cli.CommandLine;\nimport org.apache.commons.io.FileUtils;\nimport org.apache.commons.io.IOUtils;\nimport org.apache.log4j.Logger;\n\n", "old_methods": [], "patch": "@@ -1,25 +1,17 @@\n package gov.nysenate.openleg.scripts.admin;\n \n import gov.nysenate.openleg.scripts.BaseScript;\n+import org.apache.commons.cli.CommandLine;\n+import org.apache.commons.io.FileUtils;\n+import org.apache.commons.io.IOUtils;\n+import org.apache.log4j.Logger;\n \n+import javax.mail.*;\n import java.io.File;\n import java.text.SimpleDateFormat;\n import java.util.Date;\n import java.util.Properties;\n \n-import javax.mail.Flags;\n-import javax.mail.Folder;\n-import javax.mail.Message;\n-import javax.mail.Multipart;\n-import javax.mail.Part;\n-import javax.mail.Session;\n-import javax.mail.Store;\n-\n-import org.apache.commons.cli.CommandLine;\n-import org.apache.commons.io.FileUtils;\n-import org.apache.commons.io.IOUtils;\n-import org.apache.log4j.Logger;\n-\n public class CheckMail extends BaseScript\n {\n private static final Logger logger = Logger.getLogger(CheckMail.class);\n@@ -100,5 +92,4 @@ else if (message.getSubject().contains(\"Job ABPSDD - LBDC all Bills\")) {\n new CreateErrors().execute(opts);\n }\n }\n-\n }", "raw_url": "https://github.com/nysenate/OpenLegislation/raw/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fscripts%2Fadmin%2FCheckMail.java", "sha": "c58ddd4aa203b49751b75a08ec11b2ec0e37e5ca", "status": "modified" }, { "additions": 3, "blob_url": "https://github.com/nysenate/OpenLegislation/blob/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fscripts%2Fadmin%2FCreateErrors.java", "changes": 7, "contents_url": "https://api.github.com/repos/nysenate/OpenLegislation/contents/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fscripts%2Fadmin%2FCreateErrors.java?ref=f89655fbb32c1372837f17bb6f7ed81f7a32c654", "deletions": 4, "filename": "src/main/java/gov/nysenate/openleg/scripts/admin/CreateErrors.java", "new_code": "import java.sql.Connection;\nimport java.util.Collection;\n", "new_methods": [], "old_code": "\nimport java.sql.Connection;\nimport java.util.Collection;\n", "old_methods": [], "patch": "@@ -5,15 +5,14 @@\n import gov.nysenate.openleg.model.admin.ReportObservation;\n import gov.nysenate.openleg.scripts.BaseScript;\n import gov.nysenate.openleg.util.Application;\n-\n-import java.sql.Connection;\n-import java.util.Collection;\n-\n import org.apache.commons.cli.CommandLine;\n import org.apache.commons.dbutils.QueryRunner;\n import org.apache.commons.dbutils.handlers.BeanListHandler;\n import org.apache.log4j.Logger;\n \n+import java.sql.Connection;\n+import java.util.Collection;\n+\n public class CreateErrors extends BaseScript\n {\n public static Logger logger = Logger.getLogger(CreateErrors.class);", "raw_url": "https://github.com/nysenate/OpenLegislation/raw/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fscripts%2Fadmin%2FCreateErrors.java", "sha": "b8f18c1a6b89f20248f14690fbe5170a15f8298a", "status": "modified" }, { "additions": 15, "blob_url": "https://github.com/nysenate/OpenLegislation/blob/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fscripts%2Fadmin%2FSpotCheck.java", "changes": 35, "contents_url": "https://api.github.com/repos/nysenate/OpenLegislation/contents/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fscripts%2Fadmin%2FSpotCheck.java?ref=f89655fbb32c1372837f17bb6f7ed81f7a32c654", "deletions": 20, "filename": "src/main/java/gov/nysenate/openleg/scripts/admin/SpotCheck.java", "new_code": "import gov.nysenate.openleg.model.bill.Bill;\nimport gov.nysenate.openleg.model.bill.BillAction;\nimport gov.nysenate.openleg.model.entity.Person;\nimport org.apache.commons.cli.CommandLine;\nimport org.apache.commons.dbutils.QueryRunner;\nimport org.apache.commons.dbutils.handlers.BeanHandler;\nimport org.apache.commons.io.FileUtils;\nimport org.apache.commons.lang.StringUtils;\nimport org.apache.commons.lang3.StringEscapeUtils;\nimport org.apache.log4j.Logger;\nimport java.util.*;\n String jsonLaw = bill.getLaw();\n if ( bill.getAmendment(billAmendment).getCoSponsors() != null ) {\n List<Person> cosponsors = bill.getAmendment(billAmendment).getCoSponsors();\n for (String line : bill.getAmendment(billAmendment).getFulltext().split(\"\\n\")) {", "new_methods": [], "old_code": "import gov.nysenate.openleg.model.Bill;\nimport gov.nysenate.openleg.model.BillAction;\nimport gov.nysenate.openleg.model.Person;\nimport java.util.ArrayList;\nimport java.util.Date;\nimport java.util.HashMap;\nimport java.util.List;\nimport java.util.TreeSet;\nimport org.apache.commons.cli.CommandLine;\nimport org.apache.commons.dbutils.QueryRunner;\nimport org.apache.commons.dbutils.handlers.BeanHandler;\nimport org.apache.commons.io.FileUtils;\nimport org.apache.commons.lang.StringUtils;\nimport org.apache.commons.lang3.StringEscapeUtils;\nimport org.apache.log4j.Logger;\n\n String jsonLaw = bill.getLaw(billAmendment);\n if ( bill.getCoSponsors() != null ) {\n List<Person> cosponsors = bill.getCoSponsors(billAmendment);\n for (String line : bill.getFulltext(billAmendment).split(\"\\n\")) {", "old_methods": [], "patch": "@@ -1,36 +1,31 @@\n package gov.nysenate.openleg.scripts.admin;\n \n-import gov.nysenate.openleg.model.Bill;\n-import gov.nysenate.openleg.model.BillAction;\n-import gov.nysenate.openleg.model.Person;\n import gov.nysenate.openleg.model.admin.Report;\n import gov.nysenate.openleg.model.admin.ReportObservation;\n import gov.nysenate.openleg.model.admin.SpotCheckBill;\n+import gov.nysenate.openleg.model.bill.Bill;\n+import gov.nysenate.openleg.model.bill.BillAction;\n+import gov.nysenate.openleg.model.entity.Person;\n import gov.nysenate.openleg.scripts.BaseScript;\n import gov.nysenate.openleg.util.Application;\n import gov.nysenate.openleg.util.Storage;\n+import org.apache.commons.cli.CommandLine;\n+import org.apache.commons.dbutils.QueryRunner;\n+import org.apache.commons.dbutils.handlers.BeanHandler;\n+import org.apache.commons.io.FileUtils;\n+import org.apache.commons.lang.StringUtils;\n+import org.apache.commons.lang3.StringEscapeUtils;\n+import org.apache.log4j.Logger;\n \n import java.io.File;\n import java.io.IOException;\n import java.sql.SQLException;\n import java.text.ParseException;\n import java.text.SimpleDateFormat;\n-import java.util.ArrayList;\n-import java.util.Date;\n-import java.util.HashMap;\n-import java.util.List;\n-import java.util.TreeSet;\n+import java.util.*;\n import java.util.regex.Matcher;\n import java.util.regex.Pattern;\n \n-import org.apache.commons.cli.CommandLine;\n-import org.apache.commons.dbutils.QueryRunner;\n-import org.apache.commons.dbutils.handlers.BeanHandler;\n-import org.apache.commons.io.FileUtils;\n-import org.apache.commons.lang.StringUtils;\n-import org.apache.commons.lang3.StringEscapeUtils;\n-import org.apache.log4j.Logger;\n-\n public class SpotCheck extends BaseScript\n {\n public static Logger logger = Logger.getLogger(SpotCheck.class);\n@@ -124,7 +119,7 @@ public void execute(CommandLine opts) throws IOException, ParseException, SQLExc\n }\n \n // Compare the summaries. LBDC reports summary and law changes together\n- String jsonLaw = bill.getLaw(billAmendment);\n+ String jsonLaw = bill.getLaw();\n String jsonSummary = unescapeHTML(bill.getSummary());\n String lbdcSummary = spotCheckBills.get(printNo).getSummary().replaceAll(\"\\\\s+\", \" \");\n \n@@ -165,8 +160,8 @@ public void execute(CommandLine opts) throws IOException, ParseException, SQLExc\n \n TreeSet<String> lbdcCosponsors = new TreeSet<String>(spotCheckBills.get(printNo).getCosponsors());\n TreeSet<String> jsonCosponsors = new TreeSet<String>();\n- if ( bill.getCoSponsors() != null ) {\n- List<Person> cosponsors = bill.getCoSponsors(billAmendment);\n+ if ( bill.getAmendment(billAmendment).getCoSponsors() != null ) {\n+ List<Person> cosponsors = bill.getAmendment(billAmendment).getCoSponsors();\n for(Person cosponsor : cosponsors) {\n jsonCosponsors.add(cosponsor.getFullname().toUpperCase());\n }\n@@ -205,7 +200,7 @@ public void execute(CommandLine opts) throws IOException, ParseException, SQLExc\n int lbdcPages = spotCheckBills.get(printNo).pages;\n int jsonPages = 0;\n Pattern pagePattern = Pattern.compile(\"(^\\\\s+\\\\w\\\\.\\\\s\\\\d+(--\\\\w)?\\\\s+\\\\d*(\\\\s+\\\\w\\\\.\\\\s\\\\d+(--\\\\w)?)?$|^\\\\s+\\\\d+\\\\s+\\\\d+\\\\-\\\\d+\\\\-\\\\d$|^\\\\s{11,}\\\\d{1,4}(--\\\\w)?$)\");\n- for (String line : bill.getFulltext(billAmendment).split(\"\\n\")) {\n+ for (String line : bill.getAmendment(billAmendment).getFulltext().split(\"\\n\")) {\n if (pagePattern.matcher(line).find()) {\n // logger.info(billNo+\": \"+line);\n jsonPages++;", "raw_url": "https://github.com/nysenate/OpenLegislation/raw/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fscripts%2Fadmin%2FSpotCheck.java", "sha": "82282b14bfca91a1e0aae4b27a33869e3bc6c762", "status": "modified" }, { "additions": 4, "blob_url": "https://github.com/nysenate/OpenLegislation/blob/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fservices%2FServiceBase.java", "changes": 9, "contents_url": "https://api.github.com/repos/nysenate/OpenLegislation/contents/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fservices%2FServiceBase.java?ref=f89655fbb32c1372837f17bb6f7ed81f7a32c654", "deletions": 5, "filename": "src/main/java/gov/nysenate/openleg/services/ServiceBase.java", "new_code": "import gov.nysenate.openleg.model.bill.Bill;\nimport gov.nysenate.openleg.model.calendar.Calendar;\nimport gov.nysenate.openleg.model.transcript.Transcript;\nimport org.apache.log4j.Logger;", "new_methods": [], "old_code": "import gov.nysenate.openleg.model.Bill;\nimport gov.nysenate.openleg.model.Calendar;\nimport gov.nysenate.openleg.model.Transcript;\nimport org.apache.log4j.Logger;\n", "old_methods": [], "patch": "@@ -1,19 +1,18 @@\n package gov.nysenate.openleg.services;\n \n import gov.nysenate.openleg.model.BaseObject;\n-import gov.nysenate.openleg.model.Bill;\n-import gov.nysenate.openleg.model.Calendar;\n import gov.nysenate.openleg.model.Change;\n-import gov.nysenate.openleg.model.Transcript;\n+import gov.nysenate.openleg.model.bill.Bill;\n+import gov.nysenate.openleg.model.calendar.Calendar;\n+import gov.nysenate.openleg.model.transcript.Transcript;\n import gov.nysenate.openleg.util.Storage;\n+import org.apache.log4j.Logger;\n \n import java.io.IOException;\n import java.util.HashMap;\n import java.util.List;\n import java.util.Map.Entry;\n \n-import org.apache.log4j.Logger;\n-\n public abstract class ServiceBase {\n protected HashMap<String, Class<? extends BaseObject>> classMap;\n protected Logger logger;", "raw_url": "https://github.com/nysenate/OpenLegislation/raw/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fservices%2FServiceBase.java", "sha": "fff530d1424f80d357c751aad0832193705b8a0a", "status": "modified" }, { "additions": 2, "blob_url": "https://github.com/nysenate/OpenLegislation/blob/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fservices%2FUpdateReporter.java", "changes": 5, "contents_url": "https://api.github.com/repos/nysenate/OpenLegislation/contents/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fservices%2FUpdateReporter.java?ref=f89655fbb32c1372837f17bb6f7ed81f7a32c654", "deletions": 3, "filename": "src/main/java/gov/nysenate/openleg/services/UpdateReporter.java", "new_code": "import org.apache.commons.dbutils.QueryRunner;\nimport org.apache.tomcat.jdbc.pool.DataSource;", "new_methods": [], "old_code": "import org.apache.commons.dbutils.QueryRunner;\nimport org.apache.tomcat.jdbc.pool.DataSource;\n", "old_methods": [], "patch": "@@ -3,14 +3,13 @@\n import gov.nysenate.openleg.model.Change;\n import gov.nysenate.openleg.util.Application;\n import gov.nysenate.openleg.util.Storage;\n+import org.apache.commons.dbutils.QueryRunner;\n+import org.apache.tomcat.jdbc.pool.DataSource;\n \n import java.sql.SQLException;\n import java.util.List;\n import java.util.Map.Entry;\n \n-import org.apache.commons.dbutils.QueryRunner;\n-import org.apache.tomcat.jdbc.pool.DataSource;\n-\n /*\n * Parses changes from a changeLog file and saves to MySQL database.\n */", "raw_url": "https://github.com/nysenate/OpenLegislation/raw/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fservices%2FUpdateReporter.java", "sha": "807499ba6314ffacbe2bf59e4a70ac0b0b62124c", "status": "modified" }, { "additions": 7, "blob_url": "https://github.com/nysenate/OpenLegislation/blob/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Futil%2FApplication.java", "changes": 21, "contents_url": "https://api.github.com/repos/nysenate/OpenLegislation/contents/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Futil%2FApplication.java?ref=f89655fbb32c1372837f17bb6f7ed81f7a32c654", "deletions": 14, "filename": "src/main/java/gov/nysenate/openleg/util/Application.java", "new_code": "import java.io.IOException;\n\n appInstance.environment = new Environment(appInstance.config, \"env\", \"master\");\n //appInstance.lucene = new Lucene(appInstance.config, \"lucene\");\n // if (appInstance.lucene != null) {\n //appInstance.lucene.close();\n // }", "new_methods": [], "old_code": "import gov.nysenate.openleg.lucene.Lucene;\n\nimport java.io.IOException;\n\n protected Lucene lucene;\n appInstance.environment = new Environment(appInstance.config, \"env\");\n appInstance.lucene = new Lucene(appInstance.config, \"lucene\");\n if (appInstance.lucene != null) {\n appInstance.lucene.close();\n }\n public static Lucene getLucene() {\n return appInstance.lucene;\n }\n", "old_methods": [ { "arguments": [], "filename": "src/main/java/gov/nysenate/openleg/util/Application.java", "implementation": "return appInstance.lucene;", "signature": "Lucene getLucene()" } ], "patch": "@@ -1,18 +1,16 @@\n package gov.nysenate.openleg.util;\n \n import gov.nysenate.openleg.Environment;\n-import gov.nysenate.openleg.lucene.Lucene;\n import gov.nysenate.util.Config;\n import gov.nysenate.util.DB;\n import gov.nysenate.util.Mailer;\n import gov.nysenate.util.listener.NYSenateConfigurationListener;\n-\n-import java.io.IOException;\n-\n import org.apache.commons.configuration.ConfigurationException;\n import org.apache.log4j.Logger;\n import org.codehaus.jackson.map.ObjectMapper;\n \n+import java.io.IOException;\n+\n public class Application\n {\n public static Logger logger = Logger.getLogger(Application.class);\n@@ -29,7 +27,6 @@ public class Application\n protected Config config;\n protected Mailer mailer;\n protected Environment environment;\n- protected Lucene lucene;\n protected Storage storage;\n protected XmlHelper xmlhelper;\n protected ObjectMapper objectMapper;\n@@ -52,8 +49,8 @@ public static boolean bootstrap(String propertyFileName)\n appInstance.xmlhelper = new XmlHelper(appInstance.config, \"xml\");\n appInstance.db = new DB(appInstance.config, \"postgresdb\");\n appInstance.mailer = new Mailer(appInstance.config, \"mailer\");\n- appInstance.environment = new Environment(appInstance.config, \"env\");\n- appInstance.lucene = new Lucene(appInstance.config, \"lucene\");\n+ appInstance.environment = new Environment(appInstance.config, \"env\", \"master\");\n+ //appInstance.lucene = new Lucene(appInstance.config, \"lucene\");\n appInstance.storage = new Storage(appInstance.environment.getStorageDirectory());\n appInstance.objectMapper = new ObjectMapper();\n return true;\n@@ -73,9 +70,9 @@ public static boolean bootstrap(String propertyFileName)\n \n public static boolean shutdown() throws IOException\n {\n- if (appInstance.lucene != null) {\n- appInstance.lucene.close();\n- }\n+ // if (appInstance.lucene != null) {\n+ //appInstance.lucene.close();\n+ // }\n return true;\n }\n \n@@ -87,10 +84,6 @@ public static DB getDB() {\n return appInstance.db;\n }\n \n- public static Lucene getLucene() {\n- return appInstance.lucene;\n- }\n-\n public static Environment getEnvironment() {\n return appInstance.environment;\n }", "raw_url": "https://github.com/nysenate/OpenLegislation/raw/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Futil%2FApplication.java", "sha": "4072ab6966f4a5e3a78b8c30874cd66864d79e2a", "status": "modified" }, { "additions": 4, "blob_url": "https://github.com/nysenate/OpenLegislation/blob/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Futil%2FChangeLogger.java", "changes": 14, "contents_url": "https://api.github.com/repos/nysenate/OpenLegislation/contents/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Futil%2FChangeLogger.java?ref=f89655fbb32c1372837f17bb6f7ed81f7a32c654", "deletions": 10, "filename": "src/main/java/gov/nysenate/openleg/util/ChangeLogger.java", "new_code": "import org.apache.commons.io.FileUtils;\nimport org.apache.commons.lang.StringUtils;\nimport org.apache.log4j.Logger;\nimport java.util.*;", "new_methods": [], "old_code": "import java.util.ArrayList;\nimport java.util.Collections;\nimport java.util.Comparator;\nimport java.util.Date;\nimport java.util.HashMap;\nimport java.util.List;\nimport org.apache.commons.io.FileUtils;\nimport org.apache.commons.lang.StringUtils;\nimport org.apache.log4j.Logger;\n", "old_methods": [], "patch": "@@ -2,25 +2,19 @@\n \n import gov.nysenate.openleg.model.Change;\n import gov.nysenate.openleg.util.Storage.Status;\n+import org.apache.commons.io.FileUtils;\n+import org.apache.commons.lang.StringUtils;\n+import org.apache.log4j.Logger;\n \n import java.io.File;\n import java.io.IOException;\n import java.text.ParseException;\n import java.text.SimpleDateFormat;\n-import java.util.ArrayList;\n-import java.util.Collections;\n-import java.util.Comparator;\n-import java.util.Date;\n-import java.util.HashMap;\n-import java.util.List;\n+import java.util.*;\n import java.util.Map.Entry;\n import java.util.regex.Matcher;\n import java.util.regex.Pattern;\n \n-import org.apache.commons.io.FileUtils;\n-import org.apache.commons.lang.StringUtils;\n-import org.apache.log4j.Logger;\n-\n public class ChangeLogger\n {\n private static final Logger logger = Logger.getLogger(ChangeLogger.class);", "raw_url": "https://github.com/nysenate/OpenLegislation/raw/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Futil%2FChangeLogger.java", "sha": "c84b463cdd898d4dd29307d18de846e089a3ff0b", "status": "modified" }, { "additions": 2, "blob_url": "https://github.com/nysenate/OpenLegislation/blob/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Futil%2FDateHelper.java", "changes": 4, "contents_url": "https://api.github.com/repos/nysenate/OpenLegislation/contents/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Futil%2FDateHelper.java?ref=f89655fbb32c1372837f17bb6f7ed81f7a32c654", "deletions": 2, "filename": "src/main/java/gov/nysenate/openleg/util/DateHelper.java", "new_code": "import org.apache.log4j.Logger;\n", "new_methods": [], "old_code": "import org.apache.log4j.Logger;\n", "old_methods": [], "patch": "@@ -1,13 +1,13 @@\n package gov.nysenate.openleg.util;\n \n+import org.apache.log4j.Logger;\n+\n import java.text.DateFormat;\n import java.text.ParseException;\n import java.text.SimpleDateFormat;\n import java.util.Calendar;\n import java.util.Date;\n \n-import org.apache.log4j.Logger;\n-\n public class DateHelper\n {\n private static Logger logger = Logger.getLogger(DateHelper.class);", "raw_url": "https://github.com/nysenate/OpenLegislation/raw/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Futil%2FDateHelper.java", "sha": "775a9a130fcb7471e6d59d1ed581d2d0c97022f3", "status": "modified" }, { "additions": 8, "blob_url": "https://github.com/nysenate/OpenLegislation/blob/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Futil%2FJSPHelper.java", "changes": 16, "contents_url": "https://api.github.com/repos/nysenate/OpenLegislation/contents/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Futil%2FJSPHelper.java?ref=f89655fbb32c1372837f17bb6f7ed81f7a32c654", "deletions": 8, "filename": "src/main/java/gov/nysenate/openleg/util/JSPHelper.java", "new_code": "import gov.nysenate.openleg.model.bill.Bill;\nimport gov.nysenate.openleg.model.entity.Person;\nimport org.apache.commons.lang3.StringUtils;\nimport javax.servlet.http.HttpServletRequest;\n /** FIXME\n } */\n /** FIXME\n } */", "new_methods": [], "old_code": "import gov.nysenate.openleg.model.Bill;\nimport gov.nysenate.openleg.model.Person;\nimport javax.servlet.http.HttpServletRequest;\n\nimport org.apache.commons.lang3.StringUtils;\n\n }\n }", "old_methods": [], "patch": "@@ -1,16 +1,14 @@\n package gov.nysenate.openleg.util;\n \n-import gov.nysenate.openleg.model.Bill;\n-import gov.nysenate.openleg.model.Person;\n+import gov.nysenate.openleg.model.bill.Bill;\n+import gov.nysenate.openleg.model.entity.Person;\n+import org.apache.commons.lang3.StringUtils;\n \n+import javax.servlet.http.HttpServletRequest;\n import java.util.ArrayList;\n import java.util.Arrays;\n import java.util.List;\n \n-import javax.servlet.http.HttpServletRequest;\n-\n-import org.apache.commons.lang3.StringUtils;\n-\n public class JSPHelper\n {\n public static String getPersonLink(String person, HttpServletRequest request)\n@@ -99,23 +97,25 @@ public static String getSponsorLinks(Bill bill, HttpServletRequest request)\n public static String getCoSponsorLinks(Bill bill, HttpServletRequest request)\n {\n ArrayList<String> links = new ArrayList<String>();\n+ /** FIXME\n for (Person sponsor : bill.getCoSponsors()) {\n if (!bill.getOtherSponsors().contains(sponsor)) {\n links.add(JSPHelper.getPersonLink(sponsor, request));\n }\n- }\n+ } */\n \n return StringUtils.join(links, \", \");\n }\n \n public static String getMultiSponsorLinks(Bill bill, HttpServletRequest request)\n {\n ArrayList<String> links = new ArrayList<String>();\n+ /** FIXME\n for (Person sponsor : bill.getMultiSponsors()) {\n if (!bill.getOtherSponsors().contains(sponsor)) {\n links.add(JSPHelper.getPersonLink(sponsor, request));\n }\n- }\n+ } */\n return StringUtils.join(links, \", \");\n }\n }", "raw_url": "https://github.com/nysenate/OpenLegislation/raw/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Futil%2FJSPHelper.java", "sha": "775112681af8d3524e335234a5a42d7a9e39e3d5", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/nysenate/OpenLegislation/blob/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Futil%2FRequestUtils.java", "changes": 3, "contents_url": "https://api.github.com/repos/nysenate/OpenLegislation/contents/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Futil%2FRequestUtils.java?ref=f89655fbb32c1372837f17bb6f7ed81f7a32c654", "deletions": 2, "filename": "src/main/java/gov/nysenate/openleg/util/RequestUtils.java", "new_code": "import javax.servlet.http.HttpServletRequest;", "new_methods": [], "old_code": "import javax.servlet.http.HttpServletRequest;\n", "old_methods": [], "patch": "@@ -1,12 +1,11 @@\n package gov.nysenate.openleg.util;\n \n+import javax.servlet.http.HttpServletRequest;\n import java.io.UnsupportedEncodingException;\n import java.net.URLDecoder;\n import java.util.regex.Matcher;\n import java.util.regex.Pattern;\n \n-import javax.servlet.http.HttpServletRequest;\n-\n public class RequestUtils {\n private static Pattern formatPattern = Pattern.compile(\"\\\\.(json|xml)$\");\n ", "raw_url": "https://github.com/nysenate/OpenLegislation/raw/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Futil%2FRequestUtils.java", "sha": "80e3071c79362651a1ce803f09c39ef7dade13f2", "status": "modified" }, { "additions": 10, "blob_url": "https://github.com/nysenate/OpenLegislation/blob/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Futil%2FResultIterator.java", "changes": 23, "contents_url": "https://api.github.com/repos/nysenate/OpenLegislation/contents/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Futil%2FResultIterator.java?ref=f89655fbb32c1372837f17bb6f7ed81f7a32c654", "deletions": 13, "filename": "src/main/java/gov/nysenate/openleg/util/ResultIterator.java", "new_code": "import org.apache.log4j.Logger;\n// try {\n// int start = (page-1)*max;\n //senateResponse = Application.getLucene().search(query, start, max, sortBy, reverse);\n// page++;\n// }\n// catch (IOException e) {\n// logger.error(e);\n// }\n// ApiHelper.buildSearchResultList(senateResponse);", "new_methods": [], "old_code": "import gov.nysenate.openleg.api.ApiHelper;\nimport java.io.IOException;\nimport org.apache.log4j.Logger;\n\n try {\n int start = (page-1)*max;\n senateResponse = Application.getLucene().search(query, start, max, sortBy, reverse);\n page++;\n }\n catch (IOException e) {\n logger.error(e);\n }\n ApiHelper.buildSearchResultList(senateResponse);", "old_methods": [], "patch": "@@ -1,16 +1,13 @@\n package gov.nysenate.openleg.util;\n \n-import gov.nysenate.openleg.api.ApiHelper;\n import gov.nysenate.openleg.model.Result;\n import gov.nysenate.openleg.model.SenateResponse;\n+import org.apache.log4j.Logger;\n \n-import java.io.IOException;\n import java.util.ArrayList;\n import java.util.Iterator;\n import java.util.NoSuchElementException;\n \n-import org.apache.log4j.Logger;\n-\n public class ResultIterator implements Iterator<Result>, Iterable<Result> {\n private static Logger logger = Logger.getLogger(ResultIterator.class);\n \n@@ -89,21 +86,21 @@ private void doQuery() {\n return;\n }\n \n- try {\n- int start = (page-1)*max;\n- senateResponse = Application.getLucene().search(query, start, max, sortBy, reverse);\n- page++;\n- }\n- catch (IOException e) {\n- logger.error(e);\n- }\n+// try {\n+// int start = (page-1)*max;\n+ //senateResponse = Application.getLucene().search(query, start, max, sortBy, reverse);\n+// page++;\n+// }\n+// catch (IOException e) {\n+// logger.error(e);\n+// }\n \n if(senateResponse == null) {\n exhausted = true;\n return;\n }\n \n- ApiHelper.buildSearchResultList(senateResponse);\n+// ApiHelper.buildSearchResultList(senateResponse);\n \n ArrayList<Result> results = senateResponse.getResults();\n ", "raw_url": "https://github.com/nysenate/OpenLegislation/raw/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Futil%2FResultIterator.java", "sha": "d1f841453f10573d267c6510b54cbaf04ac8e381", "status": "modified" }, { "additions": 51, "blob_url": "https://github.com/nysenate/OpenLegislation/blob/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Futil%2FStorage.java", "changes": 117, "contents_url": "https://api.github.com/repos/nysenate/OpenLegislation/contents/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Futil%2FStorage.java?ref=f89655fbb32c1372837f17bb6f7ed81f7a32c654", "deletions": 66, "filename": "src/main/java/gov/nysenate/openleg/util/Storage.java", "new_code": "import gov.nysenate.openleg.model.bill.Bill;\nimport org.apache.commons.io.FileUtils;\nimport org.apache.log4j.Logger;\n private static final Logger logger = Logger.getLogger(Storage.class);\n// private final StorageJsonConverter converter;\n// this.converter = new StorageJsonConverter(this);\n// try {\n// if (cls == Bill.class) {\n// value = this.converter.readBill(storageFile);\n// }\n// else if (cls == Calendar.class) {\n// value = this.converter.readCalendar(storageFile);\n// }\n// else if (cls == Transcript.class) {\n// value = this.converter.readTranscript(storageFile);\n// }\n// else {\n// logger.error(\"Unable to read value of type \"+cls.getName()+\" from: \"+storageFile);\n// return null;\n// }\n// } catch (org.codehaus.jackson.JsonParseException e) {\n// logger.error(\"could not parse json\", e);\n// } catch (JsonMappingException e) {\n// logger.error(\"could not map json\", e);\n// } catch (IOException e) {\n// logger.debug(\"Storage Miss: \"+storageFile);\n// }\n// }\n// else {\n// logger.debug(\"Missing key: \"+key);\n return null; /** KILLED THIS */\n //return value.getYear()+\"/\"+value.getOtype()+\"/\"+value.getOid();\n// try {\n// FileUtils.forceMkdir(storageFile.getParentFile());\n// if (value instanceof Bill) {\n// this.converter.write((Bill)value, storageFile);\n// }\n// else if (value instanceof Calendar) {\n// this.converter.write((Calendar)value, storageFile);\n// }\n// else if (value instanceof Transcript) {\n// this.converter.write((Transcript)value, storageFile);\n// }\n// else {\n// logger.error(\"Unable to write value of type \"+value.getClass().getName()+\": \"+value.getOid());\n// return;\n// }\n// }\n// catch (IOException e) {\n// logger.error(\"Cannot open file for writing: \"+storageFile, e);\n// }", "new_methods": [ { "arguments": [ "cls == Calendar.class" ], "filename": "src/main/java/gov/nysenate/openleg/util/Storage.java", "implementation": "// value = this.converter.readCalendar(storageFile);\n//", "signature": "else if (cls == Calendar.class)" }, { "arguments": [ "cls == Transcript.class" ], "filename": "src/main/java/gov/nysenate/openleg/util/Storage.java", "implementation": "// value = this.converter.readTranscript(storageFile);\n//", "signature": "else if (cls == Transcript.class)" }, { "arguments": [ "value instanceof Calendar" ], "filename": "src/main/java/gov/nysenate/openleg/util/Storage.java", "implementation": "// this.converter.write((Calendar)value, storageFile);\n//", "signature": "else if (value instanceof Calendar)" }, { "arguments": [ "value instanceof Transcript" ], "filename": "src/main/java/gov/nysenate/openleg/util/Storage.java", "implementation": "// this.converter.write((Transcript)value, storageFile);\n//", "signature": "else if (value instanceof Transcript)" } ], "old_code": "import gov.nysenate.openleg.converter.StorageJsonConverter;\nimport gov.nysenate.openleg.model.Bill;\nimport gov.nysenate.openleg.model.Calendar;\nimport gov.nysenate.openleg.model.Transcript;\nimport java.io.IOException;\nimport java.util.ArrayList;\nimport java.util.List;\n\nimport org.apache.commons.io.FileUtils;\nimport org.apache.log4j.Logger;\nimport org.codehaus.jackson.map.JsonMappingException;\n\n public static void main(String[] args) {\n List<String> test = new ArrayList<String>();\n System.out.println(test.getClass().cast(test));\n }\n\n protected final Logger logger;\n private final StorageJsonConverter converter;\n this.logger = Logger.getLogger(this.getClass());\n\n this.converter = new StorageJsonConverter(this);\n try {\n if (cls == Bill.class) {\n value = this.converter.readBill(storageFile);\n }\n else if (cls == Calendar.class) {\n value = this.converter.readCalendar(storageFile);\n }\n else if (cls == Transcript.class) {\n value = this.converter.readTranscript(storageFile);\n }\n else {\n logger.error(\"Unable to read value of type \"+cls.getName()+\" from: \"+storageFile);\n return null;\n }\n } catch (org.codehaus.jackson.JsonParseException e) {\n logger.error(\"could not parse json\", e);\n } catch (JsonMappingException e) {\n logger.error(\"could not map json\", e);\n } catch (IOException e) {\n logger.debug(\"Storage Miss: \"+storageFile);\n }\n }\n else {\n logger.debug(\"Missing key: \"+key);\n return value.getYear()+\"/\"+value.getOtype()+\"/\"+value.getOid();\n try {\n FileUtils.forceMkdir(storageFile.getParentFile());\n if (value instanceof Bill) {\n this.converter.write((Bill)value, storageFile);\n }\n else if (value instanceof Calendar) {\n this.converter.write((Calendar)value, storageFile);\n }\n else if (value instanceof Transcript) {\n this.converter.write((Transcript)value, storageFile);\n }\n else {\n logger.error(\"Unable to write value of type \"+value.getClass().getName()+\": \"+value.getOid());\n return;\n }\n }\n catch (IOException e) {\n logger.error(\"Cannot open file for writing: \"+storageFile, e);\n }", "old_methods": [ { "arguments": [ "String[] args" ], "filename": "src/main/java/gov/nysenate/openleg/util/Storage.java", "implementation": "List<String> test = new ArrayList<String>();\n System.out.println(test.getClass().cast(test));", "signature": "void main(String[] args)" }, { "arguments": [ "cls == Calendar.class" ], "filename": "src/main/java/gov/nysenate/openleg/util/Storage.java", "implementation": "value = this.converter.readCalendar(storageFile);", "signature": "else if (cls == Calendar.class)" }, { "arguments": [ "cls == Transcript.class" ], "filename": "src/main/java/gov/nysenate/openleg/util/Storage.java", "implementation": "value = this.converter.readTranscript(storageFile);", "signature": "else if (cls == Transcript.class)" }, { "arguments": [ "value instanceof Calendar" ], "filename": "src/main/java/gov/nysenate/openleg/util/Storage.java", "implementation": "this.converter.write((Calendar)value, storageFile);", "signature": "else if (value instanceof Calendar)" }, { "arguments": [ "value instanceof Transcript" ], "filename": "src/main/java/gov/nysenate/openleg/util/Storage.java", "implementation": "this.converter.write((Transcript)value, storageFile);", "signature": "else if (value instanceof Transcript)" } ], "patch": "@@ -1,21 +1,13 @@\n package gov.nysenate.openleg.util;\n \n-import gov.nysenate.openleg.converter.StorageJsonConverter;\n import gov.nysenate.openleg.model.BaseObject;\n-import gov.nysenate.openleg.model.Bill;\n-import gov.nysenate.openleg.model.Calendar;\n-import gov.nysenate.openleg.model.Transcript;\n+import gov.nysenate.openleg.model.bill.Bill;\n+import org.apache.commons.io.FileUtils;\n+import org.apache.log4j.Logger;\n \n import java.io.File;\n-import java.io.IOException;\n-import java.util.ArrayList;\n import java.util.HashMap;\n import java.util.HashSet;\n-import java.util.List;\n-\n-import org.apache.commons.io.FileUtils;\n-import org.apache.log4j.Logger;\n-import org.codehaus.jackson.map.JsonMappingException;\n \n /**\n * Simple file backed key-value store with that supports both published and unpublished\n@@ -25,13 +17,7 @@\n */\n public class Storage\n {\n-\n- public static void main(String[] args) {\n- List<String> test = new ArrayList<String>();\n- System.out.println(test.getClass().cast(test));\n- }\n-\n- protected final Logger logger;\n+ private static final Logger logger = Logger.getLogger(Storage.class);\n \n /**\n * Represents the current status of a key in storage:\n@@ -78,7 +64,7 @@ public static enum Status { NEW, MODIFIED, DELETED, UNMODIFIED, UNKNOWN };\n */\n protected HashSet<String> brandNew;\n \n- private final StorageJsonConverter converter;\n+// private final StorageJsonConverter converter;\n \n \n /**\n@@ -98,8 +84,6 @@ public Storage(String storagePath)\n */\n public Storage(File storageDir)\n {\n- this.logger = Logger.getLogger(this.getClass());\n-\n this.storageDir = storageDir;\n this.publishedDir = new File(storageDir, \"published\");\n this.unpublishedDir = new File(storageDir, \"unpublished\");\n@@ -108,7 +92,7 @@ public Storage(File storageDir)\n this.dirty = new HashSet<String>();\n this.brandNew = new HashSet<String>();\n \n- this.converter = new StorageJsonConverter(this);\n+// this.converter = new StorageJsonConverter(this);\n }\n \n /**\n@@ -130,32 +114,32 @@ public BaseObject get(String key, Class<? extends BaseObject> cls)\n logger.debug(\"Cache miss: \"+key);\n File storageFile = getStorageFile(key);\n if (storageFile != null) {\n- try {\n- if (cls == Bill.class) {\n- value = this.converter.readBill(storageFile);\n- }\n- else if (cls == Calendar.class) {\n- value = this.converter.readCalendar(storageFile);\n- }\n- else if (cls == Transcript.class) {\n- value = this.converter.readTranscript(storageFile);\n- }\n- else {\n- logger.error(\"Unable to read value of type \"+cls.getName()+\" from: \"+storageFile);\n- return null;\n- }\n+// try {\n+// if (cls == Bill.class) {\n+// value = this.converter.readBill(storageFile);\n+// }\n+// else if (cls == Calendar.class) {\n+// value = this.converter.readCalendar(storageFile);\n+// }\n+// else if (cls == Transcript.class) {\n+// value = this.converter.readTranscript(storageFile);\n+// }\n+// else {\n+// logger.error(\"Unable to read value of type \"+cls.getName()+\" from: \"+storageFile);\n+// return null;\n+// }\n \n value.setBrandNew(brandNew.contains(key));\n- } catch (org.codehaus.jackson.JsonParseException e) {\n- logger.error(\"could not parse json\", e);\n- } catch (JsonMappingException e) {\n- logger.error(\"could not map json\", e);\n- } catch (IOException e) {\n- logger.debug(\"Storage Miss: \"+storageFile);\n- }\n- }\n- else {\n- logger.debug(\"Missing key: \"+key);\n+// } catch (org.codehaus.jackson.JsonParseException e) {\n+// logger.error(\"could not parse json\", e);\n+// } catch (JsonMappingException e) {\n+// logger.error(\"could not map json\", e);\n+// } catch (IOException e) {\n+// logger.debug(\"Storage Miss: \"+storageFile);\n+// }\n+// }\n+// else {\n+// logger.debug(\"Missing key: \"+key);\n }\n }\n return value;\n@@ -182,7 +166,8 @@ public void set(BaseObject value)\n */\n public String key(BaseObject value)\n {\n- return value.getYear()+\"/\"+value.getOtype()+\"/\"+value.getOid();\n+ return null; /** KILLED THIS */\n+ //return value.getYear()+\"/\"+value.getOtype()+\"/\"+value.getOid();\n }\n \n /**\n@@ -263,25 +248,25 @@ public void flush(String key)\n if (value != null) {\n File storageFile = value.isPublished() ? getPublishedFile(key) : getUnpublishedFile(key);\n \n- try {\n- FileUtils.forceMkdir(storageFile.getParentFile());\n- if (value instanceof Bill) {\n- this.converter.write((Bill)value, storageFile);\n- }\n- else if (value instanceof Calendar) {\n- this.converter.write((Calendar)value, storageFile);\n- }\n- else if (value instanceof Transcript) {\n- this.converter.write((Transcript)value, storageFile);\n- }\n- else {\n- logger.error(\"Unable to write value of type \"+value.getClass().getName()+\": \"+value.getOid());\n- return;\n- }\n- }\n- catch (IOException e) {\n- logger.error(\"Cannot open file for writing: \"+storageFile, e);\n- }\n+// try {\n+// FileUtils.forceMkdir(storageFile.getParentFile());\n+// if (value instanceof Bill) {\n+// this.converter.write((Bill)value, storageFile);\n+// }\n+// else if (value instanceof Calendar) {\n+// this.converter.write((Calendar)value, storageFile);\n+// }\n+// else if (value instanceof Transcript) {\n+// this.converter.write((Transcript)value, storageFile);\n+// }\n+// else {\n+// logger.error(\"Unable to write value of type \"+value.getClass().getName()+\": \"+value.getOid());\n+// return;\n+// }\n+// }\n+// catch (IOException e) {\n+// logger.error(\"Cannot open file for writing: \"+storageFile, e);\n+// }\n }\n \n // Mark the key as clean by removing from the dirty set.", "raw_url": "https://github.com/nysenate/OpenLegislation/raw/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Futil%2FStorage.java", "sha": "dd55f9c70ecbf7178248cd710596f176f500485a", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/nysenate/OpenLegislation/blob/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Futil%2FTextFormatter.java", "changes": 2, "contents_url": "https://api.github.com/repos/nysenate/OpenLegislation/contents/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Futil%2FTextFormatter.java?ref=f89655fbb32c1372837f17bb6f7ed81f7a32c654", "deletions": 1, "filename": "src/main/java/gov/nysenate/openleg/util/TextFormatter.java", "new_code": "import gov.nysenate.openleg.model.bill.Bill;", "new_methods": [], "old_code": "import gov.nysenate.openleg.model.Bill;", "old_methods": [], "patch": "@@ -1,6 +1,6 @@\n package gov.nysenate.openleg.util;\n \n-import gov.nysenate.openleg.model.Bill;\n+import gov.nysenate.openleg.model.bill.Bill;\n \n import java.util.regex.Matcher;\n import java.util.regex.Pattern;", "raw_url": "https://github.com/nysenate/OpenLegislation/raw/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Futil%2FTextFormatter.java", "sha": "99186a343411936c5eee2674056adf1d5b5d8f29", "status": "modified" }, { "additions": 6, "blob_url": "https://github.com/nysenate/OpenLegislation/blob/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Futil%2FXmlHelper.java", "changes": 14, "contents_url": "https://api.github.com/repos/nysenate/OpenLegislation/contents/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Futil%2FXmlHelper.java?ref=f89655fbb32c1372837f17bb6f7ed81f7a32c654", "deletions": 8, "filename": "src/main/java/gov/nysenate/openleg/util/XmlHelper.java", "new_code": "import org.w3c.dom.Document;\nimport org.w3c.dom.Node;\nimport org.w3c.dom.NodeList;\nimport org.xml.sax.SAXException;\nimport java.io.File;\nimport java.io.IOException;", "new_methods": [], "old_code": "\nimport java.io.File;\nimport java.io.IOException;\n\nimport org.w3c.dom.Document;\nimport org.w3c.dom.Node;\nimport org.w3c.dom.NodeList;\nimport org.xml.sax.SAXException;", "old_methods": [], "patch": "@@ -1,9 +1,10 @@\n package gov.nysenate.openleg.util;\n \n import gov.nysenate.util.Config;\n-\n-import java.io.File;\n-import java.io.IOException;\n+import org.w3c.dom.Document;\n+import org.w3c.dom.Node;\n+import org.w3c.dom.NodeList;\n+import org.xml.sax.SAXException;\n \n import javax.xml.parsers.DocumentBuilder;\n import javax.xml.parsers.DocumentBuilderFactory;\n@@ -12,11 +13,8 @@\n import javax.xml.xpath.XPathConstants;\n import javax.xml.xpath.XPathExpressionException;\n import javax.xml.xpath.XPathFactory;\n-\n-import org.w3c.dom.Document;\n-import org.w3c.dom.Node;\n-import org.w3c.dom.NodeList;\n-import org.xml.sax.SAXException;\n+import java.io.File;\n+import java.io.IOException;\n \n public class XmlHelper\n {", "raw_url": "https://github.com/nysenate/OpenLegislation/raw/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Futil%2FXmlHelper.java", "sha": "bd8e4a97680b3bcbf412f32ca059e81aa6ab3116", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/nysenate/OpenLegislation/blob/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fxml%2Fcalendar%2FXMLActcaldate.java", "changes": 6, "contents_url": "https://api.github.com/repos/nysenate/OpenLegislation/contents/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fxml%2Fcalendar%2FXMLActcaldate.java?ref=f89655fbb32c1372837f17bb6f7ed81f7a32c654", "deletions": 5, "filename": "src/main/java/gov/nysenate/openleg/xml/calendar/XMLActcaldate.java", "new_code": "import javax.xml.bind.annotation.*;", "new_methods": [], "old_code": "import javax.xml.bind.annotation.XmlAccessType;\nimport javax.xml.bind.annotation.XmlAccessorType;\nimport javax.xml.bind.annotation.XmlRootElement;\nimport javax.xml.bind.annotation.XmlType;\nimport javax.xml.bind.annotation.XmlValue;", "old_methods": [], "patch": "@@ -8,11 +8,7 @@\n \n package gov.nysenate.openleg.xml.calendar;\n \n-import javax.xml.bind.annotation.XmlAccessType;\n-import javax.xml.bind.annotation.XmlAccessorType;\n-import javax.xml.bind.annotation.XmlRootElement;\n-import javax.xml.bind.annotation.XmlType;\n-import javax.xml.bind.annotation.XmlValue;\n+import javax.xml.bind.annotation.*;\n \n \n /**", "raw_url": "https://github.com/nysenate/OpenLegislation/raw/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fxml%2Fcalendar%2FXMLActcaldate.java", "sha": "b592ed0fb169c8b5ddce6ccbc924df99b50974e7", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/nysenate/OpenLegislation/blob/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fxml%2Fcalendar%2FXMLBill.java", "changes": 7, "contents_url": "https://api.github.com/repos/nysenate/OpenLegislation/contents/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fxml%2Fcalendar%2FXMLBill.java?ref=f89655fbb32c1372837f17bb6f7ed81f7a32c654", "deletions": 6, "filename": "src/main/java/gov/nysenate/openleg/xml/calendar/XMLBill.java", "new_code": "import javax.xml.bind.annotation.*;", "new_methods": [], "old_code": "import javax.xml.bind.annotation.XmlAccessType;\nimport javax.xml.bind.annotation.XmlAccessorType;\nimport javax.xml.bind.annotation.XmlAttribute;\nimport javax.xml.bind.annotation.XmlRootElement;\nimport javax.xml.bind.annotation.XmlSchemaType;\nimport javax.xml.bind.annotation.XmlType;", "old_methods": [], "patch": "@@ -8,12 +8,7 @@\n \n package gov.nysenate.openleg.xml.calendar;\n \n-import javax.xml.bind.annotation.XmlAccessType;\n-import javax.xml.bind.annotation.XmlAccessorType;\n-import javax.xml.bind.annotation.XmlAttribute;\n-import javax.xml.bind.annotation.XmlRootElement;\n-import javax.xml.bind.annotation.XmlSchemaType;\n-import javax.xml.bind.annotation.XmlType;\n+import javax.xml.bind.annotation.*;\n import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;\n import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;\n ", "raw_url": "https://github.com/nysenate/OpenLegislation/raw/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fxml%2Fcalendar%2FXMLBill.java", "sha": "837489b56cf2999888c13047f114430ebff1d5ac", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/nysenate/OpenLegislation/blob/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fxml%2Fcalendar%2FXMLCaldate.java", "changes": 6, "contents_url": "https://api.github.com/repos/nysenate/OpenLegislation/contents/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fxml%2Fcalendar%2FXMLCaldate.java?ref=f89655fbb32c1372837f17bb6f7ed81f7a32c654", "deletions": 5, "filename": "src/main/java/gov/nysenate/openleg/xml/calendar/XMLCaldate.java", "new_code": "import javax.xml.bind.annotation.*;", "new_methods": [], "old_code": "import javax.xml.bind.annotation.XmlAccessType;\nimport javax.xml.bind.annotation.XmlAccessorType;\nimport javax.xml.bind.annotation.XmlRootElement;\nimport javax.xml.bind.annotation.XmlType;\nimport javax.xml.bind.annotation.XmlValue;", "old_methods": [], "patch": "@@ -8,11 +8,7 @@\n \n package gov.nysenate.openleg.xml.calendar;\n \n-import javax.xml.bind.annotation.XmlAccessType;\n-import javax.xml.bind.annotation.XmlAccessorType;\n-import javax.xml.bind.annotation.XmlRootElement;\n-import javax.xml.bind.annotation.XmlType;\n-import javax.xml.bind.annotation.XmlValue;\n+import javax.xml.bind.annotation.*;\n \n \n /**", "raw_url": "https://github.com/nysenate/OpenLegislation/raw/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fxml%2Fcalendar%2FXMLCaldate.java", "sha": "606e75d68aeb9a79888f9aaec1a9065862e20ff4", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/nysenate/OpenLegislation/blob/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fxml%2Fcalendar%2FXMLCalno.java", "changes": 8, "contents_url": "https://api.github.com/repos/nysenate/OpenLegislation/contents/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fxml%2Fcalendar%2FXMLCalno.java?ref=f89655fbb32c1372837f17bb6f7ed81f7a32c654", "deletions": 7, "filename": "src/main/java/gov/nysenate/openleg/xml/calendar/XMLCalno.java", "new_code": "import javax.xml.bind.annotation.*;", "new_methods": [], "old_code": "import javax.xml.bind.annotation.XmlAccessType;\nimport javax.xml.bind.annotation.XmlAccessorType;\nimport javax.xml.bind.annotation.XmlAttribute;\nimport javax.xml.bind.annotation.XmlElement;\nimport javax.xml.bind.annotation.XmlRootElement;\nimport javax.xml.bind.annotation.XmlSchemaType;\nimport javax.xml.bind.annotation.XmlType;", "old_methods": [], "patch": "@@ -8,13 +8,7 @@\n \n package gov.nysenate.openleg.xml.calendar;\n \n-import javax.xml.bind.annotation.XmlAccessType;\n-import javax.xml.bind.annotation.XmlAccessorType;\n-import javax.xml.bind.annotation.XmlAttribute;\n-import javax.xml.bind.annotation.XmlElement;\n-import javax.xml.bind.annotation.XmlRootElement;\n-import javax.xml.bind.annotation.XmlSchemaType;\n-import javax.xml.bind.annotation.XmlType;\n+import javax.xml.bind.annotation.*;\n import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;\n import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;\n ", "raw_url": "https://github.com/nysenate/OpenLegislation/raw/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fxml%2Fcalendar%2FXMLCalno.java", "sha": "4d95430dd7fb4803082ea92ba173ed959c2ddab9", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/nysenate/OpenLegislation/blob/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fxml%2Fcalendar%2FXMLCalnos.java", "changes": 6, "contents_url": "https://api.github.com/repos/nysenate/OpenLegislation/contents/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fxml%2Fcalendar%2FXMLCalnos.java?ref=f89655fbb32c1372837f17bb6f7ed81f7a32c654", "deletions": 5, "filename": "src/main/java/gov/nysenate/openleg/xml/calendar/XMLCalnos.java", "new_code": "import javax.xml.bind.annotation.*;", "new_methods": [], "old_code": "import javax.xml.bind.annotation.XmlAccessType;\nimport javax.xml.bind.annotation.XmlAccessorType;\nimport javax.xml.bind.annotation.XmlElement;\nimport javax.xml.bind.annotation.XmlRootElement;\nimport javax.xml.bind.annotation.XmlType;", "old_methods": [], "patch": "@@ -8,13 +8,9 @@\n \n package gov.nysenate.openleg.xml.calendar;\n \n+import javax.xml.bind.annotation.*;\n import java.util.ArrayList;\n import java.util.List;\n-import javax.xml.bind.annotation.XmlAccessType;\n-import javax.xml.bind.annotation.XmlAccessorType;\n-import javax.xml.bind.annotation.XmlElement;\n-import javax.xml.bind.annotation.XmlRootElement;\n-import javax.xml.bind.annotation.XmlType;\n \n \n /**", "raw_url": "https://github.com/nysenate/OpenLegislation/raw/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fxml%2Fcalendar%2FXMLCalnos.java", "sha": "583d7684d8205e8a9499fa09a4002ca66256db9d", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/nysenate/OpenLegislation/blob/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fxml%2Fcalendar%2FXMLMotiondate.java", "changes": 6, "contents_url": "https://api.github.com/repos/nysenate/OpenLegislation/contents/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fxml%2Fcalendar%2FXMLMotiondate.java?ref=f89655fbb32c1372837f17bb6f7ed81f7a32c654", "deletions": 5, "filename": "src/main/java/gov/nysenate/openleg/xml/calendar/XMLMotiondate.java", "new_code": "import javax.xml.bind.annotation.*;", "new_methods": [], "old_code": "import javax.xml.bind.annotation.XmlAccessType;\nimport javax.xml.bind.annotation.XmlAccessorType;\nimport javax.xml.bind.annotation.XmlRootElement;\nimport javax.xml.bind.annotation.XmlType;\nimport javax.xml.bind.annotation.XmlValue;", "old_methods": [], "patch": "@@ -8,11 +8,7 @@\n \n package gov.nysenate.openleg.xml.calendar;\n \n-import javax.xml.bind.annotation.XmlAccessType;\n-import javax.xml.bind.annotation.XmlAccessorType;\n-import javax.xml.bind.annotation.XmlRootElement;\n-import javax.xml.bind.annotation.XmlType;\n-import javax.xml.bind.annotation.XmlValue;\n+import javax.xml.bind.annotation.*;\n \n \n /**", "raw_url": "https://github.com/nysenate/OpenLegislation/raw/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fxml%2Fcalendar%2FXMLMotiondate.java", "sha": "1e9d4f4e64cb7f6c6e5b6ae02f82bad67043e216", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/nysenate/OpenLegislation/blob/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fxml%2Fcalendar%2FXMLReleasedate.java", "changes": 6, "contents_url": "https://api.github.com/repos/nysenate/OpenLegislation/contents/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fxml%2Fcalendar%2FXMLReleasedate.java?ref=f89655fbb32c1372837f17bb6f7ed81f7a32c654", "deletions": 5, "filename": "src/main/java/gov/nysenate/openleg/xml/calendar/XMLReleasedate.java", "new_code": "import javax.xml.bind.annotation.*;", "new_methods": [], "old_code": "import javax.xml.bind.annotation.XmlAccessType;\nimport javax.xml.bind.annotation.XmlAccessorType;\nimport javax.xml.bind.annotation.XmlRootElement;\nimport javax.xml.bind.annotation.XmlType;\nimport javax.xml.bind.annotation.XmlValue;", "old_methods": [], "patch": "@@ -8,11 +8,7 @@\n \n package gov.nysenate.openleg.xml.calendar;\n \n-import javax.xml.bind.annotation.XmlAccessType;\n-import javax.xml.bind.annotation.XmlAccessorType;\n-import javax.xml.bind.annotation.XmlRootElement;\n-import javax.xml.bind.annotation.XmlType;\n-import javax.xml.bind.annotation.XmlValue;\n+import javax.xml.bind.annotation.*;\n \n \n /**", "raw_url": "https://github.com/nysenate/OpenLegislation/raw/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fxml%2Fcalendar%2FXMLReleasedate.java", "sha": "41ef7b8c7c0e97b1f6e8beecc539011399afae3f", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/nysenate/OpenLegislation/blob/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fxml%2Fcalendar%2FXMLReleasetime.java", "changes": 6, "contents_url": "https://api.github.com/repos/nysenate/OpenLegislation/contents/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fxml%2Fcalendar%2FXMLReleasetime.java?ref=f89655fbb32c1372837f17bb6f7ed81f7a32c654", "deletions": 5, "filename": "src/main/java/gov/nysenate/openleg/xml/calendar/XMLReleasetime.java", "new_code": "import javax.xml.bind.annotation.*;", "new_methods": [], "old_code": "import javax.xml.bind.annotation.XmlAccessType;\nimport javax.xml.bind.annotation.XmlAccessorType;\nimport javax.xml.bind.annotation.XmlRootElement;\nimport javax.xml.bind.annotation.XmlType;\nimport javax.xml.bind.annotation.XmlValue;", "old_methods": [], "patch": "@@ -8,11 +8,7 @@\n \n package gov.nysenate.openleg.xml.calendar;\n \n-import javax.xml.bind.annotation.XmlAccessType;\n-import javax.xml.bind.annotation.XmlAccessorType;\n-import javax.xml.bind.annotation.XmlRootElement;\n-import javax.xml.bind.annotation.XmlType;\n-import javax.xml.bind.annotation.XmlValue;\n+import javax.xml.bind.annotation.*;\n \n \n /**", "raw_url": "https://github.com/nysenate/OpenLegislation/raw/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fxml%2Fcalendar%2FXMLReleasetime.java", "sha": "dd30cf8a30fba1d3cf0903bc12a96b37d68e060f", "status": "modified" }, { "additions": 3, "blob_url": "https://github.com/nysenate/OpenLegislation/blob/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fxml%2Fcalendar%2FXMLSENATEDATA.java", "changes": 13, "contents_url": "https://api.github.com/repos/nysenate/OpenLegislation/contents/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fxml%2Fcalendar%2FXMLSENATEDATA.java?ref=f89655fbb32c1372837f17bb6f7ed81f7a32c654", "deletions": 10, "filename": "src/main/java/gov/nysenate/openleg/xml/calendar/XMLSENATEDATA.java", "new_code": "import javax.xml.bind.annotation.*;\nimport java.util.ArrayList;\nimport java.util.List;", "new_methods": [], "old_code": "import java.util.ArrayList;\nimport java.util.List;\nimport javax.xml.bind.annotation.XmlAccessType;\nimport javax.xml.bind.annotation.XmlAccessorType;\nimport javax.xml.bind.annotation.XmlAttribute;\nimport javax.xml.bind.annotation.XmlElement;\nimport javax.xml.bind.annotation.XmlElements;\nimport javax.xml.bind.annotation.XmlRootElement;\nimport javax.xml.bind.annotation.XmlSchemaType;\nimport javax.xml.bind.annotation.XmlType;", "old_methods": [], "patch": "@@ -8,18 +8,11 @@\n \n package gov.nysenate.openleg.xml.calendar;\n \n-import java.util.ArrayList;\n-import java.util.List;\n-import javax.xml.bind.annotation.XmlAccessType;\n-import javax.xml.bind.annotation.XmlAccessorType;\n-import javax.xml.bind.annotation.XmlAttribute;\n-import javax.xml.bind.annotation.XmlElement;\n-import javax.xml.bind.annotation.XmlElements;\n-import javax.xml.bind.annotation.XmlRootElement;\n-import javax.xml.bind.annotation.XmlSchemaType;\n-import javax.xml.bind.annotation.XmlType;\n+import javax.xml.bind.annotation.*;\n import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;\n import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;\n+import java.util.ArrayList;\n+import java.util.List;\n \n \n /**", "raw_url": "https://github.com/nysenate/OpenLegislation/raw/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fxml%2Fcalendar%2FXMLSENATEDATA.java", "sha": "c2d4de2420f02d8d56af682d9db98ca48aa3a243", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/nysenate/OpenLegislation/blob/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fxml%2Fcalendar%2FXMLSection.java", "changes": 8, "contents_url": "https://api.github.com/repos/nysenate/OpenLegislation/contents/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fxml%2Fcalendar%2FXMLSection.java?ref=f89655fbb32c1372837f17bb6f7ed81f7a32c654", "deletions": 7, "filename": "src/main/java/gov/nysenate/openleg/xml/calendar/XMLSection.java", "new_code": "import javax.xml.bind.annotation.*;", "new_methods": [], "old_code": "import javax.xml.bind.annotation.XmlAccessType;\nimport javax.xml.bind.annotation.XmlAccessorType;\nimport javax.xml.bind.annotation.XmlAttribute;\nimport javax.xml.bind.annotation.XmlElement;\nimport javax.xml.bind.annotation.XmlRootElement;\nimport javax.xml.bind.annotation.XmlSchemaType;\nimport javax.xml.bind.annotation.XmlType;", "old_methods": [], "patch": "@@ -8,13 +8,7 @@\n \n package gov.nysenate.openleg.xml.calendar;\n \n-import javax.xml.bind.annotation.XmlAccessType;\n-import javax.xml.bind.annotation.XmlAccessorType;\n-import javax.xml.bind.annotation.XmlAttribute;\n-import javax.xml.bind.annotation.XmlElement;\n-import javax.xml.bind.annotation.XmlRootElement;\n-import javax.xml.bind.annotation.XmlSchemaType;\n-import javax.xml.bind.annotation.XmlType;\n+import javax.xml.bind.annotation.*;\n import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;\n import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;\n ", "raw_url": "https://github.com/nysenate/OpenLegislation/raw/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fxml%2Fcalendar%2FXMLSection.java", "sha": "a9db2197b48011cd998b56ea656d95088790641e", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/nysenate/OpenLegislation/blob/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fxml%2Fcalendar%2FXMLSections.java", "changes": 6, "contents_url": "https://api.github.com/repos/nysenate/OpenLegislation/contents/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fxml%2Fcalendar%2FXMLSections.java?ref=f89655fbb32c1372837f17bb6f7ed81f7a32c654", "deletions": 5, "filename": "src/main/java/gov/nysenate/openleg/xml/calendar/XMLSections.java", "new_code": "import javax.xml.bind.annotation.*;", "new_methods": [], "old_code": "import javax.xml.bind.annotation.XmlAccessType;\nimport javax.xml.bind.annotation.XmlAccessorType;\nimport javax.xml.bind.annotation.XmlElement;\nimport javax.xml.bind.annotation.XmlRootElement;\nimport javax.xml.bind.annotation.XmlType;", "old_methods": [], "patch": "@@ -8,13 +8,9 @@\n \n package gov.nysenate.openleg.xml.calendar;\n \n+import javax.xml.bind.annotation.*;\n import java.util.ArrayList;\n import java.util.List;\n-import javax.xml.bind.annotation.XmlAccessType;\n-import javax.xml.bind.annotation.XmlAccessorType;\n-import javax.xml.bind.annotation.XmlElement;\n-import javax.xml.bind.annotation.XmlRootElement;\n-import javax.xml.bind.annotation.XmlType;\n \n \n /**", "raw_url": "https://github.com/nysenate/OpenLegislation/raw/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fxml%2Fcalendar%2FXMLSections.java", "sha": "50ca6594b2932c25874e4195ef385eaab841f9fd", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/nysenate/OpenLegislation/blob/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fxml%2Fcalendar%2FXMLSencalendar.java", "changes": 8, "contents_url": "https://api.github.com/repos/nysenate/OpenLegislation/contents/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fxml%2Fcalendar%2FXMLSencalendar.java?ref=f89655fbb32c1372837f17bb6f7ed81f7a32c654", "deletions": 7, "filename": "src/main/java/gov/nysenate/openleg/xml/calendar/XMLSencalendar.java", "new_code": "import javax.xml.bind.annotation.*;", "new_methods": [], "old_code": "import javax.xml.bind.annotation.XmlAccessType;\nimport javax.xml.bind.annotation.XmlAccessorType;\nimport javax.xml.bind.annotation.XmlAttribute;\nimport javax.xml.bind.annotation.XmlElement;\nimport javax.xml.bind.annotation.XmlRootElement;\nimport javax.xml.bind.annotation.XmlSchemaType;\nimport javax.xml.bind.annotation.XmlType;", "old_methods": [], "patch": "@@ -8,13 +8,7 @@\n \n package gov.nysenate.openleg.xml.calendar;\n \n-import javax.xml.bind.annotation.XmlAccessType;\n-import javax.xml.bind.annotation.XmlAccessorType;\n-import javax.xml.bind.annotation.XmlAttribute;\n-import javax.xml.bind.annotation.XmlElement;\n-import javax.xml.bind.annotation.XmlRootElement;\n-import javax.xml.bind.annotation.XmlSchemaType;\n-import javax.xml.bind.annotation.XmlType;\n+import javax.xml.bind.annotation.*;\n import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;\n import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;\n ", "raw_url": "https://github.com/nysenate/OpenLegislation/raw/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fxml%2Fcalendar%2FXMLSencalendar.java", "sha": "35015d19cd5439d3b2adb7e9fa350a0a08fa76da", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/nysenate/OpenLegislation/blob/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fxml%2Fcalendar%2FXMLSencalendaractive.java", "changes": 8, "contents_url": "https://api.github.com/repos/nysenate/OpenLegislation/contents/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fxml%2Fcalendar%2FXMLSencalendaractive.java?ref=f89655fbb32c1372837f17bb6f7ed81f7a32c654", "deletions": 7, "filename": "src/main/java/gov/nysenate/openleg/xml/calendar/XMLSencalendaractive.java", "new_code": "import javax.xml.bind.annotation.*;", "new_methods": [], "old_code": "import javax.xml.bind.annotation.XmlAccessType;\nimport javax.xml.bind.annotation.XmlAccessorType;\nimport javax.xml.bind.annotation.XmlAttribute;\nimport javax.xml.bind.annotation.XmlElement;\nimport javax.xml.bind.annotation.XmlRootElement;\nimport javax.xml.bind.annotation.XmlSchemaType;\nimport javax.xml.bind.annotation.XmlType;", "old_methods": [], "patch": "@@ -8,13 +8,7 @@\n \n package gov.nysenate.openleg.xml.calendar;\n \n-import javax.xml.bind.annotation.XmlAccessType;\n-import javax.xml.bind.annotation.XmlAccessorType;\n-import javax.xml.bind.annotation.XmlAttribute;\n-import javax.xml.bind.annotation.XmlElement;\n-import javax.xml.bind.annotation.XmlRootElement;\n-import javax.xml.bind.annotation.XmlSchemaType;\n-import javax.xml.bind.annotation.XmlType;\n+import javax.xml.bind.annotation.*;\n import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;\n import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;\n ", "raw_url": "https://github.com/nysenate/OpenLegislation/raw/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fxml%2Fcalendar%2FXMLSencalendaractive.java", "sha": "9744c5f95f35bdfd1fb54b99b7f72d74cfb6f107", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/nysenate/OpenLegislation/blob/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fxml%2Fcalendar%2FXMLSequence.java", "changes": 6, "contents_url": "https://api.github.com/repos/nysenate/OpenLegislation/contents/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fxml%2Fcalendar%2FXMLSequence.java?ref=f89655fbb32c1372837f17bb6f7ed81f7a32c654", "deletions": 5, "filename": "src/main/java/gov/nysenate/openleg/xml/calendar/XMLSequence.java", "new_code": "import javax.xml.bind.annotation.*;", "new_methods": [], "old_code": "import javax.xml.bind.annotation.XmlAccessType;\nimport javax.xml.bind.annotation.XmlAccessorType;\nimport javax.xml.bind.annotation.XmlAttribute;\nimport javax.xml.bind.annotation.XmlRootElement;\nimport javax.xml.bind.annotation.XmlType;", "old_methods": [], "patch": "@@ -8,11 +8,7 @@\n \n package gov.nysenate.openleg.xml.calendar;\n \n-import javax.xml.bind.annotation.XmlAccessType;\n-import javax.xml.bind.annotation.XmlAccessorType;\n-import javax.xml.bind.annotation.XmlAttribute;\n-import javax.xml.bind.annotation.XmlRootElement;\n-import javax.xml.bind.annotation.XmlType;\n+import javax.xml.bind.annotation.*;\n \n \n /**", "raw_url": "https://github.com/nysenate/OpenLegislation/raw/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fxml%2Fcalendar%2FXMLSequence.java", "sha": "ee714514c2b7acd0d58f4ff30ba665016fccca4c", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/nysenate/OpenLegislation/blob/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fxml%2Fcalendar%2FXMLSponsor.java", "changes": 6, "contents_url": "https://api.github.com/repos/nysenate/OpenLegislation/contents/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fxml%2Fcalendar%2FXMLSponsor.java?ref=f89655fbb32c1372837f17bb6f7ed81f7a32c654", "deletions": 5, "filename": "src/main/java/gov/nysenate/openleg/xml/calendar/XMLSponsor.java", "new_code": "import javax.xml.bind.annotation.*;", "new_methods": [], "old_code": "import javax.xml.bind.annotation.XmlAccessType;\nimport javax.xml.bind.annotation.XmlAccessorType;\nimport javax.xml.bind.annotation.XmlRootElement;\nimport javax.xml.bind.annotation.XmlType;\nimport javax.xml.bind.annotation.XmlValue;", "old_methods": [], "patch": "@@ -8,11 +8,7 @@\n \n package gov.nysenate.openleg.xml.calendar;\n \n-import javax.xml.bind.annotation.XmlAccessType;\n-import javax.xml.bind.annotation.XmlAccessorType;\n-import javax.xml.bind.annotation.XmlRootElement;\n-import javax.xml.bind.annotation.XmlType;\n-import javax.xml.bind.annotation.XmlValue;\n+import javax.xml.bind.annotation.*;\n \n \n /**", "raw_url": "https://github.com/nysenate/OpenLegislation/raw/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fxml%2Fcalendar%2FXMLSponsor.java", "sha": "66543cccbac5e99723ffcdbd15037a1b3b02d557", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/nysenate/OpenLegislation/blob/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fxml%2Fcalendar%2FXMLSubbill.java", "changes": 6, "contents_url": "https://api.github.com/repos/nysenate/OpenLegislation/contents/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fxml%2Fcalendar%2FXMLSubbill.java?ref=f89655fbb32c1372837f17bb6f7ed81f7a32c654", "deletions": 5, "filename": "src/main/java/gov/nysenate/openleg/xml/calendar/XMLSubbill.java", "new_code": "import javax.xml.bind.annotation.*;", "new_methods": [], "old_code": "import javax.xml.bind.annotation.XmlAccessType;\nimport javax.xml.bind.annotation.XmlAccessorType;\nimport javax.xml.bind.annotation.XmlAttribute;\nimport javax.xml.bind.annotation.XmlRootElement;\nimport javax.xml.bind.annotation.XmlType;", "old_methods": [], "patch": "@@ -8,11 +8,7 @@\n \n package gov.nysenate.openleg.xml.calendar;\n \n-import javax.xml.bind.annotation.XmlAccessType;\n-import javax.xml.bind.annotation.XmlAccessorType;\n-import javax.xml.bind.annotation.XmlAttribute;\n-import javax.xml.bind.annotation.XmlRootElement;\n-import javax.xml.bind.annotation.XmlType;\n+import javax.xml.bind.annotation.*;\n \n \n /**", "raw_url": "https://github.com/nysenate/OpenLegislation/raw/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fxml%2Fcalendar%2FXMLSubbill.java", "sha": "3659028379562ab027323e8ccf61df22673333b2", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/nysenate/OpenLegislation/blob/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fxml%2Fcalendar%2FXMLSubsponsor.java", "changes": 6, "contents_url": "https://api.github.com/repos/nysenate/OpenLegislation/contents/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fxml%2Fcalendar%2FXMLSubsponsor.java?ref=f89655fbb32c1372837f17bb6f7ed81f7a32c654", "deletions": 5, "filename": "src/main/java/gov/nysenate/openleg/xml/calendar/XMLSubsponsor.java", "new_code": "import javax.xml.bind.annotation.*;", "new_methods": [], "old_code": "import javax.xml.bind.annotation.XmlAccessType;\nimport javax.xml.bind.annotation.XmlAccessorType;\nimport javax.xml.bind.annotation.XmlRootElement;\nimport javax.xml.bind.annotation.XmlType;\nimport javax.xml.bind.annotation.XmlValue;", "old_methods": [], "patch": "@@ -8,11 +8,7 @@\n \n package gov.nysenate.openleg.xml.calendar;\n \n-import javax.xml.bind.annotation.XmlAccessType;\n-import javax.xml.bind.annotation.XmlAccessorType;\n-import javax.xml.bind.annotation.XmlRootElement;\n-import javax.xml.bind.annotation.XmlType;\n-import javax.xml.bind.annotation.XmlValue;\n+import javax.xml.bind.annotation.*;\n \n \n /**", "raw_url": "https://github.com/nysenate/OpenLegislation/raw/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fxml%2Fcalendar%2FXMLSubsponsor.java", "sha": "0461341fcdcb2c808aaa462e6a72931e6deb0fca", "status": "modified" }, { "additions": 1, "blob_url": "https://github.com/nysenate/OpenLegislation/blob/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fxml%2Fcalendar%2FXMLSupplemental.java", "changes": 6, "contents_url": "https://api.github.com/repos/nysenate/OpenLegislation/contents/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fxml%2Fcalendar%2FXMLSupplemental.java?ref=f89655fbb32c1372837f17bb6f7ed81f7a32c654", "deletions": 5, "filename": "src/main/java/gov/nysenate/openleg/xml/calendar/XMLSupplemental.java", "new_code": "import javax.xml.bind.annotation.*;", "new_methods": [], "old_code": "import javax.xml.bind.annotation.XmlAccessType;\nimport javax.xml.bind.annotation.XmlAccessorType;\nimport javax.xml.bind.annotation.XmlAttribute;\nimport javax.xml.bind.annotation.XmlRootElement;\nimport javax.xml.bind.annotation.XmlType;", "old_methods": [], "patch": "@@ -8,11 +8,7 @@\n \n package gov.nysenate.openleg.xml.calendar;\n \n-import javax.xml.bind.annotation.XmlAccessType;\n-import javax.xml.bind.annotation.XmlAccessorType;\n-import javax.xml.bind.annotation.XmlAttribute;\n-import javax.xml.bind.annotation.XmlRootElement;\n-import javax.xml.bind.annotation.XmlType;\n+import javax.xml.bind.annotation.*;\n \n \n /**", "raw_url": "https://github.com/nysenate/OpenLegislation/raw/f89655fbb32c1372837f17bb6f7ed81f7a32c654/src%2Fmain%2Fjava%2Fgov%2Fnysenate%2Fopenleg%2Fxml%2Fcalendar%2FXMLSupplemental.java", "sha": "4675538496e7ef2024582b2a5dfa550d49c68f57", "status": "modified" } ]
76
[ { "name": "nysenate$openlegislation", "new_args": "String baseBillPrintNo", "new_implementation": "this.baseBillPrintNo = baseBillPrintNo;", "new_return_type": "void", "new_signature": "void setBaseBillPrintNo(String baseBillPrintNo)", "old_args": "String oid", "old_implementation": "this.oid = oid;\n /**\n * @return - The date of the action.\n */\n public Date getDate() {\n return date;", "old_return_type": "void", "old_signature": "void setOid(String oid)" } ]
1
9